From 916cea95d0cf536cf36f759c0fe56f9eddc9e3ea Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 22 Jul 2021 10:37:59 +0200
Subject: [PATCH 0001/1008] MOBILE-3800 h5pactivity: Log event when viewing H5P
 report

---
 .../pages/attempt-results/attempt-results.ts  |  2 +
 .../pages/user-attempts/user-attempts.ts      |  2 +
 .../mod/h5pactivity/services/h5pactivity.ts   | 56 ++++++++++++++++++-
 3 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.ts b/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.ts
index 741e78f28..3f3d79731 100644
--- a/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.ts
+++ b/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.ts
@@ -56,6 +56,8 @@ export class AddonModH5PActivityAttemptResultsPage implements OnInit {
 
         try {
             await this.fetchData();
+
+            await AddonModH5PActivity.logViewReport(this.h5pActivity!.id, this.h5pActivity!.name, { attemptId: this.attemptId });
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'Error loading attempt.');
         } finally {
diff --git a/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.ts b/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.ts
index 9f6d8b1d1..5f09b4c02 100644
--- a/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.ts
+++ b/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.ts
@@ -58,6 +58,8 @@ export class AddonModH5PActivityUserAttemptsPage implements OnInit {
 
         try {
             await this.fetchData();
+
+            await AddonModH5PActivity.logViewReport(this.h5pActivity!.id, this.h5pActivity!.name, { userId: this.userId });
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'Error loading attempts.');
         } finally {
diff --git a/src/addons/mod/h5pactivity/services/h5pactivity.ts b/src/addons/mod/h5pactivity/services/h5pactivity.ts
index 7902596d1..28927c099 100644
--- a/src/addons/mod/h5pactivity/services/h5pactivity.ts
+++ b/src/addons/mod/h5pactivity/services/h5pactivity.ts
@@ -580,7 +580,7 @@ export class AddonModH5PActivityProvider {
      * @return Promise resolved when the WS call is successful.
      */
     logView(id: number, name?: string, siteId?: string): Promise<void> {
-        const params: AddonModH5pactivityViewH5pactivityWSParams = {
+        const params: AddonModH5PActivityViewH5pactivityWSParams = {
             h5pactivityid: id,
         };
 
@@ -596,6 +596,40 @@ export class AddonModH5PActivityProvider {
         );
     }
 
+    /**
+     * Report an H5P activity report as being viewed.
+     *
+     * @param id H5P activity ID.
+     * @param name Name of the activity.
+     * @param options Options.
+     * @return Promise resolved when the WS call is successful.
+     */
+    async logViewReport(id: number, name?: string,  options: AddonModH5PActivityViewReportOptions = {}): Promise<void> {
+        const site = await CoreSites.getSite(options.siteId);
+
+        if (!site.wsAvailable('mod_h5pactivity_log_report_viewed')) {
+            // Site doesn't support the WS, stop.
+            return;
+        }
+
+        const params: AddonModH5PActivityLogReportViewedWSParams = {
+            h5pactivityid: id,
+            userid: options.userId,
+            attemptid: options.attemptId,
+        };
+
+        return CoreCourseLogHelper.logSingle(
+            'mod_h5pactivity_log_report_viewed',
+            params,
+            AddonModH5PActivityProvider.COMPONENT,
+            id,
+            name,
+            'h5pactivity',
+            {},
+            site.getId(),
+        );
+    }
+
 }
 
 export const AddonModH5PActivity = makeSingleton(AddonModH5PActivityProvider);
@@ -840,10 +874,28 @@ export type AddonModH5PActivityGetAttemptsOptions = AddonModH5PActivityGetAttemp
 /**
  * Params of mod_h5pactivity_view_h5pactivity WS.
  */
-export type AddonModH5pactivityViewH5pactivityWSParams = {
+export type AddonModH5PActivityViewH5pactivityWSParams = {
     h5pactivityid: number; // H5P activity instance id.
 };
 
+/**
+ * Params of mod_h5pactivity_log_report_viewed WS.
+ */
+export type AddonModH5PActivityLogReportViewedWSParams = {
+    h5pactivityid: number; // H5P activity instance id.
+    userid?: number | null; // The user id to log attempt (null means only current user).
+    attemptid?: number | null; // The attempt id.
+};
+
+/**
+ * Options for logViewReport.
+ */
+export type AddonModH5PActivityViewReportOptions = {
+    userId?: number; // User ID being viewed. Undefined for current user or when viewing an attempt.
+    attemptId?: number; // Attempt ID being viewed. Undefined if no attempt.
+    siteId?: string; // Site ID. If not defined, current site.
+};
+
 declare module '@singletons/events' {
 
     /**

From 628f380d7c3e4aef895eccc04f7a39ba5f51eaa9 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 22 Jul 2021 14:40:51 +0200
Subject: [PATCH 0002/1008] MOBILE-3780 course: Use right max upload size when
 set to course limit

---
 .../mod/assign/services/handlers/prefetch.ts  |  3 ++
 .../addon-mod-assign-submission-file.html     |  2 +-
 .../component/addon-mod-data-field-file.html  |  2 +-
 .../addon-mod-data-field-picture.html         |  2 +-
 .../mod/data/services/handlers/prefetch.ts    |  4 ++
 .../forum/components/edit-post/edit-post.html |  2 +-
 .../mod/forum/components/post/post.html       |  2 +-
 .../pages/new-discussion/new-discussion.html  |  2 +-
 .../new-discussion/new-discussion.page.ts     |  2 +-
 .../mod/forum/services/handlers/prefetch.ts   |  4 ++
 src/addons/mod/glossary/pages/edit/edit.html  |  2 +-
 .../glossary/services/handlers/prefetch.ts    |  5 +++
 .../mod/quiz/services/handlers/prefetch.ts    |  4 ++
 ...ddon-mod-workshop-assessment-strategy.html |  2 +-
 .../edit-submission/edit-submission.html      |  3 +-
 .../workshop/services/handlers/prefetch.ts    |  4 ++
 .../essay/component/addon-qtype-essay.html    |  2 +-
 .../components/attachments/attachments.ts     | 45 ++++++++++++++-----
 18 files changed, 71 insertions(+), 21 deletions(-)

diff --git a/src/addons/mod/assign/services/handlers/prefetch.ts b/src/addons/mod/assign/services/handlers/prefetch.ts
index 2c909584e..8d84587d0 100644
--- a/src/addons/mod/assign/services/handlers/prefetch.ts
+++ b/src/addons/mod/assign/services/handlers/prefetch.ts
@@ -35,6 +35,7 @@ import { CoreGroups } from '@services/groups';
 import { AddonModAssignSync, AddonModAssignSyncResult } from '../assign-sync';
 import { CoreUser } from '@features/user/services/user';
 import { CoreGradesHelper } from '@features/grades/services/grades-helper';
+import { CoreCourses } from '@features/courses/services/courses';
 
 /**
  * Handler to prefetch assigns.
@@ -252,6 +253,8 @@ export class AddonModAssignPrefetchHandlerService extends CoreCourseActivityPref
         promises.push(this.prefetchSubmissions(assign, courseId, module.id, userId, siteId));
 
         promises.push(CoreCourseHelper.getModuleCourseIdByInstance(assign.id, 'assign', siteId));
+        // Get course data, needed to determine upload max size if it's configured to be course limit.
+        promises.push(CoreUtils.ignoreErrors(CoreCourses.getCourseByField('id', courseId, siteId)));
 
         // Download intro files and attachments. Do not call getFiles because it'd call some WS twice.
         let files: CoreWSFile[] = assign.introattachments || [];
diff --git a/src/addons/mod/assign/submission/file/component/addon-mod-assign-submission-file.html b/src/addons/mod/assign/submission/file/component/addon-mod-assign-submission-file.html
index 92517dd92..af3d5235f 100644
--- a/src/addons/mod/assign/submission/file/component/addon-mod-assign-submission-file.html
+++ b/src/addons/mod/assign/submission/file/component/addon-mod-assign-submission-file.html
@@ -13,7 +13,7 @@
     <ion-item-divider class="ion-text-wrap" sticky="true">
         <ion-label><h2>{{ plugin.name }}</h2></ion-label>
     </ion-item-divider>
-    <core-attachments [files]="files" [maxSize]="maxSize" [maxSubmissions]="maxSubmissions"
+    <core-attachments [files]="files" [maxSize]="maxSize" [maxSubmissions]="maxSubmissions" [courseId]="assign.course"
         [component]="component" [componentId]="assign.cmid" [acceptedTypes]="acceptedTypes" [allowOffline]="allowOffline">
     </core-attachments>
 </div>
diff --git a/src/addons/mod/data/fields/file/component/addon-mod-data-field-file.html b/src/addons/mod/data/fields/file/component/addon-mod-data-field-file.html
index 4afdd5eb6..286e96940 100644
--- a/src/addons/mod/data/fields/file/component/addon-mod-data-field-file.html
+++ b/src/addons/mod/data/fields/file/component/addon-mod-data-field-file.html
@@ -1,7 +1,7 @@
 <span *ngIf="editMode && form">
     <span [core-mark-required]="field.required" class="core-mark-required"></span>
     <core-attachments [files]="files" [maxSize]="maxSizeBytes" maxSubmissions="1" [component]="component"
-        [componentId]="componentId" [allowOffline]="true">
+        [componentId]="componentId" [allowOffline]="true" [courseId]="database?.course">
     </core-attachments>
     <core-input-errors *ngIf="error" [errorText]="error"></core-input-errors>
 </span>
diff --git a/src/addons/mod/data/fields/picture/component/addon-mod-data-field-picture.html b/src/addons/mod/data/fields/picture/component/addon-mod-data-field-picture.html
index d00754fdc..bf10ea74e 100644
--- a/src/addons/mod/data/fields/picture/component/addon-mod-data-field-picture.html
+++ b/src/addons/mod/data/fields/picture/component/addon-mod-data-field-picture.html
@@ -1,7 +1,7 @@
 <span *ngIf="editMode && form" [formGroup]="form">
     <span [core-mark-required]="field.required" class="core-mark-required"></span>
     <core-attachments [files]="files" [maxSize]="maxSizeBytes" maxSubmissions="1" [component]="component"
-        [componentId]="componentId" [allowOffline]="true" acceptedTypes="image">
+        [componentId]="componentId" [allowOffline]="true" acceptedTypes="image" [courseId]="database?.course">
     </core-attachments>
     <core-input-errors *ngIf="error" [errorText]="error"></core-input-errors>
 
diff --git a/src/addons/mod/data/services/handlers/prefetch.ts b/src/addons/mod/data/services/handlers/prefetch.ts
index 92844d596..01446305c 100644
--- a/src/addons/mod/data/services/handlers/prefetch.ts
+++ b/src/addons/mod/data/services/handlers/prefetch.ts
@@ -16,6 +16,7 @@ import { Injectable } from '@angular/core';
 import { CoreComments } from '@features/comments/services/comments';
 import { CoreCourseActivityPrefetchHandlerBase } from '@features/course/classes/activity-prefetch-handler';
 import { CoreCourseCommonModWSOptions, CoreCourse, CoreCourseAnyModuleData } from '@features/course/services/course';
+import { CoreCourses } from '@features/courses/services/courses';
 import { CoreFilepool } from '@services/filepool';
 import { CoreGroup, CoreGroups } from '@services/groups';
 import { CoreSitesCommonWSOptions, CoreSites, CoreSitesReadingStrategy } from '@services/sites';
@@ -269,6 +270,9 @@ export class AddonModDataPrefetchHandlerService extends CoreCourseActivityPrefet
         // Add Basic Info to manage links.
         promises.push(CoreCourse.getModuleBasicInfoByInstance(database.id, 'data', siteId));
 
+        // Get course data, needed to determine upload max size if it's configured to be course limit.
+        promises.push(CoreUtils.ignoreErrors(CoreCourses.getCourseByField('id', courseId, siteId)));
+
         await Promise.all(promises);
     }
 
diff --git a/src/addons/mod/forum/components/edit-post/edit-post.html b/src/addons/mod/forum/components/edit-post/edit-post.html
index 60a500105..19f1c65ba 100644
--- a/src/addons/mod/forum/components/edit-post/edit-post.html
+++ b/src/addons/mod/forum/components/edit-post/edit-post.html
@@ -41,7 +41,7 @@
         <div *ngIf="advanced" id="addon-mod-forum-advanced">
             <core-attachments *ngIf="forum.id && forum.maxattachments > 0"
                 [maxSize]="forum.maxbytes" [maxSubmissions]="forum.maxattachments" [allowOffline]="true" [files]="replyData.files"
-                [component]="component" [componentId]="forum.cmid">
+                [component]="component" [componentId]="forum.cmid" [courseId]="forum.course">
             </core-attachments>
         </div>
         <ion-grid>
diff --git a/src/addons/mod/forum/components/post/post.html b/src/addons/mod/forum/components/post/post.html
index a3b998b29..89dbb0ed0 100644
--- a/src/addons/mod/forum/components/post/post.html
+++ b/src/addons/mod/forum/components/post/post.html
@@ -139,7 +139,7 @@
             <div *ngIf="advanced" [id]="'addon-forum-reply-edit-form-advanced-' + uniqueId">
                 <core-attachments
                     [files]="replyData.files" [maxSize]="forum.maxbytes" [maxSubmissions]="forum.maxattachments"
-                    [component]="component" [componentId]="forum.cmid" [allowOffline]="true">
+                    [component]="component" [componentId]="forum.cmid" [allowOffline]="true" [courseId]="courseId">
                 </core-attachments>
             </div>
         </ng-container>
diff --git a/src/addons/mod/forum/pages/new-discussion/new-discussion.html b/src/addons/mod/forum/pages/new-discussion/new-discussion.html
index c37f3edef..6155f595b 100644
--- a/src/addons/mod/forum/pages/new-discussion/new-discussion.html
+++ b/src/addons/mod/forum/pages/new-discussion/new-discussion.html
@@ -68,7 +68,7 @@
                 </ion-item>
                 <core-attachments *ngIf="canCreateAttachments && forum && forum.maxattachments > 0"
                     [files]="newDiscussion.files" [maxSize]="forum.maxbytes" [maxSubmissions]="forum.maxattachments"
-                    [component]="component" [componentId]="forum.cmid" [allowOffline]="true">
+                    [component]="component" [componentId]="forum.cmid" [allowOffline]="true" [courseId]="courseId">
                 </core-attachments>
             </div>
             <ion-item>
diff --git a/src/addons/mod/forum/pages/new-discussion/new-discussion.page.ts b/src/addons/mod/forum/pages/new-discussion/new-discussion.page.ts
index f47f8a5b4..71e71d97e 100644
--- a/src/addons/mod/forum/pages/new-discussion/new-discussion.page.ts
+++ b/src/addons/mod/forum/pages/new-discussion/new-discussion.page.ts
@@ -86,8 +86,8 @@ export class AddonModForumNewDiscussionPage implements OnInit, OnDestroy, CanLea
 
     advanced = false; // Display all form fields.
     accessInfo: AddonModForumAccessInformation = {};
+    courseId!: number;
 
-    protected courseId!: number;
     protected cmId!: number;
     protected forumId!: number;
     protected timeCreated!: number;
diff --git a/src/addons/mod/forum/services/handlers/prefetch.ts b/src/addons/mod/forum/services/handlers/prefetch.ts
index 7b7f62dbb..41357fcf6 100644
--- a/src/addons/mod/forum/services/handlers/prefetch.ts
+++ b/src/addons/mod/forum/services/handlers/prefetch.ts
@@ -24,6 +24,7 @@ import { CoreGroups, CoreGroupsProvider } from '@services/groups';
 import { CoreUtils } from '@services/utils/utils';
 import { AddonModForumSync } from '../forum-sync';
 import { makeSingleton } from '@singletons';
+import { CoreCourses } from '@features/courses/services/courses';
 
 /**
  * Handler to prefetch forums.
@@ -229,6 +230,9 @@ export class AddonModForumPrefetchHandlerService extends CoreCourseActivityPrefe
             promises.push(CoreUser.getUserPreference(AddonModForumProvider.PREFERENCE_SORTORDER, siteId));
         }
 
+        // Get course data, needed to determine upload max size if it's configured to be course limit.
+        promises.push(CoreUtils.ignoreErrors(CoreCourses.getCourseByField('id', courseId, siteId)));
+
         await Promise.all(promises);
     }
 
diff --git a/src/addons/mod/glossary/pages/edit/edit.html b/src/addons/mod/glossary/pages/edit/edit.html
index 1c7d899ff..9ab191489 100644
--- a/src/addons/mod/glossary/pages/edit/edit.html
+++ b/src/addons/mod/glossary/pages/edit/edit.html
@@ -50,7 +50,7 @@
                 <ion-label><h2>{{ 'addon.mod_glossary.attachment' | translate }}</h2></ion-label>
             </ion-item-divider>
             <core-attachments [files]="attachments" [component]="component" [componentId]="glossary.coursemodule"
-                [allowOffline]="true">
+                [allowOffline]="true" [courseId]="courseId">
             </core-attachments>
             <ng-container *ngIf="glossary.usedynalink">
                 <ion-item-divider>
diff --git a/src/addons/mod/glossary/services/handlers/prefetch.ts b/src/addons/mod/glossary/services/handlers/prefetch.ts
index 3c29641d3..16236256d 100644
--- a/src/addons/mod/glossary/services/handlers/prefetch.ts
+++ b/src/addons/mod/glossary/services/handlers/prefetch.ts
@@ -16,9 +16,11 @@ import { Injectable } from '@angular/core';
 import { CoreComments } from '@features/comments/services/comments';
 import { CoreCourseActivityPrefetchHandlerBase } from '@features/course/classes/activity-prefetch-handler';
 import { CoreCourse, CoreCourseAnyModuleData } from '@features/course/services/course';
+import { CoreCourses } from '@features/courses/services/courses';
 import { CoreUser } from '@features/user/services/user';
 import { CoreFilepool } from '@services/filepool';
 import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
+import { CoreUtils } from '@services/utils/utils';
 import { CoreWSFile } from '@services/ws';
 import { makeSingleton } from '@singletons';
 import { AddonModGlossary, AddonModGlossaryEntry, AddonModGlossaryGlossary, AddonModGlossaryProvider } from '../glossary';
@@ -210,6 +212,9 @@ export class AddonModGlossaryPrefetchHandlerService extends CoreCourseActivityPr
         promises.push(CoreCourse.getModuleBasicInfo(module.id, siteId));
         promises.push(CoreCourse.getModuleBasicInfoByInstance(glossary.id, 'glossary', siteId));
 
+        // Get course data, needed to determine upload max size if it's configured to be course limit.
+        promises.push(CoreUtils.ignoreErrors(CoreCourses.getCourseByField('id', courseId, siteId)));
+
         await Promise.all(promises);
     }
 
diff --git a/src/addons/mod/quiz/services/handlers/prefetch.ts b/src/addons/mod/quiz/services/handlers/prefetch.ts
index 982b5920e..1ee999c75 100644
--- a/src/addons/mod/quiz/services/handlers/prefetch.ts
+++ b/src/addons/mod/quiz/services/handlers/prefetch.ts
@@ -18,6 +18,7 @@ import { Injectable } from '@angular/core';
 import { CoreError } from '@classes/errors/error';
 import { CoreCourseActivityPrefetchHandlerBase } from '@features/course/classes/activity-prefetch-handler';
 import { CoreCourseAnyModuleData, CoreCourseCommonModWSOptions } from '@features/course/services/course';
+import { CoreCourses } from '@features/courses/services/courses';
 import { CoreQuestionHelper } from '@features/question/services/question-helper';
 import { CoreFilepool } from '@services/filepool';
 import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
@@ -374,6 +375,9 @@ export class AddonModQuizPrefetchHandlerService extends CoreCourseActivityPrefet
         promises.push(this.prefetchGradeAndFeedback(quiz, modOptions, siteId));
         promises.push(AddonModQuiz.getAttemptAccessInformation(quiz.id, 0, modOptions)); // Last attempt.
 
+        // Get course data, needed to determine upload max size if it's configured to be course limit.
+        promises.push(CoreUtils.ignoreErrors(CoreCourses.getCourseByField('id', courseId, siteId)));
+
         await Promise.all(promises);
 
         // We have quiz data, now we'll get specific data for each attempt.
diff --git a/src/addons/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html b/src/addons/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html
index df65c40e7..42baab58b 100644
--- a/src/addons/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html
+++ b/src/addons/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html
@@ -37,7 +37,7 @@
             </ion-item>
             <core-attachments *ngIf="edit && workshop.overallfeedbackfiles" [files]="data.assessment?.feedbackattachmentfiles"
                 [maxSize]="workshop.overallfeedbackmaxbytes" [maxSubmissions]="workshop.overallfeedbackfiles"
-                [component]="component" [componentId]="componentId" [allowOffline]="true">
+                [component]="component" [componentId]="componentId" [allowOffline]="true" [courseId]="workshop.course">
             </core-attachments>
             <ion-item *ngIf="edit && access && access.canallocate">
                 <ion-label position="stacked">
diff --git a/src/addons/mod/workshop/pages/edit-submission/edit-submission.html b/src/addons/mod/workshop/pages/edit-submission/edit-submission.html
index e39705bf9..ad52ca562 100644
--- a/src/addons/mod/workshop/pages/edit-submission/edit-submission.html
+++ b/src/addons/mod/workshop/pages/edit-submission/edit-submission.html
@@ -39,7 +39,8 @@
 
             <core-attachments *ngIf="fileAvailable" [files]="attachments" [maxSize]="workshop.maxbytes"
                 [maxSubmissions]="workshop.nattachments" [component]="component" [componentId]="workshop.coursemodule"
-                allowOffline="true" [acceptedTypes]="workshop.submissionfiletypes" [required]="fileRequired">
+                allowOffline="true" [acceptedTypes]="workshop.submissionfiletypes" [required]="fileRequired"
+                [courseId]="workshop.course">
             </core-attachments>
         </form>
     </core-loading>
diff --git a/src/addons/mod/workshop/services/handlers/prefetch.ts b/src/addons/mod/workshop/services/handlers/prefetch.ts
index 088002c86..c0903280a 100644
--- a/src/addons/mod/workshop/services/handlers/prefetch.ts
+++ b/src/addons/mod/workshop/services/handlers/prefetch.ts
@@ -16,6 +16,7 @@ import { AddonModDataSyncResult } from '@addons/mod/data/services/data-sync';
 import { Injectable } from '@angular/core';
 import { CoreCourseActivityPrefetchHandlerBase } from '@features/course/classes/activity-prefetch-handler';
 import { CoreCourse, CoreCourseAnyModuleData } from '@features/course/services/course';
+import { CoreCourses } from '@features/courses/services/courses';
 import { CoreUser } from '@features/user/services/user';
 import { CoreFilepool } from '@services/filepool';
 import { CoreGroup, CoreGroups } from '@services/groups';
@@ -372,6 +373,9 @@ export class AddonModWorkshopPrefetchHandlerService extends CoreCourseActivityPr
         promises.push(CoreCourse.getModuleBasicInfoByInstance(workshop.id, 'workshop', siteId));
         promises.push(CoreCourse.getModuleBasicGradeInfo(module.id, siteId));
 
+        // Get course data, needed to determine upload max size if it's configured to be course limit.
+        promises.push(CoreUtils.ignoreErrors(CoreCourses.getCourseByField('id', courseId, siteId)));
+
         await Promise.all(promises);
 
         // Prefetch user profiles.
diff --git a/src/addons/qtype/essay/component/addon-qtype-essay.html b/src/addons/qtype/essay/component/addon-qtype-essay.html
index 40e4359b7..a70656f8a 100644
--- a/src/addons/qtype/essay/component/addon-qtype-essay.html
+++ b/src/addons/qtype/essay/component/addon-qtype-essay.html
@@ -52,7 +52,7 @@
             <core-attachments *ngIf="uploadFilesSupported && essayQuestion.attachmentsDraftIdInput" [files]="attachments"
                 [component]="component" [componentId]="componentId" [maxSize]="essayQuestion.attachmentsMaxBytes"
                 [maxSubmissions]="essayQuestion.attachmentsMaxFiles" [allowOffline]="offlineEnabled"
-                [acceptedTypes]="essayQuestion.attachmentsAcceptedTypes">
+                [acceptedTypes]="essayQuestion.attachmentsAcceptedTypes" [courseId]="courseId">
             </core-attachments>
 
             <input *ngIf="essayQuestion.attachmentsDraftIdInput" type="hidden" [name]="essayQuestion.attachmentsDraftIdInput.name"
diff --git a/src/core/components/attachments/attachments.ts b/src/core/components/attachments/attachments.ts
index b541e1947..925d71de7 100644
--- a/src/core/components/attachments/attachments.ts
+++ b/src/core/components/attachments/attachments.ts
@@ -23,6 +23,8 @@ import { CoreApp } from '@services/app';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreFileUploaderHelper } from '@features/fileuploader/services/fileuploader-helper';
 import { CoreFileEntry } from '@services/file-helper';
+import { CoreCourses } from '@features/courses/services/courses';
+import { CoreUtils } from '@services/utils/utils';
 
 /**
  * Component to render attachments, allow adding more and delete the current ones.
@@ -44,13 +46,14 @@ import { CoreFileEntry } from '@services/file-helper';
 export class CoreAttachmentsComponent implements OnInit {
 
     @Input() files?: CoreFileEntry[]; // List of attachments. New attachments will be added to this array.
-    @Input() maxSize?: number; // Max size for attachments. -1 means unlimited, 0 means user max size, not defined means unknown.
+    @Input() maxSize?: number; // Max size. -1 means unlimited, 0 means course/user max size, not defined means unknown.
     @Input() maxSubmissions?: number; // Max number of attachments. -1 means unlimited, not defined means unknown limit.
     @Input() component?: string; // Component the downloaded files will be linked to.
     @Input() componentId?: string | number; // Component ID.
     @Input() allowOffline?: boolean | string; // Whether to allow selecting files in offline.
     @Input() acceptedTypes?: string; // List of supported filetypes. If undefined, all types supported.
     @Input() required?: boolean; // Whether to display the required mark.
+    @Input() courseId?: number; // Course ID.
 
     maxSizeReadable?: string;
     maxSubmissionsReadable?: string;
@@ -65,15 +68,7 @@ export class CoreAttachmentsComponent implements OnInit {
         this.maxSize = this.maxSize !== null ? Number(this.maxSize) : NaN;
 
         if (this.maxSize === 0) {
-            const currentSite = CoreSites.getCurrentSite();
-            const siteInfo = currentSite?.getInfo();
-
-            if (siteInfo?.usermaxuploadfilesize) {
-                this.maxSize = siteInfo.usermaxuploadfilesize;
-                this.maxSizeReadable = CoreTextUtils.bytesToSize(this.maxSize, 2);
-            } else {
-                this.maxSizeReadable = Translate.instant('core.unknown');
-            }
+            this.getMaxSizeOfArea();
         } else if (this.maxSize > 0) {
             this.maxSizeReadable = CoreTextUtils.bytesToSize(this.maxSize, 2);
         } else if (this.maxSize === -1) {
@@ -97,6 +92,36 @@ export class CoreAttachmentsComponent implements OnInit {
         }
     }
 
+    /**
+     * Get max size of the area.
+     *
+     * @return Promise resolved when done.
+     */
+    protected async getMaxSizeOfArea(): Promise<void> {
+        if (this.courseId) {
+            // Check course max size.
+            const course = await CoreUtils.ignoreErrors(CoreCourses.getCourseByField('id', this.courseId));
+
+            if (course?.maxbytes) {
+                this.maxSize = course.maxbytes;
+                this.maxSizeReadable = CoreTextUtils.bytesToSize(this.maxSize, 2);
+
+                return;
+            }
+        }
+
+        // Check user max size.
+        const currentSite = CoreSites.getCurrentSite();
+        const siteInfo = currentSite?.getInfo();
+
+        if (siteInfo?.usermaxuploadfilesize) {
+            this.maxSize = siteInfo.usermaxuploadfilesize;
+            this.maxSizeReadable = CoreTextUtils.bytesToSize(this.maxSize, 2);
+        } else {
+            this.maxSizeReadable = Translate.instant('core.unknown');
+        }
+    }
+
     /**
      * Add a new attachment.
      */

From 1512ab72ed51043b01cc2880747d15b6c2290a21 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 26 Jul 2021 11:07:33 +0200
Subject: [PATCH 0003/1008] MOBILE-3782 course: Fix guest access options and
 prefetch

---
 .../course/pages/contents/contents.ts         |  12 +-
 .../features/course/pages/index/index.page.ts |   5 +-
 .../course/pages/preview/preview.page.ts      |  15 +-
 .../features/course/services/course-helper.ts | 134 ++++++++++++++----
 .../courses/pages/my-courses/my-courses.ts    |   4 +-
 upgrade.txt                                   |   4 +
 6 files changed, 137 insertions(+), 37 deletions(-)

diff --git a/src/core/features/course/pages/contents/contents.ts b/src/core/features/course/pages/contents/contents.ts
index 0fafde5ef..3bb1ac9fc 100644
--- a/src/core/features/course/pages/contents/contents.ts
+++ b/src/core/features/course/pages/contents/contents.ts
@@ -82,6 +82,7 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
     protected syncObserver?: CoreEventObserver;
     protected isDestroyed = false;
     protected modulesHaveCompletion = false;
+    protected isGuest?: boolean;
     protected debouncedUpdateCachedCompletion?: () => void; // Update the cached completion after a certain time.
 
     /**
@@ -101,6 +102,7 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
         this.sectionId = CoreNavigator.getRouteNumberParam('sectionId');
         this.sectionNumber = CoreNavigator.getRouteNumberParam('sectionNumber');
         this.moduleId = CoreNavigator.getRouteNumberParam('moduleId');
+        this.isGuest = CoreNavigator.getRouteBooleanParam('isGuest');
 
         this.displayEnableDownload = !CoreSites.getCurrentSite()?.isOfflineDisabled() &&
             CoreCourseFormatDelegate.displayEnableDownload(this.course);
@@ -309,7 +311,7 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
      * @return Promise resolved when done.
      */
     protected async loadMenuHandlers(refresh?: boolean): Promise<void> {
-        this.courseMenuHandlers = await CoreCourseOptionsDelegate.getMenuHandlersToDisplay(this.course, refresh);
+        this.courseMenuHandlers = await CoreCourseOptionsDelegate.getMenuHandlersToDisplay(this.course, refresh, this.isGuest);
     }
 
     /**
@@ -450,9 +452,11 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
             await CoreCourseHelper.confirmAndPrefetchCourse(
                 this.prefetchCourseData,
                 this.course,
-                this.sections,
-                undefined,
-                this.courseMenuHandlers,
+                {
+                    sections: this.sections,
+                    menuHandlers: this.courseMenuHandlers,
+                    isGuest: this.isGuest,
+                },
             );
         } catch (error) {
             if (this.isDestroyed) {
diff --git a/src/core/features/course/pages/index/index.page.ts b/src/core/features/course/pages/index/index.page.ts
index cf9a9a892..98dd85dd1 100644
--- a/src/core/features/course/pages/index/index.page.ts
+++ b/src/core/features/course/pages/index/index.page.ts
@@ -48,6 +48,7 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
     protected firstTabName?: string;
     protected module?: CoreCourseWSModule;
     protected modParams?: Params;
+    protected isGuest?: boolean;
     protected contentsTab: CoreTabsOutletTab = {
         page: CONTENTS_PAGE_NAME,
         title: 'core.course.contents',
@@ -91,6 +92,7 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
         this.firstTabName = CoreNavigator.getRouteParam('selectedTab');
         this.module = CoreNavigator.getRouteParam<CoreCourseWSModule>('module');
         this.modParams = CoreNavigator.getRouteParam<Params>('modParams');
+        this.isGuest = CoreNavigator.getRouteBooleanParam('isGuest');
 
         this.currentPagePath = CoreNavigator.getCurrentPath();
         this.contentsTab.page = CoreTextUtils.concatenatePaths(this.currentPagePath, this.contentsTab.page);
@@ -98,6 +100,7 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
             course: this.course,
             sectionId: CoreNavigator.getRouteNumberParam('sectionId'),
             sectionNumber: CoreNavigator.getRouteNumberParam('sectionNumber'),
+            isGuest: this.isGuest,
         };
 
         if (this.module) {
@@ -132,7 +135,7 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
      */
     protected async loadCourseHandlers(): Promise<void> {
         // Load the course handlers.
-        const handlers = await CoreCourseOptionsDelegate.getHandlersToDisplay(this.course!, false, false);
+        const handlers = await CoreCourseOptionsDelegate.getHandlersToDisplay(this.course!, false, this.isGuest);
 
         let tabToLoad: number | undefined;
 
diff --git a/src/core/features/course/pages/preview/preview.page.ts b/src/core/features/course/pages/preview/preview.page.ts
index 32ddc47e2..122557ace 100644
--- a/src/core/features/course/pages/preview/preview.page.ts
+++ b/src/core/features/course/pages/preview/preview.page.ts
@@ -67,6 +67,7 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
     isMobile: boolean;
 
     protected isGuestEnabled = false;
+    protected useGuestAccess = false;
     protected guestInstanceId?: number;
     protected enrolmentMethods: CoreCourseEnrolmentMethod[] = [];
     protected waitStart = 0;
@@ -209,10 +210,12 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
             this.course!.fullname = course.fullname || this.course!.fullname;
             this.course!.summary = course.summary || this.course!.summary;
             this.canAccessCourse = true;
+            this.useGuestAccess = false;
         } catch {
             // The user is not an admin/manager. Check if we can provide guest access to the course.
             try {
                 this.canAccessCourse = !(await this.canAccessAsGuest());
+                this.useGuestAccess = this.canAccessCourse;
             } catch {
                 this.canAccessCourse = false;
             }
@@ -243,7 +246,7 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
             return;
         }
 
-        CoreCourseHelper.openCourse(this.course!);
+        CoreCourseHelper.openCourse(this.course!, { isGuest: this.useGuestAccess });
     }
 
     /**
@@ -452,12 +455,16 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
     /**
      * Prefetch the course.
      */
-    prefetchCourse(): void {
-        CoreCourseHelper.confirmAndPrefetchCourse(this.prefetchCourseData, this.course!).catch((error) => {
+    async prefetchCourse(): Promise<void> {
+        try {
+            await CoreCourseHelper.confirmAndPrefetchCourse(this.prefetchCourseData, this.course!, {
+                isGuest: this.useGuestAccess,
+            });
+        } catch (error) {
             if (!this.pageDestroyed) {
                 CoreDomUtils.showErrorModalDefault(error, 'core.course.errordownloadingcourse', true);
             }
-        });
+        }
     }
 
     /**
diff --git a/src/core/features/course/services/course-helper.ts b/src/core/features/course/services/course-helper.ts
index d4127950e..61f2c9df7 100644
--- a/src/core/features/course/services/course-helper.ts
+++ b/src/core/features/course/services/course-helper.ts
@@ -361,17 +361,13 @@ export class CoreCourseHelperProvider {
      *
      * @param data An object where to store the course icon and title: "prefetchCourseIcon", "title" and "downloadSucceeded".
      * @param course Course to prefetch.
-     * @param sections List of course sections.
-     * @param courseHandlers List of course handlers.
-     * @param menuHandlers List of course menu handlers.
+     * @param options Other options.
      * @return Promise resolved when the download finishes, rejected if an error occurs or the user cancels.
      */
     async confirmAndPrefetchCourse(
         data: CorePrefetchStatusInfo,
         course: CoreCourseAnyCourseData,
-        sections?: CoreCourseWSSection[],
-        courseHandlers?: CoreCourseOptionsHandlerToDisplay[],
-        menuHandlers?: CoreCourseOptionsMenuHandlerToDisplay[],
+        options: CoreCoursePrefetchCourseOptions = {},
     ): Promise<void> {
         const initialIcon = data.icon;
         const initialStatus = data.status;
@@ -386,23 +382,23 @@ export class CoreCourseHelperProvider {
 
         try {
             // Get the sections first if needed.
-            if (!sections) {
-                sections = await CoreCourse.getSections(course.id, false, true);
+            if (!options.sections) {
+                options.sections = await CoreCourse.getSections(course.id, false, true);
             }
 
             // Confirm the download.
-            await this.confirmDownloadSizeSection(course.id, undefined, sections, true);
+            await this.confirmDownloadSizeSection(course.id, undefined, options.sections, true);
 
             // User confirmed, get the course handlers if needed.
-            if (!courseHandlers) {
-                courseHandlers = await CoreCourseOptionsDelegate.getHandlersToDisplay(course);
+            if (!options.courseHandlers) {
+                options.courseHandlers = await CoreCourseOptionsDelegate.getHandlersToDisplay(course, false, options.isGuest);
             }
-            if (!menuHandlers) {
-                menuHandlers = await CoreCourseOptionsDelegate.getMenuHandlersToDisplay(course);
+            if (!options.menuHandlers) {
+                options.menuHandlers = await CoreCourseOptionsDelegate.getMenuHandlersToDisplay(course, false, options.isGuest);
             }
 
             // Now we have all the data, download the course.
-            await this.prefetchCourse(course, sections, courseHandlers, menuHandlers, siteId);
+            await this.prefetchCourse(course, options.sections, options.courseHandlers, options.menuHandlers, siteId);
 
             // Download successful.
             data.downloadSucceeded = true;
@@ -422,12 +418,12 @@ export class CoreCourseHelperProvider {
      * Confirm and prefetches a list of courses.
      *
      * @param courses List of courses to download.
-     * @param onProgress Function to call everytime a course is downloaded.
+     * @param options Other options.
      * @return Resolved when downloaded, rejected if error or canceled.
      */
     async confirmAndPrefetchCourses(
         courses: CoreEnrolledCourseDataWithExtraInfoAndOptions[],
-        onProgress?: (data: CoreCourseCoursesProgress) => void,
+        options: CoreCourseConfirmPrefetchCoursesOptions = {},
     ): Promise<void> {
         const siteId = CoreSites.getCurrentSiteId();
 
@@ -437,12 +433,18 @@ export class CoreCourseHelperProvider {
         const total = courses.length;
         let count = 0;
 
-        const promises = courses.map((course) => {
+        const promises = courses.map(async (course) => {
             const subPromises: Promise<void>[] = [];
             let sections: CoreCourseWSSection[];
             let handlers: CoreCourseOptionsHandlerToDisplay[] = [];
             let menuHandlers: CoreCourseOptionsMenuHandlerToDisplay[] = [];
             let success = true;
+            let isGuest = false;
+
+            if (options.canHaveGuestCourses) {
+                // Check if the user can only access as guest.
+                isGuest = await this.courseUsesGuestAccess(course.id, siteId);
+            }
 
             // Get the sections and the handlers.
             subPromises.push(CoreCourse.getSections(course.id, false, true).then((courseSections) => {
@@ -451,12 +453,12 @@ export class CoreCourseHelperProvider {
                 return;
             }));
 
-            subPromises.push(CoreCourseOptionsDelegate.getHandlersToDisplay(course).then((cHandlers) => {
+            subPromises.push(CoreCourseOptionsDelegate.getHandlersToDisplay(course, false, isGuest).then((cHandlers) => {
                 handlers = cHandlers;
 
                 return;
             }));
-            subPromises.push(CoreCourseOptionsDelegate.getMenuHandlersToDisplay(course).then((mHandlers) => {
+            subPromises.push(CoreCourseOptionsDelegate.getMenuHandlersToDisplay(course, false, isGuest).then((mHandlers) => {
                 menuHandlers = mHandlers;
 
                 return;
@@ -470,15 +472,15 @@ export class CoreCourseHelperProvider {
                 }).finally(() => {
                 // Course downloaded or failed, notify the progress.
                     count++;
-                    if (onProgress) {
-                        onProgress({ count: count, total: total, courseId: course.id, success: success });
+                    if (options.onProgress) {
+                        options.onProgress({ count: count, total: total, courseId: course.id, success: success });
                     }
                 });
         });
 
-        if (onProgress) {
+        if (options.onProgress) {
             // Notify the start of the download.
-            onProgress({ count: 0, total: total, success: true });
+            options.onProgress({ count: 0, total: total, success: true });
         }
 
         return CoreUtils.allPromises(promises);
@@ -609,6 +611,55 @@ export class CoreCourseHelperProvider {
         }
     }
 
+    /**
+     * Check whether a course is accessed using guest access.
+     *
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: whether course is accessed using guest access.
+     */
+    async courseUsesGuestAccess(courseId: number, siteId?: string): Promise<boolean> {
+        try {
+            try {
+                // Check if user is enrolled. If enrolled, no guest access.
+                await CoreCourses.getUserCourse(courseId, false, siteId);
+
+                return false;
+            } catch {
+                // Ignore errors.
+            }
+
+            try {
+                // The user is not enrolled in the course. Use getCourses to see if it's an admin/manager and can see the course.
+                await CoreCourses.getCourse(courseId, siteId);
+
+                return false;
+            } catch {
+                // Ignore errors.
+            }
+
+            // Check if guest access is enabled.
+            const enrolmentMethods = await CoreCourses.getCourseEnrolmentMethods(courseId, siteId);
+
+            const method = enrolmentMethods.find((method) => method.type === 'guest');
+
+            if (!method) {
+                return false;
+            }
+
+            const info = await CoreCourses.getCourseGuestEnrolmentInfo(method.id);
+            if (!info.status) {
+                // Not active, reject.
+                return false;
+            }
+
+            // Don't allow guest access if it requires a password.
+            return !info.passwordrequired;
+        } catch {
+            return false;
+        }
+    }
+
     /**
      * Create and return a section for "All sections".
      *
@@ -1257,23 +1308,30 @@ export class CoreCourseHelperProvider {
      *
      * @param courses Courses array to prefetch.
      * @param prefetch Prefetch information to be updated.
+     * @param options Other options.
      * @return Promise resolved when done.
      */
     async prefetchCourses(
         courses: CoreEnrolledCourseDataWithExtraInfoAndOptions[],
         prefetch: CorePrefetchStatusInfo,
+        options: CoreCoursePrefetchCoursesOptions = {},
     ): Promise<void> {
         prefetch.loading = true;
         prefetch.icon = CoreConstants.ICON_DOWNLOADING;
         prefetch.badge = '';
 
-        try {
-            await this.confirmAndPrefetchCourses(courses, (progress) => {
+        const prefetchOptions = {
+            ...options,
+            onProgress: (progress) => {
                 prefetch.badge = progress.count + ' / ' + progress.total;
                 prefetch.badgeA11yText = Translate.instant('core.course.downloadcoursesprogressdescription', progress);
                 prefetch.count = progress.count;
                 prefetch.total = progress.total;
-            });
+            },
+        };
+
+        try {
+            await this.confirmAndPrefetchCourses(courses, prefetchOptions);
             prefetch.icon = CoreConstants.ICON_OUTDATED;
         } finally {
             prefetch.loading = false;
@@ -2059,6 +2117,30 @@ export type CoreCourseModuleCompletionData = CoreCourseModuleWSCompletionData &
     offline?: boolean;
 };
 
+/**
+ * Options for prefetch course function.
+ */
+export type CoreCoursePrefetchCourseOptions = {
+    sections?: CoreCourseWSSection[]; // List of course sections.
+    courseHandlers?: CoreCourseOptionsHandlerToDisplay[]; // List of course handlers.
+    menuHandlers?: CoreCourseOptionsMenuHandlerToDisplay[]; // List of course menu handlers.
+    isGuest?: boolean; // Whether the user is guest.
+};
+
+/**
+ * Options for prefetch courses function.
+ */
+export type CoreCoursePrefetchCoursesOptions = {
+    canHaveGuestCourses?: boolean; // Whether the list of courses can contain courses with only guest access.
+};
+
+/**
+ * Options for confirm and prefetch courses function.
+ */
+export type CoreCourseConfirmPrefetchCoursesOptions = CoreCoursePrefetchCoursesOptions & {
+    onProgress?: (data: CoreCourseCoursesProgress) => void;
+};
+
 type ComponentWithContextMenu = {
     prefetchStatusIcon?: string;
     isDestroyed?: boolean;
diff --git a/src/core/features/courses/pages/my-courses/my-courses.ts b/src/core/features/courses/pages/my-courses/my-courses.ts
index 657e4e84c..c7697acb8 100644
--- a/src/core/features/courses/pages/my-courses/my-courses.ts
+++ b/src/core/features/courses/pages/my-courses/my-courses.ts
@@ -185,13 +185,13 @@ export class CoreCoursesMyCoursesPage implements OnInit, OnDestroy {
         this.downloadAllCoursesLoading = true;
 
         try {
-            await CoreCourseHelper.confirmAndPrefetchCourses(this.courses, (progress) => {
+            await CoreCourseHelper.confirmAndPrefetchCourses(this.courses, { onProgress: (progress) => {
                 this.downloadAllCoursesBadge = progress.count + ' / ' + progress.total;
                 this.downloadAllCoursesBadgeA11yText =
                     Translate.instant('core.course.downloadcoursesprogressdescription', progress);
                 this.downloadAllCoursesCount = progress.count;
                 this.downloadAllCoursesTotal = progress.total;
-            });
+            } });
         } catch (error) {
             if (!this.isDestroyed) {
                 CoreDomUtils.showErrorModalDefault(error, 'core.course.errordownloadingcourse', true);
diff --git a/upgrade.txt b/upgrade.txt
index 4ee9ede3e..19393ed60 100644
--- a/upgrade.txt
+++ b/upgrade.txt
@@ -1,6 +1,10 @@
 This files describes API changes in the Moodle Mobile app,
 information provided here is intended especially for developers.
 
+=== 3.9.6 ===
+
+- The parameters of the functions confirmAndPrefetchCourse and confirmAndPrefetchCourses have changed, they now accept an object with options.
+
 === 3.9.5 ===
 
 - Several functions inside AddonNotificationsProvider have been modified to accept an "options" parameter instead of having several optional parameters.

From 2b1ab6fddeb50f604d5ad23fb84a6c7d1b755640 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 26 Jul 2021 11:08:15 +0200
Subject: [PATCH 0004/1008] MOBILE-3782 course: Change 'Download course' text
 after download

---
 src/core/features/course/pages/preview/preview.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/core/features/course/pages/preview/preview.html b/src/core/features/course/pages/preview/preview.html
index 7ab51f689..7a0e9317e 100644
--- a/src/core/features/course/pages/preview/preview.html
+++ b/src/core/features/course/pages/preview/preview.html
@@ -113,7 +113,10 @@
                 </ion-icon>
                 <ion-spinner *ngIf="prefetchCourseData.loading" slot="start"
                     [attr.aria-label]="'core.loading' | translate"></ion-spinner>
-                <ion-label><h2>{{ 'core.course.downloadcourse' | translate }}</h2></ion-label>
+                <ion-label>
+                    <h2 *ngIf="prefetchCourseData.status != statusDownloaded">{{ 'core.course.downloadcourse' | translate }}</h2>
+                    <h2 *ngIf="prefetchCourseData.status == statusDownloaded">{{ 'core.course.refreshcourse' | translate }}</h2>
+                </ion-label>
             </ion-item>
             <ion-item button (click)="openCourse()" [attr.aria-label]="course.fullname" *ngIf="!avoidOpenCourse && canAccessCourse"
                 detail="true">

From cb5bde99daa3db6f6151b7c13b71868adb8f5c73 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 26 Jul 2021 15:06:23 +0200
Subject: [PATCH 0005/1008] MOBILE-3779 wiki: Handle params in wiki index link

---
 src/addons/mod/wiki/components/index/index.ts | 20 +++++++++++++------
 .../mod/wiki/services/handlers/index-link.ts  | 12 +++++++++++
 src/addons/mod/wiki/services/wiki.ts          | 18 +++++++++++++----
 3 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/src/addons/mod/wiki/components/index/index.ts b/src/addons/mod/wiki/components/index/index.ts
index 6fd242ed7..e0a5f3da2 100644
--- a/src/addons/mod/wiki/components/index/index.ts
+++ b/src/addons/mod/wiki/components/index/index.ts
@@ -350,12 +350,20 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
             cmId: this.module.id,
         });
 
-        // If no page specified, search first page.
-        if (!this.currentPage && !this.pageTitle) {
-            const firstPage = subwikiPages.find((page) => page.firstpage );
-            if (firstPage) {
-                this.currentPage = firstPage.id;
-                this.pageTitle = firstPage.title;
+        if (!this.currentPage) {
+            if (!this.pageTitle) {
+                // No page specified, search first page.
+                const firstPage = subwikiPages.find((page) => page.firstpage );
+                if (firstPage) {
+                    this.currentPage = firstPage.id;
+                    this.pageTitle = firstPage.title;
+                }
+            } else {
+                // Got the page title but not its ID. Search the page.
+                const page = subwikiPages.find((page) => page.title === this.pageTitle );
+                if (page) {
+                    this.currentPage = page.id;
+                }
             }
         }
 
diff --git a/src/addons/mod/wiki/services/handlers/index-link.ts b/src/addons/mod/wiki/services/handlers/index-link.ts
index 50c5c4531..c31e68885 100644
--- a/src/addons/mod/wiki/services/handlers/index-link.ts
+++ b/src/addons/mod/wiki/services/handlers/index-link.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import { Injectable } from '@angular/core';
+import { Params } from '@angular/router';
 import { CoreContentLinksModuleIndexHandler } from '@features/contentlinks/classes/module-index-handler';
 import { makeSingleton } from '@singletons';
 
@@ -28,6 +29,17 @@ export class AddonModWikiIndexLinkHandlerService extends CoreContentLinksModuleI
         super('AddonModWiki', 'wiki', 'wid');
     }
 
+    /**
+     * @inheritdoc
+     */
+    getPageParams(url: string, params: Record<string, string>): Params {
+        return {
+            groupId: params.group || params.group === '0' ? Number(params.group) : undefined,
+            userId: params.uid || params.uid === '0' ? Number(params.uid) : undefined,
+            pageTitle: params.title,
+        };
+    }
+
 }
 
 export const AddonModWikiIndexLinkHandler = makeSingleton(AddonModWikiIndexLinkHandlerService);
diff --git a/src/addons/mod/wiki/services/wiki.ts b/src/addons/mod/wiki/services/wiki.ts
index 3bdfcf796..5a10fc8b9 100644
--- a/src/addons/mod/wiki/services/wiki.ts
+++ b/src/addons/mod/wiki/services/wiki.ts
@@ -335,7 +335,10 @@ export class AddonModWikiProvider {
 
         const response = await site.read<AddonModWikiGetSubwikisWSResponse>('mod_wiki_get_subwikis', params, preSets);
 
-        return response.subwikis;
+        return response.subwikis.map(subwiki => ({
+            ...subwiki,
+            groupid: Number(subwiki.groupid), // Convert groupid to number.
+        }));
     }
 
     /**
@@ -1112,21 +1115,28 @@ export type AddonModWikiGetSubwikisWSParams = {
  * Data returned by mod_wiki_get_subwikis WS.
  */
 export type AddonModWikiGetSubwikisWSResponse = {
-    subwikis: AddonModWikiSubwiki[];
+    subwikis: AddonModWikiSubwikiWSData[];
     warnings?: CoreWSExternalWarning[];
 };
 
 /**
  * Subwiki data returned by mod_wiki_get_subwikis WS.
  */
-export type AddonModWikiSubwiki = {
+export type AddonModWikiSubwikiWSData = {
     id: number; // Subwiki ID.
     wikiid: number; // Wiki ID.
-    groupid: number; // Group ID.
+    groupid: string; // Group ID.
     userid: number; // User ID.
     canedit: boolean; // True if user can edit the subwiki.
 };
 
+/**
+ * Subwiki data with some calculated data.
+ */
+export type AddonModWikiSubwiki = Omit<AddonModWikiSubwikiWSData, 'groupid'> & {
+    groupid: number; // Group ID.
+};
+
 /**
  * Params of mod_wiki_get_wikis_by_courses WS.
  */

From 310f55f119c943415cc2295efb4026629092a646 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 27 Jul 2021 12:56:23 +0200
Subject: [PATCH 0006/1008] MOBILE-3763 h5p: Fix height of iframes added using
 the embed code

---
 .../services/handlers/displayh5p.ts           | 20 +++++++++++++++++++
 src/core/features/h5p/classes/helper.ts       | 16 +++++++++++++++
 .../h5p/components/h5p-iframe/h5p-iframe.ts   | 18 +----------------
 3 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/src/addons/filter/displayh5p/services/handlers/displayh5p.ts b/src/addons/filter/displayh5p/services/handlers/displayh5p.ts
index 8134fac47..c2b11d7f7 100644
--- a/src/addons/filter/displayh5p/services/handlers/displayh5p.ts
+++ b/src/addons/filter/displayh5p/services/handlers/displayh5p.ts
@@ -18,6 +18,8 @@ import { CoreFilterDefaultHandler } from '@features/filter/services/handlers/def
 import { CoreFilterFilter, CoreFilterFormatTextOptions } from '@features/filter/services/filter';
 import { makeSingleton } from '@singletons';
 import { CoreH5PPlayerComponent } from '@features/h5p/components/h5p-player/h5p-player';
+import { CoreUrlUtils } from '@services/utils/url';
+import { CoreH5PHelper } from '@features/h5p/classes/helper';
 
 /**
  * Handler to support the Display H5P filter.
@@ -63,6 +65,24 @@ export class AddonFilterDisplayH5PHandlerService extends CoreFilterDefaultHandle
             iframe.parentElement?.replaceChild(placeholder, iframe);
         });
 
+        // Handle H5P iframes embedded using the embed HTML code.
+        const embeddedH5PIframes = <HTMLIFrameElement[]> Array.from(this.template.content.querySelectorAll('iframe.h5p-player'));
+
+        embeddedH5PIframes.forEach((iframe) => {
+            // Add the preventredirect param to allow authenticating if auto-login fails.
+            iframe.src = CoreUrlUtils.addParamsToUrl(iframe.src, { preventredirect: false });
+
+            // Add resizer script so the H5P has the right height.
+            CoreH5PHelper.addResizerScript();
+
+            // If the iframe has a small height, add some minimum initial height so it's seen if auto-login fails.
+            const styleHeight = Number(iframe.style.height);
+            const height = Number(iframe.getAttribute('height'));
+            if ((!height || height < 400) && (!styleHeight || styleHeight < 400)) {
+                iframe.style.height = '400px';
+            }
+        });
+
         return this.template.innerHTML;
     }
 
diff --git a/src/core/features/h5p/classes/helper.ts b/src/core/features/h5p/classes/helper.ts
index 9724e29a3..bfb7b9537 100644
--- a/src/core/features/h5p/classes/helper.ts
+++ b/src/core/features/h5p/classes/helper.ts
@@ -30,6 +30,22 @@ import { CoreError } from '@classes/errors/error';
  */
 export class CoreH5PHelper {
 
+    /**
+     * Add the resizer script if it hasn't been added already.
+     */
+    static addResizerScript(): void {
+        if (document.head.querySelector('#core-h5p-resizer-script') != null) {
+            // Script already added, don't add it again.
+            return;
+        }
+
+        const script = document.createElement('script');
+        script.id = 'core-h5p-resizer-script';
+        script.type = 'text/javascript';
+        script.src = CoreH5P.h5pPlayer.getResizerScriptUrl();
+        document.head.appendChild(script);
+    }
+
     /**
      * Convert the number representation of display options into an object.
      *
diff --git a/src/core/features/h5p/components/h5p-iframe/h5p-iframe.ts b/src/core/features/h5p/components/h5p-iframe/h5p-iframe.ts
index 72bcdb169..5a921c6f8 100644
--- a/src/core/features/h5p/components/h5p-iframe/h5p-iframe.ts
+++ b/src/core/features/h5p/components/h5p-iframe/h5p-iframe.ts
@@ -138,7 +138,7 @@ export class CoreH5PIframeComponent implements OnChanges, OnDestroy {
             CoreDomUtils.showErrorModalDefault(error, 'Error loading H5P package.', true);
 
         } finally {
-            this.addResizerScript();
+            CoreH5PHelper.addResizerScript();
             this.onIframeUrlSet.emit({ src: this.iframeSrc!, online: !!localUrl });
         }
     }
@@ -185,22 +185,6 @@ export class CoreH5PIframeComponent implements OnChanges, OnDestroy {
         }
     }
 
-    /**
-     * Add the resizer script if it hasn't been added already.
-     */
-    protected addResizerScript(): void {
-        if (document.head.querySelector('#core-h5p-resizer-script') != null) {
-            // Script already added, don't add it again.
-            return;
-        }
-
-        const script = document.createElement('script');
-        script.id = 'core-h5p-resizer-script';
-        script.type = 'text/javascript';
-        script.src = CoreH5P.h5pPlayer.getResizerScriptUrl();
-        document.head.appendChild(script);
-    }
-
     /**
      * H5P iframe has been loaded.
      */

From 8ad4502aade703a36ac073d5dde29e6d86a955e0 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 27 Jul 2021 16:05:59 +0200
Subject: [PATCH 0007/1008] MOBILE-3822 mathjax: Disable clicks in links in
 mathjax preview

---
 src/theme/components/format-text.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/theme/components/format-text.scss b/src/theme/components/format-text.scss
index 325ab0460..0e617a2b8 100644
--- a/src/theme/components/format-text.scss
+++ b/src/theme/components/format-text.scss
@@ -191,6 +191,11 @@ core-format-text {
             display: none;
         }
     }
+
+    // Disable clicks in links inside MathJax equations.
+    .core-format-text-content .filter_mathjaxloader_equation .MathJax_Preview a {
+        pointer-events: none;
+    }
 }
 
 

From 0c3ceca486ccb5e359a97e885b1dbb70217bd432 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 28 Jul 2021 10:22:22 +0200
Subject: [PATCH 0008/1008] MOBILE-3715 iab: Fix load previous page after open
 external app

---
 src/app/app.component.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 18a5360d3..038345fff 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -110,6 +110,7 @@ export class AppComponent implements OnInit, AfterViewInit {
         // Check URLs loaded in any InAppBrowser.
         CoreEvents.on(CoreEvents.IAB_LOAD_START, (event) => {
             // URLs with a custom scheme can be prefixed with "http://" or "https://", we need to remove this.
+            const protocol = CoreUrlUtils.getUrlProtocol(event.url);
             const url = event.url.replace(/^https?:\/\//, '');
 
             if (CoreCustomURLSchemes.isCustomURL(url)) {
@@ -135,7 +136,7 @@ export class AppComponent implements OnInit, AfterViewInit {
                         CoreUtils.closeInAppBrowser();
                     }
                 } else {
-                    this.lastInAppUrl = url;
+                    this.lastInAppUrl = protocol ? `${protocol}://${url}` : url;
                 }
             }
         });

From 8e809fbc4d0749cd51d25e742341a6f9a292dd4f Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 23 Jul 2021 12:02:52 +0200
Subject: [PATCH 0009/1008] MOBILE-3785 groups: Always allow selecting all
 parts if visible groups

---
 src/core/services/groups.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/core/services/groups.ts b/src/core/services/groups.ts
index 3d1150f5d..7aad3f30c 100644
--- a/src/core/services/groups.ts
+++ b/src/core/services/groups.ts
@@ -172,8 +172,7 @@ export class CoreGroupsProvider {
             groupInfo.visibleGroups = false;
             groupInfo.defaultGroupId = 0;
         } else {
-            // The "canaccessallgroups" field was added in 3.4. Add all participants for visible groups in previous versions.
-            if (result.canaccessallgroups || (typeof result.canaccessallgroups == 'undefined' && groupInfo.visibleGroups)) {
+            if (result.canaccessallgroups || groupInfo.visibleGroups) {
                 groupInfo.groups!.push({ id: 0, name: Translate.instant('core.allparticipants') });
                 groupInfo.defaultGroupId = 0;
             } else {

From f019c9383765bc18c335c937c139d731fb3938bb Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 29 Jul 2021 08:18:07 +0200
Subject: [PATCH 0010/1008] MOBILE-3688 siteplugins: Auto create mod index&list
 link handlers

---
 .../classes/handlers/module-handler.ts        | 15 ++++++++++---
 .../services/siteplugins-helper.ts            | 21 ++++++++++++++++---
 .../siteplugins/services/siteplugins.ts       |  1 +
 3 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/src/core/features/siteplugins/classes/handlers/module-handler.ts b/src/core/features/siteplugins/classes/handlers/module-handler.ts
index c776e722c..ee3ae05b6 100644
--- a/src/core/features/siteplugins/classes/handlers/module-handler.ts
+++ b/src/core/features/siteplugins/classes/handlers/module-handler.ts
@@ -125,9 +125,7 @@ export class CoreSitePluginsModuleHandler extends CoreSitePluginsBaseHandler imp
         }
 
         // Check if the plugin specifies if FEATURE_NO_VIEW_LINK is supported.
-        const noViewLink = <boolean | undefined> (this.supportsFeature ?
-            this.supportsFeature(CoreConstants.FEATURE_NO_VIEW_LINK) :
-            this.supportedFeatures?.[CoreConstants.FEATURE_NO_VIEW_LINK]);
+        const noViewLink = this.supportsNoViewLink();
 
         if (noViewLink !== undefined) {
             return noViewLink;
@@ -137,6 +135,17 @@ export class CoreSitePluginsModuleHandler extends CoreSitePluginsBaseHandler imp
         return 'noviewlink' in module && !!module.noviewlink;
     }
 
+    /**
+     * Check whether the module supports NO_VIEW_LINK.
+     *
+     * @return Bool if defined, undefined if not specified.
+     */
+    supportsNoViewLink(): boolean | undefined {
+        return <boolean | undefined> (this.supportsFeature ?
+            this.supportsFeature(CoreConstants.FEATURE_NO_VIEW_LINK) :
+            this.supportedFeatures?.[CoreConstants.FEATURE_NO_VIEW_LINK]);
+    }
+
     /**
      * Load and use template for course page.
      *
diff --git a/src/core/features/siteplugins/services/siteplugins-helper.ts b/src/core/features/siteplugins/services/siteplugins-helper.ts
index 84a1b626b..3ce97bba9 100644
--- a/src/core/features/siteplugins/services/siteplugins-helper.ts
+++ b/src/core/features/siteplugins/services/siteplugins-helper.ts
@@ -81,6 +81,9 @@ import { CoreMainMenuHomeDelegate } from '@features/mainmenu/services/home-deleg
 import { CoreSitePluginsMainMenuHomeHandler } from '../classes/handlers/main-menu-home-handler';
 import { AddonWorkshopAssessmentStrategyDelegate } from '@addons/mod/workshop/services/assessment-strategy-delegate';
 import { CoreSitePluginsWorkshopAssessmentStrategyHandler } from '../classes/handlers/workshop-assessment-strategy-handler';
+import { CoreContentLinksModuleIndexHandler } from '@features/contentlinks/classes/module-index-handler';
+import { CoreContentLinksDelegate } from '@features/contentlinks/services/contentlinks-delegate';
+import { CoreContentLinksModuleListHandler } from '@features/contentlinks/classes/module-list-handler';
 
 const HANDLER_DISABLED = 'core_site_plugins_helper_handler_disabled';
 
@@ -886,9 +889,8 @@ export class CoreSitePluginsHelperProvider {
         const uniqueName = CoreSitePlugins.getHandlerUniqueName(plugin, handlerName);
         const modName = (handlerSchema.moodlecomponent || plugin.component).replace('mod_', '');
 
-        CoreCourseModuleDelegate.registerHandler(
-            new CoreSitePluginsModuleHandler(uniqueName, modName, plugin, handlerSchema, initResult),
-        );
+        const moduleHandler = new CoreSitePluginsModuleHandler(uniqueName, modName, plugin, handlerSchema, initResult);
+        CoreCourseModuleDelegate.registerHandler(moduleHandler);
 
         if (handlerSchema.offlinefunctions && Object.keys(handlerSchema.offlinefunctions).length) {
             // Register the prefetch handler.
@@ -897,6 +899,19 @@ export class CoreSitePluginsHelperProvider {
             );
         }
 
+        // Create default link handlers if needed.
+        if (!moduleHandler.supportsNoViewLink() && handlerSchema.method && !handlerSchema.nolinkhandlers) {
+            const indexLinkHandler = new CoreContentLinksModuleIndexHandler(uniqueName, modName);
+            indexLinkHandler.name = uniqueName + '_indexlink';
+            indexLinkHandler.priority = -1; // Use -1 to give more priority to the plugins link handlers if any.
+            CoreContentLinksDelegate.registerHandler(indexLinkHandler);
+
+            const listLinkHandler = new CoreContentLinksModuleListHandler(uniqueName, modName);
+            listLinkHandler.name = uniqueName + '_listlink';
+            listLinkHandler.priority = -1; // Use -1 to give more priority to the plugins link handlers if any.
+            CoreContentLinksDelegate.registerHandler(listLinkHandler);
+        }
+
         return uniqueName;
     }
 
diff --git a/src/core/features/siteplugins/services/siteplugins.ts b/src/core/features/siteplugins/services/siteplugins.ts
index bc7a572b5..e0aa2e9d5 100644
--- a/src/core/features/siteplugins/services/siteplugins.ts
+++ b/src/core/features/siteplugins/services/siteplugins.ts
@@ -846,6 +846,7 @@ export type CoreSitePluginsCourseModuleHandlerData = CoreSitePluginsHandlerCommo
     ptrenabled?: boolean;
     supportedfeatures?: Record<string, unknown>;
     manualcompletionalwaysshown?: boolean;
+    nolinkhandlers?: boolean;
 };
 
 /**

From e05526f911fc8a172a9abfc83e9a7c5146737014 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 29 Jul 2021 10:43:19 +0200
Subject: [PATCH 0011/1008] MOBILE-3775 course: Fix PTR not updating contents
 in some resources

---
 src/addons/mod/book/components/index/index.ts |  3 +-
 .../mod/imscp/components/index/index.ts       |  3 +-
 src/addons/mod/page/components/index/index.ts |  3 +-
 .../mod/resource/components/index/index.ts    |  6 ++-
 .../course/classes/main-resource-component.ts | 37 +++++++++++--------
 .../features/course/services/course-helper.ts |  2 +
 .../services/module-prefetch-delegate.ts      |  2 +-
 7 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/src/addons/mod/book/components/index/index.ts b/src/addons/mod/book/components/index/index.ts
index 76c994b86..9473a677c 100644
--- a/src/addons/mod/book/components/index/index.ts
+++ b/src/addons/mod/book/components/index/index.ts
@@ -186,7 +186,8 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
                 // Ignore errors, they're handled inside the loadChapter function.
             }
         } finally {
-            this.fillContextMenu(refresh);
+            // Pass false because downloadResourceIfNeeded already invalidates and refresh data if refresh=true.
+            this.fillContextMenu(false);
         }
     }
 
diff --git a/src/addons/mod/imscp/components/index/index.ts b/src/addons/mod/imscp/components/index/index.ts
index 83c8e976f..b6c6e301b 100644
--- a/src/addons/mod/imscp/components/index/index.ts
+++ b/src/addons/mod/imscp/components/index/index.ts
@@ -117,7 +117,8 @@ export class AddonModImscpIndexComponent extends CoreCourseModuleMainResourceCom
             this.warning = downloadResult!.failed ? this.getErrorDownloadingSomeFilesMessage(downloadResult!.error!) : '';
 
         } finally {
-            this.fillContextMenu(refresh);
+            // Pass false because downloadResourceIfNeeded already invalidates and refresh data if refresh=true.
+            this.fillContextMenu(false);
         }
     }
 
diff --git a/src/addons/mod/page/components/index/index.ts b/src/addons/mod/page/components/index/index.ts
index d8d3cdb61..acfedd74b 100644
--- a/src/addons/mod/page/components/index/index.ts
+++ b/src/addons/mod/page/components/index/index.ts
@@ -143,7 +143,8 @@ export class AddonModPageIndexComponent extends CoreCourseModuleMainResourceComp
 
             await Promise.all(promises);
         } finally {
-            this.fillContextMenu(refresh);
+            // Pass false because downloadResourceIfNeeded already invalidates and refresh data if refresh=true.
+            this.fillContextMenu(false);
         }
     }
 
diff --git a/src/addons/mod/resource/components/index/index.ts b/src/addons/mod/resource/components/index/index.ts
index aca96abae..11f4241c2 100644
--- a/src/addons/mod/resource/components/index/index.ts
+++ b/src/addons/mod/resource/components/index/index.ts
@@ -114,6 +114,7 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
 
         let resource: AddonModResourceResource | CoreCourseWSModule | undefined;
         let options: AddonModResourceCustomData = {};
+        let hasCalledDownloadResource = false;
 
         // Get the resource instance to get the latest name/description and to know if it's embedded.
         if (this.canGetResource) {
@@ -133,6 +134,8 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
             }
 
             if (AddonModResourceHelper.isDisplayedInIframe(this.module)) {
+                hasCalledDownloadResource = true;
+
                 const downloadResult = await this.downloadResourceIfNeeded(refresh, true);
                 const src = await AddonModResourceHelper.getIframeSrc(this.module);
                 this.mode = 'iframe';
@@ -174,7 +177,8 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
                 this.isStreamedFile = CoreMimetypeUtils.isStreamedMimetype(mimetype);
             }
         } finally {
-            this.fillContextMenu(refresh);
+            // Pass false in some cases because downloadResourceIfNeeded already invalidates and refresh data if refresh=true.
+            this.fillContextMenu(hasCalledDownloadResource ? false : refresh);
         }
     }
 
diff --git a/src/core/features/course/classes/main-resource-component.ts b/src/core/features/course/classes/main-resource-component.ts
index 287435b87..3fb59518a 100644
--- a/src/core/features/course/classes/main-resource-component.ts
+++ b/src/core/features/course/classes/main-resource-component.ts
@@ -321,28 +321,33 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
     /**
      * Watch for changes on the status.
      *
+     * @param refresh Whether we're refreshing data.
      * @return Promise resolved when done.
      */
-    protected async setStatusListener(): Promise<void> {
-        if (typeof this.statusObserver != 'undefined') {
+    protected async setStatusListener(refresh?: boolean): Promise<void> {
+        if (this.statusObserver === undefined) {
+            // Listen for changes on this module status.
+            this.statusObserver = CoreEvents.on(CoreEvents.PACKAGE_STATUS_CHANGED, (data) => {
+                if (data.componentId != this.module.id || data.component != this.component) {
+                    return;
+                }
+
+                // The status has changed, update it.
+                const previousStatus = this.currentStatus;
+                this.currentStatus = data.status;
+
+                this.showStatus(this.currentStatus, previousStatus);
+            }, this.siteId);
+        } else if (!refresh) {
             return;
         }
 
-        // Listen for changes on this module status.
-        this.statusObserver = CoreEvents.on(CoreEvents.PACKAGE_STATUS_CHANGED, (data) => {
-            if (data.componentId != this.module.id || data.component != this.component) {
-                return;
-            }
-
-            // The status has changed, update it.
-            const previousStatus = this.currentStatus;
-            this.currentStatus = data.status;
-
-            this.showStatus(this.currentStatus, previousStatus);
-        }, this.siteId);
+        if (refresh) {
+            await CoreUtils.ignoreErrors(CoreCourseModulePrefetchDelegate.invalidateCourseUpdates(this.courseId));
+        }
 
         // Also, get the current status.
-        const status = await CoreCourseModulePrefetchDelegate.getModuleStatus(this.module, this.courseId);
+        const status = await CoreCourseModulePrefetchDelegate.getModuleStatus(this.module, this.courseId, undefined, refresh);
 
         this.currentStatus = status;
         this.showStatus(status);
@@ -366,7 +371,7 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
         };
 
         // Get module status to determine if it needs to be downloaded.
-        await this.setStatusListener();
+        await this.setStatusListener(refresh);
 
         if (this.currentStatus != CoreConstants.DOWNLOADED) {
             // Download content. This function also loads module contents if needed.
diff --git a/src/core/features/course/services/course-helper.ts b/src/core/features/course/services/course-helper.ts
index d4127950e..b50ee641d 100644
--- a/src/core/features/course/services/course-helper.ts
+++ b/src/core/features/course/services/course-helper.ts
@@ -1397,6 +1397,8 @@ export class CoreCourseHelperProvider {
         const siteId = CoreSites.getCurrentSiteId();
 
         if (invalidateCache) {
+            // Currently, some modules pass invalidateCache=false because they already invalidate data in downloadResourceIfNeeded.
+            // If this function is changed to do more actions if invalidateCache=true, please review those modules.
             CoreCourseModulePrefetchDelegate.invalidateModuleStatusCache(module);
         }
 
diff --git a/src/core/features/course/services/module-prefetch-delegate.ts b/src/core/features/course/services/module-prefetch-delegate.ts
index 04d7fbc4c..8ee32560d 100644
--- a/src/core/features/course/services/module-prefetch-delegate.ts
+++ b/src/core/features/course/services/module-prefetch-delegate.ts
@@ -546,7 +546,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
      * @param courseId Course ID the module belongs to.
      * @param updates Result of getCourseUpdates for all modules in the course. If not provided, it will be
      *                calculated (slower). If it's false it means the site doesn't support check updates.
-     * @param refresh True if it should ignore the cache.
+     * @param refresh True if it should ignore the memory cache, not the WS cache.
      * @param sectionId ID of the section the module belongs to.
      * @return Promise resolved with the status.
      */

From 30b2c9af4f2effc6f0a0dab12a9992c8d688b0ff Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Mon, 2 Aug 2021 13:27:15 +0200
Subject: [PATCH 0012/1008] MOBILE-3825 DX: Fix ionic:serve hook

---
 package.json     |  2 +-
 scripts/serve.sh | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100755 scripts/serve.sh

diff --git a/package.json b/package.json
index 01beb7354..7758f7bdc 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
     "test:coverage": "NODE_ENV=testing gulp && jest --coverage",
     "lint": "NODE_OPTIONS=--max-old-space-size=4096 ng lint",
     "ionic:serve:before": "gulp",
-    "ionic:serve": "gulp watch & NODE_OPTIONS=--max-old-space-size=4096 ng serve",
+    "ionic:serve": "./scripts/serve.sh",
     "ionic:build:before": "gulp"
   },
   "dependencies": {
diff --git a/scripts/serve.sh b/scripts/serve.sh
new file mode 100755
index 000000000..393ebc86f
--- /dev/null
+++ b/scripts/serve.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# This script is necessary because @ionic/cli is passing one argument to the ionic:serve hook
+# that is unsupported by angular cli: https://github.com/ionic-team/ionic-cli/issues/4743
+#
+# Once the issue is fixed, this script can be replaced adding the following npm script:
+#
+#     "ionic:serve": "gulp watch & NODE_OPTIONS=--max-old-space-size=4096 ng serve"
+#
+
+# Run gulp watch.
+echo "> gulp watch &"
+gulp watch &
+
+# Remove unknown arguments and prepare angular target.
+args=("$@")
+angulartarget="serve"
+total=${#args[@]}
+for ((i=0; i<total; ++i)); do
+    case ${args[i]} in
+        --project=*)
+            unset args[i];
+            ;;
+        --platform=*)
+            angulartarget="ionic-cordova-serve";
+            ;;
+    esac
+done
+
+# Serve app.
+echo "> NODE_OPTIONS=--max-old-space-size=4096 ng run app:$angulartarget ${args[@]}"
+NODE_OPTIONS=--max-old-space-size=4096 ng run "app:$angulartarget" ${args[@]}

From 98a8feb2ea915ebfc51cc6dbfbe9c40c869a3259 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 3 Aug 2021 09:43:25 +0200
Subject: [PATCH 0013/1008] MOBILE-3711 styles: Some style fixes

Reverted 6822e0246f96c58af5d0984bd8243bb22891fdcc since it broke some
styles the problem on the original commit was an ion-item without
ion-label
---
 src/core/components/combobox/combobox.scss        | 1 +
 src/core/features/sitehome/pages/index/index.html | 4 ++--
 src/theme/components/format-text.scss             | 5 ++++-
 src/theme/theme.base.scss                         | 8 ++++----
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/core/components/combobox/combobox.scss b/src/core/components/combobox/combobox.scss
index 1de608344..950503000 100644
--- a/src/core/components/combobox/combobox.scss
+++ b/src/core/components/combobox/combobox.scss
@@ -99,6 +99,7 @@ ion-button {
         font-weight: 400;
         font-size: 16px;
         line-height: 20px;
+        border-radius: 0;
     }
 
     .select-text {
diff --git a/src/core/features/sitehome/pages/index/index.html b/src/core/features/sitehome/pages/index/index.html
index 799dede96..9ee1cac42 100644
--- a/src/core/features/sitehome/pages/index/index.html
+++ b/src/core/features/sitehome/pages/index/index.html
@@ -21,8 +21,8 @@
                     <!-- Site home main contents. -->
                     <ng-container *ngIf="section && section.hasContent">
                         <ion-item class="ion-text-wrap" *ngIf="section.summary">
-                            <core-format-text [text]="section.summary" contextLevel="course" [contextInstanceId]="siteHomeId">
-                            </core-format-text>
+                            <ion-label><core-format-text [text]="section.summary" contextLevel="course" [contextInstanceId]="siteHomeId">
+                            </core-format-text></ion-label>
                         </ion-item>
 
                         <core-course-module *ngFor="let module of section.modules" [module]="module" [courseId]="siteHomeId"
diff --git a/src/theme/components/format-text.scss b/src/theme/components/format-text.scss
index 0e617a2b8..eee01ca1f 100644
--- a/src/theme/components/format-text.scss
+++ b/src/theme/components/format-text.scss
@@ -16,11 +16,12 @@ body.dark core-format-text {
 }
 
 core-format-text {
-    display: block;
+    display: contents;
 
     .core-format-text-loader {
         opacity: 0;
         @include core-transition(opacity, 200ms);
+        display: contents;
     }
 
     &.core-format-text-loading {
@@ -31,6 +32,7 @@ core-format-text {
         background-color: rgba(0,0,0,.1);
         overflow: hidden;
         border-radius: 5px;
+        display: block;
 
         .core-format-text-loader {
             position: absolute;
@@ -66,6 +68,7 @@ core-format-text {
 
     &[maxHeight],
     &[ng-reflect-max-height] {
+        display: block;
         position: relative;
         width: 100%;
         overflow: hidden;
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index f18cc6ad5..d2825f348 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -466,7 +466,7 @@ ion-toolbar {
 
         border-bottom: 3px solid var(--color-base);
 
-        ion-item::part(native) {
+        ion-item {
             --inner-border-width: 0;
         }
         ion-label {
@@ -480,9 +480,9 @@ ion-toolbar {
     .item.core-#{$color-name}-item {
         --color-base: var(--ion-color-#{$color-name});
 
-        --inner-border-width: 0 0 3px 0;
-        --border-width: 0;
-        border-bottom: 3px solid var(--color-base) !important;
+        --border-width: 0 0 3px 0;
+        --border-color: var(--color-base);
+        --inner-border-width: 0;
         ion-icon {
             color: var(--color-base);
         }

From c03866cba4be6b50dfd425cf21fa6fefc8f53135 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 22 Jul 2021 17:24:55 +0200
Subject: [PATCH 0014/1008] MOBILE-3831 DX: Migrate cordova plugins to npm

---
 package-lock.json  | 91 +++++++++++++++++++++++-----------------------
 package.json       | 29 +++++++--------
 tsconfig.app.json  |  4 +-
 tsconfig.json      |  4 +-
 tsconfig.test.json |  4 +-
 5 files changed, 65 insertions(+), 67 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 89128236b..513cc3cb2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3752,6 +3752,39 @@
         }
       }
     },
+    "@moodlehq/cordova-plugin-file-transfer": {
+      "version": "1.7.1-moodle.2",
+      "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-file-transfer/-/cordova-plugin-file-transfer-1.7.1-moodle.2.tgz",
+      "integrity": "sha512-nvddQelAwPXmvjv0YJJwuf2xFNi78ZmTa47BgtHGebOvdKpmcbphkOQAVN7KMheL4J3KNE9DbMBHwEHkGGkH4g=="
+    },
+    "@moodlehq/cordova-plugin-inappbrowser": {
+      "version": "5.0.0-moodle.2",
+      "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-inappbrowser/-/cordova-plugin-inappbrowser-5.0.0-moodle.2.tgz",
+      "integrity": "sha512-0JOLHUFEJC3fv4OQuyr2kwNyrb7oeyjmfFLQ+LcKO41e6UOnNy/du0hU7Yz9Rh8B2zGcebvSwMrN+cRSCqlipQ=="
+    },
+    "@moodlehq/cordova-plugin-local-notification": {
+      "version": "0.9.0-moodle.2",
+      "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-local-notification/-/cordova-plugin-local-notification-0.9.0-moodle.2.tgz",
+      "integrity": "sha512-enK/jcbXrnSFJt8TS2drb/5uUOpsTYbUqjI3pYgvogKdP5k5JOnT0xtW54Arlpl5RphcINx733OuXHRJAED2Ow=="
+    },
+    "@moodlehq/cordova-plugin-qrscanner": {
+      "version": "3.0.1-moodle.2",
+      "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-qrscanner/-/cordova-plugin-qrscanner-3.0.1-moodle.2.tgz",
+      "integrity": "sha512-bjMI94QTEaUOl5TbK8K+HZI3gcR8HHfYTocsA1/C1HMKD3nROhGtwvuVDNvb+ogknv9WVQDyGnfMAnNihYH+PQ==",
+      "requires": {
+        "qrcode-reader": "^1.0.4",
+        "webrtc-adapter": "^3.1.4"
+      }
+    },
+    "@moodlehq/phonegap-plugin-push": {
+      "version": "2.2.3-moodle.1",
+      "resolved": "https://registry.npmjs.org/@moodlehq/phonegap-plugin-push/-/phonegap-plugin-push-2.2.3-moodle.1.tgz",
+      "integrity": "sha512-LxHz0nPIvxhRgjvj8QRTdhuMtb+NNbFsaAh7JS6q9Ag0lt3LkKrGwCoMr/rTfhfCLj+mrIhyLUv/mo8oPmHeeg==",
+      "requires": {
+        "babel-plugin-add-header-comment": "^1.0.3",
+        "install": "^0.8.2"
+      }
+    },
     "@netflix/nerror": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/@netflix/nerror/-/nerror-1.1.3.tgz",
@@ -4034,14 +4067,6 @@
       "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
       "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
     },
-    "@types/cordova-plugin-file-transfer": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/@types/cordova-plugin-file-transfer/-/cordova-plugin-file-transfer-1.6.2.tgz",
-      "integrity": "sha512-jWZQefyVn/GiQAdummRoY1v5cUY4dT7GNk3Hg40iUtL68y40jKWD3ALAtMM4pnYt9RSMTlsgs1I7/apXexddvw==",
-      "requires": {
-        "cordova-plugin-file-transfer": "*"
-      }
-    },
     "@types/dom-mediacapture-record": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/@types/dom-mediacapture-record/-/dom-mediacapture-record-1.0.7.tgz",
@@ -8062,10 +8087,6 @@
       "resolved": "https://registry.npmjs.org/cordova-plugin-file-opener2/-/cordova-plugin-file-opener2-3.0.5.tgz",
       "integrity": "sha512-tjLHDamH5+y0bJZYVe2967L1S4R8tL4Y0rJUzJGoxsyiw3FUlrJNS199POOpzZZ6Xhlntn9a2o7+84r1dMN21A=="
     },
-    "cordova-plugin-file-transfer": {
-      "version": "git+https://github.com/moodlemobile/cordova-plugin-file-transfer.git#648b57792f2f33ffc9da6d2fa020d26a48799048",
-      "from": "git+https://github.com/moodlemobile/cordova-plugin-file-transfer.git"
-    },
     "cordova-plugin-geolocation": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/cordova-plugin-geolocation/-/cordova-plugin-geolocation-4.1.0.tgz",
@@ -8076,10 +8097,6 @@
       "resolved": "https://registry.npmjs.org/cordova-plugin-globalization/-/cordova-plugin-globalization-1.11.0.tgz",
       "integrity": "sha1-6sMVgQAphJOvowvolA5pj2HvvP4="
     },
-    "cordova-plugin-inappbrowser": {
-      "version": "git+https://github.com/moodlemobile/cordova-plugin-inappbrowser.git#a1ac936fd79596fd5841bd424cc782ee84e4a290",
-      "from": "git+https://github.com/moodlemobile/cordova-plugin-inappbrowser.git#moodle-ionic5"
-    },
     "cordova-plugin-ionic-keyboard": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/cordova-plugin-ionic-keyboard/-/cordova-plugin-ionic-keyboard-2.2.0.tgz",
@@ -8090,10 +8107,6 @@
       "resolved": "https://registry.npmjs.org/cordova-plugin-ionic-webview/-/cordova-plugin-ionic-webview-5.0.0.tgz",
       "integrity": "sha512-Wq0kCanxubK/JroTW4Mp5soayScnRyiY1eCkbwiz1Dyt1xHOiOW/v+1miqtBHtnZhcXw25TulCKAVJzkNBdmyg=="
     },
-    "cordova-plugin-local-notification": {
-      "version": "git+https://github.com/moodlemobile/cordova-plugin-local-notification.git#0bb96b757fb484553ceabf35a59802f7983a2836",
-      "from": "git+https://github.com/moodlemobile/cordova-plugin-local-notification.git#moodle"
-    },
     "cordova-plugin-media": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/cordova-plugin-media/-/cordova-plugin-media-5.0.3.tgz",
@@ -8110,17 +8123,9 @@
       "integrity": "sha512-NwO3qDBNL/vJxUxBTPNOA1HvkDf9eTeGH8JSZiwy1jq2W2mJKQEDBwqWkaEQS19Yd/MQTiw0cykxg5D7u4J6cQ=="
     },
     "cordova-plugin-prevent-override": {
-      "version": "git+https://github.com/moodlemobile/cordova-plugin-prevent-override.git#49507eda3c929e488e58b8402cfc7e1521ebc400",
-      "from": "git+https://github.com/moodlemobile/cordova-plugin-prevent-override.git",
-      "dev": true
-    },
-    "cordova-plugin-qrscanner": {
-      "version": "git+https://github.com/moodlemobile/cordova-plugin-qrscanner.git#857efee3a7a49104faabd108ff1f00a57d3aca94",
-      "from": "git+https://github.com/moodlemobile/cordova-plugin-qrscanner.git#dist",
-      "requires": {
-        "qrcode-reader": "^1.0.4",
-        "webrtc-adapter": "^3.1.4"
-      }
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-prevent-override/-/cordova-plugin-prevent-override-1.0.0.tgz",
+      "integrity": "sha512-/+3q5r4K5RahCpiYVmZQBjq10x4jj+6CMjYtZyx9jdMWeV+yFE+ItFcO1NeUAEWd2iHC5YPD0P2tHiHx5kscsw=="
     },
     "cordova-plugin-screen-orientation": {
       "version": "3.0.2",
@@ -8143,12 +8148,14 @@
       "integrity": "sha512-EYC5eQFVkoYXq39l7tYKE6lEjHJ04mvTmKXxGL7quHLdFPfJMNzru/UYpn92AOfpl3PQaZmou78C7EgmFOwFQQ=="
     },
     "cordova-plugin-wkuserscript": {
-      "version": "git+https://github.com/moodlemobile/cordova-plugin-wkuserscript.git#aa77d0f98a3fb106f2e798e5adf5882f01a2c947",
-      "from": "git+https://github.com/moodlemobile/cordova-plugin-wkuserscript.git"
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-wkuserscript/-/cordova-plugin-wkuserscript-1.0.0.tgz",
+      "integrity": "sha512-g18TohV1T+iWQJImYUCZc44x2ywHTH3ycgEJyxo4WTL9eYm4T7lNkyl1svzQGI97e8W5hQxUqAcmvpVcnWvjSQ=="
     },
     "cordova-plugin-wkwebview-cookies": {
-      "version": "git+https://github.com/moodlemobile/cordova-plugin-wkwebview-cookies.git#8c3a289e29b33edecff15f470c1630baf4ec3e88",
-      "from": "git+https://github.com/moodlemobile/cordova-plugin-wkwebview-cookies.git"
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-wkwebview-cookies/-/cordova-plugin-wkwebview-cookies-1.0.0.tgz",
+      "integrity": "sha512-bQRnc/1UNu2XDb6ds+RuAZGA8FM2MuQb4z45J/CaDfjSs60OSvxGVKo3okrM/okYosZqWJFygrPah0MK3lDERQ=="
     },
     "cordova-plugin-zip": {
       "version": "3.1.0",
@@ -8181,9 +8188,9 @@
       "integrity": "sha512-dTBxYaX/RGzH6+pp49o4sb3FuHCvhrssaKn1XMJ4LL3f9dnvz3rhFK2LdcWrdFkhOLOndnW/azUkbzZd+WWhRA=="
     },
     "cordova-support-google-services": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/cordova-support-google-services/-/cordova-support-google-services-1.3.2.tgz",
-      "integrity": "sha512-RtEWzULreUX662MFWopGhFispLiHX7gUf2GijPOC2mY2oCNuUobj2mO4tl5q7PYbOreSxq+PrSekhmS6TAAWdw=="
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/cordova-support-google-services/-/cordova-support-google-services-1.2.1.tgz",
+      "integrity": "sha512-EnFjKAE9oI2uzyUvEfWpLgTM200nuJVvShaA4yyz9wMKBUN+H/BRG1byd1ibZz3sSihNKi3FxjQPxmmEn6/IfA=="
     },
     "cordova.plugins.diagnostic": {
       "version": "5.0.2",
@@ -17308,14 +17315,6 @@
       "resolved": "https://registry.npmjs.org/phonegap-plugin-multidex/-/phonegap-plugin-multidex-1.0.0.tgz",
       "integrity": "sha512-1wvc3iQOQpEBaQbXgLxA2JUiLSQ2azdF/bF29ghXDiQJWSpQ1BF8gSuqttM8WZoj081Ps8OKL0gYxdDBkFNPqA=="
     },
-    "phonegap-plugin-push": {
-      "version": "git+https://github.com/moodlemobile/phonegap-plugin-push.git#cb332d5ec8a1a0d43916fc6d35455fe6bea7a7f9",
-      "from": "git+https://github.com/moodlemobile/phonegap-plugin-push.git#moodle-v3",
-      "requires": {
-        "babel-plugin-add-header-comment": "^1.0.3",
-        "install": "^0.8.2"
-      }
-    },
     "picomatch": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
diff --git a/package.json b/package.json
index 01beb7354..1025d3190 100644
--- a/package.json
+++ b/package.json
@@ -71,11 +71,15 @@
     "@ionic-native/web-intent": "5.33.0",
     "@ionic-native/zip": "5.33.0",
     "@ionic/angular": "5.6.6",
+    "@moodlehq/cordova-plugin-file-transfer": "1.7.1-moodle.2",
+    "@moodlehq/cordova-plugin-inappbrowser": "5.0.0-moodle.2",
+    "@moodlehq/cordova-plugin-local-notification": "0.9.0-moodle.2",
+    "@moodlehq/cordova-plugin-qrscanner": "3.0.1-moodle.2",
+    "@moodlehq/phonegap-plugin-push": "2.2.3-moodle.1",
     "@ngx-translate/core": "13.0.0",
     "@ngx-translate/http-loader": "6.0.0",
     "@types/chart.js": "2.9.31",
     "@types/cordova": "0.0.34",
-    "@types/cordova-plugin-file-transfer": "1.6.2",
     "@types/dom-mediacapture-record": "1.0.7",
     "chart.js": "2.9.4",
     "com-darryncampbell-cordova-plugin-intent": "1.3.0",
@@ -93,26 +97,23 @@
     "cordova-plugin-device": "2.0.3",
     "cordova-plugin-file": "6.0.2",
     "cordova-plugin-file-opener2": "3.0.5",
-    "cordova-plugin-file-transfer": "git+https://github.com/moodlemobile/cordova-plugin-file-transfer.git",
     "cordova-plugin-geolocation": "4.1.0",
     "cordova-plugin-globalization": "1.11.0",
-    "cordova-plugin-inappbrowser": "git+https://github.com/moodlemobile/cordova-plugin-inappbrowser.git#moodle-ionic5",
     "cordova-plugin-ionic-keyboard": "2.2.0",
     "cordova-plugin-ionic-webview": "5.0.0",
-    "cordova-plugin-local-notification": "git+https://github.com/moodlemobile/cordova-plugin-local-notification.git#moodle",
     "cordova-plugin-media": "5.0.3",
     "cordova-plugin-media-capture": "3.0.3",
     "cordova-plugin-network-information": "2.0.2",
-    "cordova-plugin-qrscanner": "git+https://github.com/moodlemobile/cordova-plugin-qrscanner.git#dist",
+    "cordova-plugin-prevent-override": "1.0.0",
     "cordova-plugin-screen-orientation": "3.0.2",
     "cordova-plugin-splashscreen": "6.0.0",
     "cordova-plugin-statusbar": "2.4.3",
     "cordova-plugin-whitelist": "1.3.4",
-    "cordova-plugin-wkuserscript": "git+https://github.com/moodlemobile/cordova-plugin-wkuserscript.git",
-    "cordova-plugin-wkwebview-cookies": "git+https://github.com/moodlemobile/cordova-plugin-wkwebview-cookies.git",
+    "cordova-plugin-wkuserscript": "1.0.0",
+    "cordova-plugin-wkwebview-cookies": "1.0.0",
     "cordova-plugin-zip": "3.1.0",
     "cordova-sqlite-storage": "6.0.0",
-    "cordova-support-google-services": "1.3.2",
+    "cordova-support-google-services": "1.2.1",
     "cordova.plugins.diagnostic": "5.0.2",
     "core-js": "3.9.1",
     "es6-promise-plugin": "4.2.2",
@@ -121,7 +122,6 @@
     "moment": "2.29.0",
     "nl.kingsquare.cordova.background-audio": "1.0.1",
     "phonegap-plugin-multidex": "1.0.0",
-    "phonegap-plugin-push": "git+https://github.com/moodlemobile/phonegap-plugin-push.git#moodle-v3",
     "rxjs": "6.5.5",
     "ts-md5": "1.2.7",
     "tslib": "2.0.1",
@@ -148,7 +148,6 @@
     "@typescript-eslint/eslint-plugin": "4.22.0",
     "@typescript-eslint/parser": "4.22.0",
     "check-es-compat": "1.1.1",
-    "cordova-plugin-prevent-override": "git+https://github.com/moodlemobile/cordova-plugin-prevent-override.git",
     "eslint": "7.25.0",
     "eslint-config-prettier": "8.3.0",
     "eslint-plugin-header": "3.1.1",
@@ -203,10 +202,10 @@
       "cordova-plugin-geolocation": {
         "GPS_REQUIRED": "false"
       },
-      "cordova-plugin-inappbrowser": {},
+      "@moodlehq/cordova-plugin-inappbrowser": {},
       "cordova-plugin-ionic-keyboard": {},
       "cordova-plugin-ionic-webview": {},
-      "cordova-plugin-local-notification": {
+      "@moodlehq/cordova-plugin-local-notification": {
         "ANDROID_SUPPORT_V4_VERSION": "26.+"
       },
       "cordova-plugin-media-capture": {},
@@ -214,7 +213,7 @@
         "KEEP_AVAUDIOSESSION_ALWAYS_ACTIVE": "NO"
       },
       "cordova-plugin-network-information": {},
-      "cordova-plugin-qrscanner": {},
+      "@moodlehq/cordova-plugin-qrscanner": {},
       "cordova-plugin-screen-orientation": {},
       "cordova-plugin-splashscreen": {},
       "cordova-plugin-statusbar": {},
@@ -223,7 +222,7 @@
       "cordova-plugin-wkwebview-cookies": {},
       "cordova-plugin-zip": {},
       "cordova-sqlite-storage": {},
-      "phonegap-plugin-push": {
+      "@moodlehq/phonegap-plugin-push": {
         "ANDROID_SUPPORT_V13_VERSION": "27.+",
         "FCM_VERSION": "17.0.+"
       },
@@ -236,7 +235,7 @@
         "ANDROID_SUPPORT_VERSION": "28.+"
       },
       "cordova-plugin-globalization": {},
-      "cordova-plugin-file-transfer": {},
+      "@moodlehq/cordova-plugin-file-transfer": {},
       "cordova-plugin-prevent-override": {}
     }
   },
diff --git a/tsconfig.app.json b/tsconfig.app.json
index 67b984831..fec951fbe 100644
--- a/tsconfig.app.json
+++ b/tsconfig.app.json
@@ -3,8 +3,8 @@
   "compilerOptions": {
     "outDir": "./out-tsc/app",
     "types": [
-      "cordova-plugin-file-transfer",
-      "cordova-plugin-inappbrowser",
+      "@moodlehq/cordova-plugin-file-transfer",
+      "@moodlehq/cordova-plugin-inappbrowser",
       "cordova",
       "dom-mediacapture-record",
       "node",
diff --git a/tsconfig.json b/tsconfig.json
index 700301d46..d617cbf05 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -20,8 +20,8 @@
       "dom"
     ],
     "types": [
-        "cordova-plugin-file-transfer",
-        "cordova-plugin-inappbrowser",
+        "@moodlehq/cordova-plugin-file-transfer",
+        "@moodlehq/cordova-plugin-inappbrowser",
         "cordova",
         "dom-mediacapture-record",
         "faker",
diff --git a/tsconfig.test.json b/tsconfig.test.json
index 58fd560d7..96425dace 100644
--- a/tsconfig.test.json
+++ b/tsconfig.test.json
@@ -6,8 +6,8 @@
     "esModuleInterop": true,
     "emitDecoratorMetadata": true,
     "types": [
-      "cordova-plugin-file-transfer",
-      "cordova-plugin-inappbrowser",
+      "@moodlehq/cordova-plugin-file-transfer",
+      "@moodlehq/cordova-plugin-inappbrowser",
       "cordova",
       "dom-mediacapture-record",
       "faker",

From 85ac2b0bb54ecff1bdffc82129717a7754c325a1 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 2 Aug 2021 15:58:33 +0200
Subject: [PATCH 0015/1008] MOBILE-3799 h5p: Let teachers view users attempts
 in activity

---
 scripts/langindex.json                        |   4 +
 .../index/addon-mod-h5pactivity-index.html    |   4 +
 .../mod/h5pactivity/components/index/index.ts |  20 +-
 .../h5pactivity/h5pactivity-lazy.module.ts    |   5 +
 src/addons/mod/h5pactivity/lang.json          |   6 +-
 .../pages/user-attempts/user-attempts.html    |   2 +-
 .../pages/users-attempts/users-attempts.html  |  70 +++++
 .../users-attempts/users-attempts.module.ts   |  38 +++
 .../pages/users-attempts/users-attempts.ts    | 202 ++++++++++++++
 .../mod/h5pactivity/services/h5pactivity.ts   | 255 ++++++++++++++++--
 .../h5pactivity/services/handlers/prefetch.ts |  23 +-
 11 files changed, 602 insertions(+), 27 deletions(-)
 create mode 100644 src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.html
 create mode 100644 src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.module.ts
 create mode 100644 src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.ts

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 57ee82499..df750b6bf 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -681,6 +681,7 @@
   "addon.mod_h5pactivity.attempt_success_fail": "h5pactivity",
   "addon.mod_h5pactivity.attempt_success_pass": "h5pactivity",
   "addon.mod_h5pactivity.attempt_success_unknown": "h5pactivity",
+  "addon.mod_h5pactivity.attempts": "h5pactivity",
   "addon.mod_h5pactivity.attempts_none": "h5pactivity",
   "addon.mod_h5pactivity.completion": "h5pactivity",
   "addon.mod_h5pactivity.downloadh5pfile": "local_moodlemobileapp",
@@ -692,12 +693,15 @@
   "addon.mod_h5pactivity.modulenameplural": "h5pactivity",
   "addon.mod_h5pactivity.myattempts": "h5pactivity",
   "addon.mod_h5pactivity.no_compatible_track": "h5pactivity",
+  "addon.mod_h5pactivity.noparticipants": "h5pactivity",
   "addon.mod_h5pactivity.offlinedisabledwarning": "local_moodlemobileapp",
   "addon.mod_h5pactivity.outcome": "h5pactivity",
   "addon.mod_h5pactivity.previewmode": "h5pactivity",
   "addon.mod_h5pactivity.result_fill-in": "h5pactivity",
   "addon.mod_h5pactivity.result_other": "h5pactivity",
+  "addon.mod_h5pactivity.review_attempts": "local_moodlemobileapp",
   "addon.mod_h5pactivity.review_my_attempts": "h5pactivity",
+  "addon.mod_h5pactivity.review_user_attempts": "h5pactivity",
   "addon.mod_h5pactivity.score": "h5pactivity",
   "addon.mod_h5pactivity.score_out_of": "h5pactivity",
   "addon.mod_h5pactivity.startdate": "h5pactivity",
diff --git a/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html b/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
index a3a164dfb..f88b40b88 100644
--- a/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
+++ b/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
@@ -5,6 +5,10 @@
             [priority]="1000" [content]="'addon.mod_h5pactivity.review_my_attempts' | translate" (action)="viewMyAttempts()"
             iconAction="stats-chart">
         </core-context-menu-item>
+        <core-context-menu-item *ngIf="canViewAllAttempts"
+            [priority]="1000" [content]="'addon.mod_h5pactivity.review_attempts' | translate" (action)="viewAllAttempts()"
+            iconAction="stats-chart">
+        </core-context-menu-item>
         <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
             [href]="externalUrl" iconAction="fas-external-link-alt">
         </core-context-menu-item>
diff --git a/src/addons/mod/h5pactivity/components/index/index.ts b/src/addons/mod/h5pactivity/components/index/index.ts
index e2f69620e..37989271f 100644
--- a/src/addons/mod/h5pactivity/components/index/index.ts
+++ b/src/addons/mod/h5pactivity/components/index/index.ts
@@ -79,6 +79,7 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
     trackComponent?: string; // Component for tracking.
     hasOffline = false;
     isOpeningPage = false;
+    canViewAllAttempts = false;
 
     protected listeningResize = false;
     protected fetchContentDefaultError = 'addon.mod_h5pactivity.errorgetactivity';
@@ -137,6 +138,8 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
             ]);
 
             this.trackComponent = this.accessInfo?.cansubmit ? AddonModH5PActivityProvider.TRACK_COMPONENT : '';
+            this.canViewAllAttempts = !!this.h5pActivity.enabletracking && !!this.accessInfo?.canreviewattempts &&
+                AddonModH5PActivity.canGetUsersAttemptsInSite();
 
             if (this.h5pActivity.package && this.h5pActivity.package[0]) {
                 // The online player should use the original file, not the trusted one.
@@ -377,7 +380,7 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
     }
 
     /**
-     * Go to view user events.
+     * Go to view user attempts.
      */
     async viewMyAttempts(): Promise<void> {
         this.isOpeningPage = true;
@@ -392,6 +395,21 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
         }
     }
 
+    /**
+     * Go to view all user attempts.
+     */
+    async viewAllAttempts(): Promise<void> {
+        this.isOpeningPage = true;
+
+        try {
+            await CoreNavigator.navigateToSitePath(
+                `${AddonModH5PActivityModuleHandlerService.PAGE_NAME}/${this.courseId}/${this.module.id}/users`,
+            );
+        } finally {
+            this.isOpeningPage = false;
+        }
+    }
+
     /**
      * Treat an iframe message event.
      *
diff --git a/src/addons/mod/h5pactivity/h5pactivity-lazy.module.ts b/src/addons/mod/h5pactivity/h5pactivity-lazy.module.ts
index 477958871..3ac3e9562 100644
--- a/src/addons/mod/h5pactivity/h5pactivity-lazy.module.ts
+++ b/src/addons/mod/h5pactivity/h5pactivity-lazy.module.ts
@@ -36,6 +36,11 @@ const routes: Routes = [
         loadChildren: () => import('./pages/attempt-results/attempt-results.module')
             .then( m => m.AddonModH5PActivityAttemptResultsPageModule),
     },
+    {
+        path: ':courseId/:cmId/users',
+        loadChildren: () => import('./pages/users-attempts/users-attempts.module')
+            .then( m => m.AddonModH5PActivityUsersAttemptsPageModule),
+    },
 ];
 
 @NgModule({
diff --git a/src/addons/mod/h5pactivity/lang.json b/src/addons/mod/h5pactivity/lang.json
index 3ac109635..55044c8dd 100644
--- a/src/addons/mod/h5pactivity/lang.json
+++ b/src/addons/mod/h5pactivity/lang.json
@@ -11,6 +11,7 @@
     "attempt_success_fail": "Fail",
     "attempt_success_pass": "Pass",
     "attempt_success_unknown": "Not reported",
+    "attempts": "Attempts",
     "attempts_none": "This user has no attempts to display.",
     "completion": "Completion",
     "downloadh5pfile": "Download H5P file",
@@ -22,15 +23,18 @@
     "modulenameplural": "H5P",
     "myattempts": "My attempts",
     "no_compatible_track": "This interaction ({{$a}}) does not provide tracking information or the tracking\n        provided is not compatible with the current activity version.",
+    "noparticipants": "No participants to display",
     "offlinedisabledwarning": "You need to be online to view the H5P package.",
     "outcome": "Outcome",
     "previewmode": "This content is displayed in preview mode. No attempt tracking will be stored.",
     "result_fill-in": "Fill-in text",
     "result_other": "Unknown interaction type",
+    "review_attempts": "View all attempts",
     "review_my_attempts": "View my attempts",
+    "review_user_attempts": "View user attempts ({{$a}})",
     "score": "Score",
     "score_out_of": "{{$a.rawscore}} out of {{$a.maxscore}}",
     "startdate": "Start date",
     "totalscore": "Total score",
     "viewattempt": "View attempt {{$a}}"
-}
\ No newline at end of file
+}
diff --git a/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.html b/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.html
index 01bcfe080..31ca8fcd6 100644
--- a/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.html
+++ b/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.html
@@ -17,7 +17,7 @@
     <core-loading [hideUntil]="loaded">
         <!-- User viewed. -->
         <ion-item class="ion-text-wrap" *ngIf="user && !isCurrentUser" core-user-link [userId]="user.id" [courseId]="courseId"
-            [attr.aria-label]="user.fullname">
+            [attr.aria-label]="user.fullname" button detail="true">
             <core-user-avatar [user]="user" slot="start" [courseId]="courseId"></core-user-avatar>
             <ion-label>
                 <h2>{{ user.fullname }}</h2>
diff --git a/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.html b/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.html
new file mode 100644
index 000000000..15a9557e6
--- /dev/null
+++ b/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.html
@@ -0,0 +1,70 @@
+<ion-header>
+    <ion-toolbar>
+        <ion-buttons slot="start">
+            <ion-back-button [text]="'core.back' | translate"></ion-back-button>
+        </ion-buttons>
+        <h1>
+            <core-format-text *ngIf="h5pActivity" [text]="h5pActivity.name" contextLevel="module"
+                [contextInstanceId]="h5pActivity.coursemodule" [courseId]="courseId">
+            </core-format-text>
+        </h1>
+    </ion-toolbar>
+</ion-header>
+<ion-content>
+    <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="doRefresh($event.target)">
+        <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
+    </ion-refresher>
+    <core-loading [hideUntil]="loaded">
+        <ion-list *ngIf="users.length">
+            <!-- "Header" of the table -->
+            <ion-item class="addon-mod_h5pactivity-table-header hide-detail font-bold" detail="true">
+                <ion-label>
+                    <ion-row class="ion-align-items-center">
+                        <ion-col class="ion-text-center" size="4">{{ 'core.user' | translate }}</ion-col>
+                        <ion-col class="ion-text-center" size="4">{{ 'core.date' | translate }}</ion-col>
+                        <ion-col class="ion-text-center" size="2">{{ 'addon.mod_h5pactivity.score' | translate }}</ion-col>
+                        <ion-col class="ion-text-center" size="2">{{ 'addon.mod_h5pactivity.attempts' | translate }}</ion-col>
+                    </ion-row>
+                </ion-label>
+            </ion-item>
+
+            <!-- List of users. -->
+            <ion-item class="ion-text-wrap addon-mod_h5pactivity-table-row" *ngFor="let user of users" detail="true" button
+                [attr.aria-label]="'addon.mod_h5pactivity.review_user_attempts' | translate:{$a: user.attempts.length}"
+                (click)="openUser(user)">
+
+                <ion-label>
+                    <ion-row class="ion-align-items-center">
+                        <ion-col class="ion-text-center" size="4">
+                            <p>
+                                <core-user-avatar [user]="user.user" [courseId]="courseId"></core-user-avatar>
+                            </p>
+                            {{ user.user.fullname }}
+                        </ion-col>
+                        <ion-col class="ion-text-center" size="4">
+                            <span *ngIf="user.attempts.length">
+                                {{ user.attempts[user.attempts.length - 1].timemodified | coreFormatDate:'strftimedatetimeshort' }}
+                            </span>
+                        </ion-col>
+                        <ion-col class="ion-text-center" size="2">
+                            <span *ngIf="user.score !== undefined">
+                                {{ 'core.percentagenumber' | translate: {$a: user.score} }}
+                            </span>
+                        </ion-col>
+                        <ion-col class="ion-text-center" size="2">
+                            <span *ngIf="user.attempts.length">{{user.attempts.length}}</span>
+                        </ion-col>
+                    </ion-row>
+                </ion-label>
+            </ion-item>
+        </ion-list>
+
+        <!-- No attempts. -->
+        <core-empty-box *ngIf="!users.length && !canLoadMore" icon="fas-chart-bar"
+            [message]="'addon.mod_h5pactivity.noparticipants' | translate">
+        </core-empty-box>
+
+        <core-infinite-loading [enabled]="loaded && canLoadMore" [error]="fetchMoreUsersFailed" (action)="fetchMoreUsers($event)">
+        </core-infinite-loading>
+    </core-loading>
+</ion-content>
diff --git a/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.module.ts b/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.module.ts
new file mode 100644
index 000000000..c09f58954
--- /dev/null
+++ b/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.module.ts
@@ -0,0 +1,38 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { RouterModule, Routes } from '@angular/router';
+
+import { CoreSharedModule } from '@/core/shared.module';
+import { AddonModH5PActivityUsersAttemptsPage } from './users-attempts';
+
+const routes: Routes = [
+    {
+        path: '',
+        component: AddonModH5PActivityUsersAttemptsPage,
+    },
+];
+
+@NgModule({
+    imports: [
+        RouterModule.forChild(routes),
+        CoreSharedModule,
+    ],
+    declarations: [
+        AddonModH5PActivityUsersAttemptsPage,
+    ],
+    exports: [RouterModule],
+})
+export class AddonModH5PActivityUsersAttemptsPageModule {}
diff --git a/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.ts b/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.ts
new file mode 100644
index 000000000..7dee400fe
--- /dev/null
+++ b/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.ts
@@ -0,0 +1,202 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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, OnInit } from '@angular/core';
+import { CoreUser, CoreUserProfile } from '@features/user/services/user';
+import { IonRefresher } from '@ionic/angular';
+
+import { CoreNavigator } from '@services/navigator';
+import { CoreDomUtils } from '@services/utils/dom';
+import { CoreUtils } from '@services/utils/utils';
+import {
+    AddonModH5PActivity,
+    AddonModH5PActivityData,
+    AddonModH5PActivityProvider,
+    AddonModH5PActivityUserAttempts,
+} from '../../services/h5pactivity';
+
+/**
+ * Page that displays all users that can attempt an H5P activity.
+ */
+@Component({
+    selector: 'page-addon-mod-h5pactivity-users-attempts',
+    templateUrl: 'users-attempts.html',
+})
+export class AddonModH5PActivityUsersAttemptsPage implements OnInit {
+
+    loaded = false;
+    courseId!: number;
+    cmId!: number;
+    h5pActivity?: AddonModH5PActivityData;
+    users: AddonModH5PActivityUserAttemptsFormatted[] = [];
+    fetchMoreUsersFailed = false;
+    canLoadMore = false;
+
+    protected page = 0;
+
+    /**
+     * @inheritdoc
+     */
+    async ngOnInit(): Promise<void> {
+        this.courseId = CoreNavigator.getRouteNumberParam('courseId')!;
+        this.cmId = CoreNavigator.getRouteNumberParam('cmId')!;
+
+        try {
+            await this.fetchData();
+
+            await AddonModH5PActivity.logViewReport(this.h5pActivity!.id, this.h5pActivity!.name);
+        } catch (error) {
+            CoreDomUtils.showErrorModalDefault(error, 'Error loading attempts.');
+        } finally {
+            this.loaded = true;
+        }
+    }
+
+    /**
+     * Refresh the data.
+     *
+     * @param refresher Refresher.
+     */
+    doRefresh(refresher: IonRefresher): void {
+        this.refreshData().finally(() => {
+            refresher.complete();
+        });
+    }
+
+    /**
+     * Get quiz data and attempt data.
+     *
+     * @param refresh Whether user is refreshing data.
+     * @return Promise resolved when done.
+     */
+    protected async fetchData(refresh?: boolean): Promise<void> {
+        this.h5pActivity = await AddonModH5PActivity.getH5PActivity(this.courseId, this.cmId);
+
+        await Promise.all([
+            this.fetchUsers(refresh),
+        ]);
+    }
+
+    /**
+     * Get users.
+     *
+     * @param refresh Whether user is refreshing data.
+     * @return Promise resolved when done.
+     */
+    protected async fetchUsers(refresh?: boolean): Promise<void> {
+        if (refresh) {
+            this.page = 0;
+        }
+
+        const result = await AddonModH5PActivity.getUsersAttempts(this.h5pActivity!.id, {
+            cmId: this.cmId,
+            page: this.page,
+        });
+
+        const formattedUsers = await this.formatUsers(result.users);
+
+        if (this.page === 0) {
+            this.users = formattedUsers;
+        } else {
+            this.users = this.users.concat(formattedUsers);
+        }
+
+        this.canLoadMore = result.canLoadMore;
+        this.page++;
+    }
+
+    /**
+     * Format users data.
+     *
+     * @param users Users to format.
+     * @return Formatted users.
+     */
+    protected async formatUsers(users: AddonModH5PActivityUserAttempts[]): Promise<AddonModH5PActivityUserAttemptsFormatted[]> {
+        return await Promise.all(users.map(async (user: AddonModH5PActivityUserAttemptsFormatted) => {
+            user.user = await CoreUser.getProfile(user.userid, this.courseId, true);
+
+            // Calculate the score of the user.
+            if (this.h5pActivity!.grademethod === AddonModH5PActivityProvider.GRADEMANUAL) {
+                // No score.
+            } else if (this.h5pActivity!.grademethod === AddonModH5PActivityProvider.GRADEAVERAGEATTEMPT) {
+                if (user.attempts.length) {
+                    // Calculate the average.
+                    const sumScores = user.attempts.reduce((sumScores, attempt) =>
+                        sumScores + attempt.rawscore * 100 / attempt.maxscore, 0);
+
+                    user.score = Math.round(sumScores / user.attempts.length);
+                }
+            } else if (user.scored?.attempts[0]) {
+                // Only a single attempt used to calculate the grade. Use it.
+                user.score = Math.round(user.scored.attempts[0].rawscore * 100 / user.scored.attempts[0].maxscore);
+            }
+
+            return user;
+        }));
+    }
+
+    /**
+     * Load a new batch of users.
+     *
+     * @param complete Completion callback.
+     */
+    async fetchMoreUsers(complete: () => void): Promise<void> {
+        try {
+            await this.fetchUsers(false);
+        } catch (error) {
+            CoreDomUtils.showErrorModalDefault(error, 'Error loading more users');
+
+            this.fetchMoreUsersFailed = true;
+        }
+
+        complete();
+    }
+
+    /**
+     * Refresh the data.
+     *
+     * @return Promise resolved when done.
+     */
+    protected async refreshData(): Promise<void> {
+        const promises = [
+            AddonModH5PActivity.invalidateActivityData(this.courseId),
+        ];
+
+        if (this.h5pActivity) {
+            promises.push(AddonModH5PActivity.invalidateAllUsersAttempts(this.h5pActivity.id));
+        }
+
+        await CoreUtils.ignoreErrors(Promise.all(promises));
+
+        await this.fetchData(true);
+    }
+
+    /**
+     * Open the page to view a user attempts.
+     *
+     * @param user User to open.
+     */
+    openUser(user: AddonModH5PActivityUserAttemptsFormatted): void {
+        CoreNavigator.navigate(`../userattempts/${user.userid}`);
+    }
+
+}
+
+/**
+ * User attempts data with some calculated data.
+ */
+type AddonModH5PActivityUserAttemptsFormatted = AddonModH5PActivityUserAttempts & {
+    user?: CoreUserProfile;
+    score?: number;
+};
diff --git a/src/addons/mod/h5pactivity/services/h5pactivity.ts b/src/addons/mod/h5pactivity/services/h5pactivity.ts
index 28927c099..7f16095fc 100644
--- a/src/addons/mod/h5pactivity/services/h5pactivity.ts
+++ b/src/addons/mod/h5pactivity/services/h5pactivity.ts
@@ -38,6 +38,40 @@ export class AddonModH5PActivityProvider {
 
     static readonly COMPONENT = 'mmaModH5PActivity';
     static readonly TRACK_COMPONENT = 'mod_h5pactivity'; // Component for tracking.
+    static readonly USERS_PER_PAGE = 20;
+
+    // Grade type constants.
+    static readonly GRADEMANUAL = 0; // No automathic grading using attempt results.
+    static readonly GRADEHIGHESTATTEMPT = 1; // Use highest attempt results for grading.
+    static readonly GRADEAVERAGEATTEMPT = 2; // Use average attempt results for grading.
+    static readonly GRADELASTATTEMPT = 3; // Use last attempt results for grading.
+    static readonly GRADEFIRSTATTEMPT = 4; // Use first attempt results for grading.
+
+    /**
+     * Check if a certain site allows viewing list of users and their attempts.
+     *
+     * @param site Site ID. If not defined, use current site.
+     * @return Whether can view users.
+     * @since 3.11
+     */
+    async canGetUsersAttempts(siteId?: string): Promise<boolean> {
+        const site = await CoreSites.getSite(siteId);
+
+        return this.canGetUsersAttemptsInSite(site);
+    }
+
+    /**
+     * Check if a certain site allows viewing list of users and their attempts.
+     *
+     * @param site Site. If not defined, use current site.
+     * @return Whether can view users.
+     * @since 3.11
+     */
+    canGetUsersAttemptsInSite(site?: CoreSite): boolean {
+        site = site || CoreSites.getCurrentSite();
+
+        return !!site?.wsAvailable('mod_h5pactivity_get_user_attempts');
+    }
 
     /**
      * Format an attempt's data.
@@ -168,6 +202,122 @@ export class AddonModH5PActivityProvider {
         }
     }
 
+    /**
+     * Get all pages of users attempts.
+     *
+     * @param id Activity ID.
+     * @param options Other options.
+     * @return Promise resolved with the list of user.
+     */
+    async getAllUsersAttempts(
+        id: number,
+        options?: AddonModH5PActivityGetAllUsersAttemptsOptions,
+    ): Promise<AddonModH5PActivityUserAttempts[]> {
+
+        const optionsWithPage: AddonModH5PActivityGetAllUsersAttemptsOptions = {
+            ...options,
+            page: 0,
+        };
+        let canLoadMore = true;
+        let users: AddonModH5PActivityUserAttempts[] = [];
+
+        while (canLoadMore) {
+            try {
+                const result = await this.getUsersAttempts(id, optionsWithPage);
+
+                optionsWithPage.page = optionsWithPage.page! + 1;
+                users = users.concat(result.users);
+                canLoadMore = result.canLoadMore;
+            } catch (error) {
+                if (optionsWithPage.dontFailOnError) {
+                    return users;
+                }
+
+                throw error;
+            }
+        }
+
+        return users;
+    }
+
+    /**
+     * Get list of users and their attempts.
+     *
+     * @param id H5P Activity ID.
+     * @param options Options.
+     * @return Promise resolved with list of users and whether can load more attempts.
+     * @since 3.11
+     */
+    async getUsersAttempts(
+        id: number,
+        options?: AddonModH5PActivityGetUsersAttemptsOptions,
+    ): Promise<{users: AddonModH5PActivityUserAttempts[]; canLoadMore: boolean}> {
+        options = options || {};
+        options.page = options.page || 0;
+        options.perPage = options.perPage ?? AddonModH5PActivityProvider.USERS_PER_PAGE;
+
+        const site = await CoreSites.getSite(options.siteId);
+
+        const params: AddonModH5pactivityGetUserAttemptsWSParams = {
+            h5pactivityid: id,
+            page: options.page,
+            perpage: options.perPage === 0 ? 0 : options.perPage + 1, // Get 1 more to be able to know if there are more to load.
+            sortorder: options.sortOrder,
+            firstinitial: options.firstInitial,
+            lastinitial: options.lastInitial,
+        };
+        const preSets: CoreSiteWSPreSets = {
+            cacheKey: this.getUsersAttemptsCacheKey(id, options),
+            updateFrequency: CoreSite.FREQUENCY_SOMETIMES,
+            component: AddonModH5PActivityProvider.COMPONENT,
+            componentId: options.cmId,
+            ...CoreSites.getReadingStrategyPreSets(options.readingStrategy), // Include reading strategy preSets.
+        };
+
+        const response = await site.read<AddonModH5pactivityGetUserAttemptsWSResponse>(
+            'mod_h5pactivity_get_user_attempts',
+            params,
+            preSets,
+        );
+
+        if (response.warnings?.[0]) {
+            throw new CoreWSError(response.warnings[0]);
+        }
+
+        let canLoadMore = false;
+        if (options.perPage > 0) {
+            canLoadMore = response.usersattempts.length > options.perPage;
+            response.usersattempts = response.usersattempts.slice(0, options.perPage);
+        }
+
+        return {
+            canLoadMore: canLoadMore,
+            users: response.usersattempts.map(userAttempts => this.formatUserAttempts(userAttempts)),
+        };
+    }
+
+    /**
+     * Get cache key for get users attempts WS calls.
+     *
+     * @param id Instance ID.
+     * @param attemptsIds Attempts IDs.
+     * @return Cache key.
+     */
+    protected getUsersAttemptsCacheKey(id: number, options: AddonModH5PActivityGetUsersAttemptsOptions): string {
+        return this.getUsersAttemptsCommonCacheKey(id) + `:${options.page}:${options.perPage}` +
+            `:${options.sortOrder || ''}:${options.firstInitial || ''}:${options.lastInitial || ''}`;
+    }
+
+    /**
+     * Get common cache key for get users attempts WS calls.
+     *
+     * @param id Instance ID.
+     * @return Cache key.
+     */
+    protected getUsersAttemptsCommonCacheKey(id: number): string {
+        return ROOT_CACHE_KEY + 'userAttempts:' + id;
+    }
+
     /**
      * Get cache key for results WS calls.
      *
@@ -455,26 +605,56 @@ export class AddonModH5PActivityProvider {
     ): Promise<AddonModH5PActivityUserAttempts> {
 
         const site = await CoreSites.getSite(options.siteId);
+        const userId = options.userId || site.getUserId();
 
-        const params: AddonModH5pactivityGetAttemptsWSParams = {
-            h5pactivityid: id,
-            userids: [options.userId || site.getUserId()],
-        };
-        const preSets: CoreSiteWSPreSets = {
-            cacheKey: this.getUserAttemptsCacheKey(id, params.userids!),
-            updateFrequency: CoreSite.FREQUENCY_SOMETIMES,
-            component: AddonModH5PActivityProvider.COMPONENT,
-            componentId: options.cmId,
-            ...CoreSites.getReadingStrategyPreSets(options.readingStrategy), // Include reading strategy preSets.
-        };
+        try {
+            const params: AddonModH5pactivityGetAttemptsWSParams = {
+                h5pactivityid: id,
+                userids: [userId],
+            };
+            const preSets: CoreSiteWSPreSets = {
+                cacheKey: this.getUserAttemptsCacheKey(id, params.userids!),
+                updateFrequency: CoreSite.FREQUENCY_SOMETIMES,
+                component: AddonModH5PActivityProvider.COMPONENT,
+                componentId: options.cmId,
+                ...CoreSites.getReadingStrategyPreSets(options.readingStrategy), // Include reading strategy preSets.
+            };
 
-        const response = await site.read<AddonModH5pactivityGetAttemptsWSResponse>('mod_h5pactivity_get_attempts', params, preSets);
+            const response = await site.read<AddonModH5pactivityGetAttemptsWSResponse>(
+                'mod_h5pactivity_get_attempts',
+                params,
+                preSets,
+            );
 
-        if (response.warnings?.[0]) {
-            throw new CoreWSError(response.warnings[0]); // Cannot view user attempts.
+            if (response.warnings?.[0]) {
+                throw new CoreWSError(response.warnings[0]); // Cannot view user attempts.
+            }
+
+            return this.formatUserAttempts(response.usersattempts[0]);
+        } catch (error) {
+            if (CoreUtils.isWebServiceError(error)) {
+                throw error;
+            }
+
+            try {
+                // Check if the full list of users is cached. If so, get the user attempts from there.
+                const users = await this.getAllUsersAttempts(id, {
+                    ...options,
+                    readingStrategy: CoreSitesReadingStrategy.ONLY_CACHE,
+                    dontFailOnError: true,
+                });
+
+                const user = users.find(user => user.userid === userId);
+                if (!user) {
+                    throw error;
+                }
+
+                return this.formatUserAttempts(user);
+            } catch {
+                throw error;
+            }
         }
 
-        return this.formatUserAttempts(response.usersattempts[0]);
     }
 
     /**
@@ -532,16 +712,16 @@ export class AddonModH5PActivityProvider {
     }
 
     /**
-     * Invalidates all users attempts for H5P activity.
+     * Invalidates list of users for H5P activity.
      *
      * @param id Activity ID.
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when the data is invalidated.
      */
-    async invalidateAllUserAttempts(id: number, siteId?: string): Promise<void> {
+    async invalidateAllUsersAttempts(id: number, siteId?: string): Promise<void> {
         const site = await CoreSites.getSite(siteId);
 
-        await site.invalidateWsCacheForKey(this.getUserAttemptsCommonCacheKey(id));
+        await site.invalidateWsCacheForKeyStartingWith(this.getUsersAttemptsCommonCacheKey(id));
     }
 
     /**
@@ -896,6 +1076,45 @@ export type AddonModH5PActivityViewReportOptions = {
     siteId?: string; // Site ID. If not defined, current site.
 };
 
+/**
+ * Params of mod_h5pactivity_get_user_attempts WS.
+ */
+export type AddonModH5pactivityGetUserAttemptsWSParams = {
+    h5pactivityid: number; // H5p activity instance id.
+    sortorder?: string; // Sort by this element: id, firstname.
+    page?: number; // Current page.
+    perpage?: number; // Items per page.
+    firstinitial?: string; // Users whose first name starts with firstinitial.
+    lastinitial?: string; // Users whose last name starts with lastinitial.
+};
+
+/**
+ * Data returned by mod_h5pactivity_get_user_attempts WS.
+ */
+export type AddonModH5pactivityGetUserAttemptsWSResponse = {
+    activityid: number; // Activity course module ID.
+    usersattempts: AddonModH5PActivityWSUserAttempts[]; // The complete users attempts list.
+    warnings?: CoreWSExternalWarning[];
+};
+
+/**
+ * Options for getUsersAttempts.
+ */
+export type AddonModH5PActivityGetUsersAttemptsOptions = CoreCourseCommonModWSOptions & {
+    sortOrder?: string; // Sort by this element: id, firstname.
+    page?: number; // Current page. Defaults to 0.
+    perPage?: number; // Items per page. Defaults to USERS_PER_PAGE.
+    firstInitial?: string; // Users whose first name starts with firstInitial.
+    lastInitial?: string; // Users whose last name starts with lastInitial.
+};
+
+/**
+ * Options for getAllUsersAttempts.
+ */
+export type AddonModH5PActivityGetAllUsersAttemptsOptions = AddonModH5PActivityGetUsersAttemptsOptions & {
+    dontFailOnError?: boolean; // If true the function will return the users it's able to retrieve, until a call fails.
+};
+
 declare module '@singletons/events' {
 
     /**
diff --git a/src/addons/mod/h5pactivity/services/handlers/prefetch.ts b/src/addons/mod/h5pactivity/services/handlers/prefetch.ts
index df1f199ef..14ecc15cb 100644
--- a/src/addons/mod/h5pactivity/services/handlers/prefetch.ts
+++ b/src/addons/mod/h5pactivity/services/handlers/prefetch.ts
@@ -147,20 +147,31 @@ export class AddonModH5PActivityPrefetchHandlerService extends CoreCourseActivit
             siteId,
         });
 
+        const options = {
+            cmId: h5pActivity.coursemodule,
+            readingStrategy: CoreSitesReadingStrategy.ONLY_NETWORK,
+            siteId: siteId,
+        };
+
         if (!accessInfo.canreviewattempts) {
             // Not a teacher, prefetch user attempts and the current user profile.
             const site = await CoreSites.getSite(siteId);
 
-            const options = {
-                cmId: h5pActivity.coursemodule,
-                readingStrategy: CoreSitesReadingStrategy.ONLY_NETWORK,
-                siteId: siteId,
-            };
-
             await Promise.all([
                 AddonModH5PActivity.getAllAttemptsResults(h5pActivity.id, options),
                 CoreUser.prefetchProfiles([site.getUserId()], h5pActivity.course, siteId),
             ]);
+        } else {
+            // It's a teacher, get all attempts if possible.
+            const canGetUsers = await AddonModH5PActivity.canGetUsersAttempts(siteId);
+            if (!canGetUsers) {
+                return;
+            }
+
+            const users = await AddonModH5PActivity.getAllUsersAttempts(h5pActivity.id, options);
+
+            const userIds = users.map(user => user.userid);
+            await CoreUser.prefetchProfiles(userIds, h5pActivity.course, siteId);
         }
     }
 

From eefcd491405c5f54a9b717446324a3992b13c281 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 3 Aug 2021 12:14:47 +0200
Subject: [PATCH 0016/1008] MOBILE-3832 core: Fix infinite calls if error on
 infinite loading

---
 src/core/components/infinite-loading/infinite-loading.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/components/infinite-loading/infinite-loading.ts b/src/core/components/infinite-loading/infinite-loading.ts
index 994f6ea43..33eb9d81b 100644
--- a/src/core/components/infinite-loading/infinite-loading.ts
+++ b/src/core/components/infinite-loading/infinite-loading.ts
@@ -69,7 +69,7 @@ export class CoreInfiniteLoadingComponent implements OnChanges {
      * like the Ionic component does.
      */
     protected async checkScrollDistance(): Promise<void> {
-        if (!this.enabled) {
+        if (!this.enabled || this.error || this.loadingMore) {
             return;
         }
 

From 23a5b5b8a4c2c2207e0cc35e235a3621dd9f3179 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 3 Aug 2021 09:44:14 +0200
Subject: [PATCH 0017/1008] MOBILE-3711 quiz: Add classes to some quiz messages
 on index

---
 .../index/addon-mod-quiz-index.html           | 41 +++++++++++--------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
index 39e77b870..40a465a46 100644
--- a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
+++ b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
@@ -45,13 +45,13 @@
             </ion-item>
             <ion-item class="ion-text-wrap" *ngIf="gradeMethodReadable">
                 <ion-label>
-                    <h3>{{ 'addon.mod_quiz.grademethod' | translate }}</h3>
+                    <p class="item-heading">{{ 'addon.mod_quiz.grademethod' | translate }}</p>
                     <p>{{ gradeMethodReadable }}</p>
                 </ion-label>
             </ion-item>
             <ion-item class="ion-text-wrap" *ngIf="bestGrade && bestGrade.gradetopass && quiz && quiz.gradeFormatted">
                 <ion-label>
-                    <h3>{{ 'core.grades.gradepass' | translate }}</h3>
+                    <p class="item-heading">{{ 'core.grades.gradepass' | translate }}</p>
                     <p>{{ 'addon.mod_quiz.outof' | translate: { $a: {
                         grade: bestGrade.gradetopass,
                         maxgrade: quiz.gradeFormatted
@@ -60,7 +60,7 @@
             </ion-item>
             <ion-item class="ion-text-wrap" *ngIf="syncTime">
                 <ion-label>
-                    <h3>{{ 'core.lastsync' | translate }}</h3>
+                    <p class="item-heading">{{ 'core.lastsync' | translate }}</p>
                     <p>{{ syncTime }}</p>
                 </ion-label>
             </ion-item>
@@ -141,7 +141,7 @@
             </ion-item>
             <ion-item class="ion-text-wrap" *ngIf="gradebookFeedback">
                 <ion-label>
-                    <h3 class="item-heading">{{ 'addon.mod_quiz.comment' | translate }}</h3>
+                    <p class="item-heading">{{ 'addon.mod_quiz.comment' | translate }}</p>
                     <p><core-format-text [component]="component" [componentId]="componentId" [text]="gradebookFeedback"
                         contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
                     </core-format-text></p>
@@ -149,7 +149,7 @@
             </ion-item>
             <ion-item class="ion-text-wrap" *ngIf="quiz.showFeedbackColumn && overallFeedback">
                 <ion-label>
-                    <h3 class="item-heading">{{ 'addon.mod_quiz.overallfeedback' | translate }}</h3>
+                    <p class="item-heading">{{ 'addon.mod_quiz.overallfeedback' | translate }}</p>
                     <p><core-format-text [component]="component" [componentId]="componentId" [text]="overallFeedback"
                         contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
                     </core-format-text></p>
@@ -162,28 +162,35 @@
     <ion-card *ngIf="quiz">
         <ion-list>
             <!-- Error messages. -->
-            <ion-item class="ion-text-wrap core-danger-item" *ngFor="let message of preventMessages">
+            <ion-item class="ion-text-wrap core-danger-item addon-mod_quiz-prevent-messages" *ngFor="let message of preventMessages">
                 <ion-label><p>{{ message }}</p></ion-label>
             </ion-item>
-            <ion-item class="ion-text-wrap core-danger-item" *ngIf="quiz.hasquestions === 0">
+            <ion-item class="ion-text-wrap core-danger-item addon-mod_quiz-no-questions" *ngIf="quiz.hasquestions === 0">
                 <ion-label><p>{{ 'addon.mod_quiz.noquestions' | translate }}</p></ion-label>
             </ion-item>
-            <ion-item class="ion-text-wrap core-danger-item" *ngIf="!hasSupportedQuestions && unsupportedQuestions.length">
+            <ion-item class="ion-text-wrap core-danger-item addon-mod_quiz-unsupported-questions"
+                *ngIf="!hasSupportedQuestions && unsupportedQuestions.length">
                 <ion-label>
-                    <p>{{ 'addon.mod_quiz.errorquestionsnotsupported' | translate }}</p>
-                    <p *ngFor="let type of unsupportedQuestions">{{ type }}</p>
+                    <p class="item-heading">{{ 'addon.mod_quiz.errorquestionsnotsupported' | translate }}</p>
+                    <p *ngFor="let type of unsupportedQuestions"
+                        class="addon-mod_quiz-unsupported-question addon-mod_quiz-unsupported-question-{{type}}">
+                        {{ type }}
+                    </p>
                 </ion-label>
             </ion-item>
-            <ion-item class="ion-text-wrap core-danger-item" *ngIf="unsupportedRules.length">
+            <ion-item class="ion-text-wrap core-danger-item addon-mod_quiz-unsupported-rules" *ngIf="unsupportedRules.length">
                 <ion-label>
-                    <p>{{ 'addon.mod_quiz.errorrulesnotsupported' | translate }}</p>
-                    <p *ngFor="let name of unsupportedRules">{{ name }}</p>
+                    <p class="item-heading">{{ 'addon.mod_quiz.errorrulesnotsupported' | translate }}</p>
+                    <p *ngFor="let name of unsupportedRules"
+                        class="addon-mod_quiz-unsupported-rule addon-mod_quiz-unsupported-rule-{{name}}">
+                        {{ name }}
+                    </p>
                 </ion-label>
             </ion-item>
-            <ion-item class="ion-text-wrap core-danger-item" *ngIf="behaviourSupported === false">
+            <ion-item class="ion-text-wrap core-danger-item addon-mod_quiz-unsupported-behaviours" *ngIf="behaviourSupported === false">
                 <ion-label>
-                    <p>{{ 'addon.mod_quiz.errorbehaviournotsupported' | translate }}</p>
-                    <p>{{ quiz.preferredbehaviour }}</p>
+                    <p class="item-heading">{{ 'addon.mod_quiz.errorbehaviournotsupported' | translate }}</p>
+                    <p class="addon-mod_quiz-unsupported-behaviour">{{ quiz.preferredbehaviour }}</p>
                 </ion-label>
             </ion-item>
 
@@ -198,7 +205,7 @@
             <!-- Other warnings. -->
             <ion-item class="core-warning-item ion-text-wrap" *ngIf="hasSupportedQuestions && unsupportedQuestions.length">
                 <ion-label>
-                    <p>{{ 'addon.mod_quiz.canattemptbutnotsubmit' | translate }}</p>
+                    <p class="item-heading">{{ 'addon.mod_quiz.canattemptbutnotsubmit' | translate }}</p>
                     <p>{{ 'addon.mod_quiz.warningquestionsnotsupported' | translate }}</p>
                     <p *ngFor="let type of unsupportedQuestions">{{ type }}</p>
                 </ion-label>

From 145858310920a3b023c014dc9130ef2134445f33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 26 Jul 2021 15:03:22 +0200
Subject: [PATCH 0018/1008] MOBILE-3792 config: Unlock package versions and
 bump dev version

---
 config.xml         |   2 +-
 moodle.config.json |   4 +-
 package.json       | 252 ++++++++++++++++++++++-----------------------
 3 files changed, 129 insertions(+), 129 deletions(-)

diff --git a/config.xml b/config.xml
index 7d7f7f72b..be368b0a3 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="39501" id="com.moodle.moodlemobile" ios-CFBundleVersion="3.9.5.1" version="3.9.5" versionCode="39501" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-versionCode="39600" id="com.moodle.moodlemobile" ios-CFBundleVersion="3.9.6.0" version="3.9.6-dev" versionCode="39600" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>Moodle</name>
     <description>Moodle official app</description>
     <author email="mobile@moodle.com" href="http://moodle.com">Moodle Mobile team</author>
diff --git a/moodle.config.json b/moodle.config.json
index 79e6c5d38..af5ee4d0d 100644
--- a/moodle.config.json
+++ b/moodle.config.json
@@ -1,8 +1,8 @@
 {
     "app_id": "com.moodle.moodlemobile",
     "appname": "Moodle Mobile",
-    "versioncode": 3950,
-    "versionname": "3.9.5",
+    "versioncode": 3960,
+    "versionname": "3.9.6-dev",
     "cache_update_frequency_usually": 420000,
     "cache_update_frequency_often": 1200000,
     "cache_update_frequency_sometimes": 3600000,
diff --git a/package.json b/package.json
index 64d0a8ad3..9c1d04eed 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "moodlemobile",
-  "version": "3.9.5",
+  "version": "3.9.6-dev",
   "description": "The official app for Moodle.",
   "author": {
     "name": "Moodle Pty Ltd.",
@@ -37,141 +37,141 @@
     "ionic:build:before": "gulp"
   },
   "dependencies": {
-    "@angular/animations": "10.0.14",
-    "@angular/common": "10.0.14",
-    "@angular/core": "10.0.14",
-    "@angular/forms": "10.0.14",
-    "@angular/platform-browser": "10.0.14",
-    "@angular/platform-browser-dynamic": "10.0.14",
-    "@angular/router": "10.0.14",
-    "@ionic-native/badge": "5.33.0",
-    "@ionic-native/camera": "5.33.0",
-    "@ionic-native/chooser": "5.33.0",
-    "@ionic-native/clipboard": "5.33.0",
-    "@ionic-native/core": "5.33.0",
-    "@ionic-native/device": "5.33.0",
-    "@ionic-native/diagnostic": "5.33.0",
-    "@ionic-native/file": "5.33.0",
-    "@ionic-native/file-opener": "5.33.0",
-    "@ionic-native/file-transfer": "5.33.0",
-    "@ionic-native/geolocation": "5.33.0",
-    "@ionic-native/http": "5.33.0",
-    "@ionic-native/in-app-browser": "5.33.0",
-    "@ionic-native/ionic-webview": "5.33.0",
-    "@ionic-native/keyboard": "5.33.0",
-    "@ionic-native/local-notifications": "5.33.0",
-    "@ionic-native/media": "5.33.0",
-    "@ionic-native/media-capture": "5.33.0",
-    "@ionic-native/network": "5.33.0",
-    "@ionic-native/push": "5.33.0",
-    "@ionic-native/qr-scanner": "5.33.0",
-    "@ionic-native/splash-screen": "5.33.0",
-    "@ionic-native/sqlite": "5.33.0",
-    "@ionic-native/status-bar": "5.33.0",
-    "@ionic-native/web-intent": "5.33.0",
-    "@ionic-native/zip": "5.33.0",
-    "@ionic/angular": "5.6.6",
+    "@angular/animations": "~10.0.14",
+    "@angular/common": "~10.0.14",
+    "@angular/core": "~10.0.14",
+    "@angular/forms": "~10.0.14",
+    "@angular/platform-browser": "~10.0.14",
+    "@angular/platform-browser-dynamic": "~10.0.14",
+    "@angular/router": "~10.0.14",
+    "@ionic-native/badge": "^5.33.0",
+    "@ionic-native/camera": "^5.33.0",
+    "@ionic-native/chooser": "^5.33.0",
+    "@ionic-native/clipboard": "^5.33.0",
+    "@ionic-native/core": "^5.33.0",
+    "@ionic-native/device": "^5.33.0",
+    "@ionic-native/diagnostic": "^5.33.0",
+    "@ionic-native/file": "^5.33.0",
+    "@ionic-native/file-opener": "^5.33.0",
+    "@ionic-native/file-transfer": "^5.33.0",
+    "@ionic-native/geolocation": "^5.33.0",
+    "@ionic-native/http": "^5.33.0",
+    "@ionic-native/in-app-browser": "^5.33.0",
+    "@ionic-native/ionic-webview": "^5.33.0",
+    "@ionic-native/keyboard": "^5.33.0",
+    "@ionic-native/local-notifications": "^5.33.0",
+    "@ionic-native/media": "^5.33.0",
+    "@ionic-native/media-capture": "^5.33.0",
+    "@ionic-native/network": "^5.33.0",
+    "@ionic-native/push": "^5.33.0",
+    "@ionic-native/qr-scanner": "^5.33.0",
+    "@ionic-native/splash-screen": "^5.33.0",
+    "@ionic-native/sqlite": "^5.33.0",
+    "@ionic-native/status-bar": "^5.33.0",
+    "@ionic-native/web-intent": "^5.33.0",
+    "@ionic-native/zip": "^5.33.0",
+    "@ionic/angular": "^5.6.6",
     "@moodlehq/cordova-plugin-file-transfer": "1.7.1-moodle.2",
     "@moodlehq/cordova-plugin-inappbrowser": "5.0.0-moodle.2",
     "@moodlehq/cordova-plugin-local-notification": "0.9.0-moodle.2",
     "@moodlehq/cordova-plugin-qrscanner": "3.0.1-moodle.2",
     "@moodlehq/phonegap-plugin-push": "2.2.3-moodle.1",
-    "@ngx-translate/core": "13.0.0",
-    "@ngx-translate/http-loader": "6.0.0",
-    "@types/chart.js": "2.9.31",
+    "@ngx-translate/core": "^13.0.0",
+    "@ngx-translate/http-loader": "^6.0.0",
+    "@types/chart.js": "^2.9.31",
     "@types/cordova": "0.0.34",
-    "@types/dom-mediacapture-record": "1.0.7",
-    "chart.js": "2.9.4",
-    "com-darryncampbell-cordova-plugin-intent": "1.3.0",
-    "cordova": "10.0.0",
-    "cordova-android": "9.1.0",
-    "cordova-android-support-gradle-release": "3.0.1",
-    "cordova-clipboard": "1.3.0",
-    "cordova-ios": "6.2.0",
-    "cordova-plugin-add-swift-support": "2.0.2",
-    "cordova-plugin-advanced-http": "3.1.0",
-    "cordova-plugin-badge": "0.8.8",
-    "cordova-plugin-camera": "5.0.1",
-    "cordova-plugin-chooser": "1.3.2",
-    "cordova-plugin-customurlscheme": "5.0.2",
-    "cordova-plugin-device": "2.0.3",
-    "cordova-plugin-file": "6.0.2",
-    "cordova-plugin-file-opener2": "3.0.5",
-    "cordova-plugin-geolocation": "4.1.0",
-    "cordova-plugin-globalization": "1.11.0",
-    "cordova-plugin-ionic-keyboard": "2.2.0",
-    "cordova-plugin-ionic-webview": "5.0.0",
-    "cordova-plugin-media": "5.0.3",
-    "cordova-plugin-media-capture": "3.0.3",
-    "cordova-plugin-network-information": "2.0.2",
-    "cordova-plugin-prevent-override": "1.0.0",
-    "cordova-plugin-screen-orientation": "3.0.2",
-    "cordova-plugin-splashscreen": "6.0.0",
-    "cordova-plugin-statusbar": "2.4.3",
-    "cordova-plugin-whitelist": "1.3.4",
-    "cordova-plugin-wkuserscript": "1.0.0",
-    "cordova-plugin-wkwebview-cookies": "1.0.0",
-    "cordova-plugin-zip": "3.1.0",
-    "cordova-sqlite-storage": "6.0.0",
-    "cordova-support-google-services": "1.2.1",
-    "cordova.plugins.diagnostic": "5.0.2",
-    "core-js": "3.9.1",
-    "es6-promise-plugin": "4.2.2",
-    "jszip": "3.5.0",
+    "@types/dom-mediacapture-record": "^1.0.7",
+    "chart.js": "^2.9.4",
+    "com-darryncampbell-cordova-plugin-intent": "^1.3.0",
+    "cordova": "^10.0.0",
+    "cordova-android": "^9.1.0",
+    "cordova-android-support-gradle-release": "^3.0.1",
+    "cordova-clipboard": "^1.3.0",
+    "cordova-ios": "^6.2.0",
+    "cordova-plugin-add-swift-support": "^2.0.2",
+    "cordova-plugin-advanced-http": "^3.1.0",
+    "cordova-plugin-badge": "^0.8.8",
+    "cordova-plugin-camera": "^5.0.1",
+    "cordova-plugin-chooser": "^1.3.2",
+    "cordova-plugin-customurlscheme": "^5.0.2",
+    "cordova-plugin-device": "^2.0.3",
+    "cordova-plugin-file": "^6.0.2",
+    "cordova-plugin-file-opener2": "^3.0.5",
+    "cordova-plugin-geolocation": "^4.1.0",
+    "cordova-plugin-globalization": "^1.11.0",
+    "cordova-plugin-ionic-keyboard": "^2.2.0",
+    "cordova-plugin-ionic-webview": "^5.0.0",
+    "cordova-plugin-media": "^5.0.3",
+    "cordova-plugin-media-capture": "^3.0.3",
+    "cordova-plugin-network-information": "^2.0.2",
+    "cordova-plugin-prevent-override": "^1.0.0",
+    "cordova-plugin-screen-orientation": "^3.0.2",
+    "cordova-plugin-splashscreen": "^6.0.0",
+    "cordova-plugin-statusbar": "^2.4.3",
+    "cordova-plugin-whitelist": "^1.3.4",
+    "cordova-plugin-wkuserscript": "^1.0.0",
+    "cordova-plugin-wkwebview-cookies": "^1.0.0",
+    "cordova-plugin-zip": "^3.1.0",
+    "cordova-sqlite-storage": "^6.0.0",
+    "cordova-support-google-services": "^1.2.1",
+    "cordova.plugins.diagnostic": "^5.0.2",
+    "core-js": "^3.9.1",
+    "es6-promise-plugin": "^4.2.2",
+    "jszip": "^3.5.0",
     "mathjax": "2.7.7",
-    "moment": "2.29.0",
-    "nl.kingsquare.cordova.background-audio": "1.0.1",
-    "phonegap-plugin-multidex": "1.0.0",
-    "rxjs": "6.5.5",
-    "ts-md5": "1.2.7",
-    "tslib": "2.0.1",
-    "zone.js": "0.10.3"
+    "moment": "^2.29.0",
+    "nl.kingsquare.cordova.background-audio": "^1.0.1",
+    "phonegap-plugin-multidex": "^1.0.0",
+    "rxjs": "~6.5.5",
+    "ts-md5": "^1.2.7",
+    "tslib": "^2.0.1",
+    "zone.js": "~0.10.3"
   },
   "devDependencies": {
-    "@angular-devkit/architect": "0.1101.2",
-    "@angular-devkit/build-angular": "0.1000.8",
-    "@angular-eslint/builder": "4.2.0",
-    "@angular-eslint/eslint-plugin": "4.2.0",
-    "@angular-eslint/eslint-plugin-template": "4.2.0",
-    "@angular-eslint/schematics": "4.2.0",
-    "@angular-eslint/template-parser": "4.2.0",
-    "@angular/cli": "10.0.8",
-    "@angular/compiler": "10.0.14",
-    "@angular/compiler-cli": "10.0.14",
-    "@angular/language-service": "10.0.14",
-    "@ionic/angular-toolkit": "2.3.3",
-    "@ionic/cli": "6.14.1",
-    "@types/faker": "5.1.3",
-    "@types/node": "12.12.64",
-    "@types/resize-observer-browser": "0.1.5",
-    "@types/webpack-env": "1.16.0",
-    "@typescript-eslint/eslint-plugin": "4.22.0",
-    "@typescript-eslint/parser": "4.22.0",
-    "check-es-compat": "1.1.1",
-    "eslint": "7.25.0",
-    "eslint-config-prettier": "8.3.0",
-    "eslint-plugin-header": "3.1.1",
-    "eslint-plugin-import": "2.22.1",
-    "eslint-plugin-jest": "24.3.6",
-    "eslint-plugin-jsdoc": "32.3.3",
-    "eslint-plugin-prefer-arrow": "1.2.3",
-    "eslint-plugin-promise": "5.1.0",
-    "faker": "5.1.0",
-    "fs-extra": "9.1.0",
+    "@angular-devkit/architect": "~0.1101.2",
+    "@angular-devkit/build-angular": "~0.1000.8",
+    "@angular-eslint/builder": "^4.2.0",
+    "@angular-eslint/eslint-plugin": "^4.2.0",
+    "@angular-eslint/eslint-plugin-template": "^4.2.0",
+    "@angular-eslint/schematics": "^4.2.0",
+    "@angular-eslint/template-parser": "^4.2.0",
+    "@angular/cli": "~10.0.8",
+    "@angular/compiler": "~10.0.14",
+    "@angular/compiler-cli": "~10.0.14",
+    "@angular/language-service": "~10.0.14",
+    "@ionic/angular-toolkit": "^2.3.3",
+    "@ionic/cli": "^6.14.1",
+    "@types/faker": "^5.1.3",
+    "@types/node": "^12.12.64",
+    "@types/resize-observer-browser": "^0.1.5",
+    "@types/webpack-env": "^1.16.0",
+    "@typescript-eslint/eslint-plugin": "^4.22.0",
+    "@typescript-eslint/parser": "^4.22.0",
+    "check-es-compat": "^1.1.1",
+    "eslint": "^7.25.0",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-header": "^3.1.1",
+    "eslint-plugin-import": "^2.22.1",
+    "eslint-plugin-jest": "^24.3.6",
+    "eslint-plugin-jsdoc": "^32.3.3",
+    "eslint-plugin-prefer-arrow": "^1.2.3",
+    "eslint-plugin-promise": "^5.1.0",
+    "faker": "^5.1.0",
+    "fs-extra": "^9.1.0",
     "gulp": "4.0.2",
-    "gulp-clip-empty-files": "0.1.2",
-    "gulp-concat": "2.6.1",
-    "gulp-flatten": "0.4.0",
-    "gulp-htmlmin": "5.0.1",
-    "gulp-rename": "2.0.0",
-    "gulp-slash": "1.1.3",
-    "jest": "26.5.2",
-    "jest-preset-angular": "8.3.1",
-    "jsonc-parser": "2.3.1",
+    "gulp-clip-empty-files": "^0.1.2",
+    "gulp-concat": "^2.6.1",
+    "gulp-flatten": "^0.4.0",
+    "gulp-htmlmin": "^5.0.1",
+    "gulp-rename": "^2.0.0",
+    "gulp-slash": "^1.1.3",
+    "jest": "^26.5.2",
+    "jest-preset-angular": "^8.3.1",
+    "jsonc-parser": "^2.3.1",
     "native-run": "^1.4.0",
-    "ts-jest": "26.4.1",
-    "ts-node": "8.3.0",
-    "typescript": "3.9.9"
+    "ts-jest": "^26.4.1",
+    "ts-node": "~8.3.0",
+    "typescript": "^3.9.9"
   },
   "engines": {
     "node": ">=12.x"
@@ -240,6 +240,6 @@
     }
   },
   "optionalDependencies": {
-    "keytar": "7.2.0"
+    "keytar": "^7.2.0"
   }
 }

From ad4f5d870de631c09669b50374b9dddf9995cc9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 26 Jul 2021 15:07:13 +0200
Subject: [PATCH 0019/1008] MOBILE-3792 config: Autoupdate package lock to
 version 2

---
 package-lock.json | 30672 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 30606 insertions(+), 66 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 513cc3cb2..61c66dc13 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,8 +1,30531 @@
 {
   "name": "moodlemobile",
-  "version": "3.9.5",
-  "lockfileVersion": 1,
+  "version": "3.9.6-dev",
+  "lockfileVersion": 2,
   "requires": true,
+  "packages": {
+    "": {
+      "name": "moodlemobile",
+      "version": "3.9.6-dev",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@angular/animations": "~10.0.14",
+        "@angular/common": "~10.0.14",
+        "@angular/core": "~10.0.14",
+        "@angular/forms": "~10.0.14",
+        "@angular/platform-browser": "~10.0.14",
+        "@angular/platform-browser-dynamic": "~10.0.14",
+        "@angular/router": "~10.0.14",
+        "@ionic-native/badge": "^5.33.0",
+        "@ionic-native/camera": "^5.33.0",
+        "@ionic-native/chooser": "^5.33.0",
+        "@ionic-native/clipboard": "^5.33.0",
+        "@ionic-native/core": "^5.33.0",
+        "@ionic-native/device": "^5.33.0",
+        "@ionic-native/diagnostic": "^5.33.0",
+        "@ionic-native/file": "^5.33.0",
+        "@ionic-native/file-opener": "^5.33.0",
+        "@ionic-native/file-transfer": "^5.33.0",
+        "@ionic-native/geolocation": "^5.33.0",
+        "@ionic-native/http": "^5.33.0",
+        "@ionic-native/in-app-browser": "^5.33.0",
+        "@ionic-native/ionic-webview": "^5.33.0",
+        "@ionic-native/keyboard": "^5.33.0",
+        "@ionic-native/local-notifications": "^5.33.0",
+        "@ionic-native/media": "^5.33.0",
+        "@ionic-native/media-capture": "^5.33.0",
+        "@ionic-native/network": "^5.33.0",
+        "@ionic-native/push": "^5.33.0",
+        "@ionic-native/qr-scanner": "^5.33.0",
+        "@ionic-native/splash-screen": "^5.33.0",
+        "@ionic-native/sqlite": "^5.33.0",
+        "@ionic-native/status-bar": "^5.33.0",
+        "@ionic-native/web-intent": "^5.33.0",
+        "@ionic-native/zip": "^5.33.0",
+        "@ionic/angular": "^5.6.6",
+        "@moodlehq/cordova-plugin-file-transfer": "1.7.1-moodle.2",
+        "@moodlehq/cordova-plugin-inappbrowser": "5.0.0-moodle.2",
+        "@moodlehq/cordova-plugin-local-notification": "0.9.0-moodle.2",
+        "@moodlehq/cordova-plugin-qrscanner": "3.0.1-moodle.2",
+        "@moodlehq/phonegap-plugin-push": "2.2.3-moodle.1",
+        "@ngx-translate/core": "^13.0.0",
+        "@ngx-translate/http-loader": "^6.0.0",
+        "@types/chart.js": "^2.9.31",
+        "@types/cordova": "0.0.34",
+        "@types/dom-mediacapture-record": "^1.0.7",
+        "chart.js": "^2.9.4",
+        "com-darryncampbell-cordova-plugin-intent": "^1.3.0",
+        "cordova": "^10.0.0",
+        "cordova-android": "^9.1.0",
+        "cordova-android-support-gradle-release": "^3.0.1",
+        "cordova-clipboard": "^1.3.0",
+        "cordova-ios": "^6.2.0",
+        "cordova-plugin-add-swift-support": "^2.0.2",
+        "cordova-plugin-advanced-http": "^3.1.0",
+        "cordova-plugin-badge": "^0.8.8",
+        "cordova-plugin-camera": "^5.0.1",
+        "cordova-plugin-chooser": "^1.3.2",
+        "cordova-plugin-customurlscheme": "^5.0.2",
+        "cordova-plugin-device": "^2.0.3",
+        "cordova-plugin-file": "^6.0.2",
+        "cordova-plugin-file-opener2": "^3.0.5",
+        "cordova-plugin-geolocation": "^4.1.0",
+        "cordova-plugin-globalization": "^1.11.0",
+        "cordova-plugin-ionic-keyboard": "^2.2.0",
+        "cordova-plugin-ionic-webview": "^5.0.0",
+        "cordova-plugin-media": "^5.0.3",
+        "cordova-plugin-media-capture": "^3.0.3",
+        "cordova-plugin-network-information": "^2.0.2",
+        "cordova-plugin-prevent-override": "^1.0.0",
+        "cordova-plugin-screen-orientation": "^3.0.2",
+        "cordova-plugin-splashscreen": "^6.0.0",
+        "cordova-plugin-statusbar": "^2.4.3",
+        "cordova-plugin-whitelist": "^1.3.4",
+        "cordova-plugin-wkuserscript": "^1.0.0",
+        "cordova-plugin-wkwebview-cookies": "^1.0.0",
+        "cordova-plugin-zip": "^3.1.0",
+        "cordova-sqlite-storage": "^6.0.0",
+        "cordova-support-google-services": "^1.2.1",
+        "cordova.plugins.diagnostic": "^5.0.2",
+        "core-js": "^3.9.1",
+        "es6-promise-plugin": "^4.2.2",
+        "jszip": "^3.5.0",
+        "mathjax": "2.7.7",
+        "moment": "^2.29.0",
+        "nl.kingsquare.cordova.background-audio": "^1.0.1",
+        "phonegap-plugin-multidex": "^1.0.0",
+        "rxjs": "~6.5.5",
+        "ts-md5": "^1.2.7",
+        "tslib": "^2.0.1",
+        "zone.js": "~0.10.3"
+      },
+      "devDependencies": {
+        "@angular-devkit/architect": "~0.1101.2",
+        "@angular-devkit/build-angular": "~0.1000.8",
+        "@angular-eslint/builder": "^4.2.0",
+        "@angular-eslint/eslint-plugin": "^4.2.0",
+        "@angular-eslint/eslint-plugin-template": "^4.2.0",
+        "@angular-eslint/schematics": "^4.2.0",
+        "@angular-eslint/template-parser": "^4.2.0",
+        "@angular/cli": "~10.0.8",
+        "@angular/compiler": "~10.0.14",
+        "@angular/compiler-cli": "~10.0.14",
+        "@angular/language-service": "~10.0.14",
+        "@ionic/angular-toolkit": "^2.3.3",
+        "@ionic/cli": "^6.14.1",
+        "@types/faker": "^5.1.3",
+        "@types/node": "^12.12.64",
+        "@types/resize-observer-browser": "^0.1.5",
+        "@types/webpack-env": "^1.16.0",
+        "@typescript-eslint/eslint-plugin": "^4.22.0",
+        "@typescript-eslint/parser": "^4.22.0",
+        "check-es-compat": "^1.1.1",
+        "eslint": "^7.25.0",
+        "eslint-config-prettier": "^8.3.0",
+        "eslint-plugin-header": "^3.1.1",
+        "eslint-plugin-import": "^2.22.1",
+        "eslint-plugin-jest": "^24.3.6",
+        "eslint-plugin-jsdoc": "^32.3.3",
+        "eslint-plugin-prefer-arrow": "^1.2.3",
+        "eslint-plugin-promise": "^5.1.0",
+        "faker": "^5.1.0",
+        "fs-extra": "^9.1.0",
+        "gulp": "4.0.2",
+        "gulp-clip-empty-files": "^0.1.2",
+        "gulp-concat": "^2.6.1",
+        "gulp-flatten": "^0.4.0",
+        "gulp-htmlmin": "^5.0.1",
+        "gulp-rename": "^2.0.0",
+        "gulp-slash": "^1.1.3",
+        "jest": "^26.5.2",
+        "jest-preset-angular": "^8.3.1",
+        "jsonc-parser": "^2.3.1",
+        "native-run": "^1.4.0",
+        "ts-jest": "^26.4.1",
+        "ts-node": "~8.3.0",
+        "typescript": "^3.9.9"
+      },
+      "engines": {
+        "node": ">=12.x"
+      },
+      "optionalDependencies": {
+        "keytar": "^7.2.0"
+      }
+    },
+    "node_modules/@angular-devkit/architect": {
+      "version": "0.1101.2",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1101.2.tgz",
+      "integrity": "sha512-MLmBfHiiyPhbFSSAX4oMecPjEuBauOui5uBpI6BKNnk/7783fznbkbAKjXlOco7M81gkNeEoHMR8c+mOfcvv7g==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "11.1.2",
+        "rxjs": "6.6.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular-devkit/architect/node_modules/rxjs": {
+      "version": "6.6.3",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
+      "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/@angular-devkit/architect/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
+    "node_modules/@angular-devkit/build-angular": {
+      "version": "0.1000.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.1000.8.tgz",
+      "integrity": "sha512-wwDN2oadQvYPL7lDmvGsoWQjW++0ZnxWk1QVlABGhBSIs8Uxs26Hjd5YNUSsvJavBkqb1UZIOilqzb4dig5MIA==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/architect": "0.1000.8",
+        "@angular-devkit/build-optimizer": "0.1000.8",
+        "@angular-devkit/build-webpack": "0.1000.8",
+        "@angular-devkit/core": "10.0.8",
+        "@babel/core": "7.9.6",
+        "@babel/generator": "7.9.6",
+        "@babel/plugin-transform-runtime": "7.9.6",
+        "@babel/preset-env": "7.9.6",
+        "@babel/runtime": "7.9.6",
+        "@babel/template": "7.8.6",
+        "@jsdevtools/coverage-istanbul-loader": "3.0.3",
+        "@ngtools/webpack": "10.0.8",
+        "ajv": "6.12.3",
+        "autoprefixer": "9.8.0",
+        "babel-loader": "8.1.0",
+        "browserslist": "^4.9.1",
+        "cacache": "15.0.3",
+        "caniuse-lite": "^1.0.30001032",
+        "circular-dependency-plugin": "5.2.0",
+        "copy-webpack-plugin": "6.0.3",
+        "core-js": "3.6.4",
+        "css-loader": "3.5.3",
+        "cssnano": "4.1.10",
+        "file-loader": "6.0.0",
+        "find-cache-dir": "3.3.1",
+        "glob": "7.1.6",
+        "jest-worker": "26.0.0",
+        "karma-source-map-support": "1.4.0",
+        "less-loader": "6.1.0",
+        "license-webpack-plugin": "2.2.0",
+        "loader-utils": "2.0.0",
+        "mini-css-extract-plugin": "0.9.0",
+        "minimatch": "3.0.4",
+        "open": "7.0.4",
+        "parse5": "4.0.0",
+        "pnp-webpack-plugin": "1.6.4",
+        "postcss": "7.0.31",
+        "postcss-import": "12.0.1",
+        "postcss-loader": "3.0.0",
+        "raw-loader": "4.0.1",
+        "regenerator-runtime": "0.13.5",
+        "resolve-url-loader": "3.1.1",
+        "rimraf": "3.0.2",
+        "rollup": "2.10.9",
+        "rxjs": "6.5.5",
+        "sass": "1.26.5",
+        "sass-loader": "8.0.2",
+        "semver": "7.3.2",
+        "source-map": "0.7.3",
+        "source-map-loader": "1.0.0",
+        "source-map-support": "0.5.19",
+        "speed-measure-webpack-plugin": "1.3.3",
+        "style-loader": "1.2.1",
+        "stylus": "0.54.7",
+        "stylus-loader": "3.0.2",
+        "terser": "4.7.0",
+        "terser-webpack-plugin": "3.0.1",
+        "tree-kill": "1.2.2",
+        "webpack": "4.43.0",
+        "webpack-dev-middleware": "3.7.2",
+        "webpack-dev-server": "3.11.0",
+        "webpack-merge": "4.2.2",
+        "webpack-sources": "1.4.3",
+        "webpack-subresource-integrity": "1.4.1",
+        "worker-plugin": "4.0.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
+        "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "@angular/compiler-cli": ">=10.0.0-next.0 < 11",
+        "typescript": ">=3.9 < 3.10"
+      },
+      "peerDependenciesMeta": {
+        "@angular/localize": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/architect": {
+      "version": "0.1000.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1000.8.tgz",
+      "integrity": "sha512-2AqPbiEugtPxNz4MGhLh+imUVelhW9h1cdJs2AbxZosIxftPb5DNDQUSAwVmRGp4CtcXVrlvcDwc0f4Fw1aiIA==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "10.0.8",
+        "rxjs": "6.5.5"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/core": {
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
+      "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "6.12.3",
+        "fast-json-stable-stringify": "2.1.0",
+        "magic-string": "0.25.7",
+        "rxjs": "6.5.5",
+        "source-map": "0.7.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/ajv": {
+      "version": "6.12.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/core-js": {
+      "version": "3.6.4",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
+      "integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/open": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/open/-/open-7.0.4.tgz",
+      "integrity": "sha512-brSA+/yq+b08Hsr4c8fsEW2CRzk1BmfN3SAK/5VCHQ9bdoZJ4qa/+AfR0xHjlbbZUyPkUHs1b8x1RqdyZdkVqQ==",
+      "dev": true,
+      "dependencies": {
+        "is-docker": "^2.0.0",
+        "is-wsl": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular-devkit/build-optimizer": {
+      "version": "0.1000.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.1000.8.tgz",
+      "integrity": "sha512-esODHuTGEEMx1SmLUq03VAMly8gZUd1vRuvZeKS5HqKwDg8ZzcI7/25BuuUSlyST+6BEdjo2gnmagQnG0VBdQw==",
+      "dev": true,
+      "dependencies": {
+        "loader-utils": "2.0.0",
+        "source-map": "0.7.3",
+        "tslib": "2.0.0",
+        "webpack-sources": "1.4.3"
+      },
+      "bin": {
+        "build-optimizer": "src/build-optimizer/cli.js"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-optimizer/node_modules/tslib": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.0.tgz",
+      "integrity": "sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==",
+      "dev": true
+    },
+    "node_modules/@angular-devkit/build-webpack": {
+      "version": "0.1000.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1000.8.tgz",
+      "integrity": "sha512-y/U+dV5N8W7KECncGSKQWoUH/DFNZCseczyl6LAd8bc0fMr8Z0TAIe8OXj+5CSRRdejWfRIxGtNWM+L2kTCU8A==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/architect": "0.1000.8",
+        "@angular-devkit/core": "10.0.8",
+        "rxjs": "6.5.5"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
+        "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "webpack": "^4.6.0",
+        "webpack-dev-server": "^3.1.4"
+      }
+    },
+    "node_modules/@angular-devkit/build-webpack/node_modules/@angular-devkit/architect": {
+      "version": "0.1000.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1000.8.tgz",
+      "integrity": "sha512-2AqPbiEugtPxNz4MGhLh+imUVelhW9h1cdJs2AbxZosIxftPb5DNDQUSAwVmRGp4CtcXVrlvcDwc0f4Fw1aiIA==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "10.0.8",
+        "rxjs": "6.5.5"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-webpack/node_modules/@angular-devkit/core": {
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
+      "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "6.12.3",
+        "fast-json-stable-stringify": "2.1.0",
+        "magic-string": "0.25.7",
+        "rxjs": "6.5.5",
+        "source-map": "0.7.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-webpack/node_modules/ajv": {
+      "version": "6.12.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@angular-devkit/core": {
+      "version": "11.1.2",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.1.2.tgz",
+      "integrity": "sha512-V7zOMqL2l56JcwXVyswkG+7+t67r9XtkrVzRcG2Z5ZYwafU+iKWMwg5kBFZr1SX7fM1M9E4MpskxqtagQeUKng==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "6.12.6",
+        "fast-json-stable-stringify": "2.1.0",
+        "magic-string": "0.25.7",
+        "rxjs": "6.6.3",
+        "source-map": "0.7.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular-devkit/core/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@angular-devkit/core/node_modules/rxjs": {
+      "version": "6.6.3",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
+      "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/@angular-devkit/core/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
+    "node_modules/@angular-devkit/schematics": {
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.0.8.tgz",
+      "integrity": "sha512-p2PjvrExuzOe/azyOEcBeIgwZIk4D6VeLkJf/KVjhXOVu13pjIXHX7/qWl+IYnbtj3NZGHqXM5Cr8nxsJNIMpw==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "10.0.8",
+        "ora": "4.0.4",
+        "rxjs": "6.5.5"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular-devkit/schematics/node_modules/@angular-devkit/core": {
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
+      "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "6.12.3",
+        "fast-json-stable-stringify": "2.1.0",
+        "magic-string": "0.25.7",
+        "rxjs": "6.5.5",
+        "source-map": "0.7.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular-devkit/schematics/node_modules/ajv": {
+      "version": "6.12.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@angular-eslint/builder": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-4.2.0.tgz",
+      "integrity": "sha512-qM4hpweuQ14ul8CU6LKpUWFZs6POUE7HZKdTllUrYuoZMrTpNB1XGelR0pweYzbfo4XRnUaO1NVgWhWOWiD5MA==",
+      "dev": true,
+      "peerDependencies": {
+        "@angular/cli": ">= 11.2.0 < 12.0.0",
+        "eslint": "*",
+        "typescript": "*"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-4.2.0.tgz",
+      "integrity": "sha512-G8D8Pso6GcHW8vFkUSvgoKPIOtGTqO+eb5aytGtpogMgzxBRyr0juU/9Uz5dAhO6TOERIj1gPpJQ61R/n/Aaew==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/experimental-utils": "4.16.1"
+      },
+      "peerDependencies": {
+        "@angular/compiler": ">= 11.2.0 < 12.0.0",
+        "eslint": "*",
+        "typescript": "*"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin-template": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-4.2.0.tgz",
+      "integrity": "sha512-LC8qqqqVmA/OJAsUt6fQCXLmWP5BL30XFvVsPtrORdxMFt0HI1gvkuz5EVak7PeAXEmerdVarNZr5zmCXIWf3g==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/experimental-utils": "4.16.1",
+        "aria-query": "^4.2.2",
+        "axobject-query": "^2.2.0"
+      },
+      "peerDependencies": {
+        "@angular-eslint/template-parser": "*",
+        "@angular/compiler": ">= 11.2.0 < 12.0.0",
+        "eslint": "*",
+        "typescript": "*"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/experimental-utils": {
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.16.1.tgz",
+      "integrity": "sha512-0Hm3LSlMYFK17jO4iY3un1Ve9x1zLNn4EM50Lia+0EV99NdbK+cn0er7HC7IvBA23mBg3P+8dUkMXy4leL33UQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.3",
+        "@typescript-eslint/scope-manager": "4.16.1",
+        "@typescript-eslint/types": "4.16.1",
+        "@typescript-eslint/typescript-estree": "4.16.1",
+        "eslint-scope": "^5.0.0",
+        "eslint-utils": "^2.0.0"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "*"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/scope-manager": {
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.16.1.tgz",
+      "integrity": "sha512-6IlZv9JaurqV0jkEg923cV49aAn8V6+1H1DRfhRcvZUrptQ+UtSKHb5kwTayzOYTJJ/RsYZdcvhOEKiBLyc0Cw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.16.1",
+        "@typescript-eslint/visitor-keys": "4.16.1"
+      },
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/types": {
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.16.1.tgz",
+      "integrity": "sha512-nnKqBwMgRlhzmJQF8tnFDZWfunXmJyuXj55xc8Kbfup4PbkzdoDXZvzN8//EiKR27J6vUSU8j4t37yUuYPiLqA==",
+      "dev": true,
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.16.1.tgz",
+      "integrity": "sha512-m8I/DKHa8YbeHt31T+UGd/l8Kwr0XCTCZL3H4HMvvLCT7HU9V7yYdinTOv1gf/zfqNeDcCgaFH2BMsS8x6NvJg==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.16.1",
+        "@typescript-eslint/visitor-keys": "4.16.1",
+        "debug": "^4.1.1",
+        "globby": "^11.0.1",
+        "is-glob": "^4.0.1",
+        "semver": "^7.3.2",
+        "tsutils": "^3.17.1"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.16.1.tgz",
+      "integrity": "sha512-s/aIP1XcMkEqCNcPQtl60ogUYjSM8FU2mq1O7y5cFf3Xcob1z1iXWNB6cC43Op+NGRTFgGolri6s8z/efA9i1w==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.16.1",
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/experimental-utils": {
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.16.1.tgz",
+      "integrity": "sha512-0Hm3LSlMYFK17jO4iY3un1Ve9x1zLNn4EM50Lia+0EV99NdbK+cn0er7HC7IvBA23mBg3P+8dUkMXy4leL33UQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.3",
+        "@typescript-eslint/scope-manager": "4.16.1",
+        "@typescript-eslint/types": "4.16.1",
+        "@typescript-eslint/typescript-estree": "4.16.1",
+        "eslint-scope": "^5.0.0",
+        "eslint-utils": "^2.0.0"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "*"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.16.1.tgz",
+      "integrity": "sha512-6IlZv9JaurqV0jkEg923cV49aAn8V6+1H1DRfhRcvZUrptQ+UtSKHb5kwTayzOYTJJ/RsYZdcvhOEKiBLyc0Cw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.16.1",
+        "@typescript-eslint/visitor-keys": "4.16.1"
+      },
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.16.1.tgz",
+      "integrity": "sha512-nnKqBwMgRlhzmJQF8tnFDZWfunXmJyuXj55xc8Kbfup4PbkzdoDXZvzN8//EiKR27J6vUSU8j4t37yUuYPiLqA==",
+      "dev": true,
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.16.1.tgz",
+      "integrity": "sha512-m8I/DKHa8YbeHt31T+UGd/l8Kwr0XCTCZL3H4HMvvLCT7HU9V7yYdinTOv1gf/zfqNeDcCgaFH2BMsS8x6NvJg==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.16.1",
+        "@typescript-eslint/visitor-keys": "4.16.1",
+        "debug": "^4.1.1",
+        "globby": "^11.0.1",
+        "is-glob": "^4.0.1",
+        "semver": "^7.3.2",
+        "tsutils": "^3.17.1"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.16.1.tgz",
+      "integrity": "sha512-s/aIP1XcMkEqCNcPQtl60ogUYjSM8FU2mq1O7y5cFf3Xcob1z1iXWNB6cC43Op+NGRTFgGolri6s8z/efA9i1w==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.16.1",
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin/node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@angular-eslint/schematics": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-4.2.0.tgz",
+      "integrity": "sha512-aohGcfYUqN2hFLWaZoOqkLDyYVDFoLC3LwgIknoaDqWkvFG/RUTg1X1pCFjddLQYP5ist8+OppHH+gnYMbftEw==",
+      "dev": true,
+      "dependencies": {
+        "@angular-eslint/eslint-plugin": "4.2.0",
+        "@angular-eslint/eslint-plugin-template": "4.2.0",
+        "ignore": "5.1.8",
+        "strip-json-comments": "3.1.1",
+        "tmp": "0.2.1"
+      },
+      "peerDependencies": {
+        "@angular/cli": ">= 11.2.0 < 12.0.0"
+      }
+    },
+    "node_modules/@angular-eslint/schematics/node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular-eslint/template-parser": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-4.2.0.tgz",
+      "integrity": "sha512-77lJ9MDNWmW4ik9l3g149iO9SGRx3qLGZvfSTwmbPxpCgNripWerla9Ia1X+gLkitI8CLpcpiZybxH3EWxj/qQ==",
+      "dev": true,
+      "dependencies": {
+        "eslint-scope": "^5.1.0"
+      },
+      "peerDependencies": {
+        "@angular/compiler": ">= 11.2.0 < 12.0.0",
+        "eslint": "*",
+        "typescript": "*"
+      }
+    },
+    "node_modules/@angular-eslint/template-parser/node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@angular/animations": {
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-10.0.14.tgz",
+      "integrity": "sha512-0BOGQOuaudIG0pq6FAnG55teKM7tEQZdIwdoOf0okhh9n0cFWSWRUjvUxWt25bWswlO+HxELyJioiRUvVSES4g==",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@angular/core": "10.0.14"
+      }
+    },
+    "node_modules/@angular/cli": {
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-10.0.8.tgz",
+      "integrity": "sha512-unTteffLepsFw7qQulHOLLyLqCpQMOaZo0WO4x6cQGcW2mc0WgwnwBW2JDYMx1U2434t/Q13LqYMPNYWyCGsog==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "@angular-devkit/architect": "0.1000.8",
+        "@angular-devkit/core": "10.0.8",
+        "@angular-devkit/schematics": "10.0.8",
+        "@schematics/angular": "10.0.8",
+        "@schematics/update": "0.1000.8",
+        "@yarnpkg/lockfile": "1.1.0",
+        "ansi-colors": "4.1.1",
+        "debug": "4.1.1",
+        "ini": "1.3.5",
+        "inquirer": "7.1.0",
+        "npm-package-arg": "8.0.1",
+        "npm-pick-manifest": "6.1.0",
+        "open": "7.0.4",
+        "pacote": "9.5.12",
+        "read-package-tree": "5.3.1",
+        "rimraf": "3.0.2",
+        "semver": "7.3.2",
+        "symbol-observable": "1.2.0",
+        "universal-analytics": "0.4.20",
+        "uuid": "8.1.0"
+      },
+      "bin": {
+        "ng": "bin/ng"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/@angular-devkit/architect": {
+      "version": "0.1000.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1000.8.tgz",
+      "integrity": "sha512-2AqPbiEugtPxNz4MGhLh+imUVelhW9h1cdJs2AbxZosIxftPb5DNDQUSAwVmRGp4CtcXVrlvcDwc0f4Fw1aiIA==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "10.0.8",
+        "rxjs": "6.5.5"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/@angular-devkit/core": {
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
+      "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "6.12.3",
+        "fast-json-stable-stringify": "2.1.0",
+        "magic-string": "0.25.7",
+        "rxjs": "6.5.5",
+        "source-map": "0.7.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/ajv": {
+      "version": "6.12.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/ansi-colors": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/ansi-escapes": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
+      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.11.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/cli-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+      "dev": true,
+      "dependencies": {
+        "restore-cursor": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/debug": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/@angular/cli/node_modules/figures": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+      "dev": true,
+      "dependencies": {
+        "escape-string-regexp": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/inquirer": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz",
+      "integrity": "sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^3.0.0",
+        "cli-cursor": "^3.1.0",
+        "cli-width": "^2.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^3.0.0",
+        "lodash": "^4.17.15",
+        "mute-stream": "0.0.8",
+        "run-async": "^2.4.0",
+        "rxjs": "^6.5.3",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "through": "^2.3.6"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@angular/cli/node_modules/open": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/open/-/open-7.0.4.tgz",
+      "integrity": "sha512-brSA+/yq+b08Hsr4c8fsEW2CRzk1BmfN3SAK/5VCHQ9bdoZJ4qa/+AfR0xHjlbbZUyPkUHs1b8x1RqdyZdkVqQ==",
+      "dev": true,
+      "dependencies": {
+        "is-docker": "^2.0.0",
+        "is-wsl": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/restore-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "dev": true,
+      "dependencies": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/string-width": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/type-fest": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
+      "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/uuid": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.1.0.tgz",
+      "integrity": "sha512-CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg==",
+      "dev": true,
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/@angular/common": {
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-10.0.14.tgz",
+      "integrity": "sha512-EOAuaMt2HwJF3DtIJ/ksHtnF8Pqh5K2rWISYLEs9R3WNaSGn74kbCODAT4pNhI8P22Ykl3H4FmQUgnDZ3uDAUg==",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@angular/core": "10.0.14",
+        "rxjs": "^6.5.3"
+      }
+    },
+    "node_modules/@angular/compiler": {
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-10.0.14.tgz",
+      "integrity": "sha512-lYNo6/MmnYAVFoDQDBB6HMFd9zHg3RHXc6hn+wchU0XSWiIsg6WYHbKOb/DyqUEyKebzy0gSKZf7gUeZHtj62Q==",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      }
+    },
+    "node_modules/@angular/compiler-cli": {
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-10.0.14.tgz",
+      "integrity": "sha512-WK+S90sjc+3iMo8/CuuAX0RdGFwyA9esqqC5fYG/MDZjKuPuhogiimmR0rY3P1Th7B9di8x012xiILbf4GsGUQ==",
+      "dev": true,
+      "dependencies": {
+        "canonical-path": "1.0.0",
+        "chokidar": "^3.0.0",
+        "convert-source-map": "^1.5.1",
+        "dependency-graph": "^0.7.2",
+        "fs-extra": "4.0.2",
+        "magic-string": "^0.25.0",
+        "minimist": "^1.2.0",
+        "reflect-metadata": "^0.1.2",
+        "semver": "^6.3.0",
+        "source-map": "^0.6.1",
+        "sourcemap-codec": "^1.4.8",
+        "tslib": "^2.0.0",
+        "yargs": "15.3.0"
+      },
+      "bin": {
+        "ivy-ngcc": "ngcc/main-ivy-ngcc.js",
+        "ng-xi18n": "src/extract_i18n.js",
+        "ngc": "src/main.js",
+        "ngcc": "ngcc/main-ngcc.js"
+      },
+      "engines": {
+        "node": ">=10.0"
+      },
+      "peerDependencies": {
+        "@angular/compiler": "10.0.14",
+        "typescript": ">=3.9 <4.0"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/cliui": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.0"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/@angular/compiler-cli/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/fs-extra": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.2.tgz",
+      "integrity": "sha1-+RcExT0bRh+JNFKwwwfZmXZHq2s=",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "dev": true,
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/string-width": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/yargs": {
+      "version": "15.3.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.0.tgz",
+      "integrity": "sha512-g/QCnmjgOl1YJjGsnUg2SatC7NUYEiLXJqxNOQU9qSpjzGtGXda9b+OKccr1kLTy8BN9yqEyqfq5lxlwdc13TA==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^6.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^4.1.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^4.2.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^18.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/yargs-parser": {
+      "version": "18.1.3",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@angular/core": {
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-10.0.14.tgz",
+      "integrity": "sha512-m+c9g6fA/gE+6K7It01b6r8TEmbuFjUZajQ9gG/pzist0mTBcqfvn0O4h5X+ebnSgw/bbnnp+4PbaXEi1pOWZQ==",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "rxjs": "^6.5.3",
+        "zone.js": "~0.10.3"
+      }
+    },
+    "node_modules/@angular/forms": {
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-10.0.14.tgz",
+      "integrity": "sha512-McKh3rXDlAE7qmCnyWKENb2HhqAT+1dsAfChuqs0w8jhKkoRgA00RDFee6dZ6XQCc907DwuV0K8+wC3CvBp35w==",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@angular/common": "10.0.14",
+        "@angular/core": "10.0.14",
+        "@angular/platform-browser": "10.0.14",
+        "rxjs": "^6.5.3"
+      }
+    },
+    "node_modules/@angular/language-service": {
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-10.0.14.tgz",
+      "integrity": "sha512-QQLYUjD0T6u2hLNYXUEUbupAGsz5egmhCAckaQojvXCe3SLL/hQsrK4odrNuspy7TvMB0H5ZNEHGlF6m/WLZ3g==",
+      "dev": true
+    },
+    "node_modules/@angular/platform-browser": {
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-10.0.14.tgz",
+      "integrity": "sha512-DcBZ1wt2TwtXrdcmCTWanAzu2Vxk5Uvioam0UcDxcgXD84T2fHipyfZVn07fMqRvzFQj45tDNAEevFBnGZar4w==",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@angular/animations": "10.0.14",
+        "@angular/common": "10.0.14",
+        "@angular/core": "10.0.14"
+      },
+      "peerDependenciesMeta": {
+        "@angular/animations": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular/platform-browser-dynamic": {
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-10.0.14.tgz",
+      "integrity": "sha512-PPCAiNh/JSuQNKXOhj3a8CTFdVhTgF/EpGtaotnVr/BfbJMeFImKo7m2QQOTsAFaEP2DurSHnofPnMWAfHS2mg==",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@angular/common": "10.0.14",
+        "@angular/compiler": "10.0.14",
+        "@angular/core": "10.0.14",
+        "@angular/platform-browser": "10.0.14"
+      }
+    },
+    "node_modules/@angular/router": {
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-10.0.14.tgz",
+      "integrity": "sha512-VWzaNyPZDY99TMszV1GlXJgVOxXsjhJrsv3mIcjaz1dfdlKOeKTVDLdnyXfP9CkwE3PRmvG7eSXppIj6nn9BpQ==",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@angular/common": "10.0.14",
+        "@angular/core": "10.0.14",
+        "@angular/platform-browser": "10.0.14",
+        "rxjs": "^6.5.3"
+      }
+    },
+    "node_modules/@babel/code-frame": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+      "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/highlight": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/compat-data": {
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.11.0.tgz",
+      "integrity": "sha512-TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.12.0",
+        "invariant": "^2.2.4",
+        "semver": "^5.5.0"
+      }
+    },
+    "node_modules/@babel/compat-data/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/@babel/core": {
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz",
+      "integrity": "sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.8.3",
+        "@babel/generator": "^7.9.6",
+        "@babel/helper-module-transforms": "^7.9.0",
+        "@babel/helpers": "^7.9.6",
+        "@babel/parser": "^7.9.6",
+        "@babel/template": "^7.8.6",
+        "@babel/traverse": "^7.9.6",
+        "@babel/types": "^7.9.6",
+        "convert-source-map": "^1.7.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.1",
+        "json5": "^2.1.2",
+        "lodash": "^4.17.13",
+        "resolve": "^1.3.2",
+        "semver": "^5.4.1",
+        "source-map": "^0.5.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
+      }
+    },
+    "node_modules/@babel/core/node_modules/debug": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+      "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@babel/core/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@babel/core/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/@babel/core/node_modules/source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@babel/generator": {
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz",
+      "integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.9.6",
+        "jsesc": "^2.5.1",
+        "lodash": "^4.17.13",
+        "source-map": "^0.5.0"
+      }
+    },
+    "node_modules/@babel/generator/node_modules/source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@babel/helper-annotate-as-pure": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz",
+      "integrity": "sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz",
+      "integrity": "sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-explode-assignable-expression": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helper-compilation-targets": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz",
+      "integrity": "sha512-a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/compat-data": "^7.10.4",
+        "browserslist": "^4.12.0",
+        "invariant": "^2.2.4",
+        "levenary": "^1.1.1",
+        "semver": "^5.5.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/@babel/helper-create-regexp-features-plugin": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz",
+      "integrity": "sha512-2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.10.4",
+        "@babel/helper-regex": "^7.10.4",
+        "regexpu-core": "^4.7.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-define-map": {
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz",
+      "integrity": "sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-function-name": "^7.10.4",
+        "@babel/types": "^7.10.5",
+        "lodash": "^4.17.19"
+      }
+    },
+    "node_modules/@babel/helper-explode-assignable-expression": {
+      "version": "7.11.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz",
+      "integrity": "sha512-ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helper-function-name": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
+      "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-get-function-arity": "^7.10.4",
+        "@babel/template": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helper-function-name/node_modules/@babel/template": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.10.4",
+        "@babel/parser": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helper-get-function-arity": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
+      "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helper-hoist-variables": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz",
+      "integrity": "sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helper-member-expression-to-functions": {
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
+      "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.11.0"
+      }
+    },
+    "node_modules/@babel/helper-module-imports": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz",
+      "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helper-module-transforms": {
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz",
+      "integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.10.4",
+        "@babel/helper-replace-supers": "^7.10.4",
+        "@babel/helper-simple-access": "^7.10.4",
+        "@babel/helper-split-export-declaration": "^7.11.0",
+        "@babel/template": "^7.10.4",
+        "@babel/types": "^7.11.0",
+        "lodash": "^4.17.19"
+      }
+    },
+    "node_modules/@babel/helper-module-transforms/node_modules/@babel/template": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.10.4",
+        "@babel/parser": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helper-optimise-call-expression": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz",
+      "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helper-plugin-utils": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
+      "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+      "dev": true
+    },
+    "node_modules/@babel/helper-regex": {
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.5.tgz",
+      "integrity": "sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^4.17.19"
+      }
+    },
+    "node_modules/@babel/helper-remap-async-to-generator": {
+      "version": "7.11.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz",
+      "integrity": "sha512-tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.10.4",
+        "@babel/helper-wrap-function": "^7.10.4",
+        "@babel/template": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/template": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.10.4",
+        "@babel/parser": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helper-replace-supers": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
+      "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-member-expression-to-functions": "^7.10.4",
+        "@babel/helper-optimise-call-expression": "^7.10.4",
+        "@babel/traverse": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helper-simple-access": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz",
+      "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/template": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helper-simple-access/node_modules/@babel/template": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.10.4",
+        "@babel/parser": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz",
+      "integrity": "sha512-0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.11.0"
+      }
+    },
+    "node_modules/@babel/helper-split-export-declaration": {
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
+      "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.11.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+      "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+      "dev": true
+    },
+    "node_modules/@babel/helper-wrap-function": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz",
+      "integrity": "sha512-6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-function-name": "^7.10.4",
+        "@babel/template": "^7.10.4",
+        "@babel/traverse": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helper-wrap-function/node_modules/@babel/template": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.10.4",
+        "@babel/parser": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helpers": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.4.tgz",
+      "integrity": "sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/template": "^7.10.4",
+        "@babel/traverse": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helpers/node_modules/@babel/template": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.10.4",
+        "@babel/parser": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/highlight": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+      "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.10.4",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/@babel/highlight/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.11.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
+      "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
+      "dev": true,
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-async-generator-functions": {
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz",
+      "integrity": "sha512-cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-remap-async-to-generator": "^7.10.4",
+        "@babel/plugin-syntax-async-generators": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-dynamic-import": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz",
+      "integrity": "sha512-up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-json-strings": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz",
+      "integrity": "sha512-fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-syntax-json-strings": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz",
+      "integrity": "sha512-wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-numeric-separator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-object-rest-spread": {
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz",
+      "integrity": "sha512-wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
+        "@babel/plugin-transform-parameters": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-optional-catch-binding": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz",
+      "integrity": "sha512-LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-optional-chaining": {
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz",
+      "integrity": "sha512-v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-unicode-property-regex": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz",
+      "integrity": "sha512-H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-async-generators": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-bigint": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
+      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-class-properties": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz",
+      "integrity": "sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-dynamic-import": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
+      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-import-meta": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-json-strings": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-numeric-separator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-optional-chaining": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-top-level-await": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz",
+      "integrity": "sha512-ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-arrow-functions": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz",
+      "integrity": "sha512-9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-async-to-generator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz",
+      "integrity": "sha512-F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-remap-async-to-generator": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-block-scoped-functions": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz",
+      "integrity": "sha512-WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-block-scoping": {
+      "version": "7.11.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz",
+      "integrity": "sha512-00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-classes": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz",
+      "integrity": "sha512-2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.10.4",
+        "@babel/helper-define-map": "^7.10.4",
+        "@babel/helper-function-name": "^7.10.4",
+        "@babel/helper-optimise-call-expression": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-replace-supers": "^7.10.4",
+        "@babel/helper-split-export-declaration": "^7.10.4",
+        "globals": "^11.1.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-computed-properties": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz",
+      "integrity": "sha512-JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-destructuring": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz",
+      "integrity": "sha512-+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-dotall-regex": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz",
+      "integrity": "sha512-ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-duplicate-keys": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz",
+      "integrity": "sha512-GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-exponentiation-operator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz",
+      "integrity": "sha512-S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-for-of": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz",
+      "integrity": "sha512-ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-function-name": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz",
+      "integrity": "sha512-OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-function-name": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-literals": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz",
+      "integrity": "sha512-Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-member-expression-literals": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz",
+      "integrity": "sha512-0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-amd": {
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz",
+      "integrity": "sha512-elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.10.5",
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-commonjs": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz",
+      "integrity": "sha512-Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-simple-access": "^7.10.4",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-systemjs": {
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz",
+      "integrity": "sha512-f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-hoist-variables": "^7.10.4",
+        "@babel/helper-module-transforms": "^7.10.5",
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-umd": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz",
+      "integrity": "sha512-mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz",
+      "integrity": "sha512-V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-new-target": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz",
+      "integrity": "sha512-YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-object-super": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz",
+      "integrity": "sha512-5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-replace-supers": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-parameters": {
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz",
+      "integrity": "sha512-xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-get-function-arity": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-property-literals": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz",
+      "integrity": "sha512-ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-regenerator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz",
+      "integrity": "sha512-3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw==",
+      "dev": true,
+      "dependencies": {
+        "regenerator-transform": "^0.14.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-reserved-words": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz",
+      "integrity": "sha512-hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-runtime": {
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.6.tgz",
+      "integrity": "sha512-qcmiECD0mYOjOIt8YHNsAP1SxPooC/rDmfmiSK9BNY72EitdSc7l44WTEklaWuFtbOEBjNhWWyph/kOImbNJ4w==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "resolve": "^1.8.1",
+        "semver": "^5.5.1"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-runtime/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/@babel/plugin-transform-shorthand-properties": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz",
+      "integrity": "sha512-AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-spread": {
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz",
+      "integrity": "sha512-UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-sticky-regex": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz",
+      "integrity": "sha512-Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-regex": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-template-literals": {
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz",
+      "integrity": "sha512-V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-typeof-symbol": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz",
+      "integrity": "sha512-QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-unicode-regex": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz",
+      "integrity": "sha512-wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/preset-env": {
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.6.tgz",
+      "integrity": "sha512-0gQJ9RTzO0heXOhzftog+a/WyOuqMrAIugVYxMYf83gh1CQaQDjMtsOpqOwXyDL/5JcWsrCm8l4ju8QC97O7EQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/compat-data": "^7.9.6",
+        "@babel/helper-compilation-targets": "^7.9.6",
+        "@babel/helper-module-imports": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/plugin-proposal-async-generator-functions": "^7.8.3",
+        "@babel/plugin-proposal-dynamic-import": "^7.8.3",
+        "@babel/plugin-proposal-json-strings": "^7.8.3",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-proposal-numeric-separator": "^7.8.3",
+        "@babel/plugin-proposal-object-rest-spread": "^7.9.6",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-proposal-optional-chaining": "^7.9.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.8.3",
+        "@babel/plugin-syntax-async-generators": "^7.8.0",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.0",
+        "@babel/plugin-syntax-json-strings": "^7.8.0",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0",
+        "@babel/plugin-syntax-numeric-separator": "^7.8.0",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.0",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.0",
+        "@babel/plugin-syntax-top-level-await": "^7.8.3",
+        "@babel/plugin-transform-arrow-functions": "^7.8.3",
+        "@babel/plugin-transform-async-to-generator": "^7.8.3",
+        "@babel/plugin-transform-block-scoped-functions": "^7.8.3",
+        "@babel/plugin-transform-block-scoping": "^7.8.3",
+        "@babel/plugin-transform-classes": "^7.9.5",
+        "@babel/plugin-transform-computed-properties": "^7.8.3",
+        "@babel/plugin-transform-destructuring": "^7.9.5",
+        "@babel/plugin-transform-dotall-regex": "^7.8.3",
+        "@babel/plugin-transform-duplicate-keys": "^7.8.3",
+        "@babel/plugin-transform-exponentiation-operator": "^7.8.3",
+        "@babel/plugin-transform-for-of": "^7.9.0",
+        "@babel/plugin-transform-function-name": "^7.8.3",
+        "@babel/plugin-transform-literals": "^7.8.3",
+        "@babel/plugin-transform-member-expression-literals": "^7.8.3",
+        "@babel/plugin-transform-modules-amd": "^7.9.6",
+        "@babel/plugin-transform-modules-commonjs": "^7.9.6",
+        "@babel/plugin-transform-modules-systemjs": "^7.9.6",
+        "@babel/plugin-transform-modules-umd": "^7.9.0",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.8.3",
+        "@babel/plugin-transform-new-target": "^7.8.3",
+        "@babel/plugin-transform-object-super": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.9.5",
+        "@babel/plugin-transform-property-literals": "^7.8.3",
+        "@babel/plugin-transform-regenerator": "^7.8.7",
+        "@babel/plugin-transform-reserved-words": "^7.8.3",
+        "@babel/plugin-transform-shorthand-properties": "^7.8.3",
+        "@babel/plugin-transform-spread": "^7.8.3",
+        "@babel/plugin-transform-sticky-regex": "^7.8.3",
+        "@babel/plugin-transform-template-literals": "^7.8.3",
+        "@babel/plugin-transform-typeof-symbol": "^7.8.4",
+        "@babel/plugin-transform-unicode-regex": "^7.8.3",
+        "@babel/preset-modules": "^0.1.3",
+        "@babel/types": "^7.9.6",
+        "browserslist": "^4.11.1",
+        "core-js-compat": "^3.6.2",
+        "invariant": "^2.2.2",
+        "levenary": "^1.1.1",
+        "semver": "^5.5.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/preset-env/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/@babel/preset-modules": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz",
+      "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
+        "@babel/plugin-transform-dotall-regex": "^7.4.4",
+        "@babel/types": "^7.4.4",
+        "esutils": "^2.0.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/runtime": {
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz",
+      "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==",
+      "dev": true,
+      "dependencies": {
+        "regenerator-runtime": "^0.13.4"
+      }
+    },
+    "node_modules/@babel/runtime-corejs3": {
+      "version": "7.13.17",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.13.17.tgz",
+      "integrity": "sha512-RGXINY1YvduBlGrP+vHjJqd/nK7JVpfM4rmZLGMx77WoL3sMrhheA0qxii9VNn1VHnxJLEyxmvCB+Wqc+x/FMw==",
+      "dev": true,
+      "dependencies": {
+        "core-js-pure": "^3.0.0",
+        "regenerator-runtime": "^0.13.4"
+      }
+    },
+    "node_modules/@babel/template": {
+      "version": "7.8.6",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
+      "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.8.3",
+        "@babel/parser": "^7.8.6",
+        "@babel/types": "^7.8.6"
+      }
+    },
+    "node_modules/@babel/traverse": {
+      "version": "7.11.5",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
+      "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.10.4",
+        "@babel/generator": "^7.11.5",
+        "@babel/helper-function-name": "^7.10.4",
+        "@babel/helper-split-export-declaration": "^7.11.0",
+        "@babel/parser": "^7.11.5",
+        "@babel/types": "^7.11.5",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0",
+        "lodash": "^4.17.19"
+      }
+    },
+    "node_modules/@babel/traverse/node_modules/@babel/generator": {
+      "version": "7.11.6",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
+      "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.11.5",
+        "jsesc": "^2.5.1",
+        "source-map": "^0.5.0"
+      }
+    },
+    "node_modules/@babel/traverse/node_modules/debug": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+      "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@babel/traverse/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@babel/traverse/node_modules/source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@babel/types": {
+      "version": "7.11.5",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+      "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.10.4",
+        "lodash": "^4.17.19",
+        "to-fast-properties": "^2.0.0"
+      }
+    },
+    "node_modules/@bcoe/v8-coverage": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
+      "dev": true
+    },
+    "node_modules/@cnakazawa/watch": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz",
+      "integrity": "sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==",
+      "dev": true,
+      "dependencies": {
+        "exec-sh": "^0.3.2",
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "watch": "cli.js"
+      },
+      "engines": {
+        "node": ">=0.1.95"
+      }
+    },
+    "node_modules/@eslint/eslintrc": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.0.tgz",
+      "integrity": "sha512-2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.12.4",
+        "debug": "^4.1.1",
+        "espree": "^7.3.0",
+        "globals": "^12.1.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^3.13.1",
+        "minimatch": "^3.0.4",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/globals": {
+      "version": "12.4.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
+      "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.8.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/ignore": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@eslint/eslintrc/node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@ionic-native/badge": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/badge/-/badge-5.33.0.tgz",
+      "integrity": "sha512-g/E2HLB53csZq5hWeyWUFj6r7CrllSPuOkV88XotIFTQFNuY7TaLtiFUVFSvWXRh0Kvu+w7TI5Hys67d/v7F/g==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/badge/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/camera": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/camera/-/camera-5.33.0.tgz",
+      "integrity": "sha512-cLAxM4e8IrTECvlszyUe9FnUjE4PbWR99NNDwkOuB85yJ3diyKxiQhHu89Qh9A6qzHTJQLa93iknY2Q40VM/5Q==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/camera/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/chooser": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/chooser/-/chooser-5.33.0.tgz",
+      "integrity": "sha512-hz2OtB8UsJpKdXZByDzGS6+U1FK8toIjKmIVCDQAuOXxjbw9dU2Ef+MSUKXOpK6MYnP56oP80JdSX9LDEFJnRA==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/chooser/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/clipboard": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/clipboard/-/clipboard-5.33.0.tgz",
+      "integrity": "sha512-HFZN4tsAjFJ9Se9ik0/IOUvApL4zNPEKQAtUsjqP7vCnTsdrgS+FDMln1UDEKXCQ/dEEwU1N1ndFmPBGxjkGzQ==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/clipboard/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/core": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/core/-/core-5.33.0.tgz",
+      "integrity": "sha512-dnZHu7SadvQvliGJPndk2ohdoPvwiyBWJjsJw33BKyhadnmLlmkYKkRgPPI+i22BZofDKq4YiAfIIqhvfHU6gw==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/core/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/device": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/device/-/device-5.33.0.tgz",
+      "integrity": "sha512-KYQvVsN98bGTEomI193Jf9r1vaXBFJQXuhkhwBI6lajynAlf2SIVJwthNUXnK43kNXy1cOelYxScUuKyPwqudw==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/device/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/diagnostic": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/diagnostic/-/diagnostic-5.33.0.tgz",
+      "integrity": "sha512-zBDv/yNMvUkXfxy17rgrGVU3+XKREXRI7cqy/DyvpjdomOnmx2pnFvhszgMEgeD03LkXXKiFOR5yUAVNgYirmg==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/diagnostic/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/file": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/file/-/file-5.33.0.tgz",
+      "integrity": "sha512-RisSGJl2t8JrBgw30Vn5hJYYKEDTHR9f3KbQDfe1MQg+VrZo7vnbml/vk4l55u65c1TYZDH+F6i7s9nyif1QVQ==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/file-opener": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/file-opener/-/file-opener-5.33.0.tgz",
+      "integrity": "sha512-v7t1ndalAPYT9gvMAhxAup8tg1NPV415cfG6tzs1foPFP91UZC3MQny0tup8AgFivugT1GRdoSk1NMuK1jy8Cw==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/file-opener/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/file-transfer": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/file-transfer/-/file-transfer-5.33.0.tgz",
+      "integrity": "sha512-xDUpdJVgTBP6aEiU08iZ/pa9aMoGSMB9391dQKk+VSDs0hdbIwk+Cx4V40GIE4QF3TI06sUMdKXD2sIhVsr2QA==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/file-transfer/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/file/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/geolocation": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/geolocation/-/geolocation-5.33.0.tgz",
+      "integrity": "sha512-oE6pi6l8/Wsv94vpJmPlPqE1LheP6cQTJrC78WYQp9WVDOOCGZnFznNoH8BlQfnfjuDx/kUARxzEJBO/gbUg1A==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/geolocation/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/http": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/http/-/http-5.33.0.tgz",
+      "integrity": "sha512-dqcPu3igSLlfDUK8Mvma/6o6aq7WtKBlcR8xXwE8tVsO/r4fEB6NevLLN4S4zCr381Jy+RxIIjn3CZx5XHF6JQ==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/http/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/in-app-browser": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/in-app-browser/-/in-app-browser-5.33.0.tgz",
+      "integrity": "sha512-GGIvnYHf8FgaIae9yfRzxqxj0ZAxrYhOJpsHVSq1YKjxnDpRe6ImWWaHHfaeXE5IdUUMUXVuf75VTSBN00VBvA==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/in-app-browser/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/ionic-webview": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/ionic-webview/-/ionic-webview-5.33.0.tgz",
+      "integrity": "sha512-Jbr4M6z/Fya51F+QXuPLm/crFlZ9T6YvRM1cygGmFwZ7SgDAimYnjgSO8SEGJmvO2ZekYmFuF56qiVPSvx2wUA==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/ionic-webview/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/keyboard": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/keyboard/-/keyboard-5.33.0.tgz",
+      "integrity": "sha512-TIYU3LC+Yz/pcpBuHcxLThMNuN9y1E1wBu4SlmS6VlO3/D3R3At2WOg2UK3iA66G2kTJubed5haqTYZjeoA6Uw==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/keyboard/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/local-notifications": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/local-notifications/-/local-notifications-5.33.0.tgz",
+      "integrity": "sha512-ljn2uq0rFWpjG1I1qK+mPVX8T3T+09fsF8sZ9nK7uvD9YWShCVz2e2ctf8qPRFq+TWDeDqlnwXz3wCvWmbBUWw==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/local-notifications/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/media": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/media/-/media-5.33.0.tgz",
+      "integrity": "sha512-nUu7/FSH41j9+BqHXYVMBd3EifNsTNOufD3NEiMVpHVDWLWqG7tG5h5cFlsVACxUaP4kNpSEke2mjom6CKyjxQ==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/media-capture": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/media-capture/-/media-capture-5.33.0.tgz",
+      "integrity": "sha512-aQTnonVSeijpuZ9B7oYJCjIDqgFVhNdvqkx9vUoaO359BtJGpGS1rNPjEovt4DsqV7oe7TkbmBd8DMEwnB3A2g==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/media-capture/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/media/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/network": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/network/-/network-5.33.0.tgz",
+      "integrity": "sha512-J+3+rbDTMVNUspa/nV+P8a0hFKDicJK1rVIrm5aLBQdmN9n7WaqJmeMYTptyWOnZxQpktJAJDdhJTEvVmKQjjw==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/network/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/push": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/push/-/push-5.33.0.tgz",
+      "integrity": "sha512-H4gOkMbOaNvi97cKKJDggWvAR1BVCUbtdLyWInA0q3cZBHWSc6KcRJGz+hcdDndCQJUnHofs1Tpw8LN3zhjYyQ==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/push/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/qr-scanner": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/qr-scanner/-/qr-scanner-5.33.0.tgz",
+      "integrity": "sha512-cyiQv0Rje/fN9/JYoDXP1+ILJkRkjvPtoSx4vd2FsKAuJB60U2DpQfmVEE/KMF4iceTpx4MK/kGzr2WE2AYnIg==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/qr-scanner/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/splash-screen": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-5.33.0.tgz",
+      "integrity": "sha512-6PHk5WJeUoc3zru6wTvUmd9DCASvRQoQq1dysYI3JCECaAJ6X0x1RbzM8dBFs3JPLfWtDn+P8eTp+KaA0Xf58w==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/splash-screen/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/sqlite": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/sqlite/-/sqlite-5.33.0.tgz",
+      "integrity": "sha512-JIdQJr6bcksotF/3ZMJQZo9lHgaHXvHOOK9R30mM/5Ds5fFu+rUoUf0wvyqaGzEFu94pGw2uPGnfD+WI7x7+1A==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/sqlite/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/status-bar": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/status-bar/-/status-bar-5.33.0.tgz",
+      "integrity": "sha512-cnyfd42N9gGfhyDtF7wbWoacKg/jfsoJQHOHltfhS4/EjxsVu4bjkwq1YBLMcMY3OIqFDSn2aFcejHn8wVNkDQ==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/status-bar/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/web-intent": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/web-intent/-/web-intent-5.33.0.tgz",
+      "integrity": "sha512-3CIAofrg9nkJQbSftFdMKYOduXy9Ra/a1Q0it6ysm9NFeAQn7iZPThSexBeZ9xiKKj/QTPZtnqAJ0MQ+4mkGag==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/web-intent/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/zip": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/zip/-/zip-5.33.0.tgz",
+      "integrity": "sha512-hErISQ6/xqVErmVnnha5BR+3GWRNQIVfMTXzprEpNZxQl3iDe1UTIVQdFnMd3Nasz/naY+61Vq/y91PZ1Rrajw==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/zip/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic/angular": {
+      "version": "5.6.6",
+      "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-5.6.6.tgz",
+      "integrity": "sha512-0psh2n4Y/3sx0e2Yj4WmNcukz0nrETEiJE6Fl4CldoB8QHZcXGi0hKrPAcbGSAF0+lAJ58+Z5Gp/HQVm/MQOMA==",
+      "dependencies": {
+        "@ionic/core": "5.6.6",
+        "tslib": "^1.9.3"
+      },
+      "peerDependencies": {
+        "@angular/core": ">=8.2.7",
+        "@angular/forms": ">=8.2.7",
+        "@angular/router": ">=8.2.7",
+        "rxjs": ">=6.2.0",
+        "zone.js": ">=0.8.26"
+      }
+    },
+    "node_modules/@ionic/angular-toolkit": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/@ionic/angular-toolkit/-/angular-toolkit-2.3.3.tgz",
+      "integrity": "sha512-r87mApDLWbLaUtd5LvNHrRlZWxjQhaBBM1yPlk9M98dHOxcX3jy7kv60ZurGZutuvbhXISGvHcvvR90yywDC1A==",
+      "dev": true,
+      "dependencies": {
+        "@schematics/angular": ">=8.0.0",
+        "cheerio": "1.0.0-rc.3",
+        "colorette": "1.1.0",
+        "copy-webpack-plugin": "^6.0.3",
+        "tslib": "^1.9.0",
+        "ws": "^7.0.1"
+      },
+      "peerDependencies": {
+        "@angular-devkit/architect": ">=0.800.0",
+        "@angular-devkit/build-angular": ">=0.800.0",
+        "@angular-devkit/core": ">=8.0.0",
+        "@angular-devkit/schematics": ">=8.0.0"
+      }
+    },
+    "node_modules/@ionic/angular-toolkit/node_modules/tslib": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
+      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
+      "dev": true
+    },
+    "node_modules/@ionic/angular-toolkit/node_modules/ws": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz",
+      "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@ionic/angular/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+    },
+    "node_modules/@ionic/cli": {
+      "version": "6.14.1",
+      "resolved": "https://registry.npmjs.org/@ionic/cli/-/cli-6.14.1.tgz",
+      "integrity": "sha512-QGmA5hjW4PvS8o0f+ptJ2bOknu4dPKzlECFApBiR7ayDgGTDMwmbxrtNpRhDnjdsVlMAzWq8eo9l76831+DBjQ==",
+      "dev": true,
+      "dependencies": {
+        "@ionic/cli-framework": "5.1.0",
+        "@ionic/cli-framework-output": "2.2.2",
+        "@ionic/cli-framework-prompts": "2.1.8",
+        "@ionic/utils-array": "2.1.5",
+        "@ionic/utils-fs": "3.1.5",
+        "@ionic/utils-network": "2.1.5",
+        "@ionic/utils-process": "2.1.8",
+        "@ionic/utils-stream": "3.1.5",
+        "@ionic/utils-subprocess": "2.1.8",
+        "@ionic/utils-terminal": "2.3.1",
+        "chalk": "^4.0.0",
+        "debug": "^4.0.0",
+        "diff": "^4.0.1",
+        "elementtree": "^0.1.7",
+        "leek": "0.0.24",
+        "lodash": "^4.17.5",
+        "open": "^7.0.4",
+        "os-name": "^4.0.0",
+        "semver": "^7.1.1",
+        "split2": "^3.0.0",
+        "ssh-config": "^1.1.1",
+        "stream-combiner2": "^1.1.1",
+        "superagent": "^5.2.1",
+        "superagent-proxy": "^2.0.0",
+        "tar": "^6.0.1",
+        "tslib": "^2.0.1"
+      },
+      "bin": {
+        "ionic": "bin/ionic"
+      },
+      "engines": {
+        "node": ">=10.3.0"
+      }
+    },
+    "node_modules/@ionic/cli-framework": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-5.1.0.tgz",
+      "integrity": "sha512-Hb/P2zuHB3zQZN0qG7Lxda8IlP2mHisfb0KR+wc9cw2BSiH+rtXRd/A4JxndPznjWs00PHbWiEm0Ehas2pA/nw==",
+      "dev": true,
+      "dependencies": {
+        "@ionic/cli-framework-output": "2.2.2",
+        "@ionic/utils-array": "2.1.5",
+        "@ionic/utils-fs": "3.1.5",
+        "@ionic/utils-object": "2.1.5",
+        "@ionic/utils-process": "2.1.8",
+        "@ionic/utils-stream": "3.1.5",
+        "@ionic/utils-subprocess": "2.1.8",
+        "@ionic/utils-terminal": "2.3.1",
+        "chalk": "^4.0.0",
+        "debug": "^4.0.0",
+        "lodash": "^4.17.5",
+        "minimist": "^1.2.0",
+        "rimraf": "^3.0.0",
+        "tslib": "^2.0.1",
+        "write-file-atomic": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10.3.0"
+      }
+    },
+    "node_modules/@ionic/cli-framework-output": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/@ionic/cli-framework-output/-/cli-framework-output-2.2.2.tgz",
+      "integrity": "sha512-eQYkqIW1/tCwSC6Bd0gjse96U11lDX/ikf3jvsjX7a8z/zwSmGzCHRizb7xogV65Ey+1/zyAZR71cpDRQuFLBQ==",
+      "dev": true,
+      "dependencies": {
+        "@ionic/utils-terminal": "2.3.1",
+        "debug": "^4.0.0",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10.3.0"
+      }
+    },
+    "node_modules/@ionic/cli-framework-output/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@ionic/cli-framework-output/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@ionic/cli-framework-prompts": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/@ionic/cli-framework-prompts/-/cli-framework-prompts-2.1.8.tgz",
+      "integrity": "sha512-DjO4lQsmvficsZbPmpGqSSx+F1BfgSTQBwRqL5bl9Dkh9rIZ/ckcJcKqCciVOw9kIY7WTeNFOTwj2vWrkFn7+Q==",
+      "dev": true,
+      "dependencies": {
+        "@ionic/utils-terminal": "2.3.1",
+        "debug": "^4.0.0",
+        "inquirer": "^7.0.0",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10.3.0"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/ansi-escapes": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.21.3"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/chalk": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/cli-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+      "dev": true,
+      "dependencies": {
+        "restore-cursor": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/cli-width": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
+      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/figures": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+      "dev": true,
+      "dependencies": {
+        "escape-string-regexp": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/inquirer": {
+      "version": "7.3.3",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz",
+      "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.1.0",
+        "cli-cursor": "^3.1.0",
+        "cli-width": "^3.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^3.0.0",
+        "lodash": "^4.17.19",
+        "mute-stream": "0.0.8",
+        "run-async": "^2.4.0",
+        "rxjs": "^6.6.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "through": "^2.3.6"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/restore-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "dev": true,
+      "dependencies": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/rxjs": {
+      "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/rxjs/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/string-width": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/type-fest": {
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@ionic/cli-framework/node_modules/chalk": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@ionic/cli-framework/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@ionic/cli-framework/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@ionic/cli/node_modules/chalk": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@ionic/cli/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@ionic/cli/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@ionic/cli/node_modules/os-name": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/os-name/-/os-name-4.0.0.tgz",
+      "integrity": "sha512-caABzDdJMbtykt7GmSogEat3faTKQhmZf0BS5l/pZGmP0vPWQjXWqOhbLyK+b6j2/DQPmEvYdzLXJXXLJNVDNg==",
+      "dev": true,
+      "dependencies": {
+        "macos-release": "^2.2.0",
+        "windows-release": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@ionic/cli/node_modules/windows-release": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-4.0.0.tgz",
+      "integrity": "sha512-OxmV4wzDKB1x7AZaZgXMVsdJ1qER1ed83ZrTYd5Bwq2HfJVg3DJS8nqlAG4sMoJ7mu8cuRmLEYyU13BKwctRAg==",
+      "dev": true,
+      "dependencies": {
+        "execa": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@ionic/core": {
+      "version": "5.6.6",
+      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.6.6.tgz",
+      "integrity": "sha512-EbVIXOTVVPxBo7hsarBpRSFNsQ22wBFtWkKmrmliieknG5LUkf5WZBpj4EENQhzYA6c+//7/nfhcD9pWgtAofA==",
+      "dependencies": {
+        "@stencil/core": "^2.4.0",
+        "ionicons": "^5.5.1",
+        "tslib": "^2.1.0"
+      }
+    },
+    "node_modules/@ionic/core/node_modules/tslib": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz",
+      "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w=="
+    },
+    "node_modules/@ionic/utils-array": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-2.1.5.tgz",
+      "integrity": "sha512-HD72a71IQVBmQckDwmA8RxNVMTbxnaLbgFOl+dO5tbvW9CkkSFCv41h6fUuNsSEVgngfkn0i98HDuZC8mk+lTA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.0.0",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10.3.0"
+      }
+    },
+    "node_modules/@ionic/utils-array/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@ionic/utils-array/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@ionic/utils-fs": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-3.1.5.tgz",
+      "integrity": "sha512-a41bY2dHqWSEQQ/80CpbXSs8McyiCFf2DnIWWLukrhYWf46h4qi6M/8dxcMKrofRiqI/3F+cL3S2mOm9Zz/o2Q==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.0.0",
+        "fs-extra": "^9.0.0",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10.3.0"
+      }
+    },
+    "node_modules/@ionic/utils-fs/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@ionic/utils-fs/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@ionic/utils-network": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-2.1.5.tgz",
+      "integrity": "sha512-HUQ1Ec4Mh2MXzzKdbbbDS6xYKwpFJ2XRY7SYXbaZT8+jiNahfHbsOfe62/p8bk41Yil7E9EagzGC2JvIFJh01w==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.0.0",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10.3.0"
+      }
+    },
+    "node_modules/@ionic/utils-network/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@ionic/utils-network/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@ionic/utils-object": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-object/-/utils-object-2.1.5.tgz",
+      "integrity": "sha512-XnYNSwfewUqxq+yjER1hxTKggftpNjFLJH0s37jcrNDwbzmbpFTQTVAp4ikNK4rd9DOebX/jbeZb8jfD86IYxw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.0.0",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10.3.0"
+      }
+    },
+    "node_modules/@ionic/utils-object/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@ionic/utils-object/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@ionic/utils-process": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-process/-/utils-process-2.1.8.tgz",
+      "integrity": "sha512-VBBoyTzi+m6tgKAItl+jiTQneGwTOsctcrTG4CsEgmVOVOEhUYkPhddXqzD+oC54hPDU9ROsd3I014P5CWEuhQ==",
+      "dev": true,
+      "dependencies": {
+        "@ionic/utils-object": "2.1.5",
+        "@ionic/utils-terminal": "2.3.1",
+        "debug": "^4.0.0",
+        "signal-exit": "^3.0.3",
+        "tree-kill": "^1.2.2",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10.3.0"
+      }
+    },
+    "node_modules/@ionic/utils-process/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@ionic/utils-process/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@ionic/utils-stream": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-stream/-/utils-stream-3.1.5.tgz",
+      "integrity": "sha512-hkm46uHvEC05X/8PHgdJi4l4zv9VQDELZTM+Kz69odtO9zZYfnt8DkfXHJqJ+PxmtiE5mk/ehJWLnn/XAczTUw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.0.0",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10.3.0"
+      }
+    },
+    "node_modules/@ionic/utils-stream/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@ionic/utils-stream/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@ionic/utils-subprocess": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-2.1.8.tgz",
+      "integrity": "sha512-pkmtf1LtXcEMPn6/cctREL2aZtZoy0+0Sl+nT0NIkOHIoBUcqrcfMWdctCSM4Mp6+2/hLWtgpHE3TOIibkWfIg==",
+      "dev": true,
+      "dependencies": {
+        "@ionic/utils-array": "2.1.5",
+        "@ionic/utils-fs": "3.1.5",
+        "@ionic/utils-process": "2.1.8",
+        "@ionic/utils-stream": "3.1.5",
+        "@ionic/utils-terminal": "2.3.1",
+        "cross-spawn": "^7.0.0",
+        "debug": "^4.0.0",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10.3.0"
+      }
+    },
+    "node_modules/@ionic/utils-subprocess/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@ionic/utils-subprocess/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@ionic/utils-terminal": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-2.3.1.tgz",
+      "integrity": "sha512-cglsSd2AckI3Ldtdfczeq64vIIDjtPspV5QJtky8f8uIdxkeOIGeRV7bCj1+BEf1hyo+ZuggQxLviHnbMZhiRw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.0.0",
+        "signal-exit": "^3.0.3",
+        "slice-ansi": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "tslib": "^2.0.1",
+        "untildify": "^4.0.0",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=10.3.0"
+      }
+    },
+    "node_modules/@ionic/utils-terminal/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@ionic/utils-terminal/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@ionic/utils-terminal/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/@ionic/utils-terminal/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@ionic/utils-terminal/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@ionic/utils-terminal/node_modules/string-width": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@ionic/utils-terminal/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@ionic/utils-terminal/node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.3.1",
+        "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
+        "js-yaml": "^3.13.1",
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/schema": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz",
+      "integrity": "sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jest/console": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.5.2.tgz",
+      "integrity": "sha512-lJELzKINpF1v74DXHbCRIkQ/+nUV1M+ntj+X1J8LxCgpmJZjfLmhFejiMSbjjD66fayxl5Z06tbs3HMyuik6rw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.5.2",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "jest-message-util": "^26.5.2",
+        "jest-util": "^26.5.2",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/console/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@jest/core": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.5.2.tgz",
+      "integrity": "sha512-LLTo1LQMg7eJjG/+P1NYqFof2B25EV1EqzD5FonklihG4UJKiK2JBIvWonunws6W7e+DhNLoFD+g05tCY03eyA==",
+      "dev": true,
+      "dependencies": {
+        "@jest/console": "^26.5.2",
+        "@jest/reporters": "^26.5.2",
+        "@jest/test-result": "^26.5.2",
+        "@jest/transform": "^26.5.2",
+        "@jest/types": "^26.5.2",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.4",
+        "jest-changed-files": "^26.5.2",
+        "jest-config": "^26.5.2",
+        "jest-haste-map": "^26.5.2",
+        "jest-message-util": "^26.5.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-resolve": "^26.5.2",
+        "jest-resolve-dependencies": "^26.5.2",
+        "jest-runner": "^26.5.2",
+        "jest-runtime": "^26.5.2",
+        "jest-snapshot": "^26.5.2",
+        "jest-util": "^26.5.2",
+        "jest-validate": "^26.5.2",
+        "jest-watcher": "^26.5.2",
+        "micromatch": "^4.0.2",
+        "p-each-series": "^2.1.0",
+        "rimraf": "^3.0.0",
+        "slash": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/core/node_modules/ansi-escapes": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
+      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.11.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@jest/core/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jest/core/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@jest/core/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jest/core/node_modules/type-fest": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
+      "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@jest/environment": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.5.2.tgz",
+      "integrity": "sha512-YjhCD/Zhkz0/1vdlS/QN6QmuUdDkpgBdK4SdiVg4Y19e29g4VQYN5Xg8+YuHjdoWGY7wJHMxc79uDTeTOy9Ngw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/fake-timers": "^26.5.2",
+        "@jest/types": "^26.5.2",
+        "@types/node": "*",
+        "jest-mock": "^26.5.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/fake-timers": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.5.2.tgz",
+      "integrity": "sha512-09Hn5Oraqt36V1akxQeWMVL0fR9c6PnEhpgLaYvREXZJAh2H2Y+QLCsl0g7uMoJeoWJAuz4tozk1prbR1Fc1sw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.5.2",
+        "@sinonjs/fake-timers": "^6.0.1",
+        "@types/node": "*",
+        "jest-message-util": "^26.5.2",
+        "jest-mock": "^26.5.2",
+        "jest-util": "^26.5.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/globals": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.5.2.tgz",
+      "integrity": "sha512-9PmnFsAUJxpPt1s/stq02acS1YHliVBDNfAWMe1bwdRr1iTCfhbNt3ERQXrO/ZfZSweftoA26Q/2yhSVSWQ3sw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^26.5.2",
+        "@jest/types": "^26.5.2",
+        "expect": "^26.5.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/reporters": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.5.2.tgz",
+      "integrity": "sha512-zvq6Wvy6MmJq/0QY0YfOPb49CXKSf42wkJbrBPkeypVa8I+XDxijvFuywo6TJBX/ILPrdrlE/FW9vJZh6Rf9vA==",
+      "dev": true,
+      "dependencies": {
+        "@bcoe/v8-coverage": "^0.2.3",
+        "@jest/console": "^26.5.2",
+        "@jest/test-result": "^26.5.2",
+        "@jest/transform": "^26.5.2",
+        "@jest/types": "^26.5.2",
+        "chalk": "^4.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "exit": "^0.1.2",
+        "glob": "^7.1.2",
+        "graceful-fs": "^4.2.4",
+        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-instrument": "^4.0.3",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^4.0.0",
+        "istanbul-reports": "^3.0.2",
+        "jest-haste-map": "^26.5.2",
+        "jest-resolve": "^26.5.2",
+        "jest-util": "^26.5.2",
+        "jest-worker": "^26.5.0",
+        "slash": "^3.0.0",
+        "source-map": "^0.6.0",
+        "string-length": "^4.0.1",
+        "terminal-link": "^2.0.0",
+        "v8-to-istanbul": "^5.0.1"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      },
+      "optionalDependencies": {
+        "node-notifier": "^8.0.0"
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/jest-worker": {
+      "version": "26.5.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.5.0.tgz",
+      "integrity": "sha512-kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@jest/source-map": {
+      "version": "26.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.5.0.tgz",
+      "integrity": "sha512-jWAw9ZwYHJMe9eZq/WrsHlwF8E3hM9gynlcDpOyCb9bR8wEd9ZNBZCi7/jZyzHxC7t3thZ10gO2IDhu0bPKS5g==",
+      "dev": true,
+      "dependencies": {
+        "callsites": "^3.0.0",
+        "graceful-fs": "^4.2.4",
+        "source-map": "^0.6.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/source-map/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@jest/test-result": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.5.2.tgz",
+      "integrity": "sha512-E/Zp6LURJEGSCWpoMGmCFuuEI1OWuI3hmZwmULV0GsgJBh7u0rwqioxhRU95euUuviqBDN8ruX/vP/4bwYolXw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/console": "^26.5.2",
+        "@jest/types": "^26.5.2",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "collect-v8-coverage": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/test-sequencer": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.5.2.tgz",
+      "integrity": "sha512-XmGEh7hh07H2B8mHLFCIgr7gA5Y6Hw1ZATIsbz2fOhpnQ5AnQtZk0gmP0Q5/+mVB2xygO64tVFQxOajzoptkNA==",
+      "dev": true,
+      "dependencies": {
+        "@jest/test-result": "^26.5.2",
+        "graceful-fs": "^4.2.4",
+        "jest-haste-map": "^26.5.2",
+        "jest-runner": "^26.5.2",
+        "jest-runtime": "^26.5.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/transform": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.5.2.tgz",
+      "integrity": "sha512-AUNjvexh+APhhmS8S+KboPz+D3pCxPvEAGduffaAJYxIFxGi/ytZQkrqcKDUU0ERBAo5R7087fyOYr2oms1seg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.1.0",
+        "@jest/types": "^26.5.2",
+        "babel-plugin-istanbul": "^6.0.0",
+        "chalk": "^4.0.0",
+        "convert-source-map": "^1.4.0",
+        "fast-json-stable-stringify": "^2.0.0",
+        "graceful-fs": "^4.2.4",
+        "jest-haste-map": "^26.5.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-util": "^26.5.2",
+        "micromatch": "^4.0.2",
+        "pirates": "^4.0.1",
+        "slash": "^3.0.0",
+        "source-map": "^0.6.1",
+        "write-file-atomic": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/transform/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@jest/transform/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@jest/types": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.5.2.tgz",
+      "integrity": "sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==",
+      "dev": true,
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^15.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/types/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@jsdevtools/coverage-istanbul-loader": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@jsdevtools/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.3.tgz",
+      "integrity": "sha512-TAdNkeGB5Fe4Og+ZkAr1Kvn9by2sfL44IAHFtxlh1BA1XJ5cLpO9iSNki5opWESv3l3vSHsZ9BNKuqFKbEbFaA==",
+      "dev": true,
+      "dependencies": {
+        "convert-source-map": "^1.7.0",
+        "istanbul-lib-instrument": "^4.0.1",
+        "loader-utils": "^1.4.0",
+        "merge-source-map": "^1.1.0",
+        "schema-utils": "^2.6.4"
+      }
+    },
+    "node_modules/@jsdevtools/coverage-istanbul-loader/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/@jsdevtools/coverage-istanbul-loader/node_modules/loader-utils": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/@moodlehq/cordova-plugin-file-transfer": {
+      "version": "1.7.1-moodle.2",
+      "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-file-transfer/-/cordova-plugin-file-transfer-1.7.1-moodle.2.tgz",
+      "integrity": "sha512-nvddQelAwPXmvjv0YJJwuf2xFNi78ZmTa47BgtHGebOvdKpmcbphkOQAVN7KMheL4J3KNE9DbMBHwEHkGGkH4g==",
+      "engines": {
+        "cordovaDependencies": {
+          "3.0.0": {
+            "cordova": ">100"
+          }
+        }
+      }
+    },
+    "node_modules/@moodlehq/cordova-plugin-inappbrowser": {
+      "version": "5.0.0-moodle.2",
+      "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-inappbrowser/-/cordova-plugin-inappbrowser-5.0.0-moodle.2.tgz",
+      "integrity": "sha512-0JOLHUFEJC3fv4OQuyr2kwNyrb7oeyjmfFLQ+LcKO41e6UOnNy/du0hU7Yz9Rh8B2zGcebvSwMrN+cRSCqlipQ==",
+      "engines": {
+        "cordovaDependencies": {
+          "0.2.3": {
+            "cordova": ">=3.1.0"
+          },
+          "4.0.0": {
+            "cordova": ">=3.1.0",
+            "cordova-ios": ">=4.0.0"
+          },
+          "5.0.0": {
+            "cordova": ">=9.0.0",
+            "cordova-android": ">=9.0.0",
+            "cordova-ios": ">=6.0.0"
+          },
+          "6.0.0": {
+            "cordova": ">100"
+          }
+        }
+      }
+    },
+    "node_modules/@moodlehq/cordova-plugin-local-notification": {
+      "version": "0.9.0-moodle.2",
+      "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-local-notification/-/cordova-plugin-local-notification-0.9.0-moodle.2.tgz",
+      "integrity": "sha512-enK/jcbXrnSFJt8TS2drb/5uUOpsTYbUqjI3pYgvogKdP5k5JOnT0xtW54Arlpl5RphcINx733OuXHRJAED2Ow==",
+      "engines": [
+        {
+          "name": "cordova",
+          "version": ">=3.6.0"
+        },
+        {
+          "name": "cordova-android",
+          "version": ">=6.0.0"
+        },
+        {
+          "name": "cordova-windows",
+          "version": ">=4.2.0"
+        },
+        {
+          "name": "android-sdk",
+          "version": ">=26"
+        },
+        {
+          "name": "apple-ios",
+          "version": ">=10.0.0"
+        }
+      ]
+    },
+    "node_modules/@moodlehq/cordova-plugin-qrscanner": {
+      "version": "3.0.1-moodle.2",
+      "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-qrscanner/-/cordova-plugin-qrscanner-3.0.1-moodle.2.tgz",
+      "integrity": "sha512-bjMI94QTEaUOl5TbK8K+HZI3gcR8HHfYTocsA1/C1HMKD3nROhGtwvuVDNvb+ogknv9WVQDyGnfMAnNihYH+PQ==",
+      "dependencies": {
+        "qrcode-reader": "^1.0.4",
+        "webrtc-adapter": "^3.1.4"
+      }
+    },
+    "node_modules/@moodlehq/phonegap-plugin-push": {
+      "version": "2.2.3-moodle.1",
+      "resolved": "https://registry.npmjs.org/@moodlehq/phonegap-plugin-push/-/phonegap-plugin-push-2.2.3-moodle.1.tgz",
+      "integrity": "sha512-LxHz0nPIvxhRgjvj8QRTdhuMtb+NNbFsaAh7JS6q9Ag0lt3LkKrGwCoMr/rTfhfCLj+mrIhyLUv/mo8oPmHeeg==",
+      "dependencies": {
+        "babel-plugin-add-header-comment": "^1.0.3",
+        "install": "^0.8.2"
+      },
+      "engines": {
+        "cordovaDependencies": {
+          "<2.0.0": {
+            "cordova": ">=6.4.0",
+            "cordova-android": ">=6.0.0",
+            "cordova-ios": ">=4.3.0"
+          },
+          "<2.1.2": {
+            "cordova": ">=7.1.0",
+            "cordova-android": ">=6.3.0",
+            "cordova-ios": ">=4.4.0"
+          },
+          "<2.2.0": {
+            "cordova": ">=7.1.0",
+            "cordova-android": ">=6.3.0",
+            "cordova-ios": ">=4.5.0"
+          },
+          "1.8.2": {
+            "cordova": ">=3.6.3",
+            "cordova-android": ">=4.0.0",
+            "cordova-ios": ">=4.1.0"
+          },
+          "2.0.0": {
+            "cordova": ">=7.0.0",
+            "cordova-android": ">=6.2.1",
+            "cordova-ios": ">=4.4.0"
+          },
+          "2.2.0": {
+            "cordova": ">=7.1.0",
+            "cordova-android": ">=7.1.0",
+            "cordova-ios": ">=4.5.0"
+          }
+        }
+      }
+    },
+    "node_modules/@netflix/nerror": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@netflix/nerror/-/nerror-1.1.3.tgz",
+      "integrity": "sha512-b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg==",
+      "dependencies": {
+        "assert-plus": "^1.0.0",
+        "extsprintf": "^1.4.0",
+        "lodash": "^4.17.15"
+      }
+    },
+    "node_modules/@ngtools/webpack": {
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-10.0.8.tgz",
+      "integrity": "sha512-Qv4v7O4VGeWuXjRThd/mdC2I4cJOgQ7kDrVN7vkDB2EW5xtRB+/4hghvFeO3bD11FLuFvCxBMb0HbwyKoVQgEQ==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "10.0.8",
+        "enhanced-resolve": "4.1.1",
+        "rxjs": "6.5.5",
+        "webpack-sources": "1.4.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
+        "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "@angular/compiler-cli": ">=10.0.0-next.0 < 11",
+        "typescript": ">=3.9 < 3.10",
+        "webpack": "^4.0.0"
+      }
+    },
+    "node_modules/@ngtools/webpack/node_modules/@angular-devkit/core": {
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
+      "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "6.12.3",
+        "fast-json-stable-stringify": "2.1.0",
+        "magic-string": "0.25.7",
+        "rxjs": "6.5.5",
+        "source-map": "0.7.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@ngtools/webpack/node_modules/ajv": {
+      "version": "6.12.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@ngx-translate/core": {
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-13.0.0.tgz",
+      "integrity": "sha512-+tzEp8wlqEnw0Gc7jtVRAJ6RteUjXw6JJR4O65KlnxOmJrCGPI0xjV/lKRnQeU0w4i96PQs/jtpL921Wrb7PWg==",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@angular/core": ">=10.0.0",
+        "rxjs": ">=6.5.3"
+      }
+    },
+    "node_modules/@ngx-translate/http-loader": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@ngx-translate/http-loader/-/http-loader-6.0.0.tgz",
+      "integrity": "sha512-LCekn6qCbeXWlhESCxU1rAbZz33WzDG0lI7Ig0pYC1o5YxJWrkU9y3Y4tNi+jakQ7R6YhTR2D3ox6APxDtA0wA==",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@angular/common": ">=10.0.0",
+        "@ngx-translate/core": ">=13.0.0",
+        "rxjs": ">=6.5.3"
+      }
+    },
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz",
+      "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==",
+      "dependencies": {
+        "@nodelib/fs.stat": "2.0.3",
+        "run-parallel": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz",
+      "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz",
+      "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==",
+      "dependencies": {
+        "@nodelib/fs.scandir": "2.1.3",
+        "fastq": "^1.6.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@npmcli/move-file": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.0.1.tgz",
+      "integrity": "sha512-Uv6h1sT+0DrblvIrolFtbvM1FgWm+/sy4B3pvLp67Zys+thcukzS5ekn7HsZFGpWP4Q3fYJCljbWQE/XivMRLw==",
+      "dev": true,
+      "dependencies": {
+        "mkdirp": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@npmcli/move-file/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "dev": true,
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@schematics/angular": {
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-10.0.8.tgz",
+      "integrity": "sha512-KNO61UGtiKMQSG+NbusqLtwLbxId0y+xpXJt9PKFwi+vaViOO+YzOPREfiFCuQ7q6X8SmNlrMj6sZ34E2YN1pQ==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "10.0.8",
+        "@angular-devkit/schematics": "10.0.8"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@schematics/angular/node_modules/@angular-devkit/core": {
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
+      "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "6.12.3",
+        "fast-json-stable-stringify": "2.1.0",
+        "magic-string": "0.25.7",
+        "rxjs": "6.5.5",
+        "source-map": "0.7.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@schematics/angular/node_modules/ajv": {
+      "version": "6.12.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@schematics/update": {
+      "version": "0.1000.8",
+      "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.1000.8.tgz",
+      "integrity": "sha512-xHuj6ME3PNTsVUrpftd98LF3WHPM0NU25GcT/n0E/j0/52yDTiaPS3wUnYSK8ZSv4Et4hcyGx7f/LEXAoOKJXw==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "10.0.8",
+        "@angular-devkit/schematics": "10.0.8",
+        "@yarnpkg/lockfile": "1.1.0",
+        "ini": "1.3.5",
+        "npm-package-arg": "^8.0.0",
+        "pacote": "9.5.12",
+        "rxjs": "6.5.5",
+        "semver": "7.3.2",
+        "semver-intersect": "1.4.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@schematics/update/node_modules/@angular-devkit/core": {
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
+      "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "6.12.3",
+        "fast-json-stable-stringify": "2.1.0",
+        "magic-string": "0.25.7",
+        "rxjs": "6.5.5",
+        "source-map": "0.7.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@schematics/update/node_modules/ajv": {
+      "version": "6.12.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@sindresorhus/is": {
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
+      "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@sinonjs/commons": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.1.tgz",
+      "integrity": "sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw==",
+      "dev": true,
+      "dependencies": {
+        "type-detect": "4.0.8"
+      }
+    },
+    "node_modules/@sinonjs/fake-timers": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz",
+      "integrity": "sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==",
+      "dev": true,
+      "dependencies": {
+        "@sinonjs/commons": "^1.7.0"
+      }
+    },
+    "node_modules/@stencil/core": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.5.2.tgz",
+      "integrity": "sha512-bgjPXkSzzg1WnTgVUm6m5ZzpKt602WmA/QljODAW1xVN40OHJdbGblzF/F6MFzqv2c5Cy30CB41arc8qADIdcQ==",
+      "bin": {
+        "stencil": "bin/stencil"
+      },
+      "engines": {
+        "node": ">=12.10.0",
+        "npm": ">=6.0.0"
+      }
+    },
+    "node_modules/@szmarczak/http-timer": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz",
+      "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==",
+      "dependencies": {
+        "defer-to-connect": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@tootallnate/once": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/@types/babel__core": {
+      "version": "7.1.10",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.10.tgz",
+      "integrity": "sha512-x8OM8XzITIMyiwl5Vmo2B1cR1S1Ipkyv4mdlbJjMa1lmuKvKY9FrBbEANIaMlnWn5Rf7uO+rC/VgYabNkE17Hw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0",
+        "@types/babel__generator": "*",
+        "@types/babel__template": "*",
+        "@types/babel__traverse": "*"
+      }
+    },
+    "node_modules/@types/babel__generator": {
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.2.tgz",
+      "integrity": "sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__template": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.3.tgz",
+      "integrity": "sha512-uCoznIPDmnickEi6D0v11SBpW0OuVqHJCa7syXqQHy5uktSCreIlt0iglsCnmvz8yCb38hGcWeseA8cWJSwv5Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__traverse": {
+      "version": "7.0.15",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.15.tgz",
+      "integrity": "sha512-Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.3.0"
+      }
+    },
+    "node_modules/@types/chart.js": {
+      "version": "2.9.31",
+      "resolved": "https://registry.npmjs.org/@types/chart.js/-/chart.js-2.9.31.tgz",
+      "integrity": "sha512-hzS6phN/kx3jClk3iYqEHNnYIRSi4RZrIGJ8CDLjgatpHoftCezvC44uqB3o3OUm9ftU1m7sHG8+RLyPTlACrA==",
+      "dependencies": {
+        "moment": "^2.10.2"
+      }
+    },
+    "node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@types/dom-mediacapture-record": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/@types/dom-mediacapture-record/-/dom-mediacapture-record-1.0.7.tgz",
+      "integrity": "sha512-ddDIRTO1ajtbxaNo2o7fPJggpN54PZf1ZUJKOjto2ENMJE/9GKUvaw3ZRuQzlS/p0E+PnIcssxfoqYJ4yiXSBw=="
+    },
+    "node_modules/@types/faker": {
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/@types/faker/-/faker-5.1.3.tgz",
+      "integrity": "sha512-7YTyCRoujZWYaCpDLslQJ8QzaFWFLZZ3mZ7Vfr/jJHascRmSd05pYteyt2FK4btF2vXyGq0obuoyLpcF99OvaA==",
+      "dev": true
+    },
+    "node_modules/@types/glob": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
+      "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==",
+      "dev": true,
+      "dependencies": {
+        "@types/minimatch": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/graceful-fs": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.3.tgz",
+      "integrity": "sha512-AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/istanbul-lib-coverage": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
+      "integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==",
+      "dev": true
+    },
+    "node_modules/@types/istanbul-lib-report": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+      "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
+      "dev": true,
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "*"
+      }
+    },
+    "node_modules/@types/istanbul-reports": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
+      "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
+      "dev": true,
+      "dependencies": {
+        "@types/istanbul-lib-report": "*"
+      }
+    },
+    "node_modules/@types/jest": {
+      "version": "26.0.14",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.14.tgz",
+      "integrity": "sha512-Hz5q8Vu0D288x3iWXePSn53W7hAjP0H7EQ6QvDO9c7t46mR0lNOLlfuwQ+JkVxuhygHzlzPX+0jKdA3ZgSh+Vg==",
+      "dev": true,
+      "dependencies": {
+        "jest-diff": "^25.2.1",
+        "pretty-format": "^25.2.1"
+      }
+    },
+    "node_modules/@types/jest/node_modules/@jest/types": {
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
+      "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
+      "dev": true,
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^1.1.1",
+        "@types/yargs": "^15.0.0",
+        "chalk": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8.3"
+      }
+    },
+    "node_modules/@types/jest/node_modules/@types/istanbul-reports": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
+      "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
+      "dev": true,
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "*",
+        "@types/istanbul-lib-report": "*"
+      }
+    },
+    "node_modules/@types/jest/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@types/jest/node_modules/diff-sequences": {
+      "version": "25.2.6",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz",
+      "integrity": "sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8.3"
+      }
+    },
+    "node_modules/@types/jest/node_modules/jest-diff": {
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz",
+      "integrity": "sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^3.0.0",
+        "diff-sequences": "^25.2.6",
+        "jest-get-type": "^25.2.6",
+        "pretty-format": "^25.5.0"
+      },
+      "engines": {
+        "node": ">= 8.3"
+      }
+    },
+    "node_modules/@types/jest/node_modules/jest-get-type": {
+      "version": "25.2.6",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz",
+      "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8.3"
+      }
+    },
+    "node_modules/@types/jest/node_modules/pretty-format": {
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz",
+      "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^25.5.0",
+        "ansi-regex": "^5.0.0",
+        "ansi-styles": "^4.0.0",
+        "react-is": "^16.12.0"
+      },
+      "engines": {
+        "node": ">= 8.3"
+      }
+    },
+    "node_modules/@types/json-schema": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz",
+      "integrity": "sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==",
+      "dev": true
+    },
+    "node_modules/@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
+      "dev": true
+    },
+    "node_modules/@types/minimatch": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
+      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
+      "dev": true
+    },
+    "node_modules/@types/node": {
+      "version": "12.12.64",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.64.tgz",
+      "integrity": "sha512-UV1/ZJMC+HcP902wWdpC43cAcGu0IQk/I5bXjP2aSuCjsk3cE74mDvFrLKga7oDC170ugOAYBwfT4DSQW3akDA==",
+      "dev": true
+    },
+    "node_modules/@types/normalize-package-data": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
+      "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
+      "dev": true
+    },
+    "node_modules/@types/prettier": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.1.1.tgz",
+      "integrity": "sha512-2zs+O+UkDsJ1Vcp667pd3f8xearMdopz/z54i99wtRDI5KLmngk7vlrYZD0ZjKHaROR03EznlBbVY9PfAEyJIQ==",
+      "dev": true
+    },
+    "node_modules/@types/q": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz",
+      "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==",
+      "dev": true
+    },
+    "node_modules/@types/resize-observer-browser": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/@types/resize-observer-browser/-/resize-observer-browser-0.1.5.tgz",
+      "integrity": "sha512-8k/67Z95Goa6Lznuykxkfhq9YU3l1Qe6LNZmwde1u7802a3x8v44oq0j91DICclxatTr0rNnhXx7+VTIetSrSQ==",
+      "dev": true
+    },
+    "node_modules/@types/source-list-map": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
+      "integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==",
+      "dev": true
+    },
+    "node_modules/@types/stack-utils": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.0.tgz",
+      "integrity": "sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==",
+      "dev": true
+    },
+    "node_modules/@types/webpack-env": {
+      "version": "1.16.0",
+      "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.16.0.tgz",
+      "integrity": "sha512-Fx+NpfOO0CpeYX2g9bkvX8O5qh9wrU1sOF4g8sft4Mu7z+qfe387YlyY8w8daDyDsKY5vUxM0yxkAYnbkRbZEw==",
+      "dev": true
+    },
+    "node_modules/@types/webpack-sources": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.8.tgz",
+      "integrity": "sha512-JHB2/xZlXOjzjBB6fMOpH1eQAfsrpqVVIbneE0Rok16WXwFaznaI5vfg75U5WgGJm7V9W1c4xeRQDjX/zwvghA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "@types/source-list-map": "*",
+        "source-map": "^0.6.1"
+      }
+    },
+    "node_modules/@types/webpack-sources/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@types/yargs": {
+      "version": "15.0.7",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.7.tgz",
+      "integrity": "sha512-Gf4u3EjaPNcC9cTu4/j2oN14nSVhr8PQ+BvBcBQHAhDZfl0bVIiLgvnRXv/dn58XhTm9UXvBpvJpDlwV65QxOA==",
+      "dev": true,
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/@types/yargs-parser": {
+      "version": "15.0.0",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz",
+      "integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==",
+      "dev": true
+    },
+    "node_modules/@typescript-eslint/eslint-plugin": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.22.0.tgz",
+      "integrity": "sha512-U8SP9VOs275iDXaL08Ln1Fa/wLXfj5aTr/1c0t0j6CdbOnxh+TruXu1p4I0NAvdPBQgoPjHsgKn28mOi0FzfoA==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/experimental-utils": "4.22.0",
+        "@typescript-eslint/scope-manager": "4.22.0",
+        "debug": "^4.1.1",
+        "functional-red-black-tree": "^1.0.1",
+        "lodash": "^4.17.15",
+        "regexpp": "^3.0.0",
+        "semver": "^7.3.2",
+        "tsutils": "^3.17.1"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/parser": "^4.0.0",
+        "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/experimental-utils": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.22.0.tgz",
+      "integrity": "sha512-xJXHHl6TuAxB5AWiVrGhvbGL8/hbiCQ8FiWwObO3r0fnvBdrbWEDy1hlvGQOAWc6qsCWuWMKdVWlLAEMpxnddg==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.3",
+        "@typescript-eslint/scope-manager": "4.22.0",
+        "@typescript-eslint/types": "4.22.0",
+        "@typescript-eslint/typescript-estree": "4.22.0",
+        "eslint-scope": "^5.0.0",
+        "eslint-utils": "^2.0.0"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "*"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.22.0.tgz",
+      "integrity": "sha512-OcCO7LTdk6ukawUM40wo61WdeoA7NM/zaoq1/2cs13M7GyiF+T4rxuA4xM+6LeHWjWbss7hkGXjFDRcKD4O04Q==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.22.0",
+        "@typescript-eslint/visitor-keys": "4.22.0"
+      },
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.22.0.tgz",
+      "integrity": "sha512-sW/BiXmmyMqDPO2kpOhSy2Py5w6KvRRsKZnV0c4+0nr4GIcedJwXAq+RHNK4lLVEZAJYFltnnk1tJSlbeS9lYA==",
+      "dev": true,
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.0.tgz",
+      "integrity": "sha512-TkIFeu5JEeSs5ze/4NID+PIcVjgoU3cUQUIZnH3Sb1cEn1lBo7StSV5bwPuJQuoxKXlzAObjYTilOEKRuhR5yg==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.22.0",
+        "@typescript-eslint/visitor-keys": "4.22.0",
+        "debug": "^4.1.1",
+        "globby": "^11.0.1",
+        "is-glob": "^4.0.1",
+        "semver": "^7.3.2",
+        "tsutils": "^3.17.1"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.0.tgz",
+      "integrity": "sha512-nnMu4F+s4o0sll6cBSsTeVsT4cwxB7zECK3dFxzEjPBii9xLpq4yqqsy/FU5zMfan6G60DKZSCXAa3sHJZrcYw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.22.0",
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@typescript-eslint/experimental-utils": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.22.0.tgz",
+      "integrity": "sha512-xJXHHl6TuAxB5AWiVrGhvbGL8/hbiCQ8FiWwObO3r0fnvBdrbWEDy1hlvGQOAWc6qsCWuWMKdVWlLAEMpxnddg==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.3",
+        "@typescript-eslint/scope-manager": "4.22.0",
+        "@typescript-eslint/types": "4.22.0",
+        "@typescript-eslint/typescript-estree": "4.22.0",
+        "eslint-scope": "^5.0.0",
+        "eslint-utils": "^2.0.0"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "*"
+      }
+    },
+    "node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/parser": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.22.0.tgz",
+      "integrity": "sha512-z/bGdBJJZJN76nvAY9DkJANYgK3nlRstRRi74WHm3jjgf2I8AglrSY+6l7ogxOmn55YJ6oKZCLLy+6PW70z15Q==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/scope-manager": "4.22.0",
+        "@typescript-eslint/types": "4.22.0",
+        "@typescript-eslint/typescript-estree": "4.22.0",
+        "debug": "^4.1.1"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.22.0.tgz",
+      "integrity": "sha512-OcCO7LTdk6ukawUM40wo61WdeoA7NM/zaoq1/2cs13M7GyiF+T4rxuA4xM+6LeHWjWbss7hkGXjFDRcKD4O04Q==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.22.0",
+        "@typescript-eslint/visitor-keys": "4.22.0"
+      },
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.22.0.tgz",
+      "integrity": "sha512-sW/BiXmmyMqDPO2kpOhSy2Py5w6KvRRsKZnV0c4+0nr4GIcedJwXAq+RHNK4lLVEZAJYFltnnk1tJSlbeS9lYA==",
+      "dev": true,
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.0.tgz",
+      "integrity": "sha512-TkIFeu5JEeSs5ze/4NID+PIcVjgoU3cUQUIZnH3Sb1cEn1lBo7StSV5bwPuJQuoxKXlzAObjYTilOEKRuhR5yg==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.22.0",
+        "@typescript-eslint/visitor-keys": "4.22.0",
+        "debug": "^4.1.1",
+        "globby": "^11.0.1",
+        "is-glob": "^4.0.1",
+        "semver": "^7.3.2",
+        "tsutils": "^3.17.1"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.0.tgz",
+      "integrity": "sha512-nnMu4F+s4o0sll6cBSsTeVsT4cwxB7zECK3dFxzEjPBii9xLpq4yqqsy/FU5zMfan6G60DKZSCXAa3sHJZrcYw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.22.0",
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.22.0.tgz",
+      "integrity": "sha512-OcCO7LTdk6ukawUM40wo61WdeoA7NM/zaoq1/2cs13M7GyiF+T4rxuA4xM+6LeHWjWbss7hkGXjFDRcKD4O04Q==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.22.0",
+        "@typescript-eslint/visitor-keys": "4.22.0"
+      },
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/types": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.22.0.tgz",
+      "integrity": "sha512-sW/BiXmmyMqDPO2kpOhSy2Py5w6KvRRsKZnV0c4+0nr4GIcedJwXAq+RHNK4lLVEZAJYFltnnk1tJSlbeS9lYA==",
+      "dev": true,
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.0.tgz",
+      "integrity": "sha512-TkIFeu5JEeSs5ze/4NID+PIcVjgoU3cUQUIZnH3Sb1cEn1lBo7StSV5bwPuJQuoxKXlzAObjYTilOEKRuhR5yg==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.22.0",
+        "@typescript-eslint/visitor-keys": "4.22.0",
+        "debug": "^4.1.1",
+        "globby": "^11.0.1",
+        "is-glob": "^4.0.1",
+        "semver": "^7.3.2",
+        "tsutils": "^3.17.1"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@typescript-eslint/visitor-keys": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.0.tgz",
+      "integrity": "sha512-nnMu4F+s4o0sll6cBSsTeVsT4cwxB7zECK3dFxzEjPBii9xLpq4yqqsy/FU5zMfan6G60DKZSCXAa3sHJZrcYw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.22.0",
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@webassemblyjs/ast": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz",
+      "integrity": "sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/helper-module-context": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/wast-parser": "1.9.0"
+      }
+    },
+    "node_modules/@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz",
+      "integrity": "sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-api-error": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz",
+      "integrity": "sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-buffer": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz",
+      "integrity": "sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-code-frame": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz",
+      "integrity": "sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/wast-printer": "1.9.0"
+      }
+    },
+    "node_modules/@webassemblyjs/helper-fsm": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz",
+      "integrity": "sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-module-context": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz",
+      "integrity": "sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.9.0"
+      }
+    },
+    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz",
+      "integrity": "sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-wasm-section": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz",
+      "integrity": "sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-buffer": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/wasm-gen": "1.9.0"
+      }
+    },
+    "node_modules/@webassemblyjs/ieee754": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz",
+      "integrity": "sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==",
+      "dev": true,
+      "dependencies": {
+        "@xtuc/ieee754": "^1.2.0"
+      }
+    },
+    "node_modules/@webassemblyjs/leb128": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz",
+      "integrity": "sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==",
+      "dev": true,
+      "dependencies": {
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/utf8": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz",
+      "integrity": "sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/wasm-edit": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz",
+      "integrity": "sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-buffer": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/helper-wasm-section": "1.9.0",
+        "@webassemblyjs/wasm-gen": "1.9.0",
+        "@webassemblyjs/wasm-opt": "1.9.0",
+        "@webassemblyjs/wasm-parser": "1.9.0",
+        "@webassemblyjs/wast-printer": "1.9.0"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-gen": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz",
+      "integrity": "sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/ieee754": "1.9.0",
+        "@webassemblyjs/leb128": "1.9.0",
+        "@webassemblyjs/utf8": "1.9.0"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-opt": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz",
+      "integrity": "sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-buffer": "1.9.0",
+        "@webassemblyjs/wasm-gen": "1.9.0",
+        "@webassemblyjs/wasm-parser": "1.9.0"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-parser": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz",
+      "integrity": "sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-api-error": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/ieee754": "1.9.0",
+        "@webassemblyjs/leb128": "1.9.0",
+        "@webassemblyjs/utf8": "1.9.0"
+      }
+    },
+    "node_modules/@webassemblyjs/wast-parser": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz",
+      "integrity": "sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/floating-point-hex-parser": "1.9.0",
+        "@webassemblyjs/helper-api-error": "1.9.0",
+        "@webassemblyjs/helper-code-frame": "1.9.0",
+        "@webassemblyjs/helper-fsm": "1.9.0",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/wast-printer": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz",
+      "integrity": "sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/wast-parser": "1.9.0",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+      "dev": true
+    },
+    "node_modules/@xtuc/long": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+      "dev": true
+    },
+    "node_modules/@yarnpkg/lockfile": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz",
+      "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==",
+      "dev": true
+    },
+    "node_modules/abab": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
+      "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==",
+      "dev": true
+    },
+    "node_modules/abbrev": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
+    },
+    "node_modules/accepts": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
+      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
+      "dependencies": {
+        "mime-types": "~2.1.24",
+        "negotiator": "0.6.2"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/acorn": {
+      "version": "6.4.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
+      "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-globals": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
+      "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^7.1.1",
+        "acorn-walk": "^7.1.1"
+      }
+    },
+    "node_modules/acorn-globals/node_modules/acorn": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-jsx": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
+      "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
+      "dev": true,
+      "peerDependencies": {
+        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/acorn-walk": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/adjust-sourcemap-loader": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-2.0.0.tgz",
+      "integrity": "sha512-4hFsTsn58+YjrU9qKzML2JSSDqKvN8mUGQ0nNIrfPi8hmIONT4L3uUaT6MKdMsZ9AjsU6D2xDkZxCkbQPxChrA==",
+      "dev": true,
+      "dependencies": {
+        "assert": "1.4.1",
+        "camelcase": "5.0.0",
+        "loader-utils": "1.2.3",
+        "object-path": "0.11.4",
+        "regex-parser": "2.2.10"
+      }
+    },
+    "node_modules/adjust-sourcemap-loader/node_modules/camelcase": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz",
+      "integrity": "sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/adjust-sourcemap-loader/node_modules/emojis-list": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
+      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/adjust-sourcemap-loader/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/adjust-sourcemap-loader/node_modules/loader-utils": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
+      "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^2.0.0",
+        "json5": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/agent-base": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
+      "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
+      "dev": true,
+      "dependencies": {
+        "es6-promisify": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/agentkeepalive": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.5.2.tgz",
+      "integrity": "sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==",
+      "dev": true,
+      "dependencies": {
+        "humanize-ms": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/aggregate-error": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
+      "dev": true,
+      "dependencies": {
+        "clean-stack": "^2.0.0",
+        "indent-string": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "6.12.5",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz",
+      "integrity": "sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ajv-errors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
+      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
+      "dev": true,
+      "peerDependencies": {
+        "ajv": ">=5.0.0"
+      }
+    },
+    "node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/alphanum-sort": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
+      "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
+      "dev": true
+    },
+    "node_modules/android-versions": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-1.6.0.tgz",
+      "integrity": "sha512-ojC2Ig7b/KJ6iNtR8e4bacmOsJyEkoERk3CKMIsnH7kJz5z6551NMbrVaRb7KXYavu1d74Uhml/bfcmqT3nAcg==",
+      "dependencies": {
+        "semver": "^5.7.1"
+      }
+    },
+    "node_modules/android-versions/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/ansi": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz",
+      "integrity": "sha1-DELU+xcWDVqa8eSEus4cZpIsGyE="
+    },
+    "node_modules/ansi-align": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz",
+      "integrity": "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==",
+      "dependencies": {
+        "string-width": "^3.0.0"
+      }
+    },
+    "node_modules/ansi-align/node_modules/string-width": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+      "dependencies": {
+        "emoji-regex": "^7.0.1",
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ansi-colors": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
+      "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ansi-cyan": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz",
+      "integrity": "sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM=",
+      "dev": true,
+      "dependencies": {
+        "ansi-wrap": "0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ansi-escapes": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ansi-gray": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
+      "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=",
+      "dev": true,
+      "dependencies": {
+        "ansi-wrap": "0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ansi-html": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
+      "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=",
+      "dev": true,
+      "engines": [
+        "node >= 0.8.0"
+      ],
+      "bin": {
+        "ansi-html": "bin/ansi-html"
+      }
+    },
+    "node_modules/ansi-red": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz",
+      "integrity": "sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw=",
+      "dev": true,
+      "dependencies": {
+        "ansi-wrap": "0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/ansi-wrap": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
+      "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/anymatch": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+      "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+      "dev": true,
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/append-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz",
+      "integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=",
+      "dev": true,
+      "dependencies": {
+        "buffer-equal": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/aproba": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+      "devOptional": true
+    },
+    "node_modules/archy": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
+      "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
+      "dev": true
+    },
+    "node_modules/are-we-there-yet": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
+      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
+      "optional": true,
+      "dependencies": {
+        "delegates": "^1.0.0",
+        "readable-stream": "^2.0.6"
+      }
+    },
+    "node_modules/arg": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
+      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
+      "dev": true
+    },
+    "node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/aria-query": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
+      "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.10.2",
+        "@babel/runtime-corejs3": "^7.10.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
+    "node_modules/aria-query/node_modules/@babel/runtime": {
+      "version": "7.13.17",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.17.tgz",
+      "integrity": "sha512-NCdgJEelPTSh+FEFylhnP1ylq848l1z9t9N0j1Lfbcw0+KXGjsTvUmkxy+voLLXB5SOKMbLLx4jxYliGrYQseA==",
+      "dev": true,
+      "dependencies": {
+        "regenerator-runtime": "^0.13.4"
+      }
+    },
+    "node_modules/arity-n": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/arity-n/-/arity-n-1.0.4.tgz",
+      "integrity": "sha1-2edrEXM+CFacCEeuezmyhgswt0U=",
+      "dev": true
+    },
+    "node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/arr-filter": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz",
+      "integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=",
+      "dev": true,
+      "dependencies": {
+        "make-iterator": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/arr-map": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz",
+      "integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ=",
+      "dev": true,
+      "dependencies": {
+        "make-iterator": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-each": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
+      "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-find-index": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
+      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-flatten": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
+    },
+    "node_modules/array-includes": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.3.tgz",
+      "integrity": "sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.18.0-next.2",
+        "get-intrinsic": "^1.1.1",
+        "is-string": "^1.0.5"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/es-abstract": {
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz",
+      "integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.2",
+        "is-callable": "^1.2.3",
+        "is-negative-zero": "^2.0.1",
+        "is-regex": "^1.1.2",
+        "is-string": "^1.0.5",
+        "object-inspect": "^1.9.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.2",
+        "string.prototype.trimend": "^1.0.4",
+        "string.prototype.trimstart": "^1.0.4",
+        "unbox-primitive": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/has-symbols": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/is-callable": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
+      "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/is-negative-zero": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
+      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/is-regex": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
+      "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-symbols": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/object-inspect": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.2.tgz",
+      "integrity": "sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/object.assign": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "has-symbols": "^1.0.1",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/string.prototype.trimend": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
+      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/string.prototype.trimstart": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
+      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-initial": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz",
+      "integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U=",
+      "dev": true,
+      "dependencies": {
+        "array-slice": "^1.0.0",
+        "is-number": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-initial/node_modules/is-number": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+      "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-last": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz",
+      "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-last/node_modules/is-number": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+      "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-slice": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
+      "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-sort": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz",
+      "integrity": "sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==",
+      "dev": true,
+      "dependencies": {
+        "default-compare": "^1.0.0",
+        "get-value": "^2.0.6",
+        "kind-of": "^5.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-sort/node_modules/kind-of": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array.prototype.flat": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz",
+      "integrity": "sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.18.0-next.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/asap": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
+      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=",
+      "dev": true
+    },
+    "node_modules/asn1": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+      "dependencies": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
+    "node_modules/asn1.js": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
+      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "node_modules/asn1.js/node_modules/bn.js": {
+      "version": "4.11.9",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+      "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+      "dev": true
+    },
+    "node_modules/assert": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
+      "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
+      "dev": true,
+      "dependencies": {
+        "util": "0.10.3"
+      }
+    },
+    "node_modules/assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ast-types": {
+      "version": "0.13.4",
+      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz",
+      "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/astral-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/async": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "dependencies": {
+        "lodash": "^4.17.14"
+      }
+    },
+    "node_modules/async-done": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz",
+      "integrity": "sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==",
+      "dev": true,
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.2",
+        "process-nextick-args": "^2.0.0",
+        "stream-exhaust": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/async-each": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
+      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
+      "dev": true
+    },
+    "node_modules/async-limiter": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
+      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
+      "dev": true
+    },
+    "node_modules/async-settle": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz",
+      "integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=",
+      "dev": true,
+      "dependencies": {
+        "async-done": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+    },
+    "node_modules/at-least-node": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
+      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/atob": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+      "dev": true,
+      "bin": {
+        "atob": "bin/atob.js"
+      },
+      "engines": {
+        "node": ">= 4.5.0"
+      }
+    },
+    "node_modules/autoprefixer": {
+      "version": "9.8.0",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.0.tgz",
+      "integrity": "sha512-D96ZiIHXbDmU02dBaemyAg53ez+6F5yZmapmgKcjm35yEe1uVDYI8hGW3VYoGRaG290ZFf91YxHrR518vC0u/A==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.12.0",
+        "caniuse-lite": "^1.0.30001061",
+        "chalk": "^2.4.2",
+        "normalize-range": "^0.1.2",
+        "num2fraction": "^1.2.2",
+        "postcss": "^7.0.30",
+        "postcss-value-parser": "^4.1.0"
+      },
+      "bin": {
+        "autoprefixer": "bin/autoprefixer"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      },
+      "funding": {
+        "type": "tidelift",
+        "url": "https://tidelift.com/funding/github/npm/autoprefixer"
+      }
+    },
+    "node_modules/autoprefixer/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/autoprefixer/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/autoprefixer/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/autoprefixer/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/autoprefixer/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/autoprefixer/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/aws4": {
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz",
+      "integrity": "sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA=="
+    },
+    "node_modules/axobject-query": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
+      "integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==",
+      "dev": true
+    },
+    "node_modules/babel-jest": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.5.2.tgz",
+      "integrity": "sha512-U3KvymF3SczA3vOL/cgiUFOznfMET+XDIXiWnoJV45siAp2pLMG8i2+/MGZlAC3f/F6Q40LR4M4qDrWZ9wkK8A==",
+      "dev": true,
+      "dependencies": {
+        "@jest/transform": "^26.5.2",
+        "@jest/types": "^26.5.2",
+        "@types/babel__core": "^7.1.7",
+        "babel-plugin-istanbul": "^6.0.0",
+        "babel-preset-jest": "^26.5.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/babel-jest/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/babel-loader": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz",
+      "integrity": "sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==",
+      "dev": true,
+      "dependencies": {
+        "find-cache-dir": "^2.1.0",
+        "loader-utils": "^1.4.0",
+        "mkdirp": "^0.5.3",
+        "pify": "^4.0.1",
+        "schema-utils": "^2.6.5"
+      },
+      "engines": {
+        "node": ">= 6.9"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0",
+        "webpack": ">=2"
+      }
+    },
+    "node_modules/babel-loader/node_modules/find-cache-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
+      "dev": true,
+      "dependencies": {
+        "commondir": "^1.0.1",
+        "make-dir": "^2.0.0",
+        "pkg-dir": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/babel-loader/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/babel-loader/node_modules/loader-utils": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/babel-loader/node_modules/make-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+      "dev": true,
+      "dependencies": {
+        "pify": "^4.0.1",
+        "semver": "^5.6.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/babel-loader/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/babel-plugin-add-header-comment": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-add-header-comment/-/babel-plugin-add-header-comment-1.0.3.tgz",
+      "integrity": "sha1-URxJAQYmQNWkgLSsPt1pRBlYUOw="
+    },
+    "node_modules/babel-plugin-dynamic-import-node": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
+      "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
+      "dev": true,
+      "dependencies": {
+        "object.assign": "^4.1.0"
+      }
+    },
+    "node_modules/babel-plugin-istanbul": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz",
+      "integrity": "sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-instrument": "^4.0.0",
+        "test-exclude": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/babel-plugin-jest-hoist": {
+      "version": "26.5.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.5.0.tgz",
+      "integrity": "sha512-ck17uZFD3CDfuwCLATWZxkkuGGFhMij8quP8CNhwj8ek1mqFgbFzRJ30xwC04LLscj/aKsVFfRST+b5PT7rSuw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/template": "^7.3.3",
+        "@babel/types": "^7.3.3",
+        "@types/babel__core": "^7.0.0",
+        "@types/babel__traverse": "^7.0.6"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/babel-preset-current-node-syntax": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.4.tgz",
+      "integrity": "sha512-5/INNCYhUGqw7VbVjT/hb3ucjgkVHKXY7lX3ZjlN4gm565VyFmJUrJ/h+h16ECVB38R/9SF6aACydpKMLZ/c9w==",
+      "dev": true,
+      "dependencies": {
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-bigint": "^7.8.3",
+        "@babel/plugin-syntax-class-properties": "^7.8.3",
+        "@babel/plugin-syntax-import-meta": "^7.8.3",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.8.3",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/babel-preset-jest": {
+      "version": "26.5.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.5.0.tgz",
+      "integrity": "sha512-F2vTluljhqkiGSJGBg/jOruA8vIIIL11YrxRcO7nviNTMbbofPSHwnm8mgP7d/wS7wRSexRoI6X1A6T74d4LQA==",
+      "dev": true,
+      "dependencies": {
+        "babel-plugin-jest-hoist": "^26.5.0",
+        "babel-preset-current-node-syntax": "^0.1.3"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/bach": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz",
+      "integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=",
+      "dev": true,
+      "dependencies": {
+        "arr-filter": "^1.1.1",
+        "arr-flatten": "^1.0.1",
+        "arr-map": "^2.0.0",
+        "array-each": "^1.0.0",
+        "array-initial": "^1.0.0",
+        "array-last": "^1.1.1",
+        "async-done": "^1.2.2",
+        "async-settle": "^1.0.0",
+        "now-and-later": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+    },
+    "node_modules/base": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "dev": true,
+      "dependencies": {
+        "cache-base": "^1.0.1",
+        "class-utils": "^0.3.5",
+        "component-emitter": "^1.2.1",
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.1",
+        "mixin-deep": "^1.2.0",
+        "pascalcase": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/base/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/base/node_modules/is-accessor-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/base/node_modules/is-data-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/base/node_modules/is-descriptor": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.0",
+        "is-data-descriptor": "^1.0.0",
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/base/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/base64-js": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
+      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
+    },
+    "node_modules/batch": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
+      "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
+      "dev": true
+    },
+    "node_modules/bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+      "dependencies": {
+        "tweetnacl": "^0.14.3"
+      }
+    },
+    "node_modules/big-integer": {
+      "version": "1.6.48",
+      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.48.tgz",
+      "integrity": "sha512-j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w==",
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/big.js": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/binary-extensions": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
+      "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
+    "node_modules/bl": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.3.tgz",
+      "integrity": "sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==",
+      "optional": true,
+      "dependencies": {
+        "buffer": "^5.5.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
+      }
+    },
+    "node_modules/bl/node_modules/buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "optional": true,
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
+    "node_modules/bl/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "optional": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/bluebird": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+      "dev": true
+    },
+    "node_modules/bn.js": {
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz",
+      "integrity": "sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==",
+      "dev": true
+    },
+    "node_modules/body-parser": {
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
+      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
+      "dependencies": {
+        "bytes": "3.1.0",
+        "content-type": "~1.0.4",
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "http-errors": "1.7.2",
+        "iconv-lite": "0.4.24",
+        "on-finished": "~2.3.0",
+        "qs": "6.7.0",
+        "raw-body": "2.4.0",
+        "type-is": "~1.6.17"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/body-parser/node_modules/bytes": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/bonjour": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
+      "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
+      "dev": true,
+      "dependencies": {
+        "array-flatten": "^2.1.0",
+        "deep-equal": "^1.0.1",
+        "dns-equal": "^1.0.0",
+        "dns-txt": "^2.0.2",
+        "multicast-dns": "^6.0.1",
+        "multicast-dns-service-types": "^1.1.0"
+      }
+    },
+    "node_modules/bonjour/node_modules/array-flatten": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
+      "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
+      "dev": true
+    },
+    "node_modules/boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
+      "dev": true
+    },
+    "node_modules/boxen": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/boxen/-/boxen-4.2.0.tgz",
+      "integrity": "sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==",
+      "dependencies": {
+        "ansi-align": "^3.0.0",
+        "camelcase": "^5.3.1",
+        "chalk": "^3.0.0",
+        "cli-boxes": "^2.2.0",
+        "string-width": "^4.1.0",
+        "term-size": "^2.1.0",
+        "type-fest": "^0.8.1",
+        "widest-line": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/boxen/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/boxen/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
+    "node_modules/boxen/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/boxen/node_modules/string-width": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/boxen/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/bplist-creator": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.8.tgz",
+      "integrity": "sha512-Za9JKzD6fjLC16oX2wsXfc+qBEhJBJB1YPInoAQpMLhDuj5aVOv1baGeIQSq1Fr3OCqzvsoQcSBSwGId/Ja2PA==",
+      "dependencies": {
+        "stream-buffers": "~2.2.0"
+      }
+    },
+    "node_modules/bplist-parser": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.2.0.tgz",
+      "integrity": "sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==",
+      "dependencies": {
+        "big-integer": "^1.6.44"
+      },
+      "engines": {
+        "node": ">= 5.10.0"
+      }
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dependencies": {
+        "fill-range": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
+      "dev": true
+    },
+    "node_modules/browser-process-hrtime": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
+      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
+      "dev": true
+    },
+    "node_modules/browserify-aes": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "dev": true,
+      "dependencies": {
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/browserify-cipher": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+      "dev": true,
+      "dependencies": {
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
+      }
+    },
+    "node_modules/browserify-des": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+      "dev": true,
+      "dependencies": {
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/browserify-rsa": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "randombytes": "^2.0.1"
+      }
+    },
+    "node_modules/browserify-rsa/node_modules/bn.js": {
+      "version": "4.11.9",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+      "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+      "dev": true
+    },
+    "node_modules/browserify-sign": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
+      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^5.1.1",
+        "browserify-rsa": "^4.0.1",
+        "create-hash": "^1.2.0",
+        "create-hmac": "^1.1.7",
+        "elliptic": "^6.5.3",
+        "inherits": "^2.0.4",
+        "parse-asn1": "^5.1.5",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      }
+    },
+    "node_modules/browserify-sign/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/browserify-sign/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/browserify-zlib": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+      "dev": true,
+      "dependencies": {
+        "pako": "~1.0.5"
+      }
+    },
+    "node_modules/browserslist": {
+      "version": "4.14.5",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.5.tgz",
+      "integrity": "sha512-Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA==",
+      "dev": true,
+      "dependencies": {
+        "caniuse-lite": "^1.0.30001135",
+        "electron-to-chromium": "^1.3.571",
+        "escalade": "^3.1.0",
+        "node-releases": "^1.1.61"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      },
+      "funding": {
+        "type": "tidelift",
+        "url": "https://tidelift.com/funding/github/npm/browserslist"
+      }
+    },
+    "node_modules/bs-logger": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
+      "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
+      "dev": true,
+      "dependencies": {
+        "fast-json-stable-stringify": "2.x"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/bser": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
+      "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
+      "dev": true,
+      "dependencies": {
+        "node-int64": "^0.4.0"
+      }
+    },
+    "node_modules/buffer": {
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
+      "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
+      "dev": true,
+      "dependencies": {
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
+      }
+    },
+    "node_modules/buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/buffer-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
+      "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
+      "dev": true
+    },
+    "node_modules/buffer-indexof": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
+      "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==",
+      "dev": true
+    },
+    "node_modules/buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
+      "dev": true
+    },
+    "node_modules/builtin-status-codes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
+      "dev": true
+    },
+    "node_modules/builtins": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz",
+      "integrity": "sha1-y5T662HIaWRR2zZTThQi+U8K7og="
+    },
+    "node_modules/bytes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/cacache": {
+      "version": "15.0.3",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.3.tgz",
+      "integrity": "sha512-bc3jKYjqv7k4pWh7I/ixIjfcjPul4V4jme/WbjvwGS5LzoPL/GzXr4C5EgPNLO/QEZl9Oi61iGitYEdwcrwLCQ==",
+      "dev": true,
+      "dependencies": {
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "glob": "^7.1.4",
+        "infer-owner": "^1.0.4",
+        "lru-cache": "^5.1.1",
+        "minipass": "^3.1.1",
+        "minipass-collect": "^1.0.2",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.2",
+        "mkdirp": "^1.0.3",
+        "move-file": "^2.0.0",
+        "p-map": "^4.0.0",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^3.0.2",
+        "ssri": "^8.0.0",
+        "tar": "^6.0.2",
+        "unique-filename": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/cacache/node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/cacache/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "dev": true,
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cacache/node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true
+    },
+    "node_modules/cache-base": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+      "dev": true,
+      "dependencies": {
+        "collection-visit": "^1.0.0",
+        "component-emitter": "^1.2.1",
+        "get-value": "^2.0.6",
+        "has-value": "^1.0.0",
+        "isobject": "^3.0.1",
+        "set-value": "^2.0.0",
+        "to-object-path": "^0.3.0",
+        "union-value": "^1.0.0",
+        "unset-value": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/cache-base/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/cacheable-request": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
+      "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==",
+      "dependencies": {
+        "clone-response": "^1.0.2",
+        "get-stream": "^5.1.0",
+        "http-cache-semantics": "^4.0.0",
+        "keyv": "^3.0.0",
+        "lowercase-keys": "^2.0.0",
+        "normalize-url": "^4.1.0",
+        "responselike": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cacheable-request/node_modules/lowercase-keys": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
+      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/caller-callsite": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
+      "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
+      "dev": true,
+      "dependencies": {
+        "callsites": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/caller-callsite/node_modules/callsites": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
+      "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/caller-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
+      "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
+      "dev": true,
+      "dependencies": {
+        "caller-callsite": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/camel-case": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
+      "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
+      "dev": true,
+      "dependencies": {
+        "no-case": "^2.2.0",
+        "upper-case": "^1.1.1"
+      }
+    },
+    "node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/caniuse-api": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
+      "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.0.0",
+        "caniuse-lite": "^1.0.0",
+        "lodash.memoize": "^4.1.2",
+        "lodash.uniq": "^4.5.0"
+      }
+    },
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001197",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001197.tgz",
+      "integrity": "sha512-8aE+sqBqtXz4G8g35Eg/XEaFr2N7rd/VQ6eABGBmNtcB8cN6qNJhMi6oSFy4UWWZgqgL3filHT8Nha4meu3tsw==",
+      "dev": true
+    },
+    "node_modules/canonical-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/canonical-path/-/canonical-path-1.0.0.tgz",
+      "integrity": "sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg==",
+      "dev": true
+    },
+    "node_modules/capture-exit": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz",
+      "integrity": "sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==",
+      "dev": true,
+      "dependencies": {
+        "rsvp": "^4.8.4"
+      },
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+    },
+    "node_modules/chalk": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/char-regex": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
+      "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/chardet": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
+      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="
+    },
+    "node_modules/chart.js": {
+      "version": "2.9.4",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.9.4.tgz",
+      "integrity": "sha512-B07aAzxcrikjAPyV+01j7BmOpxtQETxTSlQ26BEYJ+3iUkbNKaOJ/nDbT6JjyqYxseM0ON12COHYdU2cTIjC7A==",
+      "dependencies": {
+        "chartjs-color": "^2.1.0",
+        "moment": "^2.10.2"
+      }
+    },
+    "node_modules/chartjs-color": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/chartjs-color/-/chartjs-color-2.4.1.tgz",
+      "integrity": "sha512-haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w==",
+      "dependencies": {
+        "chartjs-color-string": "^0.6.0",
+        "color-convert": "^1.9.3"
+      }
+    },
+    "node_modules/chartjs-color-string": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz",
+      "integrity": "sha512-TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A==",
+      "dependencies": {
+        "color-name": "^1.0.0"
+      }
+    },
+    "node_modules/chartjs-color/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/chartjs-color/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+    },
+    "node_modules/check-es-compat": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/check-es-compat/-/check-es-compat-1.1.1.tgz",
+      "integrity": "sha512-q8k6nnYg6aabuEtx0LyVXP8Q3OQ07eOAAWZ7eD95FiSk+GRIdqouuJHd7gGPzxSUJZRioRrW2GMWu7MHDFsIUw==",
+      "dev": true,
+      "dependencies": {
+        "eslint": "^6.7.2",
+        "eslint-plugin-ecmascript-compat": "^1.1.1"
+      },
+      "bin": {
+        "check-es-compat": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/acorn": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/ansi-escapes": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
+      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.11.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/ansi-escapes/node_modules/type-fest": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
+      "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/astral-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
+      "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/cli-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+      "dev": true,
+      "dependencies": {
+        "restore-cursor": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/cli-width": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
+      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/check-es-compat/node_modules/cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "dev": true,
+      "dependencies": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      },
+      "engines": {
+        "node": ">=4.8"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/cross-spawn/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/check-es-compat/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/check-es-compat/node_modules/eslint": {
+      "version": "6.8.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz",
+      "integrity": "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "ajv": "^6.10.0",
+        "chalk": "^2.1.0",
+        "cross-spawn": "^6.0.5",
+        "debug": "^4.0.1",
+        "doctrine": "^3.0.0",
+        "eslint-scope": "^5.0.0",
+        "eslint-utils": "^1.4.3",
+        "eslint-visitor-keys": "^1.1.0",
+        "espree": "^6.1.2",
+        "esquery": "^1.0.1",
+        "esutils": "^2.0.2",
+        "file-entry-cache": "^5.0.1",
+        "functional-red-black-tree": "^1.0.1",
+        "glob-parent": "^5.0.0",
+        "globals": "^12.1.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "inquirer": "^7.0.0",
+        "is-glob": "^4.0.0",
+        "js-yaml": "^3.13.1",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.3.0",
+        "lodash": "^4.17.14",
+        "minimatch": "^3.0.4",
+        "mkdirp": "^0.5.1",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.8.3",
+        "progress": "^2.0.0",
+        "regexpp": "^2.0.1",
+        "semver": "^6.1.2",
+        "strip-ansi": "^5.2.0",
+        "strip-json-comments": "^3.0.1",
+        "table": "^5.2.3",
+        "text-table": "^0.2.0",
+        "v8-compile-cache": "^2.0.3"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/eslint-utils": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
+      "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/eslint-visitor-keys": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/espree": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz",
+      "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^7.1.1",
+        "acorn-jsx": "^5.2.0",
+        "eslint-visitor-keys": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/figures": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+      "dev": true,
+      "dependencies": {
+        "escape-string-regexp": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/file-entry-cache": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
+      "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
+      "dev": true,
+      "dependencies": {
+        "flat-cache": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/flat-cache": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
+      "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
+      "dev": true,
+      "dependencies": {
+        "flatted": "^2.0.0",
+        "rimraf": "2.6.3",
+        "write": "1.0.3"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/flatted": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz",
+      "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==",
+      "dev": true
+    },
+    "node_modules/check-es-compat/node_modules/globals": {
+      "version": "12.4.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
+      "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.8.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/ignore": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/inquirer": {
+      "version": "7.3.3",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz",
+      "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.1.0",
+        "cli-cursor": "^3.1.0",
+        "cli-width": "^3.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^3.0.0",
+        "lodash": "^4.17.19",
+        "mute-stream": "0.0.8",
+        "run-async": "^2.4.0",
+        "rxjs": "^6.6.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "through": "^2.3.6"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/inquirer/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/inquirer/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/inquirer/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/inquirer/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/check-es-compat/node_modules/inquirer/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/inquirer/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/inquirer/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/check-es-compat/node_modules/optionator": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+      "dev": true,
+      "dependencies": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.6",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "word-wrap": "~1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/regexpp": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
+      "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.5.0"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/restore-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "dev": true,
+      "dependencies": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/rimraf": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/rxjs": {
+      "version": "6.6.6",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.6.tgz",
+      "integrity": "sha512-/oTwee4N4iWzAMAL9xdGKjkEHmIwupR3oXbQjCKywF1BeFohswF3vZdogbmEF6pZkOsXTzWkrZszrWpQTByYVg==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/slice-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
+      "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.0",
+        "astral-regex": "^1.0.0",
+        "is-fullwidth-code-point": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/slice-ansi/node_modules/is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/string-width": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/string-width/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/table": {
+      "version": "5.4.6",
+      "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
+      "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.10.2",
+        "lodash": "^4.17.14",
+        "slice-ansi": "^2.1.0",
+        "string-width": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/table/node_modules/emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "dev": true
+    },
+    "node_modules/check-es-compat/node_modules/table/node_modules/is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/table/node_modules/string-width": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^7.0.1",
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
+    "node_modules/check-es-compat/node_modules/type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/cheerio": {
+      "version": "1.0.0-rc.3",
+      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.3.tgz",
+      "integrity": "sha512-0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA==",
+      "dev": true,
+      "dependencies": {
+        "css-select": "~1.2.0",
+        "dom-serializer": "~0.1.1",
+        "entities": "~1.1.1",
+        "htmlparser2": "^3.9.1",
+        "lodash": "^4.15.0",
+        "parse5": "^3.0.1"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/cheerio/node_modules/css-select": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
+      "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "~1.0.0",
+        "css-what": "2.1",
+        "domutils": "1.5.1",
+        "nth-check": "~1.0.1"
+      }
+    },
+    "node_modules/cheerio/node_modules/css-what": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
+      "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/cheerio/node_modules/dom-serializer": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
+      "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^1.3.0",
+        "entities": "^1.1.1"
+      }
+    },
+    "node_modules/cheerio/node_modules/domutils": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
+      "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
+      "dev": true,
+      "dependencies": {
+        "dom-serializer": "0",
+        "domelementtype": "1"
+      }
+    },
+    "node_modules/cheerio/node_modules/entities": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
+      "dev": true
+    },
+    "node_modules/cheerio/node_modules/parse5": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz",
+      "integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/chokidar": {
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz",
+      "integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==",
+      "dev": true,
+      "dependencies": {
+        "anymatch": "~3.1.1",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.0",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.4.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.1.2"
+      }
+    },
+    "node_modules/chownr": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/chrome-trace-event": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz",
+      "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
+    "node_modules/chrome-trace-event/node_modules/tslib": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
+      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
+      "dev": true
+    },
+    "node_modules/ci-info": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
+      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="
+    },
+    "node_modules/cipher-base": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/circular-dependency-plugin": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-5.2.0.tgz",
+      "integrity": "sha512-7p4Kn/gffhQaavNfyDFg7LS5S/UT1JAjyGd4UqR2+jzoYF02eDkj0Ec3+48TsIa4zghjLY87nQHIh/ecK9qLdw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0.0"
+      },
+      "peerDependencies": {
+        "webpack": ">=4.0.1"
+      }
+    },
+    "node_modules/class-utils": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+      "dev": true,
+      "dependencies": {
+        "arr-union": "^3.1.0",
+        "define-property": "^0.2.5",
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/clean-css": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz",
+      "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==",
+      "dev": true,
+      "dependencies": {
+        "source-map": "~0.6.0"
+      },
+      "engines": {
+        "node": ">= 4.0"
+      }
+    },
+    "node_modules/clean-css/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/clean-stack": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/cli-boxes": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz",
+      "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==",
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cli-cursor": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+      "dependencies": {
+        "restore-cursor": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/cli-spinners": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.4.0.tgz",
+      "integrity": "sha512-sJAofoarcm76ZGpuooaO0eDy8saEy+YoZBLjC4h8srt4jeBnkYeOgqxgsJQTpyt2LjI5PTfLJHSL+41Yu4fEJA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cli-width": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
+      "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw=="
+    },
+    "node_modules/cliui": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^3.1.0",
+        "strip-ansi": "^5.2.0",
+        "wrap-ansi": "^5.1.0"
+      }
+    },
+    "node_modules/cliui/node_modules/string-width": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^7.0.1",
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/clone": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+      "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/clone-buffer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
+      "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/clone-deep": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4",
+        "kind-of": "^6.0.2",
+        "shallow-clone": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/clone-response": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
+      "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
+      "dependencies": {
+        "mimic-response": "^1.0.0"
+      }
+    },
+    "node_modules/clone-stats": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
+      "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
+      "dev": true
+    },
+    "node_modules/cloneable-readable": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz",
+      "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "process-nextick-args": "^2.0.0",
+        "readable-stream": "^2.3.5"
+      }
+    },
+    "node_modules/co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+      "dev": true,
+      "engines": {
+        "iojs": ">= 1.0.0",
+        "node": ">= 0.12.0"
+      }
+    },
+    "node_modules/coa": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
+      "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
+      "dev": true,
+      "dependencies": {
+        "@types/q": "^1.5.1",
+        "chalk": "^2.4.1",
+        "q": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 4.0"
+      }
+    },
+    "node_modules/coa/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/coa/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/coa/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/coa/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/coa/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/coa/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/code-point-at": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+      "devOptional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/collect-v8-coverage": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
+      "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
+      "dev": true
+    },
+    "node_modules/collection-map": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz",
+      "integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=",
+      "dev": true,
+      "dependencies": {
+        "arr-map": "^2.0.2",
+        "for-own": "^1.0.0",
+        "make-iterator": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/collection-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+      "dev": true,
+      "dependencies": {
+        "map-visit": "^1.0.0",
+        "object-visit": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/color": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/color/-/color-3.1.2.tgz",
+      "integrity": "sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.1",
+        "color-string": "^1.5.2"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    },
+    "node_modules/color-string": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz",
+      "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "^1.0.0",
+        "simple-swizzle": "^0.2.2"
+      }
+    },
+    "node_modules/color-support": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
+      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+      "dev": true,
+      "bin": {
+        "color-support": "bin.js"
+      }
+    },
+    "node_modules/color/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/color/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/colorette": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.1.0.tgz",
+      "integrity": "sha512-6S062WDQUXi6hOfkO/sBPVwE5ASXY4G2+b4atvhJfSsuUUhIaUKlkjLe9692Ipyt5/a+IPF5aVTu3V5gvXq5cg==",
+      "dev": true
+    },
+    "node_modules/colors": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
+      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
+      "engines": {
+        "node": ">=0.1.90"
+      }
+    },
+    "node_modules/com-darryncampbell-cordova-plugin-intent": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/com-darryncampbell-cordova-plugin-intent/-/com-darryncampbell-cordova-plugin-intent-1.3.0.tgz",
+      "integrity": "sha512-JXslndd4UiRHmirGZrwrHZHczoZ5sxM7zAylm4bPX7ZDwD4FdCHhILgDA8AeaG8wc11e0A7OEAFo0Esgc0M4yA=="
+    },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
+    },
+    "node_modules/comment-parser": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.1.5.tgz",
+      "integrity": "sha512-RePCE4leIhBlmrqiYTvaqEeGYg7qpSl4etaIabKtdOQVi+mSTIBBklGUwIr79GXYnl3LpMwmDw4KeR2stNc6FA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+      "dev": true
+    },
+    "node_modules/component-emitter": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
+      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
+      "dev": true
+    },
+    "node_modules/compose-function": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/compose-function/-/compose-function-3.0.3.tgz",
+      "integrity": "sha1-ntZ18TzFRQHTCVCkhv9qe6OrGF8=",
+      "dev": true,
+      "dependencies": {
+        "arity-n": "^1.0.4"
+      }
+    },
+    "node_modules/compressible": {
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
+      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
+      "dependencies": {
+        "mime-db": ">= 1.43.0 < 2"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/compression": {
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
+      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
+      "dependencies": {
+        "accepts": "~1.3.5",
+        "bytes": "3.0.0",
+        "compressible": "~2.0.16",
+        "debug": "2.6.9",
+        "on-headers": "~1.0.2",
+        "safe-buffer": "5.1.2",
+        "vary": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+    },
+    "node_modules/concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "dev": true,
+      "engines": [
+        "node >= 0.8"
+      ],
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      }
+    },
+    "node_modules/concat-with-sourcemaps": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz",
+      "integrity": "sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==",
+      "dev": true,
+      "dependencies": {
+        "source-map": "^0.6.1"
+      }
+    },
+    "node_modules/concat-with-sourcemaps/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/conf": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/conf/-/conf-1.4.0.tgz",
+      "integrity": "sha512-bzlVWS2THbMetHqXKB8ypsXN4DQ/1qopGwNJi1eYbpwesJcd86FBjFciCQX/YwAhp9bM7NVnPFqZ5LpV7gP0Dg==",
+      "dependencies": {
+        "dot-prop": "^4.1.0",
+        "env-paths": "^1.0.0",
+        "make-dir": "^1.0.0",
+        "pkg-up": "^2.0.0",
+        "write-file-atomic": "^2.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/conf/node_modules/dot-prop": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.1.tgz",
+      "integrity": "sha512-l0p4+mIuJIua0mhxGoh4a+iNL9bmeK5DvnSVQa6T0OhrVmaEa1XScX5Etc673FePCJOArq/4Pa2cLGODUWTPOQ==",
+      "dependencies": {
+        "is-obj": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/conf/node_modules/is-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/conf/node_modules/make-dir": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
+      "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+      "dependencies": {
+        "pify": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/conf/node_modules/pify": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/conf/node_modules/write-file-atomic": {
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz",
+      "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==",
+      "dependencies": {
+        "graceful-fs": "^4.1.11",
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^3.0.2"
+      }
+    },
+    "node_modules/configstore": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz",
+      "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==",
+      "dependencies": {
+        "dot-prop": "^5.2.0",
+        "graceful-fs": "^4.1.2",
+        "make-dir": "^3.0.0",
+        "unique-string": "^2.0.0",
+        "write-file-atomic": "^3.0.0",
+        "xdg-basedir": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/connect-history-api-fallback": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
+      "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/console-browserify": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
+      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
+      "dev": true
+    },
+    "node_modules/console-control-strings": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
+      "optional": true
+    },
+    "node_modules/constants-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
+      "dev": true
+    },
+    "node_modules/contains-path": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
+      "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/content-disposition": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
+      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
+      "dependencies": {
+        "safe-buffer": "5.1.2"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/content-type": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/convert-source-map": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
+      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.1"
+      }
+    },
+    "node_modules/cookie": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
+      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
+    },
+    "node_modules/cookiejar": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz",
+      "integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==",
+      "dev": true
+    },
+    "node_modules/copy-concurrently": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
+      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+      "dev": true,
+      "dependencies": {
+        "aproba": "^1.1.1",
+        "fs-write-stream-atomic": "^1.0.8",
+        "iferr": "^0.1.5",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.0"
+      }
+    },
+    "node_modules/copy-concurrently/node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/copy-descriptor": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/copy-props": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz",
+      "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==",
+      "dev": true,
+      "dependencies": {
+        "each-props": "^1.3.0",
+        "is-plain-object": "^2.0.1"
+      }
+    },
+    "node_modules/copy-webpack-plugin": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.0.3.tgz",
+      "integrity": "sha512-q5m6Vz4elsuyVEIUXr7wJdIdePWTubsqVbEMvf1WQnHGv0Q+9yPRu7MtYFPt+GBOXRav9lvIINifTQ1vSCs+eA==",
+      "dev": true,
+      "dependencies": {
+        "cacache": "^15.0.4",
+        "fast-glob": "^3.2.4",
+        "find-cache-dir": "^3.3.1",
+        "glob-parent": "^5.1.1",
+        "globby": "^11.0.1",
+        "loader-utils": "^2.0.0",
+        "normalize-path": "^3.0.0",
+        "p-limit": "^3.0.1",
+        "schema-utils": "^2.7.0",
+        "serialize-javascript": "^4.0.0",
+        "webpack-sources": "^1.4.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.37.0 || ^5.0.0"
+      }
+    },
+    "node_modules/copy-webpack-plugin/node_modules/cacache": {
+      "version": "15.0.5",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.5.tgz",
+      "integrity": "sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A==",
+      "dev": true,
+      "dependencies": {
+        "@npmcli/move-file": "^1.0.1",
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "glob": "^7.1.4",
+        "infer-owner": "^1.0.4",
+        "lru-cache": "^6.0.0",
+        "minipass": "^3.1.1",
+        "minipass-collect": "^1.0.2",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.2",
+        "mkdirp": "^1.0.3",
+        "p-map": "^4.0.0",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^3.0.2",
+        "ssri": "^8.0.0",
+        "tar": "^6.0.2",
+        "unique-filename": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/copy-webpack-plugin/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "dev": true,
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/copy-webpack-plugin/node_modules/p-limit": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.0.2.tgz",
+      "integrity": "sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cordova": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/cordova/-/cordova-10.0.0.tgz",
+      "integrity": "sha512-00wMcj3X9ILhKtvRG2iEwO2qly4B+vgXFhH4WhVepWg2UVbD1opl1q9jSZ+j2AaI/vsBWW8e6M2M5FAHasnuWw==",
+      "dependencies": {
+        "configstore": "^5.0.1",
+        "cordova-common": "^4.0.2",
+        "cordova-create": "^3.0.0",
+        "cordova-lib": "^10.0.0",
+        "editor": "^1.0.0",
+        "execa": "^4.0.3",
+        "fs-extra": "^9.0.1",
+        "insight": "^0.10.3",
+        "loud-rejection": "^2.2.0",
+        "nopt": "^4.0.3",
+        "semver": "^7.3.2",
+        "systeminformation": "^4.26.10",
+        "update-notifier": "^4.1.0"
+      },
+      "bin": {
+        "cordova": "bin/cordova"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/cordova-android": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-9.1.0.tgz",
+      "integrity": "sha512-bzOX9E4eQsOSpa06oZZ7XAGq3DwB73juhhj0oPqHH/khWk0mkCD4aiVYMFoc0fmIaSQvzbY1ww7L6UBW5pyGfg==",
+      "dependencies": {
+        "android-versions": "^1.5.0",
+        "cordova-common": "^4.0.1",
+        "execa": "^4.0.2",
+        "fast-glob": "^3.2.4",
+        "fs-extra": "^9.0.1",
+        "is-path-inside": "^3.0.2",
+        "nopt": "^4.0.3",
+        "properties-parser": "^0.3.1",
+        "semver": "^7.3.4",
+        "which": "^2.0.2"
+      },
+      "bin": {
+        "create": "bin/create"
+      },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/cordova-android-support-gradle-release": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/cordova-android-support-gradle-release/-/cordova-android-support-gradle-release-3.0.1.tgz",
+      "integrity": "sha512-RSW55DkSckmqhX/kjj+a1YeVdy7s/AtlZn6Qa5XMQmmA4Iogq+IF2jvInZqzCF19DbI5YE95AP7VDbRk+DdDRw==",
+      "dependencies": {
+        "q": "^1.4.1",
+        "semver": "5.6.0"
+      }
+    },
+    "node_modules/cordova-android-support-gradle-release/node_modules/semver": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
+      "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/cordova-android/node_modules/semver": {
+      "version": "7.3.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cordova-app-hello-world": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-5.0.0.tgz",
+      "integrity": "sha512-5My01wsYoeYwS0f/t5Ck52xPm0+2zYJ0SlvxG9vUsndDGtgiP6t/G8upPgWcyDRRz7Rs/50yZuOntmHqmJxccQ=="
+    },
+    "node_modules/cordova-clipboard": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/cordova-clipboard/-/cordova-clipboard-1.3.0.tgz",
+      "integrity": "sha512-IGk4LZm/DJ0Xk/jgakHm4wa+A/lrRP3QfzMAHDG7oWLJS4ISOpfI32Wez4ndnENItRslGyBVyJyKD83CxELCAw=="
+    },
+    "node_modules/cordova-common": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/cordova-common/-/cordova-common-4.0.2.tgz",
+      "integrity": "sha512-od7aNShyuBajzPY83mUEO8tERwwWdFklXETHiXP5Ft87CWeo/tSuwNPFztyTy8XYc74yXdogXKPTJeUHuVzB8Q==",
+      "dependencies": {
+        "@netflix/nerror": "^1.1.3",
+        "ansi": "^0.3.1",
+        "bplist-parser": "^0.2.0",
+        "cross-spawn": "^7.0.1",
+        "elementtree": "^0.1.7",
+        "endent": "^1.4.1",
+        "fast-glob": "^3.2.2",
+        "fs-extra": "^9.0.0",
+        "glob": "^7.1.6",
+        "plist": "^3.0.1",
+        "q": "^1.5.1",
+        "read-chunk": "^3.2.0",
+        "strip-bom": "^4.0.0",
+        "underscore": "^1.9.2"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/cordova-create": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-create/-/cordova-create-3.0.0.tgz",
+      "integrity": "sha512-WxZRTnt5RHxSAB9urnHFUtVBcIe1YjR4sfwHLsxakNoKkFhcie3HrV5QmNBgRQ5DkxmanRN3VSx4OrPVsNmAaQ==",
+      "dependencies": {
+        "cordova-app-hello-world": "^5.0.0",
+        "cordova-common": "^4.0.1",
+        "cordova-fetch": "^3.0.0",
+        "fs-extra": "^9.0.0",
+        "globby": "^11.0.0",
+        "import-fresh": "^3.2.1",
+        "isobject": "^4.0.0",
+        "npm-package-arg": "^8.0.1",
+        "path-is-inside": "^1.0.2",
+        "tmp": "^0.2.1",
+        "valid-identifier": "0.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cordova-fetch": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-3.0.0.tgz",
+      "integrity": "sha512-N6mB/1GD8BNclxnfO85E4/s46nEJjIxYeJYHRGi6MjofhigJ3NlGwTCslbTcq8IOYEh0RdoA0mS4W2jA5UcWeQ==",
+      "dependencies": {
+        "cordova-common": "^4.0.0",
+        "fs-extra": "^9.0.0",
+        "npm-package-arg": "^8.0.1",
+        "pify": "^5.0.0",
+        "resolve": "^1.15.1",
+        "semver": "^7.1.3",
+        "which": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 10",
+        "npm": ">= 5.6.0"
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/pify": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz",
+      "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cordova-ios": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/cordova-ios/-/cordova-ios-6.2.0.tgz",
+      "integrity": "sha512-sLjZg2QBI1SpQVwfe0MSn89YNVkBGLW9Q1vcFJBsqKBrhvoEOJ5Ytq0gwqdhgTOGzlwJUfxC6OHM3jcsRjtYrw==",
+      "dependencies": {
+        "cordova-common": "^4.0.2",
+        "fs-extra": "^9.1.0",
+        "ios-sim": "^8.0.2",
+        "nopt": "^5.0.0",
+        "plist": "^3.0.1",
+        "semver": "^7.3.4",
+        "unorm": "^1.6.0",
+        "which": "^2.0.2",
+        "xcode": "^3.0.1",
+        "xml-escape": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cordova-ios/node_modules/nopt": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
+      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
+      "dependencies": {
+        "abbrev": "1"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/cordova-ios/node_modules/semver": {
+      "version": "7.3.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cordova-ios/node_modules/uuid": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
+      "integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/cordova-ios/node_modules/xcode": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/xcode/-/xcode-3.0.1.tgz",
+      "integrity": "sha512-kCz5k7J7XbJtjABOvkc5lJmkiDh8VhjVCGNiqdKCscmVpdVUpEAyXv1xmCLkQJ5dsHqx3IPO4XW+NTDhU/fatA==",
+      "dependencies": {
+        "simple-plist": "^1.1.0",
+        "uuid": "^7.0.3"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/cordova-lib": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-lib/-/cordova-lib-10.0.0.tgz",
+      "integrity": "sha512-azU/WH0x/3fQg33tU5bKCtj+Weh/bHelz9FWCVdXqVOHXmjzbi3p6p61z5Si967Tfh3TkmHRrodNxS0ovZ7iFQ==",
+      "dependencies": {
+        "cordova-common": "^4.0.2",
+        "cordova-fetch": "^3.0.0",
+        "cordova-serve": "^4.0.0",
+        "dep-graph": "^1.1.0",
+        "detect-indent": "^6.0.0",
+        "detect-newline": "^3.1.0",
+        "elementtree": "^0.1.7",
+        "execa": "^4.0.3",
+        "fs-extra": "^9.0.1",
+        "globby": "^11.0.1",
+        "init-package-json": "^1.10.3",
+        "md5-file": "^5.0.0",
+        "pify": "^5.0.0",
+        "semver": "^7.3.2",
+        "stringify-package": "^1.0.1",
+        "write-file-atomic": "^3.0.3"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/cordova-lib/node_modules/pify": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz",
+      "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cordova-plugin-add-swift-support": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-add-swift-support/-/cordova-plugin-add-swift-support-2.0.2.tgz",
+      "integrity": "sha512-K03WDnsD3GT+n7Od3BnS17D8rYnAFZbZjjQJa2r7qW8QLq8+h7hGbFaiF+w5+nUtyAqUNq+HT/d/MdqBGLNzxA==",
+      "dependencies": {
+        "glob": "^7.1.3",
+        "semver": "^6.0.0",
+        "xcode": "^2.0.0"
+      }
+    },
+    "node_modules/cordova-plugin-add-swift-support/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/cordova-plugin-advanced-http": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-advanced-http/-/cordova-plugin-advanced-http-3.1.0.tgz",
+      "integrity": "sha512-zlTlNJyTttE7TV5vW2WGvHqpbKMDVrr1meZU0fy4y3ObrI/hGk2UDcDNwpZdMfaytNZwDKU4sRgsTgQYdFNBew==",
+      "engines": [
+        {
+          "name": "cordova",
+          "version": ">=4.0.0"
+        }
+      ]
+    },
+    "node_modules/cordova-plugin-badge": {
+      "version": "0.8.8",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-badge/-/cordova-plugin-badge-0.8.8.tgz",
+      "integrity": "sha512-RhIBtd5xhD/iLnxjt35jvOae28oNW/wtMZBOmQR3Rf0y4wirvA1bpAZEhBoFqL+rZGhsd6ddOdQXdex1T0DRyQ==",
+      "engines": [
+        {
+          "name": "cordova",
+          "version": ">=6.0.0"
+        },
+        {
+          "name": "apple-ios",
+          "version": ">=10.0.0"
+        },
+        {
+          "name": "cordova-android",
+          "version": ">=4"
+        },
+        {
+          "name": "cordova-plugman",
+          "version": ">=4.2.0"
+        }
+      ]
+    },
+    "node_modules/cordova-plugin-camera": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-camera/-/cordova-plugin-camera-5.0.1.tgz",
+      "integrity": "sha512-9gXyZvI8u9KzsZuqmB8Yw+uheF+7f+usMAwvOMw7L7pqbykg+bm9US5zjhJbwit3A1cSblgZkpBafe5cFiMcTA==",
+      "engines": {
+        "cordovaDependencies": {
+          "3.0.0": {
+            "cordova-android": ">=6.3.0"
+          },
+          "4.1.0": {
+            "cordova": ">=7.1.0",
+            "cordova-android": ">=6.3.0"
+          },
+          "5.0.0": {
+            "cordova": ">=9.0.0",
+            "cordova-android": ">=9.0.0",
+            "cordova-ios": ">=5.1.0"
+          },
+          "6.0.0": {
+            "cordova": ">100"
+          }
+        }
+      }
+    },
+    "node_modules/cordova-plugin-chooser": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-chooser/-/cordova-plugin-chooser-1.3.2.tgz",
+      "integrity": "sha512-GfAibvrPdWe/ri+h3e3xkmq5bietY6yJRBIZawYDE7w600j2mtRsxgat7siWZtjRRhJuVsVwUG6H86Hyp3WKvA=="
+    },
+    "node_modules/cordova-plugin-customurlscheme": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-customurlscheme/-/cordova-plugin-customurlscheme-5.0.2.tgz",
+      "integrity": "sha512-g139Av7iYD3xcSsCd5S6a7B7dp4GTqGYtvdhh44g4OS38+aX6XkC1lsCRmROuhLIs4fkwJqkrvxacH9H4U9Gsg==",
+      "engines": [
+        {
+          "name": "cordova",
+          "version": ">=3.0.0"
+        }
+      ]
+    },
+    "node_modules/cordova-plugin-device": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-device/-/cordova-plugin-device-2.0.3.tgz",
+      "integrity": "sha512-Jb3V72btxf3XHpkPQsGdyc8N6tVBYn1vsxSFj43fIz9vonJDUThYPCJJHqk6PX6N4dJw6I4FjxkpfCR4LDYMlw==",
+      "engines": {
+        "cordovaDependencies": {
+          "3.0.0": {
+            "cordova": ">100"
+          }
+        }
+      }
+    },
+    "node_modules/cordova-plugin-file": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-file/-/cordova-plugin-file-6.0.2.tgz",
+      "integrity": "sha512-m7cughw327CjONN/qjzsTpSesLaeybksQh420/gRuSXJX5Zt9NfgsSbqqKDon6jnQ9Mm7h7imgyO2uJ34XMBtA==",
+      "engines": {
+        "cordovaDependencies": {
+          "5.0.0": {
+            "cordova-android": ">=6.3.0"
+          },
+          "7.0.0": {
+            "cordova": ">100"
+          }
+        }
+      }
+    },
+    "node_modules/cordova-plugin-file-opener2": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-file-opener2/-/cordova-plugin-file-opener2-3.0.5.tgz",
+      "integrity": "sha512-tjLHDamH5+y0bJZYVe2967L1S4R8tL4Y0rJUzJGoxsyiw3FUlrJNS199POOpzZZ6Xhlntn9a2o7+84r1dMN21A==",
+      "engines": {
+        "cordova": ">=6.0.0"
+      }
+    },
+    "node_modules/cordova-plugin-geolocation": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-geolocation/-/cordova-plugin-geolocation-4.1.0.tgz",
+      "integrity": "sha512-y5io/P10xGMxSn2KEqfv/fExK47eA1pmSonJdmDqDsaSADV9JpgdPx0mUSA08+5pzma/OS9R0LoODeDPx7Jvjg==",
+      "engines": {
+        "cordovaDependencies": {
+          "3.0.0": {
+            "cordova-android": ">=6.3.0"
+          },
+          "5.0.0": {
+            "cordova": ">100"
+          }
+        }
+      }
+    },
+    "node_modules/cordova-plugin-globalization": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-globalization/-/cordova-plugin-globalization-1.11.0.tgz",
+      "integrity": "sha1-6sMVgQAphJOvowvolA5pj2HvvP4=",
+      "engines": {
+        "cordovaDependencies": {
+          "2.0.0": {
+            "cordova": ">100"
+          }
+        }
+      }
+    },
+    "node_modules/cordova-plugin-ionic-keyboard": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-ionic-keyboard/-/cordova-plugin-ionic-keyboard-2.2.0.tgz",
+      "integrity": "sha512-yDUG+9ieKVRitq5mGlNxjaZh/MgEhFFIgTIPhqSbUaQ8UuZbawy5mhJAVClqY97q8/rcQtL6dCDa7x2sEtCLcA=="
+    },
+    "node_modules/cordova-plugin-ionic-webview": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-ionic-webview/-/cordova-plugin-ionic-webview-5.0.0.tgz",
+      "integrity": "sha512-Wq0kCanxubK/JroTW4Mp5soayScnRyiY1eCkbwiz1Dyt1xHOiOW/v+1miqtBHtnZhcXw25TulCKAVJzkNBdmyg==",
+      "engines": {
+        "cordovaDependencies": {
+          "2.0.0": {
+            "cordova-android": ">=6.4.0",
+            "cordova-ios": ">=4.0.0-dev"
+          },
+          "3.1.0": {
+            "cordova": ">=7.1.0",
+            "cordova-android": ">=6.4.0",
+            "cordova-ios": ">=4.0.0-dev"
+          }
+        }
+      }
+    },
+    "node_modules/cordova-plugin-media": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-media/-/cordova-plugin-media-5.0.3.tgz",
+      "integrity": "sha512-UQPFlpk1zL4BY44zGi8RVmYCvcKBCN4Dyf8ovxqGYCC8zR1yhbTRWYDdO9vJdERwbfgWV7+z7FMWiSUfqWm9bQ==",
+      "engines": {
+        "cordovaDependencies": {
+          "3.0.0": {
+            "cordova-android": ">=6.1.0"
+          },
+          "4.0.0": {
+            "cordova-android": ">=6.3.0"
+          },
+          "6.0.0": {
+            "cordova": ">100"
+          }
+        }
+      }
+    },
+    "node_modules/cordova-plugin-media-capture": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-media-capture/-/cordova-plugin-media-capture-3.0.3.tgz",
+      "integrity": "sha512-pVQOrNM7VAuVUMXibAlMGIArrftHPrRs4dUCoE+e2HEFUp3LmN3Yj539LjdUxcWmz/A/cHC65m9E3DS56YJhcg==",
+      "engines": {
+        "cordovaDependencies": {
+          ">=1.4.4": {
+            "cordova-ios": ">=4.0.0"
+          },
+          "2.0.0": {
+            "cordova-android": ">=6.3.0"
+          },
+          "4.0.0": {
+            "cordova": ">100"
+          }
+        }
+      }
+    },
+    "node_modules/cordova-plugin-network-information": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-network-information/-/cordova-plugin-network-information-2.0.2.tgz",
+      "integrity": "sha512-NwO3qDBNL/vJxUxBTPNOA1HvkDf9eTeGH8JSZiwy1jq2W2mJKQEDBwqWkaEQS19Yd/MQTiw0cykxg5D7u4J6cQ==",
+      "engines": {
+        "cordovaDependencies": {
+          "3.0.0": {
+            "cordova": ">100"
+          }
+        }
+      }
+    },
+    "node_modules/cordova-plugin-prevent-override": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-prevent-override/-/cordova-plugin-prevent-override-1.0.0.tgz",
+      "integrity": "sha512-/+3q5r4K5RahCpiYVmZQBjq10x4jj+6CMjYtZyx9jdMWeV+yFE+ItFcO1NeUAEWd2iHC5YPD0P2tHiHx5kscsw==",
+      "engines": {
+        "cordovaDependencies": {
+          "3.0.0": {
+            "cordova": ">100"
+          }
+        }
+      }
+    },
+    "node_modules/cordova-plugin-screen-orientation": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-screen-orientation/-/cordova-plugin-screen-orientation-3.0.2.tgz",
+      "integrity": "sha512-2w6CMC+HGvbhogJetalwGurL2Fx8DQCCPy3wlSZHN1/W7WoQ5n9ujVozcoKrY4VaagK6bxrPFih+ElkO8Uqfzg==",
+      "engines": {
+        "cordovaDependencies": {
+          "4.0.0": {
+            "cordova": ">100"
+          }
+        }
+      }
+    },
+    "node_modules/cordova-plugin-splashscreen": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-splashscreen/-/cordova-plugin-splashscreen-6.0.0.tgz",
+      "integrity": "sha512-pm4ZtJKQY4bCGXVeIInbGrXilryTevYSKgfvoQJpW9UClOWKAxSsYf2/4G2u1vcn492svOSL42OSa2MhujBWEQ==",
+      "engines": {
+        "cordovaDependencies": {
+          ">=4.0.0": {
+            "cordova-android": ">=3.6.0",
+            "cordova-windows": ">=4.4.0"
+          },
+          "2.0.0": {
+            "cordova-android": ">=3.6.0"
+          },
+          "7.0.0": {
+            "cordova": ">100"
+          }
+        }
+      }
+    },
+    "node_modules/cordova-plugin-statusbar": {
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-statusbar/-/cordova-plugin-statusbar-2.4.3.tgz",
+      "integrity": "sha512-ThmXzl6QIKWFXf4wWw7Q/zpB+VKkz3VM958+5A0sXD4jmR++u7KnGttLksXshVwWr6lvGwUebLYtIyXwS4Ovcg==",
+      "engines": {
+        "cordovaDependencies": {
+          "0.1.0": {
+            "cordova": ">=3.0.0"
+          },
+          "3.0.0": {
+            "cordova": ">100"
+          }
+        }
+      }
+    },
+    "node_modules/cordova-plugin-whitelist": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.4.tgz",
+      "integrity": "sha512-EYC5eQFVkoYXq39l7tYKE6lEjHJ04mvTmKXxGL7quHLdFPfJMNzru/UYpn92AOfpl3PQaZmou78C7EgmFOwFQQ==",
+      "engines": {
+        "cordovaDependencies": {
+          "0.0.0": {
+            "cordova-android": ">=4.0.0"
+          },
+          "2.0.0": {
+            "cordova": ">100"
+          }
+        }
+      }
+    },
+    "node_modules/cordova-plugin-wkuserscript": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-wkuserscript/-/cordova-plugin-wkuserscript-1.0.0.tgz",
+      "integrity": "sha512-g18TohV1T+iWQJImYUCZc44x2ywHTH3ycgEJyxo4WTL9eYm4T7lNkyl1svzQGI97e8W5hQxUqAcmvpVcnWvjSQ==",
+      "engines": {
+        "cordovaDependencies": {
+          "3.0.0": {
+            "cordova": ">100"
+          }
+        }
+      }
+    },
+    "node_modules/cordova-plugin-wkwebview-cookies": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-wkwebview-cookies/-/cordova-plugin-wkwebview-cookies-1.0.0.tgz",
+      "integrity": "sha512-bQRnc/1UNu2XDb6ds+RuAZGA8FM2MuQb4z45J/CaDfjSs60OSvxGVKo3okrM/okYosZqWJFygrPah0MK3lDERQ==",
+      "engines": {
+        "cordovaDependencies": {
+          "3.0.0": {
+            "cordova": ">100"
+          }
+        }
+      }
+    },
+    "node_modules/cordova-plugin-zip": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-zip/-/cordova-plugin-zip-3.1.0.tgz",
+      "integrity": "sha1-F2yCSOog058c+VnvXmFWrMqWshc=",
+      "engines": [
+        {
+          "name": "cordova",
+          "version": ">=3.3.0"
+        }
+      ]
+    },
+    "node_modules/cordova-serve": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-serve/-/cordova-serve-4.0.0.tgz",
+      "integrity": "sha512-gzTLeBQzNP8aM/nG0/7sSfICfNazUgwvEU2kiDaybbYXmxwioo2v96h4tzE0XOyA64beyYwAyRYEEqWA4AMZjw==",
+      "dependencies": {
+        "chalk": "^3.0.0",
+        "compression": "^1.7.4",
+        "express": "^4.17.1",
+        "open": "^7.0.3",
+        "which": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 10",
+        "npm": ">= 5.6.0"
+      }
+    },
+    "node_modules/cordova-sqlite-storage": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-sqlite-storage/-/cordova-sqlite-storage-6.0.0.tgz",
+      "integrity": "sha512-njRloA3AICaUFztKHXoFfVcwlL7zbvyFxtdZIkK7P+MA3umILXtSKhYAQkSe2GtHr0LBNzJI5xUUqAlZl/Js0A==",
+      "dependencies": {
+        "cordova-sqlite-storage-dependencies": "4.0.0"
+      }
+    },
+    "node_modules/cordova-sqlite-storage-dependencies": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-sqlite-storage-dependencies/-/cordova-sqlite-storage-dependencies-4.0.0.tgz",
+      "integrity": "sha512-dTBxYaX/RGzH6+pp49o4sb3FuHCvhrssaKn1XMJ4LL3f9dnvz3rhFK2LdcWrdFkhOLOndnW/azUkbzZd+WWhRA=="
+    },
+    "node_modules/cordova-support-google-services": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/cordova-support-google-services/-/cordova-support-google-services-1.2.1.tgz",
+      "integrity": "sha512-EnFjKAE9oI2uzyUvEfWpLgTM200nuJVvShaA4yyz9wMKBUN+H/BRG1byd1ibZz3sSihNKi3FxjQPxmmEn6/IfA=="
+    },
+    "node_modules/cordova.plugins.diagnostic": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/cordova.plugins.diagnostic/-/cordova.plugins.diagnostic-5.0.2.tgz",
+      "integrity": "sha512-H59o7YxJ2/COzvg+jyTpUqX8QoDcvti9dluJ9a+pHumE8lf3meWemwCl0QFa9GH+xgVd6X1Ikj/6P3+DKWd9eg==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "colors": "^1.1.2",
+        "elementtree": "^0.1.6",
+        "minimist": "1.2.0"
+      },
+      "engines": {
+        "cordovaDependencies": {
+          "4.0.0": {
+            "cordova": ">=7.1.0",
+            "cordova-android": ">=6.3.0",
+            "cordova-ios": ">=4.3.0"
+          }
+        }
+      }
+    },
+    "node_modules/cordova.plugins.diagnostic/node_modules/minimist": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+    },
+    "node_modules/core-js": {
+      "version": "3.9.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.9.1.tgz",
+      "integrity": "sha512-gSjRvzkxQc1zjM/5paAmL4idJBFzuJoo+jDjF1tStYFMV2ERfD02HhahhCGXUyHxQRG4yFKVSdO6g62eoRMcDg==",
+      "hasInstallScript": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/core-js-compat": {
+      "version": "3.6.5",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz",
+      "integrity": "sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.8.5",
+        "semver": "7.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/core-js-compat/node_modules/semver": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
+      "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/core-js-pure": {
+      "version": "3.11.1",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.11.1.tgz",
+      "integrity": "sha512-2JukQi8HgAOCD5CSimxWWXVrUBoA9Br796uIA5Z06bIjt7PBBI19ircFaAxplgE1mJf3x2BY6MkT/HWA/UryPg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+    },
+    "node_modules/cosmiconfig": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
+      "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
+      "dev": true,
+      "dependencies": {
+        "import-fresh": "^2.0.0",
+        "is-directory": "^0.3.1",
+        "js-yaml": "^3.13.1",
+        "parse-json": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/cosmiconfig/node_modules/import-fresh": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
+      "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
+      "dev": true,
+      "dependencies": {
+        "caller-path": "^2.0.0",
+        "resolve-from": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/cosmiconfig/node_modules/resolve-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/create-ecdh": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
+      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "elliptic": "^6.5.3"
+      }
+    },
+    "node_modules/create-ecdh/node_modules/bn.js": {
+      "version": "4.11.9",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+      "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+      "dev": true
+    },
+    "node_modules/create-hash": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "dev": true,
+      "dependencies": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
+      }
+    },
+    "node_modules/create-hmac": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "dev": true,
+      "dependencies": {
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/crypto-browserify": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+      "dev": true,
+      "dependencies": {
+        "browserify-cipher": "^1.0.0",
+        "browserify-sign": "^4.0.0",
+        "create-ecdh": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.0",
+        "diffie-hellman": "^5.0.0",
+        "inherits": "^2.0.1",
+        "pbkdf2": "^3.0.3",
+        "public-encrypt": "^4.0.0",
+        "randombytes": "^2.0.0",
+        "randomfill": "^1.0.3"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/crypto-random-string": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
+      "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/css": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
+      "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "source-map": "^0.6.1",
+        "source-map-resolve": "^0.5.2",
+        "urix": "^0.1.0"
+      }
+    },
+    "node_modules/css-color-names": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
+      "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/css-declaration-sorter": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz",
+      "integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^7.0.1",
+        "timsort": "^0.3.0"
+      },
+      "engines": {
+        "node": ">4"
+      }
+    },
+    "node_modules/css-loader": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.5.3.tgz",
+      "integrity": "sha512-UEr9NH5Lmi7+dguAm+/JSPovNjYbm2k3TK58EiwQHzOHH5Jfq1Y+XoP2bQO6TMn7PptMd0opxxedAWcaSTRKHw==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.3.1",
+        "cssesc": "^3.0.0",
+        "icss-utils": "^4.1.1",
+        "loader-utils": "^1.2.3",
+        "normalize-path": "^3.0.0",
+        "postcss": "^7.0.27",
+        "postcss-modules-extract-imports": "^2.0.0",
+        "postcss-modules-local-by-default": "^3.0.2",
+        "postcss-modules-scope": "^2.2.0",
+        "postcss-modules-values": "^3.0.0",
+        "postcss-value-parser": "^4.0.3",
+        "schema-utils": "^2.6.6",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">= 8.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/css-loader/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/css-loader/node_modules/loader-utils": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/css-loader/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/css-parse": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz",
+      "integrity": "sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=",
+      "dev": true,
+      "dependencies": {
+        "css": "^2.0.0"
+      }
+    },
+    "node_modules/css-select": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
+      "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "^1.0.0",
+        "css-what": "^3.2.1",
+        "domutils": "^1.7.0",
+        "nth-check": "^1.0.2"
+      }
+    },
+    "node_modules/css-select-base-adapter": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
+      "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
+      "dev": true
+    },
+    "node_modules/css-tree": {
+      "version": "1.0.0-alpha.37",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz",
+      "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==",
+      "dev": true,
+      "dependencies": {
+        "mdn-data": "2.0.4",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/css-tree/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/css-what": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.1.tgz",
+      "integrity": "sha512-wHOppVDKl4vTAOWzJt5Ek37Sgd9qq1Bmj/T1OjvicWbU5W7ru7Pqbn0Jdqii3Drx/h+dixHKXNhZYx7blthL7g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/css/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/cssesc": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+      "dev": true,
+      "bin": {
+        "cssesc": "bin/cssesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/cssnano": {
+      "version": "4.1.10",
+      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz",
+      "integrity": "sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ==",
+      "dev": true,
+      "dependencies": {
+        "cosmiconfig": "^5.0.0",
+        "cssnano-preset-default": "^4.0.7",
+        "is-resolvable": "^1.0.0",
+        "postcss": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/cssnano-preset-default": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz",
+      "integrity": "sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA==",
+      "dev": true,
+      "dependencies": {
+        "css-declaration-sorter": "^4.0.1",
+        "cssnano-util-raw-cache": "^4.0.1",
+        "postcss": "^7.0.0",
+        "postcss-calc": "^7.0.1",
+        "postcss-colormin": "^4.0.3",
+        "postcss-convert-values": "^4.0.1",
+        "postcss-discard-comments": "^4.0.2",
+        "postcss-discard-duplicates": "^4.0.2",
+        "postcss-discard-empty": "^4.0.1",
+        "postcss-discard-overridden": "^4.0.1",
+        "postcss-merge-longhand": "^4.0.11",
+        "postcss-merge-rules": "^4.0.3",
+        "postcss-minify-font-values": "^4.0.2",
+        "postcss-minify-gradients": "^4.0.2",
+        "postcss-minify-params": "^4.0.2",
+        "postcss-minify-selectors": "^4.0.2",
+        "postcss-normalize-charset": "^4.0.1",
+        "postcss-normalize-display-values": "^4.0.2",
+        "postcss-normalize-positions": "^4.0.2",
+        "postcss-normalize-repeat-style": "^4.0.2",
+        "postcss-normalize-string": "^4.0.2",
+        "postcss-normalize-timing-functions": "^4.0.2",
+        "postcss-normalize-unicode": "^4.0.1",
+        "postcss-normalize-url": "^4.0.1",
+        "postcss-normalize-whitespace": "^4.0.2",
+        "postcss-ordered-values": "^4.1.2",
+        "postcss-reduce-initial": "^4.0.3",
+        "postcss-reduce-transforms": "^4.0.2",
+        "postcss-svgo": "^4.0.2",
+        "postcss-unique-selectors": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/cssnano-util-get-arguments": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz",
+      "integrity": "sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8=",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/cssnano-util-get-match": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz",
+      "integrity": "sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0=",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/cssnano-util-raw-cache": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz",
+      "integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/cssnano-util-same-parent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz",
+      "integrity": "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/csso": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-4.0.3.tgz",
+      "integrity": "sha512-NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ==",
+      "dev": true,
+      "dependencies": {
+        "css-tree": "1.0.0-alpha.39"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/csso/node_modules/css-tree": {
+      "version": "1.0.0-alpha.39",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.39.tgz",
+      "integrity": "sha512-7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA==",
+      "dev": true,
+      "dependencies": {
+        "mdn-data": "2.0.6",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/csso/node_modules/mdn-data": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.6.tgz",
+      "integrity": "sha512-rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA==",
+      "dev": true
+    },
+    "node_modules/csso/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/cssom": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
+      "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==",
+      "dev": true
+    },
+    "node_modules/cssstyle": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
+      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
+      "dev": true,
+      "dependencies": {
+        "cssom": "~0.3.6"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cssstyle/node_modules/cssom": {
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
+      "dev": true
+    },
+    "node_modules/currently-unhandled": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
+      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
+      "dependencies": {
+        "array-find-index": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/cyclist": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
+      "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
+      "dev": true
+    },
+    "node_modules/d": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
+      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
+      "dev": true,
+      "dependencies": {
+        "es5-ext": "^0.10.50",
+        "type": "^1.0.1"
+      }
+    },
+    "node_modules/dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "dependencies": {
+        "assert-plus": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/data-uri-to-buffer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz",
+      "integrity": "sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/data-urls": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
+      "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
+      "dev": true,
+      "dependencies": {
+        "abab": "^2.0.3",
+        "whatwg-mimetype": "^2.3.0",
+        "whatwg-url": "^8.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/debuglog": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz",
+      "integrity": "sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/decimal.js": {
+      "version": "10.2.1",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.1.tgz",
+      "integrity": "sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==",
+      "dev": true
+    },
+    "node_modules/decode-uri-component": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/decompress-response": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
+      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
+      "dependencies": {
+        "mimic-response": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/dedent": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
+      "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw="
+    },
+    "node_modules/deep-equal": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
+      "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
+      "dev": true,
+      "dependencies": {
+        "is-arguments": "^1.0.4",
+        "is-date-object": "^1.0.1",
+        "is-regex": "^1.0.4",
+        "object-is": "^1.0.1",
+        "object-keys": "^1.1.1",
+        "regexp.prototype.flags": "^1.2.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/deep-extend": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/deep-is": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+      "dev": true
+    },
+    "node_modules/deepmerge": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
+      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/default-compare": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz",
+      "integrity": "sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^5.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/default-compare/node_modules/kind-of": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/default-gateway": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
+      "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==",
+      "dev": true,
+      "dependencies": {
+        "execa": "^1.0.0",
+        "ip-regex": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/default-gateway/node_modules/cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "dev": true,
+      "dependencies": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      },
+      "engines": {
+        "node": ">=4.8"
+      }
+    },
+    "node_modules/default-gateway/node_modules/execa": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^6.0.0",
+        "get-stream": "^4.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/default-gateway/node_modules/get-stream": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "dev": true,
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/default-gateway/node_modules/is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/default-gateway/node_modules/npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/default-gateway/node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/default-gateway/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/default-gateway/node_modules/shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/default-gateway/node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/default-gateway/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/default-resolution": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz",
+      "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/defaults": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
+      "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
+      "dev": true,
+      "dependencies": {
+        "clone": "^1.0.2"
+      }
+    },
+    "node_modules/defaults/node_modules/clone": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/defer-to-connect": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz",
+      "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="
+    },
+    "node_modules/define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "dev": true,
+      "dependencies": {
+        "object-keys": "^1.0.12"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/define-property": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.2",
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/define-property/node_modules/is-accessor-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/define-property/node_modules/is-data-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/define-property/node_modules/is-descriptor": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.0",
+        "is-data-descriptor": "^1.0.0",
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/define-property/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/degenerator": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-2.2.0.tgz",
+      "integrity": "sha512-aiQcQowF01RxFI4ZLFMpzyotbQonhNpBao6dkI8JPk5a+hmSjR5ErHp2CQySmQe8os3VBqLCIh87nDBgZXvsmg==",
+      "dev": true,
+      "dependencies": {
+        "ast-types": "^0.13.2",
+        "escodegen": "^1.8.1",
+        "esprima": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/del": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
+      "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/glob": "^7.1.1",
+        "globby": "^6.1.0",
+        "is-path-cwd": "^2.0.0",
+        "is-path-in-cwd": "^2.0.0",
+        "p-map": "^2.0.0",
+        "pify": "^4.0.1",
+        "rimraf": "^2.6.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/del/node_modules/array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+      "dev": true,
+      "dependencies": {
+        "array-uniq": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/del/node_modules/globby": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+      "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+      "dev": true,
+      "dependencies": {
+        "array-union": "^1.0.1",
+        "glob": "^7.0.3",
+        "object-assign": "^4.0.1",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/del/node_modules/globby/node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/del/node_modules/p-map": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
+      "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/del/node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
+      "optional": true
+    },
+    "node_modules/dep-graph": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/dep-graph/-/dep-graph-1.1.0.tgz",
+      "integrity": "sha1-+t6GqSeZqBPptCURzfPfpsyNvv4=",
+      "dependencies": {
+        "underscore": "1.2.1"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/dep-graph/node_modules/underscore": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.2.1.tgz",
+      "integrity": "sha1-/FxrB2VnPZKi1KyLTcCqiHAuK9Q=",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/dependency-graph": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.7.2.tgz",
+      "integrity": "sha512-KqtH4/EZdtdfWX0p6MGP9jljvxSY6msy/pRUD4jgNwVpv3v1QmNLlsB3LDSSUg79BRVSn7jI1QPRtArGABovAQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
+    "node_modules/des.js": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
+      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "node_modules/destroy": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
+    },
+    "node_modules/detect-file": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
+      "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/detect-indent": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.0.0.tgz",
+      "integrity": "sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
+      "optional": true,
+      "bin": {
+        "detect-libc": "bin/detect-libc.js"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/detect-newline": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/detect-node": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
+      "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
+      "dev": true
+    },
+    "node_modules/dezalgo": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz",
+      "integrity": "sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=",
+      "dev": true,
+      "dependencies": {
+        "asap": "^2.0.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/diff": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
+    "node_modules/diff-sequences": {
+      "version": "26.5.0",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.5.0.tgz",
+      "integrity": "sha512-ZXx86srb/iYy6jG71k++wBN9P9J05UNQ5hQHQd9MtMPvcqXPx/vKU69jfHV637D00Q2gSgPk2D+jSx3l1lDW/Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/diffie-hellman": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
+      }
+    },
+    "node_modules/diffie-hellman/node_modules/bn.js": {
+      "version": "4.11.9",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+      "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+      "dev": true
+    },
+    "node_modules/dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "dependencies": {
+        "path-type": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/dns-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
+      "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=",
+      "dev": true
+    },
+    "node_modules/dns-packet": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
+      "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
+      "dev": true,
+      "dependencies": {
+        "ip": "^1.1.0",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/dns-txt": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
+      "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
+      "dev": true,
+      "dependencies": {
+        "buffer-indexof": "^1.0.0"
+      }
+    },
+    "node_modules/doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/dom-serializer": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
+      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "entities": "^2.0.0"
+      }
+    },
+    "node_modules/dom-serializer/node_modules/domelementtype": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.2.tgz",
+      "integrity": "sha512-wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ]
+    },
+    "node_modules/domain-browser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4",
+        "npm": ">=1.2"
+      }
+    },
+    "node_modules/domelementtype": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
+      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
+      "dev": true
+    },
+    "node_modules/domexception": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
+      "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
+      "dev": true,
+      "dependencies": {
+        "webidl-conversions": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/domexception/node_modules/webidl-conversions": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
+      "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/domhandler": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
+      "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "1"
+      }
+    },
+    "node_modules/domutils": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
+      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
+      "dev": true,
+      "dependencies": {
+        "dom-serializer": "0",
+        "domelementtype": "1"
+      }
+    },
+    "node_modules/dot-prop": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
+      "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
+      "dependencies": {
+        "is-obj": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/duplexer2": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+      "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "node_modules/duplexer3": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
+      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI="
+    },
+    "node_modules/duplexify": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+      "dev": true,
+      "dependencies": {
+        "end-of-stream": "^1.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "node_modules/each-props": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz",
+      "integrity": "sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.1",
+        "object.defaults": "^1.1.0"
+      }
+    },
+    "node_modules/ecc-jsbn": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+      "dependencies": {
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "node_modules/editor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/editor/-/editor-1.0.0.tgz",
+      "integrity": "sha1-YMf4e9YrzGqJT6jM1q+3gjok90I="
+    },
+    "node_modules/ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
+    },
+    "node_modules/electron-to-chromium": {
+      "version": "1.3.577",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.577.tgz",
+      "integrity": "sha512-dSb64JQSFif/pD8mpVAgSFkbVi6YHbK6JeEziwNNmXlr/Ne2rZtseFK5SM7JoWSLf6gP0gVvRGi4/2ZRhSX/rA==",
+      "dev": true
+    },
+    "node_modules/elementtree": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.7.tgz",
+      "integrity": "sha1-mskb5uUvtuYkTE5UpKw+2K6OKcA=",
+      "dependencies": {
+        "sax": "1.1.4"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/elliptic": {
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
+      "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.4.0",
+        "brorand": "^1.0.1",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.0"
+      }
+    },
+    "node_modules/elliptic/node_modules/bn.js": {
+      "version": "4.11.9",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+      "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+      "dev": true
+    },
+    "node_modules/emittery": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.7.1.tgz",
+      "integrity": "sha512-d34LN4L6h18Bzz9xpoku2nPwKxCPlPMr3EEKTkoEBi+1/+b0lcRkRJ1UVyyZaKNeqGR3swcGl6s390DNO4YVgQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
+      }
+    },
+    "node_modules/emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
+    },
+    "node_modules/emojis-list": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/encoding": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
+      "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
+      "dev": true,
+      "dependencies": {
+        "iconv-lite": "^0.6.2"
+      }
+    },
+    "node_modules/encoding/node_modules/iconv-lite": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz",
+      "integrity": "sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==",
+      "dev": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dependencies": {
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/endent": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/endent/-/endent-1.4.1.tgz",
+      "integrity": "sha512-buHTb5c8AC9NshtP6dgmNLYkiT+olskbq1z6cEGvfGCF3Qphbu/1zz5Xu+yjTDln8RbxNhPoUyJ5H8MSrp1olQ==",
+      "dependencies": {
+        "dedent": "^0.7.0",
+        "fast-json-parse": "^1.0.3",
+        "objectorarray": "^1.0.4"
+      }
+    },
+    "node_modules/enhanced-resolve": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz",
+      "integrity": "sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "memory-fs": "^0.5.0",
+        "tapable": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/enquirer": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/enquirer/node_modules/ansi-colors": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/entities": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
+      "integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==",
+      "dev": true
+    },
+    "node_modules/env-paths": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-1.0.0.tgz",
+      "integrity": "sha1-QWgTO0K7BcOKNbGuQ5fIKYqzaeA=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/err-code": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz",
+      "integrity": "sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA=",
+      "dev": true
+    },
+    "node_modules/errno": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
+      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
+      "dev": true,
+      "dependencies": {
+        "prr": "~1.0.1"
+      },
+      "bin": {
+        "errno": "cli.js"
+      }
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "node_modules/es-abstract": {
+      "version": "1.18.0-next.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
+      "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
+      "dev": true,
+      "dependencies": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.2",
+        "is-negative-zero": "^2.0.0",
+        "is-regex": "^1.1.1",
+        "object-inspect": "^1.8.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.1",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es5-ext": {
+      "version": "0.10.53",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
+      "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
+      "dev": true,
+      "dependencies": {
+        "es6-iterator": "~2.0.3",
+        "es6-symbol": "~3.1.3",
+        "next-tick": "~1.0.0"
+      }
+    },
+    "node_modules/es6-iterator": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
+      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
+      "dev": true,
+      "dependencies": {
+        "d": "1",
+        "es5-ext": "^0.10.35",
+        "es6-symbol": "^3.1.1"
+      }
+    },
+    "node_modules/es6-promise": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
+      "dev": true
+    },
+    "node_modules/es6-promise-plugin": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/es6-promise-plugin/-/es6-promise-plugin-4.2.2.tgz",
+      "integrity": "sha512-uoA4aVplXI9oqUYJFBAVRwAqIN9/n9JgrTAUGX3qPbnSZVE5yY1+6/MsoN5f4xsaPO62WjPHOdtts6okMN6tNA=="
+    },
+    "node_modules/es6-promisify": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
+      "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
+      "dev": true,
+      "dependencies": {
+        "es6-promise": "^4.0.3"
+      }
+    },
+    "node_modules/es6-symbol": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
+      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
+      "dev": true,
+      "dependencies": {
+        "d": "^1.0.1",
+        "ext": "^1.1.2"
+      }
+    },
+    "node_modules/es6-weak-map": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
+      "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
+      "dev": true,
+      "dependencies": {
+        "d": "1",
+        "es5-ext": "^0.10.46",
+        "es6-iterator": "^2.0.3",
+        "es6-symbol": "^3.1.1"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.0.tgz",
+      "integrity": "sha512-mAk+hPSO8fLDkhV7V0dXazH5pDc6MrjBTPyD3VeKzxnVFjH1MIxbCdqGZB9O8+EwWakZs3ZCbDS4IpRt79V1ig==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-goat": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz",
+      "integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/escodegen": {
+      "version": "1.14.3",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
+      "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
+      "dev": true,
+      "dependencies": {
+        "esprima": "^4.0.1",
+        "estraverse": "^4.2.0",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
+      },
+      "engines": {
+        "node": ">=4.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/escodegen/node_modules/levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/escodegen/node_modules/optionator": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+      "dev": true,
+      "dependencies": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.6",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "word-wrap": "~1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/escodegen/node_modules/prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/escodegen/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/escodegen/node_modules/type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/eslint": {
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.25.0.tgz",
+      "integrity": "sha512-TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "7.12.11",
+        "@eslint/eslintrc": "^0.4.0",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.0.1",
+        "doctrine": "^3.0.0",
+        "enquirer": "^2.3.5",
+        "eslint-scope": "^5.1.1",
+        "eslint-utils": "^2.1.0",
+        "eslint-visitor-keys": "^2.0.0",
+        "espree": "^7.3.1",
+        "esquery": "^1.4.0",
+        "esutils": "^2.0.2",
+        "file-entry-cache": "^6.0.1",
+        "functional-red-black-tree": "^1.0.1",
+        "glob-parent": "^5.0.0",
+        "globals": "^13.6.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "js-yaml": "^3.13.1",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash": "^4.17.21",
+        "minimatch": "^3.0.4",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.1",
+        "progress": "^2.0.0",
+        "regexpp": "^3.1.0",
+        "semver": "^7.2.1",
+        "strip-ansi": "^6.0.0",
+        "strip-json-comments": "^3.1.0",
+        "table": "^6.0.4",
+        "text-table": "^0.2.0",
+        "v8-compile-cache": "^2.0.3"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-config-prettier": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz",
+      "integrity": "sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==",
+      "dev": true,
+      "bin": {
+        "eslint-config-prettier": "bin/cli.js"
+      },
+      "peerDependencies": {
+        "eslint": ">=7.0.0"
+      }
+    },
+    "node_modules/eslint-import-resolver-node": {
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz",
+      "integrity": "sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^2.6.9",
+        "resolve": "^1.13.1"
+      }
+    },
+    "node_modules/eslint-module-utils": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz",
+      "integrity": "sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^2.6.9",
+        "pkg-dir": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eslint-module-utils/node_modules/pkg-dir": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
+      "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eslint-plugin-ecmascript-compat": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-ecmascript-compat/-/eslint-plugin-ecmascript-compat-1.1.1.tgz",
+      "integrity": "sha512-OUytzpOKynpuSfnrGpOfj2QmduJu/0fGfTLf9GwTJzIyvfXfLDGtoZ+ek0sHFh68BLbwG5lylyBNgAxhFh5V8A==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.8.0",
+        "eslint-plugin-es": "^2.0.0",
+        "lodash": "^4.17.15",
+        "mdn-browser-compat-data": "^1.0.25"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      },
+      "peerDependencies": {
+        "eslint": ">=4.19.1"
+      }
+    },
+    "node_modules/eslint-plugin-es": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-2.0.0.tgz",
+      "integrity": "sha512-f6fceVtg27BR02EYnBhgWLFQfK6bN4Ll0nQFrBHOlCsAyxeZkn0NHns5O0YZOPrV1B3ramd6cgFwaoFLcSkwEQ==",
+      "dev": true,
+      "dependencies": {
+        "eslint-utils": "^1.4.2",
+        "regexpp": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      },
+      "peerDependencies": {
+        "eslint": ">=4.19.1"
+      }
+    },
+    "node_modules/eslint-plugin-es/node_modules/eslint-utils": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
+      "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/eslint-plugin-es/node_modules/eslint-visitor-keys": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eslint-plugin-header": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-header/-/eslint-plugin-header-3.1.1.tgz",
+      "integrity": "sha512-9vlKxuJ4qf793CmeeSrZUvVClw6amtpghq3CuWcB5cUNnWHQhgcqy5eF8oVKFk1G3Y/CbchGfEaw3wiIJaNmVg==",
+      "dev": true,
+      "peerDependencies": {
+        "eslint": ">=7.7.0"
+      }
+    },
+    "node_modules/eslint-plugin-import": {
+      "version": "2.22.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz",
+      "integrity": "sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==",
+      "dev": true,
+      "dependencies": {
+        "array-includes": "^3.1.1",
+        "array.prototype.flat": "^1.2.3",
+        "contains-path": "^0.1.0",
+        "debug": "^2.6.9",
+        "doctrine": "1.5.0",
+        "eslint-import-resolver-node": "^0.3.4",
+        "eslint-module-utils": "^2.6.0",
+        "has": "^1.0.3",
+        "minimatch": "^3.0.4",
+        "object.values": "^1.1.1",
+        "read-pkg-up": "^2.0.0",
+        "resolve": "^1.17.0",
+        "tsconfig-paths": "^3.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/doctrine": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
+      "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2",
+        "isarray": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eslint-plugin-jest": {
+      "version": "24.3.6",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.3.6.tgz",
+      "integrity": "sha512-WOVH4TIaBLIeCX576rLcOgjNXqP+jNlCiEmRgFTfQtJ52DpwnIQKAVGlGPAN7CZ33bW6eNfHD6s8ZbEUTQubJg==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/experimental-utils": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/eslint-plugin": ">= 4",
+        "eslint": ">=5"
+      },
+      "peerDependenciesMeta": {
+        "@typescript-eslint/eslint-plugin": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-plugin-jsdoc": {
+      "version": "32.3.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-32.3.3.tgz",
+      "integrity": "sha512-WxXohbMYlZvCt3r7MepwT++nTLsO4CPegWcm5toM4IGq3MBmYkG+Uf5yDa+n1MwPXLg+KbJqAsI19hmkVD7MPg==",
+      "dev": true,
+      "dependencies": {
+        "comment-parser": "1.1.5",
+        "debug": "^4.3.1",
+        "jsdoctypeparser": "^9.0.0",
+        "lodash": "^4.17.21",
+        "regextras": "^0.7.1",
+        "semver": "^7.3.5",
+        "spdx-expression-parse": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-jsdoc/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-plugin-jsdoc/node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
+    },
+    "node_modules/eslint-plugin-jsdoc/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/eslint-plugin-jsdoc/node_modules/semver": {
+      "version": "7.3.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint-plugin-prefer-arrow": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prefer-arrow/-/eslint-plugin-prefer-arrow-1.2.3.tgz",
+      "integrity": "sha512-J9I5PKCOJretVuiZRGvPQxCbllxGAV/viI20JO3LYblAodofBxyMnZAJ+WGeClHgANnSJberTNoFWWjrWKBuXQ==",
+      "dev": true,
+      "peerDependencies": {
+        "eslint": ">=2.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-promise": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-5.1.0.tgz",
+      "integrity": "sha512-NGmI6BH5L12pl7ScQHbg7tvtk4wPxxj8yPHH47NvSmMtFneC077PSeY3huFj06ZWZvtbfxSPt3RuOQD5XcR4ng==",
+      "dev": true,
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^7.0.0"
+      }
+    },
+    "node_modules/eslint-scope": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/eslint-utils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      }
+    },
+    "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eslint-visitor-keys": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz",
+      "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint/node_modules/@babel/code-frame": {
+      "version": "7.12.11",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
+      "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/highlight": "^7.10.4"
+      }
+    },
+    "node_modules/eslint/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/chalk": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/eslint/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint/node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/eslint/node_modules/globals": {
+      "version": "13.8.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.8.0.tgz",
+      "integrity": "sha512-rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/ignore": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/eslint/node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
+    },
+    "node_modules/eslint/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/eslint/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/espree": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
+      "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^7.4.0",
+        "acorn-jsx": "^5.3.1",
+        "eslint-visitor-keys": "^1.3.0"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/espree/node_modules/acorn": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/espree/node_modules/eslint-visitor-keys": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/esquery": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/esquery/node_modules/estraverse": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esrecurse/node_modules/estraverse": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/eventemitter3": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
+      "dev": true
+    },
+    "node_modules/events": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.2.0.tgz",
+      "integrity": "sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.x"
+      }
+    },
+    "node_modules/eventsource": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz",
+      "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
+      "dev": true,
+      "dependencies": {
+        "original": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/evp_bytestokey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "dev": true,
+      "dependencies": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/exec-sh": {
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz",
+      "integrity": "sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==",
+      "dev": true
+    },
+    "node_modules/execa": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-4.0.3.tgz",
+      "integrity": "sha512-WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A==",
+      "dependencies": {
+        "cross-spawn": "^7.0.0",
+        "get-stream": "^5.0.0",
+        "human-signals": "^1.1.1",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.0",
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2",
+        "strip-final-newline": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/exit": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+      "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+      "dev": true,
+      "dependencies": {
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-template": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
+      "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
+      "optional": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/expand-tilde": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
+      "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
+      "dev": true,
+      "dependencies": {
+        "homedir-polyfill": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expect": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-26.5.2.tgz",
+      "integrity": "sha512-ccTGrXZd8DZCcvCz4htGXTkd/LOoy6OEtiDS38x3/VVf6E4AQL0QoeksBiw7BtGR5xDNiRYPB8GN6pfbuTOi7w==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.5.2",
+        "ansi-styles": "^4.0.0",
+        "jest-get-type": "^26.3.0",
+        "jest-matcher-utils": "^26.5.2",
+        "jest-message-util": "^26.5.2",
+        "jest-regex-util": "^26.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/express": {
+      "version": "4.17.1",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
+      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
+      "dependencies": {
+        "accepts": "~1.3.7",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.19.0",
+        "content-disposition": "0.5.3",
+        "content-type": "~1.0.4",
+        "cookie": "0.4.0",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "~1.1.2",
+        "fresh": "0.5.2",
+        "merge-descriptors": "1.0.1",
+        "methods": "~1.1.2",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "~2.0.5",
+        "qs": "6.7.0",
+        "range-parser": "~1.2.1",
+        "safe-buffer": "5.1.2",
+        "send": "0.17.1",
+        "serve-static": "1.14.1",
+        "setprototypeof": "1.1.1",
+        "statuses": "~1.5.0",
+        "type-is": "~1.6.18",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/ext": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz",
+      "integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==",
+      "dev": true,
+      "dependencies": {
+        "type": "^2.0.0"
+      }
+    },
+    "node_modules/ext/node_modules/type": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/type/-/type-2.1.0.tgz",
+      "integrity": "sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA==",
+      "dev": true
+    },
+    "node_modules/extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+    },
+    "node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extend-shallow/node_modules/is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/external-editor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
+      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
+      "dependencies": {
+        "chardet": "^0.7.0",
+        "iconv-lite": "^0.4.24",
+        "tmp": "^0.0.33"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/external-editor/node_modules/tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "dependencies": {
+        "os-tmpdir": "~1.0.2"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+    "node_modules/extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
+      "dependencies": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob/node_modules/is-accessor-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob/node_modules/is-data-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob/node_modules/is-descriptor": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.0",
+        "is-data-descriptor": "^1.0.0",
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extsprintf": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.0.tgz",
+      "integrity": "sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=",
+      "engines": [
+        "node >=0.6.0"
+      ]
+    },
+    "node_modules/faker": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/faker/-/faker-5.1.0.tgz",
+      "integrity": "sha512-RrWKFSSA/aNLP0g3o2WW1Zez7/MnMr7xkiZmoCfAGZmdkDQZ6l2KtuXHN5XjdvpRjDl8+3vf+Rrtl06Z352+Mw==",
+      "dev": true
+    },
+    "node_modules/fancy-log": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
+      "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
+      "dev": true,
+      "dependencies": {
+        "ansi-gray": "^0.1.1",
+        "color-support": "^1.1.3",
+        "parse-node-version": "^1.0.0",
+        "time-stamp": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+    },
+    "node_modules/fast-glob": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz",
+      "integrity": "sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==",
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.0",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.2",
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/fast-json-parse": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/fast-json-parse/-/fast-json-parse-1.0.3.tgz",
+      "integrity": "sha512-FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw=="
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+    },
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "dev": true
+    },
+    "node_modules/fast-safe-stringify": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz",
+      "integrity": "sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==",
+      "dev": true
+    },
+    "node_modules/fastq": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz",
+      "integrity": "sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==",
+      "dependencies": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "node_modules/faye-websocket": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
+      "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
+      "dev": true,
+      "dependencies": {
+        "websocket-driver": ">=0.5.1"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/fb-watchman": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
+      "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
+      "dev": true,
+      "dependencies": {
+        "bser": "2.1.1"
+      }
+    },
+    "node_modules/fd-slicer": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
+      "dev": true,
+      "dependencies": {
+        "pend": "~1.2.0"
+      }
+    },
+    "node_modules/figgy-pudding": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
+      "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==",
+      "dev": true
+    },
+    "node_modules/figures": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+      "dependencies": {
+        "escape-string-regexp": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
+      "dependencies": {
+        "flat-cache": "^3.0.4"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/file-loader": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.0.0.tgz",
+      "integrity": "sha512-/aMOAYEFXDdjG0wytpTL5YQLfZnnTmLNjn+AIrJ/6HVnTfDqLsVKUUwkDf4I4kgex36BvjuXEn/TX9B/1ESyqQ==",
+      "dev": true,
+      "dependencies": {
+        "loader-utils": "^2.0.0",
+        "schema-utils": "^2.6.5"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/finalhandler": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
+      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "dependencies": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
+        "statuses": "~1.5.0",
+        "unpipe": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/find-cache-dir": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
+      "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
+      "dev": true,
+      "dependencies": {
+        "commondir": "^1.0.1",
+        "make-dir": "^3.0.2",
+        "pkg-dir": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
+      }
+    },
+    "node_modules/find-cache-dir/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/find-cache-dir/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/find-cache-dir/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/find-cache-dir/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/find-cache-dir/node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/find-cache-dir/node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/find-up": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+      "dependencies": {
+        "locate-path": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/findup-sync": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
+      "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
+      "dev": true,
+      "dependencies": {
+        "detect-file": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "micromatch": "^3.0.4",
+        "resolve-dir": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/findup-sync/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/fined": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
+      "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
+      "dev": true,
+      "dependencies": {
+        "expand-tilde": "^2.0.2",
+        "is-plain-object": "^2.0.3",
+        "object.defaults": "^1.1.0",
+        "object.pick": "^1.2.0",
+        "parse-filepath": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/flagged-respawn": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
+      "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/flat-cache": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+      "dev": true,
+      "dependencies": {
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/flatted": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz",
+      "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==",
+      "dev": true
+    },
+    "node_modules/flush-write-stream": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
+      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.3.6"
+      }
+    },
+    "node_modules/follow-redirects": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz",
+      "integrity": "sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/for-own": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
+      "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
+      "dev": true,
+      "dependencies": {
+        "for-in": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/form-data": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 0.12"
+      }
+    },
+    "node_modules/formidable": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.2.tgz",
+      "integrity": "sha512-V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q==",
+      "dev": true,
+      "funding": {
+        "url": "https://ko-fi.com/tunnckoCore/commissions"
+      }
+    },
+    "node_modules/forwarded": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
+      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/fragment-cache": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+      "dev": true,
+      "dependencies": {
+        "map-cache": "^0.2.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/from2": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
+      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0"
+      }
+    },
+    "node_modules/fs-constants": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+      "optional": true
+    },
+    "node_modules/fs-extra": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+      "dependencies": {
+        "at-least-node": "^1.0.0",
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/fs-minipass": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/fs-mkdirp-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
+      "integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.11",
+        "through2": "^2.0.3"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/fs-write-stream-atomic": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
+      "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "iferr": "^0.1.5",
+        "imurmurhash": "^0.1.4",
+        "readable-stream": "1 || 2"
+      }
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+    },
+    "node_modules/fsevents": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
+      "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+      "deprecated": "\"Please update to latest v2.3 or v2.2\"",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/ftp": {
+      "version": "0.3.10",
+      "resolved": "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz",
+      "integrity": "sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "1.1.x",
+        "xregexp": "2.0.0"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/ftp/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+      "dev": true
+    },
+    "node_modules/ftp/node_modules/readable-stream": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/ftp/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+      "dev": true
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "node_modules/functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+      "dev": true
+    },
+    "node_modules/gauge": {
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+      "optional": true,
+      "dependencies": {
+        "aproba": "^1.0.3",
+        "console-control-strings": "^1.0.0",
+        "has-unicode": "^2.0.0",
+        "object-assign": "^4.1.0",
+        "signal-exit": "^3.0.0",
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wide-align": "^1.1.0"
+      }
+    },
+    "node_modules/gauge/node_modules/ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gauge/node_modules/is-fullwidth-code-point": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+      "optional": true,
+      "dependencies": {
+        "number-is-nan": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gauge/node_modules/string-width": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+      "optional": true,
+      "dependencies": {
+        "code-point-at": "^1.0.0",
+        "is-fullwidth-code-point": "^1.0.0",
+        "strip-ansi": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gauge/node_modules/strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "optional": true,
+      "dependencies": {
+        "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/genfun": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/genfun/-/genfun-5.0.0.tgz",
+      "integrity": "sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==",
+      "dev": true
+    },
+    "node_modules/gensync": {
+      "version": "1.0.0-beta.1",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz",
+      "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true,
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
+      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-package-type": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/get-stream": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/get-uri": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-3.0.2.tgz",
+      "integrity": "sha512-+5s0SJbGoyiJTZZ2JTpFPLMPSch72KEqGOTvQsBqg0RBWvwhWUSYZFAtz3TPW0GXJuLBJPts1E241iHg+VRfhg==",
+      "dev": true,
+      "dependencies": {
+        "@tootallnate/once": "1",
+        "data-uri-to-buffer": "3",
+        "debug": "4",
+        "file-uri-to-path": "2",
+        "fs-extra": "^8.1.0",
+        "ftp": "^0.3.10"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/get-uri/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/get-uri/node_modules/file-uri-to-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-2.0.0.tgz",
+      "integrity": "sha512-hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/get-uri/node_modules/fs-extra": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=6 <7 || >=8"
+      }
+    },
+    "node_modules/get-uri/node_modules/jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "dev": true,
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/get-uri/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/get-uri/node_modules/universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "dependencies": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "node_modules/github-from-package": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
+      "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=",
+      "optional": true
+    },
+    "node_modules/glob": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/glob-stream": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz",
+      "integrity": "sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=",
+      "dev": true,
+      "dependencies": {
+        "extend": "^3.0.0",
+        "glob": "^7.1.1",
+        "glob-parent": "^3.1.0",
+        "is-negated-glob": "^1.0.0",
+        "ordered-read-streams": "^1.0.0",
+        "pumpify": "^1.3.5",
+        "readable-stream": "^2.1.5",
+        "remove-trailing-separator": "^1.0.1",
+        "to-absolute-glob": "^2.0.0",
+        "unique-stream": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/glob-stream/node_modules/glob-parent": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      }
+    },
+    "node_modules/glob-stream/node_modules/is-glob": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.5.tgz",
+      "integrity": "sha512-zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw==",
+      "dev": true,
+      "dependencies": {
+        "anymatch": "^2.0.0",
+        "async-done": "^1.2.0",
+        "chokidar": "^2.0.0",
+        "is-negated-glob": "^1.0.0",
+        "just-debounce": "^1.0.0",
+        "normalize-path": "^3.0.0",
+        "object.defaults": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/anymatch": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+      "dev": true,
+      "dependencies": {
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/anymatch/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+      "dev": true,
+      "dependencies": {
+        "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/binary-extensions": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/chokidar": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+      "deprecated": "Chokidar 2 will break on node v14+. Upgrade to chokidar 3 with 15x less dependencies.",
+      "dev": true,
+      "dependencies": {
+        "anymatch": "^2.0.0",
+        "async-each": "^1.0.1",
+        "braces": "^2.3.2",
+        "glob-parent": "^3.1.0",
+        "inherits": "^2.0.3",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "normalize-path": "^3.0.0",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.2.1",
+        "upath": "^1.1.1"
+      },
+      "optionalDependencies": {
+        "fsevents": "^1.2.7"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/fsevents": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+      "deprecated": "fsevents 1 will break on node v14+ and could be using insecure binaries. Upgrade to fsevents 2.",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "dependencies": {
+        "bindings": "^1.5.0",
+        "nan": "^2.12.1"
+      },
+      "engines": {
+        "node": ">= 4.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/glob-parent": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/glob-parent/node_modules/is-glob": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/is-binary-path": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+      "dev": true,
+      "dependencies": {
+        "binary-extensions": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/readdirp": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.11",
+        "micromatch": "^3.1.10",
+        "readable-stream": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/global-dirs": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-2.0.1.tgz",
+      "integrity": "sha512-5HqUqdhkEovj2Of/ms3IeS/EekcO54ytHRLV4PEY2rhRwrHXLQjeVEES0Lhka0xwNDtGYn58wyC4s5+MHsOO6A==",
+      "dependencies": {
+        "ini": "^1.3.5"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/global-modules": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
+      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+      "dev": true,
+      "dependencies": {
+        "global-prefix": "^1.0.1",
+        "is-windows": "^1.0.1",
+        "resolve-dir": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/global-prefix": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
+      "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
+      "dev": true,
+      "dependencies": {
+        "expand-tilde": "^2.0.2",
+        "homedir-polyfill": "^1.0.1",
+        "ini": "^1.3.4",
+        "is-windows": "^1.0.1",
+        "which": "^1.2.14"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/global-prefix/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/globby": {
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz",
+      "integrity": "sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==",
+      "dependencies": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.1.1",
+        "ignore": "^5.1.4",
+        "merge2": "^1.3.0",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/glogg": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
+      "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
+      "dev": true,
+      "dependencies": {
+        "sparkles": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/got": {
+      "version": "9.6.0",
+      "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
+      "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==",
+      "dependencies": {
+        "@sindresorhus/is": "^0.14.0",
+        "@szmarczak/http-timer": "^1.1.2",
+        "cacheable-request": "^6.0.0",
+        "decompress-response": "^3.3.0",
+        "duplexer3": "^0.1.4",
+        "get-stream": "^4.1.0",
+        "lowercase-keys": "^1.0.1",
+        "mimic-response": "^1.0.1",
+        "p-cancelable": "^1.0.0",
+        "to-readable-stream": "^1.0.0",
+        "url-parse-lax": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/got/node_modules/get-stream": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="
+    },
+    "node_modules/growly": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
+      "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/gulp": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz",
+      "integrity": "sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==",
+      "dev": true,
+      "dependencies": {
+        "glob-watcher": "^5.0.3",
+        "gulp-cli": "^2.2.0",
+        "undertaker": "^1.2.1",
+        "vinyl-fs": "^3.0.0"
+      },
+      "bin": {
+        "gulp": "bin/gulp.js"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/gulp-clip-empty-files": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/gulp-clip-empty-files/-/gulp-clip-empty-files-0.1.2.tgz",
+      "integrity": "sha1-vumATiU7vaVc+8Em6NuuZDPtzMg=",
+      "dev": true,
+      "dependencies": {
+        "through2": "~2.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-concat": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz",
+      "integrity": "sha1-Yz0WyV2IUEYorQJmVmPO5aR5M1M=",
+      "dev": true,
+      "dependencies": {
+        "concat-with-sourcemaps": "^1.0.0",
+        "through2": "^2.0.0",
+        "vinyl": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/gulp-flatten": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/gulp-flatten/-/gulp-flatten-0.4.0.tgz",
+      "integrity": "sha512-eg4spVTAiv1xXmugyaCxWne1oPtNG0UHEtABx5W8ScLiqAYceyYm6GYA36x0Qh8KOIXmAZV97L2aYGnKREG3Sg==",
+      "dev": true,
+      "dependencies": {
+        "plugin-error": "^0.1.2",
+        "through2": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/gulp-htmlmin": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/gulp-htmlmin/-/gulp-htmlmin-5.0.1.tgz",
+      "integrity": "sha512-ASlyDPZOSKjHYUifYV0rf9JPDflN9IRIb8lw2vRqtYMC4ljU3zAmnnaVXwFQ3H+CfXxZSUesZ2x7jrnPJu93jA==",
+      "dev": true,
+      "dependencies": {
+        "html-minifier": "^3.5.20",
+        "plugin-error": "^1.0.1",
+        "through2": "^2.0.3"
+      },
+      "engines": {
+        "node": ">= 6.0"
+      }
+    },
+    "node_modules/gulp-htmlmin/node_modules/ansi-colors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-wrap": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-htmlmin/node_modules/plugin-error": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
+      "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "^1.0.1",
+        "arr-diff": "^4.0.0",
+        "arr-union": "^3.1.0",
+        "extend-shallow": "^3.0.2"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/gulp-rename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-2.0.0.tgz",
+      "integrity": "sha512-97Vba4KBzbYmR5VBs9mWmK+HwIf5mj+/zioxfZhOKeXtx5ZjBk57KFlePf5nxq9QsTtFl0ejnHE3zTC9MHXqyQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/gulp-slash": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/gulp-slash/-/gulp-slash-1.1.3.tgz",
+      "integrity": "sha1-8VUhrCOxeNtE5VHjDi/Lykv2/h0=",
+      "dev": true,
+      "dependencies": {
+        "slash": "~0.1.3",
+        "through2": "~0.5.1"
+      }
+    },
+    "node_modules/gulp-slash/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+      "dev": true
+    },
+    "node_modules/gulp-slash/node_modules/readable-stream": {
+      "version": "1.0.34",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+      "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/gulp-slash/node_modules/slash": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-0.1.3.tgz",
+      "integrity": "sha1-qnEMjvULjh0YetbP9G84xla6Dlc=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/gulp-slash/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+      "dev": true
+    },
+    "node_modules/gulp-slash/node_modules/through2": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
+      "integrity": "sha1-390BLrnHAOIyP9M084rGIqs3Lac=",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~1.0.17",
+        "xtend": "~3.0.0"
+      }
+    },
+    "node_modules/gulp-slash/node_modules/xtend": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
+      "integrity": "sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
+    "node_modules/gulp/node_modules/ansi-colors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-wrap": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/camelcase": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/cliui": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wrap-ansi": "^2.0.0"
+      }
+    },
+    "node_modules/gulp/node_modules/find-up": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+      "dev": true,
+      "dependencies": {
+        "path-exists": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/get-caller-file": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
+      "dev": true
+    },
+    "node_modules/gulp/node_modules/gulp-cli": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.3.0.tgz",
+      "integrity": "sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "^1.0.1",
+        "archy": "^1.0.0",
+        "array-sort": "^1.0.0",
+        "color-support": "^1.1.3",
+        "concat-stream": "^1.6.0",
+        "copy-props": "^2.0.1",
+        "fancy-log": "^1.3.2",
+        "gulplog": "^1.0.0",
+        "interpret": "^1.4.0",
+        "isobject": "^3.0.1",
+        "liftoff": "^3.1.0",
+        "matchdep": "^2.0.0",
+        "mute-stdout": "^1.0.0",
+        "pretty-hrtime": "^1.0.0",
+        "replace-homedir": "^1.0.0",
+        "semver-greatest-satisfied-range": "^1.1.0",
+        "v8flags": "^3.2.0",
+        "yargs": "^7.1.0"
+      },
+      "bin": {
+        "gulp": "bin/gulp.js"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/gulp/node_modules/is-fullwidth-code-point": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+      "dev": true,
+      "dependencies": {
+        "number-is-nan": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/load-json-file": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0",
+        "strip-bom": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/parse-json": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+      "dev": true,
+      "dependencies": {
+        "error-ex": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/path-exists": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+      "dev": true,
+      "dependencies": {
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/path-type": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/read-pkg": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+      "dev": true,
+      "dependencies": {
+        "load-json-file": "^1.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/read-pkg-up": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^1.0.0",
+        "read-pkg": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/require-main-filename": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
+      "dev": true
+    },
+    "node_modules/gulp/node_modules/string-width": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+      "dev": true,
+      "dependencies": {
+        "code-point-at": "^1.0.0",
+        "is-fullwidth-code-point": "^1.0.0",
+        "strip-ansi": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/strip-bom": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+      "dev": true,
+      "dependencies": {
+        "is-utf8": "^0.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/which-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
+      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
+      "dev": true
+    },
+    "node_modules/gulp/node_modules/wrap-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/y18n": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+      "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+      "dev": true
+    },
+    "node_modules/gulp/node_modules/yargs": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.1.tgz",
+      "integrity": "sha512-huO4Fr1f9PmiJJdll5kwoS2e4GqzGSsMT3PPMpOwoVkOK8ckqAewMTZyA6LXVQWflleb/Z8oPBEvNsMft0XE+g==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^3.0.0",
+        "cliui": "^3.2.0",
+        "decamelize": "^1.1.1",
+        "get-caller-file": "^1.0.1",
+        "os-locale": "^1.4.0",
+        "read-pkg-up": "^1.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^1.0.1",
+        "set-blocking": "^2.0.0",
+        "string-width": "^1.0.2",
+        "which-module": "^1.0.0",
+        "y18n": "^3.2.1",
+        "yargs-parser": "5.0.0-security.0"
+      }
+    },
+    "node_modules/gulp/node_modules/yargs-parser": {
+      "version": "5.0.0-security.0",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0-security.0.tgz",
+      "integrity": "sha512-T69y4Ps64LNesYxeYGYPvfoMTt/7y1XtfpIslUeK4um+9Hu7hlGoRtaDLvdXb7+/tfq4opVa2HRY5xGip022rQ==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^3.0.0",
+        "object.assign": "^4.1.0"
+      }
+    },
+    "node_modules/gulplog": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
+      "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
+      "dev": true,
+      "dependencies": {
+        "glogg": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/handle-thing": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
+      "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
+      "dev": true
+    },
+    "node_modules/har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/har-validator": {
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
+      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
+      "deprecated": "this library is no longer supported",
+      "dependencies": {
+        "ajv": "^6.12.3",
+        "har-schema": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/has-bigints": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
+      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
+      "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-unicode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
+      "optional": true
+    },
+    "node_modules/has-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+      "dev": true,
+      "dependencies": {
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-value/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values/node_modules/kind-of": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+      "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-yarn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz",
+      "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/hash-base": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
+      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/hash-base/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/hash-base/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/hash.js": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
+    "node_modules/he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "dev": true,
+      "bin": {
+        "he": "bin/he"
+      }
+    },
+    "node_modules/hex-color-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
+      "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==",
+      "dev": true
+    },
+    "node_modules/hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+      "dev": true,
+      "dependencies": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "node_modules/homedir-polyfill": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
+      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
+      "dev": true,
+      "dependencies": {
+        "parse-passwd": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hosted-git-info": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.5.tgz",
+      "integrity": "sha512-i4dpK6xj9BIpVOTboXIlKG9+8HMKggcrMX7WA24xZtKwX0TPelq/rbaS5rCKeNX8sJXZJGdSxpnEGtta+wismQ==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/hpack.js": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
+      "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "obuf": "^1.0.0",
+        "readable-stream": "^2.0.1",
+        "wbuf": "^1.1.0"
+      }
+    },
+    "node_modules/hsl-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz",
+      "integrity": "sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4=",
+      "dev": true
+    },
+    "node_modules/hsla-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz",
+      "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg=",
+      "dev": true
+    },
+    "node_modules/html-comment-regex": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz",
+      "integrity": "sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==",
+      "dev": true
+    },
+    "node_modules/html-encoding-sniffer": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
+      "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
+      "dev": true,
+      "dependencies": {
+        "whatwg-encoding": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/html-entities": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.3.1.tgz",
+      "integrity": "sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==",
+      "dev": true
+    },
+    "node_modules/html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "dev": true
+    },
+    "node_modules/html-minifier": {
+      "version": "3.5.21",
+      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz",
+      "integrity": "sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==",
+      "dev": true,
+      "dependencies": {
+        "camel-case": "3.0.x",
+        "clean-css": "4.2.x",
+        "commander": "2.17.x",
+        "he": "1.2.x",
+        "param-case": "2.1.x",
+        "relateurl": "0.2.x",
+        "uglify-js": "3.4.x"
+      },
+      "bin": {
+        "html-minifier": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/html-minifier/node_modules/commander": {
+      "version": "2.17.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
+      "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
+      "dev": true
+    },
+    "node_modules/htmlparser2": {
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
+      "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^1.3.1",
+        "domhandler": "^2.3.0",
+        "domutils": "^1.5.1",
+        "entities": "^1.1.1",
+        "inherits": "^2.0.1",
+        "readable-stream": "^3.1.1"
+      }
+    },
+    "node_modules/htmlparser2/node_modules/entities": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
+      "dev": true
+    },
+    "node_modules/htmlparser2/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/http-cache-semantics": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
+      "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="
+    },
+    "node_modules/http-deceiver": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
+      "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
+      "dev": true
+    },
+    "node_modules/http-errors": {
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
+      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
+      "dependencies": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.1",
+        "statuses": ">= 1.5.0 < 2",
+        "toidentifier": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/http-errors/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+    },
+    "node_modules/http-proxy": {
+      "version": "1.18.1",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
+      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
+      "dev": true,
+      "dependencies": {
+        "eventemitter3": "^4.0.0",
+        "follow-redirects": "^1.0.0",
+        "requires-port": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/http-proxy-agent": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz",
+      "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "4",
+        "debug": "3.1.0"
+      },
+      "engines": {
+        "node": ">= 4.5.0"
+      }
+    },
+    "node_modules/http-proxy-agent/node_modules/debug": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/http-proxy-middleware": {
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz",
+      "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==",
+      "dev": true,
+      "dependencies": {
+        "http-proxy": "^1.17.0",
+        "is-glob": "^4.0.0",
+        "lodash": "^4.17.11",
+        "micromatch": "^3.1.10"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/http-proxy-middleware/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/http-proxy-middleware/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/http-proxy-middleware/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/http-proxy-middleware/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/http-proxy-middleware/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/http-proxy-middleware/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/http-proxy-middleware/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/http-proxy-middleware/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/http-proxy-middleware/node_modules/to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "dependencies": {
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
+      },
+      "engines": {
+        "node": ">=0.8",
+        "npm": ">=1.3.7"
+      }
+    },
+    "node_modules/https-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
+      "dev": true
+    },
+    "node_modules/https-proxy-agent": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
+      "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^4.3.0",
+        "debug": "^3.1.0"
+      },
+      "engines": {
+        "node": ">= 4.5.0"
+      }
+    },
+    "node_modules/https-proxy-agent/node_modules/debug": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/https-proxy-agent/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/human-signals": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
+      "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
+      "engines": {
+        "node": ">=8.12.0"
+      }
+    },
+    "node_modules/humanize-ms": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
+      "integrity": "sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.0.0"
+      }
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/icss-utils": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz",
+      "integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^7.0.14"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/ieee754": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
+      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
+      "devOptional": true
+    },
+    "node_modules/iferr": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
+      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
+      "dev": true
+    },
+    "node_modules/ignore": {
+      "version": "5.1.8",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
+      "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/ignore-walk": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz",
+      "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==",
+      "dev": true,
+      "dependencies": {
+        "minimatch": "^3.0.4"
+      }
+    },
+    "node_modules/image-size": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
+      "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=",
+      "dev": true,
+      "optional": true,
+      "bin": {
+        "image-size": "bin/image-size.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/immediate": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
+      "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps="
+    },
+    "node_modules/import-cwd": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
+      "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
+      "dev": true,
+      "dependencies": {
+        "import-from": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/import-fresh": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
+      "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/import-from": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
+      "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
+      "dev": true,
+      "dependencies": {
+        "resolve-from": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/import-from/node_modules/resolve-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/import-lazy": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
+      "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/import-local": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
+      "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
+      "dev": true,
+      "dependencies": {
+        "pkg-dir": "^3.0.0",
+        "resolve-cwd": "^2.0.0"
+      },
+      "bin": {
+        "import-local-fixture": "fixtures/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/indexes-of": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
+      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
+      "dev": true
+    },
+    "node_modules/infer-owner": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
+      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
+      "dev": true
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "node_modules/ini": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+      "deprecated": "Please update to ini >=1.3.6 to avoid a prototype pollution issue",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/init-package-json": {
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.10.3.tgz",
+      "integrity": "sha512-zKSiXKhQveNteyhcj1CoOP8tqp1QuxPIPBl8Bid99DGLFqA1p87M6lNgfjJHSBoWJJlidGOv5rWjyYKEB3g2Jw==",
+      "dependencies": {
+        "glob": "^7.1.1",
+        "npm-package-arg": "^4.0.0 || ^5.0.0 || ^6.0.0",
+        "promzard": "^0.3.0",
+        "read": "~1.0.1",
+        "read-package-json": "1 || 2",
+        "semver": "2.x || 3.x || 4 || 5",
+        "validate-npm-package-license": "^3.0.1",
+        "validate-npm-package-name": "^3.0.0"
+      }
+    },
+    "node_modules/init-package-json/node_modules/hosted-git-info": {
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
+      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="
+    },
+    "node_modules/init-package-json/node_modules/npm-package-arg": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
+      "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
+      "dependencies": {
+        "hosted-git-info": "^2.7.1",
+        "osenv": "^0.1.5",
+        "semver": "^5.6.0",
+        "validate-npm-package-name": "^3.0.0"
+      }
+    },
+    "node_modules/init-package-json/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/inquirer": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz",
+      "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==",
+      "dependencies": {
+        "ansi-escapes": "^3.2.0",
+        "chalk": "^2.4.2",
+        "cli-cursor": "^2.1.0",
+        "cli-width": "^2.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^2.0.0",
+        "lodash": "^4.17.12",
+        "mute-stream": "0.0.7",
+        "run-async": "^2.2.0",
+        "rxjs": "^6.4.0",
+        "string-width": "^2.1.0",
+        "strip-ansi": "^5.1.0",
+        "through": "^2.3.6"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/inquirer/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/inquirer/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/inquirer/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/inquirer/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+    },
+    "node_modules/inquirer/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/inquirer/node_modules/mute-stream": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
+    },
+    "node_modules/inquirer/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/insight": {
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/insight/-/insight-0.10.3.tgz",
+      "integrity": "sha512-YOncxSN6Omh+1Oqxt+OJAvJVMDKw7l6IEG0wT2cTMGxjsTcroOGW4IR926QDzxg/uZHcFZ2cZbckDWdZhc2pZw==",
+      "dependencies": {
+        "async": "^2.6.2",
+        "chalk": "^2.4.2",
+        "conf": "^1.4.0",
+        "inquirer": "^6.3.1",
+        "lodash.debounce": "^4.0.8",
+        "os-name": "^3.1.0",
+        "request": "^2.88.0",
+        "tough-cookie": "^3.0.1",
+        "uuid": "^3.3.2"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/insight/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/insight/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/insight/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/insight/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+    },
+    "node_modules/insight/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/insight/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/install": {
+      "version": "0.8.9",
+      "resolved": "https://registry.npmjs.org/install/-/install-0.8.9.tgz",
+      "integrity": "sha1-n0tcDRhR74cunfheT3Fi1OXc2+0=",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/internal-ip": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz",
+      "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==",
+      "dev": true,
+      "dependencies": {
+        "default-gateway": "^4.2.0",
+        "ipaddr.js": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/interpret": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
+      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/invariant": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
+      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+      "dev": true,
+      "dependencies": {
+        "loose-envify": "^1.0.0"
+      }
+    },
+    "node_modules/invert-kv": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ionicons": {
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.1.tgz",
+      "integrity": "sha512-1auVisfaXmkmxINer8Q3kJGHP1vSxk86hf7By95eJ+Av9+oBcNuAEBfSe3jaMaGRVxVw8U/2j23MFq7R3c0HPg==",
+      "dependencies": {
+        "@stencil/core": "^2.5.0"
+      }
+    },
+    "node_modules/ios-sim": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/ios-sim/-/ios-sim-8.0.2.tgz",
+      "integrity": "sha512-P7nEG771bfd+JoMRjnis1gpZOkjTUUxu+4Ek1Z+eoaEEoT9byllU9pxfQ8Df7hL3gSkIQxNwTSLhos2I8tWUQA==",
+      "dependencies": {
+        "bplist-parser": "^0.0.6",
+        "nopt": "1.0.9",
+        "plist": "^3.0.1",
+        "simctl": "^2"
+      },
+      "bin": {
+        "ios-sim": "bin/ios-sim"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ios-sim/node_modules/bplist-parser": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.0.6.tgz",
+      "integrity": "sha1-ONo0cYF9+dRKs4kuJ3B7u9daEbk="
+    },
+    "node_modules/ios-sim/node_modules/nopt": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.9.tgz",
+      "integrity": "sha1-O8DXy6e/sNWmdtvtfA6+SKT9RU4=",
+      "dependencies": {
+        "abbrev": "1"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/ip": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
+      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=",
+      "dev": true
+    },
+    "node_modules/ip-regex": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
+      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ipaddr.js": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/is-absolute": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
+      "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
+      "dev": true,
+      "dependencies": {
+        "is-relative": "^1.0.0",
+        "is-windows": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-absolute-url": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
+      "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-accessor-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-arguments": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
+      "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+      "dev": true
+    },
+    "node_modules/is-bigint": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.1.tgz",
+      "integrity": "sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-boolean-object": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.0.tgz",
+      "integrity": "sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "node_modules/is-callable": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz",
+      "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-ci": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
+      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
+      "dependencies": {
+        "ci-info": "^2.0.0"
+      },
+      "bin": {
+        "is-ci": "bin.js"
+      }
+    },
+    "node_modules/is-color-stop": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz",
+      "integrity": "sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=",
+      "dev": true,
+      "dependencies": {
+        "css-color-names": "^0.0.4",
+        "hex-color-regex": "^1.1.0",
+        "hsl-regex": "^1.0.0",
+        "hsla-regex": "^1.0.0",
+        "rgb-regex": "^1.0.1",
+        "rgba-regex": "^1.0.0"
+      }
+    },
+    "node_modules/is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-data-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-date-object": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
+      "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-descriptor/node_modules/kind-of": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-directory": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
+      "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-docker": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz",
+      "integrity": "sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==",
+      "bin": {
+        "is-docker": "cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/is-generator-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-installed-globally": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.3.2.tgz",
+      "integrity": "sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==",
+      "dependencies": {
+        "global-dirs": "^2.0.1",
+        "is-path-inside": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-interactive": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
+      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-negated-glob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz",
+      "integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-negative-zero": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz",
+      "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/is-npm": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz",
+      "integrity": "sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-number-object": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.4.tgz",
+      "integrity": "sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-obj": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
+      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-path-cwd": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
+      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-path-in-cwd": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
+      "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
+      "dev": true,
+      "dependencies": {
+        "is-path-inside": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-path-in-cwd/node_modules/is-path-inside": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
+      "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
+      "dev": true,
+      "dependencies": {
+        "path-is-inside": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-path-inside": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz",
+      "integrity": "sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-plain-object/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-potential-custom-element-name": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz",
+      "integrity": "sha1-DFLlS8yjkbssSUsh6GJtczbG45c=",
+      "dev": true
+    },
+    "node_modules/is-regex": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
+      "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-relative": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
+      "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
+      "dev": true,
+      "dependencies": {
+        "is-unc-path": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-resolvable": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
+      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
+      "dev": true
+    },
+    "node_modules/is-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
+      "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-string": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz",
+      "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-svg": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz",
+      "integrity": "sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==",
+      "dev": true,
+      "dependencies": {
+        "html-comment-regex": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/is-symbol": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
+      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+    },
+    "node_modules/is-unc-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
+      "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
+      "dev": true,
+      "dependencies": {
+        "unc-path-regex": "^0.1.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-utf8": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
+      "dev": true
+    },
+    "node_modules/is-valid-glob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
+      "integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "dependencies": {
+        "is-docker": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-yarn-global": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz",
+      "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw=="
+    },
+    "node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+    },
+    "node_modules/isobject": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-4.0.0.tgz",
+      "integrity": "sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+    },
+    "node_modules/istanbul-lib-coverage": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
+      "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-instrument": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
+      "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.7.5",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.0.0",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-instrument/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/istanbul-lib-report": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+      "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
+      "dev": true,
+      "dependencies": {
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^3.0.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz",
+      "integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps/node_modules/debug": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+      "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/istanbul-lib-source-maps/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/istanbul-lib-source-maps/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/istanbul-reports": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz",
+      "integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==",
+      "dev": true,
+      "dependencies": {
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-26.5.2.tgz",
+      "integrity": "sha512-4HFabJVwsgDwul/7rhXJ3yFAF/aUkVIXiJWmgFxb+WMdZG39fVvOwYAs8/3r4AlFPc4m/n5sTMtuMbOL3kNtrQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/core": "^26.5.2",
+        "import-local": "^3.0.2",
+        "jest-cli": "^26.5.2"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-changed-files": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.5.2.tgz",
+      "integrity": "sha512-qSmssmiIdvM5BWVtyK/nqVpN3spR5YyvkvPqz1x3BR1bwIxsWmU/MGwLoCrPNLbkG2ASAKfvmJpOduEApBPh2w==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.5.2",
+        "execa": "^4.0.0",
+        "throat": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-config": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.5.2.tgz",
+      "integrity": "sha512-dqJOnSegNdE5yDiuGHsjTM5gec7Z4AcAMHiW+YscbOYJAlb3LEtDSobXCq0or9EmGQI5SFmKy4T7P1FxetJOfg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.1.0",
+        "@jest/test-sequencer": "^26.5.2",
+        "@jest/types": "^26.5.2",
+        "babel-jest": "^26.5.2",
+        "chalk": "^4.0.0",
+        "deepmerge": "^4.2.2",
+        "glob": "^7.1.1",
+        "graceful-fs": "^4.2.4",
+        "jest-environment-jsdom": "^26.5.2",
+        "jest-environment-node": "^26.5.2",
+        "jest-get-type": "^26.3.0",
+        "jest-jasmine2": "^26.5.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-resolve": "^26.5.2",
+        "jest-util": "^26.5.2",
+        "jest-validate": "^26.5.2",
+        "micromatch": "^4.0.2",
+        "pretty-format": "^26.5.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-config/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-diff": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.5.2.tgz",
+      "integrity": "sha512-HCSWDUGwsov5oTlGzrRM+UPJI/Dpqi9jzeV0fdRNi3Ch5bnoXhnyJMmVg2juv9081zLIy3HGPI5mcuGgXM2xRA==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "diff-sequences": "^26.5.0",
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.5.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-diff/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-docblock": {
+      "version": "26.0.0",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-26.0.0.tgz",
+      "integrity": "sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w==",
+      "dev": true,
+      "dependencies": {
+        "detect-newline": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-each": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.5.2.tgz",
+      "integrity": "sha512-w7D9FNe0m2D3yZ0Drj9CLkyF/mGhmBSULMQTypzAKR746xXnjUrK8GUJdlLTWUF6dd0ks3MtvGP7/xNFr9Aphg==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.5.2",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^26.3.0",
+        "jest-util": "^26.5.2",
+        "pretty-format": "^26.5.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-each/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-environment-jsdom": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.5.2.tgz",
+      "integrity": "sha512-fWZPx0bluJaTQ36+PmRpvUtUlUFlGGBNyGX1SN3dLUHHMcQ4WseNEzcGGKOw4U5towXgxI4qDoI3vwR18H0RTw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^26.5.2",
+        "@jest/fake-timers": "^26.5.2",
+        "@jest/types": "^26.5.2",
+        "@types/node": "*",
+        "jest-mock": "^26.5.2",
+        "jest-util": "^26.5.2",
+        "jsdom": "^16.4.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-environment-node": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.5.2.tgz",
+      "integrity": "sha512-YHjnDsf/GKFCYMGF1V+6HF7jhY1fcLfLNBDjhAOvFGvt6d8vXvNdJGVM7uTZ2VO/TuIyEFhPGaXMX5j3h7fsrA==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^26.5.2",
+        "@jest/fake-timers": "^26.5.2",
+        "@jest/types": "^26.5.2",
+        "@types/node": "*",
+        "jest-mock": "^26.5.2",
+        "jest-util": "^26.5.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-get-type": {
+      "version": "26.3.0",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
+      "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-haste-map": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.5.2.tgz",
+      "integrity": "sha512-lJIAVJN3gtO3k4xy+7i2Xjtwh8CfPcH08WYjZpe9xzveDaqGw9fVNCpkYu6M525wKFVkLmyi7ku+DxCAP1lyMA==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.5.2",
+        "@types/graceful-fs": "^4.1.2",
+        "@types/node": "*",
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
+        "graceful-fs": "^4.2.4",
+        "jest-regex-util": "^26.0.0",
+        "jest-serializer": "^26.5.0",
+        "jest-util": "^26.5.2",
+        "jest-worker": "^26.5.0",
+        "micromatch": "^4.0.2",
+        "sane": "^4.0.3",
+        "walker": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      },
+      "optionalDependencies": {
+        "fsevents": "^2.1.2"
+      }
+    },
+    "node_modules/jest-haste-map/node_modules/jest-worker": {
+      "version": "26.5.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.5.0.tgz",
+      "integrity": "sha512-kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/jest-jasmine2": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.5.2.tgz",
+      "integrity": "sha512-2J+GYcgLVPTkpmvHEj0/IDTIAuyblGNGlyGe4fLfDT2aktEPBYvoxUwFiOmDDxxzuuEAD2uxcYXr0+1Yw4tjFA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/traverse": "^7.1.0",
+        "@jest/environment": "^26.5.2",
+        "@jest/source-map": "^26.5.0",
+        "@jest/test-result": "^26.5.2",
+        "@jest/types": "^26.5.2",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "co": "^4.6.0",
+        "expect": "^26.5.2",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^26.5.2",
+        "jest-matcher-utils": "^26.5.2",
+        "jest-message-util": "^26.5.2",
+        "jest-runtime": "^26.5.2",
+        "jest-snapshot": "^26.5.2",
+        "jest-util": "^26.5.2",
+        "pretty-format": "^26.5.2",
+        "throat": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-jasmine2/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-leak-detector": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.5.2.tgz",
+      "integrity": "sha512-h7ia3dLzBFItmYERaLPEtEKxy3YlcbcRSjj0XRNJgBEyODuu+3DM2o62kvIFvs3PsaYoIIv+e+nLRI61Dj1CNw==",
+      "dev": true,
+      "dependencies": {
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.5.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-matcher-utils": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.5.2.tgz",
+      "integrity": "sha512-W9GO9KBIC4gIArsNqDUKsLnhivaqf8MSs6ujO/JDcPIQrmY+aasewweXVET8KdrJ6ADQaUne5UzysvF/RR7JYA==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "jest-diff": "^26.5.2",
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.5.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-matcher-utils/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-message-util": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.5.2.tgz",
+      "integrity": "sha512-Ocp9UYZ5Jl15C5PNsoDiGEk14A4NG0zZKknpWdZGoMzJuGAkVt10e97tnEVMYpk7LnQHZOfuK2j/izLBMcuCZw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "@jest/types": "^26.5.2",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "micromatch": "^4.0.2",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-message-util/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-mock": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.5.2.tgz",
+      "integrity": "sha512-9SiU4b5PtO51v0MtJwVRqeGEroH66Bnwtq4ARdNP7jNXbpT7+ByeWNAk4NeT/uHfNSVDXEXgQo1XRuwEqS6Rdw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.5.2",
+        "@types/node": "*"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-pnp-resolver": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
+      "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      },
+      "peerDependencies": {
+        "jest-resolve": "*"
+      },
+      "peerDependenciesMeta": {
+        "jest-resolve": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-preset-angular": {
+      "version": "8.3.1",
+      "resolved": "https://registry.npmjs.org/jest-preset-angular/-/jest-preset-angular-8.3.1.tgz",
+      "integrity": "sha512-WhQm+0tXzikkvIF35XErV87DqYbieZI0R0MIGgn7VE/DDhdbXFDmYQxFZ7w4qcA0cGLLvSMTBbIsUtHeE/rFxQ==",
+      "dev": true,
+      "dependencies": {
+        "pretty-format": "26.x",
+        "ts-jest": "26.x"
+      },
+      "engines": {
+        "node": ">= 10"
+      },
+      "peerDependencies": {
+        "@angular/core": ">=2.0.0",
+        "@angular/platform-browser-dynamic": ">=2.0.0",
+        "jest": "^26.0.0"
+      }
+    },
+    "node_modules/jest-regex-util": {
+      "version": "26.0.0",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz",
+      "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-resolve": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.5.2.tgz",
+      "integrity": "sha512-XsPxojXGRA0CoDD7Vis59ucz2p3cQFU5C+19tz3tLEAlhYKkK77IL0cjYjikY9wXnOaBeEdm1rOgSJjbZWpcZg==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.5.2",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "jest-pnp-resolver": "^1.2.2",
+        "jest-util": "^26.5.2",
+        "read-pkg-up": "^7.0.1",
+        "resolve": "^1.17.0",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-resolve-dependencies": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.5.2.tgz",
+      "integrity": "sha512-LLkc8LuRtxqOx0AtX/Npa2C4I23WcIrwUgNtHYXg4owYF/ZDQShcwBAHjYZIFR06+HpQcZ43+kCTMlQ3aDCYTg==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.5.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-snapshot": "^26.5.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-resolve/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-resolve/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-resolve/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-resolve/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-resolve/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-resolve/node_modules/parse-json": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.1.0.tgz",
+      "integrity": "sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-resolve/node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-resolve/node_modules/read-pkg": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
+      "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+      "dev": true,
+      "dependencies": {
+        "@types/normalize-package-data": "^2.4.0",
+        "normalize-package-data": "^2.5.0",
+        "parse-json": "^5.0.0",
+        "type-fest": "^0.6.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-resolve/node_modules/read-pkg-up": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+      "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^4.1.0",
+        "read-pkg": "^5.2.0",
+        "type-fest": "^0.8.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-resolve/node_modules/read-pkg/node_modules/type-fest": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
+      "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-runner": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.5.2.tgz",
+      "integrity": "sha512-GKhYxtSX5+tXZsd2QwfkDqPIj5C2HqOdXLRc2x2qYqWE26OJh17xo58/fN/mLhRkO4y6o60ZVloan7Kk5YA6hg==",
+      "dev": true,
+      "dependencies": {
+        "@jest/console": "^26.5.2",
+        "@jest/environment": "^26.5.2",
+        "@jest/test-result": "^26.5.2",
+        "@jest/types": "^26.5.2",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "emittery": "^0.7.1",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.4",
+        "jest-config": "^26.5.2",
+        "jest-docblock": "^26.0.0",
+        "jest-haste-map": "^26.5.2",
+        "jest-leak-detector": "^26.5.2",
+        "jest-message-util": "^26.5.2",
+        "jest-resolve": "^26.5.2",
+        "jest-runtime": "^26.5.2",
+        "jest-util": "^26.5.2",
+        "jest-worker": "^26.5.0",
+        "source-map-support": "^0.5.6",
+        "throat": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-runner/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-runner/node_modules/jest-worker": {
+      "version": "26.5.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.5.0.tgz",
+      "integrity": "sha512-kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/jest-runtime": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.5.2.tgz",
+      "integrity": "sha512-zArr4DatX/Sn0wswX/AnAuJgmwgAR5rNtrUz36HR8BfMuysHYNq5sDbYHuLC4ICyRdy5ae/KQ+sczxyS9G6Qvw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/console": "^26.5.2",
+        "@jest/environment": "^26.5.2",
+        "@jest/fake-timers": "^26.5.2",
+        "@jest/globals": "^26.5.2",
+        "@jest/source-map": "^26.5.0",
+        "@jest/test-result": "^26.5.2",
+        "@jest/transform": "^26.5.2",
+        "@jest/types": "^26.5.2",
+        "@types/yargs": "^15.0.0",
+        "chalk": "^4.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "exit": "^0.1.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.4",
+        "jest-config": "^26.5.2",
+        "jest-haste-map": "^26.5.2",
+        "jest-message-util": "^26.5.2",
+        "jest-mock": "^26.5.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-resolve": "^26.5.2",
+        "jest-snapshot": "^26.5.2",
+        "jest-util": "^26.5.2",
+        "jest-validate": "^26.5.2",
+        "slash": "^3.0.0",
+        "strip-bom": "^4.0.0",
+        "yargs": "^15.4.1"
+      },
+      "bin": {
+        "jest-runtime": "bin/jest-runtime.js"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/cliui": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.0"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/jest-runtime/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/string-width": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/yargs": {
+      "version": "15.4.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^6.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^4.1.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^4.2.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^18.1.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/yargs-parser": {
+      "version": "18.1.3",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jest-serializer": {
+      "version": "26.5.0",
+      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.5.0.tgz",
+      "integrity": "sha512-+h3Gf5CDRlSLdgTv7y0vPIAoLgX/SI7T4v6hy+TEXMgYbv+ztzbg5PSN6mUXAT/hXYHvZRWm+MaObVfqkhCGxA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "graceful-fs": "^4.2.4"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-snapshot": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.5.2.tgz",
+      "integrity": "sha512-MkXIDvEefzDubI/WaDVSRH4xnkuirP/Pz8LhAIDXcVQTmcEfwxywj5LGwBmhz+kAAIldA7XM4l96vbpzltSjqg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.0.0",
+        "@jest/types": "^26.5.2",
+        "@types/babel__traverse": "^7.0.4",
+        "@types/prettier": "^2.0.0",
+        "chalk": "^4.0.0",
+        "expect": "^26.5.2",
+        "graceful-fs": "^4.2.4",
+        "jest-diff": "^26.5.2",
+        "jest-get-type": "^26.3.0",
+        "jest-haste-map": "^26.5.2",
+        "jest-matcher-utils": "^26.5.2",
+        "jest-message-util": "^26.5.2",
+        "jest-resolve": "^26.5.2",
+        "natural-compare": "^1.4.0",
+        "pretty-format": "^26.5.2",
+        "semver": "^7.3.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-util": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.5.2.tgz",
+      "integrity": "sha512-WTL675bK+GSSAYgS8z9FWdCT2nccO1yTIplNLPlP0OD8tUk/H5IrWKMMRudIQQ0qp8bb4k+1Qa8CxGKq9qnYdg==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.5.2",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "is-ci": "^2.0.0",
+        "micromatch": "^4.0.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-util/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-validate": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.5.2.tgz",
+      "integrity": "sha512-FmJks0zY36mp6Af/5sqO6CTL9bNMU45yKCJk3hrz8d2aIqQIlN1pr9HPIwZE8blLaewOla134nt5+xAmWsx3SQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.5.2",
+        "camelcase": "^6.0.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^26.3.0",
+        "leven": "^3.1.0",
+        "pretty-format": "^26.5.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-validate/node_modules/camelcase": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.0.0.tgz",
+      "integrity": "sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-validate/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-watcher": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.5.2.tgz",
+      "integrity": "sha512-i3m1NtWzF+FXfJ3ljLBB/WQEp4uaNhX7QcQUWMokcifFTUQBDFyUMEwk0JkJ1kopHbx7Een3KX0Q7+9koGM/Pw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/test-result": "^26.5.2",
+        "@jest/types": "^26.5.2",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "jest-util": "^26.5.2",
+        "string-length": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-watcher/node_modules/ansi-escapes": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
+      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.11.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-watcher/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-watcher/node_modules/type-fest": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
+      "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-worker": {
+      "version": "26.0.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.0.0.tgz",
+      "integrity": "sha512-pPaYa2+JnwmiZjK9x7p9BoZht+47ecFCDFA/CJxspHzeDvQcfVBLWzCiWyo+EGrSiQMWZtCFo9iSvMZnAAo8vw==",
+      "dev": true,
+      "dependencies": {
+        "merge-stream": "^2.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest/node_modules/cliui": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.0"
+      }
+    },
+    "node_modules/jest/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/jest/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/import-local": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
+      "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==",
+      "dev": true,
+      "dependencies": {
+        "pkg-dir": "^4.2.0",
+        "resolve-cwd": "^3.0.0"
+      },
+      "bin": {
+        "import-local-fixture": "fixtures/cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/jest-cli": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.5.2.tgz",
+      "integrity": "sha512-usm48COuUvRp8YEG5OWOaxbSM0my7eHn3QeBWxiGUuFhvkGVBvl1fic4UjC02EAEQtDv8KrNQUXdQTV6ZZBsoA==",
+      "dev": true,
+      "dependencies": {
+        "@jest/core": "^26.5.2",
+        "@jest/test-result": "^26.5.2",
+        "@jest/types": "^26.5.2",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.4",
+        "import-local": "^3.0.2",
+        "is-ci": "^2.0.0",
+        "jest-config": "^26.5.2",
+        "jest-util": "^26.5.2",
+        "jest-validate": "^26.5.2",
+        "prompts": "^2.0.1",
+        "yargs": "^15.4.1"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/resolve-cwd": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+      "dev": true,
+      "dependencies": {
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/string-width": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/yargs": {
+      "version": "15.4.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^6.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^4.1.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^4.2.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^18.1.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/yargs-parser": {
+      "version": "18.1.3",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "node_modules/js-yaml": {
+      "version": "3.14.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
+      "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
+    },
+    "node_modules/jsdoctypeparser": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/jsdoctypeparser/-/jsdoctypeparser-9.0.0.tgz",
+      "integrity": "sha512-jrTA2jJIL6/DAEILBEh2/w9QxCuwmvNXIry39Ay/HVfhE3o2yVV0U44blYkqdHA/OKloJEqvJy0xU+GSdE2SIw==",
+      "dev": true,
+      "bin": {
+        "jsdoctypeparser": "bin/jsdoctypeparser"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jsdom": {
+      "version": "16.4.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.4.0.tgz",
+      "integrity": "sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w==",
+      "dev": true,
+      "dependencies": {
+        "abab": "^2.0.3",
+        "acorn": "^7.1.1",
+        "acorn-globals": "^6.0.0",
+        "cssom": "^0.4.4",
+        "cssstyle": "^2.2.0",
+        "data-urls": "^2.0.0",
+        "decimal.js": "^10.2.0",
+        "domexception": "^2.0.1",
+        "escodegen": "^1.14.1",
+        "html-encoding-sniffer": "^2.0.1",
+        "is-potential-custom-element-name": "^1.0.0",
+        "nwsapi": "^2.2.0",
+        "parse5": "5.1.1",
+        "request": "^2.88.2",
+        "request-promise-native": "^1.0.8",
+        "saxes": "^5.0.0",
+        "symbol-tree": "^3.2.4",
+        "tough-cookie": "^3.0.1",
+        "w3c-hr-time": "^1.0.2",
+        "w3c-xmlserializer": "^2.0.0",
+        "webidl-conversions": "^6.1.0",
+        "whatwg-encoding": "^1.0.5",
+        "whatwg-mimetype": "^2.3.0",
+        "whatwg-url": "^8.0.0",
+        "ws": "^7.2.3",
+        "xml-name-validator": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "canvas": "^2.5.0"
+      },
+      "peerDependenciesMeta": {
+        "canvas": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jsdom/node_modules/acorn": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/jsdom/node_modules/parse5": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
+      "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
+      "dev": true
+    },
+    "node_modules/jsdom/node_modules/ws": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz",
+      "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "dev": true,
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/json-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
+      "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg="
+    },
+    "node_modules/json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+      "dev": true
+    },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
+    },
+    "node_modules/json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+    },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+      "dev": true
+    },
+    "node_modules/json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+    },
+    "node_modules/json3": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz",
+      "integrity": "sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==",
+      "dev": true
+    },
+    "node_modules/json5": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
+      "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jsonc-parser": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.3.1.tgz",
+      "integrity": "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==",
+      "dev": true
+    },
+    "node_modules/jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/jsonparse": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
+      "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
+      "dev": true,
+      "engines": [
+        "node >= 0.2.0"
+      ]
+    },
+    "node_modules/JSONStream": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
+      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
+      "dev": true,
+      "dependencies": {
+        "jsonparse": "^1.2.0",
+        "through": ">=2.2.7 <3"
+      },
+      "bin": {
+        "JSONStream": "bin.js"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/jsprim": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "engines": [
+        "node >=0.6.0"
+      ],
+      "dependencies": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
+      }
+    },
+    "node_modules/jsprim/node_modules/extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+      "engines": [
+        "node >=0.6.0"
+      ]
+    },
+    "node_modules/jszip": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.5.0.tgz",
+      "integrity": "sha512-WRtu7TPCmYePR1nazfrtuF216cIVon/3GWOvHS9QR5bIwSbnxtdpma6un3jyGGNhHsKCSzn5Ypk+EkDRvTGiFA==",
+      "dependencies": {
+        "lie": "~3.3.0",
+        "pako": "~1.0.2",
+        "readable-stream": "~2.3.6",
+        "set-immediate-shim": "~1.0.1"
+      }
+    },
+    "node_modules/just-debounce": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.0.0.tgz",
+      "integrity": "sha1-h/zPrv/AtozRnVX2cilD+SnqNeo=",
+      "dev": true
+    },
+    "node_modules/karma-source-map-support": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz",
+      "integrity": "sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A==",
+      "dev": true,
+      "dependencies": {
+        "source-map-support": "^0.5.5"
+      }
+    },
+    "node_modules/keytar": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/keytar/-/keytar-7.2.0.tgz",
+      "integrity": "sha512-ECSaWvoLKI5SI0pGpZQeUV1/lpBYfkaxvoSp3zkiPOz05VavwSfLi8DdEaa9N2ekQZv3Chy+o7aP6n9mairBgw==",
+      "hasInstallScript": true,
+      "optional": true,
+      "dependencies": {
+        "node-addon-api": "^3.0.0",
+        "prebuild-install": "^6.0.0"
+      }
+    },
+    "node_modules/keyv": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
+      "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==",
+      "dependencies": {
+        "json-buffer": "3.0.0"
+      }
+    },
+    "node_modules/killable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
+      "integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==",
+      "dev": true
+    },
+    "node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/kleur": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/last-run": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
+      "integrity": "sha1-RblpQsF7HHnHchmCWbqUO+v4yls=",
+      "dev": true,
+      "dependencies": {
+        "default-resolution": "^2.0.0",
+        "es6-weak-map": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/latest-version": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz",
+      "integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==",
+      "dependencies": {
+        "package-json": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/lazystream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
+      "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "^2.0.5"
+      },
+      "engines": {
+        "node": ">= 0.6.3"
+      }
+    },
+    "node_modules/lcid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+      "dev": true,
+      "dependencies": {
+        "invert-kv": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/lead": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz",
+      "integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=",
+      "dev": true,
+      "dependencies": {
+        "flush-write-stream": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/leek": {
+      "version": "0.0.24",
+      "resolved": "https://registry.npmjs.org/leek/-/leek-0.0.24.tgz",
+      "integrity": "sha1-5ADlfw5g2O8r1NBo3EKKVDRdvNo=",
+      "dev": true,
+      "dependencies": {
+        "debug": "^2.1.0",
+        "lodash.assign": "^3.2.0",
+        "rsvp": "^3.0.21"
+      }
+    },
+    "node_modules/leek/node_modules/rsvp": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz",
+      "integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==",
+      "dev": true,
+      "engines": {
+        "node": "0.12.* || 4.* || 6.* || >= 7.*"
+      }
+    },
+    "node_modules/less": {
+      "version": "3.12.2",
+      "resolved": "https://registry.npmjs.org/less/-/less-3.12.2.tgz",
+      "integrity": "sha512-+1V2PCMFkL+OIj2/HrtrvZw0BC0sYLMICJfbQjuj/K8CEnlrFX6R5cKKgzzttsZDHyxQNL1jqMREjKN3ja/E3Q==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.10.0"
+      },
+      "bin": {
+        "lessc": "bin/lessc"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "optionalDependencies": {
+        "errno": "^0.1.1",
+        "graceful-fs": "^4.1.2",
+        "image-size": "~0.5.0",
+        "make-dir": "^2.1.0",
+        "mime": "^1.4.1",
+        "native-request": "^1.0.5",
+        "source-map": "~0.6.0"
+      }
+    },
+    "node_modules/less-loader": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-6.1.0.tgz",
+      "integrity": "sha512-/jLzOwLyqJ7Kt3xg5sHHkXtOyShWwFj410K9Si9WO+/h8rmYxxkSR0A3/hFEntWudE20zZnWMtpMYnLzqTVdUA==",
+      "dev": true,
+      "dependencies": {
+        "clone": "^2.1.2",
+        "less": "^3.11.1",
+        "loader-utils": "^2.0.0",
+        "schema-utils": "^2.6.6"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/less/node_modules/make-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "pify": "^4.0.1",
+        "semver": "^5.6.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/less/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "optional": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/less/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/less/node_modules/tslib": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
+      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
+      "dev": true
+    },
+    "node_modules/leven": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/levenary": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz",
+      "integrity": "sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==",
+      "dev": true,
+      "dependencies": {
+        "leven": "^3.1.0"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/license-webpack-plugin": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-2.2.0.tgz",
+      "integrity": "sha512-XPsdL/0brSHf+7dXIlRqotnCQ58RX2au6otkOg4U3dm8uH+Ka/fW4iukEs95uXm+qKe/SBs+s1Ll/aQddKG+tg==",
+      "dev": true,
+      "dependencies": {
+        "@types/webpack-sources": "^0.1.5",
+        "webpack-sources": "^1.2.0"
+      }
+    },
+    "node_modules/lie": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
+      "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
+      "dependencies": {
+        "immediate": "~3.0.5"
+      }
+    },
+    "node_modules/liftoff": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz",
+      "integrity": "sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==",
+      "dev": true,
+      "dependencies": {
+        "extend": "^3.0.0",
+        "findup-sync": "^3.0.0",
+        "fined": "^1.0.1",
+        "flagged-respawn": "^1.0.0",
+        "is-plain-object": "^2.0.4",
+        "object.map": "^1.0.0",
+        "rechoir": "^0.6.2",
+        "resolve": "^1.1.7"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/lines-and-columns": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
+      "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
+      "dev": true
+    },
+    "node_modules/load-json-file": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+      "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "strip-bom": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/load-json-file/node_modules/parse-json": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+      "dev": true,
+      "dependencies": {
+        "error-ex": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/load-json-file/node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/load-json-file/node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/loader-runner": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
+      "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.3.0 <5.0.0 || >=5.10"
+      }
+    },
+    "node_modules/loader-utils": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+      "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
+    "node_modules/locate-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+      "dependencies": {
+        "p-locate": "^2.0.0",
+        "path-exists": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.20",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+      "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
+    },
+    "node_modules/lodash._baseassign": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
+      "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=",
+      "dev": true,
+      "dependencies": {
+        "lodash._basecopy": "^3.0.0",
+        "lodash.keys": "^3.0.0"
+      }
+    },
+    "node_modules/lodash._basecopy": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
+      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
+      "dev": true
+    },
+    "node_modules/lodash._bindcallback": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz",
+      "integrity": "sha1-5THCdkTPi1epnhftlbNcdIeJOS4=",
+      "dev": true
+    },
+    "node_modules/lodash._createassigner": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz",
+      "integrity": "sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=",
+      "dev": true,
+      "dependencies": {
+        "lodash._bindcallback": "^3.0.0",
+        "lodash._isiterateecall": "^3.0.0",
+        "lodash.restparam": "^3.0.0"
+      }
+    },
+    "node_modules/lodash._getnative": {
+      "version": "3.9.1",
+      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
+      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
+      "dev": true
+    },
+    "node_modules/lodash._isiterateecall": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
+      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
+      "dev": true
+    },
+    "node_modules/lodash.assign": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz",
+      "integrity": "sha1-POnwI0tLIiPilrj6CsH+6OvKZPo=",
+      "dev": true,
+      "dependencies": {
+        "lodash._baseassign": "^3.0.0",
+        "lodash._createassigner": "^3.0.0",
+        "lodash.keys": "^3.0.0"
+      }
+    },
+    "node_modules/lodash.clonedeep": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
+      "dev": true
+    },
+    "node_modules/lodash.debounce": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168="
+    },
+    "node_modules/lodash.flatten": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
+      "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=",
+      "dev": true
+    },
+    "node_modules/lodash.isarguments": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
+      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
+      "dev": true
+    },
+    "node_modules/lodash.isarray": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
+      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
+      "dev": true
+    },
+    "node_modules/lodash.keys": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
+      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
+      "dev": true,
+      "dependencies": {
+        "lodash._getnative": "^3.0.0",
+        "lodash.isarguments": "^3.0.0",
+        "lodash.isarray": "^3.0.0"
+      }
+    },
+    "node_modules/lodash.memoize": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
+      "dev": true
+    },
+    "node_modules/lodash.restparam": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
+      "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
+      "dev": true
+    },
+    "node_modules/lodash.sortby": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
+      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
+      "dev": true
+    },
+    "node_modules/lodash.truncate": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
+      "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
+      "dev": true
+    },
+    "node_modules/lodash.uniq": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
+      "dev": true
+    },
+    "node_modules/log-symbols": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
+      "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/log-symbols/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/log-symbols/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/log-symbols/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/log-symbols/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/log-symbols/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/log-symbols/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/loglevel": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.0.tgz",
+      "integrity": "sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6.0"
+      },
+      "funding": {
+        "type": "tidelift",
+        "url": "https://tidelift.com/subscription/pkg/npm-loglevel?utm_medium=referral&utm_source=npm_fund"
+      }
+    },
+    "node_modules/loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "dev": true,
+      "dependencies": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      },
+      "bin": {
+        "loose-envify": "cli.js"
+      }
+    },
+    "node_modules/loud-rejection": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-2.2.0.tgz",
+      "integrity": "sha512-S0FayMXku80toa5sZ6Ro4C+s+EtFDCsyJNG/AzFMfX3AxD5Si4dZsgzm/kKnbOxHl5Cv8jBlno8+3XYIh2pNjQ==",
+      "dependencies": {
+        "currently-unhandled": "^0.4.1",
+        "signal-exit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/lower-case": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
+      "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=",
+      "dev": true
+    },
+    "node_modules/lowercase-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
+      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/macos-release": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.4.1.tgz",
+      "integrity": "sha512-H/QHeBIN1fIGJX517pvK8IEK53yQOW7YcEI55oYtgjDdoCQQz7eJS94qt5kNrscReEyuD/JcdFCm2XBEcGOITg==",
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/magic-string": {
+      "version": "0.25.7",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
+      "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==",
+      "dev": true,
+      "dependencies": {
+        "sourcemap-codec": "^1.4.4"
+      }
+    },
+    "node_modules/make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "dependencies": {
+        "semver": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/make-dir/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/make-error": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+      "dev": true
+    },
+    "node_modules/make-fetch-happen": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz",
+      "integrity": "sha512-07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag==",
+      "dev": true,
+      "dependencies": {
+        "agentkeepalive": "^3.4.1",
+        "cacache": "^12.0.0",
+        "http-cache-semantics": "^3.8.1",
+        "http-proxy-agent": "^2.1.0",
+        "https-proxy-agent": "^2.2.3",
+        "lru-cache": "^5.1.1",
+        "mississippi": "^3.0.0",
+        "node-fetch-npm": "^2.0.2",
+        "promise-retry": "^1.1.1",
+        "socks-proxy-agent": "^4.0.0",
+        "ssri": "^6.0.0"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/cacache": {
+      "version": "12.0.4",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
+      "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
+      "dev": true,
+      "dependencies": {
+        "bluebird": "^3.5.5",
+        "chownr": "^1.1.1",
+        "figgy-pudding": "^3.5.1",
+        "glob": "^7.1.4",
+        "graceful-fs": "^4.1.15",
+        "infer-owner": "^1.0.3",
+        "lru-cache": "^5.1.1",
+        "mississippi": "^3.0.0",
+        "mkdirp": "^0.5.1",
+        "move-concurrently": "^1.0.1",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^2.6.3",
+        "ssri": "^6.0.1",
+        "unique-filename": "^1.1.1",
+        "y18n": "^4.0.0"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "dev": true
+    },
+    "node_modules/make-fetch-happen/node_modules/http-cache-semantics": {
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz",
+      "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==",
+      "dev": true
+    },
+    "node_modules/make-fetch-happen/node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/ssri": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+      "dev": true,
+      "dependencies": {
+        "figgy-pudding": "^3.5.1"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true
+    },
+    "node_modules/make-iterator": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
+      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/makeerror": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
+      "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
+      "dev": true,
+      "dependencies": {
+        "tmpl": "1.0.x"
+      }
+    },
+    "node_modules/map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/map-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+      "dev": true,
+      "dependencies": {
+        "object-visit": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
+      "integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4=",
+      "dev": true,
+      "dependencies": {
+        "findup-sync": "^2.0.0",
+        "micromatch": "^3.0.4",
+        "resolve": "^1.4.0",
+        "stack-trace": "0.0.10"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/findup-sync": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
+      "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
+      "dev": true,
+      "dependencies": {
+        "detect-file": "^1.0.0",
+        "is-glob": "^3.1.0",
+        "micromatch": "^3.0.4",
+        "resolve-dir": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/matchdep/node_modules/is-glob": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mathjax": {
+      "version": "2.7.7",
+      "resolved": "https://registry.npmjs.org/mathjax/-/mathjax-2.7.7.tgz",
+      "integrity": "sha512-OOl0B2/0tSJAtAZarXnQuLDBLgTNRqiI9VqHTQzPsxf4okT2iIpDrvaklK9x2QEMD1sDj4yRn11Ygci41DxMAQ=="
+    },
+    "node_modules/md5-file": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/md5-file/-/md5-file-5.0.0.tgz",
+      "integrity": "sha512-xbEFXCYVWrSx/gEKS1VPlg84h/4L20znVIulKw6kMfmBUAZNAnF00eczz9ICMl+/hjQGo5KSXRxbL/47X3rmMw==",
+      "bin": {
+        "md5-file": "cli.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/md5.js": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+      "dev": true,
+      "dependencies": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/mdn-browser-compat-data": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/mdn-browser-compat-data/-/mdn-browser-compat-data-1.1.2.tgz",
+      "integrity": "sha512-uBNX2P4iu3PZcXP20rL+n7fxN9PWZLj0y43QMe/1aXzqP3H6HbVOeePS0cBZCtMwcfr2Tugf1OHj+/wLam+dUg==",
+      "deprecated": "mdn-browser-compat-data is deprecated. Upgrade to @mdn/browser-compat-data. Learn more: https://github.com/mdn/browser-compat-data/blob/v1.1.2/UPGRADE-2.0.x.md",
+      "dev": true,
+      "dependencies": {
+        "extend": "3.0.2"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/mdn-data": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
+      "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==",
+      "dev": true
+    },
+    "node_modules/media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/memory-fs": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
+      "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
+      "dev": true,
+      "dependencies": {
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=4.3.0 <5.0.0 || >=5.10"
+      }
+    },
+    "node_modules/merge-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
+    },
+    "node_modules/merge-source-map": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz",
+      "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
+      "dev": true,
+      "dependencies": {
+        "source-map": "^0.6.1"
+      }
+    },
+    "node_modules/merge-source-map/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
+    },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+      "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+      "dependencies": {
+        "braces": "^3.0.1",
+        "picomatch": "^2.0.5"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/miller-rabin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
+      },
+      "bin": {
+        "miller-rabin": "bin/miller-rabin"
+      }
+    },
+    "node_modules/miller-rabin/node_modules/bn.js": {
+      "version": "4.11.9",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+      "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+      "dev": true
+    },
+    "node_modules/mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/mime-db": {
+      "version": "1.44.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
+      "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.27",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
+      "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
+      "dependencies": {
+        "mime-db": "1.44.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mimic-response": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
+      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/mini-css-extract-plugin": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz",
+      "integrity": "sha512-lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A==",
+      "dev": true,
+      "dependencies": {
+        "loader-utils": "^1.1.0",
+        "normalize-url": "1.9.1",
+        "schema-utils": "^1.0.0",
+        "webpack-sources": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 6.9.0"
+      },
+      "peerDependencies": {
+        "webpack": "^4.4.0"
+      }
+    },
+    "node_modules/mini-css-extract-plugin/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/mini-css-extract-plugin/node_modules/loader-utils": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/mini-css-extract-plugin/node_modules/normalize-url": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz",
+      "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
+      "dev": true,
+      "dependencies": {
+        "object-assign": "^4.0.1",
+        "prepend-http": "^1.0.0",
+        "query-string": "^4.1.0",
+        "sort-keys": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/mini-css-extract-plugin/node_modules/prepend-http": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
+      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.1.0",
+        "ajv-errors": "^1.0.0",
+        "ajv-keywords": "^3.1.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+      "dev": true
+    },
+    "node_modules/minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
+      "dev": true
+    },
+    "node_modules/minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+    },
+    "node_modules/minipass": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
+      "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minipass-collect": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
+      "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/minipass-flush": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
+      "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/minipass-pipeline": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
+      "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minizlib": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.0.0",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/mississippi": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+      "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
+      "dev": true,
+      "dependencies": {
+        "concat-stream": "^1.5.0",
+        "duplexify": "^3.4.2",
+        "end-of-stream": "^1.1.0",
+        "flush-write-stream": "^1.0.0",
+        "from2": "^2.1.0",
+        "parallel-transform": "^1.1.0",
+        "pump": "^3.0.0",
+        "pumpify": "^1.3.3",
+        "stream-each": "^1.1.0",
+        "through2": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/mixin-deep": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+      "dev": true,
+      "dependencies": {
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mixin-deep/node_modules/is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/mkdirp-classic": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+      "optional": true
+    },
+    "node_modules/moment": {
+      "version": "2.29.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.0.tgz",
+      "integrity": "sha512-z6IJ5HXYiuxvFTI6eiQ9dm77uE0gyy1yXNApVHqTcnIKfY9tIwEjlzsZ6u1LQXvVgKeTnv9Xm7NDvJ7lso3MtA==",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/move-concurrently": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
+      "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
+      "dev": true,
+      "dependencies": {
+        "aproba": "^1.1.1",
+        "copy-concurrently": "^1.0.0",
+        "fs-write-stream-atomic": "^1.0.8",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.3"
+      }
+    },
+    "node_modules/move-concurrently/node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/move-file": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/move-file/-/move-file-2.0.0.tgz",
+      "integrity": "sha512-cdkdhNCgbP5dvS4tlGxZbD+nloio9GIimP57EjqFhwLcMjnU+XJKAZzlmg/TN/AK1LuNAdTSvm3CPPP4Xkv0iQ==",
+      "dev": true,
+      "dependencies": {
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/move-file/node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+    },
+    "node_modules/multicast-dns": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
+      "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
+      "dev": true,
+      "dependencies": {
+        "dns-packet": "^1.3.1",
+        "thunky": "^1.0.2"
+      },
+      "bin": {
+        "multicast-dns": "cli.js"
+      }
+    },
+    "node_modules/multicast-dns-service-types": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
+      "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
+      "dev": true
+    },
+    "node_modules/mute-stdout": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz",
+      "integrity": "sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/mute-stream": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="
+    },
+    "node_modules/nan": {
+      "version": "2.14.1",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz",
+      "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/nanomatch": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "fragment-cache": "^0.2.1",
+        "is-windows": "^1.0.2",
+        "kind-of": "^6.0.2",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/napi-build-utils": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
+      "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==",
+      "optional": true
+    },
+    "node_modules/native-request": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/native-request/-/native-request-1.0.7.tgz",
+      "integrity": "sha512-9nRjinI9bmz+S7dgNtf4A70+/vPhnd+2krGpy4SUlADuOuSa24IDkNaZ+R/QT1wQ6S8jBdi6wE7fLekFZNfUpQ==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/native-run": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/native-run/-/native-run-1.4.0.tgz",
+      "integrity": "sha512-3XJiDxGNi6XCsn8KYDQFSYGDVkKEMg0y55qTMU0feEuPNNU4iztBwW5bE87sfybZsQPsYDJQyYt9CUKDSoJgdQ==",
+      "dev": true,
+      "dependencies": {
+        "@ionic/utils-fs": "^3.0.0",
+        "@ionic/utils-terminal": "^2.3.1",
+        "bplist-parser": "0.2.0",
+        "debug": "^4.1.1",
+        "elementtree": "^0.1.7",
+        "ini": "^1.3.5",
+        "plist": "^3.0.1",
+        "split2": "^3.1.0",
+        "through2": "^4.0.2",
+        "tslib": "^2.0.1",
+        "yauzl": "^2.10.0"
+      },
+      "bin": {
+        "native-run": "bin/native-run"
+      },
+      "engines": {
+        "node": ">=10.3.0"
+      }
+    },
+    "node_modules/native-run/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/native-run/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/native-run/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/native-run/node_modules/through2": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
+      "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "3"
+      }
+    },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+      "dev": true
+    },
+    "node_modules/negotiator": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
+      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/neo-async": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+      "dev": true
+    },
+    "node_modules/netmask": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",
+      "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/next-tick": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
+      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
+      "dev": true
+    },
+    "node_modules/nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
+    },
+    "node_modules/nl.kingsquare.cordova.background-audio": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/nl.kingsquare.cordova.background-audio/-/nl.kingsquare.cordova.background-audio-1.0.1.tgz",
+      "integrity": "sha1-Gx1NzaijXAx/x5UzN7FzsUtPmGA="
+    },
+    "node_modules/no-case": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
+      "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
+      "dev": true,
+      "dependencies": {
+        "lower-case": "^1.1.1"
+      }
+    },
+    "node_modules/node-abi": {
+      "version": "2.19.3",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.19.3.tgz",
+      "integrity": "sha512-9xZrlyfvKhWme2EXFKQhZRp1yNWT/uI1luYPr3sFl+H4keYY4xR+1jO7mvTTijIsHf1M+QDe9uWuKeEpLInIlg==",
+      "optional": true,
+      "dependencies": {
+        "semver": "^5.4.1"
+      }
+    },
+    "node_modules/node-abi/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "optional": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/node-addon-api": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.0.2.tgz",
+      "integrity": "sha512-+D4s2HCnxPd5PjjI0STKwncjXTUKKqm74MDMz9OPXavjsGmjkvwgLtA5yoxJUdmpj52+2u+RrXgPipahKczMKg==",
+      "optional": true
+    },
+    "node_modules/node-fetch-npm": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.4.tgz",
+      "integrity": "sha512-iOuIQDWDyjhv9qSDrj9aq/klt6F9z1p2otB3AV7v3zBDcL/x+OfGsvGQZZCcMZbUf4Ujw1xGNQkjvGnVT22cKg==",
+      "dev": true,
+      "dependencies": {
+        "encoding": "^0.1.11",
+        "json-parse-better-errors": "^1.0.0",
+        "safe-buffer": "^5.1.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/node-forge": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
+      "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/node-int64": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+      "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
+      "dev": true
+    },
+    "node_modules/node-libs-browser": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
+      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
+      "dev": true,
+      "dependencies": {
+        "assert": "^1.1.1",
+        "browserify-zlib": "^0.2.0",
+        "buffer": "^4.3.0",
+        "console-browserify": "^1.1.0",
+        "constants-browserify": "^1.0.0",
+        "crypto-browserify": "^3.11.0",
+        "domain-browser": "^1.1.1",
+        "events": "^3.0.0",
+        "https-browserify": "^1.0.0",
+        "os-browserify": "^0.3.0",
+        "path-browserify": "0.0.1",
+        "process": "^0.11.10",
+        "punycode": "^1.2.4",
+        "querystring-es3": "^0.2.0",
+        "readable-stream": "^2.3.3",
+        "stream-browserify": "^2.0.1",
+        "stream-http": "^2.7.2",
+        "string_decoder": "^1.0.0",
+        "timers-browserify": "^2.0.4",
+        "tty-browserify": "0.0.0",
+        "url": "^0.11.0",
+        "util": "^0.11.0",
+        "vm-browserify": "^1.0.1"
+      }
+    },
+    "node_modules/node-libs-browser/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "dev": true
+    },
+    "node_modules/node-libs-browser/node_modules/punycode": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+      "dev": true
+    },
+    "node_modules/node-libs-browser/node_modules/util": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "2.0.3"
+      }
+    },
+    "node_modules/node-modules-regexp": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
+      "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/node-notifier": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.0.tgz",
+      "integrity": "sha512-46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "growly": "^1.3.0",
+        "is-wsl": "^2.2.0",
+        "semver": "^7.3.2",
+        "shellwords": "^0.1.1",
+        "uuid": "^8.3.0",
+        "which": "^2.0.2"
+      }
+    },
+    "node_modules/node-notifier/node_modules/uuid": {
+      "version": "8.3.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.1.tgz",
+      "integrity": "sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==",
+      "dev": true,
+      "optional": true,
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/node-releases": {
+      "version": "1.1.61",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.61.tgz",
+      "integrity": "sha512-DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g==",
+      "dev": true
+    },
+    "node_modules/noop-logger": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz",
+      "integrity": "sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI=",
+      "optional": true
+    },
+    "node_modules/nopt": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
+      "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
+      "dependencies": {
+        "abbrev": "1",
+        "osenv": "^0.1.4"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      }
+    },
+    "node_modules/normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dependencies": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
+    "node_modules/normalize-package-data/node_modules/hosted-git-info": {
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
+      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="
+    },
+    "node_modules/normalize-package-data/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/normalize-range": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/normalize-url": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz",
+      "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/now-and-later": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz",
+      "integrity": "sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.3.2"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/npm-bundled": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz",
+      "integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==",
+      "dev": true,
+      "dependencies": {
+        "npm-normalize-package-bin": "^1.0.1"
+      }
+    },
+    "node_modules/npm-install-checks": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-4.0.0.tgz",
+      "integrity": "sha512-09OmyDkNLYwqKPOnbI8exiOZU2GVVmQp7tgez2BPi5OZC8M82elDAps7sxC4l//uSUtotWqoEIDwjRvWH4qz8w==",
+      "dev": true,
+      "dependencies": {
+        "semver": "^7.1.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/npm-normalize-package-bin": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz",
+      "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA=="
+    },
+    "node_modules/npm-package-arg": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.0.1.tgz",
+      "integrity": "sha512-/h5Fm6a/exByzFSTm7jAyHbgOqErl9qSNJDQF32Si/ZzgwT2TERVxRxn3Jurw1wflgyVVAxnFR4fRHPM7y1ClQ==",
+      "dependencies": {
+        "hosted-git-info": "^3.0.2",
+        "semver": "^7.0.0",
+        "validate-npm-package-name": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/npm-packlist": {
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz",
+      "integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==",
+      "dev": true,
+      "dependencies": {
+        "ignore-walk": "^3.0.1",
+        "npm-bundled": "^1.0.1",
+        "npm-normalize-package-bin": "^1.0.1"
+      }
+    },
+    "node_modules/npm-pick-manifest": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-6.1.0.tgz",
+      "integrity": "sha512-ygs4k6f54ZxJXrzT0x34NybRlLeZ4+6nECAIbr2i0foTnijtS1TJiyzpqtuUAJOps/hO0tNDr8fRV5g+BtRlTw==",
+      "dev": true,
+      "dependencies": {
+        "npm-install-checks": "^4.0.0",
+        "npm-package-arg": "^8.0.0",
+        "semver": "^7.0.0"
+      }
+    },
+    "node_modules/npm-registry-fetch": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.7.tgz",
+      "integrity": "sha512-cny9v0+Mq6Tjz+e0erFAB+RYJ/AVGzkjnISiobqP8OWj9c9FLoZZu8/SPSKJWE17F1tk4018wfjV+ZbIbqC7fQ==",
+      "dev": true,
+      "dependencies": {
+        "bluebird": "^3.5.1",
+        "figgy-pudding": "^3.4.1",
+        "JSONStream": "^1.3.4",
+        "lru-cache": "^5.1.1",
+        "make-fetch-happen": "^5.0.0",
+        "npm-package-arg": "^6.1.0",
+        "safe-buffer": "^5.2.0"
+      }
+    },
+    "node_modules/npm-registry-fetch/node_modules/hosted-git-info": {
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
+      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+      "dev": true
+    },
+    "node_modules/npm-registry-fetch/node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/npm-registry-fetch/node_modules/npm-package-arg": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
+      "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
+      "dev": true,
+      "dependencies": {
+        "hosted-git-info": "^2.7.1",
+        "osenv": "^0.1.5",
+        "semver": "^5.6.0",
+        "validate-npm-package-name": "^3.0.0"
+      }
+    },
+    "node_modules/npm-registry-fetch/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/npm-registry-fetch/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/npm-registry-fetch/node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true
+    },
+    "node_modules/npm-run-path": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+      "dependencies": {
+        "path-key": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/npmlog": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+      "optional": true,
+      "dependencies": {
+        "are-we-there-yet": "~1.1.2",
+        "console-control-strings": "~1.1.0",
+        "gauge": "~2.7.3",
+        "set-blocking": "~2.0.0"
+      }
+    },
+    "node_modules/nth-check": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
+      "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "~1.0.0"
+      }
+    },
+    "node_modules/num2fraction": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
+      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
+      "dev": true
+    },
+    "node_modules/number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+      "devOptional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/nwsapi": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
+      "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
+      "dev": true
+    },
+    "node_modules/oauth-sign": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "devOptional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+      "dev": true,
+      "dependencies": {
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
+      "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-is": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.3.tgz",
+      "integrity": "sha512-teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.18.0-next.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object-path": {
+      "version": "0.11.4",
+      "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.11.4.tgz",
+      "integrity": "sha1-NwrnUvvzfePqcKhhwju6iRVpGUk=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-visit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-visit/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz",
+      "integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.18.0-next.0",
+        "has-symbols": "^1.0.1",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.defaults": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
+      "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
+      "dev": true,
+      "dependencies": {
+        "array-each": "^1.0.1",
+        "array-slice": "^1.0.0",
+        "for-own": "^1.0.0",
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.defaults/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.getownpropertydescriptors": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz",
+      "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.getownpropertydescriptors/node_modules/es-abstract": {
+      "version": "1.17.7",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+      "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+      "dev": true,
+      "dependencies": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.2",
+        "is-regex": "^1.1.1",
+        "object-inspect": "^1.8.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.1",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.map": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
+      "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
+      "dev": true,
+      "dependencies": {
+        "for-own": "^1.0.0",
+        "make-iterator": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.pick/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.reduce": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz",
+      "integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=",
+      "dev": true,
+      "dependencies": {
+        "for-own": "^1.0.0",
+        "make-iterator": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.values": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz",
+      "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.values/node_modules/es-abstract": {
+      "version": "1.17.7",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+      "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+      "dev": true,
+      "dependencies": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.2",
+        "is-regex": "^1.1.1",
+        "object-inspect": "^1.8.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.1",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/objectorarray": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/objectorarray/-/objectorarray-1.0.4.tgz",
+      "integrity": "sha512-91k8bjcldstRz1bG6zJo8lWD7c6QXcB4nTDUqiEvIL1xAsLoZlOOZZG+nd6YPz+V7zY1580J4Xxh1vZtyv4i/w=="
+    },
+    "node_modules/obuf": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
+      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
+      "dev": true
+    },
+    "node_modules/on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/on-headers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/open": {
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/open/-/open-7.3.0.tgz",
+      "integrity": "sha512-mgLwQIx2F/ye9SmbrUkurZCnkoXyXyu9EbHtJZrICjVAJfyMArdHp3KkixGdZx1ZHFPNIwl0DDM1dFFqXbTLZw==",
+      "dependencies": {
+        "is-docker": "^2.0.0",
+        "is-wsl": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/opn": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz",
+      "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==",
+      "dev": true,
+      "dependencies": {
+        "is-wsl": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/opn/node_modules/is-wsl": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/optionator": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "dev": true,
+      "dependencies": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/ora": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-4.0.4.tgz",
+      "integrity": "sha512-77iGeVU1cIdRhgFzCK8aw1fbtT1B/iZAvWjS+l/o1x0RShMgxHUZaD2yDpWsNCPwXg9z1ZA78Kbdvr8kBmG/Ww==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^3.0.0",
+        "cli-cursor": "^3.1.0",
+        "cli-spinners": "^2.2.0",
+        "is-interactive": "^1.0.0",
+        "log-symbols": "^3.0.0",
+        "mute-stream": "0.0.8",
+        "strip-ansi": "^6.0.0",
+        "wcwidth": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ora/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ora/node_modules/cli-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+      "dev": true,
+      "dependencies": {
+        "restore-cursor": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ora/node_modules/restore-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "dev": true,
+      "dependencies": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ora/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ordered-read-streams": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz",
+      "integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "^2.0.1"
+      }
+    },
+    "node_modules/original": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz",
+      "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==",
+      "dev": true,
+      "dependencies": {
+        "url-parse": "^1.4.3"
+      }
+    },
+    "node_modules/os-browserify": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
+      "dev": true
+    },
+    "node_modules/os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/os-locale": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
+      "dev": true,
+      "dependencies": {
+        "lcid": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/os-name": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/os-name/-/os-name-3.1.0.tgz",
+      "integrity": "sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==",
+      "dependencies": {
+        "macos-release": "^2.2.0",
+        "windows-release": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/osenv": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+      "dependencies": {
+        "os-homedir": "^1.0.0",
+        "os-tmpdir": "^1.0.0"
+      }
+    },
+    "node_modules/p-cancelable": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
+      "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/p-each-series": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.1.0.tgz",
+      "integrity": "sha512-ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+      "dependencies": {
+        "p-try": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-limit/node_modules/p-try": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "dependencies": {
+        "p-limit": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-map": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+      "dev": true,
+      "dependencies": {
+        "aggregate-error": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-retry": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz",
+      "integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==",
+      "dev": true,
+      "dependencies": {
+        "retry": "^0.12.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pac-proxy-agent": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-4.1.0.tgz",
+      "integrity": "sha512-ejNgYm2HTXSIYX9eFlkvqFp8hyJ374uDf0Zq5YUAifiSh1D6fo+iBivQZirGvVv8dCYUsLhmLBRhlAYvBKI5+Q==",
+      "dev": true,
+      "dependencies": {
+        "@tootallnate/once": "1",
+        "agent-base": "6",
+        "debug": "4",
+        "get-uri": "3",
+        "http-proxy-agent": "^4.0.1",
+        "https-proxy-agent": "5",
+        "pac-resolver": "^4.1.0",
+        "raw-body": "^2.2.0",
+        "socks-proxy-agent": "5"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/pac-proxy-agent/node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/pac-proxy-agent/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/pac-proxy-agent/node_modules/http-proxy-agent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+      "dev": true,
+      "dependencies": {
+        "@tootallnate/once": "1",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/pac-proxy-agent/node_modules/https-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/pac-proxy-agent/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/pac-proxy-agent/node_modules/socks-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4",
+        "socks": "^2.3.3"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/pac-resolver": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-4.2.0.tgz",
+      "integrity": "sha512-rPACZdUyuxT5Io/gFKUeeZFfE5T7ve7cAkE5TUZRRfuKP0u5Hocwe48X7ZEm6mYB+bTB0Qf+xlVlA/RM/i6RCQ==",
+      "dev": true,
+      "dependencies": {
+        "degenerator": "^2.2.0",
+        "ip": "^1.1.5",
+        "netmask": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/package-json": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz",
+      "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==",
+      "dependencies": {
+        "got": "^9.6.0",
+        "registry-auth-token": "^4.0.0",
+        "registry-url": "^5.0.0",
+        "semver": "^6.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/package-json/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/pacote": {
+      "version": "9.5.12",
+      "resolved": "https://registry.npmjs.org/pacote/-/pacote-9.5.12.tgz",
+      "integrity": "sha512-BUIj/4kKbwWg4RtnBncXPJd15piFSVNpTzY0rysSr3VnMowTYgkGKcaHrbReepAkjTr8lH2CVWRi58Spg2CicQ==",
+      "dev": true,
+      "dependencies": {
+        "bluebird": "^3.5.3",
+        "cacache": "^12.0.2",
+        "chownr": "^1.1.2",
+        "figgy-pudding": "^3.5.1",
+        "get-stream": "^4.1.0",
+        "glob": "^7.1.3",
+        "infer-owner": "^1.0.4",
+        "lru-cache": "^5.1.1",
+        "make-fetch-happen": "^5.0.0",
+        "minimatch": "^3.0.4",
+        "minipass": "^2.3.5",
+        "mississippi": "^3.0.0",
+        "mkdirp": "^0.5.1",
+        "normalize-package-data": "^2.4.0",
+        "npm-normalize-package-bin": "^1.0.0",
+        "npm-package-arg": "^6.1.0",
+        "npm-packlist": "^1.1.12",
+        "npm-pick-manifest": "^3.0.0",
+        "npm-registry-fetch": "^4.0.0",
+        "osenv": "^0.1.5",
+        "promise-inflight": "^1.0.1",
+        "promise-retry": "^1.1.1",
+        "protoduck": "^5.0.1",
+        "rimraf": "^2.6.2",
+        "safe-buffer": "^5.1.2",
+        "semver": "^5.6.0",
+        "ssri": "^6.0.1",
+        "tar": "^4.4.10",
+        "unique-filename": "^1.1.1",
+        "which": "^1.3.1"
+      }
+    },
+    "node_modules/pacote/node_modules/cacache": {
+      "version": "12.0.4",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
+      "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
+      "dev": true,
+      "dependencies": {
+        "bluebird": "^3.5.5",
+        "chownr": "^1.1.1",
+        "figgy-pudding": "^3.5.1",
+        "glob": "^7.1.4",
+        "graceful-fs": "^4.1.15",
+        "infer-owner": "^1.0.3",
+        "lru-cache": "^5.1.1",
+        "mississippi": "^3.0.0",
+        "mkdirp": "^0.5.1",
+        "move-concurrently": "^1.0.1",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^2.6.3",
+        "ssri": "^6.0.1",
+        "unique-filename": "^1.1.1",
+        "y18n": "^4.0.0"
+      }
+    },
+    "node_modules/pacote/node_modules/chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "dev": true
+    },
+    "node_modules/pacote/node_modules/fs-minipass": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
+      "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^2.6.0"
+      }
+    },
+    "node_modules/pacote/node_modules/get-stream": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "dev": true,
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pacote/node_modules/hosted-git-info": {
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
+      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+      "dev": true
+    },
+    "node_modules/pacote/node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/pacote/node_modules/minipass": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
+      "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "^5.1.2",
+        "yallist": "^3.0.0"
+      }
+    },
+    "node_modules/pacote/node_modules/minizlib": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
+      "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^2.9.0"
+      }
+    },
+    "node_modules/pacote/node_modules/npm-package-arg": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
+      "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
+      "dev": true,
+      "dependencies": {
+        "hosted-git-info": "^2.7.1",
+        "osenv": "^0.1.5",
+        "semver": "^5.6.0",
+        "validate-npm-package-name": "^3.0.0"
+      }
+    },
+    "node_modules/pacote/node_modules/npm-pick-manifest": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-3.0.2.tgz",
+      "integrity": "sha512-wNprTNg+X5nf+tDi+hbjdHhM4bX+mKqv6XmPh7B5eG+QY9VARfQPfCEH013H5GqfNj6ee8Ij2fg8yk0mzps1Vw==",
+      "dev": true,
+      "dependencies": {
+        "figgy-pudding": "^3.5.1",
+        "npm-package-arg": "^6.0.0",
+        "semver": "^5.4.1"
+      }
+    },
+    "node_modules/pacote/node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/pacote/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/pacote/node_modules/ssri": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+      "dev": true,
+      "dependencies": {
+        "figgy-pudding": "^3.5.1"
+      }
+    },
+    "node_modules/pacote/node_modules/tar": {
+      "version": "4.4.13",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz",
+      "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
+      "dev": true,
+      "dependencies": {
+        "chownr": "^1.1.1",
+        "fs-minipass": "^1.2.5",
+        "minipass": "^2.8.6",
+        "minizlib": "^1.2.1",
+        "mkdirp": "^0.5.0",
+        "safe-buffer": "^5.1.2",
+        "yallist": "^3.0.3"
+      },
+      "engines": {
+        "node": ">=4.5"
+      }
+    },
+    "node_modules/pacote/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/pacote/node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true
+    },
+    "node_modules/pako": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
+    },
+    "node_modules/parallel-transform": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
+      "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
+      "dev": true,
+      "dependencies": {
+        "cyclist": "^1.0.1",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.1.5"
+      }
+    },
+    "node_modules/param-case": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
+      "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=",
+      "dev": true,
+      "dependencies": {
+        "no-case": "^2.2.0"
+      }
+    },
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parse-asn1": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
+      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
+      "dev": true,
+      "dependencies": {
+        "asn1.js": "^5.2.0",
+        "browserify-aes": "^1.0.0",
+        "evp_bytestokey": "^1.0.0",
+        "pbkdf2": "^3.0.3",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/parse-filepath": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
+      "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
+      "dev": true,
+      "dependencies": {
+        "is-absolute": "^1.0.0",
+        "map-cache": "^0.2.0",
+        "path-root": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/parse-json": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+      "dev": true,
+      "dependencies": {
+        "error-ex": "^1.3.1",
+        "json-parse-better-errors": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/parse-node-version": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
+      "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/parse-passwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
+      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/parse5": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
+      "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==",
+      "dev": true
+    },
+    "node_modules/parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/pascalcase": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-browserify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
+      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
+      "dev": true
+    },
+    "node_modules/path-dirname": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
+      "dev": true
+    },
+    "node_modules/path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM="
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
+    },
+    "node_modules/path-root": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
+      "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
+      "dev": true,
+      "dependencies": {
+        "path-root-regex": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-root-regex": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
+      "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-to-regexp": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
+    },
+    "node_modules/path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pbkdf2": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.1.tgz",
+      "integrity": "sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==",
+      "dev": true,
+      "dependencies": {
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      },
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
+    "node_modules/pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
+      "dev": true
+    },
+    "node_modules/performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
+    },
+    "node_modules/phonegap-plugin-multidex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/phonegap-plugin-multidex/-/phonegap-plugin-multidex-1.0.0.tgz",
+      "integrity": "sha512-1wvc3iQOQpEBaQbXgLxA2JUiLSQ2azdF/bF29ghXDiQJWSpQ1BF8gSuqttM8WZoj081Ps8OKL0gYxdDBkFNPqA==",
+      "deprecated": "This package is deprecated, see https://blog.phonegap.com/update-for-customers-using-phonegap-and-phonegap-build-cc701c77502c"
+    },
+    "node_modules/picomatch": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "dev": true,
+      "dependencies": {
+        "pinkie": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pirates": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
+      "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
+      "dev": true,
+      "dependencies": {
+        "node-modules-regexp": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/pkg-dir": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/find-up": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/locate-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/p-locate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pkg-up": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz",
+      "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=",
+      "dependencies": {
+        "find-up": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/plist": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.1.tgz",
+      "integrity": "sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==",
+      "dependencies": {
+        "base64-js": "^1.2.3",
+        "xmlbuilder": "^9.0.7",
+        "xmldom": "0.1.x"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/plugin-error": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
+      "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=",
+      "dev": true,
+      "dependencies": {
+        "ansi-cyan": "^0.1.1",
+        "ansi-red": "^0.1.1",
+        "arr-diff": "^1.0.1",
+        "arr-union": "^2.0.1",
+        "extend-shallow": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/plugin-error/node_modules/arr-diff": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
+      "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.0.1",
+        "array-slice": "^0.2.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/plugin-error/node_modules/arr-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
+      "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/plugin-error/node_modules/array-slice": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
+      "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/plugin-error/node_modules/extend-shallow": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
+      "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/plugin-error/node_modules/kind-of": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
+      "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pnp-webpack-plugin": {
+      "version": "1.6.4",
+      "resolved": "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz",
+      "integrity": "sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg==",
+      "dev": true,
+      "dependencies": {
+        "ts-pnp": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/portfinder": {
+      "version": "1.0.28",
+      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
+      "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==",
+      "dev": true,
+      "dependencies": {
+        "async": "^2.6.2",
+        "debug": "^3.1.1",
+        "mkdirp": "^0.5.5"
+      },
+      "engines": {
+        "node": ">= 0.12.0"
+      }
+    },
+    "node_modules/portfinder/node_modules/debug": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/portfinder/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/posix-character-classes": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss": {
+      "version": "7.0.31",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.31.tgz",
+      "integrity": "sha512-a937VDHE1ftkjk+8/7nj/mrjtmkn69xxzJgRETXdAUU+IgOYPQNJF17haGWbeDxSyk++HA14UA98FurvPyBJOA==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.2",
+        "source-map": "^0.6.1",
+        "supports-color": "^6.1.0"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      },
+      "funding": {
+        "type": "tidelift",
+        "url": "https://tidelift.com/funding/github/npm/postcss"
+      }
+    },
+    "node_modules/postcss-calc": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.5.tgz",
+      "integrity": "sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^7.0.27",
+        "postcss-selector-parser": "^6.0.2",
+        "postcss-value-parser": "^4.0.2"
+      }
+    },
+    "node_modules/postcss-colormin": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz",
+      "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.0.0",
+        "color": "^3.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-colormin/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-convert-values": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz",
+      "integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-convert-values/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-discard-comments": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz",
+      "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-discard-duplicates": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz",
+      "integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-discard-empty": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz",
+      "integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-discard-overridden": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz",
+      "integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-import": {
+      "version": "12.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-12.0.1.tgz",
+      "integrity": "sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^7.0.1",
+        "postcss-value-parser": "^3.2.3",
+        "read-cache": "^1.0.0",
+        "resolve": "^1.1.7"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/postcss-import/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-load-config": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.2.tgz",
+      "integrity": "sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==",
+      "dev": true,
+      "dependencies": {
+        "cosmiconfig": "^5.0.0",
+        "import-cwd": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      }
+    },
+    "node_modules/postcss-loader": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz",
+      "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==",
+      "dev": true,
+      "dependencies": {
+        "loader-utils": "^1.1.0",
+        "postcss": "^7.0.0",
+        "postcss-load-config": "^2.0.0",
+        "schema-utils": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/postcss-loader/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/postcss-loader/node_modules/loader-utils": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-loader/node_modules/schema-utils": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.1.0",
+        "ajv-errors": "^1.0.0",
+        "ajv-keywords": "^3.1.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/postcss-merge-longhand": {
+      "version": "4.0.11",
+      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz",
+      "integrity": "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==",
+      "dev": true,
+      "dependencies": {
+        "css-color-names": "0.0.4",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0",
+        "stylehacks": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-merge-longhand/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-merge-rules": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz",
+      "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.0.0",
+        "caniuse-api": "^3.0.0",
+        "cssnano-util-same-parent": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-selector-parser": "^3.0.0",
+        "vendors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-merge-rules/node_modules/postcss-selector-parser": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
+      "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
+      "dev": true,
+      "dependencies": {
+        "dot-prop": "^5.2.0",
+        "indexes-of": "^1.0.1",
+        "uniq": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/postcss-minify-font-values": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz",
+      "integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-minify-font-values/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-minify-gradients": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz",
+      "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==",
+      "dev": true,
+      "dependencies": {
+        "cssnano-util-get-arguments": "^4.0.0",
+        "is-color-stop": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-minify-gradients/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-minify-params": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz",
+      "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==",
+      "dev": true,
+      "dependencies": {
+        "alphanum-sort": "^1.0.0",
+        "browserslist": "^4.0.0",
+        "cssnano-util-get-arguments": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0",
+        "uniqs": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-minify-params/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-minify-selectors": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz",
+      "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==",
+      "dev": true,
+      "dependencies": {
+        "alphanum-sort": "^1.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-selector-parser": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-minify-selectors/node_modules/postcss-selector-parser": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
+      "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
+      "dev": true,
+      "dependencies": {
+        "dot-prop": "^5.2.0",
+        "indexes-of": "^1.0.1",
+        "uniq": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/postcss-modules-extract-imports": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz",
+      "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^7.0.5"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz",
+      "integrity": "sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==",
+      "dev": true,
+      "dependencies": {
+        "icss-utils": "^4.1.1",
+        "postcss": "^7.0.32",
+        "postcss-selector-parser": "^6.0.2",
+        "postcss-value-parser": "^4.1.0"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default/node_modules/chalk/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/postcss-modules-local-by-default/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default/node_modules/postcss": {
+      "version": "7.0.35",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
+      "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.2",
+        "source-map": "^0.6.1",
+        "supports-color": "^6.1.0"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default/node_modules/supports-color": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/postcss-modules-scope": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz",
+      "integrity": "sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^7.0.6",
+        "postcss-selector-parser": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/postcss-modules-values": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz",
+      "integrity": "sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==",
+      "dev": true,
+      "dependencies": {
+        "icss-utils": "^4.0.0",
+        "postcss": "^7.0.6"
+      }
+    },
+    "node_modules/postcss-normalize-charset": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz",
+      "integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-normalize-display-values": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz",
+      "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==",
+      "dev": true,
+      "dependencies": {
+        "cssnano-util-get-match": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-normalize-display-values/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-normalize-positions": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz",
+      "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==",
+      "dev": true,
+      "dependencies": {
+        "cssnano-util-get-arguments": "^4.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-normalize-positions/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-normalize-repeat-style": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz",
+      "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==",
+      "dev": true,
+      "dependencies": {
+        "cssnano-util-get-arguments": "^4.0.0",
+        "cssnano-util-get-match": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-normalize-repeat-style/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-normalize-string": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz",
+      "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==",
+      "dev": true,
+      "dependencies": {
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-normalize-string/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-normalize-timing-functions": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz",
+      "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==",
+      "dev": true,
+      "dependencies": {
+        "cssnano-util-get-match": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-normalize-timing-functions/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-normalize-unicode": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz",
+      "integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-normalize-unicode/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-normalize-url": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz",
+      "integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==",
+      "dev": true,
+      "dependencies": {
+        "is-absolute-url": "^2.0.0",
+        "normalize-url": "^3.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-normalize-url/node_modules/normalize-url": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz",
+      "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/postcss-normalize-url/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-normalize-whitespace": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz",
+      "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-normalize-whitespace/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-ordered-values": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz",
+      "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==",
+      "dev": true,
+      "dependencies": {
+        "cssnano-util-get-arguments": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-ordered-values/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-reduce-initial": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz",
+      "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.0.0",
+        "caniuse-api": "^3.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-reduce-transforms": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz",
+      "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==",
+      "dev": true,
+      "dependencies": {
+        "cssnano-util-get-match": "^4.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-reduce-transforms/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-selector-parser": {
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz",
+      "integrity": "sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==",
+      "dev": true,
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "indexes-of": "^1.0.1",
+        "uniq": "^1.0.1",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-svgo": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz",
+      "integrity": "sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw==",
+      "dev": true,
+      "dependencies": {
+        "is-svg": "^3.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0",
+        "svgo": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-svgo/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-unique-selectors": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz",
+      "integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==",
+      "dev": true,
+      "dependencies": {
+        "alphanum-sort": "^1.0.0",
+        "postcss": "^7.0.0",
+        "uniqs": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-value-parser": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
+      "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
+      "dev": true
+    },
+    "node_modules/postcss/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss/node_modules/chalk/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/postcss/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/postcss/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss/node_modules/supports-color": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/prebuild-install": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.0.0.tgz",
+      "integrity": "sha512-h2ZJ1PXHKWZpp1caLw0oX9sagVpL2YTk+ZwInQbQ3QqNd4J03O6MpFNmMTJlkfgPENWqe5kP0WjQLqz5OjLfsw==",
+      "optional": true,
+      "dependencies": {
+        "detect-libc": "^1.0.3",
+        "expand-template": "^2.0.3",
+        "github-from-package": "0.0.0",
+        "minimist": "^1.2.3",
+        "mkdirp-classic": "^0.5.3",
+        "napi-build-utils": "^1.0.1",
+        "node-abi": "^2.7.0",
+        "noop-logger": "^0.1.1",
+        "npmlog": "^4.0.1",
+        "pump": "^3.0.0",
+        "rc": "^1.2.7",
+        "simple-get": "^3.0.3",
+        "tar-fs": "^2.0.0",
+        "tunnel-agent": "^0.6.0",
+        "which-pm-runs": "^1.0.0"
+      },
+      "bin": {
+        "prebuild-install": "bin.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/prepend-http": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
+      "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/pretty-format": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.5.2.tgz",
+      "integrity": "sha512-VizyV669eqESlkOikKJI8Ryxl/kPpbdLwNdPs2GrbQs18MpySB5S0Yo0N7zkg2xTRiFq4CFw8ct5Vg4a0xP0og==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.5.2",
+        "ansi-regex": "^5.0.0",
+        "ansi-styles": "^4.0.0",
+        "react-is": "^16.12.0"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/pretty-format/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pretty-hrtime": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
+      "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
+    "node_modules/process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+    },
+    "node_modules/progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/promise-inflight": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
+      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
+      "dev": true
+    },
+    "node_modules/promise-retry": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz",
+      "integrity": "sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0=",
+      "dev": true,
+      "dependencies": {
+        "err-code": "^1.0.0",
+        "retry": "^0.10.0"
+      },
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
+    "node_modules/promise-retry/node_modules/retry": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz",
+      "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/prompts": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.2.tgz",
+      "integrity": "sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA==",
+      "dev": true,
+      "dependencies": {
+        "kleur": "^3.0.3",
+        "sisteransi": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/promzard": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz",
+      "integrity": "sha1-JqXW7ox97kyxIggwWs+5O6OCqe4=",
+      "dependencies": {
+        "read": "1"
+      }
+    },
+    "node_modules/properties-parser": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/properties-parser/-/properties-parser-0.3.1.tgz",
+      "integrity": "sha1-ExbpU5/7/ZOEXjabIRAiq9R4dxo=",
+      "dependencies": {
+        "string.prototype.codepointat": "^0.2.0"
+      },
+      "engines": {
+        "node": ">= 0.3.1"
+      }
+    },
+    "node_modules/protoduck": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/protoduck/-/protoduck-5.0.1.tgz",
+      "integrity": "sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==",
+      "dev": true,
+      "dependencies": {
+        "genfun": "^5.0.0"
+      }
+    },
+    "node_modules/proxy-addr": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
+      "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==",
+      "dependencies": {
+        "forwarded": "~0.1.2",
+        "ipaddr.js": "1.9.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/proxy-agent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-ODnQnW2jc/FUVwHHuaZEfN5otg/fMbvMxz9nMSUQfJ9JU7q2SZvSULSsjLloVgJOiv9yhc8GlNMKc4GkFmcVEA==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^6.0.0",
+        "debug": "4",
+        "http-proxy-agent": "^4.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "lru-cache": "^5.1.1",
+        "pac-proxy-agent": "^4.1.0",
+        "proxy-from-env": "^1.0.0",
+        "socks-proxy-agent": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/proxy-agent/node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/proxy-agent/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/proxy-agent/node_modules/http-proxy-agent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+      "dev": true,
+      "dependencies": {
+        "@tootallnate/once": "1",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/proxy-agent/node_modules/https-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/proxy-agent/node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/proxy-agent/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/proxy-agent/node_modules/socks-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4",
+        "socks": "^2.3.3"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/proxy-agent/node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true
+    },
+    "node_modules/proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+      "dev": true
+    },
+    "node_modules/prr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
+      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
+      "dev": true
+    },
+    "node_modules/psl": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
+      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
+    },
+    "node_modules/public-encrypt": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/public-encrypt/node_modules/bn.js": {
+      "version": "4.11.9",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+      "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+      "dev": true
+    },
+    "node_modules/pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "node_modules/pumpify": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
+      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+      "dev": true,
+      "dependencies": {
+        "duplexify": "^3.6.0",
+        "inherits": "^2.0.3",
+        "pump": "^2.0.0"
+      }
+    },
+    "node_modules/pumpify/node_modules/pump": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+      "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+      "dev": true,
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "node_modules/punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pupa": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.0.1.tgz",
+      "integrity": "sha512-hEJH0s8PXLY/cdXh66tNEQGndDrIKNqNC5xmrysZy3i5C3oEoLna7YAOad+7u125+zH1HNXUmGEkrhb3c2VriA==",
+      "dependencies": {
+        "escape-goat": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/q": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
+      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
+      "engines": {
+        "node": ">=0.6.0",
+        "teleport": ">=0.2.0"
+      }
+    },
+    "node_modules/qrcode-reader": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/qrcode-reader/-/qrcode-reader-1.0.4.tgz",
+      "integrity": "sha512-rRjALGNh9zVqvweg1j5OKIQKNsw3bLC+7qwlnead5K/9cb1cEIAGkwikt/09U0K+2IDWGD9CC6SP7tHAjUeqvQ=="
+    },
+    "node_modules/qs": {
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/query-string": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
+      "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
+      "dev": true,
+      "dependencies": {
+        "object-assign": "^4.1.0",
+        "strict-uri-encode": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
+      "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
+    "node_modules/querystring-es3": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
+    "node_modules/querystringify": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+      "dev": true
+    },
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/randomfill": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "dev": true,
+      "dependencies": {
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/range-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/raw-body": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
+      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
+      "dependencies": {
+        "bytes": "3.1.0",
+        "http-errors": "1.7.2",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/raw-body/node_modules/bytes": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/raw-loader": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-4.0.1.tgz",
+      "integrity": "sha512-baolhQBSi3iNh1cglJjA0mYzga+wePk7vdEX//1dTFd+v4TsQlQE0jitJSNF1OIP82rdYulH7otaVmdlDaJ64A==",
+      "dev": true,
+      "dependencies": {
+        "loader-utils": "^2.0.0",
+        "schema-utils": "^2.6.5"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/rc": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+      "dependencies": {
+        "deep-extend": "^0.6.0",
+        "ini": "~1.3.0",
+        "minimist": "^1.2.0",
+        "strip-json-comments": "~2.0.1"
+      },
+      "bin": {
+        "rc": "cli.js"
+      }
+    },
+    "node_modules/react-is": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+      "dev": true
+    },
+    "node_modules/read": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
+      "integrity": "sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=",
+      "dependencies": {
+        "mute-stream": "~0.0.4"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/read-cache": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
+      "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
+      "dev": true,
+      "dependencies": {
+        "pify": "^2.3.0"
+      }
+    },
+    "node_modules/read-cache/node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/read-chunk": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/read-chunk/-/read-chunk-3.2.0.tgz",
+      "integrity": "sha512-CEjy9LCzhmD7nUpJ1oVOE6s/hBkejlcJEgLQHVnQznOSilOPb+kpKktlLfFDK3/WP43+F80xkUTM2VOkYoSYvQ==",
+      "dependencies": {
+        "pify": "^4.0.1",
+        "with-open-file": "^0.1.6"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/read-package-json": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.2.tgz",
+      "integrity": "sha512-D1KmuLQr6ZSJS0tW8hf3WGpRlwszJOXZ3E8Yd/DNRaM5d+1wVRZdHlpGBLAuovjr28LbWvjpWkBHMxpRGGjzNA==",
+      "dependencies": {
+        "glob": "^7.1.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "normalize-package-data": "^2.0.0",
+        "npm-normalize-package-bin": "^1.0.0"
+      }
+    },
+    "node_modules/read-package-tree": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.3.1.tgz",
+      "integrity": "sha512-mLUDsD5JVtlZxjSlPPx1RETkNjjvQYuweKwNVt1Sn8kP5Jh44pvYuUHCp6xSVDZWbNxVxG5lyZJ921aJH61sTw==",
+      "dev": true,
+      "dependencies": {
+        "read-package-json": "^2.0.0",
+        "readdir-scoped-modules": "^1.0.0",
+        "util-promisify": "^2.1.0"
+      }
+    },
+    "node_modules/read-pkg": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
+      "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+      "dev": true,
+      "dependencies": {
+        "load-json-file": "^2.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/read-pkg-up": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+      "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^2.0.0",
+        "read-pkg": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/read-pkg/node_modules/path-type": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
+      "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+      "dev": true,
+      "dependencies": {
+        "pify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/read-pkg/node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/readdir-scoped-modules": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz",
+      "integrity": "sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==",
+      "dev": true,
+      "dependencies": {
+        "debuglog": "^1.0.1",
+        "dezalgo": "^1.0.0",
+        "graceful-fs": "^4.1.2",
+        "once": "^1.3.0"
+      }
+    },
+    "node_modules/readdirp": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
+      "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
+      "dev": true,
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/rechoir": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
+      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
+      "dev": true,
+      "dependencies": {
+        "resolve": "^1.1.6"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/reflect-metadata": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
+      "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==",
+      "dev": true
+    },
+    "node_modules/regenerate": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.1.tgz",
+      "integrity": "sha512-j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A==",
+      "dev": true
+    },
+    "node_modules/regenerate-unicode-properties": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz",
+      "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==",
+      "dev": true,
+      "dependencies": {
+        "regenerate": "^1.4.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/regenerator-runtime": {
+      "version": "0.13.5",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz",
+      "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==",
+      "dev": true
+    },
+    "node_modules/regenerator-transform": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz",
+      "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.8.4"
+      }
+    },
+    "node_modules/regex-not": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^3.0.2",
+        "safe-regex": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/regex-parser": {
+      "version": "2.2.10",
+      "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.10.tgz",
+      "integrity": "sha512-8t6074A68gHfU8Neftl0Le6KTDwfGAj7IyjPIMSfikI2wJUTHDMaIq42bUsfVnj8mhx0R+45rdUXHGpN164avA==",
+      "dev": true
+    },
+    "node_modules/regexp.prototype.flags": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz",
+      "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/regexp.prototype.flags/node_modules/es-abstract": {
+      "version": "1.17.7",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+      "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+      "dev": true,
+      "dependencies": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.2",
+        "is-regex": "^1.1.1",
+        "object-inspect": "^1.8.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.1",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/regexpp": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",
+      "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      }
+    },
+    "node_modules/regexpu-core": {
+      "version": "4.7.1",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz",
+      "integrity": "sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==",
+      "dev": true,
+      "dependencies": {
+        "regenerate": "^1.4.0",
+        "regenerate-unicode-properties": "^8.2.0",
+        "regjsgen": "^0.5.1",
+        "regjsparser": "^0.6.4",
+        "unicode-match-property-ecmascript": "^1.0.4",
+        "unicode-match-property-value-ecmascript": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/regextras": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/regextras/-/regextras-0.7.1.tgz",
+      "integrity": "sha512-9YXf6xtW+qzQ+hcMQXx95MOvfqXFgsKDZodX3qZB0x2n5Z94ioetIITsBtvJbiOyxa/6s9AtyweBLCdPmPko/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.1.14"
+      }
+    },
+    "node_modules/registry-auth-token": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.0.tgz",
+      "integrity": "sha512-P+lWzPrsgfN+UEpDS3U8AQKg/UjZX6mQSJueZj3EK+vNESoqBSpBUD3gmu4sF9lOsjXWjF11dQKUqemf3veq1w==",
+      "dependencies": {
+        "rc": "^1.2.8"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/registry-url": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz",
+      "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==",
+      "dependencies": {
+        "rc": "^1.2.8"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/regjsgen": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz",
+      "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==",
+      "dev": true
+    },
+    "node_modules/regjsparser": {
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz",
+      "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==",
+      "dev": true,
+      "dependencies": {
+        "jsesc": "~0.5.0"
+      },
+      "bin": {
+        "regjsparser": "bin/parser"
+      }
+    },
+    "node_modules/regjsparser/node_modules/jsesc": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+      "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+      "dev": true,
+      "bin": {
+        "jsesc": "bin/jsesc"
+      }
+    },
+    "node_modules/relateurl": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
+      "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/remove-bom-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz",
+      "integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5",
+        "is-utf8": "^0.2.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/remove-bom-stream": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz",
+      "integrity": "sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=",
+      "dev": true,
+      "dependencies": {
+        "remove-bom-buffer": "^3.0.0",
+        "safe-buffer": "^5.1.0",
+        "through2": "^2.0.3"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/remove-trailing-separator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
+      "dev": true
+    },
+    "node_modules/repeat-element": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
+      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/replace-ext": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
+      "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/replace-homedir": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz",
+      "integrity": "sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw=",
+      "dev": true,
+      "dependencies": {
+        "homedir-polyfill": "^1.0.1",
+        "is-absolute": "^1.0.0",
+        "remove-trailing-separator": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/request": {
+      "version": "2.88.2",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
+      "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
+      "dependencies": {
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.8.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.2",
+        "har-validator": "~5.1.3",
+        "http-signature": "~1.2.0",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.19",
+        "oauth-sign": "~0.9.0",
+        "performance-now": "^2.1.0",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.5.0",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^3.3.2"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/request-promise-core": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz",
+      "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^4.17.19"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      },
+      "peerDependencies": {
+        "request": "^2.34"
+      }
+    },
+    "node_modules/request-promise-native": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz",
+      "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==",
+      "deprecated": "request-promise-native has been deprecated because it extends the now deprecated request package, see https://github.com/request/request/issues/3142",
+      "dev": true,
+      "dependencies": {
+        "request-promise-core": "1.1.4",
+        "stealthy-require": "^1.1.1",
+        "tough-cookie": "^2.3.3"
+      },
+      "engines": {
+        "node": ">=0.12.0"
+      },
+      "peerDependencies": {
+        "request": "^2.34"
+      }
+    },
+    "node_modules/request-promise-native/node_modules/tough-cookie": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+      "dev": true,
+      "dependencies": {
+        "psl": "^1.1.28",
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/request/node_modules/qs": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/request/node_modules/tough-cookie": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+      "dependencies": {
+        "psl": "^1.1.28",
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-main-filename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+      "dev": true
+    },
+    "node_modules/requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
+      "dev": true
+    },
+    "node_modules/resolve": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+      "dependencies": {
+        "path-parse": "^1.0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve-cwd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
+      "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
+      "dev": true,
+      "dependencies": {
+        "resolve-from": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/resolve-cwd/node_modules/resolve-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/resolve-dir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
+      "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
+      "dev": true,
+      "dependencies": {
+        "expand-tilde": "^2.0.0",
+        "global-modules": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/resolve-options": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz",
+      "integrity": "sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=",
+      "dev": true,
+      "dependencies": {
+        "value-or-function": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
+      "deprecated": "https://github.com/lydell/resolve-url#deprecated",
+      "dev": true
+    },
+    "node_modules/resolve-url-loader": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-3.1.1.tgz",
+      "integrity": "sha512-K1N5xUjj7v0l2j/3Sgs5b8CjrrgtC70SmdCuZiJ8tSyb5J+uk3FoeZ4b7yTnH6j7ngI+Bc5bldHJIa8hYdu2gQ==",
+      "dev": true,
+      "dependencies": {
+        "adjust-sourcemap-loader": "2.0.0",
+        "camelcase": "5.3.1",
+        "compose-function": "3.0.3",
+        "convert-source-map": "1.7.0",
+        "es6-iterator": "2.0.3",
+        "loader-utils": "1.2.3",
+        "postcss": "7.0.21",
+        "rework": "1.0.1",
+        "rework-visit": "1.0.0",
+        "source-map": "0.6.1"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/resolve-url-loader/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/resolve-url-loader/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/resolve-url-loader/node_modules/chalk/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/resolve-url-loader/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/resolve-url-loader/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/resolve-url-loader/node_modules/emojis-list": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
+      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/resolve-url-loader/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/resolve-url-loader/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/resolve-url-loader/node_modules/loader-utils": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
+      "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^2.0.0",
+        "json5": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/resolve-url-loader/node_modules/postcss": {
+      "version": "7.0.21",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.21.tgz",
+      "integrity": "sha512-uIFtJElxJo29QC753JzhidoAhvp/e/Exezkdhfmt8AymWT6/5B7W1WmponYWkHk2eg6sONyTch0A3nkMPun3SQ==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.2",
+        "source-map": "^0.6.1",
+        "supports-color": "^6.1.0"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/resolve-url-loader/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/resolve-url-loader/node_modules/supports-color": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/responselike": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
+      "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
+      "dependencies": {
+        "lowercase-keys": "^1.0.0"
+      }
+    },
+    "node_modules/restore-cursor": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+      "dependencies": {
+        "onetime": "^2.0.0",
+        "signal-exit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/restore-cursor/node_modules/mimic-fn": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/restore-cursor/node_modules/onetime": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+      "dependencies": {
+        "mimic-fn": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
+    "node_modules/retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "engines": {
+        "iojs": ">=1.0.0",
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/rework": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/rework/-/rework-1.0.1.tgz",
+      "integrity": "sha1-MIBqhBNCtUUQqkEQhQzUhTQUSqc=",
+      "dev": true,
+      "dependencies": {
+        "convert-source-map": "^0.3.3",
+        "css": "^2.0.0"
+      }
+    },
+    "node_modules/rework-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/rework-visit/-/rework-visit-1.0.0.tgz",
+      "integrity": "sha1-mUWygD8hni96ygCtuLyfZA+ELJo=",
+      "dev": true
+    },
+    "node_modules/rework/node_modules/convert-source-map": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz",
+      "integrity": "sha1-8dgClQr33SYxof6+BZZVDIarMZA=",
+      "dev": true
+    },
+    "node_modules/rgb-regex": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz",
+      "integrity": "sha1-wODWiC3w4jviVKR16O3UGRX+rrE=",
+      "dev": true
+    },
+    "node_modules/rgba-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz",
+      "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=",
+      "dev": true
+    },
+    "node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/ripemd160": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "dev": true,
+      "dependencies": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
+    "node_modules/rollup": {
+      "version": "2.10.9",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.10.9.tgz",
+      "integrity": "sha512-dY/EbjiWC17ZCUSyk14hkxATAMAShkMsD43XmZGWjLrgFj15M3Dw2kEkA9ns64BiLFm9PKN6vTQw8neHwK74eg==",
+      "dev": true,
+      "bin": {
+        "rollup": "dist/bin/rollup"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.1.2"
+      }
+    },
+    "node_modules/rsvp": {
+      "version": "4.8.5",
+      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
+      "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
+      "dev": true,
+      "engines": {
+        "node": "6.* || >= 7.*"
+      }
+    },
+    "node_modules/run-async": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
+      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/run-parallel": {
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
+      "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q=="
+    },
+    "node_modules/run-queue": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
+      "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
+      "dev": true,
+      "dependencies": {
+        "aproba": "^1.1.1"
+      }
+    },
+    "node_modules/rxjs": {
+      "version": "6.5.5",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz",
+      "integrity": "sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==",
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/rxjs/node_modules/tslib": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
+      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "node_modules/safe-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+      "dev": true,
+      "dependencies": {
+        "ret": "~0.1.10"
+      }
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "node_modules/sane": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz",
+      "integrity": "sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==",
+      "deprecated": "some dependency vulnerabilities fixed, support for node < 10 dropped, and newer ECMAScript syntax/features added",
+      "dev": true,
+      "dependencies": {
+        "@cnakazawa/watch": "^1.0.3",
+        "anymatch": "^2.0.0",
+        "capture-exit": "^2.0.0",
+        "exec-sh": "^0.3.2",
+        "execa": "^1.0.0",
+        "fb-watchman": "^2.0.0",
+        "micromatch": "^3.1.4",
+        "minimist": "^1.1.1",
+        "walker": "~1.0.5"
+      },
+      "bin": {
+        "sane": "src/cli.js"
+      },
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/sane/node_modules/anymatch": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+      "dev": true,
+      "dependencies": {
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
+      }
+    },
+    "node_modules/sane/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "dev": true,
+      "dependencies": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      },
+      "engines": {
+        "node": ">=4.8"
+      }
+    },
+    "node_modules/sane/node_modules/execa": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^6.0.0",
+        "get-stream": "^4.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/sane/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/get-stream": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "dev": true,
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/sane/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+      "dev": true,
+      "dependencies": {
+        "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/sane/node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/sane/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/sane/node_modules/shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/sass": {
+      "version": "1.26.5",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.26.5.tgz",
+      "integrity": "sha512-FG2swzaZUiX53YzZSjSakzvGtlds0lcbF+URuU9mxOv7WBh7NhXEVDa4kPKN4hN6fC2TkOTOKqiqp6d53N9X5Q==",
+      "dev": true,
+      "dependencies": {
+        "chokidar": ">=2.0.0 <4.0.0"
+      },
+      "bin": {
+        "sass": "sass.js"
+      },
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
+    "node_modules/sass-loader": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.2.tgz",
+      "integrity": "sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==",
+      "dev": true,
+      "dependencies": {
+        "clone-deep": "^4.0.1",
+        "loader-utils": "^1.2.3",
+        "neo-async": "^2.6.1",
+        "schema-utils": "^2.6.1",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">= 8.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "fibers": ">= 3.1.0",
+        "node-sass": "^4.0.0",
+        "sass": "^1.3.0",
+        "webpack": "^4.36.0 || ^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "fibers": {
+          "optional": true
+        },
+        "node-sass": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/sass-loader/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/sass-loader/node_modules/loader-utils": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/sass-loader/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/sax": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz",
+      "integrity": "sha1-dLbTPJrh4AFRDxeakRaFiPGu2qk="
+    },
+    "node_modules/saxes": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
+      "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
+      "dev": true,
+      "dependencies": {
+        "xmlchars": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/schema-utils": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
+      "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.5",
+        "ajv": "^6.12.4",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 8.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/sdp": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/sdp/-/sdp-1.5.4.tgz",
+      "integrity": "sha1-jgOPbdsUvXZa4fS1IW4SCUUR4NA="
+    },
+    "node_modules/select-hose": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
+      "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=",
+      "dev": true
+    },
+    "node_modules/selfsigned": {
+      "version": "1.10.8",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.8.tgz",
+      "integrity": "sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w==",
+      "dev": true,
+      "dependencies": {
+        "node-forge": "^0.10.0"
+      }
+    },
+    "node_modules/semver": {
+      "version": "7.3.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
+      "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/semver-diff": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz",
+      "integrity": "sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==",
+      "dependencies": {
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/semver-diff/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/semver-greatest-satisfied-range": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz",
+      "integrity": "sha1-E+jCZYq5aRywzXEJMkAoDTb3els=",
+      "dev": true,
+      "dependencies": {
+        "sver-compat": "^1.5.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/semver-intersect": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/semver-intersect/-/semver-intersect-1.4.0.tgz",
+      "integrity": "sha512-d8fvGg5ycKAq0+I6nfWeCx6ffaWJCsBYU0H2Rq56+/zFePYfT8mXkB3tWBSjR5BerkHNZ5eTPIk1/LBYas35xQ==",
+      "dev": true,
+      "dependencies": {
+        "semver": "^5.0.0"
+      }
+    },
+    "node_modules/semver-intersect/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/send": {
+      "version": "0.17.1",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
+      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
+      "dependencies": {
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "destroy": "~1.0.4",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "~1.7.2",
+        "mime": "1.6.0",
+        "ms": "2.1.1",
+        "on-finished": "~2.3.0",
+        "range-parser": "~1.2.1",
+        "statuses": "~1.5.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/send/node_modules/ms": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+      "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
+    },
+    "node_modules/serialize-javascript": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
+      "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+      "dev": true,
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "node_modules/serve-index": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
+      "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
+      "dev": true,
+      "dependencies": {
+        "accepts": "~1.3.4",
+        "batch": "0.6.1",
+        "debug": "2.6.9",
+        "escape-html": "~1.0.3",
+        "http-errors": "~1.6.2",
+        "mime-types": "~2.1.17",
+        "parseurl": "~1.3.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/serve-index/node_modules/http-errors": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+      "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+      "dev": true,
+      "dependencies": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.0",
+        "statuses": ">= 1.4.0 < 2"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/serve-index/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "dev": true
+    },
+    "node_modules/serve-index/node_modules/setprototypeof": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+      "dev": true
+    },
+    "node_modules/serve-static": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
+      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
+      "dependencies": {
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.3",
+        "send": "0.17.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+      "devOptional": true
+    },
+    "node_modules/set-immediate-shim": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
+      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/set-value": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-extendable": "^0.1.1",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/set-value/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
+      "dev": true
+    },
+    "node_modules/setprototypeof": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
+      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
+    },
+    "node_modules/sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      },
+      "bin": {
+        "sha.js": "bin.js"
+      }
+    },
+    "node_modules/shallow-clone": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shellwords": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
+      "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel/node_modules/object-inspect": {
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz",
+      "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
+      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
+    },
+    "node_modules/simctl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/simctl/-/simctl-2.0.0.tgz",
+      "integrity": "sha512-5rB7rN4N3b0z0nFdy9eczVssXqrv2aAgdVRksPVqVoiDtvXmfzNvebp3EMdId2sAUzXIflarQlx4P0hjVQEzKQ==",
+      "dependencies": {
+        "shelljs": "^0.2.6",
+        "tail": "^0.4.0"
+      }
+    },
+    "node_modules/simctl/node_modules/shelljs": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz",
+      "integrity": "sha1-kEktcv/MgVmXa6umL7D2iE8MM3g=",
+      "bin": {
+        "shjs": "bin/shjs"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/simple-concat": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
+      "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "optional": true
+    },
+    "node_modules/simple-get": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz",
+      "integrity": "sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==",
+      "optional": true,
+      "dependencies": {
+        "decompress-response": "^4.2.0",
+        "once": "^1.3.1",
+        "simple-concat": "^1.0.0"
+      }
+    },
+    "node_modules/simple-get/node_modules/decompress-response": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
+      "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
+      "optional": true,
+      "dependencies": {
+        "mimic-response": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/simple-get/node_modules/mimic-response": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
+      "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
+      "optional": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/simple-plist": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/simple-plist/-/simple-plist-1.1.1.tgz",
+      "integrity": "sha512-pKMCVKvZbZTsqYR6RKgLfBHkh2cV89GXcA/0CVPje3sOiNOnXA8+rp/ciAMZ7JRaUdLzlEM6JFfUn+fS6Nt3hg==",
+      "dependencies": {
+        "bplist-creator": "0.0.8",
+        "bplist-parser": "0.2.0",
+        "plist": "^3.0.1"
+      }
+    },
+    "node_modules/simple-swizzle": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
+      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
+      "dev": true,
+      "dependencies": {
+        "is-arrayish": "^0.3.1"
+      }
+    },
+    "node_modules/simple-swizzle/node_modules/is-arrayish": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
+      "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
+      "dev": true
+    },
+    "node_modules/sisteransi": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
+      "dev": true
+    },
+    "node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/slice-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      }
+    },
+    "node_modules/slice-ansi/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/smart-buffer": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.1.0.tgz",
+      "integrity": "sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/snapdragon": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "dev": true,
+      "dependencies": {
+        "base": "^0.11.1",
+        "debug": "^2.2.0",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "map-cache": "^0.2.2",
+        "source-map": "^0.5.6",
+        "source-map-resolve": "^0.5.0",
+        "use": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "dev": true,
+      "dependencies": {
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.0",
+        "snapdragon-util": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node/node_modules/is-accessor-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node/node_modules/is-data-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node/node_modules/is-descriptor": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.0",
+        "is-data-descriptor": "^1.0.0",
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-util": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-util/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sockjs": {
+      "version": "0.3.20",
+      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.20.tgz",
+      "integrity": "sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA==",
+      "dev": true,
+      "dependencies": {
+        "faye-websocket": "^0.10.0",
+        "uuid": "^3.4.0",
+        "websocket-driver": "0.6.5"
+      }
+    },
+    "node_modules/sockjs-client": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz",
+      "integrity": "sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.5",
+        "eventsource": "^1.0.7",
+        "faye-websocket": "~0.11.1",
+        "inherits": "^2.0.3",
+        "json3": "^3.3.2",
+        "url-parse": "^1.4.3"
+      }
+    },
+    "node_modules/sockjs-client/node_modules/debug": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/sockjs-client/node_modules/faye-websocket": {
+      "version": "0.11.3",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz",
+      "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==",
+      "dev": true,
+      "dependencies": {
+        "websocket-driver": ">=0.5.1"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/sockjs-client/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/socks": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.3.3.tgz",
+      "integrity": "sha512-o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA==",
+      "dev": true,
+      "dependencies": {
+        "ip": "1.1.5",
+        "smart-buffer": "^4.1.0"
+      },
+      "engines": {
+        "node": ">= 6.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks-proxy-agent": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz",
+      "integrity": "sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "~4.2.1",
+        "socks": "~2.3.2"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/socks-proxy-agent/node_modules/agent-base": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz",
+      "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==",
+      "dev": true,
+      "dependencies": {
+        "es6-promisify": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/sort-keys": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
+      "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
+      "dev": true,
+      "dependencies": {
+        "is-plain-obj": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-list-map": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
+      "dev": true
+    },
+    "node_modules/source-map": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/source-map-loader": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-1.0.0.tgz",
+      "integrity": "sha512-ZayyQCSCrQazN50aCvuS84lJT4xc1ZAcykH5blHaBdVveSwjiFK8UGMPvao0ho54DTb0Jf7m57uRRG/YYUZ2Fg==",
+      "dev": true,
+      "dependencies": {
+        "data-urls": "^2.0.0",
+        "iconv-lite": "^0.5.1",
+        "loader-utils": "^2.0.0",
+        "schema-utils": "^2.6.6",
+        "source-map": "^0.6.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/source-map-loader/node_modules/iconv-lite": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.2.tgz",
+      "integrity": "sha512-kERHXvpSaB4aU3eANwidg79K8FlrN77m8G9V+0vOR3HYaRifrlwMEpT7ZBJqLSEIHnEgJTHcWK82wwLwwKwtag==",
+      "dev": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-loader/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-resolve": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+      "dev": true,
+      "dependencies": {
+        "atob": "^2.1.2",
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
+      }
+    },
+    "node_modules/source-map-support": {
+      "version": "0.5.19",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
+      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+      "dev": true,
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/source-map-support/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-url": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
+      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
+      "dev": true
+    },
+    "node_modules/sourcemap-codec": {
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
+      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
+      "dev": true
+    },
+    "node_modules/sparkles": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
+      "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/spdx-correct": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
+      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+      "dependencies": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-exceptions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="
+    },
+    "node_modules/spdx-expression-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "dependencies": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-license-ids": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz",
+      "integrity": "sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw=="
+    },
+    "node_modules/spdy": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
+      "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.0",
+        "handle-thing": "^2.0.0",
+        "http-deceiver": "^1.2.7",
+        "select-hose": "^2.0.0",
+        "spdy-transport": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/spdy-transport": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
+      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.0",
+        "detect-node": "^2.0.4",
+        "hpack.js": "^2.1.6",
+        "obuf": "^1.1.2",
+        "readable-stream": "^3.0.6",
+        "wbuf": "^1.7.3"
+      }
+    },
+    "node_modules/spdy-transport/node_modules/debug": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+      "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/spdy-transport/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/spdy-transport/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/spdy/node_modules/debug": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+      "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/spdy/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/speed-measure-webpack-plugin": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.3.tgz",
+      "integrity": "sha512-2ljD4Ch/rz2zG3HsLsnPfp23osuPBS0qPuz9sGpkNXTN1Ic4M+W9xB8l8rS8ob2cO4b1L+WTJw/0AJwWYVgcxQ==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      },
+      "peerDependencies": {
+        "webpack": "^1 || ^2 || ^3 || ^4"
+      }
+    },
+    "node_modules/speed-measure-webpack-plugin/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/speed-measure-webpack-plugin/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/speed-measure-webpack-plugin/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/speed-measure-webpack-plugin/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/speed-measure-webpack-plugin/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/speed-measure-webpack-plugin/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/split-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/split2": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
+      "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "^3.0.0"
+      }
+    },
+    "node_modules/split2/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "dev": true
+    },
+    "node_modules/ssh-config": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/ssh-config/-/ssh-config-1.1.6.tgz",
+      "integrity": "sha512-ZPO9rECxzs5JIQ6G/2EfL1I9ho/BVZkx9HRKn8+0af7QgwAmumQ7XBFP1ggMyPMo+/tUbmv0HFdv4qifdO/9JA==",
+      "dev": true
+    },
+    "node_modules/sshpk": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
+      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
+      "dependencies": {
+        "asn1": "~0.2.3",
+        "assert-plus": "^1.0.0",
+        "bcrypt-pbkdf": "^1.0.0",
+        "dashdash": "^1.12.0",
+        "ecc-jsbn": "~0.1.1",
+        "getpass": "^0.1.1",
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.0.2",
+        "tweetnacl": "~0.14.0"
+      },
+      "bin": {
+        "sshpk-conv": "bin/sshpk-conv",
+        "sshpk-sign": "bin/sshpk-sign",
+        "sshpk-verify": "bin/sshpk-verify"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ssri": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.0.tgz",
+      "integrity": "sha512-aq/pz989nxVYwn16Tsbj1TqFpD5LLrQxHf5zaHuieFV+R0Bbr4y8qUsOA45hXT/N4/9UNXTarBjnjVmjSOVaAA==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.1.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/stable": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
+      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
+      "dev": true
+    },
+    "node_modules/stack-trace": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
+      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/stack-utils": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.2.tgz",
+      "integrity": "sha512-0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg==",
+      "dev": true,
+      "dependencies": {
+        "escape-string-regexp": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/stack-utils/node_modules/escape-string-regexp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/static-extend": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+      "dev": true,
+      "dependencies": {
+        "define-property": "^0.2.5",
+        "object-copy": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-extend/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/stealthy-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
+      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/stream-browserify": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
+      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "~2.0.1",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "node_modules/stream-buffers": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz",
+      "integrity": "sha1-kdX1Ew0c75bc+n9yaUUYh0HQnuQ=",
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/stream-combiner2": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz",
+      "integrity": "sha1-+02KFCDqNidk4hrUeAOXvry0HL4=",
+      "dev": true,
+      "dependencies": {
+        "duplexer2": "~0.1.0",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "node_modules/stream-each": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
+      "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
+      "dev": true,
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "node_modules/stream-exhaust": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
+      "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==",
+      "dev": true
+    },
+    "node_modules/stream-http": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
+      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+      "dev": true,
+      "dependencies": {
+        "builtin-status-codes": "^3.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.3.6",
+        "to-arraybuffer": "^1.0.0",
+        "xtend": "^4.0.0"
+      }
+    },
+    "node_modules/stream-shift": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
+      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
+      "dev": true
+    },
+    "node_modules/strict-uri-encode": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
+      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/string-length": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.1.tgz",
+      "integrity": "sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw==",
+      "dev": true,
+      "dependencies": {
+        "char-regex": "^1.0.2",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/string-length/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-length/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "dependencies": {
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/string-width/node_modules/strip-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+      "dependencies": {
+        "ansi-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/string.prototype.codepointat": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz",
+      "integrity": "sha512-2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg=="
+    },
+    "node_modules/string.prototype.trimend": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
+      "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimend/node_modules/es-abstract": {
+      "version": "1.17.7",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+      "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+      "dev": true,
+      "dependencies": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.2",
+        "is-regex": "^1.1.1",
+        "object-inspect": "^1.8.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.1",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
+      "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart/node_modules/es-abstract": {
+      "version": "1.17.7",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+      "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+      "dev": true,
+      "dependencies": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.2",
+        "is-regex": "^1.1.1",
+        "object-inspect": "^1.8.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.1",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/stringify-package": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/stringify-package/-/stringify-package-1.0.1.tgz",
+      "integrity": "sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg=="
+    },
+    "node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "dependencies": {
+        "ansi-regex": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/strip-ansi/node_modules/ansi-regex": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/strip-final-newline": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/style-loader": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.2.1.tgz",
+      "integrity": "sha512-ByHSTQvHLkWE9Ir5+lGbVOXhxX10fbprhLvdg96wedFZb4NDekDPxVKv5Fwmio+QcMlkkNfuK+5W1peQ5CUhZg==",
+      "dev": true,
+      "dependencies": {
+        "loader-utils": "^2.0.0",
+        "schema-utils": "^2.6.6"
+      },
+      "engines": {
+        "node": ">= 8.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/stylehacks": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz",
+      "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-selector-parser": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/stylehacks/node_modules/postcss-selector-parser": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
+      "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
+      "dev": true,
+      "dependencies": {
+        "dot-prop": "^5.2.0",
+        "indexes-of": "^1.0.1",
+        "uniq": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/stylus": {
+      "version": "0.54.7",
+      "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.7.tgz",
+      "integrity": "sha512-Yw3WMTzVwevT6ZTrLCYNHAFmanMxdylelL3hkWNgPMeTCpMwpV3nXjpOHuBXtFv7aiO2xRuQS6OoAdgkNcSNug==",
+      "dev": true,
+      "dependencies": {
+        "css-parse": "~2.0.0",
+        "debug": "~3.1.0",
+        "glob": "^7.1.3",
+        "mkdirp": "~0.5.x",
+        "safer-buffer": "^2.1.2",
+        "sax": "~1.2.4",
+        "semver": "^6.0.0",
+        "source-map": "^0.7.3"
+      },
+      "bin": {
+        "stylus": "bin/stylus"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/stylus-loader": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz",
+      "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==",
+      "dev": true,
+      "dependencies": {
+        "loader-utils": "^1.0.2",
+        "lodash.clonedeep": "^4.5.0",
+        "when": "~3.6.x"
+      },
+      "peerDependencies": {
+        "stylus": ">=0.52.4"
+      }
+    },
+    "node_modules/stylus-loader/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/stylus-loader/node_modules/loader-utils": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/stylus/node_modules/debug": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/stylus/node_modules/sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+      "dev": true
+    },
+    "node_modules/stylus/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/superagent": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/superagent/-/superagent-5.3.1.tgz",
+      "integrity": "sha512-wjJ/MoTid2/RuGCOFtlacyGNxN9QLMgcpYLDQlWFIhhdJ93kNscFonGvrpAHSCVjRVj++DGCglocF7Aej1KHvQ==",
+      "dev": true,
+      "dependencies": {
+        "component-emitter": "^1.3.0",
+        "cookiejar": "^2.1.2",
+        "debug": "^4.1.1",
+        "fast-safe-stringify": "^2.0.7",
+        "form-data": "^3.0.0",
+        "formidable": "^1.2.2",
+        "methods": "^1.1.2",
+        "mime": "^2.4.6",
+        "qs": "^6.9.4",
+        "readable-stream": "^3.6.0",
+        "semver": "^7.3.2"
+      },
+      "engines": {
+        "node": ">= 7.0.0"
+      }
+    },
+    "node_modules/superagent-proxy": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/superagent-proxy/-/superagent-proxy-2.1.0.tgz",
+      "integrity": "sha512-DnarpKN6Xn8e3pYlFV4Yvsj9yxLY4q5FIsUe5JvN7vjzP+YCfzXv03dTkZSD2yzrSadsNYHf0IgOUJwKjX457A==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.1.0",
+        "proxy-agent": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "peerDependencies": {
+        "superagent": ">= 0.15.4 || 1 || 2 || 3"
+      }
+    },
+    "node_modules/superagent-proxy/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/superagent-proxy/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true
+    },
+    "node_modules/superagent/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/superagent/node_modules/form-data": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
+      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+      "dev": true,
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/superagent/node_modules/mime": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
+      "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
+      "dev": true,
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/superagent/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/superagent/node_modules/qs": {
+      "version": "6.10.1",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz",
+      "integrity": "sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==",
+      "dev": true,
+      "dependencies": {
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/superagent/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-hyperlinks": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz",
+      "integrity": "sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/sver-compat": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz",
+      "integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=",
+      "dev": true,
+      "dependencies": {
+        "es6-iterator": "^2.0.1",
+        "es6-symbol": "^3.1.1"
+      }
+    },
+    "node_modules/svgo": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
+      "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "coa": "^2.0.2",
+        "css-select": "^2.0.0",
+        "css-select-base-adapter": "^0.1.1",
+        "css-tree": "1.0.0-alpha.37",
+        "csso": "^4.0.2",
+        "js-yaml": "^3.13.1",
+        "mkdirp": "~0.5.1",
+        "object.values": "^1.1.0",
+        "sax": "~1.2.4",
+        "stable": "^0.1.8",
+        "unquote": "~1.1.1",
+        "util.promisify": "~1.0.0"
+      },
+      "bin": {
+        "svgo": "bin/svgo"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/svgo/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/svgo/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/svgo/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/svgo/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/svgo/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/svgo/node_modules/sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+      "dev": true
+    },
+    "node_modules/svgo/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/symbol-observable": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
+      "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/symbol-tree": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
+      "dev": true
+    },
+    "node_modules/systeminformation": {
+      "version": "4.27.7",
+      "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-4.27.7.tgz",
+      "integrity": "sha512-3ozUwGSf5jmrhGgOXlX/O6hk1KQ28XPb7d3NiPZX267QmimuDq3TuIgnkw+vICUrGJGKWPLKmXVASnuJ3w07nw==",
+      "os": [
+        "darwin",
+        "linux",
+        "win32",
+        "freebsd",
+        "openbsd",
+        "netbsd",
+        "sunos"
+      ],
+      "bin": {
+        "systeminformation": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      },
+      "funding": {
+        "type": "Buy me a coffee",
+        "url": "https://www.buymeacoffee.com/systeminfo"
+      }
+    },
+    "node_modules/table": {
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.6.0.tgz",
+      "integrity": "sha512-iZMtp5tUvcnAdtHpZTWLPF0M7AgiQsURR2DwmxnJwSy8I3+cY+ozzVvYha3BOLG2TB+L0CqjIz+91htuj6yCXg==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^8.0.1",
+        "lodash.clonedeep": "^4.5.0",
+        "lodash.flatten": "^4.4.0",
+        "lodash.truncate": "^4.4.2",
+        "slice-ansi": "^4.0.0",
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/table/node_modules/ajv": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.2.0.tgz",
+      "integrity": "sha512-WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/table/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/table/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/table/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/table/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
+    },
+    "node_modules/table/node_modules/string-width": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/table/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/tail": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/tail/-/tail-0.4.0.tgz",
+      "integrity": "sha1-0p3nJ1DMmdseBTr/E8NZ7PtxMAI=",
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/tapable": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
+      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tar": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.0.5.tgz",
+      "integrity": "sha512-0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg==",
+      "dev": true,
+      "dependencies": {
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "minipass": "^3.0.0",
+        "minizlib": "^2.1.1",
+        "mkdirp": "^1.0.3",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/tar-fs": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
+      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+      "optional": true,
+      "dependencies": {
+        "chownr": "^1.1.1",
+        "mkdirp-classic": "^0.5.2",
+        "pump": "^3.0.0",
+        "tar-stream": "^2.1.4"
+      }
+    },
+    "node_modules/tar-fs/node_modules/chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "optional": true
+    },
+    "node_modules/tar-stream": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.4.tgz",
+      "integrity": "sha512-o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw==",
+      "optional": true,
+      "dependencies": {
+        "bl": "^4.0.3",
+        "end-of-stream": "^1.4.1",
+        "fs-constants": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tar-stream/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "optional": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/tar/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "dev": true,
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/term-size": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.0.tgz",
+      "integrity": "sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw==",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/terminal-link": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
+      "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-escapes": "^4.2.1",
+        "supports-hyperlinks": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/terminal-link/node_modules/ansi-escapes": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
+      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.11.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/terminal-link/node_modules/type-fest": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
+      "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/terser": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.7.0.tgz",
+      "integrity": "sha512-Lfb0RiZcjRDXCC3OSHJpEkxJ9Qeqs6mp2v4jf2MHfy8vGERmVDuvjXdd/EnP5Deme5F2yBRBymKmKHCBg2echw==",
+      "dev": true,
+      "dependencies": {
+        "commander": "^2.20.0",
+        "source-map": "~0.6.1",
+        "source-map-support": "~0.5.12"
+      },
+      "bin": {
+        "terser": "bin/terser"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/terser-webpack-plugin": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-3.0.1.tgz",
+      "integrity": "sha512-eFDtq8qPUEa9hXcUzTwKXTnugIVtlqc1Z/ZVhG8LmRT3lgRY13+pQTnFLY2N7ATB6TKCHuW/IGjoAnZz9wOIqw==",
+      "dev": true,
+      "dependencies": {
+        "cacache": "^15.0.3",
+        "find-cache-dir": "^3.3.1",
+        "jest-worker": "^26.0.0",
+        "p-limit": "^2.3.0",
+        "schema-utils": "^2.6.6",
+        "serialize-javascript": "^3.0.0",
+        "source-map": "^0.6.1",
+        "terser": "^4.6.13",
+        "webpack-sources": "^1.4.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/serialize-javascript": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz",
+      "integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==",
+      "dev": true,
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/terser/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/test-exclude": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+      "dev": true,
+      "dependencies": {
+        "@istanbuljs/schema": "^0.1.2",
+        "glob": "^7.1.4",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "dev": true
+    },
+    "node_modules/throat": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz",
+      "integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==",
+      "dev": true
+    },
+    "node_modules/through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
+    },
+    "node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/through2-filter": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
+      "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
+      "dev": true,
+      "dependencies": {
+        "through2": "~2.0.0",
+        "xtend": "~4.0.0"
+      }
+    },
+    "node_modules/thunky": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
+      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
+      "dev": true
+    },
+    "node_modules/time-stamp": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
+      "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/timers-browserify": {
+      "version": "2.0.11",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
+      "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
+      "dev": true,
+      "dependencies": {
+        "setimmediate": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+    "node_modules/timsort": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
+      "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
+      "dev": true
+    },
+    "node_modules/tmp": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
+      "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
+      "dependencies": {
+        "rimraf": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8.17.0"
+      }
+    },
+    "node_modules/tmpl": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
+      "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=",
+      "dev": true
+    },
+    "node_modules/to-absolute-glob": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
+      "integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=",
+      "dev": true,
+      "dependencies": {
+        "is-absolute": "^1.0.0",
+        "is-negated-glob": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-arraybuffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
+      "dev": true
+    },
+    "node_modules/to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/to-object-path": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-object-path/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-readable-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz",
+      "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/to-regex": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+      "dev": true,
+      "dependencies": {
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/to-through": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz",
+      "integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=",
+      "dev": true,
+      "dependencies": {
+        "through2": "^2.0.3"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/toidentifier": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
+      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/tough-cookie": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
+      "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
+      "dependencies": {
+        "ip-regex": "^2.1.0",
+        "psl": "^1.1.28",
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.0.2.tgz",
+      "integrity": "sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/tree-kill": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
+      "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
+      "dev": true,
+      "bin": {
+        "tree-kill": "cli.js"
+      }
+    },
+    "node_modules/ts-jest": {
+      "version": "26.4.1",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-26.4.1.tgz",
+      "integrity": "sha512-F4aFq01aS6mnAAa0DljNmKr/Kk9y4HVZ1m6/rtJ0ED56cuxINGq3Q9eVAh+z5vcYKe5qnTMvv90vE8vUMFxomg==",
+      "dev": true,
+      "dependencies": {
+        "@types/jest": "26.x",
+        "bs-logger": "0.x",
+        "buffer-from": "1.x",
+        "fast-json-stable-stringify": "2.x",
+        "jest-util": "^26.1.0",
+        "json5": "2.x",
+        "lodash.memoize": "4.x",
+        "make-error": "1.x",
+        "mkdirp": "1.x",
+        "semver": "7.x",
+        "yargs-parser": "20.x"
+      },
+      "bin": {
+        "ts-jest": "cli.js"
+      },
+      "engines": {
+        "node": ">= 10"
+      },
+      "peerDependencies": {
+        "jest": ">=26 <27",
+        "typescript": ">=3.8 <5.0"
+      }
+    },
+    "node_modules/ts-jest/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "dev": true,
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ts-jest/node_modules/yargs-parser": {
+      "version": "20.2.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.1.tgz",
+      "integrity": "sha512-yYsjuSkjbLMBp16eaOt7/siKTjNVjMm3SoJnIg3sEh/JsvqVVDyjRKmaJV4cl+lNIgq6QEco2i3gDebJl7/vLA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ts-md5": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/ts-md5/-/ts-md5-1.2.7.tgz",
+      "integrity": "sha512-emODogvKGWi1KO1l9c6YxLMBn6CEH3VrH5mVPIyOtxBG52BvV4jP3GWz6bOZCz61nLgBc3ffQYE4+EHfCD+V7w=="
+    },
+    "node_modules/ts-node": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.3.0.tgz",
+      "integrity": "sha512-dyNS/RqyVTDcmNM4NIBAeDMpsAdaQ+ojdf0GOLqE6nwJOgzEkdRNzJywhDfwnuvB10oa6NLVG1rUJQCpRN7qoQ==",
+      "dev": true,
+      "dependencies": {
+        "arg": "^4.1.0",
+        "diff": "^4.0.1",
+        "make-error": "^1.1.1",
+        "source-map-support": "^0.5.6",
+        "yn": "^3.0.0"
+      },
+      "bin": {
+        "ts-node": "dist/bin.js"
+      },
+      "engines": {
+        "node": ">=4.2.0"
+      },
+      "peerDependencies": {
+        "typescript": ">=2.0"
+      }
+    },
+    "node_modules/ts-pnp": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.2.0.tgz",
+      "integrity": "sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/tsconfig-paths": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz",
+      "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==",
+      "dev": true,
+      "dependencies": {
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.1",
+        "minimist": "^1.2.0",
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "node_modules/tsconfig-paths/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/tsconfig-paths/node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/tslib": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz",
+      "integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ=="
+    },
+    "node_modules/tsutils": {
+      "version": "3.17.1",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.17.1.tgz",
+      "integrity": "sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.8.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      },
+      "peerDependencies": {
+        "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
+      }
+    },
+    "node_modules/tsutils/node_modules/tslib": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
+      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
+      "dev": true
+    },
+    "node_modules/tty-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
+      "dev": true
+    },
+    "node_modules/tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "dependencies": {
+        "safe-buffer": "^5.0.1"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
+    },
+    "node_modules/type": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
+      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
+      "dev": true
+    },
+    "node_modules/type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/type-is": {
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "dependencies": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+      "dev": true
+    },
+    "node_modules/typedarray-to-buffer": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+      "dependencies": {
+        "is-typedarray": "^1.0.0"
+      }
+    },
+    "node_modules/typescript": {
+      "version": "3.9.9",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.9.tgz",
+      "integrity": "sha512-kdMjTiekY+z/ubJCATUPlRDl39vXYiMV9iyeMuEuXZh2we6zz80uovNN2WlAxmmdE/Z/YQe+EbOEXB5RHEED3w==",
+      "dev": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=4.2.0"
+      }
+    },
+    "node_modules/uglify-js": {
+      "version": "3.4.10",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz",
+      "integrity": "sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==",
+      "dev": true,
+      "dependencies": {
+        "commander": "~2.19.0",
+        "source-map": "~0.6.1"
+      },
+      "bin": {
+        "uglifyjs": "bin/uglifyjs"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/uglify-js/node_modules/commander": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
+      "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
+      "dev": true
+    },
+    "node_modules/uglify-js/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unbox-primitive": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
+      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has-bigints": "^1.0.1",
+        "has-symbols": "^1.0.2",
+        "which-boxed-primitive": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/unbox-primitive/node_modules/has-symbols": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/unc-path-regex": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
+      "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/underscore": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.11.0.tgz",
+      "integrity": "sha512-xY96SsN3NA461qIRKZ/+qox37YXPtSBswMGfiNptr+wrt6ds4HaMw23TP612fEyGekRE6LNRiLYr/aqbHXNedw=="
+    },
+    "node_modules/undertaker": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.3.0.tgz",
+      "integrity": "sha512-/RXwi5m/Mu3H6IHQGww3GNt1PNXlbeCuclF2QYR14L/2CHPz3DFZkvB5hZ0N/QUkiXWCACML2jXViIQEQc2MLg==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.0.1",
+        "arr-map": "^2.0.0",
+        "bach": "^1.0.0",
+        "collection-map": "^1.0.0",
+        "es6-weak-map": "^2.0.1",
+        "fast-levenshtein": "^1.0.0",
+        "last-run": "^1.1.0",
+        "object.defaults": "^1.0.0",
+        "object.reduce": "^1.0.0",
+        "undertaker-registry": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/undertaker-registry": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz",
+      "integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/undertaker/node_modules/fast-levenshtein": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz",
+      "integrity": "sha1-5qdUzI8V5YmHqpy9J69m/W9OWvk=",
+      "dev": true
+    },
+    "node_modules/unicode-canonical-property-names-ecmascript": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
+      "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unicode-match-property-ecmascript": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz",
+      "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==",
+      "dev": true,
+      "dependencies": {
+        "unicode-canonical-property-names-ecmascript": "^1.0.4",
+        "unicode-property-aliases-ecmascript": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unicode-match-property-value-ecmascript": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz",
+      "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unicode-property-aliases-ecmascript": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz",
+      "integrity": "sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/union-value": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+      "dev": true,
+      "dependencies": {
+        "arr-union": "^3.1.0",
+        "get-value": "^2.0.6",
+        "is-extendable": "^0.1.1",
+        "set-value": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/uniq": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
+      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
+      "dev": true
+    },
+    "node_modules/uniqs": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz",
+      "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=",
+      "dev": true
+    },
+    "node_modules/unique-filename": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
+      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
+      "dev": true,
+      "dependencies": {
+        "unique-slug": "^2.0.0"
+      }
+    },
+    "node_modules/unique-slug": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
+      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
+      "dev": true,
+      "dependencies": {
+        "imurmurhash": "^0.1.4"
+      }
+    },
+    "node_modules/unique-stream": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
+      "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
+      "dev": true,
+      "dependencies": {
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "through2-filter": "^3.0.0"
+      }
+    },
+    "node_modules/unique-string": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
+      "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
+      "dependencies": {
+        "crypto-random-string": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/universal-analytics": {
+      "version": "0.4.20",
+      "resolved": "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.4.20.tgz",
+      "integrity": "sha512-gE91dtMvNkjO+kWsPstHRtSwHXz0l2axqptGYp5ceg4MsuurloM0PU3pdOfpb5zBXUvyjT4PwhWK2m39uczZuw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.0.0",
+        "request": "^2.88.0",
+        "uuid": "^3.0.0"
+      }
+    },
+    "node_modules/universal-analytics/node_modules/debug": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/universal-analytics/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/universalify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/unorm": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.6.0.tgz",
+      "integrity": "sha512-b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA==",
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/unquote": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
+      "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
+      "dev": true
+    },
+    "node_modules/unset-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+      "dev": true,
+      "dependencies": {
+        "has-value": "^0.3.1",
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/has-value": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+      "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+      "dev": true,
+      "dependencies": {
+        "get-value": "^2.0.3",
+        "has-values": "^0.1.4",
+        "isobject": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+      "dev": true,
+      "dependencies": {
+        "isarray": "1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/has-values": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+      "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/untildify": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
+      "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/upath": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
+      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
+      "dev": true,
+      "engines": {
+        "node": ">=4",
+        "yarn": "*"
+      }
+    },
+    "node_modules/update-notifier": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.3.tgz",
+      "integrity": "sha512-Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A==",
+      "dependencies": {
+        "boxen": "^4.2.0",
+        "chalk": "^3.0.0",
+        "configstore": "^5.0.1",
+        "has-yarn": "^2.1.0",
+        "import-lazy": "^2.1.0",
+        "is-ci": "^2.0.0",
+        "is-installed-globally": "^0.3.1",
+        "is-npm": "^4.0.0",
+        "is-yarn-global": "^0.3.0",
+        "latest-version": "^5.0.0",
+        "pupa": "^2.0.1",
+        "semver-diff": "^3.1.1",
+        "xdg-basedir": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/yeoman/update-notifier?sponsor=1"
+      }
+    },
+    "node_modules/upper-case": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
+      "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=",
+      "dev": true
+    },
+    "node_modules/uri-js": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz",
+      "integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==",
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
+      "deprecated": "Please see https://github.com/lydell/urix#deprecated",
+      "dev": true
+    },
+    "node_modules/url": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+      "dev": true,
+      "dependencies": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      }
+    },
+    "node_modules/url-parse": {
+      "version": "1.4.7",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
+      "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
+      "dev": true,
+      "dependencies": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
+    "node_modules/url-parse-lax": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
+      "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
+      "dependencies": {
+        "prepend-http": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/url/node_modules/punycode": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+      "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+      "dev": true
+    },
+    "node_modules/use": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/util": {
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+      "dev": true,
+      "dependencies": {
+        "inherits": "2.0.1"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+    },
+    "node_modules/util-promisify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/util-promisify/-/util-promisify-2.1.0.tgz",
+      "integrity": "sha1-PCI2R2xNMsX/PEcAKt18E7moKlM=",
+      "dev": true,
+      "dependencies": {
+        "object.getownpropertydescriptors": "^2.0.3"
+      }
+    },
+    "node_modules/util.promisify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
+      "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.2",
+        "has-symbols": "^1.0.1",
+        "object.getownpropertydescriptors": "^2.1.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/util.promisify/node_modules/es-abstract": {
+      "version": "1.17.7",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+      "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+      "dev": true,
+      "dependencies": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.2",
+        "is-regex": "^1.1.1",
+        "object-inspect": "^1.8.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.1",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/util/node_modules/inherits": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+      "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+      "dev": true
+    },
+    "node_modules/utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/uuid": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "bin": {
+        "uuid": "bin/uuid"
+      }
+    },
+    "node_modules/v8-compile-cache": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+      "dev": true
+    },
+    "node_modules/v8-to-istanbul": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-5.0.1.tgz",
+      "integrity": "sha512-mbDNjuDajqYe3TXFk5qxcQy8L1msXNE37WTlLoqqpBfRsimbNcrlhQlDPntmECEcUvdC+AQ8CyMMf6EUx1r74Q==",
+      "dev": true,
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.1",
+        "convert-source-map": "^1.6.0",
+        "source-map": "^0.7.3"
+      },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/v8flags": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
+      "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==",
+      "dev": true,
+      "dependencies": {
+        "homedir-polyfill": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/valid-identifier": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/valid-identifier/-/valid-identifier-0.0.2.tgz",
+      "integrity": "sha512-zaSmOW6ykXwrkX0YTuFUSoALNEKGaQHpxBJQLb3TXspRNDpBwbfrIQCZqAQ0LKBlKuyn2YOq7NNd6415hvZ33g=="
+    },
+    "node_modules/validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dependencies": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "node_modules/validate-npm-package-name": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz",
+      "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=",
+      "dependencies": {
+        "builtins": "^1.0.3"
+      }
+    },
+    "node_modules/value-or-function": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz",
+      "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/vendors": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz",
+      "integrity": "sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "engines": [
+        "node >=0.6.0"
+      ],
+      "dependencies": {
+        "assert-plus": "^1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "^1.2.0"
+      }
+    },
+    "node_modules/vinyl": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
+      "integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==",
+      "dev": true,
+      "dependencies": {
+        "clone": "^2.1.1",
+        "clone-buffer": "^1.0.0",
+        "clone-stats": "^1.0.0",
+        "cloneable-readable": "^1.0.0",
+        "remove-trailing-separator": "^1.0.1",
+        "replace-ext": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/vinyl-fs": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz",
+      "integrity": "sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==",
+      "dev": true,
+      "dependencies": {
+        "fs-mkdirp-stream": "^1.0.0",
+        "glob-stream": "^6.1.0",
+        "graceful-fs": "^4.0.0",
+        "is-valid-glob": "^1.0.0",
+        "lazystream": "^1.0.0",
+        "lead": "^1.0.0",
+        "object.assign": "^4.0.4",
+        "pumpify": "^1.3.5",
+        "readable-stream": "^2.3.3",
+        "remove-bom-buffer": "^3.0.0",
+        "remove-bom-stream": "^1.2.0",
+        "resolve-options": "^1.1.0",
+        "through2": "^2.0.0",
+        "to-through": "^2.0.0",
+        "value-or-function": "^3.0.0",
+        "vinyl": "^2.0.0",
+        "vinyl-sourcemap": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/vinyl-sourcemap": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz",
+      "integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=",
+      "dev": true,
+      "dependencies": {
+        "append-buffer": "^1.0.2",
+        "convert-source-map": "^1.5.0",
+        "graceful-fs": "^4.1.6",
+        "normalize-path": "^2.1.1",
+        "now-and-later": "^2.0.0",
+        "remove-bom-buffer": "^3.0.0",
+        "vinyl": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/vinyl-sourcemap/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+      "dev": true,
+      "dependencies": {
+        "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/vm-browserify": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
+      "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
+      "dev": true
+    },
+    "node_modules/w3c-hr-time": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
+      "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
+      "dev": true,
+      "dependencies": {
+        "browser-process-hrtime": "^1.0.0"
+      }
+    },
+    "node_modules/w3c-xmlserializer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
+      "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
+      "dev": true,
+      "dependencies": {
+        "xml-name-validator": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/walker": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
+      "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
+      "dev": true,
+      "dependencies": {
+        "makeerror": "1.0.x"
+      }
+    },
+    "node_modules/watchpack": {
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.4.tgz",
+      "integrity": "sha512-aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "neo-async": "^2.5.0"
+      },
+      "optionalDependencies": {
+        "chokidar": "^3.4.1",
+        "watchpack-chokidar2": "^2.0.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz",
+      "integrity": "sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "chokidar": "^2.1.8"
+      },
+      "engines": {
+        "node": "<8.10.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/anymatch": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/anymatch/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/binary-extensions": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/chokidar": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+      "deprecated": "Chokidar 2 will break on node v14+. Upgrade to chokidar 3 with 15x less dependencies.",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "anymatch": "^2.0.0",
+        "async-each": "^1.0.1",
+        "braces": "^2.3.2",
+        "glob-parent": "^3.1.0",
+        "inherits": "^2.0.3",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "normalize-path": "^3.0.0",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.2.1",
+        "upath": "^1.1.1"
+      },
+      "optionalDependencies": {
+        "fsevents": "^1.2.7"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/fsevents": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+      "deprecated": "fsevents 1 will break on node v14+ and could be using insecure binaries. Upgrade to fsevents 2.",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "dependencies": {
+        "bindings": "^1.5.0",
+        "nan": "^2.12.1"
+      },
+      "engines": {
+        "node": ">= 4.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/glob-parent": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/glob-parent/node_modules/is-glob": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "is-extglob": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/is-binary-path": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "binary-extensions": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/readdirp": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.11",
+        "micromatch": "^3.1.10",
+        "readable-stream": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/wbuf": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
+      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
+      "dev": true,
+      "dependencies": {
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "node_modules/wcwidth": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
+      "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=",
+      "dev": true,
+      "dependencies": {
+        "defaults": "^1.0.3"
+      }
+    },
+    "node_modules/webidl-conversions": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
+      "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.4"
+      }
+    },
+    "node_modules/webpack": {
+      "version": "4.43.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.43.0.tgz",
+      "integrity": "sha512-GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-module-context": "1.9.0",
+        "@webassemblyjs/wasm-edit": "1.9.0",
+        "@webassemblyjs/wasm-parser": "1.9.0",
+        "acorn": "^6.4.1",
+        "ajv": "^6.10.2",
+        "ajv-keywords": "^3.4.1",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^4.1.0",
+        "eslint-scope": "^4.0.3",
+        "json-parse-better-errors": "^1.0.2",
+        "loader-runner": "^2.4.0",
+        "loader-utils": "^1.2.3",
+        "memory-fs": "^0.4.1",
+        "micromatch": "^3.1.10",
+        "mkdirp": "^0.5.3",
+        "neo-async": "^2.6.1",
+        "node-libs-browser": "^2.2.1",
+        "schema-utils": "^1.0.0",
+        "tapable": "^1.1.3",
+        "terser-webpack-plugin": "^1.4.3",
+        "watchpack": "^1.6.1",
+        "webpack-sources": "^1.4.1"
+      },
+      "bin": {
+        "webpack": "bin/webpack.js"
+      },
+      "engines": {
+        "node": ">=6.11.5"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/webpack-dev-middleware": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz",
+      "integrity": "sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==",
+      "dev": true,
+      "dependencies": {
+        "memory-fs": "^0.4.1",
+        "mime": "^2.4.4",
+        "mkdirp": "^0.5.1",
+        "range-parser": "^1.2.1",
+        "webpack-log": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 6"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0"
+      }
+    },
+    "node_modules/webpack-dev-middleware/node_modules/memory-fs": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+      "dev": true,
+      "dependencies": {
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
+      }
+    },
+    "node_modules/webpack-dev-middleware/node_modules/mime": {
+      "version": "2.4.6",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
+      "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==",
+      "dev": true,
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/webpack-dev-server": {
+      "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz",
+      "integrity": "sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-html": "0.0.7",
+        "bonjour": "^3.5.0",
+        "chokidar": "^2.1.8",
+        "compression": "^1.7.4",
+        "connect-history-api-fallback": "^1.6.0",
+        "debug": "^4.1.1",
+        "del": "^4.1.1",
+        "express": "^4.17.1",
+        "html-entities": "^1.3.1",
+        "http-proxy-middleware": "0.19.1",
+        "import-local": "^2.0.0",
+        "internal-ip": "^4.3.0",
+        "ip": "^1.1.5",
+        "is-absolute-url": "^3.0.3",
+        "killable": "^1.0.1",
+        "loglevel": "^1.6.8",
+        "opn": "^5.5.0",
+        "p-retry": "^3.0.1",
+        "portfinder": "^1.0.26",
+        "schema-utils": "^1.0.0",
+        "selfsigned": "^1.10.7",
+        "semver": "^6.3.0",
+        "serve-index": "^1.9.1",
+        "sockjs": "0.3.20",
+        "sockjs-client": "1.4.0",
+        "spdy": "^4.0.2",
+        "strip-ansi": "^3.0.1",
+        "supports-color": "^6.1.0",
+        "url": "^0.11.0",
+        "webpack-dev-middleware": "^3.7.2",
+        "webpack-log": "^2.0.0",
+        "ws": "^6.2.1",
+        "yargs": "^13.3.2"
+      },
+      "bin": {
+        "webpack-dev-server": "bin/webpack-dev-server.js"
+      },
+      "engines": {
+        "node": ">= 6.11.5"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "webpack-cli": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/anymatch": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+      "dev": true,
+      "dependencies": {
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/anymatch/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+      "dev": true,
+      "dependencies": {
+        "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/binary-extensions": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/chokidar": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+      "deprecated": "Chokidar 2 will break on node v14+. Upgrade to chokidar 3 with 15x less dependencies.",
+      "dev": true,
+      "dependencies": {
+        "anymatch": "^2.0.0",
+        "async-each": "^1.0.1",
+        "braces": "^2.3.2",
+        "glob-parent": "^3.1.0",
+        "inherits": "^2.0.3",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "normalize-path": "^3.0.0",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.2.1",
+        "upath": "^1.1.1"
+      },
+      "optionalDependencies": {
+        "fsevents": "^1.2.7"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/debug": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+      "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/fsevents": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+      "deprecated": "fsevents 1 will break on node v14+ and could be using insecure binaries. Upgrade to fsevents 2.",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "dependencies": {
+        "bindings": "^1.5.0",
+        "nan": "^2.12.1"
+      },
+      "engines": {
+        "node": ">= 4.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/glob-parent": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/glob-parent/node_modules/is-glob": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/is-absolute-url": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz",
+      "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/is-binary-path": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+      "dev": true,
+      "dependencies": {
+        "binary-extensions": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/webpack-dev-server/node_modules/readdirp": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.11",
+        "micromatch": "^3.1.10",
+        "readable-stream": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/schema-utils": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.1.0",
+        "ajv-errors": "^1.0.0",
+        "ajv-keywords": "^3.1.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/supports-color": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-log": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
+      "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "^3.0.0",
+        "uuid": "^3.3.2"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/webpack-merge": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
+      "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^4.17.15"
+      }
+    },
+    "node_modules/webpack-sources": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+      "dev": true,
+      "dependencies": {
+        "source-list-map": "^2.0.0",
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/webpack-sources/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-subresource-integrity": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.4.1.tgz",
+      "integrity": "sha512-XMLFInbGbB1HV7K4vHWANzc1CN0t/c4bBvnlvGxGwV45yE/S/feAXIm8dJsCkzqWtSKnmaEgTp/meyeThxG4Iw==",
+      "dev": true,
+      "dependencies": {
+        "webpack-sources": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "html-webpack-plugin": "^2.21.0 || ~3 || >=4.0.0-alpha.2 <5",
+        "webpack": "^1.12.11 || ~2 || ~3 || ~4"
+      },
+      "peerDependenciesMeta": {
+        "html-webpack-plugin": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack/node_modules/cacache": {
+      "version": "12.0.4",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
+      "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
+      "dev": true,
+      "dependencies": {
+        "bluebird": "^3.5.5",
+        "chownr": "^1.1.1",
+        "figgy-pudding": "^3.5.1",
+        "glob": "^7.1.4",
+        "graceful-fs": "^4.1.15",
+        "infer-owner": "^1.0.3",
+        "lru-cache": "^5.1.1",
+        "mississippi": "^3.0.0",
+        "mkdirp": "^0.5.1",
+        "move-concurrently": "^1.0.1",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^2.6.3",
+        "ssri": "^6.0.1",
+        "unique-filename": "^1.1.1",
+        "y18n": "^4.0.0"
+      }
+    },
+    "node_modules/webpack/node_modules/chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "dev": true
+    },
+    "node_modules/webpack/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack/node_modules/find-cache-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
+      "dev": true,
+      "dependencies": {
+        "commondir": "^1.0.1",
+        "make-dir": "^2.0.0",
+        "pkg-dir": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/webpack/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack/node_modules/is-wsl": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/webpack/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/webpack/node_modules/loader-utils": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/webpack/node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/webpack/node_modules/make-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+      "dev": true,
+      "dependencies": {
+        "pify": "^4.0.1",
+        "semver": "^5.6.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/webpack/node_modules/memory-fs": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+      "dev": true,
+      "dependencies": {
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
+      }
+    },
+    "node_modules/webpack/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack/node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/webpack/node_modules/schema-utils": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.1.0",
+        "ajv-errors": "^1.0.0",
+        "ajv-keywords": "^3.1.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/webpack/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/webpack/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack/node_modules/ssri": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+      "dev": true,
+      "dependencies": {
+        "figgy-pudding": "^3.5.1"
+      }
+    },
+    "node_modules/webpack/node_modules/terser-webpack-plugin": {
+      "version": "1.4.5",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz",
+      "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==",
+      "dev": true,
+      "dependencies": {
+        "cacache": "^12.0.2",
+        "find-cache-dir": "^2.1.0",
+        "is-wsl": "^1.1.0",
+        "schema-utils": "^1.0.0",
+        "serialize-javascript": "^4.0.0",
+        "source-map": "^0.6.1",
+        "terser": "^4.1.2",
+        "webpack-sources": "^1.4.0",
+        "worker-farm": "^1.7.0"
+      },
+      "engines": {
+        "node": ">= 6.9.0"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0"
+      }
+    },
+    "node_modules/webpack/node_modules/to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack/node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true
+    },
+    "node_modules/webrtc-adapter": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/webrtc-adapter/-/webrtc-adapter-3.4.3.tgz",
+      "integrity": "sha1-tjYGLu6abvFYrNDYUBtnhDS1bxY=",
+      "dependencies": {
+        "sdp": "^1.5.0"
+      },
+      "engines": {
+        "node": ">=6.0.0",
+        "npm": ">=3.10.0"
+      }
+    },
+    "node_modules/websocket-driver": {
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz",
+      "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=",
+      "dev": true,
+      "dependencies": {
+        "websocket-extensions": ">=0.1.1"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+    "node_modules/websocket-extensions": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
+      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/whatwg-encoding": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
+      "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
+      "dev": true,
+      "dependencies": {
+        "iconv-lite": "0.4.24"
+      }
+    },
+    "node_modules/whatwg-mimetype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
+      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
+      "dev": true
+    },
+    "node_modules/whatwg-url": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.3.0.tgz",
+      "integrity": "sha512-BQRf/ej5Rp3+n7k0grQXZj9a1cHtsp4lqj01p59xBWFKdezR8sO37XnpafwNqiFac/v2Il12EIMjX/Y4VZtT8Q==",
+      "dev": true,
+      "dependencies": {
+        "lodash.sortby": "^4.7.0",
+        "tr46": "^2.0.2",
+        "webidl-conversions": "^6.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/when": {
+      "version": "3.6.4",
+      "resolved": "https://registry.npmjs.org/when/-/when-3.6.4.tgz",
+      "integrity": "sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=",
+      "dev": true
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "dev": true,
+      "dependencies": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+      "dev": true
+    },
+    "node_modules/which-pm-runs": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz",
+      "integrity": "sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=",
+      "optional": true
+    },
+    "node_modules/wide-align": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+      "optional": true,
+      "dependencies": {
+        "string-width": "^1.0.2 || 2"
+      }
+    },
+    "node_modules/widest-line": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
+      "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==",
+      "dependencies": {
+        "string-width": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/widest-line/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/widest-line/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
+    "node_modules/widest-line/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/widest-line/node_modules/string-width": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/widest-line/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/windows-release": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-3.3.3.tgz",
+      "integrity": "sha512-OSOGH1QYiW5yVor9TtmXKQvt2vjQqbYS+DqmsZw+r7xDwLXEeT3JGW0ZppFmHx4diyXmxt238KFR3N9jzevBRg==",
+      "dependencies": {
+        "execa": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/windows-release/node_modules/cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "dependencies": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      },
+      "engines": {
+        "node": ">=4.8"
+      }
+    },
+    "node_modules/windows-release/node_modules/execa": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+      "dependencies": {
+        "cross-spawn": "^6.0.0",
+        "get-stream": "^4.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/windows-release/node_modules/get-stream": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/windows-release/node_modules/is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/windows-release/node_modules/npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "dependencies": {
+        "path-key": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/windows-release/node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/windows-release/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/windows-release/node_modules/shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dependencies": {
+        "shebang-regex": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/windows-release/node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/windows-release/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/with-open-file": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/with-open-file/-/with-open-file-0.1.7.tgz",
+      "integrity": "sha512-ecJS2/oHtESJ1t3ZfMI3B7KIDKyfN0O16miWxdn30zdh66Yd3LsRFebXZXq6GU4xfxLf6nVxp9kIqElb5fqczA==",
+      "dependencies": {
+        "p-finally": "^1.0.0",
+        "p-try": "^2.1.0",
+        "pify": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/worker-farm": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
+      "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
+      "dev": true,
+      "dependencies": {
+        "errno": "~0.1.7"
+      }
+    },
+    "node_modules/worker-plugin": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/worker-plugin/-/worker-plugin-4.0.3.tgz",
+      "integrity": "sha512-7hFDYWiKcE3yHZvemsoM9lZis/PzurHAEX1ej8PLCu818Rt6QqUAiDdxHPCKZctzmhqzPpcFSgvMCiPbtooqAg==",
+      "dev": true,
+      "dependencies": {
+        "loader-utils": "^1.1.0"
+      },
+      "peerDependencies": {
+        "webpack": ">= 4"
+      }
+    },
+    "node_modules/worker-plugin/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/worker-plugin/node_modules/loader-utils": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/wrap-ansi": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.0",
+        "string-width": "^3.0.0",
+        "strip-ansi": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/wrap-ansi/node_modules/string-width": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^7.0.1",
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+    },
+    "node_modules/write": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
+      "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
+      "dev": true,
+      "dependencies": {
+        "mkdirp": "^0.5.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/write-file-atomic": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
+      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+      "dependencies": {
+        "imurmurhash": "^0.1.4",
+        "is-typedarray": "^1.0.0",
+        "signal-exit": "^3.0.2",
+        "typedarray-to-buffer": "^3.1.5"
+      }
+    },
+    "node_modules/ws": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
+      "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
+      "dev": true,
+      "dependencies": {
+        "async-limiter": "~1.0.0"
+      }
+    },
+    "node_modules/xcode": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/xcode/-/xcode-2.1.0.tgz",
+      "integrity": "sha512-uCrmPITrqTEzhn0TtT57fJaNaw8YJs1aCzs+P/QqxsDbvPZSv7XMPPwXrKvHtD6pLjBM/NaVwraWJm8q83Y4iQ==",
+      "dependencies": {
+        "simple-plist": "^1.0.0",
+        "uuid": "^3.3.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/xdg-basedir": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
+      "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/xml-escape": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/xml-escape/-/xml-escape-1.1.0.tgz",
+      "integrity": "sha1-OQTBQ/qOs6ADDsZG0pAqLxtwbEQ="
+    },
+    "node_modules/xml-name-validator": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
+      "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
+      "dev": true
+    },
+    "node_modules/xmlbuilder": {
+      "version": "9.0.7",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
+      "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/xmlchars": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
+      "dev": true
+    },
+    "node_modules/xmldom": {
+      "version": "0.1.31",
+      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.31.tgz",
+      "integrity": "sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==",
+      "deprecated": "Deprecated due to CVE-2021-21366 resolved in 0.5.0",
+      "engines": {
+        "node": ">=0.1"
+      }
+    },
+    "node_modules/xregexp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz",
+      "integrity": "sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
+    "node_modules/y18n": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+      "dev": true
+    },
+    "node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
+    "node_modules/yargs": {
+      "version": "13.3.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+      "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^5.0.0",
+        "find-up": "^3.0.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^3.0.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^13.1.2"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "13.1.2",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      }
+    },
+    "node_modules/yargs/node_modules/find-up": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/yargs/node_modules/locate-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/yargs/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/yargs/node_modules/p-locate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/yargs/node_modules/string-width": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^7.0.1",
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
+      "dev": true,
+      "dependencies": {
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.1.0"
+      }
+    },
+    "node_modules/yn": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
+      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/zone.js": {
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.10.3.tgz",
+      "integrity": "sha512-LXVLVEq0NNOqK/fLJo3d0kfzd4sxwn2/h67/02pjCjfKDxgx1i9QqpvtHD8CrBnSSwMw5+dy11O7FRX5mkO7Cg=="
+    }
+  },
   "dependencies": {
     "@angular-devkit/architect": {
       "version": "0.1101.2",
@@ -309,7 +30832,8 @@
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-4.2.0.tgz",
       "integrity": "sha512-qM4hpweuQ14ul8CU6LKpUWFZs6POUE7HZKdTllUrYuoZMrTpNB1XGelR0pweYzbfo4XRnUaO1NVgWhWOWiD5MA==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "@angular-eslint/eslint-plugin": {
       "version": "4.2.0",
@@ -761,7 +31285,6 @@
       "version": "10.0.14",
       "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-10.0.14.tgz",
       "integrity": "sha512-lYNo6/MmnYAVFoDQDBB6HMFd9zHg3RHXc6hn+wchU0XSWiIsg6WYHbKOb/DyqUEyKebzy0gSKZf7gUeZHtj62Q==",
-      "dev": true,
       "requires": {
         "tslib": "^2.0.0"
       }
@@ -2284,7 +32807,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/badge/-/badge-5.33.0.tgz",
       "integrity": "sha512-g/E2HLB53csZq5hWeyWUFj6r7CrllSPuOkV88XotIFTQFNuY7TaLtiFUVFSvWXRh0Kvu+w7TI5Hys67d/v7F/g==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2299,7 +32822,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/camera/-/camera-5.33.0.tgz",
       "integrity": "sha512-cLAxM4e8IrTECvlszyUe9FnUjE4PbWR99NNDwkOuB85yJ3diyKxiQhHu89Qh9A6qzHTJQLa93iknY2Q40VM/5Q==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2314,7 +32837,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/chooser/-/chooser-5.33.0.tgz",
       "integrity": "sha512-hz2OtB8UsJpKdXZByDzGS6+U1FK8toIjKmIVCDQAuOXxjbw9dU2Ef+MSUKXOpK6MYnP56oP80JdSX9LDEFJnRA==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2329,7 +32852,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/clipboard/-/clipboard-5.33.0.tgz",
       "integrity": "sha512-HFZN4tsAjFJ9Se9ik0/IOUvApL4zNPEKQAtUsjqP7vCnTsdrgS+FDMln1UDEKXCQ/dEEwU1N1ndFmPBGxjkGzQ==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2344,7 +32867,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/core/-/core-5.33.0.tgz",
       "integrity": "sha512-dnZHu7SadvQvliGJPndk2ohdoPvwiyBWJjsJw33BKyhadnmLlmkYKkRgPPI+i22BZofDKq4YiAfIIqhvfHU6gw==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2359,7 +32882,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/device/-/device-5.33.0.tgz",
       "integrity": "sha512-KYQvVsN98bGTEomI193Jf9r1vaXBFJQXuhkhwBI6lajynAlf2SIVJwthNUXnK43kNXy1cOelYxScUuKyPwqudw==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2374,7 +32897,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/diagnostic/-/diagnostic-5.33.0.tgz",
       "integrity": "sha512-zBDv/yNMvUkXfxy17rgrGVU3+XKREXRI7cqy/DyvpjdomOnmx2pnFvhszgMEgeD03LkXXKiFOR5yUAVNgYirmg==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2389,7 +32912,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/file/-/file-5.33.0.tgz",
       "integrity": "sha512-RisSGJl2t8JrBgw30Vn5hJYYKEDTHR9f3KbQDfe1MQg+VrZo7vnbml/vk4l55u65c1TYZDH+F6i7s9nyif1QVQ==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2404,7 +32927,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/file-opener/-/file-opener-5.33.0.tgz",
       "integrity": "sha512-v7t1ndalAPYT9gvMAhxAup8tg1NPV415cfG6tzs1foPFP91UZC3MQny0tup8AgFivugT1GRdoSk1NMuK1jy8Cw==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2419,7 +32942,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/file-transfer/-/file-transfer-5.33.0.tgz",
       "integrity": "sha512-xDUpdJVgTBP6aEiU08iZ/pa9aMoGSMB9391dQKk+VSDs0hdbIwk+Cx4V40GIE4QF3TI06sUMdKXD2sIhVsr2QA==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2434,7 +32957,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/geolocation/-/geolocation-5.33.0.tgz",
       "integrity": "sha512-oE6pi6l8/Wsv94vpJmPlPqE1LheP6cQTJrC78WYQp9WVDOOCGZnFznNoH8BlQfnfjuDx/kUARxzEJBO/gbUg1A==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2449,7 +32972,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/http/-/http-5.33.0.tgz",
       "integrity": "sha512-dqcPu3igSLlfDUK8Mvma/6o6aq7WtKBlcR8xXwE8tVsO/r4fEB6NevLLN4S4zCr381Jy+RxIIjn3CZx5XHF6JQ==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2464,7 +32987,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/in-app-browser/-/in-app-browser-5.33.0.tgz",
       "integrity": "sha512-GGIvnYHf8FgaIae9yfRzxqxj0ZAxrYhOJpsHVSq1YKjxnDpRe6ImWWaHHfaeXE5IdUUMUXVuf75VTSBN00VBvA==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2479,7 +33002,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/ionic-webview/-/ionic-webview-5.33.0.tgz",
       "integrity": "sha512-Jbr4M6z/Fya51F+QXuPLm/crFlZ9T6YvRM1cygGmFwZ7SgDAimYnjgSO8SEGJmvO2ZekYmFuF56qiVPSvx2wUA==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2494,7 +33017,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/keyboard/-/keyboard-5.33.0.tgz",
       "integrity": "sha512-TIYU3LC+Yz/pcpBuHcxLThMNuN9y1E1wBu4SlmS6VlO3/D3R3At2WOg2UK3iA66G2kTJubed5haqTYZjeoA6Uw==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2509,7 +33032,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/local-notifications/-/local-notifications-5.33.0.tgz",
       "integrity": "sha512-ljn2uq0rFWpjG1I1qK+mPVX8T3T+09fsF8sZ9nK7uvD9YWShCVz2e2ctf8qPRFq+TWDeDqlnwXz3wCvWmbBUWw==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2524,7 +33047,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/media/-/media-5.33.0.tgz",
       "integrity": "sha512-nUu7/FSH41j9+BqHXYVMBd3EifNsTNOufD3NEiMVpHVDWLWqG7tG5h5cFlsVACxUaP4kNpSEke2mjom6CKyjxQ==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2539,7 +33062,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/media-capture/-/media-capture-5.33.0.tgz",
       "integrity": "sha512-aQTnonVSeijpuZ9B7oYJCjIDqgFVhNdvqkx9vUoaO359BtJGpGS1rNPjEovt4DsqV7oe7TkbmBd8DMEwnB3A2g==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2554,7 +33077,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/network/-/network-5.33.0.tgz",
       "integrity": "sha512-J+3+rbDTMVNUspa/nV+P8a0hFKDicJK1rVIrm5aLBQdmN9n7WaqJmeMYTptyWOnZxQpktJAJDdhJTEvVmKQjjw==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2569,7 +33092,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/push/-/push-5.33.0.tgz",
       "integrity": "sha512-H4gOkMbOaNvi97cKKJDggWvAR1BVCUbtdLyWInA0q3cZBHWSc6KcRJGz+hcdDndCQJUnHofs1Tpw8LN3zhjYyQ==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2584,7 +33107,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/qr-scanner/-/qr-scanner-5.33.0.tgz",
       "integrity": "sha512-cyiQv0Rje/fN9/JYoDXP1+ILJkRkjvPtoSx4vd2FsKAuJB60U2DpQfmVEE/KMF4iceTpx4MK/kGzr2WE2AYnIg==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2599,7 +33122,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-5.33.0.tgz",
       "integrity": "sha512-6PHk5WJeUoc3zru6wTvUmd9DCASvRQoQq1dysYI3JCECaAJ6X0x1RbzM8dBFs3JPLfWtDn+P8eTp+KaA0Xf58w==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2614,7 +33137,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/sqlite/-/sqlite-5.33.0.tgz",
       "integrity": "sha512-JIdQJr6bcksotF/3ZMJQZo9lHgaHXvHOOK9R30mM/5Ds5fFu+rUoUf0wvyqaGzEFu94pGw2uPGnfD+WI7x7+1A==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2629,7 +33152,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/status-bar/-/status-bar-5.33.0.tgz",
       "integrity": "sha512-cnyfd42N9gGfhyDtF7wbWoacKg/jfsoJQHOHltfhS4/EjxsVu4bjkwq1YBLMcMY3OIqFDSn2aFcejHn8wVNkDQ==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2644,7 +33167,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/web-intent/-/web-intent-5.33.0.tgz",
       "integrity": "sha512-3CIAofrg9nkJQbSftFdMKYOduXy9Ra/a1Q0it6ysm9NFeAQn7iZPThSexBeZ9xiKKj/QTPZtnqAJ0MQ+4mkGag==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2659,7 +33182,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/zip/-/zip-5.33.0.tgz",
       "integrity": "sha512-hErISQ6/xqVErmVnnha5BR+3GWRNQIVfMTXzprEpNZxQl3iDe1UTIVQdFnMd3Nasz/naY+61Vq/y91PZ1Rrajw==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2709,7 +33232,8 @@
           "version": "7.3.1",
           "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz",
           "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==",
-          "dev": true
+          "dev": true,
+          "requires": {}
         }
       }
     },
@@ -4742,16 +35266,6 @@
       "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==",
       "dev": true
     },
-    "JSONStream": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
-      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
-      "dev": true,
-      "requires": {
-        "jsonparse": "^1.2.0",
-        "through": ">=2.2.7 <3"
-      }
-    },
     "abab": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
@@ -4800,7 +35314,8 @@
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
       "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "acorn-walk": {
       "version": "7.2.0",
@@ -4898,13 +35413,15 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
       "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "ajv-keywords": {
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
       "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "alphanum-sort": {
       "version": "1.0.2",
@@ -5037,7 +35554,8 @@
     "aproba": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+      "devOptional": true
     },
     "archy": {
       "version": "1.0.0",
@@ -7165,7 +37683,8 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-5.2.0.tgz",
       "integrity": "sha512-7p4Kn/gffhQaavNfyDFg7LS5S/UT1JAjyGd4UqR2+jzoYF02eDkj0Ec3+48TsIa4zghjLY87nQHIh/ecK9qLdw==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "class-utils": {
       "version": "0.3.6",
@@ -7387,7 +37906,8 @@
     "code-point-at": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+      "devOptional": true
     },
     "collect-v8-coverage": {
       "version": "1.0.1",
@@ -9798,7 +40318,8 @@
       "version": "8.3.0",
       "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz",
       "integrity": "sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "eslint-import-resolver-node": {
       "version": "0.3.4",
@@ -9874,7 +40395,8 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/eslint-plugin-header/-/eslint-plugin-header-3.1.1.tgz",
       "integrity": "sha512-9vlKxuJ4qf793CmeeSrZUvVClw6amtpghq3CuWcB5cUNnWHQhgcqy5eF8oVKFk1G3Y/CbchGfEaw3wiIJaNmVg==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "eslint-plugin-import": {
       "version": "2.22.1",
@@ -9969,13 +40491,15 @@
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/eslint-plugin-prefer-arrow/-/eslint-plugin-prefer-arrow-1.2.3.tgz",
       "integrity": "sha512-J9I5PKCOJretVuiZRGvPQxCbllxGAV/viI20JO3LYblAodofBxyMnZAJ+WGeClHgANnSJberTNoFWWjrWKBuXQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "eslint-plugin-promise": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-5.1.0.tgz",
       "integrity": "sha512-NGmI6BH5L12pl7ScQHbg7tvtk4wPxxj8yPHH47NvSmMtFneC077PSeY3huFj06ZWZvtbfxSPt3RuOQD5XcR4ng==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "eslint-scope": {
       "version": "4.0.3",
@@ -12498,7 +43022,8 @@
     "ieee754": {
       "version": "1.1.13",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
-      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
+      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
+      "devOptional": true
     },
     "iferr": {
       "version": "0.1.5",
@@ -13881,7 +44406,8 @@
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
       "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "jest-preset-angular": {
       "version": "8.3.1",
@@ -14486,7 +45012,8 @@
           "version": "7.3.1",
           "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz",
           "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==",
-          "dev": true
+          "dev": true,
+          "requires": {}
         }
       }
     },
@@ -14569,6 +45096,16 @@
       "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
       "dev": true
     },
+    "JSONStream": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
+      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
+      "dev": true,
+      "requires": {
+        "jsonparse": "^1.2.0",
+        "through": ">=2.2.7 <3"
+      }
+    },
     "jsprim": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
@@ -16250,9 +46787,9 @@
       "integrity": "sha512-cny9v0+Mq6Tjz+e0erFAB+RYJ/AVGzkjnISiobqP8OWj9c9FLoZZu8/SPSKJWE17F1tk4018wfjV+ZbIbqC7fQ==",
       "dev": true,
       "requires": {
-        "JSONStream": "^1.3.4",
         "bluebird": "^3.5.1",
         "figgy-pudding": "^3.4.1",
+        "JSONStream": "^1.3.4",
         "lru-cache": "^5.1.1",
         "make-fetch-happen": "^5.0.0",
         "npm-package-arg": "^6.1.0",
@@ -16344,7 +46881,8 @@
     "number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+      "devOptional": true
     },
     "nwsapi": {
       "version": "2.2.0",
@@ -16360,7 +46898,8 @@
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "devOptional": true
     },
     "object-copy": {
       "version": "0.1.0",
@@ -19967,7 +50506,8 @@
     "set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+      "devOptional": true
     },
     "set-immediate-shim": {
       "version": "1.0.1",
@@ -20841,6 +51381,14 @@
       "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
       "dev": true
     },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
     "string-length": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.1.tgz",
@@ -20954,14 +51502,6 @@
         }
       }
     },
-    "string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "requires": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
     "stringify-package": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/stringify-package/-/stringify-package-1.0.1.tgz",

From bfb949c9590c49b6fbfc6cb17ece3c1948d6e37f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 26 Jul 2021 15:11:13 +0200
Subject: [PATCH 0020/1008] MOBILE-3792 config: Update cordova-fetch and
 dependencies

---
 package-lock.json | 1176 +++++++++++++++++++++++++++++++++++++--------
 package.json      |    1 -
 2 files changed, 964 insertions(+), 213 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 61c66dc13..3748913af 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -100,7 +100,6 @@
         "zone.js": "~0.10.3"
       },
       "devDependencies": {
-        "@angular-devkit/architect": "~0.1101.2",
         "@angular-devkit/build-angular": "~0.1000.8",
         "@angular-eslint/builder": "^4.2.0",
         "@angular-eslint/eslint-plugin": "^4.2.0",
@@ -157,6 +156,7 @@
       "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1101.2.tgz",
       "integrity": "sha512-MLmBfHiiyPhbFSSAX4oMecPjEuBauOui5uBpI6BKNnk/7783fznbkbAKjXlOco7M81gkNeEoHMR8c+mOfcvv7g==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "@angular-devkit/core": "11.1.2",
         "rxjs": "6.6.3"
@@ -172,6 +172,7 @@
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
       "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "tslib": "^1.9.0"
       },
@@ -183,7 +184,8 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
+      "dev": true,
+      "peer": true
     },
     "node_modules/@angular-devkit/build-angular": {
       "version": "0.1000.8",
@@ -448,6 +450,7 @@
       "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.1.2.tgz",
       "integrity": "sha512-V7zOMqL2l56JcwXVyswkG+7+t67r9XtkrVzRcG2Z5ZYwafU+iKWMwg5kBFZr1SX7fM1M9E4MpskxqtagQeUKng==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "ajv": "6.12.6",
         "fast-json-stable-stringify": "2.1.0",
@@ -466,6 +469,7 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -482,6 +486,7 @@
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
       "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "tslib": "^1.9.0"
       },
@@ -493,7 +498,8 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
+      "dev": true,
+      "peer": true
     },
     "node_modules/@angular-devkit/schematics": {
       "version": "10.0.8",
@@ -5166,11 +5172,117 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@npmcli/git": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-2.1.0.tgz",
+      "integrity": "sha512-/hBFX/QG1b+N7PZBFs0bi+evgRZcK9nWBxQKZkGoXUT5hJSwl5c4d7y8/hm+NQZRPhQ67RzFaj5UM9YeyKoryw==",
+      "dependencies": {
+        "@npmcli/promise-spawn": "^1.3.2",
+        "lru-cache": "^6.0.0",
+        "mkdirp": "^1.0.4",
+        "npm-pick-manifest": "^6.1.1",
+        "promise-inflight": "^1.0.1",
+        "promise-retry": "^2.0.1",
+        "semver": "^7.3.5",
+        "which": "^2.0.2"
+      }
+    },
+    "node_modules/@npmcli/git/node_modules/err-code": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
+      "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="
+    },
+    "node_modules/@npmcli/git/node_modules/hosted-git-info": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
+      "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@npmcli/git/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@npmcli/git/node_modules/npm-package-arg": {
+      "version": "8.1.5",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.5.tgz",
+      "integrity": "sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==",
+      "dependencies": {
+        "hosted-git-info": "^4.0.1",
+        "semver": "^7.3.4",
+        "validate-npm-package-name": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@npmcli/git/node_modules/npm-pick-manifest": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-6.1.1.tgz",
+      "integrity": "sha512-dBsdBtORT84S8V8UTad1WlUyKIY9iMsAmqxHbLdeEeBNMLQDlDWWra3wYUx9EBEIiG/YwAy0XyNHDd2goAsfuA==",
+      "dependencies": {
+        "npm-install-checks": "^4.0.0",
+        "npm-normalize-package-bin": "^1.0.1",
+        "npm-package-arg": "^8.1.2",
+        "semver": "^7.3.4"
+      }
+    },
+    "node_modules/@npmcli/git/node_modules/promise-retry": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
+      "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
+      "dependencies": {
+        "err-code": "^2.0.2",
+        "retry": "^0.12.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@npmcli/git/node_modules/semver": {
+      "version": "7.3.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@npmcli/installed-package-contents": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-1.0.7.tgz",
+      "integrity": "sha512-9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw==",
+      "dependencies": {
+        "npm-bundled": "^1.1.1",
+        "npm-normalize-package-bin": "^1.0.1"
+      },
+      "bin": {
+        "installed-package-contents": "index.js"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
     "node_modules/@npmcli/move-file": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.0.1.tgz",
       "integrity": "sha512-Uv6h1sT+0DrblvIrolFtbvM1FgWm+/sy4B3pvLp67Zys+thcukzS5ekn7HsZFGpWP4Q3fYJCljbWQE/XivMRLw==",
-      "dev": true,
       "dependencies": {
         "mkdirp": "^1.0.4"
       },
@@ -5182,7 +5294,6 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
       "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "dev": true,
       "bin": {
         "mkdirp": "bin/cmd.js"
       },
@@ -5190,6 +5301,31 @@
         "node": ">=10"
       }
     },
+    "node_modules/@npmcli/node-gyp": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-1.0.2.tgz",
+      "integrity": "sha512-yrJUe6reVMpktcvagumoqD9r08fH1iRo01gn1u0zoCApa9lnZGEigVKUd2hzsCId4gdtkZZIVscLhNxMECKgRg=="
+    },
+    "node_modules/@npmcli/promise-spawn": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-1.3.2.tgz",
+      "integrity": "sha512-QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg==",
+      "dependencies": {
+        "infer-owner": "^1.0.4"
+      }
+    },
+    "node_modules/@npmcli/run-script": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.8.5.tgz",
+      "integrity": "sha512-NQspusBCpTjNwNRFMtz2C5MxoxyzlbuJ4YEhxAKrIonTiirKDtatsZictx9RgamQIx6+QuHMNmPl0wQdoESs9A==",
+      "dependencies": {
+        "@npmcli/node-gyp": "^1.0.2",
+        "@npmcli/promise-spawn": "^1.3.2",
+        "infer-owner": "^1.0.4",
+        "node-gyp": "^7.1.0",
+        "read-package-json-fast": "^2.0.1"
+      }
+    },
     "node_modules/@schematics/angular": {
       "version": "10.0.8",
       "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-10.0.8.tgz",
@@ -5348,7 +5484,6 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
       "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
-      "dev": true,
       "engines": {
         "node": ">= 6"
       }
@@ -6431,7 +6566,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
       "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
-      "dev": true,
       "dependencies": {
         "clean-stack": "^2.0.0",
         "indent-string": "^4.0.0"
@@ -6645,8 +6779,7 @@
     "node_modules/aproba": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-      "devOptional": true
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
     },
     "node_modules/archy": {
       "version": "1.0.0",
@@ -6658,7 +6791,6 @@
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
       "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
-      "optional": true,
       "dependencies": {
         "delegates": "^1.0.0",
         "readable-stream": "^2.0.6"
@@ -7827,9 +7959,9 @@
       }
     },
     "node_modules/boxen/node_modules/string-width": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -9265,7 +9397,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
       "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       }
@@ -9376,7 +9507,6 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
       "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
-      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -9592,7 +9722,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
       "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-      "devOptional": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -9919,8 +10048,7 @@
     "node_modules/console-control-strings": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-      "optional": true
+      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
     },
     "node_modules/constants-browserify": {
       "version": "1.0.0",
@@ -10249,13 +10377,14 @@
       }
     },
     "node_modules/cordova-fetch": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-3.0.0.tgz",
-      "integrity": "sha512-N6mB/1GD8BNclxnfO85E4/s46nEJjIxYeJYHRGi6MjofhigJ3NlGwTCslbTcq8IOYEh0RdoA0mS4W2jA5UcWeQ==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-3.0.1.tgz",
+      "integrity": "sha512-bxXk6H3FtGXpCtlO+XyXM4pa72azQomdurNeHbZai9eYBzA5vjyPnsgxsYcylLUc1wQFeR+XWQVfgJitx6ghEw==",
       "dependencies": {
         "cordova-common": "^4.0.0",
         "fs-extra": "^9.0.0",
         "npm-package-arg": "^8.0.1",
+        "pacote": "^11.1.11",
         "pify": "^5.0.0",
         "resolve": "^1.15.1",
         "semver": "^7.1.3",
@@ -10266,6 +10395,210 @@
         "npm": ">= 5.6.0"
       }
     },
+    "node_modules/cordova-fetch/node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/agentkeepalive": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.1.4.tgz",
+      "integrity": "sha512-+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ==",
+      "dependencies": {
+        "debug": "^4.1.0",
+        "depd": "^1.1.2",
+        "humanize-ms": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 8.0.0"
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/cacache": {
+      "version": "15.2.0",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.2.0.tgz",
+      "integrity": "sha512-uKoJSHmnrqXgthDFx/IU6ED/5xd+NNGe+Bb+kLZy7Ku4P+BaiWEUflAKPZ7eAzsYGcsAGASJZsybXp+quEcHTw==",
+      "dependencies": {
+        "@npmcli/move-file": "^1.0.1",
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "glob": "^7.1.4",
+        "infer-owner": "^1.0.4",
+        "lru-cache": "^6.0.0",
+        "minipass": "^3.1.1",
+        "minipass-collect": "^1.0.2",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.2",
+        "mkdirp": "^1.0.3",
+        "p-map": "^4.0.0",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^3.0.2",
+        "ssri": "^8.0.1",
+        "tar": "^6.0.2",
+        "unique-filename": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/debug": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/err-code": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
+      "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="
+    },
+    "node_modules/cordova-fetch/node_modules/http-proxy-agent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+      "dependencies": {
+        "@tootallnate/once": "1",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/https-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/make-fetch-happen": {
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.0.4.tgz",
+      "integrity": "sha512-sQWNKMYqSmbAGXqJg2jZ+PmHh5JAybvwu0xM8mZR/bsTjGiTASj3ldXJV7KFHy1k/IJIBkjxQFoWIVsv9+PQMg==",
+      "dependencies": {
+        "agentkeepalive": "^4.1.3",
+        "cacache": "^15.2.0",
+        "http-cache-semantics": "^4.1.0",
+        "http-proxy-agent": "^4.0.1",
+        "https-proxy-agent": "^5.0.0",
+        "is-lambda": "^1.0.1",
+        "lru-cache": "^6.0.0",
+        "minipass": "^3.1.3",
+        "minipass-collect": "^1.0.2",
+        "minipass-fetch": "^1.3.2",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.4",
+        "negotiator": "^0.6.2",
+        "promise-retry": "^2.0.1",
+        "socks-proxy-agent": "^5.0.0",
+        "ssri": "^8.0.0"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
+    "node_modules/cordova-fetch/node_modules/npm-packlist": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.2.2.tgz",
+      "integrity": "sha512-Jt01acDvJRhJGthnUJVF/w6gumWOZxO7IkpY/lsX9//zqQgnF7OJaxgQXcerd4uQOLu7W5bkb4mChL9mdfm+Zg==",
+      "dependencies": {
+        "glob": "^7.1.6",
+        "ignore-walk": "^3.0.3",
+        "npm-bundled": "^1.1.1",
+        "npm-normalize-package-bin": "^1.0.1"
+      },
+      "bin": {
+        "npm-packlist": "bin/index.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/npm-registry-fetch": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-11.0.0.tgz",
+      "integrity": "sha512-jmlgSxoDNuhAtxUIG6pVwwtz840i994dL14FoNVZisrmZW5kWd63IUTNv1m/hyRSGSqWjCUp/YZlS1BJyNp9XA==",
+      "dependencies": {
+        "make-fetch-happen": "^9.0.1",
+        "minipass": "^3.1.3",
+        "minipass-fetch": "^1.3.0",
+        "minipass-json-stream": "^1.0.1",
+        "minizlib": "^2.0.0",
+        "npm-package-arg": "^8.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/pacote": {
+      "version": "11.3.5",
+      "resolved": "https://registry.npmjs.org/pacote/-/pacote-11.3.5.tgz",
+      "integrity": "sha512-fT375Yczn4zi+6Hkk2TBe1x1sP8FgFsEIZ2/iWaXY2r/NkhDJfxbcn5paz1+RTFCyNf+dPnaoBDJoAxXSU8Bkg==",
+      "dependencies": {
+        "@npmcli/git": "^2.1.0",
+        "@npmcli/installed-package-contents": "^1.0.6",
+        "@npmcli/promise-spawn": "^1.2.0",
+        "@npmcli/run-script": "^1.8.2",
+        "cacache": "^15.0.5",
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.1.0",
+        "infer-owner": "^1.0.4",
+        "minipass": "^3.1.3",
+        "mkdirp": "^1.0.3",
+        "npm-package-arg": "^8.0.1",
+        "npm-packlist": "^2.1.4",
+        "npm-pick-manifest": "^6.0.0",
+        "npm-registry-fetch": "^11.0.0",
+        "promise-retry": "^2.0.1",
+        "read-package-json-fast": "^2.0.1",
+        "rimraf": "^3.0.2",
+        "ssri": "^8.0.1",
+        "tar": "^6.1.0"
+      },
+      "bin": {
+        "pacote": "lib/bin.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/cordova-fetch/node_modules/pify": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz",
@@ -10277,6 +10610,31 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/cordova-fetch/node_modules/promise-retry": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
+      "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
+      "dependencies": {
+        "err-code": "^2.0.2",
+        "retry": "^0.12.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/socks-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ==",
+      "dependencies": {
+        "agent-base": "^6.0.2",
+        "debug": "4",
+        "socks": "^2.3.3"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/cordova-ios": {
       "version": "6.2.0",
       "resolved": "https://registry.npmjs.org/cordova-ios/-/cordova-ios-6.2.0.tgz",
@@ -11802,8 +12160,7 @@
     "node_modules/delegates": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
-      "optional": true
+      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
     },
     "node_modules/dep-graph": {
       "version": "1.1.0",
@@ -11866,9 +12223,9 @@
       }
     },
     "node_modules/detect-indent": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.0.0.tgz",
-      "integrity": "sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz",
+      "integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==",
       "engines": {
         "node": ">=8"
       }
@@ -12212,7 +12569,7 @@
       "version": "0.1.13",
       "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
       "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
-      "dev": true,
+      "devOptional": true,
       "dependencies": {
         "iconv-lite": "^0.6.2"
       }
@@ -12221,7 +12578,7 @@
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz",
       "integrity": "sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==",
-      "dev": true,
+      "devOptional": true,
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
       },
@@ -14119,7 +14476,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
       "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-      "dev": true,
       "dependencies": {
         "minipass": "^3.0.0"
       },
@@ -14225,7 +14581,6 @@
       "version": "2.7.4",
       "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-      "optional": true,
       "dependencies": {
         "aproba": "^1.0.3",
         "console-control-strings": "^1.0.0",
@@ -14241,7 +14596,6 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
       "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "optional": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -14250,7 +14604,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
       "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-      "optional": true,
       "dependencies": {
         "number-is-nan": "^1.0.0"
       },
@@ -14262,7 +14615,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
       "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-      "optional": true,
       "dependencies": {
         "code-point-at": "^1.0.0",
         "is-fullwidth-code-point": "^1.0.0",
@@ -14276,7 +14628,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
       "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "optional": true,
       "dependencies": {
         "ansi-regex": "^2.0.0"
       },
@@ -14792,16 +15143,24 @@
       }
     },
     "node_modules/global-dirs": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-2.0.1.tgz",
-      "integrity": "sha512-5HqUqdhkEovj2Of/ms3IeS/EekcO54ytHRLV4PEY2rhRwrHXLQjeVEES0Lhka0xwNDtGYn58wyC4s5+MHsOO6A==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-2.1.0.tgz",
+      "integrity": "sha512-MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ==",
       "dependencies": {
-        "ini": "^1.3.5"
+        "ini": "1.3.7"
       },
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/global-dirs/node_modules/ini": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.7.tgz",
+      "integrity": "sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ=="
+    },
     "node_modules/global-modules": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
@@ -15483,8 +15842,7 @@
     "node_modules/has-unicode": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
-      "optional": true
+      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
     },
     "node_modules/has-value": {
       "version": "1.0.0",
@@ -16061,7 +16419,6 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
       "integrity": "sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=",
-      "dev": true,
       "dependencies": {
         "ms": "^2.0.0"
       }
@@ -16113,7 +16470,6 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz",
       "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==",
-      "dev": true,
       "dependencies": {
         "minimatch": "^3.0.4"
       }
@@ -16217,7 +16573,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
       "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -16231,8 +16586,7 @@
     "node_modules/infer-owner": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
-      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
-      "dev": true
+      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="
     },
     "node_modules/inflight": {
       "version": "1.0.6",
@@ -16273,9 +16627,9 @@
       }
     },
     "node_modules/init-package-json/node_modules/hosted-git-info": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
-      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="
     },
     "node_modules/init-package-json/node_modules/npm-package-arg": {
       "version": "6.1.1",
@@ -16550,8 +16904,7 @@
     "node_modules/ip": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
-      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=",
-      "dev": true
+      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
     },
     "node_modules/ip-regex": {
       "version": "2.1.0",
@@ -16860,6 +17213,11 @@
         "node": ">=8"
       }
     },
+    "node_modules/is-lambda": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
+      "integrity": "sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU="
+    },
     "node_modules/is-negated-glob": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz",
@@ -18814,7 +19172,6 @@
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
       "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
-      "dev": true,
       "engines": [
         "node >= 0.2.0"
       ]
@@ -20170,7 +20527,6 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
       "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
-      "dev": true,
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -20182,7 +20538,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
       "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
-      "dev": true,
       "dependencies": {
         "minipass": "^3.0.0"
       },
@@ -20190,11 +20545,26 @@
         "node": ">= 8"
       }
     },
+    "node_modules/minipass-fetch": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.3.4.tgz",
+      "integrity": "sha512-TielGogIzbUEtd1LsjZFs47RWuHHfhl6TiCx1InVxApBAmQ8bL0dL5ilkLGcRvuyW/A9nE+Lvn855Ewz8S0PnQ==",
+      "dependencies": {
+        "minipass": "^3.1.0",
+        "minipass-sized": "^1.0.3",
+        "minizlib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "optionalDependencies": {
+        "encoding": "^0.1.12"
+      }
+    },
     "node_modules/minipass-flush": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
       "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
-      "dev": true,
       "dependencies": {
         "minipass": "^3.0.0"
       },
@@ -20202,11 +20572,30 @@
         "node": ">= 8"
       }
     },
+    "node_modules/minipass-json-stream": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz",
+      "integrity": "sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==",
+      "dependencies": {
+        "jsonparse": "^1.3.1",
+        "minipass": "^3.0.0"
+      }
+    },
     "node_modules/minipass-pipeline": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
       "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
-      "dev": true,
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minipass-sized": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
+      "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==",
       "dependencies": {
         "minipass": "^3.0.0"
       },
@@ -20218,7 +20607,6 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
       "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
-      "dev": true,
       "dependencies": {
         "minipass": "^3.0.0",
         "yallist": "^4.0.0"
@@ -20601,6 +20989,51 @@
         "node": ">= 6.0.0"
       }
     },
+    "node_modules/node-gyp": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz",
+      "integrity": "sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==",
+      "dependencies": {
+        "env-paths": "^2.2.0",
+        "glob": "^7.1.4",
+        "graceful-fs": "^4.2.3",
+        "nopt": "^5.0.0",
+        "npmlog": "^4.1.2",
+        "request": "^2.88.2",
+        "rimraf": "^3.0.2",
+        "semver": "^7.3.2",
+        "tar": "^6.0.2",
+        "which": "^2.0.2"
+      },
+      "bin": {
+        "node-gyp": "bin/node-gyp.js"
+      },
+      "engines": {
+        "node": ">= 10.12.0"
+      }
+    },
+    "node_modules/node-gyp/node_modules/env-paths": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
+      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/node-gyp/node_modules/nopt": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
+      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
+      "dependencies": {
+        "abbrev": "1"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/node-int64": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
@@ -20760,9 +21193,9 @@
       }
     },
     "node_modules/normalize-url": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz",
-      "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==",
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
+      "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==",
       "engines": {
         "node": ">=8"
       }
@@ -20783,7 +21216,6 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz",
       "integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==",
-      "dev": true,
       "dependencies": {
         "npm-normalize-package-bin": "^1.0.1"
       }
@@ -20792,7 +21224,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-4.0.0.tgz",
       "integrity": "sha512-09OmyDkNLYwqKPOnbI8exiOZU2GVVmQp7tgez2BPi5OZC8M82elDAps7sxC4l//uSUtotWqoEIDwjRvWH4qz8w==",
-      "dev": true,
       "dependencies": {
         "semver": "^7.1.1"
       },
@@ -20833,7 +21264,6 @@
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-6.1.0.tgz",
       "integrity": "sha512-ygs4k6f54ZxJXrzT0x34NybRlLeZ4+6nECAIbr2i0foTnijtS1TJiyzpqtuUAJOps/hO0tNDr8fRV5g+BtRlTw==",
-      "dev": true,
       "dependencies": {
         "npm-install-checks": "^4.0.0",
         "npm-package-arg": "^8.0.0",
@@ -20932,7 +21362,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
       "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
-      "optional": true,
       "dependencies": {
         "are-we-there-yet": "~1.1.2",
         "console-control-strings": "~1.1.0",
@@ -20959,7 +21388,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
       "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-      "devOptional": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -20982,7 +21410,6 @@
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "devOptional": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -21567,7 +21994,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
       "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
-      "dev": true,
       "dependencies": {
         "aggregate-error": "^3.0.0"
       },
@@ -23419,8 +23845,7 @@
     "node_modules/promise-inflight": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
-      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
-      "dev": true
+      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM="
     },
     "node_modules/promise-retry": {
       "version": "1.1.1",
@@ -23683,9 +24108,9 @@
       }
     },
     "node_modules/pupa": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.0.1.tgz",
-      "integrity": "sha512-hEJH0s8PXLY/cdXh66tNEQGndDrIKNqNC5xmrysZy3i5C3oEoLna7YAOad+7u125+zH1HNXUmGEkrhb3c2VriA==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz",
+      "integrity": "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==",
       "dependencies": {
         "escape-goat": "^2.0.0"
       },
@@ -23894,6 +24319,18 @@
         "npm-normalize-package-bin": "^1.0.0"
       }
     },
+    "node_modules/read-package-json-fast": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz",
+      "integrity": "sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ==",
+      "dependencies": {
+        "json-parse-even-better-errors": "^2.3.0",
+        "npm-normalize-package-bin": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/read-package-tree": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.3.1.tgz",
@@ -24141,9 +24578,9 @@
       }
     },
     "node_modules/registry-auth-token": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.0.tgz",
-      "integrity": "sha512-P+lWzPrsgfN+UEpDS3U8AQKg/UjZX6mQSJueZj3EK+vNESoqBSpBUD3gmu4sF9lOsjXWjF11dQKUqemf3veq1w==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.1.tgz",
+      "integrity": "sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==",
       "dependencies": {
         "rc": "^1.2.8"
       },
@@ -24676,7 +25113,6 @@
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
       "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
-      "dev": true,
       "engines": {
         "node": ">= 4"
       }
@@ -25424,8 +25860,7 @@
     "node_modules/set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-      "devOptional": true
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
     },
     "node_modules/set-immediate-shim": {
       "version": "1.0.1",
@@ -25696,7 +26131,6 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.1.0.tgz",
       "integrity": "sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==",
-      "dev": true,
       "engines": {
         "node": ">= 6.0.0",
         "npm": ">= 3.0.0"
@@ -25908,7 +26342,6 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/socks/-/socks-2.3.3.tgz",
       "integrity": "sha512-o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA==",
-      "dev": true,
       "dependencies": {
         "ip": "1.1.5",
         "smart-buffer": "^4.1.0"
@@ -26336,10 +26769,9 @@
       }
     },
     "node_modules/ssri": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.0.tgz",
-      "integrity": "sha512-aq/pz989nxVYwn16Tsbj1TqFpD5LLrQxHf5zaHuieFV+R0Bbr4y8qUsOA45hXT/N4/9UNXTarBjnjVmjSOVaAA==",
-      "dev": true,
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
+      "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
       "dependencies": {
         "minipass": "^3.1.1"
       },
@@ -27109,9 +27541,9 @@
       "dev": true
     },
     "node_modules/systeminformation": {
-      "version": "4.27.7",
-      "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-4.27.7.tgz",
-      "integrity": "sha512-3ozUwGSf5jmrhGgOXlX/O6hk1KQ28XPb7d3NiPZX267QmimuDq3TuIgnkw+vICUrGJGKWPLKmXVASnuJ3w07nw==",
+      "version": "4.34.23",
+      "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-4.34.23.tgz",
+      "integrity": "sha512-33+lQwlLxXoxy0o9WLOgw8OjbXeS3Jv+pSl+nxKc2AOClBI28HsdRPpH0u9Xa9OVjHLT9vonnOMw1ug7YXI0dA==",
       "os": [
         "darwin",
         "linux",
@@ -27240,10 +27672,9 @@
       }
     },
     "node_modules/tar": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.0.5.tgz",
-      "integrity": "sha512-0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg==",
-      "dev": true,
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.1.tgz",
+      "integrity": "sha512-GG0R7yt/CQkvG4fueXDi52Zskqxe2AyRJ+Wm54yqarnBgcX3qRIWh10qLVAAN+mlPFGTfP5UxvD3Fbi11UOTUQ==",
       "dependencies": {
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
@@ -27308,7 +27739,6 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
       "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "dev": true,
       "bin": {
         "mkdirp": "bin/cmd.js"
       },
@@ -27317,9 +27747,9 @@
       }
     },
     "node_modules/term-size": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.0.tgz",
-      "integrity": "sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz",
+      "integrity": "sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==",
       "engines": {
         "node": ">=8"
       },
@@ -28122,7 +28552,6 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
       "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
-      "dev": true,
       "dependencies": {
         "unique-slug": "^2.0.0"
       }
@@ -28131,7 +28560,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
       "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
-      "dev": true,
       "dependencies": {
         "imurmurhash": "^0.1.4"
       }
@@ -29980,7 +30408,6 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
       "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
-      "optional": true,
       "dependencies": {
         "string-width": "^1.0.2 || 2"
       }
@@ -30018,9 +30445,9 @@
       }
     },
     "node_modules/widest-line/node_modules/string-width": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -30532,6 +30959,7 @@
       "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1101.2.tgz",
       "integrity": "sha512-MLmBfHiiyPhbFSSAX4oMecPjEuBauOui5uBpI6BKNnk/7783fznbkbAKjXlOco7M81gkNeEoHMR8c+mOfcvv7g==",
       "dev": true,
+      "peer": true,
       "requires": {
         "@angular-devkit/core": "11.1.2",
         "rxjs": "6.6.3"
@@ -30542,6 +30970,7 @@
           "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
           "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
           "dev": true,
+          "peer": true,
           "requires": {
             "tslib": "^1.9.0"
           }
@@ -30550,7 +30979,8 @@
           "version": "1.14.1",
           "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
           "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-          "dev": true
+          "dev": true,
+          "peer": true
         }
       }
     },
@@ -30753,6 +31183,7 @@
       "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.1.2.tgz",
       "integrity": "sha512-V7zOMqL2l56JcwXVyswkG+7+t67r9XtkrVzRcG2Z5ZYwafU+iKWMwg5kBFZr1SX7fM1M9E4MpskxqtagQeUKng==",
       "dev": true,
+      "peer": true,
       "requires": {
         "ajv": "6.12.6",
         "fast-json-stable-stringify": "2.1.0",
@@ -30766,6 +31197,7 @@
           "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
           "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
           "dev": true,
+          "peer": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
             "fast-json-stable-stringify": "^2.0.0",
@@ -30778,6 +31210,7 @@
           "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
           "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
           "dev": true,
+          "peer": true,
           "requires": {
             "tslib": "^1.9.0"
           }
@@ -30786,7 +31219,8 @@
           "version": "1.14.1",
           "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
           "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-          "dev": true
+          "dev": true,
+          "peer": true
         }
       }
     },
@@ -34397,11 +34831,92 @@
         "fastq": "^1.6.0"
       }
     },
+    "@npmcli/git": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-2.1.0.tgz",
+      "integrity": "sha512-/hBFX/QG1b+N7PZBFs0bi+evgRZcK9nWBxQKZkGoXUT5hJSwl5c4d7y8/hm+NQZRPhQ67RzFaj5UM9YeyKoryw==",
+      "requires": {
+        "@npmcli/promise-spawn": "^1.3.2",
+        "lru-cache": "^6.0.0",
+        "mkdirp": "^1.0.4",
+        "npm-pick-manifest": "^6.1.1",
+        "promise-inflight": "^1.0.1",
+        "promise-retry": "^2.0.1",
+        "semver": "^7.3.5",
+        "which": "^2.0.2"
+      },
+      "dependencies": {
+        "err-code": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
+          "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="
+        },
+        "hosted-git-info": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
+          "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
+        },
+        "npm-package-arg": {
+          "version": "8.1.5",
+          "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.5.tgz",
+          "integrity": "sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==",
+          "requires": {
+            "hosted-git-info": "^4.0.1",
+            "semver": "^7.3.4",
+            "validate-npm-package-name": "^3.0.0"
+          }
+        },
+        "npm-pick-manifest": {
+          "version": "6.1.1",
+          "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-6.1.1.tgz",
+          "integrity": "sha512-dBsdBtORT84S8V8UTad1WlUyKIY9iMsAmqxHbLdeEeBNMLQDlDWWra3wYUx9EBEIiG/YwAy0XyNHDd2goAsfuA==",
+          "requires": {
+            "npm-install-checks": "^4.0.0",
+            "npm-normalize-package-bin": "^1.0.1",
+            "npm-package-arg": "^8.1.2",
+            "semver": "^7.3.4"
+          }
+        },
+        "promise-retry": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
+          "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
+          "requires": {
+            "err-code": "^2.0.2",
+            "retry": "^0.12.0"
+          }
+        },
+        "semver": {
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        }
+      }
+    },
+    "@npmcli/installed-package-contents": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-1.0.7.tgz",
+      "integrity": "sha512-9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw==",
+      "requires": {
+        "npm-bundled": "^1.1.1",
+        "npm-normalize-package-bin": "^1.0.1"
+      }
+    },
     "@npmcli/move-file": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.0.1.tgz",
       "integrity": "sha512-Uv6h1sT+0DrblvIrolFtbvM1FgWm+/sy4B3pvLp67Zys+thcukzS5ekn7HsZFGpWP4Q3fYJCljbWQE/XivMRLw==",
-      "dev": true,
       "requires": {
         "mkdirp": "^1.0.4"
       },
@@ -34409,11 +34924,35 @@
         "mkdirp": {
           "version": "1.0.4",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-          "dev": true
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
         }
       }
     },
+    "@npmcli/node-gyp": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-1.0.2.tgz",
+      "integrity": "sha512-yrJUe6reVMpktcvagumoqD9r08fH1iRo01gn1u0zoCApa9lnZGEigVKUd2hzsCId4gdtkZZIVscLhNxMECKgRg=="
+    },
+    "@npmcli/promise-spawn": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-1.3.2.tgz",
+      "integrity": "sha512-QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg==",
+      "requires": {
+        "infer-owner": "^1.0.4"
+      }
+    },
+    "@npmcli/run-script": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.8.5.tgz",
+      "integrity": "sha512-NQspusBCpTjNwNRFMtz2C5MxoxyzlbuJ4YEhxAKrIonTiirKDtatsZictx9RgamQIx6+QuHMNmPl0wQdoESs9A==",
+      "requires": {
+        "@npmcli/node-gyp": "^1.0.2",
+        "@npmcli/promise-spawn": "^1.3.2",
+        "infer-owner": "^1.0.4",
+        "node-gyp": "^7.1.0",
+        "read-package-json-fast": "^2.0.1"
+      }
+    },
     "@schematics/angular": {
       "version": "10.0.8",
       "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-10.0.8.tgz",
@@ -34534,8 +35073,7 @@
     "@tootallnate/once": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
-      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
-      "dev": true
+      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="
     },
     "@types/babel__core": {
       "version": "7.1.10",
@@ -35392,7 +35930,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
       "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
-      "dev": true,
       "requires": {
         "clean-stack": "^2.0.0",
         "indent-string": "^4.0.0"
@@ -35554,8 +36091,7 @@
     "aproba": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-      "devOptional": true
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
     },
     "archy": {
       "version": "1.0.0",
@@ -35567,7 +36103,6 @@
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
       "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
-      "optional": true,
       "requires": {
         "delegates": "^1.0.0",
         "readable-stream": "^2.0.6"
@@ -36485,9 +37020,9 @@
           "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
         },
         "string-width": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
           "requires": {
             "emoji-regex": "^8.0.0",
             "is-fullwidth-code-point": "^3.0.0",
@@ -37644,8 +38179,7 @@
     "chownr": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
-      "dev": true
+      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="
     },
     "chrome-trace-event": {
       "version": "1.0.2",
@@ -37735,8 +38269,7 @@
     "clean-stack": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
-      "dev": true
+      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="
     },
     "cli-boxes": {
       "version": "2.2.1",
@@ -37906,8 +38439,7 @@
     "code-point-at": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-      "devOptional": true
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
     },
     "collect-v8-coverage": {
       "version": "1.0.1",
@@ -38183,8 +38715,7 @@
     "console-control-strings": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-      "optional": true
+      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
     },
     "constants-browserify": {
       "version": "1.0.0",
@@ -38451,23 +38982,200 @@
       }
     },
     "cordova-fetch": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-3.0.0.tgz",
-      "integrity": "sha512-N6mB/1GD8BNclxnfO85E4/s46nEJjIxYeJYHRGi6MjofhigJ3NlGwTCslbTcq8IOYEh0RdoA0mS4W2jA5UcWeQ==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-3.0.1.tgz",
+      "integrity": "sha512-bxXk6H3FtGXpCtlO+XyXM4pa72azQomdurNeHbZai9eYBzA5vjyPnsgxsYcylLUc1wQFeR+XWQVfgJitx6ghEw==",
       "requires": {
         "cordova-common": "^4.0.0",
         "fs-extra": "^9.0.0",
         "npm-package-arg": "^8.0.1",
+        "pacote": "^11.1.11",
         "pify": "^5.0.0",
         "resolve": "^1.15.1",
         "semver": "^7.1.3",
         "which": "^2.0.2"
       },
       "dependencies": {
+        "agent-base": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+          "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+          "requires": {
+            "debug": "4"
+          }
+        },
+        "agentkeepalive": {
+          "version": "4.1.4",
+          "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.1.4.tgz",
+          "integrity": "sha512-+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ==",
+          "requires": {
+            "debug": "^4.1.0",
+            "depd": "^1.1.2",
+            "humanize-ms": "^1.2.1"
+          }
+        },
+        "cacache": {
+          "version": "15.2.0",
+          "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.2.0.tgz",
+          "integrity": "sha512-uKoJSHmnrqXgthDFx/IU6ED/5xd+NNGe+Bb+kLZy7Ku4P+BaiWEUflAKPZ7eAzsYGcsAGASJZsybXp+quEcHTw==",
+          "requires": {
+            "@npmcli/move-file": "^1.0.1",
+            "chownr": "^2.0.0",
+            "fs-minipass": "^2.0.0",
+            "glob": "^7.1.4",
+            "infer-owner": "^1.0.4",
+            "lru-cache": "^6.0.0",
+            "minipass": "^3.1.1",
+            "minipass-collect": "^1.0.2",
+            "minipass-flush": "^1.0.5",
+            "minipass-pipeline": "^1.2.2",
+            "mkdirp": "^1.0.3",
+            "p-map": "^4.0.0",
+            "promise-inflight": "^1.0.1",
+            "rimraf": "^3.0.2",
+            "ssri": "^8.0.1",
+            "tar": "^6.0.2",
+            "unique-filename": "^1.1.1"
+          }
+        },
+        "debug": {
+          "version": "4.3.2",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+          "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "err-code": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
+          "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="
+        },
+        "http-proxy-agent": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+          "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+          "requires": {
+            "@tootallnate/once": "1",
+            "agent-base": "6",
+            "debug": "4"
+          }
+        },
+        "https-proxy-agent": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+          "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+          "requires": {
+            "agent-base": "6",
+            "debug": "4"
+          }
+        },
+        "make-fetch-happen": {
+          "version": "9.0.4",
+          "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.0.4.tgz",
+          "integrity": "sha512-sQWNKMYqSmbAGXqJg2jZ+PmHh5JAybvwu0xM8mZR/bsTjGiTASj3ldXJV7KFHy1k/IJIBkjxQFoWIVsv9+PQMg==",
+          "requires": {
+            "agentkeepalive": "^4.1.3",
+            "cacache": "^15.2.0",
+            "http-cache-semantics": "^4.1.0",
+            "http-proxy-agent": "^4.0.1",
+            "https-proxy-agent": "^5.0.0",
+            "is-lambda": "^1.0.1",
+            "lru-cache": "^6.0.0",
+            "minipass": "^3.1.3",
+            "minipass-collect": "^1.0.2",
+            "minipass-fetch": "^1.3.2",
+            "minipass-flush": "^1.0.5",
+            "minipass-pipeline": "^1.2.4",
+            "negotiator": "^0.6.2",
+            "promise-retry": "^2.0.1",
+            "socks-proxy-agent": "^5.0.0",
+            "ssri": "^8.0.0"
+          }
+        },
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        },
+        "npm-packlist": {
+          "version": "2.2.2",
+          "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.2.2.tgz",
+          "integrity": "sha512-Jt01acDvJRhJGthnUJVF/w6gumWOZxO7IkpY/lsX9//zqQgnF7OJaxgQXcerd4uQOLu7W5bkb4mChL9mdfm+Zg==",
+          "requires": {
+            "glob": "^7.1.6",
+            "ignore-walk": "^3.0.3",
+            "npm-bundled": "^1.1.1",
+            "npm-normalize-package-bin": "^1.0.1"
+          }
+        },
+        "npm-registry-fetch": {
+          "version": "11.0.0",
+          "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-11.0.0.tgz",
+          "integrity": "sha512-jmlgSxoDNuhAtxUIG6pVwwtz840i994dL14FoNVZisrmZW5kWd63IUTNv1m/hyRSGSqWjCUp/YZlS1BJyNp9XA==",
+          "requires": {
+            "make-fetch-happen": "^9.0.1",
+            "minipass": "^3.1.3",
+            "minipass-fetch": "^1.3.0",
+            "minipass-json-stream": "^1.0.1",
+            "minizlib": "^2.0.0",
+            "npm-package-arg": "^8.0.0"
+          }
+        },
+        "pacote": {
+          "version": "11.3.5",
+          "resolved": "https://registry.npmjs.org/pacote/-/pacote-11.3.5.tgz",
+          "integrity": "sha512-fT375Yczn4zi+6Hkk2TBe1x1sP8FgFsEIZ2/iWaXY2r/NkhDJfxbcn5paz1+RTFCyNf+dPnaoBDJoAxXSU8Bkg==",
+          "requires": {
+            "@npmcli/git": "^2.1.0",
+            "@npmcli/installed-package-contents": "^1.0.6",
+            "@npmcli/promise-spawn": "^1.2.0",
+            "@npmcli/run-script": "^1.8.2",
+            "cacache": "^15.0.5",
+            "chownr": "^2.0.0",
+            "fs-minipass": "^2.1.0",
+            "infer-owner": "^1.0.4",
+            "minipass": "^3.1.3",
+            "mkdirp": "^1.0.3",
+            "npm-package-arg": "^8.0.1",
+            "npm-packlist": "^2.1.4",
+            "npm-pick-manifest": "^6.0.0",
+            "npm-registry-fetch": "^11.0.0",
+            "promise-retry": "^2.0.1",
+            "read-package-json-fast": "^2.0.1",
+            "rimraf": "^3.0.2",
+            "ssri": "^8.0.1",
+            "tar": "^6.1.0"
+          }
+        },
         "pify": {
           "version": "5.0.0",
           "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz",
           "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA=="
+        },
+        "promise-retry": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
+          "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
+          "requires": {
+            "err-code": "^2.0.2",
+            "retry": "^0.12.0"
+          }
+        },
+        "socks-proxy-agent": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz",
+          "integrity": "sha512-vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ==",
+          "requires": {
+            "agent-base": "^6.0.2",
+            "debug": "4",
+            "socks": "^2.3.3"
+          }
         }
       }
     },
@@ -39554,8 +40262,7 @@
     "delegates": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
-      "optional": true
+      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
     },
     "dep-graph": {
       "version": "1.1.0",
@@ -39605,9 +40312,9 @@
       "dev": true
     },
     "detect-indent": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.0.0.tgz",
-      "integrity": "sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA=="
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz",
+      "integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA=="
     },
     "detect-libc": {
       "version": "1.0.3",
@@ -39901,7 +40608,7 @@
       "version": "0.1.13",
       "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
       "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
-      "dev": true,
+      "devOptional": true,
       "requires": {
         "iconv-lite": "^0.6.2"
       },
@@ -39910,7 +40617,7 @@
           "version": "0.6.2",
           "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz",
           "integrity": "sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==",
-          "dev": true,
+          "devOptional": true,
           "requires": {
             "safer-buffer": ">= 2.1.2 < 3.0.0"
           }
@@ -41397,7 +42104,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
       "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-      "dev": true,
       "requires": {
         "minipass": "^3.0.0"
       }
@@ -41488,7 +42194,6 @@
       "version": "2.7.4",
       "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-      "optional": true,
       "requires": {
         "aproba": "^1.0.3",
         "console-control-strings": "^1.0.0",
@@ -41503,14 +42208,12 @@
         "ansi-regex": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "optional": true
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
         },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -41519,7 +42222,6 @@
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -41530,7 +42232,6 @@
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -41949,11 +42650,18 @@
       }
     },
     "global-dirs": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-2.0.1.tgz",
-      "integrity": "sha512-5HqUqdhkEovj2Of/ms3IeS/EekcO54ytHRLV4PEY2rhRwrHXLQjeVEES0Lhka0xwNDtGYn58wyC4s5+MHsOO6A==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-2.1.0.tgz",
+      "integrity": "sha512-MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ==",
       "requires": {
-        "ini": "^1.3.5"
+        "ini": "1.3.7"
+      },
+      "dependencies": {
+        "ini": {
+          "version": "1.3.7",
+          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.7.tgz",
+          "integrity": "sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ=="
+        }
       }
     },
     "global-modules": {
@@ -42505,8 +43213,7 @@
     "has-unicode": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
-      "optional": true
+      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
     },
     "has-value": {
       "version": "1.0.0",
@@ -42997,7 +43704,6 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
       "integrity": "sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=",
-      "dev": true,
       "requires": {
         "ms": "^2.0.0"
       }
@@ -43040,7 +43746,6 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz",
       "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==",
-      "dev": true,
       "requires": {
         "minimatch": "^3.0.4"
       }
@@ -43115,8 +43820,7 @@
     "indent-string": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "dev": true
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="
     },
     "indexes-of": {
       "version": "1.0.1",
@@ -43127,8 +43831,7 @@
     "infer-owner": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
-      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
-      "dev": true
+      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="
     },
     "inflight": {
       "version": "1.0.6",
@@ -43165,9 +43868,9 @@
       },
       "dependencies": {
         "hosted-git-info": {
-          "version": "2.8.8",
-          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
-          "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="
+          "version": "2.8.9",
+          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+          "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="
         },
         "npm-package-arg": {
           "version": "6.1.1",
@@ -43393,8 +44096,7 @@
     "ip": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
-      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=",
-      "dev": true
+      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
     },
     "ip-regex": {
       "version": "2.1.0",
@@ -43613,6 +44315,11 @@
       "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
       "dev": true
     },
+    "is-lambda": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
+      "integrity": "sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU="
+    },
     "is-negated-glob": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz",
@@ -45093,8 +45800,7 @@
     "jsonparse": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
-      "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
-      "dev": true
+      "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA="
     },
     "JSONStream": {
       "version": "1.3.5",
@@ -46208,7 +46914,6 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
       "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
-      "dev": true,
       "requires": {
         "yallist": "^4.0.0"
       }
@@ -46217,25 +46922,50 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
       "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
-      "dev": true,
       "requires": {
         "minipass": "^3.0.0"
       }
     },
+    "minipass-fetch": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.3.4.tgz",
+      "integrity": "sha512-TielGogIzbUEtd1LsjZFs47RWuHHfhl6TiCx1InVxApBAmQ8bL0dL5ilkLGcRvuyW/A9nE+Lvn855Ewz8S0PnQ==",
+      "requires": {
+        "encoding": "^0.1.12",
+        "minipass": "^3.1.0",
+        "minipass-sized": "^1.0.3",
+        "minizlib": "^2.0.0"
+      }
+    },
     "minipass-flush": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
       "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
-      "dev": true,
       "requires": {
         "minipass": "^3.0.0"
       }
     },
+    "minipass-json-stream": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz",
+      "integrity": "sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==",
+      "requires": {
+        "jsonparse": "^1.3.1",
+        "minipass": "^3.0.0"
+      }
+    },
     "minipass-pipeline": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
       "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
-      "dev": true,
+      "requires": {
+        "minipass": "^3.0.0"
+      }
+    },
+    "minipass-sized": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
+      "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==",
       "requires": {
         "minipass": "^3.0.0"
       }
@@ -46244,7 +46974,6 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
       "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
-      "dev": true,
       "requires": {
         "minipass": "^3.0.0",
         "yallist": "^4.0.0"
@@ -46566,6 +47295,38 @@
       "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==",
       "dev": true
     },
+    "node-gyp": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz",
+      "integrity": "sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==",
+      "requires": {
+        "env-paths": "^2.2.0",
+        "glob": "^7.1.4",
+        "graceful-fs": "^4.2.3",
+        "nopt": "^5.0.0",
+        "npmlog": "^4.1.2",
+        "request": "^2.88.2",
+        "rimraf": "^3.0.2",
+        "semver": "^7.3.2",
+        "tar": "^6.0.2",
+        "which": "^2.0.2"
+      },
+      "dependencies": {
+        "env-paths": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
+          "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="
+        },
+        "nopt": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
+          "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
+          "requires": {
+            "abbrev": "1"
+          }
+        }
+      }
+    },
     "node-int64": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
@@ -46713,9 +47474,9 @@
       "dev": true
     },
     "normalize-url": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz",
-      "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ=="
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
+      "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA=="
     },
     "now-and-later": {
       "version": "2.0.1",
@@ -46730,7 +47491,6 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz",
       "integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==",
-      "dev": true,
       "requires": {
         "npm-normalize-package-bin": "^1.0.1"
       }
@@ -46739,7 +47499,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-4.0.0.tgz",
       "integrity": "sha512-09OmyDkNLYwqKPOnbI8exiOZU2GVVmQp7tgez2BPi5OZC8M82elDAps7sxC4l//uSUtotWqoEIDwjRvWH4qz8w==",
-      "dev": true,
       "requires": {
         "semver": "^7.1.1"
       }
@@ -46774,7 +47533,6 @@
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-6.1.0.tgz",
       "integrity": "sha512-ygs4k6f54ZxJXrzT0x34NybRlLeZ4+6nECAIbr2i0foTnijtS1TJiyzpqtuUAJOps/hO0tNDr8fRV5g+BtRlTw==",
-      "dev": true,
       "requires": {
         "npm-install-checks": "^4.0.0",
         "npm-package-arg": "^8.0.0",
@@ -46855,7 +47613,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
       "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
-      "optional": true,
       "requires": {
         "are-we-there-yet": "~1.1.2",
         "console-control-strings": "~1.1.0",
@@ -46881,8 +47638,7 @@
     "number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-      "devOptional": true
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
     },
     "nwsapi": {
       "version": "2.2.0",
@@ -46898,8 +47654,7 @@
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "devOptional": true
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
     "object-copy": {
       "version": "0.1.0",
@@ -47346,7 +48101,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
       "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
-      "dev": true,
       "requires": {
         "aggregate-error": "^3.0.0"
       }
@@ -48892,8 +49646,7 @@
     "promise-inflight": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
-      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
-      "dev": true
+      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM="
     },
     "promise-retry": {
       "version": "1.1.1",
@@ -49123,9 +49876,9 @@
       "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
     },
     "pupa": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.0.1.tgz",
-      "integrity": "sha512-hEJH0s8PXLY/cdXh66tNEQGndDrIKNqNC5xmrysZy3i5C3oEoLna7YAOad+7u125+zH1HNXUmGEkrhb3c2VriA==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz",
+      "integrity": "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==",
       "requires": {
         "escape-goat": "^2.0.0"
       }
@@ -49287,6 +50040,15 @@
         "npm-normalize-package-bin": "^1.0.0"
       }
     },
+    "read-package-json-fast": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz",
+      "integrity": "sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ==",
+      "requires": {
+        "json-parse-even-better-errors": "^2.3.0",
+        "npm-normalize-package-bin": "^1.0.1"
+      }
+    },
     "read-package-tree": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.3.1.tgz",
@@ -49490,9 +50252,9 @@
       "dev": true
     },
     "registry-auth-token": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.0.tgz",
-      "integrity": "sha512-P+lWzPrsgfN+UEpDS3U8AQKg/UjZX6mQSJueZj3EK+vNESoqBSpBUD3gmu4sF9lOsjXWjF11dQKUqemf3veq1w==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.1.tgz",
+      "integrity": "sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==",
       "requires": {
         "rc": "^1.2.8"
       }
@@ -49909,8 +50671,7 @@
     "retry": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
-      "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
-      "dev": true
+      "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs="
     },
     "reusify": {
       "version": "1.0.4",
@@ -50506,8 +51267,7 @@
     "set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-      "devOptional": true
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
     },
     "set-immediate-shim": {
       "version": "1.0.1",
@@ -50721,8 +51481,7 @@
     "smart-buffer": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.1.0.tgz",
-      "integrity": "sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==",
-      "dev": true
+      "integrity": "sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw=="
     },
     "snapdragon": {
       "version": "0.8.2",
@@ -50898,7 +51657,6 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/socks/-/socks-2.3.3.tgz",
       "integrity": "sha512-o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA==",
-      "dev": true,
       "requires": {
         "ip": "1.1.5",
         "smart-buffer": "^4.1.0"
@@ -51246,10 +52004,9 @@
       }
     },
     "ssri": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.0.tgz",
-      "integrity": "sha512-aq/pz989nxVYwn16Tsbj1TqFpD5LLrQxHf5zaHuieFV+R0Bbr4y8qUsOA45hXT/N4/9UNXTarBjnjVmjSOVaAA==",
-      "dev": true,
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
+      "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
       "requires": {
         "minipass": "^3.1.1"
       }
@@ -51868,9 +52625,9 @@
       "dev": true
     },
     "systeminformation": {
-      "version": "4.27.7",
-      "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-4.27.7.tgz",
-      "integrity": "sha512-3ozUwGSf5jmrhGgOXlX/O6hk1KQ28XPb7d3NiPZX267QmimuDq3TuIgnkw+vICUrGJGKWPLKmXVASnuJ3w07nw=="
+      "version": "4.34.23",
+      "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-4.34.23.tgz",
+      "integrity": "sha512-33+lQwlLxXoxy0o9WLOgw8OjbXeS3Jv+pSl+nxKc2AOClBI28HsdRPpH0u9Xa9OVjHLT9vonnOMw1ug7YXI0dA=="
     },
     "table": {
       "version": "6.6.0",
@@ -51957,10 +52714,9 @@
       "dev": true
     },
     "tar": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.0.5.tgz",
-      "integrity": "sha512-0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg==",
-      "dev": true,
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.1.tgz",
+      "integrity": "sha512-GG0R7yt/CQkvG4fueXDi52Zskqxe2AyRJ+Wm54yqarnBgcX3qRIWh10qLVAAN+mlPFGTfP5UxvD3Fbi11UOTUQ==",
       "requires": {
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
@@ -51973,8 +52729,7 @@
         "mkdirp": {
           "version": "1.0.4",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-          "dev": true
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
         }
       }
     },
@@ -52025,9 +52780,9 @@
       }
     },
     "term-size": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.0.tgz",
-      "integrity": "sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw=="
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz",
+      "integrity": "sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg=="
     },
     "terminal-link": {
       "version": "2.1.1",
@@ -52638,7 +53393,6 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
       "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
-      "dev": true,
       "requires": {
         "unique-slug": "^2.0.0"
       }
@@ -52647,7 +53401,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
       "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
-      "dev": true,
       "requires": {
         "imurmurhash": "^0.1.4"
       }
@@ -54168,7 +54921,6 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
       "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
-      "optional": true,
       "requires": {
         "string-width": "^1.0.2 || 2"
       }
@@ -54197,9 +54949,9 @@
           "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
         },
         "string-width": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
           "requires": {
             "emoji-regex": "^8.0.0",
             "is-fullwidth-code-point": "^3.0.0",
diff --git a/package.json b/package.json
index 9c1d04eed..ce314dd2f 100644
--- a/package.json
+++ b/package.json
@@ -128,7 +128,6 @@
     "zone.js": "~0.10.3"
   },
   "devDependencies": {
-    "@angular-devkit/architect": "~0.1101.2",
     "@angular-devkit/build-angular": "~0.1000.8",
     "@angular-eslint/builder": "^4.2.0",
     "@angular-eslint/eslint-plugin": "^4.2.0",

From adca594247984deb3217b138e0f166a3ff0000eb Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 4 Aug 2021 16:01:49 +0200
Subject: [PATCH 0021/1008] MOBILE-3825 DX: Add --external flag to dev:ios

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 64d0a8ad3..a44bb9fd5 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "build:prod": "NODE_ENV=production ionic build --prod",
     "build:test": "NODE_ENV=testing ionic build",
     "dev:android": "ionic cordova run android --livereload",
-    "dev:ios": "ionic cordova run ios --livereload",
+    "dev:ios": "ionic cordova run ios --livereload --external",
     "prod:android": "NODE_ENV=production ionic cordova run android --aot",
     "prod:ios": "NODE_ENV=production ionic cordova run ios --aot",
     "test": "NODE_ENV=testing gulp && jest --verbose",

From 84da4a9f4600d8288527cc101d16e9aa6c8ce18d Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 5 Aug 2021 10:23:19 +0200
Subject: [PATCH 0022/1008] MOBILE-3825 DX: Update run scripts

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index a44bb9fd5..16c394ff3 100644
--- a/package.json
+++ b/package.json
@@ -24,9 +24,9 @@
     "build:prod": "NODE_ENV=production ionic build --prod",
     "build:test": "NODE_ENV=testing ionic build",
     "dev:android": "ionic cordova run android --livereload",
-    "dev:ios": "ionic cordova run ios --livereload --external",
-    "prod:android": "NODE_ENV=production ionic cordova run android --aot",
-    "prod:ios": "NODE_ENV=production ionic cordova run ios --aot",
+    "dev:ios": "ionic cordova run ios",
+    "prod:android": "NODE_ENV=production ionic cordova run android --prod",
+    "prod:ios": "NODE_ENV=production ionic cordova run ios --prod",
     "test": "NODE_ENV=testing gulp && jest --verbose",
     "test:ci": "NODE_ENV=testing gulp && jest -ci --runInBand --verbose",
     "test:watch": "NODE_ENV=testing gulp watch & jest --watch",

From d4a6bc0f72d1ed8aed49b74daababf622db36a7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 29 Jul 2021 09:34:52 +0200
Subject: [PATCH 0023/1008] MOBILE-3792 github: Update npm to 7 on github
 actions

---
 .github/workflows/testing.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 1534b363c..4f326a88b 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -12,9 +12,11 @@ jobs:
     - name: Use Node.js
       uses: actions/setup-node@v1
       with:
-        node-version: '12.x'
+        node-version: '12'
     - name: Install npm packages
-      run: npm ci
+      run: |
+        npm install -g npm@7
+        npm ci --no-audit
     - name: Check langindex
       run: |
         result=$(cat scripts/langindex.json | grep \"TBD\" | wc -l); test $result -eq 0

From b8d5a7cf372af77d15e8a90b642c227ed13b8522 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 5 Aug 2021 12:08:21 +0200
Subject: [PATCH 0024/1008] MOBILE-3833 chore: Update repo url

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 16c394ff3..3f7c2bbab 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/moodlehq/moodlemobile2.git"
+    "url": "https://github.com/moodlehq/moodleapp.git"
   },
   "license": "Apache-2.0",
   "licenses": [

From 04ff191fb0e3bedce0af7a332c6fac4edeaf1d80 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 5 Aug 2021 12:44:15 +0200
Subject: [PATCH 0025/1008] MOBILE-3833 chore: Remove stale TODOs

---
 src/addons/calendar/pages/list/list.page.ts   |  4 ---
 .../pages/discussion/discussion.page.ts       |  8 -----
 src/addons/mod/chat/pages/chat/chat.html      |  2 +-
 src/addons/mod/chat/pages/chat/chat.ts        | 34 +------------------
 src/core/classes/page-items-list-manager.ts   |  2 --
 src/core/components/tabs/tabs.ts              | 13 -------
 .../choose-site-modal/choose-site-modal.ts    |  2 --
 .../features/mainmenu/services/mainmenu.ts    |  2 --
 .../settings/services/settings-helper.ts      |  2 +-
 .../tag/pages/index-area/index-area.page.ts   |  2 --
 src/core/services/file.ts                     |  2 --
 src/core/services/utils/dom.ts                |  2 +-
 12 files changed, 4 insertions(+), 71 deletions(-)

diff --git a/src/addons/calendar/pages/list/list.page.ts b/src/addons/calendar/pages/list/list.page.ts
index d7d97a084..6cdf62469 100644
--- a/src/addons/calendar/pages/list/list.page.ts
+++ b/src/addons/calendar/pages/list/list.page.ts
@@ -363,10 +363,6 @@ export class AddonCalendarListPage implements OnInit, OnDestroy {
 
                 this.daysLoaded += AddonCalendarProvider.DAYS_INTERVAL;
             }
-
-            // Resize the content so infinite loading is able to calculate if it should load more items or not.
-            // @todo: Infinite loading is not working if content is not high enough.
-            // this.content.resize();
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'addon.calendar.errorloadevents', true);
             this.loadMoreError = true; // Set to prevent infinite calls with infinite-loading.
diff --git a/src/addons/messages/pages/discussion/discussion.page.ts b/src/addons/messages/pages/discussion/discussion.page.ts
index cb683d327..4617e2e3e 100644
--- a/src/addons/messages/pages/discussion/discussion.page.ts
+++ b/src/addons/messages/pages/discussion/discussion.page.ts
@@ -71,7 +71,6 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView
     protected keepMessageMap: {[hash: string]: boolean} = {};
     protected syncObserver: CoreEventObserver;
     protected oldContentHeight = 0;
-    protected keyboardObserver: CoreEventObserver;
     protected scrollBottom = true;
     protected viewDestroyed = false;
     protected memberInfoObserver: CoreEventObserver;
@@ -148,12 +147,6 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView
             },
             this.siteId,
         );
-
-        // Recalculate footer position when keyboard is shown or hidden.
-        this.keyboardObserver = CoreEvents.on(CoreEvents.KEYBOARD_CHANGE, () => {
-            // @todo probably not needed.
-            // this.content.resize();
-        });
     }
 
     /**
@@ -1701,7 +1694,6 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView
         // Unset again, just in case.
         this.unsetPolling();
         this.syncObserver?.off();
-        this.keyboardObserver?.off();
         this.memberInfoObserver?.off();
         this.viewDestroyed = true;
     }
diff --git a/src/addons/mod/chat/pages/chat/chat.html b/src/addons/mod/chat/pages/chat/chat.html
index d88bf4d0b..87e3b16e5 100644
--- a/src/addons/mod/chat/pages/chat/chat.html
+++ b/src/addons/mod/chat/pages/chat/chat.html
@@ -116,7 +116,7 @@
         </p>
 
         <core-send-message-form [sendDisabled]="sending" *ngIf="isOnline && polling && loaded" [message]="newMessage"
-            (onSubmit)="sendMessage($event)" [placeholder]="'addon.messages.newmessage' | translate" (onResize)="resizeContent()">
+            (onSubmit)="sendMessage($event)" [placeholder]="'addon.messages.newmessage' | translate">
         </core-send-message-form>
 
         <ion-button *ngIf="isOnline && !polling && loaded" (click)="reconnect()" expand="block" color="light">
diff --git a/src/addons/mod/chat/pages/chat/chat.ts b/src/addons/mod/chat/pages/chat/chat.ts
index 72aaff042..76ffdeb6b 100644
--- a/src/addons/mod/chat/pages/chat/chat.ts
+++ b/src/addons/mod/chat/pages/chat/chat.ts
@@ -23,7 +23,7 @@ import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
 import { Network, NgZone, Translate } from '@singletons';
-import { CoreEventObserver, CoreEvents } from '@singletons/events';
+import { CoreEvents } from '@singletons/events';
 import { Subscription } from 'rxjs';
 import { AddonModChatUsersModalComponent, AddonModChatUsersModalResult } from '../../components/users-modal/users-modal';
 import { AddonModChat, AddonModChatProvider, AddonModChatUser } from '../../services/chat';
@@ -59,7 +59,6 @@ export class AddonModChatChatPage implements OnInit, OnDestroy, CanLeave {
     protected lastTime = 0;
     protected oldContentHeight = 0;
     protected onlineSubscription: Subscription;
-    protected keyboardObserver: CoreEventObserver;
     protected viewDestroyed = false;
     protected pollingRunning = false;
     protected users: AddonModChatUser[] = [];
@@ -73,12 +72,6 @@ export class AddonModChatChatPage implements OnInit, OnDestroy, CanLeave {
                 this.isOnline = CoreApp.isOnline();
             });
         });
-
-        // Recalculate footer position when keyboard is shown or hidden.
-        this.keyboardObserver = CoreEvents.on(CoreEvents.KEYBOARD_CHANGE, () => {
-            // @todo probably not needed.
-            // this.content.resize();
-        });
     }
 
     /**
@@ -357,30 +350,6 @@ export class AddonModChatChatPage implements OnInit, OnDestroy, CanLeave {
         });
     }
 
-    /**
-     * Content or scroll has been resized. For content, only call it if it's been added on top.
-     */
-    resizeContent(): void {
-        // @todo probably not needed.
-        // let top = this.content.getContentDimensions().scrollTop;
-        // this.content.resize();
-
-        // // Wait for new content height to be calculated.
-        // setTimeout(() => {
-        //     // Visible content size changed, maintain the bottom position.
-        //     if (!this.viewDestroyed && this.content && this.domUtils.getContentHeight(this.content) != this.oldContentHeight) {
-        //         if (!top) {
-        //             top = this.content.getContentDimensions().scrollTop;
-        //         }
-
-        //         top += this.oldContentHeight - this.domUtils.getContentHeight(this.content);
-        //         this.oldContentHeight = this.domUtils.getContentHeight(this.content);
-
-        //         this.content.scrollTo(0, top, 0);
-        //     }
-        // });
-    }
-
     /**
      * Check if we can leave the page or not.
      *
@@ -402,7 +371,6 @@ export class AddonModChatChatPage implements OnInit, OnDestroy, CanLeave {
      */
     ngOnDestroy(): void {
         this.onlineSubscription && this.onlineSubscription.unsubscribe();
-        this.keyboardObserver && this.keyboardObserver.off();
         this.stopPolling();
         this.viewDestroyed = true;
     }
diff --git a/src/core/classes/page-items-list-manager.ts b/src/core/classes/page-items-list-manager.ts
index 11089a807..27705ffef 100644
--- a/src/core/classes/page-items-list-manager.ts
+++ b/src/core/classes/page-items-list-manager.ts
@@ -109,8 +109,6 @@ export abstract class CorePageItemsListManager<Item> {
         this.selectedItem = null;
     }
 
-    // @todo Implement watchResize.
-
     /**
      * Check whether the given item is selected or not.
      *
diff --git a/src/core/components/tabs/tabs.ts b/src/core/components/tabs/tabs.ts
index e5c4f778e..a0fef9e06 100644
--- a/src/core/components/tabs/tabs.ts
+++ b/src/core/components/tabs/tabs.ts
@@ -76,19 +76,6 @@ export class CoreTabsComponent extends CoreTabsBaseComponent<CoreTabComponent> i
      */
     protected async initializeTabs(): Promise<void> {
         await super.initializeTabs();
-
-        // @todo: Is this still needed?
-        // if (this.content) {
-        //     if (!this.parentScrollable) {
-        //         // Parent scroll element (if core-tabs is inside a ion-content).
-        //         const scroll = await this.content.getScrollElement();
-        //         if (scroll) {
-        //             scroll.classList.add('no-scroll');
-        //         }
-        //     } else {
-        //         this.originalTabsContainer?.classList.add('no-scroll');
-        //     }
-        // }
     }
 
     /**
diff --git a/src/core/features/contentlinks/components/choose-site-modal/choose-site-modal.ts b/src/core/features/contentlinks/components/choose-site-modal/choose-site-modal.ts
index a71ea2f32..76f65b273 100644
--- a/src/core/features/contentlinks/components/choose-site-modal/choose-site-modal.ts
+++ b/src/core/features/contentlinks/components/choose-site-modal/choose-site-modal.ts
@@ -23,8 +23,6 @@ import { CoreNavigator } from '@services/navigator';
 
 /**
  * Page to display the list of sites to choose one to perform a content link action.
- *
- * @todo Include routing and testing.
  */
 @Component({
     selector: 'core-content-links-choose-site-modal',
diff --git a/src/core/features/mainmenu/services/mainmenu.ts b/src/core/features/mainmenu/services/mainmenu.ts
index 6dc54ec70..683f8aea7 100644
--- a/src/core/features/mainmenu/services/mainmenu.ts
+++ b/src/core/features/mainmenu/services/mainmenu.ts
@@ -241,8 +241,6 @@ export class CoreMainMenuProvider {
 
         if (tablet != this.tablet) {
             this.tablet = tablet;
-
-            // @todo Resize so content margins can be updated.
         }
 
         return tablet ? 'side' : 'bottom';
diff --git a/src/core/features/settings/services/settings-helper.ts b/src/core/features/settings/services/settings-helper.ts
index cad265dad..94fddfc40 100644
--- a/src/core/features/settings/services/settings-helper.ts
+++ b/src/core/features/settings/services/settings-helper.ts
@@ -405,7 +405,7 @@ export class CoreSettingsHelperProvider {
      */
     applyZoomLevel(zoomLevel: CoreZoomLevel): void {
         const zoom = CoreConstants.CONFIG.zoomlevels[zoomLevel];
-        // @todo Since zoom is deprecated and fontSize is not working, we should do some research here.
+        // @todo MOBILE-3790 non-standard property, doesn't work everywhere.
         document.documentElement.style.zoom = zoom + '%';
     }
 
diff --git a/src/core/features/tag/pages/index-area/index-area.page.ts b/src/core/features/tag/pages/index-area/index-area.page.ts
index 41c3d10bc..58104c6d3 100644
--- a/src/core/features/tag/pages/index-area/index-area.page.ts
+++ b/src/core/features/tag/pages/index-area/index-area.page.ts
@@ -23,8 +23,6 @@ import { CoreNavigator } from '@services/navigator';
 
 /**
  * Page that displays the tag index area.
- *
- * @todo testing.
  */
 @Component({
     selector: 'page-core-tag-index-area',
diff --git a/src/core/services/file.ts b/src/core/services/file.ts
index 9923d7a46..0678e3b35 100644
--- a/src/core/services/file.ts
+++ b/src/core/services/file.ts
@@ -104,8 +104,6 @@ export class CoreFileProvider {
 
     constructor() {
         this.logger = CoreLogger.getInstance('CoreFileProvider');
-
-        // @todo: Check if redefining FileReader getters and setters is still needed in Android.
     }
 
     /**
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index 19a864a24..7a3d37e90 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -1986,7 +1986,7 @@ function fixIOSPopoverPosition(baseEl: HTMLElement, ev?: Event): void {
  * which doesn't return the correct dimensions when the `zoom` CSS property is being used. This is only a temporary solution
  * in Android because system zooming is already supported, so it won't be necessary to do it at an app level.
  *
- * @todo remove the ability to zoom in Android.
+ * @todo MOBILE-3790 remove the ability to zoom in Android.
  *
  * This function has been copied in its entirety from Ionic's source code, only changing the aforementioned calculation
  * of the body dimensions with `document.body.clientXXX`.

From b835b6195aedfeff88c44fb09854720cf755b573 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 3 Aug 2021 12:33:01 +0200
Subject: [PATCH 0026/1008] MOBILE-3833 config: Update to angular 11

---
 .gitignore        |     1 +
 package-lock.json | 37843 ++++++++++++++++++++++----------------------
 package.json      |    86 +-
 tsconfig.json     |     6 +-
 4 files changed, 18894 insertions(+), 19042 deletions(-)

diff --git a/.gitignore b/.gitignore
index d3b41f8be..b9c20f25f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@ npm-debug.log*
 /.sass-cache
 /.sourcemaps
 /.versions
+/.vscode
 /coverage
 /dist
 /node_modules
diff --git a/package-lock.json b/package-lock.json
index 3748913af..b80623d42 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,40 +9,40 @@
       "version": "3.9.6-dev",
       "license": "Apache-2.0",
       "dependencies": {
-        "@angular/animations": "~10.0.14",
-        "@angular/common": "~10.0.14",
-        "@angular/core": "~10.0.14",
-        "@angular/forms": "~10.0.14",
-        "@angular/platform-browser": "~10.0.14",
-        "@angular/platform-browser-dynamic": "~10.0.14",
-        "@angular/router": "~10.0.14",
-        "@ionic-native/badge": "^5.33.0",
-        "@ionic-native/camera": "^5.33.0",
-        "@ionic-native/chooser": "^5.33.0",
-        "@ionic-native/clipboard": "^5.33.0",
-        "@ionic-native/core": "^5.33.0",
-        "@ionic-native/device": "^5.33.0",
-        "@ionic-native/diagnostic": "^5.33.0",
-        "@ionic-native/file": "^5.33.0",
-        "@ionic-native/file-opener": "^5.33.0",
-        "@ionic-native/file-transfer": "^5.33.0",
-        "@ionic-native/geolocation": "^5.33.0",
-        "@ionic-native/http": "^5.33.0",
-        "@ionic-native/in-app-browser": "^5.33.0",
-        "@ionic-native/ionic-webview": "^5.33.0",
-        "@ionic-native/keyboard": "^5.33.0",
-        "@ionic-native/local-notifications": "^5.33.0",
-        "@ionic-native/media": "^5.33.0",
-        "@ionic-native/media-capture": "^5.33.0",
-        "@ionic-native/network": "^5.33.0",
-        "@ionic-native/push": "^5.33.0",
-        "@ionic-native/qr-scanner": "^5.33.0",
-        "@ionic-native/splash-screen": "^5.33.0",
-        "@ionic-native/sqlite": "^5.33.0",
-        "@ionic-native/status-bar": "^5.33.0",
-        "@ionic-native/web-intent": "^5.33.0",
-        "@ionic-native/zip": "^5.33.0",
-        "@ionic/angular": "^5.6.6",
+        "@angular/animations": "~11.2.14",
+        "@angular/common": "~11.2.14",
+        "@angular/core": "~11.2.14",
+        "@angular/forms": "~11.2.14",
+        "@angular/platform-browser": "~11.2.14",
+        "@angular/platform-browser-dynamic": "~11.2.14",
+        "@angular/router": "~11.2.14",
+        "@ionic-native/badge": "^5.34.0",
+        "@ionic-native/camera": "^5.34.0",
+        "@ionic-native/chooser": "^5.34.0",
+        "@ionic-native/clipboard": "^5.34.0",
+        "@ionic-native/core": "^5.34.0",
+        "@ionic-native/device": "^5.34.0",
+        "@ionic-native/diagnostic": "^5.34.0",
+        "@ionic-native/file": "^5.34.0",
+        "@ionic-native/file-opener": "^5.34.0",
+        "@ionic-native/file-transfer": "^5.34.0",
+        "@ionic-native/geolocation": "^5.34.0",
+        "@ionic-native/http": "^5.34.0",
+        "@ionic-native/in-app-browser": "^5.34.0",
+        "@ionic-native/ionic-webview": "^5.34.0",
+        "@ionic-native/keyboard": "^5.34.0",
+        "@ionic-native/local-notifications": "^5.34.0",
+        "@ionic-native/media": "^5.34.0",
+        "@ionic-native/media-capture": "^5.34.0",
+        "@ionic-native/network": "^5.34.0",
+        "@ionic-native/push": "^5.34.0",
+        "@ionic-native/qr-scanner": "^5.34.0",
+        "@ionic-native/splash-screen": "^5.34.0",
+        "@ionic-native/sqlite": "^5.34.0",
+        "@ionic-native/status-bar": "^5.34.0",
+        "@ionic-native/web-intent": "^5.34.0",
+        "@ionic-native/zip": "^5.34.0",
+        "@ionic/angular": "^5.6.13",
         "@moodlehq/cordova-plugin-file-transfer": "1.7.1-moodle.2",
         "@moodlehq/cordova-plugin-inappbrowser": "5.0.0-moodle.2",
         "@moodlehq/cordova-plugin-local-notification": "0.9.0-moodle.2",
@@ -52,11 +52,11 @@
         "@ngx-translate/http-loader": "^6.0.0",
         "@types/chart.js": "^2.9.31",
         "@types/cordova": "0.0.34",
-        "@types/dom-mediacapture-record": "^1.0.7",
+        "@types/dom-mediacapture-record": "^1.0.10",
         "chart.js": "^2.9.4",
         "com-darryncampbell-cordova-plugin-intent": "^1.3.0",
         "cordova": "^10.0.0",
-        "cordova-android": "^9.1.0",
+        "cordova-android": "^10.0.1",
         "cordova-android-support-gradle-release": "^3.0.1",
         "cordova-clipboard": "^1.3.0",
         "cordova-ios": "^6.2.0",
@@ -100,17 +100,17 @@
         "zone.js": "~0.10.3"
       },
       "devDependencies": {
-        "@angular-devkit/build-angular": "~0.1000.8",
+        "@angular-devkit/build-angular": "~0.1102.14",
         "@angular-eslint/builder": "^4.2.0",
         "@angular-eslint/eslint-plugin": "^4.2.0",
         "@angular-eslint/eslint-plugin-template": "^4.2.0",
         "@angular-eslint/schematics": "^4.2.0",
         "@angular-eslint/template-parser": "^4.2.0",
-        "@angular/cli": "~10.0.8",
-        "@angular/compiler": "~10.0.14",
-        "@angular/compiler-cli": "~10.0.14",
-        "@angular/language-service": "~10.0.14",
-        "@ionic/angular-toolkit": "^2.3.3",
+        "@angular/cli": "~11.2.14",
+        "@angular/compiler": "~11.2.14",
+        "@angular/compiler-cli": "~11.2.14",
+        "@angular/language-service": "~11.2.14",
+        "@ionic/angular-toolkit": "^4.0.0",
         "@ionic/cli": "^6.14.1",
         "@types/faker": "^5.1.3",
         "@types/node": "^12.12.64",
@@ -142,7 +142,7 @@
         "native-run": "^1.4.0",
         "ts-jest": "^26.4.1",
         "ts-node": "~8.3.0",
-        "typescript": "^3.9.9"
+        "typescript": "^4.1.6"
       },
       "engines": {
         "node": ">=12.x"
@@ -152,25 +152,25 @@
       }
     },
     "node_modules/@angular-devkit/architect": {
-      "version": "0.1101.2",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1101.2.tgz",
-      "integrity": "sha512-MLmBfHiiyPhbFSSAX4oMecPjEuBauOui5uBpI6BKNnk/7783fznbkbAKjXlOco7M81gkNeEoHMR8c+mOfcvv7g==",
+      "version": "0.1200.5",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1200.5.tgz",
+      "integrity": "sha512-222VZ4OeaDK3vON8V5m+w15SRWfUs5uOb4H9ij/H9/6tyHD83uWfCDoOGg+ax4wJVdWEFJIS+Vn4ijGcZCq9WQ==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "@angular-devkit/core": "11.1.2",
-        "rxjs": "6.6.3"
+        "@angular-devkit/core": "12.0.5",
+        "rxjs": "6.6.7"
       },
       "engines": {
-        "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
+        "node": "^12.14.1 || >=14.0.0",
+        "npm": "^6.11.0 || ^7.5.6",
         "yarn": ">= 1.13.0"
       }
     },
     "node_modules/@angular-devkit/architect/node_modules/rxjs": {
-      "version": "6.6.3",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
-      "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
+      "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -188,129 +188,162 @@
       "peer": true
     },
     "node_modules/@angular-devkit/build-angular": {
-      "version": "0.1000.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.1000.8.tgz",
-      "integrity": "sha512-wwDN2oadQvYPL7lDmvGsoWQjW++0ZnxWk1QVlABGhBSIs8Uxs26Hjd5YNUSsvJavBkqb1UZIOilqzb4dig5MIA==",
+      "version": "0.1102.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.1102.14.tgz",
+      "integrity": "sha512-SyX9SK3qfpk6xNIrxpxYi8zxP/cN2kny4I+XYbkKvgGiE3qhkrC/PRJE9OWj0sloekLD0CDfFWOvIiw3GMc4Tg==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/architect": "0.1000.8",
-        "@angular-devkit/build-optimizer": "0.1000.8",
-        "@angular-devkit/build-webpack": "0.1000.8",
-        "@angular-devkit/core": "10.0.8",
-        "@babel/core": "7.9.6",
-        "@babel/generator": "7.9.6",
-        "@babel/plugin-transform-runtime": "7.9.6",
-        "@babel/preset-env": "7.9.6",
-        "@babel/runtime": "7.9.6",
-        "@babel/template": "7.8.6",
-        "@jsdevtools/coverage-istanbul-loader": "3.0.3",
-        "@ngtools/webpack": "10.0.8",
-        "ajv": "6.12.3",
-        "autoprefixer": "9.8.0",
-        "babel-loader": "8.1.0",
+        "@angular-devkit/architect": "0.1102.14",
+        "@angular-devkit/build-optimizer": "0.1102.14",
+        "@angular-devkit/build-webpack": "0.1102.14",
+        "@angular-devkit/core": "11.2.14",
+        "@babel/core": "7.12.10",
+        "@babel/generator": "7.12.11",
+        "@babel/plugin-transform-async-to-generator": "7.12.1",
+        "@babel/plugin-transform-runtime": "7.12.10",
+        "@babel/preset-env": "7.12.11",
+        "@babel/runtime": "7.12.5",
+        "@babel/template": "7.12.7",
+        "@discoveryjs/json-ext": "0.5.2",
+        "@jsdevtools/coverage-istanbul-loader": "3.0.5",
+        "@ngtools/webpack": "11.2.14",
+        "ansi-colors": "4.1.1",
+        "autoprefixer": "10.2.4",
+        "babel-loader": "8.2.2",
         "browserslist": "^4.9.1",
-        "cacache": "15.0.3",
+        "cacache": "15.0.5",
         "caniuse-lite": "^1.0.30001032",
-        "circular-dependency-plugin": "5.2.0",
-        "copy-webpack-plugin": "6.0.3",
-        "core-js": "3.6.4",
-        "css-loader": "3.5.3",
-        "cssnano": "4.1.10",
-        "file-loader": "6.0.0",
+        "circular-dependency-plugin": "5.2.2",
+        "copy-webpack-plugin": "6.3.2",
+        "core-js": "3.8.3",
+        "critters": "0.0.7",
+        "css-loader": "5.0.1",
+        "cssnano": "5.0.2",
+        "file-loader": "6.2.0",
         "find-cache-dir": "3.3.1",
         "glob": "7.1.6",
-        "jest-worker": "26.0.0",
+        "https-proxy-agent": "5.0.0",
+        "inquirer": "7.3.3",
+        "jest-worker": "26.6.2",
         "karma-source-map-support": "1.4.0",
-        "less-loader": "6.1.0",
-        "license-webpack-plugin": "2.2.0",
+        "less": "4.1.1",
+        "less-loader": "7.3.0",
+        "license-webpack-plugin": "2.3.11",
         "loader-utils": "2.0.0",
-        "mini-css-extract-plugin": "0.9.0",
+        "mini-css-extract-plugin": "1.3.5",
         "minimatch": "3.0.4",
-        "open": "7.0.4",
-        "parse5": "4.0.0",
+        "open": "7.4.0",
+        "ora": "5.3.0",
+        "parse5-html-rewriting-stream": "6.0.1",
         "pnp-webpack-plugin": "1.6.4",
-        "postcss": "7.0.31",
-        "postcss-import": "12.0.1",
-        "postcss-loader": "3.0.0",
-        "raw-loader": "4.0.1",
-        "regenerator-runtime": "0.13.5",
-        "resolve-url-loader": "3.1.1",
+        "postcss": "8.2.15",
+        "postcss-import": "14.0.0",
+        "postcss-loader": "4.2.0",
+        "raw-loader": "4.0.2",
+        "regenerator-runtime": "0.13.7",
+        "resolve-url-loader": "4.0.0",
         "rimraf": "3.0.2",
-        "rollup": "2.10.9",
-        "rxjs": "6.5.5",
-        "sass": "1.26.5",
-        "sass-loader": "8.0.2",
-        "semver": "7.3.2",
+        "rollup": "2.38.4",
+        "rxjs": "6.6.3",
+        "sass": "1.32.6",
+        "sass-loader": "10.1.1",
+        "semver": "7.3.4",
         "source-map": "0.7.3",
-        "source-map-loader": "1.0.0",
+        "source-map-loader": "1.1.3",
         "source-map-support": "0.5.19",
-        "speed-measure-webpack-plugin": "1.3.3",
-        "style-loader": "1.2.1",
-        "stylus": "0.54.7",
-        "stylus-loader": "3.0.2",
-        "terser": "4.7.0",
-        "terser-webpack-plugin": "3.0.1",
+        "speed-measure-webpack-plugin": "1.4.2",
+        "style-loader": "2.0.0",
+        "stylus": "0.54.8",
+        "stylus-loader": "4.3.3",
+        "terser": "5.5.1",
+        "terser-webpack-plugin": "4.2.3",
+        "text-table": "0.2.0",
         "tree-kill": "1.2.2",
-        "webpack": "4.43.0",
+        "webpack": "4.44.2",
         "webpack-dev-middleware": "3.7.2",
-        "webpack-dev-server": "3.11.0",
-        "webpack-merge": "4.2.2",
-        "webpack-sources": "1.4.3",
-        "webpack-subresource-integrity": "1.4.1",
-        "worker-plugin": "4.0.3"
+        "webpack-dev-server": "3.11.2",
+        "webpack-merge": "5.7.3",
+        "webpack-sources": "2.2.0",
+        "webpack-subresource-integrity": "1.5.2",
+        "worker-plugin": "5.0.0"
       },
       "engines": {
         "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
+        "npm": "^6.11.0 || ^7.5.6",
         "yarn": ">= 1.13.0"
       },
       "peerDependencies": {
-        "@angular/compiler-cli": ">=10.0.0-next.0 < 11",
-        "typescript": ">=3.9 < 3.10"
+        "@angular/compiler-cli": "^11.0.0 || ^11.2.0-next",
+        "@angular/localize": "^11.0.0 || ^11.2.0-next",
+        "@angular/service-worker": "^11.0.0 || ^11.2.0-next",
+        "karma": "^5.2.0 || ^6.0.0",
+        "ng-packagr": "^11.0.0 || ^11.2.0-next",
+        "protractor": "^7.0.0",
+        "tailwindcss": "^2.0.0",
+        "tslint": "^6.1.0",
+        "typescript": "~4.0.0 || ~4.1.0"
       },
       "peerDependenciesMeta": {
         "@angular/localize": {
           "optional": true
+        },
+        "@angular/service-worker": {
+          "optional": true
+        },
+        "karma": {
+          "optional": true
+        },
+        "ng-packagr": {
+          "optional": true
+        },
+        "protractor": {
+          "optional": true
+        },
+        "tailwindcss": {
+          "optional": true
+        },
+        "tslint": {
+          "optional": true
         }
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/architect": {
-      "version": "0.1000.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1000.8.tgz",
-      "integrity": "sha512-2AqPbiEugtPxNz4MGhLh+imUVelhW9h1cdJs2AbxZosIxftPb5DNDQUSAwVmRGp4CtcXVrlvcDwc0f4Fw1aiIA==",
+      "version": "0.1102.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.14.tgz",
+      "integrity": "sha512-965TVXuBtRb8RySgxRxUEO+YTd7mT0xiqVHSe+MHvMtUCmEE9vwRofFZl6axkK5ri4fiomiMnOVE19aw4spgNQ==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "10.0.8",
-        "rxjs": "6.5.5"
+        "@angular-devkit/core": "11.2.14",
+        "rxjs": "6.6.3"
       },
       "engines": {
         "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
+        "npm": "^6.11.0 || ^7.5.6",
         "yarn": ">= 1.13.0"
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/core": {
-      "version": "10.0.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
-      "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
+      "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
       "dev": true,
       "dependencies": {
-        "ajv": "6.12.3",
+        "ajv": "6.12.6",
         "fast-json-stable-stringify": "2.1.0",
         "magic-string": "0.25.7",
-        "rxjs": "6.5.5",
+        "rxjs": "6.6.3",
         "source-map": "0.7.3"
       },
       "engines": {
         "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
+        "npm": "^6.11.0 || ^7.5.6",
         "yarn": ">= 1.13.0"
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/ajv": {
-      "version": "6.12.3",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
@@ -324,9 +357,9 @@
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/core-js": {
-      "version": "3.6.4",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
-      "integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==",
+      "version": "3.8.3",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.8.3.tgz",
+      "integrity": "sha512-KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q==",
       "dev": true,
       "hasInstallScript": true,
       "funding": {
@@ -334,61 +367,83 @@
         "url": "https://opencollective.com/core-js"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/open": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/open/-/open-7.0.4.tgz",
-      "integrity": "sha512-brSA+/yq+b08Hsr4c8fsEW2CRzk1BmfN3SAK/5VCHQ9bdoZJ4qa/+AfR0xHjlbbZUyPkUHs1b8x1RqdyZdkVqQ==",
+    "node_modules/@angular-devkit/build-angular/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/rxjs": {
+      "version": "6.6.3",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
+      "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
       "dev": true,
       "dependencies": {
-        "is-docker": "^2.0.0",
-        "is-wsl": "^2.1.1"
+        "tslib": "^1.9.0"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "npm": ">=2.0.0"
       }
     },
+    "node_modules/@angular-devkit/build-angular/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
     "node_modules/@angular-devkit/build-optimizer": {
-      "version": "0.1000.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.1000.8.tgz",
-      "integrity": "sha512-esODHuTGEEMx1SmLUq03VAMly8gZUd1vRuvZeKS5HqKwDg8ZzcI7/25BuuUSlyST+6BEdjo2gnmagQnG0VBdQw==",
+      "version": "0.1102.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.1102.14.tgz",
+      "integrity": "sha512-1j69rFqE6tPMO0lQvOH8ogF7vE+p+Ws1/OtdZKUkZPOerIbQ8A3n5wzCx6/ZzMVhBQ3sXNhaShb4b9/1YuwU/g==",
       "dev": true,
       "dependencies": {
         "loader-utils": "2.0.0",
         "source-map": "0.7.3",
-        "tslib": "2.0.0",
-        "webpack-sources": "1.4.3"
+        "tslib": "2.1.0",
+        "typescript": "4.1.5",
+        "webpack-sources": "2.2.0"
       },
       "bin": {
         "build-optimizer": "src/build-optimizer/cli.js"
       },
       "engines": {
         "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
+        "npm": "^6.11.0 || ^7.5.6",
         "yarn": ">= 1.13.0"
       }
     },
     "node_modules/@angular-devkit/build-optimizer/node_modules/tslib": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.0.tgz",
-      "integrity": "sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz",
+      "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==",
       "dev": true
     },
+    "node_modules/@angular-devkit/build-optimizer/node_modules/typescript": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.1.5.tgz",
+      "integrity": "sha512-6OSu9PTIzmn9TCDiovULTnET6BgXtDYL4Gg4szY+cGsc3JP1dQL8qvE8kShTRx1NIw4Q9IBHlwODjkjWEtMUyA==",
+      "dev": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=4.2.0"
+      }
+    },
     "node_modules/@angular-devkit/build-webpack": {
-      "version": "0.1000.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1000.8.tgz",
-      "integrity": "sha512-y/U+dV5N8W7KECncGSKQWoUH/DFNZCseczyl6LAd8bc0fMr8Z0TAIe8OXj+5CSRRdejWfRIxGtNWM+L2kTCU8A==",
+      "version": "0.1102.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1102.14.tgz",
+      "integrity": "sha512-+dJvzrwjbHY0bNr8fUDVbn4D4pAT/h1YVpGVyaoX7q66LN0x61zRC3e10gJ/Mr54l3yfc26M0OPD9KG8iZRbCA==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/architect": "0.1000.8",
-        "@angular-devkit/core": "10.0.8",
-        "rxjs": "6.5.5"
+        "@angular-devkit/architect": "0.1102.14",
+        "@angular-devkit/core": "11.2.14",
+        "rxjs": "6.6.3"
       },
       "engines": {
         "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
+        "npm": "^6.11.0 || ^7.5.6",
         "yarn": ">= 1.13.0"
       },
       "peerDependencies": {
@@ -397,60 +452,25 @@
       }
     },
     "node_modules/@angular-devkit/build-webpack/node_modules/@angular-devkit/architect": {
-      "version": "0.1000.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1000.8.tgz",
-      "integrity": "sha512-2AqPbiEugtPxNz4MGhLh+imUVelhW9h1cdJs2AbxZosIxftPb5DNDQUSAwVmRGp4CtcXVrlvcDwc0f4Fw1aiIA==",
+      "version": "0.1102.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.14.tgz",
+      "integrity": "sha512-965TVXuBtRb8RySgxRxUEO+YTd7mT0xiqVHSe+MHvMtUCmEE9vwRofFZl6axkK5ri4fiomiMnOVE19aw4spgNQ==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "10.0.8",
-        "rxjs": "6.5.5"
+        "@angular-devkit/core": "11.2.14",
+        "rxjs": "6.6.3"
       },
       "engines": {
         "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
+        "npm": "^6.11.0 || ^7.5.6",
         "yarn": ">= 1.13.0"
       }
     },
     "node_modules/@angular-devkit/build-webpack/node_modules/@angular-devkit/core": {
-      "version": "10.0.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
-      "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
+      "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
       "dev": true,
-      "dependencies": {
-        "ajv": "6.12.3",
-        "fast-json-stable-stringify": "2.1.0",
-        "magic-string": "0.25.7",
-        "rxjs": "6.5.5",
-        "source-map": "0.7.3"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@angular-devkit/build-webpack/node_modules/ajv": {
-      "version": "6.12.3",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/@angular-devkit/core": {
-      "version": "11.1.2",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.1.2.tgz",
-      "integrity": "sha512-V7zOMqL2l56JcwXVyswkG+7+t67r9XtkrVzRcG2Z5ZYwafU+iKWMwg5kBFZr1SX7fM1M9E4MpskxqtagQeUKng==",
-      "dev": true,
-      "peer": true,
       "dependencies": {
         "ajv": "6.12.6",
         "fast-json-stable-stringify": "2.1.0",
@@ -460,16 +480,15 @@
       },
       "engines": {
         "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
+        "npm": "^6.11.0 || ^7.5.6",
         "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@angular-devkit/core/node_modules/ajv": {
+    "node_modules/@angular-devkit/build-webpack/node_modules/ajv": {
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -481,11 +500,55 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/@angular-devkit/core/node_modules/rxjs": {
+    "node_modules/@angular-devkit/build-webpack/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/@angular-devkit/build-webpack/node_modules/rxjs": {
       "version": "6.6.3",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
       "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
       "dev": true,
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-webpack/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
+    "node_modules/@angular-devkit/core": {
+      "version": "12.0.5",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-12.0.5.tgz",
+      "integrity": "sha512-zVSQV+8/vjUjsUKGlj8Kf5LioA6AXJTGI0yhHW9q1dFX4dPpbW63k0R1UoIB2wJ0F/AbYVgpnPGPe9BBm2fvZA==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "ajv": "8.2.0",
+        "ajv-formats": "2.0.2",
+        "fast-json-stable-stringify": "2.1.0",
+        "magic-string": "0.25.7",
+        "rxjs": "6.6.7",
+        "source-map": "0.7.3"
+      },
+      "engines": {
+        "node": "^12.14.1 || >=14.0.0",
+        "npm": "^6.11.0 || ^7.5.6",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular-devkit/core/node_modules/rxjs": {
+      "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+      "dev": true,
       "peer": true,
       "dependencies": {
         "tslib": "^1.9.0"
@@ -502,48 +565,49 @@
       "peer": true
     },
     "node_modules/@angular-devkit/schematics": {
-      "version": "10.0.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.0.8.tgz",
-      "integrity": "sha512-p2PjvrExuzOe/azyOEcBeIgwZIk4D6VeLkJf/KVjhXOVu13pjIXHX7/qWl+IYnbtj3NZGHqXM5Cr8nxsJNIMpw==",
+      "version": "12.1.4",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.1.4.tgz",
+      "integrity": "sha512-yD3y3pK/K5piOgvALFoCCiPp4H8emNa3yZL+vlpEpewVLpF1MM55LeTxc0PI5s0uqtOGVnvcbA5wYgMm3YsUEA==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "10.0.8",
-        "ora": "4.0.4",
-        "rxjs": "6.5.5"
+        "@angular-devkit/core": "12.1.4",
+        "ora": "5.4.1",
+        "rxjs": "6.6.7"
       },
       "engines": {
-        "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
+        "node": "^12.14.1 || >=14.0.0",
+        "npm": "^6.11.0 || ^7.5.6",
         "yarn": ">= 1.13.0"
       }
     },
     "node_modules/@angular-devkit/schematics/node_modules/@angular-devkit/core": {
-      "version": "10.0.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
-      "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
+      "version": "12.1.4",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-12.1.4.tgz",
+      "integrity": "sha512-KOzGD8JbP/7EeUwPiU5x+fo3ZEQ5R4IVW5WoH92PaO3mdpqXC7UL2MWLct8PUe9il9nqJMvrBMldSSvP9PCT2w==",
       "dev": true,
       "dependencies": {
-        "ajv": "6.12.3",
+        "ajv": "8.6.0",
+        "ajv-formats": "2.1.0",
         "fast-json-stable-stringify": "2.1.0",
         "magic-string": "0.25.7",
-        "rxjs": "6.5.5",
+        "rxjs": "6.6.7",
         "source-map": "0.7.3"
       },
       "engines": {
-        "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
+        "node": "^12.14.1 || >=14.0.0",
+        "npm": "^6.11.0 || ^7.5.6",
         "yarn": ">= 1.13.0"
       }
     },
     "node_modules/@angular-devkit/schematics/node_modules/ajv": {
-      "version": "6.12.3",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+      "version": "8.6.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz",
+      "integrity": "sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==",
       "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
         "uri-js": "^4.2.2"
       },
       "funding": {
@@ -551,10 +615,132 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
+    "node_modules/@angular-devkit/schematics/node_modules/ajv-formats": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.0.tgz",
+      "integrity": "sha512-USH2jBb+C/hIpwD2iRjp0pe0k+MvzG0mlSn/FIdCgQhUb9ALPRjt2KIQdfZDS9r0ZIeUAg7gOu9KL0PFqGqr5Q==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-devkit/schematics/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@angular-devkit/schematics/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@angular-devkit/schematics/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/@angular-devkit/schematics/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular-devkit/schematics/node_modules/ora": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
+      "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
+      "dev": true,
+      "dependencies": {
+        "bl": "^4.1.0",
+        "chalk": "^4.1.0",
+        "cli-cursor": "^3.1.0",
+        "cli-spinners": "^2.5.0",
+        "is-interactive": "^1.0.0",
+        "is-unicode-supported": "^0.1.0",
+        "log-symbols": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "wcwidth": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular-devkit/schematics/node_modules/rxjs": {
+      "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/@angular-devkit/schematics/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular-devkit/schematics/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
     "node_modules/@angular-eslint/builder": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-4.2.0.tgz",
-      "integrity": "sha512-qM4hpweuQ14ul8CU6LKpUWFZs6POUE7HZKdTllUrYuoZMrTpNB1XGelR0pweYzbfo4XRnUaO1NVgWhWOWiD5MA==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-4.3.0.tgz",
+      "integrity": "sha512-OzCA4jyELbHt8pyRuW6asib26rc+Ihr2SDjp+uoMivfpqjWVPOw0CvvEZj4SbpGvYOHtcAezyS526D2q2tKHvg==",
       "dev": true,
       "peerDependencies": {
         "@angular/cli": ">= 11.2.0 < 12.0.0",
@@ -563,9 +749,9 @@
       }
     },
     "node_modules/@angular-eslint/eslint-plugin": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-4.2.0.tgz",
-      "integrity": "sha512-G8D8Pso6GcHW8vFkUSvgoKPIOtGTqO+eb5aytGtpogMgzxBRyr0juU/9Uz5dAhO6TOERIj1gPpJQ61R/n/Aaew==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-4.3.0.tgz",
+      "integrity": "sha512-an0fyKzPmpWp9OnstZYXFSCvKnc14F8xfl+HXqvynOiBK63cWTZLlzO+7Z4t3pQiSuiXsEYleRPktWkNWGv0tQ==",
       "dev": true,
       "dependencies": {
         "@typescript-eslint/experimental-utils": "4.16.1"
@@ -577,9 +763,9 @@
       }
     },
     "node_modules/@angular-eslint/eslint-plugin-template": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-4.2.0.tgz",
-      "integrity": "sha512-LC8qqqqVmA/OJAsUt6fQCXLmWP5BL30XFvVsPtrORdxMFt0HI1gvkuz5EVak7PeAXEmerdVarNZr5zmCXIWf3g==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-4.3.0.tgz",
+      "integrity": "sha512-5DuCvEa3cYx0G2mZtECAwgJ19xJWAFZ8Fu8mIkKDiof1dcUISs1PvECJ6NhdzfxEJp0McPQn1jtOK0IDRX1eJw==",
       "dev": true,
       "dependencies": {
         "@typescript-eslint/experimental-utils": "4.16.1",
@@ -593,282 +779,14 @@
         "typescript": "*"
       }
     },
-    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/experimental-utils": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.16.1.tgz",
-      "integrity": "sha512-0Hm3LSlMYFK17jO4iY3un1Ve9x1zLNn4EM50Lia+0EV99NdbK+cn0er7HC7IvBA23mBg3P+8dUkMXy4leL33UQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.3",
-        "@typescript-eslint/scope-manager": "4.16.1",
-        "@typescript-eslint/types": "4.16.1",
-        "@typescript-eslint/typescript-estree": "4.16.1",
-        "eslint-scope": "^5.0.0",
-        "eslint-utils": "^2.0.0"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "*"
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/scope-manager": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.16.1.tgz",
-      "integrity": "sha512-6IlZv9JaurqV0jkEg923cV49aAn8V6+1H1DRfhRcvZUrptQ+UtSKHb5kwTayzOYTJJ/RsYZdcvhOEKiBLyc0Cw==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "4.16.1",
-        "@typescript-eslint/visitor-keys": "4.16.1"
-      },
-      "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/types": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.16.1.tgz",
-      "integrity": "sha512-nnKqBwMgRlhzmJQF8tnFDZWfunXmJyuXj55xc8Kbfup4PbkzdoDXZvzN8//EiKR27J6vUSU8j4t37yUuYPiLqA==",
-      "dev": true,
-      "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.16.1.tgz",
-      "integrity": "sha512-m8I/DKHa8YbeHt31T+UGd/l8Kwr0XCTCZL3H4HMvvLCT7HU9V7yYdinTOv1gf/zfqNeDcCgaFH2BMsS8x6NvJg==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "4.16.1",
-        "@typescript-eslint/visitor-keys": "4.16.1",
-        "debug": "^4.1.1",
-        "globby": "^11.0.1",
-        "is-glob": "^4.0.1",
-        "semver": "^7.3.2",
-        "tsutils": "^3.17.1"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.16.1.tgz",
-      "integrity": "sha512-s/aIP1XcMkEqCNcPQtl60ogUYjSM8FU2mq1O7y5cFf3Xcob1z1iXWNB6cC43Op+NGRTFgGolri6s8z/efA9i1w==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "4.16.1",
-        "eslint-visitor-keys": "^2.0.0"
-      },
-      "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/experimental-utils": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.16.1.tgz",
-      "integrity": "sha512-0Hm3LSlMYFK17jO4iY3un1Ve9x1zLNn4EM50Lia+0EV99NdbK+cn0er7HC7IvBA23mBg3P+8dUkMXy4leL33UQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.3",
-        "@typescript-eslint/scope-manager": "4.16.1",
-        "@typescript-eslint/types": "4.16.1",
-        "@typescript-eslint/typescript-estree": "4.16.1",
-        "eslint-scope": "^5.0.0",
-        "eslint-utils": "^2.0.0"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "*"
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.16.1.tgz",
-      "integrity": "sha512-6IlZv9JaurqV0jkEg923cV49aAn8V6+1H1DRfhRcvZUrptQ+UtSKHb5kwTayzOYTJJ/RsYZdcvhOEKiBLyc0Cw==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "4.16.1",
-        "@typescript-eslint/visitor-keys": "4.16.1"
-      },
-      "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.16.1.tgz",
-      "integrity": "sha512-nnKqBwMgRlhzmJQF8tnFDZWfunXmJyuXj55xc8Kbfup4PbkzdoDXZvzN8//EiKR27J6vUSU8j4t37yUuYPiLqA==",
-      "dev": true,
-      "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.16.1.tgz",
-      "integrity": "sha512-m8I/DKHa8YbeHt31T+UGd/l8Kwr0XCTCZL3H4HMvvLCT7HU9V7yYdinTOv1gf/zfqNeDcCgaFH2BMsS8x6NvJg==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "4.16.1",
-        "@typescript-eslint/visitor-keys": "4.16.1",
-        "debug": "^4.1.1",
-        "globby": "^11.0.1",
-        "is-glob": "^4.0.1",
-        "semver": "^7.3.2",
-        "tsutils": "^3.17.1"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.16.1.tgz",
-      "integrity": "sha512-s/aIP1XcMkEqCNcPQtl60ogUYjSM8FU2mq1O7y5cFf3Xcob1z1iXWNB6cC43Op+NGRTFgGolri6s8z/efA9i1w==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "4.16.1",
-        "eslint-visitor-keys": "^2.0.0"
-      },
-      "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin/node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
     "node_modules/@angular-eslint/schematics": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-4.2.0.tgz",
-      "integrity": "sha512-aohGcfYUqN2hFLWaZoOqkLDyYVDFoLC3LwgIknoaDqWkvFG/RUTg1X1pCFjddLQYP5ist8+OppHH+gnYMbftEw==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-4.3.0.tgz",
+      "integrity": "sha512-zHEpvWoT0mdylQw/K7+RccBK2rJq0to6ZbIp9i65+RZZTHbscaJaDISFvBHm5RNwEhoWI7sJ14ci66pnpAxx3g==",
       "dev": true,
       "dependencies": {
-        "@angular-eslint/eslint-plugin": "4.2.0",
-        "@angular-eslint/eslint-plugin-template": "4.2.0",
+        "@angular-eslint/eslint-plugin": "4.3.0",
+        "@angular-eslint/eslint-plugin-template": "4.3.0",
         "ignore": "5.1.8",
         "strip-json-comments": "3.1.1",
         "tmp": "0.2.1"
@@ -877,22 +795,10 @@
         "@angular/cli": ">= 11.2.0 < 12.0.0"
       }
     },
-    "node_modules/@angular-eslint/schematics/node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/@angular-eslint/template-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-4.2.0.tgz",
-      "integrity": "sha512-77lJ9MDNWmW4ik9l3g149iO9SGRx3qLGZvfSTwmbPxpCgNripWerla9Ia1X+gLkitI8CLpcpiZybxH3EWxj/qQ==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-4.3.0.tgz",
+      "integrity": "sha512-TH+UCrDmOWNLgNgTTR46+wpvgJ3q9Vf9kzqUA5vUNbg/Hhrdbi++DPeCiKagSAXkNBQavqcmyYuT9fzUReIDIg==",
       "dev": true,
       "dependencies": {
         "eslint-scope": "^5.1.0"
@@ -903,104 +809,109 @@
         "typescript": "*"
       }
     },
-    "node_modules/@angular-eslint/template-parser/node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
     "node_modules/@angular/animations": {
-      "version": "10.0.14",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-10.0.14.tgz",
-      "integrity": "sha512-0BOGQOuaudIG0pq6FAnG55teKM7tEQZdIwdoOf0okhh9n0cFWSWRUjvUxWt25bWswlO+HxELyJioiRUvVSES4g==",
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-11.2.14.tgz",
+      "integrity": "sha512-Heq/nNrCmb3jbkusu+BQszOecfFI/31Oxxj+CDQkqqYpBcswk6bOJLoEE472o+vmgxaXbgeflU9qbIiCQhpMFA==",
       "dependencies": {
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "@angular/core": "10.0.14"
+        "@angular/core": "11.2.14"
       }
     },
     "node_modules/@angular/cli": {
-      "version": "10.0.8",
-      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-10.0.8.tgz",
-      "integrity": "sha512-unTteffLepsFw7qQulHOLLyLqCpQMOaZo0WO4x6cQGcW2mc0WgwnwBW2JDYMx1U2434t/Q13LqYMPNYWyCGsog==",
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-11.2.14.tgz",
+      "integrity": "sha512-8Ud7vcUK7CKjzT2Ks1glLhleAPIC5ChcrA15XtOb7k+/uMHBkMscP/UKymbVQiBjCJlglbzJoyj8cpVYTZY5KA==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
-        "@angular-devkit/architect": "0.1000.8",
-        "@angular-devkit/core": "10.0.8",
-        "@angular-devkit/schematics": "10.0.8",
-        "@schematics/angular": "10.0.8",
-        "@schematics/update": "0.1000.8",
+        "@angular-devkit/architect": "0.1102.14",
+        "@angular-devkit/core": "11.2.14",
+        "@angular-devkit/schematics": "11.2.14",
+        "@schematics/angular": "11.2.14",
+        "@schematics/update": "0.1102.14",
         "@yarnpkg/lockfile": "1.1.0",
         "ansi-colors": "4.1.1",
-        "debug": "4.1.1",
-        "ini": "1.3.5",
-        "inquirer": "7.1.0",
-        "npm-package-arg": "8.0.1",
+        "debug": "4.3.1",
+        "ini": "2.0.0",
+        "inquirer": "7.3.3",
+        "jsonc-parser": "3.0.0",
+        "npm-package-arg": "8.1.0",
         "npm-pick-manifest": "6.1.0",
-        "open": "7.0.4",
-        "pacote": "9.5.12",
-        "read-package-tree": "5.3.1",
+        "open": "7.4.0",
+        "ora": "5.3.0",
+        "pacote": "11.2.4",
+        "resolve": "1.19.0",
         "rimraf": "3.0.2",
-        "semver": "7.3.2",
-        "symbol-observable": "1.2.0",
-        "universal-analytics": "0.4.20",
-        "uuid": "8.1.0"
+        "semver": "7.3.4",
+        "symbol-observable": "3.0.0",
+        "universal-analytics": "0.4.23",
+        "uuid": "8.3.2"
       },
       "bin": {
         "ng": "bin/ng"
       },
       "engines": {
         "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
+        "npm": "^6.11.0 || ^7.5.6",
         "yarn": ">= 1.13.0"
       }
     },
     "node_modules/@angular/cli/node_modules/@angular-devkit/architect": {
-      "version": "0.1000.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1000.8.tgz",
-      "integrity": "sha512-2AqPbiEugtPxNz4MGhLh+imUVelhW9h1cdJs2AbxZosIxftPb5DNDQUSAwVmRGp4CtcXVrlvcDwc0f4Fw1aiIA==",
+      "version": "0.1102.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.14.tgz",
+      "integrity": "sha512-965TVXuBtRb8RySgxRxUEO+YTd7mT0xiqVHSe+MHvMtUCmEE9vwRofFZl6axkK5ri4fiomiMnOVE19aw4spgNQ==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "10.0.8",
-        "rxjs": "6.5.5"
+        "@angular-devkit/core": "11.2.14",
+        "rxjs": "6.6.3"
       },
       "engines": {
         "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
+        "npm": "^6.11.0 || ^7.5.6",
         "yarn": ">= 1.13.0"
       }
     },
     "node_modules/@angular/cli/node_modules/@angular-devkit/core": {
-      "version": "10.0.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
-      "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
+      "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
       "dev": true,
       "dependencies": {
-        "ajv": "6.12.3",
+        "ajv": "6.12.6",
         "fast-json-stable-stringify": "2.1.0",
         "magic-string": "0.25.7",
-        "rxjs": "6.5.5",
+        "rxjs": "6.6.3",
         "source-map": "0.7.3"
       },
       "engines": {
         "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
+        "npm": "^6.11.0 || ^7.5.6",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/@angular-devkit/schematics": {
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.14.tgz",
+      "integrity": "sha512-Ol6+0qdGKzuVJm5gCtQr47X0OCihTfAxI4h047cHYhPFIGGPSvkG/QeJMZugflgoobi2k/xcYokOu/VAkRtWbQ==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "11.2.14",
+        "ora": "5.3.0",
+        "rxjs": "6.6.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": "^6.11.0 || ^7.5.6",
         "yarn": ">= 1.13.0"
       }
     },
     "node_modules/@angular/cli/node_modules/ajv": {
-      "version": "6.12.3",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
@@ -1013,223 +924,64 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/@angular/cli/node_modules/ansi-colors": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/ansi-escapes": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.11.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "dev": true,
-      "dependencies": {
-        "restore-cursor": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/debug": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+    "node_modules/@angular/cli/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true
     },
-    "node_modules/@angular/cli/node_modules/figures": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-      "dev": true,
-      "dependencies": {
-        "escape-string-regexp": "^1.0.5"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/inquirer": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz",
-      "integrity": "sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^3.0.0",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^2.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^3.0.0",
-        "lodash": "^4.17.15",
-        "mute-stream": "0.0.8",
-        "run-async": "^2.4.0",
-        "rxjs": "^6.5.3",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "through": "^2.3.6"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/is-fullwidth-code-point": {
+    "node_modules/@angular/cli/node_modules/jsonc-parser": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
+      "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==",
       "dev": true
     },
-    "node_modules/@angular/cli/node_modules/open": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/open/-/open-7.0.4.tgz",
-      "integrity": "sha512-brSA+/yq+b08Hsr4c8fsEW2CRzk1BmfN3SAK/5VCHQ9bdoZJ4qa/+AfR0xHjlbbZUyPkUHs1b8x1RqdyZdkVqQ==",
+    "node_modules/@angular/cli/node_modules/rxjs": {
+      "version": "6.6.3",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
+      "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
       "dev": true,
       "dependencies": {
-        "is-docker": "^2.0.0",
-        "is-wsl": "^2.1.1"
+        "tslib": "^1.9.0"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "npm": ">=2.0.0"
       }
     },
-    "node_modules/@angular/cli/node_modules/restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-      "dev": true,
-      "dependencies": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/string-width": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/type-fest": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-      "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/uuid": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.1.0.tgz",
-      "integrity": "sha512-CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg==",
-      "dev": true,
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
+    "node_modules/@angular/cli/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
     },
     "node_modules/@angular/common": {
-      "version": "10.0.14",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-10.0.14.tgz",
-      "integrity": "sha512-EOAuaMt2HwJF3DtIJ/ksHtnF8Pqh5K2rWISYLEs9R3WNaSGn74kbCODAT4pNhI8P22Ykl3H4FmQUgnDZ3uDAUg==",
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-11.2.14.tgz",
+      "integrity": "sha512-ZSLV/3j7eCTyLf/8g4yBFLWySjiLz3vLJAGWscYoUpnJWMnug1VRu6zoF/COxCbtORgE+Wz6K0uhfS6MziBGVw==",
       "dependencies": {
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "@angular/core": "10.0.14",
+        "@angular/core": "11.2.14",
         "rxjs": "^6.5.3"
       }
     },
     "node_modules/@angular/compiler": {
-      "version": "10.0.14",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-10.0.14.tgz",
-      "integrity": "sha512-lYNo6/MmnYAVFoDQDBB6HMFd9zHg3RHXc6hn+wchU0XSWiIsg6WYHbKOb/DyqUEyKebzy0gSKZf7gUeZHtj62Q==",
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-11.2.14.tgz",
+      "integrity": "sha512-XBOK3HgA+/y6Cz7kOX4zcJYmgJ264XnfcbXUMU2cD7Ac+mbNhLPKohWrEiSWalfcjnpf5gRfufQrQP7lpAGu0A==",
       "dependencies": {
         "tslib": "^2.0.0"
       }
     },
     "node_modules/@angular/compiler-cli": {
-      "version": "10.0.14",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-10.0.14.tgz",
-      "integrity": "sha512-WK+S90sjc+3iMo8/CuuAX0RdGFwyA9esqqC5fYG/MDZjKuPuhogiimmR0rY3P1Th7B9di8x012xiILbf4GsGUQ==",
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-11.2.14.tgz",
+      "integrity": "sha512-A7ltnCp03/EVqK/Q3tVUDsokgz5GHW3dSPGl0Csk7Ys5uBB9ibHTmVt4eiXA4jt0+6Bk+mKxwe5BEDqLvwYFAg==",
       "dev": true,
       "dependencies": {
+        "@babel/core": "^7.8.6",
+        "@babel/types": "^7.8.6",
         "canonical-path": "1.0.0",
         "chokidar": "^3.0.0",
         "convert-source-map": "^1.5.1",
@@ -1242,7 +994,7 @@
         "source-map": "^0.6.1",
         "sourcemap-codec": "^1.4.8",
         "tslib": "^2.0.0",
-        "yargs": "15.3.0"
+        "yargs": "^16.2.0"
       },
       "bin": {
         "ivy-ngcc": "ngcc/main-ivy-ngcc.js",
@@ -1254,47 +1006,8 @@
         "node": ">=10.0"
       },
       "peerDependencies": {
-        "@angular/compiler": "10.0.14",
-        "typescript": ">=3.9 <4.0"
-      }
-    },
-    "node_modules/@angular/compiler-cli/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@angular/compiler-cli/node_modules/cliui": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^6.2.0"
-      }
-    },
-    "node_modules/@angular/compiler-cli/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/@angular/compiler-cli/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "@angular/compiler": "11.2.14",
+        "typescript": ">=4.0 <4.2"
       }
     },
     "node_modules/@angular/compiler-cli/node_modules/fs-extra": {
@@ -1308,15 +1021,6 @@
         "universalify": "^0.1.0"
       }
     },
-    "node_modules/@angular/compiler-cli/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@angular/compiler-cli/node_modules/jsonfile": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
@@ -1326,54 +1030,6 @@
         "graceful-fs": "^4.1.6"
       }
     },
-    "node_modules/@angular/compiler-cli/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@angular/compiler-cli/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@angular/compiler-cli/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@angular/compiler-cli/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@angular/compiler-cli/node_modules/semver": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -1392,32 +1048,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/@angular/compiler-cli/node_modules/string-width": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@angular/compiler-cli/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@angular/compiler-cli/node_modules/universalify": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
@@ -1427,98 +1057,49 @@
         "node": ">= 4.0.0"
       }
     },
-    "node_modules/@angular/compiler-cli/node_modules/wrap-ansi": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@angular/compiler-cli/node_modules/yargs": {
-      "version": "15.3.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.0.tgz",
-      "integrity": "sha512-g/QCnmjgOl1YJjGsnUg2SatC7NUYEiLXJqxNOQU9qSpjzGtGXda9b+OKccr1kLTy8BN9yqEyqfq5lxlwdc13TA==",
-      "dev": true,
-      "dependencies": {
-        "cliui": "^6.0.0",
-        "decamelize": "^1.2.0",
-        "find-up": "^4.1.0",
-        "get-caller-file": "^2.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^4.2.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^18.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@angular/compiler-cli/node_modules/yargs-parser": {
-      "version": "18.1.3",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/@angular/core": {
-      "version": "10.0.14",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-10.0.14.tgz",
-      "integrity": "sha512-m+c9g6fA/gE+6K7It01b6r8TEmbuFjUZajQ9gG/pzist0mTBcqfvn0O4h5X+ebnSgw/bbnnp+4PbaXEi1pOWZQ==",
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-11.2.14.tgz",
+      "integrity": "sha512-vpR4XqBGitk1Faph37CSpemwIYTmJ3pdIVNoHKP6jLonpWu+0azkchf0f7oD8/2ivj2F81opcIw0tcsy/D/5Vg==",
       "dependencies": {
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
         "rxjs": "^6.5.3",
-        "zone.js": "~0.10.3"
+        "zone.js": "^0.10.2 || ^0.11.3"
       }
     },
     "node_modules/@angular/forms": {
-      "version": "10.0.14",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-10.0.14.tgz",
-      "integrity": "sha512-McKh3rXDlAE7qmCnyWKENb2HhqAT+1dsAfChuqs0w8jhKkoRgA00RDFee6dZ6XQCc907DwuV0K8+wC3CvBp35w==",
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-11.2.14.tgz",
+      "integrity": "sha512-4LWqY6KEIk1AZQFnk+4PJSOCamlD4tumuVN06gO4D0dZo9Cx+GcvW6pM6N0CPubRvPs3sScCnu20WT11HNWC1w==",
       "dependencies": {
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "@angular/common": "10.0.14",
-        "@angular/core": "10.0.14",
-        "@angular/platform-browser": "10.0.14",
+        "@angular/common": "11.2.14",
+        "@angular/core": "11.2.14",
+        "@angular/platform-browser": "11.2.14",
         "rxjs": "^6.5.3"
       }
     },
     "node_modules/@angular/language-service": {
-      "version": "10.0.14",
-      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-10.0.14.tgz",
-      "integrity": "sha512-QQLYUjD0T6u2hLNYXUEUbupAGsz5egmhCAckaQojvXCe3SLL/hQsrK4odrNuspy7TvMB0H5ZNEHGlF6m/WLZ3g==",
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-11.2.14.tgz",
+      "integrity": "sha512-3+0F0X4r1WeNOV6VmaMzYnJENPVmLX2/MX3/lugwZPNYKVXl/oGyh/4PB8ktntIj0tnxQuErzqRSeucNStNGRw==",
       "dev": true
     },
     "node_modules/@angular/platform-browser": {
-      "version": "10.0.14",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-10.0.14.tgz",
-      "integrity": "sha512-DcBZ1wt2TwtXrdcmCTWanAzu2Vxk5Uvioam0UcDxcgXD84T2fHipyfZVn07fMqRvzFQj45tDNAEevFBnGZar4w==",
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-11.2.14.tgz",
+      "integrity": "sha512-fb7b7ss/gRoP8wLAN17W62leMgjynuyjEPU2eUoAAazsG9f2cgM+z3rK29GYncDVyYQxZUZYnjSqvL6GSXx86A==",
       "dependencies": {
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "@angular/animations": "10.0.14",
-        "@angular/common": "10.0.14",
-        "@angular/core": "10.0.14"
+        "@angular/animations": "11.2.14",
+        "@angular/common": "11.2.14",
+        "@angular/core": "11.2.14"
       },
       "peerDependenciesMeta": {
         "@angular/animations": {
@@ -1527,82 +1108,73 @@
       }
     },
     "node_modules/@angular/platform-browser-dynamic": {
-      "version": "10.0.14",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-10.0.14.tgz",
-      "integrity": "sha512-PPCAiNh/JSuQNKXOhj3a8CTFdVhTgF/EpGtaotnVr/BfbJMeFImKo7m2QQOTsAFaEP2DurSHnofPnMWAfHS2mg==",
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-11.2.14.tgz",
+      "integrity": "sha512-TWTPdFs6iBBcp+/YMsgCRQwdHpWGq8KjeJDJ2tfatGgBD3Gqt2YaHOMST1zPW6RkrmupytTejuVqXzeaKWFxuw==",
       "dependencies": {
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "@angular/common": "10.0.14",
-        "@angular/compiler": "10.0.14",
-        "@angular/core": "10.0.14",
-        "@angular/platform-browser": "10.0.14"
+        "@angular/common": "11.2.14",
+        "@angular/compiler": "11.2.14",
+        "@angular/core": "11.2.14",
+        "@angular/platform-browser": "11.2.14"
       }
     },
     "node_modules/@angular/router": {
-      "version": "10.0.14",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-10.0.14.tgz",
-      "integrity": "sha512-VWzaNyPZDY99TMszV1GlXJgVOxXsjhJrsv3mIcjaz1dfdlKOeKTVDLdnyXfP9CkwE3PRmvG7eSXppIj6nn9BpQ==",
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-11.2.14.tgz",
+      "integrity": "sha512-3aYBmj+zrEL9yf/ntIQxHIYaWShZOBKP3U07X2mX+TPMpGlvHDnR7L6bWhQVZwewzMMz7YVR16ldg50IFuAlfA==",
       "dependencies": {
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "@angular/common": "10.0.14",
-        "@angular/core": "10.0.14",
-        "@angular/platform-browser": "10.0.14",
+        "@angular/common": "11.2.14",
+        "@angular/core": "11.2.14",
+        "@angular/platform-browser": "11.2.14",
         "rxjs": "^6.5.3"
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-      "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz",
+      "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==",
       "dev": true,
       "dependencies": {
-        "@babel/highlight": "^7.10.4"
+        "@babel/highlight": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.11.0.tgz",
-      "integrity": "sha512-TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ==",
+      "version": "7.14.9",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.9.tgz",
+      "integrity": "sha512-p3QjZmMGHDGdpcwEYYWu7i7oJShJvtgMjJeb0W95PPhSm++3lm8YXYOh45Y6iCN9PkZLTZ7CIX5nFrp7pw7TXw==",
       "dev": true,
-      "dependencies": {
-        "browserslist": "^4.12.0",
-        "invariant": "^2.2.4",
-        "semver": "^5.5.0"
-      }
-    },
-    "node_modules/@babel/compat-data/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.9.6",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz",
-      "integrity": "sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==",
+      "version": "7.12.10",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.10.tgz",
+      "integrity": "sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.8.3",
-        "@babel/generator": "^7.9.6",
-        "@babel/helper-module-transforms": "^7.9.0",
-        "@babel/helpers": "^7.9.6",
-        "@babel/parser": "^7.9.6",
-        "@babel/template": "^7.8.6",
-        "@babel/traverse": "^7.9.6",
-        "@babel/types": "^7.9.6",
+        "@babel/code-frame": "^7.10.4",
+        "@babel/generator": "^7.12.10",
+        "@babel/helper-module-transforms": "^7.12.1",
+        "@babel/helpers": "^7.12.5",
+        "@babel/parser": "^7.12.10",
+        "@babel/template": "^7.12.7",
+        "@babel/traverse": "^7.12.10",
+        "@babel/types": "^7.12.10",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.1",
         "json5": "^2.1.2",
-        "lodash": "^4.17.13",
-        "resolve": "^1.3.2",
+        "lodash": "^4.17.19",
         "semver": "^5.4.1",
         "source-map": "^0.5.0"
       },
@@ -1614,30 +1186,6 @@
         "url": "https://opencollective.com/babel"
       }
     },
-    "node_modules/@babel/core/node_modules/debug": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
-      "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
-      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@babel/core/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
     "node_modules/@babel/core/node_modules/semver": {
       "version": "5.7.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
@@ -1657,14 +1205,13 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.9.6",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz",
-      "integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==",
+      "version": "7.12.11",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz",
+      "integrity": "sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.9.6",
+        "@babel/types": "^7.12.11",
         "jsesc": "^2.5.1",
-        "lodash": "^4.17.13",
         "source-map": "^0.5.0"
       }
     },
@@ -1678,393 +1225,393 @@
       }
     },
     "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz",
-      "integrity": "sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.14.5.tgz",
+      "integrity": "sha512-EivH9EgBIb+G8ij1B2jAwSH36WnGvkQSEC6CkX/6v6ZFlw5fVOHvsgGF4uiEHO2GzMvunZb6tDLQEQSdrdocrA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.10.4"
+        "@babel/types": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz",
-      "integrity": "sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.14.5.tgz",
+      "integrity": "sha512-YTA/Twn0vBXDVGJuAX6PwW7x5zQei1luDDo2Pl6q1qZ7hVNl0RZrhHCQG/ArGpR29Vl7ETiB8eJyrvpuRp300w==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-explode-assignable-expression": "^7.10.4",
-        "@babel/types": "^7.10.4"
+        "@babel/helper-explode-assignable-expression": "^7.14.5",
+        "@babel/types": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz",
-      "integrity": "sha512-a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz",
+      "integrity": "sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.10.4",
-        "browserslist": "^4.12.0",
-        "invariant": "^2.2.4",
-        "levenary": "^1.1.1",
-        "semver": "^5.5.0"
+        "@babel/compat-data": "^7.14.5",
+        "@babel/helper-validator-option": "^7.14.5",
+        "browserslist": "^4.16.6",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
       "dev": true,
       "bin": {
-        "semver": "bin/semver"
+        "semver": "bin/semver.js"
       }
     },
-    "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz",
-      "integrity": "sha512-2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g==",
+    "node_modules/@babel/helper-create-class-features-plugin": {
+      "version": "7.14.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.8.tgz",
+      "integrity": "sha512-bpYvH8zJBWzeqi1o+co8qOrw+EXzQ/0c74gVmY205AWXy9nifHrOg77y+1zwxX5lXE7Icq4sPlSQ4O2kWBrteQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.10.4",
-        "@babel/helper-regex": "^7.10.4",
-        "regexpu-core": "^4.7.0"
+        "@babel/helper-annotate-as-pure": "^7.14.5",
+        "@babel/helper-function-name": "^7.14.5",
+        "@babel/helper-member-expression-to-functions": "^7.14.7",
+        "@babel/helper-optimise-call-expression": "^7.14.5",
+        "@babel/helper-replace-supers": "^7.14.5",
+        "@babel/helper-split-export-declaration": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-define-map": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz",
-      "integrity": "sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==",
+    "node_modules/@babel/helper-create-regexp-features-plugin": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz",
+      "integrity": "sha512-TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-function-name": "^7.10.4",
-        "@babel/types": "^7.10.5",
-        "lodash": "^4.17.19"
+        "@babel/helper-annotate-as-pure": "^7.14.5",
+        "regexpu-core": "^4.7.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
     "node_modules/@babel/helper-explode-assignable-expression": {
-      "version": "7.11.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz",
-      "integrity": "sha512-ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.14.5.tgz",
+      "integrity": "sha512-Htb24gnGJdIGT4vnRKMdoXiOIlqOLmdiUYpAQ0mYfgVT/GDm8GOYhgi4GL+hMKrkiPRohO4ts34ELFsGAPQLDQ==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.10.4"
+        "@babel/types": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-function-name": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
-      "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz",
+      "integrity": "sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-get-function-arity": "^7.10.4",
-        "@babel/template": "^7.10.4",
-        "@babel/types": "^7.10.4"
+        "@babel/helper-get-function-arity": "^7.14.5",
+        "@babel/template": "^7.14.5",
+        "@babel/types": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-function-name/node_modules/@babel/template": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz",
+      "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/parser": "^7.10.4",
-        "@babel/types": "^7.10.4"
+        "@babel/code-frame": "^7.14.5",
+        "@babel/parser": "^7.14.5",
+        "@babel/types": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-get-function-arity": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
-      "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz",
+      "integrity": "sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.10.4"
+        "@babel/types": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz",
-      "integrity": "sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz",
+      "integrity": "sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.10.4"
+        "@babel/types": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
-      "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz",
+      "integrity": "sha512-TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.11.0"
+        "@babel/types": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz",
-      "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz",
+      "integrity": "sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.10.4"
+        "@babel/types": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz",
-      "integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==",
+      "version": "7.14.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.8.tgz",
+      "integrity": "sha512-RyE+NFOjXn5A9YU1dkpeBaduagTlZ0+fccnIcAGbv1KGUlReBj7utF7oEth8IdIBQPcux0DDgW5MFBH2xu9KcA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-imports": "^7.10.4",
-        "@babel/helper-replace-supers": "^7.10.4",
-        "@babel/helper-simple-access": "^7.10.4",
-        "@babel/helper-split-export-declaration": "^7.11.0",
-        "@babel/template": "^7.10.4",
-        "@babel/types": "^7.11.0",
-        "lodash": "^4.17.19"
+        "@babel/helper-module-imports": "^7.14.5",
+        "@babel/helper-replace-supers": "^7.14.5",
+        "@babel/helper-simple-access": "^7.14.8",
+        "@babel/helper-split-export-declaration": "^7.14.5",
+        "@babel/helper-validator-identifier": "^7.14.8",
+        "@babel/template": "^7.14.5",
+        "@babel/traverse": "^7.14.8",
+        "@babel/types": "^7.14.8"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms/node_modules/@babel/template": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz",
+      "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/parser": "^7.10.4",
-        "@babel/types": "^7.10.4"
+        "@babel/code-frame": "^7.14.5",
+        "@babel/parser": "^7.14.5",
+        "@babel/types": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz",
-      "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz",
+      "integrity": "sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.10.4"
+        "@babel/types": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-      "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-regex": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.5.tgz",
-      "integrity": "sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz",
+      "integrity": "sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==",
       "dev": true,
-      "dependencies": {
-        "lodash": "^4.17.19"
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.11.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz",
-      "integrity": "sha512-tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.14.5.tgz",
+      "integrity": "sha512-rLQKdQU+HYlxBwQIj8dk4/0ENOUEhA/Z0l4hN8BexpvmSMN9oA9EagjnhnDpNsRdWCfjwa4mn/HyBXO9yhQP6A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.10.4",
-        "@babel/helper-wrap-function": "^7.10.4",
-        "@babel/template": "^7.10.4",
-        "@babel/types": "^7.10.4"
-      }
-    },
-    "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/template": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/parser": "^7.10.4",
-        "@babel/types": "^7.10.4"
+        "@babel/helper-annotate-as-pure": "^7.14.5",
+        "@babel/helper-wrap-function": "^7.14.5",
+        "@babel/types": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
-      "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz",
+      "integrity": "sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-member-expression-to-functions": "^7.10.4",
-        "@babel/helper-optimise-call-expression": "^7.10.4",
-        "@babel/traverse": "^7.10.4",
-        "@babel/types": "^7.10.4"
+        "@babel/helper-member-expression-to-functions": "^7.14.5",
+        "@babel/helper-optimise-call-expression": "^7.14.5",
+        "@babel/traverse": "^7.14.5",
+        "@babel/types": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-simple-access": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz",
-      "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==",
+      "version": "7.14.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz",
+      "integrity": "sha512-TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg==",
       "dev": true,
       "dependencies": {
-        "@babel/template": "^7.10.4",
-        "@babel/types": "^7.10.4"
-      }
-    },
-    "node_modules/@babel/helper-simple-access/node_modules/@babel/template": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/parser": "^7.10.4",
-        "@babel/types": "^7.10.4"
+        "@babel/types": "^7.14.8"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz",
-      "integrity": "sha512-0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.14.5.tgz",
+      "integrity": "sha512-dmqZB7mrb94PZSAOYtr+ZN5qt5owZIAgqtoTuqiFbHFtxgEcmQlRJVI+bO++fciBunXtB6MK7HrzrfcAzIz2NQ==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.11.0"
+        "@babel/types": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
-      "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz",
+      "integrity": "sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.11.0"
+        "@babel/types": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
-      "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
-      "dev": true
+      "version": "7.14.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz",
+      "integrity": "sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-option": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz",
+      "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
     },
     "node_modules/@babel/helper-wrap-function": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz",
-      "integrity": "sha512-6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.14.5.tgz",
+      "integrity": "sha512-YEdjTCq+LNuNS1WfxsDCNpgXkJaIyqco6DAelTUjT4f2KIWC1nBcaCaSdHTBqQVLnTBexBcVcFhLSU1KnYuePQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-function-name": "^7.10.4",
-        "@babel/template": "^7.10.4",
-        "@babel/traverse": "^7.10.4",
-        "@babel/types": "^7.10.4"
+        "@babel/helper-function-name": "^7.14.5",
+        "@babel/template": "^7.14.5",
+        "@babel/traverse": "^7.14.5",
+        "@babel/types": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-wrap-function/node_modules/@babel/template": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz",
+      "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/parser": "^7.10.4",
-        "@babel/types": "^7.10.4"
+        "@babel/code-frame": "^7.14.5",
+        "@babel/parser": "^7.14.5",
+        "@babel/types": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.4.tgz",
-      "integrity": "sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==",
+      "version": "7.14.8",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.8.tgz",
+      "integrity": "sha512-ZRDmI56pnV+p1dH6d+UN6GINGz7Krps3+270qqI9UJ4wxYThfAIcI5i7j5vXC4FJ3Wap+S9qcebxeYiqn87DZw==",
       "dev": true,
       "dependencies": {
-        "@babel/template": "^7.10.4",
-        "@babel/traverse": "^7.10.4",
-        "@babel/types": "^7.10.4"
+        "@babel/template": "^7.14.5",
+        "@babel/traverse": "^7.14.8",
+        "@babel/types": "^7.14.8"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers/node_modules/@babel/template": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz",
+      "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/parser": "^7.10.4",
-        "@babel/types": "^7.10.4"
+        "@babel/code-frame": "^7.14.5",
+        "@babel/parser": "^7.14.5",
+        "@babel/types": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-      "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
+      "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.10.4",
+        "@babel/helper-validator-identifier": "^7.14.5",
         "chalk": "^2.0.0",
         "js-tokens": "^4.0.0"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
       },
       "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/@babel/highlight/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.11.5",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
-      "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
+      "version": "7.14.9",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.9.tgz",
+      "integrity": "sha512-RdUTOseXJ8POjjOeEBEvNMIZU/nm4yu2rufRkcibzkkg7DmQvXU8v3M4Xk9G7uuI86CDGkKcuDWgioqZm+mScQ==",
       "dev": true,
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -2074,120 +1621,210 @@
       }
     },
     "node_modules/@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz",
-      "integrity": "sha512-cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg==",
+      "version": "7.14.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.9.tgz",
+      "integrity": "sha512-d1lnh+ZnKrFKwtTYdw320+sQWCTwgkB9fmUhNXRADA4akR6wLjaruSGnIEUjpt9HCOwTr4ynFTKu19b7rFRpmw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-remap-async-to-generator": "^7.10.4",
-        "@babel/plugin-syntax-async-generators": "^7.8.0"
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-remap-async-to-generator": "^7.14.5",
+        "@babel/plugin-syntax-async-generators": "^7.8.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-class-properties": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz",
+      "integrity": "sha512-q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-proposal-dynamic-import": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz",
-      "integrity": "sha512-up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz",
+      "integrity": "sha512-ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.0"
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-export-namespace-from": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz",
+      "integrity": "sha512-g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-proposal-json-strings": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz",
-      "integrity": "sha512-fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz",
+      "integrity": "sha512-NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/plugin-syntax-json-strings": "^7.8.0"
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-json-strings": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-logical-assignment-operators": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz",
+      "integrity": "sha512-YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz",
-      "integrity": "sha512-wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz",
+      "integrity": "sha512-gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0"
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-proposal-numeric-separator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz",
-      "integrity": "sha512-73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz",
+      "integrity": "sha512-yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.14.5",
         "@babel/plugin-syntax-numeric-separator": "^7.10.4"
       },
+      "engines": {
+        "node": ">=6.9.0"
+      },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz",
-      "integrity": "sha512-wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA==",
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.7.tgz",
+      "integrity": "sha512-082hsZz+sVabfmDWo1Oct1u1AgbKbUAyVgmX4otIc7bdsRgHBXwTwb3DpDmD4Eyyx6DNiuz5UAATT655k+kL5g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-        "@babel/plugin-transform-parameters": "^7.10.4"
+        "@babel/compat-data": "^7.14.7",
+        "@babel/helper-compilation-targets": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz",
-      "integrity": "sha512-LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz",
+      "integrity": "sha512-3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.0"
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-proposal-optional-chaining": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz",
-      "integrity": "sha512-v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz",
+      "integrity": "sha512-ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.0"
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-private-methods": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz",
+      "integrity": "sha512-838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz",
-      "integrity": "sha512-H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz",
+      "integrity": "sha512-6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
       },
       "engines": {
         "node": ">=4"
@@ -2221,12 +1858,12 @@
       }
     },
     "node_modules/@babel/plugin-syntax-class-properties": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz",
-      "integrity": "sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA==",
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.12.13"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
@@ -2244,6 +1881,18 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-syntax-export-namespace-from": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
+      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.3"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
     "node_modules/@babel/plugin-syntax-import-meta": {
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
@@ -2341,349 +1990,422 @@
       }
     },
     "node_modules/@babel/plugin-syntax-top-level-await": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz",
-      "integrity": "sha512-ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz",
-      "integrity": "sha512-9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz",
+      "integrity": "sha512-KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz",
-      "integrity": "sha512-F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz",
+      "integrity": "sha512-SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-imports": "^7.10.4",
+        "@babel/helper-module-imports": "^7.12.1",
         "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-remap-async-to-generator": "^7.10.4"
+        "@babel/helper-remap-async-to-generator": "^7.12.1"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz",
-      "integrity": "sha512-WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz",
+      "integrity": "sha512-dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.11.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz",
-      "integrity": "sha512-00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.5.tgz",
+      "integrity": "sha512-LBYm4ZocNgoCqyxMLoOnwpsmQ18HWTQvql64t3GvMUzLQrNoV1BDG0lNftC8QKYERkZgCCT/7J5xWGObGAyHDw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz",
-      "integrity": "sha512-2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA==",
+      "version": "7.14.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.9.tgz",
+      "integrity": "sha512-NfZpTcxU3foGWbl4wxmZ35mTsYJy8oQocbeIMoDAGGFarAmSQlL+LWMkDx/tj6pNotpbX3rltIA4dprgAPOq5A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.10.4",
-        "@babel/helper-define-map": "^7.10.4",
-        "@babel/helper-function-name": "^7.10.4",
-        "@babel/helper-optimise-call-expression": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-replace-supers": "^7.10.4",
-        "@babel/helper-split-export-declaration": "^7.10.4",
+        "@babel/helper-annotate-as-pure": "^7.14.5",
+        "@babel/helper-function-name": "^7.14.5",
+        "@babel/helper-optimise-call-expression": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-replace-supers": "^7.14.5",
+        "@babel/helper-split-export-declaration": "^7.14.5",
         "globals": "^11.1.0"
       },
+      "engines": {
+        "node": ">=6.9.0"
+      },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz",
-      "integrity": "sha512-JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz",
+      "integrity": "sha512-pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz",
-      "integrity": "sha512-+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA==",
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz",
+      "integrity": "sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz",
-      "integrity": "sha512-ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz",
+      "integrity": "sha512-loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz",
-      "integrity": "sha512-GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz",
+      "integrity": "sha512-iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz",
-      "integrity": "sha512-S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz",
+      "integrity": "sha512-jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz",
-      "integrity": "sha512-ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.14.5.tgz",
+      "integrity": "sha512-CfmqxSUZzBl0rSjpoQSFoR9UEj3HzbGuGNL21/iFTmjb5gFggJp3ph0xR1YBhexmLoKRHzgxuFvty2xdSt6gTA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz",
-      "integrity": "sha512-OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz",
+      "integrity": "sha512-vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-function-name": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-function-name": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz",
-      "integrity": "sha512-Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz",
+      "integrity": "sha512-ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz",
-      "integrity": "sha512-0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz",
+      "integrity": "sha512-WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz",
-      "integrity": "sha512-elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz",
+      "integrity": "sha512-3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.10.5",
-        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-module-transforms": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       },
+      "engines": {
+        "node": ">=6.9.0"
+      },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz",
-      "integrity": "sha512-Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.5.tgz",
+      "integrity": "sha512-en8GfBtgnydoao2PS+87mKyw62k02k7kJ9ltbKe0fXTHrQmG6QZZflYuGI1VVG7sVpx4E1n7KBpNlPb8m78J+A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-simple-access": "^7.10.4",
+        "@babel/helper-module-transforms": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-simple-access": "^7.14.5",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       },
+      "engines": {
+        "node": ">=6.9.0"
+      },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz",
-      "integrity": "sha512-f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.14.5.tgz",
+      "integrity": "sha512-mNMQdvBEE5DcMQaL5LbzXFMANrQjd2W7FPzg34Y4yEz7dBgdaC+9B84dSO+/1Wba98zoDbInctCDo4JGxz1VYA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-hoist-variables": "^7.10.4",
-        "@babel/helper-module-transforms": "^7.10.5",
-        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-hoist-variables": "^7.14.5",
+        "@babel/helper-module-transforms": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-validator-identifier": "^7.14.5",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       },
+      "engines": {
+        "node": ">=6.9.0"
+      },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz",
-      "integrity": "sha512-mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz",
+      "integrity": "sha512-RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-module-transforms": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz",
-      "integrity": "sha512-V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==",
+      "version": "7.14.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz",
+      "integrity": "sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.10.4"
+        "@babel/helper-create-regexp-features-plugin": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0"
       }
     },
     "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz",
-      "integrity": "sha512-YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz",
+      "integrity": "sha512-Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz",
-      "integrity": "sha512-5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz",
+      "integrity": "sha512-MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-replace-supers": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-replace-supers": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz",
-      "integrity": "sha512-xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.5.tgz",
+      "integrity": "sha512-Tl7LWdr6HUxTmzQtzuU14SqbgrSKmaR77M0OKyq4njZLQTPfOvzblNKyNkGwOfEFCEx7KeYHQHDI0P3F02IVkA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-get-function-arity": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz",
-      "integrity": "sha512-ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz",
+      "integrity": "sha512-r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz",
-      "integrity": "sha512-3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz",
+      "integrity": "sha512-NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg==",
       "dev": true,
       "dependencies": {
         "regenerator-transform": "^0.14.2"
       },
+      "engines": {
+        "node": ">=6.9.0"
+      },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz",
-      "integrity": "sha512-hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz",
+      "integrity": "sha512-cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-runtime": {
-      "version": "7.9.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.6.tgz",
-      "integrity": "sha512-qcmiECD0mYOjOIt8YHNsAP1SxPooC/rDmfmiSK9BNY72EitdSc7l44WTEklaWuFtbOEBjNhWWyph/kOImbNJ4w==",
+      "version": "7.12.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.10.tgz",
+      "integrity": "sha512-xOrUfzPxw7+WDm9igMgQCbO3cJKymX7dFdsgRr1eu9n3KjjyU4pptIXbXPseQDquw+W+RuJEJMHKHNsPNNm3CA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-imports": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "resolve": "^1.8.1",
+        "@babel/helper-module-imports": "^7.12.5",
+        "@babel/helper-plugin-utils": "^7.10.4",
         "semver": "^5.5.1"
       },
       "peerDependencies": {
@@ -2700,146 +2422,183 @@
       }
     },
     "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz",
-      "integrity": "sha512-AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz",
+      "integrity": "sha512-xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz",
-      "integrity": "sha512-UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw==",
+      "version": "7.14.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.6.tgz",
+      "integrity": "sha512-Zr0x0YroFJku7n7+/HH3A2eIrGMjbmAIbJSVv0IZ+t3U2WUQUA64S/oeied2e+MaGSjmt4alzBCsK9E8gh+fag==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0"
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz",
-      "integrity": "sha512-Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz",
+      "integrity": "sha512-Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-regex": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz",
-      "integrity": "sha512-V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz",
+      "integrity": "sha512-22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz",
-      "integrity": "sha512-QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz",
+      "integrity": "sha512-lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-unicode-escapes": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz",
+      "integrity": "sha512-crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz",
-      "integrity": "sha512-wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz",
+      "integrity": "sha512-UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.9.6",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.6.tgz",
-      "integrity": "sha512-0gQJ9RTzO0heXOhzftog+a/WyOuqMrAIugVYxMYf83gh1CQaQDjMtsOpqOwXyDL/5JcWsrCm8l4ju8QC97O7EQ==",
+      "version": "7.12.11",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.11.tgz",
+      "integrity": "sha512-j8Tb+KKIXKYlDBQyIOy4BLxzv1NUOwlHfZ74rvW+Z0Gp4/cI2IMDPBWAgWceGcE7aep9oL/0K9mlzlMGxA8yNw==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.9.6",
-        "@babel/helper-compilation-targets": "^7.9.6",
-        "@babel/helper-module-imports": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/plugin-proposal-async-generator-functions": "^7.8.3",
-        "@babel/plugin-proposal-dynamic-import": "^7.8.3",
-        "@babel/plugin-proposal-json-strings": "^7.8.3",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-proposal-numeric-separator": "^7.8.3",
-        "@babel/plugin-proposal-object-rest-spread": "^7.9.6",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-proposal-optional-chaining": "^7.9.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.8.3",
+        "@babel/compat-data": "^7.12.7",
+        "@babel/helper-compilation-targets": "^7.12.5",
+        "@babel/helper-module-imports": "^7.12.5",
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-validator-option": "^7.12.11",
+        "@babel/plugin-proposal-async-generator-functions": "^7.12.1",
+        "@babel/plugin-proposal-class-properties": "^7.12.1",
+        "@babel/plugin-proposal-dynamic-import": "^7.12.1",
+        "@babel/plugin-proposal-export-namespace-from": "^7.12.1",
+        "@babel/plugin-proposal-json-strings": "^7.12.1",
+        "@babel/plugin-proposal-logical-assignment-operators": "^7.12.1",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
+        "@babel/plugin-proposal-numeric-separator": "^7.12.7",
+        "@babel/plugin-proposal-object-rest-spread": "^7.12.1",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.12.1",
+        "@babel/plugin-proposal-optional-chaining": "^7.12.7",
+        "@babel/plugin-proposal-private-methods": "^7.12.1",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.12.1",
         "@babel/plugin-syntax-async-generators": "^7.8.0",
+        "@babel/plugin-syntax-class-properties": "^7.12.1",
         "@babel/plugin-syntax-dynamic-import": "^7.8.0",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
         "@babel/plugin-syntax-json-strings": "^7.8.0",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0",
-        "@babel/plugin-syntax-numeric-separator": "^7.8.0",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
         "@babel/plugin-syntax-optional-catch-binding": "^7.8.0",
         "@babel/plugin-syntax-optional-chaining": "^7.8.0",
-        "@babel/plugin-syntax-top-level-await": "^7.8.3",
-        "@babel/plugin-transform-arrow-functions": "^7.8.3",
-        "@babel/plugin-transform-async-to-generator": "^7.8.3",
-        "@babel/plugin-transform-block-scoped-functions": "^7.8.3",
-        "@babel/plugin-transform-block-scoping": "^7.8.3",
-        "@babel/plugin-transform-classes": "^7.9.5",
-        "@babel/plugin-transform-computed-properties": "^7.8.3",
-        "@babel/plugin-transform-destructuring": "^7.9.5",
-        "@babel/plugin-transform-dotall-regex": "^7.8.3",
-        "@babel/plugin-transform-duplicate-keys": "^7.8.3",
-        "@babel/plugin-transform-exponentiation-operator": "^7.8.3",
-        "@babel/plugin-transform-for-of": "^7.9.0",
-        "@babel/plugin-transform-function-name": "^7.8.3",
-        "@babel/plugin-transform-literals": "^7.8.3",
-        "@babel/plugin-transform-member-expression-literals": "^7.8.3",
-        "@babel/plugin-transform-modules-amd": "^7.9.6",
-        "@babel/plugin-transform-modules-commonjs": "^7.9.6",
-        "@babel/plugin-transform-modules-systemjs": "^7.9.6",
-        "@babel/plugin-transform-modules-umd": "^7.9.0",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.8.3",
-        "@babel/plugin-transform-new-target": "^7.8.3",
-        "@babel/plugin-transform-object-super": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.9.5",
-        "@babel/plugin-transform-property-literals": "^7.8.3",
-        "@babel/plugin-transform-regenerator": "^7.8.7",
-        "@babel/plugin-transform-reserved-words": "^7.8.3",
-        "@babel/plugin-transform-shorthand-properties": "^7.8.3",
-        "@babel/plugin-transform-spread": "^7.8.3",
-        "@babel/plugin-transform-sticky-regex": "^7.8.3",
-        "@babel/plugin-transform-template-literals": "^7.8.3",
-        "@babel/plugin-transform-typeof-symbol": "^7.8.4",
-        "@babel/plugin-transform-unicode-regex": "^7.8.3",
+        "@babel/plugin-syntax-top-level-await": "^7.12.1",
+        "@babel/plugin-transform-arrow-functions": "^7.12.1",
+        "@babel/plugin-transform-async-to-generator": "^7.12.1",
+        "@babel/plugin-transform-block-scoped-functions": "^7.12.1",
+        "@babel/plugin-transform-block-scoping": "^7.12.11",
+        "@babel/plugin-transform-classes": "^7.12.1",
+        "@babel/plugin-transform-computed-properties": "^7.12.1",
+        "@babel/plugin-transform-destructuring": "^7.12.1",
+        "@babel/plugin-transform-dotall-regex": "^7.12.1",
+        "@babel/plugin-transform-duplicate-keys": "^7.12.1",
+        "@babel/plugin-transform-exponentiation-operator": "^7.12.1",
+        "@babel/plugin-transform-for-of": "^7.12.1",
+        "@babel/plugin-transform-function-name": "^7.12.1",
+        "@babel/plugin-transform-literals": "^7.12.1",
+        "@babel/plugin-transform-member-expression-literals": "^7.12.1",
+        "@babel/plugin-transform-modules-amd": "^7.12.1",
+        "@babel/plugin-transform-modules-commonjs": "^7.12.1",
+        "@babel/plugin-transform-modules-systemjs": "^7.12.1",
+        "@babel/plugin-transform-modules-umd": "^7.12.1",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.12.1",
+        "@babel/plugin-transform-new-target": "^7.12.1",
+        "@babel/plugin-transform-object-super": "^7.12.1",
+        "@babel/plugin-transform-parameters": "^7.12.1",
+        "@babel/plugin-transform-property-literals": "^7.12.1",
+        "@babel/plugin-transform-regenerator": "^7.12.1",
+        "@babel/plugin-transform-reserved-words": "^7.12.1",
+        "@babel/plugin-transform-shorthand-properties": "^7.12.1",
+        "@babel/plugin-transform-spread": "^7.12.1",
+        "@babel/plugin-transform-sticky-regex": "^7.12.7",
+        "@babel/plugin-transform-template-literals": "^7.12.1",
+        "@babel/plugin-transform-typeof-symbol": "^7.12.10",
+        "@babel/plugin-transform-unicode-escapes": "^7.12.1",
+        "@babel/plugin-transform-unicode-regex": "^7.12.1",
         "@babel/preset-modules": "^0.1.3",
-        "@babel/types": "^7.9.6",
-        "browserslist": "^4.11.1",
-        "core-js-compat": "^3.6.2",
-        "invariant": "^2.2.2",
-        "levenary": "^1.1.1",
+        "@babel/types": "^7.12.11",
+        "core-js-compat": "^3.8.0",
         "semver": "^5.5.0"
       },
       "peerDependencies": {
@@ -2872,87 +2631,72 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.9.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz",
-      "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==",
+      "version": "7.12.5",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz",
+      "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==",
       "dev": true,
       "dependencies": {
         "regenerator-runtime": "^0.13.4"
       }
     },
     "node_modules/@babel/runtime-corejs3": {
-      "version": "7.13.17",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.13.17.tgz",
-      "integrity": "sha512-RGXINY1YvduBlGrP+vHjJqd/nK7JVpfM4rmZLGMx77WoL3sMrhheA0qxii9VNn1VHnxJLEyxmvCB+Wqc+x/FMw==",
+      "version": "7.14.9",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.9.tgz",
+      "integrity": "sha512-64RiH2ON4/y8qYtoa8rUiyam/tUVyGqRyNYhe+vCRGmjnV4bUlZvY+mwd0RrmLoCpJpdq3RsrNqKb7SJdw/4kw==",
       "dev": true,
       "dependencies": {
-        "core-js-pure": "^3.0.0",
+        "core-js-pure": "^3.16.0",
         "regenerator-runtime": "^0.13.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.8.6",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
-      "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.8.3",
-        "@babel/parser": "^7.8.6",
-        "@babel/types": "^7.8.6"
-      }
-    },
-    "node_modules/@babel/traverse": {
-      "version": "7.11.5",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
-      "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
+      "version": "7.12.7",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz",
+      "integrity": "sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==",
       "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.10.4",
-        "@babel/generator": "^7.11.5",
-        "@babel/helper-function-name": "^7.10.4",
-        "@babel/helper-split-export-declaration": "^7.11.0",
-        "@babel/parser": "^7.11.5",
-        "@babel/types": "^7.11.5",
+        "@babel/parser": "^7.12.7",
+        "@babel/types": "^7.12.7"
+      }
+    },
+    "node_modules/@babel/traverse": {
+      "version": "7.14.9",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.9.tgz",
+      "integrity": "sha512-bldh6dtB49L8q9bUyB7bC20UKgU+EFDwKJylwl234Kv+ySZeMD31Xeht6URyueQ6LrRRpF2tmkfcZooZR9/e8g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.14.5",
+        "@babel/generator": "^7.14.9",
+        "@babel/helper-function-name": "^7.14.5",
+        "@babel/helper-hoist-variables": "^7.14.5",
+        "@babel/helper-split-export-declaration": "^7.14.5",
+        "@babel/parser": "^7.14.9",
+        "@babel/types": "^7.14.9",
         "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.19"
+        "globals": "^11.1.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse/node_modules/@babel/generator": {
-      "version": "7.11.6",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
-      "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
+      "version": "7.14.9",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.9.tgz",
+      "integrity": "sha512-4yoHbhDYzFa0GLfCzLp5GxH7vPPMAHdZjyE7M/OajM9037zhx0rf+iNsJwp4PT0MSFpwjG7BsHEbPkBQpZ6cYA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.11.5",
+        "@babel/types": "^7.14.9",
         "jsesc": "^2.5.1",
         "source-map": "^0.5.0"
-      }
-    },
-    "node_modules/@babel/traverse/node_modules/debug": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
-      "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
-      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
       },
       "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/traverse/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
     "node_modules/@babel/traverse/node_modules/source-map": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -2963,14 +2707,16 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.11.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-      "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+      "version": "7.14.9",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.9.tgz",
+      "integrity": "sha512-u0bLTnv3DFHeaQLYzb7oRJ1JHr1sv/SYDM7JSqHFFLwXG1wTZRughxFI5NCP8qBEo1rVVsn7Yg2Lvw49nne/Ow==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.10.4",
-        "lodash": "^4.17.19",
+        "@babel/helper-validator-identifier": "^7.14.9",
         "to-fast-properties": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@bcoe/v8-coverage": {
@@ -2995,16 +2741,25 @@
         "node": ">=0.1.95"
       }
     },
+    "node_modules/@discoveryjs/json-ext": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.2.tgz",
+      "integrity": "sha512-HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
     "node_modules/@eslint/eslintrc": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.0.tgz",
-      "integrity": "sha512-2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog==",
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
+      "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
       "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.1.1",
         "espree": "^7.3.0",
-        "globals": "^12.1.0",
+        "globals": "^13.9.0",
         "ignore": "^4.0.6",
         "import-fresh": "^3.2.1",
         "js-yaml": "^3.13.1",
@@ -3015,30 +2770,29 @@
         "node": "^10.12.0 || >=12.0.0"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+    "node_modules/@eslint/eslintrc/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
       "dependencies": {
-        "ms": "2.1.2"
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
       },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
     "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "12.4.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
-      "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
+      "version": "13.10.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.10.0.tgz",
+      "integrity": "sha512-piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g==",
       "dev": true,
       "dependencies": {
-        "type-fest": "^0.8.1"
+        "type-fest": "^0.20.2"
       },
       "engines": {
         "node": ">=8"
@@ -3056,28 +2810,48 @@
         "node": ">= 4"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+    "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true
     },
-    "node_modules/@eslint/eslintrc/node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+    "node_modules/@eslint/eslintrc/node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/@humanwhocodes/config-array": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
+      "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
+      "dev": true,
+      "dependencies": {
+        "@humanwhocodes/object-schema": "^1.2.0",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/@humanwhocodes/object-schema": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz",
+      "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==",
+      "dev": true
+    },
     "node_modules/@ionic-native/badge": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/badge/-/badge-5.33.0.tgz",
-      "integrity": "sha512-g/E2HLB53csZq5hWeyWUFj6r7CrllSPuOkV88XotIFTQFNuY7TaLtiFUVFSvWXRh0Kvu+w7TI5Hys67d/v7F/g==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/badge/-/badge-5.35.0.tgz",
+      "integrity": "sha512-VTelBbEoj7MdkN4rzgPOFiQnw9GZrJPI/3GOEIib3/sj5HVSnClkGDFlLPSwe+sdjvozehpDCkGE92dPd5KMpA==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3086,15 +2860,10 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/badge/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/camera": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/camera/-/camera-5.33.0.tgz",
-      "integrity": "sha512-cLAxM4e8IrTECvlszyUe9FnUjE4PbWR99NNDwkOuB85yJ3diyKxiQhHu89Qh9A6qzHTJQLa93iknY2Q40VM/5Q==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/camera/-/camera-5.35.0.tgz",
+      "integrity": "sha512-zW39wFdJ9oACMVtZJSvYn8gaJJQYKOoqjtnLphMXceFY0KBqyDYdTdkquzTOFUjsB3WQRwScndEJJ73PhVCZmg==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3103,15 +2872,10 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/camera/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/chooser": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/chooser/-/chooser-5.33.0.tgz",
-      "integrity": "sha512-hz2OtB8UsJpKdXZByDzGS6+U1FK8toIjKmIVCDQAuOXxjbw9dU2Ef+MSUKXOpK6MYnP56oP80JdSX9LDEFJnRA==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/chooser/-/chooser-5.35.0.tgz",
+      "integrity": "sha512-oQnfahfA1Z8Pv3MbnhBDAeGyMyC598Xm2U2mCNKdYhtPtqeH5uOOk596XGsgoR+11G9g1gqFDg3qypK4E1zVTA==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3120,15 +2884,10 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/chooser/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/clipboard": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/clipboard/-/clipboard-5.33.0.tgz",
-      "integrity": "sha512-HFZN4tsAjFJ9Se9ik0/IOUvApL4zNPEKQAtUsjqP7vCnTsdrgS+FDMln1UDEKXCQ/dEEwU1N1ndFmPBGxjkGzQ==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/clipboard/-/clipboard-5.35.0.tgz",
+      "integrity": "sha512-M39sLi6HFJEKwMXcFBwWEk5X70t/b7uuDFqqtLCOg7dsZwmhY07Lr/kU3lBh7zbj9TgCKSkOxc3jlZH3fRWXbA==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3137,15 +2896,10 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/clipboard/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/core": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/core/-/core-5.33.0.tgz",
-      "integrity": "sha512-dnZHu7SadvQvliGJPndk2ohdoPvwiyBWJjsJw33BKyhadnmLlmkYKkRgPPI+i22BZofDKq4YiAfIIqhvfHU6gw==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/core/-/core-5.35.0.tgz",
+      "integrity": "sha512-x2mShlaLOzCxwdqvPOvUFX4g0ctMvEYiYak6Hlh+HP9eNWfruT0EcMoXs6KSvIRFRsyFaYAXHyDZseKtB3aqsA==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3153,15 +2907,10 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/core/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/device": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/device/-/device-5.33.0.tgz",
-      "integrity": "sha512-KYQvVsN98bGTEomI193Jf9r1vaXBFJQXuhkhwBI6lajynAlf2SIVJwthNUXnK43kNXy1cOelYxScUuKyPwqudw==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/device/-/device-5.35.0.tgz",
+      "integrity": "sha512-p/kTzERyWFhAN6mzhq4wanFme3aNGHeT2hM+lp1tM87vqLn+49GycKNwYMED0mfcGA1n2aT+ClF+ga6df5Rvhw==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3170,15 +2919,10 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/device/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/diagnostic": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/diagnostic/-/diagnostic-5.33.0.tgz",
-      "integrity": "sha512-zBDv/yNMvUkXfxy17rgrGVU3+XKREXRI7cqy/DyvpjdomOnmx2pnFvhszgMEgeD03LkXXKiFOR5yUAVNgYirmg==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/diagnostic/-/diagnostic-5.35.0.tgz",
+      "integrity": "sha512-hjTYiGEZzL4cE/GNr/g9T/zaBuIXNTfUGJXOVSKOI3t0miIo4eZi1IQnbQtac4fhuwtW23eo5TFtzP8NwJHy/Q==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3187,15 +2931,10 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/diagnostic/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/file": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/file/-/file-5.33.0.tgz",
-      "integrity": "sha512-RisSGJl2t8JrBgw30Vn5hJYYKEDTHR9f3KbQDfe1MQg+VrZo7vnbml/vk4l55u65c1TYZDH+F6i7s9nyif1QVQ==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/file/-/file-5.35.0.tgz",
+      "integrity": "sha512-CpD8z7skurzL4Gj1R6AhAvszoc+Ii06+2u1E48/jq6SXBY9S6ufzSlpWosRFkfydRKDIZ1gIb/vAGedCuuRWyQ==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3205,9 +2944,9 @@
       }
     },
     "node_modules/@ionic-native/file-opener": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/file-opener/-/file-opener-5.33.0.tgz",
-      "integrity": "sha512-v7t1ndalAPYT9gvMAhxAup8tg1NPV415cfG6tzs1foPFP91UZC3MQny0tup8AgFivugT1GRdoSk1NMuK1jy8Cw==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/file-opener/-/file-opener-5.35.0.tgz",
+      "integrity": "sha512-1xDQVfsRUdd+b/MNtKuxuBqi2pv63kyuB6VFTP7g3I+e13JW05I0RNlujpcBhGpA1FZyPKs7w7b2era9famNLg==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3216,15 +2955,10 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/file-opener/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/file-transfer": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/file-transfer/-/file-transfer-5.33.0.tgz",
-      "integrity": "sha512-xDUpdJVgTBP6aEiU08iZ/pa9aMoGSMB9391dQKk+VSDs0hdbIwk+Cx4V40GIE4QF3TI06sUMdKXD2sIhVsr2QA==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/file-transfer/-/file-transfer-5.35.0.tgz",
+      "integrity": "sha512-rkOOSY+1/VLstv2TT8TYkZUmAzN+syjFolK8Sj5hEbgVuCWhZZK+7bqwGmHg2op4OvXf4kptehHZ5KDD0ZenBw==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3233,20 +2967,10 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/file-transfer/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
-    "node_modules/@ionic-native/file/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/geolocation": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/geolocation/-/geolocation-5.33.0.tgz",
-      "integrity": "sha512-oE6pi6l8/Wsv94vpJmPlPqE1LheP6cQTJrC78WYQp9WVDOOCGZnFznNoH8BlQfnfjuDx/kUARxzEJBO/gbUg1A==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/geolocation/-/geolocation-5.35.0.tgz",
+      "integrity": "sha512-gjwe2WUv75qNfIdLipgUCBhpQPHhzLivecEeHNGpb4pXo151rq3MtgHK2Q3xjy7iyrYsZlcNYtVb+jhb+4toBg==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3255,15 +2979,10 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/geolocation/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/http": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/http/-/http-5.33.0.tgz",
-      "integrity": "sha512-dqcPu3igSLlfDUK8Mvma/6o6aq7WtKBlcR8xXwE8tVsO/r4fEB6NevLLN4S4zCr381Jy+RxIIjn3CZx5XHF6JQ==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/http/-/http-5.35.0.tgz",
+      "integrity": "sha512-AaLvi59gdOlxpM3x9krk0l8UcLI9OLBm+o7DNu8y1pgsUKIvf7+ZbY4xU1fJG1HDvUyrU8+NQLrvXgpXx6CmAQ==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3272,15 +2991,10 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/http/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/in-app-browser": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/in-app-browser/-/in-app-browser-5.33.0.tgz",
-      "integrity": "sha512-GGIvnYHf8FgaIae9yfRzxqxj0ZAxrYhOJpsHVSq1YKjxnDpRe6ImWWaHHfaeXE5IdUUMUXVuf75VTSBN00VBvA==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/in-app-browser/-/in-app-browser-5.35.0.tgz",
+      "integrity": "sha512-P06lB3ZhMPn1r5qT742uqczRfceY3dPAAAujlGD+m/06DSikKcB4CYDUHrowJbYAXYr8hkHtnQgtthZx5PPZAA==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3289,15 +3003,10 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/in-app-browser/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/ionic-webview": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/ionic-webview/-/ionic-webview-5.33.0.tgz",
-      "integrity": "sha512-Jbr4M6z/Fya51F+QXuPLm/crFlZ9T6YvRM1cygGmFwZ7SgDAimYnjgSO8SEGJmvO2ZekYmFuF56qiVPSvx2wUA==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/ionic-webview/-/ionic-webview-5.35.0.tgz",
+      "integrity": "sha512-OliPzhM1eAhJW0Q4vzhwb0M98IptN9woXuiaDhRyEBBB3PvukKeGWbVBHdquzVSZYuhz0emrJeDDRhTVQEaJ/Q==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3306,15 +3015,10 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/ionic-webview/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/keyboard": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/keyboard/-/keyboard-5.33.0.tgz",
-      "integrity": "sha512-TIYU3LC+Yz/pcpBuHcxLThMNuN9y1E1wBu4SlmS6VlO3/D3R3At2WOg2UK3iA66G2kTJubed5haqTYZjeoA6Uw==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/keyboard/-/keyboard-5.35.0.tgz",
+      "integrity": "sha512-SB4S91NVkdSuNsT8OTS67QnE76yvoPB1BFrz1uL37BGKselgF0xTlJEfLOV7VL82ZteXr4siQr/MLRmBYIc6QQ==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3323,15 +3027,10 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/keyboard/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/local-notifications": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/local-notifications/-/local-notifications-5.33.0.tgz",
-      "integrity": "sha512-ljn2uq0rFWpjG1I1qK+mPVX8T3T+09fsF8sZ9nK7uvD9YWShCVz2e2ctf8qPRFq+TWDeDqlnwXz3wCvWmbBUWw==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/local-notifications/-/local-notifications-5.35.0.tgz",
+      "integrity": "sha512-kdn+skyQpTDHBpL8kLlsnZ7n5EzPPytrKZbCYgRZPJR4yNymZqfGbvuXblmpAZUoAMObEj5EWetOyBQcmuNFXw==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3340,15 +3039,10 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/local-notifications/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/media": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/media/-/media-5.33.0.tgz",
-      "integrity": "sha512-nUu7/FSH41j9+BqHXYVMBd3EifNsTNOufD3NEiMVpHVDWLWqG7tG5h5cFlsVACxUaP4kNpSEke2mjom6CKyjxQ==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/media/-/media-5.35.0.tgz",
+      "integrity": "sha512-pTzQQnwkJpjlvBJ+ye8eazxiBuHqAOkBYzpcez/dY2HK5u9MTFvX/YeeaZ7LetKHoAwBhtN/LSr2sFG7mo9wFg==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3358,9 +3052,9 @@
       }
     },
     "node_modules/@ionic-native/media-capture": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/media-capture/-/media-capture-5.33.0.tgz",
-      "integrity": "sha512-aQTnonVSeijpuZ9B7oYJCjIDqgFVhNdvqkx9vUoaO359BtJGpGS1rNPjEovt4DsqV7oe7TkbmBd8DMEwnB3A2g==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/media-capture/-/media-capture-5.35.0.tgz",
+      "integrity": "sha512-rF97XrAO6Ehc0UG9tO/kVMJ70YIpUzDFr3DdJ6H86cMSROfs8CqP0gsO3x0Uco8sLLCzM7JHqx1oz9gtyiV5PA==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3369,20 +3063,10 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/media-capture/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
-    "node_modules/@ionic-native/media/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/network": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/network/-/network-5.33.0.tgz",
-      "integrity": "sha512-J+3+rbDTMVNUspa/nV+P8a0hFKDicJK1rVIrm5aLBQdmN9n7WaqJmeMYTptyWOnZxQpktJAJDdhJTEvVmKQjjw==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/network/-/network-5.35.0.tgz",
+      "integrity": "sha512-Iu6dC0xTB0DUfdY+AJDVdQCJlmmn779s0j5QlR7THA1UUWz37LeWQuUvBdipLt66VfxZ2TlayM4HKrbTE/VkCQ==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3391,15 +3075,10 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/network/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/push": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/push/-/push-5.33.0.tgz",
-      "integrity": "sha512-H4gOkMbOaNvi97cKKJDggWvAR1BVCUbtdLyWInA0q3cZBHWSc6KcRJGz+hcdDndCQJUnHofs1Tpw8LN3zhjYyQ==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/push/-/push-5.35.0.tgz",
+      "integrity": "sha512-sXaQWnRLe1uyDRraHsPAoU2CLVwVAbTDgJoX1CwxmjILEAa0B7/cJTycbZic8gJ5AYVHdt+JTM5yIE7NfhREHA==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3408,15 +3087,10 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/push/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/qr-scanner": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/qr-scanner/-/qr-scanner-5.33.0.tgz",
-      "integrity": "sha512-cyiQv0Rje/fN9/JYoDXP1+ILJkRkjvPtoSx4vd2FsKAuJB60U2DpQfmVEE/KMF4iceTpx4MK/kGzr2WE2AYnIg==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/qr-scanner/-/qr-scanner-5.35.0.tgz",
+      "integrity": "sha512-QElERY4ImURDFCZB/S58F7f73eiTbThxuxeLhIjB9Uogi72FyAYgQR767NAFIBMh58uIlZy4WKKlIrLWMIx4RQ==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3425,15 +3099,10 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/qr-scanner/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/splash-screen": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-5.33.0.tgz",
-      "integrity": "sha512-6PHk5WJeUoc3zru6wTvUmd9DCASvRQoQq1dysYI3JCECaAJ6X0x1RbzM8dBFs3JPLfWtDn+P8eTp+KaA0Xf58w==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-5.35.0.tgz",
+      "integrity": "sha512-q3JNIdONmT8pA5xqVB1XiXRR7upKd/o6b2ZX5pPaAZK5GB1kaD8BlRyfJPvX4H1C1o7mAlyr6Y+r1PpeF7KkWg==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3442,15 +3111,10 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/splash-screen/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/sqlite": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/sqlite/-/sqlite-5.33.0.tgz",
-      "integrity": "sha512-JIdQJr6bcksotF/3ZMJQZo9lHgaHXvHOOK9R30mM/5Ds5fFu+rUoUf0wvyqaGzEFu94pGw2uPGnfD+WI7x7+1A==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/sqlite/-/sqlite-5.35.0.tgz",
+      "integrity": "sha512-6S2EYifwjdDSwgyaojkUT5sbTV/0s65YH7/XJiReDNf7nWAv49Nu7DggJhdNwDKt9kl0NdeJnCv0SS0zGFJRdw==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3459,15 +3123,10 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/sqlite/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/status-bar": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/status-bar/-/status-bar-5.33.0.tgz",
-      "integrity": "sha512-cnyfd42N9gGfhyDtF7wbWoacKg/jfsoJQHOHltfhS4/EjxsVu4bjkwq1YBLMcMY3OIqFDSn2aFcejHn8wVNkDQ==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/status-bar/-/status-bar-5.35.0.tgz",
+      "integrity": "sha512-c9uwQHGf0nO5V+u6cLpCido6FX7QOfjo11BRKwrQoAzpIvSK7cUgh/6PMW3MlkjWs3qNKHRNiHDg7wlac2vcuQ==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3476,15 +3135,10 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/status-bar/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/web-intent": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/web-intent/-/web-intent-5.33.0.tgz",
-      "integrity": "sha512-3CIAofrg9nkJQbSftFdMKYOduXy9Ra/a1Q0it6ysm9NFeAQn7iZPThSexBeZ9xiKKj/QTPZtnqAJ0MQ+4mkGag==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/web-intent/-/web-intent-5.35.0.tgz",
+      "integrity": "sha512-N2bzHNKGkMNEe4ugPXHkAst2kdBIESXnN4CbQR0s4LYA5o9Aw8Vx3yFKPuhAHfC5rVDWHytoj2ErX+40cPKg5A==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3493,15 +3147,10 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/web-intent/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/zip": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/zip/-/zip-5.33.0.tgz",
-      "integrity": "sha512-hErISQ6/xqVErmVnnha5BR+3GWRNQIVfMTXzprEpNZxQl3iDe1UTIVQdFnMd3Nasz/naY+61Vq/y91PZ1Rrajw==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/zip/-/zip-5.35.0.tgz",
+      "integrity": "sha512-PgGFsXcLWWRrb9UtiKtBHwkKwAamR3l2qMW5qVESns4rBMC628sMaDtIrzsTxarw23Oy3q4kO47tp1pS3Ko0xg==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3510,17 +3159,12 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/zip/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic/angular": {
-      "version": "5.6.6",
-      "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-5.6.6.tgz",
-      "integrity": "sha512-0psh2n4Y/3sx0e2Yj4WmNcukz0nrETEiJE6Fl4CldoB8QHZcXGi0hKrPAcbGSAF0+lAJ58+Z5Gp/HQVm/MQOMA==",
+      "version": "5.6.13",
+      "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-5.6.13.tgz",
+      "integrity": "sha512-78S6aCcmeyxeLTTSq/pvc94UH+uIuCm8IO2Dumr/nxpKDw16xs0Xf0E07om0H6Ik4hcqUS7Sjur8syu6cY5Zuw==",
       "dependencies": {
-        "@ionic/core": "5.6.6",
+        "@ionic/core": "5.6.13",
         "tslib": "^1.9.3"
       },
       "peerDependencies": {
@@ -3532,61 +3176,125 @@
       }
     },
     "node_modules/@ionic/angular-toolkit": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/@ionic/angular-toolkit/-/angular-toolkit-2.3.3.tgz",
-      "integrity": "sha512-r87mApDLWbLaUtd5LvNHrRlZWxjQhaBBM1yPlk9M98dHOxcX3jy7kv60ZurGZutuvbhXISGvHcvvR90yywDC1A==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@ionic/angular-toolkit/-/angular-toolkit-4.0.0.tgz",
+      "integrity": "sha512-HGRAGUtc1YSwNZ/Q7X7c2QRyYM2AfsSm++OasPrMo3LnPRVr8OIsUih2ithEU7f3CXrViUR7j/Anu90zGsRgzg==",
       "dev": true,
       "dependencies": {
-        "@schematics/angular": ">=8.0.0",
+        "@schematics/angular": "^12.0.0",
         "cheerio": "1.0.0-rc.3",
         "colorette": "1.1.0",
-        "copy-webpack-plugin": "^6.0.3",
-        "tslib": "^1.9.0",
+        "copy-webpack-plugin": "^6.2.1",
+        "tapable": "^2.1.1",
+        "tslib": "^2.0.3",
         "ws": "^7.0.1"
       },
       "peerDependencies": {
-        "@angular-devkit/architect": ">=0.800.0",
-        "@angular-devkit/build-angular": ">=0.800.0",
-        "@angular-devkit/core": ">=8.0.0",
-        "@angular-devkit/schematics": ">=8.0.0"
+        "@angular-devkit/architect": "^0.1200.0",
+        "@angular-devkit/schematics": "^12.0.0"
       }
     },
-    "node_modules/@ionic/angular-toolkit/node_modules/tslib": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
-      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
-      "dev": true
-    },
-    "node_modules/@ionic/angular-toolkit/node_modules/ws": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz",
-      "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==",
+    "node_modules/@ionic/angular-toolkit/node_modules/@angular-devkit/core": {
+      "version": "12.1.4",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-12.1.4.tgz",
+      "integrity": "sha512-KOzGD8JbP/7EeUwPiU5x+fo3ZEQ5R4IVW5WoH92PaO3mdpqXC7UL2MWLct8PUe9il9nqJMvrBMldSSvP9PCT2w==",
       "dev": true,
+      "dependencies": {
+        "ajv": "8.6.0",
+        "ajv-formats": "2.1.0",
+        "fast-json-stable-stringify": "2.1.0",
+        "magic-string": "0.25.7",
+        "rxjs": "6.6.7",
+        "source-map": "0.7.3"
+      },
       "engines": {
-        "node": ">=8.3.0"
+        "node": "^12.14.1 || >=14.0.0",
+        "npm": "^6.11.0 || ^7.5.6",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@ionic/angular-toolkit/node_modules/@schematics/angular": {
+      "version": "12.1.4",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-12.1.4.tgz",
+      "integrity": "sha512-xGqgGI6GWk4EFdKis8FmSESxoLgjnLQbaRE1t1KZCkSKJzqkOj0R9wiDrtZfcrbPxIkLL+3fAk2ThwwPznT6yw==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "12.1.4",
+        "@angular-devkit/schematics": "12.1.4",
+        "jsonc-parser": "3.0.0"
+      },
+      "engines": {
+        "node": "^12.14.1 || >=14.0.0",
+        "npm": "^6.11.0 || ^7.5.6",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@ionic/angular-toolkit/node_modules/ajv": {
+      "version": "8.6.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz",
+      "integrity": "sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@ionic/angular-toolkit/node_modules/ajv-formats": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.0.tgz",
+      "integrity": "sha512-USH2jBb+C/hIpwD2iRjp0pe0k+MvzG0mlSn/FIdCgQhUb9ALPRjt2KIQdfZDS9r0ZIeUAg7gOu9KL0PFqGqr5Q==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^8.0.0"
       },
       "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
+        "ajv": "^8.0.0"
       },
       "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
+        "ajv": {
           "optional": true
         }
       }
     },
+    "node_modules/@ionic/angular-toolkit/node_modules/jsonc-parser": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
+      "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==",
+      "dev": true
+    },
+    "node_modules/@ionic/angular-toolkit/node_modules/rxjs": {
+      "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/@ionic/angular-toolkit/node_modules/rxjs/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
     "node_modules/@ionic/angular/node_modules/tslib": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
     },
     "node_modules/@ionic/cli": {
-      "version": "6.14.1",
-      "resolved": "https://registry.npmjs.org/@ionic/cli/-/cli-6.14.1.tgz",
-      "integrity": "sha512-QGmA5hjW4PvS8o0f+ptJ2bOknu4dPKzlECFApBiR7ayDgGTDMwmbxrtNpRhDnjdsVlMAzWq8eo9l76831+DBjQ==",
+      "version": "6.16.3",
+      "resolved": "https://registry.npmjs.org/@ionic/cli/-/cli-6.16.3.tgz",
+      "integrity": "sha512-4gune4s02oxft1RC+zXXexr2qT0CuPzRWpP3c3daabf3skZHAV+TfhE7aW26zV9XHS2Mw0YjHuKZHu1/UgMRqw==",
       "dev": true,
       "dependencies": {
         "@ionic/cli-framework": "5.1.0",
@@ -3663,29 +3371,6 @@
         "node": ">=10.3.0"
       }
     },
-    "node_modules/@ionic/cli-framework-output/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@ionic/cli-framework-output/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
     "node_modules/@ionic/cli-framework-prompts": {
       "version": "2.1.8",
       "resolved": "https://registry.npmjs.org/@ionic/cli-framework-prompts/-/cli-framework-prompts-2.1.8.tgz",
@@ -3701,217 +3386,25 @@
         "node": ">=10.3.0"
       }
     },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/ansi-escapes": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+    "node_modules/@ionic/cli-framework/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
-        "type-fest": "^0.21.3"
+        "color-convert": "^2.0.1"
       },
       "engines": {
         "node": ">=8"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "dev": true,
-      "dependencies": {
-        "restore-cursor": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/cli-width": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
-      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/figures": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-      "dev": true,
-      "dependencies": {
-        "escape-string-regexp": "^1.0.5"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/inquirer": {
-      "version": "7.3.3",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz",
-      "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^3.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^3.0.0",
-        "lodash": "^4.17.19",
-        "mute-stream": "0.0.8",
-        "run-async": "^2.4.0",
-        "rxjs": "^6.6.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "through": "^2.3.6"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-      "dev": true,
-      "dependencies": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/rxjs": {
-      "version": "6.6.7",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^1.9.0"
-      },
-      "engines": {
-        "npm": ">=2.0.0"
-      }
-    },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/rxjs/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
-    },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/type-fest": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/@ionic/cli-framework/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -3924,33 +3417,58 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@ionic/cli-framework/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+    "node_modules/@ionic/cli-framework/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
-        "ms": "2.1.2"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/@ionic/cli-framework/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
+    "node_modules/@ionic/cli-framework/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@ionic/cli-framework/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@ionic/cli/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
     },
     "node_modules/@ionic/cli/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -3963,75 +3481,49 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@ionic/cli/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+    "node_modules/@ionic/cli/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
-        "ms": "2.1.2"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/@ionic/cli/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@ionic/cli/node_modules/os-name": {
+    "node_modules/@ionic/cli/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/os-name/-/os-name-4.0.0.tgz",
-      "integrity": "sha512-caABzDdJMbtykt7GmSogEat3faTKQhmZf0BS5l/pZGmP0vPWQjXWqOhbLyK+b6j2/DQPmEvYdzLXJXXLJNVDNg==",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "dependencies": {
-        "macos-release": "^2.2.0",
-        "windows-release": "^4.0.0"
-      },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=8"
       }
     },
-    "node_modules/@ionic/cli/node_modules/windows-release": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-4.0.0.tgz",
-      "integrity": "sha512-OxmV4wzDKB1x7AZaZgXMVsdJ1qER1ed83ZrTYd5Bwq2HfJVg3DJS8nqlAG4sMoJ7mu8cuRmLEYyU13BKwctRAg==",
+    "node_modules/@ionic/cli/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
-        "execa": "^4.0.2"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=8"
       }
     },
     "node_modules/@ionic/core": {
-      "version": "5.6.6",
-      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.6.6.tgz",
-      "integrity": "sha512-EbVIXOTVVPxBo7hsarBpRSFNsQ22wBFtWkKmrmliieknG5LUkf5WZBpj4EENQhzYA6c+//7/nfhcD9pWgtAofA==",
+      "version": "5.6.13",
+      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.6.13.tgz",
+      "integrity": "sha512-stN80Q4zdLT7pmUoNNqp+lVjTIhcLSjDN2rzP/gYz8YAkz1L5AB2CkudD5VHWFTBbAEsylih34gAMOrygVNoJQ==",
       "dependencies": {
         "@stencil/core": "^2.4.0",
-        "ionicons": "^5.5.1",
+        "ionicons": "^5.5.3",
         "tslib": "^2.1.0"
       }
     },
-    "node_modules/@ionic/core/node_modules/tslib": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz",
-      "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w=="
-    },
     "node_modules/@ionic/utils-array": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-2.1.5.tgz",
@@ -4045,29 +3537,6 @@
         "node": ">=10.3.0"
       }
     },
-    "node_modules/@ionic/utils-array/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@ionic/utils-array/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
     "node_modules/@ionic/utils-fs": {
       "version": "3.1.5",
       "resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-3.1.5.tgz",
@@ -4082,29 +3551,6 @@
         "node": ">=10.3.0"
       }
     },
-    "node_modules/@ionic/utils-fs/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@ionic/utils-fs/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
     "node_modules/@ionic/utils-network": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-2.1.5.tgz",
@@ -4118,29 +3564,6 @@
         "node": ">=10.3.0"
       }
     },
-    "node_modules/@ionic/utils-network/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@ionic/utils-network/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
     "node_modules/@ionic/utils-object": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@ionic/utils-object/-/utils-object-2.1.5.tgz",
@@ -4154,29 +3577,6 @@
         "node": ">=10.3.0"
       }
     },
-    "node_modules/@ionic/utils-object/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@ionic/utils-object/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
     "node_modules/@ionic/utils-process": {
       "version": "2.1.8",
       "resolved": "https://registry.npmjs.org/@ionic/utils-process/-/utils-process-2.1.8.tgz",
@@ -4194,29 +3594,6 @@
         "node": ">=10.3.0"
       }
     },
-    "node_modules/@ionic/utils-process/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@ionic/utils-process/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
     "node_modules/@ionic/utils-stream": {
       "version": "3.1.5",
       "resolved": "https://registry.npmjs.org/@ionic/utils-stream/-/utils-stream-3.1.5.tgz",
@@ -4230,29 +3607,6 @@
         "node": ">=10.3.0"
       }
     },
-    "node_modules/@ionic/utils-stream/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@ionic/utils-stream/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
     "node_modules/@ionic/utils-subprocess": {
       "version": "2.1.8",
       "resolved": "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-2.1.8.tgz",
@@ -4272,29 +3626,6 @@
         "node": ">=10.3.0"
       }
     },
-    "node_modules/@ionic/utils-subprocess/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@ionic/utils-subprocess/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
     "node_modules/@ionic/utils-terminal": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-2.3.1.tgz",
@@ -4314,96 +3645,6 @@
         "node": ">=10.3.0"
       }
     },
-    "node_modules/@ionic/utils-terminal/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@ionic/utils-terminal/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@ionic/utils-terminal/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/@ionic/utils-terminal/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@ionic/utils-terminal/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@ionic/utils-terminal/node_modules/string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@ionic/utils-terminal/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@ionic/utils-terminal/node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
     "node_modules/@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
@@ -4420,6 +3661,15 @@
         "node": ">=8"
       }
     },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
@@ -4491,35 +3741,50 @@
       }
     },
     "node_modules/@istanbuljs/schema": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz",
-      "integrity": "sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==",
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
       "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@jest/console": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.5.2.tgz",
-      "integrity": "sha512-lJELzKINpF1v74DXHbCRIkQ/+nUV1M+ntj+X1J8LxCgpmJZjfLmhFejiMSbjjD66fayxl5Z06tbs3HMyuik6rw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.6.2.tgz",
+      "integrity": "sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^26.5.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "jest-message-util": "^26.5.2",
-        "jest-util": "^26.5.2",
+        "jest-message-util": "^26.6.2",
+        "jest-util": "^26.6.2",
         "slash": "^3.0.0"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
+    "node_modules/@jest/console/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
     "node_modules/@jest/console/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -4532,35 +3797,68 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@jest/core": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.5.2.tgz",
-      "integrity": "sha512-LLTo1LQMg7eJjG/+P1NYqFof2B25EV1EqzD5FonklihG4UJKiK2JBIvWonunws6W7e+DhNLoFD+g05tCY03eyA==",
+    "node_modules/@jest/console/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
-        "@jest/console": "^26.5.2",
-        "@jest/reporters": "^26.5.2",
-        "@jest/test-result": "^26.5.2",
-        "@jest/transform": "^26.5.2",
-        "@jest/types": "^26.5.2",
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/@jest/console/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jest/console/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jest/core": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.6.3.tgz",
+      "integrity": "sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/console": "^26.6.2",
+        "@jest/reporters": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.4",
-        "jest-changed-files": "^26.5.2",
-        "jest-config": "^26.5.2",
-        "jest-haste-map": "^26.5.2",
-        "jest-message-util": "^26.5.2",
+        "jest-changed-files": "^26.6.2",
+        "jest-config": "^26.6.3",
+        "jest-haste-map": "^26.6.2",
+        "jest-message-util": "^26.6.2",
         "jest-regex-util": "^26.0.0",
-        "jest-resolve": "^26.5.2",
-        "jest-resolve-dependencies": "^26.5.2",
-        "jest-runner": "^26.5.2",
-        "jest-runtime": "^26.5.2",
-        "jest-snapshot": "^26.5.2",
-        "jest-util": "^26.5.2",
-        "jest-validate": "^26.5.2",
-        "jest-watcher": "^26.5.2",
+        "jest-resolve": "^26.6.2",
+        "jest-resolve-dependencies": "^26.6.3",
+        "jest-runner": "^26.6.3",
+        "jest-runtime": "^26.6.3",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
+        "jest-watcher": "^26.6.2",
         "micromatch": "^4.0.2",
         "p-each-series": "^2.1.0",
         "rimraf": "^3.0.0",
@@ -4571,34 +3869,25 @@
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/@jest/core/node_modules/ansi-escapes": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+    "node_modules/@jest/core/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
-        "type-fest": "^0.11.0"
+        "color-convert": "^2.0.1"
       },
       "engines": {
         "node": ">=8"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@jest/core/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/@jest/core/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -4611,87 +3900,177 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@jest/core/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+    "node_modules/@jest/core/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
-        "ansi-regex": "^5.0.0"
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/@jest/core/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jest/core/node_modules/jest-config": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",
+      "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.1.0",
+        "@jest/test-sequencer": "^26.6.3",
+        "@jest/types": "^26.6.2",
+        "babel-jest": "^26.6.3",
+        "chalk": "^4.0.0",
+        "deepmerge": "^4.2.2",
+        "glob": "^7.1.1",
+        "graceful-fs": "^4.2.4",
+        "jest-environment-jsdom": "^26.6.2",
+        "jest-environment-node": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "jest-jasmine2": "^26.6.3",
+        "jest-regex-util": "^26.0.0",
+        "jest-resolve": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
+        "micromatch": "^4.0.2",
+        "pretty-format": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      },
+      "peerDependencies": {
+        "ts-node": ">=9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ts-node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@jest/core/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/@jest/core/node_modules/type-fest": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-      "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
+    "node_modules/@jest/core/node_modules/ts-node": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.1.0.tgz",
+      "integrity": "sha512-6szn3+J9WyG2hE+5W8e0ruZrzyk1uFLYye6IGMBadnOzDh8aP7t8CbFpsfCiEx2+wMixAhjFt7lOZC4+l+WbEA==",
       "dev": true,
-      "engines": {
-        "node": ">=8"
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@tsconfig/node10": "^1.0.7",
+        "@tsconfig/node12": "^1.0.7",
+        "@tsconfig/node14": "^1.0.0",
+        "@tsconfig/node16": "^1.0.1",
+        "arg": "^4.1.0",
+        "create-require": "^1.1.0",
+        "diff": "^4.0.1",
+        "make-error": "^1.1.1",
+        "source-map-support": "^0.5.17",
+        "yn": "3.1.1"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "bin": {
+        "ts-node": "dist/bin.js",
+        "ts-node-cwd": "dist/bin-cwd.js",
+        "ts-node-script": "dist/bin-script.js",
+        "ts-node-transpile-only": "dist/bin-transpile.js",
+        "ts-script": "dist/bin-script-deprecated.js"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "@swc/core": ">=1.2.50",
+        "@swc/wasm": ">=1.2.50",
+        "@types/node": "*",
+        "typescript": ">=2.7"
+      },
+      "peerDependenciesMeta": {
+        "@swc/core": {
+          "optional": true
+        },
+        "@swc/wasm": {
+          "optional": true
+        }
       }
     },
     "node_modules/@jest/environment": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.5.2.tgz",
-      "integrity": "sha512-YjhCD/Zhkz0/1vdlS/QN6QmuUdDkpgBdK4SdiVg4Y19e29g4VQYN5Xg8+YuHjdoWGY7wJHMxc79uDTeTOy9Ngw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.6.2.tgz",
+      "integrity": "sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA==",
       "dev": true,
       "dependencies": {
-        "@jest/fake-timers": "^26.5.2",
-        "@jest/types": "^26.5.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
-        "jest-mock": "^26.5.2"
+        "jest-mock": "^26.6.2"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
     "node_modules/@jest/fake-timers": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.5.2.tgz",
-      "integrity": "sha512-09Hn5Oraqt36V1akxQeWMVL0fR9c6PnEhpgLaYvREXZJAh2H2Y+QLCsl0g7uMoJeoWJAuz4tozk1prbR1Fc1sw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.6.2.tgz",
+      "integrity": "sha512-14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^26.5.2",
+        "@jest/types": "^26.6.2",
         "@sinonjs/fake-timers": "^6.0.1",
         "@types/node": "*",
-        "jest-message-util": "^26.5.2",
-        "jest-mock": "^26.5.2",
-        "jest-util": "^26.5.2"
+        "jest-message-util": "^26.6.2",
+        "jest-mock": "^26.6.2",
+        "jest-util": "^26.6.2"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
     "node_modules/@jest/globals": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.5.2.tgz",
-      "integrity": "sha512-9PmnFsAUJxpPt1s/stq02acS1YHliVBDNfAWMe1bwdRr1iTCfhbNt3ERQXrO/ZfZSweftoA26Q/2yhSVSWQ3sw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.6.2.tgz",
+      "integrity": "sha512-85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^26.5.2",
-        "@jest/types": "^26.5.2",
-        "expect": "^26.5.2"
+        "@jest/environment": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "expect": "^26.6.2"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
     "node_modules/@jest/reporters": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.5.2.tgz",
-      "integrity": "sha512-zvq6Wvy6MmJq/0QY0YfOPb49CXKSf42wkJbrBPkeypVa8I+XDxijvFuywo6TJBX/ILPrdrlE/FW9vJZh6Rf9vA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.6.2.tgz",
+      "integrity": "sha512-h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw==",
       "dev": true,
       "dependencies": {
         "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^26.5.2",
-        "@jest/test-result": "^26.5.2",
-        "@jest/transform": "^26.5.2",
-        "@jest/types": "^26.5.2",
+        "@jest/console": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "chalk": "^4.0.0",
         "collect-v8-coverage": "^1.0.0",
         "exit": "^0.1.2",
@@ -4702,15 +4081,15 @@
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^4.0.0",
         "istanbul-reports": "^3.0.2",
-        "jest-haste-map": "^26.5.2",
-        "jest-resolve": "^26.5.2",
-        "jest-util": "^26.5.2",
-        "jest-worker": "^26.5.0",
+        "jest-haste-map": "^26.6.2",
+        "jest-resolve": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-worker": "^26.6.2",
         "slash": "^3.0.0",
         "source-map": "^0.6.0",
         "string-length": "^4.0.1",
         "terminal-link": "^2.0.0",
-        "v8-to-istanbul": "^5.0.1"
+        "v8-to-istanbul": "^7.0.0"
       },
       "engines": {
         "node": ">= 10.14.2"
@@ -4719,10 +4098,25 @@
         "node-notifier": "^8.0.0"
       }
     },
+    "node_modules/@jest/reporters/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
     "node_modules/@jest/reporters/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -4735,18 +4129,25 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@jest/reporters/node_modules/jest-worker": {
-      "version": "26.5.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.5.0.tgz",
-      "integrity": "sha512-kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug==",
+    "node_modules/@jest/reporters/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^7.0.0"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">= 10.13.0"
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
       }
     },
     "node_modules/@jest/reporters/node_modules/source-map": {
@@ -4758,10 +4159,22 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/@jest/reporters/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@jest/source-map": {
-      "version": "26.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.5.0.tgz",
-      "integrity": "sha512-jWAw9ZwYHJMe9eZq/WrsHlwF8E3hM9gynlcDpOyCb9bR8wEd9ZNBZCi7/jZyzHxC7t3thZ10gO2IDhu0bPKS5g==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.6.2.tgz",
+      "integrity": "sha512-YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA==",
       "dev": true,
       "dependencies": {
         "callsites": "^3.0.0",
@@ -4782,13 +4195,13 @@
       }
     },
     "node_modules/@jest/test-result": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.5.2.tgz",
-      "integrity": "sha512-E/Zp6LURJEGSCWpoMGmCFuuEI1OWuI3hmZwmULV0GsgJBh7u0rwqioxhRU95euUuviqBDN8ruX/vP/4bwYolXw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.6.2.tgz",
+      "integrity": "sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ==",
       "dev": true,
       "dependencies": {
-        "@jest/console": "^26.5.2",
-        "@jest/types": "^26.5.2",
+        "@jest/console": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "collect-v8-coverage": "^1.0.0"
       },
@@ -4797,37 +4210,37 @@
       }
     },
     "node_modules/@jest/test-sequencer": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.5.2.tgz",
-      "integrity": "sha512-XmGEh7hh07H2B8mHLFCIgr7gA5Y6Hw1ZATIsbz2fOhpnQ5AnQtZk0gmP0Q5/+mVB2xygO64tVFQxOajzoptkNA==",
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz",
+      "integrity": "sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw==",
       "dev": true,
       "dependencies": {
-        "@jest/test-result": "^26.5.2",
+        "@jest/test-result": "^26.6.2",
         "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^26.5.2",
-        "jest-runner": "^26.5.2",
-        "jest-runtime": "^26.5.2"
+        "jest-haste-map": "^26.6.2",
+        "jest-runner": "^26.6.3",
+        "jest-runtime": "^26.6.3"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
     "node_modules/@jest/transform": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.5.2.tgz",
-      "integrity": "sha512-AUNjvexh+APhhmS8S+KboPz+D3pCxPvEAGduffaAJYxIFxGi/ytZQkrqcKDUU0ERBAo5R7087fyOYr2oms1seg==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.6.2.tgz",
+      "integrity": "sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.1.0",
-        "@jest/types": "^26.5.2",
+        "@jest/types": "^26.6.2",
         "babel-plugin-istanbul": "^6.0.0",
         "chalk": "^4.0.0",
         "convert-source-map": "^1.4.0",
         "fast-json-stable-stringify": "^2.0.0",
         "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^26.5.2",
+        "jest-haste-map": "^26.6.2",
         "jest-regex-util": "^26.0.0",
-        "jest-util": "^26.5.2",
+        "jest-util": "^26.6.2",
         "micromatch": "^4.0.2",
         "pirates": "^4.0.1",
         "slash": "^3.0.0",
@@ -4838,10 +4251,25 @@
         "node": ">= 10.14.2"
       }
     },
+    "node_modules/@jest/transform/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
     "node_modules/@jest/transform/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -4854,6 +4282,27 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
+    "node_modules/@jest/transform/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/@jest/transform/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@jest/transform/node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -4863,10 +4312,22 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/@jest/transform/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@jest/types": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.5.2.tgz",
-      "integrity": "sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+      "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
       "dev": true,
       "dependencies": {
         "@types/istanbul-lib-coverage": "^2.0.0",
@@ -4879,10 +4340,25 @@
         "node": ">= 10.14.2"
       }
     },
+    "node_modules/@jest/types/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
     "node_modules/@jest/types/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -4895,43 +4371,50 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
+    "node_modules/@jest/types/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/@jest/types/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jest/types/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@jsdevtools/coverage-istanbul-loader": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@jsdevtools/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.3.tgz",
-      "integrity": "sha512-TAdNkeGB5Fe4Og+ZkAr1Kvn9by2sfL44IAHFtxlh1BA1XJ5cLpO9iSNki5opWESv3l3vSHsZ9BNKuqFKbEbFaA==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@jsdevtools/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.5.tgz",
+      "integrity": "sha512-EUCPEkaRPvmHjWAAZkWMT7JDzpw7FKB00WTISaiXsbNOd5hCHg77XLA8sLYLFDo1zepYLo2w7GstN8YBqRXZfA==",
       "dev": true,
       "dependencies": {
         "convert-source-map": "^1.7.0",
-        "istanbul-lib-instrument": "^4.0.1",
-        "loader-utils": "^1.4.0",
+        "istanbul-lib-instrument": "^4.0.3",
+        "loader-utils": "^2.0.0",
         "merge-source-map": "^1.1.0",
-        "schema-utils": "^2.6.4"
-      }
-    },
-    "node_modules/@jsdevtools/coverage-istanbul-loader/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/@jsdevtools/coverage-istanbul-loader/node_modules/loader-utils": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4.0.0"
+        "schema-utils": "^2.7.0"
       }
     },
     "node_modules/@moodlehq/cordova-plugin-file-transfer": {
@@ -5060,49 +4543,48 @@
       }
     },
     "node_modules/@ngtools/webpack": {
-      "version": "10.0.8",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-10.0.8.tgz",
-      "integrity": "sha512-Qv4v7O4VGeWuXjRThd/mdC2I4cJOgQ7kDrVN7vkDB2EW5xtRB+/4hghvFeO3bD11FLuFvCxBMb0HbwyKoVQgEQ==",
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-11.2.14.tgz",
+      "integrity": "sha512-6q57tEWtUJRsxfTKE19L20iXvNesfVy8hrVdyzVk64DZQh0lIl4/xZT4d5bJCWOuQQDaAeZK4YbEFcYJn7k1yw==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "10.0.8",
-        "enhanced-resolve": "4.1.1",
-        "rxjs": "6.5.5",
-        "webpack-sources": "1.4.3"
+        "@angular-devkit/core": "11.2.14",
+        "enhanced-resolve": "5.7.0",
+        "webpack-sources": "2.2.0"
       },
       "engines": {
         "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
+        "npm": "^6.11.0 || ^7.5.6",
         "yarn": ">= 1.13.0"
       },
       "peerDependencies": {
-        "@angular/compiler-cli": ">=10.0.0-next.0 < 11",
-        "typescript": ">=3.9 < 3.10",
+        "@angular/compiler-cli": "^11.0.0 || ^11.2.0-next",
+        "typescript": "~4.0.0 || ~4.1.0",
         "webpack": "^4.0.0"
       }
     },
     "node_modules/@ngtools/webpack/node_modules/@angular-devkit/core": {
-      "version": "10.0.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
-      "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
+      "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
       "dev": true,
       "dependencies": {
-        "ajv": "6.12.3",
+        "ajv": "6.12.6",
         "fast-json-stable-stringify": "2.1.0",
         "magic-string": "0.25.7",
-        "rxjs": "6.5.5",
+        "rxjs": "6.6.3",
         "source-map": "0.7.3"
       },
       "engines": {
         "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
+        "npm": "^6.11.0 || ^7.5.6",
         "yarn": ">= 1.13.0"
       }
     },
     "node_modules/@ngtools/webpack/node_modules/ajv": {
-      "version": "6.12.3",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
@@ -5115,6 +4597,30 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
+    "node_modules/@ngtools/webpack/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/@ngtools/webpack/node_modules/rxjs": {
+      "version": "6.6.3",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
+      "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/@ngtools/webpack/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
     "node_modules/@ngx-translate/core": {
       "version": "13.0.0",
       "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-13.0.0.tgz",
@@ -5141,11 +4647,11 @@
       }
     },
     "node_modules/@nodelib/fs.scandir": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz",
-      "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==",
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
       "dependencies": {
-        "@nodelib/fs.stat": "2.0.3",
+        "@nodelib/fs.stat": "2.0.5",
         "run-parallel": "^1.1.9"
       },
       "engines": {
@@ -5153,25 +4659,30 @@
       }
     },
     "node_modules/@nodelib/fs.stat": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz",
-      "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
       "engines": {
         "node": ">= 8"
       }
     },
     "node_modules/@nodelib/fs.walk": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz",
-      "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==",
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
       "dependencies": {
-        "@nodelib/fs.scandir": "2.1.3",
+        "@nodelib/fs.scandir": "2.1.5",
         "fastq": "^1.6.0"
       },
       "engines": {
         "node": ">= 8"
       }
     },
+    "node_modules/@npmcli/ci-detect": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/ci-detect/-/ci-detect-1.3.0.tgz",
+      "integrity": "sha512-oN3y7FAROHhrAt7Rr7PnTSwrHrZVRTS2ZbyxeQwSSYD0ifwM3YNgQqbaRmjcWoPyq77MjchusjJDspbzMmip1Q=="
+    },
     "node_modules/@npmcli/git": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-2.1.0.tgz",
@@ -5203,17 +4714,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/@npmcli/git/node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@npmcli/git/node_modules/npm-package-arg": {
       "version": "8.1.5",
       "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.5.tgz",
@@ -5250,6 +4750,14 @@
         "node": ">=10"
       }
     },
+    "node_modules/@npmcli/git/node_modules/retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
     "node_modules/@npmcli/git/node_modules/semver": {
       "version": "7.3.5",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
@@ -5280,22 +4788,12 @@
       }
     },
     "node_modules/@npmcli/move-file": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.0.1.tgz",
-      "integrity": "sha512-Uv6h1sT+0DrblvIrolFtbvM1FgWm+/sy4B3pvLp67Zys+thcukzS5ekn7HsZFGpWP4Q3fYJCljbWQE/XivMRLw==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz",
+      "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==",
       "dependencies": {
-        "mkdirp": "^1.0.4"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@npmcli/move-file/node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "bin": {
-        "mkdirp": "bin/cmd.js"
+        "mkdirp": "^1.0.4",
+        "rimraf": "^3.0.2"
       },
       "engines": {
         "node": ">=10"
@@ -5326,43 +4824,72 @@
         "read-package-json-fast": "^2.0.1"
       }
     },
+    "node_modules/@npmcli/run-script/node_modules/read-package-json-fast": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz",
+      "integrity": "sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ==",
+      "dependencies": {
+        "json-parse-even-better-errors": "^2.3.0",
+        "npm-normalize-package-bin": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/@schematics/angular": {
-      "version": "10.0.8",
-      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-10.0.8.tgz",
-      "integrity": "sha512-KNO61UGtiKMQSG+NbusqLtwLbxId0y+xpXJt9PKFwi+vaViOO+YzOPREfiFCuQ7q6X8SmNlrMj6sZ34E2YN1pQ==",
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-11.2.14.tgz",
+      "integrity": "sha512-nErn5BFYp4HB7mOkt23kF+dyM6zPxolejM8eXQ5vd/rdhcc6ROaMZ0EmeEAWkfqB3+vqaSDz/D2Nm/IjJlyW/Q==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "10.0.8",
-        "@angular-devkit/schematics": "10.0.8"
+        "@angular-devkit/core": "11.2.14",
+        "@angular-devkit/schematics": "11.2.14",
+        "jsonc-parser": "3.0.0"
       },
       "engines": {
         "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
+        "npm": "^6.11.0 || ^7.5.6",
         "yarn": ">= 1.13.0"
       }
     },
     "node_modules/@schematics/angular/node_modules/@angular-devkit/core": {
-      "version": "10.0.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
-      "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
+      "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
       "dev": true,
       "dependencies": {
-        "ajv": "6.12.3",
+        "ajv": "6.12.6",
         "fast-json-stable-stringify": "2.1.0",
         "magic-string": "0.25.7",
-        "rxjs": "6.5.5",
+        "rxjs": "6.6.3",
         "source-map": "0.7.3"
       },
       "engines": {
         "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
+        "npm": "^6.11.0 || ^7.5.6",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@schematics/angular/node_modules/@angular-devkit/schematics": {
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.14.tgz",
+      "integrity": "sha512-Ol6+0qdGKzuVJm5gCtQr47X0OCihTfAxI4h047cHYhPFIGGPSvkG/QeJMZugflgoobi2k/xcYokOu/VAkRtWbQ==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "11.2.14",
+        "ora": "5.3.0",
+        "rxjs": "6.6.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": "^6.11.0 || ^7.5.6",
         "yarn": ">= 1.13.0"
       }
     },
     "node_modules/@schematics/angular/node_modules/ajv": {
-      "version": "6.12.3",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
@@ -5375,50 +4902,95 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/@schematics/update": {
-      "version": "0.1000.8",
-      "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.1000.8.tgz",
-      "integrity": "sha512-xHuj6ME3PNTsVUrpftd98LF3WHPM0NU25GcT/n0E/j0/52yDTiaPS3wUnYSK8ZSv4Et4hcyGx7f/LEXAoOKJXw==",
+    "node_modules/@schematics/angular/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/@schematics/angular/node_modules/jsonc-parser": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
+      "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==",
+      "dev": true
+    },
+    "node_modules/@schematics/angular/node_modules/rxjs": {
+      "version": "6.6.3",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
+      "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "10.0.8",
-        "@angular-devkit/schematics": "10.0.8",
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/@schematics/angular/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
+    "node_modules/@schematics/update": {
+      "version": "0.1102.14",
+      "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.1102.14.tgz",
+      "integrity": "sha512-OsWuC0iyNjpST1+hVUUZAegXAFpEFpS5uKYSQF3jsbyw8XHx7oA5/HbEwyr2WkX2EdV1tKrDLz6BrD5b8W6EYw==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "11.2.14",
+        "@angular-devkit/schematics": "11.2.14",
         "@yarnpkg/lockfile": "1.1.0",
-        "ini": "1.3.5",
+        "ini": "2.0.0",
         "npm-package-arg": "^8.0.0",
-        "pacote": "9.5.12",
-        "rxjs": "6.5.5",
-        "semver": "7.3.2",
+        "pacote": "11.2.4",
+        "semver": "7.3.4",
         "semver-intersect": "1.4.0"
       },
       "engines": {
         "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
+        "npm": "^6.11.0 || ^7.5.6",
         "yarn": ">= 1.13.0"
       }
     },
     "node_modules/@schematics/update/node_modules/@angular-devkit/core": {
-      "version": "10.0.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
-      "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
+      "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
       "dev": true,
       "dependencies": {
-        "ajv": "6.12.3",
+        "ajv": "6.12.6",
         "fast-json-stable-stringify": "2.1.0",
         "magic-string": "0.25.7",
-        "rxjs": "6.5.5",
+        "rxjs": "6.6.3",
         "source-map": "0.7.3"
       },
       "engines": {
         "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
+        "npm": "^6.11.0 || ^7.5.6",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@schematics/update/node_modules/@angular-devkit/schematics": {
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.14.tgz",
+      "integrity": "sha512-Ol6+0qdGKzuVJm5gCtQr47X0OCihTfAxI4h047cHYhPFIGGPSvkG/QeJMZugflgoobi2k/xcYokOu/VAkRtWbQ==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "11.2.14",
+        "ora": "5.3.0",
+        "rxjs": "6.6.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": "^6.11.0 || ^7.5.6",
         "yarn": ">= 1.13.0"
       }
     },
     "node_modules/@schematics/update/node_modules/ajv": {
-      "version": "6.12.3",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
@@ -5431,6 +5003,30 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
+    "node_modules/@schematics/update/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/@schematics/update/node_modules/rxjs": {
+      "version": "6.6.3",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
+      "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/@schematics/update/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
     "node_modules/@sindresorhus/is": {
       "version": "0.14.0",
       "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
@@ -5440,9 +5036,9 @@
       }
     },
     "node_modules/@sinonjs/commons": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.1.tgz",
-      "integrity": "sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw==",
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
+      "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
       "dev": true,
       "dependencies": {
         "type-detect": "4.0.8"
@@ -5458,9 +5054,9 @@
       }
     },
     "node_modules/@stencil/core": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.5.2.tgz",
-      "integrity": "sha512-bgjPXkSzzg1WnTgVUm6m5ZzpKt602WmA/QljODAW1xVN40OHJdbGblzF/F6MFzqv2c5Cy30CB41arc8qADIdcQ==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.6.0.tgz",
+      "integrity": "sha512-QsxWayZyusnqSZrlCl81R71rA3KqFjVVQSH4E0rGN15F1GdQaFonKlHLyCOLKLig1zzC+DQkLLiUuocexuvdeQ==",
       "bin": {
         "stencil": "bin/stencil"
       },
@@ -5488,10 +5084,51 @@
         "node": ">= 6"
       }
     },
+    "node_modules/@trysound/sax": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.1.1.tgz",
+      "integrity": "sha512-Z6DoceYb/1xSg5+e+ZlPZ9v0N16ZvZ+wYMraFue4HYrE4ttONKtsvruIRf6t9TBR0YvSOfi1hUU0fJfBLCDYow==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/@tsconfig/node10": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz",
+      "integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/@tsconfig/node12": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz",
+      "integrity": "sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/@tsconfig/node14": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz",
+      "integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/@tsconfig/node16": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz",
+      "integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "node_modules/@types/babel__core": {
-      "version": "7.1.10",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.10.tgz",
-      "integrity": "sha512-x8OM8XzITIMyiwl5Vmo2B1cR1S1Ipkyv4mdlbJjMa1lmuKvKY9FrBbEANIaMlnWn5Rf7uO+rC/VgYabNkE17Hw==",
+      "version": "7.1.15",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.15.tgz",
+      "integrity": "sha512-bxlMKPDbY8x5h6HBwVzEOk2C8fb6SLfYQ5Jw3uBYuYF1lfWk/kbLd81la82vrIkBb0l+JdmrZaDikPrNxpS/Ew==",
       "dev": true,
       "dependencies": {
         "@babel/parser": "^7.1.0",
@@ -5502,18 +5139,18 @@
       }
     },
     "node_modules/@types/babel__generator": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.2.tgz",
-      "integrity": "sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ==",
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.3.tgz",
+      "integrity": "sha512-/GWCmzJWqV7diQW54smJZzWbSFf4QYtF71WCKhcx6Ru/tFyQIY2eiiITcCAeuPbNSvT9YCGkVMqqvSk2Z0mXiA==",
       "dev": true,
       "dependencies": {
         "@babel/types": "^7.0.0"
       }
     },
     "node_modules/@types/babel__template": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.3.tgz",
-      "integrity": "sha512-uCoznIPDmnickEi6D0v11SBpW0OuVqHJCa7syXqQHy5uktSCreIlt0iglsCnmvz8yCb38hGcWeseA8cWJSwv5Q==",
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
+      "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
       "dev": true,
       "dependencies": {
         "@babel/parser": "^7.1.0",
@@ -5521,18 +5158,18 @@
       }
     },
     "node_modules/@types/babel__traverse": {
-      "version": "7.0.15",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.15.tgz",
-      "integrity": "sha512-Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A==",
+      "version": "7.14.2",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.14.2.tgz",
+      "integrity": "sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==",
       "dev": true,
       "dependencies": {
         "@babel/types": "^7.3.0"
       }
     },
     "node_modules/@types/chart.js": {
-      "version": "2.9.31",
-      "resolved": "https://registry.npmjs.org/@types/chart.js/-/chart.js-2.9.31.tgz",
-      "integrity": "sha512-hzS6phN/kx3jClk3iYqEHNnYIRSi4RZrIGJ8CDLjgatpHoftCezvC44uqB3o3OUm9ftU1m7sHG8+RLyPTlACrA==",
+      "version": "2.9.34",
+      "resolved": "https://registry.npmjs.org/@types/chart.js/-/chart.js-2.9.34.tgz",
+      "integrity": "sha512-CtZVk+kh1IN67dv+fB0CWmCLCRrDJgqOj15qPic2B1VCMovNO6B7Vhf/TgPpNscjhAL1j+qUntDMWb9A4ZmPTg==",
       "dependencies": {
         "moment": "^2.10.2"
       }
@@ -5543,20 +5180,20 @@
       "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
     },
     "node_modules/@types/dom-mediacapture-record": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/@types/dom-mediacapture-record/-/dom-mediacapture-record-1.0.7.tgz",
-      "integrity": "sha512-ddDIRTO1ajtbxaNo2o7fPJggpN54PZf1ZUJKOjto2ENMJE/9GKUvaw3ZRuQzlS/p0E+PnIcssxfoqYJ4yiXSBw=="
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/@types/dom-mediacapture-record/-/dom-mediacapture-record-1.0.10.tgz",
+      "integrity": "sha512-8O84hHuVhMMLHLybf3y9SQpNcnQSuzVzcJaUNq9+4Ovb7fodS0aQXep4hyMtxd6fe/dyszbHFjFqtyawf4y46A=="
     },
     "node_modules/@types/faker": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/@types/faker/-/faker-5.1.3.tgz",
-      "integrity": "sha512-7YTyCRoujZWYaCpDLslQJ8QzaFWFLZZ3mZ7Vfr/jJHascRmSd05pYteyt2FK4btF2vXyGq0obuoyLpcF99OvaA==",
+      "version": "5.5.7",
+      "resolved": "https://registry.npmjs.org/@types/faker/-/faker-5.5.7.tgz",
+      "integrity": "sha512-ejzb61Q5zQTtS0ZIafgQ7ahO5ACzmGhG5PfX2hxWyth3k0/aysb4ZOxKQB8DbzwSPppA5jmFBwqnBxjv5hqI5Q==",
       "dev": true
     },
     "node_modules/@types/glob": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
-      "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==",
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.4.tgz",
+      "integrity": "sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA==",
       "dev": true,
       "dependencies": {
         "@types/minimatch": "*",
@@ -5564,9 +5201,9 @@
       }
     },
     "node_modules/@types/graceful-fs": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.3.tgz",
-      "integrity": "sha512-AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
+      "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
       "dev": true,
       "dependencies": {
         "@types/node": "*"
@@ -5588,152 +5225,54 @@
       }
     },
     "node_modules/@types/istanbul-reports": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
-      "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
+      "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
       "dev": true,
       "dependencies": {
         "@types/istanbul-lib-report": "*"
       }
     },
-    "node_modules/@types/jest": {
-      "version": "26.0.14",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.14.tgz",
-      "integrity": "sha512-Hz5q8Vu0D288x3iWXePSn53W7hAjP0H7EQ6QvDO9c7t46mR0lNOLlfuwQ+JkVxuhygHzlzPX+0jKdA3ZgSh+Vg==",
-      "dev": true,
-      "dependencies": {
-        "jest-diff": "^25.2.1",
-        "pretty-format": "^25.2.1"
-      }
-    },
-    "node_modules/@types/jest/node_modules/@jest/types": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
-      "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
-      "dev": true,
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^1.1.1",
-        "@types/yargs": "^15.0.0",
-        "chalk": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 8.3"
-      }
-    },
-    "node_modules/@types/jest/node_modules/@types/istanbul-reports": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
-      "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
-      "dev": true,
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "*",
-        "@types/istanbul-lib-report": "*"
-      }
-    },
-    "node_modules/@types/jest/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@types/jest/node_modules/diff-sequences": {
-      "version": "25.2.6",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz",
-      "integrity": "sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8.3"
-      }
-    },
-    "node_modules/@types/jest/node_modules/jest-diff": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz",
-      "integrity": "sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^3.0.0",
-        "diff-sequences": "^25.2.6",
-        "jest-get-type": "^25.2.6",
-        "pretty-format": "^25.5.0"
-      },
-      "engines": {
-        "node": ">= 8.3"
-      }
-    },
-    "node_modules/@types/jest/node_modules/jest-get-type": {
-      "version": "25.2.6",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz",
-      "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8.3"
-      }
-    },
-    "node_modules/@types/jest/node_modules/pretty-format": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz",
-      "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^25.5.0",
-        "ansi-regex": "^5.0.0",
-        "ansi-styles": "^4.0.0",
-        "react-is": "^16.12.0"
-      },
-      "engines": {
-        "node": ">= 8.3"
-      }
-    },
     "node_modules/@types/json-schema": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz",
-      "integrity": "sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==",
-      "dev": true
-    },
-    "node_modules/@types/json5": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
+      "version": "7.0.8",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.8.tgz",
+      "integrity": "sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg==",
       "dev": true
     },
     "node_modules/@types/minimatch": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
-      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
+      "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==",
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "12.12.64",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.64.tgz",
-      "integrity": "sha512-UV1/ZJMC+HcP902wWdpC43cAcGu0IQk/I5bXjP2aSuCjsk3cE74mDvFrLKga7oDC170ugOAYBwfT4DSQW3akDA==",
+      "version": "12.20.18",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.18.tgz",
+      "integrity": "sha512-YoTiIwdKxM3VLiY2sM05x4iGuTveYiCcDaUVmo1L5ndrXxPGW/NEoZu+pGcBirziomizcZsnsQoemikKcB2fRA==",
       "dev": true
     },
     "node_modules/@types/normalize-package-data": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-      "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
+      "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
+      "dev": true
+    },
+    "node_modules/@types/parse-json": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
       "dev": true
     },
     "node_modules/@types/prettier": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.1.1.tgz",
-      "integrity": "sha512-2zs+O+UkDsJ1Vcp667pd3f8xearMdopz/z54i99wtRDI5KLmngk7vlrYZD0ZjKHaROR03EznlBbVY9PfAEyJIQ==",
-      "dev": true
-    },
-    "node_modules/@types/q": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz",
-      "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.3.2.tgz",
+      "integrity": "sha512-eI5Yrz3Qv4KPUa/nSIAi0h+qX0XyewOliug5F2QAtuRg6Kjg6jfmxe1GIwoIRhZspD1A0RP8ANrPwvEXXtRFog==",
       "dev": true
     },
     "node_modules/@types/resize-observer-browser": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@types/resize-observer-browser/-/resize-observer-browser-0.1.5.tgz",
-      "integrity": "sha512-8k/67Z95Goa6Lznuykxkfhq9YU3l1Qe6LNZmwde1u7802a3x8v44oq0j91DICclxatTr0rNnhXx7+VTIetSrSQ==",
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/@types/resize-observer-browser/-/resize-observer-browser-0.1.6.tgz",
+      "integrity": "sha512-61IfTac0s9jvNtBCpyo86QeaN8qqpMGHdK0uGKCCIy2dt5/Yk84VduHIdWAcmkC5QvdkPL0p5eWYgUZtHKKUVg==",
       "dev": true
     },
     "node_modules/@types/source-list-map": {
@@ -5743,21 +5282,21 @@
       "dev": true
     },
     "node_modules/@types/stack-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.0.tgz",
-      "integrity": "sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
+      "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
       "dev": true
     },
     "node_modules/@types/webpack-env": {
-      "version": "1.16.0",
-      "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.16.0.tgz",
-      "integrity": "sha512-Fx+NpfOO0CpeYX2g9bkvX8O5qh9wrU1sOF4g8sft4Mu7z+qfe387YlyY8w8daDyDsKY5vUxM0yxkAYnbkRbZEw==",
+      "version": "1.16.2",
+      "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.16.2.tgz",
+      "integrity": "sha512-vKx7WNQNZDyJveYcHAm9ZxhqSGLYwoyLhrHjLBOkw3a7cT76sTdjgtwyijhk1MaHyRIuSztcVwrUOO/NEu68Dw==",
       "dev": true
     },
     "node_modules/@types/webpack-sources": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.8.tgz",
-      "integrity": "sha512-JHB2/xZlXOjzjBB6fMOpH1eQAfsrpqVVIbneE0Rok16WXwFaznaI5vfg75U5WgGJm7V9W1c4xeRQDjX/zwvghA==",
+      "version": "0.1.9",
+      "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.9.tgz",
+      "integrity": "sha512-bvzMnzqoK16PQIC8AYHNdW45eREJQMd6WG/msQWX5V2+vZmODCOPb4TJcbgRljTZZTwTM4wUMcsI8FftNA7new==",
       "dev": true,
       "dependencies": {
         "@types/node": "*",
@@ -5775,34 +5314,33 @@
       }
     },
     "node_modules/@types/yargs": {
-      "version": "15.0.7",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.7.tgz",
-      "integrity": "sha512-Gf4u3EjaPNcC9cTu4/j2oN14nSVhr8PQ+BvBcBQHAhDZfl0bVIiLgvnRXv/dn58XhTm9UXvBpvJpDlwV65QxOA==",
+      "version": "15.0.14",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.14.tgz",
+      "integrity": "sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==",
       "dev": true,
       "dependencies": {
         "@types/yargs-parser": "*"
       }
     },
     "node_modules/@types/yargs-parser": {
-      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz",
-      "integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==",
+      "version": "20.2.1",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz",
+      "integrity": "sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==",
       "dev": true
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.22.0.tgz",
-      "integrity": "sha512-U8SP9VOs275iDXaL08Ln1Fa/wLXfj5aTr/1c0t0j6CdbOnxh+TruXu1p4I0NAvdPBQgoPjHsgKn28mOi0FzfoA==",
+      "version": "4.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.0.tgz",
+      "integrity": "sha512-eiREtqWRZ8aVJcNru7cT/AMVnYd9a2UHsfZT8MR1dW3UUEg6jDv9EQ9Cq4CUPZesyQ58YUpoAADGv71jY8RwgA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/experimental-utils": "4.22.0",
-        "@typescript-eslint/scope-manager": "4.22.0",
-        "debug": "^4.1.1",
+        "@typescript-eslint/experimental-utils": "4.29.0",
+        "@typescript-eslint/scope-manager": "4.29.0",
+        "debug": "^4.3.1",
         "functional-red-black-tree": "^1.0.1",
-        "lodash": "^4.17.15",
-        "regexpp": "^3.0.0",
-        "semver": "^7.3.2",
-        "tsutils": "^3.17.1"
+        "regexpp": "^3.1.0",
+        "semver": "^7.3.5",
+        "tsutils": "^3.21.0"
       },
       "engines": {
         "node": "^10.12.0 || >=12.0.0"
@@ -5822,17 +5360,17 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/experimental-utils": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.22.0.tgz",
-      "integrity": "sha512-xJXHHl6TuAxB5AWiVrGhvbGL8/hbiCQ8FiWwObO3r0fnvBdrbWEDy1hlvGQOAWc6qsCWuWMKdVWlLAEMpxnddg==",
+      "version": "4.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.0.tgz",
+      "integrity": "sha512-FpNVKykfeaIxlArLUP/yQfv/5/3rhl1ov6RWgud4OgbqWLkEq7lqgQU9iiavZRzpzCRQV4XddyFz3wFXdkiX9w==",
       "dev": true,
       "dependencies": {
-        "@types/json-schema": "^7.0.3",
-        "@typescript-eslint/scope-manager": "4.22.0",
-        "@typescript-eslint/types": "4.22.0",
-        "@typescript-eslint/typescript-estree": "4.22.0",
-        "eslint-scope": "^5.0.0",
-        "eslint-utils": "^2.0.0"
+        "@types/json-schema": "^7.0.7",
+        "@typescript-eslint/scope-manager": "4.29.0",
+        "@typescript-eslint/types": "4.29.0",
+        "@typescript-eslint/typescript-estree": "4.29.0",
+        "eslint-scope": "^5.1.1",
+        "eslint-utils": "^3.0.0"
       },
       "engines": {
         "node": "^10.12.0 || >=12.0.0"
@@ -5845,27 +5383,10 @@
         "eslint": "*"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.22.0.tgz",
-      "integrity": "sha512-OcCO7LTdk6ukawUM40wo61WdeoA7NM/zaoq1/2cs13M7GyiF+T4rxuA4xM+6LeHWjWbss7hkGXjFDRcKD4O04Q==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "4.22.0",
-        "@typescript-eslint/visitor-keys": "4.22.0"
-      },
-      "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.22.0.tgz",
-      "integrity": "sha512-sW/BiXmmyMqDPO2kpOhSy2Py5w6KvRRsKZnV0c4+0nr4GIcedJwXAq+RHNK4lLVEZAJYFltnnk1tJSlbeS9lYA==",
+      "version": "4.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.0.tgz",
+      "integrity": "sha512-2YJM6XfWfi8pgU2HRhTp7WgRw78TCRO3dOmSpAvIQ8MOv4B46JD2chnhpNT7Jq8j0APlIbzO1Bach734xxUl4A==",
       "dev": true,
       "engines": {
         "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
@@ -5876,18 +5397,18 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.0.tgz",
-      "integrity": "sha512-TkIFeu5JEeSs5ze/4NID+PIcVjgoU3cUQUIZnH3Sb1cEn1lBo7StSV5bwPuJQuoxKXlzAObjYTilOEKRuhR5yg==",
+      "version": "4.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.0.tgz",
+      "integrity": "sha512-8ZpNHDIOyqzzgZrQW9+xQ4k5hM62Xy2R4RPO3DQxMc5Rq5QkCdSpk/drka+DL9w6sXNzV5nrdlBmf8+x495QXQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "4.22.0",
-        "@typescript-eslint/visitor-keys": "4.22.0",
-        "debug": "^4.1.1",
-        "globby": "^11.0.1",
+        "@typescript-eslint/types": "4.29.0",
+        "@typescript-eslint/visitor-keys": "4.29.0",
+        "debug": "^4.3.1",
+        "globby": "^11.0.3",
         "is-glob": "^4.0.1",
-        "semver": "^7.3.2",
-        "tsutils": "^3.17.1"
+        "semver": "^7.3.5",
+        "tsutils": "^3.21.0"
       },
       "engines": {
         "node": "^10.12.0 || >=12.0.0"
@@ -5902,69 +5423,49 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.0.tgz",
-      "integrity": "sha512-nnMu4F+s4o0sll6cBSsTeVsT4cwxB7zECK3dFxzEjPBii9xLpq4yqqsy/FU5zMfan6G60DKZSCXAa3sHJZrcYw==",
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-utils": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "4.22.0",
         "eslint-visitor-keys": "^2.0.0"
       },
       "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "url": "https://github.com/sponsors/mysticatea"
+      },
+      "peerDependencies": {
+        "eslint": ">=5"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": {
+      "version": "7.3.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
       "dev": true,
       "dependencies": {
-        "ms": "2.1.2"
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
       },
       "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+        "node": ">=10"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
     "node_modules/@typescript-eslint/experimental-utils": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.22.0.tgz",
-      "integrity": "sha512-xJXHHl6TuAxB5AWiVrGhvbGL8/hbiCQ8FiWwObO3r0fnvBdrbWEDy1hlvGQOAWc6qsCWuWMKdVWlLAEMpxnddg==",
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.16.1.tgz",
+      "integrity": "sha512-0Hm3LSlMYFK17jO4iY3un1Ve9x1zLNn4EM50Lia+0EV99NdbK+cn0er7HC7IvBA23mBg3P+8dUkMXy4leL33UQ==",
       "dev": true,
       "dependencies": {
         "@types/json-schema": "^7.0.3",
-        "@typescript-eslint/scope-manager": "4.22.0",
-        "@typescript-eslint/types": "4.22.0",
-        "@typescript-eslint/typescript-estree": "4.22.0",
+        "@typescript-eslint/scope-manager": "4.16.1",
+        "@typescript-eslint/types": "4.16.1",
+        "@typescript-eslint/typescript-estree": "4.16.1",
         "eslint-scope": "^5.0.0",
         "eslint-utils": "^2.0.0"
       },
@@ -5979,29 +5480,50 @@
         "eslint": "*"
       }
     },
-    "node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+    "node_modules/@typescript-eslint/experimental-utils/node_modules/@typescript-eslint/scope-manager": {
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.16.1.tgz",
+      "integrity": "sha512-6IlZv9JaurqV0jkEg923cV49aAn8V6+1H1DRfhRcvZUrptQ+UtSKHb5kwTayzOYTJJ/RsYZdcvhOEKiBLyc0Cw==",
       "dev": true,
       "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
+        "@typescript-eslint/types": "4.16.1",
+        "@typescript-eslint/visitor-keys": "4.16.1"
       },
       "engines": {
-        "node": ">=8.0.0"
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/experimental-utils/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.16.1.tgz",
+      "integrity": "sha512-s/aIP1XcMkEqCNcPQtl60ogUYjSM8FU2mq1O7y5cFf3Xcob1z1iXWNB6cC43Op+NGRTFgGolri6s8z/efA9i1w==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.16.1",
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.22.0.tgz",
-      "integrity": "sha512-z/bGdBJJZJN76nvAY9DkJANYgK3nlRstRRi74WHm3jjgf2I8AglrSY+6l7ogxOmn55YJ6oKZCLLy+6PW70z15Q==",
+      "version": "4.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.29.0.tgz",
+      "integrity": "sha512-+92YRNHFdXgq+GhWQPT2bmjX09X7EH36JfgN2/4wmhtwV/HPxozpCNst8jrWcngLtEVd/4zAwA6BKojAlf+YqA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "4.22.0",
-        "@typescript-eslint/types": "4.22.0",
-        "@typescript-eslint/typescript-estree": "4.22.0",
-        "debug": "^4.1.1"
+        "@typescript-eslint/scope-manager": "4.29.0",
+        "@typescript-eslint/types": "4.29.0",
+        "@typescript-eslint/typescript-estree": "4.29.0",
+        "debug": "^4.3.1"
       },
       "engines": {
         "node": "^10.12.0 || >=12.0.0"
@@ -6019,27 +5541,10 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.22.0.tgz",
-      "integrity": "sha512-OcCO7LTdk6ukawUM40wo61WdeoA7NM/zaoq1/2cs13M7GyiF+T4rxuA4xM+6LeHWjWbss7hkGXjFDRcKD4O04Q==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "4.22.0",
-        "@typescript-eslint/visitor-keys": "4.22.0"
-      },
-      "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.22.0.tgz",
-      "integrity": "sha512-sW/BiXmmyMqDPO2kpOhSy2Py5w6KvRRsKZnV0c4+0nr4GIcedJwXAq+RHNK4lLVEZAJYFltnnk1tJSlbeS9lYA==",
+      "version": "4.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.0.tgz",
+      "integrity": "sha512-2YJM6XfWfi8pgU2HRhTp7WgRw78TCRO3dOmSpAvIQ8MOv4B46JD2chnhpNT7Jq8j0APlIbzO1Bach734xxUl4A==",
       "dev": true,
       "engines": {
         "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
@@ -6050,18 +5555,18 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.0.tgz",
-      "integrity": "sha512-TkIFeu5JEeSs5ze/4NID+PIcVjgoU3cUQUIZnH3Sb1cEn1lBo7StSV5bwPuJQuoxKXlzAObjYTilOEKRuhR5yg==",
+      "version": "4.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.0.tgz",
+      "integrity": "sha512-8ZpNHDIOyqzzgZrQW9+xQ4k5hM62Xy2R4RPO3DQxMc5Rq5QkCdSpk/drka+DL9w6sXNzV5nrdlBmf8+x495QXQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "4.22.0",
-        "@typescript-eslint/visitor-keys": "4.22.0",
-        "debug": "^4.1.1",
-        "globby": "^11.0.1",
+        "@typescript-eslint/types": "4.29.0",
+        "@typescript-eslint/visitor-keys": "4.29.0",
+        "debug": "^4.3.1",
+        "globby": "^11.0.3",
         "is-glob": "^4.0.1",
-        "semver": "^7.3.2",
-        "tsutils": "^3.17.1"
+        "semver": "^7.3.5",
+        "tsutils": "^3.21.0"
       },
       "engines": {
         "node": "^10.12.0 || >=12.0.0"
@@ -6076,14 +5581,29 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.0.tgz",
-      "integrity": "sha512-nnMu4F+s4o0sll6cBSsTeVsT4cwxB7zECK3dFxzEjPBii9xLpq4yqqsy/FU5zMfan6G60DKZSCXAa3sHJZrcYw==",
+    "node_modules/@typescript-eslint/parser/node_modules/semver": {
+      "version": "7.3.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "4.22.0",
-        "eslint-visitor-keys": "^2.0.0"
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "4.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.29.0.tgz",
+      "integrity": "sha512-HPq7XAaDMM3DpmuijxLV9Io8/6pQnliiXMQUcAdjpJJSR+fdmbD/zHCd7hMkjJn04UQtCQBtshgxClzg6NIS2w==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.29.0",
+        "@typescript-eslint/visitor-keys": "4.29.0"
       },
       "engines": {
         "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
@@ -6093,38 +5613,11 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+    "node_modules/@typescript-eslint/scope-manager/node_modules/@typescript-eslint/types": {
+      "version": "4.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.0.tgz",
+      "integrity": "sha512-2YJM6XfWfi8pgU2HRhTp7WgRw78TCRO3dOmSpAvIQ8MOv4B46JD2chnhpNT7Jq8j0APlIbzO1Bach734xxUl4A==",
       "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@typescript-eslint/scope-manager": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.22.0.tgz",
-      "integrity": "sha512-OcCO7LTdk6ukawUM40wo61WdeoA7NM/zaoq1/2cs13M7GyiF+T4rxuA4xM+6LeHWjWbss7hkGXjFDRcKD4O04Q==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "4.22.0",
-        "@typescript-eslint/visitor-keys": "4.22.0"
-      },
       "engines": {
         "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
       },
@@ -6134,9 +5627,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.22.0.tgz",
-      "integrity": "sha512-sW/BiXmmyMqDPO2kpOhSy2Py5w6KvRRsKZnV0c4+0nr4GIcedJwXAq+RHNK4lLVEZAJYFltnnk1tJSlbeS9lYA==",
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.16.1.tgz",
+      "integrity": "sha512-nnKqBwMgRlhzmJQF8tnFDZWfunXmJyuXj55xc8Kbfup4PbkzdoDXZvzN8//EiKR27J6vUSU8j4t37yUuYPiLqA==",
       "dev": true,
       "engines": {
         "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
@@ -6147,13 +5640,13 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.0.tgz",
-      "integrity": "sha512-TkIFeu5JEeSs5ze/4NID+PIcVjgoU3cUQUIZnH3Sb1cEn1lBo7StSV5bwPuJQuoxKXlzAObjYTilOEKRuhR5yg==",
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.16.1.tgz",
+      "integrity": "sha512-m8I/DKHa8YbeHt31T+UGd/l8Kwr0XCTCZL3H4HMvvLCT7HU9V7yYdinTOv1gf/zfqNeDcCgaFH2BMsS8x6NvJg==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "4.22.0",
-        "@typescript-eslint/visitor-keys": "4.22.0",
+        "@typescript-eslint/types": "4.16.1",
+        "@typescript-eslint/visitor-keys": "4.16.1",
         "debug": "^4.1.1",
         "globby": "^11.0.1",
         "is-glob": "^4.0.1",
@@ -6173,36 +5666,13 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.16.1.tgz",
+      "integrity": "sha512-s/aIP1XcMkEqCNcPQtl60ogUYjSM8FU2mq1O7y5cFf3Xcob1z1iXWNB6cC43Op+NGRTFgGolri6s8z/efA9i1w==",
       "dev": true,
       "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.0.tgz",
-      "integrity": "sha512-nnMu4F+s4o0sll6cBSsTeVsT4cwxB7zECK3dFxzEjPBii9xLpq4yqqsy/FU5zMfan6G60DKZSCXAa3sHJZrcYw==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "4.22.0",
+        "@typescript-eslint/types": "4.16.1",
         "eslint-visitor-keys": "^2.0.0"
       },
       "engines": {
@@ -6213,6 +5683,36 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
+    "node_modules/@typescript-eslint/visitor-keys": {
+      "version": "4.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.0.tgz",
+      "integrity": "sha512-LoaofO1C/jAJYs0uEpYMXfHboGXzOJeV118X4OsZu9f7rG7Pr9B3+4HTU8+err81rADa4xfQmAxnRnPAI2jp+Q==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.29.0",
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/visitor-keys/node_modules/@typescript-eslint/types": {
+      "version": "4.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.0.tgz",
+      "integrity": "sha512-2YJM6XfWfi8pgU2HRhTp7WgRw78TCRO3dOmSpAvIQ8MOv4B46JD2chnhpNT7Jq8j0APlIbzO1Bach734xxUl4A==",
+      "dev": true,
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
     "node_modules/@webassemblyjs/ast": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz",
@@ -6430,9 +5930,9 @@
       }
     },
     "node_modules/acorn": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
-      "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -6451,22 +5951,10 @@
         "acorn-walk": "^7.1.1"
       }
     },
-    "node_modules/acorn-globals/node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/acorn-jsx": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
-      "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
       "dev": true,
       "peerDependencies": {
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
@@ -6482,84 +5970,40 @@
       }
     },
     "node_modules/adjust-sourcemap-loader": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-2.0.0.tgz",
-      "integrity": "sha512-4hFsTsn58+YjrU9qKzML2JSSDqKvN8mUGQ0nNIrfPi8hmIONT4L3uUaT6MKdMsZ9AjsU6D2xDkZxCkbQPxChrA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz",
+      "integrity": "sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==",
       "dev": true,
       "dependencies": {
-        "assert": "1.4.1",
-        "camelcase": "5.0.0",
-        "loader-utils": "1.2.3",
-        "object-path": "0.11.4",
-        "regex-parser": "2.2.10"
-      }
-    },
-    "node_modules/adjust-sourcemap-loader/node_modules/camelcase": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz",
-      "integrity": "sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/adjust-sourcemap-loader/node_modules/emojis-list": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/adjust-sourcemap-loader/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/adjust-sourcemap-loader/node_modules/loader-utils": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
-      "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^2.0.0",
-        "json5": "^1.0.1"
+        "loader-utils": "^2.0.0",
+        "regex-parser": "^2.2.11"
       },
       "engines": {
-        "node": ">=4.0.0"
+        "node": ">=8.9"
       }
     },
     "node_modules/agent-base": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
-      "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
-      "dev": true,
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
       "dependencies": {
-        "es6-promisify": "^5.0.0"
+        "debug": "4"
       },
       "engines": {
-        "node": ">= 4.0.0"
+        "node": ">= 6.0.0"
       }
     },
     "node_modules/agentkeepalive": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.5.2.tgz",
-      "integrity": "sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==",
-      "dev": true,
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.1.4.tgz",
+      "integrity": "sha512-+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ==",
       "dependencies": {
+        "debug": "^4.1.0",
+        "depd": "^1.1.2",
         "humanize-ms": "^1.2.1"
       },
       "engines": {
-        "node": ">= 4.0.0"
+        "node": ">= 8.0.0"
       }
     },
     "node_modules/aggregate-error": {
@@ -6575,13 +6019,14 @@
       }
     },
     "node_modules/ajv": {
-      "version": "6.12.5",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz",
-      "integrity": "sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.2.0.tgz",
+      "integrity": "sha512-WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA==",
+      "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
         "uri-js": "^4.2.2"
       },
       "funding": {
@@ -6598,13 +6043,22 @@
         "ajv": ">=5.0.0"
       }
     },
-    "node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+    "node_modules/ajv-formats": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.0.2.tgz",
+      "integrity": "sha512-Brah4Uo5/U8v76c6euTwtjVFFaVishwnJrQBYpev1JRh4vjA1F4HY3UzQez41YUCszUCXKagG8v6eVRBHV1gkw==",
       "dev": true,
+      "peer": true,
+      "dependencies": {
+        "ajv": "^8.0.0"
+      },
       "peerDependencies": {
-        "ajv": "^6.9.1"
+        "ajv": "^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
       }
     },
     "node_modules/alphanum-sort": {
@@ -6614,9 +6068,9 @@
       "dev": true
     },
     "node_modules/android-versions": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-1.6.0.tgz",
-      "integrity": "sha512-ojC2Ig7b/KJ6iNtR8e4bacmOsJyEkoERk3CKMIsnH7kJz5z6551NMbrVaRb7KXYavu1d74Uhml/bfcmqT3nAcg==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-1.7.0.tgz",
+      "integrity": "sha512-TCy4b8Dk8YS6A23ZPfhSKqK66JHFq0D8avGYiwvYpjno6HrrcI0DRgHx9+jtkvWYmrsE2vQWgbHJhvGGhhOb0g==",
       "dependencies": {
         "semver": "^5.7.1"
       }
@@ -6642,6 +6096,27 @@
         "string-width": "^3.0.0"
       }
     },
+    "node_modules/ansi-align/node_modules/ansi-regex": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ansi-align/node_modules/emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
+    },
+    "node_modules/ansi-align/node_modules/is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/ansi-align/node_modules/string-width": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
@@ -6655,10 +6130,21 @@
         "node": ">=6"
       }
     },
+    "node_modules/ansi-align/node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "dependencies": {
+        "ansi-regex": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/ansi-colors": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
-      "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
       "dev": true,
       "engines": {
         "node": ">=6"
@@ -6677,11 +6163,18 @@
       }
     },
     "node_modules/ansi-escapes": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
-      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.21.3"
+      },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/ansi-gray": {
@@ -6721,25 +6214,22 @@
       }
     },
     "node_modules/ansi-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "color-convert": "^1.9.0"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">=4"
       }
     },
     "node_modules/ansi-wrap": {
@@ -6752,9 +6242,9 @@
       }
     },
     "node_modules/anymatch": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-      "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
       "dev": true,
       "dependencies": {
         "normalize-path": "^3.0.0",
@@ -6824,25 +6314,23 @@
         "node": ">=6.0"
       }
     },
-    "node_modules/aria-query/node_modules/@babel/runtime": {
-      "version": "7.13.17",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.17.tgz",
-      "integrity": "sha512-NCdgJEelPTSh+FEFylhnP1ylq848l1z9t9N0j1Lfbcw0+KXGjsTvUmkxy+voLLXB5SOKMbLLx4jxYliGrYQseA==",
+    "node_modules/arr-diff": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
+      "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
       "dev": true,
       "dependencies": {
-        "regenerator-runtime": "^0.13.4"
+        "arr-flatten": "^1.0.1",
+        "array-slice": "^0.2.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/arity-n": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/arity-n/-/arity-n-1.0.4.tgz",
-      "integrity": "sha1-2edrEXM+CFacCEeuezmyhgswt0U=",
-      "dev": true
-    },
-    "node_modules/arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+    "node_modules/arr-diff/node_modules/array-slice": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
+      "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -6882,9 +6370,9 @@
       }
     },
     "node_modules/arr-union": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
+      "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -6931,141 +6419,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array-includes/node_modules/es-abstract": {
-      "version": "1.18.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz",
-      "integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.2",
-        "is-callable": "^1.2.3",
-        "is-negative-zero": "^2.0.1",
-        "is-regex": "^1.1.2",
-        "is-string": "^1.0.5",
-        "object-inspect": "^1.9.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "string.prototype.trimend": "^1.0.4",
-        "string.prototype.trimstart": "^1.0.4",
-        "unbox-primitive": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/has-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/is-callable": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
-      "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/is-negative-zero": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
-      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/is-regex": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
-      "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-symbols": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/object-inspect": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.2.tgz",
-      "integrity": "sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/object.assign": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "has-symbols": "^1.0.1",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/string.prototype.trimend": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
-      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/string.prototype.trimstart": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
-      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/array-initial": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz",
@@ -7132,15 +6485,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/array-sort/node_modules/kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/array-union": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
@@ -7184,12 +6528,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/asap": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=",
-      "dev": true
-    },
     "node_modules/asn1": {
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
@@ -7211,17 +6549,18 @@
       }
     },
     "node_modules/asn1.js/node_modules/bn.js": {
-      "version": "4.11.9",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-      "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
       "dev": true
     },
     "node_modules/assert": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
-      "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
+      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
       "dev": true,
       "dependencies": {
+        "object-assign": "^4.1.1",
         "util": "0.10.3"
       }
     },
@@ -7233,6 +6572,21 @@
         "node": ">=0.8"
       }
     },
+    "node_modules/assert/node_modules/inherits": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+      "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+      "dev": true
+    },
+    "node_modules/assert/node_modules/util": {
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+      "dev": true,
+      "dependencies": {
+        "inherits": "2.0.1"
+      }
+    },
     "node_modules/assign-symbols": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
@@ -7336,92 +6690,38 @@
       }
     },
     "node_modules/autoprefixer": {
-      "version": "9.8.0",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.0.tgz",
-      "integrity": "sha512-D96ZiIHXbDmU02dBaemyAg53ez+6F5yZmapmgKcjm35yEe1uVDYI8hGW3VYoGRaG290ZFf91YxHrR518vC0u/A==",
+      "version": "10.2.4",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.2.4.tgz",
+      "integrity": "sha512-DCCdUQiMD+P/as8m3XkeTUkUKuuRqLGcwD0nll7wevhqoJfMRpJlkFd1+MQh1pvupjiQuip42lc/VFvfUTMSKw==",
       "dev": true,
       "dependencies": {
-        "browserslist": "^4.12.0",
-        "caniuse-lite": "^1.0.30001061",
-        "chalk": "^2.4.2",
+        "browserslist": "^4.16.1",
+        "caniuse-lite": "^1.0.30001181",
+        "colorette": "^1.2.1",
+        "fraction.js": "^4.0.13",
         "normalize-range": "^0.1.2",
-        "num2fraction": "^1.2.2",
-        "postcss": "^7.0.30",
         "postcss-value-parser": "^4.1.0"
       },
       "bin": {
         "autoprefixer": "bin/autoprefixer"
       },
       "engines": {
-        "node": ">=6.0.0"
+        "node": "^10 || ^12 || >=14"
       },
       "funding": {
-        "type": "tidelift",
-        "url": "https://tidelift.com/funding/github/npm/autoprefixer"
-      }
-    },
-    "node_modules/autoprefixer/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
       },
-      "engines": {
-        "node": ">=4"
+      "peerDependencies": {
+        "postcss": "^8.1.0"
       }
     },
-    "node_modules/autoprefixer/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/autoprefixer/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/autoprefixer/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+    "node_modules/autoprefixer/node_modules/colorette": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
+      "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
       "dev": true
     },
-    "node_modules/autoprefixer/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/autoprefixer/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/aws-sign2": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
@@ -7431,9 +6731,9 @@
       }
     },
     "node_modules/aws4": {
-      "version": "1.10.1",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz",
-      "integrity": "sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA=="
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
+      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
     },
     "node_modules/axobject-query": {
       "version": "2.2.0",
@@ -7442,16 +6742,16 @@
       "dev": true
     },
     "node_modules/babel-jest": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.5.2.tgz",
-      "integrity": "sha512-U3KvymF3SczA3vOL/cgiUFOznfMET+XDIXiWnoJV45siAp2pLMG8i2+/MGZlAC3f/F6Q40LR4M4qDrWZ9wkK8A==",
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.6.3.tgz",
+      "integrity": "sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA==",
       "dev": true,
       "dependencies": {
-        "@jest/transform": "^26.5.2",
-        "@jest/types": "^26.5.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/babel__core": "^7.1.7",
         "babel-plugin-istanbul": "^6.0.0",
-        "babel-preset-jest": "^26.5.0",
+        "babel-preset-jest": "^26.6.2",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.4",
         "slash": "^3.0.0"
@@ -7463,10 +6763,25 @@
         "@babel/core": "^7.0.0"
       }
     },
+    "node_modules/babel-jest/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
     "node_modules/babel-jest/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -7479,40 +6794,58 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/babel-loader": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz",
-      "integrity": "sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==",
+    "node_modules/babel-jest/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
-        "find-cache-dir": "^2.1.0",
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/babel-jest/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/babel-jest/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/babel-loader": {
+      "version": "8.2.2",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.2.tgz",
+      "integrity": "sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==",
+      "dev": true,
+      "dependencies": {
+        "find-cache-dir": "^3.3.1",
         "loader-utils": "^1.4.0",
-        "mkdirp": "^0.5.3",
-        "pify": "^4.0.1",
+        "make-dir": "^3.1.0",
         "schema-utils": "^2.6.5"
       },
       "engines": {
-        "node": ">= 6.9"
+        "node": ">= 8.9"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0",
         "webpack": ">=2"
       }
     },
-    "node_modules/babel-loader/node_modules/find-cache-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
-      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
-      "dev": true,
-      "dependencies": {
-        "commondir": "^1.0.1",
-        "make-dir": "^2.0.0",
-        "pkg-dir": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/babel-loader/node_modules/json5": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
@@ -7539,28 +6872,6 @@
         "node": ">=4.0.0"
       }
     },
-    "node_modules/babel-loader/node_modules/make-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-      "dev": true,
-      "dependencies": {
-        "pify": "^4.0.1",
-        "semver": "^5.6.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/babel-loader/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
     "node_modules/babel-plugin-add-header-comment": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/babel-plugin-add-header-comment/-/babel-plugin-add-header-comment-1.0.3.tgz",
@@ -7592,9 +6903,9 @@
       }
     },
     "node_modules/babel-plugin-jest-hoist": {
-      "version": "26.5.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.5.0.tgz",
-      "integrity": "sha512-ck17uZFD3CDfuwCLATWZxkkuGGFhMij8quP8CNhwj8ek1mqFgbFzRJ30xwC04LLscj/aKsVFfRST+b5PT7rSuw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz",
+      "integrity": "sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw==",
       "dev": true,
       "dependencies": {
         "@babel/template": "^7.3.3",
@@ -7607,9 +6918,9 @@
       }
     },
     "node_modules/babel-preset-current-node-syntax": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.4.tgz",
-      "integrity": "sha512-5/INNCYhUGqw7VbVjT/hb3ucjgkVHKXY7lX3ZjlN4gm565VyFmJUrJ/h+h16ECVB38R/9SF6aACydpKMLZ/c9w==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
+      "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
       "dev": true,
       "dependencies": {
         "@babel/plugin-syntax-async-generators": "^7.8.4",
@@ -7622,20 +6933,21 @@
         "@babel/plugin-syntax-numeric-separator": "^7.8.3",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
         "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-top-level-await": "^7.8.3"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0"
       }
     },
     "node_modules/babel-preset-jest": {
-      "version": "26.5.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.5.0.tgz",
-      "integrity": "sha512-F2vTluljhqkiGSJGBg/jOruA8vIIIL11YrxRcO7nviNTMbbofPSHwnm8mgP7d/wS7wRSexRoI6X1A6T74d4LQA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz",
+      "integrity": "sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ==",
       "dev": true,
       "dependencies": {
-        "babel-plugin-jest-hoist": "^26.5.0",
-        "babel-preset-current-node-syntax": "^0.1.3"
+        "babel-plugin-jest-hoist": "^26.6.2",
+        "babel-preset-current-node-syntax": "^1.0.0"
       },
       "engines": {
         "node": ">= 10.14.2"
@@ -7665,9 +6977,9 @@
       }
     },
     "node_modules/balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
     },
     "node_modules/base": {
       "version": "0.11.2",
@@ -7699,44 +7011,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/base/node_modules/is-accessor-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/base/node_modules/is-data-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/base/node_modules/is-descriptor": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/base/node_modules/isobject": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
@@ -7747,9 +7021,23 @@
       }
     },
     "node_modules/base64-js": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
-      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
     },
     "node_modules/batch": {
       "version": "0.6.1",
@@ -7783,9 +7071,9 @@
       }
     },
     "node_modules/binary-extensions": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
-      "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
       "dev": true,
       "engines": {
         "node": ">=8"
@@ -7801,46 +7089,29 @@
         "file-uri-to-path": "1.0.0"
       }
     },
+    "node_modules/bindings/node_modules/file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "dev": true,
+      "optional": true
+    },
     "node_modules/bl": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.3.tgz",
-      "integrity": "sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==",
-      "optional": true,
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+      "devOptional": true,
       "dependencies": {
         "buffer": "^5.5.0",
         "inherits": "^2.0.4",
         "readable-stream": "^3.4.0"
       }
     },
-    "node_modules/bl/node_modules/buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "optional": true,
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
-    },
     "node_modules/bl/node_modules/readable-stream": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
       "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "optional": true,
+      "devOptional": true,
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -7857,9 +7128,9 @@
       "dev": true
     },
     "node_modules/bn.js": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz",
-      "integrity": "sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
+      "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==",
       "dev": true
     },
     "node_modules/body-parser": {
@@ -7890,6 +7161,19 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/body-parser/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/body-parser/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+    },
     "node_modules/bonjour": {
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
@@ -7937,47 +7221,74 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/boxen/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+    "node_modules/boxen/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/boxen/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    "node_modules/boxen/node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "engines": {
+        "node": ">=6"
+      }
     },
-    "node_modules/boxen/node_modules/is-fullwidth-code-point": {
+    "node_modules/boxen/node_modules/chalk": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/boxen/node_modules/string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
       "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/boxen/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+    "node_modules/boxen/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dependencies": {
-        "ansi-regex": "^5.0.0"
+        "color-name": "~1.1.4"
       },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/boxen/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/boxen/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/boxen/node_modules/type-fest": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
       "engines": {
         "node": ">=8"
       }
@@ -8071,21 +7382,15 @@
       }
     },
     "node_modules/browserify-rsa": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
-      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
+      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
       "dev": true,
       "dependencies": {
-        "bn.js": "^4.1.0",
+        "bn.js": "^5.0.0",
         "randombytes": "^2.0.1"
       }
     },
-    "node_modules/browserify-rsa/node_modules/bn.js": {
-      "version": "4.11.9",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-      "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
-      "dev": true
-    },
     "node_modules/browserify-sign": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
@@ -8147,15 +7452,16 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.14.5",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.5.tgz",
-      "integrity": "sha512-Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA==",
+      "version": "4.16.7",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.7.tgz",
+      "integrity": "sha512-7I4qVwqZltJ7j37wObBe3SoTz+nS8APaNcrBOlgoirb6/HbEU2XxW/LpUDTCngM6iauwFqmRTuOMfyKnFGY5JA==",
       "dev": true,
       "dependencies": {
-        "caniuse-lite": "^1.0.30001135",
-        "electron-to-chromium": "^1.3.571",
-        "escalade": "^3.1.0",
-        "node-releases": "^1.1.61"
+        "caniuse-lite": "^1.0.30001248",
+        "colorette": "^1.2.2",
+        "electron-to-chromium": "^1.3.793",
+        "escalade": "^3.1.1",
+        "node-releases": "^1.1.73"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -8164,10 +7470,16 @@
         "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
       },
       "funding": {
-        "type": "tidelift",
-        "url": "https://tidelift.com/funding/github/npm/browserslist"
+        "type": "opencollective",
+        "url": "https://opencollective.com/browserslist"
       }
     },
+    "node_modules/browserslist/node_modules/colorette": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
+      "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
+      "dev": true
+    },
     "node_modules/bs-logger": {
       "version": "0.2.6",
       "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
@@ -8190,14 +7502,27 @@
       }
     },
     "node_modules/buffer": {
-      "version": "4.9.2",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
-      "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
-      "dev": true,
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "devOptional": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
       "dependencies": {
-        "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4",
-        "isarray": "^1.0.0"
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
       }
     },
     "node_modules/buffer-crc32": {
@@ -8219,9 +7544,9 @@
       }
     },
     "node_modules/buffer-from": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
       "dev": true
     },
     "node_modules/buffer-indexof": {
@@ -8256,22 +7581,21 @@
       }
     },
     "node_modules/cacache": {
-      "version": "15.0.3",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.3.tgz",
-      "integrity": "sha512-bc3jKYjqv7k4pWh7I/ixIjfcjPul4V4jme/WbjvwGS5LzoPL/GzXr4C5EgPNLO/QEZl9Oi61iGitYEdwcrwLCQ==",
-      "dev": true,
+      "version": "15.0.5",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.5.tgz",
+      "integrity": "sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A==",
       "dependencies": {
+        "@npmcli/move-file": "^1.0.1",
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
         "glob": "^7.1.4",
         "infer-owner": "^1.0.4",
-        "lru-cache": "^5.1.1",
+        "lru-cache": "^6.0.0",
         "minipass": "^3.1.1",
         "minipass-collect": "^1.0.2",
         "minipass-flush": "^1.0.5",
         "minipass-pipeline": "^1.2.2",
         "mkdirp": "^1.0.3",
-        "move-file": "^2.0.0",
         "p-map": "^4.0.0",
         "promise-inflight": "^1.0.1",
         "rimraf": "^3.0.2",
@@ -8283,33 +7607,6 @@
         "node": ">= 10"
       }
     },
-    "node_modules/cacache/node_modules/lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^3.0.2"
-      }
-    },
-    "node_modules/cacache/node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "dev": true,
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/cacache/node_modules/yallist": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true
-    },
     "node_modules/cache-base": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
@@ -8364,6 +7661,14 @@
         "node": ">=8"
       }
     },
+    "node_modules/cacheable-request/node_modules/normalize-url": {
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
+      "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/call-bind": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
@@ -8377,39 +7682,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/caller-callsite": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
-      "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
-      "dev": true,
-      "dependencies": {
-        "callsites": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/caller-callsite/node_modules/callsites": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
-      "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/caller-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
-      "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
-      "dev": true,
-      "dependencies": {
-        "caller-callsite": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/callsites": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -8429,11 +7701,15 @@
       }
     },
     "node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
+      "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
+      "dev": true,
       "engines": {
-        "node": ">=6"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/caniuse-api": {
@@ -8449,10 +7725,14 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001197",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001197.tgz",
-      "integrity": "sha512-8aE+sqBqtXz4G8g35Eg/XEaFr2N7rd/VQ6eABGBmNtcB8cN6qNJhMi6oSFy4UWWZgqgL3filHT8Nha4meu3tsw==",
-      "dev": true
+      "version": "1.0.30001248",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001248.tgz",
+      "integrity": "sha512-NwlQbJkxUFJ8nMErnGtT0QTM2TJ33xgz4KXJSMIrjXIbDVdaYueGyjOrLKRtJC+rTiWfi6j5cnZN1NBiSBJGNw==",
+      "dev": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/browserslist"
+      }
     },
     "node_modules/canonical-path": {
       "version": "1.0.0",
@@ -8472,21 +7752,31 @@
         "node": "6.* || 8.* || >= 10.*"
       }
     },
+    "node_modules/capture-exit/node_modules/rsvp": {
+      "version": "4.8.5",
+      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
+      "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
+      "dev": true,
+      "engines": {
+        "node": "6.* || >= 7.*"
+      }
+    },
     "node_modules/caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
       "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
     },
     "node_modules/chalk": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
     "node_modules/char-regex": {
@@ -8529,19 +7819,6 @@
         "color-name": "^1.0.0"
       }
     },
-    "node_modules/chartjs-color/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/chartjs-color/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-    },
     "node_modules/check-es-compat": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/check-es-compat/-/check-es-compat-1.1.1.tgz",
@@ -8558,64 +7835,29 @@
         "node": ">=8.10.0"
       }
     },
-    "node_modules/check-es-compat/node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/ansi-escapes": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+    "node_modules/check-es-compat/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
       "dependencies": {
-        "type-fest": "^0.11.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/ansi-escapes/node_modules/type-fest": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-      "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
     "node_modules/check-es-compat/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
       "dev": true,
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
+        "node": ">=6"
       }
     },
     "node_modules/check-es-compat/node_modules/astral-regex": {
@@ -8627,56 +7869,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/check-es-compat/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "dev": true,
-      "dependencies": {
-        "restore-cursor": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/cli-width": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
-      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
     "node_modules/check-es-compat/node_modules/cross-spawn": {
       "version": "6.0.5",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
@@ -8702,27 +7894,10 @@
         "semver": "bin/semver"
       }
     },
-    "node_modules/check-es-compat/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/check-es-compat/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
       "dev": true
     },
     "node_modules/check-es-compat/node_modules/eslint": {
@@ -8779,19 +7954,6 @@
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/check-es-compat/node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
     "node_modules/check-es-compat/node_modules/eslint-utils": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
@@ -8827,21 +7989,6 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/check-es-compat/node_modules/figures": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-      "dev": true,
-      "dependencies": {
-        "escape-string-regexp": "^1.0.5"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/check-es-compat/node_modules/file-entry-cache": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
@@ -8889,15 +8036,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/check-es-compat/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/check-es-compat/node_modules/ignore": {
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
@@ -8907,121 +8045,21 @@
         "node": ">= 4"
       }
     },
-    "node_modules/check-es-compat/node_modules/inquirer": {
-      "version": "7.3.3",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz",
-      "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^3.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^3.0.0",
-        "lodash": "^4.17.19",
-        "mute-stream": "0.0.8",
-        "run-async": "^2.4.0",
-        "rxjs": "^6.6.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "through": "^2.3.6"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/inquirer/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/inquirer/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/inquirer/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/inquirer/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/check-es-compat/node_modules/inquirer/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/inquirer/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/inquirer/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/check-es-compat/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
+    "node_modules/check-es-compat/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
     "node_modules/check-es-compat/node_modules/levn": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
@@ -9035,11 +8073,17 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/check-es-compat/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
+    "node_modules/check-es-compat/node_modules/mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
     },
     "node_modules/check-es-compat/node_modules/optionator": {
       "version": "0.8.3",
@@ -9085,19 +8129,6 @@
         "node": ">=6.5.0"
       }
     },
-    "node_modules/check-es-compat/node_modules/restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-      "dev": true,
-      "dependencies": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/check-es-compat/node_modules/rimraf": {
       "version": "2.6.3",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
@@ -9110,18 +8141,6 @@
         "rimraf": "bin.js"
       }
     },
-    "node_modules/check-es-compat/node_modules/rxjs": {
-      "version": "6.6.6",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.6.tgz",
-      "integrity": "sha512-/oTwee4N4iWzAMAL9xdGKjkEHmIwupR3oXbQjCKywF1BeFohswF3vZdogbmEF6pZkOsXTzWkrZszrWpQTByYVg==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^1.9.0"
-      },
-      "engines": {
-        "npm": ">=2.0.0"
-      }
-    },
     "node_modules/check-es-compat/node_modules/semver": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -9166,63 +8185,30 @@
         "node": ">=6"
       }
     },
-    "node_modules/check-es-compat/node_modules/slice-ansi/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/check-es-compat/node_modules/string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
       "dev": true,
       "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
+        "emoji-regex": "^7.0.1",
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^5.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=6"
       }
     },
-    "node_modules/check-es-compat/node_modules/string-width/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+    "node_modules/check-es-compat/node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
       "dev": true,
       "dependencies": {
-        "ansi-regex": "^5.0.0"
+        "ansi-regex": "^4.1.0"
       },
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
+        "node": ">=6"
       }
     },
     "node_modules/check-es-compat/node_modules/table": {
@@ -9240,41 +8226,6 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/check-es-compat/node_modules/table/node_modules/emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-      "dev": true
-    },
-    "node_modules/check-es-compat/node_modules/table/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/table/node_modules/string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
-    },
     "node_modules/check-es-compat/node_modules/type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
@@ -9287,6 +8238,15 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/check-es-compat/node_modules/type-fest": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/check-es-compat/node_modules/which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -9316,81 +8276,25 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/cheerio/node_modules/css-select": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
-      "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
-      "dev": true,
-      "dependencies": {
-        "boolbase": "~1.0.0",
-        "css-what": "2.1",
-        "domutils": "1.5.1",
-        "nth-check": "~1.0.1"
-      }
-    },
-    "node_modules/cheerio/node_modules/css-what": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
-      "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/cheerio/node_modules/dom-serializer": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
-      "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "^1.3.0",
-        "entities": "^1.1.1"
-      }
-    },
-    "node_modules/cheerio/node_modules/domutils": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
-      "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
-      "dev": true,
-      "dependencies": {
-        "dom-serializer": "0",
-        "domelementtype": "1"
-      }
-    },
-    "node_modules/cheerio/node_modules/entities": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
-      "dev": true
-    },
-    "node_modules/cheerio/node_modules/parse5": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz",
-      "integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
     "node_modules/chokidar": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz",
-      "integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==",
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
+      "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
       "dev": true,
       "dependencies": {
-        "anymatch": "~3.1.1",
+        "anymatch": "~3.1.2",
         "braces": "~3.0.2",
-        "glob-parent": "~5.1.0",
+        "glob-parent": "~5.1.2",
         "is-binary-path": "~2.1.0",
         "is-glob": "~4.0.1",
         "normalize-path": "~3.0.0",
-        "readdirp": "~3.4.0"
+        "readdirp": "~3.6.0"
       },
       "engines": {
         "node": ">= 8.10.0"
       },
       "optionalDependencies": {
-        "fsevents": "~2.1.2"
+        "fsevents": "~2.3.2"
       }
     },
     "node_modules/chownr": {
@@ -9402,23 +8306,14 @@
       }
     },
     "node_modules/chrome-trace-event": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz",
-      "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
+      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
       "dev": true,
-      "dependencies": {
-        "tslib": "^1.9.0"
-      },
       "engines": {
         "node": ">=6.0"
       }
     },
-    "node_modules/chrome-trace-event/node_modules/tslib": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
-      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
-      "dev": true
-    },
     "node_modules/ci-info": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
@@ -9435,9 +8330,9 @@
       }
     },
     "node_modules/circular-dependency-plugin": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-5.2.0.tgz",
-      "integrity": "sha512-7p4Kn/gffhQaavNfyDFg7LS5S/UT1JAjyGd4UqR2+jzoYF02eDkj0Ec3+48TsIa4zghjLY87nQHIh/ecK9qLdw==",
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-5.2.2.tgz",
+      "integrity": "sha512-g38K9Cm5WRwlaH6g03B9OEz/0qRizI+2I7n+Gz+L5DxXJAPAiWQvwlYNm1V1jkdpUv95bOe/ASm2vfi/G560jQ==",
       "dev": true,
       "engines": {
         "node": ">=6.0.0"
@@ -9446,6 +8341,12 @@
         "webpack": ">=4.0.1"
       }
     },
+    "node_modules/cjs-module-lexer": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz",
+      "integrity": "sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==",
+      "dev": true
+    },
     "node_modules/class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
@@ -9461,6 +8362,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/class-utils/node_modules/arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/class-utils/node_modules/define-property": {
       "version": "0.2.5",
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
@@ -9473,6 +8383,68 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/class-utils/node_modules/is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/is-accessor-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/is-data-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/class-utils/node_modules/isobject": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
@@ -9523,20 +8495,21 @@
       }
     },
     "node_modules/cli-cursor": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
-      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+      "dev": true,
       "dependencies": {
-        "restore-cursor": "^2.0.0"
+        "restore-cursor": "^3.1.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/cli-spinners": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.4.0.tgz",
-      "integrity": "sha512-sJAofoarcm76ZGpuooaO0eDy8saEy+YoZBLjC4h8srt4jeBnkYeOgqxgsJQTpyt2LjI5PTfLJHSL+41Yu4fEJA==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.0.tgz",
+      "integrity": "sha512-t+4/y50K/+4xcCRosKkA7W4gTr1MySvLV0q+PxmG7FJ5g+66ChKurYjxBCjHggHH3HA5Hh9cy+lcUGWDqVH+4Q==",
       "dev": true,
       "engines": {
         "node": ">=6"
@@ -9546,33 +8519,23 @@
       }
     },
     "node_modules/cli-width": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
-      "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw=="
-    },
-    "node_modules/cliui": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
+      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
       "dev": true,
-      "dependencies": {
-        "string-width": "^3.1.0",
-        "strip-ansi": "^5.2.0",
-        "wrap-ansi": "^5.1.0"
+      "engines": {
+        "node": ">= 10"
       }
     },
-    "node_modules/cliui/node_modules/string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+    "node_modules/cliui": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
       "dev": true,
       "dependencies": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=6"
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
       }
     },
     "node_modules/clone": {
@@ -9607,6 +8570,36 @@
         "node": ">=6"
       }
     },
+    "node_modules/clone-deep/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/clone-deep/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/clone-deep/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/clone-response": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
@@ -9615,6 +8608,14 @@
         "mimic-response": "^1.0.0"
       }
     },
+    "node_modules/clone-response/node_modules/mimic-response": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
+      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/clone-stats": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
@@ -9642,82 +8643,6 @@
         "node": ">= 0.12.0"
       }
     },
-    "node_modules/coa": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
-      "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
-      "dev": true,
-      "dependencies": {
-        "@types/q": "^1.5.1",
-        "chalk": "^2.4.1",
-        "q": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 4.0"
-      }
-    },
-    "node_modules/coa/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/coa/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/coa/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/coa/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/coa/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/coa/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/code-point-at": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
@@ -9759,42 +8684,24 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/color": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/color/-/color-3.1.2.tgz",
-      "integrity": "sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==",
-      "dev": true,
+    "node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "dependencies": {
-        "color-convert": "^1.9.1",
-        "color-string": "^1.5.2"
+        "color-name": "1.1.3"
       }
     },
-    "node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
+    "node_modules/color-convert/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
     },
     "node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
-    "node_modules/color-string": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz",
-      "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "^1.0.0",
-        "simple-swizzle": "^0.2.2"
-      }
-    },
     "node_modules/color-support": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
@@ -9804,19 +8711,10 @@
         "color-support": "bin.js"
       }
     },
-    "node_modules/color/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/color/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+    "node_modules/colord": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/colord/-/colord-2.5.0.tgz",
+      "integrity": "sha512-EeswvDseZAYGju9qVFHIf1ftRsWayhVZgCaZvp25UZzDON7ESYj/MoXD+qvf1lnRrgweeaCGHr389t2r1Huo7w==",
       "dev": true
     },
     "node_modules/colorette": {
@@ -9850,9 +8748,9 @@
       }
     },
     "node_modules/commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "version": "2.17.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
+      "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
       "dev": true
     },
     "node_modules/comment-parser": {
@@ -9876,15 +8774,6 @@
       "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
       "dev": true
     },
-    "node_modules/compose-function": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/compose-function/-/compose-function-3.0.3.tgz",
-      "integrity": "sha1-ntZ18TzFRQHTCVCkhv9qe6OrGF8=",
-      "dev": true,
-      "dependencies": {
-        "arity-n": "^1.0.4"
-      }
-    },
     "node_modules/compressible": {
       "version": "2.0.18",
       "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
@@ -9913,6 +8802,19 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/compression/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/compression/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+    },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -10056,15 +8958,6 @@
       "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
       "dev": true
     },
-    "node_modules/contains-path": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
-      "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/content-disposition": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
@@ -10085,9 +8978,9 @@
       }
     },
     "node_modules/convert-source-map": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
-      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
+      "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
       "dev": true,
       "dependencies": {
         "safe-buffer": "~5.1.1"
@@ -10112,6 +9005,15 @@
       "integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==",
       "dev": true
     },
+    "node_modules/copy-anything": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.3.tgz",
+      "integrity": "sha512-GK6QUtisv4fNS+XcI7shX0Gx9ORg7QqIznyfho79JTnX1XhLiyZHfftvGiziqzRiEi/Bjhgpi+D2o7HxJFPnDQ==",
+      "dev": true,
+      "dependencies": {
+        "is-what": "^3.12.0"
+      }
+    },
     "node_modules/copy-concurrently": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
@@ -10126,6 +9028,18 @@
         "run-queue": "^1.0.0"
       }
     },
+    "node_modules/copy-concurrently/node_modules/mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
     "node_modules/copy-concurrently/node_modules/rimraf": {
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -10148,31 +9062,31 @@
       }
     },
     "node_modules/copy-props": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz",
-      "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.5.tgz",
+      "integrity": "sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw==",
       "dev": true,
       "dependencies": {
-        "each-props": "^1.3.0",
-        "is-plain-object": "^2.0.1"
+        "each-props": "^1.3.2",
+        "is-plain-object": "^5.0.0"
       }
     },
     "node_modules/copy-webpack-plugin": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.0.3.tgz",
-      "integrity": "sha512-q5m6Vz4elsuyVEIUXr7wJdIdePWTubsqVbEMvf1WQnHGv0Q+9yPRu7MtYFPt+GBOXRav9lvIINifTQ1vSCs+eA==",
+      "version": "6.3.2",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.3.2.tgz",
+      "integrity": "sha512-MgJ1uouLIbDg4ST1GzqrGQyKoXY5iPqi6fghFqarijam7FQcBa/r6Rg0VkoIuzx75Xq8iAMghyOueMkWUQ5OaA==",
       "dev": true,
       "dependencies": {
-        "cacache": "^15.0.4",
+        "cacache": "^15.0.5",
         "fast-glob": "^3.2.4",
         "find-cache-dir": "^3.3.1",
         "glob-parent": "^5.1.1",
         "globby": "^11.0.1",
         "loader-utils": "^2.0.0",
         "normalize-path": "^3.0.0",
-        "p-limit": "^3.0.1",
-        "schema-utils": "^2.7.0",
-        "serialize-javascript": "^4.0.0",
+        "p-limit": "^3.0.2",
+        "schema-utils": "^3.0.0",
+        "serialize-javascript": "^5.0.1",
         "webpack-sources": "^1.4.3"
       },
       "engines": {
@@ -10186,59 +9100,72 @@
         "webpack": "^4.37.0 || ^5.0.0"
       }
     },
-    "node_modules/copy-webpack-plugin/node_modules/cacache": {
-      "version": "15.0.5",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.5.tgz",
-      "integrity": "sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A==",
+    "node_modules/copy-webpack-plugin/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
       "dependencies": {
-        "@npmcli/move-file": "^1.0.1",
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "glob": "^7.1.4",
-        "infer-owner": "^1.0.4",
-        "lru-cache": "^6.0.0",
-        "minipass": "^3.1.1",
-        "minipass-collect": "^1.0.2",
-        "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.2",
-        "mkdirp": "^1.0.3",
-        "p-map": "^4.0.0",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^3.0.2",
-        "ssri": "^8.0.0",
-        "tar": "^6.0.2",
-        "unique-filename": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "dev": true,
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/p-limit": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.0.2.tgz",
-      "integrity": "sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/copy-webpack-plugin/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/copy-webpack-plugin/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/copy-webpack-plugin/node_modules/schema-utils": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/copy-webpack-plugin/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/copy-webpack-plugin/node_modules/webpack-sources": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+      "dev": true,
+      "dependencies": {
+        "source-list-map": "^2.0.0",
+        "source-map": "~0.6.1"
       }
     },
     "node_modules/cordova": {
@@ -10268,26 +9195,24 @@
       }
     },
     "node_modules/cordova-android": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-9.1.0.tgz",
-      "integrity": "sha512-bzOX9E4eQsOSpa06oZZ7XAGq3DwB73juhhj0oPqHH/khWk0mkCD4aiVYMFoc0fmIaSQvzbY1ww7L6UBW5pyGfg==",
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-10.0.1.tgz",
+      "integrity": "sha512-Hv8H9b4JE2wi9vBBl6K84ZWh01nkFAdIgIGnv3T2Gd8srmCwOw1f3snDCjpcCqxD0jiBAkN5wk5hCIY+EmHJyA==",
       "dependencies": {
-        "android-versions": "^1.5.0",
-        "cordova-common": "^4.0.1",
-        "execa": "^4.0.2",
-        "fast-glob": "^3.2.4",
-        "fs-extra": "^9.0.1",
-        "is-path-inside": "^3.0.2",
-        "nopt": "^4.0.3",
+        "android-versions": "^1.7.0",
+        "cordova-common": "^4.0.2",
+        "execa": "^5.1.1",
+        "fast-glob": "^3.2.7",
+        "fs-extra": "^10.0.0",
+        "is-path-inside": "^3.0.3",
+        "nopt": "^5.0.0",
         "properties-parser": "^0.3.1",
-        "semver": "^7.3.4",
+        "semver": "^7.3.5",
+        "untildify": "^4.0.0",
         "which": "^2.0.2"
       },
-      "bin": {
-        "create": "bin/create"
-      },
       "engines": {
-        "node": ">=10.10.0"
+        "node": ">=12.0.0"
       }
     },
     "node_modules/cordova-android-support-gradle-release": {
@@ -10307,6 +9232,74 @@
         "semver": "bin/semver"
       }
     },
+    "node_modules/cordova-android/node_modules/execa": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/cordova-android/node_modules/fs-extra": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
+      "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/cordova-android/node_modules/get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cordova-android/node_modules/human-signals": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+      "engines": {
+        "node": ">=10.17.0"
+      }
+    },
+    "node_modules/cordova-android/node_modules/nopt": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
+      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
+      "dependencies": {
+        "abbrev": "1"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/cordova-android/node_modules/semver": {
       "version": "7.3.5",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
@@ -10395,246 +9388,6 @@
         "npm": ">= 5.6.0"
       }
     },
-    "node_modules/cordova-fetch/node_modules/agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-      "dependencies": {
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6.0.0"
-      }
-    },
-    "node_modules/cordova-fetch/node_modules/agentkeepalive": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.1.4.tgz",
-      "integrity": "sha512-+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ==",
-      "dependencies": {
-        "debug": "^4.1.0",
-        "depd": "^1.1.2",
-        "humanize-ms": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 8.0.0"
-      }
-    },
-    "node_modules/cordova-fetch/node_modules/cacache": {
-      "version": "15.2.0",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.2.0.tgz",
-      "integrity": "sha512-uKoJSHmnrqXgthDFx/IU6ED/5xd+NNGe+Bb+kLZy7Ku4P+BaiWEUflAKPZ7eAzsYGcsAGASJZsybXp+quEcHTw==",
-      "dependencies": {
-        "@npmcli/move-file": "^1.0.1",
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "glob": "^7.1.4",
-        "infer-owner": "^1.0.4",
-        "lru-cache": "^6.0.0",
-        "minipass": "^3.1.1",
-        "minipass-collect": "^1.0.2",
-        "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.2",
-        "mkdirp": "^1.0.3",
-        "p-map": "^4.0.0",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^3.0.2",
-        "ssri": "^8.0.1",
-        "tar": "^6.0.2",
-        "unique-filename": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/cordova-fetch/node_modules/debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/cordova-fetch/node_modules/err-code": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
-      "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="
-    },
-    "node_modules/cordova-fetch/node_modules/http-proxy-agent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
-      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
-      "dependencies": {
-        "@tootallnate/once": "1",
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/cordova-fetch/node_modules/https-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
-      "dependencies": {
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/cordova-fetch/node_modules/make-fetch-happen": {
-      "version": "9.0.4",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.0.4.tgz",
-      "integrity": "sha512-sQWNKMYqSmbAGXqJg2jZ+PmHh5JAybvwu0xM8mZR/bsTjGiTASj3ldXJV7KFHy1k/IJIBkjxQFoWIVsv9+PQMg==",
-      "dependencies": {
-        "agentkeepalive": "^4.1.3",
-        "cacache": "^15.2.0",
-        "http-cache-semantics": "^4.1.0",
-        "http-proxy-agent": "^4.0.1",
-        "https-proxy-agent": "^5.0.0",
-        "is-lambda": "^1.0.1",
-        "lru-cache": "^6.0.0",
-        "minipass": "^3.1.3",
-        "minipass-collect": "^1.0.2",
-        "minipass-fetch": "^1.3.2",
-        "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.4",
-        "negotiator": "^0.6.2",
-        "promise-retry": "^2.0.1",
-        "socks-proxy-agent": "^5.0.0",
-        "ssri": "^8.0.0"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/cordova-fetch/node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/cordova-fetch/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "node_modules/cordova-fetch/node_modules/npm-packlist": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.2.2.tgz",
-      "integrity": "sha512-Jt01acDvJRhJGthnUJVF/w6gumWOZxO7IkpY/lsX9//zqQgnF7OJaxgQXcerd4uQOLu7W5bkb4mChL9mdfm+Zg==",
-      "dependencies": {
-        "glob": "^7.1.6",
-        "ignore-walk": "^3.0.3",
-        "npm-bundled": "^1.1.1",
-        "npm-normalize-package-bin": "^1.0.1"
-      },
-      "bin": {
-        "npm-packlist": "bin/index.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/cordova-fetch/node_modules/npm-registry-fetch": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-11.0.0.tgz",
-      "integrity": "sha512-jmlgSxoDNuhAtxUIG6pVwwtz840i994dL14FoNVZisrmZW5kWd63IUTNv1m/hyRSGSqWjCUp/YZlS1BJyNp9XA==",
-      "dependencies": {
-        "make-fetch-happen": "^9.0.1",
-        "minipass": "^3.1.3",
-        "minipass-fetch": "^1.3.0",
-        "minipass-json-stream": "^1.0.1",
-        "minizlib": "^2.0.0",
-        "npm-package-arg": "^8.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/cordova-fetch/node_modules/pacote": {
-      "version": "11.3.5",
-      "resolved": "https://registry.npmjs.org/pacote/-/pacote-11.3.5.tgz",
-      "integrity": "sha512-fT375Yczn4zi+6Hkk2TBe1x1sP8FgFsEIZ2/iWaXY2r/NkhDJfxbcn5paz1+RTFCyNf+dPnaoBDJoAxXSU8Bkg==",
-      "dependencies": {
-        "@npmcli/git": "^2.1.0",
-        "@npmcli/installed-package-contents": "^1.0.6",
-        "@npmcli/promise-spawn": "^1.2.0",
-        "@npmcli/run-script": "^1.8.2",
-        "cacache": "^15.0.5",
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.1.0",
-        "infer-owner": "^1.0.4",
-        "minipass": "^3.1.3",
-        "mkdirp": "^1.0.3",
-        "npm-package-arg": "^8.0.1",
-        "npm-packlist": "^2.1.4",
-        "npm-pick-manifest": "^6.0.0",
-        "npm-registry-fetch": "^11.0.0",
-        "promise-retry": "^2.0.1",
-        "read-package-json-fast": "^2.0.1",
-        "rimraf": "^3.0.2",
-        "ssri": "^8.0.1",
-        "tar": "^6.1.0"
-      },
-      "bin": {
-        "pacote": "lib/bin.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/cordova-fetch/node_modules/pify": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz",
-      "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/cordova-fetch/node_modules/promise-retry": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
-      "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
-      "dependencies": {
-        "err-code": "^2.0.2",
-        "retry": "^0.12.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/cordova-fetch/node_modules/socks-proxy-agent": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz",
-      "integrity": "sha512-vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ==",
-      "dependencies": {
-        "agent-base": "^6.0.2",
-        "debug": "4",
-        "socks": "^2.3.3"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/cordova-ios": {
       "version": "6.2.0",
       "resolved": "https://registry.npmjs.org/cordova-ios/-/cordova-ios-6.2.0.tgz",
@@ -10669,40 +9422,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/cordova-ios/node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/cordova-ios/node_modules/uuid": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
-      "integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==",
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
-    "node_modules/cordova-ios/node_modules/xcode": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/xcode/-/xcode-3.0.1.tgz",
-      "integrity": "sha512-kCz5k7J7XbJtjABOvkc5lJmkiDh8VhjVCGNiqdKCscmVpdVUpEAyXv1xmCLkQJ5dsHqx3IPO4XW+NTDhU/fatA==",
-      "dependencies": {
-        "simple-plist": "^1.1.0",
-        "uuid": "^7.0.3"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
     "node_modules/cordova-lib": {
       "version": "10.0.0",
       "resolved": "https://registry.npmjs.org/cordova-lib/-/cordova-lib-10.0.0.tgz",
@@ -10729,17 +9448,6 @@
         "node": ">=10.0.0"
       }
     },
-    "node_modules/cordova-lib/node_modules/pify": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz",
-      "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/cordova-plugin-add-swift-support": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/cordova-plugin-add-swift-support/-/cordova-plugin-add-swift-support-2.0.2.tgz",
@@ -10758,10 +9466,31 @@
         "semver": "bin/semver.js"
       }
     },
+    "node_modules/cordova-plugin-add-swift-support/node_modules/uuid": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "bin": {
+        "uuid": "bin/uuid"
+      }
+    },
+    "node_modules/cordova-plugin-add-swift-support/node_modules/xcode": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/xcode/-/xcode-2.1.0.tgz",
+      "integrity": "sha512-uCrmPITrqTEzhn0TtT57fJaNaw8YJs1aCzs+P/QqxsDbvPZSv7XMPPwXrKvHtD6pLjBM/NaVwraWJm8q83Y4iQ==",
+      "dependencies": {
+        "simple-plist": "^1.0.0",
+        "uuid": "^3.3.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
     "node_modules/cordova-plugin-advanced-http": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-advanced-http/-/cordova-plugin-advanced-http-3.1.0.tgz",
-      "integrity": "sha512-zlTlNJyTttE7TV5vW2WGvHqpbKMDVrr1meZU0fy4y3ObrI/hGk2UDcDNwpZdMfaytNZwDKU4sRgsTgQYdFNBew==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-advanced-http/-/cordova-plugin-advanced-http-3.2.0.tgz",
+      "integrity": "sha512-NOjkxLvP8z7vrnrwuXO0bWGJviK31KO1ov0Nel1BqbNi2rZNafL5RRxC1/RHXik252xf070xDgBvDwdWv7yxjA==",
       "engines": [
         {
           "name": "cordova",
@@ -10793,9 +9522,9 @@
       ]
     },
     "node_modules/cordova-plugin-camera": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-camera/-/cordova-plugin-camera-5.0.1.tgz",
-      "integrity": "sha512-9gXyZvI8u9KzsZuqmB8Yw+uheF+7f+usMAwvOMw7L7pqbykg+bm9US5zjhJbwit3A1cSblgZkpBafe5cFiMcTA==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-camera/-/cordova-plugin-camera-5.0.2.tgz",
+      "integrity": "sha512-iR9W9S+USg/YTjwB+6rnIqJ1mZ02da0Q2VDU0Twf/CccEJO+006T5RM/NYDkBRs6vMCw7rWXroCNJOPBLLETPQ==",
       "engines": {
         "cordovaDependencies": {
           "3.0.0": {
@@ -10966,9 +9695,9 @@
       }
     },
     "node_modules/cordova-plugin-prevent-override": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-prevent-override/-/cordova-plugin-prevent-override-1.0.0.tgz",
-      "integrity": "sha512-/+3q5r4K5RahCpiYVmZQBjq10x4jj+6CMjYtZyx9jdMWeV+yFE+ItFcO1NeUAEWd2iHC5YPD0P2tHiHx5kscsw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-prevent-override/-/cordova-plugin-prevent-override-1.0.1.tgz",
+      "integrity": "sha512-yy1JZ+lXTR33Ai1yloT6wdXJXe0a3LrfgnKORuPZv/QkbiqfIQKjy0R4zRP8qljaJSelF/xv5CgrVt8iS0SkBg==",
       "engines": {
         "cordovaDependencies": {
           "3.0.0": {
@@ -11024,24 +9753,24 @@
       }
     },
     "node_modules/cordova-plugin-whitelist": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.4.tgz",
-      "integrity": "sha512-EYC5eQFVkoYXq39l7tYKE6lEjHJ04mvTmKXxGL7quHLdFPfJMNzru/UYpn92AOfpl3PQaZmou78C7EgmFOwFQQ==",
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.5.tgz",
+      "integrity": "sha512-+v/VzCYBdGsIxJTP2m+RWaq7l/NLu7b976w6XGJUFiN2TVOeaGrytaR4jRy0w9akRai8uKFeBmuGHmlS/sOeCA==",
       "engines": {
         "cordovaDependencies": {
           "0.0.0": {
             "cordova-android": ">=4.0.0"
           },
-          "2.0.0": {
-            "cordova": ">100"
+          "1.3.5": {
+            "cordova-android": ">=4.0.0 <10.0.0"
           }
         }
       }
     },
     "node_modules/cordova-plugin-wkuserscript": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-wkuserscript/-/cordova-plugin-wkuserscript-1.0.0.tgz",
-      "integrity": "sha512-g18TohV1T+iWQJImYUCZc44x2ywHTH3ycgEJyxo4WTL9eYm4T7lNkyl1svzQGI97e8W5hQxUqAcmvpVcnWvjSQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-wkuserscript/-/cordova-plugin-wkuserscript-1.0.1.tgz",
+      "integrity": "sha512-qhb2JOFy+XnLIbPubDuAcZyf6fSsrQ2syM8PqAVvW7JJQVR7i64pZDLHmgYQrGN+2pO1fG8EdR2aUp5O0Kx/HA==",
       "engines": {
         "cordovaDependencies": {
           "3.0.0": {
@@ -11051,9 +9780,9 @@
       }
     },
     "node_modules/cordova-plugin-wkwebview-cookies": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-wkwebview-cookies/-/cordova-plugin-wkwebview-cookies-1.0.0.tgz",
-      "integrity": "sha512-bQRnc/1UNu2XDb6ds+RuAZGA8FM2MuQb4z45J/CaDfjSs60OSvxGVKo3okrM/okYosZqWJFygrPah0MK3lDERQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-wkwebview-cookies/-/cordova-plugin-wkwebview-cookies-1.0.1.tgz",
+      "integrity": "sha512-x984mlj21Newei7UFPTu4N3NJSTBZuuQXkDNJxq8FTGM1RH/YECqYAzk6ekk/regFamj1bCQ3IB8XJeCm5/dhA==",
       "engines": {
         "cordovaDependencies": {
           "3.0.0": {
@@ -11089,6 +9818,62 @@
         "npm": ">= 5.6.0"
       }
     },
+    "node_modules/cordova-serve/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/cordova-serve/node_modules/chalk": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cordova-serve/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/cordova-serve/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cordova-serve/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/cordova-sqlite-storage": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/cordova-sqlite-storage/-/cordova-sqlite-storage-6.0.0.tgz",
@@ -11103,9 +9888,9 @@
       "integrity": "sha512-dTBxYaX/RGzH6+pp49o4sb3FuHCvhrssaKn1XMJ4LL3f9dnvz3rhFK2LdcWrdFkhOLOndnW/azUkbzZd+WWhRA=="
     },
     "node_modules/cordova-support-google-services": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/cordova-support-google-services/-/cordova-support-google-services-1.2.1.tgz",
-      "integrity": "sha512-EnFjKAE9oI2uzyUvEfWpLgTM200nuJVvShaA4yyz9wMKBUN+H/BRG1byd1ibZz3sSihNKi3FxjQPxmmEn6/IfA=="
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/cordova-support-google-services/-/cordova-support-google-services-1.4.1.tgz",
+      "integrity": "sha512-1VgF9kFCOMbzgdnsDtSKaYGmWXmeciGP8+N0wTcTkL2m6Qrs1xZ82NiYEJYXe7BjHad2d06liWThqQv7iXt5HA=="
     },
     "node_modules/cordova.plugins.diagnostic": {
       "version": "5.0.2",
@@ -11133,9 +9918,9 @@
       "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
     },
     "node_modules/core-js": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.9.1.tgz",
-      "integrity": "sha512-gSjRvzkxQc1zjM/5paAmL4idJBFzuJoo+jDjF1tStYFMV2ERfD02HhahhCGXUyHxQRG4yFKVSdO6g62eoRMcDg==",
+      "version": "3.16.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.16.0.tgz",
+      "integrity": "sha512-5+5VxRFmSf97nM8Jr2wzOwLqRo6zphH2aX+7KsAUONObyzakDNq2G/bgbhinxB4PoV9L3aXQYhiDKyIKWd2c8g==",
       "hasInstallScript": true,
       "funding": {
         "type": "opencollective",
@@ -11143,12 +9928,12 @@
       }
     },
     "node_modules/core-js-compat": {
-      "version": "3.6.5",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz",
-      "integrity": "sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==",
+      "version": "3.16.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.16.0.tgz",
+      "integrity": "sha512-5D9sPHCdewoUK7pSUPfTF7ZhLh8k9/CoJXWUEo+F1dZT5Z1DVgcuRqUKhjeKW+YLb8f21rTFgWwQJiNw1hoZ5Q==",
       "dev": true,
       "dependencies": {
-        "browserslist": "^4.8.5",
+        "browserslist": "^4.16.6",
         "semver": "7.0.0"
       },
       "funding": {
@@ -11166,9 +9951,9 @@
       }
     },
     "node_modules/core-js-pure": {
-      "version": "3.11.1",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.11.1.tgz",
-      "integrity": "sha512-2JukQi8HgAOCD5CSimxWWXVrUBoA9Br796uIA5Z06bIjt7PBBI19ircFaAxplgE1mJf3x2BY6MkT/HWA/UryPg==",
+      "version": "3.16.0",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.16.0.tgz",
+      "integrity": "sha512-wzlhZNepF/QA9yvx3ePDgNGudU5KDB8lu/TRPKelYA/QtSnkS/cLl2W+TIdEX1FAFcBr0YpY7tPDlcmXJ7AyiQ==",
       "dev": true,
       "hasInstallScript": true,
       "funding": {
@@ -11182,40 +9967,19 @@
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "node_modules/cosmiconfig": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
-      "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz",
+      "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==",
       "dev": true,
       "dependencies": {
-        "import-fresh": "^2.0.0",
-        "is-directory": "^0.3.1",
-        "js-yaml": "^3.13.1",
-        "parse-json": "^4.0.0"
+        "@types/parse-json": "^4.0.0",
+        "import-fresh": "^3.2.1",
+        "parse-json": "^5.0.0",
+        "path-type": "^4.0.0",
+        "yaml": "^1.10.0"
       },
       "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/cosmiconfig/node_modules/import-fresh": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
-      "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
-      "dev": true,
-      "dependencies": {
-        "caller-path": "^2.0.0",
-        "resolve-from": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/cosmiconfig/node_modules/resolve-from": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
+        "node": ">=10"
       }
     },
     "node_modules/create-ecdh": {
@@ -11229,9 +9993,9 @@
       }
     },
     "node_modules/create-ecdh/node_modules/bn.js": {
-      "version": "4.11.9",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-      "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
       "dev": true
     },
     "node_modules/create-hash": {
@@ -11261,6 +10025,97 @@
         "sha.js": "^2.4.8"
       }
     },
+    "node_modules/create-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
+      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/critters": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/critters/-/critters-0.0.7.tgz",
+      "integrity": "sha512-qUF2SaAWFYjNPdCcPpu68p2DnHiosia84yx5mPTlUMQjkjChR+n6sO1/I7yn2U2qNDgSPTd2SoaTIDQcUL+EwQ==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "css": "^3.0.0",
+        "parse5": "^6.0.1",
+        "parse5-htmlparser2-tree-adapter": "^6.0.1",
+        "pretty-bytes": "^5.3.0"
+      }
+    },
+    "node_modules/critters/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/critters/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/critters/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/critters/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/critters/node_modules/parse5": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+      "dev": true
+    },
+    "node_modules/critters/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -11305,103 +10160,117 @@
       }
     },
     "node_modules/css": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
-      "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/css/-/css-3.0.0.tgz",
+      "integrity": "sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==",
       "dev": true,
       "dependencies": {
-        "inherits": "^2.0.3",
+        "inherits": "^2.0.4",
         "source-map": "^0.6.1",
-        "source-map-resolve": "^0.5.2",
-        "urix": "^0.1.0"
+        "source-map-resolve": "^0.6.0"
       }
     },
     "node_modules/css-color-names": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
-      "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-1.0.1.tgz",
+      "integrity": "sha512-/loXYOch1qU1biStIFsHH8SxTmOseh1IJqFvy8IujXOm1h+QjUdDhkzOrR5HG8K8mlxREj0yfi8ewCHx0eMxzA==",
       "dev": true,
       "engines": {
         "node": "*"
       }
     },
     "node_modules/css-declaration-sorter": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz",
-      "integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.1.1.tgz",
+      "integrity": "sha512-BZ1aOuif2Sb7tQYY1GeCjG7F++8ggnwUkH5Ictw0mrdpqpEd+zWmcPdstnH2TItlb74FqR0DrVEieon221T/1Q==",
       "dev": true,
       "dependencies": {
-        "postcss": "^7.0.1",
         "timsort": "^0.3.0"
       },
       "engines": {
-        "node": ">4"
+        "node": ">= 10"
+      },
+      "peerDependencies": {
+        "postcss": "^8.0.9"
       }
     },
     "node_modules/css-loader": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.5.3.tgz",
-      "integrity": "sha512-UEr9NH5Lmi7+dguAm+/JSPovNjYbm2k3TK58EiwQHzOHH5Jfq1Y+XoP2bQO6TMn7PptMd0opxxedAWcaSTRKHw==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-5.0.1.tgz",
+      "integrity": "sha512-cXc2ti9V234cq7rJzFKhirb2L2iPy8ZjALeVJAozXYz9te3r4eqLSixNAbMDJSgJEQywqXzs8gonxaboeKqwiw==",
       "dev": true,
       "dependencies": {
-        "camelcase": "^5.3.1",
+        "camelcase": "^6.2.0",
         "cssesc": "^3.0.0",
-        "icss-utils": "^4.1.1",
-        "loader-utils": "^1.2.3",
-        "normalize-path": "^3.0.0",
-        "postcss": "^7.0.27",
-        "postcss-modules-extract-imports": "^2.0.0",
-        "postcss-modules-local-by-default": "^3.0.2",
-        "postcss-modules-scope": "^2.2.0",
-        "postcss-modules-values": "^3.0.0",
-        "postcss-value-parser": "^4.0.3",
-        "schema-utils": "^2.6.6",
-        "semver": "^6.3.0"
+        "icss-utils": "^5.0.0",
+        "loader-utils": "^2.0.0",
+        "postcss": "^8.1.4",
+        "postcss-modules-extract-imports": "^3.0.0",
+        "postcss-modules-local-by-default": "^4.0.0",
+        "postcss-modules-scope": "^3.0.0",
+        "postcss-modules-values": "^4.0.0",
+        "postcss-value-parser": "^4.1.0",
+        "schema-utils": "^3.0.0",
+        "semver": "^7.3.2"
       },
       "engines": {
-        "node": ">= 8.9.0"
+        "node": ">= 10.13.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/webpack"
       },
       "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
+        "webpack": "^4.27.0 || ^5.0.0"
       }
     },
-    "node_modules/css-loader/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+    "node_modules/css-loader/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
       "dependencies": {
-        "minimist": "^1.2.0"
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
       },
-      "bin": {
-        "json5": "lib/cli.js"
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/css-loader/node_modules/loader-utils": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+    "node_modules/css-loader/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/css-loader/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/css-loader/node_modules/schema-utils": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
       "dev": true,
       "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^1.0.1"
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
       },
       "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/css-loader/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
       }
     },
     "node_modules/css-parse": {
@@ -11413,31 +10282,59 @@
         "css": "^2.0.0"
       }
     },
-    "node_modules/css-select": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
-      "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
+    "node_modules/css-parse/node_modules/css": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
+      "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
       "dev": true,
       "dependencies": {
-        "boolbase": "^1.0.0",
-        "css-what": "^3.2.1",
-        "domutils": "^1.7.0",
-        "nth-check": "^1.0.2"
+        "inherits": "^2.0.3",
+        "source-map": "^0.6.1",
+        "source-map-resolve": "^0.5.2",
+        "urix": "^0.1.0"
       }
     },
-    "node_modules/css-select-base-adapter": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
-      "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
-      "dev": true
+    "node_modules/css-parse/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "node_modules/css-tree": {
-      "version": "1.0.0-alpha.37",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz",
-      "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==",
+    "node_modules/css-parse/node_modules/source-map-resolve": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
       "dev": true,
       "dependencies": {
-        "mdn-data": "2.0.4",
+        "atob": "^2.1.2",
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
+      }
+    },
+    "node_modules/css-select": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
+      "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "~1.0.0",
+        "css-what": "2.1",
+        "domutils": "1.5.1",
+        "nth-check": "~1.0.1"
+      }
+    },
+    "node_modules/css-tree": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
+      "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
+      "dev": true,
+      "dependencies": {
+        "mdn-data": "2.0.14",
         "source-map": "^0.6.1"
       },
       "engines": {
@@ -11454,15 +10351,12 @@
       }
     },
     "node_modules/css-what": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.1.tgz",
-      "integrity": "sha512-wHOppVDKl4vTAOWzJt5Ek37Sgd9qq1Bmj/T1OjvicWbU5W7ru7Pqbn0Jdqii3Drx/h+dixHKXNhZYx7blthL7g==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
+      "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
       "dev": true,
       "engines": {
-        "node": ">= 6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
+        "node": "*"
       }
     },
     "node_modules/css/node_modules/source-map": {
@@ -11487,140 +10381,93 @@
       }
     },
     "node_modules/cssnano": {
-      "version": "4.1.10",
-      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz",
-      "integrity": "sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.0.2.tgz",
+      "integrity": "sha512-8JK3EnPsjQsULme9/e5M2hF564f/480hwsdcHvQ7ZtAIMfQ1O3SCfs+b8Mjf5KJxhYApyRshR2QSovEJi2K72Q==",
       "dev": true,
       "dependencies": {
-        "cosmiconfig": "^5.0.0",
-        "cssnano-preset-default": "^4.0.7",
-        "is-resolvable": "^1.0.0",
-        "postcss": "^7.0.0"
+        "cosmiconfig": "^7.0.0",
+        "cssnano-preset-default": "^5.0.1",
+        "is-resolvable": "^1.1.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/cssnano"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.1"
       }
     },
     "node_modules/cssnano-preset-default": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz",
-      "integrity": "sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA==",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.1.3.tgz",
+      "integrity": "sha512-qo9tX+t4yAAZ/yagVV3b+QBKeLklQbmgR3wI7mccrDcR+bEk9iHgZN1E7doX68y9ThznLya3RDmR+nc7l6/2WQ==",
       "dev": true,
       "dependencies": {
-        "css-declaration-sorter": "^4.0.1",
-        "cssnano-util-raw-cache": "^4.0.1",
-        "postcss": "^7.0.0",
-        "postcss-calc": "^7.0.1",
-        "postcss-colormin": "^4.0.3",
-        "postcss-convert-values": "^4.0.1",
-        "postcss-discard-comments": "^4.0.2",
-        "postcss-discard-duplicates": "^4.0.2",
-        "postcss-discard-empty": "^4.0.1",
-        "postcss-discard-overridden": "^4.0.1",
-        "postcss-merge-longhand": "^4.0.11",
-        "postcss-merge-rules": "^4.0.3",
-        "postcss-minify-font-values": "^4.0.2",
-        "postcss-minify-gradients": "^4.0.2",
-        "postcss-minify-params": "^4.0.2",
-        "postcss-minify-selectors": "^4.0.2",
-        "postcss-normalize-charset": "^4.0.1",
-        "postcss-normalize-display-values": "^4.0.2",
-        "postcss-normalize-positions": "^4.0.2",
-        "postcss-normalize-repeat-style": "^4.0.2",
-        "postcss-normalize-string": "^4.0.2",
-        "postcss-normalize-timing-functions": "^4.0.2",
-        "postcss-normalize-unicode": "^4.0.1",
-        "postcss-normalize-url": "^4.0.1",
-        "postcss-normalize-whitespace": "^4.0.2",
-        "postcss-ordered-values": "^4.1.2",
-        "postcss-reduce-initial": "^4.0.3",
-        "postcss-reduce-transforms": "^4.0.2",
-        "postcss-svgo": "^4.0.2",
-        "postcss-unique-selectors": "^4.0.1"
+        "css-declaration-sorter": "^6.0.3",
+        "cssnano-utils": "^2.0.1",
+        "postcss-calc": "^8.0.0",
+        "postcss-colormin": "^5.2.0",
+        "postcss-convert-values": "^5.0.1",
+        "postcss-discard-comments": "^5.0.1",
+        "postcss-discard-duplicates": "^5.0.1",
+        "postcss-discard-empty": "^5.0.1",
+        "postcss-discard-overridden": "^5.0.1",
+        "postcss-merge-longhand": "^5.0.2",
+        "postcss-merge-rules": "^5.0.2",
+        "postcss-minify-font-values": "^5.0.1",
+        "postcss-minify-gradients": "^5.0.1",
+        "postcss-minify-params": "^5.0.1",
+        "postcss-minify-selectors": "^5.1.0",
+        "postcss-normalize-charset": "^5.0.1",
+        "postcss-normalize-display-values": "^5.0.1",
+        "postcss-normalize-positions": "^5.0.1",
+        "postcss-normalize-repeat-style": "^5.0.1",
+        "postcss-normalize-string": "^5.0.1",
+        "postcss-normalize-timing-functions": "^5.0.1",
+        "postcss-normalize-unicode": "^5.0.1",
+        "postcss-normalize-url": "^5.0.2",
+        "postcss-normalize-whitespace": "^5.0.1",
+        "postcss-ordered-values": "^5.0.2",
+        "postcss-reduce-initial": "^5.0.1",
+        "postcss-reduce-transforms": "^5.0.1",
+        "postcss-svgo": "^5.0.2",
+        "postcss-unique-selectors": "^5.0.1"
       },
       "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/cssnano-util-get-arguments": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz",
-      "integrity": "sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8=",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/cssnano-util-get-match": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz",
-      "integrity": "sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0=",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/cssnano-util-raw-cache": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz",
-      "integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.0"
+        "node": "^10 || ^12 || >=14.0"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/cssnano-util-same-parent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz",
-      "integrity": "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==",
+    "node_modules/cssnano-utils": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-2.0.1.tgz",
+      "integrity": "sha512-i8vLRZTnEH9ubIyfdZCAdIdgnHAUeQeByEeQ2I7oTilvP9oHO6RScpeq3GsFUVqeB8uZgOQ9pw8utofNn32hhQ==",
       "dev": true,
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
     "node_modules/csso": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-4.0.3.tgz",
-      "integrity": "sha512-NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
+      "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
       "dev": true,
       "dependencies": {
-        "css-tree": "1.0.0-alpha.39"
+        "css-tree": "^1.1.2"
       },
       "engines": {
         "node": ">=8.0.0"
       }
     },
-    "node_modules/csso/node_modules/css-tree": {
-      "version": "1.0.0-alpha.39",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.39.tgz",
-      "integrity": "sha512-7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA==",
-      "dev": true,
-      "dependencies": {
-        "mdn-data": "2.0.6",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/csso/node_modules/mdn-data": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.6.tgz",
-      "integrity": "sha512-rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA==",
-      "dev": true
-    },
-    "node_modules/csso/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/cssom": {
       "version": "0.4.4",
       "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
@@ -11707,20 +10554,19 @@
       }
     },
     "node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
       "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/debuglog": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz",
-      "integrity": "sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=",
-      "dev": true,
+        "ms": "2.1.2"
+      },
       "engines": {
-        "node": "*"
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
     "node_modules/decamelize": {
@@ -11733,9 +10579,9 @@
       }
     },
     "node_modules/decimal.js": {
-      "version": "10.2.1",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.1.tgz",
-      "integrity": "sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==",
+      "version": "10.3.1",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz",
+      "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==",
       "dev": true
     },
     "node_modules/decode-uri-component": {
@@ -11748,14 +10594,15 @@
       }
     },
     "node_modules/decompress-response": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
-      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
+      "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
+      "optional": true,
       "dependencies": {
-        "mimic-response": "^1.0.0"
+        "mimic-response": "^2.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/dedent": {
@@ -11815,15 +10662,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/default-compare/node_modules/kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/default-gateway": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
@@ -12012,44 +10850,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/define-property/node_modules/is-accessor-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/define-property/node_modules/is-data-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/define-property/node_modules/is-descriptor": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/define-property/node_modules/isobject": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
@@ -12137,6 +10937,15 @@
         "node": ">=6"
       }
     },
+    "node_modules/del/node_modules/pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/del/node_modules/rimraf": {
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -12251,21 +11060,11 @@
       }
     },
     "node_modules/detect-node": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
-      "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
+      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
       "dev": true
     },
-    "node_modules/dezalgo": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz",
-      "integrity": "sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=",
-      "dev": true,
-      "dependencies": {
-        "asap": "^2.0.0",
-        "wrappy": "1"
-      }
-    },
     "node_modules/diff": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
@@ -12276,9 +11075,9 @@
       }
     },
     "node_modules/diff-sequences": {
-      "version": "26.5.0",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.5.0.tgz",
-      "integrity": "sha512-ZXx86srb/iYy6jG71k++wBN9P9J05UNQ5hQHQd9MtMPvcqXPx/vKU69jfHV637D00Q2gSgPk2D+jSx3l1lDW/Q==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz",
+      "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==",
       "dev": true,
       "engines": {
         "node": ">= 10.14.2"
@@ -12296,9 +11095,9 @@
       }
     },
     "node_modules/diffie-hellman/node_modules/bn.js": {
-      "version": "4.11.9",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-      "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
       "dev": true
     },
     "node_modules/dir-glob": {
@@ -12319,9 +11118,9 @@
       "dev": true
     },
     "node_modules/dns-packet": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
-      "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz",
+      "integrity": "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==",
       "dev": true,
       "dependencies": {
         "ip": "^1.1.0",
@@ -12350,27 +11149,15 @@
       }
     },
     "node_modules/dom-serializer": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
-      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
+      "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
       "dev": true,
       "dependencies": {
-        "domelementtype": "^2.0.1",
-        "entities": "^2.0.0"
+        "domelementtype": "^1.3.0",
+        "entities": "^1.1.1"
       }
     },
-    "node_modules/dom-serializer/node_modules/domelementtype": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.2.tgz",
-      "integrity": "sha512-wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ]
-    },
     "node_modules/domain-browser": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
@@ -12418,9 +11205,9 @@
       }
     },
     "node_modules/domutils": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
-      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
+      "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
       "dev": true,
       "dependencies": {
         "dom-serializer": "0",
@@ -12474,6 +11261,27 @@
         "object.defaults": "^1.1.0"
       }
     },
+    "node_modules/each-props/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/each-props/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/ecc-jsbn": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
@@ -12494,9 +11302,9 @@
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.3.577",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.577.tgz",
-      "integrity": "sha512-dSb64JQSFif/pD8mpVAgSFkbVi6YHbK6JeEziwNNmXlr/Ne2rZtseFK5SM7JoWSLf6gP0gVvRGi4/2ZRhSX/rA==",
+      "version": "1.3.793",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.793.tgz",
+      "integrity": "sha512-l9NrGV6Mr4ov5mayYPvIWcwklNw5ROmy6rllzz9dCACw9nKE5y+s5uQk+CBJMetxrWZ6QJFsvEfG6WDcH2IGUg==",
       "dev": true
     },
     "node_modules/elementtree": {
@@ -12511,30 +11319,30 @@
       }
     },
     "node_modules/elliptic": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
-      "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
       "dev": true,
       "dependencies": {
-        "bn.js": "^4.4.0",
-        "brorand": "^1.0.1",
+        "bn.js": "^4.11.9",
+        "brorand": "^1.1.0",
         "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.0"
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1"
       }
     },
     "node_modules/elliptic/node_modules/bn.js": {
-      "version": "4.11.9",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-      "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
       "dev": true
     },
     "node_modules/emittery": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.7.1.tgz",
-      "integrity": "sha512-d34LN4L6h18Bzz9xpoku2nPwKxCPlPMr3EEKTkoEBi+1/+b0lcRkRJ1UVyyZaKNeqGR3swcGl6s390DNO4YVgQ==",
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.7.2.tgz",
+      "integrity": "sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ==",
       "dev": true,
       "engines": {
         "node": ">=10"
@@ -12544,9 +11352,9 @@
       }
     },
     "node_modules/emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
     },
     "node_modules/emojis-list": {
       "version": "3.0.0",
@@ -12569,16 +11377,16 @@
       "version": "0.1.13",
       "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
       "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
-      "devOptional": true,
+      "optional": true,
       "dependencies": {
         "iconv-lite": "^0.6.2"
       }
     },
     "node_modules/encoding/node_modules/iconv-lite": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz",
-      "integrity": "sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==",
-      "devOptional": true,
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "optional": true,
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
       },
@@ -12605,17 +11413,16 @@
       }
     },
     "node_modules/enhanced-resolve": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz",
-      "integrity": "sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==",
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.7.0.tgz",
+      "integrity": "sha512-6njwt/NsZFUKhM6j9U8hzVyD4E4r0x7NQzhTCbcWOJ0IQjNSAoalWmb0AE51Wn+fwan5qVESWi7t2ToBxs9vrw==",
       "dev": true,
       "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "memory-fs": "^0.5.0",
-        "tapable": "^1.0.0"
+        "graceful-fs": "^4.2.4",
+        "tapable": "^2.2.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=10.13.0"
       }
     },
     "node_modules/enquirer": {
@@ -12630,19 +11437,10 @@
         "node": ">=8.6"
       }
     },
-    "node_modules/enquirer/node_modules/ansi-colors": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/entities": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
-      "integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
       "dev": true
     },
     "node_modules/env-paths": {
@@ -12656,13 +11454,12 @@
     "node_modules/err-code": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz",
-      "integrity": "sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA=",
-      "dev": true
+      "integrity": "sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA="
     },
     "node_modules/errno": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
-      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
+      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
       "dev": true,
       "dependencies": {
         "prr": "~1.0.1"
@@ -12681,23 +11478,28 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.18.0-next.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
-      "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
+      "version": "1.18.5",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz",
+      "integrity": "sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==",
       "dev": true,
       "dependencies": {
+        "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.1.1",
         "has": "^1.0.3",
-        "has-symbols": "^1.0.1",
-        "is-callable": "^1.2.2",
-        "is-negative-zero": "^2.0.0",
-        "is-regex": "^1.1.1",
-        "object-inspect": "^1.8.0",
+        "has-symbols": "^1.0.2",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.3",
+        "is-negative-zero": "^2.0.1",
+        "is-regex": "^1.1.3",
+        "is-string": "^1.0.6",
+        "object-inspect": "^1.11.0",
         "object-keys": "^1.1.1",
-        "object.assign": "^4.1.1",
-        "string.prototype.trimend": "^1.0.1",
-        "string.prototype.trimstart": "^1.0.1"
+        "object.assign": "^4.1.2",
+        "string.prototype.trimend": "^1.0.4",
+        "string.prototype.trimstart": "^1.0.4",
+        "unbox-primitive": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -12745,26 +11547,11 @@
         "es6-symbol": "^3.1.1"
       }
     },
-    "node_modules/es6-promise": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
-      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
-      "dev": true
-    },
     "node_modules/es6-promise-plugin": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/es6-promise-plugin/-/es6-promise-plugin-4.2.2.tgz",
       "integrity": "sha512-uoA4aVplXI9oqUYJFBAVRwAqIN9/n9JgrTAUGX3qPbnSZVE5yY1+6/MsoN5f4xsaPO62WjPHOdtts6okMN6tNA=="
     },
-    "node_modules/es6-promisify": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
-      "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
-      "dev": true,
-      "dependencies": {
-        "es6-promise": "^4.0.3"
-      }
-    },
     "node_modules/es6-symbol": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
@@ -12788,9 +11575,9 @@
       }
     },
     "node_modules/escalade": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.0.tgz",
-      "integrity": "sha512-mAk+hPSO8fLDkhV7V0dXazH5pDc6MrjBTPyD3VeKzxnVFjH1MIxbCdqGZB9O8+EwWakZs3ZCbDS4IpRt79V1ig==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
       "dev": true,
       "engines": {
         "node": ">=6"
@@ -12901,28 +11688,31 @@
       }
     },
     "node_modules/eslint": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.25.0.tgz",
-      "integrity": "sha512-TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw==",
+      "version": "7.32.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
+      "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
       "dev": true,
       "dependencies": {
         "@babel/code-frame": "7.12.11",
-        "@eslint/eslintrc": "^0.4.0",
+        "@eslint/eslintrc": "^0.4.3",
+        "@humanwhocodes/config-array": "^0.5.0",
         "ajv": "^6.10.0",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
         "debug": "^4.0.1",
         "doctrine": "^3.0.0",
         "enquirer": "^2.3.5",
+        "escape-string-regexp": "^4.0.0",
         "eslint-scope": "^5.1.1",
         "eslint-utils": "^2.1.0",
         "eslint-visitor-keys": "^2.0.0",
         "espree": "^7.3.1",
         "esquery": "^1.4.0",
         "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
         "file-entry-cache": "^6.0.1",
         "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^5.0.0",
+        "glob-parent": "^5.1.2",
         "globals": "^13.6.0",
         "ignore": "^4.0.6",
         "import-fresh": "^3.0.0",
@@ -12931,7 +11721,7 @@
         "js-yaml": "^3.13.1",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "levn": "^0.4.1",
-        "lodash": "^4.17.21",
+        "lodash.merge": "^4.6.2",
         "minimatch": "^3.0.4",
         "natural-compare": "^1.4.0",
         "optionator": "^0.9.1",
@@ -12940,7 +11730,7 @@
         "semver": "^7.2.1",
         "strip-ansi": "^6.0.0",
         "strip-json-comments": "^3.1.0",
-        "table": "^6.0.4",
+        "table": "^6.0.9",
         "text-table": "^0.2.0",
         "v8-compile-cache": "^2.0.3"
       },
@@ -12976,29 +11766,41 @@
         "resolve": "^1.13.1"
       }
     },
-    "node_modules/eslint-module-utils": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz",
-      "integrity": "sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==",
+    "node_modules/eslint-import-resolver-node/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
       "dependencies": {
-        "debug": "^2.6.9",
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/eslint-import-resolver-node/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "node_modules/eslint-module-utils": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.1.tgz",
+      "integrity": "sha512-ZXI9B8cxAJIH4nfkhTwcRTEAnrVfobYqwjWy/QMCZ8rHkZHFjf9yO4BzpiF9kCSfNlMG54eKigISHpX0+AaT4A==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.7",
         "pkg-dir": "^2.0.0"
       },
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/eslint-module-utils/node_modules/pkg-dir": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
-      "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+    "node_modules/eslint-module-utils/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
       "dependencies": {
-        "find-up": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=4"
+        "ms": "^2.1.1"
       }
     },
     "node_modules/eslint-plugin-ecmascript-compat": {
@@ -13066,23 +11868,25 @@
       }
     },
     "node_modules/eslint-plugin-import": {
-      "version": "2.22.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz",
-      "integrity": "sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==",
+      "version": "2.23.4",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.23.4.tgz",
+      "integrity": "sha512-6/wP8zZRsnQFiR3iaPFgh5ImVRM1WN5NUWfTIRqwOdeiGJlBcSk82o1FEVq8yXmy4lkIzTo7YhHCIxlU/2HyEQ==",
       "dev": true,
       "dependencies": {
-        "array-includes": "^3.1.1",
-        "array.prototype.flat": "^1.2.3",
-        "contains-path": "^0.1.0",
+        "array-includes": "^3.1.3",
+        "array.prototype.flat": "^1.2.4",
         "debug": "^2.6.9",
-        "doctrine": "1.5.0",
+        "doctrine": "^2.1.0",
         "eslint-import-resolver-node": "^0.3.4",
-        "eslint-module-utils": "^2.6.0",
+        "eslint-module-utils": "^2.6.1",
+        "find-up": "^2.0.0",
         "has": "^1.0.3",
+        "is-core-module": "^2.4.0",
         "minimatch": "^3.0.4",
-        "object.values": "^1.1.1",
-        "read-pkg-up": "^2.0.0",
-        "resolve": "^1.17.0",
+        "object.values": "^1.1.3",
+        "pkg-up": "^2.0.0",
+        "read-pkg-up": "^3.0.0",
+        "resolve": "^1.20.0",
         "tsconfig-paths": "^3.9.0"
       },
       "engines": {
@@ -13092,23 +11896,50 @@
         "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/doctrine": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
-      "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
+    "node_modules/eslint-plugin-import/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
       "dependencies": {
-        "esutils": "^2.0.2",
-        "isarray": "^1.0.0"
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
+    "node_modules/eslint-plugin-import/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "node_modules/eslint-plugin-import/node_modules/resolve": {
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
+      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+      "dev": true,
+      "dependencies": {
+        "is-core-module": "^2.2.0",
+        "path-parse": "^1.0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/eslint-plugin-jest": {
-      "version": "24.3.6",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.3.6.tgz",
-      "integrity": "sha512-WOVH4TIaBLIeCX576rLcOgjNXqP+jNlCiEmRgFTfQtJ52DpwnIQKAVGlGPAN7CZ33bW6eNfHD6s8ZbEUTQubJg==",
+      "version": "24.4.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.4.0.tgz",
+      "integrity": "sha512-8qnt/hgtZ94E9dA6viqfViKBfkJwFHXgJmTWlMGDgunw1XJEGqm3eiPjDsTanM3/u/3Az82nyQM9GX7PM/QGmg==",
       "dev": true,
       "dependencies": {
         "@typescript-eslint/experimental-utils": "^4.0.1"
@@ -13127,9 +11958,9 @@
       }
     },
     "node_modules/eslint-plugin-jsdoc": {
-      "version": "32.3.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-32.3.3.tgz",
-      "integrity": "sha512-WxXohbMYlZvCt3r7MepwT++nTLsO4CPegWcm5toM4IGq3MBmYkG+Uf5yDa+n1MwPXLg+KbJqAsI19hmkVD7MPg==",
+      "version": "32.3.4",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-32.3.4.tgz",
+      "integrity": "sha512-xSWfsYvffXnN0OkwLnB7MoDDDDjqcp46W7YlY1j7JyfAQBQ+WnGCfLov3gVNZjUGtK9Otj8mEhTZTqJu4QtIGA==",
       "dev": true,
       "dependencies": {
         "comment-parser": "1.1.5",
@@ -13147,35 +11978,6 @@
         "eslint": "^6.0.0 || ^7.0.0"
       }
     },
-    "node_modules/eslint-plugin-jsdoc/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/eslint-plugin-jsdoc/node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
-    },
-    "node_modules/eslint-plugin-jsdoc/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
     "node_modules/eslint-plugin-jsdoc/node_modules/semver": {
       "version": "7.3.5",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
@@ -13213,16 +12015,16 @@
       }
     },
     "node_modules/eslint-scope": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
-      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
       "dev": true,
       "dependencies": {
-        "esrecurse": "^4.1.0",
+        "esrecurse": "^4.3.0",
         "estraverse": "^4.1.1"
       },
       "engines": {
-        "node": ">=4.0.0"
+        "node": ">=8.0.0"
       }
     },
     "node_modules/eslint-utils": {
@@ -13250,9 +12052,9 @@
       }
     },
     "node_modules/eslint-visitor-keys": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz",
-      "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
       "dev": true,
       "engines": {
         "node": ">=10"
@@ -13267,19 +12069,41 @@
         "@babel/highlight": "^7.10.4"
       }
     },
-    "node_modules/eslint/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+    "node_modules/eslint/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/eslint/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/eslint/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -13292,40 +12116,34 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/eslint/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+    "node_modules/eslint/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
-        "ms": "2.1.2"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/eslint/node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+    "node_modules/eslint/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
       "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
       "engines": {
-        "node": ">=8.0.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/eslint/node_modules/globals": {
-      "version": "13.8.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.8.0.tgz",
-      "integrity": "sha512-rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q==",
+      "version": "13.10.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.10.0.tgz",
+      "integrity": "sha512-piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -13337,6 +12155,15 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/eslint/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/eslint/node_modules/ignore": {
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
@@ -13346,42 +12173,24 @@
         "node": ">= 4"
       }
     },
-    "node_modules/eslint/node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+    "node_modules/eslint/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true
     },
-    "node_modules/eslint/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/eslint/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+    "node_modules/eslint/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
-        "ansi-regex": "^5.0.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/eslint/node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/eslint/node_modules/type-fest": {
       "version": "0.20.2",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
@@ -13408,18 +12217,6 @@
         "node": "^10.12.0 || >=12.0.0"
       }
     },
-    "node_modules/espree/node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/espree/node_modules/eslint-visitor-keys": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
@@ -13517,18 +12314,18 @@
       "dev": true
     },
     "node_modules/events": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.2.0.tgz",
-      "integrity": "sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
       "dev": true,
       "engines": {
         "node": ">=0.8.x"
       }
     },
     "node_modules/eventsource": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz",
-      "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.1.0.tgz",
+      "integrity": "sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg==",
       "dev": true,
       "dependencies": {
         "original": "^1.0.0"
@@ -13548,15 +12345,15 @@
       }
     },
     "node_modules/exec-sh": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz",
-      "integrity": "sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==",
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.6.tgz",
+      "integrity": "sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==",
       "dev": true
     },
     "node_modules/execa": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-4.0.3.tgz",
-      "integrity": "sha512-WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
+      "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
       "dependencies": {
         "cross-spawn": "^7.0.0",
         "get-stream": "^5.0.0",
@@ -13602,6 +12399,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/expand-brackets/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
     "node_modules/expand-brackets/node_modules/define-property": {
       "version": "0.2.5",
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
@@ -13626,6 +12432,83 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/expand-brackets/node_modules/is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/is-accessor-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/is-data-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
     "node_modules/expand-template": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
@@ -13648,22 +12531,49 @@
       }
     },
     "node_modules/expect": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-26.5.2.tgz",
-      "integrity": "sha512-ccTGrXZd8DZCcvCz4htGXTkd/LOoy6OEtiDS38x3/VVf6E4AQL0QoeksBiw7BtGR5xDNiRYPB8GN6pfbuTOi7w==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-26.6.2.tgz",
+      "integrity": "sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^26.5.2",
+        "@jest/types": "^26.6.2",
         "ansi-styles": "^4.0.0",
         "jest-get-type": "^26.3.0",
-        "jest-matcher-utils": "^26.5.2",
-        "jest-message-util": "^26.5.2",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
         "jest-regex-util": "^26.0.0"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
+    "node_modules/expect/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/expect/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
     "node_modules/express": {
       "version": "4.17.1",
       "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
@@ -13704,6 +12614,19 @@
         "node": ">= 0.10.0"
       }
     },
+    "node_modules/express/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/express/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+    },
     "node_modules/ext": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz",
@@ -13714,9 +12637,9 @@
       }
     },
     "node_modules/ext/node_modules/type": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/type/-/type-2.1.0.tgz",
-      "integrity": "sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/type/-/type-2.5.0.tgz",
+      "integrity": "sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==",
       "dev": true
     },
     "node_modules/extend": {
@@ -13725,26 +12648,22 @@
       "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
     },
     "node_modules/extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
+      "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
       "dev": true,
       "dependencies": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
+        "kind-of": "^1.1.0"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/extend-shallow/node_modules/is-extendable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+    "node_modules/extend-shallow/node_modules/kind-of": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
+      "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
       "dev": true,
-      "dependencies": {
-        "is-plain-object": "^2.0.4"
-      },
       "engines": {
         "node": ">=0.10.0"
       }
@@ -13816,40 +12735,11 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/extglob/node_modules/is-accessor-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+    "node_modules/extglob/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
       "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extglob/node_modules/is-data-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extglob/node_modules/is-descriptor": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
-      },
       "engines": {
         "node": ">=0.10.0"
       }
@@ -13863,9 +12753,9 @@
       ]
     },
     "node_modules/faker": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/faker/-/faker-5.1.0.tgz",
-      "integrity": "sha512-RrWKFSSA/aNLP0g3o2WW1Zez7/MnMr7xkiZmoCfAGZmdkDQZ6l2KtuXHN5XjdvpRjDl8+3vf+Rrtl06Z352+Mw==",
+      "version": "5.5.3",
+      "resolved": "https://registry.npmjs.org/faker/-/faker-5.5.3.tgz",
+      "integrity": "sha512-wLTv2a28wjUyWkbnX7u/ABZBkUkIF2fCd73V6P2oFqEGEktDfzWx4UxrSqtPRw0xPRAcjeAOIiJWqZm3pP4u3g==",
       "dev": true
     },
     "node_modules/fancy-log": {
@@ -13889,16 +12779,15 @@
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
     "node_modules/fast-glob": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz",
-      "integrity": "sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==",
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz",
+      "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.0",
+        "glob-parent": "^5.1.2",
         "merge2": "^1.3.0",
-        "micromatch": "^4.0.2",
-        "picomatch": "^2.2.1"
+        "micromatch": "^4.0.4"
       },
       "engines": {
         "node": ">=8"
@@ -13921,29 +12810,29 @@
       "dev": true
     },
     "node_modules/fast-safe-stringify": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz",
-      "integrity": "sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.8.tgz",
+      "integrity": "sha512-lXatBjf3WPjmWD6DpIZxkeSsCOwqI0maYMpgDlx8g4U2qi4lbjA9oH/HD2a87G+KfsUmo5WbJFmqBZlPxtptag==",
       "dev": true
     },
     "node_modules/fastq": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz",
-      "integrity": "sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.1.tgz",
+      "integrity": "sha512-HOnr8Mc60eNYl1gzwp6r5RoUyAn5/glBolUzP/Ez6IFVPMPirxn/9phgL6zhOtaTy7ISwPvQ+wT+hfcRZh/bzw==",
       "dependencies": {
         "reusify": "^1.0.4"
       }
     },
     "node_modules/faye-websocket": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
-      "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
+      "version": "0.11.4",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
+      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
       "dev": true,
       "dependencies": {
         "websocket-driver": ">=0.5.1"
       },
       "engines": {
-        "node": ">=0.4.0"
+        "node": ">=0.8.0"
       }
     },
     "node_modules/fb-watchman": {
@@ -13971,14 +12860,18 @@
       "dev": true
     },
     "node_modules/figures": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+      "dev": true,
       "dependencies": {
         "escape-string-regexp": "^1.0.5"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/file-entry-cache": {
@@ -13994,13 +12887,13 @@
       }
     },
     "node_modules/file-loader": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.0.0.tgz",
-      "integrity": "sha512-/aMOAYEFXDdjG0wytpTL5YQLfZnnTmLNjn+AIrJ/6HVnTfDqLsVKUUwkDf4I4kgex36BvjuXEn/TX9B/1ESyqQ==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
+      "integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==",
       "dev": true,
       "dependencies": {
         "loader-utils": "^2.0.0",
-        "schema-utils": "^2.6.5"
+        "schema-utils": "^3.0.0"
       },
       "engines": {
         "node": ">= 10.13.0"
@@ -14013,12 +12906,63 @@
         "webpack": "^4.0.0 || ^5.0.0"
       }
     },
-    "node_modules/file-uri-to-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+    "node_modules/file-loader/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
-      "optional": true
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/file-loader/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/file-loader/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/file-loader/node_modules/schema-utils": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/file-uri-to-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-2.0.0.tgz",
+      "integrity": "sha512-hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
     },
     "node_modules/fill-range": {
       "version": "7.0.1",
@@ -14048,6 +12992,19 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/finalhandler/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/finalhandler/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+    },
     "node_modules/find-cache-dir": {
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
@@ -14164,6 +13121,15 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/findup-sync/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/findup-sync/node_modules/braces": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
@@ -14197,6 +13163,28 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/findup-sync/node_modules/braces/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/findup-sync/node_modules/fill-range": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -14224,6 +13212,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/findup-sync/node_modules/fill-range/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/findup-sync/node_modules/is-number": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -14257,6 +13254,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/findup-sync/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/findup-sync/node_modules/micromatch": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -14310,6 +13316,27 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/fined/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/fined/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/flagged-respawn": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
@@ -14333,9 +13360,9 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz",
-      "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==",
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz",
+      "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==",
       "dev": true
     },
     "node_modules/flush-write-stream": {
@@ -14349,9 +13376,9 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz",
-      "integrity": "sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz",
+      "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==",
       "dev": true,
       "funding": [
         {
@@ -14361,6 +13388,11 @@
       ],
       "engines": {
         "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
+        }
       }
     },
     "node_modules/for-in": {
@@ -14415,13 +13447,26 @@
       }
     },
     "node_modules/forwarded": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
       "engines": {
         "node": ">= 0.6"
       }
     },
+    "node_modules/fraction.js": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.1.tgz",
+      "integrity": "sha512-MHOhvvxHTfRFpF1geTK9czMIZ6xclsEor2wkIGYYq+PxcQqT7vStJqjhe6S1TenZrMZzo+wlqOufBDVepUEgPg==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "type": "patreon",
+        "url": "https://www.patreon.com/infusion"
+      }
+    },
     "node_modules/fragment-cache": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
@@ -14514,10 +13559,9 @@
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
     "node_modules/fsevents": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
-      "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
-      "deprecated": "\"Please update to latest v2.3 or v2.2\"",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
       "dev": true,
       "hasInstallScript": true,
       "optional": true,
@@ -14568,8 +13612,7 @@
     "node_modules/function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
     "node_modules/functional-red-black-tree": {
       "version": "1.0.1",
@@ -14635,16 +13678,10 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/genfun": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/genfun/-/genfun-5.0.0.tgz",
-      "integrity": "sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==",
-      "dev": true
-    },
     "node_modules/gensync": {
-      "version": "1.0.0-beta.1",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz",
-      "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==",
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
@@ -14713,32 +13750,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/get-uri/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/get-uri/node_modules/file-uri-to-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-2.0.0.tgz",
-      "integrity": "sha512-hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/get-uri/node_modules/fs-extra": {
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
@@ -14762,12 +13773,6 @@
         "graceful-fs": "^4.1.6"
       }
     },
-    "node_modules/get-uri/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
     "node_modules/get-uri/node_modules/universalify": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
@@ -14820,9 +13825,9 @@
       }
     },
     "node_modules/glob-parent": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
-      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dependencies": {
         "is-glob": "^4.0.1"
       },
@@ -14913,6 +13918,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/glob-watcher/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/glob-watcher/node_modules/binary-extensions": {
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
@@ -14943,18 +13957,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/glob-watcher/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/glob-watcher/node_modules/chokidar": {
       "version": "2.1.8",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
@@ -14978,6 +13980,18 @@
         "fsevents": "^1.2.7"
       }
     },
+    "node_modules/glob-watcher/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/glob-watcher/node_modules/fill-range": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -14993,18 +14007,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/glob-watcher/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/glob-watcher/node_modules/fsevents": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
@@ -15058,6 +14060,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/glob-watcher/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/glob-watcher/node_modules/is-number": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -15070,13 +14081,13 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/glob-watcher/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+    "node_modules/glob-watcher/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "dev": true,
       "dependencies": {
-        "is-buffer": "^1.1.5"
+        "isobject": "^3.0.1"
       },
       "engines": {
         "node": ">=0.10.0"
@@ -15091,6 +14102,18 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/glob-watcher/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/glob-watcher/node_modules/micromatch": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -15115,6 +14138,40 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/glob-watcher/node_modules/micromatch/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/micromatch/node_modules/is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/micromatch/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/glob-watcher/node_modules/readdirp": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
@@ -15191,6 +14248,12 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/global-prefix/node_modules/ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "dev": true
+    },
     "node_modules/global-prefix/node_modules/which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -15213,9 +14276,9 @@
       }
     },
     "node_modules/globby": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz",
-      "integrity": "sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==",
+      "version": "11.0.4",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
+      "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
       "dependencies": {
         "array-union": "^2.1.0",
         "dir-glob": "^3.0.1",
@@ -15264,6 +14327,17 @@
         "node": ">=8.6"
       }
     },
+    "node_modules/got/node_modules/decompress-response": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
+      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
+      "dependencies": {
+        "mimic-response": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/got/node_modules/get-stream": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
@@ -15275,10 +14349,18 @@
         "node": ">=6"
       }
     },
+    "node_modules/got/node_modules/mimic-response": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
+      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/graceful-fs": {
-      "version": "4.2.4",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="
+      "version": "4.2.6",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
+      "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ=="
     },
     "node_modules/growly": {
       "version": "1.3.0",
@@ -15305,6 +14387,297 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/gulp-cli": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.3.0.tgz",
+      "integrity": "sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "^1.0.1",
+        "archy": "^1.0.0",
+        "array-sort": "^1.0.0",
+        "color-support": "^1.1.3",
+        "concat-stream": "^1.6.0",
+        "copy-props": "^2.0.1",
+        "fancy-log": "^1.3.2",
+        "gulplog": "^1.0.0",
+        "interpret": "^1.4.0",
+        "isobject": "^3.0.1",
+        "liftoff": "^3.1.0",
+        "matchdep": "^2.0.0",
+        "mute-stdout": "^1.0.0",
+        "pretty-hrtime": "^1.0.0",
+        "replace-homedir": "^1.0.0",
+        "semver-greatest-satisfied-range": "^1.1.0",
+        "v8flags": "^3.2.0",
+        "yargs": "^7.1.0"
+      },
+      "bin": {
+        "gulp": "bin/gulp.js"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/ansi-colors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-wrap": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/camelcase": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/cliui": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wrap-ansi": "^2.0.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/find-up": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+      "dev": true,
+      "dependencies": {
+        "path-exists": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/get-caller-file": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
+      "dev": true
+    },
+    "node_modules/gulp-cli/node_modules/is-fullwidth-code-point": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+      "dev": true,
+      "dependencies": {
+        "number-is-nan": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/load-json-file": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0",
+        "strip-bom": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/parse-json": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+      "dev": true,
+      "dependencies": {
+        "error-ex": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/path-exists": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+      "dev": true,
+      "dependencies": {
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/path-type": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/read-pkg": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+      "dev": true,
+      "dependencies": {
+        "load-json-file": "^1.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/read-pkg-up": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^1.0.0",
+        "read-pkg": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/string-width": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+      "dev": true,
+      "dependencies": {
+        "code-point-at": "^1.0.0",
+        "is-fullwidth-code-point": "^1.0.0",
+        "strip-ansi": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/strip-bom": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+      "dev": true,
+      "dependencies": {
+        "is-utf8": "^0.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/wrap-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/y18n": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
+      "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==",
+      "dev": true
+    },
+    "node_modules/gulp-cli/node_modules/yargs": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.2.tgz",
+      "integrity": "sha512-ZEjj/dQYQy0Zx0lgLMLR8QuaqTihnxirir7EwUHp1Axq4e3+k8jXU5K0VLbNvedv1f4EWtBonDIZm0NUr+jCcA==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^3.0.0",
+        "cliui": "^3.2.0",
+        "decamelize": "^1.1.1",
+        "get-caller-file": "^1.0.1",
+        "os-locale": "^1.4.0",
+        "read-pkg-up": "^1.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^1.0.1",
+        "set-blocking": "^2.0.0",
+        "string-width": "^1.0.2",
+        "which-module": "^1.0.0",
+        "y18n": "^3.2.1",
+        "yargs-parser": "^5.0.1"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/yargs-parser": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.1.tgz",
+      "integrity": "sha512-wpav5XYiddjXxirPoCTUPbqM0PXvJ9hiBMvuJgInvo4/lAOTZzUprArw17q2O1P2+GHhbBr18/iQwjL5Z9BqfA==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^3.0.0",
+        "object.assign": "^4.1.0"
+      }
+    },
     "node_modules/gulp-clip-empty-files": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/gulp-clip-empty-files/-/gulp-clip-empty-files-0.1.2.tgz",
@@ -15370,6 +14743,37 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/gulp-htmlmin/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-htmlmin/node_modules/arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-htmlmin/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/gulp-htmlmin/node_modules/plugin-error": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
@@ -15456,309 +14860,6 @@
         "node": ">=0.4"
       }
     },
-    "node_modules/gulp/node_modules/ansi-colors": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-wrap": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp/node_modules/camelcase": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp/node_modules/cliui": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wrap-ansi": "^2.0.0"
-      }
-    },
-    "node_modules/gulp/node_modules/find-up": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-      "dev": true,
-      "dependencies": {
-        "path-exists": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp/node_modules/get-caller-file": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
-      "dev": true
-    },
-    "node_modules/gulp/node_modules/gulp-cli": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.3.0.tgz",
-      "integrity": "sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-colors": "^1.0.1",
-        "archy": "^1.0.0",
-        "array-sort": "^1.0.0",
-        "color-support": "^1.1.3",
-        "concat-stream": "^1.6.0",
-        "copy-props": "^2.0.1",
-        "fancy-log": "^1.3.2",
-        "gulplog": "^1.0.0",
-        "interpret": "^1.4.0",
-        "isobject": "^3.0.1",
-        "liftoff": "^3.1.0",
-        "matchdep": "^2.0.0",
-        "mute-stdout": "^1.0.0",
-        "pretty-hrtime": "^1.0.0",
-        "replace-homedir": "^1.0.0",
-        "semver-greatest-satisfied-range": "^1.1.0",
-        "v8flags": "^3.2.0",
-        "yargs": "^7.1.0"
-      },
-      "bin": {
-        "gulp": "bin/gulp.js"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/gulp/node_modules/is-fullwidth-code-point": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-      "dev": true,
-      "dependencies": {
-        "number-is-nan": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp/node_modules/load-json-file": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "strip-bom": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp/node_modules/parse-json": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-      "dev": true,
-      "dependencies": {
-        "error-ex": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp/node_modules/path-exists": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-      "dev": true,
-      "dependencies": {
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp/node_modules/path-type": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp/node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp/node_modules/read-pkg": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-      "dev": true,
-      "dependencies": {
-        "load-json-file": "^1.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp/node_modules/read-pkg-up": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^1.0.0",
-        "read-pkg": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp/node_modules/require-main-filename": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
-      "dev": true
-    },
-    "node_modules/gulp/node_modules/string-width": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-      "dev": true,
-      "dependencies": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
-        "strip-ansi": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp/node_modules/strip-bom": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-      "dev": true,
-      "dependencies": {
-        "is-utf8": "^0.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp/node_modules/which-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
-      "dev": true
-    },
-    "node_modules/gulp/node_modules/wrap-ansi": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp/node_modules/y18n": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-      "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
-      "dev": true
-    },
-    "node_modules/gulp/node_modules/yargs": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.1.tgz",
-      "integrity": "sha512-huO4Fr1f9PmiJJdll5kwoS2e4GqzGSsMT3PPMpOwoVkOK8ckqAewMTZyA6LXVQWflleb/Z8oPBEvNsMft0XE+g==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^3.0.0",
-        "cliui": "^3.2.0",
-        "decamelize": "^1.1.1",
-        "get-caller-file": "^1.0.1",
-        "os-locale": "^1.4.0",
-        "read-pkg-up": "^1.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^1.0.1",
-        "set-blocking": "^2.0.0",
-        "string-width": "^1.0.2",
-        "which-module": "^1.0.0",
-        "y18n": "^3.2.1",
-        "yargs-parser": "5.0.0-security.0"
-      }
-    },
-    "node_modules/gulp/node_modules/yargs-parser": {
-      "version": "5.0.0-security.0",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0-security.0.tgz",
-      "integrity": "sha512-T69y4Ps64LNesYxeYGYPvfoMTt/7y1XtfpIslUeK4um+9Hu7hlGoRtaDLvdXb7+/tfq4opVa2HRY5xGip022rQ==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^3.0.0",
-        "object.assign": "^4.1.0"
-      }
-    },
     "node_modules/gulplog": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
@@ -15798,11 +14899,30 @@
         "node": ">=6"
       }
     },
+    "node_modules/har-validator/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/har-validator/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+    },
     "node_modules/has": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
       "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
       "dependencies": {
         "function-bind": "^1.1.1"
       },
@@ -15820,17 +14940,17 @@
       }
     },
     "node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
     "node_modules/has-symbols": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
-      "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
       "dev": true,
       "engines": {
         "node": ">= 0.4"
@@ -16021,9 +15141,9 @@
       }
     },
     "node_modules/hosted-git-info": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.5.tgz",
-      "integrity": "sha512-i4dpK6xj9BIpVOTboXIlKG9+8HMKggcrMX7WA24xZtKwX0TPelq/rbaS5rCKeNX8sJXZJGdSxpnEGtta+wismQ==",
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.8.tgz",
+      "integrity": "sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw==",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -16055,12 +15175,6 @@
       "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg=",
       "dev": true
     },
-    "node_modules/html-comment-regex": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz",
-      "integrity": "sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==",
-      "dev": true
-    },
     "node_modules/html-encoding-sniffer": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
@@ -16074,9 +15188,9 @@
       }
     },
     "node_modules/html-entities": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.3.1.tgz",
-      "integrity": "sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.4.0.tgz",
+      "integrity": "sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==",
       "dev": true
     },
     "node_modules/html-escaper": {
@@ -16106,12 +15220,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/html-minifier/node_modules/commander": {
-      "version": "2.17.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
-      "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
-      "dev": true
-    },
     "node_modules/htmlparser2": {
       "version": "3.10.1",
       "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
@@ -16126,12 +15234,6 @@
         "readable-stream": "^3.1.1"
       }
     },
-    "node_modules/htmlparser2/node_modules/entities": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
-      "dev": true
-    },
     "node_modules/htmlparser2/node_modules/readable-stream": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
@@ -16177,6 +15279,12 @@
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
       "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
+    "node_modules/http-parser-js": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz",
+      "integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==",
+      "dev": true
+    },
     "node_modules/http-proxy": {
       "version": "1.18.1",
       "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
@@ -16192,25 +15300,16 @@
       }
     },
     "node_modules/http-proxy-agent": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz",
-      "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==",
-      "dev": true,
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
       "dependencies": {
-        "agent-base": "4",
-        "debug": "3.1.0"
+        "@tootallnate/once": "1",
+        "agent-base": "6",
+        "debug": "4"
       },
       "engines": {
-        "node": ">= 4.5.0"
-      }
-    },
-    "node_modules/http-proxy-agent/node_modules/debug": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
+        "node": ">= 6"
       }
     },
     "node_modules/http-proxy-middleware": {
@@ -16228,6 +15327,15 @@
         "node": ">=4.0.0"
       }
     },
+    "node_modules/http-proxy-middleware/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/http-proxy-middleware/node_modules/braces": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
@@ -16261,6 +15369,28 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/http-proxy-middleware/node_modules/braces/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/http-proxy-middleware/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/http-proxy-middleware/node_modules/fill-range": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -16288,6 +15418,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/http-proxy-middleware/node_modules/fill-range/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/http-proxy-middleware/node_modules/is-number": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -16321,6 +15460,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/http-proxy-middleware/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/http-proxy-middleware/node_modules/micromatch": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -16379,34 +15527,17 @@
       "dev": true
     },
     "node_modules/https-proxy-agent": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
-      "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
-      "dev": true,
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
       "dependencies": {
-        "agent-base": "^4.3.0",
-        "debug": "^3.1.0"
+        "agent-base": "6",
+        "debug": "4"
       },
       "engines": {
-        "node": ">= 4.5.0"
+        "node": ">= 6"
       }
     },
-    "node_modules/https-proxy-agent/node_modules/debug": {
-      "version": "3.2.6",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/https-proxy-agent/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
     "node_modules/human-signals": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
@@ -16435,22 +15566,36 @@
       }
     },
     "node_modules/icss-utils": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz",
-      "integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
+      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
       "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.14"
-      },
       "engines": {
-        "node": ">= 6"
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
       }
     },
     "node_modules/ieee754": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
-      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
-      "devOptional": true
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "devOptional": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
     },
     "node_modules/iferr": {
       "version": "0.1.5",
@@ -16467,9 +15612,9 @@
       }
     },
     "node_modules/ignore-walk": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz",
-      "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.4.tgz",
+      "integrity": "sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==",
       "dependencies": {
         "minimatch": "^3.0.4"
       }
@@ -16492,49 +15637,19 @@
       "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
       "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps="
     },
-    "node_modules/import-cwd": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
-      "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
-      "dev": true,
-      "dependencies": {
-        "import-from": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/import-fresh": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
-      "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
       "dependencies": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
       },
       "engines": {
         "node": ">=6"
-      }
-    },
-    "node_modules/import-from": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
-      "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
-      "dev": true,
-      "dependencies": {
-        "resolve-from": "^3.0.0"
       },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/import-from/node_modules/resolve-from": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/import-lazy": {
@@ -16546,19 +15661,92 @@
       }
     },
     "node_modules/import-local": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
-      "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
+      "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==",
       "dev": true,
       "dependencies": {
-        "pkg-dir": "^3.0.0",
-        "resolve-cwd": "^2.0.0"
+        "pkg-dir": "^4.2.0",
+        "resolve-cwd": "^3.0.0"
       },
       "bin": {
         "import-local-fixture": "fixtures/cli.js"
       },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/import-local/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/import-local/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/import-local/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
       "engines": {
         "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/import-local/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/import-local/node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/import-local/node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
     "node_modules/imurmurhash": {
@@ -16577,12 +15765,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/indexes-of": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
-      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
-      "dev": true
-    },
     "node_modules/infer-owner": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
@@ -16603,12 +15785,12 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "node_modules/ini": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
-      "deprecated": "Please update to ini >=1.3.6 to avoid a prototype pollution issue",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz",
+      "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==",
+      "dev": true,
       "engines": {
-        "node": "*"
+        "node": ">=10"
       }
     },
     "node_modules/init-package-json": {
@@ -16651,6 +15833,217 @@
       }
     },
     "node_modules/inquirer": {
+      "version": "7.3.3",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz",
+      "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.1.0",
+        "cli-cursor": "^3.1.0",
+        "cli-width": "^3.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^3.0.0",
+        "lodash": "^4.17.19",
+        "mute-stream": "0.0.8",
+        "run-async": "^2.4.0",
+        "rxjs": "^6.6.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "through": "^2.3.6"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/inquirer/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/inquirer/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/inquirer/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/inquirer/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/inquirer/node_modules/rxjs": {
+      "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/inquirer/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/inquirer/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
+    "node_modules/insight": {
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/insight/-/insight-0.10.3.tgz",
+      "integrity": "sha512-YOncxSN6Omh+1Oqxt+OJAvJVMDKw7l6IEG0wT2cTMGxjsTcroOGW4IR926QDzxg/uZHcFZ2cZbckDWdZhc2pZw==",
+      "dependencies": {
+        "async": "^2.6.2",
+        "chalk": "^2.4.2",
+        "conf": "^1.4.0",
+        "inquirer": "^6.3.1",
+        "lodash.debounce": "^4.0.8",
+        "os-name": "^3.1.0",
+        "request": "^2.88.0",
+        "tough-cookie": "^3.0.1",
+        "uuid": "^3.3.2"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/insight/node_modules/ansi-escapes": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/insight/node_modules/ansi-regex": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/insight/node_modules/cli-cursor": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+      "dependencies": {
+        "restore-cursor": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/insight/node_modules/cli-width": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
+      "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw=="
+    },
+    "node_modules/insight/node_modules/cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "dependencies": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      },
+      "engines": {
+        "node": ">=4.8"
+      }
+    },
+    "node_modules/insight/node_modules/execa": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+      "dependencies": {
+        "cross-spawn": "^6.0.0",
+        "get-stream": "^4.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/insight/node_modules/figures": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+      "dependencies": {
+        "escape-string-regexp": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/insight/node_modules/get-stream": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/insight/node_modules/inquirer": {
       "version": "6.5.2",
       "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz",
       "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==",
@@ -16673,142 +16066,192 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/inquirer/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
+    "node_modules/insight/node_modules/is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/inquirer/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
+    "node_modules/insight/node_modules/is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/insight/node_modules/mimic-fn": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/inquirer/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/inquirer/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-    },
-    "node_modules/inquirer/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/inquirer/node_modules/mute-stream": {
+    "node_modules/insight/node_modules/mute-stream": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
       "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
     },
-    "node_modules/inquirer/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+    "node_modules/insight/node_modules/npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "path-key": "^2.0.0"
       },
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/insight": {
-      "version": "0.10.3",
-      "resolved": "https://registry.npmjs.org/insight/-/insight-0.10.3.tgz",
-      "integrity": "sha512-YOncxSN6Omh+1Oqxt+OJAvJVMDKw7l6IEG0wT2cTMGxjsTcroOGW4IR926QDzxg/uZHcFZ2cZbckDWdZhc2pZw==",
+    "node_modules/insight/node_modules/onetime": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
       "dependencies": {
-        "async": "^2.6.2",
-        "chalk": "^2.4.2",
-        "conf": "^1.4.0",
-        "inquirer": "^6.3.1",
-        "lodash.debounce": "^4.0.8",
-        "os-name": "^3.1.0",
-        "request": "^2.88.0",
-        "tough-cookie": "^3.0.1",
-        "uuid": "^3.3.2"
+        "mimic-fn": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/insight/node_modules/os-name": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/os-name/-/os-name-3.1.0.tgz",
+      "integrity": "sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==",
+      "dependencies": {
+        "macos-release": "^2.2.0",
+        "windows-release": "^3.1.0"
       },
       "engines": {
         "node": ">=6"
       }
     },
-    "node_modules/insight/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+    "node_modules/insight/node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/insight/node_modules/restore-cursor": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
       "dependencies": {
-        "color-convert": "^1.9.0"
+        "onetime": "^2.0.0",
+        "signal-exit": "^3.0.2"
       },
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/insight/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+    "node_modules/insight/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/insight/node_modules/shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
       "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "shebang-regex": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/insight/node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/insight/node_modules/string-width": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "dependencies": {
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^4.0.0"
       },
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/insight/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/insight/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-    },
-    "node_modules/insight/node_modules/has-flag": {
+    "node_modules/insight/node_modules/string-width/node_modules/ansi-regex": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/insight/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+    "node_modules/insight/node_modules/string-width/node_modules/strip-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "ansi-regex": "^3.0.0"
       },
       "engines": {
         "node": ">=4"
       }
     },
+    "node_modules/insight/node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "dependencies": {
+        "ansi-regex": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/insight/node_modules/uuid": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "bin": {
+        "uuid": "bin/uuid"
+      }
+    },
+    "node_modules/insight/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/insight/node_modules/windows-release": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-3.3.3.tgz",
+      "integrity": "sha512-OSOGH1QYiW5yVor9TtmXKQvt2vjQqbYS+DqmsZw+r7xDwLXEeT3JGW0ZppFmHx4diyXmxt238KFR3N9jzevBRg==",
+      "dependencies": {
+        "execa": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/install": {
       "version": "0.8.9",
       "resolved": "https://registry.npmjs.org/install/-/install-0.8.9.tgz",
@@ -16830,6 +16273,20 @@
         "node": ">=6"
       }
     },
+    "node_modules/internal-slot": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
+      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.0",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/interpret": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
@@ -16839,15 +16296,6 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/invariant": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
-      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
-      "dev": true,
-      "dependencies": {
-        "loose-envify": "^1.0.0"
-      }
-    },
     "node_modules/invert-kv": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
@@ -16858,9 +16306,9 @@
       }
     },
     "node_modules/ionicons": {
-      "version": "5.5.1",
-      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.1.tgz",
-      "integrity": "sha512-1auVisfaXmkmxINer8Q3kJGHP1vSxk86hf7By95eJ+Av9+oBcNuAEBfSe3jaMaGRVxVw8U/2j23MFq7R3c0HPg==",
+      "version": "5.5.3",
+      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz",
+      "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==",
       "dependencies": {
         "@stencil/core": "^2.5.0"
       }
@@ -16936,45 +16384,48 @@
       }
     },
     "node_modules/is-absolute-url": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
-      "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz",
+      "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==",
       "dev": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
     "node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
       "dev": true,
       "dependencies": {
-        "kind-of": "^3.0.2"
+        "kind-of": "^6.0.0"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
       "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/is-arguments": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
-      "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.0.tgz",
+      "integrity": "sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==",
       "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0"
+      },
       "engines": {
         "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/is-arrayish": {
@@ -16984,9 +16435,9 @@
       "dev": true
     },
     "node_modules/is-bigint": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.1.tgz",
-      "integrity": "sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.2.tgz",
+      "integrity": "sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==",
       "dev": true,
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -17005,12 +16456,12 @@
       }
     },
     "node_modules/is-boolean-object": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.0.tgz",
-      "integrity": "sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.1.tgz",
+      "integrity": "sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.0"
+        "call-bind": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -17026,9 +16477,9 @@
       "dev": true
     },
     "node_modules/is-callable": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz",
-      "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
+      "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
       "dev": true,
       "engines": {
         "node": ">= 0.4"
@@ -17062,34 +16513,51 @@
         "rgba-regex": "^1.0.0"
       }
     },
+    "node_modules/is-color-stop/node_modules/css-color-names": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
+      "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/is-core-module": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.5.0.tgz",
+      "integrity": "sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg==",
+      "dependencies": {
+        "has": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
       "dev": true,
       "dependencies": {
-        "kind-of": "^3.0.2"
+        "kind-of": "^6.0.0"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
       "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/is-date-object": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
-      "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.4.tgz",
+      "integrity": "sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==",
       "dev": true,
       "engines": {
         "node": ">= 0.4"
@@ -17099,41 +16567,32 @@
       }
     },
     "node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
       "dev": true,
       "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
+        "is-accessor-descriptor": "^1.0.0",
+        "is-data-descriptor": "^1.0.0",
+        "kind-of": "^6.0.2"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/is-descriptor/node_modules/kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-directory": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
-      "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/is-docker": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz",
-      "integrity": "sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
       "bin": {
         "is-docker": "cli.js"
       },
@@ -17145,9 +16604,33 @@
       }
     },
     "node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-extendable/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-extendable/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -17162,11 +16645,11 @@
       }
     },
     "node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/is-generator-fn": {
@@ -17228,12 +16711,15 @@
       }
     },
     "node_modules/is-negative-zero": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz",
-      "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
+      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
       "dev": true,
       "engines": {
         "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/is-npm": {
@@ -17253,9 +16739,9 @@
       }
     },
     "node_modules/is-number-object": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.4.tgz",
-      "integrity": "sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.5.tgz",
+      "integrity": "sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==",
       "dev": true,
       "engines": {
         "node": ">= 0.4"
@@ -17306,56 +16792,36 @@
       }
     },
     "node_modules/is-path-inside": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz",
-      "integrity": "sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/is-plain-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-plain-object/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/is-potential-custom-element-name": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz",
-      "integrity": "sha1-DFLlS8yjkbssSUsh6GJtczbG45c=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
       "dev": true
     },
     "node_modules/is-regex": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
-      "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz",
+      "integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==",
       "dev": true,
       "dependencies": {
-        "has-symbols": "^1.0.1"
+        "call-bind": "^1.0.2",
+        "has-symbols": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -17383,17 +16849,20 @@
       "dev": true
     },
     "node_modules/is-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-      "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/is-string": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz",
-      "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.6.tgz",
+      "integrity": "sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==",
       "dev": true,
       "engines": {
         "node": ">= 0.4"
@@ -17402,25 +16871,13 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-svg": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz",
-      "integrity": "sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==",
-      "dev": true,
-      "dependencies": {
-        "html-comment-regex": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/is-symbol": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
-      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
       "dev": true,
       "dependencies": {
-        "has-symbols": "^1.0.1"
+        "has-symbols": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -17446,6 +16903,18 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/is-unicode-supported": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/is-utf8": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
@@ -17461,6 +16930,12 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/is-what": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz",
+      "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==",
+      "dev": true
+    },
     "node_modules/is-windows": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
@@ -17556,6 +17031,27 @@
         "node": ">=8"
       }
     },
+    "node_modules/istanbul-lib-report/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-report/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/istanbul-lib-source-maps": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz",
@@ -17570,30 +17066,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/istanbul-lib-source-maps/node_modules/debug": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
-      "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
-      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/istanbul-lib-source-maps/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
     "node_modules/istanbul-lib-source-maps/node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -17617,14 +17089,14 @@
       }
     },
     "node_modules/jest": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-26.5.2.tgz",
-      "integrity": "sha512-4HFabJVwsgDwul/7rhXJ3yFAF/aUkVIXiJWmgFxb+WMdZG39fVvOwYAs8/3r4AlFPc4m/n5sTMtuMbOL3kNtrQ==",
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-26.6.3.tgz",
+      "integrity": "sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q==",
       "dev": true,
       "dependencies": {
-        "@jest/core": "^26.5.2",
+        "@jest/core": "^26.6.3",
         "import-local": "^3.0.2",
-        "jest-cli": "^26.5.2"
+        "jest-cli": "^26.6.3"
       },
       "bin": {
         "jest": "bin/jest.js"
@@ -17634,12 +17106,12 @@
       }
     },
     "node_modules/jest-changed-files": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.5.2.tgz",
-      "integrity": "sha512-qSmssmiIdvM5BWVtyK/nqVpN3spR5YyvkvPqz1x3BR1bwIxsWmU/MGwLoCrPNLbkG2ASAKfvmJpOduEApBPh2w==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.6.2.tgz",
+      "integrity": "sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^26.5.2",
+        "@jest/types": "^26.6.2",
         "execa": "^4.0.0",
         "throat": "^5.0.0"
       },
@@ -17647,70 +17119,360 @@
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-config": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.5.2.tgz",
-      "integrity": "sha512-dqJOnSegNdE5yDiuGHsjTM5gec7Z4AcAMHiW+YscbOYJAlb3LEtDSobXCq0or9EmGQI5SFmKy4T7P1FxetJOfg==",
+    "node_modules/jest-cli": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.6.3.tgz",
+      "integrity": "sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg==",
+      "dev": true,
+      "dependencies": {
+        "@jest/core": "^26.6.3",
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.4",
+        "import-local": "^3.0.2",
+        "is-ci": "^2.0.0",
+        "jest-config": "^26.6.3",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
+        "prompts": "^2.0.1",
+        "yargs": "^15.4.1"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-cli/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-cli/node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jest-cli/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-cli/node_modules/cliui": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.0"
+      }
+    },
+    "node_modules/jest-cli/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-cli/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-cli/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-cli/node_modules/jest-config": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",
+      "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.1.0",
-        "@jest/test-sequencer": "^26.5.2",
-        "@jest/types": "^26.5.2",
-        "babel-jest": "^26.5.2",
+        "@jest/test-sequencer": "^26.6.3",
+        "@jest/types": "^26.6.2",
+        "babel-jest": "^26.6.3",
         "chalk": "^4.0.0",
         "deepmerge": "^4.2.2",
         "glob": "^7.1.1",
         "graceful-fs": "^4.2.4",
-        "jest-environment-jsdom": "^26.5.2",
-        "jest-environment-node": "^26.5.2",
+        "jest-environment-jsdom": "^26.6.2",
+        "jest-environment-node": "^26.6.2",
         "jest-get-type": "^26.3.0",
-        "jest-jasmine2": "^26.5.2",
+        "jest-jasmine2": "^26.6.3",
         "jest-regex-util": "^26.0.0",
-        "jest-resolve": "^26.5.2",
-        "jest-util": "^26.5.2",
-        "jest-validate": "^26.5.2",
+        "jest-resolve": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
         "micromatch": "^4.0.2",
-        "pretty-format": "^26.5.2"
+        "pretty-format": "^26.6.2"
       },
       "engines": {
         "node": ">= 10.14.2"
+      },
+      "peerDependencies": {
+        "ts-node": ">=9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ts-node": {
+          "optional": true
+        }
       }
     },
-    "node_modules/jest-config/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+    "node_modules/jest-cli/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "p-locate": "^4.1.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-cli/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-cli/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-cli/node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-cli/node_modules/require-main-filename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+      "dev": true
+    },
+    "node_modules/jest-cli/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-cli/node_modules/ts-node": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.1.0.tgz",
+      "integrity": "sha512-6szn3+J9WyG2hE+5W8e0ruZrzyk1uFLYye6IGMBadnOzDh8aP7t8CbFpsfCiEx2+wMixAhjFt7lOZC4+l+WbEA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@tsconfig/node10": "^1.0.7",
+        "@tsconfig/node12": "^1.0.7",
+        "@tsconfig/node14": "^1.0.0",
+        "@tsconfig/node16": "^1.0.1",
+        "arg": "^4.1.0",
+        "create-require": "^1.1.0",
+        "diff": "^4.0.1",
+        "make-error": "^1.1.1",
+        "source-map-support": "^0.5.17",
+        "yn": "3.1.1"
+      },
+      "bin": {
+        "ts-node": "dist/bin.js",
+        "ts-node-cwd": "dist/bin-cwd.js",
+        "ts-node-script": "dist/bin-script.js",
+        "ts-node-transpile-only": "dist/bin-transpile.js",
+        "ts-script": "dist/bin-script-deprecated.js"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "@swc/core": ">=1.2.50",
+        "@swc/wasm": ">=1.2.50",
+        "@types/node": "*",
+        "typescript": ">=2.7"
+      },
+      "peerDependenciesMeta": {
+        "@swc/core": {
+          "optional": true
+        },
+        "@swc/wasm": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-cli/node_modules/which-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+      "dev": true
+    },
+    "node_modules/jest-cli/node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-cli/node_modules/y18n": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+      "dev": true
+    },
+    "node_modules/jest-cli/node_modules/yargs": {
+      "version": "15.4.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^6.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^4.1.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^4.2.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^18.1.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-cli/node_modules/yargs-parser": {
+      "version": "18.1.3",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=6"
       }
     },
     "node_modules/jest-diff": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.5.2.tgz",
-      "integrity": "sha512-HCSWDUGwsov5oTlGzrRM+UPJI/Dpqi9jzeV0fdRNi3Ch5bnoXhnyJMmVg2juv9081zLIy3HGPI5mcuGgXM2xRA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz",
+      "integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==",
       "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
-        "diff-sequences": "^26.5.0",
+        "diff-sequences": "^26.6.2",
         "jest-get-type": "^26.3.0",
-        "pretty-format": "^26.5.2"
+        "pretty-format": "^26.6.2"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
+    "node_modules/jest-diff/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
     "node_modules/jest-diff/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -17723,6 +17485,39 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
+    "node_modules/jest-diff/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-diff/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-diff/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/jest-docblock": {
       "version": "26.0.0",
       "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-26.0.0.tgz",
@@ -17736,25 +17531,40 @@
       }
     },
     "node_modules/jest-each": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.5.2.tgz",
-      "integrity": "sha512-w7D9FNe0m2D3yZ0Drj9CLkyF/mGhmBSULMQTypzAKR746xXnjUrK8GUJdlLTWUF6dd0ks3MtvGP7/xNFr9Aphg==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.6.2.tgz",
+      "integrity": "sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^26.5.2",
+        "@jest/types": "^26.6.2",
         "chalk": "^4.0.0",
         "jest-get-type": "^26.3.0",
-        "jest-util": "^26.5.2",
-        "pretty-format": "^26.5.2"
+        "jest-util": "^26.6.2",
+        "pretty-format": "^26.6.2"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
+    "node_modules/jest-each/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
     "node_modules/jest-each/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -17767,18 +17577,51 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-environment-jsdom": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.5.2.tgz",
-      "integrity": "sha512-fWZPx0bluJaTQ36+PmRpvUtUlUFlGGBNyGX1SN3dLUHHMcQ4WseNEzcGGKOw4U5towXgxI4qDoI3vwR18H0RTw==",
+    "node_modules/jest-each/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^26.5.2",
-        "@jest/fake-timers": "^26.5.2",
-        "@jest/types": "^26.5.2",
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-each/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-each/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-environment-jsdom": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz",
+      "integrity": "sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
-        "jest-mock": "^26.5.2",
-        "jest-util": "^26.5.2",
+        "jest-mock": "^26.6.2",
+        "jest-util": "^26.6.2",
         "jsdom": "^16.4.0"
       },
       "engines": {
@@ -17786,17 +17629,17 @@
       }
     },
     "node_modules/jest-environment-node": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.5.2.tgz",
-      "integrity": "sha512-YHjnDsf/GKFCYMGF1V+6HF7jhY1fcLfLNBDjhAOvFGvt6d8vXvNdJGVM7uTZ2VO/TuIyEFhPGaXMX5j3h7fsrA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.6.2.tgz",
+      "integrity": "sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^26.5.2",
-        "@jest/fake-timers": "^26.5.2",
-        "@jest/types": "^26.5.2",
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
-        "jest-mock": "^26.5.2",
-        "jest-util": "^26.5.2"
+        "jest-mock": "^26.6.2",
+        "jest-util": "^26.6.2"
       },
       "engines": {
         "node": ">= 10.14.2"
@@ -17812,21 +17655,21 @@
       }
     },
     "node_modules/jest-haste-map": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.5.2.tgz",
-      "integrity": "sha512-lJIAVJN3gtO3k4xy+7i2Xjtwh8CfPcH08WYjZpe9xzveDaqGw9fVNCpkYu6M525wKFVkLmyi7ku+DxCAP1lyMA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.6.2.tgz",
+      "integrity": "sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^26.5.2",
+        "@jest/types": "^26.6.2",
         "@types/graceful-fs": "^4.1.2",
         "@types/node": "*",
         "anymatch": "^3.0.3",
         "fb-watchman": "^2.0.0",
         "graceful-fs": "^4.2.4",
         "jest-regex-util": "^26.0.0",
-        "jest-serializer": "^26.5.0",
-        "jest-util": "^26.5.2",
-        "jest-worker": "^26.5.0",
+        "jest-serializer": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-worker": "^26.6.2",
         "micromatch": "^4.0.2",
         "sane": "^4.0.3",
         "walker": "^1.0.7"
@@ -17838,53 +17681,54 @@
         "fsevents": "^2.1.2"
       }
     },
-    "node_modules/jest-haste-map/node_modules/jest-worker": {
-      "version": "26.5.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.5.0.tgz",
-      "integrity": "sha512-kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^7.0.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      }
-    },
     "node_modules/jest-jasmine2": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.5.2.tgz",
-      "integrity": "sha512-2J+GYcgLVPTkpmvHEj0/IDTIAuyblGNGlyGe4fLfDT2aktEPBYvoxUwFiOmDDxxzuuEAD2uxcYXr0+1Yw4tjFA==",
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz",
+      "integrity": "sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg==",
       "dev": true,
       "dependencies": {
         "@babel/traverse": "^7.1.0",
-        "@jest/environment": "^26.5.2",
-        "@jest/source-map": "^26.5.0",
-        "@jest/test-result": "^26.5.2",
-        "@jest/types": "^26.5.2",
+        "@jest/environment": "^26.6.2",
+        "@jest/source-map": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "co": "^4.6.0",
-        "expect": "^26.5.2",
+        "expect": "^26.6.2",
         "is-generator-fn": "^2.0.0",
-        "jest-each": "^26.5.2",
-        "jest-matcher-utils": "^26.5.2",
-        "jest-message-util": "^26.5.2",
-        "jest-runtime": "^26.5.2",
-        "jest-snapshot": "^26.5.2",
-        "jest-util": "^26.5.2",
-        "pretty-format": "^26.5.2",
+        "jest-each": "^26.6.2",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-runtime": "^26.6.3",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "pretty-format": "^26.6.2",
         "throat": "^5.0.0"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
+    "node_modules/jest-jasmine2/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
     "node_modules/jest-jasmine2/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -17897,38 +17741,86 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
+    "node_modules/jest-jasmine2/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-jasmine2/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-jasmine2/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/jest-leak-detector": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.5.2.tgz",
-      "integrity": "sha512-h7ia3dLzBFItmYERaLPEtEKxy3YlcbcRSjj0XRNJgBEyODuu+3DM2o62kvIFvs3PsaYoIIv+e+nLRI61Dj1CNw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz",
+      "integrity": "sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg==",
       "dev": true,
       "dependencies": {
         "jest-get-type": "^26.3.0",
-        "pretty-format": "^26.5.2"
+        "pretty-format": "^26.6.2"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
     "node_modules/jest-matcher-utils": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.5.2.tgz",
-      "integrity": "sha512-W9GO9KBIC4gIArsNqDUKsLnhivaqf8MSs6ujO/JDcPIQrmY+aasewweXVET8KdrJ6ADQaUne5UzysvF/RR7JYA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz",
+      "integrity": "sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==",
       "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
-        "jest-diff": "^26.5.2",
+        "jest-diff": "^26.6.2",
         "jest-get-type": "^26.3.0",
-        "pretty-format": "^26.5.2"
+        "pretty-format": "^26.6.2"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
+    "node_modules/jest-matcher-utils/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
     "node_modules/jest-matcher-utils/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -17941,18 +17833,52 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
+    "node_modules/jest-matcher-utils/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-matcher-utils/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-matcher-utils/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/jest-message-util": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.5.2.tgz",
-      "integrity": "sha512-Ocp9UYZ5Jl15C5PNsoDiGEk14A4NG0zZKknpWdZGoMzJuGAkVt10e97tnEVMYpk7LnQHZOfuK2j/izLBMcuCZw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.6.2.tgz",
+      "integrity": "sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==",
       "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.0.0",
-        "@jest/types": "^26.5.2",
+        "@jest/types": "^26.6.2",
         "@types/stack-utils": "^2.0.0",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.4",
         "micromatch": "^4.0.2",
+        "pretty-format": "^26.6.2",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.2"
       },
@@ -17960,10 +17886,25 @@
         "node": ">= 10.14.2"
       }
     },
+    "node_modules/jest-message-util/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
     "node_modules/jest-message-util/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -17976,13 +17917,46 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-mock": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.5.2.tgz",
-      "integrity": "sha512-9SiU4b5PtO51v0MtJwVRqeGEroH66Bnwtq4ARdNP7jNXbpT7+ByeWNAk4NeT/uHfNSVDXEXgQo1XRuwEqS6Rdw==",
+    "node_modules/jest-message-util/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^26.5.2",
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-message-util/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-message-util/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-mock": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.6.2.tgz",
+      "integrity": "sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.6.2",
         "@types/node": "*"
       },
       "engines": {
@@ -18007,9 +17981,9 @@
       }
     },
     "node_modules/jest-preset-angular": {
-      "version": "8.3.1",
-      "resolved": "https://registry.npmjs.org/jest-preset-angular/-/jest-preset-angular-8.3.1.tgz",
-      "integrity": "sha512-WhQm+0tXzikkvIF35XErV87DqYbieZI0R0MIGgn7VE/DDhdbXFDmYQxFZ7w4qcA0cGLLvSMTBbIsUtHeE/rFxQ==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/jest-preset-angular/-/jest-preset-angular-8.4.0.tgz",
+      "integrity": "sha512-lngQRVVMy2qdzhSzUVTkKFsWC+Z2uMFlJf8J5ZeapNZFsRYW2tjlVqdm+sJOTnVmMVnN7CtDqvRDwlyFTIYD+A==",
       "dev": true,
       "dependencies": {
         "pretty-format": "26.x",
@@ -18034,18 +18008,18 @@
       }
     },
     "node_modules/jest-resolve": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.5.2.tgz",
-      "integrity": "sha512-XsPxojXGRA0CoDD7Vis59ucz2p3cQFU5C+19tz3tLEAlhYKkK77IL0cjYjikY9wXnOaBeEdm1rOgSJjbZWpcZg==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz",
+      "integrity": "sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^26.5.2",
+        "@jest/types": "^26.6.2",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.4",
         "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^26.5.2",
+        "jest-util": "^26.6.2",
         "read-pkg-up": "^7.0.1",
-        "resolve": "^1.17.0",
+        "resolve": "^1.18.1",
         "slash": "^3.0.0"
       },
       "engines": {
@@ -18053,23 +18027,38 @@
       }
     },
     "node_modules/jest-resolve-dependencies": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.5.2.tgz",
-      "integrity": "sha512-LLkc8LuRtxqOx0AtX/Npa2C4I23WcIrwUgNtHYXg4owYF/ZDQShcwBAHjYZIFR06+HpQcZ43+kCTMlQ3aDCYTg==",
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz",
+      "integrity": "sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^26.5.2",
+        "@jest/types": "^26.6.2",
         "jest-regex-util": "^26.0.0",
-        "jest-snapshot": "^26.5.2"
+        "jest-snapshot": "^26.6.2"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
+    "node_modules/jest-resolve/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
     "node_modules/jest-resolve/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -18082,6 +18071,18 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
+    "node_modules/jest-resolve/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
     "node_modules/jest-resolve/node_modules/find-up": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
@@ -18095,6 +18096,15 @@
         "node": ">=8"
       }
     },
+    "node_modules/jest-resolve/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/jest-resolve/node_modules/locate-path": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
@@ -18134,24 +18144,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-resolve/node_modules/parse-json": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.1.0.tgz",
-      "integrity": "sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "lines-and-columns": "^1.1.6"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/jest-resolve/node_modules/path-exists": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -18202,30 +18194,51 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-runner": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.5.2.tgz",
-      "integrity": "sha512-GKhYxtSX5+tXZsd2QwfkDqPIj5C2HqOdXLRc2x2qYqWE26OJh17xo58/fN/mLhRkO4y6o60ZVloan7Kk5YA6hg==",
+    "node_modules/jest-resolve/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
-        "@jest/console": "^26.5.2",
-        "@jest/environment": "^26.5.2",
-        "@jest/test-result": "^26.5.2",
-        "@jest/types": "^26.5.2",
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-resolve/node_modules/type-fest": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-runner": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.6.3.tgz",
+      "integrity": "sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/console": "^26.6.2",
+        "@jest/environment": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "emittery": "^0.7.1",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.4",
-        "jest-config": "^26.5.2",
+        "jest-config": "^26.6.3",
         "jest-docblock": "^26.0.0",
-        "jest-haste-map": "^26.5.2",
-        "jest-leak-detector": "^26.5.2",
-        "jest-message-util": "^26.5.2",
-        "jest-resolve": "^26.5.2",
-        "jest-runtime": "^26.5.2",
-        "jest-util": "^26.5.2",
-        "jest-worker": "^26.5.0",
+        "jest-haste-map": "^26.6.2",
+        "jest-leak-detector": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-resolve": "^26.6.2",
+        "jest-runtime": "^26.6.3",
+        "jest-util": "^26.6.2",
+        "jest-worker": "^26.6.2",
         "source-map-support": "^0.5.6",
         "throat": "^5.0.0"
       },
@@ -18233,10 +18246,25 @@
         "node": ">= 10.14.2"
       }
     },
+    "node_modules/jest-runner/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
     "node_modules/jest-runner/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -18249,49 +18277,150 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-runner/node_modules/jest-worker": {
-      "version": "26.5.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.5.0.tgz",
-      "integrity": "sha512-kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug==",
+    "node_modules/jest-runner/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^7.0.0"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">= 10.13.0"
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-runner/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-runner/node_modules/jest-config": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",
+      "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.1.0",
+        "@jest/test-sequencer": "^26.6.3",
+        "@jest/types": "^26.6.2",
+        "babel-jest": "^26.6.3",
+        "chalk": "^4.0.0",
+        "deepmerge": "^4.2.2",
+        "glob": "^7.1.1",
+        "graceful-fs": "^4.2.4",
+        "jest-environment-jsdom": "^26.6.2",
+        "jest-environment-node": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "jest-jasmine2": "^26.6.3",
+        "jest-regex-util": "^26.0.0",
+        "jest-resolve": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
+        "micromatch": "^4.0.2",
+        "pretty-format": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      },
+      "peerDependencies": {
+        "ts-node": ">=9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ts-node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-runner/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-runner/node_modules/ts-node": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.1.0.tgz",
+      "integrity": "sha512-6szn3+J9WyG2hE+5W8e0ruZrzyk1uFLYye6IGMBadnOzDh8aP7t8CbFpsfCiEx2+wMixAhjFt7lOZC4+l+WbEA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@tsconfig/node10": "^1.0.7",
+        "@tsconfig/node12": "^1.0.7",
+        "@tsconfig/node14": "^1.0.0",
+        "@tsconfig/node16": "^1.0.1",
+        "arg": "^4.1.0",
+        "create-require": "^1.1.0",
+        "diff": "^4.0.1",
+        "make-error": "^1.1.1",
+        "source-map-support": "^0.5.17",
+        "yn": "3.1.1"
+      },
+      "bin": {
+        "ts-node": "dist/bin.js",
+        "ts-node-cwd": "dist/bin-cwd.js",
+        "ts-node-script": "dist/bin-script.js",
+        "ts-node-transpile-only": "dist/bin-transpile.js",
+        "ts-script": "dist/bin-script-deprecated.js"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "@swc/core": ">=1.2.50",
+        "@swc/wasm": ">=1.2.50",
+        "@types/node": "*",
+        "typescript": ">=2.7"
+      },
+      "peerDependenciesMeta": {
+        "@swc/core": {
+          "optional": true
+        },
+        "@swc/wasm": {
+          "optional": true
+        }
       }
     },
     "node_modules/jest-runtime": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.5.2.tgz",
-      "integrity": "sha512-zArr4DatX/Sn0wswX/AnAuJgmwgAR5rNtrUz36HR8BfMuysHYNq5sDbYHuLC4ICyRdy5ae/KQ+sczxyS9G6Qvw==",
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.6.3.tgz",
+      "integrity": "sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw==",
       "dev": true,
       "dependencies": {
-        "@jest/console": "^26.5.2",
-        "@jest/environment": "^26.5.2",
-        "@jest/fake-timers": "^26.5.2",
-        "@jest/globals": "^26.5.2",
-        "@jest/source-map": "^26.5.0",
-        "@jest/test-result": "^26.5.2",
-        "@jest/transform": "^26.5.2",
-        "@jest/types": "^26.5.2",
+        "@jest/console": "^26.6.2",
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/globals": "^26.6.2",
+        "@jest/source-map": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/yargs": "^15.0.0",
         "chalk": "^4.0.0",
+        "cjs-module-lexer": "^0.6.0",
         "collect-v8-coverage": "^1.0.0",
         "exit": "^0.1.2",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.4",
-        "jest-config": "^26.5.2",
-        "jest-haste-map": "^26.5.2",
-        "jest-message-util": "^26.5.2",
-        "jest-mock": "^26.5.2",
+        "jest-config": "^26.6.3",
+        "jest-haste-map": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-mock": "^26.6.2",
         "jest-regex-util": "^26.0.0",
-        "jest-resolve": "^26.5.2",
-        "jest-snapshot": "^26.5.2",
-        "jest-util": "^26.5.2",
-        "jest-validate": "^26.5.2",
+        "jest-resolve": "^26.6.2",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
         "slash": "^3.0.0",
         "strip-bom": "^4.0.0",
         "yargs": "^15.4.1"
@@ -18303,19 +18432,34 @@
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-runtime/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+    "node_modules/jest-runtime/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
       }
     },
     "node_modules/jest-runtime/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -18339,11 +18483,17 @@
         "wrap-ansi": "^6.2.0"
       }
     },
-    "node_modules/jest-runtime/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
+    "node_modules/jest-runtime/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
     },
     "node_modules/jest-runtime/node_modules/find-up": {
       "version": "4.1.0",
@@ -18358,15 +18508,52 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-runtime/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+    "node_modules/jest-runtime/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
+    "node_modules/jest-runtime/node_modules/jest-config": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",
+      "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.1.0",
+        "@jest/test-sequencer": "^26.6.3",
+        "@jest/types": "^26.6.2",
+        "babel-jest": "^26.6.3",
+        "chalk": "^4.0.0",
+        "deepmerge": "^4.2.2",
+        "glob": "^7.1.1",
+        "graceful-fs": "^4.2.4",
+        "jest-environment-jsdom": "^26.6.2",
+        "jest-environment-node": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "jest-jasmine2": "^26.6.3",
+        "jest-regex-util": "^26.0.0",
+        "jest-resolve": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
+        "micromatch": "^4.0.2",
+        "pretty-format": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      },
+      "peerDependencies": {
+        "ts-node": ">=9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ts-node": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/jest-runtime/node_modules/locate-path": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
@@ -18415,32 +18602,74 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-runtime/node_modules/string-width": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+    "node_modules/jest-runtime/node_modules/require-main-filename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+      "dev": true
+    },
+    "node_modules/jest-runtime/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/jest-runtime/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+    "node_modules/jest-runtime/node_modules/ts-node": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.1.0.tgz",
+      "integrity": "sha512-6szn3+J9WyG2hE+5W8e0ruZrzyk1uFLYye6IGMBadnOzDh8aP7t8CbFpsfCiEx2+wMixAhjFt7lOZC4+l+WbEA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "ansi-regex": "^5.0.0"
+        "@tsconfig/node10": "^1.0.7",
+        "@tsconfig/node12": "^1.0.7",
+        "@tsconfig/node14": "^1.0.0",
+        "@tsconfig/node16": "^1.0.1",
+        "arg": "^4.1.0",
+        "create-require": "^1.1.0",
+        "diff": "^4.0.1",
+        "make-error": "^1.1.1",
+        "source-map-support": "^0.5.17",
+        "yn": "3.1.1"
+      },
+      "bin": {
+        "ts-node": "dist/bin.js",
+        "ts-node-cwd": "dist/bin-cwd.js",
+        "ts-node-script": "dist/bin-script.js",
+        "ts-node-transpile-only": "dist/bin-transpile.js",
+        "ts-script": "dist/bin-script-deprecated.js"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "@swc/core": ">=1.2.50",
+        "@swc/wasm": ">=1.2.50",
+        "@types/node": "*",
+        "typescript": ">=2.7"
+      },
+      "peerDependenciesMeta": {
+        "@swc/core": {
+          "optional": true
+        },
+        "@swc/wasm": {
+          "optional": true
+        }
       }
     },
+    "node_modules/jest-runtime/node_modules/which-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+      "dev": true
+    },
     "node_modules/jest-runtime/node_modules/wrap-ansi": {
       "version": "6.2.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
@@ -18455,6 +18684,12 @@
         "node": ">=8"
       }
     },
+    "node_modules/jest-runtime/node_modules/y18n": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+      "dev": true
+    },
     "node_modules/jest-runtime/node_modules/yargs": {
       "version": "15.4.1",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
@@ -18491,9 +18726,9 @@
       }
     },
     "node_modules/jest-serializer": {
-      "version": "26.5.0",
-      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.5.0.tgz",
-      "integrity": "sha512-+h3Gf5CDRlSLdgTv7y0vPIAoLgX/SI7T4v6hy+TEXMgYbv+ztzbg5PSN6mUXAT/hXYHvZRWm+MaObVfqkhCGxA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.6.2.tgz",
+      "integrity": "sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==",
       "dev": true,
       "dependencies": {
         "@types/node": "*",
@@ -18504,36 +18739,51 @@
       }
     },
     "node_modules/jest-snapshot": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.5.2.tgz",
-      "integrity": "sha512-MkXIDvEefzDubI/WaDVSRH4xnkuirP/Pz8LhAIDXcVQTmcEfwxywj5LGwBmhz+kAAIldA7XM4l96vbpzltSjqg==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.6.2.tgz",
+      "integrity": "sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og==",
       "dev": true,
       "dependencies": {
         "@babel/types": "^7.0.0",
-        "@jest/types": "^26.5.2",
+        "@jest/types": "^26.6.2",
         "@types/babel__traverse": "^7.0.4",
         "@types/prettier": "^2.0.0",
         "chalk": "^4.0.0",
-        "expect": "^26.5.2",
+        "expect": "^26.6.2",
         "graceful-fs": "^4.2.4",
-        "jest-diff": "^26.5.2",
+        "jest-diff": "^26.6.2",
         "jest-get-type": "^26.3.0",
-        "jest-haste-map": "^26.5.2",
-        "jest-matcher-utils": "^26.5.2",
-        "jest-message-util": "^26.5.2",
-        "jest-resolve": "^26.5.2",
+        "jest-haste-map": "^26.6.2",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-resolve": "^26.6.2",
         "natural-compare": "^1.4.0",
-        "pretty-format": "^26.5.2",
+        "pretty-format": "^26.6.2",
         "semver": "^7.3.2"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
+    "node_modules/jest-snapshot/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
     "node_modules/jest-snapshot/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -18546,13 +18796,46 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-util": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.5.2.tgz",
-      "integrity": "sha512-WTL675bK+GSSAYgS8z9FWdCT2nccO1yTIplNLPlP0OD8tUk/H5IrWKMMRudIQQ0qp8bb4k+1Qa8CxGKq9qnYdg==",
+    "node_modules/jest-snapshot/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^26.5.2",
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-util": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+      "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.4",
@@ -18563,10 +18846,25 @@
         "node": ">= 10.14.2"
       }
     },
+    "node_modules/jest-util/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
     "node_modules/jest-util/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -18579,39 +18877,75 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-validate": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.5.2.tgz",
-      "integrity": "sha512-FmJks0zY36mp6Af/5sqO6CTL9bNMU45yKCJk3hrz8d2aIqQIlN1pr9HPIwZE8blLaewOla134nt5+xAmWsx3SQ==",
+    "node_modules/jest-util/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^26.5.2",
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-util/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-util/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-validate": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.6.2.tgz",
+      "integrity": "sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.6.2",
         "camelcase": "^6.0.0",
         "chalk": "^4.0.0",
         "jest-get-type": "^26.3.0",
         "leven": "^3.1.0",
-        "pretty-format": "^26.5.2"
+        "pretty-format": "^26.6.2"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-validate/node_modules/camelcase": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.0.0.tgz",
-      "integrity": "sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==",
+    "node_modules/jest-validate/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
       "engines": {
-        "node": ">=10"
+        "node": ">=8"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/jest-validate/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -18624,43 +18958,76 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-watcher": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.5.2.tgz",
-      "integrity": "sha512-i3m1NtWzF+FXfJ3ljLBB/WQEp4uaNhX7QcQUWMokcifFTUQBDFyUMEwk0JkJ1kopHbx7Een3KX0Q7+9koGM/Pw==",
+    "node_modules/jest-validate/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
-        "@jest/test-result": "^26.5.2",
-        "@jest/types": "^26.5.2",
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-validate/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-validate/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-watcher": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.6.2.tgz",
+      "integrity": "sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
-        "jest-util": "^26.5.2",
+        "jest-util": "^26.6.2",
         "string-length": "^4.0.1"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-watcher/node_modules/ansi-escapes": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+    "node_modules/jest-watcher/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
-        "type-fest": "^0.11.0"
+        "color-convert": "^2.0.1"
       },
       "engines": {
         "node": ">=8"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/jest-watcher/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -18673,294 +19040,74 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-watcher/node_modules/type-fest": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-      "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
+    "node_modules/jest-watcher/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-watcher/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
+      }
+    },
+    "node_modules/jest-watcher/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "engines": {
+        "node": ">=8"
       }
     },
     "node_modules/jest-worker": {
-      "version": "26.0.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.0.0.tgz",
-      "integrity": "sha512-pPaYa2+JnwmiZjK9x7p9BoZht+47ecFCDFA/CJxspHzeDvQcfVBLWzCiWyo+EGrSiQMWZtCFo9iSvMZnAAo8vw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
+      "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
       "dev": true,
       "dependencies": {
+        "@types/node": "*",
         "merge-stream": "^2.0.0",
         "supports-color": "^7.0.0"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": ">= 10.13.0"
       }
     },
-    "node_modules/jest/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest/node_modules/cliui": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^6.2.0"
-      }
-    },
-    "node_modules/jest/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/jest/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest/node_modules/import-local": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
-      "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==",
-      "dev": true,
-      "dependencies": {
-        "pkg-dir": "^4.2.0",
-        "resolve-cwd": "^3.0.0"
-      },
-      "bin": {
-        "import-local-fixture": "fixtures/cli.js"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest/node_modules/jest-cli": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.5.2.tgz",
-      "integrity": "sha512-usm48COuUvRp8YEG5OWOaxbSM0my7eHn3QeBWxiGUuFhvkGVBvl1fic4UjC02EAEQtDv8KrNQUXdQTV6ZZBsoA==",
-      "dev": true,
-      "dependencies": {
-        "@jest/core": "^26.5.2",
-        "@jest/test-result": "^26.5.2",
-        "@jest/types": "^26.5.2",
-        "chalk": "^4.0.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.4",
-        "import-local": "^3.0.2",
-        "is-ci": "^2.0.0",
-        "jest-config": "^26.5.2",
-        "jest-util": "^26.5.2",
-        "jest-validate": "^26.5.2",
-        "prompts": "^2.0.1",
-        "yargs": "^15.4.1"
-      },
-      "bin": {
-        "jest": "bin/jest.js"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/jest/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest/node_modules/path-exists": {
+    "node_modules/jest-worker/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/jest/node_modules/pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+    "node_modules/jest-worker/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
-        "find-up": "^4.0.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/jest/node_modules/resolve-cwd": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
-      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
-      "dev": true,
-      "dependencies": {
-        "resolve-from": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest/node_modules/resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest/node_modules/string-width": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest/node_modules/wrap-ansi": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest/node_modules/yargs": {
-      "version": "15.4.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
-      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
-      "dev": true,
-      "dependencies": {
-        "cliui": "^6.0.0",
-        "decamelize": "^1.2.0",
-        "find-up": "^4.1.0",
-        "get-caller-file": "^2.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^4.2.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^18.1.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest/node_modules/yargs-parser": {
-      "version": "18.1.3",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -18968,9 +19115,9 @@
       "dev": true
     },
     "node_modules/js-yaml": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
-      "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "dev": true,
       "dependencies": {
         "argparse": "^1.0.7",
@@ -18998,36 +19145,37 @@
       }
     },
     "node_modules/jsdom": {
-      "version": "16.4.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.4.0.tgz",
-      "integrity": "sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w==",
+      "version": "16.7.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
+      "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
       "dev": true,
       "dependencies": {
-        "abab": "^2.0.3",
-        "acorn": "^7.1.1",
+        "abab": "^2.0.5",
+        "acorn": "^8.2.4",
         "acorn-globals": "^6.0.0",
         "cssom": "^0.4.4",
-        "cssstyle": "^2.2.0",
+        "cssstyle": "^2.3.0",
         "data-urls": "^2.0.0",
-        "decimal.js": "^10.2.0",
+        "decimal.js": "^10.2.1",
         "domexception": "^2.0.1",
-        "escodegen": "^1.14.1",
+        "escodegen": "^2.0.0",
+        "form-data": "^3.0.0",
         "html-encoding-sniffer": "^2.0.1",
-        "is-potential-custom-element-name": "^1.0.0",
+        "http-proxy-agent": "^4.0.1",
+        "https-proxy-agent": "^5.0.0",
+        "is-potential-custom-element-name": "^1.0.1",
         "nwsapi": "^2.2.0",
-        "parse5": "5.1.1",
-        "request": "^2.88.2",
-        "request-promise-native": "^1.0.8",
-        "saxes": "^5.0.0",
+        "parse5": "6.0.1",
+        "saxes": "^5.0.1",
         "symbol-tree": "^3.2.4",
-        "tough-cookie": "^3.0.1",
+        "tough-cookie": "^4.0.0",
         "w3c-hr-time": "^1.0.2",
         "w3c-xmlserializer": "^2.0.0",
         "webidl-conversions": "^6.1.0",
         "whatwg-encoding": "^1.0.5",
         "whatwg-mimetype": "^2.3.0",
-        "whatwg-url": "^8.0.0",
-        "ws": "^7.2.3",
+        "whatwg-url": "^8.5.0",
+        "ws": "^7.4.6",
         "xml-name-validator": "^3.0.0"
       },
       "engines": {
@@ -19043,9 +19191,9 @@
       }
     },
     "node_modules/jsdom/node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "version": "8.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz",
+      "integrity": "sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -19054,31 +19202,139 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/jsdom/node_modules/parse5": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
-      "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
-      "dev": true
+    "node_modules/jsdom/node_modules/escodegen": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
+      "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
+      "dev": true,
+      "dependencies": {
+        "esprima": "^4.0.1",
+        "estraverse": "^5.2.0",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.6.1"
+      }
     },
-    "node_modules/jsdom/node_modules/ws": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz",
-      "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==",
+    "node_modules/jsdom/node_modules/estraverse": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
       "dev": true,
       "engines": {
-        "node": ">=8.3.0"
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/jsdom/node_modules/form-data": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
+      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+      "dev": true,
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
       },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/jsdom/node_modules/levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
       },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/jsdom/node_modules/optionator": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+      "dev": true,
+      "dependencies": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.6",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "word-wrap": "~1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/jsdom/node_modules/parse5": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+      "dev": true
+    },
+    "node_modules/jsdom/node_modules/prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/jsdom/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/jsdom/node_modules/tough-cookie": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
+      "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
+      "dev": true,
+      "dependencies": {
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.1.2"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jsdom/node_modules/type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/jsdom/node_modules/universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0"
       }
     },
     "node_modules/jsesc": {
@@ -19115,9 +19371,10 @@
       "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
     },
     "node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
     },
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
@@ -19137,9 +19394,9 @@
       "dev": true
     },
     "node_modules/json5": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
-      "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+      "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
       "dev": true,
       "dependencies": {
         "minimist": "^1.2.5"
@@ -19176,22 +19433,6 @@
         "node >= 0.2.0"
       ]
     },
-    "node_modules/JSONStream": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
-      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
-      "dev": true,
-      "dependencies": {
-        "jsonparse": "^1.2.0",
-        "through": ">=2.2.7 <3"
-      },
-      "bin": {
-        "JSONStream": "bin.js"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/jsprim": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
@@ -19215,9 +19456,9 @@
       ]
     },
     "node_modules/jszip": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.5.0.tgz",
-      "integrity": "sha512-WRtu7TPCmYePR1nazfrtuF216cIVon/3GWOvHS9QR5bIwSbnxtdpma6un3jyGGNhHsKCSzn5Ypk+EkDRvTGiFA==",
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.7.0.tgz",
+      "integrity": "sha512-Y2OlFIzrDOPWUnpU0LORIcDn2xN7rC9yKffFM/7pGhQuhO+SUhfm2trkJ/S5amjFvem0Y+1EALz/MEPkvHXVNw==",
       "dependencies": {
         "lie": "~3.3.0",
         "pako": "~1.0.2",
@@ -19226,9 +19467,9 @@
       }
     },
     "node_modules/just-debounce": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.0.0.tgz",
-      "integrity": "sha1-h/zPrv/AtozRnVX2cilD+SnqNeo=",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.1.0.tgz",
+      "integrity": "sha512-qpcRocdkUmf+UTNBYx5w6dexX5J31AKK1OmPwH630a83DdVVUIngk55RSAiIGpQyoH0dlr872VHfPjnQnK1qDQ==",
       "dev": true
     },
     "node_modules/karma-source-map-support": {
@@ -19241,9 +19482,9 @@
       }
     },
     "node_modules/keytar": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/keytar/-/keytar-7.2.0.tgz",
-      "integrity": "sha512-ECSaWvoLKI5SI0pGpZQeUV1/lpBYfkaxvoSp3zkiPOz05VavwSfLi8DdEaa9N2ekQZv3Chy+o7aP6n9mairBgw==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/keytar/-/keytar-7.7.0.tgz",
+      "integrity": "sha512-YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A==",
       "hasInstallScript": true,
       "optional": true,
       "dependencies": {
@@ -19266,9 +19507,9 @@
       "dev": true
     },
     "node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -19283,6 +19524,15 @@
         "node": ">=6"
       }
     },
+    "node_modules/klona": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz",
+      "integrity": "sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/last-run": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
@@ -19354,21 +19604,29 @@
         "rsvp": "^3.0.21"
       }
     },
-    "node_modules/leek/node_modules/rsvp": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz",
-      "integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==",
-      "dev": true,
-      "engines": {
-        "node": "0.12.* || 4.* || 6.* || >= 7.*"
-      }
-    },
-    "node_modules/less": {
-      "version": "3.12.2",
-      "resolved": "https://registry.npmjs.org/less/-/less-3.12.2.tgz",
-      "integrity": "sha512-+1V2PCMFkL+OIj2/HrtrvZw0BC0sYLMICJfbQjuj/K8CEnlrFX6R5cKKgzzttsZDHyxQNL1jqMREjKN3ja/E3Q==",
+    "node_modules/leek/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
       "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/leek/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "node_modules/less": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/less/-/less-4.1.1.tgz",
+      "integrity": "sha512-w09o8tZFPThBscl5d0Ggp3RcrKIouBoQscnOMgFH3n5V3kN/CXGHNfCkRPtxJk6nKryDXaV9aHLK55RXuH4sAw==",
+      "dev": true,
+      "dependencies": {
+        "copy-anything": "^2.0.1",
+        "parse-node-version": "^1.0.1",
         "tslib": "^1.10.0"
       },
       "bin": {
@@ -19383,20 +19641,19 @@
         "image-size": "~0.5.0",
         "make-dir": "^2.1.0",
         "mime": "^1.4.1",
-        "native-request": "^1.0.5",
+        "needle": "^2.5.2",
         "source-map": "~0.6.0"
       }
     },
     "node_modules/less-loader": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-6.1.0.tgz",
-      "integrity": "sha512-/jLzOwLyqJ7Kt3xg5sHHkXtOyShWwFj410K9Si9WO+/h8rmYxxkSR0A3/hFEntWudE20zZnWMtpMYnLzqTVdUA==",
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-7.3.0.tgz",
+      "integrity": "sha512-Mi8915g7NMaLlgi77mgTTQvK022xKRQBIVDSyfl3ErTuBhmZBQab0mjeJjNNqGbdR+qrfTleKXqbGI4uEFavxg==",
       "dev": true,
       "dependencies": {
-        "clone": "^2.1.2",
-        "less": "^3.11.1",
+        "klona": "^2.0.4",
         "loader-utils": "^2.0.0",
-        "schema-utils": "^2.6.6"
+        "schema-utils": "^3.0.0"
       },
       "engines": {
         "node": ">= 10.13.0"
@@ -19406,9 +19663,59 @@
         "url": "https://opencollective.com/webpack"
       },
       "peerDependencies": {
+        "less": "^3.5.0 || ^4.0.0",
         "webpack": "^4.0.0 || ^5.0.0"
       }
     },
+    "node_modules/less-loader/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/less-loader/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/less-loader/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/less-loader/node_modules/schema-utils": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
     "node_modules/less/node_modules/make-dir": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
@@ -19423,6 +19730,16 @@
         "node": ">=6"
       }
     },
+    "node_modules/less/node_modules/pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/less/node_modules/semver": {
       "version": "5.7.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
@@ -19444,9 +19761,9 @@
       }
     },
     "node_modules/less/node_modules/tslib": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
-      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
       "dev": true
     },
     "node_modules/leven": {
@@ -19458,18 +19775,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/levenary": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz",
-      "integrity": "sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==",
-      "dev": true,
-      "dependencies": {
-        "leven": "^3.1.0"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/levn": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
@@ -19484,15 +19789,34 @@
       }
     },
     "node_modules/license-webpack-plugin": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-2.2.0.tgz",
-      "integrity": "sha512-XPsdL/0brSHf+7dXIlRqotnCQ58RX2au6otkOg4U3dm8uH+Ka/fW4iukEs95uXm+qKe/SBs+s1Ll/aQddKG+tg==",
+      "version": "2.3.11",
+      "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-2.3.11.tgz",
+      "integrity": "sha512-0iVGoX5vx0WDy8dmwTTpOOMYiGqILyUbDeVMFH52AjgBlS58lHwOlFMSoqg5nY8Kxl6+FRKyUZY/UdlQaOyqDw==",
       "dev": true,
       "dependencies": {
         "@types/webpack-sources": "^0.1.5",
         "webpack-sources": "^1.2.0"
       }
     },
+    "node_modules/license-webpack-plugin/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/license-webpack-plugin/node_modules/webpack-sources": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+      "dev": true,
+      "dependencies": {
+        "source-list-map": "^2.0.0",
+        "source-map": "~0.6.1"
+      }
+    },
     "node_modules/lie": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
@@ -19520,6 +19844,27 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/liftoff/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/liftoff/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/lines-and-columns": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
@@ -19527,14 +19872,14 @@
       "dev": true
     },
     "node_modules/load-json-file": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
-      "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+      "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
       "dev": true,
       "dependencies": {
         "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
+        "parse-json": "^4.0.0",
+        "pify": "^3.0.0",
         "strip-bom": "^3.0.0"
       },
       "engines": {
@@ -19542,24 +19887,25 @@
       }
     },
     "node_modules/load-json-file/node_modules/parse-json": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
       "dev": true,
       "dependencies": {
-        "error-ex": "^1.2.0"
+        "error-ex": "^1.3.1",
+        "json-parse-better-errors": "^1.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=4"
       }
     },
     "node_modules/load-json-file/node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
       "dev": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=4"
       }
     },
     "node_modules/load-json-file/node_modules/strip-bom": {
@@ -19607,9 +19953,9 @@
       }
     },
     "node_modules/lodash": {
-      "version": "4.17.20",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-      "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
     "node_modules/lodash._baseassign": {
       "version": "3.2.0",
@@ -19678,12 +20024,6 @@
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
       "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168="
     },
-    "node_modules/lodash.flatten": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
-      "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=",
-      "dev": true
-    },
     "node_modules/lodash.isarguments": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
@@ -19713,18 +20053,18 @@
       "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
       "dev": true
     },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
     "node_modules/lodash.restparam": {
       "version": "3.6.1",
       "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
       "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
       "dev": true
     },
-    "node_modules/lodash.sortby": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
-      "dev": true
-    },
     "node_modules/lodash.truncate": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
@@ -19738,102 +20078,96 @@
       "dev": true
     },
     "node_modules/log-symbols": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
-      "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
       "dev": true,
       "dependencies": {
-        "chalk": "^2.4.2"
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-symbols/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/log-symbols/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/log-symbols/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/log-symbols/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/log-symbols/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/log-symbols/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/log-symbols/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/log-symbols/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/log-symbols/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/log-symbols/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/log-symbols/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/loglevel": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.0.tgz",
-      "integrity": "sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==",
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.1.tgz",
+      "integrity": "sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==",
       "dev": true,
       "engines": {
         "node": ">= 0.6.0"
       },
       "funding": {
         "type": "tidelift",
-        "url": "https://tidelift.com/subscription/pkg/npm-loglevel?utm_medium=referral&utm_source=npm_fund"
-      }
-    },
-    "node_modules/loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dev": true,
-      "dependencies": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      },
-      "bin": {
-        "loose-envify": "cli.js"
+        "url": "https://tidelift.com/funding/github/npm/loglevel"
       }
     },
     "node_modules/loud-rejection": {
@@ -19874,9 +20208,9 @@
       }
     },
     "node_modules/macos-release": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.4.1.tgz",
-      "integrity": "sha512-H/QHeBIN1fIGJX517pvK8IEK53yQOW7YcEI55oYtgjDdoCQQz7eJS94qt5kNrscReEyuD/JcdFCm2XBEcGOITg==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.5.0.tgz",
+      "integrity": "sha512-EIgv+QZ9r+814gjJj0Bt5vSLJLzswGmSUbUpbi9AIr/fsN2IWFBl2NucV9PAiek+U1STK468tEkxmVYUtuAN3g==",
       "engines": {
         "node": ">=6"
       },
@@ -19922,94 +20256,54 @@
       "dev": true
     },
     "node_modules/make-fetch-happen": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz",
-      "integrity": "sha512-07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag==",
-      "dev": true,
+      "version": "8.0.14",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.14.tgz",
+      "integrity": "sha512-EsS89h6l4vbfJEtBZnENTOFk8mCRpY5ru36Xe5bcX1KYIli2mkSHqoFsp5O1wMDvTJJzxe/4THpCTtygjeeGWQ==",
       "dependencies": {
-        "agentkeepalive": "^3.4.1",
-        "cacache": "^12.0.0",
-        "http-cache-semantics": "^3.8.1",
-        "http-proxy-agent": "^2.1.0",
-        "https-proxy-agent": "^2.2.3",
-        "lru-cache": "^5.1.1",
-        "mississippi": "^3.0.0",
-        "node-fetch-npm": "^2.0.2",
-        "promise-retry": "^1.1.1",
-        "socks-proxy-agent": "^4.0.0",
-        "ssri": "^6.0.0"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/cacache": {
-      "version": "12.0.4",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
-      "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
-      "dev": true,
-      "dependencies": {
-        "bluebird": "^3.5.5",
-        "chownr": "^1.1.1",
-        "figgy-pudding": "^3.5.1",
-        "glob": "^7.1.4",
-        "graceful-fs": "^4.1.15",
-        "infer-owner": "^1.0.3",
-        "lru-cache": "^5.1.1",
-        "mississippi": "^3.0.0",
-        "mkdirp": "^0.5.1",
-        "move-concurrently": "^1.0.1",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^2.6.3",
-        "ssri": "^6.0.1",
-        "unique-filename": "^1.1.1",
-        "y18n": "^4.0.0"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/chownr": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-      "dev": true
-    },
-    "node_modules/make-fetch-happen/node_modules/http-cache-semantics": {
-      "version": "3.8.1",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz",
-      "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==",
-      "dev": true
-    },
-    "node_modules/make-fetch-happen/node_modules/lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^3.0.2"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
+        "agentkeepalive": "^4.1.3",
+        "cacache": "^15.0.5",
+        "http-cache-semantics": "^4.1.0",
+        "http-proxy-agent": "^4.0.1",
+        "https-proxy-agent": "^5.0.0",
+        "is-lambda": "^1.0.1",
+        "lru-cache": "^6.0.0",
+        "minipass": "^3.1.3",
+        "minipass-collect": "^1.0.2",
+        "minipass-fetch": "^1.3.2",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.4",
+        "promise-retry": "^2.0.1",
+        "socks-proxy-agent": "^5.0.0",
+        "ssri": "^8.0.0"
       },
-      "bin": {
-        "rimraf": "bin.js"
+      "engines": {
+        "node": ">= 10"
       }
     },
-    "node_modules/make-fetch-happen/node_modules/ssri": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
-      "dev": true,
+    "node_modules/make-fetch-happen/node_modules/err-code": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
+      "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="
+    },
+    "node_modules/make-fetch-happen/node_modules/promise-retry": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
+      "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
       "dependencies": {
-        "figgy-pudding": "^3.5.1"
+        "err-code": "^2.0.2",
+        "retry": "^0.12.0"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
-    "node_modules/make-fetch-happen/node_modules/yallist": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true
+    "node_modules/make-fetch-happen/node_modules/retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
+      "engines": {
+        "node": ">= 4"
+      }
     },
     "node_modules/make-iterator": {
       "version": "1.0.1",
@@ -20023,6 +20317,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/make-iterator/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/makeerror": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
@@ -20068,6 +20371,15 @@
         "node": ">= 0.10.0"
       }
     },
+    "node_modules/matchdep/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/matchdep/node_modules/braces": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
@@ -20101,6 +20413,28 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/matchdep/node_modules/braces/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/matchdep/node_modules/fill-range": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -20128,6 +20462,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/matchdep/node_modules/fill-range/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/matchdep/node_modules/findup-sync": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
@@ -20188,6 +20531,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/matchdep/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/matchdep/node_modules/micromatch": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -20266,9 +20618,9 @@
       }
     },
     "node_modules/mdn-data": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
-      "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==",
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
+      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
       "dev": true
     },
     "node_modules/media-typer": {
@@ -20280,16 +20632,13 @@
       }
     },
     "node_modules/memory-fs": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
-      "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
       "dev": true,
       "dependencies": {
         "errno": "^0.1.3",
         "readable-stream": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=4.3.0 <5.0.0 || >=5.10"
       }
     },
     "node_modules/merge-descriptors": {
@@ -20337,15 +20686,15 @@
       }
     },
     "node_modules/micromatch": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-      "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
       "dependencies": {
         "braces": "^3.0.1",
-        "picomatch": "^2.0.5"
+        "picomatch": "^2.2.3"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=8.6"
       }
     },
     "node_modules/miller-rabin": {
@@ -20362,9 +20711,9 @@
       }
     },
     "node_modules/miller-rabin/node_modules/bn.js": {
-      "version": "4.11.9",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-      "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
       "dev": true
     },
     "node_modules/mime": {
@@ -20379,19 +20728,19 @@
       }
     },
     "node_modules/mime-db": {
-      "version": "1.44.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
-      "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==",
+      "version": "1.49.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz",
+      "integrity": "sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA==",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/mime-types": {
-      "version": "2.1.27",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
-      "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
+      "version": "2.1.32",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz",
+      "integrity": "sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A==",
       "dependencies": {
-        "mime-db": "1.44.0"
+        "mime-db": "1.49.0"
       },
       "engines": {
         "node": ">= 0.6"
@@ -20406,93 +20755,104 @@
       }
     },
     "node_modules/mimic-response": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
+      "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
+      "optional": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/mini-css-extract-plugin": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz",
-      "integrity": "sha512-lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A==",
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.3.5.tgz",
+      "integrity": "sha512-tvmzcwqJJXau4OQE5vT72pRT18o2zF+tQJp8CWchqvfQnTlflkzS+dANYcRdyPRWUWRkfmeNTKltx0NZI/b5dQ==",
       "dev": true,
       "dependencies": {
-        "loader-utils": "^1.1.0",
-        "normalize-url": "1.9.1",
-        "schema-utils": "^1.0.0",
+        "loader-utils": "^2.0.0",
+        "schema-utils": "^3.0.0",
         "webpack-sources": "^1.1.0"
       },
       "engines": {
-        "node": ">= 6.9.0"
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
       },
       "peerDependencies": {
-        "webpack": "^4.4.0"
+        "webpack": "^4.4.0 || ^5.0.0"
       }
     },
-    "node_modules/mini-css-extract-plugin/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+    "node_modules/mini-css-extract-plugin/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
       "dependencies": {
-        "minimist": "^1.2.0"
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
       },
-      "bin": {
-        "json5": "lib/cli.js"
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/mini-css-extract-plugin/node_modules/loader-utils": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+    "node_modules/mini-css-extract-plugin/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/mini-css-extract-plugin/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
       "dev": true,
       "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^1.0.1"
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
       },
       "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/mini-css-extract-plugin/node_modules/normalize-url": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz",
-      "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
-      "dev": true,
-      "dependencies": {
-        "object-assign": "^4.0.1",
-        "prepend-http": "^1.0.0",
-        "query-string": "^4.1.0",
-        "sort-keys": "^1.0.0"
+        "node": ">= 10.13.0"
       },
-      "engines": {
-        "node": ">=4"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
       }
     },
-    "node_modules/mini-css-extract-plugin/node_modules/prepend-http": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
-      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
+    "node_modules/mini-css-extract-plugin/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+    "node_modules/mini-css-extract-plugin/node_modules/webpack-sources": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
       "dev": true,
       "dependencies": {
-        "ajv": "^6.1.0",
-        "ajv-errors": "^1.0.0",
-        "ajv-keywords": "^3.1.0"
-      },
-      "engines": {
-        "node": ">= 4"
+        "source-list-map": "^2.0.0",
+        "source-map": "~0.6.1"
       }
     },
     "node_modules/minimalistic-assert": {
@@ -20649,28 +21009,15 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/mixin-deep/node_modules/is-extendable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-      "dev": true,
-      "dependencies": {
-        "is-plain-object": "^2.0.4"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
       "bin": {
         "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
     "node_modules/mkdirp-classic": {
@@ -20680,9 +21027,9 @@
       "optional": true
     },
     "node_modules/moment": {
-      "version": "2.29.0",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.0.tgz",
-      "integrity": "sha512-z6IJ5HXYiuxvFTI6eiQ9dm77uE0gyy1yXNApVHqTcnIKfY9tIwEjlzsZ6u1LQXvVgKeTnv9Xm7NDvJ7lso3MtA==",
+      "version": "2.29.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
+      "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==",
       "engines": {
         "node": "*"
       }
@@ -20701,6 +21048,18 @@
         "run-queue": "^1.0.3"
       }
     },
+    "node_modules/move-concurrently/node_modules/mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
     "node_modules/move-concurrently/node_modules/rimraf": {
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -20713,34 +21072,10 @@
         "rimraf": "bin.js"
       }
     },
-    "node_modules/move-file": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/move-file/-/move-file-2.0.0.tgz",
-      "integrity": "sha512-cdkdhNCgbP5dvS4tlGxZbD+nloio9GIimP57EjqFhwLcMjnU+XJKAZzlmg/TN/AK1LuNAdTSvm3CPPP4Xkv0iQ==",
-      "dev": true,
-      "dependencies": {
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/move-file/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "node_modules/multicast-dns": {
       "version": "6.2.3",
@@ -20776,12 +21111,24 @@
       "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="
     },
     "node_modules/nan": {
-      "version": "2.14.1",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz",
-      "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==",
+      "version": "2.14.2",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
+      "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==",
       "dev": true,
       "optional": true
     },
+    "node_modules/nanoid": {
+      "version": "3.1.23",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz",
+      "integrity": "sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==",
+      "dev": true,
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
     "node_modules/nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -20804,19 +21151,43 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/nanomatch/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/nanomatch/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/nanomatch/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/napi-build-utils": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
       "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==",
       "optional": true
     },
-    "node_modules/native-request": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/native-request/-/native-request-1.0.7.tgz",
-      "integrity": "sha512-9nRjinI9bmz+S7dgNtf4A70+/vPhnd+2krGpy4SUlADuOuSa24IDkNaZ+R/QT1wQ6S8jBdi6wE7fLekFZNfUpQ==",
-      "dev": true,
-      "optional": true
-    },
     "node_modules/native-run": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/native-run/-/native-run-1.4.0.tgz",
@@ -20842,27 +21213,10 @@
         "node": ">=10.3.0"
       }
     },
-    "node_modules/native-run/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/native-run/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+    "node_modules/native-run/node_modules/ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
       "dev": true
     },
     "node_modules/native-run/node_modules/readable-stream": {
@@ -20894,6 +21248,41 @@
       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
       "dev": true
     },
+    "node_modules/needle": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/needle/-/needle-2.8.0.tgz",
+      "integrity": "sha512-ZTq6WYkN/3782H1393me3utVYdq2XyqNUFBsprEE3VMAT0+hP/cItpnITpqsY6ep2yeFE4Tqtqwc74VqUlUYtw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "debug": "^3.2.6",
+        "iconv-lite": "^0.4.4",
+        "sax": "^1.2.4"
+      },
+      "bin": {
+        "needle": "bin/needle"
+      },
+      "engines": {
+        "node": ">= 4.4.x"
+      }
+    },
+    "node_modules/needle/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/needle/node_modules/sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+      "dev": true,
+      "optional": true
+    },
     "node_modules/negotiator": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
@@ -20943,9 +21332,9 @@
       }
     },
     "node_modules/node-abi": {
-      "version": "2.19.3",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.19.3.tgz",
-      "integrity": "sha512-9xZrlyfvKhWme2EXFKQhZRp1yNWT/uI1luYPr3sFl+H4keYY4xR+1jO7mvTTijIsHf1M+QDe9uWuKeEpLInIlg==",
+      "version": "2.30.0",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.30.0.tgz",
+      "integrity": "sha512-g6bZh3YCKQRdwuO/tSZZYJAw622SjsRfJ2X0Iy4sSOHZ34/sPPdVBn8fev2tj7njzLwuqPw9uMtGsGkO5kIQvg==",
       "optional": true,
       "dependencies": {
         "semver": "^5.4.1"
@@ -20961,25 +21350,11 @@
       }
     },
     "node_modules/node-addon-api": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.0.2.tgz",
-      "integrity": "sha512-+D4s2HCnxPd5PjjI0STKwncjXTUKKqm74MDMz9OPXavjsGmjkvwgLtA5yoxJUdmpj52+2u+RrXgPipahKczMKg==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
+      "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
       "optional": true
     },
-    "node_modules/node-fetch-npm": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.4.tgz",
-      "integrity": "sha512-iOuIQDWDyjhv9qSDrj9aq/klt6F9z1p2otB3AV7v3zBDcL/x+OfGsvGQZZCcMZbUf4Ujw1xGNQkjvGnVT22cKg==",
-      "dev": true,
-      "dependencies": {
-        "encoding": "^0.1.11",
-        "json-parse-better-errors": "^1.0.0",
-        "safe-buffer": "^5.1.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/node-forge": {
       "version": "0.10.0",
       "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
@@ -21071,11 +21446,16 @@
         "vm-browserify": "^1.0.1"
       }
     },
-    "node_modules/node-libs-browser/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-      "dev": true
+    "node_modules/node-libs-browser/node_modules/buffer": {
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
+      "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
+      "dev": true,
+      "dependencies": {
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
+      }
     },
     "node_modules/node-libs-browser/node_modules/punycode": {
       "version": "1.4.1",
@@ -21083,15 +21463,6 @@
       "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
       "dev": true
     },
-    "node_modules/node-libs-browser/node_modules/util": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
-      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "2.0.3"
-      }
-    },
     "node_modules/node-modules-regexp": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
@@ -21102,9 +21473,9 @@
       }
     },
     "node_modules/node-notifier": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.0.tgz",
-      "integrity": "sha512-46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.2.tgz",
+      "integrity": "sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==",
       "dev": true,
       "optional": true,
       "dependencies": {
@@ -21116,28 +21487,12 @@
         "which": "^2.0.2"
       }
     },
-    "node_modules/node-notifier/node_modules/uuid": {
-      "version": "8.3.1",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.1.tgz",
-      "integrity": "sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==",
-      "dev": true,
-      "optional": true,
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
     "node_modules/node-releases": {
-      "version": "1.1.61",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.61.tgz",
-      "integrity": "sha512-DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g==",
+      "version": "1.1.73",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz",
+      "integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==",
       "dev": true
     },
-    "node_modules/noop-logger": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz",
-      "integrity": "sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI=",
-      "optional": true
-    },
     "node_modules/nopt": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
@@ -21162,9 +21517,9 @@
       }
     },
     "node_modules/normalize-package-data/node_modules/hosted-git-info": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
-      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="
     },
     "node_modules/normalize-package-data/node_modules/semver": {
       "version": "5.7.1",
@@ -21193,11 +21548,15 @@
       }
     },
     "node_modules/normalize-url": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
-      "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
+      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
+      "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/now-and-later": {
@@ -21213,9 +21572,9 @@
       }
     },
     "node_modules/npm-bundled": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz",
-      "integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz",
+      "integrity": "sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==",
       "dependencies": {
         "npm-normalize-package-bin": "^1.0.1"
       }
@@ -21237,11 +21596,11 @@
       "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA=="
     },
     "node_modules/npm-package-arg": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.0.1.tgz",
-      "integrity": "sha512-/h5Fm6a/exByzFSTm7jAyHbgOqErl9qSNJDQF32Si/ZzgwT2TERVxRxn3Jurw1wflgyVVAxnFR4fRHPM7y1ClQ==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.0.tgz",
+      "integrity": "sha512-/ep6QDxBkm9HvOhOg0heitSd7JHA1U7y1qhhlRlteYYAi9Pdb/ZV7FW5aHpkrpM8+P+4p/jjR8zCyKPBMBjSig==",
       "dependencies": {
-        "hosted-git-info": "^3.0.2",
+        "hosted-git-info": "^3.0.6",
         "semver": "^7.0.0",
         "validate-npm-package-name": "^3.0.0"
       },
@@ -21250,14 +21609,20 @@
       }
     },
     "node_modules/npm-packlist": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz",
-      "integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==",
-      "dev": true,
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.2.2.tgz",
+      "integrity": "sha512-Jt01acDvJRhJGthnUJVF/w6gumWOZxO7IkpY/lsX9//zqQgnF7OJaxgQXcerd4uQOLu7W5bkb4mChL9mdfm+Zg==",
       "dependencies": {
-        "ignore-walk": "^3.0.1",
-        "npm-bundled": "^1.0.1",
+        "glob": "^7.1.6",
+        "ignore-walk": "^3.0.3",
+        "npm-bundled": "^1.1.1",
         "npm-normalize-package-bin": "^1.0.1"
+      },
+      "bin": {
+        "npm-packlist": "bin/index.js"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
     "node_modules/npm-pick-manifest": {
@@ -21271,82 +21636,23 @@
       }
     },
     "node_modules/npm-registry-fetch": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.7.tgz",
-      "integrity": "sha512-cny9v0+Mq6Tjz+e0erFAB+RYJ/AVGzkjnISiobqP8OWj9c9FLoZZu8/SPSKJWE17F1tk4018wfjV+ZbIbqC7fQ==",
-      "dev": true,
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-9.0.0.tgz",
+      "integrity": "sha512-PuFYYtnQ8IyVl6ib9d3PepeehcUeHN9IO5N/iCRhyg9tStQcqGQBRVHmfmMWPDERU3KwZoHFvbJ4FPXPspvzbA==",
       "dependencies": {
-        "bluebird": "^3.5.1",
-        "figgy-pudding": "^3.4.1",
-        "JSONStream": "^1.3.4",
-        "lru-cache": "^5.1.1",
-        "make-fetch-happen": "^5.0.0",
-        "npm-package-arg": "^6.1.0",
-        "safe-buffer": "^5.2.0"
+        "@npmcli/ci-detect": "^1.0.0",
+        "lru-cache": "^6.0.0",
+        "make-fetch-happen": "^8.0.9",
+        "minipass": "^3.1.3",
+        "minipass-fetch": "^1.3.0",
+        "minipass-json-stream": "^1.0.1",
+        "minizlib": "^2.0.0",
+        "npm-package-arg": "^8.0.0"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
-    "node_modules/npm-registry-fetch/node_modules/hosted-git-info": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
-      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
-      "dev": true
-    },
-    "node_modules/npm-registry-fetch/node_modules/lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^3.0.2"
-      }
-    },
-    "node_modules/npm-registry-fetch/node_modules/npm-package-arg": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
-      "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
-      "dev": true,
-      "dependencies": {
-        "hosted-git-info": "^2.7.1",
-        "osenv": "^0.1.5",
-        "semver": "^5.6.0",
-        "validate-npm-package-name": "^3.0.0"
-      }
-    },
-    "node_modules/npm-registry-fetch/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/npm-registry-fetch/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/npm-registry-fetch/node_modules/yallist": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true
-    },
     "node_modules/npm-run-path": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
@@ -21378,12 +21684,6 @@
         "boolbase": "~1.0.0"
       }
     },
-    "node_modules/num2fraction": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
-      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
-      "dev": true
-    },
     "node_modules/number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
@@ -21440,6 +21740,53 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/object-copy/node_modules/is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/is-descriptor/node_modules/kind-of": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/object-copy/node_modules/kind-of": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -21453,22 +21800,22 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
-      "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz",
+      "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==",
       "dev": true,
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/object-is": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.3.tgz",
-      "integrity": "sha512-teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg==",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
+      "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
       "dev": true,
       "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.1"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -21486,15 +21833,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/object-path": {
-      "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.11.4.tgz",
-      "integrity": "sha1-NwrnUvvzfePqcKhhwju6iRVpGUk=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/object-visit": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
@@ -21517,13 +21855,13 @@
       }
     },
     "node_modules/object.assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz",
-      "integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
       "dev": true,
       "dependencies": {
+        "call-bind": "^1.0.0",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.0",
         "has-symbols": "^1.0.1",
         "object-keys": "^1.1.1"
       },
@@ -21558,47 +21896,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/object.getownpropertydescriptors": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz",
-      "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.getownpropertydescriptors/node_modules/es-abstract": {
-      "version": "1.17.7",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
-      "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
-      "dev": true,
-      "dependencies": {
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1",
-        "is-callable": "^1.2.2",
-        "is-regex": "^1.1.1",
-        "object-inspect": "^1.8.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.1",
-        "string.prototype.trimend": "^1.0.1",
-        "string.prototype.trimstart": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/object.map": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
@@ -21647,40 +21944,14 @@
       }
     },
     "node_modules/object.values": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz",
-      "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.4.tgz",
+      "integrity": "sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==",
       "dev": true,
       "dependencies": {
+        "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/es-abstract": {
-      "version": "1.17.7",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
-      "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
-      "dev": true,
-      "dependencies": {
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1",
-        "is-callable": "^1.2.2",
-        "is-regex": "^1.1.1",
-        "object-inspect": "^1.8.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.1",
-        "string.prototype.trimend": "^1.0.1",
-        "string.prototype.trimstart": "^1.0.1"
+        "es-abstract": "^1.18.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -21690,9 +21961,9 @@
       }
     },
     "node_modules/objectorarray": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/objectorarray/-/objectorarray-1.0.4.tgz",
-      "integrity": "sha512-91k8bjcldstRz1bG6zJo8lWD7c6QXcB4nTDUqiEvIL1xAsLoZlOOZZG+nd6YPz+V7zY1580J4Xxh1vZtyv4i/w=="
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/objectorarray/-/objectorarray-1.0.5.tgz",
+      "integrity": "sha512-eJJDYkhJFFbBBAxeh8xW+weHlkI28n2ZdQV/J/DNfWfSKlGEf2xcfAbZTv3riEXHAhL9SVOTs2pRmXiSTf78xg=="
     },
     "node_modules/obuf": {
       "version": "1.1.2",
@@ -21742,9 +22013,9 @@
       }
     },
     "node_modules/open": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/open/-/open-7.3.0.tgz",
-      "integrity": "sha512-mgLwQIx2F/ye9SmbrUkurZCnkoXyXyu9EbHtJZrICjVAJfyMArdHp3KkixGdZx1ZHFPNIwl0DDM1dFFqXbTLZw==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/open/-/open-7.4.0.tgz",
+      "integrity": "sha512-PGoBCX/lclIWlpS/R2PQuIR4NJoXh6X5AwVzE7WXnWRGvHg7+4TBCgsujUgiPpm0K1y4qvQeWnCWVTpTKZBtvA==",
       "dependencies": {
         "is-docker": "^2.0.0",
         "is-wsl": "^2.1.1"
@@ -21795,68 +22066,86 @@
       }
     },
     "node_modules/ora": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-4.0.4.tgz",
-      "integrity": "sha512-77iGeVU1cIdRhgFzCK8aw1fbtT1B/iZAvWjS+l/o1x0RShMgxHUZaD2yDpWsNCPwXg9z1ZA78Kbdvr8kBmG/Ww==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-5.3.0.tgz",
+      "integrity": "sha512-zAKMgGXUim0Jyd6CXK9lraBnD3H5yPGBPPOkC23a2BG6hsm4Zu6OQSjQuEtV0BHDf4aKHcUFvJiGRrFuW3MG8g==",
       "dev": true,
       "dependencies": {
-        "chalk": "^3.0.0",
+        "bl": "^4.0.3",
+        "chalk": "^4.1.0",
         "cli-cursor": "^3.1.0",
-        "cli-spinners": "^2.2.0",
+        "cli-spinners": "^2.5.0",
         "is-interactive": "^1.0.0",
-        "log-symbols": "^3.0.0",
-        "mute-stream": "0.0.8",
+        "log-symbols": "^4.0.0",
         "strip-ansi": "^6.0.0",
         "wcwidth": "^1.0.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/ora/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ora/node_modules/cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+    "node_modules/ora/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
-        "restore-cursor": "^3.1.0"
+        "color-convert": "^2.0.1"
       },
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/ora/node_modules/restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+    "node_modules/ora/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/ora/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/ora/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/ora/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+    "node_modules/ora/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
-        "ansi-regex": "^5.0.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
         "node": ">=8"
@@ -21907,15 +22196,19 @@
       }
     },
     "node_modules/os-name": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/os-name/-/os-name-3.1.0.tgz",
-      "integrity": "sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/os-name/-/os-name-4.0.1.tgz",
+      "integrity": "sha512-xl9MAoU97MH1Xt5K9ERft2YfCAoaO6msy1OBA0ozxEC0x0TmIoE6K3QvgJMMZA9yKGLmHXNY/YZoDbiGDj4zYw==",
+      "dev": true,
       "dependencies": {
-        "macos-release": "^2.2.0",
-        "windows-release": "^3.1.0"
+        "macos-release": "^2.5.0",
+        "windows-release": "^4.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/os-tmpdir": {
@@ -21944,12 +22237,15 @@
       }
     },
     "node_modules/p-each-series": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.1.0.tgz",
-      "integrity": "sha512-ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.2.0.tgz",
+      "integrity": "sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==",
       "dev": true,
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/p-finally": {
@@ -21961,6 +22257,32 @@
       }
     },
     "node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "dependencies": {
+        "p-limit": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-locate/node_modules/p-limit": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
       "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
@@ -21971,7 +22293,7 @@
         "node": ">=4"
       }
     },
-    "node_modules/p-limit/node_modules/p-try": {
+    "node_modules/p-locate/node_modules/p-try": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
       "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
@@ -21979,17 +22301,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-      "dependencies": {
-        "p-limit": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/p-map": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
@@ -22016,6 +22327,15 @@
         "node": ">=6"
       }
     },
+    "node_modules/p-retry/node_modules/retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
     "node_modules/p-try": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
@@ -22044,82 +22364,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/pac-proxy-agent/node_modules/agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-      "dev": true,
-      "dependencies": {
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6.0.0"
-      }
-    },
-    "node_modules/pac-proxy-agent/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/pac-proxy-agent/node_modules/http-proxy-agent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
-      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
-      "dev": true,
-      "dependencies": {
-        "@tootallnate/once": "1",
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/pac-proxy-agent/node_modules/https-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
-      "dev": true,
-      "dependencies": {
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/pac-proxy-agent/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/pac-proxy-agent/node_modules/socks-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA==",
-      "dev": true,
-      "dependencies": {
-        "agent-base": "6",
-        "debug": "4",
-        "socks": "^2.3.3"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/pac-resolver": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-4.2.0.tgz",
@@ -22157,216 +22401,37 @@
       }
     },
     "node_modules/pacote": {
-      "version": "9.5.12",
-      "resolved": "https://registry.npmjs.org/pacote/-/pacote-9.5.12.tgz",
-      "integrity": "sha512-BUIj/4kKbwWg4RtnBncXPJd15piFSVNpTzY0rysSr3VnMowTYgkGKcaHrbReepAkjTr8lH2CVWRi58Spg2CicQ==",
-      "dev": true,
+      "version": "11.2.4",
+      "resolved": "https://registry.npmjs.org/pacote/-/pacote-11.2.4.tgz",
+      "integrity": "sha512-GfTeVQGJ6WyBQbQD4t3ocHbyOmTQLmWjkCKSZPmKiGFKYKNUaM5U2gbLzUW8WG1XmS9yQFnsTFA0k3o1+q4klQ==",
       "dependencies": {
-        "bluebird": "^3.5.3",
-        "cacache": "^12.0.2",
-        "chownr": "^1.1.2",
-        "figgy-pudding": "^3.5.1",
-        "get-stream": "^4.1.0",
-        "glob": "^7.1.3",
+        "@npmcli/git": "^2.0.1",
+        "@npmcli/installed-package-contents": "^1.0.5",
+        "@npmcli/promise-spawn": "^1.2.0",
+        "@npmcli/run-script": "^1.3.0",
+        "cacache": "^15.0.5",
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.1.0",
         "infer-owner": "^1.0.4",
-        "lru-cache": "^5.1.1",
-        "make-fetch-happen": "^5.0.0",
-        "minimatch": "^3.0.4",
-        "minipass": "^2.3.5",
-        "mississippi": "^3.0.0",
-        "mkdirp": "^0.5.1",
-        "normalize-package-data": "^2.4.0",
-        "npm-normalize-package-bin": "^1.0.0",
-        "npm-package-arg": "^6.1.0",
-        "npm-packlist": "^1.1.12",
-        "npm-pick-manifest": "^3.0.0",
-        "npm-registry-fetch": "^4.0.0",
-        "osenv": "^0.1.5",
-        "promise-inflight": "^1.0.1",
+        "minipass": "^3.1.3",
+        "mkdirp": "^1.0.3",
+        "npm-package-arg": "^8.0.1",
+        "npm-packlist": "^2.1.4",
+        "npm-pick-manifest": "^6.0.0",
+        "npm-registry-fetch": "^9.0.0",
         "promise-retry": "^1.1.1",
-        "protoduck": "^5.0.1",
-        "rimraf": "^2.6.2",
-        "safe-buffer": "^5.1.2",
-        "semver": "^5.6.0",
-        "ssri": "^6.0.1",
-        "tar": "^4.4.10",
-        "unique-filename": "^1.1.1",
-        "which": "^1.3.1"
-      }
-    },
-    "node_modules/pacote/node_modules/cacache": {
-      "version": "12.0.4",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
-      "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
-      "dev": true,
-      "dependencies": {
-        "bluebird": "^3.5.5",
-        "chownr": "^1.1.1",
-        "figgy-pudding": "^3.5.1",
-        "glob": "^7.1.4",
-        "graceful-fs": "^4.1.15",
-        "infer-owner": "^1.0.3",
-        "lru-cache": "^5.1.1",
-        "mississippi": "^3.0.0",
-        "mkdirp": "^0.5.1",
-        "move-concurrently": "^1.0.1",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^2.6.3",
-        "ssri": "^6.0.1",
-        "unique-filename": "^1.1.1",
-        "y18n": "^4.0.0"
-      }
-    },
-    "node_modules/pacote/node_modules/chownr": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-      "dev": true
-    },
-    "node_modules/pacote/node_modules/fs-minipass": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
-      "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^2.6.0"
-      }
-    },
-    "node_modules/pacote/node_modules/get-stream": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-      "dev": true,
-      "dependencies": {
-        "pump": "^3.0.0"
+        "read-package-json-fast": "^1.1.3",
+        "rimraf": "^3.0.2",
+        "ssri": "^8.0.0",
+        "tar": "^6.1.0"
+      },
+      "bin": {
+        "pacote": "lib/bin.js"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=10"
       }
     },
-    "node_modules/pacote/node_modules/hosted-git-info": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
-      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
-      "dev": true
-    },
-    "node_modules/pacote/node_modules/lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^3.0.2"
-      }
-    },
-    "node_modules/pacote/node_modules/minipass": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
-      "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "^5.1.2",
-        "yallist": "^3.0.0"
-      }
-    },
-    "node_modules/pacote/node_modules/minizlib": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
-      "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^2.9.0"
-      }
-    },
-    "node_modules/pacote/node_modules/npm-package-arg": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
-      "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
-      "dev": true,
-      "dependencies": {
-        "hosted-git-info": "^2.7.1",
-        "osenv": "^0.1.5",
-        "semver": "^5.6.0",
-        "validate-npm-package-name": "^3.0.0"
-      }
-    },
-    "node_modules/pacote/node_modules/npm-pick-manifest": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-3.0.2.tgz",
-      "integrity": "sha512-wNprTNg+X5nf+tDi+hbjdHhM4bX+mKqv6XmPh7B5eG+QY9VARfQPfCEH013H5GqfNj6ee8Ij2fg8yk0mzps1Vw==",
-      "dev": true,
-      "dependencies": {
-        "figgy-pudding": "^3.5.1",
-        "npm-package-arg": "^6.0.0",
-        "semver": "^5.4.1"
-      }
-    },
-    "node_modules/pacote/node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/pacote/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/pacote/node_modules/ssri": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
-      "dev": true,
-      "dependencies": {
-        "figgy-pudding": "^3.5.1"
-      }
-    },
-    "node_modules/pacote/node_modules/tar": {
-      "version": "4.4.13",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz",
-      "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
-      "dev": true,
-      "dependencies": {
-        "chownr": "^1.1.1",
-        "fs-minipass": "^1.2.5",
-        "minipass": "^2.8.6",
-        "minizlib": "^1.2.1",
-        "mkdirp": "^0.5.0",
-        "safe-buffer": "^5.1.2",
-        "yallist": "^3.0.3"
-      },
-      "engines": {
-        "node": ">=4.5"
-      }
-    },
-    "node_modules/pacote/node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
-    "node_modules/pacote/node_modules/yallist": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true
-    },
     "node_modules/pako": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
@@ -22431,16 +22496,21 @@
       }
     },
     "node_modules/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
       "dev": true,
       "dependencies": {
+        "@babel/code-frame": "^7.0.0",
         "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/parse-node-version": {
@@ -22462,9 +22532,58 @@
       }
     },
     "node_modules/parse5": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
-      "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz",
+      "integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/parse5-html-rewriting-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-6.0.1.tgz",
+      "integrity": "sha512-vwLQzynJVEfUlURxgnf51yAJDQTtVpNyGD8tKi2Za7m+akukNHxCcUQMAa/mUGLhCeicFdpy7Tlvj8ZNKadprg==",
+      "dev": true,
+      "dependencies": {
+        "parse5": "^6.0.1",
+        "parse5-sax-parser": "^6.0.1"
+      }
+    },
+    "node_modules/parse5-html-rewriting-stream/node_modules/parse5": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+      "dev": true
+    },
+    "node_modules/parse5-htmlparser2-tree-adapter": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz",
+      "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==",
+      "dev": true,
+      "dependencies": {
+        "parse5": "^6.0.1"
+      }
+    },
+    "node_modules/parse5-htmlparser2-tree-adapter/node_modules/parse5": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+      "dev": true
+    },
+    "node_modules/parse5-sax-parser": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5-sax-parser/-/parse5-sax-parser-6.0.1.tgz",
+      "integrity": "sha512-kXX+5S81lgESA0LsDuGjAlBybImAChYRMT+/uKCEXFBFOeEhS52qUCydGhU3qLRD8D9DVjaUo821WK7DM4iCeg==",
+      "dev": true,
+      "dependencies": {
+        "parse5": "^6.0.1"
+      }
+    },
+    "node_modules/parse5-sax-parser/node_modules/parse5": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
       "dev": true
     },
     "node_modules/parseurl": {
@@ -22526,9 +22645,9 @@
       }
     },
     "node_modules/path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
     },
     "node_modules/path-root": {
       "version": "0.1.1",
@@ -22565,9 +22684,9 @@
       }
     },
     "node_modules/pbkdf2": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.1.tgz",
-      "integrity": "sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
+      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
       "dev": true,
       "dependencies": {
         "create-hash": "^1.1.2",
@@ -22598,9 +22717,9 @@
       "deprecated": "This package is deprecated, see https://blog.phonegap.com/update-for-customers-using-phonegap-and-phonegap-build-cc701c77502c"
     },
     "node_modules/picomatch": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
-      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
+      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
       "engines": {
         "node": ">=8.6"
       },
@@ -22609,11 +22728,14 @@
       }
     },
     "node_modules/pify": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz",
+      "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==",
       "engines": {
-        "node": ">=6"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/pinkie": {
@@ -22650,67 +22772,15 @@
       }
     },
     "node_modules/pkg-dir": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
+      "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
       "dev": true,
       "dependencies": {
-        "find-up": "^3.0.0"
+        "find-up": "^2.1.0"
       },
       "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
+        "node": ">=4"
       }
     },
     "node_modules/pkg-up": {
@@ -22725,13 +22795,13 @@
       }
     },
     "node_modules/plist": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.1.tgz",
-      "integrity": "sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.2.tgz",
+      "integrity": "sha512-MSrkwZBdQ6YapHy87/8hDU8MnIcyxBKjeF+McXnr5A9MtffPewTs7G3hlpodT5TacyfIyFTaJEhh3GGcmasTgQ==",
       "dependencies": {
-        "base64-js": "^1.2.3",
+        "base64-js": "^1.5.1",
         "xmlbuilder": "^9.0.7",
-        "xmldom": "0.1.x"
+        "xmldom": "^0.5.0"
       },
       "engines": {
         "node": ">=6"
@@ -22753,58 +22823,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/plugin-error/node_modules/arr-diff": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
-      "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
-      "dev": true,
-      "dependencies": {
-        "arr-flatten": "^1.0.1",
-        "array-slice": "^0.2.3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/plugin-error/node_modules/arr-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
-      "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/plugin-error/node_modules/array-slice": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
-      "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/plugin-error/node_modules/extend-shallow": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
-      "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/plugin-error/node_modules/kind-of": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
-      "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/pnp-webpack-plugin": {
       "version": "1.6.4",
       "resolved": "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz",
@@ -22832,20 +22850,25 @@
       }
     },
     "node_modules/portfinder/node_modules/debug": {
-      "version": "3.2.6",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
       "dependencies": {
         "ms": "^2.1.1"
       }
     },
-    "node_modules/portfinder/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
+    "node_modules/portfinder/node_modules/mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
     },
     "node_modules/posix-character-classes": {
       "version": "0.1.1",
@@ -22857,759 +22880,562 @@
       }
     },
     "node_modules/postcss": {
-      "version": "7.0.31",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.31.tgz",
-      "integrity": "sha512-a937VDHE1ftkjk+8/7nj/mrjtmkn69xxzJgRETXdAUU+IgOYPQNJF17haGWbeDxSyk++HA14UA98FurvPyBJOA==",
+      "version": "8.2.15",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.15.tgz",
+      "integrity": "sha512-2zO3b26eJD/8rb106Qu2o7Qgg52ND5HPjcyQiK2B98O388h43A448LCslC0dI2P97wCAQRJsFvwTRcXxTKds+Q==",
       "dev": true,
       "dependencies": {
-        "chalk": "^2.4.2",
-        "source-map": "^0.6.1",
-        "supports-color": "^6.1.0"
+        "colorette": "^1.2.2",
+        "nanoid": "^3.1.23",
+        "source-map": "^0.6.1"
       },
       "engines": {
-        "node": ">=6.0.0"
+        "node": "^10 || ^12 || >=14"
       },
       "funding": {
-        "type": "tidelift",
-        "url": "https://tidelift.com/funding/github/npm/postcss"
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
       }
     },
     "node_modules/postcss-calc": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.5.tgz",
-      "integrity": "sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.0.0.tgz",
+      "integrity": "sha512-5NglwDrcbiy8XXfPM11F3HeC6hoT9W7GUH/Zi5U/p7u3Irv4rHhdDcIZwG0llHXV4ftsBjpfWMXAnXNl4lnt8g==",
       "dev": true,
       "dependencies": {
-        "postcss": "^7.0.27",
         "postcss-selector-parser": "^6.0.2",
         "postcss-value-parser": "^4.0.2"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.2"
       }
     },
     "node_modules/postcss-colormin": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz",
-      "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.2.0.tgz",
+      "integrity": "sha512-+HC6GfWU3upe5/mqmxuqYZ9B2Wl4lcoUUNkoaX59nEWV4EtADCMiBqui111Bu8R8IvaZTmqmxrqOAqjbHIwXPw==",
       "dev": true,
       "dependencies": {
-        "browserslist": "^4.0.0",
-        "color": "^3.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
+        "browserslist": "^4.16.6",
+        "caniuse-api": "^3.0.0",
+        "colord": "^2.0.1",
+        "postcss-value-parser": "^4.1.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/postcss-colormin/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
     "node_modules/postcss-convert-values": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz",
-      "integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.0.1.tgz",
+      "integrity": "sha512-C3zR1Do2BkKkCgC0g3sF8TS0koF2G+mN8xxayZx3f10cIRmTaAnpgpRQZjNekTZxM2ciSPoh2IWJm0VZx8NoQg==",
       "dev": true,
       "dependencies": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
+        "postcss-value-parser": "^4.1.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/postcss-convert-values/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
     "node_modules/postcss-discard-comments": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz",
-      "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.0.1.tgz",
+      "integrity": "sha512-lgZBPTDvWrbAYY1v5GYEv8fEO/WhKOu/hmZqmCYfrpD6eyDWWzAOsl2rF29lpvziKO02Gc5GJQtlpkTmakwOWg==",
       "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.0"
-      },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
     "node_modules/postcss-discard-duplicates": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz",
-      "integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.1.tgz",
+      "integrity": "sha512-svx747PWHKOGpAXXQkCc4k/DsWo+6bc5LsVrAsw+OU+Ibi7klFZCyX54gjYzX4TH+f2uzXjRviLARxkMurA2bA==",
       "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.0"
-      },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
     "node_modules/postcss-discard-empty": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz",
-      "integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.0.1.tgz",
+      "integrity": "sha512-vfU8CxAQ6YpMxV2SvMcMIyF2LX1ZzWpy0lqHDsOdaKKLQVQGVP1pzhrI9JlsO65s66uQTfkQBKBD/A5gp9STFw==",
       "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.0"
-      },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
     "node_modules/postcss-discard-overridden": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz",
-      "integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.0.1.tgz",
+      "integrity": "sha512-Y28H7y93L2BpJhrdUR2SR2fnSsT+3TVx1NmVQLbcnZWwIUpJ7mfcTC6Za9M2PG6w8j7UQRfzxqn8jU2VwFxo3Q==",
       "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.0"
-      },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
     "node_modules/postcss-import": {
-      "version": "12.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-12.0.1.tgz",
-      "integrity": "sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw==",
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-14.0.0.tgz",
+      "integrity": "sha512-gFDDzXhqr9ELmnLHgCC3TbGfA6Dm/YMb/UN8/f7Uuq4fL7VTk2vOIj6hwINEwbokEmp123bLD7a5m+E+KIetRg==",
       "dev": true,
       "dependencies": {
-        "postcss": "^7.0.1",
-        "postcss-value-parser": "^3.2.3",
+        "postcss-value-parser": "^4.0.0",
         "read-cache": "^1.0.0",
         "resolve": "^1.1.7"
       },
       "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-import/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/postcss-load-config": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.2.tgz",
-      "integrity": "sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==",
-      "dev": true,
-      "dependencies": {
-        "cosmiconfig": "^5.0.0",
-        "import-cwd": "^2.0.0"
+        "node": ">=10.0.0"
       },
-      "engines": {
-        "node": ">= 4"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
+      "peerDependencies": {
+        "postcss": "^8.0.0"
       }
     },
     "node_modules/postcss-loader": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz",
-      "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-4.2.0.tgz",
+      "integrity": "sha512-mqgScxHqbiz1yxbnNcPdKYo/6aVt+XExURmEbQlviFVWogDbM4AJ0A/B+ZBpYsJrTRxKw7HyRazg9x0Q9SWwLA==",
       "dev": true,
       "dependencies": {
-        "loader-utils": "^1.1.0",
-        "postcss": "^7.0.0",
-        "postcss-load-config": "^2.0.0",
-        "schema-utils": "^1.0.0"
+        "cosmiconfig": "^7.0.0",
+        "klona": "^2.0.4",
+        "loader-utils": "^2.0.0",
+        "schema-utils": "^3.0.0",
+        "semver": "^7.3.4"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "postcss": "^7.0.0 || ^8.0.1",
+        "webpack": "^4.0.0 || ^5.0.0"
       }
     },
-    "node_modules/postcss-loader/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+    "node_modules/postcss-loader/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
       "dependencies": {
-        "minimist": "^1.2.0"
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
       },
-      "bin": {
-        "json5": "lib/cli.js"
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/postcss-loader/node_modules/loader-utils": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+    "node_modules/postcss-loader/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
       "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4.0.0"
+      "peerDependencies": {
+        "ajv": "^6.9.1"
       }
     },
+    "node_modules/postcss-loader/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
     "node_modules/postcss-loader/node_modules/schema-utils": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
       "dev": true,
       "dependencies": {
-        "ajv": "^6.1.0",
-        "ajv-errors": "^1.0.0",
-        "ajv-keywords": "^3.1.0"
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
       },
       "engines": {
-        "node": ">= 4"
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
       }
     },
     "node_modules/postcss-merge-longhand": {
-      "version": "4.0.11",
-      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz",
-      "integrity": "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.0.2.tgz",
+      "integrity": "sha512-BMlg9AXSI5G9TBT0Lo/H3PfUy63P84rVz3BjCFE9e9Y9RXQZD3+h3YO1kgTNsNJy7bBc1YQp8DmSnwLIW5VPcw==",
       "dev": true,
       "dependencies": {
-        "css-color-names": "0.0.4",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0",
-        "stylehacks": "^4.0.0"
+        "css-color-names": "^1.0.1",
+        "postcss-value-parser": "^4.1.0",
+        "stylehacks": "^5.0.1"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/postcss-merge-longhand/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
     "node_modules/postcss-merge-rules": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz",
-      "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.0.2.tgz",
+      "integrity": "sha512-5K+Md7S3GwBewfB4rjDeol6V/RZ8S+v4B66Zk2gChRqLTCC8yjnHQ601omj9TKftS19OPGqZ/XzoqpzNQQLwbg==",
       "dev": true,
       "dependencies": {
-        "browserslist": "^4.0.0",
+        "browserslist": "^4.16.6",
         "caniuse-api": "^3.0.0",
-        "cssnano-util-same-parent": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-selector-parser": "^3.0.0",
-        "vendors": "^1.0.0"
+        "cssnano-utils": "^2.0.1",
+        "postcss-selector-parser": "^6.0.5",
+        "vendors": "^1.0.3"
       },
       "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-merge-rules/node_modules/postcss-selector-parser": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-      "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
-      "dev": true,
-      "dependencies": {
-        "dot-prop": "^5.2.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
+        "node": "^10 || ^12 || >=14.0"
       },
-      "engines": {
-        "node": ">=8"
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
     "node_modules/postcss-minify-font-values": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz",
-      "integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.0.1.tgz",
+      "integrity": "sha512-7JS4qIsnqaxk+FXY1E8dHBDmraYFWmuL6cgt0T1SWGRO5bzJf8sUoelwa4P88LEWJZweHevAiDKxHlofuvtIoA==",
       "dev": true,
       "dependencies": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
+        "postcss-value-parser": "^4.1.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/postcss-minify-font-values/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
     "node_modules/postcss-minify-gradients": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz",
-      "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.0.1.tgz",
+      "integrity": "sha512-odOwBFAIn2wIv+XYRpoN2hUV3pPQlgbJ10XeXPq8UY2N+9ZG42xu45lTn/g9zZ+d70NKSQD6EOi6UiCMu3FN7g==",
       "dev": true,
       "dependencies": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "is-color-stop": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
+        "cssnano-utils": "^2.0.1",
+        "is-color-stop": "^1.1.0",
+        "postcss-value-parser": "^4.1.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/postcss-minify-gradients/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
     "node_modules/postcss-minify-params": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz",
-      "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.0.1.tgz",
+      "integrity": "sha512-4RUC4k2A/Q9mGco1Z8ODc7h+A0z7L7X2ypO1B6V8057eVK6mZ6xwz6QN64nHuHLbqbclkX1wyzRnIrdZehTEHw==",
       "dev": true,
       "dependencies": {
-        "alphanum-sort": "^1.0.0",
-        "browserslist": "^4.0.0",
-        "cssnano-util-get-arguments": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0",
+        "alphanum-sort": "^1.0.2",
+        "browserslist": "^4.16.0",
+        "cssnano-utils": "^2.0.1",
+        "postcss-value-parser": "^4.1.0",
         "uniqs": "^2.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/postcss-minify-params/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
     "node_modules/postcss-minify-selectors": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz",
-      "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.1.0.tgz",
+      "integrity": "sha512-NzGBXDa7aPsAcijXZeagnJBKBPMYLaJJzB8CQh6ncvyl2sIndLVWfbcDi0SBjRWk5VqEjXvf8tYwzoKf4Z07og==",
       "dev": true,
       "dependencies": {
-        "alphanum-sort": "^1.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-selector-parser": "^3.0.0"
+        "alphanum-sort": "^1.0.2",
+        "postcss-selector-parser": "^6.0.5"
       },
       "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-minify-selectors/node_modules/postcss-selector-parser": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-      "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
-      "dev": true,
-      "dependencies": {
-        "dot-prop": "^5.2.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
+        "node": "^10 || ^12 || >=14.0"
       },
-      "engines": {
-        "node": ">=8"
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
     "node_modules/postcss-modules-extract-imports": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz",
-      "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
+      "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
       "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.5"
-      },
       "engines": {
-        "node": ">= 6"
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
       }
     },
     "node_modules/postcss-modules-local-by-default": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz",
-      "integrity": "sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz",
+      "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==",
       "dev": true,
       "dependencies": {
-        "icss-utils": "^4.1.1",
-        "postcss": "^7.0.32",
+        "icss-utils": "^5.0.0",
         "postcss-selector-parser": "^6.0.2",
         "postcss-value-parser": "^4.1.0"
       },
       "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/postcss-modules-local-by-default/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
+        "node": "^10 || ^12 || >= 14"
       },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss-modules-local-by-default/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss-modules-local-by-default/node_modules/chalk/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss-modules-local-by-default/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/postcss-modules-local-by-default/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/postcss-modules-local-by-default/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss-modules-local-by-default/node_modules/postcss": {
-      "version": "7.0.35",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-      "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.2",
-        "source-map": "^0.6.1",
-        "supports-color": "^6.1.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-      }
-    },
-    "node_modules/postcss-modules-local-by-default/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-modules-local-by-default/node_modules/supports-color": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
+      "peerDependencies": {
+        "postcss": "^8.1.0"
       }
     },
     "node_modules/postcss-modules-scope": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz",
-      "integrity": "sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
+      "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
       "dev": true,
       "dependencies": {
-        "postcss": "^7.0.6",
-        "postcss-selector-parser": "^6.0.0"
+        "postcss-selector-parser": "^6.0.4"
       },
       "engines": {
-        "node": ">= 6"
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
       }
     },
     "node_modules/postcss-modules-values": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz",
-      "integrity": "sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
+      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
       "dev": true,
       "dependencies": {
-        "icss-utils": "^4.0.0",
-        "postcss": "^7.0.6"
+        "icss-utils": "^5.0.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
       }
     },
     "node_modules/postcss-normalize-charset": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz",
-      "integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.0.1.tgz",
+      "integrity": "sha512-6J40l6LNYnBdPSk+BHZ8SF+HAkS4q2twe5jnocgd+xWpz/mx/5Sa32m3W1AA8uE8XaXN+eg8trIlfu8V9x61eg==",
       "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.0"
-      },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
     "node_modules/postcss-normalize-display-values": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz",
-      "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.1.tgz",
+      "integrity": "sha512-uupdvWk88kLDXi5HEyI9IaAJTE3/Djbcrqq8YgjvAVuzgVuqIk3SuJWUisT2gaJbZm1H9g5k2w1xXilM3x8DjQ==",
       "dev": true,
       "dependencies": {
-        "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
+        "cssnano-utils": "^2.0.1",
+        "postcss-value-parser": "^4.1.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/postcss-normalize-display-values/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
     "node_modules/postcss-normalize-positions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz",
-      "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.0.1.tgz",
+      "integrity": "sha512-rvzWAJai5xej9yWqlCb1OWLd9JjW2Ex2BCPzUJrbaXmtKtgfL8dBMOOMTX6TnvQMtjk3ei1Lswcs78qKO1Skrg==",
       "dev": true,
       "dependencies": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
+        "postcss-value-parser": "^4.1.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/postcss-normalize-positions/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
     "node_modules/postcss-normalize-repeat-style": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz",
-      "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.1.tgz",
+      "integrity": "sha512-syZ2itq0HTQjj4QtXZOeefomckiV5TaUO6ReIEabCh3wgDs4Mr01pkif0MeVwKyU/LHEkPJnpwFKRxqWA/7O3w==",
       "dev": true,
       "dependencies": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
+        "cssnano-utils": "^2.0.1",
+        "postcss-value-parser": "^4.1.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/postcss-normalize-repeat-style/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
     "node_modules/postcss-normalize-string": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz",
-      "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.0.1.tgz",
+      "integrity": "sha512-Ic8GaQ3jPMVl1OEn2U//2pm93AXUcF3wz+OriskdZ1AOuYV25OdgS7w9Xu2LO5cGyhHCgn8dMXh9bO7vi3i9pA==",
       "dev": true,
       "dependencies": {
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
+        "postcss-value-parser": "^4.1.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/postcss-normalize-string/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
     "node_modules/postcss-normalize-timing-functions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz",
-      "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.0.1.tgz",
+      "integrity": "sha512-cPcBdVN5OsWCNEo5hiXfLUnXfTGtSFiBU9SK8k7ii8UD7OLuznzgNRYkLZow11BkQiiqMcgPyh4ZqXEEUrtQ1Q==",
       "dev": true,
       "dependencies": {
-        "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
+        "cssnano-utils": "^2.0.1",
+        "postcss-value-parser": "^4.1.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/postcss-normalize-timing-functions/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
     "node_modules/postcss-normalize-unicode": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz",
-      "integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.1.tgz",
+      "integrity": "sha512-kAtYD6V3pK0beqrU90gpCQB7g6AOfP/2KIPCVBKJM2EheVsBQmx/Iof+9zR9NFKLAx4Pr9mDhogB27pmn354nA==",
       "dev": true,
       "dependencies": {
-        "browserslist": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
+        "browserslist": "^4.16.0",
+        "postcss-value-parser": "^4.1.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/postcss-normalize-unicode/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
     "node_modules/postcss-normalize-url": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz",
-      "integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.0.2.tgz",
+      "integrity": "sha512-k4jLTPUxREQ5bpajFQZpx8bCF2UrlqOTzP9kEqcEnOfwsRshWs2+oAFIHfDQB8GO2PaUaSE0NlTAYtbluZTlHQ==",
       "dev": true,
       "dependencies": {
-        "is-absolute-url": "^2.0.0",
-        "normalize-url": "^3.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
+        "is-absolute-url": "^3.0.3",
+        "normalize-url": "^6.0.1",
+        "postcss-value-parser": "^4.1.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/postcss-normalize-url/node_modules/normalize-url": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz",
-      "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/postcss-normalize-url/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
     "node_modules/postcss-normalize-whitespace": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz",
-      "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.1.tgz",
+      "integrity": "sha512-iPklmI5SBnRvwceb/XH568yyzK0qRVuAG+a1HFUsFRf11lEJTiQQa03a4RSCQvLKdcpX7XsI1Gen9LuLoqwiqA==",
       "dev": true,
       "dependencies": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
+        "postcss-value-parser": "^4.1.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/postcss-normalize-whitespace/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
     "node_modules/postcss-ordered-values": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz",
-      "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.0.2.tgz",
+      "integrity": "sha512-8AFYDSOYWebJYLyJi3fyjl6CqMEG/UVworjiyK1r573I56kb3e879sCJLGvR3merj+fAdPpVplXKQZv+ey6CgQ==",
       "dev": true,
       "dependencies": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
+        "cssnano-utils": "^2.0.1",
+        "postcss-value-parser": "^4.1.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/postcss-ordered-values/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
     "node_modules/postcss-reduce-initial": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz",
-      "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.0.1.tgz",
+      "integrity": "sha512-zlCZPKLLTMAqA3ZWH57HlbCjkD55LX9dsRyxlls+wfuRfqCi5mSlZVan0heX5cHr154Dq9AfbH70LyhrSAezJw==",
       "dev": true,
       "dependencies": {
-        "browserslist": "^4.0.0",
-        "caniuse-api": "^3.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0"
+        "browserslist": "^4.16.0",
+        "caniuse-api": "^3.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
     "node_modules/postcss-reduce-transforms": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz",
-      "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.1.tgz",
+      "integrity": "sha512-a//FjoPeFkRuAguPscTVmRQUODP+f3ke2HqFNgGPwdYnpeC29RZdCBvGRGTsKpMURb/I3p6jdKoBQ2zI+9Q7kA==",
       "dev": true,
       "dependencies": {
-        "cssnano-util-get-match": "^4.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
+        "cssnano-utils": "^2.0.1",
+        "postcss-value-parser": "^4.1.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/postcss-reduce-transforms/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
     "node_modules/postcss-selector-parser": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz",
-      "integrity": "sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==",
+      "version": "6.0.6",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz",
+      "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==",
       "dev": true,
       "dependencies": {
         "cssesc": "^3.0.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1",
         "util-deprecate": "^1.0.2"
       },
       "engines": {
@@ -23617,38 +23443,36 @@
       }
     },
     "node_modules/postcss-svgo": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz",
-      "integrity": "sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.0.2.tgz",
+      "integrity": "sha512-YzQuFLZu3U3aheizD+B1joQ94vzPfE6BNUcSYuceNxlVnKKsOtdo6hL9/zyC168Q8EwfLSgaDSalsUGa9f2C0A==",
       "dev": true,
       "dependencies": {
-        "is-svg": "^3.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0",
-        "svgo": "^1.0.0"
+        "postcss-value-parser": "^4.1.0",
+        "svgo": "^2.3.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/postcss-svgo/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
     "node_modules/postcss-unique-selectors": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz",
-      "integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.0.1.tgz",
+      "integrity": "sha512-gwi1NhHV4FMmPn+qwBNuot1sG1t2OmacLQ/AX29lzyggnjd+MnVD5uqQmpXO3J17KGL2WAxQruj1qTd3H0gG/w==",
       "dev": true,
       "dependencies": {
-        "alphanum-sort": "^1.0.0",
-        "postcss": "^7.0.0",
+        "alphanum-sort": "^1.0.2",
+        "postcss-selector-parser": "^6.0.5",
         "uniqs": "^2.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
     "node_modules/postcss-value-parser": {
@@ -23657,68 +23481,12 @@
       "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
       "dev": true
     },
-    "node_modules/postcss/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss/node_modules/chalk/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/postcss/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+    "node_modules/postcss/node_modules/colorette": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
+      "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
       "dev": true
     },
-    "node_modules/postcss/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/postcss/node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -23728,22 +23496,10 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/postcss/node_modules/supports-color": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/prebuild-install": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.0.0.tgz",
-      "integrity": "sha512-h2ZJ1PXHKWZpp1caLw0oX9sagVpL2YTk+ZwInQbQ3QqNd4J03O6MpFNmMTJlkfgPENWqe5kP0WjQLqz5OjLfsw==",
+      "version": "6.1.3",
+      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.3.tgz",
+      "integrity": "sha512-iqqSR84tNYQUQHRXalSKdIaM8Ov1QxOVuBNWI7+BzZWv6Ih9k75wOnH1rGQ9WWTaaLkTpxWKIciOF0KyfM74+Q==",
       "optional": true,
       "dependencies": {
         "detect-libc": "^1.0.3",
@@ -23752,15 +23508,13 @@
         "minimist": "^1.2.3",
         "mkdirp-classic": "^0.5.3",
         "napi-build-utils": "^1.0.1",
-        "node-abi": "^2.7.0",
-        "noop-logger": "^0.1.1",
+        "node-abi": "^2.21.0",
         "npmlog": "^4.0.1",
         "pump": "^3.0.0",
         "rc": "^1.2.7",
         "simple-get": "^3.0.3",
         "tar-fs": "^2.0.0",
-        "tunnel-agent": "^0.6.0",
-        "which-pm-runs": "^1.0.0"
+        "tunnel-agent": "^0.6.0"
       },
       "bin": {
         "prebuild-install": "bin.js"
@@ -23786,28 +23540,58 @@
         "node": ">=4"
       }
     },
+    "node_modules/pretty-bytes": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
+      "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/pretty-format": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.5.2.tgz",
-      "integrity": "sha512-VizyV669eqESlkOikKJI8Ryxl/kPpbdLwNdPs2GrbQs18MpySB5S0Yo0N7zkg2xTRiFq4CFw8ct5Vg4a0xP0og==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
+      "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^26.5.2",
+        "@jest/types": "^26.6.2",
         "ansi-regex": "^5.0.0",
         "ansi-styles": "^4.0.0",
-        "react-is": "^16.12.0"
+        "react-is": "^17.0.1"
       },
       "engines": {
         "node": ">= 10"
       }
     },
-    "node_modules/pretty-format/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+    "node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/pretty-format/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
     "node_modules/pretty-hrtime": {
@@ -23851,7 +23635,6 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz",
       "integrity": "sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0=",
-      "dev": true,
       "dependencies": {
         "err-code": "^1.0.0",
         "retry": "^0.10.0"
@@ -23860,23 +23643,14 @@
         "node": ">=0.12"
       }
     },
-    "node_modules/promise-retry/node_modules/retry": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz",
-      "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/prompts": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.2.tgz",
-      "integrity": "sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.1.tgz",
+      "integrity": "sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ==",
       "dev": true,
       "dependencies": {
         "kleur": "^3.0.3",
-        "sisteransi": "^1.0.4"
+        "sisteransi": "^1.0.5"
       },
       "engines": {
         "node": ">= 6"
@@ -23901,21 +23675,12 @@
         "node": ">= 0.3.1"
       }
     },
-    "node_modules/protoduck": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/protoduck/-/protoduck-5.0.1.tgz",
-      "integrity": "sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==",
-      "dev": true,
-      "dependencies": {
-        "genfun": "^5.0.0"
-      }
-    },
     "node_modules/proxy-addr": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
-      "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
       "dependencies": {
-        "forwarded": "~0.1.2",
+        "forwarded": "0.2.0",
         "ipaddr.js": "1.9.1"
       },
       "engines": {
@@ -23941,62 +23706,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/proxy-agent/node_modules/agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-      "dev": true,
-      "dependencies": {
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6.0.0"
-      }
-    },
-    "node_modules/proxy-agent/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/proxy-agent/node_modules/http-proxy-agent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
-      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
-      "dev": true,
-      "dependencies": {
-        "@tootallnate/once": "1",
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/proxy-agent/node_modules/https-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
-      "dev": true,
-      "dependencies": {
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/proxy-agent/node_modules/lru-cache": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
@@ -24006,26 +23715,6 @@
         "yallist": "^3.0.2"
       }
     },
-    "node_modules/proxy-agent/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/proxy-agent/node_modules/socks-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA==",
-      "dev": true,
-      "dependencies": {
-        "agent-base": "6",
-        "debug": "4",
-        "socks": "^2.3.3"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/proxy-agent/node_modules/yallist": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
@@ -24064,9 +23753,9 @@
       }
     },
     "node_modules/public-encrypt/node_modules/bn.js": {
-      "version": "4.11.9",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-      "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
       "dev": true
     },
     "node_modules/pump": {
@@ -24140,19 +23829,6 @@
         "node": ">=0.6"
       }
     },
-    "node_modules/query-string": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
-      "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
-      "dev": true,
-      "dependencies": {
-        "object-assign": "^4.1.0",
-        "strict-uri-encode": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/querystring": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
@@ -24178,6 +23854,25 @@
       "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
       "dev": true
     },
+    "node_modules/queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
     "node_modules/randombytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
@@ -24228,13 +23923,13 @@
       }
     },
     "node_modules/raw-loader": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-4.0.1.tgz",
-      "integrity": "sha512-baolhQBSi3iNh1cglJjA0mYzga+wePk7vdEX//1dTFd+v4TsQlQE0jitJSNF1OIP82rdYulH7otaVmdlDaJ64A==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-4.0.2.tgz",
+      "integrity": "sha512-ZnScIV3ag9A4wPX/ZayxL/jZH+euYb6FcUinPcgiQW0+UBtEv0O6Q3lGd3cqJ+GHH+rksEv3Pj99oxJ3u3VIKA==",
       "dev": true,
       "dependencies": {
         "loader-utils": "^2.0.0",
-        "schema-utils": "^2.6.5"
+        "schema-utils": "^3.0.0"
       },
       "engines": {
         "node": ">= 10.13.0"
@@ -24247,6 +23942,55 @@
         "webpack": "^4.0.0 || ^5.0.0"
       }
     },
+    "node_modules/raw-loader/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/raw-loader/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/raw-loader/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/raw-loader/node_modules/schema-utils": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
     "node_modules/rc": {
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
@@ -24261,10 +24005,23 @@
         "rc": "cli.js"
       }
     },
+    "node_modules/rc/node_modules/ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
+    },
+    "node_modules/rc/node_modules/strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/react-is": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
       "dev": true
     },
     "node_modules/read": {
@@ -24308,6 +24065,14 @@
         "node": ">=6"
       }
     },
+    "node_modules/read-chunk/node_modules/pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/read-package-json": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.2.tgz",
@@ -24320,74 +24085,60 @@
       }
     },
     "node_modules/read-package-json-fast": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz",
-      "integrity": "sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-1.2.2.tgz",
+      "integrity": "sha512-39DbPJjkltEzfXJXB6D8/Ir3GFOU2YbSKa2HaB/Y3nKrc/zY+0XrALpID6/13ezWyzqvOHrBbR4t4cjQuTdBVQ==",
       "dependencies": {
         "json-parse-even-better-errors": "^2.3.0",
         "npm-normalize-package-bin": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/read-package-tree": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.3.1.tgz",
-      "integrity": "sha512-mLUDsD5JVtlZxjSlPPx1RETkNjjvQYuweKwNVt1Sn8kP5Jh44pvYuUHCp6xSVDZWbNxVxG5lyZJ921aJH61sTw==",
-      "dev": true,
-      "dependencies": {
-        "read-package-json": "^2.0.0",
-        "readdir-scoped-modules": "^1.0.0",
-        "util-promisify": "^2.1.0"
       }
     },
     "node_modules/read-pkg": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
-      "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+      "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
       "dev": true,
       "dependencies": {
-        "load-json-file": "^2.0.0",
+        "load-json-file": "^4.0.0",
         "normalize-package-data": "^2.3.2",
-        "path-type": "^2.0.0"
+        "path-type": "^3.0.0"
       },
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/read-pkg-up": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-      "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
+      "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
       "dev": true,
       "dependencies": {
         "find-up": "^2.0.0",
-        "read-pkg": "^2.0.0"
+        "read-pkg": "^3.0.0"
       },
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/read-pkg/node_modules/path-type": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
-      "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+      "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
       "dev": true,
       "dependencies": {
-        "pify": "^2.0.0"
+        "pify": "^3.0.0"
       },
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/read-pkg/node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
       "dev": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=4"
       }
     },
     "node_modules/readable-stream": {
@@ -24404,22 +24155,10 @@
         "util-deprecate": "~1.0.1"
       }
     },
-    "node_modules/readdir-scoped-modules": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz",
-      "integrity": "sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==",
-      "dev": true,
-      "dependencies": {
-        "debuglog": "^1.0.1",
-        "dezalgo": "^1.0.0",
-        "graceful-fs": "^4.1.2",
-        "once": "^1.3.0"
-      }
-    },
     "node_modules/readdirp": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
-      "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
       "dev": true,
       "dependencies": {
         "picomatch": "^2.2.1"
@@ -24447,9 +24186,9 @@
       "dev": true
     },
     "node_modules/regenerate": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.1.tgz",
-      "integrity": "sha512-j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A==",
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
+      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
       "dev": true
     },
     "node_modules/regenerate-unicode-properties": {
@@ -24465,9 +24204,9 @@
       }
     },
     "node_modules/regenerator-runtime": {
-      "version": "0.13.5",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz",
-      "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==",
+      "version": "0.13.7",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
+      "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==",
       "dev": true
     },
     "node_modules/regenerator-transform": {
@@ -24492,45 +24231,33 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/regex-not/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/regex-parser": {
-      "version": "2.2.10",
-      "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.10.tgz",
-      "integrity": "sha512-8t6074A68gHfU8Neftl0Le6KTDwfGAj7IyjPIMSfikI2wJUTHDMaIq42bUsfVnj8mhx0R+45rdUXHGpN164avA==",
+      "version": "2.2.11",
+      "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.11.tgz",
+      "integrity": "sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==",
       "dev": true
     },
     "node_modules/regexp.prototype.flags": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz",
-      "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz",
+      "integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==",
       "dev": true,
       "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/regexp.prototype.flags/node_modules/es-abstract": {
-      "version": "1.17.7",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
-      "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
-      "dev": true,
-      "dependencies": {
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1",
-        "is-callable": "^1.2.2",
-        "is-regex": "^1.1.1",
-        "object-inspect": "^1.8.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.1",
-        "string.prototype.trimend": "^1.0.1",
-        "string.prototype.trimstart": "^1.0.1"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -24540,9 +24267,9 @@
       }
     },
     "node_modules/regexpp": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",
-      "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
       "dev": true,
       "engines": {
         "node": ">=8"
@@ -24606,9 +24333,9 @@
       "dev": true
     },
     "node_modules/regjsparser": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz",
-      "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==",
+      "version": "0.6.9",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.9.tgz",
+      "integrity": "sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==",
       "dev": true,
       "dependencies": {
         "jsesc": "~0.5.0"
@@ -24669,9 +24396,9 @@
       "dev": true
     },
     "node_modules/repeat-element": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
-      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
+      "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -24740,52 +24467,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/request-promise-core": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz",
-      "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==",
-      "dev": true,
-      "dependencies": {
-        "lodash": "^4.17.19"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      },
-      "peerDependencies": {
-        "request": "^2.34"
-      }
-    },
-    "node_modules/request-promise-native": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz",
-      "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==",
-      "deprecated": "request-promise-native has been deprecated because it extends the now deprecated request package, see https://github.com/request/request/issues/3142",
-      "dev": true,
-      "dependencies": {
-        "request-promise-core": "1.1.4",
-        "stealthy-require": "^1.1.1",
-        "tough-cookie": "^2.3.3"
-      },
-      "engines": {
-        "node": ">=0.12.0"
-      },
-      "peerDependencies": {
-        "request": "^2.34"
-      }
-    },
-    "node_modules/request-promise-native/node_modules/tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-      "dev": true,
-      "dependencies": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
     "node_modules/request/node_modules/qs": {
       "version": "6.5.2",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
@@ -24806,6 +24487,15 @@
         "node": ">=0.8"
       }
     },
+    "node_modules/request/node_modules/uuid": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "bin": {
+        "uuid": "bin/uuid"
+      }
+    },
     "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -24825,9 +24515,9 @@
       }
     },
     "node_modules/require-main-filename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
       "dev": true
     },
     "node_modules/requires-port": {
@@ -24837,10 +24527,11 @@
       "dev": true
     },
     "node_modules/resolve": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
+      "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
       "dependencies": {
+        "is-core-module": "^2.1.0",
         "path-parse": "^1.0.6"
       },
       "funding": {
@@ -24848,24 +24539,24 @@
       }
     },
     "node_modules/resolve-cwd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
-      "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
       "dev": true,
       "dependencies": {
-        "resolve-from": "^3.0.0"
+        "resolve-from": "^5.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/resolve-cwd/node_modules/resolve-from": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
       "dev": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/resolve-dir": {
@@ -24909,127 +24600,37 @@
       "dev": true
     },
     "node_modules/resolve-url-loader": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-3.1.1.tgz",
-      "integrity": "sha512-K1N5xUjj7v0l2j/3Sgs5b8CjrrgtC70SmdCuZiJ8tSyb5J+uk3FoeZ4b7yTnH6j7ngI+Bc5bldHJIa8hYdu2gQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-4.0.0.tgz",
+      "integrity": "sha512-05VEMczVREcbtT7Bz+C+96eUO5HDNvdthIiMB34t7FcF8ehcu4wC0sSgPUubs3XW2Q3CNLJk/BJrCU9wVRymiA==",
       "dev": true,
       "dependencies": {
-        "adjust-sourcemap-loader": "2.0.0",
-        "camelcase": "5.3.1",
-        "compose-function": "3.0.3",
-        "convert-source-map": "1.7.0",
-        "es6-iterator": "2.0.3",
-        "loader-utils": "1.2.3",
-        "postcss": "7.0.21",
-        "rework": "1.0.1",
-        "rework-visit": "1.0.0",
+        "adjust-sourcemap-loader": "^4.0.0",
+        "convert-source-map": "^1.7.0",
+        "loader-utils": "^2.0.0",
+        "postcss": "^7.0.35",
         "source-map": "0.6.1"
       },
       "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/resolve-url-loader/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
+        "node": ">=8.9"
       },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/resolve-url-loader/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+      "peerDependencies": {
+        "rework": "1.0.1",
+        "rework-visit": "1.0.0"
       },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/resolve-url-loader/node_modules/chalk/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/resolve-url-loader/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/resolve-url-loader/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/resolve-url-loader/node_modules/emojis-list": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/resolve-url-loader/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/resolve-url-loader/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/resolve-url-loader/node_modules/loader-utils": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
-      "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^2.0.0",
-        "json5": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4.0.0"
+      "peerDependenciesMeta": {
+        "rework": {
+          "optional": true
+        },
+        "rework-visit": {
+          "optional": true
+        }
       }
     },
     "node_modules/resolve-url-loader/node_modules/postcss": {
-      "version": "7.0.21",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.21.tgz",
-      "integrity": "sha512-uIFtJElxJo29QC753JzhidoAhvp/e/Exezkdhfmt8AymWT6/5B7W1WmponYWkHk2eg6sONyTch0A3nkMPun3SQ==",
+      "version": "7.0.36",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz",
+      "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==",
       "dev": true,
       "dependencies": {
         "chalk": "^2.4.2",
@@ -25038,6 +24639,10 @@
       },
       "engines": {
         "node": ">=6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
       }
     },
     "node_modules/resolve-url-loader/node_modules/source-map": {
@@ -25070,34 +24675,16 @@
       }
     },
     "node_modules/restore-cursor": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
-      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "dev": true,
       "dependencies": {
-        "onetime": "^2.0.0",
+        "onetime": "^5.1.0",
         "signal-exit": "^3.0.2"
       },
       "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/restore-cursor/node_modules/mimic-fn": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/restore-cursor/node_modules/onetime": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
-      "dependencies": {
-        "mimic-fn": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/ret": {
@@ -25110,11 +24697,11 @@
       }
     },
     "node_modules/retry": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
-      "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz",
+      "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=",
       "engines": {
-        "node": ">= 4"
+        "node": "*"
       }
     },
     "node_modules/reusify": {
@@ -25126,28 +24713,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/rework": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/rework/-/rework-1.0.1.tgz",
-      "integrity": "sha1-MIBqhBNCtUUQqkEQhQzUhTQUSqc=",
-      "dev": true,
-      "dependencies": {
-        "convert-source-map": "^0.3.3",
-        "css": "^2.0.0"
-      }
-    },
-    "node_modules/rework-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/rework-visit/-/rework-visit-1.0.0.tgz",
-      "integrity": "sha1-mUWygD8hni96ygCtuLyfZA+ELJo=",
-      "dev": true
-    },
-    "node_modules/rework/node_modules/convert-source-map": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz",
-      "integrity": "sha1-8dgClQr33SYxof6+BZZVDIarMZA=",
-      "dev": true
-    },
     "node_modules/rgb-regex": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz",
@@ -25185,9 +24750,9 @@
       }
     },
     "node_modules/rollup": {
-      "version": "2.10.9",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.10.9.tgz",
-      "integrity": "sha512-dY/EbjiWC17ZCUSyk14hkxATAMAShkMsD43XmZGWjLrgFj15M3Dw2kEkA9ns64BiLFm9PKN6vTQw8neHwK74eg==",
+      "version": "2.38.4",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.38.4.tgz",
+      "integrity": "sha512-B0LcJhjiwKkTl79aGVF/u5KdzsH8IylVfV56Ut6c9ouWLJcUK17T83aZBetNYSnZtXf2OHD4+2PbmRW+Fp5ulg==",
       "dev": true,
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -25196,16 +24761,16 @@
         "node": ">=10.0.0"
       },
       "optionalDependencies": {
-        "fsevents": "~2.1.2"
+        "fsevents": "~2.3.1"
       }
     },
     "node_modules/rsvp": {
-      "version": "4.8.5",
-      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
-      "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz",
+      "integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==",
       "dev": true,
       "engines": {
-        "node": "6.* || >= 7.*"
+        "node": "0.12.* || 4.* || 6.* || >= 7.*"
       }
     },
     "node_modules/run-async": {
@@ -25217,9 +24782,26 @@
       }
     },
     "node_modules/run-parallel": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
-      "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q=="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "queue-microtask": "^1.2.2"
+      }
     },
     "node_modules/run-queue": {
       "version": "1.0.3",
@@ -25242,9 +24824,9 @@
       }
     },
     "node_modules/rxjs/node_modules/tslib": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
-      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
     },
     "node_modules/safe-buffer": {
       "version": "5.1.2",
@@ -25299,6 +24881,15 @@
         "normalize-path": "^2.1.1"
       }
     },
+    "node_modules/sane/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/sane/node_modules/braces": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
@@ -25332,6 +24923,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/sane/node_modules/braces/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/sane/node_modules/cross-spawn": {
       "version": "6.0.5",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
@@ -25366,6 +24966,19 @@
         "node": ">=6"
       }
     },
+    "node_modules/sane/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/sane/node_modules/fill-range": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -25393,6 +25006,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/sane/node_modules/fill-range/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/sane/node_modules/get-stream": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
@@ -25447,6 +25069,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/sane/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/sane/node_modules/micromatch": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -25560,9 +25191,9 @@
       }
     },
     "node_modules/sass": {
-      "version": "1.26.5",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.26.5.tgz",
-      "integrity": "sha512-FG2swzaZUiX53YzZSjSakzvGtlds0lcbF+URuU9mxOv7WBh7NhXEVDa4kPKN4hN6fC2TkOTOKqiqp6d53N9X5Q==",
+      "version": "1.32.6",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.6.tgz",
+      "integrity": "sha512-1bcDHDcSqeFtMr0JXI3xc/CXX6c4p0wHHivJdru8W7waM7a1WjKMm4m/Z5sY7CbVw4Whi2Chpcw6DFfSWwGLzQ==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=2.0.0 <4.0.0"
@@ -25575,19 +25206,19 @@
       }
     },
     "node_modules/sass-loader": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.2.tgz",
-      "integrity": "sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==",
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-10.1.1.tgz",
+      "integrity": "sha512-W6gVDXAd5hR/WHsPicvZdjAWHBcEJ44UahgxcIE196fW2ong0ZHMPO1kZuI5q0VlvMQZh32gpv69PLWQm70qrw==",
       "dev": true,
       "dependencies": {
-        "clone-deep": "^4.0.1",
-        "loader-utils": "^1.2.3",
-        "neo-async": "^2.6.1",
-        "schema-utils": "^2.6.1",
-        "semver": "^6.3.0"
+        "klona": "^2.0.4",
+        "loader-utils": "^2.0.0",
+        "neo-async": "^2.6.2",
+        "schema-utils": "^3.0.0",
+        "semver": "^7.3.2"
       },
       "engines": {
-        "node": ">= 8.9.0"
+        "node": ">= 10.13.0"
       },
       "funding": {
         "type": "opencollective",
@@ -25595,7 +25226,7 @@
       },
       "peerDependencies": {
         "fibers": ">= 3.1.0",
-        "node-sass": "^4.0.0",
+        "node-sass": "^4.0.0 || ^5.0.0",
         "sass": "^1.3.0",
         "webpack": "^4.36.0 || ^5.0.0"
       },
@@ -25611,39 +25242,53 @@
         }
       }
     },
-    "node_modules/sass-loader/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+    "node_modules/sass-loader/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
       "dependencies": {
-        "minimist": "^1.2.0"
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
       },
-      "bin": {
-        "json5": "lib/cli.js"
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/sass-loader/node_modules/loader-utils": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+    "node_modules/sass-loader/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/sass-loader/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/sass-loader/node_modules/schema-utils": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
       "dev": true,
       "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^1.0.1"
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
       },
       "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/sass-loader/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
       }
     },
     "node_modules/sax": {
@@ -25681,6 +25326,37 @@
         "url": "https://opencollective.com/webpack"
       }
     },
+    "node_modules/schema-utils/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/schema-utils/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/schema-utils/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
     "node_modules/sdp": {
       "version": "1.5.4",
       "resolved": "https://registry.npmjs.org/sdp/-/sdp-1.5.4.tgz",
@@ -25693,18 +25369,21 @@
       "dev": true
     },
     "node_modules/selfsigned": {
-      "version": "1.10.8",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.8.tgz",
-      "integrity": "sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w==",
+      "version": "1.10.11",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.11.tgz",
+      "integrity": "sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA==",
       "dev": true,
       "dependencies": {
         "node-forge": "^0.10.0"
       }
     },
     "node_modules/semver": {
-      "version": "7.3.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-      "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
+      "version": "7.3.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
+      "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -25784,15 +25463,28 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/send/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/send/node_modules/debug/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+    },
     "node_modules/send/node_modules/ms": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
       "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
     },
     "node_modules/serialize-javascript": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
-      "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
+      "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
       "dev": true,
       "dependencies": {
         "randombytes": "^2.1.0"
@@ -25816,6 +25508,15 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/serve-index/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
     "node_modules/serve-index/node_modules/http-errors": {
       "version": "1.6.3",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
@@ -25837,6 +25538,12 @@
       "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
       "dev": true
     },
+    "node_modules/serve-index/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
     "node_modules/serve-index/node_modules/setprototypeof": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
@@ -25897,6 +25604,36 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/set-value/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/set-value/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/set-value/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/setimmediate": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
@@ -25933,6 +25670,15 @@
         "node": ">=8"
       }
     },
+    "node_modules/shallow-clone/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -25952,6 +25698,17 @@
         "node": ">=8"
       }
     },
+    "node_modules/shelljs": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz",
+      "integrity": "sha1-kEktcv/MgVmXa6umL7D2iE8MM3g=",
+      "bin": {
+        "shjs": "bin/shjs"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
     "node_modules/shellwords": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
@@ -25973,15 +25730,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/side-channel/node_modules/object-inspect": {
-      "version": "1.10.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz",
-      "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/signal-exit": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
@@ -25996,17 +25744,6 @@
         "tail": "^0.4.0"
       }
     },
-    "node_modules/simctl/node_modules/shelljs": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz",
-      "integrity": "sha1-kEktcv/MgVmXa6umL7D2iE8MM3g=",
-      "bin": {
-        "shjs": "bin/shjs"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/simple-concat": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
@@ -26038,30 +25775,6 @@
         "simple-concat": "^1.0.0"
       }
     },
-    "node_modules/simple-get/node_modules/decompress-response": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
-      "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
-      "optional": true,
-      "dependencies": {
-        "mimic-response": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/simple-get/node_modules/mimic-response": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
-      "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
-      "optional": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/simple-plist": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/simple-plist/-/simple-plist-1.1.1.tgz",
@@ -26072,21 +25785,6 @@
         "plist": "^3.0.1"
       }
     },
-    "node_modules/simple-swizzle": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
-      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
-      "dev": true,
-      "dependencies": {
-        "is-arrayish": "^0.3.1"
-      }
-    },
-    "node_modules/simple-swizzle/node_modules/is-arrayish": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
-      "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
-      "dev": true
-    },
     "node_modules/sisteransi": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
@@ -26118,13 +25816,31 @@
         "url": "https://github.com/chalk/slice-ansi?sponsor=1"
       }
     },
-    "node_modules/slice-ansi/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+    "node_modules/slice-ansi/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/slice-ansi/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
     "node_modules/smart-buffer": {
@@ -26181,44 +25897,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/snapdragon-node/node_modules/is-accessor-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-node/node_modules/is-data-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-node/node_modules/is-descriptor": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/snapdragon-node/node_modules/isobject": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
@@ -26252,6 +25930,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/snapdragon/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
     "node_modules/snapdragon/node_modules/define-property": {
       "version": "0.2.5",
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
@@ -26276,6 +25963,83 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/snapdragon/node_modules/is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/is-accessor-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/is-data-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
     "node_modules/snapdragon/node_modules/source-map": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -26285,109 +26049,89 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/sockjs": {
-      "version": "0.3.20",
-      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.20.tgz",
-      "integrity": "sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA==",
+    "node_modules/snapdragon/node_modules/source-map-resolve": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
       "dev": true,
       "dependencies": {
-        "faye-websocket": "^0.10.0",
+        "atob": "^2.1.2",
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
+      }
+    },
+    "node_modules/sockjs": {
+      "version": "0.3.21",
+      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.21.tgz",
+      "integrity": "sha512-DhbPFGpxjc6Z3I+uX07Id5ZO2XwYsWOrYjaSeieES78cq+JaJvVe5q/m1uvjIQhXinhIeCFRH6JgXe+mvVMyXw==",
+      "dev": true,
+      "dependencies": {
+        "faye-websocket": "^0.11.3",
         "uuid": "^3.4.0",
-        "websocket-driver": "0.6.5"
+        "websocket-driver": "^0.7.4"
       }
     },
     "node_modules/sockjs-client": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz",
-      "integrity": "sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.5.1.tgz",
+      "integrity": "sha512-VnVAb663fosipI/m6pqRXakEOw7nvd7TUgdr3PlR/8V2I95QIdwT8L4nMxhyU8SmDBHYXU1TOElaKOmKLfYzeQ==",
       "dev": true,
       "dependencies": {
-        "debug": "^3.2.5",
+        "debug": "^3.2.6",
         "eventsource": "^1.0.7",
-        "faye-websocket": "~0.11.1",
-        "inherits": "^2.0.3",
-        "json3": "^3.3.2",
-        "url-parse": "^1.4.3"
+        "faye-websocket": "^0.11.3",
+        "inherits": "^2.0.4",
+        "json3": "^3.3.3",
+        "url-parse": "^1.5.1"
       }
     },
     "node_modules/sockjs-client/node_modules/debug": {
-      "version": "3.2.6",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
       "dependencies": {
         "ms": "^2.1.1"
       }
     },
-    "node_modules/sockjs-client/node_modules/faye-websocket": {
-      "version": "0.11.3",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz",
-      "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==",
+    "node_modules/sockjs/node_modules/uuid": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
       "dev": true,
-      "dependencies": {
-        "websocket-driver": ">=0.5.1"
-      },
-      "engines": {
-        "node": ">=0.8.0"
+      "bin": {
+        "uuid": "bin/uuid"
       }
     },
-    "node_modules/sockjs-client/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
     "node_modules/socks": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.3.3.tgz",
-      "integrity": "sha512-o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA==",
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.6.1.tgz",
+      "integrity": "sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA==",
       "dependencies": {
-        "ip": "1.1.5",
+        "ip": "^1.1.5",
         "smart-buffer": "^4.1.0"
       },
       "engines": {
-        "node": ">= 6.0.0",
+        "node": ">= 10.13.0",
         "npm": ">= 3.0.0"
       }
     },
     "node_modules/socks-proxy-agent": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz",
-      "integrity": "sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==",
-      "dev": true,
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ==",
       "dependencies": {
-        "agent-base": "~4.2.1",
-        "socks": "~2.3.2"
+        "agent-base": "^6.0.2",
+        "debug": "4",
+        "socks": "^2.3.3"
       },
       "engines": {
         "node": ">= 6"
       }
     },
-    "node_modules/socks-proxy-agent/node_modules/agent-base": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz",
-      "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==",
-      "dev": true,
-      "dependencies": {
-        "es6-promisify": "^5.0.0"
-      },
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
-    "node_modules/sort-keys": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
-      "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
-      "dev": true,
-      "dependencies": {
-        "is-plain-obj": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/source-list-map": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
@@ -26404,16 +26148,17 @@
       }
     },
     "node_modules/source-map-loader": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-1.0.0.tgz",
-      "integrity": "sha512-ZayyQCSCrQazN50aCvuS84lJT4xc1ZAcykH5blHaBdVveSwjiFK8UGMPvao0ho54DTb0Jf7m57uRRG/YYUZ2Fg==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-1.1.3.tgz",
+      "integrity": "sha512-6YHeF+XzDOrT/ycFJNI53cgEsp/tHTMl37hi7uVyqFAlTXW109JazaQCkbc+jjoL2637qkH1amLi+JzrIpt5lA==",
       "dev": true,
       "dependencies": {
-        "data-urls": "^2.0.0",
-        "iconv-lite": "^0.5.1",
+        "abab": "^2.0.5",
+        "iconv-lite": "^0.6.2",
         "loader-utils": "^2.0.0",
-        "schema-utils": "^2.6.6",
-        "source-map": "^0.6.0"
+        "schema-utils": "^3.0.0",
+        "source-map": "^0.6.1",
+        "whatwg-mimetype": "^2.3.0"
       },
       "engines": {
         "node": ">= 10.13.0"
@@ -26426,18 +26171,67 @@
         "webpack": "^4.0.0 || ^5.0.0"
       }
     },
-    "node_modules/source-map-loader/node_modules/iconv-lite": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.2.tgz",
-      "integrity": "sha512-kERHXvpSaB4aU3eANwidg79K8FlrN77m8G9V+0vOR3HYaRifrlwMEpT7ZBJqLSEIHnEgJTHcWK82wwLwwKwtag==",
+    "node_modules/source-map-loader/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
       "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/source-map-loader/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/source-map-loader/node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "dev": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
+    "node_modules/source-map-loader/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/source-map-loader/node_modules/schema-utils": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
     "node_modules/source-map-loader/node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -26448,16 +26242,13 @@
       }
     },
     "node_modules/source-map-resolve": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
-      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz",
+      "integrity": "sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==",
       "dev": true,
       "dependencies": {
         "atob": "^2.1.2",
-        "decode-uri-component": "^0.2.0",
-        "resolve-url": "^0.2.1",
-        "source-map-url": "^0.4.0",
-        "urix": "^0.1.0"
+        "decode-uri-component": "^0.2.0"
       }
     },
     "node_modules/source-map-support": {
@@ -26480,9 +26271,9 @@
       }
     },
     "node_modules/source-map-url": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
-      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
+      "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
       "dev": true
     },
     "node_modules/sourcemap-codec": {
@@ -26524,9 +26315,9 @@
       }
     },
     "node_modules/spdx-license-ids": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz",
-      "integrity": "sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw=="
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz",
+      "integrity": "sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ=="
     },
     "node_modules/spdy": {
       "version": "4.0.2",
@@ -26558,30 +26349,6 @@
         "wbuf": "^1.7.3"
       }
     },
-    "node_modules/spdy-transport/node_modules/debug": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
-      "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
-      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/spdy-transport/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
     "node_modules/spdy-transport/node_modules/readable-stream": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
@@ -26596,105 +26363,83 @@
         "node": ">= 6"
       }
     },
-    "node_modules/spdy/node_modules/debug": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
-      "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
-      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/spdy/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
     "node_modules/speed-measure-webpack-plugin": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.3.tgz",
-      "integrity": "sha512-2ljD4Ch/rz2zG3HsLsnPfp23osuPBS0qPuz9sGpkNXTN1Ic4M+W9xB8l8rS8ob2cO4b1L+WTJw/0AJwWYVgcxQ==",
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.4.2.tgz",
+      "integrity": "sha512-AtVzD0bnIy2/B0fWqJpJgmhcrfWFhBlduzSo0uwplr/QvB33ZNZj2NEth3NONgdnZJqicK0W0mSxnLSbsVCDbw==",
       "dev": true,
       "dependencies": {
-        "chalk": "^2.0.1"
+        "chalk": "^4.1.0"
       },
       "engines": {
         "node": ">=6.0.0"
       },
       "peerDependencies": {
-        "webpack": "^1 || ^2 || ^3 || ^4"
+        "webpack": "^1 || ^2 || ^3 || ^4 || ^5"
       }
     },
     "node_modules/speed-measure-webpack-plugin/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^1.9.0"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/speed-measure-webpack-plugin/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
     "node_modules/speed-measure-webpack-plugin/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
-        "color-name": "1.1.3"
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/speed-measure-webpack-plugin/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
     "node_modules/speed-measure-webpack-plugin/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/speed-measure-webpack-plugin/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/split-string": {
@@ -26709,6 +26454,19 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/split-string/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/split2": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
@@ -26795,9 +26553,9 @@
       }
     },
     "node_modules/stack-utils": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.2.tgz",
-      "integrity": "sha512-0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.3.tgz",
+      "integrity": "sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==",
       "dev": true,
       "dependencies": {
         "escape-string-regexp": "^2.0.0"
@@ -26840,6 +26598,68 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/static-extend/node_modules/is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-extend/node_modules/is-accessor-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-extend/node_modules/is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-extend/node_modules/is-data-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-extend/node_modules/is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/statuses": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
@@ -26848,15 +26668,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/stealthy-require": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
-      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/stream-browserify": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
@@ -26920,15 +26731,6 @@
       "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
       "dev": true
     },
-    "node_modules/strict-uri-encode": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
-      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -26938,9 +26740,9 @@
       }
     },
     "node_modules/string-length": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.1.tgz",
-      "integrity": "sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
+      "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
       "dev": true,
       "dependencies": {
         "char-regex": "^1.0.2",
@@ -26950,48 +26752,17 @@
         "node": ">=10"
       }
     },
-    "node_modules/string-length/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/string-length/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
       "dependencies": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
       },
       "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/string-width/node_modules/strip-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-      "dependencies": {
-        "ansi-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/string.prototype.codepointat": {
@@ -27000,76 +26771,26 @@
       "integrity": "sha512-2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg=="
     },
     "node_modules/string.prototype.trimend": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
-      "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
+      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
       "dev": true,
       "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimend/node_modules/es-abstract": {
-      "version": "1.17.7",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
-      "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
-      "dev": true,
-      "dependencies": {
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1",
-        "is-callable": "^1.2.2",
-        "is-regex": "^1.1.1",
-        "object-inspect": "^1.8.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.1",
-        "string.prototype.trimend": "^1.0.1",
-        "string.prototype.trimstart": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/string.prototype.trimstart": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
-      "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
+      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
       "dev": true,
       "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimstart/node_modules/es-abstract": {
-      "version": "1.17.7",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
-      "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
-      "dev": true,
-      "dependencies": {
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1",
-        "is-callable": "^1.2.2",
-        "is-regex": "^1.1.1",
-        "object-inspect": "^1.8.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.1",
-        "string.prototype.trimend": "^1.0.1",
-        "string.prototype.trimstart": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -27081,22 +26802,14 @@
       "integrity": "sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg=="
     },
     "node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
       "dependencies": {
-        "ansi-regex": "^4.1.0"
+        "ansi-regex": "^5.0.0"
       },
       "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/strip-ansi/node_modules/ansi-regex": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-      "engines": {
-        "node": ">=6"
+        "node": ">=8"
       }
     },
     "node_modules/strip-bom": {
@@ -27124,24 +26837,28 @@
       }
     },
     "node_modules/strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/style-loader": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.2.1.tgz",
-      "integrity": "sha512-ByHSTQvHLkWE9Ir5+lGbVOXhxX10fbprhLvdg96wedFZb4NDekDPxVKv5Fwmio+QcMlkkNfuK+5W1peQ5CUhZg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-2.0.0.tgz",
+      "integrity": "sha512-Z0gYUJmzZ6ZdRUqpg1r8GsaFKypE+3xAzuFeMuoHgjc9KZv3wMyCRjQIWEbhoFSq7+7yoHXySDJyyWQaPajeiQ==",
       "dev": true,
       "dependencies": {
         "loader-utils": "^2.0.0",
-        "schema-utils": "^2.6.6"
+        "schema-utils": "^3.0.0"
       },
       "engines": {
-        "node": ">= 8.9.0"
+        "node": ">= 10.13.0"
       },
       "funding": {
         "type": "opencollective",
@@ -27151,47 +26868,84 @@
         "webpack": "^4.0.0 || ^5.0.0"
       }
     },
-    "node_modules/stylehacks": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz",
-      "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==",
+    "node_modules/style-loader/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
       "dependencies": {
-        "browserslist": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-selector-parser": "^3.0.0"
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/stylehacks/node_modules/postcss-selector-parser": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-      "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
+    "node_modules/style-loader/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/style-loader/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/style-loader/node_modules/schema-utils": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
       "dev": true,
       "dependencies": {
-        "dot-prop": "^5.2.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/stylehacks": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.0.1.tgz",
+      "integrity": "sha512-Es0rVnHIqbWzveU1b24kbw92HsebBepxfcqe5iix7t9j0PQqhs0IxXVXv0pY2Bxa08CgMkzD6OWql7kbGOuEdA==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.16.0",
+        "postcss-selector-parser": "^6.0.4"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
     "node_modules/stylus": {
-      "version": "0.54.7",
-      "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.7.tgz",
-      "integrity": "sha512-Yw3WMTzVwevT6ZTrLCYNHAFmanMxdylelL3hkWNgPMeTCpMwpV3nXjpOHuBXtFv7aiO2xRuQS6OoAdgkNcSNug==",
+      "version": "0.54.8",
+      "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.8.tgz",
+      "integrity": "sha512-vr54Or4BZ7pJafo2mpf0ZcwA74rpuYCZbxrHBsH8kbcXOwSfvBFwsRfpGO5OD5fhG5HDCFW737PKaawI7OqEAg==",
       "dev": true,
       "dependencies": {
         "css-parse": "~2.0.0",
         "debug": "~3.1.0",
-        "glob": "^7.1.3",
-        "mkdirp": "~0.5.x",
+        "glob": "^7.1.6",
+        "mkdirp": "~1.0.4",
         "safer-buffer": "^2.1.2",
         "sax": "~1.2.4",
-        "semver": "^6.0.0",
+        "semver": "^6.3.0",
         "source-map": "^0.7.3"
       },
       "bin": {
@@ -27202,43 +26956,76 @@
       }
     },
     "node_modules/stylus-loader": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz",
-      "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-4.3.3.tgz",
+      "integrity": "sha512-PpWB5PnCXUzW4WMYhCvNzAHJBjIBPMXwsdfkkKuA9W7k8OQFMl/19/AQvaWsxz2IptxUlCseyJ6TY/eEKJ4+UQ==",
       "dev": true,
       "dependencies": {
-        "loader-utils": "^1.0.2",
-        "lodash.clonedeep": "^4.5.0",
-        "when": "~3.6.x"
-      },
-      "peerDependencies": {
-        "stylus": ">=0.52.4"
-      }
-    },
-    "node_modules/stylus-loader/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/stylus-loader/node_modules/loader-utils": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^1.0.1"
+        "fast-glob": "^3.2.4",
+        "klona": "^2.0.4",
+        "loader-utils": "^2.0.0",
+        "normalize-path": "^3.0.0",
+        "schema-utils": "^3.0.0"
       },
       "engines": {
-        "node": ">=4.0.0"
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "stylus": ">=0.52.4",
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/stylus-loader/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/stylus-loader/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/stylus-loader/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/stylus-loader/node_modules/schema-utils": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
       }
     },
     "node_modules/stylus/node_modules/debug": {
@@ -27250,6 +27037,12 @@
         "ms": "2.0.0"
       }
     },
+    "node_modules/stylus/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
     "node_modules/stylus/node_modules/sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
@@ -27312,29 +27105,6 @@
         "ms": "^2.1.1"
       }
     },
-    "node_modules/superagent-proxy/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "dev": true
-    },
-    "node_modules/superagent/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/superagent/node_modules/form-data": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
@@ -27361,12 +27131,6 @@
         "node": ">=4.0.0"
       }
     },
-    "node_modules/superagent/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
     "node_modules/superagent/node_modules/qs": {
       "version": "6.10.1",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz",
@@ -27397,24 +27161,45 @@
       }
     },
     "node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/supports-hyperlinks": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
+      "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0",
+        "supports-color": "^7.0.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/supports-hyperlinks": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz",
-      "integrity": "sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA==",
+    "node_modules/supports-hyperlinks/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-hyperlinks/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0",
-        "supports-color": "^7.0.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
         "node": ">=8"
@@ -27431,107 +27216,210 @@
       }
     },
     "node_modules/svgo": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
-      "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.3.1.tgz",
+      "integrity": "sha512-riDDIQgXpEnn0BEl9Gvhh1LNLIyiusSpt64IR8upJu7MwxnzetmF/Y57pXQD2NMX2lVyMRzXt5f2M5rO4wG7Dw==",
       "dev": true,
       "dependencies": {
-        "chalk": "^2.4.1",
-        "coa": "^2.0.2",
-        "css-select": "^2.0.0",
-        "css-select-base-adapter": "^0.1.1",
-        "css-tree": "1.0.0-alpha.37",
-        "csso": "^4.0.2",
-        "js-yaml": "^3.13.1",
-        "mkdirp": "~0.5.1",
-        "object.values": "^1.1.0",
-        "sax": "~1.2.4",
-        "stable": "^0.1.8",
-        "unquote": "~1.1.1",
-        "util.promisify": "~1.0.0"
+        "@trysound/sax": "0.1.1",
+        "chalk": "^4.1.0",
+        "commander": "^7.1.0",
+        "css-select": "^4.1.3",
+        "css-tree": "^1.1.2",
+        "csso": "^4.2.0",
+        "stable": "^0.1.8"
       },
       "bin": {
         "svgo": "bin/svgo"
       },
       "engines": {
-        "node": ">=4.0.0"
+        "node": ">=10.13.0"
       }
     },
     "node_modules/svgo/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^1.9.0"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/svgo/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
     "node_modules/svgo/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/svgo/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/svgo/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/svgo/node_modules/sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-      "dev": true
-    },
-    "node_modules/svgo/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/svgo/node_modules/commander": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/svgo/node_modules/css-select": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz",
+      "integrity": "sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "^1.0.0",
+        "css-what": "^5.0.0",
+        "domhandler": "^4.2.0",
+        "domutils": "^2.6.0",
+        "nth-check": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/svgo/node_modules/css-what": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.0.1.tgz",
+      "integrity": "sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/svgo/node_modules/dom-serializer": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz",
+      "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.2.0",
+        "entities": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+      }
+    },
+    "node_modules/svgo/node_modules/domelementtype": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
+      "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ]
+    },
+    "node_modules/svgo/node_modules/domhandler": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.2.0.tgz",
+      "integrity": "sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.2.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
+      }
+    },
+    "node_modules/svgo/node_modules/domutils": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.7.0.tgz",
+      "integrity": "sha512-8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg==",
+      "dev": true,
+      "dependencies": {
+        "dom-serializer": "^1.0.1",
+        "domelementtype": "^2.2.0",
+        "domhandler": "^4.2.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domutils?sponsor=1"
+      }
+    },
+    "node_modules/svgo/node_modules/entities": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/svgo/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/svgo/node_modules/nth-check": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.0.tgz",
+      "integrity": "sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q==",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/nth-check?sponsor=1"
+      }
+    },
+    "node_modules/svgo/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
     "node_modules/symbol-observable": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
-      "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-3.0.0.tgz",
+      "integrity": "sha512-6tDOXSHiVjuCaasQSWTmHUWn4PuG7qa3+1WT031yTc/swT7+rLiw3GOrFxaH1E3lLP09dH3bVuVDf2gK5rxG3Q==",
       "dev": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=0.10"
       }
     },
     "node_modules/symbol-tree": {
@@ -27565,14 +27453,13 @@
       }
     },
     "node_modules/table": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.6.0.tgz",
-      "integrity": "sha512-iZMtp5tUvcnAdtHpZTWLPF0M7AgiQsURR2DwmxnJwSy8I3+cY+ozzVvYha3BOLG2TB+L0CqjIz+91htuj6yCXg==",
+      "version": "6.7.1",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz",
+      "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==",
       "dev": true,
       "dependencies": {
         "ajv": "^8.0.1",
         "lodash.clonedeep": "^4.5.0",
-        "lodash.flatten": "^4.4.0",
         "lodash.truncate": "^4.4.2",
         "slice-ansi": "^4.0.0",
         "string-width": "^4.2.0",
@@ -27582,78 +27469,6 @@
         "node": ">=10.0.0"
       }
     },
-    "node_modules/table/node_modules/ajv": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.2.0.tgz",
-      "integrity": "sha512-WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/table/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/table/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/table/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/table/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
-    },
-    "node_modules/table/node_modules/string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/table/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/tail": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/tail/-/tail-0.4.0.tgz",
@@ -27663,18 +27478,18 @@
       }
     },
     "node_modules/tapable": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
-      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz",
+      "integrity": "sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw==",
       "dev": true,
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/tar": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.1.tgz",
-      "integrity": "sha512-GG0R7yt/CQkvG4fueXDi52Zskqxe2AyRJ+Wm54yqarnBgcX3qRIWh10qLVAAN+mlPFGTfP5UxvD3Fbi11UOTUQ==",
+      "version": "6.1.3",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.3.tgz",
+      "integrity": "sha512-3rUqwucgVZXTeyJyL2jqtUau8/8r54SioM1xj3AmTX3HnWQdj2AydfJ2qYYayPyIIznSplcvU9mhBb7dR2XF3w==",
       "dependencies": {
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
@@ -27706,9 +27521,9 @@
       "optional": true
     },
     "node_modules/tar-stream": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.4.tgz",
-      "integrity": "sha512-o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
       "optional": true,
       "dependencies": {
         "bl": "^4.0.3",
@@ -27735,17 +27550,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/tar/node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/term-size": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz",
@@ -27773,64 +27577,37 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/terminal-link/node_modules/ansi-escapes": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.11.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/terminal-link/node_modules/type-fest": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-      "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/terser": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.7.0.tgz",
-      "integrity": "sha512-Lfb0RiZcjRDXCC3OSHJpEkxJ9Qeqs6mp2v4jf2MHfy8vGERmVDuvjXdd/EnP5Deme5F2yBRBymKmKHCBg2echw==",
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.5.1.tgz",
+      "integrity": "sha512-6VGWZNVP2KTUcltUQJ25TtNjx/XgdDsBDKGt8nN0MpydU36LmbPPcMBd2kmtZNNGVVDLg44k7GKeHHj+4zPIBQ==",
       "dev": true,
       "dependencies": {
         "commander": "^2.20.0",
-        "source-map": "~0.6.1",
-        "source-map-support": "~0.5.12"
+        "source-map": "~0.7.2",
+        "source-map-support": "~0.5.19"
       },
       "bin": {
         "terser": "bin/terser"
       },
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=10"
       }
     },
     "node_modules/terser-webpack-plugin": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-3.0.1.tgz",
-      "integrity": "sha512-eFDtq8qPUEa9hXcUzTwKXTnugIVtlqc1Z/ZVhG8LmRT3lgRY13+pQTnFLY2N7ATB6TKCHuW/IGjoAnZz9wOIqw==",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-4.2.3.tgz",
+      "integrity": "sha512-jTgXh40RnvOrLQNgIkwEKnQ8rmHjHK4u+6UBEi+W+FPmvb+uo+chJXntKe7/3lW5mNysgSWD60KyesnhW8D6MQ==",
       "dev": true,
       "dependencies": {
-        "cacache": "^15.0.3",
+        "cacache": "^15.0.5",
         "find-cache-dir": "^3.3.1",
-        "jest-worker": "^26.0.0",
-        "p-limit": "^2.3.0",
-        "schema-utils": "^2.6.6",
-        "serialize-javascript": "^3.0.0",
+        "jest-worker": "^26.5.0",
+        "p-limit": "^3.0.2",
+        "schema-utils": "^3.0.0",
+        "serialize-javascript": "^5.0.1",
         "source-map": "^0.6.1",
-        "terser": "^4.6.13",
+        "terser": "^5.3.4",
         "webpack-sources": "^1.4.3"
       },
       "engines": {
@@ -27844,28 +27621,53 @@
         "webpack": "^4.0.0 || ^5.0.0"
       }
     },
-    "node_modules/terser-webpack-plugin/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+    "node_modules/terser-webpack-plugin/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
       "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/terser-webpack-plugin/node_modules/serialize-javascript": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz",
-      "integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==",
+    "node_modules/terser-webpack-plugin/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
       "dev": true,
       "dependencies": {
-        "randombytes": "^2.1.0"
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
       }
     },
     "node_modules/terser-webpack-plugin/node_modules/source-map": {
@@ -27877,15 +27679,22 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/terser/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+    "node_modules/terser-webpack-plugin/node_modules/webpack-sources": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
       "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "source-list-map": "^2.0.0",
+        "source-map": "~0.6.1"
       }
     },
+    "node_modules/terser/node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
+    },
     "node_modules/test-exclude": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
@@ -27953,9 +27762,9 @@
       }
     },
     "node_modules/timers-browserify": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
-      "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
+      "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
       "dev": true,
       "dependencies": {
         "setimmediate": "^1.0.4"
@@ -28073,6 +27882,19 @@
         "node": ">=8.0"
       }
     },
+    "node_modules/to-regex/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/to-through": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz",
@@ -28107,9 +27929,9 @@
       }
     },
     "node_modules/tr46": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.0.2.tgz",
-      "integrity": "sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
+      "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
       "dev": true,
       "dependencies": {
         "punycode": "^2.1.1"
@@ -28128,18 +27950,17 @@
       }
     },
     "node_modules/ts-jest": {
-      "version": "26.4.1",
-      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-26.4.1.tgz",
-      "integrity": "sha512-F4aFq01aS6mnAAa0DljNmKr/Kk9y4HVZ1m6/rtJ0ED56cuxINGq3Q9eVAh+z5vcYKe5qnTMvv90vE8vUMFxomg==",
+      "version": "26.5.6",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-26.5.6.tgz",
+      "integrity": "sha512-rua+rCP8DxpA8b4DQD/6X2HQS8Zy/xzViVYfEs2OQu68tkCuKLV0Md8pmX55+W24uRIyAsf/BajRfxOs+R2MKA==",
       "dev": true,
       "dependencies": {
-        "@types/jest": "26.x",
         "bs-logger": "0.x",
         "buffer-from": "1.x",
         "fast-json-stable-stringify": "2.x",
         "jest-util": "^26.1.0",
         "json5": "2.x",
-        "lodash.memoize": "4.x",
+        "lodash": "4.x",
         "make-error": "1.x",
         "mkdirp": "1.x",
         "semver": "7.x",
@@ -28156,31 +27977,10 @@
         "typescript": ">=3.8 <5.0"
       }
     },
-    "node_modules/ts-jest/node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "dev": true,
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/ts-jest/node_modules/yargs-parser": {
-      "version": "20.2.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.1.tgz",
-      "integrity": "sha512-yYsjuSkjbLMBp16eaOt7/siKTjNVjMm3SoJnIg3sEh/JsvqVVDyjRKmaJV4cl+lNIgq6QEco2i3gDebJl7/vLA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/ts-md5": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/ts-md5/-/ts-md5-1.2.7.tgz",
-      "integrity": "sha512-emODogvKGWi1KO1l9c6YxLMBn6CEH3VrH5mVPIyOtxBG52BvV4jP3GWz6bOZCz61nLgBc3ffQYE4+EHfCD+V7w=="
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/ts-md5/-/ts-md5-1.2.9.tgz",
+      "integrity": "sha512-/Efr7ZfGf8P+d9HXh0PLQD1CDipqD8j9apCFG96pODDoEaFLxXpV4En6tAc6y3fWyfhFGrqtNBRBS+eLVIB2uQ=="
     },
     "node_modules/ts-node": {
       "version": "8.3.0",
@@ -28219,29 +28019,16 @@
       }
     },
     "node_modules/tsconfig-paths": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz",
-      "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==",
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.10.1.tgz",
+      "integrity": "sha512-rETidPDgCpltxF7MjBZlAFPUHv5aHH2MymyPvh+vEyWAED4Eb/WeMbsnD/JDr4OKPOA1TssDHgIcpTN5Kh0p6Q==",
       "dev": true,
       "dependencies": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
+        "json5": "^2.2.0",
         "minimist": "^1.2.0",
         "strip-bom": "^3.0.0"
       }
     },
-    "node_modules/tsconfig-paths/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
     "node_modules/tsconfig-paths/node_modules/strip-bom": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
@@ -28252,14 +28039,14 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz",
-      "integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ=="
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
+      "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
     },
     "node_modules/tsutils": {
-      "version": "3.17.1",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.17.1.tgz",
-      "integrity": "sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==",
+      "version": "3.21.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
       "dev": true,
       "dependencies": {
         "tslib": "^1.8.1"
@@ -28272,9 +28059,9 @@
       }
     },
     "node_modules/tsutils/node_modules/tslib": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
-      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
       "dev": true
     },
     "node_modules/tty-browserify": {
@@ -28327,11 +28114,15 @@
       }
     },
     "node_modules/type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/type-is": {
@@ -28361,9 +28152,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "3.9.9",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.9.tgz",
-      "integrity": "sha512-kdMjTiekY+z/ubJCATUPlRDl39vXYiMV9iyeMuEuXZh2we6zz80uovNN2WlAxmmdE/Z/YQe+EbOEXB5RHEED3w==",
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.1.6.tgz",
+      "integrity": "sha512-pxnwLxeb/Z5SP80JDRzVjh58KsM6jZHRAOtTpS7sXLS4ogXNKC9ANxHHZqLLeVHZN35jCtI4JdmLLbLiC1kBow==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
@@ -28419,18 +28210,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/unbox-primitive/node_modules/has-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/unc-path-regex": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
@@ -28441,9 +28220,9 @@
       }
     },
     "node_modules/underscore": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.11.0.tgz",
-      "integrity": "sha512-xY96SsN3NA461qIRKZ/+qox37YXPtSBswMGfiNptr+wrt6ds4HaMw23TP612fEyGekRE6LNRiLYr/aqbHXNedw=="
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
+      "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g=="
     },
     "node_modules/undertaker": {
       "version": "1.3.0",
@@ -28536,11 +28315,23 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/uniq": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
-      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
-      "dev": true
+    "node_modules/union-value/node_modules/arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/union-value/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
     "node_modules/uniqs": {
       "version": "2.0.0",
@@ -28586,32 +28377,26 @@
       }
     },
     "node_modules/universal-analytics": {
-      "version": "0.4.20",
-      "resolved": "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.4.20.tgz",
-      "integrity": "sha512-gE91dtMvNkjO+kWsPstHRtSwHXz0l2axqptGYp5ceg4MsuurloM0PU3pdOfpb5zBXUvyjT4PwhWK2m39uczZuw==",
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.4.23.tgz",
+      "integrity": "sha512-lgMIH7XBI6OgYn1woDEmxhGdj8yDefMKg7GkWdeATAlQZFrMrNyxSkpDzY57iY0/6fdlzTbBV03OawvvzG+q7A==",
       "dev": true,
       "dependencies": {
-        "debug": "^3.0.0",
-        "request": "^2.88.0",
+        "debug": "^4.1.1",
+        "request": "^2.88.2",
         "uuid": "^3.0.0"
       }
     },
-    "node_modules/universal-analytics/node_modules/debug": {
-      "version": "3.2.6",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+    "node_modules/universal-analytics/node_modules/uuid": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
       "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
+      "bin": {
+        "uuid": "bin/uuid"
       }
     },
-    "node_modules/universal-analytics/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
     "node_modules/universalify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
@@ -28636,12 +28421,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/unquote": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
-      "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
-      "dev": true
-    },
     "node_modules/unset-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
@@ -28703,7 +28482,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
       "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -28744,6 +28522,62 @@
         "url": "https://github.com/yeoman/update-notifier?sponsor=1"
       }
     },
+    "node_modules/update-notifier/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/update-notifier/node_modules/chalk": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/update-notifier/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/update-notifier/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/update-notifier/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/upper-case": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
@@ -28751,9 +28585,9 @@
       "dev": true
     },
     "node_modules/uri-js": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz",
-      "integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
       "dependencies": {
         "punycode": "^2.1.0"
       }
@@ -28776,9 +28610,9 @@
       }
     },
     "node_modules/url-parse": {
-      "version": "1.4.7",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
-      "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz",
+      "integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==",
       "dev": true,
       "dependencies": {
         "querystringify": "^2.1.1",
@@ -28812,12 +28646,12 @@
       }
     },
     "node_modules/util": {
-      "version": "0.10.3",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
       "dev": true,
       "dependencies": {
-        "inherits": "2.0.1"
+        "inherits": "2.0.3"
       }
     },
     "node_modules/util-deprecate": {
@@ -28825,59 +28659,10 @@
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
-    "node_modules/util-promisify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/util-promisify/-/util-promisify-2.1.0.tgz",
-      "integrity": "sha1-PCI2R2xNMsX/PEcAKt18E7moKlM=",
-      "dev": true,
-      "dependencies": {
-        "object.getownpropertydescriptors": "^2.0.3"
-      }
-    },
-    "node_modules/util.promisify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
-      "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.2",
-        "has-symbols": "^1.0.1",
-        "object.getownpropertydescriptors": "^2.1.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/util.promisify/node_modules/es-abstract": {
-      "version": "1.17.7",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
-      "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
-      "dev": true,
-      "dependencies": {
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1",
-        "is-callable": "^1.2.2",
-        "is-regex": "^1.1.1",
-        "object-inspect": "^1.8.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.1",
-        "string.prototype.trimend": "^1.0.1",
-        "string.prototype.trimstart": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/util/node_modules/inherits": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-      "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
       "dev": true
     },
     "node_modules/utils-merge": {
@@ -28889,12 +28674,12 @@
       }
     },
     "node_modules/uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "dev": true,
       "bin": {
-        "uuid": "bin/uuid"
+        "uuid": "dist/bin/uuid"
       }
     },
     "node_modules/v8-compile-cache": {
@@ -28904,9 +28689,9 @@
       "dev": true
     },
     "node_modules/v8-to-istanbul": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-5.0.1.tgz",
-      "integrity": "sha512-mbDNjuDajqYe3TXFk5qxcQy8L1msXNE37WTlLoqqpBfRsimbNcrlhQlDPntmECEcUvdC+AQ8CyMMf6EUx1r74Q==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz",
+      "integrity": "sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow==",
       "dev": true,
       "dependencies": {
         "@types/istanbul-lib-coverage": "^2.0.1",
@@ -29103,9 +28888,9 @@
       }
     },
     "node_modules/watchpack": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.4.tgz",
-      "integrity": "sha512-aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg==",
+      "version": "1.7.5",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",
+      "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==",
       "dev": true,
       "dependencies": {
         "graceful-fs": "^4.1.2",
@@ -29113,20 +28898,17 @@
       },
       "optionalDependencies": {
         "chokidar": "^3.4.1",
-        "watchpack-chokidar2": "^2.0.0"
+        "watchpack-chokidar2": "^2.0.1"
       }
     },
     "node_modules/watchpack-chokidar2": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz",
-      "integrity": "sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz",
+      "integrity": "sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==",
       "dev": true,
       "optional": true,
       "dependencies": {
         "chokidar": "^2.1.8"
-      },
-      "engines": {
-        "node": "<8.10.0"
       }
     },
     "node_modules/watchpack-chokidar2/node_modules/anymatch": {
@@ -29153,6 +28935,16 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/watchpack-chokidar2/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/watchpack-chokidar2/node_modules/binary-extensions": {
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
@@ -29185,19 +28977,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/watchpack-chokidar2/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/watchpack-chokidar2/node_modules/chokidar": {
       "version": "2.1.8",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
@@ -29222,6 +29001,19 @@
         "fsevents": "^1.2.7"
       }
     },
+    "node_modules/watchpack-chokidar2/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/watchpack-chokidar2/node_modules/fill-range": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -29238,19 +29030,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/watchpack-chokidar2/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/watchpack-chokidar2/node_modules/fsevents": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
@@ -29307,6 +29086,16 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/watchpack-chokidar2/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/watchpack-chokidar2/node_modules/is-number": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -29320,14 +29109,14 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/watchpack-chokidar2/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+    "node_modules/watchpack-chokidar2/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "dev": true,
       "optional": true,
       "dependencies": {
-        "is-buffer": "^1.1.5"
+        "isobject": "^3.0.1"
       },
       "engines": {
         "node": ">=0.10.0"
@@ -29343,6 +29132,19 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/watchpack-chokidar2/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/watchpack-chokidar2/node_modules/micromatch": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -29368,6 +29170,43 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/watchpack-chokidar2/node_modules/micromatch/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/micromatch/node_modules/is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/micromatch/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/watchpack-chokidar2/node_modules/readdirp": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
@@ -29425,9 +29264,9 @@
       }
     },
     "node_modules/webpack": {
-      "version": "4.43.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.43.0.tgz",
-      "integrity": "sha512-GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g==",
+      "version": "4.44.2",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.2.tgz",
+      "integrity": "sha512-6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q==",
       "dev": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.9.0",
@@ -29438,7 +29277,7 @@
         "ajv": "^6.10.2",
         "ajv-keywords": "^3.4.1",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^4.1.0",
+        "enhanced-resolve": "^4.3.0",
         "eslint-scope": "^4.0.3",
         "json-parse-better-errors": "^1.0.2",
         "loader-runner": "^2.4.0",
@@ -29451,7 +29290,7 @@
         "schema-utils": "^1.0.0",
         "tapable": "^1.1.3",
         "terser-webpack-plugin": "^1.4.3",
-        "watchpack": "^1.6.1",
+        "watchpack": "^1.7.4",
         "webpack-sources": "^1.4.1"
       },
       "bin": {
@@ -29463,6 +29302,14 @@
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/webpack"
+      },
+      "peerDependenciesMeta": {
+        "webpack-cli": {
+          "optional": true
+        },
+        "webpack-command": {
+          "optional": true
+        }
       }
     },
     "node_modules/webpack-dev-middleware": {
@@ -29484,20 +29331,10 @@
         "webpack": "^4.0.0"
       }
     },
-    "node_modules/webpack-dev-middleware/node_modules/memory-fs": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
-      "dev": true,
-      "dependencies": {
-        "errno": "^0.1.3",
-        "readable-stream": "^2.0.1"
-      }
-    },
     "node_modules/webpack-dev-middleware/node_modules/mime": {
-      "version": "2.4.6",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
-      "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
+      "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
       "dev": true,
       "bin": {
         "mime": "cli.js"
@@ -29506,10 +29343,22 @@
         "node": ">=4.0.0"
       }
     },
+    "node_modules/webpack-dev-middleware/node_modules/mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
     "node_modules/webpack-dev-server": {
-      "version": "3.11.0",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz",
-      "integrity": "sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg==",
+      "version": "3.11.2",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.2.tgz",
+      "integrity": "sha512-A80BkuHRQfCiNtGBS1EMf2ChTUs0x+B3wGDFmOeT4rmJOHhHTCH2naNxIHhmkr0/UillP4U3yeIyv1pNp+QDLQ==",
       "dev": true,
       "dependencies": {
         "ansi-html": "0.0.7",
@@ -29532,11 +29381,11 @@
         "p-retry": "^3.0.1",
         "portfinder": "^1.0.26",
         "schema-utils": "^1.0.0",
-        "selfsigned": "^1.10.7",
+        "selfsigned": "^1.10.8",
         "semver": "^6.3.0",
         "serve-index": "^1.9.1",
-        "sockjs": "0.3.20",
-        "sockjs-client": "1.4.0",
+        "sockjs": "^0.3.21",
+        "sockjs-client": "^1.5.0",
         "spdy": "^4.0.2",
         "strip-ansi": "^3.0.1",
         "supports-color": "^6.1.0",
@@ -29561,6 +29410,31 @@
         }
       }
     },
+    "node_modules/webpack-dev-server/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
     "node_modules/webpack-dev-server/node_modules/ansi-regex": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
@@ -29592,6 +29466,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/webpack-dev-server/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/webpack-dev-server/node_modules/binary-extensions": {
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
@@ -29622,16 +29505,13 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/webpack-dev-server/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+    "node_modules/webpack-dev-server/node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
       "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6"
       }
     },
     "node_modules/webpack-dev-server/node_modules/chokidar": {
@@ -29657,22 +29537,54 @@
         "fsevents": "^1.2.7"
       }
     },
-    "node_modules/webpack-dev-server/node_modules/debug": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
-      "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
-      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+    "node_modules/webpack-dev-server/node_modules/cliui": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
       "dev": true,
       "dependencies": {
-        "ms": "2.1.2"
+        "string-width": "^3.1.0",
+        "strip-ansi": "^5.2.0",
+        "wrap-ansi": "^5.1.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/cliui/node_modules/ansi-regex": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/cliui/node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^4.1.0"
       },
       "engines": {
-        "node": ">=6.0"
+        "node": ">=6"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "dev": true
+    },
+    "node_modules/webpack-dev-server/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
       },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
     "node_modules/webpack-dev-server/node_modules/fill-range": {
@@ -29690,16 +29602,16 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/webpack-dev-server/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+    "node_modules/webpack-dev-server/node_modules/find-up": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
       "dev": true,
       "dependencies": {
-        "is-extendable": "^0.1.0"
+        "locate-path": "^3.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6"
       }
     },
     "node_modules/webpack-dev-server/node_modules/fsevents": {
@@ -29743,22 +29655,20 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/webpack-dev-server/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+    "node_modules/webpack-dev-server/node_modules/import-local": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
+      "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
       "dev": true,
+      "dependencies": {
+        "pkg-dir": "^3.0.0",
+        "resolve-cwd": "^2.0.0"
+      },
+      "bin": {
+        "import-local-fixture": "fixtures/cli.js"
+      },
       "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/is-absolute-url": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz",
-      "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
+        "node": ">=6"
       }
     },
     "node_modules/webpack-dev-server/node_modules/is-binary-path": {
@@ -29773,6 +29683,24 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/webpack-dev-server/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/webpack-dev-server/node_modules/is-number": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -29785,13 +29713,13 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/webpack-dev-server/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+    "node_modules/webpack-dev-server/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "dev": true,
       "dependencies": {
-        "is-buffer": "^1.1.5"
+        "isobject": "^3.0.1"
       },
       "engines": {
         "node": ">=0.10.0"
@@ -29806,6 +29734,37 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/webpack-dev-server/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/webpack-dev-server/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/locate-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/webpack-dev-server/node_modules/micromatch": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -29830,11 +29789,78 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/webpack-dev-server/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
+    "node_modules/webpack-dev-server/node_modules/micromatch/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/micromatch/node_modules/is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/micromatch/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/p-locate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/pkg-dir": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
     },
     "node_modules/webpack-dev-server/node_modules/readdirp": {
       "version": "2.2.1",
@@ -29850,6 +29876,33 @@
         "node": ">=0.10"
       }
     },
+    "node_modules/webpack-dev-server/node_modules/require-main-filename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+      "dev": true
+    },
+    "node_modules/webpack-dev-server/node_modules/resolve-cwd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
+      "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
+      "dev": true,
+      "dependencies": {
+        "resolve-from": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/resolve-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/webpack-dev-server/node_modules/schema-utils": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
@@ -29873,6 +29926,41 @@
         "semver": "bin/semver.js"
       }
     },
+    "node_modules/webpack-dev-server/node_modules/string-width": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^7.0.1",
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/string-width/node_modules/ansi-regex": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/string-width/node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/webpack-dev-server/node_modules/strip-ansi": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
@@ -29910,6 +29998,90 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/webpack-dev-server/node_modules/which-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+      "dev": true
+    },
+    "node_modules/webpack-dev-server/node_modules/wrap-ansi": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.0",
+        "string-width": "^3.0.0",
+        "strip-ansi": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/wrap-ansi/node_modules/ansi-regex": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/wrap-ansi/node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/ws": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
+      "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
+      "dev": true,
+      "dependencies": {
+        "async-limiter": "~1.0.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/y18n": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+      "dev": true
+    },
+    "node_modules/webpack-dev-server/node_modules/yargs": {
+      "version": "13.3.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+      "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^5.0.0",
+        "find-up": "^3.0.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^3.0.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^13.1.2"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/yargs-parser": {
+      "version": "13.1.2",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      }
+    },
     "node_modules/webpack-log": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
@@ -29923,23 +30095,49 @@
         "node": ">= 6"
       }
     },
+    "node_modules/webpack-log/node_modules/ansi-colors": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
+      "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/webpack-log/node_modules/uuid": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "dev": true,
+      "bin": {
+        "uuid": "bin/uuid"
+      }
+    },
     "node_modules/webpack-merge": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
-      "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==",
+      "version": "5.7.3",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.7.3.tgz",
+      "integrity": "sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA==",
       "dev": true,
       "dependencies": {
-        "lodash": "^4.17.15"
+        "clone-deep": "^4.0.1",
+        "wildcard": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
       }
     },
     "node_modules/webpack-sources": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.2.0.tgz",
+      "integrity": "sha512-bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w==",
       "dev": true,
       "dependencies": {
-        "source-list-map": "^2.0.0",
-        "source-map": "~0.6.1"
+        "source-list-map": "^2.0.1",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=10.13.0"
       }
     },
     "node_modules/webpack-sources/node_modules/source-map": {
@@ -29952,9 +30150,9 @@
       }
     },
     "node_modules/webpack-subresource-integrity": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.4.1.tgz",
-      "integrity": "sha512-XMLFInbGbB1HV7K4vHWANzc1CN0t/c4bBvnlvGxGwV45yE/S/feAXIm8dJsCkzqWtSKnmaEgTp/meyeThxG4Iw==",
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.5.2.tgz",
+      "integrity": "sha512-GBWYBoyalbo5YClwWop9qe6Zclp8CIXYGIz12OPclJhIrSplDxs1Ls1JDMH8xBPPrg1T6ISaTW9Y6zOrwEiAzw==",
       "dev": true,
       "dependencies": {
         "webpack-sources": "^1.3.0"
@@ -29963,8 +30161,8 @@
         "node": ">=4"
       },
       "peerDependencies": {
-        "html-webpack-plugin": "^2.21.0 || ~3 || >=4.0.0-alpha.2 <5",
-        "webpack": "^1.12.11 || ~2 || ~3 || ~4"
+        "html-webpack-plugin": ">= 2.21.0 < 5",
+        "webpack": ">= 1.12.11 < 6"
       },
       "peerDependenciesMeta": {
         "html-webpack-plugin": {
@@ -29972,6 +30170,71 @@
         }
       }
     },
+    "node_modules/webpack-subresource-integrity/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-subresource-integrity/node_modules/webpack-sources": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+      "dev": true,
+      "dependencies": {
+        "source-list-map": "^2.0.0",
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/webpack/node_modules/acorn": {
+      "version": "6.4.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
+      "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/webpack/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/webpack/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/webpack/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/webpack/node_modules/braces": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
@@ -30005,6 +30268,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/webpack/node_modules/braces/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/webpack/node_modules/cacache": {
       "version": "12.0.4",
       "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
@@ -30034,6 +30306,65 @@
       "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
       "dev": true
     },
+    "node_modules/webpack/node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
+    },
+    "node_modules/webpack/node_modules/enhanced-resolve": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz",
+      "integrity": "sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "memory-fs": "^0.5.0",
+        "tapable": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/webpack/node_modules/enhanced-resolve/node_modules/memory-fs": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
+      "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
+      "dev": true,
+      "dependencies": {
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=4.3.0 <5.0.0 || >=5.10"
+      }
+    },
+    "node_modules/webpack/node_modules/eslint-scope": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/webpack/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/webpack/node_modules/fill-range": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -30061,6 +30392,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/webpack/node_modules/fill-range/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/webpack/node_modules/find-cache-dir": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
@@ -30075,6 +30415,18 @@
         "node": ">=6"
       }
     },
+    "node_modules/webpack/node_modules/find-up": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/webpack/node_modules/is-number": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -30117,6 +30469,12 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/webpack/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
     "node_modules/webpack/node_modules/json5": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
@@ -30129,6 +30487,15 @@
         "json5": "lib/cli.js"
       }
     },
+    "node_modules/webpack/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/webpack/node_modules/loader-utils": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
@@ -30143,6 +30510,19 @@
         "node": ">=4.0.0"
       }
     },
+    "node_modules/webpack/node_modules/locate-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/webpack/node_modules/lru-cache": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
@@ -30165,16 +30545,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/webpack/node_modules/memory-fs": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
-      "dev": true,
-      "dependencies": {
-        "errno": "^0.1.3",
-        "readable-stream": "^2.0.1"
-      }
-    },
     "node_modules/webpack/node_modules/micromatch": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -30199,6 +30569,66 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/webpack/node_modules/mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/webpack/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/webpack/node_modules/p-locate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/webpack/node_modules/pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/webpack/node_modules/pkg-dir": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/webpack/node_modules/rimraf": {
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -30234,6 +30664,15 @@
         "semver": "bin/semver"
       }
     },
+    "node_modules/webpack/node_modules/serialize-javascript": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
+      "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+      "dev": true,
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
     "node_modules/webpack/node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -30244,14 +30683,40 @@
       }
     },
     "node_modules/webpack/node_modules/ssri": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz",
+      "integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==",
       "dev": true,
       "dependencies": {
         "figgy-pudding": "^3.5.1"
       }
     },
+    "node_modules/webpack/node_modules/tapable": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
+      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/webpack/node_modules/terser": {
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
+      "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
+      "dev": true,
+      "dependencies": {
+        "commander": "^2.20.0",
+        "source-map": "~0.6.1",
+        "source-map-support": "~0.5.12"
+      },
+      "bin": {
+        "terser": "bin/terser"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
     "node_modules/webpack/node_modules/terser-webpack-plugin": {
       "version": "1.4.5",
       "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz",
@@ -30288,6 +30753,22 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/webpack/node_modules/webpack-sources": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+      "dev": true,
+      "dependencies": {
+        "source-list-map": "^2.0.0",
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/webpack/node_modules/y18n": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+      "dev": true
+    },
     "node_modules/webpack/node_modules/yallist": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
@@ -30307,15 +30788,17 @@
       }
     },
     "node_modules/websocket-driver": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz",
-      "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=",
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
+      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
       "dev": true,
       "dependencies": {
+        "http-parser-js": ">=0.5.1",
+        "safe-buffer": ">=5.1.0",
         "websocket-extensions": ">=0.1.1"
       },
       "engines": {
-        "node": ">=0.6.0"
+        "node": ">=0.8.0"
       }
     },
     "node_modules/websocket-extensions": {
@@ -30343,25 +30826,19 @@
       "dev": true
     },
     "node_modules/whatwg-url": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.3.0.tgz",
-      "integrity": "sha512-BQRf/ej5Rp3+n7k0grQXZj9a1cHtsp4lqj01p59xBWFKdezR8sO37XnpafwNqiFac/v2Il12EIMjX/Y4VZtT8Q==",
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
+      "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
       "dev": true,
       "dependencies": {
-        "lodash.sortby": "^4.7.0",
-        "tr46": "^2.0.2",
+        "lodash": "^4.7.0",
+        "tr46": "^2.1.0",
         "webidl-conversions": "^6.1.0"
       },
       "engines": {
         "node": ">=10"
       }
     },
-    "node_modules/when": {
-      "version": "3.6.4",
-      "resolved": "https://registry.npmjs.org/when/-/when-3.6.4.tgz",
-      "integrity": "sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=",
-      "dev": true
-    },
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -30393,16 +30870,10 @@
       }
     },
     "node_modules/which-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-      "dev": true
-    },
-    "node_modules/which-pm-runs": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz",
-      "integrity": "sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=",
-      "optional": true
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
+      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
+      "dev": true
     },
     "node_modules/wide-align": {
       "version": "1.1.3",
@@ -30412,6 +30883,45 @@
         "string-width": "^1.0.2 || 2"
       }
     },
+    "node_modules/wide-align/node_modules/ansi-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/wide-align/node_modules/is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/wide-align/node_modules/string-width": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "dependencies": {
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/wide-align/node_modules/strip-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+      "dependencies": {
+        "ansi-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/widest-line": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
@@ -30423,173 +30933,27 @@
         "node": ">=8"
       }
     },
-    "node_modules/widest-line/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/widest-line/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-    },
-    "node_modules/widest-line/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/widest-line/node_modules/string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/widest-line/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
+    "node_modules/wildcard": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
+      "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
+      "dev": true
     },
     "node_modules/windows-release": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-3.3.3.tgz",
-      "integrity": "sha512-OSOGH1QYiW5yVor9TtmXKQvt2vjQqbYS+DqmsZw+r7xDwLXEeT3JGW0ZppFmHx4diyXmxt238KFR3N9jzevBRg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-4.0.0.tgz",
+      "integrity": "sha512-OxmV4wzDKB1x7AZaZgXMVsdJ1qER1ed83ZrTYd5Bwq2HfJVg3DJS8nqlAG4sMoJ7mu8cuRmLEYyU13BKwctRAg==",
+      "dev": true,
       "dependencies": {
-        "execa": "^1.0.0"
+        "execa": "^4.0.2"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=10"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/windows-release/node_modules/cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-      "dependencies": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      },
-      "engines": {
-        "node": ">=4.8"
-      }
-    },
-    "node_modules/windows-release/node_modules/execa": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-      "dependencies": {
-        "cross-spawn": "^6.0.0",
-        "get-stream": "^4.0.0",
-        "is-stream": "^1.1.0",
-        "npm-run-path": "^2.0.0",
-        "p-finally": "^1.0.0",
-        "signal-exit": "^3.0.0",
-        "strip-eof": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/windows-release/node_modules/get-stream": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/windows-release/node_modules/is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/windows-release/node_modules/npm-run-path": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-      "dependencies": {
-        "path-key": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/windows-release/node_modules/path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/windows-release/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/windows-release/node_modules/shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-      "dependencies": {
-        "shebang-regex": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/windows-release/node_modules/shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/windows-release/node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
     "node_modules/with-open-file": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/with-open-file/-/with-open-file-0.1.7.tgz",
@@ -30603,6 +30967,14 @@
         "node": ">=6"
       }
     },
+    "node_modules/with-open-file/node_modules/pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
@@ -30622,9 +30994,9 @@
       }
     },
     "node_modules/worker-plugin": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/worker-plugin/-/worker-plugin-4.0.3.tgz",
-      "integrity": "sha512-7hFDYWiKcE3yHZvemsoM9lZis/PzurHAEX1ej8PLCu818Rt6QqUAiDdxHPCKZctzmhqzPpcFSgvMCiPbtooqAg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/worker-plugin/-/worker-plugin-5.0.0.tgz",
+      "integrity": "sha512-AXMUstURCxDD6yGam2r4E34aJg6kW85IiaeX72hi+I1cxyaMUtrvVY6sbfpGKAj5e7f68Acl62BjQF5aOOx2IQ==",
       "dev": true,
       "dependencies": {
         "loader-utils": "^1.1.0"
@@ -30660,58 +31032,47 @@
       }
     },
     "node_modules/wrap-ansi": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^3.2.0",
-        "string-width": "^3.0.0",
-        "strip-ansi": "^5.0.0"
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
     "node_modules/wrap-ansi/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^1.9.0"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/wrap-ansi/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/wrap-ansi/node_modules/string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=7.0.0"
       }
     },
     "node_modules/wrappy": {
@@ -30742,25 +31103,57 @@
         "typedarray-to-buffer": "^3.1.5"
       }
     },
-    "node_modules/ws": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
-      "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
+    "node_modules/write/node_modules/mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
       "dev": true,
       "dependencies": {
-        "async-limiter": "~1.0.0"
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/ws": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz",
+      "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
       }
     },
     "node_modules/xcode": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/xcode/-/xcode-2.1.0.tgz",
-      "integrity": "sha512-uCrmPITrqTEzhn0TtT57fJaNaw8YJs1aCzs+P/QqxsDbvPZSv7XMPPwXrKvHtD6pLjBM/NaVwraWJm8q83Y4iQ==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/xcode/-/xcode-3.0.1.tgz",
+      "integrity": "sha512-kCz5k7J7XbJtjABOvkc5lJmkiDh8VhjVCGNiqdKCscmVpdVUpEAyXv1xmCLkQJ5dsHqx3IPO4XW+NTDhU/fatA==",
       "dependencies": {
-        "simple-plist": "^1.0.0",
-        "uuid": "^3.3.2"
+        "simple-plist": "^1.1.0",
+        "uuid": "^7.0.3"
       },
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/xcode/node_modules/uuid": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
+      "integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==",
+      "bin": {
+        "uuid": "dist/bin/uuid"
       }
     },
     "node_modules/xdg-basedir": {
@@ -30797,12 +31190,11 @@
       "dev": true
     },
     "node_modules/xmldom": {
-      "version": "0.1.31",
-      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.31.tgz",
-      "integrity": "sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==",
-      "deprecated": "Deprecated due to CVE-2021-21366 resolved in 0.5.0",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.5.0.tgz",
+      "integrity": "sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA==",
       "engines": {
-        "node": ">=0.1"
+        "node": ">=10.0.0"
       }
     },
     "node_modules/xregexp": {
@@ -30824,108 +31216,53 @@
       }
     },
     "node_modules/y18n": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
-      "dev": true
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
     },
     "node_modules/yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     },
+    "node_modules/yaml": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/yargs": {
-      "version": "13.3.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-      "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
       "dev": true,
       "dependencies": {
-        "cliui": "^5.0.0",
-        "find-up": "^3.0.0",
-        "get-caller-file": "^2.0.1",
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
         "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^3.0.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^13.1.2"
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
     "node_modules/yargs-parser": {
-      "version": "13.1.2",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+      "version": "20.2.9",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
       "dev": true,
-      "dependencies": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      }
-    },
-    "node_modules/yargs/node_modules/find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^3.0.0"
-      },
       "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yargs/node_modules/locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yargs/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yargs/node_modules/p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yargs/node_modules/string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=6"
+        "node": ">=10"
       }
     },
     "node_modules/yauzl": {
@@ -30947,6 +31284,18 @@
         "node": ">=6"
       }
     },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/zone.js": {
       "version": "0.10.3",
       "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.10.3.tgz",
@@ -30955,20 +31304,20 @@
   },
   "dependencies": {
     "@angular-devkit/architect": {
-      "version": "0.1101.2",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1101.2.tgz",
-      "integrity": "sha512-MLmBfHiiyPhbFSSAX4oMecPjEuBauOui5uBpI6BKNnk/7783fznbkbAKjXlOco7M81gkNeEoHMR8c+mOfcvv7g==",
+      "version": "0.1200.5",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1200.5.tgz",
+      "integrity": "sha512-222VZ4OeaDK3vON8V5m+w15SRWfUs5uOb4H9ij/H9/6tyHD83uWfCDoOGg+ax4wJVdWEFJIS+Vn4ijGcZCq9WQ==",
       "dev": true,
       "peer": true,
       "requires": {
-        "@angular-devkit/core": "11.1.2",
-        "rxjs": "6.6.3"
+        "@angular-devkit/core": "12.0.5",
+        "rxjs": "6.6.7"
       },
       "dependencies": {
         "rxjs": {
-          "version": "6.6.3",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
-          "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
+          "version": "6.6.7",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+          "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
           "dev": true,
           "peer": true,
           "requires": {
@@ -30985,105 +31334,113 @@
       }
     },
     "@angular-devkit/build-angular": {
-      "version": "0.1000.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.1000.8.tgz",
-      "integrity": "sha512-wwDN2oadQvYPL7lDmvGsoWQjW++0ZnxWk1QVlABGhBSIs8Uxs26Hjd5YNUSsvJavBkqb1UZIOilqzb4dig5MIA==",
+      "version": "0.1102.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.1102.14.tgz",
+      "integrity": "sha512-SyX9SK3qfpk6xNIrxpxYi8zxP/cN2kny4I+XYbkKvgGiE3qhkrC/PRJE9OWj0sloekLD0CDfFWOvIiw3GMc4Tg==",
       "dev": true,
       "requires": {
-        "@angular-devkit/architect": "0.1000.8",
-        "@angular-devkit/build-optimizer": "0.1000.8",
-        "@angular-devkit/build-webpack": "0.1000.8",
-        "@angular-devkit/core": "10.0.8",
-        "@babel/core": "7.9.6",
-        "@babel/generator": "7.9.6",
-        "@babel/plugin-transform-runtime": "7.9.6",
-        "@babel/preset-env": "7.9.6",
-        "@babel/runtime": "7.9.6",
-        "@babel/template": "7.8.6",
-        "@jsdevtools/coverage-istanbul-loader": "3.0.3",
-        "@ngtools/webpack": "10.0.8",
-        "ajv": "6.12.3",
-        "autoprefixer": "9.8.0",
-        "babel-loader": "8.1.0",
+        "@angular-devkit/architect": "0.1102.14",
+        "@angular-devkit/build-optimizer": "0.1102.14",
+        "@angular-devkit/build-webpack": "0.1102.14",
+        "@angular-devkit/core": "11.2.14",
+        "@babel/core": "7.12.10",
+        "@babel/generator": "7.12.11",
+        "@babel/plugin-transform-async-to-generator": "7.12.1",
+        "@babel/plugin-transform-runtime": "7.12.10",
+        "@babel/preset-env": "7.12.11",
+        "@babel/runtime": "7.12.5",
+        "@babel/template": "7.12.7",
+        "@discoveryjs/json-ext": "0.5.2",
+        "@jsdevtools/coverage-istanbul-loader": "3.0.5",
+        "@ngtools/webpack": "11.2.14",
+        "ansi-colors": "4.1.1",
+        "autoprefixer": "10.2.4",
+        "babel-loader": "8.2.2",
         "browserslist": "^4.9.1",
-        "cacache": "15.0.3",
+        "cacache": "15.0.5",
         "caniuse-lite": "^1.0.30001032",
-        "circular-dependency-plugin": "5.2.0",
-        "copy-webpack-plugin": "6.0.3",
-        "core-js": "3.6.4",
-        "css-loader": "3.5.3",
-        "cssnano": "4.1.10",
-        "file-loader": "6.0.0",
+        "circular-dependency-plugin": "5.2.2",
+        "copy-webpack-plugin": "6.3.2",
+        "core-js": "3.8.3",
+        "critters": "0.0.7",
+        "css-loader": "5.0.1",
+        "cssnano": "5.0.2",
+        "file-loader": "6.2.0",
         "find-cache-dir": "3.3.1",
         "glob": "7.1.6",
-        "jest-worker": "26.0.0",
+        "https-proxy-agent": "5.0.0",
+        "inquirer": "7.3.3",
+        "jest-worker": "26.6.2",
         "karma-source-map-support": "1.4.0",
-        "less-loader": "6.1.0",
-        "license-webpack-plugin": "2.2.0",
+        "less": "4.1.1",
+        "less-loader": "7.3.0",
+        "license-webpack-plugin": "2.3.11",
         "loader-utils": "2.0.0",
-        "mini-css-extract-plugin": "0.9.0",
+        "mini-css-extract-plugin": "1.3.5",
         "minimatch": "3.0.4",
-        "open": "7.0.4",
-        "parse5": "4.0.0",
+        "open": "7.4.0",
+        "ora": "5.3.0",
+        "parse5-html-rewriting-stream": "6.0.1",
         "pnp-webpack-plugin": "1.6.4",
-        "postcss": "7.0.31",
-        "postcss-import": "12.0.1",
-        "postcss-loader": "3.0.0",
-        "raw-loader": "4.0.1",
-        "regenerator-runtime": "0.13.5",
-        "resolve-url-loader": "3.1.1",
+        "postcss": "8.2.15",
+        "postcss-import": "14.0.0",
+        "postcss-loader": "4.2.0",
+        "raw-loader": "4.0.2",
+        "regenerator-runtime": "0.13.7",
+        "resolve-url-loader": "4.0.0",
         "rimraf": "3.0.2",
-        "rollup": "2.10.9",
-        "rxjs": "6.5.5",
-        "sass": "1.26.5",
-        "sass-loader": "8.0.2",
-        "semver": "7.3.2",
+        "rollup": "2.38.4",
+        "rxjs": "6.6.3",
+        "sass": "1.32.6",
+        "sass-loader": "10.1.1",
+        "semver": "7.3.4",
         "source-map": "0.7.3",
-        "source-map-loader": "1.0.0",
+        "source-map-loader": "1.1.3",
         "source-map-support": "0.5.19",
-        "speed-measure-webpack-plugin": "1.3.3",
-        "style-loader": "1.2.1",
-        "stylus": "0.54.7",
-        "stylus-loader": "3.0.2",
-        "terser": "4.7.0",
-        "terser-webpack-plugin": "3.0.1",
+        "speed-measure-webpack-plugin": "1.4.2",
+        "style-loader": "2.0.0",
+        "stylus": "0.54.8",
+        "stylus-loader": "4.3.3",
+        "terser": "5.5.1",
+        "terser-webpack-plugin": "4.2.3",
+        "text-table": "0.2.0",
         "tree-kill": "1.2.2",
-        "webpack": "4.43.0",
+        "webpack": "4.44.2",
         "webpack-dev-middleware": "3.7.2",
-        "webpack-dev-server": "3.11.0",
-        "webpack-merge": "4.2.2",
-        "webpack-sources": "1.4.3",
-        "webpack-subresource-integrity": "1.4.1",
-        "worker-plugin": "4.0.3"
+        "webpack-dev-server": "3.11.2",
+        "webpack-merge": "5.7.3",
+        "webpack-sources": "2.2.0",
+        "webpack-subresource-integrity": "1.5.2",
+        "worker-plugin": "5.0.0"
       },
       "dependencies": {
         "@angular-devkit/architect": {
-          "version": "0.1000.8",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1000.8.tgz",
-          "integrity": "sha512-2AqPbiEugtPxNz4MGhLh+imUVelhW9h1cdJs2AbxZosIxftPb5DNDQUSAwVmRGp4CtcXVrlvcDwc0f4Fw1aiIA==",
+          "version": "0.1102.14",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.14.tgz",
+          "integrity": "sha512-965TVXuBtRb8RySgxRxUEO+YTd7mT0xiqVHSe+MHvMtUCmEE9vwRofFZl6axkK5ri4fiomiMnOVE19aw4spgNQ==",
           "dev": true,
           "requires": {
-            "@angular-devkit/core": "10.0.8",
-            "rxjs": "6.5.5"
+            "@angular-devkit/core": "11.2.14",
+            "rxjs": "6.6.3"
           }
         },
         "@angular-devkit/core": {
-          "version": "10.0.8",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
-          "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
+          "version": "11.2.14",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
+          "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
           "dev": true,
           "requires": {
-            "ajv": "6.12.3",
+            "ajv": "6.12.6",
             "fast-json-stable-stringify": "2.1.0",
             "magic-string": "0.25.7",
-            "rxjs": "6.5.5",
+            "rxjs": "6.6.3",
             "source-map": "0.7.3"
           }
         },
         "ajv": {
-          "version": "6.12.3",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-          "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
@@ -31093,123 +31450,150 @@
           }
         },
         "core-js": {
-          "version": "3.6.4",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
-          "integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==",
+          "version": "3.8.3",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.8.3.tgz",
+          "integrity": "sha512-KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q==",
           "dev": true
         },
-        "open": {
-          "version": "7.0.4",
-          "resolved": "https://registry.npmjs.org/open/-/open-7.0.4.tgz",
-          "integrity": "sha512-brSA+/yq+b08Hsr4c8fsEW2CRzk1BmfN3SAK/5VCHQ9bdoZJ4qa/+AfR0xHjlbbZUyPkUHs1b8x1RqdyZdkVqQ==",
-          "dev": true,
-          "requires": {
-            "is-docker": "^2.0.0",
-            "is-wsl": "^2.1.1"
-          }
-        }
-      }
-    },
-    "@angular-devkit/build-optimizer": {
-      "version": "0.1000.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.1000.8.tgz",
-      "integrity": "sha512-esODHuTGEEMx1SmLUq03VAMly8gZUd1vRuvZeKS5HqKwDg8ZzcI7/25BuuUSlyST+6BEdjo2gnmagQnG0VBdQw==",
-      "dev": true,
-      "requires": {
-        "loader-utils": "2.0.0",
-        "source-map": "0.7.3",
-        "tslib": "2.0.0",
-        "webpack-sources": "1.4.3"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.0.tgz",
-          "integrity": "sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==",
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
           "dev": true
-        }
-      }
-    },
-    "@angular-devkit/build-webpack": {
-      "version": "0.1000.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1000.8.tgz",
-      "integrity": "sha512-y/U+dV5N8W7KECncGSKQWoUH/DFNZCseczyl6LAd8bc0fMr8Z0TAIe8OXj+5CSRRdejWfRIxGtNWM+L2kTCU8A==",
-      "dev": true,
-      "requires": {
-        "@angular-devkit/architect": "0.1000.8",
-        "@angular-devkit/core": "10.0.8",
-        "rxjs": "6.5.5"
-      },
-      "dependencies": {
-        "@angular-devkit/architect": {
-          "version": "0.1000.8",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1000.8.tgz",
-          "integrity": "sha512-2AqPbiEugtPxNz4MGhLh+imUVelhW9h1cdJs2AbxZosIxftPb5DNDQUSAwVmRGp4CtcXVrlvcDwc0f4Fw1aiIA==",
-          "dev": true,
-          "requires": {
-            "@angular-devkit/core": "10.0.8",
-            "rxjs": "6.5.5"
-          }
-        },
-        "@angular-devkit/core": {
-          "version": "10.0.8",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
-          "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
-          "dev": true,
-          "requires": {
-            "ajv": "6.12.3",
-            "fast-json-stable-stringify": "2.1.0",
-            "magic-string": "0.25.7",
-            "rxjs": "6.5.5",
-            "source-map": "0.7.3"
-          }
-        },
-        "ajv": {
-          "version": "6.12.3",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-          "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        }
-      }
-    },
-    "@angular-devkit/core": {
-      "version": "11.1.2",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.1.2.tgz",
-      "integrity": "sha512-V7zOMqL2l56JcwXVyswkG+7+t67r9XtkrVzRcG2Z5ZYwafU+iKWMwg5kBFZr1SX7fM1M9E4MpskxqtagQeUKng==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "ajv": "6.12.6",
-        "fast-json-stable-stringify": "2.1.0",
-        "magic-string": "0.25.7",
-        "rxjs": "6.6.3",
-        "source-map": "0.7.3"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
         },
         "rxjs": {
           "version": "6.6.3",
           "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
           "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
           "dev": true,
+          "requires": {
+            "tslib": "^1.9.0"
+          }
+        },
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+          "dev": true
+        }
+      }
+    },
+    "@angular-devkit/build-optimizer": {
+      "version": "0.1102.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.1102.14.tgz",
+      "integrity": "sha512-1j69rFqE6tPMO0lQvOH8ogF7vE+p+Ws1/OtdZKUkZPOerIbQ8A3n5wzCx6/ZzMVhBQ3sXNhaShb4b9/1YuwU/g==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "2.0.0",
+        "source-map": "0.7.3",
+        "tslib": "2.1.0",
+        "typescript": "4.1.5",
+        "webpack-sources": "2.2.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz",
+          "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==",
+          "dev": true
+        },
+        "typescript": {
+          "version": "4.1.5",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.1.5.tgz",
+          "integrity": "sha512-6OSu9PTIzmn9TCDiovULTnET6BgXtDYL4Gg4szY+cGsc3JP1dQL8qvE8kShTRx1NIw4Q9IBHlwODjkjWEtMUyA==",
+          "dev": true
+        }
+      }
+    },
+    "@angular-devkit/build-webpack": {
+      "version": "0.1102.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1102.14.tgz",
+      "integrity": "sha512-+dJvzrwjbHY0bNr8fUDVbn4D4pAT/h1YVpGVyaoX7q66LN0x61zRC3e10gJ/Mr54l3yfc26M0OPD9KG8iZRbCA==",
+      "dev": true,
+      "requires": {
+        "@angular-devkit/architect": "0.1102.14",
+        "@angular-devkit/core": "11.2.14",
+        "rxjs": "6.6.3"
+      },
+      "dependencies": {
+        "@angular-devkit/architect": {
+          "version": "0.1102.14",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.14.tgz",
+          "integrity": "sha512-965TVXuBtRb8RySgxRxUEO+YTd7mT0xiqVHSe+MHvMtUCmEE9vwRofFZl6axkK5ri4fiomiMnOVE19aw4spgNQ==",
+          "dev": true,
+          "requires": {
+            "@angular-devkit/core": "11.2.14",
+            "rxjs": "6.6.3"
+          }
+        },
+        "@angular-devkit/core": {
+          "version": "11.2.14",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
+          "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
+          "dev": true,
+          "requires": {
+            "ajv": "6.12.6",
+            "fast-json-stable-stringify": "2.1.0",
+            "magic-string": "0.25.7",
+            "rxjs": "6.6.3",
+            "source-map": "0.7.3"
+          }
+        },
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        },
+        "rxjs": {
+          "version": "6.6.3",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
+          "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
+          "dev": true,
+          "requires": {
+            "tslib": "^1.9.0"
+          }
+        },
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+          "dev": true
+        }
+      }
+    },
+    "@angular-devkit/core": {
+      "version": "12.0.5",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-12.0.5.tgz",
+      "integrity": "sha512-zVSQV+8/vjUjsUKGlj8Kf5LioA6AXJTGI0yhHW9q1dFX4dPpbW63k0R1UoIB2wJ0F/AbYVgpnPGPe9BBm2fvZA==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "ajv": "8.2.0",
+        "ajv-formats": "2.0.2",
+        "fast-json-stable-stringify": "2.1.0",
+        "magic-string": "0.25.7",
+        "rxjs": "6.6.7",
+        "source-map": "0.7.3"
+      },
+      "dependencies": {
+        "rxjs": {
+          "version": "6.6.7",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+          "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+          "dev": true,
           "peer": true,
           "requires": {
             "tslib": "^1.9.0"
@@ -31225,339 +31609,253 @@
       }
     },
     "@angular-devkit/schematics": {
-      "version": "10.0.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.0.8.tgz",
-      "integrity": "sha512-p2PjvrExuzOe/azyOEcBeIgwZIk4D6VeLkJf/KVjhXOVu13pjIXHX7/qWl+IYnbtj3NZGHqXM5Cr8nxsJNIMpw==",
+      "version": "12.1.4",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.1.4.tgz",
+      "integrity": "sha512-yD3y3pK/K5piOgvALFoCCiPp4H8emNa3yZL+vlpEpewVLpF1MM55LeTxc0PI5s0uqtOGVnvcbA5wYgMm3YsUEA==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "10.0.8",
-        "ora": "4.0.4",
-        "rxjs": "6.5.5"
+        "@angular-devkit/core": "12.1.4",
+        "ora": "5.4.1",
+        "rxjs": "6.6.7"
       },
       "dependencies": {
         "@angular-devkit/core": {
-          "version": "10.0.8",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
-          "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
+          "version": "12.1.4",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-12.1.4.tgz",
+          "integrity": "sha512-KOzGD8JbP/7EeUwPiU5x+fo3ZEQ5R4IVW5WoH92PaO3mdpqXC7UL2MWLct8PUe9il9nqJMvrBMldSSvP9PCT2w==",
           "dev": true,
           "requires": {
-            "ajv": "6.12.3",
+            "ajv": "8.6.0",
+            "ajv-formats": "2.1.0",
             "fast-json-stable-stringify": "2.1.0",
             "magic-string": "0.25.7",
-            "rxjs": "6.5.5",
+            "rxjs": "6.6.7",
             "source-map": "0.7.3"
           }
         },
         "ajv": {
-          "version": "6.12.3",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-          "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+          "version": "8.6.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz",
+          "integrity": "sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
+            "json-schema-traverse": "^1.0.0",
+            "require-from-string": "^2.0.2",
             "uri-js": "^4.2.2"
           }
+        },
+        "ajv-formats": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.0.tgz",
+          "integrity": "sha512-USH2jBb+C/hIpwD2iRjp0pe0k+MvzG0mlSn/FIdCgQhUb9ALPRjt2KIQdfZDS9r0ZIeUAg7gOu9KL0PFqGqr5Q==",
+          "dev": true,
+          "requires": {
+            "ajv": "^8.0.0"
+          }
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "ora": {
+          "version": "5.4.1",
+          "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
+          "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
+          "dev": true,
+          "requires": {
+            "bl": "^4.1.0",
+            "chalk": "^4.1.0",
+            "cli-cursor": "^3.1.0",
+            "cli-spinners": "^2.5.0",
+            "is-interactive": "^1.0.0",
+            "is-unicode-supported": "^0.1.0",
+            "log-symbols": "^4.1.0",
+            "strip-ansi": "^6.0.0",
+            "wcwidth": "^1.0.1"
+          }
+        },
+        "rxjs": {
+          "version": "6.6.7",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+          "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+          "dev": true,
+          "requires": {
+            "tslib": "^1.9.0"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+          "dev": true
         }
       }
     },
     "@angular-eslint/builder": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-4.2.0.tgz",
-      "integrity": "sha512-qM4hpweuQ14ul8CU6LKpUWFZs6POUE7HZKdTllUrYuoZMrTpNB1XGelR0pweYzbfo4XRnUaO1NVgWhWOWiD5MA==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-4.3.0.tgz",
+      "integrity": "sha512-OzCA4jyELbHt8pyRuW6asib26rc+Ihr2SDjp+uoMivfpqjWVPOw0CvvEZj4SbpGvYOHtcAezyS526D2q2tKHvg==",
       "dev": true,
       "requires": {}
     },
     "@angular-eslint/eslint-plugin": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-4.2.0.tgz",
-      "integrity": "sha512-G8D8Pso6GcHW8vFkUSvgoKPIOtGTqO+eb5aytGtpogMgzxBRyr0juU/9Uz5dAhO6TOERIj1gPpJQ61R/n/Aaew==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-4.3.0.tgz",
+      "integrity": "sha512-an0fyKzPmpWp9OnstZYXFSCvKnc14F8xfl+HXqvynOiBK63cWTZLlzO+7Z4t3pQiSuiXsEYleRPktWkNWGv0tQ==",
       "dev": true,
       "requires": {
         "@typescript-eslint/experimental-utils": "4.16.1"
-      },
-      "dependencies": {
-        "@typescript-eslint/experimental-utils": {
-          "version": "4.16.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.16.1.tgz",
-          "integrity": "sha512-0Hm3LSlMYFK17jO4iY3un1Ve9x1zLNn4EM50Lia+0EV99NdbK+cn0er7HC7IvBA23mBg3P+8dUkMXy4leL33UQ==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.3",
-            "@typescript-eslint/scope-manager": "4.16.1",
-            "@typescript-eslint/types": "4.16.1",
-            "@typescript-eslint/typescript-estree": "4.16.1",
-            "eslint-scope": "^5.0.0",
-            "eslint-utils": "^2.0.0"
-          }
-        },
-        "@typescript-eslint/scope-manager": {
-          "version": "4.16.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.16.1.tgz",
-          "integrity": "sha512-6IlZv9JaurqV0jkEg923cV49aAn8V6+1H1DRfhRcvZUrptQ+UtSKHb5kwTayzOYTJJ/RsYZdcvhOEKiBLyc0Cw==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "4.16.1",
-            "@typescript-eslint/visitor-keys": "4.16.1"
-          }
-        },
-        "@typescript-eslint/types": {
-          "version": "4.16.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.16.1.tgz",
-          "integrity": "sha512-nnKqBwMgRlhzmJQF8tnFDZWfunXmJyuXj55xc8Kbfup4PbkzdoDXZvzN8//EiKR27J6vUSU8j4t37yUuYPiLqA==",
-          "dev": true
-        },
-        "@typescript-eslint/typescript-estree": {
-          "version": "4.16.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.16.1.tgz",
-          "integrity": "sha512-m8I/DKHa8YbeHt31T+UGd/l8Kwr0XCTCZL3H4HMvvLCT7HU9V7yYdinTOv1gf/zfqNeDcCgaFH2BMsS8x6NvJg==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "4.16.1",
-            "@typescript-eslint/visitor-keys": "4.16.1",
-            "debug": "^4.1.1",
-            "globby": "^11.0.1",
-            "is-glob": "^4.0.1",
-            "semver": "^7.3.2",
-            "tsutils": "^3.17.1"
-          }
-        },
-        "@typescript-eslint/visitor-keys": {
-          "version": "4.16.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.16.1.tgz",
-          "integrity": "sha512-s/aIP1XcMkEqCNcPQtl60ogUYjSM8FU2mq1O7y5cFf3Xcob1z1iXWNB6cC43Op+NGRTFgGolri6s8z/efA9i1w==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "4.16.1",
-            "eslint-visitor-keys": "^2.0.0"
-          }
-        },
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "eslint-scope": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-          "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-          "dev": true,
-          "requires": {
-            "esrecurse": "^4.3.0",
-            "estraverse": "^4.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
       }
     },
     "@angular-eslint/eslint-plugin-template": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-4.2.0.tgz",
-      "integrity": "sha512-LC8qqqqVmA/OJAsUt6fQCXLmWP5BL30XFvVsPtrORdxMFt0HI1gvkuz5EVak7PeAXEmerdVarNZr5zmCXIWf3g==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-4.3.0.tgz",
+      "integrity": "sha512-5DuCvEa3cYx0G2mZtECAwgJ19xJWAFZ8Fu8mIkKDiof1dcUISs1PvECJ6NhdzfxEJp0McPQn1jtOK0IDRX1eJw==",
       "dev": true,
       "requires": {
         "@typescript-eslint/experimental-utils": "4.16.1",
         "aria-query": "^4.2.2",
         "axobject-query": "^2.2.0"
-      },
-      "dependencies": {
-        "@typescript-eslint/experimental-utils": {
-          "version": "4.16.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.16.1.tgz",
-          "integrity": "sha512-0Hm3LSlMYFK17jO4iY3un1Ve9x1zLNn4EM50Lia+0EV99NdbK+cn0er7HC7IvBA23mBg3P+8dUkMXy4leL33UQ==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.3",
-            "@typescript-eslint/scope-manager": "4.16.1",
-            "@typescript-eslint/types": "4.16.1",
-            "@typescript-eslint/typescript-estree": "4.16.1",
-            "eslint-scope": "^5.0.0",
-            "eslint-utils": "^2.0.0"
-          }
-        },
-        "@typescript-eslint/scope-manager": {
-          "version": "4.16.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.16.1.tgz",
-          "integrity": "sha512-6IlZv9JaurqV0jkEg923cV49aAn8V6+1H1DRfhRcvZUrptQ+UtSKHb5kwTayzOYTJJ/RsYZdcvhOEKiBLyc0Cw==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "4.16.1",
-            "@typescript-eslint/visitor-keys": "4.16.1"
-          }
-        },
-        "@typescript-eslint/types": {
-          "version": "4.16.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.16.1.tgz",
-          "integrity": "sha512-nnKqBwMgRlhzmJQF8tnFDZWfunXmJyuXj55xc8Kbfup4PbkzdoDXZvzN8//EiKR27J6vUSU8j4t37yUuYPiLqA==",
-          "dev": true
-        },
-        "@typescript-eslint/typescript-estree": {
-          "version": "4.16.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.16.1.tgz",
-          "integrity": "sha512-m8I/DKHa8YbeHt31T+UGd/l8Kwr0XCTCZL3H4HMvvLCT7HU9V7yYdinTOv1gf/zfqNeDcCgaFH2BMsS8x6NvJg==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "4.16.1",
-            "@typescript-eslint/visitor-keys": "4.16.1",
-            "debug": "^4.1.1",
-            "globby": "^11.0.1",
-            "is-glob": "^4.0.1",
-            "semver": "^7.3.2",
-            "tsutils": "^3.17.1"
-          }
-        },
-        "@typescript-eslint/visitor-keys": {
-          "version": "4.16.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.16.1.tgz",
-          "integrity": "sha512-s/aIP1XcMkEqCNcPQtl60ogUYjSM8FU2mq1O7y5cFf3Xcob1z1iXWNB6cC43Op+NGRTFgGolri6s8z/efA9i1w==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "4.16.1",
-            "eslint-visitor-keys": "^2.0.0"
-          }
-        },
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "eslint-scope": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-          "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-          "dev": true,
-          "requires": {
-            "esrecurse": "^4.3.0",
-            "estraverse": "^4.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
       }
     },
     "@angular-eslint/schematics": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-4.2.0.tgz",
-      "integrity": "sha512-aohGcfYUqN2hFLWaZoOqkLDyYVDFoLC3LwgIknoaDqWkvFG/RUTg1X1pCFjddLQYP5ist8+OppHH+gnYMbftEw==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-4.3.0.tgz",
+      "integrity": "sha512-zHEpvWoT0mdylQw/K7+RccBK2rJq0to6ZbIp9i65+RZZTHbscaJaDISFvBHm5RNwEhoWI7sJ14ci66pnpAxx3g==",
       "dev": true,
       "requires": {
-        "@angular-eslint/eslint-plugin": "4.2.0",
-        "@angular-eslint/eslint-plugin-template": "4.2.0",
+        "@angular-eslint/eslint-plugin": "4.3.0",
+        "@angular-eslint/eslint-plugin-template": "4.3.0",
         "ignore": "5.1.8",
         "strip-json-comments": "3.1.1",
         "tmp": "0.2.1"
-      },
-      "dependencies": {
-        "strip-json-comments": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-          "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-          "dev": true
-        }
       }
     },
     "@angular-eslint/template-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-4.2.0.tgz",
-      "integrity": "sha512-77lJ9MDNWmW4ik9l3g149iO9SGRx3qLGZvfSTwmbPxpCgNripWerla9Ia1X+gLkitI8CLpcpiZybxH3EWxj/qQ==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-4.3.0.tgz",
+      "integrity": "sha512-TH+UCrDmOWNLgNgTTR46+wpvgJ3q9Vf9kzqUA5vUNbg/Hhrdbi++DPeCiKagSAXkNBQavqcmyYuT9fzUReIDIg==",
       "dev": true,
       "requires": {
         "eslint-scope": "^5.1.0"
-      },
-      "dependencies": {
-        "eslint-scope": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-          "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-          "dev": true,
-          "requires": {
-            "esrecurse": "^4.3.0",
-            "estraverse": "^4.1.1"
-          }
-        }
       }
     },
     "@angular/animations": {
-      "version": "10.0.14",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-10.0.14.tgz",
-      "integrity": "sha512-0BOGQOuaudIG0pq6FAnG55teKM7tEQZdIwdoOf0okhh9n0cFWSWRUjvUxWt25bWswlO+HxELyJioiRUvVSES4g==",
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-11.2.14.tgz",
+      "integrity": "sha512-Heq/nNrCmb3jbkusu+BQszOecfFI/31Oxxj+CDQkqqYpBcswk6bOJLoEE472o+vmgxaXbgeflU9qbIiCQhpMFA==",
       "requires": {
         "tslib": "^2.0.0"
       }
     },
     "@angular/cli": {
-      "version": "10.0.8",
-      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-10.0.8.tgz",
-      "integrity": "sha512-unTteffLepsFw7qQulHOLLyLqCpQMOaZo0WO4x6cQGcW2mc0WgwnwBW2JDYMx1U2434t/Q13LqYMPNYWyCGsog==",
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-11.2.14.tgz",
+      "integrity": "sha512-8Ud7vcUK7CKjzT2Ks1glLhleAPIC5ChcrA15XtOb7k+/uMHBkMscP/UKymbVQiBjCJlglbzJoyj8cpVYTZY5KA==",
       "dev": true,
       "requires": {
-        "@angular-devkit/architect": "0.1000.8",
-        "@angular-devkit/core": "10.0.8",
-        "@angular-devkit/schematics": "10.0.8",
-        "@schematics/angular": "10.0.8",
-        "@schematics/update": "0.1000.8",
+        "@angular-devkit/architect": "0.1102.14",
+        "@angular-devkit/core": "11.2.14",
+        "@angular-devkit/schematics": "11.2.14",
+        "@schematics/angular": "11.2.14",
+        "@schematics/update": "0.1102.14",
         "@yarnpkg/lockfile": "1.1.0",
         "ansi-colors": "4.1.1",
-        "debug": "4.1.1",
-        "ini": "1.3.5",
-        "inquirer": "7.1.0",
-        "npm-package-arg": "8.0.1",
+        "debug": "4.3.1",
+        "ini": "2.0.0",
+        "inquirer": "7.3.3",
+        "jsonc-parser": "3.0.0",
+        "npm-package-arg": "8.1.0",
         "npm-pick-manifest": "6.1.0",
-        "open": "7.0.4",
-        "pacote": "9.5.12",
-        "read-package-tree": "5.3.1",
+        "open": "7.4.0",
+        "ora": "5.3.0",
+        "pacote": "11.2.4",
+        "resolve": "1.19.0",
         "rimraf": "3.0.2",
-        "semver": "7.3.2",
-        "symbol-observable": "1.2.0",
-        "universal-analytics": "0.4.20",
-        "uuid": "8.1.0"
+        "semver": "7.3.4",
+        "symbol-observable": "3.0.0",
+        "universal-analytics": "0.4.23",
+        "uuid": "8.3.2"
       },
       "dependencies": {
         "@angular-devkit/architect": {
-          "version": "0.1000.8",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1000.8.tgz",
-          "integrity": "sha512-2AqPbiEugtPxNz4MGhLh+imUVelhW9h1cdJs2AbxZosIxftPb5DNDQUSAwVmRGp4CtcXVrlvcDwc0f4Fw1aiIA==",
+          "version": "0.1102.14",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.14.tgz",
+          "integrity": "sha512-965TVXuBtRb8RySgxRxUEO+YTd7mT0xiqVHSe+MHvMtUCmEE9vwRofFZl6axkK5ri4fiomiMnOVE19aw4spgNQ==",
           "dev": true,
           "requires": {
-            "@angular-devkit/core": "10.0.8",
-            "rxjs": "6.5.5"
+            "@angular-devkit/core": "11.2.14",
+            "rxjs": "6.6.3"
           }
         },
         "@angular-devkit/core": {
-          "version": "10.0.8",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
-          "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
+          "version": "11.2.14",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
+          "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
           "dev": true,
           "requires": {
-            "ajv": "6.12.3",
+            "ajv": "6.12.6",
             "fast-json-stable-stringify": "2.1.0",
             "magic-string": "0.25.7",
-            "rxjs": "6.5.5",
+            "rxjs": "6.6.3",
             "source-map": "0.7.3"
           }
         },
+        "@angular-devkit/schematics": {
+          "version": "11.2.14",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.14.tgz",
+          "integrity": "sha512-Ol6+0qdGKzuVJm5gCtQr47X0OCihTfAxI4h047cHYhPFIGGPSvkG/QeJMZugflgoobi2k/xcYokOu/VAkRtWbQ==",
+          "dev": true,
+          "requires": {
+            "@angular-devkit/core": "11.2.14",
+            "ora": "5.3.0",
+            "rxjs": "6.6.3"
+          }
+        },
         "ajv": {
-          "version": "6.12.3",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-          "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
@@ -31566,169 +31864,59 @@
             "uri-js": "^4.2.2"
           }
         },
-        "ansi-colors": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-          "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
           "dev": true
         },
-        "ansi-escapes": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-          "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
-          "dev": true,
-          "requires": {
-            "type-fest": "^0.11.0"
-          }
-        },
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-          "dev": true
-        },
-        "cli-cursor": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-          "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-          "dev": true,
-          "requires": {
-            "restore-cursor": "^3.1.0"
-          }
-        },
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
-        "figures": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-          "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-          "dev": true,
-          "requires": {
-            "escape-string-regexp": "^1.0.5"
-          }
-        },
-        "inquirer": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz",
-          "integrity": "sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==",
-          "dev": true,
-          "requires": {
-            "ansi-escapes": "^4.2.1",
-            "chalk": "^3.0.0",
-            "cli-cursor": "^3.1.0",
-            "cli-width": "^2.0.0",
-            "external-editor": "^3.0.3",
-            "figures": "^3.0.0",
-            "lodash": "^4.17.15",
-            "mute-stream": "0.0.8",
-            "run-async": "^2.4.0",
-            "rxjs": "^6.5.3",
-            "string-width": "^4.1.0",
-            "strip-ansi": "^6.0.0",
-            "through": "^2.3.6"
-          }
-        },
-        "is-fullwidth-code-point": {
+        "jsonc-parser": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+          "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
+          "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==",
           "dev": true
         },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "open": {
-          "version": "7.0.4",
-          "resolved": "https://registry.npmjs.org/open/-/open-7.0.4.tgz",
-          "integrity": "sha512-brSA+/yq+b08Hsr4c8fsEW2CRzk1BmfN3SAK/5VCHQ9bdoZJ4qa/+AfR0xHjlbbZUyPkUHs1b8x1RqdyZdkVqQ==",
+        "rxjs": {
+          "version": "6.6.3",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
+          "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
           "dev": true,
           "requires": {
-            "is-docker": "^2.0.0",
-            "is-wsl": "^2.1.1"
+            "tslib": "^1.9.0"
           }
         },
-        "restore-cursor": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-          "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-          "dev": true,
-          "requires": {
-            "onetime": "^5.1.0",
-            "signal-exit": "^3.0.2"
-          }
-        },
-        "string-width": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        },
-        "type-fest": {
-          "version": "0.11.0",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-          "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
-          "dev": true
-        },
-        "uuid": {
-          "version": "8.1.0",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.1.0.tgz",
-          "integrity": "sha512-CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg==",
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
           "dev": true
         }
       }
     },
     "@angular/common": {
-      "version": "10.0.14",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-10.0.14.tgz",
-      "integrity": "sha512-EOAuaMt2HwJF3DtIJ/ksHtnF8Pqh5K2rWISYLEs9R3WNaSGn74kbCODAT4pNhI8P22Ykl3H4FmQUgnDZ3uDAUg==",
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-11.2.14.tgz",
+      "integrity": "sha512-ZSLV/3j7eCTyLf/8g4yBFLWySjiLz3vLJAGWscYoUpnJWMnug1VRu6zoF/COxCbtORgE+Wz6K0uhfS6MziBGVw==",
       "requires": {
         "tslib": "^2.0.0"
       }
     },
     "@angular/compiler": {
-      "version": "10.0.14",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-10.0.14.tgz",
-      "integrity": "sha512-lYNo6/MmnYAVFoDQDBB6HMFd9zHg3RHXc6hn+wchU0XSWiIsg6WYHbKOb/DyqUEyKebzy0gSKZf7gUeZHtj62Q==",
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-11.2.14.tgz",
+      "integrity": "sha512-XBOK3HgA+/y6Cz7kOX4zcJYmgJ264XnfcbXUMU2cD7Ac+mbNhLPKohWrEiSWalfcjnpf5gRfufQrQP7lpAGu0A==",
       "requires": {
         "tslib": "^2.0.0"
       }
     },
     "@angular/compiler-cli": {
-      "version": "10.0.14",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-10.0.14.tgz",
-      "integrity": "sha512-WK+S90sjc+3iMo8/CuuAX0RdGFwyA9esqqC5fYG/MDZjKuPuhogiimmR0rY3P1Th7B9di8x012xiILbf4GsGUQ==",
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-11.2.14.tgz",
+      "integrity": "sha512-A7ltnCp03/EVqK/Q3tVUDsokgz5GHW3dSPGl0Csk7Ys5uBB9ibHTmVt4eiXA4jt0+6Bk+mKxwe5BEDqLvwYFAg==",
       "dev": true,
       "requires": {
+        "@babel/core": "^7.8.6",
+        "@babel/types": "^7.8.6",
         "canonical-path": "1.0.0",
         "chokidar": "^3.0.0",
         "convert-source-map": "^1.5.1",
@@ -31741,42 +31929,9 @@
         "source-map": "^0.6.1",
         "sourcemap-codec": "^1.4.8",
         "tslib": "^2.0.0",
-        "yargs": "15.3.0"
+        "yargs": "^16.2.0"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-          "dev": true
-        },
-        "cliui": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-          "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-          "dev": true,
-          "requires": {
-            "string-width": "^4.2.0",
-            "strip-ansi": "^6.0.0",
-            "wrap-ansi": "^6.2.0"
-          }
-        },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
-        "find-up": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^5.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
         "fs-extra": {
           "version": "4.0.2",
           "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.2.tgz",
@@ -31788,12 +31943,6 @@
             "universalify": "^0.1.0"
           }
         },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
         "jsonfile": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
@@ -31803,39 +31952,6 @@
             "graceful-fs": "^4.1.6"
           }
         },
-        "locate-path": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^4.1.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.2.0"
-          }
-        },
-        "path-exists": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-          "dev": true
-        },
         "semver": {
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -31848,187 +31964,98 @@
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         },
-        "string-width": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        },
         "universalify": {
           "version": "0.1.2",
           "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
           "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
           "dev": true
-        },
-        "wrap-ansi": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-          "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.0.0",
-            "string-width": "^4.1.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "yargs": {
-          "version": "15.3.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.0.tgz",
-          "integrity": "sha512-g/QCnmjgOl1YJjGsnUg2SatC7NUYEiLXJqxNOQU9qSpjzGtGXda9b+OKccr1kLTy8BN9yqEyqfq5lxlwdc13TA==",
-          "dev": true,
-          "requires": {
-            "cliui": "^6.0.0",
-            "decamelize": "^1.2.0",
-            "find-up": "^4.1.0",
-            "get-caller-file": "^2.0.1",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^2.0.0",
-            "set-blocking": "^2.0.0",
-            "string-width": "^4.2.0",
-            "which-module": "^2.0.0",
-            "y18n": "^4.0.0",
-            "yargs-parser": "^18.1.0"
-          }
-        },
-        "yargs-parser": {
-          "version": "18.1.3",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-          "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
-          "dev": true,
-          "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
-          }
         }
       }
     },
     "@angular/core": {
-      "version": "10.0.14",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-10.0.14.tgz",
-      "integrity": "sha512-m+c9g6fA/gE+6K7It01b6r8TEmbuFjUZajQ9gG/pzist0mTBcqfvn0O4h5X+ebnSgw/bbnnp+4PbaXEi1pOWZQ==",
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-11.2.14.tgz",
+      "integrity": "sha512-vpR4XqBGitk1Faph37CSpemwIYTmJ3pdIVNoHKP6jLonpWu+0azkchf0f7oD8/2ivj2F81opcIw0tcsy/D/5Vg==",
       "requires": {
         "tslib": "^2.0.0"
       }
     },
     "@angular/forms": {
-      "version": "10.0.14",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-10.0.14.tgz",
-      "integrity": "sha512-McKh3rXDlAE7qmCnyWKENb2HhqAT+1dsAfChuqs0w8jhKkoRgA00RDFee6dZ6XQCc907DwuV0K8+wC3CvBp35w==",
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-11.2.14.tgz",
+      "integrity": "sha512-4LWqY6KEIk1AZQFnk+4PJSOCamlD4tumuVN06gO4D0dZo9Cx+GcvW6pM6N0CPubRvPs3sScCnu20WT11HNWC1w==",
       "requires": {
         "tslib": "^2.0.0"
       }
     },
     "@angular/language-service": {
-      "version": "10.0.14",
-      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-10.0.14.tgz",
-      "integrity": "sha512-QQLYUjD0T6u2hLNYXUEUbupAGsz5egmhCAckaQojvXCe3SLL/hQsrK4odrNuspy7TvMB0H5ZNEHGlF6m/WLZ3g==",
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-11.2.14.tgz",
+      "integrity": "sha512-3+0F0X4r1WeNOV6VmaMzYnJENPVmLX2/MX3/lugwZPNYKVXl/oGyh/4PB8ktntIj0tnxQuErzqRSeucNStNGRw==",
       "dev": true
     },
     "@angular/platform-browser": {
-      "version": "10.0.14",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-10.0.14.tgz",
-      "integrity": "sha512-DcBZ1wt2TwtXrdcmCTWanAzu2Vxk5Uvioam0UcDxcgXD84T2fHipyfZVn07fMqRvzFQj45tDNAEevFBnGZar4w==",
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-11.2.14.tgz",
+      "integrity": "sha512-fb7b7ss/gRoP8wLAN17W62leMgjynuyjEPU2eUoAAazsG9f2cgM+z3rK29GYncDVyYQxZUZYnjSqvL6GSXx86A==",
       "requires": {
         "tslib": "^2.0.0"
       }
     },
     "@angular/platform-browser-dynamic": {
-      "version": "10.0.14",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-10.0.14.tgz",
-      "integrity": "sha512-PPCAiNh/JSuQNKXOhj3a8CTFdVhTgF/EpGtaotnVr/BfbJMeFImKo7m2QQOTsAFaEP2DurSHnofPnMWAfHS2mg==",
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-11.2.14.tgz",
+      "integrity": "sha512-TWTPdFs6iBBcp+/YMsgCRQwdHpWGq8KjeJDJ2tfatGgBD3Gqt2YaHOMST1zPW6RkrmupytTejuVqXzeaKWFxuw==",
       "requires": {
         "tslib": "^2.0.0"
       }
     },
     "@angular/router": {
-      "version": "10.0.14",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-10.0.14.tgz",
-      "integrity": "sha512-VWzaNyPZDY99TMszV1GlXJgVOxXsjhJrsv3mIcjaz1dfdlKOeKTVDLdnyXfP9CkwE3PRmvG7eSXppIj6nn9BpQ==",
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-11.2.14.tgz",
+      "integrity": "sha512-3aYBmj+zrEL9yf/ntIQxHIYaWShZOBKP3U07X2mX+TPMpGlvHDnR7L6bWhQVZwewzMMz7YVR16ldg50IFuAlfA==",
       "requires": {
         "tslib": "^2.0.0"
       }
     },
     "@babel/code-frame": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-      "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz",
+      "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==",
       "dev": true,
       "requires": {
-        "@babel/highlight": "^7.10.4"
+        "@babel/highlight": "^7.14.5"
       }
     },
     "@babel/compat-data": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.11.0.tgz",
-      "integrity": "sha512-TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.12.0",
-        "invariant": "^2.2.4",
-        "semver": "^5.5.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "dev": true
-        }
-      }
+      "version": "7.14.9",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.9.tgz",
+      "integrity": "sha512-p3QjZmMGHDGdpcwEYYWu7i7oJShJvtgMjJeb0W95PPhSm++3lm8YXYOh45Y6iCN9PkZLTZ7CIX5nFrp7pw7TXw==",
+      "dev": true
     },
     "@babel/core": {
-      "version": "7.9.6",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz",
-      "integrity": "sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==",
+      "version": "7.12.10",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.10.tgz",
+      "integrity": "sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.8.3",
-        "@babel/generator": "^7.9.6",
-        "@babel/helper-module-transforms": "^7.9.0",
-        "@babel/helpers": "^7.9.6",
-        "@babel/parser": "^7.9.6",
-        "@babel/template": "^7.8.6",
-        "@babel/traverse": "^7.9.6",
-        "@babel/types": "^7.9.6",
+        "@babel/code-frame": "^7.10.4",
+        "@babel/generator": "^7.12.10",
+        "@babel/helper-module-transforms": "^7.12.1",
+        "@babel/helpers": "^7.12.5",
+        "@babel/parser": "^7.12.10",
+        "@babel/template": "^7.12.7",
+        "@babel/traverse": "^7.12.10",
+        "@babel/types": "^7.12.10",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.1",
         "json5": "^2.1.2",
-        "lodash": "^4.17.13",
-        "resolve": "^1.3.2",
+        "lodash": "^4.17.19",
         "semver": "^5.4.1",
         "source-map": "^0.5.0"
       },
       "dependencies": {
-        "debug": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
-          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
         "semver": {
           "version": "5.7.1",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
@@ -32044,14 +32071,13 @@
       }
     },
     "@babel/generator": {
-      "version": "7.9.6",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz",
-      "integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==",
+      "version": "7.12.11",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz",
+      "integrity": "sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.9.6",
+        "@babel/types": "^7.12.11",
         "jsesc": "^2.5.1",
-        "lodash": "^4.17.13",
         "source-map": "^0.5.0"
       },
       "dependencies": {
@@ -32064,481 +32090,442 @@
       }
     },
     "@babel/helper-annotate-as-pure": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz",
-      "integrity": "sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.14.5.tgz",
+      "integrity": "sha512-EivH9EgBIb+G8ij1B2jAwSH36WnGvkQSEC6CkX/6v6ZFlw5fVOHvsgGF4uiEHO2GzMvunZb6tDLQEQSdrdocrA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.10.4"
+        "@babel/types": "^7.14.5"
       }
     },
     "@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz",
-      "integrity": "sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.14.5.tgz",
+      "integrity": "sha512-YTA/Twn0vBXDVGJuAX6PwW7x5zQei1luDDo2Pl6q1qZ7hVNl0RZrhHCQG/ArGpR29Vl7ETiB8eJyrvpuRp300w==",
       "dev": true,
       "requires": {
-        "@babel/helper-explode-assignable-expression": "^7.10.4",
-        "@babel/types": "^7.10.4"
+        "@babel/helper-explode-assignable-expression": "^7.14.5",
+        "@babel/types": "^7.14.5"
       }
     },
     "@babel/helper-compilation-targets": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz",
-      "integrity": "sha512-a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz",
+      "integrity": "sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.10.4",
-        "browserslist": "^4.12.0",
-        "invariant": "^2.2.4",
-        "levenary": "^1.1.1",
-        "semver": "^5.5.0"
+        "@babel/compat-data": "^7.14.5",
+        "@babel/helper-validator-option": "^7.14.5",
+        "browserslist": "^4.16.6",
+        "semver": "^6.3.0"
       },
       "dependencies": {
         "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
         }
       }
     },
-    "@babel/helper-create-regexp-features-plugin": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz",
-      "integrity": "sha512-2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g==",
+    "@babel/helper-create-class-features-plugin": {
+      "version": "7.14.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.8.tgz",
+      "integrity": "sha512-bpYvH8zJBWzeqi1o+co8qOrw+EXzQ/0c74gVmY205AWXy9nifHrOg77y+1zwxX5lXE7Icq4sPlSQ4O2kWBrteQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.10.4",
-        "@babel/helper-regex": "^7.10.4",
-        "regexpu-core": "^4.7.0"
+        "@babel/helper-annotate-as-pure": "^7.14.5",
+        "@babel/helper-function-name": "^7.14.5",
+        "@babel/helper-member-expression-to-functions": "^7.14.7",
+        "@babel/helper-optimise-call-expression": "^7.14.5",
+        "@babel/helper-replace-supers": "^7.14.5",
+        "@babel/helper-split-export-declaration": "^7.14.5"
       }
     },
-    "@babel/helper-define-map": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz",
-      "integrity": "sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==",
+    "@babel/helper-create-regexp-features-plugin": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz",
+      "integrity": "sha512-TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "^7.10.4",
-        "@babel/types": "^7.10.5",
-        "lodash": "^4.17.19"
+        "@babel/helper-annotate-as-pure": "^7.14.5",
+        "regexpu-core": "^4.7.1"
       }
     },
     "@babel/helper-explode-assignable-expression": {
-      "version": "7.11.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz",
-      "integrity": "sha512-ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.14.5.tgz",
+      "integrity": "sha512-Htb24gnGJdIGT4vnRKMdoXiOIlqOLmdiUYpAQ0mYfgVT/GDm8GOYhgi4GL+hMKrkiPRohO4ts34ELFsGAPQLDQ==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.10.4"
+        "@babel/types": "^7.14.5"
       }
     },
     "@babel/helper-function-name": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
-      "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz",
+      "integrity": "sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-get-function-arity": "^7.10.4",
-        "@babel/template": "^7.10.4",
-        "@babel/types": "^7.10.4"
+        "@babel/helper-get-function-arity": "^7.14.5",
+        "@babel/template": "^7.14.5",
+        "@babel/types": "^7.14.5"
       },
       "dependencies": {
         "@babel/template": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+          "version": "7.14.5",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz",
+          "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==",
           "dev": true,
           "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/parser": "^7.10.4",
-            "@babel/types": "^7.10.4"
+            "@babel/code-frame": "^7.14.5",
+            "@babel/parser": "^7.14.5",
+            "@babel/types": "^7.14.5"
           }
         }
       }
     },
     "@babel/helper-get-function-arity": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
-      "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz",
+      "integrity": "sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.10.4"
+        "@babel/types": "^7.14.5"
       }
     },
     "@babel/helper-hoist-variables": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz",
-      "integrity": "sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz",
+      "integrity": "sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.10.4"
+        "@babel/types": "^7.14.5"
       }
     },
     "@babel/helper-member-expression-to-functions": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
-      "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz",
+      "integrity": "sha512-TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.11.0"
+        "@babel/types": "^7.14.5"
       }
     },
     "@babel/helper-module-imports": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz",
-      "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz",
+      "integrity": "sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.10.4"
+        "@babel/types": "^7.14.5"
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz",
-      "integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==",
+      "version": "7.14.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.8.tgz",
+      "integrity": "sha512-RyE+NFOjXn5A9YU1dkpeBaduagTlZ0+fccnIcAGbv1KGUlReBj7utF7oEth8IdIBQPcux0DDgW5MFBH2xu9KcA==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.10.4",
-        "@babel/helper-replace-supers": "^7.10.4",
-        "@babel/helper-simple-access": "^7.10.4",
-        "@babel/helper-split-export-declaration": "^7.11.0",
-        "@babel/template": "^7.10.4",
-        "@babel/types": "^7.11.0",
-        "lodash": "^4.17.19"
+        "@babel/helper-module-imports": "^7.14.5",
+        "@babel/helper-replace-supers": "^7.14.5",
+        "@babel/helper-simple-access": "^7.14.8",
+        "@babel/helper-split-export-declaration": "^7.14.5",
+        "@babel/helper-validator-identifier": "^7.14.8",
+        "@babel/template": "^7.14.5",
+        "@babel/traverse": "^7.14.8",
+        "@babel/types": "^7.14.8"
       },
       "dependencies": {
         "@babel/template": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+          "version": "7.14.5",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz",
+          "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==",
           "dev": true,
           "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/parser": "^7.10.4",
-            "@babel/types": "^7.10.4"
+            "@babel/code-frame": "^7.14.5",
+            "@babel/parser": "^7.14.5",
+            "@babel/types": "^7.14.5"
           }
         }
       }
     },
     "@babel/helper-optimise-call-expression": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz",
-      "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz",
+      "integrity": "sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.10.4"
+        "@babel/types": "^7.14.5"
       }
     },
     "@babel/helper-plugin-utils": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-      "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz",
+      "integrity": "sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==",
       "dev": true
     },
-    "@babel/helper-regex": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.5.tgz",
-      "integrity": "sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.19"
-      }
-    },
     "@babel/helper-remap-async-to-generator": {
-      "version": "7.11.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz",
-      "integrity": "sha512-tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.14.5.tgz",
+      "integrity": "sha512-rLQKdQU+HYlxBwQIj8dk4/0ENOUEhA/Z0l4hN8BexpvmSMN9oA9EagjnhnDpNsRdWCfjwa4mn/HyBXO9yhQP6A==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.10.4",
-        "@babel/helper-wrap-function": "^7.10.4",
-        "@babel/template": "^7.10.4",
-        "@babel/types": "^7.10.4"
-      },
-      "dependencies": {
-        "@babel/template": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/parser": "^7.10.4",
-            "@babel/types": "^7.10.4"
-          }
-        }
+        "@babel/helper-annotate-as-pure": "^7.14.5",
+        "@babel/helper-wrap-function": "^7.14.5",
+        "@babel/types": "^7.14.5"
       }
     },
     "@babel/helper-replace-supers": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
-      "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz",
+      "integrity": "sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow==",
       "dev": true,
       "requires": {
-        "@babel/helper-member-expression-to-functions": "^7.10.4",
-        "@babel/helper-optimise-call-expression": "^7.10.4",
-        "@babel/traverse": "^7.10.4",
-        "@babel/types": "^7.10.4"
+        "@babel/helper-member-expression-to-functions": "^7.14.5",
+        "@babel/helper-optimise-call-expression": "^7.14.5",
+        "@babel/traverse": "^7.14.5",
+        "@babel/types": "^7.14.5"
       }
     },
     "@babel/helper-simple-access": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz",
-      "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==",
+      "version": "7.14.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz",
+      "integrity": "sha512-TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg==",
       "dev": true,
       "requires": {
-        "@babel/template": "^7.10.4",
-        "@babel/types": "^7.10.4"
-      },
-      "dependencies": {
-        "@babel/template": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/parser": "^7.10.4",
-            "@babel/types": "^7.10.4"
-          }
-        }
+        "@babel/types": "^7.14.8"
       }
     },
     "@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz",
-      "integrity": "sha512-0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.14.5.tgz",
+      "integrity": "sha512-dmqZB7mrb94PZSAOYtr+ZN5qt5owZIAgqtoTuqiFbHFtxgEcmQlRJVI+bO++fciBunXtB6MK7HrzrfcAzIz2NQ==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.11.0"
+        "@babel/types": "^7.14.5"
       }
     },
     "@babel/helper-split-export-declaration": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
-      "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz",
+      "integrity": "sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.11.0"
+        "@babel/types": "^7.14.5"
       }
     },
     "@babel/helper-validator-identifier": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
-      "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+      "version": "7.14.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz",
+      "integrity": "sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g==",
+      "dev": true
+    },
+    "@babel/helper-validator-option": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz",
+      "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==",
       "dev": true
     },
     "@babel/helper-wrap-function": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz",
-      "integrity": "sha512-6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.14.5.tgz",
+      "integrity": "sha512-YEdjTCq+LNuNS1WfxsDCNpgXkJaIyqco6DAelTUjT4f2KIWC1nBcaCaSdHTBqQVLnTBexBcVcFhLSU1KnYuePQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "^7.10.4",
-        "@babel/template": "^7.10.4",
-        "@babel/traverse": "^7.10.4",
-        "@babel/types": "^7.10.4"
+        "@babel/helper-function-name": "^7.14.5",
+        "@babel/template": "^7.14.5",
+        "@babel/traverse": "^7.14.5",
+        "@babel/types": "^7.14.5"
       },
       "dependencies": {
         "@babel/template": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+          "version": "7.14.5",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz",
+          "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==",
           "dev": true,
           "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/parser": "^7.10.4",
-            "@babel/types": "^7.10.4"
+            "@babel/code-frame": "^7.14.5",
+            "@babel/parser": "^7.14.5",
+            "@babel/types": "^7.14.5"
           }
         }
       }
     },
     "@babel/helpers": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.4.tgz",
-      "integrity": "sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==",
+      "version": "7.14.8",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.8.tgz",
+      "integrity": "sha512-ZRDmI56pnV+p1dH6d+UN6GINGz7Krps3+270qqI9UJ4wxYThfAIcI5i7j5vXC4FJ3Wap+S9qcebxeYiqn87DZw==",
       "dev": true,
       "requires": {
-        "@babel/template": "^7.10.4",
-        "@babel/traverse": "^7.10.4",
-        "@babel/types": "^7.10.4"
+        "@babel/template": "^7.14.5",
+        "@babel/traverse": "^7.14.8",
+        "@babel/types": "^7.14.8"
       },
       "dependencies": {
         "@babel/template": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+          "version": "7.14.5",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz",
+          "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==",
           "dev": true,
           "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/parser": "^7.10.4",
-            "@babel/types": "^7.10.4"
+            "@babel/code-frame": "^7.14.5",
+            "@babel/parser": "^7.14.5",
+            "@babel/types": "^7.14.5"
           }
         }
       }
     },
     "@babel/highlight": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-      "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
+      "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
       "dev": true,
       "requires": {
-        "@babel/helper-validator-identifier": "^7.10.4",
+        "@babel/helper-validator-identifier": "^7.14.5",
         "chalk": "^2.0.0",
         "js-tokens": "^4.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "dev": true,
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "@babel/parser": {
-      "version": "7.11.5",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
-      "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
+      "version": "7.14.9",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.9.tgz",
+      "integrity": "sha512-RdUTOseXJ8POjjOeEBEvNMIZU/nm4yu2rufRkcibzkkg7DmQvXU8v3M4Xk9G7uuI86CDGkKcuDWgioqZm+mScQ==",
       "dev": true
     },
     "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz",
-      "integrity": "sha512-cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg==",
+      "version": "7.14.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.9.tgz",
+      "integrity": "sha512-d1lnh+ZnKrFKwtTYdw320+sQWCTwgkB9fmUhNXRADA4akR6wLjaruSGnIEUjpt9HCOwTr4ynFTKu19b7rFRpmw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-remap-async-to-generator": "^7.10.4",
-        "@babel/plugin-syntax-async-generators": "^7.8.0"
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-remap-async-to-generator": "^7.14.5",
+        "@babel/plugin-syntax-async-generators": "^7.8.4"
+      }
+    },
+    "@babel/plugin-proposal-class-properties": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz",
+      "integrity": "sha512-q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-proposal-dynamic-import": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz",
-      "integrity": "sha512-up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz",
+      "integrity": "sha512-ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.0"
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+      }
+    },
+    "@babel/plugin-proposal-export-namespace-from": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz",
+      "integrity": "sha512-g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
       }
     },
     "@babel/plugin-proposal-json-strings": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz",
-      "integrity": "sha512-fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz",
+      "integrity": "sha512-NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/plugin-syntax-json-strings": "^7.8.0"
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-json-strings": "^7.8.3"
+      }
+    },
+    "@babel/plugin-proposal-logical-assignment-operators": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz",
+      "integrity": "sha512-YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
       }
     },
     "@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz",
-      "integrity": "sha512-wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz",
+      "integrity": "sha512-gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0"
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
       }
     },
     "@babel/plugin-proposal-numeric-separator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz",
-      "integrity": "sha512-73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz",
+      "integrity": "sha512-yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.14.5",
         "@babel/plugin-syntax-numeric-separator": "^7.10.4"
       }
     },
     "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz",
-      "integrity": "sha512-wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA==",
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.7.tgz",
+      "integrity": "sha512-082hsZz+sVabfmDWo1Oct1u1AgbKbUAyVgmX4otIc7bdsRgHBXwTwb3DpDmD4Eyyx6DNiuz5UAATT655k+kL5g==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-        "@babel/plugin-transform-parameters": "^7.10.4"
+        "@babel/compat-data": "^7.14.7",
+        "@babel/helper-compilation-targets": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.14.5"
       }
     },
     "@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz",
-      "integrity": "sha512-LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz",
+      "integrity": "sha512-3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.0"
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
       }
     },
     "@babel/plugin-proposal-optional-chaining": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz",
-      "integrity": "sha512-v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz",
+      "integrity": "sha512-ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.0"
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+      }
+    },
+    "@babel/plugin-proposal-private-methods": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz",
+      "integrity": "sha512-838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz",
-      "integrity": "sha512-H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz",
+      "integrity": "sha512-6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-syntax-async-generators": {
@@ -32560,12 +32547,12 @@
       }
     },
     "@babel/plugin-syntax-class-properties": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz",
-      "integrity": "sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA==",
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.12.13"
       }
     },
     "@babel/plugin-syntax-dynamic-import": {
@@ -32577,6 +32564,15 @@
         "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
+    "@babel/plugin-syntax-export-namespace-from": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
+      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3"
+      }
+    },
     "@babel/plugin-syntax-import-meta": {
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
@@ -32650,271 +32646,269 @@
       }
     },
     "@babel/plugin-syntax-top-level-await": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz",
-      "integrity": "sha512-ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-arrow-functions": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz",
-      "integrity": "sha512-9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz",
+      "integrity": "sha512-KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-async-to-generator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz",
-      "integrity": "sha512-F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz",
+      "integrity": "sha512-SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.10.4",
+        "@babel/helper-module-imports": "^7.12.1",
         "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-remap-async-to-generator": "^7.10.4"
+        "@babel/helper-remap-async-to-generator": "^7.12.1"
       }
     },
     "@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz",
-      "integrity": "sha512-WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz",
+      "integrity": "sha512-dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-block-scoping": {
-      "version": "7.11.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz",
-      "integrity": "sha512-00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.5.tgz",
+      "integrity": "sha512-LBYm4ZocNgoCqyxMLoOnwpsmQ18HWTQvql64t3GvMUzLQrNoV1BDG0lNftC8QKYERkZgCCT/7J5xWGObGAyHDw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-classes": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz",
-      "integrity": "sha512-2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA==",
+      "version": "7.14.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.9.tgz",
+      "integrity": "sha512-NfZpTcxU3foGWbl4wxmZ35mTsYJy8oQocbeIMoDAGGFarAmSQlL+LWMkDx/tj6pNotpbX3rltIA4dprgAPOq5A==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.10.4",
-        "@babel/helper-define-map": "^7.10.4",
-        "@babel/helper-function-name": "^7.10.4",
-        "@babel/helper-optimise-call-expression": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-replace-supers": "^7.10.4",
-        "@babel/helper-split-export-declaration": "^7.10.4",
+        "@babel/helper-annotate-as-pure": "^7.14.5",
+        "@babel/helper-function-name": "^7.14.5",
+        "@babel/helper-optimise-call-expression": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-replace-supers": "^7.14.5",
+        "@babel/helper-split-export-declaration": "^7.14.5",
         "globals": "^11.1.0"
       }
     },
     "@babel/plugin-transform-computed-properties": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz",
-      "integrity": "sha512-JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz",
+      "integrity": "sha512-pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-destructuring": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz",
-      "integrity": "sha512-+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA==",
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz",
+      "integrity": "sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-dotall-regex": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz",
-      "integrity": "sha512-ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz",
+      "integrity": "sha512-loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-duplicate-keys": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz",
-      "integrity": "sha512-GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz",
+      "integrity": "sha512-iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz",
-      "integrity": "sha512-S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz",
+      "integrity": "sha512-jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA==",
       "dev": true,
       "requires": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-for-of": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz",
-      "integrity": "sha512-ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.14.5.tgz",
+      "integrity": "sha512-CfmqxSUZzBl0rSjpoQSFoR9UEj3HzbGuGNL21/iFTmjb5gFggJp3ph0xR1YBhexmLoKRHzgxuFvty2xdSt6gTA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-function-name": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz",
-      "integrity": "sha512-OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz",
+      "integrity": "sha512-vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-function-name": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-literals": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz",
-      "integrity": "sha512-Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz",
+      "integrity": "sha512-ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-member-expression-literals": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz",
-      "integrity": "sha512-0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz",
+      "integrity": "sha512-WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-modules-amd": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz",
-      "integrity": "sha512-elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz",
+      "integrity": "sha512-3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.10.5",
-        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-module-transforms": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       }
     },
     "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz",
-      "integrity": "sha512-Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.5.tgz",
+      "integrity": "sha512-en8GfBtgnydoao2PS+87mKyw62k02k7kJ9ltbKe0fXTHrQmG6QZZflYuGI1VVG7sVpx4E1n7KBpNlPb8m78J+A==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-simple-access": "^7.10.4",
+        "@babel/helper-module-transforms": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-simple-access": "^7.14.5",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       }
     },
     "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz",
-      "integrity": "sha512-f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.14.5.tgz",
+      "integrity": "sha512-mNMQdvBEE5DcMQaL5LbzXFMANrQjd2W7FPzg34Y4yEz7dBgdaC+9B84dSO+/1Wba98zoDbInctCDo4JGxz1VYA==",
       "dev": true,
       "requires": {
-        "@babel/helper-hoist-variables": "^7.10.4",
-        "@babel/helper-module-transforms": "^7.10.5",
-        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-hoist-variables": "^7.14.5",
+        "@babel/helper-module-transforms": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-validator-identifier": "^7.14.5",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       }
     },
     "@babel/plugin-transform-modules-umd": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz",
-      "integrity": "sha512-mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz",
+      "integrity": "sha512-RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-module-transforms": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz",
-      "integrity": "sha512-V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==",
+      "version": "7.14.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz",
+      "integrity": "sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.10.4"
+        "@babel/helper-create-regexp-features-plugin": "^7.14.5"
       }
     },
     "@babel/plugin-transform-new-target": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz",
-      "integrity": "sha512-YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz",
+      "integrity": "sha512-Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-object-super": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz",
-      "integrity": "sha512-5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz",
+      "integrity": "sha512-MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-replace-supers": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-replace-supers": "^7.14.5"
       }
     },
     "@babel/plugin-transform-parameters": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz",
-      "integrity": "sha512-xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.5.tgz",
+      "integrity": "sha512-Tl7LWdr6HUxTmzQtzuU14SqbgrSKmaR77M0OKyq4njZLQTPfOvzblNKyNkGwOfEFCEx7KeYHQHDI0P3F02IVkA==",
       "dev": true,
       "requires": {
-        "@babel/helper-get-function-arity": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-property-literals": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz",
-      "integrity": "sha512-ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz",
+      "integrity": "sha512-r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-regenerator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz",
-      "integrity": "sha512-3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz",
+      "integrity": "sha512-NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg==",
       "dev": true,
       "requires": {
         "regenerator-transform": "^0.14.2"
       }
     },
     "@babel/plugin-transform-reserved-words": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz",
-      "integrity": "sha512-hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz",
+      "integrity": "sha512-cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-runtime": {
-      "version": "7.9.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.6.tgz",
-      "integrity": "sha512-qcmiECD0mYOjOIt8YHNsAP1SxPooC/rDmfmiSK9BNY72EitdSc7l44WTEklaWuFtbOEBjNhWWyph/kOImbNJ4w==",
+      "version": "7.12.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.10.tgz",
+      "integrity": "sha512-xOrUfzPxw7+WDm9igMgQCbO3cJKymX7dFdsgRr1eu9n3KjjyU4pptIXbXPseQDquw+W+RuJEJMHKHNsPNNm3CA==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "resolve": "^1.8.1",
+        "@babel/helper-module-imports": "^7.12.5",
+        "@babel/helper-plugin-utils": "^7.10.4",
         "semver": "^5.5.1"
       },
       "dependencies": {
@@ -32927,128 +32921,141 @@
       }
     },
     "@babel/plugin-transform-shorthand-properties": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz",
-      "integrity": "sha512-AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz",
+      "integrity": "sha512-xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-spread": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz",
-      "integrity": "sha512-UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw==",
+      "version": "7.14.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.6.tgz",
+      "integrity": "sha512-Zr0x0YroFJku7n7+/HH3A2eIrGMjbmAIbJSVv0IZ+t3U2WUQUA64S/oeied2e+MaGSjmt4alzBCsK9E8gh+fag==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0"
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5"
       }
     },
     "@babel/plugin-transform-sticky-regex": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz",
-      "integrity": "sha512-Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz",
+      "integrity": "sha512-Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-regex": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-template-literals": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz",
-      "integrity": "sha512-V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz",
+      "integrity": "sha512-22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-typeof-symbol": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz",
-      "integrity": "sha512-QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz",
+      "integrity": "sha512-lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-unicode-escapes": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz",
+      "integrity": "sha512-crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-unicode-regex": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz",
-      "integrity": "sha512-wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz",
+      "integrity": "sha512-UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/preset-env": {
-      "version": "7.9.6",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.6.tgz",
-      "integrity": "sha512-0gQJ9RTzO0heXOhzftog+a/WyOuqMrAIugVYxMYf83gh1CQaQDjMtsOpqOwXyDL/5JcWsrCm8l4ju8QC97O7EQ==",
+      "version": "7.12.11",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.11.tgz",
+      "integrity": "sha512-j8Tb+KKIXKYlDBQyIOy4BLxzv1NUOwlHfZ74rvW+Z0Gp4/cI2IMDPBWAgWceGcE7aep9oL/0K9mlzlMGxA8yNw==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.9.6",
-        "@babel/helper-compilation-targets": "^7.9.6",
-        "@babel/helper-module-imports": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/plugin-proposal-async-generator-functions": "^7.8.3",
-        "@babel/plugin-proposal-dynamic-import": "^7.8.3",
-        "@babel/plugin-proposal-json-strings": "^7.8.3",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-proposal-numeric-separator": "^7.8.3",
-        "@babel/plugin-proposal-object-rest-spread": "^7.9.6",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-proposal-optional-chaining": "^7.9.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.8.3",
+        "@babel/compat-data": "^7.12.7",
+        "@babel/helper-compilation-targets": "^7.12.5",
+        "@babel/helper-module-imports": "^7.12.5",
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-validator-option": "^7.12.11",
+        "@babel/plugin-proposal-async-generator-functions": "^7.12.1",
+        "@babel/plugin-proposal-class-properties": "^7.12.1",
+        "@babel/plugin-proposal-dynamic-import": "^7.12.1",
+        "@babel/plugin-proposal-export-namespace-from": "^7.12.1",
+        "@babel/plugin-proposal-json-strings": "^7.12.1",
+        "@babel/plugin-proposal-logical-assignment-operators": "^7.12.1",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
+        "@babel/plugin-proposal-numeric-separator": "^7.12.7",
+        "@babel/plugin-proposal-object-rest-spread": "^7.12.1",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.12.1",
+        "@babel/plugin-proposal-optional-chaining": "^7.12.7",
+        "@babel/plugin-proposal-private-methods": "^7.12.1",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.12.1",
         "@babel/plugin-syntax-async-generators": "^7.8.0",
+        "@babel/plugin-syntax-class-properties": "^7.12.1",
         "@babel/plugin-syntax-dynamic-import": "^7.8.0",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
         "@babel/plugin-syntax-json-strings": "^7.8.0",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0",
-        "@babel/plugin-syntax-numeric-separator": "^7.8.0",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
         "@babel/plugin-syntax-optional-catch-binding": "^7.8.0",
         "@babel/plugin-syntax-optional-chaining": "^7.8.0",
-        "@babel/plugin-syntax-top-level-await": "^7.8.3",
-        "@babel/plugin-transform-arrow-functions": "^7.8.3",
-        "@babel/plugin-transform-async-to-generator": "^7.8.3",
-        "@babel/plugin-transform-block-scoped-functions": "^7.8.3",
-        "@babel/plugin-transform-block-scoping": "^7.8.3",
-        "@babel/plugin-transform-classes": "^7.9.5",
-        "@babel/plugin-transform-computed-properties": "^7.8.3",
-        "@babel/plugin-transform-destructuring": "^7.9.5",
-        "@babel/plugin-transform-dotall-regex": "^7.8.3",
-        "@babel/plugin-transform-duplicate-keys": "^7.8.3",
-        "@babel/plugin-transform-exponentiation-operator": "^7.8.3",
-        "@babel/plugin-transform-for-of": "^7.9.0",
-        "@babel/plugin-transform-function-name": "^7.8.3",
-        "@babel/plugin-transform-literals": "^7.8.3",
-        "@babel/plugin-transform-member-expression-literals": "^7.8.3",
-        "@babel/plugin-transform-modules-amd": "^7.9.6",
-        "@babel/plugin-transform-modules-commonjs": "^7.9.6",
-        "@babel/plugin-transform-modules-systemjs": "^7.9.6",
-        "@babel/plugin-transform-modules-umd": "^7.9.0",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.8.3",
-        "@babel/plugin-transform-new-target": "^7.8.3",
-        "@babel/plugin-transform-object-super": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.9.5",
-        "@babel/plugin-transform-property-literals": "^7.8.3",
-        "@babel/plugin-transform-regenerator": "^7.8.7",
-        "@babel/plugin-transform-reserved-words": "^7.8.3",
-        "@babel/plugin-transform-shorthand-properties": "^7.8.3",
-        "@babel/plugin-transform-spread": "^7.8.3",
-        "@babel/plugin-transform-sticky-regex": "^7.8.3",
-        "@babel/plugin-transform-template-literals": "^7.8.3",
-        "@babel/plugin-transform-typeof-symbol": "^7.8.4",
-        "@babel/plugin-transform-unicode-regex": "^7.8.3",
+        "@babel/plugin-syntax-top-level-await": "^7.12.1",
+        "@babel/plugin-transform-arrow-functions": "^7.12.1",
+        "@babel/plugin-transform-async-to-generator": "^7.12.1",
+        "@babel/plugin-transform-block-scoped-functions": "^7.12.1",
+        "@babel/plugin-transform-block-scoping": "^7.12.11",
+        "@babel/plugin-transform-classes": "^7.12.1",
+        "@babel/plugin-transform-computed-properties": "^7.12.1",
+        "@babel/plugin-transform-destructuring": "^7.12.1",
+        "@babel/plugin-transform-dotall-regex": "^7.12.1",
+        "@babel/plugin-transform-duplicate-keys": "^7.12.1",
+        "@babel/plugin-transform-exponentiation-operator": "^7.12.1",
+        "@babel/plugin-transform-for-of": "^7.12.1",
+        "@babel/plugin-transform-function-name": "^7.12.1",
+        "@babel/plugin-transform-literals": "^7.12.1",
+        "@babel/plugin-transform-member-expression-literals": "^7.12.1",
+        "@babel/plugin-transform-modules-amd": "^7.12.1",
+        "@babel/plugin-transform-modules-commonjs": "^7.12.1",
+        "@babel/plugin-transform-modules-systemjs": "^7.12.1",
+        "@babel/plugin-transform-modules-umd": "^7.12.1",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.12.1",
+        "@babel/plugin-transform-new-target": "^7.12.1",
+        "@babel/plugin-transform-object-super": "^7.12.1",
+        "@babel/plugin-transform-parameters": "^7.12.1",
+        "@babel/plugin-transform-property-literals": "^7.12.1",
+        "@babel/plugin-transform-regenerator": "^7.12.1",
+        "@babel/plugin-transform-reserved-words": "^7.12.1",
+        "@babel/plugin-transform-shorthand-properties": "^7.12.1",
+        "@babel/plugin-transform-spread": "^7.12.1",
+        "@babel/plugin-transform-sticky-regex": "^7.12.7",
+        "@babel/plugin-transform-template-literals": "^7.12.1",
+        "@babel/plugin-transform-typeof-symbol": "^7.12.10",
+        "@babel/plugin-transform-unicode-escapes": "^7.12.1",
+        "@babel/plugin-transform-unicode-regex": "^7.12.1",
         "@babel/preset-modules": "^0.1.3",
-        "@babel/types": "^7.9.6",
-        "browserslist": "^4.11.1",
-        "core-js-compat": "^3.6.2",
-        "invariant": "^2.2.2",
-        "levenary": "^1.1.1",
+        "@babel/types": "^7.12.11",
+        "core-js-compat": "^3.8.0",
         "semver": "^5.5.0"
       },
       "dependencies": {
@@ -33074,78 +33081,63 @@
       }
     },
     "@babel/runtime": {
-      "version": "7.9.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz",
-      "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==",
+      "version": "7.12.5",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz",
+      "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==",
       "dev": true,
       "requires": {
         "regenerator-runtime": "^0.13.4"
       }
     },
     "@babel/runtime-corejs3": {
-      "version": "7.13.17",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.13.17.tgz",
-      "integrity": "sha512-RGXINY1YvduBlGrP+vHjJqd/nK7JVpfM4rmZLGMx77WoL3sMrhheA0qxii9VNn1VHnxJLEyxmvCB+Wqc+x/FMw==",
+      "version": "7.14.9",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.9.tgz",
+      "integrity": "sha512-64RiH2ON4/y8qYtoa8rUiyam/tUVyGqRyNYhe+vCRGmjnV4bUlZvY+mwd0RrmLoCpJpdq3RsrNqKb7SJdw/4kw==",
       "dev": true,
       "requires": {
-        "core-js-pure": "^3.0.0",
+        "core-js-pure": "^3.16.0",
         "regenerator-runtime": "^0.13.4"
       }
     },
     "@babel/template": {
-      "version": "7.8.6",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
-      "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.8.3",
-        "@babel/parser": "^7.8.6",
-        "@babel/types": "^7.8.6"
-      }
-    },
-    "@babel/traverse": {
-      "version": "7.11.5",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
-      "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
+      "version": "7.12.7",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz",
+      "integrity": "sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.10.4",
-        "@babel/generator": "^7.11.5",
-        "@babel/helper-function-name": "^7.10.4",
-        "@babel/helper-split-export-declaration": "^7.11.0",
-        "@babel/parser": "^7.11.5",
-        "@babel/types": "^7.11.5",
+        "@babel/parser": "^7.12.7",
+        "@babel/types": "^7.12.7"
+      }
+    },
+    "@babel/traverse": {
+      "version": "7.14.9",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.9.tgz",
+      "integrity": "sha512-bldh6dtB49L8q9bUyB7bC20UKgU+EFDwKJylwl234Kv+ySZeMD31Xeht6URyueQ6LrRRpF2tmkfcZooZR9/e8g==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.14.5",
+        "@babel/generator": "^7.14.9",
+        "@babel/helper-function-name": "^7.14.5",
+        "@babel/helper-hoist-variables": "^7.14.5",
+        "@babel/helper-split-export-declaration": "^7.14.5",
+        "@babel/parser": "^7.14.9",
+        "@babel/types": "^7.14.9",
         "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.19"
+        "globals": "^11.1.0"
       },
       "dependencies": {
         "@babel/generator": {
-          "version": "7.11.6",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
-          "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
+          "version": "7.14.9",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.9.tgz",
+          "integrity": "sha512-4yoHbhDYzFa0GLfCzLp5GxH7vPPMAHdZjyE7M/OajM9037zhx0rf+iNsJwp4PT0MSFpwjG7BsHEbPkBQpZ6cYA==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.11.5",
+            "@babel/types": "^7.14.9",
             "jsesc": "^2.5.1",
             "source-map": "^0.5.0"
           }
         },
-        "debug": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
-          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
         "source-map": {
           "version": "0.5.7",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -33155,13 +33147,12 @@
       }
     },
     "@babel/types": {
-      "version": "7.11.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-      "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+      "version": "7.14.9",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.9.tgz",
+      "integrity": "sha512-u0bLTnv3DFHeaQLYzb7oRJ1JHr1sv/SYDM7JSqHFFLwXG1wTZRughxFI5NCP8qBEo1rVVsn7Yg2Lvw49nne/Ow==",
       "dev": true,
       "requires": {
-        "@babel/helper-validator-identifier": "^7.10.4",
-        "lodash": "^4.17.19",
+        "@babel/helper-validator-identifier": "^7.14.9",
         "to-fast-properties": "^2.0.0"
       }
     },
@@ -33181,16 +33172,22 @@
         "minimist": "^1.2.0"
       }
     },
+    "@discoveryjs/json-ext": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.2.tgz",
+      "integrity": "sha512-HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg==",
+      "dev": true
+    },
     "@eslint/eslintrc": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.0.tgz",
-      "integrity": "sha512-2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog==",
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
+      "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
       "dev": true,
       "requires": {
         "ajv": "^6.12.4",
         "debug": "^4.1.1",
         "espree": "^7.3.0",
-        "globals": "^12.1.0",
+        "globals": "^13.9.0",
         "ignore": "^4.0.6",
         "import-fresh": "^3.2.1",
         "js-yaml": "^3.13.1",
@@ -33198,22 +33195,25 @@
         "strip-json-comments": "^3.1.1"
       },
       "dependencies": {
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
           "dev": true,
           "requires": {
-            "ms": "2.1.2"
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
           }
         },
         "globals": {
-          "version": "12.4.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
-          "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
+          "version": "13.10.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.10.0.tgz",
+          "integrity": "sha512-piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g==",
           "dev": true,
           "requires": {
-            "type-fest": "^0.8.1"
+            "type-fest": "^0.20.2"
           }
         },
         "ignore": {
@@ -33222,416 +33222,251 @@
           "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
           "dev": true
         },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
           "dev": true
         },
-        "strip-json-comments": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-          "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+        "type-fest": {
+          "version": "0.20.2",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
           "dev": true
         }
       }
     },
+    "@humanwhocodes/config-array": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
+      "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
+      "dev": true,
+      "requires": {
+        "@humanwhocodes/object-schema": "^1.2.0",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.4"
+      }
+    },
+    "@humanwhocodes/object-schema": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz",
+      "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==",
+      "dev": true
+    },
     "@ionic-native/badge": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/badge/-/badge-5.33.0.tgz",
-      "integrity": "sha512-g/E2HLB53csZq5hWeyWUFj6r7CrllSPuOkV88XotIFTQFNuY7TaLtiFUVFSvWXRh0Kvu+w7TI5Hys67d/v7F/g==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/badge/-/badge-5.35.0.tgz",
+      "integrity": "sha512-VTelBbEoj7MdkN4rzgPOFiQnw9GZrJPI/3GOEIib3/sj5HVSnClkGDFlLPSwe+sdjvozehpDCkGE92dPd5KMpA==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/camera": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/camera/-/camera-5.33.0.tgz",
-      "integrity": "sha512-cLAxM4e8IrTECvlszyUe9FnUjE4PbWR99NNDwkOuB85yJ3diyKxiQhHu89Qh9A6qzHTJQLa93iknY2Q40VM/5Q==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/camera/-/camera-5.35.0.tgz",
+      "integrity": "sha512-zW39wFdJ9oACMVtZJSvYn8gaJJQYKOoqjtnLphMXceFY0KBqyDYdTdkquzTOFUjsB3WQRwScndEJJ73PhVCZmg==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/chooser": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/chooser/-/chooser-5.33.0.tgz",
-      "integrity": "sha512-hz2OtB8UsJpKdXZByDzGS6+U1FK8toIjKmIVCDQAuOXxjbw9dU2Ef+MSUKXOpK6MYnP56oP80JdSX9LDEFJnRA==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/chooser/-/chooser-5.35.0.tgz",
+      "integrity": "sha512-oQnfahfA1Z8Pv3MbnhBDAeGyMyC598Xm2U2mCNKdYhtPtqeH5uOOk596XGsgoR+11G9g1gqFDg3qypK4E1zVTA==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/clipboard": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/clipboard/-/clipboard-5.33.0.tgz",
-      "integrity": "sha512-HFZN4tsAjFJ9Se9ik0/IOUvApL4zNPEKQAtUsjqP7vCnTsdrgS+FDMln1UDEKXCQ/dEEwU1N1ndFmPBGxjkGzQ==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/clipboard/-/clipboard-5.35.0.tgz",
+      "integrity": "sha512-M39sLi6HFJEKwMXcFBwWEk5X70t/b7uuDFqqtLCOg7dsZwmhY07Lr/kU3lBh7zbj9TgCKSkOxc3jlZH3fRWXbA==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/core": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/core/-/core-5.33.0.tgz",
-      "integrity": "sha512-dnZHu7SadvQvliGJPndk2ohdoPvwiyBWJjsJw33BKyhadnmLlmkYKkRgPPI+i22BZofDKq4YiAfIIqhvfHU6gw==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/core/-/core-5.35.0.tgz",
+      "integrity": "sha512-x2mShlaLOzCxwdqvPOvUFX4g0ctMvEYiYak6Hlh+HP9eNWfruT0EcMoXs6KSvIRFRsyFaYAXHyDZseKtB3aqsA==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/device": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/device/-/device-5.33.0.tgz",
-      "integrity": "sha512-KYQvVsN98bGTEomI193Jf9r1vaXBFJQXuhkhwBI6lajynAlf2SIVJwthNUXnK43kNXy1cOelYxScUuKyPwqudw==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/device/-/device-5.35.0.tgz",
+      "integrity": "sha512-p/kTzERyWFhAN6mzhq4wanFme3aNGHeT2hM+lp1tM87vqLn+49GycKNwYMED0mfcGA1n2aT+ClF+ga6df5Rvhw==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/diagnostic": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/diagnostic/-/diagnostic-5.33.0.tgz",
-      "integrity": "sha512-zBDv/yNMvUkXfxy17rgrGVU3+XKREXRI7cqy/DyvpjdomOnmx2pnFvhszgMEgeD03LkXXKiFOR5yUAVNgYirmg==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/diagnostic/-/diagnostic-5.35.0.tgz",
+      "integrity": "sha512-hjTYiGEZzL4cE/GNr/g9T/zaBuIXNTfUGJXOVSKOI3t0miIo4eZi1IQnbQtac4fhuwtW23eo5TFtzP8NwJHy/Q==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/file": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/file/-/file-5.33.0.tgz",
-      "integrity": "sha512-RisSGJl2t8JrBgw30Vn5hJYYKEDTHR9f3KbQDfe1MQg+VrZo7vnbml/vk4l55u65c1TYZDH+F6i7s9nyif1QVQ==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/file/-/file-5.35.0.tgz",
+      "integrity": "sha512-CpD8z7skurzL4Gj1R6AhAvszoc+Ii06+2u1E48/jq6SXBY9S6ufzSlpWosRFkfydRKDIZ1gIb/vAGedCuuRWyQ==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/file-opener": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/file-opener/-/file-opener-5.33.0.tgz",
-      "integrity": "sha512-v7t1ndalAPYT9gvMAhxAup8tg1NPV415cfG6tzs1foPFP91UZC3MQny0tup8AgFivugT1GRdoSk1NMuK1jy8Cw==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/file-opener/-/file-opener-5.35.0.tgz",
+      "integrity": "sha512-1xDQVfsRUdd+b/MNtKuxuBqi2pv63kyuB6VFTP7g3I+e13JW05I0RNlujpcBhGpA1FZyPKs7w7b2era9famNLg==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/file-transfer": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/file-transfer/-/file-transfer-5.33.0.tgz",
-      "integrity": "sha512-xDUpdJVgTBP6aEiU08iZ/pa9aMoGSMB9391dQKk+VSDs0hdbIwk+Cx4V40GIE4QF3TI06sUMdKXD2sIhVsr2QA==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/file-transfer/-/file-transfer-5.35.0.tgz",
+      "integrity": "sha512-rkOOSY+1/VLstv2TT8TYkZUmAzN+syjFolK8Sj5hEbgVuCWhZZK+7bqwGmHg2op4OvXf4kptehHZ5KDD0ZenBw==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/geolocation": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/geolocation/-/geolocation-5.33.0.tgz",
-      "integrity": "sha512-oE6pi6l8/Wsv94vpJmPlPqE1LheP6cQTJrC78WYQp9WVDOOCGZnFznNoH8BlQfnfjuDx/kUARxzEJBO/gbUg1A==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/geolocation/-/geolocation-5.35.0.tgz",
+      "integrity": "sha512-gjwe2WUv75qNfIdLipgUCBhpQPHhzLivecEeHNGpb4pXo151rq3MtgHK2Q3xjy7iyrYsZlcNYtVb+jhb+4toBg==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/http": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/http/-/http-5.33.0.tgz",
-      "integrity": "sha512-dqcPu3igSLlfDUK8Mvma/6o6aq7WtKBlcR8xXwE8tVsO/r4fEB6NevLLN4S4zCr381Jy+RxIIjn3CZx5XHF6JQ==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/http/-/http-5.35.0.tgz",
+      "integrity": "sha512-AaLvi59gdOlxpM3x9krk0l8UcLI9OLBm+o7DNu8y1pgsUKIvf7+ZbY4xU1fJG1HDvUyrU8+NQLrvXgpXx6CmAQ==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/in-app-browser": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/in-app-browser/-/in-app-browser-5.33.0.tgz",
-      "integrity": "sha512-GGIvnYHf8FgaIae9yfRzxqxj0ZAxrYhOJpsHVSq1YKjxnDpRe6ImWWaHHfaeXE5IdUUMUXVuf75VTSBN00VBvA==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/in-app-browser/-/in-app-browser-5.35.0.tgz",
+      "integrity": "sha512-P06lB3ZhMPn1r5qT742uqczRfceY3dPAAAujlGD+m/06DSikKcB4CYDUHrowJbYAXYr8hkHtnQgtthZx5PPZAA==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/ionic-webview": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/ionic-webview/-/ionic-webview-5.33.0.tgz",
-      "integrity": "sha512-Jbr4M6z/Fya51F+QXuPLm/crFlZ9T6YvRM1cygGmFwZ7SgDAimYnjgSO8SEGJmvO2ZekYmFuF56qiVPSvx2wUA==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/ionic-webview/-/ionic-webview-5.35.0.tgz",
+      "integrity": "sha512-OliPzhM1eAhJW0Q4vzhwb0M98IptN9woXuiaDhRyEBBB3PvukKeGWbVBHdquzVSZYuhz0emrJeDDRhTVQEaJ/Q==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/keyboard": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/keyboard/-/keyboard-5.33.0.tgz",
-      "integrity": "sha512-TIYU3LC+Yz/pcpBuHcxLThMNuN9y1E1wBu4SlmS6VlO3/D3R3At2WOg2UK3iA66G2kTJubed5haqTYZjeoA6Uw==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/keyboard/-/keyboard-5.35.0.tgz",
+      "integrity": "sha512-SB4S91NVkdSuNsT8OTS67QnE76yvoPB1BFrz1uL37BGKselgF0xTlJEfLOV7VL82ZteXr4siQr/MLRmBYIc6QQ==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/local-notifications": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/local-notifications/-/local-notifications-5.33.0.tgz",
-      "integrity": "sha512-ljn2uq0rFWpjG1I1qK+mPVX8T3T+09fsF8sZ9nK7uvD9YWShCVz2e2ctf8qPRFq+TWDeDqlnwXz3wCvWmbBUWw==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/local-notifications/-/local-notifications-5.35.0.tgz",
+      "integrity": "sha512-kdn+skyQpTDHBpL8kLlsnZ7n5EzPPytrKZbCYgRZPJR4yNymZqfGbvuXblmpAZUoAMObEj5EWetOyBQcmuNFXw==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/media": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/media/-/media-5.33.0.tgz",
-      "integrity": "sha512-nUu7/FSH41j9+BqHXYVMBd3EifNsTNOufD3NEiMVpHVDWLWqG7tG5h5cFlsVACxUaP4kNpSEke2mjom6CKyjxQ==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/media/-/media-5.35.0.tgz",
+      "integrity": "sha512-pTzQQnwkJpjlvBJ+ye8eazxiBuHqAOkBYzpcez/dY2HK5u9MTFvX/YeeaZ7LetKHoAwBhtN/LSr2sFG7mo9wFg==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/media-capture": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/media-capture/-/media-capture-5.33.0.tgz",
-      "integrity": "sha512-aQTnonVSeijpuZ9B7oYJCjIDqgFVhNdvqkx9vUoaO359BtJGpGS1rNPjEovt4DsqV7oe7TkbmBd8DMEwnB3A2g==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/media-capture/-/media-capture-5.35.0.tgz",
+      "integrity": "sha512-rF97XrAO6Ehc0UG9tO/kVMJ70YIpUzDFr3DdJ6H86cMSROfs8CqP0gsO3x0Uco8sLLCzM7JHqx1oz9gtyiV5PA==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/network": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/network/-/network-5.33.0.tgz",
-      "integrity": "sha512-J+3+rbDTMVNUspa/nV+P8a0hFKDicJK1rVIrm5aLBQdmN9n7WaqJmeMYTptyWOnZxQpktJAJDdhJTEvVmKQjjw==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/network/-/network-5.35.0.tgz",
+      "integrity": "sha512-Iu6dC0xTB0DUfdY+AJDVdQCJlmmn779s0j5QlR7THA1UUWz37LeWQuUvBdipLt66VfxZ2TlayM4HKrbTE/VkCQ==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/push": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/push/-/push-5.33.0.tgz",
-      "integrity": "sha512-H4gOkMbOaNvi97cKKJDggWvAR1BVCUbtdLyWInA0q3cZBHWSc6KcRJGz+hcdDndCQJUnHofs1Tpw8LN3zhjYyQ==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/push/-/push-5.35.0.tgz",
+      "integrity": "sha512-sXaQWnRLe1uyDRraHsPAoU2CLVwVAbTDgJoX1CwxmjILEAa0B7/cJTycbZic8gJ5AYVHdt+JTM5yIE7NfhREHA==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/qr-scanner": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/qr-scanner/-/qr-scanner-5.33.0.tgz",
-      "integrity": "sha512-cyiQv0Rje/fN9/JYoDXP1+ILJkRkjvPtoSx4vd2FsKAuJB60U2DpQfmVEE/KMF4iceTpx4MK/kGzr2WE2AYnIg==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/qr-scanner/-/qr-scanner-5.35.0.tgz",
+      "integrity": "sha512-QElERY4ImURDFCZB/S58F7f73eiTbThxuxeLhIjB9Uogi72FyAYgQR767NAFIBMh58uIlZy4WKKlIrLWMIx4RQ==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/splash-screen": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-5.33.0.tgz",
-      "integrity": "sha512-6PHk5WJeUoc3zru6wTvUmd9DCASvRQoQq1dysYI3JCECaAJ6X0x1RbzM8dBFs3JPLfWtDn+P8eTp+KaA0Xf58w==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-5.35.0.tgz",
+      "integrity": "sha512-q3JNIdONmT8pA5xqVB1XiXRR7upKd/o6b2ZX5pPaAZK5GB1kaD8BlRyfJPvX4H1C1o7mAlyr6Y+r1PpeF7KkWg==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/sqlite": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/sqlite/-/sqlite-5.33.0.tgz",
-      "integrity": "sha512-JIdQJr6bcksotF/3ZMJQZo9lHgaHXvHOOK9R30mM/5Ds5fFu+rUoUf0wvyqaGzEFu94pGw2uPGnfD+WI7x7+1A==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/sqlite/-/sqlite-5.35.0.tgz",
+      "integrity": "sha512-6S2EYifwjdDSwgyaojkUT5sbTV/0s65YH7/XJiReDNf7nWAv49Nu7DggJhdNwDKt9kl0NdeJnCv0SS0zGFJRdw==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/status-bar": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/status-bar/-/status-bar-5.33.0.tgz",
-      "integrity": "sha512-cnyfd42N9gGfhyDtF7wbWoacKg/jfsoJQHOHltfhS4/EjxsVu4bjkwq1YBLMcMY3OIqFDSn2aFcejHn8wVNkDQ==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/status-bar/-/status-bar-5.35.0.tgz",
+      "integrity": "sha512-c9uwQHGf0nO5V+u6cLpCido6FX7QOfjo11BRKwrQoAzpIvSK7cUgh/6PMW3MlkjWs3qNKHRNiHDg7wlac2vcuQ==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/web-intent": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/web-intent/-/web-intent-5.33.0.tgz",
-      "integrity": "sha512-3CIAofrg9nkJQbSftFdMKYOduXy9Ra/a1Q0it6ysm9NFeAQn7iZPThSexBeZ9xiKKj/QTPZtnqAJ0MQ+4mkGag==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/web-intent/-/web-intent-5.35.0.tgz",
+      "integrity": "sha512-N2bzHNKGkMNEe4ugPXHkAst2kdBIESXnN4CbQR0s4LYA5o9Aw8Vx3yFKPuhAHfC5rVDWHytoj2ErX+40cPKg5A==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/zip": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/zip/-/zip-5.33.0.tgz",
-      "integrity": "sha512-hErISQ6/xqVErmVnnha5BR+3GWRNQIVfMTXzprEpNZxQl3iDe1UTIVQdFnMd3Nasz/naY+61Vq/y91PZ1Rrajw==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/zip/-/zip-5.35.0.tgz",
+      "integrity": "sha512-PgGFsXcLWWRrb9UtiKtBHwkKwAamR3l2qMW5qVESns4rBMC628sMaDtIrzsTxarw23Oy3q4kO47tp1pS3Ko0xg==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic/angular": {
-      "version": "5.6.6",
-      "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-5.6.6.tgz",
-      "integrity": "sha512-0psh2n4Y/3sx0e2Yj4WmNcukz0nrETEiJE6Fl4CldoB8QHZcXGi0hKrPAcbGSAF0+lAJ58+Z5Gp/HQVm/MQOMA==",
+      "version": "5.6.13",
+      "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-5.6.13.tgz",
+      "integrity": "sha512-78S6aCcmeyxeLTTSq/pvc94UH+uIuCm8IO2Dumr/nxpKDw16xs0Xf0E07om0H6Ik4hcqUS7Sjur8syu6cY5Zuw==",
       "requires": {
-        "@ionic/core": "5.6.6",
+        "@ionic/core": "5.6.13",
         "tslib": "^1.9.3"
       },
       "dependencies": {
@@ -33643,38 +33478,95 @@
       }
     },
     "@ionic/angular-toolkit": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/@ionic/angular-toolkit/-/angular-toolkit-2.3.3.tgz",
-      "integrity": "sha512-r87mApDLWbLaUtd5LvNHrRlZWxjQhaBBM1yPlk9M98dHOxcX3jy7kv60ZurGZutuvbhXISGvHcvvR90yywDC1A==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@ionic/angular-toolkit/-/angular-toolkit-4.0.0.tgz",
+      "integrity": "sha512-HGRAGUtc1YSwNZ/Q7X7c2QRyYM2AfsSm++OasPrMo3LnPRVr8OIsUih2ithEU7f3CXrViUR7j/Anu90zGsRgzg==",
       "dev": true,
       "requires": {
-        "@schematics/angular": ">=8.0.0",
+        "@schematics/angular": "^12.0.0",
         "cheerio": "1.0.0-rc.3",
         "colorette": "1.1.0",
-        "copy-webpack-plugin": "^6.0.3",
-        "tslib": "^1.9.0",
+        "copy-webpack-plugin": "^6.2.1",
+        "tapable": "^2.1.1",
+        "tslib": "^2.0.3",
         "ws": "^7.0.1"
       },
       "dependencies": {
-        "tslib": {
-          "version": "1.13.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
-          "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
+        "@angular-devkit/core": {
+          "version": "12.1.4",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-12.1.4.tgz",
+          "integrity": "sha512-KOzGD8JbP/7EeUwPiU5x+fo3ZEQ5R4IVW5WoH92PaO3mdpqXC7UL2MWLct8PUe9il9nqJMvrBMldSSvP9PCT2w==",
+          "dev": true,
+          "requires": {
+            "ajv": "8.6.0",
+            "ajv-formats": "2.1.0",
+            "fast-json-stable-stringify": "2.1.0",
+            "magic-string": "0.25.7",
+            "rxjs": "6.6.7",
+            "source-map": "0.7.3"
+          }
+        },
+        "@schematics/angular": {
+          "version": "12.1.4",
+          "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-12.1.4.tgz",
+          "integrity": "sha512-xGqgGI6GWk4EFdKis8FmSESxoLgjnLQbaRE1t1KZCkSKJzqkOj0R9wiDrtZfcrbPxIkLL+3fAk2ThwwPznT6yw==",
+          "dev": true,
+          "requires": {
+            "@angular-devkit/core": "12.1.4",
+            "@angular-devkit/schematics": "12.1.4",
+            "jsonc-parser": "3.0.0"
+          }
+        },
+        "ajv": {
+          "version": "8.6.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz",
+          "integrity": "sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "json-schema-traverse": "^1.0.0",
+            "require-from-string": "^2.0.2",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-formats": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.0.tgz",
+          "integrity": "sha512-USH2jBb+C/hIpwD2iRjp0pe0k+MvzG0mlSn/FIdCgQhUb9ALPRjt2KIQdfZDS9r0ZIeUAg7gOu9KL0PFqGqr5Q==",
+          "dev": true,
+          "requires": {
+            "ajv": "^8.0.0"
+          }
+        },
+        "jsonc-parser": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
+          "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==",
           "dev": true
         },
-        "ws": {
-          "version": "7.3.1",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz",
-          "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==",
+        "rxjs": {
+          "version": "6.6.7",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+          "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
           "dev": true,
-          "requires": {}
+          "requires": {
+            "tslib": "^1.9.0"
+          },
+          "dependencies": {
+            "tslib": {
+              "version": "1.14.1",
+              "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+              "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+              "dev": true
+            }
+          }
         }
       }
     },
     "@ionic/cli": {
-      "version": "6.14.1",
-      "resolved": "https://registry.npmjs.org/@ionic/cli/-/cli-6.14.1.tgz",
-      "integrity": "sha512-QGmA5hjW4PvS8o0f+ptJ2bOknu4dPKzlECFApBiR7ayDgGTDMwmbxrtNpRhDnjdsVlMAzWq8eo9l76831+DBjQ==",
+      "version": "6.16.3",
+      "resolved": "https://registry.npmjs.org/@ionic/cli/-/cli-6.16.3.tgz",
+      "integrity": "sha512-4gune4s02oxft1RC+zXXexr2qT0CuPzRWpP3c3daabf3skZHAV+TfhE7aW26zV9XHS2Mw0YjHuKZHu1/UgMRqw==",
       "dev": true,
       "requires": {
         "@ionic/cli-framework": "5.1.0",
@@ -33705,48 +33597,47 @@
         "tslib": "^2.0.1"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
         },
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
-            "ms": "2.1.2"
+            "color-name": "~1.1.4"
           }
         },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "os-name": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/os-name/-/os-name-4.0.0.tgz",
-          "integrity": "sha512-caABzDdJMbtykt7GmSogEat3faTKQhmZf0BS5l/pZGmP0vPWQjXWqOhbLyK+b6j2/DQPmEvYdzLXJXXLJNVDNg==",
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
-            "macos-release": "^2.2.0",
-            "windows-release": "^4.0.0"
-          }
-        },
-        "windows-release": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-4.0.0.tgz",
-          "integrity": "sha512-OxmV4wzDKB1x7AZaZgXMVsdJ1qER1ed83ZrTYd5Bwq2HfJVg3DJS8nqlAG4sMoJ7mu8cuRmLEYyU13BKwctRAg==",
-          "dev": true,
-          "requires": {
-            "execa": "^4.0.2"
+            "has-flag": "^4.0.0"
           }
         }
       }
@@ -33774,30 +33665,48 @@
         "write-file-atomic": "^3.0.0"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
         },
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
-            "ms": "2.1.2"
+            "color-name": "~1.1.4"
           }
         },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
         }
       }
     },
@@ -33810,23 +33719,6 @@
         "@ionic/utils-terminal": "2.3.1",
         "debug": "^4.0.0",
         "tslib": "^2.0.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
       }
     },
     "@ionic/cli-framework-prompts": {
@@ -33839,175 +33731,16 @@
         "debug": "^4.0.0",
         "inquirer": "^7.0.0",
         "tslib": "^2.0.1"
-      },
-      "dependencies": {
-        "ansi-escapes": {
-          "version": "4.3.2",
-          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-          "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-          "dev": true,
-          "requires": {
-            "type-fest": "^0.21.3"
-          }
-        },
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-          "dev": true
-        },
-        "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "cli-cursor": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-          "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-          "dev": true,
-          "requires": {
-            "restore-cursor": "^3.1.0"
-          }
-        },
-        "cli-width": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
-          "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
-          "dev": true
-        },
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
-        "figures": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-          "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-          "dev": true,
-          "requires": {
-            "escape-string-regexp": "^1.0.5"
-          }
-        },
-        "inquirer": {
-          "version": "7.3.3",
-          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz",
-          "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==",
-          "dev": true,
-          "requires": {
-            "ansi-escapes": "^4.2.1",
-            "chalk": "^4.1.0",
-            "cli-cursor": "^3.1.0",
-            "cli-width": "^3.0.0",
-            "external-editor": "^3.0.3",
-            "figures": "^3.0.0",
-            "lodash": "^4.17.19",
-            "mute-stream": "0.0.8",
-            "run-async": "^2.4.0",
-            "rxjs": "^6.6.0",
-            "string-width": "^4.1.0",
-            "strip-ansi": "^6.0.0",
-            "through": "^2.3.6"
-          }
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "restore-cursor": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-          "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-          "dev": true,
-          "requires": {
-            "onetime": "^5.1.0",
-            "signal-exit": "^3.0.2"
-          }
-        },
-        "rxjs": {
-          "version": "6.6.7",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-          "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
-          "dev": true,
-          "requires": {
-            "tslib": "^1.9.0"
-          },
-          "dependencies": {
-            "tslib": {
-              "version": "1.14.1",
-              "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-              "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-              "dev": true
-            }
-          }
-        },
-        "string-width": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        },
-        "type-fest": {
-          "version": "0.21.3",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-          "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-          "dev": true
-        }
       }
     },
     "@ionic/core": {
-      "version": "5.6.6",
-      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.6.6.tgz",
-      "integrity": "sha512-EbVIXOTVVPxBo7hsarBpRSFNsQ22wBFtWkKmrmliieknG5LUkf5WZBpj4EENQhzYA6c+//7/nfhcD9pWgtAofA==",
+      "version": "5.6.13",
+      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.6.13.tgz",
+      "integrity": "sha512-stN80Q4zdLT7pmUoNNqp+lVjTIhcLSjDN2rzP/gYz8YAkz1L5AB2CkudD5VHWFTBbAEsylih34gAMOrygVNoJQ==",
       "requires": {
         "@stencil/core": "^2.4.0",
-        "ionicons": "^5.5.1",
+        "ionicons": "^5.5.3",
         "tslib": "^2.1.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz",
-          "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w=="
-        }
       }
     },
     "@ionic/utils-array": {
@@ -34018,23 +33751,6 @@
       "requires": {
         "debug": "^4.0.0",
         "tslib": "^2.0.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
       }
     },
     "@ionic/utils-fs": {
@@ -34046,23 +33762,6 @@
         "debug": "^4.0.0",
         "fs-extra": "^9.0.0",
         "tslib": "^2.0.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
       }
     },
     "@ionic/utils-network": {
@@ -34073,23 +33772,6 @@
       "requires": {
         "debug": "^4.0.0",
         "tslib": "^2.0.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
       }
     },
     "@ionic/utils-object": {
@@ -34100,23 +33782,6 @@
       "requires": {
         "debug": "^4.0.0",
         "tslib": "^2.0.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
       }
     },
     "@ionic/utils-process": {
@@ -34131,23 +33796,6 @@
         "signal-exit": "^3.0.3",
         "tree-kill": "^1.2.2",
         "tslib": "^2.0.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
       }
     },
     "@ionic/utils-stream": {
@@ -34158,23 +33806,6 @@
       "requires": {
         "debug": "^4.0.0",
         "tslib": "^2.0.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
       }
     },
     "@ionic/utils-subprocess": {
@@ -34191,23 +33822,6 @@
         "cross-spawn": "^7.0.0",
         "debug": "^4.0.0",
         "tslib": "^2.0.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
       }
     },
     "@ionic/utils-terminal": {
@@ -34224,72 +33838,6 @@
         "tslib": "^2.0.1",
         "untildify": "^4.0.0",
         "wrap-ansi": "^7.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-          "dev": true
-        },
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        },
-        "wrap-ansi": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-          "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.0.0",
-            "string-width": "^4.1.0",
-            "strip-ansi": "^6.0.0"
-          }
-        }
       }
     },
     "@istanbuljs/load-nyc-config": {
@@ -34305,6 +33853,12 @@
         "resolve-from": "^5.0.0"
       },
       "dependencies": {
+        "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+          "dev": true
+        },
         "find-up": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
@@ -34357,66 +33911,99 @@
       }
     },
     "@istanbuljs/schema": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz",
-      "integrity": "sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==",
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
       "dev": true
     },
     "@jest/console": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.5.2.tgz",
-      "integrity": "sha512-lJELzKINpF1v74DXHbCRIkQ/+nUV1M+ntj+X1J8LxCgpmJZjfLmhFejiMSbjjD66fayxl5Z06tbs3HMyuik6rw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.6.2.tgz",
+      "integrity": "sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.5.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "jest-message-util": "^26.5.2",
-        "jest-util": "^26.5.2",
+        "jest-message-util": "^26.6.2",
+        "jest-util": "^26.6.2",
         "slash": "^3.0.0"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
         }
       }
     },
     "@jest/core": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.5.2.tgz",
-      "integrity": "sha512-LLTo1LQMg7eJjG/+P1NYqFof2B25EV1EqzD5FonklihG4UJKiK2JBIvWonunws6W7e+DhNLoFD+g05tCY03eyA==",
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.6.3.tgz",
+      "integrity": "sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw==",
       "dev": true,
       "requires": {
-        "@jest/console": "^26.5.2",
-        "@jest/reporters": "^26.5.2",
-        "@jest/test-result": "^26.5.2",
-        "@jest/transform": "^26.5.2",
-        "@jest/types": "^26.5.2",
+        "@jest/console": "^26.6.2",
+        "@jest/reporters": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.4",
-        "jest-changed-files": "^26.5.2",
-        "jest-config": "^26.5.2",
-        "jest-haste-map": "^26.5.2",
-        "jest-message-util": "^26.5.2",
+        "jest-changed-files": "^26.6.2",
+        "jest-config": "^26.6.3",
+        "jest-haste-map": "^26.6.2",
+        "jest-message-util": "^26.6.2",
         "jest-regex-util": "^26.0.0",
-        "jest-resolve": "^26.5.2",
-        "jest-resolve-dependencies": "^26.5.2",
-        "jest-runner": "^26.5.2",
-        "jest-runtime": "^26.5.2",
-        "jest-snapshot": "^26.5.2",
-        "jest-util": "^26.5.2",
-        "jest-validate": "^26.5.2",
-        "jest-watcher": "^26.5.2",
+        "jest-resolve": "^26.6.2",
+        "jest-resolve-dependencies": "^26.6.3",
+        "jest-runner": "^26.6.3",
+        "jest-runtime": "^26.6.3",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
+        "jest-watcher": "^26.6.2",
         "micromatch": "^4.0.2",
         "p-each-series": "^2.1.0",
         "rimraf": "^3.0.0",
@@ -34424,96 +34011,145 @@
         "strip-ansi": "^6.0.0"
       },
       "dependencies": {
-        "ansi-escapes": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-          "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "type-fest": "^0.11.0"
+            "color-convert": "^2.0.1"
           }
         },
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-          "dev": true
-        },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
         },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^5.0.0"
+            "color-name": "~1.1.4"
           }
         },
-        "type-fest": {
-          "version": "0.11.0",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-          "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
+        },
+        "jest-config": {
+          "version": "26.6.3",
+          "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",
+          "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
+          "dev": true,
+          "requires": {
+            "@babel/core": "^7.1.0",
+            "@jest/test-sequencer": "^26.6.3",
+            "@jest/types": "^26.6.2",
+            "babel-jest": "^26.6.3",
+            "chalk": "^4.0.0",
+            "deepmerge": "^4.2.2",
+            "glob": "^7.1.1",
+            "graceful-fs": "^4.2.4",
+            "jest-environment-jsdom": "^26.6.2",
+            "jest-environment-node": "^26.6.2",
+            "jest-get-type": "^26.3.0",
+            "jest-jasmine2": "^26.6.3",
+            "jest-regex-util": "^26.0.0",
+            "jest-resolve": "^26.6.2",
+            "jest-util": "^26.6.2",
+            "jest-validate": "^26.6.2",
+            "micromatch": "^4.0.2",
+            "pretty-format": "^26.6.2"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "ts-node": {
+          "version": "10.1.0",
+          "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.1.0.tgz",
+          "integrity": "sha512-6szn3+J9WyG2hE+5W8e0ruZrzyk1uFLYye6IGMBadnOzDh8aP7t8CbFpsfCiEx2+wMixAhjFt7lOZC4+l+WbEA==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@tsconfig/node10": "^1.0.7",
+            "@tsconfig/node12": "^1.0.7",
+            "@tsconfig/node14": "^1.0.0",
+            "@tsconfig/node16": "^1.0.1",
+            "arg": "^4.1.0",
+            "create-require": "^1.1.0",
+            "diff": "^4.0.1",
+            "make-error": "^1.1.1",
+            "source-map-support": "^0.5.17",
+            "yn": "3.1.1"
+          }
         }
       }
     },
     "@jest/environment": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.5.2.tgz",
-      "integrity": "sha512-YjhCD/Zhkz0/1vdlS/QN6QmuUdDkpgBdK4SdiVg4Y19e29g4VQYN5Xg8+YuHjdoWGY7wJHMxc79uDTeTOy9Ngw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.6.2.tgz",
+      "integrity": "sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA==",
       "dev": true,
       "requires": {
-        "@jest/fake-timers": "^26.5.2",
-        "@jest/types": "^26.5.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
-        "jest-mock": "^26.5.2"
+        "jest-mock": "^26.6.2"
       }
     },
     "@jest/fake-timers": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.5.2.tgz",
-      "integrity": "sha512-09Hn5Oraqt36V1akxQeWMVL0fR9c6PnEhpgLaYvREXZJAh2H2Y+QLCsl0g7uMoJeoWJAuz4tozk1prbR1Fc1sw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.6.2.tgz",
+      "integrity": "sha512-14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.5.2",
+        "@jest/types": "^26.6.2",
         "@sinonjs/fake-timers": "^6.0.1",
         "@types/node": "*",
-        "jest-message-util": "^26.5.2",
-        "jest-mock": "^26.5.2",
-        "jest-util": "^26.5.2"
+        "jest-message-util": "^26.6.2",
+        "jest-mock": "^26.6.2",
+        "jest-util": "^26.6.2"
       }
     },
     "@jest/globals": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.5.2.tgz",
-      "integrity": "sha512-9PmnFsAUJxpPt1s/stq02acS1YHliVBDNfAWMe1bwdRr1iTCfhbNt3ERQXrO/ZfZSweftoA26Q/2yhSVSWQ3sw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.6.2.tgz",
+      "integrity": "sha512-85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^26.5.2",
-        "@jest/types": "^26.5.2",
-        "expect": "^26.5.2"
+        "@jest/environment": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "expect": "^26.6.2"
       }
     },
     "@jest/reporters": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.5.2.tgz",
-      "integrity": "sha512-zvq6Wvy6MmJq/0QY0YfOPb49CXKSf42wkJbrBPkeypVa8I+XDxijvFuywo6TJBX/ILPrdrlE/FW9vJZh6Rf9vA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.6.2.tgz",
+      "integrity": "sha512-h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw==",
       "dev": true,
       "requires": {
         "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^26.5.2",
-        "@jest/test-result": "^26.5.2",
-        "@jest/transform": "^26.5.2",
-        "@jest/types": "^26.5.2",
+        "@jest/console": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "chalk": "^4.0.0",
         "collect-v8-coverage": "^1.0.0",
         "exit": "^0.1.2",
@@ -34524,51 +34160,73 @@
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^4.0.0",
         "istanbul-reports": "^3.0.2",
-        "jest-haste-map": "^26.5.2",
-        "jest-resolve": "^26.5.2",
-        "jest-util": "^26.5.2",
-        "jest-worker": "^26.5.0",
+        "jest-haste-map": "^26.6.2",
+        "jest-resolve": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-worker": "^26.6.2",
         "node-notifier": "^8.0.0",
         "slash": "^3.0.0",
         "source-map": "^0.6.0",
         "string-length": "^4.0.1",
         "terminal-link": "^2.0.0",
-        "v8-to-istanbul": "^5.0.1"
+        "v8-to-istanbul": "^7.0.0"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
         },
-        "jest-worker": {
-          "version": "26.5.0",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.5.0.tgz",
-          "integrity": "sha512-kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug==",
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
-            "@types/node": "*",
-            "merge-stream": "^2.0.0",
-            "supports-color": "^7.0.0"
+            "color-name": "~1.1.4"
           }
         },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
         }
       }
     },
     "@jest/source-map": {
-      "version": "26.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.5.0.tgz",
-      "integrity": "sha512-jWAw9ZwYHJMe9eZq/WrsHlwF8E3hM9gynlcDpOyCb9bR8wEd9ZNBZCi7/jZyzHxC7t3thZ10gO2IDhu0bPKS5g==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.6.2.tgz",
+      "integrity": "sha512-YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA==",
       "dev": true,
       "requires": {
         "callsites": "^3.0.0",
@@ -34585,46 +34243,46 @@
       }
     },
     "@jest/test-result": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.5.2.tgz",
-      "integrity": "sha512-E/Zp6LURJEGSCWpoMGmCFuuEI1OWuI3hmZwmULV0GsgJBh7u0rwqioxhRU95euUuviqBDN8ruX/vP/4bwYolXw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.6.2.tgz",
+      "integrity": "sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ==",
       "dev": true,
       "requires": {
-        "@jest/console": "^26.5.2",
-        "@jest/types": "^26.5.2",
+        "@jest/console": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "collect-v8-coverage": "^1.0.0"
       }
     },
     "@jest/test-sequencer": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.5.2.tgz",
-      "integrity": "sha512-XmGEh7hh07H2B8mHLFCIgr7gA5Y6Hw1ZATIsbz2fOhpnQ5AnQtZk0gmP0Q5/+mVB2xygO64tVFQxOajzoptkNA==",
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz",
+      "integrity": "sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw==",
       "dev": true,
       "requires": {
-        "@jest/test-result": "^26.5.2",
+        "@jest/test-result": "^26.6.2",
         "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^26.5.2",
-        "jest-runner": "^26.5.2",
-        "jest-runtime": "^26.5.2"
+        "jest-haste-map": "^26.6.2",
+        "jest-runner": "^26.6.3",
+        "jest-runtime": "^26.6.3"
       }
     },
     "@jest/transform": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.5.2.tgz",
-      "integrity": "sha512-AUNjvexh+APhhmS8S+KboPz+D3pCxPvEAGduffaAJYxIFxGi/ytZQkrqcKDUU0ERBAo5R7087fyOYr2oms1seg==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.6.2.tgz",
+      "integrity": "sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.1.0",
-        "@jest/types": "^26.5.2",
+        "@jest/types": "^26.6.2",
         "babel-plugin-istanbul": "^6.0.0",
         "chalk": "^4.0.0",
         "convert-source-map": "^1.4.0",
         "fast-json-stable-stringify": "^2.0.0",
         "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^26.5.2",
+        "jest-haste-map": "^26.6.2",
         "jest-regex-util": "^26.0.0",
-        "jest-util": "^26.5.2",
+        "jest-util": "^26.6.2",
         "micromatch": "^4.0.2",
         "pirates": "^4.0.1",
         "slash": "^3.0.0",
@@ -34632,28 +34290,61 @@
         "write-file-atomic": "^3.0.0"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
         },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
         }
       }
     },
     "@jest/types": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.5.2.tgz",
-      "integrity": "sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+      "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
       "dev": true,
       "requires": {
         "@types/istanbul-lib-coverage": "^2.0.0",
@@ -34663,51 +34354,62 @@
         "chalk": "^4.0.0"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
         }
       }
     },
     "@jsdevtools/coverage-istanbul-loader": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@jsdevtools/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.3.tgz",
-      "integrity": "sha512-TAdNkeGB5Fe4Og+ZkAr1Kvn9by2sfL44IAHFtxlh1BA1XJ5cLpO9iSNki5opWESv3l3vSHsZ9BNKuqFKbEbFaA==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@jsdevtools/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.5.tgz",
+      "integrity": "sha512-EUCPEkaRPvmHjWAAZkWMT7JDzpw7FKB00WTISaiXsbNOd5hCHg77XLA8sLYLFDo1zepYLo2w7GstN8YBqRXZfA==",
       "dev": true,
       "requires": {
         "convert-source-map": "^1.7.0",
-        "istanbul-lib-instrument": "^4.0.1",
-        "loader-utils": "^1.4.0",
+        "istanbul-lib-instrument": "^4.0.3",
+        "loader-utils": "^2.0.0",
         "merge-source-map": "^1.1.0",
-        "schema-utils": "^2.6.4"
-      },
-      "dependencies": {
-        "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        },
-        "loader-utils": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
-          "dev": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^1.0.1"
-          }
-        }
+        "schema-utils": "^2.7.0"
       }
     },
     "@moodlehq/cordova-plugin-file-transfer": {
@@ -34754,34 +34456,33 @@
       }
     },
     "@ngtools/webpack": {
-      "version": "10.0.8",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-10.0.8.tgz",
-      "integrity": "sha512-Qv4v7O4VGeWuXjRThd/mdC2I4cJOgQ7kDrVN7vkDB2EW5xtRB+/4hghvFeO3bD11FLuFvCxBMb0HbwyKoVQgEQ==",
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-11.2.14.tgz",
+      "integrity": "sha512-6q57tEWtUJRsxfTKE19L20iXvNesfVy8hrVdyzVk64DZQh0lIl4/xZT4d5bJCWOuQQDaAeZK4YbEFcYJn7k1yw==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "10.0.8",
-        "enhanced-resolve": "4.1.1",
-        "rxjs": "6.5.5",
-        "webpack-sources": "1.4.3"
+        "@angular-devkit/core": "11.2.14",
+        "enhanced-resolve": "5.7.0",
+        "webpack-sources": "2.2.0"
       },
       "dependencies": {
         "@angular-devkit/core": {
-          "version": "10.0.8",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
-          "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
+          "version": "11.2.14",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
+          "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
           "dev": true,
           "requires": {
-            "ajv": "6.12.3",
+            "ajv": "6.12.6",
             "fast-json-stable-stringify": "2.1.0",
             "magic-string": "0.25.7",
-            "rxjs": "6.5.5",
+            "rxjs": "6.6.3",
             "source-map": "0.7.3"
           }
         },
         "ajv": {
-          "version": "6.12.3",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-          "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
@@ -34789,6 +34490,27 @@
             "json-schema-traverse": "^0.4.1",
             "uri-js": "^4.2.2"
           }
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        },
+        "rxjs": {
+          "version": "6.6.3",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
+          "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
+          "dev": true,
+          "requires": {
+            "tslib": "^1.9.0"
+          }
+        },
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+          "dev": true
         }
       }
     },
@@ -34809,28 +34531,33 @@
       }
     },
     "@nodelib/fs.scandir": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz",
-      "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==",
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
       "requires": {
-        "@nodelib/fs.stat": "2.0.3",
+        "@nodelib/fs.stat": "2.0.5",
         "run-parallel": "^1.1.9"
       }
     },
     "@nodelib/fs.stat": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz",
-      "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA=="
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="
     },
     "@nodelib/fs.walk": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz",
-      "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==",
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
       "requires": {
-        "@nodelib/fs.scandir": "2.1.3",
+        "@nodelib/fs.scandir": "2.1.5",
         "fastq": "^1.6.0"
       }
     },
+    "@npmcli/ci-detect": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/ci-detect/-/ci-detect-1.3.0.tgz",
+      "integrity": "sha512-oN3y7FAROHhrAt7Rr7PnTSwrHrZVRTS2ZbyxeQwSSYD0ifwM3YNgQqbaRmjcWoPyq77MjchusjJDspbzMmip1Q=="
+    },
     "@npmcli/git": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-2.1.0.tgz",
@@ -34859,11 +34586,6 @@
             "lru-cache": "^6.0.0"
           }
         },
-        "mkdirp": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
-        },
         "npm-package-arg": {
           "version": "8.1.5",
           "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.5.tgz",
@@ -34894,6 +34616,11 @@
             "retry": "^0.12.0"
           }
         },
+        "retry": {
+          "version": "0.12.0",
+          "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
+          "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs="
+        },
         "semver": {
           "version": "7.3.5",
           "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
@@ -34914,18 +34641,12 @@
       }
     },
     "@npmcli/move-file": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.0.1.tgz",
-      "integrity": "sha512-Uv6h1sT+0DrblvIrolFtbvM1FgWm+/sy4B3pvLp67Zys+thcukzS5ekn7HsZFGpWP4Q3fYJCljbWQE/XivMRLw==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz",
+      "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==",
       "requires": {
-        "mkdirp": "^1.0.4"
-      },
-      "dependencies": {
-        "mkdirp": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
-        }
+        "mkdirp": "^1.0.4",
+        "rimraf": "^3.0.2"
       }
     },
     "@npmcli/node-gyp": {
@@ -34951,79 +34672,58 @@
         "infer-owner": "^1.0.4",
         "node-gyp": "^7.1.0",
         "read-package-json-fast": "^2.0.1"
-      }
-    },
-    "@schematics/angular": {
-      "version": "10.0.8",
-      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-10.0.8.tgz",
-      "integrity": "sha512-KNO61UGtiKMQSG+NbusqLtwLbxId0y+xpXJt9PKFwi+vaViOO+YzOPREfiFCuQ7q6X8SmNlrMj6sZ34E2YN1pQ==",
-      "dev": true,
-      "requires": {
-        "@angular-devkit/core": "10.0.8",
-        "@angular-devkit/schematics": "10.0.8"
       },
       "dependencies": {
-        "@angular-devkit/core": {
-          "version": "10.0.8",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
-          "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
-          "dev": true,
+        "read-package-json-fast": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz",
+          "integrity": "sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ==",
           "requires": {
-            "ajv": "6.12.3",
-            "fast-json-stable-stringify": "2.1.0",
-            "magic-string": "0.25.7",
-            "rxjs": "6.5.5",
-            "source-map": "0.7.3"
-          }
-        },
-        "ajv": {
-          "version": "6.12.3",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-          "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
+            "json-parse-even-better-errors": "^2.3.0",
+            "npm-normalize-package-bin": "^1.0.1"
           }
         }
       }
     },
-    "@schematics/update": {
-      "version": "0.1000.8",
-      "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.1000.8.tgz",
-      "integrity": "sha512-xHuj6ME3PNTsVUrpftd98LF3WHPM0NU25GcT/n0E/j0/52yDTiaPS3wUnYSK8ZSv4Et4hcyGx7f/LEXAoOKJXw==",
+    "@schematics/angular": {
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-11.2.14.tgz",
+      "integrity": "sha512-nErn5BFYp4HB7mOkt23kF+dyM6zPxolejM8eXQ5vd/rdhcc6ROaMZ0EmeEAWkfqB3+vqaSDz/D2Nm/IjJlyW/Q==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "10.0.8",
-        "@angular-devkit/schematics": "10.0.8",
-        "@yarnpkg/lockfile": "1.1.0",
-        "ini": "1.3.5",
-        "npm-package-arg": "^8.0.0",
-        "pacote": "9.5.12",
-        "rxjs": "6.5.5",
-        "semver": "7.3.2",
-        "semver-intersect": "1.4.0"
+        "@angular-devkit/core": "11.2.14",
+        "@angular-devkit/schematics": "11.2.14",
+        "jsonc-parser": "3.0.0"
       },
       "dependencies": {
         "@angular-devkit/core": {
-          "version": "10.0.8",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
-          "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
+          "version": "11.2.14",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
+          "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
           "dev": true,
           "requires": {
-            "ajv": "6.12.3",
+            "ajv": "6.12.6",
             "fast-json-stable-stringify": "2.1.0",
             "magic-string": "0.25.7",
-            "rxjs": "6.5.5",
+            "rxjs": "6.6.3",
             "source-map": "0.7.3"
           }
         },
+        "@angular-devkit/schematics": {
+          "version": "11.2.14",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.14.tgz",
+          "integrity": "sha512-Ol6+0qdGKzuVJm5gCtQr47X0OCihTfAxI4h047cHYhPFIGGPSvkG/QeJMZugflgoobi2k/xcYokOu/VAkRtWbQ==",
+          "dev": true,
+          "requires": {
+            "@angular-devkit/core": "11.2.14",
+            "ora": "5.3.0",
+            "rxjs": "6.6.3"
+          }
+        },
         "ajv": {
-          "version": "6.12.3",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-          "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
@@ -35031,6 +34731,108 @@
             "json-schema-traverse": "^0.4.1",
             "uri-js": "^4.2.2"
           }
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        },
+        "jsonc-parser": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
+          "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==",
+          "dev": true
+        },
+        "rxjs": {
+          "version": "6.6.3",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
+          "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
+          "dev": true,
+          "requires": {
+            "tslib": "^1.9.0"
+          }
+        },
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+          "dev": true
+        }
+      }
+    },
+    "@schematics/update": {
+      "version": "0.1102.14",
+      "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.1102.14.tgz",
+      "integrity": "sha512-OsWuC0iyNjpST1+hVUUZAegXAFpEFpS5uKYSQF3jsbyw8XHx7oA5/HbEwyr2WkX2EdV1tKrDLz6BrD5b8W6EYw==",
+      "dev": true,
+      "requires": {
+        "@angular-devkit/core": "11.2.14",
+        "@angular-devkit/schematics": "11.2.14",
+        "@yarnpkg/lockfile": "1.1.0",
+        "ini": "2.0.0",
+        "npm-package-arg": "^8.0.0",
+        "pacote": "11.2.4",
+        "semver": "7.3.4",
+        "semver-intersect": "1.4.0"
+      },
+      "dependencies": {
+        "@angular-devkit/core": {
+          "version": "11.2.14",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
+          "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
+          "dev": true,
+          "requires": {
+            "ajv": "6.12.6",
+            "fast-json-stable-stringify": "2.1.0",
+            "magic-string": "0.25.7",
+            "rxjs": "6.6.3",
+            "source-map": "0.7.3"
+          }
+        },
+        "@angular-devkit/schematics": {
+          "version": "11.2.14",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.14.tgz",
+          "integrity": "sha512-Ol6+0qdGKzuVJm5gCtQr47X0OCihTfAxI4h047cHYhPFIGGPSvkG/QeJMZugflgoobi2k/xcYokOu/VAkRtWbQ==",
+          "dev": true,
+          "requires": {
+            "@angular-devkit/core": "11.2.14",
+            "ora": "5.3.0",
+            "rxjs": "6.6.3"
+          }
+        },
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        },
+        "rxjs": {
+          "version": "6.6.3",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
+          "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
+          "dev": true,
+          "requires": {
+            "tslib": "^1.9.0"
+          }
+        },
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+          "dev": true
         }
       }
     },
@@ -35040,9 +34842,9 @@
       "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="
     },
     "@sinonjs/commons": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.1.tgz",
-      "integrity": "sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw==",
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
+      "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
       "dev": true,
       "requires": {
         "type-detect": "4.0.8"
@@ -35058,9 +34860,9 @@
       }
     },
     "@stencil/core": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.5.2.tgz",
-      "integrity": "sha512-bgjPXkSzzg1WnTgVUm6m5ZzpKt602WmA/QljODAW1xVN40OHJdbGblzF/F6MFzqv2c5Cy30CB41arc8qADIdcQ=="
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.6.0.tgz",
+      "integrity": "sha512-QsxWayZyusnqSZrlCl81R71rA3KqFjVVQSH4E0rGN15F1GdQaFonKlHLyCOLKLig1zzC+DQkLLiUuocexuvdeQ=="
     },
     "@szmarczak/http-timer": {
       "version": "1.1.2",
@@ -35075,10 +34877,48 @@
       "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
       "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="
     },
+    "@trysound/sax": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.1.1.tgz",
+      "integrity": "sha512-Z6DoceYb/1xSg5+e+ZlPZ9v0N16ZvZ+wYMraFue4HYrE4ttONKtsvruIRf6t9TBR0YvSOfi1hUU0fJfBLCDYow==",
+      "dev": true
+    },
+    "@tsconfig/node10": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz",
+      "integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "@tsconfig/node12": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz",
+      "integrity": "sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "@tsconfig/node14": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz",
+      "integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "@tsconfig/node16": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz",
+      "integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "@types/babel__core": {
-      "version": "7.1.10",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.10.tgz",
-      "integrity": "sha512-x8OM8XzITIMyiwl5Vmo2B1cR1S1Ipkyv4mdlbJjMa1lmuKvKY9FrBbEANIaMlnWn5Rf7uO+rC/VgYabNkE17Hw==",
+      "version": "7.1.15",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.15.tgz",
+      "integrity": "sha512-bxlMKPDbY8x5h6HBwVzEOk2C8fb6SLfYQ5Jw3uBYuYF1lfWk/kbLd81la82vrIkBb0l+JdmrZaDikPrNxpS/Ew==",
       "dev": true,
       "requires": {
         "@babel/parser": "^7.1.0",
@@ -35089,18 +34929,18 @@
       }
     },
     "@types/babel__generator": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.2.tgz",
-      "integrity": "sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ==",
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.3.tgz",
+      "integrity": "sha512-/GWCmzJWqV7diQW54smJZzWbSFf4QYtF71WCKhcx6Ru/tFyQIY2eiiITcCAeuPbNSvT9YCGkVMqqvSk2Z0mXiA==",
       "dev": true,
       "requires": {
         "@babel/types": "^7.0.0"
       }
     },
     "@types/babel__template": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.3.tgz",
-      "integrity": "sha512-uCoznIPDmnickEi6D0v11SBpW0OuVqHJCa7syXqQHy5uktSCreIlt0iglsCnmvz8yCb38hGcWeseA8cWJSwv5Q==",
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
+      "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
       "dev": true,
       "requires": {
         "@babel/parser": "^7.1.0",
@@ -35108,18 +34948,18 @@
       }
     },
     "@types/babel__traverse": {
-      "version": "7.0.15",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.15.tgz",
-      "integrity": "sha512-Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A==",
+      "version": "7.14.2",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.14.2.tgz",
+      "integrity": "sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==",
       "dev": true,
       "requires": {
         "@babel/types": "^7.3.0"
       }
     },
     "@types/chart.js": {
-      "version": "2.9.31",
-      "resolved": "https://registry.npmjs.org/@types/chart.js/-/chart.js-2.9.31.tgz",
-      "integrity": "sha512-hzS6phN/kx3jClk3iYqEHNnYIRSi4RZrIGJ8CDLjgatpHoftCezvC44uqB3o3OUm9ftU1m7sHG8+RLyPTlACrA==",
+      "version": "2.9.34",
+      "resolved": "https://registry.npmjs.org/@types/chart.js/-/chart.js-2.9.34.tgz",
+      "integrity": "sha512-CtZVk+kh1IN67dv+fB0CWmCLCRrDJgqOj15qPic2B1VCMovNO6B7Vhf/TgPpNscjhAL1j+qUntDMWb9A4ZmPTg==",
       "requires": {
         "moment": "^2.10.2"
       }
@@ -35130,20 +34970,20 @@
       "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
     },
     "@types/dom-mediacapture-record": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/@types/dom-mediacapture-record/-/dom-mediacapture-record-1.0.7.tgz",
-      "integrity": "sha512-ddDIRTO1ajtbxaNo2o7fPJggpN54PZf1ZUJKOjto2ENMJE/9GKUvaw3ZRuQzlS/p0E+PnIcssxfoqYJ4yiXSBw=="
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/@types/dom-mediacapture-record/-/dom-mediacapture-record-1.0.10.tgz",
+      "integrity": "sha512-8O84hHuVhMMLHLybf3y9SQpNcnQSuzVzcJaUNq9+4Ovb7fodS0aQXep4hyMtxd6fe/dyszbHFjFqtyawf4y46A=="
     },
     "@types/faker": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/@types/faker/-/faker-5.1.3.tgz",
-      "integrity": "sha512-7YTyCRoujZWYaCpDLslQJ8QzaFWFLZZ3mZ7Vfr/jJHascRmSd05pYteyt2FK4btF2vXyGq0obuoyLpcF99OvaA==",
+      "version": "5.5.7",
+      "resolved": "https://registry.npmjs.org/@types/faker/-/faker-5.5.7.tgz",
+      "integrity": "sha512-ejzb61Q5zQTtS0ZIafgQ7ahO5ACzmGhG5PfX2hxWyth3k0/aysb4ZOxKQB8DbzwSPppA5jmFBwqnBxjv5hqI5Q==",
       "dev": true
     },
     "@types/glob": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
-      "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==",
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.4.tgz",
+      "integrity": "sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA==",
       "dev": true,
       "requires": {
         "@types/minimatch": "*",
@@ -35151,9 +34991,9 @@
       }
     },
     "@types/graceful-fs": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.3.tgz",
-      "integrity": "sha512-AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
+      "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
       "dev": true,
       "requires": {
         "@types/node": "*"
@@ -35175,136 +35015,54 @@
       }
     },
     "@types/istanbul-reports": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
-      "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
+      "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
       "dev": true,
       "requires": {
         "@types/istanbul-lib-report": "*"
       }
     },
-    "@types/jest": {
-      "version": "26.0.14",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.14.tgz",
-      "integrity": "sha512-Hz5q8Vu0D288x3iWXePSn53W7hAjP0H7EQ6QvDO9c7t46mR0lNOLlfuwQ+JkVxuhygHzlzPX+0jKdA3ZgSh+Vg==",
-      "dev": true,
-      "requires": {
-        "jest-diff": "^25.2.1",
-        "pretty-format": "^25.2.1"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "25.5.0",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
-          "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^1.1.1",
-            "@types/yargs": "^15.0.0",
-            "chalk": "^3.0.0"
-          }
-        },
-        "@types/istanbul-reports": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
-          "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-coverage": "*",
-            "@types/istanbul-lib-report": "*"
-          }
-        },
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-          "dev": true
-        },
-        "diff-sequences": {
-          "version": "25.2.6",
-          "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz",
-          "integrity": "sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==",
-          "dev": true
-        },
-        "jest-diff": {
-          "version": "25.5.0",
-          "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz",
-          "integrity": "sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==",
-          "dev": true,
-          "requires": {
-            "chalk": "^3.0.0",
-            "diff-sequences": "^25.2.6",
-            "jest-get-type": "^25.2.6",
-            "pretty-format": "^25.5.0"
-          }
-        },
-        "jest-get-type": {
-          "version": "25.2.6",
-          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz",
-          "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==",
-          "dev": true
-        },
-        "pretty-format": {
-          "version": "25.5.0",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz",
-          "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==",
-          "dev": true,
-          "requires": {
-            "@jest/types": "^25.5.0",
-            "ansi-regex": "^5.0.0",
-            "ansi-styles": "^4.0.0",
-            "react-is": "^16.12.0"
-          }
-        }
-      }
-    },
     "@types/json-schema": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz",
-      "integrity": "sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==",
-      "dev": true
-    },
-    "@types/json5": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
+      "version": "7.0.8",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.8.tgz",
+      "integrity": "sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg==",
       "dev": true
     },
     "@types/minimatch": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
-      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
+      "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==",
       "dev": true
     },
     "@types/node": {
-      "version": "12.12.64",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.64.tgz",
-      "integrity": "sha512-UV1/ZJMC+HcP902wWdpC43cAcGu0IQk/I5bXjP2aSuCjsk3cE74mDvFrLKga7oDC170ugOAYBwfT4DSQW3akDA==",
+      "version": "12.20.18",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.18.tgz",
+      "integrity": "sha512-YoTiIwdKxM3VLiY2sM05x4iGuTveYiCcDaUVmo1L5ndrXxPGW/NEoZu+pGcBirziomizcZsnsQoemikKcB2fRA==",
       "dev": true
     },
     "@types/normalize-package-data": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-      "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
+      "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
+      "dev": true
+    },
+    "@types/parse-json": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
       "dev": true
     },
     "@types/prettier": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.1.1.tgz",
-      "integrity": "sha512-2zs+O+UkDsJ1Vcp667pd3f8xearMdopz/z54i99wtRDI5KLmngk7vlrYZD0ZjKHaROR03EznlBbVY9PfAEyJIQ==",
-      "dev": true
-    },
-    "@types/q": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz",
-      "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.3.2.tgz",
+      "integrity": "sha512-eI5Yrz3Qv4KPUa/nSIAi0h+qX0XyewOliug5F2QAtuRg6Kjg6jfmxe1GIwoIRhZspD1A0RP8ANrPwvEXXtRFog==",
       "dev": true
     },
     "@types/resize-observer-browser": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@types/resize-observer-browser/-/resize-observer-browser-0.1.5.tgz",
-      "integrity": "sha512-8k/67Z95Goa6Lznuykxkfhq9YU3l1Qe6LNZmwde1u7802a3x8v44oq0j91DICclxatTr0rNnhXx7+VTIetSrSQ==",
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/@types/resize-observer-browser/-/resize-observer-browser-0.1.6.tgz",
+      "integrity": "sha512-61IfTac0s9jvNtBCpyo86QeaN8qqpMGHdK0uGKCCIy2dt5/Yk84VduHIdWAcmkC5QvdkPL0p5eWYgUZtHKKUVg==",
       "dev": true
     },
     "@types/source-list-map": {
@@ -35314,21 +35072,21 @@
       "dev": true
     },
     "@types/stack-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.0.tgz",
-      "integrity": "sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
+      "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
       "dev": true
     },
     "@types/webpack-env": {
-      "version": "1.16.0",
-      "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.16.0.tgz",
-      "integrity": "sha512-Fx+NpfOO0CpeYX2g9bkvX8O5qh9wrU1sOF4g8sft4Mu7z+qfe387YlyY8w8daDyDsKY5vUxM0yxkAYnbkRbZEw==",
+      "version": "1.16.2",
+      "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.16.2.tgz",
+      "integrity": "sha512-vKx7WNQNZDyJveYcHAm9ZxhqSGLYwoyLhrHjLBOkw3a7cT76sTdjgtwyijhk1MaHyRIuSztcVwrUOO/NEu68Dw==",
       "dev": true
     },
     "@types/webpack-sources": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.8.tgz",
-      "integrity": "sha512-JHB2/xZlXOjzjBB6fMOpH1eQAfsrpqVVIbneE0Rok16WXwFaznaI5vfg75U5WgGJm7V9W1c4xeRQDjX/zwvghA==",
+      "version": "0.1.9",
+      "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.9.tgz",
+      "integrity": "sha512-bvzMnzqoK16PQIC8AYHNdW45eREJQMd6WG/msQWX5V2+vZmODCOPb4TJcbgRljTZZTwTM4wUMcsI8FftNA7new==",
       "dev": true,
       "requires": {
         "@types/node": "*",
@@ -35345,238 +35103,202 @@
       }
     },
     "@types/yargs": {
-      "version": "15.0.7",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.7.tgz",
-      "integrity": "sha512-Gf4u3EjaPNcC9cTu4/j2oN14nSVhr8PQ+BvBcBQHAhDZfl0bVIiLgvnRXv/dn58XhTm9UXvBpvJpDlwV65QxOA==",
+      "version": "15.0.14",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.14.tgz",
+      "integrity": "sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==",
       "dev": true,
       "requires": {
         "@types/yargs-parser": "*"
       }
     },
     "@types/yargs-parser": {
-      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz",
-      "integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==",
+      "version": "20.2.1",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz",
+      "integrity": "sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==",
       "dev": true
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.22.0.tgz",
-      "integrity": "sha512-U8SP9VOs275iDXaL08Ln1Fa/wLXfj5aTr/1c0t0j6CdbOnxh+TruXu1p4I0NAvdPBQgoPjHsgKn28mOi0FzfoA==",
+      "version": "4.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.0.tgz",
+      "integrity": "sha512-eiREtqWRZ8aVJcNru7cT/AMVnYd9a2UHsfZT8MR1dW3UUEg6jDv9EQ9Cq4CUPZesyQ58YUpoAADGv71jY8RwgA==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/experimental-utils": "4.22.0",
-        "@typescript-eslint/scope-manager": "4.22.0",
-        "debug": "^4.1.1",
+        "@typescript-eslint/experimental-utils": "4.29.0",
+        "@typescript-eslint/scope-manager": "4.29.0",
+        "debug": "^4.3.1",
         "functional-red-black-tree": "^1.0.1",
-        "lodash": "^4.17.15",
-        "regexpp": "^3.0.0",
-        "semver": "^7.3.2",
-        "tsutils": "^3.17.1"
+        "regexpp": "^3.1.0",
+        "semver": "^7.3.5",
+        "tsutils": "^3.21.0"
       },
       "dependencies": {
         "@typescript-eslint/experimental-utils": {
-          "version": "4.22.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.22.0.tgz",
-          "integrity": "sha512-xJXHHl6TuAxB5AWiVrGhvbGL8/hbiCQ8FiWwObO3r0fnvBdrbWEDy1hlvGQOAWc6qsCWuWMKdVWlLAEMpxnddg==",
+          "version": "4.29.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.0.tgz",
+          "integrity": "sha512-FpNVKykfeaIxlArLUP/yQfv/5/3rhl1ov6RWgud4OgbqWLkEq7lqgQU9iiavZRzpzCRQV4XddyFz3wFXdkiX9w==",
           "dev": true,
           "requires": {
-            "@types/json-schema": "^7.0.3",
-            "@typescript-eslint/scope-manager": "4.22.0",
-            "@typescript-eslint/types": "4.22.0",
-            "@typescript-eslint/typescript-estree": "4.22.0",
-            "eslint-scope": "^5.0.0",
-            "eslint-utils": "^2.0.0"
-          }
-        },
-        "@typescript-eslint/scope-manager": {
-          "version": "4.22.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.22.0.tgz",
-          "integrity": "sha512-OcCO7LTdk6ukawUM40wo61WdeoA7NM/zaoq1/2cs13M7GyiF+T4rxuA4xM+6LeHWjWbss7hkGXjFDRcKD4O04Q==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "4.22.0",
-            "@typescript-eslint/visitor-keys": "4.22.0"
+            "@types/json-schema": "^7.0.7",
+            "@typescript-eslint/scope-manager": "4.29.0",
+            "@typescript-eslint/types": "4.29.0",
+            "@typescript-eslint/typescript-estree": "4.29.0",
+            "eslint-scope": "^5.1.1",
+            "eslint-utils": "^3.0.0"
           }
         },
         "@typescript-eslint/types": {
-          "version": "4.22.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.22.0.tgz",
-          "integrity": "sha512-sW/BiXmmyMqDPO2kpOhSy2Py5w6KvRRsKZnV0c4+0nr4GIcedJwXAq+RHNK4lLVEZAJYFltnnk1tJSlbeS9lYA==",
+          "version": "4.29.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.0.tgz",
+          "integrity": "sha512-2YJM6XfWfi8pgU2HRhTp7WgRw78TCRO3dOmSpAvIQ8MOv4B46JD2chnhpNT7Jq8j0APlIbzO1Bach734xxUl4A==",
           "dev": true
         },
         "@typescript-eslint/typescript-estree": {
-          "version": "4.22.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.0.tgz",
-          "integrity": "sha512-TkIFeu5JEeSs5ze/4NID+PIcVjgoU3cUQUIZnH3Sb1cEn1lBo7StSV5bwPuJQuoxKXlzAObjYTilOEKRuhR5yg==",
+          "version": "4.29.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.0.tgz",
+          "integrity": "sha512-8ZpNHDIOyqzzgZrQW9+xQ4k5hM62Xy2R4RPO3DQxMc5Rq5QkCdSpk/drka+DL9w6sXNzV5nrdlBmf8+x495QXQ==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "4.22.0",
-            "@typescript-eslint/visitor-keys": "4.22.0",
-            "debug": "^4.1.1",
-            "globby": "^11.0.1",
+            "@typescript-eslint/types": "4.29.0",
+            "@typescript-eslint/visitor-keys": "4.29.0",
+            "debug": "^4.3.1",
+            "globby": "^11.0.3",
             "is-glob": "^4.0.1",
-            "semver": "^7.3.2",
-            "tsutils": "^3.17.1"
+            "semver": "^7.3.5",
+            "tsutils": "^3.21.0"
           }
         },
-        "@typescript-eslint/visitor-keys": {
-          "version": "4.22.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.0.tgz",
-          "integrity": "sha512-nnMu4F+s4o0sll6cBSsTeVsT4cwxB7zECK3dFxzEjPBii9xLpq4yqqsy/FU5zMfan6G60DKZSCXAa3sHJZrcYw==",
+        "eslint-utils": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+          "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "4.22.0",
             "eslint-visitor-keys": "^2.0.0"
           }
         },
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+        "semver": {
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
           "dev": true,
           "requires": {
-            "ms": "2.1.2"
+            "lru-cache": "^6.0.0"
           }
-        },
-        "eslint-scope": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-          "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-          "dev": true,
-          "requires": {
-            "esrecurse": "^4.3.0",
-            "estraverse": "^4.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
         }
       }
     },
     "@typescript-eslint/experimental-utils": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.22.0.tgz",
-      "integrity": "sha512-xJXHHl6TuAxB5AWiVrGhvbGL8/hbiCQ8FiWwObO3r0fnvBdrbWEDy1hlvGQOAWc6qsCWuWMKdVWlLAEMpxnddg==",
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.16.1.tgz",
+      "integrity": "sha512-0Hm3LSlMYFK17jO4iY3un1Ve9x1zLNn4EM50Lia+0EV99NdbK+cn0er7HC7IvBA23mBg3P+8dUkMXy4leL33UQ==",
       "dev": true,
       "requires": {
         "@types/json-schema": "^7.0.3",
-        "@typescript-eslint/scope-manager": "4.22.0",
-        "@typescript-eslint/types": "4.22.0",
-        "@typescript-eslint/typescript-estree": "4.22.0",
+        "@typescript-eslint/scope-manager": "4.16.1",
+        "@typescript-eslint/types": "4.16.1",
+        "@typescript-eslint/typescript-estree": "4.16.1",
         "eslint-scope": "^5.0.0",
         "eslint-utils": "^2.0.0"
       },
       "dependencies": {
-        "eslint-scope": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-          "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+        "@typescript-eslint/scope-manager": {
+          "version": "4.16.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.16.1.tgz",
+          "integrity": "sha512-6IlZv9JaurqV0jkEg923cV49aAn8V6+1H1DRfhRcvZUrptQ+UtSKHb5kwTayzOYTJJ/RsYZdcvhOEKiBLyc0Cw==",
           "dev": true,
           "requires": {
-            "esrecurse": "^4.3.0",
-            "estraverse": "^4.1.1"
+            "@typescript-eslint/types": "4.16.1",
+            "@typescript-eslint/visitor-keys": "4.16.1"
+          }
+        },
+        "@typescript-eslint/visitor-keys": {
+          "version": "4.16.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.16.1.tgz",
+          "integrity": "sha512-s/aIP1XcMkEqCNcPQtl60ogUYjSM8FU2mq1O7y5cFf3Xcob1z1iXWNB6cC43Op+NGRTFgGolri6s8z/efA9i1w==",
+          "dev": true,
+          "requires": {
+            "@typescript-eslint/types": "4.16.1",
+            "eslint-visitor-keys": "^2.0.0"
           }
         }
       }
     },
     "@typescript-eslint/parser": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.22.0.tgz",
-      "integrity": "sha512-z/bGdBJJZJN76nvAY9DkJANYgK3nlRstRRi74WHm3jjgf2I8AglrSY+6l7ogxOmn55YJ6oKZCLLy+6PW70z15Q==",
+      "version": "4.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.29.0.tgz",
+      "integrity": "sha512-+92YRNHFdXgq+GhWQPT2bmjX09X7EH36JfgN2/4wmhtwV/HPxozpCNst8jrWcngLtEVd/4zAwA6BKojAlf+YqA==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "4.22.0",
-        "@typescript-eslint/types": "4.22.0",
-        "@typescript-eslint/typescript-estree": "4.22.0",
-        "debug": "^4.1.1"
+        "@typescript-eslint/scope-manager": "4.29.0",
+        "@typescript-eslint/types": "4.29.0",
+        "@typescript-eslint/typescript-estree": "4.29.0",
+        "debug": "^4.3.1"
       },
       "dependencies": {
-        "@typescript-eslint/scope-manager": {
-          "version": "4.22.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.22.0.tgz",
-          "integrity": "sha512-OcCO7LTdk6ukawUM40wo61WdeoA7NM/zaoq1/2cs13M7GyiF+T4rxuA4xM+6LeHWjWbss7hkGXjFDRcKD4O04Q==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "4.22.0",
-            "@typescript-eslint/visitor-keys": "4.22.0"
-          }
-        },
         "@typescript-eslint/types": {
-          "version": "4.22.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.22.0.tgz",
-          "integrity": "sha512-sW/BiXmmyMqDPO2kpOhSy2Py5w6KvRRsKZnV0c4+0nr4GIcedJwXAq+RHNK4lLVEZAJYFltnnk1tJSlbeS9lYA==",
+          "version": "4.29.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.0.tgz",
+          "integrity": "sha512-2YJM6XfWfi8pgU2HRhTp7WgRw78TCRO3dOmSpAvIQ8MOv4B46JD2chnhpNT7Jq8j0APlIbzO1Bach734xxUl4A==",
           "dev": true
         },
         "@typescript-eslint/typescript-estree": {
-          "version": "4.22.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.0.tgz",
-          "integrity": "sha512-TkIFeu5JEeSs5ze/4NID+PIcVjgoU3cUQUIZnH3Sb1cEn1lBo7StSV5bwPuJQuoxKXlzAObjYTilOEKRuhR5yg==",
+          "version": "4.29.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.0.tgz",
+          "integrity": "sha512-8ZpNHDIOyqzzgZrQW9+xQ4k5hM62Xy2R4RPO3DQxMc5Rq5QkCdSpk/drka+DL9w6sXNzV5nrdlBmf8+x495QXQ==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "4.22.0",
-            "@typescript-eslint/visitor-keys": "4.22.0",
-            "debug": "^4.1.1",
-            "globby": "^11.0.1",
+            "@typescript-eslint/types": "4.29.0",
+            "@typescript-eslint/visitor-keys": "4.29.0",
+            "debug": "^4.3.1",
+            "globby": "^11.0.3",
             "is-glob": "^4.0.1",
-            "semver": "^7.3.2",
-            "tsutils": "^3.17.1"
+            "semver": "^7.3.5",
+            "tsutils": "^3.21.0"
           }
         },
-        "@typescript-eslint/visitor-keys": {
-          "version": "4.22.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.0.tgz",
-          "integrity": "sha512-nnMu4F+s4o0sll6cBSsTeVsT4cwxB7zECK3dFxzEjPBii9xLpq4yqqsy/FU5zMfan6G60DKZSCXAa3sHJZrcYw==",
+        "semver": {
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "4.22.0",
-            "eslint-visitor-keys": "^2.0.0"
+            "lru-cache": "^6.0.0"
           }
-        },
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
         }
       }
     },
     "@typescript-eslint/scope-manager": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.22.0.tgz",
-      "integrity": "sha512-OcCO7LTdk6ukawUM40wo61WdeoA7NM/zaoq1/2cs13M7GyiF+T4rxuA4xM+6LeHWjWbss7hkGXjFDRcKD4O04Q==",
+      "version": "4.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.29.0.tgz",
+      "integrity": "sha512-HPq7XAaDMM3DpmuijxLV9Io8/6pQnliiXMQUcAdjpJJSR+fdmbD/zHCd7hMkjJn04UQtCQBtshgxClzg6NIS2w==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "4.22.0",
-        "@typescript-eslint/visitor-keys": "4.22.0"
+        "@typescript-eslint/types": "4.29.0",
+        "@typescript-eslint/visitor-keys": "4.29.0"
+      },
+      "dependencies": {
+        "@typescript-eslint/types": {
+          "version": "4.29.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.0.tgz",
+          "integrity": "sha512-2YJM6XfWfi8pgU2HRhTp7WgRw78TCRO3dOmSpAvIQ8MOv4B46JD2chnhpNT7Jq8j0APlIbzO1Bach734xxUl4A==",
+          "dev": true
+        }
       }
     },
     "@typescript-eslint/types": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.22.0.tgz",
-      "integrity": "sha512-sW/BiXmmyMqDPO2kpOhSy2Py5w6KvRRsKZnV0c4+0nr4GIcedJwXAq+RHNK4lLVEZAJYFltnnk1tJSlbeS9lYA==",
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.16.1.tgz",
+      "integrity": "sha512-nnKqBwMgRlhzmJQF8tnFDZWfunXmJyuXj55xc8Kbfup4PbkzdoDXZvzN8//EiKR27J6vUSU8j4t37yUuYPiLqA==",
       "dev": true
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.0.tgz",
-      "integrity": "sha512-TkIFeu5JEeSs5ze/4NID+PIcVjgoU3cUQUIZnH3Sb1cEn1lBo7StSV5bwPuJQuoxKXlzAObjYTilOEKRuhR5yg==",
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.16.1.tgz",
+      "integrity": "sha512-m8I/DKHa8YbeHt31T+UGd/l8Kwr0XCTCZL3H4HMvvLCT7HU9V7yYdinTOv1gf/zfqNeDcCgaFH2BMsS8x6NvJg==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "4.22.0",
-        "@typescript-eslint/visitor-keys": "4.22.0",
+        "@typescript-eslint/types": "4.16.1",
+        "@typescript-eslint/visitor-keys": "4.16.1",
         "debug": "^4.1.1",
         "globby": "^11.0.1",
         "is-glob": "^4.0.1",
@@ -35584,31 +35306,34 @@
         "tsutils": "^3.17.1"
       },
       "dependencies": {
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+        "@typescript-eslint/visitor-keys": {
+          "version": "4.16.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.16.1.tgz",
+          "integrity": "sha512-s/aIP1XcMkEqCNcPQtl60ogUYjSM8FU2mq1O7y5cFf3Xcob1z1iXWNB6cC43Op+NGRTFgGolri6s8z/efA9i1w==",
           "dev": true,
           "requires": {
-            "ms": "2.1.2"
+            "@typescript-eslint/types": "4.16.1",
+            "eslint-visitor-keys": "^2.0.0"
           }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
         }
       }
     },
     "@typescript-eslint/visitor-keys": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.0.tgz",
-      "integrity": "sha512-nnMu4F+s4o0sll6cBSsTeVsT4cwxB7zECK3dFxzEjPBii9xLpq4yqqsy/FU5zMfan6G60DKZSCXAa3sHJZrcYw==",
+      "version": "4.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.0.tgz",
+      "integrity": "sha512-LoaofO1C/jAJYs0uEpYMXfHboGXzOJeV118X4OsZu9f7rG7Pr9B3+4HTU8+err81rADa4xfQmAxnRnPAI2jp+Q==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "4.22.0",
+        "@typescript-eslint/types": "4.29.0",
         "eslint-visitor-keys": "^2.0.0"
+      },
+      "dependencies": {
+        "@typescript-eslint/types": {
+          "version": "4.29.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.0.tgz",
+          "integrity": "sha512-2YJM6XfWfi8pgU2HRhTp7WgRw78TCRO3dOmSpAvIQ8MOv4B46JD2chnhpNT7Jq8j0APlIbzO1Bach734xxUl4A==",
+          "dev": true
+        }
       }
     },
     "@webassemblyjs/ast": {
@@ -35825,9 +35550,9 @@
       }
     },
     "acorn": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
-      "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
       "dev": true
     },
     "acorn-globals": {
@@ -35838,20 +35563,12 @@
       "requires": {
         "acorn": "^7.1.1",
         "acorn-walk": "^7.1.1"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "7.4.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-          "dev": true
-        }
       }
     },
     "acorn-jsx": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
-      "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
       "dev": true,
       "requires": {}
     },
@@ -35862,67 +35579,30 @@
       "dev": true
     },
     "adjust-sourcemap-loader": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-2.0.0.tgz",
-      "integrity": "sha512-4hFsTsn58+YjrU9qKzML2JSSDqKvN8mUGQ0nNIrfPi8hmIONT4L3uUaT6MKdMsZ9AjsU6D2xDkZxCkbQPxChrA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz",
+      "integrity": "sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==",
       "dev": true,
       "requires": {
-        "assert": "1.4.1",
-        "camelcase": "5.0.0",
-        "loader-utils": "1.2.3",
-        "object-path": "0.11.4",
-        "regex-parser": "2.2.10"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz",
-          "integrity": "sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==",
-          "dev": true
-        },
-        "emojis-list": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-          "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
-          "dev": true
-        },
-        "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        },
-        "loader-utils": {
-          "version": "1.2.3",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
-          "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
-          "dev": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^2.0.0",
-            "json5": "^1.0.1"
-          }
-        }
+        "loader-utils": "^2.0.0",
+        "regex-parser": "^2.2.11"
       }
     },
     "agent-base": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
-      "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
-      "dev": true,
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
       "requires": {
-        "es6-promisify": "^5.0.0"
+        "debug": "4"
       }
     },
     "agentkeepalive": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.5.2.tgz",
-      "integrity": "sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==",
-      "dev": true,
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.1.4.tgz",
+      "integrity": "sha512-+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ==",
       "requires": {
+        "debug": "^4.1.0",
+        "depd": "^1.1.2",
         "humanize-ms": "^1.2.1"
       }
     },
@@ -35936,13 +35616,14 @@
       }
     },
     "ajv": {
-      "version": "6.12.5",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz",
-      "integrity": "sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.2.0.tgz",
+      "integrity": "sha512-WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA==",
+      "dev": true,
       "requires": {
         "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
         "uri-js": "^4.2.2"
       }
     },
@@ -35953,12 +35634,15 @@
       "dev": true,
       "requires": {}
     },
-    "ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+    "ajv-formats": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.0.2.tgz",
+      "integrity": "sha512-Brah4Uo5/U8v76c6euTwtjVFFaVishwnJrQBYpev1JRh4vjA1F4HY3UzQez41YUCszUCXKagG8v6eVRBHV1gkw==",
       "dev": true,
-      "requires": {}
+      "peer": true,
+      "requires": {
+        "ajv": "^8.0.0"
+      }
     },
     "alphanum-sort": {
       "version": "1.0.2",
@@ -35967,9 +35651,9 @@
       "dev": true
     },
     "android-versions": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-1.6.0.tgz",
-      "integrity": "sha512-ojC2Ig7b/KJ6iNtR8e4bacmOsJyEkoERk3CKMIsnH7kJz5z6551NMbrVaRb7KXYavu1d74Uhml/bfcmqT3nAcg==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-1.7.0.tgz",
+      "integrity": "sha512-TCy4b8Dk8YS6A23ZPfhSKqK66JHFq0D8avGYiwvYpjno6HrrcI0DRgHx9+jtkvWYmrsE2vQWgbHJhvGGhhOb0g==",
       "requires": {
         "semver": "^5.7.1"
       },
@@ -35994,6 +35678,21 @@
         "string-width": "^3.0.0"
       },
       "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
+        },
+        "emoji-regex": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+        },
         "string-width": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
@@ -36003,13 +35702,21 @@
             "is-fullwidth-code-point": "^2.0.0",
             "strip-ansi": "^5.1.0"
           }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
         }
       }
     },
     "ansi-colors": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
-      "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
       "dev": true
     },
     "ansi-cyan": {
@@ -36022,9 +35729,13 @@
       }
     },
     "ansi-escapes": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
-      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+      "dev": true,
+      "requires": {
+        "type-fest": "^0.21.3"
+      }
     },
     "ansi-gray": {
       "version": "0.1.1",
@@ -36051,16 +35762,16 @@
       }
     },
     "ansi-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
     },
     "ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "requires": {
-        "color-convert": "^2.0.1"
+        "color-convert": "^1.9.0"
       }
     },
     "ansi-wrap": {
@@ -36070,9 +35781,9 @@
       "dev": true
     },
     "anymatch": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-      "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
       "dev": true,
       "requires": {
         "normalize-path": "^3.0.0",
@@ -36131,30 +35842,25 @@
       "requires": {
         "@babel/runtime": "^7.10.2",
         "@babel/runtime-corejs3": "^7.10.2"
-      },
-      "dependencies": {
-        "@babel/runtime": {
-          "version": "7.13.17",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.17.tgz",
-          "integrity": "sha512-NCdgJEelPTSh+FEFylhnP1ylq848l1z9t9N0j1Lfbcw0+KXGjsTvUmkxy+voLLXB5SOKMbLLx4jxYliGrYQseA==",
-          "dev": true,
-          "requires": {
-            "regenerator-runtime": "^0.13.4"
-          }
-        }
       }
     },
-    "arity-n": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/arity-n/-/arity-n-1.0.4.tgz",
-      "integrity": "sha1-2edrEXM+CFacCEeuezmyhgswt0U=",
-      "dev": true
-    },
     "arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-      "dev": true
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
+      "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
+      "dev": true,
+      "requires": {
+        "arr-flatten": "^1.0.1",
+        "array-slice": "^0.2.3"
+      },
+      "dependencies": {
+        "array-slice": {
+          "version": "0.2.3",
+          "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
+          "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
+          "dev": true
+        }
+      }
     },
     "arr-filter": {
       "version": "1.1.2",
@@ -36181,9 +35887,9 @@
       }
     },
     "arr-union": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
+      "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=",
       "dev": true
     },
     "array-each": {
@@ -36213,98 +35919,6 @@
         "es-abstract": "^1.18.0-next.2",
         "get-intrinsic": "^1.1.1",
         "is-string": "^1.0.5"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.18.0",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz",
-          "integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "get-intrinsic": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.2",
-            "is-callable": "^1.2.3",
-            "is-negative-zero": "^2.0.1",
-            "is-regex": "^1.1.2",
-            "is-string": "^1.0.5",
-            "object-inspect": "^1.9.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.2",
-            "string.prototype.trimend": "^1.0.4",
-            "string.prototype.trimstart": "^1.0.4",
-            "unbox-primitive": "^1.0.0"
-          }
-        },
-        "has-symbols": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-          "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
-          "dev": true
-        },
-        "is-callable": {
-          "version": "1.2.3",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
-          "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
-          "dev": true
-        },
-        "is-negative-zero": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
-          "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
-          "dev": true
-        },
-        "is-regex": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
-          "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-symbols": "^1.0.1"
-          }
-        },
-        "object-inspect": {
-          "version": "1.10.2",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.2.tgz",
-          "integrity": "sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA==",
-          "dev": true
-        },
-        "object.assign": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-          "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.0",
-            "define-properties": "^1.1.3",
-            "has-symbols": "^1.0.1",
-            "object-keys": "^1.1.1"
-          }
-        },
-        "string.prototype.trimend": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
-          "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.3"
-          }
-        },
-        "string.prototype.trimstart": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
-          "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.3"
-          }
-        }
       }
     },
     "array-initial": {
@@ -36357,14 +35971,6 @@
         "default-compare": "^1.0.0",
         "get-value": "^2.0.6",
         "kind-of": "^5.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-          "dev": true
-        }
       }
     },
     "array-union": {
@@ -36395,12 +36001,6 @@
         "es-abstract": "^1.18.0-next.1"
       }
     },
-    "asap": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=",
-      "dev": true
-    },
     "asn1": {
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
@@ -36422,20 +36022,38 @@
       },
       "dependencies": {
         "bn.js": {
-          "version": "4.11.9",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
           "dev": true
         }
       }
     },
     "assert": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
-      "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
+      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
       "dev": true,
       "requires": {
+        "object-assign": "^4.1.1",
         "util": "0.10.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+          "dev": true
+        },
+        "util": {
+          "version": "0.10.3",
+          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.1"
+          }
+        }
       }
     },
     "assert-plus": {
@@ -36522,69 +36140,24 @@
       "dev": true
     },
     "autoprefixer": {
-      "version": "9.8.0",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.0.tgz",
-      "integrity": "sha512-D96ZiIHXbDmU02dBaemyAg53ez+6F5yZmapmgKcjm35yEe1uVDYI8hGW3VYoGRaG290ZFf91YxHrR518vC0u/A==",
+      "version": "10.2.4",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.2.4.tgz",
+      "integrity": "sha512-DCCdUQiMD+P/as8m3XkeTUkUKuuRqLGcwD0nll7wevhqoJfMRpJlkFd1+MQh1pvupjiQuip42lc/VFvfUTMSKw==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.12.0",
-        "caniuse-lite": "^1.0.30001061",
-        "chalk": "^2.4.2",
+        "browserslist": "^4.16.1",
+        "caniuse-lite": "^1.0.30001181",
+        "colorette": "^1.2.1",
+        "fraction.js": "^4.0.13",
         "normalize-range": "^0.1.2",
-        "num2fraction": "^1.2.2",
-        "postcss": "^7.0.30",
         "postcss-value-parser": "^4.1.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "dev": true,
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+        "colorette": {
+          "version": "1.2.2",
+          "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
+          "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
           "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
@@ -36594,9 +36167,9 @@
       "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
     },
     "aws4": {
-      "version": "1.10.1",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz",
-      "integrity": "sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA=="
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
+      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
     },
     "axobject-query": {
       "version": "2.2.0",
@@ -36605,57 +36178,78 @@
       "dev": true
     },
     "babel-jest": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.5.2.tgz",
-      "integrity": "sha512-U3KvymF3SczA3vOL/cgiUFOznfMET+XDIXiWnoJV45siAp2pLMG8i2+/MGZlAC3f/F6Q40LR4M4qDrWZ9wkK8A==",
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.6.3.tgz",
+      "integrity": "sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA==",
       "dev": true,
       "requires": {
-        "@jest/transform": "^26.5.2",
-        "@jest/types": "^26.5.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/babel__core": "^7.1.7",
         "babel-plugin-istanbul": "^6.0.0",
-        "babel-preset-jest": "^26.5.0",
+        "babel-preset-jest": "^26.6.2",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.4",
         "slash": "^3.0.0"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
         }
       }
     },
     "babel-loader": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz",
-      "integrity": "sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==",
+      "version": "8.2.2",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.2.tgz",
+      "integrity": "sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==",
       "dev": true,
       "requires": {
-        "find-cache-dir": "^2.1.0",
+        "find-cache-dir": "^3.3.1",
         "loader-utils": "^1.4.0",
-        "mkdirp": "^0.5.3",
-        "pify": "^4.0.1",
+        "make-dir": "^3.1.0",
         "schema-utils": "^2.6.5"
       },
       "dependencies": {
-        "find-cache-dir": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
-          "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
-          "dev": true,
-          "requires": {
-            "commondir": "^1.0.1",
-            "make-dir": "^2.0.0",
-            "pkg-dir": "^3.0.0"
-          }
-        },
         "json5": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
@@ -36675,22 +36269,6 @@
             "emojis-list": "^3.0.0",
             "json5": "^1.0.1"
           }
-        },
-        "make-dir": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-          "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-          "dev": true,
-          "requires": {
-            "pify": "^4.0.1",
-            "semver": "^5.6.0"
-          }
-        },
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "dev": true
         }
       }
     },
@@ -36722,9 +36300,9 @@
       }
     },
     "babel-plugin-jest-hoist": {
-      "version": "26.5.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.5.0.tgz",
-      "integrity": "sha512-ck17uZFD3CDfuwCLATWZxkkuGGFhMij8quP8CNhwj8ek1mqFgbFzRJ30xwC04LLscj/aKsVFfRST+b5PT7rSuw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz",
+      "integrity": "sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw==",
       "dev": true,
       "requires": {
         "@babel/template": "^7.3.3",
@@ -36734,9 +36312,9 @@
       }
     },
     "babel-preset-current-node-syntax": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.4.tgz",
-      "integrity": "sha512-5/INNCYhUGqw7VbVjT/hb3ucjgkVHKXY7lX3ZjlN4gm565VyFmJUrJ/h+h16ECVB38R/9SF6aACydpKMLZ/c9w==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
+      "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
       "dev": true,
       "requires": {
         "@babel/plugin-syntax-async-generators": "^7.8.4",
@@ -36749,17 +36327,18 @@
         "@babel/plugin-syntax-numeric-separator": "^7.8.3",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
         "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-top-level-await": "^7.8.3"
       }
     },
     "babel-preset-jest": {
-      "version": "26.5.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.5.0.tgz",
-      "integrity": "sha512-F2vTluljhqkiGSJGBg/jOruA8vIIIL11YrxRcO7nviNTMbbofPSHwnm8mgP7d/wS7wRSexRoI6X1A6T74d4LQA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz",
+      "integrity": "sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ==",
       "dev": true,
       "requires": {
-        "babel-plugin-jest-hoist": "^26.5.0",
-        "babel-preset-current-node-syntax": "^0.1.3"
+        "babel-plugin-jest-hoist": "^26.6.2",
+        "babel-preset-current-node-syntax": "^1.0.0"
       }
     },
     "bach": {
@@ -36780,9 +36359,9 @@
       }
     },
     "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
     },
     "base": {
       "version": "0.11.2",
@@ -36808,35 +36387,6 @@
             "is-descriptor": "^1.0.0"
           }
         },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        },
         "isobject": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
@@ -36846,9 +36396,9 @@
       }
     },
     "base64-js": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
-      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
     },
     "batch": {
       "version": "0.6.1",
@@ -36876,9 +36426,9 @@
       "dev": true
     },
     "binary-extensions": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
-      "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
       "dev": true
     },
     "bindings": {
@@ -36889,34 +36439,33 @@
       "optional": true,
       "requires": {
         "file-uri-to-path": "1.0.0"
+      },
+      "dependencies": {
+        "file-uri-to-path": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+          "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+          "dev": true,
+          "optional": true
+        }
       }
     },
     "bl": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.3.tgz",
-      "integrity": "sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==",
-      "optional": true,
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+      "devOptional": true,
       "requires": {
         "buffer": "^5.5.0",
         "inherits": "^2.0.4",
         "readable-stream": "^3.4.0"
       },
       "dependencies": {
-        "buffer": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-          "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-          "optional": true,
-          "requires": {
-            "base64-js": "^1.3.1",
-            "ieee754": "^1.1.13"
-          }
-        },
         "readable-stream": {
           "version": "3.6.0",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
           "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "optional": true,
+          "devOptional": true,
           "requires": {
             "inherits": "^2.0.3",
             "string_decoder": "^1.1.1",
@@ -36932,9 +36481,9 @@
       "dev": true
     },
     "bn.js": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz",
-      "integrity": "sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
+      "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==",
       "dev": true
     },
     "body-parser": {
@@ -36958,6 +36507,19 @@
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
           "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
+        },
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
         }
       }
     },
@@ -37004,38 +36566,53 @@
         "widest-line": "^3.1.0"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
         },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+        "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
         },
-        "is-fullwidth-code-point": {
+        "chalk": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-        },
-        "string-width": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
           "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
           }
         },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "requires": {
-            "ansi-regex": "^5.0.0"
+            "color-name": "~1.1.4"
           }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "type-fest": {
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
         }
       }
     },
@@ -37122,21 +36699,13 @@
       }
     },
     "browserify-rsa": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
-      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
+      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.1.0",
+        "bn.js": "^5.0.0",
         "randombytes": "^2.0.1"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.11.9",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
-          "dev": true
-        }
       }
     },
     "browserify-sign": {
@@ -37185,15 +36754,24 @@
       }
     },
     "browserslist": {
-      "version": "4.14.5",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.5.tgz",
-      "integrity": "sha512-Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA==",
+      "version": "4.16.7",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.7.tgz",
+      "integrity": "sha512-7I4qVwqZltJ7j37wObBe3SoTz+nS8APaNcrBOlgoirb6/HbEU2XxW/LpUDTCngM6iauwFqmRTuOMfyKnFGY5JA==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30001135",
-        "electron-to-chromium": "^1.3.571",
-        "escalade": "^3.1.0",
-        "node-releases": "^1.1.61"
+        "caniuse-lite": "^1.0.30001248",
+        "colorette": "^1.2.2",
+        "electron-to-chromium": "^1.3.793",
+        "escalade": "^3.1.1",
+        "node-releases": "^1.1.73"
+      },
+      "dependencies": {
+        "colorette": {
+          "version": "1.2.2",
+          "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
+          "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
+          "dev": true
+        }
       }
     },
     "bs-logger": {
@@ -37215,14 +36793,13 @@
       }
     },
     "buffer": {
-      "version": "4.9.2",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
-      "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
-      "dev": true,
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "devOptional": true,
       "requires": {
-        "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4",
-        "isarray": "^1.0.0"
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
       }
     },
     "buffer-crc32": {
@@ -37238,9 +36815,9 @@
       "dev": true
     },
     "buffer-from": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
       "dev": true
     },
     "buffer-indexof": {
@@ -37272,51 +36849,27 @@
       "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
     },
     "cacache": {
-      "version": "15.0.3",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.3.tgz",
-      "integrity": "sha512-bc3jKYjqv7k4pWh7I/ixIjfcjPul4V4jme/WbjvwGS5LzoPL/GzXr4C5EgPNLO/QEZl9Oi61iGitYEdwcrwLCQ==",
-      "dev": true,
+      "version": "15.0.5",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.5.tgz",
+      "integrity": "sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A==",
       "requires": {
+        "@npmcli/move-file": "^1.0.1",
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
         "glob": "^7.1.4",
         "infer-owner": "^1.0.4",
-        "lru-cache": "^5.1.1",
+        "lru-cache": "^6.0.0",
         "minipass": "^3.1.1",
         "minipass-collect": "^1.0.2",
         "minipass-flush": "^1.0.5",
         "minipass-pipeline": "^1.2.2",
         "mkdirp": "^1.0.3",
-        "move-file": "^2.0.0",
         "p-map": "^4.0.0",
         "promise-inflight": "^1.0.1",
         "rimraf": "^3.0.2",
         "ssri": "^8.0.0",
         "tar": "^6.0.2",
         "unique-filename": "^1.1.1"
-      },
-      "dependencies": {
-        "lru-cache": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-          "dev": true,
-          "requires": {
-            "yallist": "^3.0.2"
-          }
-        },
-        "mkdirp": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-          "dev": true
-        },
-        "yallist": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-          "dev": true
-        }
       }
     },
     "cache-base": {
@@ -37362,6 +36915,11 @@
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
           "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="
+        },
+        "normalize-url": {
+          "version": "4.5.1",
+          "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
+          "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA=="
         }
       }
     },
@@ -37375,32 +36933,6 @@
         "get-intrinsic": "^1.0.2"
       }
     },
-    "caller-callsite": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
-      "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
-      "dev": true,
-      "requires": {
-        "callsites": "^2.0.0"
-      },
-      "dependencies": {
-        "callsites": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
-          "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
-          "dev": true
-        }
-      }
-    },
-    "caller-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
-      "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
-      "dev": true,
-      "requires": {
-        "caller-callsite": "^2.0.0"
-      }
-    },
     "callsites": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -37417,9 +36949,10 @@
       }
     },
     "camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
+      "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
+      "dev": true
     },
     "caniuse-api": {
       "version": "3.0.0",
@@ -37434,9 +36967,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001197",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001197.tgz",
-      "integrity": "sha512-8aE+sqBqtXz4G8g35Eg/XEaFr2N7rd/VQ6eABGBmNtcB8cN6qNJhMi6oSFy4UWWZgqgL3filHT8Nha4meu3tsw==",
+      "version": "1.0.30001248",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001248.tgz",
+      "integrity": "sha512-NwlQbJkxUFJ8nMErnGtT0QTM2TJ33xgz4KXJSMIrjXIbDVdaYueGyjOrLKRtJC+rTiWfi6j5cnZN1NBiSBJGNw==",
       "dev": true
     },
     "canonical-path": {
@@ -37452,6 +36985,14 @@
       "dev": true,
       "requires": {
         "rsvp": "^4.8.4"
+      },
+      "dependencies": {
+        "rsvp": {
+          "version": "4.8.5",
+          "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
+          "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
+          "dev": true
+        }
       }
     },
     "caseless": {
@@ -37460,12 +37001,13 @@
       "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
     },
     "chalk": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
       "requires": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
       }
     },
     "char-regex": {
@@ -37495,21 +37037,6 @@
       "requires": {
         "chartjs-color-string": "^0.6.0",
         "color-convert": "^1.9.3"
-      },
-      "dependencies": {
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-        }
       }
     },
     "chartjs-color-string": {
@@ -37530,91 +37057,30 @@
         "eslint-plugin-ecmascript-compat": "^1.1.1"
       },
       "dependencies": {
-        "acorn": {
-          "version": "7.4.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-          "dev": true
-        },
-        "ansi-escapes": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-          "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
           "dev": true,
           "requires": {
-            "type-fest": "^0.11.0"
-          },
-          "dependencies": {
-            "type-fest": {
-              "version": "0.11.0",
-              "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-              "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
-              "dev": true
-            }
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
           }
         },
         "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
           "dev": true
         },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
         "astral-regex": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
           "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
           "dev": true
         },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "cli-cursor": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-          "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-          "dev": true,
-          "requires": {
-            "restore-cursor": "^3.1.0"
-          }
-        },
-        "cli-width": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
-          "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
-          "dev": true
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "dev": true,
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-          "dev": true
-        },
         "cross-spawn": {
           "version": "6.0.5",
           "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
@@ -37636,19 +37102,10 @@
             }
           }
         },
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
         "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
           "dev": true
         },
         "eslint": {
@@ -37696,16 +37153,6 @@
             "v8-compile-cache": "^2.0.3"
           }
         },
-        "eslint-scope": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-          "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-          "dev": true,
-          "requires": {
-            "esrecurse": "^4.3.0",
-            "estraverse": "^4.1.1"
-          }
-        },
         "eslint-utils": {
           "version": "1.4.3",
           "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
@@ -37732,15 +37179,6 @@
             "eslint-visitor-keys": "^1.1.0"
           }
         },
-        "figures": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-          "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-          "dev": true,
-          "requires": {
-            "escape-string-regexp": "^1.0.5"
-          }
-        },
         "file-entry-cache": {
           "version": "5.0.1",
           "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
@@ -37776,103 +37214,22 @@
             "type-fest": "^0.8.1"
           }
         },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
         "ignore": {
           "version": "4.0.6",
           "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
           "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
           "dev": true
         },
-        "inquirer": {
-          "version": "7.3.3",
-          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz",
-          "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==",
-          "dev": true,
-          "requires": {
-            "ansi-escapes": "^4.2.1",
-            "chalk": "^4.1.0",
-            "cli-cursor": "^3.1.0",
-            "cli-width": "^3.0.0",
-            "external-editor": "^3.0.3",
-            "figures": "^3.0.0",
-            "lodash": "^4.17.19",
-            "mute-stream": "0.0.8",
-            "run-async": "^2.4.0",
-            "rxjs": "^6.6.0",
-            "string-width": "^4.1.0",
-            "strip-ansi": "^6.0.0",
-            "through": "^2.3.6"
-          },
-          "dependencies": {
-            "ansi-styles": {
-              "version": "4.3.0",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-              "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-              "dev": true,
-              "requires": {
-                "color-convert": "^2.0.1"
-              }
-            },
-            "chalk": {
-              "version": "4.1.0",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-              "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-              "dev": true,
-              "requires": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-              }
-            },
-            "color-convert": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-              "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-              "dev": true,
-              "requires": {
-                "color-name": "~1.1.4"
-              }
-            },
-            "color-name": {
-              "version": "1.1.4",
-              "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-              "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-              "dev": true
-            },
-            "has-flag": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-              "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-              "dev": true
-            },
-            "strip-ansi": {
-              "version": "6.0.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-              "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-              "dev": true,
-              "requires": {
-                "ansi-regex": "^5.0.0"
-              }
-            },
-            "supports-color": {
-              "version": "7.2.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^4.0.0"
-              }
-            }
-          }
-        },
         "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
           "dev": true
         },
         "levn": {
@@ -37885,11 +37242,14 @@
             "type-check": "~0.3.2"
           }
         },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
+        "mkdirp": {
+          "version": "0.5.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
         },
         "optionator": {
           "version": "0.8.3",
@@ -37923,16 +37283,6 @@
           "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
           "dev": true
         },
-        "restore-cursor": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-          "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-          "dev": true,
-          "requires": {
-            "onetime": "^5.1.0",
-            "signal-exit": "^3.0.2"
-          }
-        },
         "rimraf": {
           "version": "2.6.3",
           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
@@ -37942,15 +37292,6 @@
             "glob": "^7.1.3"
           }
         },
-        "rxjs": {
-          "version": "6.6.6",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.6.tgz",
-          "integrity": "sha512-/oTwee4N4iWzAMAL9xdGKjkEHmIwupR3oXbQjCKywF1BeFohswF3vZdogbmEF6pZkOsXTzWkrZszrWpQTByYVg==",
-          "dev": true,
-          "requires": {
-            "tslib": "^1.9.0"
-          }
-        },
         "semver": {
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -37981,51 +37322,26 @@
             "ansi-styles": "^3.2.0",
             "astral-regex": "^1.0.0",
             "is-fullwidth-code-point": "^2.0.0"
-          },
-          "dependencies": {
-            "is-fullwidth-code-point": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-              "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-              "dev": true
-            }
           }
         },
         "string-width": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
           "dev": true,
           "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          },
-          "dependencies": {
-            "strip-ansi": {
-              "version": "6.0.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-              "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-              "dev": true,
-              "requires": {
-                "ansi-regex": "^5.0.0"
-              }
-            }
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
           }
         },
-        "strip-json-comments": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-          "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
           "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "ansi-regex": "^4.1.0"
           }
         },
         "table": {
@@ -38038,39 +37354,8 @@
             "lodash": "^4.17.14",
             "slice-ansi": "^2.1.0",
             "string-width": "^3.0.0"
-          },
-          "dependencies": {
-            "emoji-regex": {
-              "version": "7.0.3",
-              "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-              "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-              "dev": true
-            },
-            "is-fullwidth-code-point": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-              "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-              "dev": true
-            },
-            "string-width": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-              "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-              "dev": true,
-              "requires": {
-                "emoji-regex": "^7.0.1",
-                "is-fullwidth-code-point": "^2.0.0",
-                "strip-ansi": "^5.1.0"
-              }
-            }
           }
         },
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-          "dev": true
-        },
         "type-check": {
           "version": "0.3.2",
           "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
@@ -38080,6 +37365,12 @@
             "prelude-ls": "~1.1.2"
           }
         },
+        "type-fest": {
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+          "dev": true
+        },
         "which": {
           "version": "1.3.1",
           "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -38103,77 +37394,22 @@
         "htmlparser2": "^3.9.1",
         "lodash": "^4.15.0",
         "parse5": "^3.0.1"
-      },
-      "dependencies": {
-        "css-select": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
-          "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
-          "dev": true,
-          "requires": {
-            "boolbase": "~1.0.0",
-            "css-what": "2.1",
-            "domutils": "1.5.1",
-            "nth-check": "~1.0.1"
-          }
-        },
-        "css-what": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
-          "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
-          "dev": true
-        },
-        "dom-serializer": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
-          "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
-          "dev": true,
-          "requires": {
-            "domelementtype": "^1.3.0",
-            "entities": "^1.1.1"
-          }
-        },
-        "domutils": {
-          "version": "1.5.1",
-          "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
-          "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
-          "dev": true,
-          "requires": {
-            "dom-serializer": "0",
-            "domelementtype": "1"
-          }
-        },
-        "entities": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-          "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
-          "dev": true
-        },
-        "parse5": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz",
-          "integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==",
-          "dev": true,
-          "requires": {
-            "@types/node": "*"
-          }
-        }
       }
     },
     "chokidar": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz",
-      "integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==",
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
+      "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
       "dev": true,
       "requires": {
-        "anymatch": "~3.1.1",
+        "anymatch": "~3.1.2",
         "braces": "~3.0.2",
-        "fsevents": "~2.1.2",
-        "glob-parent": "~5.1.0",
+        "fsevents": "~2.3.2",
+        "glob-parent": "~5.1.2",
         "is-binary-path": "~2.1.0",
         "is-glob": "~4.0.1",
         "normalize-path": "~3.0.0",
-        "readdirp": "~3.4.0"
+        "readdirp": "~3.6.0"
       }
     },
     "chownr": {
@@ -38182,21 +37418,10 @@
       "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="
     },
     "chrome-trace-event": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz",
-      "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==",
-      "dev": true,
-      "requires": {
-        "tslib": "^1.9.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "1.13.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
-          "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
-          "dev": true
-        }
-      }
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
+      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
+      "dev": true
     },
     "ci-info": {
       "version": "2.0.0",
@@ -38214,12 +37439,18 @@
       }
     },
     "circular-dependency-plugin": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-5.2.0.tgz",
-      "integrity": "sha512-7p4Kn/gffhQaavNfyDFg7LS5S/UT1JAjyGd4UqR2+jzoYF02eDkj0Ec3+48TsIa4zghjLY87nQHIh/ecK9qLdw==",
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-5.2.2.tgz",
+      "integrity": "sha512-g38K9Cm5WRwlaH6g03B9OEz/0qRizI+2I7n+Gz+L5DxXJAPAiWQvwlYNm1V1jkdpUv95bOe/ASm2vfi/G560jQ==",
       "dev": true,
       "requires": {}
     },
+    "cjs-module-lexer": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz",
+      "integrity": "sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==",
+      "dev": true
+    },
     "class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
@@ -38232,6 +37463,12 @@
         "static-extend": "^0.1.1"
       },
       "dependencies": {
+        "arr-union": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+          "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+          "dev": true
+        },
         "define-property": {
           "version": "0.2.5",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
@@ -38241,6 +37478,57 @@
             "is-descriptor": "^0.1.0"
           }
         },
+        "is-accessor-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "is-data-descriptor": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "is-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^0.1.6",
+            "is-data-descriptor": "^0.1.4",
+            "kind-of": "^5.0.0"
+          }
+        },
         "isobject": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
@@ -38277,46 +37565,35 @@
       "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw=="
     },
     "cli-cursor": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
-      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+      "dev": true,
       "requires": {
-        "restore-cursor": "^2.0.0"
+        "restore-cursor": "^3.1.0"
       }
     },
     "cli-spinners": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.4.0.tgz",
-      "integrity": "sha512-sJAofoarcm76ZGpuooaO0eDy8saEy+YoZBLjC4h8srt4jeBnkYeOgqxgsJQTpyt2LjI5PTfLJHSL+41Yu4fEJA==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.0.tgz",
+      "integrity": "sha512-t+4/y50K/+4xcCRosKkA7W4gTr1MySvLV0q+PxmG7FJ5g+66ChKurYjxBCjHggHH3HA5Hh9cy+lcUGWDqVH+4Q==",
       "dev": true
     },
     "cli-width": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
-      "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw=="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
+      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
+      "dev": true
     },
     "cliui": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
       "dev": true,
       "requires": {
-        "string-width": "^3.1.0",
-        "strip-ansi": "^5.2.0",
-        "wrap-ansi": "^5.1.0"
-      },
-      "dependencies": {
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        }
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
       }
     },
     "clone": {
@@ -38340,6 +37617,29 @@
         "is-plain-object": "^2.0.4",
         "kind-of": "^6.0.2",
         "shallow-clone": "^3.0.0"
+      },
+      "dependencies": {
+        "is-plain-object": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+          "dev": true,
+          "requires": {
+            "isobject": "^3.0.1"
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        }
       }
     },
     "clone-response": {
@@ -38348,6 +37648,13 @@
       "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
       "requires": {
         "mimic-response": "^1.0.0"
+      },
+      "dependencies": {
+        "mimic-response": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
+          "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="
+        }
       }
     },
     "clone-stats": {
@@ -38373,69 +37680,6 @@
       "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
       "dev": true
     },
-    "coa": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
-      "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
-      "dev": true,
-      "requires": {
-        "@types/q": "^1.5.1",
-        "chalk": "^2.4.1",
-        "q": "^1.1.2"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "dev": true,
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
     "code-point-at": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
@@ -38468,62 +37712,38 @@
         "object-visit": "^1.0.0"
       }
     },
-    "color": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/color/-/color-3.1.2.tgz",
-      "integrity": "sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==",
-      "dev": true,
+    "color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "requires": {
-        "color-convert": "^1.9.1",
-        "color-string": "^1.5.2"
+        "color-name": "1.1.3"
       },
       "dependencies": {
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "dev": true,
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
         "color-name": {
           "version": "1.1.3",
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-          "dev": true
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
         }
       }
     },
-    "color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "requires": {
-        "color-name": "~1.1.4"
-      }
-    },
     "color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
-    "color-string": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz",
-      "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==",
-      "dev": true,
-      "requires": {
-        "color-name": "^1.0.0",
-        "simple-swizzle": "^0.2.2"
-      }
-    },
     "color-support": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
       "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
       "dev": true
     },
+    "colord": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/colord/-/colord-2.5.0.tgz",
+      "integrity": "sha512-EeswvDseZAYGju9qVFHIf1ftRsWayhVZgCaZvp25UZzDON7ESYj/MoXD+qvf1lnRrgweeaCGHr389t2r1Huo7w==",
+      "dev": true
+    },
     "colorette": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.1.0.tgz",
@@ -38549,9 +37769,9 @@
       }
     },
     "commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "version": "2.17.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
+      "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
       "dev": true
     },
     "comment-parser": {
@@ -38572,15 +37792,6 @@
       "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
       "dev": true
     },
-    "compose-function": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/compose-function/-/compose-function-3.0.3.tgz",
-      "integrity": "sha1-ntZ18TzFRQHTCVCkhv9qe6OrGF8=",
-      "dev": true,
-      "requires": {
-        "arity-n": "^1.0.4"
-      }
-    },
     "compressible": {
       "version": "2.0.18",
       "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
@@ -38601,6 +37812,21 @@
         "on-headers": "~1.0.2",
         "safe-buffer": "5.1.2",
         "vary": "~1.1.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
       }
     },
     "concat-map": {
@@ -38723,12 +37949,6 @@
       "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
       "dev": true
     },
-    "contains-path": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
-      "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=",
-      "dev": true
-    },
     "content-disposition": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
@@ -38743,9 +37963,9 @@
       "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
     },
     "convert-source-map": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
-      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
+      "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
       "dev": true,
       "requires": {
         "safe-buffer": "~5.1.1"
@@ -38767,6 +37987,15 @@
       "integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==",
       "dev": true
     },
+    "copy-anything": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.3.tgz",
+      "integrity": "sha512-GK6QUtisv4fNS+XcI7shX0Gx9ORg7QqIznyfho79JTnX1XhLiyZHfftvGiziqzRiEi/Bjhgpi+D2o7HxJFPnDQ==",
+      "dev": true,
+      "requires": {
+        "is-what": "^3.12.0"
+      }
+    },
     "copy-concurrently": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
@@ -38781,6 +38010,15 @@
         "run-queue": "^1.0.0"
       },
       "dependencies": {
+        "mkdirp": {
+          "version": "0.5.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        },
         "rimraf": {
           "version": "2.7.1",
           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -38799,72 +38037,84 @@
       "dev": true
     },
     "copy-props": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz",
-      "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.5.tgz",
+      "integrity": "sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw==",
       "dev": true,
       "requires": {
-        "each-props": "^1.3.0",
-        "is-plain-object": "^2.0.1"
+        "each-props": "^1.3.2",
+        "is-plain-object": "^5.0.0"
       }
     },
     "copy-webpack-plugin": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.0.3.tgz",
-      "integrity": "sha512-q5m6Vz4elsuyVEIUXr7wJdIdePWTubsqVbEMvf1WQnHGv0Q+9yPRu7MtYFPt+GBOXRav9lvIINifTQ1vSCs+eA==",
+      "version": "6.3.2",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.3.2.tgz",
+      "integrity": "sha512-MgJ1uouLIbDg4ST1GzqrGQyKoXY5iPqi6fghFqarijam7FQcBa/r6Rg0VkoIuzx75Xq8iAMghyOueMkWUQ5OaA==",
       "dev": true,
       "requires": {
-        "cacache": "^15.0.4",
+        "cacache": "^15.0.5",
         "fast-glob": "^3.2.4",
         "find-cache-dir": "^3.3.1",
         "glob-parent": "^5.1.1",
         "globby": "^11.0.1",
         "loader-utils": "^2.0.0",
         "normalize-path": "^3.0.0",
-        "p-limit": "^3.0.1",
-        "schema-utils": "^2.7.0",
-        "serialize-javascript": "^4.0.0",
+        "p-limit": "^3.0.2",
+        "schema-utils": "^3.0.0",
+        "serialize-javascript": "^5.0.1",
         "webpack-sources": "^1.4.3"
       },
       "dependencies": {
-        "cacache": {
-          "version": "15.0.5",
-          "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.5.tgz",
-          "integrity": "sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A==",
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
           "dev": true,
           "requires": {
-            "@npmcli/move-file": "^1.0.1",
-            "chownr": "^2.0.0",
-            "fs-minipass": "^2.0.0",
-            "glob": "^7.1.4",
-            "infer-owner": "^1.0.4",
-            "lru-cache": "^6.0.0",
-            "minipass": "^3.1.1",
-            "minipass-collect": "^1.0.2",
-            "minipass-flush": "^1.0.5",
-            "minipass-pipeline": "^1.2.2",
-            "mkdirp": "^1.0.3",
-            "p-map": "^4.0.0",
-            "promise-inflight": "^1.0.1",
-            "rimraf": "^3.0.2",
-            "ssri": "^8.0.0",
-            "tar": "^6.0.2",
-            "unique-filename": "^1.1.1"
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
           }
         },
-        "mkdirp": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+        "ajv-keywords": {
+          "version": "3.5.2",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+          "dev": true,
+          "requires": {}
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
           "dev": true
         },
-        "p-limit": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.0.2.tgz",
-          "integrity": "sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==",
+        "schema-utils": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
           "dev": true,
           "requires": {
-            "p-try": "^2.0.0"
+            "@types/json-schema": "^7.0.8",
+            "ajv": "^6.12.5",
+            "ajv-keywords": "^3.5.2"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "webpack-sources": {
+          "version": "1.4.3",
+          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+          "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+          "dev": true,
+          "requires": {
+            "source-list-map": "^2.0.0",
+            "source-map": "~0.6.1"
           }
         }
       }
@@ -38890,22 +38140,67 @@
       }
     },
     "cordova-android": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-9.1.0.tgz",
-      "integrity": "sha512-bzOX9E4eQsOSpa06oZZ7XAGq3DwB73juhhj0oPqHH/khWk0mkCD4aiVYMFoc0fmIaSQvzbY1ww7L6UBW5pyGfg==",
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-10.0.1.tgz",
+      "integrity": "sha512-Hv8H9b4JE2wi9vBBl6K84ZWh01nkFAdIgIGnv3T2Gd8srmCwOw1f3snDCjpcCqxD0jiBAkN5wk5hCIY+EmHJyA==",
       "requires": {
-        "android-versions": "^1.5.0",
-        "cordova-common": "^4.0.1",
-        "execa": "^4.0.2",
-        "fast-glob": "^3.2.4",
-        "fs-extra": "^9.0.1",
-        "is-path-inside": "^3.0.2",
-        "nopt": "^4.0.3",
+        "android-versions": "^1.7.0",
+        "cordova-common": "^4.0.2",
+        "execa": "^5.1.1",
+        "fast-glob": "^3.2.7",
+        "fs-extra": "^10.0.0",
+        "is-path-inside": "^3.0.3",
+        "nopt": "^5.0.0",
         "properties-parser": "^0.3.1",
-        "semver": "^7.3.4",
+        "semver": "^7.3.5",
+        "untildify": "^4.0.0",
         "which": "^2.0.2"
       },
       "dependencies": {
+        "execa": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+          "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+          "requires": {
+            "cross-spawn": "^7.0.3",
+            "get-stream": "^6.0.0",
+            "human-signals": "^2.1.0",
+            "is-stream": "^2.0.0",
+            "merge-stream": "^2.0.0",
+            "npm-run-path": "^4.0.1",
+            "onetime": "^5.1.2",
+            "signal-exit": "^3.0.3",
+            "strip-final-newline": "^2.0.0"
+          }
+        },
+        "fs-extra": {
+          "version": "10.0.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
+          "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
+          "requires": {
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^6.0.1",
+            "universalify": "^2.0.0"
+          }
+        },
+        "get-stream": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+          "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="
+        },
+        "human-signals": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+          "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="
+        },
+        "nopt": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
+          "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
+          "requires": {
+            "abbrev": "1"
+          }
+        },
         "semver": {
           "version": "7.3.5",
           "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
@@ -38994,189 +38289,6 @@
         "resolve": "^1.15.1",
         "semver": "^7.1.3",
         "which": "^2.0.2"
-      },
-      "dependencies": {
-        "agent-base": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-          "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-          "requires": {
-            "debug": "4"
-          }
-        },
-        "agentkeepalive": {
-          "version": "4.1.4",
-          "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.1.4.tgz",
-          "integrity": "sha512-+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ==",
-          "requires": {
-            "debug": "^4.1.0",
-            "depd": "^1.1.2",
-            "humanize-ms": "^1.2.1"
-          }
-        },
-        "cacache": {
-          "version": "15.2.0",
-          "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.2.0.tgz",
-          "integrity": "sha512-uKoJSHmnrqXgthDFx/IU6ED/5xd+NNGe+Bb+kLZy7Ku4P+BaiWEUflAKPZ7eAzsYGcsAGASJZsybXp+quEcHTw==",
-          "requires": {
-            "@npmcli/move-file": "^1.0.1",
-            "chownr": "^2.0.0",
-            "fs-minipass": "^2.0.0",
-            "glob": "^7.1.4",
-            "infer-owner": "^1.0.4",
-            "lru-cache": "^6.0.0",
-            "minipass": "^3.1.1",
-            "minipass-collect": "^1.0.2",
-            "minipass-flush": "^1.0.5",
-            "minipass-pipeline": "^1.2.2",
-            "mkdirp": "^1.0.3",
-            "p-map": "^4.0.0",
-            "promise-inflight": "^1.0.1",
-            "rimraf": "^3.0.2",
-            "ssri": "^8.0.1",
-            "tar": "^6.0.2",
-            "unique-filename": "^1.1.1"
-          }
-        },
-        "debug": {
-          "version": "4.3.2",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-          "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "err-code": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
-          "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="
-        },
-        "http-proxy-agent": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
-          "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
-          "requires": {
-            "@tootallnate/once": "1",
-            "agent-base": "6",
-            "debug": "4"
-          }
-        },
-        "https-proxy-agent": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-          "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
-          "requires": {
-            "agent-base": "6",
-            "debug": "4"
-          }
-        },
-        "make-fetch-happen": {
-          "version": "9.0.4",
-          "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.0.4.tgz",
-          "integrity": "sha512-sQWNKMYqSmbAGXqJg2jZ+PmHh5JAybvwu0xM8mZR/bsTjGiTASj3ldXJV7KFHy1k/IJIBkjxQFoWIVsv9+PQMg==",
-          "requires": {
-            "agentkeepalive": "^4.1.3",
-            "cacache": "^15.2.0",
-            "http-cache-semantics": "^4.1.0",
-            "http-proxy-agent": "^4.0.1",
-            "https-proxy-agent": "^5.0.0",
-            "is-lambda": "^1.0.1",
-            "lru-cache": "^6.0.0",
-            "minipass": "^3.1.3",
-            "minipass-collect": "^1.0.2",
-            "minipass-fetch": "^1.3.2",
-            "minipass-flush": "^1.0.5",
-            "minipass-pipeline": "^1.2.4",
-            "negotiator": "^0.6.2",
-            "promise-retry": "^2.0.1",
-            "socks-proxy-agent": "^5.0.0",
-            "ssri": "^8.0.0"
-          }
-        },
-        "mkdirp": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-        },
-        "npm-packlist": {
-          "version": "2.2.2",
-          "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.2.2.tgz",
-          "integrity": "sha512-Jt01acDvJRhJGthnUJVF/w6gumWOZxO7IkpY/lsX9//zqQgnF7OJaxgQXcerd4uQOLu7W5bkb4mChL9mdfm+Zg==",
-          "requires": {
-            "glob": "^7.1.6",
-            "ignore-walk": "^3.0.3",
-            "npm-bundled": "^1.1.1",
-            "npm-normalize-package-bin": "^1.0.1"
-          }
-        },
-        "npm-registry-fetch": {
-          "version": "11.0.0",
-          "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-11.0.0.tgz",
-          "integrity": "sha512-jmlgSxoDNuhAtxUIG6pVwwtz840i994dL14FoNVZisrmZW5kWd63IUTNv1m/hyRSGSqWjCUp/YZlS1BJyNp9XA==",
-          "requires": {
-            "make-fetch-happen": "^9.0.1",
-            "minipass": "^3.1.3",
-            "minipass-fetch": "^1.3.0",
-            "minipass-json-stream": "^1.0.1",
-            "minizlib": "^2.0.0",
-            "npm-package-arg": "^8.0.0"
-          }
-        },
-        "pacote": {
-          "version": "11.3.5",
-          "resolved": "https://registry.npmjs.org/pacote/-/pacote-11.3.5.tgz",
-          "integrity": "sha512-fT375Yczn4zi+6Hkk2TBe1x1sP8FgFsEIZ2/iWaXY2r/NkhDJfxbcn5paz1+RTFCyNf+dPnaoBDJoAxXSU8Bkg==",
-          "requires": {
-            "@npmcli/git": "^2.1.0",
-            "@npmcli/installed-package-contents": "^1.0.6",
-            "@npmcli/promise-spawn": "^1.2.0",
-            "@npmcli/run-script": "^1.8.2",
-            "cacache": "^15.0.5",
-            "chownr": "^2.0.0",
-            "fs-minipass": "^2.1.0",
-            "infer-owner": "^1.0.4",
-            "minipass": "^3.1.3",
-            "mkdirp": "^1.0.3",
-            "npm-package-arg": "^8.0.1",
-            "npm-packlist": "^2.1.4",
-            "npm-pick-manifest": "^6.0.0",
-            "npm-registry-fetch": "^11.0.0",
-            "promise-retry": "^2.0.1",
-            "read-package-json-fast": "^2.0.1",
-            "rimraf": "^3.0.2",
-            "ssri": "^8.0.1",
-            "tar": "^6.1.0"
-          }
-        },
-        "pify": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz",
-          "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA=="
-        },
-        "promise-retry": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
-          "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
-          "requires": {
-            "err-code": "^2.0.2",
-            "retry": "^0.12.0"
-          }
-        },
-        "socks-proxy-agent": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz",
-          "integrity": "sha512-vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ==",
-          "requires": {
-            "agent-base": "^6.0.2",
-            "debug": "4",
-            "socks": "^2.3.3"
-          }
-        }
       }
     },
     "cordova-ios": {
@@ -39203,28 +38315,6 @@
           "requires": {
             "abbrev": "1"
           }
-        },
-        "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
-        "uuid": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
-          "integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg=="
-        },
-        "xcode": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/xcode/-/xcode-3.0.1.tgz",
-          "integrity": "sha512-kCz5k7J7XbJtjABOvkc5lJmkiDh8VhjVCGNiqdKCscmVpdVUpEAyXv1xmCLkQJ5dsHqx3IPO4XW+NTDhU/fatA==",
-          "requires": {
-            "simple-plist": "^1.1.0",
-            "uuid": "^7.0.3"
-          }
         }
       }
     },
@@ -39249,13 +38339,6 @@
         "semver": "^7.3.2",
         "stringify-package": "^1.0.1",
         "write-file-atomic": "^3.0.3"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz",
-          "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA=="
-        }
       }
     },
     "cordova-plugin-add-swift-support": {
@@ -39272,13 +38355,27 @@
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
           "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+        },
+        "uuid": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+        },
+        "xcode": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/xcode/-/xcode-2.1.0.tgz",
+          "integrity": "sha512-uCrmPITrqTEzhn0TtT57fJaNaw8YJs1aCzs+P/QqxsDbvPZSv7XMPPwXrKvHtD6pLjBM/NaVwraWJm8q83Y4iQ==",
+          "requires": {
+            "simple-plist": "^1.0.0",
+            "uuid": "^3.3.2"
+          }
         }
       }
     },
     "cordova-plugin-advanced-http": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-advanced-http/-/cordova-plugin-advanced-http-3.1.0.tgz",
-      "integrity": "sha512-zlTlNJyTttE7TV5vW2WGvHqpbKMDVrr1meZU0fy4y3ObrI/hGk2UDcDNwpZdMfaytNZwDKU4sRgsTgQYdFNBew=="
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-advanced-http/-/cordova-plugin-advanced-http-3.2.0.tgz",
+      "integrity": "sha512-NOjkxLvP8z7vrnrwuXO0bWGJviK31KO1ov0Nel1BqbNi2rZNafL5RRxC1/RHXik252xf070xDgBvDwdWv7yxjA=="
     },
     "cordova-plugin-badge": {
       "version": "0.8.8",
@@ -39286,9 +38383,9 @@
       "integrity": "sha512-RhIBtd5xhD/iLnxjt35jvOae28oNW/wtMZBOmQR3Rf0y4wirvA1bpAZEhBoFqL+rZGhsd6ddOdQXdex1T0DRyQ=="
     },
     "cordova-plugin-camera": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-camera/-/cordova-plugin-camera-5.0.1.tgz",
-      "integrity": "sha512-9gXyZvI8u9KzsZuqmB8Yw+uheF+7f+usMAwvOMw7L7pqbykg+bm9US5zjhJbwit3A1cSblgZkpBafe5cFiMcTA=="
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-camera/-/cordova-plugin-camera-5.0.2.tgz",
+      "integrity": "sha512-iR9W9S+USg/YTjwB+6rnIqJ1mZ02da0Q2VDU0Twf/CccEJO+006T5RM/NYDkBRs6vMCw7rWXroCNJOPBLLETPQ=="
     },
     "cordova-plugin-chooser": {
       "version": "1.3.2",
@@ -39351,9 +38448,9 @@
       "integrity": "sha512-NwO3qDBNL/vJxUxBTPNOA1HvkDf9eTeGH8JSZiwy1jq2W2mJKQEDBwqWkaEQS19Yd/MQTiw0cykxg5D7u4J6cQ=="
     },
     "cordova-plugin-prevent-override": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-prevent-override/-/cordova-plugin-prevent-override-1.0.0.tgz",
-      "integrity": "sha512-/+3q5r4K5RahCpiYVmZQBjq10x4jj+6CMjYtZyx9jdMWeV+yFE+ItFcO1NeUAEWd2iHC5YPD0P2tHiHx5kscsw=="
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-prevent-override/-/cordova-plugin-prevent-override-1.0.1.tgz",
+      "integrity": "sha512-yy1JZ+lXTR33Ai1yloT6wdXJXe0a3LrfgnKORuPZv/QkbiqfIQKjy0R4zRP8qljaJSelF/xv5CgrVt8iS0SkBg=="
     },
     "cordova-plugin-screen-orientation": {
       "version": "3.0.2",
@@ -39371,19 +38468,19 @@
       "integrity": "sha512-ThmXzl6QIKWFXf4wWw7Q/zpB+VKkz3VM958+5A0sXD4jmR++u7KnGttLksXshVwWr6lvGwUebLYtIyXwS4Ovcg=="
     },
     "cordova-plugin-whitelist": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.4.tgz",
-      "integrity": "sha512-EYC5eQFVkoYXq39l7tYKE6lEjHJ04mvTmKXxGL7quHLdFPfJMNzru/UYpn92AOfpl3PQaZmou78C7EgmFOwFQQ=="
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.5.tgz",
+      "integrity": "sha512-+v/VzCYBdGsIxJTP2m+RWaq7l/NLu7b976w6XGJUFiN2TVOeaGrytaR4jRy0w9akRai8uKFeBmuGHmlS/sOeCA=="
     },
     "cordova-plugin-wkuserscript": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-wkuserscript/-/cordova-plugin-wkuserscript-1.0.0.tgz",
-      "integrity": "sha512-g18TohV1T+iWQJImYUCZc44x2ywHTH3ycgEJyxo4WTL9eYm4T7lNkyl1svzQGI97e8W5hQxUqAcmvpVcnWvjSQ=="
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-wkuserscript/-/cordova-plugin-wkuserscript-1.0.1.tgz",
+      "integrity": "sha512-qhb2JOFy+XnLIbPubDuAcZyf6fSsrQ2syM8PqAVvW7JJQVR7i64pZDLHmgYQrGN+2pO1fG8EdR2aUp5O0Kx/HA=="
     },
     "cordova-plugin-wkwebview-cookies": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-wkwebview-cookies/-/cordova-plugin-wkwebview-cookies-1.0.0.tgz",
-      "integrity": "sha512-bQRnc/1UNu2XDb6ds+RuAZGA8FM2MuQb4z45J/CaDfjSs60OSvxGVKo3okrM/okYosZqWJFygrPah0MK3lDERQ=="
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-wkwebview-cookies/-/cordova-plugin-wkwebview-cookies-1.0.1.tgz",
+      "integrity": "sha512-x984mlj21Newei7UFPTu4N3NJSTBZuuQXkDNJxq8FTGM1RH/YECqYAzk6ekk/regFamj1bCQ3IB8XJeCm5/dhA=="
     },
     "cordova-plugin-zip": {
       "version": "3.1.0",
@@ -39400,6 +38497,46 @@
         "express": "^4.17.1",
         "open": "^7.0.3",
         "which": "^2.0.2"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
     "cordova-sqlite-storage": {
@@ -39416,9 +38553,9 @@
       "integrity": "sha512-dTBxYaX/RGzH6+pp49o4sb3FuHCvhrssaKn1XMJ4LL3f9dnvz3rhFK2LdcWrdFkhOLOndnW/azUkbzZd+WWhRA=="
     },
     "cordova-support-google-services": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/cordova-support-google-services/-/cordova-support-google-services-1.2.1.tgz",
-      "integrity": "sha512-EnFjKAE9oI2uzyUvEfWpLgTM200nuJVvShaA4yyz9wMKBUN+H/BRG1byd1ibZz3sSihNKi3FxjQPxmmEn6/IfA=="
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/cordova-support-google-services/-/cordova-support-google-services-1.4.1.tgz",
+      "integrity": "sha512-1VgF9kFCOMbzgdnsDtSKaYGmWXmeciGP8+N0wTcTkL2m6Qrs1xZ82NiYEJYXe7BjHad2d06liWThqQv7iXt5HA=="
     },
     "cordova.plugins.diagnostic": {
       "version": "5.0.2",
@@ -39438,17 +38575,17 @@
       }
     },
     "core-js": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.9.1.tgz",
-      "integrity": "sha512-gSjRvzkxQc1zjM/5paAmL4idJBFzuJoo+jDjF1tStYFMV2ERfD02HhahhCGXUyHxQRG4yFKVSdO6g62eoRMcDg=="
+      "version": "3.16.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.16.0.tgz",
+      "integrity": "sha512-5+5VxRFmSf97nM8Jr2wzOwLqRo6zphH2aX+7KsAUONObyzakDNq2G/bgbhinxB4PoV9L3aXQYhiDKyIKWd2c8g=="
     },
     "core-js-compat": {
-      "version": "3.6.5",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz",
-      "integrity": "sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==",
+      "version": "3.16.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.16.0.tgz",
+      "integrity": "sha512-5D9sPHCdewoUK7pSUPfTF7ZhLh8k9/CoJXWUEo+F1dZT5Z1DVgcuRqUKhjeKW+YLb8f21rTFgWwQJiNw1hoZ5Q==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.8.5",
+        "browserslist": "^4.16.6",
         "semver": "7.0.0"
       },
       "dependencies": {
@@ -39461,9 +38598,9 @@
       }
     },
     "core-js-pure": {
-      "version": "3.11.1",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.11.1.tgz",
-      "integrity": "sha512-2JukQi8HgAOCD5CSimxWWXVrUBoA9Br796uIA5Z06bIjt7PBBI19ircFaAxplgE1mJf3x2BY6MkT/HWA/UryPg==",
+      "version": "3.16.0",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.16.0.tgz",
+      "integrity": "sha512-wzlhZNepF/QA9yvx3ePDgNGudU5KDB8lu/TRPKelYA/QtSnkS/cLl2W+TIdEX1FAFcBr0YpY7tPDlcmXJ7AyiQ==",
       "dev": true
     },
     "core-util-is": {
@@ -39472,33 +38609,16 @@
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "cosmiconfig": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
-      "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz",
+      "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==",
       "dev": true,
       "requires": {
-        "import-fresh": "^2.0.0",
-        "is-directory": "^0.3.1",
-        "js-yaml": "^3.13.1",
-        "parse-json": "^4.0.0"
-      },
-      "dependencies": {
-        "import-fresh": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
-          "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
-          "dev": true,
-          "requires": {
-            "caller-path": "^2.0.0",
-            "resolve-from": "^3.0.0"
-          }
-        },
-        "resolve-from": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-          "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
-          "dev": true
-        }
+        "@types/parse-json": "^4.0.0",
+        "import-fresh": "^3.2.1",
+        "parse-json": "^5.0.0",
+        "path-type": "^4.0.0",
+        "yaml": "^1.10.0"
       }
     },
     "create-ecdh": {
@@ -39512,9 +38632,9 @@
       },
       "dependencies": {
         "bn.js": {
-          "version": "4.11.9",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
           "dev": true
         }
       }
@@ -39546,6 +38666,78 @@
         "sha.js": "^2.4.8"
       }
     },
+    "create-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
+      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "critters": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/critters/-/critters-0.0.7.tgz",
+      "integrity": "sha512-qUF2SaAWFYjNPdCcPpu68p2DnHiosia84yx5mPTlUMQjkjChR+n6sO1/I7yn2U2qNDgSPTd2SoaTIDQcUL+EwQ==",
+      "dev": true,
+      "requires": {
+        "chalk": "^4.1.0",
+        "css": "^3.0.0",
+        "parse5": "^6.0.1",
+        "parse5-htmlparser2-tree-adapter": "^6.0.1",
+        "pretty-bytes": "^5.3.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "parse5": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+          "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
     "cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -39581,15 +38773,14 @@
       "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA=="
     },
     "css": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
-      "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/css/-/css-3.0.0.tgz",
+      "integrity": "sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.3",
+        "inherits": "^2.0.4",
         "source-map": "^0.6.1",
-        "source-map-resolve": "^0.5.2",
-        "urix": "^0.1.0"
+        "source-map-resolve": "^0.6.0"
       },
       "dependencies": {
         "source-map": {
@@ -39601,67 +38792,75 @@
       }
     },
     "css-color-names": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
-      "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-1.0.1.tgz",
+      "integrity": "sha512-/loXYOch1qU1biStIFsHH8SxTmOseh1IJqFvy8IujXOm1h+QjUdDhkzOrR5HG8K8mlxREj0yfi8ewCHx0eMxzA==",
       "dev": true
     },
     "css-declaration-sorter": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz",
-      "integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.1.1.tgz",
+      "integrity": "sha512-BZ1aOuif2Sb7tQYY1GeCjG7F++8ggnwUkH5Ictw0mrdpqpEd+zWmcPdstnH2TItlb74FqR0DrVEieon221T/1Q==",
       "dev": true,
       "requires": {
-        "postcss": "^7.0.1",
         "timsort": "^0.3.0"
       }
     },
     "css-loader": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.5.3.tgz",
-      "integrity": "sha512-UEr9NH5Lmi7+dguAm+/JSPovNjYbm2k3TK58EiwQHzOHH5Jfq1Y+XoP2bQO6TMn7PptMd0opxxedAWcaSTRKHw==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-5.0.1.tgz",
+      "integrity": "sha512-cXc2ti9V234cq7rJzFKhirb2L2iPy8ZjALeVJAozXYz9te3r4eqLSixNAbMDJSgJEQywqXzs8gonxaboeKqwiw==",
       "dev": true,
       "requires": {
-        "camelcase": "^5.3.1",
+        "camelcase": "^6.2.0",
         "cssesc": "^3.0.0",
-        "icss-utils": "^4.1.1",
-        "loader-utils": "^1.2.3",
-        "normalize-path": "^3.0.0",
-        "postcss": "^7.0.27",
-        "postcss-modules-extract-imports": "^2.0.0",
-        "postcss-modules-local-by-default": "^3.0.2",
-        "postcss-modules-scope": "^2.2.0",
-        "postcss-modules-values": "^3.0.0",
-        "postcss-value-parser": "^4.0.3",
-        "schema-utils": "^2.6.6",
-        "semver": "^6.3.0"
+        "icss-utils": "^5.0.0",
+        "loader-utils": "^2.0.0",
+        "postcss": "^8.1.4",
+        "postcss-modules-extract-imports": "^3.0.0",
+        "postcss-modules-local-by-default": "^4.0.0",
+        "postcss-modules-scope": "^3.0.0",
+        "postcss-modules-values": "^4.0.0",
+        "postcss-value-parser": "^4.1.0",
+        "schema-utils": "^3.0.0",
+        "semver": "^7.3.2"
       },
       "dependencies": {
-        "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
           "dev": true,
           "requires": {
-            "minimist": "^1.2.0"
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
           }
         },
-        "loader-utils": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+        "ajv-keywords": {
+          "version": "3.5.2",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
           "dev": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^1.0.1"
-          }
+          "requires": {}
         },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
           "dev": true
+        },
+        "schema-utils": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+          "dev": true,
+          "requires": {
+            "@types/json-schema": "^7.0.8",
+            "ajv": "^6.12.5",
+            "ajv-keywords": "^3.5.2"
+          }
         }
       }
     },
@@ -39672,33 +38871,60 @@
       "dev": true,
       "requires": {
         "css": "^2.0.0"
+      },
+      "dependencies": {
+        "css": {
+          "version": "2.2.4",
+          "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
+          "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "source-map": "^0.6.1",
+            "source-map-resolve": "^0.5.2",
+            "urix": "^0.1.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "source-map-resolve": {
+          "version": "0.5.3",
+          "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+          "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+          "dev": true,
+          "requires": {
+            "atob": "^2.1.2",
+            "decode-uri-component": "^0.2.0",
+            "resolve-url": "^0.2.1",
+            "source-map-url": "^0.4.0",
+            "urix": "^0.1.0"
+          }
+        }
       }
     },
     "css-select": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
-      "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
+      "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
       "dev": true,
       "requires": {
-        "boolbase": "^1.0.0",
-        "css-what": "^3.2.1",
-        "domutils": "^1.7.0",
-        "nth-check": "^1.0.2"
+        "boolbase": "~1.0.0",
+        "css-what": "2.1",
+        "domutils": "1.5.1",
+        "nth-check": "~1.0.1"
       }
     },
-    "css-select-base-adapter": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
-      "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
-      "dev": true
-    },
     "css-tree": {
-      "version": "1.0.0-alpha.37",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz",
-      "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
+      "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
       "dev": true,
       "requires": {
-        "mdn-data": "2.0.4",
+        "mdn-data": "2.0.14",
         "source-map": "^0.6.1"
       },
       "dependencies": {
@@ -39711,9 +38937,9 @@
       }
     },
     "css-what": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.1.tgz",
-      "integrity": "sha512-wHOppVDKl4vTAOWzJt5Ek37Sgd9qq1Bmj/T1OjvicWbU5W7ru7Pqbn0Jdqii3Drx/h+dixHKXNhZYx7blthL7g==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
+      "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
       "dev": true
     },
     "cssesc": {
@@ -39723,113 +38949,67 @@
       "dev": true
     },
     "cssnano": {
-      "version": "4.1.10",
-      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz",
-      "integrity": "sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.0.2.tgz",
+      "integrity": "sha512-8JK3EnPsjQsULme9/e5M2hF564f/480hwsdcHvQ7ZtAIMfQ1O3SCfs+b8Mjf5KJxhYApyRshR2QSovEJi2K72Q==",
       "dev": true,
       "requires": {
-        "cosmiconfig": "^5.0.0",
-        "cssnano-preset-default": "^4.0.7",
-        "is-resolvable": "^1.0.0",
-        "postcss": "^7.0.0"
+        "cosmiconfig": "^7.0.0",
+        "cssnano-preset-default": "^5.0.1",
+        "is-resolvable": "^1.1.0"
       }
     },
     "cssnano-preset-default": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz",
-      "integrity": "sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA==",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.1.3.tgz",
+      "integrity": "sha512-qo9tX+t4yAAZ/yagVV3b+QBKeLklQbmgR3wI7mccrDcR+bEk9iHgZN1E7doX68y9ThznLya3RDmR+nc7l6/2WQ==",
       "dev": true,
       "requires": {
-        "css-declaration-sorter": "^4.0.1",
-        "cssnano-util-raw-cache": "^4.0.1",
-        "postcss": "^7.0.0",
-        "postcss-calc": "^7.0.1",
-        "postcss-colormin": "^4.0.3",
-        "postcss-convert-values": "^4.0.1",
-        "postcss-discard-comments": "^4.0.2",
-        "postcss-discard-duplicates": "^4.0.2",
-        "postcss-discard-empty": "^4.0.1",
-        "postcss-discard-overridden": "^4.0.1",
-        "postcss-merge-longhand": "^4.0.11",
-        "postcss-merge-rules": "^4.0.3",
-        "postcss-minify-font-values": "^4.0.2",
-        "postcss-minify-gradients": "^4.0.2",
-        "postcss-minify-params": "^4.0.2",
-        "postcss-minify-selectors": "^4.0.2",
-        "postcss-normalize-charset": "^4.0.1",
-        "postcss-normalize-display-values": "^4.0.2",
-        "postcss-normalize-positions": "^4.0.2",
-        "postcss-normalize-repeat-style": "^4.0.2",
-        "postcss-normalize-string": "^4.0.2",
-        "postcss-normalize-timing-functions": "^4.0.2",
-        "postcss-normalize-unicode": "^4.0.1",
-        "postcss-normalize-url": "^4.0.1",
-        "postcss-normalize-whitespace": "^4.0.2",
-        "postcss-ordered-values": "^4.1.2",
-        "postcss-reduce-initial": "^4.0.3",
-        "postcss-reduce-transforms": "^4.0.2",
-        "postcss-svgo": "^4.0.2",
-        "postcss-unique-selectors": "^4.0.1"
+        "css-declaration-sorter": "^6.0.3",
+        "cssnano-utils": "^2.0.1",
+        "postcss-calc": "^8.0.0",
+        "postcss-colormin": "^5.2.0",
+        "postcss-convert-values": "^5.0.1",
+        "postcss-discard-comments": "^5.0.1",
+        "postcss-discard-duplicates": "^5.0.1",
+        "postcss-discard-empty": "^5.0.1",
+        "postcss-discard-overridden": "^5.0.1",
+        "postcss-merge-longhand": "^5.0.2",
+        "postcss-merge-rules": "^5.0.2",
+        "postcss-minify-font-values": "^5.0.1",
+        "postcss-minify-gradients": "^5.0.1",
+        "postcss-minify-params": "^5.0.1",
+        "postcss-minify-selectors": "^5.1.0",
+        "postcss-normalize-charset": "^5.0.1",
+        "postcss-normalize-display-values": "^5.0.1",
+        "postcss-normalize-positions": "^5.0.1",
+        "postcss-normalize-repeat-style": "^5.0.1",
+        "postcss-normalize-string": "^5.0.1",
+        "postcss-normalize-timing-functions": "^5.0.1",
+        "postcss-normalize-unicode": "^5.0.1",
+        "postcss-normalize-url": "^5.0.2",
+        "postcss-normalize-whitespace": "^5.0.1",
+        "postcss-ordered-values": "^5.0.2",
+        "postcss-reduce-initial": "^5.0.1",
+        "postcss-reduce-transforms": "^5.0.1",
+        "postcss-svgo": "^5.0.2",
+        "postcss-unique-selectors": "^5.0.1"
       }
     },
-    "cssnano-util-get-arguments": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz",
-      "integrity": "sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8=",
-      "dev": true
-    },
-    "cssnano-util-get-match": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz",
-      "integrity": "sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0=",
-      "dev": true
-    },
-    "cssnano-util-raw-cache": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz",
-      "integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==",
+    "cssnano-utils": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-2.0.1.tgz",
+      "integrity": "sha512-i8vLRZTnEH9ubIyfdZCAdIdgnHAUeQeByEeQ2I7oTilvP9oHO6RScpeq3GsFUVqeB8uZgOQ9pw8utofNn32hhQ==",
       "dev": true,
-      "requires": {
-        "postcss": "^7.0.0"
-      }
-    },
-    "cssnano-util-same-parent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz",
-      "integrity": "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==",
-      "dev": true
+      "requires": {}
     },
     "csso": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-4.0.3.tgz",
-      "integrity": "sha512-NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
+      "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
       "dev": true,
       "requires": {
-        "css-tree": "1.0.0-alpha.39"
-      },
-      "dependencies": {
-        "css-tree": {
-          "version": "1.0.0-alpha.39",
-          "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.39.tgz",
-          "integrity": "sha512-7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA==",
-          "dev": true,
-          "requires": {
-            "mdn-data": "2.0.6",
-            "source-map": "^0.6.1"
-          }
-        },
-        "mdn-data": {
-          "version": "2.0.6",
-          "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.6.tgz",
-          "integrity": "sha512-rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
+        "css-tree": "^1.1.2"
       }
     },
     "cssom": {
@@ -39905,19 +39085,13 @@
       }
     },
     "debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
       "requires": {
-        "ms": "2.0.0"
+        "ms": "2.1.2"
       }
     },
-    "debuglog": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz",
-      "integrity": "sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=",
-      "dev": true
-    },
     "decamelize": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
@@ -39925,9 +39099,9 @@
       "dev": true
     },
     "decimal.js": {
-      "version": "10.2.1",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.1.tgz",
-      "integrity": "sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==",
+      "version": "10.3.1",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz",
+      "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==",
       "dev": true
     },
     "decode-uri-component": {
@@ -39937,11 +39111,12 @@
       "dev": true
     },
     "decompress-response": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
-      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
+      "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
+      "optional": true,
       "requires": {
-        "mimic-response": "^1.0.0"
+        "mimic-response": "^2.0.0"
       }
     },
     "dedent": {
@@ -39987,14 +39162,6 @@
       "dev": true,
       "requires": {
         "kind-of": "^5.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-          "dev": true
-        }
       }
     },
     "default-gateway": {
@@ -40144,35 +39311,6 @@
         "isobject": "^3.0.1"
       },
       "dependencies": {
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        },
         "isobject": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
@@ -40243,6 +39381,12 @@
           "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
           "dev": true
         },
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+          "dev": true
+        },
         "rimraf": {
           "version": "2.7.1",
           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -40328,21 +39472,11 @@
       "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA=="
     },
     "detect-node": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
-      "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
+      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
       "dev": true
     },
-    "dezalgo": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz",
-      "integrity": "sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=",
-      "dev": true,
-      "requires": {
-        "asap": "^2.0.0",
-        "wrappy": "1"
-      }
-    },
     "diff": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
@@ -40350,9 +39484,9 @@
       "dev": true
     },
     "diff-sequences": {
-      "version": "26.5.0",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.5.0.tgz",
-      "integrity": "sha512-ZXx86srb/iYy6jG71k++wBN9P9J05UNQ5hQHQd9MtMPvcqXPx/vKU69jfHV637D00Q2gSgPk2D+jSx3l1lDW/Q==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz",
+      "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==",
       "dev": true
     },
     "diffie-hellman": {
@@ -40367,9 +39501,9 @@
       },
       "dependencies": {
         "bn.js": {
-          "version": "4.11.9",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
           "dev": true
         }
       }
@@ -40389,9 +39523,9 @@
       "dev": true
     },
     "dns-packet": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
-      "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz",
+      "integrity": "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==",
       "dev": true,
       "requires": {
         "ip": "^1.1.0",
@@ -40417,21 +39551,13 @@
       }
     },
     "dom-serializer": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
-      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
+      "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
       "dev": true,
       "requires": {
-        "domelementtype": "^2.0.1",
-        "entities": "^2.0.0"
-      },
-      "dependencies": {
-        "domelementtype": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.2.tgz",
-          "integrity": "sha512-wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA==",
-          "dev": true
-        }
+        "domelementtype": "^1.3.0",
+        "entities": "^1.1.1"
       }
     },
     "domain-browser": {
@@ -40473,9 +39599,9 @@
       }
     },
     "domutils": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
-      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
+      "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
       "dev": true,
       "requires": {
         "dom-serializer": "0",
@@ -40524,6 +39650,23 @@
       "requires": {
         "is-plain-object": "^2.0.1",
         "object.defaults": "^1.1.0"
+      },
+      "dependencies": {
+        "is-plain-object": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+          "dev": true,
+          "requires": {
+            "isobject": "^3.0.1"
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        }
       }
     },
     "ecc-jsbn": {
@@ -40546,9 +39689,9 @@
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
     },
     "electron-to-chromium": {
-      "version": "1.3.577",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.577.tgz",
-      "integrity": "sha512-dSb64JQSFif/pD8mpVAgSFkbVi6YHbK6JeEziwNNmXlr/Ne2rZtseFK5SM7JoWSLf6gP0gVvRGi4/2ZRhSX/rA==",
+      "version": "1.3.793",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.793.tgz",
+      "integrity": "sha512-l9NrGV6Mr4ov5mayYPvIWcwklNw5ROmy6rllzz9dCACw9nKE5y+s5uQk+CBJMetxrWZ6QJFsvEfG6WDcH2IGUg==",
       "dev": true
     },
     "elementtree": {
@@ -40560,38 +39703,38 @@
       }
     },
     "elliptic": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
-      "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.4.0",
-        "brorand": "^1.0.1",
+        "bn.js": "^4.11.9",
+        "brorand": "^1.1.0",
         "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.0"
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1"
       },
       "dependencies": {
         "bn.js": {
-          "version": "4.11.9",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
           "dev": true
         }
       }
     },
     "emittery": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.7.1.tgz",
-      "integrity": "sha512-d34LN4L6h18Bzz9xpoku2nPwKxCPlPMr3EEKTkoEBi+1/+b0lcRkRJ1UVyyZaKNeqGR3swcGl6s390DNO4YVgQ==",
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.7.2.tgz",
+      "integrity": "sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ==",
       "dev": true
     },
     "emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
     },
     "emojis-list": {
       "version": "3.0.0",
@@ -40608,16 +39751,16 @@
       "version": "0.1.13",
       "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
       "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
-      "devOptional": true,
+      "optional": true,
       "requires": {
         "iconv-lite": "^0.6.2"
       },
       "dependencies": {
         "iconv-lite": {
-          "version": "0.6.2",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz",
-          "integrity": "sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==",
-          "devOptional": true,
+          "version": "0.6.3",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+          "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+          "optional": true,
           "requires": {
             "safer-buffer": ">= 2.1.2 < 3.0.0"
           }
@@ -40643,14 +39786,13 @@
       }
     },
     "enhanced-resolve": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz",
-      "integrity": "sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==",
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.7.0.tgz",
+      "integrity": "sha512-6njwt/NsZFUKhM6j9U8hzVyD4E4r0x7NQzhTCbcWOJ0IQjNSAoalWmb0AE51Wn+fwan5qVESWi7t2ToBxs9vrw==",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "memory-fs": "^0.5.0",
-        "tapable": "^1.0.0"
+        "graceful-fs": "^4.2.4",
+        "tapable": "^2.2.0"
       }
     },
     "enquirer": {
@@ -40660,20 +39802,12 @@
       "dev": true,
       "requires": {
         "ansi-colors": "^4.1.1"
-      },
-      "dependencies": {
-        "ansi-colors": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-          "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-          "dev": true
-        }
       }
     },
     "entities": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
-      "integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
       "dev": true
     },
     "env-paths": {
@@ -40684,13 +39818,12 @@
     "err-code": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz",
-      "integrity": "sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA=",
-      "dev": true
+      "integrity": "sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA="
     },
     "errno": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
-      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
+      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
       "dev": true,
       "requires": {
         "prr": "~1.0.1"
@@ -40706,23 +39839,28 @@
       }
     },
     "es-abstract": {
-      "version": "1.18.0-next.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
-      "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
+      "version": "1.18.5",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz",
+      "integrity": "sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==",
       "dev": true,
       "requires": {
+        "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.1.1",
         "has": "^1.0.3",
-        "has-symbols": "^1.0.1",
-        "is-callable": "^1.2.2",
-        "is-negative-zero": "^2.0.0",
-        "is-regex": "^1.1.1",
-        "object-inspect": "^1.8.0",
+        "has-symbols": "^1.0.2",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.3",
+        "is-negative-zero": "^2.0.1",
+        "is-regex": "^1.1.3",
+        "is-string": "^1.0.6",
+        "object-inspect": "^1.11.0",
         "object-keys": "^1.1.1",
-        "object.assign": "^4.1.1",
-        "string.prototype.trimend": "^1.0.1",
-        "string.prototype.trimstart": "^1.0.1"
+        "object.assign": "^4.1.2",
+        "string.prototype.trimend": "^1.0.4",
+        "string.prototype.trimstart": "^1.0.4",
+        "unbox-primitive": "^1.0.1"
       }
     },
     "es-to-primitive": {
@@ -40758,26 +39896,11 @@
         "es6-symbol": "^3.1.1"
       }
     },
-    "es6-promise": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
-      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
-      "dev": true
-    },
     "es6-promise-plugin": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/es6-promise-plugin/-/es6-promise-plugin-4.2.2.tgz",
       "integrity": "sha512-uoA4aVplXI9oqUYJFBAVRwAqIN9/n9JgrTAUGX3qPbnSZVE5yY1+6/MsoN5f4xsaPO62WjPHOdtts6okMN6tNA=="
     },
-    "es6-promisify": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
-      "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
-      "dev": true,
-      "requires": {
-        "es6-promise": "^4.0.3"
-      }
-    },
     "es6-symbol": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
@@ -40801,9 +39924,9 @@
       }
     },
     "escalade": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.0.tgz",
-      "integrity": "sha512-mAk+hPSO8fLDkhV7V0dXazH5pDc6MrjBTPyD3VeKzxnVFjH1MIxbCdqGZB9O8+EwWakZs3ZCbDS4IpRt79V1ig==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
       "dev": true
     },
     "escape-goat": {
@@ -40883,28 +40006,31 @@
       }
     },
     "eslint": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.25.0.tgz",
-      "integrity": "sha512-TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw==",
+      "version": "7.32.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
+      "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "7.12.11",
-        "@eslint/eslintrc": "^0.4.0",
+        "@eslint/eslintrc": "^0.4.3",
+        "@humanwhocodes/config-array": "^0.5.0",
         "ajv": "^6.10.0",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
         "debug": "^4.0.1",
         "doctrine": "^3.0.0",
         "enquirer": "^2.3.5",
+        "escape-string-regexp": "^4.0.0",
         "eslint-scope": "^5.1.1",
         "eslint-utils": "^2.1.0",
         "eslint-visitor-keys": "^2.0.0",
         "espree": "^7.3.1",
         "esquery": "^1.4.0",
         "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
         "file-entry-cache": "^6.0.1",
         "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^5.0.0",
+        "glob-parent": "^5.1.2",
         "globals": "^13.6.0",
         "ignore": "^4.0.6",
         "import-fresh": "^3.0.0",
@@ -40913,7 +40039,7 @@
         "js-yaml": "^3.13.1",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "levn": "^0.4.1",
-        "lodash": "^4.17.21",
+        "lodash.merge": "^4.6.2",
         "minimatch": "^3.0.4",
         "natural-compare": "^1.4.0",
         "optionator": "^0.9.1",
@@ -40922,7 +40048,7 @@
         "semver": "^7.2.1",
         "strip-ansi": "^6.0.0",
         "strip-json-comments": "^3.1.0",
-        "table": "^6.0.4",
+        "table": "^6.0.9",
         "text-table": "^0.2.0",
         "v8-compile-cache": "^2.0.3"
       },
@@ -40936,83 +40062,88 @@
             "@babel/highlight": "^7.10.4"
           }
         },
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-          "dev": true
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
         },
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
-            "ms": "2.1.2"
+            "color-name": "~1.1.4"
           }
         },
-        "eslint-scope": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-          "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-          "dev": true,
-          "requires": {
-            "esrecurse": "^4.3.0",
-            "estraverse": "^4.1.1"
-          }
+        "escape-string-regexp": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+          "dev": true
         },
         "globals": {
-          "version": "13.8.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.8.0.tgz",
-          "integrity": "sha512-rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q==",
+          "version": "13.10.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.10.0.tgz",
+          "integrity": "sha512-piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g==",
           "dev": true,
           "requires": {
             "type-fest": "^0.20.2"
           }
         },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
         "ignore": {
           "version": "4.0.6",
           "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
           "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
           "dev": true
         },
-        "lodash": {
-          "version": "4.17.21",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
           "dev": true
         },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^5.0.0"
+            "has-flag": "^4.0.0"
           }
         },
-        "strip-json-comments": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-          "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-          "dev": true
-        },
         "type-fest": {
           "version": "0.20.2",
           "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
@@ -41036,25 +40167,42 @@
       "requires": {
         "debug": "^2.6.9",
         "resolve": "^1.13.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
       }
     },
     "eslint-module-utils": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz",
-      "integrity": "sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==",
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.1.tgz",
+      "integrity": "sha512-ZXI9B8cxAJIH4nfkhTwcRTEAnrVfobYqwjWy/QMCZ8rHkZHFjf9yO4BzpiF9kCSfNlMG54eKigISHpX0+AaT4A==",
       "dev": true,
       "requires": {
-        "debug": "^2.6.9",
+        "debug": "^3.2.7",
         "pkg-dir": "^2.0.0"
       },
       "dependencies": {
-        "pkg-dir": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
-          "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "dev": true,
           "requires": {
-            "find-up": "^2.1.0"
+            "ms": "^2.1.1"
           }
         }
       }
@@ -41106,51 +40254,77 @@
       "requires": {}
     },
     "eslint-plugin-import": {
-      "version": "2.22.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz",
-      "integrity": "sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==",
+      "version": "2.23.4",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.23.4.tgz",
+      "integrity": "sha512-6/wP8zZRsnQFiR3iaPFgh5ImVRM1WN5NUWfTIRqwOdeiGJlBcSk82o1FEVq8yXmy4lkIzTo7YhHCIxlU/2HyEQ==",
       "dev": true,
       "requires": {
-        "array-includes": "^3.1.1",
-        "array.prototype.flat": "^1.2.3",
-        "contains-path": "^0.1.0",
+        "array-includes": "^3.1.3",
+        "array.prototype.flat": "^1.2.4",
         "debug": "^2.6.9",
-        "doctrine": "1.5.0",
+        "doctrine": "^2.1.0",
         "eslint-import-resolver-node": "^0.3.4",
-        "eslint-module-utils": "^2.6.0",
+        "eslint-module-utils": "^2.6.1",
+        "find-up": "^2.0.0",
         "has": "^1.0.3",
+        "is-core-module": "^2.4.0",
         "minimatch": "^3.0.4",
-        "object.values": "^1.1.1",
-        "read-pkg-up": "^2.0.0",
-        "resolve": "^1.17.0",
+        "object.values": "^1.1.3",
+        "pkg-up": "^2.0.0",
+        "read-pkg-up": "^3.0.0",
+        "resolve": "^1.20.0",
         "tsconfig-paths": "^3.9.0"
       },
       "dependencies": {
-        "doctrine": {
-          "version": "1.5.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
-          "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
           "requires": {
-            "esutils": "^2.0.2",
-            "isarray": "^1.0.0"
+            "ms": "2.0.0"
+          }
+        },
+        "doctrine": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
+        "resolve": {
+          "version": "1.20.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
+          "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+          "dev": true,
+          "requires": {
+            "is-core-module": "^2.2.0",
+            "path-parse": "^1.0.6"
           }
         }
       }
     },
     "eslint-plugin-jest": {
-      "version": "24.3.6",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.3.6.tgz",
-      "integrity": "sha512-WOVH4TIaBLIeCX576rLcOgjNXqP+jNlCiEmRgFTfQtJ52DpwnIQKAVGlGPAN7CZ33bW6eNfHD6s8ZbEUTQubJg==",
+      "version": "24.4.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.4.0.tgz",
+      "integrity": "sha512-8qnt/hgtZ94E9dA6viqfViKBfkJwFHXgJmTWlMGDgunw1XJEGqm3eiPjDsTanM3/u/3Az82nyQM9GX7PM/QGmg==",
       "dev": true,
       "requires": {
         "@typescript-eslint/experimental-utils": "^4.0.1"
       }
     },
     "eslint-plugin-jsdoc": {
-      "version": "32.3.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-32.3.3.tgz",
-      "integrity": "sha512-WxXohbMYlZvCt3r7MepwT++nTLsO4CPegWcm5toM4IGq3MBmYkG+Uf5yDa+n1MwPXLg+KbJqAsI19hmkVD7MPg==",
+      "version": "32.3.4",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-32.3.4.tgz",
+      "integrity": "sha512-xSWfsYvffXnN0OkwLnB7MoDDDDjqcp46W7YlY1j7JyfAQBQ+WnGCfLov3gVNZjUGtK9Otj8mEhTZTqJu4QtIGA==",
       "dev": true,
       "requires": {
         "comment-parser": "1.1.5",
@@ -41162,27 +40336,6 @@
         "spdx-expression-parse": "^3.0.1"
       },
       "dependencies": {
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "lodash": {
-          "version": "4.17.21",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
         "semver": {
           "version": "7.3.5",
           "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
@@ -41209,12 +40362,12 @@
       "requires": {}
     },
     "eslint-scope": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
-      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
       "dev": true,
       "requires": {
-        "esrecurse": "^4.1.0",
+        "esrecurse": "^4.3.0",
         "estraverse": "^4.1.1"
       }
     },
@@ -41236,9 +40389,9 @@
       }
     },
     "eslint-visitor-keys": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz",
-      "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
       "dev": true
     },
     "espree": {
@@ -41252,12 +40405,6 @@
         "eslint-visitor-keys": "^1.3.0"
       },
       "dependencies": {
-        "acorn": {
-          "version": "7.4.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-          "dev": true
-        },
         "eslint-visitor-keys": {
           "version": "1.3.0",
           "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
@@ -41330,15 +40477,15 @@
       "dev": true
     },
     "events": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.2.0.tgz",
-      "integrity": "sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
       "dev": true
     },
     "eventsource": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz",
-      "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.1.0.tgz",
+      "integrity": "sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg==",
       "dev": true,
       "requires": {
         "original": "^1.0.0"
@@ -41355,15 +40502,15 @@
       }
     },
     "exec-sh": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz",
-      "integrity": "sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==",
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.6.tgz",
+      "integrity": "sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==",
       "dev": true
     },
     "execa": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-4.0.3.tgz",
-      "integrity": "sha512-WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
+      "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
       "requires": {
         "cross-spawn": "^7.0.0",
         "get-stream": "^5.0.0",
@@ -41397,6 +40544,15 @@
         "to-regex": "^3.0.1"
       },
       "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
         "define-property": {
           "version": "0.2.5",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
@@ -41414,6 +40570,69 @@
           "requires": {
             "is-extendable": "^0.1.0"
           }
+        },
+        "is-accessor-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "is-data-descriptor": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "is-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^0.1.6",
+            "is-data-descriptor": "^0.1.4",
+            "kind-of": "^5.0.0"
+          }
+        },
+        "is-extendable": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+          "dev": true
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
         }
       }
     },
@@ -41433,17 +40652,37 @@
       }
     },
     "expect": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-26.5.2.tgz",
-      "integrity": "sha512-ccTGrXZd8DZCcvCz4htGXTkd/LOoy6OEtiDS38x3/VVf6E4AQL0QoeksBiw7BtGR5xDNiRYPB8GN6pfbuTOi7w==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-26.6.2.tgz",
+      "integrity": "sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.5.2",
+        "@jest/types": "^26.6.2",
         "ansi-styles": "^4.0.0",
         "jest-get-type": "^26.3.0",
-        "jest-matcher-utils": "^26.5.2",
-        "jest-message-util": "^26.5.2",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
         "jest-regex-util": "^26.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        }
       }
     },
     "express": {
@@ -41481,6 +40720,21 @@
         "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
       }
     },
     "ext": {
@@ -41493,9 +40747,9 @@
       },
       "dependencies": {
         "type": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/type/-/type-2.1.0.tgz",
-          "integrity": "sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA==",
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/type/-/type-2.5.0.tgz",
+          "integrity": "sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==",
           "dev": true
         }
       }
@@ -41506,23 +40760,19 @@
       "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
     },
     "extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
+      "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
       "dev": true,
       "requires": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
+        "kind-of": "^1.1.0"
       },
       "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
+        "kind-of": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
+          "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
+          "dev": true
         }
       }
     },
@@ -41580,34 +40830,11 @@
             "is-extendable": "^0.1.0"
           }
         },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
+        "is-extendable": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+          "dev": true
         }
       }
     },
@@ -41617,9 +40844,9 @@
       "integrity": "sha1-4mifjzVvrWLMplo6kcXfX5VRaS8="
     },
     "faker": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/faker/-/faker-5.1.0.tgz",
-      "integrity": "sha512-RrWKFSSA/aNLP0g3o2WW1Zez7/MnMr7xkiZmoCfAGZmdkDQZ6l2KtuXHN5XjdvpRjDl8+3vf+Rrtl06Z352+Mw==",
+      "version": "5.5.3",
+      "resolved": "https://registry.npmjs.org/faker/-/faker-5.5.3.tgz",
+      "integrity": "sha512-wLTv2a28wjUyWkbnX7u/ABZBkUkIF2fCd73V6P2oFqEGEktDfzWx4UxrSqtPRw0xPRAcjeAOIiJWqZm3pP4u3g==",
       "dev": true
     },
     "fancy-log": {
@@ -41640,16 +40867,15 @@
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
     "fast-glob": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz",
-      "integrity": "sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==",
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz",
+      "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
       "requires": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.0",
+        "glob-parent": "^5.1.2",
         "merge2": "^1.3.0",
-        "micromatch": "^4.0.2",
-        "picomatch": "^2.2.1"
+        "micromatch": "^4.0.4"
       }
     },
     "fast-json-parse": {
@@ -41669,23 +40895,23 @@
       "dev": true
     },
     "fast-safe-stringify": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz",
-      "integrity": "sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.8.tgz",
+      "integrity": "sha512-lXatBjf3WPjmWD6DpIZxkeSsCOwqI0maYMpgDlx8g4U2qi4lbjA9oH/HD2a87G+KfsUmo5WbJFmqBZlPxtptag==",
       "dev": true
     },
     "fastq": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz",
-      "integrity": "sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.1.tgz",
+      "integrity": "sha512-HOnr8Mc60eNYl1gzwp6r5RoUyAn5/glBolUzP/Ez6IFVPMPirxn/9phgL6zhOtaTy7ISwPvQ+wT+hfcRZh/bzw==",
       "requires": {
         "reusify": "^1.0.4"
       }
     },
     "faye-websocket": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
-      "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
+      "version": "0.11.4",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
+      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
       "dev": true,
       "requires": {
         "websocket-driver": ">=0.5.1"
@@ -41716,9 +40942,10 @@
       "dev": true
     },
     "figures": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+      "dev": true,
       "requires": {
         "escape-string-regexp": "^1.0.5"
       }
@@ -41733,21 +40960,58 @@
       }
     },
     "file-loader": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.0.0.tgz",
-      "integrity": "sha512-/aMOAYEFXDdjG0wytpTL5YQLfZnnTmLNjn+AIrJ/6HVnTfDqLsVKUUwkDf4I4kgex36BvjuXEn/TX9B/1ESyqQ==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
+      "integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==",
       "dev": true,
       "requires": {
         "loader-utils": "^2.0.0",
-        "schema-utils": "^2.6.5"
+        "schema-utils": "^3.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "3.5.2",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+          "dev": true,
+          "requires": {}
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        },
+        "schema-utils": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+          "dev": true,
+          "requires": {
+            "@types/json-schema": "^7.0.8",
+            "ajv": "^6.12.5",
+            "ajv-keywords": "^3.5.2"
+          }
+        }
       }
     },
     "file-uri-to-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
-      "dev": true,
-      "optional": true
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-2.0.0.tgz",
+      "integrity": "sha512-hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg==",
+      "dev": true
     },
     "fill-range": {
       "version": "7.0.1",
@@ -41769,6 +41033,21 @@
         "parseurl": "~1.3.3",
         "statuses": "~1.5.0",
         "unpipe": "~1.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
       }
     },
     "find-cache-dir": {
@@ -41856,6 +41135,12 @@
         "resolve-dir": "^1.0.1"
       },
       "dependencies": {
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true
+        },
         "braces": {
           "version": "2.3.2",
           "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
@@ -41882,9 +41167,25 @@
               "requires": {
                 "is-extendable": "^0.1.0"
               }
+            },
+            "is-extendable": {
+              "version": "0.1.1",
+              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+              "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+              "dev": true
             }
           }
         },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        },
         "fill-range": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -41905,6 +41206,12 @@
               "requires": {
                 "is-extendable": "^0.1.0"
               }
+            },
+            "is-extendable": {
+              "version": "0.1.1",
+              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+              "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+              "dev": true
             }
           }
         },
@@ -41934,6 +41241,12 @@
           "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
           "dev": true
         },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        },
         "micromatch": {
           "version": "3.1.10",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -41978,6 +41291,23 @@
         "object.defaults": "^1.1.0",
         "object.pick": "^1.2.0",
         "parse-filepath": "^1.0.1"
+      },
+      "dependencies": {
+        "is-plain-object": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+          "dev": true,
+          "requires": {
+            "isobject": "^3.0.1"
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        }
       }
     },
     "flagged-respawn": {
@@ -41997,9 +41327,9 @@
       }
     },
     "flatted": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz",
-      "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==",
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz",
+      "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==",
       "dev": true
     },
     "flush-write-stream": {
@@ -42013,9 +41343,9 @@
       }
     },
     "follow-redirects": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz",
-      "integrity": "sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz",
+      "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==",
       "dev": true
     },
     "for-in": {
@@ -42055,9 +41385,15 @@
       "dev": true
     },
     "forwarded": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ="
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="
+    },
+    "fraction.js": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.1.tgz",
+      "integrity": "sha512-MHOhvvxHTfRFpF1geTK9czMIZ6xclsEor2wkIGYYq+PxcQqT7vStJqjhe6S1TenZrMZzo+wlqOufBDVepUEgPg==",
+      "dev": true
     },
     "fragment-cache": {
       "version": "0.2.1",
@@ -42136,9 +41472,9 @@
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
     "fsevents": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
-      "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
       "dev": true,
       "optional": true
     },
@@ -42181,8 +41517,7 @@
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
     "functional-red-black-tree": {
       "version": "1.0.1",
@@ -42238,16 +41573,10 @@
         }
       }
     },
-    "genfun": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/genfun/-/genfun-5.0.0.tgz",
-      "integrity": "sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==",
-      "dev": true
-    },
     "gensync": {
-      "version": "1.0.0-beta.1",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz",
-      "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==",
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
       "dev": true
     },
     "get-caller-file": {
@@ -42295,21 +41624,6 @@
         "ftp": "^0.3.10"
       },
       "dependencies": {
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "file-uri-to-path": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-2.0.0.tgz",
-          "integrity": "sha512-hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg==",
-          "dev": true
-        },
         "fs-extra": {
           "version": "8.1.0",
           "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
@@ -42330,12 +41644,6 @@
             "graceful-fs": "^4.1.6"
           }
         },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
         "universalify": {
           "version": "0.1.2",
           "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
@@ -42378,9 +41686,9 @@
       }
     },
     "glob-parent": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
-      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "requires": {
         "is-glob": "^4.0.1"
       }
@@ -42460,6 +41768,12 @@
             }
           }
         },
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true
+        },
         "binary-extensions": {
           "version": "1.13.1",
           "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
@@ -42482,17 +41796,6 @@
             "snapdragon-node": "^2.0.1",
             "split-string": "^3.0.2",
             "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
           }
         },
         "chokidar": {
@@ -42515,6 +41818,15 @@
             "upath": "^1.1.1"
           }
         },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
         "fill-range": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -42525,17 +41837,6 @@
             "is-number": "^3.0.0",
             "repeat-string": "^1.6.1",
             "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
           }
         },
         "fsevents": {
@@ -42579,6 +41880,12 @@
             "binary-extensions": "^1.0.0"
           }
         },
+        "is-extendable": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+          "dev": true
+        },
         "is-number": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -42586,17 +41893,15 @@
           "dev": true,
           "requires": {
             "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
+          }
+        },
+        "is-plain-object": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+          "dev": true,
+          "requires": {
+            "isobject": "^3.0.1"
           }
         },
         "isobject": {
@@ -42605,6 +41910,15 @@
           "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
           "dev": true
         },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        },
         "micromatch": {
           "version": "3.1.10",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -42624,6 +41938,33 @@
             "regex-not": "^1.0.0",
             "snapdragon": "^0.8.1",
             "to-regex": "^3.0.2"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "3.0.2",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+              "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+              "dev": true,
+              "requires": {
+                "assign-symbols": "^1.0.0",
+                "is-extendable": "^1.0.1"
+              }
+            },
+            "is-extendable": {
+              "version": "1.0.1",
+              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+              "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+              "dev": true,
+              "requires": {
+                "is-plain-object": "^2.0.4"
+              }
+            },
+            "kind-of": {
+              "version": "6.0.3",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+              "dev": true
+            }
           }
         },
         "readdirp": {
@@ -42688,6 +42029,12 @@
         "which": "^1.2.14"
       },
       "dependencies": {
+        "ini": {
+          "version": "1.3.8",
+          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+          "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+          "dev": true
+        },
         "which": {
           "version": "1.3.1",
           "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -42706,9 +42053,9 @@
       "dev": true
     },
     "globby": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz",
-      "integrity": "sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==",
+      "version": "11.0.4",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
+      "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
       "requires": {
         "array-union": "^2.1.0",
         "dir-glob": "^3.0.1",
@@ -42745,6 +42092,14 @@
         "url-parse-lax": "^3.0.0"
       },
       "dependencies": {
+        "decompress-response": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
+          "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
+          "requires": {
+            "mimic-response": "^1.0.0"
+          }
+        },
         "get-stream": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
@@ -42752,13 +42107,18 @@
           "requires": {
             "pump": "^3.0.0"
           }
+        },
+        "mimic-response": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
+          "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="
         }
       }
     },
     "graceful-fs": {
-      "version": "4.2.4",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="
+      "version": "4.2.6",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
+      "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ=="
     },
     "growly": {
       "version": "1.3.0",
@@ -42777,6 +42137,32 @@
         "gulp-cli": "^2.2.0",
         "undertaker": "^1.2.1",
         "vinyl-fs": "^3.0.0"
+      }
+    },
+    "gulp-cli": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.3.0.tgz",
+      "integrity": "sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==",
+      "dev": true,
+      "requires": {
+        "ansi-colors": "^1.0.1",
+        "archy": "^1.0.0",
+        "array-sort": "^1.0.0",
+        "color-support": "^1.1.3",
+        "concat-stream": "^1.6.0",
+        "copy-props": "^2.0.1",
+        "fancy-log": "^1.3.2",
+        "gulplog": "^1.0.0",
+        "interpret": "^1.4.0",
+        "isobject": "^3.0.1",
+        "liftoff": "^3.1.0",
+        "matchdep": "^2.0.0",
+        "mute-stdout": "^1.0.0",
+        "pretty-hrtime": "^1.0.0",
+        "replace-homedir": "^1.0.0",
+        "semver-greatest-satisfied-range": "^1.1.0",
+        "v8flags": "^3.2.0",
+        "yargs": "^7.1.0"
       },
       "dependencies": {
         "ansi-colors": {
@@ -42827,32 +42213,6 @@
           "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
           "dev": true
         },
-        "gulp-cli": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.3.0.tgz",
-          "integrity": "sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==",
-          "dev": true,
-          "requires": {
-            "ansi-colors": "^1.0.1",
-            "archy": "^1.0.0",
-            "array-sort": "^1.0.0",
-            "color-support": "^1.1.3",
-            "concat-stream": "^1.6.0",
-            "copy-props": "^2.0.1",
-            "fancy-log": "^1.3.2",
-            "gulplog": "^1.0.0",
-            "interpret": "^1.4.0",
-            "isobject": "^3.0.1",
-            "liftoff": "^3.1.0",
-            "matchdep": "^2.0.0",
-            "mute-stdout": "^1.0.0",
-            "pretty-hrtime": "^1.0.0",
-            "replace-homedir": "^1.0.0",
-            "semver-greatest-satisfied-range": "^1.1.0",
-            "v8flags": "^3.2.0",
-            "yargs": "^7.1.0"
-          }
-        },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
@@ -42937,12 +42297,6 @@
             "read-pkg": "^1.0.0"
           }
         },
-        "require-main-filename": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-          "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
-          "dev": true
-        },
         "string-width": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@@ -42972,12 +42326,6 @@
             "is-utf8": "^0.2.0"
           }
         },
-        "which-module": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-          "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
-          "dev": true
-        },
         "wrap-ansi": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
@@ -42989,15 +42337,15 @@
           }
         },
         "y18n": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
+          "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==",
           "dev": true
         },
         "yargs": {
-          "version": "7.1.1",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.1.tgz",
-          "integrity": "sha512-huO4Fr1f9PmiJJdll5kwoS2e4GqzGSsMT3PPMpOwoVkOK8ckqAewMTZyA6LXVQWflleb/Z8oPBEvNsMft0XE+g==",
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.2.tgz",
+          "integrity": "sha512-ZEjj/dQYQy0Zx0lgLMLR8QuaqTihnxirir7EwUHp1Axq4e3+k8jXU5K0VLbNvedv1f4EWtBonDIZm0NUr+jCcA==",
           "dev": true,
           "requires": {
             "camelcase": "^3.0.0",
@@ -43012,13 +42360,13 @@
             "string-width": "^1.0.2",
             "which-module": "^1.0.0",
             "y18n": "^3.2.1",
-            "yargs-parser": "5.0.0-security.0"
+            "yargs-parser": "^5.0.1"
           }
         },
         "yargs-parser": {
-          "version": "5.0.0-security.0",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0-security.0.tgz",
-          "integrity": "sha512-T69y4Ps64LNesYxeYGYPvfoMTt/7y1XtfpIslUeK4um+9Hu7hlGoRtaDLvdXb7+/tfq4opVa2HRY5xGip022rQ==",
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.1.tgz",
+          "integrity": "sha512-wpav5XYiddjXxirPoCTUPbqM0PXvJ9hiBMvuJgInvo4/lAOTZzUprArw17q2O1P2+GHhbBr18/iQwjL5Z9BqfA==",
           "dev": true,
           "requires": {
             "camelcase": "^3.0.0",
@@ -43077,6 +42425,28 @@
             "ansi-wrap": "^0.1.0"
           }
         },
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true
+        },
+        "arr-union": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+          "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+          "dev": true
+        },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        },
         "plugin-error": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
@@ -43182,13 +42552,30 @@
       "requires": {
         "ajv": "^6.12.3",
         "har-schema": "^2.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+        }
       }
     },
     "has": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
       "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
       "requires": {
         "function-bind": "^1.1.1"
       }
@@ -43200,14 +42587,14 @@
       "dev": true
     },
     "has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
     },
     "has-symbols": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
-      "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
       "dev": true
     },
     "has-unicode": {
@@ -43353,9 +42740,9 @@
       }
     },
     "hosted-git-info": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.5.tgz",
-      "integrity": "sha512-i4dpK6xj9BIpVOTboXIlKG9+8HMKggcrMX7WA24xZtKwX0TPelq/rbaS5rCKeNX8sJXZJGdSxpnEGtta+wismQ==",
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.8.tgz",
+      "integrity": "sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw==",
       "requires": {
         "lru-cache": "^6.0.0"
       }
@@ -43384,12 +42771,6 @@
       "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg=",
       "dev": true
     },
-    "html-comment-regex": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz",
-      "integrity": "sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==",
-      "dev": true
-    },
     "html-encoding-sniffer": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
@@ -43400,9 +42781,9 @@
       }
     },
     "html-entities": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.3.1.tgz",
-      "integrity": "sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.4.0.tgz",
+      "integrity": "sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==",
       "dev": true
     },
     "html-escaper": {
@@ -43424,14 +42805,6 @@
         "param-case": "2.1.x",
         "relateurl": "0.2.x",
         "uglify-js": "3.4.x"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.17.1",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
-          "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
-          "dev": true
-        }
       }
     },
     "htmlparser2": {
@@ -43448,12 +42821,6 @@
         "readable-stream": "^3.1.1"
       },
       "dependencies": {
-        "entities": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-          "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
-          "dev": true
-        },
         "readable-stream": {
           "version": "3.6.0",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
@@ -43497,6 +42864,12 @@
         }
       }
     },
+    "http-parser-js": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz",
+      "integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==",
+      "dev": true
+    },
     "http-proxy": {
       "version": "1.18.1",
       "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
@@ -43509,24 +42882,13 @@
       }
     },
     "http-proxy-agent": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz",
-      "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==",
-      "dev": true,
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
       "requires": {
-        "agent-base": "4",
-        "debug": "3.1.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
+        "@tootallnate/once": "1",
+        "agent-base": "6",
+        "debug": "4"
       }
     },
     "http-proxy-middleware": {
@@ -43541,6 +42903,12 @@
         "micromatch": "^3.1.10"
       },
       "dependencies": {
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true
+        },
         "braces": {
           "version": "2.3.2",
           "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
@@ -43567,9 +42935,25 @@
               "requires": {
                 "is-extendable": "^0.1.0"
               }
+            },
+            "is-extendable": {
+              "version": "0.1.1",
+              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+              "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+              "dev": true
             }
           }
         },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        },
         "fill-range": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -43590,6 +42974,12 @@
               "requires": {
                 "is-extendable": "^0.1.0"
               }
+            },
+            "is-extendable": {
+              "version": "0.1.1",
+              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+              "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+              "dev": true
             }
           }
         },
@@ -43619,6 +43009,12 @@
           "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
           "dev": true
         },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        },
         "micromatch": {
           "version": "3.1.10",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -43669,30 +43065,12 @@
       "dev": true
     },
     "https-proxy-agent": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
-      "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
-      "dev": true,
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
       "requires": {
-        "agent-base": "^4.3.0",
-        "debug": "^3.1.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
+        "agent-base": "6",
+        "debug": "4"
       }
     },
     "human-signals": {
@@ -43717,18 +43095,16 @@
       }
     },
     "icss-utils": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz",
-      "integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
+      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
       "dev": true,
-      "requires": {
-        "postcss": "^7.0.14"
-      }
+      "requires": {}
     },
     "ieee754": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
-      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
       "devOptional": true
     },
     "iferr": {
@@ -43743,9 +43119,9 @@
       "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="
     },
     "ignore-walk": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz",
-      "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.4.tgz",
+      "integrity": "sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==",
       "requires": {
         "minimatch": "^3.0.4"
       }
@@ -43762,54 +43138,82 @@
       "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
       "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps="
     },
-    "import-cwd": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
-      "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
-      "dev": true,
-      "requires": {
-        "import-from": "^2.1.0"
-      }
-    },
     "import-fresh": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
-      "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
       "requires": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
       }
     },
-    "import-from": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
-      "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
-      "dev": true,
-      "requires": {
-        "resolve-from": "^3.0.0"
-      },
-      "dependencies": {
-        "resolve-from": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-          "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
-          "dev": true
-        }
-      }
-    },
     "import-lazy": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
       "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM="
     },
     "import-local": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
-      "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
+      "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==",
       "dev": true,
       "requires": {
-        "pkg-dir": "^3.0.0",
-        "resolve-cwd": "^2.0.0"
+        "pkg-dir": "^4.2.0",
+        "resolve-cwd": "^3.0.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        },
+        "pkg-dir": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+          "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+          "dev": true,
+          "requires": {
+            "find-up": "^4.0.0"
+          }
+        }
       }
     },
     "imurmurhash": {
@@ -43822,12 +43226,6 @@
       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
       "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="
     },
-    "indexes-of": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
-      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
-      "dev": true
-    },
     "infer-owner": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
@@ -43848,9 +43246,10 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "ini": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz",
+      "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==",
+      "dev": true
     },
     "init-package-json": {
       "version": "1.10.3",
@@ -43891,73 +43290,83 @@
       }
     },
     "inquirer": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz",
-      "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==",
+      "version": "7.3.3",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz",
+      "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==",
+      "dev": true,
       "requires": {
-        "ansi-escapes": "^3.2.0",
-        "chalk": "^2.4.2",
-        "cli-cursor": "^2.1.0",
-        "cli-width": "^2.0.0",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.1.0",
+        "cli-cursor": "^3.1.0",
+        "cli-width": "^3.0.0",
         "external-editor": "^3.0.3",
-        "figures": "^2.0.0",
-        "lodash": "^4.17.12",
-        "mute-stream": "0.0.7",
-        "run-async": "^2.2.0",
-        "rxjs": "^6.4.0",
-        "string-width": "^2.1.0",
-        "strip-ansi": "^5.1.0",
+        "figures": "^3.0.0",
+        "lodash": "^4.17.19",
+        "mute-stream": "0.0.8",
+        "run-async": "^2.4.0",
+        "rxjs": "^6.6.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0",
         "through": "^2.3.6"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
           "requires": {
-            "color-convert": "^1.9.0"
+            "color-convert": "^2.0.1"
           }
         },
         "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
           "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
           }
         },
         "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
           "requires": {
-            "color-name": "1.1.3"
+            "color-name": "~1.1.4"
           }
         },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-        },
         "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
         },
-        "mute-stream": {
-          "version": "0.0.7",
-          "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
-          "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
+        "rxjs": {
+          "version": "6.6.7",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+          "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+          "dev": true,
+          "requires": {
+            "tslib": "^1.9.0"
+          }
         },
         "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "has-flag": "^4.0.0"
           }
+        },
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+          "dev": true
         }
       }
     },
@@ -43977,48 +43386,219 @@
         "uuid": "^3.3.2"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+        "ansi-escapes": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+          "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="
+        },
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
+        },
+        "cli-cursor": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+          "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
           "requires": {
-            "color-convert": "^1.9.0"
+            "restore-cursor": "^2.0.0"
           }
         },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+        "cli-width": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
+          "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw=="
+        },
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
           "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
           }
         },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+        "execa": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
           "requires": {
-            "color-name": "1.1.3"
+            "cross-spawn": "^6.0.0",
+            "get-stream": "^4.0.0",
+            "is-stream": "^1.1.0",
+            "npm-run-path": "^2.0.0",
+            "p-finally": "^1.0.0",
+            "signal-exit": "^3.0.0",
+            "strip-eof": "^1.0.0"
           }
         },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+        "figures": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+          "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
           "requires": {
-            "has-flag": "^3.0.0"
+            "escape-string-regexp": "^1.0.5"
+          }
+        },
+        "get-stream": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "inquirer": {
+          "version": "6.5.2",
+          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz",
+          "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==",
+          "requires": {
+            "ansi-escapes": "^3.2.0",
+            "chalk": "^2.4.2",
+            "cli-cursor": "^2.1.0",
+            "cli-width": "^2.0.0",
+            "external-editor": "^3.0.3",
+            "figures": "^2.0.0",
+            "lodash": "^4.17.12",
+            "mute-stream": "0.0.7",
+            "run-async": "^2.2.0",
+            "rxjs": "^6.4.0",
+            "string-width": "^2.1.0",
+            "strip-ansi": "^5.1.0",
+            "through": "^2.3.6"
+          }
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+        },
+        "is-stream": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+          "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
+        },
+        "mimic-fn": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+          "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
+        },
+        "mute-stream": {
+          "version": "0.0.7",
+          "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+          "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
+        },
+        "npm-run-path": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+          "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+          "requires": {
+            "path-key": "^2.0.0"
+          }
+        },
+        "onetime": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+          "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+          "requires": {
+            "mimic-fn": "^1.0.0"
+          }
+        },
+        "os-name": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/os-name/-/os-name-3.1.0.tgz",
+          "integrity": "sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==",
+          "requires": {
+            "macos-release": "^2.2.0",
+            "windows-release": "^3.1.0"
+          }
+        },
+        "path-key": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+          "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
+        },
+        "restore-cursor": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+          "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+          "requires": {
+            "onetime": "^2.0.0",
+            "signal-exit": "^3.0.2"
+          }
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        },
+        "shebang-command": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+          "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+          "requires": {
+            "shebang-regex": "^1.0.0"
+          }
+        },
+        "shebang-regex": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+          "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "requires": {
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+              "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+            },
+            "strip-ansi": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+              "requires": {
+                "ansi-regex": "^3.0.0"
+              }
+            }
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        },
+        "uuid": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+        },
+        "which": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        },
+        "windows-release": {
+          "version": "3.3.3",
+          "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-3.3.3.tgz",
+          "integrity": "sha512-OSOGH1QYiW5yVor9TtmXKQvt2vjQqbYS+DqmsZw+r7xDwLXEeT3JGW0ZppFmHx4diyXmxt238KFR3N9jzevBRg==",
+          "requires": {
+            "execa": "^1.0.0"
           }
         }
       }
@@ -44038,21 +43618,23 @@
         "ipaddr.js": "^1.9.0"
       }
     },
+    "internal-slot": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
+      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
+      "dev": true,
+      "requires": {
+        "get-intrinsic": "^1.1.0",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
+      }
+    },
     "interpret": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
       "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
       "dev": true
     },
-    "invariant": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
-      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
-      "dev": true,
-      "requires": {
-        "loose-envify": "^1.0.0"
-      }
-    },
     "invert-kv": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
@@ -44060,9 +43642,9 @@
       "dev": true
     },
     "ionicons": {
-      "version": "5.5.1",
-      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.1.tgz",
-      "integrity": "sha512-1auVisfaXmkmxINer8Q3kJGHP1vSxk86hf7By95eJ+Av9+oBcNuAEBfSe3jaMaGRVxVw8U/2j23MFq7R3c0HPg==",
+      "version": "5.5.3",
+      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz",
+      "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==",
       "requires": {
         "@stencil/core": "^2.5.0"
       }
@@ -44119,36 +43701,36 @@
       }
     },
     "is-absolute-url": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
-      "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz",
+      "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==",
       "dev": true
     },
     "is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
       "dev": true,
       "requires": {
-        "kind-of": "^3.0.2"
+        "kind-of": "^6.0.0"
       },
       "dependencies": {
         "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
         }
       }
     },
     "is-arguments": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
-      "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==",
-      "dev": true
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.0.tgz",
+      "integrity": "sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.0"
+      }
     },
     "is-arrayish": {
       "version": "0.2.1",
@@ -44157,9 +43739,9 @@
       "dev": true
     },
     "is-bigint": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.1.tgz",
-      "integrity": "sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.2.tgz",
+      "integrity": "sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==",
       "dev": true
     },
     "is-binary-path": {
@@ -44172,12 +43754,12 @@
       }
     },
     "is-boolean-object": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.0.tgz",
-      "integrity": "sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.1.tgz",
+      "integrity": "sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.0"
+        "call-bind": "^1.0.2"
       }
     },
     "is-buffer": {
@@ -44187,9 +43769,9 @@
       "dev": true
     },
     "is-callable": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz",
-      "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
+      "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
       "dev": true
     },
     "is-ci": {
@@ -44212,69 +43794,96 @@
         "hsla-regex": "^1.0.0",
         "rgb-regex": "^1.0.1",
         "rgba-regex": "^1.0.0"
-      }
-    },
-    "is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2"
       },
       "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "is-date-object": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
-      "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==",
-      "dev": true
-    },
-    "is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "requires": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+        "css-color-names": {
+          "version": "0.0.4",
+          "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
+          "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
           "dev": true
         }
       }
     },
-    "is-directory": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
-      "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
+    "is-core-module": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.5.0.tgz",
+      "integrity": "sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg==",
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
+    "is-data-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+      "dev": true,
+      "requires": {
+        "kind-of": "^6.0.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        }
+      }
+    },
+    "is-date-object": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.4.tgz",
+      "integrity": "sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==",
       "dev": true
     },
+    "is-descriptor": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+      "dev": true,
+      "requires": {
+        "is-accessor-descriptor": "^1.0.0",
+        "is-data-descriptor": "^1.0.0",
+        "kind-of": "^6.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        }
+      }
+    },
     "is-docker": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz",
-      "integrity": "sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw=="
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="
     },
     "is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "requires": {
+        "is-plain-object": "^2.0.4"
+      },
+      "dependencies": {
+        "is-plain-object": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+          "dev": true,
+          "requires": {
+            "isobject": "^3.0.1"
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        }
+      }
     },
     "is-extglob": {
       "version": "2.1.1",
@@ -44282,9 +43891,9 @@
       "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
     },
     "is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
     },
     "is-generator-fn": {
       "version": "2.1.0",
@@ -44327,9 +43936,9 @@
       "dev": true
     },
     "is-negative-zero": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz",
-      "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
+      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
       "dev": true
     },
     "is-npm": {
@@ -44343,9 +43952,9 @@
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
     },
     "is-number-object": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.4.tgz",
-      "integrity": "sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.5.tgz",
+      "integrity": "sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==",
       "dev": true
     },
     "is-obj": {
@@ -44380,46 +43989,30 @@
       }
     },
     "is-path-inside": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz",
-      "integrity": "sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg=="
-    },
-    "is-plain-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
-      "dev": true
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="
     },
     "is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "requires": {
-        "isobject": "^3.0.1"
-      },
-      "dependencies": {
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        }
-      }
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+      "dev": true
     },
     "is-potential-custom-element-name": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz",
-      "integrity": "sha1-DFLlS8yjkbssSUsh6GJtczbG45c=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
       "dev": true
     },
     "is-regex": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
-      "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz",
+      "integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==",
       "dev": true,
       "requires": {
-        "has-symbols": "^1.0.1"
+        "call-bind": "^1.0.2",
+        "has-symbols": "^1.0.2"
       }
     },
     "is-relative": {
@@ -44438,32 +44031,23 @@
       "dev": true
     },
     "is-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-      "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="
     },
     "is-string": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz",
-      "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.6.tgz",
+      "integrity": "sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==",
       "dev": true
     },
-    "is-svg": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz",
-      "integrity": "sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==",
-      "dev": true,
-      "requires": {
-        "html-comment-regex": "^1.1.0"
-      }
-    },
     "is-symbol": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
-      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
       "dev": true,
       "requires": {
-        "has-symbols": "^1.0.1"
+        "has-symbols": "^1.0.2"
       }
     },
     "is-typedarray": {
@@ -44480,6 +44064,12 @@
         "unc-path-regex": "^0.1.2"
       }
     },
+    "is-unicode-supported": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+      "dev": true
+    },
     "is-utf8": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
@@ -44492,6 +44082,12 @@
       "integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=",
       "dev": true
     },
+    "is-what": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz",
+      "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==",
+      "dev": true
+    },
     "is-windows": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
@@ -44566,6 +44162,23 @@
         "istanbul-lib-coverage": "^3.0.0",
         "make-dir": "^3.0.0",
         "supports-color": "^7.1.0"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
     "istanbul-lib-source-maps": {
@@ -44579,21 +44192,6 @@
         "source-map": "^0.6.1"
       },
       "dependencies": {
-        "debug": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
-          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -44613,26 +44211,67 @@
       }
     },
     "jest": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-26.5.2.tgz",
-      "integrity": "sha512-4HFabJVwsgDwul/7rhXJ3yFAF/aUkVIXiJWmgFxb+WMdZG39fVvOwYAs8/3r4AlFPc4m/n5sTMtuMbOL3kNtrQ==",
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-26.6.3.tgz",
+      "integrity": "sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q==",
       "dev": true,
       "requires": {
-        "@jest/core": "^26.5.2",
+        "@jest/core": "^26.6.3",
         "import-local": "^3.0.2",
-        "jest-cli": "^26.5.2"
+        "jest-cli": "^26.6.3"
+      }
+    },
+    "jest-changed-files": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.6.2.tgz",
+      "integrity": "sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^26.6.2",
+        "execa": "^4.0.0",
+        "throat": "^5.0.0"
+      }
+    },
+    "jest-cli": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.6.3.tgz",
+      "integrity": "sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg==",
+      "dev": true,
+      "requires": {
+        "@jest/core": "^26.6.3",
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.4",
+        "import-local": "^3.0.2",
+        "is-ci": "^2.0.0",
+        "jest-config": "^26.6.3",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
+        "prompts": "^2.0.1",
+        "yargs": "^15.4.1"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
           "dev": true
         },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -44650,11 +44289,14 @@
             "wrap-ansi": "^6.2.0"
           }
         },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
         },
         "find-up": {
           "version": "4.1.0",
@@ -44666,41 +44308,36 @@
             "path-exists": "^4.0.0"
           }
         },
-        "import-local": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
-          "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==",
-          "dev": true,
-          "requires": {
-            "pkg-dir": "^4.2.0",
-            "resolve-cwd": "^3.0.0"
-          }
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "jest-cli": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.5.2.tgz",
-          "integrity": "sha512-usm48COuUvRp8YEG5OWOaxbSM0my7eHn3QeBWxiGUuFhvkGVBvl1fic4UjC02EAEQtDv8KrNQUXdQTV6ZZBsoA==",
+        "jest-config": {
+          "version": "26.6.3",
+          "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",
+          "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
           "dev": true,
           "requires": {
-            "@jest/core": "^26.5.2",
-            "@jest/test-result": "^26.5.2",
-            "@jest/types": "^26.5.2",
+            "@babel/core": "^7.1.0",
+            "@jest/test-sequencer": "^26.6.3",
+            "@jest/types": "^26.6.2",
+            "babel-jest": "^26.6.3",
             "chalk": "^4.0.0",
-            "exit": "^0.1.2",
+            "deepmerge": "^4.2.2",
+            "glob": "^7.1.1",
             "graceful-fs": "^4.2.4",
-            "import-local": "^3.0.2",
-            "is-ci": "^2.0.0",
-            "jest-config": "^26.5.2",
-            "jest-util": "^26.5.2",
-            "jest-validate": "^26.5.2",
-            "prompts": "^2.0.1",
-            "yargs": "^15.4.1"
+            "jest-environment-jsdom": "^26.6.2",
+            "jest-environment-node": "^26.6.2",
+            "jest-get-type": "^26.3.0",
+            "jest-jasmine2": "^26.6.3",
+            "jest-regex-util": "^26.0.0",
+            "jest-resolve": "^26.6.2",
+            "jest-util": "^26.6.2",
+            "jest-validate": "^26.6.2",
+            "micromatch": "^4.0.2",
+            "pretty-format": "^26.6.2"
           }
         },
         "locate-path": {
@@ -44736,50 +44373,47 @@
           "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
           "dev": true
         },
-        "pkg-dir": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-          "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-          "dev": true,
-          "requires": {
-            "find-up": "^4.0.0"
-          }
-        },
-        "resolve-cwd": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
-          "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
-          "dev": true,
-          "requires": {
-            "resolve-from": "^5.0.0"
-          }
-        },
-        "resolve-from": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-          "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+        "require-main-filename": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+          "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
           "dev": true
         },
-        "string-width": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
+            "has-flag": "^4.0.0"
           }
         },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+        "ts-node": {
+          "version": "10.1.0",
+          "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.1.0.tgz",
+          "integrity": "sha512-6szn3+J9WyG2hE+5W8e0ruZrzyk1uFLYye6IGMBadnOzDh8aP7t8CbFpsfCiEx2+wMixAhjFt7lOZC4+l+WbEA==",
           "dev": true,
+          "optional": true,
+          "peer": true,
           "requires": {
-            "ansi-regex": "^5.0.0"
+            "@tsconfig/node10": "^1.0.7",
+            "@tsconfig/node12": "^1.0.7",
+            "@tsconfig/node14": "^1.0.0",
+            "@tsconfig/node16": "^1.0.1",
+            "arg": "^4.1.0",
+            "create-require": "^1.1.0",
+            "diff": "^4.0.1",
+            "make-error": "^1.1.1",
+            "source-map-support": "^0.5.17",
+            "yn": "3.1.1"
           }
         },
+        "which-module": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+          "dev": true
+        },
         "wrap-ansi": {
           "version": "6.2.0",
           "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
@@ -44791,6 +44425,12 @@
             "strip-ansi": "^6.0.0"
           }
         },
+        "y18n": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+          "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+          "dev": true
+        },
         "yargs": {
           "version": "15.4.1",
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
@@ -44822,75 +44462,59 @@
         }
       }
     },
-    "jest-changed-files": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.5.2.tgz",
-      "integrity": "sha512-qSmssmiIdvM5BWVtyK/nqVpN3spR5YyvkvPqz1x3BR1bwIxsWmU/MGwLoCrPNLbkG2ASAKfvmJpOduEApBPh2w==",
+    "jest-diff": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz",
+      "integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.5.2",
-        "execa": "^4.0.0",
-        "throat": "^5.0.0"
-      }
-    },
-    "jest-config": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.5.2.tgz",
-      "integrity": "sha512-dqJOnSegNdE5yDiuGHsjTM5gec7Z4AcAMHiW+YscbOYJAlb3LEtDSobXCq0or9EmGQI5SFmKy4T7P1FxetJOfg==",
-      "dev": true,
-      "requires": {
-        "@babel/core": "^7.1.0",
-        "@jest/test-sequencer": "^26.5.2",
-        "@jest/types": "^26.5.2",
-        "babel-jest": "^26.5.2",
         "chalk": "^4.0.0",
-        "deepmerge": "^4.2.2",
-        "glob": "^7.1.1",
-        "graceful-fs": "^4.2.4",
-        "jest-environment-jsdom": "^26.5.2",
-        "jest-environment-node": "^26.5.2",
+        "diff-sequences": "^26.6.2",
         "jest-get-type": "^26.3.0",
-        "jest-jasmine2": "^26.5.2",
-        "jest-regex-util": "^26.0.0",
-        "jest-resolve": "^26.5.2",
-        "jest-util": "^26.5.2",
-        "jest-validate": "^26.5.2",
-        "micromatch": "^4.0.2",
-        "pretty-format": "^26.5.2"
+        "pretty-format": "^26.6.2"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
-        }
-      }
-    },
-    "jest-diff": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.5.2.tgz",
-      "integrity": "sha512-HCSWDUGwsov5oTlGzrRM+UPJI/Dpqi9jzeV0fdRNi3Ch5bnoXhnyJMmVg2juv9081zLIy3HGPI5mcuGgXM2xRA==",
-      "dev": true,
-      "requires": {
-        "chalk": "^4.0.0",
-        "diff-sequences": "^26.5.0",
-        "jest-get-type": "^26.3.0",
-        "pretty-format": "^26.5.2"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
+            "color-name": "~1.1.4"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
           }
         }
       }
@@ -44905,57 +44529,90 @@
       }
     },
     "jest-each": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.5.2.tgz",
-      "integrity": "sha512-w7D9FNe0m2D3yZ0Drj9CLkyF/mGhmBSULMQTypzAKR746xXnjUrK8GUJdlLTWUF6dd0ks3MtvGP7/xNFr9Aphg==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.6.2.tgz",
+      "integrity": "sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.5.2",
+        "@jest/types": "^26.6.2",
         "chalk": "^4.0.0",
         "jest-get-type": "^26.3.0",
-        "jest-util": "^26.5.2",
-        "pretty-format": "^26.5.2"
+        "jest-util": "^26.6.2",
+        "pretty-format": "^26.6.2"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
         }
       }
     },
     "jest-environment-jsdom": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.5.2.tgz",
-      "integrity": "sha512-fWZPx0bluJaTQ36+PmRpvUtUlUFlGGBNyGX1SN3dLUHHMcQ4WseNEzcGGKOw4U5towXgxI4qDoI3vwR18H0RTw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz",
+      "integrity": "sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^26.5.2",
-        "@jest/fake-timers": "^26.5.2",
-        "@jest/types": "^26.5.2",
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
-        "jest-mock": "^26.5.2",
-        "jest-util": "^26.5.2",
+        "jest-mock": "^26.6.2",
+        "jest-util": "^26.6.2",
         "jsdom": "^16.4.0"
       }
     },
     "jest-environment-node": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.5.2.tgz",
-      "integrity": "sha512-YHjnDsf/GKFCYMGF1V+6HF7jhY1fcLfLNBDjhAOvFGvt6d8vXvNdJGVM7uTZ2VO/TuIyEFhPGaXMX5j3h7fsrA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.6.2.tgz",
+      "integrity": "sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^26.5.2",
-        "@jest/fake-timers": "^26.5.2",
-        "@jest/types": "^26.5.2",
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
-        "jest-mock": "^26.5.2",
-        "jest-util": "^26.5.2"
+        "jest-mock": "^26.6.2",
+        "jest-util": "^26.6.2"
       }
     },
     "jest-get-type": {
@@ -44965,12 +44622,12 @@
       "dev": true
     },
     "jest-haste-map": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.5.2.tgz",
-      "integrity": "sha512-lJIAVJN3gtO3k4xy+7i2Xjtwh8CfPcH08WYjZpe9xzveDaqGw9fVNCpkYu6M525wKFVkLmyi7ku+DxCAP1lyMA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.6.2.tgz",
+      "integrity": "sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.5.2",
+        "@jest/types": "^26.6.2",
         "@types/graceful-fs": "^4.1.2",
         "@types/node": "*",
         "anymatch": "^3.0.3",
@@ -44978,134 +44635,221 @@
         "fsevents": "^2.1.2",
         "graceful-fs": "^4.2.4",
         "jest-regex-util": "^26.0.0",
-        "jest-serializer": "^26.5.0",
-        "jest-util": "^26.5.2",
-        "jest-worker": "^26.5.0",
+        "jest-serializer": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-worker": "^26.6.2",
         "micromatch": "^4.0.2",
         "sane": "^4.0.3",
         "walker": "^1.0.7"
-      },
-      "dependencies": {
-        "jest-worker": {
-          "version": "26.5.0",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.5.0.tgz",
-          "integrity": "sha512-kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug==",
-          "dev": true,
-          "requires": {
-            "@types/node": "*",
-            "merge-stream": "^2.0.0",
-            "supports-color": "^7.0.0"
-          }
-        }
       }
     },
     "jest-jasmine2": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.5.2.tgz",
-      "integrity": "sha512-2J+GYcgLVPTkpmvHEj0/IDTIAuyblGNGlyGe4fLfDT2aktEPBYvoxUwFiOmDDxxzuuEAD2uxcYXr0+1Yw4tjFA==",
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz",
+      "integrity": "sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg==",
       "dev": true,
       "requires": {
         "@babel/traverse": "^7.1.0",
-        "@jest/environment": "^26.5.2",
-        "@jest/source-map": "^26.5.0",
-        "@jest/test-result": "^26.5.2",
-        "@jest/types": "^26.5.2",
+        "@jest/environment": "^26.6.2",
+        "@jest/source-map": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "co": "^4.6.0",
-        "expect": "^26.5.2",
+        "expect": "^26.6.2",
         "is-generator-fn": "^2.0.0",
-        "jest-each": "^26.5.2",
-        "jest-matcher-utils": "^26.5.2",
-        "jest-message-util": "^26.5.2",
-        "jest-runtime": "^26.5.2",
-        "jest-snapshot": "^26.5.2",
-        "jest-util": "^26.5.2",
-        "pretty-format": "^26.5.2",
+        "jest-each": "^26.6.2",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-runtime": "^26.6.3",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "pretty-format": "^26.6.2",
         "throat": "^5.0.0"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
         }
       }
     },
     "jest-leak-detector": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.5.2.tgz",
-      "integrity": "sha512-h7ia3dLzBFItmYERaLPEtEKxy3YlcbcRSjj0XRNJgBEyODuu+3DM2o62kvIFvs3PsaYoIIv+e+nLRI61Dj1CNw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz",
+      "integrity": "sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg==",
       "dev": true,
       "requires": {
         "jest-get-type": "^26.3.0",
-        "pretty-format": "^26.5.2"
+        "pretty-format": "^26.6.2"
       }
     },
     "jest-matcher-utils": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.5.2.tgz",
-      "integrity": "sha512-W9GO9KBIC4gIArsNqDUKsLnhivaqf8MSs6ujO/JDcPIQrmY+aasewweXVET8KdrJ6ADQaUne5UzysvF/RR7JYA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz",
+      "integrity": "sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
-        "jest-diff": "^26.5.2",
+        "jest-diff": "^26.6.2",
         "jest-get-type": "^26.3.0",
-        "pretty-format": "^26.5.2"
+        "pretty-format": "^26.6.2"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
         }
       }
     },
     "jest-message-util": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.5.2.tgz",
-      "integrity": "sha512-Ocp9UYZ5Jl15C5PNsoDiGEk14A4NG0zZKknpWdZGoMzJuGAkVt10e97tnEVMYpk7LnQHZOfuK2j/izLBMcuCZw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.6.2.tgz",
+      "integrity": "sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
-        "@jest/types": "^26.5.2",
+        "@jest/types": "^26.6.2",
         "@types/stack-utils": "^2.0.0",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.4",
         "micromatch": "^4.0.2",
+        "pretty-format": "^26.6.2",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.2"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
         }
       }
     },
     "jest-mock": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.5.2.tgz",
-      "integrity": "sha512-9SiU4b5PtO51v0MtJwVRqeGEroH66Bnwtq4ARdNP7jNXbpT7+ByeWNAk4NeT/uHfNSVDXEXgQo1XRuwEqS6Rdw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.6.2.tgz",
+      "integrity": "sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.5.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*"
       }
     },
@@ -45117,9 +44861,9 @@
       "requires": {}
     },
     "jest-preset-angular": {
-      "version": "8.3.1",
-      "resolved": "https://registry.npmjs.org/jest-preset-angular/-/jest-preset-angular-8.3.1.tgz",
-      "integrity": "sha512-WhQm+0tXzikkvIF35XErV87DqYbieZI0R0MIGgn7VE/DDhdbXFDmYQxFZ7w4qcA0cGLLvSMTBbIsUtHeE/rFxQ==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/jest-preset-angular/-/jest-preset-angular-8.4.0.tgz",
+      "integrity": "sha512-lngQRVVMy2qdzhSzUVTkKFsWC+Z2uMFlJf8J5ZeapNZFsRYW2tjlVqdm+sJOTnVmMVnN7CtDqvRDwlyFTIYD+A==",
       "dev": true,
       "requires": {
         "pretty-format": "26.x",
@@ -45133,31 +44877,49 @@
       "dev": true
     },
     "jest-resolve": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.5.2.tgz",
-      "integrity": "sha512-XsPxojXGRA0CoDD7Vis59ucz2p3cQFU5C+19tz3tLEAlhYKkK77IL0cjYjikY9wXnOaBeEdm1rOgSJjbZWpcZg==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz",
+      "integrity": "sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.5.2",
+        "@jest/types": "^26.6.2",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.4",
         "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^26.5.2",
+        "jest-util": "^26.6.2",
         "read-pkg-up": "^7.0.1",
-        "resolve": "^1.17.0",
+        "resolve": "^1.18.1",
         "slash": "^3.0.0"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
         },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
         "find-up": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
@@ -45168,6 +44930,12 @@
             "path-exists": "^4.0.0"
           }
         },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
         "locate-path": {
           "version": "5.0.0",
           "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
@@ -45195,18 +44963,6 @@
             "p-limit": "^2.2.0"
           }
         },
-        "parse-json": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.1.0.tgz",
-          "integrity": "sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.0.0",
-            "error-ex": "^1.3.1",
-            "json-parse-even-better-errors": "^2.3.0",
-            "lines-and-columns": "^1.1.6"
-          }
-        },
         "path-exists": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -45243,115 +44999,208 @@
             "read-pkg": "^5.2.0",
             "type-fest": "^0.8.1"
           }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "type-fest": {
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+          "dev": true
         }
       }
     },
     "jest-resolve-dependencies": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.5.2.tgz",
-      "integrity": "sha512-LLkc8LuRtxqOx0AtX/Npa2C4I23WcIrwUgNtHYXg4owYF/ZDQShcwBAHjYZIFR06+HpQcZ43+kCTMlQ3aDCYTg==",
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz",
+      "integrity": "sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.5.2",
+        "@jest/types": "^26.6.2",
         "jest-regex-util": "^26.0.0",
-        "jest-snapshot": "^26.5.2"
+        "jest-snapshot": "^26.6.2"
       }
     },
     "jest-runner": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.5.2.tgz",
-      "integrity": "sha512-GKhYxtSX5+tXZsd2QwfkDqPIj5C2HqOdXLRc2x2qYqWE26OJh17xo58/fN/mLhRkO4y6o60ZVloan7Kk5YA6hg==",
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.6.3.tgz",
+      "integrity": "sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ==",
       "dev": true,
       "requires": {
-        "@jest/console": "^26.5.2",
-        "@jest/environment": "^26.5.2",
-        "@jest/test-result": "^26.5.2",
-        "@jest/types": "^26.5.2",
+        "@jest/console": "^26.6.2",
+        "@jest/environment": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "emittery": "^0.7.1",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.4",
-        "jest-config": "^26.5.2",
+        "jest-config": "^26.6.3",
         "jest-docblock": "^26.0.0",
-        "jest-haste-map": "^26.5.2",
-        "jest-leak-detector": "^26.5.2",
-        "jest-message-util": "^26.5.2",
-        "jest-resolve": "^26.5.2",
-        "jest-runtime": "^26.5.2",
-        "jest-util": "^26.5.2",
-        "jest-worker": "^26.5.0",
+        "jest-haste-map": "^26.6.2",
+        "jest-leak-detector": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-resolve": "^26.6.2",
+        "jest-runtime": "^26.6.3",
+        "jest-util": "^26.6.2",
+        "jest-worker": "^26.6.2",
         "source-map-support": "^0.5.6",
         "throat": "^5.0.0"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
         },
-        "jest-worker": {
-          "version": "26.5.0",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.5.0.tgz",
-          "integrity": "sha512-kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug==",
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
-            "@types/node": "*",
-            "merge-stream": "^2.0.0",
-            "supports-color": "^7.0.0"
+            "color-name": "~1.1.4"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "jest-config": {
+          "version": "26.6.3",
+          "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",
+          "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
+          "dev": true,
+          "requires": {
+            "@babel/core": "^7.1.0",
+            "@jest/test-sequencer": "^26.6.3",
+            "@jest/types": "^26.6.2",
+            "babel-jest": "^26.6.3",
+            "chalk": "^4.0.0",
+            "deepmerge": "^4.2.2",
+            "glob": "^7.1.1",
+            "graceful-fs": "^4.2.4",
+            "jest-environment-jsdom": "^26.6.2",
+            "jest-environment-node": "^26.6.2",
+            "jest-get-type": "^26.3.0",
+            "jest-jasmine2": "^26.6.3",
+            "jest-regex-util": "^26.0.0",
+            "jest-resolve": "^26.6.2",
+            "jest-util": "^26.6.2",
+            "jest-validate": "^26.6.2",
+            "micromatch": "^4.0.2",
+            "pretty-format": "^26.6.2"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "ts-node": {
+          "version": "10.1.0",
+          "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.1.0.tgz",
+          "integrity": "sha512-6szn3+J9WyG2hE+5W8e0ruZrzyk1uFLYye6IGMBadnOzDh8aP7t8CbFpsfCiEx2+wMixAhjFt7lOZC4+l+WbEA==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@tsconfig/node10": "^1.0.7",
+            "@tsconfig/node12": "^1.0.7",
+            "@tsconfig/node14": "^1.0.0",
+            "@tsconfig/node16": "^1.0.1",
+            "arg": "^4.1.0",
+            "create-require": "^1.1.0",
+            "diff": "^4.0.1",
+            "make-error": "^1.1.1",
+            "source-map-support": "^0.5.17",
+            "yn": "3.1.1"
           }
         }
       }
     },
     "jest-runtime": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.5.2.tgz",
-      "integrity": "sha512-zArr4DatX/Sn0wswX/AnAuJgmwgAR5rNtrUz36HR8BfMuysHYNq5sDbYHuLC4ICyRdy5ae/KQ+sczxyS9G6Qvw==",
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.6.3.tgz",
+      "integrity": "sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw==",
       "dev": true,
       "requires": {
-        "@jest/console": "^26.5.2",
-        "@jest/environment": "^26.5.2",
-        "@jest/fake-timers": "^26.5.2",
-        "@jest/globals": "^26.5.2",
-        "@jest/source-map": "^26.5.0",
-        "@jest/test-result": "^26.5.2",
-        "@jest/transform": "^26.5.2",
-        "@jest/types": "^26.5.2",
+        "@jest/console": "^26.6.2",
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/globals": "^26.6.2",
+        "@jest/source-map": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/yargs": "^15.0.0",
         "chalk": "^4.0.0",
+        "cjs-module-lexer": "^0.6.0",
         "collect-v8-coverage": "^1.0.0",
         "exit": "^0.1.2",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.4",
-        "jest-config": "^26.5.2",
-        "jest-haste-map": "^26.5.2",
-        "jest-message-util": "^26.5.2",
-        "jest-mock": "^26.5.2",
+        "jest-config": "^26.6.3",
+        "jest-haste-map": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-mock": "^26.6.2",
         "jest-regex-util": "^26.0.0",
-        "jest-resolve": "^26.5.2",
-        "jest-snapshot": "^26.5.2",
-        "jest-util": "^26.5.2",
-        "jest-validate": "^26.5.2",
+        "jest-resolve": "^26.6.2",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
         "slash": "^3.0.0",
         "strip-bom": "^4.0.0",
         "yargs": "^15.4.1"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
           "dev": true
         },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -45369,11 +45218,14 @@
             "wrap-ansi": "^6.2.0"
           }
         },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
         },
         "find-up": {
           "version": "4.1.0",
@@ -45385,12 +45237,38 @@
             "path-exists": "^4.0.0"
           }
         },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "jest-config": {
+          "version": "26.6.3",
+          "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",
+          "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
+          "dev": true,
+          "requires": {
+            "@babel/core": "^7.1.0",
+            "@jest/test-sequencer": "^26.6.3",
+            "@jest/types": "^26.6.2",
+            "babel-jest": "^26.6.3",
+            "chalk": "^4.0.0",
+            "deepmerge": "^4.2.2",
+            "glob": "^7.1.1",
+            "graceful-fs": "^4.2.4",
+            "jest-environment-jsdom": "^26.6.2",
+            "jest-environment-node": "^26.6.2",
+            "jest-get-type": "^26.3.0",
+            "jest-jasmine2": "^26.6.3",
+            "jest-regex-util": "^26.0.0",
+            "jest-resolve": "^26.6.2",
+            "jest-util": "^26.6.2",
+            "jest-validate": "^26.6.2",
+            "micromatch": "^4.0.2",
+            "pretty-format": "^26.6.2"
+          }
+        },
         "locate-path": {
           "version": "5.0.0",
           "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
@@ -45424,26 +45302,47 @@
           "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
           "dev": true
         },
-        "string-width": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+        "require-main-filename": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+          "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
+            "has-flag": "^4.0.0"
           }
         },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+        "ts-node": {
+          "version": "10.1.0",
+          "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.1.0.tgz",
+          "integrity": "sha512-6szn3+J9WyG2hE+5W8e0ruZrzyk1uFLYye6IGMBadnOzDh8aP7t8CbFpsfCiEx2+wMixAhjFt7lOZC4+l+WbEA==",
           "dev": true,
+          "optional": true,
+          "peer": true,
           "requires": {
-            "ansi-regex": "^5.0.0"
+            "@tsconfig/node10": "^1.0.7",
+            "@tsconfig/node12": "^1.0.7",
+            "@tsconfig/node14": "^1.0.0",
+            "@tsconfig/node16": "^1.0.1",
+            "arg": "^4.1.0",
+            "create-require": "^1.1.0",
+            "diff": "^4.0.1",
+            "make-error": "^1.1.1",
+            "source-map-support": "^0.5.17",
+            "yn": "3.1.1"
           }
         },
+        "which-module": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+          "dev": true
+        },
         "wrap-ansi": {
           "version": "6.2.0",
           "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
@@ -45455,6 +45354,12 @@
             "strip-ansi": "^6.0.0"
           }
         },
+        "y18n": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+          "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+          "dev": true
+        },
         "yargs": {
           "version": "15.4.1",
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
@@ -45487,9 +45392,9 @@
       }
     },
     "jest-serializer": {
-      "version": "26.5.0",
-      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.5.0.tgz",
-      "integrity": "sha512-+h3Gf5CDRlSLdgTv7y0vPIAoLgX/SI7T4v6hy+TEXMgYbv+ztzbg5PSN6mUXAT/hXYHvZRWm+MaObVfqkhCGxA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.6.2.tgz",
+      "integrity": "sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==",
       "dev": true,
       "requires": {
         "@types/node": "*",
@@ -45497,48 +45402,81 @@
       }
     },
     "jest-snapshot": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.5.2.tgz",
-      "integrity": "sha512-MkXIDvEefzDubI/WaDVSRH4xnkuirP/Pz8LhAIDXcVQTmcEfwxywj5LGwBmhz+kAAIldA7XM4l96vbpzltSjqg==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.6.2.tgz",
+      "integrity": "sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og==",
       "dev": true,
       "requires": {
         "@babel/types": "^7.0.0",
-        "@jest/types": "^26.5.2",
+        "@jest/types": "^26.6.2",
         "@types/babel__traverse": "^7.0.4",
         "@types/prettier": "^2.0.0",
         "chalk": "^4.0.0",
-        "expect": "^26.5.2",
+        "expect": "^26.6.2",
         "graceful-fs": "^4.2.4",
-        "jest-diff": "^26.5.2",
+        "jest-diff": "^26.6.2",
         "jest-get-type": "^26.3.0",
-        "jest-haste-map": "^26.5.2",
-        "jest-matcher-utils": "^26.5.2",
-        "jest-message-util": "^26.5.2",
-        "jest-resolve": "^26.5.2",
+        "jest-haste-map": "^26.6.2",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-resolve": "^26.6.2",
         "natural-compare": "^1.4.0",
-        "pretty-format": "^26.5.2",
+        "pretty-format": "^26.6.2",
         "semver": "^7.3.2"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
         }
       }
     },
     "jest-util": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.5.2.tgz",
-      "integrity": "sha512-WTL675bK+GSSAYgS8z9FWdCT2nccO1yTIplNLPlP0OD8tUk/H5IrWKMMRudIQQ0qp8bb4k+1Qa8CxGKq9qnYdg==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+      "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.5.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.4",
@@ -45546,100 +45484,196 @@
         "micromatch": "^4.0.2"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
         }
       }
     },
     "jest-validate": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.5.2.tgz",
-      "integrity": "sha512-FmJks0zY36mp6Af/5sqO6CTL9bNMU45yKCJk3hrz8d2aIqQIlN1pr9HPIwZE8blLaewOla134nt5+xAmWsx3SQ==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.6.2.tgz",
+      "integrity": "sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.5.2",
+        "@jest/types": "^26.6.2",
         "camelcase": "^6.0.0",
         "chalk": "^4.0.0",
         "jest-get-type": "^26.3.0",
         "leven": "^3.1.0",
-        "pretty-format": "^26.5.2"
+        "pretty-format": "^26.6.2"
       },
       "dependencies": {
-        "camelcase": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.0.0.tgz",
-          "integrity": "sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==",
-          "dev": true
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
         },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
         }
       }
     },
     "jest-watcher": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.5.2.tgz",
-      "integrity": "sha512-i3m1NtWzF+FXfJ3ljLBB/WQEp4uaNhX7QcQUWMokcifFTUQBDFyUMEwk0JkJ1kopHbx7Een3KX0Q7+9koGM/Pw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.6.2.tgz",
+      "integrity": "sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ==",
       "dev": true,
       "requires": {
-        "@jest/test-result": "^26.5.2",
-        "@jest/types": "^26.5.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
-        "jest-util": "^26.5.2",
+        "jest-util": "^26.6.2",
         "string-length": "^4.0.1"
       },
       "dependencies": {
-        "ansi-escapes": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-          "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "type-fest": "^0.11.0"
+            "color-convert": "^2.0.1"
           }
         },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
         },
-        "type-fest": {
-          "version": "0.11.0",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-          "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
         }
       }
     },
     "jest-worker": {
-      "version": "26.0.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.0.0.tgz",
-      "integrity": "sha512-pPaYa2+JnwmiZjK9x7p9BoZht+47ecFCDFA/CJxspHzeDvQcfVBLWzCiWyo+EGrSiQMWZtCFo9iSvMZnAAo8vw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
+      "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
       "dev": true,
       "requires": {
+        "@types/node": "*",
         "merge-stream": "^2.0.0",
         "supports-color": "^7.0.0"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
     "js-tokens": {
@@ -45649,9 +45683,9 @@
       "dev": true
     },
     "js-yaml": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
-      "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "dev": true,
       "requires": {
         "argparse": "^1.0.7",
@@ -45670,57 +45704,144 @@
       "dev": true
     },
     "jsdom": {
-      "version": "16.4.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.4.0.tgz",
-      "integrity": "sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w==",
+      "version": "16.7.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
+      "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
       "dev": true,
       "requires": {
-        "abab": "^2.0.3",
-        "acorn": "^7.1.1",
+        "abab": "^2.0.5",
+        "acorn": "^8.2.4",
         "acorn-globals": "^6.0.0",
         "cssom": "^0.4.4",
-        "cssstyle": "^2.2.0",
+        "cssstyle": "^2.3.0",
         "data-urls": "^2.0.0",
-        "decimal.js": "^10.2.0",
+        "decimal.js": "^10.2.1",
         "domexception": "^2.0.1",
-        "escodegen": "^1.14.1",
+        "escodegen": "^2.0.0",
+        "form-data": "^3.0.0",
         "html-encoding-sniffer": "^2.0.1",
-        "is-potential-custom-element-name": "^1.0.0",
+        "http-proxy-agent": "^4.0.1",
+        "https-proxy-agent": "^5.0.0",
+        "is-potential-custom-element-name": "^1.0.1",
         "nwsapi": "^2.2.0",
-        "parse5": "5.1.1",
-        "request": "^2.88.2",
-        "request-promise-native": "^1.0.8",
-        "saxes": "^5.0.0",
+        "parse5": "6.0.1",
+        "saxes": "^5.0.1",
         "symbol-tree": "^3.2.4",
-        "tough-cookie": "^3.0.1",
+        "tough-cookie": "^4.0.0",
         "w3c-hr-time": "^1.0.2",
         "w3c-xmlserializer": "^2.0.0",
         "webidl-conversions": "^6.1.0",
         "whatwg-encoding": "^1.0.5",
         "whatwg-mimetype": "^2.3.0",
-        "whatwg-url": "^8.0.0",
-        "ws": "^7.2.3",
+        "whatwg-url": "^8.5.0",
+        "ws": "^7.4.6",
         "xml-name-validator": "^3.0.0"
       },
       "dependencies": {
         "acorn": {
-          "version": "7.4.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+          "version": "8.4.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz",
+          "integrity": "sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==",
           "dev": true
         },
+        "escodegen": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
+          "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
+          "dev": true,
+          "requires": {
+            "esprima": "^4.0.1",
+            "estraverse": "^5.2.0",
+            "esutils": "^2.0.2",
+            "optionator": "^0.8.1",
+            "source-map": "~0.6.1"
+          }
+        },
+        "estraverse": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+          "dev": true
+        },
+        "form-data": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
+          "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+          "dev": true,
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.8",
+            "mime-types": "^2.1.12"
+          }
+        },
+        "levn": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+          "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+          "dev": true,
+          "requires": {
+            "prelude-ls": "~1.1.2",
+            "type-check": "~0.3.2"
+          }
+        },
+        "optionator": {
+          "version": "0.8.3",
+          "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+          "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+          "dev": true,
+          "requires": {
+            "deep-is": "~0.1.3",
+            "fast-levenshtein": "~2.0.6",
+            "levn": "~0.3.0",
+            "prelude-ls": "~1.1.2",
+            "type-check": "~0.3.2",
+            "word-wrap": "~1.2.3"
+          }
+        },
         "parse5": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
-          "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+          "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
           "dev": true
         },
-        "ws": {
-          "version": "7.3.1",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz",
-          "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==",
+        "prelude-ls": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+          "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true,
-          "requires": {}
+          "optional": true
+        },
+        "tough-cookie": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
+          "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
+          "dev": true,
+          "requires": {
+            "psl": "^1.1.33",
+            "punycode": "^2.1.1",
+            "universalify": "^0.1.2"
+          }
+        },
+        "type-check": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+          "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+          "dev": true,
+          "requires": {
+            "prelude-ls": "~1.1.2"
+          }
+        },
+        "universalify": {
+          "version": "0.1.2",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+          "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+          "dev": true
         }
       }
     },
@@ -45752,9 +45873,10 @@
       "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
     },
     "json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
     },
     "json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
@@ -45774,9 +45896,9 @@
       "dev": true
     },
     "json5": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
-      "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+      "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
       "dev": true,
       "requires": {
         "minimist": "^1.2.5"
@@ -45802,16 +45924,6 @@
       "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
       "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA="
     },
-    "JSONStream": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
-      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
-      "dev": true,
-      "requires": {
-        "jsonparse": "^1.2.0",
-        "through": ">=2.2.7 <3"
-      }
-    },
     "jsprim": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
@@ -45831,9 +45943,9 @@
       }
     },
     "jszip": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.5.0.tgz",
-      "integrity": "sha512-WRtu7TPCmYePR1nazfrtuF216cIVon/3GWOvHS9QR5bIwSbnxtdpma6un3jyGGNhHsKCSzn5Ypk+EkDRvTGiFA==",
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.7.0.tgz",
+      "integrity": "sha512-Y2OlFIzrDOPWUnpU0LORIcDn2xN7rC9yKffFM/7pGhQuhO+SUhfm2trkJ/S5amjFvem0Y+1EALz/MEPkvHXVNw==",
       "requires": {
         "lie": "~3.3.0",
         "pako": "~1.0.2",
@@ -45842,9 +45954,9 @@
       }
     },
     "just-debounce": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.0.0.tgz",
-      "integrity": "sha1-h/zPrv/AtozRnVX2cilD+SnqNeo=",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.1.0.tgz",
+      "integrity": "sha512-qpcRocdkUmf+UTNBYx5w6dexX5J31AKK1OmPwH630a83DdVVUIngk55RSAiIGpQyoH0dlr872VHfPjnQnK1qDQ==",
       "dev": true
     },
     "karma-source-map-support": {
@@ -45857,9 +45969,9 @@
       }
     },
     "keytar": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/keytar/-/keytar-7.2.0.tgz",
-      "integrity": "sha512-ECSaWvoLKI5SI0pGpZQeUV1/lpBYfkaxvoSp3zkiPOz05VavwSfLi8DdEaa9N2ekQZv3Chy+o7aP6n9mairBgw==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/keytar/-/keytar-7.7.0.tgz",
+      "integrity": "sha512-YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A==",
       "optional": true,
       "requires": {
         "node-addon-api": "^3.0.0",
@@ -45881,9 +45993,9 @@
       "dev": true
     },
     "kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
       "dev": true
     },
     "kleur": {
@@ -45892,6 +46004,12 @@
       "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
       "dev": true
     },
+    "klona": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz",
+      "integrity": "sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==",
+      "dev": true
+    },
     "last-run": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
@@ -45948,26 +46066,37 @@
         "rsvp": "^3.0.21"
       },
       "dependencies": {
-        "rsvp": {
-          "version": "3.6.2",
-          "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz",
-          "integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==",
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
           "dev": true
         }
       }
     },
     "less": {
-      "version": "3.12.2",
-      "resolved": "https://registry.npmjs.org/less/-/less-3.12.2.tgz",
-      "integrity": "sha512-+1V2PCMFkL+OIj2/HrtrvZw0BC0sYLMICJfbQjuj/K8CEnlrFX6R5cKKgzzttsZDHyxQNL1jqMREjKN3ja/E3Q==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/less/-/less-4.1.1.tgz",
+      "integrity": "sha512-w09o8tZFPThBscl5d0Ggp3RcrKIouBoQscnOMgFH3n5V3kN/CXGHNfCkRPtxJk6nKryDXaV9aHLK55RXuH4sAw==",
       "dev": true,
       "requires": {
+        "copy-anything": "^2.0.1",
         "errno": "^0.1.1",
         "graceful-fs": "^4.1.2",
         "image-size": "~0.5.0",
         "make-dir": "^2.1.0",
         "mime": "^1.4.1",
-        "native-request": "^1.0.5",
+        "needle": "^2.5.2",
+        "parse-node-version": "^1.0.1",
         "source-map": "~0.6.0",
         "tslib": "^1.10.0"
       },
@@ -45983,6 +46112,13 @@
             "semver": "^5.6.0"
           }
         },
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+          "dev": true,
+          "optional": true
+        },
         "semver": {
           "version": "5.7.1",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
@@ -45998,23 +46134,60 @@
           "optional": true
         },
         "tslib": {
-          "version": "1.13.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
-          "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
           "dev": true
         }
       }
     },
     "less-loader": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-6.1.0.tgz",
-      "integrity": "sha512-/jLzOwLyqJ7Kt3xg5sHHkXtOyShWwFj410K9Si9WO+/h8rmYxxkSR0A3/hFEntWudE20zZnWMtpMYnLzqTVdUA==",
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-7.3.0.tgz",
+      "integrity": "sha512-Mi8915g7NMaLlgi77mgTTQvK022xKRQBIVDSyfl3ErTuBhmZBQab0mjeJjNNqGbdR+qrfTleKXqbGI4uEFavxg==",
       "dev": true,
       "requires": {
-        "clone": "^2.1.2",
-        "less": "^3.11.1",
+        "klona": "^2.0.4",
         "loader-utils": "^2.0.0",
-        "schema-utils": "^2.6.6"
+        "schema-utils": "^3.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "3.5.2",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+          "dev": true,
+          "requires": {}
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        },
+        "schema-utils": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+          "dev": true,
+          "requires": {
+            "@types/json-schema": "^7.0.8",
+            "ajv": "^6.12.5",
+            "ajv-keywords": "^3.5.2"
+          }
+        }
       }
     },
     "leven": {
@@ -46023,15 +46196,6 @@
       "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
       "dev": true
     },
-    "levenary": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz",
-      "integrity": "sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==",
-      "dev": true,
-      "requires": {
-        "leven": "^3.1.0"
-      }
-    },
     "levn": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
@@ -46043,13 +46207,31 @@
       }
     },
     "license-webpack-plugin": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-2.2.0.tgz",
-      "integrity": "sha512-XPsdL/0brSHf+7dXIlRqotnCQ58RX2au6otkOg4U3dm8uH+Ka/fW4iukEs95uXm+qKe/SBs+s1Ll/aQddKG+tg==",
+      "version": "2.3.11",
+      "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-2.3.11.tgz",
+      "integrity": "sha512-0iVGoX5vx0WDy8dmwTTpOOMYiGqILyUbDeVMFH52AjgBlS58lHwOlFMSoqg5nY8Kxl6+FRKyUZY/UdlQaOyqDw==",
       "dev": true,
       "requires": {
         "@types/webpack-sources": "^0.1.5",
         "webpack-sources": "^1.2.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "webpack-sources": {
+          "version": "1.4.3",
+          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+          "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+          "dev": true,
+          "requires": {
+            "source-list-map": "^2.0.0",
+            "source-map": "~0.6.1"
+          }
+        }
       }
     },
     "lie": {
@@ -46074,6 +46256,23 @@
         "object.map": "^1.0.0",
         "rechoir": "^0.6.2",
         "resolve": "^1.1.7"
+      },
+      "dependencies": {
+        "is-plain-object": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+          "dev": true,
+          "requires": {
+            "isobject": "^3.0.1"
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        }
       }
     },
     "lines-and-columns": {
@@ -46083,30 +46282,31 @@
       "dev": true
     },
     "load-json-file": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
-      "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+      "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
+        "parse-json": "^4.0.0",
+        "pify": "^3.0.0",
         "strip-bom": "^3.0.0"
       },
       "dependencies": {
         "parse-json": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
           "dev": true,
           "requires": {
-            "error-ex": "^1.2.0"
+            "error-ex": "^1.3.1",
+            "json-parse-better-errors": "^1.0.1"
           }
         },
         "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
           "dev": true
         },
         "strip-bom": {
@@ -46144,9 +46344,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.20",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-      "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
     "lodash._baseassign": {
       "version": "3.2.0",
@@ -46215,12 +46415,6 @@
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
       "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168="
     },
-    "lodash.flatten": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
-      "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=",
-      "dev": true
-    },
     "lodash.isarguments": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
@@ -46250,18 +46444,18 @@
       "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
       "dev": true
     },
+    "lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
     "lodash.restparam": {
       "version": "3.6.1",
       "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
       "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
       "dev": true
     },
-    "lodash.sortby": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
-      "dev": true
-    },
     "lodash.truncate": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
@@ -46275,81 +46469,66 @@
       "dev": true
     },
     "log-symbols": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
-      "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
       "dev": true,
       "requires": {
-        "chalk": "^2.4.2"
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "color-convert": "^1.9.0"
+            "color-convert": "^2.0.1"
           }
         },
         "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
           }
         },
         "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
-            "color-name": "1.1.3"
+            "color-name": "~1.1.4"
           }
         },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-          "dev": true
-        },
         "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "has-flag": "^4.0.0"
           }
         }
       }
     },
     "loglevel": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.0.tgz",
-      "integrity": "sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==",
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.1.tgz",
+      "integrity": "sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==",
       "dev": true
     },
-    "loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dev": true,
-      "requires": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      }
-    },
     "loud-rejection": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-2.2.0.tgz",
@@ -46379,9 +46558,9 @@
       }
     },
     "macos-release": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.4.1.tgz",
-      "integrity": "sha512-H/QHeBIN1fIGJX517pvK8IEK53yQOW7YcEI55oYtgjDdoCQQz7eJS94qt5kNrscReEyuD/JcdFCm2XBEcGOITg=="
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.5.0.tgz",
+      "integrity": "sha512-EIgv+QZ9r+814gjJj0Bt5vSLJLzswGmSUbUpbi9AIr/fsN2IWFBl2NucV9PAiek+U1STK468tEkxmVYUtuAN3g=="
     },
     "magic-string": {
       "version": "0.25.7",
@@ -46414,91 +46593,45 @@
       "dev": true
     },
     "make-fetch-happen": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz",
-      "integrity": "sha512-07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag==",
-      "dev": true,
+      "version": "8.0.14",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.14.tgz",
+      "integrity": "sha512-EsS89h6l4vbfJEtBZnENTOFk8mCRpY5ru36Xe5bcX1KYIli2mkSHqoFsp5O1wMDvTJJzxe/4THpCTtygjeeGWQ==",
       "requires": {
-        "agentkeepalive": "^3.4.1",
-        "cacache": "^12.0.0",
-        "http-cache-semantics": "^3.8.1",
-        "http-proxy-agent": "^2.1.0",
-        "https-proxy-agent": "^2.2.3",
-        "lru-cache": "^5.1.1",
-        "mississippi": "^3.0.0",
-        "node-fetch-npm": "^2.0.2",
-        "promise-retry": "^1.1.1",
-        "socks-proxy-agent": "^4.0.0",
-        "ssri": "^6.0.0"
+        "agentkeepalive": "^4.1.3",
+        "cacache": "^15.0.5",
+        "http-cache-semantics": "^4.1.0",
+        "http-proxy-agent": "^4.0.1",
+        "https-proxy-agent": "^5.0.0",
+        "is-lambda": "^1.0.1",
+        "lru-cache": "^6.0.0",
+        "minipass": "^3.1.3",
+        "minipass-collect": "^1.0.2",
+        "minipass-fetch": "^1.3.2",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.4",
+        "promise-retry": "^2.0.1",
+        "socks-proxy-agent": "^5.0.0",
+        "ssri": "^8.0.0"
       },
       "dependencies": {
-        "cacache": {
-          "version": "12.0.4",
-          "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
-          "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
-          "dev": true,
+        "err-code": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
+          "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="
+        },
+        "promise-retry": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
+          "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
           "requires": {
-            "bluebird": "^3.5.5",
-            "chownr": "^1.1.1",
-            "figgy-pudding": "^3.5.1",
-            "glob": "^7.1.4",
-            "graceful-fs": "^4.1.15",
-            "infer-owner": "^1.0.3",
-            "lru-cache": "^5.1.1",
-            "mississippi": "^3.0.0",
-            "mkdirp": "^0.5.1",
-            "move-concurrently": "^1.0.1",
-            "promise-inflight": "^1.0.1",
-            "rimraf": "^2.6.3",
-            "ssri": "^6.0.1",
-            "unique-filename": "^1.1.1",
-            "y18n": "^4.0.0"
+            "err-code": "^2.0.2",
+            "retry": "^0.12.0"
           }
         },
-        "chownr": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-          "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-          "dev": true
-        },
-        "http-cache-semantics": {
-          "version": "3.8.1",
-          "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz",
-          "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==",
-          "dev": true
-        },
-        "lru-cache": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-          "dev": true,
-          "requires": {
-            "yallist": "^3.0.2"
-          }
-        },
-        "rimraf": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        },
-        "ssri": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-          "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
-          "dev": true,
-          "requires": {
-            "figgy-pudding": "^3.5.1"
-          }
-        },
-        "yallist": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-          "dev": true
+        "retry": {
+          "version": "0.12.0",
+          "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
+          "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs="
         }
       }
     },
@@ -46509,6 +46642,14 @@
       "dev": true,
       "requires": {
         "kind-of": "^6.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        }
       }
     },
     "makeerror": {
@@ -46547,6 +46688,12 @@
         "stack-trace": "0.0.10"
       },
       "dependencies": {
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true
+        },
         "braces": {
           "version": "2.3.2",
           "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
@@ -46573,9 +46720,25 @@
               "requires": {
                 "is-extendable": "^0.1.0"
               }
+            },
+            "is-extendable": {
+              "version": "0.1.1",
+              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+              "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+              "dev": true
             }
           }
         },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        },
         "fill-range": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -46596,6 +46759,12 @@
               "requires": {
                 "is-extendable": "^0.1.0"
               }
+            },
+            "is-extendable": {
+              "version": "0.1.1",
+              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+              "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+              "dev": true
             }
           }
         },
@@ -46646,6 +46815,12 @@
           "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
           "dev": true
         },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        },
         "micromatch": {
           "version": "3.1.10",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -46710,9 +46885,9 @@
       }
     },
     "mdn-data": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
-      "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==",
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
+      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
       "dev": true
     },
     "media-typer": {
@@ -46721,9 +46896,9 @@
       "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
     },
     "memory-fs": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
-      "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
       "dev": true,
       "requires": {
         "errno": "^0.1.3",
@@ -46768,12 +46943,12 @@
       "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
     },
     "micromatch": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-      "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
       "requires": {
         "braces": "^3.0.1",
-        "picomatch": "^2.0.5"
+        "picomatch": "^2.2.3"
       }
     },
     "miller-rabin": {
@@ -46787,9 +46962,9 @@
       },
       "dependencies": {
         "bn.js": {
-          "version": "4.11.9",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
           "dev": true
         }
       }
@@ -46800,16 +46975,16 @@
       "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
     },
     "mime-db": {
-      "version": "1.44.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
-      "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="
+      "version": "1.49.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz",
+      "integrity": "sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA=="
     },
     "mime-types": {
-      "version": "2.1.27",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
-      "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
+      "version": "2.1.32",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz",
+      "integrity": "sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A==",
       "requires": {
-        "mime-db": "1.44.0"
+        "mime-db": "1.49.0"
       }
     },
     "mimic-fn": {
@@ -46818,69 +46993,72 @@
       "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
     },
     "mimic-response": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
+      "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
+      "optional": true
     },
     "mini-css-extract-plugin": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz",
-      "integrity": "sha512-lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A==",
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.3.5.tgz",
+      "integrity": "sha512-tvmzcwqJJXau4OQE5vT72pRT18o2zF+tQJp8CWchqvfQnTlflkzS+dANYcRdyPRWUWRkfmeNTKltx0NZI/b5dQ==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.1.0",
-        "normalize-url": "1.9.1",
-        "schema-utils": "^1.0.0",
+        "loader-utils": "^2.0.0",
+        "schema-utils": "^3.0.0",
         "webpack-sources": "^1.1.0"
       },
       "dependencies": {
-        "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
           "dev": true,
           "requires": {
-            "minimist": "^1.2.0"
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
           }
         },
-        "loader-utils": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+        "ajv-keywords": {
+          "version": "3.5.2",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
           "dev": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^1.0.1"
-          }
+          "requires": {}
         },
-        "normalize-url": {
-          "version": "1.9.1",
-          "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz",
-          "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
-          "dev": true,
-          "requires": {
-            "object-assign": "^4.0.1",
-            "prepend-http": "^1.0.0",
-            "query-string": "^4.1.0",
-            "sort-keys": "^1.0.0"
-          }
-        },
-        "prepend-http": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
-          "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
           "dev": true
         },
         "schema-utils": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
           "dev": true,
           "requires": {
-            "ajv": "^6.1.0",
-            "ajv-errors": "^1.0.0",
-            "ajv-keywords": "^3.1.0"
+            "@types/json-schema": "^7.0.8",
+            "ajv": "^6.12.5",
+            "ajv-keywords": "^3.5.2"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "webpack-sources": {
+          "version": "1.4.3",
+          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+          "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+          "dev": true,
+          "requires": {
+            "source-list-map": "^2.0.0",
+            "source-map": "~0.6.1"
           }
         }
       }
@@ -47005,27 +47183,12 @@
       "requires": {
         "for-in": "^1.0.2",
         "is-extendable": "^1.0.1"
-      },
-      "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        }
       }
     },
     "mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
-      "requires": {
-        "minimist": "^1.2.5"
-      }
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
     },
     "mkdirp-classic": {
       "version": "0.5.3",
@@ -47034,9 +47197,9 @@
       "optional": true
     },
     "moment": {
-      "version": "2.29.0",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.0.tgz",
-      "integrity": "sha512-z6IJ5HXYiuxvFTI6eiQ9dm77uE0gyy1yXNApVHqTcnIKfY9tIwEjlzsZ6u1LQXvVgKeTnv9Xm7NDvJ7lso3MtA=="
+      "version": "2.29.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
+      "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
     },
     "move-concurrently": {
       "version": "1.0.1",
@@ -47052,6 +47215,15 @@
         "run-queue": "^1.0.3"
       },
       "dependencies": {
+        "mkdirp": {
+          "version": "0.5.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        },
         "rimraf": {
           "version": "2.7.1",
           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -47063,27 +47235,10 @@
         }
       }
     },
-    "move-file": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/move-file/-/move-file-2.0.0.tgz",
-      "integrity": "sha512-cdkdhNCgbP5dvS4tlGxZbD+nloio9GIimP57EjqFhwLcMjnU+XJKAZzlmg/TN/AK1LuNAdTSvm3CPPP4Xkv0iQ==",
-      "dev": true,
-      "requires": {
-        "path-exists": "^4.0.0"
-      },
-      "dependencies": {
-        "path-exists": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-          "dev": true
-        }
-      }
-    },
     "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "multicast-dns": {
       "version": "6.2.3",
@@ -47113,12 +47268,18 @@
       "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="
     },
     "nan": {
-      "version": "2.14.1",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz",
-      "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==",
+      "version": "2.14.2",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
+      "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==",
       "dev": true,
       "optional": true
     },
+    "nanoid": {
+      "version": "3.1.23",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz",
+      "integrity": "sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==",
+      "dev": true
+    },
     "nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -47136,6 +47297,30 @@
         "regex-not": "^1.0.0",
         "snapdragon": "^0.8.1",
         "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true
+        },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        }
       }
     },
     "napi-build-utils": {
@@ -47144,13 +47329,6 @@
       "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==",
       "optional": true
     },
-    "native-request": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/native-request/-/native-request-1.0.7.tgz",
-      "integrity": "sha512-9nRjinI9bmz+S7dgNtf4A70+/vPhnd+2krGpy4SUlADuOuSa24IDkNaZ+R/QT1wQ6S8jBdi6wE7fLekFZNfUpQ==",
-      "dev": true,
-      "optional": true
-    },
     "native-run": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/native-run/-/native-run-1.4.0.tgz",
@@ -47170,19 +47348,10 @@
         "yauzl": "^2.10.0"
       },
       "dependencies": {
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+        "ini": {
+          "version": "1.3.8",
+          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+          "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
           "dev": true
         },
         "readable-stream": {
@@ -47213,6 +47382,37 @@
       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
       "dev": true
     },
+    "needle": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/needle/-/needle-2.8.0.tgz",
+      "integrity": "sha512-ZTq6WYkN/3782H1393me3utVYdq2XyqNUFBsprEE3VMAT0+hP/cItpnITpqsY6ep2yeFE4Tqtqwc74VqUlUYtw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "debug": "^3.2.6",
+        "iconv-lite": "^0.4.4",
+        "sax": "^1.2.4"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "sax": {
+          "version": "1.2.4",
+          "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+          "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
     "negotiator": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
@@ -47256,9 +47456,9 @@
       }
     },
     "node-abi": {
-      "version": "2.19.3",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.19.3.tgz",
-      "integrity": "sha512-9xZrlyfvKhWme2EXFKQhZRp1yNWT/uI1luYPr3sFl+H4keYY4xR+1jO7mvTTijIsHf1M+QDe9uWuKeEpLInIlg==",
+      "version": "2.30.0",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.30.0.tgz",
+      "integrity": "sha512-g6bZh3YCKQRdwuO/tSZZYJAw622SjsRfJ2X0Iy4sSOHZ34/sPPdVBn8fev2tj7njzLwuqPw9uMtGsGkO5kIQvg==",
       "optional": true,
       "requires": {
         "semver": "^5.4.1"
@@ -47273,22 +47473,11 @@
       }
     },
     "node-addon-api": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.0.2.tgz",
-      "integrity": "sha512-+D4s2HCnxPd5PjjI0STKwncjXTUKKqm74MDMz9OPXavjsGmjkvwgLtA5yoxJUdmpj52+2u+RrXgPipahKczMKg==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
+      "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
       "optional": true
     },
-    "node-fetch-npm": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.4.tgz",
-      "integrity": "sha512-iOuIQDWDyjhv9qSDrj9aq/klt6F9z1p2otB3AV7v3zBDcL/x+OfGsvGQZZCcMZbUf4Ujw1xGNQkjvGnVT22cKg==",
-      "dev": true,
-      "requires": {
-        "encoding": "^0.1.11",
-        "json-parse-better-errors": "^1.0.0",
-        "safe-buffer": "^5.1.1"
-      }
-    },
     "node-forge": {
       "version": "0.10.0",
       "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
@@ -47364,26 +47553,22 @@
         "vm-browserify": "^1.0.1"
       },
       "dependencies": {
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "dev": true
+        "buffer": {
+          "version": "4.9.2",
+          "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
+          "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
+          "dev": true,
+          "requires": {
+            "base64-js": "^1.0.2",
+            "ieee754": "^1.1.4",
+            "isarray": "^1.0.0"
+          }
         },
         "punycode": {
           "version": "1.4.1",
           "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
           "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
           "dev": true
-        },
-        "util": {
-          "version": "0.11.1",
-          "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
-          "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
-          "dev": true,
-          "requires": {
-            "inherits": "2.0.3"
-          }
         }
       }
     },
@@ -47394,9 +47579,9 @@
       "dev": true
     },
     "node-notifier": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.0.tgz",
-      "integrity": "sha512-46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.2.tgz",
+      "integrity": "sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==",
       "dev": true,
       "optional": true,
       "requires": {
@@ -47406,29 +47591,14 @@
         "shellwords": "^0.1.1",
         "uuid": "^8.3.0",
         "which": "^2.0.2"
-      },
-      "dependencies": {
-        "uuid": {
-          "version": "8.3.1",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.1.tgz",
-          "integrity": "sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==",
-          "dev": true,
-          "optional": true
-        }
       }
     },
     "node-releases": {
-      "version": "1.1.61",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.61.tgz",
-      "integrity": "sha512-DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g==",
+      "version": "1.1.73",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz",
+      "integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==",
       "dev": true
     },
-    "noop-logger": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz",
-      "integrity": "sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI=",
-      "optional": true
-    },
     "nopt": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
@@ -47450,9 +47620,9 @@
       },
       "dependencies": {
         "hosted-git-info": {
-          "version": "2.8.8",
-          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
-          "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="
+          "version": "2.8.9",
+          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+          "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="
         },
         "semver": {
           "version": "5.7.1",
@@ -47474,9 +47644,10 @@
       "dev": true
     },
     "normalize-url": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
-      "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA=="
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
+      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
+      "dev": true
     },
     "now-and-later": {
       "version": "2.0.1",
@@ -47488,9 +47659,9 @@
       }
     },
     "npm-bundled": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz",
-      "integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz",
+      "integrity": "sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==",
       "requires": {
         "npm-normalize-package-bin": "^1.0.1"
       }
@@ -47509,23 +47680,23 @@
       "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA=="
     },
     "npm-package-arg": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.0.1.tgz",
-      "integrity": "sha512-/h5Fm6a/exByzFSTm7jAyHbgOqErl9qSNJDQF32Si/ZzgwT2TERVxRxn3Jurw1wflgyVVAxnFR4fRHPM7y1ClQ==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.0.tgz",
+      "integrity": "sha512-/ep6QDxBkm9HvOhOg0heitSd7JHA1U7y1qhhlRlteYYAi9Pdb/ZV7FW5aHpkrpM8+P+4p/jjR8zCyKPBMBjSig==",
       "requires": {
-        "hosted-git-info": "^3.0.2",
+        "hosted-git-info": "^3.0.6",
         "semver": "^7.0.0",
         "validate-npm-package-name": "^3.0.0"
       }
     },
     "npm-packlist": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz",
-      "integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==",
-      "dev": true,
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.2.2.tgz",
+      "integrity": "sha512-Jt01acDvJRhJGthnUJVF/w6gumWOZxO7IkpY/lsX9//zqQgnF7OJaxgQXcerd4uQOLu7W5bkb4mChL9mdfm+Zg==",
       "requires": {
-        "ignore-walk": "^3.0.1",
-        "npm-bundled": "^1.0.1",
+        "glob": "^7.1.6",
+        "ignore-walk": "^3.0.3",
+        "npm-bundled": "^1.1.1",
         "npm-normalize-package-bin": "^1.0.1"
       }
     },
@@ -47540,65 +47711,18 @@
       }
     },
     "npm-registry-fetch": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.7.tgz",
-      "integrity": "sha512-cny9v0+Mq6Tjz+e0erFAB+RYJ/AVGzkjnISiobqP8OWj9c9FLoZZu8/SPSKJWE17F1tk4018wfjV+ZbIbqC7fQ==",
-      "dev": true,
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-9.0.0.tgz",
+      "integrity": "sha512-PuFYYtnQ8IyVl6ib9d3PepeehcUeHN9IO5N/iCRhyg9tStQcqGQBRVHmfmMWPDERU3KwZoHFvbJ4FPXPspvzbA==",
       "requires": {
-        "bluebird": "^3.5.1",
-        "figgy-pudding": "^3.4.1",
-        "JSONStream": "^1.3.4",
-        "lru-cache": "^5.1.1",
-        "make-fetch-happen": "^5.0.0",
-        "npm-package-arg": "^6.1.0",
-        "safe-buffer": "^5.2.0"
-      },
-      "dependencies": {
-        "hosted-git-info": {
-          "version": "2.8.8",
-          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
-          "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
-          "dev": true
-        },
-        "lru-cache": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-          "dev": true,
-          "requires": {
-            "yallist": "^3.0.2"
-          }
-        },
-        "npm-package-arg": {
-          "version": "6.1.1",
-          "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
-          "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
-          "dev": true,
-          "requires": {
-            "hosted-git-info": "^2.7.1",
-            "osenv": "^0.1.5",
-            "semver": "^5.6.0",
-            "validate-npm-package-name": "^3.0.0"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-          "dev": true
-        },
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "dev": true
-        },
-        "yallist": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-          "dev": true
-        }
+        "@npmcli/ci-detect": "^1.0.0",
+        "lru-cache": "^6.0.0",
+        "make-fetch-happen": "^8.0.9",
+        "minipass": "^3.1.3",
+        "minipass-fetch": "^1.3.0",
+        "minipass-json-stream": "^1.0.1",
+        "minizlib": "^2.0.0",
+        "npm-package-arg": "^8.0.0"
       }
     },
     "npm-run-path": {
@@ -47629,12 +47753,6 @@
         "boolbase": "~1.0.0"
       }
     },
-    "num2fraction": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
-      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
-      "dev": true
-    },
     "number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
@@ -47676,6 +47794,43 @@
             "is-descriptor": "^0.1.0"
           }
         },
+        "is-accessor-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          }
+        },
+        "is-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^0.1.6",
+            "is-data-descriptor": "^0.1.4",
+            "kind-of": "^5.0.0"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "5.1.0",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+              "dev": true
+            }
+          }
+        },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -47688,19 +47843,19 @@
       }
     },
     "object-inspect": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
-      "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz",
+      "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==",
       "dev": true
     },
     "object-is": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.3.tgz",
-      "integrity": "sha512-teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg==",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
+      "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.1"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
       }
     },
     "object-keys": {
@@ -47709,12 +47864,6 @@
       "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
       "dev": true
     },
-    "object-path": {
-      "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.11.4.tgz",
-      "integrity": "sha1-NwrnUvvzfePqcKhhwju6iRVpGUk=",
-      "dev": true
-    },
     "object-visit": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
@@ -47733,13 +47882,13 @@
       }
     },
     "object.assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz",
-      "integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
       "dev": true,
       "requires": {
+        "call-bind": "^1.0.0",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.0",
         "has-symbols": "^1.0.1",
         "object-keys": "^1.1.1"
       }
@@ -47764,37 +47913,6 @@
         }
       }
     },
-    "object.getownpropertydescriptors": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz",
-      "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.17.7",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
-          "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
-          "dev": true,
-          "requires": {
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.1",
-            "is-callable": "^1.2.2",
-            "is-regex": "^1.1.1",
-            "object-inspect": "^1.8.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.1",
-            "string.prototype.trimend": "^1.0.1",
-            "string.prototype.trimstart": "^1.0.1"
-          }
-        }
-      }
-    },
     "object.map": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
@@ -47833,42 +47951,20 @@
       }
     },
     "object.values": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz",
-      "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.4.tgz",
+      "integrity": "sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==",
       "dev": true,
       "requires": {
+        "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.17.7",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
-          "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
-          "dev": true,
-          "requires": {
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.1",
-            "is-callable": "^1.2.2",
-            "is-regex": "^1.1.1",
-            "object-inspect": "^1.8.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.1",
-            "string.prototype.trimend": "^1.0.1",
-            "string.prototype.trimstart": "^1.0.1"
-          }
-        }
+        "es-abstract": "^1.18.2"
       }
     },
     "objectorarray": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/objectorarray/-/objectorarray-1.0.4.tgz",
-      "integrity": "sha512-91k8bjcldstRz1bG6zJo8lWD7c6QXcB4nTDUqiEvIL1xAsLoZlOOZZG+nd6YPz+V7zY1580J4Xxh1vZtyv4i/w=="
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/objectorarray/-/objectorarray-1.0.5.tgz",
+      "integrity": "sha512-eJJDYkhJFFbBBAxeh8xW+weHlkI28n2ZdQV/J/DNfWfSKlGEf2xcfAbZTv3riEXHAhL9SVOTs2pRmXiSTf78xg=="
     },
     "obuf": {
       "version": "1.1.2",
@@ -47906,9 +48002,9 @@
       }
     },
     "open": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/open/-/open-7.3.0.tgz",
-      "integrity": "sha512-mgLwQIx2F/ye9SmbrUkurZCnkoXyXyu9EbHtJZrICjVAJfyMArdHp3KkixGdZx1ZHFPNIwl0DDM1dFFqXbTLZw==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/open/-/open-7.4.0.tgz",
+      "integrity": "sha512-PGoBCX/lclIWlpS/R2PQuIR4NJoXh6X5AwVzE7WXnWRGvHg7+4TBCgsujUgiPpm0K1y4qvQeWnCWVTpTKZBtvA==",
       "requires": {
         "is-docker": "^2.0.0",
         "is-wsl": "^2.1.1"
@@ -47946,53 +48042,62 @@
       }
     },
     "ora": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-4.0.4.tgz",
-      "integrity": "sha512-77iGeVU1cIdRhgFzCK8aw1fbtT1B/iZAvWjS+l/o1x0RShMgxHUZaD2yDpWsNCPwXg9z1ZA78Kbdvr8kBmG/Ww==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-5.3.0.tgz",
+      "integrity": "sha512-zAKMgGXUim0Jyd6CXK9lraBnD3H5yPGBPPOkC23a2BG6hsm4Zu6OQSjQuEtV0BHDf4aKHcUFvJiGRrFuW3MG8g==",
       "dev": true,
       "requires": {
-        "chalk": "^3.0.0",
+        "bl": "^4.0.3",
+        "chalk": "^4.1.0",
         "cli-cursor": "^3.1.0",
-        "cli-spinners": "^2.2.0",
+        "cli-spinners": "^2.5.0",
         "is-interactive": "^1.0.0",
-        "log-symbols": "^3.0.0",
-        "mute-stream": "0.0.8",
+        "log-symbols": "^4.0.0",
         "strip-ansi": "^6.0.0",
         "wcwidth": "^1.0.1"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "cli-cursor": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-          "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
-            "restore-cursor": "^3.1.0"
-          }
-        },
-        "restore-cursor": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-          "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-          "dev": true,
-          "requires": {
-            "onetime": "^5.1.0",
-            "signal-exit": "^3.0.2"
-          }
-        },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.0"
+            "has-flag": "^4.0.0"
           }
         }
       }
@@ -48036,12 +48141,13 @@
       }
     },
     "os-name": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/os-name/-/os-name-3.1.0.tgz",
-      "integrity": "sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/os-name/-/os-name-4.0.1.tgz",
+      "integrity": "sha512-xl9MAoU97MH1Xt5K9ERft2YfCAoaO6msy1OBA0ozxEC0x0TmIoE6K3QvgJMMZA9yKGLmHXNY/YZoDbiGDj4zYw==",
+      "dev": true,
       "requires": {
-        "macos-release": "^2.2.0",
-        "windows-release": "^3.1.0"
+        "macos-release": "^2.5.0",
+        "windows-release": "^4.0.0"
       }
     },
     "os-tmpdir": {
@@ -48064,9 +48170,9 @@
       "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="
     },
     "p-each-series": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.1.0.tgz",
-      "integrity": "sha512-ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.2.0.tgz",
+      "integrity": "sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==",
       "dev": true
     },
     "p-finally": {
@@ -48075,18 +48181,12 @@
       "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
     },
     "p-limit": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
       "requires": {
-        "p-try": "^1.0.0"
-      },
-      "dependencies": {
-        "p-try": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
-        }
+        "yocto-queue": "^0.1.0"
       }
     },
     "p-locate": {
@@ -48095,6 +48195,21 @@
       "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
       "requires": {
         "p-limit": "^1.1.0"
+      },
+      "dependencies": {
+        "p-limit": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+          "requires": {
+            "p-try": "^1.0.0"
+          }
+        },
+        "p-try": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
+        }
       }
     },
     "p-map": {
@@ -48112,6 +48227,14 @@
       "dev": true,
       "requires": {
         "retry": "^0.12.0"
+      },
+      "dependencies": {
+        "retry": {
+          "version": "0.12.0",
+          "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
+          "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
+          "dev": true
+        }
       }
     },
     "p-try": {
@@ -48134,64 +48257,6 @@
         "pac-resolver": "^4.1.0",
         "raw-body": "^2.2.0",
         "socks-proxy-agent": "5"
-      },
-      "dependencies": {
-        "agent-base": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-          "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-          "dev": true,
-          "requires": {
-            "debug": "4"
-          }
-        },
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "http-proxy-agent": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
-          "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
-          "dev": true,
-          "requires": {
-            "@tootallnate/once": "1",
-            "agent-base": "6",
-            "debug": "4"
-          }
-        },
-        "https-proxy-agent": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-          "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
-          "dev": true,
-          "requires": {
-            "agent-base": "6",
-            "debug": "4"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "socks-proxy-agent": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz",
-          "integrity": "sha512-lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA==",
-          "dev": true,
-          "requires": {
-            "agent-base": "6",
-            "debug": "4",
-            "socks": "^2.3.3"
-          }
-        }
       }
     },
     "pac-resolver": {
@@ -48224,201 +48289,29 @@
       }
     },
     "pacote": {
-      "version": "9.5.12",
-      "resolved": "https://registry.npmjs.org/pacote/-/pacote-9.5.12.tgz",
-      "integrity": "sha512-BUIj/4kKbwWg4RtnBncXPJd15piFSVNpTzY0rysSr3VnMowTYgkGKcaHrbReepAkjTr8lH2CVWRi58Spg2CicQ==",
-      "dev": true,
+      "version": "11.2.4",
+      "resolved": "https://registry.npmjs.org/pacote/-/pacote-11.2.4.tgz",
+      "integrity": "sha512-GfTeVQGJ6WyBQbQD4t3ocHbyOmTQLmWjkCKSZPmKiGFKYKNUaM5U2gbLzUW8WG1XmS9yQFnsTFA0k3o1+q4klQ==",
       "requires": {
-        "bluebird": "^3.5.3",
-        "cacache": "^12.0.2",
-        "chownr": "^1.1.2",
-        "figgy-pudding": "^3.5.1",
-        "get-stream": "^4.1.0",
-        "glob": "^7.1.3",
+        "@npmcli/git": "^2.0.1",
+        "@npmcli/installed-package-contents": "^1.0.5",
+        "@npmcli/promise-spawn": "^1.2.0",
+        "@npmcli/run-script": "^1.3.0",
+        "cacache": "^15.0.5",
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.1.0",
         "infer-owner": "^1.0.4",
-        "lru-cache": "^5.1.1",
-        "make-fetch-happen": "^5.0.0",
-        "minimatch": "^3.0.4",
-        "minipass": "^2.3.5",
-        "mississippi": "^3.0.0",
-        "mkdirp": "^0.5.1",
-        "normalize-package-data": "^2.4.0",
-        "npm-normalize-package-bin": "^1.0.0",
-        "npm-package-arg": "^6.1.0",
-        "npm-packlist": "^1.1.12",
-        "npm-pick-manifest": "^3.0.0",
-        "npm-registry-fetch": "^4.0.0",
-        "osenv": "^0.1.5",
-        "promise-inflight": "^1.0.1",
+        "minipass": "^3.1.3",
+        "mkdirp": "^1.0.3",
+        "npm-package-arg": "^8.0.1",
+        "npm-packlist": "^2.1.4",
+        "npm-pick-manifest": "^6.0.0",
+        "npm-registry-fetch": "^9.0.0",
         "promise-retry": "^1.1.1",
-        "protoduck": "^5.0.1",
-        "rimraf": "^2.6.2",
-        "safe-buffer": "^5.1.2",
-        "semver": "^5.6.0",
-        "ssri": "^6.0.1",
-        "tar": "^4.4.10",
-        "unique-filename": "^1.1.1",
-        "which": "^1.3.1"
-      },
-      "dependencies": {
-        "cacache": {
-          "version": "12.0.4",
-          "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
-          "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
-          "dev": true,
-          "requires": {
-            "bluebird": "^3.5.5",
-            "chownr": "^1.1.1",
-            "figgy-pudding": "^3.5.1",
-            "glob": "^7.1.4",
-            "graceful-fs": "^4.1.15",
-            "infer-owner": "^1.0.3",
-            "lru-cache": "^5.1.1",
-            "mississippi": "^3.0.0",
-            "mkdirp": "^0.5.1",
-            "move-concurrently": "^1.0.1",
-            "promise-inflight": "^1.0.1",
-            "rimraf": "^2.6.3",
-            "ssri": "^6.0.1",
-            "unique-filename": "^1.1.1",
-            "y18n": "^4.0.0"
-          }
-        },
-        "chownr": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-          "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-          "dev": true
-        },
-        "fs-minipass": {
-          "version": "1.2.7",
-          "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
-          "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
-          "dev": true,
-          "requires": {
-            "minipass": "^2.6.0"
-          }
-        },
-        "get-stream": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-          "dev": true,
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        },
-        "hosted-git-info": {
-          "version": "2.8.8",
-          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
-          "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
-          "dev": true
-        },
-        "lru-cache": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-          "dev": true,
-          "requires": {
-            "yallist": "^3.0.2"
-          }
-        },
-        "minipass": {
-          "version": "2.9.0",
-          "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
-          "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.0"
-          }
-        },
-        "minizlib": {
-          "version": "1.3.3",
-          "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
-          "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
-          "dev": true,
-          "requires": {
-            "minipass": "^2.9.0"
-          }
-        },
-        "npm-package-arg": {
-          "version": "6.1.1",
-          "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
-          "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
-          "dev": true,
-          "requires": {
-            "hosted-git-info": "^2.7.1",
-            "osenv": "^0.1.5",
-            "semver": "^5.6.0",
-            "validate-npm-package-name": "^3.0.0"
-          }
-        },
-        "npm-pick-manifest": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-3.0.2.tgz",
-          "integrity": "sha512-wNprTNg+X5nf+tDi+hbjdHhM4bX+mKqv6XmPh7B5eG+QY9VARfQPfCEH013H5GqfNj6ee8Ij2fg8yk0mzps1Vw==",
-          "dev": true,
-          "requires": {
-            "figgy-pudding": "^3.5.1",
-            "npm-package-arg": "^6.0.0",
-            "semver": "^5.4.1"
-          }
-        },
-        "rimraf": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        },
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "dev": true
-        },
-        "ssri": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-          "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
-          "dev": true,
-          "requires": {
-            "figgy-pudding": "^3.5.1"
-          }
-        },
-        "tar": {
-          "version": "4.4.13",
-          "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz",
-          "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
-          "dev": true,
-          "requires": {
-            "chownr": "^1.1.1",
-            "fs-minipass": "^1.2.5",
-            "minipass": "^2.8.6",
-            "minizlib": "^1.2.1",
-            "mkdirp": "^0.5.0",
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.3"
-          }
-        },
-        "which": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-          "dev": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        },
-        "yallist": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-          "dev": true
-        }
+        "read-package-json-fast": "^1.1.3",
+        "rimraf": "^3.0.2",
+        "ssri": "^8.0.0",
+        "tar": "^6.1.0"
       }
     },
     "pako": {
@@ -48479,13 +48372,15 @@
       }
     },
     "parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
       "dev": true,
       "requires": {
+        "@babel/code-frame": "^7.0.0",
         "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
       }
     },
     "parse-node-version": {
@@ -48501,10 +48396,65 @@
       "dev": true
     },
     "parse5": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
-      "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==",
-      "dev": true
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz",
+      "integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "parse5-html-rewriting-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-6.0.1.tgz",
+      "integrity": "sha512-vwLQzynJVEfUlURxgnf51yAJDQTtVpNyGD8tKi2Za7m+akukNHxCcUQMAa/mUGLhCeicFdpy7Tlvj8ZNKadprg==",
+      "dev": true,
+      "requires": {
+        "parse5": "^6.0.1",
+        "parse5-sax-parser": "^6.0.1"
+      },
+      "dependencies": {
+        "parse5": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+          "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+          "dev": true
+        }
+      }
+    },
+    "parse5-htmlparser2-tree-adapter": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz",
+      "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==",
+      "dev": true,
+      "requires": {
+        "parse5": "^6.0.1"
+      },
+      "dependencies": {
+        "parse5": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+          "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+          "dev": true
+        }
+      }
+    },
+    "parse5-sax-parser": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5-sax-parser/-/parse5-sax-parser-6.0.1.tgz",
+      "integrity": "sha512-kXX+5S81lgESA0LsDuGjAlBybImAChYRMT+/uKCEXFBFOeEhS52qUCydGhU3qLRD8D9DVjaUo821WK7DM4iCeg==",
+      "dev": true,
+      "requires": {
+        "parse5": "^6.0.1"
+      },
+      "dependencies": {
+        "parse5": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+          "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+          "dev": true
+        }
+      }
     },
     "parseurl": {
       "version": "1.3.3",
@@ -48550,9 +48500,9 @@
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
     },
     "path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
     },
     "path-root": {
       "version": "0.1.1",
@@ -48580,9 +48530,9 @@
       "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
     },
     "pbkdf2": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.1.tgz",
-      "integrity": "sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
+      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
       "dev": true,
       "requires": {
         "create-hash": "^1.1.2",
@@ -48609,14 +48559,14 @@
       "integrity": "sha512-1wvc3iQOQpEBaQbXgLxA2JUiLSQ2azdF/bF29ghXDiQJWSpQ1BF8gSuqttM8WZoj081Ps8OKL0gYxdDBkFNPqA=="
     },
     "picomatch": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
-      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
+      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="
     },
     "pify": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz",
+      "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA=="
     },
     "pinkie": {
       "version": "2.0.4",
@@ -48643,51 +48593,12 @@
       }
     },
     "pkg-dir": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
+      "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
       "dev": true,
       "requires": {
-        "find-up": "^3.0.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        }
+        "find-up": "^2.1.0"
       }
     },
     "pkg-up": {
@@ -48699,13 +48610,13 @@
       }
     },
     "plist": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.1.tgz",
-      "integrity": "sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.2.tgz",
+      "integrity": "sha512-MSrkwZBdQ6YapHy87/8hDU8MnIcyxBKjeF+McXnr5A9MtffPewTs7G3hlpodT5TacyfIyFTaJEhh3GGcmasTgQ==",
       "requires": {
-        "base64-js": "^1.2.3",
+        "base64-js": "^1.5.1",
         "xmlbuilder": "^9.0.7",
-        "xmldom": "0.1.x"
+        "xmldom": "^0.5.0"
       }
     },
     "plugin-error": {
@@ -48719,45 +48630,6 @@
         "arr-diff": "^1.0.1",
         "arr-union": "^2.0.1",
         "extend-shallow": "^1.1.2"
-      },
-      "dependencies": {
-        "arr-diff": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
-          "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.0.1",
-            "array-slice": "^0.2.3"
-          }
-        },
-        "arr-union": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
-          "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=",
-          "dev": true
-        },
-        "array-slice": {
-          "version": "0.2.3",
-          "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
-          "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
-          "dev": true
-        },
-        "extend-shallow": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
-          "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^1.1.0"
-          }
-        },
-        "kind-of": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
-          "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
-          "dev": true
-        }
       }
     },
     "pnp-webpack-plugin": {
@@ -48781,19 +48653,22 @@
       },
       "dependencies": {
         "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "dev": true,
           "requires": {
             "ms": "^2.1.1"
           }
         },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
+        "mkdirp": {
+          "version": "0.5.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
         }
       }
     },
@@ -48804,66 +48679,20 @@
       "dev": true
     },
     "postcss": {
-      "version": "7.0.31",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.31.tgz",
-      "integrity": "sha512-a937VDHE1ftkjk+8/7nj/mrjtmkn69xxzJgRETXdAUU+IgOYPQNJF17haGWbeDxSyk++HA14UA98FurvPyBJOA==",
+      "version": "8.2.15",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.15.tgz",
+      "integrity": "sha512-2zO3b26eJD/8rb106Qu2o7Qgg52ND5HPjcyQiK2B98O388h43A448LCslC0dI2P97wCAQRJsFvwTRcXxTKds+Q==",
       "dev": true,
       "requires": {
-        "chalk": "^2.4.2",
-        "source-map": "^0.6.1",
-        "supports-color": "^6.1.0"
+        "colorette": "^1.2.2",
+        "nanoid": "^3.1.23",
+        "source-map": "^0.6.1"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "dev": true,
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+        "colorette": {
+          "version": "1.2.2",
+          "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
+          "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
           "dev": true
         },
         "source-map": {
@@ -48871,692 +48700,376 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
     "postcss-calc": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.5.tgz",
-      "integrity": "sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.0.0.tgz",
+      "integrity": "sha512-5NglwDrcbiy8XXfPM11F3HeC6hoT9W7GUH/Zi5U/p7u3Irv4rHhdDcIZwG0llHXV4ftsBjpfWMXAnXNl4lnt8g==",
       "dev": true,
       "requires": {
-        "postcss": "^7.0.27",
         "postcss-selector-parser": "^6.0.2",
         "postcss-value-parser": "^4.0.2"
       }
     },
     "postcss-colormin": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz",
-      "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.2.0.tgz",
+      "integrity": "sha512-+HC6GfWU3upe5/mqmxuqYZ9B2Wl4lcoUUNkoaX59nEWV4EtADCMiBqui111Bu8R8IvaZTmqmxrqOAqjbHIwXPw==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.0.0",
-        "color": "^3.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
+        "browserslist": "^4.16.6",
+        "caniuse-api": "^3.0.0",
+        "colord": "^2.0.1",
+        "postcss-value-parser": "^4.1.0"
       }
     },
     "postcss-convert-values": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz",
-      "integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.0.1.tgz",
+      "integrity": "sha512-C3zR1Do2BkKkCgC0g3sF8TS0koF2G+mN8xxayZx3f10cIRmTaAnpgpRQZjNekTZxM2ciSPoh2IWJm0VZx8NoQg==",
       "dev": true,
       "requires": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
+        "postcss-value-parser": "^4.1.0"
       }
     },
     "postcss-discard-comments": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz",
-      "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.0.1.tgz",
+      "integrity": "sha512-lgZBPTDvWrbAYY1v5GYEv8fEO/WhKOu/hmZqmCYfrpD6eyDWWzAOsl2rF29lpvziKO02Gc5GJQtlpkTmakwOWg==",
       "dev": true,
-      "requires": {
-        "postcss": "^7.0.0"
-      }
+      "requires": {}
     },
     "postcss-discard-duplicates": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz",
-      "integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.1.tgz",
+      "integrity": "sha512-svx747PWHKOGpAXXQkCc4k/DsWo+6bc5LsVrAsw+OU+Ibi7klFZCyX54gjYzX4TH+f2uzXjRviLARxkMurA2bA==",
       "dev": true,
-      "requires": {
-        "postcss": "^7.0.0"
-      }
+      "requires": {}
     },
     "postcss-discard-empty": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz",
-      "integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.0.1.tgz",
+      "integrity": "sha512-vfU8CxAQ6YpMxV2SvMcMIyF2LX1ZzWpy0lqHDsOdaKKLQVQGVP1pzhrI9JlsO65s66uQTfkQBKBD/A5gp9STFw==",
       "dev": true,
-      "requires": {
-        "postcss": "^7.0.0"
-      }
+      "requires": {}
     },
     "postcss-discard-overridden": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz",
-      "integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.0.1.tgz",
+      "integrity": "sha512-Y28H7y93L2BpJhrdUR2SR2fnSsT+3TVx1NmVQLbcnZWwIUpJ7mfcTC6Za9M2PG6w8j7UQRfzxqn8jU2VwFxo3Q==",
       "dev": true,
-      "requires": {
-        "postcss": "^7.0.0"
-      }
+      "requires": {}
     },
     "postcss-import": {
-      "version": "12.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-12.0.1.tgz",
-      "integrity": "sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw==",
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-14.0.0.tgz",
+      "integrity": "sha512-gFDDzXhqr9ELmnLHgCC3TbGfA6Dm/YMb/UN8/f7Uuq4fL7VTk2vOIj6hwINEwbokEmp123bLD7a5m+E+KIetRg==",
       "dev": true,
       "requires": {
-        "postcss": "^7.0.1",
-        "postcss-value-parser": "^3.2.3",
+        "postcss-value-parser": "^4.0.0",
         "read-cache": "^1.0.0",
         "resolve": "^1.1.7"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-load-config": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.2.tgz",
-      "integrity": "sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==",
-      "dev": true,
-      "requires": {
-        "cosmiconfig": "^5.0.0",
-        "import-cwd": "^2.0.0"
       }
     },
     "postcss-loader": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz",
-      "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-4.2.0.tgz",
+      "integrity": "sha512-mqgScxHqbiz1yxbnNcPdKYo/6aVt+XExURmEbQlviFVWogDbM4AJ0A/B+ZBpYsJrTRxKw7HyRazg9x0Q9SWwLA==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.1.0",
-        "postcss": "^7.0.0",
-        "postcss-load-config": "^2.0.0",
-        "schema-utils": "^1.0.0"
+        "cosmiconfig": "^7.0.0",
+        "klona": "^2.0.4",
+        "loader-utils": "^2.0.0",
+        "schema-utils": "^3.0.0",
+        "semver": "^7.3.4"
       },
       "dependencies": {
-        "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
           "dev": true,
           "requires": {
-            "minimist": "^1.2.0"
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
           }
         },
-        "loader-utils": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+        "ajv-keywords": {
+          "version": "3.5.2",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
           "dev": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^1.0.1"
-          }
+          "requires": {}
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
         },
         "schema-utils": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
           "dev": true,
           "requires": {
-            "ajv": "^6.1.0",
-            "ajv-errors": "^1.0.0",
-            "ajv-keywords": "^3.1.0"
+            "@types/json-schema": "^7.0.8",
+            "ajv": "^6.12.5",
+            "ajv-keywords": "^3.5.2"
           }
         }
       }
     },
     "postcss-merge-longhand": {
-      "version": "4.0.11",
-      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz",
-      "integrity": "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.0.2.tgz",
+      "integrity": "sha512-BMlg9AXSI5G9TBT0Lo/H3PfUy63P84rVz3BjCFE9e9Y9RXQZD3+h3YO1kgTNsNJy7bBc1YQp8DmSnwLIW5VPcw==",
       "dev": true,
       "requires": {
-        "css-color-names": "0.0.4",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0",
-        "stylehacks": "^4.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
+        "css-color-names": "^1.0.1",
+        "postcss-value-parser": "^4.1.0",
+        "stylehacks": "^5.0.1"
       }
     },
     "postcss-merge-rules": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz",
-      "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.0.2.tgz",
+      "integrity": "sha512-5K+Md7S3GwBewfB4rjDeol6V/RZ8S+v4B66Zk2gChRqLTCC8yjnHQ601omj9TKftS19OPGqZ/XzoqpzNQQLwbg==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.0.0",
+        "browserslist": "^4.16.6",
         "caniuse-api": "^3.0.0",
-        "cssnano-util-same-parent": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-selector-parser": "^3.0.0",
-        "vendors": "^1.0.0"
-      },
-      "dependencies": {
-        "postcss-selector-parser": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-          "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
-          "dev": true,
-          "requires": {
-            "dot-prop": "^5.2.0",
-            "indexes-of": "^1.0.1",
-            "uniq": "^1.0.1"
-          }
-        }
+        "cssnano-utils": "^2.0.1",
+        "postcss-selector-parser": "^6.0.5",
+        "vendors": "^1.0.3"
       }
     },
     "postcss-minify-font-values": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz",
-      "integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.0.1.tgz",
+      "integrity": "sha512-7JS4qIsnqaxk+FXY1E8dHBDmraYFWmuL6cgt0T1SWGRO5bzJf8sUoelwa4P88LEWJZweHevAiDKxHlofuvtIoA==",
       "dev": true,
       "requires": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
+        "postcss-value-parser": "^4.1.0"
       }
     },
     "postcss-minify-gradients": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz",
-      "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.0.1.tgz",
+      "integrity": "sha512-odOwBFAIn2wIv+XYRpoN2hUV3pPQlgbJ10XeXPq8UY2N+9ZG42xu45lTn/g9zZ+d70NKSQD6EOi6UiCMu3FN7g==",
       "dev": true,
       "requires": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "is-color-stop": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
+        "cssnano-utils": "^2.0.1",
+        "is-color-stop": "^1.1.0",
+        "postcss-value-parser": "^4.1.0"
       }
     },
     "postcss-minify-params": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz",
-      "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.0.1.tgz",
+      "integrity": "sha512-4RUC4k2A/Q9mGco1Z8ODc7h+A0z7L7X2ypO1B6V8057eVK6mZ6xwz6QN64nHuHLbqbclkX1wyzRnIrdZehTEHw==",
       "dev": true,
       "requires": {
-        "alphanum-sort": "^1.0.0",
-        "browserslist": "^4.0.0",
-        "cssnano-util-get-arguments": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0",
+        "alphanum-sort": "^1.0.2",
+        "browserslist": "^4.16.0",
+        "cssnano-utils": "^2.0.1",
+        "postcss-value-parser": "^4.1.0",
         "uniqs": "^2.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
       }
     },
     "postcss-minify-selectors": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz",
-      "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.1.0.tgz",
+      "integrity": "sha512-NzGBXDa7aPsAcijXZeagnJBKBPMYLaJJzB8CQh6ncvyl2sIndLVWfbcDi0SBjRWk5VqEjXvf8tYwzoKf4Z07og==",
       "dev": true,
       "requires": {
-        "alphanum-sort": "^1.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-selector-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-selector-parser": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-          "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
-          "dev": true,
-          "requires": {
-            "dot-prop": "^5.2.0",
-            "indexes-of": "^1.0.1",
-            "uniq": "^1.0.1"
-          }
-        }
+        "alphanum-sort": "^1.0.2",
+        "postcss-selector-parser": "^6.0.5"
       }
     },
     "postcss-modules-extract-imports": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz",
-      "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
+      "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
       "dev": true,
-      "requires": {
-        "postcss": "^7.0.5"
-      }
+      "requires": {}
     },
     "postcss-modules-local-by-default": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz",
-      "integrity": "sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz",
+      "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==",
       "dev": true,
       "requires": {
-        "icss-utils": "^4.1.1",
-        "postcss": "^7.0.32",
+        "icss-utils": "^5.0.0",
         "postcss-selector-parser": "^6.0.2",
         "postcss-value-parser": "^4.1.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "dev": true,
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "postcss-modules-scope": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz",
-      "integrity": "sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
+      "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
       "dev": true,
       "requires": {
-        "postcss": "^7.0.6",
-        "postcss-selector-parser": "^6.0.0"
+        "postcss-selector-parser": "^6.0.4"
       }
     },
     "postcss-modules-values": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz",
-      "integrity": "sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
+      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
       "dev": true,
       "requires": {
-        "icss-utils": "^4.0.0",
-        "postcss": "^7.0.6"
+        "icss-utils": "^5.0.0"
       }
     },
     "postcss-normalize-charset": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz",
-      "integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.0.1.tgz",
+      "integrity": "sha512-6J40l6LNYnBdPSk+BHZ8SF+HAkS4q2twe5jnocgd+xWpz/mx/5Sa32m3W1AA8uE8XaXN+eg8trIlfu8V9x61eg==",
       "dev": true,
-      "requires": {
-        "postcss": "^7.0.0"
-      }
+      "requires": {}
     },
     "postcss-normalize-display-values": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz",
-      "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.1.tgz",
+      "integrity": "sha512-uupdvWk88kLDXi5HEyI9IaAJTE3/Djbcrqq8YgjvAVuzgVuqIk3SuJWUisT2gaJbZm1H9g5k2w1xXilM3x8DjQ==",
       "dev": true,
       "requires": {
-        "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
+        "cssnano-utils": "^2.0.1",
+        "postcss-value-parser": "^4.1.0"
       }
     },
     "postcss-normalize-positions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz",
-      "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.0.1.tgz",
+      "integrity": "sha512-rvzWAJai5xej9yWqlCb1OWLd9JjW2Ex2BCPzUJrbaXmtKtgfL8dBMOOMTX6TnvQMtjk3ei1Lswcs78qKO1Skrg==",
       "dev": true,
       "requires": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
+        "postcss-value-parser": "^4.1.0"
       }
     },
     "postcss-normalize-repeat-style": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz",
-      "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.1.tgz",
+      "integrity": "sha512-syZ2itq0HTQjj4QtXZOeefomckiV5TaUO6ReIEabCh3wgDs4Mr01pkif0MeVwKyU/LHEkPJnpwFKRxqWA/7O3w==",
       "dev": true,
       "requires": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
+        "cssnano-utils": "^2.0.1",
+        "postcss-value-parser": "^4.1.0"
       }
     },
     "postcss-normalize-string": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz",
-      "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.0.1.tgz",
+      "integrity": "sha512-Ic8GaQ3jPMVl1OEn2U//2pm93AXUcF3wz+OriskdZ1AOuYV25OdgS7w9Xu2LO5cGyhHCgn8dMXh9bO7vi3i9pA==",
       "dev": true,
       "requires": {
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
+        "postcss-value-parser": "^4.1.0"
       }
     },
     "postcss-normalize-timing-functions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz",
-      "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.0.1.tgz",
+      "integrity": "sha512-cPcBdVN5OsWCNEo5hiXfLUnXfTGtSFiBU9SK8k7ii8UD7OLuznzgNRYkLZow11BkQiiqMcgPyh4ZqXEEUrtQ1Q==",
       "dev": true,
       "requires": {
-        "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
+        "cssnano-utils": "^2.0.1",
+        "postcss-value-parser": "^4.1.0"
       }
     },
     "postcss-normalize-unicode": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz",
-      "integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.1.tgz",
+      "integrity": "sha512-kAtYD6V3pK0beqrU90gpCQB7g6AOfP/2KIPCVBKJM2EheVsBQmx/Iof+9zR9NFKLAx4Pr9mDhogB27pmn354nA==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
+        "browserslist": "^4.16.0",
+        "postcss-value-parser": "^4.1.0"
       }
     },
     "postcss-normalize-url": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz",
-      "integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.0.2.tgz",
+      "integrity": "sha512-k4jLTPUxREQ5bpajFQZpx8bCF2UrlqOTzP9kEqcEnOfwsRshWs2+oAFIHfDQB8GO2PaUaSE0NlTAYtbluZTlHQ==",
       "dev": true,
       "requires": {
-        "is-absolute-url": "^2.0.0",
-        "normalize-url": "^3.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "normalize-url": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz",
-          "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==",
-          "dev": true
-        },
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
+        "is-absolute-url": "^3.0.3",
+        "normalize-url": "^6.0.1",
+        "postcss-value-parser": "^4.1.0"
       }
     },
     "postcss-normalize-whitespace": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz",
-      "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.1.tgz",
+      "integrity": "sha512-iPklmI5SBnRvwceb/XH568yyzK0qRVuAG+a1HFUsFRf11lEJTiQQa03a4RSCQvLKdcpX7XsI1Gen9LuLoqwiqA==",
       "dev": true,
       "requires": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
+        "postcss-value-parser": "^4.1.0"
       }
     },
     "postcss-ordered-values": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz",
-      "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.0.2.tgz",
+      "integrity": "sha512-8AFYDSOYWebJYLyJi3fyjl6CqMEG/UVworjiyK1r573I56kb3e879sCJLGvR3merj+fAdPpVplXKQZv+ey6CgQ==",
       "dev": true,
       "requires": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
+        "cssnano-utils": "^2.0.1",
+        "postcss-value-parser": "^4.1.0"
       }
     },
     "postcss-reduce-initial": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz",
-      "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.0.1.tgz",
+      "integrity": "sha512-zlCZPKLLTMAqA3ZWH57HlbCjkD55LX9dsRyxlls+wfuRfqCi5mSlZVan0heX5cHr154Dq9AfbH70LyhrSAezJw==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.0.0",
-        "caniuse-api": "^3.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0"
+        "browserslist": "^4.16.0",
+        "caniuse-api": "^3.0.0"
       }
     },
     "postcss-reduce-transforms": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz",
-      "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.1.tgz",
+      "integrity": "sha512-a//FjoPeFkRuAguPscTVmRQUODP+f3ke2HqFNgGPwdYnpeC29RZdCBvGRGTsKpMURb/I3p6jdKoBQ2zI+9Q7kA==",
       "dev": true,
       "requires": {
-        "cssnano-util-get-match": "^4.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
+        "cssnano-utils": "^2.0.1",
+        "postcss-value-parser": "^4.1.0"
       }
     },
     "postcss-selector-parser": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz",
-      "integrity": "sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==",
+      "version": "6.0.6",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz",
+      "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==",
       "dev": true,
       "requires": {
         "cssesc": "^3.0.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1",
         "util-deprecate": "^1.0.2"
       }
     },
     "postcss-svgo": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz",
-      "integrity": "sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.0.2.tgz",
+      "integrity": "sha512-YzQuFLZu3U3aheizD+B1joQ94vzPfE6BNUcSYuceNxlVnKKsOtdo6hL9/zyC168Q8EwfLSgaDSalsUGa9f2C0A==",
       "dev": true,
       "requires": {
-        "is-svg": "^3.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0",
-        "svgo": "^1.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
+        "postcss-value-parser": "^4.1.0",
+        "svgo": "^2.3.0"
       }
     },
     "postcss-unique-selectors": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz",
-      "integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.0.1.tgz",
+      "integrity": "sha512-gwi1NhHV4FMmPn+qwBNuot1sG1t2OmacLQ/AX29lzyggnjd+MnVD5uqQmpXO3J17KGL2WAxQruj1qTd3H0gG/w==",
       "dev": true,
       "requires": {
-        "alphanum-sort": "^1.0.0",
-        "postcss": "^7.0.0",
+        "alphanum-sort": "^1.0.2",
+        "postcss-selector-parser": "^6.0.5",
         "uniqs": "^2.0.0"
       }
     },
@@ -49567,9 +49080,9 @@
       "dev": true
     },
     "prebuild-install": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.0.0.tgz",
-      "integrity": "sha512-h2ZJ1PXHKWZpp1caLw0oX9sagVpL2YTk+ZwInQbQ3QqNd4J03O6MpFNmMTJlkfgPENWqe5kP0WjQLqz5OjLfsw==",
+      "version": "6.1.3",
+      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.3.tgz",
+      "integrity": "sha512-iqqSR84tNYQUQHRXalSKdIaM8Ov1QxOVuBNWI7+BzZWv6Ih9k75wOnH1rGQ9WWTaaLkTpxWKIciOF0KyfM74+Q==",
       "optional": true,
       "requires": {
         "detect-libc": "^1.0.3",
@@ -49578,15 +49091,13 @@
         "minimist": "^1.2.3",
         "mkdirp-classic": "^0.5.3",
         "napi-build-utils": "^1.0.1",
-        "node-abi": "^2.7.0",
-        "noop-logger": "^0.1.1",
+        "node-abi": "^2.21.0",
         "npmlog": "^4.0.1",
         "pump": "^3.0.0",
         "rc": "^1.2.7",
         "simple-get": "^3.0.3",
         "tar-fs": "^2.0.0",
-        "tunnel-agent": "^0.6.0",
-        "which-pm-runs": "^1.0.0"
+        "tunnel-agent": "^0.6.0"
       }
     },
     "prelude-ls": {
@@ -49600,23 +49111,41 @@
       "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
       "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc="
     },
+    "pretty-bytes": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
+      "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==",
+      "dev": true
+    },
     "pretty-format": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.5.2.tgz",
-      "integrity": "sha512-VizyV669eqESlkOikKJI8Ryxl/kPpbdLwNdPs2GrbQs18MpySB5S0Yo0N7zkg2xTRiFq4CFw8ct5Vg4a0xP0og==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
+      "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.5.2",
+        "@jest/types": "^26.6.2",
         "ansi-regex": "^5.0.0",
         "ansi-styles": "^4.0.0",
-        "react-is": "^16.12.0"
+        "react-is": "^17.0.1"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-          "dev": true
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
         }
       }
     },
@@ -49652,28 +49181,19 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz",
       "integrity": "sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0=",
-      "dev": true,
       "requires": {
         "err-code": "^1.0.0",
         "retry": "^0.10.0"
-      },
-      "dependencies": {
-        "retry": {
-          "version": "0.10.1",
-          "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz",
-          "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=",
-          "dev": true
-        }
       }
     },
     "prompts": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.2.tgz",
-      "integrity": "sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.1.tgz",
+      "integrity": "sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ==",
       "dev": true,
       "requires": {
         "kleur": "^3.0.3",
-        "sisteransi": "^1.0.4"
+        "sisteransi": "^1.0.5"
       }
     },
     "promzard": {
@@ -49692,21 +49212,12 @@
         "string.prototype.codepointat": "^0.2.0"
       }
     },
-    "protoduck": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/protoduck/-/protoduck-5.0.1.tgz",
-      "integrity": "sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==",
-      "dev": true,
-      "requires": {
-        "genfun": "^5.0.0"
-      }
-    },
     "proxy-addr": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
-      "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
       "requires": {
-        "forwarded": "~0.1.2",
+        "forwarded": "0.2.0",
         "ipaddr.js": "1.9.1"
       }
     },
@@ -49726,45 +49237,6 @@
         "socks-proxy-agent": "^5.0.0"
       },
       "dependencies": {
-        "agent-base": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-          "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-          "dev": true,
-          "requires": {
-            "debug": "4"
-          }
-        },
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "http-proxy-agent": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
-          "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
-          "dev": true,
-          "requires": {
-            "@tootallnate/once": "1",
-            "agent-base": "6",
-            "debug": "4"
-          }
-        },
-        "https-proxy-agent": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-          "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
-          "dev": true,
-          "requires": {
-            "agent-base": "6",
-            "debug": "4"
-          }
-        },
         "lru-cache": {
           "version": "5.1.1",
           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
@@ -49774,23 +49246,6 @@
             "yallist": "^3.0.2"
           }
         },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "socks-proxy-agent": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz",
-          "integrity": "sha512-lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA==",
-          "dev": true,
-          "requires": {
-            "agent-base": "6",
-            "debug": "4",
-            "socks": "^2.3.3"
-          }
-        },
         "yallist": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
@@ -49831,9 +49286,9 @@
       },
       "dependencies": {
         "bn.js": {
-          "version": "4.11.9",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
           "dev": true
         }
       }
@@ -49898,16 +49353,6 @@
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
       "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
     },
-    "query-string": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
-      "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
-      "dev": true,
-      "requires": {
-        "object-assign": "^4.1.0",
-        "strict-uri-encode": "^1.0.0"
-      }
-    },
     "querystring": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
@@ -49926,6 +49371,11 @@
       "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
       "dev": true
     },
+    "queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="
+    },
     "randombytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
@@ -49969,13 +49419,51 @@
       }
     },
     "raw-loader": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-4.0.1.tgz",
-      "integrity": "sha512-baolhQBSi3iNh1cglJjA0mYzga+wePk7vdEX//1dTFd+v4TsQlQE0jitJSNF1OIP82rdYulH7otaVmdlDaJ64A==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-4.0.2.tgz",
+      "integrity": "sha512-ZnScIV3ag9A4wPX/ZayxL/jZH+euYb6FcUinPcgiQW0+UBtEv0O6Q3lGd3cqJ+GHH+rksEv3Pj99oxJ3u3VIKA==",
       "dev": true,
       "requires": {
         "loader-utils": "^2.0.0",
-        "schema-utils": "^2.6.5"
+        "schema-utils": "^3.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "3.5.2",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+          "dev": true,
+          "requires": {}
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        },
+        "schema-utils": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+          "dev": true,
+          "requires": {
+            "@types/json-schema": "^7.0.8",
+            "ajv": "^6.12.5",
+            "ajv-keywords": "^3.5.2"
+          }
+        }
       }
     },
     "rc": {
@@ -49987,12 +49475,24 @@
         "ini": "~1.3.0",
         "minimist": "^1.2.0",
         "strip-json-comments": "~2.0.1"
+      },
+      "dependencies": {
+        "ini": {
+          "version": "1.3.8",
+          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+          "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+          "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+        }
       }
     },
     "react-is": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
       "dev": true
     },
     "read": {
@@ -50027,6 +49527,13 @@
       "requires": {
         "pify": "^4.0.1",
         "with-open-file": "^0.1.6"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
+        }
       }
     },
     "read-package-json": {
@@ -50041,61 +49548,50 @@
       }
     },
     "read-package-json-fast": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz",
-      "integrity": "sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-1.2.2.tgz",
+      "integrity": "sha512-39DbPJjkltEzfXJXB6D8/Ir3GFOU2YbSKa2HaB/Y3nKrc/zY+0XrALpID6/13ezWyzqvOHrBbR4t4cjQuTdBVQ==",
       "requires": {
         "json-parse-even-better-errors": "^2.3.0",
         "npm-normalize-package-bin": "^1.0.1"
       }
     },
-    "read-package-tree": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.3.1.tgz",
-      "integrity": "sha512-mLUDsD5JVtlZxjSlPPx1RETkNjjvQYuweKwNVt1Sn8kP5Jh44pvYuUHCp6xSVDZWbNxVxG5lyZJ921aJH61sTw==",
-      "dev": true,
-      "requires": {
-        "read-package-json": "^2.0.0",
-        "readdir-scoped-modules": "^1.0.0",
-        "util-promisify": "^2.1.0"
-      }
-    },
     "read-pkg": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
-      "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+      "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
       "dev": true,
       "requires": {
-        "load-json-file": "^2.0.0",
+        "load-json-file": "^4.0.0",
         "normalize-package-data": "^2.3.2",
-        "path-type": "^2.0.0"
+        "path-type": "^3.0.0"
       },
       "dependencies": {
         "path-type": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
-          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
           "dev": true,
           "requires": {
-            "pify": "^2.0.0"
+            "pify": "^3.0.0"
           }
         },
         "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
           "dev": true
         }
       }
     },
     "read-pkg-up": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-      "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
+      "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
       "dev": true,
       "requires": {
         "find-up": "^2.0.0",
-        "read-pkg": "^2.0.0"
+        "read-pkg": "^3.0.0"
       }
     },
     "readable-stream": {
@@ -50112,22 +49608,10 @@
         "util-deprecate": "~1.0.1"
       }
     },
-    "readdir-scoped-modules": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz",
-      "integrity": "sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==",
-      "dev": true,
-      "requires": {
-        "debuglog": "^1.0.1",
-        "dezalgo": "^1.0.0",
-        "graceful-fs": "^4.1.2",
-        "once": "^1.3.0"
-      }
-    },
     "readdirp": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
-      "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
       "dev": true,
       "requires": {
         "picomatch": "^2.2.1"
@@ -50149,9 +49633,9 @@
       "dev": true
     },
     "regenerate": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.1.tgz",
-      "integrity": "sha512-j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A==",
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
+      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
       "dev": true
     },
     "regenerate-unicode-properties": {
@@ -50164,9 +49648,9 @@
       }
     },
     "regenerator-runtime": {
-      "version": "0.13.5",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz",
-      "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==",
+      "version": "0.13.7",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
+      "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==",
       "dev": true
     },
     "regenerator-transform": {
@@ -50186,49 +49670,40 @@
       "requires": {
         "extend-shallow": "^3.0.2",
         "safe-regex": "^1.1.0"
-      }
-    },
-    "regex-parser": {
-      "version": "2.2.10",
-      "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.10.tgz",
-      "integrity": "sha512-8t6074A68gHfU8Neftl0Le6KTDwfGAj7IyjPIMSfikI2wJUTHDMaIq42bUsfVnj8mhx0R+45rdUXHGpN164avA==",
-      "dev": true
-    },
-    "regexp.prototype.flags": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz",
-      "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
       },
       "dependencies": {
-        "es-abstract": {
-          "version": "1.17.7",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
-          "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
           "dev": true,
           "requires": {
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.1",
-            "is-callable": "^1.2.2",
-            "is-regex": "^1.1.1",
-            "object-inspect": "^1.8.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.1",
-            "string.prototype.trimend": "^1.0.1",
-            "string.prototype.trimstart": "^1.0.1"
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
           }
         }
       }
     },
+    "regex-parser": {
+      "version": "2.2.11",
+      "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.11.tgz",
+      "integrity": "sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==",
+      "dev": true
+    },
+    "regexp.prototype.flags": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz",
+      "integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      }
+    },
     "regexpp": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",
-      "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
       "dev": true
     },
     "regexpu-core": {
@@ -50274,9 +49749,9 @@
       "dev": true
     },
     "regjsparser": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz",
-      "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==",
+      "version": "0.6.9",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.9.tgz",
+      "integrity": "sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==",
       "dev": true,
       "requires": {
         "jsesc": "~0.5.0"
@@ -50324,9 +49799,9 @@
       "dev": true
     },
     "repeat-element": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
-      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
+      "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
       "dev": true
     },
     "repeat-string": {
@@ -50392,38 +49867,11 @@
             "psl": "^1.1.28",
             "punycode": "^2.1.1"
           }
-        }
-      }
-    },
-    "request-promise-core": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz",
-      "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.19"
-      }
-    },
-    "request-promise-native": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz",
-      "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==",
-      "dev": true,
-      "requires": {
-        "request-promise-core": "1.1.4",
-        "stealthy-require": "^1.1.1",
-        "tough-cookie": "^2.3.3"
-      },
-      "dependencies": {
-        "tough-cookie": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-          "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-          "dev": true,
-          "requires": {
-            "psl": "^1.1.28",
-            "punycode": "^2.1.1"
-          }
+        },
+        "uuid": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
         }
       }
     },
@@ -50440,9 +49888,9 @@
       "dev": true
     },
     "require-main-filename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
       "dev": true
     },
     "requires-port": {
@@ -50452,26 +49900,27 @@
       "dev": true
     },
     "resolve": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
+      "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
       "requires": {
+        "is-core-module": "^2.1.0",
         "path-parse": "^1.0.6"
       }
     },
     "resolve-cwd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
-      "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
       "dev": true,
       "requires": {
-        "resolve-from": "^3.0.0"
+        "resolve-from": "^5.0.0"
       },
       "dependencies": {
         "resolve-from": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-          "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+          "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
           "dev": true
         }
       }
@@ -50507,105 +49956,22 @@
       "dev": true
     },
     "resolve-url-loader": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-3.1.1.tgz",
-      "integrity": "sha512-K1N5xUjj7v0l2j/3Sgs5b8CjrrgtC70SmdCuZiJ8tSyb5J+uk3FoeZ4b7yTnH6j7ngI+Bc5bldHJIa8hYdu2gQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-4.0.0.tgz",
+      "integrity": "sha512-05VEMczVREcbtT7Bz+C+96eUO5HDNvdthIiMB34t7FcF8ehcu4wC0sSgPUubs3XW2Q3CNLJk/BJrCU9wVRymiA==",
       "dev": true,
       "requires": {
-        "adjust-sourcemap-loader": "2.0.0",
-        "camelcase": "5.3.1",
-        "compose-function": "3.0.3",
-        "convert-source-map": "1.7.0",
-        "es6-iterator": "2.0.3",
-        "loader-utils": "1.2.3",
-        "postcss": "7.0.21",
-        "rework": "1.0.1",
-        "rework-visit": "1.0.0",
+        "adjust-sourcemap-loader": "^4.0.0",
+        "convert-source-map": "^1.7.0",
+        "loader-utils": "^2.0.0",
+        "postcss": "^7.0.35",
         "source-map": "0.6.1"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "dev": true,
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-          "dev": true
-        },
-        "emojis-list": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-          "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        },
-        "loader-utils": {
-          "version": "1.2.3",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
-          "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
-          "dev": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^2.0.0",
-            "json5": "^1.0.1"
-          }
-        },
         "postcss": {
-          "version": "7.0.21",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.21.tgz",
-          "integrity": "sha512-uIFtJElxJo29QC753JzhidoAhvp/e/Exezkdhfmt8AymWT6/5B7W1WmponYWkHk2eg6sONyTch0A3nkMPun3SQ==",
+          "version": "7.0.36",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz",
+          "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==",
           "dev": true,
           "requires": {
             "chalk": "^2.4.2",
@@ -50639,27 +50005,13 @@
       }
     },
     "restore-cursor": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
-      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "dev": true,
       "requires": {
-        "onetime": "^2.0.0",
+        "onetime": "^5.1.0",
         "signal-exit": "^3.0.2"
-      },
-      "dependencies": {
-        "mimic-fn": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-          "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
-        },
-        "onetime": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-          "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
-          "requires": {
-            "mimic-fn": "^1.0.0"
-          }
-        }
       }
     },
     "ret": {
@@ -50669,39 +50021,15 @@
       "dev": true
     },
     "retry": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
-      "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs="
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz",
+      "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q="
     },
     "reusify": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
       "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="
     },
-    "rework": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/rework/-/rework-1.0.1.tgz",
-      "integrity": "sha1-MIBqhBNCtUUQqkEQhQzUhTQUSqc=",
-      "dev": true,
-      "requires": {
-        "convert-source-map": "^0.3.3",
-        "css": "^2.0.0"
-      },
-      "dependencies": {
-        "convert-source-map": {
-          "version": "0.3.5",
-          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz",
-          "integrity": "sha1-8dgClQr33SYxof6+BZZVDIarMZA=",
-          "dev": true
-        }
-      }
-    },
-    "rework-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/rework-visit/-/rework-visit-1.0.0.tgz",
-      "integrity": "sha1-mUWygD8hni96ygCtuLyfZA+ELJo=",
-      "dev": true
-    },
     "rgb-regex": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz",
@@ -50733,18 +50061,18 @@
       }
     },
     "rollup": {
-      "version": "2.10.9",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.10.9.tgz",
-      "integrity": "sha512-dY/EbjiWC17ZCUSyk14hkxATAMAShkMsD43XmZGWjLrgFj15M3Dw2kEkA9ns64BiLFm9PKN6vTQw8neHwK74eg==",
+      "version": "2.38.4",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.38.4.tgz",
+      "integrity": "sha512-B0LcJhjiwKkTl79aGVF/u5KdzsH8IylVfV56Ut6c9ouWLJcUK17T83aZBetNYSnZtXf2OHD4+2PbmRW+Fp5ulg==",
       "dev": true,
       "requires": {
-        "fsevents": "~2.1.2"
+        "fsevents": "~2.3.1"
       }
     },
     "rsvp": {
-      "version": "4.8.5",
-      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
-      "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz",
+      "integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==",
       "dev": true
     },
     "run-async": {
@@ -50753,9 +50081,12 @@
       "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="
     },
     "run-parallel": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
-      "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q=="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "requires": {
+        "queue-microtask": "^1.2.2"
+      }
     },
     "run-queue": {
       "version": "1.0.3",
@@ -50775,9 +50106,9 @@
       },
       "dependencies": {
         "tslib": {
-          "version": "1.13.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
-          "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
         }
       }
     },
@@ -50827,6 +50158,12 @@
             "normalize-path": "^2.1.1"
           }
         },
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true
+        },
         "braces": {
           "version": "2.3.2",
           "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
@@ -50853,6 +50190,12 @@
               "requires": {
                 "is-extendable": "^0.1.0"
               }
+            },
+            "is-extendable": {
+              "version": "0.1.1",
+              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+              "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+              "dev": true
             }
           }
         },
@@ -50884,6 +50227,16 @@
             "strip-eof": "^1.0.0"
           }
         },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        },
         "fill-range": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -50904,6 +50257,12 @@
               "requires": {
                 "is-extendable": "^0.1.0"
               }
+            },
+            "is-extendable": {
+              "version": "0.1.1",
+              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+              "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+              "dev": true
             }
           }
         },
@@ -50948,6 +50307,12 @@
           "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
           "dev": true
         },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        },
         "micromatch": {
           "version": "3.1.10",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -51036,52 +50401,62 @@
       }
     },
     "sass": {
-      "version": "1.26.5",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.26.5.tgz",
-      "integrity": "sha512-FG2swzaZUiX53YzZSjSakzvGtlds0lcbF+URuU9mxOv7WBh7NhXEVDa4kPKN4hN6fC2TkOTOKqiqp6d53N9X5Q==",
+      "version": "1.32.6",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.6.tgz",
+      "integrity": "sha512-1bcDHDcSqeFtMr0JXI3xc/CXX6c4p0wHHivJdru8W7waM7a1WjKMm4m/Z5sY7CbVw4Whi2Chpcw6DFfSWwGLzQ==",
       "dev": true,
       "requires": {
         "chokidar": ">=2.0.0 <4.0.0"
       }
     },
     "sass-loader": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.2.tgz",
-      "integrity": "sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==",
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-10.1.1.tgz",
+      "integrity": "sha512-W6gVDXAd5hR/WHsPicvZdjAWHBcEJ44UahgxcIE196fW2ong0ZHMPO1kZuI5q0VlvMQZh32gpv69PLWQm70qrw==",
       "dev": true,
       "requires": {
-        "clone-deep": "^4.0.1",
-        "loader-utils": "^1.2.3",
-        "neo-async": "^2.6.1",
-        "schema-utils": "^2.6.1",
-        "semver": "^6.3.0"
+        "klona": "^2.0.4",
+        "loader-utils": "^2.0.0",
+        "neo-async": "^2.6.2",
+        "schema-utils": "^3.0.0",
+        "semver": "^7.3.2"
       },
       "dependencies": {
-        "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
           "dev": true,
           "requires": {
-            "minimist": "^1.2.0"
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
           }
         },
-        "loader-utils": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+        "ajv-keywords": {
+          "version": "3.5.2",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
           "dev": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^1.0.1"
-          }
+          "requires": {}
         },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
           "dev": true
+        },
+        "schema-utils": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+          "dev": true,
+          "requires": {
+            "@types/json-schema": "^7.0.8",
+            "ajv": "^6.12.5",
+            "ajv-keywords": "^3.5.2"
+          }
         }
       }
     },
@@ -51108,6 +50483,33 @@
         "@types/json-schema": "^7.0.5",
         "ajv": "^6.12.4",
         "ajv-keywords": "^3.5.2"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "3.5.2",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+          "dev": true,
+          "requires": {}
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        }
       }
     },
     "sdp": {
@@ -51122,18 +50524,21 @@
       "dev": true
     },
     "selfsigned": {
-      "version": "1.10.8",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.8.tgz",
-      "integrity": "sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w==",
+      "version": "1.10.11",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.11.tgz",
+      "integrity": "sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA==",
       "dev": true,
       "requires": {
         "node-forge": "^0.10.0"
       }
     },
     "semver": {
-      "version": "7.3.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-      "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ=="
+      "version": "7.3.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
+      "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+      "requires": {
+        "lru-cache": "^6.0.0"
+      }
     },
     "semver-diff": {
       "version": "3.1.1",
@@ -51196,6 +50601,21 @@
         "statuses": "~1.5.0"
       },
       "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          },
+          "dependencies": {
+            "ms": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+            }
+          }
+        },
         "ms": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
@@ -51204,9 +50624,9 @@
       }
     },
     "serialize-javascript": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
-      "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
+      "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
       "dev": true,
       "requires": {
         "randombytes": "^2.1.0"
@@ -51227,6 +50647,15 @@
         "parseurl": "~1.3.2"
       },
       "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
         "http-errors": {
           "version": "1.6.3",
           "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
@@ -51245,6 +50674,12 @@
           "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
           "dev": true
         },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
         "setprototypeof": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
@@ -51294,6 +50729,27 @@
           "requires": {
             "is-extendable": "^0.1.0"
           }
+        },
+        "is-extendable": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+          "dev": true
+        },
+        "is-plain-object": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+          "dev": true,
+          "requires": {
+            "isobject": "^3.0.1"
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
         }
       }
     },
@@ -51325,6 +50781,14 @@
       "dev": true,
       "requires": {
         "kind-of": "^6.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        }
       }
     },
     "shebang-command": {
@@ -51340,6 +50804,11 @@
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
     },
+    "shelljs": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz",
+      "integrity": "sha1-kEktcv/MgVmXa6umL7D2iE8MM3g="
+    },
     "shellwords": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
@@ -51356,14 +50825,6 @@
         "call-bind": "^1.0.0",
         "get-intrinsic": "^1.0.2",
         "object-inspect": "^1.9.0"
-      },
-      "dependencies": {
-        "object-inspect": {
-          "version": "1.10.3",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz",
-          "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==",
-          "dev": true
-        }
       }
     },
     "signal-exit": {
@@ -51378,13 +50839,6 @@
       "requires": {
         "shelljs": "^0.2.6",
         "tail": "^0.4.0"
-      },
-      "dependencies": {
-        "shelljs": {
-          "version": "0.2.6",
-          "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz",
-          "integrity": "sha1-kEktcv/MgVmXa6umL7D2iE8MM3g="
-        }
       }
     },
     "simple-concat": {
@@ -51402,23 +50856,6 @@
         "decompress-response": "^4.2.0",
         "once": "^1.3.1",
         "simple-concat": "^1.0.0"
-      },
-      "dependencies": {
-        "decompress-response": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
-          "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
-          "optional": true,
-          "requires": {
-            "mimic-response": "^2.0.0"
-          }
-        },
-        "mimic-response": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
-          "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
-          "optional": true
-        }
       }
     },
     "simple-plist": {
@@ -51431,23 +50868,6 @@
         "plist": "^3.0.1"
       }
     },
-    "simple-swizzle": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
-      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
-      "dev": true,
-      "requires": {
-        "is-arrayish": "^0.3.1"
-      },
-      "dependencies": {
-        "is-arrayish": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
-          "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
-          "dev": true
-        }
-      }
-    },
     "sisteransi": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
@@ -51470,11 +50890,23 @@
         "is-fullwidth-code-point": "^3.0.0"
       },
       "dependencies": {
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
         }
       }
     },
@@ -51499,6 +50931,15 @@
         "use": "^3.1.0"
       },
       "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
         "define-property": {
           "version": "0.2.5",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
@@ -51517,11 +50958,87 @@
             "is-extendable": "^0.1.0"
           }
         },
+        "is-accessor-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "is-data-descriptor": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "is-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^0.1.6",
+            "is-data-descriptor": "^0.1.4",
+            "kind-of": "^5.0.0"
+          }
+        },
+        "is-extendable": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+          "dev": true
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
         "source-map": {
           "version": "0.5.7",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
           "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
           "dev": true
+        },
+        "source-map-resolve": {
+          "version": "0.5.3",
+          "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+          "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+          "dev": true,
+          "requires": {
+            "atob": "^2.1.2",
+            "decode-uri-component": "^0.2.0",
+            "resolve-url": "^0.2.1",
+            "source-map-url": "^0.4.0",
+            "urix": "^0.1.0"
+          }
         }
       }
     },
@@ -51545,35 +51062,6 @@
             "is-descriptor": "^1.0.0"
           }
         },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        },
         "isobject": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
@@ -51603,93 +51091,66 @@
       }
     },
     "sockjs": {
-      "version": "0.3.20",
-      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.20.tgz",
-      "integrity": "sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA==",
+      "version": "0.3.21",
+      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.21.tgz",
+      "integrity": "sha512-DhbPFGpxjc6Z3I+uX07Id5ZO2XwYsWOrYjaSeieES78cq+JaJvVe5q/m1uvjIQhXinhIeCFRH6JgXe+mvVMyXw==",
       "dev": true,
       "requires": {
-        "faye-websocket": "^0.10.0",
+        "faye-websocket": "^0.11.3",
         "uuid": "^3.4.0",
-        "websocket-driver": "0.6.5"
-      }
-    },
-    "sockjs-client": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz",
-      "integrity": "sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==",
-      "dev": true,
-      "requires": {
-        "debug": "^3.2.5",
-        "eventsource": "^1.0.7",
-        "faye-websocket": "~0.11.1",
-        "inherits": "^2.0.3",
-        "json3": "^3.3.2",
-        "url-parse": "^1.4.3"
+        "websocket-driver": "^0.7.4"
       },
       "dependencies": {
-        "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "faye-websocket": {
-          "version": "0.11.3",
-          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz",
-          "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==",
-          "dev": true,
-          "requires": {
-            "websocket-driver": ">=0.5.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+        "uuid": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
           "dev": true
         }
       }
     },
-    "socks": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.3.3.tgz",
-      "integrity": "sha512-o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA==",
-      "requires": {
-        "ip": "1.1.5",
-        "smart-buffer": "^4.1.0"
-      }
-    },
-    "socks-proxy-agent": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz",
-      "integrity": "sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==",
+    "sockjs-client": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.5.1.tgz",
+      "integrity": "sha512-VnVAb663fosipI/m6pqRXakEOw7nvd7TUgdr3PlR/8V2I95QIdwT8L4nMxhyU8SmDBHYXU1TOElaKOmKLfYzeQ==",
       "dev": true,
       "requires": {
-        "agent-base": "~4.2.1",
-        "socks": "~2.3.2"
+        "debug": "^3.2.6",
+        "eventsource": "^1.0.7",
+        "faye-websocket": "^0.11.3",
+        "inherits": "^2.0.4",
+        "json3": "^3.3.3",
+        "url-parse": "^1.5.1"
       },
       "dependencies": {
-        "agent-base": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz",
-          "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==",
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "dev": true,
           "requires": {
-            "es6-promisify": "^5.0.0"
+            "ms": "^2.1.1"
           }
         }
       }
     },
-    "sort-keys": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
-      "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
-      "dev": true,
+    "socks": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.6.1.tgz",
+      "integrity": "sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA==",
       "requires": {
-        "is-plain-obj": "^1.0.0"
+        "ip": "^1.1.5",
+        "smart-buffer": "^4.1.0"
+      }
+    },
+    "socks-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ==",
+      "requires": {
+        "agent-base": "^6.0.2",
+        "debug": "4",
+        "socks": "^2.3.3"
       }
     },
     "source-list-map": {
@@ -51705,25 +51166,62 @@
       "dev": true
     },
     "source-map-loader": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-1.0.0.tgz",
-      "integrity": "sha512-ZayyQCSCrQazN50aCvuS84lJT4xc1ZAcykH5blHaBdVveSwjiFK8UGMPvao0ho54DTb0Jf7m57uRRG/YYUZ2Fg==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-1.1.3.tgz",
+      "integrity": "sha512-6YHeF+XzDOrT/ycFJNI53cgEsp/tHTMl37hi7uVyqFAlTXW109JazaQCkbc+jjoL2637qkH1amLi+JzrIpt5lA==",
       "dev": true,
       "requires": {
-        "data-urls": "^2.0.0",
-        "iconv-lite": "^0.5.1",
+        "abab": "^2.0.5",
+        "iconv-lite": "^0.6.2",
         "loader-utils": "^2.0.0",
-        "schema-utils": "^2.6.6",
-        "source-map": "^0.6.0"
+        "schema-utils": "^3.0.0",
+        "source-map": "^0.6.1",
+        "whatwg-mimetype": "^2.3.0"
       },
       "dependencies": {
-        "iconv-lite": {
-          "version": "0.5.2",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.2.tgz",
-          "integrity": "sha512-kERHXvpSaB4aU3eANwidg79K8FlrN77m8G9V+0vOR3HYaRifrlwMEpT7ZBJqLSEIHnEgJTHcWK82wwLwwKwtag==",
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
           "dev": true,
           "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "3.5.2",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+          "dev": true,
+          "requires": {}
+        },
+        "iconv-lite": {
+          "version": "0.6.3",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+          "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+          "dev": true,
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3.0.0"
+          }
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        },
+        "schema-utils": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+          "dev": true,
+          "requires": {
+            "@types/json-schema": "^7.0.8",
+            "ajv": "^6.12.5",
+            "ajv-keywords": "^3.5.2"
           }
         },
         "source-map": {
@@ -51735,16 +51233,13 @@
       }
     },
     "source-map-resolve": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
-      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz",
+      "integrity": "sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==",
       "dev": true,
       "requires": {
         "atob": "^2.1.2",
-        "decode-uri-component": "^0.2.0",
-        "resolve-url": "^0.2.1",
-        "source-map-url": "^0.4.0",
-        "urix": "^0.1.0"
+        "decode-uri-component": "^0.2.0"
       }
     },
     "source-map-support": {
@@ -51766,9 +51261,9 @@
       }
     },
     "source-map-url": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
-      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
+      "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
       "dev": true
     },
     "sourcemap-codec": {
@@ -51807,9 +51302,9 @@
       }
     },
     "spdx-license-ids": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz",
-      "integrity": "sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw=="
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz",
+      "integrity": "sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ=="
     },
     "spdy": {
       "version": "4.0.2",
@@ -51822,23 +51317,6 @@
         "http-deceiver": "^1.2.7",
         "select-hose": "^2.0.0",
         "spdy-transport": "^3.0.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
-          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
       }
     },
     "spdy-transport": {
@@ -51855,21 +51333,6 @@
         "wbuf": "^1.7.3"
       },
       "dependencies": {
-        "debug": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
-          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
         "readable-stream": {
           "version": "3.6.0",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
@@ -51884,62 +51347,55 @@
       }
     },
     "speed-measure-webpack-plugin": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.3.tgz",
-      "integrity": "sha512-2ljD4Ch/rz2zG3HsLsnPfp23osuPBS0qPuz9sGpkNXTN1Ic4M+W9xB8l8rS8ob2cO4b1L+WTJw/0AJwWYVgcxQ==",
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.4.2.tgz",
+      "integrity": "sha512-AtVzD0bnIy2/B0fWqJpJgmhcrfWFhBlduzSo0uwplr/QvB33ZNZj2NEth3NONgdnZJqicK0W0mSxnLSbsVCDbw==",
       "dev": true,
       "requires": {
-        "chalk": "^2.0.1"
+        "chalk": "^4.1.0"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "color-convert": "^1.9.0"
+            "color-convert": "^2.0.1"
           }
         },
         "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
           }
         },
         "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
-            "color-name": "1.1.3"
+            "color-name": "~1.1.4"
           }
         },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-          "dev": true
-        },
         "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "has-flag": "^4.0.0"
           }
         }
       }
@@ -51951,6 +51407,18 @@
       "dev": true,
       "requires": {
         "extend-shallow": "^3.0.0"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        }
       }
     },
     "split2": {
@@ -52024,9 +51492,9 @@
       "dev": true
     },
     "stack-utils": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.2.tgz",
-      "integrity": "sha512-0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.3.tgz",
+      "integrity": "sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==",
       "dev": true,
       "requires": {
         "escape-string-regexp": "^2.0.0"
@@ -52058,6 +51526,57 @@
           "requires": {
             "is-descriptor": "^0.1.0"
           }
+        },
+        "is-accessor-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "is-data-descriptor": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "is-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^0.1.6",
+            "is-data-descriptor": "^0.1.4",
+            "kind-of": "^5.0.0"
+          }
         }
       }
     },
@@ -52066,12 +51585,6 @@
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
       "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
     },
-    "stealthy-require": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
-      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=",
-      "dev": true
-    },
     "stream-browserify": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
@@ -52132,12 +51645,6 @@
       "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
       "dev": true
     },
-    "strict-uri-encode": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
-      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
-      "dev": true
-    },
     "string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -52147,49 +51654,23 @@
       }
     },
     "string-length": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.1.tgz",
-      "integrity": "sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
+      "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
       "dev": true,
       "requires": {
         "char-regex": "^1.0.2",
         "strip-ansi": "^6.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        }
       }
     },
     "string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
       "requires": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
-      },
-      "dependencies": {
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "requires": {
-            "ansi-regex": "^3.0.0"
-          }
-        }
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
       }
     },
     "string.prototype.codepointat": {
@@ -52198,65 +51679,23 @@
       "integrity": "sha512-2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg=="
     },
     "string.prototype.trimend": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
-      "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
+      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.17.7",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
-          "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
-          "dev": true,
-          "requires": {
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.1",
-            "is-callable": "^1.2.2",
-            "is-regex": "^1.1.1",
-            "object-inspect": "^1.8.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.1",
-            "string.prototype.trimend": "^1.0.1",
-            "string.prototype.trimstart": "^1.0.1"
-          }
-        }
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
       }
     },
     "string.prototype.trimstart": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
-      "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
+      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.17.7",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
-          "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
-          "dev": true,
-          "requires": {
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.1",
-            "is-callable": "^1.2.2",
-            "is-regex": "^1.1.1",
-            "object-inspect": "^1.8.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.1",
-            "string.prototype.trimend": "^1.0.1",
-            "string.prototype.trimstart": "^1.0.1"
-          }
-        }
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
       }
     },
     "stringify-package": {
@@ -52265,18 +51704,11 @@
       "integrity": "sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg=="
     },
     "strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
       "requires": {
-        "ansi-regex": "^4.1.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
-        }
+        "ansi-regex": "^5.0.0"
       }
     },
     "strip-bom": {
@@ -52295,57 +51727,82 @@
       "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="
     },
     "strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true
     },
     "style-loader": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.2.1.tgz",
-      "integrity": "sha512-ByHSTQvHLkWE9Ir5+lGbVOXhxX10fbprhLvdg96wedFZb4NDekDPxVKv5Fwmio+QcMlkkNfuK+5W1peQ5CUhZg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-2.0.0.tgz",
+      "integrity": "sha512-Z0gYUJmzZ6ZdRUqpg1r8GsaFKypE+3xAzuFeMuoHgjc9KZv3wMyCRjQIWEbhoFSq7+7yoHXySDJyyWQaPajeiQ==",
       "dev": true,
       "requires": {
         "loader-utils": "^2.0.0",
-        "schema-utils": "^2.6.6"
-      }
-    },
-    "stylehacks": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz",
-      "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-selector-parser": "^3.0.0"
+        "schema-utils": "^3.0.0"
       },
       "dependencies": {
-        "postcss-selector-parser": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-          "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
           "dev": true,
           "requires": {
-            "dot-prop": "^5.2.0",
-            "indexes-of": "^1.0.1",
-            "uniq": "^1.0.1"
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "3.5.2",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+          "dev": true,
+          "requires": {}
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        },
+        "schema-utils": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+          "dev": true,
+          "requires": {
+            "@types/json-schema": "^7.0.8",
+            "ajv": "^6.12.5",
+            "ajv-keywords": "^3.5.2"
           }
         }
       }
     },
+    "stylehacks": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.0.1.tgz",
+      "integrity": "sha512-Es0rVnHIqbWzveU1b24kbw92HsebBepxfcqe5iix7t9j0PQqhs0IxXVXv0pY2Bxa08CgMkzD6OWql7kbGOuEdA==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.16.0",
+        "postcss-selector-parser": "^6.0.4"
+      }
+    },
     "stylus": {
-      "version": "0.54.7",
-      "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.7.tgz",
-      "integrity": "sha512-Yw3WMTzVwevT6ZTrLCYNHAFmanMxdylelL3hkWNgPMeTCpMwpV3nXjpOHuBXtFv7aiO2xRuQS6OoAdgkNcSNug==",
+      "version": "0.54.8",
+      "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.8.tgz",
+      "integrity": "sha512-vr54Or4BZ7pJafo2mpf0ZcwA74rpuYCZbxrHBsH8kbcXOwSfvBFwsRfpGO5OD5fhG5HDCFW737PKaawI7OqEAg==",
       "dev": true,
       "requires": {
         "css-parse": "~2.0.0",
         "debug": "~3.1.0",
-        "glob": "^7.1.3",
-        "mkdirp": "~0.5.x",
+        "glob": "^7.1.6",
+        "mkdirp": "~1.0.4",
         "safer-buffer": "^2.1.2",
         "sax": "~1.2.4",
-        "semver": "^6.0.0",
+        "semver": "^6.3.0",
         "source-map": "^0.7.3"
       },
       "dependencies": {
@@ -52358,6 +51815,12 @@
             "ms": "2.0.0"
           }
         },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
         "sax": {
           "version": "1.2.4",
           "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
@@ -52373,34 +51836,52 @@
       }
     },
     "stylus-loader": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz",
-      "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-4.3.3.tgz",
+      "integrity": "sha512-PpWB5PnCXUzW4WMYhCvNzAHJBjIBPMXwsdfkkKuA9W7k8OQFMl/19/AQvaWsxz2IptxUlCseyJ6TY/eEKJ4+UQ==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.0.2",
-        "lodash.clonedeep": "^4.5.0",
-        "when": "~3.6.x"
+        "fast-glob": "^3.2.4",
+        "klona": "^2.0.4",
+        "loader-utils": "^2.0.0",
+        "normalize-path": "^3.0.0",
+        "schema-utils": "^3.0.0"
       },
       "dependencies": {
-        "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
           "dev": true,
           "requires": {
-            "minimist": "^1.2.0"
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
           }
         },
-        "loader-utils": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+        "ajv-keywords": {
+          "version": "3.5.2",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+          "dev": true,
+          "requires": {}
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        },
+        "schema-utils": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
           "dev": true,
           "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^1.0.1"
+            "@types/json-schema": "^7.0.8",
+            "ajv": "^6.12.5",
+            "ajv-keywords": "^3.5.2"
           }
         }
       }
@@ -52424,15 +51905,6 @@
         "semver": "^7.3.2"
       },
       "dependencies": {
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
         "form-data": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
@@ -52450,12 +51922,6 @@
           "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
           "dev": true
         },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
         "qs": {
           "version": "6.10.1",
           "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz",
@@ -52496,31 +51962,42 @@
           "requires": {
             "ms": "^2.1.1"
           }
-        },
-        "ms": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-          "dev": true
         }
       }
     },
     "supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "requires": {
-        "has-flag": "^4.0.0"
+        "has-flag": "^3.0.0"
       }
     },
     "supports-hyperlinks": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz",
-      "integrity": "sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
+      "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
       "dev": true,
       "requires": {
         "has-flag": "^4.0.0",
         "supports-color": "^7.0.0"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
     "sver-compat": {
@@ -52534,88 +52011,146 @@
       }
     },
     "svgo": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
-      "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.3.1.tgz",
+      "integrity": "sha512-riDDIQgXpEnn0BEl9Gvhh1LNLIyiusSpt64IR8upJu7MwxnzetmF/Y57pXQD2NMX2lVyMRzXt5f2M5rO4wG7Dw==",
       "dev": true,
       "requires": {
-        "chalk": "^2.4.1",
-        "coa": "^2.0.2",
-        "css-select": "^2.0.0",
-        "css-select-base-adapter": "^0.1.1",
-        "css-tree": "1.0.0-alpha.37",
-        "csso": "^4.0.2",
-        "js-yaml": "^3.13.1",
-        "mkdirp": "~0.5.1",
-        "object.values": "^1.1.0",
-        "sax": "~1.2.4",
-        "stable": "^0.1.8",
-        "unquote": "~1.1.1",
-        "util.promisify": "~1.0.0"
+        "@trysound/sax": "0.1.1",
+        "chalk": "^4.1.0",
+        "commander": "^7.1.0",
+        "css-select": "^4.1.3",
+        "css-tree": "^1.1.2",
+        "csso": "^4.2.0",
+        "stable": "^0.1.8"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "color-convert": "^1.9.0"
+            "color-convert": "^2.0.1"
           }
         },
         "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
           }
         },
         "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
-            "color-name": "1.1.3"
+            "color-name": "~1.1.4"
           }
         },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+        "commander": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+          "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+          "dev": true
+        },
+        "css-select": {
+          "version": "4.1.3",
+          "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz",
+          "integrity": "sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==",
+          "dev": true,
+          "requires": {
+            "boolbase": "^1.0.0",
+            "css-what": "^5.0.0",
+            "domhandler": "^4.2.0",
+            "domutils": "^2.6.0",
+            "nth-check": "^2.0.0"
+          }
+        },
+        "css-what": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.0.1.tgz",
+          "integrity": "sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg==",
+          "dev": true
+        },
+        "dom-serializer": {
+          "version": "1.3.2",
+          "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz",
+          "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==",
+          "dev": true,
+          "requires": {
+            "domelementtype": "^2.0.1",
+            "domhandler": "^4.2.0",
+            "entities": "^2.0.0"
+          }
+        },
+        "domelementtype": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
+          "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
+          "dev": true
+        },
+        "domhandler": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.2.0.tgz",
+          "integrity": "sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA==",
+          "dev": true,
+          "requires": {
+            "domelementtype": "^2.2.0"
+          }
+        },
+        "domutils": {
+          "version": "2.7.0",
+          "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.7.0.tgz",
+          "integrity": "sha512-8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg==",
+          "dev": true,
+          "requires": {
+            "dom-serializer": "^1.0.1",
+            "domelementtype": "^2.2.0",
+            "domhandler": "^4.2.0"
+          }
+        },
+        "entities": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+          "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
           "dev": true
         },
         "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "sax": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-          "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+        "nth-check": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.0.tgz",
+          "integrity": "sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q==",
           "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "boolbase": "^1.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
           }
         }
       }
     },
     "symbol-observable": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
-      "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-3.0.0.tgz",
+      "integrity": "sha512-6tDOXSHiVjuCaasQSWTmHUWn4PuG7qa3+1WT031yTc/swT7+rLiw3GOrFxaH1E3lLP09dH3bVuVDf2gK5rxG3Q==",
       "dev": true
     },
     "symbol-tree": {
@@ -52630,76 +52165,17 @@
       "integrity": "sha512-33+lQwlLxXoxy0o9WLOgw8OjbXeS3Jv+pSl+nxKc2AOClBI28HsdRPpH0u9Xa9OVjHLT9vonnOMw1ug7YXI0dA=="
     },
     "table": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.6.0.tgz",
-      "integrity": "sha512-iZMtp5tUvcnAdtHpZTWLPF0M7AgiQsURR2DwmxnJwSy8I3+cY+ozzVvYha3BOLG2TB+L0CqjIz+91htuj6yCXg==",
+      "version": "6.7.1",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz",
+      "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==",
       "dev": true,
       "requires": {
         "ajv": "^8.0.1",
         "lodash.clonedeep": "^4.5.0",
-        "lodash.flatten": "^4.4.0",
         "lodash.truncate": "^4.4.2",
         "slice-ansi": "^4.0.0",
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "8.2.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.2.0.tgz",
-          "integrity": "sha512-WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "json-schema-traverse": "^1.0.0",
-            "require-from-string": "^2.0.2",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-          "dev": true
-        },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
-        "json-schema-traverse": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        }
       }
     },
     "tail": {
@@ -52708,15 +52184,15 @@
       "integrity": "sha1-0p3nJ1DMmdseBTr/E8NZ7PtxMAI="
     },
     "tapable": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
-      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz",
+      "integrity": "sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw==",
       "dev": true
     },
     "tar": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.1.tgz",
-      "integrity": "sha512-GG0R7yt/CQkvG4fueXDi52Zskqxe2AyRJ+Wm54yqarnBgcX3qRIWh10qLVAAN+mlPFGTfP5UxvD3Fbi11UOTUQ==",
+      "version": "6.1.3",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.3.tgz",
+      "integrity": "sha512-3rUqwucgVZXTeyJyL2jqtUau8/8r54SioM1xj3AmTX3HnWQdj2AydfJ2qYYayPyIIznSplcvU9mhBb7dR2XF3w==",
       "requires": {
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
@@ -52724,13 +52200,6 @@
         "minizlib": "^2.1.1",
         "mkdirp": "^1.0.3",
         "yallist": "^4.0.0"
-      },
-      "dependencies": {
-        "mkdirp": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
-        }
       }
     },
     "tar-fs": {
@@ -52754,9 +52223,9 @@
       }
     },
     "tar-stream": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.4.tgz",
-      "integrity": "sha512-o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
       "optional": true,
       "requires": {
         "bl": "^4.0.3",
@@ -52792,77 +52261,78 @@
       "requires": {
         "ansi-escapes": "^4.2.1",
         "supports-hyperlinks": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-escapes": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-          "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
-          "dev": true,
-          "requires": {
-            "type-fest": "^0.11.0"
-          }
-        },
-        "type-fest": {
-          "version": "0.11.0",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-          "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
-          "dev": true
-        }
       }
     },
     "terser": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.7.0.tgz",
-      "integrity": "sha512-Lfb0RiZcjRDXCC3OSHJpEkxJ9Qeqs6mp2v4jf2MHfy8vGERmVDuvjXdd/EnP5Deme5F2yBRBymKmKHCBg2echw==",
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.5.1.tgz",
+      "integrity": "sha512-6VGWZNVP2KTUcltUQJ25TtNjx/XgdDsBDKGt8nN0MpydU36LmbPPcMBd2kmtZNNGVVDLg44k7GKeHHj+4zPIBQ==",
       "dev": true,
       "requires": {
         "commander": "^2.20.0",
-        "source-map": "~0.6.1",
-        "source-map-support": "~0.5.12"
+        "source-map": "~0.7.2",
+        "source-map-support": "~0.5.19"
       },
       "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+        "commander": {
+          "version": "2.20.3",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
           "dev": true
         }
       }
     },
     "terser-webpack-plugin": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-3.0.1.tgz",
-      "integrity": "sha512-eFDtq8qPUEa9hXcUzTwKXTnugIVtlqc1Z/ZVhG8LmRT3lgRY13+pQTnFLY2N7ATB6TKCHuW/IGjoAnZz9wOIqw==",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-4.2.3.tgz",
+      "integrity": "sha512-jTgXh40RnvOrLQNgIkwEKnQ8rmHjHK4u+6UBEi+W+FPmvb+uo+chJXntKe7/3lW5mNysgSWD60KyesnhW8D6MQ==",
       "dev": true,
       "requires": {
-        "cacache": "^15.0.3",
+        "cacache": "^15.0.5",
         "find-cache-dir": "^3.3.1",
-        "jest-worker": "^26.0.0",
-        "p-limit": "^2.3.0",
-        "schema-utils": "^2.6.6",
-        "serialize-javascript": "^3.0.0",
+        "jest-worker": "^26.5.0",
+        "p-limit": "^3.0.2",
+        "schema-utils": "^3.0.0",
+        "serialize-javascript": "^5.0.1",
         "source-map": "^0.6.1",
-        "terser": "^4.6.13",
+        "terser": "^5.3.4",
         "webpack-sources": "^1.4.3"
       },
       "dependencies": {
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
           "dev": true,
           "requires": {
-            "p-try": "^2.0.0"
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
           }
         },
-        "serialize-javascript": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz",
-          "integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==",
+        "ajv-keywords": {
+          "version": "3.5.2",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+          "dev": true,
+          "requires": {}
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        },
+        "schema-utils": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
           "dev": true,
           "requires": {
-            "randombytes": "^2.1.0"
+            "@types/json-schema": "^7.0.8",
+            "ajv": "^6.12.5",
+            "ajv-keywords": "^3.5.2"
           }
         },
         "source-map": {
@@ -52870,6 +52340,16 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
+        },
+        "webpack-sources": {
+          "version": "1.4.3",
+          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+          "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+          "dev": true,
+          "requires": {
+            "source-list-map": "^2.0.0",
+            "source-map": "~0.6.1"
+          }
         }
       }
     },
@@ -52934,9 +52414,9 @@
       "dev": true
     },
     "timers-browserify": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
-      "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
+      "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
       "dev": true,
       "requires": {
         "setimmediate": "^1.0.4"
@@ -53019,6 +52499,18 @@
         "extend-shallow": "^3.0.2",
         "regex-not": "^1.0.2",
         "safe-regex": "^1.1.0"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        }
       }
     },
     "to-regex-range": {
@@ -53054,9 +52546,9 @@
       }
     },
     "tr46": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.0.2.tgz",
-      "integrity": "sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
+      "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
       "dev": true,
       "requires": {
         "punycode": "^2.1.1"
@@ -53069,42 +52561,27 @@
       "dev": true
     },
     "ts-jest": {
-      "version": "26.4.1",
-      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-26.4.1.tgz",
-      "integrity": "sha512-F4aFq01aS6mnAAa0DljNmKr/Kk9y4HVZ1m6/rtJ0ED56cuxINGq3Q9eVAh+z5vcYKe5qnTMvv90vE8vUMFxomg==",
+      "version": "26.5.6",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-26.5.6.tgz",
+      "integrity": "sha512-rua+rCP8DxpA8b4DQD/6X2HQS8Zy/xzViVYfEs2OQu68tkCuKLV0Md8pmX55+W24uRIyAsf/BajRfxOs+R2MKA==",
       "dev": true,
       "requires": {
-        "@types/jest": "26.x",
         "bs-logger": "0.x",
         "buffer-from": "1.x",
         "fast-json-stable-stringify": "2.x",
         "jest-util": "^26.1.0",
         "json5": "2.x",
-        "lodash.memoize": "4.x",
+        "lodash": "4.x",
         "make-error": "1.x",
         "mkdirp": "1.x",
         "semver": "7.x",
         "yargs-parser": "20.x"
-      },
-      "dependencies": {
-        "mkdirp": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-          "dev": true
-        },
-        "yargs-parser": {
-          "version": "20.2.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.1.tgz",
-          "integrity": "sha512-yYsjuSkjbLMBp16eaOt7/siKTjNVjMm3SoJnIg3sEh/JsvqVVDyjRKmaJV4cl+lNIgq6QEco2i3gDebJl7/vLA==",
-          "dev": true
-        }
       }
     },
     "ts-md5": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/ts-md5/-/ts-md5-1.2.7.tgz",
-      "integrity": "sha512-emODogvKGWi1KO1l9c6YxLMBn6CEH3VrH5mVPIyOtxBG52BvV4jP3GWz6bOZCz61nLgBc3ffQYE4+EHfCD+V7w=="
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/ts-md5/-/ts-md5-1.2.9.tgz",
+      "integrity": "sha512-/Efr7ZfGf8P+d9HXh0PLQD1CDipqD8j9apCFG96pODDoEaFLxXpV4En6tAc6y3fWyfhFGrqtNBRBS+eLVIB2uQ=="
     },
     "ts-node": {
       "version": "8.3.0",
@@ -53126,26 +52603,16 @@
       "dev": true
     },
     "tsconfig-paths": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz",
-      "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==",
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.10.1.tgz",
+      "integrity": "sha512-rETidPDgCpltxF7MjBZlAFPUHv5aHH2MymyPvh+vEyWAED4Eb/WeMbsnD/JDr4OKPOA1TssDHgIcpTN5Kh0p6Q==",
       "dev": true,
       "requires": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
+        "json5": "^2.2.0",
         "minimist": "^1.2.0",
         "strip-bom": "^3.0.0"
       },
       "dependencies": {
-        "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        },
         "strip-bom": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
@@ -53155,23 +52622,23 @@
       }
     },
     "tslib": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz",
-      "integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ=="
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
+      "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
     },
     "tsutils": {
-      "version": "3.17.1",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.17.1.tgz",
-      "integrity": "sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==",
+      "version": "3.21.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
       "dev": true,
       "requires": {
         "tslib": "^1.8.1"
       },
       "dependencies": {
         "tslib": {
-          "version": "1.13.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
-          "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
           "dev": true
         }
       }
@@ -53217,9 +52684,10 @@
       "dev": true
     },
     "type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "dev": true
     },
     "type-is": {
       "version": "1.6.18",
@@ -53245,9 +52713,9 @@
       }
     },
     "typescript": {
-      "version": "3.9.9",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.9.tgz",
-      "integrity": "sha512-kdMjTiekY+z/ubJCATUPlRDl39vXYiMV9iyeMuEuXZh2we6zz80uovNN2WlAxmmdE/Z/YQe+EbOEXB5RHEED3w==",
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.1.6.tgz",
+      "integrity": "sha512-pxnwLxeb/Z5SP80JDRzVjh58KsM6jZHRAOtTpS7sXLS4ogXNKC9ANxHHZqLLeVHZN35jCtI4JdmLLbLiC1kBow==",
       "dev": true
     },
     "uglify-js": {
@@ -53284,14 +52752,6 @@
         "has-bigints": "^1.0.1",
         "has-symbols": "^1.0.2",
         "which-boxed-primitive": "^1.0.2"
-      },
-      "dependencies": {
-        "has-symbols": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-          "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
-          "dev": true
-        }
       }
     },
     "unc-path-regex": {
@@ -53301,9 +52761,9 @@
       "dev": true
     },
     "underscore": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.11.0.tgz",
-      "integrity": "sha512-xY96SsN3NA461qIRKZ/+qox37YXPtSBswMGfiNptr+wrt6ds4HaMw23TP612fEyGekRE6LNRiLYr/aqbHXNedw=="
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
+      "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g=="
     },
     "undertaker": {
       "version": "1.3.0",
@@ -53375,14 +52835,22 @@
         "get-value": "^2.0.6",
         "is-extendable": "^0.1.1",
         "set-value": "^2.0.1"
+      },
+      "dependencies": {
+        "arr-union": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+          "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+          "dev": true
+        },
+        "is-extendable": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+          "dev": true
+        }
       }
     },
-    "uniq": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
-      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
-      "dev": true
-    },
     "uniqs": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz",
@@ -53424,29 +52892,20 @@
       }
     },
     "universal-analytics": {
-      "version": "0.4.20",
-      "resolved": "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.4.20.tgz",
-      "integrity": "sha512-gE91dtMvNkjO+kWsPstHRtSwHXz0l2axqptGYp5ceg4MsuurloM0PU3pdOfpb5zBXUvyjT4PwhWK2m39uczZuw==",
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.4.23.tgz",
+      "integrity": "sha512-lgMIH7XBI6OgYn1woDEmxhGdj8yDefMKg7GkWdeATAlQZFrMrNyxSkpDzY57iY0/6fdlzTbBV03OawvvzG+q7A==",
       "dev": true,
       "requires": {
-        "debug": "^3.0.0",
-        "request": "^2.88.0",
+        "debug": "^4.1.1",
+        "request": "^2.88.2",
         "uuid": "^3.0.0"
       },
       "dependencies": {
-        "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+        "uuid": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
           "dev": true
         }
       }
@@ -53466,12 +52925,6 @@
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
       "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
     },
-    "unquote": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
-      "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
-      "dev": true
-    },
     "unset-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
@@ -53521,8 +52974,7 @@
     "untildify": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
-      "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
-      "dev": true
+      "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw=="
     },
     "upath": {
       "version": "1.2.0",
@@ -53548,6 +53000,46 @@
         "pupa": "^2.0.1",
         "semver-diff": "^3.1.1",
         "xdg-basedir": "^4.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
     "upper-case": {
@@ -53557,9 +53049,9 @@
       "dev": true
     },
     "uri-js": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz",
-      "integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
       "requires": {
         "punycode": "^2.1.0"
       }
@@ -53589,9 +53081,9 @@
       }
     },
     "url-parse": {
-      "version": "1.4.7",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
-      "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz",
+      "integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==",
       "dev": true,
       "requires": {
         "querystringify": "^2.1.1",
@@ -53613,18 +53105,18 @@
       "dev": true
     },
     "util": {
-      "version": "0.10.3",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
       "dev": true,
       "requires": {
-        "inherits": "2.0.1"
+        "inherits": "2.0.3"
       },
       "dependencies": {
         "inherits": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
           "dev": true
         }
       }
@@ -53634,57 +53126,16 @@
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
-    "util-promisify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/util-promisify/-/util-promisify-2.1.0.tgz",
-      "integrity": "sha1-PCI2R2xNMsX/PEcAKt18E7moKlM=",
-      "dev": true,
-      "requires": {
-        "object.getownpropertydescriptors": "^2.0.3"
-      }
-    },
-    "util.promisify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
-      "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.2",
-        "has-symbols": "^1.0.1",
-        "object.getownpropertydescriptors": "^2.1.0"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.17.7",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
-          "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
-          "dev": true,
-          "requires": {
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.1",
-            "is-callable": "^1.2.2",
-            "is-regex": "^1.1.1",
-            "object-inspect": "^1.8.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.1",
-            "string.prototype.trimend": "^1.0.1",
-            "string.prototype.trimstart": "^1.0.1"
-          }
-        }
-      }
-    },
     "utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
       "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
     },
     "uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "dev": true
     },
     "v8-compile-cache": {
       "version": "2.3.0",
@@ -53693,9 +53144,9 @@
       "dev": true
     },
     "v8-to-istanbul": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-5.0.1.tgz",
-      "integrity": "sha512-mbDNjuDajqYe3TXFk5qxcQy8L1msXNE37WTlLoqqpBfRsimbNcrlhQlDPntmECEcUvdC+AQ8CyMMf6EUx1r74Q==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz",
+      "integrity": "sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow==",
       "dev": true,
       "requires": {
         "@types/istanbul-lib-coverage": "^2.0.1",
@@ -53860,21 +53311,21 @@
       }
     },
     "watchpack": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.4.tgz",
-      "integrity": "sha512-aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg==",
+      "version": "1.7.5",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",
+      "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==",
       "dev": true,
       "requires": {
         "chokidar": "^3.4.1",
         "graceful-fs": "^4.1.2",
         "neo-async": "^2.5.0",
-        "watchpack-chokidar2": "^2.0.0"
+        "watchpack-chokidar2": "^2.0.1"
       }
     },
     "watchpack-chokidar2": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz",
-      "integrity": "sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz",
+      "integrity": "sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==",
       "dev": true,
       "optional": true,
       "requires": {
@@ -53904,6 +53355,13 @@
             }
           }
         },
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true,
+          "optional": true
+        },
         "binary-extensions": {
           "version": "1.13.1",
           "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
@@ -53928,18 +53386,6 @@
             "snapdragon-node": "^2.0.1",
             "split-string": "^3.0.2",
             "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
           }
         },
         "chokidar": {
@@ -53963,6 +53409,16 @@
             "upath": "^1.1.1"
           }
         },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
         "fill-range": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -53974,18 +53430,6 @@
             "is-number": "^3.0.0",
             "repeat-string": "^1.6.1",
             "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
           }
         },
         "fsevents": {
@@ -54032,6 +53476,13 @@
             "binary-extensions": "^1.0.0"
           }
         },
+        "is-extendable": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+          "dev": true,
+          "optional": true
+        },
         "is-number": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -54040,18 +53491,16 @@
           "optional": true,
           "requires": {
             "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
+          }
+        },
+        "is-plain-object": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "isobject": "^3.0.1"
           }
         },
         "isobject": {
@@ -54061,6 +53510,16 @@
           "dev": true,
           "optional": true
         },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        },
         "micromatch": {
           "version": "3.1.10",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -54081,6 +53540,36 @@
             "regex-not": "^1.0.0",
             "snapdragon": "^0.8.1",
             "to-regex": "^3.0.2"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "3.0.2",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+              "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "assign-symbols": "^1.0.0",
+                "is-extendable": "^1.0.1"
+              }
+            },
+            "is-extendable": {
+              "version": "1.0.1",
+              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+              "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "is-plain-object": "^2.0.4"
+              }
+            },
+            "kind-of": {
+              "version": "6.0.3",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+              "dev": true,
+              "optional": true
+            }
           }
         },
         "readdirp": {
@@ -54133,9 +53622,9 @@
       "dev": true
     },
     "webpack": {
-      "version": "4.43.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.43.0.tgz",
-      "integrity": "sha512-GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g==",
+      "version": "4.44.2",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.2.tgz",
+      "integrity": "sha512-6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q==",
       "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.9.0",
@@ -54146,7 +53635,7 @@
         "ajv": "^6.10.2",
         "ajv-keywords": "^3.4.1",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^4.1.0",
+        "enhanced-resolve": "^4.3.0",
         "eslint-scope": "^4.0.3",
         "json-parse-better-errors": "^1.0.2",
         "loader-runner": "^2.4.0",
@@ -54159,10 +53648,41 @@
         "schema-utils": "^1.0.0",
         "tapable": "^1.1.3",
         "terser-webpack-plugin": "^1.4.3",
-        "watchpack": "^1.6.1",
+        "watchpack": "^1.7.4",
         "webpack-sources": "^1.4.1"
       },
       "dependencies": {
+        "acorn": {
+          "version": "6.4.2",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
+          "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
+          "dev": true
+        },
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "3.5.2",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+          "dev": true,
+          "requires": {}
+        },
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true
+        },
         "braces": {
           "version": "2.3.2",
           "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
@@ -54189,6 +53709,12 @@
               "requires": {
                 "is-extendable": "^0.1.0"
               }
+            },
+            "is-extendable": {
+              "version": "0.1.1",
+              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+              "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+              "dev": true
             }
           }
         },
@@ -54221,6 +53747,55 @@
           "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
           "dev": true
         },
+        "commander": {
+          "version": "2.20.3",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+          "dev": true
+        },
+        "enhanced-resolve": {
+          "version": "4.5.0",
+          "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz",
+          "integrity": "sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "memory-fs": "^0.5.0",
+            "tapable": "^1.0.0"
+          },
+          "dependencies": {
+            "memory-fs": {
+              "version": "0.5.0",
+              "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
+              "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
+              "dev": true,
+              "requires": {
+                "errno": "^0.1.3",
+                "readable-stream": "^2.0.1"
+              }
+            }
+          }
+        },
+        "eslint-scope": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+          "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
+          "dev": true,
+          "requires": {
+            "esrecurse": "^4.1.0",
+            "estraverse": "^4.1.1"
+          }
+        },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        },
         "fill-range": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -54241,6 +53816,12 @@
               "requires": {
                 "is-extendable": "^0.1.0"
               }
+            },
+            "is-extendable": {
+              "version": "0.1.1",
+              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+              "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+              "dev": true
             }
           }
         },
@@ -54255,6 +53836,15 @@
             "pkg-dir": "^3.0.0"
           }
         },
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
         "is-number": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -54287,6 +53877,12 @@
           "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
           "dev": true
         },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        },
         "json5": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
@@ -54296,6 +53892,12 @@
             "minimist": "^1.2.0"
           }
         },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        },
         "loader-utils": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
@@ -54307,6 +53909,16 @@
             "json5": "^1.0.1"
           }
         },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
         "lru-cache": {
           "version": "5.1.1",
           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
@@ -54326,16 +53938,6 @@
             "semver": "^5.6.0"
           }
         },
-        "memory-fs": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-          "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
-          "dev": true,
-          "requires": {
-            "errno": "^0.1.3",
-            "readable-stream": "^2.0.1"
-          }
-        },
         "micromatch": {
           "version": "3.1.10",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -54357,6 +53959,48 @@
             "to-regex": "^3.0.2"
           }
         },
+        "mkdirp": {
+          "version": "0.5.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+          "dev": true
+        },
+        "pkg-dir": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+          "dev": true,
+          "requires": {
+            "find-up": "^3.0.0"
+          }
+        },
         "rimraf": {
           "version": "2.7.1",
           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -54383,6 +54027,15 @@
           "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
           "dev": true
         },
+        "serialize-javascript": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
+          "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+          "dev": true,
+          "requires": {
+            "randombytes": "^2.1.0"
+          }
+        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -54390,14 +54043,31 @@
           "dev": true
         },
         "ssri": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-          "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz",
+          "integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==",
           "dev": true,
           "requires": {
             "figgy-pudding": "^3.5.1"
           }
         },
+        "tapable": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
+          "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
+          "dev": true
+        },
+        "terser": {
+          "version": "4.8.0",
+          "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
+          "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
+          "dev": true,
+          "requires": {
+            "commander": "^2.20.0",
+            "source-map": "~0.6.1",
+            "source-map-support": "~0.5.12"
+          }
+        },
         "terser-webpack-plugin": {
           "version": "1.4.5",
           "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz",
@@ -54425,6 +54095,22 @@
             "repeat-string": "^1.6.1"
           }
         },
+        "webpack-sources": {
+          "version": "1.4.3",
+          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+          "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+          "dev": true,
+          "requires": {
+            "source-list-map": "^2.0.0",
+            "source-map": "~0.6.1"
+          }
+        },
+        "y18n": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+          "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+          "dev": true
+        },
         "yallist": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
@@ -54446,28 +54132,27 @@
         "webpack-log": "^2.0.0"
       },
       "dependencies": {
-        "memory-fs": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-          "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+        "mime": {
+          "version": "2.5.2",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
+          "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.5.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
           "dev": true,
           "requires": {
-            "errno": "^0.1.3",
-            "readable-stream": "^2.0.1"
+            "minimist": "^1.2.5"
           }
-        },
-        "mime": {
-          "version": "2.4.6",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
-          "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==",
-          "dev": true
         }
       }
     },
     "webpack-dev-server": {
-      "version": "3.11.0",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz",
-      "integrity": "sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg==",
+      "version": "3.11.2",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.2.tgz",
+      "integrity": "sha512-A80BkuHRQfCiNtGBS1EMf2ChTUs0x+B3wGDFmOeT4rmJOHhHTCH2naNxIHhmkr0/UillP4U3yeIyv1pNp+QDLQ==",
       "dev": true,
       "requires": {
         "ansi-html": "0.0.7",
@@ -54490,11 +54175,11 @@
         "p-retry": "^3.0.1",
         "portfinder": "^1.0.26",
         "schema-utils": "^1.0.0",
-        "selfsigned": "^1.10.7",
+        "selfsigned": "^1.10.8",
         "semver": "^6.3.0",
         "serve-index": "^1.9.1",
-        "sockjs": "0.3.20",
-        "sockjs-client": "1.4.0",
+        "sockjs": "^0.3.21",
+        "sockjs-client": "^1.5.0",
         "spdy": "^4.0.2",
         "strip-ansi": "^3.0.1",
         "supports-color": "^6.1.0",
@@ -54505,6 +54190,25 @@
         "yargs": "^13.3.2"
       },
       "dependencies": {
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "3.5.2",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+          "dev": true,
+          "requires": {}
+        },
         "ansi-regex": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
@@ -54532,6 +54236,12 @@
             }
           }
         },
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true
+        },
         "binary-extensions": {
           "version": "1.13.1",
           "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
@@ -54554,19 +54264,14 @@
             "snapdragon-node": "^2.0.1",
             "split-string": "^3.0.2",
             "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
           }
         },
+        "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+          "dev": true
+        },
         "chokidar": {
           "version": "2.1.8",
           "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
@@ -54587,13 +54292,47 @@
             "upath": "^1.1.1"
           }
         },
-        "debug": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
-          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+        "cliui": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
           "dev": true,
           "requires": {
-            "ms": "2.1.2"
+            "string-width": "^3.1.0",
+            "strip-ansi": "^5.2.0",
+            "wrap-ansi": "^5.1.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "4.1.0",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+              "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+              "dev": true
+            },
+            "strip-ansi": {
+              "version": "5.2.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+              "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^4.1.0"
+              }
+            }
+          }
+        },
+        "emoji-regex": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+          "dev": true
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
           }
         },
         "fill-range": {
@@ -54606,17 +54345,15 @@
             "is-number": "^3.0.0",
             "repeat-string": "^1.6.1",
             "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
+          }
+        },
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
           }
         },
         "fsevents": {
@@ -54651,17 +54388,15 @@
             }
           }
         },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "is-absolute-url": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz",
-          "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==",
-          "dev": true
+        "import-local": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
+          "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
+          "dev": true,
+          "requires": {
+            "pkg-dir": "^3.0.0",
+            "resolve-cwd": "^2.0.0"
+          }
         },
         "is-binary-path": {
           "version": "1.0.1",
@@ -54672,6 +54407,18 @@
             "binary-extensions": "^1.0.0"
           }
         },
+        "is-extendable": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
         "is-number": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -54679,17 +54426,15 @@
           "dev": true,
           "requires": {
             "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
+          }
+        },
+        "is-plain-object": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+          "dev": true,
+          "requires": {
+            "isobject": "^3.0.1"
           }
         },
         "isobject": {
@@ -54698,6 +54443,31 @@
           "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
           "dev": true
         },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
         "micromatch": {
           "version": "3.1.10",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -54717,13 +54487,61 @@
             "regex-not": "^1.0.0",
             "snapdragon": "^0.8.1",
             "to-regex": "^3.0.2"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "3.0.2",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+              "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+              "dev": true,
+              "requires": {
+                "assign-symbols": "^1.0.0",
+                "is-extendable": "^1.0.1"
+              }
+            },
+            "is-extendable": {
+              "version": "1.0.1",
+              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+              "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+              "dev": true,
+              "requires": {
+                "is-plain-object": "^2.0.4"
+              }
+            },
+            "kind-of": {
+              "version": "6.0.3",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+              "dev": true
+            }
           }
         },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "pkg-dir": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+          "dev": true,
+          "requires": {
+            "find-up": "^3.0.0"
+          }
         },
         "readdirp": {
           "version": "2.2.1",
@@ -54736,6 +54554,27 @@
             "readable-stream": "^2.0.2"
           }
         },
+        "require-main-filename": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+          "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+          "dev": true
+        },
+        "resolve-cwd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
+          "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
+          "dev": true,
+          "requires": {
+            "resolve-from": "^3.0.0"
+          }
+        },
+        "resolve-from": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+          "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+          "dev": true
+        },
         "schema-utils": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
@@ -54753,6 +54592,34 @@
           "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
         },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "4.1.0",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+              "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+              "dev": true
+            },
+            "strip-ansi": {
+              "version": "5.2.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+              "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^4.1.0"
+              }
+            }
+          }
+        },
         "strip-ansi": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
@@ -54780,6 +54647,83 @@
             "is-number": "^3.0.0",
             "repeat-string": "^1.6.1"
           }
+        },
+        "which-module": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+          "dev": true
+        },
+        "wrap-ansi": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+          "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.0",
+            "string-width": "^3.0.0",
+            "strip-ansi": "^5.0.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "4.1.0",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+              "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+              "dev": true
+            },
+            "strip-ansi": {
+              "version": "5.2.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+              "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^4.1.0"
+              }
+            }
+          }
+        },
+        "ws": {
+          "version": "6.2.2",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
+          "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
+          "dev": true,
+          "requires": {
+            "async-limiter": "~1.0.0"
+          }
+        },
+        "y18n": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+          "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+          "dev": true
+        },
+        "yargs": {
+          "version": "13.3.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+          "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+          "dev": true,
+          "requires": {
+            "cliui": "^5.0.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^2.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^3.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^13.1.2"
+          }
+        },
+        "yargs-parser": {
+          "version": "13.1.2",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          }
         }
       }
     },
@@ -54791,25 +54735,40 @@
       "requires": {
         "ansi-colors": "^3.0.0",
         "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "ansi-colors": {
+          "version": "3.2.4",
+          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
+          "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
+          "dev": true
+        },
+        "uuid": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+          "dev": true
+        }
       }
     },
     "webpack-merge": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
-      "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==",
+      "version": "5.7.3",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.7.3.tgz",
+      "integrity": "sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA==",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.15"
+        "clone-deep": "^4.0.1",
+        "wildcard": "^2.0.0"
       }
     },
     "webpack-sources": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.2.0.tgz",
+      "integrity": "sha512-bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w==",
       "dev": true,
       "requires": {
-        "source-list-map": "^2.0.0",
-        "source-map": "~0.6.1"
+        "source-list-map": "^2.0.1",
+        "source-map": "^0.6.1"
       },
       "dependencies": {
         "source-map": {
@@ -54821,12 +54780,30 @@
       }
     },
     "webpack-subresource-integrity": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.4.1.tgz",
-      "integrity": "sha512-XMLFInbGbB1HV7K4vHWANzc1CN0t/c4bBvnlvGxGwV45yE/S/feAXIm8dJsCkzqWtSKnmaEgTp/meyeThxG4Iw==",
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.5.2.tgz",
+      "integrity": "sha512-GBWYBoyalbo5YClwWop9qe6Zclp8CIXYGIz12OPclJhIrSplDxs1Ls1JDMH8xBPPrg1T6ISaTW9Y6zOrwEiAzw==",
       "dev": true,
       "requires": {
         "webpack-sources": "^1.3.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "webpack-sources": {
+          "version": "1.4.3",
+          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+          "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+          "dev": true,
+          "requires": {
+            "source-list-map": "^2.0.0",
+            "source-map": "~0.6.1"
+          }
+        }
       }
     },
     "webrtc-adapter": {
@@ -54838,11 +54815,13 @@
       }
     },
     "websocket-driver": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz",
-      "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=",
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
+      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
       "dev": true,
       "requires": {
+        "http-parser-js": ">=0.5.1",
+        "safe-buffer": ">=5.1.0",
         "websocket-extensions": ">=0.1.1"
       }
     },
@@ -54868,22 +54847,16 @@
       "dev": true
     },
     "whatwg-url": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.3.0.tgz",
-      "integrity": "sha512-BQRf/ej5Rp3+n7k0grQXZj9a1cHtsp4lqj01p59xBWFKdezR8sO37XnpafwNqiFac/v2Il12EIMjX/Y4VZtT8Q==",
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
+      "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
       "dev": true,
       "requires": {
-        "lodash.sortby": "^4.7.0",
-        "tr46": "^2.0.2",
+        "lodash": "^4.7.0",
+        "tr46": "^2.1.0",
         "webidl-conversions": "^6.1.0"
       }
     },
-    "when": {
-      "version": "3.6.4",
-      "resolved": "https://registry.npmjs.org/when/-/when-3.6.4.tgz",
-      "integrity": "sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=",
-      "dev": true
-    },
     "which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -54906,16 +54879,10 @@
       }
     },
     "which-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-      "dev": true
-    },
-    "which-pm-runs": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz",
-      "integrity": "sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=",
-      "optional": true
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
+      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
+      "dev": true
     },
     "wide-align": {
       "version": "1.1.3",
@@ -54923,6 +54890,35 @@
       "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
       "requires": {
         "string-width": "^1.0.2 || 2"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "requires": {
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        }
       }
     },
     "widest-line": {
@@ -54931,129 +54927,21 @@
       "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==",
       "requires": {
         "string-width": "^4.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
-        },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-        },
-        "string-width": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        }
       }
     },
+    "wildcard": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
+      "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
+      "dev": true
+    },
     "windows-release": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-3.3.3.tgz",
-      "integrity": "sha512-OSOGH1QYiW5yVor9TtmXKQvt2vjQqbYS+DqmsZw+r7xDwLXEeT3JGW0ZppFmHx4diyXmxt238KFR3N9jzevBRg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-4.0.0.tgz",
+      "integrity": "sha512-OxmV4wzDKB1x7AZaZgXMVsdJ1qER1ed83ZrTYd5Bwq2HfJVg3DJS8nqlAG4sMoJ7mu8cuRmLEYyU13BKwctRAg==",
+      "dev": true,
       "requires": {
-        "execa": "^1.0.0"
-      },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "6.0.5",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-          "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        },
-        "execa": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-          "requires": {
-            "cross-spawn": "^6.0.0",
-            "get-stream": "^4.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
-          }
-        },
-        "get-stream": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        },
-        "is-stream": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-          "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
-        },
-        "npm-run-path": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-          "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-          "requires": {
-            "path-key": "^2.0.0"
-          }
-        },
-        "path-key": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-          "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
-        },
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
-        },
-        "shebang-command": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-          "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-          "requires": {
-            "shebang-regex": "^1.0.0"
-          }
-        },
-        "shebang-regex": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-          "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
-        },
-        "which": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        }
+        "execa": "^4.0.2"
       }
     },
     "with-open-file": {
@@ -55064,6 +54952,13 @@
         "p-finally": "^1.0.0",
         "p-try": "^2.1.0",
         "pify": "^4.0.1"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
+        }
       }
     },
     "word-wrap": {
@@ -55082,9 +54977,9 @@
       }
     },
     "worker-plugin": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/worker-plugin/-/worker-plugin-4.0.3.tgz",
-      "integrity": "sha512-7hFDYWiKcE3yHZvemsoM9lZis/PzurHAEX1ej8PLCu818Rt6QqUAiDdxHPCKZctzmhqzPpcFSgvMCiPbtooqAg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/worker-plugin/-/worker-plugin-5.0.0.tgz",
+      "integrity": "sha512-AXMUstURCxDD6yGam2r4E34aJg6kW85IiaeX72hi+I1cxyaMUtrvVY6sbfpGKAj5e7f68Acl62BjQF5aOOx2IQ==",
       "dev": true,
       "requires": {
         "loader-utils": "^1.1.0"
@@ -55113,49 +55008,32 @@
       }
     },
     "wrap-ansi": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "dev": true,
       "requires": {
-        "ansi-styles": "^3.2.0",
-        "string-width": "^3.0.0",
-        "strip-ansi": "^5.0.0"
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "color-convert": "^1.9.0"
+            "color-convert": "^2.0.1"
           }
         },
         "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-          "dev": true
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
+            "color-name": "~1.1.4"
           }
         }
       }
@@ -55172,6 +55050,17 @@
       "dev": true,
       "requires": {
         "mkdirp": "^0.5.1"
+      },
+      "dependencies": {
+        "mkdirp": {
+          "version": "0.5.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        }
       }
     },
     "write-file-atomic": {
@@ -55186,21 +55075,26 @@
       }
     },
     "ws": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
-      "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz",
+      "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==",
       "dev": true,
-      "requires": {
-        "async-limiter": "~1.0.0"
-      }
+      "requires": {}
     },
     "xcode": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/xcode/-/xcode-2.1.0.tgz",
-      "integrity": "sha512-uCrmPITrqTEzhn0TtT57fJaNaw8YJs1aCzs+P/QqxsDbvPZSv7XMPPwXrKvHtD6pLjBM/NaVwraWJm8q83Y4iQ==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/xcode/-/xcode-3.0.1.tgz",
+      "integrity": "sha512-kCz5k7J7XbJtjABOvkc5lJmkiDh8VhjVCGNiqdKCscmVpdVUpEAyXv1xmCLkQJ5dsHqx3IPO4XW+NTDhU/fatA==",
       "requires": {
-        "simple-plist": "^1.0.0",
-        "uuid": "^3.3.2"
+        "simple-plist": "^1.1.0",
+        "uuid": "^7.0.3"
+      },
+      "dependencies": {
+        "uuid": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
+          "integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg=="
+        }
       }
     },
     "xdg-basedir": {
@@ -55231,9 +55125,9 @@
       "dev": true
     },
     "xmldom": {
-      "version": "0.1.31",
-      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.31.tgz",
-      "integrity": "sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ=="
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.5.0.tgz",
+      "integrity": "sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA=="
     },
     "xregexp": {
       "version": "2.0.0",
@@ -55248,9 +55142,9 @@
       "dev": true
     },
     "y18n": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
       "dev": true
     },
     "yallist": {
@@ -55258,83 +55152,32 @@
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     },
+    "yaml": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+      "dev": true
+    },
     "yargs": {
-      "version": "13.3.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-      "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
       "dev": true,
       "requires": {
-        "cliui": "^5.0.0",
-        "find-up": "^3.0.0",
-        "get-caller-file": "^2.0.1",
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
         "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^3.0.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^13.1.2"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        }
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
       }
     },
     "yargs-parser": {
-      "version": "13.1.2",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
-      "dev": true,
-      "requires": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      }
+      "version": "20.2.9",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+      "dev": true
     },
     "yauzl": {
       "version": "2.10.0",
@@ -55352,6 +55195,12 @@
       "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
       "dev": true
     },
+    "yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true
+    },
     "zone.js": {
       "version": "0.10.3",
       "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.10.3.tgz",
diff --git a/package.json b/package.json
index ce314dd2f..efe03d38c 100644
--- a/package.json
+++ b/package.json
@@ -37,40 +37,40 @@
     "ionic:build:before": "gulp"
   },
   "dependencies": {
-    "@angular/animations": "~10.0.14",
-    "@angular/common": "~10.0.14",
-    "@angular/core": "~10.0.14",
-    "@angular/forms": "~10.0.14",
-    "@angular/platform-browser": "~10.0.14",
-    "@angular/platform-browser-dynamic": "~10.0.14",
-    "@angular/router": "~10.0.14",
-    "@ionic-native/badge": "^5.33.0",
-    "@ionic-native/camera": "^5.33.0",
-    "@ionic-native/chooser": "^5.33.0",
-    "@ionic-native/clipboard": "^5.33.0",
-    "@ionic-native/core": "^5.33.0",
-    "@ionic-native/device": "^5.33.0",
-    "@ionic-native/diagnostic": "^5.33.0",
-    "@ionic-native/file": "^5.33.0",
-    "@ionic-native/file-opener": "^5.33.0",
-    "@ionic-native/file-transfer": "^5.33.0",
-    "@ionic-native/geolocation": "^5.33.0",
-    "@ionic-native/http": "^5.33.0",
-    "@ionic-native/in-app-browser": "^5.33.0",
-    "@ionic-native/ionic-webview": "^5.33.0",
-    "@ionic-native/keyboard": "^5.33.0",
-    "@ionic-native/local-notifications": "^5.33.0",
-    "@ionic-native/media": "^5.33.0",
-    "@ionic-native/media-capture": "^5.33.0",
-    "@ionic-native/network": "^5.33.0",
-    "@ionic-native/push": "^5.33.0",
-    "@ionic-native/qr-scanner": "^5.33.0",
-    "@ionic-native/splash-screen": "^5.33.0",
-    "@ionic-native/sqlite": "^5.33.0",
-    "@ionic-native/status-bar": "^5.33.0",
-    "@ionic-native/web-intent": "^5.33.0",
-    "@ionic-native/zip": "^5.33.0",
-    "@ionic/angular": "^5.6.6",
+    "@angular/animations": "~11.2.14",
+    "@angular/common": "~11.2.14",
+    "@angular/core": "~11.2.14",
+    "@angular/forms": "~11.2.14",
+    "@angular/platform-browser": "~11.2.14",
+    "@angular/platform-browser-dynamic": "~11.2.14",
+    "@angular/router": "~11.2.14",
+    "@ionic-native/badge": "^5.34.0",
+    "@ionic-native/camera": "^5.34.0",
+    "@ionic-native/chooser": "^5.34.0",
+    "@ionic-native/clipboard": "^5.34.0",
+    "@ionic-native/core": "^5.34.0",
+    "@ionic-native/device": "^5.34.0",
+    "@ionic-native/diagnostic": "^5.34.0",
+    "@ionic-native/file": "^5.34.0",
+    "@ionic-native/file-opener": "^5.34.0",
+    "@ionic-native/file-transfer": "^5.34.0",
+    "@ionic-native/geolocation": "^5.34.0",
+    "@ionic-native/http": "^5.34.0",
+    "@ionic-native/in-app-browser": "^5.34.0",
+    "@ionic-native/ionic-webview": "^5.34.0",
+    "@ionic-native/keyboard": "^5.34.0",
+    "@ionic-native/local-notifications": "^5.34.0",
+    "@ionic-native/media": "^5.34.0",
+    "@ionic-native/media-capture": "^5.34.0",
+    "@ionic-native/network": "^5.34.0",
+    "@ionic-native/push": "^5.34.0",
+    "@ionic-native/qr-scanner": "^5.34.0",
+    "@ionic-native/splash-screen": "^5.34.0",
+    "@ionic-native/sqlite": "^5.34.0",
+    "@ionic-native/status-bar": "^5.34.0",
+    "@ionic-native/web-intent": "^5.34.0",
+    "@ionic-native/zip": "^5.34.0",
+    "@ionic/angular": "^5.6.13",
     "@moodlehq/cordova-plugin-file-transfer": "1.7.1-moodle.2",
     "@moodlehq/cordova-plugin-inappbrowser": "5.0.0-moodle.2",
     "@moodlehq/cordova-plugin-local-notification": "0.9.0-moodle.2",
@@ -80,11 +80,11 @@
     "@ngx-translate/http-loader": "^6.0.0",
     "@types/chart.js": "^2.9.31",
     "@types/cordova": "0.0.34",
-    "@types/dom-mediacapture-record": "^1.0.7",
+    "@types/dom-mediacapture-record": "^1.0.10",
     "chart.js": "^2.9.4",
     "com-darryncampbell-cordova-plugin-intent": "^1.3.0",
     "cordova": "^10.0.0",
-    "cordova-android": "^9.1.0",
+    "cordova-android": "^10.0.1",
     "cordova-android-support-gradle-release": "^3.0.1",
     "cordova-clipboard": "^1.3.0",
     "cordova-ios": "^6.2.0",
@@ -128,17 +128,17 @@
     "zone.js": "~0.10.3"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.1000.8",
+    "@angular-devkit/build-angular": "~0.1102.14",
     "@angular-eslint/builder": "^4.2.0",
     "@angular-eslint/eslint-plugin": "^4.2.0",
     "@angular-eslint/eslint-plugin-template": "^4.2.0",
     "@angular-eslint/schematics": "^4.2.0",
     "@angular-eslint/template-parser": "^4.2.0",
-    "@angular/cli": "~10.0.8",
-    "@angular/compiler": "~10.0.14",
-    "@angular/compiler-cli": "~10.0.14",
-    "@angular/language-service": "~10.0.14",
-    "@ionic/angular-toolkit": "^2.3.3",
+    "@angular/cli": "~11.2.14",
+    "@angular/compiler": "~11.2.14",
+    "@angular/compiler-cli": "~11.2.14",
+    "@angular/language-service": "~11.2.14",
+    "@ionic/angular-toolkit": "^4.0.0",
     "@ionic/cli": "^6.14.1",
     "@types/faker": "^5.1.3",
     "@types/node": "^12.12.64",
@@ -170,7 +170,7 @@
     "native-run": "^1.4.0",
     "ts-jest": "^26.4.1",
     "ts-node": "~8.3.0",
-    "typescript": "^3.9.9"
+    "typescript": "^4.1.6"
   },
   "engines": {
     "node": ">=12.x"
diff --git a/tsconfig.json b/tsconfig.json
index d617cbf05..e5836c1d0 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -9,7 +9,7 @@
     "experimentalDecorators": true,
     "strictNullChecks": true,
     "strictPropertyInitialization": true,
-    "module": "esnext",
+    "module": "es2020",
     "moduleResolution": "node",
     "importHelpers": true,
     "target": "es2015",
@@ -46,6 +46,8 @@
   },
   "angularCompilerOptions": {
     "fullTemplateTypeCheck": true,
-    "strictInjectionParameters": true
+    "enableI18nLegacyMessageIdFormat": false,
+    "strictInjectionParameters": true,
+    "strictInputAccessModifiers": true
   }
 }

From 655e97213dfc339b67c8c887b69d4a8907701192 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 27 Jul 2021 13:43:48 +0200
Subject: [PATCH 0027/1008] MOBILE-3833 readme: Remove sauce labs references

---
 README.md | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/README.md b/README.md
index 886c6cbae..e0dae9019 100644
--- a/README.md
+++ b/README.md
@@ -13,10 +13,3 @@ License
 -------
 
 [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0)
-
-Big Thanks
------------
-
-Cross-browser Testing Platform and Open Source <3 Provided by [Sauce Labs](https://saucelabs.com)
-
-![Sauce Labs Logo](https://user-images.githubusercontent.com/557037/43443976-d88d5a78-94a2-11e8-8915-9f06521423dd.png)
\ No newline at end of file

From 3f1f52f5c30f1b1d91d6464653666d4e43900a0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 27 Jul 2021 14:36:09 +0200
Subject: [PATCH 0028/1008] MOBILE-3833 lint: Fix type errors

---
 src/core/features/course/services/module-prefetch-delegate.ts | 2 +-
 src/core/features/emulator/classes/sqlitedb.ts                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/features/course/services/module-prefetch-delegate.ts b/src/core/features/course/services/module-prefetch-delegate.ts
index 8ee32560d..cd2ede92b 100644
--- a/src/core/features/course/services/module-prefetch-delegate.ts
+++ b/src/core/features/course/services/module-prefetch-delegate.ts
@@ -1261,7 +1261,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
         previousTime?: number,
     ): CourseUpdates {
         // Format the response to index it by module ID.
-        CoreUtils.arrayToObject(response.instances, 'id', result);
+        CoreUtils.arrayToObject<false | CheckUpdatesWSInstance>(response.instances, 'id', result);
 
         // Treat warnings, adding the not supported modules.
         response.warnings?.forEach((warning) => {
diff --git a/src/core/features/emulator/classes/sqlitedb.ts b/src/core/features/emulator/classes/sqlitedb.ts
index 055944f71..4be4bd69d 100644
--- a/src/core/features/emulator/classes/sqlitedb.ts
+++ b/src/core/features/emulator/classes/sqlitedb.ts
@@ -60,7 +60,7 @@ export class SQLiteDBMock extends SQLiteDB {
                 tx.executeSql(query, args, (tx, result) => {
                     if (result.rows.length <= 0) {
                         // No tables to delete, stop.
-                        resolve();
+                        resolve(null);
 
                         return;
                     }

From 9544aa179d1ddefee448daa4fe9183c2e316d536 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 27 Jul 2021 14:30:03 +0200
Subject: [PATCH 0029/1008] MOBILE-3833 config: Disable chart.js CommonJS
 warning

---
 angular.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/angular.json b/angular.json
index c1275f42d..036390079 100644
--- a/angular.json
+++ b/angular.json
@@ -14,6 +14,9 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
+            "allowedCommonJsDependencies":[
+                "chart.js"
+            ],
             "outputPath": "www",
             "index": "src/index.html",
             "main": "src/main.ts",
@@ -46,7 +49,6 @@
               },
               "outputHashing": "all",
               "sourceMap": false,
-              "extractCss": true,
               "namedChunks": false,
               "aot": true,
               "extractLicenses": true,

From 0fb7961a423abb42393e22b65708595ca8e08e27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 3 Aug 2021 12:55:27 +0200
Subject: [PATCH 0030/1008] MOBILE-3833 config: Update eslint

---
 package-lock.json | 140 +++++++++++++++++++++++++++++++---------------
 package.json      |   8 +--
 2 files changed, 100 insertions(+), 48 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b80623d42..d7ac26002 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -119,12 +119,12 @@
         "@typescript-eslint/eslint-plugin": "^4.22.0",
         "@typescript-eslint/parser": "^4.22.0",
         "check-es-compat": "^1.1.1",
-        "eslint": "^7.25.0",
+        "eslint": "^7.31.0",
         "eslint-config-prettier": "^8.3.0",
         "eslint-plugin-header": "^3.1.1",
-        "eslint-plugin-import": "^2.22.1",
-        "eslint-plugin-jest": "^24.3.6",
-        "eslint-plugin-jsdoc": "^32.3.3",
+        "eslint-plugin-import": "^2.23.4",
+        "eslint-plugin-jest": "^24.4.0",
+        "eslint-plugin-jsdoc": "^36.0.3",
         "eslint-plugin-prefer-arrow": "^1.2.3",
         "eslint-plugin-promise": "^5.1.0",
         "faker": "^5.1.0",
@@ -2750,6 +2750,20 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/@es-joy/jsdoccomment": {
+      "version": "0.10.7",
+      "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.10.7.tgz",
+      "integrity": "sha512-aNKZEoMESDzOBjKxCWrFuG50mcpMeKVBnBNko4+IZZ5t9zXYs8GT1KB0ZaOq1YUsKumDRc6YII/TQm309MJ0KQ==",
+      "dev": true,
+      "dependencies": {
+        "comment-parser": "1.2.3",
+        "esquery": "^1.4.0",
+        "jsdoc-type-pratt-parser": "1.1.1"
+      },
+      "engines": {
+        "node": "^12.20 || ^14.14.0 || ^16"
+      }
+    },
     "node_modules/@eslint/eslintrc": {
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
@@ -8754,12 +8768,12 @@
       "dev": true
     },
     "node_modules/comment-parser": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.1.5.tgz",
-      "integrity": "sha512-RePCE4leIhBlmrqiYTvaqEeGYg7qpSl4etaIabKtdOQVi+mSTIBBklGUwIr79GXYnl3LpMwmDw4KeR2stNc6FA==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.2.3.tgz",
+      "integrity": "sha512-vnqDwBSXSsdAkGS5NjwMIPelE47q+UkEgWKHvCDNhVIIaQSUFY6sNnEYGzdoPGMdpV+7KR3ZkRd7oyWIjtuvJg==",
       "dev": true,
       "engines": {
-        "node": ">= 10.0.0"
+        "node": "^12.20 || ^14.14.0 || ^16"
       }
     },
     "node_modules/commondir": {
@@ -11958,26 +11972,45 @@
       }
     },
     "node_modules/eslint-plugin-jsdoc": {
-      "version": "32.3.4",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-32.3.4.tgz",
-      "integrity": "sha512-xSWfsYvffXnN0OkwLnB7MoDDDDjqcp46W7YlY1j7JyfAQBQ+WnGCfLov3gVNZjUGtK9Otj8mEhTZTqJu4QtIGA==",
+      "version": "36.0.6",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-36.0.6.tgz",
+      "integrity": "sha512-vOm27rI2SMfi1bOAYmzzGkanMCD/boquKwvN5ECi8EF9ASsXJwlnCzYtiOYpsDpbC2+6JXEHAmWMkqYNA3BWRw==",
       "dev": true,
       "dependencies": {
-        "comment-parser": "1.1.5",
-        "debug": "^4.3.1",
-        "jsdoctypeparser": "^9.0.0",
+        "@es-joy/jsdoccomment": "0.10.7",
+        "comment-parser": "1.2.3",
+        "debug": "^4.3.2",
+        "esquery": "^1.4.0",
+        "jsdoc-type-pratt-parser": "^1.1.1",
         "lodash": "^4.17.21",
-        "regextras": "^0.7.1",
+        "regextras": "^0.8.0",
         "semver": "^7.3.5",
         "spdx-expression-parse": "^3.0.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": "^12.20 || ^14.14.0 || ^16"
       },
       "peerDependencies": {
         "eslint": "^6.0.0 || ^7.0.0"
       }
     },
+    "node_modules/eslint-plugin-jsdoc/node_modules/debug": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/eslint-plugin-jsdoc/node_modules/semver": {
       "version": "7.3.5",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
@@ -19132,16 +19165,13 @@
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
       "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
     },
-    "node_modules/jsdoctypeparser": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/jsdoctypeparser/-/jsdoctypeparser-9.0.0.tgz",
-      "integrity": "sha512-jrTA2jJIL6/DAEILBEh2/w9QxCuwmvNXIry39Ay/HVfhE3o2yVV0U44blYkqdHA/OKloJEqvJy0xU+GSdE2SIw==",
+    "node_modules/jsdoc-type-pratt-parser": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-1.1.1.tgz",
+      "integrity": "sha512-uelRmpghNwPBuZScwgBG/OzodaFk5RbO5xaivBdsAY70icWfShwZ7PCMO0x1zSkOa8T1FzHThmrdoyg/0AwV5g==",
       "dev": true,
-      "bin": {
-        "jsdoctypeparser": "bin/jsdoctypeparser"
-      },
       "engines": {
-        "node": ">=10"
+        "node": ">=12.0.0"
       }
     },
     "node_modules/jsdom": {
@@ -24296,9 +24326,9 @@
       }
     },
     "node_modules/regextras": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/regextras/-/regextras-0.7.1.tgz",
-      "integrity": "sha512-9YXf6xtW+qzQ+hcMQXx95MOvfqXFgsKDZodX3qZB0x2n5Z94ioetIITsBtvJbiOyxa/6s9AtyweBLCdPmPko/w==",
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/regextras/-/regextras-0.8.0.tgz",
+      "integrity": "sha512-k519uI04Z3SaY0fLX843MRXnDeG2+vHOFsyhiPZvNLe7r8rD2YNRjq4BQLZZ0oAr2NrtvZlICsXysGNFPGa3CQ==",
       "dev": true,
       "engines": {
         "node": ">=0.1.14"
@@ -33178,6 +33208,17 @@
       "integrity": "sha512-HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg==",
       "dev": true
     },
+    "@es-joy/jsdoccomment": {
+      "version": "0.10.7",
+      "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.10.7.tgz",
+      "integrity": "sha512-aNKZEoMESDzOBjKxCWrFuG50mcpMeKVBnBNko4+IZZ5t9zXYs8GT1KB0ZaOq1YUsKumDRc6YII/TQm309MJ0KQ==",
+      "dev": true,
+      "requires": {
+        "comment-parser": "1.2.3",
+        "esquery": "^1.4.0",
+        "jsdoc-type-pratt-parser": "1.1.1"
+      }
+    },
     "@eslint/eslintrc": {
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
@@ -37775,9 +37816,9 @@
       "dev": true
     },
     "comment-parser": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.1.5.tgz",
-      "integrity": "sha512-RePCE4leIhBlmrqiYTvaqEeGYg7qpSl4etaIabKtdOQVi+mSTIBBklGUwIr79GXYnl3LpMwmDw4KeR2stNc6FA==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.2.3.tgz",
+      "integrity": "sha512-vnqDwBSXSsdAkGS5NjwMIPelE47q+UkEgWKHvCDNhVIIaQSUFY6sNnEYGzdoPGMdpV+7KR3ZkRd7oyWIjtuvJg==",
       "dev": true
     },
     "commondir": {
@@ -40322,20 +40363,31 @@
       }
     },
     "eslint-plugin-jsdoc": {
-      "version": "32.3.4",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-32.3.4.tgz",
-      "integrity": "sha512-xSWfsYvffXnN0OkwLnB7MoDDDDjqcp46W7YlY1j7JyfAQBQ+WnGCfLov3gVNZjUGtK9Otj8mEhTZTqJu4QtIGA==",
+      "version": "36.0.6",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-36.0.6.tgz",
+      "integrity": "sha512-vOm27rI2SMfi1bOAYmzzGkanMCD/boquKwvN5ECi8EF9ASsXJwlnCzYtiOYpsDpbC2+6JXEHAmWMkqYNA3BWRw==",
       "dev": true,
       "requires": {
-        "comment-parser": "1.1.5",
-        "debug": "^4.3.1",
-        "jsdoctypeparser": "^9.0.0",
+        "@es-joy/jsdoccomment": "0.10.7",
+        "comment-parser": "1.2.3",
+        "debug": "^4.3.2",
+        "esquery": "^1.4.0",
+        "jsdoc-type-pratt-parser": "^1.1.1",
         "lodash": "^4.17.21",
-        "regextras": "^0.7.1",
+        "regextras": "^0.8.0",
         "semver": "^7.3.5",
         "spdx-expression-parse": "^3.0.1"
       },
       "dependencies": {
+        "debug": {
+          "version": "4.3.2",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+          "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
         "semver": {
           "version": "7.3.5",
           "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
@@ -45697,10 +45749,10 @@
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
       "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
     },
-    "jsdoctypeparser": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/jsdoctypeparser/-/jsdoctypeparser-9.0.0.tgz",
-      "integrity": "sha512-jrTA2jJIL6/DAEILBEh2/w9QxCuwmvNXIry39Ay/HVfhE3o2yVV0U44blYkqdHA/OKloJEqvJy0xU+GSdE2SIw==",
+    "jsdoc-type-pratt-parser": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-1.1.1.tgz",
+      "integrity": "sha512-uelRmpghNwPBuZScwgBG/OzodaFk5RbO5xaivBdsAY70icWfShwZ7PCMO0x1zSkOa8T1FzHThmrdoyg/0AwV5g==",
       "dev": true
     },
     "jsdom": {
@@ -49721,9 +49773,9 @@
       }
     },
     "regextras": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/regextras/-/regextras-0.7.1.tgz",
-      "integrity": "sha512-9YXf6xtW+qzQ+hcMQXx95MOvfqXFgsKDZodX3qZB0x2n5Z94ioetIITsBtvJbiOyxa/6s9AtyweBLCdPmPko/w==",
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/regextras/-/regextras-0.8.0.tgz",
+      "integrity": "sha512-k519uI04Z3SaY0fLX843MRXnDeG2+vHOFsyhiPZvNLe7r8rD2YNRjq4BQLZZ0oAr2NrtvZlICsXysGNFPGa3CQ==",
       "dev": true
     },
     "registry-auth-token": {
diff --git a/package.json b/package.json
index efe03d38c..094851602 100644
--- a/package.json
+++ b/package.json
@@ -147,12 +147,12 @@
     "@typescript-eslint/eslint-plugin": "^4.22.0",
     "@typescript-eslint/parser": "^4.22.0",
     "check-es-compat": "^1.1.1",
-    "eslint": "^7.25.0",
+    "eslint": "^7.31.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-header": "^3.1.1",
-    "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-jest": "^24.3.6",
-    "eslint-plugin-jsdoc": "^32.3.3",
+    "eslint-plugin-import": "^2.23.4",
+    "eslint-plugin-jest": "^24.4.0",
+    "eslint-plugin-jsdoc": "^36.0.3",
     "eslint-plugin-prefer-arrow": "^1.2.3",
     "eslint-plugin-promise": "^5.1.0",
     "faker": "^5.1.0",

From 9dbcd09e4ae3def02d96da06f69fdae15d141a30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 3 Aug 2021 12:58:26 +0200
Subject: [PATCH 0031/1008] MOBILE-3833 config: Update jest

---
 jest.config.js       |  2 +-
 package-lock.json    | 21 +++++++++++++++++++++
 package.json         |  1 +
 src/testing/setup.ts |  2 +-
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/jest.config.js b/jest.config.js
index f464ae96e..79b69a153 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -16,7 +16,7 @@ module.exports = {
     moduleNameMapper: pathsToModuleNameMapper(compilerOptions.paths, { prefix: '<rootDir>/src/' }),
     globals: {
         'ts-jest': {
-            tsConfig: './tsconfig.test.json',
+            tsconfig: './tsconfig.test.json',
         },
     },
 };
diff --git a/package-lock.json b/package-lock.json
index d7ac26002..90bb4c731 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -113,6 +113,7 @@
         "@ionic/angular-toolkit": "^4.0.0",
         "@ionic/cli": "^6.14.1",
         "@types/faker": "^5.1.3",
+        "@types/jest": "^26.0.24",
         "@types/node": "^12.12.64",
         "@types/resize-observer-browser": "^0.1.5",
         "@types/webpack-env": "^1.16.0",
@@ -5247,6 +5248,16 @@
         "@types/istanbul-lib-report": "*"
       }
     },
+    "node_modules/@types/jest": {
+      "version": "26.0.24",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.24.tgz",
+      "integrity": "sha512-E/X5Vib8BWqZNRlDxj9vYXhsDwPYbPINqKF9BsnSoon4RQ0D9moEuLD8txgyypFLH7J4+Lho9Nr/c8H0Fi+17w==",
+      "dev": true,
+      "dependencies": {
+        "jest-diff": "^26.0.0",
+        "pretty-format": "^26.0.0"
+      }
+    },
     "node_modules/@types/json-schema": {
       "version": "7.0.8",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.8.tgz",
@@ -35064,6 +35075,16 @@
         "@types/istanbul-lib-report": "*"
       }
     },
+    "@types/jest": {
+      "version": "26.0.24",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.24.tgz",
+      "integrity": "sha512-E/X5Vib8BWqZNRlDxj9vYXhsDwPYbPINqKF9BsnSoon4RQ0D9moEuLD8txgyypFLH7J4+Lho9Nr/c8H0Fi+17w==",
+      "dev": true,
+      "requires": {
+        "jest-diff": "^26.0.0",
+        "pretty-format": "^26.0.0"
+      }
+    },
     "@types/json-schema": {
       "version": "7.0.8",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.8.tgz",
diff --git a/package.json b/package.json
index 094851602..ee2d05135 100644
--- a/package.json
+++ b/package.json
@@ -141,6 +141,7 @@
     "@ionic/angular-toolkit": "^4.0.0",
     "@ionic/cli": "^6.14.1",
     "@types/faker": "^5.1.3",
+    "@types/jest": "^26.0.24",
     "@types/node": "^12.12.64",
     "@types/resize-observer-browser": "^0.1.5",
     "@types/webpack-env": "^1.16.0",
diff --git a/src/testing/setup.ts b/src/testing/setup.ts
index 6bffcfaca..35812d3e7 100644
--- a/src/testing/setup.ts
+++ b/src/testing/setup.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import 'jest-preset-angular';
+import 'jest-preset-angular/setup-jest';
 
 import { setCreateSingletonMethodProxy } from '@singletons';
 

From d22b1a08e34bd9840ea6b5207f3f1d5511548994 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 27 Jul 2021 14:31:18 +0200
Subject: [PATCH 0032/1008] MOBILE-3833 lint: Fix strictInputAccessModifiers
 angular compiler option

---
 src/addons/mod/book/components/toc/toc.ts      |  2 +-
 .../components/assessment/assessment.ts        |  4 ++--
 .../mod/workshop/components/phase/phase.ts     |  2 +-
 src/addons/notes/components/add/add-modal.ts   |  4 ++--
 src/core/classes/tabs.ts                       |  2 +-
 src/core/components/combobox/combobox.ts       |  2 +-
 src/core/components/loading/loading.ts         |  2 +-
 src/core/components/user-avatar/user-avatar.ts |  4 ++--
 .../features/rating/components/rate/rate.ts    | 18 +++++++++---------
 .../rating/components/ratings/ratings.ts       | 14 +++++++-------
 .../search/components/search-box/search-box.ts |  4 ++--
 11 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/addons/mod/book/components/toc/toc.ts b/src/addons/mod/book/components/toc/toc.ts
index dc3bf5c3b..ed38ca1aa 100644
--- a/src/addons/mod/book/components/toc/toc.ts
+++ b/src/addons/mod/book/components/toc/toc.ts
@@ -34,7 +34,7 @@ export class AddonModBookTocComponent implements OnInit {
     addPadding = true;
     showBullets = false;
 
-    @Input() protected book?: AddonModBookBookWSData;
+    @Input() book?: AddonModBookBookWSData;
 
     /**
      * Component loaded.
diff --git a/src/addons/mod/workshop/components/assessment/assessment.ts b/src/addons/mod/workshop/components/assessment/assessment.ts
index 42fc54af1..f165e0105 100644
--- a/src/addons/mod/workshop/components/assessment/assessment.ts
+++ b/src/addons/mod/workshop/components/assessment/assessment.ts
@@ -40,8 +40,8 @@ export class AddonModWorkshopAssessmentComponent implements OnInit {
     @Input() courseId!: number;
     @Input() workshop!: AddonModWorkshopData;
     @Input() access!: AddonModWorkshopGetWorkshopAccessInformationWSResponse;
-    @Input() protected submission!: AddonModWorkshopSubmissionDataWithOfflineData;
-    @Input() protected module!: CoreCourseModule;
+    @Input() submission!: AddonModWorkshopSubmissionDataWithOfflineData;
+    @Input() module!: CoreCourseModule;
 
     canViewAssessment = false;
     canSelfAssess = false;
diff --git a/src/addons/mod/workshop/components/phase/phase.ts b/src/addons/mod/workshop/components/phase/phase.ts
index 1e4976d40..cc5285630 100644
--- a/src/addons/mod/workshop/components/phase/phase.ts
+++ b/src/addons/mod/workshop/components/phase/phase.ts
@@ -28,7 +28,7 @@ export class AddonModWorkshopPhaseInfoComponent implements OnInit {
     @Input() phases!: AddonModWorkshopPhaseDataWithSwitch[];
     @Input() workshopPhase!: AddonModWorkshopPhase;
     @Input() showSubmit = false;
-    @Input() protected externalUrl!: string;
+    @Input() externalUrl!: string;
 
     ngOnInit(): void {
 
diff --git a/src/addons/notes/components/add/add-modal.ts b/src/addons/notes/components/add/add-modal.ts
index 8583ce871..46b38c524 100644
--- a/src/addons/notes/components/add/add-modal.ts
+++ b/src/addons/notes/components/add/add-modal.ts
@@ -30,8 +30,8 @@ export class AddonNotesAddComponent {
 
     @ViewChild('itemEdit') formElement?: ElementRef;
 
-    @Input() protected courseId!: number;
-    @Input() protected userId?: number;
+    @Input() courseId!: number;
+    @Input() userId?: number;
     @Input() type: AddonNotesPublishState = 'personal';
     text = '';
     processing = false;
diff --git a/src/core/classes/tabs.ts b/src/core/classes/tabs.ts
index 285a47660..575f4c653 100644
--- a/src/core/classes/tabs.ts
+++ b/src/core/classes/tabs.ts
@@ -46,7 +46,7 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
     // Max height that allows tab hiding.
     protected static readonly MAX_HEIGHT_TO_HIDE_TABS = 768;
 
-    @Input() protected selectedIndex = 0; // Index of the tab to select.
+    @Input() selectedIndex = 0; // Index of the tab to select.
     @Input() hideUntil = false; // Determine when should the contents be shown.
     @Output() protected ionChange = new EventEmitter<T>(); // Emitted when the tab changes.
 
diff --git a/src/core/components/combobox/combobox.ts b/src/core/components/combobox/combobox.ts
index 068e5c60e..617e6801d 100644
--- a/src/core/components/combobox/combobox.ts
+++ b/src/core/components/combobox/combobox.ts
@@ -51,7 +51,7 @@ export class CoreComboboxComponent {
 
     // Additional options when interface modal is selected.
     @Input() icon?: string; // Icon for modal interface.
-    @Input() protected modalOptions?: ModalOptions; // Will emit an event the value changed.
+    @Input() modalOptions?: ModalOptions; // Will emit an event the value changed.
     @Input() listboxId = '';
 
     expanded = false;
diff --git a/src/core/components/loading/loading.ts b/src/core/components/loading/loading.ts
index 21aa0b8b5..a0254ee8b 100644
--- a/src/core/components/loading/loading.ts
+++ b/src/core/components/loading/loading.ts
@@ -49,7 +49,7 @@ export class CoreLoadingComponent implements OnInit, OnChanges, AfterViewInit {
 
     @Input() hideUntil: unknown; // Determine when should the contents be shown.
     @Input() message?: string; // Message to show while loading.
-    @Input() protected fullscreen = true; // Use the whole screen.
+    @Input() fullscreen = true; // Use the whole screen.
 
     @ViewChild('content') content?: ElementRef;
 
diff --git a/src/core/components/user-avatar/user-avatar.ts b/src/core/components/user-avatar/user-avatar.ts
index 28815d4b4..e450fe45c 100644
--- a/src/core/components/user-avatar/user-avatar.ts
+++ b/src/core/components/user-avatar/user-avatar.ts
@@ -38,8 +38,8 @@ export class CoreUserAvatarComponent implements OnInit, OnChanges, OnDestroy {
     @Input() profileUrl?: string;
     @Input() linkProfile = true; // Avoid linking to the profile if wanted.
     @Input() fullname?: string;
-    @Input() protected userId?: number; // If provided or found it will be used to link the image to the profile.
-    @Input() protected courseId?: number;
+    @Input() userId?: number; // If provided or found it will be used to link the image to the profile.
+    @Input() courseId?: number;
     @Input() checkOnline = false; // If want to check and show online status.
     @Input() extraIcon?: string; // Extra icon to show near the avatar.
 
diff --git a/src/core/features/rating/components/rate/rate.ts b/src/core/features/rating/components/rate/rate.ts
index 4a94297fe..07f7ee309 100644
--- a/src/core/features/rating/components/rate/rate.ts
+++ b/src/core/features/rating/components/rate/rate.ts
@@ -36,15 +36,15 @@ import { CoreEventObserver, CoreEvents } from '@singletons/events';
 })
 export class CoreRatingRateComponent implements OnChanges, OnDestroy {
 
-    @Input() protected ratingInfo!: CoreRatingInfo;
-    @Input() protected contextLevel!: ContextLevel; // Context level: course, module, user, etc.
-    @Input() protected instanceId!: number; // Context instance id.
-    @Input() protected itemId!: number; // Item id. Example: forum post id.
-    @Input() protected itemSetId!: number; // Item set id. Example: forum discussion id.
-    @Input() protected courseId!: number;
-    @Input() protected aggregateMethod!: number;
-    @Input() protected scaleId!: number;
-    @Input() protected userId!: number;
+    @Input() ratingInfo!: CoreRatingInfo;
+    @Input() contextLevel!: ContextLevel; // Context level: course, module, user, etc.
+    @Input() instanceId!: number; // Context instance id.
+    @Input() itemId!: number; // Item id. Example: forum post id.
+    @Input() itemSetId!: number; // Item set id. Example: forum discussion id.
+    @Input() courseId!: number;
+    @Input() aggregateMethod!: number;
+    @Input() scaleId!: number;
+    @Input() userId!: number;
     @Output() protected onLoading: EventEmitter<boolean>; // Eevent that indicates whether the component is loading data.
     @Output() protected onUpdate: EventEmitter<void>; // Event emitted when the rating is updated online.
 
diff --git a/src/core/features/rating/components/ratings/ratings.ts b/src/core/features/rating/components/ratings/ratings.ts
index 82fae1a91..5e938cb7a 100644
--- a/src/core/features/rating/components/ratings/ratings.ts
+++ b/src/core/features/rating/components/ratings/ratings.ts
@@ -26,13 +26,13 @@ import { ModalController } from '@singletons';
 })
 export class CoreRatingRatingsComponent implements OnInit {
 
-    @Input() protected contextLevel!: ContextLevel;
-    @Input() protected instanceId!: number;
-    @Input() protected ratingComponent!: string;
-    @Input() protected ratingArea!: string;
-    @Input() protected aggregateMethod!: number;
-    @Input() protected itemId!: number;
-    @Input() protected scaleId!: number;
+    @Input() contextLevel!: ContextLevel;
+    @Input() instanceId!: number;
+    @Input() ratingComponent!: string;
+    @Input() ratingArea!: string;
+    @Input() aggregateMethod!: number;
+    @Input() itemId!: number;
+    @Input() scaleId!: number;
     @Input() courseId!: number;
 
     loaded = false;
diff --git a/src/core/features/search/components/search-box/search-box.ts b/src/core/features/search/components/search-box/search-box.ts
index 9be520e24..5270c4f1b 100644
--- a/src/core/features/search/components/search-box/search-box.ts
+++ b/src/core/features/search/components/search-box/search-box.ts
@@ -46,12 +46,12 @@ export class CoreSearchBoxComponent implements OnInit {
     @Input() lengthCheck = 3; // Check value length before submit. If 0, any string will be submitted.
     @Input() showClear = true; // Show/hide clear button.
     @Input() disabled = false; // Disables the input text.
-    @Input() protected initialSearch = ''; // Initial search text.
+    @Input() initialSearch = ''; // Initial search text.
 
     /* If provided. It will save and display a history of searches for this particular Id.
      * To use different history lists, place different Id.
      * I.e. AddonMessagesContacts or CoreUserParticipants-6 (using the course Id).*/
-    @Input() protected searchArea = '';
+    @Input() searchArea = '';
 
     @Output() onSubmit: EventEmitter<string>; // Send data when submitting the search form.
     @Output() onClear: EventEmitter<void>; // Send event when clearing the search form.

From 5257117ea11a76b13eeac97fc02fe3874a871f68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 5 Aug 2021 08:37:38 +0200
Subject: [PATCH 0033/1008] MOBILE-3833 lint: One dependency will cause one
 compat error

It's not an error itself but it's detected as it on core-js:

https://github.com/zloirock/core-js/blob/master/packages/core-js/internals/regexp-unsupported-ncg.js
---
 .github/workflows/testing.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 4f326a88b..6f4d342ac 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -58,4 +58,4 @@ jobs:
     - name: Production builds
       run: npm run build:prod
     - name: JavaScript code compatibility
-      run: result=$(npx check-es-compat www/*.js 2> /dev/null | grep -v -E "Array\.prototype\.includes|Promise\.prototype\.finally|String\.prototype\.(matchAll|trimRight)|globalThis" | grep -Po "(?<=error).*?(?=\s+ecmascript)" | wc -l); test $result -eq 0
+      run: result=$(npx check-es-compat www/*.js 2> /dev/null | grep -v -E "Array\.prototype\.includes|Promise\.prototype\.finally|String\.prototype\.(matchAll|trimRight)|globalThis" | grep -Po "(?<=error).*?(?=\s+ecmascript)" | wc -l); test $result -eq 1

From c34d75acdb644995ee0654405528cd04f982b95d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 6 Aug 2021 10:28:52 +0200
Subject: [PATCH 0034/1008] MOBILE-3792 config: Fix angular version on ionic
 angular toolkit

---
 package-lock.json | 1363 +++++----------------------------------------
 package.json      |    2 +-
 2 files changed, 125 insertions(+), 1240 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 90bb4c731..628db367c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -110,7 +110,7 @@
         "@angular/compiler": "~11.2.14",
         "@angular/compiler-cli": "~11.2.14",
         "@angular/language-service": "~11.2.14",
-        "@ionic/angular-toolkit": "^4.0.0",
+        "@ionic/angular-toolkit": "^3.1.1",
         "@ionic/cli": "^6.14.1",
         "@types/faker": "^5.1.3",
         "@types/jest": "^26.0.24",
@@ -153,27 +153,25 @@
       }
     },
     "node_modules/@angular-devkit/architect": {
-      "version": "0.1200.5",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1200.5.tgz",
-      "integrity": "sha512-222VZ4OeaDK3vON8V5m+w15SRWfUs5uOb4H9ij/H9/6tyHD83uWfCDoOGg+ax4wJVdWEFJIS+Vn4ijGcZCq9WQ==",
+      "version": "0.1102.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.14.tgz",
+      "integrity": "sha512-965TVXuBtRb8RySgxRxUEO+YTd7mT0xiqVHSe+MHvMtUCmEE9vwRofFZl6axkK5ri4fiomiMnOVE19aw4spgNQ==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "@angular-devkit/core": "12.0.5",
-        "rxjs": "6.6.7"
+        "@angular-devkit/core": "11.2.14",
+        "rxjs": "6.6.3"
       },
       "engines": {
-        "node": "^12.14.1 || >=14.0.0",
+        "node": ">= 10.13.0",
         "npm": "^6.11.0 || ^7.5.6",
         "yarn": ">= 1.13.0"
       }
     },
     "node_modules/@angular-devkit/architect/node_modules/rxjs": {
-      "version": "6.6.7",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+      "version": "6.6.3",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
+      "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "tslib": "^1.9.0"
       },
@@ -185,8 +183,7 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "node_modules/@angular-devkit/build-angular": {
       "version": "0.1102.14",
@@ -308,55 +305,6 @@
         }
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/architect": {
-      "version": "0.1102.14",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.14.tgz",
-      "integrity": "sha512-965TVXuBtRb8RySgxRxUEO+YTd7mT0xiqVHSe+MHvMtUCmEE9vwRofFZl6axkK5ri4fiomiMnOVE19aw4spgNQ==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/core": "11.2.14",
-        "rxjs": "6.6.3"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": "^6.11.0 || ^7.5.6",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/core": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
-      "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "6.12.6",
-        "fast-json-stable-stringify": "2.1.0",
-        "magic-string": "0.25.7",
-        "rxjs": "6.6.3",
-        "source-map": "0.7.3"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": "^6.11.0 || ^7.5.6",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
     "node_modules/@angular-devkit/build-angular/node_modules/core-js": {
       "version": "3.8.3",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.8.3.tgz",
@@ -368,12 +316,6 @@
         "url": "https://opencollective.com/core-js"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
     "node_modules/@angular-devkit/build-angular/node_modules/rxjs": {
       "version": "6.6.3",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
@@ -452,61 +394,6 @@
         "webpack-dev-server": "^3.1.4"
       }
     },
-    "node_modules/@angular-devkit/build-webpack/node_modules/@angular-devkit/architect": {
-      "version": "0.1102.14",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.14.tgz",
-      "integrity": "sha512-965TVXuBtRb8RySgxRxUEO+YTd7mT0xiqVHSe+MHvMtUCmEE9vwRofFZl6axkK5ri4fiomiMnOVE19aw4spgNQ==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/core": "11.2.14",
-        "rxjs": "6.6.3"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": "^6.11.0 || ^7.5.6",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@angular-devkit/build-webpack/node_modules/@angular-devkit/core": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
-      "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "6.12.6",
-        "fast-json-stable-stringify": "2.1.0",
-        "magic-string": "0.25.7",
-        "rxjs": "6.6.3",
-        "source-map": "0.7.3"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": "^6.11.0 || ^7.5.6",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@angular-devkit/build-webpack/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/@angular-devkit/build-webpack/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
     "node_modules/@angular-devkit/build-webpack/node_modules/rxjs": {
       "version": "6.6.3",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
@@ -526,31 +413,50 @@
       "dev": true
     },
     "node_modules/@angular-devkit/core": {
-      "version": "12.0.5",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-12.0.5.tgz",
-      "integrity": "sha512-zVSQV+8/vjUjsUKGlj8Kf5LioA6AXJTGI0yhHW9q1dFX4dPpbW63k0R1UoIB2wJ0F/AbYVgpnPGPe9BBm2fvZA==",
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
+      "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "ajv": "8.2.0",
-        "ajv-formats": "2.0.2",
+        "ajv": "6.12.6",
         "fast-json-stable-stringify": "2.1.0",
         "magic-string": "0.25.7",
-        "rxjs": "6.6.7",
+        "rxjs": "6.6.3",
         "source-map": "0.7.3"
       },
       "engines": {
-        "node": "^12.14.1 || >=14.0.0",
+        "node": ">= 10.13.0",
         "npm": "^6.11.0 || ^7.5.6",
         "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@angular-devkit/core/node_modules/rxjs": {
-      "version": "6.6.7",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+    "node_modules/@angular-devkit/core/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@angular-devkit/core/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/@angular-devkit/core/node_modules/rxjs": {
+      "version": "6.6.3",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
+      "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "tslib": "^1.9.0"
       },
@@ -562,156 +468,28 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "node_modules/@angular-devkit/schematics": {
-      "version": "12.1.4",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.1.4.tgz",
-      "integrity": "sha512-yD3y3pK/K5piOgvALFoCCiPp4H8emNa3yZL+vlpEpewVLpF1MM55LeTxc0PI5s0uqtOGVnvcbA5wYgMm3YsUEA==",
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.14.tgz",
+      "integrity": "sha512-Ol6+0qdGKzuVJm5gCtQr47X0OCihTfAxI4h047cHYhPFIGGPSvkG/QeJMZugflgoobi2k/xcYokOu/VAkRtWbQ==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "12.1.4",
-        "ora": "5.4.1",
-        "rxjs": "6.6.7"
+        "@angular-devkit/core": "11.2.14",
+        "ora": "5.3.0",
+        "rxjs": "6.6.3"
       },
       "engines": {
-        "node": "^12.14.1 || >=14.0.0",
+        "node": ">= 10.13.0",
         "npm": "^6.11.0 || ^7.5.6",
         "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@angular-devkit/schematics/node_modules/@angular-devkit/core": {
-      "version": "12.1.4",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-12.1.4.tgz",
-      "integrity": "sha512-KOzGD8JbP/7EeUwPiU5x+fo3ZEQ5R4IVW5WoH92PaO3mdpqXC7UL2MWLct8PUe9il9nqJMvrBMldSSvP9PCT2w==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "8.6.0",
-        "ajv-formats": "2.1.0",
-        "fast-json-stable-stringify": "2.1.0",
-        "magic-string": "0.25.7",
-        "rxjs": "6.6.7",
-        "source-map": "0.7.3"
-      },
-      "engines": {
-        "node": "^12.14.1 || >=14.0.0",
-        "npm": "^6.11.0 || ^7.5.6",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@angular-devkit/schematics/node_modules/ajv": {
-      "version": "8.6.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz",
-      "integrity": "sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/@angular-devkit/schematics/node_modules/ajv-formats": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.0.tgz",
-      "integrity": "sha512-USH2jBb+C/hIpwD2iRjp0pe0k+MvzG0mlSn/FIdCgQhUb9ALPRjt2KIQdfZDS9r0ZIeUAg7gOu9KL0PFqGqr5Q==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "ajv": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-devkit/schematics/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@angular-devkit/schematics/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@angular-devkit/schematics/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@angular-devkit/schematics/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@angular-devkit/schematics/node_modules/ora": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
-      "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
-      "dev": true,
-      "dependencies": {
-        "bl": "^4.1.0",
-        "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-spinners": "^2.5.0",
-        "is-interactive": "^1.0.0",
-        "is-unicode-supported": "^0.1.0",
-        "log-symbols": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "wcwidth": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/@angular-devkit/schematics/node_modules/rxjs": {
-      "version": "6.6.7",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+      "version": "6.6.3",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
+      "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
       "dev": true,
       "dependencies": {
         "tslib": "^1.9.0"
@@ -720,18 +498,6 @@
         "npm": ">=2.0.0"
       }
     },
-    "node_modules/@angular-devkit/schematics/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@angular-devkit/schematics/node_modules/tslib": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
@@ -860,101 +626,12 @@
         "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@angular/cli/node_modules/@angular-devkit/architect": {
-      "version": "0.1102.14",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.14.tgz",
-      "integrity": "sha512-965TVXuBtRb8RySgxRxUEO+YTd7mT0xiqVHSe+MHvMtUCmEE9vwRofFZl6axkK5ri4fiomiMnOVE19aw4spgNQ==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/core": "11.2.14",
-        "rxjs": "6.6.3"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": "^6.11.0 || ^7.5.6",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/@angular-devkit/core": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
-      "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "6.12.6",
-        "fast-json-stable-stringify": "2.1.0",
-        "magic-string": "0.25.7",
-        "rxjs": "6.6.3",
-        "source-map": "0.7.3"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": "^6.11.0 || ^7.5.6",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/@angular-devkit/schematics": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.14.tgz",
-      "integrity": "sha512-Ol6+0qdGKzuVJm5gCtQr47X0OCihTfAxI4h047cHYhPFIGGPSvkG/QeJMZugflgoobi2k/xcYokOu/VAkRtWbQ==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/core": "11.2.14",
-        "ora": "5.3.0",
-        "rxjs": "6.6.3"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": "^6.11.0 || ^7.5.6",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
     "node_modules/@angular/cli/node_modules/jsonc-parser": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
       "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==",
       "dev": true
     },
-    "node_modules/@angular/cli/node_modules/rxjs": {
-      "version": "6.6.3",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
-      "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^1.9.0"
-      },
-      "engines": {
-        "npm": ">=2.0.0"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
-    },
     "node_modules/@angular/common": {
       "version": "11.2.14",
       "resolved": "https://registry.npmjs.org/@angular/common/-/common-11.2.14.tgz",
@@ -3191,12 +2868,12 @@
       }
     },
     "node_modules/@ionic/angular-toolkit": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@ionic/angular-toolkit/-/angular-toolkit-4.0.0.tgz",
-      "integrity": "sha512-HGRAGUtc1YSwNZ/Q7X7c2QRyYM2AfsSm++OasPrMo3LnPRVr8OIsUih2ithEU7f3CXrViUR7j/Anu90zGsRgzg==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@ionic/angular-toolkit/-/angular-toolkit-3.1.1.tgz",
+      "integrity": "sha512-/z3vwVcEBvvZ86AV0pXOhN3mc+ftxKlAWgFyuQOY7O1kO4+xfzaa401dvCrFEbgUQOLH07hjnyG0ufkID7WyLA==",
       "dev": true,
       "dependencies": {
-        "@schematics/angular": "^12.0.0",
+        "@schematics/angular": "^11.2.4",
         "cheerio": "1.0.0-rc.3",
         "colorette": "1.1.0",
         "copy-webpack-plugin": "^6.2.1",
@@ -3205,102 +2882,12 @@
         "ws": "^7.0.1"
       },
       "peerDependencies": {
-        "@angular-devkit/architect": "^0.1200.0",
-        "@angular-devkit/schematics": "^12.0.0"
+        "@angular-devkit/architect": "^0.1102.4",
+        "@angular-devkit/build-angular": "^0.1102.4",
+        "@angular-devkit/core": "^11.2.4",
+        "@angular-devkit/schematics": "^11.2.4"
       }
     },
-    "node_modules/@ionic/angular-toolkit/node_modules/@angular-devkit/core": {
-      "version": "12.1.4",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-12.1.4.tgz",
-      "integrity": "sha512-KOzGD8JbP/7EeUwPiU5x+fo3ZEQ5R4IVW5WoH92PaO3mdpqXC7UL2MWLct8PUe9il9nqJMvrBMldSSvP9PCT2w==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "8.6.0",
-        "ajv-formats": "2.1.0",
-        "fast-json-stable-stringify": "2.1.0",
-        "magic-string": "0.25.7",
-        "rxjs": "6.6.7",
-        "source-map": "0.7.3"
-      },
-      "engines": {
-        "node": "^12.14.1 || >=14.0.0",
-        "npm": "^6.11.0 || ^7.5.6",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@ionic/angular-toolkit/node_modules/@schematics/angular": {
-      "version": "12.1.4",
-      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-12.1.4.tgz",
-      "integrity": "sha512-xGqgGI6GWk4EFdKis8FmSESxoLgjnLQbaRE1t1KZCkSKJzqkOj0R9wiDrtZfcrbPxIkLL+3fAk2ThwwPznT6yw==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/core": "12.1.4",
-        "@angular-devkit/schematics": "12.1.4",
-        "jsonc-parser": "3.0.0"
-      },
-      "engines": {
-        "node": "^12.14.1 || >=14.0.0",
-        "npm": "^6.11.0 || ^7.5.6",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@ionic/angular-toolkit/node_modules/ajv": {
-      "version": "8.6.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz",
-      "integrity": "sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/@ionic/angular-toolkit/node_modules/ajv-formats": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.0.tgz",
-      "integrity": "sha512-USH2jBb+C/hIpwD2iRjp0pe0k+MvzG0mlSn/FIdCgQhUb9ALPRjt2KIQdfZDS9r0ZIeUAg7gOu9KL0PFqGqr5Q==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "ajv": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@ionic/angular-toolkit/node_modules/jsonc-parser": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
-      "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==",
-      "dev": true
-    },
-    "node_modules/@ionic/angular-toolkit/node_modules/rxjs": {
-      "version": "6.6.7",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^1.9.0"
-      },
-      "engines": {
-        "npm": ">=2.0.0"
-      }
-    },
-    "node_modules/@ionic/angular-toolkit/node_modules/rxjs/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
-    },
     "node_modules/@ionic/angular/node_modules/tslib": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
@@ -4578,64 +4165,6 @@
         "webpack": "^4.0.0"
       }
     },
-    "node_modules/@ngtools/webpack/node_modules/@angular-devkit/core": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
-      "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "6.12.6",
-        "fast-json-stable-stringify": "2.1.0",
-        "magic-string": "0.25.7",
-        "rxjs": "6.6.3",
-        "source-map": "0.7.3"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": "^6.11.0 || ^7.5.6",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@ngtools/webpack/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/@ngtools/webpack/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/@ngtools/webpack/node_modules/rxjs": {
-      "version": "6.6.3",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
-      "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^1.9.0"
-      },
-      "engines": {
-        "npm": ">=2.0.0"
-      }
-    },
-    "node_modules/@ngtools/webpack/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
-    },
     "node_modules/@ngx-translate/core": {
       "version": "13.0.0",
       "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-13.0.0.tgz",
@@ -4867,86 +4396,12 @@
         "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@schematics/angular/node_modules/@angular-devkit/core": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
-      "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "6.12.6",
-        "fast-json-stable-stringify": "2.1.0",
-        "magic-string": "0.25.7",
-        "rxjs": "6.6.3",
-        "source-map": "0.7.3"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": "^6.11.0 || ^7.5.6",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@schematics/angular/node_modules/@angular-devkit/schematics": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.14.tgz",
-      "integrity": "sha512-Ol6+0qdGKzuVJm5gCtQr47X0OCihTfAxI4h047cHYhPFIGGPSvkG/QeJMZugflgoobi2k/xcYokOu/VAkRtWbQ==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/core": "11.2.14",
-        "ora": "5.3.0",
-        "rxjs": "6.6.3"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": "^6.11.0 || ^7.5.6",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@schematics/angular/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/@schematics/angular/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
     "node_modules/@schematics/angular/node_modules/jsonc-parser": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
       "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==",
       "dev": true
     },
-    "node_modules/@schematics/angular/node_modules/rxjs": {
-      "version": "6.6.3",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
-      "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^1.9.0"
-      },
-      "engines": {
-        "npm": ">=2.0.0"
-      }
-    },
-    "node_modules/@schematics/angular/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
-    },
     "node_modules/@schematics/update": {
       "version": "0.1102.14",
       "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.1102.14.tgz",
@@ -4968,80 +4423,6 @@
         "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@schematics/update/node_modules/@angular-devkit/core": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
-      "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "6.12.6",
-        "fast-json-stable-stringify": "2.1.0",
-        "magic-string": "0.25.7",
-        "rxjs": "6.6.3",
-        "source-map": "0.7.3"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": "^6.11.0 || ^7.5.6",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@schematics/update/node_modules/@angular-devkit/schematics": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.14.tgz",
-      "integrity": "sha512-Ol6+0qdGKzuVJm5gCtQr47X0OCihTfAxI4h047cHYhPFIGGPSvkG/QeJMZugflgoobi2k/xcYokOu/VAkRtWbQ==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/core": "11.2.14",
-        "ora": "5.3.0",
-        "rxjs": "6.6.3"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": "^6.11.0 || ^7.5.6",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@schematics/update/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/@schematics/update/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/@schematics/update/node_modules/rxjs": {
-      "version": "6.6.3",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
-      "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^1.9.0"
-      },
-      "engines": {
-        "npm": ">=2.0.0"
-      }
-    },
-    "node_modules/@schematics/update/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
-    },
     "node_modules/@sindresorhus/is": {
       "version": "0.14.0",
       "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
@@ -6068,24 +5449,6 @@
         "ajv": ">=5.0.0"
       }
     },
-    "node_modules/ajv-formats": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.0.2.tgz",
-      "integrity": "sha512-Brah4Uo5/U8v76c6euTwtjVFFaVishwnJrQBYpev1JRh4vjA1F4HY3UzQez41YUCszUCXKagG8v6eVRBHV1gkw==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "ajv": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/alphanum-sort": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
@@ -22836,13 +22199,13 @@
       }
     },
     "node_modules/plist": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.2.tgz",
-      "integrity": "sha512-MSrkwZBdQ6YapHy87/8hDU8MnIcyxBKjeF+McXnr5A9MtffPewTs7G3hlpodT5TacyfIyFTaJEhh3GGcmasTgQ==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.3.tgz",
+      "integrity": "sha512-ghdOKN99hh1oEmAlwBmPYo4L+tSQ7O3jRpkhWqOrMz86CWotpVzMevvQ+czo7oPDpOZyA6K06Ci7QVHpoh9gaA==",
       "dependencies": {
         "base64-js": "^1.5.1",
         "xmlbuilder": "^9.0.7",
-        "xmldom": "^0.5.0"
+        "xmldom": "^0.6.0"
       },
       "engines": {
         "node": ">=6"
@@ -31231,9 +30594,9 @@
       "dev": true
     },
     "node_modules/xmldom": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.5.0.tgz",
-      "integrity": "sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA==",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.6.0.tgz",
+      "integrity": "sha512-iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg==",
       "engines": {
         "node": ">=10.0.0"
       }
@@ -31345,22 +30708,20 @@
   },
   "dependencies": {
     "@angular-devkit/architect": {
-      "version": "0.1200.5",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1200.5.tgz",
-      "integrity": "sha512-222VZ4OeaDK3vON8V5m+w15SRWfUs5uOb4H9ij/H9/6tyHD83uWfCDoOGg+ax4wJVdWEFJIS+Vn4ijGcZCq9WQ==",
+      "version": "0.1102.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.14.tgz",
+      "integrity": "sha512-965TVXuBtRb8RySgxRxUEO+YTd7mT0xiqVHSe+MHvMtUCmEE9vwRofFZl6axkK5ri4fiomiMnOVE19aw4spgNQ==",
       "dev": true,
-      "peer": true,
       "requires": {
-        "@angular-devkit/core": "12.0.5",
-        "rxjs": "6.6.7"
+        "@angular-devkit/core": "11.2.14",
+        "rxjs": "6.6.3"
       },
       "dependencies": {
         "rxjs": {
-          "version": "6.6.7",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-          "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+          "version": "6.6.3",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
+          "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
           "dev": true,
-          "peer": true,
           "requires": {
             "tslib": "^1.9.0"
           }
@@ -31369,8 +30730,7 @@
           "version": "1.14.1",
           "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
           "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-          "dev": true,
-          "peer": true
+          "dev": true
         }
       }
     },
@@ -31455,53 +30815,12 @@
         "worker-plugin": "5.0.0"
       },
       "dependencies": {
-        "@angular-devkit/architect": {
-          "version": "0.1102.14",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.14.tgz",
-          "integrity": "sha512-965TVXuBtRb8RySgxRxUEO+YTd7mT0xiqVHSe+MHvMtUCmEE9vwRofFZl6axkK5ri4fiomiMnOVE19aw4spgNQ==",
-          "dev": true,
-          "requires": {
-            "@angular-devkit/core": "11.2.14",
-            "rxjs": "6.6.3"
-          }
-        },
-        "@angular-devkit/core": {
-          "version": "11.2.14",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
-          "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
-          "dev": true,
-          "requires": {
-            "ajv": "6.12.6",
-            "fast-json-stable-stringify": "2.1.0",
-            "magic-string": "0.25.7",
-            "rxjs": "6.6.3",
-            "source-map": "0.7.3"
-          }
-        },
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
         "core-js": {
           "version": "3.8.3",
           "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.8.3.tgz",
           "integrity": "sha512-KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q==",
           "dev": true
         },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        },
         "rxjs": {
           "version": "6.6.3",
           "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
@@ -31557,29 +30876,36 @@
         "rxjs": "6.6.3"
       },
       "dependencies": {
-        "@angular-devkit/architect": {
-          "version": "0.1102.14",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.14.tgz",
-          "integrity": "sha512-965TVXuBtRb8RySgxRxUEO+YTd7mT0xiqVHSe+MHvMtUCmEE9vwRofFZl6axkK5ri4fiomiMnOVE19aw4spgNQ==",
+        "rxjs": {
+          "version": "6.6.3",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
+          "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
           "dev": true,
           "requires": {
-            "@angular-devkit/core": "11.2.14",
-            "rxjs": "6.6.3"
-          }
-        },
-        "@angular-devkit/core": {
-          "version": "11.2.14",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
-          "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
-          "dev": true,
-          "requires": {
-            "ajv": "6.12.6",
-            "fast-json-stable-stringify": "2.1.0",
-            "magic-string": "0.25.7",
-            "rxjs": "6.6.3",
-            "source-map": "0.7.3"
+            "tslib": "^1.9.0"
           }
         },
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+          "dev": true
+        }
+      }
+    },
+    "@angular-devkit/core": {
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
+      "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
+      "dev": true,
+      "requires": {
+        "ajv": "6.12.6",
+        "fast-json-stable-stringify": "2.1.0",
+        "magic-string": "0.25.7",
+        "rxjs": "6.6.3",
+        "source-map": "0.7.3"
+      },
+      "dependencies": {
         "ajv": {
           "version": "6.12.6",
           "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -31615,155 +30941,26 @@
         }
       }
     },
-    "@angular-devkit/core": {
-      "version": "12.0.5",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-12.0.5.tgz",
-      "integrity": "sha512-zVSQV+8/vjUjsUKGlj8Kf5LioA6AXJTGI0yhHW9q1dFX4dPpbW63k0R1UoIB2wJ0F/AbYVgpnPGPe9BBm2fvZA==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "ajv": "8.2.0",
-        "ajv-formats": "2.0.2",
-        "fast-json-stable-stringify": "2.1.0",
-        "magic-string": "0.25.7",
-        "rxjs": "6.6.7",
-        "source-map": "0.7.3"
-      },
-      "dependencies": {
-        "rxjs": {
-          "version": "6.6.7",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-          "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "tslib": "^1.9.0"
-          }
-        },
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-          "dev": true,
-          "peer": true
-        }
-      }
-    },
     "@angular-devkit/schematics": {
-      "version": "12.1.4",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.1.4.tgz",
-      "integrity": "sha512-yD3y3pK/K5piOgvALFoCCiPp4H8emNa3yZL+vlpEpewVLpF1MM55LeTxc0PI5s0uqtOGVnvcbA5wYgMm3YsUEA==",
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.14.tgz",
+      "integrity": "sha512-Ol6+0qdGKzuVJm5gCtQr47X0OCihTfAxI4h047cHYhPFIGGPSvkG/QeJMZugflgoobi2k/xcYokOu/VAkRtWbQ==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "12.1.4",
-        "ora": "5.4.1",
-        "rxjs": "6.6.7"
+        "@angular-devkit/core": "11.2.14",
+        "ora": "5.3.0",
+        "rxjs": "6.6.3"
       },
       "dependencies": {
-        "@angular-devkit/core": {
-          "version": "12.1.4",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-12.1.4.tgz",
-          "integrity": "sha512-KOzGD8JbP/7EeUwPiU5x+fo3ZEQ5R4IVW5WoH92PaO3mdpqXC7UL2MWLct8PUe9il9nqJMvrBMldSSvP9PCT2w==",
-          "dev": true,
-          "requires": {
-            "ajv": "8.6.0",
-            "ajv-formats": "2.1.0",
-            "fast-json-stable-stringify": "2.1.0",
-            "magic-string": "0.25.7",
-            "rxjs": "6.6.7",
-            "source-map": "0.7.3"
-          }
-        },
-        "ajv": {
-          "version": "8.6.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz",
-          "integrity": "sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "json-schema-traverse": "^1.0.0",
-            "require-from-string": "^2.0.2",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "ajv-formats": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.0.tgz",
-          "integrity": "sha512-USH2jBb+C/hIpwD2iRjp0pe0k+MvzG0mlSn/FIdCgQhUb9ALPRjt2KIQdfZDS9r0ZIeUAg7gOu9KL0PFqGqr5Q==",
-          "dev": true,
-          "requires": {
-            "ajv": "^8.0.0"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "ora": {
-          "version": "5.4.1",
-          "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
-          "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
-          "dev": true,
-          "requires": {
-            "bl": "^4.1.0",
-            "chalk": "^4.1.0",
-            "cli-cursor": "^3.1.0",
-            "cli-spinners": "^2.5.0",
-            "is-interactive": "^1.0.0",
-            "is-unicode-supported": "^0.1.0",
-            "log-symbols": "^4.1.0",
-            "strip-ansi": "^6.0.0",
-            "wcwidth": "^1.0.1"
-          }
-        },
         "rxjs": {
-          "version": "6.6.7",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-          "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+          "version": "6.6.3",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
+          "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
           "dev": true,
           "requires": {
             "tslib": "^1.9.0"
           }
         },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
         "tslib": {
           "version": "1.14.1",
           "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
@@ -31859,78 +31056,11 @@
         "uuid": "8.3.2"
       },
       "dependencies": {
-        "@angular-devkit/architect": {
-          "version": "0.1102.14",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.14.tgz",
-          "integrity": "sha512-965TVXuBtRb8RySgxRxUEO+YTd7mT0xiqVHSe+MHvMtUCmEE9vwRofFZl6axkK5ri4fiomiMnOVE19aw4spgNQ==",
-          "dev": true,
-          "requires": {
-            "@angular-devkit/core": "11.2.14",
-            "rxjs": "6.6.3"
-          }
-        },
-        "@angular-devkit/core": {
-          "version": "11.2.14",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
-          "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
-          "dev": true,
-          "requires": {
-            "ajv": "6.12.6",
-            "fast-json-stable-stringify": "2.1.0",
-            "magic-string": "0.25.7",
-            "rxjs": "6.6.3",
-            "source-map": "0.7.3"
-          }
-        },
-        "@angular-devkit/schematics": {
-          "version": "11.2.14",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.14.tgz",
-          "integrity": "sha512-Ol6+0qdGKzuVJm5gCtQr47X0OCihTfAxI4h047cHYhPFIGGPSvkG/QeJMZugflgoobi2k/xcYokOu/VAkRtWbQ==",
-          "dev": true,
-          "requires": {
-            "@angular-devkit/core": "11.2.14",
-            "ora": "5.3.0",
-            "rxjs": "6.6.3"
-          }
-        },
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        },
         "jsonc-parser": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
           "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==",
           "dev": true
-        },
-        "rxjs": {
-          "version": "6.6.3",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
-          "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
-          "dev": true,
-          "requires": {
-            "tslib": "^1.9.0"
-          }
-        },
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-          "dev": true
         }
       }
     },
@@ -33530,89 +32660,18 @@
       }
     },
     "@ionic/angular-toolkit": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@ionic/angular-toolkit/-/angular-toolkit-4.0.0.tgz",
-      "integrity": "sha512-HGRAGUtc1YSwNZ/Q7X7c2QRyYM2AfsSm++OasPrMo3LnPRVr8OIsUih2ithEU7f3CXrViUR7j/Anu90zGsRgzg==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@ionic/angular-toolkit/-/angular-toolkit-3.1.1.tgz",
+      "integrity": "sha512-/z3vwVcEBvvZ86AV0pXOhN3mc+ftxKlAWgFyuQOY7O1kO4+xfzaa401dvCrFEbgUQOLH07hjnyG0ufkID7WyLA==",
       "dev": true,
       "requires": {
-        "@schematics/angular": "^12.0.0",
+        "@schematics/angular": "^11.2.4",
         "cheerio": "1.0.0-rc.3",
         "colorette": "1.1.0",
         "copy-webpack-plugin": "^6.2.1",
         "tapable": "^2.1.1",
         "tslib": "^2.0.3",
         "ws": "^7.0.1"
-      },
-      "dependencies": {
-        "@angular-devkit/core": {
-          "version": "12.1.4",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-12.1.4.tgz",
-          "integrity": "sha512-KOzGD8JbP/7EeUwPiU5x+fo3ZEQ5R4IVW5WoH92PaO3mdpqXC7UL2MWLct8PUe9il9nqJMvrBMldSSvP9PCT2w==",
-          "dev": true,
-          "requires": {
-            "ajv": "8.6.0",
-            "ajv-formats": "2.1.0",
-            "fast-json-stable-stringify": "2.1.0",
-            "magic-string": "0.25.7",
-            "rxjs": "6.6.7",
-            "source-map": "0.7.3"
-          }
-        },
-        "@schematics/angular": {
-          "version": "12.1.4",
-          "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-12.1.4.tgz",
-          "integrity": "sha512-xGqgGI6GWk4EFdKis8FmSESxoLgjnLQbaRE1t1KZCkSKJzqkOj0R9wiDrtZfcrbPxIkLL+3fAk2ThwwPznT6yw==",
-          "dev": true,
-          "requires": {
-            "@angular-devkit/core": "12.1.4",
-            "@angular-devkit/schematics": "12.1.4",
-            "jsonc-parser": "3.0.0"
-          }
-        },
-        "ajv": {
-          "version": "8.6.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz",
-          "integrity": "sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "json-schema-traverse": "^1.0.0",
-            "require-from-string": "^2.0.2",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "ajv-formats": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.0.tgz",
-          "integrity": "sha512-USH2jBb+C/hIpwD2iRjp0pe0k+MvzG0mlSn/FIdCgQhUb9ALPRjt2KIQdfZDS9r0ZIeUAg7gOu9KL0PFqGqr5Q==",
-          "dev": true,
-          "requires": {
-            "ajv": "^8.0.0"
-          }
-        },
-        "jsonc-parser": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
-          "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==",
-          "dev": true
-        },
-        "rxjs": {
-          "version": "6.6.7",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-          "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
-          "dev": true,
-          "requires": {
-            "tslib": "^1.9.0"
-          },
-          "dependencies": {
-            "tslib": {
-              "version": "1.14.1",
-              "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-              "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-              "dev": true
-            }
-          }
-        }
       }
     },
     "@ionic/cli": {
@@ -34516,54 +33575,6 @@
         "@angular-devkit/core": "11.2.14",
         "enhanced-resolve": "5.7.0",
         "webpack-sources": "2.2.0"
-      },
-      "dependencies": {
-        "@angular-devkit/core": {
-          "version": "11.2.14",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
-          "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
-          "dev": true,
-          "requires": {
-            "ajv": "6.12.6",
-            "fast-json-stable-stringify": "2.1.0",
-            "magic-string": "0.25.7",
-            "rxjs": "6.6.3",
-            "source-map": "0.7.3"
-          }
-        },
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        },
-        "rxjs": {
-          "version": "6.6.3",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
-          "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
-          "dev": true,
-          "requires": {
-            "tslib": "^1.9.0"
-          }
-        },
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-          "dev": true
-        }
       }
     },
     "@ngx-translate/core": {
@@ -34748,68 +33759,11 @@
         "jsonc-parser": "3.0.0"
       },
       "dependencies": {
-        "@angular-devkit/core": {
-          "version": "11.2.14",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
-          "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
-          "dev": true,
-          "requires": {
-            "ajv": "6.12.6",
-            "fast-json-stable-stringify": "2.1.0",
-            "magic-string": "0.25.7",
-            "rxjs": "6.6.3",
-            "source-map": "0.7.3"
-          }
-        },
-        "@angular-devkit/schematics": {
-          "version": "11.2.14",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.14.tgz",
-          "integrity": "sha512-Ol6+0qdGKzuVJm5gCtQr47X0OCihTfAxI4h047cHYhPFIGGPSvkG/QeJMZugflgoobi2k/xcYokOu/VAkRtWbQ==",
-          "dev": true,
-          "requires": {
-            "@angular-devkit/core": "11.2.14",
-            "ora": "5.3.0",
-            "rxjs": "6.6.3"
-          }
-        },
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        },
         "jsonc-parser": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
           "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==",
           "dev": true
-        },
-        "rxjs": {
-          "version": "6.6.3",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
-          "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
-          "dev": true,
-          "requires": {
-            "tslib": "^1.9.0"
-          }
-        },
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-          "dev": true
         }
       }
     },
@@ -34827,65 +33781,6 @@
         "pacote": "11.2.4",
         "semver": "7.3.4",
         "semver-intersect": "1.4.0"
-      },
-      "dependencies": {
-        "@angular-devkit/core": {
-          "version": "11.2.14",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
-          "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
-          "dev": true,
-          "requires": {
-            "ajv": "6.12.6",
-            "fast-json-stable-stringify": "2.1.0",
-            "magic-string": "0.25.7",
-            "rxjs": "6.6.3",
-            "source-map": "0.7.3"
-          }
-        },
-        "@angular-devkit/schematics": {
-          "version": "11.2.14",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.14.tgz",
-          "integrity": "sha512-Ol6+0qdGKzuVJm5gCtQr47X0OCihTfAxI4h047cHYhPFIGGPSvkG/QeJMZugflgoobi2k/xcYokOu/VAkRtWbQ==",
-          "dev": true,
-          "requires": {
-            "@angular-devkit/core": "11.2.14",
-            "ora": "5.3.0",
-            "rxjs": "6.6.3"
-          }
-        },
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        },
-        "rxjs": {
-          "version": "6.6.3",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
-          "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
-          "dev": true,
-          "requires": {
-            "tslib": "^1.9.0"
-          }
-        },
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-          "dev": true
-        }
       }
     },
     "@sindresorhus/is": {
@@ -35696,16 +34591,6 @@
       "dev": true,
       "requires": {}
     },
-    "ajv-formats": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.0.2.tgz",
-      "integrity": "sha512-Brah4Uo5/U8v76c6euTwtjVFFaVishwnJrQBYpev1JRh4vjA1F4HY3UzQez41YUCszUCXKagG8v6eVRBHV1gkw==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "ajv": "^8.0.0"
-      }
-    },
     "alphanum-sort": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
@@ -48683,13 +47568,13 @@
       }
     },
     "plist": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.2.tgz",
-      "integrity": "sha512-MSrkwZBdQ6YapHy87/8hDU8MnIcyxBKjeF+McXnr5A9MtffPewTs7G3hlpodT5TacyfIyFTaJEhh3GGcmasTgQ==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.3.tgz",
+      "integrity": "sha512-ghdOKN99hh1oEmAlwBmPYo4L+tSQ7O3jRpkhWqOrMz86CWotpVzMevvQ+czo7oPDpOZyA6K06Ci7QVHpoh9gaA==",
       "requires": {
         "base64-js": "^1.5.1",
         "xmlbuilder": "^9.0.7",
-        "xmldom": "^0.5.0"
+        "xmldom": "^0.6.0"
       }
     },
     "plugin-error": {
@@ -55198,9 +54083,9 @@
       "dev": true
     },
     "xmldom": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.5.0.tgz",
-      "integrity": "sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA=="
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.6.0.tgz",
+      "integrity": "sha512-iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg=="
     },
     "xregexp": {
       "version": "2.0.0",
diff --git a/package.json b/package.json
index a8b3508a6..dcebb3641 100644
--- a/package.json
+++ b/package.json
@@ -138,7 +138,7 @@
     "@angular/compiler": "~11.2.14",
     "@angular/compiler-cli": "~11.2.14",
     "@angular/language-service": "~11.2.14",
-    "@ionic/angular-toolkit": "^4.0.0",
+    "@ionic/angular-toolkit": "^3.1.1",
     "@ionic/cli": "^6.14.1",
     "@types/faker": "^5.1.3",
     "@types/jest": "^26.0.24",

From dbab0fa59484ff1bc5f0b47993850d2a70c64175 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 6 Aug 2021 11:26:31 +0200
Subject: [PATCH 0035/1008] MOBILE-3792 travis: Update android build tools

---
 .travis.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dd479ea5a..2f4764a55 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,6 @@ before_install:
   - npm --version
   - nvm --version
   - npm ci
-  - npm install npm@^6 -g
 
 before_script:
   - npx gulp
@@ -41,8 +40,8 @@ jobs:
       components:
       - tools
       - platform-tools
-      - build-tools-29.0.3
-      - android-29
+      - build-tools-30.0.2
+      - android-30
       - extra-google-google_play_services
       - extra-google-m2repository
       - extra-android-m2repository

From 560c4b2c7486e5f3dc1b6e58a1bc8e19c4e5e73a Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 6 Aug 2021 15:12:53 +0200
Subject: [PATCH 0036/1008] MOBILE-3799 h5p: Display '-' or '0' in empty
 columns

---
 .../mod/h5pactivity/pages/users-attempts/users-attempts.html  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.html b/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.html
index 15a9557e6..37ed87b63 100644
--- a/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.html
+++ b/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.html
@@ -45,14 +45,16 @@
                             <span *ngIf="user.attempts.length">
                                 {{ user.attempts[user.attempts.length - 1].timemodified | coreFormatDate:'strftimedatetimeshort' }}
                             </span>
+                            <span *ngIf="!user.attempts.length">-</span>
                         </ion-col>
                         <ion-col class="ion-text-center" size="2">
                             <span *ngIf="user.score !== undefined">
                                 {{ 'core.percentagenumber' | translate: {$a: user.score} }}
                             </span>
+                            <span *ngIf="user.score === undefined">-</span>
                         </ion-col>
                         <ion-col class="ion-text-center" size="2">
-                            <span *ngIf="user.attempts.length">{{user.attempts.length}}</span>
+                            {{user.attempts.length}}
                         </ion-col>
                     </ion-row>
                 </ion-label>

From 88710d7971f2dc5ced500839c20f7d2b5bfad549 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 9 Aug 2021 11:59:43 +0200
Subject: [PATCH 0037/1008] Revert "MOBILE-3792 travis: Update android build
 tools"

This reverts commit dbab0fa59484ff1bc5f0b47993850d2a70c64175.
---
 .travis.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2f4764a55..dd479ea5a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,6 +23,7 @@ before_install:
   - npm --version
   - nvm --version
   - npm ci
+  - npm install npm@^6 -g
 
 before_script:
   - npx gulp
@@ -40,8 +41,8 @@ jobs:
       components:
       - tools
       - platform-tools
-      - build-tools-30.0.2
-      - android-30
+      - build-tools-29.0.3
+      - android-29
       - extra-google-google_play_services
       - extra-google-m2repository
       - extra-android-m2repository

From 2d3345f16a9e3dac26e47e246899578f51ddc0d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 9 Aug 2021 11:59:50 +0200
Subject: [PATCH 0038/1008] Revert "MOBILE-3792 config: Fix angular version on
 ionic angular toolkit"

This reverts commit c34d75acdb644995ee0654405528cd04f982b95d.
---
 package-lock.json | 1363 ++++++++++++++++++++++++++++++++++++++++-----
 package.json      |    2 +-
 2 files changed, 1240 insertions(+), 125 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 628db367c..90bb4c731 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -110,7 +110,7 @@
         "@angular/compiler": "~11.2.14",
         "@angular/compiler-cli": "~11.2.14",
         "@angular/language-service": "~11.2.14",
-        "@ionic/angular-toolkit": "^3.1.1",
+        "@ionic/angular-toolkit": "^4.0.0",
         "@ionic/cli": "^6.14.1",
         "@types/faker": "^5.1.3",
         "@types/jest": "^26.0.24",
@@ -153,25 +153,27 @@
       }
     },
     "node_modules/@angular-devkit/architect": {
-      "version": "0.1102.14",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.14.tgz",
-      "integrity": "sha512-965TVXuBtRb8RySgxRxUEO+YTd7mT0xiqVHSe+MHvMtUCmEE9vwRofFZl6axkK5ri4fiomiMnOVE19aw4spgNQ==",
+      "version": "0.1200.5",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1200.5.tgz",
+      "integrity": "sha512-222VZ4OeaDK3vON8V5m+w15SRWfUs5uOb4H9ij/H9/6tyHD83uWfCDoOGg+ax4wJVdWEFJIS+Vn4ijGcZCq9WQ==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "@angular-devkit/core": "11.2.14",
-        "rxjs": "6.6.3"
+        "@angular-devkit/core": "12.0.5",
+        "rxjs": "6.6.7"
       },
       "engines": {
-        "node": ">= 10.13.0",
+        "node": "^12.14.1 || >=14.0.0",
         "npm": "^6.11.0 || ^7.5.6",
         "yarn": ">= 1.13.0"
       }
     },
     "node_modules/@angular-devkit/architect/node_modules/rxjs": {
-      "version": "6.6.3",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
-      "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
+      "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "tslib": "^1.9.0"
       },
@@ -183,7 +185,8 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
+      "dev": true,
+      "peer": true
     },
     "node_modules/@angular-devkit/build-angular": {
       "version": "0.1102.14",
@@ -305,6 +308,55 @@
         }
       }
     },
+    "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/architect": {
+      "version": "0.1102.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.14.tgz",
+      "integrity": "sha512-965TVXuBtRb8RySgxRxUEO+YTd7mT0xiqVHSe+MHvMtUCmEE9vwRofFZl6axkK5ri4fiomiMnOVE19aw4spgNQ==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "11.2.14",
+        "rxjs": "6.6.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": "^6.11.0 || ^7.5.6",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/core": {
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
+      "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "6.12.6",
+        "fast-json-stable-stringify": "2.1.0",
+        "magic-string": "0.25.7",
+        "rxjs": "6.6.3",
+        "source-map": "0.7.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": "^6.11.0 || ^7.5.6",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
     "node_modules/@angular-devkit/build-angular/node_modules/core-js": {
       "version": "3.8.3",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.8.3.tgz",
@@ -316,6 +368,12 @@
         "url": "https://opencollective.com/core-js"
       }
     },
+    "node_modules/@angular-devkit/build-angular/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
     "node_modules/@angular-devkit/build-angular/node_modules/rxjs": {
       "version": "6.6.3",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
@@ -394,6 +452,61 @@
         "webpack-dev-server": "^3.1.4"
       }
     },
+    "node_modules/@angular-devkit/build-webpack/node_modules/@angular-devkit/architect": {
+      "version": "0.1102.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.14.tgz",
+      "integrity": "sha512-965TVXuBtRb8RySgxRxUEO+YTd7mT0xiqVHSe+MHvMtUCmEE9vwRofFZl6axkK5ri4fiomiMnOVE19aw4spgNQ==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "11.2.14",
+        "rxjs": "6.6.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": "^6.11.0 || ^7.5.6",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-webpack/node_modules/@angular-devkit/core": {
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
+      "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "6.12.6",
+        "fast-json-stable-stringify": "2.1.0",
+        "magic-string": "0.25.7",
+        "rxjs": "6.6.3",
+        "source-map": "0.7.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": "^6.11.0 || ^7.5.6",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-webpack/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@angular-devkit/build-webpack/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
     "node_modules/@angular-devkit/build-webpack/node_modules/rxjs": {
       "version": "6.6.3",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
@@ -413,50 +526,31 @@
       "dev": true
     },
     "node_modules/@angular-devkit/core": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
-      "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
+      "version": "12.0.5",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-12.0.5.tgz",
+      "integrity": "sha512-zVSQV+8/vjUjsUKGlj8Kf5LioA6AXJTGI0yhHW9q1dFX4dPpbW63k0R1UoIB2wJ0F/AbYVgpnPGPe9BBm2fvZA==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "ajv": "6.12.6",
+        "ajv": "8.2.0",
+        "ajv-formats": "2.0.2",
         "fast-json-stable-stringify": "2.1.0",
         "magic-string": "0.25.7",
-        "rxjs": "6.6.3",
+        "rxjs": "6.6.7",
         "source-map": "0.7.3"
       },
       "engines": {
-        "node": ">= 10.13.0",
+        "node": "^12.14.1 || >=14.0.0",
         "npm": "^6.11.0 || ^7.5.6",
         "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@angular-devkit/core/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/@angular-devkit/core/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
     "node_modules/@angular-devkit/core/node_modules/rxjs": {
-      "version": "6.6.3",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
-      "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
+      "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "tslib": "^1.9.0"
       },
@@ -468,28 +562,156 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
+      "dev": true,
+      "peer": true
     },
     "node_modules/@angular-devkit/schematics": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.14.tgz",
-      "integrity": "sha512-Ol6+0qdGKzuVJm5gCtQr47X0OCihTfAxI4h047cHYhPFIGGPSvkG/QeJMZugflgoobi2k/xcYokOu/VAkRtWbQ==",
+      "version": "12.1.4",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.1.4.tgz",
+      "integrity": "sha512-yD3y3pK/K5piOgvALFoCCiPp4H8emNa3yZL+vlpEpewVLpF1MM55LeTxc0PI5s0uqtOGVnvcbA5wYgMm3YsUEA==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "11.2.14",
-        "ora": "5.3.0",
-        "rxjs": "6.6.3"
+        "@angular-devkit/core": "12.1.4",
+        "ora": "5.4.1",
+        "rxjs": "6.6.7"
       },
       "engines": {
-        "node": ">= 10.13.0",
+        "node": "^12.14.1 || >=14.0.0",
         "npm": "^6.11.0 || ^7.5.6",
         "yarn": ">= 1.13.0"
       }
     },
+    "node_modules/@angular-devkit/schematics/node_modules/@angular-devkit/core": {
+      "version": "12.1.4",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-12.1.4.tgz",
+      "integrity": "sha512-KOzGD8JbP/7EeUwPiU5x+fo3ZEQ5R4IVW5WoH92PaO3mdpqXC7UL2MWLct8PUe9il9nqJMvrBMldSSvP9PCT2w==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "8.6.0",
+        "ajv-formats": "2.1.0",
+        "fast-json-stable-stringify": "2.1.0",
+        "magic-string": "0.25.7",
+        "rxjs": "6.6.7",
+        "source-map": "0.7.3"
+      },
+      "engines": {
+        "node": "^12.14.1 || >=14.0.0",
+        "npm": "^6.11.0 || ^7.5.6",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular-devkit/schematics/node_modules/ajv": {
+      "version": "8.6.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz",
+      "integrity": "sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@angular-devkit/schematics/node_modules/ajv-formats": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.0.tgz",
+      "integrity": "sha512-USH2jBb+C/hIpwD2iRjp0pe0k+MvzG0mlSn/FIdCgQhUb9ALPRjt2KIQdfZDS9r0ZIeUAg7gOu9KL0PFqGqr5Q==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-devkit/schematics/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@angular-devkit/schematics/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@angular-devkit/schematics/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/@angular-devkit/schematics/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular-devkit/schematics/node_modules/ora": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
+      "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
+      "dev": true,
+      "dependencies": {
+        "bl": "^4.1.0",
+        "chalk": "^4.1.0",
+        "cli-cursor": "^3.1.0",
+        "cli-spinners": "^2.5.0",
+        "is-interactive": "^1.0.0",
+        "is-unicode-supported": "^0.1.0",
+        "log-symbols": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "wcwidth": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/@angular-devkit/schematics/node_modules/rxjs": {
-      "version": "6.6.3",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
-      "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
+      "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
       "dev": true,
       "dependencies": {
         "tslib": "^1.9.0"
@@ -498,6 +720,18 @@
         "npm": ">=2.0.0"
       }
     },
+    "node_modules/@angular-devkit/schematics/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@angular-devkit/schematics/node_modules/tslib": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
@@ -626,12 +860,101 @@
         "yarn": ">= 1.13.0"
       }
     },
+    "node_modules/@angular/cli/node_modules/@angular-devkit/architect": {
+      "version": "0.1102.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.14.tgz",
+      "integrity": "sha512-965TVXuBtRb8RySgxRxUEO+YTd7mT0xiqVHSe+MHvMtUCmEE9vwRofFZl6axkK5ri4fiomiMnOVE19aw4spgNQ==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "11.2.14",
+        "rxjs": "6.6.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": "^6.11.0 || ^7.5.6",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/@angular-devkit/core": {
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
+      "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "6.12.6",
+        "fast-json-stable-stringify": "2.1.0",
+        "magic-string": "0.25.7",
+        "rxjs": "6.6.3",
+        "source-map": "0.7.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": "^6.11.0 || ^7.5.6",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/@angular-devkit/schematics": {
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.14.tgz",
+      "integrity": "sha512-Ol6+0qdGKzuVJm5gCtQr47X0OCihTfAxI4h047cHYhPFIGGPSvkG/QeJMZugflgoobi2k/xcYokOu/VAkRtWbQ==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "11.2.14",
+        "ora": "5.3.0",
+        "rxjs": "6.6.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": "^6.11.0 || ^7.5.6",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
     "node_modules/@angular/cli/node_modules/jsonc-parser": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
       "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==",
       "dev": true
     },
+    "node_modules/@angular/cli/node_modules/rxjs": {
+      "version": "6.6.3",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
+      "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
     "node_modules/@angular/common": {
       "version": "11.2.14",
       "resolved": "https://registry.npmjs.org/@angular/common/-/common-11.2.14.tgz",
@@ -2868,12 +3191,12 @@
       }
     },
     "node_modules/@ionic/angular-toolkit": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@ionic/angular-toolkit/-/angular-toolkit-3.1.1.tgz",
-      "integrity": "sha512-/z3vwVcEBvvZ86AV0pXOhN3mc+ftxKlAWgFyuQOY7O1kO4+xfzaa401dvCrFEbgUQOLH07hjnyG0ufkID7WyLA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@ionic/angular-toolkit/-/angular-toolkit-4.0.0.tgz",
+      "integrity": "sha512-HGRAGUtc1YSwNZ/Q7X7c2QRyYM2AfsSm++OasPrMo3LnPRVr8OIsUih2ithEU7f3CXrViUR7j/Anu90zGsRgzg==",
       "dev": true,
       "dependencies": {
-        "@schematics/angular": "^11.2.4",
+        "@schematics/angular": "^12.0.0",
         "cheerio": "1.0.0-rc.3",
         "colorette": "1.1.0",
         "copy-webpack-plugin": "^6.2.1",
@@ -2882,12 +3205,102 @@
         "ws": "^7.0.1"
       },
       "peerDependencies": {
-        "@angular-devkit/architect": "^0.1102.4",
-        "@angular-devkit/build-angular": "^0.1102.4",
-        "@angular-devkit/core": "^11.2.4",
-        "@angular-devkit/schematics": "^11.2.4"
+        "@angular-devkit/architect": "^0.1200.0",
+        "@angular-devkit/schematics": "^12.0.0"
       }
     },
+    "node_modules/@ionic/angular-toolkit/node_modules/@angular-devkit/core": {
+      "version": "12.1.4",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-12.1.4.tgz",
+      "integrity": "sha512-KOzGD8JbP/7EeUwPiU5x+fo3ZEQ5R4IVW5WoH92PaO3mdpqXC7UL2MWLct8PUe9il9nqJMvrBMldSSvP9PCT2w==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "8.6.0",
+        "ajv-formats": "2.1.0",
+        "fast-json-stable-stringify": "2.1.0",
+        "magic-string": "0.25.7",
+        "rxjs": "6.6.7",
+        "source-map": "0.7.3"
+      },
+      "engines": {
+        "node": "^12.14.1 || >=14.0.0",
+        "npm": "^6.11.0 || ^7.5.6",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@ionic/angular-toolkit/node_modules/@schematics/angular": {
+      "version": "12.1.4",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-12.1.4.tgz",
+      "integrity": "sha512-xGqgGI6GWk4EFdKis8FmSESxoLgjnLQbaRE1t1KZCkSKJzqkOj0R9wiDrtZfcrbPxIkLL+3fAk2ThwwPznT6yw==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "12.1.4",
+        "@angular-devkit/schematics": "12.1.4",
+        "jsonc-parser": "3.0.0"
+      },
+      "engines": {
+        "node": "^12.14.1 || >=14.0.0",
+        "npm": "^6.11.0 || ^7.5.6",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@ionic/angular-toolkit/node_modules/ajv": {
+      "version": "8.6.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz",
+      "integrity": "sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@ionic/angular-toolkit/node_modules/ajv-formats": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.0.tgz",
+      "integrity": "sha512-USH2jBb+C/hIpwD2iRjp0pe0k+MvzG0mlSn/FIdCgQhUb9ALPRjt2KIQdfZDS9r0ZIeUAg7gOu9KL0PFqGqr5Q==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@ionic/angular-toolkit/node_modules/jsonc-parser": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
+      "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==",
+      "dev": true
+    },
+    "node_modules/@ionic/angular-toolkit/node_modules/rxjs": {
+      "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/@ionic/angular-toolkit/node_modules/rxjs/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
     "node_modules/@ionic/angular/node_modules/tslib": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
@@ -4165,6 +4578,64 @@
         "webpack": "^4.0.0"
       }
     },
+    "node_modules/@ngtools/webpack/node_modules/@angular-devkit/core": {
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
+      "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "6.12.6",
+        "fast-json-stable-stringify": "2.1.0",
+        "magic-string": "0.25.7",
+        "rxjs": "6.6.3",
+        "source-map": "0.7.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": "^6.11.0 || ^7.5.6",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@ngtools/webpack/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@ngtools/webpack/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/@ngtools/webpack/node_modules/rxjs": {
+      "version": "6.6.3",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
+      "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/@ngtools/webpack/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
     "node_modules/@ngx-translate/core": {
       "version": "13.0.0",
       "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-13.0.0.tgz",
@@ -4396,12 +4867,86 @@
         "yarn": ">= 1.13.0"
       }
     },
+    "node_modules/@schematics/angular/node_modules/@angular-devkit/core": {
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
+      "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "6.12.6",
+        "fast-json-stable-stringify": "2.1.0",
+        "magic-string": "0.25.7",
+        "rxjs": "6.6.3",
+        "source-map": "0.7.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": "^6.11.0 || ^7.5.6",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@schematics/angular/node_modules/@angular-devkit/schematics": {
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.14.tgz",
+      "integrity": "sha512-Ol6+0qdGKzuVJm5gCtQr47X0OCihTfAxI4h047cHYhPFIGGPSvkG/QeJMZugflgoobi2k/xcYokOu/VAkRtWbQ==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "11.2.14",
+        "ora": "5.3.0",
+        "rxjs": "6.6.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": "^6.11.0 || ^7.5.6",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@schematics/angular/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@schematics/angular/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
     "node_modules/@schematics/angular/node_modules/jsonc-parser": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
       "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==",
       "dev": true
     },
+    "node_modules/@schematics/angular/node_modules/rxjs": {
+      "version": "6.6.3",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
+      "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/@schematics/angular/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
     "node_modules/@schematics/update": {
       "version": "0.1102.14",
       "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.1102.14.tgz",
@@ -4423,6 +4968,80 @@
         "yarn": ">= 1.13.0"
       }
     },
+    "node_modules/@schematics/update/node_modules/@angular-devkit/core": {
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
+      "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "6.12.6",
+        "fast-json-stable-stringify": "2.1.0",
+        "magic-string": "0.25.7",
+        "rxjs": "6.6.3",
+        "source-map": "0.7.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": "^6.11.0 || ^7.5.6",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@schematics/update/node_modules/@angular-devkit/schematics": {
+      "version": "11.2.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.14.tgz",
+      "integrity": "sha512-Ol6+0qdGKzuVJm5gCtQr47X0OCihTfAxI4h047cHYhPFIGGPSvkG/QeJMZugflgoobi2k/xcYokOu/VAkRtWbQ==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "11.2.14",
+        "ora": "5.3.0",
+        "rxjs": "6.6.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": "^6.11.0 || ^7.5.6",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@schematics/update/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@schematics/update/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/@schematics/update/node_modules/rxjs": {
+      "version": "6.6.3",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
+      "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/@schematics/update/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
     "node_modules/@sindresorhus/is": {
       "version": "0.14.0",
       "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
@@ -5449,6 +6068,24 @@
         "ajv": ">=5.0.0"
       }
     },
+    "node_modules/ajv-formats": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.0.2.tgz",
+      "integrity": "sha512-Brah4Uo5/U8v76c6euTwtjVFFaVishwnJrQBYpev1JRh4vjA1F4HY3UzQez41YUCszUCXKagG8v6eVRBHV1gkw==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/alphanum-sort": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
@@ -22199,13 +22836,13 @@
       }
     },
     "node_modules/plist": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.3.tgz",
-      "integrity": "sha512-ghdOKN99hh1oEmAlwBmPYo4L+tSQ7O3jRpkhWqOrMz86CWotpVzMevvQ+czo7oPDpOZyA6K06Ci7QVHpoh9gaA==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.2.tgz",
+      "integrity": "sha512-MSrkwZBdQ6YapHy87/8hDU8MnIcyxBKjeF+McXnr5A9MtffPewTs7G3hlpodT5TacyfIyFTaJEhh3GGcmasTgQ==",
       "dependencies": {
         "base64-js": "^1.5.1",
         "xmlbuilder": "^9.0.7",
-        "xmldom": "^0.6.0"
+        "xmldom": "^0.5.0"
       },
       "engines": {
         "node": ">=6"
@@ -30594,9 +31231,9 @@
       "dev": true
     },
     "node_modules/xmldom": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.6.0.tgz",
-      "integrity": "sha512-iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.5.0.tgz",
+      "integrity": "sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA==",
       "engines": {
         "node": ">=10.0.0"
       }
@@ -30708,20 +31345,22 @@
   },
   "dependencies": {
     "@angular-devkit/architect": {
-      "version": "0.1102.14",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.14.tgz",
-      "integrity": "sha512-965TVXuBtRb8RySgxRxUEO+YTd7mT0xiqVHSe+MHvMtUCmEE9vwRofFZl6axkK5ri4fiomiMnOVE19aw4spgNQ==",
+      "version": "0.1200.5",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1200.5.tgz",
+      "integrity": "sha512-222VZ4OeaDK3vON8V5m+w15SRWfUs5uOb4H9ij/H9/6tyHD83uWfCDoOGg+ax4wJVdWEFJIS+Vn4ijGcZCq9WQ==",
       "dev": true,
+      "peer": true,
       "requires": {
-        "@angular-devkit/core": "11.2.14",
-        "rxjs": "6.6.3"
+        "@angular-devkit/core": "12.0.5",
+        "rxjs": "6.6.7"
       },
       "dependencies": {
         "rxjs": {
-          "version": "6.6.3",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
-          "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
+          "version": "6.6.7",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+          "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
           "dev": true,
+          "peer": true,
           "requires": {
             "tslib": "^1.9.0"
           }
@@ -30730,7 +31369,8 @@
           "version": "1.14.1",
           "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
           "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-          "dev": true
+          "dev": true,
+          "peer": true
         }
       }
     },
@@ -30815,12 +31455,53 @@
         "worker-plugin": "5.0.0"
       },
       "dependencies": {
+        "@angular-devkit/architect": {
+          "version": "0.1102.14",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.14.tgz",
+          "integrity": "sha512-965TVXuBtRb8RySgxRxUEO+YTd7mT0xiqVHSe+MHvMtUCmEE9vwRofFZl6axkK5ri4fiomiMnOVE19aw4spgNQ==",
+          "dev": true,
+          "requires": {
+            "@angular-devkit/core": "11.2.14",
+            "rxjs": "6.6.3"
+          }
+        },
+        "@angular-devkit/core": {
+          "version": "11.2.14",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
+          "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
+          "dev": true,
+          "requires": {
+            "ajv": "6.12.6",
+            "fast-json-stable-stringify": "2.1.0",
+            "magic-string": "0.25.7",
+            "rxjs": "6.6.3",
+            "source-map": "0.7.3"
+          }
+        },
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
         "core-js": {
           "version": "3.8.3",
           "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.8.3.tgz",
           "integrity": "sha512-KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q==",
           "dev": true
         },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        },
         "rxjs": {
           "version": "6.6.3",
           "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
@@ -30876,36 +31557,29 @@
         "rxjs": "6.6.3"
       },
       "dependencies": {
-        "rxjs": {
-          "version": "6.6.3",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
-          "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
+        "@angular-devkit/architect": {
+          "version": "0.1102.14",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.14.tgz",
+          "integrity": "sha512-965TVXuBtRb8RySgxRxUEO+YTd7mT0xiqVHSe+MHvMtUCmEE9vwRofFZl6axkK5ri4fiomiMnOVE19aw4spgNQ==",
           "dev": true,
           "requires": {
-            "tslib": "^1.9.0"
+            "@angular-devkit/core": "11.2.14",
+            "rxjs": "6.6.3"
+          }
+        },
+        "@angular-devkit/core": {
+          "version": "11.2.14",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
+          "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
+          "dev": true,
+          "requires": {
+            "ajv": "6.12.6",
+            "fast-json-stable-stringify": "2.1.0",
+            "magic-string": "0.25.7",
+            "rxjs": "6.6.3",
+            "source-map": "0.7.3"
           }
         },
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-          "dev": true
-        }
-      }
-    },
-    "@angular-devkit/core": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
-      "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
-      "dev": true,
-      "requires": {
-        "ajv": "6.12.6",
-        "fast-json-stable-stringify": "2.1.0",
-        "magic-string": "0.25.7",
-        "rxjs": "6.6.3",
-        "source-map": "0.7.3"
-      },
-      "dependencies": {
         "ajv": {
           "version": "6.12.6",
           "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -30941,26 +31615,155 @@
         }
       }
     },
-    "@angular-devkit/schematics": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.14.tgz",
-      "integrity": "sha512-Ol6+0qdGKzuVJm5gCtQr47X0OCihTfAxI4h047cHYhPFIGGPSvkG/QeJMZugflgoobi2k/xcYokOu/VAkRtWbQ==",
+    "@angular-devkit/core": {
+      "version": "12.0.5",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-12.0.5.tgz",
+      "integrity": "sha512-zVSQV+8/vjUjsUKGlj8Kf5LioA6AXJTGI0yhHW9q1dFX4dPpbW63k0R1UoIB2wJ0F/AbYVgpnPGPe9BBm2fvZA==",
       "dev": true,
+      "peer": true,
       "requires": {
-        "@angular-devkit/core": "11.2.14",
-        "ora": "5.3.0",
-        "rxjs": "6.6.3"
+        "ajv": "8.2.0",
+        "ajv-formats": "2.0.2",
+        "fast-json-stable-stringify": "2.1.0",
+        "magic-string": "0.25.7",
+        "rxjs": "6.6.7",
+        "source-map": "0.7.3"
       },
       "dependencies": {
         "rxjs": {
-          "version": "6.6.3",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
-          "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
+          "version": "6.6.7",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+          "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "tslib": "^1.9.0"
+          }
+        },
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+          "dev": true,
+          "peer": true
+        }
+      }
+    },
+    "@angular-devkit/schematics": {
+      "version": "12.1.4",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.1.4.tgz",
+      "integrity": "sha512-yD3y3pK/K5piOgvALFoCCiPp4H8emNa3yZL+vlpEpewVLpF1MM55LeTxc0PI5s0uqtOGVnvcbA5wYgMm3YsUEA==",
+      "dev": true,
+      "requires": {
+        "@angular-devkit/core": "12.1.4",
+        "ora": "5.4.1",
+        "rxjs": "6.6.7"
+      },
+      "dependencies": {
+        "@angular-devkit/core": {
+          "version": "12.1.4",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-12.1.4.tgz",
+          "integrity": "sha512-KOzGD8JbP/7EeUwPiU5x+fo3ZEQ5R4IVW5WoH92PaO3mdpqXC7UL2MWLct8PUe9il9nqJMvrBMldSSvP9PCT2w==",
+          "dev": true,
+          "requires": {
+            "ajv": "8.6.0",
+            "ajv-formats": "2.1.0",
+            "fast-json-stable-stringify": "2.1.0",
+            "magic-string": "0.25.7",
+            "rxjs": "6.6.7",
+            "source-map": "0.7.3"
+          }
+        },
+        "ajv": {
+          "version": "8.6.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz",
+          "integrity": "sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "json-schema-traverse": "^1.0.0",
+            "require-from-string": "^2.0.2",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-formats": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.0.tgz",
+          "integrity": "sha512-USH2jBb+C/hIpwD2iRjp0pe0k+MvzG0mlSn/FIdCgQhUb9ALPRjt2KIQdfZDS9r0ZIeUAg7gOu9KL0PFqGqr5Q==",
+          "dev": true,
+          "requires": {
+            "ajv": "^8.0.0"
+          }
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "ora": {
+          "version": "5.4.1",
+          "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
+          "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
+          "dev": true,
+          "requires": {
+            "bl": "^4.1.0",
+            "chalk": "^4.1.0",
+            "cli-cursor": "^3.1.0",
+            "cli-spinners": "^2.5.0",
+            "is-interactive": "^1.0.0",
+            "is-unicode-supported": "^0.1.0",
+            "log-symbols": "^4.1.0",
+            "strip-ansi": "^6.0.0",
+            "wcwidth": "^1.0.1"
+          }
+        },
+        "rxjs": {
+          "version": "6.6.7",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+          "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
           "dev": true,
           "requires": {
             "tslib": "^1.9.0"
           }
         },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
         "tslib": {
           "version": "1.14.1",
           "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
@@ -31056,11 +31859,78 @@
         "uuid": "8.3.2"
       },
       "dependencies": {
+        "@angular-devkit/architect": {
+          "version": "0.1102.14",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.14.tgz",
+          "integrity": "sha512-965TVXuBtRb8RySgxRxUEO+YTd7mT0xiqVHSe+MHvMtUCmEE9vwRofFZl6axkK5ri4fiomiMnOVE19aw4spgNQ==",
+          "dev": true,
+          "requires": {
+            "@angular-devkit/core": "11.2.14",
+            "rxjs": "6.6.3"
+          }
+        },
+        "@angular-devkit/core": {
+          "version": "11.2.14",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
+          "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
+          "dev": true,
+          "requires": {
+            "ajv": "6.12.6",
+            "fast-json-stable-stringify": "2.1.0",
+            "magic-string": "0.25.7",
+            "rxjs": "6.6.3",
+            "source-map": "0.7.3"
+          }
+        },
+        "@angular-devkit/schematics": {
+          "version": "11.2.14",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.14.tgz",
+          "integrity": "sha512-Ol6+0qdGKzuVJm5gCtQr47X0OCihTfAxI4h047cHYhPFIGGPSvkG/QeJMZugflgoobi2k/xcYokOu/VAkRtWbQ==",
+          "dev": true,
+          "requires": {
+            "@angular-devkit/core": "11.2.14",
+            "ora": "5.3.0",
+            "rxjs": "6.6.3"
+          }
+        },
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        },
         "jsonc-parser": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
           "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==",
           "dev": true
+        },
+        "rxjs": {
+          "version": "6.6.3",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
+          "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
+          "dev": true,
+          "requires": {
+            "tslib": "^1.9.0"
+          }
+        },
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+          "dev": true
         }
       }
     },
@@ -32660,18 +33530,89 @@
       }
     },
     "@ionic/angular-toolkit": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@ionic/angular-toolkit/-/angular-toolkit-3.1.1.tgz",
-      "integrity": "sha512-/z3vwVcEBvvZ86AV0pXOhN3mc+ftxKlAWgFyuQOY7O1kO4+xfzaa401dvCrFEbgUQOLH07hjnyG0ufkID7WyLA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@ionic/angular-toolkit/-/angular-toolkit-4.0.0.tgz",
+      "integrity": "sha512-HGRAGUtc1YSwNZ/Q7X7c2QRyYM2AfsSm++OasPrMo3LnPRVr8OIsUih2ithEU7f3CXrViUR7j/Anu90zGsRgzg==",
       "dev": true,
       "requires": {
-        "@schematics/angular": "^11.2.4",
+        "@schematics/angular": "^12.0.0",
         "cheerio": "1.0.0-rc.3",
         "colorette": "1.1.0",
         "copy-webpack-plugin": "^6.2.1",
         "tapable": "^2.1.1",
         "tslib": "^2.0.3",
         "ws": "^7.0.1"
+      },
+      "dependencies": {
+        "@angular-devkit/core": {
+          "version": "12.1.4",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-12.1.4.tgz",
+          "integrity": "sha512-KOzGD8JbP/7EeUwPiU5x+fo3ZEQ5R4IVW5WoH92PaO3mdpqXC7UL2MWLct8PUe9il9nqJMvrBMldSSvP9PCT2w==",
+          "dev": true,
+          "requires": {
+            "ajv": "8.6.0",
+            "ajv-formats": "2.1.0",
+            "fast-json-stable-stringify": "2.1.0",
+            "magic-string": "0.25.7",
+            "rxjs": "6.6.7",
+            "source-map": "0.7.3"
+          }
+        },
+        "@schematics/angular": {
+          "version": "12.1.4",
+          "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-12.1.4.tgz",
+          "integrity": "sha512-xGqgGI6GWk4EFdKis8FmSESxoLgjnLQbaRE1t1KZCkSKJzqkOj0R9wiDrtZfcrbPxIkLL+3fAk2ThwwPznT6yw==",
+          "dev": true,
+          "requires": {
+            "@angular-devkit/core": "12.1.4",
+            "@angular-devkit/schematics": "12.1.4",
+            "jsonc-parser": "3.0.0"
+          }
+        },
+        "ajv": {
+          "version": "8.6.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz",
+          "integrity": "sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "json-schema-traverse": "^1.0.0",
+            "require-from-string": "^2.0.2",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-formats": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.0.tgz",
+          "integrity": "sha512-USH2jBb+C/hIpwD2iRjp0pe0k+MvzG0mlSn/FIdCgQhUb9ALPRjt2KIQdfZDS9r0ZIeUAg7gOu9KL0PFqGqr5Q==",
+          "dev": true,
+          "requires": {
+            "ajv": "^8.0.0"
+          }
+        },
+        "jsonc-parser": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
+          "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==",
+          "dev": true
+        },
+        "rxjs": {
+          "version": "6.6.7",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+          "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+          "dev": true,
+          "requires": {
+            "tslib": "^1.9.0"
+          },
+          "dependencies": {
+            "tslib": {
+              "version": "1.14.1",
+              "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+              "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+              "dev": true
+            }
+          }
+        }
       }
     },
     "@ionic/cli": {
@@ -33575,6 +34516,54 @@
         "@angular-devkit/core": "11.2.14",
         "enhanced-resolve": "5.7.0",
         "webpack-sources": "2.2.0"
+      },
+      "dependencies": {
+        "@angular-devkit/core": {
+          "version": "11.2.14",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
+          "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
+          "dev": true,
+          "requires": {
+            "ajv": "6.12.6",
+            "fast-json-stable-stringify": "2.1.0",
+            "magic-string": "0.25.7",
+            "rxjs": "6.6.3",
+            "source-map": "0.7.3"
+          }
+        },
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        },
+        "rxjs": {
+          "version": "6.6.3",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
+          "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
+          "dev": true,
+          "requires": {
+            "tslib": "^1.9.0"
+          }
+        },
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+          "dev": true
+        }
       }
     },
     "@ngx-translate/core": {
@@ -33759,11 +34748,68 @@
         "jsonc-parser": "3.0.0"
       },
       "dependencies": {
+        "@angular-devkit/core": {
+          "version": "11.2.14",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
+          "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
+          "dev": true,
+          "requires": {
+            "ajv": "6.12.6",
+            "fast-json-stable-stringify": "2.1.0",
+            "magic-string": "0.25.7",
+            "rxjs": "6.6.3",
+            "source-map": "0.7.3"
+          }
+        },
+        "@angular-devkit/schematics": {
+          "version": "11.2.14",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.14.tgz",
+          "integrity": "sha512-Ol6+0qdGKzuVJm5gCtQr47X0OCihTfAxI4h047cHYhPFIGGPSvkG/QeJMZugflgoobi2k/xcYokOu/VAkRtWbQ==",
+          "dev": true,
+          "requires": {
+            "@angular-devkit/core": "11.2.14",
+            "ora": "5.3.0",
+            "rxjs": "6.6.3"
+          }
+        },
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        },
         "jsonc-parser": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
           "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==",
           "dev": true
+        },
+        "rxjs": {
+          "version": "6.6.3",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
+          "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
+          "dev": true,
+          "requires": {
+            "tslib": "^1.9.0"
+          }
+        },
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+          "dev": true
         }
       }
     },
@@ -33781,6 +34827,65 @@
         "pacote": "11.2.4",
         "semver": "7.3.4",
         "semver-intersect": "1.4.0"
+      },
+      "dependencies": {
+        "@angular-devkit/core": {
+          "version": "11.2.14",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
+          "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
+          "dev": true,
+          "requires": {
+            "ajv": "6.12.6",
+            "fast-json-stable-stringify": "2.1.0",
+            "magic-string": "0.25.7",
+            "rxjs": "6.6.3",
+            "source-map": "0.7.3"
+          }
+        },
+        "@angular-devkit/schematics": {
+          "version": "11.2.14",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.14.tgz",
+          "integrity": "sha512-Ol6+0qdGKzuVJm5gCtQr47X0OCihTfAxI4h047cHYhPFIGGPSvkG/QeJMZugflgoobi2k/xcYokOu/VAkRtWbQ==",
+          "dev": true,
+          "requires": {
+            "@angular-devkit/core": "11.2.14",
+            "ora": "5.3.0",
+            "rxjs": "6.6.3"
+          }
+        },
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        },
+        "rxjs": {
+          "version": "6.6.3",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
+          "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
+          "dev": true,
+          "requires": {
+            "tslib": "^1.9.0"
+          }
+        },
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+          "dev": true
+        }
       }
     },
     "@sindresorhus/is": {
@@ -34591,6 +35696,16 @@
       "dev": true,
       "requires": {}
     },
+    "ajv-formats": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.0.2.tgz",
+      "integrity": "sha512-Brah4Uo5/U8v76c6euTwtjVFFaVishwnJrQBYpev1JRh4vjA1F4HY3UzQez41YUCszUCXKagG8v6eVRBHV1gkw==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "ajv": "^8.0.0"
+      }
+    },
     "alphanum-sort": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
@@ -47568,13 +48683,13 @@
       }
     },
     "plist": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.3.tgz",
-      "integrity": "sha512-ghdOKN99hh1oEmAlwBmPYo4L+tSQ7O3jRpkhWqOrMz86CWotpVzMevvQ+czo7oPDpOZyA6K06Ci7QVHpoh9gaA==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.2.tgz",
+      "integrity": "sha512-MSrkwZBdQ6YapHy87/8hDU8MnIcyxBKjeF+McXnr5A9MtffPewTs7G3hlpodT5TacyfIyFTaJEhh3GGcmasTgQ==",
       "requires": {
         "base64-js": "^1.5.1",
         "xmlbuilder": "^9.0.7",
-        "xmldom": "^0.6.0"
+        "xmldom": "^0.5.0"
       }
     },
     "plugin-error": {
@@ -54083,9 +55198,9 @@
       "dev": true
     },
     "xmldom": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.6.0.tgz",
-      "integrity": "sha512-iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg=="
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.5.0.tgz",
+      "integrity": "sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA=="
     },
     "xregexp": {
       "version": "2.0.0",
diff --git a/package.json b/package.json
index dcebb3641..a8b3508a6 100644
--- a/package.json
+++ b/package.json
@@ -138,7 +138,7 @@
     "@angular/compiler": "~11.2.14",
     "@angular/compiler-cli": "~11.2.14",
     "@angular/language-service": "~11.2.14",
-    "@ionic/angular-toolkit": "^3.1.1",
+    "@ionic/angular-toolkit": "^4.0.0",
     "@ionic/cli": "^6.14.1",
     "@types/faker": "^5.1.3",
     "@types/jest": "^26.0.24",

From aff39e8201a58cd1df18b56005d161bf919efa01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 9 Aug 2021 11:59:57 +0200
Subject: [PATCH 0039/1008] Revert "MOBILE-3833 lint: One dependency will cause
 one compat error"

This reverts commit 5257117ea11a76b13eeac97fc02fe3874a871f68.
---
 .github/workflows/testing.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 6f4d342ac..4f326a88b 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -58,4 +58,4 @@ jobs:
     - name: Production builds
       run: npm run build:prod
     - name: JavaScript code compatibility
-      run: result=$(npx check-es-compat www/*.js 2> /dev/null | grep -v -E "Array\.prototype\.includes|Promise\.prototype\.finally|String\.prototype\.(matchAll|trimRight)|globalThis" | grep -Po "(?<=error).*?(?=\s+ecmascript)" | wc -l); test $result -eq 1
+      run: result=$(npx check-es-compat www/*.js 2> /dev/null | grep -v -E "Array\.prototype\.includes|Promise\.prototype\.finally|String\.prototype\.(matchAll|trimRight)|globalThis" | grep -Po "(?<=error).*?(?=\s+ecmascript)" | wc -l); test $result -eq 0

From e96d1b5c090714afc0ca192465e70f8b13e7b2a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 9 Aug 2021 12:00:19 +0200
Subject: [PATCH 0040/1008] Revert "MOBILE-3833 config: Update jest"

This reverts commit 9dbcd09e4ae3def02d96da06f69fdae15d141a30.
---
 jest.config.js       |  2 +-
 package-lock.json    | 21 ---------------------
 package.json         |  1 -
 src/testing/setup.ts |  2 +-
 4 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/jest.config.js b/jest.config.js
index 79b69a153..f464ae96e 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -16,7 +16,7 @@ module.exports = {
     moduleNameMapper: pathsToModuleNameMapper(compilerOptions.paths, { prefix: '<rootDir>/src/' }),
     globals: {
         'ts-jest': {
-            tsconfig: './tsconfig.test.json',
+            tsConfig: './tsconfig.test.json',
         },
     },
 };
diff --git a/package-lock.json b/package-lock.json
index 90bb4c731..d7ac26002 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -113,7 +113,6 @@
         "@ionic/angular-toolkit": "^4.0.0",
         "@ionic/cli": "^6.14.1",
         "@types/faker": "^5.1.3",
-        "@types/jest": "^26.0.24",
         "@types/node": "^12.12.64",
         "@types/resize-observer-browser": "^0.1.5",
         "@types/webpack-env": "^1.16.0",
@@ -5248,16 +5247,6 @@
         "@types/istanbul-lib-report": "*"
       }
     },
-    "node_modules/@types/jest": {
-      "version": "26.0.24",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.24.tgz",
-      "integrity": "sha512-E/X5Vib8BWqZNRlDxj9vYXhsDwPYbPINqKF9BsnSoon4RQ0D9moEuLD8txgyypFLH7J4+Lho9Nr/c8H0Fi+17w==",
-      "dev": true,
-      "dependencies": {
-        "jest-diff": "^26.0.0",
-        "pretty-format": "^26.0.0"
-      }
-    },
     "node_modules/@types/json-schema": {
       "version": "7.0.8",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.8.tgz",
@@ -35075,16 +35064,6 @@
         "@types/istanbul-lib-report": "*"
       }
     },
-    "@types/jest": {
-      "version": "26.0.24",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.24.tgz",
-      "integrity": "sha512-E/X5Vib8BWqZNRlDxj9vYXhsDwPYbPINqKF9BsnSoon4RQ0D9moEuLD8txgyypFLH7J4+Lho9Nr/c8H0Fi+17w==",
-      "dev": true,
-      "requires": {
-        "jest-diff": "^26.0.0",
-        "pretty-format": "^26.0.0"
-      }
-    },
     "@types/json-schema": {
       "version": "7.0.8",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.8.tgz",
diff --git a/package.json b/package.json
index a8b3508a6..2aee05d56 100644
--- a/package.json
+++ b/package.json
@@ -141,7 +141,6 @@
     "@ionic/angular-toolkit": "^4.0.0",
     "@ionic/cli": "^6.14.1",
     "@types/faker": "^5.1.3",
-    "@types/jest": "^26.0.24",
     "@types/node": "^12.12.64",
     "@types/resize-observer-browser": "^0.1.5",
     "@types/webpack-env": "^1.16.0",
diff --git a/src/testing/setup.ts b/src/testing/setup.ts
index 35812d3e7..6bffcfaca 100644
--- a/src/testing/setup.ts
+++ b/src/testing/setup.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import 'jest-preset-angular/setup-jest';
+import 'jest-preset-angular';
 
 import { setCreateSingletonMethodProxy } from '@singletons';
 

From e1c6c7c0432daa795ab1c353d783479c764328fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 9 Aug 2021 12:00:28 +0200
Subject: [PATCH 0041/1008] Revert "MOBILE-3833 config: Update eslint"

This reverts commit 0fb7961a423abb42393e22b65708595ca8e08e27.
---
 package-lock.json | 140 +++++++++++++++-------------------------------
 package.json      |   8 +--
 2 files changed, 48 insertions(+), 100 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d7ac26002..b80623d42 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -119,12 +119,12 @@
         "@typescript-eslint/eslint-plugin": "^4.22.0",
         "@typescript-eslint/parser": "^4.22.0",
         "check-es-compat": "^1.1.1",
-        "eslint": "^7.31.0",
+        "eslint": "^7.25.0",
         "eslint-config-prettier": "^8.3.0",
         "eslint-plugin-header": "^3.1.1",
-        "eslint-plugin-import": "^2.23.4",
-        "eslint-plugin-jest": "^24.4.0",
-        "eslint-plugin-jsdoc": "^36.0.3",
+        "eslint-plugin-import": "^2.22.1",
+        "eslint-plugin-jest": "^24.3.6",
+        "eslint-plugin-jsdoc": "^32.3.3",
         "eslint-plugin-prefer-arrow": "^1.2.3",
         "eslint-plugin-promise": "^5.1.0",
         "faker": "^5.1.0",
@@ -2750,20 +2750,6 @@
         "node": ">=10.0.0"
       }
     },
-    "node_modules/@es-joy/jsdoccomment": {
-      "version": "0.10.7",
-      "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.10.7.tgz",
-      "integrity": "sha512-aNKZEoMESDzOBjKxCWrFuG50mcpMeKVBnBNko4+IZZ5t9zXYs8GT1KB0ZaOq1YUsKumDRc6YII/TQm309MJ0KQ==",
-      "dev": true,
-      "dependencies": {
-        "comment-parser": "1.2.3",
-        "esquery": "^1.4.0",
-        "jsdoc-type-pratt-parser": "1.1.1"
-      },
-      "engines": {
-        "node": "^12.20 || ^14.14.0 || ^16"
-      }
-    },
     "node_modules/@eslint/eslintrc": {
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
@@ -8768,12 +8754,12 @@
       "dev": true
     },
     "node_modules/comment-parser": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.2.3.tgz",
-      "integrity": "sha512-vnqDwBSXSsdAkGS5NjwMIPelE47q+UkEgWKHvCDNhVIIaQSUFY6sNnEYGzdoPGMdpV+7KR3ZkRd7oyWIjtuvJg==",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.1.5.tgz",
+      "integrity": "sha512-RePCE4leIhBlmrqiYTvaqEeGYg7qpSl4etaIabKtdOQVi+mSTIBBklGUwIr79GXYnl3LpMwmDw4KeR2stNc6FA==",
       "dev": true,
       "engines": {
-        "node": "^12.20 || ^14.14.0 || ^16"
+        "node": ">= 10.0.0"
       }
     },
     "node_modules/commondir": {
@@ -11972,45 +11958,26 @@
       }
     },
     "node_modules/eslint-plugin-jsdoc": {
-      "version": "36.0.6",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-36.0.6.tgz",
-      "integrity": "sha512-vOm27rI2SMfi1bOAYmzzGkanMCD/boquKwvN5ECi8EF9ASsXJwlnCzYtiOYpsDpbC2+6JXEHAmWMkqYNA3BWRw==",
+      "version": "32.3.4",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-32.3.4.tgz",
+      "integrity": "sha512-xSWfsYvffXnN0OkwLnB7MoDDDDjqcp46W7YlY1j7JyfAQBQ+WnGCfLov3gVNZjUGtK9Otj8mEhTZTqJu4QtIGA==",
       "dev": true,
       "dependencies": {
-        "@es-joy/jsdoccomment": "0.10.7",
-        "comment-parser": "1.2.3",
-        "debug": "^4.3.2",
-        "esquery": "^1.4.0",
-        "jsdoc-type-pratt-parser": "^1.1.1",
+        "comment-parser": "1.1.5",
+        "debug": "^4.3.1",
+        "jsdoctypeparser": "^9.0.0",
         "lodash": "^4.17.21",
-        "regextras": "^0.8.0",
+        "regextras": "^0.7.1",
         "semver": "^7.3.5",
         "spdx-expression-parse": "^3.0.1"
       },
       "engines": {
-        "node": "^12.20 || ^14.14.0 || ^16"
+        "node": ">=10"
       },
       "peerDependencies": {
         "eslint": "^6.0.0 || ^7.0.0"
       }
     },
-    "node_modules/eslint-plugin-jsdoc/node_modules/debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/eslint-plugin-jsdoc/node_modules/semver": {
       "version": "7.3.5",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
@@ -19165,13 +19132,16 @@
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
       "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
     },
-    "node_modules/jsdoc-type-pratt-parser": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-1.1.1.tgz",
-      "integrity": "sha512-uelRmpghNwPBuZScwgBG/OzodaFk5RbO5xaivBdsAY70icWfShwZ7PCMO0x1zSkOa8T1FzHThmrdoyg/0AwV5g==",
+    "node_modules/jsdoctypeparser": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/jsdoctypeparser/-/jsdoctypeparser-9.0.0.tgz",
+      "integrity": "sha512-jrTA2jJIL6/DAEILBEh2/w9QxCuwmvNXIry39Ay/HVfhE3o2yVV0U44blYkqdHA/OKloJEqvJy0xU+GSdE2SIw==",
       "dev": true,
+      "bin": {
+        "jsdoctypeparser": "bin/jsdoctypeparser"
+      },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=10"
       }
     },
     "node_modules/jsdom": {
@@ -24326,9 +24296,9 @@
       }
     },
     "node_modules/regextras": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/regextras/-/regextras-0.8.0.tgz",
-      "integrity": "sha512-k519uI04Z3SaY0fLX843MRXnDeG2+vHOFsyhiPZvNLe7r8rD2YNRjq4BQLZZ0oAr2NrtvZlICsXysGNFPGa3CQ==",
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/regextras/-/regextras-0.7.1.tgz",
+      "integrity": "sha512-9YXf6xtW+qzQ+hcMQXx95MOvfqXFgsKDZodX3qZB0x2n5Z94ioetIITsBtvJbiOyxa/6s9AtyweBLCdPmPko/w==",
       "dev": true,
       "engines": {
         "node": ">=0.1.14"
@@ -33208,17 +33178,6 @@
       "integrity": "sha512-HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg==",
       "dev": true
     },
-    "@es-joy/jsdoccomment": {
-      "version": "0.10.7",
-      "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.10.7.tgz",
-      "integrity": "sha512-aNKZEoMESDzOBjKxCWrFuG50mcpMeKVBnBNko4+IZZ5t9zXYs8GT1KB0ZaOq1YUsKumDRc6YII/TQm309MJ0KQ==",
-      "dev": true,
-      "requires": {
-        "comment-parser": "1.2.3",
-        "esquery": "^1.4.0",
-        "jsdoc-type-pratt-parser": "1.1.1"
-      }
-    },
     "@eslint/eslintrc": {
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
@@ -37816,9 +37775,9 @@
       "dev": true
     },
     "comment-parser": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.2.3.tgz",
-      "integrity": "sha512-vnqDwBSXSsdAkGS5NjwMIPelE47q+UkEgWKHvCDNhVIIaQSUFY6sNnEYGzdoPGMdpV+7KR3ZkRd7oyWIjtuvJg==",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.1.5.tgz",
+      "integrity": "sha512-RePCE4leIhBlmrqiYTvaqEeGYg7qpSl4etaIabKtdOQVi+mSTIBBklGUwIr79GXYnl3LpMwmDw4KeR2stNc6FA==",
       "dev": true
     },
     "commondir": {
@@ -40363,31 +40322,20 @@
       }
     },
     "eslint-plugin-jsdoc": {
-      "version": "36.0.6",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-36.0.6.tgz",
-      "integrity": "sha512-vOm27rI2SMfi1bOAYmzzGkanMCD/boquKwvN5ECi8EF9ASsXJwlnCzYtiOYpsDpbC2+6JXEHAmWMkqYNA3BWRw==",
+      "version": "32.3.4",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-32.3.4.tgz",
+      "integrity": "sha512-xSWfsYvffXnN0OkwLnB7MoDDDDjqcp46W7YlY1j7JyfAQBQ+WnGCfLov3gVNZjUGtK9Otj8mEhTZTqJu4QtIGA==",
       "dev": true,
       "requires": {
-        "@es-joy/jsdoccomment": "0.10.7",
-        "comment-parser": "1.2.3",
-        "debug": "^4.3.2",
-        "esquery": "^1.4.0",
-        "jsdoc-type-pratt-parser": "^1.1.1",
+        "comment-parser": "1.1.5",
+        "debug": "^4.3.1",
+        "jsdoctypeparser": "^9.0.0",
         "lodash": "^4.17.21",
-        "regextras": "^0.8.0",
+        "regextras": "^0.7.1",
         "semver": "^7.3.5",
         "spdx-expression-parse": "^3.0.1"
       },
       "dependencies": {
-        "debug": {
-          "version": "4.3.2",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-          "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
         "semver": {
           "version": "7.3.5",
           "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
@@ -45749,10 +45697,10 @@
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
       "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
     },
-    "jsdoc-type-pratt-parser": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-1.1.1.tgz",
-      "integrity": "sha512-uelRmpghNwPBuZScwgBG/OzodaFk5RbO5xaivBdsAY70icWfShwZ7PCMO0x1zSkOa8T1FzHThmrdoyg/0AwV5g==",
+    "jsdoctypeparser": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/jsdoctypeparser/-/jsdoctypeparser-9.0.0.tgz",
+      "integrity": "sha512-jrTA2jJIL6/DAEILBEh2/w9QxCuwmvNXIry39Ay/HVfhE3o2yVV0U44blYkqdHA/OKloJEqvJy0xU+GSdE2SIw==",
       "dev": true
     },
     "jsdom": {
@@ -49773,9 +49721,9 @@
       }
     },
     "regextras": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/regextras/-/regextras-0.8.0.tgz",
-      "integrity": "sha512-k519uI04Z3SaY0fLX843MRXnDeG2+vHOFsyhiPZvNLe7r8rD2YNRjq4BQLZZ0oAr2NrtvZlICsXysGNFPGa3CQ==",
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/regextras/-/regextras-0.7.1.tgz",
+      "integrity": "sha512-9YXf6xtW+qzQ+hcMQXx95MOvfqXFgsKDZodX3qZB0x2n5Z94ioetIITsBtvJbiOyxa/6s9AtyweBLCdPmPko/w==",
       "dev": true
     },
     "registry-auth-token": {
diff --git a/package.json b/package.json
index 2aee05d56..3ae83a376 100644
--- a/package.json
+++ b/package.json
@@ -147,12 +147,12 @@
     "@typescript-eslint/eslint-plugin": "^4.22.0",
     "@typescript-eslint/parser": "^4.22.0",
     "check-es-compat": "^1.1.1",
-    "eslint": "^7.31.0",
+    "eslint": "^7.25.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-header": "^3.1.1",
-    "eslint-plugin-import": "^2.23.4",
-    "eslint-plugin-jest": "^24.4.0",
-    "eslint-plugin-jsdoc": "^36.0.3",
+    "eslint-plugin-import": "^2.22.1",
+    "eslint-plugin-jest": "^24.3.6",
+    "eslint-plugin-jsdoc": "^32.3.3",
     "eslint-plugin-prefer-arrow": "^1.2.3",
     "eslint-plugin-promise": "^5.1.0",
     "faker": "^5.1.0",

From c6a90e251fb2d196506fa3dd82e607294a67ff57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 9 Aug 2021 12:00:39 +0200
Subject: [PATCH 0042/1008] Revert "MOBILE-3833 config: Disable chart.js
 CommonJS warning"

This reverts commit 9544aa179d1ddefee448daa4fe9183c2e316d536.
---
 angular.json | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/angular.json b/angular.json
index 036390079..c1275f42d 100644
--- a/angular.json
+++ b/angular.json
@@ -14,9 +14,6 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "allowedCommonJsDependencies":[
-                "chart.js"
-            ],
             "outputPath": "www",
             "index": "src/index.html",
             "main": "src/main.ts",
@@ -49,6 +46,7 @@
               },
               "outputHashing": "all",
               "sourceMap": false,
+              "extractCss": true,
               "namedChunks": false,
               "aot": true,
               "extractLicenses": true,

From f7eac329831262c297fae1c7819fedfa60d634b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 9 Aug 2021 12:00:53 +0200
Subject: [PATCH 0043/1008] Revert "MOBILE-3833 config: Update to angular 11"

This reverts commit b835b6195aedfeff88c44fb09854720cf755b573.
---
 .gitignore        |     1 -
 package-lock.json | 38061 ++++++++++++++++++++++----------------------
 package.json      |    86 +-
 tsconfig.json     |     6 +-
 4 files changed, 19151 insertions(+), 19003 deletions(-)

diff --git a/.gitignore b/.gitignore
index b9c20f25f..d3b41f8be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,7 +22,6 @@ npm-debug.log*
 /.sass-cache
 /.sourcemaps
 /.versions
-/.vscode
 /coverage
 /dist
 /node_modules
diff --git a/package-lock.json b/package-lock.json
index b80623d42..3748913af 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,40 +9,40 @@
       "version": "3.9.6-dev",
       "license": "Apache-2.0",
       "dependencies": {
-        "@angular/animations": "~11.2.14",
-        "@angular/common": "~11.2.14",
-        "@angular/core": "~11.2.14",
-        "@angular/forms": "~11.2.14",
-        "@angular/platform-browser": "~11.2.14",
-        "@angular/platform-browser-dynamic": "~11.2.14",
-        "@angular/router": "~11.2.14",
-        "@ionic-native/badge": "^5.34.0",
-        "@ionic-native/camera": "^5.34.0",
-        "@ionic-native/chooser": "^5.34.0",
-        "@ionic-native/clipboard": "^5.34.0",
-        "@ionic-native/core": "^5.34.0",
-        "@ionic-native/device": "^5.34.0",
-        "@ionic-native/diagnostic": "^5.34.0",
-        "@ionic-native/file": "^5.34.0",
-        "@ionic-native/file-opener": "^5.34.0",
-        "@ionic-native/file-transfer": "^5.34.0",
-        "@ionic-native/geolocation": "^5.34.0",
-        "@ionic-native/http": "^5.34.0",
-        "@ionic-native/in-app-browser": "^5.34.0",
-        "@ionic-native/ionic-webview": "^5.34.0",
-        "@ionic-native/keyboard": "^5.34.0",
-        "@ionic-native/local-notifications": "^5.34.0",
-        "@ionic-native/media": "^5.34.0",
-        "@ionic-native/media-capture": "^5.34.0",
-        "@ionic-native/network": "^5.34.0",
-        "@ionic-native/push": "^5.34.0",
-        "@ionic-native/qr-scanner": "^5.34.0",
-        "@ionic-native/splash-screen": "^5.34.0",
-        "@ionic-native/sqlite": "^5.34.0",
-        "@ionic-native/status-bar": "^5.34.0",
-        "@ionic-native/web-intent": "^5.34.0",
-        "@ionic-native/zip": "^5.34.0",
-        "@ionic/angular": "^5.6.13",
+        "@angular/animations": "~10.0.14",
+        "@angular/common": "~10.0.14",
+        "@angular/core": "~10.0.14",
+        "@angular/forms": "~10.0.14",
+        "@angular/platform-browser": "~10.0.14",
+        "@angular/platform-browser-dynamic": "~10.0.14",
+        "@angular/router": "~10.0.14",
+        "@ionic-native/badge": "^5.33.0",
+        "@ionic-native/camera": "^5.33.0",
+        "@ionic-native/chooser": "^5.33.0",
+        "@ionic-native/clipboard": "^5.33.0",
+        "@ionic-native/core": "^5.33.0",
+        "@ionic-native/device": "^5.33.0",
+        "@ionic-native/diagnostic": "^5.33.0",
+        "@ionic-native/file": "^5.33.0",
+        "@ionic-native/file-opener": "^5.33.0",
+        "@ionic-native/file-transfer": "^5.33.0",
+        "@ionic-native/geolocation": "^5.33.0",
+        "@ionic-native/http": "^5.33.0",
+        "@ionic-native/in-app-browser": "^5.33.0",
+        "@ionic-native/ionic-webview": "^5.33.0",
+        "@ionic-native/keyboard": "^5.33.0",
+        "@ionic-native/local-notifications": "^5.33.0",
+        "@ionic-native/media": "^5.33.0",
+        "@ionic-native/media-capture": "^5.33.0",
+        "@ionic-native/network": "^5.33.0",
+        "@ionic-native/push": "^5.33.0",
+        "@ionic-native/qr-scanner": "^5.33.0",
+        "@ionic-native/splash-screen": "^5.33.0",
+        "@ionic-native/sqlite": "^5.33.0",
+        "@ionic-native/status-bar": "^5.33.0",
+        "@ionic-native/web-intent": "^5.33.0",
+        "@ionic-native/zip": "^5.33.0",
+        "@ionic/angular": "^5.6.6",
         "@moodlehq/cordova-plugin-file-transfer": "1.7.1-moodle.2",
         "@moodlehq/cordova-plugin-inappbrowser": "5.0.0-moodle.2",
         "@moodlehq/cordova-plugin-local-notification": "0.9.0-moodle.2",
@@ -52,11 +52,11 @@
         "@ngx-translate/http-loader": "^6.0.0",
         "@types/chart.js": "^2.9.31",
         "@types/cordova": "0.0.34",
-        "@types/dom-mediacapture-record": "^1.0.10",
+        "@types/dom-mediacapture-record": "^1.0.7",
         "chart.js": "^2.9.4",
         "com-darryncampbell-cordova-plugin-intent": "^1.3.0",
         "cordova": "^10.0.0",
-        "cordova-android": "^10.0.1",
+        "cordova-android": "^9.1.0",
         "cordova-android-support-gradle-release": "^3.0.1",
         "cordova-clipboard": "^1.3.0",
         "cordova-ios": "^6.2.0",
@@ -100,17 +100,17 @@
         "zone.js": "~0.10.3"
       },
       "devDependencies": {
-        "@angular-devkit/build-angular": "~0.1102.14",
+        "@angular-devkit/build-angular": "~0.1000.8",
         "@angular-eslint/builder": "^4.2.0",
         "@angular-eslint/eslint-plugin": "^4.2.0",
         "@angular-eslint/eslint-plugin-template": "^4.2.0",
         "@angular-eslint/schematics": "^4.2.0",
         "@angular-eslint/template-parser": "^4.2.0",
-        "@angular/cli": "~11.2.14",
-        "@angular/compiler": "~11.2.14",
-        "@angular/compiler-cli": "~11.2.14",
-        "@angular/language-service": "~11.2.14",
-        "@ionic/angular-toolkit": "^4.0.0",
+        "@angular/cli": "~10.0.8",
+        "@angular/compiler": "~10.0.14",
+        "@angular/compiler-cli": "~10.0.14",
+        "@angular/language-service": "~10.0.14",
+        "@ionic/angular-toolkit": "^2.3.3",
         "@ionic/cli": "^6.14.1",
         "@types/faker": "^5.1.3",
         "@types/node": "^12.12.64",
@@ -142,7 +142,7 @@
         "native-run": "^1.4.0",
         "ts-jest": "^26.4.1",
         "ts-node": "~8.3.0",
-        "typescript": "^4.1.6"
+        "typescript": "^3.9.9"
       },
       "engines": {
         "node": ">=12.x"
@@ -152,25 +152,25 @@
       }
     },
     "node_modules/@angular-devkit/architect": {
-      "version": "0.1200.5",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1200.5.tgz",
-      "integrity": "sha512-222VZ4OeaDK3vON8V5m+w15SRWfUs5uOb4H9ij/H9/6tyHD83uWfCDoOGg+ax4wJVdWEFJIS+Vn4ijGcZCq9WQ==",
+      "version": "0.1101.2",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1101.2.tgz",
+      "integrity": "sha512-MLmBfHiiyPhbFSSAX4oMecPjEuBauOui5uBpI6BKNnk/7783fznbkbAKjXlOco7M81gkNeEoHMR8c+mOfcvv7g==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "@angular-devkit/core": "12.0.5",
-        "rxjs": "6.6.7"
+        "@angular-devkit/core": "11.1.2",
+        "rxjs": "6.6.3"
       },
       "engines": {
-        "node": "^12.14.1 || >=14.0.0",
-        "npm": "^6.11.0 || ^7.5.6",
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
         "yarn": ">= 1.13.0"
       }
     },
     "node_modules/@angular-devkit/architect/node_modules/rxjs": {
-      "version": "6.6.7",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+      "version": "6.6.3",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
+      "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -188,162 +188,129 @@
       "peer": true
     },
     "node_modules/@angular-devkit/build-angular": {
-      "version": "0.1102.14",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.1102.14.tgz",
-      "integrity": "sha512-SyX9SK3qfpk6xNIrxpxYi8zxP/cN2kny4I+XYbkKvgGiE3qhkrC/PRJE9OWj0sloekLD0CDfFWOvIiw3GMc4Tg==",
+      "version": "0.1000.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.1000.8.tgz",
+      "integrity": "sha512-wwDN2oadQvYPL7lDmvGsoWQjW++0ZnxWk1QVlABGhBSIs8Uxs26Hjd5YNUSsvJavBkqb1UZIOilqzb4dig5MIA==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/architect": "0.1102.14",
-        "@angular-devkit/build-optimizer": "0.1102.14",
-        "@angular-devkit/build-webpack": "0.1102.14",
-        "@angular-devkit/core": "11.2.14",
-        "@babel/core": "7.12.10",
-        "@babel/generator": "7.12.11",
-        "@babel/plugin-transform-async-to-generator": "7.12.1",
-        "@babel/plugin-transform-runtime": "7.12.10",
-        "@babel/preset-env": "7.12.11",
-        "@babel/runtime": "7.12.5",
-        "@babel/template": "7.12.7",
-        "@discoveryjs/json-ext": "0.5.2",
-        "@jsdevtools/coverage-istanbul-loader": "3.0.5",
-        "@ngtools/webpack": "11.2.14",
-        "ansi-colors": "4.1.1",
-        "autoprefixer": "10.2.4",
-        "babel-loader": "8.2.2",
+        "@angular-devkit/architect": "0.1000.8",
+        "@angular-devkit/build-optimizer": "0.1000.8",
+        "@angular-devkit/build-webpack": "0.1000.8",
+        "@angular-devkit/core": "10.0.8",
+        "@babel/core": "7.9.6",
+        "@babel/generator": "7.9.6",
+        "@babel/plugin-transform-runtime": "7.9.6",
+        "@babel/preset-env": "7.9.6",
+        "@babel/runtime": "7.9.6",
+        "@babel/template": "7.8.6",
+        "@jsdevtools/coverage-istanbul-loader": "3.0.3",
+        "@ngtools/webpack": "10.0.8",
+        "ajv": "6.12.3",
+        "autoprefixer": "9.8.0",
+        "babel-loader": "8.1.0",
         "browserslist": "^4.9.1",
-        "cacache": "15.0.5",
+        "cacache": "15.0.3",
         "caniuse-lite": "^1.0.30001032",
-        "circular-dependency-plugin": "5.2.2",
-        "copy-webpack-plugin": "6.3.2",
-        "core-js": "3.8.3",
-        "critters": "0.0.7",
-        "css-loader": "5.0.1",
-        "cssnano": "5.0.2",
-        "file-loader": "6.2.0",
+        "circular-dependency-plugin": "5.2.0",
+        "copy-webpack-plugin": "6.0.3",
+        "core-js": "3.6.4",
+        "css-loader": "3.5.3",
+        "cssnano": "4.1.10",
+        "file-loader": "6.0.0",
         "find-cache-dir": "3.3.1",
         "glob": "7.1.6",
-        "https-proxy-agent": "5.0.0",
-        "inquirer": "7.3.3",
-        "jest-worker": "26.6.2",
+        "jest-worker": "26.0.0",
         "karma-source-map-support": "1.4.0",
-        "less": "4.1.1",
-        "less-loader": "7.3.0",
-        "license-webpack-plugin": "2.3.11",
+        "less-loader": "6.1.0",
+        "license-webpack-plugin": "2.2.0",
         "loader-utils": "2.0.0",
-        "mini-css-extract-plugin": "1.3.5",
+        "mini-css-extract-plugin": "0.9.0",
         "minimatch": "3.0.4",
-        "open": "7.4.0",
-        "ora": "5.3.0",
-        "parse5-html-rewriting-stream": "6.0.1",
+        "open": "7.0.4",
+        "parse5": "4.0.0",
         "pnp-webpack-plugin": "1.6.4",
-        "postcss": "8.2.15",
-        "postcss-import": "14.0.0",
-        "postcss-loader": "4.2.0",
-        "raw-loader": "4.0.2",
-        "regenerator-runtime": "0.13.7",
-        "resolve-url-loader": "4.0.0",
+        "postcss": "7.0.31",
+        "postcss-import": "12.0.1",
+        "postcss-loader": "3.0.0",
+        "raw-loader": "4.0.1",
+        "regenerator-runtime": "0.13.5",
+        "resolve-url-loader": "3.1.1",
         "rimraf": "3.0.2",
-        "rollup": "2.38.4",
-        "rxjs": "6.6.3",
-        "sass": "1.32.6",
-        "sass-loader": "10.1.1",
-        "semver": "7.3.4",
+        "rollup": "2.10.9",
+        "rxjs": "6.5.5",
+        "sass": "1.26.5",
+        "sass-loader": "8.0.2",
+        "semver": "7.3.2",
         "source-map": "0.7.3",
-        "source-map-loader": "1.1.3",
+        "source-map-loader": "1.0.0",
         "source-map-support": "0.5.19",
-        "speed-measure-webpack-plugin": "1.4.2",
-        "style-loader": "2.0.0",
-        "stylus": "0.54.8",
-        "stylus-loader": "4.3.3",
-        "terser": "5.5.1",
-        "terser-webpack-plugin": "4.2.3",
-        "text-table": "0.2.0",
+        "speed-measure-webpack-plugin": "1.3.3",
+        "style-loader": "1.2.1",
+        "stylus": "0.54.7",
+        "stylus-loader": "3.0.2",
+        "terser": "4.7.0",
+        "terser-webpack-plugin": "3.0.1",
         "tree-kill": "1.2.2",
-        "webpack": "4.44.2",
+        "webpack": "4.43.0",
         "webpack-dev-middleware": "3.7.2",
-        "webpack-dev-server": "3.11.2",
-        "webpack-merge": "5.7.3",
-        "webpack-sources": "2.2.0",
-        "webpack-subresource-integrity": "1.5.2",
-        "worker-plugin": "5.0.0"
+        "webpack-dev-server": "3.11.0",
+        "webpack-merge": "4.2.2",
+        "webpack-sources": "1.4.3",
+        "webpack-subresource-integrity": "1.4.1",
+        "worker-plugin": "4.0.3"
       },
       "engines": {
         "node": ">= 10.13.0",
-        "npm": "^6.11.0 || ^7.5.6",
+        "npm": ">= 6.11.0",
         "yarn": ">= 1.13.0"
       },
       "peerDependencies": {
-        "@angular/compiler-cli": "^11.0.0 || ^11.2.0-next",
-        "@angular/localize": "^11.0.0 || ^11.2.0-next",
-        "@angular/service-worker": "^11.0.0 || ^11.2.0-next",
-        "karma": "^5.2.0 || ^6.0.0",
-        "ng-packagr": "^11.0.0 || ^11.2.0-next",
-        "protractor": "^7.0.0",
-        "tailwindcss": "^2.0.0",
-        "tslint": "^6.1.0",
-        "typescript": "~4.0.0 || ~4.1.0"
+        "@angular/compiler-cli": ">=10.0.0-next.0 < 11",
+        "typescript": ">=3.9 < 3.10"
       },
       "peerDependenciesMeta": {
         "@angular/localize": {
           "optional": true
-        },
-        "@angular/service-worker": {
-          "optional": true
-        },
-        "karma": {
-          "optional": true
-        },
-        "ng-packagr": {
-          "optional": true
-        },
-        "protractor": {
-          "optional": true
-        },
-        "tailwindcss": {
-          "optional": true
-        },
-        "tslint": {
-          "optional": true
         }
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/architect": {
-      "version": "0.1102.14",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.14.tgz",
-      "integrity": "sha512-965TVXuBtRb8RySgxRxUEO+YTd7mT0xiqVHSe+MHvMtUCmEE9vwRofFZl6axkK5ri4fiomiMnOVE19aw4spgNQ==",
+      "version": "0.1000.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1000.8.tgz",
+      "integrity": "sha512-2AqPbiEugtPxNz4MGhLh+imUVelhW9h1cdJs2AbxZosIxftPb5DNDQUSAwVmRGp4CtcXVrlvcDwc0f4Fw1aiIA==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "11.2.14",
-        "rxjs": "6.6.3"
+        "@angular-devkit/core": "10.0.8",
+        "rxjs": "6.5.5"
       },
       "engines": {
         "node": ">= 10.13.0",
-        "npm": "^6.11.0 || ^7.5.6",
+        "npm": ">= 6.11.0",
         "yarn": ">= 1.13.0"
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/core": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
-      "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
+      "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
       "dev": true,
       "dependencies": {
-        "ajv": "6.12.6",
+        "ajv": "6.12.3",
         "fast-json-stable-stringify": "2.1.0",
         "magic-string": "0.25.7",
-        "rxjs": "6.6.3",
+        "rxjs": "6.5.5",
         "source-map": "0.7.3"
       },
       "engines": {
         "node": ">= 10.13.0",
-        "npm": "^6.11.0 || ^7.5.6",
+        "npm": ">= 6.11.0",
         "yarn": ">= 1.13.0"
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "version": "6.12.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
       "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
@@ -357,9 +324,9 @@
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/core-js": {
-      "version": "3.8.3",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.8.3.tgz",
-      "integrity": "sha512-KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q==",
+      "version": "3.6.4",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
+      "integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==",
       "dev": true,
       "hasInstallScript": true,
       "funding": {
@@ -367,83 +334,61 @@
         "url": "https://opencollective.com/core-js"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/rxjs": {
-      "version": "6.6.3",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
-      "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
+    "node_modules/@angular-devkit/build-angular/node_modules/open": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/open/-/open-7.0.4.tgz",
+      "integrity": "sha512-brSA+/yq+b08Hsr4c8fsEW2CRzk1BmfN3SAK/5VCHQ9bdoZJ4qa/+AfR0xHjlbbZUyPkUHs1b8x1RqdyZdkVqQ==",
       "dev": true,
       "dependencies": {
-        "tslib": "^1.9.0"
+        "is-docker": "^2.0.0",
+        "is-wsl": "^2.1.1"
       },
       "engines": {
-        "npm": ">=2.0.0"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
-    },
     "node_modules/@angular-devkit/build-optimizer": {
-      "version": "0.1102.14",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.1102.14.tgz",
-      "integrity": "sha512-1j69rFqE6tPMO0lQvOH8ogF7vE+p+Ws1/OtdZKUkZPOerIbQ8A3n5wzCx6/ZzMVhBQ3sXNhaShb4b9/1YuwU/g==",
+      "version": "0.1000.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.1000.8.tgz",
+      "integrity": "sha512-esODHuTGEEMx1SmLUq03VAMly8gZUd1vRuvZeKS5HqKwDg8ZzcI7/25BuuUSlyST+6BEdjo2gnmagQnG0VBdQw==",
       "dev": true,
       "dependencies": {
         "loader-utils": "2.0.0",
         "source-map": "0.7.3",
-        "tslib": "2.1.0",
-        "typescript": "4.1.5",
-        "webpack-sources": "2.2.0"
+        "tslib": "2.0.0",
+        "webpack-sources": "1.4.3"
       },
       "bin": {
         "build-optimizer": "src/build-optimizer/cli.js"
       },
       "engines": {
         "node": ">= 10.13.0",
-        "npm": "^6.11.0 || ^7.5.6",
+        "npm": ">= 6.11.0",
         "yarn": ">= 1.13.0"
       }
     },
     "node_modules/@angular-devkit/build-optimizer/node_modules/tslib": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz",
-      "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.0.tgz",
+      "integrity": "sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==",
       "dev": true
     },
-    "node_modules/@angular-devkit/build-optimizer/node_modules/typescript": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.1.5.tgz",
-      "integrity": "sha512-6OSu9PTIzmn9TCDiovULTnET6BgXtDYL4Gg4szY+cGsc3JP1dQL8qvE8kShTRx1NIw4Q9IBHlwODjkjWEtMUyA==",
-      "dev": true,
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=4.2.0"
-      }
-    },
     "node_modules/@angular-devkit/build-webpack": {
-      "version": "0.1102.14",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1102.14.tgz",
-      "integrity": "sha512-+dJvzrwjbHY0bNr8fUDVbn4D4pAT/h1YVpGVyaoX7q66LN0x61zRC3e10gJ/Mr54l3yfc26M0OPD9KG8iZRbCA==",
+      "version": "0.1000.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1000.8.tgz",
+      "integrity": "sha512-y/U+dV5N8W7KECncGSKQWoUH/DFNZCseczyl6LAd8bc0fMr8Z0TAIe8OXj+5CSRRdejWfRIxGtNWM+L2kTCU8A==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/architect": "0.1102.14",
-        "@angular-devkit/core": "11.2.14",
-        "rxjs": "6.6.3"
+        "@angular-devkit/architect": "0.1000.8",
+        "@angular-devkit/core": "10.0.8",
+        "rxjs": "6.5.5"
       },
       "engines": {
         "node": ">= 10.13.0",
-        "npm": "^6.11.0 || ^7.5.6",
+        "npm": ">= 6.11.0",
         "yarn": ">= 1.13.0"
       },
       "peerDependencies": {
@@ -452,42 +397,42 @@
       }
     },
     "node_modules/@angular-devkit/build-webpack/node_modules/@angular-devkit/architect": {
-      "version": "0.1102.14",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.14.tgz",
-      "integrity": "sha512-965TVXuBtRb8RySgxRxUEO+YTd7mT0xiqVHSe+MHvMtUCmEE9vwRofFZl6axkK5ri4fiomiMnOVE19aw4spgNQ==",
+      "version": "0.1000.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1000.8.tgz",
+      "integrity": "sha512-2AqPbiEugtPxNz4MGhLh+imUVelhW9h1cdJs2AbxZosIxftPb5DNDQUSAwVmRGp4CtcXVrlvcDwc0f4Fw1aiIA==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "11.2.14",
-        "rxjs": "6.6.3"
+        "@angular-devkit/core": "10.0.8",
+        "rxjs": "6.5.5"
       },
       "engines": {
         "node": ">= 10.13.0",
-        "npm": "^6.11.0 || ^7.5.6",
+        "npm": ">= 6.11.0",
         "yarn": ">= 1.13.0"
       }
     },
     "node_modules/@angular-devkit/build-webpack/node_modules/@angular-devkit/core": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
-      "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
+      "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
       "dev": true,
       "dependencies": {
-        "ajv": "6.12.6",
+        "ajv": "6.12.3",
         "fast-json-stable-stringify": "2.1.0",
         "magic-string": "0.25.7",
-        "rxjs": "6.6.3",
+        "rxjs": "6.5.5",
         "source-map": "0.7.3"
       },
       "engines": {
         "node": ">= 10.13.0",
-        "npm": "^6.11.0 || ^7.5.6",
+        "npm": ">= 6.11.0",
         "yarn": ">= 1.13.0"
       }
     },
     "node_modules/@angular-devkit/build-webpack/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "version": "6.12.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
       "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
@@ -500,54 +445,46 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/@angular-devkit/build-webpack/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/@angular-devkit/build-webpack/node_modules/rxjs": {
-      "version": "6.6.3",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
-      "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^1.9.0"
-      },
-      "engines": {
-        "npm": ">=2.0.0"
-      }
-    },
-    "node_modules/@angular-devkit/build-webpack/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
-    },
     "node_modules/@angular-devkit/core": {
-      "version": "12.0.5",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-12.0.5.tgz",
-      "integrity": "sha512-zVSQV+8/vjUjsUKGlj8Kf5LioA6AXJTGI0yhHW9q1dFX4dPpbW63k0R1UoIB2wJ0F/AbYVgpnPGPe9BBm2fvZA==",
+      "version": "11.1.2",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.1.2.tgz",
+      "integrity": "sha512-V7zOMqL2l56JcwXVyswkG+7+t67r9XtkrVzRcG2Z5ZYwafU+iKWMwg5kBFZr1SX7fM1M9E4MpskxqtagQeUKng==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "ajv": "8.2.0",
-        "ajv-formats": "2.0.2",
+        "ajv": "6.12.6",
         "fast-json-stable-stringify": "2.1.0",
         "magic-string": "0.25.7",
-        "rxjs": "6.6.7",
+        "rxjs": "6.6.3",
         "source-map": "0.7.3"
       },
       "engines": {
-        "node": "^12.14.1 || >=14.0.0",
-        "npm": "^6.11.0 || ^7.5.6",
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
         "yarn": ">= 1.13.0"
       }
     },
+    "node_modules/@angular-devkit/core/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
     "node_modules/@angular-devkit/core/node_modules/rxjs": {
-      "version": "6.6.7",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+      "version": "6.6.3",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
+      "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -565,49 +502,48 @@
       "peer": true
     },
     "node_modules/@angular-devkit/schematics": {
-      "version": "12.1.4",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.1.4.tgz",
-      "integrity": "sha512-yD3y3pK/K5piOgvALFoCCiPp4H8emNa3yZL+vlpEpewVLpF1MM55LeTxc0PI5s0uqtOGVnvcbA5wYgMm3YsUEA==",
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.0.8.tgz",
+      "integrity": "sha512-p2PjvrExuzOe/azyOEcBeIgwZIk4D6VeLkJf/KVjhXOVu13pjIXHX7/qWl+IYnbtj3NZGHqXM5Cr8nxsJNIMpw==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "12.1.4",
-        "ora": "5.4.1",
-        "rxjs": "6.6.7"
+        "@angular-devkit/core": "10.0.8",
+        "ora": "4.0.4",
+        "rxjs": "6.5.5"
       },
       "engines": {
-        "node": "^12.14.1 || >=14.0.0",
-        "npm": "^6.11.0 || ^7.5.6",
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
         "yarn": ">= 1.13.0"
       }
     },
     "node_modules/@angular-devkit/schematics/node_modules/@angular-devkit/core": {
-      "version": "12.1.4",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-12.1.4.tgz",
-      "integrity": "sha512-KOzGD8JbP/7EeUwPiU5x+fo3ZEQ5R4IVW5WoH92PaO3mdpqXC7UL2MWLct8PUe9il9nqJMvrBMldSSvP9PCT2w==",
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
+      "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
       "dev": true,
       "dependencies": {
-        "ajv": "8.6.0",
-        "ajv-formats": "2.1.0",
+        "ajv": "6.12.3",
         "fast-json-stable-stringify": "2.1.0",
         "magic-string": "0.25.7",
-        "rxjs": "6.6.7",
+        "rxjs": "6.5.5",
         "source-map": "0.7.3"
       },
       "engines": {
-        "node": "^12.14.1 || >=14.0.0",
-        "npm": "^6.11.0 || ^7.5.6",
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
         "yarn": ">= 1.13.0"
       }
     },
     "node_modules/@angular-devkit/schematics/node_modules/ajv": {
-      "version": "8.6.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz",
-      "integrity": "sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==",
+      "version": "6.12.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
       "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
         "uri-js": "^4.2.2"
       },
       "funding": {
@@ -615,132 +551,10 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/@angular-devkit/schematics/node_modules/ajv-formats": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.0.tgz",
-      "integrity": "sha512-USH2jBb+C/hIpwD2iRjp0pe0k+MvzG0mlSn/FIdCgQhUb9ALPRjt2KIQdfZDS9r0ZIeUAg7gOu9KL0PFqGqr5Q==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "ajv": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-devkit/schematics/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@angular-devkit/schematics/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@angular-devkit/schematics/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@angular-devkit/schematics/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@angular-devkit/schematics/node_modules/ora": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
-      "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
-      "dev": true,
-      "dependencies": {
-        "bl": "^4.1.0",
-        "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-spinners": "^2.5.0",
-        "is-interactive": "^1.0.0",
-        "is-unicode-supported": "^0.1.0",
-        "log-symbols": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "wcwidth": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@angular-devkit/schematics/node_modules/rxjs": {
-      "version": "6.6.7",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^1.9.0"
-      },
-      "engines": {
-        "npm": ">=2.0.0"
-      }
-    },
-    "node_modules/@angular-devkit/schematics/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@angular-devkit/schematics/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
-    },
     "node_modules/@angular-eslint/builder": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-4.3.0.tgz",
-      "integrity": "sha512-OzCA4jyELbHt8pyRuW6asib26rc+Ihr2SDjp+uoMivfpqjWVPOw0CvvEZj4SbpGvYOHtcAezyS526D2q2tKHvg==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-4.2.0.tgz",
+      "integrity": "sha512-qM4hpweuQ14ul8CU6LKpUWFZs6POUE7HZKdTllUrYuoZMrTpNB1XGelR0pweYzbfo4XRnUaO1NVgWhWOWiD5MA==",
       "dev": true,
       "peerDependencies": {
         "@angular/cli": ">= 11.2.0 < 12.0.0",
@@ -749,9 +563,9 @@
       }
     },
     "node_modules/@angular-eslint/eslint-plugin": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-4.3.0.tgz",
-      "integrity": "sha512-an0fyKzPmpWp9OnstZYXFSCvKnc14F8xfl+HXqvynOiBK63cWTZLlzO+7Z4t3pQiSuiXsEYleRPktWkNWGv0tQ==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-4.2.0.tgz",
+      "integrity": "sha512-G8D8Pso6GcHW8vFkUSvgoKPIOtGTqO+eb5aytGtpogMgzxBRyr0juU/9Uz5dAhO6TOERIj1gPpJQ61R/n/Aaew==",
       "dev": true,
       "dependencies": {
         "@typescript-eslint/experimental-utils": "4.16.1"
@@ -763,9 +577,9 @@
       }
     },
     "node_modules/@angular-eslint/eslint-plugin-template": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-4.3.0.tgz",
-      "integrity": "sha512-5DuCvEa3cYx0G2mZtECAwgJ19xJWAFZ8Fu8mIkKDiof1dcUISs1PvECJ6NhdzfxEJp0McPQn1jtOK0IDRX1eJw==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-4.2.0.tgz",
+      "integrity": "sha512-LC8qqqqVmA/OJAsUt6fQCXLmWP5BL30XFvVsPtrORdxMFt0HI1gvkuz5EVak7PeAXEmerdVarNZr5zmCXIWf3g==",
       "dev": true,
       "dependencies": {
         "@typescript-eslint/experimental-utils": "4.16.1",
@@ -779,14 +593,282 @@
         "typescript": "*"
       }
     },
-    "node_modules/@angular-eslint/schematics": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-4.3.0.tgz",
-      "integrity": "sha512-zHEpvWoT0mdylQw/K7+RccBK2rJq0to6ZbIp9i65+RZZTHbscaJaDISFvBHm5RNwEhoWI7sJ14ci66pnpAxx3g==",
+    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/experimental-utils": {
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.16.1.tgz",
+      "integrity": "sha512-0Hm3LSlMYFK17jO4iY3un1Ve9x1zLNn4EM50Lia+0EV99NdbK+cn0er7HC7IvBA23mBg3P+8dUkMXy4leL33UQ==",
       "dev": true,
       "dependencies": {
-        "@angular-eslint/eslint-plugin": "4.3.0",
-        "@angular-eslint/eslint-plugin-template": "4.3.0",
+        "@types/json-schema": "^7.0.3",
+        "@typescript-eslint/scope-manager": "4.16.1",
+        "@typescript-eslint/types": "4.16.1",
+        "@typescript-eslint/typescript-estree": "4.16.1",
+        "eslint-scope": "^5.0.0",
+        "eslint-utils": "^2.0.0"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "*"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/scope-manager": {
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.16.1.tgz",
+      "integrity": "sha512-6IlZv9JaurqV0jkEg923cV49aAn8V6+1H1DRfhRcvZUrptQ+UtSKHb5kwTayzOYTJJ/RsYZdcvhOEKiBLyc0Cw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.16.1",
+        "@typescript-eslint/visitor-keys": "4.16.1"
+      },
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/types": {
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.16.1.tgz",
+      "integrity": "sha512-nnKqBwMgRlhzmJQF8tnFDZWfunXmJyuXj55xc8Kbfup4PbkzdoDXZvzN8//EiKR27J6vUSU8j4t37yUuYPiLqA==",
+      "dev": true,
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.16.1.tgz",
+      "integrity": "sha512-m8I/DKHa8YbeHt31T+UGd/l8Kwr0XCTCZL3H4HMvvLCT7HU9V7yYdinTOv1gf/zfqNeDcCgaFH2BMsS8x6NvJg==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.16.1",
+        "@typescript-eslint/visitor-keys": "4.16.1",
+        "debug": "^4.1.1",
+        "globby": "^11.0.1",
+        "is-glob": "^4.0.1",
+        "semver": "^7.3.2",
+        "tsutils": "^3.17.1"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.16.1.tgz",
+      "integrity": "sha512-s/aIP1XcMkEqCNcPQtl60ogUYjSM8FU2mq1O7y5cFf3Xcob1z1iXWNB6cC43Op+NGRTFgGolri6s8z/efA9i1w==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.16.1",
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/experimental-utils": {
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.16.1.tgz",
+      "integrity": "sha512-0Hm3LSlMYFK17jO4iY3un1Ve9x1zLNn4EM50Lia+0EV99NdbK+cn0er7HC7IvBA23mBg3P+8dUkMXy4leL33UQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.3",
+        "@typescript-eslint/scope-manager": "4.16.1",
+        "@typescript-eslint/types": "4.16.1",
+        "@typescript-eslint/typescript-estree": "4.16.1",
+        "eslint-scope": "^5.0.0",
+        "eslint-utils": "^2.0.0"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "*"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.16.1.tgz",
+      "integrity": "sha512-6IlZv9JaurqV0jkEg923cV49aAn8V6+1H1DRfhRcvZUrptQ+UtSKHb5kwTayzOYTJJ/RsYZdcvhOEKiBLyc0Cw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.16.1",
+        "@typescript-eslint/visitor-keys": "4.16.1"
+      },
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.16.1.tgz",
+      "integrity": "sha512-nnKqBwMgRlhzmJQF8tnFDZWfunXmJyuXj55xc8Kbfup4PbkzdoDXZvzN8//EiKR27J6vUSU8j4t37yUuYPiLqA==",
+      "dev": true,
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.16.1.tgz",
+      "integrity": "sha512-m8I/DKHa8YbeHt31T+UGd/l8Kwr0XCTCZL3H4HMvvLCT7HU9V7yYdinTOv1gf/zfqNeDcCgaFH2BMsS8x6NvJg==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.16.1",
+        "@typescript-eslint/visitor-keys": "4.16.1",
+        "debug": "^4.1.1",
+        "globby": "^11.0.1",
+        "is-glob": "^4.0.1",
+        "semver": "^7.3.2",
+        "tsutils": "^3.17.1"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.16.1.tgz",
+      "integrity": "sha512-s/aIP1XcMkEqCNcPQtl60ogUYjSM8FU2mq1O7y5cFf3Xcob1z1iXWNB6cC43Op+NGRTFgGolri6s8z/efA9i1w==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.16.1",
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin/node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@angular-eslint/schematics": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-4.2.0.tgz",
+      "integrity": "sha512-aohGcfYUqN2hFLWaZoOqkLDyYVDFoLC3LwgIknoaDqWkvFG/RUTg1X1pCFjddLQYP5ist8+OppHH+gnYMbftEw==",
+      "dev": true,
+      "dependencies": {
+        "@angular-eslint/eslint-plugin": "4.2.0",
+        "@angular-eslint/eslint-plugin-template": "4.2.0",
         "ignore": "5.1.8",
         "strip-json-comments": "3.1.1",
         "tmp": "0.2.1"
@@ -795,10 +877,22 @@
         "@angular/cli": ">= 11.2.0 < 12.0.0"
       }
     },
+    "node_modules/@angular-eslint/schematics/node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/@angular-eslint/template-parser": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-4.3.0.tgz",
-      "integrity": "sha512-TH+UCrDmOWNLgNgTTR46+wpvgJ3q9Vf9kzqUA5vUNbg/Hhrdbi++DPeCiKagSAXkNBQavqcmyYuT9fzUReIDIg==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-4.2.0.tgz",
+      "integrity": "sha512-77lJ9MDNWmW4ik9l3g149iO9SGRx3qLGZvfSTwmbPxpCgNripWerla9Ia1X+gLkitI8CLpcpiZybxH3EWxj/qQ==",
       "dev": true,
       "dependencies": {
         "eslint-scope": "^5.1.0"
@@ -809,109 +903,104 @@
         "typescript": "*"
       }
     },
+    "node_modules/@angular-eslint/template-parser/node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
     "node_modules/@angular/animations": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-11.2.14.tgz",
-      "integrity": "sha512-Heq/nNrCmb3jbkusu+BQszOecfFI/31Oxxj+CDQkqqYpBcswk6bOJLoEE472o+vmgxaXbgeflU9qbIiCQhpMFA==",
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-10.0.14.tgz",
+      "integrity": "sha512-0BOGQOuaudIG0pq6FAnG55teKM7tEQZdIwdoOf0okhh9n0cFWSWRUjvUxWt25bWswlO+HxELyJioiRUvVSES4g==",
       "dependencies": {
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "@angular/core": "11.2.14"
+        "@angular/core": "10.0.14"
       }
     },
     "node_modules/@angular/cli": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-11.2.14.tgz",
-      "integrity": "sha512-8Ud7vcUK7CKjzT2Ks1glLhleAPIC5ChcrA15XtOb7k+/uMHBkMscP/UKymbVQiBjCJlglbzJoyj8cpVYTZY5KA==",
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-10.0.8.tgz",
+      "integrity": "sha512-unTteffLepsFw7qQulHOLLyLqCpQMOaZo0WO4x6cQGcW2mc0WgwnwBW2JDYMx1U2434t/Q13LqYMPNYWyCGsog==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
-        "@angular-devkit/architect": "0.1102.14",
-        "@angular-devkit/core": "11.2.14",
-        "@angular-devkit/schematics": "11.2.14",
-        "@schematics/angular": "11.2.14",
-        "@schematics/update": "0.1102.14",
+        "@angular-devkit/architect": "0.1000.8",
+        "@angular-devkit/core": "10.0.8",
+        "@angular-devkit/schematics": "10.0.8",
+        "@schematics/angular": "10.0.8",
+        "@schematics/update": "0.1000.8",
         "@yarnpkg/lockfile": "1.1.0",
         "ansi-colors": "4.1.1",
-        "debug": "4.3.1",
-        "ini": "2.0.0",
-        "inquirer": "7.3.3",
-        "jsonc-parser": "3.0.0",
-        "npm-package-arg": "8.1.0",
+        "debug": "4.1.1",
+        "ini": "1.3.5",
+        "inquirer": "7.1.0",
+        "npm-package-arg": "8.0.1",
         "npm-pick-manifest": "6.1.0",
-        "open": "7.4.0",
-        "ora": "5.3.0",
-        "pacote": "11.2.4",
-        "resolve": "1.19.0",
+        "open": "7.0.4",
+        "pacote": "9.5.12",
+        "read-package-tree": "5.3.1",
         "rimraf": "3.0.2",
-        "semver": "7.3.4",
-        "symbol-observable": "3.0.0",
-        "universal-analytics": "0.4.23",
-        "uuid": "8.3.2"
+        "semver": "7.3.2",
+        "symbol-observable": "1.2.0",
+        "universal-analytics": "0.4.20",
+        "uuid": "8.1.0"
       },
       "bin": {
         "ng": "bin/ng"
       },
       "engines": {
         "node": ">= 10.13.0",
-        "npm": "^6.11.0 || ^7.5.6",
+        "npm": ">= 6.11.0",
         "yarn": ">= 1.13.0"
       }
     },
     "node_modules/@angular/cli/node_modules/@angular-devkit/architect": {
-      "version": "0.1102.14",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.14.tgz",
-      "integrity": "sha512-965TVXuBtRb8RySgxRxUEO+YTd7mT0xiqVHSe+MHvMtUCmEE9vwRofFZl6axkK5ri4fiomiMnOVE19aw4spgNQ==",
+      "version": "0.1000.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1000.8.tgz",
+      "integrity": "sha512-2AqPbiEugtPxNz4MGhLh+imUVelhW9h1cdJs2AbxZosIxftPb5DNDQUSAwVmRGp4CtcXVrlvcDwc0f4Fw1aiIA==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "11.2.14",
-        "rxjs": "6.6.3"
+        "@angular-devkit/core": "10.0.8",
+        "rxjs": "6.5.5"
       },
       "engines": {
         "node": ">= 10.13.0",
-        "npm": "^6.11.0 || ^7.5.6",
+        "npm": ">= 6.11.0",
         "yarn": ">= 1.13.0"
       }
     },
     "node_modules/@angular/cli/node_modules/@angular-devkit/core": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
-      "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
+      "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
       "dev": true,
       "dependencies": {
-        "ajv": "6.12.6",
+        "ajv": "6.12.3",
         "fast-json-stable-stringify": "2.1.0",
         "magic-string": "0.25.7",
-        "rxjs": "6.6.3",
+        "rxjs": "6.5.5",
         "source-map": "0.7.3"
       },
       "engines": {
         "node": ">= 10.13.0",
-        "npm": "^6.11.0 || ^7.5.6",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/@angular-devkit/schematics": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.14.tgz",
-      "integrity": "sha512-Ol6+0qdGKzuVJm5gCtQr47X0OCihTfAxI4h047cHYhPFIGGPSvkG/QeJMZugflgoobi2k/xcYokOu/VAkRtWbQ==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/core": "11.2.14",
-        "ora": "5.3.0",
-        "rxjs": "6.6.3"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": "^6.11.0 || ^7.5.6",
+        "npm": ">= 6.11.0",
         "yarn": ">= 1.13.0"
       }
     },
     "node_modules/@angular/cli/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "version": "6.12.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
       "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
@@ -924,64 +1013,223 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/@angular/cli/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/@angular/cli/node_modules/jsonc-parser": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
-      "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==",
-      "dev": true
-    },
-    "node_modules/@angular/cli/node_modules/rxjs": {
-      "version": "6.6.3",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
-      "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
+    "node_modules/@angular/cli/node_modules/ansi-colors": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
       "dev": true,
-      "dependencies": {
-        "tslib": "^1.9.0"
-      },
       "engines": {
-        "npm": ">=2.0.0"
+        "node": ">=6"
       }
     },
-    "node_modules/@angular/cli/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+    "node_modules/@angular/cli/node_modules/ansi-escapes": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
+      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.11.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/cli-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+      "dev": true,
+      "dependencies": {
+        "restore-cursor": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/debug": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
       "dev": true
     },
+    "node_modules/@angular/cli/node_modules/figures": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+      "dev": true,
+      "dependencies": {
+        "escape-string-regexp": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/inquirer": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz",
+      "integrity": "sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^3.0.0",
+        "cli-cursor": "^3.1.0",
+        "cli-width": "^2.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^3.0.0",
+        "lodash": "^4.17.15",
+        "mute-stream": "0.0.8",
+        "run-async": "^2.4.0",
+        "rxjs": "^6.5.3",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "through": "^2.3.6"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@angular/cli/node_modules/open": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/open/-/open-7.0.4.tgz",
+      "integrity": "sha512-brSA+/yq+b08Hsr4c8fsEW2CRzk1BmfN3SAK/5VCHQ9bdoZJ4qa/+AfR0xHjlbbZUyPkUHs1b8x1RqdyZdkVqQ==",
+      "dev": true,
+      "dependencies": {
+        "is-docker": "^2.0.0",
+        "is-wsl": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/restore-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "dev": true,
+      "dependencies": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/string-width": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/type-fest": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
+      "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/uuid": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.1.0.tgz",
+      "integrity": "sha512-CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg==",
+      "dev": true,
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
     "node_modules/@angular/common": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-11.2.14.tgz",
-      "integrity": "sha512-ZSLV/3j7eCTyLf/8g4yBFLWySjiLz3vLJAGWscYoUpnJWMnug1VRu6zoF/COxCbtORgE+Wz6K0uhfS6MziBGVw==",
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-10.0.14.tgz",
+      "integrity": "sha512-EOAuaMt2HwJF3DtIJ/ksHtnF8Pqh5K2rWISYLEs9R3WNaSGn74kbCODAT4pNhI8P22Ykl3H4FmQUgnDZ3uDAUg==",
       "dependencies": {
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "@angular/core": "11.2.14",
+        "@angular/core": "10.0.14",
         "rxjs": "^6.5.3"
       }
     },
     "node_modules/@angular/compiler": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-11.2.14.tgz",
-      "integrity": "sha512-XBOK3HgA+/y6Cz7kOX4zcJYmgJ264XnfcbXUMU2cD7Ac+mbNhLPKohWrEiSWalfcjnpf5gRfufQrQP7lpAGu0A==",
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-10.0.14.tgz",
+      "integrity": "sha512-lYNo6/MmnYAVFoDQDBB6HMFd9zHg3RHXc6hn+wchU0XSWiIsg6WYHbKOb/DyqUEyKebzy0gSKZf7gUeZHtj62Q==",
       "dependencies": {
         "tslib": "^2.0.0"
       }
     },
     "node_modules/@angular/compiler-cli": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-11.2.14.tgz",
-      "integrity": "sha512-A7ltnCp03/EVqK/Q3tVUDsokgz5GHW3dSPGl0Csk7Ys5uBB9ibHTmVt4eiXA4jt0+6Bk+mKxwe5BEDqLvwYFAg==",
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-10.0.14.tgz",
+      "integrity": "sha512-WK+S90sjc+3iMo8/CuuAX0RdGFwyA9esqqC5fYG/MDZjKuPuhogiimmR0rY3P1Th7B9di8x012xiILbf4GsGUQ==",
       "dev": true,
       "dependencies": {
-        "@babel/core": "^7.8.6",
-        "@babel/types": "^7.8.6",
         "canonical-path": "1.0.0",
         "chokidar": "^3.0.0",
         "convert-source-map": "^1.5.1",
@@ -994,7 +1242,7 @@
         "source-map": "^0.6.1",
         "sourcemap-codec": "^1.4.8",
         "tslib": "^2.0.0",
-        "yargs": "^16.2.0"
+        "yargs": "15.3.0"
       },
       "bin": {
         "ivy-ngcc": "ngcc/main-ivy-ngcc.js",
@@ -1006,8 +1254,47 @@
         "node": ">=10.0"
       },
       "peerDependencies": {
-        "@angular/compiler": "11.2.14",
-        "typescript": ">=4.0 <4.2"
+        "@angular/compiler": "10.0.14",
+        "typescript": ">=3.9 <4.0"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/cliui": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.0"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/@angular/compiler-cli/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
     "node_modules/@angular/compiler-cli/node_modules/fs-extra": {
@@ -1021,6 +1308,15 @@
         "universalify": "^0.1.0"
       }
     },
+    "node_modules/@angular/compiler-cli/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@angular/compiler-cli/node_modules/jsonfile": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
@@ -1030,6 +1326,54 @@
         "graceful-fs": "^4.1.6"
       }
     },
+    "node_modules/@angular/compiler-cli/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@angular/compiler-cli/node_modules/semver": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -1048,6 +1392,32 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/@angular/compiler-cli/node_modules/string-width": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@angular/compiler-cli/node_modules/universalify": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
@@ -1057,49 +1427,98 @@
         "node": ">= 4.0.0"
       }
     },
+    "node_modules/@angular/compiler-cli/node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/yargs": {
+      "version": "15.3.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.0.tgz",
+      "integrity": "sha512-g/QCnmjgOl1YJjGsnUg2SatC7NUYEiLXJqxNOQU9qSpjzGtGXda9b+OKccr1kLTy8BN9yqEyqfq5lxlwdc13TA==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^6.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^4.1.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^4.2.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^18.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/yargs-parser": {
+      "version": "18.1.3",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/@angular/core": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-11.2.14.tgz",
-      "integrity": "sha512-vpR4XqBGitk1Faph37CSpemwIYTmJ3pdIVNoHKP6jLonpWu+0azkchf0f7oD8/2ivj2F81opcIw0tcsy/D/5Vg==",
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-10.0.14.tgz",
+      "integrity": "sha512-m+c9g6fA/gE+6K7It01b6r8TEmbuFjUZajQ9gG/pzist0mTBcqfvn0O4h5X+ebnSgw/bbnnp+4PbaXEi1pOWZQ==",
       "dependencies": {
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
         "rxjs": "^6.5.3",
-        "zone.js": "^0.10.2 || ^0.11.3"
+        "zone.js": "~0.10.3"
       }
     },
     "node_modules/@angular/forms": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-11.2.14.tgz",
-      "integrity": "sha512-4LWqY6KEIk1AZQFnk+4PJSOCamlD4tumuVN06gO4D0dZo9Cx+GcvW6pM6N0CPubRvPs3sScCnu20WT11HNWC1w==",
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-10.0.14.tgz",
+      "integrity": "sha512-McKh3rXDlAE7qmCnyWKENb2HhqAT+1dsAfChuqs0w8jhKkoRgA00RDFee6dZ6XQCc907DwuV0K8+wC3CvBp35w==",
       "dependencies": {
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "@angular/common": "11.2.14",
-        "@angular/core": "11.2.14",
-        "@angular/platform-browser": "11.2.14",
+        "@angular/common": "10.0.14",
+        "@angular/core": "10.0.14",
+        "@angular/platform-browser": "10.0.14",
         "rxjs": "^6.5.3"
       }
     },
     "node_modules/@angular/language-service": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-11.2.14.tgz",
-      "integrity": "sha512-3+0F0X4r1WeNOV6VmaMzYnJENPVmLX2/MX3/lugwZPNYKVXl/oGyh/4PB8ktntIj0tnxQuErzqRSeucNStNGRw==",
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-10.0.14.tgz",
+      "integrity": "sha512-QQLYUjD0T6u2hLNYXUEUbupAGsz5egmhCAckaQojvXCe3SLL/hQsrK4odrNuspy7TvMB0H5ZNEHGlF6m/WLZ3g==",
       "dev": true
     },
     "node_modules/@angular/platform-browser": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-11.2.14.tgz",
-      "integrity": "sha512-fb7b7ss/gRoP8wLAN17W62leMgjynuyjEPU2eUoAAazsG9f2cgM+z3rK29GYncDVyYQxZUZYnjSqvL6GSXx86A==",
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-10.0.14.tgz",
+      "integrity": "sha512-DcBZ1wt2TwtXrdcmCTWanAzu2Vxk5Uvioam0UcDxcgXD84T2fHipyfZVn07fMqRvzFQj45tDNAEevFBnGZar4w==",
       "dependencies": {
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "@angular/animations": "11.2.14",
-        "@angular/common": "11.2.14",
-        "@angular/core": "11.2.14"
+        "@angular/animations": "10.0.14",
+        "@angular/common": "10.0.14",
+        "@angular/core": "10.0.14"
       },
       "peerDependenciesMeta": {
         "@angular/animations": {
@@ -1108,73 +1527,82 @@
       }
     },
     "node_modules/@angular/platform-browser-dynamic": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-11.2.14.tgz",
-      "integrity": "sha512-TWTPdFs6iBBcp+/YMsgCRQwdHpWGq8KjeJDJ2tfatGgBD3Gqt2YaHOMST1zPW6RkrmupytTejuVqXzeaKWFxuw==",
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-10.0.14.tgz",
+      "integrity": "sha512-PPCAiNh/JSuQNKXOhj3a8CTFdVhTgF/EpGtaotnVr/BfbJMeFImKo7m2QQOTsAFaEP2DurSHnofPnMWAfHS2mg==",
       "dependencies": {
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "@angular/common": "11.2.14",
-        "@angular/compiler": "11.2.14",
-        "@angular/core": "11.2.14",
-        "@angular/platform-browser": "11.2.14"
+        "@angular/common": "10.0.14",
+        "@angular/compiler": "10.0.14",
+        "@angular/core": "10.0.14",
+        "@angular/platform-browser": "10.0.14"
       }
     },
     "node_modules/@angular/router": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-11.2.14.tgz",
-      "integrity": "sha512-3aYBmj+zrEL9yf/ntIQxHIYaWShZOBKP3U07X2mX+TPMpGlvHDnR7L6bWhQVZwewzMMz7YVR16ldg50IFuAlfA==",
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-10.0.14.tgz",
+      "integrity": "sha512-VWzaNyPZDY99TMszV1GlXJgVOxXsjhJrsv3mIcjaz1dfdlKOeKTVDLdnyXfP9CkwE3PRmvG7eSXppIj6nn9BpQ==",
       "dependencies": {
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "@angular/common": "11.2.14",
-        "@angular/core": "11.2.14",
-        "@angular/platform-browser": "11.2.14",
+        "@angular/common": "10.0.14",
+        "@angular/core": "10.0.14",
+        "@angular/platform-browser": "10.0.14",
         "rxjs": "^6.5.3"
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz",
-      "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+      "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
       "dev": true,
       "dependencies": {
-        "@babel/highlight": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/highlight": "^7.10.4"
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.9.tgz",
-      "integrity": "sha512-p3QjZmMGHDGdpcwEYYWu7i7oJShJvtgMjJeb0W95PPhSm++3lm8YXYOh45Y6iCN9PkZLTZ7CIX5nFrp7pw7TXw==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.11.0.tgz",
+      "integrity": "sha512-TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ==",
       "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
+      "dependencies": {
+        "browserslist": "^4.12.0",
+        "invariant": "^2.2.4",
+        "semver": "^5.5.0"
+      }
+    },
+    "node_modules/@babel/compat-data/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.12.10",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.10.tgz",
-      "integrity": "sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w==",
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz",
+      "integrity": "sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/generator": "^7.12.10",
-        "@babel/helper-module-transforms": "^7.12.1",
-        "@babel/helpers": "^7.12.5",
-        "@babel/parser": "^7.12.10",
-        "@babel/template": "^7.12.7",
-        "@babel/traverse": "^7.12.10",
-        "@babel/types": "^7.12.10",
+        "@babel/code-frame": "^7.8.3",
+        "@babel/generator": "^7.9.6",
+        "@babel/helper-module-transforms": "^7.9.0",
+        "@babel/helpers": "^7.9.6",
+        "@babel/parser": "^7.9.6",
+        "@babel/template": "^7.8.6",
+        "@babel/traverse": "^7.9.6",
+        "@babel/types": "^7.9.6",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.1",
         "json5": "^2.1.2",
-        "lodash": "^4.17.19",
+        "lodash": "^4.17.13",
+        "resolve": "^1.3.2",
         "semver": "^5.4.1",
         "source-map": "^0.5.0"
       },
@@ -1186,6 +1614,30 @@
         "url": "https://opencollective.com/babel"
       }
     },
+    "node_modules/@babel/core/node_modules/debug": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+      "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@babel/core/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
     "node_modules/@babel/core/node_modules/semver": {
       "version": "5.7.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
@@ -1205,13 +1657,14 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz",
-      "integrity": "sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==",
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz",
+      "integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.12.11",
+        "@babel/types": "^7.9.6",
         "jsesc": "^2.5.1",
+        "lodash": "^4.17.13",
         "source-map": "^0.5.0"
       }
     },
@@ -1225,393 +1678,393 @@
       }
     },
     "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.14.5.tgz",
-      "integrity": "sha512-EivH9EgBIb+G8ij1B2jAwSH36WnGvkQSEC6CkX/6v6ZFlw5fVOHvsgGF4uiEHO2GzMvunZb6tDLQEQSdrdocrA==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz",
+      "integrity": "sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/types": "^7.10.4"
       }
     },
     "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.14.5.tgz",
-      "integrity": "sha512-YTA/Twn0vBXDVGJuAX6PwW7x5zQei1luDDo2Pl6q1qZ7hVNl0RZrhHCQG/ArGpR29Vl7ETiB8eJyrvpuRp300w==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz",
+      "integrity": "sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-explode-assignable-expression": "^7.14.5",
-        "@babel/types": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-explode-assignable-expression": "^7.10.4",
+        "@babel/types": "^7.10.4"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz",
-      "integrity": "sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz",
+      "integrity": "sha512-a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.14.5",
-        "@babel/helper-validator-option": "^7.14.5",
-        "browserslist": "^4.16.6",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/compat-data": "^7.10.4",
+        "browserslist": "^4.12.0",
+        "invariant": "^2.2.4",
+        "levenary": "^1.1.1",
+        "semver": "^5.5.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
       "dev": true,
       "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.8.tgz",
-      "integrity": "sha512-bpYvH8zJBWzeqi1o+co8qOrw+EXzQ/0c74gVmY205AWXy9nifHrOg77y+1zwxX5lXE7Icq4sPlSQ4O2kWBrteQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-member-expression-to-functions": "^7.14.7",
-        "@babel/helper-optimise-call-expression": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.14.5",
-        "@babel/helper-split-export-declaration": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
+        "semver": "bin/semver"
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz",
-      "integrity": "sha512-TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz",
+      "integrity": "sha512-2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "regexpu-core": "^4.7.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-annotate-as-pure": "^7.10.4",
+        "@babel/helper-regex": "^7.10.4",
+        "regexpu-core": "^4.7.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-explode-assignable-expression": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.14.5.tgz",
-      "integrity": "sha512-Htb24gnGJdIGT4vnRKMdoXiOIlqOLmdiUYpAQ0mYfgVT/GDm8GOYhgi4GL+hMKrkiPRohO4ts34ELFsGAPQLDQ==",
+    "node_modules/@babel/helper-define-map": {
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz",
+      "integrity": "sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-function-name": "^7.10.4",
+        "@babel/types": "^7.10.5",
+        "lodash": "^4.17.19"
+      }
+    },
+    "node_modules/@babel/helper-explode-assignable-expression": {
+      "version": "7.11.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz",
+      "integrity": "sha512-ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.10.4"
       }
     },
     "node_modules/@babel/helper-function-name": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz",
-      "integrity": "sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
+      "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-get-function-arity": "^7.14.5",
-        "@babel/template": "^7.14.5",
-        "@babel/types": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-get-function-arity": "^7.10.4",
+        "@babel/template": "^7.10.4",
+        "@babel/types": "^7.10.4"
       }
     },
     "node_modules/@babel/helper-function-name/node_modules/@babel/template": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz",
-      "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/parser": "^7.14.5",
-        "@babel/types": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/code-frame": "^7.10.4",
+        "@babel/parser": "^7.10.4",
+        "@babel/types": "^7.10.4"
       }
     },
     "node_modules/@babel/helper-get-function-arity": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz",
-      "integrity": "sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
+      "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/types": "^7.10.4"
       }
     },
     "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz",
-      "integrity": "sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz",
+      "integrity": "sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/types": "^7.10.4"
       }
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.14.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz",
-      "integrity": "sha512-TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
+      "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/types": "^7.11.0"
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz",
-      "integrity": "sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz",
+      "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/types": "^7.10.4"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.8.tgz",
-      "integrity": "sha512-RyE+NFOjXn5A9YU1dkpeBaduagTlZ0+fccnIcAGbv1KGUlReBj7utF7oEth8IdIBQPcux0DDgW5MFBH2xu9KcA==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz",
+      "integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-imports": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.14.5",
-        "@babel/helper-simple-access": "^7.14.8",
-        "@babel/helper-split-export-declaration": "^7.14.5",
-        "@babel/helper-validator-identifier": "^7.14.8",
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.14.8",
-        "@babel/types": "^7.14.8"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-module-imports": "^7.10.4",
+        "@babel/helper-replace-supers": "^7.10.4",
+        "@babel/helper-simple-access": "^7.10.4",
+        "@babel/helper-split-export-declaration": "^7.11.0",
+        "@babel/template": "^7.10.4",
+        "@babel/types": "^7.11.0",
+        "lodash": "^4.17.19"
       }
     },
     "node_modules/@babel/helper-module-transforms/node_modules/@babel/template": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz",
-      "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/parser": "^7.14.5",
-        "@babel/types": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/code-frame": "^7.10.4",
+        "@babel/parser": "^7.10.4",
+        "@babel/types": "^7.10.4"
       }
     },
     "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz",
-      "integrity": "sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz",
+      "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/types": "^7.10.4"
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz",
-      "integrity": "sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
+      "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+      "dev": true
+    },
+    "node_modules/@babel/helper-regex": {
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.5.tgz",
+      "integrity": "sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==",
       "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
+      "dependencies": {
+        "lodash": "^4.17.19"
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.14.5.tgz",
-      "integrity": "sha512-rLQKdQU+HYlxBwQIj8dk4/0ENOUEhA/Z0l4hN8BexpvmSMN9oA9EagjnhnDpNsRdWCfjwa4mn/HyBXO9yhQP6A==",
+      "version": "7.11.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz",
+      "integrity": "sha512-tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-wrap-function": "^7.14.5",
-        "@babel/types": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-annotate-as-pure": "^7.10.4",
+        "@babel/helper-wrap-function": "^7.10.4",
+        "@babel/template": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/template": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.10.4",
+        "@babel/parser": "^7.10.4",
+        "@babel/types": "^7.10.4"
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz",
-      "integrity": "sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
+      "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-member-expression-to-functions": "^7.14.5",
-        "@babel/helper-optimise-call-expression": "^7.14.5",
-        "@babel/traverse": "^7.14.5",
-        "@babel/types": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-member-expression-to-functions": "^7.10.4",
+        "@babel/helper-optimise-call-expression": "^7.10.4",
+        "@babel/traverse": "^7.10.4",
+        "@babel/types": "^7.10.4"
       }
     },
     "node_modules/@babel/helper-simple-access": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz",
-      "integrity": "sha512-TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz",
+      "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.14.8"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/template": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helper-simple-access/node_modules/@babel/template": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.10.4",
+        "@babel/parser": "^7.10.4",
+        "@babel/types": "^7.10.4"
       }
     },
     "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.14.5.tgz",
-      "integrity": "sha512-dmqZB7mrb94PZSAOYtr+ZN5qt5owZIAgqtoTuqiFbHFtxgEcmQlRJVI+bO++fciBunXtB6MK7HrzrfcAzIz2NQ==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz",
+      "integrity": "sha512-0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/types": "^7.11.0"
       }
     },
     "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz",
-      "integrity": "sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
+      "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/types": "^7.11.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz",
-      "integrity": "sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-option": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz",
-      "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+      "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+      "dev": true
     },
     "node_modules/@babel/helper-wrap-function": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.14.5.tgz",
-      "integrity": "sha512-YEdjTCq+LNuNS1WfxsDCNpgXkJaIyqco6DAelTUjT4f2KIWC1nBcaCaSdHTBqQVLnTBexBcVcFhLSU1KnYuePQ==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz",
+      "integrity": "sha512-6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.14.5",
-        "@babel/types": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-function-name": "^7.10.4",
+        "@babel/template": "^7.10.4",
+        "@babel/traverse": "^7.10.4",
+        "@babel/types": "^7.10.4"
       }
     },
     "node_modules/@babel/helper-wrap-function/node_modules/@babel/template": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz",
-      "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/parser": "^7.14.5",
-        "@babel/types": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/code-frame": "^7.10.4",
+        "@babel/parser": "^7.10.4",
+        "@babel/types": "^7.10.4"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.8.tgz",
-      "integrity": "sha512-ZRDmI56pnV+p1dH6d+UN6GINGz7Krps3+270qqI9UJ4wxYThfAIcI5i7j5vXC4FJ3Wap+S9qcebxeYiqn87DZw==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.4.tgz",
+      "integrity": "sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==",
       "dev": true,
       "dependencies": {
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.14.8",
-        "@babel/types": "^7.14.8"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/template": "^7.10.4",
+        "@babel/traverse": "^7.10.4",
+        "@babel/types": "^7.10.4"
       }
     },
     "node_modules/@babel/helpers/node_modules/@babel/template": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz",
-      "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/parser": "^7.14.5",
-        "@babel/types": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/code-frame": "^7.10.4",
+        "@babel/parser": "^7.10.4",
+        "@babel/types": "^7.10.4"
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
-      "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+      "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.14.5",
+        "@babel/helper-validator-identifier": "^7.10.4",
         "chalk": "^2.0.0",
         "js-tokens": "^4.0.0"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/@babel/highlight/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.9.tgz",
-      "integrity": "sha512-RdUTOseXJ8POjjOeEBEvNMIZU/nm4yu2rufRkcibzkkg7DmQvXU8v3M4Xk9G7uuI86CDGkKcuDWgioqZm+mScQ==",
+      "version": "7.11.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
+      "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
       "dev": true,
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -1621,210 +2074,120 @@
       }
     },
     "node_modules/@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.9.tgz",
-      "integrity": "sha512-d1lnh+ZnKrFKwtTYdw320+sQWCTwgkB9fmUhNXRADA4akR6wLjaruSGnIEUjpt9HCOwTr4ynFTKu19b7rFRpmw==",
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz",
+      "integrity": "sha512-cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-remap-async-to-generator": "^7.14.5",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-class-properties": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz",
-      "integrity": "sha512-q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-remap-async-to-generator": "^7.10.4",
+        "@babel/plugin-syntax-async-generators": "^7.8.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-proposal-dynamic-import": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz",
-      "integrity": "sha512-ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz",
+      "integrity": "sha512-up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz",
-      "integrity": "sha512-g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-proposal-json-strings": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz",
-      "integrity": "sha512-NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz",
+      "integrity": "sha512-fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz",
-      "integrity": "sha512-YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-syntax-json-strings": "^7.8.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz",
-      "integrity": "sha512-gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz",
+      "integrity": "sha512-wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-proposal-numeric-separator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz",
-      "integrity": "sha512-yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.10.4",
         "@babel/plugin-syntax-numeric-separator": "^7.10.4"
       },
-      "engines": {
-        "node": ">=6.9.0"
-      },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.14.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.7.tgz",
-      "integrity": "sha512-082hsZz+sVabfmDWo1Oct1u1AgbKbUAyVgmX4otIc7bdsRgHBXwTwb3DpDmD4Eyyx6DNiuz5UAATT655k+kL5g==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz",
+      "integrity": "sha512-wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.14.7",
-        "@babel/helper-compilation-targets": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
+        "@babel/plugin-transform-parameters": "^7.10.4"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz",
-      "integrity": "sha512-3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz",
+      "integrity": "sha512-LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-proposal-optional-chaining": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz",
-      "integrity": "sha512-ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz",
+      "integrity": "sha512-v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-private-methods": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz",
-      "integrity": "sha512-838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz",
-      "integrity": "sha512-6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz",
+      "integrity": "sha512-H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
       },
       "engines": {
         "node": ">=4"
@@ -1858,12 +2221,12 @@
       }
     },
     "node_modules/@babel/plugin-syntax-class-properties": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz",
+      "integrity": "sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.10.4"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
@@ -1881,18 +2244,6 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-export-namespace-from": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
-      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/plugin-syntax-import-meta": {
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
@@ -1990,422 +2341,349 @@
       }
     },
     "node_modules/@babel/plugin-syntax-top-level-await": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
-      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz",
+      "integrity": "sha512-ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.10.4"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz",
-      "integrity": "sha512-KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz",
+      "integrity": "sha512-9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.10.4"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz",
-      "integrity": "sha512-SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz",
+      "integrity": "sha512-F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-imports": "^7.12.1",
+        "@babel/helper-module-imports": "^7.10.4",
         "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-remap-async-to-generator": "^7.12.1"
+        "@babel/helper-remap-async-to-generator": "^7.10.4"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz",
-      "integrity": "sha512-dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz",
+      "integrity": "sha512-WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.10.4"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.5.tgz",
-      "integrity": "sha512-LBYm4ZocNgoCqyxMLoOnwpsmQ18HWTQvql64t3GvMUzLQrNoV1BDG0lNftC8QKYERkZgCCT/7J5xWGObGAyHDw==",
+      "version": "7.11.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz",
+      "integrity": "sha512-00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.10.4"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.9.tgz",
-      "integrity": "sha512-NfZpTcxU3foGWbl4wxmZ35mTsYJy8oQocbeIMoDAGGFarAmSQlL+LWMkDx/tj6pNotpbX3rltIA4dprgAPOq5A==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz",
+      "integrity": "sha512-2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-optimise-call-expression": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.14.5",
-        "@babel/helper-split-export-declaration": "^7.14.5",
+        "@babel/helper-annotate-as-pure": "^7.10.4",
+        "@babel/helper-define-map": "^7.10.4",
+        "@babel/helper-function-name": "^7.10.4",
+        "@babel/helper-optimise-call-expression": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-replace-supers": "^7.10.4",
+        "@babel/helper-split-export-declaration": "^7.10.4",
         "globals": "^11.1.0"
       },
-      "engines": {
-        "node": ">=6.9.0"
-      },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz",
-      "integrity": "sha512-pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz",
+      "integrity": "sha512-JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.10.4"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.14.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz",
-      "integrity": "sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz",
+      "integrity": "sha512-+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.10.4"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz",
-      "integrity": "sha512-loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz",
+      "integrity": "sha512-ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-create-regexp-features-plugin": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz",
-      "integrity": "sha512-iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz",
+      "integrity": "sha512-GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.10.4"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz",
-      "integrity": "sha512-jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz",
+      "integrity": "sha512-S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.14.5.tgz",
-      "integrity": "sha512-CfmqxSUZzBl0rSjpoQSFoR9UEj3HzbGuGNL21/iFTmjb5gFggJp3ph0xR1YBhexmLoKRHzgxuFvty2xdSt6gTA==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz",
+      "integrity": "sha512-ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.10.4"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz",
-      "integrity": "sha512-vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz",
+      "integrity": "sha512-OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-function-name": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz",
-      "integrity": "sha512-ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz",
+      "integrity": "sha512-Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.10.4"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz",
-      "integrity": "sha512-WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz",
+      "integrity": "sha512-0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.10.4"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz",
-      "integrity": "sha512-3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g==",
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz",
+      "integrity": "sha512-elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-module-transforms": "^7.10.5",
+        "@babel/helper-plugin-utils": "^7.10.4",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       },
-      "engines": {
-        "node": ">=6.9.0"
-      },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.5.tgz",
-      "integrity": "sha512-en8GfBtgnydoao2PS+87mKyw62k02k7kJ9ltbKe0fXTHrQmG6QZZflYuGI1VVG7sVpx4E1n7KBpNlPb8m78J+A==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz",
+      "integrity": "sha512-Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-simple-access": "^7.14.5",
+        "@babel/helper-module-transforms": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-simple-access": "^7.10.4",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       },
-      "engines": {
-        "node": ">=6.9.0"
-      },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.14.5.tgz",
-      "integrity": "sha512-mNMQdvBEE5DcMQaL5LbzXFMANrQjd2W7FPzg34Y4yEz7dBgdaC+9B84dSO+/1Wba98zoDbInctCDo4JGxz1VYA==",
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz",
+      "integrity": "sha512-f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-hoist-variables": "^7.14.5",
-        "@babel/helper-module-transforms": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-validator-identifier": "^7.14.5",
+        "@babel/helper-hoist-variables": "^7.10.4",
+        "@babel/helper-module-transforms": "^7.10.5",
+        "@babel/helper-plugin-utils": "^7.10.4",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       },
-      "engines": {
-        "node": ">=6.9.0"
-      },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz",
-      "integrity": "sha512-RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz",
+      "integrity": "sha512-mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-module-transforms": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz",
-      "integrity": "sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz",
+      "integrity": "sha512-V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-create-regexp-features-plugin": "^7.10.4"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0"
       }
     },
     "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz",
-      "integrity": "sha512-Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz",
+      "integrity": "sha512-YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.10.4"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz",
-      "integrity": "sha512-MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz",
+      "integrity": "sha512-5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-replace-supers": "^7.10.4"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.5.tgz",
-      "integrity": "sha512-Tl7LWdr6HUxTmzQtzuU14SqbgrSKmaR77M0OKyq4njZLQTPfOvzblNKyNkGwOfEFCEx7KeYHQHDI0P3F02IVkA==",
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz",
+      "integrity": "sha512-xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-get-function-arity": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz",
-      "integrity": "sha512-r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz",
+      "integrity": "sha512-ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.10.4"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz",
-      "integrity": "sha512-NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz",
+      "integrity": "sha512-3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw==",
       "dev": true,
       "dependencies": {
         "regenerator-transform": "^0.14.2"
       },
-      "engines": {
-        "node": ">=6.9.0"
-      },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz",
-      "integrity": "sha512-cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz",
+      "integrity": "sha512-hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.10.4"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-runtime": {
-      "version": "7.12.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.10.tgz",
-      "integrity": "sha512-xOrUfzPxw7+WDm9igMgQCbO3cJKymX7dFdsgRr1eu9n3KjjyU4pptIXbXPseQDquw+W+RuJEJMHKHNsPNNm3CA==",
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.6.tgz",
+      "integrity": "sha512-qcmiECD0mYOjOIt8YHNsAP1SxPooC/rDmfmiSK9BNY72EitdSc7l44WTEklaWuFtbOEBjNhWWyph/kOImbNJ4w==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-imports": "^7.12.5",
-        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-module-imports": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "resolve": "^1.8.1",
         "semver": "^5.5.1"
       },
       "peerDependencies": {
@@ -2422,183 +2700,146 @@
       }
     },
     "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz",
-      "integrity": "sha512-xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz",
+      "integrity": "sha512-AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.10.4"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.14.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.6.tgz",
-      "integrity": "sha512-Zr0x0YroFJku7n7+/HH3A2eIrGMjbmAIbJSVv0IZ+t3U2WUQUA64S/oeied2e+MaGSjmt4alzBCsK9E8gh+fag==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz",
+      "integrity": "sha512-UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz",
-      "integrity": "sha512-Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz",
+      "integrity": "sha512-Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-regex": "^7.10.4"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz",
-      "integrity": "sha512-22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg==",
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz",
+      "integrity": "sha512-V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-annotate-as-pure": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz",
-      "integrity": "sha512-lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz",
+      "integrity": "sha512-QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz",
-      "integrity": "sha512-crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.10.4"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz",
-      "integrity": "sha512-UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz",
+      "integrity": "sha512-wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-create-regexp-features-plugin": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.11.tgz",
-      "integrity": "sha512-j8Tb+KKIXKYlDBQyIOy4BLxzv1NUOwlHfZ74rvW+Z0Gp4/cI2IMDPBWAgWceGcE7aep9oL/0K9mlzlMGxA8yNw==",
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.6.tgz",
+      "integrity": "sha512-0gQJ9RTzO0heXOhzftog+a/WyOuqMrAIugVYxMYf83gh1CQaQDjMtsOpqOwXyDL/5JcWsrCm8l4ju8QC97O7EQ==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.12.7",
-        "@babel/helper-compilation-targets": "^7.12.5",
-        "@babel/helper-module-imports": "^7.12.5",
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-validator-option": "^7.12.11",
-        "@babel/plugin-proposal-async-generator-functions": "^7.12.1",
-        "@babel/plugin-proposal-class-properties": "^7.12.1",
-        "@babel/plugin-proposal-dynamic-import": "^7.12.1",
-        "@babel/plugin-proposal-export-namespace-from": "^7.12.1",
-        "@babel/plugin-proposal-json-strings": "^7.12.1",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.12.1",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
-        "@babel/plugin-proposal-numeric-separator": "^7.12.7",
-        "@babel/plugin-proposal-object-rest-spread": "^7.12.1",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.12.1",
-        "@babel/plugin-proposal-optional-chaining": "^7.12.7",
-        "@babel/plugin-proposal-private-methods": "^7.12.1",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.12.1",
+        "@babel/compat-data": "^7.9.6",
+        "@babel/helper-compilation-targets": "^7.9.6",
+        "@babel/helper-module-imports": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/plugin-proposal-async-generator-functions": "^7.8.3",
+        "@babel/plugin-proposal-dynamic-import": "^7.8.3",
+        "@babel/plugin-proposal-json-strings": "^7.8.3",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-proposal-numeric-separator": "^7.8.3",
+        "@babel/plugin-proposal-object-rest-spread": "^7.9.6",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-proposal-optional-chaining": "^7.9.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.8.3",
         "@babel/plugin-syntax-async-generators": "^7.8.0",
-        "@babel/plugin-syntax-class-properties": "^7.12.1",
         "@babel/plugin-syntax-dynamic-import": "^7.8.0",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
         "@babel/plugin-syntax-json-strings": "^7.8.0",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
+        "@babel/plugin-syntax-numeric-separator": "^7.8.0",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
         "@babel/plugin-syntax-optional-catch-binding": "^7.8.0",
         "@babel/plugin-syntax-optional-chaining": "^7.8.0",
-        "@babel/plugin-syntax-top-level-await": "^7.12.1",
-        "@babel/plugin-transform-arrow-functions": "^7.12.1",
-        "@babel/plugin-transform-async-to-generator": "^7.12.1",
-        "@babel/plugin-transform-block-scoped-functions": "^7.12.1",
-        "@babel/plugin-transform-block-scoping": "^7.12.11",
-        "@babel/plugin-transform-classes": "^7.12.1",
-        "@babel/plugin-transform-computed-properties": "^7.12.1",
-        "@babel/plugin-transform-destructuring": "^7.12.1",
-        "@babel/plugin-transform-dotall-regex": "^7.12.1",
-        "@babel/plugin-transform-duplicate-keys": "^7.12.1",
-        "@babel/plugin-transform-exponentiation-operator": "^7.12.1",
-        "@babel/plugin-transform-for-of": "^7.12.1",
-        "@babel/plugin-transform-function-name": "^7.12.1",
-        "@babel/plugin-transform-literals": "^7.12.1",
-        "@babel/plugin-transform-member-expression-literals": "^7.12.1",
-        "@babel/plugin-transform-modules-amd": "^7.12.1",
-        "@babel/plugin-transform-modules-commonjs": "^7.12.1",
-        "@babel/plugin-transform-modules-systemjs": "^7.12.1",
-        "@babel/plugin-transform-modules-umd": "^7.12.1",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.12.1",
-        "@babel/plugin-transform-new-target": "^7.12.1",
-        "@babel/plugin-transform-object-super": "^7.12.1",
-        "@babel/plugin-transform-parameters": "^7.12.1",
-        "@babel/plugin-transform-property-literals": "^7.12.1",
-        "@babel/plugin-transform-regenerator": "^7.12.1",
-        "@babel/plugin-transform-reserved-words": "^7.12.1",
-        "@babel/plugin-transform-shorthand-properties": "^7.12.1",
-        "@babel/plugin-transform-spread": "^7.12.1",
-        "@babel/plugin-transform-sticky-regex": "^7.12.7",
-        "@babel/plugin-transform-template-literals": "^7.12.1",
-        "@babel/plugin-transform-typeof-symbol": "^7.12.10",
-        "@babel/plugin-transform-unicode-escapes": "^7.12.1",
-        "@babel/plugin-transform-unicode-regex": "^7.12.1",
+        "@babel/plugin-syntax-top-level-await": "^7.8.3",
+        "@babel/plugin-transform-arrow-functions": "^7.8.3",
+        "@babel/plugin-transform-async-to-generator": "^7.8.3",
+        "@babel/plugin-transform-block-scoped-functions": "^7.8.3",
+        "@babel/plugin-transform-block-scoping": "^7.8.3",
+        "@babel/plugin-transform-classes": "^7.9.5",
+        "@babel/plugin-transform-computed-properties": "^7.8.3",
+        "@babel/plugin-transform-destructuring": "^7.9.5",
+        "@babel/plugin-transform-dotall-regex": "^7.8.3",
+        "@babel/plugin-transform-duplicate-keys": "^7.8.3",
+        "@babel/plugin-transform-exponentiation-operator": "^7.8.3",
+        "@babel/plugin-transform-for-of": "^7.9.0",
+        "@babel/plugin-transform-function-name": "^7.8.3",
+        "@babel/plugin-transform-literals": "^7.8.3",
+        "@babel/plugin-transform-member-expression-literals": "^7.8.3",
+        "@babel/plugin-transform-modules-amd": "^7.9.6",
+        "@babel/plugin-transform-modules-commonjs": "^7.9.6",
+        "@babel/plugin-transform-modules-systemjs": "^7.9.6",
+        "@babel/plugin-transform-modules-umd": "^7.9.0",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.8.3",
+        "@babel/plugin-transform-new-target": "^7.8.3",
+        "@babel/plugin-transform-object-super": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.9.5",
+        "@babel/plugin-transform-property-literals": "^7.8.3",
+        "@babel/plugin-transform-regenerator": "^7.8.7",
+        "@babel/plugin-transform-reserved-words": "^7.8.3",
+        "@babel/plugin-transform-shorthand-properties": "^7.8.3",
+        "@babel/plugin-transform-spread": "^7.8.3",
+        "@babel/plugin-transform-sticky-regex": "^7.8.3",
+        "@babel/plugin-transform-template-literals": "^7.8.3",
+        "@babel/plugin-transform-typeof-symbol": "^7.8.4",
+        "@babel/plugin-transform-unicode-regex": "^7.8.3",
         "@babel/preset-modules": "^0.1.3",
-        "@babel/types": "^7.12.11",
-        "core-js-compat": "^3.8.0",
+        "@babel/types": "^7.9.6",
+        "browserslist": "^4.11.1",
+        "core-js-compat": "^3.6.2",
+        "invariant": "^2.2.2",
+        "levenary": "^1.1.1",
         "semver": "^5.5.0"
       },
       "peerDependencies": {
@@ -2631,72 +2872,87 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.12.5",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz",
-      "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==",
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz",
+      "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==",
       "dev": true,
       "dependencies": {
         "regenerator-runtime": "^0.13.4"
       }
     },
     "node_modules/@babel/runtime-corejs3": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.9.tgz",
-      "integrity": "sha512-64RiH2ON4/y8qYtoa8rUiyam/tUVyGqRyNYhe+vCRGmjnV4bUlZvY+mwd0RrmLoCpJpdq3RsrNqKb7SJdw/4kw==",
+      "version": "7.13.17",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.13.17.tgz",
+      "integrity": "sha512-RGXINY1YvduBlGrP+vHjJqd/nK7JVpfM4rmZLGMx77WoL3sMrhheA0qxii9VNn1VHnxJLEyxmvCB+Wqc+x/FMw==",
       "dev": true,
       "dependencies": {
-        "core-js-pure": "^3.16.0",
+        "core-js-pure": "^3.0.0",
         "regenerator-runtime": "^0.13.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.12.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz",
-      "integrity": "sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==",
+      "version": "7.8.6",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
+      "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/parser": "^7.12.7",
-        "@babel/types": "^7.12.7"
+        "@babel/code-frame": "^7.8.3",
+        "@babel/parser": "^7.8.6",
+        "@babel/types": "^7.8.6"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.9.tgz",
-      "integrity": "sha512-bldh6dtB49L8q9bUyB7bC20UKgU+EFDwKJylwl234Kv+ySZeMD31Xeht6URyueQ6LrRRpF2tmkfcZooZR9/e8g==",
+      "version": "7.11.5",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
+      "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/generator": "^7.14.9",
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-hoist-variables": "^7.14.5",
-        "@babel/helper-split-export-declaration": "^7.14.5",
-        "@babel/parser": "^7.14.9",
-        "@babel/types": "^7.14.9",
+        "@babel/code-frame": "^7.10.4",
+        "@babel/generator": "^7.11.5",
+        "@babel/helper-function-name": "^7.10.4",
+        "@babel/helper-split-export-declaration": "^7.11.0",
+        "@babel/parser": "^7.11.5",
+        "@babel/types": "^7.11.5",
         "debug": "^4.1.0",
-        "globals": "^11.1.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "globals": "^11.1.0",
+        "lodash": "^4.17.19"
       }
     },
     "node_modules/@babel/traverse/node_modules/@babel/generator": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.9.tgz",
-      "integrity": "sha512-4yoHbhDYzFa0GLfCzLp5GxH7vPPMAHdZjyE7M/OajM9037zhx0rf+iNsJwp4PT0MSFpwjG7BsHEbPkBQpZ6cYA==",
+      "version": "7.11.6",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
+      "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.14.9",
+        "@babel/types": "^7.11.5",
         "jsesc": "^2.5.1",
         "source-map": "^0.5.0"
+      }
+    },
+    "node_modules/@babel/traverse/node_modules/debug": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+      "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
+    "node_modules/@babel/traverse/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
     "node_modules/@babel/traverse/node_modules/source-map": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -2707,16 +2963,14 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.9.tgz",
-      "integrity": "sha512-u0bLTnv3DFHeaQLYzb7oRJ1JHr1sv/SYDM7JSqHFFLwXG1wTZRughxFI5NCP8qBEo1rVVsn7Yg2Lvw49nne/Ow==",
+      "version": "7.11.5",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+      "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.14.9",
+        "@babel/helper-validator-identifier": "^7.10.4",
+        "lodash": "^4.17.19",
         "to-fast-properties": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
       }
     },
     "node_modules/@bcoe/v8-coverage": {
@@ -2741,25 +2995,16 @@
         "node": ">=0.1.95"
       }
     },
-    "node_modules/@discoveryjs/json-ext": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.2.tgz",
-      "integrity": "sha512-HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
     "node_modules/@eslint/eslintrc": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
-      "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.0.tgz",
+      "integrity": "sha512-2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog==",
       "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.1.1",
         "espree": "^7.3.0",
-        "globals": "^13.9.0",
+        "globals": "^12.1.0",
         "ignore": "^4.0.6",
         "import-fresh": "^3.2.1",
         "js-yaml": "^3.13.1",
@@ -2770,29 +3015,30 @@
         "node": "^10.12.0 || >=12.0.0"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+    "node_modules/@eslint/eslintrc/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
       "dev": true,
       "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
+        "ms": "2.1.2"
       },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
     "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.10.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.10.0.tgz",
-      "integrity": "sha512-piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g==",
+      "version": "12.4.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
+      "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
       "dev": true,
       "dependencies": {
-        "type-fest": "^0.20.2"
+        "type-fest": "^0.8.1"
       },
       "engines": {
         "node": ">=8"
@@ -2810,48 +3056,28 @@
         "node": ">= 4"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+    "node_modules/@eslint/eslintrc/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
       "dev": true
     },
-    "node_modules/@eslint/eslintrc/node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+    "node_modules/@eslint/eslintrc/node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
       "dev": true,
       "engines": {
-        "node": ">=10"
+        "node": ">=8"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@humanwhocodes/config-array": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
-      "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
-      "dev": true,
-      "dependencies": {
-        "@humanwhocodes/object-schema": "^1.2.0",
-        "debug": "^4.1.1",
-        "minimatch": "^3.0.4"
-      },
-      "engines": {
-        "node": ">=10.10.0"
-      }
-    },
-    "node_modules/@humanwhocodes/object-schema": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz",
-      "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==",
-      "dev": true
-    },
     "node_modules/@ionic-native/badge": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/badge/-/badge-5.35.0.tgz",
-      "integrity": "sha512-VTelBbEoj7MdkN4rzgPOFiQnw9GZrJPI/3GOEIib3/sj5HVSnClkGDFlLPSwe+sdjvozehpDCkGE92dPd5KMpA==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/badge/-/badge-5.33.0.tgz",
+      "integrity": "sha512-g/E2HLB53csZq5hWeyWUFj6r7CrllSPuOkV88XotIFTQFNuY7TaLtiFUVFSvWXRh0Kvu+w7TI5Hys67d/v7F/g==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -2860,10 +3086,15 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
+    "node_modules/@ionic-native/badge/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
     "node_modules/@ionic-native/camera": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/camera/-/camera-5.35.0.tgz",
-      "integrity": "sha512-zW39wFdJ9oACMVtZJSvYn8gaJJQYKOoqjtnLphMXceFY0KBqyDYdTdkquzTOFUjsB3WQRwScndEJJ73PhVCZmg==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/camera/-/camera-5.33.0.tgz",
+      "integrity": "sha512-cLAxM4e8IrTECvlszyUe9FnUjE4PbWR99NNDwkOuB85yJ3diyKxiQhHu89Qh9A6qzHTJQLa93iknY2Q40VM/5Q==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -2872,10 +3103,15 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
+    "node_modules/@ionic-native/camera/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
     "node_modules/@ionic-native/chooser": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/chooser/-/chooser-5.35.0.tgz",
-      "integrity": "sha512-oQnfahfA1Z8Pv3MbnhBDAeGyMyC598Xm2U2mCNKdYhtPtqeH5uOOk596XGsgoR+11G9g1gqFDg3qypK4E1zVTA==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/chooser/-/chooser-5.33.0.tgz",
+      "integrity": "sha512-hz2OtB8UsJpKdXZByDzGS6+U1FK8toIjKmIVCDQAuOXxjbw9dU2Ef+MSUKXOpK6MYnP56oP80JdSX9LDEFJnRA==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -2884,10 +3120,15 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
+    "node_modules/@ionic-native/chooser/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
     "node_modules/@ionic-native/clipboard": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/clipboard/-/clipboard-5.35.0.tgz",
-      "integrity": "sha512-M39sLi6HFJEKwMXcFBwWEk5X70t/b7uuDFqqtLCOg7dsZwmhY07Lr/kU3lBh7zbj9TgCKSkOxc3jlZH3fRWXbA==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/clipboard/-/clipboard-5.33.0.tgz",
+      "integrity": "sha512-HFZN4tsAjFJ9Se9ik0/IOUvApL4zNPEKQAtUsjqP7vCnTsdrgS+FDMln1UDEKXCQ/dEEwU1N1ndFmPBGxjkGzQ==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -2896,10 +3137,15 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
+    "node_modules/@ionic-native/clipboard/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
     "node_modules/@ionic-native/core": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/core/-/core-5.35.0.tgz",
-      "integrity": "sha512-x2mShlaLOzCxwdqvPOvUFX4g0ctMvEYiYak6Hlh+HP9eNWfruT0EcMoXs6KSvIRFRsyFaYAXHyDZseKtB3aqsA==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/core/-/core-5.33.0.tgz",
+      "integrity": "sha512-dnZHu7SadvQvliGJPndk2ohdoPvwiyBWJjsJw33BKyhadnmLlmkYKkRgPPI+i22BZofDKq4YiAfIIqhvfHU6gw==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -2907,10 +3153,15 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
+    "node_modules/@ionic-native/core/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
     "node_modules/@ionic-native/device": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/device/-/device-5.35.0.tgz",
-      "integrity": "sha512-p/kTzERyWFhAN6mzhq4wanFme3aNGHeT2hM+lp1tM87vqLn+49GycKNwYMED0mfcGA1n2aT+ClF+ga6df5Rvhw==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/device/-/device-5.33.0.tgz",
+      "integrity": "sha512-KYQvVsN98bGTEomI193Jf9r1vaXBFJQXuhkhwBI6lajynAlf2SIVJwthNUXnK43kNXy1cOelYxScUuKyPwqudw==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -2919,10 +3170,15 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
+    "node_modules/@ionic-native/device/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
     "node_modules/@ionic-native/diagnostic": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/diagnostic/-/diagnostic-5.35.0.tgz",
-      "integrity": "sha512-hjTYiGEZzL4cE/GNr/g9T/zaBuIXNTfUGJXOVSKOI3t0miIo4eZi1IQnbQtac4fhuwtW23eo5TFtzP8NwJHy/Q==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/diagnostic/-/diagnostic-5.33.0.tgz",
+      "integrity": "sha512-zBDv/yNMvUkXfxy17rgrGVU3+XKREXRI7cqy/DyvpjdomOnmx2pnFvhszgMEgeD03LkXXKiFOR5yUAVNgYirmg==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -2931,10 +3187,15 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
+    "node_modules/@ionic-native/diagnostic/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
     "node_modules/@ionic-native/file": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/file/-/file-5.35.0.tgz",
-      "integrity": "sha512-CpD8z7skurzL4Gj1R6AhAvszoc+Ii06+2u1E48/jq6SXBY9S6ufzSlpWosRFkfydRKDIZ1gIb/vAGedCuuRWyQ==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/file/-/file-5.33.0.tgz",
+      "integrity": "sha512-RisSGJl2t8JrBgw30Vn5hJYYKEDTHR9f3KbQDfe1MQg+VrZo7vnbml/vk4l55u65c1TYZDH+F6i7s9nyif1QVQ==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -2944,9 +3205,9 @@
       }
     },
     "node_modules/@ionic-native/file-opener": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/file-opener/-/file-opener-5.35.0.tgz",
-      "integrity": "sha512-1xDQVfsRUdd+b/MNtKuxuBqi2pv63kyuB6VFTP7g3I+e13JW05I0RNlujpcBhGpA1FZyPKs7w7b2era9famNLg==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/file-opener/-/file-opener-5.33.0.tgz",
+      "integrity": "sha512-v7t1ndalAPYT9gvMAhxAup8tg1NPV415cfG6tzs1foPFP91UZC3MQny0tup8AgFivugT1GRdoSk1NMuK1jy8Cw==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -2955,10 +3216,15 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
+    "node_modules/@ionic-native/file-opener/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
     "node_modules/@ionic-native/file-transfer": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/file-transfer/-/file-transfer-5.35.0.tgz",
-      "integrity": "sha512-rkOOSY+1/VLstv2TT8TYkZUmAzN+syjFolK8Sj5hEbgVuCWhZZK+7bqwGmHg2op4OvXf4kptehHZ5KDD0ZenBw==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/file-transfer/-/file-transfer-5.33.0.tgz",
+      "integrity": "sha512-xDUpdJVgTBP6aEiU08iZ/pa9aMoGSMB9391dQKk+VSDs0hdbIwk+Cx4V40GIE4QF3TI06sUMdKXD2sIhVsr2QA==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -2967,10 +3233,20 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
+    "node_modules/@ionic-native/file-transfer/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/file/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
     "node_modules/@ionic-native/geolocation": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/geolocation/-/geolocation-5.35.0.tgz",
-      "integrity": "sha512-gjwe2WUv75qNfIdLipgUCBhpQPHhzLivecEeHNGpb4pXo151rq3MtgHK2Q3xjy7iyrYsZlcNYtVb+jhb+4toBg==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/geolocation/-/geolocation-5.33.0.tgz",
+      "integrity": "sha512-oE6pi6l8/Wsv94vpJmPlPqE1LheP6cQTJrC78WYQp9WVDOOCGZnFznNoH8BlQfnfjuDx/kUARxzEJBO/gbUg1A==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -2979,10 +3255,15 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
+    "node_modules/@ionic-native/geolocation/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
     "node_modules/@ionic-native/http": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/http/-/http-5.35.0.tgz",
-      "integrity": "sha512-AaLvi59gdOlxpM3x9krk0l8UcLI9OLBm+o7DNu8y1pgsUKIvf7+ZbY4xU1fJG1HDvUyrU8+NQLrvXgpXx6CmAQ==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/http/-/http-5.33.0.tgz",
+      "integrity": "sha512-dqcPu3igSLlfDUK8Mvma/6o6aq7WtKBlcR8xXwE8tVsO/r4fEB6NevLLN4S4zCr381Jy+RxIIjn3CZx5XHF6JQ==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -2991,10 +3272,15 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
+    "node_modules/@ionic-native/http/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
     "node_modules/@ionic-native/in-app-browser": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/in-app-browser/-/in-app-browser-5.35.0.tgz",
-      "integrity": "sha512-P06lB3ZhMPn1r5qT742uqczRfceY3dPAAAujlGD+m/06DSikKcB4CYDUHrowJbYAXYr8hkHtnQgtthZx5PPZAA==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/in-app-browser/-/in-app-browser-5.33.0.tgz",
+      "integrity": "sha512-GGIvnYHf8FgaIae9yfRzxqxj0ZAxrYhOJpsHVSq1YKjxnDpRe6ImWWaHHfaeXE5IdUUMUXVuf75VTSBN00VBvA==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3003,10 +3289,15 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
+    "node_modules/@ionic-native/in-app-browser/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
     "node_modules/@ionic-native/ionic-webview": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/ionic-webview/-/ionic-webview-5.35.0.tgz",
-      "integrity": "sha512-OliPzhM1eAhJW0Q4vzhwb0M98IptN9woXuiaDhRyEBBB3PvukKeGWbVBHdquzVSZYuhz0emrJeDDRhTVQEaJ/Q==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/ionic-webview/-/ionic-webview-5.33.0.tgz",
+      "integrity": "sha512-Jbr4M6z/Fya51F+QXuPLm/crFlZ9T6YvRM1cygGmFwZ7SgDAimYnjgSO8SEGJmvO2ZekYmFuF56qiVPSvx2wUA==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3015,10 +3306,15 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
+    "node_modules/@ionic-native/ionic-webview/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
     "node_modules/@ionic-native/keyboard": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/keyboard/-/keyboard-5.35.0.tgz",
-      "integrity": "sha512-SB4S91NVkdSuNsT8OTS67QnE76yvoPB1BFrz1uL37BGKselgF0xTlJEfLOV7VL82ZteXr4siQr/MLRmBYIc6QQ==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/keyboard/-/keyboard-5.33.0.tgz",
+      "integrity": "sha512-TIYU3LC+Yz/pcpBuHcxLThMNuN9y1E1wBu4SlmS6VlO3/D3R3At2WOg2UK3iA66G2kTJubed5haqTYZjeoA6Uw==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3027,10 +3323,15 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
+    "node_modules/@ionic-native/keyboard/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
     "node_modules/@ionic-native/local-notifications": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/local-notifications/-/local-notifications-5.35.0.tgz",
-      "integrity": "sha512-kdn+skyQpTDHBpL8kLlsnZ7n5EzPPytrKZbCYgRZPJR4yNymZqfGbvuXblmpAZUoAMObEj5EWetOyBQcmuNFXw==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/local-notifications/-/local-notifications-5.33.0.tgz",
+      "integrity": "sha512-ljn2uq0rFWpjG1I1qK+mPVX8T3T+09fsF8sZ9nK7uvD9YWShCVz2e2ctf8qPRFq+TWDeDqlnwXz3wCvWmbBUWw==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3039,10 +3340,15 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
+    "node_modules/@ionic-native/local-notifications/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
     "node_modules/@ionic-native/media": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/media/-/media-5.35.0.tgz",
-      "integrity": "sha512-pTzQQnwkJpjlvBJ+ye8eazxiBuHqAOkBYzpcez/dY2HK5u9MTFvX/YeeaZ7LetKHoAwBhtN/LSr2sFG7mo9wFg==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/media/-/media-5.33.0.tgz",
+      "integrity": "sha512-nUu7/FSH41j9+BqHXYVMBd3EifNsTNOufD3NEiMVpHVDWLWqG7tG5h5cFlsVACxUaP4kNpSEke2mjom6CKyjxQ==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3052,9 +3358,9 @@
       }
     },
     "node_modules/@ionic-native/media-capture": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/media-capture/-/media-capture-5.35.0.tgz",
-      "integrity": "sha512-rF97XrAO6Ehc0UG9tO/kVMJ70YIpUzDFr3DdJ6H86cMSROfs8CqP0gsO3x0Uco8sLLCzM7JHqx1oz9gtyiV5PA==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/media-capture/-/media-capture-5.33.0.tgz",
+      "integrity": "sha512-aQTnonVSeijpuZ9B7oYJCjIDqgFVhNdvqkx9vUoaO359BtJGpGS1rNPjEovt4DsqV7oe7TkbmBd8DMEwnB3A2g==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3063,10 +3369,20 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
+    "node_modules/@ionic-native/media-capture/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/media/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
     "node_modules/@ionic-native/network": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/network/-/network-5.35.0.tgz",
-      "integrity": "sha512-Iu6dC0xTB0DUfdY+AJDVdQCJlmmn779s0j5QlR7THA1UUWz37LeWQuUvBdipLt66VfxZ2TlayM4HKrbTE/VkCQ==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/network/-/network-5.33.0.tgz",
+      "integrity": "sha512-J+3+rbDTMVNUspa/nV+P8a0hFKDicJK1rVIrm5aLBQdmN9n7WaqJmeMYTptyWOnZxQpktJAJDdhJTEvVmKQjjw==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3075,10 +3391,15 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
+    "node_modules/@ionic-native/network/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
     "node_modules/@ionic-native/push": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/push/-/push-5.35.0.tgz",
-      "integrity": "sha512-sXaQWnRLe1uyDRraHsPAoU2CLVwVAbTDgJoX1CwxmjILEAa0B7/cJTycbZic8gJ5AYVHdt+JTM5yIE7NfhREHA==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/push/-/push-5.33.0.tgz",
+      "integrity": "sha512-H4gOkMbOaNvi97cKKJDggWvAR1BVCUbtdLyWInA0q3cZBHWSc6KcRJGz+hcdDndCQJUnHofs1Tpw8LN3zhjYyQ==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3087,10 +3408,15 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
+    "node_modules/@ionic-native/push/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
     "node_modules/@ionic-native/qr-scanner": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/qr-scanner/-/qr-scanner-5.35.0.tgz",
-      "integrity": "sha512-QElERY4ImURDFCZB/S58F7f73eiTbThxuxeLhIjB9Uogi72FyAYgQR767NAFIBMh58uIlZy4WKKlIrLWMIx4RQ==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/qr-scanner/-/qr-scanner-5.33.0.tgz",
+      "integrity": "sha512-cyiQv0Rje/fN9/JYoDXP1+ILJkRkjvPtoSx4vd2FsKAuJB60U2DpQfmVEE/KMF4iceTpx4MK/kGzr2WE2AYnIg==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3099,10 +3425,15 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
+    "node_modules/@ionic-native/qr-scanner/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
     "node_modules/@ionic-native/splash-screen": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-5.35.0.tgz",
-      "integrity": "sha512-q3JNIdONmT8pA5xqVB1XiXRR7upKd/o6b2ZX5pPaAZK5GB1kaD8BlRyfJPvX4H1C1o7mAlyr6Y+r1PpeF7KkWg==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-5.33.0.tgz",
+      "integrity": "sha512-6PHk5WJeUoc3zru6wTvUmd9DCASvRQoQq1dysYI3JCECaAJ6X0x1RbzM8dBFs3JPLfWtDn+P8eTp+KaA0Xf58w==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3111,10 +3442,15 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
+    "node_modules/@ionic-native/splash-screen/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
     "node_modules/@ionic-native/sqlite": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/sqlite/-/sqlite-5.35.0.tgz",
-      "integrity": "sha512-6S2EYifwjdDSwgyaojkUT5sbTV/0s65YH7/XJiReDNf7nWAv49Nu7DggJhdNwDKt9kl0NdeJnCv0SS0zGFJRdw==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/sqlite/-/sqlite-5.33.0.tgz",
+      "integrity": "sha512-JIdQJr6bcksotF/3ZMJQZo9lHgaHXvHOOK9R30mM/5Ds5fFu+rUoUf0wvyqaGzEFu94pGw2uPGnfD+WI7x7+1A==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3123,10 +3459,15 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
+    "node_modules/@ionic-native/sqlite/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
     "node_modules/@ionic-native/status-bar": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/status-bar/-/status-bar-5.35.0.tgz",
-      "integrity": "sha512-c9uwQHGf0nO5V+u6cLpCido6FX7QOfjo11BRKwrQoAzpIvSK7cUgh/6PMW3MlkjWs3qNKHRNiHDg7wlac2vcuQ==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/status-bar/-/status-bar-5.33.0.tgz",
+      "integrity": "sha512-cnyfd42N9gGfhyDtF7wbWoacKg/jfsoJQHOHltfhS4/EjxsVu4bjkwq1YBLMcMY3OIqFDSn2aFcejHn8wVNkDQ==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3135,10 +3476,15 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
+    "node_modules/@ionic-native/status-bar/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
     "node_modules/@ionic-native/web-intent": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/web-intent/-/web-intent-5.35.0.tgz",
-      "integrity": "sha512-N2bzHNKGkMNEe4ugPXHkAst2kdBIESXnN4CbQR0s4LYA5o9Aw8Vx3yFKPuhAHfC5rVDWHytoj2ErX+40cPKg5A==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/web-intent/-/web-intent-5.33.0.tgz",
+      "integrity": "sha512-3CIAofrg9nkJQbSftFdMKYOduXy9Ra/a1Q0it6ysm9NFeAQn7iZPThSexBeZ9xiKKj/QTPZtnqAJ0MQ+4mkGag==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3147,10 +3493,15 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
+    "node_modules/@ionic-native/web-intent/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
     "node_modules/@ionic-native/zip": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/zip/-/zip-5.35.0.tgz",
-      "integrity": "sha512-PgGFsXcLWWRrb9UtiKtBHwkKwAamR3l2qMW5qVESns4rBMC628sMaDtIrzsTxarw23Oy3q4kO47tp1pS3Ko0xg==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/zip/-/zip-5.33.0.tgz",
+      "integrity": "sha512-hErISQ6/xqVErmVnnha5BR+3GWRNQIVfMTXzprEpNZxQl3iDe1UTIVQdFnMd3Nasz/naY+61Vq/y91PZ1Rrajw==",
       "dependencies": {
         "@types/cordova": "latest"
       },
@@ -3159,12 +3510,17 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
+    "node_modules/@ionic-native/zip/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
     "node_modules/@ionic/angular": {
-      "version": "5.6.13",
-      "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-5.6.13.tgz",
-      "integrity": "sha512-78S6aCcmeyxeLTTSq/pvc94UH+uIuCm8IO2Dumr/nxpKDw16xs0Xf0E07om0H6Ik4hcqUS7Sjur8syu6cY5Zuw==",
+      "version": "5.6.6",
+      "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-5.6.6.tgz",
+      "integrity": "sha512-0psh2n4Y/3sx0e2Yj4WmNcukz0nrETEiJE6Fl4CldoB8QHZcXGi0hKrPAcbGSAF0+lAJ58+Z5Gp/HQVm/MQOMA==",
       "dependencies": {
-        "@ionic/core": "5.6.13",
+        "@ionic/core": "5.6.6",
         "tslib": "^1.9.3"
       },
       "peerDependencies": {
@@ -3176,125 +3532,61 @@
       }
     },
     "node_modules/@ionic/angular-toolkit": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@ionic/angular-toolkit/-/angular-toolkit-4.0.0.tgz",
-      "integrity": "sha512-HGRAGUtc1YSwNZ/Q7X7c2QRyYM2AfsSm++OasPrMo3LnPRVr8OIsUih2ithEU7f3CXrViUR7j/Anu90zGsRgzg==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/@ionic/angular-toolkit/-/angular-toolkit-2.3.3.tgz",
+      "integrity": "sha512-r87mApDLWbLaUtd5LvNHrRlZWxjQhaBBM1yPlk9M98dHOxcX3jy7kv60ZurGZutuvbhXISGvHcvvR90yywDC1A==",
       "dev": true,
       "dependencies": {
-        "@schematics/angular": "^12.0.0",
+        "@schematics/angular": ">=8.0.0",
         "cheerio": "1.0.0-rc.3",
         "colorette": "1.1.0",
-        "copy-webpack-plugin": "^6.2.1",
-        "tapable": "^2.1.1",
-        "tslib": "^2.0.3",
+        "copy-webpack-plugin": "^6.0.3",
+        "tslib": "^1.9.0",
         "ws": "^7.0.1"
       },
       "peerDependencies": {
-        "@angular-devkit/architect": "^0.1200.0",
-        "@angular-devkit/schematics": "^12.0.0"
+        "@angular-devkit/architect": ">=0.800.0",
+        "@angular-devkit/build-angular": ">=0.800.0",
+        "@angular-devkit/core": ">=8.0.0",
+        "@angular-devkit/schematics": ">=8.0.0"
       }
     },
-    "node_modules/@ionic/angular-toolkit/node_modules/@angular-devkit/core": {
-      "version": "12.1.4",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-12.1.4.tgz",
-      "integrity": "sha512-KOzGD8JbP/7EeUwPiU5x+fo3ZEQ5R4IVW5WoH92PaO3mdpqXC7UL2MWLct8PUe9il9nqJMvrBMldSSvP9PCT2w==",
+    "node_modules/@ionic/angular-toolkit/node_modules/tslib": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
+      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
+      "dev": true
+    },
+    "node_modules/@ionic/angular-toolkit/node_modules/ws": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz",
+      "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==",
       "dev": true,
-      "dependencies": {
-        "ajv": "8.6.0",
-        "ajv-formats": "2.1.0",
-        "fast-json-stable-stringify": "2.1.0",
-        "magic-string": "0.25.7",
-        "rxjs": "6.6.7",
-        "source-map": "0.7.3"
-      },
       "engines": {
-        "node": "^12.14.1 || >=14.0.0",
-        "npm": "^6.11.0 || ^7.5.6",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@ionic/angular-toolkit/node_modules/@schematics/angular": {
-      "version": "12.1.4",
-      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-12.1.4.tgz",
-      "integrity": "sha512-xGqgGI6GWk4EFdKis8FmSESxoLgjnLQbaRE1t1KZCkSKJzqkOj0R9wiDrtZfcrbPxIkLL+3fAk2ThwwPznT6yw==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/core": "12.1.4",
-        "@angular-devkit/schematics": "12.1.4",
-        "jsonc-parser": "3.0.0"
-      },
-      "engines": {
-        "node": "^12.14.1 || >=14.0.0",
-        "npm": "^6.11.0 || ^7.5.6",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@ionic/angular-toolkit/node_modules/ajv": {
-      "version": "8.6.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz",
-      "integrity": "sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/@ionic/angular-toolkit/node_modules/ajv-formats": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.0.tgz",
-      "integrity": "sha512-USH2jBb+C/hIpwD2iRjp0pe0k+MvzG0mlSn/FIdCgQhUb9ALPRjt2KIQdfZDS9r0ZIeUAg7gOu9KL0PFqGqr5Q==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^8.0.0"
+        "node": ">=8.3.0"
       },
       "peerDependencies": {
-        "ajv": "^8.0.0"
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
       },
       "peerDependenciesMeta": {
-        "ajv": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
           "optional": true
         }
       }
     },
-    "node_modules/@ionic/angular-toolkit/node_modules/jsonc-parser": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
-      "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==",
-      "dev": true
-    },
-    "node_modules/@ionic/angular-toolkit/node_modules/rxjs": {
-      "version": "6.6.7",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^1.9.0"
-      },
-      "engines": {
-        "npm": ">=2.0.0"
-      }
-    },
-    "node_modules/@ionic/angular-toolkit/node_modules/rxjs/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
-    },
     "node_modules/@ionic/angular/node_modules/tslib": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
     },
     "node_modules/@ionic/cli": {
-      "version": "6.16.3",
-      "resolved": "https://registry.npmjs.org/@ionic/cli/-/cli-6.16.3.tgz",
-      "integrity": "sha512-4gune4s02oxft1RC+zXXexr2qT0CuPzRWpP3c3daabf3skZHAV+TfhE7aW26zV9XHS2Mw0YjHuKZHu1/UgMRqw==",
+      "version": "6.14.1",
+      "resolved": "https://registry.npmjs.org/@ionic/cli/-/cli-6.14.1.tgz",
+      "integrity": "sha512-QGmA5hjW4PvS8o0f+ptJ2bOknu4dPKzlECFApBiR7ayDgGTDMwmbxrtNpRhDnjdsVlMAzWq8eo9l76831+DBjQ==",
       "dev": true,
       "dependencies": {
         "@ionic/cli-framework": "5.1.0",
@@ -3371,6 +3663,29 @@
         "node": ">=10.3.0"
       }
     },
+    "node_modules/@ionic/cli-framework-output/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@ionic/cli-framework-output/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
     "node_modules/@ionic/cli-framework-prompts": {
       "version": "2.1.8",
       "resolved": "https://registry.npmjs.org/@ionic/cli-framework-prompts/-/cli-framework-prompts-2.1.8.tgz",
@@ -3386,25 +3701,217 @@
         "node": ">=10.3.0"
       }
     },
-    "node_modules/@ionic/cli-framework/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/@ionic/cli-framework-prompts/node_modules/ansi-escapes": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "type-fest": "^0.21.3"
       },
       "engines": {
         "node": ">=8"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/chalk": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/cli-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+      "dev": true,
+      "dependencies": {
+        "restore-cursor": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/cli-width": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
+      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/figures": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+      "dev": true,
+      "dependencies": {
+        "escape-string-regexp": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/inquirer": {
+      "version": "7.3.3",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz",
+      "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.1.0",
+        "cli-cursor": "^3.1.0",
+        "cli-width": "^3.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^3.0.0",
+        "lodash": "^4.17.19",
+        "mute-stream": "0.0.8",
+        "run-async": "^2.4.0",
+        "rxjs": "^6.6.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "through": "^2.3.6"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/restore-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "dev": true,
+      "dependencies": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/rxjs": {
+      "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/rxjs/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/string-width": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/type-fest": {
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/@ionic/cli-framework/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -3417,58 +3924,33 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@ionic/cli-framework/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/@ionic/cli-framework/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "ms": "2.1.2"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@ionic/cli-framework/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@ionic/cli-framework/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@ionic/cli/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
+    "node_modules/@ionic/cli-framework/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
     },
     "node_modules/@ionic/cli/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -3481,49 +3963,75 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@ionic/cli/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/@ionic/cli/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "ms": "2.1.2"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@ionic/cli/node_modules/has-flag": {
+    "node_modules/@ionic/cli/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@ionic/cli/node_modules/os-name": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@ionic/cli/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "resolved": "https://registry.npmjs.org/os-name/-/os-name-4.0.0.tgz",
+      "integrity": "sha512-caABzDdJMbtykt7GmSogEat3faTKQhmZf0BS5l/pZGmP0vPWQjXWqOhbLyK+b6j2/DQPmEvYdzLXJXXLJNVDNg==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "macos-release": "^2.2.0",
+        "windows-release": "^4.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@ionic/cli/node_modules/windows-release": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-4.0.0.tgz",
+      "integrity": "sha512-OxmV4wzDKB1x7AZaZgXMVsdJ1qER1ed83ZrTYd5Bwq2HfJVg3DJS8nqlAG4sMoJ7mu8cuRmLEYyU13BKwctRAg==",
+      "dev": true,
+      "dependencies": {
+        "execa": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/@ionic/core": {
-      "version": "5.6.13",
-      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.6.13.tgz",
-      "integrity": "sha512-stN80Q4zdLT7pmUoNNqp+lVjTIhcLSjDN2rzP/gYz8YAkz1L5AB2CkudD5VHWFTBbAEsylih34gAMOrygVNoJQ==",
+      "version": "5.6.6",
+      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.6.6.tgz",
+      "integrity": "sha512-EbVIXOTVVPxBo7hsarBpRSFNsQ22wBFtWkKmrmliieknG5LUkf5WZBpj4EENQhzYA6c+//7/nfhcD9pWgtAofA==",
       "dependencies": {
         "@stencil/core": "^2.4.0",
-        "ionicons": "^5.5.3",
+        "ionicons": "^5.5.1",
         "tslib": "^2.1.0"
       }
     },
+    "node_modules/@ionic/core/node_modules/tslib": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz",
+      "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w=="
+    },
     "node_modules/@ionic/utils-array": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-2.1.5.tgz",
@@ -3537,6 +4045,29 @@
         "node": ">=10.3.0"
       }
     },
+    "node_modules/@ionic/utils-array/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@ionic/utils-array/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
     "node_modules/@ionic/utils-fs": {
       "version": "3.1.5",
       "resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-3.1.5.tgz",
@@ -3551,6 +4082,29 @@
         "node": ">=10.3.0"
       }
     },
+    "node_modules/@ionic/utils-fs/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@ionic/utils-fs/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
     "node_modules/@ionic/utils-network": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-2.1.5.tgz",
@@ -3564,6 +4118,29 @@
         "node": ">=10.3.0"
       }
     },
+    "node_modules/@ionic/utils-network/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@ionic/utils-network/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
     "node_modules/@ionic/utils-object": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@ionic/utils-object/-/utils-object-2.1.5.tgz",
@@ -3577,6 +4154,29 @@
         "node": ">=10.3.0"
       }
     },
+    "node_modules/@ionic/utils-object/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@ionic/utils-object/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
     "node_modules/@ionic/utils-process": {
       "version": "2.1.8",
       "resolved": "https://registry.npmjs.org/@ionic/utils-process/-/utils-process-2.1.8.tgz",
@@ -3594,6 +4194,29 @@
         "node": ">=10.3.0"
       }
     },
+    "node_modules/@ionic/utils-process/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@ionic/utils-process/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
     "node_modules/@ionic/utils-stream": {
       "version": "3.1.5",
       "resolved": "https://registry.npmjs.org/@ionic/utils-stream/-/utils-stream-3.1.5.tgz",
@@ -3607,6 +4230,29 @@
         "node": ">=10.3.0"
       }
     },
+    "node_modules/@ionic/utils-stream/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@ionic/utils-stream/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
     "node_modules/@ionic/utils-subprocess": {
       "version": "2.1.8",
       "resolved": "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-2.1.8.tgz",
@@ -3626,6 +4272,29 @@
         "node": ">=10.3.0"
       }
     },
+    "node_modules/@ionic/utils-subprocess/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@ionic/utils-subprocess/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
     "node_modules/@ionic/utils-terminal": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-2.3.1.tgz",
@@ -3645,6 +4314,96 @@
         "node": ">=10.3.0"
       }
     },
+    "node_modules/@ionic/utils-terminal/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@ionic/utils-terminal/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@ionic/utils-terminal/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/@ionic/utils-terminal/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@ionic/utils-terminal/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@ionic/utils-terminal/node_modules/string-width": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@ionic/utils-terminal/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@ionic/utils-terminal/node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
     "node_modules/@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
@@ -3661,15 +4420,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
@@ -3741,50 +4491,35 @@
       }
     },
     "node_modules/@istanbuljs/schema": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz",
+      "integrity": "sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==",
       "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@jest/console": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.6.2.tgz",
-      "integrity": "sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.5.2.tgz",
+      "integrity": "sha512-lJELzKINpF1v74DXHbCRIkQ/+nUV1M+ntj+X1J8LxCgpmJZjfLmhFejiMSbjjD66fayxl5Z06tbs3HMyuik6rw==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^26.6.2",
+        "@jest/types": "^26.5.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "jest-message-util": "^26.6.2",
-        "jest-util": "^26.6.2",
+        "jest-message-util": "^26.5.2",
+        "jest-util": "^26.5.2",
         "slash": "^3.0.0"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/@jest/console/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/@jest/console/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -3797,68 +4532,35 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@jest/console/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@jest/console/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/console/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@jest/core": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.6.3.tgz",
-      "integrity": "sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.5.2.tgz",
+      "integrity": "sha512-LLTo1LQMg7eJjG/+P1NYqFof2B25EV1EqzD5FonklihG4UJKiK2JBIvWonunws6W7e+DhNLoFD+g05tCY03eyA==",
       "dev": true,
       "dependencies": {
-        "@jest/console": "^26.6.2",
-        "@jest/reporters": "^26.6.2",
-        "@jest/test-result": "^26.6.2",
-        "@jest/transform": "^26.6.2",
-        "@jest/types": "^26.6.2",
+        "@jest/console": "^26.5.2",
+        "@jest/reporters": "^26.5.2",
+        "@jest/test-result": "^26.5.2",
+        "@jest/transform": "^26.5.2",
+        "@jest/types": "^26.5.2",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.4",
-        "jest-changed-files": "^26.6.2",
-        "jest-config": "^26.6.3",
-        "jest-haste-map": "^26.6.2",
-        "jest-message-util": "^26.6.2",
+        "jest-changed-files": "^26.5.2",
+        "jest-config": "^26.5.2",
+        "jest-haste-map": "^26.5.2",
+        "jest-message-util": "^26.5.2",
         "jest-regex-util": "^26.0.0",
-        "jest-resolve": "^26.6.2",
-        "jest-resolve-dependencies": "^26.6.3",
-        "jest-runner": "^26.6.3",
-        "jest-runtime": "^26.6.3",
-        "jest-snapshot": "^26.6.2",
-        "jest-util": "^26.6.2",
-        "jest-validate": "^26.6.2",
-        "jest-watcher": "^26.6.2",
+        "jest-resolve": "^26.5.2",
+        "jest-resolve-dependencies": "^26.5.2",
+        "jest-runner": "^26.5.2",
+        "jest-runtime": "^26.5.2",
+        "jest-snapshot": "^26.5.2",
+        "jest-util": "^26.5.2",
+        "jest-validate": "^26.5.2",
+        "jest-watcher": "^26.5.2",
         "micromatch": "^4.0.2",
         "p-each-series": "^2.1.0",
         "rimraf": "^3.0.0",
@@ -3869,25 +4571,34 @@
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/@jest/core/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/@jest/core/node_modules/ansi-escapes": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
+      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "type-fest": "^0.11.0"
       },
       "engines": {
         "node": ">=8"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@jest/core/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
       }
     },
     "node_modules/@jest/core/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -3900,177 +4611,87 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@jest/core/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/@jest/core/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@jest/core/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/core/node_modules/jest-config": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",
-      "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.1.0",
-        "@jest/test-sequencer": "^26.6.3",
-        "@jest/types": "^26.6.2",
-        "babel-jest": "^26.6.3",
-        "chalk": "^4.0.0",
-        "deepmerge": "^4.2.2",
-        "glob": "^7.1.1",
-        "graceful-fs": "^4.2.4",
-        "jest-environment-jsdom": "^26.6.2",
-        "jest-environment-node": "^26.6.2",
-        "jest-get-type": "^26.3.0",
-        "jest-jasmine2": "^26.6.3",
-        "jest-regex-util": "^26.0.0",
-        "jest-resolve": "^26.6.2",
-        "jest-util": "^26.6.2",
-        "jest-validate": "^26.6.2",
-        "micromatch": "^4.0.2",
-        "pretty-format": "^26.6.2"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      },
-      "peerDependencies": {
-        "ts-node": ">=9.0.0"
-      },
-      "peerDependenciesMeta": {
-        "ts-node": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@jest/core/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
+        "ansi-regex": "^5.0.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/@jest/core/node_modules/ts-node": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.1.0.tgz",
-      "integrity": "sha512-6szn3+J9WyG2hE+5W8e0ruZrzyk1uFLYye6IGMBadnOzDh8aP7t8CbFpsfCiEx2+wMixAhjFt7lOZC4+l+WbEA==",
+    "node_modules/@jest/core/node_modules/type-fest": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
+      "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
       "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@tsconfig/node10": "^1.0.7",
-        "@tsconfig/node12": "^1.0.7",
-        "@tsconfig/node14": "^1.0.0",
-        "@tsconfig/node16": "^1.0.1",
-        "arg": "^4.1.0",
-        "create-require": "^1.1.0",
-        "diff": "^4.0.1",
-        "make-error": "^1.1.1",
-        "source-map-support": "^0.5.17",
-        "yn": "3.1.1"
-      },
-      "bin": {
-        "ts-node": "dist/bin.js",
-        "ts-node-cwd": "dist/bin-cwd.js",
-        "ts-node-script": "dist/bin-script.js",
-        "ts-node-transpile-only": "dist/bin-transpile.js",
-        "ts-script": "dist/bin-script-deprecated.js"
-      },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=8"
       },
-      "peerDependencies": {
-        "@swc/core": ">=1.2.50",
-        "@swc/wasm": ">=1.2.50",
-        "@types/node": "*",
-        "typescript": ">=2.7"
-      },
-      "peerDependenciesMeta": {
-        "@swc/core": {
-          "optional": true
-        },
-        "@swc/wasm": {
-          "optional": true
-        }
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/@jest/environment": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.6.2.tgz",
-      "integrity": "sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.5.2.tgz",
+      "integrity": "sha512-YjhCD/Zhkz0/1vdlS/QN6QmuUdDkpgBdK4SdiVg4Y19e29g4VQYN5Xg8+YuHjdoWGY7wJHMxc79uDTeTOy9Ngw==",
       "dev": true,
       "dependencies": {
-        "@jest/fake-timers": "^26.6.2",
-        "@jest/types": "^26.6.2",
+        "@jest/fake-timers": "^26.5.2",
+        "@jest/types": "^26.5.2",
         "@types/node": "*",
-        "jest-mock": "^26.6.2"
+        "jest-mock": "^26.5.2"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
     "node_modules/@jest/fake-timers": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.6.2.tgz",
-      "integrity": "sha512-14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.5.2.tgz",
+      "integrity": "sha512-09Hn5Oraqt36V1akxQeWMVL0fR9c6PnEhpgLaYvREXZJAh2H2Y+QLCsl0g7uMoJeoWJAuz4tozk1prbR1Fc1sw==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^26.6.2",
+        "@jest/types": "^26.5.2",
         "@sinonjs/fake-timers": "^6.0.1",
         "@types/node": "*",
-        "jest-message-util": "^26.6.2",
-        "jest-mock": "^26.6.2",
-        "jest-util": "^26.6.2"
+        "jest-message-util": "^26.5.2",
+        "jest-mock": "^26.5.2",
+        "jest-util": "^26.5.2"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
     "node_modules/@jest/globals": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.6.2.tgz",
-      "integrity": "sha512-85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.5.2.tgz",
+      "integrity": "sha512-9PmnFsAUJxpPt1s/stq02acS1YHliVBDNfAWMe1bwdRr1iTCfhbNt3ERQXrO/ZfZSweftoA26Q/2yhSVSWQ3sw==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^26.6.2",
-        "@jest/types": "^26.6.2",
-        "expect": "^26.6.2"
+        "@jest/environment": "^26.5.2",
+        "@jest/types": "^26.5.2",
+        "expect": "^26.5.2"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
     "node_modules/@jest/reporters": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.6.2.tgz",
-      "integrity": "sha512-h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.5.2.tgz",
+      "integrity": "sha512-zvq6Wvy6MmJq/0QY0YfOPb49CXKSf42wkJbrBPkeypVa8I+XDxijvFuywo6TJBX/ILPrdrlE/FW9vJZh6Rf9vA==",
       "dev": true,
       "dependencies": {
         "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^26.6.2",
-        "@jest/test-result": "^26.6.2",
-        "@jest/transform": "^26.6.2",
-        "@jest/types": "^26.6.2",
+        "@jest/console": "^26.5.2",
+        "@jest/test-result": "^26.5.2",
+        "@jest/transform": "^26.5.2",
+        "@jest/types": "^26.5.2",
         "chalk": "^4.0.0",
         "collect-v8-coverage": "^1.0.0",
         "exit": "^0.1.2",
@@ -4081,15 +4702,15 @@
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^4.0.0",
         "istanbul-reports": "^3.0.2",
-        "jest-haste-map": "^26.6.2",
-        "jest-resolve": "^26.6.2",
-        "jest-util": "^26.6.2",
-        "jest-worker": "^26.6.2",
+        "jest-haste-map": "^26.5.2",
+        "jest-resolve": "^26.5.2",
+        "jest-util": "^26.5.2",
+        "jest-worker": "^26.5.0",
         "slash": "^3.0.0",
         "source-map": "^0.6.0",
         "string-length": "^4.0.1",
         "terminal-link": "^2.0.0",
-        "v8-to-istanbul": "^7.0.0"
+        "v8-to-istanbul": "^5.0.1"
       },
       "engines": {
         "node": ">= 10.14.2"
@@ -4098,25 +4719,10 @@
         "node-notifier": "^8.0.0"
       }
     },
-    "node_modules/@jest/reporters/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/@jest/reporters/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -4129,25 +4735,18 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@jest/reporters/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/@jest/reporters/node_modules/jest-worker": {
+      "version": "26.5.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.5.0.tgz",
+      "integrity": "sha512-kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^7.0.0"
       },
       "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@jest/reporters/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
+        "node": ">= 10.13.0"
       }
     },
     "node_modules/@jest/reporters/node_modules/source-map": {
@@ -4159,22 +4758,10 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/@jest/reporters/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@jest/source-map": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.6.2.tgz",
-      "integrity": "sha512-YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA==",
+      "version": "26.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.5.0.tgz",
+      "integrity": "sha512-jWAw9ZwYHJMe9eZq/WrsHlwF8E3hM9gynlcDpOyCb9bR8wEd9ZNBZCi7/jZyzHxC7t3thZ10gO2IDhu0bPKS5g==",
       "dev": true,
       "dependencies": {
         "callsites": "^3.0.0",
@@ -4195,13 +4782,13 @@
       }
     },
     "node_modules/@jest/test-result": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.6.2.tgz",
-      "integrity": "sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.5.2.tgz",
+      "integrity": "sha512-E/Zp6LURJEGSCWpoMGmCFuuEI1OWuI3hmZwmULV0GsgJBh7u0rwqioxhRU95euUuviqBDN8ruX/vP/4bwYolXw==",
       "dev": true,
       "dependencies": {
-        "@jest/console": "^26.6.2",
-        "@jest/types": "^26.6.2",
+        "@jest/console": "^26.5.2",
+        "@jest/types": "^26.5.2",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "collect-v8-coverage": "^1.0.0"
       },
@@ -4210,37 +4797,37 @@
       }
     },
     "node_modules/@jest/test-sequencer": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz",
-      "integrity": "sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.5.2.tgz",
+      "integrity": "sha512-XmGEh7hh07H2B8mHLFCIgr7gA5Y6Hw1ZATIsbz2fOhpnQ5AnQtZk0gmP0Q5/+mVB2xygO64tVFQxOajzoptkNA==",
       "dev": true,
       "dependencies": {
-        "@jest/test-result": "^26.6.2",
+        "@jest/test-result": "^26.5.2",
         "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^26.6.2",
-        "jest-runner": "^26.6.3",
-        "jest-runtime": "^26.6.3"
+        "jest-haste-map": "^26.5.2",
+        "jest-runner": "^26.5.2",
+        "jest-runtime": "^26.5.2"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
     "node_modules/@jest/transform": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.6.2.tgz",
-      "integrity": "sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.5.2.tgz",
+      "integrity": "sha512-AUNjvexh+APhhmS8S+KboPz+D3pCxPvEAGduffaAJYxIFxGi/ytZQkrqcKDUU0ERBAo5R7087fyOYr2oms1seg==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.1.0",
-        "@jest/types": "^26.6.2",
+        "@jest/types": "^26.5.2",
         "babel-plugin-istanbul": "^6.0.0",
         "chalk": "^4.0.0",
         "convert-source-map": "^1.4.0",
         "fast-json-stable-stringify": "^2.0.0",
         "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^26.6.2",
+        "jest-haste-map": "^26.5.2",
         "jest-regex-util": "^26.0.0",
-        "jest-util": "^26.6.2",
+        "jest-util": "^26.5.2",
         "micromatch": "^4.0.2",
         "pirates": "^4.0.1",
         "slash": "^3.0.0",
@@ -4251,25 +4838,10 @@
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/@jest/transform/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/@jest/transform/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -4282,27 +4854,6 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@jest/transform/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@jest/transform/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@jest/transform/node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -4312,22 +4863,10 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/@jest/transform/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@jest/types": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
-      "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.5.2.tgz",
+      "integrity": "sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==",
       "dev": true,
       "dependencies": {
         "@types/istanbul-lib-coverage": "^2.0.0",
@@ -4340,25 +4879,10 @@
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/@jest/types/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/@jest/types/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -4371,50 +4895,43 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@jest/types/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@jest/types/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/types/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@jsdevtools/coverage-istanbul-loader": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@jsdevtools/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.5.tgz",
-      "integrity": "sha512-EUCPEkaRPvmHjWAAZkWMT7JDzpw7FKB00WTISaiXsbNOd5hCHg77XLA8sLYLFDo1zepYLo2w7GstN8YBqRXZfA==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@jsdevtools/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.3.tgz",
+      "integrity": "sha512-TAdNkeGB5Fe4Og+ZkAr1Kvn9by2sfL44IAHFtxlh1BA1XJ5cLpO9iSNki5opWESv3l3vSHsZ9BNKuqFKbEbFaA==",
       "dev": true,
       "dependencies": {
         "convert-source-map": "^1.7.0",
-        "istanbul-lib-instrument": "^4.0.3",
-        "loader-utils": "^2.0.0",
+        "istanbul-lib-instrument": "^4.0.1",
+        "loader-utils": "^1.4.0",
         "merge-source-map": "^1.1.0",
-        "schema-utils": "^2.7.0"
+        "schema-utils": "^2.6.4"
+      }
+    },
+    "node_modules/@jsdevtools/coverage-istanbul-loader/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/@jsdevtools/coverage-istanbul-loader/node_modules/loader-utils": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
       }
     },
     "node_modules/@moodlehq/cordova-plugin-file-transfer": {
@@ -4543,48 +5060,49 @@
       }
     },
     "node_modules/@ngtools/webpack": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-11.2.14.tgz",
-      "integrity": "sha512-6q57tEWtUJRsxfTKE19L20iXvNesfVy8hrVdyzVk64DZQh0lIl4/xZT4d5bJCWOuQQDaAeZK4YbEFcYJn7k1yw==",
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-10.0.8.tgz",
+      "integrity": "sha512-Qv4v7O4VGeWuXjRThd/mdC2I4cJOgQ7kDrVN7vkDB2EW5xtRB+/4hghvFeO3bD11FLuFvCxBMb0HbwyKoVQgEQ==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "11.2.14",
-        "enhanced-resolve": "5.7.0",
-        "webpack-sources": "2.2.0"
+        "@angular-devkit/core": "10.0.8",
+        "enhanced-resolve": "4.1.1",
+        "rxjs": "6.5.5",
+        "webpack-sources": "1.4.3"
       },
       "engines": {
         "node": ">= 10.13.0",
-        "npm": "^6.11.0 || ^7.5.6",
+        "npm": ">= 6.11.0",
         "yarn": ">= 1.13.0"
       },
       "peerDependencies": {
-        "@angular/compiler-cli": "^11.0.0 || ^11.2.0-next",
-        "typescript": "~4.0.0 || ~4.1.0",
+        "@angular/compiler-cli": ">=10.0.0-next.0 < 11",
+        "typescript": ">=3.9 < 3.10",
         "webpack": "^4.0.0"
       }
     },
     "node_modules/@ngtools/webpack/node_modules/@angular-devkit/core": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
-      "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
+      "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
       "dev": true,
       "dependencies": {
-        "ajv": "6.12.6",
+        "ajv": "6.12.3",
         "fast-json-stable-stringify": "2.1.0",
         "magic-string": "0.25.7",
-        "rxjs": "6.6.3",
+        "rxjs": "6.5.5",
         "source-map": "0.7.3"
       },
       "engines": {
         "node": ">= 10.13.0",
-        "npm": "^6.11.0 || ^7.5.6",
+        "npm": ">= 6.11.0",
         "yarn": ">= 1.13.0"
       }
     },
     "node_modules/@ngtools/webpack/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "version": "6.12.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
       "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
@@ -4597,30 +5115,6 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/@ngtools/webpack/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/@ngtools/webpack/node_modules/rxjs": {
-      "version": "6.6.3",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
-      "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^1.9.0"
-      },
-      "engines": {
-        "npm": ">=2.0.0"
-      }
-    },
-    "node_modules/@ngtools/webpack/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
-    },
     "node_modules/@ngx-translate/core": {
       "version": "13.0.0",
       "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-13.0.0.tgz",
@@ -4647,11 +5141,11 @@
       }
     },
     "node_modules/@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz",
+      "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==",
       "dependencies": {
-        "@nodelib/fs.stat": "2.0.5",
+        "@nodelib/fs.stat": "2.0.3",
         "run-parallel": "^1.1.9"
       },
       "engines": {
@@ -4659,30 +5153,25 @@
       }
     },
     "node_modules/@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz",
+      "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==",
       "engines": {
         "node": ">= 8"
       }
     },
     "node_modules/@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz",
+      "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==",
       "dependencies": {
-        "@nodelib/fs.scandir": "2.1.5",
+        "@nodelib/fs.scandir": "2.1.3",
         "fastq": "^1.6.0"
       },
       "engines": {
         "node": ">= 8"
       }
     },
-    "node_modules/@npmcli/ci-detect": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/ci-detect/-/ci-detect-1.3.0.tgz",
-      "integrity": "sha512-oN3y7FAROHhrAt7Rr7PnTSwrHrZVRTS2ZbyxeQwSSYD0ifwM3YNgQqbaRmjcWoPyq77MjchusjJDspbzMmip1Q=="
-    },
     "node_modules/@npmcli/git": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-2.1.0.tgz",
@@ -4714,6 +5203,17 @@
         "node": ">=10"
       }
     },
+    "node_modules/@npmcli/git/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/@npmcli/git/node_modules/npm-package-arg": {
       "version": "8.1.5",
       "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.5.tgz",
@@ -4750,14 +5250,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/@npmcli/git/node_modules/retry": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
-      "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
-      "engines": {
-        "node": ">= 4"
-      }
-    },
     "node_modules/@npmcli/git/node_modules/semver": {
       "version": "7.3.5",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
@@ -4788,12 +5280,22 @@
       }
     },
     "node_modules/@npmcli/move-file": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz",
-      "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.0.1.tgz",
+      "integrity": "sha512-Uv6h1sT+0DrblvIrolFtbvM1FgWm+/sy4B3pvLp67Zys+thcukzS5ekn7HsZFGpWP4Q3fYJCljbWQE/XivMRLw==",
       "dependencies": {
-        "mkdirp": "^1.0.4",
-        "rimraf": "^3.0.2"
+        "mkdirp": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@npmcli/move-file/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "bin": {
+        "mkdirp": "bin/cmd.js"
       },
       "engines": {
         "node": ">=10"
@@ -4824,72 +5326,43 @@
         "read-package-json-fast": "^2.0.1"
       }
     },
-    "node_modules/@npmcli/run-script/node_modules/read-package-json-fast": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz",
-      "integrity": "sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ==",
-      "dependencies": {
-        "json-parse-even-better-errors": "^2.3.0",
-        "npm-normalize-package-bin": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@schematics/angular": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-11.2.14.tgz",
-      "integrity": "sha512-nErn5BFYp4HB7mOkt23kF+dyM6zPxolejM8eXQ5vd/rdhcc6ROaMZ0EmeEAWkfqB3+vqaSDz/D2Nm/IjJlyW/Q==",
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-10.0.8.tgz",
+      "integrity": "sha512-KNO61UGtiKMQSG+NbusqLtwLbxId0y+xpXJt9PKFwi+vaViOO+YzOPREfiFCuQ7q6X8SmNlrMj6sZ34E2YN1pQ==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "11.2.14",
-        "@angular-devkit/schematics": "11.2.14",
-        "jsonc-parser": "3.0.0"
+        "@angular-devkit/core": "10.0.8",
+        "@angular-devkit/schematics": "10.0.8"
       },
       "engines": {
         "node": ">= 10.13.0",
-        "npm": "^6.11.0 || ^7.5.6",
+        "npm": ">= 6.11.0",
         "yarn": ">= 1.13.0"
       }
     },
     "node_modules/@schematics/angular/node_modules/@angular-devkit/core": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
-      "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
+      "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
       "dev": true,
       "dependencies": {
-        "ajv": "6.12.6",
+        "ajv": "6.12.3",
         "fast-json-stable-stringify": "2.1.0",
         "magic-string": "0.25.7",
-        "rxjs": "6.6.3",
+        "rxjs": "6.5.5",
         "source-map": "0.7.3"
       },
       "engines": {
         "node": ">= 10.13.0",
-        "npm": "^6.11.0 || ^7.5.6",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@schematics/angular/node_modules/@angular-devkit/schematics": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.14.tgz",
-      "integrity": "sha512-Ol6+0qdGKzuVJm5gCtQr47X0OCihTfAxI4h047cHYhPFIGGPSvkG/QeJMZugflgoobi2k/xcYokOu/VAkRtWbQ==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/core": "11.2.14",
-        "ora": "5.3.0",
-        "rxjs": "6.6.3"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": "^6.11.0 || ^7.5.6",
+        "npm": ">= 6.11.0",
         "yarn": ">= 1.13.0"
       }
     },
     "node_modules/@schematics/angular/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "version": "6.12.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
       "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
@@ -4902,95 +5375,50 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/@schematics/angular/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/@schematics/angular/node_modules/jsonc-parser": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
-      "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==",
-      "dev": true
-    },
-    "node_modules/@schematics/angular/node_modules/rxjs": {
-      "version": "6.6.3",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
-      "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^1.9.0"
-      },
-      "engines": {
-        "npm": ">=2.0.0"
-      }
-    },
-    "node_modules/@schematics/angular/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
-    },
     "node_modules/@schematics/update": {
-      "version": "0.1102.14",
-      "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.1102.14.tgz",
-      "integrity": "sha512-OsWuC0iyNjpST1+hVUUZAegXAFpEFpS5uKYSQF3jsbyw8XHx7oA5/HbEwyr2WkX2EdV1tKrDLz6BrD5b8W6EYw==",
+      "version": "0.1000.8",
+      "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.1000.8.tgz",
+      "integrity": "sha512-xHuj6ME3PNTsVUrpftd98LF3WHPM0NU25GcT/n0E/j0/52yDTiaPS3wUnYSK8ZSv4Et4hcyGx7f/LEXAoOKJXw==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "11.2.14",
-        "@angular-devkit/schematics": "11.2.14",
+        "@angular-devkit/core": "10.0.8",
+        "@angular-devkit/schematics": "10.0.8",
         "@yarnpkg/lockfile": "1.1.0",
-        "ini": "2.0.0",
+        "ini": "1.3.5",
         "npm-package-arg": "^8.0.0",
-        "pacote": "11.2.4",
-        "semver": "7.3.4",
+        "pacote": "9.5.12",
+        "rxjs": "6.5.5",
+        "semver": "7.3.2",
         "semver-intersect": "1.4.0"
       },
       "engines": {
         "node": ">= 10.13.0",
-        "npm": "^6.11.0 || ^7.5.6",
+        "npm": ">= 6.11.0",
         "yarn": ">= 1.13.0"
       }
     },
     "node_modules/@schematics/update/node_modules/@angular-devkit/core": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
-      "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
+      "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
       "dev": true,
       "dependencies": {
-        "ajv": "6.12.6",
+        "ajv": "6.12.3",
         "fast-json-stable-stringify": "2.1.0",
         "magic-string": "0.25.7",
-        "rxjs": "6.6.3",
+        "rxjs": "6.5.5",
         "source-map": "0.7.3"
       },
       "engines": {
         "node": ">= 10.13.0",
-        "npm": "^6.11.0 || ^7.5.6",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@schematics/update/node_modules/@angular-devkit/schematics": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.14.tgz",
-      "integrity": "sha512-Ol6+0qdGKzuVJm5gCtQr47X0OCihTfAxI4h047cHYhPFIGGPSvkG/QeJMZugflgoobi2k/xcYokOu/VAkRtWbQ==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/core": "11.2.14",
-        "ora": "5.3.0",
-        "rxjs": "6.6.3"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": "^6.11.0 || ^7.5.6",
+        "npm": ">= 6.11.0",
         "yarn": ">= 1.13.0"
       }
     },
     "node_modules/@schematics/update/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "version": "6.12.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
       "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
@@ -5003,30 +5431,6 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/@schematics/update/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/@schematics/update/node_modules/rxjs": {
-      "version": "6.6.3",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
-      "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^1.9.0"
-      },
-      "engines": {
-        "npm": ">=2.0.0"
-      }
-    },
-    "node_modules/@schematics/update/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
-    },
     "node_modules/@sindresorhus/is": {
       "version": "0.14.0",
       "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
@@ -5036,9 +5440,9 @@
       }
     },
     "node_modules/@sinonjs/commons": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
-      "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.1.tgz",
+      "integrity": "sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw==",
       "dev": true,
       "dependencies": {
         "type-detect": "4.0.8"
@@ -5054,9 +5458,9 @@
       }
     },
     "node_modules/@stencil/core": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.6.0.tgz",
-      "integrity": "sha512-QsxWayZyusnqSZrlCl81R71rA3KqFjVVQSH4E0rGN15F1GdQaFonKlHLyCOLKLig1zzC+DQkLLiUuocexuvdeQ==",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.5.2.tgz",
+      "integrity": "sha512-bgjPXkSzzg1WnTgVUm6m5ZzpKt602WmA/QljODAW1xVN40OHJdbGblzF/F6MFzqv2c5Cy30CB41arc8qADIdcQ==",
       "bin": {
         "stencil": "bin/stencil"
       },
@@ -5084,51 +5488,10 @@
         "node": ">= 6"
       }
     },
-    "node_modules/@trysound/sax": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.1.1.tgz",
-      "integrity": "sha512-Z6DoceYb/1xSg5+e+ZlPZ9v0N16ZvZ+wYMraFue4HYrE4ttONKtsvruIRf6t9TBR0YvSOfi1hUU0fJfBLCDYow==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/@tsconfig/node10": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz",
-      "integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "node_modules/@tsconfig/node12": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz",
-      "integrity": "sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "node_modules/@tsconfig/node14": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz",
-      "integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "node_modules/@tsconfig/node16": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz",
-      "integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
     "node_modules/@types/babel__core": {
-      "version": "7.1.15",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.15.tgz",
-      "integrity": "sha512-bxlMKPDbY8x5h6HBwVzEOk2C8fb6SLfYQ5Jw3uBYuYF1lfWk/kbLd81la82vrIkBb0l+JdmrZaDikPrNxpS/Ew==",
+      "version": "7.1.10",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.10.tgz",
+      "integrity": "sha512-x8OM8XzITIMyiwl5Vmo2B1cR1S1Ipkyv4mdlbJjMa1lmuKvKY9FrBbEANIaMlnWn5Rf7uO+rC/VgYabNkE17Hw==",
       "dev": true,
       "dependencies": {
         "@babel/parser": "^7.1.0",
@@ -5139,18 +5502,18 @@
       }
     },
     "node_modules/@types/babel__generator": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.3.tgz",
-      "integrity": "sha512-/GWCmzJWqV7diQW54smJZzWbSFf4QYtF71WCKhcx6Ru/tFyQIY2eiiITcCAeuPbNSvT9YCGkVMqqvSk2Z0mXiA==",
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.2.tgz",
+      "integrity": "sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ==",
       "dev": true,
       "dependencies": {
         "@babel/types": "^7.0.0"
       }
     },
     "node_modules/@types/babel__template": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
-      "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.3.tgz",
+      "integrity": "sha512-uCoznIPDmnickEi6D0v11SBpW0OuVqHJCa7syXqQHy5uktSCreIlt0iglsCnmvz8yCb38hGcWeseA8cWJSwv5Q==",
       "dev": true,
       "dependencies": {
         "@babel/parser": "^7.1.0",
@@ -5158,18 +5521,18 @@
       }
     },
     "node_modules/@types/babel__traverse": {
-      "version": "7.14.2",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.14.2.tgz",
-      "integrity": "sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==",
+      "version": "7.0.15",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.15.tgz",
+      "integrity": "sha512-Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A==",
       "dev": true,
       "dependencies": {
         "@babel/types": "^7.3.0"
       }
     },
     "node_modules/@types/chart.js": {
-      "version": "2.9.34",
-      "resolved": "https://registry.npmjs.org/@types/chart.js/-/chart.js-2.9.34.tgz",
-      "integrity": "sha512-CtZVk+kh1IN67dv+fB0CWmCLCRrDJgqOj15qPic2B1VCMovNO6B7Vhf/TgPpNscjhAL1j+qUntDMWb9A4ZmPTg==",
+      "version": "2.9.31",
+      "resolved": "https://registry.npmjs.org/@types/chart.js/-/chart.js-2.9.31.tgz",
+      "integrity": "sha512-hzS6phN/kx3jClk3iYqEHNnYIRSi4RZrIGJ8CDLjgatpHoftCezvC44uqB3o3OUm9ftU1m7sHG8+RLyPTlACrA==",
       "dependencies": {
         "moment": "^2.10.2"
       }
@@ -5180,20 +5543,20 @@
       "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
     },
     "node_modules/@types/dom-mediacapture-record": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/@types/dom-mediacapture-record/-/dom-mediacapture-record-1.0.10.tgz",
-      "integrity": "sha512-8O84hHuVhMMLHLybf3y9SQpNcnQSuzVzcJaUNq9+4Ovb7fodS0aQXep4hyMtxd6fe/dyszbHFjFqtyawf4y46A=="
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/@types/dom-mediacapture-record/-/dom-mediacapture-record-1.0.7.tgz",
+      "integrity": "sha512-ddDIRTO1ajtbxaNo2o7fPJggpN54PZf1ZUJKOjto2ENMJE/9GKUvaw3ZRuQzlS/p0E+PnIcssxfoqYJ4yiXSBw=="
     },
     "node_modules/@types/faker": {
-      "version": "5.5.7",
-      "resolved": "https://registry.npmjs.org/@types/faker/-/faker-5.5.7.tgz",
-      "integrity": "sha512-ejzb61Q5zQTtS0ZIafgQ7ahO5ACzmGhG5PfX2hxWyth3k0/aysb4ZOxKQB8DbzwSPppA5jmFBwqnBxjv5hqI5Q==",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/@types/faker/-/faker-5.1.3.tgz",
+      "integrity": "sha512-7YTyCRoujZWYaCpDLslQJ8QzaFWFLZZ3mZ7Vfr/jJHascRmSd05pYteyt2FK4btF2vXyGq0obuoyLpcF99OvaA==",
       "dev": true
     },
     "node_modules/@types/glob": {
-      "version": "7.1.4",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.4.tgz",
-      "integrity": "sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA==",
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
+      "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==",
       "dev": true,
       "dependencies": {
         "@types/minimatch": "*",
@@ -5201,9 +5564,9 @@
       }
     },
     "node_modules/@types/graceful-fs": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
-      "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.3.tgz",
+      "integrity": "sha512-AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ==",
       "dev": true,
       "dependencies": {
         "@types/node": "*"
@@ -5225,54 +5588,152 @@
       }
     },
     "node_modules/@types/istanbul-reports": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
-      "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
+      "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
       "dev": true,
       "dependencies": {
         "@types/istanbul-lib-report": "*"
       }
     },
+    "node_modules/@types/jest": {
+      "version": "26.0.14",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.14.tgz",
+      "integrity": "sha512-Hz5q8Vu0D288x3iWXePSn53W7hAjP0H7EQ6QvDO9c7t46mR0lNOLlfuwQ+JkVxuhygHzlzPX+0jKdA3ZgSh+Vg==",
+      "dev": true,
+      "dependencies": {
+        "jest-diff": "^25.2.1",
+        "pretty-format": "^25.2.1"
+      }
+    },
+    "node_modules/@types/jest/node_modules/@jest/types": {
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
+      "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
+      "dev": true,
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^1.1.1",
+        "@types/yargs": "^15.0.0",
+        "chalk": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8.3"
+      }
+    },
+    "node_modules/@types/jest/node_modules/@types/istanbul-reports": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
+      "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
+      "dev": true,
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "*",
+        "@types/istanbul-lib-report": "*"
+      }
+    },
+    "node_modules/@types/jest/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@types/jest/node_modules/diff-sequences": {
+      "version": "25.2.6",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz",
+      "integrity": "sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8.3"
+      }
+    },
+    "node_modules/@types/jest/node_modules/jest-diff": {
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz",
+      "integrity": "sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^3.0.0",
+        "diff-sequences": "^25.2.6",
+        "jest-get-type": "^25.2.6",
+        "pretty-format": "^25.5.0"
+      },
+      "engines": {
+        "node": ">= 8.3"
+      }
+    },
+    "node_modules/@types/jest/node_modules/jest-get-type": {
+      "version": "25.2.6",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz",
+      "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8.3"
+      }
+    },
+    "node_modules/@types/jest/node_modules/pretty-format": {
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz",
+      "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^25.5.0",
+        "ansi-regex": "^5.0.0",
+        "ansi-styles": "^4.0.0",
+        "react-is": "^16.12.0"
+      },
+      "engines": {
+        "node": ">= 8.3"
+      }
+    },
     "node_modules/@types/json-schema": {
-      "version": "7.0.8",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.8.tgz",
-      "integrity": "sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz",
+      "integrity": "sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==",
+      "dev": true
+    },
+    "node_modules/@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
       "dev": true
     },
     "node_modules/@types/minimatch": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
-      "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
+      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "12.20.18",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.18.tgz",
-      "integrity": "sha512-YoTiIwdKxM3VLiY2sM05x4iGuTveYiCcDaUVmo1L5ndrXxPGW/NEoZu+pGcBirziomizcZsnsQoemikKcB2fRA==",
+      "version": "12.12.64",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.64.tgz",
+      "integrity": "sha512-UV1/ZJMC+HcP902wWdpC43cAcGu0IQk/I5bXjP2aSuCjsk3cE74mDvFrLKga7oDC170ugOAYBwfT4DSQW3akDA==",
       "dev": true
     },
     "node_modules/@types/normalize-package-data": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
-      "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
-      "dev": true
-    },
-    "node_modules/@types/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
+      "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
       "dev": true
     },
     "node_modules/@types/prettier": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.3.2.tgz",
-      "integrity": "sha512-eI5Yrz3Qv4KPUa/nSIAi0h+qX0XyewOliug5F2QAtuRg6Kjg6jfmxe1GIwoIRhZspD1A0RP8ANrPwvEXXtRFog==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.1.1.tgz",
+      "integrity": "sha512-2zs+O+UkDsJ1Vcp667pd3f8xearMdopz/z54i99wtRDI5KLmngk7vlrYZD0ZjKHaROR03EznlBbVY9PfAEyJIQ==",
+      "dev": true
+    },
+    "node_modules/@types/q": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz",
+      "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==",
       "dev": true
     },
     "node_modules/@types/resize-observer-browser": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/@types/resize-observer-browser/-/resize-observer-browser-0.1.6.tgz",
-      "integrity": "sha512-61IfTac0s9jvNtBCpyo86QeaN8qqpMGHdK0uGKCCIy2dt5/Yk84VduHIdWAcmkC5QvdkPL0p5eWYgUZtHKKUVg==",
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/@types/resize-observer-browser/-/resize-observer-browser-0.1.5.tgz",
+      "integrity": "sha512-8k/67Z95Goa6Lznuykxkfhq9YU3l1Qe6LNZmwde1u7802a3x8v44oq0j91DICclxatTr0rNnhXx7+VTIetSrSQ==",
       "dev": true
     },
     "node_modules/@types/source-list-map": {
@@ -5282,21 +5743,21 @@
       "dev": true
     },
     "node_modules/@types/stack-utils": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
-      "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.0.tgz",
+      "integrity": "sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==",
       "dev": true
     },
     "node_modules/@types/webpack-env": {
-      "version": "1.16.2",
-      "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.16.2.tgz",
-      "integrity": "sha512-vKx7WNQNZDyJveYcHAm9ZxhqSGLYwoyLhrHjLBOkw3a7cT76sTdjgtwyijhk1MaHyRIuSztcVwrUOO/NEu68Dw==",
+      "version": "1.16.0",
+      "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.16.0.tgz",
+      "integrity": "sha512-Fx+NpfOO0CpeYX2g9bkvX8O5qh9wrU1sOF4g8sft4Mu7z+qfe387YlyY8w8daDyDsKY5vUxM0yxkAYnbkRbZEw==",
       "dev": true
     },
     "node_modules/@types/webpack-sources": {
-      "version": "0.1.9",
-      "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.9.tgz",
-      "integrity": "sha512-bvzMnzqoK16PQIC8AYHNdW45eREJQMd6WG/msQWX5V2+vZmODCOPb4TJcbgRljTZZTwTM4wUMcsI8FftNA7new==",
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.8.tgz",
+      "integrity": "sha512-JHB2/xZlXOjzjBB6fMOpH1eQAfsrpqVVIbneE0Rok16WXwFaznaI5vfg75U5WgGJm7V9W1c4xeRQDjX/zwvghA==",
       "dev": true,
       "dependencies": {
         "@types/node": "*",
@@ -5314,33 +5775,34 @@
       }
     },
     "node_modules/@types/yargs": {
-      "version": "15.0.14",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.14.tgz",
-      "integrity": "sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==",
+      "version": "15.0.7",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.7.tgz",
+      "integrity": "sha512-Gf4u3EjaPNcC9cTu4/j2oN14nSVhr8PQ+BvBcBQHAhDZfl0bVIiLgvnRXv/dn58XhTm9UXvBpvJpDlwV65QxOA==",
       "dev": true,
       "dependencies": {
         "@types/yargs-parser": "*"
       }
     },
     "node_modules/@types/yargs-parser": {
-      "version": "20.2.1",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz",
-      "integrity": "sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==",
+      "version": "15.0.0",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz",
+      "integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==",
       "dev": true
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "4.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.0.tgz",
-      "integrity": "sha512-eiREtqWRZ8aVJcNru7cT/AMVnYd9a2UHsfZT8MR1dW3UUEg6jDv9EQ9Cq4CUPZesyQ58YUpoAADGv71jY8RwgA==",
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.22.0.tgz",
+      "integrity": "sha512-U8SP9VOs275iDXaL08Ln1Fa/wLXfj5aTr/1c0t0j6CdbOnxh+TruXu1p4I0NAvdPBQgoPjHsgKn28mOi0FzfoA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/experimental-utils": "4.29.0",
-        "@typescript-eslint/scope-manager": "4.29.0",
-        "debug": "^4.3.1",
+        "@typescript-eslint/experimental-utils": "4.22.0",
+        "@typescript-eslint/scope-manager": "4.22.0",
+        "debug": "^4.1.1",
         "functional-red-black-tree": "^1.0.1",
-        "regexpp": "^3.1.0",
-        "semver": "^7.3.5",
-        "tsutils": "^3.21.0"
+        "lodash": "^4.17.15",
+        "regexpp": "^3.0.0",
+        "semver": "^7.3.2",
+        "tsutils": "^3.17.1"
       },
       "engines": {
         "node": "^10.12.0 || >=12.0.0"
@@ -5360,112 +5822,15 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/experimental-utils": {
-      "version": "4.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.0.tgz",
-      "integrity": "sha512-FpNVKykfeaIxlArLUP/yQfv/5/3rhl1ov6RWgud4OgbqWLkEq7lqgQU9iiavZRzpzCRQV4XddyFz3wFXdkiX9w==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.7",
-        "@typescript-eslint/scope-manager": "4.29.0",
-        "@typescript-eslint/types": "4.29.0",
-        "@typescript-eslint/typescript-estree": "4.29.0",
-        "eslint-scope": "^5.1.1",
-        "eslint-utils": "^3.0.0"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "*"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
-      "version": "4.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.0.tgz",
-      "integrity": "sha512-2YJM6XfWfi8pgU2HRhTp7WgRw78TCRO3dOmSpAvIQ8MOv4B46JD2chnhpNT7Jq8j0APlIbzO1Bach734xxUl4A==",
-      "dev": true,
-      "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "4.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.0.tgz",
-      "integrity": "sha512-8ZpNHDIOyqzzgZrQW9+xQ4k5hM62Xy2R4RPO3DQxMc5Rq5QkCdSpk/drka+DL9w6sXNzV5nrdlBmf8+x495QXQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "4.29.0",
-        "@typescript-eslint/visitor-keys": "4.29.0",
-        "debug": "^4.3.1",
-        "globby": "^11.0.3",
-        "is-glob": "^4.0.1",
-        "semver": "^7.3.5",
-        "tsutils": "^3.21.0"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-      "dev": true,
-      "dependencies": {
-        "eslint-visitor-keys": "^2.0.0"
-      },
-      "engines": {
-        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      },
-      "peerDependencies": {
-        "eslint": ">=5"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@typescript-eslint/experimental-utils": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.16.1.tgz",
-      "integrity": "sha512-0Hm3LSlMYFK17jO4iY3un1Ve9x1zLNn4EM50Lia+0EV99NdbK+cn0er7HC7IvBA23mBg3P+8dUkMXy4leL33UQ==",
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.22.0.tgz",
+      "integrity": "sha512-xJXHHl6TuAxB5AWiVrGhvbGL8/hbiCQ8FiWwObO3r0fnvBdrbWEDy1hlvGQOAWc6qsCWuWMKdVWlLAEMpxnddg==",
       "dev": true,
       "dependencies": {
         "@types/json-schema": "^7.0.3",
-        "@typescript-eslint/scope-manager": "4.16.1",
-        "@typescript-eslint/types": "4.16.1",
-        "@typescript-eslint/typescript-estree": "4.16.1",
+        "@typescript-eslint/scope-manager": "4.22.0",
+        "@typescript-eslint/types": "4.22.0",
+        "@typescript-eslint/typescript-estree": "4.22.0",
         "eslint-scope": "^5.0.0",
         "eslint-utils": "^2.0.0"
       },
@@ -5480,14 +5845,14 @@
         "eslint": "*"
       }
     },
-    "node_modules/@typescript-eslint/experimental-utils/node_modules/@typescript-eslint/scope-manager": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.16.1.tgz",
-      "integrity": "sha512-6IlZv9JaurqV0jkEg923cV49aAn8V6+1H1DRfhRcvZUrptQ+UtSKHb5kwTayzOYTJJ/RsYZdcvhOEKiBLyc0Cw==",
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.22.0.tgz",
+      "integrity": "sha512-OcCO7LTdk6ukawUM40wo61WdeoA7NM/zaoq1/2cs13M7GyiF+T4rxuA4xM+6LeHWjWbss7hkGXjFDRcKD4O04Q==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "4.16.1",
-        "@typescript-eslint/visitor-keys": "4.16.1"
+        "@typescript-eslint/types": "4.22.0",
+        "@typescript-eslint/visitor-keys": "4.22.0"
       },
       "engines": {
         "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
@@ -5497,54 +5862,10 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@typescript-eslint/experimental-utils/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.16.1.tgz",
-      "integrity": "sha512-s/aIP1XcMkEqCNcPQtl60ogUYjSM8FU2mq1O7y5cFf3Xcob1z1iXWNB6cC43Op+NGRTFgGolri6s8z/efA9i1w==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "4.16.1",
-        "eslint-visitor-keys": "^2.0.0"
-      },
-      "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/parser": {
-      "version": "4.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.29.0.tgz",
-      "integrity": "sha512-+92YRNHFdXgq+GhWQPT2bmjX09X7EH36JfgN2/4wmhtwV/HPxozpCNst8jrWcngLtEVd/4zAwA6BKojAlf+YqA==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/scope-manager": "4.29.0",
-        "@typescript-eslint/types": "4.29.0",
-        "@typescript-eslint/typescript-estree": "4.29.0",
-        "debug": "^4.3.1"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
-      "version": "4.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.0.tgz",
-      "integrity": "sha512-2YJM6XfWfi8pgU2HRhTp7WgRw78TCRO3dOmSpAvIQ8MOv4B46JD2chnhpNT7Jq8j0APlIbzO1Bach734xxUl4A==",
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.22.0.tgz",
+      "integrity": "sha512-sW/BiXmmyMqDPO2kpOhSy2Py5w6KvRRsKZnV0c4+0nr4GIcedJwXAq+RHNK4lLVEZAJYFltnnk1tJSlbeS9lYA==",
       "dev": true,
       "engines": {
         "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
@@ -5554,99 +5875,14 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "4.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.0.tgz",
-      "integrity": "sha512-8ZpNHDIOyqzzgZrQW9+xQ4k5hM62Xy2R4RPO3DQxMc5Rq5QkCdSpk/drka+DL9w6sXNzV5nrdlBmf8+x495QXQ==",
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.0.tgz",
+      "integrity": "sha512-TkIFeu5JEeSs5ze/4NID+PIcVjgoU3cUQUIZnH3Sb1cEn1lBo7StSV5bwPuJQuoxKXlzAObjYTilOEKRuhR5yg==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "4.29.0",
-        "@typescript-eslint/visitor-keys": "4.29.0",
-        "debug": "^4.3.1",
-        "globby": "^11.0.3",
-        "is-glob": "^4.0.1",
-        "semver": "^7.3.5",
-        "tsutils": "^3.21.0"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@typescript-eslint/scope-manager": {
-      "version": "4.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.29.0.tgz",
-      "integrity": "sha512-HPq7XAaDMM3DpmuijxLV9Io8/6pQnliiXMQUcAdjpJJSR+fdmbD/zHCd7hMkjJn04UQtCQBtshgxClzg6NIS2w==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "4.29.0",
-        "@typescript-eslint/visitor-keys": "4.29.0"
-      },
-      "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/scope-manager/node_modules/@typescript-eslint/types": {
-      "version": "4.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.0.tgz",
-      "integrity": "sha512-2YJM6XfWfi8pgU2HRhTp7WgRw78TCRO3dOmSpAvIQ8MOv4B46JD2chnhpNT7Jq8j0APlIbzO1Bach734xxUl4A==",
-      "dev": true,
-      "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/types": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.16.1.tgz",
-      "integrity": "sha512-nnKqBwMgRlhzmJQF8tnFDZWfunXmJyuXj55xc8Kbfup4PbkzdoDXZvzN8//EiKR27J6vUSU8j4t37yUuYPiLqA==",
-      "dev": true,
-      "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.16.1.tgz",
-      "integrity": "sha512-m8I/DKHa8YbeHt31T+UGd/l8Kwr0XCTCZL3H4HMvvLCT7HU9V7yYdinTOv1gf/zfqNeDcCgaFH2BMsS8x6NvJg==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "4.16.1",
-        "@typescript-eslint/visitor-keys": "4.16.1",
+        "@typescript-eslint/types": "4.22.0",
+        "@typescript-eslint/visitor-keys": "4.22.0",
         "debug": "^4.1.1",
         "globby": "^11.0.1",
         "is-glob": "^4.0.1",
@@ -5666,13 +5902,13 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.16.1.tgz",
-      "integrity": "sha512-s/aIP1XcMkEqCNcPQtl60ogUYjSM8FU2mq1O7y5cFf3Xcob1z1iXWNB6cC43Op+NGRTFgGolri6s8z/efA9i1w==",
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.0.tgz",
+      "integrity": "sha512-nnMu4F+s4o0sll6cBSsTeVsT4cwxB7zECK3dFxzEjPBii9xLpq4yqqsy/FU5zMfan6G60DKZSCXAa3sHJZrcYw==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "4.16.1",
+        "@typescript-eslint/types": "4.22.0",
         "eslint-visitor-keys": "^2.0.0"
       },
       "engines": {
@@ -5683,13 +5919,290 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@typescript-eslint/experimental-utils": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.22.0.tgz",
+      "integrity": "sha512-xJXHHl6TuAxB5AWiVrGhvbGL8/hbiCQ8FiWwObO3r0fnvBdrbWEDy1hlvGQOAWc6qsCWuWMKdVWlLAEMpxnddg==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.3",
+        "@typescript-eslint/scope-manager": "4.22.0",
+        "@typescript-eslint/types": "4.22.0",
+        "@typescript-eslint/typescript-estree": "4.22.0",
+        "eslint-scope": "^5.0.0",
+        "eslint-utils": "^2.0.0"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "*"
+      }
+    },
+    "node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/parser": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.22.0.tgz",
+      "integrity": "sha512-z/bGdBJJZJN76nvAY9DkJANYgK3nlRstRRi74WHm3jjgf2I8AglrSY+6l7ogxOmn55YJ6oKZCLLy+6PW70z15Q==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/scope-manager": "4.22.0",
+        "@typescript-eslint/types": "4.22.0",
+        "@typescript-eslint/typescript-estree": "4.22.0",
+        "debug": "^4.1.1"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.22.0.tgz",
+      "integrity": "sha512-OcCO7LTdk6ukawUM40wo61WdeoA7NM/zaoq1/2cs13M7GyiF+T4rxuA4xM+6LeHWjWbss7hkGXjFDRcKD4O04Q==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.22.0",
+        "@typescript-eslint/visitor-keys": "4.22.0"
+      },
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.22.0.tgz",
+      "integrity": "sha512-sW/BiXmmyMqDPO2kpOhSy2Py5w6KvRRsKZnV0c4+0nr4GIcedJwXAq+RHNK4lLVEZAJYFltnnk1tJSlbeS9lYA==",
+      "dev": true,
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.0.tgz",
+      "integrity": "sha512-TkIFeu5JEeSs5ze/4NID+PIcVjgoU3cUQUIZnH3Sb1cEn1lBo7StSV5bwPuJQuoxKXlzAObjYTilOEKRuhR5yg==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.22.0",
+        "@typescript-eslint/visitor-keys": "4.22.0",
+        "debug": "^4.1.1",
+        "globby": "^11.0.1",
+        "is-glob": "^4.0.1",
+        "semver": "^7.3.2",
+        "tsutils": "^3.17.1"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.0.tgz",
+      "integrity": "sha512-nnMu4F+s4o0sll6cBSsTeVsT4cwxB7zECK3dFxzEjPBii9xLpq4yqqsy/FU5zMfan6G60DKZSCXAa3sHJZrcYw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.22.0",
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.22.0.tgz",
+      "integrity": "sha512-OcCO7LTdk6ukawUM40wo61WdeoA7NM/zaoq1/2cs13M7GyiF+T4rxuA4xM+6LeHWjWbss7hkGXjFDRcKD4O04Q==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.22.0",
+        "@typescript-eslint/visitor-keys": "4.22.0"
+      },
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/types": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.22.0.tgz",
+      "integrity": "sha512-sW/BiXmmyMqDPO2kpOhSy2Py5w6KvRRsKZnV0c4+0nr4GIcedJwXAq+RHNK4lLVEZAJYFltnnk1tJSlbeS9lYA==",
+      "dev": true,
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.0.tgz",
+      "integrity": "sha512-TkIFeu5JEeSs5ze/4NID+PIcVjgoU3cUQUIZnH3Sb1cEn1lBo7StSV5bwPuJQuoxKXlzAObjYTilOEKRuhR5yg==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.22.0",
+        "@typescript-eslint/visitor-keys": "4.22.0",
+        "debug": "^4.1.1",
+        "globby": "^11.0.1",
+        "is-glob": "^4.0.1",
+        "semver": "^7.3.2",
+        "tsutils": "^3.17.1"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "4.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.0.tgz",
-      "integrity": "sha512-LoaofO1C/jAJYs0uEpYMXfHboGXzOJeV118X4OsZu9f7rG7Pr9B3+4HTU8+err81rADa4xfQmAxnRnPAI2jp+Q==",
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.0.tgz",
+      "integrity": "sha512-nnMu4F+s4o0sll6cBSsTeVsT4cwxB7zECK3dFxzEjPBii9xLpq4yqqsy/FU5zMfan6G60DKZSCXAa3sHJZrcYw==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "4.29.0",
+        "@typescript-eslint/types": "4.22.0",
         "eslint-visitor-keys": "^2.0.0"
       },
       "engines": {
@@ -5700,19 +6213,6 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@typescript-eslint/visitor-keys/node_modules/@typescript-eslint/types": {
-      "version": "4.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.0.tgz",
-      "integrity": "sha512-2YJM6XfWfi8pgU2HRhTp7WgRw78TCRO3dOmSpAvIQ8MOv4B46JD2chnhpNT7Jq8j0APlIbzO1Bach734xxUl4A==",
-      "dev": true,
-      "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
     "node_modules/@webassemblyjs/ast": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz",
@@ -5930,9 +6430,9 @@
       }
     },
     "node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "version": "6.4.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
+      "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -5951,10 +6451,22 @@
         "acorn-walk": "^7.1.1"
       }
     },
+    "node_modules/acorn-globals/node_modules/acorn": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/acorn-jsx": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
+      "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
       "dev": true,
       "peerDependencies": {
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
@@ -5970,40 +6482,84 @@
       }
     },
     "node_modules/adjust-sourcemap-loader": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz",
-      "integrity": "sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-2.0.0.tgz",
+      "integrity": "sha512-4hFsTsn58+YjrU9qKzML2JSSDqKvN8mUGQ0nNIrfPi8hmIONT4L3uUaT6MKdMsZ9AjsU6D2xDkZxCkbQPxChrA==",
       "dev": true,
       "dependencies": {
-        "loader-utils": "^2.0.0",
-        "regex-parser": "^2.2.11"
+        "assert": "1.4.1",
+        "camelcase": "5.0.0",
+        "loader-utils": "1.2.3",
+        "object-path": "0.11.4",
+        "regex-parser": "2.2.10"
+      }
+    },
+    "node_modules/adjust-sourcemap-loader/node_modules/camelcase": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz",
+      "integrity": "sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/adjust-sourcemap-loader/node_modules/emojis-list": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
+      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/adjust-sourcemap-loader/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/adjust-sourcemap-loader/node_modules/loader-utils": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
+      "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^2.0.0",
+        "json5": "^1.0.1"
       },
       "engines": {
-        "node": ">=8.9"
+        "node": ">=4.0.0"
       }
     },
     "node_modules/agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
+      "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
+      "dev": true,
       "dependencies": {
-        "debug": "4"
+        "es6-promisify": "^5.0.0"
       },
       "engines": {
-        "node": ">= 6.0.0"
+        "node": ">= 4.0.0"
       }
     },
     "node_modules/agentkeepalive": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.1.4.tgz",
-      "integrity": "sha512-+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ==",
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.5.2.tgz",
+      "integrity": "sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==",
+      "dev": true,
       "dependencies": {
-        "debug": "^4.1.0",
-        "depd": "^1.1.2",
         "humanize-ms": "^1.2.1"
       },
       "engines": {
-        "node": ">= 8.0.0"
+        "node": ">= 4.0.0"
       }
     },
     "node_modules/aggregate-error": {
@@ -6019,14 +6575,13 @@
       }
     },
     "node_modules/ajv": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.2.0.tgz",
-      "integrity": "sha512-WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA==",
-      "dev": true,
+      "version": "6.12.5",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz",
+      "integrity": "sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
         "uri-js": "^4.2.2"
       },
       "funding": {
@@ -6043,22 +6598,13 @@
         "ajv": ">=5.0.0"
       }
     },
-    "node_modules/ajv-formats": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.0.2.tgz",
-      "integrity": "sha512-Brah4Uo5/U8v76c6euTwtjVFFaVishwnJrQBYpev1JRh4vjA1F4HY3UzQez41YUCszUCXKagG8v6eVRBHV1gkw==",
+    "node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
       "dev": true,
-      "peer": true,
-      "dependencies": {
-        "ajv": "^8.0.0"
-      },
       "peerDependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "ajv": {
-          "optional": true
-        }
+        "ajv": "^6.9.1"
       }
     },
     "node_modules/alphanum-sort": {
@@ -6068,9 +6614,9 @@
       "dev": true
     },
     "node_modules/android-versions": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-1.7.0.tgz",
-      "integrity": "sha512-TCy4b8Dk8YS6A23ZPfhSKqK66JHFq0D8avGYiwvYpjno6HrrcI0DRgHx9+jtkvWYmrsE2vQWgbHJhvGGhhOb0g==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-1.6.0.tgz",
+      "integrity": "sha512-ojC2Ig7b/KJ6iNtR8e4bacmOsJyEkoERk3CKMIsnH7kJz5z6551NMbrVaRb7KXYavu1d74Uhml/bfcmqT3nAcg==",
       "dependencies": {
         "semver": "^5.7.1"
       }
@@ -6096,27 +6642,6 @@
         "string-width": "^3.0.0"
       }
     },
-    "node_modules/ansi-align/node_modules/ansi-regex": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/ansi-align/node_modules/emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
-    },
-    "node_modules/ansi-align/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/ansi-align/node_modules/string-width": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
@@ -6130,21 +6655,10 @@
         "node": ">=6"
       }
     },
-    "node_modules/ansi-align/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/ansi-colors": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
+      "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
       "dev": true,
       "engines": {
         "node": ">=6"
@@ -6163,18 +6677,11 @@
       }
     },
     "node_modules/ansi-escapes": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.21.3"
-      },
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=4"
       }
     },
     "node_modules/ansi-gray": {
@@ -6214,22 +6721,25 @@
       }
     },
     "node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
     "node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dependencies": {
-        "color-convert": "^1.9.0"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/ansi-wrap": {
@@ -6242,9 +6752,9 @@
       }
     },
     "node_modules/anymatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+      "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
       "dev": true,
       "dependencies": {
         "normalize-path": "^3.0.0",
@@ -6314,23 +6824,25 @@
         "node": ">=6.0"
       }
     },
-    "node_modules/arr-diff": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
-      "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
+    "node_modules/aria-query/node_modules/@babel/runtime": {
+      "version": "7.13.17",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.17.tgz",
+      "integrity": "sha512-NCdgJEelPTSh+FEFylhnP1ylq848l1z9t9N0j1Lfbcw0+KXGjsTvUmkxy+voLLXB5SOKMbLLx4jxYliGrYQseA==",
       "dev": true,
       "dependencies": {
-        "arr-flatten": "^1.0.1",
-        "array-slice": "^0.2.3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "regenerator-runtime": "^0.13.4"
       }
     },
-    "node_modules/arr-diff/node_modules/array-slice": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
-      "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
+    "node_modules/arity-n": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/arity-n/-/arity-n-1.0.4.tgz",
+      "integrity": "sha1-2edrEXM+CFacCEeuezmyhgswt0U=",
+      "dev": true
+    },
+    "node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -6370,9 +6882,9 @@
       }
     },
     "node_modules/arr-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
-      "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -6419,6 +6931,141 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/array-includes/node_modules/es-abstract": {
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz",
+      "integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.2",
+        "is-callable": "^1.2.3",
+        "is-negative-zero": "^2.0.1",
+        "is-regex": "^1.1.2",
+        "is-string": "^1.0.5",
+        "object-inspect": "^1.9.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.2",
+        "string.prototype.trimend": "^1.0.4",
+        "string.prototype.trimstart": "^1.0.4",
+        "unbox-primitive": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/has-symbols": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/is-callable": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
+      "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/is-negative-zero": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
+      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/is-regex": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
+      "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-symbols": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/object-inspect": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.2.tgz",
+      "integrity": "sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/object.assign": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "has-symbols": "^1.0.1",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/string.prototype.trimend": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
+      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/string.prototype.trimstart": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
+      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/array-initial": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz",
@@ -6485,6 +7132,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/array-sort/node_modules/kind-of": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/array-union": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
@@ -6528,6 +7184,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/asap": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
+      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=",
+      "dev": true
+    },
     "node_modules/asn1": {
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
@@ -6549,18 +7211,17 @@
       }
     },
     "node_modules/asn1.js/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "version": "4.11.9",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+      "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
       "dev": true
     },
     "node_modules/assert": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
-      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
+      "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
       "dev": true,
       "dependencies": {
-        "object-assign": "^4.1.1",
         "util": "0.10.3"
       }
     },
@@ -6572,21 +7233,6 @@
         "node": ">=0.8"
       }
     },
-    "node_modules/assert/node_modules/inherits": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-      "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
-      "dev": true
-    },
-    "node_modules/assert/node_modules/util": {
-      "version": "0.10.3",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
-      "dev": true,
-      "dependencies": {
-        "inherits": "2.0.1"
-      }
-    },
     "node_modules/assign-symbols": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
@@ -6690,38 +7336,92 @@
       }
     },
     "node_modules/autoprefixer": {
-      "version": "10.2.4",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.2.4.tgz",
-      "integrity": "sha512-DCCdUQiMD+P/as8m3XkeTUkUKuuRqLGcwD0nll7wevhqoJfMRpJlkFd1+MQh1pvupjiQuip42lc/VFvfUTMSKw==",
+      "version": "9.8.0",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.0.tgz",
+      "integrity": "sha512-D96ZiIHXbDmU02dBaemyAg53ez+6F5yZmapmgKcjm35yEe1uVDYI8hGW3VYoGRaG290ZFf91YxHrR518vC0u/A==",
       "dev": true,
       "dependencies": {
-        "browserslist": "^4.16.1",
-        "caniuse-lite": "^1.0.30001181",
-        "colorette": "^1.2.1",
-        "fraction.js": "^4.0.13",
+        "browserslist": "^4.12.0",
+        "caniuse-lite": "^1.0.30001061",
+        "chalk": "^2.4.2",
         "normalize-range": "^0.1.2",
+        "num2fraction": "^1.2.2",
+        "postcss": "^7.0.30",
         "postcss-value-parser": "^4.1.0"
       },
       "bin": {
         "autoprefixer": "bin/autoprefixer"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14"
+        "node": ">=6.0.0"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
+        "type": "tidelift",
+        "url": "https://tidelift.com/funding/github/npm/autoprefixer"
       }
     },
-    "node_modules/autoprefixer/node_modules/colorette": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
-      "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
+    "node_modules/autoprefixer/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/autoprefixer/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/autoprefixer/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/autoprefixer/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
       "dev": true
     },
+    "node_modules/autoprefixer/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/autoprefixer/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/aws-sign2": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
@@ -6731,9 +7431,9 @@
       }
     },
     "node_modules/aws4": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
-      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz",
+      "integrity": "sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA=="
     },
     "node_modules/axobject-query": {
       "version": "2.2.0",
@@ -6742,16 +7442,16 @@
       "dev": true
     },
     "node_modules/babel-jest": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.6.3.tgz",
-      "integrity": "sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.5.2.tgz",
+      "integrity": "sha512-U3KvymF3SczA3vOL/cgiUFOznfMET+XDIXiWnoJV45siAp2pLMG8i2+/MGZlAC3f/F6Q40LR4M4qDrWZ9wkK8A==",
       "dev": true,
       "dependencies": {
-        "@jest/transform": "^26.6.2",
-        "@jest/types": "^26.6.2",
+        "@jest/transform": "^26.5.2",
+        "@jest/types": "^26.5.2",
         "@types/babel__core": "^7.1.7",
         "babel-plugin-istanbul": "^6.0.0",
-        "babel-preset-jest": "^26.6.2",
+        "babel-preset-jest": "^26.5.0",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.4",
         "slash": "^3.0.0"
@@ -6763,25 +7463,10 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/babel-jest/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/babel-jest/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -6794,58 +7479,40 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/babel-jest/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/babel-jest/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/babel-jest/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/babel-loader": {
-      "version": "8.2.2",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.2.tgz",
-      "integrity": "sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz",
+      "integrity": "sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==",
       "dev": true,
       "dependencies": {
-        "find-cache-dir": "^3.3.1",
+        "find-cache-dir": "^2.1.0",
         "loader-utils": "^1.4.0",
-        "make-dir": "^3.1.0",
+        "mkdirp": "^0.5.3",
+        "pify": "^4.0.1",
         "schema-utils": "^2.6.5"
       },
       "engines": {
-        "node": ">= 8.9"
+        "node": ">= 6.9"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0",
         "webpack": ">=2"
       }
     },
+    "node_modules/babel-loader/node_modules/find-cache-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
+      "dev": true,
+      "dependencies": {
+        "commondir": "^1.0.1",
+        "make-dir": "^2.0.0",
+        "pkg-dir": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/babel-loader/node_modules/json5": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
@@ -6872,6 +7539,28 @@
         "node": ">=4.0.0"
       }
     },
+    "node_modules/babel-loader/node_modules/make-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+      "dev": true,
+      "dependencies": {
+        "pify": "^4.0.1",
+        "semver": "^5.6.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/babel-loader/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
     "node_modules/babel-plugin-add-header-comment": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/babel-plugin-add-header-comment/-/babel-plugin-add-header-comment-1.0.3.tgz",
@@ -6903,9 +7592,9 @@
       }
     },
     "node_modules/babel-plugin-jest-hoist": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz",
-      "integrity": "sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw==",
+      "version": "26.5.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.5.0.tgz",
+      "integrity": "sha512-ck17uZFD3CDfuwCLATWZxkkuGGFhMij8quP8CNhwj8ek1mqFgbFzRJ30xwC04LLscj/aKsVFfRST+b5PT7rSuw==",
       "dev": true,
       "dependencies": {
         "@babel/template": "^7.3.3",
@@ -6918,9 +7607,9 @@
       }
     },
     "node_modules/babel-preset-current-node-syntax": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
-      "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.4.tgz",
+      "integrity": "sha512-5/INNCYhUGqw7VbVjT/hb3ucjgkVHKXY7lX3ZjlN4gm565VyFmJUrJ/h+h16ECVB38R/9SF6aACydpKMLZ/c9w==",
       "dev": true,
       "dependencies": {
         "@babel/plugin-syntax-async-generators": "^7.8.4",
@@ -6933,21 +7622,20 @@
         "@babel/plugin-syntax-numeric-separator": "^7.8.3",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
         "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-top-level-await": "^7.8.3"
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0"
       }
     },
     "node_modules/babel-preset-jest": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz",
-      "integrity": "sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ==",
+      "version": "26.5.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.5.0.tgz",
+      "integrity": "sha512-F2vTluljhqkiGSJGBg/jOruA8vIIIL11YrxRcO7nviNTMbbofPSHwnm8mgP7d/wS7wRSexRoI6X1A6T74d4LQA==",
       "dev": true,
       "dependencies": {
-        "babel-plugin-jest-hoist": "^26.6.2",
-        "babel-preset-current-node-syntax": "^1.0.0"
+        "babel-plugin-jest-hoist": "^26.5.0",
+        "babel-preset-current-node-syntax": "^0.1.3"
       },
       "engines": {
         "node": ">= 10.14.2"
@@ -6977,9 +7665,9 @@
       }
     },
     "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
     },
     "node_modules/base": {
       "version": "0.11.2",
@@ -7011,6 +7699,44 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/base/node_modules/is-accessor-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/base/node_modules/is-data-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/base/node_modules/is-descriptor": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.0",
+        "is-data-descriptor": "^1.0.0",
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/base/node_modules/isobject": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
@@ -7021,23 +7747,9 @@
       }
     },
     "node_modules/base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
+      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
     },
     "node_modules/batch": {
       "version": "0.6.1",
@@ -7071,9 +7783,9 @@
       }
     },
     "node_modules/binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
+      "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
@@ -7089,29 +7801,46 @@
         "file-uri-to-path": "1.0.0"
       }
     },
-    "node_modules/bindings/node_modules/file-uri-to-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
-      "dev": true,
-      "optional": true
-    },
     "node_modules/bl": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-      "devOptional": true,
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.3.tgz",
+      "integrity": "sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==",
+      "optional": true,
       "dependencies": {
         "buffer": "^5.5.0",
         "inherits": "^2.0.4",
         "readable-stream": "^3.4.0"
       }
     },
+    "node_modules/bl/node_modules/buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "optional": true,
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
     "node_modules/bl/node_modules/readable-stream": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
       "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "devOptional": true,
+      "optional": true,
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -7128,9 +7857,9 @@
       "dev": true
     },
     "node_modules/bn.js": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
-      "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz",
+      "integrity": "sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==",
       "dev": true
     },
     "node_modules/body-parser": {
@@ -7161,19 +7890,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/body-parser/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/body-parser/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
     "node_modules/bonjour": {
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
@@ -7221,74 +7937,47 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/boxen/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
+    "node_modules/boxen/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/boxen/node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "engines": {
-        "node": ">=6"
-      }
+    "node_modules/boxen/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
     },
-    "node_modules/boxen/node_modules/chalk": {
+    "node_modules/boxen/node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/boxen/node_modules/string-width": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/boxen/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/boxen/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
       "dependencies": {
-        "color-name": "~1.1.4"
+        "ansi-regex": "^5.0.0"
       },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/boxen/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/boxen/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/boxen/node_modules/type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
       "engines": {
         "node": ">=8"
       }
@@ -7382,15 +8071,21 @@
       }
     },
     "node_modules/browserify-rsa": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
-      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
       "dev": true,
       "dependencies": {
-        "bn.js": "^5.0.0",
+        "bn.js": "^4.1.0",
         "randombytes": "^2.0.1"
       }
     },
+    "node_modules/browserify-rsa/node_modules/bn.js": {
+      "version": "4.11.9",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+      "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+      "dev": true
+    },
     "node_modules/browserify-sign": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
@@ -7452,16 +8147,15 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.16.7",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.7.tgz",
-      "integrity": "sha512-7I4qVwqZltJ7j37wObBe3SoTz+nS8APaNcrBOlgoirb6/HbEU2XxW/LpUDTCngM6iauwFqmRTuOMfyKnFGY5JA==",
+      "version": "4.14.5",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.5.tgz",
+      "integrity": "sha512-Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA==",
       "dev": true,
       "dependencies": {
-        "caniuse-lite": "^1.0.30001248",
-        "colorette": "^1.2.2",
-        "electron-to-chromium": "^1.3.793",
-        "escalade": "^3.1.1",
-        "node-releases": "^1.1.73"
+        "caniuse-lite": "^1.0.30001135",
+        "electron-to-chromium": "^1.3.571",
+        "escalade": "^3.1.0",
+        "node-releases": "^1.1.61"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -7470,16 +8164,10 @@
         "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/browserslist"
+        "type": "tidelift",
+        "url": "https://tidelift.com/funding/github/npm/browserslist"
       }
     },
-    "node_modules/browserslist/node_modules/colorette": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
-      "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
-      "dev": true
-    },
     "node_modules/bs-logger": {
       "version": "0.2.6",
       "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
@@ -7502,27 +8190,14 @@
       }
     },
     "node_modules/buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "devOptional": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
+      "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
+      "dev": true,
       "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
       }
     },
     "node_modules/buffer-crc32": {
@@ -7544,9 +8219,9 @@
       }
     },
     "node_modules/buffer-from": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
       "dev": true
     },
     "node_modules/buffer-indexof": {
@@ -7581,21 +8256,22 @@
       }
     },
     "node_modules/cacache": {
-      "version": "15.0.5",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.5.tgz",
-      "integrity": "sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A==",
+      "version": "15.0.3",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.3.tgz",
+      "integrity": "sha512-bc3jKYjqv7k4pWh7I/ixIjfcjPul4V4jme/WbjvwGS5LzoPL/GzXr4C5EgPNLO/QEZl9Oi61iGitYEdwcrwLCQ==",
+      "dev": true,
       "dependencies": {
-        "@npmcli/move-file": "^1.0.1",
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
         "glob": "^7.1.4",
         "infer-owner": "^1.0.4",
-        "lru-cache": "^6.0.0",
+        "lru-cache": "^5.1.1",
         "minipass": "^3.1.1",
         "minipass-collect": "^1.0.2",
         "minipass-flush": "^1.0.5",
         "minipass-pipeline": "^1.2.2",
         "mkdirp": "^1.0.3",
+        "move-file": "^2.0.0",
         "p-map": "^4.0.0",
         "promise-inflight": "^1.0.1",
         "rimraf": "^3.0.2",
@@ -7607,6 +8283,33 @@
         "node": ">= 10"
       }
     },
+    "node_modules/cacache/node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/cacache/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "dev": true,
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cacache/node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true
+    },
     "node_modules/cache-base": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
@@ -7661,14 +8364,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/cacheable-request/node_modules/normalize-url": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
-      "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/call-bind": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
@@ -7682,6 +8377,39 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/caller-callsite": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
+      "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
+      "dev": true,
+      "dependencies": {
+        "callsites": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/caller-callsite/node_modules/callsites": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
+      "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/caller-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
+      "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
+      "dev": true,
+      "dependencies": {
+        "caller-callsite": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/callsites": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -7701,15 +8429,11 @@
       }
     },
     "node_modules/camelcase": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
-      "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
-      "dev": true,
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=6"
       }
     },
     "node_modules/caniuse-api": {
@@ -7725,14 +8449,10 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001248",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001248.tgz",
-      "integrity": "sha512-NwlQbJkxUFJ8nMErnGtT0QTM2TJ33xgz4KXJSMIrjXIbDVdaYueGyjOrLKRtJC+rTiWfi6j5cnZN1NBiSBJGNw==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/browserslist"
-      }
+      "version": "1.0.30001197",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001197.tgz",
+      "integrity": "sha512-8aE+sqBqtXz4G8g35Eg/XEaFr2N7rd/VQ6eABGBmNtcB8cN6qNJhMi6oSFy4UWWZgqgL3filHT8Nha4meu3tsw==",
+      "dev": true
     },
     "node_modules/canonical-path": {
       "version": "1.0.0",
@@ -7752,31 +8472,21 @@
         "node": "6.* || 8.* || >= 10.*"
       }
     },
-    "node_modules/capture-exit/node_modules/rsvp": {
-      "version": "4.8.5",
-      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
-      "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
-      "dev": true,
-      "engines": {
-        "node": "6.* || >= 7.*"
-      }
-    },
     "node_modules/caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
       "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
     },
     "node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
       "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/char-regex": {
@@ -7819,6 +8529,19 @@
         "color-name": "^1.0.0"
       }
     },
+    "node_modules/chartjs-color/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/chartjs-color/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+    },
     "node_modules/check-es-compat": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/check-es-compat/-/check-es-compat-1.1.1.tgz",
@@ -7835,29 +8558,64 @@
         "node": ">=8.10.0"
       }
     },
-    "node_modules/check-es-compat/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+    "node_modules/check-es-compat/node_modules/acorn": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/ansi-escapes": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
+      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
       "dev": true,
       "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
+        "type-fest": "^0.11.0"
+      },
+      "engines": {
+        "node": ">=8"
       },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/ansi-escapes/node_modules/type-fest": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
+      "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/check-es-compat/node_modules/ansi-regex": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
       "dev": true,
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
       }
     },
     "node_modules/check-es-compat/node_modules/astral-regex": {
@@ -7869,6 +8627,56 @@
         "node": ">=4"
       }
     },
+    "node_modules/check-es-compat/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/cli-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+      "dev": true,
+      "dependencies": {
+        "restore-cursor": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/cli-width": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
+      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
     "node_modules/check-es-compat/node_modules/cross-spawn": {
       "version": "6.0.5",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
@@ -7894,10 +8702,27 @@
         "semver": "bin/semver"
       }
     },
+    "node_modules/check-es-compat/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/check-es-compat/node_modules/emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
       "dev": true
     },
     "node_modules/check-es-compat/node_modules/eslint": {
@@ -7954,6 +8779,19 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+    "node_modules/check-es-compat/node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
     "node_modules/check-es-compat/node_modules/eslint-utils": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
@@ -7989,6 +8827,21 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/check-es-compat/node_modules/figures": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+      "dev": true,
+      "dependencies": {
+        "escape-string-regexp": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/check-es-compat/node_modules/file-entry-cache": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
@@ -8036,6 +8889,15 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/check-es-compat/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/check-es-compat/node_modules/ignore": {
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
@@ -8045,21 +8907,121 @@
         "node": ">= 4"
       }
     },
-    "node_modules/check-es-compat/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+    "node_modules/check-es-compat/node_modules/inquirer": {
+      "version": "7.3.3",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz",
+      "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==",
       "dev": true,
+      "dependencies": {
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.1.0",
+        "cli-cursor": "^3.1.0",
+        "cli-width": "^3.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^3.0.0",
+        "lodash": "^4.17.19",
+        "mute-stream": "0.0.8",
+        "run-async": "^2.4.0",
+        "rxjs": "^6.6.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "through": "^2.3.6"
+      },
       "engines": {
-        "node": ">=4"
+        "node": ">=8.0.0"
       }
     },
-    "node_modules/check-es-compat/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+    "node_modules/check-es-compat/node_modules/inquirer/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/inquirer/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/inquirer/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/inquirer/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
+    "node_modules/check-es-compat/node_modules/inquirer/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/inquirer/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/inquirer/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/check-es-compat/node_modules/levn": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
@@ -8073,17 +9035,11 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/check-es-compat/node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
+    "node_modules/check-es-compat/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
     },
     "node_modules/check-es-compat/node_modules/optionator": {
       "version": "0.8.3",
@@ -8129,6 +9085,19 @@
         "node": ">=6.5.0"
       }
     },
+    "node_modules/check-es-compat/node_modules/restore-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "dev": true,
+      "dependencies": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/check-es-compat/node_modules/rimraf": {
       "version": "2.6.3",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
@@ -8141,6 +9110,18 @@
         "rimraf": "bin.js"
       }
     },
+    "node_modules/check-es-compat/node_modules/rxjs": {
+      "version": "6.6.6",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.6.tgz",
+      "integrity": "sha512-/oTwee4N4iWzAMAL9xdGKjkEHmIwupR3oXbQjCKywF1BeFohswF3vZdogbmEF6pZkOsXTzWkrZszrWpQTByYVg==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
     "node_modules/check-es-compat/node_modules/semver": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -8185,30 +9166,63 @@
         "node": ">=6"
       }
     },
-    "node_modules/check-es-compat/node_modules/string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+    "node_modules/check-es-compat/node_modules/slice-ansi/node_modules/is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
       "dev": true,
-      "dependencies": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
-      },
       "engines": {
-        "node": ">=6"
+        "node": ">=4"
       }
     },
-    "node_modules/check-es-compat/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+    "node_modules/check-es-compat/node_modules/string-width": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
       "dev": true,
       "dependencies": {
-        "ansi-regex": "^4.1.0"
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/string-width/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
       }
     },
     "node_modules/check-es-compat/node_modules/table": {
@@ -8226,6 +9240,41 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/check-es-compat/node_modules/table/node_modules/emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "dev": true
+    },
+    "node_modules/check-es-compat/node_modules/table/node_modules/is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/table/node_modules/string-width": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^7.0.1",
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
     "node_modules/check-es-compat/node_modules/type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
@@ -8238,15 +9287,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/check-es-compat/node_modules/type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/check-es-compat/node_modules/which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -8276,25 +9316,81 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/chokidar": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
-      "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
+    "node_modules/cheerio/node_modules/css-select": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
+      "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
       "dev": true,
       "dependencies": {
-        "anymatch": "~3.1.2",
+        "boolbase": "~1.0.0",
+        "css-what": "2.1",
+        "domutils": "1.5.1",
+        "nth-check": "~1.0.1"
+      }
+    },
+    "node_modules/cheerio/node_modules/css-what": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
+      "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/cheerio/node_modules/dom-serializer": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
+      "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^1.3.0",
+        "entities": "^1.1.1"
+      }
+    },
+    "node_modules/cheerio/node_modules/domutils": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
+      "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
+      "dev": true,
+      "dependencies": {
+        "dom-serializer": "0",
+        "domelementtype": "1"
+      }
+    },
+    "node_modules/cheerio/node_modules/entities": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
+      "dev": true
+    },
+    "node_modules/cheerio/node_modules/parse5": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz",
+      "integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/chokidar": {
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz",
+      "integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==",
+      "dev": true,
+      "dependencies": {
+        "anymatch": "~3.1.1",
         "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
+        "glob-parent": "~5.1.0",
         "is-binary-path": "~2.1.0",
         "is-glob": "~4.0.1",
         "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
+        "readdirp": "~3.4.0"
       },
       "engines": {
         "node": ">= 8.10.0"
       },
       "optionalDependencies": {
-        "fsevents": "~2.3.2"
+        "fsevents": "~2.1.2"
       }
     },
     "node_modules/chownr": {
@@ -8306,14 +9402,23 @@
       }
     },
     "node_modules/chrome-trace-event": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz",
+      "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==",
       "dev": true,
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
       "engines": {
         "node": ">=6.0"
       }
     },
+    "node_modules/chrome-trace-event/node_modules/tslib": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
+      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
+      "dev": true
+    },
     "node_modules/ci-info": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
@@ -8330,9 +9435,9 @@
       }
     },
     "node_modules/circular-dependency-plugin": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-5.2.2.tgz",
-      "integrity": "sha512-g38K9Cm5WRwlaH6g03B9OEz/0qRizI+2I7n+Gz+L5DxXJAPAiWQvwlYNm1V1jkdpUv95bOe/ASm2vfi/G560jQ==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-5.2.0.tgz",
+      "integrity": "sha512-7p4Kn/gffhQaavNfyDFg7LS5S/UT1JAjyGd4UqR2+jzoYF02eDkj0Ec3+48TsIa4zghjLY87nQHIh/ecK9qLdw==",
       "dev": true,
       "engines": {
         "node": ">=6.0.0"
@@ -8341,12 +9446,6 @@
         "webpack": ">=4.0.1"
       }
     },
-    "node_modules/cjs-module-lexer": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz",
-      "integrity": "sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==",
-      "dev": true
-    },
     "node_modules/class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
@@ -8362,15 +9461,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/class-utils/node_modules/arr-union": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/class-utils/node_modules/define-property": {
       "version": "0.2.5",
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
@@ -8383,68 +9473,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/class-utils/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/class-utils/node_modules/isobject": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
@@ -8495,21 +9523,20 @@
       }
     },
     "node_modules/cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "dev": true,
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
       "dependencies": {
-        "restore-cursor": "^3.1.0"
+        "restore-cursor": "^2.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
     "node_modules/cli-spinners": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.0.tgz",
-      "integrity": "sha512-t+4/y50K/+4xcCRosKkA7W4gTr1MySvLV0q+PxmG7FJ5g+66ChKurYjxBCjHggHH3HA5Hh9cy+lcUGWDqVH+4Q==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.4.0.tgz",
+      "integrity": "sha512-sJAofoarcm76ZGpuooaO0eDy8saEy+YoZBLjC4h8srt4jeBnkYeOgqxgsJQTpyt2LjI5PTfLJHSL+41Yu4fEJA==",
       "dev": true,
       "engines": {
         "node": ">=6"
@@ -8519,23 +9546,33 @@
       }
     },
     "node_modules/cli-width": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
-      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
-      }
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
+      "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw=="
     },
     "node_modules/cliui": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
       "dev": true,
       "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^7.0.0"
+        "string-width": "^3.1.0",
+        "strip-ansi": "^5.2.0",
+        "wrap-ansi": "^5.1.0"
+      }
+    },
+    "node_modules/cliui/node_modules/string-width": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^7.0.1",
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=6"
       }
     },
     "node_modules/clone": {
@@ -8570,36 +9607,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/clone-deep/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/clone-deep/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/clone-deep/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/clone-response": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
@@ -8608,14 +9615,6 @@
         "mimic-response": "^1.0.0"
       }
     },
-    "node_modules/clone-response/node_modules/mimic-response": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/clone-stats": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
@@ -8643,6 +9642,82 @@
         "node": ">= 0.12.0"
       }
     },
+    "node_modules/coa": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
+      "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
+      "dev": true,
+      "dependencies": {
+        "@types/q": "^1.5.1",
+        "chalk": "^2.4.1",
+        "q": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 4.0"
+      }
+    },
+    "node_modules/coa/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/coa/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/coa/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/coa/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/coa/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/coa/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/code-point-at": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
@@ -8684,24 +9759,42 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+    "node_modules/color": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/color/-/color-3.1.2.tgz",
+      "integrity": "sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==",
+      "dev": true,
       "dependencies": {
-        "color-name": "1.1.3"
+        "color-convert": "^1.9.1",
+        "color-string": "^1.5.2"
       }
     },
-    "node_modules/color-convert/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
     },
     "node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
+    "node_modules/color-string": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz",
+      "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "^1.0.0",
+        "simple-swizzle": "^0.2.2"
+      }
+    },
     "node_modules/color-support": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
@@ -8711,10 +9804,19 @@
         "color-support": "bin.js"
       }
     },
-    "node_modules/colord": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/colord/-/colord-2.5.0.tgz",
-      "integrity": "sha512-EeswvDseZAYGju9qVFHIf1ftRsWayhVZgCaZvp25UZzDON7ESYj/MoXD+qvf1lnRrgweeaCGHr389t2r1Huo7w==",
+    "node_modules/color/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/color/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
       "dev": true
     },
     "node_modules/colorette": {
@@ -8748,9 +9850,9 @@
       }
     },
     "node_modules/commander": {
-      "version": "2.17.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
-      "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
       "dev": true
     },
     "node_modules/comment-parser": {
@@ -8774,6 +9876,15 @@
       "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
       "dev": true
     },
+    "node_modules/compose-function": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/compose-function/-/compose-function-3.0.3.tgz",
+      "integrity": "sha1-ntZ18TzFRQHTCVCkhv9qe6OrGF8=",
+      "dev": true,
+      "dependencies": {
+        "arity-n": "^1.0.4"
+      }
+    },
     "node_modules/compressible": {
       "version": "2.0.18",
       "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
@@ -8802,19 +9913,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/compression/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/compression/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -8958,6 +10056,15 @@
       "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
       "dev": true
     },
+    "node_modules/contains-path": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
+      "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/content-disposition": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
@@ -8978,9 +10085,9 @@
       }
     },
     "node_modules/convert-source-map": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
-      "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
+      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
       "dev": true,
       "dependencies": {
         "safe-buffer": "~5.1.1"
@@ -9005,15 +10112,6 @@
       "integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==",
       "dev": true
     },
-    "node_modules/copy-anything": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.3.tgz",
-      "integrity": "sha512-GK6QUtisv4fNS+XcI7shX0Gx9ORg7QqIznyfho79JTnX1XhLiyZHfftvGiziqzRiEi/Bjhgpi+D2o7HxJFPnDQ==",
-      "dev": true,
-      "dependencies": {
-        "is-what": "^3.12.0"
-      }
-    },
     "node_modules/copy-concurrently": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
@@ -9028,18 +10126,6 @@
         "run-queue": "^1.0.0"
       }
     },
-    "node_modules/copy-concurrently/node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
     "node_modules/copy-concurrently/node_modules/rimraf": {
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -9062,31 +10148,31 @@
       }
     },
     "node_modules/copy-props": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.5.tgz",
-      "integrity": "sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz",
+      "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==",
       "dev": true,
       "dependencies": {
-        "each-props": "^1.3.2",
-        "is-plain-object": "^5.0.0"
+        "each-props": "^1.3.0",
+        "is-plain-object": "^2.0.1"
       }
     },
     "node_modules/copy-webpack-plugin": {
-      "version": "6.3.2",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.3.2.tgz",
-      "integrity": "sha512-MgJ1uouLIbDg4ST1GzqrGQyKoXY5iPqi6fghFqarijam7FQcBa/r6Rg0VkoIuzx75Xq8iAMghyOueMkWUQ5OaA==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.0.3.tgz",
+      "integrity": "sha512-q5m6Vz4elsuyVEIUXr7wJdIdePWTubsqVbEMvf1WQnHGv0Q+9yPRu7MtYFPt+GBOXRav9lvIINifTQ1vSCs+eA==",
       "dev": true,
       "dependencies": {
-        "cacache": "^15.0.5",
+        "cacache": "^15.0.4",
         "fast-glob": "^3.2.4",
         "find-cache-dir": "^3.3.1",
         "glob-parent": "^5.1.1",
         "globby": "^11.0.1",
         "loader-utils": "^2.0.0",
         "normalize-path": "^3.0.0",
-        "p-limit": "^3.0.2",
-        "schema-utils": "^3.0.0",
-        "serialize-javascript": "^5.0.1",
+        "p-limit": "^3.0.1",
+        "schema-utils": "^2.7.0",
+        "serialize-javascript": "^4.0.0",
         "webpack-sources": "^1.4.3"
       },
       "engines": {
@@ -9100,72 +10186,59 @@
         "webpack": "^4.37.0 || ^5.0.0"
       }
     },
-    "node_modules/copy-webpack-plugin/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+    "node_modules/copy-webpack-plugin/node_modules/cacache": {
+      "version": "15.0.5",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.5.tgz",
+      "integrity": "sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A==",
       "dev": true,
       "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/copy-webpack-plugin/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
+        "@npmcli/move-file": "^1.0.1",
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "glob": "^7.1.4",
+        "infer-owner": "^1.0.4",
+        "lru-cache": "^6.0.0",
+        "minipass": "^3.1.1",
+        "minipass-collect": "^1.0.2",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.2",
+        "mkdirp": "^1.0.3",
+        "p-map": "^4.0.0",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^3.0.2",
+        "ssri": "^8.0.0",
+        "tar": "^6.0.2",
+        "unique-filename": "^1.1.1"
       },
       "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
+        "node": ">= 10"
       }
     },
-    "node_modules/copy-webpack-plugin/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+    "node_modules/copy-webpack-plugin/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
       "dev": true,
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
       }
     },
-    "node_modules/copy-webpack-plugin/node_modules/webpack-sources": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+    "node_modules/copy-webpack-plugin/node_modules/p-limit": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.0.2.tgz",
+      "integrity": "sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==",
       "dev": true,
       "dependencies": {
-        "source-list-map": "^2.0.0",
-        "source-map": "~0.6.1"
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/cordova": {
@@ -9195,24 +10268,26 @@
       }
     },
     "node_modules/cordova-android": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-10.0.1.tgz",
-      "integrity": "sha512-Hv8H9b4JE2wi9vBBl6K84ZWh01nkFAdIgIGnv3T2Gd8srmCwOw1f3snDCjpcCqxD0jiBAkN5wk5hCIY+EmHJyA==",
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-9.1.0.tgz",
+      "integrity": "sha512-bzOX9E4eQsOSpa06oZZ7XAGq3DwB73juhhj0oPqHH/khWk0mkCD4aiVYMFoc0fmIaSQvzbY1ww7L6UBW5pyGfg==",
       "dependencies": {
-        "android-versions": "^1.7.0",
-        "cordova-common": "^4.0.2",
-        "execa": "^5.1.1",
-        "fast-glob": "^3.2.7",
-        "fs-extra": "^10.0.0",
-        "is-path-inside": "^3.0.3",
-        "nopt": "^5.0.0",
+        "android-versions": "^1.5.0",
+        "cordova-common": "^4.0.1",
+        "execa": "^4.0.2",
+        "fast-glob": "^3.2.4",
+        "fs-extra": "^9.0.1",
+        "is-path-inside": "^3.0.2",
+        "nopt": "^4.0.3",
         "properties-parser": "^0.3.1",
-        "semver": "^7.3.5",
-        "untildify": "^4.0.0",
+        "semver": "^7.3.4",
         "which": "^2.0.2"
       },
+      "bin": {
+        "create": "bin/create"
+      },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=10.10.0"
       }
     },
     "node_modules/cordova-android-support-gradle-release": {
@@ -9232,74 +10307,6 @@
         "semver": "bin/semver"
       }
     },
-    "node_modules/cordova-android/node_modules/execa": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-      "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.0",
-        "human-signals": "^2.1.0",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.1",
-        "onetime": "^5.1.2",
-        "signal-exit": "^3.0.3",
-        "strip-final-newline": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
-      }
-    },
-    "node_modules/cordova-android/node_modules/fs-extra": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
-      "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/cordova-android/node_modules/get-stream": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/cordova-android/node_modules/human-signals": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-      "engines": {
-        "node": ">=10.17.0"
-      }
-    },
-    "node_modules/cordova-android/node_modules/nopt": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
-      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
-      "dependencies": {
-        "abbrev": "1"
-      },
-      "bin": {
-        "nopt": "bin/nopt.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/cordova-android/node_modules/semver": {
       "version": "7.3.5",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
@@ -9388,6 +10395,246 @@
         "npm": ">= 5.6.0"
       }
     },
+    "node_modules/cordova-fetch/node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/agentkeepalive": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.1.4.tgz",
+      "integrity": "sha512-+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ==",
+      "dependencies": {
+        "debug": "^4.1.0",
+        "depd": "^1.1.2",
+        "humanize-ms": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 8.0.0"
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/cacache": {
+      "version": "15.2.0",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.2.0.tgz",
+      "integrity": "sha512-uKoJSHmnrqXgthDFx/IU6ED/5xd+NNGe+Bb+kLZy7Ku4P+BaiWEUflAKPZ7eAzsYGcsAGASJZsybXp+quEcHTw==",
+      "dependencies": {
+        "@npmcli/move-file": "^1.0.1",
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "glob": "^7.1.4",
+        "infer-owner": "^1.0.4",
+        "lru-cache": "^6.0.0",
+        "minipass": "^3.1.1",
+        "minipass-collect": "^1.0.2",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.2",
+        "mkdirp": "^1.0.3",
+        "p-map": "^4.0.0",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^3.0.2",
+        "ssri": "^8.0.1",
+        "tar": "^6.0.2",
+        "unique-filename": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/debug": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/err-code": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
+      "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="
+    },
+    "node_modules/cordova-fetch/node_modules/http-proxy-agent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+      "dependencies": {
+        "@tootallnate/once": "1",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/https-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/make-fetch-happen": {
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.0.4.tgz",
+      "integrity": "sha512-sQWNKMYqSmbAGXqJg2jZ+PmHh5JAybvwu0xM8mZR/bsTjGiTASj3ldXJV7KFHy1k/IJIBkjxQFoWIVsv9+PQMg==",
+      "dependencies": {
+        "agentkeepalive": "^4.1.3",
+        "cacache": "^15.2.0",
+        "http-cache-semantics": "^4.1.0",
+        "http-proxy-agent": "^4.0.1",
+        "https-proxy-agent": "^5.0.0",
+        "is-lambda": "^1.0.1",
+        "lru-cache": "^6.0.0",
+        "minipass": "^3.1.3",
+        "minipass-collect": "^1.0.2",
+        "minipass-fetch": "^1.3.2",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.4",
+        "negotiator": "^0.6.2",
+        "promise-retry": "^2.0.1",
+        "socks-proxy-agent": "^5.0.0",
+        "ssri": "^8.0.0"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
+    "node_modules/cordova-fetch/node_modules/npm-packlist": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.2.2.tgz",
+      "integrity": "sha512-Jt01acDvJRhJGthnUJVF/w6gumWOZxO7IkpY/lsX9//zqQgnF7OJaxgQXcerd4uQOLu7W5bkb4mChL9mdfm+Zg==",
+      "dependencies": {
+        "glob": "^7.1.6",
+        "ignore-walk": "^3.0.3",
+        "npm-bundled": "^1.1.1",
+        "npm-normalize-package-bin": "^1.0.1"
+      },
+      "bin": {
+        "npm-packlist": "bin/index.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/npm-registry-fetch": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-11.0.0.tgz",
+      "integrity": "sha512-jmlgSxoDNuhAtxUIG6pVwwtz840i994dL14FoNVZisrmZW5kWd63IUTNv1m/hyRSGSqWjCUp/YZlS1BJyNp9XA==",
+      "dependencies": {
+        "make-fetch-happen": "^9.0.1",
+        "minipass": "^3.1.3",
+        "minipass-fetch": "^1.3.0",
+        "minipass-json-stream": "^1.0.1",
+        "minizlib": "^2.0.0",
+        "npm-package-arg": "^8.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/pacote": {
+      "version": "11.3.5",
+      "resolved": "https://registry.npmjs.org/pacote/-/pacote-11.3.5.tgz",
+      "integrity": "sha512-fT375Yczn4zi+6Hkk2TBe1x1sP8FgFsEIZ2/iWaXY2r/NkhDJfxbcn5paz1+RTFCyNf+dPnaoBDJoAxXSU8Bkg==",
+      "dependencies": {
+        "@npmcli/git": "^2.1.0",
+        "@npmcli/installed-package-contents": "^1.0.6",
+        "@npmcli/promise-spawn": "^1.2.0",
+        "@npmcli/run-script": "^1.8.2",
+        "cacache": "^15.0.5",
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.1.0",
+        "infer-owner": "^1.0.4",
+        "minipass": "^3.1.3",
+        "mkdirp": "^1.0.3",
+        "npm-package-arg": "^8.0.1",
+        "npm-packlist": "^2.1.4",
+        "npm-pick-manifest": "^6.0.0",
+        "npm-registry-fetch": "^11.0.0",
+        "promise-retry": "^2.0.1",
+        "read-package-json-fast": "^2.0.1",
+        "rimraf": "^3.0.2",
+        "ssri": "^8.0.1",
+        "tar": "^6.1.0"
+      },
+      "bin": {
+        "pacote": "lib/bin.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/pify": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz",
+      "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/promise-retry": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
+      "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
+      "dependencies": {
+        "err-code": "^2.0.2",
+        "retry": "^0.12.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/socks-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ==",
+      "dependencies": {
+        "agent-base": "^6.0.2",
+        "debug": "4",
+        "socks": "^2.3.3"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/cordova-ios": {
       "version": "6.2.0",
       "resolved": "https://registry.npmjs.org/cordova-ios/-/cordova-ios-6.2.0.tgz",
@@ -9422,6 +10669,40 @@
         "node": ">=6"
       }
     },
+    "node_modules/cordova-ios/node_modules/semver": {
+      "version": "7.3.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cordova-ios/node_modules/uuid": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
+      "integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/cordova-ios/node_modules/xcode": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/xcode/-/xcode-3.0.1.tgz",
+      "integrity": "sha512-kCz5k7J7XbJtjABOvkc5lJmkiDh8VhjVCGNiqdKCscmVpdVUpEAyXv1xmCLkQJ5dsHqx3IPO4XW+NTDhU/fatA==",
+      "dependencies": {
+        "simple-plist": "^1.1.0",
+        "uuid": "^7.0.3"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
     "node_modules/cordova-lib": {
       "version": "10.0.0",
       "resolved": "https://registry.npmjs.org/cordova-lib/-/cordova-lib-10.0.0.tgz",
@@ -9448,6 +10729,17 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/cordova-lib/node_modules/pify": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz",
+      "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/cordova-plugin-add-swift-support": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/cordova-plugin-add-swift-support/-/cordova-plugin-add-swift-support-2.0.2.tgz",
@@ -9466,31 +10758,10 @@
         "semver": "bin/semver.js"
       }
     },
-    "node_modules/cordova-plugin-add-swift-support/node_modules/uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
-      "bin": {
-        "uuid": "bin/uuid"
-      }
-    },
-    "node_modules/cordova-plugin-add-swift-support/node_modules/xcode": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/xcode/-/xcode-2.1.0.tgz",
-      "integrity": "sha512-uCrmPITrqTEzhn0TtT57fJaNaw8YJs1aCzs+P/QqxsDbvPZSv7XMPPwXrKvHtD6pLjBM/NaVwraWJm8q83Y4iQ==",
-      "dependencies": {
-        "simple-plist": "^1.0.0",
-        "uuid": "^3.3.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
     "node_modules/cordova-plugin-advanced-http": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-advanced-http/-/cordova-plugin-advanced-http-3.2.0.tgz",
-      "integrity": "sha512-NOjkxLvP8z7vrnrwuXO0bWGJviK31KO1ov0Nel1BqbNi2rZNafL5RRxC1/RHXik252xf070xDgBvDwdWv7yxjA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-advanced-http/-/cordova-plugin-advanced-http-3.1.0.tgz",
+      "integrity": "sha512-zlTlNJyTttE7TV5vW2WGvHqpbKMDVrr1meZU0fy4y3ObrI/hGk2UDcDNwpZdMfaytNZwDKU4sRgsTgQYdFNBew==",
       "engines": [
         {
           "name": "cordova",
@@ -9522,9 +10793,9 @@
       ]
     },
     "node_modules/cordova-plugin-camera": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-camera/-/cordova-plugin-camera-5.0.2.tgz",
-      "integrity": "sha512-iR9W9S+USg/YTjwB+6rnIqJ1mZ02da0Q2VDU0Twf/CccEJO+006T5RM/NYDkBRs6vMCw7rWXroCNJOPBLLETPQ==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-camera/-/cordova-plugin-camera-5.0.1.tgz",
+      "integrity": "sha512-9gXyZvI8u9KzsZuqmB8Yw+uheF+7f+usMAwvOMw7L7pqbykg+bm9US5zjhJbwit3A1cSblgZkpBafe5cFiMcTA==",
       "engines": {
         "cordovaDependencies": {
           "3.0.0": {
@@ -9695,9 +10966,9 @@
       }
     },
     "node_modules/cordova-plugin-prevent-override": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-prevent-override/-/cordova-plugin-prevent-override-1.0.1.tgz",
-      "integrity": "sha512-yy1JZ+lXTR33Ai1yloT6wdXJXe0a3LrfgnKORuPZv/QkbiqfIQKjy0R4zRP8qljaJSelF/xv5CgrVt8iS0SkBg==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-prevent-override/-/cordova-plugin-prevent-override-1.0.0.tgz",
+      "integrity": "sha512-/+3q5r4K5RahCpiYVmZQBjq10x4jj+6CMjYtZyx9jdMWeV+yFE+ItFcO1NeUAEWd2iHC5YPD0P2tHiHx5kscsw==",
       "engines": {
         "cordovaDependencies": {
           "3.0.0": {
@@ -9753,24 +11024,24 @@
       }
     },
     "node_modules/cordova-plugin-whitelist": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.5.tgz",
-      "integrity": "sha512-+v/VzCYBdGsIxJTP2m+RWaq7l/NLu7b976w6XGJUFiN2TVOeaGrytaR4jRy0w9akRai8uKFeBmuGHmlS/sOeCA==",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.4.tgz",
+      "integrity": "sha512-EYC5eQFVkoYXq39l7tYKE6lEjHJ04mvTmKXxGL7quHLdFPfJMNzru/UYpn92AOfpl3PQaZmou78C7EgmFOwFQQ==",
       "engines": {
         "cordovaDependencies": {
           "0.0.0": {
             "cordova-android": ">=4.0.0"
           },
-          "1.3.5": {
-            "cordova-android": ">=4.0.0 <10.0.0"
+          "2.0.0": {
+            "cordova": ">100"
           }
         }
       }
     },
     "node_modules/cordova-plugin-wkuserscript": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-wkuserscript/-/cordova-plugin-wkuserscript-1.0.1.tgz",
-      "integrity": "sha512-qhb2JOFy+XnLIbPubDuAcZyf6fSsrQ2syM8PqAVvW7JJQVR7i64pZDLHmgYQrGN+2pO1fG8EdR2aUp5O0Kx/HA==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-wkuserscript/-/cordova-plugin-wkuserscript-1.0.0.tgz",
+      "integrity": "sha512-g18TohV1T+iWQJImYUCZc44x2ywHTH3ycgEJyxo4WTL9eYm4T7lNkyl1svzQGI97e8W5hQxUqAcmvpVcnWvjSQ==",
       "engines": {
         "cordovaDependencies": {
           "3.0.0": {
@@ -9780,9 +11051,9 @@
       }
     },
     "node_modules/cordova-plugin-wkwebview-cookies": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-wkwebview-cookies/-/cordova-plugin-wkwebview-cookies-1.0.1.tgz",
-      "integrity": "sha512-x984mlj21Newei7UFPTu4N3NJSTBZuuQXkDNJxq8FTGM1RH/YECqYAzk6ekk/regFamj1bCQ3IB8XJeCm5/dhA==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-wkwebview-cookies/-/cordova-plugin-wkwebview-cookies-1.0.0.tgz",
+      "integrity": "sha512-bQRnc/1UNu2XDb6ds+RuAZGA8FM2MuQb4z45J/CaDfjSs60OSvxGVKo3okrM/okYosZqWJFygrPah0MK3lDERQ==",
       "engines": {
         "cordovaDependencies": {
           "3.0.0": {
@@ -9818,62 +11089,6 @@
         "npm": ">= 5.6.0"
       }
     },
-    "node_modules/cordova-serve/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/cordova-serve/node_modules/chalk": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cordova-serve/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/cordova-serve/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cordova-serve/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/cordova-sqlite-storage": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/cordova-sqlite-storage/-/cordova-sqlite-storage-6.0.0.tgz",
@@ -9888,9 +11103,9 @@
       "integrity": "sha512-dTBxYaX/RGzH6+pp49o4sb3FuHCvhrssaKn1XMJ4LL3f9dnvz3rhFK2LdcWrdFkhOLOndnW/azUkbzZd+WWhRA=="
     },
     "node_modules/cordova-support-google-services": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/cordova-support-google-services/-/cordova-support-google-services-1.4.1.tgz",
-      "integrity": "sha512-1VgF9kFCOMbzgdnsDtSKaYGmWXmeciGP8+N0wTcTkL2m6Qrs1xZ82NiYEJYXe7BjHad2d06liWThqQv7iXt5HA=="
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/cordova-support-google-services/-/cordova-support-google-services-1.2.1.tgz",
+      "integrity": "sha512-EnFjKAE9oI2uzyUvEfWpLgTM200nuJVvShaA4yyz9wMKBUN+H/BRG1byd1ibZz3sSihNKi3FxjQPxmmEn6/IfA=="
     },
     "node_modules/cordova.plugins.diagnostic": {
       "version": "5.0.2",
@@ -9918,9 +11133,9 @@
       "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
     },
     "node_modules/core-js": {
-      "version": "3.16.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.16.0.tgz",
-      "integrity": "sha512-5+5VxRFmSf97nM8Jr2wzOwLqRo6zphH2aX+7KsAUONObyzakDNq2G/bgbhinxB4PoV9L3aXQYhiDKyIKWd2c8g==",
+      "version": "3.9.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.9.1.tgz",
+      "integrity": "sha512-gSjRvzkxQc1zjM/5paAmL4idJBFzuJoo+jDjF1tStYFMV2ERfD02HhahhCGXUyHxQRG4yFKVSdO6g62eoRMcDg==",
       "hasInstallScript": true,
       "funding": {
         "type": "opencollective",
@@ -9928,12 +11143,12 @@
       }
     },
     "node_modules/core-js-compat": {
-      "version": "3.16.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.16.0.tgz",
-      "integrity": "sha512-5D9sPHCdewoUK7pSUPfTF7ZhLh8k9/CoJXWUEo+F1dZT5Z1DVgcuRqUKhjeKW+YLb8f21rTFgWwQJiNw1hoZ5Q==",
+      "version": "3.6.5",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz",
+      "integrity": "sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==",
       "dev": true,
       "dependencies": {
-        "browserslist": "^4.16.6",
+        "browserslist": "^4.8.5",
         "semver": "7.0.0"
       },
       "funding": {
@@ -9951,9 +11166,9 @@
       }
     },
     "node_modules/core-js-pure": {
-      "version": "3.16.0",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.16.0.tgz",
-      "integrity": "sha512-wzlhZNepF/QA9yvx3ePDgNGudU5KDB8lu/TRPKelYA/QtSnkS/cLl2W+TIdEX1FAFcBr0YpY7tPDlcmXJ7AyiQ==",
+      "version": "3.11.1",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.11.1.tgz",
+      "integrity": "sha512-2JukQi8HgAOCD5CSimxWWXVrUBoA9Br796uIA5Z06bIjt7PBBI19ircFaAxplgE1mJf3x2BY6MkT/HWA/UryPg==",
       "dev": true,
       "hasInstallScript": true,
       "funding": {
@@ -9967,19 +11182,40 @@
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "node_modules/cosmiconfig": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz",
-      "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
+      "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
       "dev": true,
       "dependencies": {
-        "@types/parse-json": "^4.0.0",
-        "import-fresh": "^3.2.1",
-        "parse-json": "^5.0.0",
-        "path-type": "^4.0.0",
-        "yaml": "^1.10.0"
+        "import-fresh": "^2.0.0",
+        "is-directory": "^0.3.1",
+        "js-yaml": "^3.13.1",
+        "parse-json": "^4.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=4"
+      }
+    },
+    "node_modules/cosmiconfig/node_modules/import-fresh": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
+      "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
+      "dev": true,
+      "dependencies": {
+        "caller-path": "^2.0.0",
+        "resolve-from": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/cosmiconfig/node_modules/resolve-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
       }
     },
     "node_modules/create-ecdh": {
@@ -9993,9 +11229,9 @@
       }
     },
     "node_modules/create-ecdh/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "version": "4.11.9",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+      "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
       "dev": true
     },
     "node_modules/create-hash": {
@@ -10025,97 +11261,6 @@
         "sha.js": "^2.4.8"
       }
     },
-    "node_modules/create-require": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
-      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "node_modules/critters": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/critters/-/critters-0.0.7.tgz",
-      "integrity": "sha512-qUF2SaAWFYjNPdCcPpu68p2DnHiosia84yx5mPTlUMQjkjChR+n6sO1/I7yn2U2qNDgSPTd2SoaTIDQcUL+EwQ==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.1.0",
-        "css": "^3.0.0",
-        "parse5": "^6.0.1",
-        "parse5-htmlparser2-tree-adapter": "^6.0.1",
-        "pretty-bytes": "^5.3.0"
-      }
-    },
-    "node_modules/critters/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/critters/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/critters/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/critters/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/critters/node_modules/parse5": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
-      "dev": true
-    },
-    "node_modules/critters/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -10160,129 +11305,6 @@
       }
     },
     "node_modules/css": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/css/-/css-3.0.0.tgz",
-      "integrity": "sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.4",
-        "source-map": "^0.6.1",
-        "source-map-resolve": "^0.6.0"
-      }
-    },
-    "node_modules/css-color-names": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-1.0.1.tgz",
-      "integrity": "sha512-/loXYOch1qU1biStIFsHH8SxTmOseh1IJqFvy8IujXOm1h+QjUdDhkzOrR5HG8K8mlxREj0yfi8ewCHx0eMxzA==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/css-declaration-sorter": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.1.1.tgz",
-      "integrity": "sha512-BZ1aOuif2Sb7tQYY1GeCjG7F++8ggnwUkH5Ictw0mrdpqpEd+zWmcPdstnH2TItlb74FqR0DrVEieon221T/1Q==",
-      "dev": true,
-      "dependencies": {
-        "timsort": "^0.3.0"
-      },
-      "engines": {
-        "node": ">= 10"
-      },
-      "peerDependencies": {
-        "postcss": "^8.0.9"
-      }
-    },
-    "node_modules/css-loader": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-5.0.1.tgz",
-      "integrity": "sha512-cXc2ti9V234cq7rJzFKhirb2L2iPy8ZjALeVJAozXYz9te3r4eqLSixNAbMDJSgJEQywqXzs8gonxaboeKqwiw==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^6.2.0",
-        "cssesc": "^3.0.0",
-        "icss-utils": "^5.0.0",
-        "loader-utils": "^2.0.0",
-        "postcss": "^8.1.4",
-        "postcss-modules-extract-imports": "^3.0.0",
-        "postcss-modules-local-by-default": "^4.0.0",
-        "postcss-modules-scope": "^3.0.0",
-        "postcss-modules-values": "^4.0.0",
-        "postcss-value-parser": "^4.1.0",
-        "schema-utils": "^3.0.0",
-        "semver": "^7.3.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.27.0 || ^5.0.0"
-      }
-    },
-    "node_modules/css-loader/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/css-loader/node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
-    "node_modules/css-loader/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/css-loader/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/css-parse": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz",
-      "integrity": "sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=",
-      "dev": true,
-      "dependencies": {
-        "css": "^2.0.0"
-      }
-    },
-    "node_modules/css-parse/node_modules/css": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
       "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
@@ -10294,47 +11316,128 @@
         "urix": "^0.1.0"
       }
     },
-    "node_modules/css-parse/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+    "node_modules/css-color-names": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
+      "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
       "dev": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": "*"
       }
     },
-    "node_modules/css-parse/node_modules/source-map-resolve": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
-      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+    "node_modules/css-declaration-sorter": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz",
+      "integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==",
       "dev": true,
       "dependencies": {
-        "atob": "^2.1.2",
-        "decode-uri-component": "^0.2.0",
-        "resolve-url": "^0.2.1",
-        "source-map-url": "^0.4.0",
-        "urix": "^0.1.0"
+        "postcss": "^7.0.1",
+        "timsort": "^0.3.0"
+      },
+      "engines": {
+        "node": ">4"
+      }
+    },
+    "node_modules/css-loader": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.5.3.tgz",
+      "integrity": "sha512-UEr9NH5Lmi7+dguAm+/JSPovNjYbm2k3TK58EiwQHzOHH5Jfq1Y+XoP2bQO6TMn7PptMd0opxxedAWcaSTRKHw==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.3.1",
+        "cssesc": "^3.0.0",
+        "icss-utils": "^4.1.1",
+        "loader-utils": "^1.2.3",
+        "normalize-path": "^3.0.0",
+        "postcss": "^7.0.27",
+        "postcss-modules-extract-imports": "^2.0.0",
+        "postcss-modules-local-by-default": "^3.0.2",
+        "postcss-modules-scope": "^2.2.0",
+        "postcss-modules-values": "^3.0.0",
+        "postcss-value-parser": "^4.0.3",
+        "schema-utils": "^2.6.6",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">= 8.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/css-loader/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/css-loader/node_modules/loader-utils": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/css-loader/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/css-parse": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz",
+      "integrity": "sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=",
+      "dev": true,
+      "dependencies": {
+        "css": "^2.0.0"
       }
     },
     "node_modules/css-select": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
-      "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
+      "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
       "dev": true,
       "dependencies": {
-        "boolbase": "~1.0.0",
-        "css-what": "2.1",
-        "domutils": "1.5.1",
-        "nth-check": "~1.0.1"
+        "boolbase": "^1.0.0",
+        "css-what": "^3.2.1",
+        "domutils": "^1.7.0",
+        "nth-check": "^1.0.2"
       }
     },
+    "node_modules/css-select-base-adapter": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
+      "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
+      "dev": true
+    },
     "node_modules/css-tree": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
-      "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
+      "version": "1.0.0-alpha.37",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz",
+      "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==",
       "dev": true,
       "dependencies": {
-        "mdn-data": "2.0.14",
+        "mdn-data": "2.0.4",
         "source-map": "^0.6.1"
       },
       "engines": {
@@ -10351,12 +11454,15 @@
       }
     },
     "node_modules/css-what": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
-      "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.1.tgz",
+      "integrity": "sha512-wHOppVDKl4vTAOWzJt5Ek37Sgd9qq1Bmj/T1OjvicWbU5W7ru7Pqbn0Jdqii3Drx/h+dixHKXNhZYx7blthL7g==",
       "dev": true,
       "engines": {
-        "node": "*"
+        "node": ">= 6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
       }
     },
     "node_modules/css/node_modules/source-map": {
@@ -10381,93 +11487,140 @@
       }
     },
     "node_modules/cssnano": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.0.2.tgz",
-      "integrity": "sha512-8JK3EnPsjQsULme9/e5M2hF564f/480hwsdcHvQ7ZtAIMfQ1O3SCfs+b8Mjf5KJxhYApyRshR2QSovEJi2K72Q==",
+      "version": "4.1.10",
+      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz",
+      "integrity": "sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ==",
       "dev": true,
       "dependencies": {
-        "cosmiconfig": "^7.0.0",
-        "cssnano-preset-default": "^5.0.1",
-        "is-resolvable": "^1.1.0"
+        "cosmiconfig": "^5.0.0",
+        "cssnano-preset-default": "^4.0.7",
+        "is-resolvable": "^1.0.0",
+        "postcss": "^7.0.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/cssnano"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.1"
+        "node": ">=6.9.0"
       }
     },
     "node_modules/cssnano-preset-default": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.1.3.tgz",
-      "integrity": "sha512-qo9tX+t4yAAZ/yagVV3b+QBKeLklQbmgR3wI7mccrDcR+bEk9iHgZN1E7doX68y9ThznLya3RDmR+nc7l6/2WQ==",
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz",
+      "integrity": "sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA==",
       "dev": true,
       "dependencies": {
-        "css-declaration-sorter": "^6.0.3",
-        "cssnano-utils": "^2.0.1",
-        "postcss-calc": "^8.0.0",
-        "postcss-colormin": "^5.2.0",
-        "postcss-convert-values": "^5.0.1",
-        "postcss-discard-comments": "^5.0.1",
-        "postcss-discard-duplicates": "^5.0.1",
-        "postcss-discard-empty": "^5.0.1",
-        "postcss-discard-overridden": "^5.0.1",
-        "postcss-merge-longhand": "^5.0.2",
-        "postcss-merge-rules": "^5.0.2",
-        "postcss-minify-font-values": "^5.0.1",
-        "postcss-minify-gradients": "^5.0.1",
-        "postcss-minify-params": "^5.0.1",
-        "postcss-minify-selectors": "^5.1.0",
-        "postcss-normalize-charset": "^5.0.1",
-        "postcss-normalize-display-values": "^5.0.1",
-        "postcss-normalize-positions": "^5.0.1",
-        "postcss-normalize-repeat-style": "^5.0.1",
-        "postcss-normalize-string": "^5.0.1",
-        "postcss-normalize-timing-functions": "^5.0.1",
-        "postcss-normalize-unicode": "^5.0.1",
-        "postcss-normalize-url": "^5.0.2",
-        "postcss-normalize-whitespace": "^5.0.1",
-        "postcss-ordered-values": "^5.0.2",
-        "postcss-reduce-initial": "^5.0.1",
-        "postcss-reduce-transforms": "^5.0.1",
-        "postcss-svgo": "^5.0.2",
-        "postcss-unique-selectors": "^5.0.1"
+        "css-declaration-sorter": "^4.0.1",
+        "cssnano-util-raw-cache": "^4.0.1",
+        "postcss": "^7.0.0",
+        "postcss-calc": "^7.0.1",
+        "postcss-colormin": "^4.0.3",
+        "postcss-convert-values": "^4.0.1",
+        "postcss-discard-comments": "^4.0.2",
+        "postcss-discard-duplicates": "^4.0.2",
+        "postcss-discard-empty": "^4.0.1",
+        "postcss-discard-overridden": "^4.0.1",
+        "postcss-merge-longhand": "^4.0.11",
+        "postcss-merge-rules": "^4.0.3",
+        "postcss-minify-font-values": "^4.0.2",
+        "postcss-minify-gradients": "^4.0.2",
+        "postcss-minify-params": "^4.0.2",
+        "postcss-minify-selectors": "^4.0.2",
+        "postcss-normalize-charset": "^4.0.1",
+        "postcss-normalize-display-values": "^4.0.2",
+        "postcss-normalize-positions": "^4.0.2",
+        "postcss-normalize-repeat-style": "^4.0.2",
+        "postcss-normalize-string": "^4.0.2",
+        "postcss-normalize-timing-functions": "^4.0.2",
+        "postcss-normalize-unicode": "^4.0.1",
+        "postcss-normalize-url": "^4.0.1",
+        "postcss-normalize-whitespace": "^4.0.2",
+        "postcss-ordered-values": "^4.1.2",
+        "postcss-reduce-initial": "^4.0.3",
+        "postcss-reduce-transforms": "^4.0.2",
+        "postcss-svgo": "^4.0.2",
+        "postcss-unique-selectors": "^4.0.1"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/cssnano-utils": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-2.0.1.tgz",
-      "integrity": "sha512-i8vLRZTnEH9ubIyfdZCAdIdgnHAUeQeByEeQ2I7oTilvP9oHO6RScpeq3GsFUVqeB8uZgOQ9pw8utofNn32hhQ==",
+    "node_modules/cssnano-util-get-arguments": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz",
+      "integrity": "sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8=",
       "dev": true,
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/cssnano-util-get-match": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz",
+      "integrity": "sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0=",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/cssnano-util-raw-cache": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz",
+      "integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^7.0.0"
       },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/cssnano-util-same-parent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz",
+      "integrity": "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/csso": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
-      "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-4.0.3.tgz",
+      "integrity": "sha512-NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ==",
       "dev": true,
       "dependencies": {
-        "css-tree": "^1.1.2"
+        "css-tree": "1.0.0-alpha.39"
       },
       "engines": {
         "node": ">=8.0.0"
       }
     },
+    "node_modules/csso/node_modules/css-tree": {
+      "version": "1.0.0-alpha.39",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.39.tgz",
+      "integrity": "sha512-7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA==",
+      "dev": true,
+      "dependencies": {
+        "mdn-data": "2.0.6",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/csso/node_modules/mdn-data": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.6.tgz",
+      "integrity": "sha512-rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA==",
+      "dev": true
+    },
+    "node_modules/csso/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/cssom": {
       "version": "0.4.4",
       "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
@@ -10554,19 +11707,20 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dependencies": {
-        "ms": "2.1.2"
-      },
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/debuglog": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz",
+      "integrity": "sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=",
+      "dev": true,
       "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+        "node": "*"
       }
     },
     "node_modules/decamelize": {
@@ -10579,9 +11733,9 @@
       }
     },
     "node_modules/decimal.js": {
-      "version": "10.3.1",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz",
-      "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==",
+      "version": "10.2.1",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.1.tgz",
+      "integrity": "sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==",
       "dev": true
     },
     "node_modules/decode-uri-component": {
@@ -10594,15 +11748,14 @@
       }
     },
     "node_modules/decompress-response": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
-      "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
-      "optional": true,
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
+      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
       "dependencies": {
-        "mimic-response": "^2.0.0"
+        "mimic-response": "^1.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
     "node_modules/dedent": {
@@ -10662,6 +11815,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/default-compare/node_modules/kind-of": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/default-gateway": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
@@ -10850,6 +12012,44 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/define-property/node_modules/is-accessor-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/define-property/node_modules/is-data-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/define-property/node_modules/is-descriptor": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.0",
+        "is-data-descriptor": "^1.0.0",
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/define-property/node_modules/isobject": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
@@ -10937,15 +12137,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/del/node_modules/pify": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/del/node_modules/rimraf": {
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -11060,11 +12251,21 @@
       }
     },
     "node_modules/detect-node": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
-      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
+      "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
       "dev": true
     },
+    "node_modules/dezalgo": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz",
+      "integrity": "sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=",
+      "dev": true,
+      "dependencies": {
+        "asap": "^2.0.0",
+        "wrappy": "1"
+      }
+    },
     "node_modules/diff": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
@@ -11075,9 +12276,9 @@
       }
     },
     "node_modules/diff-sequences": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz",
-      "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==",
+      "version": "26.5.0",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.5.0.tgz",
+      "integrity": "sha512-ZXx86srb/iYy6jG71k++wBN9P9J05UNQ5hQHQd9MtMPvcqXPx/vKU69jfHV637D00Q2gSgPk2D+jSx3l1lDW/Q==",
       "dev": true,
       "engines": {
         "node": ">= 10.14.2"
@@ -11095,9 +12296,9 @@
       }
     },
     "node_modules/diffie-hellman/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "version": "4.11.9",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+      "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
       "dev": true
     },
     "node_modules/dir-glob": {
@@ -11118,9 +12319,9 @@
       "dev": true
     },
     "node_modules/dns-packet": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz",
-      "integrity": "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
+      "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
       "dev": true,
       "dependencies": {
         "ip": "^1.1.0",
@@ -11149,15 +12350,27 @@
       }
     },
     "node_modules/dom-serializer": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
-      "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
+      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
       "dev": true,
       "dependencies": {
-        "domelementtype": "^1.3.0",
-        "entities": "^1.1.1"
+        "domelementtype": "^2.0.1",
+        "entities": "^2.0.0"
       }
     },
+    "node_modules/dom-serializer/node_modules/domelementtype": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.2.tgz",
+      "integrity": "sha512-wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ]
+    },
     "node_modules/domain-browser": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
@@ -11205,9 +12418,9 @@
       }
     },
     "node_modules/domutils": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
-      "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
+      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
       "dev": true,
       "dependencies": {
         "dom-serializer": "0",
@@ -11261,27 +12474,6 @@
         "object.defaults": "^1.1.0"
       }
     },
-    "node_modules/each-props/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/each-props/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/ecc-jsbn": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
@@ -11302,9 +12494,9 @@
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.3.793",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.793.tgz",
-      "integrity": "sha512-l9NrGV6Mr4ov5mayYPvIWcwklNw5ROmy6rllzz9dCACw9nKE5y+s5uQk+CBJMetxrWZ6QJFsvEfG6WDcH2IGUg==",
+      "version": "1.3.577",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.577.tgz",
+      "integrity": "sha512-dSb64JQSFif/pD8mpVAgSFkbVi6YHbK6JeEziwNNmXlr/Ne2rZtseFK5SM7JoWSLf6gP0gVvRGi4/2ZRhSX/rA==",
       "dev": true
     },
     "node_modules/elementtree": {
@@ -11319,30 +12511,30 @@
       }
     },
     "node_modules/elliptic": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
-      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
+      "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
       "dev": true,
       "dependencies": {
-        "bn.js": "^4.11.9",
-        "brorand": "^1.1.0",
+        "bn.js": "^4.4.0",
+        "brorand": "^1.0.1",
         "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.1",
-        "inherits": "^2.0.4",
-        "minimalistic-assert": "^1.0.1",
-        "minimalistic-crypto-utils": "^1.0.1"
+        "hmac-drbg": "^1.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.0"
       }
     },
     "node_modules/elliptic/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "version": "4.11.9",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+      "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
       "dev": true
     },
     "node_modules/emittery": {
-      "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.7.2.tgz",
-      "integrity": "sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ==",
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.7.1.tgz",
+      "integrity": "sha512-d34LN4L6h18Bzz9xpoku2nPwKxCPlPMr3EEKTkoEBi+1/+b0lcRkRJ1UVyyZaKNeqGR3swcGl6s390DNO4YVgQ==",
       "dev": true,
       "engines": {
         "node": ">=10"
@@ -11352,9 +12544,9 @@
       }
     },
     "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
     },
     "node_modules/emojis-list": {
       "version": "3.0.0",
@@ -11377,16 +12569,16 @@
       "version": "0.1.13",
       "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
       "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
-      "optional": true,
+      "devOptional": true,
       "dependencies": {
         "iconv-lite": "^0.6.2"
       }
     },
     "node_modules/encoding/node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "optional": true,
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz",
+      "integrity": "sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==",
+      "devOptional": true,
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
       },
@@ -11413,16 +12605,17 @@
       }
     },
     "node_modules/enhanced-resolve": {
-      "version": "5.7.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.7.0.tgz",
-      "integrity": "sha512-6njwt/NsZFUKhM6j9U8hzVyD4E4r0x7NQzhTCbcWOJ0IQjNSAoalWmb0AE51Wn+fwan5qVESWi7t2ToBxs9vrw==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz",
+      "integrity": "sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==",
       "dev": true,
       "dependencies": {
-        "graceful-fs": "^4.2.4",
-        "tapable": "^2.2.0"
+        "graceful-fs": "^4.1.2",
+        "memory-fs": "^0.5.0",
+        "tapable": "^1.0.0"
       },
       "engines": {
-        "node": ">=10.13.0"
+        "node": ">=6.9.0"
       }
     },
     "node_modules/enquirer": {
@@ -11437,10 +12630,19 @@
         "node": ">=8.6"
       }
     },
+    "node_modules/enquirer/node_modules/ansi-colors": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/entities": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
+      "integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==",
       "dev": true
     },
     "node_modules/env-paths": {
@@ -11454,12 +12656,13 @@
     "node_modules/err-code": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz",
-      "integrity": "sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA="
+      "integrity": "sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA=",
+      "dev": true
     },
     "node_modules/errno": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
-      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
+      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
       "dev": true,
       "dependencies": {
         "prr": "~1.0.1"
@@ -11478,28 +12681,23 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.18.5",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz",
-      "integrity": "sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==",
+      "version": "1.18.0-next.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
+      "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.1.1",
         "has": "^1.0.3",
-        "has-symbols": "^1.0.2",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.3",
-        "is-negative-zero": "^2.0.1",
-        "is-regex": "^1.1.3",
-        "is-string": "^1.0.6",
-        "object-inspect": "^1.11.0",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.2",
+        "is-negative-zero": "^2.0.0",
+        "is-regex": "^1.1.1",
+        "object-inspect": "^1.8.0",
         "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "string.prototype.trimend": "^1.0.4",
-        "string.prototype.trimstart": "^1.0.4",
-        "unbox-primitive": "^1.0.1"
+        "object.assign": "^4.1.1",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -11547,11 +12745,26 @@
         "es6-symbol": "^3.1.1"
       }
     },
+    "node_modules/es6-promise": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
+      "dev": true
+    },
     "node_modules/es6-promise-plugin": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/es6-promise-plugin/-/es6-promise-plugin-4.2.2.tgz",
       "integrity": "sha512-uoA4aVplXI9oqUYJFBAVRwAqIN9/n9JgrTAUGX3qPbnSZVE5yY1+6/MsoN5f4xsaPO62WjPHOdtts6okMN6tNA=="
     },
+    "node_modules/es6-promisify": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
+      "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
+      "dev": true,
+      "dependencies": {
+        "es6-promise": "^4.0.3"
+      }
+    },
     "node_modules/es6-symbol": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
@@ -11575,9 +12788,9 @@
       }
     },
     "node_modules/escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.0.tgz",
+      "integrity": "sha512-mAk+hPSO8fLDkhV7V0dXazH5pDc6MrjBTPyD3VeKzxnVFjH1MIxbCdqGZB9O8+EwWakZs3ZCbDS4IpRt79V1ig==",
       "dev": true,
       "engines": {
         "node": ">=6"
@@ -11688,31 +12901,28 @@
       }
     },
     "node_modules/eslint": {
-      "version": "7.32.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
-      "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.25.0.tgz",
+      "integrity": "sha512-TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw==",
       "dev": true,
       "dependencies": {
         "@babel/code-frame": "7.12.11",
-        "@eslint/eslintrc": "^0.4.3",
-        "@humanwhocodes/config-array": "^0.5.0",
+        "@eslint/eslintrc": "^0.4.0",
         "ajv": "^6.10.0",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
         "debug": "^4.0.1",
         "doctrine": "^3.0.0",
         "enquirer": "^2.3.5",
-        "escape-string-regexp": "^4.0.0",
         "eslint-scope": "^5.1.1",
         "eslint-utils": "^2.1.0",
         "eslint-visitor-keys": "^2.0.0",
         "espree": "^7.3.1",
         "esquery": "^1.4.0",
         "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
         "file-entry-cache": "^6.0.1",
         "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^5.1.2",
+        "glob-parent": "^5.0.0",
         "globals": "^13.6.0",
         "ignore": "^4.0.6",
         "import-fresh": "^3.0.0",
@@ -11721,7 +12931,7 @@
         "js-yaml": "^3.13.1",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
+        "lodash": "^4.17.21",
         "minimatch": "^3.0.4",
         "natural-compare": "^1.4.0",
         "optionator": "^0.9.1",
@@ -11730,7 +12940,7 @@
         "semver": "^7.2.1",
         "strip-ansi": "^6.0.0",
         "strip-json-comments": "^3.1.0",
-        "table": "^6.0.9",
+        "table": "^6.0.4",
         "text-table": "^0.2.0",
         "v8-compile-cache": "^2.0.3"
       },
@@ -11766,41 +12976,29 @@
         "resolve": "^1.13.1"
       }
     },
-    "node_modules/eslint-import-resolver-node/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/eslint-import-resolver-node/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
     "node_modules/eslint-module-utils": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.1.tgz",
-      "integrity": "sha512-ZXI9B8cxAJIH4nfkhTwcRTEAnrVfobYqwjWy/QMCZ8rHkZHFjf9yO4BzpiF9kCSfNlMG54eKigISHpX0+AaT4A==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz",
+      "integrity": "sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==",
       "dev": true,
       "dependencies": {
-        "debug": "^3.2.7",
+        "debug": "^2.6.9",
         "pkg-dir": "^2.0.0"
       },
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/eslint-module-utils/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+    "node_modules/eslint-module-utils/node_modules/pkg-dir": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
+      "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
       "dev": true,
       "dependencies": {
-        "ms": "^2.1.1"
+        "find-up": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=4"
       }
     },
     "node_modules/eslint-plugin-ecmascript-compat": {
@@ -11868,25 +13066,23 @@
       }
     },
     "node_modules/eslint-plugin-import": {
-      "version": "2.23.4",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.23.4.tgz",
-      "integrity": "sha512-6/wP8zZRsnQFiR3iaPFgh5ImVRM1WN5NUWfTIRqwOdeiGJlBcSk82o1FEVq8yXmy4lkIzTo7YhHCIxlU/2HyEQ==",
+      "version": "2.22.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz",
+      "integrity": "sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==",
       "dev": true,
       "dependencies": {
-        "array-includes": "^3.1.3",
-        "array.prototype.flat": "^1.2.4",
+        "array-includes": "^3.1.1",
+        "array.prototype.flat": "^1.2.3",
+        "contains-path": "^0.1.0",
         "debug": "^2.6.9",
-        "doctrine": "^2.1.0",
+        "doctrine": "1.5.0",
         "eslint-import-resolver-node": "^0.3.4",
-        "eslint-module-utils": "^2.6.1",
-        "find-up": "^2.0.0",
+        "eslint-module-utils": "^2.6.0",
         "has": "^1.0.3",
-        "is-core-module": "^2.4.0",
         "minimatch": "^3.0.4",
-        "object.values": "^1.1.3",
-        "pkg-up": "^2.0.0",
-        "read-pkg-up": "^3.0.0",
-        "resolve": "^1.20.0",
+        "object.values": "^1.1.1",
+        "read-pkg-up": "^2.0.0",
+        "resolve": "^1.17.0",
         "tsconfig-paths": "^3.9.0"
       },
       "engines": {
@@ -11896,50 +13092,23 @@
         "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
     "node_modules/eslint-plugin-import/node_modules/doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
+      "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
       "dev": true,
       "dependencies": {
-        "esutils": "^2.0.2"
+        "esutils": "^2.0.2",
+        "isarray": "^1.0.0"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node_modules/eslint-plugin-import/node_modules/resolve": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
-      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
-      "dev": true,
-      "dependencies": {
-        "is-core-module": "^2.2.0",
-        "path-parse": "^1.0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/eslint-plugin-jest": {
-      "version": "24.4.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.4.0.tgz",
-      "integrity": "sha512-8qnt/hgtZ94E9dA6viqfViKBfkJwFHXgJmTWlMGDgunw1XJEGqm3eiPjDsTanM3/u/3Az82nyQM9GX7PM/QGmg==",
+      "version": "24.3.6",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.3.6.tgz",
+      "integrity": "sha512-WOVH4TIaBLIeCX576rLcOgjNXqP+jNlCiEmRgFTfQtJ52DpwnIQKAVGlGPAN7CZ33bW6eNfHD6s8ZbEUTQubJg==",
       "dev": true,
       "dependencies": {
         "@typescript-eslint/experimental-utils": "^4.0.1"
@@ -11958,9 +13127,9 @@
       }
     },
     "node_modules/eslint-plugin-jsdoc": {
-      "version": "32.3.4",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-32.3.4.tgz",
-      "integrity": "sha512-xSWfsYvffXnN0OkwLnB7MoDDDDjqcp46W7YlY1j7JyfAQBQ+WnGCfLov3gVNZjUGtK9Otj8mEhTZTqJu4QtIGA==",
+      "version": "32.3.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-32.3.3.tgz",
+      "integrity": "sha512-WxXohbMYlZvCt3r7MepwT++nTLsO4CPegWcm5toM4IGq3MBmYkG+Uf5yDa+n1MwPXLg+KbJqAsI19hmkVD7MPg==",
       "dev": true,
       "dependencies": {
         "comment-parser": "1.1.5",
@@ -11978,6 +13147,35 @@
         "eslint": "^6.0.0 || ^7.0.0"
       }
     },
+    "node_modules/eslint-plugin-jsdoc/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-plugin-jsdoc/node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
+    },
+    "node_modules/eslint-plugin-jsdoc/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
     "node_modules/eslint-plugin-jsdoc/node_modules/semver": {
       "version": "7.3.5",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
@@ -12015,16 +13213,16 @@
       }
     },
     "node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
       "dev": true,
       "dependencies": {
-        "esrecurse": "^4.3.0",
+        "esrecurse": "^4.1.0",
         "estraverse": "^4.1.1"
       },
       "engines": {
-        "node": ">=8.0.0"
+        "node": ">=4.0.0"
       }
     },
     "node_modules/eslint-utils": {
@@ -12052,9 +13250,9 @@
       }
     },
     "node_modules/eslint-visitor-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz",
+      "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==",
       "dev": true,
       "engines": {
         "node": ">=10"
@@ -12069,41 +13267,19 @@
         "@babel/highlight": "^7.10.4"
       }
     },
-    "node_modules/eslint/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+    "node_modules/eslint/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
       "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/eslint/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/eslint/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -12116,34 +13292,40 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/eslint/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/eslint/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "ms": "2.1.2"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
-    "node_modules/eslint/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+    "node_modules/eslint/node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
       "dev": true,
-      "engines": {
-        "node": ">=10"
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "engines": {
+        "node": ">=8.0.0"
       }
     },
     "node_modules/eslint/node_modules/globals": {
-      "version": "13.10.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.10.0.tgz",
-      "integrity": "sha512-piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g==",
+      "version": "13.8.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.8.0.tgz",
+      "integrity": "sha512-rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -12155,15 +13337,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/eslint/node_modules/ignore": {
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
@@ -12173,24 +13346,42 @@
         "node": ">= 4"
       }
     },
-    "node_modules/eslint/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+    "node_modules/eslint/node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "dev": true
     },
-    "node_modules/eslint/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/eslint/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/eslint/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "ansi-regex": "^5.0.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
+    "node_modules/eslint/node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/eslint/node_modules/type-fest": {
       "version": "0.20.2",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
@@ -12217,6 +13408,18 @@
         "node": "^10.12.0 || >=12.0.0"
       }
     },
+    "node_modules/espree/node_modules/acorn": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/espree/node_modules/eslint-visitor-keys": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
@@ -12314,18 +13517,18 @@
       "dev": true
     },
     "node_modules/events": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.2.0.tgz",
+      "integrity": "sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==",
       "dev": true,
       "engines": {
         "node": ">=0.8.x"
       }
     },
     "node_modules/eventsource": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.1.0.tgz",
-      "integrity": "sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz",
+      "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
       "dev": true,
       "dependencies": {
         "original": "^1.0.0"
@@ -12345,15 +13548,15 @@
       }
     },
     "node_modules/exec-sh": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.6.tgz",
-      "integrity": "sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==",
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz",
+      "integrity": "sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==",
       "dev": true
     },
     "node_modules/execa": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
-      "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-4.0.3.tgz",
+      "integrity": "sha512-WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A==",
       "dependencies": {
         "cross-spawn": "^7.0.0",
         "get-stream": "^5.0.0",
@@ -12399,15 +13602,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/expand-brackets/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
     "node_modules/expand-brackets/node_modules/define-property": {
       "version": "0.2.5",
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
@@ -12432,83 +13626,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/expand-brackets/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
     "node_modules/expand-template": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
@@ -12531,49 +13648,22 @@
       }
     },
     "node_modules/expect": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-26.6.2.tgz",
-      "integrity": "sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-26.5.2.tgz",
+      "integrity": "sha512-ccTGrXZd8DZCcvCz4htGXTkd/LOoy6OEtiDS38x3/VVf6E4AQL0QoeksBiw7BtGR5xDNiRYPB8GN6pfbuTOi7w==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^26.6.2",
+        "@jest/types": "^26.5.2",
         "ansi-styles": "^4.0.0",
         "jest-get-type": "^26.3.0",
-        "jest-matcher-utils": "^26.6.2",
-        "jest-message-util": "^26.6.2",
+        "jest-matcher-utils": "^26.5.2",
+        "jest-message-util": "^26.5.2",
         "jest-regex-util": "^26.0.0"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/expect/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/expect/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
     "node_modules/express": {
       "version": "4.17.1",
       "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
@@ -12614,19 +13704,6 @@
         "node": ">= 0.10.0"
       }
     },
-    "node_modules/express/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/express/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
     "node_modules/ext": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz",
@@ -12637,9 +13714,9 @@
       }
     },
     "node_modules/ext/node_modules/type": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/type/-/type-2.5.0.tgz",
-      "integrity": "sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/type/-/type-2.1.0.tgz",
+      "integrity": "sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA==",
       "dev": true
     },
     "node_modules/extend": {
@@ -12648,22 +13725,26 @@
       "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
     },
     "node_modules/extend-shallow": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
-      "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
       "dev": true,
       "dependencies": {
-        "kind-of": "^1.1.0"
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/extend-shallow/node_modules/kind-of": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
-      "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
+    "node_modules/extend-shallow/node_modules/is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
       "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
       "engines": {
         "node": ">=0.10.0"
       }
@@ -12735,11 +13816,40 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/extglob/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+    "node_modules/extglob/node_modules/is-accessor-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
       "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob/node_modules/is-data-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob/node_modules/is-descriptor": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.0",
+        "is-data-descriptor": "^1.0.0",
+        "kind-of": "^6.0.2"
+      },
       "engines": {
         "node": ">=0.10.0"
       }
@@ -12753,9 +13863,9 @@
       ]
     },
     "node_modules/faker": {
-      "version": "5.5.3",
-      "resolved": "https://registry.npmjs.org/faker/-/faker-5.5.3.tgz",
-      "integrity": "sha512-wLTv2a28wjUyWkbnX7u/ABZBkUkIF2fCd73V6P2oFqEGEktDfzWx4UxrSqtPRw0xPRAcjeAOIiJWqZm3pP4u3g==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/faker/-/faker-5.1.0.tgz",
+      "integrity": "sha512-RrWKFSSA/aNLP0g3o2WW1Zez7/MnMr7xkiZmoCfAGZmdkDQZ6l2KtuXHN5XjdvpRjDl8+3vf+Rrtl06Z352+Mw==",
       "dev": true
     },
     "node_modules/fancy-log": {
@@ -12779,15 +13889,16 @@
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
     "node_modules/fast-glob": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz",
-      "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz",
+      "integrity": "sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==",
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
+        "glob-parent": "^5.1.0",
         "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
+        "micromatch": "^4.0.2",
+        "picomatch": "^2.2.1"
       },
       "engines": {
         "node": ">=8"
@@ -12810,29 +13921,29 @@
       "dev": true
     },
     "node_modules/fast-safe-stringify": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.8.tgz",
-      "integrity": "sha512-lXatBjf3WPjmWD6DpIZxkeSsCOwqI0maYMpgDlx8g4U2qi4lbjA9oH/HD2a87G+KfsUmo5WbJFmqBZlPxtptag==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz",
+      "integrity": "sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==",
       "dev": true
     },
     "node_modules/fastq": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.1.tgz",
-      "integrity": "sha512-HOnr8Mc60eNYl1gzwp6r5RoUyAn5/glBolUzP/Ez6IFVPMPirxn/9phgL6zhOtaTy7ISwPvQ+wT+hfcRZh/bzw==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz",
+      "integrity": "sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==",
       "dependencies": {
         "reusify": "^1.0.4"
       }
     },
     "node_modules/faye-websocket": {
-      "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
-      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
+      "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
       "dev": true,
       "dependencies": {
         "websocket-driver": ">=0.5.1"
       },
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">=0.4.0"
       }
     },
     "node_modules/fb-watchman": {
@@ -12860,18 +13971,14 @@
       "dev": true
     },
     "node_modules/figures": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-      "dev": true,
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
       "dependencies": {
         "escape-string-regexp": "^1.0.5"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=4"
       }
     },
     "node_modules/file-entry-cache": {
@@ -12887,13 +13994,13 @@
       }
     },
     "node_modules/file-loader": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
-      "integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.0.0.tgz",
+      "integrity": "sha512-/aMOAYEFXDdjG0wytpTL5YQLfZnnTmLNjn+AIrJ/6HVnTfDqLsVKUUwkDf4I4kgex36BvjuXEn/TX9B/1ESyqQ==",
       "dev": true,
       "dependencies": {
         "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0"
+        "schema-utils": "^2.6.5"
       },
       "engines": {
         "node": ">= 10.13.0"
@@ -12906,63 +14013,12 @@
         "webpack": "^4.0.0 || ^5.0.0"
       }
     },
-    "node_modules/file-loader/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/file-loader/node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
-    "node_modules/file-loader/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/file-loader/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
     "node_modules/file-uri-to-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-2.0.0.tgz",
-      "integrity": "sha512-hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
       "dev": true,
-      "engines": {
-        "node": ">= 6"
-      }
+      "optional": true
     },
     "node_modules/fill-range": {
       "version": "7.0.1",
@@ -12992,19 +14048,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/finalhandler/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/finalhandler/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
     "node_modules/find-cache-dir": {
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
@@ -13121,15 +14164,6 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/findup-sync/node_modules/arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/findup-sync/node_modules/braces": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
@@ -13163,28 +14197,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/findup-sync/node_modules/braces/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/findup-sync/node_modules/extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-      "dev": true,
-      "dependencies": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/findup-sync/node_modules/fill-range": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -13212,15 +14224,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/findup-sync/node_modules/fill-range/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/findup-sync/node_modules/is-number": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -13254,15 +14257,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/findup-sync/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/findup-sync/node_modules/micromatch": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -13316,27 +14310,6 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/fined/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/fined/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/flagged-respawn": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
@@ -13360,9 +14333,9 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz",
-      "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz",
+      "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==",
       "dev": true
     },
     "node_modules/flush-write-stream": {
@@ -13376,9 +14349,9 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz",
-      "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz",
+      "integrity": "sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==",
       "dev": true,
       "funding": [
         {
@@ -13388,11 +14361,6 @@
       ],
       "engines": {
         "node": ">=4.0"
-      },
-      "peerDependenciesMeta": {
-        "debug": {
-          "optional": true
-        }
       }
     },
     "node_modules/for-in": {
@@ -13447,26 +14415,13 @@
       }
     },
     "node_modules/forwarded": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
+      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
       "engines": {
         "node": ">= 0.6"
       }
     },
-    "node_modules/fraction.js": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.1.tgz",
-      "integrity": "sha512-MHOhvvxHTfRFpF1geTK9czMIZ6xclsEor2wkIGYYq+PxcQqT7vStJqjhe6S1TenZrMZzo+wlqOufBDVepUEgPg==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "type": "patreon",
-        "url": "https://www.patreon.com/infusion"
-      }
-    },
     "node_modules/fragment-cache": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
@@ -13559,9 +14514,10 @@
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
     "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
+      "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+      "deprecated": "\"Please update to latest v2.3 or v2.2\"",
       "dev": true,
       "hasInstallScript": true,
       "optional": true,
@@ -13612,7 +14568,8 @@
     "node_modules/function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
     },
     "node_modules/functional-red-black-tree": {
       "version": "1.0.1",
@@ -13678,10 +14635,16 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/genfun": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/genfun/-/genfun-5.0.0.tgz",
+      "integrity": "sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==",
+      "dev": true
+    },
     "node_modules/gensync": {
-      "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "version": "1.0.0-beta.1",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz",
+      "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
@@ -13750,6 +14713,32 @@
         "node": ">= 6"
       }
     },
+    "node_modules/get-uri/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/get-uri/node_modules/file-uri-to-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-2.0.0.tgz",
+      "integrity": "sha512-hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/get-uri/node_modules/fs-extra": {
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
@@ -13773,6 +14762,12 @@
         "graceful-fs": "^4.1.6"
       }
     },
+    "node_modules/get-uri/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
     "node_modules/get-uri/node_modules/universalify": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
@@ -13825,9 +14820,9 @@
       }
     },
     "node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
       "dependencies": {
         "is-glob": "^4.0.1"
       },
@@ -13918,15 +14913,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/glob-watcher/node_modules/arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/glob-watcher/node_modules/binary-extensions": {
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
@@ -13957,6 +14943,18 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/glob-watcher/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/glob-watcher/node_modules/chokidar": {
       "version": "2.1.8",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
@@ -13980,18 +14978,6 @@
         "fsevents": "^1.2.7"
       }
     },
-    "node_modules/glob-watcher/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/glob-watcher/node_modules/fill-range": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -14007,6 +14993,18 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/glob-watcher/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/glob-watcher/node_modules/fsevents": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
@@ -14060,15 +15058,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/glob-watcher/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/glob-watcher/node_modules/is-number": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -14081,13 +15070,13 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/glob-watcher/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+    "node_modules/glob-watcher/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "dev": true,
       "dependencies": {
-        "isobject": "^3.0.1"
+        "is-buffer": "^1.1.5"
       },
       "engines": {
         "node": ">=0.10.0"
@@ -14102,18 +15091,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/glob-watcher/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/glob-watcher/node_modules/micromatch": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -14138,40 +15115,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/glob-watcher/node_modules/micromatch/node_modules/extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-      "dev": true,
-      "dependencies": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/micromatch/node_modules/is-extendable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-      "dev": true,
-      "dependencies": {
-        "is-plain-object": "^2.0.4"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/micromatch/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/glob-watcher/node_modules/readdirp": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
@@ -14248,12 +15191,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/global-prefix/node_modules/ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-      "dev": true
-    },
     "node_modules/global-prefix/node_modules/which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -14276,9 +15213,9 @@
       }
     },
     "node_modules/globby": {
-      "version": "11.0.4",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
-      "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz",
+      "integrity": "sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==",
       "dependencies": {
         "array-union": "^2.1.0",
         "dir-glob": "^3.0.1",
@@ -14327,17 +15264,6 @@
         "node": ">=8.6"
       }
     },
-    "node_modules/got/node_modules/decompress-response": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
-      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
-      "dependencies": {
-        "mimic-response": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/got/node_modules/get-stream": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
@@ -14349,18 +15275,10 @@
         "node": ">=6"
       }
     },
-    "node_modules/got/node_modules/mimic-response": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/graceful-fs": {
-      "version": "4.2.6",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
-      "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ=="
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="
     },
     "node_modules/growly": {
       "version": "1.3.0",
@@ -14387,297 +15305,6 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/gulp-cli": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.3.0.tgz",
-      "integrity": "sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-colors": "^1.0.1",
-        "archy": "^1.0.0",
-        "array-sort": "^1.0.0",
-        "color-support": "^1.1.3",
-        "concat-stream": "^1.6.0",
-        "copy-props": "^2.0.1",
-        "fancy-log": "^1.3.2",
-        "gulplog": "^1.0.0",
-        "interpret": "^1.4.0",
-        "isobject": "^3.0.1",
-        "liftoff": "^3.1.0",
-        "matchdep": "^2.0.0",
-        "mute-stdout": "^1.0.0",
-        "pretty-hrtime": "^1.0.0",
-        "replace-homedir": "^1.0.0",
-        "semver-greatest-satisfied-range": "^1.1.0",
-        "v8flags": "^3.2.0",
-        "yargs": "^7.1.0"
-      },
-      "bin": {
-        "gulp": "bin/gulp.js"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/ansi-colors": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-wrap": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/camelcase": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/cliui": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wrap-ansi": "^2.0.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/find-up": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-      "dev": true,
-      "dependencies": {
-        "path-exists": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/get-caller-file": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
-      "dev": true
-    },
-    "node_modules/gulp-cli/node_modules/is-fullwidth-code-point": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-      "dev": true,
-      "dependencies": {
-        "number-is-nan": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/load-json-file": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "strip-bom": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/parse-json": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-      "dev": true,
-      "dependencies": {
-        "error-ex": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/path-exists": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-      "dev": true,
-      "dependencies": {
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/path-type": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/read-pkg": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-      "dev": true,
-      "dependencies": {
-        "load-json-file": "^1.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/read-pkg-up": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^1.0.0",
-        "read-pkg": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/string-width": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-      "dev": true,
-      "dependencies": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
-        "strip-ansi": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/strip-bom": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-      "dev": true,
-      "dependencies": {
-        "is-utf8": "^0.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/wrap-ansi": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/y18n": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
-      "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==",
-      "dev": true
-    },
-    "node_modules/gulp-cli/node_modules/yargs": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.2.tgz",
-      "integrity": "sha512-ZEjj/dQYQy0Zx0lgLMLR8QuaqTihnxirir7EwUHp1Axq4e3+k8jXU5K0VLbNvedv1f4EWtBonDIZm0NUr+jCcA==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^3.0.0",
-        "cliui": "^3.2.0",
-        "decamelize": "^1.1.1",
-        "get-caller-file": "^1.0.1",
-        "os-locale": "^1.4.0",
-        "read-pkg-up": "^1.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^1.0.1",
-        "set-blocking": "^2.0.0",
-        "string-width": "^1.0.2",
-        "which-module": "^1.0.0",
-        "y18n": "^3.2.1",
-        "yargs-parser": "^5.0.1"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/yargs-parser": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.1.tgz",
-      "integrity": "sha512-wpav5XYiddjXxirPoCTUPbqM0PXvJ9hiBMvuJgInvo4/lAOTZzUprArw17q2O1P2+GHhbBr18/iQwjL5Z9BqfA==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^3.0.0",
-        "object.assign": "^4.1.0"
-      }
-    },
     "node_modules/gulp-clip-empty-files": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/gulp-clip-empty-files/-/gulp-clip-empty-files-0.1.2.tgz",
@@ -14743,37 +15370,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/gulp-htmlmin/node_modules/arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-htmlmin/node_modules/arr-union": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-htmlmin/node_modules/extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-      "dev": true,
-      "dependencies": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/gulp-htmlmin/node_modules/plugin-error": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
@@ -14860,6 +15456,309 @@
         "node": ">=0.4"
       }
     },
+    "node_modules/gulp/node_modules/ansi-colors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-wrap": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/camelcase": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/cliui": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wrap-ansi": "^2.0.0"
+      }
+    },
+    "node_modules/gulp/node_modules/find-up": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+      "dev": true,
+      "dependencies": {
+        "path-exists": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/get-caller-file": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
+      "dev": true
+    },
+    "node_modules/gulp/node_modules/gulp-cli": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.3.0.tgz",
+      "integrity": "sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "^1.0.1",
+        "archy": "^1.0.0",
+        "array-sort": "^1.0.0",
+        "color-support": "^1.1.3",
+        "concat-stream": "^1.6.0",
+        "copy-props": "^2.0.1",
+        "fancy-log": "^1.3.2",
+        "gulplog": "^1.0.0",
+        "interpret": "^1.4.0",
+        "isobject": "^3.0.1",
+        "liftoff": "^3.1.0",
+        "matchdep": "^2.0.0",
+        "mute-stdout": "^1.0.0",
+        "pretty-hrtime": "^1.0.0",
+        "replace-homedir": "^1.0.0",
+        "semver-greatest-satisfied-range": "^1.1.0",
+        "v8flags": "^3.2.0",
+        "yargs": "^7.1.0"
+      },
+      "bin": {
+        "gulp": "bin/gulp.js"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/gulp/node_modules/is-fullwidth-code-point": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+      "dev": true,
+      "dependencies": {
+        "number-is-nan": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/load-json-file": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0",
+        "strip-bom": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/parse-json": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+      "dev": true,
+      "dependencies": {
+        "error-ex": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/path-exists": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+      "dev": true,
+      "dependencies": {
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/path-type": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/read-pkg": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+      "dev": true,
+      "dependencies": {
+        "load-json-file": "^1.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/read-pkg-up": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^1.0.0",
+        "read-pkg": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/require-main-filename": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
+      "dev": true
+    },
+    "node_modules/gulp/node_modules/string-width": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+      "dev": true,
+      "dependencies": {
+        "code-point-at": "^1.0.0",
+        "is-fullwidth-code-point": "^1.0.0",
+        "strip-ansi": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/strip-bom": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+      "dev": true,
+      "dependencies": {
+        "is-utf8": "^0.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/which-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
+      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
+      "dev": true
+    },
+    "node_modules/gulp/node_modules/wrap-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/y18n": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+      "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+      "dev": true
+    },
+    "node_modules/gulp/node_modules/yargs": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.1.tgz",
+      "integrity": "sha512-huO4Fr1f9PmiJJdll5kwoS2e4GqzGSsMT3PPMpOwoVkOK8ckqAewMTZyA6LXVQWflleb/Z8oPBEvNsMft0XE+g==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^3.0.0",
+        "cliui": "^3.2.0",
+        "decamelize": "^1.1.1",
+        "get-caller-file": "^1.0.1",
+        "os-locale": "^1.4.0",
+        "read-pkg-up": "^1.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^1.0.1",
+        "set-blocking": "^2.0.0",
+        "string-width": "^1.0.2",
+        "which-module": "^1.0.0",
+        "y18n": "^3.2.1",
+        "yargs-parser": "5.0.0-security.0"
+      }
+    },
+    "node_modules/gulp/node_modules/yargs-parser": {
+      "version": "5.0.0-security.0",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0-security.0.tgz",
+      "integrity": "sha512-T69y4Ps64LNesYxeYGYPvfoMTt/7y1XtfpIslUeK4um+9Hu7hlGoRtaDLvdXb7+/tfq4opVa2HRY5xGip022rQ==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^3.0.0",
+        "object.assign": "^4.1.0"
+      }
+    },
     "node_modules/gulplog": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
@@ -14899,30 +15798,11 @@
         "node": ">=6"
       }
     },
-    "node_modules/har-validator/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/har-validator/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-    },
     "node_modules/has": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
       "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
       "dependencies": {
         "function-bind": "^1.1.1"
       },
@@ -14940,17 +15820,17 @@
       }
     },
     "node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/has-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
+      "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
       "dev": true,
       "engines": {
         "node": ">= 0.4"
@@ -15141,9 +16021,9 @@
       }
     },
     "node_modules/hosted-git-info": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.8.tgz",
-      "integrity": "sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.5.tgz",
+      "integrity": "sha512-i4dpK6xj9BIpVOTboXIlKG9+8HMKggcrMX7WA24xZtKwX0TPelq/rbaS5rCKeNX8sJXZJGdSxpnEGtta+wismQ==",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -15175,6 +16055,12 @@
       "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg=",
       "dev": true
     },
+    "node_modules/html-comment-regex": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz",
+      "integrity": "sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==",
+      "dev": true
+    },
     "node_modules/html-encoding-sniffer": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
@@ -15188,9 +16074,9 @@
       }
     },
     "node_modules/html-entities": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.4.0.tgz",
-      "integrity": "sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.3.1.tgz",
+      "integrity": "sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==",
       "dev": true
     },
     "node_modules/html-escaper": {
@@ -15220,6 +16106,12 @@
         "node": ">=4"
       }
     },
+    "node_modules/html-minifier/node_modules/commander": {
+      "version": "2.17.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
+      "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
+      "dev": true
+    },
     "node_modules/htmlparser2": {
       "version": "3.10.1",
       "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
@@ -15234,6 +16126,12 @@
         "readable-stream": "^3.1.1"
       }
     },
+    "node_modules/htmlparser2/node_modules/entities": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
+      "dev": true
+    },
     "node_modules/htmlparser2/node_modules/readable-stream": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
@@ -15279,12 +16177,6 @@
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
       "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
-    "node_modules/http-parser-js": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz",
-      "integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==",
-      "dev": true
-    },
     "node_modules/http-proxy": {
       "version": "1.18.1",
       "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
@@ -15300,16 +16192,25 @@
       }
     },
     "node_modules/http-proxy-agent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
-      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz",
+      "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==",
+      "dev": true,
       "dependencies": {
-        "@tootallnate/once": "1",
-        "agent-base": "6",
-        "debug": "4"
+        "agent-base": "4",
+        "debug": "3.1.0"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">= 4.5.0"
+      }
+    },
+    "node_modules/http-proxy-agent/node_modules/debug": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
       }
     },
     "node_modules/http-proxy-middleware": {
@@ -15327,15 +16228,6 @@
         "node": ">=4.0.0"
       }
     },
-    "node_modules/http-proxy-middleware/node_modules/arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/http-proxy-middleware/node_modules/braces": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
@@ -15369,28 +16261,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/http-proxy-middleware/node_modules/braces/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/http-proxy-middleware/node_modules/extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-      "dev": true,
-      "dependencies": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/http-proxy-middleware/node_modules/fill-range": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -15418,15 +16288,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/http-proxy-middleware/node_modules/fill-range/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/http-proxy-middleware/node_modules/is-number": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -15460,15 +16321,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/http-proxy-middleware/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/http-proxy-middleware/node_modules/micromatch": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -15527,17 +16379,34 @@
       "dev": true
     },
     "node_modules/https-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
+      "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
+      "dev": true,
       "dependencies": {
-        "agent-base": "6",
-        "debug": "4"
+        "agent-base": "^4.3.0",
+        "debug": "^3.1.0"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">= 4.5.0"
       }
     },
+    "node_modules/https-proxy-agent/node_modules/debug": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/https-proxy-agent/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
     "node_modules/human-signals": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
@@ -15566,36 +16435,22 @@
       }
     },
     "node_modules/icss-utils": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
-      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz",
+      "integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==",
       "dev": true,
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
+      "dependencies": {
+        "postcss": "^7.0.14"
       },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
+      "engines": {
+        "node": ">= 6"
       }
     },
     "node_modules/ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "devOptional": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
+      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
+      "devOptional": true
     },
     "node_modules/iferr": {
       "version": "0.1.5",
@@ -15612,9 +16467,9 @@
       }
     },
     "node_modules/ignore-walk": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.4.tgz",
-      "integrity": "sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz",
+      "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==",
       "dependencies": {
         "minimatch": "^3.0.4"
       }
@@ -15637,19 +16492,49 @@
       "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
       "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps="
     },
+    "node_modules/import-cwd": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
+      "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
+      "dev": true,
+      "dependencies": {
+        "import-from": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
+      "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
       "dependencies": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
       },
       "engines": {
         "node": ">=6"
+      }
+    },
+    "node_modules/import-from": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
+      "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
+      "dev": true,
+      "dependencies": {
+        "resolve-from": "^3.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/import-from/node_modules/resolve-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
       }
     },
     "node_modules/import-lazy": {
@@ -15661,92 +16546,19 @@
       }
     },
     "node_modules/import-local": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
-      "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
+      "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
       "dev": true,
       "dependencies": {
-        "pkg-dir": "^4.2.0",
-        "resolve-cwd": "^3.0.0"
+        "pkg-dir": "^3.0.0",
+        "resolve-cwd": "^2.0.0"
       },
       "bin": {
         "import-local-fixture": "fixtures/cli.js"
       },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/import-local/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/import-local/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/import-local/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
       "engines": {
         "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/import-local/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/import-local/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/import-local/node_modules/pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
       }
     },
     "node_modules/imurmurhash": {
@@ -15765,6 +16577,12 @@
         "node": ">=8"
       }
     },
+    "node_modules/indexes-of": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
+      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
+      "dev": true
+    },
     "node_modules/infer-owner": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
@@ -15785,12 +16603,12 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "node_modules/ini": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz",
-      "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==",
-      "dev": true,
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+      "deprecated": "Please update to ini >=1.3.6 to avoid a prototype pollution issue",
       "engines": {
-        "node": ">=10"
+        "node": "*"
       }
     },
     "node_modules/init-package-json": {
@@ -15833,217 +16651,6 @@
       }
     },
     "node_modules/inquirer": {
-      "version": "7.3.3",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz",
-      "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^3.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^3.0.0",
-        "lodash": "^4.17.19",
-        "mute-stream": "0.0.8",
-        "run-async": "^2.4.0",
-        "rxjs": "^6.6.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "through": "^2.3.6"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/inquirer/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/inquirer/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/inquirer/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/inquirer/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/inquirer/node_modules/rxjs": {
-      "version": "6.6.7",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^1.9.0"
-      },
-      "engines": {
-        "npm": ">=2.0.0"
-      }
-    },
-    "node_modules/inquirer/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/inquirer/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
-    },
-    "node_modules/insight": {
-      "version": "0.10.3",
-      "resolved": "https://registry.npmjs.org/insight/-/insight-0.10.3.tgz",
-      "integrity": "sha512-YOncxSN6Omh+1Oqxt+OJAvJVMDKw7l6IEG0wT2cTMGxjsTcroOGW4IR926QDzxg/uZHcFZ2cZbckDWdZhc2pZw==",
-      "dependencies": {
-        "async": "^2.6.2",
-        "chalk": "^2.4.2",
-        "conf": "^1.4.0",
-        "inquirer": "^6.3.1",
-        "lodash.debounce": "^4.0.8",
-        "os-name": "^3.1.0",
-        "request": "^2.88.0",
-        "tough-cookie": "^3.0.1",
-        "uuid": "^3.3.2"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/insight/node_modules/ansi-escapes": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
-      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/insight/node_modules/ansi-regex": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/insight/node_modules/cli-cursor": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
-      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
-      "dependencies": {
-        "restore-cursor": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/insight/node_modules/cli-width": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
-      "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw=="
-    },
-    "node_modules/insight/node_modules/cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-      "dependencies": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      },
-      "engines": {
-        "node": ">=4.8"
-      }
-    },
-    "node_modules/insight/node_modules/execa": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-      "dependencies": {
-        "cross-spawn": "^6.0.0",
-        "get-stream": "^4.0.0",
-        "is-stream": "^1.1.0",
-        "npm-run-path": "^2.0.0",
-        "p-finally": "^1.0.0",
-        "signal-exit": "^3.0.0",
-        "strip-eof": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/insight/node_modules/figures": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
-      "dependencies": {
-        "escape-string-regexp": "^1.0.5"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/insight/node_modules/get-stream": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/insight/node_modules/inquirer": {
       "version": "6.5.2",
       "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz",
       "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==",
@@ -16066,192 +16673,142 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/insight/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+    "node_modules/inquirer/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/insight/node_modules/is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/insight/node_modules/mimic-fn": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+    "node_modules/inquirer/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/insight/node_modules/mute-stream": {
+    "node_modules/inquirer/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/inquirer/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+    },
+    "node_modules/inquirer/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/inquirer/node_modules/mute-stream": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
       "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
     },
-    "node_modules/insight/node_modules/npm-run-path": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+    "node_modules/inquirer/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "dependencies": {
-        "path-key": "^2.0.0"
+        "has-flag": "^3.0.0"
       },
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/insight/node_modules/onetime": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+    "node_modules/insight": {
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/insight/-/insight-0.10.3.tgz",
+      "integrity": "sha512-YOncxSN6Omh+1Oqxt+OJAvJVMDKw7l6IEG0wT2cTMGxjsTcroOGW4IR926QDzxg/uZHcFZ2cZbckDWdZhc2pZw==",
       "dependencies": {
-        "mimic-fn": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/insight/node_modules/os-name": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/os-name/-/os-name-3.1.0.tgz",
-      "integrity": "sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==",
-      "dependencies": {
-        "macos-release": "^2.2.0",
-        "windows-release": "^3.1.0"
+        "async": "^2.6.2",
+        "chalk": "^2.4.2",
+        "conf": "^1.4.0",
+        "inquirer": "^6.3.1",
+        "lodash.debounce": "^4.0.8",
+        "os-name": "^3.1.0",
+        "request": "^2.88.0",
+        "tough-cookie": "^3.0.1",
+        "uuid": "^3.3.2"
       },
       "engines": {
         "node": ">=6"
       }
     },
-    "node_modules/insight/node_modules/path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/insight/node_modules/restore-cursor": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
-      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+    "node_modules/insight/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dependencies": {
-        "onetime": "^2.0.0",
-        "signal-exit": "^3.0.2"
+        "color-convert": "^1.9.0"
       },
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/insight/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/insight/node_modules/shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+    "node_modules/insight/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
       "dependencies": {
-        "shebang-regex": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/insight/node_modules/shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/insight/node_modules/string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-      "dependencies": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
       },
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/insight/node_modules/string-width/node_modules/ansi-regex": {
+    "node_modules/insight/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/insight/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+    },
+    "node_modules/insight/node_modules/has-flag": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/insight/node_modules/string-width/node_modules/strip-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+    "node_modules/insight/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "dependencies": {
-        "ansi-regex": "^3.0.0"
+        "has-flag": "^3.0.0"
       },
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/insight/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/insight/node_modules/uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
-      "bin": {
-        "uuid": "bin/uuid"
-      }
-    },
-    "node_modules/insight/node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
-    "node_modules/insight/node_modules/windows-release": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-3.3.3.tgz",
-      "integrity": "sha512-OSOGH1QYiW5yVor9TtmXKQvt2vjQqbYS+DqmsZw+r7xDwLXEeT3JGW0ZppFmHx4diyXmxt238KFR3N9jzevBRg==",
-      "dependencies": {
-        "execa": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/install": {
       "version": "0.8.9",
       "resolved": "https://registry.npmjs.org/install/-/install-0.8.9.tgz",
@@ -16273,20 +16830,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/internal-slot": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.0",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
     "node_modules/interpret": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
@@ -16296,6 +16839,15 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/invariant": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
+      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+      "dev": true,
+      "dependencies": {
+        "loose-envify": "^1.0.0"
+      }
+    },
     "node_modules/invert-kv": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
@@ -16306,9 +16858,9 @@
       }
     },
     "node_modules/ionicons": {
-      "version": "5.5.3",
-      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz",
-      "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==",
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.1.tgz",
+      "integrity": "sha512-1auVisfaXmkmxINer8Q3kJGHP1vSxk86hf7By95eJ+Av9+oBcNuAEBfSe3jaMaGRVxVw8U/2j23MFq7R3c0HPg==",
       "dependencies": {
         "@stencil/core": "^2.5.0"
       }
@@ -16384,48 +16936,45 @@
       }
     },
     "node_modules/is-absolute-url": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz",
-      "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
+      "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/is-accessor-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
       "dev": true,
       "dependencies": {
-        "kind-of": "^6.0.0"
+        "kind-of": "^3.0.2"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/is-arguments": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.0.tgz",
-      "integrity": "sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
+      "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==",
       "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.0"
-      },
       "engines": {
         "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/is-arrayish": {
@@ -16435,9 +16984,9 @@
       "dev": true
     },
     "node_modules/is-bigint": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.2.tgz",
-      "integrity": "sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.1.tgz",
+      "integrity": "sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg==",
       "dev": true,
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -16456,12 +17005,12 @@
       }
     },
     "node_modules/is-boolean-object": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.1.tgz",
-      "integrity": "sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.0.tgz",
+      "integrity": "sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2"
+        "call-bind": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -16477,9 +17026,9 @@
       "dev": true
     },
     "node_modules/is-callable": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
-      "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz",
+      "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==",
       "dev": true,
       "engines": {
         "node": ">= 0.4"
@@ -16513,51 +17062,34 @@
         "rgba-regex": "^1.0.0"
       }
     },
-    "node_modules/is-color-stop/node_modules/css-color-names": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
-      "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/is-core-module": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.5.0.tgz",
-      "integrity": "sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg==",
-      "dependencies": {
-        "has": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/is-data-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
       "dev": true,
       "dependencies": {
-        "kind-of": "^6.0.0"
+        "kind-of": "^3.0.2"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/is-date-object": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.4.tgz",
-      "integrity": "sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
+      "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==",
       "dev": true,
       "engines": {
         "node": ">= 0.4"
@@ -16567,32 +17099,41 @@
       }
     },
     "node_modules/is-descriptor": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
       "dev": true,
       "dependencies": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/is-descriptor/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-directory": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
+      "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/is-docker": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz",
+      "integrity": "sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==",
       "bin": {
         "is-docker": "cli.js"
       },
@@ -16604,33 +17145,9 @@
       }
     },
     "node_modules/is-extendable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-      "dev": true,
-      "dependencies": {
-        "is-plain-object": "^2.0.4"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-extendable/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-extendable/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -16645,11 +17162,11 @@
       }
     },
     "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
     "node_modules/is-generator-fn": {
@@ -16711,15 +17228,12 @@
       }
     },
     "node_modules/is-negative-zero": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
-      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz",
+      "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=",
       "dev": true,
       "engines": {
         "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/is-npm": {
@@ -16739,9 +17253,9 @@
       }
     },
     "node_modules/is-number-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.5.tgz",
-      "integrity": "sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.4.tgz",
+      "integrity": "sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==",
       "dev": true,
       "engines": {
         "node": ">= 0.4"
@@ -16792,36 +17306,56 @@
       }
     },
     "node_modules/is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz",
+      "integrity": "sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==",
       "engines": {
         "node": ">=8"
       }
     },
+    "node_modules/is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/is-plain-object": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
-      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-plain-object/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/is-potential-custom-element-name": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
-      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz",
+      "integrity": "sha1-DFLlS8yjkbssSUsh6GJtczbG45c=",
       "dev": true
     },
     "node_modules/is-regex": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz",
-      "integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
+      "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-symbols": "^1.0.2"
+        "has-symbols": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -16849,20 +17383,17 @@
       "dev": true
     },
     "node_modules/is-stream": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
+      "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/is-string": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.6.tgz",
-      "integrity": "sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz",
+      "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==",
       "dev": true,
       "engines": {
         "node": ">= 0.4"
@@ -16871,13 +17402,25 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+    "node_modules/is-svg": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz",
+      "integrity": "sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==",
       "dev": true,
       "dependencies": {
-        "has-symbols": "^1.0.2"
+        "html-comment-regex": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/is-symbol": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
+      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -16903,18 +17446,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-unicode-supported": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/is-utf8": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
@@ -16930,12 +17461,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-what": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz",
-      "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==",
-      "dev": true
-    },
     "node_modules/is-windows": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
@@ -17031,27 +17556,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/istanbul-lib-report/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-report/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/istanbul-lib-source-maps": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz",
@@ -17066,6 +17570,30 @@
         "node": ">=8"
       }
     },
+    "node_modules/istanbul-lib-source-maps/node_modules/debug": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+      "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/istanbul-lib-source-maps/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
     "node_modules/istanbul-lib-source-maps/node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -17089,14 +17617,14 @@
       }
     },
     "node_modules/jest": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-26.6.3.tgz",
-      "integrity": "sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-26.5.2.tgz",
+      "integrity": "sha512-4HFabJVwsgDwul/7rhXJ3yFAF/aUkVIXiJWmgFxb+WMdZG39fVvOwYAs8/3r4AlFPc4m/n5sTMtuMbOL3kNtrQ==",
       "dev": true,
       "dependencies": {
-        "@jest/core": "^26.6.3",
+        "@jest/core": "^26.5.2",
         "import-local": "^3.0.2",
-        "jest-cli": "^26.6.3"
+        "jest-cli": "^26.5.2"
       },
       "bin": {
         "jest": "bin/jest.js"
@@ -17106,12 +17634,12 @@
       }
     },
     "node_modules/jest-changed-files": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.6.2.tgz",
-      "integrity": "sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.5.2.tgz",
+      "integrity": "sha512-qSmssmiIdvM5BWVtyK/nqVpN3spR5YyvkvPqz1x3BR1bwIxsWmU/MGwLoCrPNLbkG2ASAKfvmJpOduEApBPh2w==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^26.6.2",
+        "@jest/types": "^26.5.2",
         "execa": "^4.0.0",
         "throat": "^5.0.0"
       },
@@ -17119,360 +17647,39 @@
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-cli": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.6.3.tgz",
-      "integrity": "sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg==",
-      "dev": true,
-      "dependencies": {
-        "@jest/core": "^26.6.3",
-        "@jest/test-result": "^26.6.2",
-        "@jest/types": "^26.6.2",
-        "chalk": "^4.0.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.4",
-        "import-local": "^3.0.2",
-        "is-ci": "^2.0.0",
-        "jest-config": "^26.6.3",
-        "jest-util": "^26.6.2",
-        "jest-validate": "^26.6.2",
-        "prompts": "^2.0.1",
-        "yargs": "^15.4.1"
-      },
-      "bin": {
-        "jest": "bin/jest.js"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-cli/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-cli/node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/jest-cli/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-cli/node_modules/cliui": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^6.2.0"
-      }
-    },
-    "node_modules/jest-cli/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-cli/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-cli/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-cli/node_modules/jest-config": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",
-      "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
+    "node_modules/jest-config": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.5.2.tgz",
+      "integrity": "sha512-dqJOnSegNdE5yDiuGHsjTM5gec7Z4AcAMHiW+YscbOYJAlb3LEtDSobXCq0or9EmGQI5SFmKy4T7P1FxetJOfg==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.1.0",
-        "@jest/test-sequencer": "^26.6.3",
-        "@jest/types": "^26.6.2",
-        "babel-jest": "^26.6.3",
+        "@jest/test-sequencer": "^26.5.2",
+        "@jest/types": "^26.5.2",
+        "babel-jest": "^26.5.2",
         "chalk": "^4.0.0",
         "deepmerge": "^4.2.2",
         "glob": "^7.1.1",
         "graceful-fs": "^4.2.4",
-        "jest-environment-jsdom": "^26.6.2",
-        "jest-environment-node": "^26.6.2",
+        "jest-environment-jsdom": "^26.5.2",
+        "jest-environment-node": "^26.5.2",
         "jest-get-type": "^26.3.0",
-        "jest-jasmine2": "^26.6.3",
+        "jest-jasmine2": "^26.5.2",
         "jest-regex-util": "^26.0.0",
-        "jest-resolve": "^26.6.2",
-        "jest-util": "^26.6.2",
-        "jest-validate": "^26.6.2",
+        "jest-resolve": "^26.5.2",
+        "jest-util": "^26.5.2",
+        "jest-validate": "^26.5.2",
         "micromatch": "^4.0.2",
-        "pretty-format": "^26.6.2"
+        "pretty-format": "^26.5.2"
       },
       "engines": {
         "node": ">= 10.14.2"
-      },
-      "peerDependencies": {
-        "ts-node": ">=9.0.0"
-      },
-      "peerDependenciesMeta": {
-        "ts-node": {
-          "optional": true
-        }
       }
     },
-    "node_modules/jest-cli/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-cli/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/jest-cli/node_modules/p-locate": {
+    "node_modules/jest-config/node_modules/chalk": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-cli/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-cli/node_modules/require-main-filename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-      "dev": true
-    },
-    "node_modules/jest-cli/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-cli/node_modules/ts-node": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.1.0.tgz",
-      "integrity": "sha512-6szn3+J9WyG2hE+5W8e0ruZrzyk1uFLYye6IGMBadnOzDh8aP7t8CbFpsfCiEx2+wMixAhjFt7lOZC4+l+WbEA==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@tsconfig/node10": "^1.0.7",
-        "@tsconfig/node12": "^1.0.7",
-        "@tsconfig/node14": "^1.0.0",
-        "@tsconfig/node16": "^1.0.1",
-        "arg": "^4.1.0",
-        "create-require": "^1.1.0",
-        "diff": "^4.0.1",
-        "make-error": "^1.1.1",
-        "source-map-support": "^0.5.17",
-        "yn": "3.1.1"
-      },
-      "bin": {
-        "ts-node": "dist/bin.js",
-        "ts-node-cwd": "dist/bin-cwd.js",
-        "ts-node-script": "dist/bin-script.js",
-        "ts-node-transpile-only": "dist/bin-transpile.js",
-        "ts-script": "dist/bin-script-deprecated.js"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "@swc/core": ">=1.2.50",
-        "@swc/wasm": ">=1.2.50",
-        "@types/node": "*",
-        "typescript": ">=2.7"
-      },
-      "peerDependenciesMeta": {
-        "@swc/core": {
-          "optional": true
-        },
-        "@swc/wasm": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jest-cli/node_modules/which-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-      "dev": true
-    },
-    "node_modules/jest-cli/node_modules/wrap-ansi": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-cli/node_modules/y18n": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
-      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
-      "dev": true
-    },
-    "node_modules/jest-cli/node_modules/yargs": {
-      "version": "15.4.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
-      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
-      "dev": true,
-      "dependencies": {
-        "cliui": "^6.0.0",
-        "decamelize": "^1.2.0",
-        "find-up": "^4.1.0",
-        "get-caller-file": "^2.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^4.2.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^18.1.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-cli/node_modules/yargs-parser": {
-      "version": "18.1.3",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/jest-diff": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz",
-      "integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "diff-sequences": "^26.6.2",
-        "jest-get-type": "^26.3.0",
-        "pretty-format": "^26.6.2"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-diff/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-diff/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -17485,37 +17692,35 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-diff/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/jest-diff": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.5.2.tgz",
+      "integrity": "sha512-HCSWDUGwsov5oTlGzrRM+UPJI/Dpqi9jzeV0fdRNi3Ch5bnoXhnyJMmVg2juv9081zLIy3HGPI5mcuGgXM2xRA==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "chalk": "^4.0.0",
+        "diff-sequences": "^26.5.0",
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.5.2"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-diff/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-diff/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/jest-diff/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
     "node_modules/jest-docblock": {
@@ -17531,40 +17736,25 @@
       }
     },
     "node_modules/jest-each": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.6.2.tgz",
-      "integrity": "sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.5.2.tgz",
+      "integrity": "sha512-w7D9FNe0m2D3yZ0Drj9CLkyF/mGhmBSULMQTypzAKR746xXnjUrK8GUJdlLTWUF6dd0ks3MtvGP7/xNFr9Aphg==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^26.6.2",
+        "@jest/types": "^26.5.2",
         "chalk": "^4.0.0",
         "jest-get-type": "^26.3.0",
-        "jest-util": "^26.6.2",
-        "pretty-format": "^26.6.2"
+        "jest-util": "^26.5.2",
+        "pretty-format": "^26.5.2"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-each/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/jest-each/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -17577,51 +17767,18 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-each/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-each/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-each/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-environment-jsdom": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz",
-      "integrity": "sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.5.2.tgz",
+      "integrity": "sha512-fWZPx0bluJaTQ36+PmRpvUtUlUFlGGBNyGX1SN3dLUHHMcQ4WseNEzcGGKOw4U5towXgxI4qDoI3vwR18H0RTw==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^26.6.2",
-        "@jest/fake-timers": "^26.6.2",
-        "@jest/types": "^26.6.2",
+        "@jest/environment": "^26.5.2",
+        "@jest/fake-timers": "^26.5.2",
+        "@jest/types": "^26.5.2",
         "@types/node": "*",
-        "jest-mock": "^26.6.2",
-        "jest-util": "^26.6.2",
+        "jest-mock": "^26.5.2",
+        "jest-util": "^26.5.2",
         "jsdom": "^16.4.0"
       },
       "engines": {
@@ -17629,17 +17786,17 @@
       }
     },
     "node_modules/jest-environment-node": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.6.2.tgz",
-      "integrity": "sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.5.2.tgz",
+      "integrity": "sha512-YHjnDsf/GKFCYMGF1V+6HF7jhY1fcLfLNBDjhAOvFGvt6d8vXvNdJGVM7uTZ2VO/TuIyEFhPGaXMX5j3h7fsrA==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^26.6.2",
-        "@jest/fake-timers": "^26.6.2",
-        "@jest/types": "^26.6.2",
+        "@jest/environment": "^26.5.2",
+        "@jest/fake-timers": "^26.5.2",
+        "@jest/types": "^26.5.2",
         "@types/node": "*",
-        "jest-mock": "^26.6.2",
-        "jest-util": "^26.6.2"
+        "jest-mock": "^26.5.2",
+        "jest-util": "^26.5.2"
       },
       "engines": {
         "node": ">= 10.14.2"
@@ -17655,21 +17812,21 @@
       }
     },
     "node_modules/jest-haste-map": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.6.2.tgz",
-      "integrity": "sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.5.2.tgz",
+      "integrity": "sha512-lJIAVJN3gtO3k4xy+7i2Xjtwh8CfPcH08WYjZpe9xzveDaqGw9fVNCpkYu6M525wKFVkLmyi7ku+DxCAP1lyMA==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^26.6.2",
+        "@jest/types": "^26.5.2",
         "@types/graceful-fs": "^4.1.2",
         "@types/node": "*",
         "anymatch": "^3.0.3",
         "fb-watchman": "^2.0.0",
         "graceful-fs": "^4.2.4",
         "jest-regex-util": "^26.0.0",
-        "jest-serializer": "^26.6.2",
-        "jest-util": "^26.6.2",
-        "jest-worker": "^26.6.2",
+        "jest-serializer": "^26.5.0",
+        "jest-util": "^26.5.2",
+        "jest-worker": "^26.5.0",
         "micromatch": "^4.0.2",
         "sane": "^4.0.3",
         "walker": "^1.0.7"
@@ -17681,54 +17838,53 @@
         "fsevents": "^2.1.2"
       }
     },
+    "node_modules/jest-haste-map/node_modules/jest-worker": {
+      "version": "26.5.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.5.0.tgz",
+      "integrity": "sha512-kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
     "node_modules/jest-jasmine2": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz",
-      "integrity": "sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.5.2.tgz",
+      "integrity": "sha512-2J+GYcgLVPTkpmvHEj0/IDTIAuyblGNGlyGe4fLfDT2aktEPBYvoxUwFiOmDDxxzuuEAD2uxcYXr0+1Yw4tjFA==",
       "dev": true,
       "dependencies": {
         "@babel/traverse": "^7.1.0",
-        "@jest/environment": "^26.6.2",
-        "@jest/source-map": "^26.6.2",
-        "@jest/test-result": "^26.6.2",
-        "@jest/types": "^26.6.2",
+        "@jest/environment": "^26.5.2",
+        "@jest/source-map": "^26.5.0",
+        "@jest/test-result": "^26.5.2",
+        "@jest/types": "^26.5.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "co": "^4.6.0",
-        "expect": "^26.6.2",
+        "expect": "^26.5.2",
         "is-generator-fn": "^2.0.0",
-        "jest-each": "^26.6.2",
-        "jest-matcher-utils": "^26.6.2",
-        "jest-message-util": "^26.6.2",
-        "jest-runtime": "^26.6.3",
-        "jest-snapshot": "^26.6.2",
-        "jest-util": "^26.6.2",
-        "pretty-format": "^26.6.2",
+        "jest-each": "^26.5.2",
+        "jest-matcher-utils": "^26.5.2",
+        "jest-message-util": "^26.5.2",
+        "jest-runtime": "^26.5.2",
+        "jest-snapshot": "^26.5.2",
+        "jest-util": "^26.5.2",
+        "pretty-format": "^26.5.2",
         "throat": "^5.0.0"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/jest-jasmine2/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -17741,86 +17897,38 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-jasmine2/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-jasmine2/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-leak-detector": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz",
-      "integrity": "sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.5.2.tgz",
+      "integrity": "sha512-h7ia3dLzBFItmYERaLPEtEKxy3YlcbcRSjj0XRNJgBEyODuu+3DM2o62kvIFvs3PsaYoIIv+e+nLRI61Dj1CNw==",
       "dev": true,
       "dependencies": {
         "jest-get-type": "^26.3.0",
-        "pretty-format": "^26.6.2"
+        "pretty-format": "^26.5.2"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
     "node_modules/jest-matcher-utils": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz",
-      "integrity": "sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.5.2.tgz",
+      "integrity": "sha512-W9GO9KBIC4gIArsNqDUKsLnhivaqf8MSs6ujO/JDcPIQrmY+aasewweXVET8KdrJ6ADQaUne5UzysvF/RR7JYA==",
       "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
-        "jest-diff": "^26.6.2",
+        "jest-diff": "^26.5.2",
         "jest-get-type": "^26.3.0",
-        "pretty-format": "^26.6.2"
+        "pretty-format": "^26.5.2"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-matcher-utils/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/jest-matcher-utils/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -17833,52 +17941,18 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-matcher-utils/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-matcher-utils/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-matcher-utils/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-message-util": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.6.2.tgz",
-      "integrity": "sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.5.2.tgz",
+      "integrity": "sha512-Ocp9UYZ5Jl15C5PNsoDiGEk14A4NG0zZKknpWdZGoMzJuGAkVt10e97tnEVMYpk7LnQHZOfuK2j/izLBMcuCZw==",
       "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.0.0",
-        "@jest/types": "^26.6.2",
+        "@jest/types": "^26.5.2",
         "@types/stack-utils": "^2.0.0",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.4",
         "micromatch": "^4.0.2",
-        "pretty-format": "^26.6.2",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.2"
       },
@@ -17886,25 +17960,10 @@
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-message-util/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/jest-message-util/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -17917,46 +17976,13 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-message-util/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-message-util/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-message-util/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-mock": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.6.2.tgz",
-      "integrity": "sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.5.2.tgz",
+      "integrity": "sha512-9SiU4b5PtO51v0MtJwVRqeGEroH66Bnwtq4ARdNP7jNXbpT7+ByeWNAk4NeT/uHfNSVDXEXgQo1XRuwEqS6Rdw==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^26.6.2",
+        "@jest/types": "^26.5.2",
         "@types/node": "*"
       },
       "engines": {
@@ -17981,9 +18007,9 @@
       }
     },
     "node_modules/jest-preset-angular": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/jest-preset-angular/-/jest-preset-angular-8.4.0.tgz",
-      "integrity": "sha512-lngQRVVMy2qdzhSzUVTkKFsWC+Z2uMFlJf8J5ZeapNZFsRYW2tjlVqdm+sJOTnVmMVnN7CtDqvRDwlyFTIYD+A==",
+      "version": "8.3.1",
+      "resolved": "https://registry.npmjs.org/jest-preset-angular/-/jest-preset-angular-8.3.1.tgz",
+      "integrity": "sha512-WhQm+0tXzikkvIF35XErV87DqYbieZI0R0MIGgn7VE/DDhdbXFDmYQxFZ7w4qcA0cGLLvSMTBbIsUtHeE/rFxQ==",
       "dev": true,
       "dependencies": {
         "pretty-format": "26.x",
@@ -18008,18 +18034,18 @@
       }
     },
     "node_modules/jest-resolve": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz",
-      "integrity": "sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.5.2.tgz",
+      "integrity": "sha512-XsPxojXGRA0CoDD7Vis59ucz2p3cQFU5C+19tz3tLEAlhYKkK77IL0cjYjikY9wXnOaBeEdm1rOgSJjbZWpcZg==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^26.6.2",
+        "@jest/types": "^26.5.2",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.4",
         "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^26.6.2",
+        "jest-util": "^26.5.2",
         "read-pkg-up": "^7.0.1",
-        "resolve": "^1.18.1",
+        "resolve": "^1.17.0",
         "slash": "^3.0.0"
       },
       "engines": {
@@ -18027,38 +18053,23 @@
       }
     },
     "node_modules/jest-resolve-dependencies": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz",
-      "integrity": "sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.5.2.tgz",
+      "integrity": "sha512-LLkc8LuRtxqOx0AtX/Npa2C4I23WcIrwUgNtHYXg4owYF/ZDQShcwBAHjYZIFR06+HpQcZ43+kCTMlQ3aDCYTg==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^26.6.2",
+        "@jest/types": "^26.5.2",
         "jest-regex-util": "^26.0.0",
-        "jest-snapshot": "^26.6.2"
+        "jest-snapshot": "^26.5.2"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-resolve/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/jest-resolve/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -18071,18 +18082,6 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-resolve/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
     "node_modules/jest-resolve/node_modules/find-up": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
@@ -18096,15 +18095,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-resolve/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-resolve/node_modules/locate-path": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
@@ -18144,6 +18134,24 @@
         "node": ">=8"
       }
     },
+    "node_modules/jest-resolve/node_modules/parse-json": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.1.0.tgz",
+      "integrity": "sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/jest-resolve/node_modules/path-exists": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -18194,51 +18202,30 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-resolve/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-runner": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.6.3.tgz",
-      "integrity": "sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.5.2.tgz",
+      "integrity": "sha512-GKhYxtSX5+tXZsd2QwfkDqPIj5C2HqOdXLRc2x2qYqWE26OJh17xo58/fN/mLhRkO4y6o60ZVloan7Kk5YA6hg==",
       "dev": true,
       "dependencies": {
-        "@jest/console": "^26.6.2",
-        "@jest/environment": "^26.6.2",
-        "@jest/test-result": "^26.6.2",
-        "@jest/types": "^26.6.2",
+        "@jest/console": "^26.5.2",
+        "@jest/environment": "^26.5.2",
+        "@jest/test-result": "^26.5.2",
+        "@jest/types": "^26.5.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "emittery": "^0.7.1",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.4",
-        "jest-config": "^26.6.3",
+        "jest-config": "^26.5.2",
         "jest-docblock": "^26.0.0",
-        "jest-haste-map": "^26.6.2",
-        "jest-leak-detector": "^26.6.2",
-        "jest-message-util": "^26.6.2",
-        "jest-resolve": "^26.6.2",
-        "jest-runtime": "^26.6.3",
-        "jest-util": "^26.6.2",
-        "jest-worker": "^26.6.2",
+        "jest-haste-map": "^26.5.2",
+        "jest-leak-detector": "^26.5.2",
+        "jest-message-util": "^26.5.2",
+        "jest-resolve": "^26.5.2",
+        "jest-runtime": "^26.5.2",
+        "jest-util": "^26.5.2",
+        "jest-worker": "^26.5.0",
         "source-map-support": "^0.5.6",
         "throat": "^5.0.0"
       },
@@ -18246,25 +18233,10 @@
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-runner/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/jest-runner/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -18277,150 +18249,49 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-runner/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/jest-runner/node_modules/jest-worker": {
+      "version": "26.5.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.5.0.tgz",
+      "integrity": "sha512-kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-runner/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-runner/node_modules/jest-config": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",
-      "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.1.0",
-        "@jest/test-sequencer": "^26.6.3",
-        "@jest/types": "^26.6.2",
-        "babel-jest": "^26.6.3",
-        "chalk": "^4.0.0",
-        "deepmerge": "^4.2.2",
-        "glob": "^7.1.1",
-        "graceful-fs": "^4.2.4",
-        "jest-environment-jsdom": "^26.6.2",
-        "jest-environment-node": "^26.6.2",
-        "jest-get-type": "^26.3.0",
-        "jest-jasmine2": "^26.6.3",
-        "jest-regex-util": "^26.0.0",
-        "jest-resolve": "^26.6.2",
-        "jest-util": "^26.6.2",
-        "jest-validate": "^26.6.2",
-        "micromatch": "^4.0.2",
-        "pretty-format": "^26.6.2"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      },
-      "peerDependencies": {
-        "ts-node": ">=9.0.0"
-      },
-      "peerDependenciesMeta": {
-        "ts-node": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jest-runner/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-runner/node_modules/ts-node": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.1.0.tgz",
-      "integrity": "sha512-6szn3+J9WyG2hE+5W8e0ruZrzyk1uFLYye6IGMBadnOzDh8aP7t8CbFpsfCiEx2+wMixAhjFt7lOZC4+l+WbEA==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@tsconfig/node10": "^1.0.7",
-        "@tsconfig/node12": "^1.0.7",
-        "@tsconfig/node14": "^1.0.0",
-        "@tsconfig/node16": "^1.0.1",
-        "arg": "^4.1.0",
-        "create-require": "^1.1.0",
-        "diff": "^4.0.1",
-        "make-error": "^1.1.1",
-        "source-map-support": "^0.5.17",
-        "yn": "3.1.1"
-      },
-      "bin": {
-        "ts-node": "dist/bin.js",
-        "ts-node-cwd": "dist/bin-cwd.js",
-        "ts-node-script": "dist/bin-script.js",
-        "ts-node-transpile-only": "dist/bin-transpile.js",
-        "ts-script": "dist/bin-script-deprecated.js"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "@swc/core": ">=1.2.50",
-        "@swc/wasm": ">=1.2.50",
         "@types/node": "*",
-        "typescript": ">=2.7"
+        "merge-stream": "^2.0.0",
+        "supports-color": "^7.0.0"
       },
-      "peerDependenciesMeta": {
-        "@swc/core": {
-          "optional": true
-        },
-        "@swc/wasm": {
-          "optional": true
-        }
+      "engines": {
+        "node": ">= 10.13.0"
       }
     },
     "node_modules/jest-runtime": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.6.3.tgz",
-      "integrity": "sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.5.2.tgz",
+      "integrity": "sha512-zArr4DatX/Sn0wswX/AnAuJgmwgAR5rNtrUz36HR8BfMuysHYNq5sDbYHuLC4ICyRdy5ae/KQ+sczxyS9G6Qvw==",
       "dev": true,
       "dependencies": {
-        "@jest/console": "^26.6.2",
-        "@jest/environment": "^26.6.2",
-        "@jest/fake-timers": "^26.6.2",
-        "@jest/globals": "^26.6.2",
-        "@jest/source-map": "^26.6.2",
-        "@jest/test-result": "^26.6.2",
-        "@jest/transform": "^26.6.2",
-        "@jest/types": "^26.6.2",
+        "@jest/console": "^26.5.2",
+        "@jest/environment": "^26.5.2",
+        "@jest/fake-timers": "^26.5.2",
+        "@jest/globals": "^26.5.2",
+        "@jest/source-map": "^26.5.0",
+        "@jest/test-result": "^26.5.2",
+        "@jest/transform": "^26.5.2",
+        "@jest/types": "^26.5.2",
         "@types/yargs": "^15.0.0",
         "chalk": "^4.0.0",
-        "cjs-module-lexer": "^0.6.0",
         "collect-v8-coverage": "^1.0.0",
         "exit": "^0.1.2",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.4",
-        "jest-config": "^26.6.3",
-        "jest-haste-map": "^26.6.2",
-        "jest-message-util": "^26.6.2",
-        "jest-mock": "^26.6.2",
+        "jest-config": "^26.5.2",
+        "jest-haste-map": "^26.5.2",
+        "jest-message-util": "^26.5.2",
+        "jest-mock": "^26.5.2",
         "jest-regex-util": "^26.0.0",
-        "jest-resolve": "^26.6.2",
-        "jest-snapshot": "^26.6.2",
-        "jest-util": "^26.6.2",
-        "jest-validate": "^26.6.2",
+        "jest-resolve": "^26.5.2",
+        "jest-snapshot": "^26.5.2",
+        "jest-util": "^26.5.2",
+        "jest-validate": "^26.5.2",
         "slash": "^3.0.0",
         "strip-bom": "^4.0.0",
         "yargs": "^15.4.1"
@@ -18432,34 +18303,19 @@
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-runtime/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/jest-runtime/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
       "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
       }
     },
     "node_modules/jest-runtime/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -18483,17 +18339,11 @@
         "wrap-ansi": "^6.2.0"
       }
     },
-    "node_modules/jest-runtime/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
+    "node_modules/jest-runtime/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
     },
     "node_modules/jest-runtime/node_modules/find-up": {
       "version": "4.1.0",
@@ -18508,52 +18358,15 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-runtime/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/jest-runtime/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
       "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/jest-runtime/node_modules/jest-config": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",
-      "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.1.0",
-        "@jest/test-sequencer": "^26.6.3",
-        "@jest/types": "^26.6.2",
-        "babel-jest": "^26.6.3",
-        "chalk": "^4.0.0",
-        "deepmerge": "^4.2.2",
-        "glob": "^7.1.1",
-        "graceful-fs": "^4.2.4",
-        "jest-environment-jsdom": "^26.6.2",
-        "jest-environment-node": "^26.6.2",
-        "jest-get-type": "^26.3.0",
-        "jest-jasmine2": "^26.6.3",
-        "jest-regex-util": "^26.0.0",
-        "jest-resolve": "^26.6.2",
-        "jest-util": "^26.6.2",
-        "jest-validate": "^26.6.2",
-        "micromatch": "^4.0.2",
-        "pretty-format": "^26.6.2"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      },
-      "peerDependencies": {
-        "ts-node": ">=9.0.0"
-      },
-      "peerDependenciesMeta": {
-        "ts-node": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/jest-runtime/node_modules/locate-path": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
@@ -18602,74 +18415,32 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-runtime/node_modules/require-main-filename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-      "dev": true
-    },
-    "node_modules/jest-runtime/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/jest-runtime/node_modules/string-width": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/jest-runtime/node_modules/ts-node": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.1.0.tgz",
-      "integrity": "sha512-6szn3+J9WyG2hE+5W8e0ruZrzyk1uFLYye6IGMBadnOzDh8aP7t8CbFpsfCiEx2+wMixAhjFt7lOZC4+l+WbEA==",
+    "node_modules/jest-runtime/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
       "dev": true,
-      "optional": true,
-      "peer": true,
       "dependencies": {
-        "@tsconfig/node10": "^1.0.7",
-        "@tsconfig/node12": "^1.0.7",
-        "@tsconfig/node14": "^1.0.0",
-        "@tsconfig/node16": "^1.0.1",
-        "arg": "^4.1.0",
-        "create-require": "^1.1.0",
-        "diff": "^4.0.1",
-        "make-error": "^1.1.1",
-        "source-map-support": "^0.5.17",
-        "yn": "3.1.1"
-      },
-      "bin": {
-        "ts-node": "dist/bin.js",
-        "ts-node-cwd": "dist/bin-cwd.js",
-        "ts-node-script": "dist/bin-script.js",
-        "ts-node-transpile-only": "dist/bin-transpile.js",
-        "ts-script": "dist/bin-script-deprecated.js"
+        "ansi-regex": "^5.0.0"
       },
       "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "@swc/core": ">=1.2.50",
-        "@swc/wasm": ">=1.2.50",
-        "@types/node": "*",
-        "typescript": ">=2.7"
-      },
-      "peerDependenciesMeta": {
-        "@swc/core": {
-          "optional": true
-        },
-        "@swc/wasm": {
-          "optional": true
-        }
+        "node": ">=8"
       }
     },
-    "node_modules/jest-runtime/node_modules/which-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-      "dev": true
-    },
     "node_modules/jest-runtime/node_modules/wrap-ansi": {
       "version": "6.2.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
@@ -18684,12 +18455,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-runtime/node_modules/y18n": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
-      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
-      "dev": true
-    },
     "node_modules/jest-runtime/node_modules/yargs": {
       "version": "15.4.1",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
@@ -18726,9 +18491,9 @@
       }
     },
     "node_modules/jest-serializer": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.6.2.tgz",
-      "integrity": "sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==",
+      "version": "26.5.0",
+      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.5.0.tgz",
+      "integrity": "sha512-+h3Gf5CDRlSLdgTv7y0vPIAoLgX/SI7T4v6hy+TEXMgYbv+ztzbg5PSN6mUXAT/hXYHvZRWm+MaObVfqkhCGxA==",
       "dev": true,
       "dependencies": {
         "@types/node": "*",
@@ -18739,51 +18504,36 @@
       }
     },
     "node_modules/jest-snapshot": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.6.2.tgz",
-      "integrity": "sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.5.2.tgz",
+      "integrity": "sha512-MkXIDvEefzDubI/WaDVSRH4xnkuirP/Pz8LhAIDXcVQTmcEfwxywj5LGwBmhz+kAAIldA7XM4l96vbpzltSjqg==",
       "dev": true,
       "dependencies": {
         "@babel/types": "^7.0.0",
-        "@jest/types": "^26.6.2",
+        "@jest/types": "^26.5.2",
         "@types/babel__traverse": "^7.0.4",
         "@types/prettier": "^2.0.0",
         "chalk": "^4.0.0",
-        "expect": "^26.6.2",
+        "expect": "^26.5.2",
         "graceful-fs": "^4.2.4",
-        "jest-diff": "^26.6.2",
+        "jest-diff": "^26.5.2",
         "jest-get-type": "^26.3.0",
-        "jest-haste-map": "^26.6.2",
-        "jest-matcher-utils": "^26.6.2",
-        "jest-message-util": "^26.6.2",
-        "jest-resolve": "^26.6.2",
+        "jest-haste-map": "^26.5.2",
+        "jest-matcher-utils": "^26.5.2",
+        "jest-message-util": "^26.5.2",
+        "jest-resolve": "^26.5.2",
         "natural-compare": "^1.4.0",
-        "pretty-format": "^26.6.2",
+        "pretty-format": "^26.5.2",
         "semver": "^7.3.2"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-snapshot/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/jest-snapshot/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -18796,46 +18546,13 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-snapshot/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-util": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
-      "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.5.2.tgz",
+      "integrity": "sha512-WTL675bK+GSSAYgS8z9FWdCT2nccO1yTIplNLPlP0OD8tUk/H5IrWKMMRudIQQ0qp8bb4k+1Qa8CxGKq9qnYdg==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^26.6.2",
+        "@jest/types": "^26.5.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.4",
@@ -18846,25 +18563,10 @@
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-util/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/jest-util/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -18877,75 +18579,39 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-util/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-util/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-util/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-validate": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.6.2.tgz",
-      "integrity": "sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.5.2.tgz",
+      "integrity": "sha512-FmJks0zY36mp6Af/5sqO6CTL9bNMU45yKCJk3hrz8d2aIqQIlN1pr9HPIwZE8blLaewOla134nt5+xAmWsx3SQ==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^26.6.2",
+        "@jest/types": "^26.5.2",
         "camelcase": "^6.0.0",
         "chalk": "^4.0.0",
         "jest-get-type": "^26.3.0",
         "leven": "^3.1.0",
-        "pretty-format": "^26.6.2"
+        "pretty-format": "^26.5.2"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-validate/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/jest-validate/node_modules/camelcase": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.0.0.tgz",
+      "integrity": "sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==",
       "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/jest-validate/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -18958,76 +18624,43 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-validate/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-validate/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-validate/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-watcher": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.6.2.tgz",
-      "integrity": "sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.5.2.tgz",
+      "integrity": "sha512-i3m1NtWzF+FXfJ3ljLBB/WQEp4uaNhX7QcQUWMokcifFTUQBDFyUMEwk0JkJ1kopHbx7Een3KX0Q7+9koGM/Pw==",
       "dev": true,
       "dependencies": {
-        "@jest/test-result": "^26.6.2",
-        "@jest/types": "^26.6.2",
+        "@jest/test-result": "^26.5.2",
+        "@jest/types": "^26.5.2",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
-        "jest-util": "^26.6.2",
+        "jest-util": "^26.5.2",
         "string-length": "^4.0.1"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-watcher/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/jest-watcher/node_modules/ansi-escapes": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
+      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "type-fest": "^0.11.0"
       },
       "engines": {
         "node": ">=8"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/jest-watcher/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -19040,74 +18673,294 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-watcher/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-watcher/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/jest-watcher/node_modules/type-fest": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
+      "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
-      }
-    },
-    "node_modules/jest-watcher/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
       },
-      "engines": {
-        "node": ">=8"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/jest-worker": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
-      "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
+      "version": "26.0.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.0.0.tgz",
+      "integrity": "sha512-pPaYa2+JnwmiZjK9x7p9BoZht+47ecFCDFA/CJxspHzeDvQcfVBLWzCiWyo+EGrSiQMWZtCFo9iSvMZnAAo8vw==",
       "dev": true,
       "dependencies": {
-        "@types/node": "*",
         "merge-stream": "^2.0.0",
         "supports-color": "^7.0.0"
       },
       "engines": {
-        "node": ">= 10.13.0"
+        "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-worker/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/jest/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
       "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/jest-worker/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/jest/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest/node_modules/cliui": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.0"
+      }
+    },
+    "node_modules/jest/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/jest/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
+    "node_modules/jest/node_modules/import-local": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
+      "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==",
+      "dev": true,
+      "dependencies": {
+        "pkg-dir": "^4.2.0",
+        "resolve-cwd": "^3.0.0"
+      },
+      "bin": {
+        "import-local-fixture": "fixtures/cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/jest-cli": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.5.2.tgz",
+      "integrity": "sha512-usm48COuUvRp8YEG5OWOaxbSM0my7eHn3QeBWxiGUuFhvkGVBvl1fic4UjC02EAEQtDv8KrNQUXdQTV6ZZBsoA==",
+      "dev": true,
+      "dependencies": {
+        "@jest/core": "^26.5.2",
+        "@jest/test-result": "^26.5.2",
+        "@jest/types": "^26.5.2",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.4",
+        "import-local": "^3.0.2",
+        "is-ci": "^2.0.0",
+        "jest-config": "^26.5.2",
+        "jest-util": "^26.5.2",
+        "jest-validate": "^26.5.2",
+        "prompts": "^2.0.1",
+        "yargs": "^15.4.1"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/resolve-cwd": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+      "dev": true,
+      "dependencies": {
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/string-width": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/yargs": {
+      "version": "15.4.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^6.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^4.1.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^4.2.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^18.1.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/yargs-parser": {
+      "version": "18.1.3",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -19115,9 +18968,9 @@
       "dev": true
     },
     "node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "version": "3.14.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
+      "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
       "dev": true,
       "dependencies": {
         "argparse": "^1.0.7",
@@ -19145,37 +18998,36 @@
       }
     },
     "node_modules/jsdom": {
-      "version": "16.7.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
-      "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
+      "version": "16.4.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.4.0.tgz",
+      "integrity": "sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w==",
       "dev": true,
       "dependencies": {
-        "abab": "^2.0.5",
-        "acorn": "^8.2.4",
+        "abab": "^2.0.3",
+        "acorn": "^7.1.1",
         "acorn-globals": "^6.0.0",
         "cssom": "^0.4.4",
-        "cssstyle": "^2.3.0",
+        "cssstyle": "^2.2.0",
         "data-urls": "^2.0.0",
-        "decimal.js": "^10.2.1",
+        "decimal.js": "^10.2.0",
         "domexception": "^2.0.1",
-        "escodegen": "^2.0.0",
-        "form-data": "^3.0.0",
+        "escodegen": "^1.14.1",
         "html-encoding-sniffer": "^2.0.1",
-        "http-proxy-agent": "^4.0.1",
-        "https-proxy-agent": "^5.0.0",
-        "is-potential-custom-element-name": "^1.0.1",
+        "is-potential-custom-element-name": "^1.0.0",
         "nwsapi": "^2.2.0",
-        "parse5": "6.0.1",
-        "saxes": "^5.0.1",
+        "parse5": "5.1.1",
+        "request": "^2.88.2",
+        "request-promise-native": "^1.0.8",
+        "saxes": "^5.0.0",
         "symbol-tree": "^3.2.4",
-        "tough-cookie": "^4.0.0",
+        "tough-cookie": "^3.0.1",
         "w3c-hr-time": "^1.0.2",
         "w3c-xmlserializer": "^2.0.0",
         "webidl-conversions": "^6.1.0",
         "whatwg-encoding": "^1.0.5",
         "whatwg-mimetype": "^2.3.0",
-        "whatwg-url": "^8.5.0",
-        "ws": "^7.4.6",
+        "whatwg-url": "^8.0.0",
+        "ws": "^7.2.3",
         "xml-name-validator": "^3.0.0"
       },
       "engines": {
@@ -19191,9 +19043,9 @@
       }
     },
     "node_modules/jsdom/node_modules/acorn": {
-      "version": "8.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz",
-      "integrity": "sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==",
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -19202,139 +19054,31 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/jsdom/node_modules/escodegen": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
-      "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
-      "dev": true,
-      "dependencies": {
-        "esprima": "^4.0.1",
-        "estraverse": "^5.2.0",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1"
-      },
-      "bin": {
-        "escodegen": "bin/escodegen.js",
-        "esgenerate": "bin/esgenerate.js"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "optionalDependencies": {
-        "source-map": "~0.6.1"
-      }
-    },
-    "node_modules/jsdom/node_modules/estraverse": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/jsdom/node_modules/form-data": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
-      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
-      "dev": true,
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/jsdom/node_modules/levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/jsdom/node_modules/optionator": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-      "dev": true,
-      "dependencies": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.6",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "word-wrap": "~1.2.3"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
     "node_modules/jsdom/node_modules/parse5": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
+      "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
       "dev": true
     },
-    "node_modules/jsdom/node_modules/prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+    "node_modules/jsdom/node_modules/ws": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz",
+      "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==",
       "dev": true,
       "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/jsdom/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/jsdom/node_modules/tough-cookie": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
-      "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
-      "dev": true,
-      "dependencies": {
-        "psl": "^1.1.33",
-        "punycode": "^2.1.1",
-        "universalify": "^0.1.2"
+        "node": ">=8.3.0"
       },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/jsdom/node_modules/type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "~1.1.2"
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
       },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/jsdom/node_modules/universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4.0.0"
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
       }
     },
     "node_modules/jsesc": {
@@ -19371,10 +19115,9 @@
       "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
     },
     "node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
     },
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
@@ -19394,9 +19137,9 @@
       "dev": true
     },
     "node_modules/json5": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-      "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
+      "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
       "dev": true,
       "dependencies": {
         "minimist": "^1.2.5"
@@ -19433,6 +19176,22 @@
         "node >= 0.2.0"
       ]
     },
+    "node_modules/JSONStream": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
+      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
+      "dev": true,
+      "dependencies": {
+        "jsonparse": "^1.2.0",
+        "through": ">=2.2.7 <3"
+      },
+      "bin": {
+        "JSONStream": "bin.js"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/jsprim": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
@@ -19456,9 +19215,9 @@
       ]
     },
     "node_modules/jszip": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.7.0.tgz",
-      "integrity": "sha512-Y2OlFIzrDOPWUnpU0LORIcDn2xN7rC9yKffFM/7pGhQuhO+SUhfm2trkJ/S5amjFvem0Y+1EALz/MEPkvHXVNw==",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.5.0.tgz",
+      "integrity": "sha512-WRtu7TPCmYePR1nazfrtuF216cIVon/3GWOvHS9QR5bIwSbnxtdpma6un3jyGGNhHsKCSzn5Ypk+EkDRvTGiFA==",
       "dependencies": {
         "lie": "~3.3.0",
         "pako": "~1.0.2",
@@ -19467,9 +19226,9 @@
       }
     },
     "node_modules/just-debounce": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.1.0.tgz",
-      "integrity": "sha512-qpcRocdkUmf+UTNBYx5w6dexX5J31AKK1OmPwH630a83DdVVUIngk55RSAiIGpQyoH0dlr872VHfPjnQnK1qDQ==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.0.0.tgz",
+      "integrity": "sha1-h/zPrv/AtozRnVX2cilD+SnqNeo=",
       "dev": true
     },
     "node_modules/karma-source-map-support": {
@@ -19482,9 +19241,9 @@
       }
     },
     "node_modules/keytar": {
-      "version": "7.7.0",
-      "resolved": "https://registry.npmjs.org/keytar/-/keytar-7.7.0.tgz",
-      "integrity": "sha512-YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/keytar/-/keytar-7.2.0.tgz",
+      "integrity": "sha512-ECSaWvoLKI5SI0pGpZQeUV1/lpBYfkaxvoSp3zkiPOz05VavwSfLi8DdEaa9N2ekQZv3Chy+o7aP6n9mairBgw==",
       "hasInstallScript": true,
       "optional": true,
       "dependencies": {
@@ -19507,9 +19266,9 @@
       "dev": true
     },
     "node_modules/kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -19524,15 +19283,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/klona": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz",
-      "integrity": "sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/last-run": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
@@ -19604,29 +19354,21 @@
         "rsvp": "^3.0.21"
       }
     },
-    "node_modules/leek/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+    "node_modules/leek/node_modules/rsvp": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz",
+      "integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==",
       "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
+      "engines": {
+        "node": "0.12.* || 4.* || 6.* || >= 7.*"
       }
     },
-    "node_modules/leek/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
     "node_modules/less": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/less/-/less-4.1.1.tgz",
-      "integrity": "sha512-w09o8tZFPThBscl5d0Ggp3RcrKIouBoQscnOMgFH3n5V3kN/CXGHNfCkRPtxJk6nKryDXaV9aHLK55RXuH4sAw==",
+      "version": "3.12.2",
+      "resolved": "https://registry.npmjs.org/less/-/less-3.12.2.tgz",
+      "integrity": "sha512-+1V2PCMFkL+OIj2/HrtrvZw0BC0sYLMICJfbQjuj/K8CEnlrFX6R5cKKgzzttsZDHyxQNL1jqMREjKN3ja/E3Q==",
       "dev": true,
       "dependencies": {
-        "copy-anything": "^2.0.1",
-        "parse-node-version": "^1.0.1",
         "tslib": "^1.10.0"
       },
       "bin": {
@@ -19641,19 +19383,20 @@
         "image-size": "~0.5.0",
         "make-dir": "^2.1.0",
         "mime": "^1.4.1",
-        "needle": "^2.5.2",
+        "native-request": "^1.0.5",
         "source-map": "~0.6.0"
       }
     },
     "node_modules/less-loader": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-7.3.0.tgz",
-      "integrity": "sha512-Mi8915g7NMaLlgi77mgTTQvK022xKRQBIVDSyfl3ErTuBhmZBQab0mjeJjNNqGbdR+qrfTleKXqbGI4uEFavxg==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-6.1.0.tgz",
+      "integrity": "sha512-/jLzOwLyqJ7Kt3xg5sHHkXtOyShWwFj410K9Si9WO+/h8rmYxxkSR0A3/hFEntWudE20zZnWMtpMYnLzqTVdUA==",
       "dev": true,
       "dependencies": {
-        "klona": "^2.0.4",
+        "clone": "^2.1.2",
+        "less": "^3.11.1",
         "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0"
+        "schema-utils": "^2.6.6"
       },
       "engines": {
         "node": ">= 10.13.0"
@@ -19663,59 +19406,9 @@
         "url": "https://opencollective.com/webpack"
       },
       "peerDependencies": {
-        "less": "^3.5.0 || ^4.0.0",
         "webpack": "^4.0.0 || ^5.0.0"
       }
     },
-    "node_modules/less-loader/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/less-loader/node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
-    "node_modules/less-loader/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/less-loader/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
     "node_modules/less/node_modules/make-dir": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
@@ -19730,16 +19423,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/less/node_modules/pify": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/less/node_modules/semver": {
       "version": "5.7.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
@@ -19761,9 +19444,9 @@
       }
     },
     "node_modules/less/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
+      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
       "dev": true
     },
     "node_modules/leven": {
@@ -19775,6 +19458,18 @@
         "node": ">=6"
       }
     },
+    "node_modules/levenary": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz",
+      "integrity": "sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==",
+      "dev": true,
+      "dependencies": {
+        "leven": "^3.1.0"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/levn": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
@@ -19789,34 +19484,15 @@
       }
     },
     "node_modules/license-webpack-plugin": {
-      "version": "2.3.11",
-      "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-2.3.11.tgz",
-      "integrity": "sha512-0iVGoX5vx0WDy8dmwTTpOOMYiGqILyUbDeVMFH52AjgBlS58lHwOlFMSoqg5nY8Kxl6+FRKyUZY/UdlQaOyqDw==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-2.2.0.tgz",
+      "integrity": "sha512-XPsdL/0brSHf+7dXIlRqotnCQ58RX2au6otkOg4U3dm8uH+Ka/fW4iukEs95uXm+qKe/SBs+s1Ll/aQddKG+tg==",
       "dev": true,
       "dependencies": {
         "@types/webpack-sources": "^0.1.5",
         "webpack-sources": "^1.2.0"
       }
     },
-    "node_modules/license-webpack-plugin/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/license-webpack-plugin/node_modules/webpack-sources": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-      "dev": true,
-      "dependencies": {
-        "source-list-map": "^2.0.0",
-        "source-map": "~0.6.1"
-      }
-    },
     "node_modules/lie": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
@@ -19844,27 +19520,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/liftoff/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/liftoff/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/lines-and-columns": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
@@ -19872,14 +19527,14 @@
       "dev": true
     },
     "node_modules/load-json-file": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-      "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+      "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
       "dev": true,
       "dependencies": {
         "graceful-fs": "^4.1.2",
-        "parse-json": "^4.0.0",
-        "pify": "^3.0.0",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
         "strip-bom": "^3.0.0"
       },
       "engines": {
@@ -19887,25 +19542,24 @@
       }
     },
     "node_modules/load-json-file/node_modules/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
       "dev": true,
       "dependencies": {
-        "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
+        "error-ex": "^1.2.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/load-json-file/node_modules/pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
       "dev": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/load-json-file/node_modules/strip-bom": {
@@ -19953,9 +19607,9 @@
       }
     },
     "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+      "version": "4.17.20",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+      "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
     },
     "node_modules/lodash._baseassign": {
       "version": "3.2.0",
@@ -20024,6 +19678,12 @@
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
       "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168="
     },
+    "node_modules/lodash.flatten": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
+      "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=",
+      "dev": true
+    },
     "node_modules/lodash.isarguments": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
@@ -20053,18 +19713,18 @@
       "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
       "dev": true
     },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
-    },
     "node_modules/lodash.restparam": {
       "version": "3.6.1",
       "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
       "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
       "dev": true
     },
+    "node_modules/lodash.sortby": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
+      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
+      "dev": true
+    },
     "node_modules/lodash.truncate": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
@@ -20078,96 +19738,102 @@
       "dev": true
     },
     "node_modules/log-symbols": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
+      "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==",
       "dev": true,
       "dependencies": {
-        "chalk": "^4.1.0",
-        "is-unicode-supported": "^0.1.0"
+        "chalk": "^2.4.2"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=8"
       }
     },
     "node_modules/log-symbols/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "color-convert": "^1.9.0"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">=4"
       }
     },
     "node_modules/log-symbols/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "node": ">=4"
       }
     },
     "node_modules/log-symbols/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
+        "color-name": "1.1.3"
       }
     },
+    "node_modules/log-symbols/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
     "node_modules/log-symbols/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
     "node_modules/log-symbols/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "has-flag": "^3.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
     "node_modules/loglevel": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.1.tgz",
-      "integrity": "sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.0.tgz",
+      "integrity": "sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==",
       "dev": true,
       "engines": {
         "node": ">= 0.6.0"
       },
       "funding": {
         "type": "tidelift",
-        "url": "https://tidelift.com/funding/github/npm/loglevel"
+        "url": "https://tidelift.com/subscription/pkg/npm-loglevel?utm_medium=referral&utm_source=npm_fund"
+      }
+    },
+    "node_modules/loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "dev": true,
+      "dependencies": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      },
+      "bin": {
+        "loose-envify": "cli.js"
       }
     },
     "node_modules/loud-rejection": {
@@ -20208,9 +19874,9 @@
       }
     },
     "node_modules/macos-release": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.5.0.tgz",
-      "integrity": "sha512-EIgv+QZ9r+814gjJj0Bt5vSLJLzswGmSUbUpbi9AIr/fsN2IWFBl2NucV9PAiek+U1STK468tEkxmVYUtuAN3g==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.4.1.tgz",
+      "integrity": "sha512-H/QHeBIN1fIGJX517pvK8IEK53yQOW7YcEI55oYtgjDdoCQQz7eJS94qt5kNrscReEyuD/JcdFCm2XBEcGOITg==",
       "engines": {
         "node": ">=6"
       },
@@ -20256,55 +19922,95 @@
       "dev": true
     },
     "node_modules/make-fetch-happen": {
-      "version": "8.0.14",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.14.tgz",
-      "integrity": "sha512-EsS89h6l4vbfJEtBZnENTOFk8mCRpY5ru36Xe5bcX1KYIli2mkSHqoFsp5O1wMDvTJJzxe/4THpCTtygjeeGWQ==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz",
+      "integrity": "sha512-07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag==",
+      "dev": true,
       "dependencies": {
-        "agentkeepalive": "^4.1.3",
-        "cacache": "^15.0.5",
-        "http-cache-semantics": "^4.1.0",
-        "http-proxy-agent": "^4.0.1",
-        "https-proxy-agent": "^5.0.0",
-        "is-lambda": "^1.0.1",
-        "lru-cache": "^6.0.0",
-        "minipass": "^3.1.3",
-        "minipass-collect": "^1.0.2",
-        "minipass-fetch": "^1.3.2",
-        "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.4",
-        "promise-retry": "^2.0.1",
-        "socks-proxy-agent": "^5.0.0",
-        "ssri": "^8.0.0"
-      },
-      "engines": {
-        "node": ">= 10"
+        "agentkeepalive": "^3.4.1",
+        "cacache": "^12.0.0",
+        "http-cache-semantics": "^3.8.1",
+        "http-proxy-agent": "^2.1.0",
+        "https-proxy-agent": "^2.2.3",
+        "lru-cache": "^5.1.1",
+        "mississippi": "^3.0.0",
+        "node-fetch-npm": "^2.0.2",
+        "promise-retry": "^1.1.1",
+        "socks-proxy-agent": "^4.0.0",
+        "ssri": "^6.0.0"
       }
     },
-    "node_modules/make-fetch-happen/node_modules/err-code": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
-      "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="
-    },
-    "node_modules/make-fetch-happen/node_modules/promise-retry": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
-      "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
+    "node_modules/make-fetch-happen/node_modules/cacache": {
+      "version": "12.0.4",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
+      "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
+      "dev": true,
       "dependencies": {
-        "err-code": "^2.0.2",
-        "retry": "^0.12.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "bluebird": "^3.5.5",
+        "chownr": "^1.1.1",
+        "figgy-pudding": "^3.5.1",
+        "glob": "^7.1.4",
+        "graceful-fs": "^4.1.15",
+        "infer-owner": "^1.0.3",
+        "lru-cache": "^5.1.1",
+        "mississippi": "^3.0.0",
+        "mkdirp": "^0.5.1",
+        "move-concurrently": "^1.0.1",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^2.6.3",
+        "ssri": "^6.0.1",
+        "unique-filename": "^1.1.1",
+        "y18n": "^4.0.0"
       }
     },
-    "node_modules/make-fetch-happen/node_modules/retry": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
-      "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
-      "engines": {
-        "node": ">= 4"
+    "node_modules/make-fetch-happen/node_modules/chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "dev": true
+    },
+    "node_modules/make-fetch-happen/node_modules/http-cache-semantics": {
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz",
+      "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==",
+      "dev": true
+    },
+    "node_modules/make-fetch-happen/node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^3.0.2"
       }
     },
+    "node_modules/make-fetch-happen/node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/ssri": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+      "dev": true,
+      "dependencies": {
+        "figgy-pudding": "^3.5.1"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true
+    },
     "node_modules/make-iterator": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
@@ -20317,15 +20023,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/make-iterator/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/makeerror": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
@@ -20371,15 +20068,6 @@
         "node": ">= 0.10.0"
       }
     },
-    "node_modules/matchdep/node_modules/arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/matchdep/node_modules/braces": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
@@ -20413,28 +20101,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/matchdep/node_modules/braces/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/matchdep/node_modules/extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-      "dev": true,
-      "dependencies": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/matchdep/node_modules/fill-range": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -20462,15 +20128,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/matchdep/node_modules/fill-range/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/matchdep/node_modules/findup-sync": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
@@ -20531,15 +20188,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/matchdep/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/matchdep/node_modules/micromatch": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -20618,9 +20266,9 @@
       }
     },
     "node_modules/mdn-data": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
+      "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==",
       "dev": true
     },
     "node_modules/media-typer": {
@@ -20632,13 +20280,16 @@
       }
     },
     "node_modules/memory-fs": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
+      "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
       "dev": true,
       "dependencies": {
         "errno": "^0.1.3",
         "readable-stream": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=4.3.0 <5.0.0 || >=5.10"
       }
     },
     "node_modules/merge-descriptors": {
@@ -20686,15 +20337,15 @@
       }
     },
     "node_modules/micromatch": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+      "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
       "dependencies": {
         "braces": "^3.0.1",
-        "picomatch": "^2.2.3"
+        "picomatch": "^2.0.5"
       },
       "engines": {
-        "node": ">=8.6"
+        "node": ">=8"
       }
     },
     "node_modules/miller-rabin": {
@@ -20711,9 +20362,9 @@
       }
     },
     "node_modules/miller-rabin/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "version": "4.11.9",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+      "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
       "dev": true
     },
     "node_modules/mime": {
@@ -20728,19 +20379,19 @@
       }
     },
     "node_modules/mime-db": {
-      "version": "1.49.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz",
-      "integrity": "sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA==",
+      "version": "1.44.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
+      "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/mime-types": {
-      "version": "2.1.32",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz",
-      "integrity": "sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A==",
+      "version": "2.1.27",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
+      "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
       "dependencies": {
-        "mime-db": "1.49.0"
+        "mime-db": "1.44.0"
       },
       "engines": {
         "node": ">= 0.6"
@@ -20755,104 +20406,93 @@
       }
     },
     "node_modules/mimic-response": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
-      "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
-      "optional": true,
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
+      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=4"
       }
     },
     "node_modules/mini-css-extract-plugin": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.3.5.tgz",
-      "integrity": "sha512-tvmzcwqJJXau4OQE5vT72pRT18o2zF+tQJp8CWchqvfQnTlflkzS+dANYcRdyPRWUWRkfmeNTKltx0NZI/b5dQ==",
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz",
+      "integrity": "sha512-lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A==",
       "dev": true,
       "dependencies": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0",
+        "loader-utils": "^1.1.0",
+        "normalize-url": "1.9.1",
+        "schema-utils": "^1.0.0",
         "webpack-sources": "^1.1.0"
       },
       "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
+        "node": ">= 6.9.0"
       },
       "peerDependencies": {
-        "webpack": "^4.4.0 || ^5.0.0"
+        "webpack": "^4.4.0"
       }
     },
-    "node_modules/mini-css-extract-plugin/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+    "node_modules/mini-css-extract-plugin/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
       "dev": true,
       "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
+        "minimist": "^1.2.0"
       },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
+      "bin": {
+        "json5": "lib/cli.js"
       }
     },
-    "node_modules/mini-css-extract-plugin/node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
-    "node_modules/mini-css-extract-plugin/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+    "node_modules/mini-css-extract-plugin/node_modules/loader-utils": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
       "dev": true,
       "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^1.0.1"
       },
       "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
+        "node": ">=4.0.0"
       }
     },
-    "node_modules/mini-css-extract-plugin/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+    "node_modules/mini-css-extract-plugin/node_modules/normalize-url": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz",
+      "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
+      "dev": true,
+      "dependencies": {
+        "object-assign": "^4.0.1",
+        "prepend-http": "^1.0.0",
+        "query-string": "^4.1.0",
+        "sort-keys": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/mini-css-extract-plugin/node_modules/prepend-http": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
+      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/mini-css-extract-plugin/node_modules/webpack-sources": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+    "node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
       "dev": true,
       "dependencies": {
-        "source-list-map": "^2.0.0",
-        "source-map": "~0.6.1"
+        "ajv": "^6.1.0",
+        "ajv-errors": "^1.0.0",
+        "ajv-keywords": "^3.1.0"
+      },
+      "engines": {
+        "node": ">= 4"
       }
     },
     "node_modules/minimalistic-assert": {
@@ -21009,15 +20649,28 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "bin": {
-        "mkdirp": "bin/cmd.js"
+    "node_modules/mixin-deep/node_modules/is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
       }
     },
     "node_modules/mkdirp-classic": {
@@ -21027,9 +20680,9 @@
       "optional": true
     },
     "node_modules/moment": {
-      "version": "2.29.1",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
-      "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==",
+      "version": "2.29.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.0.tgz",
+      "integrity": "sha512-z6IJ5HXYiuxvFTI6eiQ9dm77uE0gyy1yXNApVHqTcnIKfY9tIwEjlzsZ6u1LQXvVgKeTnv9Xm7NDvJ7lso3MtA==",
       "engines": {
         "node": "*"
       }
@@ -21048,18 +20701,6 @@
         "run-queue": "^1.0.3"
       }
     },
-    "node_modules/move-concurrently/node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
     "node_modules/move-concurrently/node_modules/rimraf": {
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -21072,10 +20713,34 @@
         "rimraf": "bin.js"
       }
     },
+    "node_modules/move-file": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/move-file/-/move-file-2.0.0.tgz",
+      "integrity": "sha512-cdkdhNCgbP5dvS4tlGxZbD+nloio9GIimP57EjqFhwLcMjnU+XJKAZzlmg/TN/AK1LuNAdTSvm3CPPP4Xkv0iQ==",
+      "dev": true,
+      "dependencies": {
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/move-file/node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
     },
     "node_modules/multicast-dns": {
       "version": "6.2.3",
@@ -21111,24 +20776,12 @@
       "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="
     },
     "node_modules/nan": {
-      "version": "2.14.2",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
-      "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==",
+      "version": "2.14.1",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz",
+      "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==",
       "dev": true,
       "optional": true
     },
-    "node_modules/nanoid": {
-      "version": "3.1.23",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz",
-      "integrity": "sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==",
-      "dev": true,
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
     "node_modules/nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -21151,43 +20804,19 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/nanomatch/node_modules/arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/nanomatch/node_modules/extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-      "dev": true,
-      "dependencies": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/nanomatch/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/napi-build-utils": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
       "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==",
       "optional": true
     },
+    "node_modules/native-request": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/native-request/-/native-request-1.0.7.tgz",
+      "integrity": "sha512-9nRjinI9bmz+S7dgNtf4A70+/vPhnd+2krGpy4SUlADuOuSa24IDkNaZ+R/QT1wQ6S8jBdi6wE7fLekFZNfUpQ==",
+      "dev": true,
+      "optional": true
+    },
     "node_modules/native-run": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/native-run/-/native-run-1.4.0.tgz",
@@ -21213,10 +20842,27 @@
         "node": ">=10.3.0"
       }
     },
-    "node_modules/native-run/node_modules/ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+    "node_modules/native-run/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/native-run/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
       "dev": true
     },
     "node_modules/native-run/node_modules/readable-stream": {
@@ -21248,41 +20894,6 @@
       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
       "dev": true
     },
-    "node_modules/needle": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/needle/-/needle-2.8.0.tgz",
-      "integrity": "sha512-ZTq6WYkN/3782H1393me3utVYdq2XyqNUFBsprEE3VMAT0+hP/cItpnITpqsY6ep2yeFE4Tqtqwc74VqUlUYtw==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "debug": "^3.2.6",
-        "iconv-lite": "^0.4.4",
-        "sax": "^1.2.4"
-      },
-      "bin": {
-        "needle": "bin/needle"
-      },
-      "engines": {
-        "node": ">= 4.4.x"
-      }
-    },
-    "node_modules/needle/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/needle/node_modules/sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-      "dev": true,
-      "optional": true
-    },
     "node_modules/negotiator": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
@@ -21332,9 +20943,9 @@
       }
     },
     "node_modules/node-abi": {
-      "version": "2.30.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.30.0.tgz",
-      "integrity": "sha512-g6bZh3YCKQRdwuO/tSZZYJAw622SjsRfJ2X0Iy4sSOHZ34/sPPdVBn8fev2tj7njzLwuqPw9uMtGsGkO5kIQvg==",
+      "version": "2.19.3",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.19.3.tgz",
+      "integrity": "sha512-9xZrlyfvKhWme2EXFKQhZRp1yNWT/uI1luYPr3sFl+H4keYY4xR+1jO7mvTTijIsHf1M+QDe9uWuKeEpLInIlg==",
       "optional": true,
       "dependencies": {
         "semver": "^5.4.1"
@@ -21350,11 +20961,25 @@
       }
     },
     "node_modules/node-addon-api": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
-      "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.0.2.tgz",
+      "integrity": "sha512-+D4s2HCnxPd5PjjI0STKwncjXTUKKqm74MDMz9OPXavjsGmjkvwgLtA5yoxJUdmpj52+2u+RrXgPipahKczMKg==",
       "optional": true
     },
+    "node_modules/node-fetch-npm": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.4.tgz",
+      "integrity": "sha512-iOuIQDWDyjhv9qSDrj9aq/klt6F9z1p2otB3AV7v3zBDcL/x+OfGsvGQZZCcMZbUf4Ujw1xGNQkjvGnVT22cKg==",
+      "dev": true,
+      "dependencies": {
+        "encoding": "^0.1.11",
+        "json-parse-better-errors": "^1.0.0",
+        "safe-buffer": "^5.1.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/node-forge": {
       "version": "0.10.0",
       "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
@@ -21446,16 +21071,11 @@
         "vm-browserify": "^1.0.1"
       }
     },
-    "node_modules/node-libs-browser/node_modules/buffer": {
-      "version": "4.9.2",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
-      "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
-      "dev": true,
-      "dependencies": {
-        "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4",
-        "isarray": "^1.0.0"
-      }
+    "node_modules/node-libs-browser/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "dev": true
     },
     "node_modules/node-libs-browser/node_modules/punycode": {
       "version": "1.4.1",
@@ -21463,6 +21083,15 @@
       "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
       "dev": true
     },
+    "node_modules/node-libs-browser/node_modules/util": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "2.0.3"
+      }
+    },
     "node_modules/node-modules-regexp": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
@@ -21473,9 +21102,9 @@
       }
     },
     "node_modules/node-notifier": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.2.tgz",
-      "integrity": "sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.0.tgz",
+      "integrity": "sha512-46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA==",
       "dev": true,
       "optional": true,
       "dependencies": {
@@ -21487,12 +21116,28 @@
         "which": "^2.0.2"
       }
     },
+    "node_modules/node-notifier/node_modules/uuid": {
+      "version": "8.3.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.1.tgz",
+      "integrity": "sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==",
+      "dev": true,
+      "optional": true,
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
     "node_modules/node-releases": {
-      "version": "1.1.73",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz",
-      "integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==",
+      "version": "1.1.61",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.61.tgz",
+      "integrity": "sha512-DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g==",
       "dev": true
     },
+    "node_modules/noop-logger": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz",
+      "integrity": "sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI=",
+      "optional": true
+    },
     "node_modules/nopt": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
@@ -21517,9 +21162,9 @@
       }
     },
     "node_modules/normalize-package-data/node_modules/hosted-git-info": {
-      "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
+      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="
     },
     "node_modules/normalize-package-data/node_modules/semver": {
       "version": "5.7.1",
@@ -21548,15 +21193,11 @@
       }
     },
     "node_modules/normalize-url": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
-      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
-      "dev": true,
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
+      "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==",
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=8"
       }
     },
     "node_modules/now-and-later": {
@@ -21572,9 +21213,9 @@
       }
     },
     "node_modules/npm-bundled": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz",
-      "integrity": "sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz",
+      "integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==",
       "dependencies": {
         "npm-normalize-package-bin": "^1.0.1"
       }
@@ -21596,11 +21237,11 @@
       "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA=="
     },
     "node_modules/npm-package-arg": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.0.tgz",
-      "integrity": "sha512-/ep6QDxBkm9HvOhOg0heitSd7JHA1U7y1qhhlRlteYYAi9Pdb/ZV7FW5aHpkrpM8+P+4p/jjR8zCyKPBMBjSig==",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.0.1.tgz",
+      "integrity": "sha512-/h5Fm6a/exByzFSTm7jAyHbgOqErl9qSNJDQF32Si/ZzgwT2TERVxRxn3Jurw1wflgyVVAxnFR4fRHPM7y1ClQ==",
       "dependencies": {
-        "hosted-git-info": "^3.0.6",
+        "hosted-git-info": "^3.0.2",
         "semver": "^7.0.0",
         "validate-npm-package-name": "^3.0.0"
       },
@@ -21609,20 +21250,14 @@
       }
     },
     "node_modules/npm-packlist": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.2.2.tgz",
-      "integrity": "sha512-Jt01acDvJRhJGthnUJVF/w6gumWOZxO7IkpY/lsX9//zqQgnF7OJaxgQXcerd4uQOLu7W5bkb4mChL9mdfm+Zg==",
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz",
+      "integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==",
+      "dev": true,
       "dependencies": {
-        "glob": "^7.1.6",
-        "ignore-walk": "^3.0.3",
-        "npm-bundled": "^1.1.1",
+        "ignore-walk": "^3.0.1",
+        "npm-bundled": "^1.0.1",
         "npm-normalize-package-bin": "^1.0.1"
-      },
-      "bin": {
-        "npm-packlist": "bin/index.js"
-      },
-      "engines": {
-        "node": ">=10"
       }
     },
     "node_modules/npm-pick-manifest": {
@@ -21636,23 +21271,82 @@
       }
     },
     "node_modules/npm-registry-fetch": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-9.0.0.tgz",
-      "integrity": "sha512-PuFYYtnQ8IyVl6ib9d3PepeehcUeHN9IO5N/iCRhyg9tStQcqGQBRVHmfmMWPDERU3KwZoHFvbJ4FPXPspvzbA==",
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.7.tgz",
+      "integrity": "sha512-cny9v0+Mq6Tjz+e0erFAB+RYJ/AVGzkjnISiobqP8OWj9c9FLoZZu8/SPSKJWE17F1tk4018wfjV+ZbIbqC7fQ==",
+      "dev": true,
       "dependencies": {
-        "@npmcli/ci-detect": "^1.0.0",
-        "lru-cache": "^6.0.0",
-        "make-fetch-happen": "^8.0.9",
-        "minipass": "^3.1.3",
-        "minipass-fetch": "^1.3.0",
-        "minipass-json-stream": "^1.0.1",
-        "minizlib": "^2.0.0",
-        "npm-package-arg": "^8.0.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "bluebird": "^3.5.1",
+        "figgy-pudding": "^3.4.1",
+        "JSONStream": "^1.3.4",
+        "lru-cache": "^5.1.1",
+        "make-fetch-happen": "^5.0.0",
+        "npm-package-arg": "^6.1.0",
+        "safe-buffer": "^5.2.0"
       }
     },
+    "node_modules/npm-registry-fetch/node_modules/hosted-git-info": {
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
+      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+      "dev": true
+    },
+    "node_modules/npm-registry-fetch/node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/npm-registry-fetch/node_modules/npm-package-arg": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
+      "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
+      "dev": true,
+      "dependencies": {
+        "hosted-git-info": "^2.7.1",
+        "osenv": "^0.1.5",
+        "semver": "^5.6.0",
+        "validate-npm-package-name": "^3.0.0"
+      }
+    },
+    "node_modules/npm-registry-fetch/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/npm-registry-fetch/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/npm-registry-fetch/node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true
+    },
     "node_modules/npm-run-path": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
@@ -21684,6 +21378,12 @@
         "boolbase": "~1.0.0"
       }
     },
+    "node_modules/num2fraction": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
+      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
+      "dev": true
+    },
     "node_modules/number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
@@ -21740,53 +21440,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/object-copy/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/is-descriptor/node_modules/kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/object-copy/node_modules/kind-of": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -21800,22 +21453,22 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz",
-      "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
+      "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==",
       "dev": true,
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/object-is": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
-      "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.3.tgz",
+      "integrity": "sha512-teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.18.0-next.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -21833,6 +21486,15 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/object-path": {
+      "version": "0.11.4",
+      "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.11.4.tgz",
+      "integrity": "sha1-NwrnUvvzfePqcKhhwju6iRVpGUk=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/object-visit": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
@@ -21855,13 +21517,13 @@
       }
     },
     "node_modules/object.assign": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz",
+      "integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.0",
         "define-properties": "^1.1.3",
+        "es-abstract": "^1.18.0-next.0",
         "has-symbols": "^1.0.1",
         "object-keys": "^1.1.1"
       },
@@ -21896,6 +21558,47 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/object.getownpropertydescriptors": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz",
+      "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.getownpropertydescriptors/node_modules/es-abstract": {
+      "version": "1.17.7",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+      "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+      "dev": true,
+      "dependencies": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.2",
+        "is-regex": "^1.1.1",
+        "object-inspect": "^1.8.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.1",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/object.map": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
@@ -21944,14 +21647,40 @@
       }
     },
     "node_modules/object.values": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.4.tgz",
-      "integrity": "sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz",
+      "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.2"
+        "es-abstract": "^1.17.0-next.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.values/node_modules/es-abstract": {
+      "version": "1.17.7",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+      "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+      "dev": true,
+      "dependencies": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.2",
+        "is-regex": "^1.1.1",
+        "object-inspect": "^1.8.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.1",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -21961,9 +21690,9 @@
       }
     },
     "node_modules/objectorarray": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/objectorarray/-/objectorarray-1.0.5.tgz",
-      "integrity": "sha512-eJJDYkhJFFbBBAxeh8xW+weHlkI28n2ZdQV/J/DNfWfSKlGEf2xcfAbZTv3riEXHAhL9SVOTs2pRmXiSTf78xg=="
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/objectorarray/-/objectorarray-1.0.4.tgz",
+      "integrity": "sha512-91k8bjcldstRz1bG6zJo8lWD7c6QXcB4nTDUqiEvIL1xAsLoZlOOZZG+nd6YPz+V7zY1580J4Xxh1vZtyv4i/w=="
     },
     "node_modules/obuf": {
       "version": "1.1.2",
@@ -22013,9 +21742,9 @@
       }
     },
     "node_modules/open": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/open/-/open-7.4.0.tgz",
-      "integrity": "sha512-PGoBCX/lclIWlpS/R2PQuIR4NJoXh6X5AwVzE7WXnWRGvHg7+4TBCgsujUgiPpm0K1y4qvQeWnCWVTpTKZBtvA==",
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/open/-/open-7.3.0.tgz",
+      "integrity": "sha512-mgLwQIx2F/ye9SmbrUkurZCnkoXyXyu9EbHtJZrICjVAJfyMArdHp3KkixGdZx1ZHFPNIwl0DDM1dFFqXbTLZw==",
       "dependencies": {
         "is-docker": "^2.0.0",
         "is-wsl": "^2.1.1"
@@ -22066,86 +21795,68 @@
       }
     },
     "node_modules/ora": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-5.3.0.tgz",
-      "integrity": "sha512-zAKMgGXUim0Jyd6CXK9lraBnD3H5yPGBPPOkC23a2BG6hsm4Zu6OQSjQuEtV0BHDf4aKHcUFvJiGRrFuW3MG8g==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-4.0.4.tgz",
+      "integrity": "sha512-77iGeVU1cIdRhgFzCK8aw1fbtT1B/iZAvWjS+l/o1x0RShMgxHUZaD2yDpWsNCPwXg9z1ZA78Kbdvr8kBmG/Ww==",
       "dev": true,
       "dependencies": {
-        "bl": "^4.0.3",
-        "chalk": "^4.1.0",
+        "chalk": "^3.0.0",
         "cli-cursor": "^3.1.0",
-        "cli-spinners": "^2.5.0",
+        "cli-spinners": "^2.2.0",
         "is-interactive": "^1.0.0",
-        "log-symbols": "^4.0.0",
+        "log-symbols": "^3.0.0",
+        "mute-stream": "0.0.8",
         "strip-ansi": "^6.0.0",
         "wcwidth": "^1.0.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=8"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/ora/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/ora/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/ora/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/ora/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/ora/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
       "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/ora/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/ora/node_modules/cli-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "restore-cursor": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ora/node_modules/restore-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "dev": true,
+      "dependencies": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ora/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
       },
       "engines": {
         "node": ">=8"
@@ -22196,19 +21907,15 @@
       }
     },
     "node_modules/os-name": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/os-name/-/os-name-4.0.1.tgz",
-      "integrity": "sha512-xl9MAoU97MH1Xt5K9ERft2YfCAoaO6msy1OBA0ozxEC0x0TmIoE6K3QvgJMMZA9yKGLmHXNY/YZoDbiGDj4zYw==",
-      "dev": true,
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/os-name/-/os-name-3.1.0.tgz",
+      "integrity": "sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==",
       "dependencies": {
-        "macos-release": "^2.5.0",
-        "windows-release": "^4.0.0"
+        "macos-release": "^2.2.0",
+        "windows-release": "^3.1.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=6"
       }
     },
     "node_modules/os-tmpdir": {
@@ -22237,15 +21944,12 @@
       }
     },
     "node_modules/p-each-series": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.2.0.tgz",
-      "integrity": "sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.1.0.tgz",
+      "integrity": "sha512-ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/p-finally": {
@@ -22257,32 +21961,6 @@
       }
     },
     "node_modules/p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dev": true,
-      "dependencies": {
-        "yocto-queue": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-      "dependencies": {
-        "p-limit": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/p-locate/node_modules/p-limit": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
       "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
@@ -22293,7 +21971,7 @@
         "node": ">=4"
       }
     },
-    "node_modules/p-locate/node_modules/p-try": {
+    "node_modules/p-limit/node_modules/p-try": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
       "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
@@ -22301,6 +21979,17 @@
         "node": ">=4"
       }
     },
+    "node_modules/p-locate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "dependencies": {
+        "p-limit": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/p-map": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
@@ -22327,15 +22016,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/p-retry/node_modules/retry": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
-      "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
     "node_modules/p-try": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
@@ -22364,6 +22044,82 @@
         "node": ">= 6"
       }
     },
+    "node_modules/pac-proxy-agent/node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/pac-proxy-agent/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/pac-proxy-agent/node_modules/http-proxy-agent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+      "dev": true,
+      "dependencies": {
+        "@tootallnate/once": "1",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/pac-proxy-agent/node_modules/https-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/pac-proxy-agent/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/pac-proxy-agent/node_modules/socks-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4",
+        "socks": "^2.3.3"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/pac-resolver": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-4.2.0.tgz",
@@ -22401,37 +22157,216 @@
       }
     },
     "node_modules/pacote": {
-      "version": "11.2.4",
-      "resolved": "https://registry.npmjs.org/pacote/-/pacote-11.2.4.tgz",
-      "integrity": "sha512-GfTeVQGJ6WyBQbQD4t3ocHbyOmTQLmWjkCKSZPmKiGFKYKNUaM5U2gbLzUW8WG1XmS9yQFnsTFA0k3o1+q4klQ==",
+      "version": "9.5.12",
+      "resolved": "https://registry.npmjs.org/pacote/-/pacote-9.5.12.tgz",
+      "integrity": "sha512-BUIj/4kKbwWg4RtnBncXPJd15piFSVNpTzY0rysSr3VnMowTYgkGKcaHrbReepAkjTr8lH2CVWRi58Spg2CicQ==",
+      "dev": true,
       "dependencies": {
-        "@npmcli/git": "^2.0.1",
-        "@npmcli/installed-package-contents": "^1.0.5",
-        "@npmcli/promise-spawn": "^1.2.0",
-        "@npmcli/run-script": "^1.3.0",
-        "cacache": "^15.0.5",
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.1.0",
+        "bluebird": "^3.5.3",
+        "cacache": "^12.0.2",
+        "chownr": "^1.1.2",
+        "figgy-pudding": "^3.5.1",
+        "get-stream": "^4.1.0",
+        "glob": "^7.1.3",
         "infer-owner": "^1.0.4",
-        "minipass": "^3.1.3",
-        "mkdirp": "^1.0.3",
-        "npm-package-arg": "^8.0.1",
-        "npm-packlist": "^2.1.4",
-        "npm-pick-manifest": "^6.0.0",
-        "npm-registry-fetch": "^9.0.0",
+        "lru-cache": "^5.1.1",
+        "make-fetch-happen": "^5.0.0",
+        "minimatch": "^3.0.4",
+        "minipass": "^2.3.5",
+        "mississippi": "^3.0.0",
+        "mkdirp": "^0.5.1",
+        "normalize-package-data": "^2.4.0",
+        "npm-normalize-package-bin": "^1.0.0",
+        "npm-package-arg": "^6.1.0",
+        "npm-packlist": "^1.1.12",
+        "npm-pick-manifest": "^3.0.0",
+        "npm-registry-fetch": "^4.0.0",
+        "osenv": "^0.1.5",
+        "promise-inflight": "^1.0.1",
         "promise-retry": "^1.1.1",
-        "read-package-json-fast": "^1.1.3",
-        "rimraf": "^3.0.2",
-        "ssri": "^8.0.0",
-        "tar": "^6.1.0"
-      },
-      "bin": {
-        "pacote": "lib/bin.js"
+        "protoduck": "^5.0.1",
+        "rimraf": "^2.6.2",
+        "safe-buffer": "^5.1.2",
+        "semver": "^5.6.0",
+        "ssri": "^6.0.1",
+        "tar": "^4.4.10",
+        "unique-filename": "^1.1.1",
+        "which": "^1.3.1"
+      }
+    },
+    "node_modules/pacote/node_modules/cacache": {
+      "version": "12.0.4",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
+      "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
+      "dev": true,
+      "dependencies": {
+        "bluebird": "^3.5.5",
+        "chownr": "^1.1.1",
+        "figgy-pudding": "^3.5.1",
+        "glob": "^7.1.4",
+        "graceful-fs": "^4.1.15",
+        "infer-owner": "^1.0.3",
+        "lru-cache": "^5.1.1",
+        "mississippi": "^3.0.0",
+        "mkdirp": "^0.5.1",
+        "move-concurrently": "^1.0.1",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^2.6.3",
+        "ssri": "^6.0.1",
+        "unique-filename": "^1.1.1",
+        "y18n": "^4.0.0"
+      }
+    },
+    "node_modules/pacote/node_modules/chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "dev": true
+    },
+    "node_modules/pacote/node_modules/fs-minipass": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
+      "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^2.6.0"
+      }
+    },
+    "node_modules/pacote/node_modules/get-stream": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "dev": true,
+      "dependencies": {
+        "pump": "^3.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=6"
       }
     },
+    "node_modules/pacote/node_modules/hosted-git-info": {
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
+      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+      "dev": true
+    },
+    "node_modules/pacote/node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/pacote/node_modules/minipass": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
+      "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "^5.1.2",
+        "yallist": "^3.0.0"
+      }
+    },
+    "node_modules/pacote/node_modules/minizlib": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
+      "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^2.9.0"
+      }
+    },
+    "node_modules/pacote/node_modules/npm-package-arg": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
+      "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
+      "dev": true,
+      "dependencies": {
+        "hosted-git-info": "^2.7.1",
+        "osenv": "^0.1.5",
+        "semver": "^5.6.0",
+        "validate-npm-package-name": "^3.0.0"
+      }
+    },
+    "node_modules/pacote/node_modules/npm-pick-manifest": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-3.0.2.tgz",
+      "integrity": "sha512-wNprTNg+X5nf+tDi+hbjdHhM4bX+mKqv6XmPh7B5eG+QY9VARfQPfCEH013H5GqfNj6ee8Ij2fg8yk0mzps1Vw==",
+      "dev": true,
+      "dependencies": {
+        "figgy-pudding": "^3.5.1",
+        "npm-package-arg": "^6.0.0",
+        "semver": "^5.4.1"
+      }
+    },
+    "node_modules/pacote/node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/pacote/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/pacote/node_modules/ssri": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+      "dev": true,
+      "dependencies": {
+        "figgy-pudding": "^3.5.1"
+      }
+    },
+    "node_modules/pacote/node_modules/tar": {
+      "version": "4.4.13",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz",
+      "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
+      "dev": true,
+      "dependencies": {
+        "chownr": "^1.1.1",
+        "fs-minipass": "^1.2.5",
+        "minipass": "^2.8.6",
+        "minizlib": "^1.2.1",
+        "mkdirp": "^0.5.0",
+        "safe-buffer": "^5.1.2",
+        "yallist": "^3.0.3"
+      },
+      "engines": {
+        "node": ">=4.5"
+      }
+    },
+    "node_modules/pacote/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/pacote/node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true
+    },
     "node_modules/pako": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
@@ -22496,21 +22431,16 @@
       }
     },
     "node_modules/parse-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.0.0",
         "error-ex": "^1.3.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "lines-and-columns": "^1.1.6"
+        "json-parse-better-errors": "^1.0.1"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=4"
       }
     },
     "node_modules/parse-node-version": {
@@ -22532,58 +22462,9 @@
       }
     },
     "node_modules/parse5": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz",
-      "integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/parse5-html-rewriting-stream": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-6.0.1.tgz",
-      "integrity": "sha512-vwLQzynJVEfUlURxgnf51yAJDQTtVpNyGD8tKi2Za7m+akukNHxCcUQMAa/mUGLhCeicFdpy7Tlvj8ZNKadprg==",
-      "dev": true,
-      "dependencies": {
-        "parse5": "^6.0.1",
-        "parse5-sax-parser": "^6.0.1"
-      }
-    },
-    "node_modules/parse5-html-rewriting-stream/node_modules/parse5": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
-      "dev": true
-    },
-    "node_modules/parse5-htmlparser2-tree-adapter": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz",
-      "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==",
-      "dev": true,
-      "dependencies": {
-        "parse5": "^6.0.1"
-      }
-    },
-    "node_modules/parse5-htmlparser2-tree-adapter/node_modules/parse5": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
-      "dev": true
-    },
-    "node_modules/parse5-sax-parser": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5-sax-parser/-/parse5-sax-parser-6.0.1.tgz",
-      "integrity": "sha512-kXX+5S81lgESA0LsDuGjAlBybImAChYRMT+/uKCEXFBFOeEhS52qUCydGhU3qLRD8D9DVjaUo821WK7DM4iCeg==",
-      "dev": true,
-      "dependencies": {
-        "parse5": "^6.0.1"
-      }
-    },
-    "node_modules/parse5-sax-parser/node_modules/parse5": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
+      "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==",
       "dev": true
     },
     "node_modules/parseurl": {
@@ -22645,9 +22526,9 @@
       }
     },
     "node_modules/path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
     },
     "node_modules/path-root": {
       "version": "0.1.1",
@@ -22684,9 +22565,9 @@
       }
     },
     "node_modules/pbkdf2": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
-      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.1.tgz",
+      "integrity": "sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==",
       "dev": true,
       "dependencies": {
         "create-hash": "^1.1.2",
@@ -22717,9 +22598,9 @@
       "deprecated": "This package is deprecated, see https://blog.phonegap.com/update-for-customers-using-phonegap-and-phonegap-build-cc701c77502c"
     },
     "node_modules/picomatch": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
-      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
       "engines": {
         "node": ">=8.6"
       },
@@ -22728,14 +22609,11 @@
       }
     },
     "node_modules/pify": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz",
-      "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=6"
       }
     },
     "node_modules/pinkie": {
@@ -22772,15 +22650,67 @@
       }
     },
     "node_modules/pkg-dir": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
-      "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
       "dev": true,
       "dependencies": {
-        "find-up": "^2.1.0"
+        "find-up": "^3.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=6"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/find-up": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/locate-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/p-locate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
       }
     },
     "node_modules/pkg-up": {
@@ -22795,13 +22725,13 @@
       }
     },
     "node_modules/plist": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.2.tgz",
-      "integrity": "sha512-MSrkwZBdQ6YapHy87/8hDU8MnIcyxBKjeF+McXnr5A9MtffPewTs7G3hlpodT5TacyfIyFTaJEhh3GGcmasTgQ==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.1.tgz",
+      "integrity": "sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==",
       "dependencies": {
-        "base64-js": "^1.5.1",
+        "base64-js": "^1.2.3",
         "xmlbuilder": "^9.0.7",
-        "xmldom": "^0.5.0"
+        "xmldom": "0.1.x"
       },
       "engines": {
         "node": ">=6"
@@ -22823,6 +22753,58 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/plugin-error/node_modules/arr-diff": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
+      "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.0.1",
+        "array-slice": "^0.2.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/plugin-error/node_modules/arr-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
+      "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/plugin-error/node_modules/array-slice": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
+      "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/plugin-error/node_modules/extend-shallow": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
+      "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/plugin-error/node_modules/kind-of": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
+      "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/pnp-webpack-plugin": {
       "version": "1.6.4",
       "resolved": "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz",
@@ -22850,25 +22832,20 @@
       }
     },
     "node_modules/portfinder/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
       "dev": true,
       "dependencies": {
         "ms": "^2.1.1"
       }
     },
-    "node_modules/portfinder/node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
+    "node_modules/portfinder/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
     },
     "node_modules/posix-character-classes": {
       "version": "0.1.1",
@@ -22880,562 +22857,759 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.2.15",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.15.tgz",
-      "integrity": "sha512-2zO3b26eJD/8rb106Qu2o7Qgg52ND5HPjcyQiK2B98O388h43A448LCslC0dI2P97wCAQRJsFvwTRcXxTKds+Q==",
+      "version": "7.0.31",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.31.tgz",
+      "integrity": "sha512-a937VDHE1ftkjk+8/7nj/mrjtmkn69xxzJgRETXdAUU+IgOYPQNJF17haGWbeDxSyk++HA14UA98FurvPyBJOA==",
       "dev": true,
       "dependencies": {
-        "colorette": "^1.2.2",
-        "nanoid": "^3.1.23",
-        "source-map": "^0.6.1"
+        "chalk": "^2.4.2",
+        "source-map": "^0.6.1",
+        "supports-color": "^6.1.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14"
+        "node": ">=6.0.0"
+      },
+      "funding": {
+        "type": "tidelift",
+        "url": "https://tidelift.com/funding/github/npm/postcss"
+      }
+    },
+    "node_modules/postcss-calc": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.5.tgz",
+      "integrity": "sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^7.0.27",
+        "postcss-selector-parser": "^6.0.2",
+        "postcss-value-parser": "^4.0.2"
+      }
+    },
+    "node_modules/postcss-colormin": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz",
+      "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.0.0",
+        "color": "^3.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-colormin/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-convert-values": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz",
+      "integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-convert-values/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-discard-comments": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz",
+      "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-discard-duplicates": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz",
+      "integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-discard-empty": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz",
+      "integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-discard-overridden": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz",
+      "integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-import": {
+      "version": "12.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-12.0.1.tgz",
+      "integrity": "sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^7.0.1",
+        "postcss-value-parser": "^3.2.3",
+        "read-cache": "^1.0.0",
+        "resolve": "^1.1.7"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/postcss-import/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-load-config": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.2.tgz",
+      "integrity": "sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==",
+      "dev": true,
+      "dependencies": {
+        "cosmiconfig": "^5.0.0",
+        "import-cwd": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 4"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/postcss/"
       }
     },
-    "node_modules/postcss-calc": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.0.0.tgz",
-      "integrity": "sha512-5NglwDrcbiy8XXfPM11F3HeC6hoT9W7GUH/Zi5U/p7u3Irv4rHhdDcIZwG0llHXV4ftsBjpfWMXAnXNl4lnt8g==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.0.2"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.2"
-      }
-    },
-    "node_modules/postcss-colormin": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.2.0.tgz",
-      "integrity": "sha512-+HC6GfWU3upe5/mqmxuqYZ9B2Wl4lcoUUNkoaX59nEWV4EtADCMiBqui111Bu8R8IvaZTmqmxrqOAqjbHIwXPw==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.16.6",
-        "caniuse-api": "^3.0.0",
-        "colord": "^2.0.1",
-        "postcss-value-parser": "^4.1.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-convert-values": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.0.1.tgz",
-      "integrity": "sha512-C3zR1Do2BkKkCgC0g3sF8TS0koF2G+mN8xxayZx3f10cIRmTaAnpgpRQZjNekTZxM2ciSPoh2IWJm0VZx8NoQg==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.1.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-discard-comments": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.0.1.tgz",
-      "integrity": "sha512-lgZBPTDvWrbAYY1v5GYEv8fEO/WhKOu/hmZqmCYfrpD6eyDWWzAOsl2rF29lpvziKO02Gc5GJQtlpkTmakwOWg==",
-      "dev": true,
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-discard-duplicates": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.1.tgz",
-      "integrity": "sha512-svx747PWHKOGpAXXQkCc4k/DsWo+6bc5LsVrAsw+OU+Ibi7klFZCyX54gjYzX4TH+f2uzXjRviLARxkMurA2bA==",
-      "dev": true,
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-discard-empty": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.0.1.tgz",
-      "integrity": "sha512-vfU8CxAQ6YpMxV2SvMcMIyF2LX1ZzWpy0lqHDsOdaKKLQVQGVP1pzhrI9JlsO65s66uQTfkQBKBD/A5gp9STFw==",
-      "dev": true,
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-discard-overridden": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.0.1.tgz",
-      "integrity": "sha512-Y28H7y93L2BpJhrdUR2SR2fnSsT+3TVx1NmVQLbcnZWwIUpJ7mfcTC6Za9M2PG6w8j7UQRfzxqn8jU2VwFxo3Q==",
-      "dev": true,
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-import": {
-      "version": "14.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-14.0.0.tgz",
-      "integrity": "sha512-gFDDzXhqr9ELmnLHgCC3TbGfA6Dm/YMb/UN8/f7Uuq4fL7VTk2vOIj6hwINEwbokEmp123bLD7a5m+E+KIetRg==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.0.0",
-        "read-cache": "^1.0.0",
-        "resolve": "^1.1.7"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.0.0"
-      }
-    },
     "node_modules/postcss-loader": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-4.2.0.tgz",
-      "integrity": "sha512-mqgScxHqbiz1yxbnNcPdKYo/6aVt+XExURmEbQlviFVWogDbM4AJ0A/B+ZBpYsJrTRxKw7HyRazg9x0Q9SWwLA==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz",
+      "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==",
       "dev": true,
       "dependencies": {
-        "cosmiconfig": "^7.0.0",
-        "klona": "^2.0.4",
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0",
-        "semver": "^7.3.4"
+        "loader-utils": "^1.1.0",
+        "postcss": "^7.0.0",
+        "postcss-load-config": "^2.0.0",
+        "schema-utils": "^1.0.0"
       },
       "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "postcss": "^7.0.0 || ^8.0.1",
-        "webpack": "^4.0.0 || ^5.0.0"
+        "node": ">= 6"
       }
     },
-    "node_modules/postcss-loader/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+    "node_modules/postcss-loader/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
       "dev": true,
       "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
+        "minimist": "^1.2.0"
       },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
+      "bin": {
+        "json5": "lib/cli.js"
       }
     },
-    "node_modules/postcss-loader/node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+    "node_modules/postcss-loader/node_modules/loader-utils": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
       "dev": true,
-      "peerDependencies": {
-        "ajv": "^6.9.1"
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
       }
     },
-    "node_modules/postcss-loader/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
     "node_modules/postcss-loader/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
       "dev": true,
       "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
+        "ajv": "^6.1.0",
+        "ajv-errors": "^1.0.0",
+        "ajv-keywords": "^3.1.0"
       },
       "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
+        "node": ">= 4"
       }
     },
     "node_modules/postcss-merge-longhand": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.0.2.tgz",
-      "integrity": "sha512-BMlg9AXSI5G9TBT0Lo/H3PfUy63P84rVz3BjCFE9e9Y9RXQZD3+h3YO1kgTNsNJy7bBc1YQp8DmSnwLIW5VPcw==",
+      "version": "4.0.11",
+      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz",
+      "integrity": "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==",
       "dev": true,
       "dependencies": {
-        "css-color-names": "^1.0.1",
-        "postcss-value-parser": "^4.1.0",
-        "stylehacks": "^5.0.1"
+        "css-color-names": "0.0.4",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0",
+        "stylehacks": "^4.0.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+        "node": ">=6.9.0"
       }
     },
+    "node_modules/postcss-merge-longhand/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
     "node_modules/postcss-merge-rules": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.0.2.tgz",
-      "integrity": "sha512-5K+Md7S3GwBewfB4rjDeol6V/RZ8S+v4B66Zk2gChRqLTCC8yjnHQ601omj9TKftS19OPGqZ/XzoqpzNQQLwbg==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz",
+      "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==",
       "dev": true,
       "dependencies": {
-        "browserslist": "^4.16.6",
+        "browserslist": "^4.0.0",
         "caniuse-api": "^3.0.0",
-        "cssnano-utils": "^2.0.1",
-        "postcss-selector-parser": "^6.0.5",
-        "vendors": "^1.0.3"
+        "cssnano-util-same-parent": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-selector-parser": "^3.0.0",
+        "vendors": "^1.0.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-merge-rules/node_modules/postcss-selector-parser": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
+      "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
+      "dev": true,
+      "dependencies": {
+        "dot-prop": "^5.2.0",
+        "indexes-of": "^1.0.1",
+        "uniq": "^1.0.1"
       },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+      "engines": {
+        "node": ">=8"
       }
     },
     "node_modules/postcss-minify-font-values": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.0.1.tgz",
-      "integrity": "sha512-7JS4qIsnqaxk+FXY1E8dHBDmraYFWmuL6cgt0T1SWGRO5bzJf8sUoelwa4P88LEWJZweHevAiDKxHlofuvtIoA==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz",
+      "integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==",
       "dev": true,
       "dependencies": {
-        "postcss-value-parser": "^4.1.0"
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+        "node": ">=6.9.0"
       }
     },
+    "node_modules/postcss-minify-font-values/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
     "node_modules/postcss-minify-gradients": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.0.1.tgz",
-      "integrity": "sha512-odOwBFAIn2wIv+XYRpoN2hUV3pPQlgbJ10XeXPq8UY2N+9ZG42xu45lTn/g9zZ+d70NKSQD6EOi6UiCMu3FN7g==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz",
+      "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==",
       "dev": true,
       "dependencies": {
-        "cssnano-utils": "^2.0.1",
-        "is-color-stop": "^1.1.0",
-        "postcss-value-parser": "^4.1.0"
+        "cssnano-util-get-arguments": "^4.0.0",
+        "is-color-stop": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+        "node": ">=6.9.0"
       }
     },
+    "node_modules/postcss-minify-gradients/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
     "node_modules/postcss-minify-params": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.0.1.tgz",
-      "integrity": "sha512-4RUC4k2A/Q9mGco1Z8ODc7h+A0z7L7X2ypO1B6V8057eVK6mZ6xwz6QN64nHuHLbqbclkX1wyzRnIrdZehTEHw==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz",
+      "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==",
       "dev": true,
       "dependencies": {
-        "alphanum-sort": "^1.0.2",
-        "browserslist": "^4.16.0",
-        "cssnano-utils": "^2.0.1",
-        "postcss-value-parser": "^4.1.0",
+        "alphanum-sort": "^1.0.0",
+        "browserslist": "^4.0.0",
+        "cssnano-util-get-arguments": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0",
         "uniqs": "^2.0.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+        "node": ">=6.9.0"
       }
     },
+    "node_modules/postcss-minify-params/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
     "node_modules/postcss-minify-selectors": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.1.0.tgz",
-      "integrity": "sha512-NzGBXDa7aPsAcijXZeagnJBKBPMYLaJJzB8CQh6ncvyl2sIndLVWfbcDi0SBjRWk5VqEjXvf8tYwzoKf4Z07og==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz",
+      "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==",
       "dev": true,
       "dependencies": {
-        "alphanum-sort": "^1.0.2",
-        "postcss-selector-parser": "^6.0.5"
+        "alphanum-sort": "^1.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-selector-parser": "^3.0.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-minify-selectors/node_modules/postcss-selector-parser": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
+      "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
+      "dev": true,
+      "dependencies": {
+        "dot-prop": "^5.2.0",
+        "indexes-of": "^1.0.1",
+        "uniq": "^1.0.1"
       },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+      "engines": {
+        "node": ">=8"
       }
     },
     "node_modules/postcss-modules-extract-imports": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
-      "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz",
+      "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==",
       "dev": true,
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
+      "dependencies": {
+        "postcss": "^7.0.5"
       },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
+      "engines": {
+        "node": ">= 6"
       }
     },
     "node_modules/postcss-modules-local-by-default": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz",
-      "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz",
+      "integrity": "sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==",
       "dev": true,
       "dependencies": {
-        "icss-utils": "^5.0.0",
+        "icss-utils": "^4.1.1",
+        "postcss": "^7.0.32",
         "postcss-selector-parser": "^6.0.2",
         "postcss-value-parser": "^4.1.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >= 14"
+        "node": ">= 6"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
       },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default/node_modules/chalk/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/postcss-modules-local-by-default/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default/node_modules/postcss": {
+      "version": "7.0.35",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
+      "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.2",
+        "source-map": "^0.6.1",
+        "supports-color": "^6.1.0"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default/node_modules/supports-color": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
       }
     },
     "node_modules/postcss-modules-scope": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
-      "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz",
+      "integrity": "sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==",
       "dev": true,
       "dependencies": {
-        "postcss-selector-parser": "^6.0.4"
+        "postcss": "^7.0.6",
+        "postcss-selector-parser": "^6.0.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
+        "node": ">= 6"
       }
     },
     "node_modules/postcss-modules-values": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
-      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz",
+      "integrity": "sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==",
       "dev": true,
       "dependencies": {
-        "icss-utils": "^5.0.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
+        "icss-utils": "^4.0.0",
+        "postcss": "^7.0.6"
       }
     },
     "node_modules/postcss-normalize-charset": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.0.1.tgz",
-      "integrity": "sha512-6J40l6LNYnBdPSk+BHZ8SF+HAkS4q2twe5jnocgd+xWpz/mx/5Sa32m3W1AA8uE8XaXN+eg8trIlfu8V9x61eg==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz",
+      "integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==",
       "dev": true,
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
+      "dependencies": {
+        "postcss": "^7.0.0"
       },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/postcss-normalize-display-values": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.1.tgz",
-      "integrity": "sha512-uupdvWk88kLDXi5HEyI9IaAJTE3/Djbcrqq8YgjvAVuzgVuqIk3SuJWUisT2gaJbZm1H9g5k2w1xXilM3x8DjQ==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz",
+      "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==",
       "dev": true,
       "dependencies": {
-        "cssnano-utils": "^2.0.1",
-        "postcss-value-parser": "^4.1.0"
+        "cssnano-util-get-match": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+        "node": ">=6.9.0"
       }
     },
+    "node_modules/postcss-normalize-display-values/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
     "node_modules/postcss-normalize-positions": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.0.1.tgz",
-      "integrity": "sha512-rvzWAJai5xej9yWqlCb1OWLd9JjW2Ex2BCPzUJrbaXmtKtgfL8dBMOOMTX6TnvQMtjk3ei1Lswcs78qKO1Skrg==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz",
+      "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==",
       "dev": true,
       "dependencies": {
-        "postcss-value-parser": "^4.1.0"
+        "cssnano-util-get-arguments": "^4.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+        "node": ">=6.9.0"
       }
     },
+    "node_modules/postcss-normalize-positions/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
     "node_modules/postcss-normalize-repeat-style": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.1.tgz",
-      "integrity": "sha512-syZ2itq0HTQjj4QtXZOeefomckiV5TaUO6ReIEabCh3wgDs4Mr01pkif0MeVwKyU/LHEkPJnpwFKRxqWA/7O3w==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz",
+      "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==",
       "dev": true,
       "dependencies": {
-        "cssnano-utils": "^2.0.1",
-        "postcss-value-parser": "^4.1.0"
+        "cssnano-util-get-arguments": "^4.0.0",
+        "cssnano-util-get-match": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+        "node": ">=6.9.0"
       }
     },
+    "node_modules/postcss-normalize-repeat-style/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
     "node_modules/postcss-normalize-string": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.0.1.tgz",
-      "integrity": "sha512-Ic8GaQ3jPMVl1OEn2U//2pm93AXUcF3wz+OriskdZ1AOuYV25OdgS7w9Xu2LO5cGyhHCgn8dMXh9bO7vi3i9pA==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz",
+      "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==",
       "dev": true,
       "dependencies": {
-        "postcss-value-parser": "^4.1.0"
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+        "node": ">=6.9.0"
       }
     },
+    "node_modules/postcss-normalize-string/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
     "node_modules/postcss-normalize-timing-functions": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.0.1.tgz",
-      "integrity": "sha512-cPcBdVN5OsWCNEo5hiXfLUnXfTGtSFiBU9SK8k7ii8UD7OLuznzgNRYkLZow11BkQiiqMcgPyh4ZqXEEUrtQ1Q==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz",
+      "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==",
       "dev": true,
       "dependencies": {
-        "cssnano-utils": "^2.0.1",
-        "postcss-value-parser": "^4.1.0"
+        "cssnano-util-get-match": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+        "node": ">=6.9.0"
       }
     },
+    "node_modules/postcss-normalize-timing-functions/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
     "node_modules/postcss-normalize-unicode": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.1.tgz",
-      "integrity": "sha512-kAtYD6V3pK0beqrU90gpCQB7g6AOfP/2KIPCVBKJM2EheVsBQmx/Iof+9zR9NFKLAx4Pr9mDhogB27pmn354nA==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz",
+      "integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==",
       "dev": true,
       "dependencies": {
-        "browserslist": "^4.16.0",
-        "postcss-value-parser": "^4.1.0"
+        "browserslist": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+        "node": ">=6.9.0"
       }
     },
+    "node_modules/postcss-normalize-unicode/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
     "node_modules/postcss-normalize-url": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.0.2.tgz",
-      "integrity": "sha512-k4jLTPUxREQ5bpajFQZpx8bCF2UrlqOTzP9kEqcEnOfwsRshWs2+oAFIHfDQB8GO2PaUaSE0NlTAYtbluZTlHQ==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz",
+      "integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==",
       "dev": true,
       "dependencies": {
-        "is-absolute-url": "^3.0.3",
-        "normalize-url": "^6.0.1",
-        "postcss-value-parser": "^4.1.0"
+        "is-absolute-url": "^2.0.0",
+        "normalize-url": "^3.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+        "node": ">=6.9.0"
       }
     },
+    "node_modules/postcss-normalize-url/node_modules/normalize-url": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz",
+      "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/postcss-normalize-url/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
     "node_modules/postcss-normalize-whitespace": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.1.tgz",
-      "integrity": "sha512-iPklmI5SBnRvwceb/XH568yyzK0qRVuAG+a1HFUsFRf11lEJTiQQa03a4RSCQvLKdcpX7XsI1Gen9LuLoqwiqA==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz",
+      "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==",
       "dev": true,
       "dependencies": {
-        "postcss-value-parser": "^4.1.0"
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+        "node": ">=6.9.0"
       }
     },
+    "node_modules/postcss-normalize-whitespace/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
     "node_modules/postcss-ordered-values": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.0.2.tgz",
-      "integrity": "sha512-8AFYDSOYWebJYLyJi3fyjl6CqMEG/UVworjiyK1r573I56kb3e879sCJLGvR3merj+fAdPpVplXKQZv+ey6CgQ==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz",
+      "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==",
       "dev": true,
       "dependencies": {
-        "cssnano-utils": "^2.0.1",
-        "postcss-value-parser": "^4.1.0"
+        "cssnano-util-get-arguments": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+        "node": ">=6.9.0"
       }
     },
+    "node_modules/postcss-ordered-values/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
     "node_modules/postcss-reduce-initial": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.0.1.tgz",
-      "integrity": "sha512-zlCZPKLLTMAqA3ZWH57HlbCjkD55LX9dsRyxlls+wfuRfqCi5mSlZVan0heX5cHr154Dq9AfbH70LyhrSAezJw==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz",
+      "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==",
       "dev": true,
       "dependencies": {
-        "browserslist": "^4.16.0",
-        "caniuse-api": "^3.0.0"
+        "browserslist": "^4.0.0",
+        "caniuse-api": "^3.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+        "node": ">=6.9.0"
       }
     },
     "node_modules/postcss-reduce-transforms": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.1.tgz",
-      "integrity": "sha512-a//FjoPeFkRuAguPscTVmRQUODP+f3ke2HqFNgGPwdYnpeC29RZdCBvGRGTsKpMURb/I3p6jdKoBQ2zI+9Q7kA==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz",
+      "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==",
       "dev": true,
       "dependencies": {
-        "cssnano-utils": "^2.0.1",
-        "postcss-value-parser": "^4.1.0"
+        "cssnano-util-get-match": "^4.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+        "node": ">=6.9.0"
       }
     },
+    "node_modules/postcss-reduce-transforms/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
     "node_modules/postcss-selector-parser": {
-      "version": "6.0.6",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz",
-      "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==",
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz",
+      "integrity": "sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==",
       "dev": true,
       "dependencies": {
         "cssesc": "^3.0.0",
+        "indexes-of": "^1.0.1",
+        "uniq": "^1.0.1",
         "util-deprecate": "^1.0.2"
       },
       "engines": {
@@ -23443,36 +23617,38 @@
       }
     },
     "node_modules/postcss-svgo": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.0.2.tgz",
-      "integrity": "sha512-YzQuFLZu3U3aheizD+B1joQ94vzPfE6BNUcSYuceNxlVnKKsOtdo6hL9/zyC168Q8EwfLSgaDSalsUGa9f2C0A==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz",
+      "integrity": "sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw==",
       "dev": true,
       "dependencies": {
-        "postcss-value-parser": "^4.1.0",
-        "svgo": "^2.3.0"
+        "is-svg": "^3.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0",
+        "svgo": "^1.0.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+        "node": ">=6.9.0"
       }
     },
+    "node_modules/postcss-svgo/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
     "node_modules/postcss-unique-selectors": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.0.1.tgz",
-      "integrity": "sha512-gwi1NhHV4FMmPn+qwBNuot1sG1t2OmacLQ/AX29lzyggnjd+MnVD5uqQmpXO3J17KGL2WAxQruj1qTd3H0gG/w==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz",
+      "integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==",
       "dev": true,
       "dependencies": {
-        "alphanum-sort": "^1.0.2",
-        "postcss-selector-parser": "^6.0.5",
+        "alphanum-sort": "^1.0.0",
+        "postcss": "^7.0.0",
         "uniqs": "^2.0.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+        "node": ">=6.9.0"
       }
     },
     "node_modules/postcss-value-parser": {
@@ -23481,12 +23657,68 @@
       "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
       "dev": true
     },
-    "node_modules/postcss/node_modules/colorette": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
-      "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
+    "node_modules/postcss/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss/node_modules/chalk/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/postcss/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
       "dev": true
     },
+    "node_modules/postcss/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/postcss/node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -23496,10 +23728,22 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/postcss/node_modules/supports-color": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/prebuild-install": {
-      "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.3.tgz",
-      "integrity": "sha512-iqqSR84tNYQUQHRXalSKdIaM8Ov1QxOVuBNWI7+BzZWv6Ih9k75wOnH1rGQ9WWTaaLkTpxWKIciOF0KyfM74+Q==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.0.0.tgz",
+      "integrity": "sha512-h2ZJ1PXHKWZpp1caLw0oX9sagVpL2YTk+ZwInQbQ3QqNd4J03O6MpFNmMTJlkfgPENWqe5kP0WjQLqz5OjLfsw==",
       "optional": true,
       "dependencies": {
         "detect-libc": "^1.0.3",
@@ -23508,13 +23752,15 @@
         "minimist": "^1.2.3",
         "mkdirp-classic": "^0.5.3",
         "napi-build-utils": "^1.0.1",
-        "node-abi": "^2.21.0",
+        "node-abi": "^2.7.0",
+        "noop-logger": "^0.1.1",
         "npmlog": "^4.0.1",
         "pump": "^3.0.0",
         "rc": "^1.2.7",
         "simple-get": "^3.0.3",
         "tar-fs": "^2.0.0",
-        "tunnel-agent": "^0.6.0"
+        "tunnel-agent": "^0.6.0",
+        "which-pm-runs": "^1.0.0"
       },
       "bin": {
         "prebuild-install": "bin.js"
@@ -23540,58 +23786,28 @@
         "node": ">=4"
       }
     },
-    "node_modules/pretty-bytes": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
-      "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/pretty-format": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
-      "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.5.2.tgz",
+      "integrity": "sha512-VizyV669eqESlkOikKJI8Ryxl/kPpbdLwNdPs2GrbQs18MpySB5S0Yo0N7zkg2xTRiFq4CFw8ct5Vg4a0xP0og==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^26.6.2",
+        "@jest/types": "^26.5.2",
         "ansi-regex": "^5.0.0",
         "ansi-styles": "^4.0.0",
-        "react-is": "^17.0.1"
+        "react-is": "^16.12.0"
       },
       "engines": {
         "node": ">= 10"
       }
     },
-    "node_modules/pretty-format/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/pretty-format/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
       "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/pretty-format/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
       }
     },
     "node_modules/pretty-hrtime": {
@@ -23635,6 +23851,7 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz",
       "integrity": "sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0=",
+      "dev": true,
       "dependencies": {
         "err-code": "^1.0.0",
         "retry": "^0.10.0"
@@ -23643,14 +23860,23 @@
         "node": ">=0.12"
       }
     },
+    "node_modules/promise-retry/node_modules/retry": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz",
+      "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/prompts": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.1.tgz",
-      "integrity": "sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.2.tgz",
+      "integrity": "sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA==",
       "dev": true,
       "dependencies": {
         "kleur": "^3.0.3",
-        "sisteransi": "^1.0.5"
+        "sisteransi": "^1.0.4"
       },
       "engines": {
         "node": ">= 6"
@@ -23675,12 +23901,21 @@
         "node": ">= 0.3.1"
       }
     },
-    "node_modules/proxy-addr": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+    "node_modules/protoduck": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/protoduck/-/protoduck-5.0.1.tgz",
+      "integrity": "sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==",
+      "dev": true,
       "dependencies": {
-        "forwarded": "0.2.0",
+        "genfun": "^5.0.0"
+      }
+    },
+    "node_modules/proxy-addr": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
+      "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==",
+      "dependencies": {
+        "forwarded": "~0.1.2",
         "ipaddr.js": "1.9.1"
       },
       "engines": {
@@ -23706,6 +23941,62 @@
         "node": ">=6"
       }
     },
+    "node_modules/proxy-agent/node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/proxy-agent/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/proxy-agent/node_modules/http-proxy-agent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+      "dev": true,
+      "dependencies": {
+        "@tootallnate/once": "1",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/proxy-agent/node_modules/https-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/proxy-agent/node_modules/lru-cache": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
@@ -23715,6 +24006,26 @@
         "yallist": "^3.0.2"
       }
     },
+    "node_modules/proxy-agent/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/proxy-agent/node_modules/socks-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4",
+        "socks": "^2.3.3"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/proxy-agent/node_modules/yallist": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
@@ -23753,9 +24064,9 @@
       }
     },
     "node_modules/public-encrypt/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "version": "4.11.9",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+      "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
       "dev": true
     },
     "node_modules/pump": {
@@ -23829,6 +24140,19 @@
         "node": ">=0.6"
       }
     },
+    "node_modules/query-string": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
+      "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
+      "dev": true,
+      "dependencies": {
+        "object-assign": "^4.1.0",
+        "strict-uri-encode": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/querystring": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
@@ -23854,25 +24178,6 @@
       "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
       "dev": true
     },
-    "node_modules/queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
     "node_modules/randombytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
@@ -23923,13 +24228,13 @@
       }
     },
     "node_modules/raw-loader": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-4.0.2.tgz",
-      "integrity": "sha512-ZnScIV3ag9A4wPX/ZayxL/jZH+euYb6FcUinPcgiQW0+UBtEv0O6Q3lGd3cqJ+GHH+rksEv3Pj99oxJ3u3VIKA==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-4.0.1.tgz",
+      "integrity": "sha512-baolhQBSi3iNh1cglJjA0mYzga+wePk7vdEX//1dTFd+v4TsQlQE0jitJSNF1OIP82rdYulH7otaVmdlDaJ64A==",
       "dev": true,
       "dependencies": {
         "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0"
+        "schema-utils": "^2.6.5"
       },
       "engines": {
         "node": ">= 10.13.0"
@@ -23942,55 +24247,6 @@
         "webpack": "^4.0.0 || ^5.0.0"
       }
     },
-    "node_modules/raw-loader/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/raw-loader/node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
-    "node_modules/raw-loader/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/raw-loader/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
     "node_modules/rc": {
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
@@ -24005,23 +24261,10 @@
         "rc": "cli.js"
       }
     },
-    "node_modules/rc/node_modules/ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
-    },
-    "node_modules/rc/node_modules/strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/react-is": {
-      "version": "17.0.2",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
       "dev": true
     },
     "node_modules/read": {
@@ -24065,14 +24308,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/read-chunk/node_modules/pify": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/read-package-json": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.2.tgz",
@@ -24085,60 +24320,74 @@
       }
     },
     "node_modules/read-package-json-fast": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-1.2.2.tgz",
-      "integrity": "sha512-39DbPJjkltEzfXJXB6D8/Ir3GFOU2YbSKa2HaB/Y3nKrc/zY+0XrALpID6/13ezWyzqvOHrBbR4t4cjQuTdBVQ==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz",
+      "integrity": "sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ==",
       "dependencies": {
         "json-parse-even-better-errors": "^2.3.0",
         "npm-normalize-package-bin": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/read-package-tree": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.3.1.tgz",
+      "integrity": "sha512-mLUDsD5JVtlZxjSlPPx1RETkNjjvQYuweKwNVt1Sn8kP5Jh44pvYuUHCp6xSVDZWbNxVxG5lyZJ921aJH61sTw==",
+      "dev": true,
+      "dependencies": {
+        "read-package-json": "^2.0.0",
+        "readdir-scoped-modules": "^1.0.0",
+        "util-promisify": "^2.1.0"
       }
     },
     "node_modules/read-pkg": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
-      "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
+      "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
       "dev": true,
       "dependencies": {
-        "load-json-file": "^4.0.0",
+        "load-json-file": "^2.0.0",
         "normalize-package-data": "^2.3.2",
-        "path-type": "^3.0.0"
+        "path-type": "^2.0.0"
       },
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/read-pkg-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
-      "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+      "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
       "dev": true,
       "dependencies": {
         "find-up": "^2.0.0",
-        "read-pkg": "^3.0.0"
+        "read-pkg": "^2.0.0"
       },
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/read-pkg/node_modules/path-type": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-      "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
+      "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
       "dev": true,
       "dependencies": {
-        "pify": "^3.0.0"
+        "pify": "^2.0.0"
       },
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/read-pkg/node_modules/pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
       "dev": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/readable-stream": {
@@ -24155,10 +24404,22 @@
         "util-deprecate": "~1.0.1"
       }
     },
+    "node_modules/readdir-scoped-modules": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz",
+      "integrity": "sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==",
+      "dev": true,
+      "dependencies": {
+        "debuglog": "^1.0.1",
+        "dezalgo": "^1.0.0",
+        "graceful-fs": "^4.1.2",
+        "once": "^1.3.0"
+      }
+    },
     "node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
+      "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
       "dev": true,
       "dependencies": {
         "picomatch": "^2.2.1"
@@ -24186,9 +24447,9 @@
       "dev": true
     },
     "node_modules/regenerate": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
-      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.1.tgz",
+      "integrity": "sha512-j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A==",
       "dev": true
     },
     "node_modules/regenerate-unicode-properties": {
@@ -24204,9 +24465,9 @@
       }
     },
     "node_modules/regenerator-runtime": {
-      "version": "0.13.7",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
-      "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==",
+      "version": "0.13.5",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz",
+      "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==",
       "dev": true
     },
     "node_modules/regenerator-transform": {
@@ -24231,33 +24492,45 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/regex-not/node_modules/extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-      "dev": true,
-      "dependencies": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/regex-parser": {
-      "version": "2.2.11",
-      "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.11.tgz",
-      "integrity": "sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==",
+      "version": "2.2.10",
+      "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.10.tgz",
+      "integrity": "sha512-8t6074A68gHfU8Neftl0Le6KTDwfGAj7IyjPIMSfikI2wJUTHDMaIq42bUsfVnj8mhx0R+45rdUXHGpN164avA==",
       "dev": true
     },
     "node_modules/regexp.prototype.flags": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz",
-      "integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz",
+      "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/regexp.prototype.flags/node_modules/es-abstract": {
+      "version": "1.17.7",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+      "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+      "dev": true,
+      "dependencies": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.2",
+        "is-regex": "^1.1.1",
+        "object-inspect": "^1.8.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.1",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -24267,9 +24540,9 @@
       }
     },
     "node_modules/regexpp": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",
+      "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==",
       "dev": true,
       "engines": {
         "node": ">=8"
@@ -24333,9 +24606,9 @@
       "dev": true
     },
     "node_modules/regjsparser": {
-      "version": "0.6.9",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.9.tgz",
-      "integrity": "sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==",
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz",
+      "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==",
       "dev": true,
       "dependencies": {
         "jsesc": "~0.5.0"
@@ -24396,9 +24669,9 @@
       "dev": true
     },
     "node_modules/repeat-element": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
-      "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
+      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -24467,6 +24740,52 @@
         "node": ">= 6"
       }
     },
+    "node_modules/request-promise-core": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz",
+      "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^4.17.19"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      },
+      "peerDependencies": {
+        "request": "^2.34"
+      }
+    },
+    "node_modules/request-promise-native": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz",
+      "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==",
+      "deprecated": "request-promise-native has been deprecated because it extends the now deprecated request package, see https://github.com/request/request/issues/3142",
+      "dev": true,
+      "dependencies": {
+        "request-promise-core": "1.1.4",
+        "stealthy-require": "^1.1.1",
+        "tough-cookie": "^2.3.3"
+      },
+      "engines": {
+        "node": ">=0.12.0"
+      },
+      "peerDependencies": {
+        "request": "^2.34"
+      }
+    },
+    "node_modules/request-promise-native/node_modules/tough-cookie": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+      "dev": true,
+      "dependencies": {
+        "psl": "^1.1.28",
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/request/node_modules/qs": {
       "version": "6.5.2",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
@@ -24487,15 +24806,6 @@
         "node": ">=0.8"
       }
     },
-    "node_modules/request/node_modules/uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
-      "bin": {
-        "uuid": "bin/uuid"
-      }
-    },
     "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -24515,9 +24825,9 @@
       }
     },
     "node_modules/require-main-filename": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
       "dev": true
     },
     "node_modules/requires-port": {
@@ -24527,11 +24837,10 @@
       "dev": true
     },
     "node_modules/resolve": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
-      "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
       "dependencies": {
-        "is-core-module": "^2.1.0",
         "path-parse": "^1.0.6"
       },
       "funding": {
@@ -24539,24 +24848,24 @@
       }
     },
     "node_modules/resolve-cwd": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
-      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
+      "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
       "dev": true,
       "dependencies": {
-        "resolve-from": "^5.0.0"
+        "resolve-from": "^3.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
     "node_modules/resolve-cwd/node_modules/resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
     "node_modules/resolve-dir": {
@@ -24600,37 +24909,127 @@
       "dev": true
     },
     "node_modules/resolve-url-loader": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-4.0.0.tgz",
-      "integrity": "sha512-05VEMczVREcbtT7Bz+C+96eUO5HDNvdthIiMB34t7FcF8ehcu4wC0sSgPUubs3XW2Q3CNLJk/BJrCU9wVRymiA==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-3.1.1.tgz",
+      "integrity": "sha512-K1N5xUjj7v0l2j/3Sgs5b8CjrrgtC70SmdCuZiJ8tSyb5J+uk3FoeZ4b7yTnH6j7ngI+Bc5bldHJIa8hYdu2gQ==",
       "dev": true,
       "dependencies": {
-        "adjust-sourcemap-loader": "^4.0.0",
-        "convert-source-map": "^1.7.0",
-        "loader-utils": "^2.0.0",
-        "postcss": "^7.0.35",
+        "adjust-sourcemap-loader": "2.0.0",
+        "camelcase": "5.3.1",
+        "compose-function": "3.0.3",
+        "convert-source-map": "1.7.0",
+        "es6-iterator": "2.0.3",
+        "loader-utils": "1.2.3",
+        "postcss": "7.0.21",
+        "rework": "1.0.1",
+        "rework-visit": "1.0.0",
         "source-map": "0.6.1"
       },
       "engines": {
-        "node": ">=8.9"
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/resolve-url-loader/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
       },
-      "peerDependencies": {
-        "rework": "1.0.1",
-        "rework-visit": "1.0.0"
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/resolve-url-loader/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
       },
-      "peerDependenciesMeta": {
-        "rework": {
-          "optional": true
-        },
-        "rework-visit": {
-          "optional": true
-        }
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/resolve-url-loader/node_modules/chalk/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/resolve-url-loader/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/resolve-url-loader/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/resolve-url-loader/node_modules/emojis-list": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
+      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/resolve-url-loader/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/resolve-url-loader/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/resolve-url-loader/node_modules/loader-utils": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
+      "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^2.0.0",
+        "json5": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
       }
     },
     "node_modules/resolve-url-loader/node_modules/postcss": {
-      "version": "7.0.36",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz",
-      "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==",
+      "version": "7.0.21",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.21.tgz",
+      "integrity": "sha512-uIFtJElxJo29QC753JzhidoAhvp/e/Exezkdhfmt8AymWT6/5B7W1WmponYWkHk2eg6sONyTch0A3nkMPun3SQ==",
       "dev": true,
       "dependencies": {
         "chalk": "^2.4.2",
@@ -24639,10 +25038,6 @@
       },
       "engines": {
         "node": ">=6.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
       }
     },
     "node_modules/resolve-url-loader/node_modules/source-map": {
@@ -24675,16 +25070,34 @@
       }
     },
     "node_modules/restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-      "dev": true,
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
       "dependencies": {
-        "onetime": "^5.1.0",
+        "onetime": "^2.0.0",
         "signal-exit": "^3.0.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
+      }
+    },
+    "node_modules/restore-cursor/node_modules/mimic-fn": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/restore-cursor/node_modules/onetime": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+      "dependencies": {
+        "mimic-fn": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
       }
     },
     "node_modules/ret": {
@@ -24697,11 +25110,11 @@
       }
     },
     "node_modules/retry": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz",
-      "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=",
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
       "engines": {
-        "node": "*"
+        "node": ">= 4"
       }
     },
     "node_modules/reusify": {
@@ -24713,6 +25126,28 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/rework": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/rework/-/rework-1.0.1.tgz",
+      "integrity": "sha1-MIBqhBNCtUUQqkEQhQzUhTQUSqc=",
+      "dev": true,
+      "dependencies": {
+        "convert-source-map": "^0.3.3",
+        "css": "^2.0.0"
+      }
+    },
+    "node_modules/rework-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/rework-visit/-/rework-visit-1.0.0.tgz",
+      "integrity": "sha1-mUWygD8hni96ygCtuLyfZA+ELJo=",
+      "dev": true
+    },
+    "node_modules/rework/node_modules/convert-source-map": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz",
+      "integrity": "sha1-8dgClQr33SYxof6+BZZVDIarMZA=",
+      "dev": true
+    },
     "node_modules/rgb-regex": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz",
@@ -24750,9 +25185,9 @@
       }
     },
     "node_modules/rollup": {
-      "version": "2.38.4",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.38.4.tgz",
-      "integrity": "sha512-B0LcJhjiwKkTl79aGVF/u5KdzsH8IylVfV56Ut6c9ouWLJcUK17T83aZBetNYSnZtXf2OHD4+2PbmRW+Fp5ulg==",
+      "version": "2.10.9",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.10.9.tgz",
+      "integrity": "sha512-dY/EbjiWC17ZCUSyk14hkxATAMAShkMsD43XmZGWjLrgFj15M3Dw2kEkA9ns64BiLFm9PKN6vTQw8neHwK74eg==",
       "dev": true,
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -24761,16 +25196,16 @@
         "node": ">=10.0.0"
       },
       "optionalDependencies": {
-        "fsevents": "~2.3.1"
+        "fsevents": "~2.1.2"
       }
     },
     "node_modules/rsvp": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz",
-      "integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==",
+      "version": "4.8.5",
+      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
+      "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
       "dev": true,
       "engines": {
-        "node": "0.12.* || 4.* || 6.* || >= 7.*"
+        "node": "6.* || >= 7.*"
       }
     },
     "node_modules/run-async": {
@@ -24782,26 +25217,9 @@
       }
     },
     "node_modules/run-parallel": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "queue-microtask": "^1.2.2"
-      }
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
+      "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q=="
     },
     "node_modules/run-queue": {
       "version": "1.0.3",
@@ -24824,9 +25242,9 @@
       }
     },
     "node_modules/rxjs/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
+      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="
     },
     "node_modules/safe-buffer": {
       "version": "5.1.2",
@@ -24881,15 +25299,6 @@
         "normalize-path": "^2.1.1"
       }
     },
-    "node_modules/sane/node_modules/arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/sane/node_modules/braces": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
@@ -24923,15 +25332,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/sane/node_modules/braces/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/sane/node_modules/cross-spawn": {
       "version": "6.0.5",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
@@ -24966,19 +25366,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/sane/node_modules/extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-      "dev": true,
-      "dependencies": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/sane/node_modules/fill-range": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -25006,15 +25393,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/sane/node_modules/fill-range/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/sane/node_modules/get-stream": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
@@ -25069,15 +25447,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/sane/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/sane/node_modules/micromatch": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -25191,9 +25560,9 @@
       }
     },
     "node_modules/sass": {
-      "version": "1.32.6",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.6.tgz",
-      "integrity": "sha512-1bcDHDcSqeFtMr0JXI3xc/CXX6c4p0wHHivJdru8W7waM7a1WjKMm4m/Z5sY7CbVw4Whi2Chpcw6DFfSWwGLzQ==",
+      "version": "1.26.5",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.26.5.tgz",
+      "integrity": "sha512-FG2swzaZUiX53YzZSjSakzvGtlds0lcbF+URuU9mxOv7WBh7NhXEVDa4kPKN4hN6fC2TkOTOKqiqp6d53N9X5Q==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=2.0.0 <4.0.0"
@@ -25206,19 +25575,19 @@
       }
     },
     "node_modules/sass-loader": {
-      "version": "10.1.1",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-10.1.1.tgz",
-      "integrity": "sha512-W6gVDXAd5hR/WHsPicvZdjAWHBcEJ44UahgxcIE196fW2ong0ZHMPO1kZuI5q0VlvMQZh32gpv69PLWQm70qrw==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.2.tgz",
+      "integrity": "sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==",
       "dev": true,
       "dependencies": {
-        "klona": "^2.0.4",
-        "loader-utils": "^2.0.0",
-        "neo-async": "^2.6.2",
-        "schema-utils": "^3.0.0",
-        "semver": "^7.3.2"
+        "clone-deep": "^4.0.1",
+        "loader-utils": "^1.2.3",
+        "neo-async": "^2.6.1",
+        "schema-utils": "^2.6.1",
+        "semver": "^6.3.0"
       },
       "engines": {
-        "node": ">= 10.13.0"
+        "node": ">= 8.9.0"
       },
       "funding": {
         "type": "opencollective",
@@ -25226,7 +25595,7 @@
       },
       "peerDependencies": {
         "fibers": ">= 3.1.0",
-        "node-sass": "^4.0.0 || ^5.0.0",
+        "node-sass": "^4.0.0",
         "sass": "^1.3.0",
         "webpack": "^4.36.0 || ^5.0.0"
       },
@@ -25242,53 +25611,39 @@
         }
       }
     },
-    "node_modules/sass-loader/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+    "node_modules/sass-loader/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
       "dev": true,
       "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
+        "minimist": "^1.2.0"
       },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
+      "bin": {
+        "json5": "lib/cli.js"
       }
     },
-    "node_modules/sass-loader/node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
-    "node_modules/sass-loader/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/sass-loader/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+    "node_modules/sass-loader/node_modules/loader-utils": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
       "dev": true,
       "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^1.0.1"
       },
       "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/sass-loader/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
       }
     },
     "node_modules/sax": {
@@ -25326,37 +25681,6 @@
         "url": "https://opencollective.com/webpack"
       }
     },
-    "node_modules/schema-utils/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/schema-utils/node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
-    "node_modules/schema-utils/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
     "node_modules/sdp": {
       "version": "1.5.4",
       "resolved": "https://registry.npmjs.org/sdp/-/sdp-1.5.4.tgz",
@@ -25369,21 +25693,18 @@
       "dev": true
     },
     "node_modules/selfsigned": {
-      "version": "1.10.11",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.11.tgz",
-      "integrity": "sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA==",
+      "version": "1.10.8",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.8.tgz",
+      "integrity": "sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w==",
       "dev": true,
       "dependencies": {
         "node-forge": "^0.10.0"
       }
     },
     "node_modules/semver": {
-      "version": "7.3.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
-      "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
+      "version": "7.3.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
+      "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -25463,28 +25784,15 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/send/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/send/node_modules/debug/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
     "node_modules/send/node_modules/ms": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
       "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
     },
     "node_modules/serialize-javascript": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
-      "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
+      "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
       "dev": true,
       "dependencies": {
         "randombytes": "^2.1.0"
@@ -25508,15 +25816,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/serve-index/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
     "node_modules/serve-index/node_modules/http-errors": {
       "version": "1.6.3",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
@@ -25538,12 +25837,6 @@
       "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
       "dev": true
     },
-    "node_modules/serve-index/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
     "node_modules/serve-index/node_modules/setprototypeof": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
@@ -25604,36 +25897,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/set-value/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/set-value/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/set-value/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/setimmediate": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
@@ -25670,15 +25933,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/shallow-clone/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -25698,17 +25952,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/shelljs": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz",
-      "integrity": "sha1-kEktcv/MgVmXa6umL7D2iE8MM3g=",
-      "bin": {
-        "shjs": "bin/shjs"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/shellwords": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
@@ -25730,6 +25973,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/side-channel/node_modules/object-inspect": {
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz",
+      "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/signal-exit": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
@@ -25744,6 +25996,17 @@
         "tail": "^0.4.0"
       }
     },
+    "node_modules/simctl/node_modules/shelljs": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz",
+      "integrity": "sha1-kEktcv/MgVmXa6umL7D2iE8MM3g=",
+      "bin": {
+        "shjs": "bin/shjs"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
     "node_modules/simple-concat": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
@@ -25775,6 +26038,30 @@
         "simple-concat": "^1.0.0"
       }
     },
+    "node_modules/simple-get/node_modules/decompress-response": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
+      "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
+      "optional": true,
+      "dependencies": {
+        "mimic-response": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/simple-get/node_modules/mimic-response": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
+      "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
+      "optional": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/simple-plist": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/simple-plist/-/simple-plist-1.1.1.tgz",
@@ -25785,6 +26072,21 @@
         "plist": "^3.0.1"
       }
     },
+    "node_modules/simple-swizzle": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
+      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
+      "dev": true,
+      "dependencies": {
+        "is-arrayish": "^0.3.1"
+      }
+    },
+    "node_modules/simple-swizzle/node_modules/is-arrayish": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
+      "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
+      "dev": true
+    },
     "node_modules/sisteransi": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
@@ -25816,31 +26118,13 @@
         "url": "https://github.com/chalk/slice-ansi?sponsor=1"
       }
     },
-    "node_modules/slice-ansi/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/slice-ansi/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
       "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/slice-ansi/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
       }
     },
     "node_modules/smart-buffer": {
@@ -25897,6 +26181,44 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/snapdragon-node/node_modules/is-accessor-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node/node_modules/is-data-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node/node_modules/is-descriptor": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.0",
+        "is-data-descriptor": "^1.0.0",
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/snapdragon-node/node_modules/isobject": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
@@ -25930,15 +26252,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/snapdragon/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
     "node_modules/snapdragon/node_modules/define-property": {
       "version": "0.2.5",
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
@@ -25963,83 +26276,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/snapdragon/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
     "node_modules/snapdragon/node_modules/source-map": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -26049,89 +26285,109 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/snapdragon/node_modules/source-map-resolve": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
-      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
-      "dev": true,
-      "dependencies": {
-        "atob": "^2.1.2",
-        "decode-uri-component": "^0.2.0",
-        "resolve-url": "^0.2.1",
-        "source-map-url": "^0.4.0",
-        "urix": "^0.1.0"
-      }
-    },
     "node_modules/sockjs": {
-      "version": "0.3.21",
-      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.21.tgz",
-      "integrity": "sha512-DhbPFGpxjc6Z3I+uX07Id5ZO2XwYsWOrYjaSeieES78cq+JaJvVe5q/m1uvjIQhXinhIeCFRH6JgXe+mvVMyXw==",
+      "version": "0.3.20",
+      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.20.tgz",
+      "integrity": "sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA==",
       "dev": true,
       "dependencies": {
-        "faye-websocket": "^0.11.3",
+        "faye-websocket": "^0.10.0",
         "uuid": "^3.4.0",
-        "websocket-driver": "^0.7.4"
+        "websocket-driver": "0.6.5"
       }
     },
     "node_modules/sockjs-client": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.5.1.tgz",
-      "integrity": "sha512-VnVAb663fosipI/m6pqRXakEOw7nvd7TUgdr3PlR/8V2I95QIdwT8L4nMxhyU8SmDBHYXU1TOElaKOmKLfYzeQ==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz",
+      "integrity": "sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==",
       "dev": true,
       "dependencies": {
-        "debug": "^3.2.6",
+        "debug": "^3.2.5",
         "eventsource": "^1.0.7",
-        "faye-websocket": "^0.11.3",
-        "inherits": "^2.0.4",
-        "json3": "^3.3.3",
-        "url-parse": "^1.5.1"
+        "faye-websocket": "~0.11.1",
+        "inherits": "^2.0.3",
+        "json3": "^3.3.2",
+        "url-parse": "^1.4.3"
       }
     },
     "node_modules/sockjs-client/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
       "dev": true,
       "dependencies": {
         "ms": "^2.1.1"
       }
     },
-    "node_modules/sockjs/node_modules/uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+    "node_modules/sockjs-client/node_modules/faye-websocket": {
+      "version": "0.11.3",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz",
+      "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==",
       "dev": true,
-      "bin": {
-        "uuid": "bin/uuid"
+      "dependencies": {
+        "websocket-driver": ">=0.5.1"
+      },
+      "engines": {
+        "node": ">=0.8.0"
       }
     },
+    "node_modules/sockjs-client/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
     "node_modules/socks": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.6.1.tgz",
-      "integrity": "sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.3.3.tgz",
+      "integrity": "sha512-o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA==",
       "dependencies": {
-        "ip": "^1.1.5",
+        "ip": "1.1.5",
         "smart-buffer": "^4.1.0"
       },
       "engines": {
-        "node": ">= 10.13.0",
+        "node": ">= 6.0.0",
         "npm": ">= 3.0.0"
       }
     },
     "node_modules/socks-proxy-agent": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz",
-      "integrity": "sha512-vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz",
+      "integrity": "sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==",
+      "dev": true,
       "dependencies": {
-        "agent-base": "^6.0.2",
-        "debug": "4",
-        "socks": "^2.3.3"
+        "agent-base": "~4.2.1",
+        "socks": "~2.3.2"
       },
       "engines": {
         "node": ">= 6"
       }
     },
+    "node_modules/socks-proxy-agent/node_modules/agent-base": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz",
+      "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==",
+      "dev": true,
+      "dependencies": {
+        "es6-promisify": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/sort-keys": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
+      "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
+      "dev": true,
+      "dependencies": {
+        "is-plain-obj": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/source-list-map": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
@@ -26148,17 +26404,16 @@
       }
     },
     "node_modules/source-map-loader": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-1.1.3.tgz",
-      "integrity": "sha512-6YHeF+XzDOrT/ycFJNI53cgEsp/tHTMl37hi7uVyqFAlTXW109JazaQCkbc+jjoL2637qkH1amLi+JzrIpt5lA==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-1.0.0.tgz",
+      "integrity": "sha512-ZayyQCSCrQazN50aCvuS84lJT4xc1ZAcykH5blHaBdVveSwjiFK8UGMPvao0ho54DTb0Jf7m57uRRG/YYUZ2Fg==",
       "dev": true,
       "dependencies": {
-        "abab": "^2.0.5",
-        "iconv-lite": "^0.6.2",
+        "data-urls": "^2.0.0",
+        "iconv-lite": "^0.5.1",
         "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0",
-        "source-map": "^0.6.1",
-        "whatwg-mimetype": "^2.3.0"
+        "schema-utils": "^2.6.6",
+        "source-map": "^0.6.0"
       },
       "engines": {
         "node": ">= 10.13.0"
@@ -26171,67 +26426,18 @@
         "webpack": "^4.0.0 || ^5.0.0"
       }
     },
-    "node_modules/source-map-loader/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/source-map-loader/node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
     "node_modules/source-map-loader/node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.2.tgz",
+      "integrity": "sha512-kERHXvpSaB4aU3eANwidg79K8FlrN77m8G9V+0vOR3HYaRifrlwMEpT7ZBJqLSEIHnEgJTHcWK82wwLwwKwtag==",
       "dev": true,
       "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
+        "safer-buffer": ">= 2.1.2 < 3"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/source-map-loader/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/source-map-loader/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
     "node_modules/source-map-loader/node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -26242,13 +26448,16 @@
       }
     },
     "node_modules/source-map-resolve": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz",
-      "integrity": "sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==",
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
       "dev": true,
       "dependencies": {
         "atob": "^2.1.2",
-        "decode-uri-component": "^0.2.0"
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
       }
     },
     "node_modules/source-map-support": {
@@ -26271,9 +26480,9 @@
       }
     },
     "node_modules/source-map-url": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
-      "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
+      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
       "dev": true
     },
     "node_modules/sourcemap-codec": {
@@ -26315,9 +26524,9 @@
       }
     },
     "node_modules/spdx-license-ids": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz",
-      "integrity": "sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ=="
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz",
+      "integrity": "sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw=="
     },
     "node_modules/spdy": {
       "version": "4.0.2",
@@ -26349,6 +26558,30 @@
         "wbuf": "^1.7.3"
       }
     },
+    "node_modules/spdy-transport/node_modules/debug": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+      "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/spdy-transport/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
     "node_modules/spdy-transport/node_modules/readable-stream": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
@@ -26363,83 +26596,105 @@
         "node": ">= 6"
       }
     },
-    "node_modules/speed-measure-webpack-plugin": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.4.2.tgz",
-      "integrity": "sha512-AtVzD0bnIy2/B0fWqJpJgmhcrfWFhBlduzSo0uwplr/QvB33ZNZj2NEth3NONgdnZJqicK0W0mSxnLSbsVCDbw==",
+    "node_modules/spdy/node_modules/debug": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+      "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
       "dev": true,
       "dependencies": {
-        "chalk": "^4.1.0"
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/spdy/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/speed-measure-webpack-plugin": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.3.tgz",
+      "integrity": "sha512-2ljD4Ch/rz2zG3HsLsnPfp23osuPBS0qPuz9sGpkNXTN1Ic4M+W9xB8l8rS8ob2cO4b1L+WTJw/0AJwWYVgcxQ==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.0.1"
       },
       "engines": {
         "node": ">=6.0.0"
       },
       "peerDependencies": {
-        "webpack": "^1 || ^2 || ^3 || ^4 || ^5"
+        "webpack": "^1 || ^2 || ^3 || ^4"
       }
     },
     "node_modules/speed-measure-webpack-plugin/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "color-convert": "^1.9.0"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">=4"
       }
     },
     "node_modules/speed-measure-webpack-plugin/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "node": ">=4"
       }
     },
     "node_modules/speed-measure-webpack-plugin/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
+        "color-name": "1.1.3"
       }
     },
+    "node_modules/speed-measure-webpack-plugin/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
     "node_modules/speed-measure-webpack-plugin/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
     "node_modules/speed-measure-webpack-plugin/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "has-flag": "^3.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
     "node_modules/split-string": {
@@ -26454,19 +26709,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/split-string/node_modules/extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-      "dev": true,
-      "dependencies": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/split2": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
@@ -26553,9 +26795,9 @@
       }
     },
     "node_modules/stack-utils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.3.tgz",
-      "integrity": "sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.2.tgz",
+      "integrity": "sha512-0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg==",
       "dev": true,
       "dependencies": {
         "escape-string-regexp": "^2.0.0"
@@ -26598,68 +26840,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/static-extend/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/statuses": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
@@ -26668,6 +26848,15 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/stealthy-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
+      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/stream-browserify": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
@@ -26731,6 +26920,15 @@
       "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
       "dev": true
     },
+    "node_modules/strict-uri-encode": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
+      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -26740,9 +26938,9 @@
       }
     },
     "node_modules/string-length": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
-      "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.1.tgz",
+      "integrity": "sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw==",
       "dev": true,
       "dependencies": {
         "char-regex": "^1.0.2",
@@ -26752,45 +26950,126 @@
         "node": ">=10"
       }
     },
-    "node_modules/string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+    "node_modules/string-length/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-length/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
       "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
+        "ansi-regex": "^5.0.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
+    "node_modules/string-width": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "dependencies": {
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/string-width/node_modules/strip-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+      "dependencies": {
+        "ansi-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/string.prototype.codepointat": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz",
       "integrity": "sha512-2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg=="
     },
     "node_modules/string.prototype.trimend": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
-      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
+      "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimend/node_modules/es-abstract": {
+      "version": "1.17.7",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+      "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+      "dev": true,
+      "dependencies": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.2",
+        "is-regex": "^1.1.1",
+        "object-inspect": "^1.8.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.1",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/string.prototype.trimstart": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
-      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
+      "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart/node_modules/es-abstract": {
+      "version": "1.17.7",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+      "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+      "dev": true,
+      "dependencies": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.2",
+        "is-regex": "^1.1.1",
+        "object-inspect": "^1.8.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.1",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -26802,14 +27081,22 @@
       "integrity": "sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg=="
     },
     "node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
       "dependencies": {
-        "ansi-regex": "^5.0.0"
+        "ansi-regex": "^4.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=6"
+      }
+    },
+    "node_modules/strip-ansi/node_modules/ansi-regex": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+      "engines": {
+        "node": ">=6"
       }
     },
     "node_modules/strip-bom": {
@@ -26837,28 +27124,24 @@
       }
     },
     "node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true,
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/style-loader": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-2.0.0.tgz",
-      "integrity": "sha512-Z0gYUJmzZ6ZdRUqpg1r8GsaFKypE+3xAzuFeMuoHgjc9KZv3wMyCRjQIWEbhoFSq7+7yoHXySDJyyWQaPajeiQ==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.2.1.tgz",
+      "integrity": "sha512-ByHSTQvHLkWE9Ir5+lGbVOXhxX10fbprhLvdg96wedFZb4NDekDPxVKv5Fwmio+QcMlkkNfuK+5W1peQ5CUhZg==",
       "dev": true,
       "dependencies": {
         "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0"
+        "schema-utils": "^2.6.6"
       },
       "engines": {
-        "node": ">= 10.13.0"
+        "node": ">= 8.9.0"
       },
       "funding": {
         "type": "opencollective",
@@ -26868,84 +27151,47 @@
         "webpack": "^4.0.0 || ^5.0.0"
       }
     },
-    "node_modules/style-loader/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/style-loader/node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
-    "node_modules/style-loader/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/style-loader/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
     "node_modules/stylehacks": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.0.1.tgz",
-      "integrity": "sha512-Es0rVnHIqbWzveU1b24kbw92HsebBepxfcqe5iix7t9j0PQqhs0IxXVXv0pY2Bxa08CgMkzD6OWql7kbGOuEdA==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz",
+      "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==",
       "dev": true,
       "dependencies": {
-        "browserslist": "^4.16.0",
-        "postcss-selector-parser": "^6.0.4"
+        "browserslist": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-selector-parser": "^3.0.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/stylehacks/node_modules/postcss-selector-parser": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
+      "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
+      "dev": true,
+      "dependencies": {
+        "dot-prop": "^5.2.0",
+        "indexes-of": "^1.0.1",
+        "uniq": "^1.0.1"
       },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+      "engines": {
+        "node": ">=8"
       }
     },
     "node_modules/stylus": {
-      "version": "0.54.8",
-      "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.8.tgz",
-      "integrity": "sha512-vr54Or4BZ7pJafo2mpf0ZcwA74rpuYCZbxrHBsH8kbcXOwSfvBFwsRfpGO5OD5fhG5HDCFW737PKaawI7OqEAg==",
+      "version": "0.54.7",
+      "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.7.tgz",
+      "integrity": "sha512-Yw3WMTzVwevT6ZTrLCYNHAFmanMxdylelL3hkWNgPMeTCpMwpV3nXjpOHuBXtFv7aiO2xRuQS6OoAdgkNcSNug==",
       "dev": true,
       "dependencies": {
         "css-parse": "~2.0.0",
         "debug": "~3.1.0",
-        "glob": "^7.1.6",
-        "mkdirp": "~1.0.4",
+        "glob": "^7.1.3",
+        "mkdirp": "~0.5.x",
         "safer-buffer": "^2.1.2",
         "sax": "~1.2.4",
-        "semver": "^6.3.0",
+        "semver": "^6.0.0",
         "source-map": "^0.7.3"
       },
       "bin": {
@@ -26956,76 +27202,43 @@
       }
     },
     "node_modules/stylus-loader": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-4.3.3.tgz",
-      "integrity": "sha512-PpWB5PnCXUzW4WMYhCvNzAHJBjIBPMXwsdfkkKuA9W7k8OQFMl/19/AQvaWsxz2IptxUlCseyJ6TY/eEKJ4+UQ==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz",
+      "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==",
       "dev": true,
       "dependencies": {
-        "fast-glob": "^3.2.4",
-        "klona": "^2.0.4",
-        "loader-utils": "^2.0.0",
-        "normalize-path": "^3.0.0",
-        "schema-utils": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
+        "loader-utils": "^1.0.2",
+        "lodash.clonedeep": "^4.5.0",
+        "when": "~3.6.x"
       },
       "peerDependencies": {
-        "stylus": ">=0.52.4",
-        "webpack": "^4.0.0 || ^5.0.0"
+        "stylus": ">=0.52.4"
       }
     },
-    "node_modules/stylus-loader/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+    "node_modules/stylus-loader/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
       "dev": true,
       "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
+        "minimist": "^1.2.0"
       },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
+      "bin": {
+        "json5": "lib/cli.js"
       }
     },
-    "node_modules/stylus-loader/node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
-    "node_modules/stylus-loader/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/stylus-loader/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+    "node_modules/stylus-loader/node_modules/loader-utils": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
       "dev": true,
       "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^1.0.1"
       },
       "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
+        "node": ">=4.0.0"
       }
     },
     "node_modules/stylus/node_modules/debug": {
@@ -27037,12 +27250,6 @@
         "ms": "2.0.0"
       }
     },
-    "node_modules/stylus/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
     "node_modules/stylus/node_modules/sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
@@ -27105,6 +27312,29 @@
         "ms": "^2.1.1"
       }
     },
+    "node_modules/superagent-proxy/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true
+    },
+    "node_modules/superagent/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/superagent/node_modules/form-data": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
@@ -27131,6 +27361,12 @@
         "node": ">=4.0.0"
       }
     },
+    "node_modules/superagent/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
     "node_modules/superagent/node_modules/qs": {
       "version": "6.10.1",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz",
@@ -27161,20 +27397,20 @@
       }
     },
     "node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/supports-hyperlinks": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
-      "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz",
+      "integrity": "sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA==",
       "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0",
@@ -27184,27 +27420,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/supports-hyperlinks/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-hyperlinks/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/sver-compat": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz",
@@ -27216,210 +27431,107 @@
       }
     },
     "node_modules/svgo": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.3.1.tgz",
-      "integrity": "sha512-riDDIQgXpEnn0BEl9Gvhh1LNLIyiusSpt64IR8upJu7MwxnzetmF/Y57pXQD2NMX2lVyMRzXt5f2M5rO4wG7Dw==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
+      "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
       "dev": true,
       "dependencies": {
-        "@trysound/sax": "0.1.1",
-        "chalk": "^4.1.0",
-        "commander": "^7.1.0",
-        "css-select": "^4.1.3",
-        "css-tree": "^1.1.2",
-        "csso": "^4.2.0",
-        "stable": "^0.1.8"
+        "chalk": "^2.4.1",
+        "coa": "^2.0.2",
+        "css-select": "^2.0.0",
+        "css-select-base-adapter": "^0.1.1",
+        "css-tree": "1.0.0-alpha.37",
+        "csso": "^4.0.2",
+        "js-yaml": "^3.13.1",
+        "mkdirp": "~0.5.1",
+        "object.values": "^1.1.0",
+        "sax": "~1.2.4",
+        "stable": "^0.1.8",
+        "unquote": "~1.1.1",
+        "util.promisify": "~1.0.0"
       },
       "bin": {
         "svgo": "bin/svgo"
       },
       "engines": {
-        "node": ">=10.13.0"
+        "node": ">=4.0.0"
       }
     },
     "node_modules/svgo/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "color-convert": "^1.9.0"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">=4"
       }
     },
     "node_modules/svgo/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "node": ">=4"
       }
     },
     "node_modules/svgo/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
+        "color-name": "1.1.3"
       }
     },
-    "node_modules/svgo/node_modules/commander": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/svgo/node_modules/css-select": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz",
-      "integrity": "sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==",
-      "dev": true,
-      "dependencies": {
-        "boolbase": "^1.0.0",
-        "css-what": "^5.0.0",
-        "domhandler": "^4.2.0",
-        "domutils": "^2.6.0",
-        "nth-check": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
-      }
-    },
-    "node_modules/svgo/node_modules/css-what": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.0.1.tgz",
-      "integrity": "sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
-      }
-    },
-    "node_modules/svgo/node_modules/dom-serializer": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz",
-      "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.2.0",
-        "entities": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
-      }
-    },
-    "node_modules/svgo/node_modules/domelementtype": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
-      "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ]
-    },
-    "node_modules/svgo/node_modules/domhandler": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.2.0.tgz",
-      "integrity": "sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "^2.2.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domhandler?sponsor=1"
-      }
-    },
-    "node_modules/svgo/node_modules/domutils": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.7.0.tgz",
-      "integrity": "sha512-8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg==",
-      "dev": true,
-      "dependencies": {
-        "dom-serializer": "^1.0.1",
-        "domelementtype": "^2.2.0",
-        "domhandler": "^4.2.0"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domutils?sponsor=1"
-      }
-    },
-    "node_modules/svgo/node_modules/entities": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
+    "node_modules/svgo/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
     },
     "node_modules/svgo/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
-    "node_modules/svgo/node_modules/nth-check": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.0.tgz",
-      "integrity": "sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q==",
-      "dev": true,
-      "dependencies": {
-        "boolbase": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/nth-check?sponsor=1"
-      }
+    "node_modules/svgo/node_modules/sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+      "dev": true
     },
     "node_modules/svgo/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "has-flag": "^3.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
     "node_modules/symbol-observable": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-3.0.0.tgz",
-      "integrity": "sha512-6tDOXSHiVjuCaasQSWTmHUWn4PuG7qa3+1WT031yTc/swT7+rLiw3GOrFxaH1E3lLP09dH3bVuVDf2gK5rxG3Q==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
+      "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==",
       "dev": true,
       "engines": {
-        "node": ">=0.10"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/symbol-tree": {
@@ -27453,13 +27565,14 @@
       }
     },
     "node_modules/table": {
-      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz",
-      "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.6.0.tgz",
+      "integrity": "sha512-iZMtp5tUvcnAdtHpZTWLPF0M7AgiQsURR2DwmxnJwSy8I3+cY+ozzVvYha3BOLG2TB+L0CqjIz+91htuj6yCXg==",
       "dev": true,
       "dependencies": {
         "ajv": "^8.0.1",
         "lodash.clonedeep": "^4.5.0",
+        "lodash.flatten": "^4.4.0",
         "lodash.truncate": "^4.4.2",
         "slice-ansi": "^4.0.0",
         "string-width": "^4.2.0",
@@ -27469,6 +27582,78 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/table/node_modules/ajv": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.2.0.tgz",
+      "integrity": "sha512-WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/table/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/table/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/table/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/table/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
+    },
+    "node_modules/table/node_modules/string-width": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/table/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/tail": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/tail/-/tail-0.4.0.tgz",
@@ -27478,18 +27663,18 @@
       }
     },
     "node_modules/tapable": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz",
-      "integrity": "sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
+      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
       "dev": true,
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/tar": {
-      "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.3.tgz",
-      "integrity": "sha512-3rUqwucgVZXTeyJyL2jqtUau8/8r54SioM1xj3AmTX3HnWQdj2AydfJ2qYYayPyIIznSplcvU9mhBb7dR2XF3w==",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.1.tgz",
+      "integrity": "sha512-GG0R7yt/CQkvG4fueXDi52Zskqxe2AyRJ+Wm54yqarnBgcX3qRIWh10qLVAAN+mlPFGTfP5UxvD3Fbi11UOTUQ==",
       "dependencies": {
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
@@ -27521,9 +27706,9 @@
       "optional": true
     },
     "node_modules/tar-stream": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
-      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.4.tgz",
+      "integrity": "sha512-o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw==",
       "optional": true,
       "dependencies": {
         "bl": "^4.0.3",
@@ -27550,6 +27735,17 @@
         "node": ">= 6"
       }
     },
+    "node_modules/tar/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/term-size": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz",
@@ -27577,37 +27773,64 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/terminal-link/node_modules/ansi-escapes": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
+      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.11.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/terminal-link/node_modules/type-fest": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
+      "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/terser": {
-      "version": "5.5.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.5.1.tgz",
-      "integrity": "sha512-6VGWZNVP2KTUcltUQJ25TtNjx/XgdDsBDKGt8nN0MpydU36LmbPPcMBd2kmtZNNGVVDLg44k7GKeHHj+4zPIBQ==",
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.7.0.tgz",
+      "integrity": "sha512-Lfb0RiZcjRDXCC3OSHJpEkxJ9Qeqs6mp2v4jf2MHfy8vGERmVDuvjXdd/EnP5Deme5F2yBRBymKmKHCBg2echw==",
       "dev": true,
       "dependencies": {
         "commander": "^2.20.0",
-        "source-map": "~0.7.2",
-        "source-map-support": "~0.5.19"
+        "source-map": "~0.6.1",
+        "source-map-support": "~0.5.12"
       },
       "bin": {
         "terser": "bin/terser"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=6.0.0"
       }
     },
     "node_modules/terser-webpack-plugin": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-4.2.3.tgz",
-      "integrity": "sha512-jTgXh40RnvOrLQNgIkwEKnQ8rmHjHK4u+6UBEi+W+FPmvb+uo+chJXntKe7/3lW5mNysgSWD60KyesnhW8D6MQ==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-3.0.1.tgz",
+      "integrity": "sha512-eFDtq8qPUEa9hXcUzTwKXTnugIVtlqc1Z/ZVhG8LmRT3lgRY13+pQTnFLY2N7ATB6TKCHuW/IGjoAnZz9wOIqw==",
       "dev": true,
       "dependencies": {
-        "cacache": "^15.0.5",
+        "cacache": "^15.0.3",
         "find-cache-dir": "^3.3.1",
-        "jest-worker": "^26.5.0",
-        "p-limit": "^3.0.2",
-        "schema-utils": "^3.0.0",
-        "serialize-javascript": "^5.0.1",
+        "jest-worker": "^26.0.0",
+        "p-limit": "^2.3.0",
+        "schema-utils": "^2.6.6",
+        "serialize-javascript": "^3.0.0",
         "source-map": "^0.6.1",
-        "terser": "^5.3.4",
+        "terser": "^4.6.13",
         "webpack-sources": "^1.4.3"
       },
       "engines": {
@@ -27621,53 +27844,28 @@
         "webpack": "^4.0.0 || ^5.0.0"
       }
     },
-    "node_modules/terser-webpack-plugin/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+    "node_modules/terser-webpack-plugin/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
       "dev": true,
       "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
+        "p-try": "^2.0.0"
       },
       "engines": {
-        "node": ">= 10.13.0"
+        "node": ">=6"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/serialize-javascript": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz",
+      "integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==",
+      "dev": true,
+      "dependencies": {
+        "randombytes": "^2.1.0"
       }
     },
     "node_modules/terser-webpack-plugin/node_modules/source-map": {
@@ -27679,22 +27877,15 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/terser-webpack-plugin/node_modules/webpack-sources": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+    "node_modules/terser/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
-      "dependencies": {
-        "source-list-map": "^2.0.0",
-        "source-map": "~0.6.1"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/terser/node_modules/commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true
-    },
     "node_modules/test-exclude": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
@@ -27762,9 +27953,9 @@
       }
     },
     "node_modules/timers-browserify": {
-      "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
-      "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
+      "version": "2.0.11",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
+      "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
       "dev": true,
       "dependencies": {
         "setimmediate": "^1.0.4"
@@ -27882,19 +28073,6 @@
         "node": ">=8.0"
       }
     },
-    "node_modules/to-regex/node_modules/extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-      "dev": true,
-      "dependencies": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/to-through": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz",
@@ -27929,9 +28107,9 @@
       }
     },
     "node_modules/tr46": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
-      "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.0.2.tgz",
+      "integrity": "sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==",
       "dev": true,
       "dependencies": {
         "punycode": "^2.1.1"
@@ -27950,17 +28128,18 @@
       }
     },
     "node_modules/ts-jest": {
-      "version": "26.5.6",
-      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-26.5.6.tgz",
-      "integrity": "sha512-rua+rCP8DxpA8b4DQD/6X2HQS8Zy/xzViVYfEs2OQu68tkCuKLV0Md8pmX55+W24uRIyAsf/BajRfxOs+R2MKA==",
+      "version": "26.4.1",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-26.4.1.tgz",
+      "integrity": "sha512-F4aFq01aS6mnAAa0DljNmKr/Kk9y4HVZ1m6/rtJ0ED56cuxINGq3Q9eVAh+z5vcYKe5qnTMvv90vE8vUMFxomg==",
       "dev": true,
       "dependencies": {
+        "@types/jest": "26.x",
         "bs-logger": "0.x",
         "buffer-from": "1.x",
         "fast-json-stable-stringify": "2.x",
         "jest-util": "^26.1.0",
         "json5": "2.x",
-        "lodash": "4.x",
+        "lodash.memoize": "4.x",
         "make-error": "1.x",
         "mkdirp": "1.x",
         "semver": "7.x",
@@ -27977,10 +28156,31 @@
         "typescript": ">=3.8 <5.0"
       }
     },
+    "node_modules/ts-jest/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "dev": true,
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ts-jest/node_modules/yargs-parser": {
+      "version": "20.2.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.1.tgz",
+      "integrity": "sha512-yYsjuSkjbLMBp16eaOt7/siKTjNVjMm3SoJnIg3sEh/JsvqVVDyjRKmaJV4cl+lNIgq6QEco2i3gDebJl7/vLA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/ts-md5": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/ts-md5/-/ts-md5-1.2.9.tgz",
-      "integrity": "sha512-/Efr7ZfGf8P+d9HXh0PLQD1CDipqD8j9apCFG96pODDoEaFLxXpV4En6tAc6y3fWyfhFGrqtNBRBS+eLVIB2uQ=="
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/ts-md5/-/ts-md5-1.2.7.tgz",
+      "integrity": "sha512-emODogvKGWi1KO1l9c6YxLMBn6CEH3VrH5mVPIyOtxBG52BvV4jP3GWz6bOZCz61nLgBc3ffQYE4+EHfCD+V7w=="
     },
     "node_modules/ts-node": {
       "version": "8.3.0",
@@ -28019,16 +28219,29 @@
       }
     },
     "node_modules/tsconfig-paths": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.10.1.tgz",
-      "integrity": "sha512-rETidPDgCpltxF7MjBZlAFPUHv5aHH2MymyPvh+vEyWAED4Eb/WeMbsnD/JDr4OKPOA1TssDHgIcpTN5Kh0p6Q==",
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz",
+      "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==",
       "dev": true,
       "dependencies": {
-        "json5": "^2.2.0",
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.1",
         "minimist": "^1.2.0",
         "strip-bom": "^3.0.0"
       }
     },
+    "node_modules/tsconfig-paths/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
     "node_modules/tsconfig-paths/node_modules/strip-bom": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
@@ -28039,14 +28252,14 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
-      "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz",
+      "integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ=="
     },
     "node_modules/tsutils": {
-      "version": "3.21.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
-      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+      "version": "3.17.1",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.17.1.tgz",
+      "integrity": "sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==",
       "dev": true,
       "dependencies": {
         "tslib": "^1.8.1"
@@ -28059,9 +28272,9 @@
       }
     },
     "node_modules/tsutils/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
+      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
       "dev": true
     },
     "node_modules/tty-browserify": {
@@ -28114,15 +28327,11 @@
       }
     },
     "node_modules/type-fest": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-      "dev": true,
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=8"
       }
     },
     "node_modules/type-is": {
@@ -28152,9 +28361,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "4.1.6",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.1.6.tgz",
-      "integrity": "sha512-pxnwLxeb/Z5SP80JDRzVjh58KsM6jZHRAOtTpS7sXLS4ogXNKC9ANxHHZqLLeVHZN35jCtI4JdmLLbLiC1kBow==",
+      "version": "3.9.9",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.9.tgz",
+      "integrity": "sha512-kdMjTiekY+z/ubJCATUPlRDl39vXYiMV9iyeMuEuXZh2we6zz80uovNN2WlAxmmdE/Z/YQe+EbOEXB5RHEED3w==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
@@ -28210,6 +28419,18 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/unbox-primitive/node_modules/has-symbols": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/unc-path-regex": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
@@ -28220,9 +28441,9 @@
       }
     },
     "node_modules/underscore": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
-      "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g=="
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.11.0.tgz",
+      "integrity": "sha512-xY96SsN3NA461qIRKZ/+qox37YXPtSBswMGfiNptr+wrt6ds4HaMw23TP612fEyGekRE6LNRiLYr/aqbHXNedw=="
     },
     "node_modules/undertaker": {
       "version": "1.3.0",
@@ -28315,23 +28536,11 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/union-value/node_modules/arr-union": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/union-value/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+    "node_modules/uniq": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
+      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
+      "dev": true
     },
     "node_modules/uniqs": {
       "version": "2.0.0",
@@ -28377,26 +28586,32 @@
       }
     },
     "node_modules/universal-analytics": {
-      "version": "0.4.23",
-      "resolved": "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.4.23.tgz",
-      "integrity": "sha512-lgMIH7XBI6OgYn1woDEmxhGdj8yDefMKg7GkWdeATAlQZFrMrNyxSkpDzY57iY0/6fdlzTbBV03OawvvzG+q7A==",
+      "version": "0.4.20",
+      "resolved": "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.4.20.tgz",
+      "integrity": "sha512-gE91dtMvNkjO+kWsPstHRtSwHXz0l2axqptGYp5ceg4MsuurloM0PU3pdOfpb5zBXUvyjT4PwhWK2m39uczZuw==",
       "dev": true,
       "dependencies": {
-        "debug": "^4.1.1",
-        "request": "^2.88.2",
+        "debug": "^3.0.0",
+        "request": "^2.88.0",
         "uuid": "^3.0.0"
       }
     },
-    "node_modules/universal-analytics/node_modules/uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+    "node_modules/universal-analytics/node_modules/debug": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
       "dev": true,
-      "bin": {
-        "uuid": "bin/uuid"
+      "dependencies": {
+        "ms": "^2.1.1"
       }
     },
+    "node_modules/universal-analytics/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
     "node_modules/universalify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
@@ -28421,6 +28636,12 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/unquote": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
+      "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
+      "dev": true
+    },
     "node_modules/unset-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
@@ -28482,6 +28703,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
       "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -28522,62 +28744,6 @@
         "url": "https://github.com/yeoman/update-notifier?sponsor=1"
       }
     },
-    "node_modules/update-notifier/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/update-notifier/node_modules/chalk": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/update-notifier/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/update-notifier/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/update-notifier/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/upper-case": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
@@ -28585,9 +28751,9 @@
       "dev": true
     },
     "node_modules/uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz",
+      "integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==",
       "dependencies": {
         "punycode": "^2.1.0"
       }
@@ -28610,9 +28776,9 @@
       }
     },
     "node_modules/url-parse": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz",
-      "integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==",
+      "version": "1.4.7",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
+      "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
       "dev": true,
       "dependencies": {
         "querystringify": "^2.1.1",
@@ -28646,12 +28812,12 @@
       }
     },
     "node_modules/util": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
-      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
       "dev": true,
       "dependencies": {
-        "inherits": "2.0.3"
+        "inherits": "2.0.1"
       }
     },
     "node_modules/util-deprecate": {
@@ -28659,10 +28825,59 @@
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
+    "node_modules/util-promisify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/util-promisify/-/util-promisify-2.1.0.tgz",
+      "integrity": "sha1-PCI2R2xNMsX/PEcAKt18E7moKlM=",
+      "dev": true,
+      "dependencies": {
+        "object.getownpropertydescriptors": "^2.0.3"
+      }
+    },
+    "node_modules/util.promisify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
+      "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.2",
+        "has-symbols": "^1.0.1",
+        "object.getownpropertydescriptors": "^2.1.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/util.promisify/node_modules/es-abstract": {
+      "version": "1.17.7",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+      "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+      "dev": true,
+      "dependencies": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.2",
+        "is-regex": "^1.1.1",
+        "object-inspect": "^1.8.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.1",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/util/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+      "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
       "dev": true
     },
     "node_modules/utils-merge": {
@@ -28674,12 +28889,12 @@
       }
     },
     "node_modules/uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "dev": true,
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
       "bin": {
-        "uuid": "dist/bin/uuid"
+        "uuid": "bin/uuid"
       }
     },
     "node_modules/v8-compile-cache": {
@@ -28689,9 +28904,9 @@
       "dev": true
     },
     "node_modules/v8-to-istanbul": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz",
-      "integrity": "sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-5.0.1.tgz",
+      "integrity": "sha512-mbDNjuDajqYe3TXFk5qxcQy8L1msXNE37WTlLoqqpBfRsimbNcrlhQlDPntmECEcUvdC+AQ8CyMMf6EUx1r74Q==",
       "dev": true,
       "dependencies": {
         "@types/istanbul-lib-coverage": "^2.0.1",
@@ -28888,9 +29103,9 @@
       }
     },
     "node_modules/watchpack": {
-      "version": "1.7.5",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",
-      "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.4.tgz",
+      "integrity": "sha512-aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg==",
       "dev": true,
       "dependencies": {
         "graceful-fs": "^4.1.2",
@@ -28898,17 +29113,20 @@
       },
       "optionalDependencies": {
         "chokidar": "^3.4.1",
-        "watchpack-chokidar2": "^2.0.1"
+        "watchpack-chokidar2": "^2.0.0"
       }
     },
     "node_modules/watchpack-chokidar2": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz",
-      "integrity": "sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz",
+      "integrity": "sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==",
       "dev": true,
       "optional": true,
       "dependencies": {
         "chokidar": "^2.1.8"
+      },
+      "engines": {
+        "node": "<8.10.0"
       }
     },
     "node_modules/watchpack-chokidar2/node_modules/anymatch": {
@@ -28935,16 +29153,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/watchpack-chokidar2/node_modules/arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/watchpack-chokidar2/node_modules/binary-extensions": {
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
@@ -28977,6 +29185,19 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/watchpack-chokidar2/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/watchpack-chokidar2/node_modules/chokidar": {
       "version": "2.1.8",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
@@ -29001,19 +29222,6 @@
         "fsevents": "^1.2.7"
       }
     },
-    "node_modules/watchpack-chokidar2/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/watchpack-chokidar2/node_modules/fill-range": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -29030,6 +29238,19 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/watchpack-chokidar2/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/watchpack-chokidar2/node_modules/fsevents": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
@@ -29086,16 +29307,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/watchpack-chokidar2/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/watchpack-chokidar2/node_modules/is-number": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -29109,14 +29320,14 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/watchpack-chokidar2/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+    "node_modules/watchpack-chokidar2/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "dev": true,
       "optional": true,
       "dependencies": {
-        "isobject": "^3.0.1"
+        "is-buffer": "^1.1.5"
       },
       "engines": {
         "node": ">=0.10.0"
@@ -29132,19 +29343,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/watchpack-chokidar2/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/watchpack-chokidar2/node_modules/micromatch": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -29170,43 +29368,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/watchpack-chokidar2/node_modules/micromatch/node_modules/extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/micromatch/node_modules/is-extendable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "is-plain-object": "^2.0.4"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/micromatch/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/watchpack-chokidar2/node_modules/readdirp": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
@@ -29264,9 +29425,9 @@
       }
     },
     "node_modules/webpack": {
-      "version": "4.44.2",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.2.tgz",
-      "integrity": "sha512-6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q==",
+      "version": "4.43.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.43.0.tgz",
+      "integrity": "sha512-GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g==",
       "dev": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.9.0",
@@ -29277,7 +29438,7 @@
         "ajv": "^6.10.2",
         "ajv-keywords": "^3.4.1",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^4.3.0",
+        "enhanced-resolve": "^4.1.0",
         "eslint-scope": "^4.0.3",
         "json-parse-better-errors": "^1.0.2",
         "loader-runner": "^2.4.0",
@@ -29290,7 +29451,7 @@
         "schema-utils": "^1.0.0",
         "tapable": "^1.1.3",
         "terser-webpack-plugin": "^1.4.3",
-        "watchpack": "^1.7.4",
+        "watchpack": "^1.6.1",
         "webpack-sources": "^1.4.1"
       },
       "bin": {
@@ -29302,14 +29463,6 @@
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/webpack"
-      },
-      "peerDependenciesMeta": {
-        "webpack-cli": {
-          "optional": true
-        },
-        "webpack-command": {
-          "optional": true
-        }
       }
     },
     "node_modules/webpack-dev-middleware": {
@@ -29331,10 +29484,20 @@
         "webpack": "^4.0.0"
       }
     },
+    "node_modules/webpack-dev-middleware/node_modules/memory-fs": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+      "dev": true,
+      "dependencies": {
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
+      }
+    },
     "node_modules/webpack-dev-middleware/node_modules/mime": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
-      "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
+      "version": "2.4.6",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
+      "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==",
       "dev": true,
       "bin": {
         "mime": "cli.js"
@@ -29343,22 +29506,10 @@
         "node": ">=4.0.0"
       }
     },
-    "node_modules/webpack-dev-middleware/node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
     "node_modules/webpack-dev-server": {
-      "version": "3.11.2",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.2.tgz",
-      "integrity": "sha512-A80BkuHRQfCiNtGBS1EMf2ChTUs0x+B3wGDFmOeT4rmJOHhHTCH2naNxIHhmkr0/UillP4U3yeIyv1pNp+QDLQ==",
+      "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz",
+      "integrity": "sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg==",
       "dev": true,
       "dependencies": {
         "ansi-html": "0.0.7",
@@ -29381,11 +29532,11 @@
         "p-retry": "^3.0.1",
         "portfinder": "^1.0.26",
         "schema-utils": "^1.0.0",
-        "selfsigned": "^1.10.8",
+        "selfsigned": "^1.10.7",
         "semver": "^6.3.0",
         "serve-index": "^1.9.1",
-        "sockjs": "^0.3.21",
-        "sockjs-client": "^1.5.0",
+        "sockjs": "0.3.20",
+        "sockjs-client": "1.4.0",
         "spdy": "^4.0.2",
         "strip-ansi": "^3.0.1",
         "supports-color": "^6.1.0",
@@ -29410,31 +29561,6 @@
         }
       }
     },
-    "node_modules/webpack-dev-server/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
     "node_modules/webpack-dev-server/node_modules/ansi-regex": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
@@ -29466,15 +29592,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/webpack-dev-server/node_modules/arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/webpack-dev-server/node_modules/binary-extensions": {
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
@@ -29505,13 +29622,16 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/webpack-dev-server/node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+    "node_modules/webpack-dev-server/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
       "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
       "engines": {
-        "node": ">=6"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/webpack-dev-server/node_modules/chokidar": {
@@ -29537,54 +29657,22 @@
         "fsevents": "^1.2.7"
       }
     },
-    "node_modules/webpack-dev-server/node_modules/cliui": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+    "node_modules/webpack-dev-server/node_modules/debug": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+      "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
       "dev": true,
       "dependencies": {
-        "string-width": "^3.1.0",
-        "strip-ansi": "^5.2.0",
-        "wrap-ansi": "^5.1.0"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/cliui/node_modules/ansi-regex": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/cliui/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
+        "ms": "2.1.2"
       },
       "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-      "dev": true
-    },
-    "node_modules/webpack-dev-server/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
+        "node": ">=6.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
     "node_modules/webpack-dev-server/node_modules/fill-range": {
@@ -29602,16 +29690,16 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/webpack-dev-server/node_modules/find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+    "node_modules/webpack-dev-server/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
       "dev": true,
       "dependencies": {
-        "locate-path": "^3.0.0"
+        "is-extendable": "^0.1.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/webpack-dev-server/node_modules/fsevents": {
@@ -29655,20 +29743,22 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/webpack-dev-server/node_modules/import-local": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
-      "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
+    "node_modules/webpack-dev-server/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
       "dev": true,
-      "dependencies": {
-        "pkg-dir": "^3.0.0",
-        "resolve-cwd": "^2.0.0"
-      },
-      "bin": {
-        "import-local-fixture": "fixtures/cli.js"
-      },
       "engines": {
-        "node": ">=6"
+        "node": ">=4"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/is-absolute-url": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz",
+      "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
       }
     },
     "node_modules/webpack-dev-server/node_modules/is-binary-path": {
@@ -29683,24 +29773,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/webpack-dev-server/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/webpack-dev-server/node_modules/is-number": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -29713,13 +29785,13 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/webpack-dev-server/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+    "node_modules/webpack-dev-server/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "dev": true,
       "dependencies": {
-        "isobject": "^3.0.1"
+        "is-buffer": "^1.1.5"
       },
       "engines": {
         "node": ">=0.10.0"
@@ -29734,37 +29806,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/webpack-dev-server/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/webpack-dev-server/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/webpack-dev-server/node_modules/micromatch": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -29789,78 +29830,11 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/webpack-dev-server/node_modules/micromatch/node_modules/extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-      "dev": true,
-      "dependencies": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/micromatch/node_modules/is-extendable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-      "dev": true,
-      "dependencies": {
-        "is-plain-object": "^2.0.4"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/micromatch/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/pkg-dir": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
+    "node_modules/webpack-dev-server/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
     },
     "node_modules/webpack-dev-server/node_modules/readdirp": {
       "version": "2.2.1",
@@ -29876,33 +29850,6 @@
         "node": ">=0.10"
       }
     },
-    "node_modules/webpack-dev-server/node_modules/require-main-filename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-      "dev": true
-    },
-    "node_modules/webpack-dev-server/node_modules/resolve-cwd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
-      "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
-      "dev": true,
-      "dependencies": {
-        "resolve-from": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/resolve-from": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/webpack-dev-server/node_modules/schema-utils": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
@@ -29926,41 +29873,6 @@
         "semver": "bin/semver.js"
       }
     },
-    "node_modules/webpack-dev-server/node_modules/string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/string-width/node_modules/ansi-regex": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/string-width/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/webpack-dev-server/node_modules/strip-ansi": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
@@ -29998,90 +29910,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/webpack-dev-server/node_modules/which-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-      "dev": true
-    },
-    "node_modules/webpack-dev-server/node_modules/wrap-ansi": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.0",
-        "string-width": "^3.0.0",
-        "strip-ansi": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/wrap-ansi/node_modules/ansi-regex": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/wrap-ansi/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/ws": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
-      "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
-      "dev": true,
-      "dependencies": {
-        "async-limiter": "~1.0.0"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/y18n": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
-      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
-      "dev": true
-    },
-    "node_modules/webpack-dev-server/node_modules/yargs": {
-      "version": "13.3.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-      "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
-      "dev": true,
-      "dependencies": {
-        "cliui": "^5.0.0",
-        "find-up": "^3.0.0",
-        "get-caller-file": "^2.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^3.0.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^13.1.2"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/yargs-parser": {
-      "version": "13.1.2",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      }
-    },
     "node_modules/webpack-log": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
@@ -30095,49 +29923,23 @@
         "node": ">= 6"
       }
     },
-    "node_modules/webpack-log/node_modules/ansi-colors": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
-      "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/webpack-log/node_modules/uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
-      "dev": true,
-      "bin": {
-        "uuid": "bin/uuid"
-      }
-    },
     "node_modules/webpack-merge": {
-      "version": "5.7.3",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.7.3.tgz",
-      "integrity": "sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
+      "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==",
       "dev": true,
       "dependencies": {
-        "clone-deep": "^4.0.1",
-        "wildcard": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10.0.0"
+        "lodash": "^4.17.15"
       }
     },
     "node_modules/webpack-sources": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.2.0.tgz",
-      "integrity": "sha512-bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w==",
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
       "dev": true,
       "dependencies": {
-        "source-list-map": "^2.0.1",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=10.13.0"
+        "source-list-map": "^2.0.0",
+        "source-map": "~0.6.1"
       }
     },
     "node_modules/webpack-sources/node_modules/source-map": {
@@ -30150,9 +29952,9 @@
       }
     },
     "node_modules/webpack-subresource-integrity": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.5.2.tgz",
-      "integrity": "sha512-GBWYBoyalbo5YClwWop9qe6Zclp8CIXYGIz12OPclJhIrSplDxs1Ls1JDMH8xBPPrg1T6ISaTW9Y6zOrwEiAzw==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.4.1.tgz",
+      "integrity": "sha512-XMLFInbGbB1HV7K4vHWANzc1CN0t/c4bBvnlvGxGwV45yE/S/feAXIm8dJsCkzqWtSKnmaEgTp/meyeThxG4Iw==",
       "dev": true,
       "dependencies": {
         "webpack-sources": "^1.3.0"
@@ -30161,8 +29963,8 @@
         "node": ">=4"
       },
       "peerDependencies": {
-        "html-webpack-plugin": ">= 2.21.0 < 5",
-        "webpack": ">= 1.12.11 < 6"
+        "html-webpack-plugin": "^2.21.0 || ~3 || >=4.0.0-alpha.2 <5",
+        "webpack": "^1.12.11 || ~2 || ~3 || ~4"
       },
       "peerDependenciesMeta": {
         "html-webpack-plugin": {
@@ -30170,71 +29972,6 @@
         }
       }
     },
-    "node_modules/webpack-subresource-integrity/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack-subresource-integrity/node_modules/webpack-sources": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-      "dev": true,
-      "dependencies": {
-        "source-list-map": "^2.0.0",
-        "source-map": "~0.6.1"
-      }
-    },
-    "node_modules/webpack/node_modules/acorn": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
-      "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/webpack/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/webpack/node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
-    "node_modules/webpack/node_modules/arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/webpack/node_modules/braces": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
@@ -30268,15 +30005,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/webpack/node_modules/braces/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/webpack/node_modules/cacache": {
       "version": "12.0.4",
       "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
@@ -30306,65 +30034,6 @@
       "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
       "dev": true
     },
-    "node_modules/webpack/node_modules/commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true
-    },
-    "node_modules/webpack/node_modules/enhanced-resolve": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz",
-      "integrity": "sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "memory-fs": "^0.5.0",
-        "tapable": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/webpack/node_modules/enhanced-resolve/node_modules/memory-fs": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
-      "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
-      "dev": true,
-      "dependencies": {
-        "errno": "^0.1.3",
-        "readable-stream": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=4.3.0 <5.0.0 || >=5.10"
-      }
-    },
-    "node_modules/webpack/node_modules/eslint-scope": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
-      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/webpack/node_modules/extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-      "dev": true,
-      "dependencies": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/webpack/node_modules/fill-range": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -30392,15 +30061,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/webpack/node_modules/fill-range/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/webpack/node_modules/find-cache-dir": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
@@ -30415,18 +30075,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/webpack/node_modules/find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/webpack/node_modules/is-number": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -30469,12 +30117,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/webpack/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
     "node_modules/webpack/node_modules/json5": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
@@ -30487,15 +30129,6 @@
         "json5": "lib/cli.js"
       }
     },
-    "node_modules/webpack/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/webpack/node_modules/loader-utils": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
@@ -30510,19 +30143,6 @@
         "node": ">=4.0.0"
       }
     },
-    "node_modules/webpack/node_modules/locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/webpack/node_modules/lru-cache": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
@@ -30545,6 +30165,16 @@
         "node": ">=6"
       }
     },
+    "node_modules/webpack/node_modules/memory-fs": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+      "dev": true,
+      "dependencies": {
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
+      }
+    },
     "node_modules/webpack/node_modules/micromatch": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -30569,66 +30199,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/webpack/node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/webpack/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/webpack/node_modules/p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/webpack/node_modules/pify": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/webpack/node_modules/pkg-dir": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/webpack/node_modules/rimraf": {
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -30664,15 +30234,6 @@
         "semver": "bin/semver"
       }
     },
-    "node_modules/webpack/node_modules/serialize-javascript": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
-      "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
-      "dev": true,
-      "dependencies": {
-        "randombytes": "^2.1.0"
-      }
-    },
     "node_modules/webpack/node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -30683,40 +30244,14 @@
       }
     },
     "node_modules/webpack/node_modules/ssri": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz",
-      "integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
       "dev": true,
       "dependencies": {
         "figgy-pudding": "^3.5.1"
       }
     },
-    "node_modules/webpack/node_modules/tapable": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
-      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/webpack/node_modules/terser": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
-      "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
-      "dev": true,
-      "dependencies": {
-        "commander": "^2.20.0",
-        "source-map": "~0.6.1",
-        "source-map-support": "~0.5.12"
-      },
-      "bin": {
-        "terser": "bin/terser"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
     "node_modules/webpack/node_modules/terser-webpack-plugin": {
       "version": "1.4.5",
       "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz",
@@ -30753,22 +30288,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/webpack/node_modules/webpack-sources": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-      "dev": true,
-      "dependencies": {
-        "source-list-map": "^2.0.0",
-        "source-map": "~0.6.1"
-      }
-    },
-    "node_modules/webpack/node_modules/y18n": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
-      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
-      "dev": true
-    },
     "node_modules/webpack/node_modules/yallist": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
@@ -30788,17 +30307,15 @@
       }
     },
     "node_modules/websocket-driver": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
-      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz",
+      "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=",
       "dev": true,
       "dependencies": {
-        "http-parser-js": ">=0.5.1",
-        "safe-buffer": ">=5.1.0",
         "websocket-extensions": ">=0.1.1"
       },
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">=0.6.0"
       }
     },
     "node_modules/websocket-extensions": {
@@ -30826,19 +30343,25 @@
       "dev": true
     },
     "node_modules/whatwg-url": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
-      "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.3.0.tgz",
+      "integrity": "sha512-BQRf/ej5Rp3+n7k0grQXZj9a1cHtsp4lqj01p59xBWFKdezR8sO37XnpafwNqiFac/v2Il12EIMjX/Y4VZtT8Q==",
       "dev": true,
       "dependencies": {
-        "lodash": "^4.7.0",
-        "tr46": "^2.1.0",
+        "lodash.sortby": "^4.7.0",
+        "tr46": "^2.0.2",
         "webidl-conversions": "^6.1.0"
       },
       "engines": {
         "node": ">=10"
       }
     },
+    "node_modules/when": {
+      "version": "3.6.4",
+      "resolved": "https://registry.npmjs.org/when/-/when-3.6.4.tgz",
+      "integrity": "sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=",
+      "dev": true
+    },
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -30870,11 +30393,17 @@
       }
     },
     "node_modules/which-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
       "dev": true
     },
+    "node_modules/which-pm-runs": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz",
+      "integrity": "sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=",
+      "optional": true
+    },
     "node_modules/wide-align": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
@@ -30883,45 +30412,6 @@
         "string-width": "^1.0.2 || 2"
       }
     },
-    "node_modules/wide-align/node_modules/ansi-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/wide-align/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/wide-align/node_modules/string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-      "dependencies": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/wide-align/node_modules/strip-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-      "dependencies": {
-        "ansi-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/widest-line": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
@@ -30933,27 +30423,173 @@
         "node": ">=8"
       }
     },
-    "node_modules/wildcard": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
-      "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
-      "dev": true
+    "node_modules/widest-line/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "node_modules/windows-release": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-4.0.0.tgz",
-      "integrity": "sha512-OxmV4wzDKB1x7AZaZgXMVsdJ1qER1ed83ZrTYd5Bwq2HfJVg3DJS8nqlAG4sMoJ7mu8cuRmLEYyU13BKwctRAg==",
-      "dev": true,
+    "node_modules/widest-line/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
+    "node_modules/widest-line/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/widest-line/node_modules/string-width": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
       "dependencies": {
-        "execa": "^4.0.2"
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=8"
+      }
+    },
+    "node_modules/widest-line/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/windows-release": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-3.3.3.tgz",
+      "integrity": "sha512-OSOGH1QYiW5yVor9TtmXKQvt2vjQqbYS+DqmsZw+r7xDwLXEeT3JGW0ZppFmHx4diyXmxt238KFR3N9jzevBRg==",
+      "dependencies": {
+        "execa": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/windows-release/node_modules/cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "dependencies": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      },
+      "engines": {
+        "node": ">=4.8"
+      }
+    },
+    "node_modules/windows-release/node_modules/execa": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+      "dependencies": {
+        "cross-spawn": "^6.0.0",
+        "get-stream": "^4.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/windows-release/node_modules/get-stream": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/windows-release/node_modules/is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/windows-release/node_modules/npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "dependencies": {
+        "path-key": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/windows-release/node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/windows-release/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/windows-release/node_modules/shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dependencies": {
+        "shebang-regex": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/windows-release/node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/windows-release/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
     "node_modules/with-open-file": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/with-open-file/-/with-open-file-0.1.7.tgz",
@@ -30967,14 +30603,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/with-open-file/node_modules/pify": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
@@ -30994,9 +30622,9 @@
       }
     },
     "node_modules/worker-plugin": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/worker-plugin/-/worker-plugin-5.0.0.tgz",
-      "integrity": "sha512-AXMUstURCxDD6yGam2r4E34aJg6kW85IiaeX72hi+I1cxyaMUtrvVY6sbfpGKAj5e7f68Acl62BjQF5aOOx2IQ==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/worker-plugin/-/worker-plugin-4.0.3.tgz",
+      "integrity": "sha512-7hFDYWiKcE3yHZvemsoM9lZis/PzurHAEX1ej8PLCu818Rt6QqUAiDdxHPCKZctzmhqzPpcFSgvMCiPbtooqAg==",
       "dev": true,
       "dependencies": {
         "loader-utils": "^1.1.0"
@@ -31032,47 +30660,58 @@
       }
     },
     "node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
+        "ansi-styles": "^3.2.0",
+        "string-width": "^3.0.0",
+        "strip-ansi": "^5.0.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+        "node": ">=6"
       }
     },
     "node_modules/wrap-ansi/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "color-convert": "^1.9.0"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">=4"
       }
     },
     "node_modules/wrap-ansi/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/wrap-ansi/node_modules/string-width": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^7.0.1",
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^5.1.0"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=6"
       }
     },
     "node_modules/wrappy": {
@@ -31103,57 +30742,25 @@
         "typedarray-to-buffer": "^3.1.5"
       }
     },
-    "node_modules/write/node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+    "node_modules/ws": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
+      "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
       "dev": true,
       "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/ws": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz",
-      "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.3.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
+        "async-limiter": "~1.0.0"
       }
     },
     "node_modules/xcode": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/xcode/-/xcode-3.0.1.tgz",
-      "integrity": "sha512-kCz5k7J7XbJtjABOvkc5lJmkiDh8VhjVCGNiqdKCscmVpdVUpEAyXv1xmCLkQJ5dsHqx3IPO4XW+NTDhU/fatA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/xcode/-/xcode-2.1.0.tgz",
+      "integrity": "sha512-uCrmPITrqTEzhn0TtT57fJaNaw8YJs1aCzs+P/QqxsDbvPZSv7XMPPwXrKvHtD6pLjBM/NaVwraWJm8q83Y4iQ==",
       "dependencies": {
-        "simple-plist": "^1.1.0",
-        "uuid": "^7.0.3"
+        "simple-plist": "^1.0.0",
+        "uuid": "^3.3.2"
       },
       "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/xcode/node_modules/uuid": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
-      "integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==",
-      "bin": {
-        "uuid": "dist/bin/uuid"
+        "node": ">=6.0.0"
       }
     },
     "node_modules/xdg-basedir": {
@@ -31190,11 +30797,12 @@
       "dev": true
     },
     "node_modules/xmldom": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.5.0.tgz",
-      "integrity": "sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA==",
+      "version": "0.1.31",
+      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.31.tgz",
+      "integrity": "sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==",
+      "deprecated": "Deprecated due to CVE-2021-21366 resolved in 0.5.0",
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=0.1"
       }
     },
     "node_modules/xregexp": {
@@ -31216,53 +30824,108 @@
       }
     },
     "node_modules/y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+      "dev": true
     },
     "node_modules/yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     },
-    "node_modules/yaml": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/yargs": {
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "version": "13.3.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+      "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
       "dev": true,
       "dependencies": {
-        "cliui": "^7.0.2",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
+        "cliui": "^5.0.0",
+        "find-up": "^3.0.0",
+        "get-caller-file": "^2.0.1",
         "require-directory": "^2.1.1",
-        "string-width": "^4.2.0",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^20.2.2"
-      },
-      "engines": {
-        "node": ">=10"
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^3.0.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^13.1.2"
       }
     },
     "node_modules/yargs-parser": {
-      "version": "20.2.9",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+      "version": "13.1.2",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
       "dev": true,
+      "dependencies": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      }
+    },
+    "node_modules/yargs/node_modules/find-up": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^3.0.0"
+      },
       "engines": {
-        "node": ">=10"
+        "node": ">=6"
+      }
+    },
+    "node_modules/yargs/node_modules/locate-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/yargs/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/yargs/node_modules/p-locate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/yargs/node_modules/string-width": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^7.0.1",
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=6"
       }
     },
     "node_modules/yauzl": {
@@ -31284,18 +30947,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/zone.js": {
       "version": "0.10.3",
       "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.10.3.tgz",
@@ -31304,20 +30955,20 @@
   },
   "dependencies": {
     "@angular-devkit/architect": {
-      "version": "0.1200.5",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1200.5.tgz",
-      "integrity": "sha512-222VZ4OeaDK3vON8V5m+w15SRWfUs5uOb4H9ij/H9/6tyHD83uWfCDoOGg+ax4wJVdWEFJIS+Vn4ijGcZCq9WQ==",
+      "version": "0.1101.2",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1101.2.tgz",
+      "integrity": "sha512-MLmBfHiiyPhbFSSAX4oMecPjEuBauOui5uBpI6BKNnk/7783fznbkbAKjXlOco7M81gkNeEoHMR8c+mOfcvv7g==",
       "dev": true,
       "peer": true,
       "requires": {
-        "@angular-devkit/core": "12.0.5",
-        "rxjs": "6.6.7"
+        "@angular-devkit/core": "11.1.2",
+        "rxjs": "6.6.3"
       },
       "dependencies": {
         "rxjs": {
-          "version": "6.6.7",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-          "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+          "version": "6.6.3",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
+          "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
           "dev": true,
           "peer": true,
           "requires": {
@@ -31334,113 +30985,105 @@
       }
     },
     "@angular-devkit/build-angular": {
-      "version": "0.1102.14",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.1102.14.tgz",
-      "integrity": "sha512-SyX9SK3qfpk6xNIrxpxYi8zxP/cN2kny4I+XYbkKvgGiE3qhkrC/PRJE9OWj0sloekLD0CDfFWOvIiw3GMc4Tg==",
+      "version": "0.1000.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.1000.8.tgz",
+      "integrity": "sha512-wwDN2oadQvYPL7lDmvGsoWQjW++0ZnxWk1QVlABGhBSIs8Uxs26Hjd5YNUSsvJavBkqb1UZIOilqzb4dig5MIA==",
       "dev": true,
       "requires": {
-        "@angular-devkit/architect": "0.1102.14",
-        "@angular-devkit/build-optimizer": "0.1102.14",
-        "@angular-devkit/build-webpack": "0.1102.14",
-        "@angular-devkit/core": "11.2.14",
-        "@babel/core": "7.12.10",
-        "@babel/generator": "7.12.11",
-        "@babel/plugin-transform-async-to-generator": "7.12.1",
-        "@babel/plugin-transform-runtime": "7.12.10",
-        "@babel/preset-env": "7.12.11",
-        "@babel/runtime": "7.12.5",
-        "@babel/template": "7.12.7",
-        "@discoveryjs/json-ext": "0.5.2",
-        "@jsdevtools/coverage-istanbul-loader": "3.0.5",
-        "@ngtools/webpack": "11.2.14",
-        "ansi-colors": "4.1.1",
-        "autoprefixer": "10.2.4",
-        "babel-loader": "8.2.2",
+        "@angular-devkit/architect": "0.1000.8",
+        "@angular-devkit/build-optimizer": "0.1000.8",
+        "@angular-devkit/build-webpack": "0.1000.8",
+        "@angular-devkit/core": "10.0.8",
+        "@babel/core": "7.9.6",
+        "@babel/generator": "7.9.6",
+        "@babel/plugin-transform-runtime": "7.9.6",
+        "@babel/preset-env": "7.9.6",
+        "@babel/runtime": "7.9.6",
+        "@babel/template": "7.8.6",
+        "@jsdevtools/coverage-istanbul-loader": "3.0.3",
+        "@ngtools/webpack": "10.0.8",
+        "ajv": "6.12.3",
+        "autoprefixer": "9.8.0",
+        "babel-loader": "8.1.0",
         "browserslist": "^4.9.1",
-        "cacache": "15.0.5",
+        "cacache": "15.0.3",
         "caniuse-lite": "^1.0.30001032",
-        "circular-dependency-plugin": "5.2.2",
-        "copy-webpack-plugin": "6.3.2",
-        "core-js": "3.8.3",
-        "critters": "0.0.7",
-        "css-loader": "5.0.1",
-        "cssnano": "5.0.2",
-        "file-loader": "6.2.0",
+        "circular-dependency-plugin": "5.2.0",
+        "copy-webpack-plugin": "6.0.3",
+        "core-js": "3.6.4",
+        "css-loader": "3.5.3",
+        "cssnano": "4.1.10",
+        "file-loader": "6.0.0",
         "find-cache-dir": "3.3.1",
         "glob": "7.1.6",
-        "https-proxy-agent": "5.0.0",
-        "inquirer": "7.3.3",
-        "jest-worker": "26.6.2",
+        "jest-worker": "26.0.0",
         "karma-source-map-support": "1.4.0",
-        "less": "4.1.1",
-        "less-loader": "7.3.0",
-        "license-webpack-plugin": "2.3.11",
+        "less-loader": "6.1.0",
+        "license-webpack-plugin": "2.2.0",
         "loader-utils": "2.0.0",
-        "mini-css-extract-plugin": "1.3.5",
+        "mini-css-extract-plugin": "0.9.0",
         "minimatch": "3.0.4",
-        "open": "7.4.0",
-        "ora": "5.3.0",
-        "parse5-html-rewriting-stream": "6.0.1",
+        "open": "7.0.4",
+        "parse5": "4.0.0",
         "pnp-webpack-plugin": "1.6.4",
-        "postcss": "8.2.15",
-        "postcss-import": "14.0.0",
-        "postcss-loader": "4.2.0",
-        "raw-loader": "4.0.2",
-        "regenerator-runtime": "0.13.7",
-        "resolve-url-loader": "4.0.0",
+        "postcss": "7.0.31",
+        "postcss-import": "12.0.1",
+        "postcss-loader": "3.0.0",
+        "raw-loader": "4.0.1",
+        "regenerator-runtime": "0.13.5",
+        "resolve-url-loader": "3.1.1",
         "rimraf": "3.0.2",
-        "rollup": "2.38.4",
-        "rxjs": "6.6.3",
-        "sass": "1.32.6",
-        "sass-loader": "10.1.1",
-        "semver": "7.3.4",
+        "rollup": "2.10.9",
+        "rxjs": "6.5.5",
+        "sass": "1.26.5",
+        "sass-loader": "8.0.2",
+        "semver": "7.3.2",
         "source-map": "0.7.3",
-        "source-map-loader": "1.1.3",
+        "source-map-loader": "1.0.0",
         "source-map-support": "0.5.19",
-        "speed-measure-webpack-plugin": "1.4.2",
-        "style-loader": "2.0.0",
-        "stylus": "0.54.8",
-        "stylus-loader": "4.3.3",
-        "terser": "5.5.1",
-        "terser-webpack-plugin": "4.2.3",
-        "text-table": "0.2.0",
+        "speed-measure-webpack-plugin": "1.3.3",
+        "style-loader": "1.2.1",
+        "stylus": "0.54.7",
+        "stylus-loader": "3.0.2",
+        "terser": "4.7.0",
+        "terser-webpack-plugin": "3.0.1",
         "tree-kill": "1.2.2",
-        "webpack": "4.44.2",
+        "webpack": "4.43.0",
         "webpack-dev-middleware": "3.7.2",
-        "webpack-dev-server": "3.11.2",
-        "webpack-merge": "5.7.3",
-        "webpack-sources": "2.2.0",
-        "webpack-subresource-integrity": "1.5.2",
-        "worker-plugin": "5.0.0"
+        "webpack-dev-server": "3.11.0",
+        "webpack-merge": "4.2.2",
+        "webpack-sources": "1.4.3",
+        "webpack-subresource-integrity": "1.4.1",
+        "worker-plugin": "4.0.3"
       },
       "dependencies": {
         "@angular-devkit/architect": {
-          "version": "0.1102.14",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.14.tgz",
-          "integrity": "sha512-965TVXuBtRb8RySgxRxUEO+YTd7mT0xiqVHSe+MHvMtUCmEE9vwRofFZl6axkK5ri4fiomiMnOVE19aw4spgNQ==",
+          "version": "0.1000.8",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1000.8.tgz",
+          "integrity": "sha512-2AqPbiEugtPxNz4MGhLh+imUVelhW9h1cdJs2AbxZosIxftPb5DNDQUSAwVmRGp4CtcXVrlvcDwc0f4Fw1aiIA==",
           "dev": true,
           "requires": {
-            "@angular-devkit/core": "11.2.14",
-            "rxjs": "6.6.3"
+            "@angular-devkit/core": "10.0.8",
+            "rxjs": "6.5.5"
           }
         },
         "@angular-devkit/core": {
-          "version": "11.2.14",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
-          "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
+          "version": "10.0.8",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
+          "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
           "dev": true,
           "requires": {
-            "ajv": "6.12.6",
+            "ajv": "6.12.3",
             "fast-json-stable-stringify": "2.1.0",
             "magic-string": "0.25.7",
-            "rxjs": "6.6.3",
+            "rxjs": "6.5.5",
             "source-map": "0.7.3"
           }
         },
         "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "version": "6.12.3",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+          "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
@@ -31450,99 +31093,81 @@
           }
         },
         "core-js": {
-          "version": "3.8.3",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.8.3.tgz",
-          "integrity": "sha512-KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q==",
+          "version": "3.6.4",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
+          "integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==",
           "dev": true
         },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        },
-        "rxjs": {
-          "version": "6.6.3",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
-          "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
+        "open": {
+          "version": "7.0.4",
+          "resolved": "https://registry.npmjs.org/open/-/open-7.0.4.tgz",
+          "integrity": "sha512-brSA+/yq+b08Hsr4c8fsEW2CRzk1BmfN3SAK/5VCHQ9bdoZJ4qa/+AfR0xHjlbbZUyPkUHs1b8x1RqdyZdkVqQ==",
           "dev": true,
           "requires": {
-            "tslib": "^1.9.0"
+            "is-docker": "^2.0.0",
+            "is-wsl": "^2.1.1"
           }
-        },
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-          "dev": true
         }
       }
     },
     "@angular-devkit/build-optimizer": {
-      "version": "0.1102.14",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.1102.14.tgz",
-      "integrity": "sha512-1j69rFqE6tPMO0lQvOH8ogF7vE+p+Ws1/OtdZKUkZPOerIbQ8A3n5wzCx6/ZzMVhBQ3sXNhaShb4b9/1YuwU/g==",
+      "version": "0.1000.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.1000.8.tgz",
+      "integrity": "sha512-esODHuTGEEMx1SmLUq03VAMly8gZUd1vRuvZeKS5HqKwDg8ZzcI7/25BuuUSlyST+6BEdjo2gnmagQnG0VBdQw==",
       "dev": true,
       "requires": {
         "loader-utils": "2.0.0",
         "source-map": "0.7.3",
-        "tslib": "2.1.0",
-        "typescript": "4.1.5",
-        "webpack-sources": "2.2.0"
+        "tslib": "2.0.0",
+        "webpack-sources": "1.4.3"
       },
       "dependencies": {
         "tslib": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz",
-          "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==",
-          "dev": true
-        },
-        "typescript": {
-          "version": "4.1.5",
-          "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.1.5.tgz",
-          "integrity": "sha512-6OSu9PTIzmn9TCDiovULTnET6BgXtDYL4Gg4szY+cGsc3JP1dQL8qvE8kShTRx1NIw4Q9IBHlwODjkjWEtMUyA==",
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.0.tgz",
+          "integrity": "sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==",
           "dev": true
         }
       }
     },
     "@angular-devkit/build-webpack": {
-      "version": "0.1102.14",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1102.14.tgz",
-      "integrity": "sha512-+dJvzrwjbHY0bNr8fUDVbn4D4pAT/h1YVpGVyaoX7q66LN0x61zRC3e10gJ/Mr54l3yfc26M0OPD9KG8iZRbCA==",
+      "version": "0.1000.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1000.8.tgz",
+      "integrity": "sha512-y/U+dV5N8W7KECncGSKQWoUH/DFNZCseczyl6LAd8bc0fMr8Z0TAIe8OXj+5CSRRdejWfRIxGtNWM+L2kTCU8A==",
       "dev": true,
       "requires": {
-        "@angular-devkit/architect": "0.1102.14",
-        "@angular-devkit/core": "11.2.14",
-        "rxjs": "6.6.3"
+        "@angular-devkit/architect": "0.1000.8",
+        "@angular-devkit/core": "10.0.8",
+        "rxjs": "6.5.5"
       },
       "dependencies": {
         "@angular-devkit/architect": {
-          "version": "0.1102.14",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.14.tgz",
-          "integrity": "sha512-965TVXuBtRb8RySgxRxUEO+YTd7mT0xiqVHSe+MHvMtUCmEE9vwRofFZl6axkK5ri4fiomiMnOVE19aw4spgNQ==",
+          "version": "0.1000.8",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1000.8.tgz",
+          "integrity": "sha512-2AqPbiEugtPxNz4MGhLh+imUVelhW9h1cdJs2AbxZosIxftPb5DNDQUSAwVmRGp4CtcXVrlvcDwc0f4Fw1aiIA==",
           "dev": true,
           "requires": {
-            "@angular-devkit/core": "11.2.14",
-            "rxjs": "6.6.3"
+            "@angular-devkit/core": "10.0.8",
+            "rxjs": "6.5.5"
           }
         },
         "@angular-devkit/core": {
-          "version": "11.2.14",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
-          "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
+          "version": "10.0.8",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
+          "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
           "dev": true,
           "requires": {
-            "ajv": "6.12.6",
+            "ajv": "6.12.3",
             "fast-json-stable-stringify": "2.1.0",
             "magic-string": "0.25.7",
-            "rxjs": "6.6.3",
+            "rxjs": "6.5.5",
             "source-map": "0.7.3"
           }
         },
         "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "version": "6.12.3",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+          "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
@@ -31550,50 +31175,41 @@
             "json-schema-traverse": "^0.4.1",
             "uri-js": "^4.2.2"
           }
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
+        }
+      }
+    },
+    "@angular-devkit/core": {
+      "version": "11.1.2",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.1.2.tgz",
+      "integrity": "sha512-V7zOMqL2l56JcwXVyswkG+7+t67r9XtkrVzRcG2Z5ZYwafU+iKWMwg5kBFZr1SX7fM1M9E4MpskxqtagQeUKng==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "ajv": "6.12.6",
+        "fast-json-stable-stringify": "2.1.0",
+        "magic-string": "0.25.7",
+        "rxjs": "6.6.3",
+        "source-map": "0.7.3"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
         },
         "rxjs": {
           "version": "6.6.3",
           "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
           "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
           "dev": true,
-          "requires": {
-            "tslib": "^1.9.0"
-          }
-        },
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-          "dev": true
-        }
-      }
-    },
-    "@angular-devkit/core": {
-      "version": "12.0.5",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-12.0.5.tgz",
-      "integrity": "sha512-zVSQV+8/vjUjsUKGlj8Kf5LioA6AXJTGI0yhHW9q1dFX4dPpbW63k0R1UoIB2wJ0F/AbYVgpnPGPe9BBm2fvZA==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "ajv": "8.2.0",
-        "ajv-formats": "2.0.2",
-        "fast-json-stable-stringify": "2.1.0",
-        "magic-string": "0.25.7",
-        "rxjs": "6.6.7",
-        "source-map": "0.7.3"
-      },
-      "dependencies": {
-        "rxjs": {
-          "version": "6.6.7",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-          "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
-          "dev": true,
           "peer": true,
           "requires": {
             "tslib": "^1.9.0"
@@ -31609,253 +31225,339 @@
       }
     },
     "@angular-devkit/schematics": {
-      "version": "12.1.4",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.1.4.tgz",
-      "integrity": "sha512-yD3y3pK/K5piOgvALFoCCiPp4H8emNa3yZL+vlpEpewVLpF1MM55LeTxc0PI5s0uqtOGVnvcbA5wYgMm3YsUEA==",
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.0.8.tgz",
+      "integrity": "sha512-p2PjvrExuzOe/azyOEcBeIgwZIk4D6VeLkJf/KVjhXOVu13pjIXHX7/qWl+IYnbtj3NZGHqXM5Cr8nxsJNIMpw==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "12.1.4",
-        "ora": "5.4.1",
-        "rxjs": "6.6.7"
+        "@angular-devkit/core": "10.0.8",
+        "ora": "4.0.4",
+        "rxjs": "6.5.5"
       },
       "dependencies": {
         "@angular-devkit/core": {
-          "version": "12.1.4",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-12.1.4.tgz",
-          "integrity": "sha512-KOzGD8JbP/7EeUwPiU5x+fo3ZEQ5R4IVW5WoH92PaO3mdpqXC7UL2MWLct8PUe9il9nqJMvrBMldSSvP9PCT2w==",
+          "version": "10.0.8",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
+          "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
           "dev": true,
           "requires": {
-            "ajv": "8.6.0",
-            "ajv-formats": "2.1.0",
+            "ajv": "6.12.3",
             "fast-json-stable-stringify": "2.1.0",
             "magic-string": "0.25.7",
-            "rxjs": "6.6.7",
+            "rxjs": "6.5.5",
             "source-map": "0.7.3"
           }
         },
         "ajv": {
-          "version": "8.6.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz",
-          "integrity": "sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==",
+          "version": "6.12.3",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+          "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
-            "json-schema-traverse": "^1.0.0",
-            "require-from-string": "^2.0.2",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
             "uri-js": "^4.2.2"
           }
-        },
-        "ajv-formats": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.0.tgz",
-          "integrity": "sha512-USH2jBb+C/hIpwD2iRjp0pe0k+MvzG0mlSn/FIdCgQhUb9ALPRjt2KIQdfZDS9r0ZIeUAg7gOu9KL0PFqGqr5Q==",
-          "dev": true,
-          "requires": {
-            "ajv": "^8.0.0"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "ora": {
-          "version": "5.4.1",
-          "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
-          "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
-          "dev": true,
-          "requires": {
-            "bl": "^4.1.0",
-            "chalk": "^4.1.0",
-            "cli-cursor": "^3.1.0",
-            "cli-spinners": "^2.5.0",
-            "is-interactive": "^1.0.0",
-            "is-unicode-supported": "^0.1.0",
-            "log-symbols": "^4.1.0",
-            "strip-ansi": "^6.0.0",
-            "wcwidth": "^1.0.1"
-          }
-        },
-        "rxjs": {
-          "version": "6.6.7",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-          "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
-          "dev": true,
-          "requires": {
-            "tslib": "^1.9.0"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-          "dev": true
         }
       }
     },
     "@angular-eslint/builder": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-4.3.0.tgz",
-      "integrity": "sha512-OzCA4jyELbHt8pyRuW6asib26rc+Ihr2SDjp+uoMivfpqjWVPOw0CvvEZj4SbpGvYOHtcAezyS526D2q2tKHvg==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-4.2.0.tgz",
+      "integrity": "sha512-qM4hpweuQ14ul8CU6LKpUWFZs6POUE7HZKdTllUrYuoZMrTpNB1XGelR0pweYzbfo4XRnUaO1NVgWhWOWiD5MA==",
       "dev": true,
       "requires": {}
     },
     "@angular-eslint/eslint-plugin": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-4.3.0.tgz",
-      "integrity": "sha512-an0fyKzPmpWp9OnstZYXFSCvKnc14F8xfl+HXqvynOiBK63cWTZLlzO+7Z4t3pQiSuiXsEYleRPktWkNWGv0tQ==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-4.2.0.tgz",
+      "integrity": "sha512-G8D8Pso6GcHW8vFkUSvgoKPIOtGTqO+eb5aytGtpogMgzxBRyr0juU/9Uz5dAhO6TOERIj1gPpJQ61R/n/Aaew==",
       "dev": true,
       "requires": {
         "@typescript-eslint/experimental-utils": "4.16.1"
+      },
+      "dependencies": {
+        "@typescript-eslint/experimental-utils": {
+          "version": "4.16.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.16.1.tgz",
+          "integrity": "sha512-0Hm3LSlMYFK17jO4iY3un1Ve9x1zLNn4EM50Lia+0EV99NdbK+cn0er7HC7IvBA23mBg3P+8dUkMXy4leL33UQ==",
+          "dev": true,
+          "requires": {
+            "@types/json-schema": "^7.0.3",
+            "@typescript-eslint/scope-manager": "4.16.1",
+            "@typescript-eslint/types": "4.16.1",
+            "@typescript-eslint/typescript-estree": "4.16.1",
+            "eslint-scope": "^5.0.0",
+            "eslint-utils": "^2.0.0"
+          }
+        },
+        "@typescript-eslint/scope-manager": {
+          "version": "4.16.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.16.1.tgz",
+          "integrity": "sha512-6IlZv9JaurqV0jkEg923cV49aAn8V6+1H1DRfhRcvZUrptQ+UtSKHb5kwTayzOYTJJ/RsYZdcvhOEKiBLyc0Cw==",
+          "dev": true,
+          "requires": {
+            "@typescript-eslint/types": "4.16.1",
+            "@typescript-eslint/visitor-keys": "4.16.1"
+          }
+        },
+        "@typescript-eslint/types": {
+          "version": "4.16.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.16.1.tgz",
+          "integrity": "sha512-nnKqBwMgRlhzmJQF8tnFDZWfunXmJyuXj55xc8Kbfup4PbkzdoDXZvzN8//EiKR27J6vUSU8j4t37yUuYPiLqA==",
+          "dev": true
+        },
+        "@typescript-eslint/typescript-estree": {
+          "version": "4.16.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.16.1.tgz",
+          "integrity": "sha512-m8I/DKHa8YbeHt31T+UGd/l8Kwr0XCTCZL3H4HMvvLCT7HU9V7yYdinTOv1gf/zfqNeDcCgaFH2BMsS8x6NvJg==",
+          "dev": true,
+          "requires": {
+            "@typescript-eslint/types": "4.16.1",
+            "@typescript-eslint/visitor-keys": "4.16.1",
+            "debug": "^4.1.1",
+            "globby": "^11.0.1",
+            "is-glob": "^4.0.1",
+            "semver": "^7.3.2",
+            "tsutils": "^3.17.1"
+          }
+        },
+        "@typescript-eslint/visitor-keys": {
+          "version": "4.16.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.16.1.tgz",
+          "integrity": "sha512-s/aIP1XcMkEqCNcPQtl60ogUYjSM8FU2mq1O7y5cFf3Xcob1z1iXWNB6cC43Op+NGRTFgGolri6s8z/efA9i1w==",
+          "dev": true,
+          "requires": {
+            "@typescript-eslint/types": "4.16.1",
+            "eslint-visitor-keys": "^2.0.0"
+          }
+        },
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "eslint-scope": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+          "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+          "dev": true,
+          "requires": {
+            "esrecurse": "^4.3.0",
+            "estraverse": "^4.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
       }
     },
     "@angular-eslint/eslint-plugin-template": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-4.3.0.tgz",
-      "integrity": "sha512-5DuCvEa3cYx0G2mZtECAwgJ19xJWAFZ8Fu8mIkKDiof1dcUISs1PvECJ6NhdzfxEJp0McPQn1jtOK0IDRX1eJw==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-4.2.0.tgz",
+      "integrity": "sha512-LC8qqqqVmA/OJAsUt6fQCXLmWP5BL30XFvVsPtrORdxMFt0HI1gvkuz5EVak7PeAXEmerdVarNZr5zmCXIWf3g==",
       "dev": true,
       "requires": {
         "@typescript-eslint/experimental-utils": "4.16.1",
         "aria-query": "^4.2.2",
         "axobject-query": "^2.2.0"
+      },
+      "dependencies": {
+        "@typescript-eslint/experimental-utils": {
+          "version": "4.16.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.16.1.tgz",
+          "integrity": "sha512-0Hm3LSlMYFK17jO4iY3un1Ve9x1zLNn4EM50Lia+0EV99NdbK+cn0er7HC7IvBA23mBg3P+8dUkMXy4leL33UQ==",
+          "dev": true,
+          "requires": {
+            "@types/json-schema": "^7.0.3",
+            "@typescript-eslint/scope-manager": "4.16.1",
+            "@typescript-eslint/types": "4.16.1",
+            "@typescript-eslint/typescript-estree": "4.16.1",
+            "eslint-scope": "^5.0.0",
+            "eslint-utils": "^2.0.0"
+          }
+        },
+        "@typescript-eslint/scope-manager": {
+          "version": "4.16.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.16.1.tgz",
+          "integrity": "sha512-6IlZv9JaurqV0jkEg923cV49aAn8V6+1H1DRfhRcvZUrptQ+UtSKHb5kwTayzOYTJJ/RsYZdcvhOEKiBLyc0Cw==",
+          "dev": true,
+          "requires": {
+            "@typescript-eslint/types": "4.16.1",
+            "@typescript-eslint/visitor-keys": "4.16.1"
+          }
+        },
+        "@typescript-eslint/types": {
+          "version": "4.16.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.16.1.tgz",
+          "integrity": "sha512-nnKqBwMgRlhzmJQF8tnFDZWfunXmJyuXj55xc8Kbfup4PbkzdoDXZvzN8//EiKR27J6vUSU8j4t37yUuYPiLqA==",
+          "dev": true
+        },
+        "@typescript-eslint/typescript-estree": {
+          "version": "4.16.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.16.1.tgz",
+          "integrity": "sha512-m8I/DKHa8YbeHt31T+UGd/l8Kwr0XCTCZL3H4HMvvLCT7HU9V7yYdinTOv1gf/zfqNeDcCgaFH2BMsS8x6NvJg==",
+          "dev": true,
+          "requires": {
+            "@typescript-eslint/types": "4.16.1",
+            "@typescript-eslint/visitor-keys": "4.16.1",
+            "debug": "^4.1.1",
+            "globby": "^11.0.1",
+            "is-glob": "^4.0.1",
+            "semver": "^7.3.2",
+            "tsutils": "^3.17.1"
+          }
+        },
+        "@typescript-eslint/visitor-keys": {
+          "version": "4.16.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.16.1.tgz",
+          "integrity": "sha512-s/aIP1XcMkEqCNcPQtl60ogUYjSM8FU2mq1O7y5cFf3Xcob1z1iXWNB6cC43Op+NGRTFgGolri6s8z/efA9i1w==",
+          "dev": true,
+          "requires": {
+            "@typescript-eslint/types": "4.16.1",
+            "eslint-visitor-keys": "^2.0.0"
+          }
+        },
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "eslint-scope": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+          "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+          "dev": true,
+          "requires": {
+            "esrecurse": "^4.3.0",
+            "estraverse": "^4.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
       }
     },
     "@angular-eslint/schematics": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-4.3.0.tgz",
-      "integrity": "sha512-zHEpvWoT0mdylQw/K7+RccBK2rJq0to6ZbIp9i65+RZZTHbscaJaDISFvBHm5RNwEhoWI7sJ14ci66pnpAxx3g==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-4.2.0.tgz",
+      "integrity": "sha512-aohGcfYUqN2hFLWaZoOqkLDyYVDFoLC3LwgIknoaDqWkvFG/RUTg1X1pCFjddLQYP5ist8+OppHH+gnYMbftEw==",
       "dev": true,
       "requires": {
-        "@angular-eslint/eslint-plugin": "4.3.0",
-        "@angular-eslint/eslint-plugin-template": "4.3.0",
+        "@angular-eslint/eslint-plugin": "4.2.0",
+        "@angular-eslint/eslint-plugin-template": "4.2.0",
         "ignore": "5.1.8",
         "strip-json-comments": "3.1.1",
         "tmp": "0.2.1"
+      },
+      "dependencies": {
+        "strip-json-comments": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+          "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+          "dev": true
+        }
       }
     },
     "@angular-eslint/template-parser": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-4.3.0.tgz",
-      "integrity": "sha512-TH+UCrDmOWNLgNgTTR46+wpvgJ3q9Vf9kzqUA5vUNbg/Hhrdbi++DPeCiKagSAXkNBQavqcmyYuT9fzUReIDIg==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-4.2.0.tgz",
+      "integrity": "sha512-77lJ9MDNWmW4ik9l3g149iO9SGRx3qLGZvfSTwmbPxpCgNripWerla9Ia1X+gLkitI8CLpcpiZybxH3EWxj/qQ==",
       "dev": true,
       "requires": {
         "eslint-scope": "^5.1.0"
+      },
+      "dependencies": {
+        "eslint-scope": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+          "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+          "dev": true,
+          "requires": {
+            "esrecurse": "^4.3.0",
+            "estraverse": "^4.1.1"
+          }
+        }
       }
     },
     "@angular/animations": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-11.2.14.tgz",
-      "integrity": "sha512-Heq/nNrCmb3jbkusu+BQszOecfFI/31Oxxj+CDQkqqYpBcswk6bOJLoEE472o+vmgxaXbgeflU9qbIiCQhpMFA==",
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-10.0.14.tgz",
+      "integrity": "sha512-0BOGQOuaudIG0pq6FAnG55teKM7tEQZdIwdoOf0okhh9n0cFWSWRUjvUxWt25bWswlO+HxELyJioiRUvVSES4g==",
       "requires": {
         "tslib": "^2.0.0"
       }
     },
     "@angular/cli": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-11.2.14.tgz",
-      "integrity": "sha512-8Ud7vcUK7CKjzT2Ks1glLhleAPIC5ChcrA15XtOb7k+/uMHBkMscP/UKymbVQiBjCJlglbzJoyj8cpVYTZY5KA==",
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-10.0.8.tgz",
+      "integrity": "sha512-unTteffLepsFw7qQulHOLLyLqCpQMOaZo0WO4x6cQGcW2mc0WgwnwBW2JDYMx1U2434t/Q13LqYMPNYWyCGsog==",
       "dev": true,
       "requires": {
-        "@angular-devkit/architect": "0.1102.14",
-        "@angular-devkit/core": "11.2.14",
-        "@angular-devkit/schematics": "11.2.14",
-        "@schematics/angular": "11.2.14",
-        "@schematics/update": "0.1102.14",
+        "@angular-devkit/architect": "0.1000.8",
+        "@angular-devkit/core": "10.0.8",
+        "@angular-devkit/schematics": "10.0.8",
+        "@schematics/angular": "10.0.8",
+        "@schematics/update": "0.1000.8",
         "@yarnpkg/lockfile": "1.1.0",
         "ansi-colors": "4.1.1",
-        "debug": "4.3.1",
-        "ini": "2.0.0",
-        "inquirer": "7.3.3",
-        "jsonc-parser": "3.0.0",
-        "npm-package-arg": "8.1.0",
+        "debug": "4.1.1",
+        "ini": "1.3.5",
+        "inquirer": "7.1.0",
+        "npm-package-arg": "8.0.1",
         "npm-pick-manifest": "6.1.0",
-        "open": "7.4.0",
-        "ora": "5.3.0",
-        "pacote": "11.2.4",
-        "resolve": "1.19.0",
+        "open": "7.0.4",
+        "pacote": "9.5.12",
+        "read-package-tree": "5.3.1",
         "rimraf": "3.0.2",
-        "semver": "7.3.4",
-        "symbol-observable": "3.0.0",
-        "universal-analytics": "0.4.23",
-        "uuid": "8.3.2"
+        "semver": "7.3.2",
+        "symbol-observable": "1.2.0",
+        "universal-analytics": "0.4.20",
+        "uuid": "8.1.0"
       },
       "dependencies": {
         "@angular-devkit/architect": {
-          "version": "0.1102.14",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.14.tgz",
-          "integrity": "sha512-965TVXuBtRb8RySgxRxUEO+YTd7mT0xiqVHSe+MHvMtUCmEE9vwRofFZl6axkK5ri4fiomiMnOVE19aw4spgNQ==",
+          "version": "0.1000.8",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1000.8.tgz",
+          "integrity": "sha512-2AqPbiEugtPxNz4MGhLh+imUVelhW9h1cdJs2AbxZosIxftPb5DNDQUSAwVmRGp4CtcXVrlvcDwc0f4Fw1aiIA==",
           "dev": true,
           "requires": {
-            "@angular-devkit/core": "11.2.14",
-            "rxjs": "6.6.3"
+            "@angular-devkit/core": "10.0.8",
+            "rxjs": "6.5.5"
           }
         },
         "@angular-devkit/core": {
-          "version": "11.2.14",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
-          "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
+          "version": "10.0.8",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
+          "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
           "dev": true,
           "requires": {
-            "ajv": "6.12.6",
+            "ajv": "6.12.3",
             "fast-json-stable-stringify": "2.1.0",
             "magic-string": "0.25.7",
-            "rxjs": "6.6.3",
+            "rxjs": "6.5.5",
             "source-map": "0.7.3"
           }
         },
-        "@angular-devkit/schematics": {
-          "version": "11.2.14",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.14.tgz",
-          "integrity": "sha512-Ol6+0qdGKzuVJm5gCtQr47X0OCihTfAxI4h047cHYhPFIGGPSvkG/QeJMZugflgoobi2k/xcYokOu/VAkRtWbQ==",
-          "dev": true,
-          "requires": {
-            "@angular-devkit/core": "11.2.14",
-            "ora": "5.3.0",
-            "rxjs": "6.6.3"
-          }
-        },
         "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "version": "6.12.3",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+          "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
@@ -31864,59 +31566,169 @@
             "uri-js": "^4.2.2"
           }
         },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+        "ansi-colors": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+          "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
           "dev": true
         },
-        "jsonc-parser": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
-          "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==",
-          "dev": true
-        },
-        "rxjs": {
-          "version": "6.6.3",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
-          "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
+        "ansi-escapes": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
+          "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
           "dev": true,
           "requires": {
-            "tslib": "^1.9.0"
+            "type-fest": "^0.11.0"
           }
         },
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "dev": true
+        },
+        "cli-cursor": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+          "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+          "dev": true,
+          "requires": {
+            "restore-cursor": "^3.1.0"
+          }
+        },
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+          "dev": true
+        },
+        "figures": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+          "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+          "dev": true,
+          "requires": {
+            "escape-string-regexp": "^1.0.5"
+          }
+        },
+        "inquirer": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz",
+          "integrity": "sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==",
+          "dev": true,
+          "requires": {
+            "ansi-escapes": "^4.2.1",
+            "chalk": "^3.0.0",
+            "cli-cursor": "^3.1.0",
+            "cli-width": "^2.0.0",
+            "external-editor": "^3.0.3",
+            "figures": "^3.0.0",
+            "lodash": "^4.17.15",
+            "mute-stream": "0.0.8",
+            "run-async": "^2.4.0",
+            "rxjs": "^6.5.3",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0",
+            "through": "^2.3.6"
+          }
+        },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+          "dev": true
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        },
+        "open": {
+          "version": "7.0.4",
+          "resolved": "https://registry.npmjs.org/open/-/open-7.0.4.tgz",
+          "integrity": "sha512-brSA+/yq+b08Hsr4c8fsEW2CRzk1BmfN3SAK/5VCHQ9bdoZJ4qa/+AfR0xHjlbbZUyPkUHs1b8x1RqdyZdkVqQ==",
+          "dev": true,
+          "requires": {
+            "is-docker": "^2.0.0",
+            "is-wsl": "^2.1.1"
+          }
+        },
+        "restore-cursor": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+          "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+          "dev": true,
+          "requires": {
+            "onetime": "^5.1.0",
+            "signal-exit": "^3.0.2"
+          }
+        },
+        "string-width": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.0"
+          }
+        },
+        "type-fest": {
+          "version": "0.11.0",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
+          "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
+          "dev": true
+        },
+        "uuid": {
+          "version": "8.1.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.1.0.tgz",
+          "integrity": "sha512-CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg==",
           "dev": true
         }
       }
     },
     "@angular/common": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-11.2.14.tgz",
-      "integrity": "sha512-ZSLV/3j7eCTyLf/8g4yBFLWySjiLz3vLJAGWscYoUpnJWMnug1VRu6zoF/COxCbtORgE+Wz6K0uhfS6MziBGVw==",
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-10.0.14.tgz",
+      "integrity": "sha512-EOAuaMt2HwJF3DtIJ/ksHtnF8Pqh5K2rWISYLEs9R3WNaSGn74kbCODAT4pNhI8P22Ykl3H4FmQUgnDZ3uDAUg==",
       "requires": {
         "tslib": "^2.0.0"
       }
     },
     "@angular/compiler": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-11.2.14.tgz",
-      "integrity": "sha512-XBOK3HgA+/y6Cz7kOX4zcJYmgJ264XnfcbXUMU2cD7Ac+mbNhLPKohWrEiSWalfcjnpf5gRfufQrQP7lpAGu0A==",
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-10.0.14.tgz",
+      "integrity": "sha512-lYNo6/MmnYAVFoDQDBB6HMFd9zHg3RHXc6hn+wchU0XSWiIsg6WYHbKOb/DyqUEyKebzy0gSKZf7gUeZHtj62Q==",
       "requires": {
         "tslib": "^2.0.0"
       }
     },
     "@angular/compiler-cli": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-11.2.14.tgz",
-      "integrity": "sha512-A7ltnCp03/EVqK/Q3tVUDsokgz5GHW3dSPGl0Csk7Ys5uBB9ibHTmVt4eiXA4jt0+6Bk+mKxwe5BEDqLvwYFAg==",
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-10.0.14.tgz",
+      "integrity": "sha512-WK+S90sjc+3iMo8/CuuAX0RdGFwyA9esqqC5fYG/MDZjKuPuhogiimmR0rY3P1Th7B9di8x012xiILbf4GsGUQ==",
       "dev": true,
       "requires": {
-        "@babel/core": "^7.8.6",
-        "@babel/types": "^7.8.6",
         "canonical-path": "1.0.0",
         "chokidar": "^3.0.0",
         "convert-source-map": "^1.5.1",
@@ -31929,9 +31741,42 @@
         "source-map": "^0.6.1",
         "sourcemap-codec": "^1.4.8",
         "tslib": "^2.0.0",
-        "yargs": "^16.2.0"
+        "yargs": "15.3.0"
       },
       "dependencies": {
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "dev": true
+        },
+        "cliui": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+          "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+          "dev": true,
+          "requires": {
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.0",
+            "wrap-ansi": "^6.2.0"
+          }
+        },
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+          "dev": true
+        },
+        "find-up": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
         "fs-extra": {
           "version": "4.0.2",
           "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.2.tgz",
@@ -31943,6 +31788,12 @@
             "universalify": "^0.1.0"
           }
         },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+          "dev": true
+        },
         "jsonfile": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
@@ -31952,6 +31803,39 @@
             "graceful-fs": "^4.1.6"
           }
         },
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        },
         "semver": {
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -31964,98 +31848,187 @@
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         },
+        "string-width": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.0"
+          }
+        },
         "universalify": {
           "version": "0.1.2",
           "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
           "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
           "dev": true
+        },
+        "wrap-ansi": {
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+          "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "yargs": {
+          "version": "15.3.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.0.tgz",
+          "integrity": "sha512-g/QCnmjgOl1YJjGsnUg2SatC7NUYEiLXJqxNOQU9qSpjzGtGXda9b+OKccr1kLTy8BN9yqEyqfq5lxlwdc13TA==",
+          "dev": true,
+          "requires": {
+            "cliui": "^6.0.0",
+            "decamelize": "^1.2.0",
+            "find-up": "^4.1.0",
+            "get-caller-file": "^2.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^4.2.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^18.1.0"
+          }
+        },
+        "yargs-parser": {
+          "version": "18.1.3",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+          "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          }
         }
       }
     },
     "@angular/core": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-11.2.14.tgz",
-      "integrity": "sha512-vpR4XqBGitk1Faph37CSpemwIYTmJ3pdIVNoHKP6jLonpWu+0azkchf0f7oD8/2ivj2F81opcIw0tcsy/D/5Vg==",
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-10.0.14.tgz",
+      "integrity": "sha512-m+c9g6fA/gE+6K7It01b6r8TEmbuFjUZajQ9gG/pzist0mTBcqfvn0O4h5X+ebnSgw/bbnnp+4PbaXEi1pOWZQ==",
       "requires": {
         "tslib": "^2.0.0"
       }
     },
     "@angular/forms": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-11.2.14.tgz",
-      "integrity": "sha512-4LWqY6KEIk1AZQFnk+4PJSOCamlD4tumuVN06gO4D0dZo9Cx+GcvW6pM6N0CPubRvPs3sScCnu20WT11HNWC1w==",
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-10.0.14.tgz",
+      "integrity": "sha512-McKh3rXDlAE7qmCnyWKENb2HhqAT+1dsAfChuqs0w8jhKkoRgA00RDFee6dZ6XQCc907DwuV0K8+wC3CvBp35w==",
       "requires": {
         "tslib": "^2.0.0"
       }
     },
     "@angular/language-service": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-11.2.14.tgz",
-      "integrity": "sha512-3+0F0X4r1WeNOV6VmaMzYnJENPVmLX2/MX3/lugwZPNYKVXl/oGyh/4PB8ktntIj0tnxQuErzqRSeucNStNGRw==",
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-10.0.14.tgz",
+      "integrity": "sha512-QQLYUjD0T6u2hLNYXUEUbupAGsz5egmhCAckaQojvXCe3SLL/hQsrK4odrNuspy7TvMB0H5ZNEHGlF6m/WLZ3g==",
       "dev": true
     },
     "@angular/platform-browser": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-11.2.14.tgz",
-      "integrity": "sha512-fb7b7ss/gRoP8wLAN17W62leMgjynuyjEPU2eUoAAazsG9f2cgM+z3rK29GYncDVyYQxZUZYnjSqvL6GSXx86A==",
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-10.0.14.tgz",
+      "integrity": "sha512-DcBZ1wt2TwtXrdcmCTWanAzu2Vxk5Uvioam0UcDxcgXD84T2fHipyfZVn07fMqRvzFQj45tDNAEevFBnGZar4w==",
       "requires": {
         "tslib": "^2.0.0"
       }
     },
     "@angular/platform-browser-dynamic": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-11.2.14.tgz",
-      "integrity": "sha512-TWTPdFs6iBBcp+/YMsgCRQwdHpWGq8KjeJDJ2tfatGgBD3Gqt2YaHOMST1zPW6RkrmupytTejuVqXzeaKWFxuw==",
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-10.0.14.tgz",
+      "integrity": "sha512-PPCAiNh/JSuQNKXOhj3a8CTFdVhTgF/EpGtaotnVr/BfbJMeFImKo7m2QQOTsAFaEP2DurSHnofPnMWAfHS2mg==",
       "requires": {
         "tslib": "^2.0.0"
       }
     },
     "@angular/router": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-11.2.14.tgz",
-      "integrity": "sha512-3aYBmj+zrEL9yf/ntIQxHIYaWShZOBKP3U07X2mX+TPMpGlvHDnR7L6bWhQVZwewzMMz7YVR16ldg50IFuAlfA==",
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-10.0.14.tgz",
+      "integrity": "sha512-VWzaNyPZDY99TMszV1GlXJgVOxXsjhJrsv3mIcjaz1dfdlKOeKTVDLdnyXfP9CkwE3PRmvG7eSXppIj6nn9BpQ==",
       "requires": {
         "tslib": "^2.0.0"
       }
     },
     "@babel/code-frame": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz",
-      "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+      "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
       "dev": true,
       "requires": {
-        "@babel/highlight": "^7.14.5"
+        "@babel/highlight": "^7.10.4"
       }
     },
     "@babel/compat-data": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.9.tgz",
-      "integrity": "sha512-p3QjZmMGHDGdpcwEYYWu7i7oJShJvtgMjJeb0W95PPhSm++3lm8YXYOh45Y6iCN9PkZLTZ7CIX5nFrp7pw7TXw==",
-      "dev": true
-    },
-    "@babel/core": {
-      "version": "7.12.10",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.10.tgz",
-      "integrity": "sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.11.0.tgz",
+      "integrity": "sha512-TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/generator": "^7.12.10",
-        "@babel/helper-module-transforms": "^7.12.1",
-        "@babel/helpers": "^7.12.5",
-        "@babel/parser": "^7.12.10",
-        "@babel/template": "^7.12.7",
-        "@babel/traverse": "^7.12.10",
-        "@babel/types": "^7.12.10",
+        "browserslist": "^4.12.0",
+        "invariant": "^2.2.4",
+        "semver": "^5.5.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        }
+      }
+    },
+    "@babel/core": {
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz",
+      "integrity": "sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.8.3",
+        "@babel/generator": "^7.9.6",
+        "@babel/helper-module-transforms": "^7.9.0",
+        "@babel/helpers": "^7.9.6",
+        "@babel/parser": "^7.9.6",
+        "@babel/template": "^7.8.6",
+        "@babel/traverse": "^7.9.6",
+        "@babel/types": "^7.9.6",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.1",
         "json5": "^2.1.2",
-        "lodash": "^4.17.19",
+        "lodash": "^4.17.13",
+        "resolve": "^1.3.2",
         "semver": "^5.4.1",
         "source-map": "^0.5.0"
       },
       "dependencies": {
+        "debug": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        },
         "semver": {
           "version": "5.7.1",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
@@ -32071,13 +32044,14 @@
       }
     },
     "@babel/generator": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz",
-      "integrity": "sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==",
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz",
+      "integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.12.11",
+        "@babel/types": "^7.9.6",
         "jsesc": "^2.5.1",
+        "lodash": "^4.17.13",
         "source-map": "^0.5.0"
       },
       "dependencies": {
@@ -32090,442 +32064,481 @@
       }
     },
     "@babel/helper-annotate-as-pure": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.14.5.tgz",
-      "integrity": "sha512-EivH9EgBIb+G8ij1B2jAwSH36WnGvkQSEC6CkX/6v6ZFlw5fVOHvsgGF4uiEHO2GzMvunZb6tDLQEQSdrdocrA==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz",
+      "integrity": "sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.14.5"
+        "@babel/types": "^7.10.4"
       }
     },
     "@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.14.5.tgz",
-      "integrity": "sha512-YTA/Twn0vBXDVGJuAX6PwW7x5zQei1luDDo2Pl6q1qZ7hVNl0RZrhHCQG/ArGpR29Vl7ETiB8eJyrvpuRp300w==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz",
+      "integrity": "sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==",
       "dev": true,
       "requires": {
-        "@babel/helper-explode-assignable-expression": "^7.14.5",
-        "@babel/types": "^7.14.5"
+        "@babel/helper-explode-assignable-expression": "^7.10.4",
+        "@babel/types": "^7.10.4"
       }
     },
     "@babel/helper-compilation-targets": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz",
-      "integrity": "sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz",
+      "integrity": "sha512-a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.14.5",
-        "@babel/helper-validator-option": "^7.14.5",
-        "browserslist": "^4.16.6",
-        "semver": "^6.3.0"
+        "@babel/compat-data": "^7.10.4",
+        "browserslist": "^4.12.0",
+        "invariant": "^2.2.4",
+        "levenary": "^1.1.1",
+        "semver": "^5.5.0"
       },
       "dependencies": {
         "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
           "dev": true
         }
       }
     },
-    "@babel/helper-create-class-features-plugin": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.8.tgz",
-      "integrity": "sha512-bpYvH8zJBWzeqi1o+co8qOrw+EXzQ/0c74gVmY205AWXy9nifHrOg77y+1zwxX5lXE7Icq4sPlSQ4O2kWBrteQ==",
+    "@babel/helper-create-regexp-features-plugin": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz",
+      "integrity": "sha512-2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-member-expression-to-functions": "^7.14.7",
-        "@babel/helper-optimise-call-expression": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.14.5",
-        "@babel/helper-split-export-declaration": "^7.14.5"
+        "@babel/helper-annotate-as-pure": "^7.10.4",
+        "@babel/helper-regex": "^7.10.4",
+        "regexpu-core": "^4.7.0"
       }
     },
-    "@babel/helper-create-regexp-features-plugin": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz",
-      "integrity": "sha512-TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A==",
+    "@babel/helper-define-map": {
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz",
+      "integrity": "sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "regexpu-core": "^4.7.1"
+        "@babel/helper-function-name": "^7.10.4",
+        "@babel/types": "^7.10.5",
+        "lodash": "^4.17.19"
       }
     },
     "@babel/helper-explode-assignable-expression": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.14.5.tgz",
-      "integrity": "sha512-Htb24gnGJdIGT4vnRKMdoXiOIlqOLmdiUYpAQ0mYfgVT/GDm8GOYhgi4GL+hMKrkiPRohO4ts34ELFsGAPQLDQ==",
+      "version": "7.11.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz",
+      "integrity": "sha512-ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.14.5"
+        "@babel/types": "^7.10.4"
       }
     },
     "@babel/helper-function-name": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz",
-      "integrity": "sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
+      "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-get-function-arity": "^7.14.5",
-        "@babel/template": "^7.14.5",
-        "@babel/types": "^7.14.5"
+        "@babel/helper-get-function-arity": "^7.10.4",
+        "@babel/template": "^7.10.4",
+        "@babel/types": "^7.10.4"
       },
       "dependencies": {
         "@babel/template": {
-          "version": "7.14.5",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz",
-          "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==",
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
           "dev": true,
           "requires": {
-            "@babel/code-frame": "^7.14.5",
-            "@babel/parser": "^7.14.5",
-            "@babel/types": "^7.14.5"
+            "@babel/code-frame": "^7.10.4",
+            "@babel/parser": "^7.10.4",
+            "@babel/types": "^7.10.4"
           }
         }
       }
     },
     "@babel/helper-get-function-arity": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz",
-      "integrity": "sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
+      "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.14.5"
+        "@babel/types": "^7.10.4"
       }
     },
     "@babel/helper-hoist-variables": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz",
-      "integrity": "sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz",
+      "integrity": "sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.14.5"
+        "@babel/types": "^7.10.4"
       }
     },
     "@babel/helper-member-expression-to-functions": {
-      "version": "7.14.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz",
-      "integrity": "sha512-TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
+      "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.14.5"
+        "@babel/types": "^7.11.0"
       }
     },
     "@babel/helper-module-imports": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz",
-      "integrity": "sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz",
+      "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.14.5"
+        "@babel/types": "^7.10.4"
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.8.tgz",
-      "integrity": "sha512-RyE+NFOjXn5A9YU1dkpeBaduagTlZ0+fccnIcAGbv1KGUlReBj7utF7oEth8IdIBQPcux0DDgW5MFBH2xu9KcA==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz",
+      "integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.14.5",
-        "@babel/helper-simple-access": "^7.14.8",
-        "@babel/helper-split-export-declaration": "^7.14.5",
-        "@babel/helper-validator-identifier": "^7.14.8",
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.14.8",
-        "@babel/types": "^7.14.8"
+        "@babel/helper-module-imports": "^7.10.4",
+        "@babel/helper-replace-supers": "^7.10.4",
+        "@babel/helper-simple-access": "^7.10.4",
+        "@babel/helper-split-export-declaration": "^7.11.0",
+        "@babel/template": "^7.10.4",
+        "@babel/types": "^7.11.0",
+        "lodash": "^4.17.19"
       },
       "dependencies": {
         "@babel/template": {
-          "version": "7.14.5",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz",
-          "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==",
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
           "dev": true,
           "requires": {
-            "@babel/code-frame": "^7.14.5",
-            "@babel/parser": "^7.14.5",
-            "@babel/types": "^7.14.5"
+            "@babel/code-frame": "^7.10.4",
+            "@babel/parser": "^7.10.4",
+            "@babel/types": "^7.10.4"
           }
         }
       }
     },
     "@babel/helper-optimise-call-expression": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz",
-      "integrity": "sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz",
+      "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.14.5"
+        "@babel/types": "^7.10.4"
       }
     },
     "@babel/helper-plugin-utils": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz",
-      "integrity": "sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
+      "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
       "dev": true
     },
+    "@babel/helper-regex": {
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.5.tgz",
+      "integrity": "sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.19"
+      }
+    },
     "@babel/helper-remap-async-to-generator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.14.5.tgz",
-      "integrity": "sha512-rLQKdQU+HYlxBwQIj8dk4/0ENOUEhA/Z0l4hN8BexpvmSMN9oA9EagjnhnDpNsRdWCfjwa4mn/HyBXO9yhQP6A==",
+      "version": "7.11.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz",
+      "integrity": "sha512-tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-wrap-function": "^7.14.5",
-        "@babel/types": "^7.14.5"
-      }
-    },
-    "@babel/helper-replace-supers": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz",
-      "integrity": "sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-member-expression-to-functions": "^7.14.5",
-        "@babel/helper-optimise-call-expression": "^7.14.5",
-        "@babel/traverse": "^7.14.5",
-        "@babel/types": "^7.14.5"
-      }
-    },
-    "@babel/helper-simple-access": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz",
-      "integrity": "sha512-TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.14.8"
-      }
-    },
-    "@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.14.5.tgz",
-      "integrity": "sha512-dmqZB7mrb94PZSAOYtr+ZN5qt5owZIAgqtoTuqiFbHFtxgEcmQlRJVI+bO++fciBunXtB6MK7HrzrfcAzIz2NQ==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.14.5"
-      }
-    },
-    "@babel/helper-split-export-declaration": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz",
-      "integrity": "sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.14.5"
-      }
-    },
-    "@babel/helper-validator-identifier": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz",
-      "integrity": "sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g==",
-      "dev": true
-    },
-    "@babel/helper-validator-option": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz",
-      "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==",
-      "dev": true
-    },
-    "@babel/helper-wrap-function": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.14.5.tgz",
-      "integrity": "sha512-YEdjTCq+LNuNS1WfxsDCNpgXkJaIyqco6DAelTUjT4f2KIWC1nBcaCaSdHTBqQVLnTBexBcVcFhLSU1KnYuePQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.14.5",
-        "@babel/types": "^7.14.5"
+        "@babel/helper-annotate-as-pure": "^7.10.4",
+        "@babel/helper-wrap-function": "^7.10.4",
+        "@babel/template": "^7.10.4",
+        "@babel/types": "^7.10.4"
       },
       "dependencies": {
         "@babel/template": {
-          "version": "7.14.5",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz",
-          "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==",
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
           "dev": true,
           "requires": {
-            "@babel/code-frame": "^7.14.5",
-            "@babel/parser": "^7.14.5",
-            "@babel/types": "^7.14.5"
+            "@babel/code-frame": "^7.10.4",
+            "@babel/parser": "^7.10.4",
+            "@babel/types": "^7.10.4"
+          }
+        }
+      }
+    },
+    "@babel/helper-replace-supers": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
+      "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-member-expression-to-functions": "^7.10.4",
+        "@babel/helper-optimise-call-expression": "^7.10.4",
+        "@babel/traverse": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "@babel/helper-simple-access": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz",
+      "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==",
+      "dev": true,
+      "requires": {
+        "@babel/template": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      },
+      "dependencies": {
+        "@babel/template": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.10.4",
+            "@babel/parser": "^7.10.4",
+            "@babel/types": "^7.10.4"
+          }
+        }
+      }
+    },
+    "@babel/helper-skip-transparent-expression-wrappers": {
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz",
+      "integrity": "sha512-0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.11.0"
+      }
+    },
+    "@babel/helper-split-export-declaration": {
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
+      "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.11.0"
+      }
+    },
+    "@babel/helper-validator-identifier": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+      "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+      "dev": true
+    },
+    "@babel/helper-wrap-function": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz",
+      "integrity": "sha512-6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-function-name": "^7.10.4",
+        "@babel/template": "^7.10.4",
+        "@babel/traverse": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      },
+      "dependencies": {
+        "@babel/template": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.10.4",
+            "@babel/parser": "^7.10.4",
+            "@babel/types": "^7.10.4"
           }
         }
       }
     },
     "@babel/helpers": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.8.tgz",
-      "integrity": "sha512-ZRDmI56pnV+p1dH6d+UN6GINGz7Krps3+270qqI9UJ4wxYThfAIcI5i7j5vXC4FJ3Wap+S9qcebxeYiqn87DZw==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.4.tgz",
+      "integrity": "sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==",
       "dev": true,
       "requires": {
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.14.8",
-        "@babel/types": "^7.14.8"
+        "@babel/template": "^7.10.4",
+        "@babel/traverse": "^7.10.4",
+        "@babel/types": "^7.10.4"
       },
       "dependencies": {
         "@babel/template": {
-          "version": "7.14.5",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz",
-          "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==",
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
           "dev": true,
           "requires": {
-            "@babel/code-frame": "^7.14.5",
-            "@babel/parser": "^7.14.5",
-            "@babel/types": "^7.14.5"
+            "@babel/code-frame": "^7.10.4",
+            "@babel/parser": "^7.10.4",
+            "@babel/types": "^7.10.4"
           }
         }
       }
     },
     "@babel/highlight": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
-      "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+      "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
       "dev": true,
       "requires": {
-        "@babel/helper-validator-identifier": "^7.14.5",
+        "@babel/helper-validator-identifier": "^7.10.4",
         "chalk": "^2.0.0",
         "js-tokens": "^4.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
       }
     },
     "@babel/parser": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.9.tgz",
-      "integrity": "sha512-RdUTOseXJ8POjjOeEBEvNMIZU/nm4yu2rufRkcibzkkg7DmQvXU8v3M4Xk9G7uuI86CDGkKcuDWgioqZm+mScQ==",
+      "version": "7.11.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
+      "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
       "dev": true
     },
     "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.9.tgz",
-      "integrity": "sha512-d1lnh+ZnKrFKwtTYdw320+sQWCTwgkB9fmUhNXRADA4akR6wLjaruSGnIEUjpt9HCOwTr4ynFTKu19b7rFRpmw==",
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz",
+      "integrity": "sha512-cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-remap-async-to-generator": "^7.14.5",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
-      }
-    },
-    "@babel/plugin-proposal-class-properties": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz",
-      "integrity": "sha512-q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-remap-async-to-generator": "^7.10.4",
+        "@babel/plugin-syntax-async-generators": "^7.8.0"
       }
     },
     "@babel/plugin-proposal-dynamic-import": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz",
-      "integrity": "sha512-ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz",
+      "integrity": "sha512-up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz",
-      "integrity": "sha512-g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.0"
       }
     },
     "@babel/plugin-proposal-json-strings": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz",
-      "integrity": "sha512-NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz",
+      "integrity": "sha512-fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz",
-      "integrity": "sha512-YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-syntax-json-strings": "^7.8.0"
       }
     },
     "@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz",
-      "integrity": "sha512-gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz",
+      "integrity": "sha512-wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0"
       }
     },
     "@babel/plugin-proposal-numeric-separator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz",
-      "integrity": "sha512-yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.10.4",
         "@babel/plugin-syntax-numeric-separator": "^7.10.4"
       }
     },
     "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.14.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.7.tgz",
-      "integrity": "sha512-082hsZz+sVabfmDWo1Oct1u1AgbKbUAyVgmX4otIc7bdsRgHBXwTwb3DpDmD4Eyyx6DNiuz5UAATT655k+kL5g==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz",
+      "integrity": "sha512-wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.14.7",
-        "@babel/helper-compilation-targets": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
+        "@babel/plugin-transform-parameters": "^7.10.4"
       }
     },
     "@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz",
-      "integrity": "sha512-3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz",
+      "integrity": "sha512-LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.0"
       }
     },
     "@babel/plugin-proposal-optional-chaining": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz",
-      "integrity": "sha512-ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz",
+      "integrity": "sha512-v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-private-methods": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz",
-      "integrity": "sha512-838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.0"
       }
     },
     "@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz",
-      "integrity": "sha512-6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz",
+      "integrity": "sha512-H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-syntax-async-generators": {
@@ -32547,12 +32560,12 @@
       }
     },
     "@babel/plugin-syntax-class-properties": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz",
+      "integrity": "sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-syntax-dynamic-import": {
@@ -32564,15 +32577,6 @@
         "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
-    "@babel/plugin-syntax-export-namespace-from": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
-      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      }
-    },
     "@babel/plugin-syntax-import-meta": {
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
@@ -32646,269 +32650,271 @@
       }
     },
     "@babel/plugin-syntax-top-level-await": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
-      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz",
+      "integrity": "sha512-ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-arrow-functions": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz",
-      "integrity": "sha512-KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz",
+      "integrity": "sha512-9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-async-to-generator": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz",
-      "integrity": "sha512-SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz",
+      "integrity": "sha512-F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.12.1",
+        "@babel/helper-module-imports": "^7.10.4",
         "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-remap-async-to-generator": "^7.12.1"
+        "@babel/helper-remap-async-to-generator": "^7.10.4"
       }
     },
     "@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz",
-      "integrity": "sha512-dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz",
+      "integrity": "sha512-WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-block-scoping": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.5.tgz",
-      "integrity": "sha512-LBYm4ZocNgoCqyxMLoOnwpsmQ18HWTQvql64t3GvMUzLQrNoV1BDG0lNftC8QKYERkZgCCT/7J5xWGObGAyHDw==",
+      "version": "7.11.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz",
+      "integrity": "sha512-00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-classes": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.9.tgz",
-      "integrity": "sha512-NfZpTcxU3foGWbl4wxmZ35mTsYJy8oQocbeIMoDAGGFarAmSQlL+LWMkDx/tj6pNotpbX3rltIA4dprgAPOq5A==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz",
+      "integrity": "sha512-2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-optimise-call-expression": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.14.5",
-        "@babel/helper-split-export-declaration": "^7.14.5",
+        "@babel/helper-annotate-as-pure": "^7.10.4",
+        "@babel/helper-define-map": "^7.10.4",
+        "@babel/helper-function-name": "^7.10.4",
+        "@babel/helper-optimise-call-expression": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-replace-supers": "^7.10.4",
+        "@babel/helper-split-export-declaration": "^7.10.4",
         "globals": "^11.1.0"
       }
     },
     "@babel/plugin-transform-computed-properties": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz",
-      "integrity": "sha512-pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz",
+      "integrity": "sha512-JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-destructuring": {
-      "version": "7.14.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz",
-      "integrity": "sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz",
+      "integrity": "sha512-+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-dotall-regex": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz",
-      "integrity": "sha512-loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz",
+      "integrity": "sha512-ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-duplicate-keys": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz",
-      "integrity": "sha512-iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz",
+      "integrity": "sha512-GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz",
-      "integrity": "sha512-jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz",
+      "integrity": "sha512-S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw==",
       "dev": true,
       "requires": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-for-of": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.14.5.tgz",
-      "integrity": "sha512-CfmqxSUZzBl0rSjpoQSFoR9UEj3HzbGuGNL21/iFTmjb5gFggJp3ph0xR1YBhexmLoKRHzgxuFvty2xdSt6gTA==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz",
+      "integrity": "sha512-ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-function-name": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz",
-      "integrity": "sha512-vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz",
+      "integrity": "sha512-OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-function-name": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-literals": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz",
-      "integrity": "sha512-ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz",
+      "integrity": "sha512-Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-member-expression-literals": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz",
-      "integrity": "sha512-WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz",
+      "integrity": "sha512-0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-modules-amd": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz",
-      "integrity": "sha512-3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g==",
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz",
+      "integrity": "sha512-elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-module-transforms": "^7.10.5",
+        "@babel/helper-plugin-utils": "^7.10.4",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       }
     },
     "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.5.tgz",
-      "integrity": "sha512-en8GfBtgnydoao2PS+87mKyw62k02k7kJ9ltbKe0fXTHrQmG6QZZflYuGI1VVG7sVpx4E1n7KBpNlPb8m78J+A==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz",
+      "integrity": "sha512-Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-simple-access": "^7.14.5",
+        "@babel/helper-module-transforms": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-simple-access": "^7.10.4",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       }
     },
     "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.14.5.tgz",
-      "integrity": "sha512-mNMQdvBEE5DcMQaL5LbzXFMANrQjd2W7FPzg34Y4yEz7dBgdaC+9B84dSO+/1Wba98zoDbInctCDo4JGxz1VYA==",
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz",
+      "integrity": "sha512-f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw==",
       "dev": true,
       "requires": {
-        "@babel/helper-hoist-variables": "^7.14.5",
-        "@babel/helper-module-transforms": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-validator-identifier": "^7.14.5",
+        "@babel/helper-hoist-variables": "^7.10.4",
+        "@babel/helper-module-transforms": "^7.10.5",
+        "@babel/helper-plugin-utils": "^7.10.4",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       }
     },
     "@babel/plugin-transform-modules-umd": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz",
-      "integrity": "sha512-RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz",
+      "integrity": "sha512-mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-module-transforms": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz",
-      "integrity": "sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz",
+      "integrity": "sha512-V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.14.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.10.4"
       }
     },
     "@babel/plugin-transform-new-target": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz",
-      "integrity": "sha512-Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz",
+      "integrity": "sha512-YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-object-super": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz",
-      "integrity": "sha512-MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz",
+      "integrity": "sha512-5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-replace-supers": "^7.10.4"
       }
     },
     "@babel/plugin-transform-parameters": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.5.tgz",
-      "integrity": "sha512-Tl7LWdr6HUxTmzQtzuU14SqbgrSKmaR77M0OKyq4njZLQTPfOvzblNKyNkGwOfEFCEx7KeYHQHDI0P3F02IVkA==",
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz",
+      "integrity": "sha512-xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-get-function-arity": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-property-literals": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz",
-      "integrity": "sha512-r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz",
+      "integrity": "sha512-ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-regenerator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz",
-      "integrity": "sha512-NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz",
+      "integrity": "sha512-3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw==",
       "dev": true,
       "requires": {
         "regenerator-transform": "^0.14.2"
       }
     },
     "@babel/plugin-transform-reserved-words": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz",
-      "integrity": "sha512-cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz",
+      "integrity": "sha512-hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-runtime": {
-      "version": "7.12.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.10.tgz",
-      "integrity": "sha512-xOrUfzPxw7+WDm9igMgQCbO3cJKymX7dFdsgRr1eu9n3KjjyU4pptIXbXPseQDquw+W+RuJEJMHKHNsPNNm3CA==",
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.6.tgz",
+      "integrity": "sha512-qcmiECD0mYOjOIt8YHNsAP1SxPooC/rDmfmiSK9BNY72EitdSc7l44WTEklaWuFtbOEBjNhWWyph/kOImbNJ4w==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.12.5",
-        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-module-imports": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "resolve": "^1.8.1",
         "semver": "^5.5.1"
       },
       "dependencies": {
@@ -32921,141 +32927,128 @@
       }
     },
     "@babel/plugin-transform-shorthand-properties": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz",
-      "integrity": "sha512-xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz",
+      "integrity": "sha512-AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-spread": {
-      "version": "7.14.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.6.tgz",
-      "integrity": "sha512-Zr0x0YroFJku7n7+/HH3A2eIrGMjbmAIbJSVv0IZ+t3U2WUQUA64S/oeied2e+MaGSjmt4alzBCsK9E8gh+fag==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz",
+      "integrity": "sha512-UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0"
       }
     },
     "@babel/plugin-transform-sticky-regex": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz",
-      "integrity": "sha512-Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz",
+      "integrity": "sha512-Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-regex": "^7.10.4"
       }
     },
     "@babel/plugin-transform-template-literals": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz",
-      "integrity": "sha512-22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg==",
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz",
+      "integrity": "sha512-V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-annotate-as-pure": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-typeof-symbol": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz",
-      "integrity": "sha512-lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz",
+      "integrity": "sha512-QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-transform-unicode-escapes": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz",
-      "integrity": "sha512-crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-unicode-regex": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz",
-      "integrity": "sha512-UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz",
+      "integrity": "sha512-wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/preset-env": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.11.tgz",
-      "integrity": "sha512-j8Tb+KKIXKYlDBQyIOy4BLxzv1NUOwlHfZ74rvW+Z0Gp4/cI2IMDPBWAgWceGcE7aep9oL/0K9mlzlMGxA8yNw==",
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.6.tgz",
+      "integrity": "sha512-0gQJ9RTzO0heXOhzftog+a/WyOuqMrAIugVYxMYf83gh1CQaQDjMtsOpqOwXyDL/5JcWsrCm8l4ju8QC97O7EQ==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.12.7",
-        "@babel/helper-compilation-targets": "^7.12.5",
-        "@babel/helper-module-imports": "^7.12.5",
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-validator-option": "^7.12.11",
-        "@babel/plugin-proposal-async-generator-functions": "^7.12.1",
-        "@babel/plugin-proposal-class-properties": "^7.12.1",
-        "@babel/plugin-proposal-dynamic-import": "^7.12.1",
-        "@babel/plugin-proposal-export-namespace-from": "^7.12.1",
-        "@babel/plugin-proposal-json-strings": "^7.12.1",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.12.1",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
-        "@babel/plugin-proposal-numeric-separator": "^7.12.7",
-        "@babel/plugin-proposal-object-rest-spread": "^7.12.1",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.12.1",
-        "@babel/plugin-proposal-optional-chaining": "^7.12.7",
-        "@babel/plugin-proposal-private-methods": "^7.12.1",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.12.1",
+        "@babel/compat-data": "^7.9.6",
+        "@babel/helper-compilation-targets": "^7.9.6",
+        "@babel/helper-module-imports": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/plugin-proposal-async-generator-functions": "^7.8.3",
+        "@babel/plugin-proposal-dynamic-import": "^7.8.3",
+        "@babel/plugin-proposal-json-strings": "^7.8.3",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-proposal-numeric-separator": "^7.8.3",
+        "@babel/plugin-proposal-object-rest-spread": "^7.9.6",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-proposal-optional-chaining": "^7.9.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.8.3",
         "@babel/plugin-syntax-async-generators": "^7.8.0",
-        "@babel/plugin-syntax-class-properties": "^7.12.1",
         "@babel/plugin-syntax-dynamic-import": "^7.8.0",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
         "@babel/plugin-syntax-json-strings": "^7.8.0",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
+        "@babel/plugin-syntax-numeric-separator": "^7.8.0",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
         "@babel/plugin-syntax-optional-catch-binding": "^7.8.0",
         "@babel/plugin-syntax-optional-chaining": "^7.8.0",
-        "@babel/plugin-syntax-top-level-await": "^7.12.1",
-        "@babel/plugin-transform-arrow-functions": "^7.12.1",
-        "@babel/plugin-transform-async-to-generator": "^7.12.1",
-        "@babel/plugin-transform-block-scoped-functions": "^7.12.1",
-        "@babel/plugin-transform-block-scoping": "^7.12.11",
-        "@babel/plugin-transform-classes": "^7.12.1",
-        "@babel/plugin-transform-computed-properties": "^7.12.1",
-        "@babel/plugin-transform-destructuring": "^7.12.1",
-        "@babel/plugin-transform-dotall-regex": "^7.12.1",
-        "@babel/plugin-transform-duplicate-keys": "^7.12.1",
-        "@babel/plugin-transform-exponentiation-operator": "^7.12.1",
-        "@babel/plugin-transform-for-of": "^7.12.1",
-        "@babel/plugin-transform-function-name": "^7.12.1",
-        "@babel/plugin-transform-literals": "^7.12.1",
-        "@babel/plugin-transform-member-expression-literals": "^7.12.1",
-        "@babel/plugin-transform-modules-amd": "^7.12.1",
-        "@babel/plugin-transform-modules-commonjs": "^7.12.1",
-        "@babel/plugin-transform-modules-systemjs": "^7.12.1",
-        "@babel/plugin-transform-modules-umd": "^7.12.1",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.12.1",
-        "@babel/plugin-transform-new-target": "^7.12.1",
-        "@babel/plugin-transform-object-super": "^7.12.1",
-        "@babel/plugin-transform-parameters": "^7.12.1",
-        "@babel/plugin-transform-property-literals": "^7.12.1",
-        "@babel/plugin-transform-regenerator": "^7.12.1",
-        "@babel/plugin-transform-reserved-words": "^7.12.1",
-        "@babel/plugin-transform-shorthand-properties": "^7.12.1",
-        "@babel/plugin-transform-spread": "^7.12.1",
-        "@babel/plugin-transform-sticky-regex": "^7.12.7",
-        "@babel/plugin-transform-template-literals": "^7.12.1",
-        "@babel/plugin-transform-typeof-symbol": "^7.12.10",
-        "@babel/plugin-transform-unicode-escapes": "^7.12.1",
-        "@babel/plugin-transform-unicode-regex": "^7.12.1",
+        "@babel/plugin-syntax-top-level-await": "^7.8.3",
+        "@babel/plugin-transform-arrow-functions": "^7.8.3",
+        "@babel/plugin-transform-async-to-generator": "^7.8.3",
+        "@babel/plugin-transform-block-scoped-functions": "^7.8.3",
+        "@babel/plugin-transform-block-scoping": "^7.8.3",
+        "@babel/plugin-transform-classes": "^7.9.5",
+        "@babel/plugin-transform-computed-properties": "^7.8.3",
+        "@babel/plugin-transform-destructuring": "^7.9.5",
+        "@babel/plugin-transform-dotall-regex": "^7.8.3",
+        "@babel/plugin-transform-duplicate-keys": "^7.8.3",
+        "@babel/plugin-transform-exponentiation-operator": "^7.8.3",
+        "@babel/plugin-transform-for-of": "^7.9.0",
+        "@babel/plugin-transform-function-name": "^7.8.3",
+        "@babel/plugin-transform-literals": "^7.8.3",
+        "@babel/plugin-transform-member-expression-literals": "^7.8.3",
+        "@babel/plugin-transform-modules-amd": "^7.9.6",
+        "@babel/plugin-transform-modules-commonjs": "^7.9.6",
+        "@babel/plugin-transform-modules-systemjs": "^7.9.6",
+        "@babel/plugin-transform-modules-umd": "^7.9.0",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.8.3",
+        "@babel/plugin-transform-new-target": "^7.8.3",
+        "@babel/plugin-transform-object-super": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.9.5",
+        "@babel/plugin-transform-property-literals": "^7.8.3",
+        "@babel/plugin-transform-regenerator": "^7.8.7",
+        "@babel/plugin-transform-reserved-words": "^7.8.3",
+        "@babel/plugin-transform-shorthand-properties": "^7.8.3",
+        "@babel/plugin-transform-spread": "^7.8.3",
+        "@babel/plugin-transform-sticky-regex": "^7.8.3",
+        "@babel/plugin-transform-template-literals": "^7.8.3",
+        "@babel/plugin-transform-typeof-symbol": "^7.8.4",
+        "@babel/plugin-transform-unicode-regex": "^7.8.3",
         "@babel/preset-modules": "^0.1.3",
-        "@babel/types": "^7.12.11",
-        "core-js-compat": "^3.8.0",
+        "@babel/types": "^7.9.6",
+        "browserslist": "^4.11.1",
+        "core-js-compat": "^3.6.2",
+        "invariant": "^2.2.2",
+        "levenary": "^1.1.1",
         "semver": "^5.5.0"
       },
       "dependencies": {
@@ -33081,63 +33074,78 @@
       }
     },
     "@babel/runtime": {
-      "version": "7.12.5",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz",
-      "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==",
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz",
+      "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==",
       "dev": true,
       "requires": {
         "regenerator-runtime": "^0.13.4"
       }
     },
     "@babel/runtime-corejs3": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.9.tgz",
-      "integrity": "sha512-64RiH2ON4/y8qYtoa8rUiyam/tUVyGqRyNYhe+vCRGmjnV4bUlZvY+mwd0RrmLoCpJpdq3RsrNqKb7SJdw/4kw==",
+      "version": "7.13.17",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.13.17.tgz",
+      "integrity": "sha512-RGXINY1YvduBlGrP+vHjJqd/nK7JVpfM4rmZLGMx77WoL3sMrhheA0qxii9VNn1VHnxJLEyxmvCB+Wqc+x/FMw==",
       "dev": true,
       "requires": {
-        "core-js-pure": "^3.16.0",
+        "core-js-pure": "^3.0.0",
         "regenerator-runtime": "^0.13.4"
       }
     },
     "@babel/template": {
-      "version": "7.12.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz",
-      "integrity": "sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==",
+      "version": "7.8.6",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
+      "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/parser": "^7.12.7",
-        "@babel/types": "^7.12.7"
+        "@babel/code-frame": "^7.8.3",
+        "@babel/parser": "^7.8.6",
+        "@babel/types": "^7.8.6"
       }
     },
     "@babel/traverse": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.9.tgz",
-      "integrity": "sha512-bldh6dtB49L8q9bUyB7bC20UKgU+EFDwKJylwl234Kv+ySZeMD31Xeht6URyueQ6LrRRpF2tmkfcZooZR9/e8g==",
+      "version": "7.11.5",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
+      "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/generator": "^7.14.9",
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-hoist-variables": "^7.14.5",
-        "@babel/helper-split-export-declaration": "^7.14.5",
-        "@babel/parser": "^7.14.9",
-        "@babel/types": "^7.14.9",
+        "@babel/code-frame": "^7.10.4",
+        "@babel/generator": "^7.11.5",
+        "@babel/helper-function-name": "^7.10.4",
+        "@babel/helper-split-export-declaration": "^7.11.0",
+        "@babel/parser": "^7.11.5",
+        "@babel/types": "^7.11.5",
         "debug": "^4.1.0",
-        "globals": "^11.1.0"
+        "globals": "^11.1.0",
+        "lodash": "^4.17.19"
       },
       "dependencies": {
         "@babel/generator": {
-          "version": "7.14.9",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.9.tgz",
-          "integrity": "sha512-4yoHbhDYzFa0GLfCzLp5GxH7vPPMAHdZjyE7M/OajM9037zhx0rf+iNsJwp4PT0MSFpwjG7BsHEbPkBQpZ6cYA==",
+          "version": "7.11.6",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
+          "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.14.9",
+            "@babel/types": "^7.11.5",
             "jsesc": "^2.5.1",
             "source-map": "^0.5.0"
           }
         },
+        "debug": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        },
         "source-map": {
           "version": "0.5.7",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -33147,12 +33155,13 @@
       }
     },
     "@babel/types": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.9.tgz",
-      "integrity": "sha512-u0bLTnv3DFHeaQLYzb7oRJ1JHr1sv/SYDM7JSqHFFLwXG1wTZRughxFI5NCP8qBEo1rVVsn7Yg2Lvw49nne/Ow==",
+      "version": "7.11.5",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+      "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-validator-identifier": "^7.14.9",
+        "@babel/helper-validator-identifier": "^7.10.4",
+        "lodash": "^4.17.19",
         "to-fast-properties": "^2.0.0"
       }
     },
@@ -33172,22 +33181,16 @@
         "minimist": "^1.2.0"
       }
     },
-    "@discoveryjs/json-ext": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.2.tgz",
-      "integrity": "sha512-HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg==",
-      "dev": true
-    },
     "@eslint/eslintrc": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
-      "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.0.tgz",
+      "integrity": "sha512-2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog==",
       "dev": true,
       "requires": {
         "ajv": "^6.12.4",
         "debug": "^4.1.1",
         "espree": "^7.3.0",
-        "globals": "^13.9.0",
+        "globals": "^12.1.0",
         "ignore": "^4.0.6",
         "import-fresh": "^3.2.1",
         "js-yaml": "^3.13.1",
@@ -33195,25 +33198,22 @@
         "strip-json-comments": "^3.1.1"
       },
       "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
+            "ms": "2.1.2"
           }
         },
         "globals": {
-          "version": "13.10.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.10.0.tgz",
-          "integrity": "sha512-piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g==",
+          "version": "12.4.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
+          "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
           "dev": true,
           "requires": {
-            "type-fest": "^0.20.2"
+            "type-fest": "^0.8.1"
           }
         },
         "ignore": {
@@ -33222,251 +33222,416 @@
           "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
           "dev": true
         },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         },
-        "type-fest": {
-          "version": "0.20.2",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+        "strip-json-comments": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+          "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
           "dev": true
         }
       }
     },
-    "@humanwhocodes/config-array": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
-      "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
-      "dev": true,
-      "requires": {
-        "@humanwhocodes/object-schema": "^1.2.0",
-        "debug": "^4.1.1",
-        "minimatch": "^3.0.4"
-      }
-    },
-    "@humanwhocodes/object-schema": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz",
-      "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==",
-      "dev": true
-    },
     "@ionic-native/badge": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/badge/-/badge-5.35.0.tgz",
-      "integrity": "sha512-VTelBbEoj7MdkN4rzgPOFiQnw9GZrJPI/3GOEIib3/sj5HVSnClkGDFlLPSwe+sdjvozehpDCkGE92dPd5KMpA==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/badge/-/badge-5.33.0.tgz",
+      "integrity": "sha512-g/E2HLB53csZq5hWeyWUFj6r7CrllSPuOkV88XotIFTQFNuY7TaLtiFUVFSvWXRh0Kvu+w7TI5Hys67d/v7F/g==",
       "requires": {
         "@types/cordova": "latest"
+      },
+      "dependencies": {
+        "@types/cordova": {
+          "version": "0.0.34",
+          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+        }
       }
     },
     "@ionic-native/camera": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/camera/-/camera-5.35.0.tgz",
-      "integrity": "sha512-zW39wFdJ9oACMVtZJSvYn8gaJJQYKOoqjtnLphMXceFY0KBqyDYdTdkquzTOFUjsB3WQRwScndEJJ73PhVCZmg==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/camera/-/camera-5.33.0.tgz",
+      "integrity": "sha512-cLAxM4e8IrTECvlszyUe9FnUjE4PbWR99NNDwkOuB85yJ3diyKxiQhHu89Qh9A6qzHTJQLa93iknY2Q40VM/5Q==",
       "requires": {
         "@types/cordova": "latest"
+      },
+      "dependencies": {
+        "@types/cordova": {
+          "version": "0.0.34",
+          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+        }
       }
     },
     "@ionic-native/chooser": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/chooser/-/chooser-5.35.0.tgz",
-      "integrity": "sha512-oQnfahfA1Z8Pv3MbnhBDAeGyMyC598Xm2U2mCNKdYhtPtqeH5uOOk596XGsgoR+11G9g1gqFDg3qypK4E1zVTA==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/chooser/-/chooser-5.33.0.tgz",
+      "integrity": "sha512-hz2OtB8UsJpKdXZByDzGS6+U1FK8toIjKmIVCDQAuOXxjbw9dU2Ef+MSUKXOpK6MYnP56oP80JdSX9LDEFJnRA==",
       "requires": {
         "@types/cordova": "latest"
+      },
+      "dependencies": {
+        "@types/cordova": {
+          "version": "0.0.34",
+          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+        }
       }
     },
     "@ionic-native/clipboard": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/clipboard/-/clipboard-5.35.0.tgz",
-      "integrity": "sha512-M39sLi6HFJEKwMXcFBwWEk5X70t/b7uuDFqqtLCOg7dsZwmhY07Lr/kU3lBh7zbj9TgCKSkOxc3jlZH3fRWXbA==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/clipboard/-/clipboard-5.33.0.tgz",
+      "integrity": "sha512-HFZN4tsAjFJ9Se9ik0/IOUvApL4zNPEKQAtUsjqP7vCnTsdrgS+FDMln1UDEKXCQ/dEEwU1N1ndFmPBGxjkGzQ==",
       "requires": {
         "@types/cordova": "latest"
+      },
+      "dependencies": {
+        "@types/cordova": {
+          "version": "0.0.34",
+          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+        }
       }
     },
     "@ionic-native/core": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/core/-/core-5.35.0.tgz",
-      "integrity": "sha512-x2mShlaLOzCxwdqvPOvUFX4g0ctMvEYiYak6Hlh+HP9eNWfruT0EcMoXs6KSvIRFRsyFaYAXHyDZseKtB3aqsA==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/core/-/core-5.33.0.tgz",
+      "integrity": "sha512-dnZHu7SadvQvliGJPndk2ohdoPvwiyBWJjsJw33BKyhadnmLlmkYKkRgPPI+i22BZofDKq4YiAfIIqhvfHU6gw==",
       "requires": {
         "@types/cordova": "latest"
+      },
+      "dependencies": {
+        "@types/cordova": {
+          "version": "0.0.34",
+          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+        }
       }
     },
     "@ionic-native/device": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/device/-/device-5.35.0.tgz",
-      "integrity": "sha512-p/kTzERyWFhAN6mzhq4wanFme3aNGHeT2hM+lp1tM87vqLn+49GycKNwYMED0mfcGA1n2aT+ClF+ga6df5Rvhw==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/device/-/device-5.33.0.tgz",
+      "integrity": "sha512-KYQvVsN98bGTEomI193Jf9r1vaXBFJQXuhkhwBI6lajynAlf2SIVJwthNUXnK43kNXy1cOelYxScUuKyPwqudw==",
       "requires": {
         "@types/cordova": "latest"
+      },
+      "dependencies": {
+        "@types/cordova": {
+          "version": "0.0.34",
+          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+        }
       }
     },
     "@ionic-native/diagnostic": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/diagnostic/-/diagnostic-5.35.0.tgz",
-      "integrity": "sha512-hjTYiGEZzL4cE/GNr/g9T/zaBuIXNTfUGJXOVSKOI3t0miIo4eZi1IQnbQtac4fhuwtW23eo5TFtzP8NwJHy/Q==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/diagnostic/-/diagnostic-5.33.0.tgz",
+      "integrity": "sha512-zBDv/yNMvUkXfxy17rgrGVU3+XKREXRI7cqy/DyvpjdomOnmx2pnFvhszgMEgeD03LkXXKiFOR5yUAVNgYirmg==",
       "requires": {
         "@types/cordova": "latest"
+      },
+      "dependencies": {
+        "@types/cordova": {
+          "version": "0.0.34",
+          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+        }
       }
     },
     "@ionic-native/file": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/file/-/file-5.35.0.tgz",
-      "integrity": "sha512-CpD8z7skurzL4Gj1R6AhAvszoc+Ii06+2u1E48/jq6SXBY9S6ufzSlpWosRFkfydRKDIZ1gIb/vAGedCuuRWyQ==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/file/-/file-5.33.0.tgz",
+      "integrity": "sha512-RisSGJl2t8JrBgw30Vn5hJYYKEDTHR9f3KbQDfe1MQg+VrZo7vnbml/vk4l55u65c1TYZDH+F6i7s9nyif1QVQ==",
       "requires": {
         "@types/cordova": "latest"
+      },
+      "dependencies": {
+        "@types/cordova": {
+          "version": "0.0.34",
+          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+        }
       }
     },
     "@ionic-native/file-opener": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/file-opener/-/file-opener-5.35.0.tgz",
-      "integrity": "sha512-1xDQVfsRUdd+b/MNtKuxuBqi2pv63kyuB6VFTP7g3I+e13JW05I0RNlujpcBhGpA1FZyPKs7w7b2era9famNLg==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/file-opener/-/file-opener-5.33.0.tgz",
+      "integrity": "sha512-v7t1ndalAPYT9gvMAhxAup8tg1NPV415cfG6tzs1foPFP91UZC3MQny0tup8AgFivugT1GRdoSk1NMuK1jy8Cw==",
       "requires": {
         "@types/cordova": "latest"
+      },
+      "dependencies": {
+        "@types/cordova": {
+          "version": "0.0.34",
+          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+        }
       }
     },
     "@ionic-native/file-transfer": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/file-transfer/-/file-transfer-5.35.0.tgz",
-      "integrity": "sha512-rkOOSY+1/VLstv2TT8TYkZUmAzN+syjFolK8Sj5hEbgVuCWhZZK+7bqwGmHg2op4OvXf4kptehHZ5KDD0ZenBw==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/file-transfer/-/file-transfer-5.33.0.tgz",
+      "integrity": "sha512-xDUpdJVgTBP6aEiU08iZ/pa9aMoGSMB9391dQKk+VSDs0hdbIwk+Cx4V40GIE4QF3TI06sUMdKXD2sIhVsr2QA==",
       "requires": {
         "@types/cordova": "latest"
+      },
+      "dependencies": {
+        "@types/cordova": {
+          "version": "0.0.34",
+          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+        }
       }
     },
     "@ionic-native/geolocation": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/geolocation/-/geolocation-5.35.0.tgz",
-      "integrity": "sha512-gjwe2WUv75qNfIdLipgUCBhpQPHhzLivecEeHNGpb4pXo151rq3MtgHK2Q3xjy7iyrYsZlcNYtVb+jhb+4toBg==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/geolocation/-/geolocation-5.33.0.tgz",
+      "integrity": "sha512-oE6pi6l8/Wsv94vpJmPlPqE1LheP6cQTJrC78WYQp9WVDOOCGZnFznNoH8BlQfnfjuDx/kUARxzEJBO/gbUg1A==",
       "requires": {
         "@types/cordova": "latest"
+      },
+      "dependencies": {
+        "@types/cordova": {
+          "version": "0.0.34",
+          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+        }
       }
     },
     "@ionic-native/http": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/http/-/http-5.35.0.tgz",
-      "integrity": "sha512-AaLvi59gdOlxpM3x9krk0l8UcLI9OLBm+o7DNu8y1pgsUKIvf7+ZbY4xU1fJG1HDvUyrU8+NQLrvXgpXx6CmAQ==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/http/-/http-5.33.0.tgz",
+      "integrity": "sha512-dqcPu3igSLlfDUK8Mvma/6o6aq7WtKBlcR8xXwE8tVsO/r4fEB6NevLLN4S4zCr381Jy+RxIIjn3CZx5XHF6JQ==",
       "requires": {
         "@types/cordova": "latest"
+      },
+      "dependencies": {
+        "@types/cordova": {
+          "version": "0.0.34",
+          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+        }
       }
     },
     "@ionic-native/in-app-browser": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/in-app-browser/-/in-app-browser-5.35.0.tgz",
-      "integrity": "sha512-P06lB3ZhMPn1r5qT742uqczRfceY3dPAAAujlGD+m/06DSikKcB4CYDUHrowJbYAXYr8hkHtnQgtthZx5PPZAA==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/in-app-browser/-/in-app-browser-5.33.0.tgz",
+      "integrity": "sha512-GGIvnYHf8FgaIae9yfRzxqxj0ZAxrYhOJpsHVSq1YKjxnDpRe6ImWWaHHfaeXE5IdUUMUXVuf75VTSBN00VBvA==",
       "requires": {
         "@types/cordova": "latest"
+      },
+      "dependencies": {
+        "@types/cordova": {
+          "version": "0.0.34",
+          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+        }
       }
     },
     "@ionic-native/ionic-webview": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/ionic-webview/-/ionic-webview-5.35.0.tgz",
-      "integrity": "sha512-OliPzhM1eAhJW0Q4vzhwb0M98IptN9woXuiaDhRyEBBB3PvukKeGWbVBHdquzVSZYuhz0emrJeDDRhTVQEaJ/Q==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/ionic-webview/-/ionic-webview-5.33.0.tgz",
+      "integrity": "sha512-Jbr4M6z/Fya51F+QXuPLm/crFlZ9T6YvRM1cygGmFwZ7SgDAimYnjgSO8SEGJmvO2ZekYmFuF56qiVPSvx2wUA==",
       "requires": {
         "@types/cordova": "latest"
+      },
+      "dependencies": {
+        "@types/cordova": {
+          "version": "0.0.34",
+          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+        }
       }
     },
     "@ionic-native/keyboard": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/keyboard/-/keyboard-5.35.0.tgz",
-      "integrity": "sha512-SB4S91NVkdSuNsT8OTS67QnE76yvoPB1BFrz1uL37BGKselgF0xTlJEfLOV7VL82ZteXr4siQr/MLRmBYIc6QQ==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/keyboard/-/keyboard-5.33.0.tgz",
+      "integrity": "sha512-TIYU3LC+Yz/pcpBuHcxLThMNuN9y1E1wBu4SlmS6VlO3/D3R3At2WOg2UK3iA66G2kTJubed5haqTYZjeoA6Uw==",
       "requires": {
         "@types/cordova": "latest"
+      },
+      "dependencies": {
+        "@types/cordova": {
+          "version": "0.0.34",
+          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+        }
       }
     },
     "@ionic-native/local-notifications": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/local-notifications/-/local-notifications-5.35.0.tgz",
-      "integrity": "sha512-kdn+skyQpTDHBpL8kLlsnZ7n5EzPPytrKZbCYgRZPJR4yNymZqfGbvuXblmpAZUoAMObEj5EWetOyBQcmuNFXw==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/local-notifications/-/local-notifications-5.33.0.tgz",
+      "integrity": "sha512-ljn2uq0rFWpjG1I1qK+mPVX8T3T+09fsF8sZ9nK7uvD9YWShCVz2e2ctf8qPRFq+TWDeDqlnwXz3wCvWmbBUWw==",
       "requires": {
         "@types/cordova": "latest"
+      },
+      "dependencies": {
+        "@types/cordova": {
+          "version": "0.0.34",
+          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+        }
       }
     },
     "@ionic-native/media": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/media/-/media-5.35.0.tgz",
-      "integrity": "sha512-pTzQQnwkJpjlvBJ+ye8eazxiBuHqAOkBYzpcez/dY2HK5u9MTFvX/YeeaZ7LetKHoAwBhtN/LSr2sFG7mo9wFg==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/media/-/media-5.33.0.tgz",
+      "integrity": "sha512-nUu7/FSH41j9+BqHXYVMBd3EifNsTNOufD3NEiMVpHVDWLWqG7tG5h5cFlsVACxUaP4kNpSEke2mjom6CKyjxQ==",
       "requires": {
         "@types/cordova": "latest"
+      },
+      "dependencies": {
+        "@types/cordova": {
+          "version": "0.0.34",
+          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+        }
       }
     },
     "@ionic-native/media-capture": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/media-capture/-/media-capture-5.35.0.tgz",
-      "integrity": "sha512-rF97XrAO6Ehc0UG9tO/kVMJ70YIpUzDFr3DdJ6H86cMSROfs8CqP0gsO3x0Uco8sLLCzM7JHqx1oz9gtyiV5PA==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/media-capture/-/media-capture-5.33.0.tgz",
+      "integrity": "sha512-aQTnonVSeijpuZ9B7oYJCjIDqgFVhNdvqkx9vUoaO359BtJGpGS1rNPjEovt4DsqV7oe7TkbmBd8DMEwnB3A2g==",
       "requires": {
         "@types/cordova": "latest"
+      },
+      "dependencies": {
+        "@types/cordova": {
+          "version": "0.0.34",
+          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+        }
       }
     },
     "@ionic-native/network": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/network/-/network-5.35.0.tgz",
-      "integrity": "sha512-Iu6dC0xTB0DUfdY+AJDVdQCJlmmn779s0j5QlR7THA1UUWz37LeWQuUvBdipLt66VfxZ2TlayM4HKrbTE/VkCQ==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/network/-/network-5.33.0.tgz",
+      "integrity": "sha512-J+3+rbDTMVNUspa/nV+P8a0hFKDicJK1rVIrm5aLBQdmN9n7WaqJmeMYTptyWOnZxQpktJAJDdhJTEvVmKQjjw==",
       "requires": {
         "@types/cordova": "latest"
+      },
+      "dependencies": {
+        "@types/cordova": {
+          "version": "0.0.34",
+          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+        }
       }
     },
     "@ionic-native/push": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/push/-/push-5.35.0.tgz",
-      "integrity": "sha512-sXaQWnRLe1uyDRraHsPAoU2CLVwVAbTDgJoX1CwxmjILEAa0B7/cJTycbZic8gJ5AYVHdt+JTM5yIE7NfhREHA==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/push/-/push-5.33.0.tgz",
+      "integrity": "sha512-H4gOkMbOaNvi97cKKJDggWvAR1BVCUbtdLyWInA0q3cZBHWSc6KcRJGz+hcdDndCQJUnHofs1Tpw8LN3zhjYyQ==",
       "requires": {
         "@types/cordova": "latest"
+      },
+      "dependencies": {
+        "@types/cordova": {
+          "version": "0.0.34",
+          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+        }
       }
     },
     "@ionic-native/qr-scanner": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/qr-scanner/-/qr-scanner-5.35.0.tgz",
-      "integrity": "sha512-QElERY4ImURDFCZB/S58F7f73eiTbThxuxeLhIjB9Uogi72FyAYgQR767NAFIBMh58uIlZy4WKKlIrLWMIx4RQ==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/qr-scanner/-/qr-scanner-5.33.0.tgz",
+      "integrity": "sha512-cyiQv0Rje/fN9/JYoDXP1+ILJkRkjvPtoSx4vd2FsKAuJB60U2DpQfmVEE/KMF4iceTpx4MK/kGzr2WE2AYnIg==",
       "requires": {
         "@types/cordova": "latest"
+      },
+      "dependencies": {
+        "@types/cordova": {
+          "version": "0.0.34",
+          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+        }
       }
     },
     "@ionic-native/splash-screen": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-5.35.0.tgz",
-      "integrity": "sha512-q3JNIdONmT8pA5xqVB1XiXRR7upKd/o6b2ZX5pPaAZK5GB1kaD8BlRyfJPvX4H1C1o7mAlyr6Y+r1PpeF7KkWg==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-5.33.0.tgz",
+      "integrity": "sha512-6PHk5WJeUoc3zru6wTvUmd9DCASvRQoQq1dysYI3JCECaAJ6X0x1RbzM8dBFs3JPLfWtDn+P8eTp+KaA0Xf58w==",
       "requires": {
         "@types/cordova": "latest"
+      },
+      "dependencies": {
+        "@types/cordova": {
+          "version": "0.0.34",
+          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+        }
       }
     },
     "@ionic-native/sqlite": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/sqlite/-/sqlite-5.35.0.tgz",
-      "integrity": "sha512-6S2EYifwjdDSwgyaojkUT5sbTV/0s65YH7/XJiReDNf7nWAv49Nu7DggJhdNwDKt9kl0NdeJnCv0SS0zGFJRdw==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/sqlite/-/sqlite-5.33.0.tgz",
+      "integrity": "sha512-JIdQJr6bcksotF/3ZMJQZo9lHgaHXvHOOK9R30mM/5Ds5fFu+rUoUf0wvyqaGzEFu94pGw2uPGnfD+WI7x7+1A==",
       "requires": {
         "@types/cordova": "latest"
+      },
+      "dependencies": {
+        "@types/cordova": {
+          "version": "0.0.34",
+          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+        }
       }
     },
     "@ionic-native/status-bar": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/status-bar/-/status-bar-5.35.0.tgz",
-      "integrity": "sha512-c9uwQHGf0nO5V+u6cLpCido6FX7QOfjo11BRKwrQoAzpIvSK7cUgh/6PMW3MlkjWs3qNKHRNiHDg7wlac2vcuQ==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/status-bar/-/status-bar-5.33.0.tgz",
+      "integrity": "sha512-cnyfd42N9gGfhyDtF7wbWoacKg/jfsoJQHOHltfhS4/EjxsVu4bjkwq1YBLMcMY3OIqFDSn2aFcejHn8wVNkDQ==",
       "requires": {
         "@types/cordova": "latest"
+      },
+      "dependencies": {
+        "@types/cordova": {
+          "version": "0.0.34",
+          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+        }
       }
     },
     "@ionic-native/web-intent": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/web-intent/-/web-intent-5.35.0.tgz",
-      "integrity": "sha512-N2bzHNKGkMNEe4ugPXHkAst2kdBIESXnN4CbQR0s4LYA5o9Aw8Vx3yFKPuhAHfC5rVDWHytoj2ErX+40cPKg5A==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/web-intent/-/web-intent-5.33.0.tgz",
+      "integrity": "sha512-3CIAofrg9nkJQbSftFdMKYOduXy9Ra/a1Q0it6ysm9NFeAQn7iZPThSexBeZ9xiKKj/QTPZtnqAJ0MQ+4mkGag==",
       "requires": {
         "@types/cordova": "latest"
+      },
+      "dependencies": {
+        "@types/cordova": {
+          "version": "0.0.34",
+          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+        }
       }
     },
     "@ionic-native/zip": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/zip/-/zip-5.35.0.tgz",
-      "integrity": "sha512-PgGFsXcLWWRrb9UtiKtBHwkKwAamR3l2qMW5qVESns4rBMC628sMaDtIrzsTxarw23Oy3q4kO47tp1pS3Ko0xg==",
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/zip/-/zip-5.33.0.tgz",
+      "integrity": "sha512-hErISQ6/xqVErmVnnha5BR+3GWRNQIVfMTXzprEpNZxQl3iDe1UTIVQdFnMd3Nasz/naY+61Vq/y91PZ1Rrajw==",
       "requires": {
         "@types/cordova": "latest"
+      },
+      "dependencies": {
+        "@types/cordova": {
+          "version": "0.0.34",
+          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+        }
       }
     },
     "@ionic/angular": {
-      "version": "5.6.13",
-      "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-5.6.13.tgz",
-      "integrity": "sha512-78S6aCcmeyxeLTTSq/pvc94UH+uIuCm8IO2Dumr/nxpKDw16xs0Xf0E07om0H6Ik4hcqUS7Sjur8syu6cY5Zuw==",
+      "version": "5.6.6",
+      "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-5.6.6.tgz",
+      "integrity": "sha512-0psh2n4Y/3sx0e2Yj4WmNcukz0nrETEiJE6Fl4CldoB8QHZcXGi0hKrPAcbGSAF0+lAJ58+Z5Gp/HQVm/MQOMA==",
       "requires": {
-        "@ionic/core": "5.6.13",
+        "@ionic/core": "5.6.6",
         "tslib": "^1.9.3"
       },
       "dependencies": {
@@ -33478,95 +33643,38 @@
       }
     },
     "@ionic/angular-toolkit": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@ionic/angular-toolkit/-/angular-toolkit-4.0.0.tgz",
-      "integrity": "sha512-HGRAGUtc1YSwNZ/Q7X7c2QRyYM2AfsSm++OasPrMo3LnPRVr8OIsUih2ithEU7f3CXrViUR7j/Anu90zGsRgzg==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/@ionic/angular-toolkit/-/angular-toolkit-2.3.3.tgz",
+      "integrity": "sha512-r87mApDLWbLaUtd5LvNHrRlZWxjQhaBBM1yPlk9M98dHOxcX3jy7kv60ZurGZutuvbhXISGvHcvvR90yywDC1A==",
       "dev": true,
       "requires": {
-        "@schematics/angular": "^12.0.0",
+        "@schematics/angular": ">=8.0.0",
         "cheerio": "1.0.0-rc.3",
         "colorette": "1.1.0",
-        "copy-webpack-plugin": "^6.2.1",
-        "tapable": "^2.1.1",
-        "tslib": "^2.0.3",
+        "copy-webpack-plugin": "^6.0.3",
+        "tslib": "^1.9.0",
         "ws": "^7.0.1"
       },
       "dependencies": {
-        "@angular-devkit/core": {
-          "version": "12.1.4",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-12.1.4.tgz",
-          "integrity": "sha512-KOzGD8JbP/7EeUwPiU5x+fo3ZEQ5R4IVW5WoH92PaO3mdpqXC7UL2MWLct8PUe9il9nqJMvrBMldSSvP9PCT2w==",
-          "dev": true,
-          "requires": {
-            "ajv": "8.6.0",
-            "ajv-formats": "2.1.0",
-            "fast-json-stable-stringify": "2.1.0",
-            "magic-string": "0.25.7",
-            "rxjs": "6.6.7",
-            "source-map": "0.7.3"
-          }
-        },
-        "@schematics/angular": {
-          "version": "12.1.4",
-          "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-12.1.4.tgz",
-          "integrity": "sha512-xGqgGI6GWk4EFdKis8FmSESxoLgjnLQbaRE1t1KZCkSKJzqkOj0R9wiDrtZfcrbPxIkLL+3fAk2ThwwPznT6yw==",
-          "dev": true,
-          "requires": {
-            "@angular-devkit/core": "12.1.4",
-            "@angular-devkit/schematics": "12.1.4",
-            "jsonc-parser": "3.0.0"
-          }
-        },
-        "ajv": {
-          "version": "8.6.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz",
-          "integrity": "sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "json-schema-traverse": "^1.0.0",
-            "require-from-string": "^2.0.2",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "ajv-formats": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.0.tgz",
-          "integrity": "sha512-USH2jBb+C/hIpwD2iRjp0pe0k+MvzG0mlSn/FIdCgQhUb9ALPRjt2KIQdfZDS9r0ZIeUAg7gOu9KL0PFqGqr5Q==",
-          "dev": true,
-          "requires": {
-            "ajv": "^8.0.0"
-          }
-        },
-        "jsonc-parser": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
-          "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==",
+        "tslib": {
+          "version": "1.13.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
+          "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
           "dev": true
         },
-        "rxjs": {
-          "version": "6.6.7",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-          "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+        "ws": {
+          "version": "7.3.1",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz",
+          "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==",
           "dev": true,
-          "requires": {
-            "tslib": "^1.9.0"
-          },
-          "dependencies": {
-            "tslib": {
-              "version": "1.14.1",
-              "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-              "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-              "dev": true
-            }
-          }
+          "requires": {}
         }
       }
     },
     "@ionic/cli": {
-      "version": "6.16.3",
-      "resolved": "https://registry.npmjs.org/@ionic/cli/-/cli-6.16.3.tgz",
-      "integrity": "sha512-4gune4s02oxft1RC+zXXexr2qT0CuPzRWpP3c3daabf3skZHAV+TfhE7aW26zV9XHS2Mw0YjHuKZHu1/UgMRqw==",
+      "version": "6.14.1",
+      "resolved": "https://registry.npmjs.org/@ionic/cli/-/cli-6.14.1.tgz",
+      "integrity": "sha512-QGmA5hjW4PvS8o0f+ptJ2bOknu4dPKzlECFApBiR7ayDgGTDMwmbxrtNpRhDnjdsVlMAzWq8eo9l76831+DBjQ==",
       "dev": true,
       "requires": {
         "@ionic/cli-framework": "5.1.0",
@@ -33597,47 +33705,48 @@
         "tslib": "^2.0.1"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
         "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
         },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
           "dev": true,
           "requires": {
-            "color-name": "~1.1.4"
+            "ms": "2.1.2"
           }
         },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+        "os-name": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/os-name/-/os-name-4.0.0.tgz",
+          "integrity": "sha512-caABzDdJMbtykt7GmSogEat3faTKQhmZf0BS5l/pZGmP0vPWQjXWqOhbLyK+b6j2/DQPmEvYdzLXJXXLJNVDNg==",
           "dev": true,
           "requires": {
-            "has-flag": "^4.0.0"
+            "macos-release": "^2.2.0",
+            "windows-release": "^4.0.0"
+          }
+        },
+        "windows-release": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-4.0.0.tgz",
+          "integrity": "sha512-OxmV4wzDKB1x7AZaZgXMVsdJ1qER1ed83ZrTYd5Bwq2HfJVg3DJS8nqlAG4sMoJ7mu8cuRmLEYyU13BKwctRAg==",
+          "dev": true,
+          "requires": {
+            "execa": "^4.0.2"
           }
         }
       }
@@ -33665,48 +33774,30 @@
         "write-file-atomic": "^3.0.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
         "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
         },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
           "dev": true,
           "requires": {
-            "color-name": "~1.1.4"
+            "ms": "2.1.2"
           }
         },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
         }
       }
     },
@@ -33719,6 +33810,23 @@
         "@ionic/utils-terminal": "2.3.1",
         "debug": "^4.0.0",
         "tslib": "^2.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
       }
     },
     "@ionic/cli-framework-prompts": {
@@ -33731,16 +33839,175 @@
         "debug": "^4.0.0",
         "inquirer": "^7.0.0",
         "tslib": "^2.0.1"
+      },
+      "dependencies": {
+        "ansi-escapes": {
+          "version": "4.3.2",
+          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+          "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+          "dev": true,
+          "requires": {
+            "type-fest": "^0.21.3"
+          }
+        },
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "dev": true
+        },
+        "chalk": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "cli-cursor": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+          "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+          "dev": true,
+          "requires": {
+            "restore-cursor": "^3.1.0"
+          }
+        },
+        "cli-width": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
+          "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
+          "dev": true
+        },
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+          "dev": true
+        },
+        "figures": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+          "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+          "dev": true,
+          "requires": {
+            "escape-string-regexp": "^1.0.5"
+          }
+        },
+        "inquirer": {
+          "version": "7.3.3",
+          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz",
+          "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==",
+          "dev": true,
+          "requires": {
+            "ansi-escapes": "^4.2.1",
+            "chalk": "^4.1.0",
+            "cli-cursor": "^3.1.0",
+            "cli-width": "^3.0.0",
+            "external-editor": "^3.0.3",
+            "figures": "^3.0.0",
+            "lodash": "^4.17.19",
+            "mute-stream": "0.0.8",
+            "run-async": "^2.4.0",
+            "rxjs": "^6.6.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0",
+            "through": "^2.3.6"
+          }
+        },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+          "dev": true
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        },
+        "restore-cursor": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+          "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+          "dev": true,
+          "requires": {
+            "onetime": "^5.1.0",
+            "signal-exit": "^3.0.2"
+          }
+        },
+        "rxjs": {
+          "version": "6.6.7",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+          "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+          "dev": true,
+          "requires": {
+            "tslib": "^1.9.0"
+          },
+          "dependencies": {
+            "tslib": {
+              "version": "1.14.1",
+              "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+              "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+              "dev": true
+            }
+          }
+        },
+        "string-width": {
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.0"
+          }
+        },
+        "type-fest": {
+          "version": "0.21.3",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+          "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+          "dev": true
+        }
       }
     },
     "@ionic/core": {
-      "version": "5.6.13",
-      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.6.13.tgz",
-      "integrity": "sha512-stN80Q4zdLT7pmUoNNqp+lVjTIhcLSjDN2rzP/gYz8YAkz1L5AB2CkudD5VHWFTBbAEsylih34gAMOrygVNoJQ==",
+      "version": "5.6.6",
+      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.6.6.tgz",
+      "integrity": "sha512-EbVIXOTVVPxBo7hsarBpRSFNsQ22wBFtWkKmrmliieknG5LUkf5WZBpj4EENQhzYA6c+//7/nfhcD9pWgtAofA==",
       "requires": {
         "@stencil/core": "^2.4.0",
-        "ionicons": "^5.5.3",
+        "ionicons": "^5.5.1",
         "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz",
+          "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w=="
+        }
       }
     },
     "@ionic/utils-array": {
@@ -33751,6 +34018,23 @@
       "requires": {
         "debug": "^4.0.0",
         "tslib": "^2.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
       }
     },
     "@ionic/utils-fs": {
@@ -33762,6 +34046,23 @@
         "debug": "^4.0.0",
         "fs-extra": "^9.0.0",
         "tslib": "^2.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
       }
     },
     "@ionic/utils-network": {
@@ -33772,6 +34073,23 @@
       "requires": {
         "debug": "^4.0.0",
         "tslib": "^2.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
       }
     },
     "@ionic/utils-object": {
@@ -33782,6 +34100,23 @@
       "requires": {
         "debug": "^4.0.0",
         "tslib": "^2.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
       }
     },
     "@ionic/utils-process": {
@@ -33796,6 +34131,23 @@
         "signal-exit": "^3.0.3",
         "tree-kill": "^1.2.2",
         "tslib": "^2.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
       }
     },
     "@ionic/utils-stream": {
@@ -33806,6 +34158,23 @@
       "requires": {
         "debug": "^4.0.0",
         "tslib": "^2.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
       }
     },
     "@ionic/utils-subprocess": {
@@ -33822,6 +34191,23 @@
         "cross-spawn": "^7.0.0",
         "debug": "^4.0.0",
         "tslib": "^2.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
       }
     },
     "@ionic/utils-terminal": {
@@ -33838,6 +34224,72 @@
         "tslib": "^2.0.1",
         "untildify": "^4.0.0",
         "wrap-ansi": "^7.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "dev": true
+        },
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+          "dev": true
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.0"
+          }
+        },
+        "wrap-ansi": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+          "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0"
+          }
+        }
       }
     },
     "@istanbuljs/load-nyc-config": {
@@ -33853,12 +34305,6 @@
         "resolve-from": "^5.0.0"
       },
       "dependencies": {
-        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-          "dev": true
-        },
         "find-up": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
@@ -33911,99 +34357,66 @@
       }
     },
     "@istanbuljs/schema": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz",
+      "integrity": "sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==",
       "dev": true
     },
     "@jest/console": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.6.2.tgz",
-      "integrity": "sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.5.2.tgz",
+      "integrity": "sha512-lJELzKINpF1v74DXHbCRIkQ/+nUV1M+ntj+X1J8LxCgpmJZjfLmhFejiMSbjjD66fayxl5Z06tbs3HMyuik6rw==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.6.2",
+        "@jest/types": "^26.5.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "jest-message-util": "^26.6.2",
-        "jest-util": "^26.6.2",
+        "jest-message-util": "^26.5.2",
+        "jest-util": "^26.5.2",
         "slash": "^3.0.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
         "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
         }
       }
     },
     "@jest/core": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.6.3.tgz",
-      "integrity": "sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.5.2.tgz",
+      "integrity": "sha512-LLTo1LQMg7eJjG/+P1NYqFof2B25EV1EqzD5FonklihG4UJKiK2JBIvWonunws6W7e+DhNLoFD+g05tCY03eyA==",
       "dev": true,
       "requires": {
-        "@jest/console": "^26.6.2",
-        "@jest/reporters": "^26.6.2",
-        "@jest/test-result": "^26.6.2",
-        "@jest/transform": "^26.6.2",
-        "@jest/types": "^26.6.2",
+        "@jest/console": "^26.5.2",
+        "@jest/reporters": "^26.5.2",
+        "@jest/test-result": "^26.5.2",
+        "@jest/transform": "^26.5.2",
+        "@jest/types": "^26.5.2",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.4",
-        "jest-changed-files": "^26.6.2",
-        "jest-config": "^26.6.3",
-        "jest-haste-map": "^26.6.2",
-        "jest-message-util": "^26.6.2",
+        "jest-changed-files": "^26.5.2",
+        "jest-config": "^26.5.2",
+        "jest-haste-map": "^26.5.2",
+        "jest-message-util": "^26.5.2",
         "jest-regex-util": "^26.0.0",
-        "jest-resolve": "^26.6.2",
-        "jest-resolve-dependencies": "^26.6.3",
-        "jest-runner": "^26.6.3",
-        "jest-runtime": "^26.6.3",
-        "jest-snapshot": "^26.6.2",
-        "jest-util": "^26.6.2",
-        "jest-validate": "^26.6.2",
-        "jest-watcher": "^26.6.2",
+        "jest-resolve": "^26.5.2",
+        "jest-resolve-dependencies": "^26.5.2",
+        "jest-runner": "^26.5.2",
+        "jest-runtime": "^26.5.2",
+        "jest-snapshot": "^26.5.2",
+        "jest-util": "^26.5.2",
+        "jest-validate": "^26.5.2",
+        "jest-watcher": "^26.5.2",
         "micromatch": "^4.0.2",
         "p-each-series": "^2.1.0",
         "rimraf": "^3.0.0",
@@ -34011,145 +34424,96 @@
         "strip-ansi": "^6.0.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+        "ansi-escapes": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
+          "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
           "dev": true,
           "requires": {
-            "color-convert": "^2.0.1"
+            "type-fest": "^0.11.0"
           }
         },
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "dev": true
+        },
         "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
         },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
           "dev": true,
           "requires": {
-            "color-name": "~1.1.4"
+            "ansi-regex": "^5.0.0"
           }
         },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+        "type-fest": {
+          "version": "0.11.0",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
+          "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
           "dev": true
-        },
-        "jest-config": {
-          "version": "26.6.3",
-          "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",
-          "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
-          "dev": true,
-          "requires": {
-            "@babel/core": "^7.1.0",
-            "@jest/test-sequencer": "^26.6.3",
-            "@jest/types": "^26.6.2",
-            "babel-jest": "^26.6.3",
-            "chalk": "^4.0.0",
-            "deepmerge": "^4.2.2",
-            "glob": "^7.1.1",
-            "graceful-fs": "^4.2.4",
-            "jest-environment-jsdom": "^26.6.2",
-            "jest-environment-node": "^26.6.2",
-            "jest-get-type": "^26.3.0",
-            "jest-jasmine2": "^26.6.3",
-            "jest-regex-util": "^26.0.0",
-            "jest-resolve": "^26.6.2",
-            "jest-util": "^26.6.2",
-            "jest-validate": "^26.6.2",
-            "micromatch": "^4.0.2",
-            "pretty-format": "^26.6.2"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "ts-node": {
-          "version": "10.1.0",
-          "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.1.0.tgz",
-          "integrity": "sha512-6szn3+J9WyG2hE+5W8e0ruZrzyk1uFLYye6IGMBadnOzDh8aP7t8CbFpsfCiEx2+wMixAhjFt7lOZC4+l+WbEA==",
-          "dev": true,
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "@tsconfig/node10": "^1.0.7",
-            "@tsconfig/node12": "^1.0.7",
-            "@tsconfig/node14": "^1.0.0",
-            "@tsconfig/node16": "^1.0.1",
-            "arg": "^4.1.0",
-            "create-require": "^1.1.0",
-            "diff": "^4.0.1",
-            "make-error": "^1.1.1",
-            "source-map-support": "^0.5.17",
-            "yn": "3.1.1"
-          }
         }
       }
     },
     "@jest/environment": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.6.2.tgz",
-      "integrity": "sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.5.2.tgz",
+      "integrity": "sha512-YjhCD/Zhkz0/1vdlS/QN6QmuUdDkpgBdK4SdiVg4Y19e29g4VQYN5Xg8+YuHjdoWGY7wJHMxc79uDTeTOy9Ngw==",
       "dev": true,
       "requires": {
-        "@jest/fake-timers": "^26.6.2",
-        "@jest/types": "^26.6.2",
+        "@jest/fake-timers": "^26.5.2",
+        "@jest/types": "^26.5.2",
         "@types/node": "*",
-        "jest-mock": "^26.6.2"
+        "jest-mock": "^26.5.2"
       }
     },
     "@jest/fake-timers": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.6.2.tgz",
-      "integrity": "sha512-14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.5.2.tgz",
+      "integrity": "sha512-09Hn5Oraqt36V1akxQeWMVL0fR9c6PnEhpgLaYvREXZJAh2H2Y+QLCsl0g7uMoJeoWJAuz4tozk1prbR1Fc1sw==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.6.2",
+        "@jest/types": "^26.5.2",
         "@sinonjs/fake-timers": "^6.0.1",
         "@types/node": "*",
-        "jest-message-util": "^26.6.2",
-        "jest-mock": "^26.6.2",
-        "jest-util": "^26.6.2"
+        "jest-message-util": "^26.5.2",
+        "jest-mock": "^26.5.2",
+        "jest-util": "^26.5.2"
       }
     },
     "@jest/globals": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.6.2.tgz",
-      "integrity": "sha512-85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.5.2.tgz",
+      "integrity": "sha512-9PmnFsAUJxpPt1s/stq02acS1YHliVBDNfAWMe1bwdRr1iTCfhbNt3ERQXrO/ZfZSweftoA26Q/2yhSVSWQ3sw==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^26.6.2",
-        "@jest/types": "^26.6.2",
-        "expect": "^26.6.2"
+        "@jest/environment": "^26.5.2",
+        "@jest/types": "^26.5.2",
+        "expect": "^26.5.2"
       }
     },
     "@jest/reporters": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.6.2.tgz",
-      "integrity": "sha512-h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.5.2.tgz",
+      "integrity": "sha512-zvq6Wvy6MmJq/0QY0YfOPb49CXKSf42wkJbrBPkeypVa8I+XDxijvFuywo6TJBX/ILPrdrlE/FW9vJZh6Rf9vA==",
       "dev": true,
       "requires": {
         "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^26.6.2",
-        "@jest/test-result": "^26.6.2",
-        "@jest/transform": "^26.6.2",
-        "@jest/types": "^26.6.2",
+        "@jest/console": "^26.5.2",
+        "@jest/test-result": "^26.5.2",
+        "@jest/transform": "^26.5.2",
+        "@jest/types": "^26.5.2",
         "chalk": "^4.0.0",
         "collect-v8-coverage": "^1.0.0",
         "exit": "^0.1.2",
@@ -34160,73 +34524,51 @@
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^4.0.0",
         "istanbul-reports": "^3.0.2",
-        "jest-haste-map": "^26.6.2",
-        "jest-resolve": "^26.6.2",
-        "jest-util": "^26.6.2",
-        "jest-worker": "^26.6.2",
+        "jest-haste-map": "^26.5.2",
+        "jest-resolve": "^26.5.2",
+        "jest-util": "^26.5.2",
+        "jest-worker": "^26.5.0",
         "node-notifier": "^8.0.0",
         "slash": "^3.0.0",
         "source-map": "^0.6.0",
         "string-length": "^4.0.1",
         "terminal-link": "^2.0.0",
-        "v8-to-istanbul": "^7.0.0"
+        "v8-to-istanbul": "^5.0.1"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
         "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
         },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+        "jest-worker": {
+          "version": "26.5.0",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.5.0.tgz",
+          "integrity": "sha512-kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug==",
           "dev": true,
           "requires": {
-            "color-name": "~1.1.4"
+            "@types/node": "*",
+            "merge-stream": "^2.0.0",
+            "supports-color": "^7.0.0"
           }
         },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
         }
       }
     },
     "@jest/source-map": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.6.2.tgz",
-      "integrity": "sha512-YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA==",
+      "version": "26.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.5.0.tgz",
+      "integrity": "sha512-jWAw9ZwYHJMe9eZq/WrsHlwF8E3hM9gynlcDpOyCb9bR8wEd9ZNBZCi7/jZyzHxC7t3thZ10gO2IDhu0bPKS5g==",
       "dev": true,
       "requires": {
         "callsites": "^3.0.0",
@@ -34243,46 +34585,46 @@
       }
     },
     "@jest/test-result": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.6.2.tgz",
-      "integrity": "sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.5.2.tgz",
+      "integrity": "sha512-E/Zp6LURJEGSCWpoMGmCFuuEI1OWuI3hmZwmULV0GsgJBh7u0rwqioxhRU95euUuviqBDN8ruX/vP/4bwYolXw==",
       "dev": true,
       "requires": {
-        "@jest/console": "^26.6.2",
-        "@jest/types": "^26.6.2",
+        "@jest/console": "^26.5.2",
+        "@jest/types": "^26.5.2",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "collect-v8-coverage": "^1.0.0"
       }
     },
     "@jest/test-sequencer": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz",
-      "integrity": "sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.5.2.tgz",
+      "integrity": "sha512-XmGEh7hh07H2B8mHLFCIgr7gA5Y6Hw1ZATIsbz2fOhpnQ5AnQtZk0gmP0Q5/+mVB2xygO64tVFQxOajzoptkNA==",
       "dev": true,
       "requires": {
-        "@jest/test-result": "^26.6.2",
+        "@jest/test-result": "^26.5.2",
         "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^26.6.2",
-        "jest-runner": "^26.6.3",
-        "jest-runtime": "^26.6.3"
+        "jest-haste-map": "^26.5.2",
+        "jest-runner": "^26.5.2",
+        "jest-runtime": "^26.5.2"
       }
     },
     "@jest/transform": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.6.2.tgz",
-      "integrity": "sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.5.2.tgz",
+      "integrity": "sha512-AUNjvexh+APhhmS8S+KboPz+D3pCxPvEAGduffaAJYxIFxGi/ytZQkrqcKDUU0ERBAo5R7087fyOYr2oms1seg==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.1.0",
-        "@jest/types": "^26.6.2",
+        "@jest/types": "^26.5.2",
         "babel-plugin-istanbul": "^6.0.0",
         "chalk": "^4.0.0",
         "convert-source-map": "^1.4.0",
         "fast-json-stable-stringify": "^2.0.0",
         "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^26.6.2",
+        "jest-haste-map": "^26.5.2",
         "jest-regex-util": "^26.0.0",
-        "jest-util": "^26.6.2",
+        "jest-util": "^26.5.2",
         "micromatch": "^4.0.2",
         "pirates": "^4.0.1",
         "slash": "^3.0.0",
@@ -34290,61 +34632,28 @@
         "write-file-atomic": "^3.0.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
         "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
         },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
         }
       }
     },
     "@jest/types": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
-      "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.5.2.tgz",
+      "integrity": "sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==",
       "dev": true,
       "requires": {
         "@types/istanbul-lib-coverage": "^2.0.0",
@@ -34354,62 +34663,51 @@
         "chalk": "^4.0.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
         "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
         }
       }
     },
     "@jsdevtools/coverage-istanbul-loader": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@jsdevtools/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.5.tgz",
-      "integrity": "sha512-EUCPEkaRPvmHjWAAZkWMT7JDzpw7FKB00WTISaiXsbNOd5hCHg77XLA8sLYLFDo1zepYLo2w7GstN8YBqRXZfA==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@jsdevtools/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.3.tgz",
+      "integrity": "sha512-TAdNkeGB5Fe4Og+ZkAr1Kvn9by2sfL44IAHFtxlh1BA1XJ5cLpO9iSNki5opWESv3l3vSHsZ9BNKuqFKbEbFaA==",
       "dev": true,
       "requires": {
         "convert-source-map": "^1.7.0",
-        "istanbul-lib-instrument": "^4.0.3",
-        "loader-utils": "^2.0.0",
+        "istanbul-lib-instrument": "^4.0.1",
+        "loader-utils": "^1.4.0",
         "merge-source-map": "^1.1.0",
-        "schema-utils": "^2.7.0"
+        "schema-utils": "^2.6.4"
+      },
+      "dependencies": {
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
+        "loader-utils": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
+        }
       }
     },
     "@moodlehq/cordova-plugin-file-transfer": {
@@ -34456,33 +34754,34 @@
       }
     },
     "@ngtools/webpack": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-11.2.14.tgz",
-      "integrity": "sha512-6q57tEWtUJRsxfTKE19L20iXvNesfVy8hrVdyzVk64DZQh0lIl4/xZT4d5bJCWOuQQDaAeZK4YbEFcYJn7k1yw==",
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-10.0.8.tgz",
+      "integrity": "sha512-Qv4v7O4VGeWuXjRThd/mdC2I4cJOgQ7kDrVN7vkDB2EW5xtRB+/4hghvFeO3bD11FLuFvCxBMb0HbwyKoVQgEQ==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "11.2.14",
-        "enhanced-resolve": "5.7.0",
-        "webpack-sources": "2.2.0"
+        "@angular-devkit/core": "10.0.8",
+        "enhanced-resolve": "4.1.1",
+        "rxjs": "6.5.5",
+        "webpack-sources": "1.4.3"
       },
       "dependencies": {
         "@angular-devkit/core": {
-          "version": "11.2.14",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
-          "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
+          "version": "10.0.8",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
+          "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
           "dev": true,
           "requires": {
-            "ajv": "6.12.6",
+            "ajv": "6.12.3",
             "fast-json-stable-stringify": "2.1.0",
             "magic-string": "0.25.7",
-            "rxjs": "6.6.3",
+            "rxjs": "6.5.5",
             "source-map": "0.7.3"
           }
         },
         "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "version": "6.12.3",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+          "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
@@ -34490,27 +34789,6 @@
             "json-schema-traverse": "^0.4.1",
             "uri-js": "^4.2.2"
           }
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        },
-        "rxjs": {
-          "version": "6.6.3",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
-          "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
-          "dev": true,
-          "requires": {
-            "tslib": "^1.9.0"
-          }
-        },
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-          "dev": true
         }
       }
     },
@@ -34531,33 +34809,28 @@
       }
     },
     "@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz",
+      "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==",
       "requires": {
-        "@nodelib/fs.stat": "2.0.5",
+        "@nodelib/fs.stat": "2.0.3",
         "run-parallel": "^1.1.9"
       }
     },
     "@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz",
+      "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA=="
     },
     "@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz",
+      "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==",
       "requires": {
-        "@nodelib/fs.scandir": "2.1.5",
+        "@nodelib/fs.scandir": "2.1.3",
         "fastq": "^1.6.0"
       }
     },
-    "@npmcli/ci-detect": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/ci-detect/-/ci-detect-1.3.0.tgz",
-      "integrity": "sha512-oN3y7FAROHhrAt7Rr7PnTSwrHrZVRTS2ZbyxeQwSSYD0ifwM3YNgQqbaRmjcWoPyq77MjchusjJDspbzMmip1Q=="
-    },
     "@npmcli/git": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-2.1.0.tgz",
@@ -34586,6 +34859,11 @@
             "lru-cache": "^6.0.0"
           }
         },
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
+        },
         "npm-package-arg": {
           "version": "8.1.5",
           "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.5.tgz",
@@ -34616,11 +34894,6 @@
             "retry": "^0.12.0"
           }
         },
-        "retry": {
-          "version": "0.12.0",
-          "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
-          "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs="
-        },
         "semver": {
           "version": "7.3.5",
           "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
@@ -34641,12 +34914,18 @@
       }
     },
     "@npmcli/move-file": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz",
-      "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.0.1.tgz",
+      "integrity": "sha512-Uv6h1sT+0DrblvIrolFtbvM1FgWm+/sy4B3pvLp67Zys+thcukzS5ekn7HsZFGpWP4Q3fYJCljbWQE/XivMRLw==",
       "requires": {
-        "mkdirp": "^1.0.4",
-        "rimraf": "^3.0.2"
+        "mkdirp": "^1.0.4"
+      },
+      "dependencies": {
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
+        }
       }
     },
     "@npmcli/node-gyp": {
@@ -34672,58 +34951,35 @@
         "infer-owner": "^1.0.4",
         "node-gyp": "^7.1.0",
         "read-package-json-fast": "^2.0.1"
-      },
-      "dependencies": {
-        "read-package-json-fast": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz",
-          "integrity": "sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ==",
-          "requires": {
-            "json-parse-even-better-errors": "^2.3.0",
-            "npm-normalize-package-bin": "^1.0.1"
-          }
-        }
       }
     },
     "@schematics/angular": {
-      "version": "11.2.14",
-      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-11.2.14.tgz",
-      "integrity": "sha512-nErn5BFYp4HB7mOkt23kF+dyM6zPxolejM8eXQ5vd/rdhcc6ROaMZ0EmeEAWkfqB3+vqaSDz/D2Nm/IjJlyW/Q==",
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-10.0.8.tgz",
+      "integrity": "sha512-KNO61UGtiKMQSG+NbusqLtwLbxId0y+xpXJt9PKFwi+vaViOO+YzOPREfiFCuQ7q6X8SmNlrMj6sZ34E2YN1pQ==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "11.2.14",
-        "@angular-devkit/schematics": "11.2.14",
-        "jsonc-parser": "3.0.0"
+        "@angular-devkit/core": "10.0.8",
+        "@angular-devkit/schematics": "10.0.8"
       },
       "dependencies": {
         "@angular-devkit/core": {
-          "version": "11.2.14",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
-          "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
+          "version": "10.0.8",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
+          "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
           "dev": true,
           "requires": {
-            "ajv": "6.12.6",
+            "ajv": "6.12.3",
             "fast-json-stable-stringify": "2.1.0",
             "magic-string": "0.25.7",
-            "rxjs": "6.6.3",
+            "rxjs": "6.5.5",
             "source-map": "0.7.3"
           }
         },
-        "@angular-devkit/schematics": {
-          "version": "11.2.14",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.14.tgz",
-          "integrity": "sha512-Ol6+0qdGKzuVJm5gCtQr47X0OCihTfAxI4h047cHYhPFIGGPSvkG/QeJMZugflgoobi2k/xcYokOu/VAkRtWbQ==",
-          "dev": true,
-          "requires": {
-            "@angular-devkit/core": "11.2.14",
-            "ora": "5.3.0",
-            "rxjs": "6.6.3"
-          }
-        },
         "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "version": "6.12.3",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+          "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
@@ -34731,80 +34987,43 @@
             "json-schema-traverse": "^0.4.1",
             "uri-js": "^4.2.2"
           }
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        },
-        "jsonc-parser": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
-          "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==",
-          "dev": true
-        },
-        "rxjs": {
-          "version": "6.6.3",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
-          "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
-          "dev": true,
-          "requires": {
-            "tslib": "^1.9.0"
-          }
-        },
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-          "dev": true
         }
       }
     },
     "@schematics/update": {
-      "version": "0.1102.14",
-      "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.1102.14.tgz",
-      "integrity": "sha512-OsWuC0iyNjpST1+hVUUZAegXAFpEFpS5uKYSQF3jsbyw8XHx7oA5/HbEwyr2WkX2EdV1tKrDLz6BrD5b8W6EYw==",
+      "version": "0.1000.8",
+      "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.1000.8.tgz",
+      "integrity": "sha512-xHuj6ME3PNTsVUrpftd98LF3WHPM0NU25GcT/n0E/j0/52yDTiaPS3wUnYSK8ZSv4Et4hcyGx7f/LEXAoOKJXw==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "11.2.14",
-        "@angular-devkit/schematics": "11.2.14",
+        "@angular-devkit/core": "10.0.8",
+        "@angular-devkit/schematics": "10.0.8",
         "@yarnpkg/lockfile": "1.1.0",
-        "ini": "2.0.0",
+        "ini": "1.3.5",
         "npm-package-arg": "^8.0.0",
-        "pacote": "11.2.4",
-        "semver": "7.3.4",
+        "pacote": "9.5.12",
+        "rxjs": "6.5.5",
+        "semver": "7.3.2",
         "semver-intersect": "1.4.0"
       },
       "dependencies": {
         "@angular-devkit/core": {
-          "version": "11.2.14",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.14.tgz",
-          "integrity": "sha512-Ad1fHqLxDwhkQgLPqq9i+G65NSOoIHXQx7ILcSPACKurV3XLS1RO9BgP/BDaqHAG+WslUAPbMStaTzzPm+9dNw==",
+          "version": "10.0.8",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
+          "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
           "dev": true,
           "requires": {
-            "ajv": "6.12.6",
+            "ajv": "6.12.3",
             "fast-json-stable-stringify": "2.1.0",
             "magic-string": "0.25.7",
-            "rxjs": "6.6.3",
+            "rxjs": "6.5.5",
             "source-map": "0.7.3"
           }
         },
-        "@angular-devkit/schematics": {
-          "version": "11.2.14",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.14.tgz",
-          "integrity": "sha512-Ol6+0qdGKzuVJm5gCtQr47X0OCihTfAxI4h047cHYhPFIGGPSvkG/QeJMZugflgoobi2k/xcYokOu/VAkRtWbQ==",
-          "dev": true,
-          "requires": {
-            "@angular-devkit/core": "11.2.14",
-            "ora": "5.3.0",
-            "rxjs": "6.6.3"
-          }
-        },
         "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "version": "6.12.3",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+          "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
@@ -34812,27 +35031,6 @@
             "json-schema-traverse": "^0.4.1",
             "uri-js": "^4.2.2"
           }
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        },
-        "rxjs": {
-          "version": "6.6.3",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
-          "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
-          "dev": true,
-          "requires": {
-            "tslib": "^1.9.0"
-          }
-        },
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-          "dev": true
         }
       }
     },
@@ -34842,9 +35040,9 @@
       "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="
     },
     "@sinonjs/commons": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
-      "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.1.tgz",
+      "integrity": "sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw==",
       "dev": true,
       "requires": {
         "type-detect": "4.0.8"
@@ -34860,9 +35058,9 @@
       }
     },
     "@stencil/core": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.6.0.tgz",
-      "integrity": "sha512-QsxWayZyusnqSZrlCl81R71rA3KqFjVVQSH4E0rGN15F1GdQaFonKlHLyCOLKLig1zzC+DQkLLiUuocexuvdeQ=="
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.5.2.tgz",
+      "integrity": "sha512-bgjPXkSzzg1WnTgVUm6m5ZzpKt602WmA/QljODAW1xVN40OHJdbGblzF/F6MFzqv2c5Cy30CB41arc8qADIdcQ=="
     },
     "@szmarczak/http-timer": {
       "version": "1.1.2",
@@ -34877,48 +35075,10 @@
       "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
       "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="
     },
-    "@trysound/sax": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.1.1.tgz",
-      "integrity": "sha512-Z6DoceYb/1xSg5+e+ZlPZ9v0N16ZvZ+wYMraFue4HYrE4ttONKtsvruIRf6t9TBR0YvSOfi1hUU0fJfBLCDYow==",
-      "dev": true
-    },
-    "@tsconfig/node10": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz",
-      "integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "@tsconfig/node12": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz",
-      "integrity": "sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "@tsconfig/node14": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz",
-      "integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "@tsconfig/node16": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz",
-      "integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
     "@types/babel__core": {
-      "version": "7.1.15",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.15.tgz",
-      "integrity": "sha512-bxlMKPDbY8x5h6HBwVzEOk2C8fb6SLfYQ5Jw3uBYuYF1lfWk/kbLd81la82vrIkBb0l+JdmrZaDikPrNxpS/Ew==",
+      "version": "7.1.10",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.10.tgz",
+      "integrity": "sha512-x8OM8XzITIMyiwl5Vmo2B1cR1S1Ipkyv4mdlbJjMa1lmuKvKY9FrBbEANIaMlnWn5Rf7uO+rC/VgYabNkE17Hw==",
       "dev": true,
       "requires": {
         "@babel/parser": "^7.1.0",
@@ -34929,18 +35089,18 @@
       }
     },
     "@types/babel__generator": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.3.tgz",
-      "integrity": "sha512-/GWCmzJWqV7diQW54smJZzWbSFf4QYtF71WCKhcx6Ru/tFyQIY2eiiITcCAeuPbNSvT9YCGkVMqqvSk2Z0mXiA==",
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.2.tgz",
+      "integrity": "sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ==",
       "dev": true,
       "requires": {
         "@babel/types": "^7.0.0"
       }
     },
     "@types/babel__template": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
-      "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.3.tgz",
+      "integrity": "sha512-uCoznIPDmnickEi6D0v11SBpW0OuVqHJCa7syXqQHy5uktSCreIlt0iglsCnmvz8yCb38hGcWeseA8cWJSwv5Q==",
       "dev": true,
       "requires": {
         "@babel/parser": "^7.1.0",
@@ -34948,18 +35108,18 @@
       }
     },
     "@types/babel__traverse": {
-      "version": "7.14.2",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.14.2.tgz",
-      "integrity": "sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==",
+      "version": "7.0.15",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.15.tgz",
+      "integrity": "sha512-Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A==",
       "dev": true,
       "requires": {
         "@babel/types": "^7.3.0"
       }
     },
     "@types/chart.js": {
-      "version": "2.9.34",
-      "resolved": "https://registry.npmjs.org/@types/chart.js/-/chart.js-2.9.34.tgz",
-      "integrity": "sha512-CtZVk+kh1IN67dv+fB0CWmCLCRrDJgqOj15qPic2B1VCMovNO6B7Vhf/TgPpNscjhAL1j+qUntDMWb9A4ZmPTg==",
+      "version": "2.9.31",
+      "resolved": "https://registry.npmjs.org/@types/chart.js/-/chart.js-2.9.31.tgz",
+      "integrity": "sha512-hzS6phN/kx3jClk3iYqEHNnYIRSi4RZrIGJ8CDLjgatpHoftCezvC44uqB3o3OUm9ftU1m7sHG8+RLyPTlACrA==",
       "requires": {
         "moment": "^2.10.2"
       }
@@ -34970,20 +35130,20 @@
       "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
     },
     "@types/dom-mediacapture-record": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/@types/dom-mediacapture-record/-/dom-mediacapture-record-1.0.10.tgz",
-      "integrity": "sha512-8O84hHuVhMMLHLybf3y9SQpNcnQSuzVzcJaUNq9+4Ovb7fodS0aQXep4hyMtxd6fe/dyszbHFjFqtyawf4y46A=="
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/@types/dom-mediacapture-record/-/dom-mediacapture-record-1.0.7.tgz",
+      "integrity": "sha512-ddDIRTO1ajtbxaNo2o7fPJggpN54PZf1ZUJKOjto2ENMJE/9GKUvaw3ZRuQzlS/p0E+PnIcssxfoqYJ4yiXSBw=="
     },
     "@types/faker": {
-      "version": "5.5.7",
-      "resolved": "https://registry.npmjs.org/@types/faker/-/faker-5.5.7.tgz",
-      "integrity": "sha512-ejzb61Q5zQTtS0ZIafgQ7ahO5ACzmGhG5PfX2hxWyth3k0/aysb4ZOxKQB8DbzwSPppA5jmFBwqnBxjv5hqI5Q==",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/@types/faker/-/faker-5.1.3.tgz",
+      "integrity": "sha512-7YTyCRoujZWYaCpDLslQJ8QzaFWFLZZ3mZ7Vfr/jJHascRmSd05pYteyt2FK4btF2vXyGq0obuoyLpcF99OvaA==",
       "dev": true
     },
     "@types/glob": {
-      "version": "7.1.4",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.4.tgz",
-      "integrity": "sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA==",
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
+      "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==",
       "dev": true,
       "requires": {
         "@types/minimatch": "*",
@@ -34991,9 +35151,9 @@
       }
     },
     "@types/graceful-fs": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
-      "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.3.tgz",
+      "integrity": "sha512-AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ==",
       "dev": true,
       "requires": {
         "@types/node": "*"
@@ -35015,54 +35175,136 @@
       }
     },
     "@types/istanbul-reports": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
-      "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
+      "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
       "dev": true,
       "requires": {
         "@types/istanbul-lib-report": "*"
       }
     },
+    "@types/jest": {
+      "version": "26.0.14",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.14.tgz",
+      "integrity": "sha512-Hz5q8Vu0D288x3iWXePSn53W7hAjP0H7EQ6QvDO9c7t46mR0lNOLlfuwQ+JkVxuhygHzlzPX+0jKdA3ZgSh+Vg==",
+      "dev": true,
+      "requires": {
+        "jest-diff": "^25.2.1",
+        "pretty-format": "^25.2.1"
+      },
+      "dependencies": {
+        "@jest/types": {
+          "version": "25.5.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
+          "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^1.1.1",
+            "@types/yargs": "^15.0.0",
+            "chalk": "^3.0.0"
+          }
+        },
+        "@types/istanbul-reports": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
+          "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "*",
+            "@types/istanbul-lib-report": "*"
+          }
+        },
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "dev": true
+        },
+        "diff-sequences": {
+          "version": "25.2.6",
+          "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz",
+          "integrity": "sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==",
+          "dev": true
+        },
+        "jest-diff": {
+          "version": "25.5.0",
+          "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz",
+          "integrity": "sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==",
+          "dev": true,
+          "requires": {
+            "chalk": "^3.0.0",
+            "diff-sequences": "^25.2.6",
+            "jest-get-type": "^25.2.6",
+            "pretty-format": "^25.5.0"
+          }
+        },
+        "jest-get-type": {
+          "version": "25.2.6",
+          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz",
+          "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==",
+          "dev": true
+        },
+        "pretty-format": {
+          "version": "25.5.0",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz",
+          "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^25.5.0",
+            "ansi-regex": "^5.0.0",
+            "ansi-styles": "^4.0.0",
+            "react-is": "^16.12.0"
+          }
+        }
+      }
+    },
     "@types/json-schema": {
-      "version": "7.0.8",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.8.tgz",
-      "integrity": "sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz",
+      "integrity": "sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==",
+      "dev": true
+    },
+    "@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
       "dev": true
     },
     "@types/minimatch": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
-      "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
+      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
       "dev": true
     },
     "@types/node": {
-      "version": "12.20.18",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.18.tgz",
-      "integrity": "sha512-YoTiIwdKxM3VLiY2sM05x4iGuTveYiCcDaUVmo1L5ndrXxPGW/NEoZu+pGcBirziomizcZsnsQoemikKcB2fRA==",
+      "version": "12.12.64",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.64.tgz",
+      "integrity": "sha512-UV1/ZJMC+HcP902wWdpC43cAcGu0IQk/I5bXjP2aSuCjsk3cE74mDvFrLKga7oDC170ugOAYBwfT4DSQW3akDA==",
       "dev": true
     },
     "@types/normalize-package-data": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
-      "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
-      "dev": true
-    },
-    "@types/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
+      "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
       "dev": true
     },
     "@types/prettier": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.3.2.tgz",
-      "integrity": "sha512-eI5Yrz3Qv4KPUa/nSIAi0h+qX0XyewOliug5F2QAtuRg6Kjg6jfmxe1GIwoIRhZspD1A0RP8ANrPwvEXXtRFog==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.1.1.tgz",
+      "integrity": "sha512-2zs+O+UkDsJ1Vcp667pd3f8xearMdopz/z54i99wtRDI5KLmngk7vlrYZD0ZjKHaROR03EznlBbVY9PfAEyJIQ==",
+      "dev": true
+    },
+    "@types/q": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz",
+      "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==",
       "dev": true
     },
     "@types/resize-observer-browser": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/@types/resize-observer-browser/-/resize-observer-browser-0.1.6.tgz",
-      "integrity": "sha512-61IfTac0s9jvNtBCpyo86QeaN8qqpMGHdK0uGKCCIy2dt5/Yk84VduHIdWAcmkC5QvdkPL0p5eWYgUZtHKKUVg==",
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/@types/resize-observer-browser/-/resize-observer-browser-0.1.5.tgz",
+      "integrity": "sha512-8k/67Z95Goa6Lznuykxkfhq9YU3l1Qe6LNZmwde1u7802a3x8v44oq0j91DICclxatTr0rNnhXx7+VTIetSrSQ==",
       "dev": true
     },
     "@types/source-list-map": {
@@ -35072,21 +35314,21 @@
       "dev": true
     },
     "@types/stack-utils": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
-      "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.0.tgz",
+      "integrity": "sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==",
       "dev": true
     },
     "@types/webpack-env": {
-      "version": "1.16.2",
-      "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.16.2.tgz",
-      "integrity": "sha512-vKx7WNQNZDyJveYcHAm9ZxhqSGLYwoyLhrHjLBOkw3a7cT76sTdjgtwyijhk1MaHyRIuSztcVwrUOO/NEu68Dw==",
+      "version": "1.16.0",
+      "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.16.0.tgz",
+      "integrity": "sha512-Fx+NpfOO0CpeYX2g9bkvX8O5qh9wrU1sOF4g8sft4Mu7z+qfe387YlyY8w8daDyDsKY5vUxM0yxkAYnbkRbZEw==",
       "dev": true
     },
     "@types/webpack-sources": {
-      "version": "0.1.9",
-      "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.9.tgz",
-      "integrity": "sha512-bvzMnzqoK16PQIC8AYHNdW45eREJQMd6WG/msQWX5V2+vZmODCOPb4TJcbgRljTZZTwTM4wUMcsI8FftNA7new==",
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.8.tgz",
+      "integrity": "sha512-JHB2/xZlXOjzjBB6fMOpH1eQAfsrpqVVIbneE0Rok16WXwFaznaI5vfg75U5WgGJm7V9W1c4xeRQDjX/zwvghA==",
       "dev": true,
       "requires": {
         "@types/node": "*",
@@ -35103,202 +35345,238 @@
       }
     },
     "@types/yargs": {
-      "version": "15.0.14",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.14.tgz",
-      "integrity": "sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==",
+      "version": "15.0.7",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.7.tgz",
+      "integrity": "sha512-Gf4u3EjaPNcC9cTu4/j2oN14nSVhr8PQ+BvBcBQHAhDZfl0bVIiLgvnRXv/dn58XhTm9UXvBpvJpDlwV65QxOA==",
       "dev": true,
       "requires": {
         "@types/yargs-parser": "*"
       }
     },
     "@types/yargs-parser": {
-      "version": "20.2.1",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz",
-      "integrity": "sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==",
+      "version": "15.0.0",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz",
+      "integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==",
       "dev": true
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "4.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.0.tgz",
-      "integrity": "sha512-eiREtqWRZ8aVJcNru7cT/AMVnYd9a2UHsfZT8MR1dW3UUEg6jDv9EQ9Cq4CUPZesyQ58YUpoAADGv71jY8RwgA==",
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.22.0.tgz",
+      "integrity": "sha512-U8SP9VOs275iDXaL08Ln1Fa/wLXfj5aTr/1c0t0j6CdbOnxh+TruXu1p4I0NAvdPBQgoPjHsgKn28mOi0FzfoA==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/experimental-utils": "4.29.0",
-        "@typescript-eslint/scope-manager": "4.29.0",
-        "debug": "^4.3.1",
+        "@typescript-eslint/experimental-utils": "4.22.0",
+        "@typescript-eslint/scope-manager": "4.22.0",
+        "debug": "^4.1.1",
         "functional-red-black-tree": "^1.0.1",
-        "regexpp": "^3.1.0",
-        "semver": "^7.3.5",
-        "tsutils": "^3.21.0"
+        "lodash": "^4.17.15",
+        "regexpp": "^3.0.0",
+        "semver": "^7.3.2",
+        "tsutils": "^3.17.1"
       },
       "dependencies": {
         "@typescript-eslint/experimental-utils": {
-          "version": "4.29.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.0.tgz",
-          "integrity": "sha512-FpNVKykfeaIxlArLUP/yQfv/5/3rhl1ov6RWgud4OgbqWLkEq7lqgQU9iiavZRzpzCRQV4XddyFz3wFXdkiX9w==",
+          "version": "4.22.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.22.0.tgz",
+          "integrity": "sha512-xJXHHl6TuAxB5AWiVrGhvbGL8/hbiCQ8FiWwObO3r0fnvBdrbWEDy1hlvGQOAWc6qsCWuWMKdVWlLAEMpxnddg==",
           "dev": true,
           "requires": {
-            "@types/json-schema": "^7.0.7",
-            "@typescript-eslint/scope-manager": "4.29.0",
-            "@typescript-eslint/types": "4.29.0",
-            "@typescript-eslint/typescript-estree": "4.29.0",
-            "eslint-scope": "^5.1.1",
-            "eslint-utils": "^3.0.0"
+            "@types/json-schema": "^7.0.3",
+            "@typescript-eslint/scope-manager": "4.22.0",
+            "@typescript-eslint/types": "4.22.0",
+            "@typescript-eslint/typescript-estree": "4.22.0",
+            "eslint-scope": "^5.0.0",
+            "eslint-utils": "^2.0.0"
+          }
+        },
+        "@typescript-eslint/scope-manager": {
+          "version": "4.22.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.22.0.tgz",
+          "integrity": "sha512-OcCO7LTdk6ukawUM40wo61WdeoA7NM/zaoq1/2cs13M7GyiF+T4rxuA4xM+6LeHWjWbss7hkGXjFDRcKD4O04Q==",
+          "dev": true,
+          "requires": {
+            "@typescript-eslint/types": "4.22.0",
+            "@typescript-eslint/visitor-keys": "4.22.0"
           }
         },
         "@typescript-eslint/types": {
-          "version": "4.29.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.0.tgz",
-          "integrity": "sha512-2YJM6XfWfi8pgU2HRhTp7WgRw78TCRO3dOmSpAvIQ8MOv4B46JD2chnhpNT7Jq8j0APlIbzO1Bach734xxUl4A==",
+          "version": "4.22.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.22.0.tgz",
+          "integrity": "sha512-sW/BiXmmyMqDPO2kpOhSy2Py5w6KvRRsKZnV0c4+0nr4GIcedJwXAq+RHNK4lLVEZAJYFltnnk1tJSlbeS9lYA==",
           "dev": true
         },
         "@typescript-eslint/typescript-estree": {
-          "version": "4.29.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.0.tgz",
-          "integrity": "sha512-8ZpNHDIOyqzzgZrQW9+xQ4k5hM62Xy2R4RPO3DQxMc5Rq5QkCdSpk/drka+DL9w6sXNzV5nrdlBmf8+x495QXQ==",
+          "version": "4.22.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.0.tgz",
+          "integrity": "sha512-TkIFeu5JEeSs5ze/4NID+PIcVjgoU3cUQUIZnH3Sb1cEn1lBo7StSV5bwPuJQuoxKXlzAObjYTilOEKRuhR5yg==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "4.29.0",
-            "@typescript-eslint/visitor-keys": "4.29.0",
-            "debug": "^4.3.1",
-            "globby": "^11.0.3",
+            "@typescript-eslint/types": "4.22.0",
+            "@typescript-eslint/visitor-keys": "4.22.0",
+            "debug": "^4.1.1",
+            "globby": "^11.0.1",
             "is-glob": "^4.0.1",
-            "semver": "^7.3.5",
-            "tsutils": "^3.21.0"
+            "semver": "^7.3.2",
+            "tsutils": "^3.17.1"
           }
         },
-        "eslint-utils": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-          "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+        "@typescript-eslint/visitor-keys": {
+          "version": "4.22.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.0.tgz",
+          "integrity": "sha512-nnMu4F+s4o0sll6cBSsTeVsT4cwxB7zECK3dFxzEjPBii9xLpq4yqqsy/FU5zMfan6G60DKZSCXAa3sHJZrcYw==",
           "dev": true,
           "requires": {
+            "@typescript-eslint/types": "4.22.0",
             "eslint-visitor-keys": "^2.0.0"
           }
         },
-        "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
           "dev": true,
           "requires": {
-            "lru-cache": "^6.0.0"
+            "ms": "2.1.2"
           }
+        },
+        "eslint-scope": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+          "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+          "dev": true,
+          "requires": {
+            "esrecurse": "^4.3.0",
+            "estraverse": "^4.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
         }
       }
     },
     "@typescript-eslint/experimental-utils": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.16.1.tgz",
-      "integrity": "sha512-0Hm3LSlMYFK17jO4iY3un1Ve9x1zLNn4EM50Lia+0EV99NdbK+cn0er7HC7IvBA23mBg3P+8dUkMXy4leL33UQ==",
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.22.0.tgz",
+      "integrity": "sha512-xJXHHl6TuAxB5AWiVrGhvbGL8/hbiCQ8FiWwObO3r0fnvBdrbWEDy1hlvGQOAWc6qsCWuWMKdVWlLAEMpxnddg==",
       "dev": true,
       "requires": {
         "@types/json-schema": "^7.0.3",
-        "@typescript-eslint/scope-manager": "4.16.1",
-        "@typescript-eslint/types": "4.16.1",
-        "@typescript-eslint/typescript-estree": "4.16.1",
+        "@typescript-eslint/scope-manager": "4.22.0",
+        "@typescript-eslint/types": "4.22.0",
+        "@typescript-eslint/typescript-estree": "4.22.0",
         "eslint-scope": "^5.0.0",
         "eslint-utils": "^2.0.0"
       },
       "dependencies": {
-        "@typescript-eslint/scope-manager": {
-          "version": "4.16.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.16.1.tgz",
-          "integrity": "sha512-6IlZv9JaurqV0jkEg923cV49aAn8V6+1H1DRfhRcvZUrptQ+UtSKHb5kwTayzOYTJJ/RsYZdcvhOEKiBLyc0Cw==",
+        "eslint-scope": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+          "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "4.16.1",
-            "@typescript-eslint/visitor-keys": "4.16.1"
-          }
-        },
-        "@typescript-eslint/visitor-keys": {
-          "version": "4.16.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.16.1.tgz",
-          "integrity": "sha512-s/aIP1XcMkEqCNcPQtl60ogUYjSM8FU2mq1O7y5cFf3Xcob1z1iXWNB6cC43Op+NGRTFgGolri6s8z/efA9i1w==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "4.16.1",
-            "eslint-visitor-keys": "^2.0.0"
+            "esrecurse": "^4.3.0",
+            "estraverse": "^4.1.1"
           }
         }
       }
     },
     "@typescript-eslint/parser": {
-      "version": "4.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.29.0.tgz",
-      "integrity": "sha512-+92YRNHFdXgq+GhWQPT2bmjX09X7EH36JfgN2/4wmhtwV/HPxozpCNst8jrWcngLtEVd/4zAwA6BKojAlf+YqA==",
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.22.0.tgz",
+      "integrity": "sha512-z/bGdBJJZJN76nvAY9DkJANYgK3nlRstRRi74WHm3jjgf2I8AglrSY+6l7ogxOmn55YJ6oKZCLLy+6PW70z15Q==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "4.29.0",
-        "@typescript-eslint/types": "4.29.0",
-        "@typescript-eslint/typescript-estree": "4.29.0",
-        "debug": "^4.3.1"
+        "@typescript-eslint/scope-manager": "4.22.0",
+        "@typescript-eslint/types": "4.22.0",
+        "@typescript-eslint/typescript-estree": "4.22.0",
+        "debug": "^4.1.1"
       },
       "dependencies": {
+        "@typescript-eslint/scope-manager": {
+          "version": "4.22.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.22.0.tgz",
+          "integrity": "sha512-OcCO7LTdk6ukawUM40wo61WdeoA7NM/zaoq1/2cs13M7GyiF+T4rxuA4xM+6LeHWjWbss7hkGXjFDRcKD4O04Q==",
+          "dev": true,
+          "requires": {
+            "@typescript-eslint/types": "4.22.0",
+            "@typescript-eslint/visitor-keys": "4.22.0"
+          }
+        },
         "@typescript-eslint/types": {
-          "version": "4.29.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.0.tgz",
-          "integrity": "sha512-2YJM6XfWfi8pgU2HRhTp7WgRw78TCRO3dOmSpAvIQ8MOv4B46JD2chnhpNT7Jq8j0APlIbzO1Bach734xxUl4A==",
+          "version": "4.22.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.22.0.tgz",
+          "integrity": "sha512-sW/BiXmmyMqDPO2kpOhSy2Py5w6KvRRsKZnV0c4+0nr4GIcedJwXAq+RHNK4lLVEZAJYFltnnk1tJSlbeS9lYA==",
           "dev": true
         },
         "@typescript-eslint/typescript-estree": {
-          "version": "4.29.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.0.tgz",
-          "integrity": "sha512-8ZpNHDIOyqzzgZrQW9+xQ4k5hM62Xy2R4RPO3DQxMc5Rq5QkCdSpk/drka+DL9w6sXNzV5nrdlBmf8+x495QXQ==",
+          "version": "4.22.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.0.tgz",
+          "integrity": "sha512-TkIFeu5JEeSs5ze/4NID+PIcVjgoU3cUQUIZnH3Sb1cEn1lBo7StSV5bwPuJQuoxKXlzAObjYTilOEKRuhR5yg==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "4.29.0",
-            "@typescript-eslint/visitor-keys": "4.29.0",
-            "debug": "^4.3.1",
-            "globby": "^11.0.3",
+            "@typescript-eslint/types": "4.22.0",
+            "@typescript-eslint/visitor-keys": "4.22.0",
+            "debug": "^4.1.1",
+            "globby": "^11.0.1",
             "is-glob": "^4.0.1",
-            "semver": "^7.3.5",
-            "tsutils": "^3.21.0"
+            "semver": "^7.3.2",
+            "tsutils": "^3.17.1"
           }
         },
-        "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+        "@typescript-eslint/visitor-keys": {
+          "version": "4.22.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.0.tgz",
+          "integrity": "sha512-nnMu4F+s4o0sll6cBSsTeVsT4cwxB7zECK3dFxzEjPBii9xLpq4yqqsy/FU5zMfan6G60DKZSCXAa3sHJZrcYw==",
           "dev": true,
           "requires": {
-            "lru-cache": "^6.0.0"
+            "@typescript-eslint/types": "4.22.0",
+            "eslint-visitor-keys": "^2.0.0"
           }
+        },
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
         }
       }
     },
     "@typescript-eslint/scope-manager": {
-      "version": "4.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.29.0.tgz",
-      "integrity": "sha512-HPq7XAaDMM3DpmuijxLV9Io8/6pQnliiXMQUcAdjpJJSR+fdmbD/zHCd7hMkjJn04UQtCQBtshgxClzg6NIS2w==",
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.22.0.tgz",
+      "integrity": "sha512-OcCO7LTdk6ukawUM40wo61WdeoA7NM/zaoq1/2cs13M7GyiF+T4rxuA4xM+6LeHWjWbss7hkGXjFDRcKD4O04Q==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "4.29.0",
-        "@typescript-eslint/visitor-keys": "4.29.0"
-      },
-      "dependencies": {
-        "@typescript-eslint/types": {
-          "version": "4.29.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.0.tgz",
-          "integrity": "sha512-2YJM6XfWfi8pgU2HRhTp7WgRw78TCRO3dOmSpAvIQ8MOv4B46JD2chnhpNT7Jq8j0APlIbzO1Bach734xxUl4A==",
-          "dev": true
-        }
+        "@typescript-eslint/types": "4.22.0",
+        "@typescript-eslint/visitor-keys": "4.22.0"
       }
     },
     "@typescript-eslint/types": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.16.1.tgz",
-      "integrity": "sha512-nnKqBwMgRlhzmJQF8tnFDZWfunXmJyuXj55xc8Kbfup4PbkzdoDXZvzN8//EiKR27J6vUSU8j4t37yUuYPiLqA==",
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.22.0.tgz",
+      "integrity": "sha512-sW/BiXmmyMqDPO2kpOhSy2Py5w6KvRRsKZnV0c4+0nr4GIcedJwXAq+RHNK4lLVEZAJYFltnnk1tJSlbeS9lYA==",
       "dev": true
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.16.1.tgz",
-      "integrity": "sha512-m8I/DKHa8YbeHt31T+UGd/l8Kwr0XCTCZL3H4HMvvLCT7HU9V7yYdinTOv1gf/zfqNeDcCgaFH2BMsS8x6NvJg==",
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.0.tgz",
+      "integrity": "sha512-TkIFeu5JEeSs5ze/4NID+PIcVjgoU3cUQUIZnH3Sb1cEn1lBo7StSV5bwPuJQuoxKXlzAObjYTilOEKRuhR5yg==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "4.16.1",
-        "@typescript-eslint/visitor-keys": "4.16.1",
+        "@typescript-eslint/types": "4.22.0",
+        "@typescript-eslint/visitor-keys": "4.22.0",
         "debug": "^4.1.1",
         "globby": "^11.0.1",
         "is-glob": "^4.0.1",
@@ -35306,34 +35584,31 @@
         "tsutils": "^3.17.1"
       },
       "dependencies": {
-        "@typescript-eslint/visitor-keys": {
-          "version": "4.16.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.16.1.tgz",
-          "integrity": "sha512-s/aIP1XcMkEqCNcPQtl60ogUYjSM8FU2mq1O7y5cFf3Xcob1z1iXWNB6cC43Op+NGRTFgGolri6s8z/efA9i1w==",
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "4.16.1",
-            "eslint-visitor-keys": "^2.0.0"
+            "ms": "2.1.2"
           }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
         }
       }
     },
     "@typescript-eslint/visitor-keys": {
-      "version": "4.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.0.tgz",
-      "integrity": "sha512-LoaofO1C/jAJYs0uEpYMXfHboGXzOJeV118X4OsZu9f7rG7Pr9B3+4HTU8+err81rADa4xfQmAxnRnPAI2jp+Q==",
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.0.tgz",
+      "integrity": "sha512-nnMu4F+s4o0sll6cBSsTeVsT4cwxB7zECK3dFxzEjPBii9xLpq4yqqsy/FU5zMfan6G60DKZSCXAa3sHJZrcYw==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "4.29.0",
+        "@typescript-eslint/types": "4.22.0",
         "eslint-visitor-keys": "^2.0.0"
-      },
-      "dependencies": {
-        "@typescript-eslint/types": {
-          "version": "4.29.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.0.tgz",
-          "integrity": "sha512-2YJM6XfWfi8pgU2HRhTp7WgRw78TCRO3dOmSpAvIQ8MOv4B46JD2chnhpNT7Jq8j0APlIbzO1Bach734xxUl4A==",
-          "dev": true
-        }
       }
     },
     "@webassemblyjs/ast": {
@@ -35550,9 +35825,9 @@
       }
     },
     "acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "version": "6.4.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
+      "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
       "dev": true
     },
     "acorn-globals": {
@@ -35563,12 +35838,20 @@
       "requires": {
         "acorn": "^7.1.1",
         "acorn-walk": "^7.1.1"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "7.4.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+          "dev": true
+        }
       }
     },
     "acorn-jsx": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
+      "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
       "dev": true,
       "requires": {}
     },
@@ -35579,30 +35862,67 @@
       "dev": true
     },
     "adjust-sourcemap-loader": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz",
-      "integrity": "sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-2.0.0.tgz",
+      "integrity": "sha512-4hFsTsn58+YjrU9qKzML2JSSDqKvN8mUGQ0nNIrfPi8hmIONT4L3uUaT6MKdMsZ9AjsU6D2xDkZxCkbQPxChrA==",
       "dev": true,
       "requires": {
-        "loader-utils": "^2.0.0",
-        "regex-parser": "^2.2.11"
+        "assert": "1.4.1",
+        "camelcase": "5.0.0",
+        "loader-utils": "1.2.3",
+        "object-path": "0.11.4",
+        "regex-parser": "2.2.10"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz",
+          "integrity": "sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==",
+          "dev": true
+        },
+        "emojis-list": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
+          "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+          "dev": true
+        },
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
+        "loader-utils": {
+          "version": "1.2.3",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
+          "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^2.0.0",
+            "json5": "^1.0.1"
+          }
+        }
       }
     },
     "agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
+      "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
+      "dev": true,
       "requires": {
-        "debug": "4"
+        "es6-promisify": "^5.0.0"
       }
     },
     "agentkeepalive": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.1.4.tgz",
-      "integrity": "sha512-+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ==",
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.5.2.tgz",
+      "integrity": "sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==",
+      "dev": true,
       "requires": {
-        "debug": "^4.1.0",
-        "depd": "^1.1.2",
         "humanize-ms": "^1.2.1"
       }
     },
@@ -35616,14 +35936,13 @@
       }
     },
     "ajv": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.2.0.tgz",
-      "integrity": "sha512-WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA==",
-      "dev": true,
+      "version": "6.12.5",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz",
+      "integrity": "sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==",
       "requires": {
         "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
         "uri-js": "^4.2.2"
       }
     },
@@ -35634,15 +35953,12 @@
       "dev": true,
       "requires": {}
     },
-    "ajv-formats": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.0.2.tgz",
-      "integrity": "sha512-Brah4Uo5/U8v76c6euTwtjVFFaVishwnJrQBYpev1JRh4vjA1F4HY3UzQez41YUCszUCXKagG8v6eVRBHV1gkw==",
+    "ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
       "dev": true,
-      "peer": true,
-      "requires": {
-        "ajv": "^8.0.0"
-      }
+      "requires": {}
     },
     "alphanum-sort": {
       "version": "1.0.2",
@@ -35651,9 +35967,9 @@
       "dev": true
     },
     "android-versions": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-1.7.0.tgz",
-      "integrity": "sha512-TCy4b8Dk8YS6A23ZPfhSKqK66JHFq0D8avGYiwvYpjno6HrrcI0DRgHx9+jtkvWYmrsE2vQWgbHJhvGGhhOb0g==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-1.6.0.tgz",
+      "integrity": "sha512-ojC2Ig7b/KJ6iNtR8e4bacmOsJyEkoERk3CKMIsnH7kJz5z6551NMbrVaRb7KXYavu1d74Uhml/bfcmqT3nAcg==",
       "requires": {
         "semver": "^5.7.1"
       },
@@ -35678,21 +35994,6 @@
         "string-width": "^3.0.0"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
-        },
-        "emoji-regex": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
-        },
         "string-width": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
@@ -35702,21 +36003,13 @@
             "is-fullwidth-code-point": "^2.0.0",
             "strip-ansi": "^5.1.0"
           }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
         }
       }
     },
     "ansi-colors": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
+      "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
       "dev": true
     },
     "ansi-cyan": {
@@ -35729,13 +36022,9 @@
       }
     },
     "ansi-escapes": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-      "dev": true,
-      "requires": {
-        "type-fest": "^0.21.3"
-      }
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="
     },
     "ansi-gray": {
       "version": "0.1.1",
@@ -35762,16 +36051,16 @@
       }
     },
     "ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
     },
     "ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "requires": {
-        "color-convert": "^1.9.0"
+        "color-convert": "^2.0.1"
       }
     },
     "ansi-wrap": {
@@ -35781,9 +36070,9 @@
       "dev": true
     },
     "anymatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+      "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
       "dev": true,
       "requires": {
         "normalize-path": "^3.0.0",
@@ -35842,26 +36131,31 @@
       "requires": {
         "@babel/runtime": "^7.10.2",
         "@babel/runtime-corejs3": "^7.10.2"
-      }
-    },
-    "arr-diff": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
-      "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
-      "dev": true,
-      "requires": {
-        "arr-flatten": "^1.0.1",
-        "array-slice": "^0.2.3"
       },
       "dependencies": {
-        "array-slice": {
-          "version": "0.2.3",
-          "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
-          "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
-          "dev": true
+        "@babel/runtime": {
+          "version": "7.13.17",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.17.tgz",
+          "integrity": "sha512-NCdgJEelPTSh+FEFylhnP1ylq848l1z9t9N0j1Lfbcw0+KXGjsTvUmkxy+voLLXB5SOKMbLLx4jxYliGrYQseA==",
+          "dev": true,
+          "requires": {
+            "regenerator-runtime": "^0.13.4"
+          }
         }
       }
     },
+    "arity-n": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/arity-n/-/arity-n-1.0.4.tgz",
+      "integrity": "sha1-2edrEXM+CFacCEeuezmyhgswt0U=",
+      "dev": true
+    },
+    "arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+      "dev": true
+    },
     "arr-filter": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz",
@@ -35887,9 +36181,9 @@
       }
     },
     "arr-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
-      "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
       "dev": true
     },
     "array-each": {
@@ -35919,6 +36213,98 @@
         "es-abstract": "^1.18.0-next.2",
         "get-intrinsic": "^1.1.1",
         "is-string": "^1.0.5"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.18.0",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz",
+          "integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "get-intrinsic": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.2",
+            "is-callable": "^1.2.3",
+            "is-negative-zero": "^2.0.1",
+            "is-regex": "^1.1.2",
+            "is-string": "^1.0.5",
+            "object-inspect": "^1.9.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.2",
+            "string.prototype.trimend": "^1.0.4",
+            "string.prototype.trimstart": "^1.0.4",
+            "unbox-primitive": "^1.0.0"
+          }
+        },
+        "has-symbols": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+          "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+          "dev": true
+        },
+        "is-callable": {
+          "version": "1.2.3",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
+          "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
+          "dev": true
+        },
+        "is-negative-zero": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
+          "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
+          "dev": true
+        },
+        "is-regex": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
+          "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "has-symbols": "^1.0.1"
+          }
+        },
+        "object-inspect": {
+          "version": "1.10.2",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.2.tgz",
+          "integrity": "sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA==",
+          "dev": true
+        },
+        "object.assign": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+          "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.0",
+            "define-properties": "^1.1.3",
+            "has-symbols": "^1.0.1",
+            "object-keys": "^1.1.1"
+          }
+        },
+        "string.prototype.trimend": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
+          "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.3"
+          }
+        },
+        "string.prototype.trimstart": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
+          "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.3"
+          }
+        }
       }
     },
     "array-initial": {
@@ -35971,6 +36357,14 @@
         "default-compare": "^1.0.0",
         "get-value": "^2.0.6",
         "kind-of": "^5.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "dev": true
+        }
       }
     },
     "array-union": {
@@ -36001,6 +36395,12 @@
         "es-abstract": "^1.18.0-next.1"
       }
     },
+    "asap": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
+      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=",
+      "dev": true
+    },
     "asn1": {
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
@@ -36022,38 +36422,20 @@
       },
       "dependencies": {
         "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
           "dev": true
         }
       }
     },
     "assert": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
-      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
+      "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
       "dev": true,
       "requires": {
-        "object-assign": "^4.1.1",
         "util": "0.10.3"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
-          "dev": true
-        },
-        "util": {
-          "version": "0.10.3",
-          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
-          "dev": true,
-          "requires": {
-            "inherits": "2.0.1"
-          }
-        }
       }
     },
     "assert-plus": {
@@ -36140,24 +36522,69 @@
       "dev": true
     },
     "autoprefixer": {
-      "version": "10.2.4",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.2.4.tgz",
-      "integrity": "sha512-DCCdUQiMD+P/as8m3XkeTUkUKuuRqLGcwD0nll7wevhqoJfMRpJlkFd1+MQh1pvupjiQuip42lc/VFvfUTMSKw==",
+      "version": "9.8.0",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.0.tgz",
+      "integrity": "sha512-D96ZiIHXbDmU02dBaemyAg53ez+6F5yZmapmgKcjm35yEe1uVDYI8hGW3VYoGRaG290ZFf91YxHrR518vC0u/A==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.16.1",
-        "caniuse-lite": "^1.0.30001181",
-        "colorette": "^1.2.1",
-        "fraction.js": "^4.0.13",
+        "browserslist": "^4.12.0",
+        "caniuse-lite": "^1.0.30001061",
+        "chalk": "^2.4.2",
         "normalize-range": "^0.1.2",
+        "num2fraction": "^1.2.2",
+        "postcss": "^7.0.30",
         "postcss-value-parser": "^4.1.0"
       },
       "dependencies": {
-        "colorette": {
-          "version": "1.2.2",
-          "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
-          "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
           "dev": true
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
         }
       }
     },
@@ -36167,9 +36594,9 @@
       "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
     },
     "aws4": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
-      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz",
+      "integrity": "sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA=="
     },
     "axobject-query": {
       "version": "2.2.0",
@@ -36178,78 +36605,57 @@
       "dev": true
     },
     "babel-jest": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.6.3.tgz",
-      "integrity": "sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.5.2.tgz",
+      "integrity": "sha512-U3KvymF3SczA3vOL/cgiUFOznfMET+XDIXiWnoJV45siAp2pLMG8i2+/MGZlAC3f/F6Q40LR4M4qDrWZ9wkK8A==",
       "dev": true,
       "requires": {
-        "@jest/transform": "^26.6.2",
-        "@jest/types": "^26.6.2",
+        "@jest/transform": "^26.5.2",
+        "@jest/types": "^26.5.2",
         "@types/babel__core": "^7.1.7",
         "babel-plugin-istanbul": "^6.0.0",
-        "babel-preset-jest": "^26.6.2",
+        "babel-preset-jest": "^26.5.0",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.4",
         "slash": "^3.0.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
         "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
         }
       }
     },
     "babel-loader": {
-      "version": "8.2.2",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.2.tgz",
-      "integrity": "sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz",
+      "integrity": "sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==",
       "dev": true,
       "requires": {
-        "find-cache-dir": "^3.3.1",
+        "find-cache-dir": "^2.1.0",
         "loader-utils": "^1.4.0",
-        "make-dir": "^3.1.0",
+        "mkdirp": "^0.5.3",
+        "pify": "^4.0.1",
         "schema-utils": "^2.6.5"
       },
       "dependencies": {
+        "find-cache-dir": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+          "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
+          "dev": true,
+          "requires": {
+            "commondir": "^1.0.1",
+            "make-dir": "^2.0.0",
+            "pkg-dir": "^3.0.0"
+          }
+        },
         "json5": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
@@ -36269,6 +36675,22 @@
             "emojis-list": "^3.0.0",
             "json5": "^1.0.1"
           }
+        },
+        "make-dir": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+          "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+          "dev": true,
+          "requires": {
+            "pify": "^4.0.1",
+            "semver": "^5.6.0"
+          }
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
         }
       }
     },
@@ -36300,9 +36722,9 @@
       }
     },
     "babel-plugin-jest-hoist": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz",
-      "integrity": "sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw==",
+      "version": "26.5.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.5.0.tgz",
+      "integrity": "sha512-ck17uZFD3CDfuwCLATWZxkkuGGFhMij8quP8CNhwj8ek1mqFgbFzRJ30xwC04LLscj/aKsVFfRST+b5PT7rSuw==",
       "dev": true,
       "requires": {
         "@babel/template": "^7.3.3",
@@ -36312,9 +36734,9 @@
       }
     },
     "babel-preset-current-node-syntax": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
-      "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.4.tgz",
+      "integrity": "sha512-5/INNCYhUGqw7VbVjT/hb3ucjgkVHKXY7lX3ZjlN4gm565VyFmJUrJ/h+h16ECVB38R/9SF6aACydpKMLZ/c9w==",
       "dev": true,
       "requires": {
         "@babel/plugin-syntax-async-generators": "^7.8.4",
@@ -36327,18 +36749,17 @@
         "@babel/plugin-syntax-numeric-separator": "^7.8.3",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
         "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-top-level-await": "^7.8.3"
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
       }
     },
     "babel-preset-jest": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz",
-      "integrity": "sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ==",
+      "version": "26.5.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.5.0.tgz",
+      "integrity": "sha512-F2vTluljhqkiGSJGBg/jOruA8vIIIL11YrxRcO7nviNTMbbofPSHwnm8mgP7d/wS7wRSexRoI6X1A6T74d4LQA==",
       "dev": true,
       "requires": {
-        "babel-plugin-jest-hoist": "^26.6.2",
-        "babel-preset-current-node-syntax": "^1.0.0"
+        "babel-plugin-jest-hoist": "^26.5.0",
+        "babel-preset-current-node-syntax": "^0.1.3"
       }
     },
     "bach": {
@@ -36359,9 +36780,9 @@
       }
     },
     "balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
     },
     "base": {
       "version": "0.11.2",
@@ -36387,6 +36808,35 @@
             "is-descriptor": "^1.0.0"
           }
         },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        },
         "isobject": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
@@ -36396,9 +36846,9 @@
       }
     },
     "base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
+      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
     },
     "batch": {
       "version": "0.6.1",
@@ -36426,9 +36876,9 @@
       "dev": true
     },
     "binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
+      "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==",
       "dev": true
     },
     "bindings": {
@@ -36439,33 +36889,34 @@
       "optional": true,
       "requires": {
         "file-uri-to-path": "1.0.0"
-      },
-      "dependencies": {
-        "file-uri-to-path": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-          "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
-          "dev": true,
-          "optional": true
-        }
       }
     },
     "bl": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-      "devOptional": true,
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.3.tgz",
+      "integrity": "sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==",
+      "optional": true,
       "requires": {
         "buffer": "^5.5.0",
         "inherits": "^2.0.4",
         "readable-stream": "^3.4.0"
       },
       "dependencies": {
+        "buffer": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+          "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+          "optional": true,
+          "requires": {
+            "base64-js": "^1.3.1",
+            "ieee754": "^1.1.13"
+          }
+        },
         "readable-stream": {
           "version": "3.6.0",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
           "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "devOptional": true,
+          "optional": true,
           "requires": {
             "inherits": "^2.0.3",
             "string_decoder": "^1.1.1",
@@ -36481,9 +36932,9 @@
       "dev": true
     },
     "bn.js": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
-      "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz",
+      "integrity": "sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==",
       "dev": true
     },
     "body-parser": {
@@ -36507,19 +36958,6 @@
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
           "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
-        },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
         }
       }
     },
@@ -36566,53 +37004,38 @@
         "widest-line": "^3.1.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
         },
-        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
         },
-        "chalk": {
+        "is-fullwidth-code-point": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
+        },
+        "string-width": {
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
           "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
           }
         },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
           "requires": {
-            "color-name": "~1.1.4"
+            "ansi-regex": "^5.0.0"
           }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "type-fest": {
-          "version": "0.8.1",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
         }
       }
     },
@@ -36699,13 +37122,21 @@
       }
     },
     "browserify-rsa": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
-      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
       "dev": true,
       "requires": {
-        "bn.js": "^5.0.0",
+        "bn.js": "^4.1.0",
         "randombytes": "^2.0.1"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+          "dev": true
+        }
       }
     },
     "browserify-sign": {
@@ -36754,24 +37185,15 @@
       }
     },
     "browserslist": {
-      "version": "4.16.7",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.7.tgz",
-      "integrity": "sha512-7I4qVwqZltJ7j37wObBe3SoTz+nS8APaNcrBOlgoirb6/HbEU2XxW/LpUDTCngM6iauwFqmRTuOMfyKnFGY5JA==",
+      "version": "4.14.5",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.5.tgz",
+      "integrity": "sha512-Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30001248",
-        "colorette": "^1.2.2",
-        "electron-to-chromium": "^1.3.793",
-        "escalade": "^3.1.1",
-        "node-releases": "^1.1.73"
-      },
-      "dependencies": {
-        "colorette": {
-          "version": "1.2.2",
-          "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
-          "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
-          "dev": true
-        }
+        "caniuse-lite": "^1.0.30001135",
+        "electron-to-chromium": "^1.3.571",
+        "escalade": "^3.1.0",
+        "node-releases": "^1.1.61"
       }
     },
     "bs-logger": {
@@ -36793,13 +37215,14 @@
       }
     },
     "buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "devOptional": true,
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
+      "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
+      "dev": true,
       "requires": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
       }
     },
     "buffer-crc32": {
@@ -36815,9 +37238,9 @@
       "dev": true
     },
     "buffer-from": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
       "dev": true
     },
     "buffer-indexof": {
@@ -36849,27 +37272,51 @@
       "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
     },
     "cacache": {
-      "version": "15.0.5",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.5.tgz",
-      "integrity": "sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A==",
+      "version": "15.0.3",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.3.tgz",
+      "integrity": "sha512-bc3jKYjqv7k4pWh7I/ixIjfcjPul4V4jme/WbjvwGS5LzoPL/GzXr4C5EgPNLO/QEZl9Oi61iGitYEdwcrwLCQ==",
+      "dev": true,
       "requires": {
-        "@npmcli/move-file": "^1.0.1",
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
         "glob": "^7.1.4",
         "infer-owner": "^1.0.4",
-        "lru-cache": "^6.0.0",
+        "lru-cache": "^5.1.1",
         "minipass": "^3.1.1",
         "minipass-collect": "^1.0.2",
         "minipass-flush": "^1.0.5",
         "minipass-pipeline": "^1.2.2",
         "mkdirp": "^1.0.3",
+        "move-file": "^2.0.0",
         "p-map": "^4.0.0",
         "promise-inflight": "^1.0.1",
         "rimraf": "^3.0.2",
         "ssri": "^8.0.0",
         "tar": "^6.0.2",
         "unique-filename": "^1.1.1"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+          "dev": true,
+          "requires": {
+            "yallist": "^3.0.2"
+          }
+        },
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+          "dev": true
+        },
+        "yallist": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+          "dev": true
+        }
       }
     },
     "cache-base": {
@@ -36915,11 +37362,6 @@
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
           "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="
-        },
-        "normalize-url": {
-          "version": "4.5.1",
-          "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
-          "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA=="
         }
       }
     },
@@ -36933,6 +37375,32 @@
         "get-intrinsic": "^1.0.2"
       }
     },
+    "caller-callsite": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
+      "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
+      "dev": true,
+      "requires": {
+        "callsites": "^2.0.0"
+      },
+      "dependencies": {
+        "callsites": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
+          "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
+          "dev": true
+        }
+      }
+    },
+    "caller-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
+      "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
+      "dev": true,
+      "requires": {
+        "caller-callsite": "^2.0.0"
+      }
+    },
     "callsites": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -36949,10 +37417,9 @@
       }
     },
     "camelcase": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
-      "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
-      "dev": true
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
     },
     "caniuse-api": {
       "version": "3.0.0",
@@ -36967,9 +37434,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001248",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001248.tgz",
-      "integrity": "sha512-NwlQbJkxUFJ8nMErnGtT0QTM2TJ33xgz4KXJSMIrjXIbDVdaYueGyjOrLKRtJC+rTiWfi6j5cnZN1NBiSBJGNw==",
+      "version": "1.0.30001197",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001197.tgz",
+      "integrity": "sha512-8aE+sqBqtXz4G8g35Eg/XEaFr2N7rd/VQ6eABGBmNtcB8cN6qNJhMi6oSFy4UWWZgqgL3filHT8Nha4meu3tsw==",
       "dev": true
     },
     "canonical-path": {
@@ -36985,14 +37452,6 @@
       "dev": true,
       "requires": {
         "rsvp": "^4.8.4"
-      },
-      "dependencies": {
-        "rsvp": {
-          "version": "4.8.5",
-          "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
-          "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
-          "dev": true
-        }
       }
     },
     "caseless": {
@@ -37001,13 +37460,12 @@
       "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
     },
     "chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
       "requires": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       }
     },
     "char-regex": {
@@ -37037,6 +37495,21 @@
       "requires": {
         "chartjs-color-string": "^0.6.0",
         "color-convert": "^1.9.3"
+      },
+      "dependencies": {
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+        }
       }
     },
     "chartjs-color-string": {
@@ -37057,30 +37530,91 @@
         "eslint-plugin-ecmascript-compat": "^1.1.1"
       },
       "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+        "acorn": {
+          "version": "7.4.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+          "dev": true
+        },
+        "ansi-escapes": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
+          "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
+            "type-fest": "^0.11.0"
+          },
+          "dependencies": {
+            "type-fest": {
+              "version": "0.11.0",
+              "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
+              "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
+              "dev": true
+            }
           }
         },
         "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
           "dev": true
         },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
         "astral-regex": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
           "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
           "dev": true
         },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "cli-cursor": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+          "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+          "dev": true,
+          "requires": {
+            "restore-cursor": "^3.1.0"
+          }
+        },
+        "cli-width": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
+          "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
+          "dev": true
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "dev": true
+        },
         "cross-spawn": {
           "version": "6.0.5",
           "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
@@ -37102,10 +37636,19 @@
             }
           }
         },
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
         "emoji-regex": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
           "dev": true
         },
         "eslint": {
@@ -37153,6 +37696,16 @@
             "v8-compile-cache": "^2.0.3"
           }
         },
+        "eslint-scope": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+          "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+          "dev": true,
+          "requires": {
+            "esrecurse": "^4.3.0",
+            "estraverse": "^4.1.1"
+          }
+        },
         "eslint-utils": {
           "version": "1.4.3",
           "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
@@ -37179,6 +37732,15 @@
             "eslint-visitor-keys": "^1.1.0"
           }
         },
+        "figures": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+          "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+          "dev": true,
+          "requires": {
+            "escape-string-regexp": "^1.0.5"
+          }
+        },
         "file-entry-cache": {
           "version": "5.0.1",
           "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
@@ -37214,22 +37776,103 @@
             "type-fest": "^0.8.1"
           }
         },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
         "ignore": {
           "version": "4.0.6",
           "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
           "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
           "dev": true
         },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
+        "inquirer": {
+          "version": "7.3.3",
+          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz",
+          "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==",
+          "dev": true,
+          "requires": {
+            "ansi-escapes": "^4.2.1",
+            "chalk": "^4.1.0",
+            "cli-cursor": "^3.1.0",
+            "cli-width": "^3.0.0",
+            "external-editor": "^3.0.3",
+            "figures": "^3.0.0",
+            "lodash": "^4.17.19",
+            "mute-stream": "0.0.8",
+            "run-async": "^2.4.0",
+            "rxjs": "^6.6.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0",
+            "through": "^2.3.6"
+          },
+          "dependencies": {
+            "ansi-styles": {
+              "version": "4.3.0",
+              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+              "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+              "dev": true,
+              "requires": {
+                "color-convert": "^2.0.1"
+              }
+            },
+            "chalk": {
+              "version": "4.1.0",
+              "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+              "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+              "dev": true,
+              "requires": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+              }
+            },
+            "color-convert": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+              "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+              "dev": true,
+              "requires": {
+                "color-name": "~1.1.4"
+              }
+            },
+            "color-name": {
+              "version": "1.1.4",
+              "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+              "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+              "dev": true
+            },
+            "has-flag": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+              "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+              "dev": true
+            },
+            "strip-ansi": {
+              "version": "6.0.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+              "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^5.0.0"
+              }
+            },
+            "supports-color": {
+              "version": "7.2.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+              "dev": true,
+              "requires": {
+                "has-flag": "^4.0.0"
+              }
+            }
+          }
         },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
           "dev": true
         },
         "levn": {
@@ -37242,14 +37885,11 @@
             "type-check": "~0.3.2"
           }
         },
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
         },
         "optionator": {
           "version": "0.8.3",
@@ -37283,6 +37923,16 @@
           "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
           "dev": true
         },
+        "restore-cursor": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+          "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+          "dev": true,
+          "requires": {
+            "onetime": "^5.1.0",
+            "signal-exit": "^3.0.2"
+          }
+        },
         "rimraf": {
           "version": "2.6.3",
           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
@@ -37292,6 +37942,15 @@
             "glob": "^7.1.3"
           }
         },
+        "rxjs": {
+          "version": "6.6.6",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.6.tgz",
+          "integrity": "sha512-/oTwee4N4iWzAMAL9xdGKjkEHmIwupR3oXbQjCKywF1BeFohswF3vZdogbmEF6pZkOsXTzWkrZszrWpQTByYVg==",
+          "dev": true,
+          "requires": {
+            "tslib": "^1.9.0"
+          }
+        },
         "semver": {
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -37322,26 +37981,51 @@
             "ansi-styles": "^3.2.0",
             "astral-regex": "^1.0.0",
             "is-fullwidth-code-point": "^2.0.0"
+          },
+          "dependencies": {
+            "is-fullwidth-code-point": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+              "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+              "dev": true
+            }
           }
         },
         "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
           "dev": true,
           "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
+          },
+          "dependencies": {
+            "strip-ansi": {
+              "version": "6.0.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+              "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^5.0.0"
+              }
+            }
           }
         },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+        "strip-json-comments": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+          "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^4.1.0"
+            "has-flag": "^3.0.0"
           }
         },
         "table": {
@@ -37354,8 +38038,39 @@
             "lodash": "^4.17.14",
             "slice-ansi": "^2.1.0",
             "string-width": "^3.0.0"
+          },
+          "dependencies": {
+            "emoji-regex": {
+              "version": "7.0.3",
+              "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+              "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+              "dev": true
+            },
+            "is-fullwidth-code-point": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+              "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+              "dev": true
+            },
+            "string-width": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+              "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+              "dev": true,
+              "requires": {
+                "emoji-regex": "^7.0.1",
+                "is-fullwidth-code-point": "^2.0.0",
+                "strip-ansi": "^5.1.0"
+              }
+            }
           }
         },
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+          "dev": true
+        },
         "type-check": {
           "version": "0.3.2",
           "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
@@ -37365,12 +38080,6 @@
             "prelude-ls": "~1.1.2"
           }
         },
-        "type-fest": {
-          "version": "0.8.1",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-          "dev": true
-        },
         "which": {
           "version": "1.3.1",
           "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -37394,22 +38103,77 @@
         "htmlparser2": "^3.9.1",
         "lodash": "^4.15.0",
         "parse5": "^3.0.1"
+      },
+      "dependencies": {
+        "css-select": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
+          "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
+          "dev": true,
+          "requires": {
+            "boolbase": "~1.0.0",
+            "css-what": "2.1",
+            "domutils": "1.5.1",
+            "nth-check": "~1.0.1"
+          }
+        },
+        "css-what": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
+          "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
+          "dev": true
+        },
+        "dom-serializer": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
+          "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
+          "dev": true,
+          "requires": {
+            "domelementtype": "^1.3.0",
+            "entities": "^1.1.1"
+          }
+        },
+        "domutils": {
+          "version": "1.5.1",
+          "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
+          "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
+          "dev": true,
+          "requires": {
+            "dom-serializer": "0",
+            "domelementtype": "1"
+          }
+        },
+        "entities": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+          "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
+          "dev": true
+        },
+        "parse5": {
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz",
+          "integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==",
+          "dev": true,
+          "requires": {
+            "@types/node": "*"
+          }
+        }
       }
     },
     "chokidar": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
-      "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz",
+      "integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==",
       "dev": true,
       "requires": {
-        "anymatch": "~3.1.2",
+        "anymatch": "~3.1.1",
         "braces": "~3.0.2",
-        "fsevents": "~2.3.2",
-        "glob-parent": "~5.1.2",
+        "fsevents": "~2.1.2",
+        "glob-parent": "~5.1.0",
         "is-binary-path": "~2.1.0",
         "is-glob": "~4.0.1",
         "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
+        "readdirp": "~3.4.0"
       }
     },
     "chownr": {
@@ -37418,10 +38182,21 @@
       "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="
     },
     "chrome-trace-event": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
-      "dev": true
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz",
+      "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==",
+      "dev": true,
+      "requires": {
+        "tslib": "^1.9.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.13.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
+          "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
+          "dev": true
+        }
+      }
     },
     "ci-info": {
       "version": "2.0.0",
@@ -37439,18 +38214,12 @@
       }
     },
     "circular-dependency-plugin": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-5.2.2.tgz",
-      "integrity": "sha512-g38K9Cm5WRwlaH6g03B9OEz/0qRizI+2I7n+Gz+L5DxXJAPAiWQvwlYNm1V1jkdpUv95bOe/ASm2vfi/G560jQ==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-5.2.0.tgz",
+      "integrity": "sha512-7p4Kn/gffhQaavNfyDFg7LS5S/UT1JAjyGd4UqR2+jzoYF02eDkj0Ec3+48TsIa4zghjLY87nQHIh/ecK9qLdw==",
       "dev": true,
       "requires": {}
     },
-    "cjs-module-lexer": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz",
-      "integrity": "sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==",
-      "dev": true
-    },
     "class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
@@ -37463,12 +38232,6 @@
         "static-extend": "^0.1.1"
       },
       "dependencies": {
-        "arr-union": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-          "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-          "dev": true
-        },
         "define-property": {
           "version": "0.2.5",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
@@ -37478,57 +38241,6 @@
             "is-descriptor": "^0.1.0"
           }
         },
-        "is-accessor-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-data-descriptor": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^0.1.6",
-            "is-data-descriptor": "^0.1.4",
-            "kind-of": "^5.0.0"
-          }
-        },
         "isobject": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
@@ -37565,35 +38277,46 @@
       "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw=="
     },
     "cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "dev": true,
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
       "requires": {
-        "restore-cursor": "^3.1.0"
+        "restore-cursor": "^2.0.0"
       }
     },
     "cli-spinners": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.0.tgz",
-      "integrity": "sha512-t+4/y50K/+4xcCRosKkA7W4gTr1MySvLV0q+PxmG7FJ5g+66ChKurYjxBCjHggHH3HA5Hh9cy+lcUGWDqVH+4Q==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.4.0.tgz",
+      "integrity": "sha512-sJAofoarcm76ZGpuooaO0eDy8saEy+YoZBLjC4h8srt4jeBnkYeOgqxgsJQTpyt2LjI5PTfLJHSL+41Yu4fEJA==",
       "dev": true
     },
     "cli-width": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
-      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
-      "dev": true
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
+      "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw=="
     },
     "cliui": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
       "dev": true,
       "requires": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^7.0.0"
+        "string-width": "^3.1.0",
+        "strip-ansi": "^5.2.0",
+        "wrap-ansi": "^5.1.0"
+      },
+      "dependencies": {
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        }
       }
     },
     "clone": {
@@ -37617,29 +38340,6 @@
         "is-plain-object": "^2.0.4",
         "kind-of": "^6.0.2",
         "shallow-clone": "^3.0.0"
-      },
-      "dependencies": {
-        "is-plain-object": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-          "dev": true,
-          "requires": {
-            "isobject": "^3.0.1"
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        }
       }
     },
     "clone-response": {
@@ -37648,13 +38348,6 @@
       "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
       "requires": {
         "mimic-response": "^1.0.0"
-      },
-      "dependencies": {
-        "mimic-response": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-          "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="
-        }
       }
     },
     "clone-stats": {
@@ -37680,6 +38373,69 @@
       "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
       "dev": true
     },
+    "coa": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
+      "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
+      "dev": true,
+      "requires": {
+        "@types/q": "^1.5.1",
+        "chalk": "^2.4.1",
+        "q": "^1.1.2"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
     "code-point-at": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
@@ -37712,38 +38468,62 @@
         "object-visit": "^1.0.0"
       }
     },
-    "color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+    "color": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/color/-/color-3.1.2.tgz",
+      "integrity": "sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==",
+      "dev": true,
       "requires": {
-        "color-name": "1.1.3"
+        "color-convert": "^1.9.1",
+        "color-string": "^1.5.2"
       },
       "dependencies": {
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
         "color-name": {
           "version": "1.1.3",
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "dev": true
         }
       }
     },
+    "color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "requires": {
+        "color-name": "~1.1.4"
+      }
+    },
     "color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
+    "color-string": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz",
+      "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==",
+      "dev": true,
+      "requires": {
+        "color-name": "^1.0.0",
+        "simple-swizzle": "^0.2.2"
+      }
+    },
     "color-support": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
       "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
       "dev": true
     },
-    "colord": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/colord/-/colord-2.5.0.tgz",
-      "integrity": "sha512-EeswvDseZAYGju9qVFHIf1ftRsWayhVZgCaZvp25UZzDON7ESYj/MoXD+qvf1lnRrgweeaCGHr389t2r1Huo7w==",
-      "dev": true
-    },
     "colorette": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.1.0.tgz",
@@ -37769,9 +38549,9 @@
       }
     },
     "commander": {
-      "version": "2.17.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
-      "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
       "dev": true
     },
     "comment-parser": {
@@ -37792,6 +38572,15 @@
       "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
       "dev": true
     },
+    "compose-function": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/compose-function/-/compose-function-3.0.3.tgz",
+      "integrity": "sha1-ntZ18TzFRQHTCVCkhv9qe6OrGF8=",
+      "dev": true,
+      "requires": {
+        "arity-n": "^1.0.4"
+      }
+    },
     "compressible": {
       "version": "2.0.18",
       "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
@@ -37812,21 +38601,6 @@
         "on-headers": "~1.0.2",
         "safe-buffer": "5.1.2",
         "vary": "~1.1.2"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        }
       }
     },
     "concat-map": {
@@ -37949,6 +38723,12 @@
       "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
       "dev": true
     },
+    "contains-path": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
+      "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=",
+      "dev": true
+    },
     "content-disposition": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
@@ -37963,9 +38743,9 @@
       "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
     },
     "convert-source-map": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
-      "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
+      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
       "dev": true,
       "requires": {
         "safe-buffer": "~5.1.1"
@@ -37987,15 +38767,6 @@
       "integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==",
       "dev": true
     },
-    "copy-anything": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.3.tgz",
-      "integrity": "sha512-GK6QUtisv4fNS+XcI7shX0Gx9ORg7QqIznyfho79JTnX1XhLiyZHfftvGiziqzRiEi/Bjhgpi+D2o7HxJFPnDQ==",
-      "dev": true,
-      "requires": {
-        "is-what": "^3.12.0"
-      }
-    },
     "copy-concurrently": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
@@ -38010,15 +38781,6 @@
         "run-queue": "^1.0.0"
       },
       "dependencies": {
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        },
         "rimraf": {
           "version": "2.7.1",
           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -38037,84 +38799,72 @@
       "dev": true
     },
     "copy-props": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.5.tgz",
-      "integrity": "sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz",
+      "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==",
       "dev": true,
       "requires": {
-        "each-props": "^1.3.2",
-        "is-plain-object": "^5.0.0"
+        "each-props": "^1.3.0",
+        "is-plain-object": "^2.0.1"
       }
     },
     "copy-webpack-plugin": {
-      "version": "6.3.2",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.3.2.tgz",
-      "integrity": "sha512-MgJ1uouLIbDg4ST1GzqrGQyKoXY5iPqi6fghFqarijam7FQcBa/r6Rg0VkoIuzx75Xq8iAMghyOueMkWUQ5OaA==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.0.3.tgz",
+      "integrity": "sha512-q5m6Vz4elsuyVEIUXr7wJdIdePWTubsqVbEMvf1WQnHGv0Q+9yPRu7MtYFPt+GBOXRav9lvIINifTQ1vSCs+eA==",
       "dev": true,
       "requires": {
-        "cacache": "^15.0.5",
+        "cacache": "^15.0.4",
         "fast-glob": "^3.2.4",
         "find-cache-dir": "^3.3.1",
         "glob-parent": "^5.1.1",
         "globby": "^11.0.1",
         "loader-utils": "^2.0.0",
         "normalize-path": "^3.0.0",
-        "p-limit": "^3.0.2",
-        "schema-utils": "^3.0.0",
-        "serialize-javascript": "^5.0.1",
+        "p-limit": "^3.0.1",
+        "schema-utils": "^2.7.0",
+        "serialize-javascript": "^4.0.0",
         "webpack-sources": "^1.4.3"
       },
       "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+        "cacache": {
+          "version": "15.0.5",
+          "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.5.tgz",
+          "integrity": "sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
+            "@npmcli/move-file": "^1.0.1",
+            "chownr": "^2.0.0",
+            "fs-minipass": "^2.0.0",
+            "glob": "^7.1.4",
+            "infer-owner": "^1.0.4",
+            "lru-cache": "^6.0.0",
+            "minipass": "^3.1.1",
+            "minipass-collect": "^1.0.2",
+            "minipass-flush": "^1.0.5",
+            "minipass-pipeline": "^1.2.2",
+            "mkdirp": "^1.0.3",
+            "p-map": "^4.0.0",
+            "promise-inflight": "^1.0.1",
+            "rimraf": "^3.0.2",
+            "ssri": "^8.0.0",
+            "tar": "^6.0.2",
+            "unique-filename": "^1.1.1"
           }
         },
-        "ajv-keywords": {
-          "version": "3.5.2",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-          "dev": true,
-          "requires": {}
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
           "dev": true
         },
-        "schema-utils": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+        "p-limit": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.0.2.tgz",
+          "integrity": "sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==",
           "dev": true,
           "requires": {
-            "@types/json-schema": "^7.0.8",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "webpack-sources": {
-          "version": "1.4.3",
-          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-          "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-          "dev": true,
-          "requires": {
-            "source-list-map": "^2.0.0",
-            "source-map": "~0.6.1"
+            "p-try": "^2.0.0"
           }
         }
       }
@@ -38140,67 +38890,22 @@
       }
     },
     "cordova-android": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-10.0.1.tgz",
-      "integrity": "sha512-Hv8H9b4JE2wi9vBBl6K84ZWh01nkFAdIgIGnv3T2Gd8srmCwOw1f3snDCjpcCqxD0jiBAkN5wk5hCIY+EmHJyA==",
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-9.1.0.tgz",
+      "integrity": "sha512-bzOX9E4eQsOSpa06oZZ7XAGq3DwB73juhhj0oPqHH/khWk0mkCD4aiVYMFoc0fmIaSQvzbY1ww7L6UBW5pyGfg==",
       "requires": {
-        "android-versions": "^1.7.0",
-        "cordova-common": "^4.0.2",
-        "execa": "^5.1.1",
-        "fast-glob": "^3.2.7",
-        "fs-extra": "^10.0.0",
-        "is-path-inside": "^3.0.3",
-        "nopt": "^5.0.0",
+        "android-versions": "^1.5.0",
+        "cordova-common": "^4.0.1",
+        "execa": "^4.0.2",
+        "fast-glob": "^3.2.4",
+        "fs-extra": "^9.0.1",
+        "is-path-inside": "^3.0.2",
+        "nopt": "^4.0.3",
         "properties-parser": "^0.3.1",
-        "semver": "^7.3.5",
-        "untildify": "^4.0.0",
+        "semver": "^7.3.4",
         "which": "^2.0.2"
       },
       "dependencies": {
-        "execa": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-          "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-          "requires": {
-            "cross-spawn": "^7.0.3",
-            "get-stream": "^6.0.0",
-            "human-signals": "^2.1.0",
-            "is-stream": "^2.0.0",
-            "merge-stream": "^2.0.0",
-            "npm-run-path": "^4.0.1",
-            "onetime": "^5.1.2",
-            "signal-exit": "^3.0.3",
-            "strip-final-newline": "^2.0.0"
-          }
-        },
-        "fs-extra": {
-          "version": "10.0.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
-          "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
-          "requires": {
-            "graceful-fs": "^4.2.0",
-            "jsonfile": "^6.0.1",
-            "universalify": "^2.0.0"
-          }
-        },
-        "get-stream": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-          "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="
-        },
-        "human-signals": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-          "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="
-        },
-        "nopt": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
-          "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
-          "requires": {
-            "abbrev": "1"
-          }
-        },
         "semver": {
           "version": "7.3.5",
           "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
@@ -38289,6 +38994,189 @@
         "resolve": "^1.15.1",
         "semver": "^7.1.3",
         "which": "^2.0.2"
+      },
+      "dependencies": {
+        "agent-base": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+          "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+          "requires": {
+            "debug": "4"
+          }
+        },
+        "agentkeepalive": {
+          "version": "4.1.4",
+          "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.1.4.tgz",
+          "integrity": "sha512-+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ==",
+          "requires": {
+            "debug": "^4.1.0",
+            "depd": "^1.1.2",
+            "humanize-ms": "^1.2.1"
+          }
+        },
+        "cacache": {
+          "version": "15.2.0",
+          "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.2.0.tgz",
+          "integrity": "sha512-uKoJSHmnrqXgthDFx/IU6ED/5xd+NNGe+Bb+kLZy7Ku4P+BaiWEUflAKPZ7eAzsYGcsAGASJZsybXp+quEcHTw==",
+          "requires": {
+            "@npmcli/move-file": "^1.0.1",
+            "chownr": "^2.0.0",
+            "fs-minipass": "^2.0.0",
+            "glob": "^7.1.4",
+            "infer-owner": "^1.0.4",
+            "lru-cache": "^6.0.0",
+            "minipass": "^3.1.1",
+            "minipass-collect": "^1.0.2",
+            "minipass-flush": "^1.0.5",
+            "minipass-pipeline": "^1.2.2",
+            "mkdirp": "^1.0.3",
+            "p-map": "^4.0.0",
+            "promise-inflight": "^1.0.1",
+            "rimraf": "^3.0.2",
+            "ssri": "^8.0.1",
+            "tar": "^6.0.2",
+            "unique-filename": "^1.1.1"
+          }
+        },
+        "debug": {
+          "version": "4.3.2",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+          "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "err-code": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
+          "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="
+        },
+        "http-proxy-agent": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+          "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+          "requires": {
+            "@tootallnate/once": "1",
+            "agent-base": "6",
+            "debug": "4"
+          }
+        },
+        "https-proxy-agent": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+          "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+          "requires": {
+            "agent-base": "6",
+            "debug": "4"
+          }
+        },
+        "make-fetch-happen": {
+          "version": "9.0.4",
+          "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.0.4.tgz",
+          "integrity": "sha512-sQWNKMYqSmbAGXqJg2jZ+PmHh5JAybvwu0xM8mZR/bsTjGiTASj3ldXJV7KFHy1k/IJIBkjxQFoWIVsv9+PQMg==",
+          "requires": {
+            "agentkeepalive": "^4.1.3",
+            "cacache": "^15.2.0",
+            "http-cache-semantics": "^4.1.0",
+            "http-proxy-agent": "^4.0.1",
+            "https-proxy-agent": "^5.0.0",
+            "is-lambda": "^1.0.1",
+            "lru-cache": "^6.0.0",
+            "minipass": "^3.1.3",
+            "minipass-collect": "^1.0.2",
+            "minipass-fetch": "^1.3.2",
+            "minipass-flush": "^1.0.5",
+            "minipass-pipeline": "^1.2.4",
+            "negotiator": "^0.6.2",
+            "promise-retry": "^2.0.1",
+            "socks-proxy-agent": "^5.0.0",
+            "ssri": "^8.0.0"
+          }
+        },
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        },
+        "npm-packlist": {
+          "version": "2.2.2",
+          "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.2.2.tgz",
+          "integrity": "sha512-Jt01acDvJRhJGthnUJVF/w6gumWOZxO7IkpY/lsX9//zqQgnF7OJaxgQXcerd4uQOLu7W5bkb4mChL9mdfm+Zg==",
+          "requires": {
+            "glob": "^7.1.6",
+            "ignore-walk": "^3.0.3",
+            "npm-bundled": "^1.1.1",
+            "npm-normalize-package-bin": "^1.0.1"
+          }
+        },
+        "npm-registry-fetch": {
+          "version": "11.0.0",
+          "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-11.0.0.tgz",
+          "integrity": "sha512-jmlgSxoDNuhAtxUIG6pVwwtz840i994dL14FoNVZisrmZW5kWd63IUTNv1m/hyRSGSqWjCUp/YZlS1BJyNp9XA==",
+          "requires": {
+            "make-fetch-happen": "^9.0.1",
+            "minipass": "^3.1.3",
+            "minipass-fetch": "^1.3.0",
+            "minipass-json-stream": "^1.0.1",
+            "minizlib": "^2.0.0",
+            "npm-package-arg": "^8.0.0"
+          }
+        },
+        "pacote": {
+          "version": "11.3.5",
+          "resolved": "https://registry.npmjs.org/pacote/-/pacote-11.3.5.tgz",
+          "integrity": "sha512-fT375Yczn4zi+6Hkk2TBe1x1sP8FgFsEIZ2/iWaXY2r/NkhDJfxbcn5paz1+RTFCyNf+dPnaoBDJoAxXSU8Bkg==",
+          "requires": {
+            "@npmcli/git": "^2.1.0",
+            "@npmcli/installed-package-contents": "^1.0.6",
+            "@npmcli/promise-spawn": "^1.2.0",
+            "@npmcli/run-script": "^1.8.2",
+            "cacache": "^15.0.5",
+            "chownr": "^2.0.0",
+            "fs-minipass": "^2.1.0",
+            "infer-owner": "^1.0.4",
+            "minipass": "^3.1.3",
+            "mkdirp": "^1.0.3",
+            "npm-package-arg": "^8.0.1",
+            "npm-packlist": "^2.1.4",
+            "npm-pick-manifest": "^6.0.0",
+            "npm-registry-fetch": "^11.0.0",
+            "promise-retry": "^2.0.1",
+            "read-package-json-fast": "^2.0.1",
+            "rimraf": "^3.0.2",
+            "ssri": "^8.0.1",
+            "tar": "^6.1.0"
+          }
+        },
+        "pify": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz",
+          "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA=="
+        },
+        "promise-retry": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
+          "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
+          "requires": {
+            "err-code": "^2.0.2",
+            "retry": "^0.12.0"
+          }
+        },
+        "socks-proxy-agent": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz",
+          "integrity": "sha512-vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ==",
+          "requires": {
+            "agent-base": "^6.0.2",
+            "debug": "4",
+            "socks": "^2.3.3"
+          }
+        }
       }
     },
     "cordova-ios": {
@@ -38315,6 +39203,28 @@
           "requires": {
             "abbrev": "1"
           }
+        },
+        "semver": {
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "uuid": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
+          "integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg=="
+        },
+        "xcode": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/xcode/-/xcode-3.0.1.tgz",
+          "integrity": "sha512-kCz5k7J7XbJtjABOvkc5lJmkiDh8VhjVCGNiqdKCscmVpdVUpEAyXv1xmCLkQJ5dsHqx3IPO4XW+NTDhU/fatA==",
+          "requires": {
+            "simple-plist": "^1.1.0",
+            "uuid": "^7.0.3"
+          }
         }
       }
     },
@@ -38339,6 +39249,13 @@
         "semver": "^7.3.2",
         "stringify-package": "^1.0.1",
         "write-file-atomic": "^3.0.3"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz",
+          "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA=="
+        }
       }
     },
     "cordova-plugin-add-swift-support": {
@@ -38355,27 +39272,13 @@
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
           "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
-        },
-        "uuid": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
-        },
-        "xcode": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/xcode/-/xcode-2.1.0.tgz",
-          "integrity": "sha512-uCrmPITrqTEzhn0TtT57fJaNaw8YJs1aCzs+P/QqxsDbvPZSv7XMPPwXrKvHtD6pLjBM/NaVwraWJm8q83Y4iQ==",
-          "requires": {
-            "simple-plist": "^1.0.0",
-            "uuid": "^3.3.2"
-          }
         }
       }
     },
     "cordova-plugin-advanced-http": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-advanced-http/-/cordova-plugin-advanced-http-3.2.0.tgz",
-      "integrity": "sha512-NOjkxLvP8z7vrnrwuXO0bWGJviK31KO1ov0Nel1BqbNi2rZNafL5RRxC1/RHXik252xf070xDgBvDwdWv7yxjA=="
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-advanced-http/-/cordova-plugin-advanced-http-3.1.0.tgz",
+      "integrity": "sha512-zlTlNJyTttE7TV5vW2WGvHqpbKMDVrr1meZU0fy4y3ObrI/hGk2UDcDNwpZdMfaytNZwDKU4sRgsTgQYdFNBew=="
     },
     "cordova-plugin-badge": {
       "version": "0.8.8",
@@ -38383,9 +39286,9 @@
       "integrity": "sha512-RhIBtd5xhD/iLnxjt35jvOae28oNW/wtMZBOmQR3Rf0y4wirvA1bpAZEhBoFqL+rZGhsd6ddOdQXdex1T0DRyQ=="
     },
     "cordova-plugin-camera": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-camera/-/cordova-plugin-camera-5.0.2.tgz",
-      "integrity": "sha512-iR9W9S+USg/YTjwB+6rnIqJ1mZ02da0Q2VDU0Twf/CccEJO+006T5RM/NYDkBRs6vMCw7rWXroCNJOPBLLETPQ=="
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-camera/-/cordova-plugin-camera-5.0.1.tgz",
+      "integrity": "sha512-9gXyZvI8u9KzsZuqmB8Yw+uheF+7f+usMAwvOMw7L7pqbykg+bm9US5zjhJbwit3A1cSblgZkpBafe5cFiMcTA=="
     },
     "cordova-plugin-chooser": {
       "version": "1.3.2",
@@ -38448,9 +39351,9 @@
       "integrity": "sha512-NwO3qDBNL/vJxUxBTPNOA1HvkDf9eTeGH8JSZiwy1jq2W2mJKQEDBwqWkaEQS19Yd/MQTiw0cykxg5D7u4J6cQ=="
     },
     "cordova-plugin-prevent-override": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-prevent-override/-/cordova-plugin-prevent-override-1.0.1.tgz",
-      "integrity": "sha512-yy1JZ+lXTR33Ai1yloT6wdXJXe0a3LrfgnKORuPZv/QkbiqfIQKjy0R4zRP8qljaJSelF/xv5CgrVt8iS0SkBg=="
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-prevent-override/-/cordova-plugin-prevent-override-1.0.0.tgz",
+      "integrity": "sha512-/+3q5r4K5RahCpiYVmZQBjq10x4jj+6CMjYtZyx9jdMWeV+yFE+ItFcO1NeUAEWd2iHC5YPD0P2tHiHx5kscsw=="
     },
     "cordova-plugin-screen-orientation": {
       "version": "3.0.2",
@@ -38468,19 +39371,19 @@
       "integrity": "sha512-ThmXzl6QIKWFXf4wWw7Q/zpB+VKkz3VM958+5A0sXD4jmR++u7KnGttLksXshVwWr6lvGwUebLYtIyXwS4Ovcg=="
     },
     "cordova-plugin-whitelist": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.5.tgz",
-      "integrity": "sha512-+v/VzCYBdGsIxJTP2m+RWaq7l/NLu7b976w6XGJUFiN2TVOeaGrytaR4jRy0w9akRai8uKFeBmuGHmlS/sOeCA=="
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.4.tgz",
+      "integrity": "sha512-EYC5eQFVkoYXq39l7tYKE6lEjHJ04mvTmKXxGL7quHLdFPfJMNzru/UYpn92AOfpl3PQaZmou78C7EgmFOwFQQ=="
     },
     "cordova-plugin-wkuserscript": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-wkuserscript/-/cordova-plugin-wkuserscript-1.0.1.tgz",
-      "integrity": "sha512-qhb2JOFy+XnLIbPubDuAcZyf6fSsrQ2syM8PqAVvW7JJQVR7i64pZDLHmgYQrGN+2pO1fG8EdR2aUp5O0Kx/HA=="
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-wkuserscript/-/cordova-plugin-wkuserscript-1.0.0.tgz",
+      "integrity": "sha512-g18TohV1T+iWQJImYUCZc44x2ywHTH3ycgEJyxo4WTL9eYm4T7lNkyl1svzQGI97e8W5hQxUqAcmvpVcnWvjSQ=="
     },
     "cordova-plugin-wkwebview-cookies": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-wkwebview-cookies/-/cordova-plugin-wkwebview-cookies-1.0.1.tgz",
-      "integrity": "sha512-x984mlj21Newei7UFPTu4N3NJSTBZuuQXkDNJxq8FTGM1RH/YECqYAzk6ekk/regFamj1bCQ3IB8XJeCm5/dhA=="
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-wkwebview-cookies/-/cordova-plugin-wkwebview-cookies-1.0.0.tgz",
+      "integrity": "sha512-bQRnc/1UNu2XDb6ds+RuAZGA8FM2MuQb4z45J/CaDfjSs60OSvxGVKo3okrM/okYosZqWJFygrPah0MK3lDERQ=="
     },
     "cordova-plugin-zip": {
       "version": "3.1.0",
@@ -38497,46 +39400,6 @@
         "express": "^4.17.1",
         "open": "^7.0.3",
         "which": "^2.0.2"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
       }
     },
     "cordova-sqlite-storage": {
@@ -38553,9 +39416,9 @@
       "integrity": "sha512-dTBxYaX/RGzH6+pp49o4sb3FuHCvhrssaKn1XMJ4LL3f9dnvz3rhFK2LdcWrdFkhOLOndnW/azUkbzZd+WWhRA=="
     },
     "cordova-support-google-services": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/cordova-support-google-services/-/cordova-support-google-services-1.4.1.tgz",
-      "integrity": "sha512-1VgF9kFCOMbzgdnsDtSKaYGmWXmeciGP8+N0wTcTkL2m6Qrs1xZ82NiYEJYXe7BjHad2d06liWThqQv7iXt5HA=="
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/cordova-support-google-services/-/cordova-support-google-services-1.2.1.tgz",
+      "integrity": "sha512-EnFjKAE9oI2uzyUvEfWpLgTM200nuJVvShaA4yyz9wMKBUN+H/BRG1byd1ibZz3sSihNKi3FxjQPxmmEn6/IfA=="
     },
     "cordova.plugins.diagnostic": {
       "version": "5.0.2",
@@ -38575,17 +39438,17 @@
       }
     },
     "core-js": {
-      "version": "3.16.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.16.0.tgz",
-      "integrity": "sha512-5+5VxRFmSf97nM8Jr2wzOwLqRo6zphH2aX+7KsAUONObyzakDNq2G/bgbhinxB4PoV9L3aXQYhiDKyIKWd2c8g=="
+      "version": "3.9.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.9.1.tgz",
+      "integrity": "sha512-gSjRvzkxQc1zjM/5paAmL4idJBFzuJoo+jDjF1tStYFMV2ERfD02HhahhCGXUyHxQRG4yFKVSdO6g62eoRMcDg=="
     },
     "core-js-compat": {
-      "version": "3.16.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.16.0.tgz",
-      "integrity": "sha512-5D9sPHCdewoUK7pSUPfTF7ZhLh8k9/CoJXWUEo+F1dZT5Z1DVgcuRqUKhjeKW+YLb8f21rTFgWwQJiNw1hoZ5Q==",
+      "version": "3.6.5",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz",
+      "integrity": "sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.16.6",
+        "browserslist": "^4.8.5",
         "semver": "7.0.0"
       },
       "dependencies": {
@@ -38598,9 +39461,9 @@
       }
     },
     "core-js-pure": {
-      "version": "3.16.0",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.16.0.tgz",
-      "integrity": "sha512-wzlhZNepF/QA9yvx3ePDgNGudU5KDB8lu/TRPKelYA/QtSnkS/cLl2W+TIdEX1FAFcBr0YpY7tPDlcmXJ7AyiQ==",
+      "version": "3.11.1",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.11.1.tgz",
+      "integrity": "sha512-2JukQi8HgAOCD5CSimxWWXVrUBoA9Br796uIA5Z06bIjt7PBBI19ircFaAxplgE1mJf3x2BY6MkT/HWA/UryPg==",
       "dev": true
     },
     "core-util-is": {
@@ -38609,16 +39472,33 @@
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "cosmiconfig": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz",
-      "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
+      "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
       "dev": true,
       "requires": {
-        "@types/parse-json": "^4.0.0",
-        "import-fresh": "^3.2.1",
-        "parse-json": "^5.0.0",
-        "path-type": "^4.0.0",
-        "yaml": "^1.10.0"
+        "import-fresh": "^2.0.0",
+        "is-directory": "^0.3.1",
+        "js-yaml": "^3.13.1",
+        "parse-json": "^4.0.0"
+      },
+      "dependencies": {
+        "import-fresh": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
+          "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
+          "dev": true,
+          "requires": {
+            "caller-path": "^2.0.0",
+            "resolve-from": "^3.0.0"
+          }
+        },
+        "resolve-from": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+          "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+          "dev": true
+        }
       }
     },
     "create-ecdh": {
@@ -38632,9 +39512,9 @@
       },
       "dependencies": {
         "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
           "dev": true
         }
       }
@@ -38666,78 +39546,6 @@
         "sha.js": "^2.4.8"
       }
     },
-    "create-require": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
-      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "critters": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/critters/-/critters-0.0.7.tgz",
-      "integrity": "sha512-qUF2SaAWFYjNPdCcPpu68p2DnHiosia84yx5mPTlUMQjkjChR+n6sO1/I7yn2U2qNDgSPTd2SoaTIDQcUL+EwQ==",
-      "dev": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "css": "^3.0.0",
-        "parse5": "^6.0.1",
-        "parse5-htmlparser2-tree-adapter": "^6.0.1",
-        "pretty-bytes": "^5.3.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "parse5": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-          "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -38773,14 +39581,15 @@
       "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA=="
     },
     "css": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/css/-/css-3.0.0.tgz",
-      "integrity": "sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==",
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
+      "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.4",
+        "inherits": "^2.0.3",
         "source-map": "^0.6.1",
-        "source-map-resolve": "^0.6.0"
+        "source-map-resolve": "^0.5.2",
+        "urix": "^0.1.0"
       },
       "dependencies": {
         "source-map": {
@@ -38792,75 +39601,67 @@
       }
     },
     "css-color-names": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-1.0.1.tgz",
-      "integrity": "sha512-/loXYOch1qU1biStIFsHH8SxTmOseh1IJqFvy8IujXOm1h+QjUdDhkzOrR5HG8K8mlxREj0yfi8ewCHx0eMxzA==",
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
+      "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
       "dev": true
     },
     "css-declaration-sorter": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.1.1.tgz",
-      "integrity": "sha512-BZ1aOuif2Sb7tQYY1GeCjG7F++8ggnwUkH5Ictw0mrdpqpEd+zWmcPdstnH2TItlb74FqR0DrVEieon221T/1Q==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz",
+      "integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==",
       "dev": true,
       "requires": {
+        "postcss": "^7.0.1",
         "timsort": "^0.3.0"
       }
     },
     "css-loader": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-5.0.1.tgz",
-      "integrity": "sha512-cXc2ti9V234cq7rJzFKhirb2L2iPy8ZjALeVJAozXYz9te3r4eqLSixNAbMDJSgJEQywqXzs8gonxaboeKqwiw==",
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.5.3.tgz",
+      "integrity": "sha512-UEr9NH5Lmi7+dguAm+/JSPovNjYbm2k3TK58EiwQHzOHH5Jfq1Y+XoP2bQO6TMn7PptMd0opxxedAWcaSTRKHw==",
       "dev": true,
       "requires": {
-        "camelcase": "^6.2.0",
+        "camelcase": "^5.3.1",
         "cssesc": "^3.0.0",
-        "icss-utils": "^5.0.0",
-        "loader-utils": "^2.0.0",
-        "postcss": "^8.1.4",
-        "postcss-modules-extract-imports": "^3.0.0",
-        "postcss-modules-local-by-default": "^4.0.0",
-        "postcss-modules-scope": "^3.0.0",
-        "postcss-modules-values": "^4.0.0",
-        "postcss-value-parser": "^4.1.0",
-        "schema-utils": "^3.0.0",
-        "semver": "^7.3.2"
+        "icss-utils": "^4.1.1",
+        "loader-utils": "^1.2.3",
+        "normalize-path": "^3.0.0",
+        "postcss": "^7.0.27",
+        "postcss-modules-extract-imports": "^2.0.0",
+        "postcss-modules-local-by-default": "^3.0.2",
+        "postcss-modules-scope": "^2.2.0",
+        "postcss-modules-values": "^3.0.0",
+        "postcss-value-parser": "^4.0.3",
+        "schema-utils": "^2.6.6",
+        "semver": "^6.3.0"
       },
       "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
+            "minimist": "^1.2.0"
           }
         },
-        "ajv-keywords": {
-          "version": "3.5.2",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+        "loader-utils": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
           "dev": true,
-          "requires": {}
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
         },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
-        },
-        "schema-utils": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.8",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
-          }
         }
       }
     },
@@ -38871,60 +39672,33 @@
       "dev": true,
       "requires": {
         "css": "^2.0.0"
-      },
-      "dependencies": {
-        "css": {
-          "version": "2.2.4",
-          "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
-          "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "source-map": "^0.6.1",
-            "source-map-resolve": "^0.5.2",
-            "urix": "^0.1.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "source-map-resolve": {
-          "version": "0.5.3",
-          "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
-          "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
-          "dev": true,
-          "requires": {
-            "atob": "^2.1.2",
-            "decode-uri-component": "^0.2.0",
-            "resolve-url": "^0.2.1",
-            "source-map-url": "^0.4.0",
-            "urix": "^0.1.0"
-          }
-        }
       }
     },
     "css-select": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
-      "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
+      "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
       "dev": true,
       "requires": {
-        "boolbase": "~1.0.0",
-        "css-what": "2.1",
-        "domutils": "1.5.1",
-        "nth-check": "~1.0.1"
+        "boolbase": "^1.0.0",
+        "css-what": "^3.2.1",
+        "domutils": "^1.7.0",
+        "nth-check": "^1.0.2"
       }
     },
+    "css-select-base-adapter": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
+      "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
+      "dev": true
+    },
     "css-tree": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
-      "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
+      "version": "1.0.0-alpha.37",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz",
+      "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==",
       "dev": true,
       "requires": {
-        "mdn-data": "2.0.14",
+        "mdn-data": "2.0.4",
         "source-map": "^0.6.1"
       },
       "dependencies": {
@@ -38937,9 +39711,9 @@
       }
     },
     "css-what": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
-      "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.1.tgz",
+      "integrity": "sha512-wHOppVDKl4vTAOWzJt5Ek37Sgd9qq1Bmj/T1OjvicWbU5W7ru7Pqbn0Jdqii3Drx/h+dixHKXNhZYx7blthL7g==",
       "dev": true
     },
     "cssesc": {
@@ -38949,67 +39723,113 @@
       "dev": true
     },
     "cssnano": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.0.2.tgz",
-      "integrity": "sha512-8JK3EnPsjQsULme9/e5M2hF564f/480hwsdcHvQ7ZtAIMfQ1O3SCfs+b8Mjf5KJxhYApyRshR2QSovEJi2K72Q==",
+      "version": "4.1.10",
+      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz",
+      "integrity": "sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ==",
       "dev": true,
       "requires": {
-        "cosmiconfig": "^7.0.0",
-        "cssnano-preset-default": "^5.0.1",
-        "is-resolvable": "^1.1.0"
+        "cosmiconfig": "^5.0.0",
+        "cssnano-preset-default": "^4.0.7",
+        "is-resolvable": "^1.0.0",
+        "postcss": "^7.0.0"
       }
     },
     "cssnano-preset-default": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.1.3.tgz",
-      "integrity": "sha512-qo9tX+t4yAAZ/yagVV3b+QBKeLklQbmgR3wI7mccrDcR+bEk9iHgZN1E7doX68y9ThznLya3RDmR+nc7l6/2WQ==",
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz",
+      "integrity": "sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA==",
       "dev": true,
       "requires": {
-        "css-declaration-sorter": "^6.0.3",
-        "cssnano-utils": "^2.0.1",
-        "postcss-calc": "^8.0.0",
-        "postcss-colormin": "^5.2.0",
-        "postcss-convert-values": "^5.0.1",
-        "postcss-discard-comments": "^5.0.1",
-        "postcss-discard-duplicates": "^5.0.1",
-        "postcss-discard-empty": "^5.0.1",
-        "postcss-discard-overridden": "^5.0.1",
-        "postcss-merge-longhand": "^5.0.2",
-        "postcss-merge-rules": "^5.0.2",
-        "postcss-minify-font-values": "^5.0.1",
-        "postcss-minify-gradients": "^5.0.1",
-        "postcss-minify-params": "^5.0.1",
-        "postcss-minify-selectors": "^5.1.0",
-        "postcss-normalize-charset": "^5.0.1",
-        "postcss-normalize-display-values": "^5.0.1",
-        "postcss-normalize-positions": "^5.0.1",
-        "postcss-normalize-repeat-style": "^5.0.1",
-        "postcss-normalize-string": "^5.0.1",
-        "postcss-normalize-timing-functions": "^5.0.1",
-        "postcss-normalize-unicode": "^5.0.1",
-        "postcss-normalize-url": "^5.0.2",
-        "postcss-normalize-whitespace": "^5.0.1",
-        "postcss-ordered-values": "^5.0.2",
-        "postcss-reduce-initial": "^5.0.1",
-        "postcss-reduce-transforms": "^5.0.1",
-        "postcss-svgo": "^5.0.2",
-        "postcss-unique-selectors": "^5.0.1"
+        "css-declaration-sorter": "^4.0.1",
+        "cssnano-util-raw-cache": "^4.0.1",
+        "postcss": "^7.0.0",
+        "postcss-calc": "^7.0.1",
+        "postcss-colormin": "^4.0.3",
+        "postcss-convert-values": "^4.0.1",
+        "postcss-discard-comments": "^4.0.2",
+        "postcss-discard-duplicates": "^4.0.2",
+        "postcss-discard-empty": "^4.0.1",
+        "postcss-discard-overridden": "^4.0.1",
+        "postcss-merge-longhand": "^4.0.11",
+        "postcss-merge-rules": "^4.0.3",
+        "postcss-minify-font-values": "^4.0.2",
+        "postcss-minify-gradients": "^4.0.2",
+        "postcss-minify-params": "^4.0.2",
+        "postcss-minify-selectors": "^4.0.2",
+        "postcss-normalize-charset": "^4.0.1",
+        "postcss-normalize-display-values": "^4.0.2",
+        "postcss-normalize-positions": "^4.0.2",
+        "postcss-normalize-repeat-style": "^4.0.2",
+        "postcss-normalize-string": "^4.0.2",
+        "postcss-normalize-timing-functions": "^4.0.2",
+        "postcss-normalize-unicode": "^4.0.1",
+        "postcss-normalize-url": "^4.0.1",
+        "postcss-normalize-whitespace": "^4.0.2",
+        "postcss-ordered-values": "^4.1.2",
+        "postcss-reduce-initial": "^4.0.3",
+        "postcss-reduce-transforms": "^4.0.2",
+        "postcss-svgo": "^4.0.2",
+        "postcss-unique-selectors": "^4.0.1"
       }
     },
-    "cssnano-utils": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-2.0.1.tgz",
-      "integrity": "sha512-i8vLRZTnEH9ubIyfdZCAdIdgnHAUeQeByEeQ2I7oTilvP9oHO6RScpeq3GsFUVqeB8uZgOQ9pw8utofNn32hhQ==",
-      "dev": true,
-      "requires": {}
+    "cssnano-util-get-arguments": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz",
+      "integrity": "sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8=",
+      "dev": true
     },
-    "csso": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
-      "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
+    "cssnano-util-get-match": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz",
+      "integrity": "sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0=",
+      "dev": true
+    },
+    "cssnano-util-raw-cache": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz",
+      "integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==",
       "dev": true,
       "requires": {
-        "css-tree": "^1.1.2"
+        "postcss": "^7.0.0"
+      }
+    },
+    "cssnano-util-same-parent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz",
+      "integrity": "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==",
+      "dev": true
+    },
+    "csso": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-4.0.3.tgz",
+      "integrity": "sha512-NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ==",
+      "dev": true,
+      "requires": {
+        "css-tree": "1.0.0-alpha.39"
+      },
+      "dependencies": {
+        "css-tree": {
+          "version": "1.0.0-alpha.39",
+          "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.39.tgz",
+          "integrity": "sha512-7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA==",
+          "dev": true,
+          "requires": {
+            "mdn-data": "2.0.6",
+            "source-map": "^0.6.1"
+          }
+        },
+        "mdn-data": {
+          "version": "2.0.6",
+          "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.6.tgz",
+          "integrity": "sha512-rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
       }
     },
     "cssom": {
@@ -39085,13 +39905,19 @@
       }
     },
     "debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "requires": {
-        "ms": "2.1.2"
+        "ms": "2.0.0"
       }
     },
+    "debuglog": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz",
+      "integrity": "sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=",
+      "dev": true
+    },
     "decamelize": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
@@ -39099,9 +39925,9 @@
       "dev": true
     },
     "decimal.js": {
-      "version": "10.3.1",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz",
-      "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==",
+      "version": "10.2.1",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.1.tgz",
+      "integrity": "sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==",
       "dev": true
     },
     "decode-uri-component": {
@@ -39111,12 +39937,11 @@
       "dev": true
     },
     "decompress-response": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
-      "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
-      "optional": true,
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
+      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
       "requires": {
-        "mimic-response": "^2.0.0"
+        "mimic-response": "^1.0.0"
       }
     },
     "dedent": {
@@ -39162,6 +39987,14 @@
       "dev": true,
       "requires": {
         "kind-of": "^5.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "dev": true
+        }
       }
     },
     "default-gateway": {
@@ -39311,6 +40144,35 @@
         "isobject": "^3.0.1"
       },
       "dependencies": {
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        },
         "isobject": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
@@ -39381,12 +40243,6 @@
           "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
           "dev": true
         },
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-          "dev": true
-        },
         "rimraf": {
           "version": "2.7.1",
           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -39472,11 +40328,21 @@
       "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA=="
     },
     "detect-node": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
-      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
+      "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
       "dev": true
     },
+    "dezalgo": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz",
+      "integrity": "sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=",
+      "dev": true,
+      "requires": {
+        "asap": "^2.0.0",
+        "wrappy": "1"
+      }
+    },
     "diff": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
@@ -39484,9 +40350,9 @@
       "dev": true
     },
     "diff-sequences": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz",
-      "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==",
+      "version": "26.5.0",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.5.0.tgz",
+      "integrity": "sha512-ZXx86srb/iYy6jG71k++wBN9P9J05UNQ5hQHQd9MtMPvcqXPx/vKU69jfHV637D00Q2gSgPk2D+jSx3l1lDW/Q==",
       "dev": true
     },
     "diffie-hellman": {
@@ -39501,9 +40367,9 @@
       },
       "dependencies": {
         "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
           "dev": true
         }
       }
@@ -39523,9 +40389,9 @@
       "dev": true
     },
     "dns-packet": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz",
-      "integrity": "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
+      "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
       "dev": true,
       "requires": {
         "ip": "^1.1.0",
@@ -39551,13 +40417,21 @@
       }
     },
     "dom-serializer": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
-      "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
+      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
       "dev": true,
       "requires": {
-        "domelementtype": "^1.3.0",
-        "entities": "^1.1.1"
+        "domelementtype": "^2.0.1",
+        "entities": "^2.0.0"
+      },
+      "dependencies": {
+        "domelementtype": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.2.tgz",
+          "integrity": "sha512-wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA==",
+          "dev": true
+        }
       }
     },
     "domain-browser": {
@@ -39599,9 +40473,9 @@
       }
     },
     "domutils": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
-      "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
+      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
       "dev": true,
       "requires": {
         "dom-serializer": "0",
@@ -39650,23 +40524,6 @@
       "requires": {
         "is-plain-object": "^2.0.1",
         "object.defaults": "^1.1.0"
-      },
-      "dependencies": {
-        "is-plain-object": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-          "dev": true,
-          "requires": {
-            "isobject": "^3.0.1"
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        }
       }
     },
     "ecc-jsbn": {
@@ -39689,9 +40546,9 @@
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
     },
     "electron-to-chromium": {
-      "version": "1.3.793",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.793.tgz",
-      "integrity": "sha512-l9NrGV6Mr4ov5mayYPvIWcwklNw5ROmy6rllzz9dCACw9nKE5y+s5uQk+CBJMetxrWZ6QJFsvEfG6WDcH2IGUg==",
+      "version": "1.3.577",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.577.tgz",
+      "integrity": "sha512-dSb64JQSFif/pD8mpVAgSFkbVi6YHbK6JeEziwNNmXlr/Ne2rZtseFK5SM7JoWSLf6gP0gVvRGi4/2ZRhSX/rA==",
       "dev": true
     },
     "elementtree": {
@@ -39703,38 +40560,38 @@
       }
     },
     "elliptic": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
-      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
+      "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.11.9",
-        "brorand": "^1.1.0",
+        "bn.js": "^4.4.0",
+        "brorand": "^1.0.1",
         "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.1",
-        "inherits": "^2.0.4",
-        "minimalistic-assert": "^1.0.1",
-        "minimalistic-crypto-utils": "^1.0.1"
+        "hmac-drbg": "^1.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.0"
       },
       "dependencies": {
         "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
           "dev": true
         }
       }
     },
     "emittery": {
-      "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.7.2.tgz",
-      "integrity": "sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ==",
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.7.1.tgz",
+      "integrity": "sha512-d34LN4L6h18Bzz9xpoku2nPwKxCPlPMr3EEKTkoEBi+1/+b0lcRkRJ1UVyyZaKNeqGR3swcGl6s390DNO4YVgQ==",
       "dev": true
     },
     "emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
     },
     "emojis-list": {
       "version": "3.0.0",
@@ -39751,16 +40608,16 @@
       "version": "0.1.13",
       "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
       "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
-      "optional": true,
+      "devOptional": true,
       "requires": {
         "iconv-lite": "^0.6.2"
       },
       "dependencies": {
         "iconv-lite": {
-          "version": "0.6.3",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-          "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-          "optional": true,
+          "version": "0.6.2",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz",
+          "integrity": "sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==",
+          "devOptional": true,
           "requires": {
             "safer-buffer": ">= 2.1.2 < 3.0.0"
           }
@@ -39786,13 +40643,14 @@
       }
     },
     "enhanced-resolve": {
-      "version": "5.7.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.7.0.tgz",
-      "integrity": "sha512-6njwt/NsZFUKhM6j9U8hzVyD4E4r0x7NQzhTCbcWOJ0IQjNSAoalWmb0AE51Wn+fwan5qVESWi7t2ToBxs9vrw==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz",
+      "integrity": "sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.2.4",
-        "tapable": "^2.2.0"
+        "graceful-fs": "^4.1.2",
+        "memory-fs": "^0.5.0",
+        "tapable": "^1.0.0"
       }
     },
     "enquirer": {
@@ -39802,12 +40660,20 @@
       "dev": true,
       "requires": {
         "ansi-colors": "^4.1.1"
+      },
+      "dependencies": {
+        "ansi-colors": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+          "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+          "dev": true
+        }
       }
     },
     "entities": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
+      "integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==",
       "dev": true
     },
     "env-paths": {
@@ -39818,12 +40684,13 @@
     "err-code": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz",
-      "integrity": "sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA="
+      "integrity": "sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA=",
+      "dev": true
     },
     "errno": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
-      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
+      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
       "dev": true,
       "requires": {
         "prr": "~1.0.1"
@@ -39839,28 +40706,23 @@
       }
     },
     "es-abstract": {
-      "version": "1.18.5",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz",
-      "integrity": "sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==",
+      "version": "1.18.0-next.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
+      "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.1.1",
         "has": "^1.0.3",
-        "has-symbols": "^1.0.2",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.3",
-        "is-negative-zero": "^2.0.1",
-        "is-regex": "^1.1.3",
-        "is-string": "^1.0.6",
-        "object-inspect": "^1.11.0",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.2",
+        "is-negative-zero": "^2.0.0",
+        "is-regex": "^1.1.1",
+        "object-inspect": "^1.8.0",
         "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "string.prototype.trimend": "^1.0.4",
-        "string.prototype.trimstart": "^1.0.4",
-        "unbox-primitive": "^1.0.1"
+        "object.assign": "^4.1.1",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
       }
     },
     "es-to-primitive": {
@@ -39896,11 +40758,26 @@
         "es6-symbol": "^3.1.1"
       }
     },
+    "es6-promise": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
+      "dev": true
+    },
     "es6-promise-plugin": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/es6-promise-plugin/-/es6-promise-plugin-4.2.2.tgz",
       "integrity": "sha512-uoA4aVplXI9oqUYJFBAVRwAqIN9/n9JgrTAUGX3qPbnSZVE5yY1+6/MsoN5f4xsaPO62WjPHOdtts6okMN6tNA=="
     },
+    "es6-promisify": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
+      "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
+      "dev": true,
+      "requires": {
+        "es6-promise": "^4.0.3"
+      }
+    },
     "es6-symbol": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
@@ -39924,9 +40801,9 @@
       }
     },
     "escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.0.tgz",
+      "integrity": "sha512-mAk+hPSO8fLDkhV7V0dXazH5pDc6MrjBTPyD3VeKzxnVFjH1MIxbCdqGZB9O8+EwWakZs3ZCbDS4IpRt79V1ig==",
       "dev": true
     },
     "escape-goat": {
@@ -40006,31 +40883,28 @@
       }
     },
     "eslint": {
-      "version": "7.32.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
-      "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.25.0.tgz",
+      "integrity": "sha512-TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "7.12.11",
-        "@eslint/eslintrc": "^0.4.3",
-        "@humanwhocodes/config-array": "^0.5.0",
+        "@eslint/eslintrc": "^0.4.0",
         "ajv": "^6.10.0",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
         "debug": "^4.0.1",
         "doctrine": "^3.0.0",
         "enquirer": "^2.3.5",
-        "escape-string-regexp": "^4.0.0",
         "eslint-scope": "^5.1.1",
         "eslint-utils": "^2.1.0",
         "eslint-visitor-keys": "^2.0.0",
         "espree": "^7.3.1",
         "esquery": "^1.4.0",
         "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
         "file-entry-cache": "^6.0.1",
         "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^5.1.2",
+        "glob-parent": "^5.0.0",
         "globals": "^13.6.0",
         "ignore": "^4.0.6",
         "import-fresh": "^3.0.0",
@@ -40039,7 +40913,7 @@
         "js-yaml": "^3.13.1",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
+        "lodash": "^4.17.21",
         "minimatch": "^3.0.4",
         "natural-compare": "^1.4.0",
         "optionator": "^0.9.1",
@@ -40048,7 +40922,7 @@
         "semver": "^7.2.1",
         "strip-ansi": "^6.0.0",
         "strip-json-comments": "^3.1.0",
-        "table": "^6.0.9",
+        "table": "^6.0.4",
         "text-table": "^0.2.0",
         "v8-compile-cache": "^2.0.3"
       },
@@ -40062,88 +40936,83 @@
             "@babel/highlight": "^7.10.4"
           }
         },
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "dev": true
         },
         "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
         },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
           "dev": true,
           "requires": {
-            "color-name": "~1.1.4"
+            "ms": "2.1.2"
           }
         },
-        "escape-string-regexp": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-          "dev": true
+        "eslint-scope": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+          "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+          "dev": true,
+          "requires": {
+            "esrecurse": "^4.3.0",
+            "estraverse": "^4.1.1"
+          }
         },
         "globals": {
-          "version": "13.10.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.10.0.tgz",
-          "integrity": "sha512-piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g==",
+          "version": "13.8.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.8.0.tgz",
+          "integrity": "sha512-rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q==",
           "dev": true,
           "requires": {
             "type-fest": "^0.20.2"
           }
         },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
         "ignore": {
           "version": "4.0.6",
           "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
           "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
           "dev": true
         },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+        "lodash": {
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
           "dev": true
         },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
           "dev": true,
           "requires": {
-            "has-flag": "^4.0.0"
+            "ansi-regex": "^5.0.0"
           }
         },
+        "strip-json-comments": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+          "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+          "dev": true
+        },
         "type-fest": {
           "version": "0.20.2",
           "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
@@ -40167,42 +41036,25 @@
       "requires": {
         "debug": "^2.6.9",
         "resolve": "^1.13.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        }
       }
     },
     "eslint-module-utils": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.1.tgz",
-      "integrity": "sha512-ZXI9B8cxAJIH4nfkhTwcRTEAnrVfobYqwjWy/QMCZ8rHkZHFjf9yO4BzpiF9kCSfNlMG54eKigISHpX0+AaT4A==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz",
+      "integrity": "sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==",
       "dev": true,
       "requires": {
-        "debug": "^3.2.7",
+        "debug": "^2.6.9",
         "pkg-dir": "^2.0.0"
       },
       "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+        "pkg-dir": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
+          "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "find-up": "^2.1.0"
           }
         }
       }
@@ -40254,77 +41106,51 @@
       "requires": {}
     },
     "eslint-plugin-import": {
-      "version": "2.23.4",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.23.4.tgz",
-      "integrity": "sha512-6/wP8zZRsnQFiR3iaPFgh5ImVRM1WN5NUWfTIRqwOdeiGJlBcSk82o1FEVq8yXmy4lkIzTo7YhHCIxlU/2HyEQ==",
+      "version": "2.22.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz",
+      "integrity": "sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==",
       "dev": true,
       "requires": {
-        "array-includes": "^3.1.3",
-        "array.prototype.flat": "^1.2.4",
+        "array-includes": "^3.1.1",
+        "array.prototype.flat": "^1.2.3",
+        "contains-path": "^0.1.0",
         "debug": "^2.6.9",
-        "doctrine": "^2.1.0",
+        "doctrine": "1.5.0",
         "eslint-import-resolver-node": "^0.3.4",
-        "eslint-module-utils": "^2.6.1",
-        "find-up": "^2.0.0",
+        "eslint-module-utils": "^2.6.0",
         "has": "^1.0.3",
-        "is-core-module": "^2.4.0",
         "minimatch": "^3.0.4",
-        "object.values": "^1.1.3",
-        "pkg-up": "^2.0.0",
-        "read-pkg-up": "^3.0.0",
-        "resolve": "^1.20.0",
+        "object.values": "^1.1.1",
+        "read-pkg-up": "^2.0.0",
+        "resolve": "^1.17.0",
         "tsconfig-paths": "^3.9.0"
       },
       "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
         "doctrine": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
+          "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
           "dev": true,
           "requires": {
-            "esutils": "^2.0.2"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        },
-        "resolve": {
-          "version": "1.20.0",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
-          "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
-          "dev": true,
-          "requires": {
-            "is-core-module": "^2.2.0",
-            "path-parse": "^1.0.6"
+            "esutils": "^2.0.2",
+            "isarray": "^1.0.0"
           }
         }
       }
     },
     "eslint-plugin-jest": {
-      "version": "24.4.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.4.0.tgz",
-      "integrity": "sha512-8qnt/hgtZ94E9dA6viqfViKBfkJwFHXgJmTWlMGDgunw1XJEGqm3eiPjDsTanM3/u/3Az82nyQM9GX7PM/QGmg==",
+      "version": "24.3.6",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.3.6.tgz",
+      "integrity": "sha512-WOVH4TIaBLIeCX576rLcOgjNXqP+jNlCiEmRgFTfQtJ52DpwnIQKAVGlGPAN7CZ33bW6eNfHD6s8ZbEUTQubJg==",
       "dev": true,
       "requires": {
         "@typescript-eslint/experimental-utils": "^4.0.1"
       }
     },
     "eslint-plugin-jsdoc": {
-      "version": "32.3.4",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-32.3.4.tgz",
-      "integrity": "sha512-xSWfsYvffXnN0OkwLnB7MoDDDDjqcp46W7YlY1j7JyfAQBQ+WnGCfLov3gVNZjUGtK9Otj8mEhTZTqJu4QtIGA==",
+      "version": "32.3.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-32.3.3.tgz",
+      "integrity": "sha512-WxXohbMYlZvCt3r7MepwT++nTLsO4CPegWcm5toM4IGq3MBmYkG+Uf5yDa+n1MwPXLg+KbJqAsI19hmkVD7MPg==",
       "dev": true,
       "requires": {
         "comment-parser": "1.1.5",
@@ -40336,6 +41162,27 @@
         "spdx-expression-parse": "^3.0.1"
       },
       "dependencies": {
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "lodash": {
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+          "dev": true
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        },
         "semver": {
           "version": "7.3.5",
           "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
@@ -40362,12 +41209,12 @@
       "requires": {}
     },
     "eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
       "dev": true,
       "requires": {
-        "esrecurse": "^4.3.0",
+        "esrecurse": "^4.1.0",
         "estraverse": "^4.1.1"
       }
     },
@@ -40389,9 +41236,9 @@
       }
     },
     "eslint-visitor-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz",
+      "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==",
       "dev": true
     },
     "espree": {
@@ -40405,6 +41252,12 @@
         "eslint-visitor-keys": "^1.3.0"
       },
       "dependencies": {
+        "acorn": {
+          "version": "7.4.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+          "dev": true
+        },
         "eslint-visitor-keys": {
           "version": "1.3.0",
           "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
@@ -40477,15 +41330,15 @@
       "dev": true
     },
     "events": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.2.0.tgz",
+      "integrity": "sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==",
       "dev": true
     },
     "eventsource": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.1.0.tgz",
-      "integrity": "sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz",
+      "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
       "dev": true,
       "requires": {
         "original": "^1.0.0"
@@ -40502,15 +41355,15 @@
       }
     },
     "exec-sh": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.6.tgz",
-      "integrity": "sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==",
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz",
+      "integrity": "sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==",
       "dev": true
     },
     "execa": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
-      "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-4.0.3.tgz",
+      "integrity": "sha512-WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A==",
       "requires": {
         "cross-spawn": "^7.0.0",
         "get-stream": "^5.0.0",
@@ -40544,15 +41397,6 @@
         "to-regex": "^3.0.1"
       },
       "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
         "define-property": {
           "version": "0.2.5",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
@@ -40570,69 +41414,6 @@
           "requires": {
             "is-extendable": "^0.1.0"
           }
-        },
-        "is-accessor-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-data-descriptor": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^0.1.6",
-            "is-data-descriptor": "^0.1.4",
-            "kind-of": "^5.0.0"
-          }
-        },
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
         }
       }
     },
@@ -40652,37 +41433,17 @@
       }
     },
     "expect": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-26.6.2.tgz",
-      "integrity": "sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-26.5.2.tgz",
+      "integrity": "sha512-ccTGrXZd8DZCcvCz4htGXTkd/LOoy6OEtiDS38x3/VVf6E4AQL0QoeksBiw7BtGR5xDNiRYPB8GN6pfbuTOi7w==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.6.2",
+        "@jest/types": "^26.5.2",
         "ansi-styles": "^4.0.0",
         "jest-get-type": "^26.3.0",
-        "jest-matcher-utils": "^26.6.2",
-        "jest-message-util": "^26.6.2",
+        "jest-matcher-utils": "^26.5.2",
+        "jest-message-util": "^26.5.2",
         "jest-regex-util": "^26.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        }
       }
     },
     "express": {
@@ -40720,21 +41481,6 @@
         "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        }
       }
     },
     "ext": {
@@ -40747,9 +41493,9 @@
       },
       "dependencies": {
         "type": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/type/-/type-2.5.0.tgz",
-          "integrity": "sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==",
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/type/-/type-2.1.0.tgz",
+          "integrity": "sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA==",
           "dev": true
         }
       }
@@ -40760,19 +41506,23 @@
       "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
     },
     "extend-shallow": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
-      "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
       "dev": true,
       "requires": {
-        "kind-of": "^1.1.0"
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
       },
       "dependencies": {
-        "kind-of": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
-          "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
-          "dev": true
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
         }
       }
     },
@@ -40830,11 +41580,34 @@
             "is-extendable": "^0.1.0"
           }
         },
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
         }
       }
     },
@@ -40844,9 +41617,9 @@
       "integrity": "sha1-4mifjzVvrWLMplo6kcXfX5VRaS8="
     },
     "faker": {
-      "version": "5.5.3",
-      "resolved": "https://registry.npmjs.org/faker/-/faker-5.5.3.tgz",
-      "integrity": "sha512-wLTv2a28wjUyWkbnX7u/ABZBkUkIF2fCd73V6P2oFqEGEktDfzWx4UxrSqtPRw0xPRAcjeAOIiJWqZm3pP4u3g==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/faker/-/faker-5.1.0.tgz",
+      "integrity": "sha512-RrWKFSSA/aNLP0g3o2WW1Zez7/MnMr7xkiZmoCfAGZmdkDQZ6l2KtuXHN5XjdvpRjDl8+3vf+Rrtl06Z352+Mw==",
       "dev": true
     },
     "fancy-log": {
@@ -40867,15 +41640,16 @@
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
     "fast-glob": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz",
-      "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz",
+      "integrity": "sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==",
       "requires": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
+        "glob-parent": "^5.1.0",
         "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
+        "micromatch": "^4.0.2",
+        "picomatch": "^2.2.1"
       }
     },
     "fast-json-parse": {
@@ -40895,23 +41669,23 @@
       "dev": true
     },
     "fast-safe-stringify": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.8.tgz",
-      "integrity": "sha512-lXatBjf3WPjmWD6DpIZxkeSsCOwqI0maYMpgDlx8g4U2qi4lbjA9oH/HD2a87G+KfsUmo5WbJFmqBZlPxtptag==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz",
+      "integrity": "sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==",
       "dev": true
     },
     "fastq": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.1.tgz",
-      "integrity": "sha512-HOnr8Mc60eNYl1gzwp6r5RoUyAn5/glBolUzP/Ez6IFVPMPirxn/9phgL6zhOtaTy7ISwPvQ+wT+hfcRZh/bzw==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz",
+      "integrity": "sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==",
       "requires": {
         "reusify": "^1.0.4"
       }
     },
     "faye-websocket": {
-      "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
-      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
+      "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
       "dev": true,
       "requires": {
         "websocket-driver": ">=0.5.1"
@@ -40942,10 +41716,9 @@
       "dev": true
     },
     "figures": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-      "dev": true,
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
       "requires": {
         "escape-string-regexp": "^1.0.5"
       }
@@ -40960,58 +41733,21 @@
       }
     },
     "file-loader": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
-      "integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.0.0.tgz",
+      "integrity": "sha512-/aMOAYEFXDdjG0wytpTL5YQLfZnnTmLNjn+AIrJ/6HVnTfDqLsVKUUwkDf4I4kgex36BvjuXEn/TX9B/1ESyqQ==",
       "dev": true,
       "requires": {
         "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "ajv-keywords": {
-          "version": "3.5.2",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-          "dev": true,
-          "requires": {}
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        },
-        "schema-utils": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.8",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
-          }
-        }
+        "schema-utils": "^2.6.5"
       }
     },
     "file-uri-to-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-2.0.0.tgz",
-      "integrity": "sha512-hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg==",
-      "dev": true
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "dev": true,
+      "optional": true
     },
     "fill-range": {
       "version": "7.0.1",
@@ -41033,21 +41769,6 @@
         "parseurl": "~1.3.3",
         "statuses": "~1.5.0",
         "unpipe": "~1.0.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        }
       }
     },
     "find-cache-dir": {
@@ -41135,12 +41856,6 @@
         "resolve-dir": "^1.0.1"
       },
       "dependencies": {
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-          "dev": true
-        },
         "braces": {
           "version": "2.3.2",
           "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
@@ -41167,25 +41882,9 @@
               "requires": {
                 "is-extendable": "^0.1.0"
               }
-            },
-            "is-extendable": {
-              "version": "0.1.1",
-              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-              "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-              "dev": true
             }
           }
         },
-        "extend-shallow": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-          "dev": true,
-          "requires": {
-            "assign-symbols": "^1.0.0",
-            "is-extendable": "^1.0.1"
-          }
-        },
         "fill-range": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -41206,12 +41905,6 @@
               "requires": {
                 "is-extendable": "^0.1.0"
               }
-            },
-            "is-extendable": {
-              "version": "0.1.1",
-              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-              "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-              "dev": true
             }
           }
         },
@@ -41241,12 +41934,6 @@
           "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
           "dev": true
         },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        },
         "micromatch": {
           "version": "3.1.10",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -41291,23 +41978,6 @@
         "object.defaults": "^1.1.0",
         "object.pick": "^1.2.0",
         "parse-filepath": "^1.0.1"
-      },
-      "dependencies": {
-        "is-plain-object": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-          "dev": true,
-          "requires": {
-            "isobject": "^3.0.1"
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        }
       }
     },
     "flagged-respawn": {
@@ -41327,9 +41997,9 @@
       }
     },
     "flatted": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz",
-      "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz",
+      "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==",
       "dev": true
     },
     "flush-write-stream": {
@@ -41343,9 +42013,9 @@
       }
     },
     "follow-redirects": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz",
-      "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz",
+      "integrity": "sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==",
       "dev": true
     },
     "for-in": {
@@ -41385,15 +42055,9 @@
       "dev": true
     },
     "forwarded": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="
-    },
-    "fraction.js": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.1.tgz",
-      "integrity": "sha512-MHOhvvxHTfRFpF1geTK9czMIZ6xclsEor2wkIGYYq+PxcQqT7vStJqjhe6S1TenZrMZzo+wlqOufBDVepUEgPg==",
-      "dev": true
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
+      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ="
     },
     "fragment-cache": {
       "version": "0.2.1",
@@ -41472,9 +42136,9 @@
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
     "fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
+      "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
       "dev": true,
       "optional": true
     },
@@ -41517,7 +42181,8 @@
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
     },
     "functional-red-black-tree": {
       "version": "1.0.1",
@@ -41573,10 +42238,16 @@
         }
       }
     },
+    "genfun": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/genfun/-/genfun-5.0.0.tgz",
+      "integrity": "sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==",
+      "dev": true
+    },
     "gensync": {
-      "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "version": "1.0.0-beta.1",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz",
+      "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==",
       "dev": true
     },
     "get-caller-file": {
@@ -41624,6 +42295,21 @@
         "ftp": "^0.3.10"
       },
       "dependencies": {
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "file-uri-to-path": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-2.0.0.tgz",
+          "integrity": "sha512-hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg==",
+          "dev": true
+        },
         "fs-extra": {
           "version": "8.1.0",
           "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
@@ -41644,6 +42330,12 @@
             "graceful-fs": "^4.1.6"
           }
         },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        },
         "universalify": {
           "version": "0.1.2",
           "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
@@ -41686,9 +42378,9 @@
       }
     },
     "glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
       "requires": {
         "is-glob": "^4.0.1"
       }
@@ -41768,12 +42460,6 @@
             }
           }
         },
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-          "dev": true
-        },
         "binary-extensions": {
           "version": "1.13.1",
           "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
@@ -41796,6 +42482,17 @@
             "snapdragon-node": "^2.0.1",
             "split-string": "^3.0.2",
             "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
           }
         },
         "chokidar": {
@@ -41818,15 +42515,6 @@
             "upath": "^1.1.1"
           }
         },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
         "fill-range": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -41837,6 +42525,17 @@
             "is-number": "^3.0.0",
             "repeat-string": "^1.6.1",
             "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
           }
         },
         "fsevents": {
@@ -41880,12 +42579,6 @@
             "binary-extensions": "^1.0.0"
           }
         },
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true
-        },
         "is-number": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -41893,15 +42586,17 @@
           "dev": true,
           "requires": {
             "kind-of": "^3.0.2"
-          }
-        },
-        "is-plain-object": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-          "dev": true,
-          "requires": {
-            "isobject": "^3.0.1"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
           }
         },
         "isobject": {
@@ -41910,15 +42605,6 @@
           "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
           "dev": true
         },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        },
         "micromatch": {
           "version": "3.1.10",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -41938,33 +42624,6 @@
             "regex-not": "^1.0.0",
             "snapdragon": "^0.8.1",
             "to-regex": "^3.0.2"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "3.0.2",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-              "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-              "dev": true,
-              "requires": {
-                "assign-symbols": "^1.0.0",
-                "is-extendable": "^1.0.1"
-              }
-            },
-            "is-extendable": {
-              "version": "1.0.1",
-              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-              "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-              "dev": true,
-              "requires": {
-                "is-plain-object": "^2.0.4"
-              }
-            },
-            "kind-of": {
-              "version": "6.0.3",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-              "dev": true
-            }
           }
         },
         "readdirp": {
@@ -42029,12 +42688,6 @@
         "which": "^1.2.14"
       },
       "dependencies": {
-        "ini": {
-          "version": "1.3.8",
-          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-          "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-          "dev": true
-        },
         "which": {
           "version": "1.3.1",
           "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -42053,9 +42706,9 @@
       "dev": true
     },
     "globby": {
-      "version": "11.0.4",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
-      "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz",
+      "integrity": "sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==",
       "requires": {
         "array-union": "^2.1.0",
         "dir-glob": "^3.0.1",
@@ -42092,14 +42745,6 @@
         "url-parse-lax": "^3.0.0"
       },
       "dependencies": {
-        "decompress-response": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
-          "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
-          "requires": {
-            "mimic-response": "^1.0.0"
-          }
-        },
         "get-stream": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
@@ -42107,18 +42752,13 @@
           "requires": {
             "pump": "^3.0.0"
           }
-        },
-        "mimic-response": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-          "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="
         }
       }
     },
     "graceful-fs": {
-      "version": "4.2.6",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
-      "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ=="
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="
     },
     "growly": {
       "version": "1.3.0",
@@ -42137,32 +42777,6 @@
         "gulp-cli": "^2.2.0",
         "undertaker": "^1.2.1",
         "vinyl-fs": "^3.0.0"
-      }
-    },
-    "gulp-cli": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.3.0.tgz",
-      "integrity": "sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==",
-      "dev": true,
-      "requires": {
-        "ansi-colors": "^1.0.1",
-        "archy": "^1.0.0",
-        "array-sort": "^1.0.0",
-        "color-support": "^1.1.3",
-        "concat-stream": "^1.6.0",
-        "copy-props": "^2.0.1",
-        "fancy-log": "^1.3.2",
-        "gulplog": "^1.0.0",
-        "interpret": "^1.4.0",
-        "isobject": "^3.0.1",
-        "liftoff": "^3.1.0",
-        "matchdep": "^2.0.0",
-        "mute-stdout": "^1.0.0",
-        "pretty-hrtime": "^1.0.0",
-        "replace-homedir": "^1.0.0",
-        "semver-greatest-satisfied-range": "^1.1.0",
-        "v8flags": "^3.2.0",
-        "yargs": "^7.1.0"
       },
       "dependencies": {
         "ansi-colors": {
@@ -42213,6 +42827,32 @@
           "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
           "dev": true
         },
+        "gulp-cli": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.3.0.tgz",
+          "integrity": "sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==",
+          "dev": true,
+          "requires": {
+            "ansi-colors": "^1.0.1",
+            "archy": "^1.0.0",
+            "array-sort": "^1.0.0",
+            "color-support": "^1.1.3",
+            "concat-stream": "^1.6.0",
+            "copy-props": "^2.0.1",
+            "fancy-log": "^1.3.2",
+            "gulplog": "^1.0.0",
+            "interpret": "^1.4.0",
+            "isobject": "^3.0.1",
+            "liftoff": "^3.1.0",
+            "matchdep": "^2.0.0",
+            "mute-stdout": "^1.0.0",
+            "pretty-hrtime": "^1.0.0",
+            "replace-homedir": "^1.0.0",
+            "semver-greatest-satisfied-range": "^1.1.0",
+            "v8flags": "^3.2.0",
+            "yargs": "^7.1.0"
+          }
+        },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
@@ -42297,6 +42937,12 @@
             "read-pkg": "^1.0.0"
           }
         },
+        "require-main-filename": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+          "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
+          "dev": true
+        },
         "string-width": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@@ -42326,6 +42972,12 @@
             "is-utf8": "^0.2.0"
           }
         },
+        "which-module": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
+          "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
+          "dev": true
+        },
         "wrap-ansi": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
@@ -42337,15 +42989,15 @@
           }
         },
         "y18n": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
-          "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==",
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
           "dev": true
         },
         "yargs": {
-          "version": "7.1.2",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.2.tgz",
-          "integrity": "sha512-ZEjj/dQYQy0Zx0lgLMLR8QuaqTihnxirir7EwUHp1Axq4e3+k8jXU5K0VLbNvedv1f4EWtBonDIZm0NUr+jCcA==",
+          "version": "7.1.1",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.1.tgz",
+          "integrity": "sha512-huO4Fr1f9PmiJJdll5kwoS2e4GqzGSsMT3PPMpOwoVkOK8ckqAewMTZyA6LXVQWflleb/Z8oPBEvNsMft0XE+g==",
           "dev": true,
           "requires": {
             "camelcase": "^3.0.0",
@@ -42360,13 +43012,13 @@
             "string-width": "^1.0.2",
             "which-module": "^1.0.0",
             "y18n": "^3.2.1",
-            "yargs-parser": "^5.0.1"
+            "yargs-parser": "5.0.0-security.0"
           }
         },
         "yargs-parser": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.1.tgz",
-          "integrity": "sha512-wpav5XYiddjXxirPoCTUPbqM0PXvJ9hiBMvuJgInvo4/lAOTZzUprArw17q2O1P2+GHhbBr18/iQwjL5Z9BqfA==",
+          "version": "5.0.0-security.0",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0-security.0.tgz",
+          "integrity": "sha512-T69y4Ps64LNesYxeYGYPvfoMTt/7y1XtfpIslUeK4um+9Hu7hlGoRtaDLvdXb7+/tfq4opVa2HRY5xGip022rQ==",
           "dev": true,
           "requires": {
             "camelcase": "^3.0.0",
@@ -42425,28 +43077,6 @@
             "ansi-wrap": "^0.1.0"
           }
         },
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-          "dev": true
-        },
-        "arr-union": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-          "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-          "dev": true
-        },
-        "extend-shallow": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-          "dev": true,
-          "requires": {
-            "assign-symbols": "^1.0.0",
-            "is-extendable": "^1.0.1"
-          }
-        },
         "plugin-error": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
@@ -42552,30 +43182,13 @@
       "requires": {
         "ajv": "^6.12.3",
         "har-schema": "^2.0.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-        }
       }
     },
     "has": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
       "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
       "requires": {
         "function-bind": "^1.1.1"
       }
@@ -42587,14 +43200,14 @@
       "dev": true
     },
     "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
     },
     "has-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
+      "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
       "dev": true
     },
     "has-unicode": {
@@ -42740,9 +43353,9 @@
       }
     },
     "hosted-git-info": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.8.tgz",
-      "integrity": "sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.5.tgz",
+      "integrity": "sha512-i4dpK6xj9BIpVOTboXIlKG9+8HMKggcrMX7WA24xZtKwX0TPelq/rbaS5rCKeNX8sJXZJGdSxpnEGtta+wismQ==",
       "requires": {
         "lru-cache": "^6.0.0"
       }
@@ -42771,6 +43384,12 @@
       "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg=",
       "dev": true
     },
+    "html-comment-regex": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz",
+      "integrity": "sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==",
+      "dev": true
+    },
     "html-encoding-sniffer": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
@@ -42781,9 +43400,9 @@
       }
     },
     "html-entities": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.4.0.tgz",
-      "integrity": "sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.3.1.tgz",
+      "integrity": "sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==",
       "dev": true
     },
     "html-escaper": {
@@ -42805,6 +43424,14 @@
         "param-case": "2.1.x",
         "relateurl": "0.2.x",
         "uglify-js": "3.4.x"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.17.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
+          "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
+          "dev": true
+        }
       }
     },
     "htmlparser2": {
@@ -42821,6 +43448,12 @@
         "readable-stream": "^3.1.1"
       },
       "dependencies": {
+        "entities": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+          "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
+          "dev": true
+        },
         "readable-stream": {
           "version": "3.6.0",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
@@ -42864,12 +43497,6 @@
         }
       }
     },
-    "http-parser-js": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz",
-      "integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==",
-      "dev": true
-    },
     "http-proxy": {
       "version": "1.18.1",
       "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
@@ -42882,13 +43509,24 @@
       }
     },
     "http-proxy-agent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
-      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz",
+      "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==",
+      "dev": true,
       "requires": {
-        "@tootallnate/once": "1",
-        "agent-base": "6",
-        "debug": "4"
+        "agent-base": "4",
+        "debug": "3.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
       }
     },
     "http-proxy-middleware": {
@@ -42903,12 +43541,6 @@
         "micromatch": "^3.1.10"
       },
       "dependencies": {
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-          "dev": true
-        },
         "braces": {
           "version": "2.3.2",
           "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
@@ -42935,25 +43567,9 @@
               "requires": {
                 "is-extendable": "^0.1.0"
               }
-            },
-            "is-extendable": {
-              "version": "0.1.1",
-              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-              "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-              "dev": true
             }
           }
         },
-        "extend-shallow": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-          "dev": true,
-          "requires": {
-            "assign-symbols": "^1.0.0",
-            "is-extendable": "^1.0.1"
-          }
-        },
         "fill-range": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -42974,12 +43590,6 @@
               "requires": {
                 "is-extendable": "^0.1.0"
               }
-            },
-            "is-extendable": {
-              "version": "0.1.1",
-              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-              "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-              "dev": true
             }
           }
         },
@@ -43009,12 +43619,6 @@
           "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
           "dev": true
         },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        },
         "micromatch": {
           "version": "3.1.10",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -43065,12 +43669,30 @@
       "dev": true
     },
     "https-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
+      "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
+      "dev": true,
       "requires": {
-        "agent-base": "6",
-        "debug": "4"
+        "agent-base": "^4.3.0",
+        "debug": "^3.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
       }
     },
     "human-signals": {
@@ -43095,16 +43717,18 @@
       }
     },
     "icss-utils": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
-      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz",
+      "integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==",
       "dev": true,
-      "requires": {}
+      "requires": {
+        "postcss": "^7.0.14"
+      }
     },
     "ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
+      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
       "devOptional": true
     },
     "iferr": {
@@ -43119,9 +43743,9 @@
       "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="
     },
     "ignore-walk": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.4.tgz",
-      "integrity": "sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz",
+      "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==",
       "requires": {
         "minimatch": "^3.0.4"
       }
@@ -43138,82 +43762,54 @@
       "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
       "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps="
     },
+    "import-cwd": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
+      "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
+      "dev": true,
+      "requires": {
+        "import-from": "^2.1.0"
+      }
+    },
     "import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
+      "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
       "requires": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
       }
     },
+    "import-from": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
+      "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
+      "dev": true,
+      "requires": {
+        "resolve-from": "^3.0.0"
+      },
+      "dependencies": {
+        "resolve-from": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+          "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+          "dev": true
+        }
+      }
+    },
     "import-lazy": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
       "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM="
     },
     "import-local": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
-      "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
+      "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
       "dev": true,
       "requires": {
-        "pkg-dir": "^4.2.0",
-        "resolve-cwd": "^3.0.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^5.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^4.1.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.2.0"
-          }
-        },
-        "path-exists": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-          "dev": true
-        },
-        "pkg-dir": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-          "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-          "dev": true,
-          "requires": {
-            "find-up": "^4.0.0"
-          }
-        }
+        "pkg-dir": "^3.0.0",
+        "resolve-cwd": "^2.0.0"
       }
     },
     "imurmurhash": {
@@ -43226,6 +43822,12 @@
       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
       "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="
     },
+    "indexes-of": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
+      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
+      "dev": true
+    },
     "infer-owner": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
@@ -43246,10 +43848,9 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "ini": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz",
-      "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==",
-      "dev": true
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
     },
     "init-package-json": {
       "version": "1.10.3",
@@ -43290,83 +43891,73 @@
       }
     },
     "inquirer": {
-      "version": "7.3.3",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz",
-      "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==",
-      "dev": true,
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz",
+      "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==",
       "requires": {
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^3.0.0",
+        "ansi-escapes": "^3.2.0",
+        "chalk": "^2.4.2",
+        "cli-cursor": "^2.1.0",
+        "cli-width": "^2.0.0",
         "external-editor": "^3.0.3",
-        "figures": "^3.0.0",
-        "lodash": "^4.17.19",
-        "mute-stream": "0.0.8",
-        "run-async": "^2.4.0",
-        "rxjs": "^6.6.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
+        "figures": "^2.0.0",
+        "lodash": "^4.17.12",
+        "mute-stream": "0.0.7",
+        "run-async": "^2.2.0",
+        "rxjs": "^6.4.0",
+        "string-width": "^2.1.0",
+        "strip-ansi": "^5.1.0",
         "through": "^2.3.6"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "requires": {
-            "color-convert": "^2.0.1"
+            "color-convert": "^1.9.0"
           }
         },
         "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
           "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
           }
         },
         "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
           "requires": {
-            "color-name": "~1.1.4"
+            "color-name": "1.1.3"
           }
         },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+        },
         "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
         },
-        "rxjs": {
-          "version": "6.6.7",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-          "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
-          "dev": true,
-          "requires": {
-            "tslib": "^1.9.0"
-          }
+        "mute-stream": {
+          "version": "0.0.7",
+          "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+          "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
         },
         "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
           "requires": {
-            "has-flag": "^4.0.0"
+            "has-flag": "^3.0.0"
           }
-        },
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-          "dev": true
         }
       }
     },
@@ -43386,219 +43977,48 @@
         "uuid": "^3.3.2"
       },
       "dependencies": {
-        "ansi-escapes": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
-          "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="
-        },
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
-        },
-        "cli-cursor": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
-          "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "requires": {
-            "restore-cursor": "^2.0.0"
+            "color-convert": "^1.9.0"
           }
         },
-        "cli-width": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
-          "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw=="
-        },
-        "cross-spawn": {
-          "version": "6.0.5",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
           "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
           }
         },
-        "execa": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
           "requires": {
-            "cross-spawn": "^6.0.0",
-            "get-stream": "^4.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
+            "color-name": "1.1.3"
           }
         },
-        "figures": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-          "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
           "requires": {
-            "escape-string-regexp": "^1.0.5"
-          }
-        },
-        "get-stream": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        },
-        "inquirer": {
-          "version": "6.5.2",
-          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz",
-          "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==",
-          "requires": {
-            "ansi-escapes": "^3.2.0",
-            "chalk": "^2.4.2",
-            "cli-cursor": "^2.1.0",
-            "cli-width": "^2.0.0",
-            "external-editor": "^3.0.3",
-            "figures": "^2.0.0",
-            "lodash": "^4.17.12",
-            "mute-stream": "0.0.7",
-            "run-async": "^2.2.0",
-            "rxjs": "^6.4.0",
-            "string-width": "^2.1.0",
-            "strip-ansi": "^5.1.0",
-            "through": "^2.3.6"
-          }
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
-        },
-        "is-stream": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-          "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
-        },
-        "mimic-fn": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-          "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
-        },
-        "mute-stream": {
-          "version": "0.0.7",
-          "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
-          "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
-        },
-        "npm-run-path": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-          "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-          "requires": {
-            "path-key": "^2.0.0"
-          }
-        },
-        "onetime": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-          "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
-          "requires": {
-            "mimic-fn": "^1.0.0"
-          }
-        },
-        "os-name": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/os-name/-/os-name-3.1.0.tgz",
-          "integrity": "sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==",
-          "requires": {
-            "macos-release": "^2.2.0",
-            "windows-release": "^3.1.0"
-          }
-        },
-        "path-key": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-          "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
-        },
-        "restore-cursor": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
-          "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
-          "requires": {
-            "onetime": "^2.0.0",
-            "signal-exit": "^3.0.2"
-          }
-        },
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
-        },
-        "shebang-command": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-          "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-          "requires": {
-            "shebang-regex": "^1.0.0"
-          }
-        },
-        "shebang-regex": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-          "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-              "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
-            },
-            "strip-ansi": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-              "requires": {
-                "ansi-regex": "^3.0.0"
-              }
-            }
-          }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        },
-        "uuid": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
-        },
-        "which": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        },
-        "windows-release": {
-          "version": "3.3.3",
-          "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-3.3.3.tgz",
-          "integrity": "sha512-OSOGH1QYiW5yVor9TtmXKQvt2vjQqbYS+DqmsZw+r7xDwLXEeT3JGW0ZppFmHx4diyXmxt238KFR3N9jzevBRg==",
-          "requires": {
-            "execa": "^1.0.0"
+            "has-flag": "^3.0.0"
           }
         }
       }
@@ -43618,23 +44038,21 @@
         "ipaddr.js": "^1.9.0"
       }
     },
-    "internal-slot": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
-      "dev": true,
-      "requires": {
-        "get-intrinsic": "^1.1.0",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
-      }
-    },
     "interpret": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
       "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
       "dev": true
     },
+    "invariant": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
+      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+      "dev": true,
+      "requires": {
+        "loose-envify": "^1.0.0"
+      }
+    },
     "invert-kv": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
@@ -43642,9 +44060,9 @@
       "dev": true
     },
     "ionicons": {
-      "version": "5.5.3",
-      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz",
-      "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==",
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.1.tgz",
+      "integrity": "sha512-1auVisfaXmkmxINer8Q3kJGHP1vSxk86hf7By95eJ+Av9+oBcNuAEBfSe3jaMaGRVxVw8U/2j23MFq7R3c0HPg==",
       "requires": {
         "@stencil/core": "^2.5.0"
       }
@@ -43701,36 +44119,36 @@
       }
     },
     "is-absolute-url": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz",
-      "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
+      "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=",
       "dev": true
     },
     "is-accessor-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
       "dev": true,
       "requires": {
-        "kind-of": "^6.0.0"
+        "kind-of": "^3.0.2"
       },
       "dependencies": {
         "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
         }
       }
     },
     "is-arguments": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.0.tgz",
-      "integrity": "sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.0"
-      }
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
+      "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==",
+      "dev": true
     },
     "is-arrayish": {
       "version": "0.2.1",
@@ -43739,9 +44157,9 @@
       "dev": true
     },
     "is-bigint": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.2.tgz",
-      "integrity": "sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.1.tgz",
+      "integrity": "sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg==",
       "dev": true
     },
     "is-binary-path": {
@@ -43754,12 +44172,12 @@
       }
     },
     "is-boolean-object": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.1.tgz",
-      "integrity": "sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.0.tgz",
+      "integrity": "sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.2"
+        "call-bind": "^1.0.0"
       }
     },
     "is-buffer": {
@@ -43769,9 +44187,9 @@
       "dev": true
     },
     "is-callable": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
-      "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz",
+      "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==",
       "dev": true
     },
     "is-ci": {
@@ -43794,96 +44212,69 @@
         "hsla-regex": "^1.0.0",
         "rgb-regex": "^1.0.1",
         "rgba-regex": "^1.0.0"
-      },
-      "dependencies": {
-        "css-color-names": {
-          "version": "0.0.4",
-          "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
-          "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
-          "dev": true
-        }
-      }
-    },
-    "is-core-module": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.5.0.tgz",
-      "integrity": "sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg==",
-      "requires": {
-        "has": "^1.0.3"
       }
     },
     "is-data-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
       "dev": true,
       "requires": {
-        "kind-of": "^6.0.0"
+        "kind-of": "^3.0.2"
       },
       "dependencies": {
         "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
         }
       }
     },
     "is-date-object": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.4.tgz",
-      "integrity": "sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
+      "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==",
       "dev": true
     },
     "is-descriptor": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
       "dev": true,
       "requires": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
       },
       "dependencies": {
         "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
           "dev": true
         }
       }
     },
+    "is-directory": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
+      "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
+      "dev": true
+    },
     "is-docker": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz",
+      "integrity": "sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw=="
     },
     "is-extendable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-      "dev": true,
-      "requires": {
-        "is-plain-object": "^2.0.4"
-      },
-      "dependencies": {
-        "is-plain-object": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-          "dev": true,
-          "requires": {
-            "isobject": "^3.0.1"
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        }
-      }
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true
     },
     "is-extglob": {
       "version": "2.1.1",
@@ -43891,9 +44282,9 @@
       "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
     },
     "is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
     },
     "is-generator-fn": {
       "version": "2.1.0",
@@ -43936,9 +44327,9 @@
       "dev": true
     },
     "is-negative-zero": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
-      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz",
+      "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=",
       "dev": true
     },
     "is-npm": {
@@ -43952,9 +44343,9 @@
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
     },
     "is-number-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.5.tgz",
-      "integrity": "sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.4.tgz",
+      "integrity": "sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==",
       "dev": true
     },
     "is-obj": {
@@ -43989,30 +44380,46 @@
       }
     },
     "is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz",
+      "integrity": "sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg=="
     },
-    "is-plain-object": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
-      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+    "is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
       "dev": true
     },
+    "is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.1"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        }
+      }
+    },
     "is-potential-custom-element-name": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
-      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz",
+      "integrity": "sha1-DFLlS8yjkbssSUsh6GJtczbG45c=",
       "dev": true
     },
     "is-regex": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz",
-      "integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
+      "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.2",
-        "has-symbols": "^1.0.2"
+        "has-symbols": "^1.0.1"
       }
     },
     "is-relative": {
@@ -44031,23 +44438,32 @@
       "dev": true
     },
     "is-stream": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
+      "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="
     },
     "is-string": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.6.tgz",
-      "integrity": "sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz",
+      "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==",
       "dev": true
     },
-    "is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+    "is-svg": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz",
+      "integrity": "sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==",
       "dev": true,
       "requires": {
-        "has-symbols": "^1.0.2"
+        "html-comment-regex": "^1.1.0"
+      }
+    },
+    "is-symbol": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
+      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
+      "dev": true,
+      "requires": {
+        "has-symbols": "^1.0.1"
       }
     },
     "is-typedarray": {
@@ -44064,12 +44480,6 @@
         "unc-path-regex": "^0.1.2"
       }
     },
-    "is-unicode-supported": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
-      "dev": true
-    },
     "is-utf8": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
@@ -44082,12 +44492,6 @@
       "integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=",
       "dev": true
     },
-    "is-what": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz",
-      "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==",
-      "dev": true
-    },
     "is-windows": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
@@ -44162,23 +44566,6 @@
         "istanbul-lib-coverage": "^3.0.0",
         "make-dir": "^3.0.0",
         "supports-color": "^7.1.0"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
       }
     },
     "istanbul-lib-source-maps": {
@@ -44192,6 +44579,21 @@
         "source-map": "^0.6.1"
       },
       "dependencies": {
+        "debug": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -44211,67 +44613,26 @@
       }
     },
     "jest": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-26.6.3.tgz",
-      "integrity": "sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-26.5.2.tgz",
+      "integrity": "sha512-4HFabJVwsgDwul/7rhXJ3yFAF/aUkVIXiJWmgFxb+WMdZG39fVvOwYAs8/3r4AlFPc4m/n5sTMtuMbOL3kNtrQ==",
       "dev": true,
       "requires": {
-        "@jest/core": "^26.6.3",
+        "@jest/core": "^26.5.2",
         "import-local": "^3.0.2",
-        "jest-cli": "^26.6.3"
-      }
-    },
-    "jest-changed-files": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.6.2.tgz",
-      "integrity": "sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ==",
-      "dev": true,
-      "requires": {
-        "@jest/types": "^26.6.2",
-        "execa": "^4.0.0",
-        "throat": "^5.0.0"
-      }
-    },
-    "jest-cli": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.6.3.tgz",
-      "integrity": "sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg==",
-      "dev": true,
-      "requires": {
-        "@jest/core": "^26.6.3",
-        "@jest/test-result": "^26.6.2",
-        "@jest/types": "^26.6.2",
-        "chalk": "^4.0.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.4",
-        "import-local": "^3.0.2",
-        "is-ci": "^2.0.0",
-        "jest-config": "^26.6.3",
-        "jest-util": "^26.6.2",
-        "jest-validate": "^26.6.2",
-        "prompts": "^2.0.1",
-        "yargs": "^15.4.1"
+        "jest-cli": "^26.5.2"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
           "dev": true
         },
         "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -44289,14 +44650,11 @@
             "wrap-ansi": "^6.2.0"
           }
         },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+          "dev": true
         },
         "find-up": {
           "version": "4.1.0",
@@ -44308,36 +44666,41 @@
             "path-exists": "^4.0.0"
           }
         },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "jest-config": {
-          "version": "26.6.3",
-          "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",
-          "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
+        "import-local": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
+          "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==",
           "dev": true,
           "requires": {
-            "@babel/core": "^7.1.0",
-            "@jest/test-sequencer": "^26.6.3",
-            "@jest/types": "^26.6.2",
-            "babel-jest": "^26.6.3",
+            "pkg-dir": "^4.2.0",
+            "resolve-cwd": "^3.0.0"
+          }
+        },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+          "dev": true
+        },
+        "jest-cli": {
+          "version": "26.5.2",
+          "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.5.2.tgz",
+          "integrity": "sha512-usm48COuUvRp8YEG5OWOaxbSM0my7eHn3QeBWxiGUuFhvkGVBvl1fic4UjC02EAEQtDv8KrNQUXdQTV6ZZBsoA==",
+          "dev": true,
+          "requires": {
+            "@jest/core": "^26.5.2",
+            "@jest/test-result": "^26.5.2",
+            "@jest/types": "^26.5.2",
             "chalk": "^4.0.0",
-            "deepmerge": "^4.2.2",
-            "glob": "^7.1.1",
+            "exit": "^0.1.2",
             "graceful-fs": "^4.2.4",
-            "jest-environment-jsdom": "^26.6.2",
-            "jest-environment-node": "^26.6.2",
-            "jest-get-type": "^26.3.0",
-            "jest-jasmine2": "^26.6.3",
-            "jest-regex-util": "^26.0.0",
-            "jest-resolve": "^26.6.2",
-            "jest-util": "^26.6.2",
-            "jest-validate": "^26.6.2",
-            "micromatch": "^4.0.2",
-            "pretty-format": "^26.6.2"
+            "import-local": "^3.0.2",
+            "is-ci": "^2.0.0",
+            "jest-config": "^26.5.2",
+            "jest-util": "^26.5.2",
+            "jest-validate": "^26.5.2",
+            "prompts": "^2.0.1",
+            "yargs": "^15.4.1"
           }
         },
         "locate-path": {
@@ -44373,47 +44736,50 @@
           "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
           "dev": true
         },
-        "require-main-filename": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-          "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+        "pkg-dir": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+          "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
           "dev": true,
           "requires": {
-            "has-flag": "^4.0.0"
+            "find-up": "^4.0.0"
           }
         },
-        "ts-node": {
-          "version": "10.1.0",
-          "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.1.0.tgz",
-          "integrity": "sha512-6szn3+J9WyG2hE+5W8e0ruZrzyk1uFLYye6IGMBadnOzDh8aP7t8CbFpsfCiEx2+wMixAhjFt7lOZC4+l+WbEA==",
+        "resolve-cwd": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+          "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
           "dev": true,
-          "optional": true,
-          "peer": true,
           "requires": {
-            "@tsconfig/node10": "^1.0.7",
-            "@tsconfig/node12": "^1.0.7",
-            "@tsconfig/node14": "^1.0.0",
-            "@tsconfig/node16": "^1.0.1",
-            "arg": "^4.1.0",
-            "create-require": "^1.1.0",
-            "diff": "^4.0.1",
-            "make-error": "^1.1.1",
-            "source-map-support": "^0.5.17",
-            "yn": "3.1.1"
+            "resolve-from": "^5.0.0"
           }
         },
-        "which-module": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+        "resolve-from": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+          "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
           "dev": true
         },
+        "string-width": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.0"
+          }
+        },
         "wrap-ansi": {
           "version": "6.2.0",
           "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
@@ -44425,12 +44791,6 @@
             "strip-ansi": "^6.0.0"
           }
         },
-        "y18n": {
-          "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
-          "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
-          "dev": true
-        },
         "yargs": {
           "version": "15.4.1",
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
@@ -44462,59 +44822,75 @@
         }
       }
     },
-    "jest-diff": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz",
-      "integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==",
+    "jest-changed-files": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.5.2.tgz",
+      "integrity": "sha512-qSmssmiIdvM5BWVtyK/nqVpN3spR5YyvkvPqz1x3BR1bwIxsWmU/MGwLoCrPNLbkG2ASAKfvmJpOduEApBPh2w==",
       "dev": true,
       "requires": {
+        "@jest/types": "^26.5.2",
+        "execa": "^4.0.0",
+        "throat": "^5.0.0"
+      }
+    },
+    "jest-config": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.5.2.tgz",
+      "integrity": "sha512-dqJOnSegNdE5yDiuGHsjTM5gec7Z4AcAMHiW+YscbOYJAlb3LEtDSobXCq0or9EmGQI5SFmKy4T7P1FxetJOfg==",
+      "dev": true,
+      "requires": {
+        "@babel/core": "^7.1.0",
+        "@jest/test-sequencer": "^26.5.2",
+        "@jest/types": "^26.5.2",
+        "babel-jest": "^26.5.2",
         "chalk": "^4.0.0",
-        "diff-sequences": "^26.6.2",
+        "deepmerge": "^4.2.2",
+        "glob": "^7.1.1",
+        "graceful-fs": "^4.2.4",
+        "jest-environment-jsdom": "^26.5.2",
+        "jest-environment-node": "^26.5.2",
         "jest-get-type": "^26.3.0",
-        "pretty-format": "^26.6.2"
+        "jest-jasmine2": "^26.5.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-resolve": "^26.5.2",
+        "jest-util": "^26.5.2",
+        "jest-validate": "^26.5.2",
+        "micromatch": "^4.0.2",
+        "pretty-format": "^26.5.2"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
         "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+        }
+      }
+    },
+    "jest-diff": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.5.2.tgz",
+      "integrity": "sha512-HCSWDUGwsov5oTlGzrRM+UPJI/Dpqi9jzeV0fdRNi3Ch5bnoXhnyJMmVg2juv9081zLIy3HGPI5mcuGgXM2xRA==",
+      "dev": true,
+      "requires": {
+        "chalk": "^4.0.0",
+        "diff-sequences": "^26.5.0",
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.5.2"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
           "dev": true,
           "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
           }
         }
       }
@@ -44529,90 +44905,57 @@
       }
     },
     "jest-each": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.6.2.tgz",
-      "integrity": "sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.5.2.tgz",
+      "integrity": "sha512-w7D9FNe0m2D3yZ0Drj9CLkyF/mGhmBSULMQTypzAKR746xXnjUrK8GUJdlLTWUF6dd0ks3MtvGP7/xNFr9Aphg==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.6.2",
+        "@jest/types": "^26.5.2",
         "chalk": "^4.0.0",
         "jest-get-type": "^26.3.0",
-        "jest-util": "^26.6.2",
-        "pretty-format": "^26.6.2"
+        "jest-util": "^26.5.2",
+        "pretty-format": "^26.5.2"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
         "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
         }
       }
     },
     "jest-environment-jsdom": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz",
-      "integrity": "sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.5.2.tgz",
+      "integrity": "sha512-fWZPx0bluJaTQ36+PmRpvUtUlUFlGGBNyGX1SN3dLUHHMcQ4WseNEzcGGKOw4U5towXgxI4qDoI3vwR18H0RTw==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^26.6.2",
-        "@jest/fake-timers": "^26.6.2",
-        "@jest/types": "^26.6.2",
+        "@jest/environment": "^26.5.2",
+        "@jest/fake-timers": "^26.5.2",
+        "@jest/types": "^26.5.2",
         "@types/node": "*",
-        "jest-mock": "^26.6.2",
-        "jest-util": "^26.6.2",
+        "jest-mock": "^26.5.2",
+        "jest-util": "^26.5.2",
         "jsdom": "^16.4.0"
       }
     },
     "jest-environment-node": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.6.2.tgz",
-      "integrity": "sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.5.2.tgz",
+      "integrity": "sha512-YHjnDsf/GKFCYMGF1V+6HF7jhY1fcLfLNBDjhAOvFGvt6d8vXvNdJGVM7uTZ2VO/TuIyEFhPGaXMX5j3h7fsrA==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^26.6.2",
-        "@jest/fake-timers": "^26.6.2",
-        "@jest/types": "^26.6.2",
+        "@jest/environment": "^26.5.2",
+        "@jest/fake-timers": "^26.5.2",
+        "@jest/types": "^26.5.2",
         "@types/node": "*",
-        "jest-mock": "^26.6.2",
-        "jest-util": "^26.6.2"
+        "jest-mock": "^26.5.2",
+        "jest-util": "^26.5.2"
       }
     },
     "jest-get-type": {
@@ -44622,12 +44965,12 @@
       "dev": true
     },
     "jest-haste-map": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.6.2.tgz",
-      "integrity": "sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.5.2.tgz",
+      "integrity": "sha512-lJIAVJN3gtO3k4xy+7i2Xjtwh8CfPcH08WYjZpe9xzveDaqGw9fVNCpkYu6M525wKFVkLmyi7ku+DxCAP1lyMA==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.6.2",
+        "@jest/types": "^26.5.2",
         "@types/graceful-fs": "^4.1.2",
         "@types/node": "*",
         "anymatch": "^3.0.3",
@@ -44635,221 +44978,134 @@
         "fsevents": "^2.1.2",
         "graceful-fs": "^4.2.4",
         "jest-regex-util": "^26.0.0",
-        "jest-serializer": "^26.6.2",
-        "jest-util": "^26.6.2",
-        "jest-worker": "^26.6.2",
+        "jest-serializer": "^26.5.0",
+        "jest-util": "^26.5.2",
+        "jest-worker": "^26.5.0",
         "micromatch": "^4.0.2",
         "sane": "^4.0.3",
         "walker": "^1.0.7"
+      },
+      "dependencies": {
+        "jest-worker": {
+          "version": "26.5.0",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.5.0.tgz",
+          "integrity": "sha512-kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug==",
+          "dev": true,
+          "requires": {
+            "@types/node": "*",
+            "merge-stream": "^2.0.0",
+            "supports-color": "^7.0.0"
+          }
+        }
       }
     },
     "jest-jasmine2": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz",
-      "integrity": "sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.5.2.tgz",
+      "integrity": "sha512-2J+GYcgLVPTkpmvHEj0/IDTIAuyblGNGlyGe4fLfDT2aktEPBYvoxUwFiOmDDxxzuuEAD2uxcYXr0+1Yw4tjFA==",
       "dev": true,
       "requires": {
         "@babel/traverse": "^7.1.0",
-        "@jest/environment": "^26.6.2",
-        "@jest/source-map": "^26.6.2",
-        "@jest/test-result": "^26.6.2",
-        "@jest/types": "^26.6.2",
+        "@jest/environment": "^26.5.2",
+        "@jest/source-map": "^26.5.0",
+        "@jest/test-result": "^26.5.2",
+        "@jest/types": "^26.5.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "co": "^4.6.0",
-        "expect": "^26.6.2",
+        "expect": "^26.5.2",
         "is-generator-fn": "^2.0.0",
-        "jest-each": "^26.6.2",
-        "jest-matcher-utils": "^26.6.2",
-        "jest-message-util": "^26.6.2",
-        "jest-runtime": "^26.6.3",
-        "jest-snapshot": "^26.6.2",
-        "jest-util": "^26.6.2",
-        "pretty-format": "^26.6.2",
+        "jest-each": "^26.5.2",
+        "jest-matcher-utils": "^26.5.2",
+        "jest-message-util": "^26.5.2",
+        "jest-runtime": "^26.5.2",
+        "jest-snapshot": "^26.5.2",
+        "jest-util": "^26.5.2",
+        "pretty-format": "^26.5.2",
         "throat": "^5.0.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
         "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
         }
       }
     },
     "jest-leak-detector": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz",
-      "integrity": "sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.5.2.tgz",
+      "integrity": "sha512-h7ia3dLzBFItmYERaLPEtEKxy3YlcbcRSjj0XRNJgBEyODuu+3DM2o62kvIFvs3PsaYoIIv+e+nLRI61Dj1CNw==",
       "dev": true,
       "requires": {
         "jest-get-type": "^26.3.0",
-        "pretty-format": "^26.6.2"
+        "pretty-format": "^26.5.2"
       }
     },
     "jest-matcher-utils": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz",
-      "integrity": "sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.5.2.tgz",
+      "integrity": "sha512-W9GO9KBIC4gIArsNqDUKsLnhivaqf8MSs6ujO/JDcPIQrmY+aasewweXVET8KdrJ6ADQaUne5UzysvF/RR7JYA==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
-        "jest-diff": "^26.6.2",
+        "jest-diff": "^26.5.2",
         "jest-get-type": "^26.3.0",
-        "pretty-format": "^26.6.2"
+        "pretty-format": "^26.5.2"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
         "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
         }
       }
     },
     "jest-message-util": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.6.2.tgz",
-      "integrity": "sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.5.2.tgz",
+      "integrity": "sha512-Ocp9UYZ5Jl15C5PNsoDiGEk14A4NG0zZKknpWdZGoMzJuGAkVt10e97tnEVMYpk7LnQHZOfuK2j/izLBMcuCZw==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
-        "@jest/types": "^26.6.2",
+        "@jest/types": "^26.5.2",
         "@types/stack-utils": "^2.0.0",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.4",
         "micromatch": "^4.0.2",
-        "pretty-format": "^26.6.2",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.2"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
         "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
         }
       }
     },
     "jest-mock": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.6.2.tgz",
-      "integrity": "sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.5.2.tgz",
+      "integrity": "sha512-9SiU4b5PtO51v0MtJwVRqeGEroH66Bnwtq4ARdNP7jNXbpT7+ByeWNAk4NeT/uHfNSVDXEXgQo1XRuwEqS6Rdw==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.6.2",
+        "@jest/types": "^26.5.2",
         "@types/node": "*"
       }
     },
@@ -44861,9 +45117,9 @@
       "requires": {}
     },
     "jest-preset-angular": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/jest-preset-angular/-/jest-preset-angular-8.4.0.tgz",
-      "integrity": "sha512-lngQRVVMy2qdzhSzUVTkKFsWC+Z2uMFlJf8J5ZeapNZFsRYW2tjlVqdm+sJOTnVmMVnN7CtDqvRDwlyFTIYD+A==",
+      "version": "8.3.1",
+      "resolved": "https://registry.npmjs.org/jest-preset-angular/-/jest-preset-angular-8.3.1.tgz",
+      "integrity": "sha512-WhQm+0tXzikkvIF35XErV87DqYbieZI0R0MIGgn7VE/DDhdbXFDmYQxFZ7w4qcA0cGLLvSMTBbIsUtHeE/rFxQ==",
       "dev": true,
       "requires": {
         "pretty-format": "26.x",
@@ -44877,49 +45133,31 @@
       "dev": true
     },
     "jest-resolve": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz",
-      "integrity": "sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.5.2.tgz",
+      "integrity": "sha512-XsPxojXGRA0CoDD7Vis59ucz2p3cQFU5C+19tz3tLEAlhYKkK77IL0cjYjikY9wXnOaBeEdm1rOgSJjbZWpcZg==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.6.2",
+        "@jest/types": "^26.5.2",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.4",
         "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^26.6.2",
+        "jest-util": "^26.5.2",
         "read-pkg-up": "^7.0.1",
-        "resolve": "^1.18.1",
+        "resolve": "^1.17.0",
         "slash": "^3.0.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
         "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
         },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
         "find-up": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
@@ -44930,12 +45168,6 @@
             "path-exists": "^4.0.0"
           }
         },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
         "locate-path": {
           "version": "5.0.0",
           "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
@@ -44963,6 +45195,18 @@
             "p-limit": "^2.2.0"
           }
         },
+        "parse-json": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.1.0.tgz",
+          "integrity": "sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.0.0",
+            "error-ex": "^1.3.1",
+            "json-parse-even-better-errors": "^2.3.0",
+            "lines-and-columns": "^1.1.6"
+          }
+        },
         "path-exists": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -44999,208 +45243,115 @@
             "read-pkg": "^5.2.0",
             "type-fest": "^0.8.1"
           }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "type-fest": {
-          "version": "0.8.1",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-          "dev": true
         }
       }
     },
     "jest-resolve-dependencies": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz",
-      "integrity": "sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.5.2.tgz",
+      "integrity": "sha512-LLkc8LuRtxqOx0AtX/Npa2C4I23WcIrwUgNtHYXg4owYF/ZDQShcwBAHjYZIFR06+HpQcZ43+kCTMlQ3aDCYTg==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.6.2",
+        "@jest/types": "^26.5.2",
         "jest-regex-util": "^26.0.0",
-        "jest-snapshot": "^26.6.2"
+        "jest-snapshot": "^26.5.2"
       }
     },
     "jest-runner": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.6.3.tgz",
-      "integrity": "sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.5.2.tgz",
+      "integrity": "sha512-GKhYxtSX5+tXZsd2QwfkDqPIj5C2HqOdXLRc2x2qYqWE26OJh17xo58/fN/mLhRkO4y6o60ZVloan7Kk5YA6hg==",
       "dev": true,
       "requires": {
-        "@jest/console": "^26.6.2",
-        "@jest/environment": "^26.6.2",
-        "@jest/test-result": "^26.6.2",
-        "@jest/types": "^26.6.2",
+        "@jest/console": "^26.5.2",
+        "@jest/environment": "^26.5.2",
+        "@jest/test-result": "^26.5.2",
+        "@jest/types": "^26.5.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "emittery": "^0.7.1",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.4",
-        "jest-config": "^26.6.3",
+        "jest-config": "^26.5.2",
         "jest-docblock": "^26.0.0",
-        "jest-haste-map": "^26.6.2",
-        "jest-leak-detector": "^26.6.2",
-        "jest-message-util": "^26.6.2",
-        "jest-resolve": "^26.6.2",
-        "jest-runtime": "^26.6.3",
-        "jest-util": "^26.6.2",
-        "jest-worker": "^26.6.2",
+        "jest-haste-map": "^26.5.2",
+        "jest-leak-detector": "^26.5.2",
+        "jest-message-util": "^26.5.2",
+        "jest-resolve": "^26.5.2",
+        "jest-runtime": "^26.5.2",
+        "jest-util": "^26.5.2",
+        "jest-worker": "^26.5.0",
         "source-map-support": "^0.5.6",
         "throat": "^5.0.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
         "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
         },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+        "jest-worker": {
+          "version": "26.5.0",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.5.0.tgz",
+          "integrity": "sha512-kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug==",
           "dev": true,
           "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "jest-config": {
-          "version": "26.6.3",
-          "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",
-          "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
-          "dev": true,
-          "requires": {
-            "@babel/core": "^7.1.0",
-            "@jest/test-sequencer": "^26.6.3",
-            "@jest/types": "^26.6.2",
-            "babel-jest": "^26.6.3",
-            "chalk": "^4.0.0",
-            "deepmerge": "^4.2.2",
-            "glob": "^7.1.1",
-            "graceful-fs": "^4.2.4",
-            "jest-environment-jsdom": "^26.6.2",
-            "jest-environment-node": "^26.6.2",
-            "jest-get-type": "^26.3.0",
-            "jest-jasmine2": "^26.6.3",
-            "jest-regex-util": "^26.0.0",
-            "jest-resolve": "^26.6.2",
-            "jest-util": "^26.6.2",
-            "jest-validate": "^26.6.2",
-            "micromatch": "^4.0.2",
-            "pretty-format": "^26.6.2"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "ts-node": {
-          "version": "10.1.0",
-          "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.1.0.tgz",
-          "integrity": "sha512-6szn3+J9WyG2hE+5W8e0ruZrzyk1uFLYye6IGMBadnOzDh8aP7t8CbFpsfCiEx2+wMixAhjFt7lOZC4+l+WbEA==",
-          "dev": true,
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "@tsconfig/node10": "^1.0.7",
-            "@tsconfig/node12": "^1.0.7",
-            "@tsconfig/node14": "^1.0.0",
-            "@tsconfig/node16": "^1.0.1",
-            "arg": "^4.1.0",
-            "create-require": "^1.1.0",
-            "diff": "^4.0.1",
-            "make-error": "^1.1.1",
-            "source-map-support": "^0.5.17",
-            "yn": "3.1.1"
+            "@types/node": "*",
+            "merge-stream": "^2.0.0",
+            "supports-color": "^7.0.0"
           }
         }
       }
     },
     "jest-runtime": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.6.3.tgz",
-      "integrity": "sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.5.2.tgz",
+      "integrity": "sha512-zArr4DatX/Sn0wswX/AnAuJgmwgAR5rNtrUz36HR8BfMuysHYNq5sDbYHuLC4ICyRdy5ae/KQ+sczxyS9G6Qvw==",
       "dev": true,
       "requires": {
-        "@jest/console": "^26.6.2",
-        "@jest/environment": "^26.6.2",
-        "@jest/fake-timers": "^26.6.2",
-        "@jest/globals": "^26.6.2",
-        "@jest/source-map": "^26.6.2",
-        "@jest/test-result": "^26.6.2",
-        "@jest/transform": "^26.6.2",
-        "@jest/types": "^26.6.2",
+        "@jest/console": "^26.5.2",
+        "@jest/environment": "^26.5.2",
+        "@jest/fake-timers": "^26.5.2",
+        "@jest/globals": "^26.5.2",
+        "@jest/source-map": "^26.5.0",
+        "@jest/test-result": "^26.5.2",
+        "@jest/transform": "^26.5.2",
+        "@jest/types": "^26.5.2",
         "@types/yargs": "^15.0.0",
         "chalk": "^4.0.0",
-        "cjs-module-lexer": "^0.6.0",
         "collect-v8-coverage": "^1.0.0",
         "exit": "^0.1.2",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.4",
-        "jest-config": "^26.6.3",
-        "jest-haste-map": "^26.6.2",
-        "jest-message-util": "^26.6.2",
-        "jest-mock": "^26.6.2",
+        "jest-config": "^26.5.2",
+        "jest-haste-map": "^26.5.2",
+        "jest-message-util": "^26.5.2",
+        "jest-mock": "^26.5.2",
         "jest-regex-util": "^26.0.0",
-        "jest-resolve": "^26.6.2",
-        "jest-snapshot": "^26.6.2",
-        "jest-util": "^26.6.2",
-        "jest-validate": "^26.6.2",
+        "jest-resolve": "^26.5.2",
+        "jest-snapshot": "^26.5.2",
+        "jest-util": "^26.5.2",
+        "jest-validate": "^26.5.2",
         "slash": "^3.0.0",
         "strip-bom": "^4.0.0",
         "yargs": "^15.4.1"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
           "dev": true
         },
         "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -45218,14 +45369,11 @@
             "wrap-ansi": "^6.2.0"
           }
         },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+          "dev": true
         },
         "find-up": {
           "version": "4.1.0",
@@ -45237,38 +45385,12 @@
             "path-exists": "^4.0.0"
           }
         },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
           "dev": true
         },
-        "jest-config": {
-          "version": "26.6.3",
-          "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",
-          "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
-          "dev": true,
-          "requires": {
-            "@babel/core": "^7.1.0",
-            "@jest/test-sequencer": "^26.6.3",
-            "@jest/types": "^26.6.2",
-            "babel-jest": "^26.6.3",
-            "chalk": "^4.0.0",
-            "deepmerge": "^4.2.2",
-            "glob": "^7.1.1",
-            "graceful-fs": "^4.2.4",
-            "jest-environment-jsdom": "^26.6.2",
-            "jest-environment-node": "^26.6.2",
-            "jest-get-type": "^26.3.0",
-            "jest-jasmine2": "^26.6.3",
-            "jest-regex-util": "^26.0.0",
-            "jest-resolve": "^26.6.2",
-            "jest-util": "^26.6.2",
-            "jest-validate": "^26.6.2",
-            "micromatch": "^4.0.2",
-            "pretty-format": "^26.6.2"
-          }
-        },
         "locate-path": {
           "version": "5.0.0",
           "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
@@ -45302,47 +45424,26 @@
           "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
           "dev": true
         },
-        "require-main-filename": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-          "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+        "string-width": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
           "dev": true,
           "requires": {
-            "has-flag": "^4.0.0"
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
           }
         },
-        "ts-node": {
-          "version": "10.1.0",
-          "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.1.0.tgz",
-          "integrity": "sha512-6szn3+J9WyG2hE+5W8e0ruZrzyk1uFLYye6IGMBadnOzDh8aP7t8CbFpsfCiEx2+wMixAhjFt7lOZC4+l+WbEA==",
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
           "dev": true,
-          "optional": true,
-          "peer": true,
           "requires": {
-            "@tsconfig/node10": "^1.0.7",
-            "@tsconfig/node12": "^1.0.7",
-            "@tsconfig/node14": "^1.0.0",
-            "@tsconfig/node16": "^1.0.1",
-            "arg": "^4.1.0",
-            "create-require": "^1.1.0",
-            "diff": "^4.0.1",
-            "make-error": "^1.1.1",
-            "source-map-support": "^0.5.17",
-            "yn": "3.1.1"
+            "ansi-regex": "^5.0.0"
           }
         },
-        "which-module": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-          "dev": true
-        },
         "wrap-ansi": {
           "version": "6.2.0",
           "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
@@ -45354,12 +45455,6 @@
             "strip-ansi": "^6.0.0"
           }
         },
-        "y18n": {
-          "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
-          "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
-          "dev": true
-        },
         "yargs": {
           "version": "15.4.1",
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
@@ -45392,9 +45487,9 @@
       }
     },
     "jest-serializer": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.6.2.tgz",
-      "integrity": "sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==",
+      "version": "26.5.0",
+      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.5.0.tgz",
+      "integrity": "sha512-+h3Gf5CDRlSLdgTv7y0vPIAoLgX/SI7T4v6hy+TEXMgYbv+ztzbg5PSN6mUXAT/hXYHvZRWm+MaObVfqkhCGxA==",
       "dev": true,
       "requires": {
         "@types/node": "*",
@@ -45402,81 +45497,48 @@
       }
     },
     "jest-snapshot": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.6.2.tgz",
-      "integrity": "sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.5.2.tgz",
+      "integrity": "sha512-MkXIDvEefzDubI/WaDVSRH4xnkuirP/Pz8LhAIDXcVQTmcEfwxywj5LGwBmhz+kAAIldA7XM4l96vbpzltSjqg==",
       "dev": true,
       "requires": {
         "@babel/types": "^7.0.0",
-        "@jest/types": "^26.6.2",
+        "@jest/types": "^26.5.2",
         "@types/babel__traverse": "^7.0.4",
         "@types/prettier": "^2.0.0",
         "chalk": "^4.0.0",
-        "expect": "^26.6.2",
+        "expect": "^26.5.2",
         "graceful-fs": "^4.2.4",
-        "jest-diff": "^26.6.2",
+        "jest-diff": "^26.5.2",
         "jest-get-type": "^26.3.0",
-        "jest-haste-map": "^26.6.2",
-        "jest-matcher-utils": "^26.6.2",
-        "jest-message-util": "^26.6.2",
-        "jest-resolve": "^26.6.2",
+        "jest-haste-map": "^26.5.2",
+        "jest-matcher-utils": "^26.5.2",
+        "jest-message-util": "^26.5.2",
+        "jest-resolve": "^26.5.2",
         "natural-compare": "^1.4.0",
-        "pretty-format": "^26.6.2",
+        "pretty-format": "^26.5.2",
         "semver": "^7.3.2"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
         "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
         }
       }
     },
     "jest-util": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
-      "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.5.2.tgz",
+      "integrity": "sha512-WTL675bK+GSSAYgS8z9FWdCT2nccO1yTIplNLPlP0OD8tUk/H5IrWKMMRudIQQ0qp8bb4k+1Qa8CxGKq9qnYdg==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.6.2",
+        "@jest/types": "^26.5.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.4",
@@ -45484,196 +45546,100 @@
         "micromatch": "^4.0.2"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
         "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
         }
       }
     },
     "jest-validate": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.6.2.tgz",
-      "integrity": "sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.5.2.tgz",
+      "integrity": "sha512-FmJks0zY36mp6Af/5sqO6CTL9bNMU45yKCJk3hrz8d2aIqQIlN1pr9HPIwZE8blLaewOla134nt5+xAmWsx3SQ==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.6.2",
+        "@jest/types": "^26.5.2",
         "camelcase": "^6.0.0",
         "chalk": "^4.0.0",
         "jest-get-type": "^26.3.0",
         "leven": "^3.1.0",
-        "pretty-format": "^26.6.2"
+        "pretty-format": "^26.5.2"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
+        "camelcase": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.0.0.tgz",
+          "integrity": "sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==",
+          "dev": true
         },
         "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
         }
       }
     },
     "jest-watcher": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.6.2.tgz",
-      "integrity": "sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.5.2.tgz",
+      "integrity": "sha512-i3m1NtWzF+FXfJ3ljLBB/WQEp4uaNhX7QcQUWMokcifFTUQBDFyUMEwk0JkJ1kopHbx7Een3KX0Q7+9koGM/Pw==",
       "dev": true,
       "requires": {
-        "@jest/test-result": "^26.6.2",
-        "@jest/types": "^26.6.2",
+        "@jest/test-result": "^26.5.2",
+        "@jest/types": "^26.5.2",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
-        "jest-util": "^26.6.2",
+        "jest-util": "^26.5.2",
         "string-length": "^4.0.1"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+        "ansi-escapes": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
+          "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
           "dev": true,
           "requires": {
-            "color-convert": "^2.0.1"
+            "type-fest": "^0.11.0"
           }
         },
         "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
         },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+        "type-fest": {
+          "version": "0.11.0",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
+          "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
           "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
         }
       }
     },
     "jest-worker": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
-      "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
+      "version": "26.0.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.0.0.tgz",
+      "integrity": "sha512-pPaYa2+JnwmiZjK9x7p9BoZht+47ecFCDFA/CJxspHzeDvQcfVBLWzCiWyo+EGrSiQMWZtCFo9iSvMZnAAo8vw==",
       "dev": true,
       "requires": {
-        "@types/node": "*",
         "merge-stream": "^2.0.0",
         "supports-color": "^7.0.0"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
       }
     },
     "js-tokens": {
@@ -45683,9 +45649,9 @@
       "dev": true
     },
     "js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "version": "3.14.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
+      "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
       "dev": true,
       "requires": {
         "argparse": "^1.0.7",
@@ -45704,144 +45670,57 @@
       "dev": true
     },
     "jsdom": {
-      "version": "16.7.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
-      "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
+      "version": "16.4.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.4.0.tgz",
+      "integrity": "sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w==",
       "dev": true,
       "requires": {
-        "abab": "^2.0.5",
-        "acorn": "^8.2.4",
+        "abab": "^2.0.3",
+        "acorn": "^7.1.1",
         "acorn-globals": "^6.0.0",
         "cssom": "^0.4.4",
-        "cssstyle": "^2.3.0",
+        "cssstyle": "^2.2.0",
         "data-urls": "^2.0.0",
-        "decimal.js": "^10.2.1",
+        "decimal.js": "^10.2.0",
         "domexception": "^2.0.1",
-        "escodegen": "^2.0.0",
-        "form-data": "^3.0.0",
+        "escodegen": "^1.14.1",
         "html-encoding-sniffer": "^2.0.1",
-        "http-proxy-agent": "^4.0.1",
-        "https-proxy-agent": "^5.0.0",
-        "is-potential-custom-element-name": "^1.0.1",
+        "is-potential-custom-element-name": "^1.0.0",
         "nwsapi": "^2.2.0",
-        "parse5": "6.0.1",
-        "saxes": "^5.0.1",
+        "parse5": "5.1.1",
+        "request": "^2.88.2",
+        "request-promise-native": "^1.0.8",
+        "saxes": "^5.0.0",
         "symbol-tree": "^3.2.4",
-        "tough-cookie": "^4.0.0",
+        "tough-cookie": "^3.0.1",
         "w3c-hr-time": "^1.0.2",
         "w3c-xmlserializer": "^2.0.0",
         "webidl-conversions": "^6.1.0",
         "whatwg-encoding": "^1.0.5",
         "whatwg-mimetype": "^2.3.0",
-        "whatwg-url": "^8.5.0",
-        "ws": "^7.4.6",
+        "whatwg-url": "^8.0.0",
+        "ws": "^7.2.3",
         "xml-name-validator": "^3.0.0"
       },
       "dependencies": {
         "acorn": {
-          "version": "8.4.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz",
-          "integrity": "sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==",
+          "version": "7.4.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
           "dev": true
         },
-        "escodegen": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
-          "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
-          "dev": true,
-          "requires": {
-            "esprima": "^4.0.1",
-            "estraverse": "^5.2.0",
-            "esutils": "^2.0.2",
-            "optionator": "^0.8.1",
-            "source-map": "~0.6.1"
-          }
-        },
-        "estraverse": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-          "dev": true
-        },
-        "form-data": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
-          "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
-          "dev": true,
-          "requires": {
-            "asynckit": "^0.4.0",
-            "combined-stream": "^1.0.8",
-            "mime-types": "^2.1.12"
-          }
-        },
-        "levn": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-          "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-          "dev": true,
-          "requires": {
-            "prelude-ls": "~1.1.2",
-            "type-check": "~0.3.2"
-          }
-        },
-        "optionator": {
-          "version": "0.8.3",
-          "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-          "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-          "dev": true,
-          "requires": {
-            "deep-is": "~0.1.3",
-            "fast-levenshtein": "~2.0.6",
-            "levn": "~0.3.0",
-            "prelude-ls": "~1.1.2",
-            "type-check": "~0.3.2",
-            "word-wrap": "~1.2.3"
-          }
-        },
         "parse5": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-          "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
+          "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
           "dev": true
         },
-        "prelude-ls": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-          "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+        "ws": {
+          "version": "7.3.1",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz",
+          "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==",
           "dev": true,
-          "optional": true
-        },
-        "tough-cookie": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
-          "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
-          "dev": true,
-          "requires": {
-            "psl": "^1.1.33",
-            "punycode": "^2.1.1",
-            "universalify": "^0.1.2"
-          }
-        },
-        "type-check": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-          "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-          "dev": true,
-          "requires": {
-            "prelude-ls": "~1.1.2"
-          }
-        },
-        "universalify": {
-          "version": "0.1.2",
-          "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-          "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-          "dev": true
+          "requires": {}
         }
       }
     },
@@ -45873,10 +45752,9 @@
       "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
     },
     "json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
     },
     "json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
@@ -45896,9 +45774,9 @@
       "dev": true
     },
     "json5": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-      "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
+      "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
       "dev": true,
       "requires": {
         "minimist": "^1.2.5"
@@ -45924,6 +45802,16 @@
       "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
       "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA="
     },
+    "JSONStream": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
+      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
+      "dev": true,
+      "requires": {
+        "jsonparse": "^1.2.0",
+        "through": ">=2.2.7 <3"
+      }
+    },
     "jsprim": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
@@ -45943,9 +45831,9 @@
       }
     },
     "jszip": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.7.0.tgz",
-      "integrity": "sha512-Y2OlFIzrDOPWUnpU0LORIcDn2xN7rC9yKffFM/7pGhQuhO+SUhfm2trkJ/S5amjFvem0Y+1EALz/MEPkvHXVNw==",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.5.0.tgz",
+      "integrity": "sha512-WRtu7TPCmYePR1nazfrtuF216cIVon/3GWOvHS9QR5bIwSbnxtdpma6un3jyGGNhHsKCSzn5Ypk+EkDRvTGiFA==",
       "requires": {
         "lie": "~3.3.0",
         "pako": "~1.0.2",
@@ -45954,9 +45842,9 @@
       }
     },
     "just-debounce": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.1.0.tgz",
-      "integrity": "sha512-qpcRocdkUmf+UTNBYx5w6dexX5J31AKK1OmPwH630a83DdVVUIngk55RSAiIGpQyoH0dlr872VHfPjnQnK1qDQ==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.0.0.tgz",
+      "integrity": "sha1-h/zPrv/AtozRnVX2cilD+SnqNeo=",
       "dev": true
     },
     "karma-source-map-support": {
@@ -45969,9 +45857,9 @@
       }
     },
     "keytar": {
-      "version": "7.7.0",
-      "resolved": "https://registry.npmjs.org/keytar/-/keytar-7.7.0.tgz",
-      "integrity": "sha512-YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/keytar/-/keytar-7.2.0.tgz",
+      "integrity": "sha512-ECSaWvoLKI5SI0pGpZQeUV1/lpBYfkaxvoSp3zkiPOz05VavwSfLi8DdEaa9N2ekQZv3Chy+o7aP6n9mairBgw==",
       "optional": true,
       "requires": {
         "node-addon-api": "^3.0.0",
@@ -45993,9 +45881,9 @@
       "dev": true
     },
     "kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
       "dev": true
     },
     "kleur": {
@@ -46004,12 +45892,6 @@
       "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
       "dev": true
     },
-    "klona": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz",
-      "integrity": "sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==",
-      "dev": true
-    },
     "last-run": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
@@ -46066,37 +45948,26 @@
         "rsvp": "^3.0.21"
       },
       "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+        "rsvp": {
+          "version": "3.6.2",
+          "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz",
+          "integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==",
           "dev": true
         }
       }
     },
     "less": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/less/-/less-4.1.1.tgz",
-      "integrity": "sha512-w09o8tZFPThBscl5d0Ggp3RcrKIouBoQscnOMgFH3n5V3kN/CXGHNfCkRPtxJk6nKryDXaV9aHLK55RXuH4sAw==",
+      "version": "3.12.2",
+      "resolved": "https://registry.npmjs.org/less/-/less-3.12.2.tgz",
+      "integrity": "sha512-+1V2PCMFkL+OIj2/HrtrvZw0BC0sYLMICJfbQjuj/K8CEnlrFX6R5cKKgzzttsZDHyxQNL1jqMREjKN3ja/E3Q==",
       "dev": true,
       "requires": {
-        "copy-anything": "^2.0.1",
         "errno": "^0.1.1",
         "graceful-fs": "^4.1.2",
         "image-size": "~0.5.0",
         "make-dir": "^2.1.0",
         "mime": "^1.4.1",
-        "needle": "^2.5.2",
-        "parse-node-version": "^1.0.1",
+        "native-request": "^1.0.5",
         "source-map": "~0.6.0",
         "tslib": "^1.10.0"
       },
@@ -46112,13 +45983,6 @@
             "semver": "^5.6.0"
           }
         },
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-          "dev": true,
-          "optional": true
-        },
         "semver": {
           "version": "5.7.1",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
@@ -46134,60 +45998,23 @@
           "optional": true
         },
         "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+          "version": "1.13.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
+          "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
           "dev": true
         }
       }
     },
     "less-loader": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-7.3.0.tgz",
-      "integrity": "sha512-Mi8915g7NMaLlgi77mgTTQvK022xKRQBIVDSyfl3ErTuBhmZBQab0mjeJjNNqGbdR+qrfTleKXqbGI4uEFavxg==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-6.1.0.tgz",
+      "integrity": "sha512-/jLzOwLyqJ7Kt3xg5sHHkXtOyShWwFj410K9Si9WO+/h8rmYxxkSR0A3/hFEntWudE20zZnWMtpMYnLzqTVdUA==",
       "dev": true,
       "requires": {
-        "klona": "^2.0.4",
+        "clone": "^2.1.2",
+        "less": "^3.11.1",
         "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "ajv-keywords": {
-          "version": "3.5.2",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-          "dev": true,
-          "requires": {}
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        },
-        "schema-utils": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.8",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
-          }
-        }
+        "schema-utils": "^2.6.6"
       }
     },
     "leven": {
@@ -46196,6 +46023,15 @@
       "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
       "dev": true
     },
+    "levenary": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz",
+      "integrity": "sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==",
+      "dev": true,
+      "requires": {
+        "leven": "^3.1.0"
+      }
+    },
     "levn": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
@@ -46207,31 +46043,13 @@
       }
     },
     "license-webpack-plugin": {
-      "version": "2.3.11",
-      "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-2.3.11.tgz",
-      "integrity": "sha512-0iVGoX5vx0WDy8dmwTTpOOMYiGqILyUbDeVMFH52AjgBlS58lHwOlFMSoqg5nY8Kxl6+FRKyUZY/UdlQaOyqDw==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-2.2.0.tgz",
+      "integrity": "sha512-XPsdL/0brSHf+7dXIlRqotnCQ58RX2au6otkOg4U3dm8uH+Ka/fW4iukEs95uXm+qKe/SBs+s1Ll/aQddKG+tg==",
       "dev": true,
       "requires": {
         "@types/webpack-sources": "^0.1.5",
         "webpack-sources": "^1.2.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "webpack-sources": {
-          "version": "1.4.3",
-          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-          "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-          "dev": true,
-          "requires": {
-            "source-list-map": "^2.0.0",
-            "source-map": "~0.6.1"
-          }
-        }
       }
     },
     "lie": {
@@ -46256,23 +46074,6 @@
         "object.map": "^1.0.0",
         "rechoir": "^0.6.2",
         "resolve": "^1.1.7"
-      },
-      "dependencies": {
-        "is-plain-object": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-          "dev": true,
-          "requires": {
-            "isobject": "^3.0.1"
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        }
       }
     },
     "lines-and-columns": {
@@ -46282,31 +46083,30 @@
       "dev": true
     },
     "load-json-file": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-      "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+      "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.1.2",
-        "parse-json": "^4.0.0",
-        "pify": "^3.0.0",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
         "strip-bom": "^3.0.0"
       },
       "dependencies": {
         "parse-json": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
           "dev": true,
           "requires": {
-            "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1"
+            "error-ex": "^1.2.0"
           }
         },
         "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
           "dev": true
         },
         "strip-bom": {
@@ -46344,9 +46144,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+      "version": "4.17.20",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+      "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
     },
     "lodash._baseassign": {
       "version": "3.2.0",
@@ -46415,6 +46215,12 @@
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
       "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168="
     },
+    "lodash.flatten": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
+      "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=",
+      "dev": true
+    },
     "lodash.isarguments": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
@@ -46444,18 +46250,18 @@
       "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
       "dev": true
     },
-    "lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
-    },
     "lodash.restparam": {
       "version": "3.6.1",
       "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
       "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
       "dev": true
     },
+    "lodash.sortby": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
+      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
+      "dev": true
+    },
     "lodash.truncate": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
@@ -46469,66 +46275,81 @@
       "dev": true
     },
     "log-symbols": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
+      "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==",
       "dev": true,
       "requires": {
-        "chalk": "^4.1.0",
-        "is-unicode-supported": "^0.1.0"
+        "chalk": "^2.4.2"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "^2.0.1"
+            "color-convert": "^1.9.0"
           }
         },
         "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
           }
         },
         "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
           "dev": true,
           "requires": {
-            "color-name": "~1.1.4"
+            "color-name": "1.1.3"
           }
         },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "dev": true
+        },
         "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
           "dev": true
         },
         "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
           "dev": true,
           "requires": {
-            "has-flag": "^4.0.0"
+            "has-flag": "^3.0.0"
           }
         }
       }
     },
     "loglevel": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.1.tgz",
-      "integrity": "sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.0.tgz",
+      "integrity": "sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==",
       "dev": true
     },
+    "loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "dev": true,
+      "requires": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      }
+    },
     "loud-rejection": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-2.2.0.tgz",
@@ -46558,9 +46379,9 @@
       }
     },
     "macos-release": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.5.0.tgz",
-      "integrity": "sha512-EIgv+QZ9r+814gjJj0Bt5vSLJLzswGmSUbUpbi9AIr/fsN2IWFBl2NucV9PAiek+U1STK468tEkxmVYUtuAN3g=="
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.4.1.tgz",
+      "integrity": "sha512-H/QHeBIN1fIGJX517pvK8IEK53yQOW7YcEI55oYtgjDdoCQQz7eJS94qt5kNrscReEyuD/JcdFCm2XBEcGOITg=="
     },
     "magic-string": {
       "version": "0.25.7",
@@ -46593,45 +46414,91 @@
       "dev": true
     },
     "make-fetch-happen": {
-      "version": "8.0.14",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.14.tgz",
-      "integrity": "sha512-EsS89h6l4vbfJEtBZnENTOFk8mCRpY5ru36Xe5bcX1KYIli2mkSHqoFsp5O1wMDvTJJzxe/4THpCTtygjeeGWQ==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz",
+      "integrity": "sha512-07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag==",
+      "dev": true,
       "requires": {
-        "agentkeepalive": "^4.1.3",
-        "cacache": "^15.0.5",
-        "http-cache-semantics": "^4.1.0",
-        "http-proxy-agent": "^4.0.1",
-        "https-proxy-agent": "^5.0.0",
-        "is-lambda": "^1.0.1",
-        "lru-cache": "^6.0.0",
-        "minipass": "^3.1.3",
-        "minipass-collect": "^1.0.2",
-        "minipass-fetch": "^1.3.2",
-        "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.4",
-        "promise-retry": "^2.0.1",
-        "socks-proxy-agent": "^5.0.0",
-        "ssri": "^8.0.0"
+        "agentkeepalive": "^3.4.1",
+        "cacache": "^12.0.0",
+        "http-cache-semantics": "^3.8.1",
+        "http-proxy-agent": "^2.1.0",
+        "https-proxy-agent": "^2.2.3",
+        "lru-cache": "^5.1.1",
+        "mississippi": "^3.0.0",
+        "node-fetch-npm": "^2.0.2",
+        "promise-retry": "^1.1.1",
+        "socks-proxy-agent": "^4.0.0",
+        "ssri": "^6.0.0"
       },
       "dependencies": {
-        "err-code": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
-          "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="
-        },
-        "promise-retry": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
-          "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
+        "cacache": {
+          "version": "12.0.4",
+          "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
+          "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
+          "dev": true,
           "requires": {
-            "err-code": "^2.0.2",
-            "retry": "^0.12.0"
+            "bluebird": "^3.5.5",
+            "chownr": "^1.1.1",
+            "figgy-pudding": "^3.5.1",
+            "glob": "^7.1.4",
+            "graceful-fs": "^4.1.15",
+            "infer-owner": "^1.0.3",
+            "lru-cache": "^5.1.1",
+            "mississippi": "^3.0.0",
+            "mkdirp": "^0.5.1",
+            "move-concurrently": "^1.0.1",
+            "promise-inflight": "^1.0.1",
+            "rimraf": "^2.6.3",
+            "ssri": "^6.0.1",
+            "unique-filename": "^1.1.1",
+            "y18n": "^4.0.0"
           }
         },
-        "retry": {
-          "version": "0.12.0",
-          "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
-          "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs="
+        "chownr": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+          "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+          "dev": true
+        },
+        "http-cache-semantics": {
+          "version": "3.8.1",
+          "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz",
+          "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==",
+          "dev": true
+        },
+        "lru-cache": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+          "dev": true,
+          "requires": {
+            "yallist": "^3.0.2"
+          }
+        },
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
+        "ssri": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+          "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+          "dev": true,
+          "requires": {
+            "figgy-pudding": "^3.5.1"
+          }
+        },
+        "yallist": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+          "dev": true
         }
       }
     },
@@ -46642,14 +46509,6 @@
       "dev": true,
       "requires": {
         "kind-of": "^6.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        }
       }
     },
     "makeerror": {
@@ -46688,12 +46547,6 @@
         "stack-trace": "0.0.10"
       },
       "dependencies": {
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-          "dev": true
-        },
         "braces": {
           "version": "2.3.2",
           "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
@@ -46720,25 +46573,9 @@
               "requires": {
                 "is-extendable": "^0.1.0"
               }
-            },
-            "is-extendable": {
-              "version": "0.1.1",
-              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-              "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-              "dev": true
             }
           }
         },
-        "extend-shallow": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-          "dev": true,
-          "requires": {
-            "assign-symbols": "^1.0.0",
-            "is-extendable": "^1.0.1"
-          }
-        },
         "fill-range": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -46759,12 +46596,6 @@
               "requires": {
                 "is-extendable": "^0.1.0"
               }
-            },
-            "is-extendable": {
-              "version": "0.1.1",
-              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-              "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-              "dev": true
             }
           }
         },
@@ -46815,12 +46646,6 @@
           "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
           "dev": true
         },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        },
         "micromatch": {
           "version": "3.1.10",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -46885,9 +46710,9 @@
       }
     },
     "mdn-data": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
+      "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==",
       "dev": true
     },
     "media-typer": {
@@ -46896,9 +46721,9 @@
       "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
     },
     "memory-fs": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
+      "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
       "dev": true,
       "requires": {
         "errno": "^0.1.3",
@@ -46943,12 +46768,12 @@
       "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
     },
     "micromatch": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+      "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
       "requires": {
         "braces": "^3.0.1",
-        "picomatch": "^2.2.3"
+        "picomatch": "^2.0.5"
       }
     },
     "miller-rabin": {
@@ -46962,9 +46787,9 @@
       },
       "dependencies": {
         "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
           "dev": true
         }
       }
@@ -46975,16 +46800,16 @@
       "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
     },
     "mime-db": {
-      "version": "1.49.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz",
-      "integrity": "sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA=="
+      "version": "1.44.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
+      "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="
     },
     "mime-types": {
-      "version": "2.1.32",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz",
-      "integrity": "sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A==",
+      "version": "2.1.27",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
+      "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
       "requires": {
-        "mime-db": "1.49.0"
+        "mime-db": "1.44.0"
       }
     },
     "mimic-fn": {
@@ -46993,72 +46818,69 @@
       "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
     },
     "mimic-response": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
-      "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
-      "optional": true
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
+      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="
     },
     "mini-css-extract-plugin": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.3.5.tgz",
-      "integrity": "sha512-tvmzcwqJJXau4OQE5vT72pRT18o2zF+tQJp8CWchqvfQnTlflkzS+dANYcRdyPRWUWRkfmeNTKltx0NZI/b5dQ==",
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz",
+      "integrity": "sha512-lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A==",
       "dev": true,
       "requires": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0",
+        "loader-utils": "^1.1.0",
+        "normalize-url": "1.9.1",
+        "schema-utils": "^1.0.0",
         "webpack-sources": "^1.1.0"
       },
       "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
+            "minimist": "^1.2.0"
           }
         },
-        "ajv-keywords": {
-          "version": "3.5.2",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+        "loader-utils": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
           "dev": true,
-          "requires": {}
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
         },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+        "normalize-url": {
+          "version": "1.9.1",
+          "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz",
+          "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
+          "dev": true,
+          "requires": {
+            "object-assign": "^4.0.1",
+            "prepend-http": "^1.0.0",
+            "query-string": "^4.1.0",
+            "sort-keys": "^1.0.0"
+          }
+        },
+        "prepend-http": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
+          "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
           "dev": true
         },
         "schema-utils": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
           "dev": true,
           "requires": {
-            "@types/json-schema": "^7.0.8",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "webpack-sources": {
-          "version": "1.4.3",
-          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-          "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-          "dev": true,
-          "requires": {
-            "source-list-map": "^2.0.0",
-            "source-map": "~0.6.1"
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
           }
         }
       }
@@ -47183,12 +47005,27 @@
       "requires": {
         "for-in": "^1.0.2",
         "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
       }
     },
     "mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "dev": true,
+      "requires": {
+        "minimist": "^1.2.5"
+      }
     },
     "mkdirp-classic": {
       "version": "0.5.3",
@@ -47197,9 +47034,9 @@
       "optional": true
     },
     "moment": {
-      "version": "2.29.1",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
-      "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
+      "version": "2.29.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.0.tgz",
+      "integrity": "sha512-z6IJ5HXYiuxvFTI6eiQ9dm77uE0gyy1yXNApVHqTcnIKfY9tIwEjlzsZ6u1LQXvVgKeTnv9Xm7NDvJ7lso3MtA=="
     },
     "move-concurrently": {
       "version": "1.0.1",
@@ -47215,15 +47052,6 @@
         "run-queue": "^1.0.3"
       },
       "dependencies": {
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        },
         "rimraf": {
           "version": "2.7.1",
           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -47235,10 +47063,27 @@
         }
       }
     },
+    "move-file": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/move-file/-/move-file-2.0.0.tgz",
+      "integrity": "sha512-cdkdhNCgbP5dvS4tlGxZbD+nloio9GIimP57EjqFhwLcMjnU+XJKAZzlmg/TN/AK1LuNAdTSvm3CPPP4Xkv0iQ==",
+      "dev": true,
+      "requires": {
+        "path-exists": "^4.0.0"
+      },
+      "dependencies": {
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        }
+      }
+    },
     "ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
     },
     "multicast-dns": {
       "version": "6.2.3",
@@ -47268,18 +47113,12 @@
       "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="
     },
     "nan": {
-      "version": "2.14.2",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
-      "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==",
+      "version": "2.14.1",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz",
+      "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==",
       "dev": true,
       "optional": true
     },
-    "nanoid": {
-      "version": "3.1.23",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz",
-      "integrity": "sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==",
-      "dev": true
-    },
     "nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -47297,30 +47136,6 @@
         "regex-not": "^1.0.0",
         "snapdragon": "^0.8.1",
         "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-          "dev": true
-        },
-        "extend-shallow": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-          "dev": true,
-          "requires": {
-            "assign-symbols": "^1.0.0",
-            "is-extendable": "^1.0.1"
-          }
-        },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        }
       }
     },
     "napi-build-utils": {
@@ -47329,6 +47144,13 @@
       "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==",
       "optional": true
     },
+    "native-request": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/native-request/-/native-request-1.0.7.tgz",
+      "integrity": "sha512-9nRjinI9bmz+S7dgNtf4A70+/vPhnd+2krGpy4SUlADuOuSa24IDkNaZ+R/QT1wQ6S8jBdi6wE7fLekFZNfUpQ==",
+      "dev": true,
+      "optional": true
+    },
     "native-run": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/native-run/-/native-run-1.4.0.tgz",
@@ -47348,10 +47170,19 @@
         "yauzl": "^2.10.0"
       },
       "dependencies": {
-        "ini": {
-          "version": "1.3.8",
-          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-          "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         },
         "readable-stream": {
@@ -47382,37 +47213,6 @@
       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
       "dev": true
     },
-    "needle": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/needle/-/needle-2.8.0.tgz",
-      "integrity": "sha512-ZTq6WYkN/3782H1393me3utVYdq2XyqNUFBsprEE3VMAT0+hP/cItpnITpqsY6ep2yeFE4Tqtqwc74VqUlUYtw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "debug": "^3.2.6",
-        "iconv-lite": "^0.4.4",
-        "sax": "^1.2.4"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "sax": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-          "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
     "negotiator": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
@@ -47456,9 +47256,9 @@
       }
     },
     "node-abi": {
-      "version": "2.30.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.30.0.tgz",
-      "integrity": "sha512-g6bZh3YCKQRdwuO/tSZZYJAw622SjsRfJ2X0Iy4sSOHZ34/sPPdVBn8fev2tj7njzLwuqPw9uMtGsGkO5kIQvg==",
+      "version": "2.19.3",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.19.3.tgz",
+      "integrity": "sha512-9xZrlyfvKhWme2EXFKQhZRp1yNWT/uI1luYPr3sFl+H4keYY4xR+1jO7mvTTijIsHf1M+QDe9uWuKeEpLInIlg==",
       "optional": true,
       "requires": {
         "semver": "^5.4.1"
@@ -47473,11 +47273,22 @@
       }
     },
     "node-addon-api": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
-      "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.0.2.tgz",
+      "integrity": "sha512-+D4s2HCnxPd5PjjI0STKwncjXTUKKqm74MDMz9OPXavjsGmjkvwgLtA5yoxJUdmpj52+2u+RrXgPipahKczMKg==",
       "optional": true
     },
+    "node-fetch-npm": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.4.tgz",
+      "integrity": "sha512-iOuIQDWDyjhv9qSDrj9aq/klt6F9z1p2otB3AV7v3zBDcL/x+OfGsvGQZZCcMZbUf4Ujw1xGNQkjvGnVT22cKg==",
+      "dev": true,
+      "requires": {
+        "encoding": "^0.1.11",
+        "json-parse-better-errors": "^1.0.0",
+        "safe-buffer": "^5.1.1"
+      }
+    },
     "node-forge": {
       "version": "0.10.0",
       "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
@@ -47553,22 +47364,26 @@
         "vm-browserify": "^1.0.1"
       },
       "dependencies": {
-        "buffer": {
-          "version": "4.9.2",
-          "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
-          "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
-          "dev": true,
-          "requires": {
-            "base64-js": "^1.0.2",
-            "ieee754": "^1.1.4",
-            "isarray": "^1.0.0"
-          }
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "dev": true
         },
         "punycode": {
           "version": "1.4.1",
           "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
           "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
           "dev": true
+        },
+        "util": {
+          "version": "0.11.1",
+          "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+          "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.3"
+          }
         }
       }
     },
@@ -47579,9 +47394,9 @@
       "dev": true
     },
     "node-notifier": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.2.tgz",
-      "integrity": "sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.0.tgz",
+      "integrity": "sha512-46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA==",
       "dev": true,
       "optional": true,
       "requires": {
@@ -47591,14 +47406,29 @@
         "shellwords": "^0.1.1",
         "uuid": "^8.3.0",
         "which": "^2.0.2"
+      },
+      "dependencies": {
+        "uuid": {
+          "version": "8.3.1",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.1.tgz",
+          "integrity": "sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==",
+          "dev": true,
+          "optional": true
+        }
       }
     },
     "node-releases": {
-      "version": "1.1.73",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz",
-      "integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==",
+      "version": "1.1.61",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.61.tgz",
+      "integrity": "sha512-DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g==",
       "dev": true
     },
+    "noop-logger": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz",
+      "integrity": "sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI=",
+      "optional": true
+    },
     "nopt": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
@@ -47620,9 +47450,9 @@
       },
       "dependencies": {
         "hosted-git-info": {
-          "version": "2.8.9",
-          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-          "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="
+          "version": "2.8.8",
+          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
+          "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="
         },
         "semver": {
           "version": "5.7.1",
@@ -47644,10 +47474,9 @@
       "dev": true
     },
     "normalize-url": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
-      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
-      "dev": true
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
+      "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA=="
     },
     "now-and-later": {
       "version": "2.0.1",
@@ -47659,9 +47488,9 @@
       }
     },
     "npm-bundled": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz",
-      "integrity": "sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz",
+      "integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==",
       "requires": {
         "npm-normalize-package-bin": "^1.0.1"
       }
@@ -47680,23 +47509,23 @@
       "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA=="
     },
     "npm-package-arg": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.0.tgz",
-      "integrity": "sha512-/ep6QDxBkm9HvOhOg0heitSd7JHA1U7y1qhhlRlteYYAi9Pdb/ZV7FW5aHpkrpM8+P+4p/jjR8zCyKPBMBjSig==",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.0.1.tgz",
+      "integrity": "sha512-/h5Fm6a/exByzFSTm7jAyHbgOqErl9qSNJDQF32Si/ZzgwT2TERVxRxn3Jurw1wflgyVVAxnFR4fRHPM7y1ClQ==",
       "requires": {
-        "hosted-git-info": "^3.0.6",
+        "hosted-git-info": "^3.0.2",
         "semver": "^7.0.0",
         "validate-npm-package-name": "^3.0.0"
       }
     },
     "npm-packlist": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.2.2.tgz",
-      "integrity": "sha512-Jt01acDvJRhJGthnUJVF/w6gumWOZxO7IkpY/lsX9//zqQgnF7OJaxgQXcerd4uQOLu7W5bkb4mChL9mdfm+Zg==",
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz",
+      "integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==",
+      "dev": true,
       "requires": {
-        "glob": "^7.1.6",
-        "ignore-walk": "^3.0.3",
-        "npm-bundled": "^1.1.1",
+        "ignore-walk": "^3.0.1",
+        "npm-bundled": "^1.0.1",
         "npm-normalize-package-bin": "^1.0.1"
       }
     },
@@ -47711,18 +47540,65 @@
       }
     },
     "npm-registry-fetch": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-9.0.0.tgz",
-      "integrity": "sha512-PuFYYtnQ8IyVl6ib9d3PepeehcUeHN9IO5N/iCRhyg9tStQcqGQBRVHmfmMWPDERU3KwZoHFvbJ4FPXPspvzbA==",
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.7.tgz",
+      "integrity": "sha512-cny9v0+Mq6Tjz+e0erFAB+RYJ/AVGzkjnISiobqP8OWj9c9FLoZZu8/SPSKJWE17F1tk4018wfjV+ZbIbqC7fQ==",
+      "dev": true,
       "requires": {
-        "@npmcli/ci-detect": "^1.0.0",
-        "lru-cache": "^6.0.0",
-        "make-fetch-happen": "^8.0.9",
-        "minipass": "^3.1.3",
-        "minipass-fetch": "^1.3.0",
-        "minipass-json-stream": "^1.0.1",
-        "minizlib": "^2.0.0",
-        "npm-package-arg": "^8.0.0"
+        "bluebird": "^3.5.1",
+        "figgy-pudding": "^3.4.1",
+        "JSONStream": "^1.3.4",
+        "lru-cache": "^5.1.1",
+        "make-fetch-happen": "^5.0.0",
+        "npm-package-arg": "^6.1.0",
+        "safe-buffer": "^5.2.0"
+      },
+      "dependencies": {
+        "hosted-git-info": {
+          "version": "2.8.8",
+          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
+          "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+          "dev": true
+        },
+        "lru-cache": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+          "dev": true,
+          "requires": {
+            "yallist": "^3.0.2"
+          }
+        },
+        "npm-package-arg": {
+          "version": "6.1.1",
+          "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
+          "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
+          "dev": true,
+          "requires": {
+            "hosted-git-info": "^2.7.1",
+            "osenv": "^0.1.5",
+            "semver": "^5.6.0",
+            "validate-npm-package-name": "^3.0.0"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "dev": true
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        },
+        "yallist": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+          "dev": true
+        }
       }
     },
     "npm-run-path": {
@@ -47753,6 +47629,12 @@
         "boolbase": "~1.0.0"
       }
     },
+    "num2fraction": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
+      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
+      "dev": true
+    },
     "number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
@@ -47794,43 +47676,6 @@
             "is-descriptor": "^0.1.0"
           }
         },
-        "is-accessor-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          }
-        },
-        "is-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^0.1.6",
-            "is-data-descriptor": "^0.1.4",
-            "kind-of": "^5.0.0"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "5.1.0",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-              "dev": true
-            }
-          }
-        },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -47843,19 +47688,19 @@
       }
     },
     "object-inspect": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz",
-      "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
+      "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==",
       "dev": true
     },
     "object-is": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
-      "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.3.tgz",
+      "integrity": "sha512-teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.18.0-next.1"
       }
     },
     "object-keys": {
@@ -47864,6 +47709,12 @@
       "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
       "dev": true
     },
+    "object-path": {
+      "version": "0.11.4",
+      "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.11.4.tgz",
+      "integrity": "sha1-NwrnUvvzfePqcKhhwju6iRVpGUk=",
+      "dev": true
+    },
     "object-visit": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
@@ -47882,13 +47733,13 @@
       }
     },
     "object.assign": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz",
+      "integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.0",
         "define-properties": "^1.1.3",
+        "es-abstract": "^1.18.0-next.0",
         "has-symbols": "^1.0.1",
         "object-keys": "^1.1.1"
       }
@@ -47913,6 +47764,37 @@
         }
       }
     },
+    "object.getownpropertydescriptors": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz",
+      "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.17.7",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+          "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+          "dev": true,
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.2.2",
+            "is-regex": "^1.1.1",
+            "object-inspect": "^1.8.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.1",
+            "string.prototype.trimend": "^1.0.1",
+            "string.prototype.trimstart": "^1.0.1"
+          }
+        }
+      }
+    },
     "object.map": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
@@ -47951,20 +47833,42 @@
       }
     },
     "object.values": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.4.tgz",
-      "integrity": "sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz",
+      "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.2"
+        "es-abstract": "^1.17.0-next.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.17.7",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+          "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+          "dev": true,
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.2.2",
+            "is-regex": "^1.1.1",
+            "object-inspect": "^1.8.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.1",
+            "string.prototype.trimend": "^1.0.1",
+            "string.prototype.trimstart": "^1.0.1"
+          }
+        }
       }
     },
     "objectorarray": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/objectorarray/-/objectorarray-1.0.5.tgz",
-      "integrity": "sha512-eJJDYkhJFFbBBAxeh8xW+weHlkI28n2ZdQV/J/DNfWfSKlGEf2xcfAbZTv3riEXHAhL9SVOTs2pRmXiSTf78xg=="
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/objectorarray/-/objectorarray-1.0.4.tgz",
+      "integrity": "sha512-91k8bjcldstRz1bG6zJo8lWD7c6QXcB4nTDUqiEvIL1xAsLoZlOOZZG+nd6YPz+V7zY1580J4Xxh1vZtyv4i/w=="
     },
     "obuf": {
       "version": "1.1.2",
@@ -48002,9 +47906,9 @@
       }
     },
     "open": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/open/-/open-7.4.0.tgz",
-      "integrity": "sha512-PGoBCX/lclIWlpS/R2PQuIR4NJoXh6X5AwVzE7WXnWRGvHg7+4TBCgsujUgiPpm0K1y4qvQeWnCWVTpTKZBtvA==",
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/open/-/open-7.3.0.tgz",
+      "integrity": "sha512-mgLwQIx2F/ye9SmbrUkurZCnkoXyXyu9EbHtJZrICjVAJfyMArdHp3KkixGdZx1ZHFPNIwl0DDM1dFFqXbTLZw==",
       "requires": {
         "is-docker": "^2.0.0",
         "is-wsl": "^2.1.1"
@@ -48042,62 +47946,53 @@
       }
     },
     "ora": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-5.3.0.tgz",
-      "integrity": "sha512-zAKMgGXUim0Jyd6CXK9lraBnD3H5yPGBPPOkC23a2BG6hsm4Zu6OQSjQuEtV0BHDf4aKHcUFvJiGRrFuW3MG8g==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-4.0.4.tgz",
+      "integrity": "sha512-77iGeVU1cIdRhgFzCK8aw1fbtT1B/iZAvWjS+l/o1x0RShMgxHUZaD2yDpWsNCPwXg9z1ZA78Kbdvr8kBmG/Ww==",
       "dev": true,
       "requires": {
-        "bl": "^4.0.3",
-        "chalk": "^4.1.0",
+        "chalk": "^3.0.0",
         "cli-cursor": "^3.1.0",
-        "cli-spinners": "^2.5.0",
+        "cli-spinners": "^2.2.0",
         "is-interactive": "^1.0.0",
-        "log-symbols": "^4.0.0",
+        "log-symbols": "^3.0.0",
+        "mute-stream": "0.0.8",
         "strip-ansi": "^6.0.0",
         "wcwidth": "^1.0.1"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
           "dev": true
         },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+        "cli-cursor": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+          "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
           "dev": true,
           "requires": {
-            "has-flag": "^4.0.0"
+            "restore-cursor": "^3.1.0"
+          }
+        },
+        "restore-cursor": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+          "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+          "dev": true,
+          "requires": {
+            "onetime": "^5.1.0",
+            "signal-exit": "^3.0.2"
+          }
+        },
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.0"
           }
         }
       }
@@ -48141,13 +48036,12 @@
       }
     },
     "os-name": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/os-name/-/os-name-4.0.1.tgz",
-      "integrity": "sha512-xl9MAoU97MH1Xt5K9ERft2YfCAoaO6msy1OBA0ozxEC0x0TmIoE6K3QvgJMMZA9yKGLmHXNY/YZoDbiGDj4zYw==",
-      "dev": true,
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/os-name/-/os-name-3.1.0.tgz",
+      "integrity": "sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==",
       "requires": {
-        "macos-release": "^2.5.0",
-        "windows-release": "^4.0.0"
+        "macos-release": "^2.2.0",
+        "windows-release": "^3.1.0"
       }
     },
     "os-tmpdir": {
@@ -48170,9 +48064,9 @@
       "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="
     },
     "p-each-series": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.2.0.tgz",
-      "integrity": "sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.1.0.tgz",
+      "integrity": "sha512-ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ==",
       "dev": true
     },
     "p-finally": {
@@ -48181,12 +48075,18 @@
       "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
     },
     "p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dev": true,
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
       "requires": {
-        "yocto-queue": "^0.1.0"
+        "p-try": "^1.0.0"
+      },
+      "dependencies": {
+        "p-try": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
+        }
       }
     },
     "p-locate": {
@@ -48195,21 +48095,6 @@
       "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
       "requires": {
         "p-limit": "^1.1.0"
-      },
-      "dependencies": {
-        "p-limit": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-          "requires": {
-            "p-try": "^1.0.0"
-          }
-        },
-        "p-try": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
-        }
       }
     },
     "p-map": {
@@ -48227,14 +48112,6 @@
       "dev": true,
       "requires": {
         "retry": "^0.12.0"
-      },
-      "dependencies": {
-        "retry": {
-          "version": "0.12.0",
-          "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
-          "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
-          "dev": true
-        }
       }
     },
     "p-try": {
@@ -48257,6 +48134,64 @@
         "pac-resolver": "^4.1.0",
         "raw-body": "^2.2.0",
         "socks-proxy-agent": "5"
+      },
+      "dependencies": {
+        "agent-base": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+          "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+          "dev": true,
+          "requires": {
+            "debug": "4"
+          }
+        },
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "http-proxy-agent": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+          "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+          "dev": true,
+          "requires": {
+            "@tootallnate/once": "1",
+            "agent-base": "6",
+            "debug": "4"
+          }
+        },
+        "https-proxy-agent": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+          "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+          "dev": true,
+          "requires": {
+            "agent-base": "6",
+            "debug": "4"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        },
+        "socks-proxy-agent": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz",
+          "integrity": "sha512-lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA==",
+          "dev": true,
+          "requires": {
+            "agent-base": "6",
+            "debug": "4",
+            "socks": "^2.3.3"
+          }
+        }
       }
     },
     "pac-resolver": {
@@ -48289,29 +48224,201 @@
       }
     },
     "pacote": {
-      "version": "11.2.4",
-      "resolved": "https://registry.npmjs.org/pacote/-/pacote-11.2.4.tgz",
-      "integrity": "sha512-GfTeVQGJ6WyBQbQD4t3ocHbyOmTQLmWjkCKSZPmKiGFKYKNUaM5U2gbLzUW8WG1XmS9yQFnsTFA0k3o1+q4klQ==",
+      "version": "9.5.12",
+      "resolved": "https://registry.npmjs.org/pacote/-/pacote-9.5.12.tgz",
+      "integrity": "sha512-BUIj/4kKbwWg4RtnBncXPJd15piFSVNpTzY0rysSr3VnMowTYgkGKcaHrbReepAkjTr8lH2CVWRi58Spg2CicQ==",
+      "dev": true,
       "requires": {
-        "@npmcli/git": "^2.0.1",
-        "@npmcli/installed-package-contents": "^1.0.5",
-        "@npmcli/promise-spawn": "^1.2.0",
-        "@npmcli/run-script": "^1.3.0",
-        "cacache": "^15.0.5",
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.1.0",
+        "bluebird": "^3.5.3",
+        "cacache": "^12.0.2",
+        "chownr": "^1.1.2",
+        "figgy-pudding": "^3.5.1",
+        "get-stream": "^4.1.0",
+        "glob": "^7.1.3",
         "infer-owner": "^1.0.4",
-        "minipass": "^3.1.3",
-        "mkdirp": "^1.0.3",
-        "npm-package-arg": "^8.0.1",
-        "npm-packlist": "^2.1.4",
-        "npm-pick-manifest": "^6.0.0",
-        "npm-registry-fetch": "^9.0.0",
+        "lru-cache": "^5.1.1",
+        "make-fetch-happen": "^5.0.0",
+        "minimatch": "^3.0.4",
+        "minipass": "^2.3.5",
+        "mississippi": "^3.0.0",
+        "mkdirp": "^0.5.1",
+        "normalize-package-data": "^2.4.0",
+        "npm-normalize-package-bin": "^1.0.0",
+        "npm-package-arg": "^6.1.0",
+        "npm-packlist": "^1.1.12",
+        "npm-pick-manifest": "^3.0.0",
+        "npm-registry-fetch": "^4.0.0",
+        "osenv": "^0.1.5",
+        "promise-inflight": "^1.0.1",
         "promise-retry": "^1.1.1",
-        "read-package-json-fast": "^1.1.3",
-        "rimraf": "^3.0.2",
-        "ssri": "^8.0.0",
-        "tar": "^6.1.0"
+        "protoduck": "^5.0.1",
+        "rimraf": "^2.6.2",
+        "safe-buffer": "^5.1.2",
+        "semver": "^5.6.0",
+        "ssri": "^6.0.1",
+        "tar": "^4.4.10",
+        "unique-filename": "^1.1.1",
+        "which": "^1.3.1"
+      },
+      "dependencies": {
+        "cacache": {
+          "version": "12.0.4",
+          "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
+          "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
+          "dev": true,
+          "requires": {
+            "bluebird": "^3.5.5",
+            "chownr": "^1.1.1",
+            "figgy-pudding": "^3.5.1",
+            "glob": "^7.1.4",
+            "graceful-fs": "^4.1.15",
+            "infer-owner": "^1.0.3",
+            "lru-cache": "^5.1.1",
+            "mississippi": "^3.0.0",
+            "mkdirp": "^0.5.1",
+            "move-concurrently": "^1.0.1",
+            "promise-inflight": "^1.0.1",
+            "rimraf": "^2.6.3",
+            "ssri": "^6.0.1",
+            "unique-filename": "^1.1.1",
+            "y18n": "^4.0.0"
+          }
+        },
+        "chownr": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+          "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+          "dev": true
+        },
+        "fs-minipass": {
+          "version": "1.2.7",
+          "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
+          "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
+          "dev": true,
+          "requires": {
+            "minipass": "^2.6.0"
+          }
+        },
+        "get-stream": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+          "dev": true,
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "hosted-git-info": {
+          "version": "2.8.8",
+          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
+          "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+          "dev": true
+        },
+        "lru-cache": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+          "dev": true,
+          "requires": {
+            "yallist": "^3.0.2"
+          }
+        },
+        "minipass": {
+          "version": "2.9.0",
+          "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
+          "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "^5.1.2",
+            "yallist": "^3.0.0"
+          }
+        },
+        "minizlib": {
+          "version": "1.3.3",
+          "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
+          "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
+          "dev": true,
+          "requires": {
+            "minipass": "^2.9.0"
+          }
+        },
+        "npm-package-arg": {
+          "version": "6.1.1",
+          "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
+          "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
+          "dev": true,
+          "requires": {
+            "hosted-git-info": "^2.7.1",
+            "osenv": "^0.1.5",
+            "semver": "^5.6.0",
+            "validate-npm-package-name": "^3.0.0"
+          }
+        },
+        "npm-pick-manifest": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-3.0.2.tgz",
+          "integrity": "sha512-wNprTNg+X5nf+tDi+hbjdHhM4bX+mKqv6XmPh7B5eG+QY9VARfQPfCEH013H5GqfNj6ee8Ij2fg8yk0mzps1Vw==",
+          "dev": true,
+          "requires": {
+            "figgy-pudding": "^3.5.1",
+            "npm-package-arg": "^6.0.0",
+            "semver": "^5.4.1"
+          }
+        },
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        },
+        "ssri": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+          "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+          "dev": true,
+          "requires": {
+            "figgy-pudding": "^3.5.1"
+          }
+        },
+        "tar": {
+          "version": "4.4.13",
+          "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz",
+          "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
+          "dev": true,
+          "requires": {
+            "chownr": "^1.1.1",
+            "fs-minipass": "^1.2.5",
+            "minipass": "^2.8.6",
+            "minizlib": "^1.2.1",
+            "mkdirp": "^0.5.0",
+            "safe-buffer": "^5.1.2",
+            "yallist": "^3.0.3"
+          }
+        },
+        "which": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        },
+        "yallist": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+          "dev": true
+        }
       }
     },
     "pako": {
@@ -48372,15 +48479,13 @@
       }
     },
     "parse-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.0.0",
         "error-ex": "^1.3.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "lines-and-columns": "^1.1.6"
+        "json-parse-better-errors": "^1.0.1"
       }
     },
     "parse-node-version": {
@@ -48396,65 +48501,10 @@
       "dev": true
     },
     "parse5": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz",
-      "integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "parse5-html-rewriting-stream": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-6.0.1.tgz",
-      "integrity": "sha512-vwLQzynJVEfUlURxgnf51yAJDQTtVpNyGD8tKi2Za7m+akukNHxCcUQMAa/mUGLhCeicFdpy7Tlvj8ZNKadprg==",
-      "dev": true,
-      "requires": {
-        "parse5": "^6.0.1",
-        "parse5-sax-parser": "^6.0.1"
-      },
-      "dependencies": {
-        "parse5": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-          "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
-          "dev": true
-        }
-      }
-    },
-    "parse5-htmlparser2-tree-adapter": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz",
-      "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==",
-      "dev": true,
-      "requires": {
-        "parse5": "^6.0.1"
-      },
-      "dependencies": {
-        "parse5": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-          "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
-          "dev": true
-        }
-      }
-    },
-    "parse5-sax-parser": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5-sax-parser/-/parse5-sax-parser-6.0.1.tgz",
-      "integrity": "sha512-kXX+5S81lgESA0LsDuGjAlBybImAChYRMT+/uKCEXFBFOeEhS52qUCydGhU3qLRD8D9DVjaUo821WK7DM4iCeg==",
-      "dev": true,
-      "requires": {
-        "parse5": "^6.0.1"
-      },
-      "dependencies": {
-        "parse5": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-          "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
-          "dev": true
-        }
-      }
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
+      "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==",
+      "dev": true
     },
     "parseurl": {
       "version": "1.3.3",
@@ -48500,9 +48550,9 @@
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
     },
     "path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
     },
     "path-root": {
       "version": "0.1.1",
@@ -48530,9 +48580,9 @@
       "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
     },
     "pbkdf2": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
-      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.1.tgz",
+      "integrity": "sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==",
       "dev": true,
       "requires": {
         "create-hash": "^1.1.2",
@@ -48559,14 +48609,14 @@
       "integrity": "sha512-1wvc3iQOQpEBaQbXgLxA2JUiLSQ2azdF/bF29ghXDiQJWSpQ1BF8gSuqttM8WZoj081Ps8OKL0gYxdDBkFNPqA=="
     },
     "picomatch": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
-      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="
     },
     "pify": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz",
-      "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA=="
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
     },
     "pinkie": {
       "version": "2.0.4",
@@ -48593,12 +48643,51 @@
       }
     },
     "pkg-dir": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
-      "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
       "dev": true,
       "requires": {
-        "find-up": "^2.1.0"
+        "find-up": "^3.0.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        }
       }
     },
     "pkg-up": {
@@ -48610,13 +48699,13 @@
       }
     },
     "plist": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.2.tgz",
-      "integrity": "sha512-MSrkwZBdQ6YapHy87/8hDU8MnIcyxBKjeF+McXnr5A9MtffPewTs7G3hlpodT5TacyfIyFTaJEhh3GGcmasTgQ==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.1.tgz",
+      "integrity": "sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==",
       "requires": {
-        "base64-js": "^1.5.1",
+        "base64-js": "^1.2.3",
         "xmlbuilder": "^9.0.7",
-        "xmldom": "^0.5.0"
+        "xmldom": "0.1.x"
       }
     },
     "plugin-error": {
@@ -48630,6 +48719,45 @@
         "arr-diff": "^1.0.1",
         "arr-union": "^2.0.1",
         "extend-shallow": "^1.1.2"
+      },
+      "dependencies": {
+        "arr-diff": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
+          "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "^1.0.1",
+            "array-slice": "^0.2.3"
+          }
+        },
+        "arr-union": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
+          "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=",
+          "dev": true
+        },
+        "array-slice": {
+          "version": "0.2.3",
+          "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
+          "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
+          "dev": true
+        },
+        "extend-shallow": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
+          "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^1.1.0"
+          }
+        },
+        "kind-of": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
+          "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
+          "dev": true
+        }
       }
     },
     "pnp-webpack-plugin": {
@@ -48653,22 +48781,19 @@
       },
       "dependencies": {
         "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "dev": true,
           "requires": {
             "ms": "^2.1.1"
           }
         },
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
         }
       }
     },
@@ -48679,20 +48804,66 @@
       "dev": true
     },
     "postcss": {
-      "version": "8.2.15",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.15.tgz",
-      "integrity": "sha512-2zO3b26eJD/8rb106Qu2o7Qgg52ND5HPjcyQiK2B98O388h43A448LCslC0dI2P97wCAQRJsFvwTRcXxTKds+Q==",
+      "version": "7.0.31",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.31.tgz",
+      "integrity": "sha512-a937VDHE1ftkjk+8/7nj/mrjtmkn69xxzJgRETXdAUU+IgOYPQNJF17haGWbeDxSyk++HA14UA98FurvPyBJOA==",
       "dev": true,
       "requires": {
-        "colorette": "^1.2.2",
-        "nanoid": "^3.1.23",
-        "source-map": "^0.6.1"
+        "chalk": "^2.4.2",
+        "source-map": "^0.6.1",
+        "supports-color": "^6.1.0"
       },
       "dependencies": {
-        "colorette": {
-          "version": "1.2.2",
-          "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
-          "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "5.5.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+              "dev": true,
+              "requires": {
+                "has-flag": "^3.0.0"
+              }
+            }
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
           "dev": true
         },
         "source-map": {
@@ -48700,376 +48871,692 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
         }
       }
     },
     "postcss-calc": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.0.0.tgz",
-      "integrity": "sha512-5NglwDrcbiy8XXfPM11F3HeC6hoT9W7GUH/Zi5U/p7u3Irv4rHhdDcIZwG0llHXV4ftsBjpfWMXAnXNl4lnt8g==",
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.5.tgz",
+      "integrity": "sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg==",
       "dev": true,
       "requires": {
+        "postcss": "^7.0.27",
         "postcss-selector-parser": "^6.0.2",
         "postcss-value-parser": "^4.0.2"
       }
     },
     "postcss-colormin": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.2.0.tgz",
-      "integrity": "sha512-+HC6GfWU3upe5/mqmxuqYZ9B2Wl4lcoUUNkoaX59nEWV4EtADCMiBqui111Bu8R8IvaZTmqmxrqOAqjbHIwXPw==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz",
+      "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.16.6",
-        "caniuse-api": "^3.0.0",
-        "colord": "^2.0.1",
-        "postcss-value-parser": "^4.1.0"
+        "browserslist": "^4.0.0",
+        "color": "^3.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
       }
     },
     "postcss-convert-values": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.0.1.tgz",
-      "integrity": "sha512-C3zR1Do2BkKkCgC0g3sF8TS0koF2G+mN8xxayZx3f10cIRmTaAnpgpRQZjNekTZxM2ciSPoh2IWJm0VZx8NoQg==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz",
+      "integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==",
       "dev": true,
       "requires": {
-        "postcss-value-parser": "^4.1.0"
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
       }
     },
     "postcss-discard-comments": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.0.1.tgz",
-      "integrity": "sha512-lgZBPTDvWrbAYY1v5GYEv8fEO/WhKOu/hmZqmCYfrpD6eyDWWzAOsl2rF29lpvziKO02Gc5GJQtlpkTmakwOWg==",
-      "dev": true,
-      "requires": {}
-    },
-    "postcss-discard-duplicates": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.1.tgz",
-      "integrity": "sha512-svx747PWHKOGpAXXQkCc4k/DsWo+6bc5LsVrAsw+OU+Ibi7klFZCyX54gjYzX4TH+f2uzXjRviLARxkMurA2bA==",
-      "dev": true,
-      "requires": {}
-    },
-    "postcss-discard-empty": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.0.1.tgz",
-      "integrity": "sha512-vfU8CxAQ6YpMxV2SvMcMIyF2LX1ZzWpy0lqHDsOdaKKLQVQGVP1pzhrI9JlsO65s66uQTfkQBKBD/A5gp9STFw==",
-      "dev": true,
-      "requires": {}
-    },
-    "postcss-discard-overridden": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.0.1.tgz",
-      "integrity": "sha512-Y28H7y93L2BpJhrdUR2SR2fnSsT+3TVx1NmVQLbcnZWwIUpJ7mfcTC6Za9M2PG6w8j7UQRfzxqn8jU2VwFxo3Q==",
-      "dev": true,
-      "requires": {}
-    },
-    "postcss-import": {
-      "version": "14.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-14.0.0.tgz",
-      "integrity": "sha512-gFDDzXhqr9ELmnLHgCC3TbGfA6Dm/YMb/UN8/f7Uuq4fL7VTk2vOIj6hwINEwbokEmp123bLD7a5m+E+KIetRg==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz",
+      "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==",
       "dev": true,
       "requires": {
-        "postcss-value-parser": "^4.0.0",
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-discard-duplicates": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz",
+      "integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-discard-empty": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz",
+      "integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-discard-overridden": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz",
+      "integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-import": {
+      "version": "12.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-12.0.1.tgz",
+      "integrity": "sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.1",
+        "postcss-value-parser": "^3.2.3",
         "read-cache": "^1.0.0",
         "resolve": "^1.1.7"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-load-config": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.2.tgz",
+      "integrity": "sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==",
+      "dev": true,
+      "requires": {
+        "cosmiconfig": "^5.0.0",
+        "import-cwd": "^2.0.0"
       }
     },
     "postcss-loader": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-4.2.0.tgz",
-      "integrity": "sha512-mqgScxHqbiz1yxbnNcPdKYo/6aVt+XExURmEbQlviFVWogDbM4AJ0A/B+ZBpYsJrTRxKw7HyRazg9x0Q9SWwLA==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz",
+      "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==",
       "dev": true,
       "requires": {
-        "cosmiconfig": "^7.0.0",
-        "klona": "^2.0.4",
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0",
-        "semver": "^7.3.4"
+        "loader-utils": "^1.1.0",
+        "postcss": "^7.0.0",
+        "postcss-load-config": "^2.0.0",
+        "schema-utils": "^1.0.0"
       },
       "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
+            "minimist": "^1.2.0"
           }
         },
-        "ajv-keywords": {
-          "version": "3.5.2",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-          "dev": true,
-          "requires": {}
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        },
-        "schema-utils": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+        "loader-utils": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
           "dev": true,
           "requires": {
-            "@types/json-schema": "^7.0.8",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
+        },
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
           }
         }
       }
     },
     "postcss-merge-longhand": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.0.2.tgz",
-      "integrity": "sha512-BMlg9AXSI5G9TBT0Lo/H3PfUy63P84rVz3BjCFE9e9Y9RXQZD3+h3YO1kgTNsNJy7bBc1YQp8DmSnwLIW5VPcw==",
+      "version": "4.0.11",
+      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz",
+      "integrity": "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==",
       "dev": true,
       "requires": {
-        "css-color-names": "^1.0.1",
-        "postcss-value-parser": "^4.1.0",
-        "stylehacks": "^5.0.1"
+        "css-color-names": "0.0.4",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0",
+        "stylehacks": "^4.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
       }
     },
     "postcss-merge-rules": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.0.2.tgz",
-      "integrity": "sha512-5K+Md7S3GwBewfB4rjDeol6V/RZ8S+v4B66Zk2gChRqLTCC8yjnHQ601omj9TKftS19OPGqZ/XzoqpzNQQLwbg==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz",
+      "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.16.6",
+        "browserslist": "^4.0.0",
         "caniuse-api": "^3.0.0",
-        "cssnano-utils": "^2.0.1",
-        "postcss-selector-parser": "^6.0.5",
-        "vendors": "^1.0.3"
+        "cssnano-util-same-parent": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-selector-parser": "^3.0.0",
+        "vendors": "^1.0.0"
+      },
+      "dependencies": {
+        "postcss-selector-parser": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
+          "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
+          "dev": true,
+          "requires": {
+            "dot-prop": "^5.2.0",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
+          }
+        }
       }
     },
     "postcss-minify-font-values": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.0.1.tgz",
-      "integrity": "sha512-7JS4qIsnqaxk+FXY1E8dHBDmraYFWmuL6cgt0T1SWGRO5bzJf8sUoelwa4P88LEWJZweHevAiDKxHlofuvtIoA==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz",
+      "integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==",
       "dev": true,
       "requires": {
-        "postcss-value-parser": "^4.1.0"
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
       }
     },
     "postcss-minify-gradients": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.0.1.tgz",
-      "integrity": "sha512-odOwBFAIn2wIv+XYRpoN2hUV3pPQlgbJ10XeXPq8UY2N+9ZG42xu45lTn/g9zZ+d70NKSQD6EOi6UiCMu3FN7g==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz",
+      "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==",
       "dev": true,
       "requires": {
-        "cssnano-utils": "^2.0.1",
-        "is-color-stop": "^1.1.0",
-        "postcss-value-parser": "^4.1.0"
+        "cssnano-util-get-arguments": "^4.0.0",
+        "is-color-stop": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
       }
     },
     "postcss-minify-params": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.0.1.tgz",
-      "integrity": "sha512-4RUC4k2A/Q9mGco1Z8ODc7h+A0z7L7X2ypO1B6V8057eVK6mZ6xwz6QN64nHuHLbqbclkX1wyzRnIrdZehTEHw==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz",
+      "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==",
       "dev": true,
       "requires": {
-        "alphanum-sort": "^1.0.2",
-        "browserslist": "^4.16.0",
-        "cssnano-utils": "^2.0.1",
-        "postcss-value-parser": "^4.1.0",
+        "alphanum-sort": "^1.0.0",
+        "browserslist": "^4.0.0",
+        "cssnano-util-get-arguments": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0",
         "uniqs": "^2.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
       }
     },
     "postcss-minify-selectors": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.1.0.tgz",
-      "integrity": "sha512-NzGBXDa7aPsAcijXZeagnJBKBPMYLaJJzB8CQh6ncvyl2sIndLVWfbcDi0SBjRWk5VqEjXvf8tYwzoKf4Z07og==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz",
+      "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==",
       "dev": true,
       "requires": {
-        "alphanum-sort": "^1.0.2",
-        "postcss-selector-parser": "^6.0.5"
+        "alphanum-sort": "^1.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-selector-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-selector-parser": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
+          "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
+          "dev": true,
+          "requires": {
+            "dot-prop": "^5.2.0",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
+          }
+        }
       }
     },
     "postcss-modules-extract-imports": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
-      "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
-      "dev": true,
-      "requires": {}
-    },
-    "postcss-modules-local-by-default": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz",
-      "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz",
+      "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==",
       "dev": true,
       "requires": {
-        "icss-utils": "^5.0.0",
+        "postcss": "^7.0.5"
+      }
+    },
+    "postcss-modules-local-by-default": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz",
+      "integrity": "sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==",
+      "dev": true,
+      "requires": {
+        "icss-utils": "^4.1.1",
+        "postcss": "^7.0.32",
         "postcss-selector-parser": "^6.0.2",
         "postcss-value-parser": "^4.1.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "5.5.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+              "dev": true,
+              "requires": {
+                "has-flag": "^3.0.0"
+              }
+            }
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "7.0.35",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
+          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
+          "dev": true,
+          "requires": {
+            "chalk": "^2.4.2",
+            "source-map": "^0.6.1",
+            "supports-color": "^6.1.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
       }
     },
     "postcss-modules-scope": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
-      "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz",
+      "integrity": "sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==",
       "dev": true,
       "requires": {
-        "postcss-selector-parser": "^6.0.4"
+        "postcss": "^7.0.6",
+        "postcss-selector-parser": "^6.0.0"
       }
     },
     "postcss-modules-values": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
-      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz",
+      "integrity": "sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==",
       "dev": true,
       "requires": {
-        "icss-utils": "^5.0.0"
+        "icss-utils": "^4.0.0",
+        "postcss": "^7.0.6"
       }
     },
     "postcss-normalize-charset": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.0.1.tgz",
-      "integrity": "sha512-6J40l6LNYnBdPSk+BHZ8SF+HAkS4q2twe5jnocgd+xWpz/mx/5Sa32m3W1AA8uE8XaXN+eg8trIlfu8V9x61eg==",
-      "dev": true,
-      "requires": {}
-    },
-    "postcss-normalize-display-values": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.1.tgz",
-      "integrity": "sha512-uupdvWk88kLDXi5HEyI9IaAJTE3/Djbcrqq8YgjvAVuzgVuqIk3SuJWUisT2gaJbZm1H9g5k2w1xXilM3x8DjQ==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz",
+      "integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==",
       "dev": true,
       "requires": {
-        "cssnano-utils": "^2.0.1",
-        "postcss-value-parser": "^4.1.0"
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-normalize-display-values": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz",
+      "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==",
+      "dev": true,
+      "requires": {
+        "cssnano-util-get-match": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
       }
     },
     "postcss-normalize-positions": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.0.1.tgz",
-      "integrity": "sha512-rvzWAJai5xej9yWqlCb1OWLd9JjW2Ex2BCPzUJrbaXmtKtgfL8dBMOOMTX6TnvQMtjk3ei1Lswcs78qKO1Skrg==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz",
+      "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==",
       "dev": true,
       "requires": {
-        "postcss-value-parser": "^4.1.0"
+        "cssnano-util-get-arguments": "^4.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
       }
     },
     "postcss-normalize-repeat-style": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.1.tgz",
-      "integrity": "sha512-syZ2itq0HTQjj4QtXZOeefomckiV5TaUO6ReIEabCh3wgDs4Mr01pkif0MeVwKyU/LHEkPJnpwFKRxqWA/7O3w==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz",
+      "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==",
       "dev": true,
       "requires": {
-        "cssnano-utils": "^2.0.1",
-        "postcss-value-parser": "^4.1.0"
+        "cssnano-util-get-arguments": "^4.0.0",
+        "cssnano-util-get-match": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
       }
     },
     "postcss-normalize-string": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.0.1.tgz",
-      "integrity": "sha512-Ic8GaQ3jPMVl1OEn2U//2pm93AXUcF3wz+OriskdZ1AOuYV25OdgS7w9Xu2LO5cGyhHCgn8dMXh9bO7vi3i9pA==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz",
+      "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==",
       "dev": true,
       "requires": {
-        "postcss-value-parser": "^4.1.0"
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
       }
     },
     "postcss-normalize-timing-functions": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.0.1.tgz",
-      "integrity": "sha512-cPcBdVN5OsWCNEo5hiXfLUnXfTGtSFiBU9SK8k7ii8UD7OLuznzgNRYkLZow11BkQiiqMcgPyh4ZqXEEUrtQ1Q==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz",
+      "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==",
       "dev": true,
       "requires": {
-        "cssnano-utils": "^2.0.1",
-        "postcss-value-parser": "^4.1.0"
+        "cssnano-util-get-match": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
       }
     },
     "postcss-normalize-unicode": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.1.tgz",
-      "integrity": "sha512-kAtYD6V3pK0beqrU90gpCQB7g6AOfP/2KIPCVBKJM2EheVsBQmx/Iof+9zR9NFKLAx4Pr9mDhogB27pmn354nA==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz",
+      "integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.16.0",
-        "postcss-value-parser": "^4.1.0"
+        "browserslist": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
       }
     },
     "postcss-normalize-url": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.0.2.tgz",
-      "integrity": "sha512-k4jLTPUxREQ5bpajFQZpx8bCF2UrlqOTzP9kEqcEnOfwsRshWs2+oAFIHfDQB8GO2PaUaSE0NlTAYtbluZTlHQ==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz",
+      "integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==",
       "dev": true,
       "requires": {
-        "is-absolute-url": "^3.0.3",
-        "normalize-url": "^6.0.1",
-        "postcss-value-parser": "^4.1.0"
+        "is-absolute-url": "^2.0.0",
+        "normalize-url": "^3.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "normalize-url": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz",
+          "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==",
+          "dev": true
+        },
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
       }
     },
     "postcss-normalize-whitespace": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.1.tgz",
-      "integrity": "sha512-iPklmI5SBnRvwceb/XH568yyzK0qRVuAG+a1HFUsFRf11lEJTiQQa03a4RSCQvLKdcpX7XsI1Gen9LuLoqwiqA==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz",
+      "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==",
       "dev": true,
       "requires": {
-        "postcss-value-parser": "^4.1.0"
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
       }
     },
     "postcss-ordered-values": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.0.2.tgz",
-      "integrity": "sha512-8AFYDSOYWebJYLyJi3fyjl6CqMEG/UVworjiyK1r573I56kb3e879sCJLGvR3merj+fAdPpVplXKQZv+ey6CgQ==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz",
+      "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==",
       "dev": true,
       "requires": {
-        "cssnano-utils": "^2.0.1",
-        "postcss-value-parser": "^4.1.0"
+        "cssnano-util-get-arguments": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
       }
     },
     "postcss-reduce-initial": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.0.1.tgz",
-      "integrity": "sha512-zlCZPKLLTMAqA3ZWH57HlbCjkD55LX9dsRyxlls+wfuRfqCi5mSlZVan0heX5cHr154Dq9AfbH70LyhrSAezJw==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz",
+      "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.16.0",
-        "caniuse-api": "^3.0.0"
+        "browserslist": "^4.0.0",
+        "caniuse-api": "^3.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0"
       }
     },
     "postcss-reduce-transforms": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.1.tgz",
-      "integrity": "sha512-a//FjoPeFkRuAguPscTVmRQUODP+f3ke2HqFNgGPwdYnpeC29RZdCBvGRGTsKpMURb/I3p6jdKoBQ2zI+9Q7kA==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz",
+      "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==",
       "dev": true,
       "requires": {
-        "cssnano-utils": "^2.0.1",
-        "postcss-value-parser": "^4.1.0"
+        "cssnano-util-get-match": "^4.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
       }
     },
     "postcss-selector-parser": {
-      "version": "6.0.6",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz",
-      "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==",
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz",
+      "integrity": "sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==",
       "dev": true,
       "requires": {
         "cssesc": "^3.0.0",
+        "indexes-of": "^1.0.1",
+        "uniq": "^1.0.1",
         "util-deprecate": "^1.0.2"
       }
     },
     "postcss-svgo": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.0.2.tgz",
-      "integrity": "sha512-YzQuFLZu3U3aheizD+B1joQ94vzPfE6BNUcSYuceNxlVnKKsOtdo6hL9/zyC168Q8EwfLSgaDSalsUGa9f2C0A==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz",
+      "integrity": "sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw==",
       "dev": true,
       "requires": {
-        "postcss-value-parser": "^4.1.0",
-        "svgo": "^2.3.0"
+        "is-svg": "^3.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0",
+        "svgo": "^1.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
       }
     },
     "postcss-unique-selectors": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.0.1.tgz",
-      "integrity": "sha512-gwi1NhHV4FMmPn+qwBNuot1sG1t2OmacLQ/AX29lzyggnjd+MnVD5uqQmpXO3J17KGL2WAxQruj1qTd3H0gG/w==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz",
+      "integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==",
       "dev": true,
       "requires": {
-        "alphanum-sort": "^1.0.2",
-        "postcss-selector-parser": "^6.0.5",
+        "alphanum-sort": "^1.0.0",
+        "postcss": "^7.0.0",
         "uniqs": "^2.0.0"
       }
     },
@@ -49080,9 +49567,9 @@
       "dev": true
     },
     "prebuild-install": {
-      "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.3.tgz",
-      "integrity": "sha512-iqqSR84tNYQUQHRXalSKdIaM8Ov1QxOVuBNWI7+BzZWv6Ih9k75wOnH1rGQ9WWTaaLkTpxWKIciOF0KyfM74+Q==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.0.0.tgz",
+      "integrity": "sha512-h2ZJ1PXHKWZpp1caLw0oX9sagVpL2YTk+ZwInQbQ3QqNd4J03O6MpFNmMTJlkfgPENWqe5kP0WjQLqz5OjLfsw==",
       "optional": true,
       "requires": {
         "detect-libc": "^1.0.3",
@@ -49091,13 +49578,15 @@
         "minimist": "^1.2.3",
         "mkdirp-classic": "^0.5.3",
         "napi-build-utils": "^1.0.1",
-        "node-abi": "^2.21.0",
+        "node-abi": "^2.7.0",
+        "noop-logger": "^0.1.1",
         "npmlog": "^4.0.1",
         "pump": "^3.0.0",
         "rc": "^1.2.7",
         "simple-get": "^3.0.3",
         "tar-fs": "^2.0.0",
-        "tunnel-agent": "^0.6.0"
+        "tunnel-agent": "^0.6.0",
+        "which-pm-runs": "^1.0.0"
       }
     },
     "prelude-ls": {
@@ -49111,41 +49600,23 @@
       "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
       "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc="
     },
-    "pretty-bytes": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
-      "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==",
-      "dev": true
-    },
     "pretty-format": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
-      "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.5.2.tgz",
+      "integrity": "sha512-VizyV669eqESlkOikKJI8Ryxl/kPpbdLwNdPs2GrbQs18MpySB5S0Yo0N7zkg2xTRiFq4CFw8ct5Vg4a0xP0og==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.6.2",
+        "@jest/types": "^26.5.2",
         "ansi-regex": "^5.0.0",
         "ansi-styles": "^4.0.0",
-        "react-is": "^17.0.1"
+        "react-is": "^16.12.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "dev": true
         }
       }
     },
@@ -49181,19 +49652,28 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz",
       "integrity": "sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0=",
+      "dev": true,
       "requires": {
         "err-code": "^1.0.0",
         "retry": "^0.10.0"
+      },
+      "dependencies": {
+        "retry": {
+          "version": "0.10.1",
+          "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz",
+          "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=",
+          "dev": true
+        }
       }
     },
     "prompts": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.1.tgz",
-      "integrity": "sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.2.tgz",
+      "integrity": "sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA==",
       "dev": true,
       "requires": {
         "kleur": "^3.0.3",
-        "sisteransi": "^1.0.5"
+        "sisteransi": "^1.0.4"
       }
     },
     "promzard": {
@@ -49212,12 +49692,21 @@
         "string.prototype.codepointat": "^0.2.0"
       }
     },
-    "proxy-addr": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+    "protoduck": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/protoduck/-/protoduck-5.0.1.tgz",
+      "integrity": "sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==",
+      "dev": true,
       "requires": {
-        "forwarded": "0.2.0",
+        "genfun": "^5.0.0"
+      }
+    },
+    "proxy-addr": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
+      "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==",
+      "requires": {
+        "forwarded": "~0.1.2",
         "ipaddr.js": "1.9.1"
       }
     },
@@ -49237,6 +49726,45 @@
         "socks-proxy-agent": "^5.0.0"
       },
       "dependencies": {
+        "agent-base": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+          "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+          "dev": true,
+          "requires": {
+            "debug": "4"
+          }
+        },
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "http-proxy-agent": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+          "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+          "dev": true,
+          "requires": {
+            "@tootallnate/once": "1",
+            "agent-base": "6",
+            "debug": "4"
+          }
+        },
+        "https-proxy-agent": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+          "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+          "dev": true,
+          "requires": {
+            "agent-base": "6",
+            "debug": "4"
+          }
+        },
         "lru-cache": {
           "version": "5.1.1",
           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
@@ -49246,6 +49774,23 @@
             "yallist": "^3.0.2"
           }
         },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        },
+        "socks-proxy-agent": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz",
+          "integrity": "sha512-lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA==",
+          "dev": true,
+          "requires": {
+            "agent-base": "6",
+            "debug": "4",
+            "socks": "^2.3.3"
+          }
+        },
         "yallist": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
@@ -49286,9 +49831,9 @@
       },
       "dependencies": {
         "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
           "dev": true
         }
       }
@@ -49353,6 +49898,16 @@
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
       "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
     },
+    "query-string": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
+      "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
+      "dev": true,
+      "requires": {
+        "object-assign": "^4.1.0",
+        "strict-uri-encode": "^1.0.0"
+      }
+    },
     "querystring": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
@@ -49371,11 +49926,6 @@
       "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
       "dev": true
     },
-    "queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="
-    },
     "randombytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
@@ -49419,51 +49969,13 @@
       }
     },
     "raw-loader": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-4.0.2.tgz",
-      "integrity": "sha512-ZnScIV3ag9A4wPX/ZayxL/jZH+euYb6FcUinPcgiQW0+UBtEv0O6Q3lGd3cqJ+GHH+rksEv3Pj99oxJ3u3VIKA==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-4.0.1.tgz",
+      "integrity": "sha512-baolhQBSi3iNh1cglJjA0mYzga+wePk7vdEX//1dTFd+v4TsQlQE0jitJSNF1OIP82rdYulH7otaVmdlDaJ64A==",
       "dev": true,
       "requires": {
         "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "ajv-keywords": {
-          "version": "3.5.2",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-          "dev": true,
-          "requires": {}
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        },
-        "schema-utils": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.8",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
-          }
-        }
+        "schema-utils": "^2.6.5"
       }
     },
     "rc": {
@@ -49475,24 +49987,12 @@
         "ini": "~1.3.0",
         "minimist": "^1.2.0",
         "strip-json-comments": "~2.0.1"
-      },
-      "dependencies": {
-        "ini": {
-          "version": "1.3.8",
-          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-          "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
-        },
-        "strip-json-comments": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-          "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
-        }
       }
     },
     "react-is": {
-      "version": "17.0.2",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
       "dev": true
     },
     "read": {
@@ -49527,13 +50027,6 @@
       "requires": {
         "pify": "^4.0.1",
         "with-open-file": "^0.1.6"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
-        }
       }
     },
     "read-package-json": {
@@ -49548,50 +50041,61 @@
       }
     },
     "read-package-json-fast": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-1.2.2.tgz",
-      "integrity": "sha512-39DbPJjkltEzfXJXB6D8/Ir3GFOU2YbSKa2HaB/Y3nKrc/zY+0XrALpID6/13ezWyzqvOHrBbR4t4cjQuTdBVQ==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz",
+      "integrity": "sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ==",
       "requires": {
         "json-parse-even-better-errors": "^2.3.0",
         "npm-normalize-package-bin": "^1.0.1"
       }
     },
-    "read-pkg": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
-      "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+    "read-package-tree": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.3.1.tgz",
+      "integrity": "sha512-mLUDsD5JVtlZxjSlPPx1RETkNjjvQYuweKwNVt1Sn8kP5Jh44pvYuUHCp6xSVDZWbNxVxG5lyZJ921aJH61sTw==",
       "dev": true,
       "requires": {
-        "load-json-file": "^4.0.0",
+        "read-package-json": "^2.0.0",
+        "readdir-scoped-modules": "^1.0.0",
+        "util-promisify": "^2.1.0"
+      }
+    },
+    "read-pkg": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
+      "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+      "dev": true,
+      "requires": {
+        "load-json-file": "^2.0.0",
         "normalize-package-data": "^2.3.2",
-        "path-type": "^3.0.0"
+        "path-type": "^2.0.0"
       },
       "dependencies": {
         "path-type": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
+          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
           "dev": true,
           "requires": {
-            "pify": "^3.0.0"
+            "pify": "^2.0.0"
           }
         },
         "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
           "dev": true
         }
       }
     },
     "read-pkg-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
-      "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+      "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
       "dev": true,
       "requires": {
         "find-up": "^2.0.0",
-        "read-pkg": "^3.0.0"
+        "read-pkg": "^2.0.0"
       }
     },
     "readable-stream": {
@@ -49608,10 +50112,22 @@
         "util-deprecate": "~1.0.1"
       }
     },
+    "readdir-scoped-modules": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz",
+      "integrity": "sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==",
+      "dev": true,
+      "requires": {
+        "debuglog": "^1.0.1",
+        "dezalgo": "^1.0.0",
+        "graceful-fs": "^4.1.2",
+        "once": "^1.3.0"
+      }
+    },
     "readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
+      "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
       "dev": true,
       "requires": {
         "picomatch": "^2.2.1"
@@ -49633,9 +50149,9 @@
       "dev": true
     },
     "regenerate": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
-      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.1.tgz",
+      "integrity": "sha512-j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A==",
       "dev": true
     },
     "regenerate-unicode-properties": {
@@ -49648,9 +50164,9 @@
       }
     },
     "regenerator-runtime": {
-      "version": "0.13.7",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
-      "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==",
+      "version": "0.13.5",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz",
+      "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==",
       "dev": true
     },
     "regenerator-transform": {
@@ -49670,40 +50186,49 @@
       "requires": {
         "extend-shallow": "^3.0.2",
         "safe-regex": "^1.1.0"
+      }
+    },
+    "regex-parser": {
+      "version": "2.2.10",
+      "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.10.tgz",
+      "integrity": "sha512-8t6074A68gHfU8Neftl0Le6KTDwfGAj7IyjPIMSfikI2wJUTHDMaIq42bUsfVnj8mhx0R+45rdUXHGpN164avA==",
+      "dev": true
+    },
+    "regexp.prototype.flags": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz",
+      "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1"
       },
       "dependencies": {
-        "extend-shallow": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+        "es-abstract": {
+          "version": "1.17.7",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+          "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
           "dev": true,
           "requires": {
-            "assign-symbols": "^1.0.0",
-            "is-extendable": "^1.0.1"
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.2.2",
+            "is-regex": "^1.1.1",
+            "object-inspect": "^1.8.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.1",
+            "string.prototype.trimend": "^1.0.1",
+            "string.prototype.trimstart": "^1.0.1"
           }
         }
       }
     },
-    "regex-parser": {
-      "version": "2.2.11",
-      "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.11.tgz",
-      "integrity": "sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==",
-      "dev": true
-    },
-    "regexp.prototype.flags": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz",
-      "integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      }
-    },
     "regexpp": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",
+      "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==",
       "dev": true
     },
     "regexpu-core": {
@@ -49749,9 +50274,9 @@
       "dev": true
     },
     "regjsparser": {
-      "version": "0.6.9",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.9.tgz",
-      "integrity": "sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==",
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz",
+      "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==",
       "dev": true,
       "requires": {
         "jsesc": "~0.5.0"
@@ -49799,9 +50324,9 @@
       "dev": true
     },
     "repeat-element": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
-      "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
+      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
       "dev": true
     },
     "repeat-string": {
@@ -49867,11 +50392,38 @@
             "psl": "^1.1.28",
             "punycode": "^2.1.1"
           }
-        },
-        "uuid": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+        }
+      }
+    },
+    "request-promise-core": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz",
+      "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.19"
+      }
+    },
+    "request-promise-native": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz",
+      "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==",
+      "dev": true,
+      "requires": {
+        "request-promise-core": "1.1.4",
+        "stealthy-require": "^1.1.1",
+        "tough-cookie": "^2.3.3"
+      },
+      "dependencies": {
+        "tough-cookie": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+          "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+          "dev": true,
+          "requires": {
+            "psl": "^1.1.28",
+            "punycode": "^2.1.1"
+          }
         }
       }
     },
@@ -49888,9 +50440,9 @@
       "dev": true
     },
     "require-main-filename": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
       "dev": true
     },
     "requires-port": {
@@ -49900,27 +50452,26 @@
       "dev": true
     },
     "resolve": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
-      "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
       "requires": {
-        "is-core-module": "^2.1.0",
         "path-parse": "^1.0.6"
       }
     },
     "resolve-cwd": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
-      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
+      "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
       "dev": true,
       "requires": {
-        "resolve-from": "^5.0.0"
+        "resolve-from": "^3.0.0"
       },
       "dependencies": {
         "resolve-from": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-          "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+          "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
           "dev": true
         }
       }
@@ -49956,22 +50507,105 @@
       "dev": true
     },
     "resolve-url-loader": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-4.0.0.tgz",
-      "integrity": "sha512-05VEMczVREcbtT7Bz+C+96eUO5HDNvdthIiMB34t7FcF8ehcu4wC0sSgPUubs3XW2Q3CNLJk/BJrCU9wVRymiA==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-3.1.1.tgz",
+      "integrity": "sha512-K1N5xUjj7v0l2j/3Sgs5b8CjrrgtC70SmdCuZiJ8tSyb5J+uk3FoeZ4b7yTnH6j7ngI+Bc5bldHJIa8hYdu2gQ==",
       "dev": true,
       "requires": {
-        "adjust-sourcemap-loader": "^4.0.0",
-        "convert-source-map": "^1.7.0",
-        "loader-utils": "^2.0.0",
-        "postcss": "^7.0.35",
+        "adjust-sourcemap-loader": "2.0.0",
+        "camelcase": "5.3.1",
+        "compose-function": "3.0.3",
+        "convert-source-map": "1.7.0",
+        "es6-iterator": "2.0.3",
+        "loader-utils": "1.2.3",
+        "postcss": "7.0.21",
+        "rework": "1.0.1",
+        "rework-visit": "1.0.0",
         "source-map": "0.6.1"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "5.5.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+              "dev": true,
+              "requires": {
+                "has-flag": "^3.0.0"
+              }
+            }
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "dev": true
+        },
+        "emojis-list": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
+          "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
+        "loader-utils": {
+          "version": "1.2.3",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
+          "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^2.0.0",
+            "json5": "^1.0.1"
+          }
+        },
         "postcss": {
-          "version": "7.0.36",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz",
-          "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==",
+          "version": "7.0.21",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.21.tgz",
+          "integrity": "sha512-uIFtJElxJo29QC753JzhidoAhvp/e/Exezkdhfmt8AymWT6/5B7W1WmponYWkHk2eg6sONyTch0A3nkMPun3SQ==",
           "dev": true,
           "requires": {
             "chalk": "^2.4.2",
@@ -50005,13 +50639,27 @@
       }
     },
     "restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-      "dev": true,
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
       "requires": {
-        "onetime": "^5.1.0",
+        "onetime": "^2.0.0",
         "signal-exit": "^3.0.2"
+      },
+      "dependencies": {
+        "mimic-fn": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+          "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
+        },
+        "onetime": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+          "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+          "requires": {
+            "mimic-fn": "^1.0.0"
+          }
+        }
       }
     },
     "ret": {
@@ -50021,15 +50669,39 @@
       "dev": true
     },
     "retry": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz",
-      "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q="
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs="
     },
     "reusify": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
       "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="
     },
+    "rework": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/rework/-/rework-1.0.1.tgz",
+      "integrity": "sha1-MIBqhBNCtUUQqkEQhQzUhTQUSqc=",
+      "dev": true,
+      "requires": {
+        "convert-source-map": "^0.3.3",
+        "css": "^2.0.0"
+      },
+      "dependencies": {
+        "convert-source-map": {
+          "version": "0.3.5",
+          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz",
+          "integrity": "sha1-8dgClQr33SYxof6+BZZVDIarMZA=",
+          "dev": true
+        }
+      }
+    },
+    "rework-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/rework-visit/-/rework-visit-1.0.0.tgz",
+      "integrity": "sha1-mUWygD8hni96ygCtuLyfZA+ELJo=",
+      "dev": true
+    },
     "rgb-regex": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz",
@@ -50061,18 +50733,18 @@
       }
     },
     "rollup": {
-      "version": "2.38.4",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.38.4.tgz",
-      "integrity": "sha512-B0LcJhjiwKkTl79aGVF/u5KdzsH8IylVfV56Ut6c9ouWLJcUK17T83aZBetNYSnZtXf2OHD4+2PbmRW+Fp5ulg==",
+      "version": "2.10.9",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.10.9.tgz",
+      "integrity": "sha512-dY/EbjiWC17ZCUSyk14hkxATAMAShkMsD43XmZGWjLrgFj15M3Dw2kEkA9ns64BiLFm9PKN6vTQw8neHwK74eg==",
       "dev": true,
       "requires": {
-        "fsevents": "~2.3.1"
+        "fsevents": "~2.1.2"
       }
     },
     "rsvp": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz",
-      "integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==",
+      "version": "4.8.5",
+      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
+      "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
       "dev": true
     },
     "run-async": {
@@ -50081,12 +50753,9 @@
       "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="
     },
     "run-parallel": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-      "requires": {
-        "queue-microtask": "^1.2.2"
-      }
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
+      "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q=="
     },
     "run-queue": {
       "version": "1.0.3",
@@ -50106,9 +50775,9 @@
       },
       "dependencies": {
         "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+          "version": "1.13.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
+          "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="
         }
       }
     },
@@ -50158,12 +50827,6 @@
             "normalize-path": "^2.1.1"
           }
         },
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-          "dev": true
-        },
         "braces": {
           "version": "2.3.2",
           "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
@@ -50190,12 +50853,6 @@
               "requires": {
                 "is-extendable": "^0.1.0"
               }
-            },
-            "is-extendable": {
-              "version": "0.1.1",
-              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-              "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-              "dev": true
             }
           }
         },
@@ -50227,16 +50884,6 @@
             "strip-eof": "^1.0.0"
           }
         },
-        "extend-shallow": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-          "dev": true,
-          "requires": {
-            "assign-symbols": "^1.0.0",
-            "is-extendable": "^1.0.1"
-          }
-        },
         "fill-range": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -50257,12 +50904,6 @@
               "requires": {
                 "is-extendable": "^0.1.0"
               }
-            },
-            "is-extendable": {
-              "version": "0.1.1",
-              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-              "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-              "dev": true
             }
           }
         },
@@ -50307,12 +50948,6 @@
           "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
           "dev": true
         },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        },
         "micromatch": {
           "version": "3.1.10",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -50401,62 +51036,52 @@
       }
     },
     "sass": {
-      "version": "1.32.6",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.6.tgz",
-      "integrity": "sha512-1bcDHDcSqeFtMr0JXI3xc/CXX6c4p0wHHivJdru8W7waM7a1WjKMm4m/Z5sY7CbVw4Whi2Chpcw6DFfSWwGLzQ==",
+      "version": "1.26.5",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.26.5.tgz",
+      "integrity": "sha512-FG2swzaZUiX53YzZSjSakzvGtlds0lcbF+URuU9mxOv7WBh7NhXEVDa4kPKN4hN6fC2TkOTOKqiqp6d53N9X5Q==",
       "dev": true,
       "requires": {
         "chokidar": ">=2.0.0 <4.0.0"
       }
     },
     "sass-loader": {
-      "version": "10.1.1",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-10.1.1.tgz",
-      "integrity": "sha512-W6gVDXAd5hR/WHsPicvZdjAWHBcEJ44UahgxcIE196fW2ong0ZHMPO1kZuI5q0VlvMQZh32gpv69PLWQm70qrw==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.2.tgz",
+      "integrity": "sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==",
       "dev": true,
       "requires": {
-        "klona": "^2.0.4",
-        "loader-utils": "^2.0.0",
-        "neo-async": "^2.6.2",
-        "schema-utils": "^3.0.0",
-        "semver": "^7.3.2"
+        "clone-deep": "^4.0.1",
+        "loader-utils": "^1.2.3",
+        "neo-async": "^2.6.1",
+        "schema-utils": "^2.6.1",
+        "semver": "^6.3.0"
       },
       "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
+            "minimist": "^1.2.0"
           }
         },
-        "ajv-keywords": {
-          "version": "3.5.2",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+        "loader-utils": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
           "dev": true,
-          "requires": {}
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
         },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
-        },
-        "schema-utils": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.8",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
-          }
         }
       }
     },
@@ -50483,33 +51108,6 @@
         "@types/json-schema": "^7.0.5",
         "ajv": "^6.12.4",
         "ajv-keywords": "^3.5.2"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "ajv-keywords": {
-          "version": "3.5.2",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-          "dev": true,
-          "requires": {}
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        }
       }
     },
     "sdp": {
@@ -50524,21 +51122,18 @@
       "dev": true
     },
     "selfsigned": {
-      "version": "1.10.11",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.11.tgz",
-      "integrity": "sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA==",
+      "version": "1.10.8",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.8.tgz",
+      "integrity": "sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w==",
       "dev": true,
       "requires": {
         "node-forge": "^0.10.0"
       }
     },
     "semver": {
-      "version": "7.3.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
-      "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
-      "requires": {
-        "lru-cache": "^6.0.0"
-      }
+      "version": "7.3.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
+      "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ=="
     },
     "semver-diff": {
       "version": "3.1.1",
@@ -50601,21 +51196,6 @@
         "statuses": "~1.5.0"
       },
       "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          },
-          "dependencies": {
-            "ms": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-            }
-          }
-        },
         "ms": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
@@ -50624,9 +51204,9 @@
       }
     },
     "serialize-javascript": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
-      "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
+      "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
       "dev": true,
       "requires": {
         "randombytes": "^2.1.0"
@@ -50647,15 +51227,6 @@
         "parseurl": "~1.3.2"
       },
       "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
         "http-errors": {
           "version": "1.6.3",
           "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
@@ -50674,12 +51245,6 @@
           "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
           "dev": true
         },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        },
         "setprototypeof": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
@@ -50729,27 +51294,6 @@
           "requires": {
             "is-extendable": "^0.1.0"
           }
-        },
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true
-        },
-        "is-plain-object": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-          "dev": true,
-          "requires": {
-            "isobject": "^3.0.1"
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
         }
       }
     },
@@ -50781,14 +51325,6 @@
       "dev": true,
       "requires": {
         "kind-of": "^6.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        }
       }
     },
     "shebang-command": {
@@ -50804,11 +51340,6 @@
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
     },
-    "shelljs": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz",
-      "integrity": "sha1-kEktcv/MgVmXa6umL7D2iE8MM3g="
-    },
     "shellwords": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
@@ -50825,6 +51356,14 @@
         "call-bind": "^1.0.0",
         "get-intrinsic": "^1.0.2",
         "object-inspect": "^1.9.0"
+      },
+      "dependencies": {
+        "object-inspect": {
+          "version": "1.10.3",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz",
+          "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==",
+          "dev": true
+        }
       }
     },
     "signal-exit": {
@@ -50839,6 +51378,13 @@
       "requires": {
         "shelljs": "^0.2.6",
         "tail": "^0.4.0"
+      },
+      "dependencies": {
+        "shelljs": {
+          "version": "0.2.6",
+          "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz",
+          "integrity": "sha1-kEktcv/MgVmXa6umL7D2iE8MM3g="
+        }
       }
     },
     "simple-concat": {
@@ -50856,6 +51402,23 @@
         "decompress-response": "^4.2.0",
         "once": "^1.3.1",
         "simple-concat": "^1.0.0"
+      },
+      "dependencies": {
+        "decompress-response": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
+          "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
+          "optional": true,
+          "requires": {
+            "mimic-response": "^2.0.0"
+          }
+        },
+        "mimic-response": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
+          "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
+          "optional": true
+        }
       }
     },
     "simple-plist": {
@@ -50868,6 +51431,23 @@
         "plist": "^3.0.1"
       }
     },
+    "simple-swizzle": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
+      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
+      "dev": true,
+      "requires": {
+        "is-arrayish": "^0.3.1"
+      },
+      "dependencies": {
+        "is-arrayish": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
+          "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
+          "dev": true
+        }
+      }
+    },
     "sisteransi": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
@@ -50890,23 +51470,11 @@
         "is-fullwidth-code-point": "^3.0.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+          "dev": true
         }
       }
     },
@@ -50931,15 +51499,6 @@
         "use": "^3.1.0"
       },
       "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
         "define-property": {
           "version": "0.2.5",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
@@ -50958,87 +51517,11 @@
             "is-extendable": "^0.1.0"
           }
         },
-        "is-accessor-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-data-descriptor": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^0.1.6",
-            "is-data-descriptor": "^0.1.4",
-            "kind-of": "^5.0.0"
-          }
-        },
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        },
         "source-map": {
           "version": "0.5.7",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
           "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
           "dev": true
-        },
-        "source-map-resolve": {
-          "version": "0.5.3",
-          "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
-          "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
-          "dev": true,
-          "requires": {
-            "atob": "^2.1.2",
-            "decode-uri-component": "^0.2.0",
-            "resolve-url": "^0.2.1",
-            "source-map-url": "^0.4.0",
-            "urix": "^0.1.0"
-          }
         }
       }
     },
@@ -51062,6 +51545,35 @@
             "is-descriptor": "^1.0.0"
           }
         },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        },
         "isobject": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
@@ -51091,66 +51603,93 @@
       }
     },
     "sockjs": {
-      "version": "0.3.21",
-      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.21.tgz",
-      "integrity": "sha512-DhbPFGpxjc6Z3I+uX07Id5ZO2XwYsWOrYjaSeieES78cq+JaJvVe5q/m1uvjIQhXinhIeCFRH6JgXe+mvVMyXw==",
+      "version": "0.3.20",
+      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.20.tgz",
+      "integrity": "sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA==",
       "dev": true,
       "requires": {
-        "faye-websocket": "^0.11.3",
+        "faye-websocket": "^0.10.0",
         "uuid": "^3.4.0",
-        "websocket-driver": "^0.7.4"
-      },
-      "dependencies": {
-        "uuid": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-          "dev": true
-        }
+        "websocket-driver": "0.6.5"
       }
     },
     "sockjs-client": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.5.1.tgz",
-      "integrity": "sha512-VnVAb663fosipI/m6pqRXakEOw7nvd7TUgdr3PlR/8V2I95QIdwT8L4nMxhyU8SmDBHYXU1TOElaKOmKLfYzeQ==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz",
+      "integrity": "sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==",
       "dev": true,
       "requires": {
-        "debug": "^3.2.6",
+        "debug": "^3.2.5",
         "eventsource": "^1.0.7",
-        "faye-websocket": "^0.11.3",
-        "inherits": "^2.0.4",
-        "json3": "^3.3.3",
-        "url-parse": "^1.5.1"
+        "faye-websocket": "~0.11.1",
+        "inherits": "^2.0.3",
+        "json3": "^3.3.2",
+        "url-parse": "^1.4.3"
       },
       "dependencies": {
         "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "dev": true,
           "requires": {
             "ms": "^2.1.1"
           }
+        },
+        "faye-websocket": {
+          "version": "0.11.3",
+          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz",
+          "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==",
+          "dev": true,
+          "requires": {
+            "websocket-driver": ">=0.5.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
         }
       }
     },
     "socks": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.6.1.tgz",
-      "integrity": "sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.3.3.tgz",
+      "integrity": "sha512-o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA==",
       "requires": {
-        "ip": "^1.1.5",
+        "ip": "1.1.5",
         "smart-buffer": "^4.1.0"
       }
     },
     "socks-proxy-agent": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz",
-      "integrity": "sha512-vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz",
+      "integrity": "sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==",
+      "dev": true,
       "requires": {
-        "agent-base": "^6.0.2",
-        "debug": "4",
-        "socks": "^2.3.3"
+        "agent-base": "~4.2.1",
+        "socks": "~2.3.2"
+      },
+      "dependencies": {
+        "agent-base": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz",
+          "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==",
+          "dev": true,
+          "requires": {
+            "es6-promisify": "^5.0.0"
+          }
+        }
+      }
+    },
+    "sort-keys": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
+      "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
+      "dev": true,
+      "requires": {
+        "is-plain-obj": "^1.0.0"
       }
     },
     "source-list-map": {
@@ -51166,62 +51705,25 @@
       "dev": true
     },
     "source-map-loader": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-1.1.3.tgz",
-      "integrity": "sha512-6YHeF+XzDOrT/ycFJNI53cgEsp/tHTMl37hi7uVyqFAlTXW109JazaQCkbc+jjoL2637qkH1amLi+JzrIpt5lA==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-1.0.0.tgz",
+      "integrity": "sha512-ZayyQCSCrQazN50aCvuS84lJT4xc1ZAcykH5blHaBdVveSwjiFK8UGMPvao0ho54DTb0Jf7m57uRRG/YYUZ2Fg==",
       "dev": true,
       "requires": {
-        "abab": "^2.0.5",
-        "iconv-lite": "^0.6.2",
+        "data-urls": "^2.0.0",
+        "iconv-lite": "^0.5.1",
         "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0",
-        "source-map": "^0.6.1",
-        "whatwg-mimetype": "^2.3.0"
+        "schema-utils": "^2.6.6",
+        "source-map": "^0.6.0"
       },
       "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "ajv-keywords": {
-          "version": "3.5.2",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-          "dev": true,
-          "requires": {}
-        },
         "iconv-lite": {
-          "version": "0.6.3",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-          "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+          "version": "0.5.2",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.2.tgz",
+          "integrity": "sha512-kERHXvpSaB4aU3eANwidg79K8FlrN77m8G9V+0vOR3HYaRifrlwMEpT7ZBJqLSEIHnEgJTHcWK82wwLwwKwtag==",
           "dev": true,
           "requires": {
-            "safer-buffer": ">= 2.1.2 < 3.0.0"
-          }
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        },
-        "schema-utils": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.8",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
+            "safer-buffer": ">= 2.1.2 < 3"
           }
         },
         "source-map": {
@@ -51233,13 +51735,16 @@
       }
     },
     "source-map-resolve": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz",
-      "integrity": "sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==",
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
       "dev": true,
       "requires": {
         "atob": "^2.1.2",
-        "decode-uri-component": "^0.2.0"
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
       }
     },
     "source-map-support": {
@@ -51261,9 +51766,9 @@
       }
     },
     "source-map-url": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
-      "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
+      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
       "dev": true
     },
     "sourcemap-codec": {
@@ -51302,9 +51807,9 @@
       }
     },
     "spdx-license-ids": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz",
-      "integrity": "sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ=="
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz",
+      "integrity": "sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw=="
     },
     "spdy": {
       "version": "4.0.2",
@@ -51317,6 +51822,23 @@
         "http-deceiver": "^1.2.7",
         "select-hose": "^2.0.0",
         "spdy-transport": "^3.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
       }
     },
     "spdy-transport": {
@@ -51333,6 +51855,21 @@
         "wbuf": "^1.7.3"
       },
       "dependencies": {
+        "debug": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        },
         "readable-stream": {
           "version": "3.6.0",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
@@ -51347,55 +51884,62 @@
       }
     },
     "speed-measure-webpack-plugin": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.4.2.tgz",
-      "integrity": "sha512-AtVzD0bnIy2/B0fWqJpJgmhcrfWFhBlduzSo0uwplr/QvB33ZNZj2NEth3NONgdnZJqicK0W0mSxnLSbsVCDbw==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.3.tgz",
+      "integrity": "sha512-2ljD4Ch/rz2zG3HsLsnPfp23osuPBS0qPuz9sGpkNXTN1Ic4M+W9xB8l8rS8ob2cO4b1L+WTJw/0AJwWYVgcxQ==",
       "dev": true,
       "requires": {
-        "chalk": "^4.1.0"
+        "chalk": "^2.0.1"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "^2.0.1"
+            "color-convert": "^1.9.0"
           }
         },
         "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
           }
         },
         "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
           "dev": true,
           "requires": {
-            "color-name": "~1.1.4"
+            "color-name": "1.1.3"
           }
         },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "dev": true
+        },
         "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
           "dev": true
         },
         "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
           "dev": true,
           "requires": {
-            "has-flag": "^4.0.0"
+            "has-flag": "^3.0.0"
           }
         }
       }
@@ -51407,18 +51951,6 @@
       "dev": true,
       "requires": {
         "extend-shallow": "^3.0.0"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-          "dev": true,
-          "requires": {
-            "assign-symbols": "^1.0.0",
-            "is-extendable": "^1.0.1"
-          }
-        }
       }
     },
     "split2": {
@@ -51492,9 +52024,9 @@
       "dev": true
     },
     "stack-utils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.3.tgz",
-      "integrity": "sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.2.tgz",
+      "integrity": "sha512-0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg==",
       "dev": true,
       "requires": {
         "escape-string-regexp": "^2.0.0"
@@ -51526,57 +52058,6 @@
           "requires": {
             "is-descriptor": "^0.1.0"
           }
-        },
-        "is-accessor-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-data-descriptor": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^0.1.6",
-            "is-data-descriptor": "^0.1.4",
-            "kind-of": "^5.0.0"
-          }
         }
       }
     },
@@ -51585,6 +52066,12 @@
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
       "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
     },
+    "stealthy-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
+      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=",
+      "dev": true
+    },
     "stream-browserify": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
@@ -51645,6 +52132,12 @@
       "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
       "dev": true
     },
+    "strict-uri-encode": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
+      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
+      "dev": true
+    },
     "string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -51654,23 +52147,49 @@
       }
     },
     "string-length": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
-      "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.1.tgz",
+      "integrity": "sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw==",
       "dev": true,
       "requires": {
         "char-regex": "^1.0.2",
         "strip-ansi": "^6.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.0"
+          }
+        }
       }
     },
     "string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
       "requires": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^4.0.0"
+      },
+      "dependencies": {
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        }
       }
     },
     "string.prototype.codepointat": {
@@ -51679,23 +52198,65 @@
       "integrity": "sha512-2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg=="
     },
     "string.prototype.trimend": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
-      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
+      "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.17.7",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+          "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+          "dev": true,
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.2.2",
+            "is-regex": "^1.1.1",
+            "object-inspect": "^1.8.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.1",
+            "string.prototype.trimend": "^1.0.1",
+            "string.prototype.trimstart": "^1.0.1"
+          }
+        }
       }
     },
     "string.prototype.trimstart": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
-      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
+      "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.17.7",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+          "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+          "dev": true,
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.2.2",
+            "is-regex": "^1.1.1",
+            "object-inspect": "^1.8.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.1",
+            "string.prototype.trimend": "^1.0.1",
+            "string.prototype.trimstart": "^1.0.1"
+          }
+        }
       }
     },
     "stringify-package": {
@@ -51704,11 +52265,18 @@
       "integrity": "sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg=="
     },
     "strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
       "requires": {
-        "ansi-regex": "^5.0.0"
+        "ansi-regex": "^4.1.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
+        }
       }
     },
     "strip-bom": {
@@ -51727,82 +52295,57 @@
       "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="
     },
     "strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
     },
     "style-loader": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-2.0.0.tgz",
-      "integrity": "sha512-Z0gYUJmzZ6ZdRUqpg1r8GsaFKypE+3xAzuFeMuoHgjc9KZv3wMyCRjQIWEbhoFSq7+7yoHXySDJyyWQaPajeiQ==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.2.1.tgz",
+      "integrity": "sha512-ByHSTQvHLkWE9Ir5+lGbVOXhxX10fbprhLvdg96wedFZb4NDekDPxVKv5Fwmio+QcMlkkNfuK+5W1peQ5CUhZg==",
       "dev": true,
       "requires": {
         "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0"
+        "schema-utils": "^2.6.6"
+      }
+    },
+    "stylehacks": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz",
+      "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-selector-parser": "^3.0.0"
       },
       "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+        "postcss-selector-parser": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
+          "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "ajv-keywords": {
-          "version": "3.5.2",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-          "dev": true,
-          "requires": {}
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        },
-        "schema-utils": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.8",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
+            "dot-prop": "^5.2.0",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
           }
         }
       }
     },
-    "stylehacks": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.0.1.tgz",
-      "integrity": "sha512-Es0rVnHIqbWzveU1b24kbw92HsebBepxfcqe5iix7t9j0PQqhs0IxXVXv0pY2Bxa08CgMkzD6OWql7kbGOuEdA==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.16.0",
-        "postcss-selector-parser": "^6.0.4"
-      }
-    },
     "stylus": {
-      "version": "0.54.8",
-      "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.8.tgz",
-      "integrity": "sha512-vr54Or4BZ7pJafo2mpf0ZcwA74rpuYCZbxrHBsH8kbcXOwSfvBFwsRfpGO5OD5fhG5HDCFW737PKaawI7OqEAg==",
+      "version": "0.54.7",
+      "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.7.tgz",
+      "integrity": "sha512-Yw3WMTzVwevT6ZTrLCYNHAFmanMxdylelL3hkWNgPMeTCpMwpV3nXjpOHuBXtFv7aiO2xRuQS6OoAdgkNcSNug==",
       "dev": true,
       "requires": {
         "css-parse": "~2.0.0",
         "debug": "~3.1.0",
-        "glob": "^7.1.6",
-        "mkdirp": "~1.0.4",
+        "glob": "^7.1.3",
+        "mkdirp": "~0.5.x",
         "safer-buffer": "^2.1.2",
         "sax": "~1.2.4",
-        "semver": "^6.3.0",
+        "semver": "^6.0.0",
         "source-map": "^0.7.3"
       },
       "dependencies": {
@@ -51815,12 +52358,6 @@
             "ms": "2.0.0"
           }
         },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        },
         "sax": {
           "version": "1.2.4",
           "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
@@ -51836,52 +52373,34 @@
       }
     },
     "stylus-loader": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-4.3.3.tgz",
-      "integrity": "sha512-PpWB5PnCXUzW4WMYhCvNzAHJBjIBPMXwsdfkkKuA9W7k8OQFMl/19/AQvaWsxz2IptxUlCseyJ6TY/eEKJ4+UQ==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz",
+      "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==",
       "dev": true,
       "requires": {
-        "fast-glob": "^3.2.4",
-        "klona": "^2.0.4",
-        "loader-utils": "^2.0.0",
-        "normalize-path": "^3.0.0",
-        "schema-utils": "^3.0.0"
+        "loader-utils": "^1.0.2",
+        "lodash.clonedeep": "^4.5.0",
+        "when": "~3.6.x"
       },
       "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
+            "minimist": "^1.2.0"
           }
         },
-        "ajv-keywords": {
-          "version": "3.5.2",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-          "dev": true,
-          "requires": {}
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        },
-        "schema-utils": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+        "loader-utils": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
           "dev": true,
           "requires": {
-            "@types/json-schema": "^7.0.8",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
           }
         }
       }
@@ -51905,6 +52424,15 @@
         "semver": "^7.3.2"
       },
       "dependencies": {
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
         "form-data": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
@@ -51922,6 +52450,12 @@
           "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
           "dev": true
         },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        },
         "qs": {
           "version": "6.10.1",
           "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz",
@@ -51962,42 +52496,31 @@
           "requires": {
             "ms": "^2.1.1"
           }
+        },
+        "ms": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+          "dev": true
         }
       }
     },
     "supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "requires": {
-        "has-flag": "^3.0.0"
+        "has-flag": "^4.0.0"
       }
     },
     "supports-hyperlinks": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
-      "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz",
+      "integrity": "sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA==",
       "dev": true,
       "requires": {
         "has-flag": "^4.0.0",
         "supports-color": "^7.0.0"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
       }
     },
     "sver-compat": {
@@ -52011,146 +52534,88 @@
       }
     },
     "svgo": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.3.1.tgz",
-      "integrity": "sha512-riDDIQgXpEnn0BEl9Gvhh1LNLIyiusSpt64IR8upJu7MwxnzetmF/Y57pXQD2NMX2lVyMRzXt5f2M5rO4wG7Dw==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
+      "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
       "dev": true,
       "requires": {
-        "@trysound/sax": "0.1.1",
-        "chalk": "^4.1.0",
-        "commander": "^7.1.0",
-        "css-select": "^4.1.3",
-        "css-tree": "^1.1.2",
-        "csso": "^4.2.0",
-        "stable": "^0.1.8"
+        "chalk": "^2.4.1",
+        "coa": "^2.0.2",
+        "css-select": "^2.0.0",
+        "css-select-base-adapter": "^0.1.1",
+        "css-tree": "1.0.0-alpha.37",
+        "csso": "^4.0.2",
+        "js-yaml": "^3.13.1",
+        "mkdirp": "~0.5.1",
+        "object.values": "^1.1.0",
+        "sax": "~1.2.4",
+        "stable": "^0.1.8",
+        "unquote": "~1.1.1",
+        "util.promisify": "~1.0.0"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "^2.0.1"
+            "color-convert": "^1.9.0"
           }
         },
         "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
           }
         },
         "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
           "dev": true,
           "requires": {
-            "color-name": "~1.1.4"
+            "color-name": "1.1.3"
           }
         },
-        "commander": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-          "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-          "dev": true
-        },
-        "css-select": {
-          "version": "4.1.3",
-          "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz",
-          "integrity": "sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==",
-          "dev": true,
-          "requires": {
-            "boolbase": "^1.0.0",
-            "css-what": "^5.0.0",
-            "domhandler": "^4.2.0",
-            "domutils": "^2.6.0",
-            "nth-check": "^2.0.0"
-          }
-        },
-        "css-what": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.0.1.tgz",
-          "integrity": "sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg==",
-          "dev": true
-        },
-        "dom-serializer": {
-          "version": "1.3.2",
-          "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz",
-          "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==",
-          "dev": true,
-          "requires": {
-            "domelementtype": "^2.0.1",
-            "domhandler": "^4.2.0",
-            "entities": "^2.0.0"
-          }
-        },
-        "domelementtype": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
-          "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
-          "dev": true
-        },
-        "domhandler": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.2.0.tgz",
-          "integrity": "sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA==",
-          "dev": true,
-          "requires": {
-            "domelementtype": "^2.2.0"
-          }
-        },
-        "domutils": {
-          "version": "2.7.0",
-          "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.7.0.tgz",
-          "integrity": "sha512-8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg==",
-          "dev": true,
-          "requires": {
-            "dom-serializer": "^1.0.1",
-            "domelementtype": "^2.2.0",
-            "domhandler": "^4.2.0"
-          }
-        },
-        "entities": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-          "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
           "dev": true
         },
         "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
           "dev": true
         },
-        "nth-check": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.0.tgz",
-          "integrity": "sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q==",
-          "dev": true,
-          "requires": {
-            "boolbase": "^1.0.0"
-          }
+        "sax": {
+          "version": "1.2.4",
+          "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+          "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+          "dev": true
         },
         "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
           "dev": true,
           "requires": {
-            "has-flag": "^4.0.0"
+            "has-flag": "^3.0.0"
           }
         }
       }
     },
     "symbol-observable": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-3.0.0.tgz",
-      "integrity": "sha512-6tDOXSHiVjuCaasQSWTmHUWn4PuG7qa3+1WT031yTc/swT7+rLiw3GOrFxaH1E3lLP09dH3bVuVDf2gK5rxG3Q==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
+      "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==",
       "dev": true
     },
     "symbol-tree": {
@@ -52165,17 +52630,76 @@
       "integrity": "sha512-33+lQwlLxXoxy0o9WLOgw8OjbXeS3Jv+pSl+nxKc2AOClBI28HsdRPpH0u9Xa9OVjHLT9vonnOMw1ug7YXI0dA=="
     },
     "table": {
-      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz",
-      "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.6.0.tgz",
+      "integrity": "sha512-iZMtp5tUvcnAdtHpZTWLPF0M7AgiQsURR2DwmxnJwSy8I3+cY+ozzVvYha3BOLG2TB+L0CqjIz+91htuj6yCXg==",
       "dev": true,
       "requires": {
         "ajv": "^8.0.1",
         "lodash.clonedeep": "^4.5.0",
+        "lodash.flatten": "^4.4.0",
         "lodash.truncate": "^4.4.2",
         "slice-ansi": "^4.0.0",
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "8.2.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.2.0.tgz",
+          "integrity": "sha512-WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "json-schema-traverse": "^1.0.0",
+            "require-from-string": "^2.0.2",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "dev": true
+        },
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+          "dev": true
+        },
+        "json-schema-traverse": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.0"
+          }
+        }
       }
     },
     "tail": {
@@ -52184,15 +52708,15 @@
       "integrity": "sha1-0p3nJ1DMmdseBTr/E8NZ7PtxMAI="
     },
     "tapable": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz",
-      "integrity": "sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
+      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
       "dev": true
     },
     "tar": {
-      "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.3.tgz",
-      "integrity": "sha512-3rUqwucgVZXTeyJyL2jqtUau8/8r54SioM1xj3AmTX3HnWQdj2AydfJ2qYYayPyIIznSplcvU9mhBb7dR2XF3w==",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.1.tgz",
+      "integrity": "sha512-GG0R7yt/CQkvG4fueXDi52Zskqxe2AyRJ+Wm54yqarnBgcX3qRIWh10qLVAAN+mlPFGTfP5UxvD3Fbi11UOTUQ==",
       "requires": {
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
@@ -52200,6 +52724,13 @@
         "minizlib": "^2.1.1",
         "mkdirp": "^1.0.3",
         "yallist": "^4.0.0"
+      },
+      "dependencies": {
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
+        }
       }
     },
     "tar-fs": {
@@ -52223,9 +52754,9 @@
       }
     },
     "tar-stream": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
-      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.4.tgz",
+      "integrity": "sha512-o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw==",
       "optional": true,
       "requires": {
         "bl": "^4.0.3",
@@ -52261,78 +52792,77 @@
       "requires": {
         "ansi-escapes": "^4.2.1",
         "supports-hyperlinks": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-escapes": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
+          "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+          "dev": true,
+          "requires": {
+            "type-fest": "^0.11.0"
+          }
+        },
+        "type-fest": {
+          "version": "0.11.0",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
+          "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
+          "dev": true
+        }
       }
     },
     "terser": {
-      "version": "5.5.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.5.1.tgz",
-      "integrity": "sha512-6VGWZNVP2KTUcltUQJ25TtNjx/XgdDsBDKGt8nN0MpydU36LmbPPcMBd2kmtZNNGVVDLg44k7GKeHHj+4zPIBQ==",
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.7.0.tgz",
+      "integrity": "sha512-Lfb0RiZcjRDXCC3OSHJpEkxJ9Qeqs6mp2v4jf2MHfy8vGERmVDuvjXdd/EnP5Deme5F2yBRBymKmKHCBg2echw==",
       "dev": true,
       "requires": {
         "commander": "^2.20.0",
-        "source-map": "~0.7.2",
-        "source-map-support": "~0.5.19"
+        "source-map": "~0.6.1",
+        "source-map-support": "~0.5.12"
       },
       "dependencies": {
-        "commander": {
-          "version": "2.20.3",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         }
       }
     },
     "terser-webpack-plugin": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-4.2.3.tgz",
-      "integrity": "sha512-jTgXh40RnvOrLQNgIkwEKnQ8rmHjHK4u+6UBEi+W+FPmvb+uo+chJXntKe7/3lW5mNysgSWD60KyesnhW8D6MQ==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-3.0.1.tgz",
+      "integrity": "sha512-eFDtq8qPUEa9hXcUzTwKXTnugIVtlqc1Z/ZVhG8LmRT3lgRY13+pQTnFLY2N7ATB6TKCHuW/IGjoAnZz9wOIqw==",
       "dev": true,
       "requires": {
-        "cacache": "^15.0.5",
+        "cacache": "^15.0.3",
         "find-cache-dir": "^3.3.1",
-        "jest-worker": "^26.5.0",
-        "p-limit": "^3.0.2",
-        "schema-utils": "^3.0.0",
-        "serialize-javascript": "^5.0.1",
+        "jest-worker": "^26.0.0",
+        "p-limit": "^2.3.0",
+        "schema-utils": "^2.6.6",
+        "serialize-javascript": "^3.0.0",
         "source-map": "^0.6.1",
-        "terser": "^5.3.4",
+        "terser": "^4.6.13",
         "webpack-sources": "^1.4.3"
       },
       "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
+            "p-try": "^2.0.0"
           }
         },
-        "ajv-keywords": {
-          "version": "3.5.2",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-          "dev": true,
-          "requires": {}
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        },
-        "schema-utils": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+        "serialize-javascript": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz",
+          "integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==",
           "dev": true,
           "requires": {
-            "@types/json-schema": "^7.0.8",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
+            "randombytes": "^2.1.0"
           }
         },
         "source-map": {
@@ -52340,16 +52870,6 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
-        },
-        "webpack-sources": {
-          "version": "1.4.3",
-          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-          "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-          "dev": true,
-          "requires": {
-            "source-list-map": "^2.0.0",
-            "source-map": "~0.6.1"
-          }
         }
       }
     },
@@ -52414,9 +52934,9 @@
       "dev": true
     },
     "timers-browserify": {
-      "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
-      "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
+      "version": "2.0.11",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
+      "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
       "dev": true,
       "requires": {
         "setimmediate": "^1.0.4"
@@ -52499,18 +53019,6 @@
         "extend-shallow": "^3.0.2",
         "regex-not": "^1.0.2",
         "safe-regex": "^1.1.0"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-          "dev": true,
-          "requires": {
-            "assign-symbols": "^1.0.0",
-            "is-extendable": "^1.0.1"
-          }
-        }
       }
     },
     "to-regex-range": {
@@ -52546,9 +53054,9 @@
       }
     },
     "tr46": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
-      "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.0.2.tgz",
+      "integrity": "sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==",
       "dev": true,
       "requires": {
         "punycode": "^2.1.1"
@@ -52561,27 +53069,42 @@
       "dev": true
     },
     "ts-jest": {
-      "version": "26.5.6",
-      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-26.5.6.tgz",
-      "integrity": "sha512-rua+rCP8DxpA8b4DQD/6X2HQS8Zy/xzViVYfEs2OQu68tkCuKLV0Md8pmX55+W24uRIyAsf/BajRfxOs+R2MKA==",
+      "version": "26.4.1",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-26.4.1.tgz",
+      "integrity": "sha512-F4aFq01aS6mnAAa0DljNmKr/Kk9y4HVZ1m6/rtJ0ED56cuxINGq3Q9eVAh+z5vcYKe5qnTMvv90vE8vUMFxomg==",
       "dev": true,
       "requires": {
+        "@types/jest": "26.x",
         "bs-logger": "0.x",
         "buffer-from": "1.x",
         "fast-json-stable-stringify": "2.x",
         "jest-util": "^26.1.0",
         "json5": "2.x",
-        "lodash": "4.x",
+        "lodash.memoize": "4.x",
         "make-error": "1.x",
         "mkdirp": "1.x",
         "semver": "7.x",
         "yargs-parser": "20.x"
+      },
+      "dependencies": {
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+          "dev": true
+        },
+        "yargs-parser": {
+          "version": "20.2.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.1.tgz",
+          "integrity": "sha512-yYsjuSkjbLMBp16eaOt7/siKTjNVjMm3SoJnIg3sEh/JsvqVVDyjRKmaJV4cl+lNIgq6QEco2i3gDebJl7/vLA==",
+          "dev": true
+        }
       }
     },
     "ts-md5": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/ts-md5/-/ts-md5-1.2.9.tgz",
-      "integrity": "sha512-/Efr7ZfGf8P+d9HXh0PLQD1CDipqD8j9apCFG96pODDoEaFLxXpV4En6tAc6y3fWyfhFGrqtNBRBS+eLVIB2uQ=="
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/ts-md5/-/ts-md5-1.2.7.tgz",
+      "integrity": "sha512-emODogvKGWi1KO1l9c6YxLMBn6CEH3VrH5mVPIyOtxBG52BvV4jP3GWz6bOZCz61nLgBc3ffQYE4+EHfCD+V7w=="
     },
     "ts-node": {
       "version": "8.3.0",
@@ -52603,16 +53126,26 @@
       "dev": true
     },
     "tsconfig-paths": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.10.1.tgz",
-      "integrity": "sha512-rETidPDgCpltxF7MjBZlAFPUHv5aHH2MymyPvh+vEyWAED4Eb/WeMbsnD/JDr4OKPOA1TssDHgIcpTN5Kh0p6Q==",
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz",
+      "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==",
       "dev": true,
       "requires": {
-        "json5": "^2.2.0",
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.1",
         "minimist": "^1.2.0",
         "strip-bom": "^3.0.0"
       },
       "dependencies": {
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
         "strip-bom": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
@@ -52622,23 +53155,23 @@
       }
     },
     "tslib": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
-      "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz",
+      "integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ=="
     },
     "tsutils": {
-      "version": "3.21.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
-      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+      "version": "3.17.1",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.17.1.tgz",
+      "integrity": "sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==",
       "dev": true,
       "requires": {
         "tslib": "^1.8.1"
       },
       "dependencies": {
         "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+          "version": "1.13.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
+          "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
           "dev": true
         }
       }
@@ -52684,10 +53217,9 @@
       "dev": true
     },
     "type-fest": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-      "dev": true
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
     },
     "type-is": {
       "version": "1.6.18",
@@ -52713,9 +53245,9 @@
       }
     },
     "typescript": {
-      "version": "4.1.6",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.1.6.tgz",
-      "integrity": "sha512-pxnwLxeb/Z5SP80JDRzVjh58KsM6jZHRAOtTpS7sXLS4ogXNKC9ANxHHZqLLeVHZN35jCtI4JdmLLbLiC1kBow==",
+      "version": "3.9.9",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.9.tgz",
+      "integrity": "sha512-kdMjTiekY+z/ubJCATUPlRDl39vXYiMV9iyeMuEuXZh2we6zz80uovNN2WlAxmmdE/Z/YQe+EbOEXB5RHEED3w==",
       "dev": true
     },
     "uglify-js": {
@@ -52752,6 +53284,14 @@
         "has-bigints": "^1.0.1",
         "has-symbols": "^1.0.2",
         "which-boxed-primitive": "^1.0.2"
+      },
+      "dependencies": {
+        "has-symbols": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+          "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+          "dev": true
+        }
       }
     },
     "unc-path-regex": {
@@ -52761,9 +53301,9 @@
       "dev": true
     },
     "underscore": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
-      "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g=="
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.11.0.tgz",
+      "integrity": "sha512-xY96SsN3NA461qIRKZ/+qox37YXPtSBswMGfiNptr+wrt6ds4HaMw23TP612fEyGekRE6LNRiLYr/aqbHXNedw=="
     },
     "undertaker": {
       "version": "1.3.0",
@@ -52835,22 +53375,14 @@
         "get-value": "^2.0.6",
         "is-extendable": "^0.1.1",
         "set-value": "^2.0.1"
-      },
-      "dependencies": {
-        "arr-union": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-          "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-          "dev": true
-        },
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true
-        }
       }
     },
+    "uniq": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
+      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
+      "dev": true
+    },
     "uniqs": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz",
@@ -52892,20 +53424,29 @@
       }
     },
     "universal-analytics": {
-      "version": "0.4.23",
-      "resolved": "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.4.23.tgz",
-      "integrity": "sha512-lgMIH7XBI6OgYn1woDEmxhGdj8yDefMKg7GkWdeATAlQZFrMrNyxSkpDzY57iY0/6fdlzTbBV03OawvvzG+q7A==",
+      "version": "0.4.20",
+      "resolved": "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.4.20.tgz",
+      "integrity": "sha512-gE91dtMvNkjO+kWsPstHRtSwHXz0l2axqptGYp5ceg4MsuurloM0PU3pdOfpb5zBXUvyjT4PwhWK2m39uczZuw==",
       "dev": true,
       "requires": {
-        "debug": "^4.1.1",
-        "request": "^2.88.2",
+        "debug": "^3.0.0",
+        "request": "^2.88.0",
         "uuid": "^3.0.0"
       },
       "dependencies": {
-        "uuid": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         }
       }
@@ -52925,6 +53466,12 @@
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
       "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
     },
+    "unquote": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
+      "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
+      "dev": true
+    },
     "unset-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
@@ -52974,7 +53521,8 @@
     "untildify": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
-      "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw=="
+      "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
+      "dev": true
     },
     "upath": {
       "version": "1.2.0",
@@ -53000,46 +53548,6 @@
         "pupa": "^2.0.1",
         "semver-diff": "^3.1.1",
         "xdg-basedir": "^4.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
       }
     },
     "upper-case": {
@@ -53049,9 +53557,9 @@
       "dev": true
     },
     "uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz",
+      "integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==",
       "requires": {
         "punycode": "^2.1.0"
       }
@@ -53081,9 +53589,9 @@
       }
     },
     "url-parse": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz",
-      "integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==",
+      "version": "1.4.7",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
+      "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
       "dev": true,
       "requires": {
         "querystringify": "^2.1.1",
@@ -53105,18 +53613,18 @@
       "dev": true
     },
     "util": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
-      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3"
+        "inherits": "2.0.1"
       },
       "dependencies": {
         "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
           "dev": true
         }
       }
@@ -53126,16 +53634,57 @@
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
+    "util-promisify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/util-promisify/-/util-promisify-2.1.0.tgz",
+      "integrity": "sha1-PCI2R2xNMsX/PEcAKt18E7moKlM=",
+      "dev": true,
+      "requires": {
+        "object.getownpropertydescriptors": "^2.0.3"
+      }
+    },
+    "util.promisify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
+      "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.2",
+        "has-symbols": "^1.0.1",
+        "object.getownpropertydescriptors": "^2.1.0"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.17.7",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+          "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+          "dev": true,
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.2.2",
+            "is-regex": "^1.1.1",
+            "object-inspect": "^1.8.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.1",
+            "string.prototype.trimend": "^1.0.1",
+            "string.prototype.trimstart": "^1.0.1"
+          }
+        }
+      }
+    },
     "utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
       "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
     },
     "uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "dev": true
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
     },
     "v8-compile-cache": {
       "version": "2.3.0",
@@ -53144,9 +53693,9 @@
       "dev": true
     },
     "v8-to-istanbul": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz",
-      "integrity": "sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-5.0.1.tgz",
+      "integrity": "sha512-mbDNjuDajqYe3TXFk5qxcQy8L1msXNE37WTlLoqqpBfRsimbNcrlhQlDPntmECEcUvdC+AQ8CyMMf6EUx1r74Q==",
       "dev": true,
       "requires": {
         "@types/istanbul-lib-coverage": "^2.0.1",
@@ -53311,21 +53860,21 @@
       }
     },
     "watchpack": {
-      "version": "1.7.5",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",
-      "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.4.tgz",
+      "integrity": "sha512-aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg==",
       "dev": true,
       "requires": {
         "chokidar": "^3.4.1",
         "graceful-fs": "^4.1.2",
         "neo-async": "^2.5.0",
-        "watchpack-chokidar2": "^2.0.1"
+        "watchpack-chokidar2": "^2.0.0"
       }
     },
     "watchpack-chokidar2": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz",
-      "integrity": "sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz",
+      "integrity": "sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==",
       "dev": true,
       "optional": true,
       "requires": {
@@ -53355,13 +53904,6 @@
             }
           }
         },
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-          "dev": true,
-          "optional": true
-        },
         "binary-extensions": {
           "version": "1.13.1",
           "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
@@ -53386,6 +53928,18 @@
             "snapdragon-node": "^2.0.1",
             "split-string": "^3.0.2",
             "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
           }
         },
         "chokidar": {
@@ -53409,16 +53963,6 @@
             "upath": "^1.1.1"
           }
         },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
         "fill-range": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -53430,6 +53974,18 @@
             "is-number": "^3.0.0",
             "repeat-string": "^1.6.1",
             "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
           }
         },
         "fsevents": {
@@ -53476,13 +54032,6 @@
             "binary-extensions": "^1.0.0"
           }
         },
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true,
-          "optional": true
-        },
         "is-number": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -53491,16 +54040,18 @@
           "optional": true,
           "requires": {
             "kind-of": "^3.0.2"
-          }
-        },
-        "is-plain-object": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "isobject": "^3.0.1"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
           }
         },
         "isobject": {
@@ -53510,16 +54061,6 @@
           "dev": true,
           "optional": true
         },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        },
         "micromatch": {
           "version": "3.1.10",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -53540,36 +54081,6 @@
             "regex-not": "^1.0.0",
             "snapdragon": "^0.8.1",
             "to-regex": "^3.0.2"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "3.0.2",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-              "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "assign-symbols": "^1.0.0",
-                "is-extendable": "^1.0.1"
-              }
-            },
-            "is-extendable": {
-              "version": "1.0.1",
-              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-              "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "is-plain-object": "^2.0.4"
-              }
-            },
-            "kind-of": {
-              "version": "6.0.3",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-              "dev": true,
-              "optional": true
-            }
           }
         },
         "readdirp": {
@@ -53622,9 +54133,9 @@
       "dev": true
     },
     "webpack": {
-      "version": "4.44.2",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.2.tgz",
-      "integrity": "sha512-6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q==",
+      "version": "4.43.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.43.0.tgz",
+      "integrity": "sha512-GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g==",
       "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.9.0",
@@ -53635,7 +54146,7 @@
         "ajv": "^6.10.2",
         "ajv-keywords": "^3.4.1",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^4.3.0",
+        "enhanced-resolve": "^4.1.0",
         "eslint-scope": "^4.0.3",
         "json-parse-better-errors": "^1.0.2",
         "loader-runner": "^2.4.0",
@@ -53648,41 +54159,10 @@
         "schema-utils": "^1.0.0",
         "tapable": "^1.1.3",
         "terser-webpack-plugin": "^1.4.3",
-        "watchpack": "^1.7.4",
+        "watchpack": "^1.6.1",
         "webpack-sources": "^1.4.1"
       },
       "dependencies": {
-        "acorn": {
-          "version": "6.4.2",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
-          "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
-          "dev": true
-        },
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "ajv-keywords": {
-          "version": "3.5.2",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-          "dev": true,
-          "requires": {}
-        },
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-          "dev": true
-        },
         "braces": {
           "version": "2.3.2",
           "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
@@ -53709,12 +54189,6 @@
               "requires": {
                 "is-extendable": "^0.1.0"
               }
-            },
-            "is-extendable": {
-              "version": "0.1.1",
-              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-              "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-              "dev": true
             }
           }
         },
@@ -53747,55 +54221,6 @@
           "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
           "dev": true
         },
-        "commander": {
-          "version": "2.20.3",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-          "dev": true
-        },
-        "enhanced-resolve": {
-          "version": "4.5.0",
-          "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz",
-          "integrity": "sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "memory-fs": "^0.5.0",
-            "tapable": "^1.0.0"
-          },
-          "dependencies": {
-            "memory-fs": {
-              "version": "0.5.0",
-              "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
-              "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
-              "dev": true,
-              "requires": {
-                "errno": "^0.1.3",
-                "readable-stream": "^2.0.1"
-              }
-            }
-          }
-        },
-        "eslint-scope": {
-          "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
-          "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
-          "dev": true,
-          "requires": {
-            "esrecurse": "^4.1.0",
-            "estraverse": "^4.1.1"
-          }
-        },
-        "extend-shallow": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-          "dev": true,
-          "requires": {
-            "assign-symbols": "^1.0.0",
-            "is-extendable": "^1.0.1"
-          }
-        },
         "fill-range": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -53816,12 +54241,6 @@
               "requires": {
                 "is-extendable": "^0.1.0"
               }
-            },
-            "is-extendable": {
-              "version": "0.1.1",
-              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-              "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-              "dev": true
             }
           }
         },
@@ -53836,15 +54255,6 @@
             "pkg-dir": "^3.0.0"
           }
         },
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
         "is-number": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -53877,12 +54287,6 @@
           "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
           "dev": true
         },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        },
         "json5": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
@@ -53892,12 +54296,6 @@
             "minimist": "^1.2.0"
           }
         },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        },
         "loader-utils": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
@@ -53909,16 +54307,6 @@
             "json5": "^1.0.1"
           }
         },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
         "lru-cache": {
           "version": "5.1.1",
           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
@@ -53938,6 +54326,16 @@
             "semver": "^5.6.0"
           }
         },
+        "memory-fs": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+          "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+          "dev": true,
+          "requires": {
+            "errno": "^0.1.3",
+            "readable-stream": "^2.0.1"
+          }
+        },
         "micromatch": {
           "version": "3.1.10",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -53959,48 +54357,6 @@
             "to-regex": "^3.0.2"
           }
         },
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-          "dev": true
-        },
-        "pkg-dir": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-          "dev": true,
-          "requires": {
-            "find-up": "^3.0.0"
-          }
-        },
         "rimraf": {
           "version": "2.7.1",
           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -54027,15 +54383,6 @@
           "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
           "dev": true
         },
-        "serialize-javascript": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
-          "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
-          "dev": true,
-          "requires": {
-            "randombytes": "^2.1.0"
-          }
-        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -54043,31 +54390,14 @@
           "dev": true
         },
         "ssri": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz",
-          "integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==",
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+          "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
           "dev": true,
           "requires": {
             "figgy-pudding": "^3.5.1"
           }
         },
-        "tapable": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
-          "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
-          "dev": true
-        },
-        "terser": {
-          "version": "4.8.0",
-          "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
-          "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
-          "dev": true,
-          "requires": {
-            "commander": "^2.20.0",
-            "source-map": "~0.6.1",
-            "source-map-support": "~0.5.12"
-          }
-        },
         "terser-webpack-plugin": {
           "version": "1.4.5",
           "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz",
@@ -54095,22 +54425,6 @@
             "repeat-string": "^1.6.1"
           }
         },
-        "webpack-sources": {
-          "version": "1.4.3",
-          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-          "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-          "dev": true,
-          "requires": {
-            "source-list-map": "^2.0.0",
-            "source-map": "~0.6.1"
-          }
-        },
-        "y18n": {
-          "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
-          "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
-          "dev": true
-        },
         "yallist": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
@@ -54132,27 +54446,28 @@
         "webpack-log": "^2.0.0"
       },
       "dependencies": {
-        "mime": {
-          "version": "2.5.2",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
-          "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
-          "dev": true
-        },
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+        "memory-fs": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+          "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
           "dev": true,
           "requires": {
-            "minimist": "^1.2.5"
+            "errno": "^0.1.3",
+            "readable-stream": "^2.0.1"
           }
+        },
+        "mime": {
+          "version": "2.4.6",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
+          "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==",
+          "dev": true
         }
       }
     },
     "webpack-dev-server": {
-      "version": "3.11.2",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.2.tgz",
-      "integrity": "sha512-A80BkuHRQfCiNtGBS1EMf2ChTUs0x+B3wGDFmOeT4rmJOHhHTCH2naNxIHhmkr0/UillP4U3yeIyv1pNp+QDLQ==",
+      "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz",
+      "integrity": "sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg==",
       "dev": true,
       "requires": {
         "ansi-html": "0.0.7",
@@ -54175,11 +54490,11 @@
         "p-retry": "^3.0.1",
         "portfinder": "^1.0.26",
         "schema-utils": "^1.0.0",
-        "selfsigned": "^1.10.8",
+        "selfsigned": "^1.10.7",
         "semver": "^6.3.0",
         "serve-index": "^1.9.1",
-        "sockjs": "^0.3.21",
-        "sockjs-client": "^1.5.0",
+        "sockjs": "0.3.20",
+        "sockjs-client": "1.4.0",
         "spdy": "^4.0.2",
         "strip-ansi": "^3.0.1",
         "supports-color": "^6.1.0",
@@ -54190,25 +54505,6 @@
         "yargs": "^13.3.2"
       },
       "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "ajv-keywords": {
-          "version": "3.5.2",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-          "dev": true,
-          "requires": {}
-        },
         "ansi-regex": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
@@ -54236,12 +54532,6 @@
             }
           }
         },
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-          "dev": true
-        },
         "binary-extensions": {
           "version": "1.13.1",
           "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
@@ -54264,14 +54554,19 @@
             "snapdragon-node": "^2.0.1",
             "split-string": "^3.0.2",
             "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
           }
         },
-        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-          "dev": true
-        },
         "chokidar": {
           "version": "2.1.8",
           "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
@@ -54292,47 +54587,13 @@
             "upath": "^1.1.1"
           }
         },
-        "cliui": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+        "debug": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
           "dev": true,
           "requires": {
-            "string-width": "^3.1.0",
-            "strip-ansi": "^5.2.0",
-            "wrap-ansi": "^5.1.0"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "4.1.0",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-              "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-              "dev": true
-            },
-            "strip-ansi": {
-              "version": "5.2.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-              "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-              "dev": true,
-              "requires": {
-                "ansi-regex": "^4.1.0"
-              }
-            }
-          }
-        },
-        "emoji-regex": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-          "dev": true
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
+            "ms": "2.1.2"
           }
         },
         "fill-range": {
@@ -54345,15 +54606,17 @@
             "is-number": "^3.0.0",
             "repeat-string": "^1.6.1",
             "to-regex-range": "^2.1.0"
-          }
-        },
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
           }
         },
         "fsevents": {
@@ -54388,15 +54651,17 @@
             }
           }
         },
-        "import-local": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
-          "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
-          "dev": true,
-          "requires": {
-            "pkg-dir": "^3.0.0",
-            "resolve-cwd": "^2.0.0"
-          }
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "is-absolute-url": {
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz",
+          "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==",
+          "dev": true
         },
         "is-binary-path": {
           "version": "1.0.1",
@@ -54407,18 +54672,6 @@
             "binary-extensions": "^1.0.0"
           }
         },
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        },
         "is-number": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -54426,15 +54679,17 @@
           "dev": true,
           "requires": {
             "kind-of": "^3.0.2"
-          }
-        },
-        "is-plain-object": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-          "dev": true,
-          "requires": {
-            "isobject": "^3.0.1"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
           }
         },
         "isobject": {
@@ -54443,31 +54698,6 @@
           "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
           "dev": true
         },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
         "micromatch": {
           "version": "3.1.10",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -54487,61 +54717,13 @@
             "regex-not": "^1.0.0",
             "snapdragon": "^0.8.1",
             "to-regex": "^3.0.2"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "3.0.2",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-              "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-              "dev": true,
-              "requires": {
-                "assign-symbols": "^1.0.0",
-                "is-extendable": "^1.0.1"
-              }
-            },
-            "is-extendable": {
-              "version": "1.0.1",
-              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-              "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-              "dev": true,
-              "requires": {
-                "is-plain-object": "^2.0.4"
-              }
-            },
-            "kind-of": {
-              "version": "6.0.3",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-              "dev": true
-            }
           }
         },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "pkg-dir": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-          "dev": true,
-          "requires": {
-            "find-up": "^3.0.0"
-          }
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
         },
         "readdirp": {
           "version": "2.2.1",
@@ -54554,27 +54736,6 @@
             "readable-stream": "^2.0.2"
           }
         },
-        "require-main-filename": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-          "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-          "dev": true
-        },
-        "resolve-cwd": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
-          "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
-          "dev": true,
-          "requires": {
-            "resolve-from": "^3.0.0"
-          }
-        },
-        "resolve-from": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-          "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
-          "dev": true
-        },
         "schema-utils": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
@@ -54592,34 +54753,6 @@
           "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
         },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "4.1.0",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-              "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-              "dev": true
-            },
-            "strip-ansi": {
-              "version": "5.2.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-              "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-              "dev": true,
-              "requires": {
-                "ansi-regex": "^4.1.0"
-              }
-            }
-          }
-        },
         "strip-ansi": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
@@ -54647,83 +54780,6 @@
             "is-number": "^3.0.0",
             "repeat-string": "^1.6.1"
           }
-        },
-        "which-module": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-          "dev": true
-        },
-        "wrap-ansi": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-          "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.0",
-            "string-width": "^3.0.0",
-            "strip-ansi": "^5.0.0"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "4.1.0",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-              "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-              "dev": true
-            },
-            "strip-ansi": {
-              "version": "5.2.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-              "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-              "dev": true,
-              "requires": {
-                "ansi-regex": "^4.1.0"
-              }
-            }
-          }
-        },
-        "ws": {
-          "version": "6.2.2",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
-          "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
-          "dev": true,
-          "requires": {
-            "async-limiter": "~1.0.0"
-          }
-        },
-        "y18n": {
-          "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
-          "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
-          "dev": true
-        },
-        "yargs": {
-          "version": "13.3.2",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-          "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
-          "dev": true,
-          "requires": {
-            "cliui": "^5.0.0",
-            "find-up": "^3.0.0",
-            "get-caller-file": "^2.0.1",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^2.0.0",
-            "set-blocking": "^2.0.0",
-            "string-width": "^3.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^4.0.0",
-            "yargs-parser": "^13.1.2"
-          }
-        },
-        "yargs-parser": {
-          "version": "13.1.2",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
-          "dev": true,
-          "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
-          }
         }
       }
     },
@@ -54735,40 +54791,25 @@
       "requires": {
         "ansi-colors": "^3.0.0",
         "uuid": "^3.3.2"
-      },
-      "dependencies": {
-        "ansi-colors": {
-          "version": "3.2.4",
-          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
-          "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
-          "dev": true
-        },
-        "uuid": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-          "dev": true
-        }
       }
     },
     "webpack-merge": {
-      "version": "5.7.3",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.7.3.tgz",
-      "integrity": "sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
+      "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==",
       "dev": true,
       "requires": {
-        "clone-deep": "^4.0.1",
-        "wildcard": "^2.0.0"
+        "lodash": "^4.17.15"
       }
     },
     "webpack-sources": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.2.0.tgz",
-      "integrity": "sha512-bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w==",
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
       "dev": true,
       "requires": {
-        "source-list-map": "^2.0.1",
-        "source-map": "^0.6.1"
+        "source-list-map": "^2.0.0",
+        "source-map": "~0.6.1"
       },
       "dependencies": {
         "source-map": {
@@ -54780,30 +54821,12 @@
       }
     },
     "webpack-subresource-integrity": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.5.2.tgz",
-      "integrity": "sha512-GBWYBoyalbo5YClwWop9qe6Zclp8CIXYGIz12OPclJhIrSplDxs1Ls1JDMH8xBPPrg1T6ISaTW9Y6zOrwEiAzw==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.4.1.tgz",
+      "integrity": "sha512-XMLFInbGbB1HV7K4vHWANzc1CN0t/c4bBvnlvGxGwV45yE/S/feAXIm8dJsCkzqWtSKnmaEgTp/meyeThxG4Iw==",
       "dev": true,
       "requires": {
         "webpack-sources": "^1.3.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "webpack-sources": {
-          "version": "1.4.3",
-          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-          "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-          "dev": true,
-          "requires": {
-            "source-list-map": "^2.0.0",
-            "source-map": "~0.6.1"
-          }
-        }
       }
     },
     "webrtc-adapter": {
@@ -54815,13 +54838,11 @@
       }
     },
     "websocket-driver": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
-      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz",
+      "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=",
       "dev": true,
       "requires": {
-        "http-parser-js": ">=0.5.1",
-        "safe-buffer": ">=5.1.0",
         "websocket-extensions": ">=0.1.1"
       }
     },
@@ -54847,16 +54868,22 @@
       "dev": true
     },
     "whatwg-url": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
-      "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.3.0.tgz",
+      "integrity": "sha512-BQRf/ej5Rp3+n7k0grQXZj9a1cHtsp4lqj01p59xBWFKdezR8sO37XnpafwNqiFac/v2Il12EIMjX/Y4VZtT8Q==",
       "dev": true,
       "requires": {
-        "lodash": "^4.7.0",
-        "tr46": "^2.1.0",
+        "lodash.sortby": "^4.7.0",
+        "tr46": "^2.0.2",
         "webidl-conversions": "^6.1.0"
       }
     },
+    "when": {
+      "version": "3.6.4",
+      "resolved": "https://registry.npmjs.org/when/-/when-3.6.4.tgz",
+      "integrity": "sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=",
+      "dev": true
+    },
     "which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -54879,46 +54906,23 @@
       }
     },
     "which-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
       "dev": true
     },
+    "which-pm-runs": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz",
+      "integrity": "sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=",
+      "optional": true
+    },
     "wide-align": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
       "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
       "requires": {
         "string-width": "^1.0.2 || 2"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "requires": {
-            "ansi-regex": "^3.0.0"
-          }
-        }
       }
     },
     "widest-line": {
@@ -54927,21 +54931,129 @@
       "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==",
       "requires": {
         "string-width": "^4.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
+        },
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+        },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
+        },
+        "string-width": {
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "requires": {
+            "ansi-regex": "^5.0.0"
+          }
+        }
       }
     },
-    "wildcard": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
-      "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
-      "dev": true
-    },
     "windows-release": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-4.0.0.tgz",
-      "integrity": "sha512-OxmV4wzDKB1x7AZaZgXMVsdJ1qER1ed83ZrTYd5Bwq2HfJVg3DJS8nqlAG4sMoJ7mu8cuRmLEYyU13BKwctRAg==",
-      "dev": true,
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-3.3.3.tgz",
+      "integrity": "sha512-OSOGH1QYiW5yVor9TtmXKQvt2vjQqbYS+DqmsZw+r7xDwLXEeT3JGW0ZppFmHx4diyXmxt238KFR3N9jzevBRg==",
       "requires": {
-        "execa": "^4.0.2"
+        "execa": "^1.0.0"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+          "requires": {
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
+        "execa": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+          "requires": {
+            "cross-spawn": "^6.0.0",
+            "get-stream": "^4.0.0",
+            "is-stream": "^1.1.0",
+            "npm-run-path": "^2.0.0",
+            "p-finally": "^1.0.0",
+            "signal-exit": "^3.0.0",
+            "strip-eof": "^1.0.0"
+          }
+        },
+        "get-stream": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "is-stream": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+          "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
+        },
+        "npm-run-path": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+          "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+          "requires": {
+            "path-key": "^2.0.0"
+          }
+        },
+        "path-key": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+          "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        },
+        "shebang-command": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+          "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+          "requires": {
+            "shebang-regex": "^1.0.0"
+          }
+        },
+        "shebang-regex": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+          "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
+        },
+        "which": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
       }
     },
     "with-open-file": {
@@ -54952,13 +55064,6 @@
         "p-finally": "^1.0.0",
         "p-try": "^2.1.0",
         "pify": "^4.0.1"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
-        }
       }
     },
     "word-wrap": {
@@ -54977,9 +55082,9 @@
       }
     },
     "worker-plugin": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/worker-plugin/-/worker-plugin-5.0.0.tgz",
-      "integrity": "sha512-AXMUstURCxDD6yGam2r4E34aJg6kW85IiaeX72hi+I1cxyaMUtrvVY6sbfpGKAj5e7f68Acl62BjQF5aOOx2IQ==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/worker-plugin/-/worker-plugin-4.0.3.tgz",
+      "integrity": "sha512-7hFDYWiKcE3yHZvemsoM9lZis/PzurHAEX1ej8PLCu818Rt6QqUAiDdxHPCKZctzmhqzPpcFSgvMCiPbtooqAg==",
       "dev": true,
       "requires": {
         "loader-utils": "^1.1.0"
@@ -55008,32 +55113,49 @@
       }
     },
     "wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
       "dev": true,
       "requires": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
+        "ansi-styles": "^3.2.0",
+        "string-width": "^3.0.0",
+        "strip-ansi": "^5.0.0"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "^2.0.1"
+            "color-convert": "^1.9.0"
           }
         },
         "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
           "dev": true,
           "requires": {
-            "color-name": "~1.1.4"
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "dev": true
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
           }
         }
       }
@@ -55050,17 +55172,6 @@
       "dev": true,
       "requires": {
         "mkdirp": "^0.5.1"
-      },
-      "dependencies": {
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        }
       }
     },
     "write-file-atomic": {
@@ -55075,26 +55186,21 @@
       }
     },
     "ws": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz",
-      "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
+      "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
       "dev": true,
-      "requires": {}
+      "requires": {
+        "async-limiter": "~1.0.0"
+      }
     },
     "xcode": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/xcode/-/xcode-3.0.1.tgz",
-      "integrity": "sha512-kCz5k7J7XbJtjABOvkc5lJmkiDh8VhjVCGNiqdKCscmVpdVUpEAyXv1xmCLkQJ5dsHqx3IPO4XW+NTDhU/fatA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/xcode/-/xcode-2.1.0.tgz",
+      "integrity": "sha512-uCrmPITrqTEzhn0TtT57fJaNaw8YJs1aCzs+P/QqxsDbvPZSv7XMPPwXrKvHtD6pLjBM/NaVwraWJm8q83Y4iQ==",
       "requires": {
-        "simple-plist": "^1.1.0",
-        "uuid": "^7.0.3"
-      },
-      "dependencies": {
-        "uuid": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
-          "integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg=="
-        }
+        "simple-plist": "^1.0.0",
+        "uuid": "^3.3.2"
       }
     },
     "xdg-basedir": {
@@ -55125,9 +55231,9 @@
       "dev": true
     },
     "xmldom": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.5.0.tgz",
-      "integrity": "sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA=="
+      "version": "0.1.31",
+      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.31.tgz",
+      "integrity": "sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ=="
     },
     "xregexp": {
       "version": "2.0.0",
@@ -55142,9 +55248,9 @@
       "dev": true
     },
     "y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
       "dev": true
     },
     "yallist": {
@@ -55152,32 +55258,83 @@
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     },
-    "yaml": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
-      "dev": true
-    },
     "yargs": {
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "version": "13.3.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+      "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
       "dev": true,
       "requires": {
-        "cliui": "^7.0.2",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
+        "cliui": "^5.0.0",
+        "find-up": "^3.0.0",
+        "get-caller-file": "^2.0.1",
         "require-directory": "^2.1.1",
-        "string-width": "^4.2.0",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^20.2.2"
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^3.0.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^13.1.2"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        }
       }
     },
     "yargs-parser": {
-      "version": "20.2.9",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
-      "dev": true
+      "version": "13.1.2",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+      "dev": true,
+      "requires": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      }
     },
     "yauzl": {
       "version": "2.10.0",
@@ -55195,12 +55352,6 @@
       "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
       "dev": true
     },
-    "yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "dev": true
-    },
     "zone.js": {
       "version": "0.10.3",
       "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.10.3.tgz",
diff --git a/package.json b/package.json
index 3ae83a376..609746927 100644
--- a/package.json
+++ b/package.json
@@ -37,40 +37,40 @@
     "ionic:build:before": "gulp"
   },
   "dependencies": {
-    "@angular/animations": "~11.2.14",
-    "@angular/common": "~11.2.14",
-    "@angular/core": "~11.2.14",
-    "@angular/forms": "~11.2.14",
-    "@angular/platform-browser": "~11.2.14",
-    "@angular/platform-browser-dynamic": "~11.2.14",
-    "@angular/router": "~11.2.14",
-    "@ionic-native/badge": "^5.34.0",
-    "@ionic-native/camera": "^5.34.0",
-    "@ionic-native/chooser": "^5.34.0",
-    "@ionic-native/clipboard": "^5.34.0",
-    "@ionic-native/core": "^5.34.0",
-    "@ionic-native/device": "^5.34.0",
-    "@ionic-native/diagnostic": "^5.34.0",
-    "@ionic-native/file": "^5.34.0",
-    "@ionic-native/file-opener": "^5.34.0",
-    "@ionic-native/file-transfer": "^5.34.0",
-    "@ionic-native/geolocation": "^5.34.0",
-    "@ionic-native/http": "^5.34.0",
-    "@ionic-native/in-app-browser": "^5.34.0",
-    "@ionic-native/ionic-webview": "^5.34.0",
-    "@ionic-native/keyboard": "^5.34.0",
-    "@ionic-native/local-notifications": "^5.34.0",
-    "@ionic-native/media": "^5.34.0",
-    "@ionic-native/media-capture": "^5.34.0",
-    "@ionic-native/network": "^5.34.0",
-    "@ionic-native/push": "^5.34.0",
-    "@ionic-native/qr-scanner": "^5.34.0",
-    "@ionic-native/splash-screen": "^5.34.0",
-    "@ionic-native/sqlite": "^5.34.0",
-    "@ionic-native/status-bar": "^5.34.0",
-    "@ionic-native/web-intent": "^5.34.0",
-    "@ionic-native/zip": "^5.34.0",
-    "@ionic/angular": "^5.6.13",
+    "@angular/animations": "~10.0.14",
+    "@angular/common": "~10.0.14",
+    "@angular/core": "~10.0.14",
+    "@angular/forms": "~10.0.14",
+    "@angular/platform-browser": "~10.0.14",
+    "@angular/platform-browser-dynamic": "~10.0.14",
+    "@angular/router": "~10.0.14",
+    "@ionic-native/badge": "^5.33.0",
+    "@ionic-native/camera": "^5.33.0",
+    "@ionic-native/chooser": "^5.33.0",
+    "@ionic-native/clipboard": "^5.33.0",
+    "@ionic-native/core": "^5.33.0",
+    "@ionic-native/device": "^5.33.0",
+    "@ionic-native/diagnostic": "^5.33.0",
+    "@ionic-native/file": "^5.33.0",
+    "@ionic-native/file-opener": "^5.33.0",
+    "@ionic-native/file-transfer": "^5.33.0",
+    "@ionic-native/geolocation": "^5.33.0",
+    "@ionic-native/http": "^5.33.0",
+    "@ionic-native/in-app-browser": "^5.33.0",
+    "@ionic-native/ionic-webview": "^5.33.0",
+    "@ionic-native/keyboard": "^5.33.0",
+    "@ionic-native/local-notifications": "^5.33.0",
+    "@ionic-native/media": "^5.33.0",
+    "@ionic-native/media-capture": "^5.33.0",
+    "@ionic-native/network": "^5.33.0",
+    "@ionic-native/push": "^5.33.0",
+    "@ionic-native/qr-scanner": "^5.33.0",
+    "@ionic-native/splash-screen": "^5.33.0",
+    "@ionic-native/sqlite": "^5.33.0",
+    "@ionic-native/status-bar": "^5.33.0",
+    "@ionic-native/web-intent": "^5.33.0",
+    "@ionic-native/zip": "^5.33.0",
+    "@ionic/angular": "^5.6.6",
     "@moodlehq/cordova-plugin-file-transfer": "1.7.1-moodle.2",
     "@moodlehq/cordova-plugin-inappbrowser": "5.0.0-moodle.2",
     "@moodlehq/cordova-plugin-local-notification": "0.9.0-moodle.2",
@@ -80,11 +80,11 @@
     "@ngx-translate/http-loader": "^6.0.0",
     "@types/chart.js": "^2.9.31",
     "@types/cordova": "0.0.34",
-    "@types/dom-mediacapture-record": "^1.0.10",
+    "@types/dom-mediacapture-record": "^1.0.7",
     "chart.js": "^2.9.4",
     "com-darryncampbell-cordova-plugin-intent": "^1.3.0",
     "cordova": "^10.0.0",
-    "cordova-android": "^10.0.1",
+    "cordova-android": "^9.1.0",
     "cordova-android-support-gradle-release": "^3.0.1",
     "cordova-clipboard": "^1.3.0",
     "cordova-ios": "^6.2.0",
@@ -128,17 +128,17 @@
     "zone.js": "~0.10.3"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.1102.14",
+    "@angular-devkit/build-angular": "~0.1000.8",
     "@angular-eslint/builder": "^4.2.0",
     "@angular-eslint/eslint-plugin": "^4.2.0",
     "@angular-eslint/eslint-plugin-template": "^4.2.0",
     "@angular-eslint/schematics": "^4.2.0",
     "@angular-eslint/template-parser": "^4.2.0",
-    "@angular/cli": "~11.2.14",
-    "@angular/compiler": "~11.2.14",
-    "@angular/compiler-cli": "~11.2.14",
-    "@angular/language-service": "~11.2.14",
-    "@ionic/angular-toolkit": "^4.0.0",
+    "@angular/cli": "~10.0.8",
+    "@angular/compiler": "~10.0.14",
+    "@angular/compiler-cli": "~10.0.14",
+    "@angular/language-service": "~10.0.14",
+    "@ionic/angular-toolkit": "^2.3.3",
     "@ionic/cli": "^6.14.1",
     "@types/faker": "^5.1.3",
     "@types/node": "^12.12.64",
@@ -170,7 +170,7 @@
     "native-run": "^1.4.0",
     "ts-jest": "^26.4.1",
     "ts-node": "~8.3.0",
-    "typescript": "^4.1.6"
+    "typescript": "^3.9.9"
   },
   "engines": {
     "node": ">=12.x"
diff --git a/tsconfig.json b/tsconfig.json
index e5836c1d0..d617cbf05 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -9,7 +9,7 @@
     "experimentalDecorators": true,
     "strictNullChecks": true,
     "strictPropertyInitialization": true,
-    "module": "es2020",
+    "module": "esnext",
     "moduleResolution": "node",
     "importHelpers": true,
     "target": "es2015",
@@ -46,8 +46,6 @@
   },
   "angularCompilerOptions": {
     "fullTemplateTypeCheck": true,
-    "enableI18nLegacyMessageIdFormat": false,
-    "strictInjectionParameters": true,
-    "strictInputAccessModifiers": true
+    "strictInjectionParameters": true
   }
 }

From e2daa15a6fe7eabd2cb3f19d1e4efccc830fbffe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 9 Aug 2021 12:02:15 +0200
Subject: [PATCH 0044/1008] MOBILE-3833 travis: Use npm 7 on travis

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index dd479ea5a..171b23db3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,6 @@ before_install:
   - npm --version
   - nvm --version
   - npm ci
-  - npm install npm@^6 -g
 
 before_script:
   - npx gulp

From d3593dc817c326c998d46240844a682b3e16f0f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 9 Aug 2021 12:12:26 +0200
Subject: [PATCH 0045/1008] MOBILE-3833 config: Disable chart.js CommonJS
 warning

---
 angular.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/angular.json b/angular.json
index c1275f42d..9cc72565b 100644
--- a/angular.json
+++ b/angular.json
@@ -14,6 +14,9 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
+            "allowedCommonJsDependencies":[
+                "chart.js"
+            ],
             "outputPath": "www",
             "index": "src/index.html",
             "main": "src/main.ts",

From 1d5019ab19bf65cf34d63e16ea5adaab064bd505 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 11 Aug 2021 14:31:49 +0200
Subject: [PATCH 0046/1008] MOBILE-3833 test: Improve inputs rendering

---
 src/testing/utils.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/testing/utils.ts b/src/testing/utils.ts
index 0bb4e7fff..f2b16afec 100644
--- a/src/testing/utils.ts
+++ b/src/testing/utils.ts
@@ -16,6 +16,7 @@ import { Component, CUSTOM_ELEMENTS_SCHEMA, Type, ViewChild } from '@angular/cor
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { CoreSingletonProxy } from '@singletons';
+import { CoreTextUtilsProvider } from '@services/utils/text';
 
 abstract class WrapperComponent<U> {
 
@@ -30,6 +31,8 @@ export interface RenderConfig {
 
 export type WrapperComponentFixture<T> = ComponentFixture<WrapperComponent<T>>;
 
+const textUtils = new CoreTextUtilsProvider();
+
 export function mock<T>(instance?: Record<string, unknown>): T;
 export function mock<T>(methods: string[], instance?: Record<string, unknown>): T;
 export function mock<T>(
@@ -108,12 +111,12 @@ export async function renderTemplate<T>(
 export async function renderWrapperComponent<T>(
     component: Type<T>,
     tag: string,
-    inputs: Record<string, { toString() }> = {},
+    inputs: Record<string, unknown> = {},
     config: Partial<RenderConfig> = {},
 ): Promise<WrapperComponentFixture<T>> {
     const inputAttributes = Object
         .entries(inputs)
-        .map(([name, value]) => `${name}="${value.toString().replace(/"/g, '&quot;')}"`)
+        .map(([name, value]) => `[${name}]="${textUtils.escapeHTML(JSON.stringify(value)).replace(/\//g, '\\/')}"`)
         .join(' ');
 
     return renderTemplate(component, `<${tag} ${inputAttributes}></${tag}>`, config);

From f485099a67aa2c9ad0dd8a08951d597c7bdb9069 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 11 Aug 2021 14:32:22 +0200
Subject: [PATCH 0047/1008] MOBILE-3833 test: Improve error handling

---
 src/testing/setup.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/testing/setup.ts b/src/testing/setup.ts
index 6bffcfaca..b5a513699 100644
--- a/src/testing/setup.ts
+++ b/src/testing/setup.ts
@@ -22,7 +22,7 @@ console.debug = () => {
 };
 
 // eslint-disable-next-line no-console, jest/no-jasmine-globals, @typescript-eslint/no-explicit-any
-console.error = (...args: any[]) => fail(args.map(a => a.toString()).join(''));
+console.error = (...args: any[]) => fail(args.map(a => String(a)).join(''));
 
 // eslint-disable-next-line jest/no-jasmine-globals
 process.on('unhandledRejection', error => fail(error));

From 7b41b7716c4fed5718fa86ce03674a4baed23d9b Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 11 Aug 2021 14:32:53 +0200
Subject: [PATCH 0048/1008] MOBILE-3833 app: Avoid services in constructor

---
 src/core/services/app.ts | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/core/services/app.ts b/src/core/services/app.ts
index 96454cc1b..87ec78cd8 100644
--- a/src/core/services/app.ts
+++ b/src/core/services/app.ts
@@ -50,7 +50,7 @@ type SchemaVersionsManager = {
 @Injectable({ providedIn: 'root' })
 export class CoreAppProvider {
 
-    protected db: SQLiteDB;
+    protected db?: SQLiteDB;
     protected logger: CoreLogger;
     protected ssoAuthenticationDeferred?: PromiseDefer<void>;
     protected isKeyboardShown = false;
@@ -65,7 +65,6 @@ export class CoreAppProvider {
 
     constructor() {
         this.schemaVersionsManager = new Promise(resolve => this.resolveSchemaVersionsManager = resolve);
-        this.db = CoreDB.getDB(DBNAME);
         this.logger = CoreLogger.getInstance('CoreAppProvider');
     }
 
@@ -82,13 +81,13 @@ export class CoreAppProvider {
      * Initialize database.
      */
     async initializeDatabase(): Promise<void> {
-        await this.db.createTableFromSchema(SCHEMA_VERSIONS_TABLE_SCHEMA);
+        await this.getDB().createTableFromSchema(SCHEMA_VERSIONS_TABLE_SCHEMA);
 
         this.resolveSchemaVersionsManager({
             get: async name => {
                 try {
                     // Fetch installed version of the schema.
-                    const entry = await this.db.getRecord<SchemaVersionsDBEntry>(SCHEMA_VERSIONS_TABLE_NAME, { name });
+                    const entry = await this.getDB().getRecord<SchemaVersionsDBEntry>(SCHEMA_VERSIONS_TABLE_NAME, { name });
 
                     return entry.version;
                 } catch (error) {
@@ -97,7 +96,7 @@ export class CoreAppProvider {
                 }
             },
             set: async (name, version) => {
-                await this.db.insertRecord(SCHEMA_VERSIONS_TABLE_NAME, { name, version });
+                await this.getDB().insertRecord(SCHEMA_VERSIONS_TABLE_NAME, { name, version });
             },
         });
     }
@@ -149,10 +148,10 @@ export class CoreAppProvider {
         this.logger.debug(`Migrating schema '${schema.name}' of app DB from version ${oldVersion} to ${schema.version}`);
 
         if (schema.tables) {
-            await this.db.createTablesFromSchema(schema.tables);
+            await this.getDB().createTablesFromSchema(schema.tables);
         }
         if (schema.migrate && oldVersion > 0) {
-            await schema.migrate(this.db, oldVersion);
+            await schema.migrate(this.getDB(), oldVersion);
         }
 
         // Set installed version.
@@ -165,6 +164,10 @@ export class CoreAppProvider {
      * @return App's DB.
      */
     getDB(): SQLiteDB {
+        if (!this.db) {
+            this.db = CoreDB.getDB(DBNAME);
+        }
+
         return this.db;
     }
 

From f86c2af9bf800247be559a3f77f215954b770c0c Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 12 Aug 2021 11:11:54 +0200
Subject: [PATCH 0049/1008] MOBILE-3833 utils: Remove injected service

---
 src/core/services/utils/utils.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/core/services/utils/utils.ts b/src/core/services/utils/utils.ts
index 6c5ca7826..2acf447f2 100644
--- a/src/core/services/utils/utils.ts
+++ b/src/core/services/utils/utils.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Injectable, NgZone } from '@angular/core';
+import { Injectable } from '@angular/core';
 import { InAppBrowserObject, InAppBrowserOptions } from '@ionic-native/in-app-browser';
 import { FileEntry } from '@ionic-native/file/ngx';
 import { Subscription } from 'rxjs';
@@ -26,7 +26,7 @@ import { CoreDomUtils } from '@services/utils/dom';
 import { CoreMimetypeUtils } from '@services/utils/mimetype';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreWSError } from '@classes/errors/wserror';
-import { makeSingleton, Clipboard, InAppBrowser, FileOpener, WebIntent, QRScanner, Translate } from '@singletons';
+import { makeSingleton, Clipboard, InAppBrowser, FileOpener, WebIntent, QRScanner, Translate, NgZone } from '@singletons';
 import { CoreLogger } from '@singletons/logger';
 import { CoreFileSizeSum } from '@services/plugin-file-delegate';
 import { CoreViewerQRScannerComponent } from '@features/viewer/components/qr-scanner/qr-scanner';
@@ -49,7 +49,7 @@ export class CoreUtilsProvider {
     protected uniqueIds: {[name: string]: number} = {};
     protected qrScanData?: {deferred: PromiseDefer<string>; observable: Subscription};
 
-    constructor(protected zone: NgZone) {
+    constructor() {
         this.logger = CoreLogger.getInstance('CoreUtilsProvider');
     }
 
@@ -1005,7 +1005,7 @@ export class CoreUtilsProvider {
             // Trigger global events when a url is loaded or the window is closed. This is to make it work like in Ionic 1.
             const loadStartSubscription = this.iabInstance.on('loadstart').subscribe((event) => {
                 // Execute the callback in the Angular zone, so change detection doesn't stop working.
-                this.zone.run(() => {
+                NgZone.run(() => {
                     // Store the last loaded URLs (max 10).
                     loadStartUrls.push(event.url);
                     if (loadStartUrls.length > 10) {
@@ -1020,7 +1020,7 @@ export class CoreUtilsProvider {
                 // Load stop is needed with InAppBrowser v3. Custom URL schemes no longer trigger load start, simulate it.
                 loadStopSubscription = this.iabInstance.on('loadstop').subscribe((event) => {
                     // Execute the callback in the Angular zone, so change detection doesn't stop working.
-                    this.zone.run(() => {
+                    NgZone.run(() => {
                         if (loadStartUrls.indexOf(event.url) == -1) {
                             // The URL was stopped but not started, probably a custom URL scheme.
                             CoreEvents.trigger(CoreEvents.IAB_LOAD_START, event);
@@ -1031,7 +1031,7 @@ export class CoreUtilsProvider {
 
             const exitSubscription = this.iabInstance.on('exit').subscribe((event) => {
                 // Execute the callback in the Angular zone, so change detection doesn't stop working.
-                this.zone.run(() => {
+                NgZone.run(() => {
                     loadStartSubscription.unsubscribe();
                     loadStopSubscription && loadStopSubscription.unsubscribe();
                     exitSubscription.unsubscribe();

From b039ad62752bba6586843048de626278e7d838c2 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 12 Aug 2021 12:14:50 +0200
Subject: [PATCH 0050/1008] MOBILE-3833 test: Improve testing utils

---
 src/app/app.component.test.ts                 |  11 --
 src/core/services/tests/navigator.test.ts     |  12 +-
 src/core/singletons/index.ts                  |   6 +-
 src/testing/setup.ts                          |   7 +-
 .../stubs/directives/core-external-content.ts |  24 +++
 src/testing/stubs/pipes/translate.ts          |  26 +++
 src/testing/utils.ts                          | 151 +++++++++++++-----
 7 files changed, 175 insertions(+), 62 deletions(-)
 create mode 100644 src/testing/stubs/directives/core-external-content.ts
 create mode 100644 src/testing/stubs/pipes/translate.ts

diff --git a/src/app/app.component.test.ts b/src/app/app.component.test.ts
index e815b64bd..ca22b6277 100644
--- a/src/app/app.component.test.ts
+++ b/src/app/app.component.test.ts
@@ -12,17 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Observable, Subject } from 'rxjs';
-
 import { AppComponent } from '@/app/app.component';
-import { CoreApp } from '@services/app';
 import { CoreEvents } from '@singletons/events';
 import { CoreLang, CoreLangProvider } from '@services/lang';
-import { Network, Platform, NgZone } from '@singletons';
 
 import { mockSingleton, renderComponent } from '@/testing/utils';
 import { CoreNavigator, CoreNavigatorService } from '@services/navigator';
-import { CoreSitePlugins } from '@features/siteplugins/services/siteplugins';
 
 describe('AppComponent', () => {
 
@@ -30,12 +25,6 @@ describe('AppComponent', () => {
     let navigator: CoreNavigatorService;
 
     beforeEach(() => {
-        mockSingleton(CoreApp, { setStatusBarColor: jest.fn() });
-        mockSingleton(Network, { onChange: () => new Observable() });
-        mockSingleton(Platform, { ready: () => Promise.resolve(), resume: new Subject<void>() });
-        mockSingleton(NgZone, { run: jest.fn() });
-        mockSingleton(CoreSitePlugins, { hasSitePluginsLoaded: false });
-
         navigator = mockSingleton(CoreNavigator, ['navigate']);
         langProvider = mockSingleton(CoreLang, ['clearCustomStrings']);
     });
diff --git a/src/core/services/tests/navigator.test.ts b/src/core/services/tests/navigator.test.ts
index d2c3fe25d..a0000b07e 100644
--- a/src/core/services/tests/navigator.test.ts
+++ b/src/core/services/tests/navigator.test.ts
@@ -14,12 +14,9 @@
 
 import { NavController as NavControllerService } from '@ionic/angular';
 
-import { mock, mockSingleton } from '@/testing/utils';
+import { mockSingleton } from '@/testing/utils';
 
 import { CoreNavigatorService } from '@services/navigator';
-import { CoreUtils, CoreUtilsProvider } from '@services/utils/utils';
-import { CoreUrlUtils, CoreUrlUtilsProvider } from '@services/utils/url';
-import { CoreTextUtils, CoreTextUtilsProvider } from '@services/utils/text';
 import { NavController, Router } from '@singletons';
 import { ActivatedRoute, RouterState } from '@angular/router';
 import { CoreSites } from '@services/sites';
@@ -36,15 +33,12 @@ describe('CoreNavigator', () => {
     let navControllerMock: NavControllerService;
 
     beforeEach(() => {
-        router = { url: '/' };
         currentMainMenuHandlers = ['home'];
         navigator = new CoreNavigatorService();
         navControllerMock = mockSingleton(NavController, ['navigateRoot', 'navigateForward']);
 
-        mockSingleton(Router, router);
-        mockSingleton(CoreUtils, new CoreUtilsProvider(mock()));
-        mockSingleton(CoreUrlUtils, new CoreUrlUtilsProvider());
-        mockSingleton(CoreTextUtils, new CoreTextUtilsProvider());
+        router = mockSingleton(Router, { url: '/' });
+
         mockSingleton(CoreSites, { getCurrentSiteId: () => 42, isLoggedIn: () => true });
         mockSingleton(CoreMainMenu, { isMainMenuTab: path => Promise.resolve(currentMainMenuHandlers.includes(path)) });
     });
diff --git a/src/core/singletons/index.ts b/src/core/singletons/index.ts
index d22a26290..deee2a2be 100644
--- a/src/core/singletons/index.ts
+++ b/src/core/singletons/index.ts
@@ -73,8 +73,9 @@ let createSingletonMethodProxy = (instance: any, method: Function, property: str
  *
  * @see makeSingleton
  */
-export type CoreSingletonProxy<Service> = Service & {
+export type CoreSingletonProxy<Service = unknown> = Service & {
     instance: Service;
+    injectionToken: Type<Service> | AbstractType<Service> | Type<unknown> | string;
     setInstance(instance: Service): void;
 };
 
@@ -113,13 +114,14 @@ export function makeSingleton<Service extends object = object>( // eslint-disabl
     injectionToken: Type<Service> | AbstractType<Service> | Type<unknown> | string,
 ): CoreSingletonProxy<Service> {
     const singleton = {
+        injectionToken,
         setInstance(instance: Service) {
             Object.defineProperty(singleton, 'instance', {
                 value: instance,
                 configurable: true,
             });
         },
-    } as { instance: Service; setInstance(instance: Service) };
+    } as Pick<CoreSingletonProxy<Service>, 'injectionToken' | 'instance' | 'setInstance'>;
 
     Object.defineProperty(singleton, 'instance', {
         get: () => {
diff --git a/src/testing/setup.ts b/src/testing/setup.ts
index b5a513699..b988506bb 100644
--- a/src/testing/setup.ts
+++ b/src/testing/setup.ts
@@ -14,7 +14,9 @@
 
 import 'jest-preset-angular';
 
-import { setCreateSingletonMethodProxy } from '@singletons';
+import { setCreateSingletonMethodProxy, setSingletonsInjector } from '@singletons';
+
+import { resetTestingEnvironment, getServiceInstance } from './utils';
 
 // eslint-disable-next-line no-console
 console.debug = () => {
@@ -35,3 +37,6 @@ setCreateSingletonMethodProxy(
             instance[`mock_${String(property)}`] ??
             jest.fn((...args) => method.call(instance, ...args)),
 );
+
+setSingletonsInjector({ get: injectionToken => getServiceInstance(injectionToken) });
+beforeEach(() => resetTestingEnvironment());
diff --git a/src/testing/stubs/directives/core-external-content.ts b/src/testing/stubs/directives/core-external-content.ts
new file mode 100644
index 000000000..c929bd2b4
--- /dev/null
+++ b/src/testing/stubs/directives/core-external-content.ts
@@ -0,0 +1,24 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { Directive, Input } from '@angular/core';
+
+@Directive({
+    selector: '[core-external-content]',
+})
+export class CoreExternalContentDirectiveStub { // eslint-disable-line @angular-eslint/directive-class-suffix
+
+    @Input() siteId?: string;
+
+}
diff --git a/src/testing/stubs/pipes/translate.ts b/src/testing/stubs/pipes/translate.ts
new file mode 100644
index 000000000..093693b91
--- /dev/null
+++ b/src/testing/stubs/pipes/translate.ts
@@ -0,0 +1,26 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+    name: 'translate',
+})
+export class TranslatePipeStub implements PipeTransform {
+
+    transform(text: string): string {
+        return text;
+    }
+
+}
diff --git a/src/testing/utils.ts b/src/testing/utils.ts
index f2b16afec..6b7700f9e 100644
--- a/src/testing/utils.ts
+++ b/src/testing/utils.ts
@@ -12,18 +12,108 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, CUSTOM_ELEMENTS_SCHEMA, Type, ViewChild } from '@angular/core';
+import { AbstractType, Component, CUSTOM_ELEMENTS_SCHEMA, Type, ViewChild } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { Network } from '@ionic-native/network/ngx';
+import { Observable, Subject } from 'rxjs';
+import { Platform } from '@ionic/angular';
 
+import { CORE_SITE_SCHEMAS } from '@services/sites';
 import { CoreSingletonProxy } from '@singletons';
 import { CoreTextUtilsProvider } from '@services/utils/text';
 
+import { TranslatePipeStub } from './stubs/pipes/translate';
+import { CoreExternalContentDirectiveStub } from './stubs/directives/core-external-content';
+
 abstract class WrapperComponent<U> {
 
     child!: U;
 
 };
 
+type ServiceInjectionToken = AbstractType<unknown> | Type<unknown> | string;
+
+let testBedInitialized = false;
+const textUtils = new CoreTextUtilsProvider();
+
+async function renderAngularComponent<T>(component: Type<T>, config: RenderConfig): Promise<ComponentFixture<T>> {
+    config.declarations.push(component);
+
+    TestBed.configureTestingModule({
+        declarations: [
+            ...getDefaultDeclarations(),
+            ...config.declarations,
+        ],
+        providers: [
+            ...getDefaultProviders(),
+            ...config.providers,
+        ],
+        schemas: [CUSTOM_ELEMENTS_SCHEMA],
+        imports: [BrowserModule],
+    });
+
+    testBedInitialized = true;
+
+    await TestBed.compileComponents();
+
+    const fixture = TestBed.createComponent(component);
+
+    fixture.autoDetectChanges(true);
+
+    await fixture.whenRenderingDone();
+    await fixture.whenStable();
+
+    return fixture;
+}
+
+function createWrapperComponent<U>(template: string, componentClass: Type<U>): Type<WrapperComponent<U>> {
+    @Component({ template })
+    class HostComponent extends WrapperComponent<U> {
+
+        @ViewChild(componentClass) child!: U;
+
+    }
+
+    return HostComponent;
+}
+
+function getDefaultDeclarations(): unknown[] {
+    return [
+        TranslatePipeStub,
+        CoreExternalContentDirectiveStub,
+    ];
+}
+
+function getDefaultProviders(): unknown[] {
+    const platformMock = mock<Platform>({ is: () => false, ready: () => Promise.resolve(), resume: new Subject<void>() });
+    const networkMock = mock<Network>({ onChange: () => new Observable() });
+
+    return [
+        { provide: Platform, useValue: platformMock },
+        { provide: Network, useValue: networkMock },
+        { provide: CORE_SITE_SCHEMAS, multiple: true, useValue: [] },
+    ];
+}
+
+function resolveServiceInstanceFromTestBed(injectionToken: Exclude<ServiceInjectionToken, string>): Record<string, unknown> | null {
+    if (!testBedInitialized) {
+        return null;
+    }
+
+    return TestBed.inject(injectionToken) as Record<string, unknown> | null;
+}
+
+function createNewServiceInstance(injectionToken: Exclude<ServiceInjectionToken, string>): Record<string, unknown> | null {
+    try {
+        const constructor = injectionToken as { new (): Record<string, unknown> };
+
+        return new constructor();
+    } catch (e) {
+        return null;
+    }
+}
+
 export interface RenderConfig {
     declarations: unknown[];
     providers: unknown[];
@@ -31,8 +121,6 @@ export interface RenderConfig {
 
 export type WrapperComponentFixture<T> = ComponentFixture<WrapperComponent<T>>;
 
-const textUtils = new CoreTextUtilsProvider();
-
 export function mock<T>(instance?: Record<string, unknown>): T;
 export function mock<T>(methods: string[], instance?: Record<string, unknown>): T;
 export function mock<T>(
@@ -69,19 +157,36 @@ export function mockSingleton<T>(
 ): T;
 export function mockSingleton<T>(
     singleton: CoreSingletonProxy<T>,
-    methodsOrInstance: string[] | Record<string, unknown> = [],
-    instance: Record<string, unknown> = {},
+    methodsOrProperties: string[] | Record<string, unknown> = [],
+    properties: Record<string, unknown> = {},
 ): T {
-    instance = Array.isArray(methodsOrInstance) ? instance : methodsOrInstance;
+    properties = Array.isArray(methodsOrProperties) ? properties : methodsOrProperties;
 
-    const methods = Array.isArray(methodsOrInstance) ? methodsOrInstance : [];
+    const methods = Array.isArray(methodsOrProperties) ? methodsOrProperties : [];
+    const instance = getServiceInstance(singleton.injectionToken);
     const mockInstance = mock<T>(methods, instance);
 
+    Object.assign(mockInstance, properties);
+
     singleton.setInstance(mockInstance);
 
     return mockInstance;
 }
 
+export function resetTestingEnvironment(): void {
+    testBedInitialized = false;
+}
+
+export function getServiceInstance(injectionToken: ServiceInjectionToken): Record<string, unknown> {
+    if (typeof injectionToken === 'string') {
+        return {};
+    }
+
+    return resolveServiceInstanceFromTestBed(injectionToken)
+        ?? createNewServiceInstance(injectionToken)
+        ?? {};
+}
+
 export async function renderComponent<T>(component: Type<T>, config: Partial<RenderConfig> = {}): Promise<ComponentFixture<T>> {
     return renderAngularComponent(component, {
         declarations: [],
@@ -121,35 +226,3 @@ export async function renderWrapperComponent<T>(
 
     return renderTemplate(component, `<${tag} ${inputAttributes}></${tag}>`, config);
 }
-
-async function renderAngularComponent<T>(component: Type<T>, config: RenderConfig): Promise<ComponentFixture<T>> {
-    config.declarations.push(component);
-
-    TestBed.configureTestingModule({
-        declarations: config.declarations,
-        schemas: [CUSTOM_ELEMENTS_SCHEMA],
-        providers: config.providers,
-    });
-
-    await TestBed.compileComponents();
-
-    const fixture = TestBed.createComponent(component);
-
-    fixture.autoDetectChanges(true);
-
-    await fixture.whenRenderingDone();
-    await fixture.whenStable();
-
-    return fixture;
-}
-
-function createWrapperComponent<U>(template: string, componentClass: Type<U>): Type<WrapperComponent<U>> {
-    @Component({ template })
-    class HostComponent extends WrapperComponent<U> {
-
-        @ViewChild(componentClass) child!: U;
-
-    }
-
-    return HostComponent;
-}

From 9a5772c72b32466e74021a3d3eeb6e77ac1008e3 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 12 Aug 2021 12:16:49 +0200
Subject: [PATCH 0051/1008] MOBILE-3833 test: Implement pending tests

---
 src/core/components/iframe/iframe.ts          |   5 +-
 src/core/components/tests/iframe.test.ts      |  22 +++-
 src/core/components/tests/user-avatar.test.ts |  16 ++-
 src/core/directives/tests/format-text.test.ts | 111 ++++++++++++++----
 src/core/directives/tests/link.test.ts        |  27 ++++-
 5 files changed, 152 insertions(+), 29 deletions(-)

diff --git a/src/core/components/iframe/iframe.ts b/src/core/components/iframe/iframe.ts
index 3afcd69a2..48ee9a60c 100644
--- a/src/core/components/iframe/iframe.ts
+++ b/src/core/components/iframe/iframe.ts
@@ -32,6 +32,8 @@ import { DomSanitizer } from '@singletons';
 })
 export class CoreIframeComponent implements OnChanges {
 
+    static loadingTimeout = 15000;
+
     @ViewChild('iframe') iframe?: ElementRef;
     @Input() src?: string;
     @Input() iframeWidth?: string;
@@ -43,7 +45,6 @@ export class CoreIframeComponent implements OnChanges {
     safeUrl?: SafeResourceUrl;
     displayHelp = false;
 
-    protected readonly IFRAME_TIMEOUT = 15000;
     protected logger: CoreLogger;
     protected initialized = false;
 
@@ -89,7 +90,7 @@ export class CoreIframeComponent implements OnChanges {
         if (this.loading) {
             setTimeout(() => {
                 this.loading = false;
-            }, this.IFRAME_TIMEOUT);
+            }, CoreIframeComponent.loadingTimeout);
         }
     }
 
diff --git a/src/core/components/tests/iframe.test.ts b/src/core/components/tests/iframe.test.ts
index 2b80c90c3..75a0c754d 100644
--- a/src/core/components/tests/iframe.test.ts
+++ b/src/core/components/tests/iframe.test.ts
@@ -12,8 +12,28 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { CoreIframeComponent } from '@components/iframe/iframe';
+
+import { renderTemplate } from '@/testing/utils';
+
 describe('CoreIframeComponent', () => {
 
-    it.todo('should render');
+    it('should render', async () => {
+        // Arrange.
+        CoreIframeComponent.loadingTimeout = 0;
+
+        // Act.
+        const { nativeElement } = await renderTemplate(
+            CoreIframeComponent,
+            '<core-iframe src="https://moodle.org/"></core-iframe>',
+        );
+
+        // Assert.
+        expect(nativeElement.innerHTML.trim()).not.toHaveLength(0);
+
+        const iframe = nativeElement.querySelector('iframe');
+        expect(iframe).not.toBeNull();
+        expect(iframe.src).toEqual('https://moodle.org/');
+    });
 
 });
diff --git a/src/core/components/tests/user-avatar.test.ts b/src/core/components/tests/user-avatar.test.ts
index a8d933837..7b4c5f12a 100644
--- a/src/core/components/tests/user-avatar.test.ts
+++ b/src/core/components/tests/user-avatar.test.ts
@@ -12,8 +12,22 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { CoreUserAvatarComponent } from '@components/user-avatar/user-avatar';
+
+import { renderComponent } from '@/testing/utils';
+
 describe('CoreUserAvatarComponent', () => {
 
-    it.todo('should render');
+    it('should render', async () => {
+        // Act.
+        const { nativeElement } = await renderComponent(CoreUserAvatarComponent);
+
+        // Assert.
+        expect(nativeElement.innerHTML.trim()).not.toHaveLength(0);
+
+        const image = nativeElement.querySelector('img');
+        expect(image).not.toBeNull();
+        expect(image.src).toEqual(document.location.href + 'assets/img/user-avatar.png');
+    });
 
 });
diff --git a/src/core/directives/tests/format-text.test.ts b/src/core/directives/tests/format-text.test.ts
index 3bfc5afa8..aea7a5ded 100644
--- a/src/core/directives/tests/format-text.test.ts
+++ b/src/core/directives/tests/format-text.test.ts
@@ -13,34 +13,29 @@
 // limitations under the License.
 
 import { IonContent } from '@ionic/angular';
-import { NgZone } from '@angular/core';
 import Faker from 'faker';
 
 import { CoreConfig } from '@services/config';
-import { CoreDomUtils, CoreDomUtilsProvider } from '@services/utils/dom';
+import { CoreContentLinksHelper } from '@features/contentlinks/services/contentlinks-helper';
 import { CoreFilepool } from '@services/filepool';
+import { CoreFilter } from '@features/filter/services/filter';
+import { CoreFilterHelper } from '@features/filter/services/filter-helper';
 import { CoreFormatTextDirective } from '@directives/format-text';
 import { CoreSite } from '@classes/site';
 import { CoreSites } from '@services/sites';
-import { CoreUrlUtils, CoreUrlUtilsProvider } from '@services/utils/url';
-import { CoreUtils, CoreUtilsProvider } from '@services/utils/utils';
-import { Platform } from '@singletons';
+import { CoreUtils } from '@services/utils/utils';
 
-import { mock, mockSingleton, RenderConfig, renderWrapperComponent } from '@/testing/utils';
-import { CoreFilter } from '@features/filter/services/filter';
-import { CoreApp } from '@services/app';
+import { mock, mockSingleton, RenderConfig, renderTemplate, renderWrapperComponent } from '@/testing/utils';
 
 describe('CoreFormatTextDirective', () => {
 
     let config: Partial<RenderConfig>;
 
     beforeEach(() => {
-        mockSingleton(Platform, { ready: () => Promise.resolve() });
+        mockSingleton(CoreSites, { getSite: () => Promise.reject() });
         mockSingleton(CoreConfig, { get: (_, defaultValue) => defaultValue });
-
-        CoreDomUtils.setInstance(new CoreDomUtilsProvider());
-        CoreUrlUtils.setInstance(new CoreUrlUtilsProvider());
-        CoreUtils.setInstance(new CoreUtilsProvider(mock<NgZone>()));
+        mockSingleton(CoreFilter, { formatText: text => Promise.resolve(text) });
+        mockSingleton(CoreFilterHelper, { getFiltersAndFormatText: text => Promise.resolve({ text, filters: [] }) });
 
         config = {
             providers: [
@@ -53,9 +48,6 @@ describe('CoreFormatTextDirective', () => {
         // Arrange
         const sentence = Faker.lorem.sentence();
 
-        mockSingleton(CoreSites, { getSite: () => Promise.reject() });
-        mockSingleton(CoreFilter, { formatText: (text) => Promise.resolve(text) });
-
         // Act
         const fixture = await renderWrapperComponent(
             CoreFormatTextDirective,
@@ -70,6 +62,63 @@ describe('CoreFormatTextDirective', () => {
         expect(text.innerHTML).toEqual(sentence);
     });
 
+    it('should format text', async () => {
+        // Arrange
+        mockSingleton(CoreFilter, { formatText: () => 'Formatted text' });
+
+        // Act
+        const { nativeElement } = await renderTemplate(
+            CoreFormatTextDirective,
+            '<core-format-text text="Lorem ipsum dolor"></core-format-text>',
+        );
+
+        // Assert
+        const text = nativeElement.querySelector('core-format-text');
+        expect(text).not.toBeNull();
+        expect(text.textContent).toEqual('Formatted text');
+
+        expect(CoreFilter.formatText).toHaveBeenCalledTimes(1);
+        expect(CoreFilter.formatText).toHaveBeenCalledWith(
+            'Lorem ipsum dolor',
+            expect.anything(),
+            expect.anything(),
+            undefined,
+        );
+    });
+
+    it('should get filters from server and format text', async () => {
+        // Arrange
+        mockSingleton(CoreFilterHelper, {
+            getFiltersAndFormatText: () => Promise.resolve({
+                text: 'Formatted text',
+                filters: [],
+            }),
+        });
+
+        // Act
+        const { nativeElement } = await renderTemplate(CoreFormatTextDirective, `
+            <core-format-text
+                text="Lorem ipsum dolor"
+                contextLevel="course"
+                [contextInstanceId]="42"
+            ></core-format-text>
+        `);
+
+        // Assert
+        const text = nativeElement.querySelector('core-format-text');
+        expect(text).not.toBeNull();
+        expect(text.textContent).toEqual('Formatted text');
+
+        expect(CoreFilterHelper.getFiltersAndFormatText).toHaveBeenCalledTimes(1);
+        expect(CoreFilterHelper.getFiltersAndFormatText).toHaveBeenCalledWith(
+            'Lorem ipsum dolor',
+            'course',
+            42,
+            expect.anything(),
+            undefined,
+        );
+    });
+
     it('should use external-content directive on images', async () => {
         // Arrange
         const site = mock<CoreSite>({
@@ -86,11 +135,9 @@ describe('CoreFormatTextDirective', () => {
             getSite: () => Promise.resolve(site),
             getCurrentSite: () => Promise.resolve(site),
         });
-        mockSingleton(CoreFilter, { formatText: (text) => Promise.resolve(text) });
-        mockSingleton(CoreApp, { isMobile: () => false });
 
         // Act
-        const fixture = await renderWrapperComponent(
+        const { nativeElement } = await renderWrapperComponent(
             CoreFormatTextDirective,
             'core-format-text',
             { text: '<img src="https://image-url">', siteId: site.getId() },
@@ -98,7 +145,7 @@ describe('CoreFormatTextDirective', () => {
         );
 
         // Assert
-        const image = fixture.nativeElement.querySelector('img');
+        const image = nativeElement.querySelector('img');
         expect(image).not.toBeNull();
         expect(image.src).toEqual('file://local-path/');
 
@@ -106,10 +153,28 @@ describe('CoreFormatTextDirective', () => {
         expect(CoreFilepool.getSrcByUrl).toHaveBeenCalledTimes(1);
     });
 
-    it.todo('should format text');
+    it('should use link directive on anchors', async () => {
+        // Arrange
+        mockSingleton(CoreContentLinksHelper, { handleLink: () => Promise.resolve(true) });
 
-    it.todo('should get filters from server and format text');
+        // Act
+        const { nativeElement } = await renderWrapperComponent(
+            CoreFormatTextDirective,
+            'core-format-text',
+            { text: '<a href="https://anchor-url/">Link</a>' },
+        );
+        const anchor = nativeElement.querySelector('a');
 
-    it.todo('should use link directive on anchors');
+        anchor.click();
+
+        // Assert
+        expect(CoreContentLinksHelper.handleLink).toHaveBeenCalledTimes(1);
+        expect(CoreContentLinksHelper.handleLink).toHaveBeenCalledWith(
+            'https://anchor-url/',
+            undefined,
+            expect.anything(),
+            expect.anything(),
+        );
+    });
 
 });
diff --git a/src/core/directives/tests/link.test.ts b/src/core/directives/tests/link.test.ts
index 00bdbab0f..891df6111 100644
--- a/src/core/directives/tests/link.test.ts
+++ b/src/core/directives/tests/link.test.ts
@@ -13,8 +13,9 @@
 // limitations under the License.
 
 import { CoreLinkDirective } from '@directives/link';
+import { CoreContentLinksHelper } from '@features/contentlinks/services/contentlinks-helper';
 
-import { renderTemplate } from '@/testing/utils';
+import { mockSingleton, renderTemplate } from '@/testing/utils';
 
 describe('CoreLinkDirective', () => {
 
@@ -33,6 +34,28 @@ describe('CoreLinkDirective', () => {
         expect(anchor.href).toEqual('https://moodle.org/');
     });
 
-    it.todo('should capture clicks');
+    it('should capture clicks', async () => {
+        // Arrange
+        mockSingleton(CoreContentLinksHelper, { handleLink: () => Promise.resolve(true) });
+
+        // Act
+        const { nativeElement } = await renderTemplate(
+            CoreLinkDirective,
+            '<a href="https://moodle.org/" core-link [capture]="true">Link</a>',
+        );
+
+        const anchor = nativeElement.querySelector('a');
+
+        anchor.click();
+
+        // Assert
+        expect(CoreContentLinksHelper.handleLink).toHaveBeenCalledTimes(1);
+        expect(CoreContentLinksHelper.handleLink).toHaveBeenCalledWith(
+            'https://moodle.org/',
+            undefined,
+            expect.anything(),
+            expect.anything(),
+        );
+    });
 
 });

From ae351a49b2ab9b6ea6f2abe76e753152dde322f4 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 12 Aug 2021 13:08:19 +0200
Subject: [PATCH 0052/1008] MOBILE-3833 test: Set up default singletons

---
 src/testing/utils.ts | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/testing/utils.ts b/src/testing/utils.ts
index 6b7700f9e..a6ec2613b 100644
--- a/src/testing/utils.ts
+++ b/src/testing/utils.ts
@@ -15,12 +15,10 @@
 import { AbstractType, Component, CUSTOM_ELEMENTS_SCHEMA, Type, ViewChild } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { Network } from '@ionic-native/network/ngx';
 import { Observable, Subject } from 'rxjs';
-import { Platform } from '@ionic/angular';
 
 import { CORE_SITE_SCHEMAS } from '@services/sites';
-import { CoreSingletonProxy } from '@singletons';
+import { CoreSingletonProxy, Network, Platform } from '@singletons';
 import { CoreTextUtilsProvider } from '@services/utils/text';
 
 import { TranslatePipeStub } from './stubs/pipes/translate';
@@ -36,6 +34,10 @@ type ServiceInjectionToken = AbstractType<unknown> | Type<unknown> | string;
 
 let testBedInitialized = false;
 const textUtils = new CoreTextUtilsProvider();
+const DEFAULT_SERVICE_SINGLETON_MOCKS: [CoreSingletonProxy, Record<string, unknown>][] = [
+    [Platform, mock({ is: () => false, ready: () => Promise.resolve(), resume: new Subject<void>() })],
+    [Network, { onChange: () => new Observable() }],
+];
 
 async function renderAngularComponent<T>(component: Type<T>, config: RenderConfig): Promise<ComponentFixture<T>> {
     config.declarations.push(component);
@@ -86,12 +88,15 @@ function getDefaultDeclarations(): unknown[] {
 }
 
 function getDefaultProviders(): unknown[] {
-    const platformMock = mock<Platform>({ is: () => false, ready: () => Promise.resolve(), resume: new Subject<void>() });
-    const networkMock = mock<Network>({ onChange: () => new Observable() });
+    const serviceProviders = DEFAULT_SERVICE_SINGLETON_MOCKS.map(
+        ([singleton, mockInstance]) => ({
+            provide: singleton.injectionToken,
+            useValue: mockInstance,
+        }),
+    );
 
     return [
-        { provide: Platform, useValue: platformMock },
-        { provide: Network, useValue: networkMock },
+        ...serviceProviders,
         { provide: CORE_SITE_SCHEMAS, multiple: true, useValue: [] },
     ];
 }
@@ -175,6 +180,10 @@ export function mockSingleton<T>(
 
 export function resetTestingEnvironment(): void {
     testBedInitialized = false;
+
+    for (const [singleton, mockInstance] of DEFAULT_SERVICE_SINGLETON_MOCKS) {
+        mockSingleton(singleton, mockInstance);
+    }
 }
 
 export function getServiceInstance(injectionToken: ServiceInjectionToken): Record<string, unknown> {

From 8a5ccf1d7184f79fe793a3f964c110a2fda67856 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 12 Aug 2021 13:26:46 +0200
Subject: [PATCH 0053/1008] MOBILE-3833 core: Extract constructor initializers

---
 src/addons/mod/lti/lti.module.ts              |  3 +-
 src/addons/mod/lti/services/lti-helper.ts     | 12 ++++---
 .../settings/services/settings-helper.ts      |  7 +++-
 src/core/features/settings/settings.module.ts | 12 ++-----
 src/core/initializers/initialize-services.ts  | 25 +++++++++++++
 src/core/initializers/inject-ios-scripts.ts   | 26 ++++++++++++++
 src/core/initializers/watch-network.ts        | 24 +++++++++++++
 src/core/services/cron.ts                     | 14 ++------
 src/core/services/filepool.ts                 | 36 +++++++++----------
 src/core/services/lang.ts                     | 10 +++---
 src/core/services/local-notifications.ts      | 30 ++++++++--------
 src/core/services/utils/iframe.ts             |  9 ++---
 12 files changed, 133 insertions(+), 75 deletions(-)
 create mode 100644 src/core/initializers/initialize-services.ts
 create mode 100644 src/core/initializers/inject-ios-scripts.ts
 create mode 100644 src/core/initializers/watch-network.ts

diff --git a/src/addons/mod/lti/lti.module.ts b/src/addons/mod/lti/lti.module.ts
index 6c6b08390..8b9c43fc0 100644
--- a/src/addons/mod/lti/lti.module.ts
+++ b/src/addons/mod/lti/lti.module.ts
@@ -24,7 +24,7 @@ import { AddonModLtiListLinkHandler } from './services/handlers/list-link';
 import { AddonModLtiModuleHandler, AddonModLtiModuleHandlerService } from './services/handlers/module';
 import { AddonModLtiPrefetchHandler } from './services/handlers/prefetch';
 import { AddonModLtiProvider } from './services/lti';
-import { AddonModLtiHelperProvider } from './services/lti-helper';
+import { AddonModLtiHelper, AddonModLtiHelperProvider } from './services/lti-helper';
 
 export const ADDON_MOD_LTI_SERVICES: Type<unknown>[] = [
     AddonModLtiProvider,
@@ -44,6 +44,7 @@ const routes: Routes = [
         AddonModLtiComponentsModule,
     ],
     providers: [
+        { provide: APP_INITIALIZER, multi: true, useValue: () => AddonModLtiHelper.watchPendingCompletions() },
         {
             provide: APP_INITIALIZER,
             multi: true,
diff --git a/src/addons/mod/lti/services/lti-helper.ts b/src/addons/mod/lti/services/lti-helper.ts
index 905252c24..ae3d56fda 100644
--- a/src/addons/mod/lti/services/lti-helper.ts
+++ b/src/addons/mod/lti/services/lti-helper.ts
@@ -31,6 +31,13 @@ export class AddonModLtiHelperProvider {
     protected pendingCheckCompletion: {[moduleId: string]: {courseId: number; module: CoreCourseModule}} = {};
 
     constructor() {
+        // Clear pending completion on logout.
+        CoreEvents.on(CoreEvents.LOGOUT, () => {
+            this.pendingCheckCompletion = {};
+        });
+    }
+
+    watchPendingCompletions(): void {
         Platform.resume.subscribe(() => {
             // User went back to the app, check pending completions.
             for (const moduleId in this.pendingCheckCompletion) {
@@ -39,11 +46,6 @@ export class AddonModLtiHelperProvider {
                 CoreCourse.checkModuleCompletion(data.courseId, data.module.completiondata);
             }
         });
-
-        // Clear pending completion on logout.
-        CoreEvents.on(CoreEvents.LOGOUT, () => {
-            this.pendingCheckCompletion = {};
-        });
     }
 
     /**
diff --git a/src/core/features/settings/services/settings-helper.ts b/src/core/features/settings/services/settings-helper.ts
index 94fddfc40..2d68d2330 100644
--- a/src/core/features/settings/services/settings-helper.ts
+++ b/src/core/features/settings/services/settings-helper.ts
@@ -65,7 +65,7 @@ export class CoreSettingsHelperProvider {
     protected colorSchemes: CoreColorScheme[] = [];
     protected currentColorScheme = CoreColorScheme.LIGHT;
 
-    constructor() {
+    async initialize(): Promise<void> {
         this.prefersDark = window.matchMedia('(prefers-color-scheme: dark)');
 
         if (!CoreConstants.CONFIG.forceColorScheme) {
@@ -94,6 +94,11 @@ export class CoreSettingsHelperProvider {
 
         // Listen for changes to the prefers-color-scheme media query.
         this.prefersDark.addEventListener && this.prefersDark.addEventListener('change', this.toggleDarkModeListener.bind(this));
+
+        // Init zoom level.
+        await this.upgradeZoomLevel();
+
+        this.initDomSettings();
     }
 
     /**
diff --git a/src/core/features/settings/settings.module.ts b/src/core/features/settings/settings.module.ts
index 28db5b75b..e94d2072b 100644
--- a/src/core/features/settings/settings.module.ts
+++ b/src/core/features/settings/settings.module.ts
@@ -17,7 +17,7 @@ import { Routes } from '@angular/router';
 
 import { AppRoutingModule } from '@/app/app-routing.module';
 import { CoreMainMenuTabRoutingModule } from '@features/mainmenu/mainmenu-tab-routing.module';
-import { CoreSettingsHelperProvider } from './services/settings-helper';
+import { CoreSettingsHelper, CoreSettingsHelperProvider } from './services/settings-helper';
 import { CoreSettingsDelegateService } from './services/settings-delegate';
 
 export const CORE_SETTINGS_SERVICES: Type<unknown>[] = [
@@ -49,15 +49,7 @@ const mainMenuMoreRoutes: Routes = [
         CoreMainMenuTabRoutingModule.forChild(mainMenuMoreRoutes),
     ],
     providers: [
-        {
-            provide: APP_INITIALIZER,
-            multi: true,
-            deps: [CoreSettingsHelperProvider],
-            useFactory: (helper: CoreSettingsHelperProvider) => async () => {
-                await helper.upgradeZoomLevel();
-                helper.initDomSettings();
-            },
-        },
+        { provide: APP_INITIALIZER, multi: true, useValue: () => CoreSettingsHelper.initialize() },
     ],
 })
 export class CoreSettingsModule {}
diff --git a/src/core/initializers/initialize-services.ts b/src/core/initializers/initialize-services.ts
new file mode 100644
index 000000000..c07eeafff
--- /dev/null
+++ b/src/core/initializers/initialize-services.ts
@@ -0,0 +1,25 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreFilepool } from '@services/filepool';
+import { CoreLang } from '@services/lang';
+import { CoreLocalNotifications } from '@services/local-notifications';
+
+export default async function(): Promise<void> {
+    await Promise.all([
+        CoreFilepool.initialize(),
+        CoreLang.initialize(),
+        CoreLocalNotifications.initialize(),
+    ]);
+}
diff --git a/src/core/initializers/inject-ios-scripts.ts b/src/core/initializers/inject-ios-scripts.ts
new file mode 100644
index 000000000..a1a728bb2
--- /dev/null
+++ b/src/core/initializers/inject-ios-scripts.ts
@@ -0,0 +1,26 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreApp } from '@services/app';
+import { CoreIframeUtils } from '@services/utils/iframe';
+import { Platform } from '@singletons';
+
+export default async function(): Promise<void> {
+    if (!CoreApp.isIOS() || !('WKUserScript' in window)) {
+        return;
+    }
+
+    await Platform.ready();
+    await CoreIframeUtils.injectiOSScripts(window);
+}
diff --git a/src/core/initializers/watch-network.ts b/src/core/initializers/watch-network.ts
new file mode 100644
index 000000000..ee867a42e
--- /dev/null
+++ b/src/core/initializers/watch-network.ts
@@ -0,0 +1,24 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreCronDelegate } from '@services/cron';
+import { Network, NgZone } from '@singletons';
+
+export default function(): void {
+    // When the app is re-connected, start network handlers that were stopped.
+    Network.onConnect().subscribe(() => {
+        // Execute the callback in the Angular zone, so change detection doesn't stop working.
+        NgZone.run(() => CoreCronDelegate.startNetworkHandlers());
+    });
+}
diff --git a/src/core/services/cron.ts b/src/core/services/cron.ts
index dd39cd04d..76a043947 100644
--- a/src/core/services/cron.ts
+++ b/src/core/services/cron.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Injectable, NgZone } from '@angular/core';
+import { Injectable } from '@angular/core';
 
 import { CoreApp } from '@services/app';
 import { CoreConfig } from '@services/config';
@@ -21,7 +21,7 @@ import { CoreConstants } from '@/core/constants';
 import { SQLiteDB } from '@classes/sqlitedb';
 import { CoreError } from '@classes/errors/error';
 
-import { makeSingleton, Network } from '@singletons';
+import { makeSingleton } from '@singletons';
 import { CoreLogger } from '@singletons/logger';
 import { APP_SCHEMA, CRON_TABLE_NAME, CronDBEntry } from '@services/database/cron';
 
@@ -44,17 +44,9 @@ export class CoreCronDelegateService {
     protected appDB: Promise<SQLiteDB>;
     protected resolveAppDB!: (appDB: SQLiteDB) => void;
 
-    constructor(zone: NgZone) {
+    constructor() {
         this.appDB = new Promise(resolve => this.resolveAppDB = resolve);
         this.logger = CoreLogger.getInstance('CoreCronDelegate');
-
-        // When the app is re-connected, start network handlers that were stopped.
-        Network.onConnect().subscribe(() => {
-            // Execute the callback in the Angular zone, so change detection doesn't stop working.
-            zone.run(() => {
-                this.startNetworkHandlers();
-            });
-        });
     }
 
     /**
diff --git a/src/core/services/filepool.ts b/src/core/services/filepool.ts
index 3cc4c2854..275785a4a 100644
--- a/src/core/services/filepool.ts
+++ b/src/core/services/filepool.ts
@@ -97,8 +97,24 @@ export class CoreFilepoolProvider {
     constructor() {
         this.appDB = new Promise(resolve => this.resolveAppDB = resolve);
         this.logger = CoreLogger.getInstance('CoreFilepoolProvider');
+    }
 
-        this.init();
+    /**
+     * Initialize queue.
+     */
+    async initialize(): Promise<void> {
+        // Waiting for the app to be ready to start processing the queue.
+        await ApplicationInit.donePromise;
+
+        this.checkQueueProcessing();
+
+        // Start queue when device goes online.
+        Network.onConnect().subscribe(() => {
+            // Execute the callback in the Angular zone, so change detection doesn't stop working.
+            NgZone.run(() => {
+                this.checkQueueProcessing();
+            });
+        });
     }
 
     /**
@@ -114,24 +130,6 @@ export class CoreFilepoolProvider {
         this.resolveAppDB(CoreApp.getDB());
     }
 
-    /**
-     * Init some properties.
-     */
-    protected async init(): Promise<void> {
-        // Waiting for the app to be ready to start processing the queue.
-        await ApplicationInit.donePromise;
-
-        this.checkQueueProcessing();
-
-        // Start queue when device goes online.
-        Network.onConnect().subscribe(() => {
-            // Execute the callback in the Angular zone, so change detection doesn't stop working.
-            NgZone.run(() => {
-                this.checkQueueProcessing();
-            });
-        });
-    }
-
     /**
      * Link a file with a component.
      *
diff --git a/src/core/services/lang.ts b/src/core/services/lang.ts
index 7d9f54ebe..c14cd0054 100644
--- a/src/core/services/lang.ts
+++ b/src/core/services/lang.ts
@@ -37,13 +37,11 @@ export class CoreLangProvider {
     protected customStringsRaw?: string;
     protected sitePluginsStrings: CoreLanguageObject = {}; // Strings defined by site plugins.
 
-    constructor() {
+    async initialize(): Promise<void> {
         // Set fallback language and language to use until the app determines the right language to use.
         Translate.setDefaultLang(this.fallbackLanguage);
         Translate.use(this.defaultLanguage);
 
-        this.initLanguage();
-
         Translate.onLangChange.subscribe((event: LangChangeEvent) => {
             document.documentElement.setAttribute('lang', event.lang);
 
@@ -51,12 +49,14 @@ export class CoreLangProvider {
             dir = dir.indexOf('rtl') != -1 ? 'rtl' : 'ltr';
             document.documentElement.setAttribute('dir', dir);
         });
+
+        await this.initializeCurrentLanguage();
     }
 
     /**
      * Init language.
      */
-    protected async initLanguage(): Promise<void> {
+    protected async initializeCurrentLanguage(): Promise<void> {
         await Platform.ready();
 
         let language: string;
@@ -68,7 +68,7 @@ export class CoreLangProvider {
             language = await this.getCurrentLanguage();
         }
 
-        return this.changeCurrentLanguage(language);
+        await this.changeCurrentLanguage(language);
     }
 
     /**
diff --git a/src/core/services/local-notifications.ts b/src/core/services/local-notifications.ts
index df0869718..c6547f8fe 100644
--- a/src/core/services/local-notifications.ts
+++ b/src/core/services/local-notifications.ts
@@ -62,27 +62,12 @@ export class CoreLocalNotificationsProvider {
         this.appDB = new Promise(resolve => this.resolveAppDB = resolve);
         this.logger = CoreLogger.getInstance('CoreLocalNotificationsProvider');
         this.queueRunner = new CoreQueueRunner(10);
-
-        this.init();
-    }
-
-    /**
-     * Initialize database.
-     */
-    async initializeDatabase(): Promise<void> {
-        try {
-            await CoreApp.createTablesFromSchema(APP_SCHEMA);
-        } catch (e) {
-            // Ignore errors.
-        }
-
-        this.resolveAppDB(CoreApp.getDB());
     }
 
     /**
      * Init some properties.
      */
-    protected async init(): Promise<void> {
+    async initialize(): Promise<void> {
         await Platform.ready();
 
         if (!this.isAvailable()) {
@@ -131,6 +116,19 @@ export class CoreLocalNotificationsProvider {
         });
     }
 
+    /**
+     * Initialize database.
+     */
+    async initializeDatabase(): Promise<void> {
+        try {
+            await CoreApp.createTablesFromSchema(APP_SCHEMA);
+        } catch (e) {
+            // Ignore errors.
+        }
+
+        this.resolveAppDB(CoreApp.getDB());
+    }
+
     /**
      * Cancel a local notification.
      *
diff --git a/src/core/services/utils/iframe.ts b/src/core/services/utils/iframe.ts
index b9bb6c531..99f6e15bf 100644
--- a/src/core/services/utils/iframe.ts
+++ b/src/core/services/utils/iframe.ts
@@ -25,7 +25,7 @@ import { CoreTextUtils } from '@services/utils/text';
 import { CoreUrlUtils } from '@services/utils/url';
 import { CoreUtils, PromiseDefer } from '@services/utils/utils';
 
-import { makeSingleton, Network, Platform, NgZone, Translate, Diagnostic } from '@singletons';
+import { makeSingleton, Network, NgZone, Translate, Diagnostic } from '@singletons';
 import { CoreLogger } from '@singletons/logger';
 import { CoreUrl } from '@singletons/url';
 import { CoreWindow } from '@singletons/window';
@@ -52,11 +52,6 @@ export class CoreIframeUtilsProvider {
 
     constructor() {
         this.logger = CoreLogger.getInstance('CoreUtilsProvider');
-
-        if (CoreApp.isIOS() && 'WKUserScript' in window) {
-            // eslint-disable-next-line promise/catch-or-return
-            Platform.ready().then(() => this.injectiOSScripts(window));
-        }
     }
 
     /**
@@ -558,7 +553,7 @@ export class CoreIframeUtilsProvider {
      *
      * @param userScriptWindow Window.
      */
-    private injectiOSScripts(userScriptWindow: WKUserScriptWindow) {
+    injectiOSScripts(userScriptWindow: WKUserScriptWindow): void {
         const wwwPath = CoreFile.getWWWAbsolutePath();
         const linksPath = CoreTextUtils.concatenatePaths(wwwPath, 'assets/js/iframe-treat-links.js');
 

From 3e44a3c17415e94137c94f680efe217076af37a5 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 12 Aug 2021 14:03:13 +0200
Subject: [PATCH 0054/1008] MOBILE-3833 chore: Clean up initializers

---
 src/addons/badges/badges.module.ts                          | 3 +--
 src/addons/blog/blog.module.ts                              | 3 +--
 src/addons/calendar/calendar.module.ts                      | 3 +--
 src/addons/competency/competency.module.ts                  | 3 +--
 src/addons/coursecompletion/coursecompletion.module.ts      | 3 +--
 src/addons/filter/activitynames/activitynames.module.ts     | 3 +--
 src/addons/filter/algebra/algebra.module.ts                 | 3 +--
 src/addons/filter/censor/censor.module.ts                   | 3 +--
 src/addons/filter/data/data.module.ts                       | 3 +--
 src/addons/filter/displayh5p/displayh5p.module.ts           | 3 +--
 src/addons/filter/emailprotect/emailprotect.module.ts       | 3 +--
 src/addons/filter/emoticon/emoticon.module.ts               | 3 +--
 src/addons/filter/glossary/glossary.module.ts               | 3 +--
 src/addons/filter/mathjaxloader/mathjaxloader.module.ts     | 3 +--
 src/addons/filter/mediaplugin/mediaplugin.module.ts         | 3 +--
 src/addons/filter/multilang/multilang.module.ts             | 3 +--
 src/addons/filter/tex/tex.module.ts                         | 3 +--
 src/addons/filter/tidy/tidy.module.ts                       | 3 +--
 src/addons/filter/urltolink/urltolink.module.ts             | 3 +--
 src/addons/messageoutput/airnotifier/airnotifier.module.ts  | 3 +--
 src/addons/messages/messages.module.ts                      | 3 +--
 src/addons/mod/assign/assign.module.ts                      | 3 +--
 src/addons/mod/assign/feedback/comments/comments.module.ts  | 3 +--
 src/addons/mod/assign/feedback/editpdf/editpdf.module.ts    | 3 +--
 src/addons/mod/assign/feedback/file/file.module.ts          | 3 +--
 .../mod/assign/submission/comments/comments.module.ts       | 3 +--
 src/addons/mod/assign/submission/file/file.module.ts        | 3 +--
 .../mod/assign/submission/onlinetext/onlinetext.module.ts   | 3 +--
 src/addons/mod/book/book.module.ts                          | 3 +--
 src/addons/mod/chat/chat.module.ts                          | 3 +--
 src/addons/mod/choice/choice.module.ts                      | 3 +--
 src/addons/mod/data/data.module.ts                          | 3 +--
 src/addons/mod/data/fields/checkbox/checkbox.module.ts      | 3 +--
 src/addons/mod/data/fields/date/date.module.ts              | 3 +--
 src/addons/mod/data/fields/file/file.module.ts              | 3 +--
 src/addons/mod/data/fields/latlong/latlong.module.ts        | 3 +--
 src/addons/mod/data/fields/menu/menu.module.ts              | 3 +--
 src/addons/mod/data/fields/multimenu/multimenu.module.ts    | 3 +--
 src/addons/mod/data/fields/number/number.module.ts          | 3 +--
 src/addons/mod/data/fields/picture/picture.module.ts        | 3 +--
 .../mod/data/fields/radiobutton/radiobutton.module.ts       | 3 +--
 src/addons/mod/data/fields/text/text.module.ts              | 3 +--
 src/addons/mod/data/fields/textarea/textarea.module.ts      | 3 +--
 src/addons/mod/data/fields/url/url.module.ts                | 3 +--
 src/addons/mod/feedback/feedback.module.ts                  | 3 +--
 src/addons/mod/folder/folder.module.ts                      | 3 +--
 src/addons/mod/glossary/glossary.module.ts                  | 3 +--
 src/addons/mod/h5pactivity/h5pactivity.module.ts            | 3 +--
 src/addons/mod/imscp/imscp.module.ts                        | 3 +--
 src/addons/mod/label/label.module.ts                        | 3 +--
 src/addons/mod/lesson/lesson.module.ts                      | 3 +--
 src/addons/mod/lti/lti.module.ts                            | 6 +++---
 src/addons/mod/page/page.module.ts                          | 3 +--
 .../delaybetweenattempts/delaybetweenattempts.module.ts     | 3 +--
 .../mod/quiz/accessrules/ipaddress/ipaddress.module.ts      | 3 +--
 .../mod/quiz/accessrules/numattempts/numattempts.module.ts  | 3 +--
 .../accessrules/offlineattempts/offlineattempts.module.ts   | 3 +--
 .../quiz/accessrules/openclosedate/openclosedate.module.ts  | 3 +--
 src/addons/mod/quiz/accessrules/password/password.module.ts | 3 +--
 .../mod/quiz/accessrules/safebrowser/safebrowser.module.ts  | 3 +--
 .../quiz/accessrules/securewindow/securewindow.module.ts    | 3 +--
 .../mod/quiz/accessrules/timelimit/timelimit.module.ts      | 3 +--
 src/addons/mod/quiz/quiz.module.ts                          | 3 +--
 src/addons/mod/resource/resource.module.ts                  | 3 +--
 src/addons/mod/scorm/scorm.module.ts                        | 3 +--
 src/addons/mod/survey/survey.module.ts                      | 3 +--
 src/addons/mod/url/url.module.ts                            | 3 +--
 src/addons/mod/wiki/wiki.module.ts                          | 3 +--
 .../workshop/assessment/accumulative/accumulative.module.ts | 3 +--
 .../mod/workshop/assessment/comments/comments.module.ts     | 3 +--
 .../mod/workshop/assessment/numerrors/numerrors.module.ts   | 3 +--
 src/addons/mod/workshop/assessment/rubric/rubric.module.ts  | 3 +--
 src/addons/mod/workshop/workshop.module.ts                  | 3 +--
 src/addons/notes/notes.module.ts                            | 3 +--
 src/addons/notifications/notifications.module.ts            | 3 +--
 src/addons/privatefiles/privatefiles.module.ts              | 3 +--
 src/addons/qbehaviour/adaptive/adaptive.module.ts           | 3 +--
 .../adaptivenopenalty/adaptivenopenalty.module.ts           | 3 +--
 src/addons/qbehaviour/deferredcbm/deferredcbm.module.ts     | 3 +--
 .../qbehaviour/deferredfeedback/deferredfeedback.module.ts  | 3 +--
 src/addons/qbehaviour/immediatecbm/immediatecbm.module.ts   | 3 +--
 .../immediatefeedback/immediatefeedback.module.ts           | 3 +--
 .../qbehaviour/informationitem/informationitem.module.ts    | 3 +--
 src/addons/qbehaviour/interactive/interactive.module.ts     | 3 +--
 .../interactivecountback/interactivecountback.module.ts     | 3 +--
 src/addons/qbehaviour/manualgraded/manualgraded.module.ts   | 3 +--
 src/addons/qtype/calculated/calculated.module.ts            | 3 +--
 src/addons/qtype/calculatedmulti/calculatedmulti.module.ts  | 3 +--
 .../qtype/calculatedsimple/calculatedsimple.module.ts       | 3 +--
 src/addons/qtype/ddimageortext/ddimageortext.module.ts      | 3 +--
 src/addons/qtype/ddmarker/ddmarker.module.ts                | 3 +--
 src/addons/qtype/ddwtos/ddwtos.module.ts                    | 3 +--
 src/addons/qtype/description/description.module.ts          | 3 +--
 src/addons/qtype/essay/essay.module.ts                      | 3 +--
 src/addons/qtype/gapselect/gapselect.module.ts              | 3 +--
 src/addons/qtype/match/match.module.ts                      | 3 +--
 src/addons/qtype/multianswer/multianswer.module.ts          | 3 +--
 src/addons/qtype/multichoice/multichoice.module.ts          | 3 +--
 src/addons/qtype/numerical/numerical.module.ts              | 3 +--
 src/addons/qtype/randomsamatch/randomsamatch.module.ts      | 3 +--
 src/addons/qtype/shortanswer/shortanswer.module.ts          | 3 +--
 src/addons/qtype/truefalse/truefalse.module.ts              | 3 +--
 src/addons/remotethemes/remotethemes.module.ts              | 3 +--
 src/addons/storagemanager/storagemanager.module.ts          | 3 +--
 src/addons/userprofilefield/checkbox/checkbox.module.ts     | 6 +++---
 src/addons/userprofilefield/datetime/datetime.module.ts     | 6 +++---
 src/addons/userprofilefield/menu/menu.module.ts             | 6 +++---
 src/addons/userprofilefield/text/text.module.ts             | 6 +++---
 src/addons/userprofilefield/textarea/textarea.module.ts     | 6 +++---
 src/app/app.module.ts                                       | 5 ++---
 src/core/features/course/course.module.ts                   | 3 +--
 .../course/format/singleactivity/singleactivity.module.ts   | 3 +--
 src/core/features/course/format/social/social.module.ts     | 3 +--
 src/core/features/course/format/topics/topics.module.ts     | 3 +--
 src/core/features/course/format/weeks/weeks.module.ts       | 3 +--
 src/core/features/courses/courses.module.ts                 | 3 +--
 src/core/features/fileuploader/fileuploader.module.ts       | 3 +--
 src/core/features/grades/grades.module.ts                   | 1 -
 src/core/features/h5p/h5p.module.ts                         | 3 +--
 src/core/features/login/login.module.ts                     | 3 +--
 src/core/features/mainmenu/mainmenu.module.ts               | 3 +--
 .../features/pushnotifications/pushnotifications.module.ts  | 3 +--
 src/core/features/sharedfiles/sharedfiles.module.ts         | 2 +-
 src/core/features/sitehome/sitehome.module.ts               | 3 +--
 src/core/features/user/user.module.ts                       | 3 +--
 125 files changed, 137 insertions(+), 255 deletions(-)

diff --git a/src/addons/badges/badges.module.ts b/src/addons/badges/badges.module.ts
index de0fd76b9..ed210a21e 100644
--- a/src/addons/badges/badges.module.ts
+++ b/src/addons/badges/badges.module.ts
@@ -44,8 +44,7 @@ const mainMenuRoutes: Routes = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreContentLinksDelegate.registerHandler(AddonBadgesMyBadgesLinkHandler.instance);
                 CoreContentLinksDelegate.registerHandler(AddonBadgesBadgeLinkHandler.instance);
                 CoreUserDelegate.registerHandler(AddonBadgesUserHandler.instance);
diff --git a/src/addons/blog/blog.module.ts b/src/addons/blog/blog.module.ts
index c0fc7aa94..f933599fb 100644
--- a/src/addons/blog/blog.module.ts
+++ b/src/addons/blog/blog.module.ts
@@ -51,8 +51,7 @@ const routes: Routes = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => async () => {
+            useValue: () => {
                 CoreContentLinksDelegate.registerHandler(AddonBlogIndexLinkHandler.instance);
                 CoreMainMenuDelegate.registerHandler(AddonBlogMainMenuHandler.instance);
                 CoreUserDelegate.registerHandler(AddonBlogUserHandler.instance);
diff --git a/src/addons/calendar/calendar.module.ts b/src/addons/calendar/calendar.module.ts
index 0017176f0..3f4020e31 100644
--- a/src/addons/calendar/calendar.module.ts
+++ b/src/addons/calendar/calendar.module.ts
@@ -63,8 +63,7 @@ const mainMenuChildrenRoutes: Routes = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => async () => {
+            useValue: async () => {
                 CoreContentLinksDelegate.registerHandler(AddonCalendarViewLinkHandler.instance);
                 CoreMainMenuDelegate.registerHandler(AddonCalendarMainMenuHandler.instance);
                 CoreCronDelegate.register(AddonCalendarSyncCronHandler.instance);
diff --git a/src/addons/competency/competency.module.ts b/src/addons/competency/competency.module.ts
index e8a96e9e8..9e08180da 100644
--- a/src/addons/competency/competency.module.ts
+++ b/src/addons/competency/competency.module.ts
@@ -64,8 +64,7 @@ const courseIndexRoutes: Routes = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => async () => {
+            useValue: () => {
                 CoreContentLinksDelegate.registerHandler(AddonCompetencyCompetencyLinkHandler.instance);
                 CoreContentLinksDelegate.registerHandler(AddonCompetencyPlanLinkHandler.instance);
                 CoreContentLinksDelegate.registerHandler(AddonCompetencyPlansLinkHandler.instance);
diff --git a/src/addons/coursecompletion/coursecompletion.module.ts b/src/addons/coursecompletion/coursecompletion.module.ts
index 024980c8b..63fea73a7 100644
--- a/src/addons/coursecompletion/coursecompletion.module.ts
+++ b/src/addons/coursecompletion/coursecompletion.module.ts
@@ -42,8 +42,7 @@ const routes: Routes = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => async () => {
+            useValue: () => {
                 CoreUserDelegate.registerHandler(AddonCourseCompletionUserHandler.instance);
                 CoreCourseOptionsDelegate.registerHandler(AddonCourseCompletionCourseOptionHandler.instance);
             },
diff --git a/src/addons/filter/activitynames/activitynames.module.ts b/src/addons/filter/activitynames/activitynames.module.ts
index 1aa7ac805..48c4b1e43 100644
--- a/src/addons/filter/activitynames/activitynames.module.ts
+++ b/src/addons/filter/activitynames/activitynames.module.ts
@@ -26,8 +26,7 @@ import { AddonFilterActivityNamesHandler } from './services/handlers/activitynam
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => CoreFilterDelegate.registerHandler(AddonFilterActivityNamesHandler.instance),
+            useValue: () => CoreFilterDelegate.registerHandler(AddonFilterActivityNamesHandler.instance),
         },
     ],
 })
diff --git a/src/addons/filter/algebra/algebra.module.ts b/src/addons/filter/algebra/algebra.module.ts
index 8fe37b21d..bf961e966 100644
--- a/src/addons/filter/algebra/algebra.module.ts
+++ b/src/addons/filter/algebra/algebra.module.ts
@@ -26,8 +26,7 @@ import { AddonFilterAlgebraHandler } from './services/handlers/algebra';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => CoreFilterDelegate.registerHandler(AddonFilterAlgebraHandler.instance),
+            useValue: () => CoreFilterDelegate.registerHandler(AddonFilterAlgebraHandler.instance),
         },
     ],
 })
diff --git a/src/addons/filter/censor/censor.module.ts b/src/addons/filter/censor/censor.module.ts
index bdb741ab7..05672bae4 100644
--- a/src/addons/filter/censor/censor.module.ts
+++ b/src/addons/filter/censor/censor.module.ts
@@ -26,8 +26,7 @@ import { AddonFilterCensorHandler } from './services/handlers/censor';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => CoreFilterDelegate.registerHandler(AddonFilterCensorHandler.instance),
+            useValue: () => CoreFilterDelegate.registerHandler(AddonFilterCensorHandler.instance),
         },
     ],
 })
diff --git a/src/addons/filter/data/data.module.ts b/src/addons/filter/data/data.module.ts
index fe88960d0..6da1a0b2c 100644
--- a/src/addons/filter/data/data.module.ts
+++ b/src/addons/filter/data/data.module.ts
@@ -26,8 +26,7 @@ import { AddonFilterDataHandler } from './services/handlers/data';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => CoreFilterDelegate.registerHandler(AddonFilterDataHandler.instance),
+            useValue: () => CoreFilterDelegate.registerHandler(AddonFilterDataHandler.instance),
         },
     ],
 })
diff --git a/src/addons/filter/displayh5p/displayh5p.module.ts b/src/addons/filter/displayh5p/displayh5p.module.ts
index d40923144..ab5df85c4 100644
--- a/src/addons/filter/displayh5p/displayh5p.module.ts
+++ b/src/addons/filter/displayh5p/displayh5p.module.ts
@@ -26,8 +26,7 @@ import { AddonFilterDisplayH5PHandler } from './services/handlers/displayh5p';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => CoreFilterDelegate.registerHandler(AddonFilterDisplayH5PHandler.instance),
+            useValue: () => CoreFilterDelegate.registerHandler(AddonFilterDisplayH5PHandler.instance),
         },
     ],
 })
diff --git a/src/addons/filter/emailprotect/emailprotect.module.ts b/src/addons/filter/emailprotect/emailprotect.module.ts
index 3793c4219..b25597acc 100644
--- a/src/addons/filter/emailprotect/emailprotect.module.ts
+++ b/src/addons/filter/emailprotect/emailprotect.module.ts
@@ -26,8 +26,7 @@ import { AddonFilterEmailProtectHandler } from './services/handlers/emailprotect
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => CoreFilterDelegate.registerHandler(AddonFilterEmailProtectHandler.instance),
+            useValue: () => CoreFilterDelegate.registerHandler(AddonFilterEmailProtectHandler.instance),
         },
     ],
 })
diff --git a/src/addons/filter/emoticon/emoticon.module.ts b/src/addons/filter/emoticon/emoticon.module.ts
index 1e925074e..a0d562e87 100644
--- a/src/addons/filter/emoticon/emoticon.module.ts
+++ b/src/addons/filter/emoticon/emoticon.module.ts
@@ -26,8 +26,7 @@ import { AddonFilterEmoticonHandler } from './services/handlers/emoticon';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => CoreFilterDelegate.registerHandler(AddonFilterEmoticonHandler.instance),
+            useValue: () => CoreFilterDelegate.registerHandler(AddonFilterEmoticonHandler.instance),
         },
     ],
 })
diff --git a/src/addons/filter/glossary/glossary.module.ts b/src/addons/filter/glossary/glossary.module.ts
index 6464e2c84..8061c73cf 100644
--- a/src/addons/filter/glossary/glossary.module.ts
+++ b/src/addons/filter/glossary/glossary.module.ts
@@ -26,8 +26,7 @@ import { AddonFilterGlossaryHandler } from './services/handlers/glossary';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => CoreFilterDelegate.registerHandler(AddonFilterGlossaryHandler.instance),
+            useValue: () => CoreFilterDelegate.registerHandler(AddonFilterGlossaryHandler.instance),
         },
     ],
 })
diff --git a/src/addons/filter/mathjaxloader/mathjaxloader.module.ts b/src/addons/filter/mathjaxloader/mathjaxloader.module.ts
index 0f3aa5b60..fdabf6056 100644
--- a/src/addons/filter/mathjaxloader/mathjaxloader.module.ts
+++ b/src/addons/filter/mathjaxloader/mathjaxloader.module.ts
@@ -26,8 +26,7 @@ import { AddonFilterMathJaxLoaderHandler } from './services/handlers/mathjaxload
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => async () => {
+            useValue: async () => {
                 CoreFilterDelegate.registerHandler(AddonFilterMathJaxLoaderHandler.instance);
 
                 await AddonFilterMathJaxLoaderHandler.initialize();
diff --git a/src/addons/filter/mediaplugin/mediaplugin.module.ts b/src/addons/filter/mediaplugin/mediaplugin.module.ts
index a72670098..1977bd08d 100644
--- a/src/addons/filter/mediaplugin/mediaplugin.module.ts
+++ b/src/addons/filter/mediaplugin/mediaplugin.module.ts
@@ -26,8 +26,7 @@ import { AddonFilterMediaPluginHandler } from './services/handlers/mediaplugin';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => CoreFilterDelegate.registerHandler(AddonFilterMediaPluginHandler.instance),
+            useValue: () => CoreFilterDelegate.registerHandler(AddonFilterMediaPluginHandler.instance),
         },
     ],
 })
diff --git a/src/addons/filter/multilang/multilang.module.ts b/src/addons/filter/multilang/multilang.module.ts
index 7ffab28b7..9e4ebda2d 100644
--- a/src/addons/filter/multilang/multilang.module.ts
+++ b/src/addons/filter/multilang/multilang.module.ts
@@ -26,8 +26,7 @@ import { AddonFilterMultilangHandler } from './services/handlers/multilang';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => CoreFilterDelegate.registerHandler(AddonFilterMultilangHandler.instance),
+            useValue: () => CoreFilterDelegate.registerHandler(AddonFilterMultilangHandler.instance),
         },
     ],
 })
diff --git a/src/addons/filter/tex/tex.module.ts b/src/addons/filter/tex/tex.module.ts
index 414d3fdc5..94e031fc5 100644
--- a/src/addons/filter/tex/tex.module.ts
+++ b/src/addons/filter/tex/tex.module.ts
@@ -26,8 +26,7 @@ import { AddonFilterTexHandler } from './services/handlers/tex';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => CoreFilterDelegate.registerHandler(AddonFilterTexHandler.instance),
+            useValue: () => CoreFilterDelegate.registerHandler(AddonFilterTexHandler.instance),
         },
     ],
 })
diff --git a/src/addons/filter/tidy/tidy.module.ts b/src/addons/filter/tidy/tidy.module.ts
index cf1045f1e..3cfedb6d1 100644
--- a/src/addons/filter/tidy/tidy.module.ts
+++ b/src/addons/filter/tidy/tidy.module.ts
@@ -26,8 +26,7 @@ import { AddonFilterTidyHandler } from './services/handlers/tidy';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => CoreFilterDelegate.registerHandler(AddonFilterTidyHandler.instance),
+            useValue: () => CoreFilterDelegate.registerHandler(AddonFilterTidyHandler.instance),
         },
     ],
 })
diff --git a/src/addons/filter/urltolink/urltolink.module.ts b/src/addons/filter/urltolink/urltolink.module.ts
index 48230c7dd..e5ee0667b 100644
--- a/src/addons/filter/urltolink/urltolink.module.ts
+++ b/src/addons/filter/urltolink/urltolink.module.ts
@@ -26,8 +26,7 @@ import { AddonFilterUrlToLinkHandler } from './services/handlers/urltolink';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => CoreFilterDelegate.registerHandler(AddonFilterUrlToLinkHandler.instance),
+            useValue: () => CoreFilterDelegate.registerHandler(AddonFilterUrlToLinkHandler.instance),
         },
     ],
 })
diff --git a/src/addons/messageoutput/airnotifier/airnotifier.module.ts b/src/addons/messageoutput/airnotifier/airnotifier.module.ts
index 99c4b1849..3e3d06870 100644
--- a/src/addons/messageoutput/airnotifier/airnotifier.module.ts
+++ b/src/addons/messageoutput/airnotifier/airnotifier.module.ts
@@ -39,8 +39,7 @@ const routes: Routes = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 AddonMessageOutputDelegate.registerHandler(AddonMessageOutputAirnotifierHandler.instance);
             },
         },
diff --git a/src/addons/messages/messages.module.ts b/src/addons/messages/messages.module.ts
index 251b053e9..5616c65e6 100644
--- a/src/addons/messages/messages.module.ts
+++ b/src/addons/messages/messages.module.ts
@@ -73,8 +73,7 @@ const preferencesRoutes: Routes = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 // Register handlers.
                 CoreMainMenuDelegate.registerHandler(AddonMessagesMainMenuHandler.instance);
                 CoreCronDelegate.register(AddonMessagesMainMenuHandler.instance);
diff --git a/src/addons/mod/assign/assign.module.ts b/src/addons/mod/assign/assign.module.ts
index 46bd253e9..001a5cf16 100644
--- a/src/addons/mod/assign/assign.module.ts
+++ b/src/addons/mod/assign/assign.module.ts
@@ -70,8 +70,7 @@ const routes: Routes = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreCourseModuleDelegate.registerHandler(AddonModAssignModuleHandler.instance);
                 CoreContentLinksDelegate.registerHandler(AddonModAssignIndexLinkHandler.instance);
                 CoreContentLinksDelegate.registerHandler(AddonModAssignListLinkHandler.instance);
diff --git a/src/addons/mod/assign/feedback/comments/comments.module.ts b/src/addons/mod/assign/feedback/comments/comments.module.ts
index 388efd827..d1be02007 100644
--- a/src/addons/mod/assign/feedback/comments/comments.module.ts
+++ b/src/addons/mod/assign/feedback/comments/comments.module.ts
@@ -31,8 +31,7 @@ import { AddonModAssignFeedbackDelegate } from '../../services/feedback-delegate
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 AddonModAssignFeedbackDelegate.registerHandler(AddonModAssignFeedbackCommentsHandler.instance);
             },
         },
diff --git a/src/addons/mod/assign/feedback/editpdf/editpdf.module.ts b/src/addons/mod/assign/feedback/editpdf/editpdf.module.ts
index d9c5dcb31..670975e8f 100644
--- a/src/addons/mod/assign/feedback/editpdf/editpdf.module.ts
+++ b/src/addons/mod/assign/feedback/editpdf/editpdf.module.ts
@@ -29,8 +29,7 @@ import { AddonModAssignFeedbackDelegate } from '../../services/feedback-delegate
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 AddonModAssignFeedbackDelegate.registerHandler(AddonModAssignFeedbackEditPdfHandler.instance);
             },
         },
diff --git a/src/addons/mod/assign/feedback/file/file.module.ts b/src/addons/mod/assign/feedback/file/file.module.ts
index 021ce1149..b1dca6200 100644
--- a/src/addons/mod/assign/feedback/file/file.module.ts
+++ b/src/addons/mod/assign/feedback/file/file.module.ts
@@ -29,8 +29,7 @@ import { AddonModAssignFeedbackDelegate } from '../../services/feedback-delegate
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 AddonModAssignFeedbackDelegate.registerHandler(AddonModAssignFeedbackFileHandler.instance);
             },
         },
diff --git a/src/addons/mod/assign/submission/comments/comments.module.ts b/src/addons/mod/assign/submission/comments/comments.module.ts
index 361d3a96e..49de6435e 100644
--- a/src/addons/mod/assign/submission/comments/comments.module.ts
+++ b/src/addons/mod/assign/submission/comments/comments.module.ts
@@ -31,8 +31,7 @@ import { CoreCommentsComponentsModule } from '@features/comments/components/comp
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 AddonModAssignSubmissionDelegate.registerHandler(AddonModAssignSubmissionCommentsHandler.instance);
             },
         },
diff --git a/src/addons/mod/assign/submission/file/file.module.ts b/src/addons/mod/assign/submission/file/file.module.ts
index ce4501efe..a71426556 100644
--- a/src/addons/mod/assign/submission/file/file.module.ts
+++ b/src/addons/mod/assign/submission/file/file.module.ts
@@ -29,8 +29,7 @@ import { AddonModAssignSubmissionDelegate } from '../../services/submission-dele
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 AddonModAssignSubmissionDelegate.registerHandler(AddonModAssignSubmissionFileHandler.instance);
             },
         },
diff --git a/src/addons/mod/assign/submission/onlinetext/onlinetext.module.ts b/src/addons/mod/assign/submission/onlinetext/onlinetext.module.ts
index a3d79b5c8..fd2fc8338 100644
--- a/src/addons/mod/assign/submission/onlinetext/onlinetext.module.ts
+++ b/src/addons/mod/assign/submission/onlinetext/onlinetext.module.ts
@@ -31,8 +31,7 @@ import { AddonModAssignSubmissionDelegate } from '../../services/submission-dele
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 AddonModAssignSubmissionDelegate.registerHandler(AddonModAssignSubmissionOnlineTextHandler.instance);
             },
         },
diff --git a/src/addons/mod/book/book.module.ts b/src/addons/mod/book/book.module.ts
index 3123cf6b6..3ac80f207 100644
--- a/src/addons/mod/book/book.module.ts
+++ b/src/addons/mod/book/book.module.ts
@@ -47,8 +47,7 @@ const routes: Routes = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreCourseModuleDelegate.registerHandler(AddonModBookModuleHandler.instance);
                 CoreContentLinksDelegate.registerHandler(AddonModBookIndexLinkHandler.instance);
                 CoreContentLinksDelegate.registerHandler(AddonModBookListLinkHandler.instance);
diff --git a/src/addons/mod/chat/chat.module.ts b/src/addons/mod/chat/chat.module.ts
index b62ca916c..62509fdd6 100644
--- a/src/addons/mod/chat/chat.module.ts
+++ b/src/addons/mod/chat/chat.module.ts
@@ -47,8 +47,7 @@ const routes: Routes = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreCourseModuleDelegate.registerHandler(AddonModChatModuleHandler.instance);
                 CoreContentLinksDelegate.registerHandler(AddonModChatIndexLinkHandler.instance);
                 CoreContentLinksDelegate.registerHandler(AddonModChatListLinkHandler.instance);
diff --git a/src/addons/mod/choice/choice.module.ts b/src/addons/mod/choice/choice.module.ts
index dffa84ac7..ed00d95a5 100644
--- a/src/addons/mod/choice/choice.module.ts
+++ b/src/addons/mod/choice/choice.module.ts
@@ -59,8 +59,7 @@ const routes: Routes = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreCourseModuleDelegate.registerHandler(AddonModChoiceModuleHandler.instance);
                 CoreCourseModulePrefetchDelegate.registerHandler(AddonModChoicePrefetchHandler.instance);
                 CoreCronDelegate.register(AddonModChoiceSyncCronHandler.instance);
diff --git a/src/addons/mod/data/data.module.ts b/src/addons/mod/data/data.module.ts
index 353592b6d..aa75d547d 100644
--- a/src/addons/mod/data/data.module.ts
+++ b/src/addons/mod/data/data.module.ts
@@ -71,8 +71,7 @@ const routes: Routes = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreCourseModuleDelegate.registerHandler(AddonModDataModuleHandler.instance);
                 CoreCourseModulePrefetchDelegate.registerHandler(AddonModDataPrefetchHandler.instance);
                 CoreCronDelegate.register(AddonModDataSyncCronHandler.instance);
diff --git a/src/addons/mod/data/fields/checkbox/checkbox.module.ts b/src/addons/mod/data/fields/checkbox/checkbox.module.ts
index beb2b7786..05331b4ac 100644
--- a/src/addons/mod/data/fields/checkbox/checkbox.module.ts
+++ b/src/addons/mod/data/fields/checkbox/checkbox.module.ts
@@ -29,8 +29,7 @@ import { AddonModDataFieldCheckboxHandler } from './services/handler';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 AddonModDataFieldsDelegate.registerHandler(AddonModDataFieldCheckboxHandler.instance);
             },
         },
diff --git a/src/addons/mod/data/fields/date/date.module.ts b/src/addons/mod/data/fields/date/date.module.ts
index 05d33a1e0..e32d886e3 100644
--- a/src/addons/mod/data/fields/date/date.module.ts
+++ b/src/addons/mod/data/fields/date/date.module.ts
@@ -29,8 +29,7 @@ import { AddonModDataFieldDateHandler } from './services/handler';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 AddonModDataFieldsDelegate.registerHandler(AddonModDataFieldDateHandler.instance);
             },
         },
diff --git a/src/addons/mod/data/fields/file/file.module.ts b/src/addons/mod/data/fields/file/file.module.ts
index e3ad12323..a77c3f05e 100644
--- a/src/addons/mod/data/fields/file/file.module.ts
+++ b/src/addons/mod/data/fields/file/file.module.ts
@@ -29,8 +29,7 @@ import { AddonModDataFieldFileHandler } from './services/handler';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 AddonModDataFieldsDelegate.registerHandler(AddonModDataFieldFileHandler.instance);
             },
         },
diff --git a/src/addons/mod/data/fields/latlong/latlong.module.ts b/src/addons/mod/data/fields/latlong/latlong.module.ts
index 1dc6aacc5..d7aca0e7e 100644
--- a/src/addons/mod/data/fields/latlong/latlong.module.ts
+++ b/src/addons/mod/data/fields/latlong/latlong.module.ts
@@ -29,8 +29,7 @@ import { AddonModDataFieldLatlongHandler } from './services/handler';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 AddonModDataFieldsDelegate.registerHandler(AddonModDataFieldLatlongHandler.instance);
             },
         },
diff --git a/src/addons/mod/data/fields/menu/menu.module.ts b/src/addons/mod/data/fields/menu/menu.module.ts
index 12a12d4fd..1d0537e0f 100644
--- a/src/addons/mod/data/fields/menu/menu.module.ts
+++ b/src/addons/mod/data/fields/menu/menu.module.ts
@@ -29,8 +29,7 @@ import { AddonModDataFieldMenuHandler } from './services/handler';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 AddonModDataFieldsDelegate.registerHandler(AddonModDataFieldMenuHandler.instance);
             },
         },
diff --git a/src/addons/mod/data/fields/multimenu/multimenu.module.ts b/src/addons/mod/data/fields/multimenu/multimenu.module.ts
index 3ceb09691..92da6d881 100644
--- a/src/addons/mod/data/fields/multimenu/multimenu.module.ts
+++ b/src/addons/mod/data/fields/multimenu/multimenu.module.ts
@@ -29,8 +29,7 @@ import { AddonModDataFieldMultimenuHandler } from './services/handler';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 AddonModDataFieldsDelegate.registerHandler(AddonModDataFieldMultimenuHandler.instance);
             },
         },
diff --git a/src/addons/mod/data/fields/number/number.module.ts b/src/addons/mod/data/fields/number/number.module.ts
index 5dd352b23..3ba78d2b6 100644
--- a/src/addons/mod/data/fields/number/number.module.ts
+++ b/src/addons/mod/data/fields/number/number.module.ts
@@ -29,8 +29,7 @@ import { AddonModDataFieldNumberHandler } from './services/handler';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 AddonModDataFieldsDelegate.registerHandler(AddonModDataFieldNumberHandler.instance);
             },
         },
diff --git a/src/addons/mod/data/fields/picture/picture.module.ts b/src/addons/mod/data/fields/picture/picture.module.ts
index 86806e2f2..31a352cce 100644
--- a/src/addons/mod/data/fields/picture/picture.module.ts
+++ b/src/addons/mod/data/fields/picture/picture.module.ts
@@ -29,8 +29,7 @@ import { AddonModDataFieldPictureHandler } from './services/handler';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 AddonModDataFieldsDelegate.registerHandler(AddonModDataFieldPictureHandler.instance);
             },
         },
diff --git a/src/addons/mod/data/fields/radiobutton/radiobutton.module.ts b/src/addons/mod/data/fields/radiobutton/radiobutton.module.ts
index ab535000c..e44ef5d27 100644
--- a/src/addons/mod/data/fields/radiobutton/radiobutton.module.ts
+++ b/src/addons/mod/data/fields/radiobutton/radiobutton.module.ts
@@ -29,8 +29,7 @@ import { AddonModDataFieldRadiobuttonHandler } from './services/handler';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 AddonModDataFieldsDelegate.registerHandler(AddonModDataFieldRadiobuttonHandler.instance);
             },
         },
diff --git a/src/addons/mod/data/fields/text/text.module.ts b/src/addons/mod/data/fields/text/text.module.ts
index 890f6b9c3..d5e4db055 100644
--- a/src/addons/mod/data/fields/text/text.module.ts
+++ b/src/addons/mod/data/fields/text/text.module.ts
@@ -29,8 +29,7 @@ import { AddonModDataFieldTextHandler } from './services/handler';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 AddonModDataFieldsDelegate.registerHandler(AddonModDataFieldTextHandler.instance);
             },
         },
diff --git a/src/addons/mod/data/fields/textarea/textarea.module.ts b/src/addons/mod/data/fields/textarea/textarea.module.ts
index 7ee21e9be..0b9a8e73f 100644
--- a/src/addons/mod/data/fields/textarea/textarea.module.ts
+++ b/src/addons/mod/data/fields/textarea/textarea.module.ts
@@ -31,8 +31,7 @@ import { AddonModDataFieldTextareaHandler } from './services/handler';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 AddonModDataFieldsDelegate.registerHandler(AddonModDataFieldTextareaHandler.instance);
             },
         },
diff --git a/src/addons/mod/data/fields/url/url.module.ts b/src/addons/mod/data/fields/url/url.module.ts
index 99d8250e5..c0e107890 100644
--- a/src/addons/mod/data/fields/url/url.module.ts
+++ b/src/addons/mod/data/fields/url/url.module.ts
@@ -29,8 +29,7 @@ import { AddonModDataFieldUrlHandler } from './services/handler';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 AddonModDataFieldsDelegate.registerHandler(AddonModDataFieldUrlHandler.instance);
             },
         },
diff --git a/src/addons/mod/feedback/feedback.module.ts b/src/addons/mod/feedback/feedback.module.ts
index d502a3afc..1fb74f4d0 100644
--- a/src/addons/mod/feedback/feedback.module.ts
+++ b/src/addons/mod/feedback/feedback.module.ts
@@ -67,8 +67,7 @@ const routes: Routes = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreCourseModuleDelegate.registerHandler(AddonModFeedbackModuleHandler.instance);
                 CoreCourseModulePrefetchDelegate.registerHandler(AddonModFeedbackPrefetchHandler.instance);
                 CoreCronDelegate.register(AddonModFeedbackSyncCronHandler.instance);
diff --git a/src/addons/mod/folder/folder.module.ts b/src/addons/mod/folder/folder.module.ts
index 77aa6c9cd..1094af764 100644
--- a/src/addons/mod/folder/folder.module.ts
+++ b/src/addons/mod/folder/folder.module.ts
@@ -49,8 +49,7 @@ const routes: Routes = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreCourseModuleDelegate.registerHandler(AddonModFolderModuleHandler.instance);
                 CoreContentLinksDelegate.registerHandler(AddonModFolderIndexLinkHandler.instance);
                 CoreContentLinksDelegate.registerHandler(AddonModFolderListLinkHandler.instance);
diff --git a/src/addons/mod/glossary/glossary.module.ts b/src/addons/mod/glossary/glossary.module.ts
index ee78aa70c..9a4b09793 100644
--- a/src/addons/mod/glossary/glossary.module.ts
+++ b/src/addons/mod/glossary/glossary.module.ts
@@ -104,8 +104,7 @@ const courseContentsRoutes: Routes = conditionalRoutes(
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreCourseModuleDelegate.registerHandler(AddonModGlossaryModuleHandler.instance);
                 CoreCourseModulePrefetchDelegate.registerHandler(AddonModGlossaryPrefetchHandler.instance);
                 CoreCronDelegate.register(AddonModGlossarySyncCronHandler.instance);
diff --git a/src/addons/mod/h5pactivity/h5pactivity.module.ts b/src/addons/mod/h5pactivity/h5pactivity.module.ts
index 516b54977..91b81b124 100644
--- a/src/addons/mod/h5pactivity/h5pactivity.module.ts
+++ b/src/addons/mod/h5pactivity/h5pactivity.module.ts
@@ -50,8 +50,7 @@ const routes: Routes = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreCourseModuleDelegate.registerHandler(AddonModH5PActivityModuleHandler.instance);
                 CoreContentLinksDelegate.registerHandler(AddonModH5PActivityIndexLinkHandler.instance);
                 CoreContentLinksDelegate.registerHandler(AddonModH5PActivityReportLinkHandler.instance);
diff --git a/src/addons/mod/imscp/imscp.module.ts b/src/addons/mod/imscp/imscp.module.ts
index 8684244f8..b94674269 100644
--- a/src/addons/mod/imscp/imscp.module.ts
+++ b/src/addons/mod/imscp/imscp.module.ts
@@ -47,8 +47,7 @@ const routes: Routes = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreCourseModuleDelegate.registerHandler(AddonModImscpModuleHandler.instance);
                 CoreContentLinksDelegate.registerHandler(AddonModImscpIndexLinkHandler.instance);
                 CoreContentLinksDelegate.registerHandler(AddonModImscpListLinkHandler.instance);
diff --git a/src/addons/mod/label/label.module.ts b/src/addons/mod/label/label.module.ts
index 6c480d851..60e38b5b0 100644
--- a/src/addons/mod/label/label.module.ts
+++ b/src/addons/mod/label/label.module.ts
@@ -25,8 +25,7 @@ import { AddonModLabelPrefetchHandler } from './services/handlers/prefetch';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreCourseModuleDelegate.registerHandler(AddonModLabelModuleHandler.instance);
                 CoreContentLinksDelegate.registerHandler(AddonModLabelIndexLinkHandler.instance);
                 CoreCourseModulePrefetchDelegate.registerHandler(AddonModLabelPrefetchHandler.instance);
diff --git a/src/addons/mod/lesson/lesson.module.ts b/src/addons/mod/lesson/lesson.module.ts
index 6ec9fd6e7..6957ca55f 100644
--- a/src/addons/mod/lesson/lesson.module.ts
+++ b/src/addons/mod/lesson/lesson.module.ts
@@ -65,8 +65,7 @@ const routes: Routes = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreCourseModuleDelegate.registerHandler(AddonModLessonModuleHandler.instance);
                 CoreCourseModulePrefetchDelegate.registerHandler(AddonModLessonPrefetchHandler.instance);
                 CoreCronDelegate.register(AddonModLessonSyncCronHandler.instance);
diff --git a/src/addons/mod/lti/lti.module.ts b/src/addons/mod/lti/lti.module.ts
index 8b9c43fc0..fef43da2b 100644
--- a/src/addons/mod/lti/lti.module.ts
+++ b/src/addons/mod/lti/lti.module.ts
@@ -44,16 +44,16 @@ const routes: Routes = [
         AddonModLtiComponentsModule,
     ],
     providers: [
-        { provide: APP_INITIALIZER, multi: true, useValue: () => AddonModLtiHelper.watchPendingCompletions() },
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreCourseModuleDelegate.registerHandler(AddonModLtiModuleHandler.instance);
                 CoreContentLinksDelegate.registerHandler(AddonModLtiIndexLinkHandler.instance);
                 CoreContentLinksDelegate.registerHandler(AddonModLtiListLinkHandler.instance);
                 CoreCourseModulePrefetchDelegate.registerHandler(AddonModLtiPrefetchHandler.instance);
+
+                AddonModLtiHelper.watchPendingCompletions();
             },
         },
     ],
diff --git a/src/addons/mod/page/page.module.ts b/src/addons/mod/page/page.module.ts
index 10bf39c71..0eac77a47 100644
--- a/src/addons/mod/page/page.module.ts
+++ b/src/addons/mod/page/page.module.ts
@@ -49,8 +49,7 @@ const routes: Routes = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreCourseModuleDelegate.registerHandler(AddonModPageModuleHandler.instance);
                 CoreContentLinksDelegate.registerHandler(AddonModPageIndexLinkHandler.instance);
                 CoreContentLinksDelegate.registerHandler(AddonModPageListLinkHandler.instance);
diff --git a/src/addons/mod/quiz/accessrules/delaybetweenattempts/delaybetweenattempts.module.ts b/src/addons/mod/quiz/accessrules/delaybetweenattempts/delaybetweenattempts.module.ts
index 6f2b96191..537ce6c92 100644
--- a/src/addons/mod/quiz/accessrules/delaybetweenattempts/delaybetweenattempts.module.ts
+++ b/src/addons/mod/quiz/accessrules/delaybetweenattempts/delaybetweenattempts.module.ts
@@ -24,8 +24,7 @@ import { AddonModQuizAccessDelayBetweenAttemptsHandler } from './services/handle
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 AddonModQuizAccessRuleDelegate.registerHandler(AddonModQuizAccessDelayBetweenAttemptsHandler.instance);
             },
         },
diff --git a/src/addons/mod/quiz/accessrules/ipaddress/ipaddress.module.ts b/src/addons/mod/quiz/accessrules/ipaddress/ipaddress.module.ts
index 5f33d6adb..2b0d0e1d5 100644
--- a/src/addons/mod/quiz/accessrules/ipaddress/ipaddress.module.ts
+++ b/src/addons/mod/quiz/accessrules/ipaddress/ipaddress.module.ts
@@ -24,8 +24,7 @@ import { AddonModQuizAccessIpAddressHandler } from './services/handlers/ipaddres
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 AddonModQuizAccessRuleDelegate.registerHandler(AddonModQuizAccessIpAddressHandler.instance);
             },
         },
diff --git a/src/addons/mod/quiz/accessrules/numattempts/numattempts.module.ts b/src/addons/mod/quiz/accessrules/numattempts/numattempts.module.ts
index d6774518c..05312de10 100644
--- a/src/addons/mod/quiz/accessrules/numattempts/numattempts.module.ts
+++ b/src/addons/mod/quiz/accessrules/numattempts/numattempts.module.ts
@@ -24,8 +24,7 @@ import { AddonModQuizAccessNumAttemptsHandler } from './services/handlers/numatt
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 AddonModQuizAccessRuleDelegate.registerHandler(AddonModQuizAccessNumAttemptsHandler.instance);
             },
         },
diff --git a/src/addons/mod/quiz/accessrules/offlineattempts/offlineattempts.module.ts b/src/addons/mod/quiz/accessrules/offlineattempts/offlineattempts.module.ts
index 9f25e7429..ad07f27f7 100644
--- a/src/addons/mod/quiz/accessrules/offlineattempts/offlineattempts.module.ts
+++ b/src/addons/mod/quiz/accessrules/offlineattempts/offlineattempts.module.ts
@@ -30,8 +30,7 @@ import { AddonModQuizAccessOfflineAttemptsHandler } from './services/handlers/of
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 AddonModQuizAccessRuleDelegate.registerHandler(AddonModQuizAccessOfflineAttemptsHandler.instance);
             },
         },
diff --git a/src/addons/mod/quiz/accessrules/openclosedate/openclosedate.module.ts b/src/addons/mod/quiz/accessrules/openclosedate/openclosedate.module.ts
index 536df6a30..190baa87f 100644
--- a/src/addons/mod/quiz/accessrules/openclosedate/openclosedate.module.ts
+++ b/src/addons/mod/quiz/accessrules/openclosedate/openclosedate.module.ts
@@ -24,8 +24,7 @@ import { AddonModQuizAccessOpenCloseDateHandler } from './services/handlers/open
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 AddonModQuizAccessRuleDelegate.registerHandler(AddonModQuizAccessOpenCloseDateHandler.instance);
             },
         },
diff --git a/src/addons/mod/quiz/accessrules/password/password.module.ts b/src/addons/mod/quiz/accessrules/password/password.module.ts
index aa86a43a4..58570654b 100644
--- a/src/addons/mod/quiz/accessrules/password/password.module.ts
+++ b/src/addons/mod/quiz/accessrules/password/password.module.ts
@@ -37,8 +37,7 @@ import { SITE_SCHEMA } from './services/database/password';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 AddonModQuizAccessRuleDelegate.registerHandler(AddonModQuizAccessPasswordHandler.instance);
             },
         },
diff --git a/src/addons/mod/quiz/accessrules/safebrowser/safebrowser.module.ts b/src/addons/mod/quiz/accessrules/safebrowser/safebrowser.module.ts
index d7762e27d..a4f222365 100644
--- a/src/addons/mod/quiz/accessrules/safebrowser/safebrowser.module.ts
+++ b/src/addons/mod/quiz/accessrules/safebrowser/safebrowser.module.ts
@@ -24,8 +24,7 @@ import { AddonModQuizAccessSafeBrowserHandler } from './services/handlers/safebr
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 AddonModQuizAccessRuleDelegate.registerHandler(AddonModQuizAccessSafeBrowserHandler.instance);
             },
         },
diff --git a/src/addons/mod/quiz/accessrules/securewindow/securewindow.module.ts b/src/addons/mod/quiz/accessrules/securewindow/securewindow.module.ts
index 7a8f1da71..b83e8a185 100644
--- a/src/addons/mod/quiz/accessrules/securewindow/securewindow.module.ts
+++ b/src/addons/mod/quiz/accessrules/securewindow/securewindow.module.ts
@@ -24,8 +24,7 @@ import { AddonModQuizAccessSecureWindowHandler } from './services/handlers/secur
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 AddonModQuizAccessRuleDelegate.registerHandler(AddonModQuizAccessSecureWindowHandler.instance);
             },
         },
diff --git a/src/addons/mod/quiz/accessrules/timelimit/timelimit.module.ts b/src/addons/mod/quiz/accessrules/timelimit/timelimit.module.ts
index e8d3ac8bf..4fae54f5e 100644
--- a/src/addons/mod/quiz/accessrules/timelimit/timelimit.module.ts
+++ b/src/addons/mod/quiz/accessrules/timelimit/timelimit.module.ts
@@ -30,8 +30,7 @@ import { AddonModQuizAccessTimeLimitHandler } from './services/handlers/timelimi
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 AddonModQuizAccessRuleDelegate.registerHandler(AddonModQuizAccessTimeLimitHandler.instance);
             },
         },
diff --git a/src/addons/mod/quiz/quiz.module.ts b/src/addons/mod/quiz/quiz.module.ts
index 11ecdf0ec..05bad8666 100644
--- a/src/addons/mod/quiz/quiz.module.ts
+++ b/src/addons/mod/quiz/quiz.module.ts
@@ -69,8 +69,7 @@ const routes: Routes = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreCourseModuleDelegate.registerHandler(AddonModQuizModuleHandler.instance);
                 CoreCourseModulePrefetchDelegate.registerHandler(AddonModQuizPrefetchHandler.instance);
                 CoreContentLinksDelegate.registerHandler(AddonModQuizGradeLinkHandler.instance);
diff --git a/src/addons/mod/resource/resource.module.ts b/src/addons/mod/resource/resource.module.ts
index 3cecc5ec1..5049aa8cd 100644
--- a/src/addons/mod/resource/resource.module.ts
+++ b/src/addons/mod/resource/resource.module.ts
@@ -47,8 +47,7 @@ const routes: Routes = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreCourseModuleDelegate.registerHandler(AddonModResourceModuleHandler.instance);
                 CoreContentLinksDelegate.registerHandler(AddonModResourceIndexLinkHandler.instance);
                 CoreContentLinksDelegate.registerHandler(AddonModResourceListLinkHandler.instance);
diff --git a/src/addons/mod/scorm/scorm.module.ts b/src/addons/mod/scorm/scorm.module.ts
index f4dc142e6..308f07164 100644
--- a/src/addons/mod/scorm/scorm.module.ts
+++ b/src/addons/mod/scorm/scorm.module.ts
@@ -63,8 +63,7 @@ const routes: Routes = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreCourseModuleDelegate.registerHandler(AddonModScormModuleHandler.instance);
                 CoreCourseModulePrefetchDelegate.registerHandler(AddonModScormPrefetchHandler.instance);
                 CoreCronDelegate.register(AddonModScormSyncCronHandler.instance);
diff --git a/src/addons/mod/survey/survey.module.ts b/src/addons/mod/survey/survey.module.ts
index 0b00f21ae..6c9716d2b 100644
--- a/src/addons/mod/survey/survey.module.ts
+++ b/src/addons/mod/survey/survey.module.ts
@@ -61,8 +61,7 @@ const routes: Routes = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreCourseModuleDelegate.registerHandler(AddonModSurveyModuleHandler.instance);
                 CoreCourseModulePrefetchDelegate.registerHandler(AddonModSurveyPrefetchHandler.instance);
                 CoreCronDelegate.register(AddonModSurveySyncCronHandler.instance);
diff --git a/src/addons/mod/url/url.module.ts b/src/addons/mod/url/url.module.ts
index 7a30d7856..e943d15ab 100644
--- a/src/addons/mod/url/url.module.ts
+++ b/src/addons/mod/url/url.module.ts
@@ -47,8 +47,7 @@ const routes: Routes = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreCourseModuleDelegate.registerHandler(AddonModUrlModuleHandler.instance);
                 CoreContentLinksDelegate.registerHandler(AddonModUrlIndexLinkHandler.instance);
                 CoreContentLinksDelegate.registerHandler(AddonModUrlListLinkHandler.instance);
diff --git a/src/addons/mod/wiki/wiki.module.ts b/src/addons/mod/wiki/wiki.module.ts
index 409c64783..dd63d4c0a 100644
--- a/src/addons/mod/wiki/wiki.module.ts
+++ b/src/addons/mod/wiki/wiki.module.ts
@@ -63,8 +63,7 @@ const routes: Routes = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreCourseModuleDelegate.registerHandler(AddonModWikiModuleHandler.instance);
                 CoreCourseModulePrefetchDelegate.registerHandler(AddonModWikiPrefetchHandler.instance);
                 CoreCronDelegate.register(AddonModWikiSyncCronHandler.instance);
diff --git a/src/addons/mod/workshop/assessment/accumulative/accumulative.module.ts b/src/addons/mod/workshop/assessment/accumulative/accumulative.module.ts
index 7eaf6ccc4..be3c10dc1 100644
--- a/src/addons/mod/workshop/assessment/accumulative/accumulative.module.ts
+++ b/src/addons/mod/workshop/assessment/accumulative/accumulative.module.ts
@@ -29,8 +29,7 @@ import { CoreSharedModule } from '@/core/shared.module';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 AddonWorkshopAssessmentStrategyDelegate.registerHandler(
                     AddonModWorkshopAssessmentStrategyAccumulativeHandler.instance,
                 );
diff --git a/src/addons/mod/workshop/assessment/comments/comments.module.ts b/src/addons/mod/workshop/assessment/comments/comments.module.ts
index 2ceaf9a5a..cb56fc9cc 100644
--- a/src/addons/mod/workshop/assessment/comments/comments.module.ts
+++ b/src/addons/mod/workshop/assessment/comments/comments.module.ts
@@ -29,8 +29,7 @@ import { AddonModWorkshopAssessmentStrategyCommentsHandler } from './services/ha
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 AddonWorkshopAssessmentStrategyDelegate.registerHandler(
                     AddonModWorkshopAssessmentStrategyCommentsHandler.instance,
                 );
diff --git a/src/addons/mod/workshop/assessment/numerrors/numerrors.module.ts b/src/addons/mod/workshop/assessment/numerrors/numerrors.module.ts
index dab6f1f38..7d2591c2a 100644
--- a/src/addons/mod/workshop/assessment/numerrors/numerrors.module.ts
+++ b/src/addons/mod/workshop/assessment/numerrors/numerrors.module.ts
@@ -29,8 +29,7 @@ import { AddonModWorkshopAssessmentStrategyNumErrorsHandler } from './services/h
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 AddonWorkshopAssessmentStrategyDelegate.registerHandler(
                     AddonModWorkshopAssessmentStrategyNumErrorsHandler.instance,
                 );
diff --git a/src/addons/mod/workshop/assessment/rubric/rubric.module.ts b/src/addons/mod/workshop/assessment/rubric/rubric.module.ts
index 04885352e..26ef01711 100644
--- a/src/addons/mod/workshop/assessment/rubric/rubric.module.ts
+++ b/src/addons/mod/workshop/assessment/rubric/rubric.module.ts
@@ -29,8 +29,7 @@ import { AddonModWorkshopAssessmentStrategyRubricHandler } from './services/hand
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 AddonWorkshopAssessmentStrategyDelegate.registerHandler(
                     AddonModWorkshopAssessmentStrategyRubricHandler.instance,
                 );
diff --git a/src/addons/mod/workshop/workshop.module.ts b/src/addons/mod/workshop/workshop.module.ts
index 1823ec561..28a93fc50 100644
--- a/src/addons/mod/workshop/workshop.module.ts
+++ b/src/addons/mod/workshop/workshop.module.ts
@@ -65,8 +65,7 @@ const routes: Routes = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreCourseModuleDelegate.registerHandler(AddonModWorkshopModuleHandler.instance);
                 CoreCourseModulePrefetchDelegate.registerHandler(AddonModWorkshopPrefetchHandler.instance);
                 CoreCronDelegate.register(AddonModWorkshopSyncCronHandler.instance);
diff --git a/src/addons/notes/notes.module.ts b/src/addons/notes/notes.module.ts
index e7c9bcef5..5d82c91d1 100644
--- a/src/addons/notes/notes.module.ts
+++ b/src/addons/notes/notes.module.ts
@@ -58,8 +58,7 @@ const routes: Routes = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => async () => {
+            useValue: () => {
                 CoreUserDelegate.registerHandler(AddonNotesUserHandler.instance);
                 CoreCourseOptionsDelegate.registerHandler(AddonNotesCourseOptionHandler.instance);
                 CoreCronDelegate.register(AddonNotesSyncCronHandler.instance);
diff --git a/src/addons/notifications/notifications.module.ts b/src/addons/notifications/notifications.module.ts
index 86595e7c3..0f2142d22 100644
--- a/src/addons/notifications/notifications.module.ts
+++ b/src/addons/notifications/notifications.module.ts
@@ -58,8 +58,7 @@ const preferencesRoutes: Routes = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreMainMenuDelegate.registerHandler(AddonNotificationsMainMenuHandler.instance);
                 CoreCronDelegate.register(AddonNotificationsCronHandler.instance);
                 CorePushNotificationsDelegate.registerClickHandler(AddonNotificationsPushClickHandler.instance);
diff --git a/src/addons/privatefiles/privatefiles.module.ts b/src/addons/privatefiles/privatefiles.module.ts
index 48806c006..ca91c9d3f 100644
--- a/src/addons/privatefiles/privatefiles.module.ts
+++ b/src/addons/privatefiles/privatefiles.module.ts
@@ -44,8 +44,7 @@ const routes: Routes = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreMainMenuDelegate.registerHandler(AddonPrivateFilesMainMenuHandler.instance);
             },
         },
diff --git a/src/addons/qbehaviour/adaptive/adaptive.module.ts b/src/addons/qbehaviour/adaptive/adaptive.module.ts
index f0d6b50b8..01d6f8a6f 100644
--- a/src/addons/qbehaviour/adaptive/adaptive.module.ts
+++ b/src/addons/qbehaviour/adaptive/adaptive.module.ts
@@ -23,8 +23,7 @@ import { AddonQbehaviourAdaptiveHandler } from './services/handlers/adaptive';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreQuestionBehaviourDelegate.registerHandler(AddonQbehaviourAdaptiveHandler.instance);
             },
         },
diff --git a/src/addons/qbehaviour/adaptivenopenalty/adaptivenopenalty.module.ts b/src/addons/qbehaviour/adaptivenopenalty/adaptivenopenalty.module.ts
index 521c2139f..6b29f6da9 100644
--- a/src/addons/qbehaviour/adaptivenopenalty/adaptivenopenalty.module.ts
+++ b/src/addons/qbehaviour/adaptivenopenalty/adaptivenopenalty.module.ts
@@ -24,8 +24,7 @@ import { AddonQbehaviourAdaptiveNoPenaltyHandler } from './services/handlers/ada
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreQuestionBehaviourDelegate.registerHandler(AddonQbehaviourAdaptiveNoPenaltyHandler.instance);
             },
         },
diff --git a/src/addons/qbehaviour/deferredcbm/deferredcbm.module.ts b/src/addons/qbehaviour/deferredcbm/deferredcbm.module.ts
index 94e8e2c1c..9606c4c63 100644
--- a/src/addons/qbehaviour/deferredcbm/deferredcbm.module.ts
+++ b/src/addons/qbehaviour/deferredcbm/deferredcbm.module.ts
@@ -30,8 +30,7 @@ import { AddonQbehaviourDeferredCBMHandler } from './services/handlers/deferredc
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreQuestionBehaviourDelegate.registerHandler(AddonQbehaviourDeferredCBMHandler.instance);
             },
         },
diff --git a/src/addons/qbehaviour/deferredfeedback/deferredfeedback.module.ts b/src/addons/qbehaviour/deferredfeedback/deferredfeedback.module.ts
index 8ec75de4a..6c516d394 100644
--- a/src/addons/qbehaviour/deferredfeedback/deferredfeedback.module.ts
+++ b/src/addons/qbehaviour/deferredfeedback/deferredfeedback.module.ts
@@ -23,8 +23,7 @@ import { AddonQbehaviourDeferredFeedbackHandler } from './services/handlers/defe
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreQuestionBehaviourDelegate.registerHandler(AddonQbehaviourDeferredFeedbackHandler.instance);
             },
         },
diff --git a/src/addons/qbehaviour/immediatecbm/immediatecbm.module.ts b/src/addons/qbehaviour/immediatecbm/immediatecbm.module.ts
index c5bc7d5a9..1717db79b 100644
--- a/src/addons/qbehaviour/immediatecbm/immediatecbm.module.ts
+++ b/src/addons/qbehaviour/immediatecbm/immediatecbm.module.ts
@@ -24,8 +24,7 @@ import { AddonQbehaviourImmediateCBMHandler } from './services/handlers/immediat
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreQuestionBehaviourDelegate.registerHandler(AddonQbehaviourImmediateCBMHandler.instance);
             },
         },
diff --git a/src/addons/qbehaviour/immediatefeedback/immediatefeedback.module.ts b/src/addons/qbehaviour/immediatefeedback/immediatefeedback.module.ts
index 99e137d95..33191c7cc 100644
--- a/src/addons/qbehaviour/immediatefeedback/immediatefeedback.module.ts
+++ b/src/addons/qbehaviour/immediatefeedback/immediatefeedback.module.ts
@@ -24,8 +24,7 @@ import { AddonQbehaviourImmediateFeedbackHandler } from './services/handlers/imm
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreQuestionBehaviourDelegate.registerHandler(AddonQbehaviourImmediateFeedbackHandler.instance);
             },
         },
diff --git a/src/addons/qbehaviour/informationitem/informationitem.module.ts b/src/addons/qbehaviour/informationitem/informationitem.module.ts
index c72b94676..3c465a4df 100644
--- a/src/addons/qbehaviour/informationitem/informationitem.module.ts
+++ b/src/addons/qbehaviour/informationitem/informationitem.module.ts
@@ -30,8 +30,7 @@ import { AddonQbehaviourInformationItemHandler } from './services/handlers/infor
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreQuestionBehaviourDelegate.registerHandler(AddonQbehaviourInformationItemHandler.instance);
             },
         },
diff --git a/src/addons/qbehaviour/interactive/interactive.module.ts b/src/addons/qbehaviour/interactive/interactive.module.ts
index 421f6ab4e..5f258023f 100644
--- a/src/addons/qbehaviour/interactive/interactive.module.ts
+++ b/src/addons/qbehaviour/interactive/interactive.module.ts
@@ -24,8 +24,7 @@ import { AddonQbehaviourInteractiveHandler } from './services/handlers/interacti
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreQuestionBehaviourDelegate.registerHandler(AddonQbehaviourInteractiveHandler.instance);
             },
         },
diff --git a/src/addons/qbehaviour/interactivecountback/interactivecountback.module.ts b/src/addons/qbehaviour/interactivecountback/interactivecountback.module.ts
index 161b1c5a1..461bfb633 100644
--- a/src/addons/qbehaviour/interactivecountback/interactivecountback.module.ts
+++ b/src/addons/qbehaviour/interactivecountback/interactivecountback.module.ts
@@ -24,8 +24,7 @@ import { AddonQbehaviourInteractiveCountbackHandler } from './services/handlers/
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreQuestionBehaviourDelegate.registerHandler(AddonQbehaviourInteractiveCountbackHandler.instance);
             },
         },
diff --git a/src/addons/qbehaviour/manualgraded/manualgraded.module.ts b/src/addons/qbehaviour/manualgraded/manualgraded.module.ts
index 45582465f..d8216f028 100644
--- a/src/addons/qbehaviour/manualgraded/manualgraded.module.ts
+++ b/src/addons/qbehaviour/manualgraded/manualgraded.module.ts
@@ -24,8 +24,7 @@ import { AddonQbehaviourManualGradedHandler } from './services/handlers/manualgr
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreQuestionBehaviourDelegate.registerHandler(AddonQbehaviourManualGradedHandler.instance);
             },
         },
diff --git a/src/addons/qtype/calculated/calculated.module.ts b/src/addons/qtype/calculated/calculated.module.ts
index d140819ab..73b7a5a3f 100644
--- a/src/addons/qtype/calculated/calculated.module.ts
+++ b/src/addons/qtype/calculated/calculated.module.ts
@@ -30,8 +30,7 @@ import { AddonQtypeCalculatedHandler } from './services/handlers/calculated';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreQuestionDelegate.registerHandler(AddonQtypeCalculatedHandler.instance);
             },
         },
diff --git a/src/addons/qtype/calculatedmulti/calculatedmulti.module.ts b/src/addons/qtype/calculatedmulti/calculatedmulti.module.ts
index cbe7d1829..4dd42bd1e 100644
--- a/src/addons/qtype/calculatedmulti/calculatedmulti.module.ts
+++ b/src/addons/qtype/calculatedmulti/calculatedmulti.module.ts
@@ -24,8 +24,7 @@ import { AddonQtypeCalculatedMultiHandler } from './services/handlers/calculated
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreQuestionDelegate.registerHandler(AddonQtypeCalculatedMultiHandler.instance);
             },
         },
diff --git a/src/addons/qtype/calculatedsimple/calculatedsimple.module.ts b/src/addons/qtype/calculatedsimple/calculatedsimple.module.ts
index 9a7b52b18..46f250724 100644
--- a/src/addons/qtype/calculatedsimple/calculatedsimple.module.ts
+++ b/src/addons/qtype/calculatedsimple/calculatedsimple.module.ts
@@ -24,8 +24,7 @@ import { AddonQtypeCalculatedSimpleHandler } from './services/handlers/calculate
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreQuestionDelegate.registerHandler(AddonQtypeCalculatedSimpleHandler.instance);
             },
         },
diff --git a/src/addons/qtype/ddimageortext/ddimageortext.module.ts b/src/addons/qtype/ddimageortext/ddimageortext.module.ts
index 68ad009b1..392a181c3 100644
--- a/src/addons/qtype/ddimageortext/ddimageortext.module.ts
+++ b/src/addons/qtype/ddimageortext/ddimageortext.module.ts
@@ -30,8 +30,7 @@ import { AddonQtypeDdImageOrTextHandler } from './services/handlers/ddimageortex
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreQuestionDelegate.registerHandler(AddonQtypeDdImageOrTextHandler.instance);
             },
         },
diff --git a/src/addons/qtype/ddmarker/ddmarker.module.ts b/src/addons/qtype/ddmarker/ddmarker.module.ts
index 6ec64137e..0dee46686 100644
--- a/src/addons/qtype/ddmarker/ddmarker.module.ts
+++ b/src/addons/qtype/ddmarker/ddmarker.module.ts
@@ -30,8 +30,7 @@ import { AddonQtypeDdMarkerHandler } from './services/handlers/ddmarker';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreQuestionDelegate.registerHandler(AddonQtypeDdMarkerHandler.instance);
             },
         },
diff --git a/src/addons/qtype/ddwtos/ddwtos.module.ts b/src/addons/qtype/ddwtos/ddwtos.module.ts
index 33563da45..ed923dea9 100644
--- a/src/addons/qtype/ddwtos/ddwtos.module.ts
+++ b/src/addons/qtype/ddwtos/ddwtos.module.ts
@@ -30,8 +30,7 @@ import { AddonQtypeDdwtosHandler } from './services/handlers/ddwtos';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreQuestionDelegate.registerHandler(AddonQtypeDdwtosHandler.instance);
             },
         },
diff --git a/src/addons/qtype/description/description.module.ts b/src/addons/qtype/description/description.module.ts
index 198e4f89e..d580e9d59 100644
--- a/src/addons/qtype/description/description.module.ts
+++ b/src/addons/qtype/description/description.module.ts
@@ -30,8 +30,7 @@ import { AddonQtypeDescriptionHandler } from './services/handlers/description';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreQuestionDelegate.registerHandler(AddonQtypeDescriptionHandler.instance);
             },
         },
diff --git a/src/addons/qtype/essay/essay.module.ts b/src/addons/qtype/essay/essay.module.ts
index 3d18fb67b..390479bbf 100644
--- a/src/addons/qtype/essay/essay.module.ts
+++ b/src/addons/qtype/essay/essay.module.ts
@@ -32,8 +32,7 @@ import { AddonQtypeEssayComponent } from './component/essay';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreQuestionDelegate.registerHandler(AddonQtypeEssayHandler.instance);
             },
         },
diff --git a/src/addons/qtype/gapselect/gapselect.module.ts b/src/addons/qtype/gapselect/gapselect.module.ts
index 15f730e4f..badb30c4f 100644
--- a/src/addons/qtype/gapselect/gapselect.module.ts
+++ b/src/addons/qtype/gapselect/gapselect.module.ts
@@ -30,8 +30,7 @@ import { AddonQtypeGapSelectHandler } from './services/handlers/gapselect';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreQuestionDelegate.registerHandler(AddonQtypeGapSelectHandler.instance);
             },
         },
diff --git a/src/addons/qtype/match/match.module.ts b/src/addons/qtype/match/match.module.ts
index b52672cc2..0df4636e5 100644
--- a/src/addons/qtype/match/match.module.ts
+++ b/src/addons/qtype/match/match.module.ts
@@ -30,8 +30,7 @@ import { AddonQtypeMatchHandler } from './services/handlers/match';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreQuestionDelegate.registerHandler(AddonQtypeMatchHandler.instance);
             },
         },
diff --git a/src/addons/qtype/multianswer/multianswer.module.ts b/src/addons/qtype/multianswer/multianswer.module.ts
index e5840b65b..9548089b3 100644
--- a/src/addons/qtype/multianswer/multianswer.module.ts
+++ b/src/addons/qtype/multianswer/multianswer.module.ts
@@ -30,8 +30,7 @@ import { AddonQtypeMultiAnswerHandler } from './services/handlers/multianswer';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreQuestionDelegate.registerHandler(AddonQtypeMultiAnswerHandler.instance);
             },
         },
diff --git a/src/addons/qtype/multichoice/multichoice.module.ts b/src/addons/qtype/multichoice/multichoice.module.ts
index 43ee32d66..12488668f 100644
--- a/src/addons/qtype/multichoice/multichoice.module.ts
+++ b/src/addons/qtype/multichoice/multichoice.module.ts
@@ -30,8 +30,7 @@ import { AddonQtypeMultichoiceHandler } from './services/handlers/multichoice';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreQuestionDelegate.registerHandler(AddonQtypeMultichoiceHandler.instance);
             },
         },
diff --git a/src/addons/qtype/numerical/numerical.module.ts b/src/addons/qtype/numerical/numerical.module.ts
index b2956adb4..f13ba4fbe 100644
--- a/src/addons/qtype/numerical/numerical.module.ts
+++ b/src/addons/qtype/numerical/numerical.module.ts
@@ -24,8 +24,7 @@ import { AddonQtypeNumericalHandler } from './services/handlers/numerical';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreQuestionDelegate.registerHandler(AddonQtypeNumericalHandler.instance);
             },
         },
diff --git a/src/addons/qtype/randomsamatch/randomsamatch.module.ts b/src/addons/qtype/randomsamatch/randomsamatch.module.ts
index 59063e97a..877e772a3 100644
--- a/src/addons/qtype/randomsamatch/randomsamatch.module.ts
+++ b/src/addons/qtype/randomsamatch/randomsamatch.module.ts
@@ -24,8 +24,7 @@ import { AddonQtypeRandomSaMatchHandler } from './services/handlers/randomsamatc
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreQuestionDelegate.registerHandler(AddonQtypeRandomSaMatchHandler.instance);
             },
         },
diff --git a/src/addons/qtype/shortanswer/shortanswer.module.ts b/src/addons/qtype/shortanswer/shortanswer.module.ts
index 363c237c5..dcadc635e 100644
--- a/src/addons/qtype/shortanswer/shortanswer.module.ts
+++ b/src/addons/qtype/shortanswer/shortanswer.module.ts
@@ -30,8 +30,7 @@ import { AddonQtypeShortAnswerHandler } from './services/handlers/shortanswer';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreQuestionDelegate.registerHandler(AddonQtypeShortAnswerHandler.instance);
             },
         },
diff --git a/src/addons/qtype/truefalse/truefalse.module.ts b/src/addons/qtype/truefalse/truefalse.module.ts
index 129857221..83f60d24d 100644
--- a/src/addons/qtype/truefalse/truefalse.module.ts
+++ b/src/addons/qtype/truefalse/truefalse.module.ts
@@ -24,8 +24,7 @@ import { AddonQtypeTrueFalseHandler } from './services/handlers/truefalse';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreQuestionDelegate.registerHandler(AddonQtypeTrueFalseHandler.instance);
             },
         },
diff --git a/src/addons/remotethemes/remotethemes.module.ts b/src/addons/remotethemes/remotethemes.module.ts
index 74666bff4..e7b7d8d1c 100644
--- a/src/addons/remotethemes/remotethemes.module.ts
+++ b/src/addons/remotethemes/remotethemes.module.ts
@@ -21,8 +21,7 @@ import { AddonRemoteThemesHandler } from './services/remotethemes-handler';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => async () => {
+            useValue: () => {
                 CoreStyles.registerStyleHandler(AddonRemoteThemesHandler.instance);
             },
         },
diff --git a/src/addons/storagemanager/storagemanager.module.ts b/src/addons/storagemanager/storagemanager.module.ts
index 57c30cab2..2a32b1c19 100644
--- a/src/addons/storagemanager/storagemanager.module.ts
+++ b/src/addons/storagemanager/storagemanager.module.ts
@@ -36,8 +36,7 @@ const routes: Routes = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => async () => {
+            useValue: () => {
                 CoreCourseOptionsDelegate.registerHandler(AddonStorageManagerCourseMenuHandler.instance);
             },
         },
diff --git a/src/addons/userprofilefield/checkbox/checkbox.module.ts b/src/addons/userprofilefield/checkbox/checkbox.module.ts
index 9f163b4c2..92e44c431 100644
--- a/src/addons/userprofilefield/checkbox/checkbox.module.ts
+++ b/src/addons/userprofilefield/checkbox/checkbox.module.ts
@@ -30,9 +30,9 @@ import { CoreSharedModule } from '@/core/shared.module';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () =>
-                CoreUserProfileFieldDelegate.registerHandler(AddonUserProfileFieldCheckboxHandler.instance),
+            useValue: () => {
+                CoreUserProfileFieldDelegate.registerHandler(AddonUserProfileFieldCheckboxHandler.instance);
+            },
         },
     ],
     exports: [
diff --git a/src/addons/userprofilefield/datetime/datetime.module.ts b/src/addons/userprofilefield/datetime/datetime.module.ts
index a70a4da0b..4c3fe5783 100644
--- a/src/addons/userprofilefield/datetime/datetime.module.ts
+++ b/src/addons/userprofilefield/datetime/datetime.module.ts
@@ -30,9 +30,9 @@ import { CoreSharedModule } from '@/core/shared.module';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () =>
-                CoreUserProfileFieldDelegate.registerHandler(AddonUserProfileFieldDatetimeHandler.instance),
+            useValue: () => {
+                CoreUserProfileFieldDelegate.registerHandler(AddonUserProfileFieldDatetimeHandler.instance);
+            },
         },
     ],
     exports: [
diff --git a/src/addons/userprofilefield/menu/menu.module.ts b/src/addons/userprofilefield/menu/menu.module.ts
index 62aae65da..e2fa301c6 100644
--- a/src/addons/userprofilefield/menu/menu.module.ts
+++ b/src/addons/userprofilefield/menu/menu.module.ts
@@ -30,9 +30,9 @@ import { CoreSharedModule } from '@/core/shared.module';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () =>
-                CoreUserProfileFieldDelegate.registerHandler(AddonUserProfileFieldMenuHandler.instance),
+            useValue: () => {
+                CoreUserProfileFieldDelegate.registerHandler(AddonUserProfileFieldMenuHandler.instance);
+            },
         },
     ],
     exports: [
diff --git a/src/addons/userprofilefield/text/text.module.ts b/src/addons/userprofilefield/text/text.module.ts
index 83131dfe0..812f24cee 100644
--- a/src/addons/userprofilefield/text/text.module.ts
+++ b/src/addons/userprofilefield/text/text.module.ts
@@ -30,9 +30,9 @@ import { CoreSharedModule } from '@/core/shared.module';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () =>
-                CoreUserProfileFieldDelegate.registerHandler(AddonUserProfileFieldTextHandler.instance),
+            useValue: () => {
+                CoreUserProfileFieldDelegate.registerHandler(AddonUserProfileFieldTextHandler.instance);
+            },
         },
     ],
     exports: [
diff --git a/src/addons/userprofilefield/textarea/textarea.module.ts b/src/addons/userprofilefield/textarea/textarea.module.ts
index 579b284ff..f2a29d40d 100644
--- a/src/addons/userprofilefield/textarea/textarea.module.ts
+++ b/src/addons/userprofilefield/textarea/textarea.module.ts
@@ -32,9 +32,9 @@ import { CoreEditorComponentsModule } from '@features/editor/components/componen
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () =>
-                CoreUserProfileFieldDelegate.registerHandler(AddonUserProfileFieldTextareaHandler.instance),
+            useValue: () => {
+                CoreUserProfileFieldDelegate.registerHandler(AddonUserProfileFieldTextareaHandler.instance);
+            },
         },
     ],
     exports: [
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 730c31f6e..555132d45 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -51,7 +51,7 @@ export function createTranslateLoader(http: HttpClient): TranslateHttpLoader {
         TranslateModule.forRoot({
             loader: {
                 provide: TranslateLoader,
-                useFactory: (createTranslateLoader),
+                useFactory: createTranslateLoader,
                 deps: [HttpClient],
             },
         }),
@@ -66,8 +66,7 @@ export function createTranslateLoader(http: HttpClient): TranslateHttpLoader {
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreCronDelegate.register(CoreSiteInfoCronHandler.instance);
             },
         },
diff --git a/src/core/features/course/course.module.ts b/src/core/features/course/course.module.ts
index 3e56ecb0c..906b0df92 100644
--- a/src/core/features/course/course.module.ts
+++ b/src/core/features/course/course.module.ts
@@ -90,8 +90,7 @@ const courseIndexRoutes: Routes = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreCronDelegate.register(CoreCourseSyncCronHandler.instance);
                 CoreCronDelegate.register(CoreCourseLogCronHandler.instance);
                 CoreTagAreaDelegate.registerHandler(CoreCourseTagAreaHandler.instance);
diff --git a/src/core/features/course/format/singleactivity/singleactivity.module.ts b/src/core/features/course/format/singleactivity/singleactivity.module.ts
index 8db7ae9f3..c42f04b27 100644
--- a/src/core/features/course/format/singleactivity/singleactivity.module.ts
+++ b/src/core/features/course/format/singleactivity/singleactivity.module.ts
@@ -30,8 +30,7 @@ import { CoreCourseFormatSingleActivityHandler } from './services/handlers/singl
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreCourseFormatDelegate.registerHandler(CoreCourseFormatSingleActivityHandler.instance);
             },
         },
diff --git a/src/core/features/course/format/social/social.module.ts b/src/core/features/course/format/social/social.module.ts
index 16f1379c6..1278c67df 100644
--- a/src/core/features/course/format/social/social.module.ts
+++ b/src/core/features/course/format/social/social.module.ts
@@ -22,8 +22,7 @@ import { CoreCourseFormatSocialHandler } from './services/handlers/social-format
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreCourseFormatDelegate.registerHandler(CoreCourseFormatSocialHandler.instance);
             },
         },
diff --git a/src/core/features/course/format/topics/topics.module.ts b/src/core/features/course/format/topics/topics.module.ts
index 3a7594aa7..8cca95c71 100644
--- a/src/core/features/course/format/topics/topics.module.ts
+++ b/src/core/features/course/format/topics/topics.module.ts
@@ -22,8 +22,7 @@ import { CoreCourseFormatTopicsHandler } from './services/handlers/topics-format
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreCourseFormatDelegate.registerHandler(CoreCourseFormatTopicsHandler.instance);
             },
         },
diff --git a/src/core/features/course/format/weeks/weeks.module.ts b/src/core/features/course/format/weeks/weeks.module.ts
index 491c122e4..7393de0d1 100644
--- a/src/core/features/course/format/weeks/weeks.module.ts
+++ b/src/core/features/course/format/weeks/weeks.module.ts
@@ -22,8 +22,7 @@ import { CoreCourseFormatWeeksHandler } from './services/handlers/weeks-format';
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreCourseFormatDelegate.registerHandler(CoreCourseFormatWeeksHandler.instance);
             },
         },
diff --git a/src/core/features/courses/courses.module.ts b/src/core/features/courses/courses.module.ts
index 6ca5284b4..b07d4bc2b 100644
--- a/src/core/features/courses/courses.module.ts
+++ b/src/core/features/courses/courses.module.ts
@@ -66,8 +66,7 @@ const mainMenuHomeSiblingRoutes: Routes = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreMainMenuHomeDelegate.registerHandler(CoreDashboardHomeHandler.instance);
                 CoreMainMenuHomeDelegate.registerHandler(CoreCoursesMyCoursesHomeHandler.instance);
                 CoreContentLinksDelegate.registerHandler(CoreCoursesCourseLinkHandler.instance);
diff --git a/src/core/features/fileuploader/fileuploader.module.ts b/src/core/features/fileuploader/fileuploader.module.ts
index 8ca214fe7..c0774617d 100644
--- a/src/core/features/fileuploader/fileuploader.module.ts
+++ b/src/core/features/fileuploader/fileuploader.module.ts
@@ -34,8 +34,7 @@ export const CORE_FILEUPLOADER_SERVICES: Type<unknown>[] = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreFileUploaderDelegate.registerHandler(CoreFileUploaderAlbumHandler.instance);
                 CoreFileUploaderDelegate.registerHandler(CoreFileUploaderAudioHandler.instance);
                 CoreFileUploaderDelegate.registerHandler(CoreFileUploaderCameraHandler.instance);
diff --git a/src/core/features/grades/grades.module.ts b/src/core/features/grades/grades.module.ts
index 2a9c3dbd7..b359d575c 100644
--- a/src/core/features/grades/grades.module.ts
+++ b/src/core/features/grades/grades.module.ts
@@ -62,7 +62,6 @@ const courseIndexRoutes: Routes = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
             useValue: () => {
                 CoreMainMenuDelegate.registerHandler(CoreGradesMainMenuHandler.instance);
                 CoreUserDelegate.registerHandler(CoreGradesUserHandler.instance);
diff --git a/src/core/features/h5p/h5p.module.ts b/src/core/features/h5p/h5p.module.ts
index e8be04d82..89b5a494a 100644
--- a/src/core/features/h5p/h5p.module.ts
+++ b/src/core/features/h5p/h5p.module.ts
@@ -38,8 +38,7 @@ export const CORE_H5P_SERVICES: Type<unknown>[] = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CorePluginFileDelegate.registerHandler(CoreH5PPluginFileHandler.instance);
             },
         },
diff --git a/src/core/features/login/login.module.ts b/src/core/features/login/login.module.ts
index 235541150..caa91ea91 100644
--- a/src/core/features/login/login.module.ts
+++ b/src/core/features/login/login.module.ts
@@ -40,8 +40,7 @@ const appRoutes: Routes = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => async () => {
+            useValue: () => {
                 CoreCronDelegate.register(CoreLoginCronHandler.instance);
             },
         },
diff --git a/src/core/features/mainmenu/mainmenu.module.ts b/src/core/features/mainmenu/mainmenu.module.ts
index 0c871de7d..ae4136604 100644
--- a/src/core/features/mainmenu/mainmenu.module.ts
+++ b/src/core/features/mainmenu/mainmenu.module.ts
@@ -49,8 +49,7 @@ const appRoutes: Routes = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreMainMenuDelegate.registerHandler(CoreMainMenuHomeHandler.instance);
             },
         },
diff --git a/src/core/features/pushnotifications/pushnotifications.module.ts b/src/core/features/pushnotifications/pushnotifications.module.ts
index fac638aa2..b765e6fb8 100644
--- a/src/core/features/pushnotifications/pushnotifications.module.ts
+++ b/src/core/features/pushnotifications/pushnotifications.module.ts
@@ -41,8 +41,7 @@ export const CORE_PUSHNOTIFICATIONS_SERVICES: Type<unknown>[] = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => async () => {
+            useValue: async () => {
                 // Register the handlers.
                 CoreCronDelegate.register(CorePushNotificationsRegisterCronHandler.instance);
                 CoreCronDelegate.register(CorePushNotificationsUnregisterCronHandler.instance);
diff --git a/src/core/features/sharedfiles/sharedfiles.module.ts b/src/core/features/sharedfiles/sharedfiles.module.ts
index 5d82b264a..409747798 100644
--- a/src/core/features/sharedfiles/sharedfiles.module.ts
+++ b/src/core/features/sharedfiles/sharedfiles.module.ts
@@ -51,7 +51,7 @@ const routes: Routes = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            useFactory: () => async () => {
+            useValue: async () => {
                 CoreFileUploaderDelegate.registerHandler(CoreSharedFilesUploadHandler.instance);
                 CoreSettingsDelegate.registerHandler(CoreSharedFilesSettingsHandler.instance);
 
diff --git a/src/core/features/sitehome/sitehome.module.ts b/src/core/features/sitehome/sitehome.module.ts
index d77faecd2..40283ba13 100644
--- a/src/core/features/sitehome/sitehome.module.ts
+++ b/src/core/features/sitehome/sitehome.module.ts
@@ -40,8 +40,7 @@ const mainMenuHomeRoutes: Routes = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreContentLinksDelegate.registerHandler(CoreSiteHomeIndexLinkHandler.instance);
                 CoreMainMenuHomeDelegate.registerHandler(CoreSiteHomeHomeHandler.instance);
             },
diff --git a/src/core/features/user/user.module.ts b/src/core/features/user/user.module.ts
index 52c1e87ef..75901a66e 100644
--- a/src/core/features/user/user.module.ts
+++ b/src/core/features/user/user.module.ts
@@ -77,8 +77,7 @@ const courseIndexRoutes: Routes = [
         {
             provide: APP_INITIALIZER,
             multi: true,
-            deps: [],
-            useFactory: () => () => {
+            useValue: () => {
                 CoreUserDelegate.registerHandler(CoreUserProfileMailHandler.instance);
                 CoreContentLinksDelegate.registerHandler(CoreUserProfileLinkHandler.instance);
                 CoreCronDelegate.register(CoreUserSyncCronHandler.instance);

From bc1313404d748d262909a70e921b70faead151b7 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Mon, 30 Aug 2021 14:05:58 +0200
Subject: [PATCH 0055/1008] MOBILE-3833 DX: Create .nvmrc file

---
 .nvmrc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .nvmrc

diff --git a/.nvmrc b/.nvmrc
new file mode 100644
index 000000000..48082f72f
--- /dev/null
+++ b/.nvmrc
@@ -0,0 +1 @@
+12

From 770b8bd98acfad063fb2c4fbf60dfbf7eb8f8359 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Mon, 30 Aug 2021 14:56:09 +0200
Subject: [PATCH 0056/1008] MOBILE-3833 DX: Add VSCode recommendations

---
 .vscode/extensions.json | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .vscode/extensions.json

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 000000000..12ffc2065
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+        "dbaeumer.vscode-eslint"
+    ]
+}

From 014e1b455f1dcd878210e65e2f493c3a6bd93095 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Mon, 30 Aug 2021 14:58:21 +0200
Subject: [PATCH 0057/1008] MOBILE-3833 DX: Implement watch-behat gulp task

---
 gulpfile.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gulpfile.js b/gulpfile.js
index 9f3f5f93f..31db54239 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -69,3 +69,7 @@ gulp.task('watch', () => {
         gulp.watch(['./tests/behat'], { interval: 500 }, gulp.parallel('behat'));
     }
 });
+
+gulp.task('watch-behat', () => {
+    gulp.watch(['./tests/behat'], { interval: 500 }, gulp.parallel('behat'));
+});

From 8a2309522c999ec3fbffeecb64ff5e033b815ee0 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 31 Aug 2021 17:40:12 +0200
Subject: [PATCH 0058/1008] MOBILE-3833 core: Fix initialization

---
 src/core/classes/application-init-status.ts |  5 +++++
 src/core/services/filepool.ts               | 18 ++++++++----------
 src/core/services/lang.ts                   |  2 +-
 src/core/singletons/index.ts                |  4 +++-
 src/core/singletons/subscriptions.ts        |  2 +-
 5 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/core/classes/application-init-status.ts b/src/core/classes/application-init-status.ts
index f98420f81..8cfe10e86 100644
--- a/src/core/classes/application-init-status.ts
+++ b/src/core/classes/application-init-status.ts
@@ -24,4 +24,9 @@ export class CoreApplicationInitStatus extends ApplicationInitStatus {
         super(injector.get(APP_INITIALIZER, []));
     }
 
+    whenDone(callback: () => unknown): void {
+        // eslint-disable-next-line promise/catch-or-return, promise/no-callback-in-promise
+        this.donePromise.then(callback);
+    }
+
 }
diff --git a/src/core/services/filepool.ts b/src/core/services/filepool.ts
index 275785a4a..042558991 100644
--- a/src/core/services/filepool.ts
+++ b/src/core/services/filepool.ts
@@ -102,17 +102,15 @@ export class CoreFilepoolProvider {
     /**
      * Initialize queue.
      */
-    async initialize(): Promise<void> {
-        // Waiting for the app to be ready to start processing the queue.
-        await ApplicationInit.donePromise;
+    initialize(): void {
+        // Start processing the queue once the app is ready.
+        ApplicationInit.whenDone(() => {
+            this.checkQueueProcessing();
 
-        this.checkQueueProcessing();
-
-        // Start queue when device goes online.
-        Network.onConnect().subscribe(() => {
-            // Execute the callback in the Angular zone, so change detection doesn't stop working.
-            NgZone.run(() => {
-                this.checkQueueProcessing();
+            // Start queue when device goes online.
+            Network.onConnect().subscribe(() => {
+                // Execute the callback in the Angular zone, so change detection doesn't stop working.
+                NgZone.run(() => this.checkQueueProcessing());
             });
         });
     }
diff --git a/src/core/services/lang.ts b/src/core/services/lang.ts
index c14cd0054..b3eee335e 100644
--- a/src/core/services/lang.ts
+++ b/src/core/services/lang.ts
@@ -50,7 +50,7 @@ export class CoreLangProvider {
             document.documentElement.setAttribute('dir', dir);
         });
 
-        await this.initializeCurrentLanguage();
+        this.initializeCurrentLanguage();
     }
 
     /**
diff --git a/src/core/singletons/index.ts b/src/core/singletons/index.ts
index deee2a2be..cb3a81e9a 100644
--- a/src/core/singletons/index.ts
+++ b/src/core/singletons/index.ts
@@ -57,6 +57,8 @@ import { Zip as ZipService } from '@ionic-native/zip/ngx';
 
 import { TranslateService } from '@ngx-translate/core';
 
+import { CoreApplicationInitStatus } from '@classes/application-init-status';
+
 /**
  * Injector instance used to resolve singletons.
  */
@@ -198,7 +200,7 @@ export const ModalController = makeSingleton(ModalControllerService);
 export const PopoverController = makeSingleton(PopoverControllerService);
 export const ToastController = makeSingleton(ToastControllerService);
 export const GestureController = makeSingleton(GestureControllerService);
-export const ApplicationInit = makeSingleton(ApplicationInitStatus);
+export const ApplicationInit = makeSingleton<CoreApplicationInitStatus>(ApplicationInitStatus);
 export const Application = makeSingleton(ApplicationRef);
 export const NavController = makeSingleton(NavControllerService);
 export const Router = makeSingleton(RouterService);
diff --git a/src/core/singletons/subscriptions.ts b/src/core/singletons/subscriptions.ts
index 0c66c939f..3ea609a32 100644
--- a/src/core/singletons/subscriptions.ts
+++ b/src/core/singletons/subscriptions.ts
@@ -44,7 +44,7 @@ export class CoreSubscriptions {
                 // Unsubscribe using a timeout because we can receive a value immediately.
                 setTimeout(() => subscription.unsubscribe(), 0);
 
-                onError?.call(error);
+                onError && onError(error);
             },
         );
     }

From 31b6a8d69209536b0146e41f9539642d315cfa94 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 31 Aug 2021 17:43:19 +0200
Subject: [PATCH 0059/1008] MOBILE-3833 DX: Update node version

---
 .github/workflows/migration.yml | 2 +-
 .github/workflows/testing.yml   | 2 +-
 .nvmrc                          | 2 +-
 .travis.yml                     | 4 ++--
 package.json                    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/migration.yml b/.github/workflows/migration.yml
index 32899b4a6..585b297c0 100644
--- a/.github/workflows/migration.yml
+++ b/.github/workflows/migration.yml
@@ -12,7 +12,7 @@ jobs:
     - name: Use Node.js
       uses: actions/setup-node@v1
       with:
-        node-version: '12.x'
+        node-version: '14.x'
     - run: npm ci
     - run: result=$(find src -type f -iname '*.html' -exec sh -c 'cat {} | tr "\n" " " | grep -Eo "class=\"[^\"]+\"[^>]+class=\"" ' \; | wc -l); test $result -eq 0
     - run: npm install -D @ionic/v4-migration-tslint
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 4f326a88b..9e315c81a 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -12,7 +12,7 @@ jobs:
     - name: Use Node.js
       uses: actions/setup-node@v1
       with:
-        node-version: '12'
+        node-version: '14'
     - name: Install npm packages
       run: |
         npm install -g npm@7
diff --git a/.nvmrc b/.nvmrc
index 48082f72f..55d178216 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-12
+v14.15.0
diff --git a/.travis.yml b/.travis.yml
index 171b23db3..e53df5fb1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 os: linux
 dist: trusty
-node_js: 12
+node_js: 14
 
 git:
   depth: 3
@@ -18,7 +18,7 @@ cache:
     - $HOME/.android/build-cache
 
 before_install:
-  - nvm install 12
+  - nvm use
   - node --version
   - npm --version
   - nvm --version
diff --git a/package.json b/package.json
index 609746927..8331ec89d 100644
--- a/package.json
+++ b/package.json
@@ -173,7 +173,7 @@
     "typescript": "^3.9.9"
   },
   "engines": {
-    "node": ">=12.x"
+    "node": ">=14.15.0 <15"
   },
   "cordova": {
     "platforms": [

From 68625f148567daa4220509cf94152cc257888dfa Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 1 Sep 2021 08:34:52 +0200
Subject: [PATCH 0060/1008] MOBILE-3833 travis: Fix node installation

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e53df5fb1..da4c96c21 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@ cache:
     - $HOME/.android/build-cache
 
 before_install:
-  - nvm use
+  - nvm install
   - node --version
   - npm --version
   - nvm --version

From 6677e424e1256b52f695410ac941b7df36c086b1 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 27 Aug 2021 09:35:26 +0200
Subject: [PATCH 0061/1008] MOBILE-3289 h5p: Fix unneeded scroll in H5P in
 Android

---
 .../features/h5p/assets/moodle/js/embed.js     | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/core/features/h5p/assets/moodle/js/embed.js b/src/core/features/h5p/assets/moodle/js/embed.js
index 904eded89..5d86fa63d 100644
--- a/src/core/features/h5p/assets/moodle/js/embed.js
+++ b/src/core/features/h5p/assets/moodle/js/embed.js
@@ -136,7 +136,7 @@ document.onreadystatechange = function() {
     // When resize has been prepared tell parent window to resize.
     H5PEmbedCommunicator.on('resizePrepared', function() {
         H5PEmbedCommunicator.send('resize', {
-            scrollHeight: iFrame.contentDocument.body.scrollHeight
+            scrollHeight: getIframeBodyHeights(iFrame).scrollHeight
         });
     });
 
@@ -154,10 +154,11 @@ document.onreadystatechange = function() {
         resizeDelay = setTimeout(function() {
             // Only resize if the iframe can be resized.
             if (parentIsFriendly) {
+                var heights = getIframeBodyHeights(iFrame);
                 H5PEmbedCommunicator.send('prepareResize',
                     {
-                        scrollHeight: iFrame.contentDocument.body.scrollHeight,
-                        clientHeight: iFrame.contentDocument.body.clientHeight
+                        scrollHeight: heights.scrollHeight,
+                        clientHeight: heights.clientHeight
                     }
                 );
             } else {
@@ -201,3 +202,14 @@ document.onreadystatechange = function() {
     // Trigger initial resize for instance.
     H5P.trigger(instance, 'resize');
 };
+
+// Function created for the Moodle app.
+// It also takes the current body margin into account because some user agents put some margin to the body of the outer iframe.
+function getIframeBodyHeights(iFrame) {
+    var margin = parseInt(getComputedStyle(document.body)['margin'], 10) || 0;
+
+    return {
+        scrollHeight: iFrame.contentDocument.body.scrollHeight + margin * 2,
+        clientHeight: iFrame.contentDocument.body.clientHeight + margin * 2,
+    };
+}

From 4cb5c9b37e028c878a46d3d24d97d97ff1adf9a9 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 1 Sep 2021 10:30:34 +0200
Subject: [PATCH 0062/1008] MOBILE-3289 h5p: Fix fullscreen for H5P in the app

---
 config.xml                                    |  1 +
 package-lock.json                             | 50 +++++++++----------
 package.json                                  |  4 +-
 src/core/features/h5p/assets/js/h5p.js        | 16 +++---
 .../features/h5p/assets/readme_moodle.txt     |  6 +++
 5 files changed, 44 insertions(+), 33 deletions(-)
 create mode 100644 src/core/features/h5p/assets/readme_moodle.txt

diff --git a/config.xml b/config.xml
index be368b0a3..ad367a677 100644
--- a/config.xml
+++ b/config.xml
@@ -47,6 +47,7 @@
     <preference name="iosPersistentFileLocation" value="Compatibility" />
     <preference name="iosScheme" value="moodleappfs" />
     <preference name="WKWebViewOnly" value="true" />
+    <preference name="WKFullScreenEnabled" value="true" />
     <feature name="StatusBar">
         <param name="ios-package" onload="true" value="CDVStatusBar" />
     </feature>
diff --git a/package-lock.json b/package-lock.json
index 3748913af..16767d151 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -45,6 +45,7 @@
         "@ionic/angular": "^5.6.6",
         "@moodlehq/cordova-plugin-file-transfer": "1.7.1-moodle.2",
         "@moodlehq/cordova-plugin-inappbrowser": "5.0.0-moodle.2",
+        "@moodlehq/cordova-plugin-ionic-webview": "5.0.0-moodle.1",
         "@moodlehq/cordova-plugin-local-notification": "0.9.0-moodle.2",
         "@moodlehq/cordova-plugin-qrscanner": "3.0.1-moodle.2",
         "@moodlehq/phonegap-plugin-push": "2.2.3-moodle.1",
@@ -72,7 +73,6 @@
         "cordova-plugin-geolocation": "^4.1.0",
         "cordova-plugin-globalization": "^1.11.0",
         "cordova-plugin-ionic-keyboard": "^2.2.0",
-        "cordova-plugin-ionic-webview": "^5.0.0",
         "cordova-plugin-media": "^5.0.3",
         "cordova-plugin-media-capture": "^3.0.3",
         "cordova-plugin-network-information": "^2.0.2",
@@ -145,7 +145,7 @@
         "typescript": "^3.9.9"
       },
       "engines": {
-        "node": ">=12.x"
+        "node": ">=14.15.0 <15"
       },
       "optionalDependencies": {
         "keytar": "^7.2.0"
@@ -4970,6 +4970,24 @@
         }
       }
     },
+    "node_modules/@moodlehq/cordova-plugin-ionic-webview": {
+      "version": "5.0.0-moodle.1",
+      "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-ionic-webview/-/cordova-plugin-ionic-webview-5.0.0-moodle.1.tgz",
+      "integrity": "sha512-+6UrPKsEgXl3pcuTyI1hZIUw9y22Li/nvn7nxiphgZdldlhBvkMK/7nn4IAaXYlnrmIOpCkIrU4BbrAjSJGWSQ==",
+      "engines": {
+        "cordovaDependencies": {
+          "2.0.0": {
+            "cordova-android": ">=6.4.0",
+            "cordova-ios": ">=4.0.0-dev"
+          },
+          "3.1.0": {
+            "cordova": ">=7.1.0",
+            "cordova-android": ">=6.4.0",
+            "cordova-ios": ">=4.0.0-dev"
+          }
+        }
+      }
+    },
     "node_modules/@moodlehq/cordova-plugin-local-notification": {
       "version": "0.9.0-moodle.2",
       "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-local-notification/-/cordova-plugin-local-notification-0.9.0-moodle.2.tgz",
@@ -10899,24 +10917,6 @@
       "resolved": "https://registry.npmjs.org/cordova-plugin-ionic-keyboard/-/cordova-plugin-ionic-keyboard-2.2.0.tgz",
       "integrity": "sha512-yDUG+9ieKVRitq5mGlNxjaZh/MgEhFFIgTIPhqSbUaQ8UuZbawy5mhJAVClqY97q8/rcQtL6dCDa7x2sEtCLcA=="
     },
-    "node_modules/cordova-plugin-ionic-webview": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-ionic-webview/-/cordova-plugin-ionic-webview-5.0.0.tgz",
-      "integrity": "sha512-Wq0kCanxubK/JroTW4Mp5soayScnRyiY1eCkbwiz1Dyt1xHOiOW/v+1miqtBHtnZhcXw25TulCKAVJzkNBdmyg==",
-      "engines": {
-        "cordovaDependencies": {
-          "2.0.0": {
-            "cordova-android": ">=6.4.0",
-            "cordova-ios": ">=4.0.0-dev"
-          },
-          "3.1.0": {
-            "cordova": ">=7.1.0",
-            "cordova-android": ">=6.4.0",
-            "cordova-ios": ">=4.0.0-dev"
-          }
-        }
-      }
-    },
     "node_modules/cordova-plugin-media": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/cordova-plugin-media/-/cordova-plugin-media-5.0.3.tgz",
@@ -34720,6 +34720,11 @@
       "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-inappbrowser/-/cordova-plugin-inappbrowser-5.0.0-moodle.2.tgz",
       "integrity": "sha512-0JOLHUFEJC3fv4OQuyr2kwNyrb7oeyjmfFLQ+LcKO41e6UOnNy/du0hU7Yz9Rh8B2zGcebvSwMrN+cRSCqlipQ=="
     },
+    "@moodlehq/cordova-plugin-ionic-webview": {
+      "version": "5.0.0-moodle.1",
+      "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-ionic-webview/-/cordova-plugin-ionic-webview-5.0.0-moodle.1.tgz",
+      "integrity": "sha512-+6UrPKsEgXl3pcuTyI1hZIUw9y22Li/nvn7nxiphgZdldlhBvkMK/7nn4IAaXYlnrmIOpCkIrU4BbrAjSJGWSQ=="
+    },
     "@moodlehq/cordova-plugin-local-notification": {
       "version": "0.9.0-moodle.2",
       "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-local-notification/-/cordova-plugin-local-notification-0.9.0-moodle.2.tgz",
@@ -39330,11 +39335,6 @@
       "resolved": "https://registry.npmjs.org/cordova-plugin-ionic-keyboard/-/cordova-plugin-ionic-keyboard-2.2.0.tgz",
       "integrity": "sha512-yDUG+9ieKVRitq5mGlNxjaZh/MgEhFFIgTIPhqSbUaQ8UuZbawy5mhJAVClqY97q8/rcQtL6dCDa7x2sEtCLcA=="
     },
-    "cordova-plugin-ionic-webview": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-ionic-webview/-/cordova-plugin-ionic-webview-5.0.0.tgz",
-      "integrity": "sha512-Wq0kCanxubK/JroTW4Mp5soayScnRyiY1eCkbwiz1Dyt1xHOiOW/v+1miqtBHtnZhcXw25TulCKAVJzkNBdmyg=="
-    },
     "cordova-plugin-media": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/cordova-plugin-media/-/cordova-plugin-media-5.0.3.tgz",
diff --git a/package.json b/package.json
index 8331ec89d..410bf7793 100644
--- a/package.json
+++ b/package.json
@@ -73,6 +73,7 @@
     "@ionic/angular": "^5.6.6",
     "@moodlehq/cordova-plugin-file-transfer": "1.7.1-moodle.2",
     "@moodlehq/cordova-plugin-inappbrowser": "5.0.0-moodle.2",
+    "@moodlehq/cordova-plugin-ionic-webview": "5.0.0-moodle.1",
     "@moodlehq/cordova-plugin-local-notification": "0.9.0-moodle.2",
     "@moodlehq/cordova-plugin-qrscanner": "3.0.1-moodle.2",
     "@moodlehq/phonegap-plugin-push": "2.2.3-moodle.1",
@@ -100,7 +101,6 @@
     "cordova-plugin-geolocation": "^4.1.0",
     "cordova-plugin-globalization": "^1.11.0",
     "cordova-plugin-ionic-keyboard": "^2.2.0",
-    "cordova-plugin-ionic-webview": "^5.0.0",
     "cordova-plugin-media": "^5.0.3",
     "cordova-plugin-media-capture": "^3.0.3",
     "cordova-plugin-network-information": "^2.0.2",
@@ -203,7 +203,7 @@
       },
       "@moodlehq/cordova-plugin-inappbrowser": {},
       "cordova-plugin-ionic-keyboard": {},
-      "cordova-plugin-ionic-webview": {},
+      "@moodlehq/cordova-plugin-ionic-webview": {},
       "@moodlehq/cordova-plugin-local-notification": {
         "ANDROID_SUPPORT_V4_VERSION": "26.+"
       },
diff --git a/src/core/features/h5p/assets/js/h5p.js b/src/core/features/h5p/assets/js/h5p.js
index ee1888a55..424ac842f 100644
--- a/src/core/features/h5p/assets/js/h5p.js
+++ b/src/core/features/h5p/assets/js/h5p.js
@@ -32,13 +32,17 @@ if (document.documentElement.requestFullScreen) {
   H5P.fullScreenBrowserPrefix = '';
 }
 else if (document.documentElement.webkitRequestFullScreen) {
-  H5P.safariBrowser = navigator.userAgent.match(/version\/([.\d]+)/i);
-  H5P.safariBrowser = (H5P.safariBrowser === null ? 0 : parseInt(H5P.safariBrowser[1]));
+  // This code has been changed to allow full screen in Moodle app.
+  H5P.fullScreenBrowserPrefix = 'webkit';
+  H5P.safariBrowser = 0;
 
-  // Do not allow fullscreen for safari < 7.
-  if (H5P.safariBrowser === 0 || H5P.safariBrowser > 6) {
-    H5P.fullScreenBrowserPrefix = 'webkit';
-  }
+  // H5P.safariBrowser = navigator.userAgent.match(/version\/([.\d]+)/i);
+  // H5P.safariBrowser = (H5P.safariBrowser === null ? 0 : parseInt(H5P.safariBrowser[1]));
+
+  // // Do not allow fullscreen for safari < 7.
+  // if (H5P.safariBrowser === 0 || H5P.safariBrowser > 6) {
+  //   H5P.fullScreenBrowserPrefix = 'webkit';
+  // }
 }
 else if (document.documentElement.mozRequestFullScreen) {
   H5P.fullScreenBrowserPrefix = 'moz';
diff --git a/src/core/features/h5p/assets/readme_moodle.txt b/src/core/features/h5p/assets/readme_moodle.txt
new file mode 100644
index 000000000..7a5805bae
--- /dev/null
+++ b/src/core/features/h5p/assets/readme_moodle.txt
@@ -0,0 +1,6 @@
+H5P library
+---------------
+
+Changes:
+
+1. The h5p.js file has been modified to make fullscreen work in the Moodle app. In line 34, the code inside the condition document.documentElement.webkitRequestFullScreen has changed, the original code has been commented.

From 2175a11dbb7011f4432fc313f6553a7d96c3906d Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 26 Aug 2021 09:58:07 +0200
Subject: [PATCH 0063/1008] MOBILE-3847 resource: Display error if resource WS
 call fails

---
 src/addons/mod/book/components/index/index.ts |  50 ++++----
 .../mod/imscp/components/index/index.ts       |  23 +---
 src/addons/mod/page/components/index/index.ts | 107 ++++++++----------
 .../mod/resource/components/index/index.ts    |  16 ++-
 .../components/index/addon-mod-url-index.html |   2 +-
 .../course/classes/main-activity-component.ts |   3 +-
 6 files changed, 79 insertions(+), 122 deletions(-)

diff --git a/src/addons/mod/book/components/index/index.ts b/src/addons/mod/book/components/index/index.ts
index 9473a677c..6cad64def 100644
--- a/src/addons/mod/book/components/index/index.ts
+++ b/src/addons/mod/book/components/index/index.ts
@@ -14,9 +14,7 @@
 
 import { Component, Optional, Input, OnInit } from '@angular/core';
 import { IonContent } from '@ionic/angular';
-import {
-    CoreCourseModuleMainResourceComponent, CoreCourseResourceDownloadResult,
-} from '@features/course/classes/main-resource-component';
+import { CoreCourseModuleMainResourceComponent } from '@features/course/classes/main-resource-component';
 import {
     AddonModBookProvider,
     AddonModBookContentsMap,
@@ -130,35 +128,10 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
      * @return Promise resolved when done.
      */
     protected async fetchContent(refresh = false): Promise<void> {
-        const promises: Promise<void>[] = [];
-        let downloadResult: CoreCourseResourceDownloadResult | undefined;
-
-        // Try to get the book data. Ignore errors since this WS isn't available in some Moodle versions.
-        promises.push(CoreUtils.ignoreErrors(AddonModBook.getBook(this.courseId, this.module.id))
-            .then((book) => {
-                if (!book) {
-                    return;
-                }
-
-                this.book = book;
-                this.dataRetrieved.emit(book);
-
-                this.description = book.intro;
-                this.displayNavBar = book.navstyle != AddonModBookNavStyle.TOC_ONLY;
-                this.displayTitlesInNavBar = book.navstyle == AddonModBookNavStyle.TEXT;
-
-                return;
-            }));
-
-        // Get module status to determine if it needs to be downloaded.
-        promises.push(this.downloadResourceIfNeeded(refresh).then((result) => {
-            downloadResult = result;
-
-            return;
-        }));
-
         try {
-            await Promise.all(promises);
+            const downloadResult = await this.downloadResourceIfNeeded(refresh);
+
+            await this.loadBookData();
 
             this.contentsMap = AddonModBook.getContentsMap(this.module.contents);
             this.chapters = AddonModBook.getTocList(this.module.contents);
@@ -191,6 +164,21 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
         }
     }
 
+    /**
+     * Load book data from WS.
+     *
+     * @return Promise resolved when done.
+     */
+    protected async loadBookData(): Promise<void> {
+        this.book = await AddonModBook.getBook(this.courseId, this.module.id);
+
+        this.dataRetrieved.emit(this.book);
+
+        this.description = this.book.intro;
+        this.displayNavBar = this.book.navstyle != AddonModBookNavStyle.TOC_ONLY;
+        this.displayTitlesInNavBar = this.book.navstyle == AddonModBookNavStyle.TEXT;
+    }
+
     /**
      * Load a book chapter.
      *
diff --git a/src/addons/mod/imscp/components/index/index.ts b/src/addons/mod/imscp/components/index/index.ts
index b6c6e301b..6941f8acc 100644
--- a/src/addons/mod/imscp/components/index/index.ts
+++ b/src/addons/mod/imscp/components/index/index.ts
@@ -14,10 +14,7 @@
 
 import { Component, OnInit, Optional } from '@angular/core';
 import { CoreSilentError } from '@classes/errors/silenterror';
-import {
-    CoreCourseModuleMainResourceComponent,
-    CoreCourseResourceDownloadResult,
-} from '@features/course/classes/main-resource-component';
+import { CoreCourseModuleMainResourceComponent } from '@features/course/classes/main-resource-component';
 import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
 import { CoreCourse } from '@features/course/services/course';
 import { CoreDomUtils } from '@services/utils/dom';
@@ -81,25 +78,13 @@ export class AddonModImscpIndexComponent extends CoreCourseModuleMainResourceCom
      * @return Promise resolved when done.
      */
     protected async fetchContent(refresh = false): Promise<void> {
-        let downloadResult: CoreCourseResourceDownloadResult;
-        const promises: Promise<void>[] = [];
+        try {
+            const downloadResult = await this.downloadResourceIfNeeded(refresh);
 
-        promises.push(AddonModImscp.getImscp(this.courseId, this.module.id).then((imscp) => {
+            const imscp = await AddonModImscp.getImscp(this.courseId, this.module.id);
             this.description = imscp.intro;
             this.dataRetrieved.emit(imscp);
 
-            return;
-        }));
-
-        promises.push(this.downloadResourceIfNeeded(refresh).then((result) => {
-            downloadResult = result;
-
-            return;
-        }));
-
-        try {
-            await Promise.all(promises);
-
             this.items = AddonModImscp.createItemList(this.module.contents);
 
             if (this.items.length && typeof this.currentItem == 'undefined') {
diff --git a/src/addons/mod/page/components/index/index.ts b/src/addons/mod/page/components/index/index.ts
index acfedd74b..4dad5b9be 100644
--- a/src/addons/mod/page/components/index/index.ts
+++ b/src/addons/mod/page/components/index/index.ts
@@ -13,9 +13,7 @@
 // limitations under the License.
 
 import { Component, OnInit, Optional } from '@angular/core';
-import {
-    CoreCourseModuleMainResourceComponent,
-} from '@features/course/classes/main-resource-component';
+import { CoreCourseModuleMainResourceComponent } from '@features/course/classes/main-resource-component';
 import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
 import { CoreCourse, CoreCourseWSModule } from '@features/course/services/course';
 import { CoreTextUtils } from '@services/utils/text';
@@ -82,70 +80,57 @@ export class AddonModPageIndexComponent extends CoreCourseModuleMainResourceComp
      * @return Promise resolved when done.
      */
     protected async fetchContent(refresh?: boolean): Promise<void> {
-        // Download the resource if it needs to be downloaded.
         try {
+            // Download the resource if it needs to be downloaded.
             const downloadResult = await this.downloadResourceIfNeeded(refresh);
 
-            const promises: Promise<void>[] = [];
+            const results = await Promise.all([
+                this.loadPageData(),
+                AddonModPageHelper.getPageHtml(this.module.contents, this.module.id),
+            ]);
 
-            let getPagePromise: Promise<CoreCourseWSModule | AddonModPagePage>;
-
-            // Get the module to get the latest title and description. Data should've been updated in download.
-            if (this.canGetPage) {
-                getPagePromise = AddonModPage.getPageData(this.courseId, this.module.id);
-            } else {
-                getPagePromise = CoreCourse.getModule(this.module.id, this.courseId);
-            }
-
-            promises.push(getPagePromise.then((page) => {
-                if (!page) {
-                    return;
-                }
-
-                this.description = 'intro' in page ? page.intro : page.description;
-                this.dataRetrieved.emit(page);
-
-                if (!this.canGetPage) {
-                    return;
-                }
-
-                this.page = page;
-
-                // Check if description and timemodified should be displayed.
-                if ('displayoptions' in this.page) {
-                    const options: Record<string, string | boolean> =
-                        CoreTextUtils.unserialize(this.page.displayoptions) || {};
-
-                    this.displayDescription = typeof options.printintro == 'undefined' ||
-                            CoreUtils.isTrueOrOne(options.printintro);
-                    this.displayTimemodified = typeof options.printlastmodified == 'undefined' ||
-                            CoreUtils.isTrueOrOne(options.printlastmodified);
-                } else {
-                    this.displayDescription = true;
-                    this.displayTimemodified = true;
-                }
-
-                this.timemodified = 'timemodified' in this.page ? this.page.timemodified : undefined;
-
-                return;
-            }).catch(() => {
-                // Ignore errors.
-            }));
-
-            // Get the page HTML.
-            promises.push(AddonModPageHelper.getPageHtml(this.module.contents, this.module.id).then((content) => {
-
-                this.contents = content;
-                this.warning = downloadResult?.failed ? this.getErrorDownloadingSomeFilesMessage(downloadResult.error!) : '';
-
-                return;
-            }));
-
-            await Promise.all(promises);
+            this.contents = results[1];
+            this.warning = downloadResult?.failed ? this.getErrorDownloadingSomeFilesMessage(downloadResult.error!) : '';
         } finally {
-            // Pass false because downloadResourceIfNeeded already invalidates and refresh data if refresh=true.
-            this.fillContextMenu(false);
+            this.fillContextMenu(refresh);
         }
     }
 
+    /**
+     * Load page data from WS.
+     *
+     * @return Promise resolved when done.
+     */
+    protected async loadPageData(): Promise<void> {
+        // Get latest title, description and some extra data. Data should've been updated in download.
+        const page = this.canGetPage ?
+            await AddonModPage.getPageData(this.courseId, this.module.id) :
+            await CoreCourse.getModule(this.module.id, this.courseId);
+
+        this.description = 'intro' in page ? page.intro : page.description;
+        this.dataRetrieved.emit(page);
+
+        if (!this.canGetPage) {
+            return;
+        }
+
+        this.page = page;
+
+        // Check if description and timemodified should be displayed.
+        if ('displayoptions' in this.page) {
+            const options: Record<string, string | boolean> =
+                CoreTextUtils.unserialize(this.page.displayoptions) || {};
+
+            this.displayDescription = typeof options.printintro == 'undefined' ||
+                    CoreUtils.isTrueOrOne(options.printintro);
+            this.displayTimemodified = typeof options.printlastmodified == 'undefined' ||
+                    CoreUtils.isTrueOrOne(options.printlastmodified);
+        } else {
+            this.displayDescription = true;
+            this.displayTimemodified = true;
+        }
+
+        this.timemodified = 'timemodified' in this.page ? this.page.timemodified : undefined;
+    }
+
 }
diff --git a/src/addons/mod/resource/components/index/index.ts b/src/addons/mod/resource/components/index/index.ts
index 11f4241c2..29f8e101e 100644
--- a/src/addons/mod/resource/components/index/index.ts
+++ b/src/addons/mod/resource/components/index/index.ts
@@ -14,9 +14,7 @@
 
 import { Component, OnDestroy, OnInit, Optional } from '@angular/core';
 import { CoreError } from '@classes/errors/error';
-import {
-    CoreCourseModuleMainResourceComponent,
-} from '@features/course/classes/main-resource-component';
+import { CoreCourseModuleMainResourceComponent } from '@features/course/classes/main-resource-component';
 import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
 import { CoreCourse, CoreCourseWSModule } from '@features/course/services/course';
 import { CoreCourseModulePrefetchDelegate } from '@features/course/services/module-prefetch-delegate';
@@ -118,13 +116,13 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
 
         // Get the resource instance to get the latest name/description and to know if it's embedded.
         if (this.canGetResource) {
-            resource = await CoreUtils.ignoreErrors(AddonModResource.getResourceData(this.courseId, this.module.id));
-            this.description = resource?.intro || '';
-            options = resource?.displayoptions ? CoreTextUtils.unserialize(resource.displayoptions) : {};
+            resource = await AddonModResource.getResourceData(this.courseId, this.module.id);
+            this.description = resource.intro || '';
+            options = resource.displayoptions ? CoreTextUtils.unserialize(resource.displayoptions) : {};
         } else {
-            resource = await CoreUtils.ignoreErrors(CoreCourse.getModule(this.module.id, this.courseId));
-            this.description = resource?.description || '';
-            options = resource?.customdata ? CoreTextUtils.unserialize(CoreTextUtils.parseJSON(resource.customdata)) : {};
+            resource = await CoreCourse.getModule(this.module.id, this.courseId);
+            this.description = resource.description || '';
+            options = resource.customdata ? CoreTextUtils.unserialize(CoreTextUtils.parseJSON(resource.customdata)) : {};
         }
 
         try {
diff --git a/src/addons/mod/url/components/index/addon-mod-url-index.html b/src/addons/mod/url/components/index/addon-mod-url-index.html
index d673cbea8..48f9b1f91 100644
--- a/src/addons/mod/url/components/index/addon-mod-url-index.html
+++ b/src/addons/mod/url/components/index/addon-mod-url-index.html
@@ -28,7 +28,7 @@
         <core-iframe [src]="url"></core-iframe>
     </div>
 
-    <ion-list *ngIf="!shouldIframe && (!shouldEmbed || !isOther)">
+    <ion-list *ngIf="url && !shouldIframe && (!shouldEmbed || !isOther)">
         <ion-item *ngIf="shouldEmbed">
             <ion-label>
                 <img *ngIf="isImage" [alt]="name" [src]="url">
diff --git a/src/core/features/course/classes/main-activity-component.ts b/src/core/features/course/classes/main-activity-component.ts
index a601ad17a..fa0d93546 100644
--- a/src/core/features/course/classes/main-activity-component.ts
+++ b/src/core/features/course/classes/main-activity-component.ts
@@ -26,6 +26,7 @@ import { CoreDomUtils } from '@services/utils/dom';
 import { CoreWSExternalWarning } from '@services/ws';
 import { CoreCourseContentsPage } from '../pages/contents/contents';
 import { CoreConstants } from '@/core/constants';
+import { CoreSites } from '@services/sites';
 
 /**
  * Template class to easily create CoreCourseModuleMainComponent of activities.
@@ -211,7 +212,7 @@ export class CoreCourseModuleMainActivityComponent extends CoreCourseModuleMainR
 
             await this.fetchContent(refresh, sync, showErrors);
         } catch (error) {
-            if (!refresh) {
+            if (!refresh && !CoreSites.getCurrentSite()?.isOfflineDisabled()) {
                 // Some call failed, retry without using cache since it might be a new activity.
                 return await this.refreshContent(sync);
             }

From 28056bf1764ca9980acc83b41f1101279e61ad37 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 26 Aug 2021 11:22:53 +0200
Subject: [PATCH 0064/1008] MOBILE-3847 mod: Improve error message when module
 not found

---
 scripts/langindex.json                             | 1 +
 src/addons/mod/assign/services/assign.ts           | 4 ++--
 src/addons/mod/book/services/book.ts               | 4 ++--
 src/addons/mod/chat/services/chat.ts               | 2 +-
 src/addons/mod/choice/services/choice.ts           | 4 ++--
 src/addons/mod/data/services/data.ts               | 4 ++--
 src/addons/mod/feedback/services/feedback.ts       | 4 ++--
 src/addons/mod/folder/services/folder.ts           | 4 ++--
 src/addons/mod/forum/services/forum.ts             | 3 ++-
 src/addons/mod/glossary/services/glossary.ts       | 4 ++--
 src/addons/mod/h5pactivity/services/h5pactivity.ts | 2 +-
 src/addons/mod/imscp/services/imscp.ts             | 4 ++--
 src/addons/mod/label/services/label.ts             | 4 ++--
 src/addons/mod/lesson/services/lesson.ts           | 2 +-
 src/addons/mod/lti/services/lti.ts                 | 2 +-
 src/addons/mod/page/services/page.ts               | 4 ++--
 src/addons/mod/quiz/services/quiz.ts               | 2 +-
 src/addons/mod/resource/services/resource.ts       | 4 ++--
 src/addons/mod/scorm/services/scorm.ts             | 2 +-
 src/addons/mod/survey/services/survey.ts           | 4 ++--
 src/addons/mod/url/services/url.ts                 | 4 ++--
 src/addons/mod/wiki/services/wiki.ts               | 2 +-
 src/addons/mod/workshop/services/workshop.ts       | 4 ++--
 src/core/features/course/lang.json                 | 1 +
 src/core/features/course/services/course.ts        | 2 +-
 25 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index df750b6bf..5aa09b9f6 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1497,6 +1497,7 @@
   "core.course.insufficientavailablequota": "local_moodlemobileapp",
   "core.course.insufficientavailablespace": "local_moodlemobileapp",
   "core.course.manualcompletionnotsynced": "local_moodlemobileapp",
+  "core.course.modulenotfound": "local_moodlemobileapp",
   "core.course.nocontentavailable": "local_moodlemobileapp",
   "core.course.overriddennotice": "grades",
   "core.course.refreshcourse": "local_moodlemobileapp",
diff --git a/src/addons/mod/assign/services/assign.ts b/src/addons/mod/assign/services/assign.ts
index 8ebc66911..d55024c97 100644
--- a/src/addons/mod/assign/services/assign.ts
+++ b/src/addons/mod/assign/services/assign.ts
@@ -17,7 +17,7 @@ import { CoreSites, CoreSitesCommonWSOptions, CoreSitesReadingStrategy } from '@
 import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
 import { CoreInterceptor } from '@classes/interceptor';
 import { CoreWSExternalWarning, CoreWSExternalFile, CoreWSFile } from '@services/ws';
-import { makeSingleton } from '@singletons';
+import { makeSingleton, Translate } from '@singletons';
 import { CoreCourseCommonModWSOptions } from '@features/course/services/course';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreGrades } from '@features/grades/services/grades';
@@ -218,7 +218,7 @@ export class AddonModAssignProvider {
             }
         }
 
-        throw new CoreError('Assignment not found');
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**
diff --git a/src/addons/mod/book/services/book.ts b/src/addons/mod/book/services/book.ts
index d87e9e34e..cfdfdf680 100644
--- a/src/addons/mod/book/services/book.ts
+++ b/src/addons/mod/book/services/book.ts
@@ -17,7 +17,7 @@ import { CoreSites, CoreSitesCommonWSOptions } from '@services/sites';
 import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
 import { CoreTagItem } from '@features/tag/services/tag';
 import { CoreWSExternalWarning, CoreWSExternalFile, CoreWS } from '@services/ws';
-import { makeSingleton } from '@singletons';
+import { makeSingleton, Translate } from '@singletons';
 import { CoreCourseLogHelper } from '@features/course/services/log-helper';
 import { CoreCourse, CoreCourseModuleContentFile } from '@features/course/services/course';
 import { CoreUtils } from '@services/utils/utils';
@@ -103,7 +103,7 @@ export class AddonModBookProvider {
             return book;
         }
 
-        throw new CoreError('Book not found');
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**
diff --git a/src/addons/mod/chat/services/chat.ts b/src/addons/mod/chat/services/chat.ts
index 2882cc6c1..12af031ca 100644
--- a/src/addons/mod/chat/services/chat.ts
+++ b/src/addons/mod/chat/services/chat.ts
@@ -61,7 +61,7 @@ export class AddonModChatProvider {
             return chat;
         }
 
-        throw new CoreError('Chat not found.');
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**
diff --git a/src/addons/mod/choice/services/choice.ts b/src/addons/mod/choice/services/choice.ts
index 8e6af5989..af256c9ee 100644
--- a/src/addons/mod/choice/services/choice.ts
+++ b/src/addons/mod/choice/services/choice.ts
@@ -23,7 +23,7 @@ import { CoreFilepool } from '@services/filepool';
 import { CoreSites, CoreSitesCommonWSOptions } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreStatusWithWarningsWSResponse, CoreWSExternalFile, CoreWSExternalWarning } from '@services/ws';
-import { makeSingleton } from '@singletons';
+import { makeSingleton, Translate } from '@singletons';
 import { AddonModChoiceOffline } from './choice-offline';
 import { AddonModChoiceAutoSyncData, AddonModChoiceSyncProvider } from './choice-sync';
 
@@ -215,7 +215,7 @@ export class AddonModChoiceProvider {
             return currentChoice;
         }
 
-        throw new CoreError('Choice not found.');
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**
diff --git a/src/addons/mod/data/services/data.ts b/src/addons/mod/data/services/data.ts
index 47665a5ca..5d40d3cd8 100644
--- a/src/addons/mod/data/services/data.ts
+++ b/src/addons/mod/data/services/data.ts
@@ -25,7 +25,7 @@ import { CoreFilepool } from '@services/filepool';
 import { CoreSites, CoreSitesCommonWSOptions, CoreSitesReadingStrategy } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreWSExternalFile, CoreWSExternalWarning } from '@services/ws';
-import { makeSingleton } from '@singletons';
+import { makeSingleton, Translate } from '@singletons';
 import { AddonModDataFieldsDelegate } from './data-fields-delegate';
 import { AddonModDataOffline } from './data-offline';
 import { AddonModDataAutoSyncData, AddonModDataSyncProvider } from './data-sync';
@@ -586,7 +586,7 @@ export class AddonModDataProvider {
             return currentData;
         }
 
-        throw new CoreError('Activity not found');
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**
diff --git a/src/addons/mod/feedback/services/feedback.ts b/src/addons/mod/feedback/services/feedback.ts
index c1b696b67..3208cd482 100644
--- a/src/addons/mod/feedback/services/feedback.ts
+++ b/src/addons/mod/feedback/services/feedback.ts
@@ -22,7 +22,7 @@ import { CoreFilepool } from '@services/filepool';
 import { CoreSites, CoreSitesCommonWSOptions, CoreSitesReadingStrategy } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreWSExternalFile, CoreWSExternalWarning, CoreWSStoredFile } from '@services/ws';
-import { makeSingleton } from '@singletons';
+import { makeSingleton, Translate } from '@singletons';
 import { AddonModFeedbackOffline } from './feedback-offline';
 import { AddonModFeedbackAutoSyncData, AddonModFeedbackSyncProvider } from './feedback-sync';
 
@@ -605,7 +605,7 @@ export class AddonModFeedbackProvider {
             return currentFeedback;
         }
 
-        throw new CoreError('Feedback not found.');
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**
diff --git a/src/addons/mod/folder/services/folder.ts b/src/addons/mod/folder/services/folder.ts
index fd73dcd51..f868c2e27 100644
--- a/src/addons/mod/folder/services/folder.ts
+++ b/src/addons/mod/folder/services/folder.ts
@@ -20,7 +20,7 @@ import { CoreCourseLogHelper } from '@features/course/services/log-helper';
 import { CoreSites, CoreSitesCommonWSOptions } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreWSExternalFile, CoreWSExternalWarning } from '@services/ws';
-import { makeSingleton } from '@singletons';
+import { makeSingleton, Translate } from '@singletons';
 
 const ROOT_CACHE_KEY = 'mmaModFolder:';
 
@@ -80,7 +80,7 @@ export class AddonModFolderProvider {
             return currentFolder;
         }
 
-        throw new CoreError('Folder not found');
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**
diff --git a/src/addons/mod/forum/services/forum.ts b/src/addons/mod/forum/services/forum.ts
index bf53d6c30..86da4b29e 100644
--- a/src/addons/mod/forum/services/forum.ts
+++ b/src/addons/mod/forum/services/forum.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import { Injectable } from '@angular/core';
+import { CoreError } from '@classes/errors/error';
 import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
 import { CoreCourseCommonModWSOptions } from '@features/course/services/course';
 import { CoreCourseLogHelper } from '@features/course/services/log-helper';
@@ -480,7 +481,7 @@ export class AddonModForumProvider {
         const forum = forums.find(forum => forum.cmid == cmId);
 
         if (!forum) {
-            throw new Error('Forum not found');
+            throw new CoreError(Translate.instant('core.course.modulenotfound'));
         }
 
         return forum;
diff --git a/src/addons/mod/glossary/services/glossary.ts b/src/addons/mod/glossary/services/glossary.ts
index e5f6cef2d..a9476adbe 100644
--- a/src/addons/mod/glossary/services/glossary.ts
+++ b/src/addons/mod/glossary/services/glossary.ts
@@ -811,7 +811,7 @@ export class AddonModGlossaryProvider {
             return glossary;
         }
 
-        throw new CoreError('Glossary not found.');
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**
@@ -835,7 +835,7 @@ export class AddonModGlossaryProvider {
             return glossary;
         }
 
-        throw new CoreError('Glossary not found.');
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**
diff --git a/src/addons/mod/h5pactivity/services/h5pactivity.ts b/src/addons/mod/h5pactivity/services/h5pactivity.ts
index 7f16095fc..2c7f3f6d7 100644
--- a/src/addons/mod/h5pactivity/services/h5pactivity.ts
+++ b/src/addons/mod/h5pactivity/services/h5pactivity.ts
@@ -528,7 +528,7 @@ export class AddonModH5PActivityProvider {
             return currentActivity;
         }
 
-        throw new CoreError(Translate.instant('addon.mod_h5pactivity.errorgetactivity'));
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**
diff --git a/src/addons/mod/imscp/services/imscp.ts b/src/addons/mod/imscp/services/imscp.ts
index 2cfa5eb3e..df87b4684 100644
--- a/src/addons/mod/imscp/services/imscp.ts
+++ b/src/addons/mod/imscp/services/imscp.ts
@@ -24,7 +24,7 @@ import { CoreSitesCommonWSOptions, CoreSites } from '@services/sites';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreWSExternalFile, CoreWSExternalWarning } from '@services/ws';
-import { makeSingleton } from '@singletons';
+import { makeSingleton, Translate } from '@singletons';
 
 const ROOT_CACHE_KEY = 'mmaModImscp:';
 
@@ -183,7 +183,7 @@ export class AddonModImscpProvider {
             return currentImscp;
         }
 
-        throw new CoreError('Imscp not found');
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**
diff --git a/src/addons/mod/label/services/label.ts b/src/addons/mod/label/services/label.ts
index ca5488a23..21f673e6b 100644
--- a/src/addons/mod/label/services/label.ts
+++ b/src/addons/mod/label/services/label.ts
@@ -19,7 +19,7 @@ import { CoreFilepool } from '@services/filepool';
 import { CoreSites, CoreSitesCommonWSOptions } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreWSExternalFile, CoreWSExternalWarning } from '@services/ws';
-import { makeSingleton } from '@singletons';
+import { makeSingleton, Translate } from '@singletons';
 
 const ROOT_CACHE_KEY = 'mmaModLabel:';
 
@@ -77,7 +77,7 @@ export class AddonModLabelProvider {
             return currentLabel;
         }
 
-        throw new CoreError('Label not found');
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**
diff --git a/src/addons/mod/lesson/services/lesson.ts b/src/addons/mod/lesson/services/lesson.ts
index fe86bbe71..be4d8c826 100644
--- a/src/addons/mod/lesson/services/lesson.ts
+++ b/src/addons/mod/lesson/services/lesson.ts
@@ -1445,7 +1445,7 @@ export class AddonModLessonProvider {
             return currentLesson;
         }
 
-        throw new CoreError('Lesson not found.');
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**
diff --git a/src/addons/mod/lti/services/lti.ts b/src/addons/mod/lti/services/lti.ts
index 44e2d7604..35678bb66 100644
--- a/src/addons/mod/lti/services/lti.ts
+++ b/src/addons/mod/lti/services/lti.ts
@@ -110,7 +110,7 @@ export class AddonModLtiProvider {
             return currentLti;
         }
 
-        throw new CoreError('Activity not found.');
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**
diff --git a/src/addons/mod/page/services/page.ts b/src/addons/mod/page/services/page.ts
index 42cb139f4..f936f0d64 100644
--- a/src/addons/mod/page/services/page.ts
+++ b/src/addons/mod/page/services/page.ts
@@ -16,7 +16,7 @@ import { Injectable } from '@angular/core';
 import { CoreSitesCommonWSOptions, CoreSites } from '@services/sites';
 import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
 import { CoreWSExternalWarning, CoreWSExternalFile } from '@services/ws';
-import { makeSingleton } from '@singletons';
+import { makeSingleton, Translate } from '@singletons';
 import { CoreFilepool } from '@services/filepool';
 import { CoreCourse } from '@features/course/services/course';
 import { CoreUtils } from '@services/utils/utils';
@@ -79,7 +79,7 @@ export class AddonModPageProvider {
             return currentPage;
         }
 
-        throw new CoreError('Page not found');
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**
diff --git a/src/addons/mod/quiz/services/quiz.ts b/src/addons/mod/quiz/services/quiz.ts
index 478a4dce5..30216d969 100644
--- a/src/addons/mod/quiz/services/quiz.ts
+++ b/src/addons/mod/quiz/services/quiz.ts
@@ -748,7 +748,7 @@ export class AddonModQuizProvider {
         const quiz = response.quizzes.find(quiz => quiz[key] == value);
 
         if (!quiz) {
-            throw new CoreError('Quiz not found.');
+            throw new CoreError(Translate.instant('core.course.modulenotfound'));
         }
 
         return quiz;
diff --git a/src/addons/mod/resource/services/resource.ts b/src/addons/mod/resource/services/resource.ts
index e99552ac1..23f21dc62 100644
--- a/src/addons/mod/resource/services/resource.ts
+++ b/src/addons/mod/resource/services/resource.ts
@@ -21,7 +21,7 @@ import { CoreFilepool } from '@services/filepool';
 import { CoreSites, CoreSitesCommonWSOptions } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreWSExternalFile, CoreWSExternalWarning } from '@services/ws';
-import { makeSingleton } from '@singletons';
+import { makeSingleton, Translate } from '@singletons';
 
 const ROOT_CACHE_KEY = 'mmaModResource:';
 
@@ -82,7 +82,7 @@ export class AddonModResourceProvider {
             return currentResource;
         }
 
-        throw new CoreError('Resource not found');
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**
diff --git a/src/addons/mod/scorm/services/scorm.ts b/src/addons/mod/scorm/services/scorm.ts
index daeace34c..340eb6ed8 100644
--- a/src/addons/mod/scorm/services/scorm.ts
+++ b/src/addons/mod/scorm/services/scorm.ts
@@ -1105,7 +1105,7 @@ export class AddonModScormProvider {
 
         const currentScorm = <AddonModScormScorm> response.scorms.find(scorm => scorm[key] == value);
         if (!currentScorm) {
-            throw new CoreError('SCORM not found.');
+            throw new CoreError(Translate.instant('core.course.modulenotfound'));
         }
 
         // If the SCORM isn't available the WS returns a warning and it doesn't return timeopen and timeclosed.
diff --git a/src/addons/mod/survey/services/survey.ts b/src/addons/mod/survey/services/survey.ts
index a6d5d9997..523a7fa8d 100644
--- a/src/addons/mod/survey/services/survey.ts
+++ b/src/addons/mod/survey/services/survey.ts
@@ -22,7 +22,7 @@ import { CoreFilepool } from '@services/filepool';
 import { CoreSites, CoreSitesCommonWSOptions } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreStatusWithWarningsWSResponse, CoreWSExternalFile, CoreWSExternalWarning } from '@services/ws';
-import { makeSingleton } from '@singletons';
+import { makeSingleton, Translate } from '@singletons';
 import { AddonModSurveyOffline } from './survey-offline';
 
 const ROOT_CACHE_KEY = 'mmaModSurvey:';
@@ -121,7 +121,7 @@ export class AddonModSurveyProvider {
             return currentSurvey;
         }
 
-        throw new CoreError('Activity not found.');
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**
diff --git a/src/addons/mod/url/services/url.ts b/src/addons/mod/url/services/url.ts
index 45b260224..2cac565ba 100644
--- a/src/addons/mod/url/services/url.ts
+++ b/src/addons/mod/url/services/url.ts
@@ -16,7 +16,7 @@ import { Injectable } from '@angular/core';
 import { CoreSites, CoreSitesCommonWSOptions } from '@services/sites';
 import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
 import { CoreWSExternalWarning, CoreWSExternalFile } from '@services/ws';
-import { makeSingleton } from '@singletons';
+import { makeSingleton, Translate } from '@singletons';
 import { CoreConstants } from '@/core/constants';
 import { CoreMimetypeUtils } from '@services/utils/mimetype';
 import { CoreCourse } from '@features/course/services/course';
@@ -131,7 +131,7 @@ export class AddonModUrlProvider {
             return currentUrl;
         }
 
-        throw new CoreError('Url not found');
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**
diff --git a/src/addons/mod/wiki/services/wiki.ts b/src/addons/mod/wiki/services/wiki.ts
index 5a10fc8b9..f150b3834 100644
--- a/src/addons/mod/wiki/services/wiki.ts
+++ b/src/addons/mod/wiki/services/wiki.ts
@@ -397,7 +397,7 @@ export class AddonModWikiProvider {
             return currentWiki;
         }
 
-        throw new CoreError('Wiki not found.');
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**
diff --git a/src/addons/mod/workshop/services/workshop.ts b/src/addons/mod/workshop/services/workshop.ts
index ba637e2ff..27d802240 100644
--- a/src/addons/mod/workshop/services/workshop.ts
+++ b/src/addons/mod/workshop/services/workshop.ts
@@ -23,7 +23,7 @@ import { CoreSites, CoreSitesCommonWSOptions, CoreSitesReadingStrategy } from '@
 import { CoreTextFormat, defaultTextFormat } from '@services/utils/text';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreStatusWithWarningsWSResponse, CoreWS, CoreWSExternalFile, CoreWSExternalWarning } from '@services/ws';
-import { makeSingleton } from '@singletons';
+import { makeSingleton, Translate } from '@singletons';
 import { CoreFormFields } from '@singletons/form';
 import { AddonModWorkshopOffline } from './workshop-offline';
 import { AddonModWorkshopAutoSyncData, AddonModWorkshopSyncProvider } from './workshop-sync';
@@ -272,7 +272,7 @@ export class AddonModWorkshopProvider {
 
         const workshop = response.workshops.find((workshop) => workshop[key] == value);
         if (!workshop) {
-            throw new CoreError('Activity not found');
+            throw new CoreError(Translate.instant('core.course.modulenotfound'));
         }
 
         // Set submission types for Moodle 3.5 and older.
diff --git a/src/core/features/course/lang.json b/src/core/features/course/lang.json
index f383e9d84..7afa1a068 100644
--- a/src/core/features/course/lang.json
+++ b/src/core/features/course/lang.json
@@ -41,6 +41,7 @@
     "insufficientavailablespace": "You are trying to download {{size}}. This will leave your device with insufficient space to operate normally. Please clear some storage space first.",
     "insufficientavailablequota": "Your device could not allocate space to save this download. It may be reserving space for app and system updates. Please clear some storage space first.",
     "manualcompletionnotsynced": "Manual completion not synchronised.",
+    "modulenotfound": "Resource or activity not found, please make sure you're online and it's still available.",
     "nocontentavailable": "No content available at the moment.",
     "overriddennotice": "Your final grade from this activity was manually adjusted.",
     "refreshcourse": "Refresh course",
diff --git a/src/core/features/course/services/course.ts b/src/core/features/course/services/course.ts
index e03b779a2..8aa879d2c 100644
--- a/src/core/features/course/services/course.ts
+++ b/src/core/features/course/services/course.ts
@@ -505,7 +505,7 @@ export class CoreCourseProvider {
             return foundModule;
         }
 
-        throw Error('Module not found');
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**

From 54abd2e0bc2e42d6a87c68fa697e111e975874d3 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 5 Aug 2021 09:38:41 +0200
Subject: [PATCH 0065/1008] MOBILE-3793 forum: Fix sync not unblocked in
 offline

It happened when the user clicked to Reply another post while editing an offline reply
---
 src/addons/mod/forum/components/post/post.ts  | 45 ++++++++++---------
 .../forum/pages/discussion/discussion.page.ts |  9 +++-
 2 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/src/addons/mod/forum/components/post/post.ts b/src/addons/mod/forum/components/post/post.ts
index a7021eee4..a59a9c1da 100644
--- a/src/addons/mod/forum/components/post/post.ts
+++ b/src/addons/mod/forum/components/post/post.ts
@@ -54,6 +54,7 @@ import { AddonModForumEditPostComponent } from '../edit-post/edit-post';
 import { CoreRatingInfo } from '@features/rating/services/rating';
 import { CoreForms } from '@singletons/form';
 import { CoreFileEntry } from '@services/file-helper';
+import { AddonModForumSharedReplyData } from '../../pages/discussion/discussion.page';
 
 /**
  * Components that shows a discussion post, its attachments and the action buttons allowed (reply, etc.).
@@ -71,7 +72,7 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
     @Input() discussion?: AddonModForumDiscussion; // Post's' discussion, only for starting posts.
     @Input() component!: string; // Component this post belong to.
     @Input() componentId!: number; // Component ID.
-    @Input() replyData!: AddonModForumReply; // Object with the new post data. Usually shared between posts.
+    @Input() replyData!: AddonModForumSharedReplyData; // Object with the new post data. Usually shared between posts.
     @Input() originalData!: Omit<AddonModForumReply, 'id'>; // Object with the original post data. Usually shared between posts.
     @Input() trackPosts!: boolean; // True if post is being tracked.
     @Input() forum!: AddonModForumData; // The forum the post belongs to. Required for attachments and offline posts.
@@ -93,8 +94,6 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
     displaySubject = true;
     optionsMenuEnabled = false;
 
-    protected syncId!: string;
-
     constructor(
         protected elementRef: ElementRef,
         @Optional() protected content?: IonContent,
@@ -372,8 +371,8 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
         try {
             await this.confirmDiscard();
 
-            this.syncId = AddonModForumSync.getDiscussionSyncId(this.discussionId);
-            CoreSync.blockOperation(AddonModForumProvider.COMPONENT, this.syncId);
+            this.replyData.syncId = AddonModForumSync.getDiscussionSyncId(this.discussionId);
+            CoreSync.blockOperation(AddonModForumProvider.COMPONENT, this.replyData.syncId);
 
             this.setReplyFormData(
                 this.post.parentid,
@@ -498,9 +497,7 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
 
             CoreForms.triggerFormSubmittedEvent(this.formElement, sent, CoreSites.getCurrentSiteId());
 
-            if (this.syncId) {
-                CoreSync.unblockOperation(AddonModForumProvider.COMPONENT, this.syncId);
-            }
+            this.unblockOperation();
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'addon.mod_forum.couldnotadd', true);
         } finally {
@@ -520,9 +517,7 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
 
             CoreForms.triggerFormCancelledEvent(this.formElement, CoreSites.getCurrentSiteId());
 
-            if (this.syncId) {
-                CoreSync.unblockOperation(AddonModForumProvider.COMPONENT, this.syncId);
-            }
+            this.unblockOperation();
         } catch (error) {
             // Cancelled.
         }
@@ -552,9 +547,7 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
 
             this.onPostChange.emit();
 
-            if (this.syncId) {
-                CoreSync.unblockOperation(AddonModForumProvider.COMPONENT, this.syncId);
-            }
+            this.unblockOperation();
         } catch (error) {
             // Cancelled.
         }
@@ -578,9 +571,7 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
      * Component being destroyed.
      */
     ngOnDestroy(): void {
-        if (this.syncId) {
-            CoreSync.unblockOperation(AddonModForumProvider.COMPONENT, this.syncId);
-        }
+        this.unblockOperation();
     }
 
     /**
@@ -588,13 +579,25 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
      *
      * @return Promise resolved if the user confirms or data was not changed and rejected otherwise.
      */
-    protected confirmDiscard(): Promise<void> {
+    protected async confirmDiscard(): Promise<void> {
         if (AddonModForumHelper.hasPostDataChanged(this.replyData, this.originalData)) {
             // Show confirmation if some data has been modified.
-            return CoreDomUtils.showConfirm(Translate.instant('core.confirmloss'));
-        } else {
-            return Promise.resolve();
+            await CoreDomUtils.showConfirm(Translate.instant('core.confirmloss'));
         }
+
+        this.unblockOperation();
+    }
+
+    /**
+     * Unblock operation if there's any blocked operation.
+     */
+    protected unblockOperation(): void {
+        if (!this.replyData.syncId) {
+            return;
+        }
+
+        CoreSync.unblockOperation(AddonModForumProvider.COMPONENT, this.replyData.syncId);
+        delete this.replyData.syncId;
     }
 
 }
diff --git a/src/addons/mod/forum/pages/discussion/discussion.page.ts b/src/addons/mod/forum/pages/discussion/discussion.page.ts
index c9b89e9c6..ae7f6d128 100644
--- a/src/addons/mod/forum/pages/discussion/discussion.page.ts
+++ b/src/addons/mod/forum/pages/discussion/discussion.page.ts
@@ -74,7 +74,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
     postHasOffline!: boolean;
     sort: SortType = 'nested';
     trackPosts!: boolean;
-    replyData: Omit<AddonModForumReply, 'id'> = {
+    replyData: AddonModForumSharedReplyData = {
         replyingTo: 0,
         isEditing: false,
         subject: '',
@@ -795,3 +795,10 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
     }
 
 }
+
+/**
+ * Reply data shared by post.
+ */
+export type AddonModForumSharedReplyData = Omit<AddonModForumReply, 'id'> & {
+    syncId?: string; // Sync ID if some post has blocked synchronization.
+};

From a0683848677c809c977e1ac76692671bc8be3a25 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 5 Aug 2021 11:25:13 +0200
Subject: [PATCH 0066/1008] MOBILE-3793 forum: Scroll to form when edit offline
 reply

---
 src/addons/mod/forum/components/post/post.ts | 44 +++++++++++---------
 src/core/services/utils/dom.ts               | 19 ++++++---
 2 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/src/addons/mod/forum/components/post/post.ts b/src/addons/mod/forum/components/post/post.ts
index a59a9c1da..0f1107cb6 100644
--- a/src/addons/mod/forum/components/post/post.ts
+++ b/src/addons/mod/forum/components/post/post.ts
@@ -225,6 +225,7 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
                 cmId: this.forum.cmid,
             },
             event,
+            waitForDismiss: true,
         });
 
         if (popoverData && popoverData.action) {
@@ -319,15 +320,7 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
                 await this.confirmDiscard();
                 this.setReplyFormData(this.post.id);
 
-                if (this.content) {
-                    setTimeout(() => {
-                        CoreDomUtils.scrollToElementBySelector(
-                            this.elementRef.nativeElement,
-                            this.content,
-                            '#addon-forum-reply-edit-form-' + this.uniqueId,
-                        );
-                    });
-                }
+                this.scrollToForm();
             } catch {
                 // Cancelled.
             }
@@ -351,16 +344,7 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
             this.messageControl.setValue(this.replyData.message);
         }
 
-        if (this.content) {
-            setTimeout(() => {
-                CoreDomUtils.scrollToElementBySelector(
-                    this.elementRef.nativeElement,
-                    this.content,
-                    '#addon-forum-reply-edit-form-' + this.uniqueId,
-                );
-            });
-        }
-
+        this.scrollToForm();
     }
 
     /**
@@ -382,6 +366,8 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
                 this.post.attachments,
                 this.post.isprivatereply,
             );
+
+            this.scrollToForm(5);
         } catch (error) {
             // Cancelled.
         }
@@ -600,4 +586,24 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
         delete this.replyData.syncId;
     }
 
+    /**
+     * Scroll to reply/edit form.
+     *
+     * @param ticksToWait Number of ticks to wait before scrolling.
+     * @return Promise resolved when done.
+     */
+    protected async scrollToForm(ticksToWait = 1): Promise<void> {
+        if (!this.content) {
+            return;
+        }
+
+        await CoreUtils.nextTicks(ticksToWait);
+
+        CoreDomUtils.scrollToElementBySelector(
+            this.elementRef.nativeElement,
+            this.content,
+            '#addon-forum-reply-edit-form-' + this.uniqueId,
+        );
+    }
+
 }
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index 7a3d37e90..966324808 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -1728,13 +1728,13 @@ export class CoreDomUtilsProvider {
     /**
      * Opens a popover.
      *
-     * @param popoverOptions Modal Options.
+     * @param options Options.
      */
     async openPopover<T = void>(
-        popoverOptions: PopoverOptions,
+        options: OpenPopoverOptions,
     ): Promise<T | undefined> {
 
-        const popover = await PopoverController.create(popoverOptions);
+        const popover = await PopoverController.create(options);
         const zoomLevel = await CoreConfig.get(CoreConstants.SETTINGS_ZOOM_LEVEL, CoreZoomLevel.NORMAL);
 
         await popover.present();
@@ -1743,16 +1743,16 @@ export class CoreDomUtilsProvider {
         if (zoomLevel !== CoreZoomLevel.NORMAL) {
             switch (getMode()) {
                 case 'ios':
-                    fixIOSPopoverPosition(popover, popoverOptions.event);
+                    fixIOSPopoverPosition(popover, options.event);
                     break;
                 case 'md':
-                    fixMDPopoverPosition(popover, popoverOptions.event);
+                    fixMDPopoverPosition(popover, options.event);
                     break;
             }
         }
 
         // If onDidDismiss is nedded we can add a new param to the function to wait one function or the other.
-        const result = await popover.onWillDismiss<T>();
+        const result = options.waitForDismiss ? await popover.onDidDismiss<T>() : await popover.onWillDismiss<T>();
         if (result?.data) {
             return result?.data;
         }
@@ -2046,3 +2046,10 @@ export const CoreDomUtils = makeSingleton(CoreDomUtilsProvider);
 
 type AnchorOrMediaElement =
     HTMLAnchorElement | HTMLImageElement | HTMLAudioElement | HTMLVideoElement | HTMLSourceElement | HTMLTrackElement;
+
+/**
+ * Options for the openPopover function.
+ */
+export type OpenPopoverOptions = PopoverOptions & {
+    waitForDismiss?: boolean;
+};

From 5fa280fe32e19e5a605925f4e337ba00696b811e Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 5 Aug 2021 13:28:18 +0200
Subject: [PATCH 0067/1008] MOBILE-3793 forum: Hide post being edited

---
 .../mod/forum/components/post/post.html       | 194 +++++++++---------
 1 file changed, 99 insertions(+), 95 deletions(-)

diff --git a/src/addons/mod/forum/components/post/post.html b/src/addons/mod/forum/components/post/post.html
index 89dbb0ed0..f14b4febb 100644
--- a/src/addons/mod/forum/components/post/post.html
+++ b/src/addons/mod/forum/components/post/post.html
@@ -1,111 +1,115 @@
 <div class="addon-mod_forum-post">
-    <ion-card-header class="ion-text-wrap ion-no-padding" id="addon-mod_forum-post-{{post.id}}">
-        <ion-item class="ion-text-wrap" [class.highlight]="highlight" lines="none">
-            <ion-label>
-                <div class="addon-mod-forum-post-title" *ngIf="displaySubject">
-                    <h2 class="ion-text-wrap">
-                        <ion-icon name="fas-map-pin" *ngIf="discussion && !post.parentid && discussion.pinned"
-                            [attr.aria-label]="'addon.mod_forum.discussionpinned' | translate">
-                        </ion-icon>
-                        <ion-icon name="fas-star" class="addon-forum-star"
-                            [attr.aria-label]="'addon.mod_forum.favourites' | translate"
-                            *ngIf="discussion && !post.parentid && !discussion.pinned && discussion.starred">
-                        </ion-icon>
-                        <core-format-text
-                            [text]="post.subject"
-                            contextLevel="module" [contextInstanceId]="forum && forum.cmid" [courseId]="courseId">
-                        </core-format-text>
-                    </h2>
-                    <ion-note *ngIf="trackPosts && post.unread"
-                        class="ion-float-end ion-padding-start ion-text-end" [attr.aria-label]="'addon.mod_forum.unread' | translate">
-                        <ion-icon name="fas-circle" color="primary" aria-hidden="true"></ion-icon>
-                    </ion-note>
-                    <ion-button *ngIf="optionsMenuEnabled"
-                        fill="clear" color="dark" [attr.aria-label]="('core.displayoptions' | translate)"
-                        (click)="showOptionsMenu($event)">
-                        <ion-icon name="ellipsis-vertical" slot="icon-only" aria-hidden="true">
-                        </ion-icon>
-                    </ion-button>
-                </div>
-                <div class="addon-mod-forum-post-info">
-                    <core-user-avatar *ngIf="post.author && post.author.fullname" [user]="post.author" slot="start" [courseId]="courseId">
-                    </core-user-avatar>
-                    <div class="addon-mod-forum-post-author">
-                        <span *ngIf="post.author && post.author.fullname">{{post.author.fullname}}</span>
-                        <p *ngIf="post.author && post.author.groups">
-                            <ng-container *ngFor="let group of post.author.groups">
-                                <ion-icon name="fas-users" [attr.aria-label]="'addon.mod_forum.group' | translate">
-                                </ion-icon> {{ group.name }}
-                            </ng-container>
-                        </p>
-                        <p *ngIf="post.timecreated">{{post.timecreated * 1000 | coreFormatDate: "strftimerecentfull"}}</p>
-                        <p *ngIf="!post.timecreated">
-                            <ion-icon name="fas-clock" aria-hidden="true"></ion-icon> {{ 'core.notsent' | translate }}
-                        </p>
-                    </div>
-                    <ng-container *ngIf="!displaySubject">
-                        <ion-note *ngIf="trackPosts && post.unread"
-                            class="ion-float-end ion-padding-start ion-text-end" [attr.aria-label]="'addon.mod_forum.unread' | translate">
+    <ng-container *ngIf="!replyData.isEditing || !showForm">
+        <ion-card-header class="ion-text-wrap ion-no-padding" id="addon-mod_forum-post-{{post.id}}">
+            <ion-item class="ion-text-wrap" [class.highlight]="highlight" lines="none">
+                <ion-label>
+                    <div class="addon-mod-forum-post-title" *ngIf="displaySubject">
+                        <h2 class="ion-text-wrap">
+                            <ion-icon name="fas-map-pin" *ngIf="discussion && !post.parentid && discussion.pinned"
+                                [attr.aria-label]="'addon.mod_forum.discussionpinned' | translate">
+                            </ion-icon>
+                            <ion-icon name="fas-star" class="addon-forum-star"
+                                [attr.aria-label]="'addon.mod_forum.favourites' | translate"
+                                *ngIf="discussion && !post.parentid && !discussion.pinned && discussion.starred">
+                            </ion-icon>
+                            <core-format-text
+                                [text]="post.subject"
+                                contextLevel="module" [contextInstanceId]="forum && forum.cmid" [courseId]="courseId">
+                            </core-format-text>
+                        </h2>
+                        <ion-note *ngIf="trackPosts && post.unread" class="ion-float-end ion-padding-start ion-text-end"
+                            [attr.aria-label]="'addon.mod_forum.unread' | translate">
                             <ion-icon name="fas-circle" color="primary" aria-hidden="true"></ion-icon>
                         </ion-note>
                         <ion-button *ngIf="optionsMenuEnabled"
                             fill="clear" color="dark" [attr.aria-label]="('core.displayoptions' | translate)"
                             (click)="showOptionsMenu($event)">
-                            <ion-icon name="ellipsis-vertical" slot="icon-only" aria-hidden="true"></ion-icon>
+                            <ion-icon name="ellipsis-vertical" slot="icon-only" aria-hidden="true">
+                            </ion-icon>
                         </ion-button>
-                    </ng-container>
-                </div>
-            </ion-label>
-        </ion-item>
-    </ion-card-header>
-    <ion-card-content [class]="post.parentid == 0 ? 'ion-padding-top' : ''">
-        <div class="ion-padding-bottom" *ngIf="post.isprivatereply">
-            <ion-note color="danger">{{ 'addon.mod_forum.postisprivatereply' | translate }}</ion-note>
-        </div>
-        <core-format-text [component]="component" [componentId]="componentId" [text]="post.message"
-            contextLevel="module" [contextInstanceId]="forum && forum.cmid" [courseId]="courseId">
-        </core-format-text>
-        <div lines="none" *ngIf="post.attachments && post.attachments.length > 0">
-            <core-files [files]="post.attachments" [component]="component" [componentId]="componentId" showInline="true">
-            </core-files>
-        </div>
-    </ion-card-content>
-    <div class="addon-mod-forum-post-more-info">
-        <ion-item class="ion-text-wrap" *ngIf="tagsEnabled && post.tags && post.tags.length > 0" lines="none">
-            <div slot="start">{{ 'core.tag.tags' | translate }}:</div>
-            <ion-label>
-                <core-tag-list [tags]="post.tags"></core-tag-list>
-            </ion-label>
-        </ion-item>
-        <core-rating-rate *ngIf="forum && ratingInfo"
-            [ratingInfo]="ratingInfo" contextLevel="module" [instanceId]="componentId" [itemId]="post.id"
-            [itemSetId]="discussionId" [courseId]="courseId" [aggregateMethod]="forum.assessed" [scaleId]="forum.scale"
-            [userId]="post.author.id" (onUpdate)="ratingUpdated()">
-        </core-rating-rate>
-        <core-rating-aggregate *ngIf="forum && ratingInfo"
-            [ratingInfo]="ratingInfo" contextLevel="module" [instanceId]="componentId" [itemId]="post.id"
-            [courseId]="courseId" [aggregateMethod]="forum.assessed" [scaleId]="forum.scale">
-        </core-rating-aggregate>
+                    </div>
+                    <div class="addon-mod-forum-post-info">
+                        <core-user-avatar *ngIf="post.author && post.author.fullname" [user]="post.author" slot="start"
+                            [courseId]="courseId">
+                        </core-user-avatar>
+                        <div class="addon-mod-forum-post-author">
+                            <span *ngIf="post.author && post.author.fullname">{{post.author.fullname}}</span>
+                            <p *ngIf="post.author && post.author.groups">
+                                <ng-container *ngFor="let group of post.author.groups">
+                                    <ion-icon name="fas-users" [attr.aria-label]="'addon.mod_forum.group' | translate">
+                                    </ion-icon> {{ group.name }}
+                                </ng-container>
+                            </p>
+                            <p *ngIf="post.timecreated">{{post.timecreated * 1000 | coreFormatDate: "strftimerecentfull"}}</p>
+                            <p *ngIf="!post.timecreated">
+                                <ion-icon name="fas-clock" aria-hidden="true"></ion-icon> {{ 'core.notsent' | translate }}
+                            </p>
+                        </div>
+                        <ng-container *ngIf="!displaySubject">
+                            <ion-note *ngIf="trackPosts && post.unread" class="ion-float-end ion-padding-start ion-text-end"
+                                [attr.aria-label]="'addon.mod_forum.unread' | translate">
+                                <ion-icon name="fas-circle" color="primary" aria-hidden="true"></ion-icon>
+                            </ion-note>
+                            <ion-button *ngIf="optionsMenuEnabled"
+                                fill="clear" color="dark" [attr.aria-label]="('core.displayoptions' | translate)"
+                                (click)="showOptionsMenu($event)">
+                                <ion-icon name="ellipsis-vertical" slot="icon-only" aria-hidden="true"></ion-icon>
+                            </ion-button>
+                        </ng-container>
+                    </div>
+                </ion-label>
+            </ion-item>
+        </ion-card-header>
+        <ion-card-content [class]="post.parentid == 0 ? 'ion-padding-top' : ''">
+            <div class="ion-padding-bottom" *ngIf="post.isprivatereply">
+                <ion-note color="danger">{{ 'addon.mod_forum.postisprivatereply' | translate }}</ion-note>
+            </div>
+            <core-format-text [component]="component" [componentId]="componentId" [text]="post.message"
+                contextLevel="module" [contextInstanceId]="forum && forum.cmid" [courseId]="courseId">
+            </core-format-text>
+            <div lines="none" *ngIf="post.attachments && post.attachments.length > 0">
+                <core-files [files]="post.attachments" [component]="component" [componentId]="componentId" showInline="true">
+                </core-files>
+            </div>
+        </ion-card-content>
+        <div class="addon-mod-forum-post-more-info">
+            <ion-item class="ion-text-wrap" *ngIf="tagsEnabled && post.tags && post.tags.length > 0" lines="none">
+                <div slot="start">{{ 'core.tag.tags' | translate }}:</div>
+                <ion-label>
+                    <core-tag-list [tags]="post.tags"></core-tag-list>
+                </ion-label>
+            </ion-item>
+            <core-rating-rate *ngIf="forum && ratingInfo"
+                [ratingInfo]="ratingInfo" contextLevel="module" [instanceId]="componentId" [itemId]="post.id"
+                [itemSetId]="discussionId" [courseId]="courseId" [aggregateMethod]="forum.assessed" [scaleId]="forum.scale"
+                [userId]="post.author.id" (onUpdate)="ratingUpdated()">
+            </core-rating-rate>
+            <core-rating-aggregate *ngIf="forum && ratingInfo"
+                [ratingInfo]="ratingInfo" contextLevel="module" [instanceId]="componentId" [itemId]="post.id"
+                [courseId]="courseId" [aggregateMethod]="forum.assessed" [scaleId]="forum.scale">
+            </core-rating-aggregate>
 
-        <ion-item *ngIf="post.id > 0 && post.capabilities.reply && !post.isprivatereply"
-            class="ion-no-padding ion-text-end addon-forum-reply-button">
-            <ion-label>
-                <ion-button fill="clear" size="small"
-                    [attr.aria-controls]="'addon-forum-reply-edit-form-' + uniqueId"
-                    [attr.aria-expanded]="replyData.replyingTo === post.id"
-                    (click)="showReplyForm($event)">
-                    <ion-icon name="fas-reply" slot="start" aria-hidden="true"></ion-icon>
-                    {{ 'addon.mod_forum.reply' | translate }}
-                </ion-button>
-            </ion-label>
-        </ion-item>
-    </div>
+            <ion-item *ngIf="post.id > 0 && post.capabilities.reply && !post.isprivatereply"
+                class="ion-no-padding ion-text-end addon-forum-reply-button">
+                <ion-label>
+                    <ion-button fill="clear" size="small"
+                        [attr.aria-controls]="'addon-forum-reply-edit-form-' + uniqueId"
+                        [attr.aria-expanded]="replyData.replyingTo === post.id"
+                        (click)="showReplyForm($event)">
+                        <ion-icon name="fas-reply" slot="start" aria-hidden="true"></ion-icon>
+                        {{ 'addon.mod_forum.reply' | translate }}
+                    </ion-button>
+                </ion-label>
+            </ion-item>
+        </div>
+    </ng-container>
 
     <form *ngIf="showForm"
         [id]="'addon-forum-reply-edit-form-' + uniqueId" #replyFormEl>
         <ion-item>
             <ion-label position="stacked">{{ 'addon.mod_forum.subject' | translate }}</ion-label>
-            <ion-input type="text" [placeholder]="'addon.mod_forum.subject' | translate" [(ngModel)]="replyData.subject" name="subject">
+            <ion-input type="text" [placeholder]="'addon.mod_forum.subject' | translate" [(ngModel)]="replyData.subject"
+                name="subject">
             </ion-input>
         </ion-item>
         <ion-item>

From 83d5282852b23821d282a295f4cb062b2bb37d5c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 25 Aug 2021 12:45:34 +0200
Subject: [PATCH 0068/1008] MOBILE-3846 core: Fix redirect to a NO_SITE page

---
 src/core/guards/redirect.ts    |  6 +-----
 src/core/services/navigator.ts | 16 ++++++++--------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/core/guards/redirect.ts b/src/core/guards/redirect.ts
index 248518aaa..5217a123a 100644
--- a/src/core/guards/redirect.ts
+++ b/src/core/guards/redirect.ts
@@ -76,11 +76,7 @@ export class CoreRedirectGuard implements CanLoad, CanActivate {
 
         // Redirect to non-site path.
         const route = Router.parseUrl(redirect.page);
-
-        route.queryParams = {
-            redirectPath: redirect.page,
-            redirectOptions: redirect.options,
-        } as CoreRedirectPayload;
+        route.queryParams = redirect.options?.params || {};
 
         return route;
     }
diff --git a/src/core/services/navigator.ts b/src/core/services/navigator.ts
index 1b47f19ed..8707bf47d 100644
--- a/src/core/services/navigator.ts
+++ b/src/core/services/navigator.ts
@@ -201,14 +201,6 @@ export class CoreNavigatorService {
         const siteId = options.siteId ?? CoreSites.getCurrentSiteId();
         const navigationOptions: CoreNavigationOptions = CoreObject.without(options, ['siteId']);
 
-        // If the path doesn't belong to a site, call standard navigation.
-        if (siteId === CoreConstants.NO_SITE_ID) {
-            return this.navigate(path, {
-                ...navigationOptions,
-                reset: true,
-            });
-        }
-
         // If we are logged into a different site, log out first.
         if (CoreSites.isLoggedIn() && CoreSites.getCurrentSiteId() !== siteId) {
             if (CoreSitePlugins.hasSitePluginsLoaded) {
@@ -223,6 +215,14 @@ export class CoreNavigatorService {
             await CoreSites.logout();
         }
 
+        // If the path doesn't belong to a site, call standard navigation.
+        if (siteId === CoreConstants.NO_SITE_ID) {
+            return this.navigate(path, {
+                ...navigationOptions,
+                reset: true,
+            });
+        }
+
         // If we are not logged into the site, load the site.
         if (!CoreSites.isLoggedIn()) {
             const modal = await CoreDomUtils.showModalLoading();

From 44bc62e0a2b28348bc4289d575d36ea38810ba76 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 6 Aug 2021 07:57:47 +0200
Subject: [PATCH 0069/1008] MOBILE-3793 forum: Make edit post more consistent

Now edit online and offline have the same behaviour, and the original post disappears when editing it
---
 .../mod/forum/components/components.module.ts |   2 -
 .../forum/components/edit-post/edit-post.html |  60 -----
 .../forum/components/edit-post/edit-post.ts   | 150 -----------
 .../post-options-menu/post-options-menu.ts    |   6 +-
 .../mod/forum/components/post/post.html       |  12 +-
 src/addons/mod/forum/components/post/post.ts  | 241 +++++++-----------
 .../forum/pages/discussion/discussion.html    |   6 +-
 .../forum/pages/discussion/discussion.page.ts |  13 +-
 src/addons/mod/forum/services/forum.ts        |   4 +-
 src/core/services/utils/dom.ts                |  13 +-
 10 files changed, 121 insertions(+), 386 deletions(-)
 delete mode 100644 src/addons/mod/forum/components/edit-post/edit-post.html
 delete mode 100644 src/addons/mod/forum/components/edit-post/edit-post.ts

diff --git a/src/addons/mod/forum/components/components.module.ts b/src/addons/mod/forum/components/components.module.ts
index 55da612ac..d57add762 100644
--- a/src/addons/mod/forum/components/components.module.ts
+++ b/src/addons/mod/forum/components/components.module.ts
@@ -21,7 +21,6 @@ import { CoreTagComponentsModule } from '@features/tag/components/components.mod
 import { CoreRatingComponentsModule } from '@features/rating/components/components.module';
 
 import { AddonModForumDiscussionOptionsMenuComponent } from './discussion-options-menu/discussion-options-menu';
-import { AddonModForumEditPostComponent } from './edit-post/edit-post';
 import { AddonModForumIndexComponent } from './index/index';
 import { AddonModForumPostComponent } from './post/post';
 import { AddonModForumPostOptionsMenuComponent } from './post-options-menu/post-options-menu';
@@ -30,7 +29,6 @@ import { AddonModForumSortOrderSelectorComponent } from './sort-order-selector/s
 @NgModule({
     declarations: [
         AddonModForumDiscussionOptionsMenuComponent,
-        AddonModForumEditPostComponent,
         AddonModForumIndexComponent,
         AddonModForumPostComponent,
         AddonModForumPostOptionsMenuComponent,
diff --git a/src/addons/mod/forum/components/edit-post/edit-post.html b/src/addons/mod/forum/components/edit-post/edit-post.html
deleted file mode 100644
index 19f1c65ba..000000000
--- a/src/addons/mod/forum/components/edit-post/edit-post.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<ion-header>
-    <ion-toolbar>
-        <h2>{{ 'addon.mod_forum.yourreply' | translate }}</h2>
-        <ion-buttons slot="end">
-            <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
-                <ion-icon name="fas-times" slot="icon-only" aria-hidden="true"></ion-icon>
-            </ion-button>
-        </ion-buttons>
-    </ion-toolbar>
-</ion-header>
-<ion-content>
-    <form #editFormEl>
-        <ion-item>
-            <ion-label position="stacked">{{ 'addon.mod_forum.subject' | translate }}</ion-label>
-            <ion-input type="text" [placeholder]="'addon.mod_forum.subject' | translate" [(ngModel)]="replyData.subject" name="subject">
-            </ion-input>
-        </ion-item>
-        <ion-item>
-            <ion-label position="stacked">{{ 'addon.mod_forum.message' | translate }}</ion-label>
-            <core-rich-text-editor elementId="message"
-                [name]="'mod_forum_reply_' + replyData.id" [control]="messageControl"
-                [placeholder]="'addon.mod_forum.replyplaceholder' | translate" [autoSave]="true"
-                [component]="component" [componentId]="componentId" [draftExtraParams]="{edit: replyData.id}"
-                contextLevel="module" [contextInstanceId]="forum.cmid"
-                (contentChanged)="onMessageChange($event)">
-            </core-rich-text-editor>
-        </ion-item>
-        <ion-item
-            button class="divider ion-text-wrap"
-            (click)="toggleAdvanced()"
-            role="heading"
-            detail="false"
-            [attr.aria-expanded]="advanced"
-            aria-controls="addon-mod-forum-advanced"
-            [attr.aria-label]="(advanced ? 'core.hideadvanced' : 'core.showadvanced') | translate"
-        >
-            <ion-icon *ngIf="!advanced" name="fas-caret-right" flip-rtl slot="start" aria-hidden="true"></ion-icon>
-            <ion-icon *ngIf="advanced" name="fas-caret-down" slot="start" aria-hidden="true"></ion-icon>
-            <ion-label><h2>{{ 'addon.mod_forum.advanced' | translate }}</h2></ion-label>
-        </ion-item>
-        <div *ngIf="advanced" id="addon-mod-forum-advanced">
-            <core-attachments *ngIf="forum.id && forum.maxattachments > 0"
-                [maxSize]="forum.maxbytes" [maxSubmissions]="forum.maxattachments" [allowOffline]="true" [files]="replyData.files"
-                [component]="component" [componentId]="forum.cmid" [courseId]="forum.course">
-            </core-attachments>
-        </div>
-        <ion-grid>
-            <ion-row>
-                <ion-col>
-                    <ion-button expand="block" (click)="reply($event)" [disabled]="replyData.subject == '' || replyData.message == null">
-                        {{ 'core.savechanges' | translate }}
-                    </ion-button>
-                </ion-col>
-                <ion-col>
-                    <ion-button expand="block" color="light" (click)="closeModal()">{{ 'core.cancel' | translate }}</ion-button>
-                </ion-col>
-            </ion-row>
-        </ion-grid>
-    </form>
-</ion-content>
diff --git a/src/addons/mod/forum/components/edit-post/edit-post.ts b/src/addons/mod/forum/components/edit-post/edit-post.ts
deleted file mode 100644
index e3a81636c..000000000
--- a/src/addons/mod/forum/components/edit-post/edit-post.ts
+++ /dev/null
@@ -1,150 +0,0 @@
-// (C) Copyright 2015 Moodle Pty Ltd.
-//
-// 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, ViewChild, ElementRef, Input, OnInit } from '@angular/core';
-import { FormControl } from '@angular/forms';
-import { CoreFileUploader } from '@features/fileuploader/services/fileuploader';
-import { CoreSites } from '@services/sites';
-import { CoreDomUtils } from '@services/utils/dom';
-import { ModalController, Translate } from '@singletons';
-import { AddonModForumData, AddonModForumPost, AddonModForumReply } from '@addons/mod/forum/services/forum';
-import { AddonModForumHelper } from '@addons/mod/forum/services/forum-helper';
-import { CoreForms } from '@singletons/form';
-import { CoreFileEntry } from '@services/file-helper';
-
-/**
- * Page that displays a form to edit discussion post.
- */
-@Component({
-    selector: 'addon-mod-forum-edit-post',
-    templateUrl: 'edit-post.html',
-})
-export class AddonModForumEditPostComponent implements OnInit {
-
-    @ViewChild('editFormEl') formElement!: ElementRef;
-
-    @Input() component!: string; // Component this post belong to.
-    @Input() componentId!: number; // Component ID.
-    @Input() forum!: AddonModForumData; // The forum the post belongs to. Required for attachments and offline posts.
-    @Input() post!: AddonModForumPost;
-
-    messageControl = new FormControl();
-    advanced = false; // Display all form fields.
-    replyData!: AddonModForumReply;
-    originalData!: Omit<AddonModForumReply, 'id'>; // Object with the original post data. Usually shared between posts.
-
-    protected forceLeave = false; // To allow leaving the page without checking for changes.
-
-    ngOnInit(): void {
-        // @todo Override android back button to show confirmation before dismiss.
-
-        this.replyData = {
-            id: this.post.id,
-            subject: this.post.subject,
-            message: this.post.message,
-            files: this.post.attachments || [],
-        };
-
-        // Delete the local files from the tmp folder if any.
-        CoreFileUploader.clearTmpFiles(this.replyData.files as CoreFileEntry[]);
-
-        // Update rich text editor.
-        this.messageControl.setValue(this.replyData.message);
-
-        // Update original data.
-        this.originalData = {
-            subject: this.replyData.subject,
-            message: this.replyData.message,
-            files: this.replyData.files.slice(),
-        };
-
-        // Show advanced fields if any of them has not the default value.
-        this.advanced = this.replyData.files.length > 0;
-    }
-
-    /**
-     * Message changed.
-     *
-     * @param text The new text.
-     */
-    onMessageChange(text: string): void {
-        this.replyData.message = text;
-    }
-
-    /**
-     * Close modal.
-     *
-     * @param data Data to return to the page.
-     */
-    async closeModal(data?: AddonModForumReply): Promise<void> {
-        const confirmDismiss = await this.confirmDismiss();
-
-        if (!confirmDismiss) {
-            return;
-        }
-
-        if (data) {
-            CoreForms.triggerFormSubmittedEvent(this.formElement, false, CoreSites.getCurrentSiteId());
-        } else {
-            CoreForms.triggerFormCancelledEvent(this.formElement, CoreSites.getCurrentSiteId());
-        }
-
-        ModalController.dismiss(data);
-    }
-
-    /**
-     * Reply to this post.
-     *
-     * @param e Click event.
-     */
-    reply(e: Event): void {
-        e.preventDefault();
-        e.stopPropagation();
-
-        // Close the modal, sending the input data.
-        this.forceLeave = true;
-        this.closeModal(this.replyData);
-    }
-
-    /**
-     * Show or hide advanced form fields.
-     */
-    toggleAdvanced(): void {
-        this.advanced = !this.advanced;
-    }
-
-    /**
-     * Check if we can leave the page or not.
-     *
-     * @return Resolved if we can leave it, rejected if not.
-     */
-    private async confirmDismiss(): Promise<boolean> {
-        if (this.forceLeave || !AddonModForumHelper.hasPostDataChanged(this.replyData, this.originalData)) {
-            return true;
-        }
-
-        try {
-            // Show confirmation if some data has been modified.
-            await CoreDomUtils.showConfirm(Translate.instant('core.confirmcanceledit'));
-
-            // Delete the local files from the tmp folder.
-            CoreFileUploader.clearTmpFiles(this.replyData.files as CoreFileEntry[]);
-
-            return true;
-        } catch (error) {
-            return false;
-        }
-    }
-
-}
diff --git a/src/addons/mod/forum/components/post-options-menu/post-options-menu.ts b/src/addons/mod/forum/components/post-options-menu/post-options-menu.ts
index cf2d1acc8..8c7a51b87 100644
--- a/src/addons/mod/forum/components/post-options-menu/post-options-menu.ts
+++ b/src/addons/mod/forum/components/post-options-menu/post-options-menu.ts
@@ -122,11 +122,7 @@ export class AddonModForumPostOptionsMenuComponent implements OnInit, OnDestroy
      * Edit a post.
      */
     editPost(): void {
-        if (!this.offlinePost) {
-            PopoverController.dismiss({ action: 'edit' });
-        } else {
-            PopoverController.dismiss({ action: 'editoffline' });
-        }
+        PopoverController.dismiss({ action: 'edit' });
     }
 
 }
diff --git a/src/addons/mod/forum/components/post/post.html b/src/addons/mod/forum/components/post/post.html
index f14b4febb..4dcded210 100644
--- a/src/addons/mod/forum/components/post/post.html
+++ b/src/addons/mod/forum/components/post/post.html
@@ -1,5 +1,5 @@
 <div class="addon-mod_forum-post">
-    <ng-container *ngIf="!replyData.isEditing || !showForm">
+    <ng-container *ngIf="!formData.isEditing || !showForm">
         <ion-card-header class="ion-text-wrap ion-no-padding" id="addon-mod_forum-post-{{post.id}}">
             <ion-item class="ion-text-wrap" [class.highlight]="highlight" lines="none">
                 <ion-label>
@@ -94,7 +94,7 @@
                 <ion-label>
                     <ion-button fill="clear" size="small"
                         [attr.aria-controls]="'addon-forum-reply-edit-form-' + uniqueId"
-                        [attr.aria-expanded]="replyData.replyingTo === post.id"
+                        [attr.aria-expanded]="formData.replyingTo === post.id"
                         (click)="showReplyForm($event)">
                         <ion-icon name="fas-reply" slot="start" aria-hidden="true"></ion-icon>
                         {{ 'addon.mod_forum.reply' | translate }}
@@ -108,7 +108,7 @@
         [id]="'addon-forum-reply-edit-form-' + uniqueId" #replyFormEl>
         <ion-item>
             <ion-label position="stacked">{{ 'addon.mod_forum.subject' | translate }}</ion-label>
-            <ion-input type="text" [placeholder]="'addon.mod_forum.subject' | translate" [(ngModel)]="replyData.subject"
+            <ion-input type="text" [placeholder]="'addon.mod_forum.subject' | translate" [(ngModel)]="formData.subject"
                 name="subject">
             </ion-input>
         </ion-item>
@@ -123,7 +123,7 @@
         </ion-item>
         <ion-item class="ion-text-wrap" *ngIf="accessInfo.canpostprivatereply">
             <ion-label>{{ 'addon.mod_forum.privatereply' | translate }}</ion-label>
-            <ion-checkbox slot="end" [(ngModel)]="replyData.isprivatereply" name="isprivatereply"></ion-checkbox>
+            <ion-checkbox slot="end" [(ngModel)]="formData.isprivatereply" name="isprivatereply"></ion-checkbox>
         </ion-item>
         <ng-container *ngIf="forum.id && forum.maxattachments > 0">
             <ion-item
@@ -142,7 +142,7 @@
             </ion-item>
             <div *ngIf="advanced" [id]="'addon-forum-reply-edit-form-advanced-' + uniqueId">
                 <core-attachments
-                    [files]="replyData.files" [maxSize]="forum.maxbytes" [maxSubmissions]="forum.maxattachments"
+                    [files]="formData.files" [maxSize]="forum.maxbytes" [maxSubmissions]="forum.maxattachments"
                     [component]="component" [componentId]="forum.cmid" [allowOffline]="true" [courseId]="courseId">
                 </core-attachments>
             </div>
@@ -150,7 +150,7 @@
         <ion-grid>
             <ion-row>
                 <ion-col>
-                    <ion-button expand="block" (click)="reply()" [disabled]="replyData.subject == '' || replyData.message == null">
+                    <ion-button expand="block" (click)="send()" [disabled]="formData.subject == '' || formData.message == null">
                         {{ 'addon.mod_forum.posttoforum' | translate }}
                     </ion-button>
                 </ion-col>
diff --git a/src/addons/mod/forum/components/post/post.ts b/src/addons/mod/forum/components/post/post.ts
index 0f1107cb6..2a2cf19ed 100644
--- a/src/addons/mod/forum/components/post/post.ts
+++ b/src/addons/mod/forum/components/post/post.ts
@@ -36,8 +36,7 @@ import {
     AddonModForumDiscussion,
     AddonModForumPost,
     AddonModForumProvider,
-    AddonModForumReply,
-    AddonModForumUpdateDiscussionPostWSOptionsObject,
+    AddonModForumPostFormData,
 } from '../../services/forum';
 import { CoreTag } from '@features/tag/services/tag';
 import { Translate } from '@singletons';
@@ -47,14 +46,13 @@ import { AddonModForumSync } from '../../services/forum-sync';
 import { CoreSync } from '@services/sync';
 import { CoreTextUtils } from '@services/utils/text';
 import { AddonModForumHelper } from '../../services/forum-helper';
-import { AddonModForumOffline, AddonModForumReplyOptions } from '../../services/forum-offline';
+import { AddonModForumOffline } from '../../services/forum-offline';
 import { CoreUtils } from '@services/utils/utils';
 import { AddonModForumPostOptionsMenuComponent } from '../post-options-menu/post-options-menu';
-import { AddonModForumEditPostComponent } from '../edit-post/edit-post';
 import { CoreRatingInfo } from '@features/rating/services/rating';
 import { CoreForms } from '@singletons/form';
 import { CoreFileEntry } from '@services/file-helper';
-import { AddonModForumSharedReplyData } from '../../pages/discussion/discussion.page';
+import { AddonModForumSharedPostFormData } from '../../pages/discussion/discussion.page';
 
 /**
  * Components that shows a discussion post, its attachments and the action buttons allowed (reply, etc.).
@@ -72,8 +70,8 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
     @Input() discussion?: AddonModForumDiscussion; // Post's' discussion, only for starting posts.
     @Input() component!: string; // Component this post belong to.
     @Input() componentId!: number; // Component ID.
-    @Input() replyData!: AddonModForumSharedReplyData; // Object with the new post data. Usually shared between posts.
-    @Input() originalData!: Omit<AddonModForumReply, 'id'>; // Object with the original post data. Usually shared between posts.
+    @Input() formData!: AddonModForumSharedPostFormData; // Object with the new post data. Usually shared between posts.
+    @Input() originalData!: Omit<AddonModForumPostFormData, 'id'>; // Original post data. Usually shared between posts.
     @Input() trackPosts!: boolean; // True if post is being tracked.
     @Input() forum!: AddonModForumData; // The forum the post belongs to. Required for attachments and offline posts.
     @Input() accessInfo!: AddonModForumAccessInformation; // Forum access information.
@@ -101,8 +99,9 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
 
     get showForm(): boolean {
         return this.post.id > 0
-            ? !this.replyData.isEditing && this.replyData.replyingTo === this.post.id
-            : !!this.replyData.isEditing && this.replyData.replyingTo === this.post.parentid;
+            ? (!this.formData.isEditing && this.formData.replyingTo === this.post.id) ||
+                (!!this.formData.isEditing && this.formData.id === this.post.id)
+            : !!this.formData.isEditing && this.formData.replyingTo === this.post.parentid;
     }
 
     /**
@@ -171,44 +170,47 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
     }
 
     /**
-     * Set data to new reply post, clearing temporary files and updating original data.
+     * Set data to new/edit post, clearing temporary files and updating original data.
      *
      * @param replyingTo Id of post beeing replied.
      * @param isEditing True it's an offline reply beeing edited, false otherwise.
      * @param subject Subject of the reply.
      * @param message Message of the reply.
-     * @param isPrivate True if it's private reply.
      * @param files Reply attachments.
+     * @param isPrivate True if it's private reply.
+     * @param postId The post ID if user is editing an online post.
      */
-    protected setReplyFormData(
+    protected setFormData(
         replyingTo?: number,
         isEditing?: boolean,
         subject?: string,
         message?: string,
         files?: CoreFileEntry[],
         isPrivate?: boolean,
+        postId?: number,
     ): void {
         // Delete the local files from the tmp folder if any.
-        CoreFileUploader.clearTmpFiles(this.replyData.files);
+        CoreFileUploader.clearTmpFiles(this.formData.files);
 
-        this.replyData.replyingTo = replyingTo || 0;
-        this.replyData.isEditing = !!isEditing;
-        this.replyData.subject = subject || this.defaultReplySubject || '';
-        this.replyData.message = message || null;
-        this.replyData.files = files || [];
-        this.replyData.isprivatereply = !!isPrivate;
+        this.formData.replyingTo = replyingTo || 0;
+        this.formData.isEditing = !!isEditing;
+        this.formData.subject = subject || this.defaultReplySubject || '';
+        this.formData.message = message || null;
+        this.formData.files = files || [];
+        this.formData.isprivatereply = !!isPrivate;
+        this.formData.id = postId;
 
         // Update rich text editor.
-        this.messageControl.setValue(this.replyData.message);
+        this.messageControl.setValue(this.formData.message);
 
         // Update original data.
-        this.originalData.subject = this.replyData.subject;
-        this.originalData.message = this.replyData.message;
-        this.originalData.files = this.replyData.files.slice();
-        this.originalData.isprivatereply = this.replyData.isprivatereply;
+        this.originalData.subject = this.formData.subject;
+        this.originalData.message = this.formData.message;
+        this.originalData.files = this.formData.files.slice();
+        this.originalData.isprivatereply = this.formData.isprivatereply;
 
         // Show advanced fields if any of them has not the default value.
-        this.advanced = this.replyData.files.length > 0;
+        this.advanced = this.formData.files.length > 0;
     }
 
     /**
@@ -225,7 +227,7 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
                 cmId: this.forum.cmid,
             },
             event,
-            waitForDismiss: true,
+            waitForDismissCompleted: true,
         });
 
         if (popoverData && popoverData.action) {
@@ -233,9 +235,6 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
                 case 'edit':
                     this.editPost();
                     break;
-                case 'editoffline':
-                    this.editOfflineReply();
-                    break;
                 case 'delete':
                     this.deletePost();
                     break;
@@ -246,65 +245,6 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
         }
     }
 
-    /**
-     * Shows a form modal to edit an online post.
-     */
-    async editPost(): Promise<void> {
-        const modalData = await CoreDomUtils.openModal<AddonModForumReply>({
-            component: AddonModForumEditPostComponent,
-            componentProps: {
-                post: this.post,
-                component: this.component,
-                componentId: this.componentId,
-                forum: this.forum,
-            },
-            backdropDismiss: false,
-            cssClass: 'core-modal-fullscreen',
-        });
-
-        if (!modalData) {
-            return;
-        }
-
-        // Add some HTML to the message if needed.
-        const message = CoreTextUtils.formatHtmlLines(modalData.message!);
-        const files = modalData.files;
-        const options: AddonModForumUpdateDiscussionPostWSOptionsObject = {};
-
-        const sendingModal = await CoreDomUtils.showModalLoading('core.sending', true);
-
-        try {
-            // Upload attachments first if any.
-            if (files.length) {
-                const attachment = await AddonModForumHelper.uploadOrStoreReplyFiles(
-                    this.forum.id,
-                    this.post.id,
-                    files as CoreFileEntry[],
-                    false,
-                );
-
-                options.attachmentsid = attachment;
-            }
-
-            // Try to send it to server.
-            const sent = await AddonModForum.updatePost(this.post.id, modalData.subject!, message, options);
-
-            if (sent && this.forum.id) {
-                // Data sent to server, delete stored files (if any).
-                AddonModForumHelper.deleteReplyStoredFiles(this.forum.id, this.post.id);
-
-                this.onPostChange.emit();
-                this.post.subject = modalData.subject!;
-                this.post.message = message;
-                this.post.attachments = modalData.files;
-            }
-        } catch (error) {
-            CoreDomUtils.showErrorModalDefault(error, 'addon.mod_forum.couldnotupdate', true);
-        } finally {
-            sendingModal.dismiss();
-        }
-    }
-
     /**
      * Set this post as being replied to.
      *
@@ -314,11 +254,11 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
         event.preventDefault();
         event.stopPropagation();
 
-        if (this.replyData.isEditing) {
+        if (this.formData.isEditing) {
             // User is editing a post, data needs to be resetted. Ask confirm if there is unsaved data.
             try {
                 await this.confirmDiscard();
-                this.setReplyFormData(this.post.id);
+                this.setFormData(this.post.id);
 
                 this.scrollToForm();
             } catch {
@@ -328,20 +268,20 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
             return;
         }
 
-        if (!this.replyData.replyingTo) {
+        if (!this.formData.replyingTo) {
             // User isn't replying, it's a brand new reply. Initialize the data.
-            this.setReplyFormData(this.post.id);
+            this.setFormData(this.post.id);
         } else {
             // The post being replied has changed but the data will be kept.
-            this.replyData.replyingTo = this.post.id;
+            this.formData.replyingTo = this.post.id;
 
-            if (this.replyData.subject == this.originalData.subject) {
+            if (this.formData.subject == this.originalData.subject) {
                 // Update subject only if it hadn't been modified
-                this.replyData.subject = this.defaultReplySubject;
+                this.formData.subject = this.defaultReplySubject;
                 this.originalData.subject = this.defaultReplySubject;
             }
 
-            this.messageControl.setValue(this.replyData.message);
+            this.messageControl.setValue(this.formData.message);
         }
 
         this.scrollToForm();
@@ -350,21 +290,22 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
     /**
      * Set this post as being edited to.
      */
-    async editOfflineReply(): Promise<void> {
+    async editPost(): Promise<void> {
         // Ask confirm if there is unsaved data.
         try {
             await this.confirmDiscard();
 
-            this.replyData.syncId = AddonModForumSync.getDiscussionSyncId(this.discussionId);
-            CoreSync.blockOperation(AddonModForumProvider.COMPONENT, this.replyData.syncId);
+            this.formData.syncId = AddonModForumSync.getDiscussionSyncId(this.discussionId);
+            CoreSync.blockOperation(AddonModForumProvider.COMPONENT, this.formData.syncId);
 
-            this.setReplyFormData(
+            this.setFormData(
                 this.post.parentid,
                 true,
                 this.post.subject,
                 this.post.message,
                 this.post.attachments,
                 this.post.isprivatereply,
+                this.post.id > 0 ? this.post.id : undefined,
             );
 
             this.scrollToForm(5);
@@ -379,67 +320,67 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
      * @param text The new text.
      */
     onMessageChange(text: string): void {
-        this.replyData.message = text;
+        this.formData.message = text;
     }
 
     /**
-     * Reply to this post.
+     * Reply to this post or edit post data.
      */
-    async reply(): Promise<void> {
-        if (!this.replyData.subject) {
+    async send(): Promise<void> {
+        if (!this.formData.subject) {
             CoreDomUtils.showErrorModal('addon.mod_forum.erroremptysubject', true);
 
             return;
         }
 
-        if (!this.replyData.message) {
+        if (!this.formData.message) {
             CoreDomUtils.showErrorModal('addon.mod_forum.erroremptymessage', true);
 
             return;
         }
 
         let saveOffline = false;
-        let message = this.replyData.message;
-        const subject = this.replyData.subject;
-        const replyingTo = this.replyData.replyingTo!;
-        const files = this.replyData.files || [];
-        const options: AddonModForumReplyOptions = {};
+        let message = this.formData.message;
+        const subject = this.formData.subject;
+        const replyingTo = this.formData.replyingTo!;
+        const files = this.formData.files || [];
+        const isEditOnline = this.formData.id && this.formData.id > 0;
         const modal = await CoreDomUtils.showModalLoading('core.sending', true);
 
         // Add some HTML to the message if needed.
         message = CoreTextUtils.formatHtmlLines(message);
 
-        // Set private option if checked.
-        if (this.replyData.isprivatereply) {
-            options.private = true;
-        }
-
         // Upload attachments first if any.
         let attachments;
 
-        if (files.length) {
-            try {
-                attachments = await AddonModForumHelper.uploadOrStoreReplyFiles(this.forum.id, replyingTo, files, false);
-            } catch (error) {
-
-                // Cannot upload them in online, save them in offline.
-                if (!this.forum.id) {
-                    // Cannot store them in offline without the forum ID. Reject.
-                    return Promise.reject(error);
-                }
-
-                saveOffline = true;
-                attachments = await AddonModForumHelper.uploadOrStoreReplyFiles(this.forum.id, replyingTo, files, true);
-            }
-        }
-
         try {
-            if (attachments) {
-                options.attachmentsid = attachments;
+            if (files.length) {
+                try {
+                    attachments = await AddonModForumHelper.uploadOrStoreReplyFiles(
+                        this.forum.id,
+                        isEditOnline ? this.formData.id! : replyingTo,
+                        files,
+                        false,
+                    );
+                } catch (error) {
+                    // Cannot upload them in online, save them in offline.
+                    if (!this.forum.id || isEditOnline) {
+                        // Cannot store them in offline. Reject.
+                        throw error;
+                    }
+
+                    saveOffline = true;
+                    attachments = await AddonModForumHelper.uploadOrStoreReplyFiles(this.forum.id, replyingTo, files, true);
+                }
             }
 
-            let sent;
-            if (saveOffline) {
+            let sent = false;
+
+            if (isEditOnline) {
+                sent = await AddonModForum.updatePost(this.formData.id!, subject, message, {
+                    attachmentsid: attachments,
+                });
+            } else if (saveOffline) {
                 // Save post in offline.
                 await AddonModForumOffline.replyPost(
                     replyingTo,
@@ -449,7 +390,10 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
                     this.courseId,
                     subject,
                     message,
-                    options,
+                    {
+                        attachmentsid: attachments,
+                        private: !!this.formData.isprivatereply,
+                    },
                 );
 
                 // Set sent to false since it wasn't sent to server.
@@ -465,7 +409,10 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
                     this.courseId,
                     subject,
                     message,
-                    options,
+                    {
+                        attachmentsid: attachments,
+                        private: !!this.formData.isprivatereply,
+                    },
                     undefined,
                     !files.length,
                 );
@@ -477,7 +424,7 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
             }
 
             // Reset data.
-            this.setReplyFormData();
+            this.setFormData();
 
             this.onPostChange.emit();
 
@@ -485,7 +432,11 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
 
             this.unblockOperation();
         } catch (error) {
-            CoreDomUtils.showErrorModalDefault(error, 'addon.mod_forum.couldnotadd', true);
+            CoreDomUtils.showErrorModalDefault(
+                error,
+                isEditOnline ? 'addon.mod_forum.couldnotupdate' : 'addon.mod_forum.couldnotadd',
+                true,
+            );
         } finally {
             modal.dismiss();
         }
@@ -499,7 +450,7 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
             await this.confirmDiscard();
 
             // Reset data.
-            this.setReplyFormData();
+            this.setFormData();
 
             CoreForms.triggerFormCancelledEvent(this.formElement, CoreSites.getCurrentSiteId());
 
@@ -529,7 +480,7 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
             await CoreUtils.ignoreErrors(Promise.all(promises));
 
             // Reset data.
-            this.setReplyFormData();
+            this.setFormData();
 
             this.onPostChange.emit();
 
@@ -566,7 +517,7 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
      * @return Promise resolved if the user confirms or data was not changed and rejected otherwise.
      */
     protected async confirmDiscard(): Promise<void> {
-        if (AddonModForumHelper.hasPostDataChanged(this.replyData, this.originalData)) {
+        if (AddonModForumHelper.hasPostDataChanged(this.formData, this.originalData)) {
             // Show confirmation if some data has been modified.
             await CoreDomUtils.showConfirm(Translate.instant('core.confirmloss'));
         }
@@ -578,12 +529,12 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
      * Unblock operation if there's any blocked operation.
      */
     protected unblockOperation(): void {
-        if (!this.replyData.syncId) {
+        if (!this.formData.syncId) {
             return;
         }
 
-        CoreSync.unblockOperation(AddonModForumProvider.COMPONENT, this.replyData.syncId);
-        delete this.replyData.syncId;
+        CoreSync.unblockOperation(AddonModForumProvider.COMPONENT, this.formData.syncId);
+        delete this.formData.syncId;
     }
 
     /**
diff --git a/src/addons/mod/forum/pages/discussion/discussion.html b/src/addons/mod/forum/pages/discussion/discussion.html
index 8900625fe..6cc5bb804 100644
--- a/src/addons/mod/forum/pages/discussion/discussion.html
+++ b/src/addons/mod/forum/pages/discussion/discussion.html
@@ -93,7 +93,7 @@
             <addon-mod-forum-post
                 [post]="startingPost" [discussion]="discussion" [courseId]="courseId" [highlight]="true"
                 [discussionId]="discussionId" [component]="component" [componentId]="cmId"
-                [replyData]="replyData" [originalData]="originalData" [forum]="forum" [accessInfo]="accessInfo"
+                [formData]="formData" [originalData]="originalData" [forum]="forum" [accessInfo]="accessInfo"
                 [trackPosts]="trackPosts" [ratingInfo]="ratingInfo" [leavingPage]="leavingPage"
                 (onPostChange)="postListChanged()">
             </addon-mod-forum-post>
@@ -104,7 +104,7 @@
                 <core-spacer *ngIf="!first"></core-spacer>
                 <addon-mod-forum-post
                     [post]="post" [courseId]="courseId" [discussionId]="discussionId"
-                    [component]="component" [componentId]="cmId" [replyData]="replyData"
+                    [component]="component" [componentId]="cmId" [formData]="formData"
                     [originalData]="originalData" [parentSubject]="postSubjects[post.parentid]"
                     [forum]="forum" [accessInfo]="accessInfo" [trackPosts]="trackPosts" [ratingInfo]="ratingInfo"
                     [leavingPage]="leavingPage"
@@ -123,7 +123,7 @@
             <ion-card>
                 <addon-mod-forum-post
                     [post]="post" [courseId]="courseId" [discussionId]="discussionId" [component]="component"
-                    [componentId]="cmId" [replyData]="replyData" [originalData]="originalData"
+                    [componentId]="cmId" [formData]="formData" [originalData]="originalData"
                     [parentSubject]="postSubjects[post.parentid]" [forum]="forum" [accessInfo]="accessInfo"
                     [trackPosts]="trackPosts" [ratingInfo]="ratingInfo" [leavingPage]="leavingPage"
                     (onPostChange)="postListChanged()">
diff --git a/src/addons/mod/forum/pages/discussion/discussion.page.ts b/src/addons/mod/forum/pages/discussion/discussion.page.ts
index ae7f6d128..44452fe37 100644
--- a/src/addons/mod/forum/pages/discussion/discussion.page.ts
+++ b/src/addons/mod/forum/pages/discussion/discussion.page.ts
@@ -39,7 +39,7 @@ import {
     AddonModForumDiscussion,
     AddonModForumPost,
     AddonModForumProvider,
-    AddonModForumReply,
+    AddonModForumPostFormData,
 } from '../../services/forum';
 import { AddonModForumHelper } from '../../services/forum-helper';
 import { AddonModForumOffline } from '../../services/forum-offline';
@@ -74,7 +74,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
     postHasOffline!: boolean;
     sort: SortType = 'nested';
     trackPosts!: boolean;
-    replyData: AddonModForumSharedReplyData = {
+    formData: AddonModForumSharedPostFormData = {
         replyingTo: 0,
         isEditing: false,
         subject: '',
@@ -83,7 +83,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
         isprivatereply: false,
     };
 
-    originalData: Omit<AddonModForumReply, 'id'> = {
+    originalData: Omit<AddonModForumPostFormData, 'id'> = {
         subject: null,
         message: null,
         files: [],
@@ -259,13 +259,13 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
      * @return Resolved if we can leave it, rejected if not.
      */
     async canLeave(): Promise<boolean> {
-        if (AddonModForumHelper.hasPostDataChanged(this.replyData, this.originalData)) {
+        if (AddonModForumHelper.hasPostDataChanged(this.formData, this.originalData)) {
             // Show confirmation if some data has been modified.
             await CoreDomUtils.showConfirm(Translate.instant('core.confirmcanceledit'));
         }
 
         // Delete the local files from the tmp folder.
-        CoreFileUploader.clearTmpFiles(this.replyData.files);
+        CoreFileUploader.clearTmpFiles(this.formData.files);
 
         this.leavingPage = true;
 
@@ -799,6 +799,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
 /**
  * Reply data shared by post.
  */
-export type AddonModForumSharedReplyData = Omit<AddonModForumReply, 'id'> & {
+export type AddonModForumSharedPostFormData = Omit<AddonModForumPostFormData, 'id'> & {
+    id?: number; // ID when editing an online reply.
     syncId?: string; // Sync ID if some post has blocked synchronization.
 };
diff --git a/src/addons/mod/forum/services/forum.ts b/src/addons/mod/forum/services/forum.ts
index bf53d6c30..aae5118d1 100644
--- a/src/addons/mod/forum/services/forum.ts
+++ b/src/addons/mod/forum/services/forum.ts
@@ -1558,9 +1558,9 @@ export type AddonModForumAccessInformation = {
 };
 
 /**
- * Reply info.
+ * Post creation or edition data.
  */
-export type AddonModForumReply = {
+export type AddonModForumPostFormData = {
     id: number;
     subject: string | null; // Null means original data is not set.
     message: string | null; // Null means empty or just white space.
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index 966324808..b94b8c5e0 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -1729,12 +1729,12 @@ export class CoreDomUtilsProvider {
      * Opens a popover.
      *
      * @param options Options.
+     * @return Promise resolved when the popover is dismissed or will be dismissed.
      */
-    async openPopover<T = void>(
-        options: OpenPopoverOptions,
-    ): Promise<T | undefined> {
+    async openPopover<T = void>(options: OpenPopoverOptions): Promise<T | undefined> {
 
-        const popover = await PopoverController.create(options);
+        const { waitForDismissCompleted, ...popoverOptions } = options;
+        const popover = await PopoverController.create(popoverOptions);
         const zoomLevel = await CoreConfig.get(CoreConstants.SETTINGS_ZOOM_LEVEL, CoreZoomLevel.NORMAL);
 
         await popover.present();
@@ -1751,8 +1751,7 @@ export class CoreDomUtilsProvider {
             }
         }
 
-        // If onDidDismiss is nedded we can add a new param to the function to wait one function or the other.
-        const result = options.waitForDismiss ? await popover.onDidDismiss<T>() : await popover.onWillDismiss<T>();
+        const result = waitForDismissCompleted ? await popover.onDidDismiss<T>() : await popover.onWillDismiss<T>();
         if (result?.data) {
             return result?.data;
         }
@@ -2051,5 +2050,5 @@ type AnchorOrMediaElement =
  * Options for the openPopover function.
  */
 export type OpenPopoverOptions = PopoverOptions & {
-    waitForDismiss?: boolean;
+    waitForDismissCompleted?: boolean;
 };

From e9506a106fd02dbd169202bccf179f300718d5c2 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 27 Aug 2021 10:14:49 +0200
Subject: [PATCH 0070/1008] MOBILE-3846 core: Don't allow using sites not
 present in config

---
 scripts/langindex.json                        |  1 +
 src/core/classes/errors/errors.ts             |  2 +
 .../errors/errorwithtitle.ts}                 | 18 +++++-
 src/core/features/login/lang.json             |  1 +
 src/core/features/login/pages/sites/sites.ts  |  4 ++
 .../features/login/services/login-helper.ts   |  6 +-
 .../initializers/consume-storage-redirect.ts  |  5 +-
 src/core/initializers/initialize-services.ts  |  2 +
 src/core/initializers/restore-session.ts      |  3 +
 src/core/services/sites.ts                    | 22 ++++++-
 src/core/services/update-manager.ts           | 59 ++++++++++++++++++-
 src/core/services/utils/dom.ts                |  3 +
 12 files changed, 116 insertions(+), 10 deletions(-)
 rename src/core/{initializers/load-update-manager.ts => classes/errors/errorwithtitle.ts} (57%)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index df750b6bf..135298c36 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1902,6 +1902,7 @@
   "core.login.sitebadgedescription": "local_moodlemobileapp",
   "core.login.sitehasredirect": "local_moodlemobileapp",
   "core.login.siteinmaintenance": "local_moodlemobileapp",
+  "core.login.sitenotallowed": "local_moodlemobileapp",
   "core.login.sitepolicynotagreederror": "local_moodlemobileapp",
   "core.login.siteurl": "local_moodlemobileapp",
   "core.login.siteurlrequired": "local_moodlemobileapp",
diff --git a/src/core/classes/errors/errors.ts b/src/core/classes/errors/errors.ts
index 3f0923075..94b34a72f 100644
--- a/src/core/classes/errors/errors.ts
+++ b/src/core/classes/errors/errors.ts
@@ -23,6 +23,7 @@ import { CoreAjaxWSError } from './ajaxwserror';
 import { CoreCaptureError } from './captureerror';
 import { CoreNetworkError } from './network-error';
 import { CoreSiteError } from './siteerror';
+import { CoreErrorWithTitle } from './errorwithtitle';
 
 export const CORE_ERRORS_CLASSES: Type<unknown>[] = [
     CoreAjaxError,
@@ -34,4 +35,5 @@ export const CORE_ERRORS_CLASSES: Type<unknown>[] = [
     CoreSilentError,
     CoreSiteError,
     CoreWSError,
+    CoreErrorWithTitle,
 ];
diff --git a/src/core/initializers/load-update-manager.ts b/src/core/classes/errors/errorwithtitle.ts
similarity index 57%
rename from src/core/initializers/load-update-manager.ts
rename to src/core/classes/errors/errorwithtitle.ts
index fdfc913f9..0ff83d3b7 100644
--- a/src/core/initializers/load-update-manager.ts
+++ b/src/core/classes/errors/errorwithtitle.ts
@@ -12,8 +12,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { CoreUpdateManager } from '@services/update-manager';
+import { CoreError } from './error';
+
+/**
+ * Error with an explicit title describing the problem (instead of just "Error" or a generic message).
+ * This title should be used to communicate the problem with users, and if it's undefined it should be omitted.
+ */
+export class CoreErrorWithTitle extends CoreError {
+
+    title?: string;
+
+    constructor(message?: string, title?: string) {
+        super(message);
+
+        this.title = title;
+    }
 
-export default async function(): Promise<void> {
-    await CoreUpdateManager.load();
 }
diff --git a/src/core/features/login/lang.json b/src/core/features/login/lang.json
index ecf4be149..74ae914e8 100644
--- a/src/core/features/login/lang.json
+++ b/src/core/features/login/lang.json
@@ -108,6 +108,7 @@
     "sitebadgedescription": "There are {{count}} unread notifications.",
     "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",
+    "sitenotallowed": "This site is no longer available.",
     "sitepolicynotagreederror": "Site policy not agreed.",
     "siteurl": "Site URL",
     "siteurlrequired": "Site URL required i.e <i>http://www.yourmoodlesite.org</i>",
diff --git a/src/core/features/login/pages/sites/sites.ts b/src/core/features/login/pages/sites/sites.ts
index e74ac1029..447d79f7d 100644
--- a/src/core/features/login/pages/sites/sites.ts
+++ b/src/core/features/login/pages/sites/sites.ts
@@ -49,6 +49,10 @@ export class CoreLoginSitesPage implements OnInit {
      * @return Promise resolved when done.
      */
     async ngOnInit(): Promise<void> {
+        if (CoreNavigator.getRouteBooleanParam('openAddSite')) {
+            this.add();
+        }
+
         const sites = await CoreUtils.ignoreErrors(CoreSites.getSortedSites(), [] as CoreSiteBasicInfo[]);
 
         // Remove protocol from the url to show more url text.
diff --git a/src/core/features/login/services/login-helper.ts b/src/core/features/login/services/login-helper.ts
index 68a8f63d4..afa90857d 100644
--- a/src/core/features/login/services/login-helper.ts
+++ b/src/core/features/login/services/login-helper.ts
@@ -573,9 +573,10 @@ export class CoreLoginHelperProvider {
      * Check if a site URL is "allowed". In case the app has fixed sites, only those will be allowed to connect to.
      *
      * @param siteUrl Site URL to check.
+     * @param checkSiteFinder Whether to check site finder if needed. Defaults to true.
      * @return Promise resolved with boolean: whether is one of the fixed sites.
      */
-    async isSiteUrlAllowed(siteUrl: string): Promise<boolean> {
+    async isSiteUrlAllowed(siteUrl: string, checkSiteFinder = true): Promise<boolean> {
         if (this.isFixedUrlSet()) {
             // Only 1 site allowed.
             return CoreUrl.sameDomainAndPath(siteUrl, <string> this.getFixedSites());
@@ -583,7 +584,8 @@ export class CoreLoginHelperProvider {
             const sites = <CoreLoginSiteInfo[]> this.getFixedSites();
 
             return sites.some((site) => CoreUrl.sameDomainAndPath(siteUrl, site.url));
-        } else if (CoreConstants.CONFIG.multisitesdisplay == 'sitefinder' && CoreConstants.CONFIG.onlyallowlistedsites) {
+        } else if (CoreConstants.CONFIG.multisitesdisplay == 'sitefinder' && CoreConstants.CONFIG.onlyallowlistedsites &&
+                checkSiteFinder) {
             // Call the sites finder to validate the site.
             const result = await CoreSites.findSites(siteUrl.replace(/^https?:\/\/|\.\w{2,3}\/?$/g, ''));
 
diff --git a/src/core/initializers/consume-storage-redirect.ts b/src/core/initializers/consume-storage-redirect.ts
index 4a0f0efbc..990636a0c 100644
--- a/src/core/initializers/consume-storage-redirect.ts
+++ b/src/core/initializers/consume-storage-redirect.ts
@@ -13,7 +13,10 @@
 // limitations under the License.
 
 import { CoreApp } from '@services/app';
+import { CoreUpdateManager } from '@services/update-manager';
+
+export default async function(): Promise<void> {
+    await CoreUpdateManager.donePromise;
 
-export default function(): void {
     CoreApp.consumeStorageRedirect();
 }
diff --git a/src/core/initializers/initialize-services.ts b/src/core/initializers/initialize-services.ts
index c07eeafff..bef39b3a1 100644
--- a/src/core/initializers/initialize-services.ts
+++ b/src/core/initializers/initialize-services.ts
@@ -15,11 +15,13 @@
 import { CoreFilepool } from '@services/filepool';
 import { CoreLang } from '@services/lang';
 import { CoreLocalNotifications } from '@services/local-notifications';
+import { CoreUpdateManager } from '@services/update-manager';
 
 export default async function(): Promise<void> {
     await Promise.all([
         CoreFilepool.initialize(),
         CoreLang.initialize(),
         CoreLocalNotifications.initialize(),
+        CoreUpdateManager.initialize(),
     ]);
 }
diff --git a/src/core/initializers/restore-session.ts b/src/core/initializers/restore-session.ts
index 73296a92b..41914ea02 100644
--- a/src/core/initializers/restore-session.ts
+++ b/src/core/initializers/restore-session.ts
@@ -13,7 +13,10 @@
 // limitations under the License.
 
 import { CoreSites } from '@services/sites';
+import { CoreUpdateManager } from '@services/update-manager';
 
 export default async function(): Promise<void> {
+    await CoreUpdateManager.donePromise;
+
     await CoreSites.restoreSession();
 }
diff --git a/src/core/services/sites.ts b/src/core/services/sites.ts
index eb04d3fda..ac3a630a1 100644
--- a/src/core/services/sites.ts
+++ b/src/core/services/sites.ts
@@ -53,6 +53,8 @@ import { CoreNetworkError } from '@classes/errors/network-error';
 import { CoreNavigationOptions } from './navigator';
 import { CoreSitesFactory } from './sites-factory';
 import { CoreText } from '@singletons/text';
+import { CoreLoginHelper } from '@features/login/services/login-helper';
+import { CoreErrorWithTitle } from '@classes/errors/errorwithtitle';
 
 export const CORE_SITE_SCHEMAS = new InjectionToken<CoreSiteSchema[]>('CORE_SITE_SCHEMAS');
 
@@ -823,6 +825,11 @@ export class CoreSitesProvider {
 
         const site = await this.getSite(siteId);
 
+        const siteUrlAllowed = await CoreLoginHelper.isSiteUrlAllowed(site.getURL(), false);
+        if (!siteUrlAllowed) {
+            throw new CoreErrorWithTitle(Translate.instant('core.login.sitenotallowed'));
+        }
+
         this.currentSite = site;
 
         if (site.isLoggedOut()) {
@@ -1196,8 +1203,6 @@ export class CoreSitesProvider {
             return;
         }
 
-        const db = await this.appDB;
-
         const promises: Promise<unknown>[] = [];
         const siteConfig = this.currentSite.getStoredConfig();
         const siteId = this.currentSite.getId();
@@ -1208,7 +1213,7 @@ export class CoreSitesProvider {
             promises.push(this.setSiteLoggedOut(siteId, true));
         }
 
-        promises.push(db.deleteRecords(CURRENT_SITE_TABLE_NAME, { id: 1 }));
+        promises.push(this.removeStoredCurrentSite());
 
         await CoreUtils.ignoreErrors(Promise.all(promises));
 
@@ -1449,6 +1454,17 @@ export class CoreSitesProvider {
         return currentSite.siteId;
     }
 
+    /**
+     * Remove current site stored in DB.
+     *
+     * @return Promise resolved when done.
+     */
+    async removeStoredCurrentSite(): Promise<void> {
+        const db = await this.appDB;
+
+        await db.deleteRecords(CURRENT_SITE_TABLE_NAME, { id: 1 });
+    }
+
     /**
      * Get the public config of a certain site.
      *
diff --git a/src/core/services/update-manager.ts b/src/core/services/update-manager.ts
index ed030e4c4..38ad5d2b7 100644
--- a/src/core/services/update-manager.ts
+++ b/src/core/services/update-manager.ts
@@ -19,6 +19,10 @@ import { CoreConstants } from '@/core/constants';
 import { CoreLogger } from '@singletons/logger';
 import { makeSingleton } from '@singletons';
 import { CoreH5P } from '@features/h5p/services/h5p';
+import { CoreLoginHelper } from '@features/login/services/login-helper';
+import { CoreSites } from './sites';
+import { CoreUtils, PromiseDefer } from './utils/utils';
+import { CoreApp } from './app';
 
 const VERSION_APPLIED = 'version_applied';
 
@@ -31,9 +35,20 @@ const VERSION_APPLIED = 'version_applied';
 export class CoreUpdateManagerProvider {
 
     protected logger: CoreLogger;
+    protected doneDeferred: PromiseDefer<void>;
 
     constructor() {
         this.logger = CoreLogger.getInstance('CoreUpdateManagerProvider');
+        this.doneDeferred = CoreUtils.promiseDefer();
+    }
+
+    /**
+     * Returns a promise resolved when the load function is done.
+     *
+     * @return Promise resolved when the load function is done.
+     */
+    get donePromise(): Promise<void> {
+        return this.doneDeferred.promise;
     }
 
     /**
@@ -42,12 +57,16 @@ export class CoreUpdateManagerProvider {
      *
      * @return Promise resolved when the update process finishes.
      */
-    async load(): Promise<void> {
+    async initialize(): Promise<void> {
         const promises: Promise<unknown>[] = [];
         const versionCode = CoreConstants.CONFIG.versioncode;
 
         const versionApplied = await CoreConfig.get<number>(VERSION_APPLIED, 0);
 
+        if (versionCode > versionApplied) {
+            promises.push(this.checkCurrentSiteAllowed());
+        }
+
         if (versionCode >= 3950 && versionApplied < 3950 && versionApplied > 0) {
             promises.push(CoreH5P.h5pPlayer.deleteAllContentIndexes());
         }
@@ -58,9 +77,47 @@ export class CoreUpdateManagerProvider {
             await CoreConfig.set(VERSION_APPLIED, versionCode);
         } catch (error) {
             this.logger.error(`Error applying update from ${versionApplied} to ${versionCode}`, error);
+        } finally {
+            this.doneDeferred.resolve();
         }
     }
 
+    /**
+     * If there is a current site, check if it's still supported in the new app.
+     *
+     * @return Promise resolved when done.
+     */
+    protected async checkCurrentSiteAllowed(): Promise<void> {
+        if (!CoreLoginHelper.getFixedSites()) {
+            return;
+        }
+
+        const currentSiteId = await CoreUtils.ignoreErrors(CoreSites.getStoredCurrentSiteId());
+        if (!currentSiteId) {
+            return;
+        }
+
+        const site = await CoreUtils.ignoreErrors(CoreSites.getSite(currentSiteId));
+        if (!site) {
+            return;
+        }
+
+        const isUrlAllowed = await CoreLoginHelper.isSiteUrlAllowed(site.getURL(), false);
+        if (isUrlAllowed) {
+            return;
+        }
+
+        // Site no longer supported, remove it as current site.
+        await CoreSites.removeStoredCurrentSite();
+
+        // Tell the app to open add site so the user can add the new site.
+        CoreApp.storeRedirect(CoreConstants.NO_SITE_ID, '/login/sites', {
+            params: {
+                openAddSite: true,
+            },
+        });
+    }
+
 }
 
 export const CoreUpdateManager = makeSingleton(CoreUpdateManagerProvider);
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index 7a3d37e90..7ffe8ddfb 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -38,6 +38,7 @@ import { CoreViewerImageComponent } from '@features/viewer/components/image/imag
 import { CoreFormFields, CoreForms } from '../../singletons/form';
 import { CoreModalLateralTransitionEnter, CoreModalLateralTransitionLeave } from '@classes/modal-lateral-transition';
 import { CoreZoomLevel } from '@features/settings/services/settings-helper';
+import { CoreErrorWithTitle } from '@classes/errors/errorwithtitle';
 
 /*
  * "Utils" service with helper functions for UI, DOM elements and HTML code.
@@ -1376,6 +1377,8 @@ export class CoreDomUtilsProvider {
 
         if (this.isNetworkError(message, error)) {
             alertOptions.cssClass = 'core-alert-network-error';
+        } else if (error instanceof CoreErrorWithTitle) {
+            alertOptions.header = error.title || undefined;
         } else {
             alertOptions.header = Translate.instant('core.error');
         }

From 2b2f4b251769a980eb37aaf85240eac2cb34b697 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 2 Sep 2021 11:55:01 +0200
Subject: [PATCH 0071/1008] MOBILE-3833 DX: Configure default browser As
 documented in
 https://docs.moodle.org/dev/Using_the_Moodle_App_in_a_browser#Configuring_the_default_browser

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 410bf7793..1aaa5439b 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   ],
   "scripts": {
     "ng": "ng",
-    "start": "ionic serve",
+    "start": "ionic serve --browser=$MOODLE_APP_BROWSER",
     "build": "ionic build",
     "build:prod": "NODE_ENV=production ionic build --prod",
     "build:test": "NODE_ENV=testing ionic build",

From d944cb19783ca9985d5ae5644c59fe948e3e565b Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 3 Sep 2021 09:26:02 +0200
Subject: [PATCH 0072/1008] MOBILE-3819 core: Increase minimum Moodle version
 to 3.5

---
 src/core/classes/site.ts   | 27 +++++++++++++++------------
 src/core/services/sites.ts |  7 ++-----
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/core/classes/site.ts b/src/core/classes/site.ts
index 4ed56b553..8d10c359d 100644
--- a/src/core/classes/site.ts
+++ b/src/core/classes/site.ts
@@ -65,14 +65,10 @@ export class CoreSite {
     static readonly WS_CACHE_TABLE = 'wscache_2';
     static readonly CONFIG_TABLE = 'core_site_config';
 
-    static readonly MINIMUM_MOODLE_VERSION = '3.1';
+    static readonly MINIMUM_MOODLE_VERSION = '3.5';
 
     // Versions of Moodle releases.
-    protected readonly MOODLE_RELEASES = {
-        '3.1': 2016052300,
-        '3.2': 2016120500,
-        '3.3': 2017051503,
-        '3.4': 2017111300,
+    static readonly MOODLE_RELEASES = {
         '3.5': 2018051700,
         '3.6': 2018120300,
         '3.7': 2019052000,
@@ -495,6 +491,13 @@ export class CoreSite {
      */
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     async request<T = unknown>(method: string, data: any, preSets: CoreSiteWSPreSets, retrying?: boolean): Promise<T> {
+        if (this.isLoggedOut()) {
+            // Site is logged out, it cannot call WebServices.
+            CoreEvents.trigger(CoreEvents.SESSION_EXPIRED, {}, this.id);
+
+            throw new CoreError(Translate.instant('core.lostconnection'));
+        }
+
         const initialToken = this.token || '';
         data = data || {};
 
@@ -1812,12 +1815,12 @@ export class CoreSite {
             return 0;
         }
 
-        if (typeof this.MOODLE_RELEASES[data.major] == 'undefined') {
+        if (CoreSite.MOODLE_RELEASES[data.major] === undefined) {
             // Major version not found. Use the last one.
-            data.major = Object.keys(this.MOODLE_RELEASES).pop()!;
+            data.major = Object.keys(CoreSite.MOODLE_RELEASES).pop()!;
         }
 
-        return this.MOODLE_RELEASES[data.major] + data.minor;
+        return CoreSite.MOODLE_RELEASES[data.major] + data.minor;
     }
 
     /**
@@ -1847,7 +1850,7 @@ export class CoreSite {
      */
     protected getNextMajorVersionNumber(version: string): number {
         const data = this.getMajorAndMinor(version);
-        const releases = Object.keys(this.MOODLE_RELEASES);
+        const releases = Object.keys(CoreSite.MOODLE_RELEASES);
 
         if (!data) {
             // Invalid version.
@@ -1858,10 +1861,10 @@ export class CoreSite {
 
         if (position == -1 || position == releases.length - 1) {
             // Major version not found or it's the last one. Use the last one.
-            return this.MOODLE_RELEASES[releases[position]];
+            return CoreSite.MOODLE_RELEASES[releases[position]];
         }
 
-        return this.MOODLE_RELEASES[releases[position + 1]];
+        return CoreSite.MOODLE_RELEASES[releases[position + 1]];
     }
 
     /**
diff --git a/src/core/services/sites.ts b/src/core/services/sites.ts
index ac3a630a1..25dc84381 100644
--- a/src/core/services/sites.ts
+++ b/src/core/services/sites.ts
@@ -606,14 +606,11 @@ export class CoreSitesProvider {
             return CoreSitesProvider.INVALID_VERSION;
         }
 
-        const version31 = 2016052300;
-        const release31 = CoreSite.MINIMUM_MOODLE_VERSION;
-
         // Try to validate by version.
         if (info.version) {
             const version = parseInt(info.version, 10);
             if (!isNaN(version)) {
-                if (version >= version31) {
+                if (version >= CoreSite.MOODLE_RELEASES[CoreSite.MINIMUM_MOODLE_VERSION]) {
                     return this.validateWorkplaceVersion(info);
                 }
             }
@@ -622,7 +619,7 @@ export class CoreSitesProvider {
         // We couldn't validate by version number. Let's try to validate by release number.
         const release = this.getReleaseNumber(info.release || '');
         if (release) {
-            if (release >= release31) {
+            if (release >= CoreSite.MINIMUM_MOODLE_VERSION) {
                 return this.validateWorkplaceVersion(info);
             }
         }

From 872e2aa02a279ea212bddaa40dbd53ee267e5c6d Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 6 Sep 2021 10:21:32 +0200
Subject: [PATCH 0073/1008] MOBILE-3793 forum: Use 'Save changes' text when
 editing

---
 src/addons/mod/forum/components/post/post.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/addons/mod/forum/components/post/post.html b/src/addons/mod/forum/components/post/post.html
index 4dcded210..7a3223a80 100644
--- a/src/addons/mod/forum/components/post/post.html
+++ b/src/addons/mod/forum/components/post/post.html
@@ -151,7 +151,8 @@
             <ion-row>
                 <ion-col>
                     <ion-button expand="block" (click)="send()" [disabled]="formData.subject == '' || formData.message == null">
-                        {{ 'addon.mod_forum.posttoforum' | translate }}
+                        <span *ngIf="formData.isEditing">{{ 'core.savechanges' | translate }}</span>
+                        <span *ngIf="!formData.isEditing">{{ 'addon.mod_forum.posttoforum' | translate }}</span>
                     </ion-button>
                 </ion-col>
                 <ion-col>

From 68e57c0f1722d39f8fb49dbed24e7417c3603767 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 3 Sep 2021 11:51:26 +0200
Subject: [PATCH 0074/1008] MOBILE-3819 core: Remove code specific for Moodle
 3.1-3.4

---
 src/addons/badges/services/badges.ts          |   4 +-
 .../calendarmonth/services/block-handler.ts   |   4 +-
 .../services/block-handler.ts                 |   4 +-
 .../block/timeline/services/timeline.ts       |   9 +-
 src/addons/blog/services/blog.ts              |   3 +-
 src/addons/calendar/calendar-lazy.module.ts   |   7 -
 src/addons/calendar/pages/event/event.html    |   2 +-
 src/addons/calendar/pages/event/event.page.ts |  39 +-
 src/addons/calendar/pages/list/list.html      |  96 ---
 src/addons/calendar/pages/list/list.module.ts |  60 --
 src/addons/calendar/pages/list/list.page.ts   | 643 ------------------
 src/addons/calendar/pages/list/list.scss      |   5 -
 src/addons/calendar/services/calendar.ts      | 150 +---
 .../calendar/services/handlers/mainmenu.ts    |   2 +-
 .../calendar/services/handlers/view-link.ts   |   8 +-
 .../airnotifier/services/airnotifier.ts       |  11 -
 .../services/handlers/messageoutput.ts        |   5 +-
 src/addons/messages/messages-lazy.module.ts   |   4 +-
 .../pages/discussion/discussion.page.ts       |  71 +-
 .../pages/discussions-35/discussions.html     |   2 +-
 .../pages/discussions-35/discussions.page.ts  |   2 -
 .../messages/services/handlers/mainmenu.ts    |   5 +-
 .../messages/services/handlers/settings.ts    |   4 +-
 src/addons/messages/services/messages.ts      |  85 +--
 .../index/addon-mod-assign-index.html         |  16 +-
 .../mod/assign/components/index/index.ts      |   9 +-
 .../components/submission/submission.ts       |  17 +-
 .../submission-list/submission-list.html      |   7 -
 .../submission-list/submission-list.page.ts   |  11 -
 .../mod/assign/services/assign-helper.ts      |  29 +-
 src/addons/mod/assign/services/assign-sync.ts |  11 +-
 src/addons/mod/assign/services/assign.ts      | 192 +-----
 .../mod/assign/services/handlers/module.ts    |   3 +-
 .../mod/assign/services/handlers/prefetch.ts  |  14 +-
 .../submission/comments/services/handler.ts   |  21 +-
 .../submission/onlinetext/services/handler.ts |   7 +-
 src/addons/mod/book/services/book.ts          |   2 +-
 .../index/addon-mod-chat-index.html           |   2 +-
 src/addons/mod/chat/components/index/index.ts |   3 -
 src/addons/mod/chat/services/chat.ts          |  17 +-
 .../mod/chat/services/handlers/module.ts      |  13 +-
 .../mod/chat/services/handlers/prefetch.ts    |   7 -
 src/addons/mod/choice/services/choice.ts      |   2 +-
 src/addons/mod/data/services/data.ts          |  13 -
 .../data/services/handlers/approve-link.ts    |   3 +-
 .../mod/data/services/handlers/delete-link.ts |   3 +-
 .../mod/data/services/handlers/edit-link.ts   |   3 +-
 .../mod/data/services/handlers/index-link.ts  |   8 -
 .../mod/data/services/handlers/list-link.ts   |   8 -
 .../mod/data/services/handlers/module.ts      |   5 +-
 .../mod/data/services/handlers/prefetch.ts    |   7 -
 .../mod/data/services/handlers/show-link.ts   |   3 +-
 .../mod/data/services/handlers/tag-area.ts    |   3 +-
 src/addons/mod/feedback/services/feedback.ts  |  14 -
 .../services/handlers/analysis-link.ts        |   3 +-
 .../services/handlers/complete-link.ts        |   3 +-
 .../feedback/services/handlers/index-link.ts  |  14 -
 .../feedback/services/handlers/list-link.ts   |   8 -
 .../mod/feedback/services/handlers/module.ts  |   5 +-
 .../feedback/services/handlers/prefetch.ts    |   7 -
 .../feedback/services/handlers/print-link.ts  |   3 +-
 .../feedback/services/handlers/push-click.ts  |   3 +-
 .../services/handlers/show-entries-link.ts    |   3 +-
 .../handlers/show-non-respondents-link.ts     |   3 +-
 .../mod/folder/components/index/index.ts      |  18 +-
 src/addons/mod/folder/services/folder.ts      |  10 -
 .../mod/folder/services/handlers/prefetch.ts  |   5 +-
 .../new-discussion/new-discussion.page.ts     |   7 +-
 src/addons/mod/forum/services/forum.ts        |   9 -
 .../mod/glossary/components/index/index.ts    |   2 +-
 src/addons/mod/glossary/services/glossary.ts  |  16 -
 .../glossary/services/handlers/prefetch.ts    |   8 +-
 .../mod/h5pactivity/services/h5pactivity.ts   |   3 +-
 .../mod/label/services/handlers/prefetch.ts   |  12 +-
 src/addons/mod/label/services/label.ts        |  26 -
 .../lesson/services/handlers/grade-link.ts    |  15 -
 .../lesson/services/handlers/index-link.ts    |  15 -
 .../mod/lesson/services/handlers/list-link.ts |  11 -
 .../mod/lesson/services/handlers/module.ts    |   5 +-
 .../mod/lesson/services/handlers/prefetch.ts  |   9 -
 .../lesson/services/handlers/report-link.ts   |   3 +-
 src/addons/mod/lesson/services/lesson.ts      |  13 -
 src/addons/mod/lti/services/lti.ts            |   2 +-
 src/addons/mod/page/components/index/index.ts |  23 +-
 .../mod/page/services/handlers/prefetch.ts    |   5 +-
 src/addons/mod/page/services/page.ts          |  10 -
 src/addons/mod/quiz/components/index/index.ts |   9 +-
 .../mod/quiz/services/handlers/prefetch.ts    |   9 +-
 src/addons/mod/quiz/services/quiz.ts          |   4 +-
 .../mod/resource/components/index/index.ts    |  26 +-
 .../mod/resource/services/handlers/module.ts  |   2 +-
 .../resource/services/handlers/prefetch.ts    |   5 +-
 src/addons/mod/resource/services/resource.ts  |  10 -
 src/addons/mod/scorm/services/scorm.ts        |   5 -
 src/addons/mod/survey/services/survey.ts      |   2 +-
 src/addons/mod/url/components/index/index.ts  |   8 +-
 .../mod/url/services/handlers/module.ts       |   4 +-
 src/addons/mod/url/services/url.ts            |  10 -
 src/addons/mod/wiki/services/wiki.ts          |   4 +-
 .../workshop/services/handlers/index-link.ts  |   9 +-
 .../workshop/services/handlers/list-link.ts   |  10 -
 .../mod/workshop/services/handlers/module.ts  |   5 +-
 .../workshop/services/handlers/prefetch.ts    |   7 -
 src/addons/mod/workshop/services/workshop.ts  |  15 +-
 src/addons/notifications/pages/list/list.ts   |  12 +-
 .../pages/settings/settings.html              | 179 +++--
 .../notifications/pages/settings/settings.ts  |   8 +-
 .../notifications/services/handlers/cron.ts   |   5 +-
 .../services/handlers/settings.ts             |   5 +-
 .../services/notifications-helper.ts          |  15 +-
 .../notifications/services/notifications.ts   |  97 +--
 src/addons/privatefiles/pages/index/index.ts  |  11 +-
 .../privatefiles/services/privatefiles.ts     |  22 -
 .../ddimageortext/component/ddimageortext.ts  |   2 +-
 .../qtype/ddmarker/component/ddmarker.ts      |   2 +-
 src/core/classes/site.ts                      |   2 +-
 src/core/directives/external-content.ts       |   2 +-
 src/core/directives/format-text.ts            |  13 +-
 .../features/comments/services/comments.ts    |   2 +-
 .../components/format/core-course-format.html |   2 +-
 .../components/module/core-course-module.html |   2 +-
 .../course/components/module/module.ts        |   2 -
 .../course/pages/contents/contents.ts         |   2 +-
 .../course/pages/preview/preview.page.ts      |   7 +-
 .../features/course/services/course-helper.ts |  33 +-
 .../services/course-options-delegate.ts       |   3 +-
 src/core/features/course/services/course.ts   |  28 +-
 .../services/handlers/default-format.ts       |   3 -
 .../services/module-prefetch-delegate.ts      |  32 +-
 .../courses/pages/my-courses/my-courses.ts    |  12 +-
 .../courses/services/courses-helper.ts        |  21 +-
 src/core/features/courses/services/courses.ts |  27 +-
 .../services/handlers/courses-index-link.ts   |  12 +-
 src/core/features/filter/services/filter.ts   |  23 +-
 .../features/grades/services/grades-helper.ts |  33 +-
 src/core/features/grades/services/grades.ts   |  32 +-
 .../login/pages/site-policy/site-policy.ts    |   4 +-
 .../features/login/services/login-helper.ts   |   5 -
 .../features/rating/components/rate/rate.ts   |   2 +-
 src/core/features/rating/services/rating.ts   |   8 +-
 .../features/sitehome/services/sitehome.ts    |   4 +-
 .../siteplugins/services/siteplugins.ts       |  13 +-
 src/core/features/tag/services/tag.ts         |   1 +
 .../user/pages/profile/profile.page.ts        |   1 -
 .../features/user/services/user-delegate.ts   |  21 +-
 src/core/features/user/services/user.ts       |  18 +-
 src/core/services/sites.ts                    |   5 -
 147 files changed, 436 insertions(+), 2398 deletions(-)
 delete mode 100644 src/addons/calendar/pages/list/list.html
 delete mode 100644 src/addons/calendar/pages/list/list.module.ts
 delete mode 100644 src/addons/calendar/pages/list/list.page.ts
 delete mode 100644 src/addons/calendar/pages/list/list.scss

diff --git a/src/addons/badges/services/badges.ts b/src/addons/badges/services/badges.ts
index a807534a7..d95e4f733 100644
--- a/src/addons/badges/services/badges.ts
+++ b/src/addons/badges/services/badges.ts
@@ -39,7 +39,7 @@ export class AddonBadgesProvider {
     async isPluginEnabled(siteId?: string): Promise<boolean> {
         const site = await CoreSites.getSite(siteId);
 
-        return site.canUseAdvancedFeature('enablebadges') && site.wsAvailable('core_course_get_user_navigation_options');
+        return site.canUseAdvancedFeature('enablebadges');
     }
 
     /**
@@ -194,7 +194,7 @@ export type AddonBadgesUserBadge = {
         targetframework?: string; // Target framework.
         targetcode?: string; // Target code.
     }[];
-    competencies?: { // @deprecated from 3.7. @since 3.6. In 3.7 it was renamed to alignment.
+    competencies?: { // @deprecatedonmoodle from 3.7. @since 3.6. In 3.7 it was renamed to alignment.
         id?: number; // Alignment id.
         badgeid?: number; // Badge id.
         targetname?: string; // Target name.
diff --git a/src/addons/block/calendarmonth/services/block-handler.ts b/src/addons/block/calendarmonth/services/block-handler.ts
index bf557dbdc..a29e04ba9 100644
--- a/src/addons/block/calendarmonth/services/block-handler.ts
+++ b/src/addons/block/calendarmonth/services/block-handler.ts
@@ -16,10 +16,10 @@ import { Injectable } from '@angular/core';
 import { CoreBlockHandlerData } from '@features/block/services/block-delegate';
 import { CoreBlockOnlyTitleComponent } from '@features/block/components/only-title-block/only-title-block';
 import { CoreBlockBaseHandler } from '@features/block/classes/base-block-handler';
-import { AddonCalendar } from '@/addons/calendar/services/calendar';
 import { CoreCourseBlock } from '@features/course/services/course';
 import { Params } from '@angular/router';
 import { makeSingleton } from '@singletons';
+import { AddonCalendarMainMenuHandlerService } from '@addons/calendar/services/handlers/mainmenu';
 
 /**
  * Block handler.
@@ -45,7 +45,7 @@ export class AddonBlockCalendarMonthHandlerService extends CoreBlockBaseHandler
             title: 'addon.block_calendarmonth.pluginname',
             class: 'addon-block-calendar-month',
             component: CoreBlockOnlyTitleComponent,
-            link: AddonCalendar.getMainCalendarPagePath(),
+            link: AddonCalendarMainMenuHandlerService.PAGE_NAME,
             linkParams: linkParams,
             navOptions: {
                 preferCurrentTab: false,
diff --git a/src/addons/block/calendarupcoming/services/block-handler.ts b/src/addons/block/calendarupcoming/services/block-handler.ts
index 4820df1f0..2201a1c32 100644
--- a/src/addons/block/calendarupcoming/services/block-handler.ts
+++ b/src/addons/block/calendarupcoming/services/block-handler.ts
@@ -16,10 +16,10 @@ import { Injectable } from '@angular/core';
 import { CoreBlockHandlerData } from '@features/block/services/block-delegate';
 import { CoreBlockOnlyTitleComponent } from '@features/block/components/only-title-block/only-title-block';
 import { CoreBlockBaseHandler } from '@features/block/classes/base-block-handler';
-import { AddonCalendar } from '@/addons/calendar/services/calendar';
 import { CoreCourseBlock } from '@features/course/services/course';
 import { Params } from '@angular/router';
 import { makeSingleton } from '@singletons';
+import { AddonCalendarMainMenuHandlerService } from '@addons/calendar/services/handlers/mainmenu';
 
 /**
  * Block handler.
@@ -46,7 +46,7 @@ export class AddonBlockCalendarUpcomingHandlerService extends CoreBlockBaseHandl
             title: 'addon.block_calendarupcoming.pluginname',
             class: 'addon-block-calendar-upcoming',
             component: CoreBlockOnlyTitleComponent,
-            link: AddonCalendar.getMainCalendarPagePath(),
+            link: AddonCalendarMainMenuHandlerService.PAGE_NAME,
             linkParams: linkParams,
             navOptions: {
                 preferCurrentTab: false,
diff --git a/src/addons/block/timeline/services/timeline.ts b/src/addons/block/timeline/services/timeline.ts
index c50c5adef..c2e646f00 100644
--- a/src/addons/block/timeline/services/timeline.ts
+++ b/src/addons/block/timeline/services/timeline.ts
@@ -248,13 +248,8 @@ export class AddonBlockTimelineProvider {
     async isAvailable(siteId?: string): Promise<boolean> {
         const site = await CoreSites.getSite(siteId);
 
-        // First check if dashboard is disabled.
-        if (CoreCoursesDashboard.isDisabledInSite(site)) {
-            return false;
-        }
-
-        return site.wsAvailable('core_calendar_get_action_events_by_courses') &&
-            site.wsAvailable('core_calendar_get_action_events_by_timesort');
+        // Check if dashboard is disabled.
+        return !CoreCoursesDashboard.isDisabledInSite(site);
     }
 
     /**
diff --git a/src/addons/blog/services/blog.ts b/src/addons/blog/services/blog.ts
index 0b9e77ed8..8e1847d83 100644
--- a/src/addons/blog/services/blog.ts
+++ b/src/addons/blog/services/blog.ts
@@ -40,11 +40,12 @@ export class AddonBlogProvider {
      *
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with true if enabled, resolved with false or rejected otherwise.
+     * @since 3.6
      */
     async isPluginEnabled(siteId?: string): Promise<boolean> {
         const site = await CoreSites.getSite(siteId);
 
-        return site.wsAvailable('core_blog_get_entries') &&site.canUseAdvancedFeature('enableblogs');
+        return site.wsAvailable('core_blog_get_entries') && site.canUseAdvancedFeature('enableblogs');
     }
 
     /**
diff --git a/src/addons/calendar/calendar-lazy.module.ts b/src/addons/calendar/calendar-lazy.module.ts
index 7c6e1658b..5ead2dbca 100644
--- a/src/addons/calendar/calendar-lazy.module.ts
+++ b/src/addons/calendar/calendar-lazy.module.ts
@@ -38,13 +38,6 @@ function buildRoutes(injector: Injector): Routes {
             },
             loadChildren: () => import('@/addons/calendar/pages/index/index.module').then(m => m.AddonCalendarIndexPageModule),
         },
-        {
-            path: 'list',
-            data: {
-                mainMenuTabRoot: AddonCalendarMainMenuHandlerService.PAGE_NAME,
-            },
-            loadChildren: () => import('@/addons/calendar/pages/list/list.module').then(m => m.AddonCalendarListPageModule),
-        },
         {
             path: 'settings',
             loadChildren: () =>
diff --git a/src/addons/calendar/pages/event/event.html b/src/addons/calendar/pages/event/event.html
index 00acf2531..445329e5c 100644
--- a/src/addons/calendar/pages/event/event.html
+++ b/src/addons/calendar/pages/event/event.html
@@ -28,7 +28,7 @@
         <core-context-menu-item [hidden]="!canEdit || !event || !event.canedit || event.deleted" [priority]="300"
             [content]="'core.edit' | translate" (action)="openEdit()" iconAction="fas-edit">
         </core-context-menu-item>
-        <core-context-menu-item [hidden]="!canDelete || !event || !event.candelete || event.deleted" [priority]="200"
+        <core-context-menu-item [hidden]="!event || !event.candelete || event.deleted" [priority]="200"
             [content]="'core.delete' | translate" (action)="deleteEvent()"
             iconAction="fas-trash"></core-context-menu-item>
         <core-context-menu-item [hidden]="!event || !event.deleted" [priority]="200" [content]="'core.restore' | translate"
diff --git a/src/addons/calendar/pages/event/event.page.ts b/src/addons/calendar/pages/event/event.page.ts
index 61b53c219..e92b62b8e 100644
--- a/src/addons/calendar/pages/event/event.page.ts
+++ b/src/addons/calendar/pages/event/event.page.ts
@@ -17,16 +17,12 @@ import { IonRefresher } from '@ionic/angular';
 import { AlertOptions } from '@ionic/core';
 import {
     AddonCalendar,
-    AddonCalendarEvent,
-    AddonCalendarEventBase,
     AddonCalendarEventToDisplay,
-    AddonCalendarGetEventsEvent,
     AddonCalendarProvider,
 } from '../../services/calendar';
 import { AddonCalendarHelper } from '../../services/calendar-helper';
 import { AddonCalendarOffline } from '../../services/calendar-offline';
 import { AddonCalendarSync, AddonCalendarSyncEvents, AddonCalendarSyncProvider } from '../../services/calendar-sync';
-import { CoreCourses } from '@features/courses/services/courses';
 import { CoreApp } from '@services/app';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreDomUtils } from '@services/utils/dom';
@@ -82,7 +78,6 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
     defaultTime = 0;
     reminders: AddonCalendarReminderDBRecord[] = [];
     canEdit = false;
-    canDelete = false;
     hasOffline = false;
     isOnline = false;
     syncIcon = CoreConstants.ICON_LOADING; // Sync icon.
@@ -99,9 +94,8 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
         this.currentSiteId = CoreSites.getCurrentSiteId();
         this.isSplitViewOn = this.svComponent?.outletActivated;
 
-        // Check if site supports editing and deleting. No need to check allowed types, event.canedit already does it.
+        // Check if site supports editing. No need to check allowed types, event.canedit already does it.
         this.canEdit = AddonCalendar.canEditEventsInSite();
-        this.canDelete = AddonCalendar.canDeleteEventsInSite();
 
         // Listen for event edited. If current event is edited, reload the data.
         this.editEventObserver = CoreEvents.on(AddonCalendarProvider.EDIT_EVENT_EVENT, (data) => {
@@ -168,8 +162,6 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
      * @return Promise resolved when done.
      */
     async fetchEvent(sync = false, showErrors = false): Promise<void> {
-        const currentSite = CoreSites.getCurrentSite();
-        const canGetById = AddonCalendar.isGetEventByIdAvailableInSite();
         let deleted = false;
 
         this.isOnline = CoreApp.isOnline();
@@ -209,13 +201,8 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
         }
 
         try {
-            let event: AddonCalendarEvent | AddonCalendarEventBase | AddonCalendarGetEventsEvent;
             // Get the event data.
-            if (canGetById) {
-                event = await AddonCalendar.getEventById(this.eventId);
-            } else {
-                event = await AddonCalendar.getEvent(this.eventId);
-            }
+            const event = await AddonCalendar.getEventById(this.eventId);
             this.event = AddonCalendarHelper.formatEventData(event);
 
             try {
@@ -254,9 +241,7 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
                 }
 
                 // Get the module URL.
-                if (canGetById) {
-                    this.moduleUrl = this.event!.url || '';
-                }
+                this.moduleUrl = this.event!.url || '';
             }
 
             const promises: Promise<void>[] = [];
@@ -264,24 +249,10 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
             const courseId = this.event.courseid;
             if (courseId != this.siteHomeId) {
                 // If the event belongs to a course, get the course name and the URL to view it.
-                if (canGetById && this.event.course) {
+                if (this.event.course) {
                     this.courseId = this.event.course.id;
                     this.courseName = this.event.course.fullname;
                     this.courseUrl = this.event.course.viewurl;
-                } else if (!canGetById && this.event.courseid ) {
-                    // Retrieve the course.
-                    promises.push(CoreCourses.getUserCourse(this.event.courseid, true).then((course) => {
-                        this.courseId = course.id;
-                        this.courseName = course.fullname;
-                        this.courseUrl = currentSite ? CoreTextUtils.concatenatePaths(
-                            currentSite.siteUrl,
-                            '/course/view.php?id=' + this.courseId,
-                        ) : '';
-
-                        return;
-                    }).catch(() => {
-                        // Error getting course, just don't show the course name.
-                    }));
                 }
             }
 
@@ -299,7 +270,7 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
                 }));
             }
 
-            if (canGetById && this.event.iscategoryevent && this.event.category) {
+            if (this.event.iscategoryevent && this.event.category) {
                 this.categoryPath = this.event.category.nestedname;
             }
 
diff --git a/src/addons/calendar/pages/list/list.html b/src/addons/calendar/pages/list/list.html
deleted file mode 100644
index 9e64554e4..000000000
--- a/src/addons/calendar/pages/list/list.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<ion-header>
-    <ion-toolbar>
-        <ion-buttons slot="start">
-            <ion-back-button [text]="'core.back' | translate"></ion-back-button>
-        </ion-buttons>
-        <h1>{{ 'addon.calendar.calendarevents' | translate }}</h1>
-        <ion-buttons slot="end">
-            <ion-button fill="clear" (click)="openFilter($event)" [attr.aria-label]="'core.filter' | translate">
-                <ion-icon slot="icon-only" name="fas-filter" aria-hidden="true"></ion-icon>
-            </ion-button>
-            <core-context-menu>
-                <core-context-menu-item [hidden]="!notificationsEnabled" [priority]="600"
-                [content]="'core.settings.settings' | translate" (action)="openSettings()" iconAction="fas-cogs">
-            </core-context-menu-item>
-                <core-context-menu-item [hidden]="!eventsLoaded || !hasOffline || !isOnline" [priority]="400"
-                [content]="'core.settings.synchronizenow' | translate" (action)="doRefresh(undefined, $event, true)"
-                [iconAction]="syncIcon" [closeOnClick]="false"></core-context-menu-item>
-            </core-context-menu>
-        </ion-buttons>
-    </ion-toolbar>
-</ion-header>
-<ion-content>
-    <ion-refresher slot="fixed" [disabled]="!eventsLoaded" (ionRefresh)="doRefresh($event.target)">
-        <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
-    </ion-refresher>
-    <core-loading [hideUntil]="eventsLoaded">
-        <!-- There is data to be synchronized -->
-        <ion-card class="core-warning-card" *ngIf="hasOffline">
-            <ion-item>
-                <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
-                <ion-label>{{ 'core.hasdatatosync' | translate:{$a: 'addon.calendar.calendar' | translate} }}</ion-label>
-            </ion-item>
-        </ion-card>
-
-        <core-empty-box *ngIf="!filteredEvents || !filteredEvents.length" icon="fas-calendar"
-            [message]="'addon.calendar.noevents' | translate">
-        </core-empty-box>
-
-        <ion-list *ngIf="filteredEvents && filteredEvents.length" class="ion-no-margin">
-            <ng-container *ngFor="let event of filteredEvents">
-                <ion-item-divider *ngIf="event.showDate">
-                    <ion-label><p class="item-heading">{{ event.timestart * 1000 | coreFormatDate: "strftimedayshort" }}</p></ion-label>
-                </ion-item-divider>
-                <ion-item class="addon-calendar-event ion-text-wrap" [attr.aria-label]="event.name" (click)="gotoEvent(event.id)"
-                    [attr.aria-current]="event.id == eventId ? 'page' : 'false'"
-                    [ngClass]="['addon-calendar-eventtype-'+event.eventtype]" button detail="true">
-                    <img *ngIf="event.moduleIcon" src="{{event.moduleIcon}}" slot="start" class="core-module-icon" alt=""
-                        role="presentation">
-                    <ion-icon *ngIf="event.eventIcon && !event.moduleIcon" [name]="event.eventIcon" slot="start"
-                        aria-hidden="true">
-                    </ion-icon>
-                    <ion-label>
-                        <p class="item-heading">
-                            <!-- Add the icon title so accessibility tools read it. -->
-                            <span class="sr-only">
-                                {{ 'addon.calendar.type' + event.formattedType | translate }}
-                                <span class="sr-only" *ngIf="event.moduleIcon && event.iconTitle">{{ event.iconTitle }}</span>
-                            </span>
-                            <core-format-text [text]="event.name" [contextLevel]="event.contextLevel"
-                                [contextInstanceId]="event.contextInstanceId">
-                            </core-format-text>
-                        </p>
-                        <p>
-                            {{ event.timestart * 1000 | coreFormatDate: "strftimetime" }}
-                            <span *ngIf="event.timeduration && event.endsSameDay">
-                                - {{ (event.timestart + event.timeduration) * 1000 | coreFormatDate: "strftimetime" }}
-                            </span>
-                            <span *ngIf="event.timeduration && !event.endsSameDay">
-                                - {{ (event.timestart + event.timeduration) * 1000 | coreFormatDate: "strftimedatetimeshort" }}
-                            </span>
-                        </p>
-                    </ion-label>
-                    <ion-note *ngIf="event.offline && !event.deleted" slot="end">
-                        <ion-icon name="fas-clock" aria-hidden="true"></ion-icon>
-                        <span class="ion-text-wrap">{{ 'core.notsent' | translate }}</span>
-                    </ion-note>
-                    <ion-note *ngIf="event.deleted" slot="end">
-                        <ion-icon name="fas-trash" aria-hidden="true"></ion-icon>
-                        <span class="ion-text-wrap">{{ 'core.deletedoffline' | translate }}</span>
-                    </ion-note>
-                </ion-item>
-            </ng-container>
-        </ion-list>
-
-        <core-infinite-loading [enabled]="canLoadMore" (action)="loadMoreEvents($event)" [error]="loadMoreError">
-        </core-infinite-loading>
-    </core-loading>
-
-    <!-- Create a calendar event. -->
-    <ion-fab slot="fixed" core-fab vertical="bottom" horizontal="end" *ngIf="canCreate">
-        <ion-fab-button (click)="openEdit()" [attr.aria-label]="'addon.calendar.newevent' | translate">
-            <ion-icon name="fas-plus" aria-hidden="true"></ion-icon>
-            <span class="sr-only">{{ 'addon.calendar.newevent' | translate }}</span>
-        </ion-fab-button>
-    </ion-fab>
-</ion-content>
diff --git a/src/addons/calendar/pages/list/list.module.ts b/src/addons/calendar/pages/list/list.module.ts
deleted file mode 100644
index 751dfd235..000000000
--- a/src/addons/calendar/pages/list/list.module.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-// (C) Copyright 2015 Moodle Pty Ltd.
-//
-// 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 { RouterModule, Routes } from '@angular/router';
-import { AddonCalendarEventRoute, AddonCalendarEditRoute } from '@addons/calendar/calendar-lazy.module';
-import { conditionalRoutes } from '@/app/app-routing.module';
-import { CoreScreen } from '@services/screen';
-
-import { CoreSharedModule } from '@/core/shared.module';
-
-import { AddonCalendarListPage } from './list.page';
-
-const splitviewRoutes = [AddonCalendarEditRoute, AddonCalendarEventRoute];
-
-const mobileRoutes: Routes = [
-    {
-        path: '',
-        component: AddonCalendarListPage,
-    },
-    ...splitviewRoutes,
-];
-
-const tabletRoutes: Routes = [
-    {
-        path: '',
-        component: AddonCalendarListPage,
-        children: [
-            ...splitviewRoutes,
-        ],
-    },
-];
-
-const routes: Routes = [
-    ...conditionalRoutes(mobileRoutes, () => CoreScreen.isMobile),
-    ...conditionalRoutes(tabletRoutes, () => CoreScreen.isTablet),
-];
-
-@NgModule({
-    imports: [
-        RouterModule.forChild(routes),
-        CoreSharedModule,
-    ],
-    declarations: [
-        AddonCalendarListPage,
-    ],
-    exports: [RouterModule],
-})
-export class AddonCalendarListPageModule {}
diff --git a/src/addons/calendar/pages/list/list.page.ts b/src/addons/calendar/pages/list/list.page.ts
deleted file mode 100644
index 6cdf62469..000000000
--- a/src/addons/calendar/pages/list/list.page.ts
+++ /dev/null
@@ -1,643 +0,0 @@
-// (C) Copyright 2015 Moodle Pty Ltd.
-//
-// 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, ViewChild, OnDestroy, OnInit } from '@angular/core';
-import { IonContent, IonRefresher } from '@ionic/angular';
-import {
-    AddonCalendarProvider,
-    AddonCalendar,
-    AddonCalendarEventToDisplay,
-} from '../../services/calendar';
-import { AddonCalendarOffline } from '../../services/calendar-offline';
-import { AddonCalendarFilter, AddonCalendarHelper } from '../../services/calendar-helper';
-import { AddonCalendarSync, AddonCalendarSyncProvider } from '../../services/calendar-sync';
-import { CoreCategoryData, CoreCourses, CoreEnrolledCourseData } from '@features/courses/services/courses';
-import { CoreDomUtils } from '@services/utils/dom';
-import { CoreTimeUtils } from '@services/utils/time';
-import { CoreSites } from '@services/sites';
-import { CoreLocalNotifications } from '@services/local-notifications';
-import { CoreEventObserver, CoreEvents } from '@singletons/events';
-import { CoreApp } from '@services/app';
-import moment from 'moment';
-import { CoreConstants } from '@/core/constants';
-import { AddonCalendarFilterPopoverComponent } from '../../components/filter/filter';
-import { Params } from '@angular/router';
-import { Subscription } from 'rxjs';
-import { Network, NgZone } from '@singletons';
-import { CoreCoursesHelper } from '@features/courses/services/courses-helper';
-import { CoreUtils } from '@services/utils/utils';
-import { CoreNavigator } from '@services/navigator';
-
-/**
- * Page that displays the list of calendar events.
- */
-@Component({
-    selector: 'page-addon-calendar-list',
-    templateUrl: 'list.html',
-    styleUrls: ['../../calendar-common.scss', 'list.scss'],
-})
-export class AddonCalendarListPage implements OnInit, OnDestroy {
-
-    @ViewChild(IonContent) content?: IonContent;
-
-    protected initialTime = 0;
-    protected daysLoaded = 0;
-    protected emptyEventsTimes = 0; // Variable to identify consecutive calls returning 0 events.
-    protected categoriesRetrieved = false;
-    protected getCategories = false;
-    protected categories: { [id: number]: CoreCategoryData } = {};
-    protected siteHomeId: number;
-    protected currentSiteId: string;
-    protected onlineEvents: AddonCalendarEventToDisplay[] = [];
-    protected offlineEvents: AddonCalendarEventToDisplay[] = [];
-    protected deletedEvents: number [] = [];
-
-    // Observers.
-    protected obsDefaultTimeChange?: CoreEventObserver;
-    protected newEventObserver: CoreEventObserver;
-    protected discardedObserver: CoreEventObserver;
-    protected editEventObserver: CoreEventObserver;
-    protected deleteEventObserver: CoreEventObserver;
-    protected undeleteEventObserver: CoreEventObserver;
-    protected syncObserver: CoreEventObserver;
-    protected manualSyncObserver: CoreEventObserver;
-    protected filterChangedObserver: CoreEventObserver;
-    protected onlineObserver: Subscription;
-
-    eventId?: number; // Selected EventId on list
-    courses: Partial<CoreEnrolledCourseData>[] = [];
-    eventsLoaded = false;
-    events: AddonCalendarEventToDisplay[] = []; // Events (both online and offline).
-    notificationsEnabled = false;
-    filteredEvents: AddonCalendarEventToDisplay[] = [];
-    canLoadMore = false;
-    loadMoreError = false;
-    canCreate = false;
-    hasOffline = false;
-    isOnline = false;
-    syncIcon = CoreConstants.ICON_LOADING;
-    filter: AddonCalendarFilter = {
-        filtered: false,
-        courseId: undefined,
-        categoryId: undefined,
-        course: true,
-        group: true,
-        site: true,
-        user: true,
-        category: true,
-    };
-
-    constructor() {
-
-        this.siteHomeId = CoreSites.getCurrentSiteHomeId();
-        this.notificationsEnabled = CoreLocalNotifications.isAvailable();
-        this.currentSiteId = CoreSites.getCurrentSiteId();
-
-        if (this.notificationsEnabled) {
-            // Re-schedule events if default time changes.
-            this.obsDefaultTimeChange = CoreEvents.on(AddonCalendarProvider.DEFAULT_NOTIFICATION_TIME_CHANGED, () => {
-                AddonCalendar.scheduleEventsNotifications(this.onlineEvents);
-            }, this.currentSiteId);
-        }
-
-        // Listen for events added. When an event is added, reload the data.
-        this.newEventObserver = CoreEvents.on(AddonCalendarProvider.NEW_EVENT_EVENT, (data) => {
-            if (data && data.eventId) {
-                this.eventsLoaded = false;
-                this.refreshEvents(true, false);
-            }
-        }, this.currentSiteId);
-
-        // Listen for new event discarded event. When it does, reload the data.
-        this.discardedObserver = CoreEvents.on(AddonCalendarProvider.NEW_EVENT_DISCARDED_EVENT, () => {
-            this.eventsLoaded = false;
-            this.refreshEvents(true, false);
-        }, this.currentSiteId);
-
-        // Listen for events edited. When an event is edited, reload the data.
-        this.editEventObserver = CoreEvents.on(AddonCalendarProvider.EDIT_EVENT_EVENT, (data) => {
-            if (data && data.eventId) {
-                this.eventsLoaded = false;
-                this.refreshEvents(true, false);
-            }
-        }, this.currentSiteId);
-
-        // Refresh data if calendar events are synchronized automatically.
-        this.syncObserver = CoreEvents.on(AddonCalendarSyncProvider.AUTO_SYNCED, () => {
-            this.eventsLoaded = false;
-            this.refreshEvents();
-        }, this.currentSiteId);
-
-        // Refresh data if calendar events are synchronized manually but not by this page.
-        this.manualSyncObserver = CoreEvents.on(AddonCalendarSyncProvider.MANUAL_SYNCED, (data) => {
-            if (data && data.source != 'list') {
-                this.eventsLoaded = false;
-                this.refreshEvents();
-            }
-        }, this.currentSiteId);
-
-        // Update the list when an event is deleted.
-        this.deleteEventObserver = CoreEvents.on(
-            AddonCalendarProvider.DELETED_EVENT_EVENT,
-            (data) => {
-                if (data && !data.sent) {
-                    // Event was deleted in offline. Just mark it as deleted, no need to refresh.
-                    this.markAsDeleted(data.eventId, true);
-                    this.deletedEvents.push(data.eventId);
-                    this.hasOffline = true;
-                } else {
-                    // Event deleted, refresh the view.
-                    this.eventsLoaded = false;
-                    this.refreshEvents();
-                }
-            },
-            this.currentSiteId,
-        );
-
-        // Listen for events "undeleted" (offline).
-        this.undeleteEventObserver = CoreEvents.on(
-            AddonCalendarProvider.UNDELETED_EVENT_EVENT,
-            (data) => {
-                if (!data || !data.eventId) {
-                    return;
-                }
-
-                // Mark it as undeleted, no need to refresh.
-                this.markAsDeleted(data.eventId, false);
-
-                // Remove it from the list of deleted events if it's there.
-                const index = this.deletedEvents.indexOf(data.eventId);
-                if (index != -1) {
-                    this.deletedEvents.splice(index, 1);
-                }
-
-                this.hasOffline = !!this.offlineEvents.length || !!this.deletedEvents.length;
-            },
-            this.currentSiteId,
-        );
-
-        this.filterChangedObserver =
-            CoreEvents.on(AddonCalendarProvider.FILTER_CHANGED_EVENT, async (data) => {
-                this.filter = data;
-
-                // Course viewed has changed, check if the user can create events for this course calendar.
-                this.canCreate = await AddonCalendarHelper.canEditEvents(this.filter.courseId);
-
-                this.filterEvents();
-
-                this.content?.scrollToTop();
-            });
-
-        // Refresh online status when changes.
-        this.onlineObserver = Network.onChange().subscribe(() => {
-            // Execute the callback in the Angular zone, so change detection doesn't stop working.
-            NgZone.run(() => {
-                this.isOnline = CoreApp.isOnline();
-            });
-        });
-    }
-
-    /**
-     * View loaded.
-     */
-    async ngOnInit(): Promise<void> {
-        this.filter.courseId = CoreNavigator.getRouteNumberParam('courseId');
-        this.syncIcon = CoreConstants.ICON_LOADING;
-
-        await this.fetchData(false, true, false);
-    }
-
-    /**
-     * Fetch all the data required for the view.
-     *
-     * @param refresh Empty events array first.
-     * @param sync Whether it should try to synchronize offline events.
-     * @param showErrors Whether to show sync errors to the user.
-     * @return Promise resolved when done.
-     */
-    async fetchData(refresh = false, sync = false, showErrors = false): Promise<void> {
-        this.initialTime = CoreTimeUtils.timestamp();
-        this.daysLoaded = 0;
-        this.emptyEventsTimes = 0;
-        this.isOnline = CoreApp.isOnline();
-
-        if (sync) {
-            // Try to synchronize offline events.
-            try {
-                const result = await AddonCalendarSync.syncEvents();
-                if (result.warnings && result.warnings.length) {
-                    CoreDomUtils.showErrorModal(result.warnings[0]);
-                }
-
-                if (result.updated) {
-                    // Trigger a manual sync event.
-                    result.source = 'list';
-
-                    CoreEvents.trigger(
-                        AddonCalendarSyncProvider.MANUAL_SYNCED,
-                        result,
-                        this.currentSiteId,
-                    );
-                }
-            } catch (error) {
-                if (showErrors) {
-                    CoreDomUtils.showErrorModalDefault(error, 'core.errorsync', true);
-                }
-            }
-        }
-
-        try {
-            const promises: Promise<void>[] = [];
-
-            this.hasOffline = false;
-
-            promises.push(AddonCalendarHelper.canEditEvents(this.filter.courseId).then((canEdit) => {
-                this.canCreate = canEdit;
-
-                return;
-            }));
-
-            // Load courses for the popover.
-            promises.push(CoreCoursesHelper.getCoursesForPopover(this.filter.courseId).then((result) => {
-                this.courses = result.courses;
-
-                return this.fetchEvents(refresh);
-            }));
-
-            // Get offline events.
-            promises.push(AddonCalendarOffline.getAllEditedEvents().then((offlineEvents) => {
-                this.hasOffline = this.hasOffline || !!offlineEvents.length;
-
-                // Format data and sort by timestart.
-                const events: AddonCalendarEventToDisplay[] = offlineEvents.map((event) =>
-                    AddonCalendarHelper.formatOfflineEventData(event));
-
-                this.offlineEvents = AddonCalendarHelper.sortEvents(events);
-
-                return;
-            }));
-
-            // Get events deleted in offline.
-            promises.push(AddonCalendarOffline.getAllDeletedEventsIds().then((ids) => {
-                this.hasOffline = this.hasOffline || !!ids.length;
-                this.deletedEvents = ids;
-
-                return;
-            }));
-
-            await Promise.all(promises);
-        } catch (error) {
-            CoreDomUtils.showErrorModalDefault(error, 'addon.calendar.errorloadevents', true);
-        }
-
-        this.eventsLoaded = true;
-        this.syncIcon = CoreConstants.ICON_SYNC;
-    }
-
-    /**
-     * Fetches the events and updates the view.
-     *
-     * @param refresh Empty events array first.
-     * @return Promise resolved when done.
-     */
-    async fetchEvents(refresh = false): Promise<void> {
-        this.loadMoreError = false;
-
-        try {
-            const onlineEventsTemp =
-                await AddonCalendar.getEventsList(this.initialTime, this.daysLoaded, AddonCalendarProvider.DAYS_INTERVAL);
-
-            if (onlineEventsTemp.length === 0) {
-                this.emptyEventsTimes++;
-                if (this.emptyEventsTimes > 5) { // Stop execution if we retrieve empty list 6 consecutive times.
-                    this.canLoadMore = false;
-                    if (refresh) {
-                        this.onlineEvents = [];
-                        this.filteredEvents = [];
-                        this.events = this.offlineEvents;
-                    }
-                } else {
-                    // No events returned, load next events.
-                    this.daysLoaded += AddonCalendarProvider.DAYS_INTERVAL;
-
-                    return this.fetchEvents();
-                }
-            } else {
-                const onlineEvents = onlineEventsTemp.map((event) => AddonCalendarHelper.formatEventData(event));
-
-                // Get the merged events of this period.
-                const events = this.mergeEvents(onlineEvents);
-
-                this.getCategories = this.shouldLoadCategories(onlineEvents);
-
-                if (refresh) {
-                    this.onlineEvents = onlineEvents;
-                    this.events = events;
-                } else {
-                    // Filter events with same ID. Repeated events are returned once per WS call, show them only once.
-                    this.onlineEvents = CoreUtils.mergeArraysWithoutDuplicates(this.onlineEvents, onlineEvents, 'id');
-                    this.events = CoreUtils.mergeArraysWithoutDuplicates(this.events, events, 'id');
-                }
-                this.filterEvents();
-
-                // Calculate which evemts need to display the date.
-                this.filteredEvents.forEach((event, index) => {
-                    event.showDate = this.showDate(event, this.filteredEvents[index - 1]);
-                    event.endsSameDay = this.endsSameDay(event);
-                });
-                this.canLoadMore = true;
-
-                // Schedule notifications for the events retrieved (might have new events).
-                AddonCalendar.scheduleEventsNotifications(this.onlineEvents);
-
-                this.daysLoaded += AddonCalendarProvider.DAYS_INTERVAL;
-            }
-        } catch (error) {
-            CoreDomUtils.showErrorModalDefault(error, 'addon.calendar.errorloadevents', true);
-            this.loadMoreError = true; // Set to prevent infinite calls with infinite-loading.
-        }
-
-        // Success retrieving events. Get categories if needed.
-        if (this.getCategories) {
-            this.getCategories = false;
-
-            return this.loadCategories();
-        }
-    }
-
-    /**
-     * Function to load more events.
-     *
-     * @param infiniteComplete Infinite scroll complete function. Only used from core-infinite-loading.
-     * @return Resolved when done.
-     */
-    loadMoreEvents(infiniteComplete?: () => void ): void {
-        this.fetchEvents().finally(() => {
-            infiniteComplete && infiniteComplete();
-        });
-    }
-
-    protected filterEvents(): void {
-        this.filteredEvents = AddonCalendarHelper.getFilteredEvents(this.events, this.filter, this.categories);
-    }
-
-    /**
-     * Returns if the current state should load categories or not.
-     *
-     * @param events Events to parse.
-     * @return True if categories should be loaded.
-     */
-    protected shouldLoadCategories(events: AddonCalendarEventToDisplay[]): boolean {
-        if (this.categoriesRetrieved || this.getCategories) {
-            // Use previous value
-            return this.getCategories;
-        }
-
-        // Categories not loaded yet. We should get them if there's any category event.
-        const found = events.some((event) => typeof event.categoryid != 'undefined' && event.categoryid > 0);
-
-        return found || this.getCategories;
-    }
-
-    /**
-     * Load categories to be able to filter events.
-     *
-     * @return Promise resolved when done.
-     */
-    protected async loadCategories(): Promise<void> {
-        try {
-            const cats = await CoreCourses.getCategories(0, true);
-            this.categoriesRetrieved = true;
-            this.categories = {};
-            // Index categories by ID.
-            cats.forEach((category) => {
-                this.categories[category.id] = category;
-            });
-        } catch {
-            // Ignore errors.
-        }
-    }
-
-    /**
-     * Merge a period of online events with the offline events of that period.
-     *
-     * @param onlineEvents Online events.
-     * @return Merged events.
-     */
-    protected mergeEvents(onlineEvents: AddonCalendarEventToDisplay[]): AddonCalendarEventToDisplay[] {
-        if (!this.offlineEvents.length && !this.deletedEvents.length) {
-            // No offline events, nothing to merge.
-            return onlineEvents;
-        }
-
-        const start = this.initialTime + (CoreConstants.SECONDS_DAY * this.daysLoaded);
-        const end = start + (CoreConstants.SECONDS_DAY * AddonCalendarProvider.DAYS_INTERVAL) - 1;
-        let result = onlineEvents;
-
-        if (this.deletedEvents.length) {
-            // Mark as deleted the events that were deleted in offline.
-            result.forEach((event) => {
-                event.deleted = this.deletedEvents.indexOf(event.id) != -1;
-            });
-        }
-
-        if (this.offlineEvents.length) {
-            // Remove the online events that were modified in offline.
-            result = result.filter((event) => {
-                const offlineEvent = this.offlineEvents.find((ev) => ev.id == event.id);
-
-                return !offlineEvent;
-            });
-        }
-
-        // Now get the offline events that belong to this period.
-        const periodOfflineEvents = this.offlineEvents.filter((event) => {
-            if (this.daysLoaded == 0 && event.timestart < start) {
-                // Display offline events that are previous to current time to allow editing them.
-                return true;
-            }
-
-            return (event.timestart >= start || event.timestart + event.timeduration >= start) && event.timestart <= end;
-        });
-
-        // Merge both arrays and sort them.
-        result = result.concat(periodOfflineEvents);
-
-        return AddonCalendarHelper.sortEvents(result);
-    }
-
-    /**
-     * Refresh the data.
-     *
-     * @param refresher Refresher.
-     * @param done Function to call when done.
-     * @param showErrors Whether to show sync errors to the user.
-     * @return Promise resolved when done.
-     */
-    async doRefresh(refresher?: IonRefresher, done?: () => void, showErrors?: boolean): Promise<void> {
-        if (!this.eventsLoaded) {
-            return;
-        }
-
-        await this.refreshEvents(true, showErrors).finally(() => {
-            refresher?.complete();
-            done && done();
-        });
-    }
-
-    /**
-     * Refresh the events.
-     *
-     * @param sync Whether it should try to synchronize offline events.
-     * @param showErrors Whether to show sync errors to the user.
-     * @return Promise resolved when done.
-     */
-    async refreshEvents(sync?: boolean, showErrors?: boolean): Promise<void> {
-        this.syncIcon = CoreConstants.ICON_LOADING;
-
-        const promises: Promise<void>[] = [];
-
-        promises.push(AddonCalendar.invalidateEventsList());
-        promises.push(AddonCalendar.invalidateAllowedEventTypes());
-
-        if (this.categoriesRetrieved) {
-            promises.push(CoreCourses.invalidateCategories(0, true));
-            this.categoriesRetrieved = false;
-        }
-
-        await Promise.all(promises).finally(() => this.fetchData(true, sync, showErrors));
-    }
-
-    /**
-     * Check date should be shown on event list for the current event.
-     * If date has changed from previous to current event it should be shown.
-     *
-     * @param event Current event where to show the date.
-     * @param prevEvent Previous event where to compare the date with.
-     * @return If date has changed and should be shown.
-     */
-    protected showDate(event: AddonCalendarEventToDisplay, prevEvent?: AddonCalendarEventToDisplay): boolean {
-        if (!prevEvent) {
-            // First event, show it.
-            return true;
-        }
-
-        // Check if day has changed.
-        return !moment(event.timestart * 1000).isSame(prevEvent.timestart * 1000, 'day');
-    }
-
-    /**
-     * Check if event ends the same date or not.
-     *
-     * @param event Event info.
-     * @return If date has changed and should be shown.
-     */
-    protected endsSameDay(event: AddonCalendarEventToDisplay): boolean {
-        if (!event.timeduration) {
-            // No duration.
-            return true;
-        }
-
-        // Check if day has changed.
-        return moment(event.timestart * 1000).isSame((event.timestart + event.timeduration) * 1000, 'day');
-    }
-
-    /**
-     * Show the context menu.
-     *
-     * @param event Event.
-     */
-    async openFilter(event: MouseEvent): Promise<void> {
-        await CoreDomUtils.openPopover({
-            component: AddonCalendarFilterPopoverComponent,
-            componentProps: {
-                courses: this.courses,
-                filter: this.filter,
-            },
-            event,
-        });
-    }
-
-    /**
-     * Open page to create/edit an event.
-     *
-     * @param eventId Event ID to edit.
-     */
-    openEdit(eventId?: number): void {
-        this.eventId = undefined;
-        eventId = eventId || 0;
-
-        const params: Params = {};
-
-        if (this.filter.courseId) {
-            params.courseId = this.filter.courseId;
-        }
-
-        CoreNavigator.navigateToSitePath(`calendar/edit/${eventId}`, { params });
-    }
-
-    /**
-     * Open calendar events settings.
-     */
-    openSettings(): void {
-        CoreNavigator.navigateToSitePath('/calendar/settings');
-    }
-
-    /**
-     * Navigate to a particular event.
-     *
-     * @param eventId Event to load.
-     */
-    gotoEvent(eventId: number): void {
-        this.eventId = eventId;
-
-        if (eventId <= 0) {
-            // It's an offline event, go to the edit page.
-            this.openEdit(eventId);
-        } else {
-            CoreNavigator.navigateToSitePath(`/calendar/event/${eventId}`);
-        }
-    }
-
-    /**
-     * Find an event and mark it as deleted.
-     *
-     * @param eventId Event ID.
-     * @param deleted Whether to mark it as deleted or not.
-     */
-    protected markAsDeleted(eventId: number, deleted: boolean): void {
-        const event = this.onlineEvents.find((event) => event.id == eventId);
-
-        if (event) {
-            event.deleted = deleted;
-        }
-    }
-
-    /**
-     * Page destroyed.
-     */
-    ngOnDestroy(): void {
-        this.obsDefaultTimeChange?.off();
-        this.newEventObserver?.off();
-        this.discardedObserver?.off();
-        this.editEventObserver?.off();
-        this.deleteEventObserver?.off();
-        this.undeleteEventObserver?.off();
-        this.syncObserver?.off();
-        this.manualSyncObserver?.off();
-        this.filterChangedObserver?.off();
-        this.onlineObserver?.unsubscribe();
-    }
-
-}
diff --git a/src/addons/calendar/pages/list/list.scss b/src/addons/calendar/pages/list/list.scss
deleted file mode 100644
index 28505ddcb..000000000
--- a/src/addons/calendar/pages/list/list.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-:host {
-    ion-note {
-        max-width: 30%;
-    }
-}
diff --git a/src/addons/calendar/services/calendar.ts b/src/addons/calendar/services/calendar.ts
index 0d3c84412..b4ab29361 100644
--- a/src/addons/calendar/services/calendar.ts
+++ b/src/addons/calendar/services/calendar.ts
@@ -125,36 +125,6 @@ export class AddonCalendarProvider {
         },
     ];
 
-    /**
-     * Check if a certain site allows deleting events.
-     *
-     * @param siteId Site Id. If not defined, use current site.
-     * @return Promise resolved with true if can delete.
-     * @since 3.3
-     */
-    async canDeleteEvents(siteId?: string): Promise<boolean> {
-        try {
-            const site = await CoreSites.getSite(siteId);
-
-            return this.canDeleteEventsInSite(site);
-        } catch {
-            return false;
-        }
-    }
-
-    /**
-     * Check if a certain site allows deleting events.
-     *
-     * @param site Site. If not defined, use current site.
-     * @return Whether events can be deleted.
-     * @since 3.3
-     */
-    canDeleteEventsInSite(site?: CoreSite): boolean {
-        site = site || CoreSites.getCurrentSite();
-
-        return !!site?.wsAvailable('core_calendar_delete_calendar_events');
-    }
-
     /**
      * Check if a certain site allows creating and editing events.
      *
@@ -186,67 +156,6 @@ export class AddonCalendarProvider {
         return !!site?.isVersionGreaterEqualThan('3.7.1');
     }
 
-    /**
-     * Check if a certain site allows viewing events in monthly view.
-     *
-     * @param siteId Site Id. If not defined, use current site.
-     * @return Promise resolved with true if monthly view is supported.
-     * @since 3.4
-     */
-    async canViewMonth(siteId?: string): Promise<boolean> {
-        try {
-            const site = await CoreSites.getSite(siteId);
-
-            return this.canViewMonthInSite(site);
-        } catch {
-            return false;
-        }
-    }
-
-    /**
-     * Check if a certain site allows viewing events in monthly view.
-     *
-     * @param site Site. If not defined, use current site.
-     * @return Whether monthly view is supported.
-     * @since 3.4
-     */
-    canViewMonthInSite(site?: CoreSite): boolean {
-        site = site || CoreSites.getCurrentSite();
-
-        return !!site?.wsAvailable('core_calendar_get_calendar_monthly_view');
-    }
-
-    /**
-     * Gets the site main calendar page path.
-     *
-     * @param site Site. If not defined, use current site.
-     * @return Main calendar page path of the site.
-     */
-    getMainCalendarPagePath(site?: CoreSite): string {
-        return AddonCalendarMainMenuHandlerService.PAGE_NAME + (this.canViewMonthInSite(site) ? '' : '/list');
-    }
-
-    /**
-     * Removes expired events from local DB.
-     *
-     * @param siteId ID of the site the event belongs to. If not defined, use current site.
-     * @return Promise resolved when done.
-     */
-    async cleanExpiredEvents(siteId?: string): Promise<void> {
-        const site = await CoreSites.getSite(siteId);
-        if (this.canViewMonthInSite(site)) {
-            // Site supports monthly view, don't clean expired events because user can see past events.
-            return;
-        }
-        const events = await site.getDb().getRecordsSelect<AddonCalendarEventDBRecord>(
-            EVENTS_TABLE,
-            'timestart + timeduration < ?',
-            [CoreTimeUtils.timestamp()],
-        );
-
-        await Promise.all(events.map((event) => this.deleteLocalEvent(event.id!, siteId)));
-    }
-
     /**
      * Delete an event.
      *
@@ -367,12 +276,8 @@ export class AddonCalendarProvider {
                         return;
                     }
 
-                    // Check which page we should load.
-                    const site = await CoreSites.getSite(notification.siteId);
-                    const pageName = this.getMainCalendarPagePath(site);
-
                     CoreNavigator.navigateToSitePath(
-                        pageName,
+                        AddonCalendarMainMenuHandlerService.PAGE_NAME,
                         {
                             siteId: notification.siteId,
                             preferCurrentTab: false,
@@ -695,7 +600,6 @@ export class AddonCalendarProvider {
      * @param id Event ID.
      * @param siteId ID of the site. If not defined, use current site.
      * @return Promise resolved when the event data is retrieved.
-     * @since 3.4
      */
     async getEventById(id: number, siteId?: string): Promise<AddonCalendarEvent> {
         const site = await CoreSites.getSite(siteId);
@@ -742,10 +646,6 @@ export class AddonCalendarProvider {
         const record: AddonCalendarGetEventsEvent | AddonCalendarEvent | AddonCalendarEventDBRecord =
             await site.getDb().getRecord(EVENTS_TABLE, { id: id });
 
-        if (!this.isGetEventByIdAvailableInSite(site)) {
-            return record as AddonCalendarGetEventsEvent;
-        }
-
         const eventConverted = record as AddonCalendarEvent;
         const originalEvent = record as AddonCalendarGetEventsEvent;
         const recordAsRecord = record as AddonCalendarEventDBRecord;
@@ -994,10 +894,6 @@ export class AddonCalendarProvider {
         };
         const response: AddonCalendarGetCalendarEventsWSResponse =
             await site.read('core_calendar_get_calendar_events', params, preSets);
-        if (!this.canViewMonthInSite(site)) {
-            // Store events only in 3.1-3.3. In 3.4+ we'll use the new WS that return more info.
-            this.storeEventsInLocalDB(response.events, siteId);
-        }
 
         return response.events;
     }
@@ -1059,12 +955,8 @@ export class AddonCalendarProvider {
         const params: AddonCalendarGetCalendarMonthlyViewWSParams = {
             year: year,
             month: month,
+            mini: true, // Set mini to 1 to prevent returning the course selector HTML.
         };
-        // This parameter requires Moodle 3.5.
-        if (site.isVersionGreaterEqualThan('3.5')) {
-            // Set mini to 1 to prevent returning the course selector HTML.
-            params.mini = true;
-        }
         if (courseId) {
             params.courseid = courseId;
         }
@@ -1406,36 +1298,6 @@ export class AddonCalendarProvider {
         return this.isCalendarDisabledInSite(site);
     }
 
-    /**
-     * Check if the get event by ID WS is available.
-     *
-     * @param siteId Site Id. If not defined, use current site.
-     * @return Promise resolved with true if available.
-     * @since 3.4
-     */
-    async isGetEventByIdAvailable(siteId?: string): Promise<boolean> {
-        try {
-            const site = await CoreSites.getSite(siteId);
-
-            return this.isGetEventByIdAvailableInSite(site);
-        } catch {
-            return false;
-        }
-    }
-
-    /**
-     * Check if the get event by ID WS is available in a certain site.
-     *
-     * @param site Site. If not defined, use current site.
-     * @return Whether it's available.
-     * @since 3.4
-     */
-    isGetEventByIdAvailableInSite(site?: CoreSite): boolean {
-        site = site || CoreSites.getCurrentSite();
-
-        return !!site?.wsAvailable('core_calendar_get_calendar_event_by_id');
-    }
-
     /**
      * Get the next events for all the sites and schedules their notifications.
      * If an event notification time is 0, cancel its scheduled notification (if any).
@@ -1450,7 +1312,7 @@ export class AddonCalendarProvider {
 
         const siteIds = await CoreSites.getSitesIds();
 
-        const promises = siteIds.map((siteId: string) => this.cleanExpiredEvents(siteId).then(async() => {
+        const promises = siteIds.map((siteId: string) => async () => {
             if (notificationsEnabled) {
                 // Check if calendar is disabled for the site.
                 const disabled = await this.isDisabled(siteId);
@@ -1462,7 +1324,7 @@ export class AddonCalendarProvider {
             }
 
             return;
-        }));
+        });
 
         await Promise.all(promises);
     }
@@ -1995,7 +1857,7 @@ export type AddonCalendarMonth = {
     date: CoreWSDate;
     periodname: string; // Periodname.
     includenavigation: boolean; // Includenavigation.
-    initialeventsloaded: boolean; // @since 3.5. Initialeventsloaded.
+    initialeventsloaded: boolean; // Initialeventsloaded.
     previousperiod: CoreWSDate;
     previousperiodlink: string; // Previousperiodlink.
     previousperiodname: string; // Previousperiodname.
@@ -2151,7 +2013,7 @@ export type AddonCalendarGetEventsEvent = {
     description?: string; // Description.
     format: number; // Description format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
     courseid: number; // Course id.
-    categoryid?: number; // @since 3.4. Category id (only for category events).
+    categoryid?: number; // Category id (only for category events).
     groupid: number; // Group id.
     userid: number; // User id.
     repeatid: number; // Repeat id.
diff --git a/src/addons/calendar/services/handlers/mainmenu.ts b/src/addons/calendar/services/handlers/mainmenu.ts
index 5540b1149..2893888a5 100644
--- a/src/addons/calendar/services/handlers/mainmenu.ts
+++ b/src/addons/calendar/services/handlers/mainmenu.ts
@@ -46,7 +46,7 @@ export class AddonCalendarMainMenuHandlerService implements CoreMainMenuHandler
         return {
             icon: 'far-calendar',
             title: 'addon.calendar.calendar',
-            page: AddonCalendar.getMainCalendarPagePath(),
+            page: AddonCalendarMainMenuHandlerService.PAGE_NAME,
             class: 'addon-calendar-handler',
         };
     }
diff --git a/src/addons/calendar/services/handlers/view-link.ts b/src/addons/calendar/services/handlers/view-link.ts
index e7a59019f..45914e697 100644
--- a/src/addons/calendar/services/handlers/view-link.ts
+++ b/src/addons/calendar/services/handlers/view-link.ts
@@ -111,13 +111,9 @@ export class AddonCalendarViewLinkHandlerService extends CoreContentLinksHandler
             return false;
         }
 
-        return AddonCalendar.isDisabled(siteId).then((disabled) => {
-            if (disabled) {
-                return false;
-            }
+        const disabled = await AddonCalendar.isDisabled(siteId);
 
-            return AddonCalendar.canViewMonth(siteId);
-        });
+        return !disabled;
     }
 
 }
diff --git a/src/addons/messageoutput/airnotifier/services/airnotifier.ts b/src/addons/messageoutput/airnotifier/services/airnotifier.ts
index d52f8edf2..e84da309e 100644
--- a/src/addons/messageoutput/airnotifier/services/airnotifier.ts
+++ b/src/addons/messageoutput/airnotifier/services/airnotifier.ts
@@ -125,17 +125,6 @@ export class AddonMessageOutputAirnotifierProvider {
         return site.invalidateWsCacheForKey(this.getUserDevicesCacheKey());
     }
 
-    /**
-     * Returns whether or not the plugin is enabled for the current site.
-     *
-     * @return True if enabled, false otherwise.
-     * @since 3.2
-     */
-    isEnabled(): boolean {
-        return CoreSites.wsAvailableInCurrentSite('message_airnotifier_enable_device') &&
-                CoreSites.wsAvailableInCurrentSite('message_airnotifier_get_user_devices');
-    }
-
 }
 
 export const AddonMessageOutputAirnotifier = makeSingleton(AddonMessageOutputAirnotifierProvider);
diff --git a/src/addons/messageoutput/airnotifier/services/handlers/messageoutput.ts b/src/addons/messageoutput/airnotifier/services/handlers/messageoutput.ts
index 792a4322c..f83f8945c 100644
--- a/src/addons/messageoutput/airnotifier/services/handlers/messageoutput.ts
+++ b/src/addons/messageoutput/airnotifier/services/handlers/messageoutput.ts
@@ -15,7 +15,6 @@
 import { Injectable } from '@angular/core';
 
 import { AddonMessageOutputHandler, AddonMessageOutputHandlerData } from '@addons/messageoutput/services/messageoutput-delegate';
-import { AddonMessageOutputAirnotifierProvider } from '../airnotifier';
 import { makeSingleton } from '@singletons';
 
 /**
@@ -29,15 +28,13 @@ export class AddonMessageOutputAirnotifierHandlerService implements AddonMessage
     name = 'AddonMessageOutputAirnotifier';
     processorName = 'airnotifier';
 
-    constructor(private airnotifierProvider: AddonMessageOutputAirnotifierProvider) {}
-
     /**
      * Whether or not the module is enabled for the site.
      *
      * @return True if enabled, false otherwise.
      */
     async isEnabled(): Promise<boolean> {
-        return this.airnotifierProvider.isEnabled();
+        return true;
     }
 
     /**
diff --git a/src/addons/messages/messages-lazy.module.ts b/src/addons/messages/messages-lazy.module.ts
index ae0d95b6c..061f8f1e1 100644
--- a/src/addons/messages/messages-lazy.module.ts
+++ b/src/addons/messages/messages-lazy.module.ts
@@ -27,12 +27,12 @@ export const AddonMessagesDiscussionRoute: Route = {
 function buildRoutes(injector: Injector): Routes {
     return [
         {
-            path: 'index', // 3.5 or lower.
+            path: 'index', // 3.5.
             loadChildren: () =>
                 import('./pages/discussions-35/discussions.module').then(m => m.AddonMessagesDiscussions35PageModule),
         },
         {
-            path: 'contacts-35', // 3.5 or lower.
+            path: 'contacts-35', // 3.5.
             loadChildren: () => import('./pages/contacts-35/contacts.module').then(m => m.AddonMessagesContacts35PageModule),
         },
         {
diff --git a/src/addons/messages/pages/discussion/discussion.page.ts b/src/addons/messages/pages/discussion/discussion.page.ts
index 4617e2e3e..bb9689cd0 100644
--- a/src/addons/messages/pages/discussion/discussion.page.ts
+++ b/src/addons/messages/pages/discussion/discussion.page.ts
@@ -747,58 +747,37 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView
      */
     protected async markMessagesAsRead(forceMark: boolean): Promise<void> {
         let readChanged = false;
+        let messageUnreadFound = false;
 
-        if (AddonMessages.isMarkAllMessagesReadEnabled()) {
-            let messageUnreadFound = false;
-
-            // Mark all messages at a time if there is any unread message.
-            if (forceMark) {
-                messageUnreadFound = true;
-            } else if (this.groupMessagingEnabled) {
-                messageUnreadFound = !!((this.conversation?.unreadcount && this.conversation?.unreadcount > 0) &&
-                    (this.conversationId && this.conversationId > 0));
-            } else {
-                // If an unread message is found, mark all messages as read.
-                messageUnreadFound = this.messages.some((message) =>
-                    message.useridfrom != this.currentUserId && ('read' in message && !message.read));
-            }
-
-            if (messageUnreadFound) {
-                this.setUnreadLabelPosition();
-
-                if (this.groupMessagingEnabled) {
-                    await AddonMessages.markAllConversationMessagesRead(this.conversationId!);
-                } else {
-                    await AddonMessages.markAllMessagesRead(this.userId);
-
-                    // Mark all messages as read.
-                    this.messages.forEach((message) => {
-                        if ('read' in message) {
-                            message.read = true;
-                        }
-                    });
-                }
-
-                readChanged = true;
-            }
+        // Mark all messages at a time if there is any unread message.
+        if (forceMark) {
+            messageUnreadFound = true;
+        } else if (this.groupMessagingEnabled) {
+            messageUnreadFound = !!((this.conversation?.unreadcount && this.conversation?.unreadcount > 0) &&
+                (this.conversationId && this.conversationId > 0));
         } else {
+            // If an unread message is found, mark all messages as read.
+            messageUnreadFound = this.messages.some((message) =>
+                message.useridfrom != this.currentUserId && ('read' in message && !message.read));
+        }
+
+        if (messageUnreadFound) {
             this.setUnreadLabelPosition();
-            const promises: Promise<void>[] = [];
 
-            // Mark each message as read one by one.
-            this.messages.forEach((message) => {
-                // If the message is unread, call AddonMessages.markMessageRead.
-                if (message.useridfrom != this.currentUserId && 'read' in message && !message.read) {
-                    promises.push(AddonMessages.markMessageRead(message.id).then(() => {
-                        readChanged = true;
+            if (this.groupMessagingEnabled) {
+                await AddonMessages.markAllConversationMessagesRead(this.conversationId!);
+            } else {
+                await AddonMessages.markAllMessagesRead(this.userId);
+
+                // Mark all messages as read.
+                this.messages.forEach((message) => {
+                    if ('read' in message) {
                         message.read = true;
+                    }
+                });
+            }
 
-                        return;
-                    }));
-                }
-            });
-
-            await Promise.all(promises);
+            readChanged = true;
         }
 
         if (readChanged) {
diff --git a/src/addons/messages/pages/discussions-35/discussions.html b/src/addons/messages/pages/discussions-35/discussions.html
index ed02b96d8..3e756130b 100644
--- a/src/addons/messages/pages/discussions-35/discussions.html
+++ b/src/addons/messages/pages/discussions-35/discussions.html
@@ -17,7 +17,7 @@
             <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
         </ion-refresher>
 
-        <core-search-box *ngIf="search.enabled" (onSubmit)="searchMessage($event)" (onClear)="clearSearch()"
+        <core-search-box (onSubmit)="searchMessage($event)" (onClear)="clearSearch()"
             [placeholder]=" 'addon.messages.message' | translate" autocorrect="off" spellcheck="false" lengthCheck="2"
             [disabled]="!loaded" searchArea="AddonMessagesDiscussions" [autoFocus]="false"></core-search-box>
 
diff --git a/src/addons/messages/pages/discussions-35/discussions.page.ts b/src/addons/messages/pages/discussions-35/discussions.page.ts
index ee8c821e7..5c904cbae 100644
--- a/src/addons/messages/pages/discussions-35/discussions.page.ts
+++ b/src/addons/messages/pages/discussions-35/discussions.page.ts
@@ -56,7 +56,6 @@ export class AddonMessagesDiscussions35Page implements OnInit, OnDestroy {
     discussionUserId?: number;
 
     search = {
-        enabled: false,
         showResults: false,
         results: <AddonMessagesMessageAreaContact[]> [],
         loading: '',
@@ -179,7 +178,6 @@ export class AddonMessagesDiscussions35Page implements OnInit, OnDestroy {
      */
     protected async fetchData(): Promise<void> {
         this.loadingMessage = this.loadingMessages;
-        this.search.enabled = AddonMessages.isSearchMessagesEnabled();
 
         const promises: Promise<unknown>[] = [];
 
diff --git a/src/addons/messages/services/handlers/mainmenu.ts b/src/addons/messages/services/handlers/mainmenu.ts
index 45349eef3..7b19afaa5 100644
--- a/src/addons/messages/services/handlers/mainmenu.ts
+++ b/src/addons/messages/services/handlers/mainmenu.ts
@@ -45,7 +45,7 @@ export class AddonMessagesMainMenuHandlerService implements CoreMainMenuHandler,
         title: 'addon.messages.messages',
         page: AddonMessagesMainMenuHandlerService.PAGE_NAME,
         class: 'addon-messages-handler',
-        showBadge: true, // Do not check isMessageCountEnabled because we'll use fallback it not enabled.
+        showBadge: true,
         badge: '',
         badgeA11yText: 'addon.messages.unreadconversations',
         loading: true,
@@ -199,8 +199,7 @@ export class AddonMessagesMainMenuHandlerService implements CoreMainMenuHandler,
      * @return True if is a sync process, false otherwise.
      */
     isSync(): boolean {
-        // This is done to use only wifi if using the fallback function.
-        return !AddonMessages.isMessageCountEnabled() && !AddonMessages.isGroupMessagingEnabled();
+        return false;
     }
 
     /**
diff --git a/src/addons/messages/services/handlers/settings.ts b/src/addons/messages/services/handlers/settings.ts
index 40f29b1e2..9f5662d61 100644
--- a/src/addons/messages/services/handlers/settings.ts
+++ b/src/addons/messages/services/handlers/settings.ts
@@ -34,9 +34,7 @@ export class AddonMessagesSettingsHandlerService implements CoreSettingsHandler
      * @return Whether or not the handler is enabled on a site level.
      */
     async isEnabled(): Promise<boolean> {
-        const messagingEnabled = await AddonMessages.isPluginEnabled();
-
-        return messagingEnabled && AddonMessages.isMessagePreferencesEnabled();
+        return await AddonMessages.isPluginEnabled();
     }
 
     /**
diff --git a/src/addons/messages/services/messages.ts b/src/addons/messages/services/messages.ts
index dd2ae0076..1498691b6 100644
--- a/src/addons/messages/services/messages.ts
+++ b/src/addons/messages/services/messages.ts
@@ -1567,9 +1567,8 @@ export class AddonMessagesProvider {
                 self: result.types[AddonMessagesProvider.MESSAGE_CONVERSATION_TYPE_SELF] || 0,
             };
 
-        } else if (this.isMessageCountEnabled()) {
-            // @since 3.2
-            const params: { useridto: number } = {
+        } else {
+            const params: AddonMessageGetUnreadConversationsCountWSParams = {
                 useridto: site.getUserId(),
             };
             const preSets: CoreSiteWSPreSets = {
@@ -1577,37 +1576,11 @@ export class AddonMessagesProvider {
                 typeExpected: 'number',
             };
 
-            const count: number = await site.read('core_message_get_unread_conversations_count', params, preSets);
+            const count = await site.read<number>('core_message_get_unread_conversations_count', params, preSets);
 
             counts = { favourites: 0, individual: count, group: 0, self: 0 };
-        } else {
-            // Fallback call.
-            const params: AddonMessagesGetMessagesWSParams = {
-                read: false,
-                limitfrom: 0,
-                limitnum: AddonMessagesProvider.LIMIT_MESSAGES + 1,
-                useridto: site.getUserId(),
-                useridfrom: 0,
-            };
-
-            const response = await this.getMessages(params, {}, siteId);
-
-            // Count the discussions by filtering same senders.
-            const discussions = {};
-            response.messages.forEach((message) => {
-                discussions[message.useridto] = 1;
-            });
-
-            const count = Object.keys(discussions).length;
-
-            counts = {
-                favourites: 0,
-                individual: count,
-                group: 0,
-                self: 0,
-                orMore: count > AddonMessagesProvider.LIMIT_MESSAGES,
-            };
         }
+
         // Notify the new counts so all views are updated.
         CoreEvents.trigger(AddonMessagesProvider.UNREAD_CONVERSATION_COUNTS_EVENT, counts, site.id);
 
@@ -1936,8 +1909,7 @@ export class AddonMessagesProvider {
             // @since 3.6
             return site.invalidateWsCacheForKey(this.getCacheKeyForUnreadConversationCounts());
 
-        } else if (this.isMessageCountEnabled()) {
-            // @since 3.2
+        } else {
             return site.invalidateWsCacheForKey(this.getCacheKeyForMessageCount(site.getUserId()));
         }
     }
@@ -2016,37 +1988,6 @@ export class AddonMessagesProvider {
         }
     }
 
-    /**
-     * Returns whether or not we can mark all messages as read.
-     *
-     * @return If related WS is available on current site.
-     * @since 3.2
-     */
-    isMarkAllMessagesReadEnabled(): boolean {
-        return CoreSites.wsAvailableInCurrentSite('core_message_mark_all_conversation_messages_as_read') ||
-                CoreSites.wsAvailableInCurrentSite('core_message_mark_all_messages_as_read');
-    }
-
-    /**
-     * Returns whether or not we can count unread messages.
-     *
-     * @return True if enabled, false otherwise.
-     * @since 3.2
-     */
-    isMessageCountEnabled(): boolean {
-        return CoreSites.wsAvailableInCurrentSite('core_message_get_unread_conversations_count');
-    }
-
-    /**
-     * Returns whether or not the message preferences are enabled for the current site.
-     *
-     * @return True if enabled, false otherwise.
-     * @since 3.2
-     */
-    isMessagePreferencesEnabled(): boolean {
-        return CoreSites.wsAvailableInCurrentSite('core_message_get_user_message_preferences');
-    }
-
     /**
      * Returns whether or not messaging is enabled for a certain site.
      *
@@ -2105,15 +2046,6 @@ export class AddonMessagesProvider {
         return site.canUseAdvancedFeature('messaging');
     }
 
-    /**
-     * Returns whether or not we can search messages.
-     *
-     * @since 3.2
-     */
-    isSearchMessagesEnabled(): boolean {
-        return CoreSites.wsAvailableInCurrentSite('core_message_data_for_messagearea_search_messages');
-    }
-
     /**
      * Returns whether or not self conversation is supported in a certain site.
      *
@@ -3691,6 +3623,13 @@ type AddonMessagesSetFavouriteConversationsWSParams = {
     conversations: number[];
 };
 
+/**
+ * Params of core_message_get_unread_conversations_count WS.
+ */
+type AddonMessageGetUnreadConversationsCountWSParams = {
+    useridto: number; // The user id who received the message, 0 for any user.
+};
+
 /**
  * Data sent by UNREAD_CONVERSATION_COUNTS_EVENT event.
  */
diff --git a/src/addons/mod/assign/components/index/addon-mod-assign-index.html b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
index ff8b08066..304f53c41 100644
--- a/src/addons/mod/assign/components/index/addon-mod-assign-index.html
+++ b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
@@ -96,7 +96,7 @@
                     <h2 *ngIf="assign.teamsubmission">{{ 'addon.mod_assign.numberofteams' | translate }}</h2>
                     <h2 *ngIf="!assign.teamsubmission">{{ 'addon.mod_assign.numberofparticipants' | translate }}</h2>
                 </ion-label>
-                <ion-badge slot="end" *ngIf="showNumbers" color="primary">
+                <ion-badge slot="end" color="primary">
                     <span aria-hidden="true">{{ summary.participantcount }}</span>
                     <span class="sr-only" *ngIf="!assign.teamsubmission">
                         {{ 'addon.mod_assign.numberofparticipantscountdescription' | translate:{count: summary.participantcount} }}
@@ -109,12 +109,12 @@
 
             <!-- Summary of submissions with draft status. -->
             <ion-item class="ion-text-wrap" *ngIf="assign.submissiondrafts && summary && summary.submissionsenabled"
-                [class.hide-detail]="showNumbers && !summary.submissiondraftscount"
+                [class.hide-detail]="!summary.submissiondraftscount"
                 detail="true"
-                [button]="!showNumbers || summary.submissiondraftscount"
+                [button]="summary.submissiondraftscount"
                 (click)="goToSubmissionList(submissionStatusDraft, !!summary.submissiondraftscount)">
                 <ion-label><h2>{{ 'addon.mod_assign.numberofdraftsubmissions' | translate }}</h2></ion-label>
-                <ion-badge slot="end" *ngIf="showNumbers" color="primary">
+                <ion-badge slot="end" color="primary">
                     <span aria-hidden="true">{{ summary.submissiondraftscount }}</span>
                     <span class="sr-only">
                         {{ 'addon.mod_assign.numberofdraftsubmissionscountdescription' | translate:
@@ -125,12 +125,12 @@
 
             <!-- Summary of submissions with submitted status. -->
             <ion-item class="ion-text-wrap" *ngIf="summary && summary.submissionsenabled"
-                [class.hide-detail]="showNumbers && !summary.submissionssubmittedcount"
+                [class.hide-detail]="!summary.submissionssubmittedcount"
                 detail="true"
-                [button]="!showNumbers || summary.submissionssubmittedcount"
+                [button]="summary.submissionssubmittedcount"
                 (click)="goToSubmissionList(submissionStatusSubmitted, !!summary.submissionssubmittedcount)">
                 <ion-label><h2>{{ 'addon.mod_assign.numberofsubmittedassignments' | translate }}</h2></ion-label>
-                <ion-badge slot="end" *ngIf="showNumbers" color="primary">
+                <ion-badge slot="end" color="primary">
                     <span aria-hidden="true">{{ summary.submissionssubmittedcount }}</span>
                     <span class="sr-only">
                         {{ 'addon.mod_assign.numberofsubmittedassignmentscountdescription' | translate:
@@ -140,7 +140,7 @@
             </ion-item>
 
             <!-- Summary of submissions that need grading. -->
-            <ion-item class="ion-text-wrap" *ngIf="summary && summary.submissionsenabled && !assign.teamsubmission && showNumbers"
+            <ion-item class="ion-text-wrap" *ngIf="summary && summary.submissionsenabled && !assign.teamsubmission"
                 [class.hide-detail]="!needsGradingAvailable"
                 detail="true"
                 [button]="needsGradingAvailable"
diff --git a/src/addons/mod/assign/components/index/index.ts b/src/addons/mod/assign/components/index/index.ts
index edf0e7144..93ec6e8f2 100644
--- a/src/addons/mod/assign/components/index/index.ts
+++ b/src/addons/mod/assign/components/index/index.ts
@@ -63,7 +63,6 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
     canViewOwnSubmission = false; // Whether the user can view their own submission.
     timeRemaining?: string; // Message about time remaining to submit.
     lateSubmissions?: string; // Message about late submissions.
-    showNumbers = true; // Whether to show number of submissions with each status.
     summary?: AddonModAssignSubmissionGradingSummary; // The grading summary.
     needsGradingAvailable = false; // Whether we can see the submissions that need grading.
 
@@ -235,8 +234,6 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
 
                 // Check if groupmode is enabled to avoid showing wrong numbers.
                 this.groupInfo = await CoreGroups.getActivityGroupInfo(this.assign.cmid, false);
-                this.showNumbers = (this.groupInfo.groups && this.groupInfo.groups.length == 0) ||
-                    this.currentSite!.isVersionGreaterEqualThan('3.5');
 
                 await this.setGroup(CoreGroups.validateGroupId(this.group, this.groupInfo));
 
@@ -296,9 +293,7 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
             }
         }
 
-        this.needsGradingAvailable =
-            (submissionStatus.gradingsummary?.submissionsneedgradingcount || 0) > 0 &&
-            this.currentSite!.isVersionGreaterEqualThan('3.2');
+        this.needsGradingAvailable = (submissionStatus.gradingsummary?.submissionsneedgradingcount || 0) > 0;
     }
 
     /**
@@ -308,7 +303,7 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
      * @param hasSubmissions If the status has any submission.
      */
     goToSubmissionList(status?: string, hasSubmissions = false): void {
-        if (typeof status != 'undefined' && !hasSubmissions && this.showNumbers) {
+        if (typeof status != 'undefined' && !hasSubmissions) {
             return;
         }
 
diff --git a/src/addons/mod/assign/components/submission/submission.ts b/src/addons/mod/assign/components/submission/submission.ts
index a59db45c3..4256c120a 100644
--- a/src/addons/mod/assign/components/submission/submission.ts
+++ b/src/addons/mod/assign/components/submission/submission.ts
@@ -649,7 +649,6 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
         this.gradeInfo = await CoreCourse.getModuleBasicGradeInfo(this.moduleId);
 
         if (!this.gradeInfo) {
-            // It won't get gradeinfo on 3.1.
             return;
         }
 
@@ -966,7 +965,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
         }
 
         // Treat outcomes.
-        if (this.gradeInfo.outcomes && AddonModAssign.isOutcomesEditEnabled()) {
+        if (this.gradeInfo.outcomes) {
             this.gradeInfo.outcomes.forEach((outcome) => {
                 if (outcome.scale) {
                     outcome.options =
@@ -981,8 +980,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
         }
 
         // Get grade items.
-        const grades = <CoreGradesFormattedItem[]>
-            await CoreGradesHelper.getGradeModuleItems(this.courseId, this.moduleId, this.submitId);
+        const grades = await CoreGradesHelper.getGradeModuleItems(this.courseId, this.moduleId, this.submitId);
 
         const outcomes: AddonModAssignGradeOutcome[] = [];
 
@@ -1091,16 +1089,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
                 submissionStatus.lastattempt.submissiongroupmemberswhoneedtosubmit
             ) {
                 submissionStatus.lastattempt.submissiongroupmemberswhoneedtosubmit.forEach((member) => {
-                    if (this.blindMarking) {
-                        // Users not blinded! (Moodle < 3.1.1, 3.2).
-                        promises.push(AddonModAssign.getAssignmentUserMappings(this.assign!.id, member, {
-                            cmId: this.moduleId,
-                        }).then((blindId) => {
-                            this.membersToSubmitBlind.push(blindId);
-
-                            return;
-                        }));
-                    } else {
+                    if (!this.blindMarking) {
                         promises.push(CoreUser.getProfile(member, this.courseId).then((profile) => {
                             this.membersToSubmit.push(profile);
 
diff --git a/src/addons/mod/assign/pages/submission-list/submission-list.html b/src/addons/mod/assign/pages/submission-list/submission-list.html
index 9f2ef968f..6485d2520 100644
--- a/src/addons/mod/assign/pages/submission-list/submission-list.html
+++ b/src/addons/mod/assign/pages/submission-list/submission-list.html
@@ -72,13 +72,6 @@
                         </ion-label>
                     </ion-item>
                 </ng-container>
-
-                <ion-card class="ion-text-wrap core-warning-card" *ngIf="!haveAllParticipants">
-                    <ion-item>
-                        <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
-                        <ion-label>{{ 'addon.mod_assign.notallparticipantsareshown' | translate }}</ion-label>
-                    </ion-item>
-                </ion-card>
             </ion-list>
         </core-loading>
     </core-split-view>
diff --git a/src/addons/mod/assign/pages/submission-list/submission-list.page.ts b/src/addons/mod/assign/pages/submission-list/submission-list.page.ts
index 911bbbba0..86443ad08 100644
--- a/src/addons/mod/assign/pages/submission-list/submission-list.page.ts
+++ b/src/addons/mod/assign/pages/submission-list/submission-list.page.ts
@@ -55,7 +55,6 @@ export class AddonModAssignSubmissionListPage implements AfterViewInit, OnDestro
     assign?: AddonModAssignAssign; // Assignment.
     submissions: AddonModAssignSubmissionListManager; // List of submissions
     loaded = false; // Whether data has been loaded.
-    haveAllParticipants = true; // Whether all participants have been loaded.
     groupId = 0; // Group ID to show.
     courseId!: number; // Course ID the assignment belongs to.
     moduleId!: number; // Module ID the submission belongs to.
@@ -202,16 +201,6 @@ export class AddonModAssignSubmissionListPage implements AfterViewInit, OnDestro
     async setGroup(groupId: number): Promise<void> {
         this.groupId = groupId;
 
-        this.haveAllParticipants = true;
-
-        if (!CoreSites.getCurrentSite()?.wsAvailable('mod_assign_list_participants')) {
-            // Submissions are not displayed in Moodle 3.1 without the local plugin, see MOBILE-2968.
-            this.haveAllParticipants = false;
-            this.submissions.resetItems();
-
-            return;
-        }
-
         // Fetch submissions and grades.
         const submissions =
             await AddonModAssignHelper.getSubmissionsUserData(
diff --git a/src/addons/mod/assign/services/assign-helper.ts b/src/addons/mod/assign/services/assign-helper.ts
index 196d7607f..739c93d47 100644
--- a/src/addons/mod/assign/services/assign-helper.ts
+++ b/src/addons/mod/assign/services/assign-helper.ts
@@ -398,13 +398,9 @@ export class AddonModAssignHelperProvider {
         groupId?: number,
         options: CoreSitesCommonWSOptions = {},
     ): Promise<AddonModAssignSubmissionFormatted[]> {
-        // Create new options including all existing ones.
-        const modOptions: CoreCourseCommonModWSOptions = { cmId: assign.cmid, ...options };
-
         const parts = await this.getParticipants(assign, groupId, options);
 
         const blind = assign.blindmarking && !assign.revealidentities;
-        const promises: Promise<void>[] = [];
         const result: AddonModAssignSubmissionFormatted[] = [];
         const participants: {[id: number]: AddonModAssignParticipant} = CoreUtils.arrayToObject(parts, 'id');
 
@@ -434,31 +430,12 @@ export class AddonModAssignHelperProvider {
                 submission.groupname = participant.groupname;
             }
 
-            let promise = Promise.resolve();
-            if (submission.userid && submission.userid > 0 && blind) {
-                // Blind but not blinded! (Moodle < 3.1.1, 3.2).
-                delete submission.userid;
-
-                promise = AddonModAssign.getAssignmentUserMappings(assign.id, submission.submitid, modOptions)
-                    .then((blindId) => {
-                        submission.blindid = blindId;
-
-                        return;
-                    });
+            // Add to the list.
+            if (submission.userfullname || submission.blindid) {
+                result.push(submission);
             }
-
-            promises.push(promise.then(() => {
-                // Add to the list.
-                if (submission.userfullname || submission.blindid) {
-                    result.push(submission);
-                }
-
-                return;
-            }));
         });
 
-        await Promise.all(promises);
-
         // Create a submission for each participant left in the list (the participants already treated were removed).
         CoreUtils.objectToArray(participants).forEach((participant: AddonModAssignParticipant) => {
             const submission = this.createEmptySubmission();
diff --git a/src/addons/mod/assign/services/assign-sync.ts b/src/addons/mod/assign/services/assign-sync.ts
index 162165dee..e47429236 100644
--- a/src/addons/mod/assign/services/assign-sync.ts
+++ b/src/addons/mod/assign/services/assign-sync.ts
@@ -37,7 +37,7 @@ import { CoreCourseLogHelper } from '@features/course/services/log-helper';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreApp } from '@services/app';
 import { CoreNetworkError } from '@classes/errors/network-error';
-import { CoreGradesFormattedItem, CoreGradesFormattedRow, CoreGradesHelper } from '@features/grades/services/grades-helper';
+import { CoreGradesFormattedItem, CoreGradesHelper } from '@features/grades/services/grades-helper';
 import { AddonModAssignSubmissionDelegate } from './submission-delegate';
 import { AddonModAssignFeedbackDelegate } from './feedback-delegate';
 
@@ -457,21 +457,20 @@ export class AddonModAssignSyncProvider extends CoreCourseActivitySyncBaseProvid
         }
 
         // If grade has been modified from gradebook, do not use offline.
-        const grades: CoreGradesFormattedItem[] | CoreGradesFormattedRow[] =
-            await CoreGradesHelper.getGradeModuleItems(courseId, assign.cmid, userId, undefined, siteId, true);
+        const grades = await CoreGradesHelper.getGradeModuleItems(courseId, assign.cmid, userId, undefined, siteId, true);
 
         const gradeInfo = await CoreCourse.getModuleBasicGradeInfo(assign.cmid, siteId);
 
         // Override offline grade and outcomes based on the gradebook data.
-        grades.forEach((grade: CoreGradesFormattedItem | CoreGradesFormattedRow) => {
-            if ('gradedategraded' in grade && (grade.gradedategraded || 0) >= offlineData.timemodified) {
+        grades.forEach((grade: CoreGradesFormattedItem) => {
+            if ((grade.gradedategraded || 0) >= offlineData.timemodified) {
                 if (!grade.outcomeid && !grade.scaleid) {
                     if (gradeInfo && gradeInfo.scale) {
                         offlineData.grade = this.getSelectedScaleId(gradeInfo.scale, grade.grade || '');
                     } else {
                         offlineData.grade = parseFloat(grade.grade || '');
                     }
-                } else if (gradeInfo && grade.outcomeid && AddonModAssign.isOutcomesEditEnabled() && gradeInfo.outcomes) {
+                } else if (gradeInfo && grade.outcomeid && gradeInfo.outcomes) {
                     gradeInfo.outcomes.forEach((outcome, index) => {
                         if (outcome.scale && grade.itemnumber == index) {
                             offlineData.outcomes[grade.itemnumber] = this.getSelectedScaleId(
diff --git a/src/addons/mod/assign/services/assign.ts b/src/addons/mod/assign/services/assign.ts
index d55024c97..b0b198c8b 100644
--- a/src/addons/mod/assign/services/assign.ts
+++ b/src/addons/mod/assign/services/assign.ts
@@ -90,8 +90,6 @@ export class AddonModAssignProvider {
     static readonly SUBMITTED_FOR_GRADING_EVENT = 'addon_mod_assign_submitted_for_grading';
     static readonly GRADED_EVENT = 'addon_mod_assign_graded';
 
-    protected gradingOfflineEnabled: {[siteId: string]: boolean} = {};
-
     /**
      * Check if the user can submit in offline. This should only be used if submissionStatus.lastattempt.cansubmit cannot
      * be used (offline usage).
@@ -151,7 +149,7 @@ export class AddonModAssignProvider {
 
         return {
             isBlind: !userId ? false : !!isBlind,
-            groupId: site.isVersionGreaterEqualThan('3.5') ? groupId || 0 : 0,
+            groupId: groupId || 0,
             userId: userId || site.getUserId(),
         };
     }
@@ -662,10 +660,6 @@ export class AddonModAssignProvider {
         groupId = groupId || 0;
 
         const site = await CoreSites.getSite(options.siteId);
-        if (!site.wsAvailable('mod_assign_list_participants')) {
-            // Silently fail if is not available. (needs Moodle version >= 3.2)
-            throw new CoreError('mod_assign_list_participants WS is only available 3.2 onwards');
-        }
 
         const params: AddonModAssignListParticipantsWSParams = {
             assignid: assignId,
@@ -836,47 +830,6 @@ export class AddonModAssignProvider {
         await site.invalidateWsCacheForKeyStartingWith(this.listParticipantsPrefixCacheKey(assignId));
     }
 
-    /**
-     * Convenience function to check if grading offline is enabled.
-     *
-     * @param siteId Site ID. If not defined, current site.
-     * @return Promise resolved with boolean: whether grading offline is enabled.
-     */
-    protected async isGradingOfflineEnabled(siteId?: string): Promise<boolean> {
-        siteId = siteId || CoreSites.getCurrentSiteId();
-
-        if (typeof this.gradingOfflineEnabled[siteId] != 'undefined') {
-            return this.gradingOfflineEnabled[siteId];
-        }
-
-        this.gradingOfflineEnabled[siteId] = await CoreGrades.isGradeItemsAvailable(siteId);
-
-        return this.gradingOfflineEnabled[siteId];
-    }
-
-    /**
-     * Outcomes only can be edited if mod_assign_submit_grading_form is available.
-     *
-     * @param siteId Site ID. If not defined, current site.
-     * @return Promise resolved with true if outcomes edit is enabled, rejected or resolved with false otherwise.
-     * @since 3.2
-     */
-    async isOutcomesEditEnabled(siteId?: string): Promise<boolean> {
-        const site = await CoreSites.getSite(siteId);
-
-        return site.wsAvailable('mod_assign_submit_grading_form');
-    }
-
-    /**
-     * Check if assignments plugin is enabled in a certain site.
-     *
-     * @param siteId Site ID. If not defined, current site.
-     * @return Whether the plugin is enabled.
-     */
-    isPluginEnabled(): boolean {
-        return true;
-    }
-
     /**
      * Check if a submission is open. This function is based on Moodle's submissions_open.
      *
@@ -1261,25 +1214,6 @@ export class AddonModAssignProvider {
             return false;
         };
 
-        // Grading offline is only allowed if WS of grade items is enabled to avoid inconsistency.
-        const enabled = await this.isGradingOfflineEnabled(siteId);
-        if (!enabled) {
-            await this.submitGradingFormOnline(
-                assignId,
-                userId,
-                grade,
-                attemptNumber,
-                addAttempt,
-                workflowState,
-                applyToAll,
-                outcomes,
-                pluginData,
-                siteId,
-            );
-
-            return true;
-        }
-
         if (!CoreApp.isOnline()) {
             // App is offline, store the action.
             return storeOffline();
@@ -1345,58 +1279,35 @@ export class AddonModAssignProvider {
         const site = await CoreSites.getSite(siteId);
         userId = userId || site.getUserId();
 
-        if (site.wsAvailable('mod_assign_submit_grading_form')) {
-            // WS available @since 3.2.
+        const jsonData = {
+            grade,
+            attemptnumber: attemptNumber,
+            addattempt: addAttempt ? 1 : 0,
+            workflowstate: workflowState,
+            applytoall: applyToAll ? 1 : 0,
+        };
 
-            const jsonData = {
-                grade,
-                attemptnumber: attemptNumber,
-                addattempt: addAttempt ? 1 : 0,
-                workflowstate: workflowState,
-                applytoall: applyToAll ? 1 : 0,
-            };
-
-            for (const index in outcomes) {
-                jsonData['outcome_' + index + '[' + userId + ']'] = outcomes[index];
-            }
-
-            for (const index in pluginData) {
-                jsonData[index] = pluginData[index];
-            }
-
-            const serialized = CoreInterceptor.serialize(jsonData, true);
-            const params: AddonModAssignSubmitGradingFormWSParams = {
-                assignmentid: assignId,
-                userid: userId,
-                jsonformdata: JSON.stringify(serialized),
-            };
-
-            const warnings = await site.write<CoreWSExternalWarning[]>('mod_assign_submit_grading_form', params);
-
-            if (warnings.length) {
-                // The WebService returned warnings, reject.
-                throw new CoreWSError(warnings[0]);
-            }
-
-            return;
+        for (const index in outcomes) {
+            jsonData['outcome_' + index + '[' + userId + ']'] = outcomes[index];
         }
 
-        // WS not available, fallback to save_grade.
-        const params: AddonModAssignSaveGradeWSParams = {
+        for (const index in pluginData) {
+            jsonData[index] = pluginData[index];
+        }
+
+        const serialized = CoreInterceptor.serialize(jsonData, true);
+        const params: AddonModAssignSubmitGradingFormWSParams = {
             assignmentid: assignId,
             userid: userId,
-            grade: grade,
-            attemptnumber: attemptNumber,
-            addattempt: addAttempt,
-            workflowstate: workflowState,
-            applytoall: applyToAll,
-            plugindata: pluginData,
-        };
-        const preSets: CoreSiteWSPreSets = {
-            responseExpected: false,
+            jsonformdata: JSON.stringify(serialized),
         };
 
-        await site.write('mod_assign_save_grade', params, preSets);
+        const warnings = await site.write<CoreWSExternalWarning[]>('mod_assign_submit_grading_form', params);
+
+        if (warnings.length) {
+            // The WebService returned warnings, reject.
+            throw new CoreWSError(warnings[0]);
+        }
     }
 
 }
@@ -1431,7 +1342,7 @@ export type AddonModAssignAssign = {
     timemodified: number; // Last time assignment was modified.
     completionsubmit: number; // If enabled, set activity as complete following submission.
     cutoffdate: number; // Date after which submission is not accepted without an extension.
-    gradingduedate?: number; // @since 3.3. The expected date for marking the submissions.
+    gradingduedate?: number; // The expected date for marking the submissions.
     teamsubmission: number; // If enabled, students submit as a team.
     requireallteammemberssubmit: number; // If enabled, all team members must submit.
     teamsubmissiongroupingid: number; // The grouping id for the team submission groups.
@@ -1443,13 +1354,13 @@ export type AddonModAssignAssign = {
     markingworkflow: number; // Enable marking workflow.
     markingallocation: number; // Enable marking allocation.
     requiresubmissionstatement: number; // Student must accept submission statement.
-    preventsubmissionnotingroup?: number; // @since 3.2. Prevent submission not in group.
-    submissionstatement?: string; // @since 3.2. Submission statement formatted.
-    submissionstatementformat?: number; // @since 3.2. Submissionstatement format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
+    preventsubmissionnotingroup?: number; // Prevent submission not in group.
+    submissionstatement?: string; // Submission statement formatted.
+    submissionstatementformat?: number; // Submissionstatement format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
     configs: AddonModAssignConfig[]; // Configuration settings.
     intro?: string; // Assignment intro, not allways returned because it deppends on the activity configuration.
     introformat?: number; // Intro format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
-    introfiles?: CoreWSExternalFile[]; // @since 3.2.
+    introfiles?: CoreWSExternalFile[];
     introattachments?: CoreWSExternalFile[];
 };
 
@@ -1494,7 +1405,7 @@ export type AddonModAssignSubmission = {
     assignment?: number; // Assignment id.
     latest?: number; // Latest attempt.
     plugins?: AddonModAssignPlugin[]; // Plugins.
-    gradingstatus?: string; // @since 3.2. Grading status.
+    gradingstatus?: string; // Grading status.
 };
 
 /**
@@ -1539,7 +1450,7 @@ export type AddonModAssignSubmissionAttempt = {
     locked: boolean; // Whether new submissions are locked.
     graded: boolean; // Whether the submission is graded.
     canedit: boolean; // Whether the user can edit the current submission.
-    caneditowner?: boolean; // @since 3.2. Whether the owner of the submission can edit it.
+    caneditowner?: boolean; // Whether the owner of the submission can edit it.
     cansubmit: boolean; // Whether the user can submit.
     extensionduedate: number; // Extension due date.
     blindmarking: boolean; // Whether blind marking is enabled.
@@ -1610,7 +1521,7 @@ export type AddonModAssignParticipant = {
     interests?: string; // User interests (separated by commas).
     firstaccess?: number; // First access to the site (0 if never).
     lastaccess?: number; // Last access to the site (0 if never).
-    suspended?: boolean; // @since 3.2. Suspend user account, either false to enable user login or true to disable it.
+    suspended?: boolean; // Suspend user account, either false to enable user login or true to disable it.
     description?: string; // User profile description.
     descriptionformat?: number; // Int format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
     city?: string; // Home city of the user.
@@ -1647,7 +1558,7 @@ export type AddonModAssignParticipant = {
     }[];
     submitted: boolean; // Have they submitted their assignment.
     requiregrading: boolean; // Is their submission waiting for grading.
-    grantedextension?: boolean; // @since 3.3. Have they been granted an extension.
+    grantedextension?: boolean; // Have they been granted an extension.
     groupid?: number; // For group assignments this is the group id.
     groupname?: string; // For group assignments this is the group name.
 };
@@ -1815,45 +1726,6 @@ type AddonModAssignSubmitGradingFormWSParams = {
     jsonformdata: string; // The data from the grading form, encoded as a json array.
 };
 
-/**
- * Params of mod_assign_save_grade WS.
- */
-type AddonModAssignSaveGradeWSParams = {
-    assignmentid: number; // The assignment id to operate on.
-    userid: number; // The student id to operate on.
-    grade: number; // The new grade for this user. Ignored if advanced grading used.
-    attemptnumber: number; // The attempt number (-1 means latest attempt).
-    addattempt: boolean; // Allow another attempt if the attempt reopen method is manual.
-    workflowstate: string; // The next marking workflow state.
-    applytoall: boolean; // If true, this grade will be applied to all members of the group (for group assignments).
-    plugindata?: AddonModAssignSavePluginData; // Plugin data.
-    advancedgradingdata?: {
-        guide?: {
-            criteria: {
-                criterionid: number; // Criterion id.
-                fillings?: { // Filling.
-                    criterionid: number; // Criterion id.
-                    levelid?: number; // Level id.
-                    remark?: string; // Remark.
-                    remarkformat?: number; // Remark format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
-                    score: number; // Maximum score.
-                }[];
-            }[];
-        }; // Items.
-        rubric?: {
-            criteria: {
-                criterionid: number; // Criterion id.
-                fillings?: { // Filling.
-                    criterionid: number; // Criterion id.
-                    levelid?: number; // Level id.
-                    remark?: string; // Remark.
-                    remarkformat?: number; // Remark format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
-                }[];
-            }[];
-        }; // Items.
-    }; // Advanced grading data.
-};
-
 /**
  * Assignment grade outcomes.
  */
diff --git a/src/addons/mod/assign/services/handlers/module.ts b/src/addons/mod/assign/services/handlers/module.ts
index 8ef54dc73..781ef2900 100644
--- a/src/addons/mod/assign/services/handlers/module.ts
+++ b/src/addons/mod/assign/services/handlers/module.ts
@@ -20,7 +20,6 @@ import { makeSingleton } from '@singletons';
 import { CoreCourse, CoreCourseAnyModuleData } from '@features/course/services/course';
 import { CoreCourseModule } from '@features/course/services/course-helper';
 import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
-import { AddonModAssign } from '../assign';
 
 /**
  * Handler to support assign modules.
@@ -54,7 +53,7 @@ export class AddonModAssignModuleHandlerService implements CoreCourseModuleHandl
      * @return Whether or not the handler is enabled on a site level.
      */
     async isEnabled(): Promise<boolean> {
-        return AddonModAssign.isPluginEnabled();
+        return true;
     }
 
     /**
diff --git a/src/addons/mod/assign/services/handlers/prefetch.ts b/src/addons/mod/assign/services/handlers/prefetch.ts
index 8d84587d0..1f7d6e533 100644
--- a/src/addons/mod/assign/services/handlers/prefetch.ts
+++ b/src/addons/mod/assign/services/handlers/prefetch.ts
@@ -202,15 +202,6 @@ export class AddonModAssignPrefetchHandlerService extends CoreCourseActivityPref
         return CoreCourse.invalidateModule(module.id);
     }
 
-    /**
-     * Whether or not the handler is enabled on a site level.
-     *
-     * @return A boolean, or a promise resolved with a boolean, indicating if the handler is enabled.
-     */
-    async isEnabled(): Promise<boolean> {
-        return AddonModAssign.isPluginEnabled();
-    }
-
     /**
      * @inheritdoc
      */
@@ -391,10 +382,7 @@ export class AddonModAssignPrefetchHandlerService extends CoreCourseActivityPref
                     // Participiants already fetched, we don't need to ignore cache now.
                     const participants = await AddonModAssignHelper.getParticipants(assign, group.id, { siteId });
 
-                    // Fail silently (Moodle < 3.2).
-                    await CoreUtils.ignoreErrors(
-                        CoreUser.prefetchUserAvatars(participants, 'profileimageurl', siteId),
-                    );
+                    await CoreUser.prefetchUserAvatars(participants, 'profileimageurl', siteId);
 
                     return;
                 }));
diff --git a/src/addons/mod/assign/submission/comments/services/handler.ts b/src/addons/mod/assign/submission/comments/services/handler.ts
index 54ea486f3..a14f9c7a3 100644
--- a/src/addons/mod/assign/submission/comments/services/handler.ts
+++ b/src/addons/mod/assign/submission/comments/services/handler.ts
@@ -16,7 +16,6 @@ import { AddonModAssignAssign, AddonModAssignSubmission, AddonModAssignPlugin }
 import { AddonModAssignSubmissionHandler } from '@addons/mod/assign/services/submission-delegate';
 import { Injectable, Type } from '@angular/core';
 import { CoreComments } from '@features/comments/services/comments';
-import { CoreUtils } from '@services/utils/utils';
 import { makeSingleton } from '@singletons';
 import { AddonModAssignSubmissionCommentsComponent } from '../component/comments';
 
@@ -87,18 +86,14 @@ export class AddonModAssignSubmissionCommentsHandlerService implements AddonModA
         plugin: AddonModAssignPlugin,
         siteId?: string,
     ): Promise<void> {
-
-        // Fail silently (Moodle < 3.1.1, 3.2)
-        await CoreUtils.ignoreErrors(
-            CoreComments.getComments(
-                'module',
-                assign.cmid,
-                'assignsubmission_comments',
-                submission.id,
-                'submission_comments',
-                0,
-                siteId,
-            ),
+        await CoreComments.getComments(
+            'module',
+            assign.cmid,
+            'assignsubmission_comments',
+            submission.id,
+            'submission_comments',
+            0,
+            siteId,
         );
     }
 
diff --git a/src/addons/mod/assign/submission/onlinetext/services/handler.ts b/src/addons/mod/assign/submission/onlinetext/services/handler.ts
index 56f86d63a..90c65eaaa 100644
--- a/src/addons/mod/assign/submission/onlinetext/services/handler.ts
+++ b/src/addons/mod/assign/submission/onlinetext/services/handler.ts
@@ -24,7 +24,6 @@ import { AddonModAssignSubmissionHandler } from '@addons/mod/assign/services/sub
 import { Injectable, Type } from '@angular/core';
 import { CoreError } from '@classes/errors/error';
 import { CoreFileHelper } from '@services/file-helper';
-import { CoreSites } from '@services/sites';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreWSFile } from '@services/ws';
@@ -224,11 +223,7 @@ export class AddonModAssignSubmissionOnlineTextHandlerService implements AddonMo
      * @return Whether or not the handler is enabled for edit on a site level.
      */
     isEnabledForEdit(): boolean {
-        // There's a bug in Moodle 3.1.0 that doesn't allow submitting HTML, so we'll disable this plugin in that case.
-        // Bug was fixed in 3.1.1 minor release and in 3.2.
-        const currentSite = CoreSites.getCurrentSite();
-
-        return !!currentSite?.isVersionGreaterEqualThan('3.1.1') || !!currentSite?.checkIfAppUsesLocalMobile();
+        return true;
     }
 
     /**
diff --git a/src/addons/mod/book/services/book.ts b/src/addons/mod/book/services/book.ts
index cfdfdf680..7abf1dead 100644
--- a/src/addons/mod/book/services/book.ts
+++ b/src/addons/mod/book/services/book.ts
@@ -441,7 +441,7 @@ export type AddonModBookBookWSData = {
     name: string; // Book name.
     intro: string; // The Book intro.
     introformat: number; // Intro format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
-    introfiles?: CoreWSExternalFile[]; // @since 3.2.
+    introfiles?: CoreWSExternalFile[];
     numbering: number; // Book numbering configuration.
     navstyle: number; // Book navigation style configuration.
     customtitles: number; // Book custom titles type.
diff --git a/src/addons/mod/chat/components/index/addon-mod-chat-index.html b/src/addons/mod/chat/components/index/addon-mod-chat-index.html
index 2efee98b1..6e9094a0e 100644
--- a/src/addons/mod/chat/components/index/addon-mod-chat-index.html
+++ b/src/addons/mod/chat/components/index/addon-mod-chat-index.html
@@ -46,7 +46,7 @@
         <ion-button class="ion-margin ion-text-wrap" expand="block" color="primary" (click)="enterChat()">
             {{ 'addon.mod_chat.enterchat' | translate }}
         </ion-button>
-        <ion-button class="ion-margin ion-text-wrap" expand="block" color="light" *ngIf="sessionsAvailable" (click)="viewSessions()">
+        <ion-button class="ion-margin ion-text-wrap" expand="block" color="light" (click)="viewSessions()">
             {{ 'addon.mod_chat.viewreport' | translate }}
         </ion-button>
     </ng-container>
diff --git a/src/addons/mod/chat/components/index/index.ts b/src/addons/mod/chat/components/index/index.ts
index 65b73d838..fe6a7dd65 100644
--- a/src/addons/mod/chat/components/index/index.ts
+++ b/src/addons/mod/chat/components/index/index.ts
@@ -34,7 +34,6 @@ export class AddonModChatIndexComponent extends CoreCourseModuleMainActivityComp
     component = AddonModChatProvider.COMPONENT;
     moduleName = 'chat';
     chat?: AddonModChatChat;
-    sessionsAvailable = false;
     chatInfo?: {
         date: string;
         fromnow: string;
@@ -89,8 +88,6 @@ export class AddonModChatIndexComponent extends CoreCourseModuleMainActivityComp
             }
 
             this.dataRetrieved.emit(this.chat);
-
-            this.sessionsAvailable = await AddonModChat.areSessionsAvailable();
         } finally {
             this.fillContextMenu(refresh);
         }
diff --git a/src/addons/mod/chat/services/chat.ts b/src/addons/mod/chat/services/chat.ts
index 12af031ca..9908aff4f 100644
--- a/src/addons/mod/chat/services/chat.ts
+++ b/src/addons/mod/chat/services/chat.ts
@@ -217,19 +217,6 @@ export class AddonModChatProvider {
         return site.read('mod_chat_get_chat_users', params, preSets);
     }
 
-    /**
-     * Return whether WS for passed sessions are available.
-     *
-     * @param siteId Site ID. If not defined, current site.
-     * @return Promise resolved with a boolean.
-     * @since 3.5
-     */
-    async areSessionsAvailable(siteId?: string): Promise<boolean> {
-        const site = await CoreSites.getSite(siteId);
-
-        return site.wsAvailable('mod_chat_get_sessions') && site.wsAvailable('mod_chat_get_session_messages');
-    }
-
     /**
      * Get chat sessions.
      *
@@ -238,7 +225,6 @@ export class AddonModChatProvider {
      * @param showAll Whether to include incomplete sessions or not.
      * @param options Other options.
      * @return Promise resolved with the list of sessions.
-     * @since 3.5
      */
     async getSessions(
         chatId: number,
@@ -275,7 +261,6 @@ export class AddonModChatProvider {
      * @param groupId Group ID, 0 means that the function will determine the user group.
      * @param options Other options.
      * @return Promise resolved with the list of messages.
-     * @since 3.5
      */
     async getSessionMessages(
         chatId: number,
@@ -461,7 +446,7 @@ export type AddonModChatChat = {
     name: string; // Chat name.
     intro: string; // The Chat intro.
     introformat: number; // Intro format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
-    introfiles?: CoreWSExternalFile[]; // @since 3.2.
+    introfiles?: CoreWSExternalFile[];
     chatmethod?: string; // Chat method (sockets, ajax, header_js).
     keepdays?: number; // Keep days.
     studentlogs?: number; // Student logs visible to everyone.
diff --git a/src/addons/mod/chat/services/handlers/module.ts b/src/addons/mod/chat/services/handlers/module.ts
index a3e15e097..451bda34d 100644
--- a/src/addons/mod/chat/services/handlers/module.ts
+++ b/src/addons/mod/chat/services/handlers/module.ts
@@ -20,7 +20,6 @@ import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/
 import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
 import { makeSingleton } from '@singletons';
 import { AddonModChatIndexComponent } from '../../components/index';
-import { AddonModChat } from '../chat';
 
 /**
  * Handler to support chat modules.
@@ -59,6 +58,7 @@ export class AddonModChatModuleHandlerService implements CoreCourseModuleHandler
             icon: CoreCourse.getModuleIconSrc(this.modName, 'modicon' in module ? module.modicon : undefined),
             title: module.name,
             class: 'addon-mod_chat-handler',
+            showDownloadButton: true,
             action(event: Event, module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions): void {
                 options = options || {};
                 options.params = options.params || {};
@@ -69,20 +69,9 @@ export class AddonModChatModuleHandlerService implements CoreCourseModuleHandler
             },
         };
 
-        this.checkDownloadButton(data);
-
         return data;
     }
 
-    /**
-     * Check whether download button should be displayed.
-     *
-     * @param data Handler data.
-     */
-    protected async checkDownloadButton(data: CoreCourseModuleHandlerData): Promise<void> {
-        data.showDownloadButton = await AddonModChat.areSessionsAvailable();
-    }
-
     /**
      * @inheritdoc
      */
diff --git a/src/addons/mod/chat/services/handlers/prefetch.ts b/src/addons/mod/chat/services/handlers/prefetch.ts
index 335d3a1b5..3a56a30e0 100644
--- a/src/addons/mod/chat/services/handlers/prefetch.ts
+++ b/src/addons/mod/chat/services/handlers/prefetch.ts
@@ -32,13 +32,6 @@ export class AddonModChatPrefetchHandlerService extends CoreCourseActivityPrefet
     modName = 'chat';
     component = AddonModChatProvider.COMPONENT;
 
-    /**
-     * @inheritdoc
-     */
-    async isEnabled(): Promise<boolean> {
-        return AddonModChat.areSessionsAvailable();
-    }
-
     /**
      * @inheritdoc
      */
diff --git a/src/addons/mod/choice/services/choice.ts b/src/addons/mod/choice/services/choice.ts
index af256c9ee..8074f2459 100644
--- a/src/addons/mod/choice/services/choice.ts
+++ b/src/addons/mod/choice/services/choice.ts
@@ -484,7 +484,7 @@ export type AddonModChoiceChoice = {
     name: string; // Choice name.
     intro: string; // The choice intro.
     introformat: number; // Intro format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
-    introfiles?: CoreWSExternalFile[]; // @since 3.2.
+    introfiles?: CoreWSExternalFile[];
     publish?: boolean; // If choice is published.
     showresults?: number; // 0 never, 1 after answer, 2 after close, 3 always.
     display?: number; // Display mode (vertical, horizontal).
diff --git a/src/addons/mod/data/services/data.ts b/src/addons/mod/data/services/data.ts
index 5d40d3cd8..4dd6ce8e8 100644
--- a/src/addons/mod/data/services/data.ts
+++ b/src/addons/mod/data/services/data.ts
@@ -950,19 +950,6 @@ export class AddonModDataProvider {
         await site.invalidateWsCacheForKey(this.getEntryCacheKey(dataId, entryId));
     }
 
-    /**
-     * Return whether or not the plugin is enabled in a certain site. Plugin is enabled if the database WS are available.
-     *
-     * @param siteId Site ID. If not defined, current site.
-     * @return Promise resolved with true if plugin is enabled, rejected or resolved with false otherwise.
-     * @since 3.3
-     */
-    async isPluginEnabled(siteId?: string): Promise<boolean> {
-        const site = await CoreSites.getSite(siteId);
-
-        return site.wsAvailable('mod_data_get_data_access_information');
-    }
-
     /**
      * Report the database as being viewed.
      *
diff --git a/src/addons/mod/data/services/handlers/approve-link.ts b/src/addons/mod/data/services/handlers/approve-link.ts
index 7dfdc3173..5d3072634 100644
--- a/src/addons/mod/data/services/handlers/approve-link.ts
+++ b/src/addons/mod/data/services/handlers/approve-link.ts
@@ -17,7 +17,6 @@ import { Params } from '@angular/router';
 import { CoreContentLinksHandlerBase } from '@features/contentlinks/classes/base-handler';
 import { CoreContentLinksAction } from '@features/contentlinks/services/contentlinks-delegate';
 import { makeSingleton } from '@singletons';
-import { AddonModData } from '../data';
 import { AddonModDataHelper } from '../data-helper';
 
 /**
@@ -56,7 +55,7 @@ export class AddonModDataApproveLinkHandlerService extends CoreContentLinksHandl
             return false;
         }
 
-        return AddonModData.isPluginEnabled(siteId);
+        return true;
     }
 
 }
diff --git a/src/addons/mod/data/services/handlers/delete-link.ts b/src/addons/mod/data/services/handlers/delete-link.ts
index 6fd66bc4b..e17e662b6 100644
--- a/src/addons/mod/data/services/handlers/delete-link.ts
+++ b/src/addons/mod/data/services/handlers/delete-link.ts
@@ -17,7 +17,6 @@ import { Params } from '@angular/router';
 import { CoreContentLinksHandlerBase } from '@features/contentlinks/classes/base-handler';
 import { CoreContentLinksAction } from '@features/contentlinks/services/contentlinks-delegate';
 import { makeSingleton } from '@singletons';
-import { AddonModData } from '../data';
 import { AddonModDataHelper } from '../data-helper';
 
 /**
@@ -54,7 +53,7 @@ export class AddonModDataDeleteLinkHandlerService extends CoreContentLinksHandle
             return false;
         }
 
-        return AddonModData.isPluginEnabled(siteId);
+        return true;
     }
 
 }
diff --git a/src/addons/mod/data/services/handlers/edit-link.ts b/src/addons/mod/data/services/handlers/edit-link.ts
index 36acd0cfa..e759b20e2 100644
--- a/src/addons/mod/data/services/handlers/edit-link.ts
+++ b/src/addons/mod/data/services/handlers/edit-link.ts
@@ -20,7 +20,6 @@ import { CoreCourse } from '@features/course/services/course';
 import { CoreNavigator } from '@services/navigator';
 import { CoreDomUtils } from '@services/utils/dom';
 import { makeSingleton } from '@singletons';
-import { AddonModData } from '../data';
 import { AddonModDataModuleHandlerService } from './module';
 
 /**
@@ -72,7 +71,7 @@ export class AddonModDataEditLinkHandlerService extends CoreContentLinksHandlerB
             return false;
         }
 
-        return AddonModData.isPluginEnabled(siteId);
+        return true;
     }
 
 }
diff --git a/src/addons/mod/data/services/handlers/index-link.ts b/src/addons/mod/data/services/handlers/index-link.ts
index a831add07..30edb741d 100644
--- a/src/addons/mod/data/services/handlers/index-link.ts
+++ b/src/addons/mod/data/services/handlers/index-link.ts
@@ -15,7 +15,6 @@
 import { Injectable } from '@angular/core';
 import { CoreContentLinksModuleIndexHandler } from '@features/contentlinks/classes/module-index-handler';
 import { makeSingleton } from '@singletons';
-import { AddonModData } from '../data';
 
 /**
  * Handler to treat links to data.
@@ -29,12 +28,5 @@ export class AddonModDataIndexLinkHandlerService extends CoreContentLinksModuleI
         super('AddonModData', 'data', 'd');
     }
 
-    /**
-     * @inheritdoc
-     */
-    isEnabled(siteId: string): Promise<boolean> {
-        return AddonModData.isPluginEnabled(siteId);
-    }
-
 }
 export const AddonModDataIndexLinkHandler = makeSingleton(AddonModDataIndexLinkHandlerService);
diff --git a/src/addons/mod/data/services/handlers/list-link.ts b/src/addons/mod/data/services/handlers/list-link.ts
index 1bbd94082..c649e5bf7 100644
--- a/src/addons/mod/data/services/handlers/list-link.ts
+++ b/src/addons/mod/data/services/handlers/list-link.ts
@@ -15,7 +15,6 @@
 import { Injectable } from '@angular/core';
 import { CoreContentLinksModuleListHandler } from '@features/contentlinks/classes/module-list-handler';
 import { makeSingleton } from '@singletons';
-import { AddonModData } from '../data';
 
 /**
  * Handler to treat links to data list page.
@@ -29,12 +28,5 @@ export class AddonModDataListLinkHandlerService extends CoreContentLinksModuleLi
         super('AddonModData', 'data');
     }
 
-    /**
-     * @inheritdoc
-     */
-    isEnabled(siteId?: string): Promise<boolean> {
-        return AddonModData.isPluginEnabled(siteId);
-    }
-
 }
 export const AddonModDataListLinkHandler = makeSingleton(AddonModDataListLinkHandlerService);
diff --git a/src/addons/mod/data/services/handlers/module.ts b/src/addons/mod/data/services/handlers/module.ts
index c48f8bb97..1ccb3d958 100644
--- a/src/addons/mod/data/services/handlers/module.ts
+++ b/src/addons/mod/data/services/handlers/module.ts
@@ -20,7 +20,6 @@ import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/
 import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
 import { makeSingleton } from '@singletons';
 import { AddonModDataIndexComponent } from '../../components/index';
-import { AddonModData } from '../data';
 
 /**
  * Handler to support data modules.
@@ -50,8 +49,8 @@ export class AddonModDataModuleHandlerService implements CoreCourseModuleHandler
     /**
      * @inheritdoc
      */
-    isEnabled(): Promise<boolean> {
-        return AddonModData.isPluginEnabled();
+    async isEnabled(): Promise<boolean> {
+        return true;
     }
 
     /**
diff --git a/src/addons/mod/data/services/handlers/prefetch.ts b/src/addons/mod/data/services/handlers/prefetch.ts
index 01446305c..4a7bf6b38 100644
--- a/src/addons/mod/data/services/handlers/prefetch.ts
+++ b/src/addons/mod/data/services/handlers/prefetch.ts
@@ -203,13 +203,6 @@ export class AddonModDataPrefetchHandlerService extends CoreCourseActivityPrefet
         return true;
     }
 
-    /**
-     * @inheritdoc
-     */
-    async isEnabled(): Promise<boolean> {
-        return AddonModData.isPluginEnabled();
-    }
-
     /**
      * @inheritdoc
      */
diff --git a/src/addons/mod/data/services/handlers/show-link.ts b/src/addons/mod/data/services/handlers/show-link.ts
index 63beb6200..f1279506a 100644
--- a/src/addons/mod/data/services/handlers/show-link.ts
+++ b/src/addons/mod/data/services/handlers/show-link.ts
@@ -20,7 +20,6 @@ import { CoreCourse } from '@features/course/services/course';
 import { CoreNavigator } from '@services/navigator';
 import { CoreDomUtils } from '@services/utils/dom';
 import { makeSingleton } from '@singletons';
-import { AddonModData } from '../data';
 import { AddonModDataModuleHandlerService } from './module';
 
 /**
@@ -87,7 +86,7 @@ export class AddonModDataShowLinkHandlerService extends CoreContentLinksHandlerB
             return false;
         }
 
-        return AddonModData.isPluginEnabled(siteId);
+        return true;
     }
 
 }
diff --git a/src/addons/mod/data/services/handlers/tag-area.ts b/src/addons/mod/data/services/handlers/tag-area.ts
index 31341389e..f6c4033e0 100644
--- a/src/addons/mod/data/services/handlers/tag-area.ts
+++ b/src/addons/mod/data/services/handlers/tag-area.ts
@@ -17,7 +17,6 @@ import { CoreTagFeedComponent } from '@features/tag/components/feed/feed';
 import { CoreTagAreaHandler } from '@features/tag/services/tag-area-delegate';
 import { CoreTagFeedElement, CoreTagHelper } from '@features/tag/services/tag-helper';
 import { makeSingleton } from '@singletons';
-import { AddonModData } from '../data';
 
 /**
  * Handler to support tags.
@@ -32,7 +31,7 @@ export class AddonModDataTagAreaHandlerService implements CoreTagAreaHandler {
      * @inheritdoc
      */
     async isEnabled(): Promise<boolean> {
-        return AddonModData.isPluginEnabled();
+        return true;
     }
 
     /**
diff --git a/src/addons/mod/feedback/services/feedback.ts b/src/addons/mod/feedback/services/feedback.ts
index 3208cd482..c1a254df3 100644
--- a/src/addons/mod/feedback/services/feedback.ts
+++ b/src/addons/mod/feedback/services/feedback.ts
@@ -1089,20 +1089,6 @@ export class AddonModFeedbackProvider {
         return CoreUtils.promiseWorks(site.read('mod_feedback_get_last_completed', params, preSets));
     }
 
-    /**
-     * Return whether or not the plugin is enabled in a certain site. Plugin is enabled if the feedback WS are available.
-     *
-     * @param siteId Site ID. If not defined, current site.
-     * @return Promise resolved with true if plugin is enabled, rejected or resolved with false otherwise.
-     * @since 3.3
-     */
-    async isPluginEnabled(siteId?: string): Promise<boolean> {
-        const site = await CoreSites.getSite(siteId);
-
-        return site.wsAvailable('mod_feedback_get_feedbacks_by_courses') &&
-                site.wsAvailable('mod_feedback_get_feedback_access_information');
-    }
-
     /**
      * Report the feedback as being viewed.
      *
diff --git a/src/addons/mod/feedback/services/handlers/analysis-link.ts b/src/addons/mod/feedback/services/handlers/analysis-link.ts
index d3c06a61f..8081f4bee 100644
--- a/src/addons/mod/feedback/services/handlers/analysis-link.ts
+++ b/src/addons/mod/feedback/services/handlers/analysis-link.ts
@@ -19,7 +19,6 @@ import { CoreCourse } from '@features/course/services/course';
 import { CoreNavigator } from '@services/navigator';
 import { CoreDomUtils } from '@services/utils/dom';
 import { makeSingleton } from '@singletons';
-import { AddonModFeedback } from '../feedback';
 import { AddonModFeedbackModuleHandlerService } from './module';
 
 /**
@@ -84,7 +83,7 @@ export class AddonModFeedbackAnalysisLinkHandlerService extends CoreContentLinks
             return false;
         }
 
-        return AddonModFeedback.isPluginEnabled(siteId);
+        return true;
     }
 
 }
diff --git a/src/addons/mod/feedback/services/handlers/complete-link.ts b/src/addons/mod/feedback/services/handlers/complete-link.ts
index 94d46c83d..f0bc0ac94 100644
--- a/src/addons/mod/feedback/services/handlers/complete-link.ts
+++ b/src/addons/mod/feedback/services/handlers/complete-link.ts
@@ -19,7 +19,6 @@ import { CoreCourse } from '@features/course/services/course';
 import { CoreNavigator } from '@services/navigator';
 import { CoreDomUtils } from '@services/utils/dom';
 import { makeSingleton } from '@singletons';
-import { AddonModFeedback } from '../feedback';
 import { AddonModFeedbackModuleHandlerService } from './module';
 
 /**
@@ -72,7 +71,7 @@ export class AddonModFeedbackCompleteLinkHandlerService extends CoreContentLinks
             return false;
         }
 
-        return AddonModFeedback.isPluginEnabled(siteId);
+        return true;
     }
 
 }
diff --git a/src/addons/mod/feedback/services/handlers/index-link.ts b/src/addons/mod/feedback/services/handlers/index-link.ts
index 319112eb6..b6541b5ab 100644
--- a/src/addons/mod/feedback/services/handlers/index-link.ts
+++ b/src/addons/mod/feedback/services/handlers/index-link.ts
@@ -15,7 +15,6 @@
 import { Injectable } from '@angular/core';
 import { CoreContentLinksModuleIndexHandler } from '@features/contentlinks/classes/module-index-handler';
 import { makeSingleton } from '@singletons';
-import { AddonModFeedback } from '../feedback';
 
 /**
  * Handler to treat links to feedback.
@@ -29,19 +28,6 @@ export class AddonModFeedbackIndexLinkHandlerService extends CoreContentLinksMod
         super('AddonModFeedback', 'feedback');
     }
 
-    /**
-     * Check if the handler is enabled for a certain site (site + user) and a URL.
-     *
-     * @param siteId The site ID.
-     * @param url The URL to treat.
-     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param courseId Course ID related to the URL. Optional but recommended.
-     * @return Whether the handler is enabled for the URL and site.
-     */
-    isEnabled(): Promise<boolean> {
-        return AddonModFeedback.isPluginEnabled();
-    }
-
 }
 
 export const AddonModFeedbackIndexLinkHandler = makeSingleton(AddonModFeedbackIndexLinkHandlerService);
diff --git a/src/addons/mod/feedback/services/handlers/list-link.ts b/src/addons/mod/feedback/services/handlers/list-link.ts
index 9f62a378c..761015f55 100644
--- a/src/addons/mod/feedback/services/handlers/list-link.ts
+++ b/src/addons/mod/feedback/services/handlers/list-link.ts
@@ -15,7 +15,6 @@
 import { Injectable } from '@angular/core';
 import { CoreContentLinksModuleListHandler } from '@features/contentlinks/classes/module-list-handler';
 import { makeSingleton } from '@singletons';
-import { AddonModFeedback } from '../feedback';
 
 /**
  * Handler to treat links to feedback list page.
@@ -29,13 +28,6 @@ export class AddonModFeedbackListLinkHandlerService extends CoreContentLinksModu
         super('AddonModFeedback', 'feedback');
     }
 
-    /**
-     * @inheritdoc
-     */
-    isEnabled(): Promise<boolean> {
-        return AddonModFeedback.isPluginEnabled();
-    }
-
 }
 
 export const AddonModFeedbackListLinkHandler = makeSingleton(AddonModFeedbackListLinkHandlerService);
diff --git a/src/addons/mod/feedback/services/handlers/module.ts b/src/addons/mod/feedback/services/handlers/module.ts
index fba3e5862..5b7b1342c 100644
--- a/src/addons/mod/feedback/services/handlers/module.ts
+++ b/src/addons/mod/feedback/services/handlers/module.ts
@@ -19,7 +19,6 @@ import { CoreCourseModule } from '@features/course/services/course-helper';
 import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
 import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
 import { makeSingleton } from '@singletons';
-import { AddonModFeedback } from '../feedback';
 import { AddonModFeedbackIndexComponent } from '../../components/index';
 
 /**
@@ -48,8 +47,8 @@ export class AddonModFeedbackModuleHandlerService implements CoreCourseModuleHan
     /**
      * @inheritdoc
      */
-    isEnabled(): Promise<boolean> {
-        return AddonModFeedback.isPluginEnabled();
+    async isEnabled(): Promise<boolean> {
+        return true;
     }
 
     /**
diff --git a/src/addons/mod/feedback/services/handlers/prefetch.ts b/src/addons/mod/feedback/services/handlers/prefetch.ts
index 88a346d88..3180321d9 100644
--- a/src/addons/mod/feedback/services/handlers/prefetch.ts
+++ b/src/addons/mod/feedback/services/handlers/prefetch.ts
@@ -110,13 +110,6 @@ export class AddonModFeedbackPrefetchHandlerService extends CoreCourseActivityPr
         return accessData.isopen;
     }
 
-    /**
-     * @inheritdoc
-     */
-    isEnabled(): Promise<boolean> {
-        return AddonModFeedback.isPluginEnabled();
-    }
-
     /**
      * @inheritdoc
      */
diff --git a/src/addons/mod/feedback/services/handlers/print-link.ts b/src/addons/mod/feedback/services/handlers/print-link.ts
index b74bab793..1a287d5ad 100644
--- a/src/addons/mod/feedback/services/handlers/print-link.ts
+++ b/src/addons/mod/feedback/services/handlers/print-link.ts
@@ -19,7 +19,6 @@ import { CoreCourse } from '@features/course/services/course';
 import { CoreNavigator } from '@services/navigator';
 import { CoreDomUtils } from '@services/utils/dom';
 import { makeSingleton } from '@singletons';
-import { AddonModFeedback } from '../feedback';
 import { AddonModFeedbackModuleHandlerService } from './module';
 
 /**
@@ -72,7 +71,7 @@ export class AddonModFeedbackPrintLinkHandlerService extends CoreContentLinksHan
             return false;
         }
 
-        return AddonModFeedback.isPluginEnabled(siteId);
+        return true;
     }
 
 }
diff --git a/src/addons/mod/feedback/services/handlers/push-click.ts b/src/addons/mod/feedback/services/handlers/push-click.ts
index e5119b79a..e736768db 100644
--- a/src/addons/mod/feedback/services/handlers/push-click.ts
+++ b/src/addons/mod/feedback/services/handlers/push-click.ts
@@ -19,7 +19,6 @@ import { CorePushNotificationsNotificationBasicData } from '@features/pushnotifi
 import { CoreUrlUtils } from '@services/utils/url';
 import { CoreUtils } from '@services/utils/utils';
 import { makeSingleton } from '@singletons';
-import { AddonModFeedback } from '../feedback';
 import { AddonModFeedbackHelper } from '../feedback-helper';
 
 /**
@@ -39,7 +38,7 @@ export class AddonModFeedbackPushClickHandlerService implements CorePushNotifica
         if (CoreUtils.isTrueOrOne(notification.notif) && notification.moodlecomponent == 'mod_feedback' &&
                 (notification.name == 'submission' || notification.name == 'message')) {
 
-            return AddonModFeedback.isPluginEnabled(notification.site);
+            return true;
         }
 
         return false;
diff --git a/src/addons/mod/feedback/services/handlers/show-entries-link.ts b/src/addons/mod/feedback/services/handlers/show-entries-link.ts
index 6f91981bc..1d1f857d4 100644
--- a/src/addons/mod/feedback/services/handlers/show-entries-link.ts
+++ b/src/addons/mod/feedback/services/handlers/show-entries-link.ts
@@ -16,7 +16,6 @@ import { Injectable } from '@angular/core';
 import { CoreContentLinksHandlerBase } from '@features/contentlinks/classes/base-handler';
 import { CoreContentLinksAction } from '@features/contentlinks/services/contentlinks-delegate';
 import { makeSingleton } from '@singletons';
-import { AddonModFeedback } from '../feedback';
 import { AddonModFeedbackHelper } from '../feedback-helper';
 
 /**
@@ -50,7 +49,7 @@ export class AddonModFeedbackShowEntriesLinkHandlerService extends CoreContentLi
             return false;
         }
 
-        return AddonModFeedback.isPluginEnabled(siteId);
+        return true;
     }
 
 }
diff --git a/src/addons/mod/feedback/services/handlers/show-non-respondents-link.ts b/src/addons/mod/feedback/services/handlers/show-non-respondents-link.ts
index c133301ec..cccaadcad 100644
--- a/src/addons/mod/feedback/services/handlers/show-non-respondents-link.ts
+++ b/src/addons/mod/feedback/services/handlers/show-non-respondents-link.ts
@@ -19,7 +19,6 @@ import { CoreCourse } from '@features/course/services/course';
 import { CoreNavigator } from '@services/navigator';
 import { CoreDomUtils } from '@services/utils/dom';
 import { makeSingleton } from '@singletons';
-import { AddonModFeedback } from '../feedback';
 import { AddonModFeedbackModuleHandlerService } from './module';
 /**
  * Content links handler for feedback show non respondents.
@@ -67,7 +66,7 @@ export class AddonModFeedbackShowNonRespondentsLinkHandlerService extends CoreCo
             return false;
         }
 
-        return AddonModFeedback.isPluginEnabled(siteId);
+        return true;
     }
 
 }
diff --git a/src/addons/mod/folder/components/index/index.ts b/src/addons/mod/folder/components/index/index.ts
index a74ee7819..3c13d7cb4 100644
--- a/src/addons/mod/folder/components/index/index.ts
+++ b/src/addons/mod/folder/components/index/index.ts
@@ -18,7 +18,6 @@ import { Params } from '@angular/router';
 import { CoreCourseModuleMainResourceComponent } from '@features/course/classes/main-resource-component';
 import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
 import { CoreCourse } from '@features/course/services/course';
-import { CoreApp } from '@services/app';
 import { CoreNavigator } from '@services/navigator';
 import { Md5 } from 'ts-md5';
 import { AddonModFolder, AddonModFolderFolder, AddonModFolderProvider } from '../../services/folder';
@@ -41,7 +40,6 @@ export class AddonModFolderIndexComponent extends CoreCourseModuleMainResourceCo
     @Input() subfolder?: AddonModFolderFolderFormattedData; // Subfolder to show.
 
     component = AddonModFolderProvider.COMPONENT;
-    canGetFolder = false;
     contents?: AddonModFolderFolderFormattedData;
 
     constructor(@Optional() courseContentsPage?: CoreCourseContentsPage) {
@@ -54,8 +52,6 @@ export class AddonModFolderIndexComponent extends CoreCourseModuleMainResourceCo
     async ngOnInit(): Promise<void> {
         super.ngOnInit();
 
-        this.canGetFolder = AddonModFolder.isGetFolderWSAvailable();
-
         if (this.subfolder) {
             this.description = this.folderInstance ? this.folderInstance.intro : this.module.description;
             this.contents = this.subfolder;
@@ -98,18 +94,8 @@ export class AddonModFolderIndexComponent extends CoreCourseModuleMainResourceCo
      */
     protected async fetchContent(refresh = false): Promise<void> {
         try {
-            if (this.canGetFolder) {
-                this.folderInstance = await AddonModFolder.getFolder(this.courseId, this.module.id);
-                await CoreCourse.loadModuleContents(this.module, this.courseId, undefined, false, refresh);
-            } else {
-                const module = await CoreCourse.getModule(this.module.id, this.courseId);
-
-                if (!module.contents.length && this.module.contents.length && !CoreApp.isOnline()) {
-                    // The contents might be empty due to a cached data. Use the old ones.
-                    module.contents = this.module.contents;
-                }
-                this.module = module;
-            }
+            this.folderInstance = await AddonModFolder.getFolder(this.courseId, this.module.id);
+            await CoreCourse.loadModuleContents(this.module, this.courseId, undefined, false, refresh);
 
             this.dataRetrieved.emit(this.folderInstance || this.module);
 
diff --git a/src/addons/mod/folder/services/folder.ts b/src/addons/mod/folder/services/folder.ts
index f868c2e27..f62fca427 100644
--- a/src/addons/mod/folder/services/folder.ts
+++ b/src/addons/mod/folder/services/folder.ts
@@ -122,16 +122,6 @@ export class AddonModFolderProvider {
         await site.invalidateWsCacheForKey(this.getFolderCacheKey(courseId));
     }
 
-    /**
-     * Returns whether or not getFolder WS available or not.
-     *
-     * @return If WS is available.
-     * @since 3.3
-     */
-    isGetFolderWSAvailable(): boolean {
-        return CoreSites.wsAvailableInCurrentSite('mod_folder_get_folders_by_courses');
-    }
-
     /**
      * Report a folder as being viewed.
      *
diff --git a/src/addons/mod/folder/services/handlers/prefetch.ts b/src/addons/mod/folder/services/handlers/prefetch.ts
index 5c2fd9bd6..5081cd5d5 100644
--- a/src/addons/mod/folder/services/handlers/prefetch.ts
+++ b/src/addons/mod/folder/services/handlers/prefetch.ts
@@ -35,10 +35,7 @@ export class AddonModFolderPrefetchHandlerService extends CoreCourseResourcePref
         const promises: Promise<unknown>[] = [];
 
         promises.push(super.downloadOrPrefetch(module, courseId, prefetch));
-
-        if (AddonModFolder.isGetFolderWSAvailable()) {
-            promises.push(AddonModFolder.getFolder(courseId, module.id));
-        }
+        promises.push(AddonModFolder.getFolder(courseId, module.id));
 
         await Promise.all(promises);
     }
diff --git a/src/addons/mod/forum/pages/new-discussion/new-discussion.page.ts b/src/addons/mod/forum/pages/new-discussion/new-discussion.page.ts
index 71e71d97e..52995909a 100644
--- a/src/addons/mod/forum/pages/new-discussion/new-discussion.page.ts
+++ b/src/addons/mod/forum/pages/new-discussion/new-discussion.page.ts
@@ -359,12 +359,7 @@ export class AddonModForumNewDiscussionPage implements OnInit, OnDestroy, CanLea
      * @return Promise resolved with the list of groups.
      */
     protected addAllParticipantsOption(groups: CoreGroup[], check: boolean): Promise<CoreGroup[]> {
-        if (!AddonModForum.isAllParticipantsFixed()) {
-            // All participants has a bug, don't add it.
-            return Promise.resolve(groups);
-        }
-
-        let promise;
+        let promise: Promise<boolean>;
 
         if (check) {
             // We need to check if the user can add a discussion to all participants.
diff --git a/src/addons/mod/forum/services/forum.ts b/src/addons/mod/forum/services/forum.ts
index dcb625e85..131706f96 100644
--- a/src/addons/mod/forum/services/forum.ts
+++ b/src/addons/mod/forum/services/forum.ts
@@ -308,15 +308,6 @@ export class AddonModForumProvider {
         return index >= 0 ? posts.splice(index, 1).pop() : undefined;
     }
 
-    /**
-     * There was a bug adding new discussions to All Participants (see MDL-57962). Check if it's fixed.
-     *
-     * @return True if fixed, false otherwise.
-     */
-    isAllParticipantsFixed(): boolean {
-        return !!CoreSites.getCurrentSite()?.isVersionGreaterEqualThan(['3.1.5', '3.2.2']);
-    }
-
     /**
      * Returns whether or not getDiscussionPost WS available or not.
      *
diff --git a/src/addons/mod/glossary/components/index/index.ts b/src/addons/mod/glossary/components/index/index.ts
index fac7c7507..41db3e7d1 100644
--- a/src/addons/mod/glossary/components/index/index.ts
+++ b/src/addons/mod/glossary/components/index/index.ts
@@ -162,7 +162,7 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
             this.glossary = await AddonModGlossary.getGlossary(this.courseId, this.module.id);
 
             this.description = this.glossary.intro || this.description;
-            this.canAdd = (AddonModGlossary.isPluginEnabledForEditing() && !!this.glossary.canaddentry) || false;
+            this.canAdd = !!this.glossary.canaddentry || false;
 
             this.dataRetrieved.emit(this.glossary);
 
diff --git a/src/addons/mod/glossary/services/glossary.ts b/src/addons/mod/glossary/services/glossary.ts
index a9476adbe..033adbe77 100644
--- a/src/addons/mod/glossary/services/glossary.ts
+++ b/src/addons/mod/glossary/services/glossary.ts
@@ -22,7 +22,6 @@ import { CoreRatingInfo } from '@features/rating/services/rating';
 import { CoreTagItem } from '@features/tag/services/tag';
 import { CoreApp } from '@services/app';
 import { CoreSites, CoreSitesCommonWSOptions, CoreSitesReadingStrategy } from '@services/sites';
-import { CoreTextUtils } from '@services/utils/text';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreWSExternalFile, CoreWSExternalWarning } from '@services/ws';
 import { makeSingleton, Translate } from '@singletons';
@@ -964,11 +963,6 @@ export class AddonModGlossaryProvider {
             });
         }
 
-        // Workaround for bug MDL-57737.
-        if (!site.isVersionGreaterEqualThan('3.2.2')) {
-            params.definition = CoreTextUtils.cleanTags(params.definition);
-        }
-
         const response = await site.write<AddonModGlossaryAddEntryWSResponse>('mod_glossary_add_entry', params);
 
         return response.entryid;
@@ -1007,16 +1001,6 @@ export class AddonModGlossaryProvider {
         }
     }
 
-    /**
-     * Return whether or not the plugin is enabled for editing in the current site. Plugin is enabled if the glossary WS are
-     * available.
-     *
-     * @return Whether the glossary editing is available or not.
-     */
-    isPluginEnabledForEditing(): boolean {
-        return !!CoreSites.getCurrentSite()?.wsAvailable('mod_glossary_add_entry');
-    }
-
     /**
      * Report a glossary as being viewed.
      *
diff --git a/src/addons/mod/glossary/services/handlers/prefetch.ts b/src/addons/mod/glossary/services/handlers/prefetch.ts
index 16236256d..58420e244 100644
--- a/src/addons/mod/glossary/services/handlers/prefetch.ts
+++ b/src/addons/mod/glossary/services/handlers/prefetch.ts
@@ -19,7 +19,7 @@ import { CoreCourse, CoreCourseAnyModuleData } from '@features/course/services/c
 import { CoreCourses } from '@features/courses/services/courses';
 import { CoreUser } from '@features/user/services/user';
 import { CoreFilepool } from '@services/filepool';
-import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
+import { CoreSitesReadingStrategy } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreWSFile } from '@services/ws';
 import { makeSingleton } from '@singletons';
@@ -73,16 +73,12 @@ export class AddonModGlossaryPrefetchHandlerService extends CoreCourseActivityPr
     ): CoreWSFile[] {
         let files = this.getIntroFilesFromInstance(module, glossary);
 
-        const getInlineFiles = CoreSites.getCurrentSite()?.isVersionGreaterEqualThan('3.2');
-
         // Get entries files.
         entries.forEach((entry) => {
             files = files.concat(entry.attachments || []);
 
-            if (getInlineFiles && entry.definitioninlinefiles && entry.definitioninlinefiles.length) {
+            if (entry.definitioninlinefiles && entry.definitioninlinefiles.length) {
                 files = files.concat(entry.definitioninlinefiles);
-            } else if (entry.definition && !getInlineFiles) {
-                files = files.concat(CoreFilepool.extractDownloadableFilesFromHtmlAsFakeFileObjects(entry.definition));
             }
         });
 
diff --git a/src/addons/mod/h5pactivity/services/h5pactivity.ts b/src/addons/mod/h5pactivity/services/h5pactivity.ts
index 2c7f3f6d7..f3e3b0c1a 100644
--- a/src/addons/mod/h5pactivity/services/h5pactivity.ts
+++ b/src/addons/mod/h5pactivity/services/h5pactivity.ts
@@ -744,6 +744,7 @@ export class AddonModH5PActivityProvider {
      * Delete launcher.
      *
      * @return Promise resolved when the launcher file is deleted.
+     * @since 3.9
      */
     async isPluginEnabled(siteId?: string): Promise<boolean> {
         const site = await CoreSites.getSite(siteId);
@@ -788,7 +789,7 @@ export class AddonModH5PActivityProvider {
         const site = await CoreSites.getSite(options.siteId);
 
         if (!site.wsAvailable('mod_h5pactivity_log_report_viewed')) {
-            // Site doesn't support the WS, stop.
+            // Site doesn't support the WS, stop. Added in Moodle 3.11.
             return;
         }
 
diff --git a/src/addons/mod/label/services/handlers/prefetch.ts b/src/addons/mod/label/services/handlers/prefetch.ts
index 2b702318a..c9f35f8fa 100644
--- a/src/addons/mod/label/services/handlers/prefetch.ts
+++ b/src/addons/mod/label/services/handlers/prefetch.ts
@@ -19,7 +19,7 @@ import { CoreSitesReadingStrategy } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreWSFile } from '@services/ws';
 import { makeSingleton } from '@singletons';
-import { AddonModLabel, AddonModLabelLabel, AddonModLabelProvider } from '../label';
+import { AddonModLabel, AddonModLabelProvider } from '../label';
 
 /**
  * Handler to prefetch labels.
@@ -37,13 +37,9 @@ export class AddonModLabelPrefetchHandlerService extends CoreCourseResourcePrefe
      * @inheritdoc
      */
     async getIntroFiles(module: CoreCourseAnyModuleData, courseId: number, ignoreCache?: boolean): Promise<CoreWSFile[]> {
-        let label: AddonModLabelLabel | undefined;
-
-        if (AddonModLabel.isGetLabelAvailableForSite()) {
-            label = await AddonModLabel.getLabel(courseId, module.id, {
-                readingStrategy: ignoreCache ? CoreSitesReadingStrategy.ONLY_NETWORK : undefined,
-            });
-        }
+        const label = await AddonModLabel.getLabel(courseId, module.id, {
+            readingStrategy: ignoreCache ? CoreSitesReadingStrategy.ONLY_NETWORK : undefined,
+        });
 
         return this.getIntroFilesFromInstance(module, label);
     }
diff --git a/src/addons/mod/label/services/label.ts b/src/addons/mod/label/services/label.ts
index 21f673e6b..2bea84806 100644
--- a/src/addons/mod/label/services/label.ts
+++ b/src/addons/mod/label/services/label.ts
@@ -136,32 +136,6 @@ export class AddonModLabelProvider {
         await CoreUtils.allPromises(promises);
     }
 
-    /**
-     * Check if the site has the WS to get label data.
-     *
-     * @param siteId Site ID. If not defined, current site.
-     * @return Promise resolved with boolean: whether it's available.
-     * @since 3.3
-     */
-    async isGetLabelAvailable(siteId?: string): Promise<boolean> {
-        const site = await CoreSites.getSite(siteId);
-
-        return site.wsAvailable('mod_label_get_labels_by_courses');
-    }
-
-    /**
-     * Check if the site has the WS to get label data.
-     *
-     * @param site Site. If not defined, current site.
-     * @return Whether it's available.
-     * @since 3.3
-     */
-    isGetLabelAvailableForSite(site?: CoreSite): boolean {
-        site = site || CoreSites.getCurrentSite();
-
-        return !!site?.wsAvailable('mod_label_get_labels_by_courses');
-    }
-
 }
 export const AddonModLabel = makeSingleton(AddonModLabelProvider);
 
diff --git a/src/addons/mod/lesson/services/handlers/grade-link.ts b/src/addons/mod/lesson/services/handlers/grade-link.ts
index d5c847659..3bc46f80b 100644
--- a/src/addons/mod/lesson/services/handlers/grade-link.ts
+++ b/src/addons/mod/lesson/services/handlers/grade-link.ts
@@ -82,21 +82,6 @@ export class AddonModLessonGradeLinkHandlerService extends CoreContentLinksModul
         }
     }
 
-    /**
-     * Check if the handler is enabled for a certain site (site + user) and a URL.
-     * If not defined, defaults to true.
-     *
-     * @param siteId The site ID.
-     * @param url The URL to treat.
-     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param courseId Course ID related to the URL. Optional but recommended.
-     * @return Whether the handler is enabled for the URL and site.
-     */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async isEnabled(siteId: string, url: string, params: Record<string, string>, courseId?: number): Promise<boolean> {
-        return AddonModLesson.isPluginEnabled(siteId);
-    }
-
 }
 
 export const AddonModLessonGradeLinkHandler = makeSingleton(AddonModLessonGradeLinkHandlerService);
diff --git a/src/addons/mod/lesson/services/handlers/index-link.ts b/src/addons/mod/lesson/services/handlers/index-link.ts
index 03da03b76..98b647e8e 100644
--- a/src/addons/mod/lesson/services/handlers/index-link.ts
+++ b/src/addons/mod/lesson/services/handlers/index-link.ts
@@ -66,21 +66,6 @@ export class AddonModLessonIndexLinkHandlerService extends CoreContentLinksModul
         }];
     }
 
-    /**
-     * Check if the handler is enabled for a certain site (site + user) and a URL.
-     * If not defined, defaults to true.
-     *
-     * @param siteId The site ID.
-     * @param url The URL to treat.
-     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param courseId Course ID related to the URL. Optional but recommended.
-     * @return Whether the handler is enabled for the URL and site.
-     */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    isEnabled(siteId: string, url: string, params: Record<string, string>, courseId?: number): Promise<boolean> {
-        return AddonModLesson.isPluginEnabled(siteId);
-    }
-
     /**
      * Navigate to a lesson module (index page) with a fixed password.
      *
diff --git a/src/addons/mod/lesson/services/handlers/list-link.ts b/src/addons/mod/lesson/services/handlers/list-link.ts
index 16e69fb25..a2b36e3ac 100644
--- a/src/addons/mod/lesson/services/handlers/list-link.ts
+++ b/src/addons/mod/lesson/services/handlers/list-link.ts
@@ -16,7 +16,6 @@ import { Injectable } from '@angular/core';
 
 import { CoreContentLinksModuleListHandler } from '@features/contentlinks/classes/module-list-handler';
 import { makeSingleton } from '@singletons';
-import { AddonModLesson } from '../lesson';
 
 /**
  * Handler to treat links to lesson list page.
@@ -30,16 +29,6 @@ export class AddonModLessonListLinkHandlerService extends CoreContentLinksModule
         super('AddonModLesson', 'lesson');
     }
 
-    /**
-     * Check if the handler is enabled on a site level.
-     *
-     * @return Promise resolved with boolean: whether or not the handler is enabled on a site level.
-     */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    isEnabled(siteId: string, url: string, params: Record<string, string>, courseId?: number): Promise<boolean> {
-        return AddonModLesson.isPluginEnabled(siteId);
-    }
-
 }
 
 export const AddonModLessonListLinkHandler = makeSingleton(AddonModLessonListLinkHandlerService);
diff --git a/src/addons/mod/lesson/services/handlers/module.ts b/src/addons/mod/lesson/services/handlers/module.ts
index c094f2170..68cf0e871 100644
--- a/src/addons/mod/lesson/services/handlers/module.ts
+++ b/src/addons/mod/lesson/services/handlers/module.ts
@@ -18,7 +18,6 @@ import { CoreConstants } from '@/core/constants';
 import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
 import { CoreCourse, CoreCourseAnyModuleData, CoreCourseWSModule } from '@features/course/services/course';
 import { CoreCourseModule } from '@features/course/services/course-helper';
-import { AddonModLesson } from '../lesson';
 import { AddonModLessonIndexComponent } from '../../components/index';
 import { CoreCourseAnyCourseData } from '@features/courses/services/courses';
 import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
@@ -52,8 +51,8 @@ export class AddonModLessonModuleHandlerService implements CoreCourseModuleHandl
      *
      * @return Promise resolved with boolean: whether or not the handler is enabled on a site level.
      */
-    isEnabled(): Promise<boolean> {
-        return AddonModLesson.isPluginEnabled();
+    async isEnabled(): Promise<boolean> {
+        return true;
     }
 
     /**
diff --git a/src/addons/mod/lesson/services/handlers/prefetch.ts b/src/addons/mod/lesson/services/handlers/prefetch.ts
index 8369dee99..2b550bf94 100644
--- a/src/addons/mod/lesson/services/handlers/prefetch.ts
+++ b/src/addons/mod/lesson/services/handlers/prefetch.ts
@@ -221,15 +221,6 @@ export class AddonModLessonPrefetchHandlerService extends CoreCourseActivityPref
             (accessInfo.preventaccessreasons.length == 1 && AddonModLesson.isPasswordProtected(accessInfo));
     }
 
-    /**
-     * Whether or not the handler is enabled on a site level.
-     *
-     * @return Promise resolved with a boolean indicating if the handler is enabled.
-     */
-    isEnabled(): Promise<boolean> {
-        return AddonModLesson.isPluginEnabled();
-    }
-
     /**
      * @inheritdoc
      */
diff --git a/src/addons/mod/lesson/services/handlers/report-link.ts b/src/addons/mod/lesson/services/handlers/report-link.ts
index ecc00a4a1..7a068134a 100644
--- a/src/addons/mod/lesson/services/handlers/report-link.ts
+++ b/src/addons/mod/lesson/services/handlers/report-link.ts
@@ -20,7 +20,6 @@ import { CoreCourse } from '@features/course/services/course';
 import { CoreNavigator } from '@services/navigator';
 import { CoreDomUtils } from '@services/utils/dom';
 import { makeSingleton } from '@singletons';
-import { AddonModLesson } from '../lesson';
 import { AddonModLessonModuleHandlerService } from './module';
 
 /**
@@ -81,7 +80,7 @@ export class AddonModLessonReportLinkHandlerService extends CoreContentLinksHand
             return false;
         }
 
-        return AddonModLesson.isPluginEnabled(siteId);
+        return true;
     }
 
     /**
diff --git a/src/addons/mod/lesson/services/lesson.ts b/src/addons/mod/lesson/services/lesson.ts
index be4d8c826..a89470d6d 100644
--- a/src/addons/mod/lesson/services/lesson.ts
+++ b/src/addons/mod/lesson/services/lesson.ts
@@ -2710,19 +2710,6 @@ export class AddonModLessonProvider {
         return false;
     }
 
-    /**
-     * Return whether or not the plugin is enabled in a certain site. Plugin is enabled if the lesson WS are available.
-     *
-     * @param siteId Site ID. If not defined, current site.
-     * @return Promise resolved with true if plugin is enabled, rejected or resolved with false otherwise.
-     */
-    async isPluginEnabled(siteId?: string): Promise<boolean> {
-        const site = await CoreSites.getSite(siteId);
-
-        // All WS were introduced at the same time so checking one is enough.
-        return site.wsAvailable('mod_lesson_get_lesson_access_information');
-    }
-
     /**
      * Check if a page is a question page or a content page.
      *
diff --git a/src/addons/mod/lti/services/lti.ts b/src/addons/mod/lti/services/lti.ts
index 35678bb66..72c658feb 100644
--- a/src/addons/mod/lti/services/lti.ts
+++ b/src/addons/mod/lti/services/lti.ts
@@ -331,7 +331,7 @@ export type AddonModLtiLti = {
     name: string; // LTI name.
     intro?: string; // The LTI intro.
     introformat?: number; // Intro format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
-    introfiles?: CoreWSExternalFile[]; // @since 3.2.
+    introfiles?: CoreWSExternalFile[];
     timecreated?: number; // Time of creation.
     timemodified?: number; // Time of last modification.
     typeid?: number; // Type id.
diff --git a/src/addons/mod/page/components/index/index.ts b/src/addons/mod/page/components/index/index.ts
index 4dad5b9be..f3034ce73 100644
--- a/src/addons/mod/page/components/index/index.ts
+++ b/src/addons/mod/page/components/index/index.ts
@@ -15,7 +15,7 @@
 import { Component, OnInit, Optional } from '@angular/core';
 import { CoreCourseModuleMainResourceComponent } from '@features/course/classes/main-resource-component';
 import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
-import { CoreCourse, CoreCourseWSModule } from '@features/course/services/course';
+import { CoreCourse } from '@features/course/services/course';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreUtils } from '@services/utils/utils';
 import { AddonModPageProvider, AddonModPagePage, AddonModPage } from '../../services/page';
@@ -32,12 +32,11 @@ import { AddonModPageHelper } from '../../services/page-helper';
 export class AddonModPageIndexComponent extends CoreCourseModuleMainResourceComponent implements OnInit {
 
     component = AddonModPageProvider.COMPONENT;
-    canGetPage = false;
     contents?: string;
     displayDescription = true;
     displayTimemodified = true;
     timemodified?: number;
-    page?: CoreCourseWSModule | AddonModPagePage;
+    page?: AddonModPagePage;
     warning?: string;
 
     protected fetchContentDefaultError = 'addon.mod_page.errorwhileloadingthepage';
@@ -52,8 +51,6 @@ export class AddonModPageIndexComponent extends CoreCourseModuleMainResourceComp
     async ngOnInit(): Promise<void> {
         super.ngOnInit();
 
-        this.canGetPage = AddonModPage.isGetPageWSAvailable();
-
         await this.loadContent();
 
         try {
@@ -103,21 +100,13 @@ export class AddonModPageIndexComponent extends CoreCourseModuleMainResourceComp
      */
     protected async loadPageData(): Promise<void> {
         // Get latest title, description and some extra data. Data should've been updated in download.
-        const page = this.canGetPage ?
-            await AddonModPage.getPageData(this.courseId, this.module.id) :
-            await CoreCourse.getModule(this.module.id, this.courseId);
+        this.page = await AddonModPage.getPageData(this.courseId, this.module.id);
 
-        this.description = 'intro' in page ? page.intro : page.description;
-        this.dataRetrieved.emit(page);
-
-        if (!this.canGetPage) {
-            return;
-        }
-
-        this.page = page;
+        this.description = this.page.intro;
+        this.dataRetrieved.emit(this.page);
 
         // Check if description and timemodified should be displayed.
-        if ('displayoptions' in this.page) {
+        if (this.page.displayoptions) {
             const options: Record<string, string | boolean> =
                 CoreTextUtils.unserialize(this.page.displayoptions) || {};
 
diff --git a/src/addons/mod/page/services/handlers/prefetch.ts b/src/addons/mod/page/services/handlers/prefetch.ts
index 187d77fd6..fdbb6f721 100644
--- a/src/addons/mod/page/services/handlers/prefetch.ts
+++ b/src/addons/mod/page/services/handlers/prefetch.ts
@@ -42,10 +42,7 @@ export class AddonModPagePrefetchHandlerService extends CoreCourseResourcePrefet
         const promises: Promise<unknown>[] = [];
 
         promises.push(super.downloadOrPrefetch(module, courseId, prefetch));
-
-        if (AddonModPage.isGetPageWSAvailable()) {
-            promises.push(AddonModPage.getPageData(courseId, module.id));
-        }
+        promises.push(AddonModPage.getPageData(courseId, module.id));
 
         await Promise.all(promises);
     }
diff --git a/src/addons/mod/page/services/page.ts b/src/addons/mod/page/services/page.ts
index f936f0d64..1e29c8b7f 100644
--- a/src/addons/mod/page/services/page.ts
+++ b/src/addons/mod/page/services/page.ts
@@ -124,16 +124,6 @@ export class AddonModPageProvider {
         await site.invalidateWsCacheForKey(this.getPageCacheKey(courseId));
     }
 
-    /**
-     * Returns whether or not getPage WS available or not.
-     *
-     * @return If WS is available.
-     * @since 3.3
-     */
-    isGetPageWSAvailable(): boolean {
-        return CoreSites.wsAvailableInCurrentSite('mod_page_get_pages_by_courses');
-    }
-
     /**
      * Return whether or not the plugin is enabled.
      *
diff --git a/src/addons/mod/quiz/components/index/index.ts b/src/addons/mod/quiz/components/index/index.ts
index 623de1c11..d8e45071e 100644
--- a/src/addons/mod/quiz/components/index/index.ts
+++ b/src/addons/mod/quiz/components/index/index.ts
@@ -18,7 +18,6 @@ import { Component, OnDestroy, OnInit, Optional } from '@angular/core';
 import { CoreCourseModuleMainActivityComponent } from '@features/course/classes/main-activity-component';
 import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
 import { CoreCourse } from '@features/course/services/course';
-import { CoreCourseModulePrefetchDelegate } from '@features/course/services/module-prefetch-delegate';
 import { CoreQuestionBehaviourDelegate } from '@features/question/services/behaviour-delegate';
 import { IonContent } from '@ionic/angular';
 import { CoreNavigator } from '@services/navigator';
@@ -154,7 +153,7 @@ export class AddonModQuizIndexComponent extends CoreCourseModuleMainActivityComp
         // If the site doesn't support check updates, always prefetch it because we cannot tell if there's something new.
         const isDownloaded = this.currentStatus == CoreConstants.DOWNLOADED;
 
-        if (isDownloaded && CoreCourseModulePrefetchDelegate.canCheckUpdates()) {
+        if (isDownloaded) {
             // Already downloaded, open it.
             return this.openQuiz();
         }
@@ -168,7 +167,7 @@ export class AddonModQuizIndexComponent extends CoreCourseModuleMainActivityComp
             // Success downloading, open quiz.
             this.openQuiz();
         } catch (error) {
-            if (this.hasOffline || (isDownloaded && !CoreCourseModulePrefetchDelegate.canCheckUpdates())) {
+            if (this.hasOffline) {
                 // Error downloading but there is something offline, allow continuing it.
                 // If the site doesn't support check updates, continue too because we cannot tell if there's something new.
                 this.openQuiz();
@@ -647,9 +646,7 @@ export class AddonModQuizIndexComponent extends CoreCourseModuleMainActivityComp
 
             if (data) {
                 this.gradebookData = {
-                    grade: 'graderaw' in data && data.graderaw !== undefined && data.graderaw !== null ?
-                        data.graderaw :
-                        (data.grade !== undefined && data.grade !== null ? Number(data.grade) : undefined),
+                    grade: data.graderaw ?? (data.grade !== undefined && data.grade !== null ? Number(data.grade) : undefined),
                     feedback: data.feedback,
                 };
             }
diff --git a/src/addons/mod/quiz/services/handlers/prefetch.ts b/src/addons/mod/quiz/services/handlers/prefetch.ts
index 1ee999c75..47b61b959 100644
--- a/src/addons/mod/quiz/services/handlers/prefetch.ts
+++ b/src/addons/mod/quiz/services/handlers/prefetch.ts
@@ -111,7 +111,6 @@ export class AddonModQuizPrefetchHandlerService extends CoreCourseActivityPrefet
         attempts: AddonModQuizAttemptWSData[],
         siteId?: string,
     ): Promise<CoreWSFile[]> {
-        const getInlineFiles = CoreSites.getCurrentSite()?.isVersionGreaterEqualThan('3.2');
         let files: CoreWSFile[] = [];
 
         await Promise.all(attempts.map(async (attempt) => {
@@ -131,12 +130,8 @@ export class AddonModQuizPrefetchHandlerService extends CoreCourseActivityPrefet
                 siteId,
             });
 
-            if (getInlineFiles && feedback.feedbackinlinefiles?.length) {
+            if (feedback.feedbackinlinefiles?.length) {
                 files = files.concat(feedback.feedbackinlinefiles);
-            } else if (feedback.feedbacktext && !getInlineFiles) {
-                files = files.concat(
-                    CoreFilepool.extractDownloadableFilesFromHtmlAsFakeFileObjects(feedback.feedbacktext),
-                );
             }
         }));
 
@@ -526,7 +521,7 @@ export class AddonModQuizPrefetchHandlerService extends CoreCourseActivityPrefet
         try {
             const gradebookData = await AddonModQuiz.getGradeFromGradebook(quiz.course, quiz.coursemodule, true, siteId);
 
-            if (gradebookData && 'graderaw' in gradebookData && gradebookData.graderaw !== undefined) {
+            if (gradebookData && gradebookData.graderaw !== undefined) {
                 await AddonModQuiz.getFeedbackForGrade(quiz.id, gradebookData.graderaw, modOptions);
             }
         } catch {
diff --git a/src/addons/mod/quiz/services/quiz.ts b/src/addons/mod/quiz/services/quiz.ts
index 30216d969..f64bda703 100644
--- a/src/addons/mod/quiz/services/quiz.ts
+++ b/src/addons/mod/quiz/services/quiz.ts
@@ -19,7 +19,7 @@ import { CoreWSError } from '@classes/errors/wserror';
 import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
 import { CoreCourseCommonModWSOptions } from '@features/course/services/course';
 import { CoreCourseLogHelper } from '@features/course/services/log-helper';
-import { CoreGradesFormattedItem, CoreGradesFormattedRow, CoreGradesHelper } from '@features/grades/services/grades-helper';
+import { CoreGradesFormattedItem, CoreGradesHelper } from '@features/grades/services/grades-helper';
 import { CorePushNotifications } from '@features/pushnotifications/services/pushnotifications';
 import {
     CoreQuestion,
@@ -647,7 +647,7 @@ export class AddonModQuizProvider {
         ignoreCache?: boolean,
         siteId?: string,
         userId?: number,
-    ): Promise<CoreGradesFormattedItem | CoreGradesFormattedRow | undefined> {
+    ): Promise<CoreGradesFormattedItem | undefined> {
 
         const items = await CoreGradesHelper.getGradeModuleItems(
             courseId,
diff --git a/src/addons/mod/resource/components/index/index.ts b/src/addons/mod/resource/components/index/index.ts
index 29f8e101e..90d47fa39 100644
--- a/src/addons/mod/resource/components/index/index.ts
+++ b/src/addons/mod/resource/components/index/index.ts
@@ -16,7 +16,7 @@ import { Component, OnDestroy, OnInit, Optional } from '@angular/core';
 import { CoreError } from '@classes/errors/error';
 import { CoreCourseModuleMainResourceComponent } from '@features/course/classes/main-resource-component';
 import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
-import { CoreCourse, CoreCourseWSModule } from '@features/course/services/course';
+import { CoreCourse } from '@features/course/services/course';
 import { CoreCourseModulePrefetchDelegate } from '@features/course/services/module-prefetch-delegate';
 import { CoreApp } from '@services/app';
 import { CoreFileHelper } from '@services/file-helper';
@@ -30,7 +30,6 @@ import {
     AddonModResource,
     AddonModResourceCustomData,
     AddonModResourceProvider,
-    AddonModResourceResource,
 } from '../../services/resource';
 import { AddonModResourceHelper } from '../../services/resource-helper';
 
@@ -45,7 +44,6 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
 
     component = AddonModResourceProvider.COMPONENT;
 
-    canGetResource = false;
     mode = '';
     src = '';
     contentText = '';
@@ -69,7 +67,6 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
     async ngOnInit(): Promise<void> {
         super.ngOnInit();
 
-        this.canGetResource = AddonModResource.isGetResourceWSAvailable();
         this.isIOS = CoreApp.isIOS();
         this.isOnline = CoreApp.isOnline();
 
@@ -110,26 +107,17 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
             throw new CoreError(Translate.instant('core.filenotfound'));
         }
 
-        let resource: AddonModResourceResource | CoreCourseWSModule | undefined;
-        let options: AddonModResourceCustomData = {};
         let hasCalledDownloadResource = false;
 
         // Get the resource instance to get the latest name/description and to know if it's embedded.
-        if (this.canGetResource) {
-            resource = await AddonModResource.getResourceData(this.courseId, this.module.id);
-            this.description = resource.intro || '';
-            options = resource.displayoptions ? CoreTextUtils.unserialize(resource.displayoptions) : {};
-        } else {
-            resource = await CoreCourse.getModule(this.module.id, this.courseId);
-            this.description = resource.description || '';
-            options = resource.customdata ? CoreTextUtils.unserialize(CoreTextUtils.parseJSON(resource.customdata)) : {};
-        }
+        const resource = await AddonModResource.getResourceData(this.courseId, this.module.id);
+        this.description = resource.intro || '';
+        const options: AddonModResourceCustomData =
+            resource.displayoptions ? CoreTextUtils.unserialize(resource.displayoptions) : {};
 
         try {
-            if (resource) {
-                this.displayDescription = typeof options.printintro == 'undefined' || !!options.printintro;
-                this.dataRetrieved.emit(resource);
-            }
+            this.displayDescription = typeof options.printintro == 'undefined' || !!options.printintro;
+            this.dataRetrieved.emit(resource);
 
             if (AddonModResourceHelper.isDisplayedInIframe(this.module)) {
                 hasCalledDownloadResource = true;
diff --git a/src/addons/mod/resource/services/handlers/module.ts b/src/addons/mod/resource/services/handlers/module.ts
index 672482df8..317bd0c1f 100644
--- a/src/addons/mod/resource/services/handlers/module.ts
+++ b/src/addons/mod/resource/services/handlers/module.ts
@@ -156,7 +156,7 @@ export class AddonModResourceModuleHandlerService implements CoreCourseModuleHan
 
         if ('customdata' in module && typeof module.customdata != 'undefined') {
             options = CoreTextUtils.unserialize(CoreTextUtils.parseJSON(module.customdata));
-        } else if (AddonModResource.isGetResourceWSAvailable()) {
+        } else {
             // Get the resource data.
             promises.push(AddonModResource.getResourceData(courseId, module.id).then((info) => {
                 infoFiles = info.contentfiles;
diff --git a/src/addons/mod/resource/services/handlers/prefetch.ts b/src/addons/mod/resource/services/handlers/prefetch.ts
index f93df9fac..696922b78 100644
--- a/src/addons/mod/resource/services/handlers/prefetch.ts
+++ b/src/addons/mod/resource/services/handlers/prefetch.ts
@@ -67,10 +67,7 @@ export class AddonModResourcePrefetchHandlerService extends CoreCourseResourcePr
         const promises: Promise<unknown>[] = [];
 
         promises.push(super.downloadOrPrefetch(module, courseId, prefetch, dirPath));
-
-        if (AddonModResource.isGetResourceWSAvailable()) {
-            promises.push(AddonModResource.getResourceData(courseId, module.id));
-        }
+        promises.push(AddonModResource.getResourceData(courseId, module.id));
 
         await Promise.all(promises);
     }
diff --git a/src/addons/mod/resource/services/resource.ts b/src/addons/mod/resource/services/resource.ts
index 23f21dc62..e9a672728 100644
--- a/src/addons/mod/resource/services/resource.ts
+++ b/src/addons/mod/resource/services/resource.ts
@@ -130,16 +130,6 @@ export class AddonModResourceProvider {
         await site.invalidateWsCacheForKey(this.getResourceCacheKey(courseId));
     }
 
-    /**
-     * Returns whether or not getResource WS available or not.
-     *
-     * @return If WS is abalaible.
-     * @since 3.3
-     */
-    isGetResourceWSAvailable(): boolean {
-        return CoreSites.wsAvailableInCurrentSite('mod_resource_get_resources_by_courses');
-    }
-
     /**
      * Return whether or not the plugin is enabled.
      *
diff --git a/src/addons/mod/scorm/services/scorm.ts b/src/addons/mod/scorm/services/scorm.ts
index 340eb6ed8..a5cd5ecb9 100644
--- a/src/addons/mod/scorm/services/scorm.ts
+++ b/src/addons/mod/scorm/services/scorm.ts
@@ -1612,11 +1612,6 @@ export class AddonModScormProvider {
         };
         const wsFunction = 'mod_scorm_insert_scorm_tracks';
 
-        // Check if the method is available, use a prefixed version if possible.
-        if (!currentSite.wsAvailable(wsFunction, false)) {
-            return false;
-        }
-
         try {
             const response = CoreWS.syncCall<AddonModScormInsertScormTracksWSResponse>(wsFunction, params, preSets);
 
diff --git a/src/addons/mod/survey/services/survey.ts b/src/addons/mod/survey/services/survey.ts
index 523a7fa8d..0278684aa 100644
--- a/src/addons/mod/survey/services/survey.ts
+++ b/src/addons/mod/survey/services/survey.ts
@@ -322,7 +322,7 @@ export type AddonModSurveySurvey = {
     name: string; // Survey name.
     intro?: string; // The Survey intro.
     introformat?: number; // Intro format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
-    introfiles?: CoreWSExternalFile[]; // @since 3.2.
+    introfiles?: CoreWSExternalFile[];
     template?: number; // Survey type.
     days?: number; // Days.
     questions?: string; // Question ids.
diff --git a/src/addons/mod/url/components/index/index.ts b/src/addons/mod/url/components/index/index.ts
index 0409c7e4c..dddcee782 100644
--- a/src/addons/mod/url/components/index/index.ts
+++ b/src/addons/mod/url/components/index/index.ts
@@ -36,7 +36,6 @@ export class AddonModUrlIndexComponent extends CoreCourseModuleMainResourceCompo
 
     component = AddonModUrlProvider.COMPONENT;
 
-    canGetUrl = false;
     url?: string;
     name?: string;
     shouldEmbed = false;
@@ -58,8 +57,6 @@ export class AddonModUrlIndexComponent extends CoreCourseModuleMainResourceCompo
     async ngOnInit(): Promise<void> {
         super.ngOnInit();
 
-        this.canGetUrl = AddonModUrl.isGetUrlWSAvailable();
-
         await this.loadContent();
 
         if ((this.shouldIframe ||
@@ -86,9 +83,6 @@ export class AddonModUrlIndexComponent extends CoreCourseModuleMainResourceCompo
      */
     protected async fetchContent(refresh = false): Promise<void> {
         try {
-            if (!this.canGetUrl) {
-                throw null;
-            }
             // Fetch the module data.
             const url = await AddonModUrl.getUrl(this.courseId, this.module.id);
 
@@ -110,7 +104,7 @@ export class AddonModUrlIndexComponent extends CoreCourseModuleMainResourceCompo
             await this.calculateDisplayOptions(url);
 
         } catch {
-            // Fallback in case is not prefetched or not available.
+            // Fallback in case is not prefetched.
             const mod =
                 await CoreCourse.getModule(this.module.id, this.courseId, undefined, false, false, undefined, 'url');
 
diff --git a/src/addons/mod/url/services/handlers/module.ts b/src/addons/mod/url/services/handlers/module.ts
index d30b3189c..08ed9d915 100644
--- a/src/addons/mod/url/services/handlers/module.ts
+++ b/src/addons/mod/url/services/handlers/module.ts
@@ -175,7 +175,7 @@ export class AddonModUrlModuleHandlerService implements CoreCourseModuleHandler
             if (canHandle) {
                 // URL handled by the app, open it directly.
                 return true;
-            } else if (AddonModUrl.isGetUrlWSAvailable()) {
+            } else {
                 // Not handled by the app, check the display type.
                 const url = await CoreUtils.ignoreErrors(AddonModUrl.getUrl(courseId, module.id));
                 const displayType = AddonModUrl.getFinalDisplayType(url);
@@ -183,8 +183,6 @@ export class AddonModUrlModuleHandlerService implements CoreCourseModuleHandler
                 return displayType == CoreConstants.RESOURCELIB_DISPLAY_OPEN ||
                     displayType == CoreConstants.RESOURCELIB_DISPLAY_POPUP;
             }
-
-            return false;
         } catch {
             return false;
         }
diff --git a/src/addons/mod/url/services/url.ts b/src/addons/mod/url/services/url.ts
index 2cac565ba..0ccff66ed 100644
--- a/src/addons/mod/url/services/url.ts
+++ b/src/addons/mod/url/services/url.ts
@@ -206,16 +206,6 @@ export class AddonModUrlProvider {
         await site.invalidateWsCacheForKey(this.getUrlCacheKey(courseId));
     }
 
-    /**
-     * Returns whether or not getUrl WS available or not.
-     *
-     * @return If WS is abalaible.
-     * @since 3.3
-     */
-    isGetUrlWSAvailable(): boolean {
-        return CoreSites.wsAvailableInCurrentSite('mod_url_get_urls_by_courses');
-    }
-
     /**
      * Report the url as being viewed.
      *
diff --git a/src/addons/mod/wiki/services/wiki.ts b/src/addons/mod/wiki/services/wiki.ts
index f150b3834..580e9f20d 100644
--- a/src/addons/mod/wiki/services/wiki.ts
+++ b/src/addons/mod/wiki/services/wiki.ts
@@ -178,9 +178,7 @@ export class AddonModWikiProvider {
         if (section) {
             params.section = section;
         }
-
-        // This parameter requires Moodle 3.2. It saves network usage.
-        if (lockOnly && site.isVersionGreaterEqualThan('3.2')) {
+        if (lockOnly) {
             params.lockonly = true;
         }
 
diff --git a/src/addons/mod/workshop/services/handlers/index-link.ts b/src/addons/mod/workshop/services/handlers/index-link.ts
index 01fe2e311..3ad62aba9 100644
--- a/src/addons/mod/workshop/services/handlers/index-link.ts
+++ b/src/addons/mod/workshop/services/handlers/index-link.ts
@@ -15,7 +15,7 @@
 import { Injectable } from '@angular/core';
 import { CoreContentLinksModuleIndexHandler } from '@features/contentlinks/classes/module-index-handler';
 import { makeSingleton } from '@singletons';
-import { AddonModWorkshopProvider, AddonModWorkshop } from '../workshop';
+import { AddonModWorkshopProvider } from '../workshop';
 /**
  * Handler to treat links to workshop.
  */
@@ -28,12 +28,5 @@ export class AddonModWorkshopIndexLinkHandlerService extends CoreContentLinksMod
         super(AddonModWorkshopProvider.COMPONENT, 'workshop', 'w');
     }
 
-    /**
-     * @inheritdoc
-     */
-    isEnabled(siteId: string): Promise<boolean> {
-        return AddonModWorkshop.isPluginEnabled(siteId);
-    }
-
 }
 export const AddonModWorkshopIndexLinkHandler = makeSingleton(AddonModWorkshopIndexLinkHandlerService);
diff --git a/src/addons/mod/workshop/services/handlers/list-link.ts b/src/addons/mod/workshop/services/handlers/list-link.ts
index 7e2852f57..ca7ebe105 100644
--- a/src/addons/mod/workshop/services/handlers/list-link.ts
+++ b/src/addons/mod/workshop/services/handlers/list-link.ts
@@ -15,7 +15,6 @@
 import { Injectable } from '@angular/core';
 import { CoreContentLinksModuleListHandler } from '@features/contentlinks/classes/module-list-handler';
 import { makeSingleton } from '@singletons';
-import { AddonModWorkshop } from '../workshop';
 
 /**
  * Handler to treat links to workshop list page.
@@ -29,14 +28,5 @@ export class AddonModWorkshopListLinkHandlerService extends CoreContentLinksModu
         super('AddonModWorkshop', 'workshop');
     }
 
-    /**
-     * Check if the handler is enabled on a site level.
-     *
-     * @return Whether or not the handler is enabled on a site level.
-     */
-    isEnabled(): Promise<boolean> {
-        return AddonModWorkshop.isPluginEnabled();
-    }
-
 }
 export const AddonModWorkshopListLinkHandler = makeSingleton(AddonModWorkshopListLinkHandlerService);
diff --git a/src/addons/mod/workshop/services/handlers/module.ts b/src/addons/mod/workshop/services/handlers/module.ts
index 22e54bf0a..86463eee3 100644
--- a/src/addons/mod/workshop/services/handlers/module.ts
+++ b/src/addons/mod/workshop/services/handlers/module.ts
@@ -20,7 +20,6 @@ import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/
 import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
 import { makeSingleton } from '@singletons';
 import { AddonModWorkshopIndexComponent } from '../../components/index';
-import { AddonModWorkshop } from '../workshop';
 
 /**
  * Handler to support workshop modules.
@@ -47,8 +46,8 @@ export class AddonModWorkshopModuleHandlerService implements CoreCourseModuleHan
     /**
      * @inheritdoc
      */
-    isEnabled(): Promise<boolean> {
-        return AddonModWorkshop.isPluginEnabled();
+    async isEnabled(): Promise<boolean> {
+        return true;
     }
 
     /**
diff --git a/src/addons/mod/workshop/services/handlers/prefetch.ts b/src/addons/mod/workshop/services/handlers/prefetch.ts
index c0903280a..ad986d253 100644
--- a/src/addons/mod/workshop/services/handlers/prefetch.ts
+++ b/src/addons/mod/workshop/services/handlers/prefetch.ts
@@ -201,13 +201,6 @@ export class AddonModWorkshopPrefetchHandlerService extends CoreCourseActivityPr
         return accessData.canswitchphase || workshop.phase > AddonModWorkshopPhase.PHASE_SETUP;
     }
 
-    /**
-     * @inheritdoc
-     */
-    async isEnabled(): Promise<boolean> {
-        return AddonModWorkshop.isPluginEnabled();
-    }
-
     /**
      * @inheritdoc
      */
diff --git a/src/addons/mod/workshop/services/workshop.ts b/src/addons/mod/workshop/services/workshop.ts
index 27d802240..53bc85119 100644
--- a/src/addons/mod/workshop/services/workshop.ts
+++ b/src/addons/mod/workshop/services/workshop.ts
@@ -224,19 +224,6 @@ export class AddonModWorkshopProvider {
         return this.getWorkshopDataPrefixCacheKey(workshopId) + ':assessmentsform:' + assessmentId + ':' + mode;
     }
 
-    /**
-     * Return whether or not the plugin is enabled in a certain site. Plugin is enabled if the workshop WS are available.
-     *
-     * @param siteId Site ID. If not defined, current site.
-     * @return Promise resolved with true if plugin is enabled, rejected or resolved with false otherwise.
-     */
-    async isPluginEnabled(siteId?: string): Promise<boolean> {
-        const site = await CoreSites.getSite(siteId);
-
-        return site.wsAvailable('mod_workshop_get_workshops_by_courses') &&
-            site.wsAvailable('mod_workshop_get_workshop_access_information');
-    }
-
     /**
      * Get a workshop with key=value. If more than one is found, only the first will be returned.
      *
@@ -275,7 +262,7 @@ export class AddonModWorkshopProvider {
             throw new CoreError(Translate.instant('core.course.modulenotfound'));
         }
 
-        // Set submission types for Moodle 3.5 and older.
+        // Set submission types for Moodle 3.5.
         if (typeof workshop.submissiontypetext == 'undefined') {
             if (typeof workshop.nattachments != 'undefined' && workshop.nattachments > 0) {
                 workshop.submissiontypetext = AddonModWorkshopSubmissionType.SUBMISSION_TYPE_AVAILABLE;
diff --git a/src/addons/notifications/pages/list/list.ts b/src/addons/notifications/pages/list/list.ts
index fc37ccd61..589e0c8c7 100644
--- a/src/addons/notifications/pages/list/list.ts
+++ b/src/addons/notifications/pages/list/list.ts
@@ -89,7 +89,9 @@ export class AddonNotificationsListPage implements OnInit, OnDestroy {
         this.loadMoreError = false;
 
         try {
-            const result = await AddonNotificationsHelper.getNotifications(refresh ? [] : this.notifications);
+            const result = await AddonNotificationsHelper.getNotifications(refresh ? [] : this.notifications, {
+                onlyPopupNotifications: true,
+            });
 
             const notifications = result.notifications.map((notification) => this.formatText(notification));
 
@@ -150,13 +152,7 @@ export class AddonNotificationsListPage implements OnInit, OnDestroy {
             CoreEvents.trigger(AddonNotificationsProvider.READ_CHANGED_EVENT, {}, CoreSites.getCurrentSiteId());
         }
 
-        // Check if mark all notifications as read is enabled and there are some to read.
-        if (!AddonNotifications.isMarkAllNotificationsAsReadEnabled()) {
-            this.canMarkAllNotificationsAsRead = false;
-
-            return;
-        }
-
+        // Check if mark all as read should be displayed (there are unread notifications).
         try {
             this.loadingMarkAllNotificationsAsRead = true;
 
diff --git a/src/addons/notifications/pages/settings/settings.html b/src/addons/notifications/pages/settings/settings.html
index efa57cdfd..536c149c6 100644
--- a/src/addons/notifications/pages/settings/settings.html
+++ b/src/addons/notifications/pages/settings/settings.html
@@ -16,105 +16,96 @@
     </core-context-menu>
 </core-navbar-buttons>
 <ion-content>
-    <ion-refresher slot="fixed" [disabled]="!preferencesLoaded || !notifPrefsEnabled"
-        (ionRefresh)="refreshPreferences($event.target)">
+    <ion-refresher slot="fixed" [disabled]="!preferencesLoaded" (ionRefresh)="refreshPreferences($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
     <core-loading [hideUntil]="preferencesLoaded">
-        <!-- If notification preferences aren't enabled, show only the notification sound setting. -->
-        <ion-item *ngIf="canChangeSound && !notifPrefsEnabled">
-            <ion-label>{{ 'addon.notifications.playsound' | translate }}</ion-label>
-            <ion-toggle [(ngModel)]="notificationSound" (ngModelChange)="changeNotificationSound(notificationSound)"></ion-toggle>
-        </ion-item>
+        <ion-card>
+            <ion-item class="ion-text-wrap" *ngIf="preferences">
+                <ion-label>{{ 'addon.notifications.notifications' | translate }}</ion-label>
+                <ion-toggle [(ngModel)]="preferences!.enableall" (ngModelChange)="enableAll(preferences!.enableall)"></ion-toggle>
+            </ion-item>
+            <ion-item class="ion-text-wrap" *ngIf="canChangeSound">
+                <ion-label>{{ 'addon.notifications.playsound' | translate }}</ion-label>
+                <ion-toggle [(ngModel)]="notificationSound" (ngModelChange)="changeNotificationSound(notificationSound)">
+                </ion-toggle>
+            </ion-item>
+        </ion-card>
 
-        <ng-container *ngIf="notifPrefsEnabled">
-            <ion-card>
-                <ion-item class="ion-text-wrap" *ngIf="preferences">
-                    <ion-label>{{ 'addon.notifications.notifications' | translate }}</ion-label>
-                    <ion-toggle [(ngModel)]="preferences!.enableall" (ngModelChange)="enableAll(preferences!.enableall)"></ion-toggle>
-                </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="canChangeSound">
-                    <ion-label>{{ 'addon.notifications.playsound' | translate }}</ion-label>
-                    <ion-toggle [(ngModel)]="notificationSound" (ngModelChange)="changeNotificationSound(notificationSound)">
+        <!-- Show processor selector. -->
+        <core-combobox *ngIf="preferences && preferences.processors && preferences.processors.length > 0"
+            [selection]="currentProcessor!.name" (onChange)="changeProcessor($event)">
+            <ion-select-option class="ion-text-wrap" *ngFor="let processor of preferences.processors" [value]="processor.name">
+                {{ processor.displayname }}
+            </ion-select-option>
+        </core-combobox>
+
+        <ion-card list *ngFor="let component of components" class="ion-margin-top">
+            <ion-item-divider class="ion-text-wrap">
+                <ion-grid class="ion-no-padding">
+                    <ion-row class="ion-no-padding">
+                        <ion-col class="ion-no-padding">{{ component.displayname }}</ion-col>
+                        <ion-col size="2" class="ion-text-center ion-no-padding ion-hide-md-down">
+                            {{ 'core.settings.loggedin' | translate }}
+                        </ion-col>
+                        <ion-col size="2" class="ion-text-center ion-no-padding ion-hide-md-down">
+                            {{ 'core.settings.loggedoff' | translate }}
+                        </ion-col>
+                    </ion-row>
+                </ion-grid>
+            </ion-item-divider>
+            <ng-container *ngFor="let notification of component.notifications">
+                <!-- Tablet view -->
+                <ion-grid class="ion-text-wrap ion-hide-md-down addon-notifications-table-content">
+                    <ion-row class="ion-align-items-center">
+                        <ion-col class="ion-margin-horizontal">{{ notification.displayname }}</ion-col>
+                        <ion-col size="2" class="ion-text-center" *ngFor="let state of ['loggedin', 'loggedoff']">
+                            <!-- If notifications enabled, show toggle. -->
+                            <ion-spinner [hidden]="!preferences!.enableall ||
+                                !(notification.processorsByName[currentProcessor!.name][state] &&
+                                notification.processorsByName[currentProcessor!.name][state].updating)">
+                            </ion-spinner>
+                            <ion-toggle
+                                *ngIf="preferences!.enableall && !notification.processorsByName[currentProcessor!.name].locked"
+                                [(ngModel)]="notification.processorsByName[currentProcessor!.name][state].checked"
+                                (ngModelChange)="changePreference(notification, state)"
+                                [disabled]="notification.processorsByName[currentProcessor!.name][state].updating">
+                            </ion-toggle>
+                            <span class="text-gray"
+                                *ngIf="preferences!.enableall && notification.processorsByName[currentProcessor!.name].locked">
+                                {{'core.settings.locked' | translate }}
+                            </span>
+                            <!-- If notifications are disabled, show "Disabled" instead of toggle. -->
+                            <span *ngIf="!preferences!.enableall">{{ 'core.settings.disabled' | translate }}</span>
+                        </ion-col>
+                    </ion-row>
+                </ion-grid>
+
+                <!-- Phone view -->
+                <ion-list-header class="ion-text-wrap ion-no-margin ion-hide-md-up">
+                    {{ notification.displayname }}
+                </ion-list-header>
+                <!-- If notifications enabled, show toggles. If disabled, show "Disabled" instead of toggle. -->
+                <ion-item *ngFor="let state of ['loggedin', 'loggedoff']" class="ion-text-wrap ion-hide-md-up" lines="none">
+                    <ion-label>{{ 'core.settings.' + state | translate }}</ion-label>
+                    <ion-spinner slot="end"
+                        *ngIf="preferences!.enableall && (notification.processorsByName[currentProcessor!.name][state] &&
+                        notification.processorsByName[currentProcessor!.name][state].updating)">
+                    </ion-spinner>
+                    <ion-toggle slot="end"
+                        *ngIf="preferences!.enableall && !notification.processorsByName[currentProcessor!.name].locked"
+                        [(ngModel)]="notification.processorsByName[currentProcessor!.name][state].checked"
+                        (ngModelChange)="changePreference(notification, state)"
+                        [disabled]="notification.processorsByName[currentProcessor!.name][state].updating">
                     </ion-toggle>
+                    <span slot="end"
+                        *ngIf="preferences!.enableall && notification.processorsByName[currentProcessor!.name].locked"
+                        class="text-gray">
+                        {{'core.settings.locked' | translate }}
+                    </span>
+                    <ion-note slot="end" *ngIf="!preferences!.enableall">{{ 'core.settings.disabled' | translate }}</ion-note>
                 </ion-item>
-            </ion-card>
-
-            <!-- Show processor selector. -->
-            <core-combobox *ngIf="preferences && preferences.processors && preferences.processors.length > 0"
-                [selection]="currentProcessor!.name" (onChange)="changeProcessor($event)">
-                <ion-select-option class="ion-text-wrap" *ngFor="let processor of preferences.processors" [value]="processor.name">
-                    {{ processor.displayname }}
-                </ion-select-option>
-            </core-combobox>
-
-            <ion-card list *ngFor="let component of components" class="ion-margin-top">
-                <ion-item-divider class="ion-text-wrap">
-                    <ion-grid class="ion-no-padding">
-                        <ion-row class="ion-no-padding">
-                            <ion-col class="ion-no-padding">{{ component.displayname }}</ion-col>
-                            <ion-col size="2" class="ion-text-center ion-no-padding ion-hide-md-down">
-                                {{ 'core.settings.loggedin' | translate }}
-                            </ion-col>
-                            <ion-col size="2" class="ion-text-center ion-no-padding ion-hide-md-down">
-                                {{ 'core.settings.loggedoff' | translate }}
-                            </ion-col>
-                        </ion-row>
-                    </ion-grid>
-                </ion-item-divider>
-                <ng-container *ngFor="let notification of component.notifications">
-                    <!-- Tablet view -->
-                    <ion-grid class="ion-text-wrap ion-hide-md-down addon-notifications-table-content">
-                        <ion-row class="ion-align-items-center">
-                            <ion-col class="ion-margin-horizontal">{{ notification.displayname }}</ion-col>
-                            <ion-col size="2" class="ion-text-center" *ngFor="let state of ['loggedin', 'loggedoff']">
-                                <!-- If notifications enabled, show toggle. -->
-                                <ion-spinner [hidden]="!preferences!.enableall ||
-                                    !(notification.processorsByName[currentProcessor!.name][state] &&
-                                    notification.processorsByName[currentProcessor!.name][state].updating)">
-                                </ion-spinner>
-                                <ion-toggle
-                                    *ngIf="preferences!.enableall && !notification.processorsByName[currentProcessor!.name].locked"
-                                    [(ngModel)]="notification.processorsByName[currentProcessor!.name][state].checked"
-                                    (ngModelChange)="changePreference(notification, state)"
-                                    [disabled]="notification.processorsByName[currentProcessor!.name][state].updating">
-                                </ion-toggle>
-                                <span class="text-gray"
-                                    *ngIf="preferences!.enableall && notification.processorsByName[currentProcessor!.name].locked">
-                                    {{'core.settings.locked' | translate }}
-                                </span>
-                                <!-- If notifications are disabled, show "Disabled" instead of toggle. -->
-                                <span *ngIf="!preferences!.enableall">{{ 'core.settings.disabled' | translate }}</span>
-                            </ion-col>
-                        </ion-row>
-                    </ion-grid>
-
-                    <!-- Phone view -->
-                    <ion-list-header class="ion-text-wrap ion-no-margin ion-hide-md-up">
-                        {{ notification.displayname }}
-                    </ion-list-header>
-                    <!-- If notifications enabled, show toggles. If disabled, show "Disabled" instead of toggle. -->
-                    <ion-item *ngFor="let state of ['loggedin', 'loggedoff']" class="ion-text-wrap ion-hide-md-up" lines="none">
-                        <ion-label>{{ 'core.settings.' + state | translate }}</ion-label>
-                        <ion-spinner slot="end"
-                            *ngIf="preferences!.enableall && (notification.processorsByName[currentProcessor!.name][state] &&
-                            notification.processorsByName[currentProcessor!.name][state].updating)">
-                        </ion-spinner>
-                        <ion-toggle slot="end"
-                            *ngIf="preferences!.enableall && !notification.processorsByName[currentProcessor!.name].locked"
-                            [(ngModel)]="notification.processorsByName[currentProcessor!.name][state].checked"
-                            (ngModelChange)="changePreference(notification, state)"
-                            [disabled]="notification.processorsByName[currentProcessor!.name][state].updating">
-                        </ion-toggle>
-                        <span slot="end"
-                            *ngIf="preferences!.enableall && notification.processorsByName[currentProcessor!.name].locked"
-                            class="text-gray">
-                            {{'core.settings.locked' | translate }}
-                        </span>
-                        <ion-note slot="end" *ngIf="!preferences!.enableall">{{ 'core.settings.disabled' | translate }}</ion-note>
-                    </ion-item>
-                </ng-container>
-            </ion-card>
-        </ng-container>
+            </ng-container>
+        </ion-card>
     </core-loading>
 </ion-content>
diff --git a/src/addons/notifications/pages/settings/settings.ts b/src/addons/notifications/pages/settings/settings.ts
index 0748db3b5..f87ced644 100644
--- a/src/addons/notifications/pages/settings/settings.ts
+++ b/src/addons/notifications/pages/settings/settings.ts
@@ -54,14 +54,12 @@ export class AddonNotificationsSettingsPage implements OnInit, OnDestroy {
     currentProcessor?: AddonNotificationsPreferencesProcessor;
     preferencesLoaded = false;
     notificationSound = false;
-    notifPrefsEnabled: boolean;
     canChangeSound: boolean;
     processorHandlers: AddonMessageOutputHandlerData[] = [];
 
     protected updateTimeout?: number;
 
     constructor() {
-        this.notifPrefsEnabled = AddonNotifications.isNotificationPreferencesEnabled();
         this.canChangeSound = CoreLocalNotifications.canDisableSound();
     }
 
@@ -73,11 +71,7 @@ export class AddonNotificationsSettingsPage implements OnInit, OnDestroy {
             this.notificationSound = await CoreConfig.get<boolean>(CoreConstants.SETTINGS_NOTIFICATION_SOUND, true);
         }
 
-        if (this.notifPrefsEnabled) {
-            this.fetchPreferences();
-        } else {
-            this.preferencesLoaded = true;
-        }
+        this.fetchPreferences();
     }
 
     /**
diff --git a/src/addons/notifications/services/handlers/cron.ts b/src/addons/notifications/services/handlers/cron.ts
index 828a78fbc..fc8ca5329 100644
--- a/src/addons/notifications/services/handlers/cron.ts
+++ b/src/addons/notifications/services/handlers/cron.ts
@@ -19,7 +19,7 @@ import { CoreCronHandler } from '@services/cron';
 import { CoreSites } from '@services/sites';
 import { makeSingleton } from '@singletons';
 import { CoreEvents } from '@singletons/events';
-import { AddonNotifications, AddonNotificationsProvider } from '../notifications';
+import { AddonNotificationsProvider } from '../notifications';
 
 /**
  * Notifications cron handler.
@@ -44,8 +44,7 @@ export class AddonNotificationsCronHandlerService implements CoreCronHandler {
      * @return Whether it's a synchronization process or not.
      */
     isSync(): boolean {
-        // This is done to use only wifi if using the fallback function.
-        return !AddonNotifications.isPreciseNotificationCountEnabled();
+        return false;
     }
 
     /**
diff --git a/src/addons/notifications/services/handlers/settings.ts b/src/addons/notifications/services/handlers/settings.ts
index a67c415f4..fad86d300 100644
--- a/src/addons/notifications/services/handlers/settings.ts
+++ b/src/addons/notifications/services/handlers/settings.ts
@@ -14,10 +14,8 @@
 
 import { Injectable } from '@angular/core';
 
-import { CoreLocalNotifications } from '@services/local-notifications';
 import { makeSingleton } from '@singletons';
 import { CoreSettingsHandler, CoreSettingsHandlerData } from '@features/settings/services/settings-delegate';
-import { AddonNotifications } from '../notifications';
 
 /**
  * Notifications settings handler.
@@ -36,8 +34,7 @@ export class AddonNotificationsSettingsHandlerService implements CoreSettingsHan
      * @return Whether or not the handler is enabled on a site level.
      */
     async isEnabled(): Promise<boolean> {
-        // Preferences or notification sound setting available.
-        return CoreLocalNotifications.isAvailable() || AddonNotifications.isNotificationPreferencesEnabled();
+        return true;
     }
 
     /**
diff --git a/src/addons/notifications/services/notifications-helper.ts b/src/addons/notifications/services/notifications-helper.ts
index ebea4573a..77adc8eec 100644
--- a/src/addons/notifications/services/notifications-helper.ts
+++ b/src/addons/notifications/services/notifications-helper.ts
@@ -67,7 +67,7 @@ export class AddonNotificationsHelperProvider {
      */
     async getNotifications(
         notifications: AddonNotificationsAnyNotification[],
-        options?: AddonNotificationsGetNotificationsOptions,
+        options?: AddonNotificationsHelperGetNotificationsOptions,
     ): Promise<{notifications: AddonNotificationsAnyNotification[]; canLoadMore: boolean}> {
 
         notifications = notifications || [];
@@ -75,13 +75,11 @@ export class AddonNotificationsHelperProvider {
         options.limit = options.limit || AddonNotificationsProvider.LIST_LIMIT;
         options.siteId = options.siteId || CoreSites.getCurrentSiteId();
 
-        const available = await AddonNotifications.isPopupAvailable(options.siteId);
-
-        if (available) {
+        if (options.onlyPopupNotifications) {
             return AddonNotifications.getPopupNotifications(notifications.length, options);
         }
 
-        // Fallback to get_messages. We need 2 calls, one for read and the other one for unread.
+        // Use get_messages. We need 2 calls, one for read and the other one for unread.
         const unreadFrom = notifications.reduce((total, current) => total + (current.read ? 0 : 1), 0);
 
         const unread = await AddonNotifications.getUnreadNotifications(unreadFrom, options);
@@ -209,3 +207,10 @@ export type AddonNotificationsPreferencesNotificationFormatted = AddonNotificati
 export type AddonNotificationsPreferencesProcessorFormatted = AddonNotificationsPreferencesProcessor & {
     supported?: boolean; // Calculated in the app. Whether the processor is supported in the app.
 };
+
+/**
+ * Options to pass to getNotifications.
+ */
+export type AddonNotificationsHelperGetNotificationsOptions = AddonNotificationsGetNotificationsOptions & {
+    onlyPopupNotifications?: boolean; // Whether to get only popup notifications.
+};
diff --git a/src/addons/notifications/services/notifications.ts b/src/addons/notifications/services/notifications.ts
index aa4cc92bb..38bd4b982 100644
--- a/src/addons/notifications/services/notifications.ts
+++ b/src/addons/notifications/services/notifications.ts
@@ -201,7 +201,6 @@ export class AddonNotificationsProvider {
      * @param offset Position of the first notification to get.
      * @param options Other options.
      * @return Promise resolved with notifications and if can load more.
-     * @since 3.2
      */
     async getPopupNotifications(
         offset: number,
@@ -277,57 +276,29 @@ export class AddonNotificationsProvider {
     async getUnreadNotificationsCount(userId?: number, siteId?: string): Promise<number> {
         const site = await CoreSites.getSite(siteId);
 
-        // @since 3.2
-        if (site.wsAvailable('message_popup_get_unread_popup_notification_count')) {
-            userId = userId || site.getUserId();
-            const params: AddonNotificationsPopupGetUnreadPopupNotificationCountWSParams = {
-                useridto: userId,
-            };
-            const preSets: CoreSiteWSPreSets = {
-                getFromCache: false,
-                emergencyCache: false,
-                saveToCache: false,
-                typeExpected: 'number',
-            };
+        userId = userId || site.getUserId();
+        const params: AddonNotificationsPopupGetUnreadPopupNotificationCountWSParams = {
+            useridto: userId,
+        };
+        const preSets: CoreSiteWSPreSets = {
+            getFromCache: false,
+            emergencyCache: false,
+            saveToCache: false,
+            typeExpected: 'number',
+        };
 
-            try {
-                return await site.read<number>('message_popup_get_unread_popup_notification_count', params, preSets);
-            } catch {
-                // Return no messages if the call fails.
-                return 0;
-            }
-        }
-
-        // Fallback call
         try {
-            const unread = await this.getUnreadNotifications(0, { limit: AddonNotificationsProvider.LIST_LIMIT, siteId });
-
-            // The app used to add a + sign if needed, but 3.1 will be dropped soon so it's easier to always return a number.
-            return unread.length;
+            return await site.read<number>('message_popup_get_unread_popup_notification_count', params, preSets);
         } catch {
             // Return no messages if the call fails.
             return 0;
         }
     }
 
-    /**
-     * Returns whether or not popup WS is available for a certain site.
-     *
-     * @param siteId Site ID. If not defined, current site.
-     * @return Promise resolved with true if available, resolved with false or rejected otherwise.
-     * @since 3.2
-     */
-    async isPopupAvailable(siteId?: string): Promise<boolean> {
-        const site = await CoreSites.getSite(siteId);
-
-        return site.wsAvailable('message_popup_get_popup_notifications');
-    }
-
     /**
      * Mark all message notification as read.
      *
      * @return Resolved when done.
-     * @since 3.2
      */
     async markAllNotificationsAsRead(siteId?: string): Promise<boolean> {
         const site = await CoreSites.getSite(siteId);
@@ -345,7 +316,6 @@ export class AddonNotificationsProvider {
      * @param notificationId ID of notification to mark as read
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when done.
-     * @since 3.5
      */
     async markNotificationRead(
         notificationId: number,
@@ -354,17 +324,12 @@ export class AddonNotificationsProvider {
 
         const site = await CoreSites.getSite(siteId);
 
-        if (site.wsAvailable('core_message_mark_notification_read')) {
-            const params: CoreMessageMarkNotificationReadWSParams = {
-                notificationid: notificationId,
-                timeread: CoreTimeUtils.timestamp(),
-            };
+        const params: CoreMessageMarkNotificationReadWSParams = {
+            notificationid: notificationId,
+            timeread: CoreTimeUtils.timestamp(),
+        };
 
-            return site.write<CoreMessageMarkNotificationReadWSResponse>('core_message_mark_notification_read', params);
-        } else {
-            // Fallback for versions prior to 3.5.
-            return AddonMessages.markMessageRead(notificationId, site.id);
-        }
+        return site.write<CoreMessageMarkNotificationReadWSResponse>('core_message_mark_notification_read', params);
     }
 
     /**
@@ -391,36 +356,6 @@ export class AddonNotificationsProvider {
         await site.invalidateWsCacheForKey(this.getNotificationsCacheKey());
     }
 
-    /**
-     * Returns whether or not we can mark all notifications as read.
-     *
-     * @return True if enabled, false otherwise.
-     * @since 3.2
-     */
-    isMarkAllNotificationsAsReadEnabled(): boolean {
-        return CoreSites.wsAvailableInCurrentSite('core_message_mark_all_notifications_as_read');
-    }
-
-    /**
-     * Returns whether or not we can count unread notifications precisely.
-     *
-     * @return True if enabled, false otherwise.
-     * @since 3.2
-     */
-    isPreciseNotificationCountEnabled(): boolean {
-        return CoreSites.wsAvailableInCurrentSite('message_popup_get_unread_popup_notification_count');
-    }
-
-    /**
-     * Returns whether or not the notification preferences are enabled for the current site.
-     *
-     * @return True if enabled, false otherwise.
-     * @since 3.2
-     */
-    isNotificationPreferencesEnabled(): boolean {
-        return CoreSites.wsAvailableInCurrentSite('core_message_get_user_notification_preferences');
-    }
-
 }
 
 export const AddonNotifications = makeSingleton(AddonNotificationsProvider);
diff --git a/src/addons/privatefiles/pages/index/index.ts b/src/addons/privatefiles/pages/index/index.ts
index b20ad8ad7..b7a6b0da4 100644
--- a/src/addons/privatefiles/pages/index/index.ts
+++ b/src/addons/privatefiles/pages/index/index.ts
@@ -146,14 +146,6 @@ export class AddonPrivateFilesIndexPage implements OnInit, OnDestroy {
      * Upload a new file.
      */
     async uploadFile(): Promise<void> {
-        const canUpload = await AddonPrivateFiles.versionCanUploadFiles();
-
-        if (!canUpload) {
-            CoreDomUtils.showAlertTranslated('core.notice', 'addon.privatefiles.erroruploadnotworking');
-
-            return;
-        }
-
         if (!CoreApp.isOnline()) {
             CoreDomUtils.showErrorModal('core.fileuploader.errormustbeonlinetoupload', true);
 
@@ -198,8 +190,7 @@ export class AddonPrivateFilesIndexPage implements OnInit, OnDestroy {
 
                 this.files = await AddonPrivateFiles.getPrivateFiles();
 
-                if (this.showUpload && AddonPrivateFiles.canGetPrivateFilesInfo() && this.userQuota &&
-                    this.userQuota > 0) {
+                if (this.showUpload && this.userQuota && this.userQuota > 0) {
                     // Get the info to calculate the available size.
                     this.filesInfo = await AddonPrivateFiles.getPrivateFilesInfo();
 
diff --git a/src/addons/privatefiles/services/privatefiles.ts b/src/addons/privatefiles/services/privatefiles.ts
index 0af06f08f..49c29eafc 100644
--- a/src/addons/privatefiles/services/privatefiles.ts
+++ b/src/addons/privatefiles/services/privatefiles.ts
@@ -32,15 +32,6 @@ export class AddonPrivateFilesProvider {
     static readonly PRIVATE_FILES_COMPONENT = 'mmaFilesMy';
     static readonly SITE_FILES_COMPONENT = 'mmaFilesSite';
 
-    /**
-     * Check if core_user_get_private_files_info WS call is available.
-     *
-     * @return Whether the WS is available, false otherwise.
-     */
-    canGetPrivateFilesInfo(): boolean {
-        return CoreSites.wsAvailableInCurrentSite('core_user_get_private_files_info');
-    }
-
     /**
      * Check if user can view his private files.
      *
@@ -396,19 +387,6 @@ export class AddonPrivateFilesProvider {
         return site.write('core_user_add_user_private_files', params, preSets);
     }
 
-    /**
-     * Check the Moodle version in order to check if upload files is working.
-     *
-     * @param siteId Site ID. If not defined, use current site.
-     * @return Promise resolved with true if WS is working, false otherwise.
-     */
-    async versionCanUploadFiles(siteId?: string): Promise<boolean> {
-        const site = await CoreSites.getSite(siteId);
-
-        // Upload private files doesn't work for Moodle 3.1.0 due to a bug.
-        return site.isVersionGreaterEqualThan('3.1.1');
-    }
-
 }
 
 export const AddonPrivateFiles = makeSingleton(AddonPrivateFilesProvider);
diff --git a/src/addons/qtype/ddimageortext/component/ddimageortext.ts b/src/addons/qtype/ddimageortext/component/ddimageortext.ts
index 113a500d4..88d011139 100644
--- a/src/addons/qtype/ddimageortext/component/ddimageortext.ts
+++ b/src/addons/qtype/ddimageortext/component/ddimageortext.ts
@@ -70,7 +70,7 @@ export class AddonQtypeDdImageOrTextComponent extends CoreQuestionBaseComponent
         this.ddQuestion.readOnly = false;
 
         if (this.ddQuestion.initObjects) {
-            // Moodle version <= 3.5.
+            // Moodle version = 3.5.
             if (typeof this.ddQuestion.initObjects.drops != 'undefined') {
                 this.drops = <unknown[]> this.ddQuestion.initObjects.drops;
             }
diff --git a/src/addons/qtype/ddmarker/component/ddmarker.ts b/src/addons/qtype/ddmarker/component/ddmarker.ts
index 8d4942e8f..cc8611b95 100644
--- a/src/addons/qtype/ddmarker/component/ddmarker.ts
+++ b/src/addons/qtype/ddmarker/component/ddmarker.ts
@@ -82,7 +82,7 @@ export class AddonQtypeDdMarkerComponent extends CoreQuestionBaseComponent imple
         this.ddQuestion.readOnly = false;
 
         if (this.ddQuestion.initObjects) {
-            // Moodle version <= 3.5.
+            // Moodle version = 3.5.
             if (typeof this.ddQuestion.initObjects.dropzones != 'undefined') {
                 this.dropZones = <unknown[]> this.ddQuestion.initObjects.dropzones;
             }
diff --git a/src/core/classes/site.ts b/src/core/classes/site.ts
index 8d10c359d..c5a3260f2 100644
--- a/src/core/classes/site.ts
+++ b/src/core/classes/site.ts
@@ -1764,7 +1764,7 @@ export class CoreSite {
      * @return Promise resolved with the converted URL.
      */
     async getAutoLoginUrl(url: string, showModal: boolean = true): Promise<string> {
-        if (!this.privateToken || !this.wsAvailable('tool_mobile_get_autologin_key') || (this.lastAutoLogin &&
+        if (!this.privateToken || (this.lastAutoLogin &&
                 CoreTimeUtils.timestamp() - this.lastAutoLogin < CoreConstants.SECONDS_MINUTE * 6)) {
             // No private token, WS not available or last auto-login was less than 6 minutes ago. Don't change the URL.
             return url;
diff --git a/src/core/directives/external-content.ts b/src/core/directives/external-content.ts
index 188a27ee1..4dd8f719f 100644
--- a/src/core/directives/external-content.ts
+++ b/src/core/directives/external-content.ts
@@ -33,7 +33,7 @@ import { CoreError } from '@classes/errors/error';
  *
  * If a file is downloaded, its URL will be replaced by the local file URL.
  *
- * From v3.5.2 this directive will also download inline styles, so it can be used in any element as long as it has inline styles.
+ * This directive also downloads inline styles, so it can be used in any element as long as it has inline styles.
  */
 @Directive({
     selector: '[core-external-content]',
diff --git a/src/core/directives/format-text.ts b/src/core/directives/format-text.ts
index cfcdfa2c6..719c1845c 100644
--- a/src/core/directives/format-text.ts
+++ b/src/core/directives/format-text.ts
@@ -509,8 +509,6 @@ export class CoreFormatTextDirective implements OnChanges {
      * @return Promise resolved when done.
      */
     protected async treatHTMLElements(div: HTMLElement, site?: CoreSite): Promise<void> {
-        const canTreatVimeo = site?.isVersionGreaterEqualThan(['3.3.4', '3.4']) || false;
-
         const images = Array.from(div.querySelectorAll('img'));
         const anchors = Array.from(div.querySelectorAll('a'));
         const audios = Array.from(div.querySelectorAll('audio'));
@@ -561,7 +559,7 @@ export class CoreFormatTextDirective implements OnChanges {
         });
 
         iframes.forEach((iframe) => {
-            promises.push(this.treatIframe(iframe, site, canTreatVimeo));
+            promises.push(this.treatIframe(iframe, site));
         });
 
         svgImages.forEach((image) => {
@@ -704,13 +702,8 @@ export class CoreFormatTextDirective implements OnChanges {
      *
      * @param iframe Iframe to treat.
      * @param site Site instance.
-     * @param canTreatVimeo Whether Vimeo videos can be treated in the site.
      */
-    protected async treatIframe(
-        iframe: HTMLIFrameElement,
-        site: CoreSite | undefined,
-        canTreatVimeo: boolean,
-    ): Promise<void> {
+    protected async treatIframe(iframe: HTMLIFrameElement, site: CoreSite | undefined): Promise<void> {
         const src = iframe.src;
         const currentSite = CoreSites.getCurrentSite();
 
@@ -736,7 +729,7 @@ export class CoreFormatTextDirective implements OnChanges {
 
         await CoreIframeUtils.fixIframeCookies(src);
 
-        if (site && src && canTreatVimeo) {
+        if (site && src) {
             // Check if it's a Vimeo video. If it is, use the wsplayer script instead to make restricted videos work.
             const matches = iframe.src.match(/https?:\/\/player\.vimeo\.com\/video\/([0-9]+)/);
             if (matches && matches[1]) {
diff --git a/src/core/features/comments/services/comments.ts b/src/core/features/comments/services/comments.ts
index 1c252e21c..094fab2ff 100644
--- a/src/core/features/comments/services/comments.ts
+++ b/src/core/features/comments/services/comments.ts
@@ -536,7 +536,7 @@ export type CoreCommentsArea = {
     canpost: boolean; // Canpost.
     canview: boolean; // Canview.
     count: number; // Count.
-    collapsediconkey: string; // @since 3.3. Collapsediconkey.
+    collapsediconkey: string; // Collapsediconkey.
     displaytotalcount: boolean; // Displaytotalcount.
     displaycancel: boolean; // Displaycancel.
     fullwidth: boolean; // Fullwidth.
diff --git a/src/core/features/course/components/format/core-course-format.html b/src/core/features/course/components/format/core-course-format.html
index 191f9fb11..705b9aeb7 100644
--- a/src/core/features/course/components/format/core-course-format.html
+++ b/src/core/features/course/components/format/core-course-format.html
@@ -177,7 +177,7 @@
         </ion-badge>
 
         <core-download-refresh [status]="section.downloadStatus" [enabled]="downloadEnabled" (action)="prefetch(section)"
-            [loading]="section.isDownloading || section.isCalculating" [canTrustDownload]="section.canCheckUpdates" size="small">
+            [loading]="section.isDownloading || section.isCalculating" [canTrustDownload]="true" size="small">
         </core-download-refresh>
     </div>
 </ng-template>
diff --git a/src/core/features/course/components/module/core-course-module.html b/src/core/features/course/components/module/core-course-module.html
index fc93272c2..bbfebb68c 100644
--- a/src/core/features/course/components/module/core-course-module.html
+++ b/src/core/features/course/components/module/core-course-module.html
@@ -60,7 +60,7 @@
 
                 <div class="core-module-buttons-more">
                     <core-download-refresh [status]="downloadStatus" [enabled]="downloadEnabled"
-                        [canTrustDownload]="canCheckUpdates" [loading]="spinner || module.handlerData.spinner"
+                        [canTrustDownload]="true" [loading]="spinner || module.handlerData.spinner"
                         (action)="download($event)" size="small">
                     </core-download-refresh>
 
diff --git a/src/core/features/course/components/module/module.ts b/src/core/features/course/components/module/module.ts
index 9ae336d9e..5431e5114 100644
--- a/src/core/features/course/components/module/module.ts
+++ b/src/core/features/course/components/module/module.ts
@@ -69,7 +69,6 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy {
     @Output() statusChanged = new EventEmitter<CoreCourseModuleStatusChangedData>(); // Notify when the download status changes.
 
     downloadStatus?: string;
-    canCheckUpdates?: boolean;
     spinner?: boolean; // Whether to display a loading spinner.
     downloadEnabled?: boolean; // Whether the download of sections and modules is enabled.
     modNameTranslated = '';
@@ -108,7 +107,6 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy {
         if (this.module.handlerData.showDownloadButton) {
             // Listen for changes on this module status, even if download isn't enabled.
             this.prefetchHandler = CoreCourseModulePrefetchDelegate.getPrefetchHandlerFor(this.module);
-            this.canCheckUpdates = CoreCourseModulePrefetchDelegate.canCheckUpdates();
 
             this.statusObserver = CoreEvents.on(CoreEvents.PACKAGE_STATUS_CHANGED, (data) => {
                 if (!this.module || data.componentId != this.module.id || !this.prefetchHandler ||
diff --git a/src/core/features/course/pages/contents/contents.ts b/src/core/features/course/pages/contents/contents.ts
index 3bb1ac9fc..2cccc6ecb 100644
--- a/src/core/features/course/pages/contents/contents.ts
+++ b/src/core/features/course/pages/contents/contents.ts
@@ -322,7 +322,7 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
     protected async loadCourseFormatOptions(): Promise<void> {
 
         // Load the course format options when course completion is enabled to show completion progress on sections.
-        if (!this.course.enablecompletion || !CoreCourses.isGetCoursesByFieldAvailable()) {
+        if (!this.course.enablecompletion) {
             return;
         }
 
diff --git a/src/core/features/course/pages/preview/preview.page.ts b/src/core/features/course/pages/preview/preview.page.ts
index 122557ace..b7a6aa5e2 100644
--- a/src/core/features/course/pages/preview/preview.page.ts
+++ b/src/core/features/course/pages/preview/preview.page.ts
@@ -223,12 +223,9 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
 
         if (!CoreSites.getCurrentSite()?.isVersionGreaterEqualThan('3.7')) {
             try {
-                const available = await CoreCourses.isGetCoursesByFieldAvailableInSite();
-                if (available) {
-                    const course = await CoreCourses.getCourseByField('id', this.course!.id);
+                const course = await CoreCourses.getCourseByField('id', this.course!.id);
 
-                    this.course!.customfields = course.customfields;
-                }
+                this.course!.customfields = course.customfields;
             } catch {
                 // Ignore errors.
             }
diff --git a/src/core/features/course/services/course-helper.ts b/src/core/features/course/services/course-helper.ts
index be69290b1..14b7f8241 100644
--- a/src/core/features/course/services/course-helper.ts
+++ b/src/core/features/course/services/course-helper.ts
@@ -36,6 +36,8 @@ import {
     CoreCourseAnyCourseData,
     CoreCourseBasicData,
     CoreCourses,
+    CoreCourseSearchedData,
+    CoreEnrolledCourseData,
 } from '@features/courses/services/courses';
 import { CoreEnrolledCourseDataWithExtraInfoAndOptions } from '@features/courses/services/courses-helper';
 import { CoreArray } from '@singletons/array';
@@ -280,7 +282,7 @@ export class CoreCourseHelperProvider {
         }
 
         sectionWithStatus.downloadStatus = result.status;
-        sectionWithStatus.canCheckUpdates = CoreCourseModulePrefetchDelegate.canCheckUpdates();
+        sectionWithStatus.canCheckUpdates = true;
 
         // Set this section data.
         if (result.status !== CoreConstants.DOWNLOADING) {
@@ -342,7 +344,7 @@ export class CoreCourseHelperProvider {
             if (allSectionsSection) {
                 // Set "All sections" data.
                 allSectionsSection.downloadStatus = allSectionsStatus;
-                allSectionsSection.canCheckUpdates = CoreCourseModulePrefetchDelegate.canCheckUpdates();
+                allSectionsSection.canCheckUpdates = true;
                 allSectionsSection.isDownloading = allSectionsStatus === CoreConstants.DOWNLOADING;
             }
 
@@ -1126,27 +1128,19 @@ export class CoreCourseHelperProvider {
     async getCourse(
         courseId: number,
         siteId?: string,
-    ): Promise<{ enrolled: boolean; course: CoreCourseAnyCourseData }> {
+    ): Promise<{ enrolled: boolean; course: CoreEnrolledCourseData | CoreCourseSearchedData }> {
         siteId = siteId || CoreSites.getCurrentSiteId();
 
-        let course: CoreCourseAnyCourseData;
-
         // Try with enrolled courses first.
         try {
-            course = await CoreCourses.getUserCourse(courseId, false, siteId);
+            const course = await CoreCourses.getUserCourse(courseId, false, siteId);
 
             return ({ enrolled: true, course: course });
         } catch {
             // Not enrolled or an error happened. Try to use another WebService.
         }
 
-        const available = await CoreCourses.isGetCoursesByFieldAvailableInSite(siteId);
-
-        if (available) {
-            course = await CoreCourses.getCourseByField('id', courseId, siteId);
-        } else {
-            course = await CoreCourses.getCourse(courseId, siteId);
-        }
+        const course = await CoreCourses.getCourseByField('id', courseId, siteId);
 
         return ({ enrolled: false, course: course });
     }
@@ -1186,7 +1180,7 @@ export class CoreCourseHelperProvider {
      * @param name Block name to search.
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with true if the block exists or false otherwise.
-     * @since 3.3
+     * @since 3.7
      */
     async hasABlockNamed(courseId: number, name: string, siteId?: string): Promise<boolean> {
         try {
@@ -1483,9 +1477,6 @@ export class CoreCourseHelperProvider {
                 moduleInfo.statusIcon = CoreConstants.ICON_OUTDATED;
                 break;
             case CoreConstants.DOWNLOADED:
-                if (!CoreCourseModulePrefetchDelegate.canCheckUpdates()) {
-                    moduleInfo.statusIcon = CoreConstants.ICON_OUTDATED;
-                }
                 break;
             default:
                 moduleInfo.statusIcon = '';
@@ -1739,9 +1730,7 @@ export class CoreCourseHelperProvider {
             });
 
             // Prefetch other data needed to render the course.
-            if (CoreCourses.isGetCoursesByFieldAvailable()) {
-                promises.push(CoreCourses.getCoursesByField('id', course.id));
-            }
+            promises.push(CoreCourses.getCoursesByField('id', course.id));
 
             const sectionWithModules = sections.find((section) => section.modules && section.modules.length > 0);
             if (!sectionWithModules || typeof sectionWithModules.modules[0].completion == 'undefined') {
@@ -1850,7 +1839,7 @@ export class CoreCourseHelperProvider {
 
             // Set "All sections" data.
             section.downloadStatus = allSectionsStatus;
-            section.canCheckUpdates = CoreCourseModulePrefetchDelegate.canCheckUpdates();
+            section.canCheckUpdates = true;
             section.isDownloading = allSectionsStatus === CoreConstants.DOWNLOADING;
         } finally {
             section.isDownloading = false;
@@ -2092,7 +2081,7 @@ export type CoreCourseSection = Omit<CoreCourseWSSection, 'modules'> & {
  */
 export type CoreCourseSectionWithStatus = CoreCourseSection & {
     downloadStatus?: string; // Section status.
-    canCheckUpdates?: boolean; // Whether can check updates.
+    canCheckUpdates?: boolean; // Whether can check updates. @deprecated since app 4.0
     isDownloading?: boolean; // Whether section is being downloaded.
     total?: number; // Total of modules being downloaded.
     count?: number; // Number of downloaded modules.
diff --git a/src/core/features/course/services/course-options-delegate.ts b/src/core/features/course/services/course-options-delegate.ts
index dc54a21bb..87765a546 100644
--- a/src/core/features/course/services/course-options-delegate.ts
+++ b/src/core/features/course/services/course-options-delegate.ts
@@ -585,8 +585,7 @@ export class CoreCourseOptionsDelegateService extends CoreDelegate<CoreCourseOpt
      * @return Promise resolved when done.
      */
     protected async loadCourseOptions(course: CoreCourseAnyCourseDataWithOptions, refresh = false): Promise<void> {
-        if (CoreCourses.canGetAdminAndNavOptions() &&
-                (typeof course.navOptions == 'undefined' || typeof course.admOptions == 'undefined' || refresh)) {
+        if (typeof course.navOptions == 'undefined' || typeof course.admOptions == 'undefined' || refresh) {
 
             const options = await CoreCourses.getCoursesAdminAndNavOptions([course.id]);
             course.navOptions = options.navOptions[course.id];
diff --git a/src/core/features/course/services/course.ts b/src/core/features/course/services/course.ts
index 8aa879d2c..e115afb9d 100644
--- a/src/core/features/course/services/course.ts
+++ b/src/core/features/course/services/course.ts
@@ -126,7 +126,7 @@ export class CoreCourseProvider {
     canGetCourseBlocks(site?: CoreSite): boolean {
         site = site || CoreSites.getCurrentSite();
 
-        return !!site && site.isVersionGreaterEqualThan('3.7') && site.wsAvailable('core_block_get_course_blocks');
+        return !!site && site.isVersionGreaterEqualThan('3.7');
     }
 
     /**
@@ -134,12 +134,12 @@ export class CoreCourseProvider {
      *
      * @param site Site. If not defined, current site.
      * @return Whether the site supports requesting stealth modules.
-     * @since 3.4.6, 3.5.3, 3.6
+     * @since 3.5.3, 3.6
      */
     canRequestStealthModules(site?: CoreSite): boolean {
         site = site || CoreSites.getCurrentSite();
 
-        return !!site && site.isVersionGreaterEqualThan(['3.4.6', '3.5.3']);
+        return !!site && site.isVersionGreaterEqualThan('3.5.3');
     }
 
     /**
@@ -538,20 +538,11 @@ export class CoreCourseProvider {
     /**
      * Gets a module basic grade info by module ID.
      *
-     * If the user does not have permision to manage the activity false is returned.
-     *
      * @param moduleId Module ID.
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with the module's grade info.
      */
     async getModuleBasicGradeInfo(moduleId: number, siteId?: string): Promise<CoreCourseModuleGradeInfo | undefined> {
-        const site = await CoreSites.getSite(siteId);
-
-        if (!site || !site.isVersionGreaterEqualThan('3.2')) {
-            // On 3.1 won't get grading info and will return undefined. See check bellow.
-            return;
-        }
-
         const info = await this.getModuleBasicInfo(moduleId, siteId);
 
         const grade: CoreCourseModuleGradeInfo = {
@@ -568,7 +559,6 @@ export class CoreCourseProvider {
             typeof grade.advancedgrading != 'undefined' ||
             typeof grade.outcomes != 'undefined'
         ) {
-            // On 3.1 won't get grading info and will return undefined.
             return grade;
         }
 
@@ -1253,12 +1243,12 @@ export type CoreCourseSummary = {
     fullname: string; // Fullname.
     shortname: string; // Shortname.
     idnumber: string; // Idnumber.
-    summary: string; // @since 3.3. Summary.
-    summaryformat: number; // @since 3.3. Summary format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
-    startdate: number; // @since 3.3. Startdate.
-    enddate: number; // @since 3.3. Enddate.
+    summary: string; // Summary.
+    summaryformat: number; // Summary format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
+    startdate: number; // Startdate.
+    enddate: number; // Enddate.
     visible: boolean; // @since 3.8. Visible.
-    fullnamedisplay: string; // @since 3.3. Fullnamedisplay.
+    fullnamedisplay: string; // Fullnamedisplay.
     viewurl: string; // Viewurl.
     courseimage: string; // @since 3.6. Courseimage.
     progress?: number; // @since 3.6. Progress.
@@ -1522,7 +1512,7 @@ export type CoreCourseModuleContentFile = {
 };
 
 /**
- * Course module basic info type. 3.2 onwards.
+ * Course module basic info type.
  */
 export type CoreCourseModuleGradeInfo = {
     grade?: number; // Grade (max value or scale id).
diff --git a/src/core/features/course/services/handlers/default-format.ts b/src/core/features/course/services/handlers/default-format.ts
index e2a8e1e46..c84073a96 100644
--- a/src/core/features/course/services/handlers/default-format.ts
+++ b/src/core/features/course/services/handlers/default-format.ts
@@ -127,9 +127,6 @@ export class CoreCourseFormatDefaultHandler implements CoreCourseFormatHandler {
         if ('marker' in course) {
             // We already have it.
             marker = course.marker;
-        } else if (!CoreCourses.isGetCoursesByFieldAvailable()) {
-            // Cannot get the current section, return all of them.
-            return sections[0];
         } else {
             // Try to retrieve the marker.
             const courseData = await CoreUtils.ignoreErrors(CoreCourses.getCourseByField('id', course.id));
diff --git a/src/core/features/course/services/module-prefetch-delegate.ts b/src/core/features/course/services/module-prefetch-delegate.ts
index cd2ede92b..ff494e60a 100644
--- a/src/core/features/course/services/module-prefetch-delegate.ts
+++ b/src/core/features/course/services/module-prefetch-delegate.ts
@@ -80,9 +80,10 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
      * Check if current site can check updates using core_course_check_updates.
      *
      * @return True if can check updates, false otherwise.
+     * @deprecated since app 4.0
      */
     canCheckUpdates(): boolean {
-        return CoreSites.wsAvailableInCurrentSite('core_course_check_updates');
+        return true;
     }
 
     /**
@@ -166,10 +167,9 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
      *
      * @param module Module.
      * @param status Current status.
-     * @param canCheck True if updates can be checked using core_course_check_updates.
      * @return Module status.
      */
-    determineModuleStatus(module: CoreCourseAnyModuleData, status: string, canCheck?: boolean): string {
+    determineModuleStatus(module: CoreCourseAnyModuleData, status: string): string {
         const handler = this.getPrefetchHandlerFor(module);
         const siteId = CoreSites.getCurrentSiteId();
 
@@ -186,9 +186,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
             }
         } else if (handler.determineStatus) {
             // The handler implements a determineStatus function. Apply it.
-            canCheck = canCheck ?? this.canCheckUpdates();
-
-            return handler.determineStatus(module, status, canCheck);
+            return handler.determineStatus(module, status, true);
         }
 
         return status;
@@ -224,10 +222,6 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
      *         checked for that module in the current site.
      */
     async getCourseUpdates(modules: CoreCourseWSModule[], courseId: number): Promise<CourseUpdates> {
-        if (!this.canCheckUpdates()) {
-            throw new CoreError('Cannot check course updates.');
-        }
-
         // Check if there's already a getCourseUpdates in progress.
         const id = <string> Md5.hashAsciiStr(courseId + '#' + JSON.stringify(modules));
         const siteId = CoreSites.getCurrentSiteId();
@@ -334,10 +328,6 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
      * @return Promise resolved with the updates.
      */
     async getCourseUpdatesByCourseId(courseId: number): Promise<CourseUpdates> {
-        if (!this.canCheckUpdates()) {
-            throw new CoreError('Cannot check course updates.');
-        }
-
         // Get course sections and all their modules.
         const sections = await CoreCourse.getSections(courseId, false, true, { omitExpires: true });
 
@@ -558,7 +548,6 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
         sectionId?: number,
     ): Promise<string> {
         const handler = this.getPrefetchHandlerFor(module);
-        const canCheck = this.canCheckUpdates();
 
         if (!handler) {
             // No handler found, module not downloadable.
@@ -572,7 +561,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
         if (!refresh && typeof status != 'undefined') {
             this.storeCourseAndSection(packageId, courseId, sectionId);
 
-            return this.determineModuleStatus(module, status, canCheck);
+            return this.determineModuleStatus(module, status);
         }
 
         const result = await this.calculateModuleStatus(handler, module, courseId, updates, sectionId);
@@ -580,7 +569,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
             this.updateStatusCache(result.status, handler.component, module.id, courseId, sectionId);
         }
 
-        return this.determineModuleStatus(module, result.status, canCheck);
+        return this.determineModuleStatus(module, result.status);
     }
 
     /**
@@ -612,10 +601,9 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
 
         // Get the saved package status.
         const siteId = CoreSites.getCurrentSiteId();
-        const canCheck = this.canCheckUpdates();
         const currentStatus = await CoreFilepool.getPackageStatus(siteId, handler.component, module.id);
 
-        let status = handler.determineStatus ? handler.determineStatus(module, currentStatus, canCheck) : currentStatus;
+        let status = handler.determineStatus ? handler.determineStatus(module, currentStatus, true) : currentStatus;
         if (status != CoreConstants.DOWNLOADED || updates === false) {
             return {
                 status,
@@ -677,7 +665,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
             const status = this.statusCache.getValue<string>(packageId, 'status', true);
 
             return {
-                status: this.determineModuleStatus(module, status || CoreConstants.NOT_DOWNLOADED, canCheck),
+                status: this.determineModuleStatus(module, status || CoreConstants.NOT_DOWNLOADED),
                 updateStatus: true,
             };
         }
@@ -1441,10 +1429,10 @@ export interface CoreCourseModulePrefetchHandler extends CoreDelegateHandler {
      *
      * @param module Module.
      * @param status The current status.
-     * @param canCheck Whether the site allows checking for updates.
+     * @param canCheck Whether the site allows checking for updates. This parameter was deprecated since app 4.0.
      * @return Status to display.
      */
-    determineStatus?(module: CoreCourseAnyModuleData, status: string, canCheck: boolean): string;
+    determineStatus?(module: CoreCourseAnyModuleData, status: string, canCheck: true): string;
 
     /**
      * Get the downloaded size of a module. If not defined, we'll use getFiles to calculate it (it can be slow).
diff --git a/src/core/features/courses/pages/my-courses/my-courses.ts b/src/core/features/courses/pages/my-courses/my-courses.ts
index c7697acb8..576d7e8df 100644
--- a/src/core/features/courses/pages/my-courses/my-courses.ts
+++ b/src/core/features/courses/pages/my-courses/my-courses.ts
@@ -105,13 +105,11 @@ export class CoreCoursesMyCoursesPage implements OnInit, OnDestroy {
 
             await CoreCoursesHelper.loadCoursesExtraInfo(courses);
 
-            if (CoreCourses.canGetAdminAndNavOptions()) {
-                const options = await CoreCourses.getCoursesAdminAndNavOptions(courseIds);
-                courses.forEach((course) => {
-                    course.navOptions = options.navOptions[course.id];
-                    course.admOptions = options.admOptions[course.id];
-                });
-            }
+            const options = await CoreCourses.getCoursesAdminAndNavOptions(courseIds);
+            courses.forEach((course) => {
+                course.navOptions = options.navOptions[course.id];
+                course.admOptions = options.admOptions[course.id];
+            });
 
             this.courses = courses;
             this.filteredCourses = this.courses;
diff --git a/src/core/features/courses/services/courses-helper.ts b/src/core/features/courses/services/courses-helper.ts
index 158cf018d..f5e1aaec5 100644
--- a/src/core/features/courses/services/courses-helper.ts
+++ b/src/core/features/courses/services/courses-helper.ts
@@ -109,8 +109,7 @@ export class CoreCoursesHelperProvider {
             return;
         }));
 
-        if (CoreCourses.isGetCoursesByFieldAvailable() && (loadCategoryNames ||
-                (typeof courses[0].overviewfiles == 'undefined' && typeof courses[0].displayname == 'undefined'))) {
+        if (loadCategoryNames || (courses[0].overviewfiles === undefined && courses[0].displayname === undefined)) {
             const courseIds = courses.map((course) => course.id).join(',');
 
             courseInfoAvailable = true;
@@ -196,17 +195,15 @@ export class CoreCoursesHelperProvider {
         const promises: Promise<void>[] = [];
         const courseIds = courses.map((course) => course.id);
 
-        if (CoreCourses.canGetAdminAndNavOptions()) {
-            // Load course options of the course.
-            promises.push(CoreCourses.getCoursesAdminAndNavOptions(courseIds).then((options) => {
-                courses.forEach((course) => {
-                    course.navOptions = options.navOptions[course.id];
-                    course.admOptions = options.admOptions[course.id];
-                });
+        // Load course options of the course.
+        promises.push(CoreCourses.getCoursesAdminAndNavOptions(courseIds).then((options) => {
+            courses.forEach((course) => {
+                course.navOptions = options.navOptions[course.id];
+                course.admOptions = options.admOptions[course.id];
+            });
 
-                return;
-            }));
-        }
+            return;
+        }));
 
         promises.push(this.loadCoursesExtraInfo(courses, loadCategoryNames));
 
diff --git a/src/core/features/courses/services/courses.ts b/src/core/features/courses/services/courses.ts
index 1af2c4d65..f16b0e41a 100644
--- a/src/core/features/courses/services/courses.ts
+++ b/src/core/features/courses/services/courses.ts
@@ -72,10 +72,10 @@ export class CoreCoursesProvider {
      * Whether current site supports getting course options.
      *
      * @return Whether current site supports getting course options.
+     * @deprecated since app 4.0
      */
     canGetAdminAndNavOptions(): boolean {
-        return CoreSites.wsAvailableInCurrentSite('core_course_get_user_navigation_options') &&
-                CoreSites.wsAvailableInCurrentSite('core_course_get_user_administration_options');
+        return true;
     }
 
     /**
@@ -461,7 +461,6 @@ export class CoreCoursesProvider {
      * @param value The value to match.
      * @param siteId Site ID. If not defined, use current site.
      * @return Promise resolved with the first course.
-     * @since 3.2
      */
     async getCourseByField(field?: string, value?: string | number, siteId?: string): Promise<CoreCourseSearchedData> {
         const courses = await this.getCoursesByField(field, value, siteId);
@@ -485,7 +484,6 @@ export class CoreCoursesProvider {
      * @param value The value to match.
      * @param siteId Site ID. If not defined, use current site.
      * @return Promise resolved with the courses.
-     * @since 3.2
      */
     async getCoursesByField(
         field: string = '',
@@ -593,27 +591,21 @@ export class CoreCoursesProvider {
     /**
      * Check if get courses by field WS is available in a certain site.
      *
-     * @param site Site to check.
      * @return Whether get courses by field is available.
-     * @since 3.2
+     * @deprecated since app 4.0
      */
-    isGetCoursesByFieldAvailable(site?: CoreSite): boolean {
-        site = site || CoreSites.getCurrentSite();
-
-        return !!site && site.wsAvailable('core_course_get_courses_by_field');
+    isGetCoursesByFieldAvailable(): boolean {
+        return true;
     }
 
     /**
      * Check if get courses by field WS is available in a certain site, by site ID.
      *
-     * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with boolean: whether get courses by field is available.
-     * @since 3.2
+     * @deprecated since app 4.0
      */
-    async isGetCoursesByFieldAvailableInSite(siteId?: string): Promise<boolean> {
-        const site = await CoreSites.getSite(siteId);
-
-        return this.isGetCoursesByFieldAvailable(site);
+    async isGetCoursesByFieldAvailableInSite(): Promise<boolean> {
+        return true;
     }
 
     /**
@@ -1069,8 +1061,7 @@ export class CoreCoursesProvider {
      * Check if WS to retrieve guest enrolment data is available.
      *
      * @return Whether guest WS is available.
-     * @since 3.1
-     * @deprecated Will always return true since it's available since 3.1.
+     * @deprecated since app 3.9.5
      */
     isGuestWSAvailable(): boolean {
         return true;
diff --git a/src/core/features/courses/services/handlers/courses-index-link.ts b/src/core/features/courses/services/handlers/courses-index-link.ts
index 1f273fa87..500287239 100644
--- a/src/core/features/courses/services/handlers/courses-index-link.ts
+++ b/src/core/features/courses/services/handlers/courses-index-link.ts
@@ -18,7 +18,6 @@ import { CoreContentLinksHandlerBase } from '@features/contentlinks/classes/base
 import { CoreContentLinksAction } from '@features/contentlinks/services/contentlinks-delegate';
 import { CoreNavigator } from '@services/navigator';
 import { makeSingleton } from '@singletons';
-import { CoreCourses } from '../courses';
 import { CoreCoursesMyCoursesHomeHandlerService } from './my-courses-home';
 
 /**
@@ -44,15 +43,10 @@ export class CoreCoursesIndexLinkHandlerService extends CoreContentLinksHandlerB
             action: (siteId): void => {
                 let pageName = CoreCoursesMyCoursesHomeHandlerService.PAGE_NAME;
 
-                if (CoreCourses.isGetCoursesByFieldAvailable()) {
-                    if (params.categoryid) {
-                        pageName += '/categories/' + params.categoryid;
-                    } else {
-                        pageName += '/all';
-                    }
+                if (params.categoryid) {
+                    pageName += '/categories/' + params.categoryid;
                 } else {
-                    // By default, go to My Courses.
-                    pageName += '/my';
+                    pageName += '/all';
                 }
 
                 CoreNavigator.navigateToSitePath(pageName, { siteId });
diff --git a/src/core/features/filter/services/filter.ts b/src/core/features/filter/services/filter.ts
index b5139a92f..4b7dd89ca 100644
--- a/src/core/features/filter/services/filter.ts
+++ b/src/core/features/filter/services/filter.ts
@@ -63,27 +63,21 @@ export class CoreFilterProvider {
     /**
      * Returns whether or not WS get available in context is available.
      *
-     * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with true if ws is available, false otherwise.
-     * @since 3.4
+     * @deprecated since app 4.0
      */
-    async canGetAvailableInContext(siteId?: string): Promise<boolean> {
-        const site = await CoreSites.getSite(siteId);
-
-        return this.canGetAvailableInContextInSite(site);
+    async canGetAvailableInContext(): Promise<boolean> {
+        return true;
     }
 
     /**
      * Returns whether or not WS get available in context is available in a certain site.
      *
-     * @param site Site. If not defined, current site.
      * @return Promise resolved with true if ws is available, false otherwise.
-     * @since 3.4
+     * @deprecated since app 4.0
      */
-    canGetAvailableInContextInSite(site?: CoreSite): boolean {
-        site = site || CoreSites.getCurrentSite();
-
-        return !!(site?.wsAvailable('core_filters_get_available_in_context'));
+    canGetAvailableInContextInSite(): boolean {
+        return true;
     }
 
     /**
@@ -93,10 +87,9 @@ export class CoreFilterProvider {
      * @return Promise resolved with boolean: whethe can get filters.
      */
     async canGetFilters(siteId?: string): Promise<boolean> {
-        const wsAvailable = await this.canGetAvailableInContext(siteId);
         const disabled = await this.checkFiltersDisabled(siteId);
 
-        return wsAvailable && !disabled;
+        return !disabled;
     }
 
     /**
@@ -106,7 +99,7 @@ export class CoreFilterProvider {
      * @return Promise resolved with boolean: whethe can get filters.
      */
     canGetFiltersInSite(site?: CoreSite): boolean {
-        return this.canGetAvailableInContextInSite(site) && this.checkFiltersDisabledInSite(site);
+        return this.checkFiltersDisabledInSite(site);
     }
 
     /**
diff --git a/src/core/features/grades/services/grades-helper.ts b/src/core/features/grades/services/grades-helper.ts
index 809566334..3d003415b 100644
--- a/src/core/features/grades/services/grades-helper.ts
+++ b/src/core/features/grades/services/grades-helper.ts
@@ -231,11 +231,7 @@ export class CoreGradesHelperProvider {
 
         // If any course wasn't found, make a network request.
         if (coursesWereMissing) {
-            const coursesPromise = CoreCourses.isGetCoursesByFieldAvailable()
-                ? CoreCourses.getCoursesByField('ids', grades.map((grade) => grade.courseid).join(','))
-                : CoreCourses.getUserCourses(undefined, undefined, CoreSitesReadingStrategy.PREFER_NETWORK);
-
-            const courses = await coursesPromise;
+            const courses = await CoreCourses.getCoursesByField('ids', grades.map((grade) => grade.courseid).join(','));
             const coursesMap =
                 CoreUtils.arrayToObject(courses as Record<string, unknown>[], 'id') as
                     Record<string, CoreEnrolledCourseData> |
@@ -337,18 +333,9 @@ export class CoreGradesHelperProvider {
         groupId?: number,
         siteId?: string,
         ignoreCache: boolean = false,
-    ): Promise<CoreGradesFormattedItem[] | CoreGradesFormattedRow[]> {
+    ): Promise<CoreGradesFormattedItem[]> {
         const grades = await CoreGrades.getGradeItems(courseId, userId, groupId, siteId, ignoreCache);
 
-        if (!grades) {
-            throw new CoreError('Couldn\'t get grade module items');
-        }
-
-        if ('tabledata' in grades) {
-            // 3.1 Table format.
-            return this.getModuleGradesTableRows(grades, moduleId);
-        }
-
         return grades.filter((item) => item.cmid == moduleId).map((item) => this.formatGradeItem(item));
     }
 
@@ -419,6 +406,7 @@ export class CoreGradesHelperProvider {
      * @param table JSON object representing a table with data.
      * @param moduleId Grade Object identifier.
      * @return Formatted HTML table.
+     * @deprecated since app 4.0
      */
     getModuleGradesTableRows(table: CoreGradesTable, moduleId: number): CoreGradesFormattedRow[] {
         if (!table.tabledata) {
@@ -470,14 +458,7 @@ export class CoreGradesHelperProvider {
                 throw new CoreError('Invalid moduleId');
             }
 
-            // Try to open the module grade directly. Check if it's possible.
-            const grades = await CoreGrades.isGradeItemsAvailable(siteId);
-
-            if (!grades) {
-                throw new CoreError('No grades found.');
-            }
-
-            // Can get grades. Do it.
+            // Try to open the module grade directly.
             const items = await CoreGrades.getGradeItems(courseId, userId, undefined, siteId);
 
             // Find the item of the module.
@@ -543,11 +524,7 @@ export class CoreGradesHelperProvider {
         const site = await CoreSites.getSite(siteId);
         userId = userId || site.getUserId();
 
-        const enabled = await CoreGrades.isGradeItemsAvailable(siteId);
-
-        return enabled
-            ? CoreGrades.invalidateCourseGradesItemsData(courseId, userId, groupId, siteId)
-            : CoreGrades.invalidateCourseGradesData(courseId, userId, siteId);
+        return CoreGrades.invalidateCourseGradesItemsData(courseId, userId, groupId, siteId);
     }
 
     /**
diff --git a/src/core/features/grades/services/grades.ts b/src/core/features/grades/services/grades.ts
index ad28b605e..00280957d 100644
--- a/src/core/features/grades/services/grades.ts
+++ b/src/core/features/grades/services/grades.ts
@@ -87,7 +87,6 @@ export class CoreGradesProvider {
 
     /**
      * Get the grade items for a certain module. Keep in mind that may have more than one item to include outcomes and scales.
-     * Fallback function only used if 'gradereport_user_get_grade_items' WS is not available Moodle < 3.2.
      *
      * @param courseId ID of the course to get the grades from.
      * @param userId ID of the user to get the grades from. If not defined use site's current user.
@@ -102,26 +101,14 @@ export class CoreGradesProvider {
         groupId?: number,
         siteId?: string,
         ignoreCache: boolean = false,
-    ): Promise<CoreGradesGradeItem[] | CoreGradesTable> {
+    ): Promise<CoreGradesGradeItem[]> {
         siteId = siteId || CoreSites.getCurrentSiteId();
 
         const site = await CoreSites.getSite(siteId);
 
         userId = userId || site.getUserId();
 
-        const enabled = await this.isGradeItemsAvailable(siteId);
-
-        if (enabled) {
-            try {
-                const items = await this.getCourseGradesItems(courseId, userId, groupId, siteId, ignoreCache);
-
-                return items;
-            } catch {
-                // Ignore while solving MDL-57255 (fixed on 3.2.1)
-            }
-        }
-
-        return this.getCourseGradesTable(courseId, userId, siteId, ignoreCache);
+        return await this.getCourseGradesItems(courseId, userId, groupId, siteId, ignoreCache);
     }
 
     /**
@@ -307,16 +294,11 @@ export class CoreGradesProvider {
      *
      * @param siteId Site ID. If not defined, current site.
      * @return Resolve with true if plugin is enabled, false otherwise.
-     * @since Moodle 3.2
      */
     async isCourseGradesEnabled(siteId?: string): Promise<boolean> {
         const site = await CoreSites.getSite(siteId);
 
-        if (!site.wsAvailable('gradereport_overview_get_course_grades')) {
-            return false;
-        }
-
-        // Now check that the configurable mygradesurl is pointing to the gradereport_overview plugin.
+        // Check that the configurable mygradesurl is pointing to the gradereport_overview plugin.
         const url = site.getStoredConfig('mygradesurl') || '';
 
         return url.indexOf('/grade/report/overview/') !== -1;
@@ -344,12 +326,10 @@ export class CoreGradesProvider {
      *
      * @param siteId Site ID. If not defined, current site.
      * @return True if ws is available, false otherwise.
-     * @since Moodle 3.2
+     * @deprecated since app 4.0
      */
-    async isGradeItemsAvailable(siteId?: string): Promise<boolean> {
-        const site = await CoreSites.getSite(siteId);
-
-        return site.wsAvailable('gradereport_user_get_grade_items');
+    async isGradeItemsAvailable(): Promise<boolean> {
+        return true;
     }
 
     /**
diff --git a/src/core/features/login/pages/site-policy/site-policy.ts b/src/core/features/login/pages/site-policy/site-policy.ts
index f4804322b..d58ee4c4e 100644
--- a/src/core/features/login/pages/site-policy/site-policy.ts
+++ b/src/core/features/login/pages/site-policy/site-policy.ts
@@ -55,8 +55,8 @@ export class CoreLoginSitePolicyPage implements OnInit {
         const currentSiteId = this.currentSite.id;
         this.siteId = this.siteId || currentSiteId;
 
-        if (this.siteId != currentSiteId || !this.currentSite.wsAvailable('core_user_agree_site_policy')) {
-            // Not current site or WS not available, stop.
+        if (this.siteId != currentSiteId) {
+            // Not current site, stop.
             this.cancel();
 
             return;
diff --git a/src/core/features/login/services/login-helper.ts b/src/core/features/login/services/login-helper.ts
index afa90857d..91d95ff1f 100644
--- a/src/core/features/login/services/login-helper.ts
+++ b/src/core/features/login/services/login-helper.ts
@@ -1127,11 +1127,6 @@ export class CoreLoginHelperProvider {
             return;
         }
 
-        if (!CoreSites.wsAvailableInCurrentSite('core_user_agree_site_policy')) {
-            // WS not available, stop.
-            return;
-        }
-
         // If current page is already site policy, stop.
         if (CoreNavigator.isCurrent('/login/sitepolicy')) {
             return;
diff --git a/src/core/features/rating/components/rate/rate.ts b/src/core/features/rating/components/rate/rate.ts
index 07f7ee309..55f489c7f 100644
--- a/src/core/features/rating/components/rate/rate.ts
+++ b/src/core/features/rating/components/rate/rate.ts
@@ -75,7 +75,7 @@ export class CoreRatingRateComponent implements OnChanges, OnDestroy {
         this.item = (this.ratingInfo.ratings || []).find((rating) => rating.itemid == this.itemId);
         this.scale = (this.ratingInfo.scales || []).find((scale) => scale.id == this.scaleId);
 
-        if (!this.item || !this.scale || !CoreRating.isAddRatingWSAvailable()) {
+        if (!this.item || !this.scale) {
             this.item = undefined;
 
             return;
diff --git a/src/core/features/rating/services/rating.ts b/src/core/features/rating/services/rating.ts
index 25642d32a..482ebcb5a 100644
--- a/src/core/features/rating/services/rating.ts
+++ b/src/core/features/rating/services/rating.ts
@@ -47,11 +47,11 @@ export class CoreRatingProvider {
     /**
      * Returns whether the web serivce to add ratings is available.
      *
-     * @return If WS is abalaible.
-     * @since 3.2
+     * @return If WS is available.
+     * @deprecated since app 4.0
      */
     isAddRatingWSAvailable(): boolean {
-        return CoreSites.wsAvailableInCurrentSite('core_rating_add_rating');
+        return true;
     }
 
     /**
@@ -70,7 +70,6 @@ export class CoreRatingProvider {
      * @param aggregateMethod Aggregate method.
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with the aggregated rating or void if stored offline.
-     * @since 3.2
      */
     async addRating(
         component: string,
@@ -162,7 +161,6 @@ export class CoreRatingProvider {
      * @param aggregateMethod Aggregate method.
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with the aggregated rating.
-     * @since 3.2
      */
     async addRatingOnline(
         component: string,
diff --git a/src/core/features/sitehome/services/sitehome.ts b/src/core/features/sitehome/services/sitehome.ts
index 4d45d10d8..8cb52346d 100644
--- a/src/core/features/sitehome/services/sitehome.ts
+++ b/src/core/features/sitehome/services/sitehome.ts
@@ -171,8 +171,8 @@ export class CoreSiteHomeProvider {
                 case FrontPageItemNames['LIST_OF_CATEGORIES']:
                 case FrontPageItemNames['COMBO_LIST']:
                 case FrontPageItemNames['LIST_OF_COURSE']:
-                    add = CoreCourses.isGetCoursesByFieldAvailable();
-                    if (add && itemNumber == FrontPageItemNames['COMBO_LIST']) {
+                    add = true;
+                    if (itemNumber == FrontPageItemNames['COMBO_LIST']) {
                         itemNumber = FrontPageItemNames['LIST_OF_CATEGORIES'];
                     }
                     break;
diff --git a/src/core/features/siteplugins/services/siteplugins.ts b/src/core/features/siteplugins/services/siteplugins.ts
index e0aa2e9d5..984c8cfe5 100644
--- a/src/core/features/siteplugins/services/siteplugins.ts
+++ b/src/core/features/siteplugins/services/siteplugins.ts
@@ -292,11 +292,6 @@ export class CoreSitePluginsProvider {
     async getPlugins(siteId?: string): Promise<CoreSitePluginsPlugin[]> {
         const site = await CoreSites.getSite(siteId);
 
-        if (!CoreSitePlugins.isGetContentAvailable(site)) {
-            // Cannot load site plugins, so there's no point to fetch them.
-            return [];
-        }
-
         // Get the list of plugins. Try not to use cache.
         const data = await site.read<CoreSitePluginsGetPluginsSupportingMobileWSResponse>(
             'tool_mobile_get_plugins_supporting_mobile',
@@ -371,12 +366,10 @@ export class CoreSitePluginsProvider {
     /**
      * Check if the get content WS is available.
      *
-     * @param site The site to check. If not defined, current site.
+     * @deprecated since app 4.0
      */
-    isGetContentAvailable(site?: CoreSite): boolean {
-        site = site || CoreSites.getCurrentSite();
-
-        return !!site?.wsAvailable('tool_mobile_get_content');
+    isGetContentAvailable(): boolean {
+        return true;
     }
 
     /**
diff --git a/src/core/features/tag/services/tag.ts b/src/core/features/tag/services/tag.ts
index 4d1d6bd77..a4e3f6128 100644
--- a/src/core/features/tag/services/tag.ts
+++ b/src/core/features/tag/services/tag.ts
@@ -47,6 +47,7 @@ export class CoreTagProvider {
      *
      * @param site Site. If not defined, use current site.
      * @return True if available.
+     * @since 3.7
      */
     areTagsAvailableInSite(site?: CoreSite): boolean {
         site = site || CoreSites.getCurrentSite();
diff --git a/src/core/features/user/pages/profile/profile.page.ts b/src/core/features/user/pages/profile/profile.page.ts
index f40c7a053..081bfbf72 100644
--- a/src/core/features/user/pages/profile/profile.page.ts
+++ b/src/core/features/user/pages/profile/profile.page.ts
@@ -96,7 +96,6 @@ export class CoreUserProfilePage implements OnInit, OnDestroy {
             (!this.courseId || this.courseId == this.site.getSiteHomeId()) &&
             this.userId == this.site.getUserId() &&
             this.site.canUploadFiles() &&
-            CoreUser.canUpdatePictureInSite(this.site) &&
             !CoreUser.isUpdatePictureDisabledInSite(this.site);
 
         try {
diff --git a/src/core/features/user/services/user-delegate.ts b/src/core/features/user/services/user-delegate.ts
index 38c11a9c3..5901fa17d 100644
--- a/src/core/features/user/services/user-delegate.ts
+++ b/src/core/features/user/services/user-delegate.ts
@@ -270,22 +270,17 @@ export class CoreUserDelegateService extends CoreDelegate<CoreUserProfileHandler
      * @return Promise resolved when done.
      */
     protected async calculateUserHandlers(user: CoreUserProfile, courseId?: number): Promise<void> {
-        let navOptions: CoreCourseUserAdminOrNavOptionIndexed | undefined;
-        let admOptions: CoreCourseUserAdminOrNavOptionIndexed | undefined;
+        // Get course options.
+        const courses = await CoreCourses.getUserCourses(true);
+        const courseIds = courses.map((course) => course.id);
 
-        if (CoreCourses.canGetAdminAndNavOptions()) {
-            // Get course options.
-            const courses = await CoreCourses.getUserCourses(true);
-            const courseIds = courses.map((course) => course.id);
+        const options = await CoreCourses.getCoursesAdminAndNavOptions(courseIds);
 
-            const options = await CoreCourses.getCoursesAdminAndNavOptions(courseIds);
+        // For backwards compatibility we don't modify the courseId.
+        const courseIdForOptions = courseId || CoreSites.getCurrentSiteHomeId();
 
-            // For backwards compatibility we don't modify the courseId.
-            const courseIdForOptions = courseId || CoreSites.getCurrentSiteHomeId();
-
-            navOptions = options.navOptions[courseIdForOptions];
-            admOptions = options.admOptions[courseIdForOptions];
-        }
+        const navOptions = options.navOptions[courseIdForOptions];
+        const admOptions = options.admOptions[courseIdForOptions];
 
         const userData = this.userHandlers[user.id];
         userData.handlers = [];
diff --git a/src/core/features/user/services/user.ts b/src/core/features/user/services/user.ts
index 6dfc08bfa..23cf37c5b 100644
--- a/src/core/features/user/services/user.ts
+++ b/src/core/features/user/services/user.ts
@@ -110,27 +110,21 @@ export class CoreUserProvider {
     /**
      * Check if WS to update profile picture is available in site.
      *
-     * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with boolean: whether it's available.
-     * @since 3.2
+     * @deprecated since app 4.0
      */
-    async canUpdatePicture(siteId?: string): Promise<boolean> {
-        const site = await CoreSites.getSite(siteId);
-
-        return this.canUpdatePictureInSite(site);
+    async canUpdatePicture(): Promise<boolean> {
+        return true;
     }
 
     /**
      * Check if WS to search participants is available in site.
      *
-     * @param site Site. If not defined, current site.
      * @return Whether it's available.
-     * @since 3.2
+     * @deprecated since app 4.0
      */
-    canUpdatePictureInSite(site?: CoreSite): boolean {
-        site = site || CoreSites.getCurrentSite();
-
-        return !!site?.wsAvailable('core_user_update_picture');
+    canUpdatePictureInSite(): boolean {
+        return true;
     }
 
     /**
diff --git a/src/core/services/sites.ts b/src/core/services/sites.ts
index 25dc84381..ee1b5c434 100644
--- a/src/core/services/sites.ts
+++ b/src/core/services/sites.ts
@@ -1481,11 +1481,6 @@ export class CoreSitesProvider {
      * @return Promise resolved with config if available.
      */
     protected async getSiteConfig(site: CoreSite): Promise<CoreSiteConfig | undefined> {
-        if (!site.wsAvailable('tool_mobile_get_config')) {
-            // WS not available, cannot get config.
-            return;
-        }
-
         return await site.getConfig(undefined, true);
     }
 

From 705f7ce92d49c76e82f644ea852af31e04828c2e Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 3 Sep 2021 13:33:03 +0200
Subject: [PATCH 0075/1008] MOBILE-3819 core: Remove local_mobile support

---
 moodle.config.json                            |   1 -
 scripts/langindex.json                        |   1 -
 src/core/classes/site.ts                      | 133 ++-----------
 src/core/constants.ts                         |   2 +-
 src/core/features/login/lang.json             |   1 -
 .../login/pages/credentials/credentials.ts    |   6 +-
 .../login/pages/email-signup/email-signup.ts  |   3 +-
 src/core/features/login/pages/site/site.ts    |   4 -
 .../features/login/services/login-helper.ts   |  23 +--
 .../settings/services/settings-helper.ts      |  22 ---
 src/core/services/sites.ts                    | 177 ++++++------------
 src/types/config.d.ts                         |   1 -
 12 files changed, 87 insertions(+), 287 deletions(-)

diff --git a/moodle.config.json b/moodle.config.json
index af5ee4d0d..99348b609 100644
--- a/moodle.config.json
+++ b/moodle.config.json
@@ -62,7 +62,6 @@
         "zh-tw": "正體中文"
     },
     "wsservice": "moodle_mobile_app",
-    "wsextservice": "local_mobile",
     "demo_sites": {
         "student": {
             "url": "https:\/\/school.moodledemo.net",
diff --git a/scripts/langindex.json b/scripts/langindex.json
index 80e114b51..3c46978e7 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1851,7 +1851,6 @@
   "core.login.invalidurl": "scorm",
   "core.login.invalidvaluemax": "local_moodlemobileapp",
   "core.login.invalidvaluemin": "local_moodlemobileapp",
-  "core.login.localmobileunexpectedresponse": "local_moodlemobileapp",
   "core.login.loggedoutssodescription": "local_moodlemobileapp",
   "core.login.login": "moodle",
   "core.login.loginbutton": "local_moodlemobileapp",
diff --git a/src/core/classes/site.ts b/src/core/classes/site.ts
index c5a3260f2..c3593943a 100644
--- a/src/core/classes/site.ts
+++ b/src/core/classes/site.ts
@@ -485,9 +485,6 @@ export class CoreSite {
      *
      * Caching is also implemented, when enabled this method will returned a cached version of the request if the
      * data hasn't expired.
-     *
-     * This method is smart which means that it will try to map the method to a compatibility one if need be, usually this
-     * means that it will fallback on the 'local_mobile_' prefixed function if it is available and the non-prefixed is not.
      */
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     async request<T = unknown>(method: string, data: any, preSets: CoreSiteWSPreSets, retrying?: boolean): Promise<T> {
@@ -505,18 +502,12 @@ export class CoreSite {
             throw new CoreError(Translate.instant('core.errorofflinedisabled'));
         }
 
-        // Check if the method is available, use a prefixed version if possible.
+        // Check if the method is available.
         // We ignore this check when we do not have the site info, as the list of functions is not loaded yet.
-        if (this.getInfo() && !this.wsAvailable(method, false)) {
-            const compatibilityMethod = CoreConstants.WS_PREFIX + method;
-            if (this.wsAvailable(compatibilityMethod, false)) {
-                this.logger.info(`Using compatibility WS method '${compatibilityMethod}'`);
-                method = compatibilityMethod;
-            } else {
-                this.logger.error(`WS function '${method}' is not available, even in compatibility mode.`);
+        if (this.getInfo() && !this.wsAvailable(method)) {
+            this.logger.error(`WS function '${method}' is not available.`);
 
-                throw new CoreError(Translate.instant('core.wsfunctionnotavailable'));
-            }
+            throw new CoreError(Translate.instant('core.wsfunctionnotavailable'));
         }
 
         const wsPreSets: CoreWSPreSets = {
@@ -860,24 +851,10 @@ export class CoreSite {
      * Check if a WS is available in this site.
      *
      * @param method WS name.
-     * @param checkPrefix When true also checks with the compatibility prefix.
      * @return Whether the WS is available.
      */
-    wsAvailable(method: string, checkPrefix: boolean = true): boolean {
-        if (typeof this.infos == 'undefined') {
-            return false;
-        }
-
-        if (this.infos?.functionsByName?.[method]) {
-            return true;
-        }
-
-        // Let's try again with the compatibility prefix.
-        if (checkPrefix) {
-            return this.wsAvailable(CoreConstants.WS_PREFIX + method, false);
-        }
-
-        return false;
+    wsAvailable(method: string): boolean {
+        return !!this.infos?.functionsByName?.[method];
     }
 
     /**
@@ -1301,112 +1278,32 @@ export class CoreSite {
     /**
      * Check if the local_mobile plugin is installed in the Moodle site.
      *
-     * @param retrying True if we're retrying the check.
      * @return Promise resolved when the check is done.
+     * @deprecated since app 4.0
      */
-    async checkLocalMobilePlugin(retrying?: boolean): Promise<LocalMobileResponse> {
-        const checkUrl = this.siteUrl + '/local/mobile/check.php';
-        const service = CoreConstants.CONFIG.wsextservice;
-
-        if (!service) {
-            // External service not defined.
-            return { code: 0 };
-        }
-
-        let data;
-
-        try {
-            const response = await CoreWS.sendHTTPRequest(checkUrl, {
-                method: 'post',
-                data: { service },
-            });
-
-            data = response.body;
-        } catch (ex) {
-            return { code: 0 };
-        }
-
-        if (data === null) {
-            // This probably means that the server was configured to return null for non-existing URLs. Not installed.
-            return { code: 0 };
-        }
-
-        if (typeof data != 'undefined' && data.errorcode === 'requirecorrectaccess') {
-            if (!retrying) {
-                this.siteUrl = CoreUrlUtils.addOrRemoveWWW(this.siteUrl);
-
-                return this.checkLocalMobilePlugin(true);
-            } else {
-                throw new CoreWSError(data);
-            }
-        } else if (typeof data == 'undefined' || typeof data.code == 'undefined') {
-            // The local_mobile returned something we didn't expect. Let's assume it's not installed.
-            return { code: 0, warning: 'core.login.localmobileunexpectedresponse' };
-        }
-
-        const code = parseInt(data.code, 10);
-        if (data.error) {
-            switch (code) {
-                case 1:
-                    // Site in maintenance mode.
-                    throw new CoreError(Translate.instant('core.login.siteinmaintenance'));
-                case 2:
-                    // Web services not enabled.
-                    throw new CoreError(Translate.instant('core.login.webservicesnotenabled'));
-                case 3:
-                    // Extended service not enabled, but the official is enabled.
-                    return { code: 0 };
-                case 4:
-                    // Neither extended or official services enabled.
-                    throw new CoreError(Translate.instant('core.login.mobileservicesnotenabled'));
-                default:
-                    throw new CoreError(Translate.instant('core.unexpectederror'));
-            }
-        } else {
-            return { code, service, coreSupported: !!data.coresupported };
-        }
+    async checkLocalMobilePlugin(): Promise<LocalMobileResponse> {
+        // Not used anymore.
+        return { code: 0, coreSupported: true };
     }
 
     /**
      * Check if local_mobile has been installed in Moodle.
      *
      * @return Whether the App is able to use local_mobile plugin for this site.
+     * @deprecated since app 4.0
      */
     checkIfAppUsesLocalMobile(): boolean {
-        let appUsesLocalMobile = false;
-
-        if (!this.infos || !this.infos.functions) {
-            return appUsesLocalMobile;
-        }
-
-        this.infos.functions.forEach((func) => {
-            if (func.name.indexOf(CoreConstants.WS_PREFIX) != -1) {
-                appUsesLocalMobile = true;
-            }
-        });
-
-        return appUsesLocalMobile;
+        return false;
     }
 
     /**
      * Check if local_mobile has been installed in Moodle but the app is not using it.
      *
      * @return Promise resolved it local_mobile was added, rejected otherwise.
+     * @deprecated since app 4.0
      */
     async checkIfLocalMobileInstalledAndNotUsed(): Promise<void> {
-        const appUsesLocalMobile = this.checkIfAppUsesLocalMobile();
-
-        if (appUsesLocalMobile) {
-            // App already uses local_mobile, it wasn't added.
-            throw new CoreError('Already used.');
-        }
-
-        const data = await this.checkLocalMobilePlugin();
-
-        if (typeof data.service == 'undefined') {
-            // The local_mobile NOT installed. Reject.
-            throw new CoreError('Not installed.');
-        }
+        throw new CoreError('Deprecated.');
     }
 
     /**
@@ -2078,6 +1975,8 @@ export type CoreSiteWSPreSets = {
 
 /**
  * Response of checking local_mobile status.
+ *
+ * @deprecated since app 4.0
  */
 export type LocalMobileResponse = {
     /**
diff --git a/src/core/constants.ts b/src/core/constants.ts
index bbba1fdbd..255be2450 100644
--- a/src/core/constants.ts
+++ b/src/core/constants.ts
@@ -68,7 +68,7 @@ export class CoreConstants {
     // WS constants.
     static readonly WS_TIMEOUT = 30000; // Timeout when not in WiFi.
     static readonly WS_TIMEOUT_WIFI = 30000; // Timeout when in WiFi.
-    static readonly WS_PREFIX = 'local_mobile_';
+    static readonly WS_PREFIX = 'local_mobile_'; // @deprecated since app 4.0.
 
     // Login constants.
     static readonly LOGIN_SSO_CODE = 2; // SSO in browser window is required.
diff --git a/src/core/features/login/lang.json b/src/core/features/login/lang.json
index 74ae914e8..8ebeb7fa5 100644
--- a/src/core/features/login/lang.json
+++ b/src/core/features/login/lang.json
@@ -56,7 +56,6 @@
     "invalidurl": "Invalid URL specified",
     "invalidvaluemax": "The maximum value is {{$a}}",
     "invalidvaluemin": "The minimum value is {{$a}}",
-    "localmobileunexpectedresponse": "Moodle Mobile Additional Features check returned an unexpected response. You will be authenticated using the standard mobile service.",
     "loggedoutssodescription": "You have to authenticate again. You need to log in to the site in a browser window.",
     "login": "Log in",
     "loginbutton": "Log in",
diff --git a/src/core/features/login/pages/credentials/credentials.ts b/src/core/features/login/pages/credentials/credentials.ts
index 714b06934..7f478d243 100644
--- a/src/core/features/login/pages/credentials/credentials.ts
+++ b/src/core/features/login/pages/credentials/credentials.ts
@@ -124,7 +124,7 @@ export class CoreLoginCredentialsPage implements OnInit, OnDestroy {
     }
 
     /**
-     * Check if a site uses local_mobile, requires SSO login, etc.
+     * Get site config and check if it requires SSO login.
      * This should be used only if a fixed URL is set, otherwise this check is already performed in CoreLoginSitePage.
      *
      * @param siteUrl Site URL to check.
@@ -145,10 +145,6 @@ export class CoreLoginCredentialsPage implements OnInit, OnDestroy {
             this.siteConfig = result.config;
             this.treatSiteConfig();
 
-            if (result && result.warning) {
-                CoreDomUtils.showErrorModal(result.warning, true, 4000);
-            }
-
             if (CoreLoginHelper.isSSOLoginNeeded(result.code)) {
                 // SSO. User needs to authenticate in a browser.
                 this.isBrowserSSO = true;
diff --git a/src/core/features/login/pages/email-signup/email-signup.ts b/src/core/features/login/pages/email-signup/email-signup.ts
index 7e2462f6d..6e3c673ce 100644
--- a/src/core/features/login/pages/email-signup/email-signup.ts
+++ b/src/core/features/login/pages/email-signup/email-signup.ts
@@ -310,8 +310,7 @@ export class CoreLoginEmailSignupPage implements OnInit {
         };
 
         if (this.siteConfig?.launchurl) {
-            const service = CoreSites.determineService(this.siteUrl);
-            params.redirect = CoreLoginHelper.prepareForSSOLogin(this.siteUrl, service, this.siteConfig.launchurl);
+            params.redirect = CoreLoginHelper.prepareForSSOLogin(this.siteUrl, undefined, this.siteConfig.launchurl);
         }
 
         // Get the recaptcha response (if needed).
diff --git a/src/core/features/login/pages/site/site.ts b/src/core/features/login/pages/site/site.ts
index ea3f85f98..1f567ebad 100644
--- a/src/core/features/login/pages/site/site.ts
+++ b/src/core/features/login/pages/site/site.ts
@@ -339,10 +339,6 @@ export class CoreLoginSitePage implements OnInit {
 
             CoreForms.triggerFormSubmittedEvent(this.formElement, true);
 
-            if (response.warning) {
-                CoreDomUtils.showErrorModal(response.warning, true, 4000);
-            }
-
             if (CoreLoginHelper.isSSOLoginNeeded(response.code)) {
                 // SSO. User needs to authenticate in a browser.
                 CoreLoginHelper.confirmAndOpenBrowserForSSOLogin(
diff --git a/src/core/features/login/services/login-helper.ts b/src/core/features/login/services/login-helper.ts
index 91d95ff1f..75c316eb2 100644
--- a/src/core/features/login/services/login-helper.ts
+++ b/src/core/features/login/services/login-helper.ts
@@ -128,8 +128,8 @@ export class CoreLoginHelperProvider {
      *
      * @param siteurl URL of the site where the SSO login will be performed.
      * @param typeOfLogin CoreConstants.LOGIN_SSO_CODE or CoreConstants.LOGIN_SSO_INAPP_CODE.
-     * @param service The service to use. If not defined, external service will be used.
-     * @param launchUrl The URL to open for SSO. If not defined, local_mobile launch URL will be used.
+     * @param service The service to use. If not defined, core service will be used.
+     * @param launchUrl The URL to open for SSO. If not defined, default tool mobile launch URL will be used.
      * @return Promise resolved when done or if user cancelled.
      */
     async confirmAndOpenBrowserForSSOLogin(
@@ -655,8 +655,7 @@ export class CoreLoginHelperProvider {
             return false;
         }
 
-        const service = CoreSites.determineService(siteUrl);
-        const loginUrl = this.prepareForSSOLogin(siteUrl, service, launchUrl, pageName, pageOptions, {
+        const loginUrl = this.prepareForSSOLogin(siteUrl, undefined, launchUrl, pageName, pageOptions, {
             oauthsso: params.id,
         });
 
@@ -672,8 +671,8 @@ export class CoreLoginHelperProvider {
      *
      * @param siteurl URL of the site where the SSO login will be performed.
      * @param typeOfLogin CoreConstants.LOGIN_SSO_CODE or CoreConstants.LOGIN_SSO_INAPP_CODE.
-     * @param service The service to use. If not defined, external service will be used.
-     * @param launchUrl The URL to open for SSO. If not defined, local_mobile launch URL will be used.
+     * @param service The service to use. If not defined, core service will be used.
+     * @param launchUrl The URL to open for SSO. If not defined, default tool mobile launch URL will be used.
      * @param pageName Name of the page to go once authenticated. If not defined, site initial page.
      * @param pageOptions Options of the state to go once authenticated.
      */
@@ -790,8 +789,8 @@ export class CoreLoginHelperProvider {
      * Prepare the app to perform SSO login.
      *
      * @param siteUrl URL of the site where the SSO login will be performed.
-     * @param service The service to use. If not defined, external service will be used.
-     * @param launchUrl The URL to open for SSO. If not defined, local_mobile launch URL will be used.
+     * @param service The service to use. If not defined, core service will be used.
+     * @param launchUrl The URL to open for SSO. If not defined, default tool mobile launch URL will be used.
      * @param pageName Name of the page to go once authenticated. If not defined, site initial page.
      * @param pageOptions Options of the page to go once authenticated.
      * @param urlParams Other params to add to the URL.
@@ -806,8 +805,8 @@ export class CoreLoginHelperProvider {
         urlParams?: CoreUrlParams,
     ): string {
 
-        service = service || CoreConstants.CONFIG.wsextservice;
-        launchUrl = launchUrl || siteUrl + '/local/mobile/launch.php';
+        service = service || CoreConstants.CONFIG.wsservice;
+        launchUrl = launchUrl || siteUrl + '/admin/tool/mobile/launch.php';
 
         const passport = Math.random() * 1000;
         let loginUrl = launchUrl + '?service=' + service;
@@ -896,10 +895,6 @@ export class CoreLoginHelperProvider {
             // Check authentication method.
             const result = await CoreSites.checkSite(siteUrl);
 
-            if (result.warning) {
-                CoreDomUtils.showErrorModal(result.warning, true, 4000);
-            }
-
             if (this.isSSOLoginNeeded(result.code)) {
                 // SSO. User needs to authenticate in a browser. Check if we need to display a message.
                 if (!CoreApp.isSSOAuthenticationOngoing() && !this.waitingForBrowser) {
diff --git a/src/core/features/settings/services/settings-helper.ts b/src/core/features/settings/services/settings-helper.ts
index 2d68d2330..ee07046d5 100644
--- a/src/core/features/settings/services/settings-helper.ts
+++ b/src/core/features/settings/services/settings-helper.ts
@@ -267,7 +267,6 @@ export class CoreSettingsHelperProvider {
             CoreUtils.ignoreErrors(CoreFilepool.invalidateAllFiles(siteId)),
             // Invalidate and synchronize site data.
             site.invalidateWsCache(),
-            this.checkSiteLocalMobile(site),
             CoreSites.updateSiteInfo(site.getId()),
             CoreCronDelegate.forceSyncExecution(site.getId()),
         // eslint-disable-next-line arrow-body-style
@@ -284,27 +283,6 @@ export class CoreSettingsHelperProvider {
         }
     }
 
-    /**
-     * Check if local_mobile was added to the site.
-     *
-     * @param site Site to check.
-     * @return Promise resolved if no action needed.
-     */
-    protected async checkSiteLocalMobile(site: CoreSite): Promise<void> {
-        try {
-            // Check if local_mobile was installed in Moodle.
-            await site.checkIfLocalMobileInstalledAndNotUsed();
-        } catch {
-            // Not added, nothing to do.
-            return;
-        }
-
-        // Local mobile was added. Throw invalid session to force reconnect and create a new token.
-        CoreEvents.trigger(CoreEvents.SESSION_EXPIRED, {}, site.getId());
-
-        throw new CoreError(Translate.instant('core.lostconnection'));
-    }
-
     /**
      * Upgrades from Font size to new zoom level.
      */
diff --git a/src/core/services/sites.ts b/src/core/services/sites.ts
index ee1b5c434..85de9ea31 100644
--- a/src/core/services/sites.ts
+++ b/src/core/services/sites.ts
@@ -27,7 +27,6 @@ import { CoreConstants } from '@/core/constants';
 import {
     CoreSite,
     CoreSiteWSPreSets,
-    LocalMobileResponse,
     CoreSiteInfo,
     CoreSiteConfig,
     CoreSitePublicConfigResponse,
@@ -73,7 +72,6 @@ export class CoreSitesProvider {
     protected static readonly INVALID_VERSION = -1;
 
     protected logger: CoreLogger;
-    protected services = {};
     protected sessionRestored = false;
     protected currentSite?: CoreSite;
     protected sites: { [s: string]: CoreSite } = {};
@@ -182,8 +180,6 @@ export class CoreSitesProvider {
      * @return A promise resolved when the site is checked.
      */
     async checkSiteWithProtocol(siteUrl: string, protocol: string): Promise<CoreSiteCheckResponse> {
-        let publicConfig: CoreSitePublicConfigResponse | undefined;
-
         // Now, replace the siteUrl with the protocol.
         siteUrl = siteUrl.replace(/^https?:\/\//i, protocol);
 
@@ -222,82 +218,59 @@ export class CoreSitesProvider {
             }
         }
 
-        // Site exists. Create a temporary site to check if local_mobile is installed.
+        // Site exists. Create a temporary site to fetch its info.
         const temporarySite = CoreSitesFactory.makeSite(undefined, siteUrl);
-        let data: LocalMobileResponse;
+        let config: CoreSitePublicConfigResponse | undefined;
 
         try {
-            data = await temporarySite.checkLocalMobilePlugin();
+            config = await temporarySite.getPublicConfig();
+
+            // Check that the user can authenticate.
+            if (!config.enablewebservices) {
+                throw new CoreSiteError({
+                    message: Translate.instant('core.login.webservicesnotenabled'),
+                });
+            } else if (!config.enablemobilewebservice) {
+                throw new CoreSiteError({
+                    message: Translate.instant('core.login.mobileservicesnotenabled'),
+                });
+            } else if (config.maintenanceenabled) {
+                let message = Translate.instant('core.sitemaintenance');
+                if (config.maintenancemessage) {
+                    message += config.maintenancemessage;
+                }
+
+                throw new CoreSiteError({
+                    message,
+                });
+            }
         } catch (error) {
-            // Local mobile check returned an error. This only happens if the plugin is installed and it returns an error.
-            throw new CoreSiteError({
-                message: error.message,
-                critical: true,
-            });
-        }
+            // Error, check if not supported.
+            if (error.available === 1) {
+                // Service supported but an error happened. Return error.
+                if (error.errorcode == 'codingerror') {
+                    // This could be caused by a redirect. Check if it's the case.
+                    const redirect = await CoreUtils.checkRedirect(siteUrl);
 
-        data.service = data.service || CoreConstants.CONFIG.wsservice;
-        this.services[siteUrl] = data.service; // No need to store it in DB.
-
-        if (data.coreSupported || (data.code != CoreConstants.LOGIN_SSO_CODE && data.code != CoreConstants.LOGIN_SSO_INAPP_CODE)) {
-            // SSO using local_mobile not needed, try to get the site public config.
-            try {
-                const config = await temporarySite.getPublicConfig();
-
-                publicConfig = config;
-
-                // Check that the user can authenticate.
-                if (!config.enablewebservices) {
-                    throw new CoreSiteError({
-                        message: Translate.instant('core.login.webservicesnotenabled'),
-                    });
-                } else if (!config.enablemobilewebservice) {
-                    throw new CoreSiteError({
-                        message: Translate.instant('core.login.mobileservicesnotenabled'),
-                    });
-                } else if (config.maintenanceenabled) {
-                    let message = Translate.instant('core.sitemaintenance');
-                    if (config.maintenancemessage) {
-                        message += config.maintenancemessage;
+                    if (redirect) {
+                        error.error = Translate.instant('core.login.sitehasredirect');
+                    } else {
+                        // We can't be sure if there is a redirect or not. Display cannot connect error.
+                        error.error = Translate.instant('core.cannotconnecttrouble');
                     }
-
-                    throw new CoreSiteError({
-                        message,
-                    });
                 }
 
-                // Everything ok.
-                if (data.code === 0) {
-                    data.code = config.typeoflogin;
-                }
-            } catch (error) {
-                // Error, check if not supported.
-                if (error.available === 1) {
-                    // Service supported but an error happened. Return error.
-                    if (error.errorcode == 'codingerror') {
-                        // This could be caused by a redirect. Check if it's the case.
-                        const redirect = await CoreUtils.checkRedirect(siteUrl);
-
-                        if (redirect) {
-                            error.error = Translate.instant('core.login.sitehasredirect');
-                        } else {
-                            // We can't be sure if there is a redirect or not. Display cannot connect error.
-                            error.error = Translate.instant('core.cannotconnecttrouble');
-                        }
-                    }
-
-                    throw new CoreSiteError({
-                        message: error.error,
-                        errorcode: error.errorcode,
-                        critical: true,
-                    });
-                }
+                throw new CoreSiteError({
+                    message: error.error,
+                    errorcode: error.errorcode,
+                    critical: true,
+                });
             }
         }
 
         siteUrl = temporarySite.getURL();
 
-        return { siteUrl, code: data.code, warning: data.warning, service: data.service, config: publicConfig };
+        return { siteUrl, code: config?.typeoflogin || 0, service: CoreConstants.CONFIG.wsservice, config };
     }
 
     /**
@@ -367,10 +340,7 @@ export class CoreSitesProvider {
             throw new CoreNetworkError();
         }
 
-        if (!service) {
-            service = this.determineService(siteUrl);
-        }
-
+        service = service || CoreConstants.CONFIG.wsservice;
         const params = {
             username,
             password,
@@ -573,25 +543,10 @@ export class CoreSitesProvider {
     /**
      * Function for determine which service we should use (default or extended plugin).
      *
-     * @param siteUrl The site URL.
      * @return The service shortname.
+     * @deprecated since app 4.0
      */
-    determineService(siteUrl: string): string {
-        // We need to try siteUrl in both https or http (due to loginhttps setting).
-
-        // First http://
-        siteUrl = siteUrl.replace('https://', 'http://');
-        if (this.services[siteUrl]) {
-            return this.services[siteUrl];
-        }
-
-        // Now https://
-        siteUrl = siteUrl.replace('http://', 'https://');
-        if (this.services[siteUrl]) {
-            return this.services[siteUrl];
-        }
-
-        // Return default service.
+    determineService(): string {
         return CoreConstants.CONFIG.wsservice;
     }
 
@@ -839,37 +794,24 @@ export class CoreSitesProvider {
             return false;
         }
 
-        // Check if local_mobile was installed to Moodle.
+        let config: CoreSitePublicConfigResponse | undefined;
+
         try {
-            await site.checkIfLocalMobileInstalledAndNotUsed();
-
-            // Local mobile was added. Throw invalid session to force reconnect and create a new token.
-            CoreEvents.trigger(CoreEvents.SESSION_EXPIRED, {
-                pageName,
-                options: pageOptions,
-            }, siteId);
-
-            return false;
+            config = await site.getPublicConfig();
         } catch (error) {
-            let config: CoreSitePublicConfigResponse | undefined;
+            // Error getting config, maybe the user is offline.
+        }
 
-            try {
-                config = await site.getPublicConfig();
-            } catch (error) {
-                // Error getting config, probably the site doesn't have the WS
-            }
+        try {
+            await this.checkApplication(config);
 
-            try {
-                await this.checkApplication(config);
+            this.login(siteId);
+            // Update site info. We don't block the UI.
+            this.updateSiteInfo(siteId);
 
-                this.login(siteId);
-                // Update site info. We don't block the UI.
-                this.updateSiteInfo(siteId);
-
-                return true;
-            } catch (error) {
-                return false;
-            }
+            return true;
+        } catch (error) {
+            return false;
         }
     }
 
@@ -1499,13 +1441,12 @@ export class CoreSitesProvider {
      * Check if a WS is available in the current site, if any.
      *
      * @param method WS name.
-     * @param checkPrefix When true also checks with the compatibility prefix.
      * @return Whether the WS is available.
      */
-    wsAvailableInCurrentSite(method: string, checkPrefix: boolean = true): boolean {
+    wsAvailableInCurrentSite(method: string): boolean {
         const site = this.getCurrentSite();
 
-        return site ? site.wsAvailable(method, checkPrefix) : false;
+        return site ? site.wsAvailable(method) : false;
     }
 
     /**
@@ -1744,7 +1685,7 @@ export type CoreSiteCheckResponse = {
     service: string;
 
     /**
-     * Code of the warning message to show to the user.
+     * Code of the warning message to show to the user. @deprecated since app 4.0
      */
     warning?: string;
 
diff --git a/src/types/config.d.ts b/src/types/config.d.ts
index 25d7151f8..7f3fcc65c 100644
--- a/src/types/config.d.ts
+++ b/src/types/config.d.ts
@@ -32,7 +32,6 @@ export interface EnvironmentConfig {
     default_lang: string;
     languages: Record<string, string>;
     wsservice: string;
-    wsextservice: string;
     demo_sites: Record<string, CoreSitesDemoSiteData>;
     zoomlevels: Record<CoreZoomLevel, number>;
     customurlscheme: string;

From f63722e9f889a8cbfd67a4e281e715bde9fa2f03 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 6 Sep 2021 08:03:01 +0200
Subject: [PATCH 0076/1008] MOBILE-3819 core: Remove code deprecated in 3.8 or
 older

---
 .../multilang/services/handlers/multilang.ts  |  4 +-
 .../notifications/services/notifications.ts   |  3 +-
 src/core/constants.ts                         |  1 -
 src/core/pipes/pipes.module.ts                |  3 -
 src/core/pipes/to-locale-string.ts            | 66 ------------------
 src/core/services/app.ts                      |  2 +-
 src/core/services/utils/dom.ts                | 63 ++---------------
 src/core/services/utils/text.ts               | 67 +------------------
 src/core/services/utils/utils.ts              | 28 +-------
 9 files changed, 11 insertions(+), 226 deletions(-)
 delete mode 100644 src/core/pipes/to-locale-string.ts

diff --git a/src/addons/filter/multilang/services/handlers/multilang.ts b/src/addons/filter/multilang/services/handlers/multilang.ts
index 6824e5d4a..518f12f1d 100644
--- a/src/addons/filter/multilang/services/handlers/multilang.ts
+++ b/src/addons/filter/multilang/services/handlers/multilang.ts
@@ -40,8 +40,8 @@ export class AddonFilterMultilangHandlerService extends CoreFilterDefaultHandler
      */
     async filter(
         text: string,
-        filter: CoreFilterFilter, // eslint-disable-line @typescript-eslint/no-unused-vars
-        options: CoreFilterFormatTextOptions, // eslint-disable-line @typescript-eslint/no-unused-vars
+        filter?: CoreFilterFilter, // eslint-disable-line @typescript-eslint/no-unused-vars
+        options?: CoreFilterFormatTextOptions, // eslint-disable-line @typescript-eslint/no-unused-vars
         siteId?: string, // eslint-disable-line @typescript-eslint/no-unused-vars
     ): Promise<string> {
         let language = await CoreLang.getCurrentLanguage();
diff --git a/src/addons/notifications/services/notifications.ts b/src/addons/notifications/services/notifications.ts
index 38bd4b982..ed445daf1 100644
--- a/src/addons/notifications/services/notifications.ts
+++ b/src/addons/notifications/services/notifications.ts
@@ -19,7 +19,6 @@ import { CoreWSExternalWarning } from '@services/ws';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreTimeUtils } from '@services/utils/time';
 import { CoreUser } from '@features/user/services/user';
-import { AddonMessages, AddonMessagesMarkMessageReadResult } from '@addons/messages/services/messages';
 import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
 import { CoreLogger } from '@singletons/logger';
 import { makeSingleton } from '@singletons';
@@ -320,7 +319,7 @@ export class AddonNotificationsProvider {
     async markNotificationRead(
         notificationId: number,
         siteId?: string,
-    ): Promise<CoreMessageMarkNotificationReadWSResponse | AddonMessagesMarkMessageReadResult> {
+    ): Promise<CoreMessageMarkNotificationReadWSResponse> {
 
         const site = await CoreSites.getSite(siteId);
 
diff --git a/src/core/constants.ts b/src/core/constants.ts
index 255be2450..37a8b370f 100644
--- a/src/core/constants.ts
+++ b/src/core/constants.ts
@@ -59,7 +59,6 @@ export class CoreConstants {
     static readonly SETTINGS_NOTIFICATION_SOUND = 'CoreSettingsNotificationSound';
     static readonly SETTINGS_SYNC_ONLY_ON_WIFI = 'CoreSettingsSyncOnlyOnWifi';
     static readonly SETTINGS_DEBUG_DISPLAY = 'CoreSettingsDebugDisplay';
-    static readonly SETTINGS_REPORT_IN_BACKGROUND = 'CoreSettingsReportInBackground'; // @deprecated since 3.5.0
     static readonly SETTINGS_SEND_ON_ENTER = 'CoreSettingsSendOnEnter';
     static readonly SETTINGS_ZOOM_LEVEL = 'CoreSettingsZoomLevel';
     static readonly SETTINGS_COLOR_SCHEME = 'CoreSettingsColorScheme';
diff --git a/src/core/pipes/pipes.module.ts b/src/core/pipes/pipes.module.ts
index a45223af7..b8b197300 100644
--- a/src/core/pipes/pipes.module.ts
+++ b/src/core/pipes/pipes.module.ts
@@ -22,7 +22,6 @@ import { CoreFormatDatePipe } from './format-date';
 import { CoreNoTagsPipe } from './no-tags';
 import { CoreSecondsToHMSPipe } from './seconds-to-hms';
 import { CoreTimeAgoPipe } from './time-ago';
-import { CoreToLocaleStringPipe } from './to-locale-string';
 
 @NgModule({
     declarations: [
@@ -34,7 +33,6 @@ import { CoreToLocaleStringPipe } from './to-locale-string';
         CoreNoTagsPipe,
         CoreSecondsToHMSPipe,
         CoreTimeAgoPipe,
-        CoreToLocaleStringPipe,
     ],
     exports: [
         CoreBytesToSizePipe,
@@ -45,7 +43,6 @@ import { CoreToLocaleStringPipe } from './to-locale-string';
         CoreNoTagsPipe,
         CoreSecondsToHMSPipe,
         CoreTimeAgoPipe,
-        CoreToLocaleStringPipe,
     ],
 })
 export class CorePipesModule {}
diff --git a/src/core/pipes/to-locale-string.ts b/src/core/pipes/to-locale-string.ts
deleted file mode 100644
index d64df8a6d..000000000
--- a/src/core/pipes/to-locale-string.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-// (C) Copyright 2015 Moodle Pty Ltd.
-//
-// 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 { Pipe, PipeTransform } from '@angular/core';
-import { CoreTimeUtils } from '@services/utils/time';
-
-import { CoreLogger } from '@singletons/logger';
-
-/**
- * Filter to format a timestamp to a locale string. Timestamp can be in seconds or milliseconds.
- *
- * @deprecated since 3.6. Use coreFormatDate instead.
- */
-@Pipe({
-    name: 'coreToLocaleString',
-})
-export class CoreToLocaleStringPipe implements PipeTransform {
-
-    protected logger: CoreLogger;
-
-    constructor() {
-        this.logger = CoreLogger.getInstance('CoreToLocaleStringPipe');
-    }
-
-    /**
-     * Format a timestamp to a locale string.
-     *
-     * @param timestamp The timestamp (can be in seconds or milliseconds).
-     * @return Formatted time.
-     */
-    transform(timestamp: number | string): string {
-        if (typeof timestamp == 'string') {
-            // Convert the value to a number.
-            const numberTimestamp = parseInt(timestamp, 10);
-            if (isNaN(numberTimestamp)) {
-                this.logger.error('Invalid value received', timestamp);
-
-                return timestamp;
-            }
-            timestamp = numberTimestamp;
-        }
-
-        if (timestamp < 0) {
-            // Date not valid.
-            return '';
-        }
-        if (timestamp < 100000000000) {
-            // Timestamp is in seconds, convert it to milliseconds.
-            timestamp = timestamp * 1000;
-        }
-
-        return CoreTimeUtils.userDate(timestamp, 'core.strftimedatetimeshort');
-    }
-
-}
diff --git a/src/core/services/app.ts b/src/core/services/app.ts
index 87ec78cd8..4c5cfc1e2 100644
--- a/src/core/services/app.ts
+++ b/src/core/services/app.ts
@@ -677,7 +677,7 @@ export class CoreAppProvider {
     /**
      * Reset StatusBar color if any was set.
      *
-     * @deprecated Use setStatusBarColor passing the color of the new statusbar color loaded on remote theme or no color to reset.
+     * @deprecated since 3.9.5. Use setStatusBarColor passing the color of the new statusbar color, or no color to reset.
      */
     resetStatusBarColor(): void {
         this.setStatusBarColor();
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index 73a57f8b9..17048560b 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -39,6 +39,8 @@ import { CoreFormFields, CoreForms } from '../../singletons/form';
 import { CoreModalLateralTransitionEnter, CoreModalLateralTransitionLeave } from '@classes/modal-lateral-transition';
 import { CoreZoomLevel } from '@features/settings/services/settings-helper';
 import { CoreErrorWithTitle } from '@classes/errors/errorwithtitle';
+import { AddonFilterMultilangHandler } from '@addons/filter/multilang/services/handlers/multilang';
+import { CoreSites } from '@services/sites';
 
 /*
  * "Utils" service with helper functions for UI, DOM elements and HTML code.
@@ -275,58 +277,6 @@ export class CoreDomUtilsProvider {
         return newChanges;
     }
 
-    /**
-     * Extract the downloadable URLs from an HTML code.
-     *
-     * @param html HTML code.
-     * @return List of file urls.
-     * @deprecated since 3.8. Use CoreFilepoolProvider.extractDownloadableFilesFromHtml instead.
-     */
-    extractDownloadableFilesFromHtml(html: string): string[] {
-        this.logger.error('The function extractDownloadableFilesFromHtml has been moved to CoreFilepoolProvider.' +
-                ' Please use that function instead of this one.');
-
-        const urls: string[] = [];
-
-        const element = this.convertToElement(html);
-        const elements: AnchorOrMediaElement[] = Array.from(element.querySelectorAll('a, img, audio, video, source, track'));
-
-        for (let i = 0; i < elements.length; i++) {
-            const element = elements[i];
-            let url = 'href' in element ? element.href : element.src;
-
-            if (url && CoreUrlUtils.isDownloadableUrl(url) && urls.indexOf(url) == -1) {
-                urls.push(url);
-            }
-
-            // Treat video poster.
-            if (element.tagName == 'VIDEO' && element.getAttribute('poster')) {
-                url = element.getAttribute('poster') || '';
-                if (url && CoreUrlUtils.isDownloadableUrl(url) && urls.indexOf(url) == -1) {
-                    urls.push(url);
-                }
-            }
-        }
-
-        return urls;
-    }
-
-    /**
-     * Extract the downloadable URLs from an HTML code and returns them in fake file objects.
-     *
-     * @param html HTML code.
-     * @return List of fake file objects with file URLs.
-     * @deprecated since 3.8. Use CoreFilepoolProvider.extractDownloadableFilesFromHtmlAsFakeFileObjects instead.
-     */
-    extractDownloadableFilesFromHtmlAsFakeFileObjects(html: string): {fileurl: string}[] {
-        const urls = this.extractDownloadableFilesFromHtml(html);
-
-        // Convert them to fake file objects.
-        return urls.map((url) => ({
-            fileurl: url,
-        }));
-    }
-
     /**
      * Search all the URLs in a CSS file content.
      *
@@ -1196,9 +1146,9 @@ export class CoreDomUtilsProvider {
     async showAlertWithOptions(options: AlertOptions = {}, autocloseTime?: number): Promise<HTMLIonAlertElement> {
         const hasHTMLTags = CoreTextUtils.hasHTMLTags(<string> options.message || '');
 
-        if (hasHTMLTags) {
-            // Format the text.
-            options.message = await CoreTextUtils.formatText(<string> options.message);
+        if (hasHTMLTags && !CoreSites.getCurrentSite()?.isVersionGreaterEqualThan('3.7')) {
+            // Treat multilang.
+            options.message = await AddonFilterMultilangHandler.filter(<string> options.message);
         }
 
         const alertId = <string> Md5.hashAsciiStr((options.header || '') + '#' + (options.message || ''));
@@ -2046,9 +1996,6 @@ function fixMDPopoverPosition(baseEl: HTMLElement, ev?: Event): void {
 
 export const CoreDomUtils = makeSingleton(CoreDomUtilsProvider);
 
-type AnchorOrMediaElement =
-    HTMLAnchorElement | HTMLImageElement | HTMLAudioElement | HTMLVideoElement | HTMLSourceElement | HTMLTrackElement;
-
 /**
  * Options for the openPopover function.
  */
diff --git a/src/core/services/utils/text.ts b/src/core/services/utils/text.ts
index 572594b66..a0b157901 100644
--- a/src/core/services/utils/text.ts
+++ b/src/core/services/utils/text.ts
@@ -17,7 +17,6 @@ import { SafeUrl } from '@angular/platform-browser';
 import { ModalOptions } from '@ionic/core';
 
 import { CoreApp } from '@services/app';
-import { CoreLang } from '@services/lang';
 import { CoreAnyError, CoreError } from '@classes/errors/error';
 import { DomSanitizer, makeSingleton, Translate } from '@singletons';
 import { CoreWSFile } from '@services/ws';
@@ -507,33 +506,6 @@ export class CoreTextUtilsProvider {
         return text;
     }
 
-    /**
-     * Formats a text, treating multilang tags and cleaning HTML if needed.
-     *
-     * @param text Text to format.
-     * @param clean Whether HTML tags should be removed.
-     * @param singleLine Whether new lines should be removed. Only valid if clean is true.
-     * @param shortenLength Number of characters to shorten the text.
-     * @param highlight Text to highlight.
-     * @return Promise resolved with the formatted text.
-     * @deprecated since 3.8.0. Please use CoreFilterProvider.formatText instead.
-     */
-    formatText(text: string, clean?: boolean, singleLine?: boolean, shortenLength?: number, highlight?: string): Promise<string> {
-        return this.treatMultilangTags(text).then((formatted) => {
-            if (clean) {
-                formatted = this.cleanTags(formatted, singleLine);
-            }
-            if (shortenLength && shortenLength > 0) {
-                formatted = this.shortenText(formatted, shortenLength);
-            }
-            if (highlight) {
-                formatted = this.highlightText(formatted, highlight);
-            }
-
-            return formatted;
-        });
-    }
-
     /**
      * Get the error message from an error object.
      *
@@ -709,7 +681,7 @@ export class CoreTextUtilsProvider {
     }
 
     /**
-     * @deprecated Use CoreText instead.
+     * @deprecated since 3.9.5. Use CoreText instead.
      */
     removeEndingSlash(text?: string): string {
         return CoreText.removeEndingSlash(text);
@@ -997,43 +969,6 @@ export class CoreTextUtilsProvider {
         return features;
     }
 
-    /**
-     * Treat the multilang tags from a HTML code, leaving only the current language.
-     *
-     * @param text The text to be treated.
-     * @return Promise resolved with the formatted text.
-     * @deprecated since 3.8.0. Now this is handled by AddonFilterMultilangHandler.
-     */
-    treatMultilangTags(text: string): Promise<string> {
-        if (!text || typeof text != 'string') {
-            return Promise.resolve('');
-        }
-
-        return CoreLang.getCurrentLanguage().then((language) => {
-            // Match the current language.
-            const anyLangRegEx = /<(?:lang|span)[^>]+lang="[a-zA-Z0-9_-]+"[^>]*>(.*?)<\/(?:lang|span)>/g;
-            let currentLangRegEx = new RegExp('<(?:lang|span)[^>]+lang="' + language + '"[^>]*>(.*?)</(?:lang|span)>', 'g');
-
-            if (!text.match(currentLangRegEx)) {
-                // Current lang not found. Try to find the first language.
-                const matches = text.match(anyLangRegEx);
-                if (matches && matches[0]) {
-                    language = matches[0].match(/lang="([a-zA-Z0-9_-]+)"/)![1];
-                    currentLangRegEx = new RegExp('<(?:lang|span)[^>]+lang="' + language + '"[^>]*>(.*?)</(?:lang|span)>', 'g');
-                } else {
-                    // No multi-lang tag found, stop.
-                    return text;
-                }
-            }
-            // Extract contents of current language.
-            text = text.replace(currentLangRegEx, '$1');
-            // Delete the rest of languages
-            text = text.replace(anyLangRegEx, '');
-
-            return text;
-        });
-    }
-
     /**
      * Remove all ocurrences of a certain character from the start and end of a string.
      *
diff --git a/src/core/services/utils/utils.ts b/src/core/services/utils/utils.ts
index 2acf447f2..b654777f7 100644
--- a/src/core/services/utils/utils.ts
+++ b/src/core/services/utils/utils.ts
@@ -21,14 +21,13 @@ import { CoreApp } from '@services/app';
 import { CoreEvents } from '@singletons/events';
 import { CoreFile } from '@services/file';
 import { CoreLang } from '@services/lang';
-import { CoreWS, CoreWSFile } from '@services/ws';
+import { CoreWS } from '@services/ws';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreMimetypeUtils } from '@services/utils/mimetype';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreWSError } from '@classes/errors/wserror';
 import { makeSingleton, Clipboard, InAppBrowser, FileOpener, WebIntent, QRScanner, Translate, NgZone } from '@singletons';
 import { CoreLogger } from '@singletons/logger';
-import { CoreFileSizeSum } from '@services/plugin-file-delegate';
 import { CoreViewerQRScannerComponent } from '@features/viewer/components/qr-scanner/qr-scanner';
 import { CoreCanceledError } from '@classes/errors/cancelederror';
 import { CoreFileEntry } from '@services/file-helper';
@@ -1379,31 +1378,6 @@ export class CoreUtilsProvider {
         }
     }
 
-    /**
-     * Sum the filesizes from a list of files checking if the size will be partial or totally calculated.
-     *
-     * @param files List of files to sum its filesize.
-     * @return File size and a boolean to indicate if it is the total size or only partial.
-     * @deprecated since 3.8.0. Use CorePluginFileDelegate.getFilesSize instead.
-     */
-    sumFileSizes(files: CoreWSFile[]): CoreFileSizeSum {
-        const result = {
-            size: 0,
-            total: true,
-        };
-
-        files.forEach((file) => {
-            if (typeof file.filesize == 'undefined') {
-                // We don't have the file size, cannot calculate its total size.
-                result.total = false;
-            } else {
-                result.size += file.filesize;
-            }
-        });
-
-        return result;
-    }
-
     /**
      * Set a timeout to a Promise. If the time passes before the Promise is resolved or rejected, it will be automatically
      * rejected.

From 6471ef4baf44afaa84af97aa9ea9c86fdfd804f9 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 7 Sep 2021 08:52:08 +0200
Subject: [PATCH 0077/1008] MOBILE-3849 core: Fix context-menu disappearing in
 some pages

---
 .../messages/pages/contacts-35/contacts.html  |  3 -
 .../messages/pages/contacts/contacts.html     |  3 -
 .../pages/discussions-35/discussions.html     |  3 -
 .../group-conversations.html                  |  3 -
 src/addons/messages/pages/search/search.html  |  3 -
 .../navbar-buttons/navbar-buttons.ts          | 80 ++++++++++++-------
 6 files changed, 53 insertions(+), 42 deletions(-)

diff --git a/src/addons/messages/pages/contacts-35/contacts.html b/src/addons/messages/pages/contacts-35/contacts.html
index d929dd496..21e96c278 100644
--- a/src/addons/messages/pages/contacts-35/contacts.html
+++ b/src/addons/messages/pages/contacts-35/contacts.html
@@ -5,9 +5,6 @@
         </ion-buttons>
         <h1>{{ 'addon.messages.contacts' | translate }}</h1>
         <ion-buttons slot="end">
-            <!-- Add an empty context menu so discussion page can add items in split view,
-                otherwise the menu disappears in some cases. -->
-            <core-context-menu></core-context-menu>
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
diff --git a/src/addons/messages/pages/contacts/contacts.html b/src/addons/messages/pages/contacts/contacts.html
index dcdd35ab1..26e59ea71 100644
--- a/src/addons/messages/pages/contacts/contacts.html
+++ b/src/addons/messages/pages/contacts/contacts.html
@@ -8,9 +8,6 @@
             <ion-button fill="clear" (click)="gotoSearch()" [attr.aria-label]="'addon.messages.searchcombined' | translate">
                 <ion-icon name="fas-search" slot="icon-only" aria-hidden="true"></ion-icon>
             </ion-button>
-            <!-- Add an empty context menu so discussion page can add items in split view, otherwise the menu
-                disappears in some cases. -->
-            <core-context-menu></core-context-menu>
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
diff --git a/src/addons/messages/pages/discussions-35/discussions.html b/src/addons/messages/pages/discussions-35/discussions.html
index 3e756130b..5c0b2b5e3 100644
--- a/src/addons/messages/pages/discussions-35/discussions.html
+++ b/src/addons/messages/pages/discussions-35/discussions.html
@@ -5,9 +5,6 @@
         </ion-buttons>
         <h1>{{ 'addon.messages.messages' | translate }}</h1>
         <ion-buttons slot="end">
-            <!-- Add an empty context menu so discussion page can add items in split view,
-                otherwise the menu disappears in some cases. -->
-            <core-context-menu></core-context-menu>
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
diff --git a/src/addons/messages/pages/group-conversations/group-conversations.html b/src/addons/messages/pages/group-conversations/group-conversations.html
index d1b7a587e..7d02aa119 100644
--- a/src/addons/messages/pages/group-conversations/group-conversations.html
+++ b/src/addons/messages/pages/group-conversations/group-conversations.html
@@ -11,9 +11,6 @@
             <ion-button (click)="gotoSettings()" [attr.aria-label]="'addon.messages.messagepreferences' | translate">
                 <ion-icon name="fas-cog" slot="icon-only" aria-hidden="true"></ion-icon>
             </ion-button>
-            <!-- Add an empty context menu so discussion page can add items in split view,
-                otherwise the menu disappears in some cases. -->
-            <core-context-menu></core-context-menu>
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
diff --git a/src/addons/messages/pages/search/search.html b/src/addons/messages/pages/search/search.html
index 51889a600..d3700d20e 100644
--- a/src/addons/messages/pages/search/search.html
+++ b/src/addons/messages/pages/search/search.html
@@ -5,9 +5,6 @@
         </ion-buttons>
         <h1>{{ 'addon.messages.searchcombined' | translate }}</h1>
         <ion-buttons slot="end">
-            <!-- Add an empty context menu so discussion page can add items in split view,
-                otherwise the menu disappears in some cases. -->
-            <core-context-menu></core-context-menu>
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
diff --git a/src/core/components/navbar-buttons/navbar-buttons.ts b/src/core/components/navbar-buttons/navbar-buttons.ts
index f8363b1a6..39b69167e 100644
--- a/src/core/components/navbar-buttons/navbar-buttons.ts
+++ b/src/core/components/navbar-buttons/navbar-buttons.ts
@@ -12,7 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, Input, OnInit, OnDestroy, ElementRef } from '@angular/core';
+import {
+    Component,
+    Input,
+    OnInit,
+    OnDestroy,
+    ElementRef,
+    ViewContainerRef,
+    ViewChild,
+    ComponentFactoryResolver,
+} from '@angular/core';
 import { CoreLogger } from '@singletons/logger';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreContextMenuComponent } from '../context-menu/context-menu';
@@ -42,11 +51,13 @@ const BUTTON_HIDDEN_CLASS = 'core-navbar-button-hidden';
  */
 @Component({
     selector: 'core-navbar-buttons',
-    template: '<ng-content></ng-content>',
+    template: '<ng-content></ng-content><template #contextMenuContainer></template>',
     styleUrls: ['navbar-buttons.scss'],
 })
 export class CoreNavBarButtonsComponent implements OnInit, OnDestroy {
 
+    @ViewChild('contextMenuContainer', { read: ViewContainerRef }) container?: ViewContainerRef;
+
     // If the hidden input is true, hide all buttons.
     // eslint-disable-next-line @angular-eslint/no-input-rename
     @Input('hidden') set hidden(value: boolean) {
@@ -63,8 +74,9 @@ export class CoreNavBarButtonsComponent implements OnInit, OnDestroy {
     protected logger: CoreLogger;
     protected movedChildren?: Node[];
     protected mergedContextMenu?: CoreContextMenuComponent;
+    protected createdMainContextMenuElement?: HTMLElement;
 
-    constructor(element: ElementRef) {
+    constructor(element: ElementRef, protected factoryResolver: ComponentFactoryResolver) {
         this.element = element.nativeElement;
         this.logger = CoreLogger.getInstance('CoreNavBarButtonsComponent');
 
@@ -99,6 +111,9 @@ export class CoreNavBarButtonsComponent implements OnInit, OnDestroy {
                     this.movedChildren = CoreDomUtils.moveChildren(this.element, buttonsContainer, prepend);
                     this.showHideAllElements();
 
+                    // Make sure that context-menu is always at the end of buttons if any.
+                    const contextMenu = buttonsContainer.querySelector('core-context-menu');
+                    contextMenu?.parentElement?.appendChild(contextMenu);
                 } else {
                     this.logger.warn('The header was found, but it didn\'t have the right ion-buttons.', selector);
                 }
@@ -127,19 +142,22 @@ export class CoreNavBarButtonsComponent implements OnInit, OnDestroy {
      */
     protected mergeContextMenus(buttonsContainer: HTMLElement): void {
         // Check if both button containers have a context menu.
-        const mainContextMenu = buttonsContainer.querySelector('core-context-menu');
-        if (!mainContextMenu) {
-            return;
-        }
-
         const secondaryContextMenu = this.element.querySelector('core-context-menu');
         if (!secondaryContextMenu) {
             return;
         }
 
-        // Both containers have a context menu. Merge them to prevent having 2 menus at the same time.
-        const mainContextMenuInstance = CoreDomUtils.getInstanceByElement<CoreContextMenuComponent>(mainContextMenu);
+        const mainContextMenu = buttonsContainer.querySelector('core-context-menu');
         const secondaryContextMenuInstance = CoreDomUtils.getInstanceByElement<CoreContextMenuComponent>(secondaryContextMenu);
+        let mainContextMenuInstance: CoreContextMenuComponent | undefined;
+        if (mainContextMenu) {
+            // Both containers have a context menu. Merge them to prevent having 2 menus at the same time.
+            mainContextMenuInstance = CoreDomUtils.getInstanceByElement<CoreContextMenuComponent>(mainContextMenu);
+        } else {
+            // There is a context-menu in these buttons, but there is no main context menu in the header.
+            // Create one main context menu dynamically.
+            mainContextMenuInstance = this.createMainContextMenu();
+        }
 
         // Check that both context menus belong to the same core-tab. We shouldn't merge menus from different tabs.
         if (mainContextMenuInstance && secondaryContextMenuInstance) {
@@ -152,6 +170,20 @@ export class CoreNavBarButtonsComponent implements OnInit, OnDestroy {
         }
     }
 
+    /**
+     * Create a new and empty context menu to be used as a "parent".
+     *
+     * @return Created component.
+     */
+    protected createMainContextMenu(): CoreContextMenuComponent {
+        const factory = this.factoryResolver.resolveComponentFactory(CoreContextMenuComponent);
+        const componentRef = this.container!.createComponent<CoreContextMenuComponent>(factory);
+
+        this.createdMainContextMenuElement = componentRef.location.nativeElement;
+
+        return componentRef.instance;
+    }
+
     /**
      * Search the ion-header where the buttons should be added.
      *
@@ -214,11 +246,9 @@ export class CoreNavBarButtonsComponent implements OnInit, OnDestroy {
      */
     protected showHideAllElements(): void {
         // Show or hide all moved children.
-        if (this.movedChildren) {
-            this.movedChildren.forEach((child: Node) => {
-                this.showHideElement(child);
-            });
-        }
+        this.movedChildren?.forEach((child: Node) => {
+            this.showHideElement(child);
+        });
 
         // Show or hide all the context menu items that were merged to another context menu.
         if (this.mergedContextMenu) {
@@ -236,8 +266,8 @@ export class CoreNavBarButtonsComponent implements OnInit, OnDestroy {
      * @param element Element to show or hide.
      */
     protected showHideElement(element: Node): void {
-        // Check if it's an HTML Element
-        if (element instanceof Element) {
+        // Check if it's an HTML Element and it's not a created context menu. Never hide created context menus.
+        if (element instanceof Element && element !== this.createdMainContextMenuElement) {
             element.classList.toggle(BUTTON_HIDDEN_CLASS, !!this.forceHidden || !!this.allButtonsHidden);
         }
     }
@@ -249,17 +279,13 @@ export class CoreNavBarButtonsComponent implements OnInit, OnDestroy {
         // This component was destroyed, remove all the buttons that were moved.
         // The buttons can be moved outside of the current page, that's why we need to manually destroy them.
         // There's no need to destroy context menu items that were merged because they weren't moved from their DOM position.
-        if (this.movedChildren) {
-            this.movedChildren.forEach((child) => {
-                if (child.parentElement) {
-                    child.parentElement.removeChild(child);
-                }
-            });
-        }
+        this.movedChildren?.forEach((child) => {
+            if (child.parentElement && child !== this.createdMainContextMenuElement) {
+                child.parentElement.removeChild(child);
+            }
+        });
 
-        if (this.mergedContextMenu) {
-            this.mergedContextMenu.removeMergedItems();
-        }
+        this.mergedContextMenu?.removeMergedItems();
     }
 
 }

From 023aa16e10c3eba1df3d5042234b3236e7b95f06 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 7 Sep 2021 09:00:48 +0200
Subject: [PATCH 0078/1008] MOBILE-3849 sitehome: Display download button in
 site news

---
 src/core/features/sitehome/pages/index/index.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/core/features/sitehome/pages/index/index.html b/src/core/features/sitehome/pages/index/index.html
index 9ee1cac42..9bc017b46 100644
--- a/src/core/features/sitehome/pages/index/index.html
+++ b/src/core/features/sitehome/pages/index/index.html
@@ -70,7 +70,8 @@
 </ng-template>
 
 <ng-template #news>
-    <core-course-module class="core-sitehome-news" *ngIf="newsForumModule" [module]="newsForumModule" [courseId]="siteHomeId">
+    <core-course-module class="core-sitehome-news" *ngIf="newsForumModule" [module]="newsForumModule" [courseId]="siteHomeId"
+        [downloadEnabled]="downloadEnabled">
     </core-course-module>
 </ng-template>
 

From 67c4a3e9287517f913ef06a305ae45317ba6d74c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 7 Sep 2021 10:32:23 +0200
Subject: [PATCH 0079/1008] MOBILE-3855 completion: Fix manual completion when
 recent item clicked

---
 src/core/features/course/classes/main-resource-component.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/core/features/course/classes/main-resource-component.ts b/src/core/features/course/classes/main-resource-component.ts
index 3fb59518a..856ac0375 100644
--- a/src/core/features/course/classes/main-resource-component.ts
+++ b/src/core/features/course/classes/main-resource-component.ts
@@ -100,6 +100,9 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
         this.showCompletion = !!CoreSites.getCurrentSite()?.isVersionGreaterEqualThan('3.11');
 
         if (this.showCompletion) {
+            CoreCourseHelper.calculateModuleCompletionData(this.module, this.courseId);
+            CoreCourseHelper.loadModuleOfflineCompletion(this.courseId, this.module);
+
             this.completionObserver = CoreEvents.on(CoreEvents.COMPLETION_MODULE_VIEWED, async (data) => {
                 if (data && data.cmId == this.module.id) {
                     await CoreCourse.invalidateModule(this.module.id);

From 1d4fca73c04e454c53f5b8e01a8b8858e3efe472 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 8 Sep 2021 13:21:48 +0200
Subject: [PATCH 0080/1008] MOBILE-3552 h5p: Fix some dependencies not added to
 cached assets

---
 src/core/features/h5p/classes/framework.ts | 2 +-
 src/core/features/h5p/classes/validator.ts | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/core/features/h5p/classes/framework.ts b/src/core/features/h5p/classes/framework.ts
index bbdf06594..b54c08901 100644
--- a/src/core/features/h5p/classes/framework.ts
+++ b/src/core/features/h5p/classes/framework.ts
@@ -419,7 +419,7 @@ export class CoreH5PFramework {
                         'l1.patchversion AS patchVersion, l1.addto AS addTo, ' +
                         'l1.preloadedjs AS preloadedJs, l1.preloadedcss AS preloadedCss ' +
                     'FROM ' + LIBRARIES_TABLE_NAME + ' l1 ' +
-                    'JOIN ' + LIBRARIES_TABLE_NAME + ' l2 ON l1.machinename = l2.machinename AND (' +
+                    'LEFT JOIN ' + LIBRARIES_TABLE_NAME + ' l2 ON l1.machinename = l2.machinename AND (' +
                         'l1.majorversion < l2.majorversion OR (l1.majorversion = l2.majorversion AND ' +
                         'l1.minorversion < l2.minorversion)) ' +
                     'WHERE l1.addto IS NOT NULL AND l2.machinename IS NULL';
diff --git a/src/core/features/h5p/classes/validator.ts b/src/core/features/h5p/classes/validator.ts
index a957443d7..e3ec91d49 100644
--- a/src/core/features/h5p/classes/validator.ts
+++ b/src/core/features/h5p/classes/validator.ts
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { FileEntry, DirectoryEntry } from '@ionic-native/file/ngx';
 import { CoreFile, CoreFileFormat } from '@services/file';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreH5PSemantics } from './content-validator';

From 5396bb6a7191d2f432fdbdf0ea7dd14c996ca769 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 8 Sep 2021 17:43:59 +0200
Subject: [PATCH 0081/1008] MOBILE-3833 a11y: Add missing lists

This is still not completely accessible, but it is a good idea to use lists properly in case https://github.com/ionic-team/ionic-framework/issues/19939 gets solved
---
 .../features/settings/pages/about/about.html  |  60 +++--
 .../settings/pages/deviceinfo/deviceinfo.html | 250 +++++++++---------
 .../settings/pages/general/general.html       | 140 +++++-----
 .../settings/pages/licenses/licenses.html     |  51 ++--
 .../pages/space-usage/space-usage.html        |  50 ++--
 .../synchronization/synchronization.html      |  62 ++---
 6 files changed, 312 insertions(+), 301 deletions(-)

diff --git a/src/core/features/settings/pages/about/about.html b/src/core/features/settings/pages/about/about.html
index 6b931e527..807d240ce 100644
--- a/src/core/features/settings/pages/about/about.html
+++ b/src/core/features/settings/pages/about/about.html
@@ -10,33 +10,35 @@
 </ion-header>
 
 <ion-content>
-    <ion-item class="ion-text-wrap">
-        <ion-label><h2>{{ appName }} {{ versionName }}</h2></ion-label>
-    </ion-item>
-    <ion-item button class="ion-text-wrap" (click)="openPage('deviceinfo')" detail="true">
-        <ion-icon name="fas-mobile" slot="start" aria-hidden="true"></ion-icon>
-        <ion-label>{{ 'core.settings.deviceinfo' | translate }}</ion-label>
-    </ion-item>
-    <ion-item button class="ion-text-wrap" (click)="openPage('licenses')" detail="true">
-        <ion-icon name="far-copyright" slot="start" aria-hidden="true"></ion-icon>
-        <ion-label>{{ 'core.settings.opensourcelicenses' | translate }}</ion-label>
-    </ion-item>
-    <ion-item
-        *ngIf="privacyPolicy"
-        class="ion-text-wrap"
-        button core-link auto-login="no" [href]="privacyPolicy"
-        detail="true" detailIcon="open-outline"
-    >
-        <ion-icon name="fas-user-shield" slot="start" aria-hidden="true"></ion-icon>
-        <ion-label>{{ 'core.settings.privacypolicy' | translate }}</ion-label>
-    </ion-item>
-    <ion-item
-        *ngIf="feedbackFormUrl"
-        class="ion-text-wrap"
-        button core-link [href]="feedbackFormUrl"
-        detail="true" detailIcon="open-outline"
-    >
-        <ion-icon name="fas-bullhorn" slot="start" aria-hidden="true"></ion-icon>
-        <ion-label>{{ 'core.settings.helpusimprove' | translate }}</ion-label>
-    </ion-item>
+    <ion-list>
+        <ion-item class="ion-text-wrap">
+            <ion-label><h2>{{ appName }} {{ versionName }}</h2></ion-label>
+        </ion-item>
+        <ion-item button class="ion-text-wrap" (click)="openPage('deviceinfo')" detail="true">
+            <ion-icon name="fas-mobile" slot="start" aria-hidden="true"></ion-icon>
+            <ion-label>{{ 'core.settings.deviceinfo' | translate }}</ion-label>
+        </ion-item>
+        <ion-item button class="ion-text-wrap" (click)="openPage('licenses')" detail="true">
+            <ion-icon name="far-copyright" slot="start" aria-hidden="true"></ion-icon>
+            <ion-label>{{ 'core.settings.opensourcelicenses' | translate }}</ion-label>
+        </ion-item>
+        <ion-item
+            *ngIf="privacyPolicy"
+            class="ion-text-wrap"
+            button core-link auto-login="no" [href]="privacyPolicy"
+            detail="true" detailIcon="open-outline"
+        >
+            <ion-icon name="fas-user-shield" slot="start" aria-hidden="true"></ion-icon>
+            <ion-label>{{ 'core.settings.privacypolicy' | translate }}</ion-label>
+        </ion-item>
+        <ion-item
+            *ngIf="feedbackFormUrl"
+            class="ion-text-wrap"
+            button core-link [href]="feedbackFormUrl"
+            detail="true" detailIcon="open-outline"
+        >
+            <ion-icon name="fas-bullhorn" slot="start" aria-hidden="true"></ion-icon>
+            <ion-label>{{ 'core.settings.helpusimprove' | translate }}</ion-label>
+        </ion-item>
+    </ion-list>
 </ion-content>
diff --git a/src/core/features/settings/pages/deviceinfo/deviceinfo.html b/src/core/features/settings/pages/deviceinfo/deviceinfo.html
index 3e3054d5f..3495b7591 100644
--- a/src/core/features/settings/pages/deviceinfo/deviceinfo.html
+++ b/src/core/features/settings/pages/deviceinfo/deviceinfo.html
@@ -15,128 +15,130 @@
 </ion-header>
 
 <ion-content>
-    <ion-item (longPress)="copyItemInfo($event)">
-        <ion-label class="ion-text-wrap">
-            <h2>{{ 'core.settings.appversion' | translate}}</h2>
-            <p>{{ deviceInfo.versionName }} ({{ deviceInfo.versionCode }})</p>
-        </ion-label>
-    </ion-item>
-    <ion-item (longPress)="copyItemInfo($event)">
-        <ion-label class="ion-text-wrap">
-            <h2>{{ 'core.settings.compilationinfo' | translate }}</h2>
-            <p *ngIf="deviceInfo.compilationTime">{{ deviceInfo.compilationTime | coreFormatDate: "LLL Z": false }}</p>
-            <p *ngIf="deviceInfo.lastCommit">{{ deviceInfo.lastCommit }}</p>
-        </ion-label>
-    </ion-item>
-    <ion-item *ngIf="deviceInfo.siteUrl" (longPress)="copyItemInfo($event)">
-        <ion-label class="ion-text-wrap">
-            <h2>{{ 'core.settings.siteinfo' | translate }}<ng-container *ngIf="deviceInfo.isPrefixedUrl"> *</ng-container></h2>
-            <p><a [href]="deviceInfo.siteUrl" core-link auto-login="yes">{{ deviceInfo.siteUrl }}</a></p>
-            <p *ngIf="deviceInfo.siteVersion">{{ deviceInfo.siteVersion }}</p>
-            <p *ngIf="deviceInfo.siteId">{{ deviceInfo.siteId }}</p>
-        </ion-label>
-    </ion-item>
-    <ion-item *ngIf="deviceInfo.fileSystemRoot" (longPress)="copyItemInfo($event)">
-        <ion-label class="ion-text-wrap">
-            <h2>{{ 'core.settings.filesystemroot' | translate }}</h2>
-            <p><a *ngIf="fsClickable" [href]="deviceInfo.fileSystemRoot" core-link auto-login="no">{{ deviceInfo.fileSystemRoot }}</a></p>
-            <p *ngIf="!fsClickable">{{ deviceInfo.fileSystemRoot }}</p>
-        </ion-label>
-    </ion-item>
-    <ion-item *ngIf="deviceInfo.userAgent" (longPress)="copyItemInfo($event)">
-        <ion-label class="ion-text-wrap">
-            <h2>{{ 'core.settings.navigatoruseragent' | translate }}</h2>
-            <p>{{ deviceInfo.userAgent }}</p>
-        </ion-label>
-    </ion-item>
-    <ion-item *ngIf="deviceInfo.browserLanguage" (longPress)="copyItemInfo($event)">
-        <ion-label class="ion-text-wrap">
-            <h2>{{ 'core.settings.navigatorlanguage' | translate }}</h2>
-            <p>{{ deviceInfo.browserLanguage }}</p>
-        </ion-label>
-    </ion-item>
-    <ion-item *ngIf="deviceInfo.currentLanguage" (longPress)="copyItemInfo($event)">
-        <ion-label class="ion-text-wrap">
-            <h2>{{ 'core.settings.currentlanguage' | translate }}</h2>
-            <p>{{ currentLangName }} ({{ deviceInfo.currentLanguage }})</p>
-        </ion-label>
-    </ion-item>
-    <ion-item *ngIf="deviceInfo.locationHref" (longPress)="copyItemInfo($event)">
-        <ion-label class="ion-text-wrap">
-            <h2>{{ 'core.settings.locationhref' | translate }}</h2>
-            <p>{{ deviceInfo.locationHref }}</p>
-        </ion-label>
-    </ion-item>
-    <ion-item *ngIf="deviceInfo.deviceType" (longPress)="copyItemInfo($event)">
-        <ion-label class="ion-text-wrap">
-            <h2>{{ 'core.settings.displayformat' | translate }}</h2>
-            <p>{{ 'core.' + deviceInfo.deviceType | translate }}</p>
-        </ion-label>
-    </ion-item>
-    <ion-item *ngIf="deviceInfo.deviceOs && deviceOsTranslated" (longPress)="copyItemInfo($event)">
-        <ion-label class="ion-text-wrap">
-            <h2>{{ 'core.settings.deviceos' | translate}}</h2>
-            <p>{{ deviceOsTranslated }}</p>
-        </ion-label>
-    </ion-item>
-    <ion-item *ngIf="deviceInfo.screen" (longPress)="copyItemInfo($event)">
-        <ion-label class="ion-text-wrap">
-            <h2>{{ 'core.settings.screen' | translate }}</h2>
-            <p>{{ deviceInfo.screen }}</p>
-        </ion-label>
-    </ion-item>
-    <ion-item (longPress)="copyItemInfo($event)">
-        <ion-label class="ion-text-wrap">
-            <h2>{{ 'core.settings.networkstatus' | translate}}</h2>
-            <p>{{ 'core.' + deviceInfo.networkStatus | translate }}</p>
-        </ion-label>
-    </ion-item>
-    <ion-item (longPress)="copyItemInfo($event)">
-        <ion-label class="ion-text-wrap">
-            <h2>{{ 'core.settings.wificonnection' | translate}}</h2>
-            <p>{{ 'core.' + deviceInfo.wifiConnection | translate }}</p>
-        </ion-label>
-    </ion-item>
-    <ion-item *ngIf="deviceInfo.cordovaVersion" (longPress)="copyItemInfo($event)">
-        <ion-label class="ion-text-wrap">
-            <h2>{{ 'core.settings.cordovaversion' | translate }}</h2>
-            <p>{{ deviceInfo.cordovaVersion }}</p>
-        </ion-label>
-    </ion-item>
-    <ion-item *ngIf="deviceInfo.platform" (longPress)="copyItemInfo($event)">
-        <ion-label class="ion-text-wrap">
-            <h2>{{ 'core.settings.cordovadeviceplatform' | translate }}</h2>
-            <p>{{ deviceInfo.platform }}</p>
-        </ion-label>
-    </ion-item>
-    <ion-item *ngIf="deviceInfo.osVersion" (longPress)="copyItemInfo($event)">
-        <ion-label class="ion-text-wrap">
-            <h2>{{ 'core.settings.cordovadeviceosversion' | translate }}</h2>
-            <p>{{ deviceInfo.osVersion }}</p>
-        </ion-label>
-    </ion-item>
-    <ion-item *ngIf="deviceInfo.model" (longPress)="copyItemInfo($event)">
-        <ion-label class="ion-text-wrap">
-            <h2>{{ 'core.settings.cordovadevicemodel' | translate}}</h2>
-            <p>{{ deviceInfo.model }}</p>
-        </ion-label>
-    </ion-item>
-    <ion-item *ngIf="deviceInfo.uuid" (longPress)="copyItemInfo($event)">
-        <ion-label class="ion-text-wrap">
-            <h2>{{ 'core.settings.cordovadeviceuuid' | translate}}</h2>
-            <p>{{ deviceInfo.uuid }}</p>
-        </ion-label>
-    </ion-item>
-    <ion-item *ngIf="deviceInfo.pushId" (longPress)="copyItemInfo($event)">
-        <ion-label class="ion-text-wrap">
-            <h2>{{ 'core.settings.pushid' | translate }}</h2>
-            <p>{{ deviceInfo.pushId }}</p>
-        </ion-label>
-    </ion-item>
-    <ion-item (longPress)="copyItemInfo($event)">
-        <ion-label class="ion-text-wrap">
-            <h2>{{ 'core.settings.localnotifavailable' | translate }}</h2>
-            <p>{{ 'core.' + deviceInfo.localNotifAvailable | translate }}</p>
-        </ion-label>
-    </ion-item>
+    <ion-list>
+        <ion-item (longPress)="copyItemInfo($event)">
+            <ion-label class="ion-text-wrap">
+                <h2>{{ 'core.settings.appversion' | translate}}</h2>
+                <p>{{ deviceInfo.versionName }} ({{ deviceInfo.versionCode }})</p>
+            </ion-label>
+        </ion-item>
+        <ion-item (longPress)="copyItemInfo($event)">
+            <ion-label class="ion-text-wrap">
+                <h2>{{ 'core.settings.compilationinfo' | translate }}</h2>
+                <p *ngIf="deviceInfo.compilationTime">{{ deviceInfo.compilationTime | coreFormatDate: "LLL Z": false }}</p>
+                <p *ngIf="deviceInfo.lastCommit">{{ deviceInfo.lastCommit }}</p>
+            </ion-label>
+        </ion-item>
+        <ion-item *ngIf="deviceInfo.siteUrl" (longPress)="copyItemInfo($event)">
+            <ion-label class="ion-text-wrap">
+                <h2>{{ 'core.settings.siteinfo' | translate }}<ng-container *ngIf="deviceInfo.isPrefixedUrl"> *</ng-container></h2>
+                <p><a [href]="deviceInfo.siteUrl" core-link auto-login="yes">{{ deviceInfo.siteUrl }}</a></p>
+                <p *ngIf="deviceInfo.siteVersion">{{ deviceInfo.siteVersion }}</p>
+                <p *ngIf="deviceInfo.siteId">{{ deviceInfo.siteId }}</p>
+            </ion-label>
+        </ion-item>
+        <ion-item *ngIf="deviceInfo.fileSystemRoot" (longPress)="copyItemInfo($event)">
+            <ion-label class="ion-text-wrap">
+                <h2>{{ 'core.settings.filesystemroot' | translate }}</h2>
+                <p><a *ngIf="fsClickable" [href]="deviceInfo.fileSystemRoot" core-link auto-login="no">{{ deviceInfo.fileSystemRoot }}</a></p>
+                <p *ngIf="!fsClickable">{{ deviceInfo.fileSystemRoot }}</p>
+            </ion-label>
+        </ion-item>
+        <ion-item *ngIf="deviceInfo.userAgent" (longPress)="copyItemInfo($event)">
+            <ion-label class="ion-text-wrap">
+                <h2>{{ 'core.settings.navigatoruseragent' | translate }}</h2>
+                <p>{{ deviceInfo.userAgent }}</p>
+            </ion-label>
+        </ion-item>
+        <ion-item *ngIf="deviceInfo.browserLanguage" (longPress)="copyItemInfo($event)">
+            <ion-label class="ion-text-wrap">
+                <h2>{{ 'core.settings.navigatorlanguage' | translate }}</h2>
+                <p>{{ deviceInfo.browserLanguage }}</p>
+            </ion-label>
+        </ion-item>
+        <ion-item *ngIf="deviceInfo.currentLanguage" (longPress)="copyItemInfo($event)">
+            <ion-label class="ion-text-wrap">
+                <h2>{{ 'core.settings.currentlanguage' | translate }}</h2>
+                <p>{{ currentLangName }} ({{ deviceInfo.currentLanguage }})</p>
+            </ion-label>
+        </ion-item>
+        <ion-item *ngIf="deviceInfo.locationHref" (longPress)="copyItemInfo($event)">
+            <ion-label class="ion-text-wrap">
+                <h2>{{ 'core.settings.locationhref' | translate }}</h2>
+                <p>{{ deviceInfo.locationHref }}</p>
+            </ion-label>
+        </ion-item>
+        <ion-item *ngIf="deviceInfo.deviceType" (longPress)="copyItemInfo($event)">
+            <ion-label class="ion-text-wrap">
+                <h2>{{ 'core.settings.displayformat' | translate }}</h2>
+                <p>{{ 'core.' + deviceInfo.deviceType | translate }}</p>
+            </ion-label>
+        </ion-item>
+        <ion-item *ngIf="deviceInfo.deviceOs && deviceOsTranslated" (longPress)="copyItemInfo($event)">
+            <ion-label class="ion-text-wrap">
+                <h2>{{ 'core.settings.deviceos' | translate}}</h2>
+                <p>{{ deviceOsTranslated }}</p>
+            </ion-label>
+        </ion-item>
+        <ion-item *ngIf="deviceInfo.screen" (longPress)="copyItemInfo($event)">
+            <ion-label class="ion-text-wrap">
+                <h2>{{ 'core.settings.screen' | translate }}</h2>
+                <p>{{ deviceInfo.screen }}</p>
+            </ion-label>
+        </ion-item>
+        <ion-item (longPress)="copyItemInfo($event)">
+            <ion-label class="ion-text-wrap">
+                <h2>{{ 'core.settings.networkstatus' | translate}}</h2>
+                <p>{{ 'core.' + deviceInfo.networkStatus | translate }}</p>
+            </ion-label>
+        </ion-item>
+        <ion-item (longPress)="copyItemInfo($event)">
+            <ion-label class="ion-text-wrap">
+                <h2>{{ 'core.settings.wificonnection' | translate}}</h2>
+                <p>{{ 'core.' + deviceInfo.wifiConnection | translate }}</p>
+            </ion-label>
+        </ion-item>
+        <ion-item *ngIf="deviceInfo.cordovaVersion" (longPress)="copyItemInfo($event)">
+            <ion-label class="ion-text-wrap">
+                <h2>{{ 'core.settings.cordovaversion' | translate }}</h2>
+                <p>{{ deviceInfo.cordovaVersion }}</p>
+            </ion-label>
+        </ion-item>
+        <ion-item *ngIf="deviceInfo.platform" (longPress)="copyItemInfo($event)">
+            <ion-label class="ion-text-wrap">
+                <h2>{{ 'core.settings.cordovadeviceplatform' | translate }}</h2>
+                <p>{{ deviceInfo.platform }}</p>
+            </ion-label>
+        </ion-item>
+        <ion-item *ngIf="deviceInfo.osVersion" (longPress)="copyItemInfo($event)">
+            <ion-label class="ion-text-wrap">
+                <h2>{{ 'core.settings.cordovadeviceosversion' | translate }}</h2>
+                <p>{{ deviceInfo.osVersion }}</p>
+            </ion-label>
+        </ion-item>
+        <ion-item *ngIf="deviceInfo.model" (longPress)="copyItemInfo($event)">
+            <ion-label class="ion-text-wrap">
+                <h2>{{ 'core.settings.cordovadevicemodel' | translate}}</h2>
+                <p>{{ deviceInfo.model }}</p>
+            </ion-label>
+        </ion-item>
+        <ion-item *ngIf="deviceInfo.uuid" (longPress)="copyItemInfo($event)">
+            <ion-label class="ion-text-wrap">
+                <h2>{{ 'core.settings.cordovadeviceuuid' | translate}}</h2>
+                <p>{{ deviceInfo.uuid }}</p>
+            </ion-label>
+        </ion-item>
+        <ion-item *ngIf="deviceInfo.pushId" (longPress)="copyItemInfo($event)">
+            <ion-label class="ion-text-wrap">
+                <h2>{{ 'core.settings.pushid' | translate }}</h2>
+                <p>{{ deviceInfo.pushId }}</p>
+            </ion-label>
+        </ion-item>
+        <ion-item (longPress)="copyItemInfo($event)">
+            <ion-label class="ion-text-wrap">
+                <h2>{{ 'core.settings.localnotifavailable' | translate }}</h2>
+                <p>{{ 'core.' + deviceInfo.localNotifAvailable | translate }}</p>
+            </ion-label>
+        </ion-item>
+    </ion-list>
 </ion-content>
diff --git a/src/core/features/settings/pages/general/general.html b/src/core/features/settings/pages/general/general.html
index faaded554..a859ca45f 100644
--- a/src/core/features/settings/pages/general/general.html
+++ b/src/core/features/settings/pages/general/general.html
@@ -8,73 +8,75 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-item class="ion-text-wrap">
-        <ion-label>
-            <h2>{{ 'core.settings.language' | translate }}</h2>
-        </ion-label>
-        <ion-select [(ngModel)]="selectedLanguage" (ionChange)="languageChanged()" interface="action-sheet"
-            [interfaceOptions]="{header: 'core.settings.language' | translate}">
-            <ion-select-option *ngFor="let entry of languages" [value]="entry.code">{{ entry.name }}</ion-select-option>
-        </ion-select>
-    </ion-item>
-    <ion-item class="ion-text-wrap core-settings-general-font-size item-interactive">
-        <ion-label>
-            <h2>{{ 'core.settings.fontsize' | translate }}</h2>
-        </ion-label>
-        <ion-segment [(ngModel)]="selectedZoomLevel" (ionChange)="zoomLevelChanged()" color="primary">
-            <ion-segment-button *ngFor="let zoomLevel of zoomLevels" [value]="zoomLevel.value"
-                [ngStyle]="{'font-size.px': zoomLevel.style}">
-                <ion-label>
-                    {{ 'core.settings.fontsizecharacter' | translate }}
-                    <!-- Empty element styled with the largest font size, so all buttons share a common baseline. -->
-                    <span [ngStyle]="{'font-size.px': zoomLevels[zoomLevels.length - 1].style}"></span>
-                </ion-label>
-            </ion-segment-button>
-        </ion-segment>
-    </ion-item>
-    <ion-item class="ion-text-wrap core-settings-general-color-scheme" *ngIf="colorSchemes.length > 0"
-        [lines]="selectedScheme=='system' && isAndroid ? 'none' : 'inset'">
-        <ion-label>
-            <h2>{{ 'core.settings.colorscheme' | translate }}</h2>
-            <p *ngIf="colorSchemeDisabled" class="text-danger">{{ 'core.settings.forcedsetting' | translate }}</p>
-        </ion-label>
-        <ion-select [(ngModel)]="selectedScheme" (ionChange)="colorSchemeChanged()" interface="action-sheet"
-            [disabled]="colorSchemeDisabled" [interfaceOptions]="{header: 'core.settings.colorscheme' | translate}">
-            <ion-select-option *ngFor="let scheme of colorSchemes" [value]="scheme">
-                {{ 'core.settings.colorscheme-' + scheme | translate }}</ion-select-option>
-        </ion-select>
-    </ion-item>
-    <ion-item text-wrap *ngIf="colorSchemes.length > 0 && selectedScheme=='system' && isAndroid">
-        <ion-label><p>{{ 'core.settings.colorscheme-system-notice' | translate }}</p></ion-label>
-    </ion-item>
-    <ion-item class="ion-text-wrap">
-        <ion-label>
-            <h2>{{ 'core.settings.enablerichtexteditor' | translate }}</h2>
-            <p>{{ 'core.settings.enablerichtexteditordescription' | translate }}</p>
-        </ion-label>
-        <ion-toggle [(ngModel)]="richTextEditor" (ionChange)="richTextEditorChanged()"></ion-toggle>
-    </ion-item>
-    <ion-item class="ion-text-wrap" *ngIf="displayIframeHelp">
-        <ion-label>
-            <h2>{{ 'core.settings.ioscookies' | translate }}</h2>
-            <p>{{ 'core.settings.ioscookiesdescription' | translate }}</p>
-            <ion-button expand="block" (click)="openNativeSettings()">
-                {{ 'core.opensettings' | translate }}
-            </ion-button>
-        </ion-label>
-    </ion-item>
-    <ion-item class="ion-text-wrap">
-        <ion-label>
-            <h2>{{ 'core.settings.debugdisplay' | translate }}</h2>
-            <p>{{ 'core.settings.debugdisplaydescription' | translate }}</p>
-        </ion-label>
-        <ion-toggle [(ngModel)]="debugDisplay" (ionChange)="debugDisplayChanged()"></ion-toggle>
-    </ion-item>
-    <ion-item class="ion-text-wrap" *ngIf="analyticsSupported">
-        <ion-label>
-            <h2>{{ 'core.settings.enablefirebaseanalytics' | translate }}</h2>
-            <p>{{ 'core.settings.enablefirebaseanalyticsdescription' | translate }}</p>
-        </ion-label>
-        <ion-toggle [(ngModel)]="analyticsEnabled" (ionChange)="analyticsEnabledChanged()"></ion-toggle>
-    </ion-item>
+    <ion-list>
+        <ion-item class="ion-text-wrap">
+            <ion-label>
+                <h2>{{ 'core.settings.language' | translate }}</h2>
+            </ion-label>
+            <ion-select [(ngModel)]="selectedLanguage" (ionChange)="languageChanged()" interface="action-sheet"
+                [interfaceOptions]="{header: 'core.settings.language' | translate}">
+                <ion-select-option *ngFor="let entry of languages" [value]="entry.code">{{ entry.name }}</ion-select-option>
+            </ion-select>
+        </ion-item>
+        <ion-item class="ion-text-wrap core-settings-general-font-size item-interactive">
+            <ion-label>
+                <h2>{{ 'core.settings.fontsize' | translate }}</h2>
+            </ion-label>
+            <ion-segment [(ngModel)]="selectedZoomLevel" (ionChange)="zoomLevelChanged()" color="primary">
+                <ion-segment-button *ngFor="let zoomLevel of zoomLevels" [value]="zoomLevel.value"
+                    [ngStyle]="{'font-size.px': zoomLevel.style}">
+                    <ion-label>
+                        {{ 'core.settings.fontsizecharacter' | translate }}
+                        <!-- Empty element styled with the largest font size, so all buttons share a common baseline. -->
+                        <span [ngStyle]="{'font-size.px': zoomLevels[zoomLevels.length - 1].style}"></span>
+                    </ion-label>
+                </ion-segment-button>
+            </ion-segment>
+        </ion-item>
+        <ion-item class="ion-text-wrap core-settings-general-color-scheme" *ngIf="colorSchemes.length > 0"
+            [lines]="selectedScheme=='system' && isAndroid ? 'none' : 'inset'">
+            <ion-label>
+                <h2>{{ 'core.settings.colorscheme' | translate }}</h2>
+                <p *ngIf="colorSchemeDisabled" class="text-danger">{{ 'core.settings.forcedsetting' | translate }}</p>
+            </ion-label>
+            <ion-select [(ngModel)]="selectedScheme" (ionChange)="colorSchemeChanged()" interface="action-sheet"
+                [disabled]="colorSchemeDisabled" [interfaceOptions]="{header: 'core.settings.colorscheme' | translate}">
+                <ion-select-option *ngFor="let scheme of colorSchemes" [value]="scheme">
+                    {{ 'core.settings.colorscheme-' + scheme | translate }}</ion-select-option>
+            </ion-select>
+        </ion-item>
+        <ion-item text-wrap *ngIf="colorSchemes.length > 0 && selectedScheme=='system' && isAndroid">
+            <ion-label><p>{{ 'core.settings.colorscheme-system-notice' | translate }}</p></ion-label>
+        </ion-item>
+        <ion-item class="ion-text-wrap">
+            <ion-label>
+                <h2>{{ 'core.settings.enablerichtexteditor' | translate }}</h2>
+                <p>{{ 'core.settings.enablerichtexteditordescription' | translate }}</p>
+            </ion-label>
+            <ion-toggle [(ngModel)]="richTextEditor" (ionChange)="richTextEditorChanged()"></ion-toggle>
+        </ion-item>
+        <ion-item class="ion-text-wrap" *ngIf="displayIframeHelp">
+            <ion-label>
+                <h2>{{ 'core.settings.ioscookies' | translate }}</h2>
+                <p>{{ 'core.settings.ioscookiesdescription' | translate }}</p>
+                <ion-button expand="block" (click)="openNativeSettings()">
+                    {{ 'core.opensettings' | translate }}
+                </ion-button>
+            </ion-label>
+        </ion-item>
+        <ion-item class="ion-text-wrap">
+            <ion-label>
+                <h2>{{ 'core.settings.debugdisplay' | translate }}</h2>
+                <p>{{ 'core.settings.debugdisplaydescription' | translate }}</p>
+            </ion-label>
+            <ion-toggle [(ngModel)]="debugDisplay" (ionChange)="debugDisplayChanged()"></ion-toggle>
+        </ion-item>
+        <ion-item class="ion-text-wrap" *ngIf="analyticsSupported">
+            <ion-label>
+                <h2>{{ 'core.settings.enablefirebaseanalytics' | translate }}</h2>
+                <p>{{ 'core.settings.enablefirebaseanalyticsdescription' | translate }}</p>
+            </ion-label>
+            <ion-toggle [(ngModel)]="analyticsEnabled" (ionChange)="analyticsEnabledChanged()"></ion-toggle>
+        </ion-item>
+    </ion-list>
 </ion-content>
diff --git a/src/core/features/settings/pages/licenses/licenses.html b/src/core/features/settings/pages/licenses/licenses.html
index c6d1949a8..174475380 100644
--- a/src/core/features/settings/pages/licenses/licenses.html
+++ b/src/core/features/settings/pages/licenses/licenses.html
@@ -9,33 +9,34 @@
 </ion-header>
 <ion-content>
     <core-loading [hideUntil]="loaded">
-        <ion-item button *ngIf="error" class="ion-text-wrap" [href]="licensesUrl" core-link auto-login="no">
-            <ion-label>
-                {{ 'core.settings.opensourcelicenses' | translate }}
-            </ion-label>
-            <ion-button [href]="licensesUrl" target="_blank" fill="clear" slot="end" core-link auto-login="no">
-                {{ 'core.view' | translate }}</ion-button>
-        </ion-item>
-
-        <ng-container *ngIf="!error">
-            <ion-item *ngFor="let license of licenses" class="ion-text-wrap">
+        <ion-list>
+            <ion-item button *ngIf="error" class="ion-text-wrap" [href]="licensesUrl" core-link auto-login="no">
                 <ion-label>
-                    <p class="item-heading">
-                        <a *ngIf="license.repository" [href]="license.repository" core-link
-                            auto-login="no">{{ license.name }}</a>
-                        <ng-container *ngIf="!license.repository">{{ license.name }}</ng-container> - {{ license.version }}
-                    </p>
-                    <p class="item-heading" *ngIf="license.publisher">
-                        {{ 'core.settings.publisher' | translate }}{{ 'core.labelsep' | translate }} {{ license.publisher }}
-                    </p>
-                    <p>{{ 'core.settings.license' | translate }}{{ 'core.labelsep' | translate }} {{ license.licenses }}</p>
-                    <p><a *ngIf="license.url" [href]="license.url" core-link auto-login="no">{{ license.url }}</a></p>
-                    <p><a *ngIf="license.email" [href]="'mailto:' + license.email" core-link
-                            auto-login="no">{{ license.email }}</a></p>
+                    {{ 'core.settings.opensourcelicenses' | translate }}
                 </ion-label>
-                <ion-button *ngIf="license.licenseUrl" [href]="license.licenseUrl" target="_blank"
-                    fill="clear" slot="end" core-link auto-login="no">{{ 'core.view' | translate }}</ion-button>
+                <ion-button [href]="licensesUrl" target="_blank" fill="clear" slot="end" core-link auto-login="no">
+                    {{ 'core.view' | translate }}</ion-button>
             </ion-item>
-        </ng-container>
+            <ng-container *ngIf="!error">
+                <ion-item *ngFor="let license of licenses" class="ion-text-wrap">
+                    <ion-label>
+                        <p class="item-heading">
+                            <a *ngIf="license.repository" [href]="license.repository" core-link
+                                auto-login="no">{{ license.name }}</a>
+                            <ng-container *ngIf="!license.repository">{{ license.name }}</ng-container> - {{ license.version }}
+                        </p>
+                        <p class="item-heading" *ngIf="license.publisher">
+                            {{ 'core.settings.publisher' | translate }}{{ 'core.labelsep' | translate }} {{ license.publisher }}
+                        </p>
+                        <p>{{ 'core.settings.license' | translate }}{{ 'core.labelsep' | translate }} {{ license.licenses }}</p>
+                        <p><a *ngIf="license.url" [href]="license.url" core-link auto-login="no">{{ license.url }}</a></p>
+                        <p><a *ngIf="license.email" [href]="'mailto:' + license.email" core-link
+                                auto-login="no">{{ license.email }}</a></p>
+                    </ion-label>
+                    <ion-button *ngIf="license.licenseUrl" [href]="license.licenseUrl" target="_blank"
+                        fill="clear" slot="end" core-link auto-login="no">{{ 'core.view' | translate }}</ion-button>
+                </ion-item>
+            </ng-container>
+        </ion-list>
     </core-loading>
 </ion-content>
diff --git a/src/core/features/settings/pages/space-usage/space-usage.html b/src/core/features/settings/pages/space-usage/space-usage.html
index 54e988183..865cc082e 100644
--- a/src/core/features/settings/pages/space-usage/space-usage.html
+++ b/src/core/features/settings/pages/space-usage/space-usage.html
@@ -18,30 +18,32 @@
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
     <core-loading [hideUntil]="loaded">
-        <ion-item *ngFor="let site of sites" [attr.aria-current]="site.id == currentSiteId ? 'page' : 'false'">
-            <ion-label class="ion-text-wrap">
-                <p class="item-heading">
-                    <core-format-text [text]="site.siteName" clean="true" [siteId]="site.id"></core-format-text>
+        <ion-list>
+            <ion-item *ngFor="let site of sites" [attr.aria-current]="site.id == currentSiteId ? 'page' : 'false'">
+                <ion-label class="ion-text-wrap">
+                    <p class="item-heading">
+                        <core-format-text [text]="site.siteName" clean="true" [siteId]="site.id"></core-format-text>
+                    </p>
+                    <p class="ion-text-wrap">{{ site.fullName }}</p>
+                    <p>{{ site.siteUrl }}</p>
+                </ion-label>
+                <p *ngIf="site.spaceUsage !== undefined" slot="end">
+                    {{ site.spaceUsage | coreBytesToSize }}
                 </p>
-                <p class="ion-text-wrap">{{ site.fullName }}</p>
-                <p>{{ site.siteUrl }}</p>
-            </ion-label>
-            <p *ngIf="site.spaceUsage !== undefined" slot="end">
-                {{ site.spaceUsage | coreBytesToSize }}
-            </p>
-            <ion-button fill="clear" color="danger" slot="end" (click)="deleteSiteStorage(site)"
-                [hidden]="site.spaceUsage! + site.cacheEntries! <= 0"
-                [attr.aria-label]="'core.settings.deletesitefilestitle' | translate">
-                <ion-icon name="fas-trash" slot="icon-only" aria-hidden="true"></ion-icon>
-            </ion-button>
-        </ion-item>
-        <ion-item-divider>
-            <ion-label>
-                <h2>{{ 'core.settings.total' | translate }}</h2>
-            </ion-label>
-            <p slot="end" class="ion-margin-end">
-                {{ totals.spaceUsage | coreBytesToSize }}
-            </p>
-        </ion-item-divider>
+                <ion-button fill="clear" color="danger" slot="end" (click)="deleteSiteStorage(site)"
+                    [hidden]="site.spaceUsage! + site.cacheEntries! <= 0"
+                    [attr.aria-label]="'core.settings.deletesitefilestitle' | translate">
+                    <ion-icon name="fas-trash" slot="icon-only" aria-hidden="true"></ion-icon>
+                </ion-button>
+            </ion-item>
+            <ion-item-divider>
+                <ion-label>
+                    <h2>{{ 'core.settings.total' | translate }}</h2>
+                </ion-label>
+                <p slot="end" class="ion-margin-end">
+                    {{ totals.spaceUsage | coreBytesToSize }}
+                </p>
+            </ion-item-divider>
+        </ion-list>
     </core-loading>
 </ion-content>
diff --git a/src/core/features/settings/pages/synchronization/synchronization.html b/src/core/features/settings/pages/synchronization/synchronization.html
index a7bc6f784..1808a9cc7 100644
--- a/src/core/features/settings/pages/synchronization/synchronization.html
+++ b/src/core/features/settings/pages/synchronization/synchronization.html
@@ -15,35 +15,37 @@
 </ion-header>
 <ion-content>
     <core-loading [hideUntil]="sitesLoaded">
-        <ion-item-divider>
-            <ion-label>
-                <h2>{{ 'core.settings.syncsettings' | translate }}</h2>
-            </ion-label>
-        </ion-item-divider>
-        <ion-item class="ion-text-wrap">
-            <ion-label>{{ 'core.settings.enablesyncwifi' | translate }}</ion-label>
-            <ion-toggle slot="end" [(ngModel)]="syncOnlyOnWifi" (ngModelChange)="syncOnlyOnWifiChanged()">
-            </ion-toggle>
-        </ion-item>
-        <ion-item-divider>
-            <ion-label>
-                <h2>{{ 'core.settings.sites' | translate }}</h2>
-            </ion-label>
-        </ion-item-divider>
-        <ion-item *ngFor="let site of sites" [attr.aria-current]="site.id == currentSiteId ? 'page' : 'false'" class="ion-text-wrap">
-            <ion-label>
-                <p class="item-heading">
-                    <core-format-text [text]="site.siteName" clean="true" [siteId]="site.id"></core-format-text>
-                </p>
-                <p>{{ site.fullName }}</p>
-                <p>{{ site.siteUrl }}</p>
-            </ion-label>
-            <core-button-with-spinner [loading]="isSynchronizing(site.id)" slot="end">
-                <ion-button fill="clear"  (click)="synchronize(site.id)"
-                    [title]="site.siteName" [attr.aria-label]="'core.settings.synchronizenow' | translate">
-                    <ion-icon name="fas-sync-alt" slot="icon-only" aria-hidden="true"></ion-icon>
-                </ion-button>
-            </core-button-with-spinner>
-        </ion-item>
+        <ion-list>
+            <ion-item-divider>
+                <ion-label>
+                    <h2>{{ 'core.settings.syncsettings' | translate }}</h2>
+                </ion-label>
+            </ion-item-divider>
+            <ion-item class="ion-text-wrap">
+                <ion-label>{{ 'core.settings.enablesyncwifi' | translate }}</ion-label>
+                <ion-toggle slot="end" [(ngModel)]="syncOnlyOnWifi" (ngModelChange)="syncOnlyOnWifiChanged()">
+                </ion-toggle>
+            </ion-item>
+            <ion-item-divider>
+                <ion-label>
+                    <h2>{{ 'core.settings.sites' | translate }}</h2>
+                </ion-label>
+            </ion-item-divider>
+            <ion-item *ngFor="let site of sites" [attr.aria-current]="site.id == currentSiteId ? 'page' : 'false'" class="ion-text-wrap">
+                <ion-label>
+                    <p class="item-heading">
+                        <core-format-text [text]="site.siteName" clean="true" [siteId]="site.id"></core-format-text>
+                    </p>
+                    <p>{{ site.fullName }}</p>
+                    <p>{{ site.siteUrl }}</p>
+                </ion-label>
+                <core-button-with-spinner [loading]="isSynchronizing(site.id)" slot="end">
+                    <ion-button fill="clear"  (click)="synchronize(site.id)"
+                        [title]="site.siteName" [attr.aria-label]="'core.settings.synchronizenow' | translate">
+                        <ion-icon name="fas-sync-alt" slot="icon-only" aria-hidden="true"></ion-icon>
+                    </ion-button>
+                </core-button-with-spinner>
+            </ion-item>
+        </ion-list>
     </core-loading>
 </ion-content>

From 77864e9ef659614955af808aaf1a7b1deba350bc Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 8 Sep 2021 17:50:14 +0200
Subject: [PATCH 0082/1008] MOBILE-3833 chore: Fix lint warning

---
 src/core/features/settings/pages/deviceinfo/deviceinfo.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/core/features/settings/pages/deviceinfo/deviceinfo.html b/src/core/features/settings/pages/deviceinfo/deviceinfo.html
index 3495b7591..162c08fce 100644
--- a/src/core/features/settings/pages/deviceinfo/deviceinfo.html
+++ b/src/core/features/settings/pages/deviceinfo/deviceinfo.html
@@ -40,7 +40,11 @@
         <ion-item *ngIf="deviceInfo.fileSystemRoot" (longPress)="copyItemInfo($event)">
             <ion-label class="ion-text-wrap">
                 <h2>{{ 'core.settings.filesystemroot' | translate }}</h2>
-                <p><a *ngIf="fsClickable" [href]="deviceInfo.fileSystemRoot" core-link auto-login="no">{{ deviceInfo.fileSystemRoot }}</a></p>
+                <p>
+                    <a *ngIf="fsClickable" [href]="deviceInfo.fileSystemRoot" core-link auto-login="no">
+                        {{ deviceInfo.fileSystemRoot }}
+                    </a>
+                </p>
                 <p *ngIf="!fsClickable">{{ deviceInfo.fileSystemRoot }}</p>
             </ion-label>
         </ion-item>

From 13022a588897ab3e03f79d49761332ef602e347d Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 8 Sep 2021 18:00:29 +0200
Subject: [PATCH 0083/1008] MOBILE-3833 tabs: Improve customization defaults

---
 src/theme/theme.light.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 9016cbe1c..5c4114512 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -87,7 +87,7 @@
     --core-bottom-tabs-background: var(--black);
     --core-bottom-tabs-color: var(--gray-lighter);
     --core-bottom-tabs-color-selected: var(--brand-color);
-    --core-bottom-tabs-background-selected: var(--core-bottom-tabs-background);
+    --core-bottom-tabs-background-selected: transparent;
     --core-bottom-tabs-badge-color: var(--brand-color);
     --core-bottom-tabs-badge-text-color: var(--brand-color-contrast);
     --bottom-tabs-size: 56px;

From a26bbe5cfbaaf59005e4f038815b3f7be0cb301a Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 7 Sep 2021 12:43:09 +0200
Subject: [PATCH 0084/1008] MOBILE-3855 course: Fix length of undefined error
 in hidden modules

---
 src/addons/mod/book/components/index/index.ts |  7 +++-
 .../index/addon-mod-folder-index.html         |  8 ++--
 .../mod/folder/components/index/index.ts      |  5 ++-
 .../mod/imscp/components/index/index.ts       |  5 ++-
 src/addons/mod/imscp/services/imscp.ts        |  6 ++-
 src/addons/mod/page/components/index/index.ts |  5 ++-
 .../mod/resource/components/index/index.ts    |  8 ++--
 .../mod/resource/services/resource-helper.ts  | 35 ++++++++++------
 src/addons/mod/url/components/index/index.ts  | 18 +++++---
 .../mod/url/services/handlers/module.ts       | 12 +++---
 .../course/classes/main-resource-component.ts |  2 +-
 .../features/course/services/course-helper.ts | 10 ++---
 src/core/features/course/services/course.ts   | 42 ++++++++++++++++++-
 13 files changed, 115 insertions(+), 48 deletions(-)

diff --git a/src/addons/mod/book/components/index/index.ts b/src/addons/mod/book/components/index/index.ts
index 6cad64def..352b6cdd0 100644
--- a/src/addons/mod/book/components/index/index.ts
+++ b/src/addons/mod/book/components/index/index.ts
@@ -133,8 +133,11 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
 
             await this.loadBookData();
 
-            this.contentsMap = AddonModBook.getContentsMap(this.module.contents);
-            this.chapters = AddonModBook.getTocList(this.module.contents);
+            // Get contents. No need to refresh, it has been done in downloadResourceIfNeeded.
+            const contents = await CoreCourse.getModuleContents(this.module, this.courseId);
+
+            this.contentsMap = AddonModBook.getContentsMap(contents);
+            this.chapters = AddonModBook.getTocList(contents);
 
             if (typeof this.currentChapter == 'undefined' && typeof this.initialChapterId != 'undefined' && this.chapters) {
                 // Initial chapter set. Validate that the chapter exists.
diff --git a/src/addons/mod/folder/components/index/addon-mod-folder-index.html b/src/addons/mod/folder/components/index/addon-mod-folder-index.html
index 17b256dea..e3b1799f4 100644
--- a/src/addons/mod/folder/components/index/addon-mod-folder-index.html
+++ b/src/addons/mod/folder/components/index/addon-mod-folder-index.html
@@ -34,8 +34,8 @@
         contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
     </core-course-module-description>
 
-    <ion-list *ngIf="contents && (contents!.files.length + contents!.folders.length > 0)">
-        <ng-container *ngFor="let folder of contents!.folders">
+    <ion-list *ngIf="contents && (contents.files.length + contents.folders.length > 0)">
+        <ng-container *ngFor="let folder of contents.folders">
             <ion-item class="item-file" (click)="openFolder(folder)" detail="true" button>
                 <ion-icon name="fas-folder" slot="start" [attr.aria-label]="'core.folder' | translate"></ion-icon>
                 <ion-label>
@@ -43,12 +43,12 @@
                 </ion-label>
             </ion-item>
         </ng-container>
-        <ng-container *ngFor="let file of contents!.files">
+        <ng-container *ngFor="let file of contents.files">
             <core-file [file]="file" [component]="component" [componentId]="componentId"></core-file>
         </ng-container>
     </ion-list>
 
-    <core-empty-box *ngIf="!contents || (contents!.files.length + contents!.folders.length == 0)" icon="far-folder-open"
+    <core-empty-box *ngIf="!contents || (contents.files.length + contents.folders.length == 0)" icon="far-folder-open"
         [message]=" 'addon.mod_folder.emptyfilelist' | translate"></core-empty-box>
 
 </core-loading>
diff --git a/src/addons/mod/folder/components/index/index.ts b/src/addons/mod/folder/components/index/index.ts
index 3c13d7cb4..18f99216c 100644
--- a/src/addons/mod/folder/components/index/index.ts
+++ b/src/addons/mod/folder/components/index/index.ts
@@ -95,12 +95,13 @@ export class AddonModFolderIndexComponent extends CoreCourseModuleMainResourceCo
     protected async fetchContent(refresh = false): Promise<void> {
         try {
             this.folderInstance = await AddonModFolder.getFolder(this.courseId, this.module.id);
-            await CoreCourse.loadModuleContents(this.module, this.courseId, undefined, false, refresh);
+
+            const contents = await CoreCourse.getModuleContents(this.module, this.courseId, undefined, false, refresh);
 
             this.dataRetrieved.emit(this.folderInstance || this.module);
 
             this.description = this.folderInstance ? this.folderInstance.intro : this.module.description;
-            this.contents = AddonModFolderHelper.formatContents(this.module.contents);
+            this.contents = AddonModFolderHelper.formatContents(contents);
         } finally {
             this.fillContextMenu(refresh);
         }
diff --git a/src/addons/mod/imscp/components/index/index.ts b/src/addons/mod/imscp/components/index/index.ts
index 6941f8acc..b905e10e8 100644
--- a/src/addons/mod/imscp/components/index/index.ts
+++ b/src/addons/mod/imscp/components/index/index.ts
@@ -85,7 +85,10 @@ export class AddonModImscpIndexComponent extends CoreCourseModuleMainResourceCom
             this.description = imscp.intro;
             this.dataRetrieved.emit(imscp);
 
-            this.items = AddonModImscp.createItemList(this.module.contents);
+            // Get contents. No need to refresh, it has been done in downloadResourceIfNeeded.
+            const contents = await CoreCourse.getModuleContents(this.module, this.courseId);
+
+            this.items = AddonModImscp.createItemList(contents);
 
             if (this.items.length && typeof this.currentItem == 'undefined') {
                 this.currentItem = this.items[0].href;
diff --git a/src/addons/mod/imscp/services/imscp.ts b/src/addons/mod/imscp/services/imscp.ts
index df87b4684..746cabcbc 100644
--- a/src/addons/mod/imscp/services/imscp.ts
+++ b/src/addons/mod/imscp/services/imscp.ts
@@ -229,8 +229,10 @@ export class AddonModImscpProvider {
      * @return Promise resolved with the item src.
      */
     async getIframeSrc(module: CoreCourseModule, itemHref?: string): Promise<string> {
+        const contents = await CoreCourse.getModuleContents(module);
+
         if (!itemHref) {
-            const toc = this.getToc(module.contents);
+            const toc = this.getToc(contents);
             if (!toc.length) {
                 throw new CoreError('Empty TOC');
             }
@@ -246,7 +248,7 @@ export class AddonModImscpProvider {
         } catch (error) {
             // Error getting directory, there was an error downloading or we're in browser. Return online URL if connected.
             if (CoreApp.isOnline()) {
-                const indexUrl = this.getFileUrlFromContents(module.contents, itemHref);
+                const indexUrl = this.getFileUrlFromContents(contents, itemHref);
 
                 if (indexUrl) {
                     const site = await CoreSites.getSite(siteId);
diff --git a/src/addons/mod/page/components/index/index.ts b/src/addons/mod/page/components/index/index.ts
index f3034ce73..3017d9bf1 100644
--- a/src/addons/mod/page/components/index/index.ts
+++ b/src/addons/mod/page/components/index/index.ts
@@ -81,9 +81,12 @@ export class AddonModPageIndexComponent extends CoreCourseModuleMainResourceComp
             // Download the resource if it needs to be downloaded.
             const downloadResult = await this.downloadResourceIfNeeded(refresh);
 
+            // Get contents. No need to refresh, it has been done in downloadResourceIfNeeded.
+            const contents = await CoreCourse.getModuleContents(this.module, this.courseId);
+
             const results = await Promise.all([
                 this.loadPageData(),
-                AddonModPageHelper.getPageHtml(this.module.contents, this.module.id),
+                AddonModPageHelper.getPageHtml(contents, this.module.id),
             ]);
 
             this.contents = results[1];
diff --git a/src/addons/mod/resource/components/index/index.ts b/src/addons/mod/resource/components/index/index.ts
index 90d47fa39..5a0d8a430 100644
--- a/src/addons/mod/resource/components/index/index.ts
+++ b/src/addons/mod/resource/components/index/index.ts
@@ -101,9 +101,9 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
      */
     protected async fetchContent(refresh?: boolean): Promise<void> {
         // Load module contents if needed. Passing refresh is needed to force reloading contents.
-        await CoreCourse.loadModuleContents(this.module, this.courseId, undefined, false, refresh);
+        const contents = await CoreCourse.getModuleContents(this.module, this.courseId, undefined, false, refresh);
 
-        if (!this.module.contents || !this.module.contents.length) {
+        if (!contents.length) {
             throw new CoreError(Translate.instant('core.filenotfound'));
         }
 
@@ -155,10 +155,10 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
                 this.warning = '';
 
                 if (this.isIOS) {
-                    this.shouldOpenInBrowser = CoreFileHelper.shouldOpenInBrowser(this.module.contents[0]);
+                    this.shouldOpenInBrowser = CoreFileHelper.shouldOpenInBrowser(contents[0]);
                 }
 
-                const mimetype = await CoreUtils.getMimeTypeFromUrl(CoreFileHelper.getFileUrl(this.module.contents[0]));
+                const mimetype = await CoreUtils.getMimeTypeFromUrl(CoreFileHelper.getFileUrl(contents[0]));
 
                 this.isStreamedFile = CoreMimetypeUtils.isStreamedMimetype(mimetype);
             }
diff --git a/src/addons/mod/resource/services/resource-helper.ts b/src/addons/mod/resource/services/resource-helper.ts
index f8ae97537..b942f7e36 100644
--- a/src/addons/mod/resource/services/resource-helper.ts
+++ b/src/addons/mod/resource/services/resource-helper.ts
@@ -26,7 +26,7 @@ import { CoreDomUtils } from '@services/utils/dom';
 import { CoreMimetypeUtils } from '@services/utils/mimetype';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreUtilsOpenFileOptions } from '@services/utils/utils';
-import { makeSingleton } from '@singletons';
+import { makeSingleton, Translate } from '@singletons';
 import { AddonModResource, AddonModResourceProvider } from './resource';
 
 /**
@@ -43,15 +43,17 @@ export class AddonModResourceHelperProvider {
      * @return Promise resolved with the HTML.
      */
     async getEmbeddedHtml(module: CoreCourseWSModule, courseId: number): Promise<string> {
+        const contents = await CoreCourse.getModuleContents(module, courseId);
+
         const result = await CoreCourseHelper.downloadModuleWithMainFileIfNeeded(
             module,
             courseId,
             AddonModResourceProvider.COMPONENT,
             module.id,
-            module.contents,
+            contents,
         );
 
-        return CoreMimetypeUtils.getEmbeddedHtml(module.contents[0], result.path);
+        return CoreMimetypeUtils.getEmbeddedHtml(contents[0], result.path);
     }
 
     /**
@@ -61,7 +63,7 @@ export class AddonModResourceHelperProvider {
      * @return Promise resolved with the iframe src.
      */
     async getIframeSrc(module: CoreCourseWSModule): Promise<string> {
-        if (!module.contents.length) {
+        if (!module.contents?.length) {
             throw new CoreError('No contents available in module');
         }
 
@@ -98,15 +100,19 @@ export class AddonModResourceHelperProvider {
     isDisplayedEmbedded(module: CoreCourseWSModule, display: number): boolean {
         const currentSite = CoreSites.getCurrentSite();
 
-        if ((!module.contents.length && !module.contentsinfo) ||
-            !CoreFile.isAvailable() ||
-            (currentSite && !currentSite.isVersionGreaterEqualThan('3.7') && this.isNextcloudFile(module))) {
+        if (!CoreFile.isAvailable() ||
+                (currentSite && !currentSite.isVersionGreaterEqualThan('3.7') && this.isNextcloudFile(module))) {
             return false;
         }
 
-        const ext = module.contentsinfo
-            ? CoreMimetypeUtils.getExtension(module.contentsinfo.mimetypes[0])
-            : CoreMimetypeUtils.getFileExtension(module.contents[0].filename);
+        let ext: string | undefined;
+        if (module.contentsinfo) {
+            ext = CoreMimetypeUtils.getExtension(module.contentsinfo.mimetypes[0]);
+        } else if (module.contents?.length) {
+            ext = CoreMimetypeUtils.getFileExtension(module.contents[0].filename);
+        } else {
+            return false;
+        }
 
         return (display == CoreConstants.RESOURCELIB_DISPLAY_EMBED || display == CoreConstants.RESOURCELIB_DISPLAY_AUTO) &&
             CoreMimetypeUtils.canBeEmbedded(ext);
@@ -144,10 +150,15 @@ export class AddonModResourceHelperProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with boolean: whether main file is downloadable.
      */
-    isMainFileDownloadable(module: CoreCourseWSModule, siteId?: string): Promise<boolean> {
+    async isMainFileDownloadable(module: CoreCourseWSModule, siteId?: string): Promise<boolean> {
+        const contents = await CoreCourse.getModuleContents(module);
+        if (!contents.length) {
+            throw new CoreError(Translate.instant('core.filenotfound'));
+        }
+
         siteId = siteId || CoreSites.getCurrentSiteId();
 
-        const mainFile = module.contents[0];
+        const mainFile = contents[0];
         const timemodified = CoreFileHelper.getFileTimemodified(mainFile);
 
         return CoreFilepool.isFileDownloadable(siteId, mainFile.fileurl, timemodified);
diff --git a/src/addons/mod/url/components/index/index.ts b/src/addons/mod/url/components/index/index.ts
index dddcee782..e92c6541e 100644
--- a/src/addons/mod/url/components/index/index.ts
+++ b/src/addons/mod/url/components/index/index.ts
@@ -95,11 +95,19 @@ export class AddonModUrlIndexComponent extends CoreCourseModuleMainResourceCompo
                 this.displayDescription = typeof unserialized.printintro == 'undefined' || !!unserialized.printintro;
             }
 
-            // Try to load module contents, it's needed to get the URL with parameters.
-            await CoreCourse.loadModuleContents(this.module, this.courseId, undefined, false, refresh, undefined, 'url');
+            // Try to get module contents, it's needed to get the URL with parameters.
+            const contents = await CoreCourse.getModuleContents(
+                this.module,
+                this.courseId,
+                undefined,
+                false,
+                refresh,
+                undefined,
+                'url',
+            );
 
             // Always use the URL from the module because it already includes the parameters.
-            this.url = this.module.contents[0] && this.module.contents[0].fileurl ? this.module.contents[0].fileurl : undefined;
+            this.url = contents[0] && contents[0].fileurl ? contents[0].fileurl : undefined;
 
             await this.calculateDisplayOptions(url);
 
@@ -112,12 +120,12 @@ export class AddonModUrlIndexComponent extends CoreCourseModuleMainResourceCompo
             this.description = mod.description;
             this.dataRetrieved.emit(mod);
 
-            if (!mod.contents.length) {
+            if (!mod.contents?.length) {
                 // If the data was cached maybe we don't have contents. Reject.
                 throw new CoreError('No contents found in module.');
             }
 
-            this.url = mod.contents && mod.contents[0] && mod.contents[0].fileurl ? mod.contents[0].fileurl : undefined;
+            this.url = mod.contents[0].fileurl ? mod.contents[0].fileurl : undefined;
         }
     }
 
diff --git a/src/addons/mod/url/services/handlers/module.ts b/src/addons/mod/url/services/handlers/module.ts
index 08ed9d915..642dc208a 100644
--- a/src/addons/mod/url/services/handlers/module.ts
+++ b/src/addons/mod/url/services/handlers/module.ts
@@ -77,7 +77,8 @@ export class AddonModUrlModuleHandlerService implements CoreCourseModuleHandler
                 // Ignore errors.
             }
 
-            AddonModUrlHelper.open(module.contents[0].fileurl);
+            const contents = await CoreCourse.getModuleContents(module, courseId);
+            AddonModUrlHelper.open(contents[0].fileurl);
         };
 
         const handlerData: CoreCourseModuleHandlerData = {
@@ -141,9 +142,9 @@ export class AddonModUrlModuleHandlerService implements CoreCourseModuleHandler
      */
     protected async hideLinkButton(module: CoreCourseAnyModuleData, courseId: number): Promise<boolean> {
         try {
-            await CoreCourse.loadModuleContents(module, courseId, undefined, false, false, undefined, this.modName);
+            const contents = await CoreCourse.getModuleContents(module, courseId, undefined, false, false, undefined, this.modName);
 
-            return !(module.contents && module.contents[0] && module.contents[0].fileurl);
+            return !(contents[0] && contents[0].fileurl);
         } catch {
             // Module contents could not be loaded, most probably device is offline.
             return true;
@@ -166,11 +167,10 @@ export class AddonModUrlModuleHandlerService implements CoreCourseModuleHandler
      */
     protected async shouldOpenLink(module: CoreCourseModule, courseId: number): Promise<boolean> {
         try {
-            // First of all, make sure module contents are loaded.
-            await CoreCourse.loadModuleContents(module, courseId, undefined, false, false, undefined, this.modName);
+            const contents = await CoreCourse.getModuleContents(module, courseId, undefined, false, false, undefined, this.modName);
 
             // Check if the URL can be handled by the app. If so, always open it directly.
-            const canHandle = await CoreContentLinksHelper.canHandleLink(module.contents[0].fileurl, courseId, undefined, true);
+            const canHandle = await CoreContentLinksHelper.canHandleLink(contents[0].fileurl, courseId, undefined, true);
 
             if (canHandle) {
                 // URL handled by the app, open it directly.
diff --git a/src/core/features/course/classes/main-resource-component.ts b/src/core/features/course/classes/main-resource-component.ts
index 856ac0375..e01d48d86 100644
--- a/src/core/features/course/classes/main-resource-component.ts
+++ b/src/core/features/course/classes/main-resource-component.ts
@@ -390,7 +390,7 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
             }
         }
 
-        if (!this.module.contents.length || (refresh && !contentsAlreadyLoaded)) {
+        if (!this.module.contents?.length || (refresh && !contentsAlreadyLoaded)) {
             // Try to load the contents.
             const ignoreCache = refresh && CoreApp.isOnline();
 
diff --git a/src/core/features/course/services/course-helper.ts b/src/core/features/course/services/course-helper.ts
index 14b7f8241..8e62b143e 100644
--- a/src/core/features/course/services/course-helper.ts
+++ b/src/core/features/course/services/course-helper.ts
@@ -730,13 +730,11 @@ export class CoreCourseHelperProvider {
         siteId = siteId || CoreSites.getCurrentSiteId();
 
         if (!files || !files.length) {
-            // Make sure that module contents are loaded.
-            await CoreCourse.loadModuleContents(module, courseId);
-
-            files = module.contents;
+            // Try to use module contents.
+            files = await CoreCourse.getModuleContents(module, courseId);
         }
 
-        if (!files || !files.length) {
+        if (!files.length) {
             throw new CoreError(Translate.instant('core.filenotfound'));
         }
 
@@ -1033,7 +1031,7 @@ export class CoreCourseHelperProvider {
         }
 
         // There's no prefetch handler for the module, just download the files.
-        files = files || module.contents;
+        files = files || module.contents || [];
 
         await CoreFilepool.downloadOrPrefetchFiles(siteId, files, false, false, component, componentId);
     }
diff --git a/src/core/features/course/services/course.ts b/src/core/features/course/services/course.ts
index e115afb9d..4a0752ff5 100644
--- a/src/core/features/course/services/course.ts
+++ b/src/core/features/course/services/course.ts
@@ -885,9 +885,47 @@ export class CoreCourseProvider {
         }
 
         const mod = await this.getModule(module.id, courseId, sectionId, preferCache, ignoreCache, siteId, modName);
+
+        if (!mod.contents) {
+            throw new CoreError(Translate.instant('core.course.modulenotfound'));
+        }
+
         module.contents = mod.contents;
     }
 
+    /**
+     * Get module contents. If not present, this function will try to load them into module.contents.
+     * It will throw an error if contents cannot be loaded.
+     *
+     * @param module Module to get its contents.
+     * @param courseId The course ID. Recommended to speed up the process and minimize data usage.
+     * @param sectionId The section ID.
+     * @param preferCache True if shouldn't call WS if data is cached, false otherwise.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @param modName If set, the app will retrieve all modules of this type with a single WS call. This reduces the
+     *                number of WS calls, but it isn't recommended for modules that can return a lot of contents.
+     * @return Promise resolved when loaded.
+     */
+    async getModuleContents(
+        module: CoreCourseAnyModuleData,
+        courseId?: number,
+        sectionId?: number,
+        preferCache?: boolean,
+        ignoreCache?: boolean,
+        siteId?: string,
+        modName?: string,
+    ): Promise<CoreCourseModuleContentFile[]> {
+        // Make sure contents are loaded.
+        await this.loadModuleContents(module, courseId, sectionId, preferCache, ignoreCache, siteId, modName);
+
+        if (!module.contents) {
+            throw new CoreError(Translate.instant('core.course.modulenotfound'));
+        }
+
+        return module.contents;
+    }
+
     /**
      * Report a course and section as being viewed.
      *
@@ -1450,7 +1488,7 @@ export type CoreCourseWSModule = {
     noviewlink?: boolean; // Whether the module has no view page.
     completion?: number; // Type of completion tracking: 0 means none, 1 manual, 2 automatic.
     completiondata?: CoreCourseModuleWSCompletionData; // Module completion data.
-    contents: CoreCourseModuleContentFile[];
+    contents?: CoreCourseModuleContentFile[];
     dates?: {
         label: string;
         timestamp: number;
@@ -1589,5 +1627,5 @@ type CoreCompletionUpdateActivityCompletionStatusManuallyWSParams = {
  * Any of the possible module WS data.
  */
 export type CoreCourseAnyModuleData = CoreCourseWSModule | CoreCourseModuleBasicInfo & {
-    contents?: CoreCourseModuleContentFile[]; // Calculated in the app in loadModuleContents.
+    contents?: CoreCourseModuleContentFile[]; // If needed, calculated in the app in loadModuleContents.
 };

From a46b3daef89552d7b88d9a3fa97ef6a7665318ae Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 9 Sep 2021 10:41:11 +0200
Subject: [PATCH 0085/1008] MOBILE-3855 eslint: Change no-non-null-assertion to
 warn

---
 .eslintrc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 06f3866fd..1b4ee6949 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -126,7 +126,7 @@ const appConfig = {
                 ignoreParameters: true,
             },
         ],
-        '@typescript-eslint/no-non-null-assertion': 'off',
+        '@typescript-eslint/no-non-null-assertion': 'warn',
         '@typescript-eslint/no-redeclare': 'error',
         '@typescript-eslint/no-this-alias': 'error',
         '@typescript-eslint/no-unused-vars': 'error',

From d5d8962766d5ce2f33634776ca7054a450421ba7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 8 Sep 2021 14:40:20 +0200
Subject: [PATCH 0086/1008] MOBILE-3833 mod: Create a base module to remove
 duplicated getData func

---
 .../mod/assign/services/handlers/module.ts    | 46 ++----------
 .../mod/book/services/handlers/module.ts      | 44 ++----------
 .../mod/chat/services/handlers/module.ts      | 38 ++--------
 .../mod/choice/services/handlers/module.ts    | 36 ++--------
 .../mod/data/services/handlers/module.ts      | 36 ++--------
 .../mod/feedback/services/handlers/module.ts  | 36 ++--------
 .../mod/folder/services/handlers/module.ts    | 36 ++--------
 .../mod/forum/services/handlers/module.ts     | 53 +++-----------
 .../mod/glossary/services/handlers/module.ts  | 36 ++--------
 .../h5pactivity/services/handlers/module.ts   | 30 ++------
 .../mod/imscp/services/handlers/module.ts     | 31 ++------
 .../mod/label/services/handlers/module.ts     | 12 +---
 .../mod/lesson/services/handlers/module.ts    | 62 ++--------------
 .../mod/lti/services/handlers/module.ts       | 47 +++++-------
 .../mod/page/services/handlers/module.ts      | 45 ++----------
 .../mod/quiz/services/handlers/module.ts      | 50 ++-----------
 .../mod/resource/services/handlers/module.ts  | 72 +++++++++----------
 .../mod/scorm/services/handlers/module.ts     | 36 ++--------
 .../mod/survey/services/handlers/module.ts    | 38 ++--------
 .../mod/url/services/handlers/module.ts       | 29 ++++----
 .../mod/wiki/services/handlers/module.ts      | 11 +--
 .../mod/workshop/services/handlers/module.ts  | 33 ++-------
 .../course/classes/module-base-handler.ts     | 59 +++++++++++++++
 .../features/course/services/course-helper.ts |  2 +-
 src/core/features/course/services/course.ts   |  4 +-
 .../services/handlers/default-module.ts       | 38 +++-------
 .../course/services/module-delegate.ts        |  5 +-
 27 files changed, 228 insertions(+), 737 deletions(-)
 create mode 100644 src/core/features/course/classes/module-base-handler.ts

diff --git a/src/addons/mod/assign/services/handlers/module.ts b/src/addons/mod/assign/services/handlers/module.ts
index 781ef2900..7b1395e0f 100644
--- a/src/addons/mod/assign/services/handlers/module.ts
+++ b/src/addons/mod/assign/services/handlers/module.ts
@@ -14,23 +14,22 @@
 
 import { CoreConstants } from '@/core/constants';
 import { Injectable, Type } from '@angular/core';
-import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
+import { CoreCourseModuleHandler } from '@features/course/services/module-delegate';
 import { AddonModAssignIndexComponent } from '../../components/index';
 import { makeSingleton } from '@singletons';
-import { CoreCourse, CoreCourseAnyModuleData } from '@features/course/services/course';
-import { CoreCourseModule } from '@features/course/services/course-helper';
-import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
+import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
 
 /**
  * Handler to support assign modules.
  */
 @Injectable({ providedIn: 'root' })
-export class AddonModAssignModuleHandlerService implements CoreCourseModuleHandler {
+export class AddonModAssignModuleHandlerService extends CoreModuleHandlerBase implements CoreCourseModuleHandler {
 
     static readonly PAGE_NAME = 'mod_assign';
 
     name = 'AddonModAssign';
     modName = 'assign';
+    protected pageName = AddonModAssignModuleHandlerService.PAGE_NAME;
 
     supportedFeatures = {
         [CoreConstants.FEATURE_GROUPS]: true,
@@ -48,42 +47,7 @@ export class AddonModAssignModuleHandlerService implements CoreCourseModuleHandl
     };
 
     /**
-     * Check if the handler is enabled on a site level.
-     *
-     * @return Whether or not the handler is enabled on a site level.
-     */
-    async isEnabled(): Promise<boolean> {
-        return true;
-    }
-
-    /**
-     * Get the data required to display the module in the course contents view.
-     *
-     * @param module The module object.
-     * @return Data to render the module.
-     */
-    getData(module: CoreCourseAnyModuleData): CoreCourseModuleHandlerData {
-        return {
-            icon: CoreCourse.getModuleIconSrc(this.modName, 'modicon' in module ? module.modicon : undefined),
-            title: module.name,
-            class: 'addon-mod_assign-handler',
-            showDownloadButton: true,
-            action(event: Event, module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions): void {
-                options = options || {};
-                options.params = options.params || {};
-                Object.assign(options.params, { module });
-                const routeParams = '/' + courseId + '/' + module.id;
-
-                CoreNavigator.navigateToSitePath(AddonModAssignModuleHandlerService.PAGE_NAME + routeParams, options);
-            },
-        };
-    }
-
-    /**
-     * Get the component to render the module. This is needed to support singleactivity course format.
-     * The component returned must implement CoreCourseModuleMainComponent.
-     *
-     * @return The component to use, undefined if not found.
+     * @inheritdoc
      */
     async getMainComponent(): Promise<Type<unknown> | undefined> {
         return AddonModAssignIndexComponent;
diff --git a/src/addons/mod/book/services/handlers/module.ts b/src/addons/mod/book/services/handlers/module.ts
index 4ce95616e..ca5fcdd4d 100644
--- a/src/addons/mod/book/services/handlers/module.ts
+++ b/src/addons/mod/book/services/handlers/module.ts
@@ -15,23 +15,22 @@
 import { Injectable, Type } from '@angular/core';
 import { AddonModBookIndexComponent } from '../../components/index';
 import { AddonModBook } from '../book';
-import { CoreCourse, CoreCourseAnyModuleData } from '@features/course/services/course';
-import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
-import { CoreCourseModule } from '@features/course/services/course-helper';
 import { CoreConstants } from '@/core/constants';
-import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
+import { CoreCourseModuleHandler } from '@features/course/services/module-delegate';
 import { makeSingleton } from '@singletons';
+import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
 
 /**
  * Handler to support book modules.
  */
 @Injectable({ providedIn: 'root' })
-export class AddonModBookModuleHandlerService implements CoreCourseModuleHandler {
+export class AddonModBookModuleHandlerService extends CoreModuleHandlerBase implements CoreCourseModuleHandler {
 
     static readonly PAGE_NAME = 'mod_book';
 
     name = 'AddonModBook';
     modName = 'book';
+    protected pageName = AddonModBookModuleHandlerService.PAGE_NAME;
 
     supportedFeatures = {
         [CoreConstants.FEATURE_MOD_ARCHETYPE]: CoreConstants.MOD_ARCHETYPE_RESOURCE,
@@ -46,45 +45,14 @@ export class AddonModBookModuleHandlerService implements CoreCourseModuleHandler
     };
 
     /**
-     * Check if the handler is enabled on a site level.
-     *
-     * @return Whether or not the handler is enabled on a site level.
+     * @inheritdoc
      */
     isEnabled(): Promise<boolean> {
         return AddonModBook.isPluginEnabled();
     }
 
     /**
-     * Get the data required to display the module in the course contents view.
-     *
-     * @param module The module object.
-     * @param courseId The course ID.
-     * @param sectionId The section ID.
-     * @return Data to render the module.
-     */
-    getData(module: CoreCourseAnyModuleData): CoreCourseModuleHandlerData {
-        return {
-            icon: CoreCourse.getModuleIconSrc(this.modName, 'modicon' in module ? module.modicon : undefined),
-            title: module.name,
-            class: 'addon-mod_book-handler',
-            showDownloadButton: true,
-            action(event: Event, module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions): void {
-                options = options || {};
-                options.params = options.params || {};
-                Object.assign(options.params, { module });
-                const routeParams = '/' + courseId + '/' + module.id;
-
-                CoreNavigator.navigateToSitePath(AddonModBookModuleHandlerService.PAGE_NAME + routeParams, options);
-            },
-        };
-    }
-
-    /**
-     * Get the component to render the module. This is needed to support singleactivity course format.
-     * The component returned must implement CoreCourseModuleMainComponent.
-     * It's recommended to return the class of the component, but you can also return an instance of the component.
-     *
-     * @return The component (or promise resolved with component) to use, undefined if not found.
+     * @inheritdoc
      */
     async getMainComponent(): Promise<Type<unknown> | undefined> {
         return AddonModBookIndexComponent;
diff --git a/src/addons/mod/chat/services/handlers/module.ts b/src/addons/mod/chat/services/handlers/module.ts
index 451bda34d..16cfa87aa 100644
--- a/src/addons/mod/chat/services/handlers/module.ts
+++ b/src/addons/mod/chat/services/handlers/module.ts
@@ -14,10 +14,8 @@
 
 import { CoreConstants } from '@/core/constants';
 import { Injectable, Type } from '@angular/core';
-import { CoreCourse, CoreCourseAnyModuleData } from '@features/course/services/course';
-import { CoreCourseModule } from '@features/course/services/course-helper';
-import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
-import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
+import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
+import { CoreCourseModuleHandler } from '@features/course/services/module-delegate';
 import { makeSingleton } from '@singletons';
 import { AddonModChatIndexComponent } from '../../components/index';
 
@@ -25,12 +23,13 @@ import { AddonModChatIndexComponent } from '../../components/index';
  * Handler to support chat modules.
  */
 @Injectable({ providedIn: 'root' })
-export class AddonModChatModuleHandlerService implements CoreCourseModuleHandler {
+export class AddonModChatModuleHandlerService extends CoreModuleHandlerBase implements CoreCourseModuleHandler {
 
     static readonly PAGE_NAME = 'mod_chat';
 
     name = 'AddonModChat';
     modName = 'chat';
+    protected pageName = AddonModChatModuleHandlerService.PAGE_NAME;
 
     supportedFeatures = {
         [CoreConstants.FEATURE_GROUPS]: true,
@@ -43,35 +42,6 @@ export class AddonModChatModuleHandlerService implements CoreCourseModuleHandler
         [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true,
     };
 
-    /**
-     * @inheritdoc
-     */
-    async isEnabled(): Promise<boolean> {
-        return true;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    getData(module: CoreCourseAnyModuleData): CoreCourseModuleHandlerData {
-        const data: CoreCourseModuleHandlerData = {
-            icon: CoreCourse.getModuleIconSrc(this.modName, 'modicon' in module ? module.modicon : undefined),
-            title: module.name,
-            class: 'addon-mod_chat-handler',
-            showDownloadButton: true,
-            action(event: Event, module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions): void {
-                options = options || {};
-                options.params = options.params || {};
-                Object.assign(options.params, { module });
-                const routeParams = '/' + courseId + '/' + module.id;
-
-                CoreNavigator.navigateToSitePath(AddonModChatModuleHandlerService.PAGE_NAME + routeParams, options);
-            },
-        };
-
-        return data;
-    }
-
     /**
      * @inheritdoc
      */
diff --git a/src/addons/mod/choice/services/handlers/module.ts b/src/addons/mod/choice/services/handlers/module.ts
index 5f6d333cb..532204f81 100644
--- a/src/addons/mod/choice/services/handlers/module.ts
+++ b/src/addons/mod/choice/services/handlers/module.ts
@@ -14,10 +14,8 @@
 
 import { CoreConstants } from '@/core/constants';
 import { Injectable, Type } from '@angular/core';
-import { CoreCourse, CoreCourseAnyModuleData } from '@features/course/services/course';
-import { CoreCourseModule } from '@features/course/services/course-helper';
-import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
-import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
+import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
+import { CoreCourseModuleHandler } from '@features/course/services/module-delegate';
 import { makeSingleton } from '@singletons';
 import { AddonModChoiceIndexComponent } from '../../components/index';
 
@@ -25,12 +23,13 @@ import { AddonModChoiceIndexComponent } from '../../components/index';
  * Handler to support choice modules.
  */
 @Injectable({ providedIn: 'root' })
-export class AddonModChoiceModuleHandlerService implements CoreCourseModuleHandler {
+export class AddonModChoiceModuleHandlerService extends CoreModuleHandlerBase implements CoreCourseModuleHandler {
 
     static readonly PAGE_NAME = 'mod_choice';
 
     name = 'AddonModChoice';
     modName = 'choice';
+    protected pageName = AddonModChoiceModuleHandlerService.PAGE_NAME;
 
     supportedFeatures = {
         [CoreConstants.FEATURE_GROUPS]: true,
@@ -44,33 +43,6 @@ export class AddonModChoiceModuleHandlerService implements CoreCourseModuleHandl
         [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true,
     };
 
-    /**
-     * @inheritdoc
-     */
-    async isEnabled(): Promise<boolean> {
-        return true;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    getData(module: CoreCourseAnyModuleData): CoreCourseModuleHandlerData {
-        return {
-            icon: CoreCourse.getModuleIconSrc(this.modName, 'modicon' in module ? module.modicon : undefined),
-            title: module.name,
-            class: 'addon-mod_choice-handler',
-            showDownloadButton: true,
-            action(event: Event, module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions): void {
-                options = options || {};
-                options.params = options.params || {};
-                Object.assign(options.params, { module });
-                const routeParams = '/' + courseId + '/' + module.id;
-
-                CoreNavigator.navigateToSitePath(AddonModChoiceModuleHandlerService.PAGE_NAME + routeParams, options);
-            },
-        };
-    }
-
     /**
      * @inheritdoc
      */
diff --git a/src/addons/mod/data/services/handlers/module.ts b/src/addons/mod/data/services/handlers/module.ts
index 1ccb3d958..dc930ee0f 100644
--- a/src/addons/mod/data/services/handlers/module.ts
+++ b/src/addons/mod/data/services/handlers/module.ts
@@ -14,10 +14,8 @@
 
 import { CoreConstants } from '@/core/constants';
 import { Injectable, Type } from '@angular/core';
-import { CoreCourse, CoreCourseAnyModuleData } from '@features/course/services/course';
-import { CoreCourseModule } from '@features/course/services/course-helper';
-import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
-import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
+import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
+import { CoreCourseModuleHandler } from '@features/course/services/module-delegate';
 import { makeSingleton } from '@singletons';
 import { AddonModDataIndexComponent } from '../../components/index';
 
@@ -25,12 +23,13 @@ import { AddonModDataIndexComponent } from '../../components/index';
  * Handler to support data modules.
  */
 @Injectable({ providedIn: 'root' })
-export class AddonModDataModuleHandlerService implements CoreCourseModuleHandler {
+export class AddonModDataModuleHandlerService extends CoreModuleHandlerBase implements CoreCourseModuleHandler {
 
     static readonly PAGE_NAME = 'mod_data';
 
     name = 'AddonModData';
     modName = 'data';
+    protected pageName = AddonModDataModuleHandlerService.PAGE_NAME;
 
     supportedFeatures = {
         [CoreConstants.FEATURE_GROUPS]: true,
@@ -46,33 +45,6 @@ export class AddonModDataModuleHandlerService implements CoreCourseModuleHandler
         [CoreConstants.FEATURE_COMMENT]: true,
     };
 
-    /**
-     * @inheritdoc
-     */
-    async isEnabled(): Promise<boolean> {
-        return true;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    getData(module: CoreCourseAnyModuleData): CoreCourseModuleHandlerData {
-        return {
-            icon: CoreCourse.getModuleIconSrc(this.modName, 'modicon' in module ? module.modicon : undefined),
-            title: module.name,
-            class: 'addon-mod_data-handler',
-            showDownloadButton: true,
-            action(event: Event, module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions): void {
-                options = options || {};
-                options.params = options.params || {};
-                Object.assign(options.params, { module });
-                const routeParams = '/' + courseId + '/' + module.id;
-
-                CoreNavigator.navigateToSitePath(AddonModDataModuleHandlerService.PAGE_NAME + routeParams, options);
-            },
-        };
-    }
-
     /**
      * @inheritdoc
      */
diff --git a/src/addons/mod/feedback/services/handlers/module.ts b/src/addons/mod/feedback/services/handlers/module.ts
index 5b7b1342c..da1fedf27 100644
--- a/src/addons/mod/feedback/services/handlers/module.ts
+++ b/src/addons/mod/feedback/services/handlers/module.ts
@@ -14,23 +14,22 @@
 
 import { CoreConstants } from '@/core/constants';
 import { Injectable, Type } from '@angular/core';
-import { CoreCourse, CoreCourseAnyModuleData } from '@features/course/services/course';
-import { CoreCourseModule } from '@features/course/services/course-helper';
-import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
-import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
+import { CoreCourseModuleHandler } from '@features/course/services/module-delegate';
 import { makeSingleton } from '@singletons';
 import { AddonModFeedbackIndexComponent } from '../../components/index';
+import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
 
 /**
  * Handler to support feedback modules.
  */
 @Injectable({ providedIn: 'root' })
-export class AddonModFeedbackModuleHandlerService implements CoreCourseModuleHandler {
+export class AddonModFeedbackModuleHandlerService extends CoreModuleHandlerBase implements CoreCourseModuleHandler {
 
     static readonly PAGE_NAME = 'mod_feedback';
 
     name = 'AddonModFeedback';
     modName = 'feedback';
+    protected pageName = AddonModFeedbackModuleHandlerService.PAGE_NAME;
 
     supportedFeatures = {
         [CoreConstants.FEATURE_GROUPS]: true,
@@ -44,33 +43,6 @@ export class AddonModFeedbackModuleHandlerService implements CoreCourseModuleHan
         [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true,
     };
 
-    /**
-     * @inheritdoc
-     */
-    async isEnabled(): Promise<boolean> {
-        return true;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    getData(module: CoreCourseAnyModuleData): CoreCourseModuleHandlerData {
-        return {
-            icon: CoreCourse.getModuleIconSrc(this.modName, 'modicon' in module ? module.modicon : undefined),
-            title: module.name,
-            class: 'addon-mod_feedback-handler',
-            showDownloadButton: true,
-            action(event: Event, module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions): void {
-                options = options || {};
-                options.params = options.params || {};
-                Object.assign(options.params, { module });
-                const routeParams = '/' + courseId + '/' + module.id;
-
-                CoreNavigator.navigateToSitePath(AddonModFeedbackModuleHandlerService.PAGE_NAME + routeParams, options);
-            },
-        };
-    }
-
     /**
      * @inheritdoc
      */
diff --git a/src/addons/mod/folder/services/handlers/module.ts b/src/addons/mod/folder/services/handlers/module.ts
index f00241460..b127b468c 100644
--- a/src/addons/mod/folder/services/handlers/module.ts
+++ b/src/addons/mod/folder/services/handlers/module.ts
@@ -14,10 +14,8 @@
 
 import { CoreConstants } from '@/core/constants';
 import { Injectable, Type } from '@angular/core';
-import { CoreCourse, CoreCourseAnyModuleData } from '@features/course/services/course';
-import { CoreCourseModule } from '@features/course/services/course-helper';
-import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
-import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
+import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
+import { CoreCourseModuleHandler } from '@features/course/services/module-delegate';
 import { makeSingleton } from '@singletons';
 import { AddonModFolderIndexComponent } from '../../components/index';
 
@@ -25,12 +23,13 @@ import { AddonModFolderIndexComponent } from '../../components/index';
  * Handler to support folder modules.
  */
 @Injectable({ providedIn: 'root' })
-export class AddonModFolderModuleHandlerService implements CoreCourseModuleHandler {
+export class AddonModFolderModuleHandlerService extends CoreModuleHandlerBase implements CoreCourseModuleHandler {
 
     static readonly PAGE_NAME = 'mod_folder';
 
     name = 'AddonModFolder';
     modName = 'folder';
+    protected pageName = AddonModFolderModuleHandlerService.PAGE_NAME;
 
     supportedFeatures = {
         [CoreConstants.FEATURE_MOD_ARCHETYPE]: CoreConstants.MOD_ARCHETYPE_RESOURCE,
@@ -44,33 +43,6 @@ export class AddonModFolderModuleHandlerService implements CoreCourseModuleHandl
         [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true,
     };
 
-    /**
-     * @inheritdoc
-     */
-    async isEnabled(): Promise<boolean> {
-        return true;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    getData(module: CoreCourseAnyModuleData): CoreCourseModuleHandlerData {
-        return {
-            icon: CoreCourse.getModuleIconSrc(this.modName, 'modicon' in module ? module.modicon : undefined),
-            title: module.name,
-            class: 'addon-mod_folder-handler',
-            showDownloadButton: true,
-            action(event: Event, module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions): void {
-                options = options || {};
-                options.params = options.params || {};
-                Object.assign(options.params, { module });
-                const routeParams = '/' + courseId + '/' + module.id;
-
-                CoreNavigator.navigateToSitePath(AddonModFolderModuleHandlerService.PAGE_NAME + routeParams, options);
-            },
-        };
-    }
-
     /**
      * @inheritdoc
      */
diff --git a/src/addons/mod/forum/services/handlers/module.ts b/src/addons/mod/forum/services/handlers/module.ts
index c9bc2e41e..3b7327923 100644
--- a/src/addons/mod/forum/services/handlers/module.ts
+++ b/src/addons/mod/forum/services/handlers/module.ts
@@ -14,9 +14,7 @@
 
 import { Injectable, Type } from '@angular/core';
 import { AddonModForum, AddonModForumProvider } from '../forum';
-import { CoreCourse, CoreCourseAnyModuleData } from '@features/course/services/course';
-import { CoreCourseModule } from '@features/course/services/course-helper';
-import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
+import { CoreCourseAnyModuleData } from '@features/course/services/course';
 import { makeSingleton, Translate } from '@singletons';
 import { CoreEvents } from '@singletons/events';
 import { CoreSites } from '@services/sites';
@@ -24,17 +22,19 @@ import { CoreUtils } from '@services/utils/utils';
 import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
 import { CoreConstants } from '@/core/constants';
 import { AddonModForumIndexComponent } from '../../components/index';
+import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
 
 /**
  * Handler to support forum modules.
  */
 @Injectable({ providedIn: 'root' })
-export class AddonModForumModuleHandlerService implements CoreCourseModuleHandler {
+export class AddonModForumModuleHandlerService extends CoreModuleHandlerBase implements CoreCourseModuleHandler {
 
     static readonly PAGE_NAME = 'mod_forum';
 
     name = 'AddonModForum';
     modName = 'forum';
+    protected pageName = AddonModForumModuleHandlerService.PAGE_NAME;
 
     supportedFeatures = {
         [CoreConstants.FEATURE_GROUPS]: true,
@@ -51,39 +51,10 @@ export class AddonModForumModuleHandlerService implements CoreCourseModuleHandle
     };
 
     /**
-     * Check if the handler is enabled on a site level.
-     *
-     * @return Whether or not the handler is enabled on a site level.
-     */
-    isEnabled(): Promise<boolean> {
-        return Promise.resolve(true);
-    }
-
-    /**
-     * Get the data required to display the module in the course contents view.
-     *
-     * @param module The module object.
-     * @param courseId The course ID.
-     * @param sectionId The section ID.
-     * @return Data to render the module.
+     * @inheritdoc
      */
     getData(module: CoreCourseAnyModuleData, courseId: number): CoreCourseModuleHandlerData {
-        const data: CoreCourseModuleHandlerData = {
-            icon: CoreCourse.getModuleIconSrc(this.modName, 'modicon' in module ? module.modicon : undefined),
-            title: module.name,
-            class: 'addon-mod_forum-handler',
-            showDownloadButton: true,
-            action(event: Event, module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions): void {
-                options = options || {};
-                options.params = options.params || {};
-                Object.assign(options.params, { module });
-
-                CoreNavigator.navigateToSitePath(
-                    `${AddonModForumModuleHandlerService.PAGE_NAME}/${courseId}/${module.id}`,
-                    options,
-                );
-            },
-        };
+        const data = super.getData(module, courseId);
 
         if ('afterlink' in module && !!module.afterlink) {
             data.extraBadgeColor = '';
@@ -111,20 +82,14 @@ export class AddonModForumModuleHandlerService implements CoreCourseModuleHandle
     }
 
     /**
-     * Get the component to render the module. This is needed to support singleactivity course format.
-     * The component returned must implement CoreCourseModuleMainComponent.
-     *
-     * @return The component to use, undefined if not found.
+     * @inheritdoc
      */
     async getMainComponent(): Promise<Type<unknown> | undefined> {
         return AddonModForumIndexComponent;
     }
 
     /**
-     * Whether to display the course refresher in single activity course format. If it returns false, a refresher must be
-     * included in the template that calls the doRefresh method of the component. Defaults to true.
-     *
-     * @return Whether the refresher should be displayed.
+     * @inheritdoc
      */
     displayRefresherInSingleActivity(): boolean {
         return false;
@@ -161,7 +126,7 @@ export class AddonModForumModuleHandlerService implements CoreCourseModuleHandle
                     { $a : forum.unreadpostscount },
                 )
                 : '';
-        } catch (error) {
+        } catch {
             // Ignore errors.
             data.extraBadgeColor = '';
             data.extraBadge = '';
diff --git a/src/addons/mod/glossary/services/handlers/module.ts b/src/addons/mod/glossary/services/handlers/module.ts
index f49bfef4e..b7eb1a0f6 100644
--- a/src/addons/mod/glossary/services/handlers/module.ts
+++ b/src/addons/mod/glossary/services/handlers/module.ts
@@ -14,10 +14,8 @@
 
 import { CoreConstants } from '@/core/constants';
 import { Injectable, Type } from '@angular/core';
-import { CoreCourse, CoreCourseAnyModuleData } from '@features/course/services/course';
-import { CoreCourseModule } from '@features/course/services/course-helper';
-import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
-import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
+import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
+import { CoreCourseModuleHandler } from '@features/course/services/module-delegate';
 import { makeSingleton } from '@singletons';
 import { AddonModGlossaryIndexComponent } from '../../components/index/index';
 
@@ -25,12 +23,13 @@ import { AddonModGlossaryIndexComponent } from '../../components/index/index';
  * Handler to support glossary modules.
  */
 @Injectable({ providedIn: 'root' })
-export class AddonModGlossaryModuleHandlerService implements CoreCourseModuleHandler {
+export class AddonModGlossaryModuleHandlerService extends CoreModuleHandlerBase implements CoreCourseModuleHandler {
 
     static readonly PAGE_NAME = 'mod_glossary';
 
     name = 'AddonModGlossary';
     modName = 'glossary';
+    protected pageName = AddonModGlossaryModuleHandlerService.PAGE_NAME;
 
     supportedFeatures = {
         [CoreConstants.FEATURE_GROUPS]: false,
@@ -46,33 +45,6 @@ export class AddonModGlossaryModuleHandlerService implements CoreCourseModuleHan
         [CoreConstants.FEATURE_PLAGIARISM]: true,
     };
 
-    /**
-     * @inheritdoc
-     */
-    async isEnabled(): Promise<boolean> {
-        return true;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    getData(module: CoreCourseAnyModuleData): CoreCourseModuleHandlerData {
-        return {
-            icon: CoreCourse.getModuleIconSrc(this.modName, 'modicon' in module ? module.modicon : undefined),
-            title: module.name,
-            class: 'addon-mod_glossary-handler',
-            showDownloadButton: true,
-            action: (event: Event, module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions) => {
-                options = options || {};
-                options.params = options.params || {};
-                Object.assign(options.params, { module });
-                const routeParams = '/' + courseId + '/' + module.id;
-
-                CoreNavigator.navigateToSitePath(AddonModGlossaryModuleHandlerService.PAGE_NAME + routeParams, options);
-            },
-        };
-    }
-
     /**
      * @inheritdoc
      */
diff --git a/src/addons/mod/h5pactivity/services/handlers/module.ts b/src/addons/mod/h5pactivity/services/handlers/module.ts
index 1875bed1f..dfa1c7900 100644
--- a/src/addons/mod/h5pactivity/services/handlers/module.ts
+++ b/src/addons/mod/h5pactivity/services/handlers/module.ts
@@ -14,10 +14,8 @@
 
 import { CoreConstants } from '@/core/constants';
 import { Injectable, Type } from '@angular/core';
-import { CoreCourse, CoreCourseAnyModuleData } from '@features/course/services/course';
-import { CoreCourseModule } from '@features/course/services/course-helper';
-import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
-import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
+import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
+import { CoreCourseModuleHandler } from '@features/course/services/module-delegate';
 import { makeSingleton } from '@singletons';
 import { AddonModH5PActivityIndexComponent } from '../../components/index';
 import { AddonModH5PActivity } from '../h5pactivity';
@@ -26,12 +24,13 @@ import { AddonModH5PActivity } from '../h5pactivity';
  * Handler to support H5P activities.
  */
 @Injectable({ providedIn: 'root' })
-export class AddonModH5PActivityModuleHandlerService implements CoreCourseModuleHandler {
+export class AddonModH5PActivityModuleHandlerService extends CoreModuleHandlerBase implements CoreCourseModuleHandler {
 
     static readonly PAGE_NAME = 'mod_h5pactivity';
 
     name = 'AddonModH5PActivity';
     modName = 'h5pactivity';
+    protected pageName = AddonModH5PActivityModuleHandlerService.PAGE_NAME;
 
     supportedFeatures = {
         [CoreConstants.FEATURE_GROUPS]: true,
@@ -52,27 +51,6 @@ export class AddonModH5PActivityModuleHandlerService implements CoreCourseModule
         return AddonModH5PActivity.isPluginEnabled();
     }
 
-    /**
-     * @inheritdoc
-     */
-    getData(module: CoreCourseAnyModuleData): CoreCourseModuleHandlerData {
-
-        return {
-            icon: CoreCourse.getModuleIconSrc(this.modName, 'modicon' in module ? module.modicon : undefined),
-            title: module.name,
-            class: 'addon-mod_h5pactivity-handler',
-            showDownloadButton: true,
-            action(event: Event, module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions) {
-                options = options || {};
-                options.params = options.params || {};
-                Object.assign(options.params, { module });
-                const routeParams = '/' + courseId + '/' + module.id;
-
-                CoreNavigator.navigateToSitePath(AddonModH5PActivityModuleHandlerService.PAGE_NAME + routeParams, options);
-            },
-        };
-    }
-
     /**
      * @inheritdoc
      */
diff --git a/src/addons/mod/imscp/services/handlers/module.ts b/src/addons/mod/imscp/services/handlers/module.ts
index 996d09304..d1dea4491 100644
--- a/src/addons/mod/imscp/services/handlers/module.ts
+++ b/src/addons/mod/imscp/services/handlers/module.ts
@@ -14,10 +14,8 @@
 
 import { CoreConstants } from '@/core/constants';
 import { Injectable, Type } from '@angular/core';
-import { CoreCourse, CoreCourseAnyModuleData } from '@features/course/services/course';
-import { CoreCourseModule } from '@features/course/services/course-helper';
-import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
-import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
+import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
+import { CoreCourseModuleHandler } from '@features/course/services/module-delegate';
 import { makeSingleton } from '@singletons';
 import { AddonModImscpIndexComponent } from '../../components/index';
 import { AddonModImscp } from '../imscp';
@@ -26,12 +24,13 @@ import { AddonModImscp } from '../imscp';
  * Handler to support IMSCP modules.
  */
 @Injectable( { providedIn: 'root' })
-export class AddonModImscpModuleHandlerService implements CoreCourseModuleHandler {
+export class AddonModImscpModuleHandlerService extends CoreModuleHandlerBase implements CoreCourseModuleHandler {
 
     static readonly PAGE_NAME = 'mod_imscp';
 
     name = 'AddonModImscp';
     modName = 'imscp';
+    protected pageName = AddonModImscpModuleHandlerService.PAGE_NAME;
 
     supportedFeatures = {
         [CoreConstants.FEATURE_MOD_ARCHETYPE]: CoreConstants.MOD_ARCHETYPE_RESOURCE,
@@ -55,27 +54,7 @@ export class AddonModImscpModuleHandlerService implements CoreCourseModuleHandle
     /**
      * @inheritdoc
      */
-    getData(module: CoreCourseAnyModuleData): CoreCourseModuleHandlerData {
-        return {
-            icon: CoreCourse.getModuleIconSrc(this.modName, 'modicon' in module ? module.modicon : undefined),
-            title: module.name,
-            class: 'addon-mod_imscp-handler',
-            showDownloadButton: true,
-            action(event: Event, module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions): void {
-                options = options || {};
-                options.params = options.params || {};
-                Object.assign(options.params, { module });
-                const routeParams = '/' + courseId + '/' + module.id;
-
-                CoreNavigator.navigateToSitePath(AddonModImscpModuleHandlerService.PAGE_NAME + routeParams, options);
-            },
-        };
-    }
-
-    /**
-     * @inheritdoc
-     */
-    async getMainComponent(): Promise<Type<unknown> | undefined> {
+    async getMainComponent(): Promise<Type<unknown>> {
         return AddonModImscpIndexComponent;
     }
 
diff --git a/src/addons/mod/label/services/handlers/module.ts b/src/addons/mod/label/services/handlers/module.ts
index 46e0ad9da..9fd176d90 100644
--- a/src/addons/mod/label/services/handlers/module.ts
+++ b/src/addons/mod/label/services/handlers/module.ts
@@ -14,6 +14,7 @@
 
 import { CoreConstants } from '@/core/constants';
 import { Injectable } from '@angular/core';
+import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
 import { CoreCourseWSModule } from '@features/course/services/course';
 import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
 import { makeSingleton } from '@singletons';
@@ -22,7 +23,7 @@ import { makeSingleton } from '@singletons';
  * Handler to support label modules.
  */
 @Injectable({ providedIn: 'root' })
-export class AddonModLabelModuleHandlerService implements CoreCourseModuleHandler {
+export class AddonModLabelModuleHandlerService extends CoreModuleHandlerBase implements CoreCourseModuleHandler {
 
     name = 'AddonModLabel';
     modName = 'label';
@@ -40,13 +41,6 @@ export class AddonModLabelModuleHandlerService implements CoreCourseModuleHandle
         [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true,
     };
 
-    /**
-     * @inheritdoc
-     */
-    async isEnabled(): Promise<boolean> {
-        return true;
-    }
-
     /**
      * @inheritdoc
      */
@@ -57,7 +51,7 @@ export class AddonModLabelModuleHandlerService implements CoreCourseModuleHandle
 
         return {
             icon: '',
-            title: title,
+            title,
             a11yTitle: '',
             class: 'addon-mod-label-handler',
         };
diff --git a/src/addons/mod/lesson/services/handlers/module.ts b/src/addons/mod/lesson/services/handlers/module.ts
index 68cf0e871..7563848e7 100644
--- a/src/addons/mod/lesson/services/handlers/module.ts
+++ b/src/addons/mod/lesson/services/handlers/module.ts
@@ -15,24 +15,22 @@
 import { Injectable, Type } from '@angular/core';
 
 import { CoreConstants } from '@/core/constants';
-import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
-import { CoreCourse, CoreCourseAnyModuleData, CoreCourseWSModule } from '@features/course/services/course';
-import { CoreCourseModule } from '@features/course/services/course-helper';
+import { CoreCourseModuleHandler } from '@features/course/services/module-delegate';
 import { AddonModLessonIndexComponent } from '../../components/index';
-import { CoreCourseAnyCourseData } from '@features/courses/services/courses';
-import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
 import { makeSingleton } from '@singletons';
+import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
 
 /**
- * Handler to support quiz modules.
+ * Handler to support lesson modules.
  */
 @Injectable({ providedIn: 'root' })
-export class AddonModLessonModuleHandlerService implements CoreCourseModuleHandler {
+export class AddonModLessonModuleHandlerService extends CoreModuleHandlerBase implements CoreCourseModuleHandler {
 
     static readonly PAGE_NAME = 'mod_lesson';
 
     name = 'AddonModLesson';
     modName = 'lesson';
+    protected pageName = AddonModLessonModuleHandlerService.PAGE_NAME;
 
     supportedFeatures = {
         [CoreConstants.FEATURE_GROUPS]: true,
@@ -47,55 +45,9 @@ export class AddonModLessonModuleHandlerService implements CoreCourseModuleHandl
     };
 
     /**
-     * Check if the handler is enabled on a site level.
-     *
-     * @return Promise resolved with boolean: whether or not the handler is enabled on a site level.
+     * @inheritdoc
      */
-    async isEnabled(): Promise<boolean> {
-        return true;
-    }
-
-    /**
-     * Get the data required to display the module in the course contents view.
-     *
-     * @param module The module object.
-     * @param courseId The course ID.
-     * @param sectionId The section ID.
-     * @param forCoursePage Whether the data will be used to render the course page.
-     * @return Data to render the module.
-     */
-    getData(
-        module: CoreCourseAnyModuleData,
-        courseId: number, // eslint-disable-line @typescript-eslint/no-unused-vars
-        sectionId: number, // eslint-disable-line @typescript-eslint/no-unused-vars
-        forCoursePage?: boolean, // eslint-disable-line @typescript-eslint/no-unused-vars
-    ): CoreCourseModuleHandlerData {
-        return {
-            icon: CoreCourse.getModuleIconSrc(this.modName, 'modicon' in module ? module.modicon : undefined),
-            title: module.name,
-            class: 'addon-mod_lesson-handler',
-            showDownloadButton: true,
-            action: (event: Event, module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions) => {
-                options = options || {};
-                options.params = options.params || {};
-                Object.assign(options.params, { module });
-                const routeParams = '/' + courseId + '/' + module.id;
-
-                CoreNavigator.navigateToSitePath(AddonModLessonModuleHandlerService.PAGE_NAME + routeParams, options);
-            },
-        };
-    }
-
-    /**
-     * Get the component to render the module. This is needed to support singleactivity course format.
-     * The component returned must implement CoreCourseModuleMainComponent.
-     *
-     * @param course The course object.
-     * @param module The module object.
-     * @return The component to use, undefined if not found.
-     */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async getMainComponent(course: CoreCourseAnyCourseData, module: CoreCourseWSModule): Promise<Type<unknown> | undefined> {
+    async getMainComponent(): Promise<Type<unknown>> {
         return AddonModLessonIndexComponent;
     }
 
diff --git a/src/addons/mod/lti/services/handlers/module.ts b/src/addons/mod/lti/services/handlers/module.ts
index 6ad46c087..6d5e78673 100644
--- a/src/addons/mod/lti/services/handlers/module.ts
+++ b/src/addons/mod/lti/services/handlers/module.ts
@@ -16,28 +16,29 @@ import { Injectable, Type } from '@angular/core';
 
 import { CoreConstants } from '@/core/constants';
 import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
-import { CoreCourse, CoreCourseAnyModuleData } from '@features/course/services/course';
+import { CoreCourseAnyModuleData } from '@features/course/services/course';
 import { CoreCourseModule } from '@features/course/services/course-helper';
 import { CoreApp } from '@services/app';
 import { CoreFilepool } from '@services/filepool';
-import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
 import { DomSanitizer, makeSingleton } from '@singletons';
 import { AddonModLtiHelper } from '../lti-helper';
 import { AddonModLti, AddonModLtiProvider } from '../lti';
 import { AddonModLtiIndexComponent } from '../../components/index';
+import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
 
 /**
  * Handler to support LTI modules.
  */
 @Injectable({ providedIn: 'root' })
-export class AddonModLtiModuleHandlerService implements CoreCourseModuleHandler {
+export class AddonModLtiModuleHandlerService extends CoreModuleHandlerBase implements CoreCourseModuleHandler {
 
     static readonly PAGE_NAME = 'mod_lti';
 
     name = 'AddonModLti';
     modName = 'lti';
+    protected pageName = AddonModLtiModuleHandlerService.PAGE_NAME;
 
     supportedFeatures = {
         [CoreConstants.FEATURE_GROUPS]: false,
@@ -50,42 +51,26 @@ export class AddonModLtiModuleHandlerService implements CoreCourseModuleHandler
         [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true,
     };
 
-    /**
-     * @inheritdoc
-     */
-    async isEnabled(): Promise<boolean> {
-        return true;
-    }
-
     /**
      * @inheritdoc
      */
     getData(
         module: CoreCourseAnyModuleData,
         courseId: number,
+        sectionId?: number,
+        forCoursePage?: boolean,
     ): CoreCourseModuleHandlerData {
+        const data = super.getData(module, courseId, sectionId, forCoursePage);
+        data.showDownloadButton = false;
 
-        const data: CoreCourseModuleHandlerData = {
-            icon: CoreCourse.getModuleIconSrc(this.modName, 'modicon' in module ? module.modicon : undefined),
-            title: module.name,
-            class: 'addon-mod_lti-handler',
-            action(event: Event, module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions): void {
-                options = options || {};
-                options.params = options.params || {};
-                Object.assign(options.params, { module });
-                const routeParams = '/' + courseId + '/' + module.id;
-
-                CoreNavigator.navigateToSitePath(AddonModLtiModuleHandlerService.PAGE_NAME + routeParams, options);
+        data.buttons = [{
+            icon: 'fas-external-link-alt',
+            label: 'addon.mod_lti.launchactivity',
+            action: (event: Event, module: CoreCourseModule, courseId: number): void => {
+                // Launch the LTI.
+                AddonModLtiHelper.getDataAndLaunch(courseId, module);
             },
-            buttons: [{
-                icon: 'fas-external-link-alt',
-                label: 'addon.mod_lti.launchactivity',
-                action: (event: Event, module: CoreCourseModule, courseId: number): void => {
-                    // Launch the LTI.
-                    AddonModLtiHelper.getDataAndLaunch(courseId, module);
-                },
-            }],
-        };
+        }];
 
         // Handle custom icons.
         CoreUtils.ignoreErrors(this.loadCustomIcon(module, courseId, data));
@@ -133,7 +118,7 @@ export class AddonModLtiModuleHandlerService implements CoreCourseModuleHandler
     /**
      * @inheritdoc
      */
-    async getMainComponent(): Promise<Type<unknown> | undefined> {
+    async getMainComponent(): Promise<Type<unknown>> {
         return AddonModLtiIndexComponent;
     }
 
diff --git a/src/addons/mod/page/services/handlers/module.ts b/src/addons/mod/page/services/handlers/module.ts
index 7344acbd6..688d9eabc 100644
--- a/src/addons/mod/page/services/handlers/module.ts
+++ b/src/addons/mod/page/services/handlers/module.ts
@@ -14,24 +14,23 @@
 
 import { Injectable, Type } from '@angular/core';
 import { AddonModPage } from '../page';
-import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
+import { CoreCourseModuleHandler } from '@features/course/services/module-delegate';
 import { CoreConstants } from '@/core/constants';
-import { CoreCourse, CoreCourseAnyModuleData } from '@features/course/services/course';
-import { CoreCourseModule } from '@features/course/services/course-helper';
-import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
 import { AddonModPageIndexComponent } from '../../components/index';
 import { makeSingleton } from '@singletons';
+import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
 
 /**
  * Handler to support page modules.
  */
 @Injectable({ providedIn: 'root' })
-export class AddonModPageModuleHandlerService implements CoreCourseModuleHandler {
+export class AddonModPageModuleHandlerService extends CoreModuleHandlerBase implements CoreCourseModuleHandler {
 
     static readonly PAGE_NAME = 'mod_page';
 
     name = 'AddonModPage';
     modName = 'page';
+    protected pageName = AddonModPageModuleHandlerService.PAGE_NAME;
 
     supportedFeatures = {
         [CoreConstants.FEATURE_MOD_ARCHETYPE]: CoreConstants.MOD_ARCHETYPE_RESOURCE,
@@ -46,46 +45,16 @@ export class AddonModPageModuleHandlerService implements CoreCourseModuleHandler
     };
 
     /**
-     * Check if the handler is enabled on a site level.
-     *
-     * @return Whether or not the handler is enabled on a site level.
+     * @inheritdoc
      */
     isEnabled(): Promise<boolean> {
         return AddonModPage.isPluginEnabled();
     }
 
     /**
-     * Get the data required to display the module in the course contents view.
-     *
-     * @param module The module object.
-     * @return Data to render the module.
+     * @inheritdoc
      */
-    getData(module: CoreCourseAnyModuleData): CoreCourseModuleHandlerData {
-        return {
-            icon: CoreCourse.getModuleIconSrc(this.modName, 'modicon' in module ? module.modicon : undefined),
-            title: module.name,
-            class: 'addon-mod_page-handler',
-            showDownloadButton: true,
-            action(event: Event, module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions): void {
-                options = options || {};
-                options.params = options.params || {};
-                Object.assign(options.params, { module });
-                const routeParams = '/' + courseId + '/' + module.id;
-
-                CoreNavigator.navigateToSitePath(AddonModPageModuleHandlerService.PAGE_NAME + routeParams, options);
-            },
-        };
-    }
-
-    /**
-     * Get the component to render the module. This is needed to support singleactivity course format.
-     * The component returned must implement CoreCourseModuleMainComponent.
-     *
-     * @param course The course object.
-     * @param module The module object.
-     * @return The component to use, undefined if not found.
-     */
-    async getMainComponent(): Promise<Type<unknown> | undefined> {
+    async getMainComponent(): Promise<Type<unknown>> {
         return AddonModPageIndexComponent;
     }
 
diff --git a/src/addons/mod/quiz/services/handlers/module.ts b/src/addons/mod/quiz/services/handlers/module.ts
index 41f13113a..70cad4de5 100644
--- a/src/addons/mod/quiz/services/handlers/module.ts
+++ b/src/addons/mod/quiz/services/handlers/module.ts
@@ -15,23 +15,22 @@
 import { Injectable, Type } from '@angular/core';
 
 import { CoreConstants } from '@/core/constants';
-import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
-import { CoreCourse, CoreCourseAnyModuleData } from '@features/course/services/course';
-import { CoreCourseModule } from '@features/course/services/course-helper';
-import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
+import { CoreCourseModuleHandler } from '@features/course/services/module-delegate';
 import { AddonModQuizIndexComponent } from '../../components/index';
 import { makeSingleton } from '@singletons';
+import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
 
 /**
  * Handler to support quiz modules.
  */
 @Injectable({ providedIn: 'root' })
-export class AddonModQuizModuleHandlerService implements CoreCourseModuleHandler {
+export class AddonModQuizModuleHandlerService extends CoreModuleHandlerBase implements CoreCourseModuleHandler {
 
     static readonly PAGE_NAME = 'mod_quiz';
 
     name = 'AddonModQuiz';
     modName = 'quiz';
+    protected pageName = AddonModQuizModuleHandlerService.PAGE_NAME;
 
     supportedFeatures = {
         [CoreConstants.FEATURE_GROUPS]: true,
@@ -48,46 +47,7 @@ export class AddonModQuizModuleHandlerService implements CoreCourseModuleHandler
     };
 
     /**
-     * Check if the handler is enabled on a site level.
-     *
-     * @return Whether or not the handler is enabled on a site level.
-     */
-    async isEnabled(): Promise<boolean> {
-        return true;
-    }
-
-    /**
-     * Get the data required to display the module in the course contents view.
-     *
-     * @param module The module object.
-     * @param courseId The course ID.
-     * @param sectionId The section ID.
-     * @return Data to render the module.
-     */
-    getData(module: CoreCourseAnyModuleData): CoreCourseModuleHandlerData {
-        return {
-            icon: CoreCourse.getModuleIconSrc(this.modName, 'modicon' in module ? module.modicon : undefined),
-            title: module.name,
-            class: 'addon-mod_quiz-handler',
-            showDownloadButton: true,
-            action: (event: Event, module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions) => {
-                options = options || {};
-                options.params = options.params || {};
-                Object.assign(options.params, { module });
-                const routeParams = '/' + courseId + '/' + module.id;
-
-                CoreNavigator.navigateToSitePath(AddonModQuizModuleHandlerService.PAGE_NAME + routeParams, options);
-            },
-        };
-    }
-
-    /**
-     * Get the component to render the module. This is needed to support singleactivity course format.
-     * The component returned must implement CoreCourseModuleMainComponent.
-     *
-     * @param course The course object.
-     * @param module The module object.
-     * @return The component to use, undefined if not found.
+     * @inheritdoc
      */
     async getMainComponent(): Promise<Type<unknown>> {
         return AddonModQuizIndexComponent;
diff --git a/src/addons/mod/resource/services/handlers/module.ts b/src/addons/mod/resource/services/handlers/module.ts
index 317bd0c1f..e2639eeea 100644
--- a/src/addons/mod/resource/services/handlers/module.ts
+++ b/src/addons/mod/resource/services/handlers/module.ts
@@ -14,12 +14,12 @@
 
 import { CoreConstants } from '@/core/constants';
 import { Injectable, Type } from '@angular/core';
+import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
 import { CoreCourse, CoreCourseAnyModuleData, CoreCourseModuleContentFile } from '@features/course/services/course';
 import { CoreCourseModule } from '@features/course/services/course-helper';
 import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
 import { CoreCourseModulePrefetchDelegate } from '@features/course/services/module-prefetch-delegate';
 import { CoreFileHelper } from '@services/file-helper';
-import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
 import { CoreMimetypeUtils } from '@services/utils/mimetype';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreTimeUtils } from '@services/utils/time';
@@ -33,12 +33,13 @@ import { AddonModResourceHelper } from '../resource-helper';
  * Handler to support resource modules.
  */
 @Injectable({ providedIn: 'root' })
-export class AddonModResourceModuleHandlerService implements CoreCourseModuleHandler {
+export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase implements CoreCourseModuleHandler {
 
     static readonly PAGE_NAME = 'mod_resource';
 
     name = 'AddonModResource';
     modName = 'resource';
+    protected pageName = AddonModResourceModuleHandlerService.PAGE_NAME;
 
     supportedFeatures = {
         [CoreConstants.FEATURE_MOD_ARCHETYPE]: CoreConstants.MOD_ARCHETYPE_RESOURCE,
@@ -60,46 +61,37 @@ export class AddonModResourceModuleHandlerService implements CoreCourseModuleHan
     }
 
     /**
-     * Get the data required to display the module in the course contents view.
-     *
-     * @param module The module object.
-     * @param courseId The course ID.
-     * @param sectionId The section ID.
-     * @return Data to render the module.
+     * @inheritdoc
      */
-    getData(module: CoreCourseAnyModuleData, courseId: number): CoreCourseModuleHandlerData {
+    getData(
+        module: CoreCourseAnyModuleData,
+        courseId: number,
+        sectionId?: number,
+        forCoursePage?: boolean,
+    ): CoreCourseModuleHandlerData {
         const updateStatus = (status: string): void => {
-            handlerData.buttons![0].hidden = status !== CoreConstants.DOWNLOADED ||
+            if (!handlerData.buttons) {
+                return;
+            }
+
+            handlerData.buttons[0].hidden = status !== CoreConstants.DOWNLOADED ||
                 AddonModResourceHelper.isDisplayedInIframe(module);
         };
         const openWithPicker = CoreFileHelper.defaultIsOpenWithPicker();
 
-        const handlerData: CoreCourseModuleHandlerData = {
-            icon: CoreCourse.getModuleIconSrc(this.modName, 'modicon' in module ? module.modicon : undefined),
-            title: module.name,
-            class: 'addon-mod_resource-handler',
-            showDownloadButton: true,
-            action(event: Event, module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions): void {
-                options = options || {};
-                options.params = options.params || {};
-                Object.assign(options.params, { module });
-                const routeParams = '/' + courseId + '/' + module.id;
-
-                CoreNavigator.navigateToSitePath(AddonModResourceModuleHandlerService.PAGE_NAME + routeParams, options);
+        const handlerData = super.getData(module, courseId, sectionId, forCoursePage);
+        handlerData.updateStatus = updateStatus.bind(this);
+        handlerData.buttons = [{
+            hidden: true,
+            icon: openWithPicker ? 'fas-share-square' : 'fas-file',
+            label: module.name + ': ' + Translate.instant(openWithPicker ? 'core.openwith' : 'addon.mod_resource.openthefile'),
+            action: async (event: Event, module: CoreCourseModule, courseId: number): Promise<void> => {
+                const hide = await this.hideOpenButton(module, courseId);
+                if (!hide) {
+                    AddonModResourceHelper.openModuleFile(module, courseId);
+                }
             },
-            updateStatus: updateStatus.bind(this),
-            buttons: [{
-                hidden: true,
-                icon: openWithPicker ? 'fas-share-square' : 'fas-file',
-                label: module.name + ': ' + Translate.instant(openWithPicker ? 'core.openwith' : 'addon.mod_resource.openthefile'),
-                action: async (event: Event, module: CoreCourseModule, courseId: number): Promise<void> => {
-                    const hide = await this.hideOpenButton(module, courseId);
-                    if (!hide) {
-                        AddonModResourceHelper.openModuleFile(module, courseId);
-                    }
-                },
-            }],
-        };
+        }];
 
         this.getResourceData(module, courseId, handlerData).then((data) => {
             handlerData.icon = data.icon;
@@ -149,7 +141,11 @@ export class AddonModResourceModuleHandlerService implements CoreCourseModuleHan
 
         // Check if the button needs to be shown or not.
         promises.push(this.hideOpenButton(module, courseId).then((hideOpenButton) => {
-            handlerData.buttons![0].hidden = hideOpenButton;
+            if (!handlerData.buttons) {
+                return;
+            }
+
+            handlerData.buttons[0].hidden = hideOpenButton;
 
             return;
         }));
@@ -237,7 +233,7 @@ export class AddonModResourceModuleHandlerService implements CoreCourseModuleHan
 
         // No previously set, just set the icon.
         if (resourceData.icon == '') {
-            resourceData.icon = CoreCourse.getModuleIconSrc(this.modName, 'modicon' in module ? module.modicon : undefined);
+            resourceData.icon = CoreCourse.getModuleIconSrc(module.modname, 'modicon' in module ? module.modicon : undefined);
         }
 
         return resourceData;
@@ -246,7 +242,7 @@ export class AddonModResourceModuleHandlerService implements CoreCourseModuleHan
     /**
      * @inheritdoc
      */
-    async getMainComponent(): Promise<Type<unknown> | undefined> {
+    async getMainComponent(): Promise<Type<unknown>> {
         return AddonModResourceIndexComponent;
     }
 
diff --git a/src/addons/mod/scorm/services/handlers/module.ts b/src/addons/mod/scorm/services/handlers/module.ts
index 4017f1c3c..7996d4921 100644
--- a/src/addons/mod/scorm/services/handlers/module.ts
+++ b/src/addons/mod/scorm/services/handlers/module.ts
@@ -14,10 +14,8 @@
 
 import { CoreConstants } from '@/core/constants';
 import { Injectable, Type } from '@angular/core';
-import { CoreCourse, CoreCourseAnyModuleData } from '@features/course/services/course';
-import { CoreCourseModule } from '@features/course/services/course-helper';
-import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
-import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
+import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
+import { CoreCourseModuleHandler } from '@features/course/services/module-delegate';
 import { makeSingleton } from '@singletons';
 import { AddonModScormIndexComponent } from '../../components/index';
 
@@ -25,12 +23,13 @@ import { AddonModScormIndexComponent } from '../../components/index';
  * Handler to support SCORM modules.
  */
 @Injectable({ providedIn: 'root' })
-export class AddonModScormModuleHandlerService implements CoreCourseModuleHandler {
+export class AddonModScormModuleHandlerService extends CoreModuleHandlerBase implements CoreCourseModuleHandler {
 
     static readonly PAGE_NAME = 'mod_scorm';
 
     name = 'AddonModScorm';
     modName = 'scorm';
+    protected pageName = AddonModScormModuleHandlerService.PAGE_NAME;
 
     supportedFeatures = {
         [CoreConstants.FEATURE_GROUPS]: true,
@@ -44,33 +43,6 @@ export class AddonModScormModuleHandlerService implements CoreCourseModuleHandle
         [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true,
     };
 
-    /**
-     * @inheritdoc
-     */
-    async isEnabled(): Promise<boolean> {
-        return true;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    getData(module: CoreCourseAnyModuleData): CoreCourseModuleHandlerData {
-        return {
-            icon: CoreCourse.getModuleIconSrc(this.modName, 'modicon' in module ? module.modicon : undefined),
-            title: module.name,
-            class: 'addon-mod_scorm-handler',
-            showDownloadButton: true,
-            action(event: Event, module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions) {
-                options = options || {};
-                options.params = options.params || {};
-                Object.assign(options.params, { module });
-                const routeParams = '/' + courseId + '/' + module.id;
-
-                CoreNavigator.navigateToSitePath(AddonModScormModuleHandlerService.PAGE_NAME + routeParams, options);
-            },
-        };
-    }
-
     /**
      * @inheritdoc
      */
diff --git a/src/addons/mod/survey/services/handlers/module.ts b/src/addons/mod/survey/services/handlers/module.ts
index 704249350..8ec3f3969 100644
--- a/src/addons/mod/survey/services/handlers/module.ts
+++ b/src/addons/mod/survey/services/handlers/module.ts
@@ -14,10 +14,8 @@
 
 import { CoreConstants } from '@/core/constants';
 import { Injectable, Type } from '@angular/core';
-import { CoreCourse, CoreCourseAnyModuleData } from '@features/course/services/course';
-import { CoreCourseModule } from '@features/course/services/course-helper';
-import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
-import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
+import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
+import { CoreCourseModuleHandler } from '@features/course/services/module-delegate';
 import { makeSingleton } from '@singletons';
 import { AddonModSurveyIndexComponent } from '../../components/index';
 
@@ -25,12 +23,13 @@ import { AddonModSurveyIndexComponent } from '../../components/index';
  * Handler to support survey modules.
  */
 @Injectable( { providedIn: 'root' })
-export class AddonModSurveyModuleHandlerService implements CoreCourseModuleHandler {
+export class AddonModSurveyModuleHandlerService extends CoreModuleHandlerBase implements CoreCourseModuleHandler {
 
     static readonly PAGE_NAME = 'mod_survey';
 
     name = 'AddonModSurvey';
     modName = 'survey';
+    protected pageName = AddonModSurveyModuleHandlerService.PAGE_NAME;
 
     supportedFeatures = {
         [CoreConstants.FEATURE_GROUPS]: true,
@@ -44,35 +43,6 @@ export class AddonModSurveyModuleHandlerService implements CoreCourseModuleHandl
         [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true,
     };
 
-    /**
-     * @inheritdoc
-     */
-    async isEnabled(): Promise<boolean> {
-        return true;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    getData(
-        module: CoreCourseAnyModuleData,
-    ): CoreCourseModuleHandlerData {
-        return {
-            icon: CoreCourse.getModuleIconSrc(this.modName, 'modicon' in module ? module.modicon : undefined),
-            title: module.name,
-            class: 'addon-mod_survey-handler',
-            showDownloadButton: true,
-            action: (event: Event, module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions) => {
-                options = options || {};
-                options.params = options.params || {};
-                Object.assign(options.params, { module });
-                const routeParams = '/' + courseId + '/' + module.id;
-
-                CoreNavigator.navigateToSitePath(AddonModSurveyModuleHandlerService.PAGE_NAME + routeParams, options);
-            },
-        };
-    }
-
     /**
      * @inheritdoc
      */
diff --git a/src/addons/mod/url/services/handlers/module.ts b/src/addons/mod/url/services/handlers/module.ts
index 642dc208a..bd5f28b2c 100644
--- a/src/addons/mod/url/services/handlers/module.ts
+++ b/src/addons/mod/url/services/handlers/module.ts
@@ -15,6 +15,7 @@
 import { CoreConstants } from '@/core/constants';
 import { Injectable, Type } from '@angular/core';
 import { CoreContentLinksHelper } from '@features/contentlinks/services/contentlinks-helper';
+import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
 import { CoreCourse, CoreCourseAnyModuleData } from '@features/course/services/course';
 import { CoreCourseModule } from '@features/course/services/course-helper';
 import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
@@ -30,12 +31,13 @@ import { AddonModUrlHelper } from '../url-helper';
  * Handler to support url modules.
  */
 @Injectable({ providedIn: 'root' })
-export class AddonModUrlModuleHandlerService implements CoreCourseModuleHandler {
+export class AddonModUrlModuleHandlerService extends CoreModuleHandlerBase implements CoreCourseModuleHandler {
 
     static readonly PAGE_NAME = 'mod_url';
 
     name = 'AddonModUrl';
     modName = 'url';
+    protected pageName = AddonModUrlModuleHandlerService.PAGE_NAME;
 
     supportedFeatures = {
         [CoreConstants.FEATURE_MOD_ARCHETYPE]: CoreConstants.MOD_ARCHETYPE_RESOURCE,
@@ -49,13 +51,6 @@ export class AddonModUrlModuleHandlerService implements CoreCourseModuleHandler
         [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true,
     };
 
-    /**
-     * @inheritdoc
-     */
-    async isEnabled(): Promise<boolean> {
-        return true;
-    }
-
     /**
      * @inheritdoc
      */
@@ -82,7 +77,7 @@ export class AddonModUrlModuleHandlerService implements CoreCourseModuleHandler
         };
 
         const handlerData: CoreCourseModuleHandlerData = {
-            icon: CoreCourse.getModuleIconSrc(this.modName, 'modicon' in module ? module.modicon : undefined),
+            icon: CoreCourse.getModuleIconSrc(module.modname, 'modicon' in module ? module.modicon : undefined),
             title: module.name,
             class: 'addon-mod_url-handler',
             showDownloadButton: false,
@@ -117,12 +112,16 @@ export class AddonModUrlModuleHandlerService implements CoreCourseModuleHandler
         };
 
         this.hideLinkButton(module, courseId).then((hideButton) => {
-            handlerData.buttons![0]!.hidden = hideButton;
+            if (!handlerData.buttons) {
+                return;
+            }
+
+            handlerData.buttons[0].hidden = hideButton;
 
             if (module.contents && module.contents[0]) {
                 // Calculate the icon to use.
                 handlerData.icon = AddonModUrl.guessIcon(module.contents[0].fileurl) ||
-                    CoreCourse.getModuleIconSrc(this.modName, 'modicon' in module ? module.modicon : undefined);
+                    CoreCourse.getModuleIconSrc(module.modname, 'modicon' in module ? module.modicon : undefined);
             }
 
             return;
@@ -154,7 +153,7 @@ export class AddonModUrlModuleHandlerService implements CoreCourseModuleHandler
     /**
      * @inheritdoc
      */
-    async getMainComponent(): Promise<Type<unknown> | undefined> {
+    async getMainComponent(): Promise<Type<unknown>> {
         return AddonModUrlIndexComponent;
     }
 
@@ -165,7 +164,7 @@ export class AddonModUrlModuleHandlerService implements CoreCourseModuleHandler
      * @param courseId Course ID.
      * @return Promise resolved with boolean.
      */
-    protected async shouldOpenLink(module: CoreCourseModule, courseId: number): Promise<boolean> {
+    protected async shouldOpenLink(module: CoreCourseModule, courseId?: number): Promise<boolean> {
         try {
             const contents = await CoreCourse.getModuleContents(module, courseId, undefined, false, false, undefined, this.modName);
 
@@ -177,7 +176,7 @@ export class AddonModUrlModuleHandlerService implements CoreCourseModuleHandler
                 return true;
             } else {
                 // Not handled by the app, check the display type.
-                const url = await CoreUtils.ignoreErrors(AddonModUrl.getUrl(courseId, module.id));
+                const url = courseId ? await CoreUtils.ignoreErrors(AddonModUrl.getUrl(courseId, module.id)) : undefined;
                 const displayType = AddonModUrl.getFinalDisplayType(url);
 
                 return displayType == CoreConstants.RESOURCELIB_DISPLAY_OPEN ||
@@ -192,7 +191,7 @@ export class AddonModUrlModuleHandlerService implements CoreCourseModuleHandler
      * @inheritdoc
      */
     manualCompletionAlwaysShown(module: CoreCourseModule): Promise<boolean> {
-        return this.shouldOpenLink(module, module.course!);
+        return this.shouldOpenLink(module, module.course);
     }
 
 }
diff --git a/src/addons/mod/wiki/services/handlers/module.ts b/src/addons/mod/wiki/services/handlers/module.ts
index 917ad30d1..0bdd46414 100644
--- a/src/addons/mod/wiki/services/handlers/module.ts
+++ b/src/addons/mod/wiki/services/handlers/module.ts
@@ -14,6 +14,7 @@
 
 import { CoreConstants } from '@/core/constants';
 import { Injectable, Type } from '@angular/core';
+import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
 import { CoreCourse, CoreCourseAnyModuleData } from '@features/course/services/course';
 import { CoreCourseModule } from '@features/course/services/course-helper';
 import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
@@ -25,12 +26,13 @@ import { AddonModWikiIndexComponent } from '../../components/index';
  * Handler to support wiki modules.
  */
 @Injectable({ providedIn: 'root' })
-export class AddonModWikiModuleHandlerService implements CoreCourseModuleHandler {
+export class AddonModWikiModuleHandlerService extends CoreModuleHandlerBase implements CoreCourseModuleHandler {
 
     static readonly PAGE_NAME = 'mod_wiki';
 
     name = 'AddonModWiki';
     modName = 'wiki';
+    protected pageName = AddonModWikiModuleHandlerService.PAGE_NAME;
 
     supportedFeatures = {
         [CoreConstants.FEATURE_GROUPS]: true,
@@ -45,13 +47,6 @@ export class AddonModWikiModuleHandlerService implements CoreCourseModuleHandler
         [CoreConstants.FEATURE_COMMENT]: true,
     };
 
-    /**
-     * @inheritdoc
-     */
-    async isEnabled(): Promise<boolean> {
-        return true;
-    }
-
     /**
      * @inheritdoc
      */
diff --git a/src/addons/mod/workshop/services/handlers/module.ts b/src/addons/mod/workshop/services/handlers/module.ts
index 86463eee3..4364cc552 100644
--- a/src/addons/mod/workshop/services/handlers/module.ts
+++ b/src/addons/mod/workshop/services/handlers/module.ts
@@ -14,10 +14,8 @@
 
 import { CoreConstants } from '@/core/constants';
 import { Injectable, Type } from '@angular/core';
-import { CoreCourse, CoreCourseAnyModuleData } from '@features/course/services/course';
-import { CoreCourseModule } from '@features/course/services/course-helper';
-import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
-import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
+import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
+import { CoreCourseModuleHandler } from '@features/course/services/module-delegate';
 import { makeSingleton } from '@singletons';
 import { AddonModWorkshopIndexComponent } from '../../components/index';
 
@@ -25,12 +23,13 @@ import { AddonModWorkshopIndexComponent } from '../../components/index';
  * Handler to support workshop modules.
  */
 @Injectable({ providedIn: 'root' })
-export class AddonModWorkshopModuleHandlerService implements CoreCourseModuleHandler {
+export class AddonModWorkshopModuleHandlerService extends CoreModuleHandlerBase implements CoreCourseModuleHandler {
 
     static readonly PAGE_NAME = 'mod_workshop';
 
     name = 'AddonModWorkshop';
     modName = 'workshop';
+    protected pageName = AddonModWorkshopModuleHandlerService.PAGE_NAME;
 
     supportedFeatures = {
         [CoreConstants.FEATURE_GROUPS]: true,
@@ -46,30 +45,6 @@ export class AddonModWorkshopModuleHandlerService implements CoreCourseModuleHan
     /**
      * @inheritdoc
      */
-    async isEnabled(): Promise<boolean> {
-        return true;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    getData(module: CoreCourseAnyModuleData): CoreCourseModuleHandlerData {
-        return {
-            icon: CoreCourse.getModuleIconSrc(this.modName, 'modicon' in module ? module.modicon : undefined),
-            title: module.name,
-            class: 'addon-mod_workshop-handler',
-            showDownloadButton: true,
-            action(event: Event, module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions): void {
-                options = options || {};
-                options.params = options.params || {};
-                Object.assign(options.params, { module });
-                const routeParams = '/' + courseId + '/' + module.id;
-
-                CoreNavigator.navigateToSitePath(AddonModWorkshopModuleHandlerService.PAGE_NAME + routeParams, options);
-            },
-        };
-    }
-
     async getMainComponent(): Promise<Type<unknown>> {
         return AddonModWorkshopIndexComponent;
     }
diff --git a/src/core/features/course/classes/module-base-handler.ts b/src/core/features/course/classes/module-base-handler.ts
new file mode 100644
index 000000000..16ab933ed
--- /dev/null
+++ b/src/core/features/course/classes/module-base-handler.ts
@@ -0,0 +1,59 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
+import { CoreCourse, CoreCourseAnyModuleData } from '../services/course';
+import { CoreCourseModule } from '../services/course-helper';
+import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '../services/module-delegate';
+
+/**
+ * Base module handler to be registered.
+ */
+export class CoreModuleHandlerBase implements Partial<CoreCourseModuleHandler> {
+
+    protected pageName = '';
+
+    /**
+     * @inheritdoc
+     */
+    async isEnabled(): Promise<boolean> {
+        return true;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    getData(
+        module: CoreCourseAnyModuleData,
+        courseId: number, // eslint-disable-line @typescript-eslint/no-unused-vars
+        sectionId?: number, // eslint-disable-line @typescript-eslint/no-unused-vars
+        forCoursePage?: boolean, // eslint-disable-line @typescript-eslint/no-unused-vars
+    ): CoreCourseModuleHandlerData {
+        return {
+            icon: CoreCourse.getModuleIconSrc(module.modname, 'modicon' in module ? module.modicon : undefined),
+            title: module.name,
+            class: 'addon-mod_' + module.modname + '-handler',
+            showDownloadButton: true,
+            action: (event: Event, module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions): void => {
+                options = options || {};
+                options.params = options.params || {};
+                Object.assign(options.params, { module });
+                const routeParams = '/' + courseId + '/' + module.id;
+
+                CoreNavigator.navigateToSitePath(this.pageName + routeParams, options);
+            },
+        };
+    }
+
+}
diff --git a/src/core/features/course/services/course-helper.ts b/src/core/features/course/services/course-helper.ts
index 8e62b143e..725381272 100644
--- a/src/core/features/course/services/course-helper.ts
+++ b/src/core/features/course/services/course-helper.ts
@@ -1616,7 +1616,7 @@ export class CoreCourseHelperProvider {
 
             this.logger.warn('navCtrl was not passed to navigateToModule by the link handler for ' + module.modname);
 
-            const params = {
+            const params: Params = {
                 course: { id: courseId },
                 module: module,
                 sectionId: sectionId,
diff --git a/src/core/features/course/services/course.ts b/src/core/features/course/services/course.ts
index 4a0752ff5..c714008fa 100644
--- a/src/core/features/course/services/course.ts
+++ b/src/core/features/course/services/course.ts
@@ -633,9 +633,6 @@ export class CoreCourseProvider {
      * @return The IMG src.
      */
     getModuleIconSrc(moduleName: string, modicon?: string): string {
-        // @TODO: Check modicon url theme to apply other theme icons.
-
-        // Use default icon on core themes.
         if (this.CORE_MODULES.indexOf(moduleName) < 0) {
             if (modicon) {
                 return modicon;
@@ -644,6 +641,7 @@ export class CoreCourseProvider {
             moduleName = 'external-tool';
         }
 
+        // Use default icon on core modules.
         return 'assets/img/mod/' + moduleName + '.svg';
     }
 
diff --git a/src/core/features/course/services/handlers/default-module.ts b/src/core/features/course/services/handlers/default-module.ts
index 052878766..cda24c8a9 100644
--- a/src/core/features/course/services/handlers/default-module.ts
+++ b/src/core/features/course/services/handlers/default-module.ts
@@ -16,8 +16,7 @@ import { Injectable, Type } from '@angular/core';
 
 import { CoreSites } from '@services/sites';
 import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '../module-delegate';
-import { CoreCourse, CoreCourseAnyModuleData, CoreCourseWSModule } from '../course';
-import { CoreCourseAnyCourseData } from '@features/courses/services/courses';
+import { CoreCourse, CoreCourseAnyModuleData } from '../course';
 import { CoreCourseModule } from '../course-helper';
 import { CoreCourseUnsupportedModuleComponent } from '@features/course/components/unsupported-module/unsupported-module';
 import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
@@ -30,29 +29,20 @@ export class CoreCourseModuleDefaultHandler implements CoreCourseModuleHandler {
 
     name = 'CoreCourseModuleDefault';
     modName = 'default';
+    protected pageName = '';
 
     /**
-     * Whether or not the handler is enabled on a site level.
-     *
-     * @return True or promise resolved with true if enabled.
+     * @inheritdoc
      */
     async isEnabled(): Promise<boolean> {
         return true;
     }
 
     /**
-     * Get the data required to display the module in the course contents view.
-     *
-     * @param module The module object.
-     * @param courseId The course ID.
-     * @param sectionId The section ID.
-     * @return Data to render the module.
+     * @inheritdoc
      */
     getData(
         module: CoreCourseAnyModuleData,
-        courseId: number, // eslint-disable-line @typescript-eslint/no-unused-vars
-        sectionId?: number, // eslint-disable-line @typescript-eslint/no-unused-vars
-        forCoursePage?: boolean, // eslint-disable-line @typescript-eslint/no-unused-vars
     ): CoreCourseModuleHandlerData {
         // Return the default data.
         const defaultData: CoreCourseModuleHandlerData = {
@@ -71,6 +61,8 @@ export class CoreCourseModuleDefaultHandler implements CoreCourseModuleHandler {
         };
 
         if ('url' in module && module.url) {
+            const url = module.url;
+
             defaultData.buttons = [{
                 icon: 'fas-external-link-alt',
                 label: 'core.openinbrowser',
@@ -78,7 +70,7 @@ export class CoreCourseModuleDefaultHandler implements CoreCourseModuleHandler {
                     e.preventDefault();
                     e.stopPropagation();
 
-                    CoreSites.getCurrentSite()!.openInBrowserWithAutoLoginIfSameSite(module.url!);
+                    CoreSites.requireCurrentSite().openInBrowserWithAutoLoginIfSameSite(url);
                 },
             }];
         }
@@ -87,24 +79,14 @@ export class CoreCourseModuleDefaultHandler implements CoreCourseModuleHandler {
     }
 
     /**
-     * Get the component to render the module. This is needed to support singleactivity course format.
-     * The component returned must implement CoreCourseModuleMainComponent.
-     * It's recommended to return the class of the component, but you can also return an instance of the component.
-     *
-     * @param course The course object.
-     * @param module The module object.
-     * @return The component (or promise resolved with component) to use, undefined if not found.
+     * @inheritdoc
      */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async getMainComponent(course: CoreCourseAnyCourseData, module: CoreCourseWSModule): Promise<Type<unknown> | undefined> {
+    async getMainComponent(): Promise<Type<unknown>> {
         return CoreCourseUnsupportedModuleComponent;
     }
 
     /**
-     * Whether to display the course refresher in single activity course format. If it returns false, a refresher must be
-     * included in the template that calls the doRefresh method of the component. Defaults to true.
-     *
-     * @return Whether the refresher should be displayed.
+     * @inheritdoc
      */
     displayRefresherInSingleActivity(): boolean {
         return true;
diff --git a/src/core/features/course/services/module-delegate.ts b/src/core/features/course/services/module-delegate.ts
index f1cfb206e..072188859 100644
--- a/src/core/features/course/services/module-delegate.ts
+++ b/src/core/features/course/services/module-delegate.ts
@@ -345,9 +345,10 @@ export class CoreCourseModuleDelegateService extends CoreDelegate<CoreCourseModu
      * @param modicon The mod icon string.
      * @return The icon src.
      */
-    getModuleIconSrc(modname: string, modicon?: string): string | undefined {
+    getModuleIconSrc(modname: string, modicon?: string): string {
         return this.executeFunctionOnEnabled<string>(modname, 'getIconSrc') ||
-            CoreCourse.getModuleIconSrc(modname, modicon);
+            CoreCourse.getModuleIconSrc(modname, modicon) ||
+            '';
     }
 
     /**

From 8830b865f64d57736c7cd6e09ec86276040c935e Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 9 Sep 2021 14:15:40 +0200
Subject: [PATCH 0087/1008] MOBILE-3729 siteplugins: Allow updating
 coursepagemethod data

---
 .../classes/handlers/module-handler.ts        | 27 ++++++++++++++-----
 .../plugin-content/plugin-content.ts          | 14 +++++++++-
 .../siteplugins/services/siteplugins.ts       | 22 +++++++++++++++
 3 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/src/core/features/siteplugins/classes/handlers/module-handler.ts b/src/core/features/siteplugins/classes/handlers/module-handler.ts
index ee3ae05b6..1276a3a87 100644
--- a/src/core/features/siteplugins/classes/handlers/module-handler.ts
+++ b/src/core/features/siteplugins/classes/handlers/module-handler.ts
@@ -24,10 +24,13 @@ import {
     CoreSitePluginsContent,
     CoreSitePluginsCourseModuleHandlerData,
     CoreSitePluginsPlugin,
+    CoreSitePluginsProvider,
 } from '@features/siteplugins/services/siteplugins';
 import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
 import { CoreLogger } from '@singletons/logger';
 import { CoreSitePluginsBaseHandler } from './base-handler';
+import { CoreEvents } from '@singletons/events';
+import { CoreUtils } from '@services/utils/utils';
 
 /**
  * Handler to support a module using a site plugin.
@@ -105,7 +108,15 @@ export class CoreSitePluginsModuleHandler extends CoreSitePluginsBaseHandler imp
 
         if (forCoursePage && this.handlerSchema.coursepagemethod && module.visibleoncoursepage !== 0) {
             // Call the method to get the course page template.
-            this.loadCoursePageTemplate(module, courseId, handlerData);
+            const method = this.handlerSchema.coursepagemethod;
+            this.loadCoursePageTemplate(module, courseId, handlerData, method);
+
+            // Allow updating the data via event.
+            CoreEvents.on(CoreSitePluginsProvider.UPDATE_COURSE_CONTENT, (data) => {
+                if (data.cmId === module.id) {
+                    this.loadCoursePageTemplate(module, courseId, handlerData, method, !data.alreadyFetched);
+                }
+            });
         }
 
         return handlerData;
@@ -152,12 +163,16 @@ export class CoreSitePluginsModuleHandler extends CoreSitePluginsBaseHandler imp
      * @param module Module.
      * @param courseId Course ID.
      * @param handlerData Handler data.
+     * @param method Method to call.
+     * @param refresh Whether to refresh the data.
      * @return Promise resolved when done.
      */
     protected async loadCoursePageTemplate(
         module: CoreCourseAnyModuleData,
         courseId: number,
         handlerData: CoreCourseModuleHandlerData,
+        method: string,
+        refresh?: boolean,
     ): Promise<void> {
         // Call the method to get the course page template.
         handlerData.loading = true;
@@ -167,12 +182,12 @@ export class CoreSitePluginsModuleHandler extends CoreSitePluginsBaseHandler imp
             cmid: module.id,
         };
 
+        if (refresh) {
+            await CoreUtils.ignoreErrors(CoreSitePlugins.invalidateContent(this.plugin.component, method, args));
+        }
+
         try {
-            const result = await CoreSitePlugins.getContent(
-                this.plugin.component,
-                this.handlerSchema.coursepagemethod!,
-                args,
-            );
+            const result = await CoreSitePlugins.getContent(this.plugin.component, method, args);
 
             // Use the html returned.
             handlerData.title = result.templates[0]?.html ?? '';
diff --git a/src/core/features/siteplugins/components/plugin-content/plugin-content.ts b/src/core/features/siteplugins/components/plugin-content/plugin-content.ts
index 600f14042..ce4c7e2d9 100644
--- a/src/core/features/siteplugins/components/plugin-content/plugin-content.ts
+++ b/src/core/features/siteplugins/components/plugin-content/plugin-content.ts
@@ -18,9 +18,10 @@ import { Md5 } from 'ts-md5';
 
 import { CoreSiteWSPreSets } from '@classes/site';
 import { CoreCompileHtmlComponent } from '@features/compile/components/compile-html/compile-html';
-import { CoreSitePlugins, CoreSitePluginsContent } from '@features/siteplugins/services/siteplugins';
+import { CoreSitePlugins, CoreSitePluginsContent, CoreSitePluginsProvider } from '@features/siteplugins/services/siteplugins';
 import { CoreNavigator } from '@services/navigator';
 import { CoreDomUtils } from '@services/utils/dom';
+import { CoreEvents } from '@singletons/events';
 
 /**
  * Component to render a site plugin content.
@@ -111,6 +112,7 @@ export class CoreSitePluginsPluginContentComponent implements OnInit, DoCheck {
             this.jsData.openContent = this.openContent.bind(this);
             this.jsData.refreshContent = this.refreshContent.bind(this);
             this.jsData.updateContent = this.updateContent.bind(this);
+            this.jsData.updateModuleCourseContent = this.updateModuleCourseContent.bind(this);
 
             this.onContentLoaded.emit(refresh);
         } catch (error) {
@@ -224,4 +226,14 @@ export class CoreSitePluginsPluginContentComponent implements OnInit, DoCheck {
         return this.compileComponent?.callComponentFunction(name, params);
     }
 
+    /**
+     * Function only for module plugins using coursepagemethod. Update module data in course page content.
+     *
+     * @param cmId Module ID.
+     * @param alreadyFetched Whether course data has already been fetched (no need to fetch it again).
+     */
+    updateModuleCourseContent(cmId: number, alreadyFetched?: boolean): void {
+        CoreEvents.trigger(CoreSitePluginsProvider.UPDATE_COURSE_CONTENT, { cmId, alreadyFetched });
+    }
+
 }
diff --git a/src/core/features/siteplugins/services/siteplugins.ts b/src/core/features/siteplugins/services/siteplugins.ts
index 984c8cfe5..382c06f40 100644
--- a/src/core/features/siteplugins/services/siteplugins.ts
+++ b/src/core/features/siteplugins/services/siteplugins.ts
@@ -38,6 +38,7 @@ const ROOT_CACHE_KEY = 'CoreSitePlugins:';
 export class CoreSitePluginsProvider {
 
     static readonly COMPONENT = 'CoreSitePlugins';
+    static readonly UPDATE_COURSE_CONTENT = 'siteplugins_update_course_content';
 
     protected logger: CoreLogger;
     protected sitePlugins: {[name: string]: CoreSitePluginsHandler} = {}; // Site plugins registered.
@@ -922,3 +923,24 @@ export type CoreSitePluginsMainMenuHomeHandlerData = CoreSitePluginsHandlerCommo
     priority?: number;
     ptrenabled?: boolean;
 };
+
+/**
+ * Event to update course content data for plugins using coursepagemethod.
+ */
+export type CoreSitePluginsUpdateCourseContentEvent = {
+    cmId: number; // Module ID to update.
+    alreadyFetched?: boolean; // Whether course data has already been fetched (no need to fetch it again).
+};
+
+declare module '@singletons/events' {
+
+    /**
+     * Augment CoreEventsData interface with events specific to this service.
+     *
+     * @see https://www.typescriptlang.org/docs/handbook/declaration-merging.html#module-augmentation
+     */
+    export interface CoreEventsData {
+        [CoreSitePluginsProvider.UPDATE_COURSE_CONTENT]: CoreSitePluginsUpdateCourseContentEvent;
+    }
+
+}

From 0d3123d2af20a3da8d2156e16dceef27cf2475f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 9 Sep 2021 13:37:51 +0200
Subject: [PATCH 0088/1008] MOBILE-3833 sites: Add required current site
 function to solve warnings

---
 .../pages/issued-badge/issued-badge.page.ts   |  2 +-
 .../timeline/components/timeline/timeline.ts  |  6 +-
 .../pages/edit-event/edit-event.page.ts       |  2 +-
 .../services/handlers/user-send-message.ts    |  2 +-
 src/addons/mod/book/services/book.ts          |  2 +-
 src/addons/mod/data/services/data-helper.ts   |  2 +-
 src/addons/mod/feedback/pages/form/form.ts    |  2 +-
 .../post-options-menu/post-options-menu.ts    |  2 +-
 .../forum/pages/discussion/discussion.page.ts |  4 +-
 .../mod/h5pactivity/components/index/index.ts |  2 +-
 .../mod/resource/services/resource-helper.ts  |  2 +-
 .../mod/scorm/services/scorm-offline.ts       |  2 +-
 src/addons/mod/wiki/components/index/index.ts |  2 +-
 .../mod/wiki/services/handlers/module.ts      | 25 +-----
 src/addons/mod/wiki/wiki-lazy.module.ts       |  4 +
 .../features/course/services/course-helper.ts | 88 +++++++++++--------
 .../services/handlers/default-module.ts       |  2 +-
 src/core/services/sites.ts                    | 25 ++++--
 18 files changed, 92 insertions(+), 84 deletions(-)

diff --git a/src/addons/badges/pages/issued-badge/issued-badge.page.ts b/src/addons/badges/pages/issued-badge/issued-badge.page.ts
index 038dcc365..959ac2dac 100644
--- a/src/addons/badges/pages/issued-badge/issued-badge.page.ts
+++ b/src/addons/badges/pages/issued-badge/issued-badge.page.ts
@@ -52,7 +52,7 @@ export class AddonBadgesIssuedBadgePage implements OnInit {
      */
     ngOnInit(): void {
         this.courseId = CoreNavigator.getRouteNumberParam('courseId') || this.courseId; // Use 0 for site badges.
-        this.userId = CoreNavigator.getRouteNumberParam('userId') || CoreSites.getCurrentSite()!.getUserId();
+        this.userId = CoreNavigator.getRouteNumberParam('userId') || CoreSites.getRequiredCurrentSite().getUserId();
         this.badgeHash = CoreNavigator.getRouteParam('badgeHash') || '';
 
         this.fetchIssuedBadge().finally(() => {
diff --git a/src/addons/block/timeline/components/timeline/timeline.ts b/src/addons/block/timeline/components/timeline/timeline.ts
index 9c5547050..29f2e1487 100644
--- a/src/addons/block/timeline/components/timeline/timeline.ts
+++ b/src/addons/block/timeline/components/timeline/timeline.ts
@@ -69,12 +69,12 @@ export class AddonBlockTimelineComponent extends CoreBlockBaseComponent implemen
      * Component being initialized.
      */
     async ngOnInit(): Promise<void> {
-        this.currentSite = CoreSites.getCurrentSite();
+        this.currentSite = CoreSites.getRequiredCurrentSite();
 
-        this.filter = await this.currentSite!.getLocalSiteConfig('AddonBlockTimelineFilter', this.filter);
+        this.filter = await this.currentSite.getLocalSiteConfig('AddonBlockTimelineFilter', this.filter);
         this.switchFilter(this.filter);
 
-        this.sort = await this.currentSite!.getLocalSiteConfig('AddonBlockTimelineSort', this.sort);
+        this.sort = await this.currentSite.getLocalSiteConfig('AddonBlockTimelineSort', this.sort);
 
         super.ngOnInit();
     }
diff --git a/src/addons/calendar/pages/edit-event/edit-event.page.ts b/src/addons/calendar/pages/edit-event/edit-event.page.ts
index fa21d737d..fee73d0aa 100644
--- a/src/addons/calendar/pages/edit-event/edit-event.page.ts
+++ b/src/addons/calendar/pages/edit-event/edit-event.page.ts
@@ -96,7 +96,7 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy, CanLeave {
         protected fb: FormBuilder,
         @Optional() protected svComponent: CoreSplitViewComponent,
     ) {
-        this.currentSite = CoreSites.getCurrentSite()!;
+        this.currentSite = CoreSites.getRequiredCurrentSite();
         this.errors = {
             required: Translate.instant('core.required'),
         };
diff --git a/src/addons/messages/services/handlers/user-send-message.ts b/src/addons/messages/services/handlers/user-send-message.ts
index 548d69d51..6afaa6080 100644
--- a/src/addons/messages/services/handlers/user-send-message.ts
+++ b/src/addons/messages/services/handlers/user-send-message.ts
@@ -54,7 +54,7 @@ export class AddonMessagesSendMessageUserHandlerService implements CoreUserProfi
      * @return Promise resolved with true if enabled, resolved with false otherwise.
      */
     async isEnabledForUser(user: CoreUserProfile): Promise<boolean> {
-        const currentSite = CoreSites.getCurrentSite()!;
+        const currentSite = CoreSites.getRequiredCurrentSite();
 
         // From 3.7 you can send messages to yourself.
         return user.id != CoreSites.getCurrentSiteUserId() || currentSite.isVersionGreaterEqualThan('3.7');
diff --git a/src/addons/mod/book/services/book.ts b/src/addons/mod/book/services/book.ts
index 7abf1dead..edf9c5800 100644
--- a/src/addons/mod/book/services/book.ts
+++ b/src/addons/mod/book/services/book.ts
@@ -134,7 +134,7 @@ export class AddonModBookProvider {
 
         if (!CoreFile.isAvailable()) {
             // We return the live URL.
-            return CoreSites.getCurrentSite()!.checkAndFixPluginfileURL(indexUrl);
+            return CoreSites.getRequiredCurrentSite().checkAndFixPluginfileURL(indexUrl);
         }
 
         const siteId = CoreSites.getCurrentSiteId();
diff --git a/src/addons/mod/data/services/data-helper.ts b/src/addons/mod/data/services/data-helper.ts
index c0a0cc74f..869f2be38 100644
--- a/src/addons/mod/data/services/data-helper.ts
+++ b/src/addons/mod/data/services/data-helper.ts
@@ -225,7 +225,7 @@ export class AddonModDataHelperProvider {
                 let render = '';
                 if (action == AddonModDataAction.MOREURL) {
                     // Render more url directly because it can be part of an HTML attribute.
-                    render = CoreSites.getCurrentSite()!.getURL() + '/mod/data/view.php?d={{database.id}}&rid=' + entry.id;
+                    render = CoreSites.getRequiredCurrentSite().getURL() + '/mod/data/view.php?d={{database.id}}&rid=' + entry.id;
                 } else if (action == 'approvalstatus') {
                     render = Translate.instant('addon.mod_data.' + (entry.approved ? 'approved' : 'notapproved'));
                 } else {
diff --git a/src/addons/mod/feedback/pages/form/form.ts b/src/addons/mod/feedback/pages/form/form.ts
index 8d8612304..d88967c29 100644
--- a/src/addons/mod/feedback/pages/form/form.ts
+++ b/src/addons/mod/feedback/pages/form/form.ts
@@ -77,7 +77,7 @@ export class AddonModFeedbackFormPage implements OnInit, OnDestroy, CanLeave {
     completedOffline = false;
 
     constructor() {
-        this.currentSite = CoreSites.getCurrentSite()!;
+        this.currentSite = CoreSites.getRequiredCurrentSite();
 
         // Refresh online status when changes.
         this.onlineObserver = Network.onChange().subscribe(() => {
diff --git a/src/addons/mod/forum/components/post-options-menu/post-options-menu.ts b/src/addons/mod/forum/components/post-options-menu/post-options-menu.ts
index 8c7a51b87..fd1662e5a 100644
--- a/src/addons/mod/forum/components/post-options-menu/post-options-menu.ts
+++ b/src/addons/mod/forum/components/post-options-menu/post-options-menu.ts
@@ -58,7 +58,7 @@ export class AddonModForumPostOptionsMenuComponent implements OnInit, OnDestroy
         });
 
         if (this.post.id > 0) {
-            const site = CoreSites.getCurrentSite()!;
+            const site = CoreSites.getRequiredCurrentSite();
             this.url = site.createSiteUrl('/mod/forum/discuss.php', { d: this.post.discussionid.toString() }, 'p' + this.post.id);
             this.offlinePost = false;
         } else {
diff --git a/src/addons/mod/forum/pages/discussion/discussion.page.ts b/src/addons/mod/forum/pages/discussion/discussion.page.ts
index 44452fe37..34522f5b6 100644
--- a/src/addons/mod/forum/pages/discussion/discussion.page.ts
+++ b/src/addons/mod/forum/pages/discussion/discussion.page.ts
@@ -298,7 +298,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
      */
     protected async getUserSort(): Promise<SortType> {
         try {
-            const value = await CoreSites.getCurrentSite()!.getLocalSiteConfig<SortType>('AddonModForumDiscussionSort');
+            const value = await CoreSites.getRequiredCurrentSite().getLocalSiteConfig<SortType>('AddonModForumDiscussionSort');
 
             return value;
         } catch (error) {
@@ -656,7 +656,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
     changeSort(type: SortType): Promise<void> {
         this.discussionLoaded = false;
         this.sort = type;
-        CoreSites.getCurrentSite()!.setLocalSiteConfig('AddonModForumDiscussionSort', this.sort);
+        CoreSites.getRequiredCurrentSite().setLocalSiteConfig('AddonModForumDiscussionSort', this.sort);
         this.content.scrollToTop();
 
         return this.fetchPosts();
diff --git a/src/addons/mod/h5pactivity/components/index/index.ts b/src/addons/mod/h5pactivity/components/index/index.ts
index 37989271f..d7bd10f69 100644
--- a/src/addons/mod/h5pactivity/components/index/index.ts
+++ b/src/addons/mod/h5pactivity/components/index/index.ts
@@ -96,7 +96,7 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
     ) {
         super('AddonModH5PActivityIndexComponent', content, courseContentsPage);
 
-        this.site = CoreSites.getCurrentSite()!;
+        this.site = CoreSites.getRequiredCurrentSite();
         this.siteCanDownload = this.site.canDownloadFiles() && !CoreH5P.isOfflineDisabledInSite();
 
         // Listen for messages from the iframe.
diff --git a/src/addons/mod/resource/services/resource-helper.ts b/src/addons/mod/resource/services/resource-helper.ts
index b942f7e36..4cb2ccad1 100644
--- a/src/addons/mod/resource/services/resource-helper.ts
+++ b/src/addons/mod/resource/services/resource-helper.ts
@@ -83,7 +83,7 @@ export class AddonModResourceHelperProvider {
             // Error getting directory, there was an error downloading or we're in browser. Return online URL.
             if (CoreApp.isOnline() && mainFile.fileurl) {
                 // This URL is going to be injected in an iframe, we need this to make it work.
-                return CoreSites.getCurrentSite()!.checkAndFixPluginfileURL(mainFile.fileurl);
+                return CoreSites.getRequiredCurrentSite().checkAndFixPluginfileURL(mainFile.fileurl);
             }
 
             throw e;
diff --git a/src/addons/mod/scorm/services/scorm-offline.ts b/src/addons/mod/scorm/services/scorm-offline.ts
index 58b3f349d..2971656e9 100644
--- a/src/addons/mod/scorm/services/scorm-offline.ts
+++ b/src/addons/mod/scorm/services/scorm-offline.ts
@@ -730,7 +730,7 @@ export class AddonModScormOfflineProvider {
         }
 
         const scoUserData = scoData?.userdata || {};
-        const db = CoreSites.getCurrentSite()!.getDb();
+        const db = CoreSites.getRequiredCurrentSite().getDb();
         let lessonStatusInserted = false;
 
         if (forceCompleted) {
diff --git a/src/addons/mod/wiki/components/index/index.ts b/src/addons/mod/wiki/components/index/index.ts
index e0a5f3da2..8bbd2a3a8 100644
--- a/src/addons/mod/wiki/components/index/index.ts
+++ b/src/addons/mod/wiki/components/index/index.ts
@@ -664,7 +664,7 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
         content = content.trim();
 
         if (content.length > 0) {
-            const editUrl = CoreTextUtils.concatenatePaths(CoreSites.getCurrentSite()!.getURL(), '/mod/wiki/edit.php');
+            const editUrl = CoreTextUtils.concatenatePaths(CoreSites.getRequiredCurrentSite().getURL(), '/mod/wiki/edit.php');
             content = content.replace(/href="edit\.php/g, 'href="' + editUrl);
         }
 
diff --git a/src/addons/mod/wiki/services/handlers/module.ts b/src/addons/mod/wiki/services/handlers/module.ts
index 0bdd46414..33b5af3aa 100644
--- a/src/addons/mod/wiki/services/handlers/module.ts
+++ b/src/addons/mod/wiki/services/handlers/module.ts
@@ -15,10 +15,7 @@
 import { CoreConstants } from '@/core/constants';
 import { Injectable, Type } from '@angular/core';
 import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
-import { CoreCourse, CoreCourseAnyModuleData } from '@features/course/services/course';
-import { CoreCourseModule } from '@features/course/services/course-helper';
-import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
-import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
+import { CoreCourseModuleHandler } from '@features/course/services/module-delegate';
 import { makeSingleton } from '@singletons';
 import { AddonModWikiIndexComponent } from '../../components/index';
 
@@ -47,26 +44,6 @@ export class AddonModWikiModuleHandlerService extends CoreModuleHandlerBase impl
         [CoreConstants.FEATURE_COMMENT]: true,
     };
 
-    /**
-     * @inheritdoc
-     */
-    getData(module: CoreCourseAnyModuleData): CoreCourseModuleHandlerData {
-        return {
-            icon: CoreCourse.getModuleIconSrc(this.modName, 'modicon' in module ? module.modicon : undefined),
-            title: module.name,
-            class: 'addon-mod_wiki-handler',
-            showDownloadButton: true,
-            action: (event: Event, module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions) => {
-                options = options || {};
-                options.params = options.params || {};
-                Object.assign(options.params, { module });
-                const routeParams = `/${courseId}/${module.id}/page/root`;
-
-                CoreNavigator.navigateToSitePath(AddonModWikiModuleHandlerService.PAGE_NAME + routeParams, options);
-            },
-        };
-    }
-
     /**
      * @inheritdoc
      */
diff --git a/src/addons/mod/wiki/wiki-lazy.module.ts b/src/addons/mod/wiki/wiki-lazy.module.ts
index 37015b8f4..3c7225328 100644
--- a/src/addons/mod/wiki/wiki-lazy.module.ts
+++ b/src/addons/mod/wiki/wiki-lazy.module.ts
@@ -22,6 +22,10 @@ import { CanLeaveGuard } from '@guards/can-leave';
 import { AddonModWikiEditPage } from './pages/edit/edit';
 
 const routes: Routes = [
+    {
+        path: ':courseId/:cmId',
+        redirectTo: ':courseId/:cmId/page/root',
+    },
     {
         path: ':courseId/:cmId/page/:hash',
         component: AddonModWikiIndexPage,
diff --git a/src/core/features/course/services/course-helper.ts b/src/core/features/course/services/course-helper.ts
index 725381272..9a8d1ffc4 100644
--- a/src/core/features/course/services/course-helper.ts
+++ b/src/core/features/course/services/course-helper.ts
@@ -78,17 +78,17 @@ export type CoreCourseModulePrefetchInfo = {
     /**
      * Downloaded size.
      */
-    size?: number;
+    size: number;
 
     /**
      * Downloadable size in a readable format.
      */
-    sizeReadable?: string;
+    sizeReadable: string;
 
     /**
      * Module status.
      */
-    status?: string;
+    status: string;
 
     /**
      * Icon's name of the module status.
@@ -98,12 +98,12 @@ export type CoreCourseModulePrefetchInfo = {
     /**
      * Time when the module was last downloaded.
      */
-    downloadTime?: number;
+    downloadTime: number;
 
     /**
      * Download time in a readable format.
      */
-    downloadTimeReadable?: string;
+    downloadTimeReadable: string;
 };
 
 /**
@@ -539,18 +539,14 @@ export class CoreCourseHelperProvider {
             total: true,
         };
 
-        if (!section && !sections) {
-            throw new CoreError('Either section or list of sections needs to be supplied.');
-        }
-
         // Calculate the size of the download.
         if (section && section.id != CoreCourseProvider.ALL_SECTIONS_ID) {
             sizeSum = await CoreCourseModulePrefetchDelegate.getDownloadSize(section.modules, courseId);
 
             // Check if the section has embedded files in the description.
             hasEmbeddedFiles = CoreFilepool.extractDownloadableFilesFromHtml(section.summary).length > 0;
-        } else {
-            await Promise.all(sections!.map(async (section) => {
+        } else if (sections) {
+            await Promise.all(sections.map(async (section) => {
                 if (section.id == CoreCourseProvider.ALL_SECTIONS_ID) {
                     return;
                 }
@@ -565,6 +561,8 @@ export class CoreCourseHelperProvider {
                     hasEmbeddedFiles = true;
                 }
             }));
+        } else {
+            throw new CoreError('Either section or list of sections needs to be supplied.');
         }
 
         if (hasEmbeddedFiles) {
@@ -1057,7 +1055,7 @@ export class CoreCourseHelperProvider {
 
         const moduleInfo = await this.getModulePrefetchInfo(module, courseId, invalidateCache, component);
 
-        instance.size = moduleInfo.size && moduleInfo.size > 0 ? moduleInfo.sizeReadable! : '';
+        instance.size = moduleInfo.sizeReadable;
         instance.prefetchStatusIcon = moduleInfo.statusIcon;
         instance.prefetchStatus = moduleInfo.status;
 
@@ -1443,7 +1441,7 @@ export class CoreCourseHelperProvider {
         invalidateCache?: boolean,
         component?: string,
     ): Promise<CoreCourseModulePrefetchInfo> {
-        const moduleInfo: CoreCourseModulePrefetchInfo = {};
+
         const siteId = CoreSites.getCurrentSiteId();
 
         if (invalidateCache) {
@@ -1459,45 +1457,59 @@ export class CoreCourseHelperProvider {
         ]);
 
         // Treat stored size.
-        moduleInfo.size = results[0];
-        moduleInfo.sizeReadable = CoreTextUtils.bytesToSize(results[0], 2);
+        const size = results[0];
+        const sizeReadable = CoreTextUtils.bytesToSize(results[0], 2);
 
         // Treat module status.
-        moduleInfo.status = results[1];
+        const status = results[1];
+        let statusIcon: string | undefined;
         switch (results[1]) {
             case CoreConstants.NOT_DOWNLOADED:
-                moduleInfo.statusIcon = CoreConstants.ICON_NOT_DOWNLOADED;
+                statusIcon = CoreConstants.ICON_NOT_DOWNLOADED;
                 break;
             case CoreConstants.DOWNLOADING:
-                moduleInfo.statusIcon = CoreConstants.ICON_DOWNLOADING;
+                statusIcon = CoreConstants.ICON_DOWNLOADING;
                 break;
             case CoreConstants.OUTDATED:
-                moduleInfo.statusIcon = CoreConstants.ICON_OUTDATED;
+                statusIcon = CoreConstants.ICON_OUTDATED;
                 break;
             case CoreConstants.DOWNLOADED:
                 break;
             default:
-                moduleInfo.statusIcon = '';
+                statusIcon = '';
                 break;
         }
 
         // Treat download time.
         if (!results[2] || !results[2].downloadTime || !CoreFileHelper.isStateDownloaded(results[2].status || '')) {
             // Not downloaded.
-            moduleInfo.downloadTime = 0;
-
-            return moduleInfo;
+            return {
+                size,
+                sizeReadable,
+                status,
+                statusIcon,
+                downloadTime: 0,
+                downloadTimeReadable: '',
+            };
         }
 
         const now = CoreTimeUtils.timestamp();
-        moduleInfo.downloadTime = results[2].downloadTime;
+        const downloadTime = results[2].downloadTime;
+        let downloadTimeReadable = '';
         if (now - results[2].downloadTime < 7 * 86400) {
-            moduleInfo.downloadTimeReadable = moment(results[2].downloadTime * 1000).fromNow();
+            downloadTimeReadable = moment(results[2].downloadTime * 1000).fromNow();
         } else {
-            moduleInfo.downloadTimeReadable = moment(results[2].downloadTime * 1000).calendar();
+            downloadTimeReadable = moment(results[2].downloadTime * 1000).calendar();
         }
 
-        return moduleInfo;
+        return {
+            size,
+            sizeReadable,
+            status,
+            statusIcon,
+            downloadTime,
+            downloadTimeReadable,
+        };
     }
 
     /**
@@ -1690,20 +1702,20 @@ export class CoreCourseHelperProvider {
         courseMenuHandlers: CoreCourseOptionsMenuHandlerToDisplay[],
         siteId?: string,
     ): Promise<void> {
-        siteId = siteId || CoreSites.getCurrentSiteId();
+        const requiredSiteId = siteId || CoreSites.getRequiredCurrentSite().getId();
 
-        if (this.courseDwnPromises[siteId] && this.courseDwnPromises[siteId][course.id]) {
+        if (this.courseDwnPromises[requiredSiteId] && this.courseDwnPromises[requiredSiteId][course.id] !== undefined) {
             // There's already a download ongoing for this course, return the promise.
-            return this.courseDwnPromises[siteId][course.id];
-        } else if (!this.courseDwnPromises[siteId]) {
-            this.courseDwnPromises[siteId] = {};
+            return this.courseDwnPromises[requiredSiteId][course.id];
+        } else if (!this.courseDwnPromises[requiredSiteId]) {
+            this.courseDwnPromises[requiredSiteId] = {};
         }
 
         // First of all, mark the course as being downloaded.
-        this.courseDwnPromises[siteId][course.id] = CoreCourse.setCourseStatus(
+        this.courseDwnPromises[requiredSiteId][course.id] = CoreCourse.setCourseStatus(
             course.id,
             CoreConstants.DOWNLOADING,
-            siteId,
+            requiredSiteId,
         ).then(async () => {
 
             const promises: Promise<unknown>[] = [];
@@ -1740,17 +1752,17 @@ export class CoreCourseHelperProvider {
             await CoreUtils.allPromises(promises);
 
             // Download success, mark the course as downloaded.
-            return CoreCourse.setCourseStatus(course.id, CoreConstants.DOWNLOADED, siteId);
+            return CoreCourse.setCourseStatus(course.id, CoreConstants.DOWNLOADED, requiredSiteId);
         }).catch(async (error) => {
             // Error, restore previous status.
-            await CoreCourse.setCoursePreviousStatus(course.id, siteId);
+            await CoreCourse.setCoursePreviousStatus(course.id, requiredSiteId);
 
             throw error;
         }).finally(() => {
-            delete this.courseDwnPromises[siteId!][course.id];
+            delete this.courseDwnPromises[requiredSiteId][course.id];
         });
 
-        return this.courseDwnPromises[siteId][course.id];
+        return this.courseDwnPromises[requiredSiteId][course.id];
     }
 
     /**
diff --git a/src/core/features/course/services/handlers/default-module.ts b/src/core/features/course/services/handlers/default-module.ts
index cda24c8a9..75dfd0586 100644
--- a/src/core/features/course/services/handlers/default-module.ts
+++ b/src/core/features/course/services/handlers/default-module.ts
@@ -70,7 +70,7 @@ export class CoreCourseModuleDefaultHandler implements CoreCourseModuleHandler {
                     e.preventDefault();
                     e.stopPropagation();
 
-                    CoreSites.requireCurrentSite().openInBrowserWithAutoLoginIfSameSite(url);
+                    CoreSites.getRequiredCurrentSite().openInBrowserWithAutoLoginIfSameSite(url);
                 },
             }];
         }
diff --git a/src/core/services/sites.ts b/src/core/services/sites.ts
index 85de9ea31..38a35cd28 100644
--- a/src/core/services/sites.ts
+++ b/src/core/services/sites.ts
@@ -305,7 +305,7 @@ export class CoreSitesProvider {
         if (data.errorcode && (data.errorcode == 'enablewsdescription' || data.errorcode == 'requirecorrectaccess')) {
             throw new CoreSiteError({
                 errorcode: data.errorcode,
-                message: data.error!,
+                message: data.error ?? '',
             });
         }
 
@@ -816,11 +816,24 @@ export class CoreSitesProvider {
     }
 
     /**
-     * Get current site.
+     * Get current site or undefined if none.
+     *
+     * @return Current site or undefined if none.
+     */
+    getCurrentSite(): CoreSite | undefined {
+        return this.currentSite;
+    }
+
+    /**
+     * Get current site or fail if none.
      *
      * @return Current site.
      */
-    getCurrentSite(): CoreSite | undefined {
+    getRequiredCurrentSite(): CoreSite {
+        if (!this.currentSite) {
+            throw new CoreError('You aren\'t authenticated in any site.');
+        }
+
         return this.currentSite;
     }
 
@@ -1487,7 +1500,9 @@ export class CoreSitesProvider {
             return Promise.resolve();
         }
 
-        if (this.siteSchemasMigration[site.id]) {
+        const siteId = site.id;
+
+        if (this.siteSchemasMigration[site.id] !== undefined) {
             return this.siteSchemasMigration[site.id];
         }
 
@@ -1500,7 +1515,7 @@ export class CoreSitesProvider {
         this.siteSchemasMigration[site.id] = promise;
 
         return promise.finally(() => {
-            delete this.siteSchemasMigration[site.id!];
+            delete this.siteSchemasMigration[siteId];
         });
     }
 

From 84934149e1e479c03f835e7a1319ccdf558eda7e Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 10 Sep 2021 14:33:50 +0200
Subject: [PATCH 0089/1008] MOBILE-3844 media: Hide download option in audio
 and video

---
 .../url/components/index/addon-mod-url-index.html    |  2 +-
 src/core/directives/format-text.ts                   | 12 ++++++++++++
 .../components/capture-media/capture-media.html      |  6 ++++--
 src/core/services/utils/mimetype.ts                  |  2 +-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/addons/mod/url/components/index/addon-mod-url-index.html b/src/addons/mod/url/components/index/addon-mod-url-index.html
index 48f9b1f91..7c13f1b46 100644
--- a/src/addons/mod/url/components/index/addon-mod-url-index.html
+++ b/src/addons/mod/url/components/index/addon-mod-url-index.html
@@ -32,7 +32,7 @@
         <ion-item *ngIf="shouldEmbed">
             <ion-label>
                 <img *ngIf="isImage" [alt]="name" [src]="url">
-                <video *ngIf="isVideo" [title]="name" controls>
+                <video *ngIf="isVideo" [title]="name" controls controlsList="nodownload">
                     <source [src]="url" [type]="mimetype">
                 </video>
                 <audio *ngIf="isAudio" [title]="name" controls>
diff --git a/src/core/directives/format-text.ts b/src/core/directives/format-text.ts
index 719c1845c..22b5d3e4a 100644
--- a/src/core/directives/format-text.ts
+++ b/src/core/directives/format-text.ts
@@ -678,6 +678,18 @@ export class CoreFormatTextDirective implements OnChanges {
         this.addMediaAdaptClass(element);
         this.addExternalContent(element);
 
+        // Hide download button if not hidden already.
+        let controlsList = element.getAttribute('controlsList') || '';
+        if (!controlsList.includes('nodownload')) {
+            if (!controlsList.trim()) {
+                controlsList = 'nodownload';
+            } else {
+                controlsList = controlsList.split(' ').concat('nodownload').join(' ');
+            }
+
+            element.setAttribute('controlsList', controlsList);
+        }
+
         const sources = Array.from(element.querySelectorAll('source'));
         const tracks = Array.from(element.querySelectorAll('track'));
 
diff --git a/src/core/features/emulator/components/capture-media/capture-media.html b/src/core/features/emulator/components/capture-media/capture-media.html
index 544e4dc95..19c040eba 100644
--- a/src/core/features/emulator/components/capture-media/capture-media.html
+++ b/src/core/features/emulator/components/capture-media/capture-media.html
@@ -15,7 +15,9 @@
             <video *ngIf="!isAudio" [hidden]="hasCaptured" class="core-webcam-stream" autoplay #streamVideo></video>
 
             <!-- For video recording, use 2 videos and show/hide them because a CSS rule caused problems with the controls. -->
-            <video *ngIf="isVideo" [hidden]="!hasCaptured" class="core-webcam-video-captured" controls #previewVideo></video>
+            <video *ngIf="isVideo" [hidden]="!hasCaptured" class="core-webcam-video-captured" controls #previewVideo
+                controlsList="nodownload">
+            </video>
 
             <!-- Canvas to treat the image and an img to show the result. -->
             <canvas *ngIf="isImage" class="core-webcam-image-canvas" #imgCanvas></canvas>
@@ -35,7 +37,7 @@
                 </ion-button>
 
                 <!-- Audio player to listen to the result. -->
-                <audio [hidden]="!hasCaptured" class="core-audio-captured" controls #previewAudio></audio>
+                <audio [hidden]="!hasCaptured" class="core-audio-captured" controls #previewAudio controlsList="nodownload"></audio>
             </div>
         </div>
     </core-loading>
diff --git a/src/core/services/utils/mimetype.ts b/src/core/services/utils/mimetype.ts
index 9f5526ef3..78ea7322f 100644
--- a/src/core/services/utils/mimetype.ts
+++ b/src/core/services/utils/mimetype.ts
@@ -191,7 +191,7 @@ export class CoreMimetypeUtilsProvider {
                 case 'audio':
                 case 'video':
                     return [
-                        `<${embedType} controls title="${filename}" src="${path}">`,
+                        `<${embedType} controls title="${filename}" src="${path}" controlsList="nodownload">`,
                         `<source src="${path}" type="${mimeType}">`,
                         `</${embedType}>`,
                     ].join('');

From a91e21ea673c1fca1bbcc5eee9786c11fdfc16d1 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Mon, 13 Sep 2021 10:38:36 +0200
Subject: [PATCH 0090/1008] MOBILE-3833 DX: Configure `serve:test` script

Added this script in order to go in line with the documentation at https://docs.moodle.org/dev/Acceptance_testing_for_the_Moodle_App
---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 1aaa5439b..1357fd77a 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
   "scripts": {
     "ng": "ng",
     "start": "ionic serve --browser=$MOODLE_APP_BROWSER",
+    "serve:test": "NODE_ENV=testing ionic serve --no-open",
     "build": "ionic build",
     "build:prod": "NODE_ENV=production ionic build --prod",
     "build:test": "NODE_ENV=testing ionic build",

From 34f9c3ab5757db575b1e999eb74b57dd7560f2bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 9 Sep 2021 16:38:38 +0200
Subject: [PATCH 0091/1008] MOBILE-3833 navigator: Add required route params
 functions

---
 src/addons/calendar/pages/event/event.page.ts |  11 +-
 .../competency/pages/competency/competency.ts |  18 ++-
 .../competencysummary/competencysummary.ts    |  14 ++-
 .../coursecompetencies.page.ts                |  12 +-
 src/addons/competency/pages/plan/plan.ts      |  10 +-
 .../coursecompletion/pages/report/report.ts   |  12 +-
 src/addons/mod/assign/pages/edit/edit.ts      |  14 ++-
 .../submission-list/submission-list.page.ts   |  16 ++-
 .../submission-review/submission-review.ts    |  16 ++-
 src/addons/mod/chat/pages/chat/chat.ts        |  10 +-
 .../session-messages/session-messages.ts      |  20 +++-
 .../mod/chat/pages/sessions/sessions.ts       |  16 ++-
 .../components/field-plugin/field-plugin.ts   |   2 +-
 src/addons/mod/data/pages/edit/edit.ts        |  16 ++-
 src/addons/mod/data/pages/entry/entry.ts      |  19 ++-
 .../mod/feedback/pages/attempt/attempt.ts     |  14 ++-
 src/addons/mod/feedback/pages/form/form.ts    |  20 +++-
 .../pages/nonrespondents/nonrespondents.ts    |  14 ++-
 .../feedback/pages/respondents/respondents.ts |  14 ++-
 .../forum/pages/discussion/discussion.page.ts | 110 +++++++++++-------
 .../new-discussion/new-discussion.page.ts     |  27 ++++-
 src/addons/mod/glossary/pages/edit/edit.ts    |  35 ++++--
 src/addons/mod/glossary/pages/entry/entry.ts  |  16 ++-
 .../pages/attempt-results/attempt-results.ts  |  14 ++-
 .../pages/user-attempts/user-attempts.ts      |  15 ++-
 .../pages/users-attempts/users-attempts.ts    |  12 +-
 .../mod/lesson/pages/player/player.page.ts    |  20 +++-
 .../pages/user-retake/user-retake.page.ts     |  16 ++-
 .../mod/quiz/pages/attempt/attempt.page.ts    |  14 ++-
 .../mod/quiz/pages/player/player.page.ts      |  14 ++-
 .../mod/quiz/pages/review/review.page.ts      |  18 ++-
 src/addons/mod/scorm/pages/player/player.ts   |  24 ++--
 .../workshop/pages/assessment/assessment.ts   |  16 ++-
 .../pages/edit-submission/edit-submission.ts  |  16 ++-
 .../workshop/pages/submission/submission.ts   |  23 ++--
 src/addons/notes/pages/list/list.page.ts      |  18 ++-
 src/addons/privatefiles/pages/index/index.ts  |  32 +++--
 .../pages/course-storage/course-storage.ts    |  10 +-
 src/core/components/split-view/split-view.ts  |  21 ++--
 .../comments/pages/viewer/viewer.page.ts      |  25 ++--
 .../course/classes/main-activity-page.ts      |  15 ++-
 .../courses/pages/categories/categories.ts    |   2 +-
 .../grades/pages/course/course.page.ts        |  18 ++-
 .../features/grades/pages/grade/grade.page.ts |  20 +++-
 .../pages/participants/participants.page.ts   |  14 ++-
 src/core/services/navigator.ts                |  68 ++++++++++-
 46 files changed, 673 insertions(+), 228 deletions(-)

diff --git a/src/addons/calendar/pages/event/event.page.ts b/src/addons/calendar/pages/event/event.page.ts
index e92b62b8e..c449856b4 100644
--- a/src/addons/calendar/pages/event/event.page.ts
+++ b/src/addons/calendar/pages/event/event.page.ts
@@ -147,7 +147,16 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
      * View loaded.
      */
     ngOnInit(): void {
-        this.eventId = CoreNavigator.getRouteNumberParam('id')!;
+        try {
+            this.eventId = CoreNavigator.getRequiredRouteNumberParam('id');
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
+        }
+
         this.syncIcon = CoreConstants.ICON_LOADING;
 
         this.fetchEvent();
diff --git a/src/addons/competency/pages/competency/competency.ts b/src/addons/competency/pages/competency/competency.ts
index e4ebe432e..f9bd310cc 100644
--- a/src/addons/competency/pages/competency/competency.ts
+++ b/src/addons/competency/pages/competency/competency.ts
@@ -60,11 +60,19 @@ export class AddonCompetencyCompetencyPage implements OnInit {
      * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
-        this.competencyId = CoreNavigator.getRouteNumberParam('competencyId')!;
-        this.planId = CoreNavigator.getRouteNumberParam('planId');
-        if (!this.planId) {
-            this.courseId = CoreNavigator.getRouteNumberParam('courseId')!;
-            this.userId = CoreNavigator.getRouteNumberParam('userId');
+        try {
+            this.competencyId = CoreNavigator.getRequiredRouteNumberParam('competencyId');
+            this.planId = CoreNavigator.getRouteNumberParam('planId');
+            if (!this.planId) {
+                this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+                this.userId = CoreNavigator.getRouteNumberParam('userId');
+            }
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
         }
 
         try {
diff --git a/src/addons/competency/pages/competencysummary/competencysummary.ts b/src/addons/competency/pages/competencysummary/competencysummary.ts
index 451d85553..2d150eb4e 100644
--- a/src/addons/competency/pages/competencysummary/competencysummary.ts
+++ b/src/addons/competency/pages/competencysummary/competencysummary.ts
@@ -40,9 +40,17 @@ export class AddonCompetencyCompetencySummaryPage implements OnInit {
      * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
-        this.competencyId = CoreNavigator.getRouteNumberParam('competencyId')!;
-        this.contextLevel = CoreNavigator.getRouteParam<ContextLevel>('contextLevel');
-        this.contextInstanceId = CoreNavigator.getRouteNumberParam('contextInstanceId');
+        try {
+            this.competencyId = CoreNavigator.getRequiredRouteNumberParam('competencyId');
+            this.contextLevel = CoreNavigator.getRouteParam<ContextLevel>('contextLevel');
+            this.contextInstanceId = CoreNavigator.getRouteNumberParam('contextInstanceId');
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
+        }
 
         try {
             await this.fetchCompetency();
diff --git a/src/addons/competency/pages/coursecompetencies/coursecompetencies.page.ts b/src/addons/competency/pages/coursecompetencies/coursecompetencies.page.ts
index 58c91bd56..cbe9a49eb 100644
--- a/src/addons/competency/pages/coursecompetencies/coursecompetencies.page.ts
+++ b/src/addons/competency/pages/coursecompetencies/coursecompetencies.page.ts
@@ -42,8 +42,16 @@ export class AddonCompetencyCourseCompetenciesPage implements OnInit {
      * View loaded.
      */
     ngOnInit(): void {
-        this.courseId = CoreNavigator.getRouteNumberParam('courseId')!;
-        this.userId = CoreNavigator.getRouteNumberParam('userId')!;
+        try {
+            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            this.userId = CoreNavigator.getRequiredRouteNumberParam('userId');
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
+        }
 
         this.fetchCourseCompetencies().finally(() => {
             this.competenciesLoaded = true;
diff --git a/src/addons/competency/pages/plan/plan.ts b/src/addons/competency/pages/plan/plan.ts
index 71fedb68a..bf86a1a46 100644
--- a/src/addons/competency/pages/plan/plan.ts
+++ b/src/addons/competency/pages/plan/plan.ts
@@ -39,7 +39,15 @@ export class AddonCompetencyPlanPage implements OnInit {
      * @inheritdoc
      */
     ngOnInit(): void {
-        this.planId = CoreNavigator.getRouteNumberParam('planId')!;
+        try {
+            this.planId = CoreNavigator.getRequiredRouteNumberParam('planId');
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
+        }
 
         this.fetchLearningPlan().finally(() => {
             this.loaded = true;
diff --git a/src/addons/coursecompletion/pages/report/report.ts b/src/addons/coursecompletion/pages/report/report.ts
index 5cda867eb..027d0480e 100644
--- a/src/addons/coursecompletion/pages/report/report.ts
+++ b/src/addons/coursecompletion/pages/report/report.ts
@@ -44,11 +44,15 @@ export class AddonCourseCompletionReportPage implements OnInit {
      * @inheritdoc
      */
     ngOnInit(): void {
-        this.courseId = CoreNavigator.getRouteNumberParam('courseId')!;
-        this.userId = CoreNavigator.getRouteNumberParam('userId') || CoreSites.getCurrentSiteUserId();
+        try {
+            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            this.userId = CoreNavigator.getRouteNumberParam('userId') || CoreSites.getCurrentSiteUserId();
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
 
-        if (!this.userId) {
-            this.userId = CoreSites.getCurrentSiteUserId();
+            CoreNavigator.back();
+
+            return;
         }
 
         this.fetchCompletion().finally(() => {
diff --git a/src/addons/mod/assign/pages/edit/edit.ts b/src/addons/mod/assign/pages/edit/edit.ts
index 98884b13e..01ddb7499 100644
--- a/src/addons/mod/assign/pages/edit/edit.ts
+++ b/src/addons/mod/assign/pages/edit/edit.ts
@@ -78,9 +78,17 @@ export class AddonModAssignEditPage implements OnInit, OnDestroy, CanLeave {
      * Component being initialized.
      */
     ngOnInit(): void {
-        this.moduleId = CoreNavigator.getRouteNumberParam('cmId')!;
-        this.courseId = CoreNavigator.getRouteNumberParam('courseId')!;
-        this.isBlind = !!CoreNavigator.getRouteNumberParam('blindId');
+        try {
+            this.moduleId = CoreNavigator.getRequiredRouteNumberParam('cmId');
+            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            this.isBlind = !!CoreNavigator.getRouteNumberParam('blindId');
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
+        }
 
         this.fetchAssignment().finally(() => {
             this.loaded = true;
diff --git a/src/addons/mod/assign/pages/submission-list/submission-list.page.ts b/src/addons/mod/assign/pages/submission-list/submission-list.page.ts
index 86443ad08..90f02a382 100644
--- a/src/addons/mod/assign/pages/submission-list/submission-list.page.ts
+++ b/src/addons/mod/assign/pages/submission-list/submission-list.page.ts
@@ -120,10 +120,18 @@ export class AddonModAssignSubmissionListPage implements AfterViewInit, OnDestro
      * Component being initialized.
      */
     ngAfterViewInit(): void {
-        this.moduleId = CoreNavigator.getRouteNumberParam('cmId')!;
-        this.courseId = CoreNavigator.getRouteNumberParam('courseId')!;
-        this.groupId = CoreNavigator.getRouteNumberParam('groupId') || 0;
-        this.selectedStatus = CoreNavigator.getRouteParam('status');
+        try {
+            this.moduleId = CoreNavigator.getRequiredRouteNumberParam('cmId');
+            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            this.groupId = CoreNavigator.getRouteNumberParam('groupId') || 0;
+            this.selectedStatus = CoreNavigator.getRouteParam('status');
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
+        }
 
         if (this.selectedStatus) {
             if (this.selectedStatus == AddonModAssignProvider.NEED_GRADING) {
diff --git a/src/addons/mod/assign/pages/submission-review/submission-review.ts b/src/addons/mod/assign/pages/submission-review/submission-review.ts
index 831dea8b8..803074c9f 100644
--- a/src/addons/mod/assign/pages/submission-review/submission-review.ts
+++ b/src/addons/mod/assign/pages/submission-review/submission-review.ts
@@ -55,10 +55,18 @@ export class AddonModAssignSubmissionReviewPage implements OnInit, CanLeave {
      */
     ngOnInit(): void {
         this.route.queryParams.subscribe((params) => {
-            this.moduleId = CoreNavigator.getRouteNumberParam('cmId')!;
-            this.courseId = CoreNavigator.getRouteNumberParam('courseId')!;
-            this.submitId = CoreNavigator.getRouteNumberParam('submitId') || 0;
-            this.blindId = CoreNavigator.getRouteNumberParam('blindId', { params });
+            try {
+                this.moduleId = CoreNavigator.getRequiredRouteNumberParam('cmId');
+                this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+                this.submitId = CoreNavigator.getRouteNumberParam('submitId') || 0;
+                this.blindId = CoreNavigator.getRouteNumberParam('blindId', { params });
+            } catch (error) {
+                CoreDomUtils.showErrorModal(error);
+
+                CoreNavigator.back();
+
+                return;
+            }
 
             this.fetchSubmission().finally(() => {
                 this.loaded = true;
diff --git a/src/addons/mod/chat/pages/chat/chat.ts b/src/addons/mod/chat/pages/chat/chat.ts
index 76ffdeb6b..809d5106b 100644
--- a/src/addons/mod/chat/pages/chat/chat.ts
+++ b/src/addons/mod/chat/pages/chat/chat.ts
@@ -78,12 +78,12 @@ export class AddonModChatChatPage implements OnInit, OnDestroy, CanLeave {
      * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
-        this.courseId = CoreNavigator.getRouteNumberParam('courseId')!;
-        this.cmId = CoreNavigator.getRouteNumberParam('cmId')!;
-        this.chatId = CoreNavigator.getRouteNumberParam('chatId')!;
-        this.title = CoreNavigator.getRouteParam('title') || '';
-
         try {
+            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            this.cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
+            this.chatId = CoreNavigator.getRequiredRouteNumberParam('chatId');
+            this.title = CoreNavigator.getRouteParam('title') || '';
+
             await this.loginUser();
 
             await this.fetchMessages();
diff --git a/src/addons/mod/chat/pages/session-messages/session-messages.ts b/src/addons/mod/chat/pages/session-messages/session-messages.ts
index 00b7e8a71..02d185a30 100644
--- a/src/addons/mod/chat/pages/session-messages/session-messages.ts
+++ b/src/addons/mod/chat/pages/session-messages/session-messages.ts
@@ -47,12 +47,20 @@ export class AddonModChatSessionMessagesPage implements OnInit {
      * @inheritdoc
      */
     ngOnInit(): void {
-        this.courseId = CoreNavigator.getRouteNumberParam('courseId')!;
-        this.cmId = CoreNavigator.getRouteNumberParam('cmId')!;
-        this.sessionStart = CoreNavigator.getRouteNumberParam('sessionStart')!;
-        this.sessionEnd = CoreNavigator.getRouteNumberParam('sessionEnd')!;
-        this.chatId = CoreNavigator.getRouteNumberParam('chatId')!;
-        this.groupId = CoreNavigator.getRouteNumberParam('groupId') || 0;
+        try {
+            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            this.cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
+            this.sessionStart = CoreNavigator.getRequiredRouteNumberParam('sessionStart');
+            this.sessionEnd = CoreNavigator.getRequiredRouteNumberParam('sessionEnd');
+            this.chatId = CoreNavigator.getRequiredRouteNumberParam('chatId');
+            this.groupId = CoreNavigator.getRouteNumberParam('groupId') || 0;
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
+        }
 
         this.currentUserId = CoreSites.getCurrentSiteUserId();
 
diff --git a/src/addons/mod/chat/pages/sessions/sessions.ts b/src/addons/mod/chat/pages/sessions/sessions.ts
index c579fcb35..c262d4d74 100644
--- a/src/addons/mod/chat/pages/sessions/sessions.ts
+++ b/src/addons/mod/chat/pages/sessions/sessions.ts
@@ -53,10 +53,18 @@ export class AddonModChatSessionsPage implements AfterViewInit, OnDestroy {
      * @inheritdoc
      */
     async ngAfterViewInit(): Promise<void> {
-        this.courseId = CoreNavigator.getRouteNumberParam('courseId')!;
-        this.cmId = CoreNavigator.getRouteNumberParam('cmId')!;
-        this.chatId = CoreNavigator.getRouteNumberParam('chatId')!;
-        this.sessions.setChatId(this.chatId);
+        try {
+            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            this.cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
+            this.chatId = CoreNavigator.getRequiredRouteNumberParam('chatId');
+            this.sessions.setChatId(this.chatId);
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
+        }
 
         await this.fetchSessions();
 
diff --git a/src/addons/mod/data/components/field-plugin/field-plugin.ts b/src/addons/mod/data/components/field-plugin/field-plugin.ts
index 28d20115f..74ed1e710 100644
--- a/src/addons/mod/data/components/field-plugin/field-plugin.ts
+++ b/src/addons/mod/data/components/field-plugin/field-plugin.ts
@@ -53,7 +53,7 @@ export class AddonModDataFieldPluginComponent implements OnInit, OnChanges {
             return;
         }
 
-        try{
+        try {
             // Check if the plugin has defined its own component to render itself.
             this.fieldComponent = await AddonModDataFieldsDelegate.getComponentForField(this.field);
 
diff --git a/src/addons/mod/data/pages/edit/edit.ts b/src/addons/mod/data/pages/edit/edit.ts
index 2b1786d41..5af31f6ed 100644
--- a/src/addons/mod/data/pages/edit/edit.ts
+++ b/src/addons/mod/data/pages/edit/edit.ts
@@ -96,10 +96,18 @@ export class AddonModDataEditPage implements OnInit {
      * @inheritdoc
      */
     ngOnInit(): void {
-        this.module = CoreNavigator.getRouteParam<CoreCourseModule>('module')!;
-        this.entryId = CoreNavigator.getRouteNumberParam('entryId') || undefined;
-        this.courseId = CoreNavigator.getRouteNumberParam('courseId')!;
-        this.selectedGroup = CoreNavigator.getRouteNumberParam('group') || 0;
+        try {
+            this.module = CoreNavigator.getRequiredRouteParam<CoreCourseModule>('module');
+            this.entryId = CoreNavigator.getRouteNumberParam('entryId') || undefined;
+            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            this.selectedGroup = CoreNavigator.getRouteNumberParam('group') || 0;
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
+        }
 
         // If entryId is lower than 0 or null, it is a new entry or an offline entry.
         this.isEditing = typeof this.entryId != 'undefined' && this.entryId > 0;
diff --git a/src/addons/mod/data/pages/entry/entry.ts b/src/addons/mod/data/pages/entry/entry.ts
index c9c813307..95e37b326 100644
--- a/src/addons/mod/data/pages/entry/entry.ts
+++ b/src/addons/mod/data/pages/entry/entry.ts
@@ -132,11 +132,20 @@ export class AddonModDataEntryPage implements OnInit, OnDestroy {
      * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
-        this.module = CoreNavigator.getRouteParam<CoreCourseModule>('module')!;
-        this.entryId = CoreNavigator.getRouteNumberParam('entryId') || undefined;
-        this.courseId = CoreNavigator.getRouteNumberParam('courseId')!;
-        this.selectedGroup = CoreNavigator.getRouteNumberParam('group') || 0;
-        this.offset = CoreNavigator.getRouteNumberParam('offset');
+        try {
+            this.module = CoreNavigator.getRequiredRouteParam<CoreCourseModule>('module');
+            this.entryId = CoreNavigator.getRouteNumberParam('entryId') || undefined;
+            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            this.selectedGroup = CoreNavigator.getRouteNumberParam('group') || 0;
+            this.offset = CoreNavigator.getRouteNumberParam('offset');
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
+        }
+
         this.title = this.module.name;
 
         this.commentsEnabled = !CoreComments.areCommentsDisabledInSite();
diff --git a/src/addons/mod/feedback/pages/attempt/attempt.ts b/src/addons/mod/feedback/pages/attempt/attempt.ts
index 52e9736fe..194f22f06 100644
--- a/src/addons/mod/feedback/pages/attempt/attempt.ts
+++ b/src/addons/mod/feedback/pages/attempt/attempt.ts
@@ -49,9 +49,17 @@ export class AddonModFeedbackAttemptPage implements OnInit {
      * @inheritdoc
      */
     ngOnInit(): void {
-        this.cmId = CoreNavigator.getRouteNumberParam('cmId')!;
-        this.courseId = CoreNavigator.getRouteNumberParam('courseId')!;
-        this.attemptId = CoreNavigator.getRouteNumberParam('attemptId')!;
+        try {
+            this.cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
+            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            this.attemptId = CoreNavigator.getRequiredRouteNumberParam('attemptId');
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
+        }
 
         this.fetchData();
     }
diff --git a/src/addons/mod/feedback/pages/form/form.ts b/src/addons/mod/feedback/pages/form/form.ts
index d88967c29..1a11ebb21 100644
--- a/src/addons/mod/feedback/pages/form/form.ts
+++ b/src/addons/mod/feedback/pages/form/form.ts
@@ -92,12 +92,20 @@ export class AddonModFeedbackFormPage implements OnInit, OnDestroy, CanLeave {
      * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
-        this.cmId = CoreNavigator.getRouteNumberParam('cmId')!;
-        this.courseId = CoreNavigator.getRouteNumberParam('courseId')!;
-        this.currentPage = CoreNavigator.getRouteNumberParam('page');
-        this.title = CoreNavigator.getRouteParam('title');
-        this.preview = !!CoreNavigator.getRouteBooleanParam('preview');
-        this.fromIndex = !!CoreNavigator.getRouteBooleanParam('fromIndex');
+        try {
+            this.cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
+            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            this.currentPage = CoreNavigator.getRouteNumberParam('page');
+            this.title = CoreNavigator.getRouteParam('title');
+            this.preview = !!CoreNavigator.getRouteBooleanParam('preview');
+            this.fromIndex = !!CoreNavigator.getRouteBooleanParam('fromIndex');
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
+        }
 
         await this.fetchData();
 
diff --git a/src/addons/mod/feedback/pages/nonrespondents/nonrespondents.ts b/src/addons/mod/feedback/pages/nonrespondents/nonrespondents.ts
index d95111480..12d312bc0 100644
--- a/src/addons/mod/feedback/pages/nonrespondents/nonrespondents.ts
+++ b/src/addons/mod/feedback/pages/nonrespondents/nonrespondents.ts
@@ -47,9 +47,17 @@ export class AddonModFeedbackNonRespondentsPage implements OnInit {
      * @inheritdoc
      */
     ngOnInit(): void {
-        this.cmId = CoreNavigator.getRouteNumberParam('cmId')!;
-        this.courseId = CoreNavigator.getRouteNumberParam('courseId')!;
-        this.selectedGroup = CoreNavigator.getRouteNumberParam('group') || 0;
+        try {
+            this.cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
+            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            this.selectedGroup = CoreNavigator.getRouteNumberParam('group') || 0;
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
+        }
 
         this.fetchData();
     }
diff --git a/src/addons/mod/feedback/pages/respondents/respondents.ts b/src/addons/mod/feedback/pages/respondents/respondents.ts
index 8539b2cb2..3ef2266a7 100644
--- a/src/addons/mod/feedback/pages/respondents/respondents.ts
+++ b/src/addons/mod/feedback/pages/respondents/respondents.ts
@@ -63,9 +63,17 @@ export class AddonModFeedbackRespondentsPage implements AfterViewInit {
      * @inheritdoc
      */
     async ngAfterViewInit(): Promise<void> {
-        this.cmId = CoreNavigator.getRouteNumberParam('cmId')!;
-        this.courseId = CoreNavigator.getRouteNumberParam('courseId')!;
-        this.selectedGroup = CoreNavigator.getRouteNumberParam('group') || 0;
+        try {
+            this.cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
+            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            this.selectedGroup = CoreNavigator.getRouteNumberParam('group') || 0;
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
+        }
 
         await this.fetchData();
 
diff --git a/src/addons/mod/forum/pages/discussion/discussion.page.ts b/src/addons/mod/forum/pages/discussion/discussion.page.ts
index 34522f5b6..3894c38c4 100644
--- a/src/addons/mod/forum/pages/discussion/discussion.page.ts
+++ b/src/addons/mod/forum/pages/discussion/discussion.page.ts
@@ -65,7 +65,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
     discussionId!: number;
     forum: Partial<AddonModForumData> = {};
     accessInfo: AddonModForumAccessInformation = {};
-    discussion!: AddonModForumDiscussion;
+    discussion?: AddonModForumDiscussion;
     startingPost?: Post;
     posts!: Post[];
     discussionLoaded = false;
@@ -100,8 +100,8 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
     leavingPage = false;
 
     protected forumId!: number;
-    protected postId!: number;
-    protected parent!: number;
+    protected postId?: number;
+    protected parent?: number;
     protected onlineObserver?: Subscription;
     protected syncObserver?: CoreEventObserver;
     protected syncManualObserver?: CoreEventObserver;
@@ -122,16 +122,25 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
     }
 
     ngOnInit(): void {
-        this.courseId = CoreNavigator.getRouteNumberParam('courseId')!;
-        this.cmId = CoreNavigator.getRouteNumberParam('cmId')!;
-        this.forumId = CoreNavigator.getRouteNumberParam('forumId')!;
-        this.discussion = CoreNavigator.getRouteParam<AddonModForumDiscussion>('discussion')!;
-        this.discussionId = this.discussion
-            ? this.discussion.discussion
-            : CoreNavigator.getRouteNumberParam('discussionId')!;
-        this.trackPosts = CoreNavigator.getRouteBooleanParam('trackPosts')!;
-        this.postId = CoreNavigator.getRouteNumberParam('postId')!;
-        this.parent = CoreNavigator.getRouteNumberParam('parent')!;
+        try {
+            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            this.cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
+            this.forumId = CoreNavigator.getRequiredRouteNumberParam('forumId');
+            this.discussion = CoreNavigator.getRouteParam<AddonModForumDiscussion>('discussion');
+            this.discussionId = this.discussion
+                ? this.discussion.discussion
+                : CoreNavigator.getRequiredRouteNumberParam('discussionId');
+            this.trackPosts = CoreNavigator.getRouteBooleanParam('trackPosts') || false;
+            this.postId = CoreNavigator.getRouteNumberParam('postId');
+            this.parent = CoreNavigator.getRouteNumberParam('parent');
+
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            this.goBack();
+
+            return;
+        }
 
         this.isOnline = CoreApp.isOnline();
         this.onlineObserver = Network.onChange().subscribe(() => {
@@ -148,11 +157,9 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
      * View loaded.
      */
     async ngAfterViewInit(): Promise<void> {
-        if (this.parent) {
-            this.sort = 'nested'; // Force nested order.
-        } else {
-            this.sort = await this.getUserSort();
-        }
+        this.sort = this.parent
+            ? 'nested' // Force nested order.
+            : await this.getUserSort();
 
         await this.fetchPosts(true, false, true);
 
@@ -183,6 +190,16 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
             await this.loadDiscussion(this.forumId, this.cmId, this.discussionId);
         }
 
+        if (!this.discussion) {
+            CoreDomUtils.showErrorModal('Cannot get the discussion');
+
+            this.goBack();
+
+            return;
+        }
+
+        const discussion = this.discussion;
+
         // Refresh data if this discussion is synchronized automatically.
         this.syncObserver = CoreEvents.on(AddonModForumSyncProvider.AUTO_SYNCED, data => {
             if (data.forumId == this.forumId && this.discussionId == data.discussionId
@@ -204,7 +221,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
         }, CoreSites.getCurrentSiteId());
 
         // Invalidate discussion list if it was not read.
-        if (this.discussion.numunread > 0) {
+        if (discussion.numunread > 0) {
             AddonModForum.invalidateDiscussionsList(this.forumId);
         }
 
@@ -227,22 +244,18 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
             if ((this.forumId && this.forumId === data.forumId) || data.cmId === this.cmId) {
                 AddonModForum.invalidateDiscussionsList(this.forumId).finally(() => {
                     if (typeof data.locked != 'undefined') {
-                        this.discussion.locked = data.locked;
+                        discussion.locked = data.locked;
                     }
                     if (typeof data.pinned != 'undefined') {
-                        this.discussion.pinned = data.pinned;
+                        discussion.pinned = data.pinned;
                     }
                     if (typeof data.starred != 'undefined') {
-                        this.discussion.starred = data.starred;
+                        discussion.starred = data.starred;
                     }
 
                     if (typeof data.deleted != 'undefined' && data.deleted) {
                         if (!data.post?.parentid) {
-                            if (this.splitView?.outletActivated) {
-                                CoreNavigator.navigate('../');
-                            } else {
-                                CoreNavigator.back();
-                            }
+                            this.goBack();
                         } else {
                             this.discussionLoaded = false;
                             this.refreshPosts();
@@ -272,6 +285,17 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
         return true;
     }
 
+    /**
+     * Helper function to go back.
+     */
+    protected goBack(): void {
+        if (this.splitView?.outletActivated) {
+            CoreNavigator.navigate('../');
+        } else {
+            CoreNavigator.back();
+        }
+    }
+
     /**
      * Runs when the page is about to leave and no longer be the active page.
      */
@@ -515,7 +539,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
             this.syncIcon = CoreConstants.ICON_SYNC;
 
             if (forceMarkAsRead || (hasUnreadPosts && this.trackPosts)) {
-                // // Add log in Moodle and mark unread posts as readed.
+                // Add log in Moodle and mark unread posts as readed.
                 AddonModForum.logDiscussionView(this.discussionId, this.forumId || -1, this.forum.name).catch(() => {
                     // Ignore errors.
                 }).finally(() => {
@@ -543,14 +567,8 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
             return;
         }
 
-        try {
-            const discussion = await AddonModForumHelper.getDiscussionById(forumId, cmId, discussionId);
-
-            this.discussion = discussion;
-            this.discussionId = this.discussion.discussion;
-        } catch (error) {
-            // Ignore errors.
-        }
+        this.discussion = await AddonModForumHelper.getDiscussionById(forumId, cmId, discussionId);
+        this.discussionId = this.discussion.discussion;
     }
 
     /**
@@ -630,7 +648,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
      * @param showErrors Whether to show errors in a modal.
      * @return Promise resolved when done.
      */
-    refreshPosts(sync?: boolean, showErrors?: boolean): Promise<void> {
+    async refreshPosts(sync?: boolean, showErrors?: boolean): Promise<void> {
         this.content.scrollToTop();
         this.refreshIcon = CoreConstants.ICON_LOADING;
         this.syncIcon = CoreConstants.ICON_LOADING;
@@ -642,9 +660,9 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
             AddonModForum.invalidateCanAddDiscussion(this.forumId),
         ];
 
-        return CoreUtils.allPromises(promises).catch(() => {
-            // Ignore errors.
-        }).then(() => this.fetchPosts(sync, showErrors));
+        await CoreUtils.ignoreErrors(CoreUtils.allPromises(promises));
+
+        await this.fetchPosts(sync, showErrors);
     }
 
     /**
@@ -668,6 +686,10 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
      * @param locked True to lock the discussion, false to unlock.
      */
     async setLockState(locked: boolean): Promise<void> {
+        if (!this.discussion) {
+            return;
+        }
+
         const modal = await CoreDomUtils.showModalLoading('core.sending', true);
 
         try {
@@ -696,6 +718,10 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
      * @param pinned True to pin the discussion, false to unpin it.
      */
     async setPinState(pinned: boolean): Promise<void> {
+        if (!this.discussion) {
+            return;
+        }
+
         const modal = await CoreDomUtils.showModalLoading('core.sending', true);
 
         try {
@@ -725,6 +751,10 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
      * @param starred True to star the discussion, false to unstar it.
      */
     async toggleFavouriteState(starred: boolean): Promise<void> {
+        if (!this.discussion) {
+            return;
+        }
+
         const modal = await CoreDomUtils.showModalLoading('core.sending', true);
 
         try {
diff --git a/src/addons/mod/forum/pages/new-discussion/new-discussion.page.ts b/src/addons/mod/forum/pages/new-discussion/new-discussion.page.ts
index 52995909a..f5495fb71 100644
--- a/src/addons/mod/forum/pages/new-discussion/new-discussion.page.ts
+++ b/src/addons/mod/forum/pages/new-discussion/new-discussion.page.ts
@@ -103,10 +103,18 @@ export class AddonModForumNewDiscussionPage implements OnInit, OnDestroy, CanLea
      * Component being initialized.
      */
     ngOnInit(): void {
-        this.courseId = CoreNavigator.getRouteNumberParam('courseId')!;
-        this.cmId = CoreNavigator.getRouteNumberParam('cmId')!;
-        this.forumId = CoreNavigator.getRouteNumberParam('forumId')!;
-        this.timeCreated = CoreNavigator.getRouteNumberParam('timeCreated')!;
+        try {
+            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            this.cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
+            this.forumId = CoreNavigator.getRequiredRouteNumberParam('forumId');
+            this.timeCreated = CoreNavigator.getRequiredRouteNumberParam('timeCreated');
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            this.goBack();
+
+            return;
+        }
 
         this.fetchDiscussionData().finally(() => {
             this.groupsLoaded = true;
@@ -595,6 +603,17 @@ export class AddonModForumNewDiscussionPage implements OnInit, OnDestroy, CanLea
         delete this.syncObserver;
     }
 
+    /**
+     * Helper function to go back.
+     */
+    protected goBack(): void {
+        if (this.splitView?.outletActivated) {
+            CoreNavigator.navigate('../../');
+        } else {
+            CoreNavigator.back();
+        }
+    }
+
     /**
      * Page destroyed.
      */
diff --git a/src/addons/mod/glossary/pages/edit/edit.ts b/src/addons/mod/glossary/pages/edit/edit.ts
index 854c74247..33f384fc3 100644
--- a/src/addons/mod/glossary/pages/edit/edit.ts
+++ b/src/addons/mod/glossary/pages/edit/edit.ts
@@ -73,7 +73,7 @@ export class AddonModGlossaryEditPage implements OnInit, CanLeave {
     };
 
     protected timecreated!: number;
-    protected concept?: string;
+    protected concept = '';
     protected syncId?: string;
     protected syncObserver?: CoreEventObserver;
     protected isDestroyed = false;
@@ -86,11 +86,19 @@ export class AddonModGlossaryEditPage implements OnInit, CanLeave {
      * Component being initialized.
      */
     ngOnInit(): void {
-        this.cmId = CoreNavigator.getRouteNumberParam('cmId')!;
-        this.courseId = CoreNavigator.getRouteNumberParam('courseId')!;
-        this.timecreated = CoreNavigator.getRouteNumberParam('timecreated')!;
-        this.concept = CoreNavigator.getRouteParam<string>('concept')!;
-        this.editorExtraParams.timecreated = this.timecreated;
+        try {
+            this.cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
+            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            this.timecreated = CoreNavigator.getRequiredRouteNumberParam('timecreated');
+            this.concept = CoreNavigator.getRouteParam<string>('concept') || '';
+            this.editorExtraParams.timecreated = this.timecreated;
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            this.goBack();
+
+            return;
+        }
 
         this.fetchData();
     }
@@ -116,7 +124,7 @@ export class AddonModGlossaryEditPage implements OnInit, CanLeave {
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'addon.mod_glossary.errorloadingglossary', true);
 
-            CoreNavigator.back();
+            this.goBack();
         }
     }
 
@@ -126,7 +134,7 @@ export class AddonModGlossaryEditPage implements OnInit, CanLeave {
      * @return Promise resolved when done.
      */
     protected async loadOfflineData(): Promise<void> {
-        const entry = await AddonModGlossaryOffline.getNewEntry(this.glossary!.id, this.concept || '', this.timecreated);
+        const entry = await AddonModGlossaryOffline.getNewEntry(this.glossary!.id, this.concept, this.timecreated);
 
         this.entry.concept = entry.concept || '';
         this.entry.definition = entry.definition || '';
@@ -367,4 +375,15 @@ export class AddonModGlossaryEditPage implements OnInit, CanLeave {
         }
     }
 
+    /**
+     * Helper function to go back.
+     */
+    protected goBack(): void {
+        if (this.splitView?.outletActivated) {
+            CoreNavigator.navigate('../../');
+        } else {
+            CoreNavigator.back();
+        }
+    }
+
 }
diff --git a/src/addons/mod/glossary/pages/entry/entry.ts b/src/addons/mod/glossary/pages/entry/entry.ts
index 5db347e85..ae3c836e4 100644
--- a/src/addons/mod/glossary/pages/entry/entry.ts
+++ b/src/addons/mod/glossary/pages/entry/entry.ts
@@ -57,10 +57,18 @@ export class AddonModGlossaryEntryPage implements OnInit {
      * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
-        this.courseId = CoreNavigator.getRouteNumberParam('courseId')!;
-        this.entryId = CoreNavigator.getRouteNumberParam('entryId')!;
-        this.tagsEnabled = CoreTag.areTagsAvailableInSite();
-        this.commentsEnabled = !CoreComments.areCommentsDisabledInSite();
+        try {
+            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            this.entryId = CoreNavigator.getRequiredRouteNumberParam('entryId');
+            this.tagsEnabled = CoreTag.areTagsAvailableInSite();
+            this.commentsEnabled = !CoreComments.areCommentsDisabledInSite();
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
+        }
 
         try {
             await this.fetchEntry();
diff --git a/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.ts b/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.ts
index 3f3d79731..113d66430 100644
--- a/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.ts
+++ b/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.ts
@@ -50,9 +50,17 @@ export class AddonModH5PActivityAttemptResultsPage implements OnInit {
      * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
-        this.courseId = CoreNavigator.getRouteNumberParam('courseId')!;
-        this.cmId = CoreNavigator.getRouteNumberParam('cmId')!;
-        this.attemptId = CoreNavigator.getRouteNumberParam('attemptId')!;
+        try {
+            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            this.cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
+            this.attemptId = CoreNavigator.getRequiredRouteNumberParam('attemptId');
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
+        }
 
         try {
             await this.fetchData();
diff --git a/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.ts b/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.ts
index 5f09b4c02..cda950b21 100644
--- a/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.ts
+++ b/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.ts
@@ -51,9 +51,18 @@ export class AddonModH5PActivityUserAttemptsPage implements OnInit {
      * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
-        this.courseId = CoreNavigator.getRouteNumberParam('courseId')!;
-        this.cmId = CoreNavigator.getRouteNumberParam('cmId')!;
-        this.userId = CoreNavigator.getRouteNumberParam('userId') || CoreSites.getCurrentSiteUserId();
+        try {
+            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            this.cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
+            this.userId = CoreNavigator.getRouteNumberParam('userId') || CoreSites.getCurrentSiteUserId();
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
+        }
+
         this.isCurrentUser = this.userId == CoreSites.getCurrentSiteUserId();
 
         try {
diff --git a/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.ts b/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.ts
index 7dee400fe..65d0f2510 100644
--- a/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.ts
+++ b/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.ts
@@ -49,8 +49,16 @@ export class AddonModH5PActivityUsersAttemptsPage implements OnInit {
      * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
-        this.courseId = CoreNavigator.getRouteNumberParam('courseId')!;
-        this.cmId = CoreNavigator.getRouteNumberParam('cmId')!;
+        try {
+            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            this.cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
+        }
 
         try {
             await this.fetchData();
diff --git a/src/addons/mod/lesson/pages/player/player.page.ts b/src/addons/mod/lesson/pages/player/player.page.ts
index 9d5d7db72..e0c4f251d 100644
--- a/src/addons/mod/lesson/pages/player/player.page.ts
+++ b/src/addons/mod/lesson/pages/player/player.page.ts
@@ -119,12 +119,20 @@ export class AddonModLessonPlayerPage implements OnInit, OnDestroy, CanLeave {
      * Component being initialized.
      */
     async ngOnInit(): Promise<void> {
-        this.cmId = CoreNavigator.getRouteNumberParam('cmId')!;
-        this.courseId = CoreNavigator.getRouteNumberParam('courseId')!;
-        this.password = CoreNavigator.getRouteParam('password');
-        this.review = !!CoreNavigator.getRouteBooleanParam('review');
-        this.currentPage = CoreNavigator.getRouteNumberParam('pageId');
-        this.retakeToReview = CoreNavigator.getRouteNumberParam('retake');
+        try {
+            this.cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
+            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            this.password = CoreNavigator.getRouteParam('password');
+            this.review = !!CoreNavigator.getRouteBooleanParam('review');
+            this.currentPage = CoreNavigator.getRouteNumberParam('pageId');
+            this.retakeToReview = CoreNavigator.getRouteNumberParam('retake');
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
+        }
 
         try {
             // Fetch the Lesson data.
diff --git a/src/addons/mod/lesson/pages/user-retake/user-retake.page.ts b/src/addons/mod/lesson/pages/user-retake/user-retake.page.ts
index 58c826758..634e08740 100644
--- a/src/addons/mod/lesson/pages/user-retake/user-retake.page.ts
+++ b/src/addons/mod/lesson/pages/user-retake/user-retake.page.ts
@@ -64,10 +64,18 @@ export class AddonModLessonUserRetakePage implements OnInit {
      * Component being initialized.
      */
     ngOnInit(): void {
-        this.cmId = CoreNavigator.getRouteNumberParam('cmId')!;
-        this.courseId = CoreNavigator.getRouteNumberParam('courseId')!;
-        this.userId = CoreNavigator.getRouteNumberParam('userId') || CoreSites.getCurrentSiteUserId();
-        this.retakeNumber = CoreNavigator.getRouteNumberParam('retake');
+        try {
+            this.cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
+            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            this.userId = CoreNavigator.getRouteNumberParam('userId') || CoreSites.getCurrentSiteUserId();
+            this.retakeNumber = CoreNavigator.getRouteNumberParam('retake');
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
+        }
 
         // Fetch the data.
         this.fetchData().finally(() => {
diff --git a/src/addons/mod/quiz/pages/attempt/attempt.page.ts b/src/addons/mod/quiz/pages/attempt/attempt.page.ts
index 74fa31df3..85481178d 100644
--- a/src/addons/mod/quiz/pages/attempt/attempt.page.ts
+++ b/src/addons/mod/quiz/pages/attempt/attempt.page.ts
@@ -52,9 +52,17 @@ export class AddonModQuizAttemptPage implements OnInit {
      * Component being initialized.
      */
     ngOnInit(): void {
-        this.cmId = CoreNavigator.getRouteNumberParam('cmId')!;
-        this.courseId = CoreNavigator.getRouteNumberParam('courseId')!;
-        this.attemptId = CoreNavigator.getRouteNumberParam('attemptId')!;
+        try {
+            this.cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
+            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            this.attemptId = CoreNavigator.getRequiredRouteNumberParam('attemptId');
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
+        }
 
         this.fetchQuizData().finally(() => {
             this.loaded = true;
diff --git a/src/addons/mod/quiz/pages/player/player.page.ts b/src/addons/mod/quiz/pages/player/player.page.ts
index 27ea916c6..c2da33f1b 100644
--- a/src/addons/mod/quiz/pages/player/player.page.ts
+++ b/src/addons/mod/quiz/pages/player/player.page.ts
@@ -106,9 +106,17 @@ export class AddonModQuizPlayerPage implements OnInit, OnDestroy, CanLeave {
      * Component being initialized.
      */
     ngOnInit(): void {
-        this.cmId = CoreNavigator.getRouteNumberParam('cmId')!;
-        this.courseId = CoreNavigator.getRouteNumberParam('courseId')!;
-        this.moduleUrl = CoreNavigator.getRouteParam('moduleUrl');
+        try {
+            this.cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
+            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            this.moduleUrl = CoreNavigator.getRouteParam('moduleUrl');
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
+        }
 
         // Create the auto save instance.
         this.autoSave = new AddonModQuizAutoSave(
diff --git a/src/addons/mod/quiz/pages/review/review.page.ts b/src/addons/mod/quiz/pages/review/review.page.ts
index bc7ba288a..98d01d3da 100644
--- a/src/addons/mod/quiz/pages/review/review.page.ts
+++ b/src/addons/mod/quiz/pages/review/review.page.ts
@@ -83,11 +83,19 @@ export class AddonModQuizReviewPage implements OnInit {
      * Component being initialized.
      */
     async ngOnInit(): Promise<void> {
-        this.cmId = CoreNavigator.getRouteNumberParam('cmId')!;
-        this.courseId = CoreNavigator.getRouteNumberParam('courseId')!;
-        this.attemptId = CoreNavigator.getRouteNumberParam('attemptId')!;
-        this.currentPage = CoreNavigator.getRouteNumberParam('page') || -1;
-        this.showAll = this.currentPage == -1;
+        try {
+            this.cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
+            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            this.attemptId = CoreNavigator.getRequiredRouteNumberParam('attemptId');
+            this.currentPage = CoreNavigator.getRouteNumberParam('page') || -1;
+            this.showAll = this.currentPage == -1;
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
+        }
 
         try {
             await this.fetchData();
diff --git a/src/addons/mod/scorm/pages/player/player.ts b/src/addons/mod/scorm/pages/player/player.ts
index c24a3d9fd..74bf853c9 100644
--- a/src/addons/mod/scorm/pages/player/player.ts
+++ b/src/addons/mod/scorm/pages/player/player.ts
@@ -88,14 +88,22 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
      * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
-        this.cmId = CoreNavigator.getRouteNumberParam('cmId')!;
-        this.courseId = CoreNavigator.getRouteNumberParam('courseId')!;
-        this.mode = CoreNavigator.getRouteParam('mode') || AddonModScormProvider.MODENORMAL;
-        this.moduleUrl = CoreNavigator.getRouteParam('moduleUrl') || '';
-        this.newAttempt = !!CoreNavigator.getRouteBooleanParam('newAttempt');
-        this.organizationId = CoreNavigator.getRouteParam('organizationId');
-        this.initialScoId = CoreNavigator.getRouteNumberParam('scoId');
-        this.siteId = CoreSites.getCurrentSiteId();
+        try {
+            this.cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
+            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            this.mode = CoreNavigator.getRouteParam('mode') || AddonModScormProvider.MODENORMAL;
+            this.moduleUrl = CoreNavigator.getRouteParam('moduleUrl') || '';
+            this.newAttempt = !!CoreNavigator.getRouteBooleanParam('newAttempt');
+            this.organizationId = CoreNavigator.getRouteParam('organizationId');
+            this.initialScoId = CoreNavigator.getRouteNumberParam('scoId');
+            this.siteId = CoreSites.getCurrentSiteId();
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
+        }
 
         try {
             // Fetch the SCORM data.
diff --git a/src/addons/mod/workshop/pages/assessment/assessment.ts b/src/addons/mod/workshop/pages/assessment/assessment.ts
index ea8b2ec52..0c074a4f9 100644
--- a/src/addons/mod/workshop/pages/assessment/assessment.ts
+++ b/src/addons/mod/workshop/pages/assessment/assessment.ts
@@ -117,10 +117,18 @@ export class AddonModWorkshopAssessmentPage implements OnInit, OnDestroy, CanLea
      * Component being initialized.
      */
     ngOnInit(): void {
-        this.assessment = CoreNavigator.getRouteParam<AddonModWorkshopSubmissionAssessmentWithFormData>('assessment')!;
-        this.submission = CoreNavigator.getRouteParam<AddonModWorkshopSubmissionData>('submission')!;
-        this.profile = CoreNavigator.getRouteParam<CoreUserProfile>('profile')!;
-        this.courseId = CoreNavigator.getRouteNumberParam('courseId')!;
+        try {
+            this.assessment = CoreNavigator.getRequiredRouteParam<AddonModWorkshopSubmissionAssessmentWithFormData>('assessment');
+            this.submission = CoreNavigator.getRequiredRouteParam<AddonModWorkshopSubmissionData>('submission');
+            this.profile = CoreNavigator.getRequiredRouteParam<CoreUserProfile>('profile');
+            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
+        }
 
         this.assessmentId = this.assessment.id;
         this.workshopId = this.submission.workshopid;
diff --git a/src/addons/mod/workshop/pages/edit-submission/edit-submission.ts b/src/addons/mod/workshop/pages/edit-submission/edit-submission.ts
index 3cc680eb7..c91033454 100644
--- a/src/addons/mod/workshop/pages/edit-submission/edit-submission.ts
+++ b/src/addons/mod/workshop/pages/edit-submission/edit-submission.ts
@@ -99,10 +99,18 @@ export class AddonModWorkshopEditSubmissionPage implements OnInit, OnDestroy, Ca
      * Component being initialized.
      */
     ngOnInit(): void {
-        this.module = CoreNavigator.getRouteParam<CoreCourseModule>('module')!;
-        this.courseId = CoreNavigator.getRouteNumberParam('courseId')!;
-        this.access = CoreNavigator.getRouteParam<AddonModWorkshopGetWorkshopAccessInformationWSResponse>('access')!;
-        this.submissionId = CoreNavigator.getRouteNumberParam('submissionId') || 0;
+        try {
+            this.module = CoreNavigator.getRequiredRouteParam<CoreCourseModule>('module');
+            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            this.access = CoreNavigator.getRequiredRouteParam<AddonModWorkshopGetWorkshopAccessInformationWSResponse>('access');
+            this.submissionId = CoreNavigator.getRouteNumberParam('submissionId') || 0;
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
+        }
 
         if (this.submissionId > 0) {
             this.editorExtraParams.id = this.submissionId;
diff --git a/src/addons/mod/workshop/pages/submission/submission.ts b/src/addons/mod/workshop/pages/submission/submission.ts
index 349c00c28..dee18605e 100644
--- a/src/addons/mod/workshop/pages/submission/submission.ts
+++ b/src/addons/mod/workshop/pages/submission/submission.ts
@@ -130,15 +130,22 @@ export class AddonModWorkshopSubmissionPage implements OnInit, OnDestroy, CanLea
      * Component being initialized.
      */
     async ngOnInit(): Promise<void> {
+        try {
+            this.submissionId = CoreNavigator.getRequiredRouteNumberParam('submissionId');
+            this.module = CoreNavigator.getRequiredRouteParam<CoreCourseModule>('module');
+            this.workshop = CoreNavigator.getRequiredRouteParam<AddonModWorkshopData>('workshop');
+            this.access = CoreNavigator.getRequiredRouteParam<AddonModWorkshopGetWorkshopAccessInformationWSResponse>('access');
+            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            this.profile = CoreNavigator.getRouteParam<CoreUserProfile>('profile');
+            this.submissionInfo = CoreNavigator.getRequiredRouteParam<AddonModWorkshopSubmissionDataWithOfflineData>('submission');
+            this.assessment = CoreNavigator.getRouteParam<AddonModWorkshopSubmissionAssessmentWithFormData>('assessment');
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
 
-        this.submissionId = CoreNavigator.getRouteNumberParam('submissionId')!;
-        this.module = CoreNavigator.getRouteParam<CoreCourseModule>('module')!;
-        this.workshop = CoreNavigator.getRouteParam<AddonModWorkshopData>('workshop')!;
-        this.access = CoreNavigator.getRouteParam<AddonModWorkshopGetWorkshopAccessInformationWSResponse>('access')!;
-        this.courseId = CoreNavigator.getRouteNumberParam('courseId')!;
-        this.profile = CoreNavigator.getRouteParam<CoreUserProfile>('profile');
-        this.submissionInfo = CoreNavigator.getRouteParam<AddonModWorkshopSubmissionDataWithOfflineData>('submission')!;
-        this.assessment = CoreNavigator.getRouteParam<AddonModWorkshopSubmissionAssessmentWithFormData>('assessment');
+            CoreNavigator.back();
+
+            return;
+        }
 
         this.title = this.module.name;
         this.workshopId = this.module.instance || this.workshop.id;
diff --git a/src/addons/notes/pages/list/list.page.ts b/src/addons/notes/pages/list/list.page.ts
index 487b86f20..4480fc250 100644
--- a/src/addons/notes/pages/list/list.page.ts
+++ b/src/addons/notes/pages/list/list.page.ts
@@ -40,7 +40,7 @@ export class AddonNotesListPage implements OnInit, OnDestroy {
 
      @ViewChild(IonContent) content?: IonContent;
 
-    courseId: number;
+    courseId!: number;
     userId?: number;
     type: AddonNotesPublishState = 'course';
     refreshIcon = CoreConstants.ICON_LOADING;
@@ -51,13 +51,21 @@ export class AddonNotesListPage implements OnInit, OnDestroy {
     user?: CoreUserProfile;
     showDelete = false;
     canDeleteNotes = false;
-    currentUserId: number;
+    currentUserId!: number;
 
-    protected syncObserver: CoreEventObserver;
+    protected syncObserver!: CoreEventObserver;
 
     constructor() {
-        this.courseId = CoreNavigator.getRouteNumberParam('courseId')!;
-        this.userId = CoreNavigator.getRouteNumberParam('userId');
+        try {
+            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            this.userId = CoreNavigator.getRouteNumberParam('userId');
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
+        }
 
         // Refresh data if notes are synchronized automatically.
         this.syncObserver = CoreEvents.on(AddonNotesSyncProvider.AUTO_SYNCED, (data) => {
diff --git a/src/addons/privatefiles/pages/index/index.ts b/src/addons/privatefiles/pages/index/index.ts
index b7a6b0da4..098214023 100644
--- a/src/addons/privatefiles/pages/index/index.ts
+++ b/src/addons/privatefiles/pages/index/index.ts
@@ -69,19 +69,27 @@ export class AddonPrivateFilesIndexPage implements OnInit, OnDestroy {
      * Component being initialized.
      */
     ngOnInit(): void {
-        this.root = CoreNavigator.getRouteParam('root');
-        const contextId = CoreNavigator.getRouteNumberParam('contextid');
+        try {
+            this.root = CoreNavigator.getRouteParam('root');
+            const contextId = CoreNavigator.getRouteNumberParam('contextid');
 
-        if (contextId) {
-            // Loading a certain folder.
-            this.path = {
-                contextid: contextId,
-                component: CoreNavigator.getRouteParam<string>('component')!,
-                filearea: CoreNavigator.getRouteParam<string>('filearea')!,
-                itemid: CoreNavigator.getRouteNumberParam('itemid')!,
-                filepath: CoreNavigator.getRouteParam<string>('filepath')!,
-                filename: CoreNavigator.getRouteParam<string>('filename')!,
-            };
+            if (contextId) {
+                // Loading a certain folder.
+                this.path = {
+                    contextid: contextId,
+                    component: CoreNavigator.getRequiredRouteParam<string>('component'),
+                    filearea: CoreNavigator.getRequiredRouteParam<string>('filearea'),
+                    itemid: CoreNavigator.getRequiredRouteNumberParam('itemid'),
+                    filepath: CoreNavigator.getRequiredRouteParam<string>('filepath'),
+                    filename: CoreNavigator.getRequiredRouteParam<string>('filename'),
+                };
+            }
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
         }
 
         this.title = this.path?.filename || Translate.instant('addon.privatefiles.files');
diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.ts b/src/addons/storagemanager/pages/course-storage/course-storage.ts
index 2e467f96a..752059a7a 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.ts
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.ts
@@ -42,7 +42,15 @@ export class AddonStorageManagerCourseStoragePage implements OnInit {
      * View loaded.
      */
     async ngOnInit(): Promise<void> {
-        this.course = CoreNavigator.getRouteParam<CoreEnrolledCourseData>('course')!;
+        try {
+            this.course = CoreNavigator.getRequiredRouteParam<CoreEnrolledCourseData>('course');
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
+        }
 
         this.sections = await CoreCourse.getSections(this.course.id, false, true);
         CoreCourseHelper.addHandlerDataForModules(this.sections, this.course.id);
diff --git a/src/core/components/split-view/split-view.ts b/src/core/components/split-view/split-view.ts
index 1a50991a5..a69cc700c 100644
--- a/src/core/components/split-view/split-view.ts
+++ b/src/core/components/split-view/split-view.ts
@@ -66,14 +66,8 @@ export class CoreSplitViewComponent implements AfterViewInit, OnDestroy {
         this.disableScrollOnParent();
 
         this.subscriptions = [
-            this.contentOutlet.activateEvents.subscribe(() => {
-                this.updateClasses();
-                this.outletRouteSubject.next(this.contentOutlet.activatedRoute.snapshot);
-            }),
-            this.contentOutlet.deactivateEvents.subscribe(() => {
-                this.updateClasses();
-                this.outletRouteSubject.next(null);
-            }),
+            this.contentOutlet.activateEvents.subscribe(() => this.updateOutletRoute()),
+            this.contentOutlet.deactivateEvents.subscribe(() => this.updateOutletRoute()),
             CoreScreen.layoutObservable.subscribe(() => this.updateClasses()),
         ];
 
@@ -89,6 +83,17 @@ export class CoreSplitViewComponent implements AfterViewInit, OnDestroy {
         this.enableScrollOnParent();
     }
 
+    /**
+     * Update outlet status.
+     */
+    private updateOutletRoute(): void {
+        const outletRoute = this.contentOutlet.isActivated ? this.contentOutlet.activatedRoute.snapshot : null;
+
+        this.updateClasses();
+
+        this.outletRouteSubject.next(outletRoute);
+    }
+
     /**
      * Update host classes.
      */
diff --git a/src/core/features/comments/pages/viewer/viewer.page.ts b/src/core/features/comments/pages/viewer/viewer.page.ts
index f0522caca..befbfd691 100644
--- a/src/core/features/comments/pages/viewer/viewer.page.ts
+++ b/src/core/features/comments/pages/viewer/viewer.page.ts
@@ -110,19 +110,28 @@ export class CoreCommentsViewerPage implements OnInit, OnDestroy {
      * View loaded.
      */
     async ngOnInit(): Promise<void> {
+        try {
+            this.contextLevel = CoreNavigator.getRequiredRouteParam<ContextLevel>('contextLevel');
+            this.instanceId = CoreNavigator.getRequiredRouteNumberParam('instanceId');
+            this.componentName = CoreNavigator.getRequiredRouteParam<string>('componentName');
+            this.itemId = CoreNavigator.getRequiredRouteNumberParam('itemId');
+            this.area = CoreNavigator.getRouteParam('area') || '';
+            this.title = CoreNavigator.getRouteNumberParam('title') ||
+                Translate.instant('core.comments.comments');
+            this.courseId = CoreNavigator.getRouteNumberParam('courseId');
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
+        }
+
         // Is implicit the user can delete if he can add.
         this.addDeleteCommentsAvailable = await CoreComments.isAddCommentsAvailable();
         this.currentUserId = CoreSites.getCurrentSiteUserId();
 
         this.commentsLoaded = false;
-        this.contextLevel = CoreNavigator.getRouteParam<ContextLevel>('contextLevel')!;
-        this.instanceId = CoreNavigator.getRouteNumberParam('instanceId')!;
-        this.componentName = CoreNavigator.getRouteParam<string>('componentName')!;
-        this.itemId = CoreNavigator.getRouteNumberParam('itemId')!;
-        this.area = CoreNavigator.getRouteParam('area') || '';
-        this.title = CoreNavigator.getRouteNumberParam('title') ||
-            Translate.instant('core.comments.comments');
-        this.courseId = CoreNavigator.getRouteNumberParam('courseId');
 
         await this.fetchComments(true);
     }
diff --git a/src/core/features/course/classes/main-activity-page.ts b/src/core/features/course/classes/main-activity-page.ts
index 4c66ba3b0..de7604457 100644
--- a/src/core/features/course/classes/main-activity-page.ts
+++ b/src/core/features/course/classes/main-activity-page.ts
@@ -14,10 +14,10 @@
 
 import { Component, OnInit } from '@angular/core';
 import { CoreNavigator } from '@services/navigator';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreCourseAnyModuleData } from '../services/course';
 import { CoreCourseModuleMainResourceComponent } from './main-resource-component';
 
-/**
 /**
  * Template class to easily create CoreCourseModuleMainComponent of resources (or activities without syncing).
  */
@@ -36,8 +36,17 @@ export class CoreCourseModuleMainActivityPage<ActivityType extends CoreCourseMod
      * Component being initialized.
      */
     ngOnInit(): void {
-        this.module = CoreNavigator.getRouteParam<CoreCourseAnyModuleData>('module')!;
-        this.courseId = CoreNavigator.getRouteNumberParam('courseId')!;
+        try {
+            this.module = CoreNavigator.getRequiredRouteParam<CoreCourseAnyModuleData>('module');
+            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
+        }
+
         this.title = this.module?.name;
     }
 
diff --git a/src/core/features/courses/pages/categories/categories.ts b/src/core/features/courses/pages/categories/categories.ts
index 1714f4ebb..df71c1c88 100644
--- a/src/core/features/courses/pages/categories/categories.ts
+++ b/src/core/features/courses/pages/categories/categories.ts
@@ -59,7 +59,7 @@ export class CoreCoursesCategoriesPage implements OnInit {
      * @return Promise resolved when done.
      */
     protected async fetchCategories(): Promise<void> {
-        try{
+        try {
             const categories: CoreCategoryData[] = await CoreCourses.getCategories(this.categoryId, true);
 
             this.currentCategory = undefined;
diff --git a/src/core/features/grades/pages/course/course.page.ts b/src/core/features/grades/pages/course/course.page.ts
index e47cf8819..ee13e8248 100644
--- a/src/core/features/grades/pages/course/course.page.ts
+++ b/src/core/features/grades/pages/course/course.page.ts
@@ -40,14 +40,26 @@ import { CoreNavigator } from '@services/navigator';
 })
 export class CoreGradesCoursePage implements AfterViewInit, OnDestroy {
 
-    grades: CoreGradesCourseManager;
+    grades!: CoreGradesCourseManager;
     splitViewMode?: CoreSplitViewMode;
 
     @ViewChild(CoreSplitViewComponent) splitView!: CoreSplitViewComponent;
 
     constructor(protected route: ActivatedRoute) {
-        const courseId = CoreNavigator.getRouteNumberParam('courseId', { route })!;
-        const userId = CoreNavigator.getRouteNumberParam('userId', { route }) ?? CoreSites.getCurrentSiteUserId();
+        let courseId: number;
+        let userId: number;
+
+        try {
+            courseId = CoreNavigator.getRequiredRouteNumberParam('courseId', { route });
+            userId = CoreNavigator.getRouteNumberParam('userId', { route }) ?? CoreSites.getCurrentSiteUserId();
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
+        }
+
         const useSplitView = route.snapshot.data.useSplitView ?? true;
         const outsideGradesTab = route.snapshot.data.outsideGradesTab ?? false;
 
diff --git a/src/core/features/grades/pages/grade/grade.page.ts b/src/core/features/grades/pages/grade/grade.page.ts
index 4424c1bd2..b77e08ce6 100644
--- a/src/core/features/grades/pages/grade/grade.page.ts
+++ b/src/core/features/grades/pages/grade/grade.page.ts
@@ -31,16 +31,24 @@ import { CoreNavigator } from '@services/navigator';
 })
 export class CoreGradesGradePage implements OnInit {
 
-    courseId: number;
-    userId: number;
-    gradeId: number;
+    courseId!: number;
+    userId!: number;
+    gradeId!: number;
     grade?: CoreGradesFormattedRow | null;
     gradeLoaded = false;
 
     constructor() {
-        this.courseId = CoreNavigator.getRouteNumberParam('courseId')!;
-        this.gradeId = CoreNavigator.getRouteNumberParam('gradeId')!;
-        this.userId = CoreNavigator.getRouteNumberParam('userId') ?? CoreSites.getCurrentSiteUserId();
+        try {
+            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            this.gradeId = CoreNavigator.getRequiredRouteNumberParam('gradeId');
+            this.userId = CoreNavigator.getRouteNumberParam('userId') ?? CoreSites.getCurrentSiteUserId();
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
+        }
     }
 
     /**
diff --git a/src/core/features/user/pages/participants/participants.page.ts b/src/core/features/user/pages/participants/participants.page.ts
index bc135514e..b1508eb2b 100644
--- a/src/core/features/user/pages/participants/participants.page.ts
+++ b/src/core/features/user/pages/participants/participants.page.ts
@@ -33,7 +33,7 @@ import { CoreUtils } from '@services/utils/utils';
 })
 export class CoreUserParticipantsPage implements OnInit, AfterViewInit, OnDestroy {
 
-    participants: CoreUserParticipantsManager;
+    participants!: CoreUserParticipantsManager;
     searchQuery: string | null = null;
     searchInProgress = false;
     searchEnabled = false;
@@ -43,7 +43,17 @@ export class CoreUserParticipantsPage implements OnInit, AfterViewInit, OnDestro
     @ViewChild(CoreSplitViewComponent) splitView!: CoreSplitViewComponent;
 
     constructor() {
-        const courseId = CoreNavigator.getRouteNumberParam('courseId')!;
+        let courseId: number;
+
+        try {
+            courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
+        }
 
         this.participants = new CoreUserParticipantsManager(CoreUserParticipantsPage, courseId);
     }
diff --git a/src/core/services/navigator.ts b/src/core/services/navigator.ts
index 8707bf47d..2e3ad5a0c 100644
--- a/src/core/services/navigator.ts
+++ b/src/core/services/navigator.ts
@@ -30,6 +30,7 @@ import { makeSingleton, NavController, Router } from '@singletons';
 import { CoreScreen } from './screen';
 import { CoreApp } from './app';
 import { CoreSitePlugins } from '@features/siteplugins/services/siteplugins';
+import { CoreError } from '@classes/errors/error';
 
 const DEFAULT_MAIN_MENU_TAB = CoreMainMenuHomeHandlerService.PAGE_NAME;
 
@@ -269,7 +270,7 @@ export class CoreNavigatorService {
 
         const value = route.snapshot.queryParams[name] ?? route.snapshot.params[name];
 
-        if (typeof value != 'undefined') {
+        if (value !== undefined) {
             return value;
         }
 
@@ -300,7 +301,7 @@ export class CoreNavigatorService {
             value = routeOptions.params[name];
         }
 
-        if (typeof value == 'undefined') {
+        if (value === undefined) {
             return;
         }
 
@@ -345,7 +346,7 @@ export class CoreNavigatorService {
     getRouteBooleanParam(name: string, routeOptions: CoreNavigatorCurrentRouteOptions = {}): boolean | undefined {
         const value = this.getRouteParam<string>(name, routeOptions);
 
-        if (typeof value == 'undefined') {
+        if (value === undefined) {
             return value;
         }
 
@@ -360,6 +361,67 @@ export class CoreNavigatorService {
         return Boolean(value);
     }
 
+    /**
+     * Get a parameter for the current route.
+     * Please notice that objects can only be retrieved once. You must call this function only once per page and parameter,
+     * unless there's a new navigation to the page.
+     *
+     * This function will fail if parameter is not found.
+     *
+     * @param name Name of the parameter.
+     * @param routeOptions Optional routeOptions to get the params or route value from. If missing, it will autodetect.
+     * @return Value of the parameter, undefined if not found.
+     */
+    getRequiredRouteParam<T = unknown>(name: string, routeOptions: CoreNavigatorCurrentRouteOptions = {}): T {
+        const value = this.getRouteParam<T>(name, routeOptions);
+
+        if (value === undefined) {
+            throw new CoreError(`Required param '${name}' not found.`);
+        }
+
+        return value;
+    }
+
+    /**
+     * Get a number route param.
+     * Angular router automatically converts numbers to string, this function automatically converts it back to number.
+     *
+     * This function will fail if parameter is not found.
+     *
+     * @param name Name of the parameter.
+     * @param routeOptions Optional routeOptions to get the params or route value from. If missing, it will autodetect.
+     * @return Value of the parameter, undefined if not found.
+     */
+    getRequiredRouteNumberParam(name: string, routeOptions: CoreNavigatorCurrentRouteOptions = {}): number {
+        const value = this.getRouteNumberParam(name, routeOptions);
+
+        if (value === undefined) {
+            throw new CoreError(`Required number param '${name}' not found.`);
+        }
+
+        return value;
+    }
+
+    /**
+     * Get a boolean route param.
+     * Angular router automatically converts booleans to string, this function automatically converts it back to boolean.
+     *
+     * This function will fail if parameter is not found.
+     *
+     * @param name Name of the parameter.
+     * @param routeOptions Optional routeOptions to get the params or route value from. If missing, it will autodetect.
+     * @return Value of the parameter, undefined if not found.
+     */
+    getRequiredRouteBooleanParam(name: string, routeOptions: CoreNavigatorCurrentRouteOptions = {}): boolean {
+        const value = this.getRouteBooleanParam(name, routeOptions);
+
+        if (value === undefined) {
+            throw new CoreError(`Required boolean param '${name}' not found.`);
+        }
+
+        return value;
+    }
+
     /**
      * Navigate back.
      *

From d63e7505809f9e87014948e04d6cc38d7603fc9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 9 Sep 2021 16:39:59 +0200
Subject: [PATCH 0092/1008] MOBILE-3833 style: Remove border on single item
 cards

---
 src/core/features/login/login.scss         | 5 +++++
 src/core/features/login/pages/site/site.ts | 2 +-
 src/theme/theme.base.scss                  | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/core/features/login/login.scss b/src/core/features/login/login.scss
index 73b08e7ae..129a185de 100644
--- a/src/core/features/login/login.scss
+++ b/src/core/features/login/login.scss
@@ -15,6 +15,11 @@
             color: var(--color);
         }
     }
+
+    form div {
+        color: var(--color);
+    }
+
     ion-button.core-button-as-link {
         --color: var(--core-login-text-color);
         text-decoration-color: var(--core-login-text-color);
diff --git a/src/core/features/login/pages/site/site.ts b/src/core/features/login/pages/site/site.ts
index 1f567ebad..6cc44b83f 100644
--- a/src/core/features/login/pages/site/site.ts
+++ b/src/core/features/login/pages/site/site.ts
@@ -35,7 +35,7 @@ import { CoreTextUtils } from '@services/utils/text';
 import { CoreForms } from '@singletons/form';
 
 /**
- * Page that displays a "splash screen" while the app is being initialized.
+ * Site (url) chooser when adding a new site.
  */
 @Component({
     selector: 'page-core-login-site',
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index cdca1e799..ef149d2ca 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -548,6 +548,10 @@ ion-card ion-item img.core-module-icon[slot="start"] {
     margin-right: 12px;
 }
 
+ion-card ion-item:only-child {
+    --inner-border-width: 0;
+}
+
 [dir=rtl] ion-item img.core-module-icon[slot="start"] {
     margin-right: unset;
     margin-left: 32px;

From d8bab320d7ca17abf79bb64c383655f988f8c52a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 10 Sep 2021 12:31:54 +0200
Subject: [PATCH 0093/1008] MOBILE-3833 calendar: Remove unused splitview on
 calendar

---
 src/addons/calendar/calendar-lazy.module.ts   | 24 ++++-----
 .../pages/edit-event/edit-event.page.ts       | 15 ++----
 src/addons/calendar/pages/event/event.html    | 53 ++++++-------------
 src/addons/calendar/pages/event/event.page.ts | 15 ++----
 4 files changed, 31 insertions(+), 76 deletions(-)

diff --git a/src/addons/calendar/calendar-lazy.module.ts b/src/addons/calendar/calendar-lazy.module.ts
index 5ead2dbca..20af6f9a7 100644
--- a/src/addons/calendar/calendar-lazy.module.ts
+++ b/src/addons/calendar/calendar-lazy.module.ts
@@ -13,22 +13,11 @@
 // limitations under the License.
 
 import { Injector, NgModule } from '@angular/core';
-import { Route, RouterModule, ROUTES, Routes } from '@angular/router';
+import { RouterModule, ROUTES, Routes } from '@angular/router';
 
 import { buildTabMainRoutes } from '@features/mainmenu/mainmenu-tab-routing.module';
 import { AddonCalendarMainMenuHandlerService } from './services/handlers/mainmenu';
 
-export const AddonCalendarEditRoute: Route = {
-    path: 'edit/:eventId',
-    loadChildren: () =>
-        import('@/addons/calendar/pages/edit-event/edit-event.module').then(m => m.AddonCalendarEditEventPageModule),
-};
-
-export const AddonCalendarEventRoute: Route ={
-    path: 'event/:id',
-    loadChildren: () => import('@/addons/calendar/pages/event/event.module').then(m => m.AddonCalendarEventPageModule),
-};
-
 function buildRoutes(injector: Injector): Routes {
     return [
         {
@@ -48,8 +37,15 @@ function buildRoutes(injector: Injector): Routes {
             loadChildren: () =>
                 import('@/addons/calendar/pages/day/day.module').then(m => m.AddonCalendarDayPageModule),
         },
-        AddonCalendarEventRoute,
-        AddonCalendarEditRoute,
+        {
+            path: 'event/:id',
+            loadChildren: () => import('@/addons/calendar/pages/event/event.module').then(m => m.AddonCalendarEventPageModule),
+        },
+        {
+            path: 'edit/:eventId',
+            loadChildren: () =>
+                import('@/addons/calendar/pages/edit-event/edit-event.module').then(m => m.AddonCalendarEditEventPageModule),
+        },
         ...buildTabMainRoutes(injector, {
             redirectTo: 'index',
             pathMatch: 'full',
diff --git a/src/addons/calendar/pages/edit-event/edit-event.page.ts b/src/addons/calendar/pages/edit-event/edit-event.page.ts
index fee73d0aa..366e07fa9 100644
--- a/src/addons/calendar/pages/edit-event/edit-event.page.ts
+++ b/src/addons/calendar/pages/edit-event/edit-event.page.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, OnInit, OnDestroy, ViewChild, ElementRef, Optional } from '@angular/core';
+import { Component, OnInit, OnDestroy, ViewChild, ElementRef } from '@angular/core';
 import { FormControl, FormGroup, FormBuilder, Validators } from '@angular/forms';
 import { IonRefresher } from '@ionic/angular';
 import { CoreEvents } from '@singletons/events';
@@ -23,7 +23,6 @@ import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTimeUtils } from '@services/utils/time';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreCategoryData, CoreCourses, CoreCourseSearchedData, CoreEnrolledCourseData } from '@features/courses/services/courses';
-import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import { CoreEditorRichTextEditorComponent } from '@features/editor/components/rich-text-editor/rich-text-editor';
 import {
     AddonCalendarProvider,
@@ -94,7 +93,6 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy, CanLeave {
 
     constructor(
         protected fb: FormBuilder,
-        @Optional() protected svComponent: CoreSplitViewComponent,
     ) {
         this.currentSite = CoreSites.getRequiredCurrentSite();
         this.errors = {
@@ -572,15 +570,8 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy, CanLeave {
             }
         }
 
-        if (this.svComponent?.outletActivated) {
-            // Empty form.
-            this.hasOffline = false;
-            this.form.reset(this.originalData);
-            this.originalData = CoreUtils.clone(this.form.value);
-        } else {
-            this.originalData = undefined; // Avoid asking for confirmation.
-            CoreNavigator.back();
-        }
+        this.originalData = undefined; // Avoid asking for confirmation.
+        CoreNavigator.back();
     }
 
     /**
diff --git a/src/addons/calendar/pages/event/event.html b/src/addons/calendar/pages/event/event.html
index 445329e5c..6244bc546 100644
--- a/src/addons/calendar/pages/event/event.html
+++ b/src/addons/calendar/pages/event/event.html
@@ -15,26 +15,23 @@
                 [contextInstanceId]="event.contextInstanceId"></core-format-text>
         </h1>
         <ion-buttons slot="end">
-            <!-- The context menu will be added in here. -->
+            <core-context-menu>
+                <core-context-menu-item [hidden]="!eventLoaded || (!hasOffline && event && !event.deleted) || !isOnline"
+                    [priority]="400" [content]="'core.settings.synchronizenow' | translate" (action)="doRefresh(undefined, $event, true)"
+                    [iconAction]="syncIcon" [closeOnClick]="false">
+                </core-context-menu-item>
+                <core-context-menu-item [hidden]="!canEdit || !event || !event.canedit || event.deleted" [priority]="300"
+                    [content]="'core.edit' | translate" (action)="openEdit()" iconAction="fas-edit">
+                </core-context-menu-item>
+                <core-context-menu-item [hidden]="!event || !event.candelete || event.deleted" [priority]="200"
+                    [content]="'core.delete' | translate" (action)="deleteEvent()"
+                    iconAction="fas-trash"></core-context-menu-item>
+                <core-context-menu-item [hidden]="!event || !event.deleted" [priority]="200" [content]="'core.restore' | translate"
+                    (action)="undoDelete()" iconAction="fas-undo-alt"></core-context-menu-item>
+            </core-context-menu>
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
-<core-navbar-buttons slot="end">
-    <core-context-menu>
-        <core-context-menu-item [hidden]="isSplitViewOn || !eventLoaded || (!hasOffline && event && !event.deleted) || !isOnline"
-            [priority]="400" [content]="'core.settings.synchronizenow' | translate" (action)="doRefresh(undefined, $event, true)"
-            [iconAction]="syncIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item [hidden]="!canEdit || !event || !event.canedit || event.deleted" [priority]="300"
-            [content]="'core.edit' | translate" (action)="openEdit()" iconAction="fas-edit">
-        </core-context-menu-item>
-        <core-context-menu-item [hidden]="!event || !event.candelete || event.deleted" [priority]="200"
-            [content]="'core.delete' | translate" (action)="deleteEvent()"
-            iconAction="fas-trash"></core-context-menu-item>
-        <core-context-menu-item [hidden]="!event || !event.deleted" [priority]="200" [content]="'core.restore' | translate"
-            (action)="undoDelete()" iconAction="fas-undo-alt"></core-context-menu-item>
-    </core-context-menu>
-</core-navbar-buttons>
 <ion-content>
     <ion-refresher slot="fixed" [disabled]="!eventLoaded" (ionRefresh)="doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
@@ -50,33 +47,13 @@
 
         <ion-card>
             <ion-card-content *ngIf="event">
-                <ion-item class="ion-text-wrap" *ngIf="isSplitViewOn">
-                    <img *ngIf="event.moduleIcon" src="{{event.moduleIcon}}" slot="start" alt="" role="presentation"
-                        class="core-module-icon">
-                    <ion-icon *ngIf="event.eventIcon && !event.moduleIcon" [name]="event.eventIcon" slot="start" aria-hidden="true">
-                    </ion-icon>
-                    <ion-label>
-                        <span class="sr-only">
-                            {{ 'addon.calendar.type' + event.formattedType | translate }}
-                            <span class="sr-only" *ngIf="event.moduleIcon && event.iconTitle">{{ event.iconTitle }}</span>
-                        </span>
-                        <h2>{{ 'addon.calendar.eventname' | translate }}</h2>
-                        <p>
-                            <core-format-text [text]="event.name" [contextLevel]="event.contextLevel"
-                                [contextInstanceId]="event.contextInstanceId"></core-format-text>
-                        </p>
-                    </ion-label>
-                    <ion-note slot="end" *ngIf="event.deleted">
-                        <ion-icon name="fas-trash" aria-hidden="true"></ion-icon> {{ 'core.deletedoffline' | translate }}
-                    </ion-note>
-                </ion-item>
                 <ion-item>
                     <ion-label>
                         <h2>{{ 'addon.calendar.when' | translate }}</h2>
                         <core-format-text [text]="event.formattedtime" [contextLevel]="event.contextLevel"
                         [contextInstanceId]="event.contextInstanceId"></core-format-text>
                     </ion-label>
-                    <ion-note slot="end" *ngIf="!isSplitViewOn && event.deleted">
+                    <ion-note slot="end" *ngIf="event.deleted">
                         <ion-icon name="fas-trash" aria-hidden="true"></ion-icon> {{ 'core.deletedoffline' | translate }}
                     </ion-note>
                 </ion-item>
diff --git a/src/addons/calendar/pages/event/event.page.ts b/src/addons/calendar/pages/event/event.page.ts
index c449856b4..88d4597f9 100644
--- a/src/addons/calendar/pages/event/event.page.ts
+++ b/src/addons/calendar/pages/event/event.page.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, OnDestroy, OnInit, Optional } from '@angular/core';
+import { Component, OnDestroy, OnInit } from '@angular/core';
 import { IonRefresher } from '@ionic/angular';
 import { AlertOptions } from '@ionic/core';
 import {
@@ -32,14 +32,12 @@ import { CoreLocalNotifications } from '@services/local-notifications';
 import { CoreCourse } from '@features/course/services/course';
 import { CoreTimeUtils } from '@services/utils/time';
 import { CoreGroups } from '@services/groups';
-import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import { Network, NgZone, Translate } from '@singletons';
 import { Subscription } from 'rxjs';
 import { CoreNavigator } from '@services/navigator';
 import { CoreUtils } from '@services/utils/utils';
 import { AddonCalendarReminderDBRecord } from '../../services/database/calendar';
 import { ActivatedRoute } from '@angular/router';
-import { CoreScreen } from '@services/screen';
 import { CoreConstants } from '@/core/constants';
 import { CoreLang } from '@services/lang';
 
@@ -81,18 +79,15 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
     hasOffline = false;
     isOnline = false;
     syncIcon = CoreConstants.ICON_LOADING; // Sync icon.
-    isSplitViewOn = false;
     monthNames?: string[];
 
     constructor(
-        @Optional() protected svComponent: CoreSplitViewComponent,
         protected route: ActivatedRoute,
     ) {
 
         this.notificationsEnabled = CoreLocalNotifications.isAvailable();
         this.siteHomeId = CoreSites.getCurrentSiteHomeId();
         this.currentSiteId = CoreSites.getCurrentSiteId();
-        this.isSplitViewOn = this.svComponent?.outletActivated;
 
         // Check if site supports editing. No need to check allowed types, event.canedit already does it.
         this.canEdit = AddonCalendar.canEditEventsInSite();
@@ -480,9 +475,7 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
                 CoreDomUtils.showToast('addon.calendar.eventcalendareventdeleted', true, 3000);
 
                 // Event deleted, close the view.
-                if (CoreScreen.isMobile) {
-                    CoreNavigator.back();
-                }
+                CoreNavigator.back();
             } else {
                 // Event deleted in offline, just mark it as deleted.
                 this.event.deleted = true;
@@ -537,9 +530,7 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
             CoreDomUtils.showToast('addon.calendar.eventcalendareventdeleted', true, 3000);
 
             // Event was deleted, close the view.
-            if (CoreScreen.isMobile) {
-                CoreNavigator.back();
-            }
+            CoreNavigator.back();
         } else if (data.events && (!isManual || data.source != 'event')) {
             const event = data.events.find((ev) => ev.id == this.eventId);
 

From 3d07369fd0a53f97f2dd627e796e9f4f6563f84e Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 13 Sep 2021 17:51:32 +0200
Subject: [PATCH 0094/1008] MOBILE-3857 overview: Fix filter selector not
 displayed

---
 .../block/myoverview/components/myoverview/myoverview.ts      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/addons/block/myoverview/components/myoverview/myoverview.ts b/src/addons/block/myoverview/components/myoverview/myoverview.ts
index d6a41958a..6bbe6b2a9 100644
--- a/src/addons/block/myoverview/components/myoverview/myoverview.ts
+++ b/src/addons/block/myoverview/components/myoverview/myoverview.ts
@@ -229,7 +229,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
      * @return Promise resolved when done.
      */
     protected async fetchContent(): Promise<void> {
-        const config = this.block.configsRecord || {};
+        const config = this.block.configsRecord;
 
         const showCategories = config?.displaycategories?.value == '1';
 
@@ -300,7 +300,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
             false,
         );
         if (this.showFilters.custom == 'show') {
-            this.customFilter = CoreTextUtils.parseJSON(config?.customfieldsexport?.value, []);
+            this.customFilter = CoreTextUtils.parseJSON(config?.customfieldsexport?.value || '[]', []);
         } else {
             this.customFilter = [];
         }

From f4494f45c7129c729d2f1cbe6a4d76ef42b55f31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 14 Sep 2021 13:00:44 +0200
Subject: [PATCH 0095/1008] MOBILE-3833 travis: Install npm 7

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index da4c96c21..67d72aed6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,7 @@ cache:
 
 before_install:
   - nvm install
+  - npm install npm@^7 -g
   - node --version
   - npm --version
   - nvm --version

From 83ff9efbd8ac0b260f307ca2a518063026c8890c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 14 Sep 2021 13:35:26 +0200
Subject: [PATCH 0096/1008] MOBILE-3859 login: Fix missing await when check if
 URL allowed

---
 src/core/features/login/pages/site/site.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/core/features/login/pages/site/site.ts b/src/core/features/login/pages/site/site.ts
index 6cc44b83f..b607ac068 100644
--- a/src/core/features/login/pages/site/site.ts
+++ b/src/core/features/login/pages/site/site.ts
@@ -498,7 +498,12 @@ export class CoreLoginSitePage implements OnInit {
 
         if (scheme && scheme != 'http' && scheme != 'https') {
             CoreDomUtils.showErrorModal(Translate.instant('core.errorurlschemeinvalidscheme', { $a: text }));
-        } else if (CoreLoginHelper.isSiteUrlAllowed(text)) {
+
+            return;
+        }
+
+        const allowed = await CoreLoginHelper.isSiteUrlAllowed(text);
+        if (allowed) {
             // Put the text in the field (if present).
             this.siteForm.controls.siteUrl.setValue(text);
 

From 534bbbb289d45adea66363d0241304bbb3a90a8f Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 14 Sep 2021 15:18:49 +0200
Subject: [PATCH 0097/1008] MOBILE-3859 ws: Improve error message for
 certificate errors

---
 scripts/langindex.json               |  2 ++
 src/core/classes/errors/ajaxerror.ts |  6 ++--
 src/core/classes/site.ts             | 44 ++++++++++++++--------------
 src/core/lang.json                   |  2 ++
 src/core/services/sites.ts           | 33 ++++++++++-----------
 src/core/services/ws.ts              | 39 ++++++++++++++++++++++--
 6 files changed, 80 insertions(+), 46 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 3c46978e7..7c5324cd9 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1384,6 +1384,7 @@
   "core.add": "moodle",
   "core.agelocationverification": "moodle",
   "core.ago": "message",
+  "core.ajaxendpointnotfound": "local_moodlemobileapp",
   "core.all": "moodle",
   "core.allgroups": "moodle",
   "core.allparticipants": "moodle",
@@ -1405,6 +1406,7 @@
   "core.captureimage": "local_moodlemobileapp",
   "core.capturevideo": "local_moodlemobileapp",
   "core.category": "moodle",
+  "core.certificaterror": "local_moodlemobileapp",
   "core.choose": "moodle",
   "core.choosedots": "moodle",
   "core.clearsearch": "local_moodlemobileapp",
diff --git a/src/core/classes/errors/ajaxerror.ts b/src/core/classes/errors/ajaxerror.ts
index 7cf6b1363..f7a57cc9d 100644
--- a/src/core/classes/errors/ajaxerror.ts
+++ b/src/core/classes/errors/ajaxerror.ts
@@ -19,12 +19,10 @@ import { CoreError } from '@classes/errors/error';
  */
 export class CoreAjaxError extends CoreError {
 
-    available?: number; // Whether the AJAX call is available. 0 if unknown, 1 if available, -1 if not available.
+    available = 1; // @deprecated since app 4.0. AJAX endpoint should always be available in supported Moodle versions.
 
-    constructor(message: string, available?: number) {
+    constructor(message: string) {
         super(message);
-
-        this.available = typeof available == 'undefined' ? 0 : available;
     }
 
 }
diff --git a/src/core/classes/site.ts b/src/core/classes/site.ts
index c3593943a..4050c88f9 100644
--- a/src/core/classes/site.ts
+++ b/src/core/classes/site.ts
@@ -1333,38 +1333,38 @@ export class CoreSite {
             siteUrl: this.siteUrl,
         };
 
-        let config: CoreSitePublicConfigResponse | undefined;
+        let config: CoreSitePublicConfigResponse;
 
         try {
-            config = await CoreWS.callAjax('tool_mobile_get_public_config', {}, preSets);
+            config = await CoreWS.callAjax<CoreSitePublicConfigResponse>('tool_mobile_get_public_config', {}, preSets);
         } catch (error) {
-            if ((!this.getInfo() || this.isVersionGreaterEqualThan('3.8')) && error && error.errorcode == 'codingerror') {
-                // This error probably means that there is a redirect in the site. Try to use a GET request.
-                preSets.noLogin = true;
-                preSets.useGet = true;
-
-                try {
-                    config = await CoreWS.callAjax('tool_mobile_get_public_config', {}, preSets);
-                } catch (error2) {
-                    if (this.getInfo() && this.isVersionGreaterEqualThan('3.8')) {
-                        // GET is supported, return the second error.
-                        throw error2;
-                    } else {
-                        // GET not supported or we don't know if it's supported. Return first error.
-                        throw error;
-                    }
-                }
+            if (!error || error.errorcode !== 'codingerror' || (this.getInfo() && !this.isVersionGreaterEqualThan('3.8'))) {
+                throw error;
             }
 
-            throw error;
+            // This error probably means that there is a redirect in the site. Try to use a GET request.
+            preSets.noLogin = true;
+            preSets.useGet = true;
+
+            try {
+                config = await CoreWS.callAjax<CoreSitePublicConfigResponse>('tool_mobile_get_public_config', {}, preSets);
+            } catch (error2) {
+                if (this.getInfo() && this.isVersionGreaterEqualThan('3.8')) {
+                    // GET is supported, return the second error.
+                    throw error2;
+                } else {
+                    // GET not supported or we don't know if it's supported. Return first error.
+                    throw error;
+                }
+            }
         }
 
         // Use the wwwroot returned by the server.
-        if (config!.httpswwwroot) {
-            this.siteUrl = CoreUrlUtils.removeUrlParams(config!.httpswwwroot); // Make sure the URL doesn't have params.
+        if (config.httpswwwroot) {
+            this.siteUrl = CoreUrlUtils.removeUrlParams(config.httpswwwroot); // Make sure the URL doesn't have params.
         }
 
-        return config!;
+        return config;
     }
 
     /**
diff --git a/src/core/lang.json b/src/core/lang.json
index 05b6db48f..1da713f7f 100644
--- a/src/core/lang.json
+++ b/src/core/lang.json
@@ -3,6 +3,7 @@
     "add": "Add",
     "agelocationverification": "Age and location verification",
     "ago": "{{$a}} ago",
+    "ajaxendpointnotfound": "<p>AJAX endpoint not found. This can happen if the Moodle site is too old or it blocks access to this endpoint. The Moodle app only supports Moodle systems {{$a}} onwards. Please contact your site administrator.</p>\n<p>{{whoisadmin}}</p>",
     "all": "All",
     "allgroups": "All groups",
     "allparticipants": "All participants",
@@ -23,6 +24,7 @@
     "captureimage": "Take picture",
     "capturevideo": "Record video",
     "category": "Category",
+    "certificaterror": "<p>The certificate of this site cannot be trusted by your device. Please contact your site administrator.</p>\n<p>{{whoisadmin}}</p>",
     "choose": "Choose",
     "choosedots": "Choose...",
     "clearsearch": "Clear search",
diff --git a/src/core/services/sites.ts b/src/core/services/sites.ts
index 38a35cd28..5393fd864 100644
--- a/src/core/services/sites.ts
+++ b/src/core/services/sites.ts
@@ -245,27 +245,24 @@ export class CoreSitesProvider {
                 });
             }
         } catch (error) {
-            // Error, check if not supported.
-            if (error.available === 1) {
-                // Service supported but an error happened. Return error.
-                if (error.errorcode == 'codingerror') {
-                    // This could be caused by a redirect. Check if it's the case.
-                    const redirect = await CoreUtils.checkRedirect(siteUrl);
+            // Service supported but an error happened. Return error.
+            if (error.errorcode == 'codingerror') {
+                // This could be caused by a redirect. Check if it's the case.
+                const redirect = await CoreUtils.checkRedirect(siteUrl);
 
-                    if (redirect) {
-                        error.error = Translate.instant('core.login.sitehasredirect');
-                    } else {
-                        // We can't be sure if there is a redirect or not. Display cannot connect error.
-                        error.error = Translate.instant('core.cannotconnecttrouble');
-                    }
+                if (redirect) {
+                    error.message = Translate.instant('core.login.sitehasredirect');
+                } else {
+                    // We can't be sure if there is a redirect or not. Display cannot connect error.
+                    error.message = Translate.instant('core.cannotconnecttrouble');
                 }
-
-                throw new CoreSiteError({
-                    message: error.error,
-                    errorcode: error.errorcode,
-                    critical: true,
-                });
             }
+
+            throw new CoreSiteError({
+                message: error.message,
+                errorcode: error.errorcode,
+                critical: true,
+            });
         }
 
         siteUrl = temporarySite.getURL();
diff --git a/src/core/services/ws.ts b/src/core/services/ws.ts
index 92067a6e9..549e26915 100644
--- a/src/core/services/ws.ts
+++ b/src/core/services/ws.ts
@@ -37,6 +37,7 @@ import { CoreWSError } from '@classes/errors/wserror';
 import { CoreAjaxError } from '@classes/errors/ajaxerror';
 import { CoreAjaxWSError } from '@classes/errors/ajaxwserror';
 import { CoreNetworkError } from '@classes/errors/network-error';
+import { CoreSite } from '@classes/site';
 
 /**
  * This service allows performing WS calls and download/upload files.
@@ -474,9 +475,23 @@ export class CoreWSProvider {
 
             return data.data;
         }, (data) => {
-            const available = data.status == 404 ? -1 : 0;
+            let message = '';
 
-            throw new CoreAjaxError(Translate.instant('core.serverconnection'), available);
+            switch (data.status) {
+                case -2: // Certificate error.
+                    message = this.getCertificateErrorMessage(data.error);
+                    break;
+                case 404: // AJAX endpoint not found.
+                    message = Translate.instant('core.ajaxendpointnotfound', {
+                        $a: CoreSite.MINIMUM_MOODLE_VERSION,
+                        whoisadmin: Translate.instant('core.whoissiteadmin'),
+                    });
+                    break;
+                default:
+                    message = Translate.instant('core.serverconnection');
+            }
+
+            throw new CoreAjaxError(message);
         });
     }
 
@@ -675,12 +690,32 @@ export class CoreWSProvider {
                 }
 
                 return retryPromise;
+            } else if (error.status === -2) {
+                throw new CoreError(this.getCertificateErrorMessage(error.error));
             }
 
             throw new CoreError(Translate.instant('core.serverconnection'));
         });
     }
 
+    /**
+     * Get error message about certificate error.
+     *
+     * @param error Exact error message.
+     * @return Certificate error message.
+     */
+    protected getCertificateErrorMessage(error?: string): string {
+        const message = Translate.instant('core.certificaterror', {
+            whoisadmin: Translate.instant('core.whoissiteadmin'),
+        });
+
+        if (error) {
+            return `${message}\n<p>${error}</p>`;
+        }
+
+        return message;
+    }
+
     /**
      * Retry all requests in the queue.
      * This function uses recursion in order to add a delay between requests to reduce stress.

From 3109c93b64cfcf607af9b3f1eeebf4fcd8b764a6 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 15 Sep 2021 14:50:59 +0200
Subject: [PATCH 0098/1008] MOBILE-3860 login: Deprecate login/token.php checks

---
 src/core/classes/errors/ajaxerror.ts |   5 +-
 src/core/services/sites.ts           | 130 +++++++++++++++------------
 src/core/services/ws.ts              |   2 +-
 3 files changed, 76 insertions(+), 61 deletions(-)

diff --git a/src/core/classes/errors/ajaxerror.ts b/src/core/classes/errors/ajaxerror.ts
index f7a57cc9d..70f5eeee1 100644
--- a/src/core/classes/errors/ajaxerror.ts
+++ b/src/core/classes/errors/ajaxerror.ts
@@ -20,9 +20,12 @@ import { CoreError } from '@classes/errors/error';
 export class CoreAjaxError extends CoreError {
 
     available = 1; // @deprecated since app 4.0. AJAX endpoint should always be available in supported Moodle versions.
+    status?: number;
 
-    constructor(message: string) {
+    constructor(message: string, available?: number, status?: number) {
         super(message);
+
+        this.status = status;
     }
 
 }
diff --git a/src/core/services/sites.ts b/src/core/services/sites.ts
index 5393fd864..fb59d23cf 100644
--- a/src/core/services/sites.ts
+++ b/src/core/services/sites.ts
@@ -54,6 +54,8 @@ import { CoreSitesFactory } from './sites-factory';
 import { CoreText } from '@singletons/text';
 import { CoreLoginHelper } from '@features/login/services/login-helper';
 import { CoreErrorWithTitle } from '@classes/errors/errorwithtitle';
+import { CoreAjaxError } from '@classes/errors/ajaxerror';
+import { CoreAjaxWSError } from '@classes/errors/ajaxwserror';
 
 export const CORE_SITE_SCHEMAS = new InjectionToken<CoreSiteSchema[]>('CORE_SITE_SCHEMAS');
 
@@ -183,33 +185,30 @@ export class CoreSitesProvider {
         // Now, replace the siteUrl with the protocol.
         siteUrl = siteUrl.replace(/^https?:\/\//i, protocol);
 
-        try {
-            await this.siteExists(siteUrl);
-        } catch (error) {
-            // Do not continue checking if WS are not enabled.
-            if (error.errorcode == 'enablewsdescription') {
-                error.critical = true;
+        // Create a temporary site to fetch site info.
+        let temporarySite = CoreSitesFactory.makeSite(undefined, siteUrl);
+        let config: CoreSitePublicConfigResponse | undefined;
 
-                throw error;
+        try {
+            config = await temporarySite.getPublicConfig();
+        } catch (error) {
+            const treatedError = await this.treatGetPublicConfigError(temporarySite.getURL(), error);
+            if (treatedError.critical) {
+                throw treatedError; // App received a WS error, stop.
             }
 
-            // Site doesn't exist. Try to add or remove 'www'.
-            const treatedUrl = CoreUrlUtils.addOrRemoveWWW(siteUrl);
+            // Try to add or remove 'www'.
+            temporarySite = CoreSitesFactory.makeSite(undefined, CoreUrlUtils.addOrRemoveWWW(siteUrl));
 
             try {
-                await this.siteExists(treatedUrl);
-
-                // Success, use this new URL as site url.
-                siteUrl = treatedUrl;
+                config = await temporarySite.getPublicConfig();
             } catch (secondError) {
-                // Do not continue checking if WS are not enabled.
-                if (secondError.errorcode == 'enablewsdescription') {
-                    secondError.critical = true;
-
-                    throw secondError;
+                const treatedSecondError = await this.treatGetPublicConfigError(temporarySite.getURL(), secondError);
+                if (treatedSecondError.critical) {
+                    throw treatedSecondError; // App received a WS error, stop.
                 }
 
-                // Return the error.
+                // App didn't receive a WS response, probably cannot connect. Prioritize first error if it's valid.
                 if (CoreTextUtils.getErrorMessageFromError(error)) {
                     throw error;
                 } else {
@@ -218,49 +217,25 @@ export class CoreSitesProvider {
             }
         }
 
-        // Site exists. Create a temporary site to fetch its info.
-        const temporarySite = CoreSitesFactory.makeSite(undefined, siteUrl);
-        let config: CoreSitePublicConfigResponse | undefined;
-
-        try {
-            config = await temporarySite.getPublicConfig();
-
-            // Check that the user can authenticate.
-            if (!config.enablewebservices) {
-                throw new CoreSiteError({
-                    message: Translate.instant('core.login.webservicesnotenabled'),
-                });
-            } else if (!config.enablemobilewebservice) {
-                throw new CoreSiteError({
-                    message: Translate.instant('core.login.mobileservicesnotenabled'),
-                });
-            } else if (config.maintenanceenabled) {
-                let message = Translate.instant('core.sitemaintenance');
-                if (config.maintenancemessage) {
-                    message += config.maintenancemessage;
-                }
-
-                throw new CoreSiteError({
-                    message,
-                });
-            }
-        } catch (error) {
-            // Service supported but an error happened. Return error.
-            if (error.errorcode == 'codingerror') {
-                // This could be caused by a redirect. Check if it's the case.
-                const redirect = await CoreUtils.checkRedirect(siteUrl);
-
-                if (redirect) {
-                    error.message = Translate.instant('core.login.sitehasredirect');
-                } else {
-                    // We can't be sure if there is a redirect or not. Display cannot connect error.
-                    error.message = Translate.instant('core.cannotconnecttrouble');
-                }
+        // Check that the user can authenticate.
+        if (!config.enablewebservices) {
+            throw new CoreSiteError({
+                message: Translate.instant('core.login.webservicesnotenabled'),
+                critical: true,
+            });
+        } else if (!config.enablemobilewebservice) {
+            throw new CoreSiteError({
+                message: Translate.instant('core.login.mobileservicesnotenabled'),
+                critical: true,
+            });
+        } else if (config.maintenanceenabled) {
+            let message = Translate.instant('core.sitemaintenance');
+            if (config.maintenancemessage) {
+                message += config.maintenancemessage;
             }
 
             throw new CoreSiteError({
-                message: error.message,
-                errorcode: error.errorcode,
+                message,
                 critical: true,
             });
         }
@@ -270,11 +245,48 @@ export class CoreSitesProvider {
         return { siteUrl, code: config?.typeoflogin || 0, service: CoreConstants.CONFIG.wsservice, config };
     }
 
+    /**
+     * Treat an error returned by getPublicConfig in checkSiteWithProtocol. Converts the error to a CoreSiteError.
+     *
+     * @param siteUrl Site URL.
+     * @param error Error returned.
+     * @return Promise resolved with the treated error.
+     */
+    protected async treatGetPublicConfigError(siteUrl: string, error: CoreAjaxError | CoreAjaxWSError): Promise<CoreSiteError> {
+        if (!('errorcode' in error)) {
+            // The WS didn't return data, probably cannot connect.
+            return new CoreSiteError({
+                message: error.message || '',
+                critical: 'status' in error && error.status === -2, // Certificate error.
+            });
+        }
+
+        // Service supported but an error happened. Return error.
+        if (error.errorcode == 'codingerror') {
+            // This could be caused by a redirect. Check if it's the case.
+            const redirect = await CoreUtils.checkRedirect(siteUrl);
+
+            if (redirect) {
+                error.message = Translate.instant('core.login.sitehasredirect');
+            } else {
+                // We can't be sure if there is a redirect or not. Display cannot connect error.
+                error.message = Translate.instant('core.cannotconnecttrouble');
+            }
+        }
+
+        return new CoreSiteError({
+            message: error.message,
+            errorcode: error.errorcode,
+            critical: true,
+        });
+    }
+
     /**
      * Check if a site exists.
      *
      * @param siteUrl URL of the site to check.
      * @return A promise to be resolved if the site exists.
+     * @deprecated since app 4.0. Now the app calls uses tool_mobile_get_public_config to check if site exists.
      */
     async siteExists(siteUrl: string): Promise<void> {
         let data: CoreSitesLoginTokenResponse;
diff --git a/src/core/services/ws.ts b/src/core/services/ws.ts
index 549e26915..bb2e63719 100644
--- a/src/core/services/ws.ts
+++ b/src/core/services/ws.ts
@@ -491,7 +491,7 @@ export class CoreWSProvider {
                     message = Translate.instant('core.serverconnection');
             }
 
-            throw new CoreAjaxError(message);
+            throw new CoreAjaxError(message, 1, data.status);
         });
     }
 

From 5f4a96603948971028fa8cc77eb1c1ef979a2193 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 15 Sep 2021 11:45:12 +0200
Subject: [PATCH 0099/1008] MOBILE-3676 site: Always check public config on
 credentials and reconect

---
 .../login/pages/credentials/credentials.ts    | 33 ++++----
 .../login/pages/reconnect/reconnect.ts        | 76 +++++++++----------
 src/core/services/sites.ts                    |  8 +-
 3 files changed, 61 insertions(+), 56 deletions(-)

diff --git a/src/core/features/login/pages/credentials/credentials.ts b/src/core/features/login/pages/credentials/credentials.ts
index 7f478d243..c3189ef06 100644
--- a/src/core/features/login/pages/credentials/credentials.ts
+++ b/src/core/features/login/pages/credentials/credentials.ts
@@ -68,32 +68,32 @@ export class CoreLoginCredentialsPage implements OnInit, OnDestroy {
     /**
      * Initialize the component.
      */
-    ngOnInit(): void {
-        const siteUrl = CoreNavigator.getRouteParam<string>('siteUrl');
-        if (!siteUrl) {
-            CoreDomUtils.showErrorModal('Site URL not supplied.');
-            CoreNavigator.back();
+    async ngOnInit(): Promise<void> {
+        try {
+            this.siteUrl = CoreNavigator.getRequiredRouteParam<string>('siteUrl');
 
-            return;
+            this.siteName = CoreNavigator.getRouteParam('siteName');
+            this.logoUrl = !CoreConstants.CONFIG.forceLoginLogo && CoreNavigator.getRouteParam('logoUrl') || undefined;
+            this.siteConfig = CoreNavigator.getRouteParam('siteConfig');
+            this.urlToOpen = CoreNavigator.getRouteParam('urlToOpen');
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            return CoreNavigator.back();
         }
 
-        this.siteUrl = siteUrl;
-        this.siteName = CoreNavigator.getRouteParam('siteName');
-        this.logoUrl = !CoreConstants.CONFIG.forceLoginLogo && CoreNavigator.getRouteParam('logoUrl') || undefined;
-        this.siteConfig = CoreNavigator.getRouteParam('siteConfig');
-        this.urlToOpen = CoreNavigator.getRouteParam('urlToOpen');
-        this.showScanQR = CoreLoginHelper.displayQRInCredentialsScreen();
-
         this.credForm = this.fb.group({
             username: [CoreNavigator.getRouteParam<string>('username') || '', Validators.required],
             password: ['', Validators.required],
         });
 
-        this.treatSiteConfig();
+        if (this.siteConfig) {
+            this.treatSiteConfig();
+        }
         this.isFixedUrlSet = CoreLoginHelper.isFixedUrlSet();
 
-        if (this.isFixedUrlSet) {
-            // Fixed URL, we need to check if it uses browser SSO login.
+        if (this.isFixedUrlSet || !this.siteConfig) {
+            // Fixed URL or not siteConfig retrieved from params, we need to check if it uses browser SSO login.
             this.checkSite(this.siteUrl);
         } else {
             this.siteChecked = true;
@@ -177,6 +177,7 @@ export class CoreLoginCredentialsPage implements OnInit, OnDestroy {
             this.siteName = CoreConstants.CONFIG.sitename ? CoreConstants.CONFIG.sitename : this.siteConfig.sitename;
             this.logoUrl = CoreLoginHelper.getLogoUrl(this.siteConfig);
             this.authInstructions = this.siteConfig.authinstructions || Translate.instant('core.login.loginsteps');
+            this.showScanQR = CoreLoginHelper.displayQRInCredentialsScreen();
 
             const disabledFeatures = CoreLoginHelper.getDisabledFeatures(this.siteConfig);
             this.identityProviders = CoreLoginHelper.getValidIdentityProviders(this.siteConfig, disabledFeatures);
diff --git a/src/core/features/login/pages/reconnect/reconnect.ts b/src/core/features/login/pages/reconnect/reconnect.ts
index f48433217..bb5193d2a 100644
--- a/src/core/features/login/pages/reconnect/reconnect.ts
+++ b/src/core/features/login/pages/reconnect/reconnect.ts
@@ -20,7 +20,7 @@ import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreLoginHelper } from '@features/login/services/login-helper';
-import { CoreSiteIdentityProvider, CoreSitePublicConfigResponse } from '@classes/site';
+import { CoreSite, CoreSiteIdentityProvider, CoreSitePublicConfigResponse } from '@classes/site';
 import { CoreEvents } from '@singletons/events';
 import { CoreError } from '@classes/errors/error';
 import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
@@ -64,7 +64,7 @@ export class CoreLoginReconnectPage implements OnInit, OnDestroy {
     ) {
         const currentSite = CoreSites.getCurrentSite();
 
-        this.isLoggedOut = !!currentSite?.isLoggedOut();
+        this.isLoggedOut = !currentSite || currentSite.isLoggedOut();
         this.credForm = fb.group({
             password: ['', Validators.required],
         });
@@ -74,17 +74,12 @@ export class CoreLoginReconnectPage implements OnInit, OnDestroy {
      * Initialize the component.
      */
     async ngOnInit(): Promise<void> {
-        const siteId = CoreNavigator.getRouteParam<string>('siteId');
-        if (!siteId) {
-            return this.cancel();
-        }
-
-        this.siteId = siteId;
-        this.page = CoreNavigator.getRouteParam('pageName');
-        this.pageOptions = CoreNavigator.getRouteParam('pageOptions');
-        this.showScanQR = CoreLoginHelper.displayQRInSiteScreen() || CoreLoginHelper.displayQRInCredentialsScreen();
-
         try {
+            this.siteId = CoreNavigator.getRequiredRouteParam<string>('siteId');
+
+            this.page = CoreNavigator.getRouteParam('pageName');
+            this.pageOptions = CoreNavigator.getRouteParam('pageOptions');
+
             const site = await CoreSites.getSite(this.siteId);
 
             if (!site.infos) {
@@ -103,26 +98,11 @@ export class CoreLoginReconnectPage implements OnInit, OnDestroy {
             // Show logo instead of avatar if it's a fixed site.
             this.showSiteAvatar = !!this.userAvatar && !CoreLoginHelper.getFixedSites();
 
-            const config = await CoreUtils.ignoreErrors(site.getPublicConfig());
-
-            if (!config) {
-                return;
-            }
-
-            this.siteConfig = config;
-
-            await CoreSites.checkApplication(config);
-
-            // Check logoURL if user avatar is not set.
-            if (this.userAvatar.startsWith(this.siteUrl + '/theme/image.php')) {
-                this.showSiteAvatar = false;
-            }
-            this.logoUrl = CoreLoginHelper.getLogoUrl(config);
-
-            this.getDataFromConfig(this.siteConfig);
+            this.checkSiteConfig(site);
         } catch (error) {
-            // Just leave the view.
-            this.cancel();
+            CoreDomUtils.showErrorModal(error);
+
+            return this.cancel();
         }
     }
 
@@ -136,19 +116,34 @@ export class CoreLoginReconnectPage implements OnInit, OnDestroy {
 
     /**
      * Get some data (like identity providers) from the site config.
-     *
-     * @param config Config to use.
      */
-    protected getDataFromConfig(config: CoreSitePublicConfigResponse): void {
-        const disabledFeatures = CoreLoginHelper.getDisabledFeatures(config);
+    protected async checkSiteConfig(site: CoreSite): Promise<void> {
+        this.siteConfig = await CoreUtils.ignoreErrors(site.getPublicConfig());
 
-        this.identityProviders = CoreLoginHelper.getValidIdentityProviders(config, disabledFeatures);
-        this.showForgottenPassword = !CoreLoginHelper.isForgottenPasswordDisabled(config);
+        if (!this.siteConfig) {
+            return;
+        }
+
+        const disabledFeatures = CoreLoginHelper.getDisabledFeatures(this.siteConfig);
+
+        this.identityProviders = CoreLoginHelper.getValidIdentityProviders(this.siteConfig, disabledFeatures);
+        this.showForgottenPassword = !CoreLoginHelper.isForgottenPasswordDisabled(this.siteConfig);
 
         if (!this.eventThrown && !this.viewLeft) {
             this.eventThrown = true;
-            CoreEvents.trigger(CoreEvents.LOGIN_SITE_CHECKED, { config: config });
+            CoreEvents.trigger(CoreEvents.LOGIN_SITE_CHECKED, { config: this.siteConfig });
         }
+
+        this.showScanQR = CoreLoginHelper.displayQRInSiteScreen() ||
+            CoreLoginHelper.displayQRInCredentialsScreen();
+
+        await CoreSites.checkApplication(this.siteConfig);
+
+        // Check logoURL if user avatar is not set.
+        if (this.userAvatar?.startsWith(this.siteUrl + '/theme/image.php')) {
+            this.showSiteAvatar = false;
+        }
+        this.logoUrl = CoreLoginHelper.getLogoUrl(this.siteConfig);
     }
 
     /**
@@ -162,6 +157,11 @@ export class CoreLoginReconnectPage implements OnInit, OnDestroy {
             e.stopPropagation();
         }
 
+        if (this.isLoggedOut) {
+            // Go to sites page when user is logged out.
+            CoreNavigator.navigate('/login/sites', { reset: true });
+        }
+
         CoreSites.logout();
     }
 
diff --git a/src/core/services/sites.ts b/src/core/services/sites.ts
index 38a35cd28..26e8901b5 100644
--- a/src/core/services/sites.ts
+++ b/src/core/services/sites.ts
@@ -948,9 +948,13 @@ export class CoreSitesProvider {
         } else {
             // Retrieve and create the site.
             const db = await this.appDB;
-            const data = await db.getRecord<SiteDBEntry>(SITES_TABLE_NAME, { id: siteId });
+            try {
+                const data = await db.getRecord<SiteDBEntry>(SITES_TABLE_NAME, { id: siteId });
 
-            return this.makeSiteFromSiteListEntry(data);
+                return this.makeSiteFromSiteListEntry(data);
+            } catch {
+                throw new CoreError('SiteId not found');
+            }
         }
     }
 

From c3210f044d790997845e4da47237c913bfba65ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 15 Sep 2021 11:45:48 +0200
Subject: [PATCH 0100/1008] MOBILE-3676 site: Check qrcode type from site
 config

---
 src/core/classes/site.ts                          | 10 ++++++++++
 .../login/pages/credentials/credentials.ts        |  2 +-
 .../features/login/pages/reconnect/reconnect.ts   |  2 +-
 src/core/features/login/services/login-helper.ts  | 15 +++++++++++----
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/core/classes/site.ts b/src/core/classes/site.ts
index c3593943a..5105c2b2e 100644
--- a/src/core/classes/site.ts
+++ b/src/core/classes/site.ts
@@ -41,6 +41,15 @@ import { CoreLogger } from '@singletons/logger';
 import { Translate } from '@singletons';
 import { CoreIonLoadingElement } from './ion-loading';
 
+/**
+ * QR Code type enumeration.
+ */
+export enum CoreSiteQRCodeType {
+    QR_CODE_DISABLED = 0, // QR code disabled value
+    QR_CODE_URL = 1, // QR code type URL value
+    QR_CODE_LOGIN = 2, // QR code type login value
+}
+
 /**
  * Class that represents a site (combination of site + user).
  * It will have all the site data and provide utility functions regarding a site.
@@ -2122,6 +2131,7 @@ export type CoreSitePublicConfigResponse = {
     tool_mobile_androidappid?: string; // Android app's unique identifier.
     // eslint-disable-next-line @typescript-eslint/naming-convention
     tool_mobile_setuplink?: string; // App download page.
+    tool_mobile_qrcodetype?: CoreSiteQRCodeType; // eslint-disable-line @typescript-eslint/naming-convention
     warnings?: CoreWSExternalWarning[];
 };
 
diff --git a/src/core/features/login/pages/credentials/credentials.ts b/src/core/features/login/pages/credentials/credentials.ts
index c3189ef06..ad4e804ce 100644
--- a/src/core/features/login/pages/credentials/credentials.ts
+++ b/src/core/features/login/pages/credentials/credentials.ts
@@ -177,7 +177,7 @@ export class CoreLoginCredentialsPage implements OnInit, OnDestroy {
             this.siteName = CoreConstants.CONFIG.sitename ? CoreConstants.CONFIG.sitename : this.siteConfig.sitename;
             this.logoUrl = CoreLoginHelper.getLogoUrl(this.siteConfig);
             this.authInstructions = this.siteConfig.authinstructions || Translate.instant('core.login.loginsteps');
-            this.showScanQR = CoreLoginHelper.displayQRInCredentialsScreen();
+            this.showScanQR = CoreLoginHelper.displayQRInCredentialsScreen(this.siteConfig.tool_mobile_qrcodetype);
 
             const disabledFeatures = CoreLoginHelper.getDisabledFeatures(this.siteConfig);
             this.identityProviders = CoreLoginHelper.getValidIdentityProviders(this.siteConfig, disabledFeatures);
diff --git a/src/core/features/login/pages/reconnect/reconnect.ts b/src/core/features/login/pages/reconnect/reconnect.ts
index bb5193d2a..b34720cdd 100644
--- a/src/core/features/login/pages/reconnect/reconnect.ts
+++ b/src/core/features/login/pages/reconnect/reconnect.ts
@@ -135,7 +135,7 @@ export class CoreLoginReconnectPage implements OnInit, OnDestroy {
         }
 
         this.showScanQR = CoreLoginHelper.displayQRInSiteScreen() ||
-            CoreLoginHelper.displayQRInCredentialsScreen();
+            CoreLoginHelper.displayQRInCredentialsScreen(this.siteConfig.tool_mobile_qrcodetype);
 
         await CoreSites.checkApplication(this.siteConfig);
 
diff --git a/src/core/features/login/services/login-helper.ts b/src/core/features/login/services/login-helper.ts
index 75c316eb2..8f9780fc3 100644
--- a/src/core/features/login/services/login-helper.ts
+++ b/src/core/features/login/services/login-helper.ts
@@ -26,7 +26,7 @@ import { CoreTextUtils } from '@services/utils/text';
 import { CoreUrlParams, CoreUrlUtils } from '@services/utils/url';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreConstants } from '@/core/constants';
-import { CoreSite, CoreSiteIdentityProvider, CoreSitePublicConfigResponse } from '@classes/site';
+import { CoreSite, CoreSiteIdentityProvider, CoreSitePublicConfigResponse, CoreSiteQRCodeType } from '@classes/site';
 import { CoreError } from '@classes/errors/error';
 import { CoreWSError } from '@classes/errors/wserror';
 import { makeSingleton, Translate } from '@singletons';
@@ -1237,15 +1237,22 @@ export class CoreLoginHelperProvider {
     /**
      * Check whether the QR reader should be displayed in credentials screen.
      *
+     * @param qrCodeType QR Code type from public config, assuming enabled if undefined.
      * @return Whether the QR reader should be displayed in credentials screen.
      */
-    displayQRInCredentialsScreen(): boolean {
+    displayQRInCredentialsScreen(qrCodeType = CoreSiteQRCodeType.QR_CODE_LOGIN): boolean {
         if (!CoreUtils.canScanQR()) {
             return false;
         }
 
-        return (CoreConstants.CONFIG.displayqroncredentialscreen === undefined && this.isFixedUrlSet()) ||
-            (CoreConstants.CONFIG.displayqroncredentialscreen !== undefined && !!CoreConstants.CONFIG.displayqroncredentialscreen);
+        if ((CoreConstants.CONFIG.displayqroncredentialscreen === undefined && this.isFixedUrlSet()) ||
+            (CoreConstants.CONFIG.displayqroncredentialscreen !== undefined &&
+                !!CoreConstants.CONFIG.displayqroncredentialscreen)) {
+
+            return qrCodeType == CoreSiteQRCodeType.QR_CODE_LOGIN;
+        }
+
+        return false;
     }
 
     /**

From 0da02f938c4f729f9db2f2ab458a51a63107b4ed Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 15 Sep 2021 16:47:19 +0200
Subject: [PATCH 0101/1008] MOBILE-3431 docs: Update documentation links

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index e0dae9019..ae0e4be9f 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,13 @@
-Moodle Mobile
+Moodle App
 =================
 
-This is the primary repository of source code for the official Moodle Mobile app.
+This is the primary repository of source code for the official mobile app for Moodle.
 
-* [User documentation](http://docs.moodle.org/en/Moodle_Mobile)
-* [Developer documentation](http://docs.moodle.org/dev/Moodle_Mobile)
-* [Development environment setup](http://docs.moodle.org/dev/Setting_up_your_development_environment_for_Moodle_Mobile_2)
+* [User documentation](https://docs.moodle.org/en/Moodle_app)
+* [Developer documentation](http://docs.moodle.org/dev/Moodle_App)
+* [Development environment setup](https://docs.moodle.org/dev/Setting_up_your_development_environment_for_the_Moodle_App)
 * [Bug Tracker](https://tracker.moodle.org/browse/MOBILE)
-* [Release Notes](http://docs.moodle.org/dev/Moodle_Mobile_Release_Notes)
+* [Release Notes](https://docs.moodle.org/dev/Moodle_App_Release_Notes)
 
 License
 -------

From f0c6dd5443ff33df466801100b84bc68cde0499a Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 16 Sep 2021 09:36:48 +0200
Subject: [PATCH 0102/1008] MOBILE-3863 index: Make CSP less strict

The CSP is only used in the webapp
---
 src/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/index.html b/src/index.html
index 706be76f1..44e690189 100644
--- a/src/index.html
+++ b/src/index.html
@@ -9,7 +9,7 @@
 
     <meta name="color-scheme" content="light dark" />
     <meta name="viewport" content="viewport-fit=cover, width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-    <meta http-equiv="Content-Security-Policy" content="default-src * filesystem: cdvfile: file: data: gap: https://ssl.gstatic.com moodleappfs: http://localhost; img-src * filesystem: gap: data: cdvfile: file: https://ssl.gstatic.com android-webview-video-poster: blob: moodleappfs: http://localhost; style-src 'self' 'unsafe-inline' filesystem: cdvfile: file: moodleappfs: http://localhost; script-src 'self' 'unsafe-inline' 'unsafe-eval' http://localhost:* filesystem: cdvfile: file: moodleappfs:; media-src * filesystem: cdvfile: file: gap: blob: moodleappfs: http://localhost">
+    <meta http-equiv="Content-Security-Policy" content="default-src * filesystem: cdvfile: file: data: gap: moodleappfs: blob: 'unsafe-inline' 'unsafe-eval' 'self' android-webview-video-poster: about:">
     <meta name="format-detection" content="telephone=no" />
     <meta name="msapplication-tap-highlight" content="no" />
 

From 7d06bb5285b6071aaa464d0019bc782be5199f52 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 16 Sep 2021 16:39:48 +0200
Subject: [PATCH 0103/1008] MOBILE-2282 login: Call getPublicConfig in
 background when loading site

---
 src/core/services/navigator.ts |  6 ++--
 src/core/services/sites.ts     | 53 +++++++++++++++++++---------------
 2 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/src/core/services/navigator.ts b/src/core/services/navigator.ts
index 2e3ad5a0c..6e5e471de 100644
--- a/src/core/services/navigator.ts
+++ b/src/core/services/navigator.ts
@@ -532,10 +532,8 @@ export class CoreNavigatorService {
 
         const pathRoot = /^[^/]+/.exec(path)?.[0] ?? '';
         const currentMainMenuTab = this.getCurrentMainMenuTab();
-        const isMainMenuTab = await CoreUtils.ignoreErrors(
-            CoreMainMenu.isMainMenuTab(pathRoot),
-            false,
-        );
+        const isMainMenuTab = pathRoot === currentMainMenuTab || (!currentMainMenuTab && path === DEFAULT_MAIN_MENU_TAB) ||
+            await CoreUtils.ignoreErrors(CoreMainMenu.isMainMenuTab(pathRoot), false);
 
         if (!options.preferCurrentTab && isMainMenuTab) {
             return this.navigate(`/main/${path}`, options);
diff --git a/src/core/services/sites.ts b/src/core/services/sites.ts
index 26e8901b5..fe282d19c 100644
--- a/src/core/services/sites.ts
+++ b/src/core/services/sites.ts
@@ -713,10 +713,11 @@ export class CoreSitesProvider {
 
             const siteId = this.getCurrentSiteId();
             const downloadUrl = CoreApp.getAppStoreUrl(storesConfig);
+            let promise: Promise<unknown>;
 
             if (downloadUrl != null) {
                 // Do not block interface.
-                CoreDomUtils.showConfirm(
+                promise = CoreDomUtils.showConfirm(
                     Translate.instant('core.updaterequireddesc', { $a: config.tool_mobile_minimumversion }),
                     Translate.instant('core.updaterequired'),
                     Translate.instant('core.download'),
@@ -725,19 +726,20 @@ export class CoreSitesProvider {
                     // Do nothing.
                 });
             } else {
-                CoreDomUtils.showAlert(
+                // Do not block interface.
+                promise = CoreDomUtils.showAlert(
                     Translate.instant('core.updaterequired'),
                     Translate.instant('core.updaterequireddesc', { $a: config.tool_mobile_minimumversion }),
-                );
+                ).then((alert) => alert.onWillDismiss());
             }
 
-            if (siteId) {
-                // Logout the currentSite.
-                await this.logout();
-
-                // Always expire the token.
-                await this.setSiteLoggedOut(siteId, true);
-            }
+            promise.finally(() => {
+                if (siteId) {
+                    // Logout the currentSite and expire the token.
+                    this.logout();
+                    this.setSiteLoggedOut(siteId, true);
+                }
+            });
 
             throw new CoreError('Current app version is lower than required version.');
         }
@@ -794,24 +796,27 @@ export class CoreSitesProvider {
             return false;
         }
 
-        let config: CoreSitePublicConfigResponse | undefined;
+        this.login(siteId);
+        // Get some data in background, don't block the UI.
+        this.getPublicConfigAndCheckApplication(site);
+        this.updateSiteInfo(siteId);
 
-        try {
-            config = await site.getPublicConfig();
-        } catch (error) {
-            // Error getting config, maybe the user is offline.
-        }
+        return true;
+    }
 
+    /**
+     * Get site public config and check if app can access the site.
+     *
+     * @param site Site.
+     * @return Promise resolved when done.
+     */
+    protected async getPublicConfigAndCheckApplication(site: CoreSite): Promise<void> {
         try {
+            const config = await site.getPublicConfig();
+
             await this.checkApplication(config);
-
-            this.login(siteId);
-            // Update site info. We don't block the UI.
-            this.updateSiteInfo(siteId);
-
-            return true;
-        } catch (error) {
-            return false;
+        } catch {
+            // Ignore errors, maybe the user is offline.
         }
     }
 

From 03b139d199969ae00c54cca09bdbc7d0bb92a381 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 20 Jul 2021 10:43:22 +0200
Subject: [PATCH 0104/1008] MOBILE-3060 config: Activate AndroidX

---
 config.xml        |  1 +
 package-lock.json | 19 +++++++++++++++++++
 package.json      |  4 +++-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/config.xml b/config.xml
index ad367a677..528d663ee 100644
--- a/config.xml
+++ b/config.xml
@@ -48,6 +48,7 @@
     <preference name="iosScheme" value="moodleappfs" />
     <preference name="WKWebViewOnly" value="true" />
     <preference name="WKFullScreenEnabled" value="true" />
+    <preference name="AndroidXEnabled" value="true" />
     <feature name="StatusBar">
         <param name="ios-package" onload="true" value="CDVStatusBar" />
     </feature>
diff --git a/package-lock.json b/package-lock.json
index 16767d151..3b4d207ec 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -39285,6 +39285,16 @@
       "resolved": "https://registry.npmjs.org/cordova-plugin-advanced-http/-/cordova-plugin-advanced-http-3.1.0.tgz",
       "integrity": "sha512-zlTlNJyTttE7TV5vW2WGvHqpbKMDVrr1meZU0fy4y3ObrI/hGk2UDcDNwpZdMfaytNZwDKU4sRgsTgQYdFNBew=="
     },
+    "cordova-plugin-androidx-adapter": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-androidx-adapter/-/cordova-plugin-androidx-adapter-1.1.3.tgz",
+      "integrity": "sha512-W1SImn0cCCvOSTSfWWp5TnanIQrSuh2Bch+dcZXIzEn0km3Qb7VryeAqHhgBQYwwzC5Ollk1DtUAk/AJSojuZA==",
+      "dev": true,
+      "requires": {
+        "q": "^1.5.1",
+        "recursive-readdir": "^2.2.2"
+      }
+    },
     "cordova-plugin-badge": {
       "version": "0.8.8",
       "resolved": "https://registry.npmjs.org/cordova-plugin-badge/-/cordova-plugin-badge-0.8.8.tgz",
@@ -50142,6 +50152,15 @@
         "resolve": "^1.1.6"
       }
     },
+    "recursive-readdir": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz",
+      "integrity": "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==",
+      "dev": true,
+      "requires": {
+        "minimatch": "3.0.4"
+      }
+    },
     "reflect-metadata": {
       "version": "0.1.13",
       "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
diff --git a/package.json b/package.json
index 1357fd77a..17fb490cd 100644
--- a/package.json
+++ b/package.json
@@ -148,6 +148,7 @@
     "@typescript-eslint/eslint-plugin": "^4.22.0",
     "@typescript-eslint/parser": "^4.22.0",
     "check-es-compat": "^1.1.1",
+    "cordova-plugin-androidx-adapter": "^1.1.3",
     "eslint": "^7.25.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-header": "^3.1.1",
@@ -236,7 +237,8 @@
       },
       "cordova-plugin-globalization": {},
       "@moodlehq/cordova-plugin-file-transfer": {},
-      "cordova-plugin-prevent-override": {}
+      "cordova-plugin-prevent-override": {},
+      "cordova-plugin-androidx-adapter": {}
     }
   },
   "optionalDependencies": {

From 12148dbf7def63be6deb63f16626ad79fec3dae6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 21 Sep 2021 15:42:12 +0200
Subject: [PATCH 0105/1008] MOBILE-3833 theme: Improve bootstrap alert colors

---
 src/theme/components/format-text.scss | 2 +-
 src/theme/globals.mixins.ionic.scss   | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/theme/components/format-text.scss b/src/theme/components/format-text.scss
index f75be1691..ddb921751 100644
--- a/src/theme/components/format-text.scss
+++ b/src/theme/components/format-text.scss
@@ -548,7 +548,7 @@ core-rich-text-editor .core-rte-editor {
             --color-base: var(--ion-color-#{$color-name});
             color: var(--color-base);
             border-color: var(--color-base);
-            background-color: var(--ion-color-#{$color-name}-tint);
+            background-color: var(--ion-color-#{$color-name}-lighter);
 
             .alert-link {
                 color: var(--ion-color-#{$color-name}-shade);
diff --git a/src/theme/globals.mixins.ionic.scss b/src/theme/globals.mixins.ionic.scss
index 351f1080f..2406a70f3 100644
--- a/src/theme/globals.mixins.ionic.scss
+++ b/src/theme/globals.mixins.ionic.scss
@@ -54,8 +54,8 @@
 
 // Mixes a color with white to create its tint.
 // --------------------------------------------------------------------------------------------
-@function get-color-tint($color) {
-  @return mix(#fff, $color, 10%);
+@function get-color-tint($color, $percent: 10%) {
+  @return mix(#fff, $color, $percent);
 }
 
 // Converts a color to a comma separated rgb.
@@ -65,7 +65,7 @@
 }
 
 
- // Ionic Colors
+// Ionic Colors
 // --------------------------------------------------
 // Generates the color classes and variables based on the
 // colors map
@@ -76,6 +76,7 @@
     $contrast: get_contrast_color($base);
     $shade: get-color-shade($base);
     $tint: get-color-tint($base);
+    $lighter: get-color-tint($base, 90%);
 
     --ion-color-#{$color-name}: var(--#{$color-name}, #{$base});
     --ion-color-#{$color-name}-base: var(--ion-color-#{$color-name});
@@ -84,6 +85,7 @@
     --ion-color-#{$color-name}-contrast-rgb: #{color-to-rgb-list($contrast)};
     --ion-color-#{$color-name}-shade: #{$shade};
     --ion-color-#{$color-name}-tint: #{$tint};
+    --ion-color-#{$color-name}-lighter: #{$lighter};
 
     .ion-color-#{$color-name} {
         --ion-color: var(--ion-color-#{$color-name});
@@ -93,6 +95,7 @@
         --ion-color-contrast-rgb: var(--ion-color-#{$color-name}-contrast-rgb);
         --ion-color-shade: var(--ion-color-#{$color-name}-shade);
         --ion-color-tint: var(--ion-color-#{$color-name}-tint);
+        --ion-color-lighter: var(--ion-color-#{$color-name}-lighter);
     }
 }
 

From edbfa1139c655682e845213f71ed91f51a1b968f Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 21 Jul 2021 08:28:19 +0200
Subject: [PATCH 0106/1008] MOBILE-3060 config: Update push plugin version

---
 package-lock.json | 114 +++++++++++++++-------------------------------
 package.json      |   8 ++--
 2 files changed, 41 insertions(+), 81 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3b4d207ec..29eef5220 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -48,7 +48,7 @@
         "@moodlehq/cordova-plugin-ionic-webview": "5.0.0-moodle.1",
         "@moodlehq/cordova-plugin-local-notification": "0.9.0-moodle.2",
         "@moodlehq/cordova-plugin-qrscanner": "3.0.1-moodle.2",
-        "@moodlehq/phonegap-plugin-push": "2.2.3-moodle.1",
+        "@moodlehq/phonegap-plugin-push": "2.0.0-moodle.2",
         "@ngx-translate/core": "^13.0.0",
         "@ngx-translate/http-loader": "^6.0.0",
         "@types/chart.js": "^2.9.31",
@@ -93,7 +93,6 @@
         "mathjax": "2.7.7",
         "moment": "^2.29.0",
         "nl.kingsquare.cordova.background-audio": "^1.0.1",
-        "phonegap-plugin-multidex": "^1.0.0",
         "rxjs": "~6.5.5",
         "ts-md5": "^1.2.7",
         "tslib": "^2.0.1",
@@ -119,6 +118,7 @@
         "@typescript-eslint/eslint-plugin": "^4.22.0",
         "@typescript-eslint/parser": "^4.22.0",
         "check-es-compat": "^1.1.1",
+        "cordova-plugin-androidx-adapter": "^1.1.3",
         "eslint": "^7.25.0",
         "eslint-config-prettier": "^8.3.0",
         "eslint-plugin-header": "^3.1.1",
@@ -5025,44 +5025,20 @@
       }
     },
     "node_modules/@moodlehq/phonegap-plugin-push": {
-      "version": "2.2.3-moodle.1",
-      "resolved": "https://registry.npmjs.org/@moodlehq/phonegap-plugin-push/-/phonegap-plugin-push-2.2.3-moodle.1.tgz",
-      "integrity": "sha512-LxHz0nPIvxhRgjvj8QRTdhuMtb+NNbFsaAh7JS6q9Ag0lt3LkKrGwCoMr/rTfhfCLj+mrIhyLUv/mo8oPmHeeg==",
-      "dependencies": {
-        "babel-plugin-add-header-comment": "^1.0.3",
-        "install": "^0.8.2"
-      },
+      "version": "2.0.0-moodle.2",
+      "resolved": "https://registry.npmjs.org/@moodlehq/phonegap-plugin-push/-/phonegap-plugin-push-2.0.0-moodle.2.tgz",
+      "integrity": "sha512-a1ZR36vOy0Gu0yaX2T+PODlNSQcIUuHMNzPZ/kn4I+cV+hyPwAw1LmdGQDdxfABAGKWCvtzwUyYs1T/NCz2fRQ==",
       "engines": {
         "cordovaDependencies": {
-          "<2.0.0": {
-            "cordova": ">=6.4.0",
-            "cordova-android": ">=6.0.0",
-            "cordova-ios": ">=4.3.0"
-          },
-          "<2.1.2": {
-            "cordova": ">=7.1.0",
-            "cordova-android": ">=6.3.0",
-            "cordova-ios": ">=4.4.0"
-          },
-          "<2.2.0": {
-            "cordova": ">=7.1.0",
-            "cordova-android": ">=6.3.0",
-            "cordova-ios": ">=4.5.0"
-          },
-          "1.8.2": {
-            "cordova": ">=3.6.3",
-            "cordova-android": ">=4.0.0",
-            "cordova-ios": ">=4.1.0"
+          "1.0.0": {
+            "cordova": ">=10.0.0",
+            "cordova-android": ">=8.0.0",
+            "cordova-ios": ">=5.1.1"
           },
           "2.0.0": {
-            "cordova": ">=7.0.0",
-            "cordova-android": ">=6.2.1",
-            "cordova-ios": ">=4.4.0"
-          },
-          "2.2.0": {
-            "cordova": ">=7.1.0",
-            "cordova-android": ">=7.1.0",
-            "cordova-ios": ">=4.5.0"
+            "cordova": ">=10.0.0",
+            "cordova-android": ">=8.0.0",
+            "cordova-ios": ">=6.0.0"
           }
         }
       }
@@ -7579,11 +7555,6 @@
         "semver": "bin/semver"
       }
     },
-    "node_modules/babel-plugin-add-header-comment": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-add-header-comment/-/babel-plugin-add-header-comment-1.0.3.tgz",
-      "integrity": "sha1-URxJAQYmQNWkgLSsPt1pRBlYUOw="
-    },
     "node_modules/babel-plugin-dynamic-import-node": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
@@ -10787,6 +10758,16 @@
         }
       ]
     },
+    "node_modules/cordova-plugin-androidx-adapter": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-androidx-adapter/-/cordova-plugin-androidx-adapter-1.1.3.tgz",
+      "integrity": "sha512-W1SImn0cCCvOSTSfWWp5TnanIQrSuh2Bch+dcZXIzEn0km3Qb7VryeAqHhgBQYwwzC5Ollk1DtUAk/AJSojuZA==",
+      "dev": true,
+      "dependencies": {
+        "q": "^1.5.1",
+        "recursive-readdir": "^2.2.2"
+      }
+    },
     "node_modules/cordova-plugin-badge": {
       "version": "0.8.8",
       "resolved": "https://registry.npmjs.org/cordova-plugin-badge/-/cordova-plugin-badge-0.8.8.tgz",
@@ -16809,14 +16790,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/install": {
-      "version": "0.8.9",
-      "resolved": "https://registry.npmjs.org/install/-/install-0.8.9.tgz",
-      "integrity": "sha1-n0tcDRhR74cunfheT3Fi1OXc2+0=",
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
     "node_modules/internal-ip": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz",
@@ -22591,12 +22564,6 @@
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
       "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
-    "node_modules/phonegap-plugin-multidex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/phonegap-plugin-multidex/-/phonegap-plugin-multidex-1.0.0.tgz",
-      "integrity": "sha512-1wvc3iQOQpEBaQbXgLxA2JUiLSQ2azdF/bF29ghXDiQJWSpQ1BF8gSuqttM8WZoj081Ps8OKL0gYxdDBkFNPqA==",
-      "deprecated": "This package is deprecated, see https://blog.phonegap.com/update-for-customers-using-phonegap-and-phonegap-build-cc701c77502c"
-    },
     "node_modules/picomatch": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
@@ -24440,6 +24407,18 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/recursive-readdir": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz",
+      "integrity": "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==",
+      "dev": true,
+      "dependencies": {
+        "minimatch": "3.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/reflect-metadata": {
       "version": "0.1.13",
       "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
@@ -34740,13 +34719,9 @@
       }
     },
     "@moodlehq/phonegap-plugin-push": {
-      "version": "2.2.3-moodle.1",
-      "resolved": "https://registry.npmjs.org/@moodlehq/phonegap-plugin-push/-/phonegap-plugin-push-2.2.3-moodle.1.tgz",
-      "integrity": "sha512-LxHz0nPIvxhRgjvj8QRTdhuMtb+NNbFsaAh7JS6q9Ag0lt3LkKrGwCoMr/rTfhfCLj+mrIhyLUv/mo8oPmHeeg==",
-      "requires": {
-        "babel-plugin-add-header-comment": "^1.0.3",
-        "install": "^0.8.2"
-      }
+      "version": "2.0.0-moodle.2",
+      "resolved": "https://registry.npmjs.org/@moodlehq/phonegap-plugin-push/-/phonegap-plugin-push-2.0.0-moodle.2.tgz",
+      "integrity": "sha512-a1ZR36vOy0Gu0yaX2T+PODlNSQcIUuHMNzPZ/kn4I+cV+hyPwAw1LmdGQDdxfABAGKWCvtzwUyYs1T/NCz2fRQ=="
     },
     "@netflix/nerror": {
       "version": "1.1.3",
@@ -36699,11 +36674,6 @@
         }
       }
     },
-    "babel-plugin-add-header-comment": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-add-header-comment/-/babel-plugin-add-header-comment-1.0.3.tgz",
-      "integrity": "sha1-URxJAQYmQNWkgLSsPt1pRBlYUOw="
-    },
     "babel-plugin-dynamic-import-node": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
@@ -44033,11 +44003,6 @@
         }
       }
     },
-    "install": {
-      "version": "0.8.9",
-      "resolved": "https://registry.npmjs.org/install/-/install-0.8.9.tgz",
-      "integrity": "sha1-n0tcDRhR74cunfheT3Fi1OXc2+0="
-    },
     "internal-ip": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz",
@@ -48613,11 +48578,6 @@
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
       "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
-    "phonegap-plugin-multidex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/phonegap-plugin-multidex/-/phonegap-plugin-multidex-1.0.0.tgz",
-      "integrity": "sha512-1wvc3iQOQpEBaQbXgLxA2JUiLSQ2azdF/bF29ghXDiQJWSpQ1BF8gSuqttM8WZoj081Ps8OKL0gYxdDBkFNPqA=="
-    },
     "picomatch": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
diff --git a/package.json b/package.json
index 17fb490cd..ee81a3bc7 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,7 @@
     "@moodlehq/cordova-plugin-ionic-webview": "5.0.0-moodle.1",
     "@moodlehq/cordova-plugin-local-notification": "0.9.0-moodle.2",
     "@moodlehq/cordova-plugin-qrscanner": "3.0.1-moodle.2",
-    "@moodlehq/phonegap-plugin-push": "2.2.3-moodle.1",
+    "@moodlehq/phonegap-plugin-push": "2.0.0-moodle.2",
     "@ngx-translate/core": "^13.0.0",
     "@ngx-translate/http-loader": "^6.0.0",
     "@types/chart.js": "^2.9.31",
@@ -122,7 +122,6 @@
     "mathjax": "2.7.7",
     "moment": "^2.29.0",
     "nl.kingsquare.cordova.background-audio": "^1.0.1",
-    "phonegap-plugin-multidex": "^1.0.0",
     "rxjs": "~6.5.5",
     "ts-md5": "^1.2.7",
     "tslib": "^2.0.1",
@@ -224,8 +223,9 @@
       "cordova-plugin-zip": {},
       "cordova-sqlite-storage": {},
       "@moodlehq/phonegap-plugin-push": {
-        "ANDROID_SUPPORT_V13_VERSION": "27.+",
-        "FCM_VERSION": "17.0.+"
+        "ANDROID_SUPPORT_V13_VERSION": "28.0.0",
+        "FCM_VERSION": "18.+",
+        "IOS_FIREBASE_MESSAGING_VERSION": "~> 6.32.2"
       },
       "com-darryncampbell-cordova-plugin-intent": {},
       "nl.kingsquare.cordova.background-audio": {},

From 7ea44364e15ecb0280fb9e512791990b5815779a Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 21 Jul 2021 11:29:46 +0200
Subject: [PATCH 0107/1008] MOBILE-3060 local: Support sender image in local
 notifications

---
 package-lock.json                                  | 14 +++++++-------
 package.json                                       |  2 +-
 .../services/pushnotifications.ts                  |  5 ++++-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 29eef5220..68b99fc85 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -46,7 +46,7 @@
         "@moodlehq/cordova-plugin-file-transfer": "1.7.1-moodle.2",
         "@moodlehq/cordova-plugin-inappbrowser": "5.0.0-moodle.2",
         "@moodlehq/cordova-plugin-ionic-webview": "5.0.0-moodle.1",
-        "@moodlehq/cordova-plugin-local-notification": "0.9.0-moodle.2",
+        "@moodlehq/cordova-plugin-local-notification": "0.9.0-moodle.3",
         "@moodlehq/cordova-plugin-qrscanner": "3.0.1-moodle.2",
         "@moodlehq/phonegap-plugin-push": "2.0.0-moodle.2",
         "@ngx-translate/core": "^13.0.0",
@@ -4989,9 +4989,9 @@
       }
     },
     "node_modules/@moodlehq/cordova-plugin-local-notification": {
-      "version": "0.9.0-moodle.2",
-      "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-local-notification/-/cordova-plugin-local-notification-0.9.0-moodle.2.tgz",
-      "integrity": "sha512-enK/jcbXrnSFJt8TS2drb/5uUOpsTYbUqjI3pYgvogKdP5k5JOnT0xtW54Arlpl5RphcINx733OuXHRJAED2Ow==",
+      "version": "0.9.0-moodle.3",
+      "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-local-notification/-/cordova-plugin-local-notification-0.9.0-moodle.3.tgz",
+      "integrity": "sha512-dSEvshH9fE3aUG4bO05gCMqWVCnvZGUeddIfB8OShN60sj0CUWuI1e7Mn5syzTcRRNRi8XQ4MTv85zk4c8mzww==",
       "engines": [
         {
           "name": "cordova",
@@ -34705,9 +34705,9 @@
       "integrity": "sha512-+6UrPKsEgXl3pcuTyI1hZIUw9y22Li/nvn7nxiphgZdldlhBvkMK/7nn4IAaXYlnrmIOpCkIrU4BbrAjSJGWSQ=="
     },
     "@moodlehq/cordova-plugin-local-notification": {
-      "version": "0.9.0-moodle.2",
-      "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-local-notification/-/cordova-plugin-local-notification-0.9.0-moodle.2.tgz",
-      "integrity": "sha512-enK/jcbXrnSFJt8TS2drb/5uUOpsTYbUqjI3pYgvogKdP5k5JOnT0xtW54Arlpl5RphcINx733OuXHRJAED2Ow=="
+      "version": "0.9.0-moodle.3",
+      "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-local-notification/-/cordova-plugin-local-notification-0.9.0-moodle.3.tgz",
+      "integrity": "sha512-dSEvshH9fE3aUG4bO05gCMqWVCnvZGUeddIfB8OShN60sj0CUWuI1e7Mn5syzTcRRNRi8XQ4MTv85zk4c8mzww=="
     },
     "@moodlehq/cordova-plugin-qrscanner": {
       "version": "3.0.1-moodle.2",
diff --git a/package.json b/package.json
index ee81a3bc7..061f50558 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
     "@moodlehq/cordova-plugin-file-transfer": "1.7.1-moodle.2",
     "@moodlehq/cordova-plugin-inappbrowser": "5.0.0-moodle.2",
     "@moodlehq/cordova-plugin-ionic-webview": "5.0.0-moodle.1",
-    "@moodlehq/cordova-plugin-local-notification": "0.9.0-moodle.2",
+    "@moodlehq/cordova-plugin-local-notification": "0.9.0-moodle.3",
     "@moodlehq/cordova-plugin-qrscanner": "3.0.1-moodle.2",
     "@moodlehq/phonegap-plugin-push": "2.0.0-moodle.2",
     "@ngx-translate/core": "^13.0.0",
diff --git a/src/core/features/pushnotifications/services/pushnotifications.ts b/src/core/features/pushnotifications/services/pushnotifications.ts
index beef5bbbb..6b02caf7e 100644
--- a/src/core/features/pushnotifications/services/pushnotifications.ts
+++ b/src/core/features/pushnotifications/services/pushnotifications.ts
@@ -454,7 +454,8 @@ export class CorePushNotificationsProvider {
             (<any> localNotif).text = [
                 {
                     message: notification.message,
-                    person: data.conversationtype == '2' ? data.userfromfullname : '',
+                    person: data.sender ?? (data.conversationtype == '2' ? data.userfromfullname : ''),
+                    personIcon: data.senderImage,
                 },
             ];
         }
@@ -866,6 +867,8 @@ export type CorePushNotificationsNotificationBasicRawData = {
     userfromid?: string; // ID of user sending the push. Only if it's a push generated by a Moodle message.
     picture?: string; // Notification big picture. "Extra" feature.
     summaryText?: string; // Notification summary text. "Extra" feature.
+    sender?: string; // Name of the user who sent the message. "Extra" feature.
+    senderImage?: string; // Image of the user who sent the message. "Extra" feature.
 };
 
 /**

From 1688fc0d0b4b653330506d023515857f1d32d6c9 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 23 Sep 2021 12:39:35 +0200
Subject: [PATCH 0108/1008] MOBILE-3875 ci: Configure performance tests

---
 .github/workflows/performance.yml      |  55 +++++++++++
 scripts/print-measure-timings.js       |  40 ++++++++
 tests/behat/behat_performance.php      | 128 +++++++++++++++++++++++++
 tests/behat/classes/measure_timing.php |  94 ++++++++++++++++++
 tests/behat/performance.feature        |  32 +++++++
 5 files changed, 349 insertions(+)
 create mode 100644 .github/workflows/performance.yml
 create mode 100755 scripts/print-measure-timings.js
 create mode 100644 tests/behat/behat_performance.php
 create mode 100644 tests/behat/classes/measure_timing.php
 create mode 100644 tests/behat/performance.feature

diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml
new file mode 100644
index 000000000..6b894c8d8
--- /dev/null
+++ b/.github/workflows/performance.yml
@@ -0,0 +1,55 @@
+name: Performance
+
+on: [push, pull_request]
+
+jobs:
+  performance:
+    runs-on: ubuntu-latest
+    env:
+      MOODLE_DOCKER_DB: pgsql
+      MOODLE_DOCKER_BROWSER: chrome
+      MOODLE_DOCKER_PHP_VERSION: 7.3
+    steps:
+    - uses: actions/checkout@v2
+    - id: nvmrc
+      uses: browniebroke/read-nvmrc-action@v1
+    - uses: actions/setup-node@v1
+      with:
+        node-version: '${{ steps.nvmrc.outputs.node_version }}'
+    - name: Additional checkouts
+      run: |
+        git clone --branch master --depth 1 git://github.com/moodle/moodle $GITHUB_WORKSPACE/moodle
+        git clone --branch master --depth 1 git://github.com/moodlehq/moodle-local_moodlemobileapp $GITHUB_WORKSPACE/moodle/local/moodlemobileapp
+        git clone --branch master --depth 1 git://github.com/moodlehq/moodle-docker $GITHUB_WORKSPACE/moodle-docker
+    - name: Install npm packages
+      run: npm ci
+    - name: Generate Behat tests plugin
+      run: |
+        export MOODLE_DOCKER_WWWROOT=$GITHUB_WORKSPACE/moodle
+        npx gulp behat
+    - name: Configure & launch Moodle with Docker
+      run: |
+        export MOODLE_DOCKER_WWWROOT=$GITHUB_WORKSPACE/moodle
+        cp $GITHUB_WORKSPACE/moodle-docker/config.docker-template.php $GITHUB_WORKSPACE/moodle/config.php
+        sed -i "70i\$CFG->behat_ionic_wwwroot = \"http://moodleapp\";" $GITHUB_WORKSPACE/moodle/config.php
+        $GITHUB_WORKSPACE/moodle-docker/bin/moodle-docker-compose pull
+        $GITHUB_WORKSPACE/moodle-docker/bin/moodle-docker-compose up -d
+        $GITHUB_WORKSPACE/moodle-docker/bin/moodle-docker-wait-for-db
+    - name: Compile & launch production app with Docker
+      run: |
+        docker build -t moodlehq/moodleapp:performance .
+        docker run -d --rm --name moodleapp moodlehq/moodleapp:performance
+        docker network connect moodle-docker_default moodleapp --alias moodleapp
+    - name: Init Behat
+      run: |
+        export MOODLE_DOCKER_WWWROOT=$GITHUB_WORKSPACE/moodle
+        $GITHUB_WORKSPACE/moodle-docker/bin/moodle-docker-compose exec -T webserver sh -c "php admin/tool/behat/cli/init.php"
+    - name: Run performance tests
+      run: |
+        export MOODLE_DOCKER_WWWROOT=$GITHUB_WORKSPACE/moodle
+        for i in {0..3}
+        do
+          $GITHUB_WORKSPACE/moodle-docker/bin/moodle-docker-compose exec -T webserver sh -c "php admin/tool/behat/cli/run.php --tags="@performance" --auto-rerun"
+        done
+    - name: Show performance results
+      run: node ./scripts/print-measure-timings.js $GITHUB_WORKSPACE/moodle/behatmeasuretimings/
diff --git a/scripts/print-measure-timings.js b/scripts/print-measure-timings.js
new file mode 100755
index 000000000..ccd9356e1
--- /dev/null
+++ b/scripts/print-measure-timings.js
@@ -0,0 +1,40 @@
+#!/usr/bin/env node
+
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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.
+
+const { readdirSync, readFileSync } = require('fs');
+
+if (process.argv.length < 3) {
+    console.error('Missing measure timings storage path argument');
+    process.exit(1);
+}
+
+const measureTimingsStoragePath = process.argv[2].trimRight('/') + '/';
+const files = readdirSync(measureTimingsStoragePath);
+const measureTimingsDurations = {};
+
+for (const file of files) {
+    const measureTiming = JSON.parse(readFileSync(measureTimingsStoragePath + file));
+
+    measureTimingsDurations[measureTiming.measure] = measureTimingsDurations[measureTiming.measure] ?? [];
+    measureTimingsDurations[measureTiming.measure].push(measureTiming.duration);
+}
+
+for (const [measure, durations] of Object.entries(measureTimingsDurations)) {
+    const totalRuns = durations.length;
+    const averageDuration = Math.round(durations.reduce((total, duration) => total + duration) / totalRuns);
+
+    console.log(`${measure} took an average of ${averageDuration}ms per run (in ${totalRuns} runs)`);
+}
diff --git a/tests/behat/behat_performance.php b/tests/behat/behat_performance.php
new file mode 100644
index 000000000..1097c982e
--- /dev/null
+++ b/tests/behat/behat_performance.php
@@ -0,0 +1,128 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+use Behat\Mink\Exception\DriverException;
+use Behat\Mink\Exception\ExpectationException;
+
+require_once(__DIR__ . '/../../../../lib/behat/behat_base.php');
+require_once(__DIR__ . '/classes/measure_timing.php');
+
+/**
+ * Behat step definitions to measure performance.
+ */
+class behat_performance extends behat_base {
+
+    /**
+     * @var array
+     */
+    private $timings = [];
+
+    /**
+     * Start timing a performance measure.
+     *
+     * @When /^I start timing "([^"]+)"$/
+     */
+    public function i_start_timing(string $measure) {
+        $this->timings[$measure] = new measure_timing($measure);
+        $this->timings[$measure]->start();
+    }
+
+    /**
+     * Stop timing a performance measure.
+     *
+     * @When /^I stop timing "([^"]+)"$/
+     */
+    public function i_stop_timing(string $measure) {
+        $this->get_measure_timing($measure)->end();
+    }
+
+    /**
+     * Assert how long a performance measure took.
+     *
+     * @Then /^"([^"]+)" should have taken (less than|more than|exactly) (\d+(?:\.\d+)? (?:seconds|milliseconds))$/
+     */
+    public function timing_should_have_taken(string $measure, Closure $comparison, float $expectedtime) {
+        $measuretiming = $this->get_measure_timing($measure);
+
+        if (!call_user_func($comparison, $measuretiming->duration, $expectedtime)) {
+            throw new ExpectationException(
+                "Expected timing for '$measure' measure failed! (took {$measuretiming->duration}ms)",
+                $this->getSession()->getDriver()
+            );
+        }
+
+        $measuretiming->store();
+    }
+
+    /**
+     * Parse time.
+     *
+     * @Transform /^\d+(?:\.\d+)? (?:seconds|milliseconds)$/
+     * @param string $text Time string.
+     * @return float
+     */
+    public function parse_time(string $text): float {
+        $spaceindex = strpos($text, ' ');
+        $value = floatval(substr($text, 0, $spaceindex));
+
+        switch (substr($text, $spaceindex + 1)) {
+            case 'seconds':
+                $value *= 1000;
+                break;
+        }
+
+        return $value;
+    }
+
+    /**
+     * Parse a comparison function.
+     *
+     * @Transform /^less than|more than|exactly$/
+     * @param string $text Comparison string.
+     * @return Closure
+     */
+    public function parse_comparison(string $text): Closure {
+        switch ($text) {
+            case 'less than':
+                return function ($a, $b) {
+                    return $a < $b;
+                };
+            case 'more than':
+                return function ($a, $b) {
+                    return $a > $b;
+                };
+            case 'exactly':
+                return function ($a, $b) {
+                    return $a === $b;
+                };
+        }
+    }
+
+    /**
+     * Get measure timing by name.
+     *
+     * @param string $measure Measure timing name.
+     * @return measure_timing Measure timing.
+     */
+    private function get_measure_timing(string $measure): measure_timing {
+        if (!isset($this->timings[$measure])) {
+            throw new DriverException("Timing for '$measure' measure does not exist.");
+        }
+
+        return $this->timings[$measure];
+    }
+
+}
diff --git a/tests/behat/classes/measure_timing.php b/tests/behat/classes/measure_timing.php
new file mode 100644
index 000000000..4baa699f9
--- /dev/null
+++ b/tests/behat/classes/measure_timing.php
@@ -0,0 +1,94 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Performance timing for one particular measure.
+ */
+class measure_timing {
+
+    const STORAGE_FOLDER = '/behatmeasuretimings/';
+
+    /**
+     * @var string
+     */
+    public $measure;
+
+    /**
+     * @var int
+     */
+    public $start;
+
+    /**
+     * @var int
+     */
+    public $end;
+
+    /**
+     * @var int
+     */
+    public $duration;
+
+    public function __construct(string $measure) {
+        $this->measure = $measure;
+    }
+
+    /**
+     * Start timing.
+     */
+    public function start(): void {
+        $this->start = $this->now();
+    }
+
+    /**
+     * Stop timing.
+     */
+    public function end(): void {
+        $this->end = $this->now();
+        $this->duration = $this->end - $this->start;
+    }
+
+    /**
+     * Persist measure timing in storage.
+     */
+    public function store(): void {
+        global $CFG;
+
+        $storagefolderpath = $CFG->dirroot . static::STORAGE_FOLDER;
+
+        if (!file_exists($storagefolderpath)) {
+            mkdir($storagefolderpath);
+        }
+
+        $data = [
+            'measure' => $this->measure,
+            'start' => $this->start,
+            'end' => $this->end,
+            'duration' => $this->duration,
+        ];
+
+        file_put_contents($storagefolderpath . time() . '.json', json_encode($data));
+    }
+
+    /**
+     * Get current time.
+     *
+     * @return int Current time in milliseconds.
+     */
+    private function now(): int {
+        return round(microtime(true) * 1000);
+    }
+
+}
diff --git a/tests/behat/performance.feature b/tests/behat/performance.feature
new file mode 100644
index 000000000..203737163
--- /dev/null
+++ b/tests/behat/performance.feature
@@ -0,0 +1,32 @@
+@app @javascript @performance
+Feature: Measure performance.
+
+Scenario: [FCP] First Contentful Paint
+    Given I start timing "FCP"
+    When I launch the app runtime
+    Then I should find "Welcome to the Moodle App!" in the app
+
+    When I stop timing "FCP"
+    Then "FCP" should have taken less than 5 seconds
+
+Scenario: [TTI] Time to Interactive
+    Given I start timing "TTI"
+    When I launch the app runtime
+    Then I should find "Welcome to the Moodle App!" in the app
+
+    When I press "Skip" in the app
+    Then I should find "Connect to Moodle" in the app
+
+    When I stop timing "TTI"
+    Then "TTI" should have taken less than 6 seconds
+
+Scenario: [TBT] Total Blocking Time
+    Given I launch the app runtime
+    Then I should find "Welcome to the Moodle App!" in the app
+
+    When I start timing "TBT"
+    And I press "Skip" in the app
+    Then I should find "Connect to Moodle" in the app
+
+    When I stop timing "TBT"
+    Then "TBT" should have taken less than 2 seconds

From b9df5e726aa4cf5b74167f62d8d4fd462bf667e2 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 20 Sep 2021 09:47:27 +0200
Subject: [PATCH 0109/1008] MOBILE-3848 dashboard: Support guest courses in
 recently accessed

---
 .../recentlyaccessedcourses.ts                | 40 +++++++---
 .../features/course/services/course-helper.ts |  5 +-
 .../core-courses-course-progress.html         | 10 +--
 .../course-progress/course-progress.ts        | 34 ++++++--
 .../courses/services/courses-helper.ts        | 53 +++++++++++-
 src/core/features/courses/services/courses.ts | 80 +++++++++++++++++--
 6 files changed, 191 insertions(+), 31 deletions(-)

diff --git a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
index f786edbc2..de9d5a8c9 100644
--- a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
+++ b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
@@ -16,7 +16,7 @@ import { Component, OnInit, OnDestroy, Input, OnChanges, SimpleChange } from '@a
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreSites } from '@services/sites';
 import { CoreCoursesProvider, CoreCoursesMyCoursesUpdatedEventData, CoreCourses } from '@features/courses/services/courses';
-import { CoreCoursesHelper, CoreEnrolledCourseDataWithOptions } from '@features/courses/services/courses-helper';
+import { CoreCourseSearchedDataWithExtraInfoAndOptions, CoreCoursesHelper } from '@features/courses/services/courses-helper';
 import { CoreCourseHelper, CorePrefetchStatusInfo } from '@features/course/services/course-helper';
 import { CoreCourseOptionsDelegate } from '@features/course/services/course-options-delegate';
 import { AddonCourseCompletion } from '@/addons/coursecompletion/services/coursecompletion';
@@ -35,7 +35,7 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
 
     @Input() downloadEnabled = false;
 
-    courses: CoreEnrolledCourseDataWithOptions [] = [];
+    courses: CoreCourseSearchedDataWithExtraInfoAndOptions[] = [];
     prefetchCoursesData: CorePrefetchStatusInfo = {
         icon: '',
         statusTranslatable: 'core.loading',
@@ -112,7 +112,7 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
     protected async invalidateContent(): Promise<void> {
         const promises: Promise<void>[] = [];
 
-        promises.push(CoreCourses.invalidateUserCourses().finally(() =>
+        promises.push(CoreCourses.invalidateRecentCourses().finally(() =>
             // Invalidate course completion data.
             CoreUtils.allPromises(this.courseIds.map((courseId) =>
                 AddonCourseCompletion.invalidateCourseCompletion(courseId)))));
@@ -136,7 +136,33 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
         const showCategories = this.block.configsRecord && this.block.configsRecord.displaycategories &&
             this.block.configsRecord.displaycategories.value == '1';
 
-        this.courses = await CoreCoursesHelper.getUserCoursesWithOptions('lastaccess', 10, undefined, showCategories);
+        const recentCourses = await CoreCourses.getRecentCourses();
+        const courseIds = recentCourses.map((course) => course.id);
+
+        // Get the courses using getCoursesByField to get more info about each course.
+        const courses: CoreCourseSearchedDataWithExtraInfoAndOptions[] = await CoreCourses.getCoursesByField(
+            'ids',
+            courseIds.join(','),
+        );
+
+        // Sort them in the original order.
+        courses.sort((courseA, courseB) => courseIds.indexOf(courseA.id) - courseIds.indexOf(courseB.id));
+
+        // Get course options and extra info.
+        const options = await CoreCourses.getCoursesAdminAndNavOptions(courseIds);
+        courses.forEach((course) => {
+            course.navOptions = options.navOptions[course.id];
+            course.admOptions = options.admOptions[course.id];
+
+            if (!showCategories) {
+                course.categoryname = '';
+            }
+        });
+
+        await CoreCoursesHelper.loadCoursesColorAndImage(courses);
+
+        this.courses = courses;
+
         this.initPrefetchCoursesIcons();
     }
 
@@ -148,11 +174,7 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
     protected async refreshCourseList(): Promise<void> {
         CoreEvents.trigger(CoreCoursesProvider.EVENT_MY_COURSES_REFRESHED);
 
-        try {
-            await CoreCourses.invalidateUserCourses();
-        } catch (error) {
-            // Ignore errors.
-        }
+        await CoreUtils.ignoreErrors(CoreCourses.invalidateRecentCourses());
 
         await this.loadContent(true);
     }
diff --git a/src/core/features/course/services/course-helper.ts b/src/core/features/course/services/course-helper.ts
index 9a8d1ffc4..5b322d60d 100644
--- a/src/core/features/course/services/course-helper.ts
+++ b/src/core/features/course/services/course-helper.ts
@@ -39,7 +39,6 @@ import {
     CoreCourseSearchedData,
     CoreEnrolledCourseData,
 } from '@features/courses/services/courses';
-import { CoreEnrolledCourseDataWithExtraInfoAndOptions } from '@features/courses/services/courses-helper';
 import { CoreArray } from '@singletons/array';
 import { CoreIonLoadingElement } from '@classes/ion-loading';
 import { CoreCourseOffline } from './course-offline';
@@ -424,7 +423,7 @@ export class CoreCourseHelperProvider {
      * @return Resolved when downloaded, rejected if error or canceled.
      */
     async confirmAndPrefetchCourses(
-        courses: CoreEnrolledCourseDataWithExtraInfoAndOptions[],
+        courses: CoreCourseAnyCourseData[],
         options: CoreCourseConfirmPrefetchCoursesOptions = {},
     ): Promise<void> {
         const siteId = CoreSites.getCurrentSiteId();
@@ -1302,7 +1301,7 @@ export class CoreCourseHelperProvider {
      * @return Promise resolved when done.
      */
     async prefetchCourses(
-        courses: CoreEnrolledCourseDataWithExtraInfoAndOptions[],
+        courses: CoreCourseAnyCourseData[],
         prefetch: CorePrefetchStatusInfo,
         options: CoreCoursePrefetchCoursesOptions = {},
     ): Promise<void> {
diff --git a/src/core/features/courses/components/course-progress/core-courses-course-progress.html b/src/core/features/courses/components/course-progress/core-courses-course-progress.html
index 33cd0cfd4..d36b8cb38 100644
--- a/src/core/features/courses/components/course-progress/core-courses-course-progress.html
+++ b/src/core/features/courses/components/course-progress/core-courses-course-progress.html
@@ -5,7 +5,7 @@
     </div>
     <ion-item button lines="none" (click)="openCourse()" [attr.aria-label]="course.displayname || course.fullname"
         class="core-course-header" [class.item-disabled]="course.visible == 0"
-        [class.core-course-only-title]="!showAll || course.progress! < 0 && course.completionusertracked === false"
+        [class.core-course-only-title]="!showAll || progress < 0 && completionUserTracked === false"
         detail="false">
         <ion-label
             class="ion-text-wrap core-course-title"
@@ -26,9 +26,9 @@
                 </span>
             </p>
             <p class="item-heading">
-                <ion-icon name="fas-star" *ngIf="course.isfavourite" [attr.aria-label]="'core.courses.favourite' | translate">
+                <ion-icon name="fas-star" *ngIf="isFavourite" [attr.aria-label]="'core.courses.favourite' | translate">
                 </ion-icon>
-                <span class="sr-only" *ngIf="course.isfavourite">{{ 'core.courses.aria:favourite' | translate }}</span>
+                <span class="sr-only" *ngIf="isFavourite">{{ 'core.courses.aria:favourite' | translate }}</span>
                 <span class="sr-only">{{ 'core.courses.aria:coursename' | translate }}</span>
                 <core-format-text [text]="course.fullname" contextLevel="course" [contextInstanceId]="course.id"></core-format-text>
             </p>
@@ -61,10 +61,10 @@
             </ion-button>
         </div>
     </ion-item>
-    <ion-item *ngIf="showAll && course.progress! >= 0 && course.completionusertracked !== false" lines="none"
+    <ion-item *ngIf="showAll && progress >= 0 && completionUserTracked !== false" lines="none"
         class="core-course-progress">
         <ion-label>
-            <core-progress-bar [progress]="course.progress" a11yText="core.courses.aria:courseprogress"></core-progress-bar>
+            <core-progress-bar [progress]="progress" a11yText="core.courses.aria:courseprogress"></core-progress-bar>
         </ion-label>
     </ion-item>
     <ng-content></ng-content>
diff --git a/src/core/features/courses/components/course-progress/course-progress.ts b/src/core/features/courses/components/course-progress/course-progress.ts
index 2c4b9db69..c4892208b 100644
--- a/src/core/features/courses/components/course-progress/course-progress.ts
+++ b/src/core/features/courses/components/course-progress/course-progress.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, Input, OnInit, OnDestroy } from '@angular/core';
+import { Component, Input, OnInit, OnDestroy, OnChanges } from '@angular/core';
 import { CoreEventCourseStatusChanged, CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
@@ -21,7 +21,10 @@ import { CoreCourse, CoreCourseProvider } from '@features/course/services/course
 import { CoreCourseHelper, CorePrefetchStatusInfo } from '@features/course/services/course-helper';
 import { Translate } from '@singletons';
 import { CoreConstants } from '@/core/constants';
-import { CoreEnrolledCourseDataWithExtraInfoAndOptions } from '../../services/courses-helper';
+import {
+    CoreCourseAnyCourseDataWithExtraInfoAndOptions,
+    CoreEnrolledCourseDataWithExtraInfoAndOptions,
+} from '../../services/courses-helper';
 import { CoreCoursesCourseOptionsMenuComponent } from '../course-options-menu/course-options-menu';
 import { CoreUser } from '@features/user/services/user';
 
@@ -38,9 +41,10 @@ import { CoreUser } from '@features/user/services/user';
     templateUrl: 'core-courses-course-progress.html',
     styleUrls: ['course-progress.scss'],
 })
-export class CoreCoursesCourseProgressComponent implements OnInit, OnDestroy {
+export class CoreCoursesCourseProgressComponent implements OnInit, OnDestroy, OnChanges {
 
-    @Input() course!: CoreEnrolledCourseDataWithExtraInfoAndOptions; // The course to render.
+    // The course to render.
+    @Input() course!: CoreCourseAnyCourseDataWithExtraInfoAndOptions;
     @Input() showAll = false; // If true, will show all actions, options, star and progress.
     @Input() showDownload = true; // If true, will show download button. Only works if the options menu is not shown.
 
@@ -56,13 +60,16 @@ export class CoreCoursesCourseProgressComponent implements OnInit, OnDestroy {
     showSpinner = false;
     downloadCourseEnabled = false;
     courseOptionMenuEnabled = false;
+    isFavourite = false;
+    progress = -1;
+    completionUserTracked: boolean | undefined = false;
 
     protected isDestroyed = false;
     protected courseStatusObserver?: CoreEventObserver;
     protected siteUpdatedObserver?: CoreEventObserver;
 
     /**
-     * Component being initialized.
+     * @inheritdoc
      */
     ngOnInit(): void {
 
@@ -73,7 +80,8 @@ export class CoreCoursesCourseProgressComponent implements OnInit, OnDestroy {
         }
 
         // This field is only available from 3.6 onwards.
-        this.courseOptionMenuEnabled = this.showAll && typeof this.course.isfavourite != 'undefined';
+        this.courseOptionMenuEnabled = this.showAll && 'isfavourite' in this.course &&
+            typeof this.course.isfavourite != 'undefined';
 
         // Refresh the enabled flag if site is updated.
         this.siteUpdatedObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, () => {
@@ -88,6 +96,15 @@ export class CoreCoursesCourseProgressComponent implements OnInit, OnDestroy {
         }, CoreSites.getCurrentSiteId());
     }
 
+    /**
+     * @inheritdoc
+     */
+    ngOnChanges(): void {
+        this.isFavourite = 'isfavourite' in this.course && !!this.course.isfavourite;
+        this.progress = 'progress' in this.course ? this.course.progress || -1 : -1;
+        this.completionUserTracked = 'completionusertracked' in this.course && this.course.completionusertracked;
+    }
+
     /**
      * Initialize prefetch course.
      */
@@ -255,7 +272,7 @@ export class CoreCoursesCourseProgressComponent implements OnInit, OnDestroy {
                 hide ? '1' : undefined,
             );
 
-            this.course.hidden = hide;
+            (<CoreEnrolledCourseDataWithExtraInfoAndOptions> this.course).hidden = hide;
             CoreEvents.trigger(CoreCoursesProvider.EVENT_MY_COURSES_UPDATED, {
                 courseId: this.course.id,
                 course: this.course,
@@ -284,7 +301,8 @@ export class CoreCoursesCourseProgressComponent implements OnInit, OnDestroy {
         try {
             await CoreCourses.setFavouriteCourse(this.course.id, favourite);
 
-            this.course.isfavourite = favourite;
+            (<CoreEnrolledCourseDataWithExtraInfoAndOptions> this.course).isfavourite = favourite;
+            this.isFavourite = favourite;
             CoreEvents.trigger(CoreCoursesProvider.EVENT_MY_COURSES_UPDATED, {
                 courseId: this.course.id,
                 course: this.course,
diff --git a/src/core/features/courses/services/courses-helper.ts b/src/core/features/courses/services/courses-helper.ts
index f5e1aaec5..150bfb05a 100644
--- a/src/core/features/courses/services/courses-helper.ts
+++ b/src/core/features/courses/services/courses-helper.ts
@@ -15,7 +15,13 @@
 import { Injectable } from '@angular/core';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreSites } from '@services/sites';
-import { CoreCourses, CoreCourseSearchedData, CoreCourseUserAdminOrNavOptionIndexed, CoreEnrolledCourseData } from './courses';
+import {
+    CoreCourseAnyCourseDataWithOptions,
+    CoreCourses,
+    CoreCourseSearchedData,
+    CoreCourseUserAdminOrNavOptionIndexed,
+    CoreEnrolledCourseData,
+} from './courses';
 import { makeSingleton, Translate } from '@singletons';
 import { CoreWSExternalFile } from '@services/ws';
 import { AddonCourseCompletion } from '@/addons/coursecompletion/services/coursecompletion';
@@ -83,6 +89,31 @@ export class CoreCoursesHelperProvider {
         this.loadCourseColorAndImage(course, colors);
     }
 
+    /**
+     * Given a list of courses returned by core_enrol_get_users_courses, load some extra data using the WebService
+     * core_course_get_courses_by_field if available.
+     *
+     * @param courses List of courses.
+     * @param loadCategoryNames Whether load category names or not.
+     * @return Promise resolved when done.
+     */
+    /**
+     * Loads the color of courses or the thumb image.
+     *
+     * @param courses List of courses.
+     * @return Promise resolved when done.
+     */
+    async loadCoursesColorAndImage(courses: CoreCourseSearchedData[]): Promise<void> {
+        if (!courses.length) {
+            return;
+        }
+        const colors = await this.loadCourseSiteColors();
+
+        courses.forEach((course) => {
+            this.loadCourseColorAndImage(course, colors);
+        });
+    }
+
     /**
      * Given a list of courses returned by core_enrol_get_users_courses, load some extra data using the WebService
      * core_course_get_courses_by_field if available.
@@ -301,7 +332,27 @@ export type CoreEnrolledCourseDataWithOptions = CoreEnrolledCourseData & {
     admOptions?: CoreCourseUserAdminOrNavOptionIndexed;
 };
 
+/**
+ * Course summary data with admin and navigation option availability.
+ */
+export type CoreCourseSearchedDataWithOptions = CoreCourseSearchedData & {
+    navOptions?: CoreCourseUserAdminOrNavOptionIndexed;
+    admOptions?: CoreCourseUserAdminOrNavOptionIndexed;
+};
+
 /**
  * Enrolled course data with admin and navigation option availability and extra rendering info.
  */
 export type CoreEnrolledCourseDataWithExtraInfoAndOptions = CoreEnrolledCourseDataWithExtraInfo & CoreEnrolledCourseDataWithOptions;
+
+/**
+ * Searched course data with admin and navigation option availability and extra rendering info.
+ */
+export type CoreCourseSearchedDataWithExtraInfoAndOptions = CoreCourseWithImageAndColor & CoreCourseSearchedDataWithOptions;
+
+/**
+ * Any course data with admin and navigation option availability and extra rendering info.
+ */
+export type CoreCourseAnyCourseDataWithExtraInfoAndOptions = CoreCourseWithImageAndColor & CoreCourseAnyCourseDataWithOptions & {
+    categoryname?: string; // Category name,
+};
diff --git a/src/core/features/courses/services/courses.ts b/src/core/features/courses/services/courses.ts
index f16b0e41a..e05585344 100644
--- a/src/core/features/courses/services/courses.ts
+++ b/src/core/features/courses/services/courses.ts
@@ -14,7 +14,7 @@
 
 import { Injectable } from '@angular/core';
 import { CoreLogger } from '@singletons/logger';
-import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
+import { CoreSites, CoreSitesCommonWSOptions, CoreSitesReadingStrategy } from '@services/sites';
 import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
 import { makeSingleton } from '@singletons';
 import { CoreStatusWithWarningsWSResponse, CoreWarningsWSResponse, CoreWSExternalFile, CoreWSExternalWarning } from '@services/ws';
@@ -45,6 +45,7 @@ declare module '@singletons/events' {
 export class CoreCoursesProvider {
 
     static readonly SEARCH_PER_PAGE = 20;
+    static readonly RECENT_PER_PAGE = 10;
     static readonly ENROL_INVALID_KEY = 'CoreCoursesEnrolInvalidKey';
     static readonly EVENT_MY_COURSES_CHANGED = 'courses_my_courses_changed'; // User course list changed while app is running.
     // A course was hidden/favourite, or user enroled in a course.
@@ -566,7 +567,7 @@ export class CoreCoursesProvider {
         customFieldName: string,
         customFieldValue: string,
         siteId?: string,
-    ): Promise<CoreCourseGetEnrolledCoursesByTimelineClassification[]> {
+    ): Promise<CoreCourseSummaryData[]> {
         const site = await CoreSites.getSite(siteId);
         const params: CoreCourseGetEnrolledCoursesByTimelineClassificationWSParams = {
             classification: 'customfield',
@@ -648,6 +649,40 @@ export class CoreCoursesProvider {
         return ({ navOptions: navOptions, admOptions: admOptions });
     }
 
+    /**
+     * Get cache key for get recent courses WS call.
+     *
+     * @param userId User ID.
+     * @return Cache key.
+     */
+    protected getRecentCoursesCacheKey(userId: number): string {
+        return `${ROOT_CACHE_KEY}:recentcourses:${userId}`;
+    }
+
+    /**
+     * Get recent courses.
+     *
+     * @param options Options.
+     * @return Promise resolved with courses.
+     * @since 3.6
+     */
+    async getRecentCourses(options: CoreCourseGetRecentCoursesOptions = {}): Promise<CoreCourseSummaryData[]> {
+        const site = await CoreSites.getSite(options.siteId);
+
+        const userId = options.userId || site.getUserId();
+        const params: CoreCourseGetRecentCoursesWSParams = {
+            userid: userId,
+            offset: options.offset || 0,
+            limit: options.limit || CoreCoursesProvider.RECENT_PER_PAGE,
+            sort: options.sort,
+        };
+        const preSets: CoreSiteWSPreSets = {
+            cacheKey: this.getRecentCoursesCacheKey(userId),
+        };
+
+        return await site.read<CoreCourseSummaryData[]>('core_course_get_recent_courses', params, preSets);
+    }
+
     /**
      * Get the common part of the cache keys for user administration options WS calls.
      *
@@ -995,6 +1030,19 @@ export class CoreCoursesProvider {
         return site.invalidateWsCacheForKey(this.getCoursesByFieldCacheKey(field, value));
     }
 
+    /**
+     * Invalidates get recent courses WS call.
+     *
+     * @param userId User ID. If not defined, current user.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved when the data is invalidated.
+     */
+    async invalidateRecentCourses(userId?: number, siteId?: string): Promise<void> {
+        const site = await CoreSites.getSite(siteId);
+
+        await site.invalidateWsCacheForKey(this.getRecentCoursesCacheKey(userId || site.getUserId()));
+    }
+
     /**
      * Invalidates all user administration options.
      *
@@ -1428,13 +1476,15 @@ type CoreCourseGetCoursesWSParams = {
 export type CoreCourseGetCoursesWSResponse = CoreCourseGetCoursesData[];
 
 /**
- * Course type exported in CoreCourseGetEnrolledCoursesByTimelineClassificationWSResponse;
+ * Course data exported by course_summary_exporter;
  */
-export type CoreCourseGetEnrolledCoursesByTimelineClassification = CoreCourseBasicData & { // Course.
+export type CoreCourseSummaryData = CoreCourseBasicData & { // Course.
     idnumber: string; // Idnumber.
     startdate: number; // Startdate.
     enddate: number; // Enddate.
     visible: boolean; // Visible.
+    showactivitydates: boolean; // Showactivitydates.
+    showcompletionconditions: boolean; // Showcompletionconditions.
     fullnamedisplay: string; // Fullnamedisplay.
     viewurl: string; // Viewurl.
     courseimage: string; // Courseimage.
@@ -1463,7 +1513,7 @@ type CoreCourseGetEnrolledCoursesByTimelineClassificationWSParams = {
  * Data returned by core_course_get_enrolled_courses_by_timeline_classification WS.
  */
 export type CoreCourseGetEnrolledCoursesByTimelineClassificationWSResponse = {
-    courses: CoreCourseGetEnrolledCoursesByTimelineClassification[];
+    courses: CoreCourseSummaryData[];
     nextoffset: number; // Offset for the next request.
 };
 
@@ -1588,6 +1638,26 @@ export type EnrolGuestGetInstanceInfoWSResponse = {
     warnings?: CoreWSExternalWarning[];
 };
 
+/**
+ * Params of core_course_get_recent_courses WS.
+ */
+export type CoreCourseGetRecentCoursesWSParams = {
+    userid?: number; // Id of the user, default to current user.
+    limit?: number; // Result set limit.
+    offset?: number; // Result set offset.
+    sort?: string; // Sort string.
+};
+
+/**
+ * Options for getRecentCourses.
+ */
+export type CoreCourseGetRecentCoursesOptions = CoreSitesCommonWSOptions & {
+    userId?: number; // Id of the user, default to current user.
+    limit?: number; // Result set limit.
+    offset?: number; // Result set offset.
+    sort?: string; // Sort string.
+};
+
 /**
  * Course guest enrolment method.
  */

From 3db470c0a4cf218dbb3f99dc7a58e4eaf7d49c3b Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 23 Sep 2021 17:19:09 +0200
Subject: [PATCH 0110/1008] MOBILE-3876 build: Configure bundle minification

---
 angular.json      |     5 +-
 package-lock.json | 31437 +-------------------------------------------
 package.json      |     3 +
 webpack.config.js |    36 +
 4 files changed, 430 insertions(+), 31051 deletions(-)
 create mode 100644 webpack.config.js

diff --git a/angular.json b/angular.json
index 9cc72565b..36bf99fab 100644
--- a/angular.json
+++ b/angular.json
@@ -12,8 +12,11 @@
       "schematics": {},
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:browser",
+          "builder": "@angular-builders/custom-webpack:browser",
           "options": {
+            "customWebpackConfig": {
+              "path": "./webpack.config.js"
+            },
             "allowedCommonJsDependencies":[
                 "chart.js"
             ],
diff --git a/package-lock.json b/package-lock.json
index 68b99fc85..a8cec7166 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,30955 +1,104 @@
 {
   "name": "moodlemobile",
   "version": "3.9.6-dev",
-  "lockfileVersion": 2,
+  "lockfileVersion": 1,
   "requires": true,
-  "packages": {
-    "": {
-      "name": "moodlemobile",
-      "version": "3.9.6-dev",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@angular/animations": "~10.0.14",
-        "@angular/common": "~10.0.14",
-        "@angular/core": "~10.0.14",
-        "@angular/forms": "~10.0.14",
-        "@angular/platform-browser": "~10.0.14",
-        "@angular/platform-browser-dynamic": "~10.0.14",
-        "@angular/router": "~10.0.14",
-        "@ionic-native/badge": "^5.33.0",
-        "@ionic-native/camera": "^5.33.0",
-        "@ionic-native/chooser": "^5.33.0",
-        "@ionic-native/clipboard": "^5.33.0",
-        "@ionic-native/core": "^5.33.0",
-        "@ionic-native/device": "^5.33.0",
-        "@ionic-native/diagnostic": "^5.33.0",
-        "@ionic-native/file": "^5.33.0",
-        "@ionic-native/file-opener": "^5.33.0",
-        "@ionic-native/file-transfer": "^5.33.0",
-        "@ionic-native/geolocation": "^5.33.0",
-        "@ionic-native/http": "^5.33.0",
-        "@ionic-native/in-app-browser": "^5.33.0",
-        "@ionic-native/ionic-webview": "^5.33.0",
-        "@ionic-native/keyboard": "^5.33.0",
-        "@ionic-native/local-notifications": "^5.33.0",
-        "@ionic-native/media": "^5.33.0",
-        "@ionic-native/media-capture": "^5.33.0",
-        "@ionic-native/network": "^5.33.0",
-        "@ionic-native/push": "^5.33.0",
-        "@ionic-native/qr-scanner": "^5.33.0",
-        "@ionic-native/splash-screen": "^5.33.0",
-        "@ionic-native/sqlite": "^5.33.0",
-        "@ionic-native/status-bar": "^5.33.0",
-        "@ionic-native/web-intent": "^5.33.0",
-        "@ionic-native/zip": "^5.33.0",
-        "@ionic/angular": "^5.6.6",
-        "@moodlehq/cordova-plugin-file-transfer": "1.7.1-moodle.2",
-        "@moodlehq/cordova-plugin-inappbrowser": "5.0.0-moodle.2",
-        "@moodlehq/cordova-plugin-ionic-webview": "5.0.0-moodle.1",
-        "@moodlehq/cordova-plugin-local-notification": "0.9.0-moodle.3",
-        "@moodlehq/cordova-plugin-qrscanner": "3.0.1-moodle.2",
-        "@moodlehq/phonegap-plugin-push": "2.0.0-moodle.2",
-        "@ngx-translate/core": "^13.0.0",
-        "@ngx-translate/http-loader": "^6.0.0",
-        "@types/chart.js": "^2.9.31",
-        "@types/cordova": "0.0.34",
-        "@types/dom-mediacapture-record": "^1.0.7",
-        "chart.js": "^2.9.4",
-        "com-darryncampbell-cordova-plugin-intent": "^1.3.0",
-        "cordova": "^10.0.0",
-        "cordova-android": "^9.1.0",
-        "cordova-android-support-gradle-release": "^3.0.1",
-        "cordova-clipboard": "^1.3.0",
-        "cordova-ios": "^6.2.0",
-        "cordova-plugin-add-swift-support": "^2.0.2",
-        "cordova-plugin-advanced-http": "^3.1.0",
-        "cordova-plugin-badge": "^0.8.8",
-        "cordova-plugin-camera": "^5.0.1",
-        "cordova-plugin-chooser": "^1.3.2",
-        "cordova-plugin-customurlscheme": "^5.0.2",
-        "cordova-plugin-device": "^2.0.3",
-        "cordova-plugin-file": "^6.0.2",
-        "cordova-plugin-file-opener2": "^3.0.5",
-        "cordova-plugin-geolocation": "^4.1.0",
-        "cordova-plugin-globalization": "^1.11.0",
-        "cordova-plugin-ionic-keyboard": "^2.2.0",
-        "cordova-plugin-media": "^5.0.3",
-        "cordova-plugin-media-capture": "^3.0.3",
-        "cordova-plugin-network-information": "^2.0.2",
-        "cordova-plugin-prevent-override": "^1.0.0",
-        "cordova-plugin-screen-orientation": "^3.0.2",
-        "cordova-plugin-splashscreen": "^6.0.0",
-        "cordova-plugin-statusbar": "^2.4.3",
-        "cordova-plugin-whitelist": "^1.3.4",
-        "cordova-plugin-wkuserscript": "^1.0.0",
-        "cordova-plugin-wkwebview-cookies": "^1.0.0",
-        "cordova-plugin-zip": "^3.1.0",
-        "cordova-sqlite-storage": "^6.0.0",
-        "cordova-support-google-services": "^1.2.1",
-        "cordova.plugins.diagnostic": "^5.0.2",
-        "core-js": "^3.9.1",
-        "es6-promise-plugin": "^4.2.2",
-        "jszip": "^3.5.0",
-        "mathjax": "2.7.7",
-        "moment": "^2.29.0",
-        "nl.kingsquare.cordova.background-audio": "^1.0.1",
-        "rxjs": "~6.5.5",
-        "ts-md5": "^1.2.7",
-        "tslib": "^2.0.1",
-        "zone.js": "~0.10.3"
-      },
-      "devDependencies": {
-        "@angular-devkit/build-angular": "~0.1000.8",
-        "@angular-eslint/builder": "^4.2.0",
-        "@angular-eslint/eslint-plugin": "^4.2.0",
-        "@angular-eslint/eslint-plugin-template": "^4.2.0",
-        "@angular-eslint/schematics": "^4.2.0",
-        "@angular-eslint/template-parser": "^4.2.0",
-        "@angular/cli": "~10.0.8",
-        "@angular/compiler": "~10.0.14",
-        "@angular/compiler-cli": "~10.0.14",
-        "@angular/language-service": "~10.0.14",
-        "@ionic/angular-toolkit": "^2.3.3",
-        "@ionic/cli": "^6.14.1",
-        "@types/faker": "^5.1.3",
-        "@types/node": "^12.12.64",
-        "@types/resize-observer-browser": "^0.1.5",
-        "@types/webpack-env": "^1.16.0",
-        "@typescript-eslint/eslint-plugin": "^4.22.0",
-        "@typescript-eslint/parser": "^4.22.0",
-        "check-es-compat": "^1.1.1",
-        "cordova-plugin-androidx-adapter": "^1.1.3",
-        "eslint": "^7.25.0",
-        "eslint-config-prettier": "^8.3.0",
-        "eslint-plugin-header": "^3.1.1",
-        "eslint-plugin-import": "^2.22.1",
-        "eslint-plugin-jest": "^24.3.6",
-        "eslint-plugin-jsdoc": "^32.3.3",
-        "eslint-plugin-prefer-arrow": "^1.2.3",
-        "eslint-plugin-promise": "^5.1.0",
-        "faker": "^5.1.0",
-        "fs-extra": "^9.1.0",
-        "gulp": "4.0.2",
-        "gulp-clip-empty-files": "^0.1.2",
-        "gulp-concat": "^2.6.1",
-        "gulp-flatten": "^0.4.0",
-        "gulp-htmlmin": "^5.0.1",
-        "gulp-rename": "^2.0.0",
-        "gulp-slash": "^1.1.3",
-        "jest": "^26.5.2",
-        "jest-preset-angular": "^8.3.1",
-        "jsonc-parser": "^2.3.1",
-        "native-run": "^1.4.0",
-        "ts-jest": "^26.4.1",
-        "ts-node": "~8.3.0",
-        "typescript": "^3.9.9"
-      },
-      "engines": {
-        "node": ">=14.15.0 <15"
-      },
-      "optionalDependencies": {
-        "keytar": "^7.2.0"
-      }
-    },
-    "node_modules/@angular-devkit/architect": {
-      "version": "0.1101.2",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1101.2.tgz",
-      "integrity": "sha512-MLmBfHiiyPhbFSSAX4oMecPjEuBauOui5uBpI6BKNnk/7783fznbkbAKjXlOco7M81gkNeEoHMR8c+mOfcvv7g==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@angular-devkit/core": "11.1.2",
-        "rxjs": "6.6.3"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@angular-devkit/architect/node_modules/rxjs": {
-      "version": "6.6.3",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
-      "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "tslib": "^1.9.0"
-      },
-      "engines": {
-        "npm": ">=2.0.0"
-      }
-    },
-    "node_modules/@angular-devkit/architect/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/@angular-devkit/build-angular": {
-      "version": "0.1000.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.1000.8.tgz",
-      "integrity": "sha512-wwDN2oadQvYPL7lDmvGsoWQjW++0ZnxWk1QVlABGhBSIs8Uxs26Hjd5YNUSsvJavBkqb1UZIOilqzb4dig5MIA==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/architect": "0.1000.8",
-        "@angular-devkit/build-optimizer": "0.1000.8",
-        "@angular-devkit/build-webpack": "0.1000.8",
-        "@angular-devkit/core": "10.0.8",
-        "@babel/core": "7.9.6",
-        "@babel/generator": "7.9.6",
-        "@babel/plugin-transform-runtime": "7.9.6",
-        "@babel/preset-env": "7.9.6",
-        "@babel/runtime": "7.9.6",
-        "@babel/template": "7.8.6",
-        "@jsdevtools/coverage-istanbul-loader": "3.0.3",
-        "@ngtools/webpack": "10.0.8",
-        "ajv": "6.12.3",
-        "autoprefixer": "9.8.0",
-        "babel-loader": "8.1.0",
-        "browserslist": "^4.9.1",
-        "cacache": "15.0.3",
-        "caniuse-lite": "^1.0.30001032",
-        "circular-dependency-plugin": "5.2.0",
-        "copy-webpack-plugin": "6.0.3",
-        "core-js": "3.6.4",
-        "css-loader": "3.5.3",
-        "cssnano": "4.1.10",
-        "file-loader": "6.0.0",
-        "find-cache-dir": "3.3.1",
-        "glob": "7.1.6",
-        "jest-worker": "26.0.0",
-        "karma-source-map-support": "1.4.0",
-        "less-loader": "6.1.0",
-        "license-webpack-plugin": "2.2.0",
-        "loader-utils": "2.0.0",
-        "mini-css-extract-plugin": "0.9.0",
-        "minimatch": "3.0.4",
-        "open": "7.0.4",
-        "parse5": "4.0.0",
-        "pnp-webpack-plugin": "1.6.4",
-        "postcss": "7.0.31",
-        "postcss-import": "12.0.1",
-        "postcss-loader": "3.0.0",
-        "raw-loader": "4.0.1",
-        "regenerator-runtime": "0.13.5",
-        "resolve-url-loader": "3.1.1",
-        "rimraf": "3.0.2",
-        "rollup": "2.10.9",
-        "rxjs": "6.5.5",
-        "sass": "1.26.5",
-        "sass-loader": "8.0.2",
-        "semver": "7.3.2",
-        "source-map": "0.7.3",
-        "source-map-loader": "1.0.0",
-        "source-map-support": "0.5.19",
-        "speed-measure-webpack-plugin": "1.3.3",
-        "style-loader": "1.2.1",
-        "stylus": "0.54.7",
-        "stylus-loader": "3.0.2",
-        "terser": "4.7.0",
-        "terser-webpack-plugin": "3.0.1",
-        "tree-kill": "1.2.2",
-        "webpack": "4.43.0",
-        "webpack-dev-middleware": "3.7.2",
-        "webpack-dev-server": "3.11.0",
-        "webpack-merge": "4.2.2",
-        "webpack-sources": "1.4.3",
-        "webpack-subresource-integrity": "1.4.1",
-        "worker-plugin": "4.0.3"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
-        "yarn": ">= 1.13.0"
-      },
-      "peerDependencies": {
-        "@angular/compiler-cli": ">=10.0.0-next.0 < 11",
-        "typescript": ">=3.9 < 3.10"
-      },
-      "peerDependenciesMeta": {
-        "@angular/localize": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/architect": {
-      "version": "0.1000.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1000.8.tgz",
-      "integrity": "sha512-2AqPbiEugtPxNz4MGhLh+imUVelhW9h1cdJs2AbxZosIxftPb5DNDQUSAwVmRGp4CtcXVrlvcDwc0f4Fw1aiIA==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/core": "10.0.8",
-        "rxjs": "6.5.5"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/core": {
-      "version": "10.0.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
-      "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "6.12.3",
-        "fast-json-stable-stringify": "2.1.0",
-        "magic-string": "0.25.7",
-        "rxjs": "6.5.5",
-        "source-map": "0.7.3"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/ajv": {
-      "version": "6.12.3",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/core-js": {
-      "version": "3.6.4",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
-      "integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/open": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/open/-/open-7.0.4.tgz",
-      "integrity": "sha512-brSA+/yq+b08Hsr4c8fsEW2CRzk1BmfN3SAK/5VCHQ9bdoZJ4qa/+AfR0xHjlbbZUyPkUHs1b8x1RqdyZdkVqQ==",
-      "dev": true,
-      "dependencies": {
-        "is-docker": "^2.0.0",
-        "is-wsl": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@angular-devkit/build-optimizer": {
-      "version": "0.1000.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.1000.8.tgz",
-      "integrity": "sha512-esODHuTGEEMx1SmLUq03VAMly8gZUd1vRuvZeKS5HqKwDg8ZzcI7/25BuuUSlyST+6BEdjo2gnmagQnG0VBdQw==",
-      "dev": true,
-      "dependencies": {
-        "loader-utils": "2.0.0",
-        "source-map": "0.7.3",
-        "tslib": "2.0.0",
-        "webpack-sources": "1.4.3"
-      },
-      "bin": {
-        "build-optimizer": "src/build-optimizer/cli.js"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@angular-devkit/build-optimizer/node_modules/tslib": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.0.tgz",
-      "integrity": "sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==",
-      "dev": true
-    },
-    "node_modules/@angular-devkit/build-webpack": {
-      "version": "0.1000.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1000.8.tgz",
-      "integrity": "sha512-y/U+dV5N8W7KECncGSKQWoUH/DFNZCseczyl6LAd8bc0fMr8Z0TAIe8OXj+5CSRRdejWfRIxGtNWM+L2kTCU8A==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/architect": "0.1000.8",
-        "@angular-devkit/core": "10.0.8",
-        "rxjs": "6.5.5"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
-        "yarn": ">= 1.13.0"
-      },
-      "peerDependencies": {
-        "webpack": "^4.6.0",
-        "webpack-dev-server": "^3.1.4"
-      }
-    },
-    "node_modules/@angular-devkit/build-webpack/node_modules/@angular-devkit/architect": {
-      "version": "0.1000.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1000.8.tgz",
-      "integrity": "sha512-2AqPbiEugtPxNz4MGhLh+imUVelhW9h1cdJs2AbxZosIxftPb5DNDQUSAwVmRGp4CtcXVrlvcDwc0f4Fw1aiIA==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/core": "10.0.8",
-        "rxjs": "6.5.5"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@angular-devkit/build-webpack/node_modules/@angular-devkit/core": {
-      "version": "10.0.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
-      "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "6.12.3",
-        "fast-json-stable-stringify": "2.1.0",
-        "magic-string": "0.25.7",
-        "rxjs": "6.5.5",
-        "source-map": "0.7.3"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@angular-devkit/build-webpack/node_modules/ajv": {
-      "version": "6.12.3",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/@angular-devkit/core": {
-      "version": "11.1.2",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.1.2.tgz",
-      "integrity": "sha512-V7zOMqL2l56JcwXVyswkG+7+t67r9XtkrVzRcG2Z5ZYwafU+iKWMwg5kBFZr1SX7fM1M9E4MpskxqtagQeUKng==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "ajv": "6.12.6",
-        "fast-json-stable-stringify": "2.1.0",
-        "magic-string": "0.25.7",
-        "rxjs": "6.6.3",
-        "source-map": "0.7.3"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@angular-devkit/core/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/@angular-devkit/core/node_modules/rxjs": {
-      "version": "6.6.3",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
-      "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "tslib": "^1.9.0"
-      },
-      "engines": {
-        "npm": ">=2.0.0"
-      }
-    },
-    "node_modules/@angular-devkit/core/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/@angular-devkit/schematics": {
-      "version": "10.0.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.0.8.tgz",
-      "integrity": "sha512-p2PjvrExuzOe/azyOEcBeIgwZIk4D6VeLkJf/KVjhXOVu13pjIXHX7/qWl+IYnbtj3NZGHqXM5Cr8nxsJNIMpw==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/core": "10.0.8",
-        "ora": "4.0.4",
-        "rxjs": "6.5.5"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@angular-devkit/schematics/node_modules/@angular-devkit/core": {
-      "version": "10.0.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
-      "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "6.12.3",
-        "fast-json-stable-stringify": "2.1.0",
-        "magic-string": "0.25.7",
-        "rxjs": "6.5.5",
-        "source-map": "0.7.3"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@angular-devkit/schematics/node_modules/ajv": {
-      "version": "6.12.3",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/@angular-eslint/builder": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-4.2.0.tgz",
-      "integrity": "sha512-qM4hpweuQ14ul8CU6LKpUWFZs6POUE7HZKdTllUrYuoZMrTpNB1XGelR0pweYzbfo4XRnUaO1NVgWhWOWiD5MA==",
-      "dev": true,
-      "peerDependencies": {
-        "@angular/cli": ">= 11.2.0 < 12.0.0",
-        "eslint": "*",
-        "typescript": "*"
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-4.2.0.tgz",
-      "integrity": "sha512-G8D8Pso6GcHW8vFkUSvgoKPIOtGTqO+eb5aytGtpogMgzxBRyr0juU/9Uz5dAhO6TOERIj1gPpJQ61R/n/Aaew==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/experimental-utils": "4.16.1"
-      },
-      "peerDependencies": {
-        "@angular/compiler": ">= 11.2.0 < 12.0.0",
-        "eslint": "*",
-        "typescript": "*"
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin-template": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-4.2.0.tgz",
-      "integrity": "sha512-LC8qqqqVmA/OJAsUt6fQCXLmWP5BL30XFvVsPtrORdxMFt0HI1gvkuz5EVak7PeAXEmerdVarNZr5zmCXIWf3g==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/experimental-utils": "4.16.1",
-        "aria-query": "^4.2.2",
-        "axobject-query": "^2.2.0"
-      },
-      "peerDependencies": {
-        "@angular-eslint/template-parser": "*",
-        "@angular/compiler": ">= 11.2.0 < 12.0.0",
-        "eslint": "*",
-        "typescript": "*"
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/experimental-utils": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.16.1.tgz",
-      "integrity": "sha512-0Hm3LSlMYFK17jO4iY3un1Ve9x1zLNn4EM50Lia+0EV99NdbK+cn0er7HC7IvBA23mBg3P+8dUkMXy4leL33UQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.3",
-        "@typescript-eslint/scope-manager": "4.16.1",
-        "@typescript-eslint/types": "4.16.1",
-        "@typescript-eslint/typescript-estree": "4.16.1",
-        "eslint-scope": "^5.0.0",
-        "eslint-utils": "^2.0.0"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "*"
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/scope-manager": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.16.1.tgz",
-      "integrity": "sha512-6IlZv9JaurqV0jkEg923cV49aAn8V6+1H1DRfhRcvZUrptQ+UtSKHb5kwTayzOYTJJ/RsYZdcvhOEKiBLyc0Cw==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "4.16.1",
-        "@typescript-eslint/visitor-keys": "4.16.1"
-      },
-      "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/types": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.16.1.tgz",
-      "integrity": "sha512-nnKqBwMgRlhzmJQF8tnFDZWfunXmJyuXj55xc8Kbfup4PbkzdoDXZvzN8//EiKR27J6vUSU8j4t37yUuYPiLqA==",
-      "dev": true,
-      "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.16.1.tgz",
-      "integrity": "sha512-m8I/DKHa8YbeHt31T+UGd/l8Kwr0XCTCZL3H4HMvvLCT7HU9V7yYdinTOv1gf/zfqNeDcCgaFH2BMsS8x6NvJg==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "4.16.1",
-        "@typescript-eslint/visitor-keys": "4.16.1",
-        "debug": "^4.1.1",
-        "globby": "^11.0.1",
-        "is-glob": "^4.0.1",
-        "semver": "^7.3.2",
-        "tsutils": "^3.17.1"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.16.1.tgz",
-      "integrity": "sha512-s/aIP1XcMkEqCNcPQtl60ogUYjSM8FU2mq1O7y5cFf3Xcob1z1iXWNB6cC43Op+NGRTFgGolri6s8z/efA9i1w==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "4.16.1",
-        "eslint-visitor-keys": "^2.0.0"
-      },
-      "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/experimental-utils": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.16.1.tgz",
-      "integrity": "sha512-0Hm3LSlMYFK17jO4iY3un1Ve9x1zLNn4EM50Lia+0EV99NdbK+cn0er7HC7IvBA23mBg3P+8dUkMXy4leL33UQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.3",
-        "@typescript-eslint/scope-manager": "4.16.1",
-        "@typescript-eslint/types": "4.16.1",
-        "@typescript-eslint/typescript-estree": "4.16.1",
-        "eslint-scope": "^5.0.0",
-        "eslint-utils": "^2.0.0"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "*"
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.16.1.tgz",
-      "integrity": "sha512-6IlZv9JaurqV0jkEg923cV49aAn8V6+1H1DRfhRcvZUrptQ+UtSKHb5kwTayzOYTJJ/RsYZdcvhOEKiBLyc0Cw==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "4.16.1",
-        "@typescript-eslint/visitor-keys": "4.16.1"
-      },
-      "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.16.1.tgz",
-      "integrity": "sha512-nnKqBwMgRlhzmJQF8tnFDZWfunXmJyuXj55xc8Kbfup4PbkzdoDXZvzN8//EiKR27J6vUSU8j4t37yUuYPiLqA==",
-      "dev": true,
-      "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.16.1.tgz",
-      "integrity": "sha512-m8I/DKHa8YbeHt31T+UGd/l8Kwr0XCTCZL3H4HMvvLCT7HU9V7yYdinTOv1gf/zfqNeDcCgaFH2BMsS8x6NvJg==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "4.16.1",
-        "@typescript-eslint/visitor-keys": "4.16.1",
-        "debug": "^4.1.1",
-        "globby": "^11.0.1",
-        "is-glob": "^4.0.1",
-        "semver": "^7.3.2",
-        "tsutils": "^3.17.1"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.16.1.tgz",
-      "integrity": "sha512-s/aIP1XcMkEqCNcPQtl60ogUYjSM8FU2mq1O7y5cFf3Xcob1z1iXWNB6cC43Op+NGRTFgGolri6s8z/efA9i1w==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "4.16.1",
-        "eslint-visitor-keys": "^2.0.0"
-      },
-      "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin/node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@angular-eslint/schematics": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-4.2.0.tgz",
-      "integrity": "sha512-aohGcfYUqN2hFLWaZoOqkLDyYVDFoLC3LwgIknoaDqWkvFG/RUTg1X1pCFjddLQYP5ist8+OppHH+gnYMbftEw==",
-      "dev": true,
-      "dependencies": {
-        "@angular-eslint/eslint-plugin": "4.2.0",
-        "@angular-eslint/eslint-plugin-template": "4.2.0",
-        "ignore": "5.1.8",
-        "strip-json-comments": "3.1.1",
-        "tmp": "0.2.1"
-      },
-      "peerDependencies": {
-        "@angular/cli": ">= 11.2.0 < 12.0.0"
-      }
-    },
-    "node_modules/@angular-eslint/schematics/node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@angular-eslint/template-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-4.2.0.tgz",
-      "integrity": "sha512-77lJ9MDNWmW4ik9l3g149iO9SGRx3qLGZvfSTwmbPxpCgNripWerla9Ia1X+gLkitI8CLpcpiZybxH3EWxj/qQ==",
-      "dev": true,
-      "dependencies": {
-        "eslint-scope": "^5.1.0"
-      },
-      "peerDependencies": {
-        "@angular/compiler": ">= 11.2.0 < 12.0.0",
-        "eslint": "*",
-        "typescript": "*"
-      }
-    },
-    "node_modules/@angular-eslint/template-parser/node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/@angular/animations": {
-      "version": "10.0.14",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-10.0.14.tgz",
-      "integrity": "sha512-0BOGQOuaudIG0pq6FAnG55teKM7tEQZdIwdoOf0okhh9n0cFWSWRUjvUxWt25bWswlO+HxELyJioiRUvVSES4g==",
-      "dependencies": {
-        "tslib": "^2.0.0"
-      },
-      "peerDependencies": {
-        "@angular/core": "10.0.14"
-      }
-    },
-    "node_modules/@angular/cli": {
-      "version": "10.0.8",
-      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-10.0.8.tgz",
-      "integrity": "sha512-unTteffLepsFw7qQulHOLLyLqCpQMOaZo0WO4x6cQGcW2mc0WgwnwBW2JDYMx1U2434t/Q13LqYMPNYWyCGsog==",
-      "dev": true,
-      "hasInstallScript": true,
-      "dependencies": {
-        "@angular-devkit/architect": "0.1000.8",
-        "@angular-devkit/core": "10.0.8",
-        "@angular-devkit/schematics": "10.0.8",
-        "@schematics/angular": "10.0.8",
-        "@schematics/update": "0.1000.8",
-        "@yarnpkg/lockfile": "1.1.0",
-        "ansi-colors": "4.1.1",
-        "debug": "4.1.1",
-        "ini": "1.3.5",
-        "inquirer": "7.1.0",
-        "npm-package-arg": "8.0.1",
-        "npm-pick-manifest": "6.1.0",
-        "open": "7.0.4",
-        "pacote": "9.5.12",
-        "read-package-tree": "5.3.1",
-        "rimraf": "3.0.2",
-        "semver": "7.3.2",
-        "symbol-observable": "1.2.0",
-        "universal-analytics": "0.4.20",
-        "uuid": "8.1.0"
-      },
-      "bin": {
-        "ng": "bin/ng"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/@angular-devkit/architect": {
-      "version": "0.1000.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1000.8.tgz",
-      "integrity": "sha512-2AqPbiEugtPxNz4MGhLh+imUVelhW9h1cdJs2AbxZosIxftPb5DNDQUSAwVmRGp4CtcXVrlvcDwc0f4Fw1aiIA==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/core": "10.0.8",
-        "rxjs": "6.5.5"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/@angular-devkit/core": {
-      "version": "10.0.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
-      "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "6.12.3",
-        "fast-json-stable-stringify": "2.1.0",
-        "magic-string": "0.25.7",
-        "rxjs": "6.5.5",
-        "source-map": "0.7.3"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/ajv": {
-      "version": "6.12.3",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/ansi-colors": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/ansi-escapes": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.11.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "dev": true,
-      "dependencies": {
-        "restore-cursor": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/debug": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/@angular/cli/node_modules/figures": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-      "dev": true,
-      "dependencies": {
-        "escape-string-regexp": "^1.0.5"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/inquirer": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz",
-      "integrity": "sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^3.0.0",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^2.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^3.0.0",
-        "lodash": "^4.17.15",
-        "mute-stream": "0.0.8",
-        "run-async": "^2.4.0",
-        "rxjs": "^6.5.3",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "through": "^2.3.6"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@angular/cli/node_modules/open": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/open/-/open-7.0.4.tgz",
-      "integrity": "sha512-brSA+/yq+b08Hsr4c8fsEW2CRzk1BmfN3SAK/5VCHQ9bdoZJ4qa/+AfR0xHjlbbZUyPkUHs1b8x1RqdyZdkVqQ==",
-      "dev": true,
-      "dependencies": {
-        "is-docker": "^2.0.0",
-        "is-wsl": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-      "dev": true,
-      "dependencies": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/string-width": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/type-fest": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-      "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/uuid": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.1.0.tgz",
-      "integrity": "sha512-CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg==",
-      "dev": true,
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
-    "node_modules/@angular/common": {
-      "version": "10.0.14",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-10.0.14.tgz",
-      "integrity": "sha512-EOAuaMt2HwJF3DtIJ/ksHtnF8Pqh5K2rWISYLEs9R3WNaSGn74kbCODAT4pNhI8P22Ykl3H4FmQUgnDZ3uDAUg==",
-      "dependencies": {
-        "tslib": "^2.0.0"
-      },
-      "peerDependencies": {
-        "@angular/core": "10.0.14",
-        "rxjs": "^6.5.3"
-      }
-    },
-    "node_modules/@angular/compiler": {
-      "version": "10.0.14",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-10.0.14.tgz",
-      "integrity": "sha512-lYNo6/MmnYAVFoDQDBB6HMFd9zHg3RHXc6hn+wchU0XSWiIsg6WYHbKOb/DyqUEyKebzy0gSKZf7gUeZHtj62Q==",
-      "dependencies": {
-        "tslib": "^2.0.0"
-      }
-    },
-    "node_modules/@angular/compiler-cli": {
-      "version": "10.0.14",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-10.0.14.tgz",
-      "integrity": "sha512-WK+S90sjc+3iMo8/CuuAX0RdGFwyA9esqqC5fYG/MDZjKuPuhogiimmR0rY3P1Th7B9di8x012xiILbf4GsGUQ==",
-      "dev": true,
-      "dependencies": {
-        "canonical-path": "1.0.0",
-        "chokidar": "^3.0.0",
-        "convert-source-map": "^1.5.1",
-        "dependency-graph": "^0.7.2",
-        "fs-extra": "4.0.2",
-        "magic-string": "^0.25.0",
-        "minimist": "^1.2.0",
-        "reflect-metadata": "^0.1.2",
-        "semver": "^6.3.0",
-        "source-map": "^0.6.1",
-        "sourcemap-codec": "^1.4.8",
-        "tslib": "^2.0.0",
-        "yargs": "15.3.0"
-      },
-      "bin": {
-        "ivy-ngcc": "ngcc/main-ivy-ngcc.js",
-        "ng-xi18n": "src/extract_i18n.js",
-        "ngc": "src/main.js",
-        "ngcc": "ngcc/main-ngcc.js"
-      },
-      "engines": {
-        "node": ">=10.0"
-      },
-      "peerDependencies": {
-        "@angular/compiler": "10.0.14",
-        "typescript": ">=3.9 <4.0"
-      }
-    },
-    "node_modules/@angular/compiler-cli/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@angular/compiler-cli/node_modules/cliui": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^6.2.0"
-      }
-    },
-    "node_modules/@angular/compiler-cli/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/@angular/compiler-cli/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@angular/compiler-cli/node_modules/fs-extra": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.2.tgz",
-      "integrity": "sha1-+RcExT0bRh+JNFKwwwfZmXZHq2s=",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
-      }
-    },
-    "node_modules/@angular/compiler-cli/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@angular/compiler-cli/node_modules/jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-      "dev": true,
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/@angular/compiler-cli/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@angular/compiler-cli/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@angular/compiler-cli/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@angular/compiler-cli/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@angular/compiler-cli/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/@angular/compiler-cli/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@angular/compiler-cli/node_modules/string-width": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@angular/compiler-cli/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@angular/compiler-cli/node_modules/universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
-    "node_modules/@angular/compiler-cli/node_modules/wrap-ansi": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@angular/compiler-cli/node_modules/yargs": {
-      "version": "15.3.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.0.tgz",
-      "integrity": "sha512-g/QCnmjgOl1YJjGsnUg2SatC7NUYEiLXJqxNOQU9qSpjzGtGXda9b+OKccr1kLTy8BN9yqEyqfq5lxlwdc13TA==",
-      "dev": true,
-      "dependencies": {
-        "cliui": "^6.0.0",
-        "decamelize": "^1.2.0",
-        "find-up": "^4.1.0",
-        "get-caller-file": "^2.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^4.2.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^18.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@angular/compiler-cli/node_modules/yargs-parser": {
-      "version": "18.1.3",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/@angular/core": {
-      "version": "10.0.14",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-10.0.14.tgz",
-      "integrity": "sha512-m+c9g6fA/gE+6K7It01b6r8TEmbuFjUZajQ9gG/pzist0mTBcqfvn0O4h5X+ebnSgw/bbnnp+4PbaXEi1pOWZQ==",
-      "dependencies": {
-        "tslib": "^2.0.0"
-      },
-      "peerDependencies": {
-        "rxjs": "^6.5.3",
-        "zone.js": "~0.10.3"
-      }
-    },
-    "node_modules/@angular/forms": {
-      "version": "10.0.14",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-10.0.14.tgz",
-      "integrity": "sha512-McKh3rXDlAE7qmCnyWKENb2HhqAT+1dsAfChuqs0w8jhKkoRgA00RDFee6dZ6XQCc907DwuV0K8+wC3CvBp35w==",
-      "dependencies": {
-        "tslib": "^2.0.0"
-      },
-      "peerDependencies": {
-        "@angular/common": "10.0.14",
-        "@angular/core": "10.0.14",
-        "@angular/platform-browser": "10.0.14",
-        "rxjs": "^6.5.3"
-      }
-    },
-    "node_modules/@angular/language-service": {
-      "version": "10.0.14",
-      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-10.0.14.tgz",
-      "integrity": "sha512-QQLYUjD0T6u2hLNYXUEUbupAGsz5egmhCAckaQojvXCe3SLL/hQsrK4odrNuspy7TvMB0H5ZNEHGlF6m/WLZ3g==",
-      "dev": true
-    },
-    "node_modules/@angular/platform-browser": {
-      "version": "10.0.14",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-10.0.14.tgz",
-      "integrity": "sha512-DcBZ1wt2TwtXrdcmCTWanAzu2Vxk5Uvioam0UcDxcgXD84T2fHipyfZVn07fMqRvzFQj45tDNAEevFBnGZar4w==",
-      "dependencies": {
-        "tslib": "^2.0.0"
-      },
-      "peerDependencies": {
-        "@angular/animations": "10.0.14",
-        "@angular/common": "10.0.14",
-        "@angular/core": "10.0.14"
-      },
-      "peerDependenciesMeta": {
-        "@angular/animations": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular/platform-browser-dynamic": {
-      "version": "10.0.14",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-10.0.14.tgz",
-      "integrity": "sha512-PPCAiNh/JSuQNKXOhj3a8CTFdVhTgF/EpGtaotnVr/BfbJMeFImKo7m2QQOTsAFaEP2DurSHnofPnMWAfHS2mg==",
-      "dependencies": {
-        "tslib": "^2.0.0"
-      },
-      "peerDependencies": {
-        "@angular/common": "10.0.14",
-        "@angular/compiler": "10.0.14",
-        "@angular/core": "10.0.14",
-        "@angular/platform-browser": "10.0.14"
-      }
-    },
-    "node_modules/@angular/router": {
-      "version": "10.0.14",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-10.0.14.tgz",
-      "integrity": "sha512-VWzaNyPZDY99TMszV1GlXJgVOxXsjhJrsv3mIcjaz1dfdlKOeKTVDLdnyXfP9CkwE3PRmvG7eSXppIj6nn9BpQ==",
-      "dependencies": {
-        "tslib": "^2.0.0"
-      },
-      "peerDependencies": {
-        "@angular/common": "10.0.14",
-        "@angular/core": "10.0.14",
-        "@angular/platform-browser": "10.0.14",
-        "rxjs": "^6.5.3"
-      }
-    },
-    "node_modules/@babel/code-frame": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-      "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.10.4"
-      }
-    },
-    "node_modules/@babel/compat-data": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.11.0.tgz",
-      "integrity": "sha512-TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.12.0",
-        "invariant": "^2.2.4",
-        "semver": "^5.5.0"
-      }
-    },
-    "node_modules/@babel/compat-data/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/@babel/core": {
-      "version": "7.9.6",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz",
-      "integrity": "sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.8.3",
-        "@babel/generator": "^7.9.6",
-        "@babel/helper-module-transforms": "^7.9.0",
-        "@babel/helpers": "^7.9.6",
-        "@babel/parser": "^7.9.6",
-        "@babel/template": "^7.8.6",
-        "@babel/traverse": "^7.9.6",
-        "@babel/types": "^7.9.6",
-        "convert-source-map": "^1.7.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.1",
-        "json5": "^2.1.2",
-        "lodash": "^4.17.13",
-        "resolve": "^1.3.2",
-        "semver": "^5.4.1",
-        "source-map": "^0.5.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
-      }
-    },
-    "node_modules/@babel/core/node_modules/debug": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
-      "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
-      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@babel/core/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@babel/core/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/@babel/core/node_modules/source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@babel/generator": {
-      "version": "7.9.6",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz",
-      "integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.9.6",
-        "jsesc": "^2.5.1",
-        "lodash": "^4.17.13",
-        "source-map": "^0.5.0"
-      }
-    },
-    "node_modules/@babel/generator/node_modules/source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz",
-      "integrity": "sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.10.4"
-      }
-    },
-    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz",
-      "integrity": "sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-explode-assignable-expression": "^7.10.4",
-        "@babel/types": "^7.10.4"
-      }
-    },
-    "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz",
-      "integrity": "sha512-a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.10.4",
-        "browserslist": "^4.12.0",
-        "invariant": "^2.2.4",
-        "levenary": "^1.1.1",
-        "semver": "^5.5.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz",
-      "integrity": "sha512-2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.10.4",
-        "@babel/helper-regex": "^7.10.4",
-        "regexpu-core": "^4.7.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-define-map": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz",
-      "integrity": "sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-function-name": "^7.10.4",
-        "@babel/types": "^7.10.5",
-        "lodash": "^4.17.19"
-      }
-    },
-    "node_modules/@babel/helper-explode-assignable-expression": {
-      "version": "7.11.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz",
-      "integrity": "sha512-ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.10.4"
-      }
-    },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
-      "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-get-function-arity": "^7.10.4",
-        "@babel/template": "^7.10.4",
-        "@babel/types": "^7.10.4"
-      }
-    },
-    "node_modules/@babel/helper-function-name/node_modules/@babel/template": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/parser": "^7.10.4",
-        "@babel/types": "^7.10.4"
-      }
-    },
-    "node_modules/@babel/helper-get-function-arity": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
-      "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.10.4"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz",
-      "integrity": "sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.10.4"
-      }
-    },
-    "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
-      "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.11.0"
-      }
-    },
-    "node_modules/@babel/helper-module-imports": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz",
-      "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.10.4"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz",
-      "integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.10.4",
-        "@babel/helper-replace-supers": "^7.10.4",
-        "@babel/helper-simple-access": "^7.10.4",
-        "@babel/helper-split-export-declaration": "^7.11.0",
-        "@babel/template": "^7.10.4",
-        "@babel/types": "^7.11.0",
-        "lodash": "^4.17.19"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms/node_modules/@babel/template": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/parser": "^7.10.4",
-        "@babel/types": "^7.10.4"
-      }
-    },
-    "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz",
-      "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.10.4"
-      }
-    },
-    "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-      "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-regex": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.5.tgz",
-      "integrity": "sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==",
-      "dev": true,
-      "dependencies": {
-        "lodash": "^4.17.19"
-      }
-    },
-    "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.11.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz",
-      "integrity": "sha512-tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.10.4",
-        "@babel/helper-wrap-function": "^7.10.4",
-        "@babel/template": "^7.10.4",
-        "@babel/types": "^7.10.4"
-      }
-    },
-    "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/template": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/parser": "^7.10.4",
-        "@babel/types": "^7.10.4"
-      }
-    },
-    "node_modules/@babel/helper-replace-supers": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
-      "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-member-expression-to-functions": "^7.10.4",
-        "@babel/helper-optimise-call-expression": "^7.10.4",
-        "@babel/traverse": "^7.10.4",
-        "@babel/types": "^7.10.4"
-      }
-    },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz",
-      "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.10.4",
-        "@babel/types": "^7.10.4"
-      }
-    },
-    "node_modules/@babel/helper-simple-access/node_modules/@babel/template": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/parser": "^7.10.4",
-        "@babel/types": "^7.10.4"
-      }
-    },
-    "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz",
-      "integrity": "sha512-0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.11.0"
-      }
-    },
-    "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
-      "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.11.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
-      "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-wrap-function": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz",
-      "integrity": "sha512-6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-function-name": "^7.10.4",
-        "@babel/template": "^7.10.4",
-        "@babel/traverse": "^7.10.4",
-        "@babel/types": "^7.10.4"
-      }
-    },
-    "node_modules/@babel/helper-wrap-function/node_modules/@babel/template": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/parser": "^7.10.4",
-        "@babel/types": "^7.10.4"
-      }
-    },
-    "node_modules/@babel/helpers": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.4.tgz",
-      "integrity": "sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.10.4",
-        "@babel/traverse": "^7.10.4",
-        "@babel/types": "^7.10.4"
-      }
-    },
-    "node_modules/@babel/helpers/node_modules/@babel/template": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/parser": "^7.10.4",
-        "@babel/types": "^7.10.4"
-      }
-    },
-    "node_modules/@babel/highlight": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-      "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.10.4",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/@babel/highlight/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/parser": {
-      "version": "7.11.5",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
-      "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
-      "dev": true,
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz",
-      "integrity": "sha512-cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-remap-async-to-generator": "^7.10.4",
-        "@babel/plugin-syntax-async-generators": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-dynamic-import": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz",
-      "integrity": "sha512-up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-json-strings": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz",
-      "integrity": "sha512-fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/plugin-syntax-json-strings": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz",
-      "integrity": "sha512-wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-numeric-separator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz",
-      "integrity": "sha512-73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz",
-      "integrity": "sha512-wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-        "@babel/plugin-transform-parameters": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz",
-      "integrity": "sha512-LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-optional-chaining": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz",
-      "integrity": "sha512-v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz",
-      "integrity": "sha512-H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-async-generators": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-bigint": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
-      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-class-properties": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz",
-      "integrity": "sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-dynamic-import": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
-      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-import-meta": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
-      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-json-strings": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-numeric-separator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-object-rest-spread": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-optional-chaining": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-top-level-await": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz",
-      "integrity": "sha512-ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz",
-      "integrity": "sha512-9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz",
-      "integrity": "sha512-F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-remap-async-to-generator": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz",
-      "integrity": "sha512-WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.11.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz",
-      "integrity": "sha512-00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz",
-      "integrity": "sha512-2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.10.4",
-        "@babel/helper-define-map": "^7.10.4",
-        "@babel/helper-function-name": "^7.10.4",
-        "@babel/helper-optimise-call-expression": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-replace-supers": "^7.10.4",
-        "@babel/helper-split-export-declaration": "^7.10.4",
-        "globals": "^11.1.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz",
-      "integrity": "sha512-JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz",
-      "integrity": "sha512-+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz",
-      "integrity": "sha512-ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz",
-      "integrity": "sha512-GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz",
-      "integrity": "sha512-S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz",
-      "integrity": "sha512-ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz",
-      "integrity": "sha512-OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-function-name": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz",
-      "integrity": "sha512-Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz",
-      "integrity": "sha512-0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz",
-      "integrity": "sha512-elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-transforms": "^7.10.5",
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz",
-      "integrity": "sha512-Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-transforms": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-simple-access": "^7.10.4",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz",
-      "integrity": "sha512-f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-hoist-variables": "^7.10.4",
-        "@babel/helper-module-transforms": "^7.10.5",
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz",
-      "integrity": "sha512-mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-transforms": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz",
-      "integrity": "sha512-V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz",
-      "integrity": "sha512-YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz",
-      "integrity": "sha512-5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-replace-supers": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz",
-      "integrity": "sha512-xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-get-function-arity": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz",
-      "integrity": "sha512-ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz",
-      "integrity": "sha512-3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw==",
-      "dev": true,
-      "dependencies": {
-        "regenerator-transform": "^0.14.2"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz",
-      "integrity": "sha512-hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-runtime": {
-      "version": "7.9.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.6.tgz",
-      "integrity": "sha512-qcmiECD0mYOjOIt8YHNsAP1SxPooC/rDmfmiSK9BNY72EitdSc7l44WTEklaWuFtbOEBjNhWWyph/kOImbNJ4w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "resolve": "^1.8.1",
-        "semver": "^5.5.1"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-runtime/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz",
-      "integrity": "sha512-AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz",
-      "integrity": "sha512-UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz",
-      "integrity": "sha512-Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-regex": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz",
-      "integrity": "sha512-V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz",
-      "integrity": "sha512-QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz",
-      "integrity": "sha512-wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/preset-env": {
-      "version": "7.9.6",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.6.tgz",
-      "integrity": "sha512-0gQJ9RTzO0heXOhzftog+a/WyOuqMrAIugVYxMYf83gh1CQaQDjMtsOpqOwXyDL/5JcWsrCm8l4ju8QC97O7EQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.9.6",
-        "@babel/helper-compilation-targets": "^7.9.6",
-        "@babel/helper-module-imports": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/plugin-proposal-async-generator-functions": "^7.8.3",
-        "@babel/plugin-proposal-dynamic-import": "^7.8.3",
-        "@babel/plugin-proposal-json-strings": "^7.8.3",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-proposal-numeric-separator": "^7.8.3",
-        "@babel/plugin-proposal-object-rest-spread": "^7.9.6",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-proposal-optional-chaining": "^7.9.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.8.3",
-        "@babel/plugin-syntax-async-generators": "^7.8.0",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.0",
-        "@babel/plugin-syntax-json-strings": "^7.8.0",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0",
-        "@babel/plugin-syntax-numeric-separator": "^7.8.0",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.0",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.0",
-        "@babel/plugin-syntax-top-level-await": "^7.8.3",
-        "@babel/plugin-transform-arrow-functions": "^7.8.3",
-        "@babel/plugin-transform-async-to-generator": "^7.8.3",
-        "@babel/plugin-transform-block-scoped-functions": "^7.8.3",
-        "@babel/plugin-transform-block-scoping": "^7.8.3",
-        "@babel/plugin-transform-classes": "^7.9.5",
-        "@babel/plugin-transform-computed-properties": "^7.8.3",
-        "@babel/plugin-transform-destructuring": "^7.9.5",
-        "@babel/plugin-transform-dotall-regex": "^7.8.3",
-        "@babel/plugin-transform-duplicate-keys": "^7.8.3",
-        "@babel/plugin-transform-exponentiation-operator": "^7.8.3",
-        "@babel/plugin-transform-for-of": "^7.9.0",
-        "@babel/plugin-transform-function-name": "^7.8.3",
-        "@babel/plugin-transform-literals": "^7.8.3",
-        "@babel/plugin-transform-member-expression-literals": "^7.8.3",
-        "@babel/plugin-transform-modules-amd": "^7.9.6",
-        "@babel/plugin-transform-modules-commonjs": "^7.9.6",
-        "@babel/plugin-transform-modules-systemjs": "^7.9.6",
-        "@babel/plugin-transform-modules-umd": "^7.9.0",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.8.3",
-        "@babel/plugin-transform-new-target": "^7.8.3",
-        "@babel/plugin-transform-object-super": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.9.5",
-        "@babel/plugin-transform-property-literals": "^7.8.3",
-        "@babel/plugin-transform-regenerator": "^7.8.7",
-        "@babel/plugin-transform-reserved-words": "^7.8.3",
-        "@babel/plugin-transform-shorthand-properties": "^7.8.3",
-        "@babel/plugin-transform-spread": "^7.8.3",
-        "@babel/plugin-transform-sticky-regex": "^7.8.3",
-        "@babel/plugin-transform-template-literals": "^7.8.3",
-        "@babel/plugin-transform-typeof-symbol": "^7.8.4",
-        "@babel/plugin-transform-unicode-regex": "^7.8.3",
-        "@babel/preset-modules": "^0.1.3",
-        "@babel/types": "^7.9.6",
-        "browserslist": "^4.11.1",
-        "core-js-compat": "^3.6.2",
-        "invariant": "^2.2.2",
-        "levenary": "^1.1.1",
-        "semver": "^5.5.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/preset-env/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/@babel/preset-modules": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz",
-      "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
-        "@babel/plugin-transform-dotall-regex": "^7.4.4",
-        "@babel/types": "^7.4.4",
-        "esutils": "^2.0.2"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/runtime": {
-      "version": "7.9.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz",
-      "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==",
-      "dev": true,
-      "dependencies": {
-        "regenerator-runtime": "^0.13.4"
-      }
-    },
-    "node_modules/@babel/runtime-corejs3": {
-      "version": "7.13.17",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.13.17.tgz",
-      "integrity": "sha512-RGXINY1YvduBlGrP+vHjJqd/nK7JVpfM4rmZLGMx77WoL3sMrhheA0qxii9VNn1VHnxJLEyxmvCB+Wqc+x/FMw==",
-      "dev": true,
-      "dependencies": {
-        "core-js-pure": "^3.0.0",
-        "regenerator-runtime": "^0.13.4"
-      }
-    },
-    "node_modules/@babel/template": {
-      "version": "7.8.6",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
-      "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.8.3",
-        "@babel/parser": "^7.8.6",
-        "@babel/types": "^7.8.6"
-      }
-    },
-    "node_modules/@babel/traverse": {
-      "version": "7.11.5",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
-      "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/generator": "^7.11.5",
-        "@babel/helper-function-name": "^7.10.4",
-        "@babel/helper-split-export-declaration": "^7.11.0",
-        "@babel/parser": "^7.11.5",
-        "@babel/types": "^7.11.5",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.19"
-      }
-    },
-    "node_modules/@babel/traverse/node_modules/@babel/generator": {
-      "version": "7.11.6",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
-      "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.11.5",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
-      }
-    },
-    "node_modules/@babel/traverse/node_modules/debug": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
-      "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
-      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@babel/traverse/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@babel/traverse/node_modules/source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@babel/types": {
-      "version": "7.11.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-      "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.10.4",
-        "lodash": "^4.17.19",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "node_modules/@bcoe/v8-coverage": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
-      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
-      "dev": true
-    },
-    "node_modules/@cnakazawa/watch": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz",
-      "integrity": "sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==",
-      "dev": true,
-      "dependencies": {
-        "exec-sh": "^0.3.2",
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "watch": "cli.js"
-      },
-      "engines": {
-        "node": ">=0.1.95"
-      }
-    },
-    "node_modules/@eslint/eslintrc": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.0.tgz",
-      "integrity": "sha512-2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.12.4",
-        "debug": "^4.1.1",
-        "espree": "^7.3.0",
-        "globals": "^12.1.0",
-        "ignore": "^4.0.6",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^3.13.1",
-        "minimatch": "^3.0.4",
-        "strip-json-comments": "^3.1.1"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/@eslint/eslintrc/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "12.4.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
-      "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.8.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@eslint/eslintrc/node_modules/ignore": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/@eslint/eslintrc/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@eslint/eslintrc/node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@ionic-native/badge": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/badge/-/badge-5.33.0.tgz",
-      "integrity": "sha512-g/E2HLB53csZq5hWeyWUFj6r7CrllSPuOkV88XotIFTQFNuY7TaLtiFUVFSvWXRh0Kvu+w7TI5Hys67d/v7F/g==",
-      "dependencies": {
-        "@types/cordova": "latest"
-      },
-      "peerDependencies": {
-        "@ionic-native/core": "^5.1.0",
-        "rxjs": "^5.5.0 || ^6.5.0"
-      }
-    },
-    "node_modules/@ionic-native/badge/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
-    "node_modules/@ionic-native/camera": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/camera/-/camera-5.33.0.tgz",
-      "integrity": "sha512-cLAxM4e8IrTECvlszyUe9FnUjE4PbWR99NNDwkOuB85yJ3diyKxiQhHu89Qh9A6qzHTJQLa93iknY2Q40VM/5Q==",
-      "dependencies": {
-        "@types/cordova": "latest"
-      },
-      "peerDependencies": {
-        "@ionic-native/core": "^5.1.0",
-        "rxjs": "^5.5.0 || ^6.5.0"
-      }
-    },
-    "node_modules/@ionic-native/camera/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
-    "node_modules/@ionic-native/chooser": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/chooser/-/chooser-5.33.0.tgz",
-      "integrity": "sha512-hz2OtB8UsJpKdXZByDzGS6+U1FK8toIjKmIVCDQAuOXxjbw9dU2Ef+MSUKXOpK6MYnP56oP80JdSX9LDEFJnRA==",
-      "dependencies": {
-        "@types/cordova": "latest"
-      },
-      "peerDependencies": {
-        "@ionic-native/core": "^5.1.0",
-        "rxjs": "^5.5.0 || ^6.5.0"
-      }
-    },
-    "node_modules/@ionic-native/chooser/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
-    "node_modules/@ionic-native/clipboard": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/clipboard/-/clipboard-5.33.0.tgz",
-      "integrity": "sha512-HFZN4tsAjFJ9Se9ik0/IOUvApL4zNPEKQAtUsjqP7vCnTsdrgS+FDMln1UDEKXCQ/dEEwU1N1ndFmPBGxjkGzQ==",
-      "dependencies": {
-        "@types/cordova": "latest"
-      },
-      "peerDependencies": {
-        "@ionic-native/core": "^5.1.0",
-        "rxjs": "^5.5.0 || ^6.5.0"
-      }
-    },
-    "node_modules/@ionic-native/clipboard/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
-    "node_modules/@ionic-native/core": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/core/-/core-5.33.0.tgz",
-      "integrity": "sha512-dnZHu7SadvQvliGJPndk2ohdoPvwiyBWJjsJw33BKyhadnmLlmkYKkRgPPI+i22BZofDKq4YiAfIIqhvfHU6gw==",
-      "dependencies": {
-        "@types/cordova": "latest"
-      },
-      "peerDependencies": {
-        "rxjs": "^5.5.0 || ^6.5.0"
-      }
-    },
-    "node_modules/@ionic-native/core/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
-    "node_modules/@ionic-native/device": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/device/-/device-5.33.0.tgz",
-      "integrity": "sha512-KYQvVsN98bGTEomI193Jf9r1vaXBFJQXuhkhwBI6lajynAlf2SIVJwthNUXnK43kNXy1cOelYxScUuKyPwqudw==",
-      "dependencies": {
-        "@types/cordova": "latest"
-      },
-      "peerDependencies": {
-        "@ionic-native/core": "^5.1.0",
-        "rxjs": "^5.5.0 || ^6.5.0"
-      }
-    },
-    "node_modules/@ionic-native/device/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
-    "node_modules/@ionic-native/diagnostic": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/diagnostic/-/diagnostic-5.33.0.tgz",
-      "integrity": "sha512-zBDv/yNMvUkXfxy17rgrGVU3+XKREXRI7cqy/DyvpjdomOnmx2pnFvhszgMEgeD03LkXXKiFOR5yUAVNgYirmg==",
-      "dependencies": {
-        "@types/cordova": "latest"
-      },
-      "peerDependencies": {
-        "@ionic-native/core": "^5.1.0",
-        "rxjs": "^5.5.0 || ^6.5.0"
-      }
-    },
-    "node_modules/@ionic-native/diagnostic/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
-    "node_modules/@ionic-native/file": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/file/-/file-5.33.0.tgz",
-      "integrity": "sha512-RisSGJl2t8JrBgw30Vn5hJYYKEDTHR9f3KbQDfe1MQg+VrZo7vnbml/vk4l55u65c1TYZDH+F6i7s9nyif1QVQ==",
-      "dependencies": {
-        "@types/cordova": "latest"
-      },
-      "peerDependencies": {
-        "@ionic-native/core": "^5.1.0",
-        "rxjs": "^5.5.0 || ^6.5.0"
-      }
-    },
-    "node_modules/@ionic-native/file-opener": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/file-opener/-/file-opener-5.33.0.tgz",
-      "integrity": "sha512-v7t1ndalAPYT9gvMAhxAup8tg1NPV415cfG6tzs1foPFP91UZC3MQny0tup8AgFivugT1GRdoSk1NMuK1jy8Cw==",
-      "dependencies": {
-        "@types/cordova": "latest"
-      },
-      "peerDependencies": {
-        "@ionic-native/core": "^5.1.0",
-        "rxjs": "^5.5.0 || ^6.5.0"
-      }
-    },
-    "node_modules/@ionic-native/file-opener/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
-    "node_modules/@ionic-native/file-transfer": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/file-transfer/-/file-transfer-5.33.0.tgz",
-      "integrity": "sha512-xDUpdJVgTBP6aEiU08iZ/pa9aMoGSMB9391dQKk+VSDs0hdbIwk+Cx4V40GIE4QF3TI06sUMdKXD2sIhVsr2QA==",
-      "dependencies": {
-        "@types/cordova": "latest"
-      },
-      "peerDependencies": {
-        "@ionic-native/core": "^5.1.0",
-        "rxjs": "^5.5.0 || ^6.5.0"
-      }
-    },
-    "node_modules/@ionic-native/file-transfer/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
-    "node_modules/@ionic-native/file/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
-    "node_modules/@ionic-native/geolocation": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/geolocation/-/geolocation-5.33.0.tgz",
-      "integrity": "sha512-oE6pi6l8/Wsv94vpJmPlPqE1LheP6cQTJrC78WYQp9WVDOOCGZnFznNoH8BlQfnfjuDx/kUARxzEJBO/gbUg1A==",
-      "dependencies": {
-        "@types/cordova": "latest"
-      },
-      "peerDependencies": {
-        "@ionic-native/core": "^5.1.0",
-        "rxjs": "^5.5.0 || ^6.5.0"
-      }
-    },
-    "node_modules/@ionic-native/geolocation/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
-    "node_modules/@ionic-native/http": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/http/-/http-5.33.0.tgz",
-      "integrity": "sha512-dqcPu3igSLlfDUK8Mvma/6o6aq7WtKBlcR8xXwE8tVsO/r4fEB6NevLLN4S4zCr381Jy+RxIIjn3CZx5XHF6JQ==",
-      "dependencies": {
-        "@types/cordova": "latest"
-      },
-      "peerDependencies": {
-        "@ionic-native/core": "^5.1.0",
-        "rxjs": "^5.5.0 || ^6.5.0"
-      }
-    },
-    "node_modules/@ionic-native/http/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
-    "node_modules/@ionic-native/in-app-browser": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/in-app-browser/-/in-app-browser-5.33.0.tgz",
-      "integrity": "sha512-GGIvnYHf8FgaIae9yfRzxqxj0ZAxrYhOJpsHVSq1YKjxnDpRe6ImWWaHHfaeXE5IdUUMUXVuf75VTSBN00VBvA==",
-      "dependencies": {
-        "@types/cordova": "latest"
-      },
-      "peerDependencies": {
-        "@ionic-native/core": "^5.1.0",
-        "rxjs": "^5.5.0 || ^6.5.0"
-      }
-    },
-    "node_modules/@ionic-native/in-app-browser/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
-    "node_modules/@ionic-native/ionic-webview": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/ionic-webview/-/ionic-webview-5.33.0.tgz",
-      "integrity": "sha512-Jbr4M6z/Fya51F+QXuPLm/crFlZ9T6YvRM1cygGmFwZ7SgDAimYnjgSO8SEGJmvO2ZekYmFuF56qiVPSvx2wUA==",
-      "dependencies": {
-        "@types/cordova": "latest"
-      },
-      "peerDependencies": {
-        "@ionic-native/core": "^5.1.0",
-        "rxjs": "^5.5.0 || ^6.5.0"
-      }
-    },
-    "node_modules/@ionic-native/ionic-webview/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
-    "node_modules/@ionic-native/keyboard": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/keyboard/-/keyboard-5.33.0.tgz",
-      "integrity": "sha512-TIYU3LC+Yz/pcpBuHcxLThMNuN9y1E1wBu4SlmS6VlO3/D3R3At2WOg2UK3iA66G2kTJubed5haqTYZjeoA6Uw==",
-      "dependencies": {
-        "@types/cordova": "latest"
-      },
-      "peerDependencies": {
-        "@ionic-native/core": "^5.1.0",
-        "rxjs": "^5.5.0 || ^6.5.0"
-      }
-    },
-    "node_modules/@ionic-native/keyboard/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
-    "node_modules/@ionic-native/local-notifications": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/local-notifications/-/local-notifications-5.33.0.tgz",
-      "integrity": "sha512-ljn2uq0rFWpjG1I1qK+mPVX8T3T+09fsF8sZ9nK7uvD9YWShCVz2e2ctf8qPRFq+TWDeDqlnwXz3wCvWmbBUWw==",
-      "dependencies": {
-        "@types/cordova": "latest"
-      },
-      "peerDependencies": {
-        "@ionic-native/core": "^5.1.0",
-        "rxjs": "^5.5.0 || ^6.5.0"
-      }
-    },
-    "node_modules/@ionic-native/local-notifications/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
-    "node_modules/@ionic-native/media": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/media/-/media-5.33.0.tgz",
-      "integrity": "sha512-nUu7/FSH41j9+BqHXYVMBd3EifNsTNOufD3NEiMVpHVDWLWqG7tG5h5cFlsVACxUaP4kNpSEke2mjom6CKyjxQ==",
-      "dependencies": {
-        "@types/cordova": "latest"
-      },
-      "peerDependencies": {
-        "@ionic-native/core": "^5.1.0",
-        "rxjs": "^5.5.0 || ^6.5.0"
-      }
-    },
-    "node_modules/@ionic-native/media-capture": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/media-capture/-/media-capture-5.33.0.tgz",
-      "integrity": "sha512-aQTnonVSeijpuZ9B7oYJCjIDqgFVhNdvqkx9vUoaO359BtJGpGS1rNPjEovt4DsqV7oe7TkbmBd8DMEwnB3A2g==",
-      "dependencies": {
-        "@types/cordova": "latest"
-      },
-      "peerDependencies": {
-        "@ionic-native/core": "^5.1.0",
-        "rxjs": "^5.5.0 || ^6.5.0"
-      }
-    },
-    "node_modules/@ionic-native/media-capture/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
-    "node_modules/@ionic-native/media/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
-    "node_modules/@ionic-native/network": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/network/-/network-5.33.0.tgz",
-      "integrity": "sha512-J+3+rbDTMVNUspa/nV+P8a0hFKDicJK1rVIrm5aLBQdmN9n7WaqJmeMYTptyWOnZxQpktJAJDdhJTEvVmKQjjw==",
-      "dependencies": {
-        "@types/cordova": "latest"
-      },
-      "peerDependencies": {
-        "@ionic-native/core": "^5.1.0",
-        "rxjs": "^5.5.0 || ^6.5.0"
-      }
-    },
-    "node_modules/@ionic-native/network/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
-    "node_modules/@ionic-native/push": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/push/-/push-5.33.0.tgz",
-      "integrity": "sha512-H4gOkMbOaNvi97cKKJDggWvAR1BVCUbtdLyWInA0q3cZBHWSc6KcRJGz+hcdDndCQJUnHofs1Tpw8LN3zhjYyQ==",
-      "dependencies": {
-        "@types/cordova": "latest"
-      },
-      "peerDependencies": {
-        "@ionic-native/core": "^5.1.0",
-        "rxjs": "^5.5.0 || ^6.5.0"
-      }
-    },
-    "node_modules/@ionic-native/push/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
-    "node_modules/@ionic-native/qr-scanner": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/qr-scanner/-/qr-scanner-5.33.0.tgz",
-      "integrity": "sha512-cyiQv0Rje/fN9/JYoDXP1+ILJkRkjvPtoSx4vd2FsKAuJB60U2DpQfmVEE/KMF4iceTpx4MK/kGzr2WE2AYnIg==",
-      "dependencies": {
-        "@types/cordova": "latest"
-      },
-      "peerDependencies": {
-        "@ionic-native/core": "^5.1.0",
-        "rxjs": "^5.5.0 || ^6.5.0"
-      }
-    },
-    "node_modules/@ionic-native/qr-scanner/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
-    "node_modules/@ionic-native/splash-screen": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-5.33.0.tgz",
-      "integrity": "sha512-6PHk5WJeUoc3zru6wTvUmd9DCASvRQoQq1dysYI3JCECaAJ6X0x1RbzM8dBFs3JPLfWtDn+P8eTp+KaA0Xf58w==",
-      "dependencies": {
-        "@types/cordova": "latest"
-      },
-      "peerDependencies": {
-        "@ionic-native/core": "^5.1.0",
-        "rxjs": "^5.5.0 || ^6.5.0"
-      }
-    },
-    "node_modules/@ionic-native/splash-screen/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
-    "node_modules/@ionic-native/sqlite": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/sqlite/-/sqlite-5.33.0.tgz",
-      "integrity": "sha512-JIdQJr6bcksotF/3ZMJQZo9lHgaHXvHOOK9R30mM/5Ds5fFu+rUoUf0wvyqaGzEFu94pGw2uPGnfD+WI7x7+1A==",
-      "dependencies": {
-        "@types/cordova": "latest"
-      },
-      "peerDependencies": {
-        "@ionic-native/core": "^5.1.0",
-        "rxjs": "^5.5.0 || ^6.5.0"
-      }
-    },
-    "node_modules/@ionic-native/sqlite/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
-    "node_modules/@ionic-native/status-bar": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/status-bar/-/status-bar-5.33.0.tgz",
-      "integrity": "sha512-cnyfd42N9gGfhyDtF7wbWoacKg/jfsoJQHOHltfhS4/EjxsVu4bjkwq1YBLMcMY3OIqFDSn2aFcejHn8wVNkDQ==",
-      "dependencies": {
-        "@types/cordova": "latest"
-      },
-      "peerDependencies": {
-        "@ionic-native/core": "^5.1.0",
-        "rxjs": "^5.5.0 || ^6.5.0"
-      }
-    },
-    "node_modules/@ionic-native/status-bar/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
-    "node_modules/@ionic-native/web-intent": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/web-intent/-/web-intent-5.33.0.tgz",
-      "integrity": "sha512-3CIAofrg9nkJQbSftFdMKYOduXy9Ra/a1Q0it6ysm9NFeAQn7iZPThSexBeZ9xiKKj/QTPZtnqAJ0MQ+4mkGag==",
-      "dependencies": {
-        "@types/cordova": "latest"
-      },
-      "peerDependencies": {
-        "@ionic-native/core": "^5.1.0",
-        "rxjs": "^5.5.0 || ^6.5.0"
-      }
-    },
-    "node_modules/@ionic-native/web-intent/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
-    "node_modules/@ionic-native/zip": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/zip/-/zip-5.33.0.tgz",
-      "integrity": "sha512-hErISQ6/xqVErmVnnha5BR+3GWRNQIVfMTXzprEpNZxQl3iDe1UTIVQdFnMd3Nasz/naY+61Vq/y91PZ1Rrajw==",
-      "dependencies": {
-        "@types/cordova": "latest"
-      },
-      "peerDependencies": {
-        "@ionic-native/core": "^5.1.0",
-        "rxjs": "^5.5.0 || ^6.5.0"
-      }
-    },
-    "node_modules/@ionic-native/zip/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
-    "node_modules/@ionic/angular": {
-      "version": "5.6.6",
-      "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-5.6.6.tgz",
-      "integrity": "sha512-0psh2n4Y/3sx0e2Yj4WmNcukz0nrETEiJE6Fl4CldoB8QHZcXGi0hKrPAcbGSAF0+lAJ58+Z5Gp/HQVm/MQOMA==",
-      "dependencies": {
-        "@ionic/core": "5.6.6",
-        "tslib": "^1.9.3"
-      },
-      "peerDependencies": {
-        "@angular/core": ">=8.2.7",
-        "@angular/forms": ">=8.2.7",
-        "@angular/router": ">=8.2.7",
-        "rxjs": ">=6.2.0",
-        "zone.js": ">=0.8.26"
-      }
-    },
-    "node_modules/@ionic/angular-toolkit": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/@ionic/angular-toolkit/-/angular-toolkit-2.3.3.tgz",
-      "integrity": "sha512-r87mApDLWbLaUtd5LvNHrRlZWxjQhaBBM1yPlk9M98dHOxcX3jy7kv60ZurGZutuvbhXISGvHcvvR90yywDC1A==",
-      "dev": true,
-      "dependencies": {
-        "@schematics/angular": ">=8.0.0",
-        "cheerio": "1.0.0-rc.3",
-        "colorette": "1.1.0",
-        "copy-webpack-plugin": "^6.0.3",
-        "tslib": "^1.9.0",
-        "ws": "^7.0.1"
-      },
-      "peerDependencies": {
-        "@angular-devkit/architect": ">=0.800.0",
-        "@angular-devkit/build-angular": ">=0.800.0",
-        "@angular-devkit/core": ">=8.0.0",
-        "@angular-devkit/schematics": ">=8.0.0"
-      }
-    },
-    "node_modules/@ionic/angular-toolkit/node_modules/tslib": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
-      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
-      "dev": true
-    },
-    "node_modules/@ionic/angular-toolkit/node_modules/ws": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz",
-      "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.3.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@ionic/angular/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-    },
-    "node_modules/@ionic/cli": {
-      "version": "6.14.1",
-      "resolved": "https://registry.npmjs.org/@ionic/cli/-/cli-6.14.1.tgz",
-      "integrity": "sha512-QGmA5hjW4PvS8o0f+ptJ2bOknu4dPKzlECFApBiR7ayDgGTDMwmbxrtNpRhDnjdsVlMAzWq8eo9l76831+DBjQ==",
-      "dev": true,
-      "dependencies": {
-        "@ionic/cli-framework": "5.1.0",
-        "@ionic/cli-framework-output": "2.2.2",
-        "@ionic/cli-framework-prompts": "2.1.8",
-        "@ionic/utils-array": "2.1.5",
-        "@ionic/utils-fs": "3.1.5",
-        "@ionic/utils-network": "2.1.5",
-        "@ionic/utils-process": "2.1.8",
-        "@ionic/utils-stream": "3.1.5",
-        "@ionic/utils-subprocess": "2.1.8",
-        "@ionic/utils-terminal": "2.3.1",
-        "chalk": "^4.0.0",
-        "debug": "^4.0.0",
-        "diff": "^4.0.1",
-        "elementtree": "^0.1.7",
-        "leek": "0.0.24",
-        "lodash": "^4.17.5",
-        "open": "^7.0.4",
-        "os-name": "^4.0.0",
-        "semver": "^7.1.1",
-        "split2": "^3.0.0",
-        "ssh-config": "^1.1.1",
-        "stream-combiner2": "^1.1.1",
-        "superagent": "^5.2.1",
-        "superagent-proxy": "^2.0.0",
-        "tar": "^6.0.1",
-        "tslib": "^2.0.1"
-      },
-      "bin": {
-        "ionic": "bin/ionic"
-      },
-      "engines": {
-        "node": ">=10.3.0"
-      }
-    },
-    "node_modules/@ionic/cli-framework": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-5.1.0.tgz",
-      "integrity": "sha512-Hb/P2zuHB3zQZN0qG7Lxda8IlP2mHisfb0KR+wc9cw2BSiH+rtXRd/A4JxndPznjWs00PHbWiEm0Ehas2pA/nw==",
-      "dev": true,
-      "dependencies": {
-        "@ionic/cli-framework-output": "2.2.2",
-        "@ionic/utils-array": "2.1.5",
-        "@ionic/utils-fs": "3.1.5",
-        "@ionic/utils-object": "2.1.5",
-        "@ionic/utils-process": "2.1.8",
-        "@ionic/utils-stream": "3.1.5",
-        "@ionic/utils-subprocess": "2.1.8",
-        "@ionic/utils-terminal": "2.3.1",
-        "chalk": "^4.0.0",
-        "debug": "^4.0.0",
-        "lodash": "^4.17.5",
-        "minimist": "^1.2.0",
-        "rimraf": "^3.0.0",
-        "tslib": "^2.0.1",
-        "write-file-atomic": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10.3.0"
-      }
-    },
-    "node_modules/@ionic/cli-framework-output": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/@ionic/cli-framework-output/-/cli-framework-output-2.2.2.tgz",
-      "integrity": "sha512-eQYkqIW1/tCwSC6Bd0gjse96U11lDX/ikf3jvsjX7a8z/zwSmGzCHRizb7xogV65Ey+1/zyAZR71cpDRQuFLBQ==",
-      "dev": true,
-      "dependencies": {
-        "@ionic/utils-terminal": "2.3.1",
-        "debug": "^4.0.0",
-        "tslib": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=10.3.0"
-      }
-    },
-    "node_modules/@ionic/cli-framework-output/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@ionic/cli-framework-output/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@ionic/cli-framework-prompts": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/@ionic/cli-framework-prompts/-/cli-framework-prompts-2.1.8.tgz",
-      "integrity": "sha512-DjO4lQsmvficsZbPmpGqSSx+F1BfgSTQBwRqL5bl9Dkh9rIZ/ckcJcKqCciVOw9kIY7WTeNFOTwj2vWrkFn7+Q==",
-      "dev": true,
-      "dependencies": {
-        "@ionic/utils-terminal": "2.3.1",
-        "debug": "^4.0.0",
-        "inquirer": "^7.0.0",
-        "tslib": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=10.3.0"
-      }
-    },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/ansi-escapes": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.21.3"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "dev": true,
-      "dependencies": {
-        "restore-cursor": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/cli-width": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
-      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/figures": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-      "dev": true,
-      "dependencies": {
-        "escape-string-regexp": "^1.0.5"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/inquirer": {
-      "version": "7.3.3",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz",
-      "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^3.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^3.0.0",
-        "lodash": "^4.17.19",
-        "mute-stream": "0.0.8",
-        "run-async": "^2.4.0",
-        "rxjs": "^6.6.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "through": "^2.3.6"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-      "dev": true,
-      "dependencies": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/rxjs": {
-      "version": "6.6.7",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^1.9.0"
-      },
-      "engines": {
-        "npm": ">=2.0.0"
-      }
-    },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/rxjs/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
-    },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/type-fest": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@ionic/cli-framework/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@ionic/cli-framework/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@ionic/cli-framework/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@ionic/cli/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@ionic/cli/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@ionic/cli/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@ionic/cli/node_modules/os-name": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/os-name/-/os-name-4.0.0.tgz",
-      "integrity": "sha512-caABzDdJMbtykt7GmSogEat3faTKQhmZf0BS5l/pZGmP0vPWQjXWqOhbLyK+b6j2/DQPmEvYdzLXJXXLJNVDNg==",
-      "dev": true,
-      "dependencies": {
-        "macos-release": "^2.2.0",
-        "windows-release": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@ionic/cli/node_modules/windows-release": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-4.0.0.tgz",
-      "integrity": "sha512-OxmV4wzDKB1x7AZaZgXMVsdJ1qER1ed83ZrTYd5Bwq2HfJVg3DJS8nqlAG4sMoJ7mu8cuRmLEYyU13BKwctRAg==",
-      "dev": true,
-      "dependencies": {
-        "execa": "^4.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@ionic/core": {
-      "version": "5.6.6",
-      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.6.6.tgz",
-      "integrity": "sha512-EbVIXOTVVPxBo7hsarBpRSFNsQ22wBFtWkKmrmliieknG5LUkf5WZBpj4EENQhzYA6c+//7/nfhcD9pWgtAofA==",
-      "dependencies": {
-        "@stencil/core": "^2.4.0",
-        "ionicons": "^5.5.1",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@ionic/core/node_modules/tslib": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz",
-      "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w=="
-    },
-    "node_modules/@ionic/utils-array": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-2.1.5.tgz",
-      "integrity": "sha512-HD72a71IQVBmQckDwmA8RxNVMTbxnaLbgFOl+dO5tbvW9CkkSFCv41h6fUuNsSEVgngfkn0i98HDuZC8mk+lTA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.0.0",
-        "tslib": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=10.3.0"
-      }
-    },
-    "node_modules/@ionic/utils-array/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@ionic/utils-array/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@ionic/utils-fs": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-3.1.5.tgz",
-      "integrity": "sha512-a41bY2dHqWSEQQ/80CpbXSs8McyiCFf2DnIWWLukrhYWf46h4qi6M/8dxcMKrofRiqI/3F+cL3S2mOm9Zz/o2Q==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.0.0",
-        "fs-extra": "^9.0.0",
-        "tslib": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=10.3.0"
-      }
-    },
-    "node_modules/@ionic/utils-fs/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@ionic/utils-fs/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@ionic/utils-network": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-2.1.5.tgz",
-      "integrity": "sha512-HUQ1Ec4Mh2MXzzKdbbbDS6xYKwpFJ2XRY7SYXbaZT8+jiNahfHbsOfe62/p8bk41Yil7E9EagzGC2JvIFJh01w==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.0.0",
-        "tslib": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=10.3.0"
-      }
-    },
-    "node_modules/@ionic/utils-network/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@ionic/utils-network/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@ionic/utils-object": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@ionic/utils-object/-/utils-object-2.1.5.tgz",
-      "integrity": "sha512-XnYNSwfewUqxq+yjER1hxTKggftpNjFLJH0s37jcrNDwbzmbpFTQTVAp4ikNK4rd9DOebX/jbeZb8jfD86IYxw==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.0.0",
-        "tslib": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=10.3.0"
-      }
-    },
-    "node_modules/@ionic/utils-object/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@ionic/utils-object/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@ionic/utils-process": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/@ionic/utils-process/-/utils-process-2.1.8.tgz",
-      "integrity": "sha512-VBBoyTzi+m6tgKAItl+jiTQneGwTOsctcrTG4CsEgmVOVOEhUYkPhddXqzD+oC54hPDU9ROsd3I014P5CWEuhQ==",
-      "dev": true,
-      "dependencies": {
-        "@ionic/utils-object": "2.1.5",
-        "@ionic/utils-terminal": "2.3.1",
-        "debug": "^4.0.0",
-        "signal-exit": "^3.0.3",
-        "tree-kill": "^1.2.2",
-        "tslib": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=10.3.0"
-      }
-    },
-    "node_modules/@ionic/utils-process/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@ionic/utils-process/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@ionic/utils-stream": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/@ionic/utils-stream/-/utils-stream-3.1.5.tgz",
-      "integrity": "sha512-hkm46uHvEC05X/8PHgdJi4l4zv9VQDELZTM+Kz69odtO9zZYfnt8DkfXHJqJ+PxmtiE5mk/ehJWLnn/XAczTUw==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.0.0",
-        "tslib": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=10.3.0"
-      }
-    },
-    "node_modules/@ionic/utils-stream/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@ionic/utils-stream/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@ionic/utils-subprocess": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-2.1.8.tgz",
-      "integrity": "sha512-pkmtf1LtXcEMPn6/cctREL2aZtZoy0+0Sl+nT0NIkOHIoBUcqrcfMWdctCSM4Mp6+2/hLWtgpHE3TOIibkWfIg==",
-      "dev": true,
-      "dependencies": {
-        "@ionic/utils-array": "2.1.5",
-        "@ionic/utils-fs": "3.1.5",
-        "@ionic/utils-process": "2.1.8",
-        "@ionic/utils-stream": "3.1.5",
-        "@ionic/utils-terminal": "2.3.1",
-        "cross-spawn": "^7.0.0",
-        "debug": "^4.0.0",
-        "tslib": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=10.3.0"
-      }
-    },
-    "node_modules/@ionic/utils-subprocess/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@ionic/utils-subprocess/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@ionic/utils-terminal": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-2.3.1.tgz",
-      "integrity": "sha512-cglsSd2AckI3Ldtdfczeq64vIIDjtPspV5QJtky8f8uIdxkeOIGeRV7bCj1+BEf1hyo+ZuggQxLviHnbMZhiRw==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.0.0",
-        "signal-exit": "^3.0.3",
-        "slice-ansi": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "tslib": "^2.0.1",
-        "untildify": "^4.0.0",
-        "wrap-ansi": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=10.3.0"
-      }
-    },
-    "node_modules/@ionic/utils-terminal/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@ionic/utils-terminal/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@ionic/utils-terminal/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/@ionic/utils-terminal/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@ionic/utils-terminal/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@ionic/utils-terminal/node_modules/string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@ionic/utils-terminal/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@ionic/utils-terminal/node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
-      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^5.3.1",
-        "find-up": "^4.1.0",
-        "get-package-type": "^0.1.0",
-        "js-yaml": "^3.13.1",
-        "resolve-from": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@istanbuljs/schema": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz",
-      "integrity": "sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/console": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.5.2.tgz",
-      "integrity": "sha512-lJELzKINpF1v74DXHbCRIkQ/+nUV1M+ntj+X1J8LxCgpmJZjfLmhFejiMSbjjD66fayxl5Z06tbs3HMyuik6rw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^26.5.2",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "jest-message-util": "^26.5.2",
-        "jest-util": "^26.5.2",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/@jest/console/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@jest/core": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.5.2.tgz",
-      "integrity": "sha512-LLTo1LQMg7eJjG/+P1NYqFof2B25EV1EqzD5FonklihG4UJKiK2JBIvWonunws6W7e+DhNLoFD+g05tCY03eyA==",
-      "dev": true,
-      "dependencies": {
-        "@jest/console": "^26.5.2",
-        "@jest/reporters": "^26.5.2",
-        "@jest/test-result": "^26.5.2",
-        "@jest/transform": "^26.5.2",
-        "@jest/types": "^26.5.2",
-        "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.4",
-        "jest-changed-files": "^26.5.2",
-        "jest-config": "^26.5.2",
-        "jest-haste-map": "^26.5.2",
-        "jest-message-util": "^26.5.2",
-        "jest-regex-util": "^26.0.0",
-        "jest-resolve": "^26.5.2",
-        "jest-resolve-dependencies": "^26.5.2",
-        "jest-runner": "^26.5.2",
-        "jest-runtime": "^26.5.2",
-        "jest-snapshot": "^26.5.2",
-        "jest-util": "^26.5.2",
-        "jest-validate": "^26.5.2",
-        "jest-watcher": "^26.5.2",
-        "micromatch": "^4.0.2",
-        "p-each-series": "^2.1.0",
-        "rimraf": "^3.0.0",
-        "slash": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/@jest/core/node_modules/ansi-escapes": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.11.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@jest/core/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/core/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@jest/core/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/core/node_modules/type-fest": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-      "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@jest/environment": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.5.2.tgz",
-      "integrity": "sha512-YjhCD/Zhkz0/1vdlS/QN6QmuUdDkpgBdK4SdiVg4Y19e29g4VQYN5Xg8+YuHjdoWGY7wJHMxc79uDTeTOy9Ngw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/fake-timers": "^26.5.2",
-        "@jest/types": "^26.5.2",
-        "@types/node": "*",
-        "jest-mock": "^26.5.2"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/@jest/fake-timers": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.5.2.tgz",
-      "integrity": "sha512-09Hn5Oraqt36V1akxQeWMVL0fR9c6PnEhpgLaYvREXZJAh2H2Y+QLCsl0g7uMoJeoWJAuz4tozk1prbR1Fc1sw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^26.5.2",
-        "@sinonjs/fake-timers": "^6.0.1",
-        "@types/node": "*",
-        "jest-message-util": "^26.5.2",
-        "jest-mock": "^26.5.2",
-        "jest-util": "^26.5.2"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/@jest/globals": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.5.2.tgz",
-      "integrity": "sha512-9PmnFsAUJxpPt1s/stq02acS1YHliVBDNfAWMe1bwdRr1iTCfhbNt3ERQXrO/ZfZSweftoA26Q/2yhSVSWQ3sw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/environment": "^26.5.2",
-        "@jest/types": "^26.5.2",
-        "expect": "^26.5.2"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/@jest/reporters": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.5.2.tgz",
-      "integrity": "sha512-zvq6Wvy6MmJq/0QY0YfOPb49CXKSf42wkJbrBPkeypVa8I+XDxijvFuywo6TJBX/ILPrdrlE/FW9vJZh6Rf9vA==",
-      "dev": true,
-      "dependencies": {
-        "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^26.5.2",
-        "@jest/test-result": "^26.5.2",
-        "@jest/transform": "^26.5.2",
-        "@jest/types": "^26.5.2",
-        "chalk": "^4.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "exit": "^0.1.2",
-        "glob": "^7.1.2",
-        "graceful-fs": "^4.2.4",
-        "istanbul-lib-coverage": "^3.0.0",
-        "istanbul-lib-instrument": "^4.0.3",
-        "istanbul-lib-report": "^3.0.0",
-        "istanbul-lib-source-maps": "^4.0.0",
-        "istanbul-reports": "^3.0.2",
-        "jest-haste-map": "^26.5.2",
-        "jest-resolve": "^26.5.2",
-        "jest-util": "^26.5.2",
-        "jest-worker": "^26.5.0",
-        "slash": "^3.0.0",
-        "source-map": "^0.6.0",
-        "string-length": "^4.0.1",
-        "terminal-link": "^2.0.0",
-        "v8-to-istanbul": "^5.0.1"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      },
-      "optionalDependencies": {
-        "node-notifier": "^8.0.0"
-      }
-    },
-    "node_modules/@jest/reporters/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@jest/reporters/node_modules/jest-worker": {
-      "version": "26.5.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.5.0.tgz",
-      "integrity": "sha512-kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^7.0.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      }
-    },
-    "node_modules/@jest/reporters/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@jest/source-map": {
-      "version": "26.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.5.0.tgz",
-      "integrity": "sha512-jWAw9ZwYHJMe9eZq/WrsHlwF8E3hM9gynlcDpOyCb9bR8wEd9ZNBZCi7/jZyzHxC7t3thZ10gO2IDhu0bPKS5g==",
-      "dev": true,
-      "dependencies": {
-        "callsites": "^3.0.0",
-        "graceful-fs": "^4.2.4",
-        "source-map": "^0.6.0"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/@jest/source-map/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@jest/test-result": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.5.2.tgz",
-      "integrity": "sha512-E/Zp6LURJEGSCWpoMGmCFuuEI1OWuI3hmZwmULV0GsgJBh7u0rwqioxhRU95euUuviqBDN8ruX/vP/4bwYolXw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/console": "^26.5.2",
-        "@jest/types": "^26.5.2",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "collect-v8-coverage": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/@jest/test-sequencer": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.5.2.tgz",
-      "integrity": "sha512-XmGEh7hh07H2B8mHLFCIgr7gA5Y6Hw1ZATIsbz2fOhpnQ5AnQtZk0gmP0Q5/+mVB2xygO64tVFQxOajzoptkNA==",
-      "dev": true,
-      "dependencies": {
-        "@jest/test-result": "^26.5.2",
-        "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^26.5.2",
-        "jest-runner": "^26.5.2",
-        "jest-runtime": "^26.5.2"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/@jest/transform": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.5.2.tgz",
-      "integrity": "sha512-AUNjvexh+APhhmS8S+KboPz+D3pCxPvEAGduffaAJYxIFxGi/ytZQkrqcKDUU0ERBAo5R7087fyOYr2oms1seg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.1.0",
-        "@jest/types": "^26.5.2",
-        "babel-plugin-istanbul": "^6.0.0",
-        "chalk": "^4.0.0",
-        "convert-source-map": "^1.4.0",
-        "fast-json-stable-stringify": "^2.0.0",
-        "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^26.5.2",
-        "jest-regex-util": "^26.0.0",
-        "jest-util": "^26.5.2",
-        "micromatch": "^4.0.2",
-        "pirates": "^4.0.1",
-        "slash": "^3.0.0",
-        "source-map": "^0.6.1",
-        "write-file-atomic": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/@jest/transform/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@jest/transform/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@jest/types": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.5.2.tgz",
-      "integrity": "sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==",
-      "dev": true,
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^15.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/@jest/types/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@jsdevtools/coverage-istanbul-loader": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@jsdevtools/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.3.tgz",
-      "integrity": "sha512-TAdNkeGB5Fe4Og+ZkAr1Kvn9by2sfL44IAHFtxlh1BA1XJ5cLpO9iSNki5opWESv3l3vSHsZ9BNKuqFKbEbFaA==",
-      "dev": true,
-      "dependencies": {
-        "convert-source-map": "^1.7.0",
-        "istanbul-lib-instrument": "^4.0.1",
-        "loader-utils": "^1.4.0",
-        "merge-source-map": "^1.1.0",
-        "schema-utils": "^2.6.4"
-      }
-    },
-    "node_modules/@jsdevtools/coverage-istanbul-loader/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/@jsdevtools/coverage-istanbul-loader/node_modules/loader-utils": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/@moodlehq/cordova-plugin-file-transfer": {
-      "version": "1.7.1-moodle.2",
-      "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-file-transfer/-/cordova-plugin-file-transfer-1.7.1-moodle.2.tgz",
-      "integrity": "sha512-nvddQelAwPXmvjv0YJJwuf2xFNi78ZmTa47BgtHGebOvdKpmcbphkOQAVN7KMheL4J3KNE9DbMBHwEHkGGkH4g==",
-      "engines": {
-        "cordovaDependencies": {
-          "3.0.0": {
-            "cordova": ">100"
-          }
-        }
-      }
-    },
-    "node_modules/@moodlehq/cordova-plugin-inappbrowser": {
-      "version": "5.0.0-moodle.2",
-      "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-inappbrowser/-/cordova-plugin-inappbrowser-5.0.0-moodle.2.tgz",
-      "integrity": "sha512-0JOLHUFEJC3fv4OQuyr2kwNyrb7oeyjmfFLQ+LcKO41e6UOnNy/du0hU7Yz9Rh8B2zGcebvSwMrN+cRSCqlipQ==",
-      "engines": {
-        "cordovaDependencies": {
-          "0.2.3": {
-            "cordova": ">=3.1.0"
-          },
-          "4.0.0": {
-            "cordova": ">=3.1.0",
-            "cordova-ios": ">=4.0.0"
-          },
-          "5.0.0": {
-            "cordova": ">=9.0.0",
-            "cordova-android": ">=9.0.0",
-            "cordova-ios": ">=6.0.0"
-          },
-          "6.0.0": {
-            "cordova": ">100"
-          }
-        }
-      }
-    },
-    "node_modules/@moodlehq/cordova-plugin-ionic-webview": {
-      "version": "5.0.0-moodle.1",
-      "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-ionic-webview/-/cordova-plugin-ionic-webview-5.0.0-moodle.1.tgz",
-      "integrity": "sha512-+6UrPKsEgXl3pcuTyI1hZIUw9y22Li/nvn7nxiphgZdldlhBvkMK/7nn4IAaXYlnrmIOpCkIrU4BbrAjSJGWSQ==",
-      "engines": {
-        "cordovaDependencies": {
-          "2.0.0": {
-            "cordova-android": ">=6.4.0",
-            "cordova-ios": ">=4.0.0-dev"
-          },
-          "3.1.0": {
-            "cordova": ">=7.1.0",
-            "cordova-android": ">=6.4.0",
-            "cordova-ios": ">=4.0.0-dev"
-          }
-        }
-      }
-    },
-    "node_modules/@moodlehq/cordova-plugin-local-notification": {
-      "version": "0.9.0-moodle.3",
-      "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-local-notification/-/cordova-plugin-local-notification-0.9.0-moodle.3.tgz",
-      "integrity": "sha512-dSEvshH9fE3aUG4bO05gCMqWVCnvZGUeddIfB8OShN60sj0CUWuI1e7Mn5syzTcRRNRi8XQ4MTv85zk4c8mzww==",
-      "engines": [
-        {
-          "name": "cordova",
-          "version": ">=3.6.0"
-        },
-        {
-          "name": "cordova-android",
-          "version": ">=6.0.0"
-        },
-        {
-          "name": "cordova-windows",
-          "version": ">=4.2.0"
-        },
-        {
-          "name": "android-sdk",
-          "version": ">=26"
-        },
-        {
-          "name": "apple-ios",
-          "version": ">=10.0.0"
-        }
-      ]
-    },
-    "node_modules/@moodlehq/cordova-plugin-qrscanner": {
-      "version": "3.0.1-moodle.2",
-      "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-qrscanner/-/cordova-plugin-qrscanner-3.0.1-moodle.2.tgz",
-      "integrity": "sha512-bjMI94QTEaUOl5TbK8K+HZI3gcR8HHfYTocsA1/C1HMKD3nROhGtwvuVDNvb+ogknv9WVQDyGnfMAnNihYH+PQ==",
-      "dependencies": {
-        "qrcode-reader": "^1.0.4",
-        "webrtc-adapter": "^3.1.4"
-      }
-    },
-    "node_modules/@moodlehq/phonegap-plugin-push": {
-      "version": "2.0.0-moodle.2",
-      "resolved": "https://registry.npmjs.org/@moodlehq/phonegap-plugin-push/-/phonegap-plugin-push-2.0.0-moodle.2.tgz",
-      "integrity": "sha512-a1ZR36vOy0Gu0yaX2T+PODlNSQcIUuHMNzPZ/kn4I+cV+hyPwAw1LmdGQDdxfABAGKWCvtzwUyYs1T/NCz2fRQ==",
-      "engines": {
-        "cordovaDependencies": {
-          "1.0.0": {
-            "cordova": ">=10.0.0",
-            "cordova-android": ">=8.0.0",
-            "cordova-ios": ">=5.1.1"
-          },
-          "2.0.0": {
-            "cordova": ">=10.0.0",
-            "cordova-android": ">=8.0.0",
-            "cordova-ios": ">=6.0.0"
-          }
-        }
-      }
-    },
-    "node_modules/@netflix/nerror": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@netflix/nerror/-/nerror-1.1.3.tgz",
-      "integrity": "sha512-b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg==",
-      "dependencies": {
-        "assert-plus": "^1.0.0",
-        "extsprintf": "^1.4.0",
-        "lodash": "^4.17.15"
-      }
-    },
-    "node_modules/@ngtools/webpack": {
-      "version": "10.0.8",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-10.0.8.tgz",
-      "integrity": "sha512-Qv4v7O4VGeWuXjRThd/mdC2I4cJOgQ7kDrVN7vkDB2EW5xtRB+/4hghvFeO3bD11FLuFvCxBMb0HbwyKoVQgEQ==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/core": "10.0.8",
-        "enhanced-resolve": "4.1.1",
-        "rxjs": "6.5.5",
-        "webpack-sources": "1.4.3"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
-        "yarn": ">= 1.13.0"
-      },
-      "peerDependencies": {
-        "@angular/compiler-cli": ">=10.0.0-next.0 < 11",
-        "typescript": ">=3.9 < 3.10",
-        "webpack": "^4.0.0"
-      }
-    },
-    "node_modules/@ngtools/webpack/node_modules/@angular-devkit/core": {
-      "version": "10.0.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
-      "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "6.12.3",
-        "fast-json-stable-stringify": "2.1.0",
-        "magic-string": "0.25.7",
-        "rxjs": "6.5.5",
-        "source-map": "0.7.3"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@ngtools/webpack/node_modules/ajv": {
-      "version": "6.12.3",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/@ngx-translate/core": {
-      "version": "13.0.0",
-      "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-13.0.0.tgz",
-      "integrity": "sha512-+tzEp8wlqEnw0Gc7jtVRAJ6RteUjXw6JJR4O65KlnxOmJrCGPI0xjV/lKRnQeU0w4i96PQs/jtpL921Wrb7PWg==",
-      "dependencies": {
-        "tslib": "^2.0.0"
-      },
-      "peerDependencies": {
-        "@angular/core": ">=10.0.0",
-        "rxjs": ">=6.5.3"
-      }
-    },
-    "node_modules/@ngx-translate/http-loader": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/@ngx-translate/http-loader/-/http-loader-6.0.0.tgz",
-      "integrity": "sha512-LCekn6qCbeXWlhESCxU1rAbZz33WzDG0lI7Ig0pYC1o5YxJWrkU9y3Y4tNi+jakQ7R6YhTR2D3ox6APxDtA0wA==",
-      "dependencies": {
-        "tslib": "^2.0.0"
-      },
-      "peerDependencies": {
-        "@angular/common": ">=10.0.0",
-        "@ngx-translate/core": ">=13.0.0",
-        "rxjs": ">=6.5.3"
-      }
-    },
-    "node_modules/@nodelib/fs.scandir": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz",
-      "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==",
-      "dependencies": {
-        "@nodelib/fs.stat": "2.0.3",
-        "run-parallel": "^1.1.9"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.stat": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz",
-      "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==",
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.walk": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz",
-      "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==",
-      "dependencies": {
-        "@nodelib/fs.scandir": "2.1.3",
-        "fastq": "^1.6.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@npmcli/git": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-2.1.0.tgz",
-      "integrity": "sha512-/hBFX/QG1b+N7PZBFs0bi+evgRZcK9nWBxQKZkGoXUT5hJSwl5c4d7y8/hm+NQZRPhQ67RzFaj5UM9YeyKoryw==",
-      "dependencies": {
-        "@npmcli/promise-spawn": "^1.3.2",
-        "lru-cache": "^6.0.0",
-        "mkdirp": "^1.0.4",
-        "npm-pick-manifest": "^6.1.1",
-        "promise-inflight": "^1.0.1",
-        "promise-retry": "^2.0.1",
-        "semver": "^7.3.5",
-        "which": "^2.0.2"
-      }
-    },
-    "node_modules/@npmcli/git/node_modules/err-code": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
-      "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="
-    },
-    "node_modules/@npmcli/git/node_modules/hosted-git-info": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
-      "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@npmcli/git/node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@npmcli/git/node_modules/npm-package-arg": {
-      "version": "8.1.5",
-      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.5.tgz",
-      "integrity": "sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==",
-      "dependencies": {
-        "hosted-git-info": "^4.0.1",
-        "semver": "^7.3.4",
-        "validate-npm-package-name": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@npmcli/git/node_modules/npm-pick-manifest": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-6.1.1.tgz",
-      "integrity": "sha512-dBsdBtORT84S8V8UTad1WlUyKIY9iMsAmqxHbLdeEeBNMLQDlDWWra3wYUx9EBEIiG/YwAy0XyNHDd2goAsfuA==",
-      "dependencies": {
-        "npm-install-checks": "^4.0.0",
-        "npm-normalize-package-bin": "^1.0.1",
-        "npm-package-arg": "^8.1.2",
-        "semver": "^7.3.4"
-      }
-    },
-    "node_modules/@npmcli/git/node_modules/promise-retry": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
-      "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
-      "dependencies": {
-        "err-code": "^2.0.2",
-        "retry": "^0.12.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@npmcli/git/node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@npmcli/installed-package-contents": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-1.0.7.tgz",
-      "integrity": "sha512-9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw==",
-      "dependencies": {
-        "npm-bundled": "^1.1.1",
-        "npm-normalize-package-bin": "^1.0.1"
-      },
-      "bin": {
-        "installed-package-contents": "index.js"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@npmcli/move-file": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.0.1.tgz",
-      "integrity": "sha512-Uv6h1sT+0DrblvIrolFtbvM1FgWm+/sy4B3pvLp67Zys+thcukzS5ekn7HsZFGpWP4Q3fYJCljbWQE/XivMRLw==",
-      "dependencies": {
-        "mkdirp": "^1.0.4"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@npmcli/move-file/node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@npmcli/node-gyp": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-1.0.2.tgz",
-      "integrity": "sha512-yrJUe6reVMpktcvagumoqD9r08fH1iRo01gn1u0zoCApa9lnZGEigVKUd2hzsCId4gdtkZZIVscLhNxMECKgRg=="
-    },
-    "node_modules/@npmcli/promise-spawn": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-1.3.2.tgz",
-      "integrity": "sha512-QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg==",
-      "dependencies": {
-        "infer-owner": "^1.0.4"
-      }
-    },
-    "node_modules/@npmcli/run-script": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.8.5.tgz",
-      "integrity": "sha512-NQspusBCpTjNwNRFMtz2C5MxoxyzlbuJ4YEhxAKrIonTiirKDtatsZictx9RgamQIx6+QuHMNmPl0wQdoESs9A==",
-      "dependencies": {
-        "@npmcli/node-gyp": "^1.0.2",
-        "@npmcli/promise-spawn": "^1.3.2",
-        "infer-owner": "^1.0.4",
-        "node-gyp": "^7.1.0",
-        "read-package-json-fast": "^2.0.1"
-      }
-    },
-    "node_modules/@schematics/angular": {
-      "version": "10.0.8",
-      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-10.0.8.tgz",
-      "integrity": "sha512-KNO61UGtiKMQSG+NbusqLtwLbxId0y+xpXJt9PKFwi+vaViOO+YzOPREfiFCuQ7q6X8SmNlrMj6sZ34E2YN1pQ==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/core": "10.0.8",
-        "@angular-devkit/schematics": "10.0.8"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@schematics/angular/node_modules/@angular-devkit/core": {
-      "version": "10.0.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
-      "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "6.12.3",
-        "fast-json-stable-stringify": "2.1.0",
-        "magic-string": "0.25.7",
-        "rxjs": "6.5.5",
-        "source-map": "0.7.3"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@schematics/angular/node_modules/ajv": {
-      "version": "6.12.3",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/@schematics/update": {
-      "version": "0.1000.8",
-      "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.1000.8.tgz",
-      "integrity": "sha512-xHuj6ME3PNTsVUrpftd98LF3WHPM0NU25GcT/n0E/j0/52yDTiaPS3wUnYSK8ZSv4Et4hcyGx7f/LEXAoOKJXw==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/core": "10.0.8",
-        "@angular-devkit/schematics": "10.0.8",
-        "@yarnpkg/lockfile": "1.1.0",
-        "ini": "1.3.5",
-        "npm-package-arg": "^8.0.0",
-        "pacote": "9.5.12",
-        "rxjs": "6.5.5",
-        "semver": "7.3.2",
-        "semver-intersect": "1.4.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@schematics/update/node_modules/@angular-devkit/core": {
-      "version": "10.0.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
-      "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "6.12.3",
-        "fast-json-stable-stringify": "2.1.0",
-        "magic-string": "0.25.7",
-        "rxjs": "6.5.5",
-        "source-map": "0.7.3"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@schematics/update/node_modules/ajv": {
-      "version": "6.12.3",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/@sindresorhus/is": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
-      "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/@sinonjs/commons": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.1.tgz",
-      "integrity": "sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw==",
-      "dev": true,
-      "dependencies": {
-        "type-detect": "4.0.8"
-      }
-    },
-    "node_modules/@sinonjs/fake-timers": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz",
-      "integrity": "sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==",
-      "dev": true,
-      "dependencies": {
-        "@sinonjs/commons": "^1.7.0"
-      }
-    },
-    "node_modules/@stencil/core": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.5.2.tgz",
-      "integrity": "sha512-bgjPXkSzzg1WnTgVUm6m5ZzpKt602WmA/QljODAW1xVN40OHJdbGblzF/F6MFzqv2c5Cy30CB41arc8qADIdcQ==",
-      "bin": {
-        "stencil": "bin/stencil"
-      },
-      "engines": {
-        "node": ">=12.10.0",
-        "npm": ">=6.0.0"
-      }
-    },
-    "node_modules/@szmarczak/http-timer": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz",
-      "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==",
-      "dependencies": {
-        "defer-to-connect": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/@tootallnate/once": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
-      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/@types/babel__core": {
-      "version": "7.1.10",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.10.tgz",
-      "integrity": "sha512-x8OM8XzITIMyiwl5Vmo2B1cR1S1Ipkyv4mdlbJjMa1lmuKvKY9FrBbEANIaMlnWn5Rf7uO+rC/VgYabNkE17Hw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/parser": "^7.1.0",
-        "@babel/types": "^7.0.0",
-        "@types/babel__generator": "*",
-        "@types/babel__template": "*",
-        "@types/babel__traverse": "*"
-      }
-    },
-    "node_modules/@types/babel__generator": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.2.tgz",
-      "integrity": "sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "node_modules/@types/babel__template": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.3.tgz",
-      "integrity": "sha512-uCoznIPDmnickEi6D0v11SBpW0OuVqHJCa7syXqQHy5uktSCreIlt0iglsCnmvz8yCb38hGcWeseA8cWJSwv5Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/parser": "^7.1.0",
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "node_modules/@types/babel__traverse": {
-      "version": "7.0.15",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.15.tgz",
-      "integrity": "sha512-Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.3.0"
-      }
-    },
-    "node_modules/@types/chart.js": {
-      "version": "2.9.31",
-      "resolved": "https://registry.npmjs.org/@types/chart.js/-/chart.js-2.9.31.tgz",
-      "integrity": "sha512-hzS6phN/kx3jClk3iYqEHNnYIRSi4RZrIGJ8CDLjgatpHoftCezvC44uqB3o3OUm9ftU1m7sHG8+RLyPTlACrA==",
-      "dependencies": {
-        "moment": "^2.10.2"
-      }
-    },
-    "node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
-    "node_modules/@types/dom-mediacapture-record": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/@types/dom-mediacapture-record/-/dom-mediacapture-record-1.0.7.tgz",
-      "integrity": "sha512-ddDIRTO1ajtbxaNo2o7fPJggpN54PZf1ZUJKOjto2ENMJE/9GKUvaw3ZRuQzlS/p0E+PnIcssxfoqYJ4yiXSBw=="
-    },
-    "node_modules/@types/faker": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/@types/faker/-/faker-5.1.3.tgz",
-      "integrity": "sha512-7YTyCRoujZWYaCpDLslQJ8QzaFWFLZZ3mZ7Vfr/jJHascRmSd05pYteyt2FK4btF2vXyGq0obuoyLpcF99OvaA==",
-      "dev": true
-    },
-    "node_modules/@types/glob": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
-      "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==",
-      "dev": true,
-      "dependencies": {
-        "@types/minimatch": "*",
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/graceful-fs": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.3.tgz",
-      "integrity": "sha512-AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/istanbul-lib-coverage": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
-      "integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==",
-      "dev": true
-    },
-    "node_modules/@types/istanbul-lib-report": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-      "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
-      "dev": true,
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "*"
-      }
-    },
-    "node_modules/@types/istanbul-reports": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
-      "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
-      "dev": true,
-      "dependencies": {
-        "@types/istanbul-lib-report": "*"
-      }
-    },
-    "node_modules/@types/jest": {
-      "version": "26.0.14",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.14.tgz",
-      "integrity": "sha512-Hz5q8Vu0D288x3iWXePSn53W7hAjP0H7EQ6QvDO9c7t46mR0lNOLlfuwQ+JkVxuhygHzlzPX+0jKdA3ZgSh+Vg==",
-      "dev": true,
-      "dependencies": {
-        "jest-diff": "^25.2.1",
-        "pretty-format": "^25.2.1"
-      }
-    },
-    "node_modules/@types/jest/node_modules/@jest/types": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
-      "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
-      "dev": true,
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^1.1.1",
-        "@types/yargs": "^15.0.0",
-        "chalk": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 8.3"
-      }
-    },
-    "node_modules/@types/jest/node_modules/@types/istanbul-reports": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
-      "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
-      "dev": true,
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "*",
-        "@types/istanbul-lib-report": "*"
-      }
-    },
-    "node_modules/@types/jest/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@types/jest/node_modules/diff-sequences": {
-      "version": "25.2.6",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz",
-      "integrity": "sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8.3"
-      }
-    },
-    "node_modules/@types/jest/node_modules/jest-diff": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz",
-      "integrity": "sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^3.0.0",
-        "diff-sequences": "^25.2.6",
-        "jest-get-type": "^25.2.6",
-        "pretty-format": "^25.5.0"
-      },
-      "engines": {
-        "node": ">= 8.3"
-      }
-    },
-    "node_modules/@types/jest/node_modules/jest-get-type": {
-      "version": "25.2.6",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz",
-      "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8.3"
-      }
-    },
-    "node_modules/@types/jest/node_modules/pretty-format": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz",
-      "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^25.5.0",
-        "ansi-regex": "^5.0.0",
-        "ansi-styles": "^4.0.0",
-        "react-is": "^16.12.0"
-      },
-      "engines": {
-        "node": ">= 8.3"
-      }
-    },
-    "node_modules/@types/json-schema": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz",
-      "integrity": "sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==",
-      "dev": true
-    },
-    "node_modules/@types/json5": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
-      "dev": true
-    },
-    "node_modules/@types/minimatch": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
-      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
-      "dev": true
-    },
-    "node_modules/@types/node": {
-      "version": "12.12.64",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.64.tgz",
-      "integrity": "sha512-UV1/ZJMC+HcP902wWdpC43cAcGu0IQk/I5bXjP2aSuCjsk3cE74mDvFrLKga7oDC170ugOAYBwfT4DSQW3akDA==",
-      "dev": true
-    },
-    "node_modules/@types/normalize-package-data": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-      "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
-      "dev": true
-    },
-    "node_modules/@types/prettier": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.1.1.tgz",
-      "integrity": "sha512-2zs+O+UkDsJ1Vcp667pd3f8xearMdopz/z54i99wtRDI5KLmngk7vlrYZD0ZjKHaROR03EznlBbVY9PfAEyJIQ==",
-      "dev": true
-    },
-    "node_modules/@types/q": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz",
-      "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==",
-      "dev": true
-    },
-    "node_modules/@types/resize-observer-browser": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@types/resize-observer-browser/-/resize-observer-browser-0.1.5.tgz",
-      "integrity": "sha512-8k/67Z95Goa6Lznuykxkfhq9YU3l1Qe6LNZmwde1u7802a3x8v44oq0j91DICclxatTr0rNnhXx7+VTIetSrSQ==",
-      "dev": true
-    },
-    "node_modules/@types/source-list-map": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
-      "integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==",
-      "dev": true
-    },
-    "node_modules/@types/stack-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.0.tgz",
-      "integrity": "sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==",
-      "dev": true
-    },
-    "node_modules/@types/webpack-env": {
-      "version": "1.16.0",
-      "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.16.0.tgz",
-      "integrity": "sha512-Fx+NpfOO0CpeYX2g9bkvX8O5qh9wrU1sOF4g8sft4Mu7z+qfe387YlyY8w8daDyDsKY5vUxM0yxkAYnbkRbZEw==",
-      "dev": true
-    },
-    "node_modules/@types/webpack-sources": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.8.tgz",
-      "integrity": "sha512-JHB2/xZlXOjzjBB6fMOpH1eQAfsrpqVVIbneE0Rok16WXwFaznaI5vfg75U5WgGJm7V9W1c4xeRQDjX/zwvghA==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "@types/source-list-map": "*",
-        "source-map": "^0.6.1"
-      }
-    },
-    "node_modules/@types/webpack-sources/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@types/yargs": {
-      "version": "15.0.7",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.7.tgz",
-      "integrity": "sha512-Gf4u3EjaPNcC9cTu4/j2oN14nSVhr8PQ+BvBcBQHAhDZfl0bVIiLgvnRXv/dn58XhTm9UXvBpvJpDlwV65QxOA==",
-      "dev": true,
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/@types/yargs-parser": {
-      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz",
-      "integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==",
-      "dev": true
-    },
-    "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.22.0.tgz",
-      "integrity": "sha512-U8SP9VOs275iDXaL08Ln1Fa/wLXfj5aTr/1c0t0j6CdbOnxh+TruXu1p4I0NAvdPBQgoPjHsgKn28mOi0FzfoA==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/experimental-utils": "4.22.0",
-        "@typescript-eslint/scope-manager": "4.22.0",
-        "debug": "^4.1.1",
-        "functional-red-black-tree": "^1.0.1",
-        "lodash": "^4.17.15",
-        "regexpp": "^3.0.0",
-        "semver": "^7.3.2",
-        "tsutils": "^3.17.1"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "@typescript-eslint/parser": "^4.0.0",
-        "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/experimental-utils": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.22.0.tgz",
-      "integrity": "sha512-xJXHHl6TuAxB5AWiVrGhvbGL8/hbiCQ8FiWwObO3r0fnvBdrbWEDy1hlvGQOAWc6qsCWuWMKdVWlLAEMpxnddg==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.3",
-        "@typescript-eslint/scope-manager": "4.22.0",
-        "@typescript-eslint/types": "4.22.0",
-        "@typescript-eslint/typescript-estree": "4.22.0",
-        "eslint-scope": "^5.0.0",
-        "eslint-utils": "^2.0.0"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "*"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.22.0.tgz",
-      "integrity": "sha512-OcCO7LTdk6ukawUM40wo61WdeoA7NM/zaoq1/2cs13M7GyiF+T4rxuA4xM+6LeHWjWbss7hkGXjFDRcKD4O04Q==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "4.22.0",
-        "@typescript-eslint/visitor-keys": "4.22.0"
-      },
-      "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.22.0.tgz",
-      "integrity": "sha512-sW/BiXmmyMqDPO2kpOhSy2Py5w6KvRRsKZnV0c4+0nr4GIcedJwXAq+RHNK4lLVEZAJYFltnnk1tJSlbeS9lYA==",
-      "dev": true,
-      "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.0.tgz",
-      "integrity": "sha512-TkIFeu5JEeSs5ze/4NID+PIcVjgoU3cUQUIZnH3Sb1cEn1lBo7StSV5bwPuJQuoxKXlzAObjYTilOEKRuhR5yg==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "4.22.0",
-        "@typescript-eslint/visitor-keys": "4.22.0",
-        "debug": "^4.1.1",
-        "globby": "^11.0.1",
-        "is-glob": "^4.0.1",
-        "semver": "^7.3.2",
-        "tsutils": "^3.17.1"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.0.tgz",
-      "integrity": "sha512-nnMu4F+s4o0sll6cBSsTeVsT4cwxB7zECK3dFxzEjPBii9xLpq4yqqsy/FU5zMfan6G60DKZSCXAa3sHJZrcYw==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "4.22.0",
-        "eslint-visitor-keys": "^2.0.0"
-      },
-      "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@typescript-eslint/experimental-utils": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.22.0.tgz",
-      "integrity": "sha512-xJXHHl6TuAxB5AWiVrGhvbGL8/hbiCQ8FiWwObO3r0fnvBdrbWEDy1hlvGQOAWc6qsCWuWMKdVWlLAEMpxnddg==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.3",
-        "@typescript-eslint/scope-manager": "4.22.0",
-        "@typescript-eslint/types": "4.22.0",
-        "@typescript-eslint/typescript-estree": "4.22.0",
-        "eslint-scope": "^5.0.0",
-        "eslint-utils": "^2.0.0"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "*"
-      }
-    },
-    "node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/parser": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.22.0.tgz",
-      "integrity": "sha512-z/bGdBJJZJN76nvAY9DkJANYgK3nlRstRRi74WHm3jjgf2I8AglrSY+6l7ogxOmn55YJ6oKZCLLy+6PW70z15Q==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/scope-manager": "4.22.0",
-        "@typescript-eslint/types": "4.22.0",
-        "@typescript-eslint/typescript-estree": "4.22.0",
-        "debug": "^4.1.1"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.22.0.tgz",
-      "integrity": "sha512-OcCO7LTdk6ukawUM40wo61WdeoA7NM/zaoq1/2cs13M7GyiF+T4rxuA4xM+6LeHWjWbss7hkGXjFDRcKD4O04Q==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "4.22.0",
-        "@typescript-eslint/visitor-keys": "4.22.0"
-      },
-      "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.22.0.tgz",
-      "integrity": "sha512-sW/BiXmmyMqDPO2kpOhSy2Py5w6KvRRsKZnV0c4+0nr4GIcedJwXAq+RHNK4lLVEZAJYFltnnk1tJSlbeS9lYA==",
-      "dev": true,
-      "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.0.tgz",
-      "integrity": "sha512-TkIFeu5JEeSs5ze/4NID+PIcVjgoU3cUQUIZnH3Sb1cEn1lBo7StSV5bwPuJQuoxKXlzAObjYTilOEKRuhR5yg==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "4.22.0",
-        "@typescript-eslint/visitor-keys": "4.22.0",
-        "debug": "^4.1.1",
-        "globby": "^11.0.1",
-        "is-glob": "^4.0.1",
-        "semver": "^7.3.2",
-        "tsutils": "^3.17.1"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.0.tgz",
-      "integrity": "sha512-nnMu4F+s4o0sll6cBSsTeVsT4cwxB7zECK3dFxzEjPBii9xLpq4yqqsy/FU5zMfan6G60DKZSCXAa3sHJZrcYw==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "4.22.0",
-        "eslint-visitor-keys": "^2.0.0"
-      },
-      "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@typescript-eslint/scope-manager": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.22.0.tgz",
-      "integrity": "sha512-OcCO7LTdk6ukawUM40wo61WdeoA7NM/zaoq1/2cs13M7GyiF+T4rxuA4xM+6LeHWjWbss7hkGXjFDRcKD4O04Q==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "4.22.0",
-        "@typescript-eslint/visitor-keys": "4.22.0"
-      },
-      "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/types": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.22.0.tgz",
-      "integrity": "sha512-sW/BiXmmyMqDPO2kpOhSy2Py5w6KvRRsKZnV0c4+0nr4GIcedJwXAq+RHNK4lLVEZAJYFltnnk1tJSlbeS9lYA==",
-      "dev": true,
-      "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.0.tgz",
-      "integrity": "sha512-TkIFeu5JEeSs5ze/4NID+PIcVjgoU3cUQUIZnH3Sb1cEn1lBo7StSV5bwPuJQuoxKXlzAObjYTilOEKRuhR5yg==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "4.22.0",
-        "@typescript-eslint/visitor-keys": "4.22.0",
-        "debug": "^4.1.1",
-        "globby": "^11.0.1",
-        "is-glob": "^4.0.1",
-        "semver": "^7.3.2",
-        "tsutils": "^3.17.1"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.0.tgz",
-      "integrity": "sha512-nnMu4F+s4o0sll6cBSsTeVsT4cwxB7zECK3dFxzEjPBii9xLpq4yqqsy/FU5zMfan6G60DKZSCXAa3sHJZrcYw==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "4.22.0",
-        "eslint-visitor-keys": "^2.0.0"
-      },
-      "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@webassemblyjs/ast": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz",
-      "integrity": "sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/helper-module-context": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/wast-parser": "1.9.0"
-      }
-    },
-    "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz",
-      "integrity": "sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz",
-      "integrity": "sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz",
-      "integrity": "sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-code-frame": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz",
-      "integrity": "sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/wast-printer": "1.9.0"
-      }
-    },
-    "node_modules/@webassemblyjs/helper-fsm": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz",
-      "integrity": "sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-module-context": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz",
-      "integrity": "sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.9.0"
-      }
-    },
-    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz",
-      "integrity": "sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz",
-      "integrity": "sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-buffer": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/wasm-gen": "1.9.0"
-      }
-    },
-    "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz",
-      "integrity": "sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==",
-      "dev": true,
-      "dependencies": {
-        "@xtuc/ieee754": "^1.2.0"
-      }
-    },
-    "node_modules/@webassemblyjs/leb128": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz",
-      "integrity": "sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==",
-      "dev": true,
-      "dependencies": {
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webassemblyjs/utf8": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz",
-      "integrity": "sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz",
-      "integrity": "sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-buffer": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/helper-wasm-section": "1.9.0",
-        "@webassemblyjs/wasm-gen": "1.9.0",
-        "@webassemblyjs/wasm-opt": "1.9.0",
-        "@webassemblyjs/wasm-parser": "1.9.0",
-        "@webassemblyjs/wast-printer": "1.9.0"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz",
-      "integrity": "sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/ieee754": "1.9.0",
-        "@webassemblyjs/leb128": "1.9.0",
-        "@webassemblyjs/utf8": "1.9.0"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz",
-      "integrity": "sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-buffer": "1.9.0",
-        "@webassemblyjs/wasm-gen": "1.9.0",
-        "@webassemblyjs/wasm-parser": "1.9.0"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz",
-      "integrity": "sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-api-error": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/ieee754": "1.9.0",
-        "@webassemblyjs/leb128": "1.9.0",
-        "@webassemblyjs/utf8": "1.9.0"
-      }
-    },
-    "node_modules/@webassemblyjs/wast-parser": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz",
-      "integrity": "sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/floating-point-hex-parser": "1.9.0",
-        "@webassemblyjs/helper-api-error": "1.9.0",
-        "@webassemblyjs/helper-code-frame": "1.9.0",
-        "@webassemblyjs/helper-fsm": "1.9.0",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz",
-      "integrity": "sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/wast-parser": "1.9.0",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@xtuc/ieee754": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "dev": true
-    },
-    "node_modules/@xtuc/long": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "dev": true
-    },
-    "node_modules/@yarnpkg/lockfile": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz",
-      "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==",
-      "dev": true
-    },
-    "node_modules/abab": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
-      "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==",
-      "dev": true
-    },
-    "node_modules/abbrev": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
-    },
-    "node_modules/accepts": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
-      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
-      "dependencies": {
-        "mime-types": "~2.1.24",
-        "negotiator": "0.6.2"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/acorn": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
-      "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-globals": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
-      "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^7.1.1",
-        "acorn-walk": "^7.1.1"
-      }
-    },
-    "node_modules/acorn-globals/node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-jsx": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
-      "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
-      "dev": true,
-      "peerDependencies": {
-        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/acorn-walk": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
-      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/adjust-sourcemap-loader": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-2.0.0.tgz",
-      "integrity": "sha512-4hFsTsn58+YjrU9qKzML2JSSDqKvN8mUGQ0nNIrfPi8hmIONT4L3uUaT6MKdMsZ9AjsU6D2xDkZxCkbQPxChrA==",
-      "dev": true,
-      "dependencies": {
-        "assert": "1.4.1",
-        "camelcase": "5.0.0",
-        "loader-utils": "1.2.3",
-        "object-path": "0.11.4",
-        "regex-parser": "2.2.10"
-      }
-    },
-    "node_modules/adjust-sourcemap-loader/node_modules/camelcase": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz",
-      "integrity": "sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/adjust-sourcemap-loader/node_modules/emojis-list": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/adjust-sourcemap-loader/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/adjust-sourcemap-loader/node_modules/loader-utils": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
-      "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^2.0.0",
-        "json5": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/agent-base": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
-      "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
-      "dev": true,
-      "dependencies": {
-        "es6-promisify": "^5.0.0"
-      },
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
-    "node_modules/agentkeepalive": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.5.2.tgz",
-      "integrity": "sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==",
-      "dev": true,
-      "dependencies": {
-        "humanize-ms": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
-    "node_modules/aggregate-error": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
-      "dependencies": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ajv": {
-      "version": "6.12.5",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz",
-      "integrity": "sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/ajv-errors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
-      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
-      "dev": true,
-      "peerDependencies": {
-        "ajv": ">=5.0.0"
-      }
-    },
-    "node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
-    "node_modules/alphanum-sort": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
-      "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
-      "dev": true
-    },
-    "node_modules/android-versions": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-1.6.0.tgz",
-      "integrity": "sha512-ojC2Ig7b/KJ6iNtR8e4bacmOsJyEkoERk3CKMIsnH7kJz5z6551NMbrVaRb7KXYavu1d74Uhml/bfcmqT3nAcg==",
-      "dependencies": {
-        "semver": "^5.7.1"
-      }
-    },
-    "node_modules/android-versions/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/ansi": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz",
-      "integrity": "sha1-DELU+xcWDVqa8eSEus4cZpIsGyE="
-    },
-    "node_modules/ansi-align": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz",
-      "integrity": "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==",
-      "dependencies": {
-        "string-width": "^3.0.0"
-      }
-    },
-    "node_modules/ansi-align/node_modules/string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-      "dependencies": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/ansi-colors": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
-      "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/ansi-cyan": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz",
-      "integrity": "sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM=",
-      "dev": true,
-      "dependencies": {
-        "ansi-wrap": "0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ansi-escapes": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
-      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/ansi-gray": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
-      "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=",
-      "dev": true,
-      "dependencies": {
-        "ansi-wrap": "0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ansi-html": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
-      "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=",
-      "dev": true,
-      "engines": [
-        "node >= 0.8.0"
-      ],
-      "bin": {
-        "ansi-html": "bin/ansi-html"
-      }
-    },
-    "node_modules/ansi-red": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz",
-      "integrity": "sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw=",
-      "dev": true,
-      "dependencies": {
-        "ansi-wrap": "0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ansi-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/ansi-wrap": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
-      "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/anymatch": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-      "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
-      "dev": true,
-      "dependencies": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/append-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz",
-      "integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=",
-      "dev": true,
-      "dependencies": {
-        "buffer-equal": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/aproba": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
-    },
-    "node_modules/archy": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
-      "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
-      "dev": true
-    },
-    "node_modules/are-we-there-yet": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
-      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
-      "dependencies": {
-        "delegates": "^1.0.0",
-        "readable-stream": "^2.0.6"
-      }
-    },
-    "node_modules/arg": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
-      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
-      "dev": true
-    },
-    "node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "node_modules/aria-query": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
-      "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.10.2",
-        "@babel/runtime-corejs3": "^7.10.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
-    "node_modules/aria-query/node_modules/@babel/runtime": {
-      "version": "7.13.17",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.17.tgz",
-      "integrity": "sha512-NCdgJEelPTSh+FEFylhnP1ylq848l1z9t9N0j1Lfbcw0+KXGjsTvUmkxy+voLLXB5SOKMbLLx4jxYliGrYQseA==",
-      "dev": true,
-      "dependencies": {
-        "regenerator-runtime": "^0.13.4"
-      }
-    },
-    "node_modules/arity-n": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/arity-n/-/arity-n-1.0.4.tgz",
-      "integrity": "sha1-2edrEXM+CFacCEeuezmyhgswt0U=",
-      "dev": true
-    },
-    "node_modules/arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/arr-filter": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz",
-      "integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=",
-      "dev": true,
-      "dependencies": {
-        "make-iterator": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/arr-flatten": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/arr-map": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz",
-      "integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ=",
-      "dev": true,
-      "dependencies": {
-        "make-iterator": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/arr-union": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-each": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
-      "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-find-index": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
-      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-flatten": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
-    },
-    "node_modules/array-includes": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.3.tgz",
-      "integrity": "sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.2",
-        "get-intrinsic": "^1.1.1",
-        "is-string": "^1.0.5"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/es-abstract": {
-      "version": "1.18.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz",
-      "integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.2",
-        "is-callable": "^1.2.3",
-        "is-negative-zero": "^2.0.1",
-        "is-regex": "^1.1.2",
-        "is-string": "^1.0.5",
-        "object-inspect": "^1.9.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "string.prototype.trimend": "^1.0.4",
-        "string.prototype.trimstart": "^1.0.4",
-        "unbox-primitive": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/has-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/is-callable": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
-      "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/is-negative-zero": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
-      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/is-regex": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
-      "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-symbols": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/object-inspect": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.2.tgz",
-      "integrity": "sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/object.assign": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "has-symbols": "^1.0.1",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/string.prototype.trimend": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
-      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/string.prototype.trimstart": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
-      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-initial": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz",
-      "integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U=",
-      "dev": true,
-      "dependencies": {
-        "array-slice": "^1.0.0",
-        "is-number": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-initial/node_modules/is-number": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-      "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-last": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz",
-      "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-last/node_modules/is-number": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-      "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-slice": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
-      "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-sort": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz",
-      "integrity": "sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==",
-      "dev": true,
-      "dependencies": {
-        "default-compare": "^1.0.0",
-        "get-value": "^2.0.6",
-        "kind-of": "^5.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-sort/node_modules/kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/array-uniq": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array.prototype.flat": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz",
-      "integrity": "sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/asap": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=",
-      "dev": true
-    },
-    "node_modules/asn1": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-      "dependencies": {
-        "safer-buffer": "~2.1.0"
-      }
-    },
-    "node_modules/asn1.js": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
-      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
-    "node_modules/asn1.js/node_modules/bn.js": {
-      "version": "4.11.9",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-      "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
-      "dev": true
-    },
-    "node_modules/assert": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
-      "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
-      "dev": true,
-      "dependencies": {
-        "util": "0.10.3"
-      }
-    },
-    "node_modules/assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/assign-symbols": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ast-types": {
-      "version": "0.13.4",
-      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz",
-      "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/astral-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
-      "dependencies": {
-        "lodash": "^4.17.14"
-      }
-    },
-    "node_modules/async-done": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz",
-      "integrity": "sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==",
-      "dev": true,
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.2",
-        "process-nextick-args": "^2.0.0",
-        "stream-exhaust": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/async-each": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
-      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
-      "dev": true
-    },
-    "node_modules/async-limiter": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
-      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
-      "dev": true
-    },
-    "node_modules/async-settle": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz",
-      "integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=",
-      "dev": true,
-      "dependencies": {
-        "async-done": "^1.2.2"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
-    },
-    "node_modules/at-least-node": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
-      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
-    "node_modules/atob": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-      "dev": true,
-      "bin": {
-        "atob": "bin/atob.js"
-      },
-      "engines": {
-        "node": ">= 4.5.0"
-      }
-    },
-    "node_modules/autoprefixer": {
-      "version": "9.8.0",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.0.tgz",
-      "integrity": "sha512-D96ZiIHXbDmU02dBaemyAg53ez+6F5yZmapmgKcjm35yEe1uVDYI8hGW3VYoGRaG290ZFf91YxHrR518vC0u/A==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.12.0",
-        "caniuse-lite": "^1.0.30001061",
-        "chalk": "^2.4.2",
-        "normalize-range": "^0.1.2",
-        "num2fraction": "^1.2.2",
-        "postcss": "^7.0.30",
-        "postcss-value-parser": "^4.1.0"
-      },
-      "bin": {
-        "autoprefixer": "bin/autoprefixer"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      },
-      "funding": {
-        "type": "tidelift",
-        "url": "https://tidelift.com/funding/github/npm/autoprefixer"
-      }
-    },
-    "node_modules/autoprefixer/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/autoprefixer/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/autoprefixer/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/autoprefixer/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/autoprefixer/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/autoprefixer/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/aws4": {
-      "version": "1.10.1",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz",
-      "integrity": "sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA=="
-    },
-    "node_modules/axobject-query": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
-      "integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==",
-      "dev": true
-    },
-    "node_modules/babel-jest": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.5.2.tgz",
-      "integrity": "sha512-U3KvymF3SczA3vOL/cgiUFOznfMET+XDIXiWnoJV45siAp2pLMG8i2+/MGZlAC3f/F6Q40LR4M4qDrWZ9wkK8A==",
-      "dev": true,
-      "dependencies": {
-        "@jest/transform": "^26.5.2",
-        "@jest/types": "^26.5.2",
-        "@types/babel__core": "^7.1.7",
-        "babel-plugin-istanbul": "^6.0.0",
-        "babel-preset-jest": "^26.5.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.4",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/babel-jest/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/babel-loader": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz",
-      "integrity": "sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==",
-      "dev": true,
-      "dependencies": {
-        "find-cache-dir": "^2.1.0",
-        "loader-utils": "^1.4.0",
-        "mkdirp": "^0.5.3",
-        "pify": "^4.0.1",
-        "schema-utils": "^2.6.5"
-      },
-      "engines": {
-        "node": ">= 6.9"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0",
-        "webpack": ">=2"
-      }
-    },
-    "node_modules/babel-loader/node_modules/find-cache-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
-      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
-      "dev": true,
-      "dependencies": {
-        "commondir": "^1.0.1",
-        "make-dir": "^2.0.0",
-        "pkg-dir": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/babel-loader/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/babel-loader/node_modules/loader-utils": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/babel-loader/node_modules/make-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-      "dev": true,
-      "dependencies": {
-        "pify": "^4.0.1",
-        "semver": "^5.6.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/babel-loader/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/babel-plugin-dynamic-import-node": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
-      "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
-      "dev": true,
-      "dependencies": {
-        "object.assign": "^4.1.0"
-      }
-    },
-    "node_modules/babel-plugin-istanbul": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz",
-      "integrity": "sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@istanbuljs/load-nyc-config": "^1.0.0",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-instrument": "^4.0.0",
-        "test-exclude": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/babel-plugin-jest-hoist": {
-      "version": "26.5.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.5.0.tgz",
-      "integrity": "sha512-ck17uZFD3CDfuwCLATWZxkkuGGFhMij8quP8CNhwj8ek1mqFgbFzRJ30xwC04LLscj/aKsVFfRST+b5PT7rSuw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.3.3",
-        "@babel/types": "^7.3.3",
-        "@types/babel__core": "^7.0.0",
-        "@types/babel__traverse": "^7.0.6"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/babel-preset-current-node-syntax": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.4.tgz",
-      "integrity": "sha512-5/INNCYhUGqw7VbVjT/hb3ucjgkVHKXY7lX3ZjlN4gm565VyFmJUrJ/h+h16ECVB38R/9SF6aACydpKMLZ/c9w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-bigint": "^7.8.3",
-        "@babel/plugin-syntax-class-properties": "^7.8.3",
-        "@babel/plugin-syntax-import-meta": "^7.8.3",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.8.3",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/babel-preset-jest": {
-      "version": "26.5.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.5.0.tgz",
-      "integrity": "sha512-F2vTluljhqkiGSJGBg/jOruA8vIIIL11YrxRcO7nviNTMbbofPSHwnm8mgP7d/wS7wRSexRoI6X1A6T74d4LQA==",
-      "dev": true,
-      "dependencies": {
-        "babel-plugin-jest-hoist": "^26.5.0",
-        "babel-preset-current-node-syntax": "^0.1.3"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/bach": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz",
-      "integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=",
-      "dev": true,
-      "dependencies": {
-        "arr-filter": "^1.1.1",
-        "arr-flatten": "^1.0.1",
-        "arr-map": "^2.0.0",
-        "array-each": "^1.0.0",
-        "array-initial": "^1.0.0",
-        "array-last": "^1.1.1",
-        "async-done": "^1.2.2",
-        "async-settle": "^1.0.0",
-        "now-and-later": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
-    },
-    "node_modules/base": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-      "dev": true,
-      "dependencies": {
-        "cache-base": "^1.0.1",
-        "class-utils": "^0.3.5",
-        "component-emitter": "^1.2.1",
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.1",
-        "mixin-deep": "^1.2.0",
-        "pascalcase": "^0.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/base/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/base/node_modules/is-accessor-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/base/node_modules/is-data-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/base/node_modules/is-descriptor": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/base/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/base64-js": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
-      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
-    },
-    "node_modules/batch": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-      "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
-      "dev": true
-    },
-    "node_modules/bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-      "dependencies": {
-        "tweetnacl": "^0.14.3"
-      }
-    },
-    "node_modules/big-integer": {
-      "version": "1.6.48",
-      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.48.tgz",
-      "integrity": "sha512-j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w==",
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/big.js": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/binary-extensions": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
-      "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/bindings": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
-      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "file-uri-to-path": "1.0.0"
-      }
-    },
-    "node_modules/bl": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.3.tgz",
-      "integrity": "sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==",
-      "optional": true,
-      "dependencies": {
-        "buffer": "^5.5.0",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
-      }
-    },
-    "node_modules/bl/node_modules/buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "optional": true,
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
-    },
-    "node_modules/bl/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "optional": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/bluebird": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
-      "dev": true
-    },
-    "node_modules/bn.js": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz",
-      "integrity": "sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==",
-      "dev": true
-    },
-    "node_modules/body-parser": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
-      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
-      "dependencies": {
-        "bytes": "3.1.0",
-        "content-type": "~1.0.4",
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.7.2",
-        "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.7.0",
-        "raw-body": "2.4.0",
-        "type-is": "~1.6.17"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/body-parser/node_modules/bytes": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/bonjour": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
-      "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
-      "dev": true,
-      "dependencies": {
-        "array-flatten": "^2.1.0",
-        "deep-equal": "^1.0.1",
-        "dns-equal": "^1.0.0",
-        "dns-txt": "^2.0.2",
-        "multicast-dns": "^6.0.1",
-        "multicast-dns-service-types": "^1.1.0"
-      }
-    },
-    "node_modules/bonjour/node_modules/array-flatten": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
-      "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
-      "dev": true
-    },
-    "node_modules/boolbase": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
-      "dev": true
-    },
-    "node_modules/boxen": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/boxen/-/boxen-4.2.0.tgz",
-      "integrity": "sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==",
-      "dependencies": {
-        "ansi-align": "^3.0.0",
-        "camelcase": "^5.3.1",
-        "chalk": "^3.0.0",
-        "cli-boxes": "^2.2.0",
-        "string-width": "^4.1.0",
-        "term-size": "^2.1.0",
-        "type-fest": "^0.8.1",
-        "widest-line": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/boxen/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/boxen/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-    },
-    "node_modules/boxen/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/boxen/node_modules/string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/boxen/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/bplist-creator": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.8.tgz",
-      "integrity": "sha512-Za9JKzD6fjLC16oX2wsXfc+qBEhJBJB1YPInoAQpMLhDuj5aVOv1baGeIQSq1Fr3OCqzvsoQcSBSwGId/Ja2PA==",
-      "dependencies": {
-        "stream-buffers": "~2.2.0"
-      }
-    },
-    "node_modules/bplist-parser": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.2.0.tgz",
-      "integrity": "sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==",
-      "dependencies": {
-        "big-integer": "^1.6.44"
-      },
-      "engines": {
-        "node": ">= 5.10.0"
-      }
-    },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dependencies": {
-        "fill-range": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/brorand": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
-      "dev": true
-    },
-    "node_modules/browser-process-hrtime": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
-      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
-      "dev": true
-    },
-    "node_modules/browserify-aes": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-      "dev": true,
-      "dependencies": {
-        "buffer-xor": "^1.0.3",
-        "cipher-base": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.3",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/browserify-cipher": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
-      "dev": true,
-      "dependencies": {
-        "browserify-aes": "^1.0.4",
-        "browserify-des": "^1.0.0",
-        "evp_bytestokey": "^1.0.0"
-      }
-    },
-    "node_modules/browserify-des": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
-      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
-      "dev": true,
-      "dependencies": {
-        "cipher-base": "^1.0.1",
-        "des.js": "^1.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "node_modules/browserify-rsa": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
-      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "randombytes": "^2.0.1"
-      }
-    },
-    "node_modules/browserify-rsa/node_modules/bn.js": {
-      "version": "4.11.9",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-      "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
-      "dev": true
-    },
-    "node_modules/browserify-sign": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
-      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^5.1.1",
-        "browserify-rsa": "^4.0.1",
-        "create-hash": "^1.2.0",
-        "create-hmac": "^1.1.7",
-        "elliptic": "^6.5.3",
-        "inherits": "^2.0.4",
-        "parse-asn1": "^5.1.5",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
-      }
-    },
-    "node_modules/browserify-sign/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/browserify-sign/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/browserify-zlib": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
-      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
-      "dev": true,
-      "dependencies": {
-        "pako": "~1.0.5"
-      }
-    },
-    "node_modules/browserslist": {
-      "version": "4.14.5",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.5.tgz",
-      "integrity": "sha512-Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA==",
-      "dev": true,
-      "dependencies": {
-        "caniuse-lite": "^1.0.30001135",
-        "electron-to-chromium": "^1.3.571",
-        "escalade": "^3.1.0",
-        "node-releases": "^1.1.61"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      },
-      "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-      },
-      "funding": {
-        "type": "tidelift",
-        "url": "https://tidelift.com/funding/github/npm/browserslist"
-      }
-    },
-    "node_modules/bs-logger": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
-      "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
-      "dev": true,
-      "dependencies": {
-        "fast-json-stable-stringify": "2.x"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/bser": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
-      "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
-      "dev": true,
-      "dependencies": {
-        "node-int64": "^0.4.0"
-      }
-    },
-    "node_modules/buffer": {
-      "version": "4.9.2",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
-      "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
-      "dev": true,
-      "dependencies": {
-        "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4",
-        "isarray": "^1.0.0"
-      }
-    },
-    "node_modules/buffer-crc32": {
-      "version": "0.2.13",
-      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/buffer-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
-      "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/buffer-from": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
-      "dev": true
-    },
-    "node_modules/buffer-indexof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
-      "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==",
-      "dev": true
-    },
-    "node_modules/buffer-xor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
-      "dev": true
-    },
-    "node_modules/builtin-status-codes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
-      "dev": true
-    },
-    "node_modules/builtins": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz",
-      "integrity": "sha1-y5T662HIaWRR2zZTThQi+U8K7og="
-    },
-    "node_modules/bytes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/cacache": {
-      "version": "15.0.3",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.3.tgz",
-      "integrity": "sha512-bc3jKYjqv7k4pWh7I/ixIjfcjPul4V4jme/WbjvwGS5LzoPL/GzXr4C5EgPNLO/QEZl9Oi61iGitYEdwcrwLCQ==",
-      "dev": true,
-      "dependencies": {
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "glob": "^7.1.4",
-        "infer-owner": "^1.0.4",
-        "lru-cache": "^5.1.1",
-        "minipass": "^3.1.1",
-        "minipass-collect": "^1.0.2",
-        "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.2",
-        "mkdirp": "^1.0.3",
-        "move-file": "^2.0.0",
-        "p-map": "^4.0.0",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^3.0.2",
-        "ssri": "^8.0.0",
-        "tar": "^6.0.2",
-        "unique-filename": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/cacache/node_modules/lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^3.0.2"
-      }
-    },
-    "node_modules/cacache/node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "dev": true,
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/cacache/node_modules/yallist": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true
-    },
-    "node_modules/cache-base": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
-      "dev": true,
-      "dependencies": {
-        "collection-visit": "^1.0.0",
-        "component-emitter": "^1.2.1",
-        "get-value": "^2.0.6",
-        "has-value": "^1.0.0",
-        "isobject": "^3.0.1",
-        "set-value": "^2.0.0",
-        "to-object-path": "^0.3.0",
-        "union-value": "^1.0.0",
-        "unset-value": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cache-base/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cacheable-request": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
-      "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==",
-      "dependencies": {
-        "clone-response": "^1.0.2",
-        "get-stream": "^5.1.0",
-        "http-cache-semantics": "^4.0.0",
-        "keyv": "^3.0.0",
-        "lowercase-keys": "^2.0.0",
-        "normalize-url": "^4.1.0",
-        "responselike": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cacheable-request/node_modules/lowercase-keys": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/caller-callsite": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
-      "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
-      "dev": true,
-      "dependencies": {
-        "callsites": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/caller-callsite/node_modules/callsites": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
-      "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/caller-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
-      "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
-      "dev": true,
-      "dependencies": {
-        "caller-callsite": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/camel-case": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
-      "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
-      "dev": true,
-      "dependencies": {
-        "no-case": "^2.2.0",
-        "upper-case": "^1.1.1"
-      }
-    },
-    "node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/caniuse-api": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
-      "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.0.0",
-        "caniuse-lite": "^1.0.0",
-        "lodash.memoize": "^4.1.2",
-        "lodash.uniq": "^4.5.0"
-      }
-    },
-    "node_modules/caniuse-lite": {
-      "version": "1.0.30001197",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001197.tgz",
-      "integrity": "sha512-8aE+sqBqtXz4G8g35Eg/XEaFr2N7rd/VQ6eABGBmNtcB8cN6qNJhMi6oSFy4UWWZgqgL3filHT8Nha4meu3tsw==",
-      "dev": true
-    },
-    "node_modules/canonical-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/canonical-path/-/canonical-path-1.0.0.tgz",
-      "integrity": "sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg==",
-      "dev": true
-    },
-    "node_modules/capture-exit": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz",
-      "integrity": "sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==",
-      "dev": true,
-      "dependencies": {
-        "rsvp": "^4.8.4"
-      },
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
-      }
-    },
-    "node_modules/caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
-    },
-    "node_modules/chalk": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/char-regex": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
-      "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/chardet": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="
-    },
-    "node_modules/chart.js": {
-      "version": "2.9.4",
-      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.9.4.tgz",
-      "integrity": "sha512-B07aAzxcrikjAPyV+01j7BmOpxtQETxTSlQ26BEYJ+3iUkbNKaOJ/nDbT6JjyqYxseM0ON12COHYdU2cTIjC7A==",
-      "dependencies": {
-        "chartjs-color": "^2.1.0",
-        "moment": "^2.10.2"
-      }
-    },
-    "node_modules/chartjs-color": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/chartjs-color/-/chartjs-color-2.4.1.tgz",
-      "integrity": "sha512-haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w==",
-      "dependencies": {
-        "chartjs-color-string": "^0.6.0",
-        "color-convert": "^1.9.3"
-      }
-    },
-    "node_modules/chartjs-color-string": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz",
-      "integrity": "sha512-TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A==",
-      "dependencies": {
-        "color-name": "^1.0.0"
-      }
-    },
-    "node_modules/chartjs-color/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/chartjs-color/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-    },
-    "node_modules/check-es-compat": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/check-es-compat/-/check-es-compat-1.1.1.tgz",
-      "integrity": "sha512-q8k6nnYg6aabuEtx0LyVXP8Q3OQ07eOAAWZ7eD95FiSk+GRIdqouuJHd7gGPzxSUJZRioRrW2GMWu7MHDFsIUw==",
-      "dev": true,
-      "dependencies": {
-        "eslint": "^6.7.2",
-        "eslint-plugin-ecmascript-compat": "^1.1.1"
-      },
-      "bin": {
-        "check-es-compat": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/ansi-escapes": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.11.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/ansi-escapes/node_modules/type-fest": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-      "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/astral-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
-      "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "dev": true,
-      "dependencies": {
-        "restore-cursor": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/cli-width": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
-      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/check-es-compat/node_modules/cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-      "dev": true,
-      "dependencies": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      },
-      "engines": {
-        "node": ">=4.8"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/cross-spawn/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/check-es-compat/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/check-es-compat/node_modules/eslint": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz",
-      "integrity": "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "ajv": "^6.10.0",
-        "chalk": "^2.1.0",
-        "cross-spawn": "^6.0.5",
-        "debug": "^4.0.1",
-        "doctrine": "^3.0.0",
-        "eslint-scope": "^5.0.0",
-        "eslint-utils": "^1.4.3",
-        "eslint-visitor-keys": "^1.1.0",
-        "espree": "^6.1.2",
-        "esquery": "^1.0.1",
-        "esutils": "^2.0.2",
-        "file-entry-cache": "^5.0.1",
-        "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^5.0.0",
-        "globals": "^12.1.0",
-        "ignore": "^4.0.6",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "inquirer": "^7.0.0",
-        "is-glob": "^4.0.0",
-        "js-yaml": "^3.13.1",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.3.0",
-        "lodash": "^4.17.14",
-        "minimatch": "^3.0.4",
-        "mkdirp": "^0.5.1",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.8.3",
-        "progress": "^2.0.0",
-        "regexpp": "^2.0.1",
-        "semver": "^6.1.2",
-        "strip-ansi": "^5.2.0",
-        "strip-json-comments": "^3.0.1",
-        "table": "^5.2.3",
-        "text-table": "^0.2.0",
-        "v8-compile-cache": "^2.0.3"
-      },
-      "bin": {
-        "eslint": "bin/eslint.js"
-      },
-      "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/eslint-utils": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
-      "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
-      "dev": true,
-      "dependencies": {
-        "eslint-visitor-keys": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/eslint-visitor-keys": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/espree": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz",
-      "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^7.1.1",
-        "acorn-jsx": "^5.2.0",
-        "eslint-visitor-keys": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/figures": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-      "dev": true,
-      "dependencies": {
-        "escape-string-regexp": "^1.0.5"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/file-entry-cache": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
-      "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
-      "dev": true,
-      "dependencies": {
-        "flat-cache": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/flat-cache": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
-      "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
-      "dev": true,
-      "dependencies": {
-        "flatted": "^2.0.0",
-        "rimraf": "2.6.3",
-        "write": "1.0.3"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/flatted": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz",
-      "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==",
-      "dev": true
-    },
-    "node_modules/check-es-compat/node_modules/globals": {
-      "version": "12.4.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
-      "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.8.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/ignore": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/inquirer": {
-      "version": "7.3.3",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz",
-      "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^3.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^3.0.0",
-        "lodash": "^4.17.19",
-        "mute-stream": "0.0.8",
-        "run-async": "^2.4.0",
-        "rxjs": "^6.6.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "through": "^2.3.6"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/inquirer/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/inquirer/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/inquirer/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/inquirer/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/check-es-compat/node_modules/inquirer/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/inquirer/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/inquirer/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/check-es-compat/node_modules/optionator": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-      "dev": true,
-      "dependencies": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.6",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "word-wrap": "~1.2.3"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/regexpp": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
-      "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.5.0"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-      "dev": true,
-      "dependencies": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/rimraf": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/rxjs": {
-      "version": "6.6.6",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.6.tgz",
-      "integrity": "sha512-/oTwee4N4iWzAMAL9xdGKjkEHmIwupR3oXbQjCKywF1BeFohswF3vZdogbmEF6pZkOsXTzWkrZszrWpQTByYVg==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^1.9.0"
-      },
-      "engines": {
-        "npm": ">=2.0.0"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-      "dev": true,
-      "dependencies": {
-        "shebang-regex": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/slice-ansi": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
-      "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.0",
-        "astral-regex": "^1.0.0",
-        "is-fullwidth-code-point": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/slice-ansi/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/string-width/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/table": {
-      "version": "5.4.6",
-      "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
-      "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.10.2",
-        "lodash": "^4.17.14",
-        "slice-ansi": "^2.1.0",
-        "string-width": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/table/node_modules/emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-      "dev": true
-    },
-    "node_modules/check-es-compat/node_modules/table/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/table/node_modules/string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
-    },
-    "node_modules/check-es-compat/node_modules/type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/check-es-compat/node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
-    "node_modules/cheerio": {
-      "version": "1.0.0-rc.3",
-      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.3.tgz",
-      "integrity": "sha512-0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA==",
-      "dev": true,
-      "dependencies": {
-        "css-select": "~1.2.0",
-        "dom-serializer": "~0.1.1",
-        "entities": "~1.1.1",
-        "htmlparser2": "^3.9.1",
-        "lodash": "^4.15.0",
-        "parse5": "^3.0.1"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/cheerio/node_modules/css-select": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
-      "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
-      "dev": true,
-      "dependencies": {
-        "boolbase": "~1.0.0",
-        "css-what": "2.1",
-        "domutils": "1.5.1",
-        "nth-check": "~1.0.1"
-      }
-    },
-    "node_modules/cheerio/node_modules/css-what": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
-      "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/cheerio/node_modules/dom-serializer": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
-      "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "^1.3.0",
-        "entities": "^1.1.1"
-      }
-    },
-    "node_modules/cheerio/node_modules/domutils": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
-      "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
-      "dev": true,
-      "dependencies": {
-        "dom-serializer": "0",
-        "domelementtype": "1"
-      }
-    },
-    "node_modules/cheerio/node_modules/entities": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
-      "dev": true
-    },
-    "node_modules/cheerio/node_modules/parse5": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz",
-      "integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/chokidar": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz",
-      "integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==",
-      "dev": true,
-      "dependencies": {
-        "anymatch": "~3.1.1",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.0",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.4.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.1.2"
-      }
-    },
-    "node_modules/chownr": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/chrome-trace-event": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz",
-      "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
-    "node_modules/chrome-trace-event/node_modules/tslib": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
-      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
-      "dev": true
-    },
-    "node_modules/ci-info": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="
-    },
-    "node_modules/cipher-base": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/circular-dependency-plugin": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-5.2.0.tgz",
-      "integrity": "sha512-7p4Kn/gffhQaavNfyDFg7LS5S/UT1JAjyGd4UqR2+jzoYF02eDkj0Ec3+48TsIa4zghjLY87nQHIh/ecK9qLdw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.0.0"
-      },
-      "peerDependencies": {
-        "webpack": ">=4.0.1"
-      }
-    },
-    "node_modules/class-utils": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
-      "dev": true,
-      "dependencies": {
-        "arr-union": "^3.1.0",
-        "define-property": "^0.2.5",
-        "isobject": "^3.0.0",
-        "static-extend": "^0.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/clean-css": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz",
-      "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==",
-      "dev": true,
-      "dependencies": {
-        "source-map": "~0.6.0"
-      },
-      "engines": {
-        "node": ">= 4.0"
-      }
-    },
-    "node_modules/clean-css/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/clean-stack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/cli-boxes": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz",
-      "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==",
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/cli-cursor": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
-      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
-      "dependencies": {
-        "restore-cursor": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/cli-spinners": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.4.0.tgz",
-      "integrity": "sha512-sJAofoarcm76ZGpuooaO0eDy8saEy+YoZBLjC4h8srt4jeBnkYeOgqxgsJQTpyt2LjI5PTfLJHSL+41Yu4fEJA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/cli-width": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
-      "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw=="
-    },
-    "node_modules/cliui": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^3.1.0",
-        "strip-ansi": "^5.2.0",
-        "wrap-ansi": "^5.1.0"
-      }
-    },
-    "node_modules/cliui/node_modules/string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/clone": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
-      "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/clone-buffer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
-      "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/clone-deep": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
-      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
-      "dev": true,
-      "dependencies": {
-        "is-plain-object": "^2.0.4",
-        "kind-of": "^6.0.2",
-        "shallow-clone": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/clone-response": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
-      "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
-      "dependencies": {
-        "mimic-response": "^1.0.0"
-      }
-    },
-    "node_modules/clone-stats": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
-      "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
-      "dev": true
-    },
-    "node_modules/cloneable-readable": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz",
-      "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "process-nextick-args": "^2.0.0",
-        "readable-stream": "^2.3.5"
-      }
-    },
-    "node_modules/co": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-      "dev": true,
-      "engines": {
-        "iojs": ">= 1.0.0",
-        "node": ">= 0.12.0"
-      }
-    },
-    "node_modules/coa": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
-      "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
-      "dev": true,
-      "dependencies": {
-        "@types/q": "^1.5.1",
-        "chalk": "^2.4.1",
-        "q": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 4.0"
-      }
-    },
-    "node_modules/coa/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/coa/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/coa/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/coa/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/coa/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/coa/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/code-point-at": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/collect-v8-coverage": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
-      "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
-      "dev": true
-    },
-    "node_modules/collection-map": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz",
-      "integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=",
-      "dev": true,
-      "dependencies": {
-        "arr-map": "^2.0.2",
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/collection-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
-      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
-      "dev": true,
-      "dependencies": {
-        "map-visit": "^1.0.0",
-        "object-visit": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/color": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/color/-/color-3.1.2.tgz",
-      "integrity": "sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.1",
-        "color-string": "^1.5.2"
-      }
-    },
-    "node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/color-string": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz",
-      "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "^1.0.0",
-        "simple-swizzle": "^0.2.2"
-      }
-    },
-    "node_modules/color-support": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
-      "dev": true,
-      "bin": {
-        "color-support": "bin.js"
-      }
-    },
-    "node_modules/color/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/color/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/colorette": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.1.0.tgz",
-      "integrity": "sha512-6S062WDQUXi6hOfkO/sBPVwE5ASXY4G2+b4atvhJfSsuUUhIaUKlkjLe9692Ipyt5/a+IPF5aVTu3V5gvXq5cg==",
-      "dev": true
-    },
-    "node_modules/colors": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
-      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
-      "engines": {
-        "node": ">=0.1.90"
-      }
-    },
-    "node_modules/com-darryncampbell-cordova-plugin-intent": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/com-darryncampbell-cordova-plugin-intent/-/com-darryncampbell-cordova-plugin-intent-1.3.0.tgz",
-      "integrity": "sha512-JXslndd4UiRHmirGZrwrHZHczoZ5sxM7zAylm4bPX7ZDwD4FdCHhILgDA8AeaG8wc11e0A7OEAFo0Esgc0M4yA=="
-    },
-    "node_modules/combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dependencies": {
-        "delayed-stream": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true
-    },
-    "node_modules/comment-parser": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.1.5.tgz",
-      "integrity": "sha512-RePCE4leIhBlmrqiYTvaqEeGYg7qpSl4etaIabKtdOQVi+mSTIBBklGUwIr79GXYnl3LpMwmDw4KeR2stNc6FA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
-    "node_modules/commondir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
-      "dev": true
-    },
-    "node_modules/component-emitter": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
-      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
-      "dev": true
-    },
-    "node_modules/compose-function": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/compose-function/-/compose-function-3.0.3.tgz",
-      "integrity": "sha1-ntZ18TzFRQHTCVCkhv9qe6OrGF8=",
-      "dev": true,
-      "dependencies": {
-        "arity-n": "^1.0.4"
-      }
-    },
-    "node_modules/compressible": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
-      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
-      "dependencies": {
-        "mime-db": ">= 1.43.0 < 2"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/compression": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
-      "dependencies": {
-        "accepts": "~1.3.5",
-        "bytes": "3.0.0",
-        "compressible": "~2.0.16",
-        "debug": "2.6.9",
-        "on-headers": "~1.0.2",
-        "safe-buffer": "5.1.2",
-        "vary": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-    },
-    "node_modules/concat-stream": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-      "dev": true,
-      "engines": [
-        "node >= 0.8"
-      ],
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
-      }
-    },
-    "node_modules/concat-with-sourcemaps": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz",
-      "integrity": "sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==",
-      "dev": true,
-      "dependencies": {
-        "source-map": "^0.6.1"
-      }
-    },
-    "node_modules/concat-with-sourcemaps/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/conf": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/conf/-/conf-1.4.0.tgz",
-      "integrity": "sha512-bzlVWS2THbMetHqXKB8ypsXN4DQ/1qopGwNJi1eYbpwesJcd86FBjFciCQX/YwAhp9bM7NVnPFqZ5LpV7gP0Dg==",
-      "dependencies": {
-        "dot-prop": "^4.1.0",
-        "env-paths": "^1.0.0",
-        "make-dir": "^1.0.0",
-        "pkg-up": "^2.0.0",
-        "write-file-atomic": "^2.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/conf/node_modules/dot-prop": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.1.tgz",
-      "integrity": "sha512-l0p4+mIuJIua0mhxGoh4a+iNL9bmeK5DvnSVQa6T0OhrVmaEa1XScX5Etc673FePCJOArq/4Pa2cLGODUWTPOQ==",
-      "dependencies": {
-        "is-obj": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/conf/node_modules/is-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/conf/node_modules/make-dir": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-      "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
-      "dependencies": {
-        "pify": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/conf/node_modules/pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/conf/node_modules/write-file-atomic": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz",
-      "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==",
-      "dependencies": {
-        "graceful-fs": "^4.1.11",
-        "imurmurhash": "^0.1.4",
-        "signal-exit": "^3.0.2"
-      }
-    },
-    "node_modules/configstore": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz",
-      "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==",
-      "dependencies": {
-        "dot-prop": "^5.2.0",
-        "graceful-fs": "^4.1.2",
-        "make-dir": "^3.0.0",
-        "unique-string": "^2.0.0",
-        "write-file-atomic": "^3.0.0",
-        "xdg-basedir": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/connect-history-api-fallback": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
-      "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/console-browserify": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
-      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
-      "dev": true
-    },
-    "node_modules/console-control-strings": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
-    },
-    "node_modules/constants-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
-      "dev": true
-    },
-    "node_modules/contains-path": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
-      "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/content-disposition": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
-      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
-      "dependencies": {
-        "safe-buffer": "5.1.2"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/convert-source-map": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
-      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "~5.1.1"
-      }
-    },
-    "node_modules/cookie": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
-      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
-    },
-    "node_modules/cookiejar": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz",
-      "integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==",
-      "dev": true
-    },
-    "node_modules/copy-concurrently": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
-      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
-      "dev": true,
-      "dependencies": {
-        "aproba": "^1.1.1",
-        "fs-write-stream-atomic": "^1.0.8",
-        "iferr": "^0.1.5",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.0"
-      }
-    },
-    "node_modules/copy-concurrently/node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/copy-descriptor": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/copy-props": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz",
-      "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==",
-      "dev": true,
-      "dependencies": {
-        "each-props": "^1.3.0",
-        "is-plain-object": "^2.0.1"
-      }
-    },
-    "node_modules/copy-webpack-plugin": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.0.3.tgz",
-      "integrity": "sha512-q5m6Vz4elsuyVEIUXr7wJdIdePWTubsqVbEMvf1WQnHGv0Q+9yPRu7MtYFPt+GBOXRav9lvIINifTQ1vSCs+eA==",
-      "dev": true,
-      "dependencies": {
-        "cacache": "^15.0.4",
-        "fast-glob": "^3.2.4",
-        "find-cache-dir": "^3.3.1",
-        "glob-parent": "^5.1.1",
-        "globby": "^11.0.1",
-        "loader-utils": "^2.0.0",
-        "normalize-path": "^3.0.0",
-        "p-limit": "^3.0.1",
-        "schema-utils": "^2.7.0",
-        "serialize-javascript": "^4.0.0",
-        "webpack-sources": "^1.4.3"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.37.0 || ^5.0.0"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/cacache": {
-      "version": "15.0.5",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.5.tgz",
-      "integrity": "sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A==",
-      "dev": true,
-      "dependencies": {
-        "@npmcli/move-file": "^1.0.1",
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "glob": "^7.1.4",
-        "infer-owner": "^1.0.4",
-        "lru-cache": "^6.0.0",
-        "minipass": "^3.1.1",
-        "minipass-collect": "^1.0.2",
-        "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.2",
-        "mkdirp": "^1.0.3",
-        "p-map": "^4.0.0",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^3.0.2",
-        "ssri": "^8.0.0",
-        "tar": "^6.0.2",
-        "unique-filename": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "dev": true,
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/p-limit": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.0.2.tgz",
-      "integrity": "sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/cordova": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/cordova/-/cordova-10.0.0.tgz",
-      "integrity": "sha512-00wMcj3X9ILhKtvRG2iEwO2qly4B+vgXFhH4WhVepWg2UVbD1opl1q9jSZ+j2AaI/vsBWW8e6M2M5FAHasnuWw==",
-      "dependencies": {
-        "configstore": "^5.0.1",
-        "cordova-common": "^4.0.2",
-        "cordova-create": "^3.0.0",
-        "cordova-lib": "^10.0.0",
-        "editor": "^1.0.0",
-        "execa": "^4.0.3",
-        "fs-extra": "^9.0.1",
-        "insight": "^0.10.3",
-        "loud-rejection": "^2.2.0",
-        "nopt": "^4.0.3",
-        "semver": "^7.3.2",
-        "systeminformation": "^4.26.10",
-        "update-notifier": "^4.1.0"
-      },
-      "bin": {
-        "cordova": "bin/cordova"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/cordova-android": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-9.1.0.tgz",
-      "integrity": "sha512-bzOX9E4eQsOSpa06oZZ7XAGq3DwB73juhhj0oPqHH/khWk0mkCD4aiVYMFoc0fmIaSQvzbY1ww7L6UBW5pyGfg==",
-      "dependencies": {
-        "android-versions": "^1.5.0",
-        "cordova-common": "^4.0.1",
-        "execa": "^4.0.2",
-        "fast-glob": "^3.2.4",
-        "fs-extra": "^9.0.1",
-        "is-path-inside": "^3.0.2",
-        "nopt": "^4.0.3",
-        "properties-parser": "^0.3.1",
-        "semver": "^7.3.4",
-        "which": "^2.0.2"
-      },
-      "bin": {
-        "create": "bin/create"
-      },
-      "engines": {
-        "node": ">=10.10.0"
-      }
-    },
-    "node_modules/cordova-android-support-gradle-release": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/cordova-android-support-gradle-release/-/cordova-android-support-gradle-release-3.0.1.tgz",
-      "integrity": "sha512-RSW55DkSckmqhX/kjj+a1YeVdy7s/AtlZn6Qa5XMQmmA4Iogq+IF2jvInZqzCF19DbI5YE95AP7VDbRk+DdDRw==",
-      "dependencies": {
-        "q": "^1.4.1",
-        "semver": "5.6.0"
-      }
-    },
-    "node_modules/cordova-android-support-gradle-release/node_modules/semver": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
-      "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/cordova-android/node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/cordova-app-hello-world": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-5.0.0.tgz",
-      "integrity": "sha512-5My01wsYoeYwS0f/t5Ck52xPm0+2zYJ0SlvxG9vUsndDGtgiP6t/G8upPgWcyDRRz7Rs/50yZuOntmHqmJxccQ=="
-    },
-    "node_modules/cordova-clipboard": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/cordova-clipboard/-/cordova-clipboard-1.3.0.tgz",
-      "integrity": "sha512-IGk4LZm/DJ0Xk/jgakHm4wa+A/lrRP3QfzMAHDG7oWLJS4ISOpfI32Wez4ndnENItRslGyBVyJyKD83CxELCAw=="
-    },
-    "node_modules/cordova-common": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/cordova-common/-/cordova-common-4.0.2.tgz",
-      "integrity": "sha512-od7aNShyuBajzPY83mUEO8tERwwWdFklXETHiXP5Ft87CWeo/tSuwNPFztyTy8XYc74yXdogXKPTJeUHuVzB8Q==",
-      "dependencies": {
-        "@netflix/nerror": "^1.1.3",
-        "ansi": "^0.3.1",
-        "bplist-parser": "^0.2.0",
-        "cross-spawn": "^7.0.1",
-        "elementtree": "^0.1.7",
-        "endent": "^1.4.1",
-        "fast-glob": "^3.2.2",
-        "fs-extra": "^9.0.0",
-        "glob": "^7.1.6",
-        "plist": "^3.0.1",
-        "q": "^1.5.1",
-        "read-chunk": "^3.2.0",
-        "strip-bom": "^4.0.0",
-        "underscore": "^1.9.2"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/cordova-create": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cordova-create/-/cordova-create-3.0.0.tgz",
-      "integrity": "sha512-WxZRTnt5RHxSAB9urnHFUtVBcIe1YjR4sfwHLsxakNoKkFhcie3HrV5QmNBgRQ5DkxmanRN3VSx4OrPVsNmAaQ==",
-      "dependencies": {
-        "cordova-app-hello-world": "^5.0.0",
-        "cordova-common": "^4.0.1",
-        "cordova-fetch": "^3.0.0",
-        "fs-extra": "^9.0.0",
-        "globby": "^11.0.0",
-        "import-fresh": "^3.2.1",
-        "isobject": "^4.0.0",
-        "npm-package-arg": "^8.0.1",
-        "path-is-inside": "^1.0.2",
-        "tmp": "^0.2.1",
-        "valid-identifier": "0.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/cordova-fetch": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-3.0.1.tgz",
-      "integrity": "sha512-bxXk6H3FtGXpCtlO+XyXM4pa72azQomdurNeHbZai9eYBzA5vjyPnsgxsYcylLUc1wQFeR+XWQVfgJitx6ghEw==",
-      "dependencies": {
-        "cordova-common": "^4.0.0",
-        "fs-extra": "^9.0.0",
-        "npm-package-arg": "^8.0.1",
-        "pacote": "^11.1.11",
-        "pify": "^5.0.0",
-        "resolve": "^1.15.1",
-        "semver": "^7.1.3",
-        "which": "^2.0.2"
-      },
-      "engines": {
-        "node": ">= 10",
-        "npm": ">= 5.6.0"
-      }
-    },
-    "node_modules/cordova-fetch/node_modules/agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-      "dependencies": {
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6.0.0"
-      }
-    },
-    "node_modules/cordova-fetch/node_modules/agentkeepalive": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.1.4.tgz",
-      "integrity": "sha512-+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ==",
-      "dependencies": {
-        "debug": "^4.1.0",
-        "depd": "^1.1.2",
-        "humanize-ms": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 8.0.0"
-      }
-    },
-    "node_modules/cordova-fetch/node_modules/cacache": {
-      "version": "15.2.0",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.2.0.tgz",
-      "integrity": "sha512-uKoJSHmnrqXgthDFx/IU6ED/5xd+NNGe+Bb+kLZy7Ku4P+BaiWEUflAKPZ7eAzsYGcsAGASJZsybXp+quEcHTw==",
-      "dependencies": {
-        "@npmcli/move-file": "^1.0.1",
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "glob": "^7.1.4",
-        "infer-owner": "^1.0.4",
-        "lru-cache": "^6.0.0",
-        "minipass": "^3.1.1",
-        "minipass-collect": "^1.0.2",
-        "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.2",
-        "mkdirp": "^1.0.3",
-        "p-map": "^4.0.0",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^3.0.2",
-        "ssri": "^8.0.1",
-        "tar": "^6.0.2",
-        "unique-filename": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/cordova-fetch/node_modules/debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/cordova-fetch/node_modules/err-code": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
-      "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="
-    },
-    "node_modules/cordova-fetch/node_modules/http-proxy-agent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
-      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
-      "dependencies": {
-        "@tootallnate/once": "1",
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/cordova-fetch/node_modules/https-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
-      "dependencies": {
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/cordova-fetch/node_modules/make-fetch-happen": {
-      "version": "9.0.4",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.0.4.tgz",
-      "integrity": "sha512-sQWNKMYqSmbAGXqJg2jZ+PmHh5JAybvwu0xM8mZR/bsTjGiTASj3ldXJV7KFHy1k/IJIBkjxQFoWIVsv9+PQMg==",
-      "dependencies": {
-        "agentkeepalive": "^4.1.3",
-        "cacache": "^15.2.0",
-        "http-cache-semantics": "^4.1.0",
-        "http-proxy-agent": "^4.0.1",
-        "https-proxy-agent": "^5.0.0",
-        "is-lambda": "^1.0.1",
-        "lru-cache": "^6.0.0",
-        "minipass": "^3.1.3",
-        "minipass-collect": "^1.0.2",
-        "minipass-fetch": "^1.3.2",
-        "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.4",
-        "negotiator": "^0.6.2",
-        "promise-retry": "^2.0.1",
-        "socks-proxy-agent": "^5.0.0",
-        "ssri": "^8.0.0"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/cordova-fetch/node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/cordova-fetch/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "node_modules/cordova-fetch/node_modules/npm-packlist": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.2.2.tgz",
-      "integrity": "sha512-Jt01acDvJRhJGthnUJVF/w6gumWOZxO7IkpY/lsX9//zqQgnF7OJaxgQXcerd4uQOLu7W5bkb4mChL9mdfm+Zg==",
-      "dependencies": {
-        "glob": "^7.1.6",
-        "ignore-walk": "^3.0.3",
-        "npm-bundled": "^1.1.1",
-        "npm-normalize-package-bin": "^1.0.1"
-      },
-      "bin": {
-        "npm-packlist": "bin/index.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/cordova-fetch/node_modules/npm-registry-fetch": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-11.0.0.tgz",
-      "integrity": "sha512-jmlgSxoDNuhAtxUIG6pVwwtz840i994dL14FoNVZisrmZW5kWd63IUTNv1m/hyRSGSqWjCUp/YZlS1BJyNp9XA==",
-      "dependencies": {
-        "make-fetch-happen": "^9.0.1",
-        "minipass": "^3.1.3",
-        "minipass-fetch": "^1.3.0",
-        "minipass-json-stream": "^1.0.1",
-        "minizlib": "^2.0.0",
-        "npm-package-arg": "^8.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/cordova-fetch/node_modules/pacote": {
-      "version": "11.3.5",
-      "resolved": "https://registry.npmjs.org/pacote/-/pacote-11.3.5.tgz",
-      "integrity": "sha512-fT375Yczn4zi+6Hkk2TBe1x1sP8FgFsEIZ2/iWaXY2r/NkhDJfxbcn5paz1+RTFCyNf+dPnaoBDJoAxXSU8Bkg==",
-      "dependencies": {
-        "@npmcli/git": "^2.1.0",
-        "@npmcli/installed-package-contents": "^1.0.6",
-        "@npmcli/promise-spawn": "^1.2.0",
-        "@npmcli/run-script": "^1.8.2",
-        "cacache": "^15.0.5",
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.1.0",
-        "infer-owner": "^1.0.4",
-        "minipass": "^3.1.3",
-        "mkdirp": "^1.0.3",
-        "npm-package-arg": "^8.0.1",
-        "npm-packlist": "^2.1.4",
-        "npm-pick-manifest": "^6.0.0",
-        "npm-registry-fetch": "^11.0.0",
-        "promise-retry": "^2.0.1",
-        "read-package-json-fast": "^2.0.1",
-        "rimraf": "^3.0.2",
-        "ssri": "^8.0.1",
-        "tar": "^6.1.0"
-      },
-      "bin": {
-        "pacote": "lib/bin.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/cordova-fetch/node_modules/pify": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz",
-      "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/cordova-fetch/node_modules/promise-retry": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
-      "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
-      "dependencies": {
-        "err-code": "^2.0.2",
-        "retry": "^0.12.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/cordova-fetch/node_modules/socks-proxy-agent": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz",
-      "integrity": "sha512-vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ==",
-      "dependencies": {
-        "agent-base": "^6.0.2",
-        "debug": "4",
-        "socks": "^2.3.3"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/cordova-ios": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/cordova-ios/-/cordova-ios-6.2.0.tgz",
-      "integrity": "sha512-sLjZg2QBI1SpQVwfe0MSn89YNVkBGLW9Q1vcFJBsqKBrhvoEOJ5Ytq0gwqdhgTOGzlwJUfxC6OHM3jcsRjtYrw==",
-      "dependencies": {
-        "cordova-common": "^4.0.2",
-        "fs-extra": "^9.1.0",
-        "ios-sim": "^8.0.2",
-        "nopt": "^5.0.0",
-        "plist": "^3.0.1",
-        "semver": "^7.3.4",
-        "unorm": "^1.6.0",
-        "which": "^2.0.2",
-        "xcode": "^3.0.1",
-        "xml-escape": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/cordova-ios/node_modules/nopt": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
-      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
-      "dependencies": {
-        "abbrev": "1"
-      },
-      "bin": {
-        "nopt": "bin/nopt.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/cordova-ios/node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/cordova-ios/node_modules/uuid": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
-      "integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==",
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
-    "node_modules/cordova-ios/node_modules/xcode": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/xcode/-/xcode-3.0.1.tgz",
-      "integrity": "sha512-kCz5k7J7XbJtjABOvkc5lJmkiDh8VhjVCGNiqdKCscmVpdVUpEAyXv1xmCLkQJ5dsHqx3IPO4XW+NTDhU/fatA==",
-      "dependencies": {
-        "simple-plist": "^1.1.0",
-        "uuid": "^7.0.3"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/cordova-lib": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/cordova-lib/-/cordova-lib-10.0.0.tgz",
-      "integrity": "sha512-azU/WH0x/3fQg33tU5bKCtj+Weh/bHelz9FWCVdXqVOHXmjzbi3p6p61z5Si967Tfh3TkmHRrodNxS0ovZ7iFQ==",
-      "dependencies": {
-        "cordova-common": "^4.0.2",
-        "cordova-fetch": "^3.0.0",
-        "cordova-serve": "^4.0.0",
-        "dep-graph": "^1.1.0",
-        "detect-indent": "^6.0.0",
-        "detect-newline": "^3.1.0",
-        "elementtree": "^0.1.7",
-        "execa": "^4.0.3",
-        "fs-extra": "^9.0.1",
-        "globby": "^11.0.1",
-        "init-package-json": "^1.10.3",
-        "md5-file": "^5.0.0",
-        "pify": "^5.0.0",
-        "semver": "^7.3.2",
-        "stringify-package": "^1.0.1",
-        "write-file-atomic": "^3.0.3"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/cordova-lib/node_modules/pify": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz",
-      "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/cordova-plugin-add-swift-support": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-add-swift-support/-/cordova-plugin-add-swift-support-2.0.2.tgz",
-      "integrity": "sha512-K03WDnsD3GT+n7Od3BnS17D8rYnAFZbZjjQJa2r7qW8QLq8+h7hGbFaiF+w5+nUtyAqUNq+HT/d/MdqBGLNzxA==",
-      "dependencies": {
-        "glob": "^7.1.3",
-        "semver": "^6.0.0",
-        "xcode": "^2.0.0"
-      }
-    },
-    "node_modules/cordova-plugin-add-swift-support/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/cordova-plugin-advanced-http": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-advanced-http/-/cordova-plugin-advanced-http-3.1.0.tgz",
-      "integrity": "sha512-zlTlNJyTttE7TV5vW2WGvHqpbKMDVrr1meZU0fy4y3ObrI/hGk2UDcDNwpZdMfaytNZwDKU4sRgsTgQYdFNBew==",
-      "engines": [
-        {
-          "name": "cordova",
-          "version": ">=4.0.0"
-        }
-      ]
-    },
-    "node_modules/cordova-plugin-androidx-adapter": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-androidx-adapter/-/cordova-plugin-androidx-adapter-1.1.3.tgz",
-      "integrity": "sha512-W1SImn0cCCvOSTSfWWp5TnanIQrSuh2Bch+dcZXIzEn0km3Qb7VryeAqHhgBQYwwzC5Ollk1DtUAk/AJSojuZA==",
-      "dev": true,
-      "dependencies": {
-        "q": "^1.5.1",
-        "recursive-readdir": "^2.2.2"
-      }
-    },
-    "node_modules/cordova-plugin-badge": {
-      "version": "0.8.8",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-badge/-/cordova-plugin-badge-0.8.8.tgz",
-      "integrity": "sha512-RhIBtd5xhD/iLnxjt35jvOae28oNW/wtMZBOmQR3Rf0y4wirvA1bpAZEhBoFqL+rZGhsd6ddOdQXdex1T0DRyQ==",
-      "engines": [
-        {
-          "name": "cordova",
-          "version": ">=6.0.0"
-        },
-        {
-          "name": "apple-ios",
-          "version": ">=10.0.0"
-        },
-        {
-          "name": "cordova-android",
-          "version": ">=4"
-        },
-        {
-          "name": "cordova-plugman",
-          "version": ">=4.2.0"
-        }
-      ]
-    },
-    "node_modules/cordova-plugin-camera": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-camera/-/cordova-plugin-camera-5.0.1.tgz",
-      "integrity": "sha512-9gXyZvI8u9KzsZuqmB8Yw+uheF+7f+usMAwvOMw7L7pqbykg+bm9US5zjhJbwit3A1cSblgZkpBafe5cFiMcTA==",
-      "engines": {
-        "cordovaDependencies": {
-          "3.0.0": {
-            "cordova-android": ">=6.3.0"
-          },
-          "4.1.0": {
-            "cordova": ">=7.1.0",
-            "cordova-android": ">=6.3.0"
-          },
-          "5.0.0": {
-            "cordova": ">=9.0.0",
-            "cordova-android": ">=9.0.0",
-            "cordova-ios": ">=5.1.0"
-          },
-          "6.0.0": {
-            "cordova": ">100"
-          }
-        }
-      }
-    },
-    "node_modules/cordova-plugin-chooser": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-chooser/-/cordova-plugin-chooser-1.3.2.tgz",
-      "integrity": "sha512-GfAibvrPdWe/ri+h3e3xkmq5bietY6yJRBIZawYDE7w600j2mtRsxgat7siWZtjRRhJuVsVwUG6H86Hyp3WKvA=="
-    },
-    "node_modules/cordova-plugin-customurlscheme": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-customurlscheme/-/cordova-plugin-customurlscheme-5.0.2.tgz",
-      "integrity": "sha512-g139Av7iYD3xcSsCd5S6a7B7dp4GTqGYtvdhh44g4OS38+aX6XkC1lsCRmROuhLIs4fkwJqkrvxacH9H4U9Gsg==",
-      "engines": [
-        {
-          "name": "cordova",
-          "version": ">=3.0.0"
-        }
-      ]
-    },
-    "node_modules/cordova-plugin-device": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-device/-/cordova-plugin-device-2.0.3.tgz",
-      "integrity": "sha512-Jb3V72btxf3XHpkPQsGdyc8N6tVBYn1vsxSFj43fIz9vonJDUThYPCJJHqk6PX6N4dJw6I4FjxkpfCR4LDYMlw==",
-      "engines": {
-        "cordovaDependencies": {
-          "3.0.0": {
-            "cordova": ">100"
-          }
-        }
-      }
-    },
-    "node_modules/cordova-plugin-file": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-file/-/cordova-plugin-file-6.0.2.tgz",
-      "integrity": "sha512-m7cughw327CjONN/qjzsTpSesLaeybksQh420/gRuSXJX5Zt9NfgsSbqqKDon6jnQ9Mm7h7imgyO2uJ34XMBtA==",
-      "engines": {
-        "cordovaDependencies": {
-          "5.0.0": {
-            "cordova-android": ">=6.3.0"
-          },
-          "7.0.0": {
-            "cordova": ">100"
-          }
-        }
-      }
-    },
-    "node_modules/cordova-plugin-file-opener2": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-file-opener2/-/cordova-plugin-file-opener2-3.0.5.tgz",
-      "integrity": "sha512-tjLHDamH5+y0bJZYVe2967L1S4R8tL4Y0rJUzJGoxsyiw3FUlrJNS199POOpzZZ6Xhlntn9a2o7+84r1dMN21A==",
-      "engines": {
-        "cordova": ">=6.0.0"
-      }
-    },
-    "node_modules/cordova-plugin-geolocation": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-geolocation/-/cordova-plugin-geolocation-4.1.0.tgz",
-      "integrity": "sha512-y5io/P10xGMxSn2KEqfv/fExK47eA1pmSonJdmDqDsaSADV9JpgdPx0mUSA08+5pzma/OS9R0LoODeDPx7Jvjg==",
-      "engines": {
-        "cordovaDependencies": {
-          "3.0.0": {
-            "cordova-android": ">=6.3.0"
-          },
-          "5.0.0": {
-            "cordova": ">100"
-          }
-        }
-      }
-    },
-    "node_modules/cordova-plugin-globalization": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-globalization/-/cordova-plugin-globalization-1.11.0.tgz",
-      "integrity": "sha1-6sMVgQAphJOvowvolA5pj2HvvP4=",
-      "engines": {
-        "cordovaDependencies": {
-          "2.0.0": {
-            "cordova": ">100"
-          }
-        }
-      }
-    },
-    "node_modules/cordova-plugin-ionic-keyboard": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-ionic-keyboard/-/cordova-plugin-ionic-keyboard-2.2.0.tgz",
-      "integrity": "sha512-yDUG+9ieKVRitq5mGlNxjaZh/MgEhFFIgTIPhqSbUaQ8UuZbawy5mhJAVClqY97q8/rcQtL6dCDa7x2sEtCLcA=="
-    },
-    "node_modules/cordova-plugin-media": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-media/-/cordova-plugin-media-5.0.3.tgz",
-      "integrity": "sha512-UQPFlpk1zL4BY44zGi8RVmYCvcKBCN4Dyf8ovxqGYCC8zR1yhbTRWYDdO9vJdERwbfgWV7+z7FMWiSUfqWm9bQ==",
-      "engines": {
-        "cordovaDependencies": {
-          "3.0.0": {
-            "cordova-android": ">=6.1.0"
-          },
-          "4.0.0": {
-            "cordova-android": ">=6.3.0"
-          },
-          "6.0.0": {
-            "cordova": ">100"
-          }
-        }
-      }
-    },
-    "node_modules/cordova-plugin-media-capture": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-media-capture/-/cordova-plugin-media-capture-3.0.3.tgz",
-      "integrity": "sha512-pVQOrNM7VAuVUMXibAlMGIArrftHPrRs4dUCoE+e2HEFUp3LmN3Yj539LjdUxcWmz/A/cHC65m9E3DS56YJhcg==",
-      "engines": {
-        "cordovaDependencies": {
-          ">=1.4.4": {
-            "cordova-ios": ">=4.0.0"
-          },
-          "2.0.0": {
-            "cordova-android": ">=6.3.0"
-          },
-          "4.0.0": {
-            "cordova": ">100"
-          }
-        }
-      }
-    },
-    "node_modules/cordova-plugin-network-information": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-network-information/-/cordova-plugin-network-information-2.0.2.tgz",
-      "integrity": "sha512-NwO3qDBNL/vJxUxBTPNOA1HvkDf9eTeGH8JSZiwy1jq2W2mJKQEDBwqWkaEQS19Yd/MQTiw0cykxg5D7u4J6cQ==",
-      "engines": {
-        "cordovaDependencies": {
-          "3.0.0": {
-            "cordova": ">100"
-          }
-        }
-      }
-    },
-    "node_modules/cordova-plugin-prevent-override": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-prevent-override/-/cordova-plugin-prevent-override-1.0.0.tgz",
-      "integrity": "sha512-/+3q5r4K5RahCpiYVmZQBjq10x4jj+6CMjYtZyx9jdMWeV+yFE+ItFcO1NeUAEWd2iHC5YPD0P2tHiHx5kscsw==",
-      "engines": {
-        "cordovaDependencies": {
-          "3.0.0": {
-            "cordova": ">100"
-          }
-        }
-      }
-    },
-    "node_modules/cordova-plugin-screen-orientation": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-screen-orientation/-/cordova-plugin-screen-orientation-3.0.2.tgz",
-      "integrity": "sha512-2w6CMC+HGvbhogJetalwGurL2Fx8DQCCPy3wlSZHN1/W7WoQ5n9ujVozcoKrY4VaagK6bxrPFih+ElkO8Uqfzg==",
-      "engines": {
-        "cordovaDependencies": {
-          "4.0.0": {
-            "cordova": ">100"
-          }
-        }
-      }
-    },
-    "node_modules/cordova-plugin-splashscreen": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-splashscreen/-/cordova-plugin-splashscreen-6.0.0.tgz",
-      "integrity": "sha512-pm4ZtJKQY4bCGXVeIInbGrXilryTevYSKgfvoQJpW9UClOWKAxSsYf2/4G2u1vcn492svOSL42OSa2MhujBWEQ==",
-      "engines": {
-        "cordovaDependencies": {
-          ">=4.0.0": {
-            "cordova-android": ">=3.6.0",
-            "cordova-windows": ">=4.4.0"
-          },
-          "2.0.0": {
-            "cordova-android": ">=3.6.0"
-          },
-          "7.0.0": {
-            "cordova": ">100"
-          }
-        }
-      }
-    },
-    "node_modules/cordova-plugin-statusbar": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-statusbar/-/cordova-plugin-statusbar-2.4.3.tgz",
-      "integrity": "sha512-ThmXzl6QIKWFXf4wWw7Q/zpB+VKkz3VM958+5A0sXD4jmR++u7KnGttLksXshVwWr6lvGwUebLYtIyXwS4Ovcg==",
-      "engines": {
-        "cordovaDependencies": {
-          "0.1.0": {
-            "cordova": ">=3.0.0"
-          },
-          "3.0.0": {
-            "cordova": ">100"
-          }
-        }
-      }
-    },
-    "node_modules/cordova-plugin-whitelist": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.4.tgz",
-      "integrity": "sha512-EYC5eQFVkoYXq39l7tYKE6lEjHJ04mvTmKXxGL7quHLdFPfJMNzru/UYpn92AOfpl3PQaZmou78C7EgmFOwFQQ==",
-      "engines": {
-        "cordovaDependencies": {
-          "0.0.0": {
-            "cordova-android": ">=4.0.0"
-          },
-          "2.0.0": {
-            "cordova": ">100"
-          }
-        }
-      }
-    },
-    "node_modules/cordova-plugin-wkuserscript": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-wkuserscript/-/cordova-plugin-wkuserscript-1.0.0.tgz",
-      "integrity": "sha512-g18TohV1T+iWQJImYUCZc44x2ywHTH3ycgEJyxo4WTL9eYm4T7lNkyl1svzQGI97e8W5hQxUqAcmvpVcnWvjSQ==",
-      "engines": {
-        "cordovaDependencies": {
-          "3.0.0": {
-            "cordova": ">100"
-          }
-        }
-      }
-    },
-    "node_modules/cordova-plugin-wkwebview-cookies": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-wkwebview-cookies/-/cordova-plugin-wkwebview-cookies-1.0.0.tgz",
-      "integrity": "sha512-bQRnc/1UNu2XDb6ds+RuAZGA8FM2MuQb4z45J/CaDfjSs60OSvxGVKo3okrM/okYosZqWJFygrPah0MK3lDERQ==",
-      "engines": {
-        "cordovaDependencies": {
-          "3.0.0": {
-            "cordova": ">100"
-          }
-        }
-      }
-    },
-    "node_modules/cordova-plugin-zip": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-zip/-/cordova-plugin-zip-3.1.0.tgz",
-      "integrity": "sha1-F2yCSOog058c+VnvXmFWrMqWshc=",
-      "engines": [
-        {
-          "name": "cordova",
-          "version": ">=3.3.0"
-        }
-      ]
-    },
-    "node_modules/cordova-serve": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cordova-serve/-/cordova-serve-4.0.0.tgz",
-      "integrity": "sha512-gzTLeBQzNP8aM/nG0/7sSfICfNazUgwvEU2kiDaybbYXmxwioo2v96h4tzE0XOyA64beyYwAyRYEEqWA4AMZjw==",
-      "dependencies": {
-        "chalk": "^3.0.0",
-        "compression": "^1.7.4",
-        "express": "^4.17.1",
-        "open": "^7.0.3",
-        "which": "^2.0.2"
-      },
-      "engines": {
-        "node": ">= 10",
-        "npm": ">= 5.6.0"
-      }
-    },
-    "node_modules/cordova-sqlite-storage": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cordova-sqlite-storage/-/cordova-sqlite-storage-6.0.0.tgz",
-      "integrity": "sha512-njRloA3AICaUFztKHXoFfVcwlL7zbvyFxtdZIkK7P+MA3umILXtSKhYAQkSe2GtHr0LBNzJI5xUUqAlZl/Js0A==",
-      "dependencies": {
-        "cordova-sqlite-storage-dependencies": "4.0.0"
-      }
-    },
-    "node_modules/cordova-sqlite-storage-dependencies": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cordova-sqlite-storage-dependencies/-/cordova-sqlite-storage-dependencies-4.0.0.tgz",
-      "integrity": "sha512-dTBxYaX/RGzH6+pp49o4sb3FuHCvhrssaKn1XMJ4LL3f9dnvz3rhFK2LdcWrdFkhOLOndnW/azUkbzZd+WWhRA=="
-    },
-    "node_modules/cordova-support-google-services": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/cordova-support-google-services/-/cordova-support-google-services-1.2.1.tgz",
-      "integrity": "sha512-EnFjKAE9oI2uzyUvEfWpLgTM200nuJVvShaA4yyz9wMKBUN+H/BRG1byd1ibZz3sSihNKi3FxjQPxmmEn6/IfA=="
-    },
-    "node_modules/cordova.plugins.diagnostic": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/cordova.plugins.diagnostic/-/cordova.plugins.diagnostic-5.0.2.tgz",
-      "integrity": "sha512-H59o7YxJ2/COzvg+jyTpUqX8QoDcvti9dluJ9a+pHumE8lf3meWemwCl0QFa9GH+xgVd6X1Ikj/6P3+DKWd9eg==",
-      "hasInstallScript": true,
-      "dependencies": {
-        "colors": "^1.1.2",
-        "elementtree": "^0.1.6",
-        "minimist": "1.2.0"
-      },
-      "engines": {
-        "cordovaDependencies": {
-          "4.0.0": {
-            "cordova": ">=7.1.0",
-            "cordova-android": ">=6.3.0",
-            "cordova-ios": ">=4.3.0"
-          }
-        }
-      }
-    },
-    "node_modules/cordova.plugins.diagnostic/node_modules/minimist": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
-    },
-    "node_modules/core-js": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.9.1.tgz",
-      "integrity": "sha512-gSjRvzkxQc1zjM/5paAmL4idJBFzuJoo+jDjF1tStYFMV2ERfD02HhahhCGXUyHxQRG4yFKVSdO6g62eoRMcDg==",
-      "hasInstallScript": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
-    "node_modules/core-js-compat": {
-      "version": "3.6.5",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz",
-      "integrity": "sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.8.5",
-        "semver": "7.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
-    "node_modules/core-js-compat/node_modules/semver": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
-      "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/core-js-pure": {
-      "version": "3.11.1",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.11.1.tgz",
-      "integrity": "sha512-2JukQi8HgAOCD5CSimxWWXVrUBoA9Br796uIA5Z06bIjt7PBBI19ircFaAxplgE1mJf3x2BY6MkT/HWA/UryPg==",
-      "dev": true,
-      "hasInstallScript": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
-    "node_modules/core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
-    },
-    "node_modules/cosmiconfig": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
-      "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
-      "dev": true,
-      "dependencies": {
-        "import-fresh": "^2.0.0",
-        "is-directory": "^0.3.1",
-        "js-yaml": "^3.13.1",
-        "parse-json": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/cosmiconfig/node_modules/import-fresh": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
-      "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
-      "dev": true,
-      "dependencies": {
-        "caller-path": "^2.0.0",
-        "resolve-from": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/cosmiconfig/node_modules/resolve-from": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/create-ecdh": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
-      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "elliptic": "^6.5.3"
-      }
-    },
-    "node_modules/create-ecdh/node_modules/bn.js": {
-      "version": "4.11.9",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-      "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
-      "dev": true
-    },
-    "node_modules/create-hash": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-      "dev": true,
-      "dependencies": {
-        "cipher-base": "^1.0.1",
-        "inherits": "^2.0.1",
-        "md5.js": "^1.3.4",
-        "ripemd160": "^2.0.1",
-        "sha.js": "^2.4.0"
-      }
-    },
-    "node_modules/create-hmac": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-      "dev": true,
-      "dependencies": {
-        "cipher-base": "^1.0.3",
-        "create-hash": "^1.1.0",
-        "inherits": "^2.0.1",
-        "ripemd160": "^2.0.0",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
-    },
-    "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/crypto-browserify": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
-      "dev": true,
-      "dependencies": {
-        "browserify-cipher": "^1.0.0",
-        "browserify-sign": "^4.0.0",
-        "create-ecdh": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.0",
-        "diffie-hellman": "^5.0.0",
-        "inherits": "^2.0.1",
-        "pbkdf2": "^3.0.3",
-        "public-encrypt": "^4.0.0",
-        "randombytes": "^2.0.0",
-        "randomfill": "^1.0.3"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/crypto-random-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
-      "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/css": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
-      "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "source-map": "^0.6.1",
-        "source-map-resolve": "^0.5.2",
-        "urix": "^0.1.0"
-      }
-    },
-    "node_modules/css-color-names": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
-      "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/css-declaration-sorter": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz",
-      "integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.1",
-        "timsort": "^0.3.0"
-      },
-      "engines": {
-        "node": ">4"
-      }
-    },
-    "node_modules/css-loader": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.5.3.tgz",
-      "integrity": "sha512-UEr9NH5Lmi7+dguAm+/JSPovNjYbm2k3TK58EiwQHzOHH5Jfq1Y+XoP2bQO6TMn7PptMd0opxxedAWcaSTRKHw==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^5.3.1",
-        "cssesc": "^3.0.0",
-        "icss-utils": "^4.1.1",
-        "loader-utils": "^1.2.3",
-        "normalize-path": "^3.0.0",
-        "postcss": "^7.0.27",
-        "postcss-modules-extract-imports": "^2.0.0",
-        "postcss-modules-local-by-default": "^3.0.2",
-        "postcss-modules-scope": "^2.2.0",
-        "postcss-modules-values": "^3.0.0",
-        "postcss-value-parser": "^4.0.3",
-        "schema-utils": "^2.6.6",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">= 8.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/css-loader/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/css-loader/node_modules/loader-utils": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/css-loader/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/css-parse": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz",
-      "integrity": "sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=",
-      "dev": true,
-      "dependencies": {
-        "css": "^2.0.0"
-      }
-    },
-    "node_modules/css-select": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
-      "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
-      "dev": true,
-      "dependencies": {
-        "boolbase": "^1.0.0",
-        "css-what": "^3.2.1",
-        "domutils": "^1.7.0",
-        "nth-check": "^1.0.2"
-      }
-    },
-    "node_modules/css-select-base-adapter": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
-      "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
-      "dev": true
-    },
-    "node_modules/css-tree": {
-      "version": "1.0.0-alpha.37",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz",
-      "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==",
-      "dev": true,
-      "dependencies": {
-        "mdn-data": "2.0.4",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/css-tree/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/css-what": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.1.tgz",
-      "integrity": "sha512-wHOppVDKl4vTAOWzJt5Ek37Sgd9qq1Bmj/T1OjvicWbU5W7ru7Pqbn0Jdqii3Drx/h+dixHKXNhZYx7blthL7g==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
-      }
-    },
-    "node_modules/css/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cssesc": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-      "dev": true,
-      "bin": {
-        "cssesc": "bin/cssesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/cssnano": {
-      "version": "4.1.10",
-      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz",
-      "integrity": "sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ==",
-      "dev": true,
-      "dependencies": {
-        "cosmiconfig": "^5.0.0",
-        "cssnano-preset-default": "^4.0.7",
-        "is-resolvable": "^1.0.0",
-        "postcss": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/cssnano-preset-default": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz",
-      "integrity": "sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA==",
-      "dev": true,
-      "dependencies": {
-        "css-declaration-sorter": "^4.0.1",
-        "cssnano-util-raw-cache": "^4.0.1",
-        "postcss": "^7.0.0",
-        "postcss-calc": "^7.0.1",
-        "postcss-colormin": "^4.0.3",
-        "postcss-convert-values": "^4.0.1",
-        "postcss-discard-comments": "^4.0.2",
-        "postcss-discard-duplicates": "^4.0.2",
-        "postcss-discard-empty": "^4.0.1",
-        "postcss-discard-overridden": "^4.0.1",
-        "postcss-merge-longhand": "^4.0.11",
-        "postcss-merge-rules": "^4.0.3",
-        "postcss-minify-font-values": "^4.0.2",
-        "postcss-minify-gradients": "^4.0.2",
-        "postcss-minify-params": "^4.0.2",
-        "postcss-minify-selectors": "^4.0.2",
-        "postcss-normalize-charset": "^4.0.1",
-        "postcss-normalize-display-values": "^4.0.2",
-        "postcss-normalize-positions": "^4.0.2",
-        "postcss-normalize-repeat-style": "^4.0.2",
-        "postcss-normalize-string": "^4.0.2",
-        "postcss-normalize-timing-functions": "^4.0.2",
-        "postcss-normalize-unicode": "^4.0.1",
-        "postcss-normalize-url": "^4.0.1",
-        "postcss-normalize-whitespace": "^4.0.2",
-        "postcss-ordered-values": "^4.1.2",
-        "postcss-reduce-initial": "^4.0.3",
-        "postcss-reduce-transforms": "^4.0.2",
-        "postcss-svgo": "^4.0.2",
-        "postcss-unique-selectors": "^4.0.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/cssnano-util-get-arguments": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz",
-      "integrity": "sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8=",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/cssnano-util-get-match": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz",
-      "integrity": "sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0=",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/cssnano-util-raw-cache": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz",
-      "integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/cssnano-util-same-parent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz",
-      "integrity": "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/csso": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-4.0.3.tgz",
-      "integrity": "sha512-NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ==",
-      "dev": true,
-      "dependencies": {
-        "css-tree": "1.0.0-alpha.39"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/csso/node_modules/css-tree": {
-      "version": "1.0.0-alpha.39",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.39.tgz",
-      "integrity": "sha512-7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA==",
-      "dev": true,
-      "dependencies": {
-        "mdn-data": "2.0.6",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/csso/node_modules/mdn-data": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.6.tgz",
-      "integrity": "sha512-rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA==",
-      "dev": true
-    },
-    "node_modules/csso/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cssom": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
-      "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==",
-      "dev": true
-    },
-    "node_modules/cssstyle": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
-      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
-      "dev": true,
-      "dependencies": {
-        "cssom": "~0.3.6"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cssstyle/node_modules/cssom": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
-      "dev": true
-    },
-    "node_modules/currently-unhandled": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
-      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
-      "dependencies": {
-        "array-find-index": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cyclist": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
-      "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
-      "dev": true
-    },
-    "node_modules/d": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
-      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
-      "dev": true,
-      "dependencies": {
-        "es5-ext": "^0.10.50",
-        "type": "^1.0.1"
-      }
-    },
-    "node_modules/dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "dependencies": {
-        "assert-plus": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/data-uri-to-buffer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz",
-      "integrity": "sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/data-urls": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
-      "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
-      "dev": true,
-      "dependencies": {
-        "abab": "^2.0.3",
-        "whatwg-mimetype": "^2.3.0",
-        "whatwg-url": "^8.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/debuglog": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz",
-      "integrity": "sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/decimal.js": {
-      "version": "10.2.1",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.1.tgz",
-      "integrity": "sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==",
-      "dev": true
-    },
-    "node_modules/decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/decompress-response": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
-      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
-      "dependencies": {
-        "mimic-response": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/dedent": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
-      "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw="
-    },
-    "node_modules/deep-equal": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
-      "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
-      "dev": true,
-      "dependencies": {
-        "is-arguments": "^1.0.4",
-        "is-date-object": "^1.0.1",
-        "is-regex": "^1.0.4",
-        "object-is": "^1.0.1",
-        "object-keys": "^1.1.1",
-        "regexp.prototype.flags": "^1.2.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/deep-extend": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
-      "dev": true
-    },
-    "node_modules/deepmerge": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/default-compare": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz",
-      "integrity": "sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^5.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/default-compare/node_modules/kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/default-gateway": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
-      "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==",
-      "dev": true,
-      "dependencies": {
-        "execa": "^1.0.0",
-        "ip-regex": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/default-gateway/node_modules/cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-      "dev": true,
-      "dependencies": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      },
-      "engines": {
-        "node": ">=4.8"
-      }
-    },
-    "node_modules/default-gateway/node_modules/execa": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-      "dev": true,
-      "dependencies": {
-        "cross-spawn": "^6.0.0",
-        "get-stream": "^4.0.0",
-        "is-stream": "^1.1.0",
-        "npm-run-path": "^2.0.0",
-        "p-finally": "^1.0.0",
-        "signal-exit": "^3.0.0",
-        "strip-eof": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/default-gateway/node_modules/get-stream": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-      "dev": true,
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/default-gateway/node_modules/is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/default-gateway/node_modules/npm-run-path": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-      "dev": true,
-      "dependencies": {
-        "path-key": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/default-gateway/node_modules/path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/default-gateway/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/default-gateway/node_modules/shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-      "dev": true,
-      "dependencies": {
-        "shebang-regex": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/default-gateway/node_modules/shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/default-gateway/node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
-    "node_modules/default-resolution": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz",
-      "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/defaults": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
-      "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
-      "dev": true,
-      "dependencies": {
-        "clone": "^1.0.2"
-      }
-    },
-    "node_modules/defaults/node_modules/clone": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/defer-to-connect": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz",
-      "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="
-    },
-    "node_modules/define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-      "dev": true,
-      "dependencies": {
-        "object-keys": "^1.0.12"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/define-property": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
-      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^1.0.2",
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/define-property/node_modules/is-accessor-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/define-property/node_modules/is-data-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/define-property/node_modules/is-descriptor": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/define-property/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/degenerator": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-2.2.0.tgz",
-      "integrity": "sha512-aiQcQowF01RxFI4ZLFMpzyotbQonhNpBao6dkI8JPk5a+hmSjR5ErHp2CQySmQe8os3VBqLCIh87nDBgZXvsmg==",
-      "dev": true,
-      "dependencies": {
-        "ast-types": "^0.13.2",
-        "escodegen": "^1.8.1",
-        "esprima": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/del": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
-      "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/glob": "^7.1.1",
-        "globby": "^6.1.0",
-        "is-path-cwd": "^2.0.0",
-        "is-path-in-cwd": "^2.0.0",
-        "p-map": "^2.0.0",
-        "pify": "^4.0.1",
-        "rimraf": "^2.6.3"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/del/node_modules/array-union": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-      "dev": true,
-      "dependencies": {
-        "array-uniq": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/del/node_modules/globby": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-      "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
-      "dev": true,
-      "dependencies": {
-        "array-union": "^1.0.1",
-        "glob": "^7.0.3",
-        "object-assign": "^4.0.1",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/del/node_modules/globby/node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/del/node_modules/p-map": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
-      "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/del/node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/delegates": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
-    },
-    "node_modules/dep-graph": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/dep-graph/-/dep-graph-1.1.0.tgz",
-      "integrity": "sha1-+t6GqSeZqBPptCURzfPfpsyNvv4=",
-      "dependencies": {
-        "underscore": "1.2.1"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/dep-graph/node_modules/underscore": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.2.1.tgz",
-      "integrity": "sha1-/FxrB2VnPZKi1KyLTcCqiHAuK9Q=",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/dependency-graph": {
-      "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.7.2.tgz",
-      "integrity": "sha512-KqtH4/EZdtdfWX0p6MGP9jljvxSY6msy/pRUD4jgNwVpv3v1QmNLlsB3LDSSUg79BRVSn7jI1QPRtArGABovAQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6.0"
-      }
-    },
-    "node_modules/des.js": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
-      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "node_modules/destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
-    },
-    "node_modules/detect-file": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
-      "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/detect-indent": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz",
-      "integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/detect-libc": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-      "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
-      "optional": true,
-      "bin": {
-        "detect-libc": "bin/detect-libc.js"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/detect-newline": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
-      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/detect-node": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
-      "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
-      "dev": true
-    },
-    "node_modules/dezalgo": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz",
-      "integrity": "sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=",
-      "dev": true,
-      "dependencies": {
-        "asap": "^2.0.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/diff": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.3.1"
-      }
-    },
-    "node_modules/diff-sequences": {
-      "version": "26.5.0",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.5.0.tgz",
-      "integrity": "sha512-ZXx86srb/iYy6jG71k++wBN9P9J05UNQ5hQHQd9MtMPvcqXPx/vKU69jfHV637D00Q2gSgPk2D+jSx3l1lDW/Q==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/diffie-hellman": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "miller-rabin": "^4.0.0",
-        "randombytes": "^2.0.0"
-      }
-    },
-    "node_modules/diffie-hellman/node_modules/bn.js": {
-      "version": "4.11.9",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-      "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
-      "dev": true
-    },
-    "node_modules/dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dependencies": {
-        "path-type": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/dns-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-      "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=",
-      "dev": true
-    },
-    "node_modules/dns-packet": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
-      "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
-      "dev": true,
-      "dependencies": {
-        "ip": "^1.1.0",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/dns-txt": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
-      "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
-      "dev": true,
-      "dependencies": {
-        "buffer-indexof": "^1.0.0"
-      }
-    },
-    "node_modules/doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/dom-serializer": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
-      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "entities": "^2.0.0"
-      }
-    },
-    "node_modules/dom-serializer/node_modules/domelementtype": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.2.tgz",
-      "integrity": "sha512-wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ]
-    },
-    "node_modules/domain-browser": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
-      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4",
-        "npm": ">=1.2"
-      }
-    },
-    "node_modules/domelementtype": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
-      "dev": true
-    },
-    "node_modules/domexception": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
-      "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
-      "dev": true,
-      "dependencies": {
-        "webidl-conversions": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/domexception/node_modules/webidl-conversions": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
-      "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/domhandler": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
-      "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "1"
-      }
-    },
-    "node_modules/domutils": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
-      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
-      "dev": true,
-      "dependencies": {
-        "dom-serializer": "0",
-        "domelementtype": "1"
-      }
-    },
-    "node_modules/dot-prop": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
-      "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
-      "dependencies": {
-        "is-obj": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/duplexer2": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
-      "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "^2.0.2"
-      }
-    },
-    "node_modules/duplexer3": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
-      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI="
-    },
-    "node_modules/duplexify": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
-      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
-      "dev": true,
-      "dependencies": {
-        "end-of-stream": "^1.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0",
-        "stream-shift": "^1.0.0"
-      }
-    },
-    "node_modules/each-props": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz",
-      "integrity": "sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==",
-      "dev": true,
-      "dependencies": {
-        "is-plain-object": "^2.0.1",
-        "object.defaults": "^1.1.0"
-      }
-    },
-    "node_modules/ecc-jsbn": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-      "dependencies": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
-    "node_modules/editor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/editor/-/editor-1.0.0.tgz",
-      "integrity": "sha1-YMf4e9YrzGqJT6jM1q+3gjok90I="
-    },
-    "node_modules/ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
-    },
-    "node_modules/electron-to-chromium": {
-      "version": "1.3.577",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.577.tgz",
-      "integrity": "sha512-dSb64JQSFif/pD8mpVAgSFkbVi6YHbK6JeEziwNNmXlr/Ne2rZtseFK5SM7JoWSLf6gP0gVvRGi4/2ZRhSX/rA==",
-      "dev": true
-    },
-    "node_modules/elementtree": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.7.tgz",
-      "integrity": "sha1-mskb5uUvtuYkTE5UpKw+2K6OKcA=",
-      "dependencies": {
-        "sax": "1.1.4"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/elliptic": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
-      "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.4.0",
-        "brorand": "^1.0.1",
-        "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.0"
-      }
-    },
-    "node_modules/elliptic/node_modules/bn.js": {
-      "version": "4.11.9",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-      "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
-      "dev": true
-    },
-    "node_modules/emittery": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.7.1.tgz",
-      "integrity": "sha512-d34LN4L6h18Bzz9xpoku2nPwKxCPlPMr3EEKTkoEBi+1/+b0lcRkRJ1UVyyZaKNeqGR3swcGl6s390DNO4YVgQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
-      }
-    },
-    "node_modules/emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
-    },
-    "node_modules/emojis-list": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/encoding": {
-      "version": "0.1.13",
-      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
-      "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
-      "devOptional": true,
-      "dependencies": {
-        "iconv-lite": "^0.6.2"
-      }
-    },
-    "node_modules/encoding/node_modules/iconv-lite": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz",
-      "integrity": "sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==",
-      "devOptional": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dependencies": {
-        "once": "^1.4.0"
-      }
-    },
-    "node_modules/endent": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/endent/-/endent-1.4.1.tgz",
-      "integrity": "sha512-buHTb5c8AC9NshtP6dgmNLYkiT+olskbq1z6cEGvfGCF3Qphbu/1zz5Xu+yjTDln8RbxNhPoUyJ5H8MSrp1olQ==",
-      "dependencies": {
-        "dedent": "^0.7.0",
-        "fast-json-parse": "^1.0.3",
-        "objectorarray": "^1.0.4"
-      }
-    },
-    "node_modules/enhanced-resolve": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz",
-      "integrity": "sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "memory-fs": "^0.5.0",
-        "tapable": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/enquirer": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-colors": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/enquirer/node_modules/ansi-colors": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/entities": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
-      "integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==",
-      "dev": true
-    },
-    "node_modules/env-paths": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-1.0.0.tgz",
-      "integrity": "sha1-QWgTO0K7BcOKNbGuQ5fIKYqzaeA=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/err-code": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz",
-      "integrity": "sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA=",
-      "dev": true
-    },
-    "node_modules/errno": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
-      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
-      "dev": true,
-      "dependencies": {
-        "prr": "~1.0.1"
-      },
-      "bin": {
-        "errno": "cli.js"
-      }
-    },
-    "node_modules/error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dev": true,
-      "dependencies": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "node_modules/es-abstract": {
-      "version": "1.18.0-next.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
-      "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
-      "dev": true,
-      "dependencies": {
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1",
-        "is-callable": "^1.2.2",
-        "is-negative-zero": "^2.0.0",
-        "is-regex": "^1.1.1",
-        "object-inspect": "^1.8.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.1",
-        "string.prototype.trimend": "^1.0.1",
-        "string.prototype.trimstart": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/es5-ext": {
-      "version": "0.10.53",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
-      "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
-      "dev": true,
-      "dependencies": {
-        "es6-iterator": "~2.0.3",
-        "es6-symbol": "~3.1.3",
-        "next-tick": "~1.0.0"
-      }
-    },
-    "node_modules/es6-iterator": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
-      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
-      "dev": true,
-      "dependencies": {
-        "d": "1",
-        "es5-ext": "^0.10.35",
-        "es6-symbol": "^3.1.1"
-      }
-    },
-    "node_modules/es6-promise": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
-      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
-      "dev": true
-    },
-    "node_modules/es6-promise-plugin": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/es6-promise-plugin/-/es6-promise-plugin-4.2.2.tgz",
-      "integrity": "sha512-uoA4aVplXI9oqUYJFBAVRwAqIN9/n9JgrTAUGX3qPbnSZVE5yY1+6/MsoN5f4xsaPO62WjPHOdtts6okMN6tNA=="
-    },
-    "node_modules/es6-promisify": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
-      "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
-      "dev": true,
-      "dependencies": {
-        "es6-promise": "^4.0.3"
-      }
-    },
-    "node_modules/es6-symbol": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
-      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
-      "dev": true,
-      "dependencies": {
-        "d": "^1.0.1",
-        "ext": "^1.1.2"
-      }
-    },
-    "node_modules/es6-weak-map": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
-      "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
-      "dev": true,
-      "dependencies": {
-        "d": "1",
-        "es5-ext": "^0.10.46",
-        "es6-iterator": "^2.0.3",
-        "es6-symbol": "^3.1.1"
-      }
-    },
-    "node_modules/escalade": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.0.tgz",
-      "integrity": "sha512-mAk+hPSO8fLDkhV7V0dXazH5pDc6MrjBTPyD3VeKzxnVFjH1MIxbCdqGZB9O8+EwWakZs3ZCbDS4IpRt79V1ig==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/escape-goat": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz",
-      "integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/escodegen": {
-      "version": "1.14.3",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
-      "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
-      "dev": true,
-      "dependencies": {
-        "esprima": "^4.0.1",
-        "estraverse": "^4.2.0",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1"
-      },
-      "bin": {
-        "escodegen": "bin/escodegen.js",
-        "esgenerate": "bin/esgenerate.js"
-      },
-      "engines": {
-        "node": ">=4.0"
-      },
-      "optionalDependencies": {
-        "source-map": "~0.6.1"
-      }
-    },
-    "node_modules/escodegen/node_modules/levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/escodegen/node_modules/optionator": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-      "dev": true,
-      "dependencies": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.6",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "word-wrap": "~1.2.3"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/escodegen/node_modules/prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/escodegen/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/escodegen/node_modules/type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/eslint": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.25.0.tgz",
-      "integrity": "sha512-TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "7.12.11",
-        "@eslint/eslintrc": "^0.4.0",
-        "ajv": "^6.10.0",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.0.1",
-        "doctrine": "^3.0.0",
-        "enquirer": "^2.3.5",
-        "eslint-scope": "^5.1.1",
-        "eslint-utils": "^2.1.0",
-        "eslint-visitor-keys": "^2.0.0",
-        "espree": "^7.3.1",
-        "esquery": "^1.4.0",
-        "esutils": "^2.0.2",
-        "file-entry-cache": "^6.0.1",
-        "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^5.0.0",
-        "globals": "^13.6.0",
-        "ignore": "^4.0.6",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "js-yaml": "^3.13.1",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash": "^4.17.21",
-        "minimatch": "^3.0.4",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
-        "progress": "^2.0.0",
-        "regexpp": "^3.1.0",
-        "semver": "^7.2.1",
-        "strip-ansi": "^6.0.0",
-        "strip-json-comments": "^3.1.0",
-        "table": "^6.0.4",
-        "text-table": "^0.2.0",
-        "v8-compile-cache": "^2.0.3"
-      },
-      "bin": {
-        "eslint": "bin/eslint.js"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint-config-prettier": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz",
-      "integrity": "sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==",
-      "dev": true,
-      "bin": {
-        "eslint-config-prettier": "bin/cli.js"
-      },
-      "peerDependencies": {
-        "eslint": ">=7.0.0"
-      }
-    },
-    "node_modules/eslint-import-resolver-node": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz",
-      "integrity": "sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^2.6.9",
-        "resolve": "^1.13.1"
-      }
-    },
-    "node_modules/eslint-module-utils": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz",
-      "integrity": "sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^2.6.9",
-        "pkg-dir": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-module-utils/node_modules/pkg-dir": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
-      "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-plugin-ecmascript-compat": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-ecmascript-compat/-/eslint-plugin-ecmascript-compat-1.1.1.tgz",
-      "integrity": "sha512-OUytzpOKynpuSfnrGpOfj2QmduJu/0fGfTLf9GwTJzIyvfXfLDGtoZ+ek0sHFh68BLbwG5lylyBNgAxhFh5V8A==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.8.0",
-        "eslint-plugin-es": "^2.0.0",
-        "lodash": "^4.17.15",
-        "mdn-browser-compat-data": "^1.0.25"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      },
-      "peerDependencies": {
-        "eslint": ">=4.19.1"
-      }
-    },
-    "node_modules/eslint-plugin-es": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-2.0.0.tgz",
-      "integrity": "sha512-f6fceVtg27BR02EYnBhgWLFQfK6bN4Ll0nQFrBHOlCsAyxeZkn0NHns5O0YZOPrV1B3ramd6cgFwaoFLcSkwEQ==",
-      "dev": true,
-      "dependencies": {
-        "eslint-utils": "^1.4.2",
-        "regexpp": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      },
-      "peerDependencies": {
-        "eslint": ">=4.19.1"
-      }
-    },
-    "node_modules/eslint-plugin-es/node_modules/eslint-utils": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
-      "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
-      "dev": true,
-      "dependencies": {
-        "eslint-visitor-keys": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/eslint-plugin-es/node_modules/eslint-visitor-keys": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-plugin-header": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-header/-/eslint-plugin-header-3.1.1.tgz",
-      "integrity": "sha512-9vlKxuJ4qf793CmeeSrZUvVClw6amtpghq3CuWcB5cUNnWHQhgcqy5eF8oVKFk1G3Y/CbchGfEaw3wiIJaNmVg==",
-      "dev": true,
-      "peerDependencies": {
-        "eslint": ">=7.7.0"
-      }
-    },
-    "node_modules/eslint-plugin-import": {
-      "version": "2.22.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz",
-      "integrity": "sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==",
-      "dev": true,
-      "dependencies": {
-        "array-includes": "^3.1.1",
-        "array.prototype.flat": "^1.2.3",
-        "contains-path": "^0.1.0",
-        "debug": "^2.6.9",
-        "doctrine": "1.5.0",
-        "eslint-import-resolver-node": "^0.3.4",
-        "eslint-module-utils": "^2.6.0",
-        "has": "^1.0.3",
-        "minimatch": "^3.0.4",
-        "object.values": "^1.1.1",
-        "read-pkg-up": "^2.0.0",
-        "resolve": "^1.17.0",
-        "tsconfig-paths": "^3.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/doctrine": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
-      "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2",
-        "isarray": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/eslint-plugin-jest": {
-      "version": "24.3.6",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.3.6.tgz",
-      "integrity": "sha512-WOVH4TIaBLIeCX576rLcOgjNXqP+jNlCiEmRgFTfQtJ52DpwnIQKAVGlGPAN7CZ33bW6eNfHD6s8ZbEUTQubJg==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/experimental-utils": "^4.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "@typescript-eslint/eslint-plugin": ">= 4",
-        "eslint": ">=5"
-      },
-      "peerDependenciesMeta": {
-        "@typescript-eslint/eslint-plugin": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/eslint-plugin-jsdoc": {
-      "version": "32.3.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-32.3.3.tgz",
-      "integrity": "sha512-WxXohbMYlZvCt3r7MepwT++nTLsO4CPegWcm5toM4IGq3MBmYkG+Uf5yDa+n1MwPXLg+KbJqAsI19hmkVD7MPg==",
-      "dev": true,
-      "dependencies": {
-        "comment-parser": "1.1.5",
-        "debug": "^4.3.1",
-        "jsdoctypeparser": "^9.0.0",
-        "lodash": "^4.17.21",
-        "regextras": "^0.7.1",
-        "semver": "^7.3.5",
-        "spdx-expression-parse": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0"
-      }
-    },
-    "node_modules/eslint-plugin-jsdoc/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/eslint-plugin-jsdoc/node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
-    },
-    "node_modules/eslint-plugin-jsdoc/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/eslint-plugin-jsdoc/node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/eslint-plugin-prefer-arrow": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-prefer-arrow/-/eslint-plugin-prefer-arrow-1.2.3.tgz",
-      "integrity": "sha512-J9I5PKCOJretVuiZRGvPQxCbllxGAV/viI20JO3LYblAodofBxyMnZAJ+WGeClHgANnSJberTNoFWWjrWKBuXQ==",
-      "dev": true,
-      "peerDependencies": {
-        "eslint": ">=2.0.0"
-      }
-    },
-    "node_modules/eslint-plugin-promise": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-5.1.0.tgz",
-      "integrity": "sha512-NGmI6BH5L12pl7ScQHbg7tvtk4wPxxj8yPHH47NvSmMtFneC077PSeY3huFj06ZWZvtbfxSPt3RuOQD5XcR4ng==",
-      "dev": true,
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "peerDependencies": {
-        "eslint": "^7.0.0"
-      }
-    },
-    "node_modules/eslint-scope": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
-      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/eslint-utils": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
-      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
-      "dev": true,
-      "dependencies": {
-        "eslint-visitor-keys": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      }
-    },
-    "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-visitor-keys": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz",
-      "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/eslint/node_modules/@babel/code-frame": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
-      "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.10.4"
-      }
-    },
-    "node_modules/eslint/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/eslint/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/eslint/node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/globals": {
-      "version": "13.8.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.8.0.tgz",
-      "integrity": "sha512-rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/ignore": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/eslint/node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
-    },
-    "node_modules/eslint/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/eslint/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/espree": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
-      "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^7.4.0",
-        "acorn-jsx": "^5.3.1",
-        "eslint-visitor-keys": "^1.3.0"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/espree/node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/espree/node_modules/eslint-visitor-keys": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/esquery/node_modules/estraverse": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esrecurse/node_modules/estraverse": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/eventemitter3": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
-      "dev": true
-    },
-    "node_modules/events": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.2.0.tgz",
-      "integrity": "sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.x"
-      }
-    },
-    "node_modules/eventsource": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz",
-      "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
-      "dev": true,
-      "dependencies": {
-        "original": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/evp_bytestokey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-      "dev": true,
-      "dependencies": {
-        "md5.js": "^1.3.4",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "node_modules/exec-sh": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz",
-      "integrity": "sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==",
-      "dev": true
-    },
-    "node_modules/execa": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-4.0.3.tgz",
-      "integrity": "sha512-WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A==",
-      "dependencies": {
-        "cross-spawn": "^7.0.0",
-        "get-stream": "^5.0.0",
-        "human-signals": "^1.1.1",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.0",
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2",
-        "strip-final-newline": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
-      }
-    },
-    "node_modules/exit": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-      "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/expand-brackets": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-      "dev": true,
-      "dependencies": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-template": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
-      "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
-      "optional": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/expand-tilde": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-      "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
-      "dev": true,
-      "dependencies": {
-        "homedir-polyfill": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expect": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-26.5.2.tgz",
-      "integrity": "sha512-ccTGrXZd8DZCcvCz4htGXTkd/LOoy6OEtiDS38x3/VVf6E4AQL0QoeksBiw7BtGR5xDNiRYPB8GN6pfbuTOi7w==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^26.5.2",
-        "ansi-styles": "^4.0.0",
-        "jest-get-type": "^26.3.0",
-        "jest-matcher-utils": "^26.5.2",
-        "jest-message-util": "^26.5.2",
-        "jest-regex-util": "^26.0.0"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/express": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
-      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
-      "dependencies": {
-        "accepts": "~1.3.7",
-        "array-flatten": "1.1.1",
-        "body-parser": "1.19.0",
-        "content-disposition": "0.5.3",
-        "content-type": "~1.0.4",
-        "cookie": "0.4.0",
-        "cookie-signature": "1.0.6",
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
-        "fresh": "0.5.2",
-        "merge-descriptors": "1.0.1",
-        "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.5",
-        "qs": "6.7.0",
-        "range-parser": "~1.2.1",
-        "safe-buffer": "5.1.2",
-        "send": "0.17.1",
-        "serve-static": "1.14.1",
-        "setprototypeof": "1.1.1",
-        "statuses": "~1.5.0",
-        "type-is": "~1.6.18",
-        "utils-merge": "1.0.1",
-        "vary": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/ext": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz",
-      "integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==",
-      "dev": true,
-      "dependencies": {
-        "type": "^2.0.0"
-      }
-    },
-    "node_modules/ext/node_modules/type": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/type/-/type-2.1.0.tgz",
-      "integrity": "sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA==",
-      "dev": true
-    },
-    "node_modules/extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
-    },
-    "node_modules/extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-      "dev": true,
-      "dependencies": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extend-shallow/node_modules/is-extendable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-      "dev": true,
-      "dependencies": {
-        "is-plain-object": "^2.0.4"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/external-editor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
-      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
-      "dependencies": {
-        "chardet": "^0.7.0",
-        "iconv-lite": "^0.4.24",
-        "tmp": "^0.0.33"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/external-editor/node_modules/tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-      "dependencies": {
-        "os-tmpdir": "~1.0.2"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
-    "node_modules/extglob": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-      "dev": true,
-      "dependencies": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extglob/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extglob/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extglob/node_modules/is-accessor-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extglob/node_modules/is-data-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extglob/node_modules/is-descriptor": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extsprintf": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.0.tgz",
-      "integrity": "sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=",
-      "engines": [
-        "node >=0.6.0"
-      ]
-    },
-    "node_modules/faker": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/faker/-/faker-5.1.0.tgz",
-      "integrity": "sha512-RrWKFSSA/aNLP0g3o2WW1Zez7/MnMr7xkiZmoCfAGZmdkDQZ6l2KtuXHN5XjdvpRjDl8+3vf+Rrtl06Z352+Mw==",
-      "dev": true
-    },
-    "node_modules/fancy-log": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
-      "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
-      "dev": true,
-      "dependencies": {
-        "ansi-gray": "^0.1.1",
-        "color-support": "^1.1.3",
-        "parse-node-version": "^1.0.0",
-        "time-stamp": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
-    },
-    "node_modules/fast-glob": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz",
-      "integrity": "sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==",
-      "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.0",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.2",
-        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/fast-json-parse": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/fast-json-parse/-/fast-json-parse-1.0.3.tgz",
-      "integrity": "sha512-FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw=="
-    },
-    "node_modules/fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
-    },
-    "node_modules/fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-      "dev": true
-    },
-    "node_modules/fast-safe-stringify": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz",
-      "integrity": "sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==",
-      "dev": true
-    },
-    "node_modules/fastq": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz",
-      "integrity": "sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==",
-      "dependencies": {
-        "reusify": "^1.0.4"
-      }
-    },
-    "node_modules/faye-websocket": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
-      "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
-      "dev": true,
-      "dependencies": {
-        "websocket-driver": ">=0.5.1"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/fb-watchman": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
-      "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
-      "dev": true,
-      "dependencies": {
-        "bser": "2.1.1"
-      }
-    },
-    "node_modules/fd-slicer": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
-      "dev": true,
-      "dependencies": {
-        "pend": "~1.2.0"
-      }
-    },
-    "node_modules/figgy-pudding": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
-      "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==",
-      "dev": true
-    },
-    "node_modules/figures": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
-      "dependencies": {
-        "escape-string-regexp": "^1.0.5"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "dev": true,
-      "dependencies": {
-        "flat-cache": "^3.0.4"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/file-loader": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.0.0.tgz",
-      "integrity": "sha512-/aMOAYEFXDdjG0wytpTL5YQLfZnnTmLNjn+AIrJ/6HVnTfDqLsVKUUwkDf4I4kgex36BvjuXEn/TX9B/1ESyqQ==",
-      "dev": true,
-      "dependencies": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^2.6.5"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/file-uri-to-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
-      "dependencies": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
-        "unpipe": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/find-cache-dir": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
-      "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
-      "dev": true,
-      "dependencies": {
-        "commondir": "^1.0.1",
-        "make-dir": "^3.0.2",
-        "pkg-dir": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
-      }
-    },
-    "node_modules/find-cache-dir/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/find-cache-dir/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/find-cache-dir/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/find-cache-dir/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/find-cache-dir/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/find-cache-dir/node_modules/pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/find-up": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-      "dependencies": {
-        "locate-path": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/findup-sync": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
-      "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
-      "dev": true,
-      "dependencies": {
-        "detect-file": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "micromatch": "^3.0.4",
-        "resolve-dir": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/findup-sync/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
-      "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/findup-sync/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/findup-sync/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/findup-sync/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/findup-sync/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/findup-sync/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/findup-sync/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/findup-sync/node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/findup-sync/node_modules/to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/fined": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
-      "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
-      "dev": true,
-      "dependencies": {
-        "expand-tilde": "^2.0.2",
-        "is-plain-object": "^2.0.3",
-        "object.defaults": "^1.1.0",
-        "object.pick": "^1.2.0",
-        "parse-filepath": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/flagged-respawn": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
-      "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/flat-cache": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-      "dev": true,
-      "dependencies": {
-        "flatted": "^3.1.0",
-        "rimraf": "^3.0.2"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/flatted": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz",
-      "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==",
-      "dev": true
-    },
-    "node_modules/flush-write-stream": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
-      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.3.6"
-      }
-    },
-    "node_modules/follow-redirects": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz",
-      "integrity": "sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/RubenVerborgh"
-        }
-      ],
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/for-in": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/for-own": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
-      "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
-      "dev": true,
-      "dependencies": {
-        "for-in": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 0.12"
-      }
-    },
-    "node_modules/formidable": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.2.tgz",
-      "integrity": "sha512-V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q==",
-      "dev": true,
-      "funding": {
-        "url": "https://ko-fi.com/tunnckoCore/commissions"
-      }
-    },
-    "node_modules/forwarded": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/fragment-cache": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
-      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
-      "dev": true,
-      "dependencies": {
-        "map-cache": "^0.2.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/from2": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
-      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0"
-      }
-    },
-    "node_modules/fs-constants": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-      "optional": true
-    },
-    "node_modules/fs-extra": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
-      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
-      "dependencies": {
-        "at-least-node": "^1.0.0",
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/fs-minipass": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/fs-mkdirp-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
-      "integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.11",
-        "through2": "^2.0.3"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/fs-write-stream-atomic": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
-      "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "iferr": "^0.1.5",
-        "imurmurhash": "^0.1.4",
-        "readable-stream": "1 || 2"
-      }
-    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
-    },
-    "node_modules/fsevents": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
-      "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
-      "deprecated": "\"Please update to latest v2.3 or v2.2\"",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
-    "node_modules/ftp": {
-      "version": "0.3.10",
-      "resolved": "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz",
-      "integrity": "sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "1.1.x",
-        "xregexp": "2.0.0"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/ftp/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-      "dev": true
-    },
-    "node_modules/ftp/node_modules/readable-stream": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/ftp/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-      "dev": true
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
-    "node_modules/functional-red-black-tree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-      "dev": true
-    },
-    "node_modules/gauge": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-      "dependencies": {
-        "aproba": "^1.0.3",
-        "console-control-strings": "^1.0.0",
-        "has-unicode": "^2.0.0",
-        "object-assign": "^4.1.0",
-        "signal-exit": "^3.0.0",
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wide-align": "^1.1.0"
-      }
-    },
-    "node_modules/gauge/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gauge/node_modules/is-fullwidth-code-point": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-      "dependencies": {
-        "number-is-nan": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gauge/node_modules/string-width": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-      "dependencies": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
-        "strip-ansi": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gauge/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/genfun": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/genfun/-/genfun-5.0.0.tgz",
-      "integrity": "sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==",
-      "dev": true
-    },
-    "node_modules/gensync": {
-      "version": "1.0.0-beta.1",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz",
-      "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true,
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
-      }
-    },
-    "node_modules/get-intrinsic": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
-      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/get-package-type": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
-      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/get-stream": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/get-uri": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-3.0.2.tgz",
-      "integrity": "sha512-+5s0SJbGoyiJTZZ2JTpFPLMPSch72KEqGOTvQsBqg0RBWvwhWUSYZFAtz3TPW0GXJuLBJPts1E241iHg+VRfhg==",
-      "dev": true,
-      "dependencies": {
-        "@tootallnate/once": "1",
-        "data-uri-to-buffer": "3",
-        "debug": "4",
-        "file-uri-to-path": "2",
-        "fs-extra": "^8.1.0",
-        "ftp": "^0.3.10"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/get-uri/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/get-uri/node_modules/file-uri-to-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-2.0.0.tgz",
-      "integrity": "sha512-hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/get-uri/node_modules/fs-extra": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=6 <7 || >=8"
-      }
-    },
-    "node_modules/get-uri/node_modules/jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-      "dev": true,
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/get-uri/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/get-uri/node_modules/universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
-    "node_modules/get-value": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "dependencies": {
-        "assert-plus": "^1.0.0"
-      }
-    },
-    "node_modules/github-from-package": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
-      "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=",
-      "optional": true
-    },
-    "node_modules/glob": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/glob-parent": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
-      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/glob-stream": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz",
-      "integrity": "sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=",
-      "dev": true,
-      "dependencies": {
-        "extend": "^3.0.0",
-        "glob": "^7.1.1",
-        "glob-parent": "^3.1.0",
-        "is-negated-glob": "^1.0.0",
-        "ordered-read-streams": "^1.0.0",
-        "pumpify": "^1.3.5",
-        "readable-stream": "^2.1.5",
-        "remove-trailing-separator": "^1.0.1",
-        "to-absolute-glob": "^2.0.0",
-        "unique-stream": "^2.0.2"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/glob-stream/node_modules/glob-parent": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
-      }
-    },
-    "node_modules/glob-stream/node_modules/is-glob": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-watcher": {
-      "version": "5.0.5",
-      "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.5.tgz",
-      "integrity": "sha512-zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw==",
-      "dev": true,
-      "dependencies": {
-        "anymatch": "^2.0.0",
-        "async-done": "^1.2.0",
-        "chokidar": "^2.0.0",
-        "is-negated-glob": "^1.0.0",
-        "just-debounce": "^1.0.0",
-        "normalize-path": "^3.0.0",
-        "object.defaults": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/anymatch": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-      "dev": true,
-      "dependencies": {
-        "micromatch": "^3.1.4",
-        "normalize-path": "^2.1.1"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/anymatch/node_modules/normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-      "dev": true,
-      "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/binary-extensions": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
-      "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/chokidar": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-      "deprecated": "Chokidar 2 will break on node v14+. Upgrade to chokidar 3 with 15x less dependencies.",
-      "dev": true,
-      "dependencies": {
-        "anymatch": "^2.0.0",
-        "async-each": "^1.0.1",
-        "braces": "^2.3.2",
-        "glob-parent": "^3.1.0",
-        "inherits": "^2.0.3",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "normalize-path": "^3.0.0",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.2.1",
-        "upath": "^1.1.1"
-      },
-      "optionalDependencies": {
-        "fsevents": "^1.2.7"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/fsevents": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-      "deprecated": "fsevents 1 will break on node v14+ and could be using insecure binaries. Upgrade to fsevents 2.",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "dependencies": {
-        "bindings": "^1.5.0",
-        "nan": "^2.12.1"
-      },
-      "engines": {
-        "node": ">= 4.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/glob-parent": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/glob-parent/node_modules/is-glob": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/is-binary-path": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-      "dev": true,
-      "dependencies": {
-        "binary-extensions": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/readdirp": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.11",
-        "micromatch": "^3.1.10",
-        "readable-stream": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/global-dirs": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-2.1.0.tgz",
-      "integrity": "sha512-MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ==",
-      "dependencies": {
-        "ini": "1.3.7"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/global-dirs/node_modules/ini": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.7.tgz",
-      "integrity": "sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ=="
-    },
-    "node_modules/global-modules": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
-      "dev": true,
-      "dependencies": {
-        "global-prefix": "^1.0.1",
-        "is-windows": "^1.0.1",
-        "resolve-dir": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/global-prefix": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
-      "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
-      "dev": true,
-      "dependencies": {
-        "expand-tilde": "^2.0.2",
-        "homedir-polyfill": "^1.0.1",
-        "ini": "^1.3.4",
-        "is-windows": "^1.0.1",
-        "which": "^1.2.14"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/global-prefix/node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
-    "node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/globby": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz",
-      "integrity": "sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==",
-      "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.1.1",
-        "ignore": "^5.1.4",
-        "merge2": "^1.3.0",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/glogg": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
-      "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
-      "dev": true,
-      "dependencies": {
-        "sparkles": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/got": {
-      "version": "9.6.0",
-      "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
-      "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==",
-      "dependencies": {
-        "@sindresorhus/is": "^0.14.0",
-        "@szmarczak/http-timer": "^1.1.2",
-        "cacheable-request": "^6.0.0",
-        "decompress-response": "^3.3.0",
-        "duplexer3": "^0.1.4",
-        "get-stream": "^4.1.0",
-        "lowercase-keys": "^1.0.1",
-        "mimic-response": "^1.0.1",
-        "p-cancelable": "^1.0.0",
-        "to-readable-stream": "^1.0.0",
-        "url-parse-lax": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/got/node_modules/get-stream": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/graceful-fs": {
-      "version": "4.2.4",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="
-    },
-    "node_modules/growly": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
-      "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/gulp": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz",
-      "integrity": "sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==",
-      "dev": true,
-      "dependencies": {
-        "glob-watcher": "^5.0.3",
-        "gulp-cli": "^2.2.0",
-        "undertaker": "^1.2.1",
-        "vinyl-fs": "^3.0.0"
-      },
-      "bin": {
-        "gulp": "bin/gulp.js"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/gulp-clip-empty-files": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/gulp-clip-empty-files/-/gulp-clip-empty-files-0.1.2.tgz",
-      "integrity": "sha1-vumATiU7vaVc+8Em6NuuZDPtzMg=",
-      "dev": true,
-      "dependencies": {
-        "through2": "~2.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-concat": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz",
-      "integrity": "sha1-Yz0WyV2IUEYorQJmVmPO5aR5M1M=",
-      "dev": true,
-      "dependencies": {
-        "concat-with-sourcemaps": "^1.0.0",
-        "through2": "^2.0.0",
-        "vinyl": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/gulp-flatten": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/gulp-flatten/-/gulp-flatten-0.4.0.tgz",
-      "integrity": "sha512-eg4spVTAiv1xXmugyaCxWne1oPtNG0UHEtABx5W8ScLiqAYceyYm6GYA36x0Qh8KOIXmAZV97L2aYGnKREG3Sg==",
-      "dev": true,
-      "dependencies": {
-        "plugin-error": "^0.1.2",
-        "through2": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/gulp-htmlmin": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/gulp-htmlmin/-/gulp-htmlmin-5.0.1.tgz",
-      "integrity": "sha512-ASlyDPZOSKjHYUifYV0rf9JPDflN9IRIb8lw2vRqtYMC4ljU3zAmnnaVXwFQ3H+CfXxZSUesZ2x7jrnPJu93jA==",
-      "dev": true,
-      "dependencies": {
-        "html-minifier": "^3.5.20",
-        "plugin-error": "^1.0.1",
-        "through2": "^2.0.3"
-      },
-      "engines": {
-        "node": ">= 6.0"
-      }
-    },
-    "node_modules/gulp-htmlmin/node_modules/ansi-colors": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-wrap": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-htmlmin/node_modules/plugin-error": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
-      "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-colors": "^1.0.1",
-        "arr-diff": "^4.0.0",
-        "arr-union": "^3.1.0",
-        "extend-shallow": "^3.0.2"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/gulp-rename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-2.0.0.tgz",
-      "integrity": "sha512-97Vba4KBzbYmR5VBs9mWmK+HwIf5mj+/zioxfZhOKeXtx5ZjBk57KFlePf5nxq9QsTtFl0ejnHE3zTC9MHXqyQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/gulp-slash": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/gulp-slash/-/gulp-slash-1.1.3.tgz",
-      "integrity": "sha1-8VUhrCOxeNtE5VHjDi/Lykv2/h0=",
-      "dev": true,
-      "dependencies": {
-        "slash": "~0.1.3",
-        "through2": "~0.5.1"
-      }
-    },
-    "node_modules/gulp-slash/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-      "dev": true
-    },
-    "node_modules/gulp-slash/node_modules/readable-stream": {
-      "version": "1.0.34",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-      "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/gulp-slash/node_modules/slash": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-0.1.3.tgz",
-      "integrity": "sha1-qnEMjvULjh0YetbP9G84xla6Dlc=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/gulp-slash/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-      "dev": true
-    },
-    "node_modules/gulp-slash/node_modules/through2": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
-      "integrity": "sha1-390BLrnHAOIyP9M084rGIqs3Lac=",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "~1.0.17",
-        "xtend": "~3.0.0"
-      }
-    },
-    "node_modules/gulp-slash/node_modules/xtend": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
-      "integrity": "sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4"
-      }
-    },
-    "node_modules/gulp/node_modules/ansi-colors": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-wrap": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp/node_modules/camelcase": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp/node_modules/cliui": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wrap-ansi": "^2.0.0"
-      }
-    },
-    "node_modules/gulp/node_modules/find-up": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-      "dev": true,
-      "dependencies": {
-        "path-exists": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp/node_modules/get-caller-file": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
-      "dev": true
-    },
-    "node_modules/gulp/node_modules/gulp-cli": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.3.0.tgz",
-      "integrity": "sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-colors": "^1.0.1",
-        "archy": "^1.0.0",
-        "array-sort": "^1.0.0",
-        "color-support": "^1.1.3",
-        "concat-stream": "^1.6.0",
-        "copy-props": "^2.0.1",
-        "fancy-log": "^1.3.2",
-        "gulplog": "^1.0.0",
-        "interpret": "^1.4.0",
-        "isobject": "^3.0.1",
-        "liftoff": "^3.1.0",
-        "matchdep": "^2.0.0",
-        "mute-stdout": "^1.0.0",
-        "pretty-hrtime": "^1.0.0",
-        "replace-homedir": "^1.0.0",
-        "semver-greatest-satisfied-range": "^1.1.0",
-        "v8flags": "^3.2.0",
-        "yargs": "^7.1.0"
-      },
-      "bin": {
-        "gulp": "bin/gulp.js"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/gulp/node_modules/is-fullwidth-code-point": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-      "dev": true,
-      "dependencies": {
-        "number-is-nan": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp/node_modules/load-json-file": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "strip-bom": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp/node_modules/parse-json": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-      "dev": true,
-      "dependencies": {
-        "error-ex": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp/node_modules/path-exists": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-      "dev": true,
-      "dependencies": {
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp/node_modules/path-type": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp/node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp/node_modules/read-pkg": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-      "dev": true,
-      "dependencies": {
-        "load-json-file": "^1.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp/node_modules/read-pkg-up": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^1.0.0",
-        "read-pkg": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp/node_modules/require-main-filename": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
-      "dev": true
-    },
-    "node_modules/gulp/node_modules/string-width": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-      "dev": true,
-      "dependencies": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
-        "strip-ansi": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp/node_modules/strip-bom": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-      "dev": true,
-      "dependencies": {
-        "is-utf8": "^0.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp/node_modules/which-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
-      "dev": true
-    },
-    "node_modules/gulp/node_modules/wrap-ansi": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp/node_modules/y18n": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-      "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
-      "dev": true
-    },
-    "node_modules/gulp/node_modules/yargs": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.1.tgz",
-      "integrity": "sha512-huO4Fr1f9PmiJJdll5kwoS2e4GqzGSsMT3PPMpOwoVkOK8ckqAewMTZyA6LXVQWflleb/Z8oPBEvNsMft0XE+g==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^3.0.0",
-        "cliui": "^3.2.0",
-        "decamelize": "^1.1.1",
-        "get-caller-file": "^1.0.1",
-        "os-locale": "^1.4.0",
-        "read-pkg-up": "^1.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^1.0.1",
-        "set-blocking": "^2.0.0",
-        "string-width": "^1.0.2",
-        "which-module": "^1.0.0",
-        "y18n": "^3.2.1",
-        "yargs-parser": "5.0.0-security.0"
-      }
-    },
-    "node_modules/gulp/node_modules/yargs-parser": {
-      "version": "5.0.0-security.0",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0-security.0.tgz",
-      "integrity": "sha512-T69y4Ps64LNesYxeYGYPvfoMTt/7y1XtfpIslUeK4um+9Hu7hlGoRtaDLvdXb7+/tfq4opVa2HRY5xGip022rQ==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^3.0.0",
-        "object.assign": "^4.1.0"
-      }
-    },
-    "node_modules/gulplog": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
-      "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
-      "dev": true,
-      "dependencies": {
-        "glogg": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/handle-thing": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
-      "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
-      "dev": true
-    },
-    "node_modules/har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/har-validator": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
-      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
-      "deprecated": "this library is no longer supported",
-      "dependencies": {
-        "ajv": "^6.12.3",
-        "har-schema": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/has-bigints": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
-      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/has-symbols": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
-      "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-unicode": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
-    },
-    "node_modules/has-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
-      "dev": true,
-      "dependencies": {
-        "get-value": "^2.0.6",
-        "has-values": "^1.0.0",
-        "isobject": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-value/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-values": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "kind-of": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-values/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-values/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-values/node_modules/kind-of": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-      "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-yarn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz",
-      "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/hash-base": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
-      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/hash-base/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/hash-base/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/hash.js": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "minimalistic-assert": "^1.0.1"
-      }
-    },
-    "node_modules/he": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-      "dev": true,
-      "bin": {
-        "he": "bin/he"
-      }
-    },
-    "node_modules/hex-color-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
-      "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==",
-      "dev": true
-    },
-    "node_modules/hmac-drbg": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-      "dev": true,
-      "dependencies": {
-        "hash.js": "^1.0.3",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "node_modules/homedir-polyfill": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
-      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
-      "dev": true,
-      "dependencies": {
-        "parse-passwd": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hosted-git-info": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.5.tgz",
-      "integrity": "sha512-i4dpK6xj9BIpVOTboXIlKG9+8HMKggcrMX7WA24xZtKwX0TPelq/rbaS5rCKeNX8sJXZJGdSxpnEGtta+wismQ==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/hpack.js": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-      "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "obuf": "^1.0.0",
-        "readable-stream": "^2.0.1",
-        "wbuf": "^1.1.0"
-      }
-    },
-    "node_modules/hsl-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz",
-      "integrity": "sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4=",
-      "dev": true
-    },
-    "node_modules/hsla-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz",
-      "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg=",
-      "dev": true
-    },
-    "node_modules/html-comment-regex": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz",
-      "integrity": "sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==",
-      "dev": true
-    },
-    "node_modules/html-encoding-sniffer": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
-      "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
-      "dev": true,
-      "dependencies": {
-        "whatwg-encoding": "^1.0.5"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/html-entities": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.3.1.tgz",
-      "integrity": "sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==",
-      "dev": true
-    },
-    "node_modules/html-escaper": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-      "dev": true
-    },
-    "node_modules/html-minifier": {
-      "version": "3.5.21",
-      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz",
-      "integrity": "sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==",
-      "dev": true,
-      "dependencies": {
-        "camel-case": "3.0.x",
-        "clean-css": "4.2.x",
-        "commander": "2.17.x",
-        "he": "1.2.x",
-        "param-case": "2.1.x",
-        "relateurl": "0.2.x",
-        "uglify-js": "3.4.x"
-      },
-      "bin": {
-        "html-minifier": "cli.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/html-minifier/node_modules/commander": {
-      "version": "2.17.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
-      "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
-      "dev": true
-    },
-    "node_modules/htmlparser2": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
-      "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "^1.3.1",
-        "domhandler": "^2.3.0",
-        "domutils": "^1.5.1",
-        "entities": "^1.1.1",
-        "inherits": "^2.0.1",
-        "readable-stream": "^3.1.1"
-      }
-    },
-    "node_modules/htmlparser2/node_modules/entities": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
-      "dev": true
-    },
-    "node_modules/htmlparser2/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/http-cache-semantics": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
-      "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="
-    },
-    "node_modules/http-deceiver": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
-      "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
-      "dev": true
-    },
-    "node_modules/http-errors": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
-      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
-      "dependencies": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.1",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/http-errors/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-    },
-    "node_modules/http-proxy": {
-      "version": "1.18.1",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
-      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
-      "dev": true,
-      "dependencies": {
-        "eventemitter3": "^4.0.0",
-        "follow-redirects": "^1.0.0",
-        "requires-port": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/http-proxy-agent": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz",
-      "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==",
-      "dev": true,
-      "dependencies": {
-        "agent-base": "4",
-        "debug": "3.1.0"
-      },
-      "engines": {
-        "node": ">= 4.5.0"
-      }
-    },
-    "node_modules/http-proxy-agent/node_modules/debug": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/http-proxy-middleware": {
-      "version": "0.19.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz",
-      "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==",
-      "dev": true,
-      "dependencies": {
-        "http-proxy": "^1.17.0",
-        "is-glob": "^4.0.0",
-        "lodash": "^4.17.11",
-        "micromatch": "^3.1.10"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/http-proxy-middleware/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
-      "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/http-proxy-middleware/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/http-proxy-middleware/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/http-proxy-middleware/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/http-proxy-middleware/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/http-proxy-middleware/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/http-proxy-middleware/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/http-proxy-middleware/node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/http-proxy-middleware/node_modules/to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "dependencies": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
-      },
-      "engines": {
-        "node": ">=0.8",
-        "npm": ">=1.3.7"
-      }
-    },
-    "node_modules/https-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
-      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
-      "dev": true
-    },
-    "node_modules/https-proxy-agent": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
-      "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
-      "dev": true,
-      "dependencies": {
-        "agent-base": "^4.3.0",
-        "debug": "^3.1.0"
-      },
-      "engines": {
-        "node": ">= 4.5.0"
-      }
-    },
-    "node_modules/https-proxy-agent/node_modules/debug": {
-      "version": "3.2.6",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/https-proxy-agent/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/human-signals": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
-      "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
-      "engines": {
-        "node": ">=8.12.0"
-      }
-    },
-    "node_modules/humanize-ms": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
-      "integrity": "sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=",
-      "dependencies": {
-        "ms": "^2.0.0"
-      }
-    },
-    "node_modules/iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/icss-utils": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz",
-      "integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.14"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/ieee754": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
-      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
-      "devOptional": true
-    },
-    "node_modules/iferr": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
-      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
-      "dev": true
-    },
-    "node_modules/ignore": {
-      "version": "5.1.8",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-      "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/ignore-walk": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz",
-      "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==",
-      "dependencies": {
-        "minimatch": "^3.0.4"
-      }
-    },
-    "node_modules/image-size": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
-      "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=",
-      "dev": true,
-      "optional": true,
-      "bin": {
-        "image-size": "bin/image-size.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/immediate": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
-      "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps="
-    },
-    "node_modules/import-cwd": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
-      "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
-      "dev": true,
-      "dependencies": {
-        "import-from": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/import-fresh": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
-      "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
-      "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/import-from": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
-      "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
-      "dev": true,
-      "dependencies": {
-        "resolve-from": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/import-from/node_modules/resolve-from": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/import-lazy": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
-      "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/import-local": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
-      "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
-      "dev": true,
-      "dependencies": {
-        "pkg-dir": "^3.0.0",
-        "resolve-cwd": "^2.0.0"
-      },
-      "bin": {
-        "import-local-fixture": "fixtures/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "engines": {
-        "node": ">=0.8.19"
-      }
-    },
-    "node_modules/indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/indexes-of": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
-      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
-      "dev": true
-    },
-    "node_modules/infer-owner": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
-      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="
-    },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "node_modules/ini": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
-      "deprecated": "Please update to ini >=1.3.6 to avoid a prototype pollution issue",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/init-package-json": {
-      "version": "1.10.3",
-      "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.10.3.tgz",
-      "integrity": "sha512-zKSiXKhQveNteyhcj1CoOP8tqp1QuxPIPBl8Bid99DGLFqA1p87M6lNgfjJHSBoWJJlidGOv5rWjyYKEB3g2Jw==",
-      "dependencies": {
-        "glob": "^7.1.1",
-        "npm-package-arg": "^4.0.0 || ^5.0.0 || ^6.0.0",
-        "promzard": "^0.3.0",
-        "read": "~1.0.1",
-        "read-package-json": "1 || 2",
-        "semver": "2.x || 3.x || 4 || 5",
-        "validate-npm-package-license": "^3.0.1",
-        "validate-npm-package-name": "^3.0.0"
-      }
-    },
-    "node_modules/init-package-json/node_modules/hosted-git-info": {
-      "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="
-    },
-    "node_modules/init-package-json/node_modules/npm-package-arg": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
-      "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
-      "dependencies": {
-        "hosted-git-info": "^2.7.1",
-        "osenv": "^0.1.5",
-        "semver": "^5.6.0",
-        "validate-npm-package-name": "^3.0.0"
-      }
-    },
-    "node_modules/init-package-json/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/inquirer": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz",
-      "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==",
-      "dependencies": {
-        "ansi-escapes": "^3.2.0",
-        "chalk": "^2.4.2",
-        "cli-cursor": "^2.1.0",
-        "cli-width": "^2.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^2.0.0",
-        "lodash": "^4.17.12",
-        "mute-stream": "0.0.7",
-        "run-async": "^2.2.0",
-        "rxjs": "^6.4.0",
-        "string-width": "^2.1.0",
-        "strip-ansi": "^5.1.0",
-        "through": "^2.3.6"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/inquirer/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/inquirer/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/inquirer/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/inquirer/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-    },
-    "node_modules/inquirer/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/inquirer/node_modules/mute-stream": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
-      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
-    },
-    "node_modules/inquirer/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/insight": {
-      "version": "0.10.3",
-      "resolved": "https://registry.npmjs.org/insight/-/insight-0.10.3.tgz",
-      "integrity": "sha512-YOncxSN6Omh+1Oqxt+OJAvJVMDKw7l6IEG0wT2cTMGxjsTcroOGW4IR926QDzxg/uZHcFZ2cZbckDWdZhc2pZw==",
-      "dependencies": {
-        "async": "^2.6.2",
-        "chalk": "^2.4.2",
-        "conf": "^1.4.0",
-        "inquirer": "^6.3.1",
-        "lodash.debounce": "^4.0.8",
-        "os-name": "^3.1.0",
-        "request": "^2.88.0",
-        "tough-cookie": "^3.0.1",
-        "uuid": "^3.3.2"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/insight/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/insight/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/insight/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/insight/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-    },
-    "node_modules/insight/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/insight/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/internal-ip": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz",
-      "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==",
-      "dev": true,
-      "dependencies": {
-        "default-gateway": "^4.2.0",
-        "ipaddr.js": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/interpret": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
-      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/invariant": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
-      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
-      "dev": true,
-      "dependencies": {
-        "loose-envify": "^1.0.0"
-      }
-    },
-    "node_modules/invert-kv": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ionicons": {
-      "version": "5.5.1",
-      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.1.tgz",
-      "integrity": "sha512-1auVisfaXmkmxINer8Q3kJGHP1vSxk86hf7By95eJ+Av9+oBcNuAEBfSe3jaMaGRVxVw8U/2j23MFq7R3c0HPg==",
-      "dependencies": {
-        "@stencil/core": "^2.5.0"
-      }
-    },
-    "node_modules/ios-sim": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/ios-sim/-/ios-sim-8.0.2.tgz",
-      "integrity": "sha512-P7nEG771bfd+JoMRjnis1gpZOkjTUUxu+4Ek1Z+eoaEEoT9byllU9pxfQ8Df7hL3gSkIQxNwTSLhos2I8tWUQA==",
-      "dependencies": {
-        "bplist-parser": "^0.0.6",
-        "nopt": "1.0.9",
-        "plist": "^3.0.1",
-        "simctl": "^2"
-      },
-      "bin": {
-        "ios-sim": "bin/ios-sim"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/ios-sim/node_modules/bplist-parser": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.0.6.tgz",
-      "integrity": "sha1-ONo0cYF9+dRKs4kuJ3B7u9daEbk="
-    },
-    "node_modules/ios-sim/node_modules/nopt": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.9.tgz",
-      "integrity": "sha1-O8DXy6e/sNWmdtvtfA6+SKT9RU4=",
-      "dependencies": {
-        "abbrev": "1"
-      },
-      "bin": {
-        "nopt": "bin/nopt.js"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/ip": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
-      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
-    },
-    "node_modules/ip-regex": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
-      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/ipaddr.js": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/is-absolute": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
-      "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
-      "dev": true,
-      "dependencies": {
-        "is-relative": "^1.0.0",
-        "is-windows": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-absolute-url": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
-      "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-arguments": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
-      "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-      "dev": true
-    },
-    "node_modules/is-bigint": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.1.tgz",
-      "integrity": "sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dev": true,
-      "dependencies": {
-        "binary-extensions": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-boolean-object": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.0.tgz",
-      "integrity": "sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
-    },
-    "node_modules/is-callable": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz",
-      "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-ci": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
-      "dependencies": {
-        "ci-info": "^2.0.0"
-      },
-      "bin": {
-        "is-ci": "bin.js"
-      }
-    },
-    "node_modules/is-color-stop": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz",
-      "integrity": "sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=",
-      "dev": true,
-      "dependencies": {
-        "css-color-names": "^0.0.4",
-        "hex-color-regex": "^1.1.0",
-        "hsl-regex": "^1.0.0",
-        "hsla-regex": "^1.0.0",
-        "rgb-regex": "^1.0.1",
-        "rgba-regex": "^1.0.0"
-      }
-    },
-    "node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-date-object": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
-      "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-descriptor/node_modules/kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-directory": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
-      "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-docker": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz",
-      "integrity": "sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==",
-      "bin": {
-        "is-docker": "cli.js"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/is-generator-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
-      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-glob": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-installed-globally": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.3.2.tgz",
-      "integrity": "sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==",
-      "dependencies": {
-        "global-dirs": "^2.0.1",
-        "is-path-inside": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-interactive": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
-      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-lambda": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
-      "integrity": "sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU="
-    },
-    "node_modules/is-negated-glob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz",
-      "integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-negative-zero": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz",
-      "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/is-npm": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz",
-      "integrity": "sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/is-number-object": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.4.tgz",
-      "integrity": "sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-obj": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
-      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-path-cwd": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
-      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-path-in-cwd": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
-      "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
-      "dev": true,
-      "dependencies": {
-        "is-path-inside": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-path-in-cwd/node_modules/is-path-inside": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
-      "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
-      "dev": true,
-      "dependencies": {
-        "path-is-inside": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-path-inside": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz",
-      "integrity": "sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-plain-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-plain-object/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-potential-custom-element-name": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz",
-      "integrity": "sha1-DFLlS8yjkbssSUsh6GJtczbG45c=",
-      "dev": true
-    },
-    "node_modules/is-regex": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
-      "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-relative": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
-      "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
-      "dev": true,
-      "dependencies": {
-        "is-unc-path": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-resolvable": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
-      "dev": true
-    },
-    "node_modules/is-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-      "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-string": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz",
-      "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-svg": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz",
-      "integrity": "sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==",
-      "dev": true,
-      "dependencies": {
-        "html-comment-regex": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/is-symbol": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
-      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
-    },
-    "node_modules/is-unc-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
-      "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
-      "dev": true,
-      "dependencies": {
-        "unc-path-regex": "^0.1.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-utf8": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-      "dev": true
-    },
-    "node_modules/is-valid-glob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
-      "integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-windows": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-wsl": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-      "dependencies": {
-        "is-docker": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-yarn-global": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz",
-      "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw=="
-    },
-    "node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
-    },
-    "node_modules/isobject": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-4.0.0.tgz",
-      "integrity": "sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
-    },
-    "node_modules/istanbul-lib-coverage": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
-      "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-instrument": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
-      "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.7.5",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-coverage": "^3.0.0",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-instrument/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/istanbul-lib-report": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-      "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
-      "dev": true,
-      "dependencies": {
-        "istanbul-lib-coverage": "^3.0.0",
-        "make-dir": "^3.0.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-source-maps": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz",
-      "integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.1.1",
-        "istanbul-lib-coverage": "^3.0.0",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-source-maps/node_modules/debug": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
-      "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
-      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/istanbul-lib-source-maps/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/istanbul-lib-source-maps/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/istanbul-reports": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz",
-      "integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==",
-      "dev": true,
-      "dependencies": {
-        "html-escaper": "^2.0.0",
-        "istanbul-lib-report": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-26.5.2.tgz",
-      "integrity": "sha512-4HFabJVwsgDwul/7rhXJ3yFAF/aUkVIXiJWmgFxb+WMdZG39fVvOwYAs8/3r4AlFPc4m/n5sTMtuMbOL3kNtrQ==",
-      "dev": true,
-      "dependencies": {
-        "@jest/core": "^26.5.2",
-        "import-local": "^3.0.2",
-        "jest-cli": "^26.5.2"
-      },
-      "bin": {
-        "jest": "bin/jest.js"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-changed-files": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.5.2.tgz",
-      "integrity": "sha512-qSmssmiIdvM5BWVtyK/nqVpN3spR5YyvkvPqz1x3BR1bwIxsWmU/MGwLoCrPNLbkG2ASAKfvmJpOduEApBPh2w==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^26.5.2",
-        "execa": "^4.0.0",
-        "throat": "^5.0.0"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-config": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.5.2.tgz",
-      "integrity": "sha512-dqJOnSegNdE5yDiuGHsjTM5gec7Z4AcAMHiW+YscbOYJAlb3LEtDSobXCq0or9EmGQI5SFmKy4T7P1FxetJOfg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.1.0",
-        "@jest/test-sequencer": "^26.5.2",
-        "@jest/types": "^26.5.2",
-        "babel-jest": "^26.5.2",
-        "chalk": "^4.0.0",
-        "deepmerge": "^4.2.2",
-        "glob": "^7.1.1",
-        "graceful-fs": "^4.2.4",
-        "jest-environment-jsdom": "^26.5.2",
-        "jest-environment-node": "^26.5.2",
-        "jest-get-type": "^26.3.0",
-        "jest-jasmine2": "^26.5.2",
-        "jest-regex-util": "^26.0.0",
-        "jest-resolve": "^26.5.2",
-        "jest-util": "^26.5.2",
-        "jest-validate": "^26.5.2",
-        "micromatch": "^4.0.2",
-        "pretty-format": "^26.5.2"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-config/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-diff": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.5.2.tgz",
-      "integrity": "sha512-HCSWDUGwsov5oTlGzrRM+UPJI/Dpqi9jzeV0fdRNi3Ch5bnoXhnyJMmVg2juv9081zLIy3HGPI5mcuGgXM2xRA==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "diff-sequences": "^26.5.0",
-        "jest-get-type": "^26.3.0",
-        "pretty-format": "^26.5.2"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-diff/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-docblock": {
-      "version": "26.0.0",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-26.0.0.tgz",
-      "integrity": "sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w==",
-      "dev": true,
-      "dependencies": {
-        "detect-newline": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-each": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.5.2.tgz",
-      "integrity": "sha512-w7D9FNe0m2D3yZ0Drj9CLkyF/mGhmBSULMQTypzAKR746xXnjUrK8GUJdlLTWUF6dd0ks3MtvGP7/xNFr9Aphg==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^26.5.2",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^26.3.0",
-        "jest-util": "^26.5.2",
-        "pretty-format": "^26.5.2"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-each/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-environment-jsdom": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.5.2.tgz",
-      "integrity": "sha512-fWZPx0bluJaTQ36+PmRpvUtUlUFlGGBNyGX1SN3dLUHHMcQ4WseNEzcGGKOw4U5towXgxI4qDoI3vwR18H0RTw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/environment": "^26.5.2",
-        "@jest/fake-timers": "^26.5.2",
-        "@jest/types": "^26.5.2",
-        "@types/node": "*",
-        "jest-mock": "^26.5.2",
-        "jest-util": "^26.5.2",
-        "jsdom": "^16.4.0"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-environment-node": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.5.2.tgz",
-      "integrity": "sha512-YHjnDsf/GKFCYMGF1V+6HF7jhY1fcLfLNBDjhAOvFGvt6d8vXvNdJGVM7uTZ2VO/TuIyEFhPGaXMX5j3h7fsrA==",
-      "dev": true,
-      "dependencies": {
-        "@jest/environment": "^26.5.2",
-        "@jest/fake-timers": "^26.5.2",
-        "@jest/types": "^26.5.2",
-        "@types/node": "*",
-        "jest-mock": "^26.5.2",
-        "jest-util": "^26.5.2"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-get-type": {
-      "version": "26.3.0",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
-      "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-haste-map": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.5.2.tgz",
-      "integrity": "sha512-lJIAVJN3gtO3k4xy+7i2Xjtwh8CfPcH08WYjZpe9xzveDaqGw9fVNCpkYu6M525wKFVkLmyi7ku+DxCAP1lyMA==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^26.5.2",
-        "@types/graceful-fs": "^4.1.2",
-        "@types/node": "*",
-        "anymatch": "^3.0.3",
-        "fb-watchman": "^2.0.0",
-        "graceful-fs": "^4.2.4",
-        "jest-regex-util": "^26.0.0",
-        "jest-serializer": "^26.5.0",
-        "jest-util": "^26.5.2",
-        "jest-worker": "^26.5.0",
-        "micromatch": "^4.0.2",
-        "sane": "^4.0.3",
-        "walker": "^1.0.7"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      },
-      "optionalDependencies": {
-        "fsevents": "^2.1.2"
-      }
-    },
-    "node_modules/jest-haste-map/node_modules/jest-worker": {
-      "version": "26.5.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.5.0.tgz",
-      "integrity": "sha512-kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^7.0.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      }
-    },
-    "node_modules/jest-jasmine2": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.5.2.tgz",
-      "integrity": "sha512-2J+GYcgLVPTkpmvHEj0/IDTIAuyblGNGlyGe4fLfDT2aktEPBYvoxUwFiOmDDxxzuuEAD2uxcYXr0+1Yw4tjFA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/traverse": "^7.1.0",
-        "@jest/environment": "^26.5.2",
-        "@jest/source-map": "^26.5.0",
-        "@jest/test-result": "^26.5.2",
-        "@jest/types": "^26.5.2",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "co": "^4.6.0",
-        "expect": "^26.5.2",
-        "is-generator-fn": "^2.0.0",
-        "jest-each": "^26.5.2",
-        "jest-matcher-utils": "^26.5.2",
-        "jest-message-util": "^26.5.2",
-        "jest-runtime": "^26.5.2",
-        "jest-snapshot": "^26.5.2",
-        "jest-util": "^26.5.2",
-        "pretty-format": "^26.5.2",
-        "throat": "^5.0.0"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-jasmine2/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-leak-detector": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.5.2.tgz",
-      "integrity": "sha512-h7ia3dLzBFItmYERaLPEtEKxy3YlcbcRSjj0XRNJgBEyODuu+3DM2o62kvIFvs3PsaYoIIv+e+nLRI61Dj1CNw==",
-      "dev": true,
-      "dependencies": {
-        "jest-get-type": "^26.3.0",
-        "pretty-format": "^26.5.2"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-matcher-utils": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.5.2.tgz",
-      "integrity": "sha512-W9GO9KBIC4gIArsNqDUKsLnhivaqf8MSs6ujO/JDcPIQrmY+aasewweXVET8KdrJ6ADQaUne5UzysvF/RR7JYA==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "jest-diff": "^26.5.2",
-        "jest-get-type": "^26.3.0",
-        "pretty-format": "^26.5.2"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-matcher-utils/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-message-util": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.5.2.tgz",
-      "integrity": "sha512-Ocp9UYZ5Jl15C5PNsoDiGEk14A4NG0zZKknpWdZGoMzJuGAkVt10e97tnEVMYpk7LnQHZOfuK2j/izLBMcuCZw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "@jest/types": "^26.5.2",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.4",
-        "micromatch": "^4.0.2",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-message-util/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-mock": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.5.2.tgz",
-      "integrity": "sha512-9SiU4b5PtO51v0MtJwVRqeGEroH66Bnwtq4ARdNP7jNXbpT7+ByeWNAk4NeT/uHfNSVDXEXgQo1XRuwEqS6Rdw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^26.5.2",
-        "@types/node": "*"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-pnp-resolver": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
-      "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      },
-      "peerDependencies": {
-        "jest-resolve": "*"
-      },
-      "peerDependenciesMeta": {
-        "jest-resolve": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jest-preset-angular": {
-      "version": "8.3.1",
-      "resolved": "https://registry.npmjs.org/jest-preset-angular/-/jest-preset-angular-8.3.1.tgz",
-      "integrity": "sha512-WhQm+0tXzikkvIF35XErV87DqYbieZI0R0MIGgn7VE/DDhdbXFDmYQxFZ7w4qcA0cGLLvSMTBbIsUtHeE/rFxQ==",
-      "dev": true,
-      "dependencies": {
-        "pretty-format": "26.x",
-        "ts-jest": "26.x"
-      },
-      "engines": {
-        "node": ">= 10"
-      },
-      "peerDependencies": {
-        "@angular/core": ">=2.0.0",
-        "@angular/platform-browser-dynamic": ">=2.0.0",
-        "jest": "^26.0.0"
-      }
-    },
-    "node_modules/jest-regex-util": {
-      "version": "26.0.0",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz",
-      "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-resolve": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.5.2.tgz",
-      "integrity": "sha512-XsPxojXGRA0CoDD7Vis59ucz2p3cQFU5C+19tz3tLEAlhYKkK77IL0cjYjikY9wXnOaBeEdm1rOgSJjbZWpcZg==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^26.5.2",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.4",
-        "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^26.5.2",
-        "read-pkg-up": "^7.0.1",
-        "resolve": "^1.17.0",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-resolve-dependencies": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.5.2.tgz",
-      "integrity": "sha512-LLkc8LuRtxqOx0AtX/Npa2C4I23WcIrwUgNtHYXg4owYF/ZDQShcwBAHjYZIFR06+HpQcZ43+kCTMlQ3aDCYTg==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^26.5.2",
-        "jest-regex-util": "^26.0.0",
-        "jest-snapshot": "^26.5.2"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/parse-json": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.1.0.tgz",
-      "integrity": "sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "lines-and-columns": "^1.1.6"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/read-pkg": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
-      "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
-      "dev": true,
-      "dependencies": {
-        "@types/normalize-package-data": "^2.4.0",
-        "normalize-package-data": "^2.5.0",
-        "parse-json": "^5.0.0",
-        "type-fest": "^0.6.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/read-pkg-up": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
-      "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^4.1.0",
-        "read-pkg": "^5.2.0",
-        "type-fest": "^0.8.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/read-pkg/node_modules/type-fest": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-      "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-runner": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.5.2.tgz",
-      "integrity": "sha512-GKhYxtSX5+tXZsd2QwfkDqPIj5C2HqOdXLRc2x2qYqWE26OJh17xo58/fN/mLhRkO4y6o60ZVloan7Kk5YA6hg==",
-      "dev": true,
-      "dependencies": {
-        "@jest/console": "^26.5.2",
-        "@jest/environment": "^26.5.2",
-        "@jest/test-result": "^26.5.2",
-        "@jest/types": "^26.5.2",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "emittery": "^0.7.1",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.4",
-        "jest-config": "^26.5.2",
-        "jest-docblock": "^26.0.0",
-        "jest-haste-map": "^26.5.2",
-        "jest-leak-detector": "^26.5.2",
-        "jest-message-util": "^26.5.2",
-        "jest-resolve": "^26.5.2",
-        "jest-runtime": "^26.5.2",
-        "jest-util": "^26.5.2",
-        "jest-worker": "^26.5.0",
-        "source-map-support": "^0.5.6",
-        "throat": "^5.0.0"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-runner/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-runner/node_modules/jest-worker": {
-      "version": "26.5.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.5.0.tgz",
-      "integrity": "sha512-kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^7.0.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      }
-    },
-    "node_modules/jest-runtime": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.5.2.tgz",
-      "integrity": "sha512-zArr4DatX/Sn0wswX/AnAuJgmwgAR5rNtrUz36HR8BfMuysHYNq5sDbYHuLC4ICyRdy5ae/KQ+sczxyS9G6Qvw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/console": "^26.5.2",
-        "@jest/environment": "^26.5.2",
-        "@jest/fake-timers": "^26.5.2",
-        "@jest/globals": "^26.5.2",
-        "@jest/source-map": "^26.5.0",
-        "@jest/test-result": "^26.5.2",
-        "@jest/transform": "^26.5.2",
-        "@jest/types": "^26.5.2",
-        "@types/yargs": "^15.0.0",
-        "chalk": "^4.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "exit": "^0.1.2",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.4",
-        "jest-config": "^26.5.2",
-        "jest-haste-map": "^26.5.2",
-        "jest-message-util": "^26.5.2",
-        "jest-mock": "^26.5.2",
-        "jest-regex-util": "^26.0.0",
-        "jest-resolve": "^26.5.2",
-        "jest-snapshot": "^26.5.2",
-        "jest-util": "^26.5.2",
-        "jest-validate": "^26.5.2",
-        "slash": "^3.0.0",
-        "strip-bom": "^4.0.0",
-        "yargs": "^15.4.1"
-      },
-      "bin": {
-        "jest-runtime": "bin/jest-runtime.js"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/cliui": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^6.2.0"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/jest-runtime/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/string-width": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/wrap-ansi": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/yargs": {
-      "version": "15.4.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
-      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
-      "dev": true,
-      "dependencies": {
-        "cliui": "^6.0.0",
-        "decamelize": "^1.2.0",
-        "find-up": "^4.1.0",
-        "get-caller-file": "^2.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^4.2.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^18.1.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/yargs-parser": {
-      "version": "18.1.3",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/jest-serializer": {
-      "version": "26.5.0",
-      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.5.0.tgz",
-      "integrity": "sha512-+h3Gf5CDRlSLdgTv7y0vPIAoLgX/SI7T4v6hy+TEXMgYbv+ztzbg5PSN6mUXAT/hXYHvZRWm+MaObVfqkhCGxA==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "graceful-fs": "^4.2.4"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-snapshot": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.5.2.tgz",
-      "integrity": "sha512-MkXIDvEefzDubI/WaDVSRH4xnkuirP/Pz8LhAIDXcVQTmcEfwxywj5LGwBmhz+kAAIldA7XM4l96vbpzltSjqg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.0.0",
-        "@jest/types": "^26.5.2",
-        "@types/babel__traverse": "^7.0.4",
-        "@types/prettier": "^2.0.0",
-        "chalk": "^4.0.0",
-        "expect": "^26.5.2",
-        "graceful-fs": "^4.2.4",
-        "jest-diff": "^26.5.2",
-        "jest-get-type": "^26.3.0",
-        "jest-haste-map": "^26.5.2",
-        "jest-matcher-utils": "^26.5.2",
-        "jest-message-util": "^26.5.2",
-        "jest-resolve": "^26.5.2",
-        "natural-compare": "^1.4.0",
-        "pretty-format": "^26.5.2",
-        "semver": "^7.3.2"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-util": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.5.2.tgz",
-      "integrity": "sha512-WTL675bK+GSSAYgS8z9FWdCT2nccO1yTIplNLPlP0OD8tUk/H5IrWKMMRudIQQ0qp8bb4k+1Qa8CxGKq9qnYdg==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^26.5.2",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.4",
-        "is-ci": "^2.0.0",
-        "micromatch": "^4.0.2"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-util/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-validate": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.5.2.tgz",
-      "integrity": "sha512-FmJks0zY36mp6Af/5sqO6CTL9bNMU45yKCJk3hrz8d2aIqQIlN1pr9HPIwZE8blLaewOla134nt5+xAmWsx3SQ==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^26.5.2",
-        "camelcase": "^6.0.0",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^26.3.0",
-        "leven": "^3.1.0",
-        "pretty-format": "^26.5.2"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-validate/node_modules/camelcase": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.0.0.tgz",
-      "integrity": "sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/jest-validate/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-watcher": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.5.2.tgz",
-      "integrity": "sha512-i3m1NtWzF+FXfJ3ljLBB/WQEp4uaNhX7QcQUWMokcifFTUQBDFyUMEwk0JkJ1kopHbx7Een3KX0Q7+9koGM/Pw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/test-result": "^26.5.2",
-        "@jest/types": "^26.5.2",
-        "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
-        "jest-util": "^26.5.2",
-        "string-length": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-watcher/node_modules/ansi-escapes": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.11.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/jest-watcher/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-watcher/node_modules/type-fest": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-      "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/jest-worker": {
-      "version": "26.0.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.0.0.tgz",
-      "integrity": "sha512-pPaYa2+JnwmiZjK9x7p9BoZht+47ecFCDFA/CJxspHzeDvQcfVBLWzCiWyo+EGrSiQMWZtCFo9iSvMZnAAo8vw==",
-      "dev": true,
-      "dependencies": {
-        "merge-stream": "^2.0.0",
-        "supports-color": "^7.0.0"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest/node_modules/cliui": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^6.2.0"
-      }
-    },
-    "node_modules/jest/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/jest/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest/node_modules/import-local": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
-      "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==",
-      "dev": true,
-      "dependencies": {
-        "pkg-dir": "^4.2.0",
-        "resolve-cwd": "^3.0.0"
-      },
-      "bin": {
-        "import-local-fixture": "fixtures/cli.js"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest/node_modules/jest-cli": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.5.2.tgz",
-      "integrity": "sha512-usm48COuUvRp8YEG5OWOaxbSM0my7eHn3QeBWxiGUuFhvkGVBvl1fic4UjC02EAEQtDv8KrNQUXdQTV6ZZBsoA==",
-      "dev": true,
-      "dependencies": {
-        "@jest/core": "^26.5.2",
-        "@jest/test-result": "^26.5.2",
-        "@jest/types": "^26.5.2",
-        "chalk": "^4.0.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.4",
-        "import-local": "^3.0.2",
-        "is-ci": "^2.0.0",
-        "jest-config": "^26.5.2",
-        "jest-util": "^26.5.2",
-        "jest-validate": "^26.5.2",
-        "prompts": "^2.0.1",
-        "yargs": "^15.4.1"
-      },
-      "bin": {
-        "jest": "bin/jest.js"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/jest/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest/node_modules/pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest/node_modules/resolve-cwd": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
-      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
-      "dev": true,
-      "dependencies": {
-        "resolve-from": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest/node_modules/resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest/node_modules/string-width": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest/node_modules/wrap-ansi": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest/node_modules/yargs": {
-      "version": "15.4.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
-      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
-      "dev": true,
-      "dependencies": {
-        "cliui": "^6.0.0",
-        "decamelize": "^1.2.0",
-        "find-up": "^4.1.0",
-        "get-caller-file": "^2.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^4.2.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^18.1.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest/node_modules/yargs-parser": {
-      "version": "18.1.3",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
-    },
-    "node_modules/js-yaml": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
-      "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
-    },
-    "node_modules/jsdoctypeparser": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/jsdoctypeparser/-/jsdoctypeparser-9.0.0.tgz",
-      "integrity": "sha512-jrTA2jJIL6/DAEILBEh2/w9QxCuwmvNXIry39Ay/HVfhE3o2yVV0U44blYkqdHA/OKloJEqvJy0xU+GSdE2SIw==",
-      "dev": true,
-      "bin": {
-        "jsdoctypeparser": "bin/jsdoctypeparser"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/jsdom": {
-      "version": "16.4.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.4.0.tgz",
-      "integrity": "sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w==",
-      "dev": true,
-      "dependencies": {
-        "abab": "^2.0.3",
-        "acorn": "^7.1.1",
-        "acorn-globals": "^6.0.0",
-        "cssom": "^0.4.4",
-        "cssstyle": "^2.2.0",
-        "data-urls": "^2.0.0",
-        "decimal.js": "^10.2.0",
-        "domexception": "^2.0.1",
-        "escodegen": "^1.14.1",
-        "html-encoding-sniffer": "^2.0.1",
-        "is-potential-custom-element-name": "^1.0.0",
-        "nwsapi": "^2.2.0",
-        "parse5": "5.1.1",
-        "request": "^2.88.2",
-        "request-promise-native": "^1.0.8",
-        "saxes": "^5.0.0",
-        "symbol-tree": "^3.2.4",
-        "tough-cookie": "^3.0.1",
-        "w3c-hr-time": "^1.0.2",
-        "w3c-xmlserializer": "^2.0.0",
-        "webidl-conversions": "^6.1.0",
-        "whatwg-encoding": "^1.0.5",
-        "whatwg-mimetype": "^2.3.0",
-        "whatwg-url": "^8.0.0",
-        "ws": "^7.2.3",
-        "xml-name-validator": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "canvas": "^2.5.0"
-      },
-      "peerDependenciesMeta": {
-        "canvas": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jsdom/node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/jsdom/node_modules/parse5": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
-      "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
-      "dev": true
-    },
-    "node_modules/jsdom/node_modules/ws": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz",
-      "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.3.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "dev": true,
-      "bin": {
-        "jsesc": "bin/jsesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/json-buffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
-      "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg="
-    },
-    "node_modules/json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-      "dev": true
-    },
-    "node_modules/json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
-    },
-    "node_modules/json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
-    },
-    "node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-    },
-    "node_modules/json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-      "dev": true
-    },
-    "node_modules/json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
-    },
-    "node_modules/json3": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz",
-      "integrity": "sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==",
-      "dev": true
-    },
-    "node_modules/json5": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
-      "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/jsonc-parser": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.3.1.tgz",
-      "integrity": "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==",
-      "dev": true
-    },
-    "node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "dependencies": {
-        "universalify": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/jsonparse": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
-      "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
-      "engines": [
-        "node >= 0.2.0"
-      ]
-    },
-    "node_modules/JSONStream": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
-      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
-      "dev": true,
-      "dependencies": {
-        "jsonparse": "^1.2.0",
-        "through": ">=2.2.7 <3"
-      },
-      "bin": {
-        "JSONStream": "bin.js"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/jsprim": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "engines": [
-        "node >=0.6.0"
-      ],
-      "dependencies": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
-        "verror": "1.10.0"
-      }
-    },
-    "node_modules/jsprim/node_modules/extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "engines": [
-        "node >=0.6.0"
-      ]
-    },
-    "node_modules/jszip": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.5.0.tgz",
-      "integrity": "sha512-WRtu7TPCmYePR1nazfrtuF216cIVon/3GWOvHS9QR5bIwSbnxtdpma6un3jyGGNhHsKCSzn5Ypk+EkDRvTGiFA==",
-      "dependencies": {
-        "lie": "~3.3.0",
-        "pako": "~1.0.2",
-        "readable-stream": "~2.3.6",
-        "set-immediate-shim": "~1.0.1"
-      }
-    },
-    "node_modules/just-debounce": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.0.0.tgz",
-      "integrity": "sha1-h/zPrv/AtozRnVX2cilD+SnqNeo=",
-      "dev": true
-    },
-    "node_modules/karma-source-map-support": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz",
-      "integrity": "sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A==",
-      "dev": true,
-      "dependencies": {
-        "source-map-support": "^0.5.5"
-      }
-    },
-    "node_modules/keytar": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/keytar/-/keytar-7.2.0.tgz",
-      "integrity": "sha512-ECSaWvoLKI5SI0pGpZQeUV1/lpBYfkaxvoSp3zkiPOz05VavwSfLi8DdEaa9N2ekQZv3Chy+o7aP6n9mairBgw==",
-      "hasInstallScript": true,
-      "optional": true,
-      "dependencies": {
-        "node-addon-api": "^3.0.0",
-        "prebuild-install": "^6.0.0"
-      }
-    },
-    "node_modules/keyv": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
-      "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==",
-      "dependencies": {
-        "json-buffer": "3.0.0"
-      }
-    },
-    "node_modules/killable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
-      "integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==",
-      "dev": true
-    },
-    "node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/kleur": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/last-run": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
-      "integrity": "sha1-RblpQsF7HHnHchmCWbqUO+v4yls=",
-      "dev": true,
-      "dependencies": {
-        "default-resolution": "^2.0.0",
-        "es6-weak-map": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/latest-version": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz",
-      "integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==",
-      "dependencies": {
-        "package-json": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/lazystream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
-      "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "^2.0.5"
-      },
-      "engines": {
-        "node": ">= 0.6.3"
-      }
-    },
-    "node_modules/lcid": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-      "dev": true,
-      "dependencies": {
-        "invert-kv": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/lead": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz",
-      "integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=",
-      "dev": true,
-      "dependencies": {
-        "flush-write-stream": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/leek": {
-      "version": "0.0.24",
-      "resolved": "https://registry.npmjs.org/leek/-/leek-0.0.24.tgz",
-      "integrity": "sha1-5ADlfw5g2O8r1NBo3EKKVDRdvNo=",
-      "dev": true,
-      "dependencies": {
-        "debug": "^2.1.0",
-        "lodash.assign": "^3.2.0",
-        "rsvp": "^3.0.21"
-      }
-    },
-    "node_modules/leek/node_modules/rsvp": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz",
-      "integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==",
-      "dev": true,
-      "engines": {
-        "node": "0.12.* || 4.* || 6.* || >= 7.*"
-      }
-    },
-    "node_modules/less": {
-      "version": "3.12.2",
-      "resolved": "https://registry.npmjs.org/less/-/less-3.12.2.tgz",
-      "integrity": "sha512-+1V2PCMFkL+OIj2/HrtrvZw0BC0sYLMICJfbQjuj/K8CEnlrFX6R5cKKgzzttsZDHyxQNL1jqMREjKN3ja/E3Q==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^1.10.0"
-      },
-      "bin": {
-        "lessc": "bin/lessc"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "optionalDependencies": {
-        "errno": "^0.1.1",
-        "graceful-fs": "^4.1.2",
-        "image-size": "~0.5.0",
-        "make-dir": "^2.1.0",
-        "mime": "^1.4.1",
-        "native-request": "^1.0.5",
-        "source-map": "~0.6.0"
-      }
-    },
-    "node_modules/less-loader": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-6.1.0.tgz",
-      "integrity": "sha512-/jLzOwLyqJ7Kt3xg5sHHkXtOyShWwFj410K9Si9WO+/h8rmYxxkSR0A3/hFEntWudE20zZnWMtpMYnLzqTVdUA==",
-      "dev": true,
-      "dependencies": {
-        "clone": "^2.1.2",
-        "less": "^3.11.1",
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^2.6.6"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/less/node_modules/make-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "pify": "^4.0.1",
-        "semver": "^5.6.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/less/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "optional": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/less/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/less/node_modules/tslib": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
-      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
-      "dev": true
-    },
-    "node_modules/leven": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/levenary": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz",
-      "integrity": "sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==",
-      "dev": true,
-      "dependencies": {
-        "leven": "^3.1.0"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/license-webpack-plugin": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-2.2.0.tgz",
-      "integrity": "sha512-XPsdL/0brSHf+7dXIlRqotnCQ58RX2au6otkOg4U3dm8uH+Ka/fW4iukEs95uXm+qKe/SBs+s1Ll/aQddKG+tg==",
-      "dev": true,
-      "dependencies": {
-        "@types/webpack-sources": "^0.1.5",
-        "webpack-sources": "^1.2.0"
-      }
-    },
-    "node_modules/lie": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
-      "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
-      "dependencies": {
-        "immediate": "~3.0.5"
-      }
-    },
-    "node_modules/liftoff": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz",
-      "integrity": "sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==",
-      "dev": true,
-      "dependencies": {
-        "extend": "^3.0.0",
-        "findup-sync": "^3.0.0",
-        "fined": "^1.0.1",
-        "flagged-respawn": "^1.0.0",
-        "is-plain-object": "^2.0.4",
-        "object.map": "^1.0.0",
-        "rechoir": "^0.6.2",
-        "resolve": "^1.1.7"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/lines-and-columns": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
-      "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
-      "dev": true
-    },
-    "node_modules/load-json-file": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
-      "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "strip-bom": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/load-json-file/node_modules/parse-json": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-      "dev": true,
-      "dependencies": {
-        "error-ex": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/load-json-file/node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/load-json-file/node_modules/strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/loader-runner": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
-      "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.3.0 <5.0.0 || >=5.10"
-      }
-    },
-    "node_modules/loader-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-      "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      },
-      "engines": {
-        "node": ">=8.9.0"
-      }
-    },
-    "node_modules/locate-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-      "dependencies": {
-        "p-locate": "^2.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/lodash": {
-      "version": "4.17.20",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-      "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
-    },
-    "node_modules/lodash._baseassign": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
-      "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=",
-      "dev": true,
-      "dependencies": {
-        "lodash._basecopy": "^3.0.0",
-        "lodash.keys": "^3.0.0"
-      }
-    },
-    "node_modules/lodash._basecopy": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
-      "dev": true
-    },
-    "node_modules/lodash._bindcallback": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz",
-      "integrity": "sha1-5THCdkTPi1epnhftlbNcdIeJOS4=",
-      "dev": true
-    },
-    "node_modules/lodash._createassigner": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz",
-      "integrity": "sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=",
-      "dev": true,
-      "dependencies": {
-        "lodash._bindcallback": "^3.0.0",
-        "lodash._isiterateecall": "^3.0.0",
-        "lodash.restparam": "^3.0.0"
-      }
-    },
-    "node_modules/lodash._getnative": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
-      "dev": true
-    },
-    "node_modules/lodash._isiterateecall": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
-      "dev": true
-    },
-    "node_modules/lodash.assign": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz",
-      "integrity": "sha1-POnwI0tLIiPilrj6CsH+6OvKZPo=",
-      "dev": true,
-      "dependencies": {
-        "lodash._baseassign": "^3.0.0",
-        "lodash._createassigner": "^3.0.0",
-        "lodash.keys": "^3.0.0"
-      }
-    },
-    "node_modules/lodash.clonedeep": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
-      "dev": true
-    },
-    "node_modules/lodash.debounce": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168="
-    },
-    "node_modules/lodash.flatten": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
-      "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=",
-      "dev": true
-    },
-    "node_modules/lodash.isarguments": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
-      "dev": true
-    },
-    "node_modules/lodash.isarray": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
-      "dev": true
-    },
-    "node_modules/lodash.keys": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
-      "dev": true,
-      "dependencies": {
-        "lodash._getnative": "^3.0.0",
-        "lodash.isarguments": "^3.0.0",
-        "lodash.isarray": "^3.0.0"
-      }
-    },
-    "node_modules/lodash.memoize": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
-      "dev": true
-    },
-    "node_modules/lodash.restparam": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
-      "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
-      "dev": true
-    },
-    "node_modules/lodash.sortby": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
-      "dev": true
-    },
-    "node_modules/lodash.truncate": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-      "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
-      "dev": true
-    },
-    "node_modules/lodash.uniq": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
-      "dev": true
-    },
-    "node_modules/log-symbols": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
-      "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/log-symbols/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/log-symbols/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/log-symbols/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/log-symbols/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/log-symbols/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/log-symbols/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/loglevel": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.0.tgz",
-      "integrity": "sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6.0"
-      },
-      "funding": {
-        "type": "tidelift",
-        "url": "https://tidelift.com/subscription/pkg/npm-loglevel?utm_medium=referral&utm_source=npm_fund"
-      }
-    },
-    "node_modules/loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dev": true,
-      "dependencies": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      },
-      "bin": {
-        "loose-envify": "cli.js"
-      }
-    },
-    "node_modules/loud-rejection": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-2.2.0.tgz",
-      "integrity": "sha512-S0FayMXku80toa5sZ6Ro4C+s+EtFDCsyJNG/AzFMfX3AxD5Si4dZsgzm/kKnbOxHl5Cv8jBlno8+3XYIh2pNjQ==",
-      "dependencies": {
-        "currently-unhandled": "^0.4.1",
-        "signal-exit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/lower-case": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
-      "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=",
-      "dev": true
-    },
-    "node_modules/lowercase-keys": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
-      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/macos-release": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.4.1.tgz",
-      "integrity": "sha512-H/QHeBIN1fIGJX517pvK8IEK53yQOW7YcEI55oYtgjDdoCQQz7eJS94qt5kNrscReEyuD/JcdFCm2XBEcGOITg==",
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/magic-string": {
-      "version": "0.25.7",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
-      "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==",
-      "dev": true,
-      "dependencies": {
-        "sourcemap-codec": "^1.4.4"
-      }
-    },
-    "node_modules/make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "dependencies": {
-        "semver": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/make-dir/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/make-error": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
-      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
-      "dev": true
-    },
-    "node_modules/make-fetch-happen": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz",
-      "integrity": "sha512-07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag==",
-      "dev": true,
-      "dependencies": {
-        "agentkeepalive": "^3.4.1",
-        "cacache": "^12.0.0",
-        "http-cache-semantics": "^3.8.1",
-        "http-proxy-agent": "^2.1.0",
-        "https-proxy-agent": "^2.2.3",
-        "lru-cache": "^5.1.1",
-        "mississippi": "^3.0.0",
-        "node-fetch-npm": "^2.0.2",
-        "promise-retry": "^1.1.1",
-        "socks-proxy-agent": "^4.0.0",
-        "ssri": "^6.0.0"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/cacache": {
-      "version": "12.0.4",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
-      "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
-      "dev": true,
-      "dependencies": {
-        "bluebird": "^3.5.5",
-        "chownr": "^1.1.1",
-        "figgy-pudding": "^3.5.1",
-        "glob": "^7.1.4",
-        "graceful-fs": "^4.1.15",
-        "infer-owner": "^1.0.3",
-        "lru-cache": "^5.1.1",
-        "mississippi": "^3.0.0",
-        "mkdirp": "^0.5.1",
-        "move-concurrently": "^1.0.1",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^2.6.3",
-        "ssri": "^6.0.1",
-        "unique-filename": "^1.1.1",
-        "y18n": "^4.0.0"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/chownr": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-      "dev": true
-    },
-    "node_modules/make-fetch-happen/node_modules/http-cache-semantics": {
-      "version": "3.8.1",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz",
-      "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==",
-      "dev": true
-    },
-    "node_modules/make-fetch-happen/node_modules/lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^3.0.2"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/ssri": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
-      "dev": true,
-      "dependencies": {
-        "figgy-pudding": "^3.5.1"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/yallist": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true
-    },
-    "node_modules/make-iterator": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
-      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/makeerror": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
-      "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
-      "dev": true,
-      "dependencies": {
-        "tmpl": "1.0.x"
-      }
-    },
-    "node_modules/map-cache": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/map-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
-      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
-      "dev": true,
-      "dependencies": {
-        "object-visit": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/matchdep": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
-      "integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4=",
-      "dev": true,
-      "dependencies": {
-        "findup-sync": "^2.0.0",
-        "micromatch": "^3.0.4",
-        "resolve": "^1.4.0",
-        "stack-trace": "0.0.10"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/matchdep/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
-      "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/matchdep/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/matchdep/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/matchdep/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/matchdep/node_modules/findup-sync": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
-      "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
-      "dev": true,
-      "dependencies": {
-        "detect-file": "^1.0.0",
-        "is-glob": "^3.1.0",
-        "micromatch": "^3.0.4",
-        "resolve-dir": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/matchdep/node_modules/is-glob": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/matchdep/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/matchdep/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/matchdep/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/matchdep/node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/matchdep/node_modules/to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/mathjax": {
-      "version": "2.7.7",
-      "resolved": "https://registry.npmjs.org/mathjax/-/mathjax-2.7.7.tgz",
-      "integrity": "sha512-OOl0B2/0tSJAtAZarXnQuLDBLgTNRqiI9VqHTQzPsxf4okT2iIpDrvaklK9x2QEMD1sDj4yRn11Ygci41DxMAQ=="
-    },
-    "node_modules/md5-file": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/md5-file/-/md5-file-5.0.0.tgz",
-      "integrity": "sha512-xbEFXCYVWrSx/gEKS1VPlg84h/4L20znVIulKw6kMfmBUAZNAnF00eczz9ICMl+/hjQGo5KSXRxbL/47X3rmMw==",
-      "bin": {
-        "md5-file": "cli.js"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/md5.js": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
-      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
-      "dev": true,
-      "dependencies": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "node_modules/mdn-browser-compat-data": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/mdn-browser-compat-data/-/mdn-browser-compat-data-1.1.2.tgz",
-      "integrity": "sha512-uBNX2P4iu3PZcXP20rL+n7fxN9PWZLj0y43QMe/1aXzqP3H6HbVOeePS0cBZCtMwcfr2Tugf1OHj+/wLam+dUg==",
-      "deprecated": "mdn-browser-compat-data is deprecated. Upgrade to @mdn/browser-compat-data. Learn more: https://github.com/mdn/browser-compat-data/blob/v1.1.2/UPGRADE-2.0.x.md",
-      "dev": true,
-      "dependencies": {
-        "extend": "3.0.2"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/mdn-data": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
-      "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==",
-      "dev": true
-    },
-    "node_modules/media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/memory-fs": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
-      "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
-      "dev": true,
-      "dependencies": {
-        "errno": "^0.1.3",
-        "readable-stream": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=4.3.0 <5.0.0 || >=5.10"
-      }
-    },
-    "node_modules/merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
-    },
-    "node_modules/merge-source-map": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz",
-      "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
-      "dev": true,
-      "dependencies": {
-        "source-map": "^0.6.1"
-      }
-    },
-    "node_modules/merge-source-map/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
-    },
-    "node_modules/merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/micromatch": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-      "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
-      "dependencies": {
-        "braces": "^3.0.1",
-        "picomatch": "^2.0.5"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/miller-rabin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.0.0",
-        "brorand": "^1.0.1"
-      },
-      "bin": {
-        "miller-rabin": "bin/miller-rabin"
-      }
-    },
-    "node_modules/miller-rabin/node_modules/bn.js": {
-      "version": "4.11.9",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-      "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
-      "dev": true
-    },
-    "node_modules/mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/mime-db": {
-      "version": "1.44.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
-      "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mime-types": {
-      "version": "2.1.27",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
-      "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
-      "dependencies": {
-        "mime-db": "1.44.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/mimic-response": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/mini-css-extract-plugin": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz",
-      "integrity": "sha512-lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A==",
-      "dev": true,
-      "dependencies": {
-        "loader-utils": "^1.1.0",
-        "normalize-url": "1.9.1",
-        "schema-utils": "^1.0.0",
-        "webpack-sources": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 6.9.0"
-      },
-      "peerDependencies": {
-        "webpack": "^4.4.0"
-      }
-    },
-    "node_modules/mini-css-extract-plugin/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/mini-css-extract-plugin/node_modules/loader-utils": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/mini-css-extract-plugin/node_modules/normalize-url": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz",
-      "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
-      "dev": true,
-      "dependencies": {
-        "object-assign": "^4.0.1",
-        "prepend-http": "^1.0.0",
-        "query-string": "^4.1.0",
-        "sort-keys": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/mini-css-extract-plugin/node_modules/prepend-http": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
-      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.1.0",
-        "ajv-errors": "^1.0.0",
-        "ajv-keywords": "^3.1.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-      "dev": true
-    },
-    "node_modules/minimalistic-crypto-utils": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
-      "dev": true
-    },
-    "node_modules/minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
-    },
-    "node_modules/minipass": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
-      "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minipass-collect": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
-      "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/minipass-fetch": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.3.4.tgz",
-      "integrity": "sha512-TielGogIzbUEtd1LsjZFs47RWuHHfhl6TiCx1InVxApBAmQ8bL0dL5ilkLGcRvuyW/A9nE+Lvn855Ewz8S0PnQ==",
-      "dependencies": {
-        "minipass": "^3.1.0",
-        "minipass-sized": "^1.0.3",
-        "minizlib": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "optionalDependencies": {
-        "encoding": "^0.1.12"
-      }
-    },
-    "node_modules/minipass-flush": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
-      "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/minipass-json-stream": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz",
-      "integrity": "sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==",
-      "dependencies": {
-        "jsonparse": "^1.3.1",
-        "minipass": "^3.0.0"
-      }
-    },
-    "node_modules/minipass-pipeline": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
-      "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minipass-sized": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
-      "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==",
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minizlib": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
-      "dependencies": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/mississippi": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-      "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
-      "dev": true,
-      "dependencies": {
-        "concat-stream": "^1.5.0",
-        "duplexify": "^3.4.2",
-        "end-of-stream": "^1.1.0",
-        "flush-write-stream": "^1.0.0",
-        "from2": "^2.1.0",
-        "parallel-transform": "^1.1.0",
-        "pump": "^3.0.0",
-        "pumpify": "^1.3.3",
-        "stream-each": "^1.1.0",
-        "through2": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/mixin-deep": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
-      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
-      "dev": true,
-      "dependencies": {
-        "for-in": "^1.0.2",
-        "is-extendable": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/mixin-deep/node_modules/is-extendable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-      "dev": true,
-      "dependencies": {
-        "is-plain-object": "^2.0.4"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/mkdirp-classic": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
-      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
-      "optional": true
-    },
-    "node_modules/moment": {
-      "version": "2.29.0",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.0.tgz",
-      "integrity": "sha512-z6IJ5HXYiuxvFTI6eiQ9dm77uE0gyy1yXNApVHqTcnIKfY9tIwEjlzsZ6u1LQXvVgKeTnv9Xm7NDvJ7lso3MtA==",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/move-concurrently": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
-      "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
-      "dev": true,
-      "dependencies": {
-        "aproba": "^1.1.1",
-        "copy-concurrently": "^1.0.0",
-        "fs-write-stream-atomic": "^1.0.8",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.3"
-      }
-    },
-    "node_modules/move-concurrently/node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/move-file": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/move-file/-/move-file-2.0.0.tgz",
-      "integrity": "sha512-cdkdhNCgbP5dvS4tlGxZbD+nloio9GIimP57EjqFhwLcMjnU+XJKAZzlmg/TN/AK1LuNAdTSvm3CPPP4Xkv0iQ==",
-      "dev": true,
-      "dependencies": {
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/move-file/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
-    "node_modules/multicast-dns": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
-      "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
-      "dev": true,
-      "dependencies": {
-        "dns-packet": "^1.3.1",
-        "thunky": "^1.0.2"
-      },
-      "bin": {
-        "multicast-dns": "cli.js"
-      }
-    },
-    "node_modules/multicast-dns-service-types": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
-      "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
-      "dev": true
-    },
-    "node_modules/mute-stdout": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz",
-      "integrity": "sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/mute-stream": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="
-    },
-    "node_modules/nan": {
-      "version": "2.14.1",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz",
-      "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/nanomatch": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
-      "dev": true,
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "fragment-cache": "^0.2.1",
-        "is-windows": "^1.0.2",
-        "kind-of": "^6.0.2",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/napi-build-utils": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
-      "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==",
-      "optional": true
-    },
-    "node_modules/native-request": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/native-request/-/native-request-1.0.7.tgz",
-      "integrity": "sha512-9nRjinI9bmz+S7dgNtf4A70+/vPhnd+2krGpy4SUlADuOuSa24IDkNaZ+R/QT1wQ6S8jBdi6wE7fLekFZNfUpQ==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/native-run": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/native-run/-/native-run-1.4.0.tgz",
-      "integrity": "sha512-3XJiDxGNi6XCsn8KYDQFSYGDVkKEMg0y55qTMU0feEuPNNU4iztBwW5bE87sfybZsQPsYDJQyYt9CUKDSoJgdQ==",
-      "dev": true,
-      "dependencies": {
-        "@ionic/utils-fs": "^3.0.0",
-        "@ionic/utils-terminal": "^2.3.1",
-        "bplist-parser": "0.2.0",
-        "debug": "^4.1.1",
-        "elementtree": "^0.1.7",
-        "ini": "^1.3.5",
-        "plist": "^3.0.1",
-        "split2": "^3.1.0",
-        "through2": "^4.0.2",
-        "tslib": "^2.0.1",
-        "yauzl": "^2.10.0"
-      },
-      "bin": {
-        "native-run": "bin/native-run"
-      },
-      "engines": {
-        "node": ">=10.3.0"
-      }
-    },
-    "node_modules/native-run/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/native-run/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/native-run/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/native-run/node_modules/through2": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
-      "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "3"
-      }
-    },
-    "node_modules/natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-      "dev": true
-    },
-    "node_modules/negotiator": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
-      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/neo-async": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-      "dev": true
-    },
-    "node_modules/netmask": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",
-      "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/next-tick": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
-      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
-      "dev": true
-    },
-    "node_modules/nice-try": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
-    },
-    "node_modules/nl.kingsquare.cordova.background-audio": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/nl.kingsquare.cordova.background-audio/-/nl.kingsquare.cordova.background-audio-1.0.1.tgz",
-      "integrity": "sha1-Gx1NzaijXAx/x5UzN7FzsUtPmGA="
-    },
-    "node_modules/no-case": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
-      "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
-      "dev": true,
-      "dependencies": {
-        "lower-case": "^1.1.1"
-      }
-    },
-    "node_modules/node-abi": {
-      "version": "2.19.3",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.19.3.tgz",
-      "integrity": "sha512-9xZrlyfvKhWme2EXFKQhZRp1yNWT/uI1luYPr3sFl+H4keYY4xR+1jO7mvTTijIsHf1M+QDe9uWuKeEpLInIlg==",
-      "optional": true,
-      "dependencies": {
-        "semver": "^5.4.1"
-      }
-    },
-    "node_modules/node-abi/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "optional": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/node-addon-api": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.0.2.tgz",
-      "integrity": "sha512-+D4s2HCnxPd5PjjI0STKwncjXTUKKqm74MDMz9OPXavjsGmjkvwgLtA5yoxJUdmpj52+2u+RrXgPipahKczMKg==",
-      "optional": true
-    },
-    "node_modules/node-fetch-npm": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.4.tgz",
-      "integrity": "sha512-iOuIQDWDyjhv9qSDrj9aq/klt6F9z1p2otB3AV7v3zBDcL/x+OfGsvGQZZCcMZbUf4Ujw1xGNQkjvGnVT22cKg==",
-      "dev": true,
-      "dependencies": {
-        "encoding": "^0.1.11",
-        "json-parse-better-errors": "^1.0.0",
-        "safe-buffer": "^5.1.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/node-forge": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
-      "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6.0.0"
-      }
-    },
-    "node_modules/node-gyp": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz",
-      "integrity": "sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==",
-      "dependencies": {
-        "env-paths": "^2.2.0",
-        "glob": "^7.1.4",
-        "graceful-fs": "^4.2.3",
-        "nopt": "^5.0.0",
-        "npmlog": "^4.1.2",
-        "request": "^2.88.2",
-        "rimraf": "^3.0.2",
-        "semver": "^7.3.2",
-        "tar": "^6.0.2",
-        "which": "^2.0.2"
-      },
-      "bin": {
-        "node-gyp": "bin/node-gyp.js"
-      },
-      "engines": {
-        "node": ">= 10.12.0"
-      }
-    },
-    "node_modules/node-gyp/node_modules/env-paths": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
-      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/node-gyp/node_modules/nopt": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
-      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
-      "dependencies": {
-        "abbrev": "1"
-      },
-      "bin": {
-        "nopt": "bin/nopt.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/node-int64": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-      "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
-      "dev": true
-    },
-    "node_modules/node-libs-browser": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
-      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
-      "dev": true,
-      "dependencies": {
-        "assert": "^1.1.1",
-        "browserify-zlib": "^0.2.0",
-        "buffer": "^4.3.0",
-        "console-browserify": "^1.1.0",
-        "constants-browserify": "^1.0.0",
-        "crypto-browserify": "^3.11.0",
-        "domain-browser": "^1.1.1",
-        "events": "^3.0.0",
-        "https-browserify": "^1.0.0",
-        "os-browserify": "^0.3.0",
-        "path-browserify": "0.0.1",
-        "process": "^0.11.10",
-        "punycode": "^1.2.4",
-        "querystring-es3": "^0.2.0",
-        "readable-stream": "^2.3.3",
-        "stream-browserify": "^2.0.1",
-        "stream-http": "^2.7.2",
-        "string_decoder": "^1.0.0",
-        "timers-browserify": "^2.0.4",
-        "tty-browserify": "0.0.0",
-        "url": "^0.11.0",
-        "util": "^0.11.0",
-        "vm-browserify": "^1.0.1"
-      }
-    },
-    "node_modules/node-libs-browser/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-      "dev": true
-    },
-    "node_modules/node-libs-browser/node_modules/punycode": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-      "dev": true
-    },
-    "node_modules/node-libs-browser/node_modules/util": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
-      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "2.0.3"
-      }
-    },
-    "node_modules/node-modules-regexp": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
-      "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/node-notifier": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.0.tgz",
-      "integrity": "sha512-46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "growly": "^1.3.0",
-        "is-wsl": "^2.2.0",
-        "semver": "^7.3.2",
-        "shellwords": "^0.1.1",
-        "uuid": "^8.3.0",
-        "which": "^2.0.2"
-      }
-    },
-    "node_modules/node-notifier/node_modules/uuid": {
-      "version": "8.3.1",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.1.tgz",
-      "integrity": "sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==",
-      "dev": true,
-      "optional": true,
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
-    "node_modules/node-releases": {
-      "version": "1.1.61",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.61.tgz",
-      "integrity": "sha512-DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g==",
-      "dev": true
-    },
-    "node_modules/noop-logger": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz",
-      "integrity": "sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI=",
-      "optional": true
-    },
-    "node_modules/nopt": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
-      "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
-      "dependencies": {
-        "abbrev": "1",
-        "osenv": "^0.1.4"
-      },
-      "bin": {
-        "nopt": "bin/nopt.js"
-      }
-    },
-    "node_modules/normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-      "dependencies": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
-      }
-    },
-    "node_modules/normalize-package-data/node_modules/hosted-git-info": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
-      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="
-    },
-    "node_modules/normalize-package-data/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/normalize-range": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/normalize-url": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
-      "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/now-and-later": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz",
-      "integrity": "sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.3.2"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/npm-bundled": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz",
-      "integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==",
-      "dependencies": {
-        "npm-normalize-package-bin": "^1.0.1"
-      }
-    },
-    "node_modules/npm-install-checks": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-4.0.0.tgz",
-      "integrity": "sha512-09OmyDkNLYwqKPOnbI8exiOZU2GVVmQp7tgez2BPi5OZC8M82elDAps7sxC4l//uSUtotWqoEIDwjRvWH4qz8w==",
-      "dependencies": {
-        "semver": "^7.1.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/npm-normalize-package-bin": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz",
-      "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA=="
-    },
-    "node_modules/npm-package-arg": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.0.1.tgz",
-      "integrity": "sha512-/h5Fm6a/exByzFSTm7jAyHbgOqErl9qSNJDQF32Si/ZzgwT2TERVxRxn3Jurw1wflgyVVAxnFR4fRHPM7y1ClQ==",
-      "dependencies": {
-        "hosted-git-info": "^3.0.2",
-        "semver": "^7.0.0",
-        "validate-npm-package-name": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/npm-packlist": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz",
-      "integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==",
-      "dev": true,
-      "dependencies": {
-        "ignore-walk": "^3.0.1",
-        "npm-bundled": "^1.0.1",
-        "npm-normalize-package-bin": "^1.0.1"
-      }
-    },
-    "node_modules/npm-pick-manifest": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-6.1.0.tgz",
-      "integrity": "sha512-ygs4k6f54ZxJXrzT0x34NybRlLeZ4+6nECAIbr2i0foTnijtS1TJiyzpqtuUAJOps/hO0tNDr8fRV5g+BtRlTw==",
-      "dependencies": {
-        "npm-install-checks": "^4.0.0",
-        "npm-package-arg": "^8.0.0",
-        "semver": "^7.0.0"
-      }
-    },
-    "node_modules/npm-registry-fetch": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.7.tgz",
-      "integrity": "sha512-cny9v0+Mq6Tjz+e0erFAB+RYJ/AVGzkjnISiobqP8OWj9c9FLoZZu8/SPSKJWE17F1tk4018wfjV+ZbIbqC7fQ==",
-      "dev": true,
-      "dependencies": {
-        "bluebird": "^3.5.1",
-        "figgy-pudding": "^3.4.1",
-        "JSONStream": "^1.3.4",
-        "lru-cache": "^5.1.1",
-        "make-fetch-happen": "^5.0.0",
-        "npm-package-arg": "^6.1.0",
-        "safe-buffer": "^5.2.0"
-      }
-    },
-    "node_modules/npm-registry-fetch/node_modules/hosted-git-info": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
-      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
-      "dev": true
-    },
-    "node_modules/npm-registry-fetch/node_modules/lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^3.0.2"
-      }
-    },
-    "node_modules/npm-registry-fetch/node_modules/npm-package-arg": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
-      "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
-      "dev": true,
-      "dependencies": {
-        "hosted-git-info": "^2.7.1",
-        "osenv": "^0.1.5",
-        "semver": "^5.6.0",
-        "validate-npm-package-name": "^3.0.0"
-      }
-    },
-    "node_modules/npm-registry-fetch/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/npm-registry-fetch/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/npm-registry-fetch/node_modules/yallist": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true
-    },
-    "node_modules/npm-run-path": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-      "dependencies": {
-        "path-key": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/npmlog": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
-      "dependencies": {
-        "are-we-there-yet": "~1.1.2",
-        "console-control-strings": "~1.1.0",
-        "gauge": "~2.7.3",
-        "set-blocking": "~2.0.0"
-      }
-    },
-    "node_modules/nth-check": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
-      "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
-      "dev": true,
-      "dependencies": {
-        "boolbase": "~1.0.0"
-      }
-    },
-    "node_modules/num2fraction": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
-      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
-      "dev": true
-    },
-    "node_modules/number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/nwsapi": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
-      "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
-      "dev": true
-    },
-    "node_modules/oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
-      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
-      "dev": true,
-      "dependencies": {
-        "copy-descriptor": "^0.1.0",
-        "define-property": "^0.2.5",
-        "kind-of": "^3.0.3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-inspect": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
-      "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object-is": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.3.tgz",
-      "integrity": "sha512-teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object-path": {
-      "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.11.4.tgz",
-      "integrity": "sha1-NwrnUvvzfePqcKhhwju6iRVpGUk=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-visit": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
-      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-visit/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object.assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz",
-      "integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.0",
-        "has-symbols": "^1.0.1",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.defaults": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
-      "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
-      "dev": true,
-      "dependencies": {
-        "array-each": "^1.0.1",
-        "array-slice": "^1.0.0",
-        "for-own": "^1.0.0",
-        "isobject": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object.defaults/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object.getownpropertydescriptors": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz",
-      "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.getownpropertydescriptors/node_modules/es-abstract": {
-      "version": "1.17.7",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
-      "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
-      "dev": true,
-      "dependencies": {
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1",
-        "is-callable": "^1.2.2",
-        "is-regex": "^1.1.1",
-        "object-inspect": "^1.8.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.1",
-        "string.prototype.trimend": "^1.0.1",
-        "string.prototype.trimstart": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.map": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
-      "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
-      "dev": true,
-      "dependencies": {
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object.pick": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object.pick/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object.reduce": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz",
-      "integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=",
-      "dev": true,
-      "dependencies": {
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object.values": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz",
-      "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/es-abstract": {
-      "version": "1.17.7",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
-      "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
-      "dev": true,
-      "dependencies": {
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1",
-        "is-callable": "^1.2.2",
-        "is-regex": "^1.1.1",
-        "object-inspect": "^1.8.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.1",
-        "string.prototype.trimend": "^1.0.1",
-        "string.prototype.trimstart": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/objectorarray": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/objectorarray/-/objectorarray-1.0.4.tgz",
-      "integrity": "sha512-91k8bjcldstRz1bG6zJo8lWD7c6QXcB4nTDUqiEvIL1xAsLoZlOOZZG+nd6YPz+V7zY1580J4Xxh1vZtyv4i/w=="
-    },
-    "node_modules/obuf": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
-      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
-      "dev": true
-    },
-    "node_modules/on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-      "dependencies": {
-        "ee-first": "1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/on-headers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "node_modules/onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "dependencies": {
-        "mimic-fn": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/open": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/open/-/open-7.3.0.tgz",
-      "integrity": "sha512-mgLwQIx2F/ye9SmbrUkurZCnkoXyXyu9EbHtJZrICjVAJfyMArdHp3KkixGdZx1ZHFPNIwl0DDM1dFFqXbTLZw==",
-      "dependencies": {
-        "is-docker": "^2.0.0",
-        "is-wsl": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/opn": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz",
-      "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==",
-      "dev": true,
-      "dependencies": {
-        "is-wsl": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/opn/node_modules/is-wsl": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/optionator": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-      "dev": true,
-      "dependencies": {
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.3"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/ora": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-4.0.4.tgz",
-      "integrity": "sha512-77iGeVU1cIdRhgFzCK8aw1fbtT1B/iZAvWjS+l/o1x0RShMgxHUZaD2yDpWsNCPwXg9z1ZA78Kbdvr8kBmG/Ww==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^3.0.0",
-        "cli-cursor": "^3.1.0",
-        "cli-spinners": "^2.2.0",
-        "is-interactive": "^1.0.0",
-        "log-symbols": "^3.0.0",
-        "mute-stream": "0.0.8",
-        "strip-ansi": "^6.0.0",
-        "wcwidth": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/ora/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ora/node_modules/cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "dev": true,
-      "dependencies": {
-        "restore-cursor": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ora/node_modules/restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-      "dev": true,
-      "dependencies": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ora/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ordered-read-streams": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz",
-      "integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "^2.0.1"
-      }
-    },
-    "node_modules/original": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz",
-      "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==",
-      "dev": true,
-      "dependencies": {
-        "url-parse": "^1.4.3"
-      }
-    },
-    "node_modules/os-browserify": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
-      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
-      "dev": true
-    },
-    "node_modules/os-homedir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/os-locale": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-      "dev": true,
-      "dependencies": {
-        "lcid": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/os-name": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/os-name/-/os-name-3.1.0.tgz",
-      "integrity": "sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==",
-      "dependencies": {
-        "macos-release": "^2.2.0",
-        "windows-release": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/osenv": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
-      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
-      "dependencies": {
-        "os-homedir": "^1.0.0",
-        "os-tmpdir": "^1.0.0"
-      }
-    },
-    "node_modules/p-cancelable": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
-      "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/p-each-series": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.1.0.tgz",
-      "integrity": "sha512-ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/p-finally": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/p-limit": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-      "dependencies": {
-        "p-try": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/p-limit/node_modules/p-try": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-      "dependencies": {
-        "p-limit": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/p-map": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
-      "dependencies": {
-        "aggregate-error": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-retry": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz",
-      "integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==",
-      "dev": true,
-      "dependencies": {
-        "retry": "^0.12.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pac-proxy-agent": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-4.1.0.tgz",
-      "integrity": "sha512-ejNgYm2HTXSIYX9eFlkvqFp8hyJ374uDf0Zq5YUAifiSh1D6fo+iBivQZirGvVv8dCYUsLhmLBRhlAYvBKI5+Q==",
-      "dev": true,
-      "dependencies": {
-        "@tootallnate/once": "1",
-        "agent-base": "6",
-        "debug": "4",
-        "get-uri": "3",
-        "http-proxy-agent": "^4.0.1",
-        "https-proxy-agent": "5",
-        "pac-resolver": "^4.1.0",
-        "raw-body": "^2.2.0",
-        "socks-proxy-agent": "5"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/pac-proxy-agent/node_modules/agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-      "dev": true,
-      "dependencies": {
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6.0.0"
-      }
-    },
-    "node_modules/pac-proxy-agent/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/pac-proxy-agent/node_modules/http-proxy-agent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
-      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
-      "dev": true,
-      "dependencies": {
-        "@tootallnate/once": "1",
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/pac-proxy-agent/node_modules/https-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
-      "dev": true,
-      "dependencies": {
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/pac-proxy-agent/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/pac-proxy-agent/node_modules/socks-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA==",
-      "dev": true,
-      "dependencies": {
-        "agent-base": "6",
-        "debug": "4",
-        "socks": "^2.3.3"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/pac-resolver": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-4.2.0.tgz",
-      "integrity": "sha512-rPACZdUyuxT5Io/gFKUeeZFfE5T7ve7cAkE5TUZRRfuKP0u5Hocwe48X7ZEm6mYB+bTB0Qf+xlVlA/RM/i6RCQ==",
-      "dev": true,
-      "dependencies": {
-        "degenerator": "^2.2.0",
-        "ip": "^1.1.5",
-        "netmask": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/package-json": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz",
-      "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==",
-      "dependencies": {
-        "got": "^9.6.0",
-        "registry-auth-token": "^4.0.0",
-        "registry-url": "^5.0.0",
-        "semver": "^6.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/package-json/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/pacote": {
-      "version": "9.5.12",
-      "resolved": "https://registry.npmjs.org/pacote/-/pacote-9.5.12.tgz",
-      "integrity": "sha512-BUIj/4kKbwWg4RtnBncXPJd15piFSVNpTzY0rysSr3VnMowTYgkGKcaHrbReepAkjTr8lH2CVWRi58Spg2CicQ==",
-      "dev": true,
-      "dependencies": {
-        "bluebird": "^3.5.3",
-        "cacache": "^12.0.2",
-        "chownr": "^1.1.2",
-        "figgy-pudding": "^3.5.1",
-        "get-stream": "^4.1.0",
-        "glob": "^7.1.3",
-        "infer-owner": "^1.0.4",
-        "lru-cache": "^5.1.1",
-        "make-fetch-happen": "^5.0.0",
-        "minimatch": "^3.0.4",
-        "minipass": "^2.3.5",
-        "mississippi": "^3.0.0",
-        "mkdirp": "^0.5.1",
-        "normalize-package-data": "^2.4.0",
-        "npm-normalize-package-bin": "^1.0.0",
-        "npm-package-arg": "^6.1.0",
-        "npm-packlist": "^1.1.12",
-        "npm-pick-manifest": "^3.0.0",
-        "npm-registry-fetch": "^4.0.0",
-        "osenv": "^0.1.5",
-        "promise-inflight": "^1.0.1",
-        "promise-retry": "^1.1.1",
-        "protoduck": "^5.0.1",
-        "rimraf": "^2.6.2",
-        "safe-buffer": "^5.1.2",
-        "semver": "^5.6.0",
-        "ssri": "^6.0.1",
-        "tar": "^4.4.10",
-        "unique-filename": "^1.1.1",
-        "which": "^1.3.1"
-      }
-    },
-    "node_modules/pacote/node_modules/cacache": {
-      "version": "12.0.4",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
-      "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
-      "dev": true,
-      "dependencies": {
-        "bluebird": "^3.5.5",
-        "chownr": "^1.1.1",
-        "figgy-pudding": "^3.5.1",
-        "glob": "^7.1.4",
-        "graceful-fs": "^4.1.15",
-        "infer-owner": "^1.0.3",
-        "lru-cache": "^5.1.1",
-        "mississippi": "^3.0.0",
-        "mkdirp": "^0.5.1",
-        "move-concurrently": "^1.0.1",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^2.6.3",
-        "ssri": "^6.0.1",
-        "unique-filename": "^1.1.1",
-        "y18n": "^4.0.0"
-      }
-    },
-    "node_modules/pacote/node_modules/chownr": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-      "dev": true
-    },
-    "node_modules/pacote/node_modules/fs-minipass": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
-      "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^2.6.0"
-      }
-    },
-    "node_modules/pacote/node_modules/get-stream": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-      "dev": true,
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pacote/node_modules/hosted-git-info": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
-      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
-      "dev": true
-    },
-    "node_modules/pacote/node_modules/lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^3.0.2"
-      }
-    },
-    "node_modules/pacote/node_modules/minipass": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
-      "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "^5.1.2",
-        "yallist": "^3.0.0"
-      }
-    },
-    "node_modules/pacote/node_modules/minizlib": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
-      "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^2.9.0"
-      }
-    },
-    "node_modules/pacote/node_modules/npm-package-arg": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
-      "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
-      "dev": true,
-      "dependencies": {
-        "hosted-git-info": "^2.7.1",
-        "osenv": "^0.1.5",
-        "semver": "^5.6.0",
-        "validate-npm-package-name": "^3.0.0"
-      }
-    },
-    "node_modules/pacote/node_modules/npm-pick-manifest": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-3.0.2.tgz",
-      "integrity": "sha512-wNprTNg+X5nf+tDi+hbjdHhM4bX+mKqv6XmPh7B5eG+QY9VARfQPfCEH013H5GqfNj6ee8Ij2fg8yk0mzps1Vw==",
-      "dev": true,
-      "dependencies": {
-        "figgy-pudding": "^3.5.1",
-        "npm-package-arg": "^6.0.0",
-        "semver": "^5.4.1"
-      }
-    },
-    "node_modules/pacote/node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/pacote/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/pacote/node_modules/ssri": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
-      "dev": true,
-      "dependencies": {
-        "figgy-pudding": "^3.5.1"
-      }
-    },
-    "node_modules/pacote/node_modules/tar": {
-      "version": "4.4.13",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz",
-      "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
-      "dev": true,
-      "dependencies": {
-        "chownr": "^1.1.1",
-        "fs-minipass": "^1.2.5",
-        "minipass": "^2.8.6",
-        "minizlib": "^1.2.1",
-        "mkdirp": "^0.5.0",
-        "safe-buffer": "^5.1.2",
-        "yallist": "^3.0.3"
-      },
-      "engines": {
-        "node": ">=4.5"
-      }
-    },
-    "node_modules/pacote/node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
-    "node_modules/pacote/node_modules/yallist": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true
-    },
-    "node_modules/pako": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
-      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
-    },
-    "node_modules/parallel-transform": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
-      "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
-      "dev": true,
-      "dependencies": {
-        "cyclist": "^1.0.1",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.1.5"
-      }
-    },
-    "node_modules/param-case": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
-      "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=",
-      "dev": true,
-      "dependencies": {
-        "no-case": "^2.2.0"
-      }
-    },
-    "node_modules/parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dependencies": {
-        "callsites": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/parse-asn1": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
-      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
-      "dev": true,
-      "dependencies": {
-        "asn1.js": "^5.2.0",
-        "browserify-aes": "^1.0.0",
-        "evp_bytestokey": "^1.0.0",
-        "pbkdf2": "^3.0.3",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "node_modules/parse-filepath": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
-      "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
-      "dev": true,
-      "dependencies": {
-        "is-absolute": "^1.0.0",
-        "map-cache": "^0.2.0",
-        "path-root": "^0.1.1"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-      "dev": true,
-      "dependencies": {
-        "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/parse-node-version": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
-      "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/parse-passwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
-      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/parse5": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
-      "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==",
-      "dev": true
-    },
-    "node_modules/parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/pascalcase": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-browserify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
-      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
-      "dev": true
-    },
-    "node_modules/path-dirname": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
-      "dev": true
-    },
-    "node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-is-inside": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM="
-    },
-    "node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
-    },
-    "node_modules/path-root": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
-      "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
-      "dev": true,
-      "dependencies": {
-        "path-root-regex": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-root-regex": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
-      "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
-    },
-    "node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pbkdf2": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.1.tgz",
-      "integrity": "sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==",
-      "dev": true,
-      "dependencies": {
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4",
-        "ripemd160": "^2.0.1",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      },
-      "engines": {
-        "node": ">=0.12"
-      }
-    },
-    "node_modules/pend": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
-      "dev": true
-    },
-    "node_modules/performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
-    },
-    "node_modules/picomatch": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
-      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/pify": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-      "dev": true,
-      "dependencies": {
-        "pinkie": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pirates": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
-      "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
-      "dev": true,
-      "dependencies": {
-        "node-modules-regexp": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/pkg-dir": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-up": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz",
-      "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=",
-      "dependencies": {
-        "find-up": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/plist": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.1.tgz",
-      "integrity": "sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==",
-      "dependencies": {
-        "base64-js": "^1.2.3",
-        "xmlbuilder": "^9.0.7",
-        "xmldom": "0.1.x"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/plugin-error": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
-      "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=",
-      "dev": true,
-      "dependencies": {
-        "ansi-cyan": "^0.1.1",
-        "ansi-red": "^0.1.1",
-        "arr-diff": "^1.0.1",
-        "arr-union": "^2.0.1",
-        "extend-shallow": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/plugin-error/node_modules/arr-diff": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
-      "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
-      "dev": true,
-      "dependencies": {
-        "arr-flatten": "^1.0.1",
-        "array-slice": "^0.2.3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/plugin-error/node_modules/arr-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
-      "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/plugin-error/node_modules/array-slice": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
-      "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/plugin-error/node_modules/extend-shallow": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
-      "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/plugin-error/node_modules/kind-of": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
-      "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pnp-webpack-plugin": {
-      "version": "1.6.4",
-      "resolved": "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz",
-      "integrity": "sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg==",
-      "dev": true,
-      "dependencies": {
-        "ts-pnp": "^1.1.6"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/portfinder": {
-      "version": "1.0.28",
-      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
-      "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==",
-      "dev": true,
-      "dependencies": {
-        "async": "^2.6.2",
-        "debug": "^3.1.1",
-        "mkdirp": "^0.5.5"
-      },
-      "engines": {
-        "node": ">= 0.12.0"
-      }
-    },
-    "node_modules/portfinder/node_modules/debug": {
-      "version": "3.2.6",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/portfinder/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/posix-character-classes": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
-      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss": {
-      "version": "7.0.31",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.31.tgz",
-      "integrity": "sha512-a937VDHE1ftkjk+8/7nj/mrjtmkn69xxzJgRETXdAUU+IgOYPQNJF17haGWbeDxSyk++HA14UA98FurvPyBJOA==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.2",
-        "source-map": "^0.6.1",
-        "supports-color": "^6.1.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      },
-      "funding": {
-        "type": "tidelift",
-        "url": "https://tidelift.com/funding/github/npm/postcss"
-      }
-    },
-    "node_modules/postcss-calc": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.5.tgz",
-      "integrity": "sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.27",
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.0.2"
-      }
-    },
-    "node_modules/postcss-colormin": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz",
-      "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.0.0",
-        "color": "^3.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-colormin/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/postcss-convert-values": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz",
-      "integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-convert-values/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/postcss-discard-comments": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz",
-      "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-discard-duplicates": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz",
-      "integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-discard-empty": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz",
-      "integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-discard-overridden": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz",
-      "integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-import": {
-      "version": "12.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-12.0.1.tgz",
-      "integrity": "sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.1",
-        "postcss-value-parser": "^3.2.3",
-        "read-cache": "^1.0.0",
-        "resolve": "^1.1.7"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-import/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/postcss-load-config": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.2.tgz",
-      "integrity": "sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==",
-      "dev": true,
-      "dependencies": {
-        "cosmiconfig": "^5.0.0",
-        "import-cwd": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-      }
-    },
-    "node_modules/postcss-loader": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz",
-      "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==",
-      "dev": true,
-      "dependencies": {
-        "loader-utils": "^1.1.0",
-        "postcss": "^7.0.0",
-        "postcss-load-config": "^2.0.0",
-        "schema-utils": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/postcss-loader/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/postcss-loader/node_modules/loader-utils": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-loader/node_modules/schema-utils": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.1.0",
-        "ajv-errors": "^1.0.0",
-        "ajv-keywords": "^3.1.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/postcss-merge-longhand": {
-      "version": "4.0.11",
-      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz",
-      "integrity": "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==",
-      "dev": true,
-      "dependencies": {
-        "css-color-names": "0.0.4",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0",
-        "stylehacks": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-merge-longhand/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/postcss-merge-rules": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz",
-      "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.0.0",
-        "caniuse-api": "^3.0.0",
-        "cssnano-util-same-parent": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-selector-parser": "^3.0.0",
-        "vendors": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-merge-rules/node_modules/postcss-selector-parser": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-      "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
-      "dev": true,
-      "dependencies": {
-        "dot-prop": "^5.2.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/postcss-minify-font-values": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz",
-      "integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-minify-font-values/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/postcss-minify-gradients": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz",
-      "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==",
-      "dev": true,
-      "dependencies": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "is-color-stop": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-minify-gradients/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/postcss-minify-params": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz",
-      "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==",
-      "dev": true,
-      "dependencies": {
-        "alphanum-sort": "^1.0.0",
-        "browserslist": "^4.0.0",
-        "cssnano-util-get-arguments": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0",
-        "uniqs": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-minify-params/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/postcss-minify-selectors": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz",
-      "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==",
-      "dev": true,
-      "dependencies": {
-        "alphanum-sort": "^1.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-selector-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-minify-selectors/node_modules/postcss-selector-parser": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-      "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
-      "dev": true,
-      "dependencies": {
-        "dot-prop": "^5.2.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/postcss-modules-extract-imports": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz",
-      "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.5"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/postcss-modules-local-by-default": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz",
-      "integrity": "sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==",
-      "dev": true,
-      "dependencies": {
-        "icss-utils": "^4.1.1",
-        "postcss": "^7.0.32",
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.1.0"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/postcss-modules-local-by-default/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss-modules-local-by-default/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss-modules-local-by-default/node_modules/chalk/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss-modules-local-by-default/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/postcss-modules-local-by-default/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/postcss-modules-local-by-default/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss-modules-local-by-default/node_modules/postcss": {
-      "version": "7.0.35",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-      "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.2",
-        "source-map": "^0.6.1",
-        "supports-color": "^6.1.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-      }
-    },
-    "node_modules/postcss-modules-local-by-default/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-modules-local-by-default/node_modules/supports-color": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/postcss-modules-scope": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz",
-      "integrity": "sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.6",
-        "postcss-selector-parser": "^6.0.0"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/postcss-modules-values": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz",
-      "integrity": "sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==",
-      "dev": true,
-      "dependencies": {
-        "icss-utils": "^4.0.0",
-        "postcss": "^7.0.6"
-      }
-    },
-    "node_modules/postcss-normalize-charset": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz",
-      "integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-normalize-display-values": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz",
-      "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==",
-      "dev": true,
-      "dependencies": {
-        "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-normalize-display-values/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/postcss-normalize-positions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz",
-      "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==",
-      "dev": true,
-      "dependencies": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-normalize-positions/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/postcss-normalize-repeat-style": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz",
-      "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==",
-      "dev": true,
-      "dependencies": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-normalize-repeat-style/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/postcss-normalize-string": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz",
-      "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==",
-      "dev": true,
-      "dependencies": {
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-normalize-string/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/postcss-normalize-timing-functions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz",
-      "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==",
-      "dev": true,
-      "dependencies": {
-        "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-normalize-timing-functions/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/postcss-normalize-unicode": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz",
-      "integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-normalize-unicode/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/postcss-normalize-url": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz",
-      "integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==",
-      "dev": true,
-      "dependencies": {
-        "is-absolute-url": "^2.0.0",
-        "normalize-url": "^3.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-normalize-url/node_modules/normalize-url": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz",
-      "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/postcss-normalize-url/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/postcss-normalize-whitespace": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz",
-      "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-normalize-whitespace/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/postcss-ordered-values": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz",
-      "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==",
-      "dev": true,
-      "dependencies": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-ordered-values/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/postcss-reduce-initial": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz",
-      "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.0.0",
-        "caniuse-api": "^3.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-reduce-transforms": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz",
-      "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==",
-      "dev": true,
-      "dependencies": {
-        "cssnano-util-get-match": "^4.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-reduce-transforms/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/postcss-selector-parser": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz",
-      "integrity": "sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==",
-      "dev": true,
-      "dependencies": {
-        "cssesc": "^3.0.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1",
-        "util-deprecate": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss-svgo": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz",
-      "integrity": "sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw==",
-      "dev": true,
-      "dependencies": {
-        "is-svg": "^3.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0",
-        "svgo": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-svgo/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/postcss-unique-selectors": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz",
-      "integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==",
-      "dev": true,
-      "dependencies": {
-        "alphanum-sort": "^1.0.0",
-        "postcss": "^7.0.0",
-        "uniqs": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-value-parser": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
-      "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
-      "dev": true
-    },
-    "node_modules/postcss/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss/node_modules/chalk/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/postcss/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/postcss/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss/node_modules/supports-color": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/prebuild-install": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.0.0.tgz",
-      "integrity": "sha512-h2ZJ1PXHKWZpp1caLw0oX9sagVpL2YTk+ZwInQbQ3QqNd4J03O6MpFNmMTJlkfgPENWqe5kP0WjQLqz5OjLfsw==",
-      "optional": true,
-      "dependencies": {
-        "detect-libc": "^1.0.3",
-        "expand-template": "^2.0.3",
-        "github-from-package": "0.0.0",
-        "minimist": "^1.2.3",
-        "mkdirp-classic": "^0.5.3",
-        "napi-build-utils": "^1.0.1",
-        "node-abi": "^2.7.0",
-        "noop-logger": "^0.1.1",
-        "npmlog": "^4.0.1",
-        "pump": "^3.0.0",
-        "rc": "^1.2.7",
-        "simple-get": "^3.0.3",
-        "tar-fs": "^2.0.0",
-        "tunnel-agent": "^0.6.0",
-        "which-pm-runs": "^1.0.0"
-      },
-      "bin": {
-        "prebuild-install": "bin.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/prelude-ls": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/prepend-http": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
-      "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/pretty-format": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.5.2.tgz",
-      "integrity": "sha512-VizyV669eqESlkOikKJI8Ryxl/kPpbdLwNdPs2GrbQs18MpySB5S0Yo0N7zkg2xTRiFq4CFw8ct5Vg4a0xP0og==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^26.5.2",
-        "ansi-regex": "^5.0.0",
-        "ansi-styles": "^4.0.0",
-        "react-is": "^16.12.0"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/pretty-format/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pretty-hrtime": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
-      "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/process": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6.0"
-      }
-    },
-    "node_modules/process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
-    },
-    "node_modules/progress": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/promise-inflight": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
-      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM="
-    },
-    "node_modules/promise-retry": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz",
-      "integrity": "sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0=",
-      "dev": true,
-      "dependencies": {
-        "err-code": "^1.0.0",
-        "retry": "^0.10.0"
-      },
-      "engines": {
-        "node": ">=0.12"
-      }
-    },
-    "node_modules/promise-retry/node_modules/retry": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz",
-      "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/prompts": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.2.tgz",
-      "integrity": "sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA==",
-      "dev": true,
-      "dependencies": {
-        "kleur": "^3.0.3",
-        "sisteransi": "^1.0.4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/promzard": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz",
-      "integrity": "sha1-JqXW7ox97kyxIggwWs+5O6OCqe4=",
-      "dependencies": {
-        "read": "1"
-      }
-    },
-    "node_modules/properties-parser": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/properties-parser/-/properties-parser-0.3.1.tgz",
-      "integrity": "sha1-ExbpU5/7/ZOEXjabIRAiq9R4dxo=",
-      "dependencies": {
-        "string.prototype.codepointat": "^0.2.0"
-      },
-      "engines": {
-        "node": ">= 0.3.1"
-      }
-    },
-    "node_modules/protoduck": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/protoduck/-/protoduck-5.0.1.tgz",
-      "integrity": "sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==",
-      "dev": true,
-      "dependencies": {
-        "genfun": "^5.0.0"
-      }
-    },
-    "node_modules/proxy-addr": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
-      "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==",
-      "dependencies": {
-        "forwarded": "~0.1.2",
-        "ipaddr.js": "1.9.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/proxy-agent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-4.0.1.tgz",
-      "integrity": "sha512-ODnQnW2jc/FUVwHHuaZEfN5otg/fMbvMxz9nMSUQfJ9JU7q2SZvSULSsjLloVgJOiv9yhc8GlNMKc4GkFmcVEA==",
-      "dev": true,
-      "dependencies": {
-        "agent-base": "^6.0.0",
-        "debug": "4",
-        "http-proxy-agent": "^4.0.0",
-        "https-proxy-agent": "^5.0.0",
-        "lru-cache": "^5.1.1",
-        "pac-proxy-agent": "^4.1.0",
-        "proxy-from-env": "^1.0.0",
-        "socks-proxy-agent": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/proxy-agent/node_modules/agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-      "dev": true,
-      "dependencies": {
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6.0.0"
-      }
-    },
-    "node_modules/proxy-agent/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/proxy-agent/node_modules/http-proxy-agent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
-      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
-      "dev": true,
-      "dependencies": {
-        "@tootallnate/once": "1",
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/proxy-agent/node_modules/https-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
-      "dev": true,
-      "dependencies": {
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/proxy-agent/node_modules/lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^3.0.2"
-      }
-    },
-    "node_modules/proxy-agent/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/proxy-agent/node_modules/socks-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA==",
-      "dev": true,
-      "dependencies": {
-        "agent-base": "6",
-        "debug": "4",
-        "socks": "^2.3.3"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/proxy-agent/node_modules/yallist": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true
-    },
-    "node_modules/proxy-from-env": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-      "dev": true
-    },
-    "node_modules/prr": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
-      "dev": true
-    },
-    "node_modules/psl": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
-    },
-    "node_modules/public-encrypt": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
-      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "parse-asn1": "^5.0.0",
-        "randombytes": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "node_modules/public-encrypt/node_modules/bn.js": {
-      "version": "4.11.9",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-      "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
-      "dev": true
-    },
-    "node_modules/pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "node_modules/pumpify": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
-      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
-      "dev": true,
-      "dependencies": {
-        "duplexify": "^3.6.0",
-        "inherits": "^2.0.3",
-        "pump": "^2.0.0"
-      }
-    },
-    "node_modules/pumpify/node_modules/pump": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-      "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-      "dev": true,
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "node_modules/punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pupa": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz",
-      "integrity": "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==",
-      "dependencies": {
-        "escape-goat": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/q": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
-      "engines": {
-        "node": ">=0.6.0",
-        "teleport": ">=0.2.0"
-      }
-    },
-    "node_modules/qrcode-reader": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/qrcode-reader/-/qrcode-reader-1.0.4.tgz",
-      "integrity": "sha512-rRjALGNh9zVqvweg1j5OKIQKNsw3bLC+7qwlnead5K/9cb1cEIAGkwikt/09U0K+2IDWGD9CC6SP7tHAjUeqvQ=="
-    },
-    "node_modules/qs": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/query-string": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
-      "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
-      "dev": true,
-      "dependencies": {
-        "object-assign": "^4.1.0",
-        "strict-uri-encode": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/querystring": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
-      "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
-    "node_modules/querystring-es3": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
-    "node_modules/querystringify": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
-      "dev": true
-    },
-    "node_modules/randombytes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "node_modules/randomfill": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-      "dev": true,
-      "dependencies": {
-        "randombytes": "^2.0.5",
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "node_modules/range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/raw-body": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
-      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
-      "dependencies": {
-        "bytes": "3.1.0",
-        "http-errors": "1.7.2",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/raw-body/node_modules/bytes": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/raw-loader": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-4.0.1.tgz",
-      "integrity": "sha512-baolhQBSi3iNh1cglJjA0mYzga+wePk7vdEX//1dTFd+v4TsQlQE0jitJSNF1OIP82rdYulH7otaVmdlDaJ64A==",
-      "dev": true,
-      "dependencies": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^2.6.5"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/rc": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-      "dependencies": {
-        "deep-extend": "^0.6.0",
-        "ini": "~1.3.0",
-        "minimist": "^1.2.0",
-        "strip-json-comments": "~2.0.1"
-      },
-      "bin": {
-        "rc": "cli.js"
-      }
-    },
-    "node_modules/react-is": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
-      "dev": true
-    },
-    "node_modules/read": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
-      "integrity": "sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=",
-      "dependencies": {
-        "mute-stream": "~0.0.4"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/read-cache": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
-      "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
-      "dev": true,
-      "dependencies": {
-        "pify": "^2.3.0"
-      }
-    },
-    "node_modules/read-cache/node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/read-chunk": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/read-chunk/-/read-chunk-3.2.0.tgz",
-      "integrity": "sha512-CEjy9LCzhmD7nUpJ1oVOE6s/hBkejlcJEgLQHVnQznOSilOPb+kpKktlLfFDK3/WP43+F80xkUTM2VOkYoSYvQ==",
-      "dependencies": {
-        "pify": "^4.0.1",
-        "with-open-file": "^0.1.6"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/read-package-json": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.2.tgz",
-      "integrity": "sha512-D1KmuLQr6ZSJS0tW8hf3WGpRlwszJOXZ3E8Yd/DNRaM5d+1wVRZdHlpGBLAuovjr28LbWvjpWkBHMxpRGGjzNA==",
-      "dependencies": {
-        "glob": "^7.1.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "normalize-package-data": "^2.0.0",
-        "npm-normalize-package-bin": "^1.0.0"
-      }
-    },
-    "node_modules/read-package-json-fast": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz",
-      "integrity": "sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ==",
-      "dependencies": {
-        "json-parse-even-better-errors": "^2.3.0",
-        "npm-normalize-package-bin": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/read-package-tree": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.3.1.tgz",
-      "integrity": "sha512-mLUDsD5JVtlZxjSlPPx1RETkNjjvQYuweKwNVt1Sn8kP5Jh44pvYuUHCp6xSVDZWbNxVxG5lyZJ921aJH61sTw==",
-      "dev": true,
-      "dependencies": {
-        "read-package-json": "^2.0.0",
-        "readdir-scoped-modules": "^1.0.0",
-        "util-promisify": "^2.1.0"
-      }
-    },
-    "node_modules/read-pkg": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
-      "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
-      "dev": true,
-      "dependencies": {
-        "load-json-file": "^2.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/read-pkg-up": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-      "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^2.0.0",
-        "read-pkg": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/read-pkg/node_modules/path-type": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
-      "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
-      "dev": true,
-      "dependencies": {
-        "pify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/read-pkg/node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/readdir-scoped-modules": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz",
-      "integrity": "sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==",
-      "dev": true,
-      "dependencies": {
-        "debuglog": "^1.0.1",
-        "dezalgo": "^1.0.0",
-        "graceful-fs": "^4.1.2",
-        "once": "^1.3.0"
-      }
-    },
-    "node_modules/readdirp": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
-      "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
-      "dev": true,
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      }
-    },
-    "node_modules/rechoir": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
-      "dev": true,
-      "dependencies": {
-        "resolve": "^1.1.6"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/recursive-readdir": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz",
-      "integrity": "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==",
-      "dev": true,
-      "dependencies": {
-        "minimatch": "3.0.4"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/reflect-metadata": {
-      "version": "0.1.13",
-      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
-      "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==",
-      "dev": true
-    },
-    "node_modules/regenerate": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.1.tgz",
-      "integrity": "sha512-j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A==",
-      "dev": true
-    },
-    "node_modules/regenerate-unicode-properties": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz",
-      "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==",
-      "dev": true,
-      "dependencies": {
-        "regenerate": "^1.4.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/regenerator-runtime": {
-      "version": "0.13.5",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz",
-      "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==",
-      "dev": true
-    },
-    "node_modules/regenerator-transform": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz",
-      "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.8.4"
-      }
-    },
-    "node_modules/regex-not": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
-      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^3.0.2",
-        "safe-regex": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/regex-parser": {
-      "version": "2.2.10",
-      "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.10.tgz",
-      "integrity": "sha512-8t6074A68gHfU8Neftl0Le6KTDwfGAj7IyjPIMSfikI2wJUTHDMaIq42bUsfVnj8mhx0R+45rdUXHGpN164avA==",
-      "dev": true
-    },
-    "node_modules/regexp.prototype.flags": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz",
-      "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/regexp.prototype.flags/node_modules/es-abstract": {
-      "version": "1.17.7",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
-      "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
-      "dev": true,
-      "dependencies": {
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1",
-        "is-callable": "^1.2.2",
-        "is-regex": "^1.1.1",
-        "object-inspect": "^1.8.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.1",
-        "string.prototype.trimend": "^1.0.1",
-        "string.prototype.trimstart": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/regexpp": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",
-      "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      }
-    },
-    "node_modules/regexpu-core": {
-      "version": "4.7.1",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz",
-      "integrity": "sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==",
-      "dev": true,
-      "dependencies": {
-        "regenerate": "^1.4.0",
-        "regenerate-unicode-properties": "^8.2.0",
-        "regjsgen": "^0.5.1",
-        "regjsparser": "^0.6.4",
-        "unicode-match-property-ecmascript": "^1.0.4",
-        "unicode-match-property-value-ecmascript": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/regextras": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/regextras/-/regextras-0.7.1.tgz",
-      "integrity": "sha512-9YXf6xtW+qzQ+hcMQXx95MOvfqXFgsKDZodX3qZB0x2n5Z94ioetIITsBtvJbiOyxa/6s9AtyweBLCdPmPko/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.1.14"
-      }
-    },
-    "node_modules/registry-auth-token": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.1.tgz",
-      "integrity": "sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==",
-      "dependencies": {
-        "rc": "^1.2.8"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/registry-url": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz",
-      "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==",
-      "dependencies": {
-        "rc": "^1.2.8"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/regjsgen": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz",
-      "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==",
-      "dev": true
-    },
-    "node_modules/regjsparser": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz",
-      "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==",
-      "dev": true,
-      "dependencies": {
-        "jsesc": "~0.5.0"
-      },
-      "bin": {
-        "regjsparser": "bin/parser"
-      }
-    },
-    "node_modules/regjsparser/node_modules/jsesc": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-      "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
-      "dev": true,
-      "bin": {
-        "jsesc": "bin/jsesc"
-      }
-    },
-    "node_modules/relateurl": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
-      "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/remove-bom-buffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz",
-      "integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5",
-        "is-utf8": "^0.2.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/remove-bom-stream": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz",
-      "integrity": "sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=",
-      "dev": true,
-      "dependencies": {
-        "remove-bom-buffer": "^3.0.0",
-        "safe-buffer": "^5.1.0",
-        "through2": "^2.0.3"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/remove-trailing-separator": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
-      "dev": true
-    },
-    "node_modules/repeat-element": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
-      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/repeat-string": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/replace-ext": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
-      "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/replace-homedir": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz",
-      "integrity": "sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw=",
-      "dev": true,
-      "dependencies": {
-        "homedir-polyfill": "^1.0.1",
-        "is-absolute": "^1.0.0",
-        "remove-trailing-separator": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/request": {
-      "version": "2.88.2",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
-      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
-      "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
-      "dependencies": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.3",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.5.0",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/request-promise-core": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz",
-      "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==",
-      "dev": true,
-      "dependencies": {
-        "lodash": "^4.17.19"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      },
-      "peerDependencies": {
-        "request": "^2.34"
-      }
-    },
-    "node_modules/request-promise-native": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz",
-      "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==",
-      "deprecated": "request-promise-native has been deprecated because it extends the now deprecated request package, see https://github.com/request/request/issues/3142",
-      "dev": true,
-      "dependencies": {
-        "request-promise-core": "1.1.4",
-        "stealthy-require": "^1.1.1",
-        "tough-cookie": "^2.3.3"
-      },
-      "engines": {
-        "node": ">=0.12.0"
-      },
-      "peerDependencies": {
-        "request": "^2.34"
-      }
-    },
-    "node_modules/request-promise-native/node_modules/tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-      "dev": true,
-      "dependencies": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/request/node_modules/qs": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/request/node_modules/tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-      "dependencies": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/require-from-string": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/require-main-filename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-      "dev": true
-    },
-    "node_modules/requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
-      "dev": true
-    },
-    "node_modules/resolve": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
-      "dependencies": {
-        "path-parse": "^1.0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/resolve-cwd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
-      "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
-      "dev": true,
-      "dependencies": {
-        "resolve-from": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/resolve-cwd/node_modules/resolve-from": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/resolve-dir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
-      "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
-      "dev": true,
-      "dependencies": {
-        "expand-tilde": "^2.0.0",
-        "global-modules": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/resolve-options": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz",
-      "integrity": "sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=",
-      "dev": true,
-      "dependencies": {
-        "value-or-function": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/resolve-url": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
-      "deprecated": "https://github.com/lydell/resolve-url#deprecated",
-      "dev": true
-    },
-    "node_modules/resolve-url-loader": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-3.1.1.tgz",
-      "integrity": "sha512-K1N5xUjj7v0l2j/3Sgs5b8CjrrgtC70SmdCuZiJ8tSyb5J+uk3FoeZ4b7yTnH6j7ngI+Bc5bldHJIa8hYdu2gQ==",
-      "dev": true,
-      "dependencies": {
-        "adjust-sourcemap-loader": "2.0.0",
-        "camelcase": "5.3.1",
-        "compose-function": "3.0.3",
-        "convert-source-map": "1.7.0",
-        "es6-iterator": "2.0.3",
-        "loader-utils": "1.2.3",
-        "postcss": "7.0.21",
-        "rework": "1.0.1",
-        "rework-visit": "1.0.0",
-        "source-map": "0.6.1"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/resolve-url-loader/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/resolve-url-loader/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/resolve-url-loader/node_modules/chalk/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/resolve-url-loader/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/resolve-url-loader/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/resolve-url-loader/node_modules/emojis-list": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/resolve-url-loader/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/resolve-url-loader/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/resolve-url-loader/node_modules/loader-utils": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
-      "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^2.0.0",
-        "json5": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/resolve-url-loader/node_modules/postcss": {
-      "version": "7.0.21",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.21.tgz",
-      "integrity": "sha512-uIFtJElxJo29QC753JzhidoAhvp/e/Exezkdhfmt8AymWT6/5B7W1WmponYWkHk2eg6sONyTch0A3nkMPun3SQ==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.2",
-        "source-map": "^0.6.1",
-        "supports-color": "^6.1.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/resolve-url-loader/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/resolve-url-loader/node_modules/supports-color": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/responselike": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
-      "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
-      "dependencies": {
-        "lowercase-keys": "^1.0.0"
-      }
-    },
-    "node_modules/restore-cursor": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
-      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
-      "dependencies": {
-        "onetime": "^2.0.0",
-        "signal-exit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/restore-cursor/node_modules/mimic-fn": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/restore-cursor/node_modules/onetime": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
-      "dependencies": {
-        "mimic-fn": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/ret": {
-      "version": "0.1.15",
-      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12"
-      }
-    },
-    "node_modules/retry": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
-      "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-      "engines": {
-        "iojs": ">=1.0.0",
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/rework": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/rework/-/rework-1.0.1.tgz",
-      "integrity": "sha1-MIBqhBNCtUUQqkEQhQzUhTQUSqc=",
-      "dev": true,
-      "dependencies": {
-        "convert-source-map": "^0.3.3",
-        "css": "^2.0.0"
-      }
-    },
-    "node_modules/rework-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/rework-visit/-/rework-visit-1.0.0.tgz",
-      "integrity": "sha1-mUWygD8hni96ygCtuLyfZA+ELJo=",
-      "dev": true
-    },
-    "node_modules/rework/node_modules/convert-source-map": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz",
-      "integrity": "sha1-8dgClQr33SYxof6+BZZVDIarMZA=",
-      "dev": true
-    },
-    "node_modules/rgb-regex": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz",
-      "integrity": "sha1-wODWiC3w4jviVKR16O3UGRX+rrE=",
-      "dev": true
-    },
-    "node_modules/rgba-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz",
-      "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=",
-      "dev": true
-    },
-    "node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/ripemd160": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-      "dev": true,
-      "dependencies": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
-      }
-    },
-    "node_modules/rollup": {
-      "version": "2.10.9",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.10.9.tgz",
-      "integrity": "sha512-dY/EbjiWC17ZCUSyk14hkxATAMAShkMsD43XmZGWjLrgFj15M3Dw2kEkA9ns64BiLFm9PKN6vTQw8neHwK74eg==",
-      "dev": true,
-      "bin": {
-        "rollup": "dist/bin/rollup"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.1.2"
-      }
-    },
-    "node_modules/rsvp": {
-      "version": "4.8.5",
-      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
-      "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
-      "dev": true,
-      "engines": {
-        "node": "6.* || >= 7.*"
-      }
-    },
-    "node_modules/run-async": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
-      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/run-parallel": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
-      "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q=="
-    },
-    "node_modules/run-queue": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
-      "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
-      "dev": true,
-      "dependencies": {
-        "aproba": "^1.1.1"
-      }
-    },
-    "node_modules/rxjs": {
-      "version": "6.5.5",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz",
-      "integrity": "sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==",
-      "dependencies": {
-        "tslib": "^1.9.0"
-      },
-      "engines": {
-        "npm": ">=2.0.0"
-      }
-    },
-    "node_modules/rxjs/node_modules/tslib": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
-      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="
-    },
-    "node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-    },
-    "node_modules/safe-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
-      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
-      "dev": true,
-      "dependencies": {
-        "ret": "~0.1.10"
-      }
-    },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
-    "node_modules/sane": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz",
-      "integrity": "sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==",
-      "deprecated": "some dependency vulnerabilities fixed, support for node < 10 dropped, and newer ECMAScript syntax/features added",
-      "dev": true,
-      "dependencies": {
-        "@cnakazawa/watch": "^1.0.3",
-        "anymatch": "^2.0.0",
-        "capture-exit": "^2.0.0",
-        "exec-sh": "^0.3.2",
-        "execa": "^1.0.0",
-        "fb-watchman": "^2.0.0",
-        "micromatch": "^3.1.4",
-        "minimist": "^1.1.1",
-        "walker": "~1.0.5"
-      },
-      "bin": {
-        "sane": "src/cli.js"
-      },
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
-      }
-    },
-    "node_modules/sane/node_modules/anymatch": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-      "dev": true,
-      "dependencies": {
-        "micromatch": "^3.1.4",
-        "normalize-path": "^2.1.1"
-      }
-    },
-    "node_modules/sane/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
-      "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/sane/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/sane/node_modules/cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-      "dev": true,
-      "dependencies": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      },
-      "engines": {
-        "node": ">=4.8"
-      }
-    },
-    "node_modules/sane/node_modules/execa": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-      "dev": true,
-      "dependencies": {
-        "cross-spawn": "^6.0.0",
-        "get-stream": "^4.0.0",
-        "is-stream": "^1.1.0",
-        "npm-run-path": "^2.0.0",
-        "p-finally": "^1.0.0",
-        "signal-exit": "^3.0.0",
-        "strip-eof": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/sane/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/sane/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/sane/node_modules/get-stream": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-      "dev": true,
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/sane/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/sane/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/sane/node_modules/is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/sane/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/sane/node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/sane/node_modules/normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-      "dev": true,
-      "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/sane/node_modules/npm-run-path": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-      "dev": true,
-      "dependencies": {
-        "path-key": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/sane/node_modules/path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/sane/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/sane/node_modules/shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-      "dev": true,
-      "dependencies": {
-        "shebang-regex": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/sane/node_modules/shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/sane/node_modules/to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/sane/node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
-    "node_modules/sass": {
-      "version": "1.26.5",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.26.5.tgz",
-      "integrity": "sha512-FG2swzaZUiX53YzZSjSakzvGtlds0lcbF+URuU9mxOv7WBh7NhXEVDa4kPKN4hN6fC2TkOTOKqiqp6d53N9X5Q==",
-      "dev": true,
-      "dependencies": {
-        "chokidar": ">=2.0.0 <4.0.0"
-      },
-      "bin": {
-        "sass": "sass.js"
-      },
-      "engines": {
-        "node": ">=8.9.0"
-      }
-    },
-    "node_modules/sass-loader": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.2.tgz",
-      "integrity": "sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==",
-      "dev": true,
-      "dependencies": {
-        "clone-deep": "^4.0.1",
-        "loader-utils": "^1.2.3",
-        "neo-async": "^2.6.1",
-        "schema-utils": "^2.6.1",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">= 8.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "fibers": ">= 3.1.0",
-        "node-sass": "^4.0.0",
-        "sass": "^1.3.0",
-        "webpack": "^4.36.0 || ^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "fibers": {
-          "optional": true
-        },
-        "node-sass": {
-          "optional": true
-        },
-        "sass": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/sass-loader/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/sass-loader/node_modules/loader-utils": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/sass-loader/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/sax": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz",
-      "integrity": "sha1-dLbTPJrh4AFRDxeakRaFiPGu2qk="
-    },
-    "node_modules/saxes": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
-      "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
-      "dev": true,
-      "dependencies": {
-        "xmlchars": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/schema-utils": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
-      "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.5",
-        "ajv": "^6.12.4",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 8.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/sdp": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/sdp/-/sdp-1.5.4.tgz",
-      "integrity": "sha1-jgOPbdsUvXZa4fS1IW4SCUUR4NA="
-    },
-    "node_modules/select-hose": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
-      "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=",
-      "dev": true
-    },
-    "node_modules/selfsigned": {
-      "version": "1.10.8",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.8.tgz",
-      "integrity": "sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w==",
-      "dev": true,
-      "dependencies": {
-        "node-forge": "^0.10.0"
-      }
-    },
-    "node_modules/semver": {
-      "version": "7.3.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-      "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/semver-diff": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz",
-      "integrity": "sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==",
-      "dependencies": {
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/semver-diff/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/semver-greatest-satisfied-range": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz",
-      "integrity": "sha1-E+jCZYq5aRywzXEJMkAoDTb3els=",
-      "dev": true,
-      "dependencies": {
-        "sver-compat": "^1.5.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/semver-intersect": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/semver-intersect/-/semver-intersect-1.4.0.tgz",
-      "integrity": "sha512-d8fvGg5ycKAq0+I6nfWeCx6ffaWJCsBYU0H2Rq56+/zFePYfT8mXkB3tWBSjR5BerkHNZ5eTPIk1/LBYas35xQ==",
-      "dev": true,
-      "dependencies": {
-        "semver": "^5.0.0"
-      }
-    },
-    "node_modules/semver-intersect/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/send": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
-      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
-      "dependencies": {
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "~1.7.2",
-        "mime": "1.6.0",
-        "ms": "2.1.1",
-        "on-finished": "~2.3.0",
-        "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/send/node_modules/ms": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-      "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
-    },
-    "node_modules/serialize-javascript": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
-      "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
-      "dev": true,
-      "dependencies": {
-        "randombytes": "^2.1.0"
-      }
-    },
-    "node_modules/serve-index": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
-      "dev": true,
-      "dependencies": {
-        "accepts": "~1.3.4",
-        "batch": "0.6.1",
-        "debug": "2.6.9",
-        "escape-html": "~1.0.3",
-        "http-errors": "~1.6.2",
-        "mime-types": "~2.1.17",
-        "parseurl": "~1.3.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/serve-index/node_modules/http-errors": {
-      "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-      "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
-      "dev": true,
-      "dependencies": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.0",
-        "statuses": ">= 1.4.0 < 2"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/serve-index/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-      "dev": true
-    },
-    "node_modules/serve-index/node_modules/setprototypeof": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-      "dev": true
-    },
-    "node_modules/serve-static": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
-      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
-      "dependencies": {
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.3",
-        "send": "0.17.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
-    },
-    "node_modules/set-immediate-shim": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
-      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/set-value": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
-      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-extendable": "^0.1.1",
-        "is-plain-object": "^2.0.3",
-        "split-string": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/set-value/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/setimmediate": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
-      "dev": true
-    },
-    "node_modules/setprototypeof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
-    },
-    "node_modules/sha.js": {
-      "version": "2.4.11",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      },
-      "bin": {
-        "sha.js": "bin.js"
-      }
-    },
-    "node_modules/shallow-clone": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
-      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shellwords": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
-      "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/side-channel/node_modules/object-inspect": {
-      "version": "1.10.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz",
-      "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/signal-exit": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
-      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
-    },
-    "node_modules/simctl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/simctl/-/simctl-2.0.0.tgz",
-      "integrity": "sha512-5rB7rN4N3b0z0nFdy9eczVssXqrv2aAgdVRksPVqVoiDtvXmfzNvebp3EMdId2sAUzXIflarQlx4P0hjVQEzKQ==",
-      "dependencies": {
-        "shelljs": "^0.2.6",
-        "tail": "^0.4.0"
-      }
-    },
-    "node_modules/simctl/node_modules/shelljs": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz",
-      "integrity": "sha1-kEktcv/MgVmXa6umL7D2iE8MM3g=",
-      "bin": {
-        "shjs": "bin/shjs"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/simple-concat": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
-      "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "optional": true
-    },
-    "node_modules/simple-get": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz",
-      "integrity": "sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==",
-      "optional": true,
-      "dependencies": {
-        "decompress-response": "^4.2.0",
-        "once": "^1.3.1",
-        "simple-concat": "^1.0.0"
-      }
-    },
-    "node_modules/simple-get/node_modules/decompress-response": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
-      "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
-      "optional": true,
-      "dependencies": {
-        "mimic-response": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/simple-get/node_modules/mimic-response": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
-      "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
-      "optional": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/simple-plist": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/simple-plist/-/simple-plist-1.1.1.tgz",
-      "integrity": "sha512-pKMCVKvZbZTsqYR6RKgLfBHkh2cV89GXcA/0CVPje3sOiNOnXA8+rp/ciAMZ7JRaUdLzlEM6JFfUn+fS6Nt3hg==",
-      "dependencies": {
-        "bplist-creator": "0.0.8",
-        "bplist-parser": "0.2.0",
-        "plist": "^3.0.1"
-      }
-    },
-    "node_modules/simple-swizzle": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
-      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
-      "dev": true,
-      "dependencies": {
-        "is-arrayish": "^0.3.1"
-      }
-    },
-    "node_modules/simple-swizzle/node_modules/is-arrayish": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
-      "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
-      "dev": true
-    },
-    "node_modules/sisteransi": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
-      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
-      "dev": true
-    },
-    "node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/slice-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
-      }
-    },
-    "node_modules/slice-ansi/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/smart-buffer": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.1.0.tgz",
-      "integrity": "sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==",
-      "engines": {
-        "node": ">= 6.0.0",
-        "npm": ">= 3.0.0"
-      }
-    },
-    "node_modules/snapdragon": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-      "dev": true,
-      "dependencies": {
-        "base": "^0.11.1",
-        "debug": "^2.2.0",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "map-cache": "^0.2.2",
-        "source-map": "^0.5.6",
-        "source-map-resolve": "^0.5.0",
-        "use": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-node": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
-      "dev": true,
-      "dependencies": {
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.0",
-        "snapdragon-util": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-node/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-node/node_modules/is-accessor-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-node/node_modules/is-data-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-node/node_modules/is-descriptor": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-node/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-util": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-util/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/sockjs": {
-      "version": "0.3.20",
-      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.20.tgz",
-      "integrity": "sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA==",
-      "dev": true,
-      "dependencies": {
-        "faye-websocket": "^0.10.0",
-        "uuid": "^3.4.0",
-        "websocket-driver": "0.6.5"
-      }
-    },
-    "node_modules/sockjs-client": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz",
-      "integrity": "sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^3.2.5",
-        "eventsource": "^1.0.7",
-        "faye-websocket": "~0.11.1",
-        "inherits": "^2.0.3",
-        "json3": "^3.3.2",
-        "url-parse": "^1.4.3"
-      }
-    },
-    "node_modules/sockjs-client/node_modules/debug": {
-      "version": "3.2.6",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/sockjs-client/node_modules/faye-websocket": {
-      "version": "0.11.3",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz",
-      "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==",
-      "dev": true,
-      "dependencies": {
-        "websocket-driver": ">=0.5.1"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/sockjs-client/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/socks": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.3.3.tgz",
-      "integrity": "sha512-o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA==",
-      "dependencies": {
-        "ip": "1.1.5",
-        "smart-buffer": "^4.1.0"
-      },
-      "engines": {
-        "node": ">= 6.0.0",
-        "npm": ">= 3.0.0"
-      }
-    },
-    "node_modules/socks-proxy-agent": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz",
-      "integrity": "sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==",
-      "dev": true,
-      "dependencies": {
-        "agent-base": "~4.2.1",
-        "socks": "~2.3.2"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/socks-proxy-agent/node_modules/agent-base": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz",
-      "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==",
-      "dev": true,
-      "dependencies": {
-        "es6-promisify": "^5.0.0"
-      },
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
-    "node_modules/sort-keys": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
-      "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
-      "dev": true,
-      "dependencies": {
-        "is-plain-obj": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-list-map": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
-      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
-      "dev": true
-    },
-    "node_modules/source-map": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/source-map-loader": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-1.0.0.tgz",
-      "integrity": "sha512-ZayyQCSCrQazN50aCvuS84lJT4xc1ZAcykH5blHaBdVveSwjiFK8UGMPvao0ho54DTb0Jf7m57uRRG/YYUZ2Fg==",
-      "dev": true,
-      "dependencies": {
-        "data-urls": "^2.0.0",
-        "iconv-lite": "^0.5.1",
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^2.6.6",
-        "source-map": "^0.6.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/source-map-loader/node_modules/iconv-lite": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.2.tgz",
-      "integrity": "sha512-kERHXvpSaB4aU3eANwidg79K8FlrN77m8G9V+0vOR3HYaRifrlwMEpT7ZBJqLSEIHnEgJTHcWK82wwLwwKwtag==",
-      "dev": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-loader/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-resolve": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
-      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
-      "dev": true,
-      "dependencies": {
-        "atob": "^2.1.2",
-        "decode-uri-component": "^0.2.0",
-        "resolve-url": "^0.2.1",
-        "source-map-url": "^0.4.0",
-        "urix": "^0.1.0"
-      }
-    },
-    "node_modules/source-map-support": {
-      "version": "0.5.19",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
-      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
-      "dev": true,
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      }
-    },
-    "node_modules/source-map-support/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-url": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
-      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
-      "dev": true
-    },
-    "node_modules/sourcemap-codec": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
-      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
-      "dev": true
-    },
-    "node_modules/sparkles": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
-      "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/spdx-correct": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
-      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
-      "dependencies": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-exceptions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="
-    },
-    "node_modules/spdx-expression-parse": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
-      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
-      "dependencies": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-license-ids": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz",
-      "integrity": "sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw=="
-    },
-    "node_modules/spdy": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
-      "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.1.0",
-        "handle-thing": "^2.0.0",
-        "http-deceiver": "^1.2.7",
-        "select-hose": "^2.0.0",
-        "spdy-transport": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/spdy-transport": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
-      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.1.0",
-        "detect-node": "^2.0.4",
-        "hpack.js": "^2.1.6",
-        "obuf": "^1.1.2",
-        "readable-stream": "^3.0.6",
-        "wbuf": "^1.7.3"
-      }
-    },
-    "node_modules/spdy-transport/node_modules/debug": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
-      "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
-      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/spdy-transport/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/spdy-transport/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/spdy/node_modules/debug": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
-      "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
-      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/spdy/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/speed-measure-webpack-plugin": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.3.tgz",
-      "integrity": "sha512-2ljD4Ch/rz2zG3HsLsnPfp23osuPBS0qPuz9sGpkNXTN1Ic4M+W9xB8l8rS8ob2cO4b1L+WTJw/0AJwWYVgcxQ==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      },
-      "peerDependencies": {
-        "webpack": "^1 || ^2 || ^3 || ^4"
-      }
-    },
-    "node_modules/speed-measure-webpack-plugin/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/speed-measure-webpack-plugin/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/speed-measure-webpack-plugin/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/speed-measure-webpack-plugin/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/speed-measure-webpack-plugin/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/speed-measure-webpack-plugin/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/split-string": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/split2": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
-      "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "^3.0.0"
-      }
-    },
-    "node_modules/split2/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "dev": true
-    },
-    "node_modules/ssh-config": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/ssh-config/-/ssh-config-1.1.6.tgz",
-      "integrity": "sha512-ZPO9rECxzs5JIQ6G/2EfL1I9ho/BVZkx9HRKn8+0af7QgwAmumQ7XBFP1ggMyPMo+/tUbmv0HFdv4qifdO/9JA==",
-      "dev": true
-    },
-    "node_modules/sshpk": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
-      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
-      "dependencies": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
-      },
-      "bin": {
-        "sshpk-conv": "bin/sshpk-conv",
-        "sshpk-sign": "bin/sshpk-sign",
-        "sshpk-verify": "bin/sshpk-verify"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ssri": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
-      "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
-      "dependencies": {
-        "minipass": "^3.1.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/stable": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
-      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
-      "dev": true
-    },
-    "node_modules/stack-trace": {
-      "version": "0.0.10",
-      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
-      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/stack-utils": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.2.tgz",
-      "integrity": "sha512-0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg==",
-      "dev": true,
-      "dependencies": {
-        "escape-string-regexp": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/stack-utils/node_modules/escape-string-regexp": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/static-extend": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
-      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
-      "dev": true,
-      "dependencies": {
-        "define-property": "^0.2.5",
-        "object-copy": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/stealthy-require": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
-      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/stream-browserify": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
-      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "~2.0.1",
-        "readable-stream": "^2.0.2"
-      }
-    },
-    "node_modules/stream-buffers": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz",
-      "integrity": "sha1-kdX1Ew0c75bc+n9yaUUYh0HQnuQ=",
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/stream-combiner2": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz",
-      "integrity": "sha1-+02KFCDqNidk4hrUeAOXvry0HL4=",
-      "dev": true,
-      "dependencies": {
-        "duplexer2": "~0.1.0",
-        "readable-stream": "^2.0.2"
-      }
-    },
-    "node_modules/stream-each": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
-      "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
-      "dev": true,
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "stream-shift": "^1.0.0"
-      }
-    },
-    "node_modules/stream-exhaust": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
-      "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==",
-      "dev": true
-    },
-    "node_modules/stream-http": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
-      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
-      "dev": true,
-      "dependencies": {
-        "builtin-status-codes": "^3.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.3.6",
-        "to-arraybuffer": "^1.0.0",
-        "xtend": "^4.0.0"
-      }
-    },
-    "node_modules/stream-shift": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
-      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
-      "dev": true
-    },
-    "node_modules/strict-uri-encode": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
-      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "node_modules/string-length": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.1.tgz",
-      "integrity": "sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw==",
-      "dev": true,
-      "dependencies": {
-        "char-regex": "^1.0.2",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/string-length/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/string-length/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-      "dependencies": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/string-width/node_modules/strip-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-      "dependencies": {
-        "ansi-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/string.prototype.codepointat": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz",
-      "integrity": "sha512-2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg=="
-    },
-    "node_modules/string.prototype.trimend": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
-      "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimend/node_modules/es-abstract": {
-      "version": "1.17.7",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
-      "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
-      "dev": true,
-      "dependencies": {
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1",
-        "is-callable": "^1.2.2",
-        "is-regex": "^1.1.1",
-        "object-inspect": "^1.8.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.1",
-        "string.prototype.trimend": "^1.0.1",
-        "string.prototype.trimstart": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimstart": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
-      "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimstart/node_modules/es-abstract": {
-      "version": "1.17.7",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
-      "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
-      "dev": true,
-      "dependencies": {
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1",
-        "is-callable": "^1.2.2",
-        "is-regex": "^1.1.1",
-        "object-inspect": "^1.8.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.1",
-        "string.prototype.trimend": "^1.0.1",
-        "string.prototype.trimstart": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/stringify-package": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/stringify-package/-/stringify-package-1.0.1.tgz",
-      "integrity": "sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg=="
-    },
-    "node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/strip-ansi/node_modules/ansi-regex": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/strip-bom": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-eof": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/strip-final-newline": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/style-loader": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.2.1.tgz",
-      "integrity": "sha512-ByHSTQvHLkWE9Ir5+lGbVOXhxX10fbprhLvdg96wedFZb4NDekDPxVKv5Fwmio+QcMlkkNfuK+5W1peQ5CUhZg==",
-      "dev": true,
-      "dependencies": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^2.6.6"
-      },
-      "engines": {
-        "node": ">= 8.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/stylehacks": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz",
-      "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-selector-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/stylehacks/node_modules/postcss-selector-parser": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-      "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
-      "dev": true,
-      "dependencies": {
-        "dot-prop": "^5.2.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/stylus": {
-      "version": "0.54.7",
-      "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.7.tgz",
-      "integrity": "sha512-Yw3WMTzVwevT6ZTrLCYNHAFmanMxdylelL3hkWNgPMeTCpMwpV3nXjpOHuBXtFv7aiO2xRuQS6OoAdgkNcSNug==",
-      "dev": true,
-      "dependencies": {
-        "css-parse": "~2.0.0",
-        "debug": "~3.1.0",
-        "glob": "^7.1.3",
-        "mkdirp": "~0.5.x",
-        "safer-buffer": "^2.1.2",
-        "sax": "~1.2.4",
-        "semver": "^6.0.0",
-        "source-map": "^0.7.3"
-      },
-      "bin": {
-        "stylus": "bin/stylus"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/stylus-loader": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz",
-      "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==",
-      "dev": true,
-      "dependencies": {
-        "loader-utils": "^1.0.2",
-        "lodash.clonedeep": "^4.5.0",
-        "when": "~3.6.x"
-      },
-      "peerDependencies": {
-        "stylus": ">=0.52.4"
-      }
-    },
-    "node_modules/stylus-loader/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/stylus-loader/node_modules/loader-utils": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/stylus/node_modules/debug": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/stylus/node_modules/sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-      "dev": true
-    },
-    "node_modules/stylus/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/superagent": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/superagent/-/superagent-5.3.1.tgz",
-      "integrity": "sha512-wjJ/MoTid2/RuGCOFtlacyGNxN9QLMgcpYLDQlWFIhhdJ93kNscFonGvrpAHSCVjRVj++DGCglocF7Aej1KHvQ==",
-      "dev": true,
-      "dependencies": {
-        "component-emitter": "^1.3.0",
-        "cookiejar": "^2.1.2",
-        "debug": "^4.1.1",
-        "fast-safe-stringify": "^2.0.7",
-        "form-data": "^3.0.0",
-        "formidable": "^1.2.2",
-        "methods": "^1.1.2",
-        "mime": "^2.4.6",
-        "qs": "^6.9.4",
-        "readable-stream": "^3.6.0",
-        "semver": "^7.3.2"
-      },
-      "engines": {
-        "node": ">= 7.0.0"
-      }
-    },
-    "node_modules/superagent-proxy": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/superagent-proxy/-/superagent-proxy-2.1.0.tgz",
-      "integrity": "sha512-DnarpKN6Xn8e3pYlFV4Yvsj9yxLY4q5FIsUe5JvN7vjzP+YCfzXv03dTkZSD2yzrSadsNYHf0IgOUJwKjX457A==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^3.1.0",
-        "proxy-agent": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "peerDependencies": {
-        "superagent": ">= 0.15.4 || 1 || 2 || 3"
-      }
-    },
-    "node_modules/superagent-proxy/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/superagent-proxy/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "dev": true
-    },
-    "node_modules/superagent/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/superagent/node_modules/form-data": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
-      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
-      "dev": true,
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/superagent/node_modules/mime": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
-      "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
-      "dev": true,
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/superagent/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/superagent/node_modules/qs": {
-      "version": "6.10.1",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz",
-      "integrity": "sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==",
-      "dev": true,
-      "dependencies": {
-        "side-channel": "^1.0.4"
-      },
-      "engines": {
-        "node": ">=0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/superagent/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-hyperlinks": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz",
-      "integrity": "sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0",
-        "supports-color": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/sver-compat": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz",
-      "integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=",
-      "dev": true,
-      "dependencies": {
-        "es6-iterator": "^2.0.1",
-        "es6-symbol": "^3.1.1"
-      }
-    },
-    "node_modules/svgo": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
-      "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "coa": "^2.0.2",
-        "css-select": "^2.0.0",
-        "css-select-base-adapter": "^0.1.1",
-        "css-tree": "1.0.0-alpha.37",
-        "csso": "^4.0.2",
-        "js-yaml": "^3.13.1",
-        "mkdirp": "~0.5.1",
-        "object.values": "^1.1.0",
-        "sax": "~1.2.4",
-        "stable": "^0.1.8",
-        "unquote": "~1.1.1",
-        "util.promisify": "~1.0.0"
-      },
-      "bin": {
-        "svgo": "bin/svgo"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/svgo/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/svgo/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/svgo/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/svgo/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/svgo/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/svgo/node_modules/sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-      "dev": true
-    },
-    "node_modules/svgo/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/symbol-observable": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
-      "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/symbol-tree": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
-      "dev": true
-    },
-    "node_modules/systeminformation": {
-      "version": "4.34.23",
-      "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-4.34.23.tgz",
-      "integrity": "sha512-33+lQwlLxXoxy0o9WLOgw8OjbXeS3Jv+pSl+nxKc2AOClBI28HsdRPpH0u9Xa9OVjHLT9vonnOMw1ug7YXI0dA==",
-      "os": [
-        "darwin",
-        "linux",
-        "win32",
-        "freebsd",
-        "openbsd",
-        "netbsd",
-        "sunos"
-      ],
-      "bin": {
-        "systeminformation": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      },
-      "funding": {
-        "type": "Buy me a coffee",
-        "url": "https://www.buymeacoffee.com/systeminfo"
-      }
-    },
-    "node_modules/table": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.6.0.tgz",
-      "integrity": "sha512-iZMtp5tUvcnAdtHpZTWLPF0M7AgiQsURR2DwmxnJwSy8I3+cY+ozzVvYha3BOLG2TB+L0CqjIz+91htuj6yCXg==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^8.0.1",
-        "lodash.clonedeep": "^4.5.0",
-        "lodash.flatten": "^4.4.0",
-        "lodash.truncate": "^4.4.2",
-        "slice-ansi": "^4.0.0",
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/table/node_modules/ajv": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.2.0.tgz",
-      "integrity": "sha512-WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/table/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/table/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/table/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/table/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
-    },
-    "node_modules/table/node_modules/string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/table/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/tail": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/tail/-/tail-0.4.0.tgz",
-      "integrity": "sha1-0p3nJ1DMmdseBTr/E8NZ7PtxMAI=",
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/tapable": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
-      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/tar": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.1.tgz",
-      "integrity": "sha512-GG0R7yt/CQkvG4fueXDi52Zskqxe2AyRJ+Wm54yqarnBgcX3qRIWh10qLVAAN+mlPFGTfP5UxvD3Fbi11UOTUQ==",
-      "dependencies": {
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "minipass": "^3.0.0",
-        "minizlib": "^2.1.1",
-        "mkdirp": "^1.0.3",
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/tar-fs": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
-      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
-      "optional": true,
-      "dependencies": {
-        "chownr": "^1.1.1",
-        "mkdirp-classic": "^0.5.2",
-        "pump": "^3.0.0",
-        "tar-stream": "^2.1.4"
-      }
-    },
-    "node_modules/tar-fs/node_modules/chownr": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-      "optional": true
-    },
-    "node_modules/tar-stream": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.4.tgz",
-      "integrity": "sha512-o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw==",
-      "optional": true,
-      "dependencies": {
-        "bl": "^4.0.3",
-        "end-of-stream": "^1.4.1",
-        "fs-constants": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^3.1.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/tar-stream/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "optional": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/tar/node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/term-size": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz",
-      "integrity": "sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/terminal-link": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
-      "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-escapes": "^4.2.1",
-        "supports-hyperlinks": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/terminal-link/node_modules/ansi-escapes": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.11.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/terminal-link/node_modules/type-fest": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-      "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/terser": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.7.0.tgz",
-      "integrity": "sha512-Lfb0RiZcjRDXCC3OSHJpEkxJ9Qeqs6mp2v4jf2MHfy8vGERmVDuvjXdd/EnP5Deme5F2yBRBymKmKHCBg2echw==",
-      "dev": true,
-      "dependencies": {
-        "commander": "^2.20.0",
-        "source-map": "~0.6.1",
-        "source-map-support": "~0.5.12"
-      },
-      "bin": {
-        "terser": "bin/terser"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/terser-webpack-plugin": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-3.0.1.tgz",
-      "integrity": "sha512-eFDtq8qPUEa9hXcUzTwKXTnugIVtlqc1Z/ZVhG8LmRT3lgRY13+pQTnFLY2N7ATB6TKCHuW/IGjoAnZz9wOIqw==",
-      "dev": true,
-      "dependencies": {
-        "cacache": "^15.0.3",
-        "find-cache-dir": "^3.3.1",
-        "jest-worker": "^26.0.0",
-        "p-limit": "^2.3.0",
-        "schema-utils": "^2.6.6",
-        "serialize-javascript": "^3.0.0",
-        "source-map": "^0.6.1",
-        "terser": "^4.6.13",
-        "webpack-sources": "^1.4.3"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/serialize-javascript": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz",
-      "integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==",
-      "dev": true,
-      "dependencies": {
-        "randombytes": "^2.1.0"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/terser/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/test-exclude": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
-      "dev": true,
-      "dependencies": {
-        "@istanbuljs/schema": "^0.1.2",
-        "glob": "^7.1.4",
-        "minimatch": "^3.0.4"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-      "dev": true
-    },
-    "node_modules/throat": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz",
-      "integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==",
-      "dev": true
-    },
-    "node_modules/through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
-    },
-    "node_modules/through2": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
-      }
-    },
-    "node_modules/through2-filter": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
-      "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
-      "dev": true,
-      "dependencies": {
-        "through2": "~2.0.0",
-        "xtend": "~4.0.0"
-      }
-    },
-    "node_modules/thunky": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
-      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
-      "dev": true
-    },
-    "node_modules/time-stamp": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
-      "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/timers-browserify": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
-      "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
-      "dev": true,
-      "dependencies": {
-        "setimmediate": "^1.0.4"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
-    "node_modules/timsort": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
-      "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
-      "dev": true
-    },
-    "node_modules/tmp": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
-      "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
-      "dependencies": {
-        "rimraf": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8.17.0"
-      }
-    },
-    "node_modules/tmpl": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
-      "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=",
-      "dev": true
-    },
-    "node_modules/to-absolute-glob": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
-      "integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=",
-      "dev": true,
-      "dependencies": {
-        "is-absolute": "^1.0.0",
-        "is-negated-glob": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/to-arraybuffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
-      "dev": true
-    },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/to-object-path": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
-      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/to-object-path/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/to-readable-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz",
-      "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/to-regex": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
-      "dev": true,
-      "dependencies": {
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "regex-not": "^1.0.2",
-        "safe-regex": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/to-through": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz",
-      "integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=",
-      "dev": true,
-      "dependencies": {
-        "through2": "^2.0.3"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/toidentifier": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/tough-cookie": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
-      "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
-      "dependencies": {
-        "ip-regex": "^2.1.0",
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/tr46": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.0.2.tgz",
-      "integrity": "sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==",
-      "dev": true,
-      "dependencies": {
-        "punycode": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/tree-kill": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
-      "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
-      "dev": true,
-      "bin": {
-        "tree-kill": "cli.js"
-      }
-    },
-    "node_modules/ts-jest": {
-      "version": "26.4.1",
-      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-26.4.1.tgz",
-      "integrity": "sha512-F4aFq01aS6mnAAa0DljNmKr/Kk9y4HVZ1m6/rtJ0ED56cuxINGq3Q9eVAh+z5vcYKe5qnTMvv90vE8vUMFxomg==",
-      "dev": true,
-      "dependencies": {
-        "@types/jest": "26.x",
-        "bs-logger": "0.x",
-        "buffer-from": "1.x",
-        "fast-json-stable-stringify": "2.x",
-        "jest-util": "^26.1.0",
-        "json5": "2.x",
-        "lodash.memoize": "4.x",
-        "make-error": "1.x",
-        "mkdirp": "1.x",
-        "semver": "7.x",
-        "yargs-parser": "20.x"
-      },
-      "bin": {
-        "ts-jest": "cli.js"
-      },
-      "engines": {
-        "node": ">= 10"
-      },
-      "peerDependencies": {
-        "jest": ">=26 <27",
-        "typescript": ">=3.8 <5.0"
-      }
-    },
-    "node_modules/ts-jest/node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "dev": true,
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/ts-jest/node_modules/yargs-parser": {
-      "version": "20.2.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.1.tgz",
-      "integrity": "sha512-yYsjuSkjbLMBp16eaOt7/siKTjNVjMm3SoJnIg3sEh/JsvqVVDyjRKmaJV4cl+lNIgq6QEco2i3gDebJl7/vLA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/ts-md5": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/ts-md5/-/ts-md5-1.2.7.tgz",
-      "integrity": "sha512-emODogvKGWi1KO1l9c6YxLMBn6CEH3VrH5mVPIyOtxBG52BvV4jP3GWz6bOZCz61nLgBc3ffQYE4+EHfCD+V7w=="
-    },
-    "node_modules/ts-node": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.3.0.tgz",
-      "integrity": "sha512-dyNS/RqyVTDcmNM4NIBAeDMpsAdaQ+ojdf0GOLqE6nwJOgzEkdRNzJywhDfwnuvB10oa6NLVG1rUJQCpRN7qoQ==",
-      "dev": true,
-      "dependencies": {
-        "arg": "^4.1.0",
-        "diff": "^4.0.1",
-        "make-error": "^1.1.1",
-        "source-map-support": "^0.5.6",
-        "yn": "^3.0.0"
-      },
-      "bin": {
-        "ts-node": "dist/bin.js"
-      },
-      "engines": {
-        "node": ">=4.2.0"
-      },
-      "peerDependencies": {
-        "typescript": ">=2.0"
-      }
-    },
-    "node_modules/ts-pnp": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.2.0.tgz",
-      "integrity": "sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/tsconfig-paths": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz",
-      "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==",
-      "dev": true,
-      "dependencies": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
-        "minimist": "^1.2.0",
-        "strip-bom": "^3.0.0"
-      }
-    },
-    "node_modules/tsconfig-paths/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/tsconfig-paths/node_modules/strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/tslib": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz",
-      "integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ=="
-    },
-    "node_modules/tsutils": {
-      "version": "3.17.1",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.17.1.tgz",
-      "integrity": "sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^1.8.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      },
-      "peerDependencies": {
-        "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
-      }
-    },
-    "node_modules/tsutils/node_modules/tslib": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
-      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
-      "dev": true
-    },
-    "node_modules/tty-browserify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
-      "dev": true
-    },
-    "node_modules/tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "dependencies": {
-        "safe-buffer": "^5.0.1"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
-    },
-    "node_modules/type": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
-      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
-      "dev": true
-    },
-    "node_modules/type-check": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/type-detect": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-      "dependencies": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/typedarray": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
-      "dev": true
-    },
-    "node_modules/typedarray-to-buffer": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-      "dependencies": {
-        "is-typedarray": "^1.0.0"
-      }
-    },
-    "node_modules/typescript": {
-      "version": "3.9.9",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.9.tgz",
-      "integrity": "sha512-kdMjTiekY+z/ubJCATUPlRDl39vXYiMV9iyeMuEuXZh2we6zz80uovNN2WlAxmmdE/Z/YQe+EbOEXB5RHEED3w==",
-      "dev": true,
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=4.2.0"
-      }
-    },
-    "node_modules/uglify-js": {
-      "version": "3.4.10",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz",
-      "integrity": "sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==",
-      "dev": true,
-      "dependencies": {
-        "commander": "~2.19.0",
-        "source-map": "~0.6.1"
-      },
-      "bin": {
-        "uglifyjs": "bin/uglifyjs"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/uglify-js/node_modules/commander": {
-      "version": "2.19.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
-      "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
-      "dev": true
-    },
-    "node_modules/uglify-js/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unbox-primitive": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
-      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "has-bigints": "^1.0.1",
-        "has-symbols": "^1.0.2",
-        "which-boxed-primitive": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/unbox-primitive/node_modules/has-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/unc-path-regex": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
-      "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/underscore": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.11.0.tgz",
-      "integrity": "sha512-xY96SsN3NA461qIRKZ/+qox37YXPtSBswMGfiNptr+wrt6ds4HaMw23TP612fEyGekRE6LNRiLYr/aqbHXNedw=="
-    },
-    "node_modules/undertaker": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.3.0.tgz",
-      "integrity": "sha512-/RXwi5m/Mu3H6IHQGww3GNt1PNXlbeCuclF2QYR14L/2CHPz3DFZkvB5hZ0N/QUkiXWCACML2jXViIQEQc2MLg==",
-      "dev": true,
-      "dependencies": {
-        "arr-flatten": "^1.0.1",
-        "arr-map": "^2.0.0",
-        "bach": "^1.0.0",
-        "collection-map": "^1.0.0",
-        "es6-weak-map": "^2.0.1",
-        "fast-levenshtein": "^1.0.0",
-        "last-run": "^1.1.0",
-        "object.defaults": "^1.0.0",
-        "object.reduce": "^1.0.0",
-        "undertaker-registry": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/undertaker-registry": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz",
-      "integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/undertaker/node_modules/fast-levenshtein": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz",
-      "integrity": "sha1-5qdUzI8V5YmHqpy9J69m/W9OWvk=",
-      "dev": true
-    },
-    "node_modules/unicode-canonical-property-names-ecmascript": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
-      "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unicode-match-property-ecmascript": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz",
-      "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==",
-      "dev": true,
-      "dependencies": {
-        "unicode-canonical-property-names-ecmascript": "^1.0.4",
-        "unicode-property-aliases-ecmascript": "^1.0.4"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unicode-match-property-value-ecmascript": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz",
-      "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unicode-property-aliases-ecmascript": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz",
-      "integrity": "sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/union-value": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
-      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
-      "dev": true,
-      "dependencies": {
-        "arr-union": "^3.1.0",
-        "get-value": "^2.0.6",
-        "is-extendable": "^0.1.1",
-        "set-value": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/uniq": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
-      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
-      "dev": true
-    },
-    "node_modules/uniqs": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz",
-      "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=",
-      "dev": true
-    },
-    "node_modules/unique-filename": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
-      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
-      "dependencies": {
-        "unique-slug": "^2.0.0"
-      }
-    },
-    "node_modules/unique-slug": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
-      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
-      "dependencies": {
-        "imurmurhash": "^0.1.4"
-      }
-    },
-    "node_modules/unique-stream": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
-      "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
-      "dev": true,
-      "dependencies": {
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "through2-filter": "^3.0.0"
-      }
-    },
-    "node_modules/unique-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
-      "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
-      "dependencies": {
-        "crypto-random-string": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/universal-analytics": {
-      "version": "0.4.20",
-      "resolved": "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.4.20.tgz",
-      "integrity": "sha512-gE91dtMvNkjO+kWsPstHRtSwHXz0l2axqptGYp5ceg4MsuurloM0PU3pdOfpb5zBXUvyjT4PwhWK2m39uczZuw==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^3.0.0",
-        "request": "^2.88.0",
-        "uuid": "^3.0.0"
-      }
-    },
-    "node_modules/universal-analytics/node_modules/debug": {
-      "version": "3.2.6",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/universal-analytics/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/universalify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
-    "node_modules/unorm": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.6.0.tgz",
-      "integrity": "sha512-b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA==",
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/unquote": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
-      "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
-      "dev": true
-    },
-    "node_modules/unset-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
-      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
-      "dev": true,
-      "dependencies": {
-        "has-value": "^0.3.1",
-        "isobject": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/has-value": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-      "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
-      "dev": true,
-      "dependencies": {
-        "get-value": "^2.0.3",
-        "has-values": "^0.1.4",
-        "isobject": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-      "dev": true,
-      "dependencies": {
-        "isarray": "1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/has-values": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-      "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/untildify": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
-      "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/upath": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
-      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
-      "dev": true,
-      "engines": {
-        "node": ">=4",
-        "yarn": "*"
-      }
-    },
-    "node_modules/update-notifier": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.3.tgz",
-      "integrity": "sha512-Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A==",
-      "dependencies": {
-        "boxen": "^4.2.0",
-        "chalk": "^3.0.0",
-        "configstore": "^5.0.1",
-        "has-yarn": "^2.1.0",
-        "import-lazy": "^2.1.0",
-        "is-ci": "^2.0.0",
-        "is-installed-globally": "^0.3.1",
-        "is-npm": "^4.0.0",
-        "is-yarn-global": "^0.3.0",
-        "latest-version": "^5.0.0",
-        "pupa": "^2.0.1",
-        "semver-diff": "^3.1.1",
-        "xdg-basedir": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/yeoman/update-notifier?sponsor=1"
-      }
-    },
-    "node_modules/upper-case": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
-      "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=",
-      "dev": true
-    },
-    "node_modules/uri-js": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz",
-      "integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==",
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "node_modules/urix": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
-      "deprecated": "Please see https://github.com/lydell/urix#deprecated",
-      "dev": true
-    },
-    "node_modules/url": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
-      "dev": true,
-      "dependencies": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
-      }
-    },
-    "node_modules/url-parse": {
-      "version": "1.4.7",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
-      "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
-      "dev": true,
-      "dependencies": {
-        "querystringify": "^2.1.1",
-        "requires-port": "^1.0.0"
-      }
-    },
-    "node_modules/url-parse-lax": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
-      "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
-      "dependencies": {
-        "prepend-http": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/url/node_modules/punycode": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-      "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
-      "dev": true
-    },
-    "node_modules/use": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/util": {
-      "version": "0.10.3",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
-      "dev": true,
-      "dependencies": {
-        "inherits": "2.0.1"
-      }
-    },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-    },
-    "node_modules/util-promisify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/util-promisify/-/util-promisify-2.1.0.tgz",
-      "integrity": "sha1-PCI2R2xNMsX/PEcAKt18E7moKlM=",
-      "dev": true,
-      "dependencies": {
-        "object.getownpropertydescriptors": "^2.0.3"
-      }
-    },
-    "node_modules/util.promisify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
-      "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.2",
-        "has-symbols": "^1.0.1",
-        "object.getownpropertydescriptors": "^2.1.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/util.promisify/node_modules/es-abstract": {
-      "version": "1.17.7",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
-      "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
-      "dev": true,
-      "dependencies": {
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1",
-        "is-callable": "^1.2.2",
-        "is-regex": "^1.1.1",
-        "object-inspect": "^1.8.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.1",
-        "string.prototype.trimend": "^1.0.1",
-        "string.prototype.trimstart": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/util/node_modules/inherits": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-      "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
-      "dev": true
-    },
-    "node_modules/utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
-      "bin": {
-        "uuid": "bin/uuid"
-      }
-    },
-    "node_modules/v8-compile-cache": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
-      "dev": true
-    },
-    "node_modules/v8-to-istanbul": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-5.0.1.tgz",
-      "integrity": "sha512-mbDNjuDajqYe3TXFk5qxcQy8L1msXNE37WTlLoqqpBfRsimbNcrlhQlDPntmECEcUvdC+AQ8CyMMf6EUx1r74Q==",
-      "dev": true,
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.1",
-        "convert-source-map": "^1.6.0",
-        "source-map": "^0.7.3"
-      },
-      "engines": {
-        "node": ">=10.10.0"
-      }
-    },
-    "node_modules/v8flags": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
-      "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==",
-      "dev": true,
-      "dependencies": {
-        "homedir-polyfill": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/valid-identifier": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/valid-identifier/-/valid-identifier-0.0.2.tgz",
-      "integrity": "sha512-zaSmOW6ykXwrkX0YTuFUSoALNEKGaQHpxBJQLb3TXspRNDpBwbfrIQCZqAQ0LKBlKuyn2YOq7NNd6415hvZ33g=="
-    },
-    "node_modules/validate-npm-package-license": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-      "dependencies": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
-    "node_modules/validate-npm-package-name": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz",
-      "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=",
-      "dependencies": {
-        "builtins": "^1.0.3"
-      }
-    },
-    "node_modules/value-or-function": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz",
-      "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/vendors": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz",
-      "integrity": "sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "engines": [
-        "node >=0.6.0"
-      ],
-      "dependencies": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      }
-    },
-    "node_modules/vinyl": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
-      "integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==",
-      "dev": true,
-      "dependencies": {
-        "clone": "^2.1.1",
-        "clone-buffer": "^1.0.0",
-        "clone-stats": "^1.0.0",
-        "cloneable-readable": "^1.0.0",
-        "remove-trailing-separator": "^1.0.1",
-        "replace-ext": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/vinyl-fs": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz",
-      "integrity": "sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==",
-      "dev": true,
-      "dependencies": {
-        "fs-mkdirp-stream": "^1.0.0",
-        "glob-stream": "^6.1.0",
-        "graceful-fs": "^4.0.0",
-        "is-valid-glob": "^1.0.0",
-        "lazystream": "^1.0.0",
-        "lead": "^1.0.0",
-        "object.assign": "^4.0.4",
-        "pumpify": "^1.3.5",
-        "readable-stream": "^2.3.3",
-        "remove-bom-buffer": "^3.0.0",
-        "remove-bom-stream": "^1.2.0",
-        "resolve-options": "^1.1.0",
-        "through2": "^2.0.0",
-        "to-through": "^2.0.0",
-        "value-or-function": "^3.0.0",
-        "vinyl": "^2.0.0",
-        "vinyl-sourcemap": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/vinyl-sourcemap": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz",
-      "integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=",
-      "dev": true,
-      "dependencies": {
-        "append-buffer": "^1.0.2",
-        "convert-source-map": "^1.5.0",
-        "graceful-fs": "^4.1.6",
-        "normalize-path": "^2.1.1",
-        "now-and-later": "^2.0.0",
-        "remove-bom-buffer": "^3.0.0",
-        "vinyl": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/vinyl-sourcemap/node_modules/normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-      "dev": true,
-      "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/vm-browserify": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
-      "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
-      "dev": true
-    },
-    "node_modules/w3c-hr-time": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
-      "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
-      "dev": true,
-      "dependencies": {
-        "browser-process-hrtime": "^1.0.0"
-      }
-    },
-    "node_modules/w3c-xmlserializer": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
-      "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
-      "dev": true,
-      "dependencies": {
-        "xml-name-validator": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/walker": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
-      "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
-      "dev": true,
-      "dependencies": {
-        "makeerror": "1.0.x"
-      }
-    },
-    "node_modules/watchpack": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.4.tgz",
-      "integrity": "sha512-aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "neo-async": "^2.5.0"
-      },
-      "optionalDependencies": {
-        "chokidar": "^3.4.1",
-        "watchpack-chokidar2": "^2.0.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz",
-      "integrity": "sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "chokidar": "^2.1.8"
-      },
-      "engines": {
-        "node": "<8.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/anymatch": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "micromatch": "^3.1.4",
-        "normalize-path": "^2.1.1"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/anymatch/node_modules/normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/binary-extensions": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/chokidar": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-      "deprecated": "Chokidar 2 will break on node v14+. Upgrade to chokidar 3 with 15x less dependencies.",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "anymatch": "^2.0.0",
-        "async-each": "^1.0.1",
-        "braces": "^2.3.2",
-        "glob-parent": "^3.1.0",
-        "inherits": "^2.0.3",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "normalize-path": "^3.0.0",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.2.1",
-        "upath": "^1.1.1"
-      },
-      "optionalDependencies": {
-        "fsevents": "^1.2.7"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/fsevents": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-      "deprecated": "fsevents 1 will break on node v14+ and could be using insecure binaries. Upgrade to fsevents 2.",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "dependencies": {
-        "bindings": "^1.5.0",
-        "nan": "^2.12.1"
-      },
-      "engines": {
-        "node": ">= 4.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/glob-parent": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/glob-parent/node_modules/is-glob": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "is-extglob": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/is-binary-path": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "binary-extensions": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/readdirp": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.11",
-        "micromatch": "^3.1.10",
-        "readable-stream": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/wbuf": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
-      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
-      "dev": true,
-      "dependencies": {
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "node_modules/wcwidth": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
-      "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=",
-      "dev": true,
-      "dependencies": {
-        "defaults": "^1.0.3"
-      }
-    },
-    "node_modules/webidl-conversions": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
-      "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.4"
-      }
-    },
-    "node_modules/webpack": {
-      "version": "4.43.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.43.0.tgz",
-      "integrity": "sha512-GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-module-context": "1.9.0",
-        "@webassemblyjs/wasm-edit": "1.9.0",
-        "@webassemblyjs/wasm-parser": "1.9.0",
-        "acorn": "^6.4.1",
-        "ajv": "^6.10.2",
-        "ajv-keywords": "^3.4.1",
-        "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^4.1.0",
-        "eslint-scope": "^4.0.3",
-        "json-parse-better-errors": "^1.0.2",
-        "loader-runner": "^2.4.0",
-        "loader-utils": "^1.2.3",
-        "memory-fs": "^0.4.1",
-        "micromatch": "^3.1.10",
-        "mkdirp": "^0.5.3",
-        "neo-async": "^2.6.1",
-        "node-libs-browser": "^2.2.1",
-        "schema-utils": "^1.0.0",
-        "tapable": "^1.1.3",
-        "terser-webpack-plugin": "^1.4.3",
-        "watchpack": "^1.6.1",
-        "webpack-sources": "^1.4.1"
-      },
-      "bin": {
-        "webpack": "bin/webpack.js"
-      },
-      "engines": {
-        "node": ">=6.11.5"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/webpack-dev-middleware": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz",
-      "integrity": "sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==",
-      "dev": true,
-      "dependencies": {
-        "memory-fs": "^0.4.1",
-        "mime": "^2.4.4",
-        "mkdirp": "^0.5.1",
-        "range-parser": "^1.2.1",
-        "webpack-log": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 6"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0"
-      }
-    },
-    "node_modules/webpack-dev-middleware/node_modules/memory-fs": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
-      "dev": true,
-      "dependencies": {
-        "errno": "^0.1.3",
-        "readable-stream": "^2.0.1"
-      }
-    },
-    "node_modules/webpack-dev-middleware/node_modules/mime": {
-      "version": "2.4.6",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
-      "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==",
-      "dev": true,
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/webpack-dev-server": {
-      "version": "3.11.0",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz",
-      "integrity": "sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-html": "0.0.7",
-        "bonjour": "^3.5.0",
-        "chokidar": "^2.1.8",
-        "compression": "^1.7.4",
-        "connect-history-api-fallback": "^1.6.0",
-        "debug": "^4.1.1",
-        "del": "^4.1.1",
-        "express": "^4.17.1",
-        "html-entities": "^1.3.1",
-        "http-proxy-middleware": "0.19.1",
-        "import-local": "^2.0.0",
-        "internal-ip": "^4.3.0",
-        "ip": "^1.1.5",
-        "is-absolute-url": "^3.0.3",
-        "killable": "^1.0.1",
-        "loglevel": "^1.6.8",
-        "opn": "^5.5.0",
-        "p-retry": "^3.0.1",
-        "portfinder": "^1.0.26",
-        "schema-utils": "^1.0.0",
-        "selfsigned": "^1.10.7",
-        "semver": "^6.3.0",
-        "serve-index": "^1.9.1",
-        "sockjs": "0.3.20",
-        "sockjs-client": "1.4.0",
-        "spdy": "^4.0.2",
-        "strip-ansi": "^3.0.1",
-        "supports-color": "^6.1.0",
-        "url": "^0.11.0",
-        "webpack-dev-middleware": "^3.7.2",
-        "webpack-log": "^2.0.0",
-        "ws": "^6.2.1",
-        "yargs": "^13.3.2"
-      },
-      "bin": {
-        "webpack-dev-server": "bin/webpack-dev-server.js"
-      },
-      "engines": {
-        "node": ">= 6.11.5"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "webpack-cli": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/anymatch": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-      "dev": true,
-      "dependencies": {
-        "micromatch": "^3.1.4",
-        "normalize-path": "^2.1.1"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/anymatch/node_modules/normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-      "dev": true,
-      "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/binary-extensions": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
-      "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/chokidar": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-      "deprecated": "Chokidar 2 will break on node v14+. Upgrade to chokidar 3 with 15x less dependencies.",
-      "dev": true,
-      "dependencies": {
-        "anymatch": "^2.0.0",
-        "async-each": "^1.0.1",
-        "braces": "^2.3.2",
-        "glob-parent": "^3.1.0",
-        "inherits": "^2.0.3",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "normalize-path": "^3.0.0",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.2.1",
-        "upath": "^1.1.1"
-      },
-      "optionalDependencies": {
-        "fsevents": "^1.2.7"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/debug": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
-      "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
-      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/fsevents": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-      "deprecated": "fsevents 1 will break on node v14+ and could be using insecure binaries. Upgrade to fsevents 2.",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "dependencies": {
-        "bindings": "^1.5.0",
-        "nan": "^2.12.1"
-      },
-      "engines": {
-        "node": ">= 4.0"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/glob-parent": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/glob-parent/node_modules/is-glob": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/is-absolute-url": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz",
-      "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/is-binary-path": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-      "dev": true,
-      "dependencies": {
-        "binary-extensions": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/webpack-dev-server/node_modules/readdirp": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.11",
-        "micromatch": "^3.1.10",
-        "readable-stream": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/schema-utils": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.1.0",
-        "ajv-errors": "^1.0.0",
-        "ajv-keywords": "^3.1.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/supports-color": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack-log": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
-      "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-colors": "^3.0.0",
-        "uuid": "^3.3.2"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/webpack-merge": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
-      "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==",
-      "dev": true,
-      "dependencies": {
-        "lodash": "^4.17.15"
-      }
-    },
-    "node_modules/webpack-sources": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-      "dev": true,
-      "dependencies": {
-        "source-list-map": "^2.0.0",
-        "source-map": "~0.6.1"
-      }
-    },
-    "node_modules/webpack-sources/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack-subresource-integrity": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.4.1.tgz",
-      "integrity": "sha512-XMLFInbGbB1HV7K4vHWANzc1CN0t/c4bBvnlvGxGwV45yE/S/feAXIm8dJsCkzqWtSKnmaEgTp/meyeThxG4Iw==",
-      "dev": true,
-      "dependencies": {
-        "webpack-sources": "^1.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "html-webpack-plugin": "^2.21.0 || ~3 || >=4.0.0-alpha.2 <5",
-        "webpack": "^1.12.11 || ~2 || ~3 || ~4"
-      },
-      "peerDependenciesMeta": {
-        "html-webpack-plugin": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webpack/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
-      "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/cacache": {
-      "version": "12.0.4",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
-      "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
-      "dev": true,
-      "dependencies": {
-        "bluebird": "^3.5.5",
-        "chownr": "^1.1.1",
-        "figgy-pudding": "^3.5.1",
-        "glob": "^7.1.4",
-        "graceful-fs": "^4.1.15",
-        "infer-owner": "^1.0.3",
-        "lru-cache": "^5.1.1",
-        "mississippi": "^3.0.0",
-        "mkdirp": "^0.5.1",
-        "move-concurrently": "^1.0.1",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^2.6.3",
-        "ssri": "^6.0.1",
-        "unique-filename": "^1.1.1",
-        "y18n": "^4.0.0"
-      }
-    },
-    "node_modules/webpack/node_modules/chownr": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-      "dev": true
-    },
-    "node_modules/webpack/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/find-cache-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
-      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
-      "dev": true,
-      "dependencies": {
-        "commondir": "^1.0.1",
-        "make-dir": "^2.0.0",
-        "pkg-dir": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/webpack/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/is-wsl": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/webpack/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/webpack/node_modules/loader-utils": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/webpack/node_modules/lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^3.0.2"
-      }
-    },
-    "node_modules/webpack/node_modules/make-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-      "dev": true,
-      "dependencies": {
-        "pify": "^4.0.1",
-        "semver": "^5.6.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/webpack/node_modules/memory-fs": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
-      "dev": true,
-      "dependencies": {
-        "errno": "^0.1.3",
-        "readable-stream": "^2.0.1"
-      }
-    },
-    "node_modules/webpack/node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/webpack/node_modules/schema-utils": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.1.0",
-        "ajv-errors": "^1.0.0",
-        "ajv-keywords": "^3.1.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/webpack/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/webpack/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/ssri": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
-      "dev": true,
-      "dependencies": {
-        "figgy-pudding": "^3.5.1"
-      }
-    },
-    "node_modules/webpack/node_modules/terser-webpack-plugin": {
-      "version": "1.4.5",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz",
-      "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==",
-      "dev": true,
-      "dependencies": {
-        "cacache": "^12.0.2",
-        "find-cache-dir": "^2.1.0",
-        "is-wsl": "^1.1.0",
-        "schema-utils": "^1.0.0",
-        "serialize-javascript": "^4.0.0",
-        "source-map": "^0.6.1",
-        "terser": "^4.1.2",
-        "webpack-sources": "^1.4.0",
-        "worker-farm": "^1.7.0"
-      },
-      "engines": {
-        "node": ">= 6.9.0"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0"
-      }
-    },
-    "node_modules/webpack/node_modules/to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/yallist": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true
-    },
-    "node_modules/webrtc-adapter": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/webrtc-adapter/-/webrtc-adapter-3.4.3.tgz",
-      "integrity": "sha1-tjYGLu6abvFYrNDYUBtnhDS1bxY=",
-      "dependencies": {
-        "sdp": "^1.5.0"
-      },
-      "engines": {
-        "node": ">=6.0.0",
-        "npm": ">=3.10.0"
-      }
-    },
-    "node_modules/websocket-driver": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz",
-      "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=",
-      "dev": true,
-      "dependencies": {
-        "websocket-extensions": ">=0.1.1"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
-    "node_modules/websocket-extensions": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
-      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/whatwg-encoding": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
-      "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
-      "dev": true,
-      "dependencies": {
-        "iconv-lite": "0.4.24"
-      }
-    },
-    "node_modules/whatwg-mimetype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
-      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
-      "dev": true
-    },
-    "node_modules/whatwg-url": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.3.0.tgz",
-      "integrity": "sha512-BQRf/ej5Rp3+n7k0grQXZj9a1cHtsp4lqj01p59xBWFKdezR8sO37XnpafwNqiFac/v2Il12EIMjX/Y4VZtT8Q==",
-      "dev": true,
-      "dependencies": {
-        "lodash.sortby": "^4.7.0",
-        "tr46": "^2.0.2",
-        "webidl-conversions": "^6.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/when": {
-      "version": "3.6.4",
-      "resolved": "https://registry.npmjs.org/when/-/when-3.6.4.tgz",
-      "integrity": "sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=",
-      "dev": true
-    },
-    "node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-      "dev": true,
-      "dependencies": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/which-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-      "dev": true
-    },
-    "node_modules/which-pm-runs": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz",
-      "integrity": "sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=",
-      "optional": true
-    },
-    "node_modules/wide-align": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
-      "dependencies": {
-        "string-width": "^1.0.2 || 2"
-      }
-    },
-    "node_modules/widest-line": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
-      "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==",
-      "dependencies": {
-        "string-width": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/widest-line/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/widest-line/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-    },
-    "node_modules/widest-line/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/widest-line/node_modules/string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/widest-line/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/windows-release": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-3.3.3.tgz",
-      "integrity": "sha512-OSOGH1QYiW5yVor9TtmXKQvt2vjQqbYS+DqmsZw+r7xDwLXEeT3JGW0ZppFmHx4diyXmxt238KFR3N9jzevBRg==",
-      "dependencies": {
-        "execa": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/windows-release/node_modules/cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-      "dependencies": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      },
-      "engines": {
-        "node": ">=4.8"
-      }
-    },
-    "node_modules/windows-release/node_modules/execa": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-      "dependencies": {
-        "cross-spawn": "^6.0.0",
-        "get-stream": "^4.0.0",
-        "is-stream": "^1.1.0",
-        "npm-run-path": "^2.0.0",
-        "p-finally": "^1.0.0",
-        "signal-exit": "^3.0.0",
-        "strip-eof": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/windows-release/node_modules/get-stream": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/windows-release/node_modules/is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/windows-release/node_modules/npm-run-path": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-      "dependencies": {
-        "path-key": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/windows-release/node_modules/path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/windows-release/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/windows-release/node_modules/shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-      "dependencies": {
-        "shebang-regex": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/windows-release/node_modules/shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/windows-release/node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
-    "node_modules/with-open-file": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/with-open-file/-/with-open-file-0.1.7.tgz",
-      "integrity": "sha512-ecJS2/oHtESJ1t3ZfMI3B7KIDKyfN0O16miWxdn30zdh66Yd3LsRFebXZXq6GU4xfxLf6nVxp9kIqElb5fqczA==",
-      "dependencies": {
-        "p-finally": "^1.0.0",
-        "p-try": "^2.1.0",
-        "pify": "^4.0.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/worker-farm": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
-      "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
-      "dev": true,
-      "dependencies": {
-        "errno": "~0.1.7"
-      }
-    },
-    "node_modules/worker-plugin": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/worker-plugin/-/worker-plugin-4.0.3.tgz",
-      "integrity": "sha512-7hFDYWiKcE3yHZvemsoM9lZis/PzurHAEX1ej8PLCu818Rt6QqUAiDdxHPCKZctzmhqzPpcFSgvMCiPbtooqAg==",
-      "dev": true,
-      "dependencies": {
-        "loader-utils": "^1.1.0"
-      },
-      "peerDependencies": {
-        "webpack": ">= 4"
-      }
-    },
-    "node_modules/worker-plugin/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/worker-plugin/node_modules/loader-utils": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/wrap-ansi": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.0",
-        "string-width": "^3.0.0",
-        "strip-ansi": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/wrap-ansi/node_modules/string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-    },
-    "node_modules/write": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
-      "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
-      "dev": true,
-      "dependencies": {
-        "mkdirp": "^0.5.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/write-file-atomic": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-      "dependencies": {
-        "imurmurhash": "^0.1.4",
-        "is-typedarray": "^1.0.0",
-        "signal-exit": "^3.0.2",
-        "typedarray-to-buffer": "^3.1.5"
-      }
-    },
-    "node_modules/ws": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
-      "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
-      "dev": true,
-      "dependencies": {
-        "async-limiter": "~1.0.0"
-      }
-    },
-    "node_modules/xcode": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/xcode/-/xcode-2.1.0.tgz",
-      "integrity": "sha512-uCrmPITrqTEzhn0TtT57fJaNaw8YJs1aCzs+P/QqxsDbvPZSv7XMPPwXrKvHtD6pLjBM/NaVwraWJm8q83Y4iQ==",
-      "dependencies": {
-        "simple-plist": "^1.0.0",
-        "uuid": "^3.3.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/xdg-basedir": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
-      "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/xml-escape": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/xml-escape/-/xml-escape-1.1.0.tgz",
-      "integrity": "sha1-OQTBQ/qOs6ADDsZG0pAqLxtwbEQ="
-    },
-    "node_modules/xml-name-validator": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
-      "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
-      "dev": true
-    },
-    "node_modules/xmlbuilder": {
-      "version": "9.0.7",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
-      "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=",
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/xmlchars": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
-      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
-      "dev": true
-    },
-    "node_modules/xmldom": {
-      "version": "0.1.31",
-      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.31.tgz",
-      "integrity": "sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==",
-      "deprecated": "Deprecated due to CVE-2021-21366 resolved in 0.5.0",
-      "engines": {
-        "node": ">=0.1"
-      }
-    },
-    "node_modules/xregexp": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz",
-      "integrity": "sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4"
-      }
-    },
-    "node_modules/y18n": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
-      "dev": true
-    },
-    "node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
-    "node_modules/yargs": {
-      "version": "13.3.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-      "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
-      "dev": true,
-      "dependencies": {
-        "cliui": "^5.0.0",
-        "find-up": "^3.0.0",
-        "get-caller-file": "^2.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^3.0.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^13.1.2"
-      }
-    },
-    "node_modules/yargs-parser": {
-      "version": "13.1.2",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      }
-    },
-    "node_modules/yargs/node_modules/find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yargs/node_modules/locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yargs/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yargs/node_modules/p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yargs/node_modules/string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yauzl": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
-      "dev": true,
-      "dependencies": {
-        "buffer-crc32": "~0.2.3",
-        "fd-slicer": "~1.1.0"
-      }
-    },
-    "node_modules/yn": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
-      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/zone.js": {
-      "version": "0.10.3",
-      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.10.3.tgz",
-      "integrity": "sha512-LXVLVEq0NNOqK/fLJo3d0kfzd4sxwn2/h67/02pjCjfKDxgx1i9QqpvtHD8CrBnSSwMw5+dy11O7FRX5mkO7Cg=="
-    }
-  },
   "dependencies": {
-    "@angular-devkit/architect": {
-      "version": "0.1101.2",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1101.2.tgz",
-      "integrity": "sha512-MLmBfHiiyPhbFSSAX4oMecPjEuBauOui5uBpI6BKNnk/7783fznbkbAKjXlOco7M81gkNeEoHMR8c+mOfcvv7g==",
+    "@angular-builders/custom-webpack": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/@angular-builders/custom-webpack/-/custom-webpack-10.0.1.tgz",
+      "integrity": "sha512-YDy5zEKVwXdoXLjmbsY6kGaEbmunQxaPipxrwLUc9hIjRLU2WcrX9vopf1R9Pgj4POad73IPBNGu+ibqNRFIEQ==",
       "dev": true,
-      "peer": true,
       "requires": {
-        "@angular-devkit/core": "11.1.2",
-        "rxjs": "6.6.3"
+        "@angular-devkit/architect": ">=0.1000.0 < 0.1100.0",
+        "@angular-devkit/build-angular": ">=0.1000.0 < 0.1100.0",
+        "@angular-devkit/core": "^10.0.0",
+        "lodash": "^4.17.15",
+        "ts-node": "^9.0.0",
+        "webpack-merge": "^4.2.2"
+      },
+      "dependencies": {
+        "@angular-devkit/architect": {
+          "version": "0.1002.3",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1002.3.tgz",
+          "integrity": "sha512-7ainXRNO1njZ6bBbJXGpMzCh0OYrzuIRe/+zRj0ncV1YfEsJb2yWBuiza0+y2Ljco7hdd4wr+7eJm7cfn+NvAw==",
+          "dev": true,
+          "requires": {
+            "@angular-devkit/core": "10.2.3",
+            "rxjs": "6.6.2"
+          }
+        },
+        "@angular-devkit/core": {
+          "version": "10.2.3",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.2.3.tgz",
+          "integrity": "sha512-pMM1v9Xjqx6YLOQxQYs0D+03H6XPDZLS8cyEtoQX2iYdh8qlKHZVbJa2WsfzwMoIPtgcXfQAXn113VEgrQPLFA==",
+          "dev": true,
+          "requires": {
+            "ajv": "6.12.4",
+            "fast-json-stable-stringify": "2.1.0",
+            "magic-string": "0.25.7",
+            "rxjs": "6.6.2",
+            "source-map": "0.7.3"
+          }
+        },
+        "ajv": {
+          "version": "6.12.4",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz",
+          "integrity": "sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "rxjs": {
+          "version": "6.6.2",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.2.tgz",
+          "integrity": "sha512-BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg==",
+          "dev": true,
+          "requires": {
+            "tslib": "^1.9.0"
+          }
+        },
+        "ts-node": {
+          "version": "9.1.1",
+          "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-9.1.1.tgz",
+          "integrity": "sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg==",
+          "dev": true,
+          "requires": {
+            "arg": "^4.1.0",
+            "create-require": "^1.1.0",
+            "diff": "^4.0.1",
+            "make-error": "^1.1.1",
+            "source-map-support": "^0.5.17",
+            "yn": "3.1.1"
+          }
+        },
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+          "dev": true
+        }
+      }
+    },
+    "@angular-devkit/architect": {
+      "version": "0.1202.7",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1202.7.tgz",
+      "integrity": "sha512-zqqw3h8jMDYsRrXUNY1J8xtUl6wmBO++yTka+CoEIFetNdLdoWmb5VpaA81i0aSBhXBgnBUUFvqZGdiI7BbV8A==",
+      "dev": true,
+      "requires": {
+        "@angular-devkit/core": "12.2.7",
+        "rxjs": "6.6.7"
       },
       "dependencies": {
         "rxjs": {
-          "version": "6.6.3",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
-          "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
+          "version": "6.6.7",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+          "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
           "dev": true,
-          "peer": true,
           "requires": {
             "tslib": "^1.9.0"
           }
@@ -30958,8 +107,7 @@
           "version": "1.14.1",
           "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
           "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-          "dev": true,
-          "peer": true
+          "dev": true
         }
       }
     },
@@ -31086,6 +234,49 @@
             "is-docker": "^2.0.0",
             "is-wsl": "^2.1.1"
           }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "serialize-javascript": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz",
+          "integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==",
+          "dev": true,
+          "requires": {
+            "randombytes": "^2.1.0"
+          }
+        },
+        "terser-webpack-plugin": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-3.0.1.tgz",
+          "integrity": "sha512-eFDtq8qPUEa9hXcUzTwKXTnugIVtlqc1Z/ZVhG8LmRT3lgRY13+pQTnFLY2N7ATB6TKCHuW/IGjoAnZz9wOIqw==",
+          "dev": true,
+          "requires": {
+            "cacache": "^15.0.3",
+            "find-cache-dir": "^3.3.1",
+            "jest-worker": "^26.0.0",
+            "p-limit": "^2.3.0",
+            "schema-utils": "^2.6.6",
+            "serialize-javascript": "^3.0.0",
+            "source-map": "^0.6.1",
+            "terser": "^4.6.13",
+            "webpack-sources": "^1.4.3"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.6.1",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+              "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+              "dev": true
+            }
+          }
         }
       }
     },
@@ -31158,38 +349,42 @@
       }
     },
     "@angular-devkit/core": {
-      "version": "11.1.2",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.1.2.tgz",
-      "integrity": "sha512-V7zOMqL2l56JcwXVyswkG+7+t67r9XtkrVzRcG2Z5ZYwafU+iKWMwg5kBFZr1SX7fM1M9E4MpskxqtagQeUKng==",
+      "version": "12.2.7",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-12.2.7.tgz",
+      "integrity": "sha512-WeLlDZaudpx10OGDPfVcWu/CaEWiWzAaLTUQz0Ww/yM+01FxR/P8yeH1sYAV1MS6d6KHvXGw7Lpf8PV7IA/zHA==",
       "dev": true,
-      "peer": true,
       "requires": {
-        "ajv": "6.12.6",
+        "ajv": "8.6.2",
+        "ajv-formats": "2.1.0",
         "fast-json-stable-stringify": "2.1.0",
         "magic-string": "0.25.7",
-        "rxjs": "6.6.3",
+        "rxjs": "6.6.7",
         "source-map": "0.7.3"
       },
       "dependencies": {
         "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "version": "8.6.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.2.tgz",
+          "integrity": "sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w==",
           "dev": true,
-          "peer": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
+            "json-schema-traverse": "^1.0.0",
+            "require-from-string": "^2.0.2",
             "uri-js": "^4.2.2"
           }
         },
+        "json-schema-traverse": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+          "dev": true
+        },
         "rxjs": {
-          "version": "6.6.3",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
-          "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
+          "version": "6.6.7",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+          "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
           "dev": true,
-          "peer": true,
           "requires": {
             "tslib": "^1.9.0"
           }
@@ -31198,8 +393,7 @@
           "version": "1.14.1",
           "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
           "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-          "dev": true,
-          "peer": true
+          "dev": true
         }
       }
     },
@@ -31245,8 +439,7 @@
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-4.2.0.tgz",
       "integrity": "sha512-qM4hpweuQ14ul8CU6LKpUWFZs6POUE7HZKdTllUrYuoZMrTpNB1XGelR0pweYzbfo4XRnUaO1NVgWhWOWiD5MA==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "@angular-eslint/eslint-plugin": {
       "version": "4.2.0",
@@ -31698,6 +891,7 @@
       "version": "10.0.14",
       "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-10.0.14.tgz",
       "integrity": "sha512-lYNo6/MmnYAVFoDQDBB6HMFd9zHg3RHXc6hn+wchU0XSWiIsg6WYHbKOb/DyqUEyKebzy0gSKZf7gUeZHtj62Q==",
+      "dev": true,
       "requires": {
         "tslib": "^2.0.0"
       }
@@ -33215,12 +2409,18 @@
         }
       }
     },
+    "@gar/promisify": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.2.tgz",
+      "integrity": "sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw==",
+      "dev": true
+    },
     "@ionic-native/badge": {
       "version": "5.33.0",
       "resolved": "https://registry.npmjs.org/@ionic-native/badge/-/badge-5.33.0.tgz",
       "integrity": "sha512-g/E2HLB53csZq5hWeyWUFj6r7CrllSPuOkV88XotIFTQFNuY7TaLtiFUVFSvWXRh0Kvu+w7TI5Hys67d/v7F/g==",
       "requires": {
-        "@types/cordova": "latest"
+        "@types/cordova": "^0.0.34"
       },
       "dependencies": {
         "@types/cordova": {
@@ -33235,7 +2435,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/camera/-/camera-5.33.0.tgz",
       "integrity": "sha512-cLAxM4e8IrTECvlszyUe9FnUjE4PbWR99NNDwkOuB85yJ3diyKxiQhHu89Qh9A6qzHTJQLa93iknY2Q40VM/5Q==",
       "requires": {
-        "@types/cordova": "latest"
+        "@types/cordova": "^0.0.34"
       },
       "dependencies": {
         "@types/cordova": {
@@ -33250,7 +2450,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/chooser/-/chooser-5.33.0.tgz",
       "integrity": "sha512-hz2OtB8UsJpKdXZByDzGS6+U1FK8toIjKmIVCDQAuOXxjbw9dU2Ef+MSUKXOpK6MYnP56oP80JdSX9LDEFJnRA==",
       "requires": {
-        "@types/cordova": "latest"
+        "@types/cordova": "^0.0.34"
       },
       "dependencies": {
         "@types/cordova": {
@@ -33265,7 +2465,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/clipboard/-/clipboard-5.33.0.tgz",
       "integrity": "sha512-HFZN4tsAjFJ9Se9ik0/IOUvApL4zNPEKQAtUsjqP7vCnTsdrgS+FDMln1UDEKXCQ/dEEwU1N1ndFmPBGxjkGzQ==",
       "requires": {
-        "@types/cordova": "latest"
+        "@types/cordova": "^0.0.34"
       },
       "dependencies": {
         "@types/cordova": {
@@ -33280,7 +2480,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/core/-/core-5.33.0.tgz",
       "integrity": "sha512-dnZHu7SadvQvliGJPndk2ohdoPvwiyBWJjsJw33BKyhadnmLlmkYKkRgPPI+i22BZofDKq4YiAfIIqhvfHU6gw==",
       "requires": {
-        "@types/cordova": "latest"
+        "@types/cordova": "^0.0.34"
       },
       "dependencies": {
         "@types/cordova": {
@@ -33295,7 +2495,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/device/-/device-5.33.0.tgz",
       "integrity": "sha512-KYQvVsN98bGTEomI193Jf9r1vaXBFJQXuhkhwBI6lajynAlf2SIVJwthNUXnK43kNXy1cOelYxScUuKyPwqudw==",
       "requires": {
-        "@types/cordova": "latest"
+        "@types/cordova": "^0.0.34"
       },
       "dependencies": {
         "@types/cordova": {
@@ -33310,7 +2510,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/diagnostic/-/diagnostic-5.33.0.tgz",
       "integrity": "sha512-zBDv/yNMvUkXfxy17rgrGVU3+XKREXRI7cqy/DyvpjdomOnmx2pnFvhszgMEgeD03LkXXKiFOR5yUAVNgYirmg==",
       "requires": {
-        "@types/cordova": "latest"
+        "@types/cordova": "^0.0.34"
       },
       "dependencies": {
         "@types/cordova": {
@@ -33325,7 +2525,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/file/-/file-5.33.0.tgz",
       "integrity": "sha512-RisSGJl2t8JrBgw30Vn5hJYYKEDTHR9f3KbQDfe1MQg+VrZo7vnbml/vk4l55u65c1TYZDH+F6i7s9nyif1QVQ==",
       "requires": {
-        "@types/cordova": "latest"
+        "@types/cordova": "^0.0.34"
       },
       "dependencies": {
         "@types/cordova": {
@@ -33340,7 +2540,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/file-opener/-/file-opener-5.33.0.tgz",
       "integrity": "sha512-v7t1ndalAPYT9gvMAhxAup8tg1NPV415cfG6tzs1foPFP91UZC3MQny0tup8AgFivugT1GRdoSk1NMuK1jy8Cw==",
       "requires": {
-        "@types/cordova": "latest"
+        "@types/cordova": "^0.0.34"
       },
       "dependencies": {
         "@types/cordova": {
@@ -33355,7 +2555,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/file-transfer/-/file-transfer-5.33.0.tgz",
       "integrity": "sha512-xDUpdJVgTBP6aEiU08iZ/pa9aMoGSMB9391dQKk+VSDs0hdbIwk+Cx4V40GIE4QF3TI06sUMdKXD2sIhVsr2QA==",
       "requires": {
-        "@types/cordova": "latest"
+        "@types/cordova": "^0.0.34"
       },
       "dependencies": {
         "@types/cordova": {
@@ -33370,7 +2570,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/geolocation/-/geolocation-5.33.0.tgz",
       "integrity": "sha512-oE6pi6l8/Wsv94vpJmPlPqE1LheP6cQTJrC78WYQp9WVDOOCGZnFznNoH8BlQfnfjuDx/kUARxzEJBO/gbUg1A==",
       "requires": {
-        "@types/cordova": "latest"
+        "@types/cordova": "^0.0.34"
       },
       "dependencies": {
         "@types/cordova": {
@@ -33385,7 +2585,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/http/-/http-5.33.0.tgz",
       "integrity": "sha512-dqcPu3igSLlfDUK8Mvma/6o6aq7WtKBlcR8xXwE8tVsO/r4fEB6NevLLN4S4zCr381Jy+RxIIjn3CZx5XHF6JQ==",
       "requires": {
-        "@types/cordova": "latest"
+        "@types/cordova": "^0.0.34"
       },
       "dependencies": {
         "@types/cordova": {
@@ -33400,7 +2600,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/in-app-browser/-/in-app-browser-5.33.0.tgz",
       "integrity": "sha512-GGIvnYHf8FgaIae9yfRzxqxj0ZAxrYhOJpsHVSq1YKjxnDpRe6ImWWaHHfaeXE5IdUUMUXVuf75VTSBN00VBvA==",
       "requires": {
-        "@types/cordova": "latest"
+        "@types/cordova": "^0.0.34"
       },
       "dependencies": {
         "@types/cordova": {
@@ -33415,7 +2615,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/ionic-webview/-/ionic-webview-5.33.0.tgz",
       "integrity": "sha512-Jbr4M6z/Fya51F+QXuPLm/crFlZ9T6YvRM1cygGmFwZ7SgDAimYnjgSO8SEGJmvO2ZekYmFuF56qiVPSvx2wUA==",
       "requires": {
-        "@types/cordova": "latest"
+        "@types/cordova": "^0.0.34"
       },
       "dependencies": {
         "@types/cordova": {
@@ -33430,7 +2630,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/keyboard/-/keyboard-5.33.0.tgz",
       "integrity": "sha512-TIYU3LC+Yz/pcpBuHcxLThMNuN9y1E1wBu4SlmS6VlO3/D3R3At2WOg2UK3iA66G2kTJubed5haqTYZjeoA6Uw==",
       "requires": {
-        "@types/cordova": "latest"
+        "@types/cordova": "^0.0.34"
       },
       "dependencies": {
         "@types/cordova": {
@@ -33445,7 +2645,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/local-notifications/-/local-notifications-5.33.0.tgz",
       "integrity": "sha512-ljn2uq0rFWpjG1I1qK+mPVX8T3T+09fsF8sZ9nK7uvD9YWShCVz2e2ctf8qPRFq+TWDeDqlnwXz3wCvWmbBUWw==",
       "requires": {
-        "@types/cordova": "latest"
+        "@types/cordova": "^0.0.34"
       },
       "dependencies": {
         "@types/cordova": {
@@ -33460,7 +2660,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/media/-/media-5.33.0.tgz",
       "integrity": "sha512-nUu7/FSH41j9+BqHXYVMBd3EifNsTNOufD3NEiMVpHVDWLWqG7tG5h5cFlsVACxUaP4kNpSEke2mjom6CKyjxQ==",
       "requires": {
-        "@types/cordova": "latest"
+        "@types/cordova": "^0.0.34"
       },
       "dependencies": {
         "@types/cordova": {
@@ -33475,7 +2675,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/media-capture/-/media-capture-5.33.0.tgz",
       "integrity": "sha512-aQTnonVSeijpuZ9B7oYJCjIDqgFVhNdvqkx9vUoaO359BtJGpGS1rNPjEovt4DsqV7oe7TkbmBd8DMEwnB3A2g==",
       "requires": {
-        "@types/cordova": "latest"
+        "@types/cordova": "^0.0.34"
       },
       "dependencies": {
         "@types/cordova": {
@@ -33490,7 +2690,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/network/-/network-5.33.0.tgz",
       "integrity": "sha512-J+3+rbDTMVNUspa/nV+P8a0hFKDicJK1rVIrm5aLBQdmN9n7WaqJmeMYTptyWOnZxQpktJAJDdhJTEvVmKQjjw==",
       "requires": {
-        "@types/cordova": "latest"
+        "@types/cordova": "^0.0.34"
       },
       "dependencies": {
         "@types/cordova": {
@@ -33505,7 +2705,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/push/-/push-5.33.0.tgz",
       "integrity": "sha512-H4gOkMbOaNvi97cKKJDggWvAR1BVCUbtdLyWInA0q3cZBHWSc6KcRJGz+hcdDndCQJUnHofs1Tpw8LN3zhjYyQ==",
       "requires": {
-        "@types/cordova": "latest"
+        "@types/cordova": "^0.0.34"
       },
       "dependencies": {
         "@types/cordova": {
@@ -33520,7 +2720,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/qr-scanner/-/qr-scanner-5.33.0.tgz",
       "integrity": "sha512-cyiQv0Rje/fN9/JYoDXP1+ILJkRkjvPtoSx4vd2FsKAuJB60U2DpQfmVEE/KMF4iceTpx4MK/kGzr2WE2AYnIg==",
       "requires": {
-        "@types/cordova": "latest"
+        "@types/cordova": "^0.0.34"
       },
       "dependencies": {
         "@types/cordova": {
@@ -33535,7 +2735,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-5.33.0.tgz",
       "integrity": "sha512-6PHk5WJeUoc3zru6wTvUmd9DCASvRQoQq1dysYI3JCECaAJ6X0x1RbzM8dBFs3JPLfWtDn+P8eTp+KaA0Xf58w==",
       "requires": {
-        "@types/cordova": "latest"
+        "@types/cordova": "^0.0.34"
       },
       "dependencies": {
         "@types/cordova": {
@@ -33550,7 +2750,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/sqlite/-/sqlite-5.33.0.tgz",
       "integrity": "sha512-JIdQJr6bcksotF/3ZMJQZo9lHgaHXvHOOK9R30mM/5Ds5fFu+rUoUf0wvyqaGzEFu94pGw2uPGnfD+WI7x7+1A==",
       "requires": {
-        "@types/cordova": "latest"
+        "@types/cordova": "^0.0.34"
       },
       "dependencies": {
         "@types/cordova": {
@@ -33565,7 +2765,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/status-bar/-/status-bar-5.33.0.tgz",
       "integrity": "sha512-cnyfd42N9gGfhyDtF7wbWoacKg/jfsoJQHOHltfhS4/EjxsVu4bjkwq1YBLMcMY3OIqFDSn2aFcejHn8wVNkDQ==",
       "requires": {
-        "@types/cordova": "latest"
+        "@types/cordova": "^0.0.34"
       },
       "dependencies": {
         "@types/cordova": {
@@ -33580,7 +2780,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/web-intent/-/web-intent-5.33.0.tgz",
       "integrity": "sha512-3CIAofrg9nkJQbSftFdMKYOduXy9Ra/a1Q0it6ysm9NFeAQn7iZPThSexBeZ9xiKKj/QTPZtnqAJ0MQ+4mkGag==",
       "requires": {
-        "@types/cordova": "latest"
+        "@types/cordova": "^0.0.34"
       },
       "dependencies": {
         "@types/cordova": {
@@ -33595,7 +2795,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/zip/-/zip-5.33.0.tgz",
       "integrity": "sha512-hErISQ6/xqVErmVnnha5BR+3GWRNQIVfMTXzprEpNZxQl3iDe1UTIVQdFnMd3Nasz/naY+61Vq/y91PZ1Rrajw==",
       "requires": {
-        "@types/cordova": "latest"
+        "@types/cordova": "^0.0.34"
       },
       "dependencies": {
         "@types/cordova": {
@@ -33645,8 +2845,7 @@
           "version": "7.3.1",
           "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz",
           "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==",
-          "dev": true,
-          "requires": {}
+          "dev": true
         }
       }
     },
@@ -34811,6 +4010,27 @@
         "fastq": "^1.6.0"
       }
     },
+    "@npmcli/fs": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.0.0.tgz",
+      "integrity": "sha512-8ltnOpRR/oJbOp8vaGUnipOi3bqkcW+sLHFlyXIr08OGHmVJLB1Hn7QtGXbYcpVtH1gAYZTlmDXtE4YV0+AMMQ==",
+      "dev": true,
+      "requires": {
+        "@gar/promisify": "^1.0.1",
+        "semver": "^7.3.5"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        }
+      }
+    },
     "@npmcli/git": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-2.1.0.tgz",
@@ -35784,6 +5004,16 @@
       "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==",
       "dev": true
     },
+    "JSONStream": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
+      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
+      "dev": true,
+      "requires": {
+        "jsonparse": "^1.2.0",
+        "through": ">=2.2.7 <3"
+      }
+    },
     "abab": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
@@ -35832,8 +5062,7 @@
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
       "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "acorn-walk": {
       "version": "7.2.0",
@@ -35930,15 +5159,42 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
       "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
+      "dev": true
+    },
+    "ajv-formats": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.0.tgz",
+      "integrity": "sha512-USH2jBb+C/hIpwD2iRjp0pe0k+MvzG0mlSn/FIdCgQhUb9ALPRjt2KIQdfZDS9r0ZIeUAg7gOu9KL0PFqGqr5Q==",
       "dev": true,
-      "requires": {}
+      "requires": {
+        "ajv": "^8.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "8.6.3",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.3.tgz",
+          "integrity": "sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "json-schema-traverse": "^1.0.0",
+            "require-from-string": "^2.0.2",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "json-schema-traverse": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+          "dev": true
+        }
+      }
     },
     "ajv-keywords": {
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
       "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "alphanum-sort": {
       "version": "1.0.2",
@@ -38192,8 +7448,7 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-5.2.0.tgz",
       "integrity": "sha512-7p4Kn/gffhQaavNfyDFg7LS5S/UT1JAjyGd4UqR2+jzoYF02eDkj0Ec3+48TsIa4zghjLY87nQHIh/ecK9qLdw==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "class-utils": {
       "version": "0.3.6",
@@ -39526,6 +8781,12 @@
         "sha.js": "^2.4.8"
       }
     },
+    "create-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
+      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
+      "dev": true
+    },
     "cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -40588,7 +9849,6 @@
       "version": "0.1.13",
       "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
       "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
-      "devOptional": true,
       "requires": {
         "iconv-lite": "^0.6.2"
       },
@@ -40597,7 +9857,6 @@
           "version": "0.6.2",
           "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz",
           "integrity": "sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==",
-          "devOptional": true,
           "requires": {
             "safer-buffer": ">= 2.1.2 < 3.0.0"
           }
@@ -41005,8 +10264,7 @@
       "version": "8.3.0",
       "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz",
       "integrity": "sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "eslint-import-resolver-node": {
       "version": "0.3.4",
@@ -41082,8 +10340,7 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/eslint-plugin-header/-/eslint-plugin-header-3.1.1.tgz",
       "integrity": "sha512-9vlKxuJ4qf793CmeeSrZUvVClw6amtpghq3CuWcB5cUNnWHQhgcqy5eF8oVKFk1G3Y/CbchGfEaw3wiIJaNmVg==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "eslint-plugin-import": {
       "version": "2.22.1",
@@ -41178,15 +10435,13 @@
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/eslint-plugin-prefer-arrow/-/eslint-plugin-prefer-arrow-1.2.3.tgz",
       "integrity": "sha512-J9I5PKCOJretVuiZRGvPQxCbllxGAV/viI20JO3LYblAodofBxyMnZAJ+WGeClHgANnSJberTNoFWWjrWKBuXQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "eslint-plugin-promise": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-5.1.0.tgz",
       "integrity": "sha512-NGmI6BH5L12pl7ScQHbg7tvtk4wPxxj8yPHH47NvSmMtFneC077PSeY3huFj06ZWZvtbfxSPt3RuOQD5XcR4ng==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "eslint-scope": {
       "version": "4.0.3",
@@ -43708,8 +12963,7 @@
     "ieee754": {
       "version": "1.1.13",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
-      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
-      "devOptional": true
+      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
     },
     "iferr": {
       "version": "0.1.5",
@@ -45088,8 +14342,7 @@
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
       "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "jest-preset-angular": {
       "version": "8.3.1",
@@ -45694,8 +14947,7 @@
           "version": "7.3.1",
           "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz",
           "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==",
-          "dev": true,
-          "requires": {}
+          "dev": true
         }
       }
     },
@@ -45777,16 +15029,6 @@
       "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
       "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA="
     },
-    "JSONStream": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
-      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
-      "dev": true,
-      "requires": {
-        "jsonparse": "^1.2.0",
-        "through": ">=2.2.7 <3"
-      }
-    },
     "jsprim": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
@@ -47520,9 +16762,9 @@
       "integrity": "sha512-cny9v0+Mq6Tjz+e0erFAB+RYJ/AVGzkjnISiobqP8OWj9c9FLoZZu8/SPSKJWE17F1tk4018wfjV+ZbIbqC7fQ==",
       "dev": true,
       "requires": {
+        "JSONStream": "^1.3.4",
         "bluebird": "^3.5.1",
         "figgy-pudding": "^3.4.1",
-        "JSONStream": "^1.3.4",
         "lru-cache": "^5.1.1",
         "make-fetch-happen": "^5.0.0",
         "npm-package-arg": "^6.1.0",
@@ -52117,14 +21359,6 @@
       "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
       "dev": true
     },
-    "string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "requires": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
     "string-length": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.1.tgz",
@@ -52238,6 +21472,14 @@
         }
       }
     },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
     "stringify-package": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/stringify-package/-/stringify-package-1.0.1.tgz",
@@ -52810,35 +22052,95 @@
       }
     },
     "terser-webpack-plugin": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-3.0.1.tgz",
-      "integrity": "sha512-eFDtq8qPUEa9hXcUzTwKXTnugIVtlqc1Z/ZVhG8LmRT3lgRY13+pQTnFLY2N7ATB6TKCHuW/IGjoAnZz9wOIqw==",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-4.2.3.tgz",
+      "integrity": "sha512-jTgXh40RnvOrLQNgIkwEKnQ8rmHjHK4u+6UBEi+W+FPmvb+uo+chJXntKe7/3lW5mNysgSWD60KyesnhW8D6MQ==",
       "dev": true,
       "requires": {
-        "cacache": "^15.0.3",
+        "cacache": "^15.0.5",
         "find-cache-dir": "^3.3.1",
-        "jest-worker": "^26.0.0",
-        "p-limit": "^2.3.0",
-        "schema-utils": "^2.6.6",
-        "serialize-javascript": "^3.0.0",
+        "jest-worker": "^26.5.0",
+        "p-limit": "^3.0.2",
+        "schema-utils": "^3.0.0",
+        "serialize-javascript": "^5.0.1",
         "source-map": "^0.6.1",
-        "terser": "^4.6.13",
+        "terser": "^5.3.4",
         "webpack-sources": "^1.4.3"
       },
       "dependencies": {
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+        "@types/json-schema": {
+          "version": "7.0.9",
+          "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
+          "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
+          "dev": true
+        },
+        "cacache": {
+          "version": "15.3.0",
+          "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz",
+          "integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==",
           "dev": true,
           "requires": {
-            "p-try": "^2.0.0"
+            "@npmcli/fs": "^1.0.0",
+            "@npmcli/move-file": "^1.0.1",
+            "chownr": "^2.0.0",
+            "fs-minipass": "^2.0.0",
+            "glob": "^7.1.4",
+            "infer-owner": "^1.0.4",
+            "lru-cache": "^6.0.0",
+            "minipass": "^3.1.1",
+            "minipass-collect": "^1.0.2",
+            "minipass-flush": "^1.0.5",
+            "minipass-pipeline": "^1.2.2",
+            "mkdirp": "^1.0.3",
+            "p-map": "^4.0.0",
+            "promise-inflight": "^1.0.1",
+            "rimraf": "^3.0.2",
+            "ssri": "^8.0.1",
+            "tar": "^6.0.2",
+            "unique-filename": "^1.1.1"
+          }
+        },
+        "jest-worker": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
+          "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
+          "dev": true,
+          "requires": {
+            "@types/node": "*",
+            "merge-stream": "^2.0.0",
+            "supports-color": "^7.0.0"
+          }
+        },
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+          "dev": true
+        },
+        "p-limit": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+          "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+          "dev": true,
+          "requires": {
+            "yocto-queue": "^0.1.0"
+          }
+        },
+        "schema-utils": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+          "dev": true,
+          "requires": {
+            "@types/json-schema": "^7.0.8",
+            "ajv": "^6.12.5",
+            "ajv-keywords": "^3.5.2"
           }
         },
         "serialize-javascript": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz",
-          "integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==",
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
+          "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
           "dev": true,
           "requires": {
             "randombytes": "^2.1.0"
@@ -52849,6 +22151,35 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
+        },
+        "source-map-support": {
+          "version": "0.5.20",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz",
+          "integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==",
+          "dev": true,
+          "requires": {
+            "buffer-from": "^1.0.0",
+            "source-map": "^0.6.0"
+          }
+        },
+        "terser": {
+          "version": "5.9.0",
+          "resolved": "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz",
+          "integrity": "sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ==",
+          "dev": true,
+          "requires": {
+            "commander": "^2.20.0",
+            "source-map": "~0.7.2",
+            "source-map-support": "~0.5.20"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.7.3",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+              "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+              "dev": true
+            }
+          }
         }
       }
     },
@@ -55331,6 +24662,12 @@
       "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
       "dev": true
     },
+    "yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true
+    },
     "zone.js": {
       "version": "0.10.3",
       "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.10.3.tgz",
diff --git a/package.json b/package.json
index 061f50558..5139ca965 100644
--- a/package.json
+++ b/package.json
@@ -128,6 +128,8 @@
     "zone.js": "~0.10.3"
   },
   "devDependencies": {
+    "@angular-builders/custom-webpack": "^10.0.1",
+    "@angular-devkit/architect": "^0.1202.7",
     "@angular-devkit/build-angular": "~0.1000.8",
     "@angular-eslint/builder": "^4.2.0",
     "@angular-eslint/eslint-plugin": "^4.2.0",
@@ -169,6 +171,7 @@
     "jest-preset-angular": "^8.3.1",
     "jsonc-parser": "^2.3.1",
     "native-run": "^1.4.0",
+    "terser-webpack-plugin": "^4.2.3",
     "ts-jest": "^26.4.1",
     "ts-node": "~8.3.0",
     "typescript": "^3.9.9"
diff --git a/webpack.config.js b/webpack.config.js
new file mode 100644
index 000000000..4525367cb
--- /dev/null
+++ b/webpack.config.js
@@ -0,0 +1,36 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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.
+
+const TerserPlugin = require('terser-webpack-plugin');
+
+module.exports = config => {
+    config.optimization.minimizer.push(
+        new TerserPlugin({
+            terserOptions: {
+                mangle: {
+                    keep_classnames: true,
+                    keep_fnames: true,
+                },
+                compress: {
+                    toplevel: true,
+                    pure_getters: true,
+                },
+                keep_classnames: true,
+                keep_fnames: true,
+            },
+        }),
+    );
+
+    return config;
+};

From e635d809dad5c87fa34c353ee2ec9d88606e1cce Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 23 Sep 2021 17:33:10 +0200
Subject: [PATCH 0111/1008] MOBILE-3876 ng: Reduce bundle size budgets

---
 angular.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/angular.json b/angular.json
index 36bf99fab..9bb3f23ab 100644
--- a/angular.json
+++ b/angular.json
@@ -61,8 +61,8 @@
               "budgets": [
                 {
                   "type": "initial",
-                  "maximumWarning": "50mb",
-                  "maximumError": "100mb"
+                  "maximumWarning": "5mb",
+                  "maximumError": "20mb"
                 }
               ]
             },

From aa6824e4954ad3b9397947381fe671ade5c5d092 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 23 Sep 2021 12:01:00 +0200
Subject: [PATCH 0112/1008] MOBILE-3877 quiz: Fix review not opened after
 finish offline quiz

---
 src/addons/mod/quiz/components/index/index.ts | 16 +++++++++-------
 src/addons/mod/quiz/services/quiz.ts          | 14 ++++++++++++--
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/addons/mod/quiz/components/index/index.ts b/src/addons/mod/quiz/components/index/index.ts
index d8e45071e..078c97054 100644
--- a/src/addons/mod/quiz/components/index/index.ts
+++ b/src/addons/mod/quiz/components/index/index.ts
@@ -208,13 +208,15 @@ export class AddonModQuizIndexComponent extends CoreCourseModuleMainActivityComp
                 await AddonModQuizSync.setSyncWarnings(quiz.id, []);
             }
 
-            if (AddonModQuiz.isQuizOffline(quiz) && sync) {
-                // Try to sync the quiz.
-                try {
-                    await this.syncActivity(showErrors);
-                } catch {
-                    // Ignore errors, keep getting data even if sync fails.
-                    this.autoReview = undefined;
+            if (AddonModQuiz.isQuizOffline(quiz)) {
+                if (sync) {
+                    // Try to sync the quiz.
+                    try {
+                        await this.syncActivity(showErrors);
+                    } catch {
+                        // Ignore errors, keep getting data even if sync fails.
+                        this.autoReview = undefined;
+                    }
                 }
             } else {
                 this.autoReview = undefined;
diff --git a/src/addons/mod/quiz/services/quiz.ts b/src/addons/mod/quiz/services/quiz.ts
index f64bda703..c3cc895df 100644
--- a/src/addons/mod/quiz/services/quiz.ts
+++ b/src/addons/mod/quiz/services/quiz.ts
@@ -664,11 +664,21 @@ export class AddonModQuizProvider {
     /**
      * Given a list of attempts, returns the last finished attempt.
      *
-     * @param attempts Attempts.
+     * @param attempts Attempts sorted. First attempt should be the first on the list.
      * @return Last finished attempt.
      */
     getLastFinishedAttemptFromList(attempts?: AddonModQuizAttemptWSData[]): AddonModQuizAttemptWSData | undefined {
-        return attempts?.find(attempt => this.isAttemptFinished(attempt.state));
+        if (!attempts) {
+            return;
+        }
+
+        for (let i = attempts.length - 1; i >= 0; i--) {
+            const attempt = attempts[i];
+
+            if (this.isAttemptFinished(attempt.state)) {
+                return attempt;
+            }
+        }
     }
 
     /**

From a61d13d8469c6374f70e18a215cd16687cd7501f Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 23 Sep 2021 17:55:57 +0200
Subject: [PATCH 0113/1008] MOBILE-3876 test: Fix compatibility checks

Using the new minification strategy, it finds the unsupported ES2018 RegExp on src/core/services/utils/text.ts:333. It's actually fine because it is written within a try/catch, so we can ignore it. But it should have been detecting it all along, so it was a false positive before.
---
 .github/workflows/testing.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 9e315c81a..5b10f13a3 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -58,4 +58,4 @@ jobs:
     - name: Production builds
       run: npm run build:prod
     - name: JavaScript code compatibility
-      run: result=$(npx check-es-compat www/*.js 2> /dev/null | grep -v -E "Array\.prototype\.includes|Promise\.prototype\.finally|String\.prototype\.(matchAll|trimRight)|globalThis" | grep -Po "(?<=error).*?(?=\s+ecmascript)" | wc -l); test $result -eq 0
+      run: result=$(npx check-es-compat www/*.js 2> /dev/null | grep -v -E "Array\.prototype\.includes|Promise\.prototype\.finally|String\.prototype\.(matchAll|trimRight)|globalThis" | grep -Po "(?<=error).*?(?=\s+ecmascript)" | wc -l); test $result -eq 1

From 1c0a86d045a14439c42d390d34912bc988e24606 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 27 Sep 2021 16:46:43 +0200
Subject: [PATCH 0114/1008] MOBILE-2748 icon: Make getModuleIconSrc async

---
 .../activitymodules/activitymodules.ts        |  4 +-
 .../services/recentlyaccesseditems.ts         |  6 +-
 .../timeline/components/events/events.ts      | 14 ++---
 .../calendar/components/calendar/calendar.ts  | 57 ++++++++++---------
 .../upcoming-events/upcoming-events.ts        |  2 +-
 src/addons/calendar/pages/day/day.page.ts     |  2 +-
 src/addons/calendar/pages/event/event.page.ts |  2 +-
 .../calendar/services/calendar-helper.ts      |  6 +-
 .../mod/forum/services/handlers/module.ts     |  4 +-
 .../mod/label/services/handlers/module.ts     |  2 +-
 .../mod/lti/services/handlers/module.ts       |  6 +-
 .../mod/resource/services/handlers/module.ts  |  8 +--
 .../mod/url/services/handlers/module.ts       |  8 +--
 .../course/classes/module-base-handler.ts     |  6 +-
 .../course/pages/contents/contents.ts         |  8 +--
 .../features/course/services/course-helper.ts | 10 ++--
 src/core/features/course/services/course.ts   |  8 +--
 .../services/handlers/default-module.ts       |  6 +-
 .../course/services/module-delegate.ts        | 20 +++----
 .../features/grades/services/grades-helper.ts | 26 ++++-----
 .../features/sitehome/pages/index/index.ts    | 32 +++++------
 .../features/sitehome/services/sitehome.ts    |  3 +-
 22 files changed, 123 insertions(+), 117 deletions(-)

diff --git a/src/addons/block/activitymodules/components/activitymodules/activitymodules.ts b/src/addons/block/activitymodules/components/activitymodules/activitymodules.ts
index c377040b5..fdeb9a967 100644
--- a/src/addons/block/activitymodules/components/activitymodules/activitymodules.ts
+++ b/src/addons/block/activitymodules/components/activitymodules/activitymodules.ts
@@ -99,9 +99,9 @@ export class AddonBlockActivityModulesComponent extends CoreBlockBaseComponent i
             let icon: string;
 
             if (modName === 'resources') {
-                icon = CoreCourse.getModuleIconSrc('page', modIcons['page']);
+                icon = await CoreCourse.getModuleIconSrc('page', modIcons['page']);
             } else {
-                icon = CoreCourseModuleDelegate.getModuleIconSrc(modName, modIcons[modName]) || '';
+                icon = await CoreCourseModuleDelegate.getModuleIconSrc(modName, modIcons[modName]);
             }
 
             this.entries.push({
diff --git a/src/addons/block/recentlyaccesseditems/services/recentlyaccesseditems.ts b/src/addons/block/recentlyaccesseditems/services/recentlyaccesseditems.ts
index f2b50bc92..8261f24d3 100644
--- a/src/addons/block/recentlyaccesseditems/services/recentlyaccesseditems.ts
+++ b/src/addons/block/recentlyaccesseditems/services/recentlyaccesseditems.ts
@@ -52,14 +52,14 @@ export class AddonBlockRecentlyAccessedItemsProvider {
         const items: AddonBlockRecentlyAccessedItemsItem[] =
             await site.read('block_recentlyaccesseditems_get_recent_items', undefined, preSets);
 
-        return items.map((item) => {
+        return await Promise.all(items.map(async (item) => {
             const modicon = item.icon && CoreDomUtils.getHTMLElementAttribute(item.icon, 'src');
 
-            item.iconUrl = CoreCourse.getModuleIconSrc(item.modname, modicon || undefined);
+            item.iconUrl = await CoreCourse.getModuleIconSrc(item.modname, modicon || undefined);
             item.iconTitle = item.icon && CoreDomUtils.getHTMLElementAttribute(item.icon, 'title');
 
             return item;
-        });
+        }));
     }
 
     /**
diff --git a/src/addons/block/timeline/components/events/events.ts b/src/addons/block/timeline/components/events/events.ts
index f4266f50c..bf77da586 100644
--- a/src/addons/block/timeline/components/events/events.ts
+++ b/src/addons/block/timeline/components/events/events.ts
@@ -51,12 +51,12 @@ export class AddonBlockTimelineEventsComponent implements OnChanges {
     /**
      * Detect changes on input properties.
      */
-    ngOnChanges(changes: {[name: string]: SimpleChange}): void {
+    async ngOnChanges(changes: {[name: string]: SimpleChange}): Promise<void> {
         this.showCourse = CoreUtils.isTrueOrOne(this.showCourse);
 
         if (changes.events || changes.from || changes.to) {
             if (this.events && this.events.length > 0) {
-                const filteredEvents = this.filterEventsByTime(this.from, this.to);
+                const filteredEvents = await this.filterEventsByTime(this.from, this.to);
                 this.empty = !filteredEvents || filteredEvents.length <= 0;
 
                 const eventsByDay: Record<number, AddonCalendarEvent[]> = {};
@@ -92,22 +92,22 @@ export class AddonBlockTimelineEventsComponent implements OnChanges {
      * @param end Number of days after the start.
      * @return Filtered events.
      */
-    protected filterEventsByTime(start: number, end?: number): AddonBlockTimelineEvent[] {
+    protected async filterEventsByTime(start: number, end?: number): Promise<AddonBlockTimelineEvent[]> {
         start = moment().add(start, 'days').startOf('day').unix();
         end = typeof end != 'undefined' ? moment().add(end, 'days').startOf('day').unix() : end;
 
-        return this.events.filter((event) => {
+        return await Promise.all(this.events.filter((event) => {
             if (end) {
                 return start <= event.timesort && event.timesort < end;
             }
 
             return start <= event.timesort;
-        }).map((event) => {
-            event.iconUrl = CoreCourse.getModuleIconSrc(event.icon.component);
+        }).map(async (event) => {
+            event.iconUrl = await CoreCourse.getModuleIconSrc(event.icon.component);
             event.iconTitle = event.modulename && CoreCourse.translateModuleName(event.modulename);
 
             return event;
-        });
+        }));
     }
 
     /**
diff --git a/src/addons/calendar/components/calendar/calendar.ts b/src/addons/calendar/components/calendar/calendar.ts
index c6e97072a..5575e917c 100644
--- a/src/addons/calendar/components/calendar/calendar.ts
+++ b/src/addons/calendar/components/calendar/calendar.ts
@@ -68,8 +68,8 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
     isCurrentMonth = false;
     isPastMonth = false;
 
-    protected year?: number;
-    protected month?: number;
+    protected year: number;
+    protected month: number;
     protected categoriesRetrieved = false;
     protected categories: { [id: number]: CoreCategoryData } = {};
     protected currentSiteId: string;
@@ -121,16 +121,19 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
         );
 
         this.differ = differs.find([]).create();
+
+        const now = new Date();
+
+        this.year = now.getFullYear();
+        this.month = now.getMonth() + 1;
     }
 
     /**
      * Component loaded.
      */
     ngOnInit(): void {
-        const now = new Date();
-
-        this.year = this.initialYear ? this.initialYear : now.getFullYear();
-        this.month = this.initialMonth ? this.initialMonth : now.getMonth() + 1;
+        this.year = this.initialYear ? this.initialYear : this.year;
+        this.month = this.initialMonth ? this.initialMonth : this.month;
 
         this.calculateIsCurrentMonth();
 
@@ -211,11 +214,11 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
         // Don't pass courseId and categoryId, we'll filter them locally.
         let result: { daynames: Partial<AddonCalendarDayName>[]; weeks: Partial<AddonCalendarWeek>[] };
         try {
-            result = await AddonCalendar.getMonthlyEvents(this.year!, this.month!);
+            result = await AddonCalendar.getMonthlyEvents(this.year, this.month);
         } catch (error) {
             if (!CoreApp.isOnline()) {
                 // Allow navigating to non-cached months in offline (behave as if using emergency cache).
-                result = await AddonCalendarHelper.getOfflineMonthWeeks(this.year!, this.month!);
+                result = await AddonCalendarHelper.getOfflineMonthWeeks(this.year, this.month);
             } else {
                 throw error;
             }
@@ -223,27 +226,29 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
 
         // Calculate the period name. We don't use the one in result because it's in server's language.
         this.periodName = CoreTimeUtils.userDate(
-            new Date(this.year!, this.month! - 1).getTime(),
+            new Date(this.year, this.month - 1).getTime(),
             'core.strftimemonthyear',
         );
         this.weekDays = AddonCalendar.getWeekDays(result.daynames[0].dayno);
         this.weeks = result.weeks as AddonCalendarWeek[];
         this.calculateIsCurrentMonth();
 
-        this.weeks.forEach((week) => {
-            week.days.forEach((day) => {
+        await Promise.all(this.weeks.map(async (week) => {
+            await Promise.all(week.days.map(async (day) => {
                 day.periodName = CoreTimeUtils.userDate(
-                    new Date(this.year!, this.month! - 1, day.mday).getTime(),
+                    new Date(this.year, this.month - 1, day.mday).getTime(),
                     'core.strftimedaydate',
                 );
                 day.eventsFormated = day.eventsFormated || [];
                 day.filteredEvents = day.filteredEvents || [];
-                day.events.forEach((event) => {
-                    /// Format online events.
-                    day.eventsFormated!.push(AddonCalendarHelper.formatEventData(event));
-                });
-            });
-        });
+                // Format online events.
+                const onlineEventsFormatted = await Promise.all(
+                    day.events.map(async (event) => AddonCalendarHelper.formatEventData(event)),
+                );
+
+                day.eventsFormated = day.eventsFormated.concat(onlineEventsFormatted);
+            }));
+        }));
 
         if (this.isCurrentMonth) {
             const currentDay = new Date().getDate();
@@ -323,7 +328,7 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
 
         // Don't invalidate monthly events after a change, it has already been handled.
         if (!afterChange) {
-            promises.push(AddonCalendar.invalidateMonthlyEvents(this.year!, this.month!));
+            promises.push(AddonCalendar.invalidateMonthlyEvents(this.year, this.month));
         }
         promises.push(CoreCourses.invalidateCategories(0, true));
         promises.push(AddonCalendar.invalidateTimeFormat());
@@ -386,7 +391,7 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
      * @param day Day.
      */
     dayClicked(day: number): void {
-        this.onDayClicked.emit({ day: day, month: this.month!, year: this.year! });
+        this.onDayClicked.emit({ day: day, month: this.month, year: this.year });
     }
 
     /**
@@ -398,7 +403,7 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
         this.currentTime = CoreTimeUtils.timestamp();
 
         this.isCurrentMonth = this.year == now.getFullYear() && this.month == now.getMonth() + 1;
-        this.isPastMonth = this.year! < now.getFullYear() || (this.year == now.getFullYear() && this.month! < now.getMonth() + 1);
+        this.isPastMonth = this.year < now.getFullYear() || (this.year == now.getFullYear() && this.month < now.getMonth() + 1);
     }
 
     /**
@@ -432,9 +437,9 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
     protected decreaseMonth(): void {
         if (this.month === 1) {
             this.month = 12;
-            this.year!--;
+            this.year--;
         } else {
-            this.month!--;
+            this.month--;
         }
     }
 
@@ -444,9 +449,9 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
     protected increaseMonth(): void {
         if (this.month === 12) {
             this.month = 1;
-            this.year!++;
+            this.year++;
         } else {
-            this.month!++;
+            this.month++;
         }
     }
 
@@ -455,7 +460,7 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
      */
     protected mergeEvents(): void {
         const monthOfflineEvents: { [day: number]: AddonCalendarEventToDisplay[] } =
-            this.offlineEvents[AddonCalendarHelper.getMonthId(this.year!, this.month!)];
+            this.offlineEvents[AddonCalendarHelper.getMonthId(this.year, this.month)];
 
         this.weeks.forEach((week) => {
             week.days.forEach((day) => {
diff --git a/src/addons/calendar/components/upcoming-events/upcoming-events.ts b/src/addons/calendar/components/upcoming-events/upcoming-events.ts
index ae0448d60..7566c6d14 100644
--- a/src/addons/calendar/components/upcoming-events/upcoming-events.ts
+++ b/src/addons/calendar/components/upcoming-events/upcoming-events.ts
@@ -173,7 +173,7 @@ export class AddonCalendarUpcomingEventsComponent implements OnInit, DoCheck, On
     async fetchEvents(): Promise<void> {
         // Don't pass courseId and categoryId, we'll filter them locally.
         const result = await AddonCalendar.getUpcomingEvents();
-        this.onlineEvents = result.events.map((event) => AddonCalendarHelper.formatEventData(event));
+        this.onlineEvents = await Promise.all(result.events.map((event) => AddonCalendarHelper.formatEventData(event)));
         // Schedule notifications for the events retrieved.
         AddonCalendar.scheduleEventsNotifications(this.onlineEvents);
         // Merge the online events with offline data.
diff --git a/src/addons/calendar/pages/day/day.page.ts b/src/addons/calendar/pages/day/day.page.ts
index 2d26cf281..f02bc54d1 100644
--- a/src/addons/calendar/pages/day/day.page.ts
+++ b/src/addons/calendar/pages/day/day.page.ts
@@ -333,7 +333,7 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
         try {
             // Don't pass courseId and categoryId, we'll filter them locally.
             result = await AddonCalendar.getDayEvents(this.year, this.month, this.day);
-            this.onlineEvents = result.events.map((event) => AddonCalendarHelper.formatEventData(event));
+            this.onlineEvents = await Promise.all(result.events.map((event) => AddonCalendarHelper.formatEventData(event)));
         } catch (error) {
             if (CoreApp.isOnline()) {
                 throw error;
diff --git a/src/addons/calendar/pages/event/event.page.ts b/src/addons/calendar/pages/event/event.page.ts
index 88d4597f9..9ddc41f58 100644
--- a/src/addons/calendar/pages/event/event.page.ts
+++ b/src/addons/calendar/pages/event/event.page.ts
@@ -207,7 +207,7 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
         try {
             // Get the event data.
             const event = await AddonCalendar.getEventById(this.eventId);
-            this.event = AddonCalendarHelper.formatEventData(event);
+            this.event = await AddonCalendarHelper.formatEventData(event);
 
             try {
                 const offlineEvent = AddonCalendarHelper.formatOfflineEventData(
diff --git a/src/addons/calendar/services/calendar-helper.ts b/src/addons/calendar/services/calendar-helper.ts
index d457e4c05..447745701 100644
--- a/src/addons/calendar/services/calendar-helper.ts
+++ b/src/addons/calendar/services/calendar-helper.ts
@@ -161,7 +161,9 @@ export class AddonCalendarHelperProvider {
      *
      * @param event Event to format.
      */
-    formatEventData(event: AddonCalendarEvent | AddonCalendarEventBase | AddonCalendarGetEventsEvent): AddonCalendarEventToDisplay {
+    async formatEventData(
+        event: AddonCalendarEvent | AddonCalendarEventBase | AddonCalendarGetEventsEvent,
+    ): Promise<AddonCalendarEventToDisplay> {
 
         const eventFormatted: AddonCalendarEventToDisplay = {
             ...event,
@@ -176,7 +178,7 @@ export class AddonCalendarHelperProvider {
         };
 
         if (event.modulename) {
-            eventFormatted.eventIcon = CoreCourse.getModuleIconSrc(event.modulename);
+            eventFormatted.eventIcon = await CoreCourse.getModuleIconSrc(event.modulename);
             eventFormatted.moduleIcon = eventFormatted.eventIcon;
             eventFormatted.iconTitle = CoreCourse.translateModuleName(event.modulename);
         }
diff --git a/src/addons/mod/forum/services/handlers/module.ts b/src/addons/mod/forum/services/handlers/module.ts
index 3b7327923..7418879ca 100644
--- a/src/addons/mod/forum/services/handlers/module.ts
+++ b/src/addons/mod/forum/services/handlers/module.ts
@@ -53,8 +53,8 @@ export class AddonModForumModuleHandlerService extends CoreModuleHandlerBase imp
     /**
      * @inheritdoc
      */
-    getData(module: CoreCourseAnyModuleData, courseId: number): CoreCourseModuleHandlerData {
-        const data = super.getData(module, courseId);
+    async getData(module: CoreCourseAnyModuleData, courseId: number): Promise<CoreCourseModuleHandlerData> {
+        const data = await super.getData(module, courseId);
 
         if ('afterlink' in module && !!module.afterlink) {
             data.extraBadgeColor = '';
diff --git a/src/addons/mod/label/services/handlers/module.ts b/src/addons/mod/label/services/handlers/module.ts
index 9fd176d90..c51a15fa0 100644
--- a/src/addons/mod/label/services/handlers/module.ts
+++ b/src/addons/mod/label/services/handlers/module.ts
@@ -44,7 +44,7 @@ export class AddonModLabelModuleHandlerService extends CoreModuleHandlerBase imp
     /**
      * @inheritdoc
      */
-    getData(module: CoreCourseWSModule): CoreCourseModuleHandlerData {
+    async getData(module: CoreCourseWSModule): Promise<CoreCourseModuleHandlerData> {
         // Remove the description from the module so it isn't rendered twice.
         const title = module.description || '';
         module.description = '';
diff --git a/src/addons/mod/lti/services/handlers/module.ts b/src/addons/mod/lti/services/handlers/module.ts
index 6d5e78673..79d1b90a1 100644
--- a/src/addons/mod/lti/services/handlers/module.ts
+++ b/src/addons/mod/lti/services/handlers/module.ts
@@ -54,13 +54,13 @@ export class AddonModLtiModuleHandlerService extends CoreModuleHandlerBase imple
     /**
      * @inheritdoc
      */
-    getData(
+    async getData(
         module: CoreCourseAnyModuleData,
         courseId: number,
         sectionId?: number,
         forCoursePage?: boolean,
-    ): CoreCourseModuleHandlerData {
-        const data = super.getData(module, courseId, sectionId, forCoursePage);
+    ): Promise<CoreCourseModuleHandlerData> {
+        const data = await super.getData(module, courseId, sectionId, forCoursePage);
         data.showDownloadButton = false;
 
         data.buttons = [{
diff --git a/src/addons/mod/resource/services/handlers/module.ts b/src/addons/mod/resource/services/handlers/module.ts
index e2639eeea..f9ed3f2c2 100644
--- a/src/addons/mod/resource/services/handlers/module.ts
+++ b/src/addons/mod/resource/services/handlers/module.ts
@@ -63,12 +63,12 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase
     /**
      * @inheritdoc
      */
-    getData(
+    async getData(
         module: CoreCourseAnyModuleData,
         courseId: number,
         sectionId?: number,
         forCoursePage?: boolean,
-    ): CoreCourseModuleHandlerData {
+    ): Promise<CoreCourseModuleHandlerData> {
         const updateStatus = (status: string): void => {
             if (!handlerData.buttons) {
                 return;
@@ -79,7 +79,7 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase
         };
         const openWithPicker = CoreFileHelper.defaultIsOpenWithPicker();
 
-        const handlerData = super.getData(module, courseId, sectionId, forCoursePage);
+        const handlerData = await super.getData(module, courseId, sectionId, forCoursePage);
         handlerData.updateStatus = updateStatus.bind(this);
         handlerData.buttons = [{
             hidden: true,
@@ -233,7 +233,7 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase
 
         // No previously set, just set the icon.
         if (resourceData.icon == '') {
-            resourceData.icon = CoreCourse.getModuleIconSrc(module.modname, 'modicon' in module ? module.modicon : undefined);
+            resourceData.icon = await CoreCourse.getModuleIconSrc(module.modname, 'modicon' in module ? module.modicon : undefined);
         }
 
         return resourceData;
diff --git a/src/addons/mod/url/services/handlers/module.ts b/src/addons/mod/url/services/handlers/module.ts
index bd5f28b2c..94634f181 100644
--- a/src/addons/mod/url/services/handlers/module.ts
+++ b/src/addons/mod/url/services/handlers/module.ts
@@ -54,7 +54,7 @@ export class AddonModUrlModuleHandlerService extends CoreModuleHandlerBase imple
     /**
      * @inheritdoc
      */
-    getData(module: CoreCourseAnyModuleData, courseId: number): CoreCourseModuleHandlerData {
+    async getData(module: CoreCourseAnyModuleData, courseId: number): Promise<CoreCourseModuleHandlerData> {
 
         /**
          * Open the URL.
@@ -77,7 +77,7 @@ export class AddonModUrlModuleHandlerService extends CoreModuleHandlerBase imple
         };
 
         const handlerData: CoreCourseModuleHandlerData = {
-            icon: CoreCourse.getModuleIconSrc(module.modname, 'modicon' in module ? module.modicon : undefined),
+            icon: await CoreCourse.getModuleIconSrc(module.modname, 'modicon' in module ? module.modicon : undefined),
             title: module.name,
             class: 'addon-mod_url-handler',
             showDownloadButton: false,
@@ -111,7 +111,7 @@ export class AddonModUrlModuleHandlerService extends CoreModuleHandlerBase imple
             }],
         };
 
-        this.hideLinkButton(module, courseId).then((hideButton) => {
+        this.hideLinkButton(module, courseId).then(async (hideButton) => {
             if (!handlerData.buttons) {
                 return;
             }
@@ -121,7 +121,7 @@ export class AddonModUrlModuleHandlerService extends CoreModuleHandlerBase imple
             if (module.contents && module.contents[0]) {
                 // Calculate the icon to use.
                 handlerData.icon = AddonModUrl.guessIcon(module.contents[0].fileurl) ||
-                    CoreCourse.getModuleIconSrc(module.modname, 'modicon' in module ? module.modicon : undefined);
+                    await CoreCourse.getModuleIconSrc(module.modname, 'modicon' in module ? module.modicon : undefined);
             }
 
             return;
diff --git a/src/core/features/course/classes/module-base-handler.ts b/src/core/features/course/classes/module-base-handler.ts
index 16ab933ed..d44bc8238 100644
--- a/src/core/features/course/classes/module-base-handler.ts
+++ b/src/core/features/course/classes/module-base-handler.ts
@@ -34,14 +34,14 @@ export class CoreModuleHandlerBase implements Partial<CoreCourseModuleHandler> {
     /**
      * @inheritdoc
      */
-    getData(
+    async getData(
         module: CoreCourseAnyModuleData,
         courseId: number, // eslint-disable-line @typescript-eslint/no-unused-vars
         sectionId?: number, // eslint-disable-line @typescript-eslint/no-unused-vars
         forCoursePage?: boolean, // eslint-disable-line @typescript-eslint/no-unused-vars
-    ): CoreCourseModuleHandlerData {
+    ): Promise<CoreCourseModuleHandlerData> {
         return {
-            icon: CoreCourse.getModuleIconSrc(module.modname, 'modicon' in module ? module.modicon : undefined),
+            icon: await CoreCourse.getModuleIconSrc(module.modname, 'modicon' in module ? module.modicon : undefined),
             title: module.name,
             class: 'addon-mod_' + module.modname + '-handler',
             showDownloadButton: true,
diff --git a/src/core/features/course/pages/contents/contents.ts b/src/core/features/course/pages/contents/contents.ts
index 2cccc6ecb..3a95835d6 100644
--- a/src/core/features/course/pages/contents/contents.ts
+++ b/src/core/features/course/pages/contents/contents.ts
@@ -89,16 +89,16 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
      * Component being initialized.
      */
     async ngOnInit(): Promise<void> {
-        const course = CoreNavigator.getRouteParam<CoreCourseAnyCourseData>('course');
 
-        if (!course) {
-            CoreDomUtils.showErrorModal('Missing required course parameter.');
+        try {
+            this.course = CoreNavigator.getRequiredRouteParam<CoreCourseAnyCourseData>('course');
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
             CoreNavigator.back();
 
             return;
         }
 
-        this.course = course;
         this.sectionId = CoreNavigator.getRouteNumberParam('sectionId');
         this.sectionNumber = CoreNavigator.getRouteNumberParam('sectionNumber');
         this.moduleId = CoreNavigator.getRouteNumberParam('moduleId');
diff --git a/src/core/features/course/services/course-helper.ts b/src/core/features/course/services/course-helper.ts
index 5b322d60d..b87b0ab95 100644
--- a/src/core/features/course/services/course-helper.ts
+++ b/src/core/features/course/services/course-helper.ts
@@ -190,8 +190,8 @@ export class CoreCourseHelperProvider {
 
             hasContent = true;
 
-            section.modules.forEach((module) => {
-                module.handlerData = CoreCourseModuleDelegate.getModuleDataFor(
+            section.modules.forEach(async (module) => {
+                module.handlerData = await CoreCourseModuleDelegate.getModuleDataFor(
                     module.modname,
                     module,
                     courseId,
@@ -1610,7 +1610,7 @@ export class CoreCourseHelperProvider {
 
             if (CoreSites.getCurrentSiteId() == site.getId()) {
                 // Try to use the module's handler to navigate cleanly.
-                module.handlerData = CoreCourseModuleDelegate.getModuleDataFor(
+                module.handlerData = await CoreCourseModuleDelegate.getModuleDataFor(
                     module.modname,
                     module,
                     courseId,
@@ -1664,9 +1664,9 @@ export class CoreCourseHelperProvider {
      * @param modParams Params to pass to the module
      * @param True if module can be opened, false otherwise.
      */
-    openModule(module: CoreCourseModule, courseId: number, sectionId?: number, modParams?: Params): boolean {
+    async openModule(module: CoreCourseModule, courseId: number, sectionId?: number, modParams?: Params): Promise<boolean> {
         if (!module.handlerData) {
-            module.handlerData = CoreCourseModuleDelegate.getModuleDataFor(
+            module.handlerData = await CoreCourseModuleDelegate.getModuleDataFor(
                 module.modname,
                 module,
                 courseId,
diff --git a/src/core/features/course/services/course.ts b/src/core/features/course/services/course.ts
index c714008fa..0e7f38649 100644
--- a/src/core/features/course/services/course.ts
+++ b/src/core/features/course/services/course.ts
@@ -520,7 +520,7 @@ export class CoreCourseProvider {
         const params: CoreCourseGetCourseModuleWSParams = {
             cmid: moduleId,
         };
-        const preSets = {
+        const preSets: CoreSiteWSPreSets = {
             cacheKey: this.getModuleCacheKey(moduleId),
             updateFrequency: CoreSite.FREQUENCY_RARELY,
         };
@@ -528,11 +528,9 @@ export class CoreCourseProvider {
 
         if (response.warnings && response.warnings.length) {
             throw new CoreWSError(response.warnings[0]);
-        } else if (response.cm) {
-            return response.cm;
         }
 
-        throw Error('WS core_course_get_course_module failed.');
+        return response.cm;
     }
 
     /**
@@ -632,7 +630,7 @@ export class CoreCourseProvider {
      * @param modicon The mod icon string to use in case we are not using a core activity.
      * @return The IMG src.
      */
-    getModuleIconSrc(moduleName: string, modicon?: string): string {
+    async getModuleIconSrc(moduleName: string, modicon?: string): Promise<string> {
         if (this.CORE_MODULES.indexOf(moduleName) < 0) {
             if (modicon) {
                 return modicon;
diff --git a/src/core/features/course/services/handlers/default-module.ts b/src/core/features/course/services/handlers/default-module.ts
index 75dfd0586..d6f7d9637 100644
--- a/src/core/features/course/services/handlers/default-module.ts
+++ b/src/core/features/course/services/handlers/default-module.ts
@@ -41,12 +41,12 @@ export class CoreCourseModuleDefaultHandler implements CoreCourseModuleHandler {
     /**
      * @inheritdoc
      */
-    getData(
+    async getData(
         module: CoreCourseAnyModuleData,
-    ): CoreCourseModuleHandlerData {
+    ): Promise<CoreCourseModuleHandlerData> {
         // Return the default data.
         const defaultData: CoreCourseModuleHandlerData = {
-            icon: CoreCourse.getModuleIconSrc(module.modname, 'modicon' in module ? module.modicon : undefined),
+            icon: await CoreCourse.getModuleIconSrc(module.modname, 'modicon' in module ? module.modicon : undefined),
             title: module.name,
             class: 'core-course-default-handler core-course-module-' + module.modname + '-handler',
             action: (event: Event, module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions) => {
diff --git a/src/core/features/course/services/module-delegate.ts b/src/core/features/course/services/module-delegate.ts
index 072188859..e7165da57 100644
--- a/src/core/features/course/services/module-delegate.ts
+++ b/src/core/features/course/services/module-delegate.ts
@@ -56,7 +56,7 @@ export interface CoreCourseModuleHandler extends CoreDelegateHandler {
         courseId: number,
         sectionId?: number,
         forCoursePage?: boolean,
-    ): CoreCourseModuleHandlerData;
+    ): Promise<CoreCourseModuleHandlerData> | CoreCourseModuleHandlerData;
 
     /**
      * Get the component to render the module. This is needed to support singleactivity course format.
@@ -82,7 +82,7 @@ export interface CoreCourseModuleHandler extends CoreDelegateHandler {
      *
      * @return The icon src.
      */
-    getIconSrc?(): string | undefined;
+    getIconSrc?(module: CoreCourseWSModule): Promise<string> | string | undefined;
 
     /**
      * Check if this type of module supports a certain feature.
@@ -277,14 +277,14 @@ export class CoreCourseModuleDelegateService extends CoreDelegate<CoreCourseModu
      * @param forCoursePage Whether the data will be used to render the course page.
      * @return Data to render the module.
      */
-    getModuleDataFor(
+    async getModuleDataFor(
         modname: string,
         module: CoreCourseAnyModuleData,
         courseId: number,
         sectionId?: number,
         forCoursePage?: boolean,
-    ): CoreCourseModuleHandlerData | undefined {
-        return this.executeFunctionOnEnabled<CoreCourseModuleHandlerData>(
+    ): Promise<CoreCourseModuleHandlerData | undefined> {
+        return await this.executeFunctionOnEnabled<CoreCourseModuleHandlerData>(
             modname,
             'getData',
             [module, courseId, sectionId, forCoursePage],
@@ -343,12 +343,12 @@ export class CoreCourseModuleDelegateService extends CoreDelegate<CoreCourseModu
      *
      * @param modname The name of the module type.
      * @param modicon The mod icon string.
-     * @return The icon src.
+     * @return Promise resolved with the icon src.
      */
-    getModuleIconSrc(modname: string, modicon?: string): string {
-        return this.executeFunctionOnEnabled<string>(modname, 'getIconSrc') ||
-            CoreCourse.getModuleIconSrc(modname, modicon) ||
-            '';
+    async getModuleIconSrc(modname: string, modicon?: string): Promise<string> {
+        const icon = await this.executeFunctionOnEnabled<Promise<string>>(modname, 'getIconSrc');
+
+        return icon || await CoreCourse.getModuleIconSrc(modname, modicon) || '';
     }
 
     /**
diff --git a/src/core/features/grades/services/grades-helper.ts b/src/core/features/grades/services/grades-helper.ts
index 3d003415b..319dc9313 100644
--- a/src/core/features/grades/services/grades-helper.ts
+++ b/src/core/features/grades/services/grades-helper.ts
@@ -54,7 +54,7 @@ export class CoreGradesHelperProvider {
      * @param tableRow JSON object representing row of grades table data.
      * @return Formatted row object.
      */
-    protected formatGradeRow(tableRow: CoreGradesTableRow): CoreGradesFormattedRow {
+    protected async formatGradeRow(tableRow: CoreGradesTableRow): Promise<CoreGradesFormattedRow> {
         const row: CoreGradesFormattedRow = {
             rowclass: '',
         };
@@ -68,7 +68,7 @@ export class CoreGradesHelperProvider {
             let content = String(column.content);
 
             if (name == 'itemname') {
-                this.setRowIcon(row, content);
+                await this.setRowIcon(row, content);
                 row.link = this.getModuleLink(content);
                 row.rowclass += column.class.indexOf('hidden') >= 0 ? ' hidden' : '';
                 row.rowclass += column.class.indexOf('dimmed_text') >= 0 ? ' dimmed_text' : '';
@@ -95,7 +95,7 @@ export class CoreGradesHelperProvider {
      * @param tableRow JSON object representing row of grades table data.
      * @return Formatted row object.
      */
-    protected formatGradeRowForTable(tableRow: CoreGradesTableRow): CoreGradesFormattedTableRow {
+    protected async formatGradeRowForTable(tableRow: CoreGradesTableRow): Promise<CoreGradesFormattedTableRow> {
         const row: CoreGradesFormattedTableRow = {};
         for (let name in tableRow) {
             const column: CoreGradesTableColumn = tableRow[name];
@@ -113,7 +113,7 @@ export class CoreGradesHelperProvider {
                 row.colspan = itemNameColumn.colspan;
                 row.rowspan = tableRow.leader?.rowspan || 1;
 
-                this.setRowIcon(row, content);
+                await this.setRowIcon(row, content);
                 row.rowclass = itemNameColumn.class.indexOf('leveleven') < 0 ? 'odd' : 'even';
                 row.rowclass += itemNameColumn.class.indexOf('hidden') >= 0 ? ' hidden' : '';
                 row.rowclass += itemNameColumn.class.indexOf('dimmed_text') >= 0 ? ' dimmed_text' : '';
@@ -158,7 +158,7 @@ export class CoreGradesHelperProvider {
      * @param table JSON object representing a table with data.
      * @return Formatted HTML table.
      */
-    formatGradesTable(table: CoreGradesTable): CoreGradesFormattedTable {
+    async formatGradesTable(table: CoreGradesTable): Promise<CoreGradesFormattedTable> {
         const maxDepth = table.maxdepth;
         const formatted: CoreGradesFormattedTable = {
             columns: [],
@@ -178,7 +178,7 @@ export class CoreGradesHelperProvider {
             feedback: false,
             contributiontocoursetotal: false,
         };
-        formatted.rows = table.tabledata.map(row => this.formatGradeRowForTable(row));
+        formatted.rows = await Promise.all(table.tabledata.map(row => this.formatGradeRowForTable(row)));
 
         // Get a row with some info.
         let normalRow = formatted.rows.find(
@@ -382,7 +382,7 @@ export class CoreGradesHelperProvider {
      * @param gradeId Grade Object identifier.
      * @return Formatted HTML table.
      */
-    getGradesTableRow(table: CoreGradesTable, gradeId: number): CoreGradesFormattedRow | null {
+    async getGradesTableRow(table: CoreGradesTable, gradeId: number): Promise<CoreGradesFormattedRow | null> {
         if (table.tabledata) {
             const selectedRow = table.tabledata.find(
                 (row) =>
@@ -393,7 +393,7 @@ export class CoreGradesHelperProvider {
             );
 
             if (selectedRow) {
-                return this.formatGradeRow(selectedRow);
+                return await this.formatGradeRow(selectedRow);
             }
         }
 
@@ -408,7 +408,7 @@ export class CoreGradesHelperProvider {
      * @return Formatted HTML table.
      * @deprecated since app 4.0
      */
-    getModuleGradesTableRows(table: CoreGradesTable, moduleId: number): CoreGradesFormattedRow[] {
+    async getModuleGradesTableRows(table: CoreGradesTable, moduleId: number): Promise<CoreGradesFormattedRow[]> {
         if (!table.tabledata) {
             return [];
         }
@@ -416,7 +416,7 @@ export class CoreGradesHelperProvider {
         // Find href containing "/mod/xxx/xxx.php".
         const regex = /href="([^"]*\/mod\/[^"|^/]*\/[^"|^.]*\.php[^"]*)/;
 
-        return table.tabledata.filter((row) => {
+        return await Promise.all(table.tabledata.filter((row) => {
             if (row.itemname && row.itemname.content) {
                 const matches = row.itemname.content.match(regex);
 
@@ -428,7 +428,7 @@ export class CoreGradesHelperProvider {
             }
 
             return false;
-        }).map((row) => this.formatGradeRow(row));
+        }).map((row) => this.formatGradeRow(row)));
     }
 
     /**
@@ -534,7 +534,7 @@ export class CoreGradesHelperProvider {
      * @param text HTML where the image will be rendered.
      * @return Row object with the image.
      */
-    protected setRowIcon<T extends CoreGradesFormattedRowCommonData>(row: T, text: string): T {
+    protected async setRowIcon<T extends CoreGradesFormattedRowCommonData>(row: T, text: string): Promise<T> {
         text = text.replace('%2F', '/').replace('%2f', '/');
         if (text.indexOf('/agg_mean') > -1) {
             row.itemtype = 'agg_mean';
@@ -566,7 +566,7 @@ export class CoreGradesHelperProvider {
                 row.itemtype = 'mod';
                 row.itemmodule = module[1];
                 row.iconAlt = CoreCourse.translateModuleName(row.itemmodule) || '';
-                row.image = CoreCourse.getModuleIconSrc(
+                row.image = await CoreCourse.getModuleIconSrc(
                     module[1],
                     CoreDomUtils.convertToElement(text).querySelector('img')?.getAttribute('src') ?? undefined,
                 );
diff --git a/src/core/features/sitehome/pages/index/index.ts b/src/core/features/sitehome/pages/index/index.ts
index 8976ef25e..7f59dae6d 100644
--- a/src/core/features/sitehome/pages/index/index.ts
+++ b/src/core/features/sitehome/pages/index/index.ts
@@ -17,7 +17,7 @@ import { IonRefresher } from '@ionic/angular';
 import { Params } from '@angular/router';
 
 import { CoreSite, CoreSiteConfig } from '@classes/site';
-import { CoreCourse, CoreCourseModuleBasicInfo, CoreCourseWSSection } from '@features/course/services/course';
+import { CoreCourse, CoreCourseWSModule, CoreCourseWSSection } from '@features/course/services/course';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreSites } from '@services/sites';
 import { CoreSiteHome } from '@features/sitehome/services/sitehome';
@@ -48,7 +48,7 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
     hasContent = false;
     items: string[] = [];
     siteHomeId = 1;
-    currentSite?: CoreSite;
+    currentSite!: CoreSite;
     searchEnabled = false;
     downloadEnabled = false;
     downloadCourseEnabled = false;
@@ -75,7 +75,7 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
             this.switchDownload(this.downloadEnabled && this.downloadCourseEnabled && this.downloadCoursesEnabled);
         }, CoreSites.getCurrentSiteId());
 
-        this.currentSite = CoreSites.getCurrentSite()!;
+        this.currentSite = CoreSites.getRequiredCurrentSite();
         this.siteHomeId = CoreSites.getCurrentSiteHomeId();
 
         const module = CoreNavigator.getRouteParam<CoreCourseModule>('module');
@@ -97,7 +97,7 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
     protected async loadContent(): Promise<void> {
         this.hasContent = false;
 
-        const config = this.currentSite!.getStoredConfig() || { numsections: 1, frontpageloggedin: undefined };
+        const config = this.currentSite.getStoredConfig() || { numsections: 1, frontpageloggedin: undefined };
 
         this.items = await CoreSiteHome.getFrontPageItems(config.frontpageloggedin);
         this.hasContent = this.items.length > 0;
@@ -105,13 +105,13 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
         if (this.items.some((item) => item == 'NEWS_ITEMS')) {
             // Get the news forum.
             try {
-                const forum = await CoreSiteHome.getNewsForum();
-                this.newsForumModule = await CoreCourse.getModuleBasicInfo(forum.cmid);
-                this.newsForumModule.handlerData = CoreCourseModuleDelegate.getModuleDataFor(
+                const forum = await CoreSiteHome.getNewsForum(this.siteHomeId);
+                this.newsForumModule = await CoreCourse.getModule(forum.cmid, forum.course);
+                this.newsForumModule.handlerData = await CoreCourseModuleDelegate.getModuleDataFor(
                     this.newsForumModule.modname,
                     this.newsForumModule,
                     this.siteHomeId,
-                    this.newsForumModule.section,
+                    undefined,
                     true,
                 );
             } catch {
@@ -120,7 +120,7 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
         }
 
         try {
-            const sections = await CoreCourse.getSections(this.siteHomeId!, false, true);
+            const sections = await CoreCourse.getSections(this.siteHomeId, false, true);
 
             // Check "Include a topic section" setting from numsections.
             this.section = config.numsections ? sections.find((section) => section.section == 1) : undefined;
@@ -137,10 +137,10 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
 
             // Add log in Moodle.
             CoreCourse.logView(
-                this.siteHomeId!,
+                this.siteHomeId,
                 undefined,
                 undefined,
-                this.currentSite!.getInfo()?.sitename,
+                this.currentSite.getInfo()?.sitename,
             ).catch(() => {
                 // Ignore errors.
             });
@@ -157,11 +157,11 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
     doRefresh(refresher?: IonRefresher): void {
         const promises: Promise<unknown>[] = [];
 
-        promises.push(CoreCourse.invalidateSections(this.siteHomeId!));
-        promises.push(this.currentSite!.invalidateConfig().then(async () => {
+        promises.push(CoreCourse.invalidateSections(this.siteHomeId));
+        promises.push(this.currentSite.invalidateConfig().then(async () => {
             // Config invalidated, fetch it again.
-            const config: CoreSiteConfig = await this.currentSite!.getConfig();
-            this.currentSite!.setConfig(config);
+            const config: CoreSiteConfig = await this.currentSite.getConfig();
+            this.currentSite.setConfig(config);
 
             return;
         }));
@@ -251,6 +251,6 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
 
 }
 
-type NewsForum = CoreCourseModuleBasicInfo & {
+type NewsForum = CoreCourseWSModule & {
     handlerData?: CoreCourseModuleHandlerData;
 };
diff --git a/src/core/features/sitehome/services/sitehome.ts b/src/core/features/sitehome/services/sitehome.ts
index 8cb52346d..3de9e2ef9 100644
--- a/src/core/features/sitehome/services/sitehome.ts
+++ b/src/core/features/sitehome/services/sitehome.ts
@@ -20,6 +20,7 @@ import { makeSingleton } from '@singletons';
 import { CoreCourse } from '../../course/services/course';
 import { CoreCourses } from '../../courses/services/courses';
 import { AddonModForum, AddonModForumData } from '@addons/mod/forum/services/forum';
+import { CoreError } from '@classes/errors/error';
 
 /**
  * Items with index 1 and 3 were removed on 2.5 and not being supported in the app.
@@ -57,7 +58,7 @@ export class CoreSiteHomeProvider {
             return forum;
         }
 
-        throw null;
+        throw new CoreError('No news forum found');
     }
 
     /**

From aa8c6136de59d2ce3a31a3ac922cdee3b18f8308 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 22 Sep 2021 14:25:02 +0200
Subject: [PATCH 0115/1008] MOBILE-2748 mod: Use more specific type on module
 handlers

---
 src/addons/mod/forum/services/handlers/module.ts     |  4 ++--
 src/addons/mod/label/services/handlers/module.ts     |  4 ++--
 src/addons/mod/lti/services/handlers/module.ts       |  5 ++---
 src/addons/mod/resource/services/handlers/module.ts  | 12 ++++++------
 src/addons/mod/url/services/handlers/module.ts       | 12 ++++++------
 .../features/course/classes/module-base-handler.ts   |  6 +++---
 .../course/services/handlers/default-module.ts       |  6 +++---
 src/core/features/course/services/module-delegate.ts |  4 ++--
 8 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/src/addons/mod/forum/services/handlers/module.ts b/src/addons/mod/forum/services/handlers/module.ts
index 7418879ca..98b81258b 100644
--- a/src/addons/mod/forum/services/handlers/module.ts
+++ b/src/addons/mod/forum/services/handlers/module.ts
@@ -14,7 +14,6 @@
 
 import { Injectable, Type } from '@angular/core';
 import { AddonModForum, AddonModForumProvider } from '../forum';
-import { CoreCourseAnyModuleData } from '@features/course/services/course';
 import { makeSingleton, Translate } from '@singletons';
 import { CoreEvents } from '@singletons/events';
 import { CoreSites } from '@services/sites';
@@ -23,6 +22,7 @@ import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/
 import { CoreConstants } from '@/core/constants';
 import { AddonModForumIndexComponent } from '../../components/index';
 import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
+import { CoreCourseModule } from '@features/course/services/course-helper';
 
 /**
  * Handler to support forum modules.
@@ -53,7 +53,7 @@ export class AddonModForumModuleHandlerService extends CoreModuleHandlerBase imp
     /**
      * @inheritdoc
      */
-    async getData(module: CoreCourseAnyModuleData, courseId: number): Promise<CoreCourseModuleHandlerData> {
+    async getData(module: CoreCourseModule, courseId: number): Promise<CoreCourseModuleHandlerData> {
         const data = await super.getData(module, courseId);
 
         if ('afterlink' in module && !!module.afterlink) {
diff --git a/src/addons/mod/label/services/handlers/module.ts b/src/addons/mod/label/services/handlers/module.ts
index c51a15fa0..fe1306f3e 100644
--- a/src/addons/mod/label/services/handlers/module.ts
+++ b/src/addons/mod/label/services/handlers/module.ts
@@ -15,7 +15,7 @@
 import { CoreConstants } from '@/core/constants';
 import { Injectable } from '@angular/core';
 import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
-import { CoreCourseWSModule } from '@features/course/services/course';
+import { CoreCourseModule } from '@features/course/services/course-helper';
 import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
 import { makeSingleton } from '@singletons';
 
@@ -44,7 +44,7 @@ export class AddonModLabelModuleHandlerService extends CoreModuleHandlerBase imp
     /**
      * @inheritdoc
      */
-    async getData(module: CoreCourseWSModule): Promise<CoreCourseModuleHandlerData> {
+    async getData(module: CoreCourseModule): Promise<CoreCourseModuleHandlerData> {
         // Remove the description from the module so it isn't rendered twice.
         const title = module.description || '';
         module.description = '';
diff --git a/src/addons/mod/lti/services/handlers/module.ts b/src/addons/mod/lti/services/handlers/module.ts
index 79d1b90a1..6213d8c9a 100644
--- a/src/addons/mod/lti/services/handlers/module.ts
+++ b/src/addons/mod/lti/services/handlers/module.ts
@@ -16,7 +16,6 @@ import { Injectable, Type } from '@angular/core';
 
 import { CoreConstants } from '@/core/constants';
 import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
-import { CoreCourseAnyModuleData } from '@features/course/services/course';
 import { CoreCourseModule } from '@features/course/services/course-helper';
 import { CoreApp } from '@services/app';
 import { CoreFilepool } from '@services/filepool';
@@ -55,7 +54,7 @@ export class AddonModLtiModuleHandlerService extends CoreModuleHandlerBase imple
      * @inheritdoc
      */
     async getData(
-        module: CoreCourseAnyModuleData,
+        module: CoreCourseModule,
         courseId: number,
         sectionId?: number,
         forCoursePage?: boolean,
@@ -87,7 +86,7 @@ export class AddonModLtiModuleHandlerService extends CoreModuleHandlerBase imple
      * @return Promise resolved when done.
      */
     protected async loadCustomIcon(
-        module: CoreCourseAnyModuleData,
+        module: CoreCourseModule,
         courseId: number,
         handlerData: CoreCourseModuleHandlerData,
     ): Promise<void> {
diff --git a/src/addons/mod/resource/services/handlers/module.ts b/src/addons/mod/resource/services/handlers/module.ts
index f9ed3f2c2..3c6030331 100644
--- a/src/addons/mod/resource/services/handlers/module.ts
+++ b/src/addons/mod/resource/services/handlers/module.ts
@@ -15,7 +15,7 @@
 import { CoreConstants } from '@/core/constants';
 import { Injectable, Type } from '@angular/core';
 import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
-import { CoreCourse, CoreCourseAnyModuleData, CoreCourseModuleContentFile } from '@features/course/services/course';
+import { CoreCourse, CoreCourseModuleContentFile } from '@features/course/services/course';
 import { CoreCourseModule } from '@features/course/services/course-helper';
 import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
 import { CoreCourseModulePrefetchDelegate } from '@features/course/services/module-prefetch-delegate';
@@ -64,7 +64,7 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase
      * @inheritdoc
      */
     async getData(
-        module: CoreCourseAnyModuleData,
+        module: CoreCourseModule,
         courseId: number,
         sectionId?: number,
         forCoursePage?: boolean,
@@ -94,7 +94,7 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase
         }];
 
         this.getResourceData(module, courseId, handlerData).then((data) => {
-            handlerData.icon = data.icon;
+            handlerData.icon = handlerData.icon || data.icon;
             handlerData.extraBadge = data.extra;
             handlerData.extraBadgeColor = 'light';
 
@@ -113,7 +113,7 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase
      * @param courseId The course ID.
      * @return Resolved when done.
      */
-    protected async hideOpenButton(module: CoreCourseAnyModuleData, courseId: number): Promise<boolean> {
+    protected async hideOpenButton(module: CoreCourseModule, courseId: number): Promise<boolean> {
         if (!('contentsinfo' in module) || !module.contentsinfo) {
             await CoreCourse.loadModuleContents(module, courseId, undefined, false, false, undefined, this.modName);
         }
@@ -131,7 +131,7 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase
      * @return Resource data.
      */
     protected async getResourceData(
-        module: CoreCourseAnyModuleData,
+        module: CoreCourseModule,
         courseId: number,
         handlerData: CoreCourseModuleHandlerData,
     ): Promise<AddonResourceHandlerData> {
@@ -233,7 +233,7 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase
 
         // No previously set, just set the icon.
         if (resourceData.icon == '') {
-            resourceData.icon = await CoreCourse.getModuleIconSrc(module.modname, 'modicon' in module ? module.modicon : undefined);
+            resourceData.icon = await CoreCourse.getModuleIconSrc(module.modname, module.modicon);
         }
 
         return resourceData;
diff --git a/src/addons/mod/url/services/handlers/module.ts b/src/addons/mod/url/services/handlers/module.ts
index 94634f181..b1cdfaf9e 100644
--- a/src/addons/mod/url/services/handlers/module.ts
+++ b/src/addons/mod/url/services/handlers/module.ts
@@ -16,7 +16,7 @@ import { CoreConstants } from '@/core/constants';
 import { Injectable, Type } from '@angular/core';
 import { CoreContentLinksHelper } from '@features/contentlinks/services/contentlinks-helper';
 import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
-import { CoreCourse, CoreCourseAnyModuleData } from '@features/course/services/course';
+import { CoreCourse } from '@features/course/services/course';
 import { CoreCourseModule } from '@features/course/services/course-helper';
 import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
 import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
@@ -54,7 +54,7 @@ export class AddonModUrlModuleHandlerService extends CoreModuleHandlerBase imple
     /**
      * @inheritdoc
      */
-    async getData(module: CoreCourseAnyModuleData, courseId: number): Promise<CoreCourseModuleHandlerData> {
+    async getData(module: CoreCourseModule, courseId: number): Promise<CoreCourseModuleHandlerData> {
 
         /**
          * Open the URL.
@@ -77,7 +77,7 @@ export class AddonModUrlModuleHandlerService extends CoreModuleHandlerBase imple
         };
 
         const handlerData: CoreCourseModuleHandlerData = {
-            icon: await CoreCourse.getModuleIconSrc(module.modname, 'modicon' in module ? module.modicon : undefined),
+            icon: await CoreCourse.getModuleIconSrc(module.modname, module.modicon),
             title: module.name,
             class: 'addon-mod_url-handler',
             showDownloadButton: false,
@@ -120,8 +120,8 @@ export class AddonModUrlModuleHandlerService extends CoreModuleHandlerBase imple
 
             if (module.contents && module.contents[0]) {
                 // Calculate the icon to use.
-                handlerData.icon = AddonModUrl.guessIcon(module.contents[0].fileurl) ||
-                    await CoreCourse.getModuleIconSrc(module.modname, 'modicon' in module ? module.modicon : undefined);
+                handlerData.icon = await CoreCourse.getModuleIconSrc(module.modname, module.modicon) ||
+                    AddonModUrl.guessIcon(module.contents[0].fileurl);
             }
 
             return;
@@ -139,7 +139,7 @@ export class AddonModUrlModuleHandlerService extends CoreModuleHandlerBase imple
      * @param courseId The course ID.
      * @return Resolved when done.
      */
-    protected async hideLinkButton(module: CoreCourseAnyModuleData, courseId: number): Promise<boolean> {
+    protected async hideLinkButton(module: CoreCourseModule, courseId: number): Promise<boolean> {
         try {
             const contents = await CoreCourse.getModuleContents(module, courseId, undefined, false, false, undefined, this.modName);
 
diff --git a/src/core/features/course/classes/module-base-handler.ts b/src/core/features/course/classes/module-base-handler.ts
index d44bc8238..f45aa6a53 100644
--- a/src/core/features/course/classes/module-base-handler.ts
+++ b/src/core/features/course/classes/module-base-handler.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
-import { CoreCourse, CoreCourseAnyModuleData } from '../services/course';
+import { CoreCourse } from '../services/course';
 import { CoreCourseModule } from '../services/course-helper';
 import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '../services/module-delegate';
 
@@ -35,13 +35,13 @@ export class CoreModuleHandlerBase implements Partial<CoreCourseModuleHandler> {
      * @inheritdoc
      */
     async getData(
-        module: CoreCourseAnyModuleData,
+        module: CoreCourseModule,
         courseId: number, // eslint-disable-line @typescript-eslint/no-unused-vars
         sectionId?: number, // eslint-disable-line @typescript-eslint/no-unused-vars
         forCoursePage?: boolean, // eslint-disable-line @typescript-eslint/no-unused-vars
     ): Promise<CoreCourseModuleHandlerData> {
         return {
-            icon: await CoreCourse.getModuleIconSrc(module.modname, 'modicon' in module ? module.modicon : undefined),
+            icon: await CoreCourse.getModuleIconSrc(module.modname, module.modicon),
             title: module.name,
             class: 'addon-mod_' + module.modname + '-handler',
             showDownloadButton: true,
diff --git a/src/core/features/course/services/handlers/default-module.ts b/src/core/features/course/services/handlers/default-module.ts
index d6f7d9637..25bf41663 100644
--- a/src/core/features/course/services/handlers/default-module.ts
+++ b/src/core/features/course/services/handlers/default-module.ts
@@ -16,7 +16,7 @@ import { Injectable, Type } from '@angular/core';
 
 import { CoreSites } from '@services/sites';
 import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '../module-delegate';
-import { CoreCourse, CoreCourseAnyModuleData } from '../course';
+import { CoreCourse } from '../course';
 import { CoreCourseModule } from '../course-helper';
 import { CoreCourseUnsupportedModuleComponent } from '@features/course/components/unsupported-module/unsupported-module';
 import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
@@ -42,11 +42,11 @@ export class CoreCourseModuleDefaultHandler implements CoreCourseModuleHandler {
      * @inheritdoc
      */
     async getData(
-        module: CoreCourseAnyModuleData,
+        module: CoreCourseModule,
     ): Promise<CoreCourseModuleHandlerData> {
         // Return the default data.
         const defaultData: CoreCourseModuleHandlerData = {
-            icon: await CoreCourse.getModuleIconSrc(module.modname, 'modicon' in module ? module.modicon : undefined),
+            icon: await CoreCourse.getModuleIconSrc(module.modname, module.modicon),
             title: module.name,
             class: 'core-course-default-handler core-course-module-' + module.modname + '-handler',
             action: (event: Event, module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions) => {
diff --git a/src/core/features/course/services/module-delegate.ts b/src/core/features/course/services/module-delegate.ts
index e7165da57..9ff01b011 100644
--- a/src/core/features/course/services/module-delegate.ts
+++ b/src/core/features/course/services/module-delegate.ts
@@ -52,7 +52,7 @@ export interface CoreCourseModuleHandler extends CoreDelegateHandler {
      * @return Data to render the module.
      */
     getData(
-        module: CoreCourseAnyModuleData,
+        module: CoreCourseModule,
         courseId: number,
         sectionId?: number,
         forCoursePage?: boolean,
@@ -279,7 +279,7 @@ export class CoreCourseModuleDelegateService extends CoreDelegate<CoreCourseModu
      */
     async getModuleDataFor(
         modname: string,
-        module: CoreCourseAnyModuleData,
+        module: CoreCourseModule,
         courseId: number,
         sectionId?: number,
         forCoursePage?: boolean,

From 2f4967b1014b543081656189394fbd1d1a223e07 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 28 Sep 2021 17:47:36 +0200
Subject: [PATCH 0116/1008] MOBILE-3875 ci: Improve performance measures

---
 .github/workflows/performance.yml           |  12 +-
 scripts/print-measure-timings.js            |  40 ---
 scripts/print-performance-measures.js       |  75 ++++++
 tests/behat/behat_performance.php           |  40 +--
 tests/behat/classes/measure_timing.php      |  94 -------
 tests/behat/classes/performance_measure.php | 276 ++++++++++++++++++++
 tests/behat/performance.feature             |  30 ++-
 7 files changed, 396 insertions(+), 171 deletions(-)
 delete mode 100755 scripts/print-measure-timings.js
 create mode 100755 scripts/print-performance-measures.js
 delete mode 100644 tests/behat/classes/measure_timing.php
 create mode 100644 tests/behat/classes/performance_measure.php

diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml
index 6b894c8d8..99894bdde 100644
--- a/.github/workflows/performance.yml
+++ b/.github/workflows/performance.yml
@@ -31,7 +31,13 @@ jobs:
       run: |
         export MOODLE_DOCKER_WWWROOT=$GITHUB_WORKSPACE/moodle
         cp $GITHUB_WORKSPACE/moodle-docker/config.docker-template.php $GITHUB_WORKSPACE/moodle/config.php
-        sed -i "70i\$CFG->behat_ionic_wwwroot = \"http://moodleapp\";" $GITHUB_WORKSPACE/moodle/config.php
+        sed -i "58i\        'capabilities' => [" $GITHUB_WORKSPACE/moodle/config.php
+        sed -i "59i\            'extra_capabilities' => [" $GITHUB_WORKSPACE/moodle/config.php
+        sed -i "60i\                'goog:loggingPrefs' => ['performance' => 'ALL']," $GITHUB_WORKSPACE/moodle/config.php
+        sed -i "61i\                'chromeOptions' => ['perfLoggingPrefs' => ['traceCategories' => 'devtools.timeline']]," $GITHUB_WORKSPACE/moodle/config.php
+        sed -i "62i\            ]," $GITHUB_WORKSPACE/moodle/config.php
+        sed -i "63i\        ]," $GITHUB_WORKSPACE/moodle/config.php
+        sed -i "75i\$CFG->behat_ionic_wwwroot = 'http://moodleapp';" $GITHUB_WORKSPACE/moodle/config.php
         $GITHUB_WORKSPACE/moodle-docker/bin/moodle-docker-compose pull
         $GITHUB_WORKSPACE/moodle-docker/bin/moodle-docker-compose up -d
         $GITHUB_WORKSPACE/moodle-docker/bin/moodle-docker-wait-for-db
@@ -47,9 +53,9 @@ jobs:
     - name: Run performance tests
       run: |
         export MOODLE_DOCKER_WWWROOT=$GITHUB_WORKSPACE/moodle
-        for i in {0..3}
+        for i in {0..2}
         do
           $GITHUB_WORKSPACE/moodle-docker/bin/moodle-docker-compose exec -T webserver sh -c "php admin/tool/behat/cli/run.php --tags="@performance" --auto-rerun"
         done
     - name: Show performance results
-      run: node ./scripts/print-measure-timings.js $GITHUB_WORKSPACE/moodle/behatmeasuretimings/
+      run: node ./scripts/print-performance-measures.js $GITHUB_WORKSPACE/moodle/behatperformancemeasures/
diff --git a/scripts/print-measure-timings.js b/scripts/print-measure-timings.js
deleted file mode 100755
index ccd9356e1..000000000
--- a/scripts/print-measure-timings.js
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env node
-
-// (C) Copyright 2015 Moodle Pty Ltd.
-//
-// 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.
-
-const { readdirSync, readFileSync } = require('fs');
-
-if (process.argv.length < 3) {
-    console.error('Missing measure timings storage path argument');
-    process.exit(1);
-}
-
-const measureTimingsStoragePath = process.argv[2].trimRight('/') + '/';
-const files = readdirSync(measureTimingsStoragePath);
-const measureTimingsDurations = {};
-
-for (const file of files) {
-    const measureTiming = JSON.parse(readFileSync(measureTimingsStoragePath + file));
-
-    measureTimingsDurations[measureTiming.measure] = measureTimingsDurations[measureTiming.measure] ?? [];
-    measureTimingsDurations[measureTiming.measure].push(measureTiming.duration);
-}
-
-for (const [measure, durations] of Object.entries(measureTimingsDurations)) {
-    const totalRuns = durations.length;
-    const averageDuration = Math.round(durations.reduce((total, duration) => total + duration) / totalRuns);
-
-    console.log(`${measure} took an average of ${averageDuration}ms per run (in ${totalRuns} runs)`);
-}
diff --git a/scripts/print-performance-measures.js b/scripts/print-performance-measures.js
new file mode 100755
index 000000000..064a88181
--- /dev/null
+++ b/scripts/print-performance-measures.js
@@ -0,0 +1,75 @@
+#!/usr/bin/env node
+
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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.
+
+const { readdirSync, readFileSync } = require('fs');
+
+if (process.argv.length < 3) {
+    console.error('Missing measure timings storage path argument');
+    process.exit(1);
+}
+
+const performanceMeasuresStoragePath = process.argv[2].trimRight('/') + '/';
+const files = readdirSync(performanceMeasuresStoragePath);
+const performanceMeasures = {};
+
+if (files.length === 0) {
+    console.log('No logs found!');
+    process.exit(0);
+}
+
+// Aggregate data
+for (const file of files) {
+    const performanceMeasure = JSON.parse(readFileSync(performanceMeasuresStoragePath + file));
+
+    performanceMeasures[performanceMeasure.name] = performanceMeasures[performanceMeasure.name] ?? {
+        duration: [],
+        scripting: [],
+        styling: [],
+        blocking: [],
+        longTasks: [],
+        networking: [],
+    };
+    performanceMeasures[performanceMeasure.name].duration.push(performanceMeasure.duration);
+    performanceMeasures[performanceMeasure.name].scripting.push(performanceMeasure.scripting);
+    performanceMeasures[performanceMeasure.name].styling.push(performanceMeasure.styling);
+    performanceMeasures[performanceMeasure.name].blocking.push(performanceMeasure.blocking);
+    performanceMeasures[performanceMeasure.name].longTasks.push(performanceMeasure.longTasks);
+    performanceMeasures[performanceMeasure.name].networking.push(performanceMeasure.networking);
+}
+
+// Calculate averages
+for (const [name, { duration, scripting, styling, blocking, longTasks, networking }] of Object.entries(performanceMeasures)) {
+    const totalRuns = duration.length;
+    const averageDuration = Math.round(duration.reduce((total, duration) => total + duration) / totalRuns);
+    const averageScripting = Math.round(scripting.reduce((total, scripting) => total + scripting) / totalRuns);
+    const averageStyling = Math.round(styling.reduce((total, styling) => total + styling) / totalRuns);
+    const averageBlocking = Math.round(blocking.reduce((total, blocking) => total + blocking) / totalRuns);
+    const averageLongTasks = Math.round(longTasks.reduce((total, longTasks) => total + longTasks) / totalRuns);
+    const averageNetworking = Math.round(networking.reduce((total, networking) => total + networking) / totalRuns);
+
+    performanceMeasures[name] = {
+        'Total duration': `${averageDuration}ms`,
+        'Scripting': `${averageScripting}ms`,
+        'Styling': `${averageStyling}ms`,
+        'Blocking': `${averageBlocking}ms`,
+        '# Network requests': averageNetworking,
+        '# Long Tasks': averageLongTasks,
+        '# runs': totalRuns,
+    };
+}
+
+// Display data
+console.table(performanceMeasures);
diff --git a/tests/behat/behat_performance.php b/tests/behat/behat_performance.php
index 1097c982e..499fc1fea 100644
--- a/tests/behat/behat_performance.php
+++ b/tests/behat/behat_performance.php
@@ -18,7 +18,7 @@ use Behat\Mink\Exception\DriverException;
 use Behat\Mink\Exception\ExpectationException;
 
 require_once(__DIR__ . '/../../../../lib/behat/behat_base.php');
-require_once(__DIR__ . '/classes/measure_timing.php');
+require_once(__DIR__ . '/classes/performance_measure.php');
 
 /**
  * Behat step definitions to measure performance.
@@ -28,25 +28,25 @@ class behat_performance extends behat_base {
     /**
      * @var array
      */
-    private $timings = [];
+    private $measures = [];
 
     /**
-     * Start timing a performance measure.
+     * Start measuring performance.
      *
-     * @When /^I start timing "([^"]+)"$/
+     * @When /^I start measuring "([^"]+)"$/
      */
-    public function i_start_timing(string $measure) {
-        $this->timings[$measure] = new measure_timing($measure);
-        $this->timings[$measure]->start();
+    public function i_start_measuring(string $name) {
+        $this->measures[$name] = new performance_measure($name, $this->getSession()->getDriver());
+        $this->measures[$name]->start();
     }
 
     /**
-     * Stop timing a performance measure.
+     * Stop measuring performance.
      *
-     * @When /^I stop timing "([^"]+)"$/
+     * @When /^I stop measuring "([^"]+)"$/
      */
-    public function i_stop_timing(string $measure) {
-        $this->get_measure_timing($measure)->end();
+    public function i_stop_measuring(string $name) {
+        $this->get_performance_measure($name)->end();
     }
 
     /**
@@ -55,11 +55,11 @@ class behat_performance extends behat_base {
      * @Then /^"([^"]+)" should have taken (less than|more than|exactly) (\d+(?:\.\d+)? (?:seconds|milliseconds))$/
      */
     public function timing_should_have_taken(string $measure, Closure $comparison, float $expectedtime) {
-        $measuretiming = $this->get_measure_timing($measure);
+        $measuretiming = $this->get_performance_measure($measure);
 
         if (!call_user_func($comparison, $measuretiming->duration, $expectedtime)) {
             throw new ExpectationException(
-                "Expected timing for '$measure' measure failed! (took {$measuretiming->duration}ms)",
+                "Expected duration for '$measure' failed! (took {$measuretiming->duration}ms)",
                 $this->getSession()->getDriver()
             );
         }
@@ -112,17 +112,17 @@ class behat_performance extends behat_base {
     }
 
     /**
-     * Get measure timing by name.
+     * Get performance measure by name.
      *
-     * @param string $measure Measure timing name.
-     * @return measure_timing Measure timing.
+     * @param string $name Performance measure name.
+     * @return performance_measure Performance measure.
      */
-    private function get_measure_timing(string $measure): measure_timing {
-        if (!isset($this->timings[$measure])) {
-            throw new DriverException("Timing for '$measure' measure does not exist.");
+    private function get_performance_measure(string $name): performance_measure {
+        if (!isset($this->measures[$name])) {
+            throw new DriverException("'$name' performance measure does not exist.");
         }
 
-        return $this->timings[$measure];
+        return $this->measures[$name];
     }
 
 }
diff --git a/tests/behat/classes/measure_timing.php b/tests/behat/classes/measure_timing.php
deleted file mode 100644
index 4baa699f9..000000000
--- a/tests/behat/classes/measure_timing.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Performance timing for one particular measure.
- */
-class measure_timing {
-
-    const STORAGE_FOLDER = '/behatmeasuretimings/';
-
-    /**
-     * @var string
-     */
-    public $measure;
-
-    /**
-     * @var int
-     */
-    public $start;
-
-    /**
-     * @var int
-     */
-    public $end;
-
-    /**
-     * @var int
-     */
-    public $duration;
-
-    public function __construct(string $measure) {
-        $this->measure = $measure;
-    }
-
-    /**
-     * Start timing.
-     */
-    public function start(): void {
-        $this->start = $this->now();
-    }
-
-    /**
-     * Stop timing.
-     */
-    public function end(): void {
-        $this->end = $this->now();
-        $this->duration = $this->end - $this->start;
-    }
-
-    /**
-     * Persist measure timing in storage.
-     */
-    public function store(): void {
-        global $CFG;
-
-        $storagefolderpath = $CFG->dirroot . static::STORAGE_FOLDER;
-
-        if (!file_exists($storagefolderpath)) {
-            mkdir($storagefolderpath);
-        }
-
-        $data = [
-            'measure' => $this->measure,
-            'start' => $this->start,
-            'end' => $this->end,
-            'duration' => $this->duration,
-        ];
-
-        file_put_contents($storagefolderpath . time() . '.json', json_encode($data));
-    }
-
-    /**
-     * Get current time.
-     *
-     * @return int Current time in milliseconds.
-     */
-    private function now(): int {
-        return round(microtime(true) * 1000);
-    }
-
-}
diff --git a/tests/behat/classes/performance_measure.php b/tests/behat/classes/performance_measure.php
new file mode 100644
index 000000000..6646f5ce4
--- /dev/null
+++ b/tests/behat/classes/performance_measure.php
@@ -0,0 +1,276 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+use Moodle\BehatExtension\Driver\WebDriver;
+
+/**
+ * Performance measures for one particular metric.
+ */
+class performance_measure implements behat_app_listener {
+
+    const STORAGE_FOLDER = '/behatperformancemeasures/';
+
+    /**
+     * @var string
+     */
+    public $name;
+
+    /**
+     * @var int
+     */
+    public $start;
+
+    /**
+     * @var int
+     */
+    public $end;
+
+    /**
+     * @var int
+     */
+    public $duration;
+
+    /**
+     * @var int
+     */
+    public $scripting;
+
+    /**
+     * @var int
+     */
+    public $styling;
+
+    /**
+     * @var int
+     */
+     public $blocking;
+
+    /**
+     * @var int
+     */
+    public $networking;
+
+    /**
+     * @var array
+     */
+    private $longTasks = [];
+
+    /**
+     * @var Closure
+     */
+    private $behatAppUnsubscribe;
+
+    /**
+     * @var Moodle\BehatExtension\Driver\WebDriver
+     */
+    private $driver;
+
+    public function __construct(string $name, WebDriver $driver) {
+        $this->name = $name;
+        $this->driver = $driver;
+    }
+
+    /**
+     * Start timing.
+     */
+    public function start(): void {
+        $this->start = $this->now();
+
+        $this->observeLongTasks();
+
+        $this->behatAppUnsubscribe = behat_app::listen($this);
+    }
+
+    /**
+     * Stop timing.
+     */
+    public function end(): void {
+        $this->end = $this->now();
+
+        $this->stopLongTasksObserver();
+
+        call_user_func($this->behatAppUnsubscribe);
+        $this->behatAppUnsubscribe = null;
+
+        $this->analyseDuration();
+        $this->analyseLongTasks();
+        $this->analysePerformanceLogs();
+    }
+
+    /**
+     * Persist measure logs in storage.
+     */
+    public function store(): void {
+        global $CFG;
+
+        $storagefolderpath = $CFG->dirroot . static::STORAGE_FOLDER;
+
+        if (!file_exists($storagefolderpath)) {
+            mkdir($storagefolderpath);
+        }
+
+        $data = [
+            'name' => $this->name,
+            'start' => $this->start,
+            'end' => $this->end,
+            'duration' => $this->duration,
+            'scripting' => $this->scripting,
+            'styling' => $this->styling,
+            'blocking' => $this->blocking,
+            'longTasks' => count($this->longTasks),
+            'networking' => $this->networking,
+        ];
+
+        file_put_contents($storagefolderpath . time() . '.json', json_encode($data));
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function on_app_load(): void {
+        if (is_null($this->start) || !is_null($this->end)) {
+            return;
+        }
+
+        $this->observeLongTasks();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function on_app_unload(): void {
+        $this->stopLongTasksObserver();
+    }
+
+    /**
+     * Get current time.
+     *
+     * @return int Current time in milliseconds.
+     */
+    private function now(): int {
+        return $this->driver->evaluateScript('Date.now();');
+    }
+
+    /**
+     * Start observing long tasks.
+     */
+    private function observeLongTasks(): void {
+        $this->driver->executeScript("
+            if (window.MA_PERFORMANCE_OBSERVER) return;
+
+            window.MA_LONG_TASKS = [];
+            window.MA_PERFORMANCE_OBSERVER = new PerformanceObserver(list => {
+                for (const entry of list.getEntries()) {
+                    window.MA_LONG_TASKS.push(entry);
+                }
+            });
+            window.MA_PERFORMANCE_OBSERVER.observe({ entryTypes: ['longtask'] });
+        ");
+    }
+
+    /**
+     * Flush Performance observer.
+     */
+    private function stopLongTasksObserver(): void {
+        $newLongTasks = $this->driver->evaluateScript("
+            return (function() {
+                if (!window.MA_PERFORMANCE_OBSERVER) {
+                    return [];
+                }
+
+                window.MA_PERFORMANCE_OBSERVER.disconnect();
+
+                const observer = window.MA_PERFORMANCE_OBSERVER;
+                const longTasks = window.MA_LONG_TASKS;
+
+                delete window.MA_PERFORMANCE_OBSERVER;
+                delete window.MA_LONG_TASKS;
+
+                return [...longTasks, ...observer.takeRecords()];
+            })();
+        ");
+
+        if ($newLongTasks) {
+            $this->longTasks = array_merge($this->longTasks, $newLongTasks);
+        }
+    }
+
+    /**
+     * Analyse duration.
+     */
+    private function analyseDuration(): void {
+        $this->duration = $this->end - $this->start;
+    }
+
+    /**
+     * Analyse long tasks.
+     */
+    private function analyseLongTasks(): void {
+        $blocking = 0;
+
+        foreach ($this->longTasks as $longTask) {
+            $blocking += $longTask['duration'] - 50;
+        }
+
+        $this->blocking = $blocking;
+    }
+
+    /**
+     * Analyse performance logs.
+     */
+    private function analysePerformanceLogs(): void {
+        global $CFG;
+
+        $scripting = 0;
+        $styling = 0;
+        $networking = 0;
+        $logs = $this->driver->getWebDriver()->manage()->getLog('performance');
+
+        foreach ($logs as $log) {
+            // TODO this should filter by end time as well, but it seems like the timestamps are not
+            // working as expected.
+            if (($log['timestamp'] < $this->start)) {
+                continue;
+            }
+
+            $message = json_decode($log['message'])->message;
+            $messagename = $message->params->name ?? '';
+
+            if (in_array($messagename, ['FunctionCall', 'GCEvent', 'MajorGC', 'MinorGC', 'EvaluateScript'])) {
+                $scripting += $message->params->dur;
+
+                continue;
+            }
+
+            if (in_array($messagename, ['UpdateLayoutTree', 'RecalculateStyles', 'ParseAuthorStyleSheet'])) {
+                $styling += $message->params->dur;
+
+                continue;
+            }
+
+            if (in_array($messagename, ['XHRLoad']) && !str_starts_with($message->params->args->data->url, $CFG->behat_ionic_wwwroot)) {
+                $networking++;
+
+                continue;
+            }
+        }
+
+        $this->scripting = round($scripting / 1000);
+        $this->styling = round($styling / 1000);
+        $this->networking = $networking;
+    }
+
+}
diff --git a/tests/behat/performance.feature b/tests/behat/performance.feature
index 203737163..f955ff63e 100644
--- a/tests/behat/performance.feature
+++ b/tests/behat/performance.feature
@@ -1,32 +1,34 @@
 @app @javascript @performance
 Feature: Measure performance.
 
-Scenario: [FCP] First Contentful Paint
-    Given I start timing "FCP"
+Scenario: First Contentful Paint
+    Given I start measuring "First Contentful Paint"
     When I launch the app runtime
     Then I should find "Welcome to the Moodle App!" in the app
 
-    When I stop timing "FCP"
-    Then "FCP" should have taken less than 5 seconds
+    When I stop measuring "First Contentful Paint"
+    Then "First Contentful Paint" should have taken less than 6 seconds
 
-Scenario: [TTI] Time to Interactive
-    Given I start timing "TTI"
+Scenario: Time to Interactive
+    Given I start measuring "Time to Interactive"
     When I launch the app runtime
     Then I should find "Welcome to the Moodle App!" in the app
 
     When I press "Skip" in the app
-    Then I should find "Connect to Moodle" in the app
+    Then I should not find "Skip" in the app
+    And I should find "Connect to Moodle" in the app
 
-    When I stop timing "TTI"
-    Then "TTI" should have taken less than 6 seconds
+    When I stop measuring "Time to Interactive"
+    Then "Time to Interactive" should have taken less than 7 seconds
 
-Scenario: [TBT] Total Blocking Time
+Scenario: Total Blocking Time
     Given I launch the app runtime
     Then I should find "Welcome to the Moodle App!" in the app
 
-    When I start timing "TBT"
+    When I start measuring "Total Blocking Time"
     And I press "Skip" in the app
-    Then I should find "Connect to Moodle" in the app
+    Then I should not find "Skip" in the app
+    And I should find "Connect to Moodle" in the app
 
-    When I stop timing "TBT"
-    Then "TBT" should have taken less than 2 seconds
+    When I stop measuring "Total Blocking Time"
+    Then "Total Blocking Time" should have taken less than 2 seconds

From 22bdbc1ddc4d148371ff2f98ad97fb111bcb24c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 27 Sep 2021 16:44:24 +0200
Subject: [PATCH 0117/1008] MOBILE-2748 mod: Create a new module icon component

---
 .../addon-block-activitymodules.html          |  3 +-
 .../addon-block-recentlyaccesseditems.html    |  4 +-
 .../events/addon-block-timeline-events.html   |  6 +-
 .../timeline/components/events/events.ts      |  3 +-
 src/addons/calendar/calendar-common.scss      |  7 +-
 .../calendar/addon-calendar-calendar.html     |  5 +-
 .../components/calendar/calendar.scss         |  8 +-
 .../addon-calendar-upcoming-events.html       |  4 +-
 src/addons/calendar/pages/day/day.html        |  5 +-
 src/addons/calendar/pages/event/event.html    |  3 +-
 src/addons/calendar/pages/event/event.scss    |  3 +-
 .../pages/competency/competency.html          |  3 +-
 .../coursecompetencies.html                   |  4 +-
 .../mod/lti/services/handlers/module.ts       | 50 +----------
 .../mod/resource/services/handlers/module.ts  | 39 +++-----
 .../mod/url/services/handlers/module.ts       |  5 +-
 .../pages/course-storage/course-storage.html  |  5 +-
 .../pages/course-storage/course-storage.ts    |  2 -
 src/core/components/components.module.ts      |  3 +
 src/core/components/mod-icon/mod-icon.html    | 19 ++++
 src/core/components/mod-icon/mod-icon.scss    | 37 ++++++++
 src/core/components/mod-icon/mod-icon.ts      | 88 +++++++++++++++++++
 .../components/user-avatar/user-avatar.scss   |  5 ++
 src/core/directives/external-content.ts       |  3 +-
 .../components/module/core-course-module.html |  5 +-
 src/core/features/course/services/course.ts   | 19 ++--
 .../course/services/module-delegate.ts        |  2 +-
 .../features/grades/pages/course/course.html  |  5 +-
 .../grades/pages/course/course.page.ts        |  4 +-
 .../features/grades/pages/course/course.scss  | 10 +++
 .../features/grades/pages/grade/grade.html    |  9 +-
 .../tag/components/feed/core-tag-feed.html    |  4 +-
 src/theme/theme.base.scss                     | 26 ------
 33 files changed, 251 insertions(+), 147 deletions(-)
 create mode 100644 src/core/components/mod-icon/mod-icon.html
 create mode 100644 src/core/components/mod-icon/mod-icon.scss
 create mode 100644 src/core/components/mod-icon/mod-icon.ts

diff --git a/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html b/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html
index 1f39261b4..2306e3b4b 100644
--- a/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html
+++ b/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html
@@ -6,7 +6,8 @@
 <core-loading [hideUntil]="loaded" [fullscreen]="false" class="margin">
     <ion-item class="ion-text-wrap item-media" *ngFor="let entry of entries" detail="true" button
         (click)="gotoCoureListModType(entry)">
-        <img slot="start" [src]="entry.icon" alt="" role="presentation" class="core-module-icon">
+        <core-mod-icon slot="start" [modicon]="entry.icon" [modname]="entry.modName" [showAlt]="false">
+        </core-mod-icon>
         <ion-label>{{ entry.name }}</ion-label>
     </ion-item>
 </core-loading>
diff --git a/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html b/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html
index 4990142ad..73e52969f 100644
--- a/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html
+++ b/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html
@@ -17,7 +17,9 @@
                 <ion-card>
                     <ion-item class="core-course-module-handler item-media ion-text-wrap" detail="false" (click)="action($event, item)"
                         button>
-                        <img slot="start" [src]="item.iconUrl" alt="" role="presentation" *ngIf="item.iconUrl" class="core-module-icon">
+                        <core-mod-icon slot="start" *ngIf="item.iconUrl" [modicon]="item.iconUrl"
+                            [modname]="item.modname" [componentId]="item.cmid" [showAlt]="false">
+                        </core-mod-icon>
                         <ion-label>
                             <!-- Add the icon title so accessibility tools read it. -->
                             <span class="sr-only" *ngIf="item.iconTitle">{{ item.iconTitle }}</span>
diff --git a/src/addons/block/timeline/components/events/addon-block-timeline-events.html b/src/addons/block/timeline/components/events/addon-block-timeline-events.html
index 022dcc211..0622e2e0b 100644
--- a/src/addons/block/timeline/components/events/addon-block-timeline-events.html
+++ b/src/addons/block/timeline/components/events/addon-block-timeline-events.html
@@ -5,10 +5,10 @@
     <ng-container *ngFor="let event of dayEvents.events">
         <ion-item class="ion-text-wrap core-course-module-handler item-media" detail="false" (click)="action($event, event.url)"
             [attr.aria-label]="event.name" button>
-            <img slot="start" [src]="event.iconUrl" alt="" role="presentation" *ngIf="event.iconUrl" class="core-module-icon">
+            <core-mod-icon *ngIf="event.iconUrl" slot="start" [modicon]="event.iconUrl" [componentId]="event.instance"
+                [modname]="event.modulename">
+            </core-mod-icon>
             <ion-label>
-                <!-- Add the icon title so accessibility tools read it. -->
-                <span class="sr-only" *ngIf="event.iconTitle">{{ event.iconTitle }}</span>
                 <p class="item-heading">
                     <core-format-text [text]="event.name" contextLevel="module" [contextInstanceId]="event.id"
                         [courseId]="event.course && event.course.id">
diff --git a/src/addons/block/timeline/components/events/events.ts b/src/addons/block/timeline/components/events/events.ts
index bf77da586..b0db9c8a0 100644
--- a/src/addons/block/timeline/components/events/events.ts
+++ b/src/addons/block/timeline/components/events/events.ts
@@ -104,7 +104,8 @@ export class AddonBlockTimelineEventsComponent implements OnChanges {
             return start <= event.timesort;
         }).map(async (event) => {
             event.iconUrl = await CoreCourse.getModuleIconSrc(event.icon.component);
-            event.iconTitle = event.modulename && CoreCourse.translateModuleName(event.modulename);
+            event.modulename = event.modulename || event.icon.component;
+            event.iconTitle = CoreCourse.translateModuleName(event.modulename);
 
             return event;
         }));
diff --git a/src/addons/calendar/calendar-common.scss b/src/addons/calendar/calendar-common.scss
index 771f1987e..8fdaaeefe 100644
--- a/src/addons/calendar/calendar-common.scss
+++ b/src/addons/calendar/calendar-common.scss
@@ -9,6 +9,10 @@
             padding: 6px;
         }
 
+        > core-mod-icon {
+            padding: 6px;
+        }
+
         &.addon-calendar-eventtype-category > ion-icon {
             background-color: var(--addon-calendar-event-category-color);
         }
@@ -25,4 +29,5 @@
             background-color: var(--addon-calendar-event-site-color);
         }
     }
-}
+
+}
\ No newline at end of file
diff --git a/src/addons/calendar/components/calendar/addon-calendar-calendar.html b/src/addons/calendar/components/calendar/addon-calendar-calendar.html
index 93d477d00..570926c23 100644
--- a/src/addons/calendar/components/calendar/addon-calendar-calendar.html
+++ b/src/addons/calendar/components/calendar/addon-calendar-calendar.html
@@ -88,8 +88,9 @@
                                 <span class="addon-calendar-event-time">
                                     {{ event.timestart * 1000 | coreFormatDate: timeFormat }}
                                 </span>
-                                <img *ngIf="event.moduleIcon" src="{{event.moduleIcon}}" alt="" role="presentation"
-                                    class="core-module-icon">
+                                <core-mod-icon *ngIf="event.moduleIcon" [modicon]="event.moduleIcon" [showAlt]="false"
+                                    [modname]="event.modulename" [componentId]="event.instance">
+                                </core-mod-icon>
                                 <!-- Add the icon title so accessibility tools read it. -->
                                 <span class="sr-only">
                                     {{ 'addon.calendar.type' + event.formattedType | translate }}
diff --git a/src/addons/calendar/components/calendar/calendar.scss b/src/addons/calendar/components/calendar/calendar.scss
index 4d9303f3b..acbcccf6b 100644
--- a/src/addons/calendar/components/calendar/calendar.scss
+++ b/src/addons/calendar/components/calendar/calendar.scss
@@ -144,15 +144,15 @@
         }
     }
 
-    .core-module-icon {
+    core-mod-icon {
         margin-right: 1px;
         margin-left: 1px;
         --size: 16px;
         display: inline-block;
         vertical-align: bottom;
-    }
-    .core-module-icon[slot="start"] {
-        padding: 6px;
+        ::ng-deep img {
+            display: block;
+        }
     }
 }
 
diff --git a/src/addons/calendar/components/upcoming-events/addon-calendar-upcoming-events.html b/src/addons/calendar/components/upcoming-events/addon-calendar-upcoming-events.html
index 315e8e624..30c9c2224 100644
--- a/src/addons/calendar/components/upcoming-events/addon-calendar-upcoming-events.html
+++ b/src/addons/calendar/components/upcoming-events/addon-calendar-upcoming-events.html
@@ -6,8 +6,8 @@
         <ng-container *ngFor="let event of filteredEvents">
             <ion-item class="ion-text-wrap addon-calendar-event" [attr.aria-label]="event.name" (click)="eventClicked(event)" button
                 [ngClass]="['addon-calendar-eventtype-'+event.eventtype]" detail="true">
-                <img *ngIf="event.moduleIcon" src="{{event.moduleIcon}}" slot="start" class="core-module-icon" alt=""
-                    role="presentation">
+                <core-mod-icon *ngIf="event.moduleIcon" [modicon]="event.moduleIcon" slot="start" [modname]="event.modulename"
+                    [componentId]="event.instance" [showAlt]="false"></core-mod-icon>
                 <ion-icon *ngIf="event.eventIcon && !event.moduleIcon" [name]="event.eventIcon" slot="start" aria-hidden="true">
                 </ion-icon>
                 <ion-label>
diff --git a/src/addons/calendar/pages/day/day.html b/src/addons/calendar/pages/day/day.html
index 9f4b23431..c0e8bb1d7 100644
--- a/src/addons/calendar/pages/day/day.html
+++ b/src/addons/calendar/pages/day/day.html
@@ -61,8 +61,9 @@
             <ng-container *ngFor="let event of filteredEvents">
                 <ion-item class="addon-calendar-event ion-text-wrap" [attr.aria-label]="event.name" (click)="gotoEvent(event.id)"
                 [class.item-dimmed]="event.ispast" [ngClass]="['addon-calendar-eventtype-'+event.eventtype]" button detail="true">
-                    <img *ngIf="event.moduleIcon" src="{{event.moduleIcon}}" slot="start" class="core-module-icon" alt=""
-                        role="presentation">
+                    <core-mod-icon *ngIf="event.moduleIcon" [modicon]="event.moduleIcon" slot="start" [showAlt]="false"
+                        [modname]="event.modname" [componentId]="event.instance">
+                    </core-mod-icon>
                     <ion-icon *ngIf="event.eventIcon && !event.moduleIcon" [name]="event.eventIcon" slot="start" aria-hidden="true">
                     </ion-icon>
                     <ion-label>
diff --git a/src/addons/calendar/pages/event/event.html b/src/addons/calendar/pages/event/event.html
index 6244bc546..493b41712 100644
--- a/src/addons/calendar/pages/event/event.html
+++ b/src/addons/calendar/pages/event/event.html
@@ -4,7 +4,8 @@
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
         <h1 *ngIf="event">
-            <img *ngIf="event.moduleIcon" src="{{event.moduleIcon}}" alt="" role="presentation" class="core-module-icon">
+            <core-mod-icon *ngIf="event.moduleIcon" [modicon]="event.moduleIcon" [showAlt]="false"
+                [modname]="event.modulename" [componentId]="event.instance"></core-mod-icon>
             <ion-icon *ngIf="event.eventIcon && !event.moduleIcon" [name]="event.eventIcon" aria-hidden="true"></ion-icon>
             <!-- Add the icon title so accessibility tools read it. -->
             <span class="sr-only">
diff --git a/src/addons/calendar/pages/event/event.scss b/src/addons/calendar/pages/event/event.scss
index bc2bb8cb3..5403de162 100644
--- a/src/addons/calendar/pages/event/event.scss
+++ b/src/addons/calendar/pages/event/event.scss
@@ -2,8 +2,9 @@
     ion-card ion-note {
         font-size: 1.6rem;
     }
-    h1 ion-icon, h1 img {
+    h1 ion-icon, h1 img, h1 core-mod-icon {
         margin-left: 10px;
         margin-right: 10px;
+        display: inline-block;
     }
 }
diff --git a/src/addons/competency/pages/competency/competency.html b/src/addons/competency/pages/competency/competency.html
index 0406897e2..cc34b86b0 100644
--- a/src/addons/competency/pages/competency/competency.html
+++ b/src/addons/competency/pages/competency/competency.html
@@ -77,8 +77,7 @@
                     </p>
                     <ion-item class="ion-text-wrap" *ngFor="let activity of coursemodules" [href]="activity.url"
                         [attr.aria-label]="activity.name" core-link capture="true">
-                        <img slot="start" core-external-content [src]="activity.iconurl" alt="" *ngIf="activity.iconurl"
-                            class="core-module-icon">
+                        <core-mod-icon slot="start" [modicon]="activity.iconurl" [showAlt]="false" *ngIf="activity.iconurl"></core-mod-icon>
                         <ion-label>
                             <core-format-text [text]="activity.name" contextLevel="module" [contextInstanceId]="activity.id"
                                 [courseId]="courseId">
diff --git a/src/addons/competency/pages/coursecompetencies/coursecompetencies.html b/src/addons/competency/pages/coursecompetencies/coursecompetencies.html
index de2b0bb59..a0e2f63e3 100644
--- a/src/addons/competency/pages/coursecompetencies/coursecompetencies.html
+++ b/src/addons/competency/pages/coursecompetencies/coursecompetencies.html
@@ -114,8 +114,8 @@
                             </p>
                             <ion-item class="ion-text-wrap core-course-module-handler item-media" [attr.aria-label]="activity.name"
                                 core-link *ngFor="let activity of competency.coursemodules" [href]="activity.url" capture="true">
-                                <img slot="start" [src]="activity.iconurl" core-external-content alt=""
-                                    *ngIf="activity.iconurl" class="core-module-icon">
+                                <core-mod-icon slot="start" [modicon]="activity.iconurl" [showAlt]="false" *ngIf="activity.iconurl">
+                                </core-mod-icon>
                                 <ion-label>
                                     <core-format-text [text]="activity.name" contextLevel="module" [contextInstanceId]="activity.id"
                                         [courseId]="courseId">
diff --git a/src/addons/mod/lti/services/handlers/module.ts b/src/addons/mod/lti/services/handlers/module.ts
index 6213d8c9a..1692ec173 100644
--- a/src/addons/mod/lti/services/handlers/module.ts
+++ b/src/addons/mod/lti/services/handlers/module.ts
@@ -17,13 +17,8 @@ import { Injectable, Type } from '@angular/core';
 import { CoreConstants } from '@/core/constants';
 import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
 import { CoreCourseModule } from '@features/course/services/course-helper';
-import { CoreApp } from '@services/app';
-import { CoreFilepool } from '@services/filepool';
-import { CoreSites } from '@services/sites';
-import { CoreUtils } from '@services/utils/utils';
-import { DomSanitizer, makeSingleton } from '@singletons';
+import { makeSingleton } from '@singletons';
 import { AddonModLtiHelper } from '../lti-helper';
-import { AddonModLti, AddonModLtiProvider } from '../lti';
 import { AddonModLtiIndexComponent } from '../../components/index';
 import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
 
@@ -62,6 +57,9 @@ export class AddonModLtiModuleHandlerService extends CoreModuleHandlerBase imple
         const data = await super.getData(module, courseId, sectionId, forCoursePage);
         data.showDownloadButton = false;
 
+        // Handle custom icons.
+        data.icon =  module.modicon;
+
         data.buttons = [{
             icon: 'fas-external-link-alt',
             label: 'addon.mod_lti.launchactivity',
@@ -71,49 +69,9 @@ export class AddonModLtiModuleHandlerService extends CoreModuleHandlerBase imple
             },
         }];
 
-        // Handle custom icons.
-        CoreUtils.ignoreErrors(this.loadCustomIcon(module, courseId, data));
-
         return data;
     }
 
-    /**
-     * Load the custom icon.
-     *
-     * @param module Module.
-     * @param courseId Course ID.
-     * @param data Handler data.
-     * @return Promise resolved when done.
-     */
-    protected async loadCustomIcon(
-        module: CoreCourseModule,
-        courseId: number,
-        handlerData: CoreCourseModuleHandlerData,
-    ): Promise<void> {
-        const lti = await AddonModLti.getLti(courseId, module.id);
-
-        const icon = lti.secureicon || lti.icon;
-        if (!icon) {
-            return;
-        }
-
-        const siteId = CoreSites.getCurrentSiteId();
-
-        try {
-            await CoreFilepool.downloadUrl(siteId, icon, false, AddonModLtiProvider.COMPONENT, module.id);
-
-            // Get the internal URL.
-            const url = await CoreFilepool.getSrcByUrl(siteId, icon, AddonModLtiProvider.COMPONENT, module.id);
-
-            handlerData.icon = DomSanitizer.bypassSecurityTrustUrl(url);
-        } catch {
-            // Error downloading. If we're online we'll set the online url.
-            if (CoreApp.isOnline()) {
-                handlerData.icon = DomSanitizer.bypassSecurityTrustUrl(icon);
-            }
-        }
-    }
-
     /**
      * @inheritdoc
      */
diff --git a/src/addons/mod/resource/services/handlers/module.ts b/src/addons/mod/resource/services/handlers/module.ts
index 3c6030331..69a3d2ce8 100644
--- a/src/addons/mod/resource/services/handlers/module.ts
+++ b/src/addons/mod/resource/services/handlers/module.ts
@@ -15,7 +15,7 @@
 import { CoreConstants } from '@/core/constants';
 import { Injectable, Type } from '@angular/core';
 import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
-import { CoreCourse, CoreCourseModuleContentFile } from '@features/course/services/course';
+import { CoreCourse } from '@features/course/services/course';
 import { CoreCourseModule } from '@features/course/services/course-helper';
 import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
 import { CoreCourseModulePrefetchDelegate } from '@features/course/services/module-prefetch-delegate';
@@ -23,7 +23,6 @@ import { CoreFileHelper } from '@services/file-helper';
 import { CoreMimetypeUtils } from '@services/utils/mimetype';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreTimeUtils } from '@services/utils/time';
-import { CoreWSFile } from '@services/ws';
 import { makeSingleton, Translate } from '@singletons';
 import { AddonModResourceIndexComponent } from '../../components/index';
 import { AddonModResource, AddonModResourceCustomData } from '../resource';
@@ -94,7 +93,7 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase
         }];
 
         this.getResourceData(module, courseId, handlerData).then((data) => {
-            handlerData.icon = handlerData.icon || data.icon;
+            handlerData.icon = data.icon;
             handlerData.extraBadge = data.extra;
             handlerData.extraBadgeColor = 'light';
 
@@ -136,7 +135,6 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase
         handlerData: CoreCourseModuleHandlerData,
     ): Promise<AddonResourceHandlerData> {
         const promises: Promise<void>[] = [];
-        let infoFiles: CoreWSFile[] = [];
         let options: AddonModResourceCustomData = {};
 
         // Check if the button needs to be shown or not.
@@ -150,12 +148,11 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase
             return;
         }));
 
-        if ('customdata' in module && typeof module.customdata != 'undefined') {
+        if ('customdata' in module && module.customdata !== undefined) {
             options = CoreTextUtils.unserialize(CoreTextUtils.parseJSON(module.customdata));
         } else {
             // Get the resource data.
             promises.push(AddonModResource.getResourceData(courseId, module.id).then((info) => {
-                infoFiles = info.contentfiles;
                 options = CoreTextUtils.unserialize(info.displayoptions);
 
                 return;
@@ -164,28 +161,22 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase
 
         await Promise.all(promises);
 
-        const files: (CoreCourseModuleContentFile | CoreWSFile)[] = module.contents && module.contents.length
-            ? module.contents
-            : infoFiles;
-
-        const resourceData: AddonResourceHandlerData = {
-            icon: '',
-            extra: '',
-        };
+        let mimetypeIcon = '';
         const extra: string[] = [];
 
         if ('contentsinfo' in module && module.contentsinfo) {
             // No need to use the list of files.
             const mimetype = module.contentsinfo.mimetypes[0];
             if (mimetype) {
-                resourceData.icon = CoreMimetypeUtils.getMimetypeIcon(mimetype);
+                mimetypeIcon = CoreMimetypeUtils.getMimetypeIcon(mimetype);
             }
-            resourceData.extra = CoreTextUtils.cleanTags(module.afterlink);
+            extra.push(CoreTextUtils.cleanTags(module.afterlink));
 
-        } else if (files && files.length) {
+        } else if (module.contents && module.contents[0]) {
+            const files = module.contents;
             const file = files[0];
 
-            resourceData.icon = CoreMimetypeUtils.getFileIcon(file.filename || '');
+            mimetypeIcon = CoreMimetypeUtils.getFileIcon(file.filename || '');
 
             if (options.showsize) {
                 const size = options.filedetails
@@ -227,16 +218,12 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase
                     ));
                 }
             }
-
-            resourceData.extra += extra.join(' ');
         }
 
-        // No previously set, just set the icon.
-        if (resourceData.icon == '') {
-            resourceData.icon = await CoreCourse.getModuleIconSrc(module.modname, module.modicon);
-        }
-
-        return resourceData;
+        return {
+            icon: await CoreCourse.getModuleIconSrc(module.modname, module.modicon, mimetypeIcon),
+            extra: extra.join(' '),
+        };
     }
 
     /**
diff --git a/src/addons/mod/url/services/handlers/module.ts b/src/addons/mod/url/services/handlers/module.ts
index b1cdfaf9e..e6257f845 100644
--- a/src/addons/mod/url/services/handlers/module.ts
+++ b/src/addons/mod/url/services/handlers/module.ts
@@ -119,9 +119,10 @@ export class AddonModUrlModuleHandlerService extends CoreModuleHandlerBase imple
             handlerData.buttons[0].hidden = hideButton;
 
             if (module.contents && module.contents[0]) {
+                const icon = AddonModUrl.guessIcon(module.contents[0].fileurl);
+
                 // Calculate the icon to use.
-                handlerData.icon = await CoreCourse.getModuleIconSrc(module.modname, module.modicon) ||
-                    AddonModUrl.guessIcon(module.contents[0].fileurl);
+                handlerData.icon = await CoreCourse.getModuleIconSrc(module.modname, module.modicon, icon);
             }
 
             return;
diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.html b/src/addons/storagemanager/pages/course-storage/course-storage.html
index 1220ca816..a2417b7ac 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.html
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.html
@@ -45,8 +45,9 @@
                 <ion-card-content>
                     <ng-container *ngFor="let module of section.modules">
                         <ion-item class="ion-no-padding" *ngIf="module.totalSize! > 0">
-                            <img *ngIf="module.handlerData!.icon" [src]="module.handlerData!.icon" [alt]="module.modNameTranslated"
-                                class="core-module-icon" slot="start">
+                            <core-mod-icon slot="start" *ngIf="module.handlerData!.icon"
+                                [modicon]="module.handlerData!.icon" [modname]="module.modname" [componentId]="module.instance">
+                            </core-mod-icon>
                             <ion-label class="ion-text-wrap">
                                 <h3 class="{{module.handlerData!.class}} addon-storagemanager-module-size">
                                     {{ module.name }}
diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.ts b/src/addons/storagemanager/pages/course-storage/course-storage.ts
index 752059a7a..e52ddb0e0 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.ts
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.ts
@@ -63,7 +63,6 @@ export class AddonStorageManagerCourseStoragePage implements OnInit {
             section.modules.forEach((module) => {
                 module.parentSection = section;
                 module.totalSize = 0;
-                module.modNameTranslated = CoreCourse.translateModuleName(module.modname) || '';
 
                 // Note: This function only gets the size for modules which are downloadable.
                 // For other modules it always returns 0, even if they have downloaded some files.
@@ -235,5 +234,4 @@ type AddonStorageManagerCourseSection = Omit<CoreCourseSection, 'modules'> & {
 type AddonStorageManagerModule = CoreCourseModule & {
     parentSection?: AddonStorageManagerCourseSection;
     totalSize?: number;
-    modNameTranslated?: string;
 };
diff --git a/src/core/components/components.module.ts b/src/core/components/components.module.ts
index ee3d02b2e..b055bad15 100644
--- a/src/core/components/components.module.ts
+++ b/src/core/components/components.module.ts
@@ -40,6 +40,7 @@ import { CoreInputErrorsComponent } from './input-errors/input-errors';
 import { CoreLoadingComponent } from './loading/loading';
 import { CoreLocalFileComponent } from './local-file/local-file';
 import { CoreMarkRequiredComponent } from './mark-required/mark-required';
+import { CoreModIconComponent } from './mod-icon/mod-icon';
 import { CoreNavBarButtonsComponent } from './navbar-buttons/navbar-buttons';
 import { CoreNavigationBarComponent } from './navigation-bar/navigation-bar';
 import { CoreProgressBarComponent } from './progress-bar/progress-bar';
@@ -81,6 +82,7 @@ import { CoreButtonWithSpinnerComponent } from './button-with-spinner/button-wit
         CoreLoadingComponent,
         CoreLocalFileComponent,
         CoreMarkRequiredComponent,
+        CoreModIconComponent,
         CoreNavBarButtonsComponent,
         CoreNavigationBarComponent,
         CoreProgressBarComponent,
@@ -128,6 +130,7 @@ import { CoreButtonWithSpinnerComponent } from './button-with-spinner/button-wit
         CoreLoadingComponent,
         CoreLocalFileComponent,
         CoreMarkRequiredComponent,
+        CoreModIconComponent,
         CoreNavBarButtonsComponent,
         CoreNavigationBarComponent,
         CoreProgressBarComponent,
diff --git a/src/core/components/mod-icon/mod-icon.html b/src/core/components/mod-icon/mod-icon.html
new file mode 100644
index 000000000..4ce9eef5c
--- /dev/null
+++ b/src/core/components/mod-icon/mod-icon.html
@@ -0,0 +1,19 @@
+<img
+    *ngIf="!isLocalUrl"
+    [src]="icon"
+    [alt]="showAlt ? modNameTranslated : ''"
+    [attr.role]="!showAlt ? 'presentation' : null" 
+    class="core-module-icon"
+    core-external-content
+    [component]="linkIconWithComponent ? modname : null"
+    [componentId]="linkIconWithComponent ? componentId : null"
+    (error)="loadFallbackIcon()"
+>
+<img
+    *ngIf="isLocalUrl"
+    [src]="icon"
+    [alt]="showAlt ? modNameTranslated : ''"
+    [attr.role]="!showAlt ? 'presentation' : null" 
+    class="core-module-icon"
+    (error)="loadFallbackIcon()"
+>
\ No newline at end of file
diff --git a/src/core/components/mod-icon/mod-icon.scss b/src/core/components/mod-icon/mod-icon.scss
new file mode 100644
index 000000000..e8cbb5754
--- /dev/null
+++ b/src/core/components/mod-icon/mod-icon.scss
@@ -0,0 +1,37 @@
+:host {
+    --size: var(--module-icon-size);
+    --margin-end: 0px;
+    --margin-vertical: 0px;
+
+    margin-top: var(--margin-vertical);
+    margin-bottom: var(--margin-vertical);
+    margin-right: var(--margin-end);
+}
+
+img {
+    width: var(--size);
+    height: var(--size);
+    max-width: var(--size);
+    max-height: var(--size);
+
+    &[alt] {
+        text-indent: -999999px;
+        white-space: nowrap;
+        overflow: hidden;
+    }
+}
+
+:host-context(ion-item) {
+    --margin-vertical: 12px;
+    --margin-end: 32px;
+}
+
+:host-context(ion-card ion-item) {
+    --margin-vertical: 12px;
+    --margin-end: 12px;
+}
+
+:host-context([dir=rtl]) {
+    margin-right: unset;
+    margin-left: var(--margin-end);
+}
\ No newline at end of file
diff --git a/src/core/components/mod-icon/mod-icon.ts b/src/core/components/mod-icon/mod-icon.ts
new file mode 100644
index 000000000..eba805215
--- /dev/null
+++ b/src/core/components/mod-icon/mod-icon.ts
@@ -0,0 +1,88 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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, Input, OnChanges, OnInit, SimpleChange } from '@angular/core';
+import { CoreCourse } from '@features/course/services/course';
+
+const assetsPath = 'assets/img/mod/';
+const fallbackModName = 'external-tool';
+
+/**
+ * Component to handle a module icon.
+ */
+@Component({
+    selector: 'core-mod-icon',
+    templateUrl: 'mod-icon.html',
+    styleUrls: ['mod-icon.scss'],
+})
+export class CoreModIconComponent implements OnInit, OnChanges {
+
+    @Input() modname?; // The module name. Used also as component if set.
+    @Input() componentId?; // Component Id for external icons.
+    @Input() modicon?: string; // Module icon url or local url.
+    @Input() showAlt = true; // Show alt otherwise it's only presentation icon.
+
+    icon = '';
+    modNameTranslated = '';
+    isLocalUrl = true;
+    linkIconWithComponent = false;
+
+    /**
+     * @inheritdoc
+     */
+    async ngOnInit(): Promise<void> {
+        this.modNameTranslated = this.modname ? CoreCourse.translateModuleName(this.modname) || '' : '';
+
+        this.setIcon();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    ngOnChanges(changes: { [name: string]: SimpleChange }): void {
+        if (changes && changes.modicon && changes.modicon.previousValue) {
+            this.setIcon();
+        }
+    }
+
+    /**
+     * Set icon.
+     */
+    setIcon(): void {
+        this.icon = this.modicon || this.icon;
+        this.isLocalUrl = this.icon.startsWith(assetsPath);
+
+        // Cache icon if the url is not the theme generic one.
+        // If modname is not set icon won't be cached.
+        // Also if the url matches the regexp (the theme will manage the image so it's not cached).
+        this.linkIconWithComponent =
+            this.modname &&
+            this.componentId &&
+            !this.isLocalUrl &&
+            !this.icon.match('/theme/image.php/[^/]+/' + this.modname + '/[-0-9]*/');
+    }
+
+    /**
+     * Icon to load on error.
+     */
+    loadFallbackIcon(): void {
+        this.isLocalUrl = true;
+        const moduleName = !this.modname || CoreCourse.CORE_MODULES.indexOf(this.modname) < 0
+            ? fallbackModName
+            : this.modname;
+
+        this.icon = assetsPath + moduleName + '.svg';
+    }
+
+}
diff --git a/src/core/components/user-avatar/user-avatar.scss b/src/core/components/user-avatar/user-avatar.scss
index 6ae01b259..5d99ba41d 100644
--- a/src/core/components/user-avatar/user-avatar.scss
+++ b/src/core/components/user-avatar/user-avatar.scss
@@ -79,3 +79,8 @@
     left: 0;
     right: unset;
 }
+
+:host-context(ion-item) {
+    margin-top: 12px;
+    margin-bottom: 12px;
+}
\ No newline at end of file
diff --git a/src/core/directives/external-content.ts b/src/core/directives/external-content.ts
index 4dd8f719f..4d84f6845 100644
--- a/src/core/directives/external-content.ts
+++ b/src/core/directives/external-content.ts
@@ -113,8 +113,7 @@ export class CoreExternalContentDirective implements AfterViewInit, OnChanges {
      * Get the URL that should be handled and, if valid, handle it.
      */
     protected async checkAndHandleExternalContent(): Promise<void> {
-        const currentSite = CoreSites.getCurrentSite();
-        const siteId = this.siteId || currentSite?.getId();
+        const siteId = this.siteId || CoreSites.getRequiredCurrentSite().getId();
         const tagName = this.element.tagName.toUpperCase();
         let targetAttr;
         let url;
diff --git a/src/core/features/course/components/module/core-course-module.html b/src/core/features/course/components/module/core-course-module.html
index bbfebb68c..630c19e11 100644
--- a/src/core/features/course/components/module/core-course-module.html
+++ b/src/core/features/course/components/module/core-course-module.html
@@ -13,8 +13,9 @@
             [button]="module.handlerData.action && module.uservisible"
             detail="false">
 
-            <img slot="start" *ngIf="module.handlerData.icon" [src]="module.handlerData.icon" [alt]="modNameTranslated"
-                class="core-module-icon">
+            <core-mod-icon slot="start" *ngIf="module.handlerData.icon" [modicon]="module.handlerData.icon" [modname]="module.modname"
+                [componentId]="module.instance">
+            </core-mod-icon>
 
             <ion-label class="core-module-title">
                 <p class="item-heading">
diff --git a/src/core/features/course/services/course.ts b/src/core/features/course/services/course.ts
index 0e7f38649..81505df14 100644
--- a/src/core/features/course/services/course.ts
+++ b/src/core/features/course/services/course.ts
@@ -83,7 +83,7 @@ export class CoreCourseProvider {
 
     static readonly COMPONENT = 'CoreCourse';
 
-    protected readonly CORE_MODULES = [
+    readonly CORE_MODULES = [
         'assign', 'assignment', 'book', 'chat', 'choice', 'data', 'database', 'date', 'external-tool',
         'feedback', 'file', 'folder', 'forum', 'glossary', 'ims', 'imscp', 'label', 'lesson', 'lti', 'page', 'quiz',
         'resource', 'scorm', 'survey', 'url', 'wiki', 'workshop', 'h5pactivity',
@@ -402,15 +402,16 @@ export class CoreCourseProvider {
         ): Promise<CoreCourseWSSection[]> => {
             const params: CoreCourseGetContentsParams = {
                 courseid: courseId!,
-                options: [],
             };
+            params.options = [];
+
             const preSets: CoreSiteWSPreSets = {
                 omitExpires: preferCache,
                 updateFrequency: CoreSite.FREQUENCY_RARELY,
             };
 
             if (includeStealth) {
-                params.options!.push({
+                params.options.push({
                     name: 'includestealthmodules',
                     value: true,
                 });
@@ -418,13 +419,13 @@ export class CoreCourseProvider {
 
             // If modName is set, retrieve all modules of that type. Otherwise get only the module.
             if (modName) {
-                params.options!.push({
+                params.options.push({
                     name: 'modname',
                     value: modName,
                 });
                 preSets.cacheKey = this.getModuleByModNameCacheKey(modName);
             } else {
-                params.options!.push({
+                params.options.push({
                     name: 'cmid',
                     value: moduleId,
                 });
@@ -630,7 +631,11 @@ export class CoreCourseProvider {
      * @param modicon The mod icon string to use in case we are not using a core activity.
      * @return The IMG src.
      */
-    async getModuleIconSrc(moduleName: string, modicon?: string): Promise<string> {
+    async getModuleIconSrc(moduleName: string, modicon?: string, mimetypeIcon = ''): Promise<string> {
+        if (mimetypeIcon) {
+            return mimetypeIcon;
+        }
+
         if (this.CORE_MODULES.indexOf(moduleName) < 0) {
             if (modicon) {
                 return modicon;
@@ -1489,7 +1494,7 @@ export type CoreCourseWSModule = {
         label: string;
         timestamp: number;
     }[]; // @since 3.11. Activity dates.
-    contentsinfo?: { // Contents summary information.
+    contentsinfo?: { // @since v3.7.6 Contents summary information.
         filescount: number; // Total number of files.
         filessize: number; // Total files size.
         lastmodified: number; // Last time files were modified.
diff --git a/src/core/features/course/services/module-delegate.ts b/src/core/features/course/services/module-delegate.ts
index 9ff01b011..f967c89a5 100644
--- a/src/core/features/course/services/module-delegate.ts
+++ b/src/core/features/course/services/module-delegate.ts
@@ -20,7 +20,7 @@ import { CoreSite } from '@classes/site';
 import { CoreCourseModuleDefaultHandler } from './handlers/default-module';
 import { CoreDelegate, CoreDelegateHandler } from '@classes/delegate';
 import { CoreCourseAnyCourseData } from '@features/courses/services/courses';
-import { CoreCourse, CoreCourseAnyModuleData, CoreCourseWSModule } from './course';
+import { CoreCourse, CoreCourseWSModule } from './course';
 import { CoreSites } from '@services/sites';
 import { makeSingleton } from '@singletons';
 import { CoreCourseModule } from './course-helper';
diff --git a/src/core/features/grades/pages/course/course.html b/src/core/features/grades/pages/course/course.html
index c4d8ee0fd..3883ca2d3 100644
--- a/src/core/features/grades/pages/course/course.html
+++ b/src/core/features/grades/pages/course/course.html
@@ -52,8 +52,11 @@
                                 >
                                     <ion-icon *ngIf="row.icon" name="{{row.icon}}" slot="start" [attr.aria-label]="row.iconAlt">
                                     </ion-icon>
-                                    <img *ngIf="row.image" [src]="row.image" slot="start" class="core-module-icon"
+                                    <img *ngIf="row.image && !row.itemmodule" [src]="row.image" slot="start" class="core-module-icon"
                                         [alt]="row.iconAlt"/>
+                                    <core-mod-icon *ngIf="row.image && row.itemmodule" [modicon]="row.image" slot="start"
+                                        [modname]="row.itemmodule">
+                                    </core-mod-icon>
                                     <span [innerHTML]="row.gradeitem"></span>
                                 </th>
                                 <ng-container *ngFor="let column of grades.columns">
diff --git a/src/core/features/grades/pages/course/course.page.ts b/src/core/features/grades/pages/course/course.page.ts
index ee13e8248..224d9369b 100644
--- a/src/core/features/grades/pages/course/course.page.ts
+++ b/src/core/features/grades/pages/course/course.page.ts
@@ -114,7 +114,7 @@ export class CoreGradesCoursePage implements AfterViewInit, OnDestroy {
      * Update the table of grades.
      */
     private async fetchGrades(): Promise<void> {
-        const table = await CoreGrades.getCourseGradesTable(this.grades.courseId!, this.grades.userId);
+        const table = await CoreGrades.getCourseGradesTable(this.grades.courseId, this.grades.userId);
         const formattedTable = await CoreGradesHelper.formatGradesTable(table);
 
         this.grades.setTable(formattedTable);
@@ -192,7 +192,7 @@ class CoreGradesCourseManager extends CorePageItemsListManager<CoreGradesFormatt
      * @inheritdoc
      */
     protected async logActivity(): Promise<void> {
-        await CoreGrades.logCourseGradesView(this.courseId!, this.userId!);
+        await CoreGrades.logCourseGradesView(this.courseId, this.userId);
     }
 
     /**
diff --git a/src/core/features/grades/pages/course/course.scss b/src/core/features/grades/pages/course/course.scss
index aca518a0f..2f0239c09 100644
--- a/src/core/features/grades/pages/course/course.scss
+++ b/src/core/features/grades/pages/course/course.scss
@@ -82,6 +82,11 @@
             height: 16px;
         }
 
+        core-mod-icon {
+            --size: 16px;
+        }
+
+
         ion-icon {
             color: var(--icon-color);
         }
@@ -119,6 +124,11 @@
                 background-color: var(--cell-hover);
             }
         }
+
+        th, td {
+            height: var(--a11y-min-target-size);
+            vertical-align: middle;
+        }
     }
 
 }
diff --git a/src/core/features/grades/pages/grade/grade.html b/src/core/features/grades/pages/grade/grade.html
index 4b3198ee2..9abe2b1f3 100644
--- a/src/core/features/grades/pages/grade/grade.html
+++ b/src/core/features/grades/pages/grade/grade.html
@@ -17,8 +17,9 @@
             <ion-item *ngIf="grade.itemname && grade.link" class="ion-text-wrap" detail="true" [href]="grade.link" core-link
             capture="true">
                 <ion-icon *ngIf="grade.icon" name="{{grade.icon}}" slot="start" [attr.aria-label]="grade.iconAlt"></ion-icon>
-                <img *ngIf="grade.image" [src]="grade.image" slot="start" class="core-module-icon"
-                    [alt]="grade.iconAlt">
+                <img *ngIf="grade.image && !grade.itemmodule" [src]="grade.image && grade.itemmodule" slot="start" [alt]="grade.iconAlt"/>
+                <core-mod-icon *ngIf="grade.image && grade.itemmodule" [modicon]="grade.image" slot="start" [modname]="grade.itemmodule">
+                </core-mod-icon>
                 <ion-label>
                     <h2><core-format-text [text]="grade.itemname" contextLevel="course" [contextInstanceId]="courseId">
                     </core-format-text></h2>
@@ -27,7 +28,9 @@
 
             <ion-item *ngIf="grade.itemname && !grade.link" class="ion-text-wrap" >
                 <ion-icon *ngIf="grade.icon" name="{{grade.icon}}" slot="start" [attr.aria-label]="grade.iconAlt"></ion-icon>
-                <img *ngIf="grade.image" [src]="grade.image" slot="start" class="core-module-icon" [alt]="grade.iconAlt"/>
+                <img *ngIf="grade.image && !grade.itemmodule" [src]="grade.image" slot="start" [alt]="grade.iconAlt"/>
+                <core-mod-icon *ngIf="grade.image && grade.itemmodule" [modicon]="grade.image" slot="start" [modname]="grade.itemmodule">
+                </core-mod-icon>
                 <ion-label>
                     <h2><core-format-text [text]="grade.itemname" contextLevel="course" [contextInstanceId]="courseId">
                     </core-format-text></h2>
diff --git a/src/core/features/tag/components/feed/core-tag-feed.html b/src/core/features/tag/components/feed/core-tag-feed.html
index b0f626f67..1be13ee74 100644
--- a/src/core/features/tag/components/feed/core-tag-feed.html
+++ b/src/core/features/tag/components/feed/core-tag-feed.html
@@ -3,8 +3,8 @@
         <img [src]="item.avatarUrl" core-external-content alt="" role="presentation"
             onError="this.src='assets/img/user-avatar.png'">
     </ion-avatar>
-    <img slot="start" *ngIf="item.iconUrl" [src]="item.iconUrl" core-external-content alt="" role="presentation"
-        class="core-module-icon">
+    <core-mod-icon *ngIf="item.iconUrl" [modicon]="item.iconUrl" slot="start" [showAlt]="false">
+    </core-mod-icon>
     <ion-label>
         <h2>{{ item.heading }}</h2>
         <p *ngFor="let text of item.details">{{ text }}</p>
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index ef149d2ca..0253a989c 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -527,36 +527,10 @@ img[core-external-content]:not([src]) {
     visibility: hidden;
 }
 
-// Activity modules
-.core-module-icon {
-    --size: var(--module-icon-size);
-    width: var(--size);
-    height: var(--size);
-    max-width: var(--size);
-    max-height: var(--size);
-}
-
-ion-item img.core-module-icon[slot="start"] {
-    margin-top: 12px;
-    margin-bottom: 12px;
-    margin-right: 32px;
-}
-
-ion-card ion-item img.core-module-icon[slot="start"] {
-    margin-top: 12px;
-    margin-bottom: 12px;
-    margin-right: 12px;
-}
-
 ion-card ion-item:only-child {
     --inner-border-width: 0;
 }
 
-[dir=rtl] ion-item img.core-module-icon[slot="start"] {
-    margin-right: unset;
-    margin-left: 32px;
-}
-
 .core-course-module-handler:not(.addon-mod-label-handler) .item-heading .filter_mathjaxloader_equation div {
     display: inline !important;
 }

From eb34039be905990a008defe208a1eff0e8189e21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 28 Sep 2021 12:17:17 +0200
Subject: [PATCH 0118/1008] MOBILE-2748 github: Ignore warnings during linter
 on testing

---
 .github/workflows/testing.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 5b10f13a3..6e5aed17e 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -51,8 +51,8 @@ jobs:
           echo "Found $found missing langkeys"
           exit 1
         fi
-    - name: Run Linter
-      run: npm run lint
+    - name: Run Linter (ignore warnings)
+      run: npm run lint -- --quiet
     - name: Run tests
       run: npm run test:ci
     - name: Production builds

From 59d3a761a49e9856cf843c864c238089150c836b Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 30 Sep 2021 12:39:36 +0200
Subject: [PATCH 0119/1008] MOBILE-3868 user: Fix problems when using site home
 ID in profile

---
 package-lock.json                             | 31435 +++++++++++++++-
 .../pages/user-badges/user-badges.page.ts     |     7 +-
 .../user/pages/profile/profile.page.ts        |    42 +-
 3 files changed, 31406 insertions(+), 78 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a8cec7166..e781ced49 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,8 +1,31311 @@
 {
   "name": "moodlemobile",
   "version": "3.9.6-dev",
-  "lockfileVersion": 1,
+  "lockfileVersion": 2,
   "requires": true,
+  "packages": {
+    "": {
+      "name": "moodlemobile",
+      "version": "3.9.6-dev",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@angular/animations": "~10.0.14",
+        "@angular/common": "~10.0.14",
+        "@angular/core": "~10.0.14",
+        "@angular/forms": "~10.0.14",
+        "@angular/platform-browser": "~10.0.14",
+        "@angular/platform-browser-dynamic": "~10.0.14",
+        "@angular/router": "~10.0.14",
+        "@ionic-native/badge": "^5.33.0",
+        "@ionic-native/camera": "^5.33.0",
+        "@ionic-native/chooser": "^5.33.0",
+        "@ionic-native/clipboard": "^5.33.0",
+        "@ionic-native/core": "^5.33.0",
+        "@ionic-native/device": "^5.33.0",
+        "@ionic-native/diagnostic": "^5.33.0",
+        "@ionic-native/file": "^5.33.0",
+        "@ionic-native/file-opener": "^5.33.0",
+        "@ionic-native/file-transfer": "^5.33.0",
+        "@ionic-native/geolocation": "^5.33.0",
+        "@ionic-native/http": "^5.33.0",
+        "@ionic-native/in-app-browser": "^5.33.0",
+        "@ionic-native/ionic-webview": "^5.33.0",
+        "@ionic-native/keyboard": "^5.33.0",
+        "@ionic-native/local-notifications": "^5.33.0",
+        "@ionic-native/media": "^5.33.0",
+        "@ionic-native/media-capture": "^5.33.0",
+        "@ionic-native/network": "^5.33.0",
+        "@ionic-native/push": "^5.33.0",
+        "@ionic-native/qr-scanner": "^5.33.0",
+        "@ionic-native/splash-screen": "^5.33.0",
+        "@ionic-native/sqlite": "^5.33.0",
+        "@ionic-native/status-bar": "^5.33.0",
+        "@ionic-native/web-intent": "^5.33.0",
+        "@ionic-native/zip": "^5.33.0",
+        "@ionic/angular": "^5.6.6",
+        "@moodlehq/cordova-plugin-file-transfer": "1.7.1-moodle.2",
+        "@moodlehq/cordova-plugin-inappbrowser": "5.0.0-moodle.2",
+        "@moodlehq/cordova-plugin-ionic-webview": "5.0.0-moodle.1",
+        "@moodlehq/cordova-plugin-local-notification": "0.9.0-moodle.3",
+        "@moodlehq/cordova-plugin-qrscanner": "3.0.1-moodle.2",
+        "@moodlehq/phonegap-plugin-push": "2.0.0-moodle.2",
+        "@ngx-translate/core": "^13.0.0",
+        "@ngx-translate/http-loader": "^6.0.0",
+        "@types/chart.js": "^2.9.31",
+        "@types/cordova": "0.0.34",
+        "@types/dom-mediacapture-record": "^1.0.7",
+        "chart.js": "^2.9.4",
+        "com-darryncampbell-cordova-plugin-intent": "^1.3.0",
+        "cordova": "^10.0.0",
+        "cordova-android": "^9.1.0",
+        "cordova-android-support-gradle-release": "^3.0.1",
+        "cordova-clipboard": "^1.3.0",
+        "cordova-ios": "^6.2.0",
+        "cordova-plugin-add-swift-support": "^2.0.2",
+        "cordova-plugin-advanced-http": "^3.1.0",
+        "cordova-plugin-badge": "^0.8.8",
+        "cordova-plugin-camera": "^5.0.1",
+        "cordova-plugin-chooser": "^1.3.2",
+        "cordova-plugin-customurlscheme": "^5.0.2",
+        "cordova-plugin-device": "^2.0.3",
+        "cordova-plugin-file": "^6.0.2",
+        "cordova-plugin-file-opener2": "^3.0.5",
+        "cordova-plugin-geolocation": "^4.1.0",
+        "cordova-plugin-globalization": "^1.11.0",
+        "cordova-plugin-ionic-keyboard": "^2.2.0",
+        "cordova-plugin-media": "^5.0.3",
+        "cordova-plugin-media-capture": "^3.0.3",
+        "cordova-plugin-network-information": "^2.0.2",
+        "cordova-plugin-prevent-override": "^1.0.0",
+        "cordova-plugin-screen-orientation": "^3.0.2",
+        "cordova-plugin-splashscreen": "^6.0.0",
+        "cordova-plugin-statusbar": "^2.4.3",
+        "cordova-plugin-whitelist": "^1.3.4",
+        "cordova-plugin-wkuserscript": "^1.0.0",
+        "cordova-plugin-wkwebview-cookies": "^1.0.0",
+        "cordova-plugin-zip": "^3.1.0",
+        "cordova-sqlite-storage": "^6.0.0",
+        "cordova-support-google-services": "^1.2.1",
+        "cordova.plugins.diagnostic": "^5.0.2",
+        "core-js": "^3.9.1",
+        "es6-promise-plugin": "^4.2.2",
+        "jszip": "^3.5.0",
+        "mathjax": "2.7.7",
+        "moment": "^2.29.0",
+        "nl.kingsquare.cordova.background-audio": "^1.0.1",
+        "rxjs": "~6.5.5",
+        "ts-md5": "^1.2.7",
+        "tslib": "^2.0.1",
+        "zone.js": "~0.10.3"
+      },
+      "devDependencies": {
+        "@angular-builders/custom-webpack": "^10.0.1",
+        "@angular-devkit/architect": "^0.1202.7",
+        "@angular-devkit/build-angular": "~0.1000.8",
+        "@angular-eslint/builder": "^4.2.0",
+        "@angular-eslint/eslint-plugin": "^4.2.0",
+        "@angular-eslint/eslint-plugin-template": "^4.2.0",
+        "@angular-eslint/schematics": "^4.2.0",
+        "@angular-eslint/template-parser": "^4.2.0",
+        "@angular/cli": "~10.0.8",
+        "@angular/compiler": "~10.0.14",
+        "@angular/compiler-cli": "~10.0.14",
+        "@angular/language-service": "~10.0.14",
+        "@ionic/angular-toolkit": "^2.3.3",
+        "@ionic/cli": "^6.14.1",
+        "@types/faker": "^5.1.3",
+        "@types/node": "^12.12.64",
+        "@types/resize-observer-browser": "^0.1.5",
+        "@types/webpack-env": "^1.16.0",
+        "@typescript-eslint/eslint-plugin": "^4.22.0",
+        "@typescript-eslint/parser": "^4.22.0",
+        "check-es-compat": "^1.1.1",
+        "cordova-plugin-androidx-adapter": "^1.1.3",
+        "eslint": "^7.25.0",
+        "eslint-config-prettier": "^8.3.0",
+        "eslint-plugin-header": "^3.1.1",
+        "eslint-plugin-import": "^2.22.1",
+        "eslint-plugin-jest": "^24.3.6",
+        "eslint-plugin-jsdoc": "^32.3.3",
+        "eslint-plugin-prefer-arrow": "^1.2.3",
+        "eslint-plugin-promise": "^5.1.0",
+        "faker": "^5.1.0",
+        "fs-extra": "^9.1.0",
+        "gulp": "4.0.2",
+        "gulp-clip-empty-files": "^0.1.2",
+        "gulp-concat": "^2.6.1",
+        "gulp-flatten": "^0.4.0",
+        "gulp-htmlmin": "^5.0.1",
+        "gulp-rename": "^2.0.0",
+        "gulp-slash": "^1.1.3",
+        "jest": "^26.5.2",
+        "jest-preset-angular": "^8.3.1",
+        "jsonc-parser": "^2.3.1",
+        "native-run": "^1.4.0",
+        "terser-webpack-plugin": "^4.2.3",
+        "ts-jest": "^26.4.1",
+        "ts-node": "~8.3.0",
+        "typescript": "^3.9.9"
+      },
+      "engines": {
+        "node": ">=14.15.0 <15"
+      },
+      "optionalDependencies": {
+        "keytar": "^7.2.0"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/@angular-builders/custom-webpack/-/custom-webpack-10.0.1.tgz",
+      "integrity": "sha512-YDy5zEKVwXdoXLjmbsY6kGaEbmunQxaPipxrwLUc9hIjRLU2WcrX9vopf1R9Pgj4POad73IPBNGu+ibqNRFIEQ==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/architect": ">=0.1000.0 < 0.1100.0",
+        "@angular-devkit/build-angular": ">=0.1000.0 < 0.1100.0",
+        "@angular-devkit/core": "^10.0.0",
+        "lodash": "^4.17.15",
+        "ts-node": "^9.0.0",
+        "webpack-merge": "^4.2.2"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/@angular-devkit/architect": {
+      "version": "0.1002.3",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1002.3.tgz",
+      "integrity": "sha512-7ainXRNO1njZ6bBbJXGpMzCh0OYrzuIRe/+zRj0ncV1YfEsJb2yWBuiza0+y2Ljco7hdd4wr+7eJm7cfn+NvAw==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "10.2.3",
+        "rxjs": "6.6.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": "^6.11.0 || ^7.5.6",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/@angular-devkit/core": {
+      "version": "10.2.3",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.2.3.tgz",
+      "integrity": "sha512-pMM1v9Xjqx6YLOQxQYs0D+03H6XPDZLS8cyEtoQX2iYdh8qlKHZVbJa2WsfzwMoIPtgcXfQAXn113VEgrQPLFA==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "6.12.4",
+        "fast-json-stable-stringify": "2.1.0",
+        "magic-string": "0.25.7",
+        "rxjs": "6.6.2",
+        "source-map": "0.7.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": "^6.11.0 || ^7.5.6",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/ajv": {
+      "version": "6.12.4",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz",
+      "integrity": "sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/rxjs": {
+      "version": "6.6.2",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.2.tgz",
+      "integrity": "sha512-BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/ts-node": {
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-9.1.1.tgz",
+      "integrity": "sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg==",
+      "dev": true,
+      "dependencies": {
+        "arg": "^4.1.0",
+        "create-require": "^1.1.0",
+        "diff": "^4.0.1",
+        "make-error": "^1.1.1",
+        "source-map-support": "^0.5.17",
+        "yn": "3.1.1"
+      },
+      "bin": {
+        "ts-node": "dist/bin.js",
+        "ts-node-script": "dist/bin-script.js",
+        "ts-node-transpile-only": "dist/bin-transpile.js",
+        "ts-script": "dist/bin-script-deprecated.js"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "typescript": ">=2.7"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
+    "node_modules/@angular-devkit/architect": {
+      "version": "0.1202.7",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1202.7.tgz",
+      "integrity": "sha512-zqqw3h8jMDYsRrXUNY1J8xtUl6wmBO++yTka+CoEIFetNdLdoWmb5VpaA81i0aSBhXBgnBUUFvqZGdiI7BbV8A==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "12.2.7",
+        "rxjs": "6.6.7"
+      },
+      "engines": {
+        "node": "^12.14.1 || >=14.0.0",
+        "npm": "^6.11.0 || ^7.5.6",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular-devkit/architect/node_modules/rxjs": {
+      "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/@angular-devkit/architect/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
+    "node_modules/@angular-devkit/build-angular": {
+      "version": "0.1000.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.1000.8.tgz",
+      "integrity": "sha512-wwDN2oadQvYPL7lDmvGsoWQjW++0ZnxWk1QVlABGhBSIs8Uxs26Hjd5YNUSsvJavBkqb1UZIOilqzb4dig5MIA==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/architect": "0.1000.8",
+        "@angular-devkit/build-optimizer": "0.1000.8",
+        "@angular-devkit/build-webpack": "0.1000.8",
+        "@angular-devkit/core": "10.0.8",
+        "@babel/core": "7.9.6",
+        "@babel/generator": "7.9.6",
+        "@babel/plugin-transform-runtime": "7.9.6",
+        "@babel/preset-env": "7.9.6",
+        "@babel/runtime": "7.9.6",
+        "@babel/template": "7.8.6",
+        "@jsdevtools/coverage-istanbul-loader": "3.0.3",
+        "@ngtools/webpack": "10.0.8",
+        "ajv": "6.12.3",
+        "autoprefixer": "9.8.0",
+        "babel-loader": "8.1.0",
+        "browserslist": "^4.9.1",
+        "cacache": "15.0.3",
+        "caniuse-lite": "^1.0.30001032",
+        "circular-dependency-plugin": "5.2.0",
+        "copy-webpack-plugin": "6.0.3",
+        "core-js": "3.6.4",
+        "css-loader": "3.5.3",
+        "cssnano": "4.1.10",
+        "file-loader": "6.0.0",
+        "find-cache-dir": "3.3.1",
+        "glob": "7.1.6",
+        "jest-worker": "26.0.0",
+        "karma-source-map-support": "1.4.0",
+        "less-loader": "6.1.0",
+        "license-webpack-plugin": "2.2.0",
+        "loader-utils": "2.0.0",
+        "mini-css-extract-plugin": "0.9.0",
+        "minimatch": "3.0.4",
+        "open": "7.0.4",
+        "parse5": "4.0.0",
+        "pnp-webpack-plugin": "1.6.4",
+        "postcss": "7.0.31",
+        "postcss-import": "12.0.1",
+        "postcss-loader": "3.0.0",
+        "raw-loader": "4.0.1",
+        "regenerator-runtime": "0.13.5",
+        "resolve-url-loader": "3.1.1",
+        "rimraf": "3.0.2",
+        "rollup": "2.10.9",
+        "rxjs": "6.5.5",
+        "sass": "1.26.5",
+        "sass-loader": "8.0.2",
+        "semver": "7.3.2",
+        "source-map": "0.7.3",
+        "source-map-loader": "1.0.0",
+        "source-map-support": "0.5.19",
+        "speed-measure-webpack-plugin": "1.3.3",
+        "style-loader": "1.2.1",
+        "stylus": "0.54.7",
+        "stylus-loader": "3.0.2",
+        "terser": "4.7.0",
+        "terser-webpack-plugin": "3.0.1",
+        "tree-kill": "1.2.2",
+        "webpack": "4.43.0",
+        "webpack-dev-middleware": "3.7.2",
+        "webpack-dev-server": "3.11.0",
+        "webpack-merge": "4.2.2",
+        "webpack-sources": "1.4.3",
+        "webpack-subresource-integrity": "1.4.1",
+        "worker-plugin": "4.0.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
+        "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "@angular/compiler-cli": ">=10.0.0-next.0 < 11",
+        "typescript": ">=3.9 < 3.10"
+      },
+      "peerDependenciesMeta": {
+        "@angular/localize": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/architect": {
+      "version": "0.1000.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1000.8.tgz",
+      "integrity": "sha512-2AqPbiEugtPxNz4MGhLh+imUVelhW9h1cdJs2AbxZosIxftPb5DNDQUSAwVmRGp4CtcXVrlvcDwc0f4Fw1aiIA==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "10.0.8",
+        "rxjs": "6.5.5"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/core": {
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
+      "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "6.12.3",
+        "fast-json-stable-stringify": "2.1.0",
+        "magic-string": "0.25.7",
+        "rxjs": "6.5.5",
+        "source-map": "0.7.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/ajv": {
+      "version": "6.12.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/core-js": {
+      "version": "3.6.4",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
+      "integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/open": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/open/-/open-7.0.4.tgz",
+      "integrity": "sha512-brSA+/yq+b08Hsr4c8fsEW2CRzk1BmfN3SAK/5VCHQ9bdoZJ4qa/+AfR0xHjlbbZUyPkUHs1b8x1RqdyZdkVqQ==",
+      "dev": true,
+      "dependencies": {
+        "is-docker": "^2.0.0",
+        "is-wsl": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/serialize-javascript": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz",
+      "integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==",
+      "dev": true,
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/terser-webpack-plugin": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-3.0.1.tgz",
+      "integrity": "sha512-eFDtq8qPUEa9hXcUzTwKXTnugIVtlqc1Z/ZVhG8LmRT3lgRY13+pQTnFLY2N7ATB6TKCHuW/IGjoAnZz9wOIqw==",
+      "dev": true,
+      "dependencies": {
+        "cacache": "^15.0.3",
+        "find-cache-dir": "^3.3.1",
+        "jest-worker": "^26.0.0",
+        "p-limit": "^2.3.0",
+        "schema-utils": "^2.6.6",
+        "serialize-javascript": "^3.0.0",
+        "source-map": "^0.6.1",
+        "terser": "^4.6.13",
+        "webpack-sources": "^1.4.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/terser-webpack-plugin/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-optimizer": {
+      "version": "0.1000.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.1000.8.tgz",
+      "integrity": "sha512-esODHuTGEEMx1SmLUq03VAMly8gZUd1vRuvZeKS5HqKwDg8ZzcI7/25BuuUSlyST+6BEdjo2gnmagQnG0VBdQw==",
+      "dev": true,
+      "dependencies": {
+        "loader-utils": "2.0.0",
+        "source-map": "0.7.3",
+        "tslib": "2.0.0",
+        "webpack-sources": "1.4.3"
+      },
+      "bin": {
+        "build-optimizer": "src/build-optimizer/cli.js"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-optimizer/node_modules/tslib": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.0.tgz",
+      "integrity": "sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==",
+      "dev": true
+    },
+    "node_modules/@angular-devkit/build-webpack": {
+      "version": "0.1000.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1000.8.tgz",
+      "integrity": "sha512-y/U+dV5N8W7KECncGSKQWoUH/DFNZCseczyl6LAd8bc0fMr8Z0TAIe8OXj+5CSRRdejWfRIxGtNWM+L2kTCU8A==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/architect": "0.1000.8",
+        "@angular-devkit/core": "10.0.8",
+        "rxjs": "6.5.5"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
+        "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "webpack": "^4.6.0",
+        "webpack-dev-server": "^3.1.4"
+      }
+    },
+    "node_modules/@angular-devkit/build-webpack/node_modules/@angular-devkit/architect": {
+      "version": "0.1000.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1000.8.tgz",
+      "integrity": "sha512-2AqPbiEugtPxNz4MGhLh+imUVelhW9h1cdJs2AbxZosIxftPb5DNDQUSAwVmRGp4CtcXVrlvcDwc0f4Fw1aiIA==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "10.0.8",
+        "rxjs": "6.5.5"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-webpack/node_modules/@angular-devkit/core": {
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
+      "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "6.12.3",
+        "fast-json-stable-stringify": "2.1.0",
+        "magic-string": "0.25.7",
+        "rxjs": "6.5.5",
+        "source-map": "0.7.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-webpack/node_modules/ajv": {
+      "version": "6.12.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@angular-devkit/core": {
+      "version": "12.2.7",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-12.2.7.tgz",
+      "integrity": "sha512-WeLlDZaudpx10OGDPfVcWu/CaEWiWzAaLTUQz0Ww/yM+01FxR/P8yeH1sYAV1MS6d6KHvXGw7Lpf8PV7IA/zHA==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "8.6.2",
+        "ajv-formats": "2.1.0",
+        "fast-json-stable-stringify": "2.1.0",
+        "magic-string": "0.25.7",
+        "rxjs": "6.6.7",
+        "source-map": "0.7.3"
+      },
+      "engines": {
+        "node": "^12.14.1 || >=14.0.0",
+        "npm": "^6.11.0 || ^7.5.6",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular-devkit/core/node_modules/ajv": {
+      "version": "8.6.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.2.tgz",
+      "integrity": "sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@angular-devkit/core/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
+    },
+    "node_modules/@angular-devkit/core/node_modules/rxjs": {
+      "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/@angular-devkit/core/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
+    "node_modules/@angular-devkit/schematics": {
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.0.8.tgz",
+      "integrity": "sha512-p2PjvrExuzOe/azyOEcBeIgwZIk4D6VeLkJf/KVjhXOVu13pjIXHX7/qWl+IYnbtj3NZGHqXM5Cr8nxsJNIMpw==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "10.0.8",
+        "ora": "4.0.4",
+        "rxjs": "6.5.5"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular-devkit/schematics/node_modules/@angular-devkit/core": {
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
+      "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "6.12.3",
+        "fast-json-stable-stringify": "2.1.0",
+        "magic-string": "0.25.7",
+        "rxjs": "6.5.5",
+        "source-map": "0.7.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular-devkit/schematics/node_modules/ajv": {
+      "version": "6.12.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@angular-eslint/builder": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-4.2.0.tgz",
+      "integrity": "sha512-qM4hpweuQ14ul8CU6LKpUWFZs6POUE7HZKdTllUrYuoZMrTpNB1XGelR0pweYzbfo4XRnUaO1NVgWhWOWiD5MA==",
+      "dev": true,
+      "peerDependencies": {
+        "@angular/cli": ">= 11.2.0 < 12.0.0",
+        "eslint": "*",
+        "typescript": "*"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-4.2.0.tgz",
+      "integrity": "sha512-G8D8Pso6GcHW8vFkUSvgoKPIOtGTqO+eb5aytGtpogMgzxBRyr0juU/9Uz5dAhO6TOERIj1gPpJQ61R/n/Aaew==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/experimental-utils": "4.16.1"
+      },
+      "peerDependencies": {
+        "@angular/compiler": ">= 11.2.0 < 12.0.0",
+        "eslint": "*",
+        "typescript": "*"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin-template": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-4.2.0.tgz",
+      "integrity": "sha512-LC8qqqqVmA/OJAsUt6fQCXLmWP5BL30XFvVsPtrORdxMFt0HI1gvkuz5EVak7PeAXEmerdVarNZr5zmCXIWf3g==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/experimental-utils": "4.16.1",
+        "aria-query": "^4.2.2",
+        "axobject-query": "^2.2.0"
+      },
+      "peerDependencies": {
+        "@angular-eslint/template-parser": "*",
+        "@angular/compiler": ">= 11.2.0 < 12.0.0",
+        "eslint": "*",
+        "typescript": "*"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/experimental-utils": {
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.16.1.tgz",
+      "integrity": "sha512-0Hm3LSlMYFK17jO4iY3un1Ve9x1zLNn4EM50Lia+0EV99NdbK+cn0er7HC7IvBA23mBg3P+8dUkMXy4leL33UQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.3",
+        "@typescript-eslint/scope-manager": "4.16.1",
+        "@typescript-eslint/types": "4.16.1",
+        "@typescript-eslint/typescript-estree": "4.16.1",
+        "eslint-scope": "^5.0.0",
+        "eslint-utils": "^2.0.0"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "*"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/scope-manager": {
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.16.1.tgz",
+      "integrity": "sha512-6IlZv9JaurqV0jkEg923cV49aAn8V6+1H1DRfhRcvZUrptQ+UtSKHb5kwTayzOYTJJ/RsYZdcvhOEKiBLyc0Cw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.16.1",
+        "@typescript-eslint/visitor-keys": "4.16.1"
+      },
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/types": {
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.16.1.tgz",
+      "integrity": "sha512-nnKqBwMgRlhzmJQF8tnFDZWfunXmJyuXj55xc8Kbfup4PbkzdoDXZvzN8//EiKR27J6vUSU8j4t37yUuYPiLqA==",
+      "dev": true,
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.16.1.tgz",
+      "integrity": "sha512-m8I/DKHa8YbeHt31T+UGd/l8Kwr0XCTCZL3H4HMvvLCT7HU9V7yYdinTOv1gf/zfqNeDcCgaFH2BMsS8x6NvJg==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.16.1",
+        "@typescript-eslint/visitor-keys": "4.16.1",
+        "debug": "^4.1.1",
+        "globby": "^11.0.1",
+        "is-glob": "^4.0.1",
+        "semver": "^7.3.2",
+        "tsutils": "^3.17.1"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.16.1.tgz",
+      "integrity": "sha512-s/aIP1XcMkEqCNcPQtl60ogUYjSM8FU2mq1O7y5cFf3Xcob1z1iXWNB6cC43Op+NGRTFgGolri6s8z/efA9i1w==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.16.1",
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/experimental-utils": {
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.16.1.tgz",
+      "integrity": "sha512-0Hm3LSlMYFK17jO4iY3un1Ve9x1zLNn4EM50Lia+0EV99NdbK+cn0er7HC7IvBA23mBg3P+8dUkMXy4leL33UQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.3",
+        "@typescript-eslint/scope-manager": "4.16.1",
+        "@typescript-eslint/types": "4.16.1",
+        "@typescript-eslint/typescript-estree": "4.16.1",
+        "eslint-scope": "^5.0.0",
+        "eslint-utils": "^2.0.0"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "*"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.16.1.tgz",
+      "integrity": "sha512-6IlZv9JaurqV0jkEg923cV49aAn8V6+1H1DRfhRcvZUrptQ+UtSKHb5kwTayzOYTJJ/RsYZdcvhOEKiBLyc0Cw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.16.1",
+        "@typescript-eslint/visitor-keys": "4.16.1"
+      },
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.16.1.tgz",
+      "integrity": "sha512-nnKqBwMgRlhzmJQF8tnFDZWfunXmJyuXj55xc8Kbfup4PbkzdoDXZvzN8//EiKR27J6vUSU8j4t37yUuYPiLqA==",
+      "dev": true,
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.16.1.tgz",
+      "integrity": "sha512-m8I/DKHa8YbeHt31T+UGd/l8Kwr0XCTCZL3H4HMvvLCT7HU9V7yYdinTOv1gf/zfqNeDcCgaFH2BMsS8x6NvJg==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.16.1",
+        "@typescript-eslint/visitor-keys": "4.16.1",
+        "debug": "^4.1.1",
+        "globby": "^11.0.1",
+        "is-glob": "^4.0.1",
+        "semver": "^7.3.2",
+        "tsutils": "^3.17.1"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.16.1.tgz",
+      "integrity": "sha512-s/aIP1XcMkEqCNcPQtl60ogUYjSM8FU2mq1O7y5cFf3Xcob1z1iXWNB6cC43Op+NGRTFgGolri6s8z/efA9i1w==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.16.1",
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin/node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@angular-eslint/schematics": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-4.2.0.tgz",
+      "integrity": "sha512-aohGcfYUqN2hFLWaZoOqkLDyYVDFoLC3LwgIknoaDqWkvFG/RUTg1X1pCFjddLQYP5ist8+OppHH+gnYMbftEw==",
+      "dev": true,
+      "dependencies": {
+        "@angular-eslint/eslint-plugin": "4.2.0",
+        "@angular-eslint/eslint-plugin-template": "4.2.0",
+        "ignore": "5.1.8",
+        "strip-json-comments": "3.1.1",
+        "tmp": "0.2.1"
+      },
+      "peerDependencies": {
+        "@angular/cli": ">= 11.2.0 < 12.0.0"
+      }
+    },
+    "node_modules/@angular-eslint/schematics/node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular-eslint/template-parser": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-4.2.0.tgz",
+      "integrity": "sha512-77lJ9MDNWmW4ik9l3g149iO9SGRx3qLGZvfSTwmbPxpCgNripWerla9Ia1X+gLkitI8CLpcpiZybxH3EWxj/qQ==",
+      "dev": true,
+      "dependencies": {
+        "eslint-scope": "^5.1.0"
+      },
+      "peerDependencies": {
+        "@angular/compiler": ">= 11.2.0 < 12.0.0",
+        "eslint": "*",
+        "typescript": "*"
+      }
+    },
+    "node_modules/@angular-eslint/template-parser/node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@angular/animations": {
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-10.0.14.tgz",
+      "integrity": "sha512-0BOGQOuaudIG0pq6FAnG55teKM7tEQZdIwdoOf0okhh9n0cFWSWRUjvUxWt25bWswlO+HxELyJioiRUvVSES4g==",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@angular/core": "10.0.14"
+      }
+    },
+    "node_modules/@angular/cli": {
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-10.0.8.tgz",
+      "integrity": "sha512-unTteffLepsFw7qQulHOLLyLqCpQMOaZo0WO4x6cQGcW2mc0WgwnwBW2JDYMx1U2434t/Q13LqYMPNYWyCGsog==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "@angular-devkit/architect": "0.1000.8",
+        "@angular-devkit/core": "10.0.8",
+        "@angular-devkit/schematics": "10.0.8",
+        "@schematics/angular": "10.0.8",
+        "@schematics/update": "0.1000.8",
+        "@yarnpkg/lockfile": "1.1.0",
+        "ansi-colors": "4.1.1",
+        "debug": "4.1.1",
+        "ini": "1.3.5",
+        "inquirer": "7.1.0",
+        "npm-package-arg": "8.0.1",
+        "npm-pick-manifest": "6.1.0",
+        "open": "7.0.4",
+        "pacote": "9.5.12",
+        "read-package-tree": "5.3.1",
+        "rimraf": "3.0.2",
+        "semver": "7.3.2",
+        "symbol-observable": "1.2.0",
+        "universal-analytics": "0.4.20",
+        "uuid": "8.1.0"
+      },
+      "bin": {
+        "ng": "bin/ng"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/@angular-devkit/architect": {
+      "version": "0.1000.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1000.8.tgz",
+      "integrity": "sha512-2AqPbiEugtPxNz4MGhLh+imUVelhW9h1cdJs2AbxZosIxftPb5DNDQUSAwVmRGp4CtcXVrlvcDwc0f4Fw1aiIA==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "10.0.8",
+        "rxjs": "6.5.5"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/@angular-devkit/core": {
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
+      "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "6.12.3",
+        "fast-json-stable-stringify": "2.1.0",
+        "magic-string": "0.25.7",
+        "rxjs": "6.5.5",
+        "source-map": "0.7.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/ajv": {
+      "version": "6.12.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/ansi-colors": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/ansi-escapes": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
+      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.11.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/cli-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+      "dev": true,
+      "dependencies": {
+        "restore-cursor": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/debug": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/@angular/cli/node_modules/figures": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+      "dev": true,
+      "dependencies": {
+        "escape-string-regexp": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/inquirer": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz",
+      "integrity": "sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^3.0.0",
+        "cli-cursor": "^3.1.0",
+        "cli-width": "^2.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^3.0.0",
+        "lodash": "^4.17.15",
+        "mute-stream": "0.0.8",
+        "run-async": "^2.4.0",
+        "rxjs": "^6.5.3",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "through": "^2.3.6"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@angular/cli/node_modules/open": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/open/-/open-7.0.4.tgz",
+      "integrity": "sha512-brSA+/yq+b08Hsr4c8fsEW2CRzk1BmfN3SAK/5VCHQ9bdoZJ4qa/+AfR0xHjlbbZUyPkUHs1b8x1RqdyZdkVqQ==",
+      "dev": true,
+      "dependencies": {
+        "is-docker": "^2.0.0",
+        "is-wsl": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/restore-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "dev": true,
+      "dependencies": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/string-width": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/type-fest": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
+      "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/uuid": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.1.0.tgz",
+      "integrity": "sha512-CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg==",
+      "dev": true,
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/@angular/common": {
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-10.0.14.tgz",
+      "integrity": "sha512-EOAuaMt2HwJF3DtIJ/ksHtnF8Pqh5K2rWISYLEs9R3WNaSGn74kbCODAT4pNhI8P22Ykl3H4FmQUgnDZ3uDAUg==",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@angular/core": "10.0.14",
+        "rxjs": "^6.5.3"
+      }
+    },
+    "node_modules/@angular/compiler": {
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-10.0.14.tgz",
+      "integrity": "sha512-lYNo6/MmnYAVFoDQDBB6HMFd9zHg3RHXc6hn+wchU0XSWiIsg6WYHbKOb/DyqUEyKebzy0gSKZf7gUeZHtj62Q==",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      }
+    },
+    "node_modules/@angular/compiler-cli": {
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-10.0.14.tgz",
+      "integrity": "sha512-WK+S90sjc+3iMo8/CuuAX0RdGFwyA9esqqC5fYG/MDZjKuPuhogiimmR0rY3P1Th7B9di8x012xiILbf4GsGUQ==",
+      "dev": true,
+      "dependencies": {
+        "canonical-path": "1.0.0",
+        "chokidar": "^3.0.0",
+        "convert-source-map": "^1.5.1",
+        "dependency-graph": "^0.7.2",
+        "fs-extra": "4.0.2",
+        "magic-string": "^0.25.0",
+        "minimist": "^1.2.0",
+        "reflect-metadata": "^0.1.2",
+        "semver": "^6.3.0",
+        "source-map": "^0.6.1",
+        "sourcemap-codec": "^1.4.8",
+        "tslib": "^2.0.0",
+        "yargs": "15.3.0"
+      },
+      "bin": {
+        "ivy-ngcc": "ngcc/main-ivy-ngcc.js",
+        "ng-xi18n": "src/extract_i18n.js",
+        "ngc": "src/main.js",
+        "ngcc": "ngcc/main-ngcc.js"
+      },
+      "engines": {
+        "node": ">=10.0"
+      },
+      "peerDependencies": {
+        "@angular/compiler": "10.0.14",
+        "typescript": ">=3.9 <4.0"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/cliui": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.0"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/@angular/compiler-cli/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/fs-extra": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.2.tgz",
+      "integrity": "sha1-+RcExT0bRh+JNFKwwwfZmXZHq2s=",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "dev": true,
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/string-width": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/yargs": {
+      "version": "15.3.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.0.tgz",
+      "integrity": "sha512-g/QCnmjgOl1YJjGsnUg2SatC7NUYEiLXJqxNOQU9qSpjzGtGXda9b+OKccr1kLTy8BN9yqEyqfq5lxlwdc13TA==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^6.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^4.1.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^4.2.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^18.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/yargs-parser": {
+      "version": "18.1.3",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@angular/core": {
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-10.0.14.tgz",
+      "integrity": "sha512-m+c9g6fA/gE+6K7It01b6r8TEmbuFjUZajQ9gG/pzist0mTBcqfvn0O4h5X+ebnSgw/bbnnp+4PbaXEi1pOWZQ==",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "rxjs": "^6.5.3",
+        "zone.js": "~0.10.3"
+      }
+    },
+    "node_modules/@angular/forms": {
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-10.0.14.tgz",
+      "integrity": "sha512-McKh3rXDlAE7qmCnyWKENb2HhqAT+1dsAfChuqs0w8jhKkoRgA00RDFee6dZ6XQCc907DwuV0K8+wC3CvBp35w==",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@angular/common": "10.0.14",
+        "@angular/core": "10.0.14",
+        "@angular/platform-browser": "10.0.14",
+        "rxjs": "^6.5.3"
+      }
+    },
+    "node_modules/@angular/language-service": {
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-10.0.14.tgz",
+      "integrity": "sha512-QQLYUjD0T6u2hLNYXUEUbupAGsz5egmhCAckaQojvXCe3SLL/hQsrK4odrNuspy7TvMB0H5ZNEHGlF6m/WLZ3g==",
+      "dev": true
+    },
+    "node_modules/@angular/platform-browser": {
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-10.0.14.tgz",
+      "integrity": "sha512-DcBZ1wt2TwtXrdcmCTWanAzu2Vxk5Uvioam0UcDxcgXD84T2fHipyfZVn07fMqRvzFQj45tDNAEevFBnGZar4w==",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@angular/animations": "10.0.14",
+        "@angular/common": "10.0.14",
+        "@angular/core": "10.0.14"
+      },
+      "peerDependenciesMeta": {
+        "@angular/animations": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular/platform-browser-dynamic": {
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-10.0.14.tgz",
+      "integrity": "sha512-PPCAiNh/JSuQNKXOhj3a8CTFdVhTgF/EpGtaotnVr/BfbJMeFImKo7m2QQOTsAFaEP2DurSHnofPnMWAfHS2mg==",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@angular/common": "10.0.14",
+        "@angular/compiler": "10.0.14",
+        "@angular/core": "10.0.14",
+        "@angular/platform-browser": "10.0.14"
+      }
+    },
+    "node_modules/@angular/router": {
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-10.0.14.tgz",
+      "integrity": "sha512-VWzaNyPZDY99TMszV1GlXJgVOxXsjhJrsv3mIcjaz1dfdlKOeKTVDLdnyXfP9CkwE3PRmvG7eSXppIj6nn9BpQ==",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@angular/common": "10.0.14",
+        "@angular/core": "10.0.14",
+        "@angular/platform-browser": "10.0.14",
+        "rxjs": "^6.5.3"
+      }
+    },
+    "node_modules/@babel/code-frame": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+      "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/highlight": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/compat-data": {
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.11.0.tgz",
+      "integrity": "sha512-TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.12.0",
+        "invariant": "^2.2.4",
+        "semver": "^5.5.0"
+      }
+    },
+    "node_modules/@babel/compat-data/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/@babel/core": {
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz",
+      "integrity": "sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.8.3",
+        "@babel/generator": "^7.9.6",
+        "@babel/helper-module-transforms": "^7.9.0",
+        "@babel/helpers": "^7.9.6",
+        "@babel/parser": "^7.9.6",
+        "@babel/template": "^7.8.6",
+        "@babel/traverse": "^7.9.6",
+        "@babel/types": "^7.9.6",
+        "convert-source-map": "^1.7.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.1",
+        "json5": "^2.1.2",
+        "lodash": "^4.17.13",
+        "resolve": "^1.3.2",
+        "semver": "^5.4.1",
+        "source-map": "^0.5.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
+      }
+    },
+    "node_modules/@babel/core/node_modules/debug": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+      "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@babel/core/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@babel/core/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/@babel/core/node_modules/source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@babel/generator": {
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz",
+      "integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.9.6",
+        "jsesc": "^2.5.1",
+        "lodash": "^4.17.13",
+        "source-map": "^0.5.0"
+      }
+    },
+    "node_modules/@babel/generator/node_modules/source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@babel/helper-annotate-as-pure": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz",
+      "integrity": "sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz",
+      "integrity": "sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-explode-assignable-expression": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helper-compilation-targets": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz",
+      "integrity": "sha512-a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/compat-data": "^7.10.4",
+        "browserslist": "^4.12.0",
+        "invariant": "^2.2.4",
+        "levenary": "^1.1.1",
+        "semver": "^5.5.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/@babel/helper-create-regexp-features-plugin": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz",
+      "integrity": "sha512-2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.10.4",
+        "@babel/helper-regex": "^7.10.4",
+        "regexpu-core": "^4.7.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-define-map": {
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz",
+      "integrity": "sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-function-name": "^7.10.4",
+        "@babel/types": "^7.10.5",
+        "lodash": "^4.17.19"
+      }
+    },
+    "node_modules/@babel/helper-explode-assignable-expression": {
+      "version": "7.11.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz",
+      "integrity": "sha512-ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helper-function-name": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
+      "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-get-function-arity": "^7.10.4",
+        "@babel/template": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helper-function-name/node_modules/@babel/template": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.10.4",
+        "@babel/parser": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helper-get-function-arity": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
+      "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helper-hoist-variables": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz",
+      "integrity": "sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helper-member-expression-to-functions": {
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
+      "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.11.0"
+      }
+    },
+    "node_modules/@babel/helper-module-imports": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz",
+      "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helper-module-transforms": {
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz",
+      "integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.10.4",
+        "@babel/helper-replace-supers": "^7.10.4",
+        "@babel/helper-simple-access": "^7.10.4",
+        "@babel/helper-split-export-declaration": "^7.11.0",
+        "@babel/template": "^7.10.4",
+        "@babel/types": "^7.11.0",
+        "lodash": "^4.17.19"
+      }
+    },
+    "node_modules/@babel/helper-module-transforms/node_modules/@babel/template": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.10.4",
+        "@babel/parser": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helper-optimise-call-expression": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz",
+      "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helper-plugin-utils": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
+      "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+      "dev": true
+    },
+    "node_modules/@babel/helper-regex": {
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.5.tgz",
+      "integrity": "sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^4.17.19"
+      }
+    },
+    "node_modules/@babel/helper-remap-async-to-generator": {
+      "version": "7.11.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz",
+      "integrity": "sha512-tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.10.4",
+        "@babel/helper-wrap-function": "^7.10.4",
+        "@babel/template": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/template": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.10.4",
+        "@babel/parser": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helper-replace-supers": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
+      "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-member-expression-to-functions": "^7.10.4",
+        "@babel/helper-optimise-call-expression": "^7.10.4",
+        "@babel/traverse": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helper-simple-access": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz",
+      "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/template": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helper-simple-access/node_modules/@babel/template": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.10.4",
+        "@babel/parser": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz",
+      "integrity": "sha512-0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.11.0"
+      }
+    },
+    "node_modules/@babel/helper-split-export-declaration": {
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
+      "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.11.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+      "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+      "dev": true
+    },
+    "node_modules/@babel/helper-wrap-function": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz",
+      "integrity": "sha512-6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-function-name": "^7.10.4",
+        "@babel/template": "^7.10.4",
+        "@babel/traverse": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helper-wrap-function/node_modules/@babel/template": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.10.4",
+        "@babel/parser": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helpers": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.4.tgz",
+      "integrity": "sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/template": "^7.10.4",
+        "@babel/traverse": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helpers/node_modules/@babel/template": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.10.4",
+        "@babel/parser": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/highlight": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+      "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.10.4",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/@babel/highlight/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.11.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
+      "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
+      "dev": true,
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-async-generator-functions": {
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz",
+      "integrity": "sha512-cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-remap-async-to-generator": "^7.10.4",
+        "@babel/plugin-syntax-async-generators": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-dynamic-import": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz",
+      "integrity": "sha512-up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-json-strings": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz",
+      "integrity": "sha512-fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-syntax-json-strings": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz",
+      "integrity": "sha512-wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-numeric-separator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-object-rest-spread": {
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz",
+      "integrity": "sha512-wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
+        "@babel/plugin-transform-parameters": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-optional-catch-binding": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz",
+      "integrity": "sha512-LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-optional-chaining": {
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz",
+      "integrity": "sha512-v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-unicode-property-regex": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz",
+      "integrity": "sha512-H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-async-generators": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-bigint": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
+      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-class-properties": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz",
+      "integrity": "sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-dynamic-import": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
+      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-import-meta": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-json-strings": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-numeric-separator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-optional-chaining": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-top-level-await": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz",
+      "integrity": "sha512-ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-arrow-functions": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz",
+      "integrity": "sha512-9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-async-to-generator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz",
+      "integrity": "sha512-F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-remap-async-to-generator": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-block-scoped-functions": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz",
+      "integrity": "sha512-WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-block-scoping": {
+      "version": "7.11.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz",
+      "integrity": "sha512-00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-classes": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz",
+      "integrity": "sha512-2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.10.4",
+        "@babel/helper-define-map": "^7.10.4",
+        "@babel/helper-function-name": "^7.10.4",
+        "@babel/helper-optimise-call-expression": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-replace-supers": "^7.10.4",
+        "@babel/helper-split-export-declaration": "^7.10.4",
+        "globals": "^11.1.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-computed-properties": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz",
+      "integrity": "sha512-JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-destructuring": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz",
+      "integrity": "sha512-+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-dotall-regex": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz",
+      "integrity": "sha512-ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-duplicate-keys": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz",
+      "integrity": "sha512-GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-exponentiation-operator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz",
+      "integrity": "sha512-S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-for-of": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz",
+      "integrity": "sha512-ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-function-name": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz",
+      "integrity": "sha512-OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-function-name": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-literals": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz",
+      "integrity": "sha512-Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-member-expression-literals": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz",
+      "integrity": "sha512-0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-amd": {
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz",
+      "integrity": "sha512-elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.10.5",
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-commonjs": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz",
+      "integrity": "sha512-Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-simple-access": "^7.10.4",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-systemjs": {
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz",
+      "integrity": "sha512-f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-hoist-variables": "^7.10.4",
+        "@babel/helper-module-transforms": "^7.10.5",
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-umd": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz",
+      "integrity": "sha512-mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz",
+      "integrity": "sha512-V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-new-target": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz",
+      "integrity": "sha512-YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-object-super": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz",
+      "integrity": "sha512-5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-replace-supers": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-parameters": {
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz",
+      "integrity": "sha512-xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-get-function-arity": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-property-literals": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz",
+      "integrity": "sha512-ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-regenerator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz",
+      "integrity": "sha512-3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw==",
+      "dev": true,
+      "dependencies": {
+        "regenerator-transform": "^0.14.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-reserved-words": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz",
+      "integrity": "sha512-hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-runtime": {
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.6.tgz",
+      "integrity": "sha512-qcmiECD0mYOjOIt8YHNsAP1SxPooC/rDmfmiSK9BNY72EitdSc7l44WTEklaWuFtbOEBjNhWWyph/kOImbNJ4w==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "resolve": "^1.8.1",
+        "semver": "^5.5.1"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-runtime/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/@babel/plugin-transform-shorthand-properties": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz",
+      "integrity": "sha512-AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-spread": {
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz",
+      "integrity": "sha512-UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-sticky-regex": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz",
+      "integrity": "sha512-Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-regex": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-template-literals": {
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz",
+      "integrity": "sha512-V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-typeof-symbol": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz",
+      "integrity": "sha512-QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-unicode-regex": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz",
+      "integrity": "sha512-wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/preset-env": {
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.6.tgz",
+      "integrity": "sha512-0gQJ9RTzO0heXOhzftog+a/WyOuqMrAIugVYxMYf83gh1CQaQDjMtsOpqOwXyDL/5JcWsrCm8l4ju8QC97O7EQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/compat-data": "^7.9.6",
+        "@babel/helper-compilation-targets": "^7.9.6",
+        "@babel/helper-module-imports": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/plugin-proposal-async-generator-functions": "^7.8.3",
+        "@babel/plugin-proposal-dynamic-import": "^7.8.3",
+        "@babel/plugin-proposal-json-strings": "^7.8.3",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-proposal-numeric-separator": "^7.8.3",
+        "@babel/plugin-proposal-object-rest-spread": "^7.9.6",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-proposal-optional-chaining": "^7.9.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.8.3",
+        "@babel/plugin-syntax-async-generators": "^7.8.0",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.0",
+        "@babel/plugin-syntax-json-strings": "^7.8.0",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0",
+        "@babel/plugin-syntax-numeric-separator": "^7.8.0",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.0",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.0",
+        "@babel/plugin-syntax-top-level-await": "^7.8.3",
+        "@babel/plugin-transform-arrow-functions": "^7.8.3",
+        "@babel/plugin-transform-async-to-generator": "^7.8.3",
+        "@babel/plugin-transform-block-scoped-functions": "^7.8.3",
+        "@babel/plugin-transform-block-scoping": "^7.8.3",
+        "@babel/plugin-transform-classes": "^7.9.5",
+        "@babel/plugin-transform-computed-properties": "^7.8.3",
+        "@babel/plugin-transform-destructuring": "^7.9.5",
+        "@babel/plugin-transform-dotall-regex": "^7.8.3",
+        "@babel/plugin-transform-duplicate-keys": "^7.8.3",
+        "@babel/plugin-transform-exponentiation-operator": "^7.8.3",
+        "@babel/plugin-transform-for-of": "^7.9.0",
+        "@babel/plugin-transform-function-name": "^7.8.3",
+        "@babel/plugin-transform-literals": "^7.8.3",
+        "@babel/plugin-transform-member-expression-literals": "^7.8.3",
+        "@babel/plugin-transform-modules-amd": "^7.9.6",
+        "@babel/plugin-transform-modules-commonjs": "^7.9.6",
+        "@babel/plugin-transform-modules-systemjs": "^7.9.6",
+        "@babel/plugin-transform-modules-umd": "^7.9.0",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.8.3",
+        "@babel/plugin-transform-new-target": "^7.8.3",
+        "@babel/plugin-transform-object-super": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.9.5",
+        "@babel/plugin-transform-property-literals": "^7.8.3",
+        "@babel/plugin-transform-regenerator": "^7.8.7",
+        "@babel/plugin-transform-reserved-words": "^7.8.3",
+        "@babel/plugin-transform-shorthand-properties": "^7.8.3",
+        "@babel/plugin-transform-spread": "^7.8.3",
+        "@babel/plugin-transform-sticky-regex": "^7.8.3",
+        "@babel/plugin-transform-template-literals": "^7.8.3",
+        "@babel/plugin-transform-typeof-symbol": "^7.8.4",
+        "@babel/plugin-transform-unicode-regex": "^7.8.3",
+        "@babel/preset-modules": "^0.1.3",
+        "@babel/types": "^7.9.6",
+        "browserslist": "^4.11.1",
+        "core-js-compat": "^3.6.2",
+        "invariant": "^2.2.2",
+        "levenary": "^1.1.1",
+        "semver": "^5.5.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/preset-env/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/@babel/preset-modules": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz",
+      "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
+        "@babel/plugin-transform-dotall-regex": "^7.4.4",
+        "@babel/types": "^7.4.4",
+        "esutils": "^2.0.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/runtime": {
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz",
+      "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==",
+      "dev": true,
+      "dependencies": {
+        "regenerator-runtime": "^0.13.4"
+      }
+    },
+    "node_modules/@babel/runtime-corejs3": {
+      "version": "7.13.17",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.13.17.tgz",
+      "integrity": "sha512-RGXINY1YvduBlGrP+vHjJqd/nK7JVpfM4rmZLGMx77WoL3sMrhheA0qxii9VNn1VHnxJLEyxmvCB+Wqc+x/FMw==",
+      "dev": true,
+      "dependencies": {
+        "core-js-pure": "^3.0.0",
+        "regenerator-runtime": "^0.13.4"
+      }
+    },
+    "node_modules/@babel/template": {
+      "version": "7.8.6",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
+      "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.8.3",
+        "@babel/parser": "^7.8.6",
+        "@babel/types": "^7.8.6"
+      }
+    },
+    "node_modules/@babel/traverse": {
+      "version": "7.11.5",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
+      "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.10.4",
+        "@babel/generator": "^7.11.5",
+        "@babel/helper-function-name": "^7.10.4",
+        "@babel/helper-split-export-declaration": "^7.11.0",
+        "@babel/parser": "^7.11.5",
+        "@babel/types": "^7.11.5",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0",
+        "lodash": "^4.17.19"
+      }
+    },
+    "node_modules/@babel/traverse/node_modules/@babel/generator": {
+      "version": "7.11.6",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
+      "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.11.5",
+        "jsesc": "^2.5.1",
+        "source-map": "^0.5.0"
+      }
+    },
+    "node_modules/@babel/traverse/node_modules/debug": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+      "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@babel/traverse/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@babel/traverse/node_modules/source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@babel/types": {
+      "version": "7.11.5",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+      "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.10.4",
+        "lodash": "^4.17.19",
+        "to-fast-properties": "^2.0.0"
+      }
+    },
+    "node_modules/@bcoe/v8-coverage": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
+      "dev": true
+    },
+    "node_modules/@cnakazawa/watch": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz",
+      "integrity": "sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==",
+      "dev": true,
+      "dependencies": {
+        "exec-sh": "^0.3.2",
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "watch": "cli.js"
+      },
+      "engines": {
+        "node": ">=0.1.95"
+      }
+    },
+    "node_modules/@eslint/eslintrc": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.0.tgz",
+      "integrity": "sha512-2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.12.4",
+        "debug": "^4.1.1",
+        "espree": "^7.3.0",
+        "globals": "^12.1.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^3.13.1",
+        "minimatch": "^3.0.4",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/globals": {
+      "version": "12.4.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
+      "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.8.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/ignore": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@eslint/eslintrc/node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@gar/promisify": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.2.tgz",
+      "integrity": "sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw==",
+      "dev": true
+    },
+    "node_modules/@ionic-native/badge": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/badge/-/badge-5.33.0.tgz",
+      "integrity": "sha512-g/E2HLB53csZq5hWeyWUFj6r7CrllSPuOkV88XotIFTQFNuY7TaLtiFUVFSvWXRh0Kvu+w7TI5Hys67d/v7F/g==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/badge/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/camera": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/camera/-/camera-5.33.0.tgz",
+      "integrity": "sha512-cLAxM4e8IrTECvlszyUe9FnUjE4PbWR99NNDwkOuB85yJ3diyKxiQhHu89Qh9A6qzHTJQLa93iknY2Q40VM/5Q==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/camera/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/chooser": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/chooser/-/chooser-5.33.0.tgz",
+      "integrity": "sha512-hz2OtB8UsJpKdXZByDzGS6+U1FK8toIjKmIVCDQAuOXxjbw9dU2Ef+MSUKXOpK6MYnP56oP80JdSX9LDEFJnRA==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/chooser/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/clipboard": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/clipboard/-/clipboard-5.33.0.tgz",
+      "integrity": "sha512-HFZN4tsAjFJ9Se9ik0/IOUvApL4zNPEKQAtUsjqP7vCnTsdrgS+FDMln1UDEKXCQ/dEEwU1N1ndFmPBGxjkGzQ==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/clipboard/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/core": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/core/-/core-5.33.0.tgz",
+      "integrity": "sha512-dnZHu7SadvQvliGJPndk2ohdoPvwiyBWJjsJw33BKyhadnmLlmkYKkRgPPI+i22BZofDKq4YiAfIIqhvfHU6gw==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/core/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/device": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/device/-/device-5.33.0.tgz",
+      "integrity": "sha512-KYQvVsN98bGTEomI193Jf9r1vaXBFJQXuhkhwBI6lajynAlf2SIVJwthNUXnK43kNXy1cOelYxScUuKyPwqudw==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/device/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/diagnostic": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/diagnostic/-/diagnostic-5.33.0.tgz",
+      "integrity": "sha512-zBDv/yNMvUkXfxy17rgrGVU3+XKREXRI7cqy/DyvpjdomOnmx2pnFvhszgMEgeD03LkXXKiFOR5yUAVNgYirmg==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/diagnostic/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/file": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/file/-/file-5.33.0.tgz",
+      "integrity": "sha512-RisSGJl2t8JrBgw30Vn5hJYYKEDTHR9f3KbQDfe1MQg+VrZo7vnbml/vk4l55u65c1TYZDH+F6i7s9nyif1QVQ==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/file-opener": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/file-opener/-/file-opener-5.33.0.tgz",
+      "integrity": "sha512-v7t1ndalAPYT9gvMAhxAup8tg1NPV415cfG6tzs1foPFP91UZC3MQny0tup8AgFivugT1GRdoSk1NMuK1jy8Cw==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/file-opener/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/file-transfer": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/file-transfer/-/file-transfer-5.33.0.tgz",
+      "integrity": "sha512-xDUpdJVgTBP6aEiU08iZ/pa9aMoGSMB9391dQKk+VSDs0hdbIwk+Cx4V40GIE4QF3TI06sUMdKXD2sIhVsr2QA==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/file-transfer/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/file/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/geolocation": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/geolocation/-/geolocation-5.33.0.tgz",
+      "integrity": "sha512-oE6pi6l8/Wsv94vpJmPlPqE1LheP6cQTJrC78WYQp9WVDOOCGZnFznNoH8BlQfnfjuDx/kUARxzEJBO/gbUg1A==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/geolocation/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/http": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/http/-/http-5.33.0.tgz",
+      "integrity": "sha512-dqcPu3igSLlfDUK8Mvma/6o6aq7WtKBlcR8xXwE8tVsO/r4fEB6NevLLN4S4zCr381Jy+RxIIjn3CZx5XHF6JQ==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/http/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/in-app-browser": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/in-app-browser/-/in-app-browser-5.33.0.tgz",
+      "integrity": "sha512-GGIvnYHf8FgaIae9yfRzxqxj0ZAxrYhOJpsHVSq1YKjxnDpRe6ImWWaHHfaeXE5IdUUMUXVuf75VTSBN00VBvA==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/in-app-browser/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/ionic-webview": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/ionic-webview/-/ionic-webview-5.33.0.tgz",
+      "integrity": "sha512-Jbr4M6z/Fya51F+QXuPLm/crFlZ9T6YvRM1cygGmFwZ7SgDAimYnjgSO8SEGJmvO2ZekYmFuF56qiVPSvx2wUA==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/ionic-webview/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/keyboard": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/keyboard/-/keyboard-5.33.0.tgz",
+      "integrity": "sha512-TIYU3LC+Yz/pcpBuHcxLThMNuN9y1E1wBu4SlmS6VlO3/D3R3At2WOg2UK3iA66G2kTJubed5haqTYZjeoA6Uw==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/keyboard/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/local-notifications": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/local-notifications/-/local-notifications-5.33.0.tgz",
+      "integrity": "sha512-ljn2uq0rFWpjG1I1qK+mPVX8T3T+09fsF8sZ9nK7uvD9YWShCVz2e2ctf8qPRFq+TWDeDqlnwXz3wCvWmbBUWw==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/local-notifications/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/media": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/media/-/media-5.33.0.tgz",
+      "integrity": "sha512-nUu7/FSH41j9+BqHXYVMBd3EifNsTNOufD3NEiMVpHVDWLWqG7tG5h5cFlsVACxUaP4kNpSEke2mjom6CKyjxQ==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/media-capture": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/media-capture/-/media-capture-5.33.0.tgz",
+      "integrity": "sha512-aQTnonVSeijpuZ9B7oYJCjIDqgFVhNdvqkx9vUoaO359BtJGpGS1rNPjEovt4DsqV7oe7TkbmBd8DMEwnB3A2g==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/media-capture/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/media/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/network": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/network/-/network-5.33.0.tgz",
+      "integrity": "sha512-J+3+rbDTMVNUspa/nV+P8a0hFKDicJK1rVIrm5aLBQdmN9n7WaqJmeMYTptyWOnZxQpktJAJDdhJTEvVmKQjjw==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/network/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/push": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/push/-/push-5.33.0.tgz",
+      "integrity": "sha512-H4gOkMbOaNvi97cKKJDggWvAR1BVCUbtdLyWInA0q3cZBHWSc6KcRJGz+hcdDndCQJUnHofs1Tpw8LN3zhjYyQ==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/push/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/qr-scanner": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/qr-scanner/-/qr-scanner-5.33.0.tgz",
+      "integrity": "sha512-cyiQv0Rje/fN9/JYoDXP1+ILJkRkjvPtoSx4vd2FsKAuJB60U2DpQfmVEE/KMF4iceTpx4MK/kGzr2WE2AYnIg==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/qr-scanner/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/splash-screen": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-5.33.0.tgz",
+      "integrity": "sha512-6PHk5WJeUoc3zru6wTvUmd9DCASvRQoQq1dysYI3JCECaAJ6X0x1RbzM8dBFs3JPLfWtDn+P8eTp+KaA0Xf58w==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/splash-screen/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/sqlite": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/sqlite/-/sqlite-5.33.0.tgz",
+      "integrity": "sha512-JIdQJr6bcksotF/3ZMJQZo9lHgaHXvHOOK9R30mM/5Ds5fFu+rUoUf0wvyqaGzEFu94pGw2uPGnfD+WI7x7+1A==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/sqlite/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/status-bar": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/status-bar/-/status-bar-5.33.0.tgz",
+      "integrity": "sha512-cnyfd42N9gGfhyDtF7wbWoacKg/jfsoJQHOHltfhS4/EjxsVu4bjkwq1YBLMcMY3OIqFDSn2aFcejHn8wVNkDQ==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/status-bar/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/web-intent": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/web-intent/-/web-intent-5.33.0.tgz",
+      "integrity": "sha512-3CIAofrg9nkJQbSftFdMKYOduXy9Ra/a1Q0it6ysm9NFeAQn7iZPThSexBeZ9xiKKj/QTPZtnqAJ0MQ+4mkGag==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/web-intent/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic-native/zip": {
+      "version": "5.33.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/zip/-/zip-5.33.0.tgz",
+      "integrity": "sha512-hErISQ6/xqVErmVnnha5BR+3GWRNQIVfMTXzprEpNZxQl3iDe1UTIVQdFnMd3Nasz/naY+61Vq/y91PZ1Rrajw==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
+    "node_modules/@ionic-native/zip/node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@ionic/angular": {
+      "version": "5.6.6",
+      "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-5.6.6.tgz",
+      "integrity": "sha512-0psh2n4Y/3sx0e2Yj4WmNcukz0nrETEiJE6Fl4CldoB8QHZcXGi0hKrPAcbGSAF0+lAJ58+Z5Gp/HQVm/MQOMA==",
+      "dependencies": {
+        "@ionic/core": "5.6.6",
+        "tslib": "^1.9.3"
+      },
+      "peerDependencies": {
+        "@angular/core": ">=8.2.7",
+        "@angular/forms": ">=8.2.7",
+        "@angular/router": ">=8.2.7",
+        "rxjs": ">=6.2.0",
+        "zone.js": ">=0.8.26"
+      }
+    },
+    "node_modules/@ionic/angular-toolkit": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/@ionic/angular-toolkit/-/angular-toolkit-2.3.3.tgz",
+      "integrity": "sha512-r87mApDLWbLaUtd5LvNHrRlZWxjQhaBBM1yPlk9M98dHOxcX3jy7kv60ZurGZutuvbhXISGvHcvvR90yywDC1A==",
+      "dev": true,
+      "dependencies": {
+        "@schematics/angular": ">=8.0.0",
+        "cheerio": "1.0.0-rc.3",
+        "colorette": "1.1.0",
+        "copy-webpack-plugin": "^6.0.3",
+        "tslib": "^1.9.0",
+        "ws": "^7.0.1"
+      },
+      "peerDependencies": {
+        "@angular-devkit/architect": ">=0.800.0",
+        "@angular-devkit/build-angular": ">=0.800.0",
+        "@angular-devkit/core": ">=8.0.0",
+        "@angular-devkit/schematics": ">=8.0.0"
+      }
+    },
+    "node_modules/@ionic/angular-toolkit/node_modules/tslib": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
+      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
+      "dev": true
+    },
+    "node_modules/@ionic/angular-toolkit/node_modules/ws": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz",
+      "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@ionic/angular/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+    },
+    "node_modules/@ionic/cli": {
+      "version": "6.14.1",
+      "resolved": "https://registry.npmjs.org/@ionic/cli/-/cli-6.14.1.tgz",
+      "integrity": "sha512-QGmA5hjW4PvS8o0f+ptJ2bOknu4dPKzlECFApBiR7ayDgGTDMwmbxrtNpRhDnjdsVlMAzWq8eo9l76831+DBjQ==",
+      "dev": true,
+      "dependencies": {
+        "@ionic/cli-framework": "5.1.0",
+        "@ionic/cli-framework-output": "2.2.2",
+        "@ionic/cli-framework-prompts": "2.1.8",
+        "@ionic/utils-array": "2.1.5",
+        "@ionic/utils-fs": "3.1.5",
+        "@ionic/utils-network": "2.1.5",
+        "@ionic/utils-process": "2.1.8",
+        "@ionic/utils-stream": "3.1.5",
+        "@ionic/utils-subprocess": "2.1.8",
+        "@ionic/utils-terminal": "2.3.1",
+        "chalk": "^4.0.0",
+        "debug": "^4.0.0",
+        "diff": "^4.0.1",
+        "elementtree": "^0.1.7",
+        "leek": "0.0.24",
+        "lodash": "^4.17.5",
+        "open": "^7.0.4",
+        "os-name": "^4.0.0",
+        "semver": "^7.1.1",
+        "split2": "^3.0.0",
+        "ssh-config": "^1.1.1",
+        "stream-combiner2": "^1.1.1",
+        "superagent": "^5.2.1",
+        "superagent-proxy": "^2.0.0",
+        "tar": "^6.0.1",
+        "tslib": "^2.0.1"
+      },
+      "bin": {
+        "ionic": "bin/ionic"
+      },
+      "engines": {
+        "node": ">=10.3.0"
+      }
+    },
+    "node_modules/@ionic/cli-framework": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-5.1.0.tgz",
+      "integrity": "sha512-Hb/P2zuHB3zQZN0qG7Lxda8IlP2mHisfb0KR+wc9cw2BSiH+rtXRd/A4JxndPznjWs00PHbWiEm0Ehas2pA/nw==",
+      "dev": true,
+      "dependencies": {
+        "@ionic/cli-framework-output": "2.2.2",
+        "@ionic/utils-array": "2.1.5",
+        "@ionic/utils-fs": "3.1.5",
+        "@ionic/utils-object": "2.1.5",
+        "@ionic/utils-process": "2.1.8",
+        "@ionic/utils-stream": "3.1.5",
+        "@ionic/utils-subprocess": "2.1.8",
+        "@ionic/utils-terminal": "2.3.1",
+        "chalk": "^4.0.0",
+        "debug": "^4.0.0",
+        "lodash": "^4.17.5",
+        "minimist": "^1.2.0",
+        "rimraf": "^3.0.0",
+        "tslib": "^2.0.1",
+        "write-file-atomic": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10.3.0"
+      }
+    },
+    "node_modules/@ionic/cli-framework-output": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/@ionic/cli-framework-output/-/cli-framework-output-2.2.2.tgz",
+      "integrity": "sha512-eQYkqIW1/tCwSC6Bd0gjse96U11lDX/ikf3jvsjX7a8z/zwSmGzCHRizb7xogV65Ey+1/zyAZR71cpDRQuFLBQ==",
+      "dev": true,
+      "dependencies": {
+        "@ionic/utils-terminal": "2.3.1",
+        "debug": "^4.0.0",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10.3.0"
+      }
+    },
+    "node_modules/@ionic/cli-framework-output/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@ionic/cli-framework-output/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@ionic/cli-framework-prompts": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/@ionic/cli-framework-prompts/-/cli-framework-prompts-2.1.8.tgz",
+      "integrity": "sha512-DjO4lQsmvficsZbPmpGqSSx+F1BfgSTQBwRqL5bl9Dkh9rIZ/ckcJcKqCciVOw9kIY7WTeNFOTwj2vWrkFn7+Q==",
+      "dev": true,
+      "dependencies": {
+        "@ionic/utils-terminal": "2.3.1",
+        "debug": "^4.0.0",
+        "inquirer": "^7.0.0",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10.3.0"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/ansi-escapes": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.21.3"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/chalk": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/cli-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+      "dev": true,
+      "dependencies": {
+        "restore-cursor": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/cli-width": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
+      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/figures": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+      "dev": true,
+      "dependencies": {
+        "escape-string-regexp": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/inquirer": {
+      "version": "7.3.3",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz",
+      "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.1.0",
+        "cli-cursor": "^3.1.0",
+        "cli-width": "^3.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^3.0.0",
+        "lodash": "^4.17.19",
+        "mute-stream": "0.0.8",
+        "run-async": "^2.4.0",
+        "rxjs": "^6.6.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "through": "^2.3.6"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/restore-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "dev": true,
+      "dependencies": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/rxjs": {
+      "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/rxjs/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/string-width": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts/node_modules/type-fest": {
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@ionic/cli-framework/node_modules/chalk": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@ionic/cli-framework/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@ionic/cli-framework/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@ionic/cli/node_modules/chalk": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@ionic/cli/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@ionic/cli/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@ionic/cli/node_modules/os-name": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/os-name/-/os-name-4.0.0.tgz",
+      "integrity": "sha512-caABzDdJMbtykt7GmSogEat3faTKQhmZf0BS5l/pZGmP0vPWQjXWqOhbLyK+b6j2/DQPmEvYdzLXJXXLJNVDNg==",
+      "dev": true,
+      "dependencies": {
+        "macos-release": "^2.2.0",
+        "windows-release": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@ionic/cli/node_modules/windows-release": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-4.0.0.tgz",
+      "integrity": "sha512-OxmV4wzDKB1x7AZaZgXMVsdJ1qER1ed83ZrTYd5Bwq2HfJVg3DJS8nqlAG4sMoJ7mu8cuRmLEYyU13BKwctRAg==",
+      "dev": true,
+      "dependencies": {
+        "execa": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@ionic/core": {
+      "version": "5.6.6",
+      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.6.6.tgz",
+      "integrity": "sha512-EbVIXOTVVPxBo7hsarBpRSFNsQ22wBFtWkKmrmliieknG5LUkf5WZBpj4EENQhzYA6c+//7/nfhcD9pWgtAofA==",
+      "dependencies": {
+        "@stencil/core": "^2.4.0",
+        "ionicons": "^5.5.1",
+        "tslib": "^2.1.0"
+      }
+    },
+    "node_modules/@ionic/core/node_modules/tslib": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz",
+      "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w=="
+    },
+    "node_modules/@ionic/utils-array": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-2.1.5.tgz",
+      "integrity": "sha512-HD72a71IQVBmQckDwmA8RxNVMTbxnaLbgFOl+dO5tbvW9CkkSFCv41h6fUuNsSEVgngfkn0i98HDuZC8mk+lTA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.0.0",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10.3.0"
+      }
+    },
+    "node_modules/@ionic/utils-array/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@ionic/utils-array/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@ionic/utils-fs": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-3.1.5.tgz",
+      "integrity": "sha512-a41bY2dHqWSEQQ/80CpbXSs8McyiCFf2DnIWWLukrhYWf46h4qi6M/8dxcMKrofRiqI/3F+cL3S2mOm9Zz/o2Q==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.0.0",
+        "fs-extra": "^9.0.0",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10.3.0"
+      }
+    },
+    "node_modules/@ionic/utils-fs/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@ionic/utils-fs/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@ionic/utils-network": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-2.1.5.tgz",
+      "integrity": "sha512-HUQ1Ec4Mh2MXzzKdbbbDS6xYKwpFJ2XRY7SYXbaZT8+jiNahfHbsOfe62/p8bk41Yil7E9EagzGC2JvIFJh01w==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.0.0",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10.3.0"
+      }
+    },
+    "node_modules/@ionic/utils-network/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@ionic/utils-network/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@ionic/utils-object": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-object/-/utils-object-2.1.5.tgz",
+      "integrity": "sha512-XnYNSwfewUqxq+yjER1hxTKggftpNjFLJH0s37jcrNDwbzmbpFTQTVAp4ikNK4rd9DOebX/jbeZb8jfD86IYxw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.0.0",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10.3.0"
+      }
+    },
+    "node_modules/@ionic/utils-object/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@ionic/utils-object/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@ionic/utils-process": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-process/-/utils-process-2.1.8.tgz",
+      "integrity": "sha512-VBBoyTzi+m6tgKAItl+jiTQneGwTOsctcrTG4CsEgmVOVOEhUYkPhddXqzD+oC54hPDU9ROsd3I014P5CWEuhQ==",
+      "dev": true,
+      "dependencies": {
+        "@ionic/utils-object": "2.1.5",
+        "@ionic/utils-terminal": "2.3.1",
+        "debug": "^4.0.0",
+        "signal-exit": "^3.0.3",
+        "tree-kill": "^1.2.2",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10.3.0"
+      }
+    },
+    "node_modules/@ionic/utils-process/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@ionic/utils-process/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@ionic/utils-stream": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-stream/-/utils-stream-3.1.5.tgz",
+      "integrity": "sha512-hkm46uHvEC05X/8PHgdJi4l4zv9VQDELZTM+Kz69odtO9zZYfnt8DkfXHJqJ+PxmtiE5mk/ehJWLnn/XAczTUw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.0.0",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10.3.0"
+      }
+    },
+    "node_modules/@ionic/utils-stream/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@ionic/utils-stream/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@ionic/utils-subprocess": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-2.1.8.tgz",
+      "integrity": "sha512-pkmtf1LtXcEMPn6/cctREL2aZtZoy0+0Sl+nT0NIkOHIoBUcqrcfMWdctCSM4Mp6+2/hLWtgpHE3TOIibkWfIg==",
+      "dev": true,
+      "dependencies": {
+        "@ionic/utils-array": "2.1.5",
+        "@ionic/utils-fs": "3.1.5",
+        "@ionic/utils-process": "2.1.8",
+        "@ionic/utils-stream": "3.1.5",
+        "@ionic/utils-terminal": "2.3.1",
+        "cross-spawn": "^7.0.0",
+        "debug": "^4.0.0",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10.3.0"
+      }
+    },
+    "node_modules/@ionic/utils-subprocess/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@ionic/utils-subprocess/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@ionic/utils-terminal": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-2.3.1.tgz",
+      "integrity": "sha512-cglsSd2AckI3Ldtdfczeq64vIIDjtPspV5QJtky8f8uIdxkeOIGeRV7bCj1+BEf1hyo+ZuggQxLviHnbMZhiRw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.0.0",
+        "signal-exit": "^3.0.3",
+        "slice-ansi": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "tslib": "^2.0.1",
+        "untildify": "^4.0.0",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=10.3.0"
+      }
+    },
+    "node_modules/@ionic/utils-terminal/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@ionic/utils-terminal/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@ionic/utils-terminal/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/@ionic/utils-terminal/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@ionic/utils-terminal/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@ionic/utils-terminal/node_modules/string-width": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@ionic/utils-terminal/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@ionic/utils-terminal/node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.3.1",
+        "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
+        "js-yaml": "^3.13.1",
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/schema": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz",
+      "integrity": "sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jest/console": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.5.2.tgz",
+      "integrity": "sha512-lJELzKINpF1v74DXHbCRIkQ/+nUV1M+ntj+X1J8LxCgpmJZjfLmhFejiMSbjjD66fayxl5Z06tbs3HMyuik6rw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.5.2",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "jest-message-util": "^26.5.2",
+        "jest-util": "^26.5.2",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/console/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@jest/core": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.5.2.tgz",
+      "integrity": "sha512-LLTo1LQMg7eJjG/+P1NYqFof2B25EV1EqzD5FonklihG4UJKiK2JBIvWonunws6W7e+DhNLoFD+g05tCY03eyA==",
+      "dev": true,
+      "dependencies": {
+        "@jest/console": "^26.5.2",
+        "@jest/reporters": "^26.5.2",
+        "@jest/test-result": "^26.5.2",
+        "@jest/transform": "^26.5.2",
+        "@jest/types": "^26.5.2",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.4",
+        "jest-changed-files": "^26.5.2",
+        "jest-config": "^26.5.2",
+        "jest-haste-map": "^26.5.2",
+        "jest-message-util": "^26.5.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-resolve": "^26.5.2",
+        "jest-resolve-dependencies": "^26.5.2",
+        "jest-runner": "^26.5.2",
+        "jest-runtime": "^26.5.2",
+        "jest-snapshot": "^26.5.2",
+        "jest-util": "^26.5.2",
+        "jest-validate": "^26.5.2",
+        "jest-watcher": "^26.5.2",
+        "micromatch": "^4.0.2",
+        "p-each-series": "^2.1.0",
+        "rimraf": "^3.0.0",
+        "slash": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/core/node_modules/ansi-escapes": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
+      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.11.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@jest/core/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jest/core/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@jest/core/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jest/core/node_modules/type-fest": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
+      "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@jest/environment": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.5.2.tgz",
+      "integrity": "sha512-YjhCD/Zhkz0/1vdlS/QN6QmuUdDkpgBdK4SdiVg4Y19e29g4VQYN5Xg8+YuHjdoWGY7wJHMxc79uDTeTOy9Ngw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/fake-timers": "^26.5.2",
+        "@jest/types": "^26.5.2",
+        "@types/node": "*",
+        "jest-mock": "^26.5.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/fake-timers": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.5.2.tgz",
+      "integrity": "sha512-09Hn5Oraqt36V1akxQeWMVL0fR9c6PnEhpgLaYvREXZJAh2H2Y+QLCsl0g7uMoJeoWJAuz4tozk1prbR1Fc1sw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.5.2",
+        "@sinonjs/fake-timers": "^6.0.1",
+        "@types/node": "*",
+        "jest-message-util": "^26.5.2",
+        "jest-mock": "^26.5.2",
+        "jest-util": "^26.5.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/globals": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.5.2.tgz",
+      "integrity": "sha512-9PmnFsAUJxpPt1s/stq02acS1YHliVBDNfAWMe1bwdRr1iTCfhbNt3ERQXrO/ZfZSweftoA26Q/2yhSVSWQ3sw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^26.5.2",
+        "@jest/types": "^26.5.2",
+        "expect": "^26.5.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/reporters": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.5.2.tgz",
+      "integrity": "sha512-zvq6Wvy6MmJq/0QY0YfOPb49CXKSf42wkJbrBPkeypVa8I+XDxijvFuywo6TJBX/ILPrdrlE/FW9vJZh6Rf9vA==",
+      "dev": true,
+      "dependencies": {
+        "@bcoe/v8-coverage": "^0.2.3",
+        "@jest/console": "^26.5.2",
+        "@jest/test-result": "^26.5.2",
+        "@jest/transform": "^26.5.2",
+        "@jest/types": "^26.5.2",
+        "chalk": "^4.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "exit": "^0.1.2",
+        "glob": "^7.1.2",
+        "graceful-fs": "^4.2.4",
+        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-instrument": "^4.0.3",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^4.0.0",
+        "istanbul-reports": "^3.0.2",
+        "jest-haste-map": "^26.5.2",
+        "jest-resolve": "^26.5.2",
+        "jest-util": "^26.5.2",
+        "jest-worker": "^26.5.0",
+        "slash": "^3.0.0",
+        "source-map": "^0.6.0",
+        "string-length": "^4.0.1",
+        "terminal-link": "^2.0.0",
+        "v8-to-istanbul": "^5.0.1"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      },
+      "optionalDependencies": {
+        "node-notifier": "^8.0.0"
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/jest-worker": {
+      "version": "26.5.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.5.0.tgz",
+      "integrity": "sha512-kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@jest/source-map": {
+      "version": "26.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.5.0.tgz",
+      "integrity": "sha512-jWAw9ZwYHJMe9eZq/WrsHlwF8E3hM9gynlcDpOyCb9bR8wEd9ZNBZCi7/jZyzHxC7t3thZ10gO2IDhu0bPKS5g==",
+      "dev": true,
+      "dependencies": {
+        "callsites": "^3.0.0",
+        "graceful-fs": "^4.2.4",
+        "source-map": "^0.6.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/source-map/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@jest/test-result": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.5.2.tgz",
+      "integrity": "sha512-E/Zp6LURJEGSCWpoMGmCFuuEI1OWuI3hmZwmULV0GsgJBh7u0rwqioxhRU95euUuviqBDN8ruX/vP/4bwYolXw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/console": "^26.5.2",
+        "@jest/types": "^26.5.2",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "collect-v8-coverage": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/test-sequencer": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.5.2.tgz",
+      "integrity": "sha512-XmGEh7hh07H2B8mHLFCIgr7gA5Y6Hw1ZATIsbz2fOhpnQ5AnQtZk0gmP0Q5/+mVB2xygO64tVFQxOajzoptkNA==",
+      "dev": true,
+      "dependencies": {
+        "@jest/test-result": "^26.5.2",
+        "graceful-fs": "^4.2.4",
+        "jest-haste-map": "^26.5.2",
+        "jest-runner": "^26.5.2",
+        "jest-runtime": "^26.5.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/transform": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.5.2.tgz",
+      "integrity": "sha512-AUNjvexh+APhhmS8S+KboPz+D3pCxPvEAGduffaAJYxIFxGi/ytZQkrqcKDUU0ERBAo5R7087fyOYr2oms1seg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.1.0",
+        "@jest/types": "^26.5.2",
+        "babel-plugin-istanbul": "^6.0.0",
+        "chalk": "^4.0.0",
+        "convert-source-map": "^1.4.0",
+        "fast-json-stable-stringify": "^2.0.0",
+        "graceful-fs": "^4.2.4",
+        "jest-haste-map": "^26.5.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-util": "^26.5.2",
+        "micromatch": "^4.0.2",
+        "pirates": "^4.0.1",
+        "slash": "^3.0.0",
+        "source-map": "^0.6.1",
+        "write-file-atomic": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/transform/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@jest/transform/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@jest/types": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.5.2.tgz",
+      "integrity": "sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==",
+      "dev": true,
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^15.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/types/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@jsdevtools/coverage-istanbul-loader": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@jsdevtools/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.3.tgz",
+      "integrity": "sha512-TAdNkeGB5Fe4Og+ZkAr1Kvn9by2sfL44IAHFtxlh1BA1XJ5cLpO9iSNki5opWESv3l3vSHsZ9BNKuqFKbEbFaA==",
+      "dev": true,
+      "dependencies": {
+        "convert-source-map": "^1.7.0",
+        "istanbul-lib-instrument": "^4.0.1",
+        "loader-utils": "^1.4.0",
+        "merge-source-map": "^1.1.0",
+        "schema-utils": "^2.6.4"
+      }
+    },
+    "node_modules/@jsdevtools/coverage-istanbul-loader/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/@jsdevtools/coverage-istanbul-loader/node_modules/loader-utils": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/@moodlehq/cordova-plugin-file-transfer": {
+      "version": "1.7.1-moodle.2",
+      "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-file-transfer/-/cordova-plugin-file-transfer-1.7.1-moodle.2.tgz",
+      "integrity": "sha512-nvddQelAwPXmvjv0YJJwuf2xFNi78ZmTa47BgtHGebOvdKpmcbphkOQAVN7KMheL4J3KNE9DbMBHwEHkGGkH4g==",
+      "engines": {
+        "cordovaDependencies": {
+          "3.0.0": {
+            "cordova": ">100"
+          }
+        }
+      }
+    },
+    "node_modules/@moodlehq/cordova-plugin-inappbrowser": {
+      "version": "5.0.0-moodle.2",
+      "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-inappbrowser/-/cordova-plugin-inappbrowser-5.0.0-moodle.2.tgz",
+      "integrity": "sha512-0JOLHUFEJC3fv4OQuyr2kwNyrb7oeyjmfFLQ+LcKO41e6UOnNy/du0hU7Yz9Rh8B2zGcebvSwMrN+cRSCqlipQ==",
+      "engines": {
+        "cordovaDependencies": {
+          "0.2.3": {
+            "cordova": ">=3.1.0"
+          },
+          "4.0.0": {
+            "cordova": ">=3.1.0",
+            "cordova-ios": ">=4.0.0"
+          },
+          "5.0.0": {
+            "cordova": ">=9.0.0",
+            "cordova-android": ">=9.0.0",
+            "cordova-ios": ">=6.0.0"
+          },
+          "6.0.0": {
+            "cordova": ">100"
+          }
+        }
+      }
+    },
+    "node_modules/@moodlehq/cordova-plugin-ionic-webview": {
+      "version": "5.0.0-moodle.1",
+      "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-ionic-webview/-/cordova-plugin-ionic-webview-5.0.0-moodle.1.tgz",
+      "integrity": "sha512-+6UrPKsEgXl3pcuTyI1hZIUw9y22Li/nvn7nxiphgZdldlhBvkMK/7nn4IAaXYlnrmIOpCkIrU4BbrAjSJGWSQ==",
+      "engines": {
+        "cordovaDependencies": {
+          "2.0.0": {
+            "cordova-android": ">=6.4.0",
+            "cordova-ios": ">=4.0.0-dev"
+          },
+          "3.1.0": {
+            "cordova": ">=7.1.0",
+            "cordova-android": ">=6.4.0",
+            "cordova-ios": ">=4.0.0-dev"
+          }
+        }
+      }
+    },
+    "node_modules/@moodlehq/cordova-plugin-local-notification": {
+      "version": "0.9.0-moodle.3",
+      "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-local-notification/-/cordova-plugin-local-notification-0.9.0-moodle.3.tgz",
+      "integrity": "sha512-dSEvshH9fE3aUG4bO05gCMqWVCnvZGUeddIfB8OShN60sj0CUWuI1e7Mn5syzTcRRNRi8XQ4MTv85zk4c8mzww==",
+      "engines": [
+        {
+          "name": "cordova",
+          "version": ">=3.6.0"
+        },
+        {
+          "name": "cordova-android",
+          "version": ">=6.0.0"
+        },
+        {
+          "name": "cordova-windows",
+          "version": ">=4.2.0"
+        },
+        {
+          "name": "android-sdk",
+          "version": ">=26"
+        },
+        {
+          "name": "apple-ios",
+          "version": ">=10.0.0"
+        }
+      ]
+    },
+    "node_modules/@moodlehq/cordova-plugin-qrscanner": {
+      "version": "3.0.1-moodle.2",
+      "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-qrscanner/-/cordova-plugin-qrscanner-3.0.1-moodle.2.tgz",
+      "integrity": "sha512-bjMI94QTEaUOl5TbK8K+HZI3gcR8HHfYTocsA1/C1HMKD3nROhGtwvuVDNvb+ogknv9WVQDyGnfMAnNihYH+PQ==",
+      "dependencies": {
+        "qrcode-reader": "^1.0.4",
+        "webrtc-adapter": "^3.1.4"
+      }
+    },
+    "node_modules/@moodlehq/phonegap-plugin-push": {
+      "version": "2.0.0-moodle.2",
+      "resolved": "https://registry.npmjs.org/@moodlehq/phonegap-plugin-push/-/phonegap-plugin-push-2.0.0-moodle.2.tgz",
+      "integrity": "sha512-a1ZR36vOy0Gu0yaX2T+PODlNSQcIUuHMNzPZ/kn4I+cV+hyPwAw1LmdGQDdxfABAGKWCvtzwUyYs1T/NCz2fRQ==",
+      "engines": {
+        "cordovaDependencies": {
+          "1.0.0": {
+            "cordova": ">=10.0.0",
+            "cordova-android": ">=8.0.0",
+            "cordova-ios": ">=5.1.1"
+          },
+          "2.0.0": {
+            "cordova": ">=10.0.0",
+            "cordova-android": ">=8.0.0",
+            "cordova-ios": ">=6.0.0"
+          }
+        }
+      }
+    },
+    "node_modules/@netflix/nerror": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@netflix/nerror/-/nerror-1.1.3.tgz",
+      "integrity": "sha512-b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg==",
+      "dependencies": {
+        "assert-plus": "^1.0.0",
+        "extsprintf": "^1.4.0",
+        "lodash": "^4.17.15"
+      }
+    },
+    "node_modules/@ngtools/webpack": {
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-10.0.8.tgz",
+      "integrity": "sha512-Qv4v7O4VGeWuXjRThd/mdC2I4cJOgQ7kDrVN7vkDB2EW5xtRB+/4hghvFeO3bD11FLuFvCxBMb0HbwyKoVQgEQ==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "10.0.8",
+        "enhanced-resolve": "4.1.1",
+        "rxjs": "6.5.5",
+        "webpack-sources": "1.4.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
+        "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "@angular/compiler-cli": ">=10.0.0-next.0 < 11",
+        "typescript": ">=3.9 < 3.10",
+        "webpack": "^4.0.0"
+      }
+    },
+    "node_modules/@ngtools/webpack/node_modules/@angular-devkit/core": {
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
+      "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "6.12.3",
+        "fast-json-stable-stringify": "2.1.0",
+        "magic-string": "0.25.7",
+        "rxjs": "6.5.5",
+        "source-map": "0.7.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@ngtools/webpack/node_modules/ajv": {
+      "version": "6.12.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@ngx-translate/core": {
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-13.0.0.tgz",
+      "integrity": "sha512-+tzEp8wlqEnw0Gc7jtVRAJ6RteUjXw6JJR4O65KlnxOmJrCGPI0xjV/lKRnQeU0w4i96PQs/jtpL921Wrb7PWg==",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@angular/core": ">=10.0.0",
+        "rxjs": ">=6.5.3"
+      }
+    },
+    "node_modules/@ngx-translate/http-loader": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@ngx-translate/http-loader/-/http-loader-6.0.0.tgz",
+      "integrity": "sha512-LCekn6qCbeXWlhESCxU1rAbZz33WzDG0lI7Ig0pYC1o5YxJWrkU9y3Y4tNi+jakQ7R6YhTR2D3ox6APxDtA0wA==",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@angular/common": ">=10.0.0",
+        "@ngx-translate/core": ">=13.0.0",
+        "rxjs": ">=6.5.3"
+      }
+    },
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz",
+      "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==",
+      "dependencies": {
+        "@nodelib/fs.stat": "2.0.3",
+        "run-parallel": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz",
+      "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz",
+      "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==",
+      "dependencies": {
+        "@nodelib/fs.scandir": "2.1.3",
+        "fastq": "^1.6.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@npmcli/fs": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.0.0.tgz",
+      "integrity": "sha512-8ltnOpRR/oJbOp8vaGUnipOi3bqkcW+sLHFlyXIr08OGHmVJLB1Hn7QtGXbYcpVtH1gAYZTlmDXtE4YV0+AMMQ==",
+      "dev": true,
+      "dependencies": {
+        "@gar/promisify": "^1.0.1",
+        "semver": "^7.3.5"
+      }
+    },
+    "node_modules/@npmcli/fs/node_modules/semver": {
+      "version": "7.3.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@npmcli/git": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-2.1.0.tgz",
+      "integrity": "sha512-/hBFX/QG1b+N7PZBFs0bi+evgRZcK9nWBxQKZkGoXUT5hJSwl5c4d7y8/hm+NQZRPhQ67RzFaj5UM9YeyKoryw==",
+      "dependencies": {
+        "@npmcli/promise-spawn": "^1.3.2",
+        "lru-cache": "^6.0.0",
+        "mkdirp": "^1.0.4",
+        "npm-pick-manifest": "^6.1.1",
+        "promise-inflight": "^1.0.1",
+        "promise-retry": "^2.0.1",
+        "semver": "^7.3.5",
+        "which": "^2.0.2"
+      }
+    },
+    "node_modules/@npmcli/git/node_modules/err-code": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
+      "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="
+    },
+    "node_modules/@npmcli/git/node_modules/hosted-git-info": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
+      "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@npmcli/git/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@npmcli/git/node_modules/npm-package-arg": {
+      "version": "8.1.5",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.5.tgz",
+      "integrity": "sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==",
+      "dependencies": {
+        "hosted-git-info": "^4.0.1",
+        "semver": "^7.3.4",
+        "validate-npm-package-name": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@npmcli/git/node_modules/npm-pick-manifest": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-6.1.1.tgz",
+      "integrity": "sha512-dBsdBtORT84S8V8UTad1WlUyKIY9iMsAmqxHbLdeEeBNMLQDlDWWra3wYUx9EBEIiG/YwAy0XyNHDd2goAsfuA==",
+      "dependencies": {
+        "npm-install-checks": "^4.0.0",
+        "npm-normalize-package-bin": "^1.0.1",
+        "npm-package-arg": "^8.1.2",
+        "semver": "^7.3.4"
+      }
+    },
+    "node_modules/@npmcli/git/node_modules/promise-retry": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
+      "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
+      "dependencies": {
+        "err-code": "^2.0.2",
+        "retry": "^0.12.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@npmcli/git/node_modules/semver": {
+      "version": "7.3.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@npmcli/installed-package-contents": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-1.0.7.tgz",
+      "integrity": "sha512-9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw==",
+      "dependencies": {
+        "npm-bundled": "^1.1.1",
+        "npm-normalize-package-bin": "^1.0.1"
+      },
+      "bin": {
+        "installed-package-contents": "index.js"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@npmcli/move-file": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.0.1.tgz",
+      "integrity": "sha512-Uv6h1sT+0DrblvIrolFtbvM1FgWm+/sy4B3pvLp67Zys+thcukzS5ekn7HsZFGpWP4Q3fYJCljbWQE/XivMRLw==",
+      "dependencies": {
+        "mkdirp": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@npmcli/move-file/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@npmcli/node-gyp": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-1.0.2.tgz",
+      "integrity": "sha512-yrJUe6reVMpktcvagumoqD9r08fH1iRo01gn1u0zoCApa9lnZGEigVKUd2hzsCId4gdtkZZIVscLhNxMECKgRg=="
+    },
+    "node_modules/@npmcli/promise-spawn": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-1.3.2.tgz",
+      "integrity": "sha512-QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg==",
+      "dependencies": {
+        "infer-owner": "^1.0.4"
+      }
+    },
+    "node_modules/@npmcli/run-script": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.8.5.tgz",
+      "integrity": "sha512-NQspusBCpTjNwNRFMtz2C5MxoxyzlbuJ4YEhxAKrIonTiirKDtatsZictx9RgamQIx6+QuHMNmPl0wQdoESs9A==",
+      "dependencies": {
+        "@npmcli/node-gyp": "^1.0.2",
+        "@npmcli/promise-spawn": "^1.3.2",
+        "infer-owner": "^1.0.4",
+        "node-gyp": "^7.1.0",
+        "read-package-json-fast": "^2.0.1"
+      }
+    },
+    "node_modules/@schematics/angular": {
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-10.0.8.tgz",
+      "integrity": "sha512-KNO61UGtiKMQSG+NbusqLtwLbxId0y+xpXJt9PKFwi+vaViOO+YzOPREfiFCuQ7q6X8SmNlrMj6sZ34E2YN1pQ==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "10.0.8",
+        "@angular-devkit/schematics": "10.0.8"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@schematics/angular/node_modules/@angular-devkit/core": {
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
+      "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "6.12.3",
+        "fast-json-stable-stringify": "2.1.0",
+        "magic-string": "0.25.7",
+        "rxjs": "6.5.5",
+        "source-map": "0.7.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@schematics/angular/node_modules/ajv": {
+      "version": "6.12.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@schematics/update": {
+      "version": "0.1000.8",
+      "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.1000.8.tgz",
+      "integrity": "sha512-xHuj6ME3PNTsVUrpftd98LF3WHPM0NU25GcT/n0E/j0/52yDTiaPS3wUnYSK8ZSv4Et4hcyGx7f/LEXAoOKJXw==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "10.0.8",
+        "@angular-devkit/schematics": "10.0.8",
+        "@yarnpkg/lockfile": "1.1.0",
+        "ini": "1.3.5",
+        "npm-package-arg": "^8.0.0",
+        "pacote": "9.5.12",
+        "rxjs": "6.5.5",
+        "semver": "7.3.2",
+        "semver-intersect": "1.4.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@schematics/update/node_modules/@angular-devkit/core": {
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
+      "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "6.12.3",
+        "fast-json-stable-stringify": "2.1.0",
+        "magic-string": "0.25.7",
+        "rxjs": "6.5.5",
+        "source-map": "0.7.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 6.11.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@schematics/update/node_modules/ajv": {
+      "version": "6.12.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@sindresorhus/is": {
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
+      "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@sinonjs/commons": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.1.tgz",
+      "integrity": "sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw==",
+      "dev": true,
+      "dependencies": {
+        "type-detect": "4.0.8"
+      }
+    },
+    "node_modules/@sinonjs/fake-timers": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz",
+      "integrity": "sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==",
+      "dev": true,
+      "dependencies": {
+        "@sinonjs/commons": "^1.7.0"
+      }
+    },
+    "node_modules/@stencil/core": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.5.2.tgz",
+      "integrity": "sha512-bgjPXkSzzg1WnTgVUm6m5ZzpKt602WmA/QljODAW1xVN40OHJdbGblzF/F6MFzqv2c5Cy30CB41arc8qADIdcQ==",
+      "bin": {
+        "stencil": "bin/stencil"
+      },
+      "engines": {
+        "node": ">=12.10.0",
+        "npm": ">=6.0.0"
+      }
+    },
+    "node_modules/@szmarczak/http-timer": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz",
+      "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==",
+      "dependencies": {
+        "defer-to-connect": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@tootallnate/once": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/@types/babel__core": {
+      "version": "7.1.10",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.10.tgz",
+      "integrity": "sha512-x8OM8XzITIMyiwl5Vmo2B1cR1S1Ipkyv4mdlbJjMa1lmuKvKY9FrBbEANIaMlnWn5Rf7uO+rC/VgYabNkE17Hw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0",
+        "@types/babel__generator": "*",
+        "@types/babel__template": "*",
+        "@types/babel__traverse": "*"
+      }
+    },
+    "node_modules/@types/babel__generator": {
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.2.tgz",
+      "integrity": "sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__template": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.3.tgz",
+      "integrity": "sha512-uCoznIPDmnickEi6D0v11SBpW0OuVqHJCa7syXqQHy5uktSCreIlt0iglsCnmvz8yCb38hGcWeseA8cWJSwv5Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__traverse": {
+      "version": "7.0.15",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.15.tgz",
+      "integrity": "sha512-Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.3.0"
+      }
+    },
+    "node_modules/@types/chart.js": {
+      "version": "2.9.31",
+      "resolved": "https://registry.npmjs.org/@types/chart.js/-/chart.js-2.9.31.tgz",
+      "integrity": "sha512-hzS6phN/kx3jClk3iYqEHNnYIRSi4RZrIGJ8CDLjgatpHoftCezvC44uqB3o3OUm9ftU1m7sHG8+RLyPTlACrA==",
+      "dependencies": {
+        "moment": "^2.10.2"
+      }
+    },
+    "node_modules/@types/cordova": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+    },
+    "node_modules/@types/dom-mediacapture-record": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/@types/dom-mediacapture-record/-/dom-mediacapture-record-1.0.7.tgz",
+      "integrity": "sha512-ddDIRTO1ajtbxaNo2o7fPJggpN54PZf1ZUJKOjto2ENMJE/9GKUvaw3ZRuQzlS/p0E+PnIcssxfoqYJ4yiXSBw=="
+    },
+    "node_modules/@types/faker": {
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/@types/faker/-/faker-5.1.3.tgz",
+      "integrity": "sha512-7YTyCRoujZWYaCpDLslQJ8QzaFWFLZZ3mZ7Vfr/jJHascRmSd05pYteyt2FK4btF2vXyGq0obuoyLpcF99OvaA==",
+      "dev": true
+    },
+    "node_modules/@types/glob": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
+      "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==",
+      "dev": true,
+      "dependencies": {
+        "@types/minimatch": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/graceful-fs": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.3.tgz",
+      "integrity": "sha512-AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/istanbul-lib-coverage": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
+      "integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==",
+      "dev": true
+    },
+    "node_modules/@types/istanbul-lib-report": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+      "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
+      "dev": true,
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "*"
+      }
+    },
+    "node_modules/@types/istanbul-reports": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
+      "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
+      "dev": true,
+      "dependencies": {
+        "@types/istanbul-lib-report": "*"
+      }
+    },
+    "node_modules/@types/jest": {
+      "version": "26.0.14",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.14.tgz",
+      "integrity": "sha512-Hz5q8Vu0D288x3iWXePSn53W7hAjP0H7EQ6QvDO9c7t46mR0lNOLlfuwQ+JkVxuhygHzlzPX+0jKdA3ZgSh+Vg==",
+      "dev": true,
+      "dependencies": {
+        "jest-diff": "^25.2.1",
+        "pretty-format": "^25.2.1"
+      }
+    },
+    "node_modules/@types/jest/node_modules/@jest/types": {
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
+      "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
+      "dev": true,
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^1.1.1",
+        "@types/yargs": "^15.0.0",
+        "chalk": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8.3"
+      }
+    },
+    "node_modules/@types/jest/node_modules/@types/istanbul-reports": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
+      "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
+      "dev": true,
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "*",
+        "@types/istanbul-lib-report": "*"
+      }
+    },
+    "node_modules/@types/jest/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@types/jest/node_modules/diff-sequences": {
+      "version": "25.2.6",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz",
+      "integrity": "sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8.3"
+      }
+    },
+    "node_modules/@types/jest/node_modules/jest-diff": {
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz",
+      "integrity": "sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^3.0.0",
+        "diff-sequences": "^25.2.6",
+        "jest-get-type": "^25.2.6",
+        "pretty-format": "^25.5.0"
+      },
+      "engines": {
+        "node": ">= 8.3"
+      }
+    },
+    "node_modules/@types/jest/node_modules/jest-get-type": {
+      "version": "25.2.6",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz",
+      "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8.3"
+      }
+    },
+    "node_modules/@types/jest/node_modules/pretty-format": {
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz",
+      "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^25.5.0",
+        "ansi-regex": "^5.0.0",
+        "ansi-styles": "^4.0.0",
+        "react-is": "^16.12.0"
+      },
+      "engines": {
+        "node": ">= 8.3"
+      }
+    },
+    "node_modules/@types/json-schema": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz",
+      "integrity": "sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==",
+      "dev": true
+    },
+    "node_modules/@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
+      "dev": true
+    },
+    "node_modules/@types/minimatch": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
+      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
+      "dev": true
+    },
+    "node_modules/@types/node": {
+      "version": "12.12.64",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.64.tgz",
+      "integrity": "sha512-UV1/ZJMC+HcP902wWdpC43cAcGu0IQk/I5bXjP2aSuCjsk3cE74mDvFrLKga7oDC170ugOAYBwfT4DSQW3akDA==",
+      "dev": true
+    },
+    "node_modules/@types/normalize-package-data": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
+      "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
+      "dev": true
+    },
+    "node_modules/@types/prettier": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.1.1.tgz",
+      "integrity": "sha512-2zs+O+UkDsJ1Vcp667pd3f8xearMdopz/z54i99wtRDI5KLmngk7vlrYZD0ZjKHaROR03EznlBbVY9PfAEyJIQ==",
+      "dev": true
+    },
+    "node_modules/@types/q": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz",
+      "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==",
+      "dev": true
+    },
+    "node_modules/@types/resize-observer-browser": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/@types/resize-observer-browser/-/resize-observer-browser-0.1.5.tgz",
+      "integrity": "sha512-8k/67Z95Goa6Lznuykxkfhq9YU3l1Qe6LNZmwde1u7802a3x8v44oq0j91DICclxatTr0rNnhXx7+VTIetSrSQ==",
+      "dev": true
+    },
+    "node_modules/@types/source-list-map": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
+      "integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==",
+      "dev": true
+    },
+    "node_modules/@types/stack-utils": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.0.tgz",
+      "integrity": "sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==",
+      "dev": true
+    },
+    "node_modules/@types/webpack-env": {
+      "version": "1.16.0",
+      "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.16.0.tgz",
+      "integrity": "sha512-Fx+NpfOO0CpeYX2g9bkvX8O5qh9wrU1sOF4g8sft4Mu7z+qfe387YlyY8w8daDyDsKY5vUxM0yxkAYnbkRbZEw==",
+      "dev": true
+    },
+    "node_modules/@types/webpack-sources": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.8.tgz",
+      "integrity": "sha512-JHB2/xZlXOjzjBB6fMOpH1eQAfsrpqVVIbneE0Rok16WXwFaznaI5vfg75U5WgGJm7V9W1c4xeRQDjX/zwvghA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "@types/source-list-map": "*",
+        "source-map": "^0.6.1"
+      }
+    },
+    "node_modules/@types/webpack-sources/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@types/yargs": {
+      "version": "15.0.7",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.7.tgz",
+      "integrity": "sha512-Gf4u3EjaPNcC9cTu4/j2oN14nSVhr8PQ+BvBcBQHAhDZfl0bVIiLgvnRXv/dn58XhTm9UXvBpvJpDlwV65QxOA==",
+      "dev": true,
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/@types/yargs-parser": {
+      "version": "15.0.0",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz",
+      "integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==",
+      "dev": true
+    },
+    "node_modules/@typescript-eslint/eslint-plugin": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.22.0.tgz",
+      "integrity": "sha512-U8SP9VOs275iDXaL08Ln1Fa/wLXfj5aTr/1c0t0j6CdbOnxh+TruXu1p4I0NAvdPBQgoPjHsgKn28mOi0FzfoA==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/experimental-utils": "4.22.0",
+        "@typescript-eslint/scope-manager": "4.22.0",
+        "debug": "^4.1.1",
+        "functional-red-black-tree": "^1.0.1",
+        "lodash": "^4.17.15",
+        "regexpp": "^3.0.0",
+        "semver": "^7.3.2",
+        "tsutils": "^3.17.1"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/parser": "^4.0.0",
+        "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/experimental-utils": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.22.0.tgz",
+      "integrity": "sha512-xJXHHl6TuAxB5AWiVrGhvbGL8/hbiCQ8FiWwObO3r0fnvBdrbWEDy1hlvGQOAWc6qsCWuWMKdVWlLAEMpxnddg==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.3",
+        "@typescript-eslint/scope-manager": "4.22.0",
+        "@typescript-eslint/types": "4.22.0",
+        "@typescript-eslint/typescript-estree": "4.22.0",
+        "eslint-scope": "^5.0.0",
+        "eslint-utils": "^2.0.0"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "*"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.22.0.tgz",
+      "integrity": "sha512-OcCO7LTdk6ukawUM40wo61WdeoA7NM/zaoq1/2cs13M7GyiF+T4rxuA4xM+6LeHWjWbss7hkGXjFDRcKD4O04Q==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.22.0",
+        "@typescript-eslint/visitor-keys": "4.22.0"
+      },
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.22.0.tgz",
+      "integrity": "sha512-sW/BiXmmyMqDPO2kpOhSy2Py5w6KvRRsKZnV0c4+0nr4GIcedJwXAq+RHNK4lLVEZAJYFltnnk1tJSlbeS9lYA==",
+      "dev": true,
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.0.tgz",
+      "integrity": "sha512-TkIFeu5JEeSs5ze/4NID+PIcVjgoU3cUQUIZnH3Sb1cEn1lBo7StSV5bwPuJQuoxKXlzAObjYTilOEKRuhR5yg==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.22.0",
+        "@typescript-eslint/visitor-keys": "4.22.0",
+        "debug": "^4.1.1",
+        "globby": "^11.0.1",
+        "is-glob": "^4.0.1",
+        "semver": "^7.3.2",
+        "tsutils": "^3.17.1"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.0.tgz",
+      "integrity": "sha512-nnMu4F+s4o0sll6cBSsTeVsT4cwxB7zECK3dFxzEjPBii9xLpq4yqqsy/FU5zMfan6G60DKZSCXAa3sHJZrcYw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.22.0",
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@typescript-eslint/experimental-utils": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.22.0.tgz",
+      "integrity": "sha512-xJXHHl6TuAxB5AWiVrGhvbGL8/hbiCQ8FiWwObO3r0fnvBdrbWEDy1hlvGQOAWc6qsCWuWMKdVWlLAEMpxnddg==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.3",
+        "@typescript-eslint/scope-manager": "4.22.0",
+        "@typescript-eslint/types": "4.22.0",
+        "@typescript-eslint/typescript-estree": "4.22.0",
+        "eslint-scope": "^5.0.0",
+        "eslint-utils": "^2.0.0"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "*"
+      }
+    },
+    "node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/parser": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.22.0.tgz",
+      "integrity": "sha512-z/bGdBJJZJN76nvAY9DkJANYgK3nlRstRRi74WHm3jjgf2I8AglrSY+6l7ogxOmn55YJ6oKZCLLy+6PW70z15Q==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/scope-manager": "4.22.0",
+        "@typescript-eslint/types": "4.22.0",
+        "@typescript-eslint/typescript-estree": "4.22.0",
+        "debug": "^4.1.1"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.22.0.tgz",
+      "integrity": "sha512-OcCO7LTdk6ukawUM40wo61WdeoA7NM/zaoq1/2cs13M7GyiF+T4rxuA4xM+6LeHWjWbss7hkGXjFDRcKD4O04Q==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.22.0",
+        "@typescript-eslint/visitor-keys": "4.22.0"
+      },
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.22.0.tgz",
+      "integrity": "sha512-sW/BiXmmyMqDPO2kpOhSy2Py5w6KvRRsKZnV0c4+0nr4GIcedJwXAq+RHNK4lLVEZAJYFltnnk1tJSlbeS9lYA==",
+      "dev": true,
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.0.tgz",
+      "integrity": "sha512-TkIFeu5JEeSs5ze/4NID+PIcVjgoU3cUQUIZnH3Sb1cEn1lBo7StSV5bwPuJQuoxKXlzAObjYTilOEKRuhR5yg==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.22.0",
+        "@typescript-eslint/visitor-keys": "4.22.0",
+        "debug": "^4.1.1",
+        "globby": "^11.0.1",
+        "is-glob": "^4.0.1",
+        "semver": "^7.3.2",
+        "tsutils": "^3.17.1"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.0.tgz",
+      "integrity": "sha512-nnMu4F+s4o0sll6cBSsTeVsT4cwxB7zECK3dFxzEjPBii9xLpq4yqqsy/FU5zMfan6G60DKZSCXAa3sHJZrcYw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.22.0",
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.22.0.tgz",
+      "integrity": "sha512-OcCO7LTdk6ukawUM40wo61WdeoA7NM/zaoq1/2cs13M7GyiF+T4rxuA4xM+6LeHWjWbss7hkGXjFDRcKD4O04Q==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.22.0",
+        "@typescript-eslint/visitor-keys": "4.22.0"
+      },
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/types": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.22.0.tgz",
+      "integrity": "sha512-sW/BiXmmyMqDPO2kpOhSy2Py5w6KvRRsKZnV0c4+0nr4GIcedJwXAq+RHNK4lLVEZAJYFltnnk1tJSlbeS9lYA==",
+      "dev": true,
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.0.tgz",
+      "integrity": "sha512-TkIFeu5JEeSs5ze/4NID+PIcVjgoU3cUQUIZnH3Sb1cEn1lBo7StSV5bwPuJQuoxKXlzAObjYTilOEKRuhR5yg==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.22.0",
+        "@typescript-eslint/visitor-keys": "4.22.0",
+        "debug": "^4.1.1",
+        "globby": "^11.0.1",
+        "is-glob": "^4.0.1",
+        "semver": "^7.3.2",
+        "tsutils": "^3.17.1"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@typescript-eslint/visitor-keys": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.0.tgz",
+      "integrity": "sha512-nnMu4F+s4o0sll6cBSsTeVsT4cwxB7zECK3dFxzEjPBii9xLpq4yqqsy/FU5zMfan6G60DKZSCXAa3sHJZrcYw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "4.22.0",
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@webassemblyjs/ast": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz",
+      "integrity": "sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/helper-module-context": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/wast-parser": "1.9.0"
+      }
+    },
+    "node_modules/@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz",
+      "integrity": "sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-api-error": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz",
+      "integrity": "sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-buffer": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz",
+      "integrity": "sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-code-frame": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz",
+      "integrity": "sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/wast-printer": "1.9.0"
+      }
+    },
+    "node_modules/@webassemblyjs/helper-fsm": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz",
+      "integrity": "sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-module-context": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz",
+      "integrity": "sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.9.0"
+      }
+    },
+    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz",
+      "integrity": "sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-wasm-section": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz",
+      "integrity": "sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-buffer": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/wasm-gen": "1.9.0"
+      }
+    },
+    "node_modules/@webassemblyjs/ieee754": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz",
+      "integrity": "sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==",
+      "dev": true,
+      "dependencies": {
+        "@xtuc/ieee754": "^1.2.0"
+      }
+    },
+    "node_modules/@webassemblyjs/leb128": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz",
+      "integrity": "sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==",
+      "dev": true,
+      "dependencies": {
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/utf8": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz",
+      "integrity": "sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/wasm-edit": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz",
+      "integrity": "sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-buffer": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/helper-wasm-section": "1.9.0",
+        "@webassemblyjs/wasm-gen": "1.9.0",
+        "@webassemblyjs/wasm-opt": "1.9.0",
+        "@webassemblyjs/wasm-parser": "1.9.0",
+        "@webassemblyjs/wast-printer": "1.9.0"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-gen": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz",
+      "integrity": "sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/ieee754": "1.9.0",
+        "@webassemblyjs/leb128": "1.9.0",
+        "@webassemblyjs/utf8": "1.9.0"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-opt": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz",
+      "integrity": "sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-buffer": "1.9.0",
+        "@webassemblyjs/wasm-gen": "1.9.0",
+        "@webassemblyjs/wasm-parser": "1.9.0"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-parser": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz",
+      "integrity": "sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-api-error": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/ieee754": "1.9.0",
+        "@webassemblyjs/leb128": "1.9.0",
+        "@webassemblyjs/utf8": "1.9.0"
+      }
+    },
+    "node_modules/@webassemblyjs/wast-parser": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz",
+      "integrity": "sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/floating-point-hex-parser": "1.9.0",
+        "@webassemblyjs/helper-api-error": "1.9.0",
+        "@webassemblyjs/helper-code-frame": "1.9.0",
+        "@webassemblyjs/helper-fsm": "1.9.0",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/wast-printer": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz",
+      "integrity": "sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/wast-parser": "1.9.0",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+      "dev": true
+    },
+    "node_modules/@xtuc/long": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+      "dev": true
+    },
+    "node_modules/@yarnpkg/lockfile": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz",
+      "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==",
+      "dev": true
+    },
+    "node_modules/abab": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
+      "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==",
+      "dev": true
+    },
+    "node_modules/abbrev": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
+    },
+    "node_modules/accepts": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
+      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
+      "dependencies": {
+        "mime-types": "~2.1.24",
+        "negotiator": "0.6.2"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/acorn": {
+      "version": "6.4.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
+      "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-globals": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
+      "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^7.1.1",
+        "acorn-walk": "^7.1.1"
+      }
+    },
+    "node_modules/acorn-globals/node_modules/acorn": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-jsx": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
+      "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
+      "dev": true,
+      "peerDependencies": {
+        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/acorn-walk": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/adjust-sourcemap-loader": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-2.0.0.tgz",
+      "integrity": "sha512-4hFsTsn58+YjrU9qKzML2JSSDqKvN8mUGQ0nNIrfPi8hmIONT4L3uUaT6MKdMsZ9AjsU6D2xDkZxCkbQPxChrA==",
+      "dev": true,
+      "dependencies": {
+        "assert": "1.4.1",
+        "camelcase": "5.0.0",
+        "loader-utils": "1.2.3",
+        "object-path": "0.11.4",
+        "regex-parser": "2.2.10"
+      }
+    },
+    "node_modules/adjust-sourcemap-loader/node_modules/camelcase": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz",
+      "integrity": "sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/adjust-sourcemap-loader/node_modules/emojis-list": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
+      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/adjust-sourcemap-loader/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/adjust-sourcemap-loader/node_modules/loader-utils": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
+      "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^2.0.0",
+        "json5": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/agent-base": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
+      "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
+      "dev": true,
+      "dependencies": {
+        "es6-promisify": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/agentkeepalive": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.5.2.tgz",
+      "integrity": "sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==",
+      "dev": true,
+      "dependencies": {
+        "humanize-ms": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/aggregate-error": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
+      "dependencies": {
+        "clean-stack": "^2.0.0",
+        "indent-string": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "6.12.5",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz",
+      "integrity": "sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ajv-errors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
+      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
+      "dev": true,
+      "peerDependencies": {
+        "ajv": ">=5.0.0"
+      }
+    },
+    "node_modules/ajv-formats": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.0.tgz",
+      "integrity": "sha512-USH2jBb+C/hIpwD2iRjp0pe0k+MvzG0mlSn/FIdCgQhUb9ALPRjt2KIQdfZDS9r0ZIeUAg7gOu9KL0PFqGqr5Q==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ajv-formats/node_modules/ajv": {
+      "version": "8.6.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.3.tgz",
+      "integrity": "sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ajv-formats/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
+    },
+    "node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/alphanum-sort": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
+      "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
+      "dev": true
+    },
+    "node_modules/android-versions": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-1.6.0.tgz",
+      "integrity": "sha512-ojC2Ig7b/KJ6iNtR8e4bacmOsJyEkoERk3CKMIsnH7kJz5z6551NMbrVaRb7KXYavu1d74Uhml/bfcmqT3nAcg==",
+      "dependencies": {
+        "semver": "^5.7.1"
+      }
+    },
+    "node_modules/android-versions/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/ansi": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz",
+      "integrity": "sha1-DELU+xcWDVqa8eSEus4cZpIsGyE="
+    },
+    "node_modules/ansi-align": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz",
+      "integrity": "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==",
+      "dependencies": {
+        "string-width": "^3.0.0"
+      }
+    },
+    "node_modules/ansi-align/node_modules/string-width": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+      "dependencies": {
+        "emoji-regex": "^7.0.1",
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ansi-colors": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
+      "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ansi-cyan": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz",
+      "integrity": "sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM=",
+      "dev": true,
+      "dependencies": {
+        "ansi-wrap": "0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ansi-escapes": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ansi-gray": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
+      "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=",
+      "dev": true,
+      "dependencies": {
+        "ansi-wrap": "0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ansi-html": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
+      "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=",
+      "dev": true,
+      "engines": [
+        "node >= 0.8.0"
+      ],
+      "bin": {
+        "ansi-html": "bin/ansi-html"
+      }
+    },
+    "node_modules/ansi-red": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz",
+      "integrity": "sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw=",
+      "dev": true,
+      "dependencies": {
+        "ansi-wrap": "0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/ansi-wrap": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
+      "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/anymatch": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+      "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+      "dev": true,
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/append-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz",
+      "integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=",
+      "dev": true,
+      "dependencies": {
+        "buffer-equal": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/aproba": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
+    },
+    "node_modules/archy": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
+      "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
+      "dev": true
+    },
+    "node_modules/are-we-there-yet": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
+      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
+      "dependencies": {
+        "delegates": "^1.0.0",
+        "readable-stream": "^2.0.6"
+      }
+    },
+    "node_modules/arg": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
+      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
+      "dev": true
+    },
+    "node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/aria-query": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
+      "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.10.2",
+        "@babel/runtime-corejs3": "^7.10.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
+    "node_modules/aria-query/node_modules/@babel/runtime": {
+      "version": "7.13.17",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.17.tgz",
+      "integrity": "sha512-NCdgJEelPTSh+FEFylhnP1ylq848l1z9t9N0j1Lfbcw0+KXGjsTvUmkxy+voLLXB5SOKMbLLx4jxYliGrYQseA==",
+      "dev": true,
+      "dependencies": {
+        "regenerator-runtime": "^0.13.4"
+      }
+    },
+    "node_modules/arity-n": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/arity-n/-/arity-n-1.0.4.tgz",
+      "integrity": "sha1-2edrEXM+CFacCEeuezmyhgswt0U=",
+      "dev": true
+    },
+    "node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/arr-filter": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz",
+      "integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=",
+      "dev": true,
+      "dependencies": {
+        "make-iterator": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/arr-map": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz",
+      "integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ=",
+      "dev": true,
+      "dependencies": {
+        "make-iterator": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-each": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
+      "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-find-index": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
+      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-flatten": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
+    },
+    "node_modules/array-includes": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.3.tgz",
+      "integrity": "sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.18.0-next.2",
+        "get-intrinsic": "^1.1.1",
+        "is-string": "^1.0.5"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/es-abstract": {
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz",
+      "integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.2",
+        "is-callable": "^1.2.3",
+        "is-negative-zero": "^2.0.1",
+        "is-regex": "^1.1.2",
+        "is-string": "^1.0.5",
+        "object-inspect": "^1.9.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.2",
+        "string.prototype.trimend": "^1.0.4",
+        "string.prototype.trimstart": "^1.0.4",
+        "unbox-primitive": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/has-symbols": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/is-callable": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
+      "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/is-negative-zero": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
+      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/is-regex": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
+      "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-symbols": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/object-inspect": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.2.tgz",
+      "integrity": "sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/object.assign": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "has-symbols": "^1.0.1",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/string.prototype.trimend": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
+      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/string.prototype.trimstart": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
+      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-initial": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz",
+      "integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U=",
+      "dev": true,
+      "dependencies": {
+        "array-slice": "^1.0.0",
+        "is-number": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-initial/node_modules/is-number": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+      "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-last": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz",
+      "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-last/node_modules/is-number": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+      "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-slice": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
+      "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-sort": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz",
+      "integrity": "sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==",
+      "dev": true,
+      "dependencies": {
+        "default-compare": "^1.0.0",
+        "get-value": "^2.0.6",
+        "kind-of": "^5.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-sort/node_modules/kind-of": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array.prototype.flat": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz",
+      "integrity": "sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.18.0-next.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/asap": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
+      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=",
+      "dev": true
+    },
+    "node_modules/asn1": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+      "dependencies": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
+    "node_modules/asn1.js": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
+      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "node_modules/asn1.js/node_modules/bn.js": {
+      "version": "4.11.9",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+      "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+      "dev": true
+    },
+    "node_modules/assert": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
+      "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
+      "dev": true,
+      "dependencies": {
+        "util": "0.10.3"
+      }
+    },
+    "node_modules/assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ast-types": {
+      "version": "0.13.4",
+      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz",
+      "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/astral-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/async": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "dependencies": {
+        "lodash": "^4.17.14"
+      }
+    },
+    "node_modules/async-done": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz",
+      "integrity": "sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==",
+      "dev": true,
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.2",
+        "process-nextick-args": "^2.0.0",
+        "stream-exhaust": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/async-each": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
+      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
+      "dev": true
+    },
+    "node_modules/async-limiter": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
+      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
+      "dev": true
+    },
+    "node_modules/async-settle": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz",
+      "integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=",
+      "dev": true,
+      "dependencies": {
+        "async-done": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+    },
+    "node_modules/at-least-node": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
+      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/atob": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+      "dev": true,
+      "bin": {
+        "atob": "bin/atob.js"
+      },
+      "engines": {
+        "node": ">= 4.5.0"
+      }
+    },
+    "node_modules/autoprefixer": {
+      "version": "9.8.0",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.0.tgz",
+      "integrity": "sha512-D96ZiIHXbDmU02dBaemyAg53ez+6F5yZmapmgKcjm35yEe1uVDYI8hGW3VYoGRaG290ZFf91YxHrR518vC0u/A==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.12.0",
+        "caniuse-lite": "^1.0.30001061",
+        "chalk": "^2.4.2",
+        "normalize-range": "^0.1.2",
+        "num2fraction": "^1.2.2",
+        "postcss": "^7.0.30",
+        "postcss-value-parser": "^4.1.0"
+      },
+      "bin": {
+        "autoprefixer": "bin/autoprefixer"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      },
+      "funding": {
+        "type": "tidelift",
+        "url": "https://tidelift.com/funding/github/npm/autoprefixer"
+      }
+    },
+    "node_modules/autoprefixer/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/autoprefixer/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/autoprefixer/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/autoprefixer/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/autoprefixer/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/autoprefixer/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/aws4": {
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz",
+      "integrity": "sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA=="
+    },
+    "node_modules/axobject-query": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
+      "integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==",
+      "dev": true
+    },
+    "node_modules/babel-jest": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.5.2.tgz",
+      "integrity": "sha512-U3KvymF3SczA3vOL/cgiUFOznfMET+XDIXiWnoJV45siAp2pLMG8i2+/MGZlAC3f/F6Q40LR4M4qDrWZ9wkK8A==",
+      "dev": true,
+      "dependencies": {
+        "@jest/transform": "^26.5.2",
+        "@jest/types": "^26.5.2",
+        "@types/babel__core": "^7.1.7",
+        "babel-plugin-istanbul": "^6.0.0",
+        "babel-preset-jest": "^26.5.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/babel-jest/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/babel-loader": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz",
+      "integrity": "sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==",
+      "dev": true,
+      "dependencies": {
+        "find-cache-dir": "^2.1.0",
+        "loader-utils": "^1.4.0",
+        "mkdirp": "^0.5.3",
+        "pify": "^4.0.1",
+        "schema-utils": "^2.6.5"
+      },
+      "engines": {
+        "node": ">= 6.9"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0",
+        "webpack": ">=2"
+      }
+    },
+    "node_modules/babel-loader/node_modules/find-cache-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
+      "dev": true,
+      "dependencies": {
+        "commondir": "^1.0.1",
+        "make-dir": "^2.0.0",
+        "pkg-dir": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/babel-loader/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/babel-loader/node_modules/loader-utils": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/babel-loader/node_modules/make-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+      "dev": true,
+      "dependencies": {
+        "pify": "^4.0.1",
+        "semver": "^5.6.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/babel-loader/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/babel-plugin-dynamic-import-node": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
+      "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
+      "dev": true,
+      "dependencies": {
+        "object.assign": "^4.1.0"
+      }
+    },
+    "node_modules/babel-plugin-istanbul": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz",
+      "integrity": "sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-instrument": "^4.0.0",
+        "test-exclude": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/babel-plugin-jest-hoist": {
+      "version": "26.5.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.5.0.tgz",
+      "integrity": "sha512-ck17uZFD3CDfuwCLATWZxkkuGGFhMij8quP8CNhwj8ek1mqFgbFzRJ30xwC04LLscj/aKsVFfRST+b5PT7rSuw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/template": "^7.3.3",
+        "@babel/types": "^7.3.3",
+        "@types/babel__core": "^7.0.0",
+        "@types/babel__traverse": "^7.0.6"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/babel-preset-current-node-syntax": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.4.tgz",
+      "integrity": "sha512-5/INNCYhUGqw7VbVjT/hb3ucjgkVHKXY7lX3ZjlN4gm565VyFmJUrJ/h+h16ECVB38R/9SF6aACydpKMLZ/c9w==",
+      "dev": true,
+      "dependencies": {
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-bigint": "^7.8.3",
+        "@babel/plugin-syntax-class-properties": "^7.8.3",
+        "@babel/plugin-syntax-import-meta": "^7.8.3",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.8.3",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/babel-preset-jest": {
+      "version": "26.5.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.5.0.tgz",
+      "integrity": "sha512-F2vTluljhqkiGSJGBg/jOruA8vIIIL11YrxRcO7nviNTMbbofPSHwnm8mgP7d/wS7wRSexRoI6X1A6T74d4LQA==",
+      "dev": true,
+      "dependencies": {
+        "babel-plugin-jest-hoist": "^26.5.0",
+        "babel-preset-current-node-syntax": "^0.1.3"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/bach": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz",
+      "integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=",
+      "dev": true,
+      "dependencies": {
+        "arr-filter": "^1.1.1",
+        "arr-flatten": "^1.0.1",
+        "arr-map": "^2.0.0",
+        "array-each": "^1.0.0",
+        "array-initial": "^1.0.0",
+        "array-last": "^1.1.1",
+        "async-done": "^1.2.2",
+        "async-settle": "^1.0.0",
+        "now-and-later": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+    },
+    "node_modules/base": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "dev": true,
+      "dependencies": {
+        "cache-base": "^1.0.1",
+        "class-utils": "^0.3.5",
+        "component-emitter": "^1.2.1",
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.1",
+        "mixin-deep": "^1.2.0",
+        "pascalcase": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/base/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/base/node_modules/is-accessor-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/base/node_modules/is-data-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/base/node_modules/is-descriptor": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.0",
+        "is-data-descriptor": "^1.0.0",
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/base/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/base64-js": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
+      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
+    },
+    "node_modules/batch": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
+      "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
+      "dev": true
+    },
+    "node_modules/bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+      "dependencies": {
+        "tweetnacl": "^0.14.3"
+      }
+    },
+    "node_modules/big-integer": {
+      "version": "1.6.48",
+      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.48.tgz",
+      "integrity": "sha512-j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w==",
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/big.js": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/binary-extensions": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
+      "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
+    "node_modules/bl": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.3.tgz",
+      "integrity": "sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==",
+      "optional": true,
+      "dependencies": {
+        "buffer": "^5.5.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
+      }
+    },
+    "node_modules/bl/node_modules/buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "optional": true,
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
+    "node_modules/bl/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "optional": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/bluebird": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+      "dev": true
+    },
+    "node_modules/bn.js": {
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz",
+      "integrity": "sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==",
+      "dev": true
+    },
+    "node_modules/body-parser": {
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
+      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
+      "dependencies": {
+        "bytes": "3.1.0",
+        "content-type": "~1.0.4",
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "http-errors": "1.7.2",
+        "iconv-lite": "0.4.24",
+        "on-finished": "~2.3.0",
+        "qs": "6.7.0",
+        "raw-body": "2.4.0",
+        "type-is": "~1.6.17"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/body-parser/node_modules/bytes": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/bonjour": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
+      "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
+      "dev": true,
+      "dependencies": {
+        "array-flatten": "^2.1.0",
+        "deep-equal": "^1.0.1",
+        "dns-equal": "^1.0.0",
+        "dns-txt": "^2.0.2",
+        "multicast-dns": "^6.0.1",
+        "multicast-dns-service-types": "^1.1.0"
+      }
+    },
+    "node_modules/bonjour/node_modules/array-flatten": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
+      "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
+      "dev": true
+    },
+    "node_modules/boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
+      "dev": true
+    },
+    "node_modules/boxen": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/boxen/-/boxen-4.2.0.tgz",
+      "integrity": "sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==",
+      "dependencies": {
+        "ansi-align": "^3.0.0",
+        "camelcase": "^5.3.1",
+        "chalk": "^3.0.0",
+        "cli-boxes": "^2.2.0",
+        "string-width": "^4.1.0",
+        "term-size": "^2.1.0",
+        "type-fest": "^0.8.1",
+        "widest-line": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/boxen/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/boxen/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
+    "node_modules/boxen/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/boxen/node_modules/string-width": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/boxen/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/bplist-creator": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.8.tgz",
+      "integrity": "sha512-Za9JKzD6fjLC16oX2wsXfc+qBEhJBJB1YPInoAQpMLhDuj5aVOv1baGeIQSq1Fr3OCqzvsoQcSBSwGId/Ja2PA==",
+      "dependencies": {
+        "stream-buffers": "~2.2.0"
+      }
+    },
+    "node_modules/bplist-parser": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.2.0.tgz",
+      "integrity": "sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==",
+      "dependencies": {
+        "big-integer": "^1.6.44"
+      },
+      "engines": {
+        "node": ">= 5.10.0"
+      }
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dependencies": {
+        "fill-range": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
+      "dev": true
+    },
+    "node_modules/browser-process-hrtime": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
+      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
+      "dev": true
+    },
+    "node_modules/browserify-aes": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "dev": true,
+      "dependencies": {
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/browserify-cipher": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+      "dev": true,
+      "dependencies": {
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
+      }
+    },
+    "node_modules/browserify-des": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+      "dev": true,
+      "dependencies": {
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/browserify-rsa": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "randombytes": "^2.0.1"
+      }
+    },
+    "node_modules/browserify-rsa/node_modules/bn.js": {
+      "version": "4.11.9",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+      "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+      "dev": true
+    },
+    "node_modules/browserify-sign": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
+      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^5.1.1",
+        "browserify-rsa": "^4.0.1",
+        "create-hash": "^1.2.0",
+        "create-hmac": "^1.1.7",
+        "elliptic": "^6.5.3",
+        "inherits": "^2.0.4",
+        "parse-asn1": "^5.1.5",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      }
+    },
+    "node_modules/browserify-sign/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/browserify-sign/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/browserify-zlib": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+      "dev": true,
+      "dependencies": {
+        "pako": "~1.0.5"
+      }
+    },
+    "node_modules/browserslist": {
+      "version": "4.14.5",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.5.tgz",
+      "integrity": "sha512-Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA==",
+      "dev": true,
+      "dependencies": {
+        "caniuse-lite": "^1.0.30001135",
+        "electron-to-chromium": "^1.3.571",
+        "escalade": "^3.1.0",
+        "node-releases": "^1.1.61"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      },
+      "funding": {
+        "type": "tidelift",
+        "url": "https://tidelift.com/funding/github/npm/browserslist"
+      }
+    },
+    "node_modules/bs-logger": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
+      "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
+      "dev": true,
+      "dependencies": {
+        "fast-json-stable-stringify": "2.x"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/bser": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
+      "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
+      "dev": true,
+      "dependencies": {
+        "node-int64": "^0.4.0"
+      }
+    },
+    "node_modules/buffer": {
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
+      "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
+      "dev": true,
+      "dependencies": {
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
+      }
+    },
+    "node_modules/buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/buffer-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
+      "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
+      "dev": true
+    },
+    "node_modules/buffer-indexof": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
+      "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==",
+      "dev": true
+    },
+    "node_modules/buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
+      "dev": true
+    },
+    "node_modules/builtin-status-codes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
+      "dev": true
+    },
+    "node_modules/builtins": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz",
+      "integrity": "sha1-y5T662HIaWRR2zZTThQi+U8K7og="
+    },
+    "node_modules/bytes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/cacache": {
+      "version": "15.0.3",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.3.tgz",
+      "integrity": "sha512-bc3jKYjqv7k4pWh7I/ixIjfcjPul4V4jme/WbjvwGS5LzoPL/GzXr4C5EgPNLO/QEZl9Oi61iGitYEdwcrwLCQ==",
+      "dev": true,
+      "dependencies": {
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "glob": "^7.1.4",
+        "infer-owner": "^1.0.4",
+        "lru-cache": "^5.1.1",
+        "minipass": "^3.1.1",
+        "minipass-collect": "^1.0.2",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.2",
+        "mkdirp": "^1.0.3",
+        "move-file": "^2.0.0",
+        "p-map": "^4.0.0",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^3.0.2",
+        "ssri": "^8.0.0",
+        "tar": "^6.0.2",
+        "unique-filename": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/cacache/node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/cacache/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "dev": true,
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cacache/node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true
+    },
+    "node_modules/cache-base": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+      "dev": true,
+      "dependencies": {
+        "collection-visit": "^1.0.0",
+        "component-emitter": "^1.2.1",
+        "get-value": "^2.0.6",
+        "has-value": "^1.0.0",
+        "isobject": "^3.0.1",
+        "set-value": "^2.0.0",
+        "to-object-path": "^0.3.0",
+        "union-value": "^1.0.0",
+        "unset-value": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/cache-base/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/cacheable-request": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
+      "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==",
+      "dependencies": {
+        "clone-response": "^1.0.2",
+        "get-stream": "^5.1.0",
+        "http-cache-semantics": "^4.0.0",
+        "keyv": "^3.0.0",
+        "lowercase-keys": "^2.0.0",
+        "normalize-url": "^4.1.0",
+        "responselike": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cacheable-request/node_modules/lowercase-keys": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
+      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/caller-callsite": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
+      "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
+      "dev": true,
+      "dependencies": {
+        "callsites": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/caller-callsite/node_modules/callsites": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
+      "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/caller-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
+      "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
+      "dev": true,
+      "dependencies": {
+        "caller-callsite": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/camel-case": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
+      "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
+      "dev": true,
+      "dependencies": {
+        "no-case": "^2.2.0",
+        "upper-case": "^1.1.1"
+      }
+    },
+    "node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/caniuse-api": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
+      "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.0.0",
+        "caniuse-lite": "^1.0.0",
+        "lodash.memoize": "^4.1.2",
+        "lodash.uniq": "^4.5.0"
+      }
+    },
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001197",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001197.tgz",
+      "integrity": "sha512-8aE+sqBqtXz4G8g35Eg/XEaFr2N7rd/VQ6eABGBmNtcB8cN6qNJhMi6oSFy4UWWZgqgL3filHT8Nha4meu3tsw==",
+      "dev": true
+    },
+    "node_modules/canonical-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/canonical-path/-/canonical-path-1.0.0.tgz",
+      "integrity": "sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg==",
+      "dev": true
+    },
+    "node_modules/capture-exit": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz",
+      "integrity": "sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==",
+      "dev": true,
+      "dependencies": {
+        "rsvp": "^4.8.4"
+      },
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+    },
+    "node_modules/chalk": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/char-regex": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
+      "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/chardet": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
+      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="
+    },
+    "node_modules/chart.js": {
+      "version": "2.9.4",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.9.4.tgz",
+      "integrity": "sha512-B07aAzxcrikjAPyV+01j7BmOpxtQETxTSlQ26BEYJ+3iUkbNKaOJ/nDbT6JjyqYxseM0ON12COHYdU2cTIjC7A==",
+      "dependencies": {
+        "chartjs-color": "^2.1.0",
+        "moment": "^2.10.2"
+      }
+    },
+    "node_modules/chartjs-color": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/chartjs-color/-/chartjs-color-2.4.1.tgz",
+      "integrity": "sha512-haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w==",
+      "dependencies": {
+        "chartjs-color-string": "^0.6.0",
+        "color-convert": "^1.9.3"
+      }
+    },
+    "node_modules/chartjs-color-string": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz",
+      "integrity": "sha512-TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A==",
+      "dependencies": {
+        "color-name": "^1.0.0"
+      }
+    },
+    "node_modules/chartjs-color/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/chartjs-color/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+    },
+    "node_modules/check-es-compat": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/check-es-compat/-/check-es-compat-1.1.1.tgz",
+      "integrity": "sha512-q8k6nnYg6aabuEtx0LyVXP8Q3OQ07eOAAWZ7eD95FiSk+GRIdqouuJHd7gGPzxSUJZRioRrW2GMWu7MHDFsIUw==",
+      "dev": true,
+      "dependencies": {
+        "eslint": "^6.7.2",
+        "eslint-plugin-ecmascript-compat": "^1.1.1"
+      },
+      "bin": {
+        "check-es-compat": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/acorn": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/ansi-escapes": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
+      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.11.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/ansi-escapes/node_modules/type-fest": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
+      "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/astral-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
+      "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/cli-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+      "dev": true,
+      "dependencies": {
+        "restore-cursor": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/cli-width": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
+      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/check-es-compat/node_modules/cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "dev": true,
+      "dependencies": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      },
+      "engines": {
+        "node": ">=4.8"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/cross-spawn/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/check-es-compat/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/check-es-compat/node_modules/eslint": {
+      "version": "6.8.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz",
+      "integrity": "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "ajv": "^6.10.0",
+        "chalk": "^2.1.0",
+        "cross-spawn": "^6.0.5",
+        "debug": "^4.0.1",
+        "doctrine": "^3.0.0",
+        "eslint-scope": "^5.0.0",
+        "eslint-utils": "^1.4.3",
+        "eslint-visitor-keys": "^1.1.0",
+        "espree": "^6.1.2",
+        "esquery": "^1.0.1",
+        "esutils": "^2.0.2",
+        "file-entry-cache": "^5.0.1",
+        "functional-red-black-tree": "^1.0.1",
+        "glob-parent": "^5.0.0",
+        "globals": "^12.1.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "inquirer": "^7.0.0",
+        "is-glob": "^4.0.0",
+        "js-yaml": "^3.13.1",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.3.0",
+        "lodash": "^4.17.14",
+        "minimatch": "^3.0.4",
+        "mkdirp": "^0.5.1",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.8.3",
+        "progress": "^2.0.0",
+        "regexpp": "^2.0.1",
+        "semver": "^6.1.2",
+        "strip-ansi": "^5.2.0",
+        "strip-json-comments": "^3.0.1",
+        "table": "^5.2.3",
+        "text-table": "^0.2.0",
+        "v8-compile-cache": "^2.0.3"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/eslint-utils": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
+      "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/eslint-visitor-keys": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/espree": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz",
+      "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^7.1.1",
+        "acorn-jsx": "^5.2.0",
+        "eslint-visitor-keys": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/figures": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+      "dev": true,
+      "dependencies": {
+        "escape-string-regexp": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/file-entry-cache": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
+      "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
+      "dev": true,
+      "dependencies": {
+        "flat-cache": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/flat-cache": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
+      "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
+      "dev": true,
+      "dependencies": {
+        "flatted": "^2.0.0",
+        "rimraf": "2.6.3",
+        "write": "1.0.3"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/flatted": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz",
+      "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==",
+      "dev": true
+    },
+    "node_modules/check-es-compat/node_modules/globals": {
+      "version": "12.4.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
+      "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.8.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/ignore": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/inquirer": {
+      "version": "7.3.3",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz",
+      "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.1.0",
+        "cli-cursor": "^3.1.0",
+        "cli-width": "^3.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^3.0.0",
+        "lodash": "^4.17.19",
+        "mute-stream": "0.0.8",
+        "run-async": "^2.4.0",
+        "rxjs": "^6.6.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "through": "^2.3.6"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/inquirer/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/inquirer/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/inquirer/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/inquirer/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/check-es-compat/node_modules/inquirer/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/inquirer/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/inquirer/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/check-es-compat/node_modules/optionator": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+      "dev": true,
+      "dependencies": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.6",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "word-wrap": "~1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/regexpp": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
+      "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.5.0"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/restore-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "dev": true,
+      "dependencies": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/rimraf": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/rxjs": {
+      "version": "6.6.6",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.6.tgz",
+      "integrity": "sha512-/oTwee4N4iWzAMAL9xdGKjkEHmIwupR3oXbQjCKywF1BeFohswF3vZdogbmEF6pZkOsXTzWkrZszrWpQTByYVg==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/slice-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
+      "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.0",
+        "astral-regex": "^1.0.0",
+        "is-fullwidth-code-point": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/slice-ansi/node_modules/is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/string-width": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/string-width/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/table": {
+      "version": "5.4.6",
+      "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
+      "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.10.2",
+        "lodash": "^4.17.14",
+        "slice-ansi": "^2.1.0",
+        "string-width": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/table/node_modules/emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "dev": true
+    },
+    "node_modules/check-es-compat/node_modules/table/node_modules/is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/table/node_modules/string-width": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^7.0.1",
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
+    "node_modules/check-es-compat/node_modules/type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/check-es-compat/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/cheerio": {
+      "version": "1.0.0-rc.3",
+      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.3.tgz",
+      "integrity": "sha512-0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA==",
+      "dev": true,
+      "dependencies": {
+        "css-select": "~1.2.0",
+        "dom-serializer": "~0.1.1",
+        "entities": "~1.1.1",
+        "htmlparser2": "^3.9.1",
+        "lodash": "^4.15.0",
+        "parse5": "^3.0.1"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/cheerio/node_modules/css-select": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
+      "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "~1.0.0",
+        "css-what": "2.1",
+        "domutils": "1.5.1",
+        "nth-check": "~1.0.1"
+      }
+    },
+    "node_modules/cheerio/node_modules/css-what": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
+      "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/cheerio/node_modules/dom-serializer": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
+      "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^1.3.0",
+        "entities": "^1.1.1"
+      }
+    },
+    "node_modules/cheerio/node_modules/domutils": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
+      "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
+      "dev": true,
+      "dependencies": {
+        "dom-serializer": "0",
+        "domelementtype": "1"
+      }
+    },
+    "node_modules/cheerio/node_modules/entities": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
+      "dev": true
+    },
+    "node_modules/cheerio/node_modules/parse5": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz",
+      "integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/chokidar": {
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz",
+      "integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==",
+      "dev": true,
+      "dependencies": {
+        "anymatch": "~3.1.1",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.0",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.4.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.1.2"
+      }
+    },
+    "node_modules/chownr": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/chrome-trace-event": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz",
+      "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
+    "node_modules/chrome-trace-event/node_modules/tslib": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
+      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
+      "dev": true
+    },
+    "node_modules/ci-info": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
+      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="
+    },
+    "node_modules/cipher-base": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/circular-dependency-plugin": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-5.2.0.tgz",
+      "integrity": "sha512-7p4Kn/gffhQaavNfyDFg7LS5S/UT1JAjyGd4UqR2+jzoYF02eDkj0Ec3+48TsIa4zghjLY87nQHIh/ecK9qLdw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0.0"
+      },
+      "peerDependencies": {
+        "webpack": ">=4.0.1"
+      }
+    },
+    "node_modules/class-utils": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+      "dev": true,
+      "dependencies": {
+        "arr-union": "^3.1.0",
+        "define-property": "^0.2.5",
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/clean-css": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz",
+      "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==",
+      "dev": true,
+      "dependencies": {
+        "source-map": "~0.6.0"
+      },
+      "engines": {
+        "node": ">= 4.0"
+      }
+    },
+    "node_modules/clean-css/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/clean-stack": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/cli-boxes": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz",
+      "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==",
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cli-cursor": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+      "dependencies": {
+        "restore-cursor": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/cli-spinners": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.4.0.tgz",
+      "integrity": "sha512-sJAofoarcm76ZGpuooaO0eDy8saEy+YoZBLjC4h8srt4jeBnkYeOgqxgsJQTpyt2LjI5PTfLJHSL+41Yu4fEJA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cli-width": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
+      "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw=="
+    },
+    "node_modules/cliui": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^3.1.0",
+        "strip-ansi": "^5.2.0",
+        "wrap-ansi": "^5.1.0"
+      }
+    },
+    "node_modules/cliui/node_modules/string-width": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^7.0.1",
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/clone": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+      "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/clone-buffer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
+      "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/clone-deep": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4",
+        "kind-of": "^6.0.2",
+        "shallow-clone": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/clone-response": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
+      "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
+      "dependencies": {
+        "mimic-response": "^1.0.0"
+      }
+    },
+    "node_modules/clone-stats": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
+      "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
+      "dev": true
+    },
+    "node_modules/cloneable-readable": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz",
+      "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "process-nextick-args": "^2.0.0",
+        "readable-stream": "^2.3.5"
+      }
+    },
+    "node_modules/co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+      "dev": true,
+      "engines": {
+        "iojs": ">= 1.0.0",
+        "node": ">= 0.12.0"
+      }
+    },
+    "node_modules/coa": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
+      "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
+      "dev": true,
+      "dependencies": {
+        "@types/q": "^1.5.1",
+        "chalk": "^2.4.1",
+        "q": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 4.0"
+      }
+    },
+    "node_modules/coa/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/coa/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/coa/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/coa/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/coa/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/coa/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/code-point-at": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/collect-v8-coverage": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
+      "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
+      "dev": true
+    },
+    "node_modules/collection-map": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz",
+      "integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=",
+      "dev": true,
+      "dependencies": {
+        "arr-map": "^2.0.2",
+        "for-own": "^1.0.0",
+        "make-iterator": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/collection-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+      "dev": true,
+      "dependencies": {
+        "map-visit": "^1.0.0",
+        "object-visit": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/color": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/color/-/color-3.1.2.tgz",
+      "integrity": "sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.1",
+        "color-string": "^1.5.2"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    },
+    "node_modules/color-string": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz",
+      "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "^1.0.0",
+        "simple-swizzle": "^0.2.2"
+      }
+    },
+    "node_modules/color-support": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
+      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+      "dev": true,
+      "bin": {
+        "color-support": "bin.js"
+      }
+    },
+    "node_modules/color/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/color/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/colorette": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.1.0.tgz",
+      "integrity": "sha512-6S062WDQUXi6hOfkO/sBPVwE5ASXY4G2+b4atvhJfSsuUUhIaUKlkjLe9692Ipyt5/a+IPF5aVTu3V5gvXq5cg==",
+      "dev": true
+    },
+    "node_modules/colors": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
+      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
+      "engines": {
+        "node": ">=0.1.90"
+      }
+    },
+    "node_modules/com-darryncampbell-cordova-plugin-intent": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/com-darryncampbell-cordova-plugin-intent/-/com-darryncampbell-cordova-plugin-intent-1.3.0.tgz",
+      "integrity": "sha512-JXslndd4UiRHmirGZrwrHZHczoZ5sxM7zAylm4bPX7ZDwD4FdCHhILgDA8AeaG8wc11e0A7OEAFo0Esgc0M4yA=="
+    },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
+    },
+    "node_modules/comment-parser": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.1.5.tgz",
+      "integrity": "sha512-RePCE4leIhBlmrqiYTvaqEeGYg7qpSl4etaIabKtdOQVi+mSTIBBklGUwIr79GXYnl3LpMwmDw4KeR2stNc6FA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+      "dev": true
+    },
+    "node_modules/component-emitter": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
+      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
+      "dev": true
+    },
+    "node_modules/compose-function": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/compose-function/-/compose-function-3.0.3.tgz",
+      "integrity": "sha1-ntZ18TzFRQHTCVCkhv9qe6OrGF8=",
+      "dev": true,
+      "dependencies": {
+        "arity-n": "^1.0.4"
+      }
+    },
+    "node_modules/compressible": {
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
+      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
+      "dependencies": {
+        "mime-db": ">= 1.43.0 < 2"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/compression": {
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
+      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
+      "dependencies": {
+        "accepts": "~1.3.5",
+        "bytes": "3.0.0",
+        "compressible": "~2.0.16",
+        "debug": "2.6.9",
+        "on-headers": "~1.0.2",
+        "safe-buffer": "5.1.2",
+        "vary": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+    },
+    "node_modules/concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "dev": true,
+      "engines": [
+        "node >= 0.8"
+      ],
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      }
+    },
+    "node_modules/concat-with-sourcemaps": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz",
+      "integrity": "sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==",
+      "dev": true,
+      "dependencies": {
+        "source-map": "^0.6.1"
+      }
+    },
+    "node_modules/concat-with-sourcemaps/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/conf": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/conf/-/conf-1.4.0.tgz",
+      "integrity": "sha512-bzlVWS2THbMetHqXKB8ypsXN4DQ/1qopGwNJi1eYbpwesJcd86FBjFciCQX/YwAhp9bM7NVnPFqZ5LpV7gP0Dg==",
+      "dependencies": {
+        "dot-prop": "^4.1.0",
+        "env-paths": "^1.0.0",
+        "make-dir": "^1.0.0",
+        "pkg-up": "^2.0.0",
+        "write-file-atomic": "^2.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/conf/node_modules/dot-prop": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.1.tgz",
+      "integrity": "sha512-l0p4+mIuJIua0mhxGoh4a+iNL9bmeK5DvnSVQa6T0OhrVmaEa1XScX5Etc673FePCJOArq/4Pa2cLGODUWTPOQ==",
+      "dependencies": {
+        "is-obj": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/conf/node_modules/is-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/conf/node_modules/make-dir": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
+      "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+      "dependencies": {
+        "pify": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/conf/node_modules/pify": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/conf/node_modules/write-file-atomic": {
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz",
+      "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==",
+      "dependencies": {
+        "graceful-fs": "^4.1.11",
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^3.0.2"
+      }
+    },
+    "node_modules/configstore": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz",
+      "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==",
+      "dependencies": {
+        "dot-prop": "^5.2.0",
+        "graceful-fs": "^4.1.2",
+        "make-dir": "^3.0.0",
+        "unique-string": "^2.0.0",
+        "write-file-atomic": "^3.0.0",
+        "xdg-basedir": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/connect-history-api-fallback": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
+      "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/console-browserify": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
+      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
+      "dev": true
+    },
+    "node_modules/console-control-strings": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
+    },
+    "node_modules/constants-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
+      "dev": true
+    },
+    "node_modules/contains-path": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
+      "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/content-disposition": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
+      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
+      "dependencies": {
+        "safe-buffer": "5.1.2"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/content-type": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/convert-source-map": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
+      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.1"
+      }
+    },
+    "node_modules/cookie": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
+      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
+    },
+    "node_modules/cookiejar": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz",
+      "integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==",
+      "dev": true
+    },
+    "node_modules/copy-concurrently": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
+      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+      "dev": true,
+      "dependencies": {
+        "aproba": "^1.1.1",
+        "fs-write-stream-atomic": "^1.0.8",
+        "iferr": "^0.1.5",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.0"
+      }
+    },
+    "node_modules/copy-concurrently/node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/copy-descriptor": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/copy-props": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz",
+      "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==",
+      "dev": true,
+      "dependencies": {
+        "each-props": "^1.3.0",
+        "is-plain-object": "^2.0.1"
+      }
+    },
+    "node_modules/copy-webpack-plugin": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.0.3.tgz",
+      "integrity": "sha512-q5m6Vz4elsuyVEIUXr7wJdIdePWTubsqVbEMvf1WQnHGv0Q+9yPRu7MtYFPt+GBOXRav9lvIINifTQ1vSCs+eA==",
+      "dev": true,
+      "dependencies": {
+        "cacache": "^15.0.4",
+        "fast-glob": "^3.2.4",
+        "find-cache-dir": "^3.3.1",
+        "glob-parent": "^5.1.1",
+        "globby": "^11.0.1",
+        "loader-utils": "^2.0.0",
+        "normalize-path": "^3.0.0",
+        "p-limit": "^3.0.1",
+        "schema-utils": "^2.7.0",
+        "serialize-javascript": "^4.0.0",
+        "webpack-sources": "^1.4.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.37.0 || ^5.0.0"
+      }
+    },
+    "node_modules/copy-webpack-plugin/node_modules/cacache": {
+      "version": "15.0.5",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.5.tgz",
+      "integrity": "sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A==",
+      "dev": true,
+      "dependencies": {
+        "@npmcli/move-file": "^1.0.1",
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "glob": "^7.1.4",
+        "infer-owner": "^1.0.4",
+        "lru-cache": "^6.0.0",
+        "minipass": "^3.1.1",
+        "minipass-collect": "^1.0.2",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.2",
+        "mkdirp": "^1.0.3",
+        "p-map": "^4.0.0",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^3.0.2",
+        "ssri": "^8.0.0",
+        "tar": "^6.0.2",
+        "unique-filename": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/copy-webpack-plugin/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "dev": true,
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/copy-webpack-plugin/node_modules/p-limit": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.0.2.tgz",
+      "integrity": "sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cordova": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/cordova/-/cordova-10.0.0.tgz",
+      "integrity": "sha512-00wMcj3X9ILhKtvRG2iEwO2qly4B+vgXFhH4WhVepWg2UVbD1opl1q9jSZ+j2AaI/vsBWW8e6M2M5FAHasnuWw==",
+      "dependencies": {
+        "configstore": "^5.0.1",
+        "cordova-common": "^4.0.2",
+        "cordova-create": "^3.0.0",
+        "cordova-lib": "^10.0.0",
+        "editor": "^1.0.0",
+        "execa": "^4.0.3",
+        "fs-extra": "^9.0.1",
+        "insight": "^0.10.3",
+        "loud-rejection": "^2.2.0",
+        "nopt": "^4.0.3",
+        "semver": "^7.3.2",
+        "systeminformation": "^4.26.10",
+        "update-notifier": "^4.1.0"
+      },
+      "bin": {
+        "cordova": "bin/cordova"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/cordova-android": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-9.1.0.tgz",
+      "integrity": "sha512-bzOX9E4eQsOSpa06oZZ7XAGq3DwB73juhhj0oPqHH/khWk0mkCD4aiVYMFoc0fmIaSQvzbY1ww7L6UBW5pyGfg==",
+      "dependencies": {
+        "android-versions": "^1.5.0",
+        "cordova-common": "^4.0.1",
+        "execa": "^4.0.2",
+        "fast-glob": "^3.2.4",
+        "fs-extra": "^9.0.1",
+        "is-path-inside": "^3.0.2",
+        "nopt": "^4.0.3",
+        "properties-parser": "^0.3.1",
+        "semver": "^7.3.4",
+        "which": "^2.0.2"
+      },
+      "bin": {
+        "create": "bin/create"
+      },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/cordova-android-support-gradle-release": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/cordova-android-support-gradle-release/-/cordova-android-support-gradle-release-3.0.1.tgz",
+      "integrity": "sha512-RSW55DkSckmqhX/kjj+a1YeVdy7s/AtlZn6Qa5XMQmmA4Iogq+IF2jvInZqzCF19DbI5YE95AP7VDbRk+DdDRw==",
+      "dependencies": {
+        "q": "^1.4.1",
+        "semver": "5.6.0"
+      }
+    },
+    "node_modules/cordova-android-support-gradle-release/node_modules/semver": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
+      "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/cordova-android/node_modules/semver": {
+      "version": "7.3.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cordova-app-hello-world": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-5.0.0.tgz",
+      "integrity": "sha512-5My01wsYoeYwS0f/t5Ck52xPm0+2zYJ0SlvxG9vUsndDGtgiP6t/G8upPgWcyDRRz7Rs/50yZuOntmHqmJxccQ=="
+    },
+    "node_modules/cordova-clipboard": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/cordova-clipboard/-/cordova-clipboard-1.3.0.tgz",
+      "integrity": "sha512-IGk4LZm/DJ0Xk/jgakHm4wa+A/lrRP3QfzMAHDG7oWLJS4ISOpfI32Wez4ndnENItRslGyBVyJyKD83CxELCAw=="
+    },
+    "node_modules/cordova-common": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/cordova-common/-/cordova-common-4.0.2.tgz",
+      "integrity": "sha512-od7aNShyuBajzPY83mUEO8tERwwWdFklXETHiXP5Ft87CWeo/tSuwNPFztyTy8XYc74yXdogXKPTJeUHuVzB8Q==",
+      "dependencies": {
+        "@netflix/nerror": "^1.1.3",
+        "ansi": "^0.3.1",
+        "bplist-parser": "^0.2.0",
+        "cross-spawn": "^7.0.1",
+        "elementtree": "^0.1.7",
+        "endent": "^1.4.1",
+        "fast-glob": "^3.2.2",
+        "fs-extra": "^9.0.0",
+        "glob": "^7.1.6",
+        "plist": "^3.0.1",
+        "q": "^1.5.1",
+        "read-chunk": "^3.2.0",
+        "strip-bom": "^4.0.0",
+        "underscore": "^1.9.2"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/cordova-create": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-create/-/cordova-create-3.0.0.tgz",
+      "integrity": "sha512-WxZRTnt5RHxSAB9urnHFUtVBcIe1YjR4sfwHLsxakNoKkFhcie3HrV5QmNBgRQ5DkxmanRN3VSx4OrPVsNmAaQ==",
+      "dependencies": {
+        "cordova-app-hello-world": "^5.0.0",
+        "cordova-common": "^4.0.1",
+        "cordova-fetch": "^3.0.0",
+        "fs-extra": "^9.0.0",
+        "globby": "^11.0.0",
+        "import-fresh": "^3.2.1",
+        "isobject": "^4.0.0",
+        "npm-package-arg": "^8.0.1",
+        "path-is-inside": "^1.0.2",
+        "tmp": "^0.2.1",
+        "valid-identifier": "0.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cordova-fetch": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-3.0.1.tgz",
+      "integrity": "sha512-bxXk6H3FtGXpCtlO+XyXM4pa72azQomdurNeHbZai9eYBzA5vjyPnsgxsYcylLUc1wQFeR+XWQVfgJitx6ghEw==",
+      "dependencies": {
+        "cordova-common": "^4.0.0",
+        "fs-extra": "^9.0.0",
+        "npm-package-arg": "^8.0.1",
+        "pacote": "^11.1.11",
+        "pify": "^5.0.0",
+        "resolve": "^1.15.1",
+        "semver": "^7.1.3",
+        "which": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 10",
+        "npm": ">= 5.6.0"
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/agentkeepalive": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.1.4.tgz",
+      "integrity": "sha512-+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ==",
+      "dependencies": {
+        "debug": "^4.1.0",
+        "depd": "^1.1.2",
+        "humanize-ms": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 8.0.0"
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/cacache": {
+      "version": "15.2.0",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.2.0.tgz",
+      "integrity": "sha512-uKoJSHmnrqXgthDFx/IU6ED/5xd+NNGe+Bb+kLZy7Ku4P+BaiWEUflAKPZ7eAzsYGcsAGASJZsybXp+quEcHTw==",
+      "dependencies": {
+        "@npmcli/move-file": "^1.0.1",
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "glob": "^7.1.4",
+        "infer-owner": "^1.0.4",
+        "lru-cache": "^6.0.0",
+        "minipass": "^3.1.1",
+        "minipass-collect": "^1.0.2",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.2",
+        "mkdirp": "^1.0.3",
+        "p-map": "^4.0.0",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^3.0.2",
+        "ssri": "^8.0.1",
+        "tar": "^6.0.2",
+        "unique-filename": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/debug": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/err-code": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
+      "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="
+    },
+    "node_modules/cordova-fetch/node_modules/http-proxy-agent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+      "dependencies": {
+        "@tootallnate/once": "1",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/https-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/make-fetch-happen": {
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.0.4.tgz",
+      "integrity": "sha512-sQWNKMYqSmbAGXqJg2jZ+PmHh5JAybvwu0xM8mZR/bsTjGiTASj3ldXJV7KFHy1k/IJIBkjxQFoWIVsv9+PQMg==",
+      "dependencies": {
+        "agentkeepalive": "^4.1.3",
+        "cacache": "^15.2.0",
+        "http-cache-semantics": "^4.1.0",
+        "http-proxy-agent": "^4.0.1",
+        "https-proxy-agent": "^5.0.0",
+        "is-lambda": "^1.0.1",
+        "lru-cache": "^6.0.0",
+        "minipass": "^3.1.3",
+        "minipass-collect": "^1.0.2",
+        "minipass-fetch": "^1.3.2",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.4",
+        "negotiator": "^0.6.2",
+        "promise-retry": "^2.0.1",
+        "socks-proxy-agent": "^5.0.0",
+        "ssri": "^8.0.0"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
+    "node_modules/cordova-fetch/node_modules/npm-packlist": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.2.2.tgz",
+      "integrity": "sha512-Jt01acDvJRhJGthnUJVF/w6gumWOZxO7IkpY/lsX9//zqQgnF7OJaxgQXcerd4uQOLu7W5bkb4mChL9mdfm+Zg==",
+      "dependencies": {
+        "glob": "^7.1.6",
+        "ignore-walk": "^3.0.3",
+        "npm-bundled": "^1.1.1",
+        "npm-normalize-package-bin": "^1.0.1"
+      },
+      "bin": {
+        "npm-packlist": "bin/index.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/npm-registry-fetch": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-11.0.0.tgz",
+      "integrity": "sha512-jmlgSxoDNuhAtxUIG6pVwwtz840i994dL14FoNVZisrmZW5kWd63IUTNv1m/hyRSGSqWjCUp/YZlS1BJyNp9XA==",
+      "dependencies": {
+        "make-fetch-happen": "^9.0.1",
+        "minipass": "^3.1.3",
+        "minipass-fetch": "^1.3.0",
+        "minipass-json-stream": "^1.0.1",
+        "minizlib": "^2.0.0",
+        "npm-package-arg": "^8.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/pacote": {
+      "version": "11.3.5",
+      "resolved": "https://registry.npmjs.org/pacote/-/pacote-11.3.5.tgz",
+      "integrity": "sha512-fT375Yczn4zi+6Hkk2TBe1x1sP8FgFsEIZ2/iWaXY2r/NkhDJfxbcn5paz1+RTFCyNf+dPnaoBDJoAxXSU8Bkg==",
+      "dependencies": {
+        "@npmcli/git": "^2.1.0",
+        "@npmcli/installed-package-contents": "^1.0.6",
+        "@npmcli/promise-spawn": "^1.2.0",
+        "@npmcli/run-script": "^1.8.2",
+        "cacache": "^15.0.5",
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.1.0",
+        "infer-owner": "^1.0.4",
+        "minipass": "^3.1.3",
+        "mkdirp": "^1.0.3",
+        "npm-package-arg": "^8.0.1",
+        "npm-packlist": "^2.1.4",
+        "npm-pick-manifest": "^6.0.0",
+        "npm-registry-fetch": "^11.0.0",
+        "promise-retry": "^2.0.1",
+        "read-package-json-fast": "^2.0.1",
+        "rimraf": "^3.0.2",
+        "ssri": "^8.0.1",
+        "tar": "^6.1.0"
+      },
+      "bin": {
+        "pacote": "lib/bin.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/pify": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz",
+      "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/promise-retry": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
+      "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
+      "dependencies": {
+        "err-code": "^2.0.2",
+        "retry": "^0.12.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/socks-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ==",
+      "dependencies": {
+        "agent-base": "^6.0.2",
+        "debug": "4",
+        "socks": "^2.3.3"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/cordova-ios": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/cordova-ios/-/cordova-ios-6.2.0.tgz",
+      "integrity": "sha512-sLjZg2QBI1SpQVwfe0MSn89YNVkBGLW9Q1vcFJBsqKBrhvoEOJ5Ytq0gwqdhgTOGzlwJUfxC6OHM3jcsRjtYrw==",
+      "dependencies": {
+        "cordova-common": "^4.0.2",
+        "fs-extra": "^9.1.0",
+        "ios-sim": "^8.0.2",
+        "nopt": "^5.0.0",
+        "plist": "^3.0.1",
+        "semver": "^7.3.4",
+        "unorm": "^1.6.0",
+        "which": "^2.0.2",
+        "xcode": "^3.0.1",
+        "xml-escape": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cordova-ios/node_modules/nopt": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
+      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
+      "dependencies": {
+        "abbrev": "1"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/cordova-ios/node_modules/semver": {
+      "version": "7.3.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cordova-ios/node_modules/uuid": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
+      "integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/cordova-ios/node_modules/xcode": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/xcode/-/xcode-3.0.1.tgz",
+      "integrity": "sha512-kCz5k7J7XbJtjABOvkc5lJmkiDh8VhjVCGNiqdKCscmVpdVUpEAyXv1xmCLkQJ5dsHqx3IPO4XW+NTDhU/fatA==",
+      "dependencies": {
+        "simple-plist": "^1.1.0",
+        "uuid": "^7.0.3"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/cordova-lib": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-lib/-/cordova-lib-10.0.0.tgz",
+      "integrity": "sha512-azU/WH0x/3fQg33tU5bKCtj+Weh/bHelz9FWCVdXqVOHXmjzbi3p6p61z5Si967Tfh3TkmHRrodNxS0ovZ7iFQ==",
+      "dependencies": {
+        "cordova-common": "^4.0.2",
+        "cordova-fetch": "^3.0.0",
+        "cordova-serve": "^4.0.0",
+        "dep-graph": "^1.1.0",
+        "detect-indent": "^6.0.0",
+        "detect-newline": "^3.1.0",
+        "elementtree": "^0.1.7",
+        "execa": "^4.0.3",
+        "fs-extra": "^9.0.1",
+        "globby": "^11.0.1",
+        "init-package-json": "^1.10.3",
+        "md5-file": "^5.0.0",
+        "pify": "^5.0.0",
+        "semver": "^7.3.2",
+        "stringify-package": "^1.0.1",
+        "write-file-atomic": "^3.0.3"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/cordova-lib/node_modules/pify": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz",
+      "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cordova-plugin-add-swift-support": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-add-swift-support/-/cordova-plugin-add-swift-support-2.0.2.tgz",
+      "integrity": "sha512-K03WDnsD3GT+n7Od3BnS17D8rYnAFZbZjjQJa2r7qW8QLq8+h7hGbFaiF+w5+nUtyAqUNq+HT/d/MdqBGLNzxA==",
+      "dependencies": {
+        "glob": "^7.1.3",
+        "semver": "^6.0.0",
+        "xcode": "^2.0.0"
+      }
+    },
+    "node_modules/cordova-plugin-add-swift-support/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/cordova-plugin-advanced-http": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-advanced-http/-/cordova-plugin-advanced-http-3.1.0.tgz",
+      "integrity": "sha512-zlTlNJyTttE7TV5vW2WGvHqpbKMDVrr1meZU0fy4y3ObrI/hGk2UDcDNwpZdMfaytNZwDKU4sRgsTgQYdFNBew==",
+      "engines": [
+        {
+          "name": "cordova",
+          "version": ">=4.0.0"
+        }
+      ]
+    },
+    "node_modules/cordova-plugin-androidx-adapter": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-androidx-adapter/-/cordova-plugin-androidx-adapter-1.1.3.tgz",
+      "integrity": "sha512-W1SImn0cCCvOSTSfWWp5TnanIQrSuh2Bch+dcZXIzEn0km3Qb7VryeAqHhgBQYwwzC5Ollk1DtUAk/AJSojuZA==",
+      "dev": true,
+      "dependencies": {
+        "q": "^1.5.1",
+        "recursive-readdir": "^2.2.2"
+      }
+    },
+    "node_modules/cordova-plugin-badge": {
+      "version": "0.8.8",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-badge/-/cordova-plugin-badge-0.8.8.tgz",
+      "integrity": "sha512-RhIBtd5xhD/iLnxjt35jvOae28oNW/wtMZBOmQR3Rf0y4wirvA1bpAZEhBoFqL+rZGhsd6ddOdQXdex1T0DRyQ==",
+      "engines": [
+        {
+          "name": "cordova",
+          "version": ">=6.0.0"
+        },
+        {
+          "name": "apple-ios",
+          "version": ">=10.0.0"
+        },
+        {
+          "name": "cordova-android",
+          "version": ">=4"
+        },
+        {
+          "name": "cordova-plugman",
+          "version": ">=4.2.0"
+        }
+      ]
+    },
+    "node_modules/cordova-plugin-camera": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-camera/-/cordova-plugin-camera-5.0.1.tgz",
+      "integrity": "sha512-9gXyZvI8u9KzsZuqmB8Yw+uheF+7f+usMAwvOMw7L7pqbykg+bm9US5zjhJbwit3A1cSblgZkpBafe5cFiMcTA==",
+      "engines": {
+        "cordovaDependencies": {
+          "3.0.0": {
+            "cordova-android": ">=6.3.0"
+          },
+          "4.1.0": {
+            "cordova": ">=7.1.0",
+            "cordova-android": ">=6.3.0"
+          },
+          "5.0.0": {
+            "cordova": ">=9.0.0",
+            "cordova-android": ">=9.0.0",
+            "cordova-ios": ">=5.1.0"
+          },
+          "6.0.0": {
+            "cordova": ">100"
+          }
+        }
+      }
+    },
+    "node_modules/cordova-plugin-chooser": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-chooser/-/cordova-plugin-chooser-1.3.2.tgz",
+      "integrity": "sha512-GfAibvrPdWe/ri+h3e3xkmq5bietY6yJRBIZawYDE7w600j2mtRsxgat7siWZtjRRhJuVsVwUG6H86Hyp3WKvA=="
+    },
+    "node_modules/cordova-plugin-customurlscheme": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-customurlscheme/-/cordova-plugin-customurlscheme-5.0.2.tgz",
+      "integrity": "sha512-g139Av7iYD3xcSsCd5S6a7B7dp4GTqGYtvdhh44g4OS38+aX6XkC1lsCRmROuhLIs4fkwJqkrvxacH9H4U9Gsg==",
+      "engines": [
+        {
+          "name": "cordova",
+          "version": ">=3.0.0"
+        }
+      ]
+    },
+    "node_modules/cordova-plugin-device": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-device/-/cordova-plugin-device-2.0.3.tgz",
+      "integrity": "sha512-Jb3V72btxf3XHpkPQsGdyc8N6tVBYn1vsxSFj43fIz9vonJDUThYPCJJHqk6PX6N4dJw6I4FjxkpfCR4LDYMlw==",
+      "engines": {
+        "cordovaDependencies": {
+          "3.0.0": {
+            "cordova": ">100"
+          }
+        }
+      }
+    },
+    "node_modules/cordova-plugin-file": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-file/-/cordova-plugin-file-6.0.2.tgz",
+      "integrity": "sha512-m7cughw327CjONN/qjzsTpSesLaeybksQh420/gRuSXJX5Zt9NfgsSbqqKDon6jnQ9Mm7h7imgyO2uJ34XMBtA==",
+      "engines": {
+        "cordovaDependencies": {
+          "5.0.0": {
+            "cordova-android": ">=6.3.0"
+          },
+          "7.0.0": {
+            "cordova": ">100"
+          }
+        }
+      }
+    },
+    "node_modules/cordova-plugin-file-opener2": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-file-opener2/-/cordova-plugin-file-opener2-3.0.5.tgz",
+      "integrity": "sha512-tjLHDamH5+y0bJZYVe2967L1S4R8tL4Y0rJUzJGoxsyiw3FUlrJNS199POOpzZZ6Xhlntn9a2o7+84r1dMN21A==",
+      "engines": {
+        "cordova": ">=6.0.0"
+      }
+    },
+    "node_modules/cordova-plugin-geolocation": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-geolocation/-/cordova-plugin-geolocation-4.1.0.tgz",
+      "integrity": "sha512-y5io/P10xGMxSn2KEqfv/fExK47eA1pmSonJdmDqDsaSADV9JpgdPx0mUSA08+5pzma/OS9R0LoODeDPx7Jvjg==",
+      "engines": {
+        "cordovaDependencies": {
+          "3.0.0": {
+            "cordova-android": ">=6.3.0"
+          },
+          "5.0.0": {
+            "cordova": ">100"
+          }
+        }
+      }
+    },
+    "node_modules/cordova-plugin-globalization": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-globalization/-/cordova-plugin-globalization-1.11.0.tgz",
+      "integrity": "sha1-6sMVgQAphJOvowvolA5pj2HvvP4=",
+      "engines": {
+        "cordovaDependencies": {
+          "2.0.0": {
+            "cordova": ">100"
+          }
+        }
+      }
+    },
+    "node_modules/cordova-plugin-ionic-keyboard": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-ionic-keyboard/-/cordova-plugin-ionic-keyboard-2.2.0.tgz",
+      "integrity": "sha512-yDUG+9ieKVRitq5mGlNxjaZh/MgEhFFIgTIPhqSbUaQ8UuZbawy5mhJAVClqY97q8/rcQtL6dCDa7x2sEtCLcA=="
+    },
+    "node_modules/cordova-plugin-media": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-media/-/cordova-plugin-media-5.0.3.tgz",
+      "integrity": "sha512-UQPFlpk1zL4BY44zGi8RVmYCvcKBCN4Dyf8ovxqGYCC8zR1yhbTRWYDdO9vJdERwbfgWV7+z7FMWiSUfqWm9bQ==",
+      "engines": {
+        "cordovaDependencies": {
+          "3.0.0": {
+            "cordova-android": ">=6.1.0"
+          },
+          "4.0.0": {
+            "cordova-android": ">=6.3.0"
+          },
+          "6.0.0": {
+            "cordova": ">100"
+          }
+        }
+      }
+    },
+    "node_modules/cordova-plugin-media-capture": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-media-capture/-/cordova-plugin-media-capture-3.0.3.tgz",
+      "integrity": "sha512-pVQOrNM7VAuVUMXibAlMGIArrftHPrRs4dUCoE+e2HEFUp3LmN3Yj539LjdUxcWmz/A/cHC65m9E3DS56YJhcg==",
+      "engines": {
+        "cordovaDependencies": {
+          ">=1.4.4": {
+            "cordova-ios": ">=4.0.0"
+          },
+          "2.0.0": {
+            "cordova-android": ">=6.3.0"
+          },
+          "4.0.0": {
+            "cordova": ">100"
+          }
+        }
+      }
+    },
+    "node_modules/cordova-plugin-network-information": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-network-information/-/cordova-plugin-network-information-2.0.2.tgz",
+      "integrity": "sha512-NwO3qDBNL/vJxUxBTPNOA1HvkDf9eTeGH8JSZiwy1jq2W2mJKQEDBwqWkaEQS19Yd/MQTiw0cykxg5D7u4J6cQ==",
+      "engines": {
+        "cordovaDependencies": {
+          "3.0.0": {
+            "cordova": ">100"
+          }
+        }
+      }
+    },
+    "node_modules/cordova-plugin-prevent-override": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-prevent-override/-/cordova-plugin-prevent-override-1.0.0.tgz",
+      "integrity": "sha512-/+3q5r4K5RahCpiYVmZQBjq10x4jj+6CMjYtZyx9jdMWeV+yFE+ItFcO1NeUAEWd2iHC5YPD0P2tHiHx5kscsw==",
+      "engines": {
+        "cordovaDependencies": {
+          "3.0.0": {
+            "cordova": ">100"
+          }
+        }
+      }
+    },
+    "node_modules/cordova-plugin-screen-orientation": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-screen-orientation/-/cordova-plugin-screen-orientation-3.0.2.tgz",
+      "integrity": "sha512-2w6CMC+HGvbhogJetalwGurL2Fx8DQCCPy3wlSZHN1/W7WoQ5n9ujVozcoKrY4VaagK6bxrPFih+ElkO8Uqfzg==",
+      "engines": {
+        "cordovaDependencies": {
+          "4.0.0": {
+            "cordova": ">100"
+          }
+        }
+      }
+    },
+    "node_modules/cordova-plugin-splashscreen": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-splashscreen/-/cordova-plugin-splashscreen-6.0.0.tgz",
+      "integrity": "sha512-pm4ZtJKQY4bCGXVeIInbGrXilryTevYSKgfvoQJpW9UClOWKAxSsYf2/4G2u1vcn492svOSL42OSa2MhujBWEQ==",
+      "engines": {
+        "cordovaDependencies": {
+          ">=4.0.0": {
+            "cordova-android": ">=3.6.0",
+            "cordova-windows": ">=4.4.0"
+          },
+          "2.0.0": {
+            "cordova-android": ">=3.6.0"
+          },
+          "7.0.0": {
+            "cordova": ">100"
+          }
+        }
+      }
+    },
+    "node_modules/cordova-plugin-statusbar": {
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-statusbar/-/cordova-plugin-statusbar-2.4.3.tgz",
+      "integrity": "sha512-ThmXzl6QIKWFXf4wWw7Q/zpB+VKkz3VM958+5A0sXD4jmR++u7KnGttLksXshVwWr6lvGwUebLYtIyXwS4Ovcg==",
+      "engines": {
+        "cordovaDependencies": {
+          "0.1.0": {
+            "cordova": ">=3.0.0"
+          },
+          "3.0.0": {
+            "cordova": ">100"
+          }
+        }
+      }
+    },
+    "node_modules/cordova-plugin-whitelist": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.4.tgz",
+      "integrity": "sha512-EYC5eQFVkoYXq39l7tYKE6lEjHJ04mvTmKXxGL7quHLdFPfJMNzru/UYpn92AOfpl3PQaZmou78C7EgmFOwFQQ==",
+      "engines": {
+        "cordovaDependencies": {
+          "0.0.0": {
+            "cordova-android": ">=4.0.0"
+          },
+          "2.0.0": {
+            "cordova": ">100"
+          }
+        }
+      }
+    },
+    "node_modules/cordova-plugin-wkuserscript": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-wkuserscript/-/cordova-plugin-wkuserscript-1.0.0.tgz",
+      "integrity": "sha512-g18TohV1T+iWQJImYUCZc44x2ywHTH3ycgEJyxo4WTL9eYm4T7lNkyl1svzQGI97e8W5hQxUqAcmvpVcnWvjSQ==",
+      "engines": {
+        "cordovaDependencies": {
+          "3.0.0": {
+            "cordova": ">100"
+          }
+        }
+      }
+    },
+    "node_modules/cordova-plugin-wkwebview-cookies": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-wkwebview-cookies/-/cordova-plugin-wkwebview-cookies-1.0.0.tgz",
+      "integrity": "sha512-bQRnc/1UNu2XDb6ds+RuAZGA8FM2MuQb4z45J/CaDfjSs60OSvxGVKo3okrM/okYosZqWJFygrPah0MK3lDERQ==",
+      "engines": {
+        "cordovaDependencies": {
+          "3.0.0": {
+            "cordova": ">100"
+          }
+        }
+      }
+    },
+    "node_modules/cordova-plugin-zip": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-zip/-/cordova-plugin-zip-3.1.0.tgz",
+      "integrity": "sha1-F2yCSOog058c+VnvXmFWrMqWshc=",
+      "engines": [
+        {
+          "name": "cordova",
+          "version": ">=3.3.0"
+        }
+      ]
+    },
+    "node_modules/cordova-serve": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-serve/-/cordova-serve-4.0.0.tgz",
+      "integrity": "sha512-gzTLeBQzNP8aM/nG0/7sSfICfNazUgwvEU2kiDaybbYXmxwioo2v96h4tzE0XOyA64beyYwAyRYEEqWA4AMZjw==",
+      "dependencies": {
+        "chalk": "^3.0.0",
+        "compression": "^1.7.4",
+        "express": "^4.17.1",
+        "open": "^7.0.3",
+        "which": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 10",
+        "npm": ">= 5.6.0"
+      }
+    },
+    "node_modules/cordova-sqlite-storage": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-sqlite-storage/-/cordova-sqlite-storage-6.0.0.tgz",
+      "integrity": "sha512-njRloA3AICaUFztKHXoFfVcwlL7zbvyFxtdZIkK7P+MA3umILXtSKhYAQkSe2GtHr0LBNzJI5xUUqAlZl/Js0A==",
+      "dependencies": {
+        "cordova-sqlite-storage-dependencies": "4.0.0"
+      }
+    },
+    "node_modules/cordova-sqlite-storage-dependencies": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-sqlite-storage-dependencies/-/cordova-sqlite-storage-dependencies-4.0.0.tgz",
+      "integrity": "sha512-dTBxYaX/RGzH6+pp49o4sb3FuHCvhrssaKn1XMJ4LL3f9dnvz3rhFK2LdcWrdFkhOLOndnW/azUkbzZd+WWhRA=="
+    },
+    "node_modules/cordova-support-google-services": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/cordova-support-google-services/-/cordova-support-google-services-1.2.1.tgz",
+      "integrity": "sha512-EnFjKAE9oI2uzyUvEfWpLgTM200nuJVvShaA4yyz9wMKBUN+H/BRG1byd1ibZz3sSihNKi3FxjQPxmmEn6/IfA=="
+    },
+    "node_modules/cordova.plugins.diagnostic": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/cordova.plugins.diagnostic/-/cordova.plugins.diagnostic-5.0.2.tgz",
+      "integrity": "sha512-H59o7YxJ2/COzvg+jyTpUqX8QoDcvti9dluJ9a+pHumE8lf3meWemwCl0QFa9GH+xgVd6X1Ikj/6P3+DKWd9eg==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "colors": "^1.1.2",
+        "elementtree": "^0.1.6",
+        "minimist": "1.2.0"
+      },
+      "engines": {
+        "cordovaDependencies": {
+          "4.0.0": {
+            "cordova": ">=7.1.0",
+            "cordova-android": ">=6.3.0",
+            "cordova-ios": ">=4.3.0"
+          }
+        }
+      }
+    },
+    "node_modules/cordova.plugins.diagnostic/node_modules/minimist": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+    },
+    "node_modules/core-js": {
+      "version": "3.9.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.9.1.tgz",
+      "integrity": "sha512-gSjRvzkxQc1zjM/5paAmL4idJBFzuJoo+jDjF1tStYFMV2ERfD02HhahhCGXUyHxQRG4yFKVSdO6g62eoRMcDg==",
+      "hasInstallScript": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/core-js-compat": {
+      "version": "3.6.5",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz",
+      "integrity": "sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.8.5",
+        "semver": "7.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/core-js-compat/node_modules/semver": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
+      "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/core-js-pure": {
+      "version": "3.11.1",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.11.1.tgz",
+      "integrity": "sha512-2JukQi8HgAOCD5CSimxWWXVrUBoA9Br796uIA5Z06bIjt7PBBI19ircFaAxplgE1mJf3x2BY6MkT/HWA/UryPg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+    },
+    "node_modules/cosmiconfig": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
+      "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
+      "dev": true,
+      "dependencies": {
+        "import-fresh": "^2.0.0",
+        "is-directory": "^0.3.1",
+        "js-yaml": "^3.13.1",
+        "parse-json": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/cosmiconfig/node_modules/import-fresh": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
+      "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
+      "dev": true,
+      "dependencies": {
+        "caller-path": "^2.0.0",
+        "resolve-from": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/cosmiconfig/node_modules/resolve-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/create-ecdh": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
+      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "elliptic": "^6.5.3"
+      }
+    },
+    "node_modules/create-ecdh/node_modules/bn.js": {
+      "version": "4.11.9",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+      "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+      "dev": true
+    },
+    "node_modules/create-hash": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "dev": true,
+      "dependencies": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
+      }
+    },
+    "node_modules/create-hmac": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "dev": true,
+      "dependencies": {
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "node_modules/create-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
+      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
+      "dev": true
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/crypto-browserify": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+      "dev": true,
+      "dependencies": {
+        "browserify-cipher": "^1.0.0",
+        "browserify-sign": "^4.0.0",
+        "create-ecdh": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.0",
+        "diffie-hellman": "^5.0.0",
+        "inherits": "^2.0.1",
+        "pbkdf2": "^3.0.3",
+        "public-encrypt": "^4.0.0",
+        "randombytes": "^2.0.0",
+        "randomfill": "^1.0.3"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/crypto-random-string": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
+      "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/css": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
+      "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "source-map": "^0.6.1",
+        "source-map-resolve": "^0.5.2",
+        "urix": "^0.1.0"
+      }
+    },
+    "node_modules/css-color-names": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
+      "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/css-declaration-sorter": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz",
+      "integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^7.0.1",
+        "timsort": "^0.3.0"
+      },
+      "engines": {
+        "node": ">4"
+      }
+    },
+    "node_modules/css-loader": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.5.3.tgz",
+      "integrity": "sha512-UEr9NH5Lmi7+dguAm+/JSPovNjYbm2k3TK58EiwQHzOHH5Jfq1Y+XoP2bQO6TMn7PptMd0opxxedAWcaSTRKHw==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.3.1",
+        "cssesc": "^3.0.0",
+        "icss-utils": "^4.1.1",
+        "loader-utils": "^1.2.3",
+        "normalize-path": "^3.0.0",
+        "postcss": "^7.0.27",
+        "postcss-modules-extract-imports": "^2.0.0",
+        "postcss-modules-local-by-default": "^3.0.2",
+        "postcss-modules-scope": "^2.2.0",
+        "postcss-modules-values": "^3.0.0",
+        "postcss-value-parser": "^4.0.3",
+        "schema-utils": "^2.6.6",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">= 8.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/css-loader/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/css-loader/node_modules/loader-utils": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/css-loader/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/css-parse": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz",
+      "integrity": "sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=",
+      "dev": true,
+      "dependencies": {
+        "css": "^2.0.0"
+      }
+    },
+    "node_modules/css-select": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
+      "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "^1.0.0",
+        "css-what": "^3.2.1",
+        "domutils": "^1.7.0",
+        "nth-check": "^1.0.2"
+      }
+    },
+    "node_modules/css-select-base-adapter": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
+      "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
+      "dev": true
+    },
+    "node_modules/css-tree": {
+      "version": "1.0.0-alpha.37",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz",
+      "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==",
+      "dev": true,
+      "dependencies": {
+        "mdn-data": "2.0.4",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/css-tree/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/css-what": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.1.tgz",
+      "integrity": "sha512-wHOppVDKl4vTAOWzJt5Ek37Sgd9qq1Bmj/T1OjvicWbU5W7ru7Pqbn0Jdqii3Drx/h+dixHKXNhZYx7blthL7g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/css/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/cssesc": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+      "dev": true,
+      "bin": {
+        "cssesc": "bin/cssesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/cssnano": {
+      "version": "4.1.10",
+      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz",
+      "integrity": "sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ==",
+      "dev": true,
+      "dependencies": {
+        "cosmiconfig": "^5.0.0",
+        "cssnano-preset-default": "^4.0.7",
+        "is-resolvable": "^1.0.0",
+        "postcss": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/cssnano-preset-default": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz",
+      "integrity": "sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA==",
+      "dev": true,
+      "dependencies": {
+        "css-declaration-sorter": "^4.0.1",
+        "cssnano-util-raw-cache": "^4.0.1",
+        "postcss": "^7.0.0",
+        "postcss-calc": "^7.0.1",
+        "postcss-colormin": "^4.0.3",
+        "postcss-convert-values": "^4.0.1",
+        "postcss-discard-comments": "^4.0.2",
+        "postcss-discard-duplicates": "^4.0.2",
+        "postcss-discard-empty": "^4.0.1",
+        "postcss-discard-overridden": "^4.0.1",
+        "postcss-merge-longhand": "^4.0.11",
+        "postcss-merge-rules": "^4.0.3",
+        "postcss-minify-font-values": "^4.0.2",
+        "postcss-minify-gradients": "^4.0.2",
+        "postcss-minify-params": "^4.0.2",
+        "postcss-minify-selectors": "^4.0.2",
+        "postcss-normalize-charset": "^4.0.1",
+        "postcss-normalize-display-values": "^4.0.2",
+        "postcss-normalize-positions": "^4.0.2",
+        "postcss-normalize-repeat-style": "^4.0.2",
+        "postcss-normalize-string": "^4.0.2",
+        "postcss-normalize-timing-functions": "^4.0.2",
+        "postcss-normalize-unicode": "^4.0.1",
+        "postcss-normalize-url": "^4.0.1",
+        "postcss-normalize-whitespace": "^4.0.2",
+        "postcss-ordered-values": "^4.1.2",
+        "postcss-reduce-initial": "^4.0.3",
+        "postcss-reduce-transforms": "^4.0.2",
+        "postcss-svgo": "^4.0.2",
+        "postcss-unique-selectors": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/cssnano-util-get-arguments": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz",
+      "integrity": "sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8=",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/cssnano-util-get-match": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz",
+      "integrity": "sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0=",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/cssnano-util-raw-cache": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz",
+      "integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/cssnano-util-same-parent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz",
+      "integrity": "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/csso": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-4.0.3.tgz",
+      "integrity": "sha512-NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ==",
+      "dev": true,
+      "dependencies": {
+        "css-tree": "1.0.0-alpha.39"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/csso/node_modules/css-tree": {
+      "version": "1.0.0-alpha.39",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.39.tgz",
+      "integrity": "sha512-7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA==",
+      "dev": true,
+      "dependencies": {
+        "mdn-data": "2.0.6",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/csso/node_modules/mdn-data": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.6.tgz",
+      "integrity": "sha512-rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA==",
+      "dev": true
+    },
+    "node_modules/csso/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/cssom": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
+      "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==",
+      "dev": true
+    },
+    "node_modules/cssstyle": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
+      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
+      "dev": true,
+      "dependencies": {
+        "cssom": "~0.3.6"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cssstyle/node_modules/cssom": {
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
+      "dev": true
+    },
+    "node_modules/currently-unhandled": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
+      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
+      "dependencies": {
+        "array-find-index": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/cyclist": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
+      "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
+      "dev": true
+    },
+    "node_modules/d": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
+      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
+      "dev": true,
+      "dependencies": {
+        "es5-ext": "^0.10.50",
+        "type": "^1.0.1"
+      }
+    },
+    "node_modules/dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "dependencies": {
+        "assert-plus": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/data-uri-to-buffer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz",
+      "integrity": "sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/data-urls": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
+      "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
+      "dev": true,
+      "dependencies": {
+        "abab": "^2.0.3",
+        "whatwg-mimetype": "^2.3.0",
+        "whatwg-url": "^8.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/debuglog": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz",
+      "integrity": "sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/decimal.js": {
+      "version": "10.2.1",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.1.tgz",
+      "integrity": "sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==",
+      "dev": true
+    },
+    "node_modules/decode-uri-component": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/decompress-response": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
+      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
+      "dependencies": {
+        "mimic-response": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/dedent": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
+      "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw="
+    },
+    "node_modules/deep-equal": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
+      "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
+      "dev": true,
+      "dependencies": {
+        "is-arguments": "^1.0.4",
+        "is-date-object": "^1.0.1",
+        "is-regex": "^1.0.4",
+        "object-is": "^1.0.1",
+        "object-keys": "^1.1.1",
+        "regexp.prototype.flags": "^1.2.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/deep-extend": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/deep-is": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+      "dev": true
+    },
+    "node_modules/deepmerge": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
+      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/default-compare": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz",
+      "integrity": "sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^5.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/default-compare/node_modules/kind-of": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/default-gateway": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
+      "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==",
+      "dev": true,
+      "dependencies": {
+        "execa": "^1.0.0",
+        "ip-regex": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/default-gateway/node_modules/cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "dev": true,
+      "dependencies": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      },
+      "engines": {
+        "node": ">=4.8"
+      }
+    },
+    "node_modules/default-gateway/node_modules/execa": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^6.0.0",
+        "get-stream": "^4.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/default-gateway/node_modules/get-stream": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "dev": true,
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/default-gateway/node_modules/is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/default-gateway/node_modules/npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/default-gateway/node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/default-gateway/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/default-gateway/node_modules/shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/default-gateway/node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/default-gateway/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/default-resolution": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz",
+      "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/defaults": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
+      "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
+      "dev": true,
+      "dependencies": {
+        "clone": "^1.0.2"
+      }
+    },
+    "node_modules/defaults/node_modules/clone": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/defer-to-connect": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz",
+      "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="
+    },
+    "node_modules/define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "dev": true,
+      "dependencies": {
+        "object-keys": "^1.0.12"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/define-property": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.2",
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/define-property/node_modules/is-accessor-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/define-property/node_modules/is-data-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/define-property/node_modules/is-descriptor": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.0",
+        "is-data-descriptor": "^1.0.0",
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/define-property/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/degenerator": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-2.2.0.tgz",
+      "integrity": "sha512-aiQcQowF01RxFI4ZLFMpzyotbQonhNpBao6dkI8JPk5a+hmSjR5ErHp2CQySmQe8os3VBqLCIh87nDBgZXvsmg==",
+      "dev": true,
+      "dependencies": {
+        "ast-types": "^0.13.2",
+        "escodegen": "^1.8.1",
+        "esprima": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/del": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
+      "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/glob": "^7.1.1",
+        "globby": "^6.1.0",
+        "is-path-cwd": "^2.0.0",
+        "is-path-in-cwd": "^2.0.0",
+        "p-map": "^2.0.0",
+        "pify": "^4.0.1",
+        "rimraf": "^2.6.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/del/node_modules/array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+      "dev": true,
+      "dependencies": {
+        "array-uniq": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/del/node_modules/globby": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+      "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+      "dev": true,
+      "dependencies": {
+        "array-union": "^1.0.1",
+        "glob": "^7.0.3",
+        "object-assign": "^4.0.1",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/del/node_modules/globby/node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/del/node_modules/p-map": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
+      "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/del/node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
+    },
+    "node_modules/dep-graph": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/dep-graph/-/dep-graph-1.1.0.tgz",
+      "integrity": "sha1-+t6GqSeZqBPptCURzfPfpsyNvv4=",
+      "dependencies": {
+        "underscore": "1.2.1"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/dep-graph/node_modules/underscore": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.2.1.tgz",
+      "integrity": "sha1-/FxrB2VnPZKi1KyLTcCqiHAuK9Q=",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/dependency-graph": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.7.2.tgz",
+      "integrity": "sha512-KqtH4/EZdtdfWX0p6MGP9jljvxSY6msy/pRUD4jgNwVpv3v1QmNLlsB3LDSSUg79BRVSn7jI1QPRtArGABovAQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
+    "node_modules/des.js": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
+      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "node_modules/destroy": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
+    },
+    "node_modules/detect-file": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
+      "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/detect-indent": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz",
+      "integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
+      "optional": true,
+      "bin": {
+        "detect-libc": "bin/detect-libc.js"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/detect-newline": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/detect-node": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
+      "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
+      "dev": true
+    },
+    "node_modules/dezalgo": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz",
+      "integrity": "sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=",
+      "dev": true,
+      "dependencies": {
+        "asap": "^2.0.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/diff": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
+    "node_modules/diff-sequences": {
+      "version": "26.5.0",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.5.0.tgz",
+      "integrity": "sha512-ZXx86srb/iYy6jG71k++wBN9P9J05UNQ5hQHQd9MtMPvcqXPx/vKU69jfHV637D00Q2gSgPk2D+jSx3l1lDW/Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/diffie-hellman": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
+      }
+    },
+    "node_modules/diffie-hellman/node_modules/bn.js": {
+      "version": "4.11.9",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+      "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+      "dev": true
+    },
+    "node_modules/dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "dependencies": {
+        "path-type": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/dns-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
+      "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=",
+      "dev": true
+    },
+    "node_modules/dns-packet": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
+      "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
+      "dev": true,
+      "dependencies": {
+        "ip": "^1.1.0",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/dns-txt": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
+      "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
+      "dev": true,
+      "dependencies": {
+        "buffer-indexof": "^1.0.0"
+      }
+    },
+    "node_modules/doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/dom-serializer": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
+      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "entities": "^2.0.0"
+      }
+    },
+    "node_modules/dom-serializer/node_modules/domelementtype": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.2.tgz",
+      "integrity": "sha512-wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ]
+    },
+    "node_modules/domain-browser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4",
+        "npm": ">=1.2"
+      }
+    },
+    "node_modules/domelementtype": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
+      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
+      "dev": true
+    },
+    "node_modules/domexception": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
+      "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
+      "dev": true,
+      "dependencies": {
+        "webidl-conversions": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/domexception/node_modules/webidl-conversions": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
+      "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/domhandler": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
+      "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "1"
+      }
+    },
+    "node_modules/domutils": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
+      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
+      "dev": true,
+      "dependencies": {
+        "dom-serializer": "0",
+        "domelementtype": "1"
+      }
+    },
+    "node_modules/dot-prop": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
+      "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
+      "dependencies": {
+        "is-obj": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/duplexer2": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+      "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "node_modules/duplexer3": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
+      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI="
+    },
+    "node_modules/duplexify": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+      "dev": true,
+      "dependencies": {
+        "end-of-stream": "^1.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "node_modules/each-props": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz",
+      "integrity": "sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.1",
+        "object.defaults": "^1.1.0"
+      }
+    },
+    "node_modules/ecc-jsbn": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+      "dependencies": {
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "node_modules/editor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/editor/-/editor-1.0.0.tgz",
+      "integrity": "sha1-YMf4e9YrzGqJT6jM1q+3gjok90I="
+    },
+    "node_modules/ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
+    },
+    "node_modules/electron-to-chromium": {
+      "version": "1.3.577",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.577.tgz",
+      "integrity": "sha512-dSb64JQSFif/pD8mpVAgSFkbVi6YHbK6JeEziwNNmXlr/Ne2rZtseFK5SM7JoWSLf6gP0gVvRGi4/2ZRhSX/rA==",
+      "dev": true
+    },
+    "node_modules/elementtree": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.7.tgz",
+      "integrity": "sha1-mskb5uUvtuYkTE5UpKw+2K6OKcA=",
+      "dependencies": {
+        "sax": "1.1.4"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/elliptic": {
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
+      "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.4.0",
+        "brorand": "^1.0.1",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.0"
+      }
+    },
+    "node_modules/elliptic/node_modules/bn.js": {
+      "version": "4.11.9",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+      "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+      "dev": true
+    },
+    "node_modules/emittery": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.7.1.tgz",
+      "integrity": "sha512-d34LN4L6h18Bzz9xpoku2nPwKxCPlPMr3EEKTkoEBi+1/+b0lcRkRJ1UVyyZaKNeqGR3swcGl6s390DNO4YVgQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
+      }
+    },
+    "node_modules/emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
+    },
+    "node_modules/emojis-list": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/encoding": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
+      "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
+      "dependencies": {
+        "iconv-lite": "^0.6.2"
+      }
+    },
+    "node_modules/encoding/node_modules/iconv-lite": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz",
+      "integrity": "sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dependencies": {
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/endent": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/endent/-/endent-1.4.1.tgz",
+      "integrity": "sha512-buHTb5c8AC9NshtP6dgmNLYkiT+olskbq1z6cEGvfGCF3Qphbu/1zz5Xu+yjTDln8RbxNhPoUyJ5H8MSrp1olQ==",
+      "dependencies": {
+        "dedent": "^0.7.0",
+        "fast-json-parse": "^1.0.3",
+        "objectorarray": "^1.0.4"
+      }
+    },
+    "node_modules/enhanced-resolve": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz",
+      "integrity": "sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "memory-fs": "^0.5.0",
+        "tapable": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/enquirer": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/enquirer/node_modules/ansi-colors": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/entities": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
+      "integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==",
+      "dev": true
+    },
+    "node_modules/env-paths": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-1.0.0.tgz",
+      "integrity": "sha1-QWgTO0K7BcOKNbGuQ5fIKYqzaeA=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/err-code": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz",
+      "integrity": "sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA=",
+      "dev": true
+    },
+    "node_modules/errno": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
+      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
+      "dev": true,
+      "dependencies": {
+        "prr": "~1.0.1"
+      },
+      "bin": {
+        "errno": "cli.js"
+      }
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "node_modules/es-abstract": {
+      "version": "1.18.0-next.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
+      "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
+      "dev": true,
+      "dependencies": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.2",
+        "is-negative-zero": "^2.0.0",
+        "is-regex": "^1.1.1",
+        "object-inspect": "^1.8.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.1",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es5-ext": {
+      "version": "0.10.53",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
+      "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
+      "dev": true,
+      "dependencies": {
+        "es6-iterator": "~2.0.3",
+        "es6-symbol": "~3.1.3",
+        "next-tick": "~1.0.0"
+      }
+    },
+    "node_modules/es6-iterator": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
+      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
+      "dev": true,
+      "dependencies": {
+        "d": "1",
+        "es5-ext": "^0.10.35",
+        "es6-symbol": "^3.1.1"
+      }
+    },
+    "node_modules/es6-promise": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
+      "dev": true
+    },
+    "node_modules/es6-promise-plugin": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/es6-promise-plugin/-/es6-promise-plugin-4.2.2.tgz",
+      "integrity": "sha512-uoA4aVplXI9oqUYJFBAVRwAqIN9/n9JgrTAUGX3qPbnSZVE5yY1+6/MsoN5f4xsaPO62WjPHOdtts6okMN6tNA=="
+    },
+    "node_modules/es6-promisify": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
+      "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
+      "dev": true,
+      "dependencies": {
+        "es6-promise": "^4.0.3"
+      }
+    },
+    "node_modules/es6-symbol": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
+      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
+      "dev": true,
+      "dependencies": {
+        "d": "^1.0.1",
+        "ext": "^1.1.2"
+      }
+    },
+    "node_modules/es6-weak-map": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
+      "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
+      "dev": true,
+      "dependencies": {
+        "d": "1",
+        "es5-ext": "^0.10.46",
+        "es6-iterator": "^2.0.3",
+        "es6-symbol": "^3.1.1"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.0.tgz",
+      "integrity": "sha512-mAk+hPSO8fLDkhV7V0dXazH5pDc6MrjBTPyD3VeKzxnVFjH1MIxbCdqGZB9O8+EwWakZs3ZCbDS4IpRt79V1ig==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-goat": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz",
+      "integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/escodegen": {
+      "version": "1.14.3",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
+      "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
+      "dev": true,
+      "dependencies": {
+        "esprima": "^4.0.1",
+        "estraverse": "^4.2.0",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
+      },
+      "engines": {
+        "node": ">=4.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/escodegen/node_modules/levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/escodegen/node_modules/optionator": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+      "dev": true,
+      "dependencies": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.6",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "word-wrap": "~1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/escodegen/node_modules/prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/escodegen/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/escodegen/node_modules/type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/eslint": {
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.25.0.tgz",
+      "integrity": "sha512-TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "7.12.11",
+        "@eslint/eslintrc": "^0.4.0",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.0.1",
+        "doctrine": "^3.0.0",
+        "enquirer": "^2.3.5",
+        "eslint-scope": "^5.1.1",
+        "eslint-utils": "^2.1.0",
+        "eslint-visitor-keys": "^2.0.0",
+        "espree": "^7.3.1",
+        "esquery": "^1.4.0",
+        "esutils": "^2.0.2",
+        "file-entry-cache": "^6.0.1",
+        "functional-red-black-tree": "^1.0.1",
+        "glob-parent": "^5.0.0",
+        "globals": "^13.6.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "js-yaml": "^3.13.1",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash": "^4.17.21",
+        "minimatch": "^3.0.4",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.1",
+        "progress": "^2.0.0",
+        "regexpp": "^3.1.0",
+        "semver": "^7.2.1",
+        "strip-ansi": "^6.0.0",
+        "strip-json-comments": "^3.1.0",
+        "table": "^6.0.4",
+        "text-table": "^0.2.0",
+        "v8-compile-cache": "^2.0.3"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-config-prettier": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz",
+      "integrity": "sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==",
+      "dev": true,
+      "bin": {
+        "eslint-config-prettier": "bin/cli.js"
+      },
+      "peerDependencies": {
+        "eslint": ">=7.0.0"
+      }
+    },
+    "node_modules/eslint-import-resolver-node": {
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz",
+      "integrity": "sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^2.6.9",
+        "resolve": "^1.13.1"
+      }
+    },
+    "node_modules/eslint-module-utils": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz",
+      "integrity": "sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^2.6.9",
+        "pkg-dir": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eslint-module-utils/node_modules/pkg-dir": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
+      "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eslint-plugin-ecmascript-compat": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-ecmascript-compat/-/eslint-plugin-ecmascript-compat-1.1.1.tgz",
+      "integrity": "sha512-OUytzpOKynpuSfnrGpOfj2QmduJu/0fGfTLf9GwTJzIyvfXfLDGtoZ+ek0sHFh68BLbwG5lylyBNgAxhFh5V8A==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.8.0",
+        "eslint-plugin-es": "^2.0.0",
+        "lodash": "^4.17.15",
+        "mdn-browser-compat-data": "^1.0.25"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      },
+      "peerDependencies": {
+        "eslint": ">=4.19.1"
+      }
+    },
+    "node_modules/eslint-plugin-es": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-2.0.0.tgz",
+      "integrity": "sha512-f6fceVtg27BR02EYnBhgWLFQfK6bN4Ll0nQFrBHOlCsAyxeZkn0NHns5O0YZOPrV1B3ramd6cgFwaoFLcSkwEQ==",
+      "dev": true,
+      "dependencies": {
+        "eslint-utils": "^1.4.2",
+        "regexpp": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      },
+      "peerDependencies": {
+        "eslint": ">=4.19.1"
+      }
+    },
+    "node_modules/eslint-plugin-es/node_modules/eslint-utils": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
+      "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/eslint-plugin-es/node_modules/eslint-visitor-keys": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eslint-plugin-header": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-header/-/eslint-plugin-header-3.1.1.tgz",
+      "integrity": "sha512-9vlKxuJ4qf793CmeeSrZUvVClw6amtpghq3CuWcB5cUNnWHQhgcqy5eF8oVKFk1G3Y/CbchGfEaw3wiIJaNmVg==",
+      "dev": true,
+      "peerDependencies": {
+        "eslint": ">=7.7.0"
+      }
+    },
+    "node_modules/eslint-plugin-import": {
+      "version": "2.22.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz",
+      "integrity": "sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==",
+      "dev": true,
+      "dependencies": {
+        "array-includes": "^3.1.1",
+        "array.prototype.flat": "^1.2.3",
+        "contains-path": "^0.1.0",
+        "debug": "^2.6.9",
+        "doctrine": "1.5.0",
+        "eslint-import-resolver-node": "^0.3.4",
+        "eslint-module-utils": "^2.6.0",
+        "has": "^1.0.3",
+        "minimatch": "^3.0.4",
+        "object.values": "^1.1.1",
+        "read-pkg-up": "^2.0.0",
+        "resolve": "^1.17.0",
+        "tsconfig-paths": "^3.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/doctrine": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
+      "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2",
+        "isarray": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eslint-plugin-jest": {
+      "version": "24.3.6",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.3.6.tgz",
+      "integrity": "sha512-WOVH4TIaBLIeCX576rLcOgjNXqP+jNlCiEmRgFTfQtJ52DpwnIQKAVGlGPAN7CZ33bW6eNfHD6s8ZbEUTQubJg==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/experimental-utils": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/eslint-plugin": ">= 4",
+        "eslint": ">=5"
+      },
+      "peerDependenciesMeta": {
+        "@typescript-eslint/eslint-plugin": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-plugin-jsdoc": {
+      "version": "32.3.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-32.3.3.tgz",
+      "integrity": "sha512-WxXohbMYlZvCt3r7MepwT++nTLsO4CPegWcm5toM4IGq3MBmYkG+Uf5yDa+n1MwPXLg+KbJqAsI19hmkVD7MPg==",
+      "dev": true,
+      "dependencies": {
+        "comment-parser": "1.1.5",
+        "debug": "^4.3.1",
+        "jsdoctypeparser": "^9.0.0",
+        "lodash": "^4.17.21",
+        "regextras": "^0.7.1",
+        "semver": "^7.3.5",
+        "spdx-expression-parse": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-jsdoc/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-plugin-jsdoc/node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
+    },
+    "node_modules/eslint-plugin-jsdoc/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/eslint-plugin-jsdoc/node_modules/semver": {
+      "version": "7.3.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint-plugin-prefer-arrow": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prefer-arrow/-/eslint-plugin-prefer-arrow-1.2.3.tgz",
+      "integrity": "sha512-J9I5PKCOJretVuiZRGvPQxCbllxGAV/viI20JO3LYblAodofBxyMnZAJ+WGeClHgANnSJberTNoFWWjrWKBuXQ==",
+      "dev": true,
+      "peerDependencies": {
+        "eslint": ">=2.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-promise": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-5.1.0.tgz",
+      "integrity": "sha512-NGmI6BH5L12pl7ScQHbg7tvtk4wPxxj8yPHH47NvSmMtFneC077PSeY3huFj06ZWZvtbfxSPt3RuOQD5XcR4ng==",
+      "dev": true,
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^7.0.0"
+      }
+    },
+    "node_modules/eslint-scope": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/eslint-utils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      }
+    },
+    "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eslint-visitor-keys": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz",
+      "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint/node_modules/@babel/code-frame": {
+      "version": "7.12.11",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
+      "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/highlight": "^7.10.4"
+      }
+    },
+    "node_modules/eslint/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/chalk": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/eslint/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint/node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/eslint/node_modules/globals": {
+      "version": "13.8.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.8.0.tgz",
+      "integrity": "sha512-rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/ignore": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/eslint/node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
+    },
+    "node_modules/eslint/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/eslint/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/espree": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
+      "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^7.4.0",
+        "acorn-jsx": "^5.3.1",
+        "eslint-visitor-keys": "^1.3.0"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/espree/node_modules/acorn": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/espree/node_modules/eslint-visitor-keys": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/esquery": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/esquery/node_modules/estraverse": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esrecurse/node_modules/estraverse": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/eventemitter3": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
+      "dev": true
+    },
+    "node_modules/events": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.2.0.tgz",
+      "integrity": "sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.x"
+      }
+    },
+    "node_modules/eventsource": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz",
+      "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
+      "dev": true,
+      "dependencies": {
+        "original": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/evp_bytestokey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "dev": true,
+      "dependencies": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/exec-sh": {
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz",
+      "integrity": "sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==",
+      "dev": true
+    },
+    "node_modules/execa": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-4.0.3.tgz",
+      "integrity": "sha512-WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A==",
+      "dependencies": {
+        "cross-spawn": "^7.0.0",
+        "get-stream": "^5.0.0",
+        "human-signals": "^1.1.1",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.0",
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2",
+        "strip-final-newline": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/exit": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+      "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+      "dev": true,
+      "dependencies": {
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-template": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
+      "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
+      "optional": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/expand-tilde": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
+      "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
+      "dev": true,
+      "dependencies": {
+        "homedir-polyfill": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expect": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-26.5.2.tgz",
+      "integrity": "sha512-ccTGrXZd8DZCcvCz4htGXTkd/LOoy6OEtiDS38x3/VVf6E4AQL0QoeksBiw7BtGR5xDNiRYPB8GN6pfbuTOi7w==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.5.2",
+        "ansi-styles": "^4.0.0",
+        "jest-get-type": "^26.3.0",
+        "jest-matcher-utils": "^26.5.2",
+        "jest-message-util": "^26.5.2",
+        "jest-regex-util": "^26.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/express": {
+      "version": "4.17.1",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
+      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
+      "dependencies": {
+        "accepts": "~1.3.7",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.19.0",
+        "content-disposition": "0.5.3",
+        "content-type": "~1.0.4",
+        "cookie": "0.4.0",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "~1.1.2",
+        "fresh": "0.5.2",
+        "merge-descriptors": "1.0.1",
+        "methods": "~1.1.2",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "~2.0.5",
+        "qs": "6.7.0",
+        "range-parser": "~1.2.1",
+        "safe-buffer": "5.1.2",
+        "send": "0.17.1",
+        "serve-static": "1.14.1",
+        "setprototypeof": "1.1.1",
+        "statuses": "~1.5.0",
+        "type-is": "~1.6.18",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/ext": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz",
+      "integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==",
+      "dev": true,
+      "dependencies": {
+        "type": "^2.0.0"
+      }
+    },
+    "node_modules/ext/node_modules/type": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/type/-/type-2.1.0.tgz",
+      "integrity": "sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA==",
+      "dev": true
+    },
+    "node_modules/extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+    },
+    "node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extend-shallow/node_modules/is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/external-editor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
+      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
+      "dependencies": {
+        "chardet": "^0.7.0",
+        "iconv-lite": "^0.4.24",
+        "tmp": "^0.0.33"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/external-editor/node_modules/tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "dependencies": {
+        "os-tmpdir": "~1.0.2"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+    "node_modules/extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
+      "dependencies": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob/node_modules/is-accessor-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob/node_modules/is-data-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob/node_modules/is-descriptor": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.0",
+        "is-data-descriptor": "^1.0.0",
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extsprintf": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.0.tgz",
+      "integrity": "sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=",
+      "engines": [
+        "node >=0.6.0"
+      ]
+    },
+    "node_modules/faker": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/faker/-/faker-5.1.0.tgz",
+      "integrity": "sha512-RrWKFSSA/aNLP0g3o2WW1Zez7/MnMr7xkiZmoCfAGZmdkDQZ6l2KtuXHN5XjdvpRjDl8+3vf+Rrtl06Z352+Mw==",
+      "dev": true
+    },
+    "node_modules/fancy-log": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
+      "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
+      "dev": true,
+      "dependencies": {
+        "ansi-gray": "^0.1.1",
+        "color-support": "^1.1.3",
+        "parse-node-version": "^1.0.0",
+        "time-stamp": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+    },
+    "node_modules/fast-glob": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz",
+      "integrity": "sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==",
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.0",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.2",
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/fast-json-parse": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/fast-json-parse/-/fast-json-parse-1.0.3.tgz",
+      "integrity": "sha512-FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw=="
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+    },
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "dev": true
+    },
+    "node_modules/fast-safe-stringify": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz",
+      "integrity": "sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==",
+      "dev": true
+    },
+    "node_modules/fastq": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz",
+      "integrity": "sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==",
+      "dependencies": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "node_modules/faye-websocket": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
+      "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
+      "dev": true,
+      "dependencies": {
+        "websocket-driver": ">=0.5.1"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/fb-watchman": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
+      "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
+      "dev": true,
+      "dependencies": {
+        "bser": "2.1.1"
+      }
+    },
+    "node_modules/fd-slicer": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
+      "dev": true,
+      "dependencies": {
+        "pend": "~1.2.0"
+      }
+    },
+    "node_modules/figgy-pudding": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
+      "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==",
+      "dev": true
+    },
+    "node_modules/figures": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+      "dependencies": {
+        "escape-string-regexp": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
+      "dependencies": {
+        "flat-cache": "^3.0.4"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/file-loader": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.0.0.tgz",
+      "integrity": "sha512-/aMOAYEFXDdjG0wytpTL5YQLfZnnTmLNjn+AIrJ/6HVnTfDqLsVKUUwkDf4I4kgex36BvjuXEn/TX9B/1ESyqQ==",
+      "dev": true,
+      "dependencies": {
+        "loader-utils": "^2.0.0",
+        "schema-utils": "^2.6.5"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/finalhandler": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
+      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "dependencies": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
+        "statuses": "~1.5.0",
+        "unpipe": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/find-cache-dir": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
+      "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
+      "dev": true,
+      "dependencies": {
+        "commondir": "^1.0.1",
+        "make-dir": "^3.0.2",
+        "pkg-dir": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
+      }
+    },
+    "node_modules/find-cache-dir/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/find-cache-dir/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/find-cache-dir/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/find-cache-dir/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/find-cache-dir/node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/find-cache-dir/node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/find-up": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+      "dependencies": {
+        "locate-path": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/findup-sync": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
+      "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
+      "dev": true,
+      "dependencies": {
+        "detect-file": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "micromatch": "^3.0.4",
+        "resolve-dir": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/findup-sync/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/fined": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
+      "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
+      "dev": true,
+      "dependencies": {
+        "expand-tilde": "^2.0.2",
+        "is-plain-object": "^2.0.3",
+        "object.defaults": "^1.1.0",
+        "object.pick": "^1.2.0",
+        "parse-filepath": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/flagged-respawn": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
+      "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/flat-cache": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+      "dev": true,
+      "dependencies": {
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/flatted": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz",
+      "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==",
+      "dev": true
+    },
+    "node_modules/flush-write-stream": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
+      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.3.6"
+      }
+    },
+    "node_modules/follow-redirects": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz",
+      "integrity": "sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/for-own": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
+      "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
+      "dev": true,
+      "dependencies": {
+        "for-in": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/form-data": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 0.12"
+      }
+    },
+    "node_modules/formidable": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.2.tgz",
+      "integrity": "sha512-V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q==",
+      "dev": true,
+      "funding": {
+        "url": "https://ko-fi.com/tunnckoCore/commissions"
+      }
+    },
+    "node_modules/forwarded": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
+      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/fragment-cache": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+      "dev": true,
+      "dependencies": {
+        "map-cache": "^0.2.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/from2": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
+      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0"
+      }
+    },
+    "node_modules/fs-constants": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+      "optional": true
+    },
+    "node_modules/fs-extra": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+      "dependencies": {
+        "at-least-node": "^1.0.0",
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/fs-minipass": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/fs-mkdirp-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
+      "integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.11",
+        "through2": "^2.0.3"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/fs-write-stream-atomic": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
+      "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "iferr": "^0.1.5",
+        "imurmurhash": "^0.1.4",
+        "readable-stream": "1 || 2"
+      }
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+    },
+    "node_modules/fsevents": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
+      "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+      "deprecated": "\"Please update to latest v2.3 or v2.2\"",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/ftp": {
+      "version": "0.3.10",
+      "resolved": "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz",
+      "integrity": "sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "1.1.x",
+        "xregexp": "2.0.0"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/ftp/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+      "dev": true
+    },
+    "node_modules/ftp/node_modules/readable-stream": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/ftp/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+      "dev": true
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "node_modules/functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+      "dev": true
+    },
+    "node_modules/gauge": {
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+      "dependencies": {
+        "aproba": "^1.0.3",
+        "console-control-strings": "^1.0.0",
+        "has-unicode": "^2.0.0",
+        "object-assign": "^4.1.0",
+        "signal-exit": "^3.0.0",
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wide-align": "^1.1.0"
+      }
+    },
+    "node_modules/gauge/node_modules/ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gauge/node_modules/is-fullwidth-code-point": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+      "dependencies": {
+        "number-is-nan": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gauge/node_modules/string-width": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+      "dependencies": {
+        "code-point-at": "^1.0.0",
+        "is-fullwidth-code-point": "^1.0.0",
+        "strip-ansi": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gauge/node_modules/strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "dependencies": {
+        "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/genfun": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/genfun/-/genfun-5.0.0.tgz",
+      "integrity": "sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==",
+      "dev": true
+    },
+    "node_modules/gensync": {
+      "version": "1.0.0-beta.1",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz",
+      "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true,
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
+      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-package-type": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/get-stream": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/get-uri": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-3.0.2.tgz",
+      "integrity": "sha512-+5s0SJbGoyiJTZZ2JTpFPLMPSch72KEqGOTvQsBqg0RBWvwhWUSYZFAtz3TPW0GXJuLBJPts1E241iHg+VRfhg==",
+      "dev": true,
+      "dependencies": {
+        "@tootallnate/once": "1",
+        "data-uri-to-buffer": "3",
+        "debug": "4",
+        "file-uri-to-path": "2",
+        "fs-extra": "^8.1.0",
+        "ftp": "^0.3.10"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/get-uri/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/get-uri/node_modules/file-uri-to-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-2.0.0.tgz",
+      "integrity": "sha512-hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/get-uri/node_modules/fs-extra": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=6 <7 || >=8"
+      }
+    },
+    "node_modules/get-uri/node_modules/jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "dev": true,
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/get-uri/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/get-uri/node_modules/universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "dependencies": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "node_modules/github-from-package": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
+      "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=",
+      "optional": true
+    },
+    "node_modules/glob": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/glob-stream": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz",
+      "integrity": "sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=",
+      "dev": true,
+      "dependencies": {
+        "extend": "^3.0.0",
+        "glob": "^7.1.1",
+        "glob-parent": "^3.1.0",
+        "is-negated-glob": "^1.0.0",
+        "ordered-read-streams": "^1.0.0",
+        "pumpify": "^1.3.5",
+        "readable-stream": "^2.1.5",
+        "remove-trailing-separator": "^1.0.1",
+        "to-absolute-glob": "^2.0.0",
+        "unique-stream": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/glob-stream/node_modules/glob-parent": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      }
+    },
+    "node_modules/glob-stream/node_modules/is-glob": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.5.tgz",
+      "integrity": "sha512-zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw==",
+      "dev": true,
+      "dependencies": {
+        "anymatch": "^2.0.0",
+        "async-done": "^1.2.0",
+        "chokidar": "^2.0.0",
+        "is-negated-glob": "^1.0.0",
+        "just-debounce": "^1.0.0",
+        "normalize-path": "^3.0.0",
+        "object.defaults": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/anymatch": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+      "dev": true,
+      "dependencies": {
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/anymatch/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+      "dev": true,
+      "dependencies": {
+        "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/binary-extensions": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/chokidar": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+      "deprecated": "Chokidar 2 will break on node v14+. Upgrade to chokidar 3 with 15x less dependencies.",
+      "dev": true,
+      "dependencies": {
+        "anymatch": "^2.0.0",
+        "async-each": "^1.0.1",
+        "braces": "^2.3.2",
+        "glob-parent": "^3.1.0",
+        "inherits": "^2.0.3",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "normalize-path": "^3.0.0",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.2.1",
+        "upath": "^1.1.1"
+      },
+      "optionalDependencies": {
+        "fsevents": "^1.2.7"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/fsevents": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+      "deprecated": "fsevents 1 will break on node v14+ and could be using insecure binaries. Upgrade to fsevents 2.",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "dependencies": {
+        "bindings": "^1.5.0",
+        "nan": "^2.12.1"
+      },
+      "engines": {
+        "node": ">= 4.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/glob-parent": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/glob-parent/node_modules/is-glob": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/is-binary-path": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+      "dev": true,
+      "dependencies": {
+        "binary-extensions": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/readdirp": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.11",
+        "micromatch": "^3.1.10",
+        "readable-stream": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/global-dirs": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-2.1.0.tgz",
+      "integrity": "sha512-MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ==",
+      "dependencies": {
+        "ini": "1.3.7"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/global-dirs/node_modules/ini": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.7.tgz",
+      "integrity": "sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ=="
+    },
+    "node_modules/global-modules": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
+      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+      "dev": true,
+      "dependencies": {
+        "global-prefix": "^1.0.1",
+        "is-windows": "^1.0.1",
+        "resolve-dir": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/global-prefix": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
+      "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
+      "dev": true,
+      "dependencies": {
+        "expand-tilde": "^2.0.2",
+        "homedir-polyfill": "^1.0.1",
+        "ini": "^1.3.4",
+        "is-windows": "^1.0.1",
+        "which": "^1.2.14"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/global-prefix/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/globby": {
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz",
+      "integrity": "sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==",
+      "dependencies": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.1.1",
+        "ignore": "^5.1.4",
+        "merge2": "^1.3.0",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/glogg": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
+      "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
+      "dev": true,
+      "dependencies": {
+        "sparkles": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/got": {
+      "version": "9.6.0",
+      "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
+      "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==",
+      "dependencies": {
+        "@sindresorhus/is": "^0.14.0",
+        "@szmarczak/http-timer": "^1.1.2",
+        "cacheable-request": "^6.0.0",
+        "decompress-response": "^3.3.0",
+        "duplexer3": "^0.1.4",
+        "get-stream": "^4.1.0",
+        "lowercase-keys": "^1.0.1",
+        "mimic-response": "^1.0.1",
+        "p-cancelable": "^1.0.0",
+        "to-readable-stream": "^1.0.0",
+        "url-parse-lax": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/got/node_modules/get-stream": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="
+    },
+    "node_modules/growly": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
+      "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/gulp": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz",
+      "integrity": "sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==",
+      "dev": true,
+      "dependencies": {
+        "glob-watcher": "^5.0.3",
+        "gulp-cli": "^2.2.0",
+        "undertaker": "^1.2.1",
+        "vinyl-fs": "^3.0.0"
+      },
+      "bin": {
+        "gulp": "bin/gulp.js"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/gulp-clip-empty-files": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/gulp-clip-empty-files/-/gulp-clip-empty-files-0.1.2.tgz",
+      "integrity": "sha1-vumATiU7vaVc+8Em6NuuZDPtzMg=",
+      "dev": true,
+      "dependencies": {
+        "through2": "~2.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-concat": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz",
+      "integrity": "sha1-Yz0WyV2IUEYorQJmVmPO5aR5M1M=",
+      "dev": true,
+      "dependencies": {
+        "concat-with-sourcemaps": "^1.0.0",
+        "through2": "^2.0.0",
+        "vinyl": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/gulp-flatten": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/gulp-flatten/-/gulp-flatten-0.4.0.tgz",
+      "integrity": "sha512-eg4spVTAiv1xXmugyaCxWne1oPtNG0UHEtABx5W8ScLiqAYceyYm6GYA36x0Qh8KOIXmAZV97L2aYGnKREG3Sg==",
+      "dev": true,
+      "dependencies": {
+        "plugin-error": "^0.1.2",
+        "through2": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/gulp-htmlmin": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/gulp-htmlmin/-/gulp-htmlmin-5.0.1.tgz",
+      "integrity": "sha512-ASlyDPZOSKjHYUifYV0rf9JPDflN9IRIb8lw2vRqtYMC4ljU3zAmnnaVXwFQ3H+CfXxZSUesZ2x7jrnPJu93jA==",
+      "dev": true,
+      "dependencies": {
+        "html-minifier": "^3.5.20",
+        "plugin-error": "^1.0.1",
+        "through2": "^2.0.3"
+      },
+      "engines": {
+        "node": ">= 6.0"
+      }
+    },
+    "node_modules/gulp-htmlmin/node_modules/ansi-colors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-wrap": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-htmlmin/node_modules/plugin-error": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
+      "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "^1.0.1",
+        "arr-diff": "^4.0.0",
+        "arr-union": "^3.1.0",
+        "extend-shallow": "^3.0.2"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/gulp-rename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-2.0.0.tgz",
+      "integrity": "sha512-97Vba4KBzbYmR5VBs9mWmK+HwIf5mj+/zioxfZhOKeXtx5ZjBk57KFlePf5nxq9QsTtFl0ejnHE3zTC9MHXqyQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/gulp-slash": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/gulp-slash/-/gulp-slash-1.1.3.tgz",
+      "integrity": "sha1-8VUhrCOxeNtE5VHjDi/Lykv2/h0=",
+      "dev": true,
+      "dependencies": {
+        "slash": "~0.1.3",
+        "through2": "~0.5.1"
+      }
+    },
+    "node_modules/gulp-slash/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+      "dev": true
+    },
+    "node_modules/gulp-slash/node_modules/readable-stream": {
+      "version": "1.0.34",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+      "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/gulp-slash/node_modules/slash": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-0.1.3.tgz",
+      "integrity": "sha1-qnEMjvULjh0YetbP9G84xla6Dlc=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/gulp-slash/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+      "dev": true
+    },
+    "node_modules/gulp-slash/node_modules/through2": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
+      "integrity": "sha1-390BLrnHAOIyP9M084rGIqs3Lac=",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~1.0.17",
+        "xtend": "~3.0.0"
+      }
+    },
+    "node_modules/gulp-slash/node_modules/xtend": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
+      "integrity": "sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
+    "node_modules/gulp/node_modules/ansi-colors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-wrap": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/camelcase": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/cliui": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wrap-ansi": "^2.0.0"
+      }
+    },
+    "node_modules/gulp/node_modules/find-up": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+      "dev": true,
+      "dependencies": {
+        "path-exists": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/get-caller-file": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
+      "dev": true
+    },
+    "node_modules/gulp/node_modules/gulp-cli": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.3.0.tgz",
+      "integrity": "sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "^1.0.1",
+        "archy": "^1.0.0",
+        "array-sort": "^1.0.0",
+        "color-support": "^1.1.3",
+        "concat-stream": "^1.6.0",
+        "copy-props": "^2.0.1",
+        "fancy-log": "^1.3.2",
+        "gulplog": "^1.0.0",
+        "interpret": "^1.4.0",
+        "isobject": "^3.0.1",
+        "liftoff": "^3.1.0",
+        "matchdep": "^2.0.0",
+        "mute-stdout": "^1.0.0",
+        "pretty-hrtime": "^1.0.0",
+        "replace-homedir": "^1.0.0",
+        "semver-greatest-satisfied-range": "^1.1.0",
+        "v8flags": "^3.2.0",
+        "yargs": "^7.1.0"
+      },
+      "bin": {
+        "gulp": "bin/gulp.js"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/gulp/node_modules/is-fullwidth-code-point": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+      "dev": true,
+      "dependencies": {
+        "number-is-nan": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/load-json-file": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0",
+        "strip-bom": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/parse-json": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+      "dev": true,
+      "dependencies": {
+        "error-ex": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/path-exists": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+      "dev": true,
+      "dependencies": {
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/path-type": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/read-pkg": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+      "dev": true,
+      "dependencies": {
+        "load-json-file": "^1.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/read-pkg-up": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^1.0.0",
+        "read-pkg": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/require-main-filename": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
+      "dev": true
+    },
+    "node_modules/gulp/node_modules/string-width": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+      "dev": true,
+      "dependencies": {
+        "code-point-at": "^1.0.0",
+        "is-fullwidth-code-point": "^1.0.0",
+        "strip-ansi": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/strip-bom": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+      "dev": true,
+      "dependencies": {
+        "is-utf8": "^0.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/which-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
+      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
+      "dev": true
+    },
+    "node_modules/gulp/node_modules/wrap-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/y18n": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+      "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+      "dev": true
+    },
+    "node_modules/gulp/node_modules/yargs": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.1.tgz",
+      "integrity": "sha512-huO4Fr1f9PmiJJdll5kwoS2e4GqzGSsMT3PPMpOwoVkOK8ckqAewMTZyA6LXVQWflleb/Z8oPBEvNsMft0XE+g==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^3.0.0",
+        "cliui": "^3.2.0",
+        "decamelize": "^1.1.1",
+        "get-caller-file": "^1.0.1",
+        "os-locale": "^1.4.0",
+        "read-pkg-up": "^1.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^1.0.1",
+        "set-blocking": "^2.0.0",
+        "string-width": "^1.0.2",
+        "which-module": "^1.0.0",
+        "y18n": "^3.2.1",
+        "yargs-parser": "5.0.0-security.0"
+      }
+    },
+    "node_modules/gulp/node_modules/yargs-parser": {
+      "version": "5.0.0-security.0",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0-security.0.tgz",
+      "integrity": "sha512-T69y4Ps64LNesYxeYGYPvfoMTt/7y1XtfpIslUeK4um+9Hu7hlGoRtaDLvdXb7+/tfq4opVa2HRY5xGip022rQ==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^3.0.0",
+        "object.assign": "^4.1.0"
+      }
+    },
+    "node_modules/gulplog": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
+      "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
+      "dev": true,
+      "dependencies": {
+        "glogg": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/handle-thing": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
+      "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
+      "dev": true
+    },
+    "node_modules/har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/har-validator": {
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
+      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
+      "deprecated": "this library is no longer supported",
+      "dependencies": {
+        "ajv": "^6.12.3",
+        "har-schema": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/has-bigints": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
+      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
+      "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-unicode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
+    },
+    "node_modules/has-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+      "dev": true,
+      "dependencies": {
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-value/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values/node_modules/kind-of": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+      "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-yarn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz",
+      "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/hash-base": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
+      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/hash-base/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/hash-base/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/hash.js": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
+    "node_modules/he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "dev": true,
+      "bin": {
+        "he": "bin/he"
+      }
+    },
+    "node_modules/hex-color-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
+      "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==",
+      "dev": true
+    },
+    "node_modules/hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+      "dev": true,
+      "dependencies": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "node_modules/homedir-polyfill": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
+      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
+      "dev": true,
+      "dependencies": {
+        "parse-passwd": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hosted-git-info": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.5.tgz",
+      "integrity": "sha512-i4dpK6xj9BIpVOTboXIlKG9+8HMKggcrMX7WA24xZtKwX0TPelq/rbaS5rCKeNX8sJXZJGdSxpnEGtta+wismQ==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/hpack.js": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
+      "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "obuf": "^1.0.0",
+        "readable-stream": "^2.0.1",
+        "wbuf": "^1.1.0"
+      }
+    },
+    "node_modules/hsl-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz",
+      "integrity": "sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4=",
+      "dev": true
+    },
+    "node_modules/hsla-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz",
+      "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg=",
+      "dev": true
+    },
+    "node_modules/html-comment-regex": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz",
+      "integrity": "sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==",
+      "dev": true
+    },
+    "node_modules/html-encoding-sniffer": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
+      "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
+      "dev": true,
+      "dependencies": {
+        "whatwg-encoding": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/html-entities": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.3.1.tgz",
+      "integrity": "sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==",
+      "dev": true
+    },
+    "node_modules/html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "dev": true
+    },
+    "node_modules/html-minifier": {
+      "version": "3.5.21",
+      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz",
+      "integrity": "sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==",
+      "dev": true,
+      "dependencies": {
+        "camel-case": "3.0.x",
+        "clean-css": "4.2.x",
+        "commander": "2.17.x",
+        "he": "1.2.x",
+        "param-case": "2.1.x",
+        "relateurl": "0.2.x",
+        "uglify-js": "3.4.x"
+      },
+      "bin": {
+        "html-minifier": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/html-minifier/node_modules/commander": {
+      "version": "2.17.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
+      "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
+      "dev": true
+    },
+    "node_modules/htmlparser2": {
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
+      "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^1.3.1",
+        "domhandler": "^2.3.0",
+        "domutils": "^1.5.1",
+        "entities": "^1.1.1",
+        "inherits": "^2.0.1",
+        "readable-stream": "^3.1.1"
+      }
+    },
+    "node_modules/htmlparser2/node_modules/entities": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
+      "dev": true
+    },
+    "node_modules/htmlparser2/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/http-cache-semantics": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
+      "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="
+    },
+    "node_modules/http-deceiver": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
+      "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
+      "dev": true
+    },
+    "node_modules/http-errors": {
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
+      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
+      "dependencies": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.1",
+        "statuses": ">= 1.5.0 < 2",
+        "toidentifier": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/http-errors/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+    },
+    "node_modules/http-proxy": {
+      "version": "1.18.1",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
+      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
+      "dev": true,
+      "dependencies": {
+        "eventemitter3": "^4.0.0",
+        "follow-redirects": "^1.0.0",
+        "requires-port": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/http-proxy-agent": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz",
+      "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "4",
+        "debug": "3.1.0"
+      },
+      "engines": {
+        "node": ">= 4.5.0"
+      }
+    },
+    "node_modules/http-proxy-agent/node_modules/debug": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/http-proxy-middleware": {
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz",
+      "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==",
+      "dev": true,
+      "dependencies": {
+        "http-proxy": "^1.17.0",
+        "is-glob": "^4.0.0",
+        "lodash": "^4.17.11",
+        "micromatch": "^3.1.10"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/http-proxy-middleware/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/http-proxy-middleware/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/http-proxy-middleware/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/http-proxy-middleware/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/http-proxy-middleware/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/http-proxy-middleware/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/http-proxy-middleware/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/http-proxy-middleware/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/http-proxy-middleware/node_modules/to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "dependencies": {
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
+      },
+      "engines": {
+        "node": ">=0.8",
+        "npm": ">=1.3.7"
+      }
+    },
+    "node_modules/https-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
+      "dev": true
+    },
+    "node_modules/https-proxy-agent": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
+      "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^4.3.0",
+        "debug": "^3.1.0"
+      },
+      "engines": {
+        "node": ">= 4.5.0"
+      }
+    },
+    "node_modules/https-proxy-agent/node_modules/debug": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/https-proxy-agent/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/human-signals": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
+      "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
+      "engines": {
+        "node": ">=8.12.0"
+      }
+    },
+    "node_modules/humanize-ms": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
+      "integrity": "sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=",
+      "dependencies": {
+        "ms": "^2.0.0"
+      }
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/icss-utils": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz",
+      "integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^7.0.14"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/ieee754": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
+      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
+      "devOptional": true
+    },
+    "node_modules/iferr": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
+      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
+      "dev": true
+    },
+    "node_modules/ignore": {
+      "version": "5.1.8",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
+      "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/ignore-walk": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz",
+      "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==",
+      "dependencies": {
+        "minimatch": "^3.0.4"
+      }
+    },
+    "node_modules/image-size": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
+      "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=",
+      "dev": true,
+      "optional": true,
+      "bin": {
+        "image-size": "bin/image-size.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/immediate": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
+      "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps="
+    },
+    "node_modules/import-cwd": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
+      "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
+      "dev": true,
+      "dependencies": {
+        "import-from": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/import-fresh": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
+      "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/import-from": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
+      "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
+      "dev": true,
+      "dependencies": {
+        "resolve-from": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/import-from/node_modules/resolve-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/import-lazy": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
+      "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/import-local": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
+      "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
+      "dev": true,
+      "dependencies": {
+        "pkg-dir": "^3.0.0",
+        "resolve-cwd": "^2.0.0"
+      },
+      "bin": {
+        "import-local-fixture": "fixtures/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/indexes-of": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
+      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
+      "dev": true
+    },
+    "node_modules/infer-owner": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
+      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "node_modules/ini": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+      "deprecated": "Please update to ini >=1.3.6 to avoid a prototype pollution issue",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/init-package-json": {
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.10.3.tgz",
+      "integrity": "sha512-zKSiXKhQveNteyhcj1CoOP8tqp1QuxPIPBl8Bid99DGLFqA1p87M6lNgfjJHSBoWJJlidGOv5rWjyYKEB3g2Jw==",
+      "dependencies": {
+        "glob": "^7.1.1",
+        "npm-package-arg": "^4.0.0 || ^5.0.0 || ^6.0.0",
+        "promzard": "^0.3.0",
+        "read": "~1.0.1",
+        "read-package-json": "1 || 2",
+        "semver": "2.x || 3.x || 4 || 5",
+        "validate-npm-package-license": "^3.0.1",
+        "validate-npm-package-name": "^3.0.0"
+      }
+    },
+    "node_modules/init-package-json/node_modules/hosted-git-info": {
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="
+    },
+    "node_modules/init-package-json/node_modules/npm-package-arg": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
+      "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
+      "dependencies": {
+        "hosted-git-info": "^2.7.1",
+        "osenv": "^0.1.5",
+        "semver": "^5.6.0",
+        "validate-npm-package-name": "^3.0.0"
+      }
+    },
+    "node_modules/init-package-json/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/inquirer": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz",
+      "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==",
+      "dependencies": {
+        "ansi-escapes": "^3.2.0",
+        "chalk": "^2.4.2",
+        "cli-cursor": "^2.1.0",
+        "cli-width": "^2.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^2.0.0",
+        "lodash": "^4.17.12",
+        "mute-stream": "0.0.7",
+        "run-async": "^2.2.0",
+        "rxjs": "^6.4.0",
+        "string-width": "^2.1.0",
+        "strip-ansi": "^5.1.0",
+        "through": "^2.3.6"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/inquirer/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/inquirer/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/inquirer/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/inquirer/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+    },
+    "node_modules/inquirer/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/inquirer/node_modules/mute-stream": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
+    },
+    "node_modules/inquirer/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/insight": {
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/insight/-/insight-0.10.3.tgz",
+      "integrity": "sha512-YOncxSN6Omh+1Oqxt+OJAvJVMDKw7l6IEG0wT2cTMGxjsTcroOGW4IR926QDzxg/uZHcFZ2cZbckDWdZhc2pZw==",
+      "dependencies": {
+        "async": "^2.6.2",
+        "chalk": "^2.4.2",
+        "conf": "^1.4.0",
+        "inquirer": "^6.3.1",
+        "lodash.debounce": "^4.0.8",
+        "os-name": "^3.1.0",
+        "request": "^2.88.0",
+        "tough-cookie": "^3.0.1",
+        "uuid": "^3.3.2"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/insight/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/insight/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/insight/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/insight/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+    },
+    "node_modules/insight/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/insight/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/internal-ip": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz",
+      "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==",
+      "dev": true,
+      "dependencies": {
+        "default-gateway": "^4.2.0",
+        "ipaddr.js": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/interpret": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
+      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/invariant": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
+      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+      "dev": true,
+      "dependencies": {
+        "loose-envify": "^1.0.0"
+      }
+    },
+    "node_modules/invert-kv": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ionicons": {
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.1.tgz",
+      "integrity": "sha512-1auVisfaXmkmxINer8Q3kJGHP1vSxk86hf7By95eJ+Av9+oBcNuAEBfSe3jaMaGRVxVw8U/2j23MFq7R3c0HPg==",
+      "dependencies": {
+        "@stencil/core": "^2.5.0"
+      }
+    },
+    "node_modules/ios-sim": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/ios-sim/-/ios-sim-8.0.2.tgz",
+      "integrity": "sha512-P7nEG771bfd+JoMRjnis1gpZOkjTUUxu+4Ek1Z+eoaEEoT9byllU9pxfQ8Df7hL3gSkIQxNwTSLhos2I8tWUQA==",
+      "dependencies": {
+        "bplist-parser": "^0.0.6",
+        "nopt": "1.0.9",
+        "plist": "^3.0.1",
+        "simctl": "^2"
+      },
+      "bin": {
+        "ios-sim": "bin/ios-sim"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ios-sim/node_modules/bplist-parser": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.0.6.tgz",
+      "integrity": "sha1-ONo0cYF9+dRKs4kuJ3B7u9daEbk="
+    },
+    "node_modules/ios-sim/node_modules/nopt": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.9.tgz",
+      "integrity": "sha1-O8DXy6e/sNWmdtvtfA6+SKT9RU4=",
+      "dependencies": {
+        "abbrev": "1"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/ip": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
+      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
+    },
+    "node_modules/ip-regex": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
+      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ipaddr.js": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/is-absolute": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
+      "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
+      "dev": true,
+      "dependencies": {
+        "is-relative": "^1.0.0",
+        "is-windows": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-absolute-url": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
+      "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-accessor-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-arguments": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
+      "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+      "dev": true
+    },
+    "node_modules/is-bigint": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.1.tgz",
+      "integrity": "sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-boolean-object": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.0.tgz",
+      "integrity": "sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "node_modules/is-callable": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz",
+      "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-ci": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
+      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
+      "dependencies": {
+        "ci-info": "^2.0.0"
+      },
+      "bin": {
+        "is-ci": "bin.js"
+      }
+    },
+    "node_modules/is-color-stop": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz",
+      "integrity": "sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=",
+      "dev": true,
+      "dependencies": {
+        "css-color-names": "^0.0.4",
+        "hex-color-regex": "^1.1.0",
+        "hsl-regex": "^1.0.0",
+        "hsla-regex": "^1.0.0",
+        "rgb-regex": "^1.0.1",
+        "rgba-regex": "^1.0.0"
+      }
+    },
+    "node_modules/is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-data-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-date-object": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
+      "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-descriptor/node_modules/kind-of": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-directory": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
+      "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-docker": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz",
+      "integrity": "sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==",
+      "bin": {
+        "is-docker": "cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/is-generator-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-installed-globally": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.3.2.tgz",
+      "integrity": "sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==",
+      "dependencies": {
+        "global-dirs": "^2.0.1",
+        "is-path-inside": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-interactive": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
+      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-lambda": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
+      "integrity": "sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU="
+    },
+    "node_modules/is-negated-glob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz",
+      "integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-negative-zero": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz",
+      "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/is-npm": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz",
+      "integrity": "sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-number-object": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.4.tgz",
+      "integrity": "sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-obj": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
+      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-path-cwd": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
+      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-path-in-cwd": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
+      "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
+      "dev": true,
+      "dependencies": {
+        "is-path-inside": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-path-in-cwd/node_modules/is-path-inside": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
+      "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
+      "dev": true,
+      "dependencies": {
+        "path-is-inside": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-path-inside": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz",
+      "integrity": "sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-plain-object/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-potential-custom-element-name": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz",
+      "integrity": "sha1-DFLlS8yjkbssSUsh6GJtczbG45c=",
+      "dev": true
+    },
+    "node_modules/is-regex": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
+      "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-relative": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
+      "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
+      "dev": true,
+      "dependencies": {
+        "is-unc-path": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-resolvable": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
+      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
+      "dev": true
+    },
+    "node_modules/is-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
+      "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-string": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz",
+      "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-svg": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz",
+      "integrity": "sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==",
+      "dev": true,
+      "dependencies": {
+        "html-comment-regex": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/is-symbol": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
+      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+    },
+    "node_modules/is-unc-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
+      "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
+      "dev": true,
+      "dependencies": {
+        "unc-path-regex": "^0.1.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-utf8": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
+      "dev": true
+    },
+    "node_modules/is-valid-glob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
+      "integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "dependencies": {
+        "is-docker": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-yarn-global": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz",
+      "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw=="
+    },
+    "node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+    },
+    "node_modules/isobject": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-4.0.0.tgz",
+      "integrity": "sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+    },
+    "node_modules/istanbul-lib-coverage": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
+      "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-instrument": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
+      "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.7.5",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.0.0",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-instrument/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/istanbul-lib-report": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+      "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
+      "dev": true,
+      "dependencies": {
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^3.0.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz",
+      "integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps/node_modules/debug": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+      "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/istanbul-lib-source-maps/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/istanbul-lib-source-maps/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/istanbul-reports": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz",
+      "integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==",
+      "dev": true,
+      "dependencies": {
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-26.5.2.tgz",
+      "integrity": "sha512-4HFabJVwsgDwul/7rhXJ3yFAF/aUkVIXiJWmgFxb+WMdZG39fVvOwYAs8/3r4AlFPc4m/n5sTMtuMbOL3kNtrQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/core": "^26.5.2",
+        "import-local": "^3.0.2",
+        "jest-cli": "^26.5.2"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-changed-files": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.5.2.tgz",
+      "integrity": "sha512-qSmssmiIdvM5BWVtyK/nqVpN3spR5YyvkvPqz1x3BR1bwIxsWmU/MGwLoCrPNLbkG2ASAKfvmJpOduEApBPh2w==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.5.2",
+        "execa": "^4.0.0",
+        "throat": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-config": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.5.2.tgz",
+      "integrity": "sha512-dqJOnSegNdE5yDiuGHsjTM5gec7Z4AcAMHiW+YscbOYJAlb3LEtDSobXCq0or9EmGQI5SFmKy4T7P1FxetJOfg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.1.0",
+        "@jest/test-sequencer": "^26.5.2",
+        "@jest/types": "^26.5.2",
+        "babel-jest": "^26.5.2",
+        "chalk": "^4.0.0",
+        "deepmerge": "^4.2.2",
+        "glob": "^7.1.1",
+        "graceful-fs": "^4.2.4",
+        "jest-environment-jsdom": "^26.5.2",
+        "jest-environment-node": "^26.5.2",
+        "jest-get-type": "^26.3.0",
+        "jest-jasmine2": "^26.5.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-resolve": "^26.5.2",
+        "jest-util": "^26.5.2",
+        "jest-validate": "^26.5.2",
+        "micromatch": "^4.0.2",
+        "pretty-format": "^26.5.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-config/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-diff": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.5.2.tgz",
+      "integrity": "sha512-HCSWDUGwsov5oTlGzrRM+UPJI/Dpqi9jzeV0fdRNi3Ch5bnoXhnyJMmVg2juv9081zLIy3HGPI5mcuGgXM2xRA==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "diff-sequences": "^26.5.0",
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.5.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-diff/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-docblock": {
+      "version": "26.0.0",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-26.0.0.tgz",
+      "integrity": "sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w==",
+      "dev": true,
+      "dependencies": {
+        "detect-newline": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-each": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.5.2.tgz",
+      "integrity": "sha512-w7D9FNe0m2D3yZ0Drj9CLkyF/mGhmBSULMQTypzAKR746xXnjUrK8GUJdlLTWUF6dd0ks3MtvGP7/xNFr9Aphg==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.5.2",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^26.3.0",
+        "jest-util": "^26.5.2",
+        "pretty-format": "^26.5.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-each/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-environment-jsdom": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.5.2.tgz",
+      "integrity": "sha512-fWZPx0bluJaTQ36+PmRpvUtUlUFlGGBNyGX1SN3dLUHHMcQ4WseNEzcGGKOw4U5towXgxI4qDoI3vwR18H0RTw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^26.5.2",
+        "@jest/fake-timers": "^26.5.2",
+        "@jest/types": "^26.5.2",
+        "@types/node": "*",
+        "jest-mock": "^26.5.2",
+        "jest-util": "^26.5.2",
+        "jsdom": "^16.4.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-environment-node": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.5.2.tgz",
+      "integrity": "sha512-YHjnDsf/GKFCYMGF1V+6HF7jhY1fcLfLNBDjhAOvFGvt6d8vXvNdJGVM7uTZ2VO/TuIyEFhPGaXMX5j3h7fsrA==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^26.5.2",
+        "@jest/fake-timers": "^26.5.2",
+        "@jest/types": "^26.5.2",
+        "@types/node": "*",
+        "jest-mock": "^26.5.2",
+        "jest-util": "^26.5.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-get-type": {
+      "version": "26.3.0",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
+      "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-haste-map": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.5.2.tgz",
+      "integrity": "sha512-lJIAVJN3gtO3k4xy+7i2Xjtwh8CfPcH08WYjZpe9xzveDaqGw9fVNCpkYu6M525wKFVkLmyi7ku+DxCAP1lyMA==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.5.2",
+        "@types/graceful-fs": "^4.1.2",
+        "@types/node": "*",
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
+        "graceful-fs": "^4.2.4",
+        "jest-regex-util": "^26.0.0",
+        "jest-serializer": "^26.5.0",
+        "jest-util": "^26.5.2",
+        "jest-worker": "^26.5.0",
+        "micromatch": "^4.0.2",
+        "sane": "^4.0.3",
+        "walker": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      },
+      "optionalDependencies": {
+        "fsevents": "^2.1.2"
+      }
+    },
+    "node_modules/jest-haste-map/node_modules/jest-worker": {
+      "version": "26.5.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.5.0.tgz",
+      "integrity": "sha512-kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/jest-jasmine2": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.5.2.tgz",
+      "integrity": "sha512-2J+GYcgLVPTkpmvHEj0/IDTIAuyblGNGlyGe4fLfDT2aktEPBYvoxUwFiOmDDxxzuuEAD2uxcYXr0+1Yw4tjFA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/traverse": "^7.1.0",
+        "@jest/environment": "^26.5.2",
+        "@jest/source-map": "^26.5.0",
+        "@jest/test-result": "^26.5.2",
+        "@jest/types": "^26.5.2",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "co": "^4.6.0",
+        "expect": "^26.5.2",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^26.5.2",
+        "jest-matcher-utils": "^26.5.2",
+        "jest-message-util": "^26.5.2",
+        "jest-runtime": "^26.5.2",
+        "jest-snapshot": "^26.5.2",
+        "jest-util": "^26.5.2",
+        "pretty-format": "^26.5.2",
+        "throat": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-jasmine2/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-leak-detector": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.5.2.tgz",
+      "integrity": "sha512-h7ia3dLzBFItmYERaLPEtEKxy3YlcbcRSjj0XRNJgBEyODuu+3DM2o62kvIFvs3PsaYoIIv+e+nLRI61Dj1CNw==",
+      "dev": true,
+      "dependencies": {
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.5.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-matcher-utils": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.5.2.tgz",
+      "integrity": "sha512-W9GO9KBIC4gIArsNqDUKsLnhivaqf8MSs6ujO/JDcPIQrmY+aasewweXVET8KdrJ6ADQaUne5UzysvF/RR7JYA==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "jest-diff": "^26.5.2",
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.5.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-matcher-utils/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-message-util": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.5.2.tgz",
+      "integrity": "sha512-Ocp9UYZ5Jl15C5PNsoDiGEk14A4NG0zZKknpWdZGoMzJuGAkVt10e97tnEVMYpk7LnQHZOfuK2j/izLBMcuCZw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "@jest/types": "^26.5.2",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "micromatch": "^4.0.2",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-message-util/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-mock": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.5.2.tgz",
+      "integrity": "sha512-9SiU4b5PtO51v0MtJwVRqeGEroH66Bnwtq4ARdNP7jNXbpT7+ByeWNAk4NeT/uHfNSVDXEXgQo1XRuwEqS6Rdw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.5.2",
+        "@types/node": "*"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-pnp-resolver": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
+      "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      },
+      "peerDependencies": {
+        "jest-resolve": "*"
+      },
+      "peerDependenciesMeta": {
+        "jest-resolve": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-preset-angular": {
+      "version": "8.3.1",
+      "resolved": "https://registry.npmjs.org/jest-preset-angular/-/jest-preset-angular-8.3.1.tgz",
+      "integrity": "sha512-WhQm+0tXzikkvIF35XErV87DqYbieZI0R0MIGgn7VE/DDhdbXFDmYQxFZ7w4qcA0cGLLvSMTBbIsUtHeE/rFxQ==",
+      "dev": true,
+      "dependencies": {
+        "pretty-format": "26.x",
+        "ts-jest": "26.x"
+      },
+      "engines": {
+        "node": ">= 10"
+      },
+      "peerDependencies": {
+        "@angular/core": ">=2.0.0",
+        "@angular/platform-browser-dynamic": ">=2.0.0",
+        "jest": "^26.0.0"
+      }
+    },
+    "node_modules/jest-regex-util": {
+      "version": "26.0.0",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz",
+      "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-resolve": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.5.2.tgz",
+      "integrity": "sha512-XsPxojXGRA0CoDD7Vis59ucz2p3cQFU5C+19tz3tLEAlhYKkK77IL0cjYjikY9wXnOaBeEdm1rOgSJjbZWpcZg==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.5.2",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "jest-pnp-resolver": "^1.2.2",
+        "jest-util": "^26.5.2",
+        "read-pkg-up": "^7.0.1",
+        "resolve": "^1.17.0",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-resolve-dependencies": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.5.2.tgz",
+      "integrity": "sha512-LLkc8LuRtxqOx0AtX/Npa2C4I23WcIrwUgNtHYXg4owYF/ZDQShcwBAHjYZIFR06+HpQcZ43+kCTMlQ3aDCYTg==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.5.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-snapshot": "^26.5.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-resolve/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-resolve/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-resolve/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-resolve/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-resolve/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-resolve/node_modules/parse-json": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.1.0.tgz",
+      "integrity": "sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-resolve/node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-resolve/node_modules/read-pkg": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
+      "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+      "dev": true,
+      "dependencies": {
+        "@types/normalize-package-data": "^2.4.0",
+        "normalize-package-data": "^2.5.0",
+        "parse-json": "^5.0.0",
+        "type-fest": "^0.6.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-resolve/node_modules/read-pkg-up": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+      "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^4.1.0",
+        "read-pkg": "^5.2.0",
+        "type-fest": "^0.8.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-resolve/node_modules/read-pkg/node_modules/type-fest": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
+      "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-runner": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.5.2.tgz",
+      "integrity": "sha512-GKhYxtSX5+tXZsd2QwfkDqPIj5C2HqOdXLRc2x2qYqWE26OJh17xo58/fN/mLhRkO4y6o60ZVloan7Kk5YA6hg==",
+      "dev": true,
+      "dependencies": {
+        "@jest/console": "^26.5.2",
+        "@jest/environment": "^26.5.2",
+        "@jest/test-result": "^26.5.2",
+        "@jest/types": "^26.5.2",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "emittery": "^0.7.1",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.4",
+        "jest-config": "^26.5.2",
+        "jest-docblock": "^26.0.0",
+        "jest-haste-map": "^26.5.2",
+        "jest-leak-detector": "^26.5.2",
+        "jest-message-util": "^26.5.2",
+        "jest-resolve": "^26.5.2",
+        "jest-runtime": "^26.5.2",
+        "jest-util": "^26.5.2",
+        "jest-worker": "^26.5.0",
+        "source-map-support": "^0.5.6",
+        "throat": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-runner/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-runner/node_modules/jest-worker": {
+      "version": "26.5.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.5.0.tgz",
+      "integrity": "sha512-kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/jest-runtime": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.5.2.tgz",
+      "integrity": "sha512-zArr4DatX/Sn0wswX/AnAuJgmwgAR5rNtrUz36HR8BfMuysHYNq5sDbYHuLC4ICyRdy5ae/KQ+sczxyS9G6Qvw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/console": "^26.5.2",
+        "@jest/environment": "^26.5.2",
+        "@jest/fake-timers": "^26.5.2",
+        "@jest/globals": "^26.5.2",
+        "@jest/source-map": "^26.5.0",
+        "@jest/test-result": "^26.5.2",
+        "@jest/transform": "^26.5.2",
+        "@jest/types": "^26.5.2",
+        "@types/yargs": "^15.0.0",
+        "chalk": "^4.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "exit": "^0.1.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.4",
+        "jest-config": "^26.5.2",
+        "jest-haste-map": "^26.5.2",
+        "jest-message-util": "^26.5.2",
+        "jest-mock": "^26.5.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-resolve": "^26.5.2",
+        "jest-snapshot": "^26.5.2",
+        "jest-util": "^26.5.2",
+        "jest-validate": "^26.5.2",
+        "slash": "^3.0.0",
+        "strip-bom": "^4.0.0",
+        "yargs": "^15.4.1"
+      },
+      "bin": {
+        "jest-runtime": "bin/jest-runtime.js"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/cliui": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.0"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/jest-runtime/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/string-width": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/yargs": {
+      "version": "15.4.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^6.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^4.1.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^4.2.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^18.1.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/yargs-parser": {
+      "version": "18.1.3",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jest-serializer": {
+      "version": "26.5.0",
+      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.5.0.tgz",
+      "integrity": "sha512-+h3Gf5CDRlSLdgTv7y0vPIAoLgX/SI7T4v6hy+TEXMgYbv+ztzbg5PSN6mUXAT/hXYHvZRWm+MaObVfqkhCGxA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "graceful-fs": "^4.2.4"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-snapshot": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.5.2.tgz",
+      "integrity": "sha512-MkXIDvEefzDubI/WaDVSRH4xnkuirP/Pz8LhAIDXcVQTmcEfwxywj5LGwBmhz+kAAIldA7XM4l96vbpzltSjqg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.0.0",
+        "@jest/types": "^26.5.2",
+        "@types/babel__traverse": "^7.0.4",
+        "@types/prettier": "^2.0.0",
+        "chalk": "^4.0.0",
+        "expect": "^26.5.2",
+        "graceful-fs": "^4.2.4",
+        "jest-diff": "^26.5.2",
+        "jest-get-type": "^26.3.0",
+        "jest-haste-map": "^26.5.2",
+        "jest-matcher-utils": "^26.5.2",
+        "jest-message-util": "^26.5.2",
+        "jest-resolve": "^26.5.2",
+        "natural-compare": "^1.4.0",
+        "pretty-format": "^26.5.2",
+        "semver": "^7.3.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-util": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.5.2.tgz",
+      "integrity": "sha512-WTL675bK+GSSAYgS8z9FWdCT2nccO1yTIplNLPlP0OD8tUk/H5IrWKMMRudIQQ0qp8bb4k+1Qa8CxGKq9qnYdg==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.5.2",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "is-ci": "^2.0.0",
+        "micromatch": "^4.0.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-util/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-validate": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.5.2.tgz",
+      "integrity": "sha512-FmJks0zY36mp6Af/5sqO6CTL9bNMU45yKCJk3hrz8d2aIqQIlN1pr9HPIwZE8blLaewOla134nt5+xAmWsx3SQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.5.2",
+        "camelcase": "^6.0.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^26.3.0",
+        "leven": "^3.1.0",
+        "pretty-format": "^26.5.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-validate/node_modules/camelcase": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.0.0.tgz",
+      "integrity": "sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-validate/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-watcher": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.5.2.tgz",
+      "integrity": "sha512-i3m1NtWzF+FXfJ3ljLBB/WQEp4uaNhX7QcQUWMokcifFTUQBDFyUMEwk0JkJ1kopHbx7Een3KX0Q7+9koGM/Pw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/test-result": "^26.5.2",
+        "@jest/types": "^26.5.2",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "jest-util": "^26.5.2",
+        "string-length": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-watcher/node_modules/ansi-escapes": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
+      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.11.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-watcher/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-watcher/node_modules/type-fest": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
+      "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-worker": {
+      "version": "26.0.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.0.0.tgz",
+      "integrity": "sha512-pPaYa2+JnwmiZjK9x7p9BoZht+47ecFCDFA/CJxspHzeDvQcfVBLWzCiWyo+EGrSiQMWZtCFo9iSvMZnAAo8vw==",
+      "dev": true,
+      "dependencies": {
+        "merge-stream": "^2.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest/node_modules/cliui": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.0"
+      }
+    },
+    "node_modules/jest/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/jest/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/import-local": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
+      "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==",
+      "dev": true,
+      "dependencies": {
+        "pkg-dir": "^4.2.0",
+        "resolve-cwd": "^3.0.0"
+      },
+      "bin": {
+        "import-local-fixture": "fixtures/cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/jest-cli": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.5.2.tgz",
+      "integrity": "sha512-usm48COuUvRp8YEG5OWOaxbSM0my7eHn3QeBWxiGUuFhvkGVBvl1fic4UjC02EAEQtDv8KrNQUXdQTV6ZZBsoA==",
+      "dev": true,
+      "dependencies": {
+        "@jest/core": "^26.5.2",
+        "@jest/test-result": "^26.5.2",
+        "@jest/types": "^26.5.2",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.4",
+        "import-local": "^3.0.2",
+        "is-ci": "^2.0.0",
+        "jest-config": "^26.5.2",
+        "jest-util": "^26.5.2",
+        "jest-validate": "^26.5.2",
+        "prompts": "^2.0.1",
+        "yargs": "^15.4.1"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/resolve-cwd": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+      "dev": true,
+      "dependencies": {
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/string-width": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/yargs": {
+      "version": "15.4.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^6.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^4.1.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^4.2.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^18.1.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/yargs-parser": {
+      "version": "18.1.3",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "node_modules/js-yaml": {
+      "version": "3.14.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
+      "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
+    },
+    "node_modules/jsdoctypeparser": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/jsdoctypeparser/-/jsdoctypeparser-9.0.0.tgz",
+      "integrity": "sha512-jrTA2jJIL6/DAEILBEh2/w9QxCuwmvNXIry39Ay/HVfhE3o2yVV0U44blYkqdHA/OKloJEqvJy0xU+GSdE2SIw==",
+      "dev": true,
+      "bin": {
+        "jsdoctypeparser": "bin/jsdoctypeparser"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jsdom": {
+      "version": "16.4.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.4.0.tgz",
+      "integrity": "sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w==",
+      "dev": true,
+      "dependencies": {
+        "abab": "^2.0.3",
+        "acorn": "^7.1.1",
+        "acorn-globals": "^6.0.0",
+        "cssom": "^0.4.4",
+        "cssstyle": "^2.2.0",
+        "data-urls": "^2.0.0",
+        "decimal.js": "^10.2.0",
+        "domexception": "^2.0.1",
+        "escodegen": "^1.14.1",
+        "html-encoding-sniffer": "^2.0.1",
+        "is-potential-custom-element-name": "^1.0.0",
+        "nwsapi": "^2.2.0",
+        "parse5": "5.1.1",
+        "request": "^2.88.2",
+        "request-promise-native": "^1.0.8",
+        "saxes": "^5.0.0",
+        "symbol-tree": "^3.2.4",
+        "tough-cookie": "^3.0.1",
+        "w3c-hr-time": "^1.0.2",
+        "w3c-xmlserializer": "^2.0.0",
+        "webidl-conversions": "^6.1.0",
+        "whatwg-encoding": "^1.0.5",
+        "whatwg-mimetype": "^2.3.0",
+        "whatwg-url": "^8.0.0",
+        "ws": "^7.2.3",
+        "xml-name-validator": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "canvas": "^2.5.0"
+      },
+      "peerDependenciesMeta": {
+        "canvas": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jsdom/node_modules/acorn": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/jsdom/node_modules/parse5": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
+      "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
+      "dev": true
+    },
+    "node_modules/jsdom/node_modules/ws": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz",
+      "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "dev": true,
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/json-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
+      "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg="
+    },
+    "node_modules/json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+      "dev": true
+    },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
+    },
+    "node_modules/json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+    },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+      "dev": true
+    },
+    "node_modules/json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+    },
+    "node_modules/json3": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz",
+      "integrity": "sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==",
+      "dev": true
+    },
+    "node_modules/json5": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
+      "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jsonc-parser": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.3.1.tgz",
+      "integrity": "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==",
+      "dev": true
+    },
+    "node_modules/jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/jsonparse": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
+      "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
+      "engines": [
+        "node >= 0.2.0"
+      ]
+    },
+    "node_modules/JSONStream": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
+      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
+      "dev": true,
+      "dependencies": {
+        "jsonparse": "^1.2.0",
+        "through": ">=2.2.7 <3"
+      },
+      "bin": {
+        "JSONStream": "bin.js"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/jsprim": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "engines": [
+        "node >=0.6.0"
+      ],
+      "dependencies": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
+      }
+    },
+    "node_modules/jsprim/node_modules/extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+      "engines": [
+        "node >=0.6.0"
+      ]
+    },
+    "node_modules/jszip": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.5.0.tgz",
+      "integrity": "sha512-WRtu7TPCmYePR1nazfrtuF216cIVon/3GWOvHS9QR5bIwSbnxtdpma6un3jyGGNhHsKCSzn5Ypk+EkDRvTGiFA==",
+      "dependencies": {
+        "lie": "~3.3.0",
+        "pako": "~1.0.2",
+        "readable-stream": "~2.3.6",
+        "set-immediate-shim": "~1.0.1"
+      }
+    },
+    "node_modules/just-debounce": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.0.0.tgz",
+      "integrity": "sha1-h/zPrv/AtozRnVX2cilD+SnqNeo=",
+      "dev": true
+    },
+    "node_modules/karma-source-map-support": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz",
+      "integrity": "sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A==",
+      "dev": true,
+      "dependencies": {
+        "source-map-support": "^0.5.5"
+      }
+    },
+    "node_modules/keytar": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/keytar/-/keytar-7.2.0.tgz",
+      "integrity": "sha512-ECSaWvoLKI5SI0pGpZQeUV1/lpBYfkaxvoSp3zkiPOz05VavwSfLi8DdEaa9N2ekQZv3Chy+o7aP6n9mairBgw==",
+      "hasInstallScript": true,
+      "optional": true,
+      "dependencies": {
+        "node-addon-api": "^3.0.0",
+        "prebuild-install": "^6.0.0"
+      }
+    },
+    "node_modules/keyv": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
+      "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==",
+      "dependencies": {
+        "json-buffer": "3.0.0"
+      }
+    },
+    "node_modules/killable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
+      "integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==",
+      "dev": true
+    },
+    "node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/kleur": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/last-run": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
+      "integrity": "sha1-RblpQsF7HHnHchmCWbqUO+v4yls=",
+      "dev": true,
+      "dependencies": {
+        "default-resolution": "^2.0.0",
+        "es6-weak-map": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/latest-version": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz",
+      "integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==",
+      "dependencies": {
+        "package-json": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/lazystream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
+      "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "^2.0.5"
+      },
+      "engines": {
+        "node": ">= 0.6.3"
+      }
+    },
+    "node_modules/lcid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+      "dev": true,
+      "dependencies": {
+        "invert-kv": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/lead": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz",
+      "integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=",
+      "dev": true,
+      "dependencies": {
+        "flush-write-stream": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/leek": {
+      "version": "0.0.24",
+      "resolved": "https://registry.npmjs.org/leek/-/leek-0.0.24.tgz",
+      "integrity": "sha1-5ADlfw5g2O8r1NBo3EKKVDRdvNo=",
+      "dev": true,
+      "dependencies": {
+        "debug": "^2.1.0",
+        "lodash.assign": "^3.2.0",
+        "rsvp": "^3.0.21"
+      }
+    },
+    "node_modules/leek/node_modules/rsvp": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz",
+      "integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==",
+      "dev": true,
+      "engines": {
+        "node": "0.12.* || 4.* || 6.* || >= 7.*"
+      }
+    },
+    "node_modules/less": {
+      "version": "3.12.2",
+      "resolved": "https://registry.npmjs.org/less/-/less-3.12.2.tgz",
+      "integrity": "sha512-+1V2PCMFkL+OIj2/HrtrvZw0BC0sYLMICJfbQjuj/K8CEnlrFX6R5cKKgzzttsZDHyxQNL1jqMREjKN3ja/E3Q==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.10.0"
+      },
+      "bin": {
+        "lessc": "bin/lessc"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "optionalDependencies": {
+        "errno": "^0.1.1",
+        "graceful-fs": "^4.1.2",
+        "image-size": "~0.5.0",
+        "make-dir": "^2.1.0",
+        "mime": "^1.4.1",
+        "native-request": "^1.0.5",
+        "source-map": "~0.6.0"
+      }
+    },
+    "node_modules/less-loader": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-6.1.0.tgz",
+      "integrity": "sha512-/jLzOwLyqJ7Kt3xg5sHHkXtOyShWwFj410K9Si9WO+/h8rmYxxkSR0A3/hFEntWudE20zZnWMtpMYnLzqTVdUA==",
+      "dev": true,
+      "dependencies": {
+        "clone": "^2.1.2",
+        "less": "^3.11.1",
+        "loader-utils": "^2.0.0",
+        "schema-utils": "^2.6.6"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/less/node_modules/make-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "pify": "^4.0.1",
+        "semver": "^5.6.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/less/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "optional": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/less/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/less/node_modules/tslib": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
+      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
+      "dev": true
+    },
+    "node_modules/leven": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/levenary": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz",
+      "integrity": "sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==",
+      "dev": true,
+      "dependencies": {
+        "leven": "^3.1.0"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/license-webpack-plugin": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-2.2.0.tgz",
+      "integrity": "sha512-XPsdL/0brSHf+7dXIlRqotnCQ58RX2au6otkOg4U3dm8uH+Ka/fW4iukEs95uXm+qKe/SBs+s1Ll/aQddKG+tg==",
+      "dev": true,
+      "dependencies": {
+        "@types/webpack-sources": "^0.1.5",
+        "webpack-sources": "^1.2.0"
+      }
+    },
+    "node_modules/lie": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
+      "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
+      "dependencies": {
+        "immediate": "~3.0.5"
+      }
+    },
+    "node_modules/liftoff": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz",
+      "integrity": "sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==",
+      "dev": true,
+      "dependencies": {
+        "extend": "^3.0.0",
+        "findup-sync": "^3.0.0",
+        "fined": "^1.0.1",
+        "flagged-respawn": "^1.0.0",
+        "is-plain-object": "^2.0.4",
+        "object.map": "^1.0.0",
+        "rechoir": "^0.6.2",
+        "resolve": "^1.1.7"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/lines-and-columns": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
+      "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
+      "dev": true
+    },
+    "node_modules/load-json-file": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+      "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "strip-bom": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/load-json-file/node_modules/parse-json": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+      "dev": true,
+      "dependencies": {
+        "error-ex": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/load-json-file/node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/load-json-file/node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/loader-runner": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
+      "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.3.0 <5.0.0 || >=5.10"
+      }
+    },
+    "node_modules/loader-utils": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+      "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
+    "node_modules/locate-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+      "dependencies": {
+        "p-locate": "^2.0.0",
+        "path-exists": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.20",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+      "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
+    },
+    "node_modules/lodash._baseassign": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
+      "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=",
+      "dev": true,
+      "dependencies": {
+        "lodash._basecopy": "^3.0.0",
+        "lodash.keys": "^3.0.0"
+      }
+    },
+    "node_modules/lodash._basecopy": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
+      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
+      "dev": true
+    },
+    "node_modules/lodash._bindcallback": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz",
+      "integrity": "sha1-5THCdkTPi1epnhftlbNcdIeJOS4=",
+      "dev": true
+    },
+    "node_modules/lodash._createassigner": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz",
+      "integrity": "sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=",
+      "dev": true,
+      "dependencies": {
+        "lodash._bindcallback": "^3.0.0",
+        "lodash._isiterateecall": "^3.0.0",
+        "lodash.restparam": "^3.0.0"
+      }
+    },
+    "node_modules/lodash._getnative": {
+      "version": "3.9.1",
+      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
+      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
+      "dev": true
+    },
+    "node_modules/lodash._isiterateecall": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
+      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
+      "dev": true
+    },
+    "node_modules/lodash.assign": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz",
+      "integrity": "sha1-POnwI0tLIiPilrj6CsH+6OvKZPo=",
+      "dev": true,
+      "dependencies": {
+        "lodash._baseassign": "^3.0.0",
+        "lodash._createassigner": "^3.0.0",
+        "lodash.keys": "^3.0.0"
+      }
+    },
+    "node_modules/lodash.clonedeep": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
+      "dev": true
+    },
+    "node_modules/lodash.debounce": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168="
+    },
+    "node_modules/lodash.flatten": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
+      "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=",
+      "dev": true
+    },
+    "node_modules/lodash.isarguments": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
+      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
+      "dev": true
+    },
+    "node_modules/lodash.isarray": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
+      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
+      "dev": true
+    },
+    "node_modules/lodash.keys": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
+      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
+      "dev": true,
+      "dependencies": {
+        "lodash._getnative": "^3.0.0",
+        "lodash.isarguments": "^3.0.0",
+        "lodash.isarray": "^3.0.0"
+      }
+    },
+    "node_modules/lodash.memoize": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
+      "dev": true
+    },
+    "node_modules/lodash.restparam": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
+      "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
+      "dev": true
+    },
+    "node_modules/lodash.sortby": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
+      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
+      "dev": true
+    },
+    "node_modules/lodash.truncate": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
+      "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
+      "dev": true
+    },
+    "node_modules/lodash.uniq": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
+      "dev": true
+    },
+    "node_modules/log-symbols": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
+      "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/log-symbols/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/log-symbols/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/log-symbols/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/log-symbols/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/log-symbols/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/log-symbols/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/loglevel": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.0.tgz",
+      "integrity": "sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6.0"
+      },
+      "funding": {
+        "type": "tidelift",
+        "url": "https://tidelift.com/subscription/pkg/npm-loglevel?utm_medium=referral&utm_source=npm_fund"
+      }
+    },
+    "node_modules/loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "dev": true,
+      "dependencies": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      },
+      "bin": {
+        "loose-envify": "cli.js"
+      }
+    },
+    "node_modules/loud-rejection": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-2.2.0.tgz",
+      "integrity": "sha512-S0FayMXku80toa5sZ6Ro4C+s+EtFDCsyJNG/AzFMfX3AxD5Si4dZsgzm/kKnbOxHl5Cv8jBlno8+3XYIh2pNjQ==",
+      "dependencies": {
+        "currently-unhandled": "^0.4.1",
+        "signal-exit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/lower-case": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
+      "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=",
+      "dev": true
+    },
+    "node_modules/lowercase-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
+      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/macos-release": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.4.1.tgz",
+      "integrity": "sha512-H/QHeBIN1fIGJX517pvK8IEK53yQOW7YcEI55oYtgjDdoCQQz7eJS94qt5kNrscReEyuD/JcdFCm2XBEcGOITg==",
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/magic-string": {
+      "version": "0.25.7",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
+      "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==",
+      "dev": true,
+      "dependencies": {
+        "sourcemap-codec": "^1.4.4"
+      }
+    },
+    "node_modules/make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "dependencies": {
+        "semver": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/make-dir/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/make-error": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+      "dev": true
+    },
+    "node_modules/make-fetch-happen": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz",
+      "integrity": "sha512-07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag==",
+      "dev": true,
+      "dependencies": {
+        "agentkeepalive": "^3.4.1",
+        "cacache": "^12.0.0",
+        "http-cache-semantics": "^3.8.1",
+        "http-proxy-agent": "^2.1.0",
+        "https-proxy-agent": "^2.2.3",
+        "lru-cache": "^5.1.1",
+        "mississippi": "^3.0.0",
+        "node-fetch-npm": "^2.0.2",
+        "promise-retry": "^1.1.1",
+        "socks-proxy-agent": "^4.0.0",
+        "ssri": "^6.0.0"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/cacache": {
+      "version": "12.0.4",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
+      "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
+      "dev": true,
+      "dependencies": {
+        "bluebird": "^3.5.5",
+        "chownr": "^1.1.1",
+        "figgy-pudding": "^3.5.1",
+        "glob": "^7.1.4",
+        "graceful-fs": "^4.1.15",
+        "infer-owner": "^1.0.3",
+        "lru-cache": "^5.1.1",
+        "mississippi": "^3.0.0",
+        "mkdirp": "^0.5.1",
+        "move-concurrently": "^1.0.1",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^2.6.3",
+        "ssri": "^6.0.1",
+        "unique-filename": "^1.1.1",
+        "y18n": "^4.0.0"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "dev": true
+    },
+    "node_modules/make-fetch-happen/node_modules/http-cache-semantics": {
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz",
+      "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==",
+      "dev": true
+    },
+    "node_modules/make-fetch-happen/node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/ssri": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+      "dev": true,
+      "dependencies": {
+        "figgy-pudding": "^3.5.1"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true
+    },
+    "node_modules/make-iterator": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
+      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/makeerror": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
+      "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
+      "dev": true,
+      "dependencies": {
+        "tmpl": "1.0.x"
+      }
+    },
+    "node_modules/map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/map-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+      "dev": true,
+      "dependencies": {
+        "object-visit": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
+      "integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4=",
+      "dev": true,
+      "dependencies": {
+        "findup-sync": "^2.0.0",
+        "micromatch": "^3.0.4",
+        "resolve": "^1.4.0",
+        "stack-trace": "0.0.10"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/findup-sync": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
+      "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
+      "dev": true,
+      "dependencies": {
+        "detect-file": "^1.0.0",
+        "is-glob": "^3.1.0",
+        "micromatch": "^3.0.4",
+        "resolve-dir": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/matchdep/node_modules/is-glob": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mathjax": {
+      "version": "2.7.7",
+      "resolved": "https://registry.npmjs.org/mathjax/-/mathjax-2.7.7.tgz",
+      "integrity": "sha512-OOl0B2/0tSJAtAZarXnQuLDBLgTNRqiI9VqHTQzPsxf4okT2iIpDrvaklK9x2QEMD1sDj4yRn11Ygci41DxMAQ=="
+    },
+    "node_modules/md5-file": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/md5-file/-/md5-file-5.0.0.tgz",
+      "integrity": "sha512-xbEFXCYVWrSx/gEKS1VPlg84h/4L20znVIulKw6kMfmBUAZNAnF00eczz9ICMl+/hjQGo5KSXRxbL/47X3rmMw==",
+      "bin": {
+        "md5-file": "cli.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/md5.js": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+      "dev": true,
+      "dependencies": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/mdn-browser-compat-data": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/mdn-browser-compat-data/-/mdn-browser-compat-data-1.1.2.tgz",
+      "integrity": "sha512-uBNX2P4iu3PZcXP20rL+n7fxN9PWZLj0y43QMe/1aXzqP3H6HbVOeePS0cBZCtMwcfr2Tugf1OHj+/wLam+dUg==",
+      "deprecated": "mdn-browser-compat-data is deprecated. Upgrade to @mdn/browser-compat-data. Learn more: https://github.com/mdn/browser-compat-data/blob/v1.1.2/UPGRADE-2.0.x.md",
+      "dev": true,
+      "dependencies": {
+        "extend": "3.0.2"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/mdn-data": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
+      "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==",
+      "dev": true
+    },
+    "node_modules/media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/memory-fs": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
+      "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
+      "dev": true,
+      "dependencies": {
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=4.3.0 <5.0.0 || >=5.10"
+      }
+    },
+    "node_modules/merge-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
+    },
+    "node_modules/merge-source-map": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz",
+      "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
+      "dev": true,
+      "dependencies": {
+        "source-map": "^0.6.1"
+      }
+    },
+    "node_modules/merge-source-map/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
+    },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+      "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+      "dependencies": {
+        "braces": "^3.0.1",
+        "picomatch": "^2.0.5"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/miller-rabin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
+      },
+      "bin": {
+        "miller-rabin": "bin/miller-rabin"
+      }
+    },
+    "node_modules/miller-rabin/node_modules/bn.js": {
+      "version": "4.11.9",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+      "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+      "dev": true
+    },
+    "node_modules/mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/mime-db": {
+      "version": "1.44.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
+      "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.27",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
+      "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
+      "dependencies": {
+        "mime-db": "1.44.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mimic-response": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
+      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/mini-css-extract-plugin": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz",
+      "integrity": "sha512-lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A==",
+      "dev": true,
+      "dependencies": {
+        "loader-utils": "^1.1.0",
+        "normalize-url": "1.9.1",
+        "schema-utils": "^1.0.0",
+        "webpack-sources": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 6.9.0"
+      },
+      "peerDependencies": {
+        "webpack": "^4.4.0"
+      }
+    },
+    "node_modules/mini-css-extract-plugin/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/mini-css-extract-plugin/node_modules/loader-utils": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/mini-css-extract-plugin/node_modules/normalize-url": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz",
+      "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
+      "dev": true,
+      "dependencies": {
+        "object-assign": "^4.0.1",
+        "prepend-http": "^1.0.0",
+        "query-string": "^4.1.0",
+        "sort-keys": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/mini-css-extract-plugin/node_modules/prepend-http": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
+      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.1.0",
+        "ajv-errors": "^1.0.0",
+        "ajv-keywords": "^3.1.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+      "dev": true
+    },
+    "node_modules/minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
+      "dev": true
+    },
+    "node_modules/minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+    },
+    "node_modules/minipass": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
+      "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minipass-collect": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
+      "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/minipass-fetch": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.3.4.tgz",
+      "integrity": "sha512-TielGogIzbUEtd1LsjZFs47RWuHHfhl6TiCx1InVxApBAmQ8bL0dL5ilkLGcRvuyW/A9nE+Lvn855Ewz8S0PnQ==",
+      "dependencies": {
+        "minipass": "^3.1.0",
+        "minipass-sized": "^1.0.3",
+        "minizlib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "optionalDependencies": {
+        "encoding": "^0.1.12"
+      }
+    },
+    "node_modules/minipass-flush": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
+      "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/minipass-json-stream": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz",
+      "integrity": "sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==",
+      "dependencies": {
+        "jsonparse": "^1.3.1",
+        "minipass": "^3.0.0"
+      }
+    },
+    "node_modules/minipass-pipeline": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
+      "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minipass-sized": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
+      "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==",
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minizlib": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+      "dependencies": {
+        "minipass": "^3.0.0",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/mississippi": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+      "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
+      "dev": true,
+      "dependencies": {
+        "concat-stream": "^1.5.0",
+        "duplexify": "^3.4.2",
+        "end-of-stream": "^1.1.0",
+        "flush-write-stream": "^1.0.0",
+        "from2": "^2.1.0",
+        "parallel-transform": "^1.1.0",
+        "pump": "^3.0.0",
+        "pumpify": "^1.3.3",
+        "stream-each": "^1.1.0",
+        "through2": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/mixin-deep": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+      "dev": true,
+      "dependencies": {
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mixin-deep/node_modules/is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/mkdirp-classic": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+      "optional": true
+    },
+    "node_modules/moment": {
+      "version": "2.29.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.0.tgz",
+      "integrity": "sha512-z6IJ5HXYiuxvFTI6eiQ9dm77uE0gyy1yXNApVHqTcnIKfY9tIwEjlzsZ6u1LQXvVgKeTnv9Xm7NDvJ7lso3MtA==",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/move-concurrently": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
+      "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
+      "dev": true,
+      "dependencies": {
+        "aproba": "^1.1.1",
+        "copy-concurrently": "^1.0.0",
+        "fs-write-stream-atomic": "^1.0.8",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.3"
+      }
+    },
+    "node_modules/move-concurrently/node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/move-file": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/move-file/-/move-file-2.0.0.tgz",
+      "integrity": "sha512-cdkdhNCgbP5dvS4tlGxZbD+nloio9GIimP57EjqFhwLcMjnU+XJKAZzlmg/TN/AK1LuNAdTSvm3CPPP4Xkv0iQ==",
+      "dev": true,
+      "dependencies": {
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/move-file/node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+    },
+    "node_modules/multicast-dns": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
+      "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
+      "dev": true,
+      "dependencies": {
+        "dns-packet": "^1.3.1",
+        "thunky": "^1.0.2"
+      },
+      "bin": {
+        "multicast-dns": "cli.js"
+      }
+    },
+    "node_modules/multicast-dns-service-types": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
+      "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
+      "dev": true
+    },
+    "node_modules/mute-stdout": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz",
+      "integrity": "sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/mute-stream": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="
+    },
+    "node_modules/nan": {
+      "version": "2.14.1",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz",
+      "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/nanomatch": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "fragment-cache": "^0.2.1",
+        "is-windows": "^1.0.2",
+        "kind-of": "^6.0.2",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/napi-build-utils": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
+      "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==",
+      "optional": true
+    },
+    "node_modules/native-request": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/native-request/-/native-request-1.0.7.tgz",
+      "integrity": "sha512-9nRjinI9bmz+S7dgNtf4A70+/vPhnd+2krGpy4SUlADuOuSa24IDkNaZ+R/QT1wQ6S8jBdi6wE7fLekFZNfUpQ==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/native-run": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/native-run/-/native-run-1.4.0.tgz",
+      "integrity": "sha512-3XJiDxGNi6XCsn8KYDQFSYGDVkKEMg0y55qTMU0feEuPNNU4iztBwW5bE87sfybZsQPsYDJQyYt9CUKDSoJgdQ==",
+      "dev": true,
+      "dependencies": {
+        "@ionic/utils-fs": "^3.0.0",
+        "@ionic/utils-terminal": "^2.3.1",
+        "bplist-parser": "0.2.0",
+        "debug": "^4.1.1",
+        "elementtree": "^0.1.7",
+        "ini": "^1.3.5",
+        "plist": "^3.0.1",
+        "split2": "^3.1.0",
+        "through2": "^4.0.2",
+        "tslib": "^2.0.1",
+        "yauzl": "^2.10.0"
+      },
+      "bin": {
+        "native-run": "bin/native-run"
+      },
+      "engines": {
+        "node": ">=10.3.0"
+      }
+    },
+    "node_modules/native-run/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/native-run/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/native-run/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/native-run/node_modules/through2": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
+      "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "3"
+      }
+    },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+      "dev": true
+    },
+    "node_modules/negotiator": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
+      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/neo-async": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+      "dev": true
+    },
+    "node_modules/netmask": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",
+      "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/next-tick": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
+      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
+      "dev": true
+    },
+    "node_modules/nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
+    },
+    "node_modules/nl.kingsquare.cordova.background-audio": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/nl.kingsquare.cordova.background-audio/-/nl.kingsquare.cordova.background-audio-1.0.1.tgz",
+      "integrity": "sha1-Gx1NzaijXAx/x5UzN7FzsUtPmGA="
+    },
+    "node_modules/no-case": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
+      "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
+      "dev": true,
+      "dependencies": {
+        "lower-case": "^1.1.1"
+      }
+    },
+    "node_modules/node-abi": {
+      "version": "2.19.3",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.19.3.tgz",
+      "integrity": "sha512-9xZrlyfvKhWme2EXFKQhZRp1yNWT/uI1luYPr3sFl+H4keYY4xR+1jO7mvTTijIsHf1M+QDe9uWuKeEpLInIlg==",
+      "optional": true,
+      "dependencies": {
+        "semver": "^5.4.1"
+      }
+    },
+    "node_modules/node-abi/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "optional": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/node-addon-api": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.0.2.tgz",
+      "integrity": "sha512-+D4s2HCnxPd5PjjI0STKwncjXTUKKqm74MDMz9OPXavjsGmjkvwgLtA5yoxJUdmpj52+2u+RrXgPipahKczMKg==",
+      "optional": true
+    },
+    "node_modules/node-fetch-npm": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.4.tgz",
+      "integrity": "sha512-iOuIQDWDyjhv9qSDrj9aq/klt6F9z1p2otB3AV7v3zBDcL/x+OfGsvGQZZCcMZbUf4Ujw1xGNQkjvGnVT22cKg==",
+      "dev": true,
+      "dependencies": {
+        "encoding": "^0.1.11",
+        "json-parse-better-errors": "^1.0.0",
+        "safe-buffer": "^5.1.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/node-forge": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
+      "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/node-gyp": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz",
+      "integrity": "sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==",
+      "dependencies": {
+        "env-paths": "^2.2.0",
+        "glob": "^7.1.4",
+        "graceful-fs": "^4.2.3",
+        "nopt": "^5.0.0",
+        "npmlog": "^4.1.2",
+        "request": "^2.88.2",
+        "rimraf": "^3.0.2",
+        "semver": "^7.3.2",
+        "tar": "^6.0.2",
+        "which": "^2.0.2"
+      },
+      "bin": {
+        "node-gyp": "bin/node-gyp.js"
+      },
+      "engines": {
+        "node": ">= 10.12.0"
+      }
+    },
+    "node_modules/node-gyp/node_modules/env-paths": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
+      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/node-gyp/node_modules/nopt": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
+      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
+      "dependencies": {
+        "abbrev": "1"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/node-int64": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+      "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
+      "dev": true
+    },
+    "node_modules/node-libs-browser": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
+      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
+      "dev": true,
+      "dependencies": {
+        "assert": "^1.1.1",
+        "browserify-zlib": "^0.2.0",
+        "buffer": "^4.3.0",
+        "console-browserify": "^1.1.0",
+        "constants-browserify": "^1.0.0",
+        "crypto-browserify": "^3.11.0",
+        "domain-browser": "^1.1.1",
+        "events": "^3.0.0",
+        "https-browserify": "^1.0.0",
+        "os-browserify": "^0.3.0",
+        "path-browserify": "0.0.1",
+        "process": "^0.11.10",
+        "punycode": "^1.2.4",
+        "querystring-es3": "^0.2.0",
+        "readable-stream": "^2.3.3",
+        "stream-browserify": "^2.0.1",
+        "stream-http": "^2.7.2",
+        "string_decoder": "^1.0.0",
+        "timers-browserify": "^2.0.4",
+        "tty-browserify": "0.0.0",
+        "url": "^0.11.0",
+        "util": "^0.11.0",
+        "vm-browserify": "^1.0.1"
+      }
+    },
+    "node_modules/node-libs-browser/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "dev": true
+    },
+    "node_modules/node-libs-browser/node_modules/punycode": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+      "dev": true
+    },
+    "node_modules/node-libs-browser/node_modules/util": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "2.0.3"
+      }
+    },
+    "node_modules/node-modules-regexp": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
+      "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/node-notifier": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.0.tgz",
+      "integrity": "sha512-46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "growly": "^1.3.0",
+        "is-wsl": "^2.2.0",
+        "semver": "^7.3.2",
+        "shellwords": "^0.1.1",
+        "uuid": "^8.3.0",
+        "which": "^2.0.2"
+      }
+    },
+    "node_modules/node-notifier/node_modules/uuid": {
+      "version": "8.3.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.1.tgz",
+      "integrity": "sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==",
+      "dev": true,
+      "optional": true,
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/node-releases": {
+      "version": "1.1.61",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.61.tgz",
+      "integrity": "sha512-DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g==",
+      "dev": true
+    },
+    "node_modules/noop-logger": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz",
+      "integrity": "sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI=",
+      "optional": true
+    },
+    "node_modules/nopt": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
+      "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
+      "dependencies": {
+        "abbrev": "1",
+        "osenv": "^0.1.4"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      }
+    },
+    "node_modules/normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dependencies": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
+    "node_modules/normalize-package-data/node_modules/hosted-git-info": {
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
+      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="
+    },
+    "node_modules/normalize-package-data/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/normalize-range": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/normalize-url": {
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
+      "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/now-and-later": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz",
+      "integrity": "sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.3.2"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/npm-bundled": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz",
+      "integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==",
+      "dependencies": {
+        "npm-normalize-package-bin": "^1.0.1"
+      }
+    },
+    "node_modules/npm-install-checks": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-4.0.0.tgz",
+      "integrity": "sha512-09OmyDkNLYwqKPOnbI8exiOZU2GVVmQp7tgez2BPi5OZC8M82elDAps7sxC4l//uSUtotWqoEIDwjRvWH4qz8w==",
+      "dependencies": {
+        "semver": "^7.1.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/npm-normalize-package-bin": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz",
+      "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA=="
+    },
+    "node_modules/npm-package-arg": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.0.1.tgz",
+      "integrity": "sha512-/h5Fm6a/exByzFSTm7jAyHbgOqErl9qSNJDQF32Si/ZzgwT2TERVxRxn3Jurw1wflgyVVAxnFR4fRHPM7y1ClQ==",
+      "dependencies": {
+        "hosted-git-info": "^3.0.2",
+        "semver": "^7.0.0",
+        "validate-npm-package-name": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/npm-packlist": {
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz",
+      "integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==",
+      "dev": true,
+      "dependencies": {
+        "ignore-walk": "^3.0.1",
+        "npm-bundled": "^1.0.1",
+        "npm-normalize-package-bin": "^1.0.1"
+      }
+    },
+    "node_modules/npm-pick-manifest": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-6.1.0.tgz",
+      "integrity": "sha512-ygs4k6f54ZxJXrzT0x34NybRlLeZ4+6nECAIbr2i0foTnijtS1TJiyzpqtuUAJOps/hO0tNDr8fRV5g+BtRlTw==",
+      "dependencies": {
+        "npm-install-checks": "^4.0.0",
+        "npm-package-arg": "^8.0.0",
+        "semver": "^7.0.0"
+      }
+    },
+    "node_modules/npm-registry-fetch": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.7.tgz",
+      "integrity": "sha512-cny9v0+Mq6Tjz+e0erFAB+RYJ/AVGzkjnISiobqP8OWj9c9FLoZZu8/SPSKJWE17F1tk4018wfjV+ZbIbqC7fQ==",
+      "dev": true,
+      "dependencies": {
+        "bluebird": "^3.5.1",
+        "figgy-pudding": "^3.4.1",
+        "JSONStream": "^1.3.4",
+        "lru-cache": "^5.1.1",
+        "make-fetch-happen": "^5.0.0",
+        "npm-package-arg": "^6.1.0",
+        "safe-buffer": "^5.2.0"
+      }
+    },
+    "node_modules/npm-registry-fetch/node_modules/hosted-git-info": {
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
+      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+      "dev": true
+    },
+    "node_modules/npm-registry-fetch/node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/npm-registry-fetch/node_modules/npm-package-arg": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
+      "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
+      "dev": true,
+      "dependencies": {
+        "hosted-git-info": "^2.7.1",
+        "osenv": "^0.1.5",
+        "semver": "^5.6.0",
+        "validate-npm-package-name": "^3.0.0"
+      }
+    },
+    "node_modules/npm-registry-fetch/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/npm-registry-fetch/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/npm-registry-fetch/node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true
+    },
+    "node_modules/npm-run-path": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+      "dependencies": {
+        "path-key": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/npmlog": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+      "dependencies": {
+        "are-we-there-yet": "~1.1.2",
+        "console-control-strings": "~1.1.0",
+        "gauge": "~2.7.3",
+        "set-blocking": "~2.0.0"
+      }
+    },
+    "node_modules/nth-check": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
+      "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "~1.0.0"
+      }
+    },
+    "node_modules/num2fraction": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
+      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
+      "dev": true
+    },
+    "node_modules/number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/nwsapi": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
+      "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
+      "dev": true
+    },
+    "node_modules/oauth-sign": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+      "dev": true,
+      "dependencies": {
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
+      "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-is": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.3.tgz",
+      "integrity": "sha512-teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.18.0-next.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object-path": {
+      "version": "0.11.4",
+      "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.11.4.tgz",
+      "integrity": "sha1-NwrnUvvzfePqcKhhwju6iRVpGUk=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-visit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-visit/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz",
+      "integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.18.0-next.0",
+        "has-symbols": "^1.0.1",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.defaults": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
+      "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
+      "dev": true,
+      "dependencies": {
+        "array-each": "^1.0.1",
+        "array-slice": "^1.0.0",
+        "for-own": "^1.0.0",
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.defaults/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.getownpropertydescriptors": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz",
+      "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.getownpropertydescriptors/node_modules/es-abstract": {
+      "version": "1.17.7",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+      "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+      "dev": true,
+      "dependencies": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.2",
+        "is-regex": "^1.1.1",
+        "object-inspect": "^1.8.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.1",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.map": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
+      "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
+      "dev": true,
+      "dependencies": {
+        "for-own": "^1.0.0",
+        "make-iterator": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.pick/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.reduce": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz",
+      "integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=",
+      "dev": true,
+      "dependencies": {
+        "for-own": "^1.0.0",
+        "make-iterator": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.values": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz",
+      "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.values/node_modules/es-abstract": {
+      "version": "1.17.7",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+      "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+      "dev": true,
+      "dependencies": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.2",
+        "is-regex": "^1.1.1",
+        "object-inspect": "^1.8.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.1",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/objectorarray": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/objectorarray/-/objectorarray-1.0.4.tgz",
+      "integrity": "sha512-91k8bjcldstRz1bG6zJo8lWD7c6QXcB4nTDUqiEvIL1xAsLoZlOOZZG+nd6YPz+V7zY1580J4Xxh1vZtyv4i/w=="
+    },
+    "node_modules/obuf": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
+      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
+      "dev": true
+    },
+    "node_modules/on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/on-headers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/open": {
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/open/-/open-7.3.0.tgz",
+      "integrity": "sha512-mgLwQIx2F/ye9SmbrUkurZCnkoXyXyu9EbHtJZrICjVAJfyMArdHp3KkixGdZx1ZHFPNIwl0DDM1dFFqXbTLZw==",
+      "dependencies": {
+        "is-docker": "^2.0.0",
+        "is-wsl": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/opn": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz",
+      "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==",
+      "dev": true,
+      "dependencies": {
+        "is-wsl": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/opn/node_modules/is-wsl": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/optionator": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "dev": true,
+      "dependencies": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/ora": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-4.0.4.tgz",
+      "integrity": "sha512-77iGeVU1cIdRhgFzCK8aw1fbtT1B/iZAvWjS+l/o1x0RShMgxHUZaD2yDpWsNCPwXg9z1ZA78Kbdvr8kBmG/Ww==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^3.0.0",
+        "cli-cursor": "^3.1.0",
+        "cli-spinners": "^2.2.0",
+        "is-interactive": "^1.0.0",
+        "log-symbols": "^3.0.0",
+        "mute-stream": "0.0.8",
+        "strip-ansi": "^6.0.0",
+        "wcwidth": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ora/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ora/node_modules/cli-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+      "dev": true,
+      "dependencies": {
+        "restore-cursor": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ora/node_modules/restore-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "dev": true,
+      "dependencies": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ora/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ordered-read-streams": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz",
+      "integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "^2.0.1"
+      }
+    },
+    "node_modules/original": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz",
+      "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==",
+      "dev": true,
+      "dependencies": {
+        "url-parse": "^1.4.3"
+      }
+    },
+    "node_modules/os-browserify": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
+      "dev": true
+    },
+    "node_modules/os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/os-locale": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
+      "dev": true,
+      "dependencies": {
+        "lcid": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/os-name": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/os-name/-/os-name-3.1.0.tgz",
+      "integrity": "sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==",
+      "dependencies": {
+        "macos-release": "^2.2.0",
+        "windows-release": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/osenv": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+      "dependencies": {
+        "os-homedir": "^1.0.0",
+        "os-tmpdir": "^1.0.0"
+      }
+    },
+    "node_modules/p-cancelable": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
+      "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/p-each-series": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.1.0.tgz",
+      "integrity": "sha512-ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+      "dependencies": {
+        "p-try": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-limit/node_modules/p-try": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "dependencies": {
+        "p-limit": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-map": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+      "dependencies": {
+        "aggregate-error": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-retry": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz",
+      "integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==",
+      "dev": true,
+      "dependencies": {
+        "retry": "^0.12.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pac-proxy-agent": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-4.1.0.tgz",
+      "integrity": "sha512-ejNgYm2HTXSIYX9eFlkvqFp8hyJ374uDf0Zq5YUAifiSh1D6fo+iBivQZirGvVv8dCYUsLhmLBRhlAYvBKI5+Q==",
+      "dev": true,
+      "dependencies": {
+        "@tootallnate/once": "1",
+        "agent-base": "6",
+        "debug": "4",
+        "get-uri": "3",
+        "http-proxy-agent": "^4.0.1",
+        "https-proxy-agent": "5",
+        "pac-resolver": "^4.1.0",
+        "raw-body": "^2.2.0",
+        "socks-proxy-agent": "5"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/pac-proxy-agent/node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/pac-proxy-agent/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/pac-proxy-agent/node_modules/http-proxy-agent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+      "dev": true,
+      "dependencies": {
+        "@tootallnate/once": "1",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/pac-proxy-agent/node_modules/https-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/pac-proxy-agent/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/pac-proxy-agent/node_modules/socks-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4",
+        "socks": "^2.3.3"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/pac-resolver": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-4.2.0.tgz",
+      "integrity": "sha512-rPACZdUyuxT5Io/gFKUeeZFfE5T7ve7cAkE5TUZRRfuKP0u5Hocwe48X7ZEm6mYB+bTB0Qf+xlVlA/RM/i6RCQ==",
+      "dev": true,
+      "dependencies": {
+        "degenerator": "^2.2.0",
+        "ip": "^1.1.5",
+        "netmask": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/package-json": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz",
+      "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==",
+      "dependencies": {
+        "got": "^9.6.0",
+        "registry-auth-token": "^4.0.0",
+        "registry-url": "^5.0.0",
+        "semver": "^6.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/package-json/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/pacote": {
+      "version": "9.5.12",
+      "resolved": "https://registry.npmjs.org/pacote/-/pacote-9.5.12.tgz",
+      "integrity": "sha512-BUIj/4kKbwWg4RtnBncXPJd15piFSVNpTzY0rysSr3VnMowTYgkGKcaHrbReepAkjTr8lH2CVWRi58Spg2CicQ==",
+      "dev": true,
+      "dependencies": {
+        "bluebird": "^3.5.3",
+        "cacache": "^12.0.2",
+        "chownr": "^1.1.2",
+        "figgy-pudding": "^3.5.1",
+        "get-stream": "^4.1.0",
+        "glob": "^7.1.3",
+        "infer-owner": "^1.0.4",
+        "lru-cache": "^5.1.1",
+        "make-fetch-happen": "^5.0.0",
+        "minimatch": "^3.0.4",
+        "minipass": "^2.3.5",
+        "mississippi": "^3.0.0",
+        "mkdirp": "^0.5.1",
+        "normalize-package-data": "^2.4.0",
+        "npm-normalize-package-bin": "^1.0.0",
+        "npm-package-arg": "^6.1.0",
+        "npm-packlist": "^1.1.12",
+        "npm-pick-manifest": "^3.0.0",
+        "npm-registry-fetch": "^4.0.0",
+        "osenv": "^0.1.5",
+        "promise-inflight": "^1.0.1",
+        "promise-retry": "^1.1.1",
+        "protoduck": "^5.0.1",
+        "rimraf": "^2.6.2",
+        "safe-buffer": "^5.1.2",
+        "semver": "^5.6.0",
+        "ssri": "^6.0.1",
+        "tar": "^4.4.10",
+        "unique-filename": "^1.1.1",
+        "which": "^1.3.1"
+      }
+    },
+    "node_modules/pacote/node_modules/cacache": {
+      "version": "12.0.4",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
+      "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
+      "dev": true,
+      "dependencies": {
+        "bluebird": "^3.5.5",
+        "chownr": "^1.1.1",
+        "figgy-pudding": "^3.5.1",
+        "glob": "^7.1.4",
+        "graceful-fs": "^4.1.15",
+        "infer-owner": "^1.0.3",
+        "lru-cache": "^5.1.1",
+        "mississippi": "^3.0.0",
+        "mkdirp": "^0.5.1",
+        "move-concurrently": "^1.0.1",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^2.6.3",
+        "ssri": "^6.0.1",
+        "unique-filename": "^1.1.1",
+        "y18n": "^4.0.0"
+      }
+    },
+    "node_modules/pacote/node_modules/chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "dev": true
+    },
+    "node_modules/pacote/node_modules/fs-minipass": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
+      "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^2.6.0"
+      }
+    },
+    "node_modules/pacote/node_modules/get-stream": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "dev": true,
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pacote/node_modules/hosted-git-info": {
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
+      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+      "dev": true
+    },
+    "node_modules/pacote/node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/pacote/node_modules/minipass": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
+      "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "^5.1.2",
+        "yallist": "^3.0.0"
+      }
+    },
+    "node_modules/pacote/node_modules/minizlib": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
+      "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^2.9.0"
+      }
+    },
+    "node_modules/pacote/node_modules/npm-package-arg": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
+      "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
+      "dev": true,
+      "dependencies": {
+        "hosted-git-info": "^2.7.1",
+        "osenv": "^0.1.5",
+        "semver": "^5.6.0",
+        "validate-npm-package-name": "^3.0.0"
+      }
+    },
+    "node_modules/pacote/node_modules/npm-pick-manifest": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-3.0.2.tgz",
+      "integrity": "sha512-wNprTNg+X5nf+tDi+hbjdHhM4bX+mKqv6XmPh7B5eG+QY9VARfQPfCEH013H5GqfNj6ee8Ij2fg8yk0mzps1Vw==",
+      "dev": true,
+      "dependencies": {
+        "figgy-pudding": "^3.5.1",
+        "npm-package-arg": "^6.0.0",
+        "semver": "^5.4.1"
+      }
+    },
+    "node_modules/pacote/node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/pacote/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/pacote/node_modules/ssri": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+      "dev": true,
+      "dependencies": {
+        "figgy-pudding": "^3.5.1"
+      }
+    },
+    "node_modules/pacote/node_modules/tar": {
+      "version": "4.4.13",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz",
+      "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
+      "dev": true,
+      "dependencies": {
+        "chownr": "^1.1.1",
+        "fs-minipass": "^1.2.5",
+        "minipass": "^2.8.6",
+        "minizlib": "^1.2.1",
+        "mkdirp": "^0.5.0",
+        "safe-buffer": "^5.1.2",
+        "yallist": "^3.0.3"
+      },
+      "engines": {
+        "node": ">=4.5"
+      }
+    },
+    "node_modules/pacote/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/pacote/node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true
+    },
+    "node_modules/pako": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
+    },
+    "node_modules/parallel-transform": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
+      "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
+      "dev": true,
+      "dependencies": {
+        "cyclist": "^1.0.1",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.1.5"
+      }
+    },
+    "node_modules/param-case": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
+      "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=",
+      "dev": true,
+      "dependencies": {
+        "no-case": "^2.2.0"
+      }
+    },
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parse-asn1": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
+      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
+      "dev": true,
+      "dependencies": {
+        "asn1.js": "^5.2.0",
+        "browserify-aes": "^1.0.0",
+        "evp_bytestokey": "^1.0.0",
+        "pbkdf2": "^3.0.3",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/parse-filepath": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
+      "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
+      "dev": true,
+      "dependencies": {
+        "is-absolute": "^1.0.0",
+        "map-cache": "^0.2.0",
+        "path-root": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/parse-json": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+      "dev": true,
+      "dependencies": {
+        "error-ex": "^1.3.1",
+        "json-parse-better-errors": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/parse-node-version": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
+      "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/parse-passwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
+      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/parse5": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
+      "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==",
+      "dev": true
+    },
+    "node_modules/parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/pascalcase": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-browserify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
+      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
+      "dev": true
+    },
+    "node_modules/path-dirname": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
+      "dev": true
+    },
+    "node_modules/path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM="
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
+    },
+    "node_modules/path-root": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
+      "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
+      "dev": true,
+      "dependencies": {
+        "path-root-regex": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-root-regex": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
+      "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-to-regexp": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
+    },
+    "node_modules/path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pbkdf2": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.1.tgz",
+      "integrity": "sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==",
+      "dev": true,
+      "dependencies": {
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      },
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
+    "node_modules/pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
+      "dev": true
+    },
+    "node_modules/performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
+    },
+    "node_modules/picomatch": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "dev": true,
+      "dependencies": {
+        "pinkie": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pirates": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
+      "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
+      "dev": true,
+      "dependencies": {
+        "node-modules-regexp": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/pkg-dir": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/find-up": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/locate-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/p-locate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pkg-up": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz",
+      "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=",
+      "dependencies": {
+        "find-up": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/plist": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.1.tgz",
+      "integrity": "sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==",
+      "dependencies": {
+        "base64-js": "^1.2.3",
+        "xmlbuilder": "^9.0.7",
+        "xmldom": "0.1.x"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/plugin-error": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
+      "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=",
+      "dev": true,
+      "dependencies": {
+        "ansi-cyan": "^0.1.1",
+        "ansi-red": "^0.1.1",
+        "arr-diff": "^1.0.1",
+        "arr-union": "^2.0.1",
+        "extend-shallow": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/plugin-error/node_modules/arr-diff": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
+      "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.0.1",
+        "array-slice": "^0.2.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/plugin-error/node_modules/arr-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
+      "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/plugin-error/node_modules/array-slice": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
+      "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/plugin-error/node_modules/extend-shallow": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
+      "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/plugin-error/node_modules/kind-of": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
+      "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pnp-webpack-plugin": {
+      "version": "1.6.4",
+      "resolved": "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz",
+      "integrity": "sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg==",
+      "dev": true,
+      "dependencies": {
+        "ts-pnp": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/portfinder": {
+      "version": "1.0.28",
+      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
+      "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==",
+      "dev": true,
+      "dependencies": {
+        "async": "^2.6.2",
+        "debug": "^3.1.1",
+        "mkdirp": "^0.5.5"
+      },
+      "engines": {
+        "node": ">= 0.12.0"
+      }
+    },
+    "node_modules/portfinder/node_modules/debug": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/portfinder/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/posix-character-classes": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss": {
+      "version": "7.0.31",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.31.tgz",
+      "integrity": "sha512-a937VDHE1ftkjk+8/7nj/mrjtmkn69xxzJgRETXdAUU+IgOYPQNJF17haGWbeDxSyk++HA14UA98FurvPyBJOA==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.2",
+        "source-map": "^0.6.1",
+        "supports-color": "^6.1.0"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      },
+      "funding": {
+        "type": "tidelift",
+        "url": "https://tidelift.com/funding/github/npm/postcss"
+      }
+    },
+    "node_modules/postcss-calc": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.5.tgz",
+      "integrity": "sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^7.0.27",
+        "postcss-selector-parser": "^6.0.2",
+        "postcss-value-parser": "^4.0.2"
+      }
+    },
+    "node_modules/postcss-colormin": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz",
+      "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.0.0",
+        "color": "^3.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-colormin/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-convert-values": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz",
+      "integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-convert-values/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-discard-comments": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz",
+      "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-discard-duplicates": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz",
+      "integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-discard-empty": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz",
+      "integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-discard-overridden": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz",
+      "integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-import": {
+      "version": "12.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-12.0.1.tgz",
+      "integrity": "sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^7.0.1",
+        "postcss-value-parser": "^3.2.3",
+        "read-cache": "^1.0.0",
+        "resolve": "^1.1.7"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/postcss-import/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-load-config": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.2.tgz",
+      "integrity": "sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==",
+      "dev": true,
+      "dependencies": {
+        "cosmiconfig": "^5.0.0",
+        "import-cwd": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      }
+    },
+    "node_modules/postcss-loader": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz",
+      "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==",
+      "dev": true,
+      "dependencies": {
+        "loader-utils": "^1.1.0",
+        "postcss": "^7.0.0",
+        "postcss-load-config": "^2.0.0",
+        "schema-utils": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/postcss-loader/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/postcss-loader/node_modules/loader-utils": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-loader/node_modules/schema-utils": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.1.0",
+        "ajv-errors": "^1.0.0",
+        "ajv-keywords": "^3.1.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/postcss-merge-longhand": {
+      "version": "4.0.11",
+      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz",
+      "integrity": "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==",
+      "dev": true,
+      "dependencies": {
+        "css-color-names": "0.0.4",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0",
+        "stylehacks": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-merge-longhand/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-merge-rules": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz",
+      "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.0.0",
+        "caniuse-api": "^3.0.0",
+        "cssnano-util-same-parent": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-selector-parser": "^3.0.0",
+        "vendors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-merge-rules/node_modules/postcss-selector-parser": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
+      "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
+      "dev": true,
+      "dependencies": {
+        "dot-prop": "^5.2.0",
+        "indexes-of": "^1.0.1",
+        "uniq": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/postcss-minify-font-values": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz",
+      "integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-minify-font-values/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-minify-gradients": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz",
+      "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==",
+      "dev": true,
+      "dependencies": {
+        "cssnano-util-get-arguments": "^4.0.0",
+        "is-color-stop": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-minify-gradients/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-minify-params": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz",
+      "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==",
+      "dev": true,
+      "dependencies": {
+        "alphanum-sort": "^1.0.0",
+        "browserslist": "^4.0.0",
+        "cssnano-util-get-arguments": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0",
+        "uniqs": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-minify-params/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-minify-selectors": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz",
+      "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==",
+      "dev": true,
+      "dependencies": {
+        "alphanum-sort": "^1.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-selector-parser": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-minify-selectors/node_modules/postcss-selector-parser": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
+      "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
+      "dev": true,
+      "dependencies": {
+        "dot-prop": "^5.2.0",
+        "indexes-of": "^1.0.1",
+        "uniq": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/postcss-modules-extract-imports": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz",
+      "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^7.0.5"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz",
+      "integrity": "sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==",
+      "dev": true,
+      "dependencies": {
+        "icss-utils": "^4.1.1",
+        "postcss": "^7.0.32",
+        "postcss-selector-parser": "^6.0.2",
+        "postcss-value-parser": "^4.1.0"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default/node_modules/chalk/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/postcss-modules-local-by-default/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default/node_modules/postcss": {
+      "version": "7.0.35",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
+      "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.2",
+        "source-map": "^0.6.1",
+        "supports-color": "^6.1.0"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default/node_modules/supports-color": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/postcss-modules-scope": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz",
+      "integrity": "sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^7.0.6",
+        "postcss-selector-parser": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/postcss-modules-values": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz",
+      "integrity": "sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==",
+      "dev": true,
+      "dependencies": {
+        "icss-utils": "^4.0.0",
+        "postcss": "^7.0.6"
+      }
+    },
+    "node_modules/postcss-normalize-charset": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz",
+      "integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-normalize-display-values": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz",
+      "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==",
+      "dev": true,
+      "dependencies": {
+        "cssnano-util-get-match": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-normalize-display-values/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-normalize-positions": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz",
+      "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==",
+      "dev": true,
+      "dependencies": {
+        "cssnano-util-get-arguments": "^4.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-normalize-positions/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-normalize-repeat-style": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz",
+      "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==",
+      "dev": true,
+      "dependencies": {
+        "cssnano-util-get-arguments": "^4.0.0",
+        "cssnano-util-get-match": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-normalize-repeat-style/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-normalize-string": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz",
+      "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==",
+      "dev": true,
+      "dependencies": {
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-normalize-string/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-normalize-timing-functions": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz",
+      "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==",
+      "dev": true,
+      "dependencies": {
+        "cssnano-util-get-match": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-normalize-timing-functions/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-normalize-unicode": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz",
+      "integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-normalize-unicode/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-normalize-url": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz",
+      "integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==",
+      "dev": true,
+      "dependencies": {
+        "is-absolute-url": "^2.0.0",
+        "normalize-url": "^3.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-normalize-url/node_modules/normalize-url": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz",
+      "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/postcss-normalize-url/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-normalize-whitespace": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz",
+      "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-normalize-whitespace/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-ordered-values": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz",
+      "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==",
+      "dev": true,
+      "dependencies": {
+        "cssnano-util-get-arguments": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-ordered-values/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-reduce-initial": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz",
+      "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.0.0",
+        "caniuse-api": "^3.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-reduce-transforms": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz",
+      "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==",
+      "dev": true,
+      "dependencies": {
+        "cssnano-util-get-match": "^4.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-reduce-transforms/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-selector-parser": {
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz",
+      "integrity": "sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==",
+      "dev": true,
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "indexes-of": "^1.0.1",
+        "uniq": "^1.0.1",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-svgo": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz",
+      "integrity": "sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw==",
+      "dev": true,
+      "dependencies": {
+        "is-svg": "^3.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0",
+        "svgo": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-svgo/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-unique-selectors": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz",
+      "integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==",
+      "dev": true,
+      "dependencies": {
+        "alphanum-sort": "^1.0.0",
+        "postcss": "^7.0.0",
+        "uniqs": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/postcss-value-parser": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
+      "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
+      "dev": true
+    },
+    "node_modules/postcss/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss/node_modules/chalk/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/postcss/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/postcss/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss/node_modules/supports-color": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/prebuild-install": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.0.0.tgz",
+      "integrity": "sha512-h2ZJ1PXHKWZpp1caLw0oX9sagVpL2YTk+ZwInQbQ3QqNd4J03O6MpFNmMTJlkfgPENWqe5kP0WjQLqz5OjLfsw==",
+      "optional": true,
+      "dependencies": {
+        "detect-libc": "^1.0.3",
+        "expand-template": "^2.0.3",
+        "github-from-package": "0.0.0",
+        "minimist": "^1.2.3",
+        "mkdirp-classic": "^0.5.3",
+        "napi-build-utils": "^1.0.1",
+        "node-abi": "^2.7.0",
+        "noop-logger": "^0.1.1",
+        "npmlog": "^4.0.1",
+        "pump": "^3.0.0",
+        "rc": "^1.2.7",
+        "simple-get": "^3.0.3",
+        "tar-fs": "^2.0.0",
+        "tunnel-agent": "^0.6.0",
+        "which-pm-runs": "^1.0.0"
+      },
+      "bin": {
+        "prebuild-install": "bin.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/prepend-http": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
+      "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/pretty-format": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.5.2.tgz",
+      "integrity": "sha512-VizyV669eqESlkOikKJI8Ryxl/kPpbdLwNdPs2GrbQs18MpySB5S0Yo0N7zkg2xTRiFq4CFw8ct5Vg4a0xP0og==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.5.2",
+        "ansi-regex": "^5.0.0",
+        "ansi-styles": "^4.0.0",
+        "react-is": "^16.12.0"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/pretty-format/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pretty-hrtime": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
+      "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
+    "node_modules/process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+    },
+    "node_modules/progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/promise-inflight": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
+      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM="
+    },
+    "node_modules/promise-retry": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz",
+      "integrity": "sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0=",
+      "dev": true,
+      "dependencies": {
+        "err-code": "^1.0.0",
+        "retry": "^0.10.0"
+      },
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
+    "node_modules/promise-retry/node_modules/retry": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz",
+      "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/prompts": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.2.tgz",
+      "integrity": "sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA==",
+      "dev": true,
+      "dependencies": {
+        "kleur": "^3.0.3",
+        "sisteransi": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/promzard": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz",
+      "integrity": "sha1-JqXW7ox97kyxIggwWs+5O6OCqe4=",
+      "dependencies": {
+        "read": "1"
+      }
+    },
+    "node_modules/properties-parser": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/properties-parser/-/properties-parser-0.3.1.tgz",
+      "integrity": "sha1-ExbpU5/7/ZOEXjabIRAiq9R4dxo=",
+      "dependencies": {
+        "string.prototype.codepointat": "^0.2.0"
+      },
+      "engines": {
+        "node": ">= 0.3.1"
+      }
+    },
+    "node_modules/protoduck": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/protoduck/-/protoduck-5.0.1.tgz",
+      "integrity": "sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==",
+      "dev": true,
+      "dependencies": {
+        "genfun": "^5.0.0"
+      }
+    },
+    "node_modules/proxy-addr": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
+      "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==",
+      "dependencies": {
+        "forwarded": "~0.1.2",
+        "ipaddr.js": "1.9.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/proxy-agent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-ODnQnW2jc/FUVwHHuaZEfN5otg/fMbvMxz9nMSUQfJ9JU7q2SZvSULSsjLloVgJOiv9yhc8GlNMKc4GkFmcVEA==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^6.0.0",
+        "debug": "4",
+        "http-proxy-agent": "^4.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "lru-cache": "^5.1.1",
+        "pac-proxy-agent": "^4.1.0",
+        "proxy-from-env": "^1.0.0",
+        "socks-proxy-agent": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/proxy-agent/node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/proxy-agent/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/proxy-agent/node_modules/http-proxy-agent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+      "dev": true,
+      "dependencies": {
+        "@tootallnate/once": "1",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/proxy-agent/node_modules/https-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/proxy-agent/node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/proxy-agent/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/proxy-agent/node_modules/socks-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4",
+        "socks": "^2.3.3"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/proxy-agent/node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true
+    },
+    "node_modules/proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+      "dev": true
+    },
+    "node_modules/prr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
+      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
+      "dev": true
+    },
+    "node_modules/psl": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
+      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
+    },
+    "node_modules/public-encrypt": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/public-encrypt/node_modules/bn.js": {
+      "version": "4.11.9",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+      "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+      "dev": true
+    },
+    "node_modules/pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "node_modules/pumpify": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
+      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+      "dev": true,
+      "dependencies": {
+        "duplexify": "^3.6.0",
+        "inherits": "^2.0.3",
+        "pump": "^2.0.0"
+      }
+    },
+    "node_modules/pumpify/node_modules/pump": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+      "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+      "dev": true,
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "node_modules/punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pupa": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz",
+      "integrity": "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==",
+      "dependencies": {
+        "escape-goat": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/q": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
+      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
+      "engines": {
+        "node": ">=0.6.0",
+        "teleport": ">=0.2.0"
+      }
+    },
+    "node_modules/qrcode-reader": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/qrcode-reader/-/qrcode-reader-1.0.4.tgz",
+      "integrity": "sha512-rRjALGNh9zVqvweg1j5OKIQKNsw3bLC+7qwlnead5K/9cb1cEIAGkwikt/09U0K+2IDWGD9CC6SP7tHAjUeqvQ=="
+    },
+    "node_modules/qs": {
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/query-string": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
+      "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
+      "dev": true,
+      "dependencies": {
+        "object-assign": "^4.1.0",
+        "strict-uri-encode": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
+      "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
+    "node_modules/querystring-es3": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
+    "node_modules/querystringify": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+      "dev": true
+    },
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/randomfill": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "dev": true,
+      "dependencies": {
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/range-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/raw-body": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
+      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
+      "dependencies": {
+        "bytes": "3.1.0",
+        "http-errors": "1.7.2",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/raw-body/node_modules/bytes": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/raw-loader": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-4.0.1.tgz",
+      "integrity": "sha512-baolhQBSi3iNh1cglJjA0mYzga+wePk7vdEX//1dTFd+v4TsQlQE0jitJSNF1OIP82rdYulH7otaVmdlDaJ64A==",
+      "dev": true,
+      "dependencies": {
+        "loader-utils": "^2.0.0",
+        "schema-utils": "^2.6.5"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/rc": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+      "dependencies": {
+        "deep-extend": "^0.6.0",
+        "ini": "~1.3.0",
+        "minimist": "^1.2.0",
+        "strip-json-comments": "~2.0.1"
+      },
+      "bin": {
+        "rc": "cli.js"
+      }
+    },
+    "node_modules/react-is": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+      "dev": true
+    },
+    "node_modules/read": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
+      "integrity": "sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=",
+      "dependencies": {
+        "mute-stream": "~0.0.4"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/read-cache": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
+      "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
+      "dev": true,
+      "dependencies": {
+        "pify": "^2.3.0"
+      }
+    },
+    "node_modules/read-cache/node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/read-chunk": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/read-chunk/-/read-chunk-3.2.0.tgz",
+      "integrity": "sha512-CEjy9LCzhmD7nUpJ1oVOE6s/hBkejlcJEgLQHVnQznOSilOPb+kpKktlLfFDK3/WP43+F80xkUTM2VOkYoSYvQ==",
+      "dependencies": {
+        "pify": "^4.0.1",
+        "with-open-file": "^0.1.6"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/read-package-json": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.2.tgz",
+      "integrity": "sha512-D1KmuLQr6ZSJS0tW8hf3WGpRlwszJOXZ3E8Yd/DNRaM5d+1wVRZdHlpGBLAuovjr28LbWvjpWkBHMxpRGGjzNA==",
+      "dependencies": {
+        "glob": "^7.1.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "normalize-package-data": "^2.0.0",
+        "npm-normalize-package-bin": "^1.0.0"
+      }
+    },
+    "node_modules/read-package-json-fast": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz",
+      "integrity": "sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ==",
+      "dependencies": {
+        "json-parse-even-better-errors": "^2.3.0",
+        "npm-normalize-package-bin": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/read-package-tree": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.3.1.tgz",
+      "integrity": "sha512-mLUDsD5JVtlZxjSlPPx1RETkNjjvQYuweKwNVt1Sn8kP5Jh44pvYuUHCp6xSVDZWbNxVxG5lyZJ921aJH61sTw==",
+      "dev": true,
+      "dependencies": {
+        "read-package-json": "^2.0.0",
+        "readdir-scoped-modules": "^1.0.0",
+        "util-promisify": "^2.1.0"
+      }
+    },
+    "node_modules/read-pkg": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
+      "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+      "dev": true,
+      "dependencies": {
+        "load-json-file": "^2.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/read-pkg-up": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+      "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^2.0.0",
+        "read-pkg": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/read-pkg/node_modules/path-type": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
+      "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+      "dev": true,
+      "dependencies": {
+        "pify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/read-pkg/node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/readdir-scoped-modules": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz",
+      "integrity": "sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==",
+      "dev": true,
+      "dependencies": {
+        "debuglog": "^1.0.1",
+        "dezalgo": "^1.0.0",
+        "graceful-fs": "^4.1.2",
+        "once": "^1.3.0"
+      }
+    },
+    "node_modules/readdirp": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
+      "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
+      "dev": true,
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/rechoir": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
+      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
+      "dev": true,
+      "dependencies": {
+        "resolve": "^1.1.6"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/recursive-readdir": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz",
+      "integrity": "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==",
+      "dev": true,
+      "dependencies": {
+        "minimatch": "3.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/reflect-metadata": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
+      "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==",
+      "dev": true
+    },
+    "node_modules/regenerate": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.1.tgz",
+      "integrity": "sha512-j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A==",
+      "dev": true
+    },
+    "node_modules/regenerate-unicode-properties": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz",
+      "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==",
+      "dev": true,
+      "dependencies": {
+        "regenerate": "^1.4.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/regenerator-runtime": {
+      "version": "0.13.5",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz",
+      "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==",
+      "dev": true
+    },
+    "node_modules/regenerator-transform": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz",
+      "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.8.4"
+      }
+    },
+    "node_modules/regex-not": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^3.0.2",
+        "safe-regex": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/regex-parser": {
+      "version": "2.2.10",
+      "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.10.tgz",
+      "integrity": "sha512-8t6074A68gHfU8Neftl0Le6KTDwfGAj7IyjPIMSfikI2wJUTHDMaIq42bUsfVnj8mhx0R+45rdUXHGpN164avA==",
+      "dev": true
+    },
+    "node_modules/regexp.prototype.flags": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz",
+      "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/regexp.prototype.flags/node_modules/es-abstract": {
+      "version": "1.17.7",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+      "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+      "dev": true,
+      "dependencies": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.2",
+        "is-regex": "^1.1.1",
+        "object-inspect": "^1.8.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.1",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/regexpp": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",
+      "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      }
+    },
+    "node_modules/regexpu-core": {
+      "version": "4.7.1",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz",
+      "integrity": "sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==",
+      "dev": true,
+      "dependencies": {
+        "regenerate": "^1.4.0",
+        "regenerate-unicode-properties": "^8.2.0",
+        "regjsgen": "^0.5.1",
+        "regjsparser": "^0.6.4",
+        "unicode-match-property-ecmascript": "^1.0.4",
+        "unicode-match-property-value-ecmascript": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/regextras": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/regextras/-/regextras-0.7.1.tgz",
+      "integrity": "sha512-9YXf6xtW+qzQ+hcMQXx95MOvfqXFgsKDZodX3qZB0x2n5Z94ioetIITsBtvJbiOyxa/6s9AtyweBLCdPmPko/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.1.14"
+      }
+    },
+    "node_modules/registry-auth-token": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.1.tgz",
+      "integrity": "sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==",
+      "dependencies": {
+        "rc": "^1.2.8"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/registry-url": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz",
+      "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==",
+      "dependencies": {
+        "rc": "^1.2.8"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/regjsgen": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz",
+      "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==",
+      "dev": true
+    },
+    "node_modules/regjsparser": {
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz",
+      "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==",
+      "dev": true,
+      "dependencies": {
+        "jsesc": "~0.5.0"
+      },
+      "bin": {
+        "regjsparser": "bin/parser"
+      }
+    },
+    "node_modules/regjsparser/node_modules/jsesc": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+      "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+      "dev": true,
+      "bin": {
+        "jsesc": "bin/jsesc"
+      }
+    },
+    "node_modules/relateurl": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
+      "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/remove-bom-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz",
+      "integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5",
+        "is-utf8": "^0.2.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/remove-bom-stream": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz",
+      "integrity": "sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=",
+      "dev": true,
+      "dependencies": {
+        "remove-bom-buffer": "^3.0.0",
+        "safe-buffer": "^5.1.0",
+        "through2": "^2.0.3"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/remove-trailing-separator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
+      "dev": true
+    },
+    "node_modules/repeat-element": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
+      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/replace-ext": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
+      "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/replace-homedir": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz",
+      "integrity": "sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw=",
+      "dev": true,
+      "dependencies": {
+        "homedir-polyfill": "^1.0.1",
+        "is-absolute": "^1.0.0",
+        "remove-trailing-separator": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/request": {
+      "version": "2.88.2",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
+      "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
+      "dependencies": {
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.8.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.2",
+        "har-validator": "~5.1.3",
+        "http-signature": "~1.2.0",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.19",
+        "oauth-sign": "~0.9.0",
+        "performance-now": "^2.1.0",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.5.0",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^3.3.2"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/request-promise-core": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz",
+      "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^4.17.19"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      },
+      "peerDependencies": {
+        "request": "^2.34"
+      }
+    },
+    "node_modules/request-promise-native": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz",
+      "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==",
+      "deprecated": "request-promise-native has been deprecated because it extends the now deprecated request package, see https://github.com/request/request/issues/3142",
+      "dev": true,
+      "dependencies": {
+        "request-promise-core": "1.1.4",
+        "stealthy-require": "^1.1.1",
+        "tough-cookie": "^2.3.3"
+      },
+      "engines": {
+        "node": ">=0.12.0"
+      },
+      "peerDependencies": {
+        "request": "^2.34"
+      }
+    },
+    "node_modules/request-promise-native/node_modules/tough-cookie": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+      "dev": true,
+      "dependencies": {
+        "psl": "^1.1.28",
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/request/node_modules/qs": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/request/node_modules/tough-cookie": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+      "dependencies": {
+        "psl": "^1.1.28",
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-main-filename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+      "dev": true
+    },
+    "node_modules/requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
+      "dev": true
+    },
+    "node_modules/resolve": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+      "dependencies": {
+        "path-parse": "^1.0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve-cwd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
+      "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
+      "dev": true,
+      "dependencies": {
+        "resolve-from": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/resolve-cwd/node_modules/resolve-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/resolve-dir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
+      "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
+      "dev": true,
+      "dependencies": {
+        "expand-tilde": "^2.0.0",
+        "global-modules": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/resolve-options": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz",
+      "integrity": "sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=",
+      "dev": true,
+      "dependencies": {
+        "value-or-function": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
+      "deprecated": "https://github.com/lydell/resolve-url#deprecated",
+      "dev": true
+    },
+    "node_modules/resolve-url-loader": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-3.1.1.tgz",
+      "integrity": "sha512-K1N5xUjj7v0l2j/3Sgs5b8CjrrgtC70SmdCuZiJ8tSyb5J+uk3FoeZ4b7yTnH6j7ngI+Bc5bldHJIa8hYdu2gQ==",
+      "dev": true,
+      "dependencies": {
+        "adjust-sourcemap-loader": "2.0.0",
+        "camelcase": "5.3.1",
+        "compose-function": "3.0.3",
+        "convert-source-map": "1.7.0",
+        "es6-iterator": "2.0.3",
+        "loader-utils": "1.2.3",
+        "postcss": "7.0.21",
+        "rework": "1.0.1",
+        "rework-visit": "1.0.0",
+        "source-map": "0.6.1"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/resolve-url-loader/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/resolve-url-loader/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/resolve-url-loader/node_modules/chalk/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/resolve-url-loader/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/resolve-url-loader/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/resolve-url-loader/node_modules/emojis-list": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
+      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/resolve-url-loader/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/resolve-url-loader/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/resolve-url-loader/node_modules/loader-utils": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
+      "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^2.0.0",
+        "json5": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/resolve-url-loader/node_modules/postcss": {
+      "version": "7.0.21",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.21.tgz",
+      "integrity": "sha512-uIFtJElxJo29QC753JzhidoAhvp/e/Exezkdhfmt8AymWT6/5B7W1WmponYWkHk2eg6sONyTch0A3nkMPun3SQ==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.2",
+        "source-map": "^0.6.1",
+        "supports-color": "^6.1.0"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/resolve-url-loader/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/resolve-url-loader/node_modules/supports-color": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/responselike": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
+      "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
+      "dependencies": {
+        "lowercase-keys": "^1.0.0"
+      }
+    },
+    "node_modules/restore-cursor": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+      "dependencies": {
+        "onetime": "^2.0.0",
+        "signal-exit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/restore-cursor/node_modules/mimic-fn": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/restore-cursor/node_modules/onetime": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+      "dependencies": {
+        "mimic-fn": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
+    "node_modules/retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "engines": {
+        "iojs": ">=1.0.0",
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/rework": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/rework/-/rework-1.0.1.tgz",
+      "integrity": "sha1-MIBqhBNCtUUQqkEQhQzUhTQUSqc=",
+      "dev": true,
+      "dependencies": {
+        "convert-source-map": "^0.3.3",
+        "css": "^2.0.0"
+      }
+    },
+    "node_modules/rework-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/rework-visit/-/rework-visit-1.0.0.tgz",
+      "integrity": "sha1-mUWygD8hni96ygCtuLyfZA+ELJo=",
+      "dev": true
+    },
+    "node_modules/rework/node_modules/convert-source-map": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz",
+      "integrity": "sha1-8dgClQr33SYxof6+BZZVDIarMZA=",
+      "dev": true
+    },
+    "node_modules/rgb-regex": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz",
+      "integrity": "sha1-wODWiC3w4jviVKR16O3UGRX+rrE=",
+      "dev": true
+    },
+    "node_modules/rgba-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz",
+      "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=",
+      "dev": true
+    },
+    "node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/ripemd160": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "dev": true,
+      "dependencies": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
+    "node_modules/rollup": {
+      "version": "2.10.9",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.10.9.tgz",
+      "integrity": "sha512-dY/EbjiWC17ZCUSyk14hkxATAMAShkMsD43XmZGWjLrgFj15M3Dw2kEkA9ns64BiLFm9PKN6vTQw8neHwK74eg==",
+      "dev": true,
+      "bin": {
+        "rollup": "dist/bin/rollup"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.1.2"
+      }
+    },
+    "node_modules/rsvp": {
+      "version": "4.8.5",
+      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
+      "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
+      "dev": true,
+      "engines": {
+        "node": "6.* || >= 7.*"
+      }
+    },
+    "node_modules/run-async": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
+      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/run-parallel": {
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
+      "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q=="
+    },
+    "node_modules/run-queue": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
+      "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
+      "dev": true,
+      "dependencies": {
+        "aproba": "^1.1.1"
+      }
+    },
+    "node_modules/rxjs": {
+      "version": "6.5.5",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz",
+      "integrity": "sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==",
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/rxjs/node_modules/tslib": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
+      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "node_modules/safe-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+      "dev": true,
+      "dependencies": {
+        "ret": "~0.1.10"
+      }
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "node_modules/sane": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz",
+      "integrity": "sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==",
+      "deprecated": "some dependency vulnerabilities fixed, support for node < 10 dropped, and newer ECMAScript syntax/features added",
+      "dev": true,
+      "dependencies": {
+        "@cnakazawa/watch": "^1.0.3",
+        "anymatch": "^2.0.0",
+        "capture-exit": "^2.0.0",
+        "exec-sh": "^0.3.2",
+        "execa": "^1.0.0",
+        "fb-watchman": "^2.0.0",
+        "micromatch": "^3.1.4",
+        "minimist": "^1.1.1",
+        "walker": "~1.0.5"
+      },
+      "bin": {
+        "sane": "src/cli.js"
+      },
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/sane/node_modules/anymatch": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+      "dev": true,
+      "dependencies": {
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
+      }
+    },
+    "node_modules/sane/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "dev": true,
+      "dependencies": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      },
+      "engines": {
+        "node": ">=4.8"
+      }
+    },
+    "node_modules/sane/node_modules/execa": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^6.0.0",
+        "get-stream": "^4.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/sane/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/get-stream": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "dev": true,
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/sane/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+      "dev": true,
+      "dependencies": {
+        "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/sane/node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/sane/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/sane/node_modules/shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/sass": {
+      "version": "1.26.5",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.26.5.tgz",
+      "integrity": "sha512-FG2swzaZUiX53YzZSjSakzvGtlds0lcbF+URuU9mxOv7WBh7NhXEVDa4kPKN4hN6fC2TkOTOKqiqp6d53N9X5Q==",
+      "dev": true,
+      "dependencies": {
+        "chokidar": ">=2.0.0 <4.0.0"
+      },
+      "bin": {
+        "sass": "sass.js"
+      },
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
+    "node_modules/sass-loader": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.2.tgz",
+      "integrity": "sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==",
+      "dev": true,
+      "dependencies": {
+        "clone-deep": "^4.0.1",
+        "loader-utils": "^1.2.3",
+        "neo-async": "^2.6.1",
+        "schema-utils": "^2.6.1",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">= 8.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "fibers": ">= 3.1.0",
+        "node-sass": "^4.0.0",
+        "sass": "^1.3.0",
+        "webpack": "^4.36.0 || ^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "fibers": {
+          "optional": true
+        },
+        "node-sass": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/sass-loader/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/sass-loader/node_modules/loader-utils": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/sass-loader/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/sax": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz",
+      "integrity": "sha1-dLbTPJrh4AFRDxeakRaFiPGu2qk="
+    },
+    "node_modules/saxes": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
+      "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
+      "dev": true,
+      "dependencies": {
+        "xmlchars": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/schema-utils": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
+      "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.5",
+        "ajv": "^6.12.4",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 8.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/sdp": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/sdp/-/sdp-1.5.4.tgz",
+      "integrity": "sha1-jgOPbdsUvXZa4fS1IW4SCUUR4NA="
+    },
+    "node_modules/select-hose": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
+      "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=",
+      "dev": true
+    },
+    "node_modules/selfsigned": {
+      "version": "1.10.8",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.8.tgz",
+      "integrity": "sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w==",
+      "dev": true,
+      "dependencies": {
+        "node-forge": "^0.10.0"
+      }
+    },
+    "node_modules/semver": {
+      "version": "7.3.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
+      "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/semver-diff": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz",
+      "integrity": "sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==",
+      "dependencies": {
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/semver-diff/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/semver-greatest-satisfied-range": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz",
+      "integrity": "sha1-E+jCZYq5aRywzXEJMkAoDTb3els=",
+      "dev": true,
+      "dependencies": {
+        "sver-compat": "^1.5.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/semver-intersect": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/semver-intersect/-/semver-intersect-1.4.0.tgz",
+      "integrity": "sha512-d8fvGg5ycKAq0+I6nfWeCx6ffaWJCsBYU0H2Rq56+/zFePYfT8mXkB3tWBSjR5BerkHNZ5eTPIk1/LBYas35xQ==",
+      "dev": true,
+      "dependencies": {
+        "semver": "^5.0.0"
+      }
+    },
+    "node_modules/semver-intersect/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/send": {
+      "version": "0.17.1",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
+      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
+      "dependencies": {
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "destroy": "~1.0.4",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "~1.7.2",
+        "mime": "1.6.0",
+        "ms": "2.1.1",
+        "on-finished": "~2.3.0",
+        "range-parser": "~1.2.1",
+        "statuses": "~1.5.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/send/node_modules/ms": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+      "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
+    },
+    "node_modules/serialize-javascript": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
+      "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+      "dev": true,
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "node_modules/serve-index": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
+      "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
+      "dev": true,
+      "dependencies": {
+        "accepts": "~1.3.4",
+        "batch": "0.6.1",
+        "debug": "2.6.9",
+        "escape-html": "~1.0.3",
+        "http-errors": "~1.6.2",
+        "mime-types": "~2.1.17",
+        "parseurl": "~1.3.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/serve-index/node_modules/http-errors": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+      "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+      "dev": true,
+      "dependencies": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.0",
+        "statuses": ">= 1.4.0 < 2"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/serve-index/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "dev": true
+    },
+    "node_modules/serve-index/node_modules/setprototypeof": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+      "dev": true
+    },
+    "node_modules/serve-static": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
+      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
+      "dependencies": {
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.3",
+        "send": "0.17.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
+    },
+    "node_modules/set-immediate-shim": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
+      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/set-value": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-extendable": "^0.1.1",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/set-value/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
+      "dev": true
+    },
+    "node_modules/setprototypeof": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
+      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
+    },
+    "node_modules/sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      },
+      "bin": {
+        "sha.js": "bin.js"
+      }
+    },
+    "node_modules/shallow-clone": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shellwords": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
+      "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel/node_modules/object-inspect": {
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz",
+      "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
+      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
+    },
+    "node_modules/simctl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/simctl/-/simctl-2.0.0.tgz",
+      "integrity": "sha512-5rB7rN4N3b0z0nFdy9eczVssXqrv2aAgdVRksPVqVoiDtvXmfzNvebp3EMdId2sAUzXIflarQlx4P0hjVQEzKQ==",
+      "dependencies": {
+        "shelljs": "^0.2.6",
+        "tail": "^0.4.0"
+      }
+    },
+    "node_modules/simctl/node_modules/shelljs": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz",
+      "integrity": "sha1-kEktcv/MgVmXa6umL7D2iE8MM3g=",
+      "bin": {
+        "shjs": "bin/shjs"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/simple-concat": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
+      "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "optional": true
+    },
+    "node_modules/simple-get": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz",
+      "integrity": "sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==",
+      "optional": true,
+      "dependencies": {
+        "decompress-response": "^4.2.0",
+        "once": "^1.3.1",
+        "simple-concat": "^1.0.0"
+      }
+    },
+    "node_modules/simple-get/node_modules/decompress-response": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
+      "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
+      "optional": true,
+      "dependencies": {
+        "mimic-response": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/simple-get/node_modules/mimic-response": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
+      "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
+      "optional": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/simple-plist": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/simple-plist/-/simple-plist-1.1.1.tgz",
+      "integrity": "sha512-pKMCVKvZbZTsqYR6RKgLfBHkh2cV89GXcA/0CVPje3sOiNOnXA8+rp/ciAMZ7JRaUdLzlEM6JFfUn+fS6Nt3hg==",
+      "dependencies": {
+        "bplist-creator": "0.0.8",
+        "bplist-parser": "0.2.0",
+        "plist": "^3.0.1"
+      }
+    },
+    "node_modules/simple-swizzle": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
+      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
+      "dev": true,
+      "dependencies": {
+        "is-arrayish": "^0.3.1"
+      }
+    },
+    "node_modules/simple-swizzle/node_modules/is-arrayish": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
+      "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
+      "dev": true
+    },
+    "node_modules/sisteransi": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
+      "dev": true
+    },
+    "node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/slice-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      }
+    },
+    "node_modules/slice-ansi/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/smart-buffer": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.1.0.tgz",
+      "integrity": "sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==",
+      "engines": {
+        "node": ">= 6.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/snapdragon": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "dev": true,
+      "dependencies": {
+        "base": "^0.11.1",
+        "debug": "^2.2.0",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "map-cache": "^0.2.2",
+        "source-map": "^0.5.6",
+        "source-map-resolve": "^0.5.0",
+        "use": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "dev": true,
+      "dependencies": {
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.0",
+        "snapdragon-util": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node/node_modules/is-accessor-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node/node_modules/is-data-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node/node_modules/is-descriptor": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.0",
+        "is-data-descriptor": "^1.0.0",
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-util": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-util/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sockjs": {
+      "version": "0.3.20",
+      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.20.tgz",
+      "integrity": "sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA==",
+      "dev": true,
+      "dependencies": {
+        "faye-websocket": "^0.10.0",
+        "uuid": "^3.4.0",
+        "websocket-driver": "0.6.5"
+      }
+    },
+    "node_modules/sockjs-client": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz",
+      "integrity": "sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.5",
+        "eventsource": "^1.0.7",
+        "faye-websocket": "~0.11.1",
+        "inherits": "^2.0.3",
+        "json3": "^3.3.2",
+        "url-parse": "^1.4.3"
+      }
+    },
+    "node_modules/sockjs-client/node_modules/debug": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/sockjs-client/node_modules/faye-websocket": {
+      "version": "0.11.3",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz",
+      "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==",
+      "dev": true,
+      "dependencies": {
+        "websocket-driver": ">=0.5.1"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/sockjs-client/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/socks": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.3.3.tgz",
+      "integrity": "sha512-o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA==",
+      "dependencies": {
+        "ip": "1.1.5",
+        "smart-buffer": "^4.1.0"
+      },
+      "engines": {
+        "node": ">= 6.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks-proxy-agent": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz",
+      "integrity": "sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "~4.2.1",
+        "socks": "~2.3.2"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/socks-proxy-agent/node_modules/agent-base": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz",
+      "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==",
+      "dev": true,
+      "dependencies": {
+        "es6-promisify": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/sort-keys": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
+      "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
+      "dev": true,
+      "dependencies": {
+        "is-plain-obj": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-list-map": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
+      "dev": true
+    },
+    "node_modules/source-map": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/source-map-loader": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-1.0.0.tgz",
+      "integrity": "sha512-ZayyQCSCrQazN50aCvuS84lJT4xc1ZAcykH5blHaBdVveSwjiFK8UGMPvao0ho54DTb0Jf7m57uRRG/YYUZ2Fg==",
+      "dev": true,
+      "dependencies": {
+        "data-urls": "^2.0.0",
+        "iconv-lite": "^0.5.1",
+        "loader-utils": "^2.0.0",
+        "schema-utils": "^2.6.6",
+        "source-map": "^0.6.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/source-map-loader/node_modules/iconv-lite": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.2.tgz",
+      "integrity": "sha512-kERHXvpSaB4aU3eANwidg79K8FlrN77m8G9V+0vOR3HYaRifrlwMEpT7ZBJqLSEIHnEgJTHcWK82wwLwwKwtag==",
+      "dev": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-loader/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-resolve": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+      "dev": true,
+      "dependencies": {
+        "atob": "^2.1.2",
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
+      }
+    },
+    "node_modules/source-map-support": {
+      "version": "0.5.19",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
+      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+      "dev": true,
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/source-map-support/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-url": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
+      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
+      "dev": true
+    },
+    "node_modules/sourcemap-codec": {
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
+      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
+      "dev": true
+    },
+    "node_modules/sparkles": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
+      "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/spdx-correct": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
+      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+      "dependencies": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-exceptions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="
+    },
+    "node_modules/spdx-expression-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "dependencies": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-license-ids": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz",
+      "integrity": "sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw=="
+    },
+    "node_modules/spdy": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
+      "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.0",
+        "handle-thing": "^2.0.0",
+        "http-deceiver": "^1.2.7",
+        "select-hose": "^2.0.0",
+        "spdy-transport": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/spdy-transport": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
+      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.0",
+        "detect-node": "^2.0.4",
+        "hpack.js": "^2.1.6",
+        "obuf": "^1.1.2",
+        "readable-stream": "^3.0.6",
+        "wbuf": "^1.7.3"
+      }
+    },
+    "node_modules/spdy-transport/node_modules/debug": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+      "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/spdy-transport/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/spdy-transport/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/spdy/node_modules/debug": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+      "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/spdy/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/speed-measure-webpack-plugin": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.3.tgz",
+      "integrity": "sha512-2ljD4Ch/rz2zG3HsLsnPfp23osuPBS0qPuz9sGpkNXTN1Ic4M+W9xB8l8rS8ob2cO4b1L+WTJw/0AJwWYVgcxQ==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      },
+      "peerDependencies": {
+        "webpack": "^1 || ^2 || ^3 || ^4"
+      }
+    },
+    "node_modules/speed-measure-webpack-plugin/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/speed-measure-webpack-plugin/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/speed-measure-webpack-plugin/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/speed-measure-webpack-plugin/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/speed-measure-webpack-plugin/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/speed-measure-webpack-plugin/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/split-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/split2": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
+      "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "^3.0.0"
+      }
+    },
+    "node_modules/split2/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "dev": true
+    },
+    "node_modules/ssh-config": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/ssh-config/-/ssh-config-1.1.6.tgz",
+      "integrity": "sha512-ZPO9rECxzs5JIQ6G/2EfL1I9ho/BVZkx9HRKn8+0af7QgwAmumQ7XBFP1ggMyPMo+/tUbmv0HFdv4qifdO/9JA==",
+      "dev": true
+    },
+    "node_modules/sshpk": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
+      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
+      "dependencies": {
+        "asn1": "~0.2.3",
+        "assert-plus": "^1.0.0",
+        "bcrypt-pbkdf": "^1.0.0",
+        "dashdash": "^1.12.0",
+        "ecc-jsbn": "~0.1.1",
+        "getpass": "^0.1.1",
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.0.2",
+        "tweetnacl": "~0.14.0"
+      },
+      "bin": {
+        "sshpk-conv": "bin/sshpk-conv",
+        "sshpk-sign": "bin/sshpk-sign",
+        "sshpk-verify": "bin/sshpk-verify"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ssri": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
+      "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
+      "dependencies": {
+        "minipass": "^3.1.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/stable": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
+      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
+      "dev": true
+    },
+    "node_modules/stack-trace": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
+      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/stack-utils": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.2.tgz",
+      "integrity": "sha512-0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg==",
+      "dev": true,
+      "dependencies": {
+        "escape-string-regexp": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/stack-utils/node_modules/escape-string-regexp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/static-extend": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+      "dev": true,
+      "dependencies": {
+        "define-property": "^0.2.5",
+        "object-copy": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-extend/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/stealthy-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
+      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/stream-browserify": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
+      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "~2.0.1",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "node_modules/stream-buffers": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz",
+      "integrity": "sha1-kdX1Ew0c75bc+n9yaUUYh0HQnuQ=",
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/stream-combiner2": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz",
+      "integrity": "sha1-+02KFCDqNidk4hrUeAOXvry0HL4=",
+      "dev": true,
+      "dependencies": {
+        "duplexer2": "~0.1.0",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "node_modules/stream-each": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
+      "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
+      "dev": true,
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "node_modules/stream-exhaust": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
+      "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==",
+      "dev": true
+    },
+    "node_modules/stream-http": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
+      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+      "dev": true,
+      "dependencies": {
+        "builtin-status-codes": "^3.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.3.6",
+        "to-arraybuffer": "^1.0.0",
+        "xtend": "^4.0.0"
+      }
+    },
+    "node_modules/stream-shift": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
+      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
+      "dev": true
+    },
+    "node_modules/strict-uri-encode": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
+      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/string-length": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.1.tgz",
+      "integrity": "sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw==",
+      "dev": true,
+      "dependencies": {
+        "char-regex": "^1.0.2",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/string-length/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-length/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "dependencies": {
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/string-width/node_modules/strip-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+      "dependencies": {
+        "ansi-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/string.prototype.codepointat": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz",
+      "integrity": "sha512-2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg=="
+    },
+    "node_modules/string.prototype.trimend": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
+      "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimend/node_modules/es-abstract": {
+      "version": "1.17.7",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+      "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+      "dev": true,
+      "dependencies": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.2",
+        "is-regex": "^1.1.1",
+        "object-inspect": "^1.8.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.1",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
+      "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart/node_modules/es-abstract": {
+      "version": "1.17.7",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+      "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+      "dev": true,
+      "dependencies": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.2",
+        "is-regex": "^1.1.1",
+        "object-inspect": "^1.8.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.1",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/stringify-package": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/stringify-package/-/stringify-package-1.0.1.tgz",
+      "integrity": "sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg=="
+    },
+    "node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "dependencies": {
+        "ansi-regex": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/strip-ansi/node_modules/ansi-regex": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/strip-final-newline": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/style-loader": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.2.1.tgz",
+      "integrity": "sha512-ByHSTQvHLkWE9Ir5+lGbVOXhxX10fbprhLvdg96wedFZb4NDekDPxVKv5Fwmio+QcMlkkNfuK+5W1peQ5CUhZg==",
+      "dev": true,
+      "dependencies": {
+        "loader-utils": "^2.0.0",
+        "schema-utils": "^2.6.6"
+      },
+      "engines": {
+        "node": ">= 8.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/stylehacks": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz",
+      "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-selector-parser": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/stylehacks/node_modules/postcss-selector-parser": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
+      "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
+      "dev": true,
+      "dependencies": {
+        "dot-prop": "^5.2.0",
+        "indexes-of": "^1.0.1",
+        "uniq": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/stylus": {
+      "version": "0.54.7",
+      "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.7.tgz",
+      "integrity": "sha512-Yw3WMTzVwevT6ZTrLCYNHAFmanMxdylelL3hkWNgPMeTCpMwpV3nXjpOHuBXtFv7aiO2xRuQS6OoAdgkNcSNug==",
+      "dev": true,
+      "dependencies": {
+        "css-parse": "~2.0.0",
+        "debug": "~3.1.0",
+        "glob": "^7.1.3",
+        "mkdirp": "~0.5.x",
+        "safer-buffer": "^2.1.2",
+        "sax": "~1.2.4",
+        "semver": "^6.0.0",
+        "source-map": "^0.7.3"
+      },
+      "bin": {
+        "stylus": "bin/stylus"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/stylus-loader": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz",
+      "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==",
+      "dev": true,
+      "dependencies": {
+        "loader-utils": "^1.0.2",
+        "lodash.clonedeep": "^4.5.0",
+        "when": "~3.6.x"
+      },
+      "peerDependencies": {
+        "stylus": ">=0.52.4"
+      }
+    },
+    "node_modules/stylus-loader/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/stylus-loader/node_modules/loader-utils": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/stylus/node_modules/debug": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/stylus/node_modules/sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+      "dev": true
+    },
+    "node_modules/stylus/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/superagent": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/superagent/-/superagent-5.3.1.tgz",
+      "integrity": "sha512-wjJ/MoTid2/RuGCOFtlacyGNxN9QLMgcpYLDQlWFIhhdJ93kNscFonGvrpAHSCVjRVj++DGCglocF7Aej1KHvQ==",
+      "dev": true,
+      "dependencies": {
+        "component-emitter": "^1.3.0",
+        "cookiejar": "^2.1.2",
+        "debug": "^4.1.1",
+        "fast-safe-stringify": "^2.0.7",
+        "form-data": "^3.0.0",
+        "formidable": "^1.2.2",
+        "methods": "^1.1.2",
+        "mime": "^2.4.6",
+        "qs": "^6.9.4",
+        "readable-stream": "^3.6.0",
+        "semver": "^7.3.2"
+      },
+      "engines": {
+        "node": ">= 7.0.0"
+      }
+    },
+    "node_modules/superagent-proxy": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/superagent-proxy/-/superagent-proxy-2.1.0.tgz",
+      "integrity": "sha512-DnarpKN6Xn8e3pYlFV4Yvsj9yxLY4q5FIsUe5JvN7vjzP+YCfzXv03dTkZSD2yzrSadsNYHf0IgOUJwKjX457A==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.1.0",
+        "proxy-agent": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "peerDependencies": {
+        "superagent": ">= 0.15.4 || 1 || 2 || 3"
+      }
+    },
+    "node_modules/superagent-proxy/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/superagent-proxy/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true
+    },
+    "node_modules/superagent/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/superagent/node_modules/form-data": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
+      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+      "dev": true,
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/superagent/node_modules/mime": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
+      "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
+      "dev": true,
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/superagent/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/superagent/node_modules/qs": {
+      "version": "6.10.1",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz",
+      "integrity": "sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==",
+      "dev": true,
+      "dependencies": {
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/superagent/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-hyperlinks": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz",
+      "integrity": "sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/sver-compat": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz",
+      "integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=",
+      "dev": true,
+      "dependencies": {
+        "es6-iterator": "^2.0.1",
+        "es6-symbol": "^3.1.1"
+      }
+    },
+    "node_modules/svgo": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
+      "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "coa": "^2.0.2",
+        "css-select": "^2.0.0",
+        "css-select-base-adapter": "^0.1.1",
+        "css-tree": "1.0.0-alpha.37",
+        "csso": "^4.0.2",
+        "js-yaml": "^3.13.1",
+        "mkdirp": "~0.5.1",
+        "object.values": "^1.1.0",
+        "sax": "~1.2.4",
+        "stable": "^0.1.8",
+        "unquote": "~1.1.1",
+        "util.promisify": "~1.0.0"
+      },
+      "bin": {
+        "svgo": "bin/svgo"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/svgo/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/svgo/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/svgo/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/svgo/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/svgo/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/svgo/node_modules/sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+      "dev": true
+    },
+    "node_modules/svgo/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/symbol-observable": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
+      "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/symbol-tree": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
+      "dev": true
+    },
+    "node_modules/systeminformation": {
+      "version": "4.34.23",
+      "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-4.34.23.tgz",
+      "integrity": "sha512-33+lQwlLxXoxy0o9WLOgw8OjbXeS3Jv+pSl+nxKc2AOClBI28HsdRPpH0u9Xa9OVjHLT9vonnOMw1ug7YXI0dA==",
+      "os": [
+        "darwin",
+        "linux",
+        "win32",
+        "freebsd",
+        "openbsd",
+        "netbsd",
+        "sunos"
+      ],
+      "bin": {
+        "systeminformation": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      },
+      "funding": {
+        "type": "Buy me a coffee",
+        "url": "https://www.buymeacoffee.com/systeminfo"
+      }
+    },
+    "node_modules/table": {
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.6.0.tgz",
+      "integrity": "sha512-iZMtp5tUvcnAdtHpZTWLPF0M7AgiQsURR2DwmxnJwSy8I3+cY+ozzVvYha3BOLG2TB+L0CqjIz+91htuj6yCXg==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^8.0.1",
+        "lodash.clonedeep": "^4.5.0",
+        "lodash.flatten": "^4.4.0",
+        "lodash.truncate": "^4.4.2",
+        "slice-ansi": "^4.0.0",
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/table/node_modules/ajv": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.2.0.tgz",
+      "integrity": "sha512-WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/table/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/table/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/table/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/table/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
+    },
+    "node_modules/table/node_modules/string-width": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/table/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/tail": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/tail/-/tail-0.4.0.tgz",
+      "integrity": "sha1-0p3nJ1DMmdseBTr/E8NZ7PtxMAI=",
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/tapable": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
+      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tar": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.1.tgz",
+      "integrity": "sha512-GG0R7yt/CQkvG4fueXDi52Zskqxe2AyRJ+Wm54yqarnBgcX3qRIWh10qLVAAN+mlPFGTfP5UxvD3Fbi11UOTUQ==",
+      "dependencies": {
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "minipass": "^3.0.0",
+        "minizlib": "^2.1.1",
+        "mkdirp": "^1.0.3",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/tar-fs": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
+      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+      "optional": true,
+      "dependencies": {
+        "chownr": "^1.1.1",
+        "mkdirp-classic": "^0.5.2",
+        "pump": "^3.0.0",
+        "tar-stream": "^2.1.4"
+      }
+    },
+    "node_modules/tar-fs/node_modules/chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "optional": true
+    },
+    "node_modules/tar-stream": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.4.tgz",
+      "integrity": "sha512-o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw==",
+      "optional": true,
+      "dependencies": {
+        "bl": "^4.0.3",
+        "end-of-stream": "^1.4.1",
+        "fs-constants": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tar-stream/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "optional": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/tar/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/term-size": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz",
+      "integrity": "sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/terminal-link": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
+      "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-escapes": "^4.2.1",
+        "supports-hyperlinks": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/terminal-link/node_modules/ansi-escapes": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
+      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.11.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/terminal-link/node_modules/type-fest": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
+      "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/terser": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.7.0.tgz",
+      "integrity": "sha512-Lfb0RiZcjRDXCC3OSHJpEkxJ9Qeqs6mp2v4jf2MHfy8vGERmVDuvjXdd/EnP5Deme5F2yBRBymKmKHCBg2echw==",
+      "dev": true,
+      "dependencies": {
+        "commander": "^2.20.0",
+        "source-map": "~0.6.1",
+        "source-map-support": "~0.5.12"
+      },
+      "bin": {
+        "terser": "bin/terser"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/terser-webpack-plugin": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-4.2.3.tgz",
+      "integrity": "sha512-jTgXh40RnvOrLQNgIkwEKnQ8rmHjHK4u+6UBEi+W+FPmvb+uo+chJXntKe7/3lW5mNysgSWD60KyesnhW8D6MQ==",
+      "dev": true,
+      "dependencies": {
+        "cacache": "^15.0.5",
+        "find-cache-dir": "^3.3.1",
+        "jest-worker": "^26.5.0",
+        "p-limit": "^3.0.2",
+        "schema-utils": "^3.0.0",
+        "serialize-javascript": "^5.0.1",
+        "source-map": "^0.6.1",
+        "terser": "^5.3.4",
+        "webpack-sources": "^1.4.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/@types/json-schema": {
+      "version": "7.0.9",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
+      "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
+      "dev": true
+    },
+    "node_modules/terser-webpack-plugin/node_modules/cacache": {
+      "version": "15.3.0",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz",
+      "integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==",
+      "dev": true,
+      "dependencies": {
+        "@npmcli/fs": "^1.0.0",
+        "@npmcli/move-file": "^1.0.1",
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "glob": "^7.1.4",
+        "infer-owner": "^1.0.4",
+        "lru-cache": "^6.0.0",
+        "minipass": "^3.1.1",
+        "minipass-collect": "^1.0.2",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.2",
+        "mkdirp": "^1.0.3",
+        "p-map": "^4.0.0",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^3.0.2",
+        "ssri": "^8.0.1",
+        "tar": "^6.0.2",
+        "unique-filename": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/jest-worker": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
+      "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "dev": true,
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/serialize-javascript": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
+      "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
+      "dev": true,
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/source-map-support": {
+      "version": "0.5.20",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz",
+      "integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==",
+      "dev": true,
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/terser": {
+      "version": "5.9.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz",
+      "integrity": "sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ==",
+      "dev": true,
+      "dependencies": {
+        "commander": "^2.20.0",
+        "source-map": "~0.7.2",
+        "source-map-support": "~0.5.20"
+      },
+      "bin": {
+        "terser": "bin/terser"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/terser/node_modules/source-map": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/terser/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/test-exclude": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+      "dev": true,
+      "dependencies": {
+        "@istanbuljs/schema": "^0.1.2",
+        "glob": "^7.1.4",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "dev": true
+    },
+    "node_modules/throat": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz",
+      "integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==",
+      "dev": true
+    },
+    "node_modules/through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
+    },
+    "node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/through2-filter": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
+      "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
+      "dev": true,
+      "dependencies": {
+        "through2": "~2.0.0",
+        "xtend": "~4.0.0"
+      }
+    },
+    "node_modules/thunky": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
+      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
+      "dev": true
+    },
+    "node_modules/time-stamp": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
+      "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/timers-browserify": {
+      "version": "2.0.11",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
+      "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
+      "dev": true,
+      "dependencies": {
+        "setimmediate": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+    "node_modules/timsort": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
+      "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
+      "dev": true
+    },
+    "node_modules/tmp": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
+      "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
+      "dependencies": {
+        "rimraf": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8.17.0"
+      }
+    },
+    "node_modules/tmpl": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
+      "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=",
+      "dev": true
+    },
+    "node_modules/to-absolute-glob": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
+      "integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=",
+      "dev": true,
+      "dependencies": {
+        "is-absolute": "^1.0.0",
+        "is-negated-glob": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-arraybuffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
+      "dev": true
+    },
+    "node_modules/to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/to-object-path": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-object-path/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-readable-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz",
+      "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/to-regex": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+      "dev": true,
+      "dependencies": {
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/to-through": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz",
+      "integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=",
+      "dev": true,
+      "dependencies": {
+        "through2": "^2.0.3"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/toidentifier": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
+      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/tough-cookie": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
+      "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
+      "dependencies": {
+        "ip-regex": "^2.1.0",
+        "psl": "^1.1.28",
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.0.2.tgz",
+      "integrity": "sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/tree-kill": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
+      "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
+      "dev": true,
+      "bin": {
+        "tree-kill": "cli.js"
+      }
+    },
+    "node_modules/ts-jest": {
+      "version": "26.4.1",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-26.4.1.tgz",
+      "integrity": "sha512-F4aFq01aS6mnAAa0DljNmKr/Kk9y4HVZ1m6/rtJ0ED56cuxINGq3Q9eVAh+z5vcYKe5qnTMvv90vE8vUMFxomg==",
+      "dev": true,
+      "dependencies": {
+        "@types/jest": "26.x",
+        "bs-logger": "0.x",
+        "buffer-from": "1.x",
+        "fast-json-stable-stringify": "2.x",
+        "jest-util": "^26.1.0",
+        "json5": "2.x",
+        "lodash.memoize": "4.x",
+        "make-error": "1.x",
+        "mkdirp": "1.x",
+        "semver": "7.x",
+        "yargs-parser": "20.x"
+      },
+      "bin": {
+        "ts-jest": "cli.js"
+      },
+      "engines": {
+        "node": ">= 10"
+      },
+      "peerDependencies": {
+        "jest": ">=26 <27",
+        "typescript": ">=3.8 <5.0"
+      }
+    },
+    "node_modules/ts-jest/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "dev": true,
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ts-jest/node_modules/yargs-parser": {
+      "version": "20.2.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.1.tgz",
+      "integrity": "sha512-yYsjuSkjbLMBp16eaOt7/siKTjNVjMm3SoJnIg3sEh/JsvqVVDyjRKmaJV4cl+lNIgq6QEco2i3gDebJl7/vLA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ts-md5": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/ts-md5/-/ts-md5-1.2.7.tgz",
+      "integrity": "sha512-emODogvKGWi1KO1l9c6YxLMBn6CEH3VrH5mVPIyOtxBG52BvV4jP3GWz6bOZCz61nLgBc3ffQYE4+EHfCD+V7w=="
+    },
+    "node_modules/ts-node": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.3.0.tgz",
+      "integrity": "sha512-dyNS/RqyVTDcmNM4NIBAeDMpsAdaQ+ojdf0GOLqE6nwJOgzEkdRNzJywhDfwnuvB10oa6NLVG1rUJQCpRN7qoQ==",
+      "dev": true,
+      "dependencies": {
+        "arg": "^4.1.0",
+        "diff": "^4.0.1",
+        "make-error": "^1.1.1",
+        "source-map-support": "^0.5.6",
+        "yn": "^3.0.0"
+      },
+      "bin": {
+        "ts-node": "dist/bin.js"
+      },
+      "engines": {
+        "node": ">=4.2.0"
+      },
+      "peerDependencies": {
+        "typescript": ">=2.0"
+      }
+    },
+    "node_modules/ts-pnp": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.2.0.tgz",
+      "integrity": "sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/tsconfig-paths": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz",
+      "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==",
+      "dev": true,
+      "dependencies": {
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.1",
+        "minimist": "^1.2.0",
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "node_modules/tsconfig-paths/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/tsconfig-paths/node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/tslib": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz",
+      "integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ=="
+    },
+    "node_modules/tsutils": {
+      "version": "3.17.1",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.17.1.tgz",
+      "integrity": "sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.8.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      },
+      "peerDependencies": {
+        "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
+      }
+    },
+    "node_modules/tsutils/node_modules/tslib": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
+      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
+      "dev": true
+    },
+    "node_modules/tty-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
+      "dev": true
+    },
+    "node_modules/tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "dependencies": {
+        "safe-buffer": "^5.0.1"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
+    },
+    "node_modules/type": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
+      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
+      "dev": true
+    },
+    "node_modules/type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/type-is": {
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "dependencies": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+      "dev": true
+    },
+    "node_modules/typedarray-to-buffer": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+      "dependencies": {
+        "is-typedarray": "^1.0.0"
+      }
+    },
+    "node_modules/typescript": {
+      "version": "3.9.9",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.9.tgz",
+      "integrity": "sha512-kdMjTiekY+z/ubJCATUPlRDl39vXYiMV9iyeMuEuXZh2we6zz80uovNN2WlAxmmdE/Z/YQe+EbOEXB5RHEED3w==",
+      "dev": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=4.2.0"
+      }
+    },
+    "node_modules/uglify-js": {
+      "version": "3.4.10",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz",
+      "integrity": "sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==",
+      "dev": true,
+      "dependencies": {
+        "commander": "~2.19.0",
+        "source-map": "~0.6.1"
+      },
+      "bin": {
+        "uglifyjs": "bin/uglifyjs"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/uglify-js/node_modules/commander": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
+      "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
+      "dev": true
+    },
+    "node_modules/uglify-js/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unbox-primitive": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
+      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has-bigints": "^1.0.1",
+        "has-symbols": "^1.0.2",
+        "which-boxed-primitive": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/unbox-primitive/node_modules/has-symbols": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/unc-path-regex": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
+      "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/underscore": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.11.0.tgz",
+      "integrity": "sha512-xY96SsN3NA461qIRKZ/+qox37YXPtSBswMGfiNptr+wrt6ds4HaMw23TP612fEyGekRE6LNRiLYr/aqbHXNedw=="
+    },
+    "node_modules/undertaker": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.3.0.tgz",
+      "integrity": "sha512-/RXwi5m/Mu3H6IHQGww3GNt1PNXlbeCuclF2QYR14L/2CHPz3DFZkvB5hZ0N/QUkiXWCACML2jXViIQEQc2MLg==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.0.1",
+        "arr-map": "^2.0.0",
+        "bach": "^1.0.0",
+        "collection-map": "^1.0.0",
+        "es6-weak-map": "^2.0.1",
+        "fast-levenshtein": "^1.0.0",
+        "last-run": "^1.1.0",
+        "object.defaults": "^1.0.0",
+        "object.reduce": "^1.0.0",
+        "undertaker-registry": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/undertaker-registry": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz",
+      "integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/undertaker/node_modules/fast-levenshtein": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz",
+      "integrity": "sha1-5qdUzI8V5YmHqpy9J69m/W9OWvk=",
+      "dev": true
+    },
+    "node_modules/unicode-canonical-property-names-ecmascript": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
+      "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unicode-match-property-ecmascript": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz",
+      "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==",
+      "dev": true,
+      "dependencies": {
+        "unicode-canonical-property-names-ecmascript": "^1.0.4",
+        "unicode-property-aliases-ecmascript": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unicode-match-property-value-ecmascript": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz",
+      "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unicode-property-aliases-ecmascript": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz",
+      "integrity": "sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/union-value": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+      "dev": true,
+      "dependencies": {
+        "arr-union": "^3.1.0",
+        "get-value": "^2.0.6",
+        "is-extendable": "^0.1.1",
+        "set-value": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/uniq": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
+      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
+      "dev": true
+    },
+    "node_modules/uniqs": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz",
+      "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=",
+      "dev": true
+    },
+    "node_modules/unique-filename": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
+      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
+      "dependencies": {
+        "unique-slug": "^2.0.0"
+      }
+    },
+    "node_modules/unique-slug": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
+      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
+      "dependencies": {
+        "imurmurhash": "^0.1.4"
+      }
+    },
+    "node_modules/unique-stream": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
+      "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
+      "dev": true,
+      "dependencies": {
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "through2-filter": "^3.0.0"
+      }
+    },
+    "node_modules/unique-string": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
+      "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
+      "dependencies": {
+        "crypto-random-string": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/universal-analytics": {
+      "version": "0.4.20",
+      "resolved": "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.4.20.tgz",
+      "integrity": "sha512-gE91dtMvNkjO+kWsPstHRtSwHXz0l2axqptGYp5ceg4MsuurloM0PU3pdOfpb5zBXUvyjT4PwhWK2m39uczZuw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.0.0",
+        "request": "^2.88.0",
+        "uuid": "^3.0.0"
+      }
+    },
+    "node_modules/universal-analytics/node_modules/debug": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/universal-analytics/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/universalify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/unorm": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.6.0.tgz",
+      "integrity": "sha512-b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA==",
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/unquote": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
+      "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
+      "dev": true
+    },
+    "node_modules/unset-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+      "dev": true,
+      "dependencies": {
+        "has-value": "^0.3.1",
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/has-value": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+      "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+      "dev": true,
+      "dependencies": {
+        "get-value": "^2.0.3",
+        "has-values": "^0.1.4",
+        "isobject": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+      "dev": true,
+      "dependencies": {
+        "isarray": "1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/has-values": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+      "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/untildify": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
+      "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/upath": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
+      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
+      "dev": true,
+      "engines": {
+        "node": ">=4",
+        "yarn": "*"
+      }
+    },
+    "node_modules/update-notifier": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.3.tgz",
+      "integrity": "sha512-Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A==",
+      "dependencies": {
+        "boxen": "^4.2.0",
+        "chalk": "^3.0.0",
+        "configstore": "^5.0.1",
+        "has-yarn": "^2.1.0",
+        "import-lazy": "^2.1.0",
+        "is-ci": "^2.0.0",
+        "is-installed-globally": "^0.3.1",
+        "is-npm": "^4.0.0",
+        "is-yarn-global": "^0.3.0",
+        "latest-version": "^5.0.0",
+        "pupa": "^2.0.1",
+        "semver-diff": "^3.1.1",
+        "xdg-basedir": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/yeoman/update-notifier?sponsor=1"
+      }
+    },
+    "node_modules/upper-case": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
+      "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=",
+      "dev": true
+    },
+    "node_modules/uri-js": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz",
+      "integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==",
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
+      "deprecated": "Please see https://github.com/lydell/urix#deprecated",
+      "dev": true
+    },
+    "node_modules/url": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+      "dev": true,
+      "dependencies": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      }
+    },
+    "node_modules/url-parse": {
+      "version": "1.4.7",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
+      "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
+      "dev": true,
+      "dependencies": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
+    "node_modules/url-parse-lax": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
+      "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
+      "dependencies": {
+        "prepend-http": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/url/node_modules/punycode": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+      "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+      "dev": true
+    },
+    "node_modules/use": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/util": {
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+      "dev": true,
+      "dependencies": {
+        "inherits": "2.0.1"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+    },
+    "node_modules/util-promisify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/util-promisify/-/util-promisify-2.1.0.tgz",
+      "integrity": "sha1-PCI2R2xNMsX/PEcAKt18E7moKlM=",
+      "dev": true,
+      "dependencies": {
+        "object.getownpropertydescriptors": "^2.0.3"
+      }
+    },
+    "node_modules/util.promisify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
+      "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.2",
+        "has-symbols": "^1.0.1",
+        "object.getownpropertydescriptors": "^2.1.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/util.promisify/node_modules/es-abstract": {
+      "version": "1.17.7",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+      "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+      "dev": true,
+      "dependencies": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.2",
+        "is-regex": "^1.1.1",
+        "object-inspect": "^1.8.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.1",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/util/node_modules/inherits": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+      "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+      "dev": true
+    },
+    "node_modules/utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/uuid": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "bin": {
+        "uuid": "bin/uuid"
+      }
+    },
+    "node_modules/v8-compile-cache": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+      "dev": true
+    },
+    "node_modules/v8-to-istanbul": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-5.0.1.tgz",
+      "integrity": "sha512-mbDNjuDajqYe3TXFk5qxcQy8L1msXNE37WTlLoqqpBfRsimbNcrlhQlDPntmECEcUvdC+AQ8CyMMf6EUx1r74Q==",
+      "dev": true,
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.1",
+        "convert-source-map": "^1.6.0",
+        "source-map": "^0.7.3"
+      },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/v8flags": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
+      "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==",
+      "dev": true,
+      "dependencies": {
+        "homedir-polyfill": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/valid-identifier": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/valid-identifier/-/valid-identifier-0.0.2.tgz",
+      "integrity": "sha512-zaSmOW6ykXwrkX0YTuFUSoALNEKGaQHpxBJQLb3TXspRNDpBwbfrIQCZqAQ0LKBlKuyn2YOq7NNd6415hvZ33g=="
+    },
+    "node_modules/validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dependencies": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "node_modules/validate-npm-package-name": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz",
+      "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=",
+      "dependencies": {
+        "builtins": "^1.0.3"
+      }
+    },
+    "node_modules/value-or-function": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz",
+      "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/vendors": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz",
+      "integrity": "sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "engines": [
+        "node >=0.6.0"
+      ],
+      "dependencies": {
+        "assert-plus": "^1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "^1.2.0"
+      }
+    },
+    "node_modules/vinyl": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
+      "integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==",
+      "dev": true,
+      "dependencies": {
+        "clone": "^2.1.1",
+        "clone-buffer": "^1.0.0",
+        "clone-stats": "^1.0.0",
+        "cloneable-readable": "^1.0.0",
+        "remove-trailing-separator": "^1.0.1",
+        "replace-ext": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/vinyl-fs": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz",
+      "integrity": "sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==",
+      "dev": true,
+      "dependencies": {
+        "fs-mkdirp-stream": "^1.0.0",
+        "glob-stream": "^6.1.0",
+        "graceful-fs": "^4.0.0",
+        "is-valid-glob": "^1.0.0",
+        "lazystream": "^1.0.0",
+        "lead": "^1.0.0",
+        "object.assign": "^4.0.4",
+        "pumpify": "^1.3.5",
+        "readable-stream": "^2.3.3",
+        "remove-bom-buffer": "^3.0.0",
+        "remove-bom-stream": "^1.2.0",
+        "resolve-options": "^1.1.0",
+        "through2": "^2.0.0",
+        "to-through": "^2.0.0",
+        "value-or-function": "^3.0.0",
+        "vinyl": "^2.0.0",
+        "vinyl-sourcemap": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/vinyl-sourcemap": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz",
+      "integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=",
+      "dev": true,
+      "dependencies": {
+        "append-buffer": "^1.0.2",
+        "convert-source-map": "^1.5.0",
+        "graceful-fs": "^4.1.6",
+        "normalize-path": "^2.1.1",
+        "now-and-later": "^2.0.0",
+        "remove-bom-buffer": "^3.0.0",
+        "vinyl": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/vinyl-sourcemap/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+      "dev": true,
+      "dependencies": {
+        "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/vm-browserify": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
+      "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
+      "dev": true
+    },
+    "node_modules/w3c-hr-time": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
+      "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
+      "dev": true,
+      "dependencies": {
+        "browser-process-hrtime": "^1.0.0"
+      }
+    },
+    "node_modules/w3c-xmlserializer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
+      "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
+      "dev": true,
+      "dependencies": {
+        "xml-name-validator": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/walker": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
+      "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
+      "dev": true,
+      "dependencies": {
+        "makeerror": "1.0.x"
+      }
+    },
+    "node_modules/watchpack": {
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.4.tgz",
+      "integrity": "sha512-aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "neo-async": "^2.5.0"
+      },
+      "optionalDependencies": {
+        "chokidar": "^3.4.1",
+        "watchpack-chokidar2": "^2.0.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz",
+      "integrity": "sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "chokidar": "^2.1.8"
+      },
+      "engines": {
+        "node": "<8.10.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/anymatch": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/anymatch/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/binary-extensions": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/chokidar": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+      "deprecated": "Chokidar 2 will break on node v14+. Upgrade to chokidar 3 with 15x less dependencies.",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "anymatch": "^2.0.0",
+        "async-each": "^1.0.1",
+        "braces": "^2.3.2",
+        "glob-parent": "^3.1.0",
+        "inherits": "^2.0.3",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "normalize-path": "^3.0.0",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.2.1",
+        "upath": "^1.1.1"
+      },
+      "optionalDependencies": {
+        "fsevents": "^1.2.7"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/fsevents": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+      "deprecated": "fsevents 1 will break on node v14+ and could be using insecure binaries. Upgrade to fsevents 2.",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "dependencies": {
+        "bindings": "^1.5.0",
+        "nan": "^2.12.1"
+      },
+      "engines": {
+        "node": ">= 4.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/glob-parent": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/glob-parent/node_modules/is-glob": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "is-extglob": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/is-binary-path": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "binary-extensions": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/readdirp": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.11",
+        "micromatch": "^3.1.10",
+        "readable-stream": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/watchpack-chokidar2/node_modules/to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/wbuf": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
+      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
+      "dev": true,
+      "dependencies": {
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "node_modules/wcwidth": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
+      "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=",
+      "dev": true,
+      "dependencies": {
+        "defaults": "^1.0.3"
+      }
+    },
+    "node_modules/webidl-conversions": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
+      "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.4"
+      }
+    },
+    "node_modules/webpack": {
+      "version": "4.43.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.43.0.tgz",
+      "integrity": "sha512-GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-module-context": "1.9.0",
+        "@webassemblyjs/wasm-edit": "1.9.0",
+        "@webassemblyjs/wasm-parser": "1.9.0",
+        "acorn": "^6.4.1",
+        "ajv": "^6.10.2",
+        "ajv-keywords": "^3.4.1",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^4.1.0",
+        "eslint-scope": "^4.0.3",
+        "json-parse-better-errors": "^1.0.2",
+        "loader-runner": "^2.4.0",
+        "loader-utils": "^1.2.3",
+        "memory-fs": "^0.4.1",
+        "micromatch": "^3.1.10",
+        "mkdirp": "^0.5.3",
+        "neo-async": "^2.6.1",
+        "node-libs-browser": "^2.2.1",
+        "schema-utils": "^1.0.0",
+        "tapable": "^1.1.3",
+        "terser-webpack-plugin": "^1.4.3",
+        "watchpack": "^1.6.1",
+        "webpack-sources": "^1.4.1"
+      },
+      "bin": {
+        "webpack": "bin/webpack.js"
+      },
+      "engines": {
+        "node": ">=6.11.5"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/webpack-dev-middleware": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz",
+      "integrity": "sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==",
+      "dev": true,
+      "dependencies": {
+        "memory-fs": "^0.4.1",
+        "mime": "^2.4.4",
+        "mkdirp": "^0.5.1",
+        "range-parser": "^1.2.1",
+        "webpack-log": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 6"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0"
+      }
+    },
+    "node_modules/webpack-dev-middleware/node_modules/memory-fs": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+      "dev": true,
+      "dependencies": {
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
+      }
+    },
+    "node_modules/webpack-dev-middleware/node_modules/mime": {
+      "version": "2.4.6",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
+      "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==",
+      "dev": true,
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/webpack-dev-server": {
+      "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz",
+      "integrity": "sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-html": "0.0.7",
+        "bonjour": "^3.5.0",
+        "chokidar": "^2.1.8",
+        "compression": "^1.7.4",
+        "connect-history-api-fallback": "^1.6.0",
+        "debug": "^4.1.1",
+        "del": "^4.1.1",
+        "express": "^4.17.1",
+        "html-entities": "^1.3.1",
+        "http-proxy-middleware": "0.19.1",
+        "import-local": "^2.0.0",
+        "internal-ip": "^4.3.0",
+        "ip": "^1.1.5",
+        "is-absolute-url": "^3.0.3",
+        "killable": "^1.0.1",
+        "loglevel": "^1.6.8",
+        "opn": "^5.5.0",
+        "p-retry": "^3.0.1",
+        "portfinder": "^1.0.26",
+        "schema-utils": "^1.0.0",
+        "selfsigned": "^1.10.7",
+        "semver": "^6.3.0",
+        "serve-index": "^1.9.1",
+        "sockjs": "0.3.20",
+        "sockjs-client": "1.4.0",
+        "spdy": "^4.0.2",
+        "strip-ansi": "^3.0.1",
+        "supports-color": "^6.1.0",
+        "url": "^0.11.0",
+        "webpack-dev-middleware": "^3.7.2",
+        "webpack-log": "^2.0.0",
+        "ws": "^6.2.1",
+        "yargs": "^13.3.2"
+      },
+      "bin": {
+        "webpack-dev-server": "bin/webpack-dev-server.js"
+      },
+      "engines": {
+        "node": ">= 6.11.5"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "webpack-cli": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/anymatch": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+      "dev": true,
+      "dependencies": {
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/anymatch/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+      "dev": true,
+      "dependencies": {
+        "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/binary-extensions": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/chokidar": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+      "deprecated": "Chokidar 2 will break on node v14+. Upgrade to chokidar 3 with 15x less dependencies.",
+      "dev": true,
+      "dependencies": {
+        "anymatch": "^2.0.0",
+        "async-each": "^1.0.1",
+        "braces": "^2.3.2",
+        "glob-parent": "^3.1.0",
+        "inherits": "^2.0.3",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "normalize-path": "^3.0.0",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.2.1",
+        "upath": "^1.1.1"
+      },
+      "optionalDependencies": {
+        "fsevents": "^1.2.7"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/debug": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+      "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/fsevents": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+      "deprecated": "fsevents 1 will break on node v14+ and could be using insecure binaries. Upgrade to fsevents 2.",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "dependencies": {
+        "bindings": "^1.5.0",
+        "nan": "^2.12.1"
+      },
+      "engines": {
+        "node": ">= 4.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/glob-parent": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/glob-parent/node_modules/is-glob": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/is-absolute-url": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz",
+      "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/is-binary-path": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+      "dev": true,
+      "dependencies": {
+        "binary-extensions": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/webpack-dev-server/node_modules/readdirp": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.11",
+        "micromatch": "^3.1.10",
+        "readable-stream": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/schema-utils": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.1.0",
+        "ajv-errors": "^1.0.0",
+        "ajv-keywords": "^3.1.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/supports-color": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-log": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
+      "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "^3.0.0",
+        "uuid": "^3.3.2"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/webpack-merge": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
+      "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^4.17.15"
+      }
+    },
+    "node_modules/webpack-sources": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+      "dev": true,
+      "dependencies": {
+        "source-list-map": "^2.0.0",
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/webpack-sources/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-subresource-integrity": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.4.1.tgz",
+      "integrity": "sha512-XMLFInbGbB1HV7K4vHWANzc1CN0t/c4bBvnlvGxGwV45yE/S/feAXIm8dJsCkzqWtSKnmaEgTp/meyeThxG4Iw==",
+      "dev": true,
+      "dependencies": {
+        "webpack-sources": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "html-webpack-plugin": "^2.21.0 || ~3 || >=4.0.0-alpha.2 <5",
+        "webpack": "^1.12.11 || ~2 || ~3 || ~4"
+      },
+      "peerDependenciesMeta": {
+        "html-webpack-plugin": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack/node_modules/cacache": {
+      "version": "12.0.4",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
+      "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
+      "dev": true,
+      "dependencies": {
+        "bluebird": "^3.5.5",
+        "chownr": "^1.1.1",
+        "figgy-pudding": "^3.5.1",
+        "glob": "^7.1.4",
+        "graceful-fs": "^4.1.15",
+        "infer-owner": "^1.0.3",
+        "lru-cache": "^5.1.1",
+        "mississippi": "^3.0.0",
+        "mkdirp": "^0.5.1",
+        "move-concurrently": "^1.0.1",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^2.6.3",
+        "ssri": "^6.0.1",
+        "unique-filename": "^1.1.1",
+        "y18n": "^4.0.0"
+      }
+    },
+    "node_modules/webpack/node_modules/chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "dev": true
+    },
+    "node_modules/webpack/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack/node_modules/find-cache-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
+      "dev": true,
+      "dependencies": {
+        "commondir": "^1.0.1",
+        "make-dir": "^2.0.0",
+        "pkg-dir": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/webpack/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack/node_modules/is-wsl": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/webpack/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/webpack/node_modules/loader-utils": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/webpack/node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/webpack/node_modules/make-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+      "dev": true,
+      "dependencies": {
+        "pify": "^4.0.1",
+        "semver": "^5.6.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/webpack/node_modules/memory-fs": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+      "dev": true,
+      "dependencies": {
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
+      }
+    },
+    "node_modules/webpack/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack/node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/webpack/node_modules/schema-utils": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.1.0",
+        "ajv-errors": "^1.0.0",
+        "ajv-keywords": "^3.1.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/webpack/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/webpack/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack/node_modules/ssri": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+      "dev": true,
+      "dependencies": {
+        "figgy-pudding": "^3.5.1"
+      }
+    },
+    "node_modules/webpack/node_modules/terser-webpack-plugin": {
+      "version": "1.4.5",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz",
+      "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==",
+      "dev": true,
+      "dependencies": {
+        "cacache": "^12.0.2",
+        "find-cache-dir": "^2.1.0",
+        "is-wsl": "^1.1.0",
+        "schema-utils": "^1.0.0",
+        "serialize-javascript": "^4.0.0",
+        "source-map": "^0.6.1",
+        "terser": "^4.1.2",
+        "webpack-sources": "^1.4.0",
+        "worker-farm": "^1.7.0"
+      },
+      "engines": {
+        "node": ">= 6.9.0"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0"
+      }
+    },
+    "node_modules/webpack/node_modules/to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack/node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true
+    },
+    "node_modules/webrtc-adapter": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/webrtc-adapter/-/webrtc-adapter-3.4.3.tgz",
+      "integrity": "sha1-tjYGLu6abvFYrNDYUBtnhDS1bxY=",
+      "dependencies": {
+        "sdp": "^1.5.0"
+      },
+      "engines": {
+        "node": ">=6.0.0",
+        "npm": ">=3.10.0"
+      }
+    },
+    "node_modules/websocket-driver": {
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz",
+      "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=",
+      "dev": true,
+      "dependencies": {
+        "websocket-extensions": ">=0.1.1"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+    "node_modules/websocket-extensions": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
+      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/whatwg-encoding": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
+      "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
+      "dev": true,
+      "dependencies": {
+        "iconv-lite": "0.4.24"
+      }
+    },
+    "node_modules/whatwg-mimetype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
+      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
+      "dev": true
+    },
+    "node_modules/whatwg-url": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.3.0.tgz",
+      "integrity": "sha512-BQRf/ej5Rp3+n7k0grQXZj9a1cHtsp4lqj01p59xBWFKdezR8sO37XnpafwNqiFac/v2Il12EIMjX/Y4VZtT8Q==",
+      "dev": true,
+      "dependencies": {
+        "lodash.sortby": "^4.7.0",
+        "tr46": "^2.0.2",
+        "webidl-conversions": "^6.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/when": {
+      "version": "3.6.4",
+      "resolved": "https://registry.npmjs.org/when/-/when-3.6.4.tgz",
+      "integrity": "sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=",
+      "dev": true
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "dev": true,
+      "dependencies": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+      "dev": true
+    },
+    "node_modules/which-pm-runs": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz",
+      "integrity": "sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=",
+      "optional": true
+    },
+    "node_modules/wide-align": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+      "dependencies": {
+        "string-width": "^1.0.2 || 2"
+      }
+    },
+    "node_modules/widest-line": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
+      "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==",
+      "dependencies": {
+        "string-width": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/widest-line/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/widest-line/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
+    "node_modules/widest-line/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/widest-line/node_modules/string-width": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/widest-line/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/windows-release": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-3.3.3.tgz",
+      "integrity": "sha512-OSOGH1QYiW5yVor9TtmXKQvt2vjQqbYS+DqmsZw+r7xDwLXEeT3JGW0ZppFmHx4diyXmxt238KFR3N9jzevBRg==",
+      "dependencies": {
+        "execa": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/windows-release/node_modules/cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "dependencies": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      },
+      "engines": {
+        "node": ">=4.8"
+      }
+    },
+    "node_modules/windows-release/node_modules/execa": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+      "dependencies": {
+        "cross-spawn": "^6.0.0",
+        "get-stream": "^4.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/windows-release/node_modules/get-stream": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/windows-release/node_modules/is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/windows-release/node_modules/npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "dependencies": {
+        "path-key": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/windows-release/node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/windows-release/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/windows-release/node_modules/shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dependencies": {
+        "shebang-regex": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/windows-release/node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/windows-release/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/with-open-file": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/with-open-file/-/with-open-file-0.1.7.tgz",
+      "integrity": "sha512-ecJS2/oHtESJ1t3ZfMI3B7KIDKyfN0O16miWxdn30zdh66Yd3LsRFebXZXq6GU4xfxLf6nVxp9kIqElb5fqczA==",
+      "dependencies": {
+        "p-finally": "^1.0.0",
+        "p-try": "^2.1.0",
+        "pify": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/worker-farm": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
+      "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
+      "dev": true,
+      "dependencies": {
+        "errno": "~0.1.7"
+      }
+    },
+    "node_modules/worker-plugin": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/worker-plugin/-/worker-plugin-4.0.3.tgz",
+      "integrity": "sha512-7hFDYWiKcE3yHZvemsoM9lZis/PzurHAEX1ej8PLCu818Rt6QqUAiDdxHPCKZctzmhqzPpcFSgvMCiPbtooqAg==",
+      "dev": true,
+      "dependencies": {
+        "loader-utils": "^1.1.0"
+      },
+      "peerDependencies": {
+        "webpack": ">= 4"
+      }
+    },
+    "node_modules/worker-plugin/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/worker-plugin/node_modules/loader-utils": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/wrap-ansi": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.0",
+        "string-width": "^3.0.0",
+        "strip-ansi": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/wrap-ansi/node_modules/string-width": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^7.0.1",
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+    },
+    "node_modules/write": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
+      "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
+      "dev": true,
+      "dependencies": {
+        "mkdirp": "^0.5.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/write-file-atomic": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
+      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+      "dependencies": {
+        "imurmurhash": "^0.1.4",
+        "is-typedarray": "^1.0.0",
+        "signal-exit": "^3.0.2",
+        "typedarray-to-buffer": "^3.1.5"
+      }
+    },
+    "node_modules/ws": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
+      "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
+      "dev": true,
+      "dependencies": {
+        "async-limiter": "~1.0.0"
+      }
+    },
+    "node_modules/xcode": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/xcode/-/xcode-2.1.0.tgz",
+      "integrity": "sha512-uCrmPITrqTEzhn0TtT57fJaNaw8YJs1aCzs+P/QqxsDbvPZSv7XMPPwXrKvHtD6pLjBM/NaVwraWJm8q83Y4iQ==",
+      "dependencies": {
+        "simple-plist": "^1.0.0",
+        "uuid": "^3.3.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/xdg-basedir": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
+      "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/xml-escape": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/xml-escape/-/xml-escape-1.1.0.tgz",
+      "integrity": "sha1-OQTBQ/qOs6ADDsZG0pAqLxtwbEQ="
+    },
+    "node_modules/xml-name-validator": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
+      "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
+      "dev": true
+    },
+    "node_modules/xmlbuilder": {
+      "version": "9.0.7",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
+      "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/xmlchars": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
+      "dev": true
+    },
+    "node_modules/xmldom": {
+      "version": "0.1.31",
+      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.31.tgz",
+      "integrity": "sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==",
+      "deprecated": "Deprecated due to CVE-2021-21366 resolved in 0.5.0",
+      "engines": {
+        "node": ">=0.1"
+      }
+    },
+    "node_modules/xregexp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz",
+      "integrity": "sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
+    "node_modules/y18n": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+      "dev": true
+    },
+    "node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
+    "node_modules/yargs": {
+      "version": "13.3.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+      "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^5.0.0",
+        "find-up": "^3.0.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^3.0.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^13.1.2"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "13.1.2",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      }
+    },
+    "node_modules/yargs/node_modules/find-up": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/yargs/node_modules/locate-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/yargs/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/yargs/node_modules/p-locate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/yargs/node_modules/string-width": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^7.0.1",
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
+      "dev": true,
+      "dependencies": {
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.1.0"
+      }
+    },
+    "node_modules/yn": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
+      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/zone.js": {
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.10.3.tgz",
+      "integrity": "sha512-LXVLVEq0NNOqK/fLJo3d0kfzd4sxwn2/h67/02pjCjfKDxgx1i9QqpvtHD8CrBnSSwMw5+dy11O7FRX5mkO7Cg=="
+    }
+  },
   "dependencies": {
     "@angular-builders/custom-webpack": {
       "version": "10.0.1",
@@ -439,7 +31742,8 @@
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-4.2.0.tgz",
       "integrity": "sha512-qM4hpweuQ14ul8CU6LKpUWFZs6POUE7HZKdTllUrYuoZMrTpNB1XGelR0pweYzbfo4XRnUaO1NVgWhWOWiD5MA==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "@angular-eslint/eslint-plugin": {
       "version": "4.2.0",
@@ -891,7 +32195,6 @@
       "version": "10.0.14",
       "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-10.0.14.tgz",
       "integrity": "sha512-lYNo6/MmnYAVFoDQDBB6HMFd9zHg3RHXc6hn+wchU0XSWiIsg6WYHbKOb/DyqUEyKebzy0gSKZf7gUeZHtj62Q==",
-      "dev": true,
       "requires": {
         "tslib": "^2.0.0"
       }
@@ -2420,7 +33723,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/badge/-/badge-5.33.0.tgz",
       "integrity": "sha512-g/E2HLB53csZq5hWeyWUFj6r7CrllSPuOkV88XotIFTQFNuY7TaLtiFUVFSvWXRh0Kvu+w7TI5Hys67d/v7F/g==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2435,7 +33738,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/camera/-/camera-5.33.0.tgz",
       "integrity": "sha512-cLAxM4e8IrTECvlszyUe9FnUjE4PbWR99NNDwkOuB85yJ3diyKxiQhHu89Qh9A6qzHTJQLa93iknY2Q40VM/5Q==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2450,7 +33753,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/chooser/-/chooser-5.33.0.tgz",
       "integrity": "sha512-hz2OtB8UsJpKdXZByDzGS6+U1FK8toIjKmIVCDQAuOXxjbw9dU2Ef+MSUKXOpK6MYnP56oP80JdSX9LDEFJnRA==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2465,7 +33768,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/clipboard/-/clipboard-5.33.0.tgz",
       "integrity": "sha512-HFZN4tsAjFJ9Se9ik0/IOUvApL4zNPEKQAtUsjqP7vCnTsdrgS+FDMln1UDEKXCQ/dEEwU1N1ndFmPBGxjkGzQ==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2480,7 +33783,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/core/-/core-5.33.0.tgz",
       "integrity": "sha512-dnZHu7SadvQvliGJPndk2ohdoPvwiyBWJjsJw33BKyhadnmLlmkYKkRgPPI+i22BZofDKq4YiAfIIqhvfHU6gw==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2495,7 +33798,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/device/-/device-5.33.0.tgz",
       "integrity": "sha512-KYQvVsN98bGTEomI193Jf9r1vaXBFJQXuhkhwBI6lajynAlf2SIVJwthNUXnK43kNXy1cOelYxScUuKyPwqudw==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2510,7 +33813,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/diagnostic/-/diagnostic-5.33.0.tgz",
       "integrity": "sha512-zBDv/yNMvUkXfxy17rgrGVU3+XKREXRI7cqy/DyvpjdomOnmx2pnFvhszgMEgeD03LkXXKiFOR5yUAVNgYirmg==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2525,7 +33828,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/file/-/file-5.33.0.tgz",
       "integrity": "sha512-RisSGJl2t8JrBgw30Vn5hJYYKEDTHR9f3KbQDfe1MQg+VrZo7vnbml/vk4l55u65c1TYZDH+F6i7s9nyif1QVQ==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2540,7 +33843,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/file-opener/-/file-opener-5.33.0.tgz",
       "integrity": "sha512-v7t1ndalAPYT9gvMAhxAup8tg1NPV415cfG6tzs1foPFP91UZC3MQny0tup8AgFivugT1GRdoSk1NMuK1jy8Cw==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2555,7 +33858,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/file-transfer/-/file-transfer-5.33.0.tgz",
       "integrity": "sha512-xDUpdJVgTBP6aEiU08iZ/pa9aMoGSMB9391dQKk+VSDs0hdbIwk+Cx4V40GIE4QF3TI06sUMdKXD2sIhVsr2QA==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2570,7 +33873,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/geolocation/-/geolocation-5.33.0.tgz",
       "integrity": "sha512-oE6pi6l8/Wsv94vpJmPlPqE1LheP6cQTJrC78WYQp9WVDOOCGZnFznNoH8BlQfnfjuDx/kUARxzEJBO/gbUg1A==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2585,7 +33888,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/http/-/http-5.33.0.tgz",
       "integrity": "sha512-dqcPu3igSLlfDUK8Mvma/6o6aq7WtKBlcR8xXwE8tVsO/r4fEB6NevLLN4S4zCr381Jy+RxIIjn3CZx5XHF6JQ==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2600,7 +33903,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/in-app-browser/-/in-app-browser-5.33.0.tgz",
       "integrity": "sha512-GGIvnYHf8FgaIae9yfRzxqxj0ZAxrYhOJpsHVSq1YKjxnDpRe6ImWWaHHfaeXE5IdUUMUXVuf75VTSBN00VBvA==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2615,7 +33918,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/ionic-webview/-/ionic-webview-5.33.0.tgz",
       "integrity": "sha512-Jbr4M6z/Fya51F+QXuPLm/crFlZ9T6YvRM1cygGmFwZ7SgDAimYnjgSO8SEGJmvO2ZekYmFuF56qiVPSvx2wUA==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2630,7 +33933,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/keyboard/-/keyboard-5.33.0.tgz",
       "integrity": "sha512-TIYU3LC+Yz/pcpBuHcxLThMNuN9y1E1wBu4SlmS6VlO3/D3R3At2WOg2UK3iA66G2kTJubed5haqTYZjeoA6Uw==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2645,7 +33948,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/local-notifications/-/local-notifications-5.33.0.tgz",
       "integrity": "sha512-ljn2uq0rFWpjG1I1qK+mPVX8T3T+09fsF8sZ9nK7uvD9YWShCVz2e2ctf8qPRFq+TWDeDqlnwXz3wCvWmbBUWw==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2660,7 +33963,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/media/-/media-5.33.0.tgz",
       "integrity": "sha512-nUu7/FSH41j9+BqHXYVMBd3EifNsTNOufD3NEiMVpHVDWLWqG7tG5h5cFlsVACxUaP4kNpSEke2mjom6CKyjxQ==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2675,7 +33978,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/media-capture/-/media-capture-5.33.0.tgz",
       "integrity": "sha512-aQTnonVSeijpuZ9B7oYJCjIDqgFVhNdvqkx9vUoaO359BtJGpGS1rNPjEovt4DsqV7oe7TkbmBd8DMEwnB3A2g==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2690,7 +33993,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/network/-/network-5.33.0.tgz",
       "integrity": "sha512-J+3+rbDTMVNUspa/nV+P8a0hFKDicJK1rVIrm5aLBQdmN9n7WaqJmeMYTptyWOnZxQpktJAJDdhJTEvVmKQjjw==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2705,7 +34008,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/push/-/push-5.33.0.tgz",
       "integrity": "sha512-H4gOkMbOaNvi97cKKJDggWvAR1BVCUbtdLyWInA0q3cZBHWSc6KcRJGz+hcdDndCQJUnHofs1Tpw8LN3zhjYyQ==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2720,7 +34023,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/qr-scanner/-/qr-scanner-5.33.0.tgz",
       "integrity": "sha512-cyiQv0Rje/fN9/JYoDXP1+ILJkRkjvPtoSx4vd2FsKAuJB60U2DpQfmVEE/KMF4iceTpx4MK/kGzr2WE2AYnIg==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2735,7 +34038,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-5.33.0.tgz",
       "integrity": "sha512-6PHk5WJeUoc3zru6wTvUmd9DCASvRQoQq1dysYI3JCECaAJ6X0x1RbzM8dBFs3JPLfWtDn+P8eTp+KaA0Xf58w==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2750,7 +34053,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/sqlite/-/sqlite-5.33.0.tgz",
       "integrity": "sha512-JIdQJr6bcksotF/3ZMJQZo9lHgaHXvHOOK9R30mM/5Ds5fFu+rUoUf0wvyqaGzEFu94pGw2uPGnfD+WI7x7+1A==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2765,7 +34068,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/status-bar/-/status-bar-5.33.0.tgz",
       "integrity": "sha512-cnyfd42N9gGfhyDtF7wbWoacKg/jfsoJQHOHltfhS4/EjxsVu4bjkwq1YBLMcMY3OIqFDSn2aFcejHn8wVNkDQ==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2780,7 +34083,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/web-intent/-/web-intent-5.33.0.tgz",
       "integrity": "sha512-3CIAofrg9nkJQbSftFdMKYOduXy9Ra/a1Q0it6ysm9NFeAQn7iZPThSexBeZ9xiKKj/QTPZtnqAJ0MQ+4mkGag==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2795,7 +34098,7 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/zip/-/zip-5.33.0.tgz",
       "integrity": "sha512-hErISQ6/xqVErmVnnha5BR+3GWRNQIVfMTXzprEpNZxQl3iDe1UTIVQdFnMd3Nasz/naY+61Vq/y91PZ1Rrajw==",
       "requires": {
-        "@types/cordova": "^0.0.34"
+        "@types/cordova": "latest"
       },
       "dependencies": {
         "@types/cordova": {
@@ -2845,7 +34148,8 @@
           "version": "7.3.1",
           "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz",
           "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==",
-          "dev": true
+          "dev": true,
+          "requires": {}
         }
       }
     },
@@ -5004,16 +36308,6 @@
       "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==",
       "dev": true
     },
-    "JSONStream": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
-      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
-      "dev": true,
-      "requires": {
-        "jsonparse": "^1.2.0",
-        "through": ">=2.2.7 <3"
-      }
-    },
     "abab": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
@@ -5062,7 +36356,8 @@
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
       "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "acorn-walk": {
       "version": "7.2.0",
@@ -5159,7 +36454,8 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
       "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "ajv-formats": {
       "version": "2.1.0",
@@ -5194,7 +36490,8 @@
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
       "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "alphanum-sort": {
       "version": "1.0.2",
@@ -7448,7 +38745,8 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-5.2.0.tgz",
       "integrity": "sha512-7p4Kn/gffhQaavNfyDFg7LS5S/UT1JAjyGd4UqR2+jzoYF02eDkj0Ec3+48TsIa4zghjLY87nQHIh/ecK9qLdw==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "class-utils": {
       "version": "0.3.6",
@@ -10264,7 +41562,8 @@
       "version": "8.3.0",
       "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz",
       "integrity": "sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "eslint-import-resolver-node": {
       "version": "0.3.4",
@@ -10340,7 +41639,8 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/eslint-plugin-header/-/eslint-plugin-header-3.1.1.tgz",
       "integrity": "sha512-9vlKxuJ4qf793CmeeSrZUvVClw6amtpghq3CuWcB5cUNnWHQhgcqy5eF8oVKFk1G3Y/CbchGfEaw3wiIJaNmVg==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "eslint-plugin-import": {
       "version": "2.22.1",
@@ -10435,13 +41735,15 @@
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/eslint-plugin-prefer-arrow/-/eslint-plugin-prefer-arrow-1.2.3.tgz",
       "integrity": "sha512-J9I5PKCOJretVuiZRGvPQxCbllxGAV/viI20JO3LYblAodofBxyMnZAJ+WGeClHgANnSJberTNoFWWjrWKBuXQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "eslint-plugin-promise": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-5.1.0.tgz",
       "integrity": "sha512-NGmI6BH5L12pl7ScQHbg7tvtk4wPxxj8yPHH47NvSmMtFneC077PSeY3huFj06ZWZvtbfxSPt3RuOQD5XcR4ng==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "eslint-scope": {
       "version": "4.0.3",
@@ -12963,7 +44265,8 @@
     "ieee754": {
       "version": "1.1.13",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
-      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
+      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
+      "devOptional": true
     },
     "iferr": {
       "version": "0.1.5",
@@ -14342,7 +45645,8 @@
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
       "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "jest-preset-angular": {
       "version": "8.3.1",
@@ -14947,7 +46251,8 @@
           "version": "7.3.1",
           "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz",
           "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==",
-          "dev": true
+          "dev": true,
+          "requires": {}
         }
       }
     },
@@ -15029,6 +46334,16 @@
       "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
       "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA="
     },
+    "JSONStream": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
+      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
+      "dev": true,
+      "requires": {
+        "jsonparse": "^1.2.0",
+        "through": ">=2.2.7 <3"
+      }
+    },
     "jsprim": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
@@ -16762,9 +48077,9 @@
       "integrity": "sha512-cny9v0+Mq6Tjz+e0erFAB+RYJ/AVGzkjnISiobqP8OWj9c9FLoZZu8/SPSKJWE17F1tk4018wfjV+ZbIbqC7fQ==",
       "dev": true,
       "requires": {
-        "JSONStream": "^1.3.4",
         "bluebird": "^3.5.1",
         "figgy-pudding": "^3.4.1",
+        "JSONStream": "^1.3.4",
         "lru-cache": "^5.1.1",
         "make-fetch-happen": "^5.0.0",
         "npm-package-arg": "^6.1.0",
@@ -21359,6 +52674,14 @@
       "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
       "dev": true
     },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
     "string-length": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.1.tgz",
@@ -21472,14 +52795,6 @@
         }
       }
     },
-    "string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "requires": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
     "stringify-package": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/stringify-package/-/stringify-package-1.0.1.tgz",
diff --git a/src/addons/badges/pages/user-badges/user-badges.page.ts b/src/addons/badges/pages/user-badges/user-badges.page.ts
index 1dabb74fe..b5eef4a15 100644
--- a/src/addons/badges/pages/user-badges/user-badges.page.ts
+++ b/src/addons/badges/pages/user-badges/user-badges.page.ts
@@ -39,9 +39,14 @@ export class AddonBadgesUserBadgesPage implements AfterViewInit, OnDestroy {
     @ViewChild(CoreSplitViewComponent) splitView!: CoreSplitViewComponent;
 
     constructor() {
-        const courseId = CoreNavigator.getRouteNumberParam('courseId') ?? 0; // Use 0 for site badges.
+        let courseId = CoreNavigator.getRouteNumberParam('courseId') ?? 0; // Use 0 for site badges.
         const userId = CoreNavigator.getRouteNumberParam('userId') ?? CoreSites.getCurrentSiteUserId();
 
+        if (courseId === CoreSites.getCurrentSiteHomeId()) {
+            // Use courseId 0 for site home, otherwise the site doesn't return site badges.
+            courseId = 0;
+        }
+
         this.badges = new AddonBadgesUserBadgesManager(AddonBadgesUserBadgesPage, courseId, userId);
     }
 
diff --git a/src/core/features/user/pages/profile/profile.page.ts b/src/core/features/user/pages/profile/profile.page.ts
index 081bfbf72..6e0f72013 100644
--- a/src/core/features/user/pages/profile/profile.page.ts
+++ b/src/core/features/user/pages/profile/profile.page.ts
@@ -44,7 +44,7 @@ export class CoreUserProfilePage implements OnInit, OnDestroy {
 
     protected courseId?: number;
     protected userId!: number;
-    protected site?: CoreSite;
+    protected site!: CoreSite;
     protected obsProfileRefreshed: CoreEventObserver;
     protected subscription?: Subscription;
 
@@ -75,25 +75,25 @@ export class CoreUserProfilePage implements OnInit, OnDestroy {
      * On init.
      */
     async ngOnInit(): Promise<void> {
-        this.site = CoreSites.getCurrentSite();
-        this.courseId = CoreNavigator.getRouteNumberParam('courseId');
-        const userId = CoreNavigator.getRouteNumberParam('userId');
-
-        if (!this.site) {
-            return;
-        }
-        if (userId === undefined) {
-            CoreDomUtils.showErrorModal('User ID not supplied');
+        try {
+            this.site = CoreSites.getRequiredCurrentSite();
+            this.courseId = CoreNavigator.getRouteNumberParam('courseId');
+            this.userId = CoreNavigator.getRequiredRouteNumberParam('userId');
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
             CoreNavigator.back();
 
             return;
         }
 
-        this.userId = userId;
+        if (this.courseId === this.site.getSiteHomeId()) {
+            // Get site profile.
+            this.courseId = undefined;
+        }
 
         // Allow to change the profile image only in the app profile page.
         this.canChangeProfilePicture =
-            (!this.courseId || this.courseId == this.site.getSiteHomeId()) &&
+            !this.courseId &&
             this.userId == this.site.getUserId() &&
             this.site.canUploadFiles() &&
             !CoreUser.isUpdatePictureDisabledInSite(this.site);
@@ -101,8 +101,12 @@ export class CoreUserProfilePage implements OnInit, OnDestroy {
         try {
             await this.fetchUser();
 
+            if (!this.user) {
+                return;
+            }
+
             try {
-                await CoreUser.logView(this.userId, this.courseId, this.user!.fullname);
+                await CoreUser.logView(this.userId, this.courseId, this.user.fullname);
             } catch (error) {
                 this.isDeleted = error?.errorcode === 'userdeleted';
                 this.isEnrolled = error?.errorcode !== 'notenrolledprofile';
@@ -211,14 +215,14 @@ export class CoreUserProfilePage implements OnInit, OnDestroy {
 
             modal = await CoreDomUtils.showModalLoading('core.sending', true);
 
-            const profileImageURL = await CoreUser.changeProfilePicture(result.itemid, this.userId, this.site!.getId());
+            const profileImageURL = await CoreUser.changeProfilePicture(result.itemid, this.userId, this.site.getId());
 
             CoreEvents.trigger(CoreUserProvider.PROFILE_PICTURE_UPDATED, {
                 userId: this.userId,
                 picture: profileImageURL,
-            }, this.site!.getId());
+            }, this.site.getId());
 
-            CoreSites.updateSiteInfo(this.site!.getId());
+            CoreSites.updateSiteInfo(this.site.getId());
 
             this.refreshUser();
         } catch (error) {
@@ -273,7 +277,11 @@ export class CoreUserProfilePage implements OnInit, OnDestroy {
      * @param handler Handler that was clicked.
      */
     handlerClicked(event: Event, handler: CoreUserProfileHandlerData): void {
-        handler.action(event, this.user!, this.courseId);
+        if (!this.user) {
+            return;
+        }
+
+        handler.action(event, this.user, this.courseId);
     }
 
     /**

From 52d7fc4df883cd27ca4f5a80184d9abdef8900eb Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 30 Sep 2021 15:14:34 +0200
Subject: [PATCH 0120/1008] MOBILE-3883 config: Set
 ITSAppUsesNonExemptEncryption to false

---
 config.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config.xml b/config.xml
index 528d663ee..1730384cf 100644
--- a/config.xml
+++ b/config.xml
@@ -290,6 +290,9 @@
         <config-file parent="NSCrossWebsiteTrackingUsageDescription" target="*-Info.plist">
             <string>This app needs third party cookies to correctly render embedded content from the Moodle site.</string>
         </config-file>
+        <config-file parent="ITSAppUsesNonExemptEncryption" target="*-Info.plist">
+            <false />
+        </config-file>
         <config-file parent="CFBundleDocumentTypes" target="*-Info.plist">
             <array>
                 <dict>

From 23e1d99f05783b015f6e009150342854f2ee38f8 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 30 Sep 2021 16:35:16 +0200
Subject: [PATCH 0121/1008] MOBILE-3798 competency: Remove learning plans from
 main menu

---
 .../learningplans/services/block-handler.ts   |  4 +-
 .../competency/competency-lazy.module.ts      |  7 ---
 src/addons/competency/competency.module.ts    | 10 ++--
 .../competency/pages/competency/competency.ts |  4 +-
 .../competencysummary/competencysummary.ts    |  4 +-
 .../coursecompetencies.page.ts                |  6 +--
 src/addons/competency/pages/plan/plan.ts      |  4 +-
 .../services/handlers/competency-link.ts      |  4 +-
 .../services/handlers/course-option.ts        |  4 +-
 .../competency/services/handlers/mainmenu.ts  | 54 -------------------
 .../competency/services/handlers/plan-link.ts |  4 +-
 .../services/handlers/plans-link.ts           |  4 +-
 .../services/handlers/push-click.ts           |  8 +--
 .../services/handlers/user-competency-link.ts |  4 +-
 .../competency/services/handlers/user.ts      |  6 +--
 15 files changed, 32 insertions(+), 95 deletions(-)
 delete mode 100644 src/addons/competency/services/handlers/mainmenu.ts

diff --git a/src/addons/block/learningplans/services/block-handler.ts b/src/addons/block/learningplans/services/block-handler.ts
index 2ab12f1a1..316884f45 100644
--- a/src/addons/block/learningplans/services/block-handler.ts
+++ b/src/addons/block/learningplans/services/block-handler.ts
@@ -17,7 +17,7 @@ import { CoreBlockHandlerData } from '@features/block/services/block-delegate';
 import { CoreBlockOnlyTitleComponent } from '@features/block/components/only-title-block/only-title-block';
 import { CoreBlockBaseHandler } from '@features/block/classes/base-block-handler';
 import { makeSingleton } from '@singletons';
-import { AddonCompetencyMainMenuHandlerService } from '@addons/competency/services/handlers/mainmenu';
+import { ADDON_COMPETENCY_MAIN_PAGE_NAME } from '@addons/competency/competency.module';
 
 /**
  * Block handler.
@@ -38,7 +38,7 @@ export class AddonBlockLearningPlansHandlerService extends CoreBlockBaseHandler
             title: 'addon.block_learningplans.pluginname',
             class: 'addon-block-learning-plans',
             component: CoreBlockOnlyTitleComponent,
-            link: AddonCompetencyMainMenuHandlerService.PAGE_NAME,
+            link: ADDON_COMPETENCY_MAIN_PAGE_NAME,
             navOptions: {
                 preferCurrentTab: false,
             },
diff --git a/src/addons/competency/competency-lazy.module.ts b/src/addons/competency/competency-lazy.module.ts
index 65be44eb5..09dce93a7 100644
--- a/src/addons/competency/competency-lazy.module.ts
+++ b/src/addons/competency/competency-lazy.module.ts
@@ -25,15 +25,11 @@ import { AddonCompetencyCompetencyPage } from './pages/competency/competency';
 import { AddonCompetencyCompetencySummaryPage } from './pages/competencysummary/competencysummary';
 import { AddonCompetencyCourseCompetenciesPage } from './pages/coursecompetencies/coursecompetencies.page';
 import { AddonCompetencyCourseCompetenciesPageModule } from './pages/coursecompetencies/coursecompetencies.module';
-import { AddonCompetencyMainMenuHandlerService } from './services/handlers/mainmenu';
 
 const mobileRoutes: Routes = [
     {
         path: '',
         pathMatch: 'full',
-        data: {
-            mainMenuTabRoot: AddonCompetencyMainMenuHandlerService.PAGE_NAME,
-        },
         component: AddonCompetencyPlanListPage,
     },
     {
@@ -79,9 +75,6 @@ const tabletRoutes: Routes = [
     },
     {
         path: '',
-        data: {
-            mainMenuTabRoot: AddonCompetencyMainMenuHandlerService.PAGE_NAME,
-        },
         component: AddonCompetencyPlanListPage,
         children: [
             {
diff --git a/src/addons/competency/competency.module.ts b/src/addons/competency/competency.module.ts
index 9e08180da..a20438615 100644
--- a/src/addons/competency/competency.module.ts
+++ b/src/addons/competency/competency.module.ts
@@ -15,14 +15,12 @@
 import { APP_INITIALIZER, NgModule, Type } from '@angular/core';
 import { CoreContentLinksDelegate } from '@features/contentlinks/services/contentlinks-delegate';
 import { CoreCourseOptionsDelegate } from '@features/course/services/course-options-delegate';
-import { CoreMainMenuDelegate } from '@features/mainmenu/services/mainmenu-delegate';
 import { CorePushNotificationsDelegate } from '@features/pushnotifications/services/push-delegate';
 import { CoreUserDelegate } from '@features/user/services/user-delegate';
 import { AddonCompetencyProvider } from './services/competency';
 import { AddonCompetencyHelperProvider } from './services/competency-helper';
 import { AddonCompetencyCompetencyLinkHandler } from './services/handlers/competency-link';
 import { AddonCompetencyCourseOptionHandler } from './services/handlers/course-option';
-import { AddonCompetencyMainMenuHandler, AddonCompetencyMainMenuHandlerService } from './services/handlers/mainmenu';
 import { AddonCompetencyPlanLinkHandler } from './services/handlers/plan-link';
 import { AddonCompetencyPlansLinkHandler } from './services/handlers/plans-link';
 import { AddonCompetencyPushClickHandler } from './services/handlers/push-click';
@@ -39,16 +37,18 @@ export const ADDON_COMPETENCY_SERVICES: Type<unknown>[] = [
     AddonCompetencyHelperProvider,
 ];
 
+export const ADDON_COMPETENCY_MAIN_PAGE_NAME = 'competency';
+
 const mainMenuChildrenRoutes: Routes = [
     {
-        path: AddonCompetencyMainMenuHandlerService.PAGE_NAME,
+        path: ADDON_COMPETENCY_MAIN_PAGE_NAME,
         loadChildren: () => import('./competency-lazy.module').then(m => m.AddonCompetencyLazyModule),
     },
 ];
 
 const courseIndexRoutes: Routes = [
     {
-        path: AddonCompetencyMainMenuHandlerService.PAGE_NAME,
+        path: ADDON_COMPETENCY_MAIN_PAGE_NAME,
         loadChildren: () => import('@addons/competency/competency-course-lazy.module').then(m => m.AddonCompetencyCourseLazyModule),
     },
 ];
@@ -56,7 +56,6 @@ const courseIndexRoutes: Routes = [
 @NgModule({
     imports: [
         CoreMainMenuTabRoutingModule.forChild(mainMenuChildrenRoutes),
-        CoreMainMenuRoutingModule.forChild({ children: mainMenuChildrenRoutes }),
         CoreCourseIndexRoutingModule.forChild({ children: courseIndexRoutes }),
     ],
     exports: [CoreMainMenuRoutingModule],
@@ -69,7 +68,6 @@ const courseIndexRoutes: Routes = [
                 CoreContentLinksDelegate.registerHandler(AddonCompetencyPlanLinkHandler.instance);
                 CoreContentLinksDelegate.registerHandler(AddonCompetencyPlansLinkHandler.instance);
                 CoreContentLinksDelegate.registerHandler(AddonCompetencyUserCompetencyLinkHandler.instance);
-                CoreMainMenuDelegate.registerHandler(AddonCompetencyMainMenuHandler.instance);
                 CoreUserDelegate.registerHandler(AddonCompetencyUserHandler.instance);
                 CoreCourseOptionsDelegate.registerHandler(AddonCompetencyCourseOptionHandler.instance);
                 CorePushNotificationsDelegate.registerClickHandler(AddonCompetencyPushClickHandler.instance);
diff --git a/src/addons/competency/pages/competency/competency.ts b/src/addons/competency/pages/competency/competency.ts
index f9bd310cc..dba3905e4 100644
--- a/src/addons/competency/pages/competency/competency.ts
+++ b/src/addons/competency/pages/competency/competency.ts
@@ -32,7 +32,7 @@ import { CoreNavigator } from '@services/navigator';
 import { IonRefresher } from '@ionic/angular';
 import { ContextLevel } from '@/core/constants';
 import { CoreUtils } from '@services/utils/utils';
-import { AddonCompetencyMainMenuHandlerService } from '@addons/competency/services/handlers/mainmenu';
+import { ADDON_COMPETENCY_MAIN_PAGE_NAME } from '@addons/competency/competency.module';
 
 /**
  * Page that displays the competency information.
@@ -184,7 +184,7 @@ export class AddonCompetencyCompetencyPage implements OnInit {
      */
     openCompetencySummary(competencyId: number): void {
         CoreNavigator.navigateToSitePath(
-            '/' + AddonCompetencyMainMenuHandlerService.PAGE_NAME + '/summary/' + competencyId,
+            ADDON_COMPETENCY_MAIN_PAGE_NAME + '/summary/' + competencyId,
             {
                 params: { contextLevel: this.contextLevel, contextInstanceId: this.contextInstanceId },
             },
diff --git a/src/addons/competency/pages/competencysummary/competencysummary.ts b/src/addons/competency/pages/competencysummary/competencysummary.ts
index 2d150eb4e..fa810bf2b 100644
--- a/src/addons/competency/pages/competencysummary/competencysummary.ts
+++ b/src/addons/competency/pages/competencysummary/competencysummary.ts
@@ -19,7 +19,7 @@ import { IonRefresher } from '@ionic/angular';
 import { CoreNavigator } from '@services/navigator';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
-import { AddonCompetencyMainMenuHandlerService } from '@addons/competency/services/handlers/mainmenu';
+import { ADDON_COMPETENCY_MAIN_PAGE_NAME } from '@addons/competency/competency.module';
 
 /**
  * Page that displays the competency summary.
@@ -102,7 +102,7 @@ export class AddonCompetencyCompetencySummaryPage implements OnInit {
      */
     openCompetencySummary(competencyId: number): void {
         CoreNavigator.navigateToSitePath(
-            '/' + AddonCompetencyMainMenuHandlerService.PAGE_NAME + '/summary/' + competencyId,
+            ADDON_COMPETENCY_MAIN_PAGE_NAME + '/summary/' + competencyId,
             {
                 params: { contextLevel: this.contextLevel, contextInstanceId: this.contextInstanceId },
             },
diff --git a/src/addons/competency/pages/coursecompetencies/coursecompetencies.page.ts b/src/addons/competency/pages/coursecompetencies/coursecompetencies.page.ts
index cbe9a49eb..96e98da36 100644
--- a/src/addons/competency/pages/coursecompetencies/coursecompetencies.page.ts
+++ b/src/addons/competency/pages/coursecompetencies/coursecompetencies.page.ts
@@ -19,8 +19,8 @@ import { CoreUserProfile } from '@features/user/services/user';
 import { IonRefresher } from '@ionic/angular';
 import { CoreNavigator } from '@services/navigator';
 import { CoreDomUtils } from '@services/utils/dom';
-import { AddonCompetencyMainMenuHandlerService } from '@addons/competency/services/handlers/mainmenu';
 import { ContextLevel } from '@/core/constants';
+import { ADDON_COMPETENCY_MAIN_PAGE_NAME } from '@addons/competency/competency.module';
 
 /**
  * Page that displays the list of competencies of a course.
@@ -81,7 +81,7 @@ export class AddonCompetencyCourseCompetenciesPage implements OnInit {
      */
     openCompetency(competencyId: number): void {
         CoreNavigator.navigateToSitePath(
-            '/' + AddonCompetencyMainMenuHandlerService.PAGE_NAME + '/competencies/' + competencyId,
+            ADDON_COMPETENCY_MAIN_PAGE_NAME + '/competencies/' + competencyId,
             {
                 params: { courseId: this.courseId, userId: this.userId },
             },
@@ -94,7 +94,7 @@ export class AddonCompetencyCourseCompetenciesPage implements OnInit {
      * @param competencyId
      */
     openCompetencySummary(competencyId: number): void {
-        CoreNavigator.navigateToSitePath('/' + AddonCompetencyMainMenuHandlerService.PAGE_NAME + '/summary/' + competencyId, {
+        CoreNavigator.navigateToSitePath(ADDON_COMPETENCY_MAIN_PAGE_NAME + '/summary/' + competencyId, {
             params: {
                 contextLevel: ContextLevel.COURSE,
                 contextInstanceId: this.courseId,
diff --git a/src/addons/competency/pages/plan/plan.ts b/src/addons/competency/pages/plan/plan.ts
index bf86a1a46..aafe9c4d8 100644
--- a/src/addons/competency/pages/plan/plan.ts
+++ b/src/addons/competency/pages/plan/plan.ts
@@ -19,7 +19,7 @@ import { AddonCompetencyHelper } from '../../services/competency-helper';
 import { CoreNavigator } from '@services/navigator';
 import { CoreUserProfile } from '@features/user/services/user';
 import { IonRefresher } from '@ionic/angular';
-import { AddonCompetencyMainMenuHandlerService } from '@addons/competency/services/handlers/mainmenu';
+import { ADDON_COMPETENCY_MAIN_PAGE_NAME } from '@addons/competency/competency.module';
 
 /**
  * Page that displays a learning plan.
@@ -80,7 +80,7 @@ export class AddonCompetencyPlanPage implements OnInit {
      */
     openCompetency(competencyId: number): void {
         CoreNavigator.navigateToSitePath(
-            '/' + AddonCompetencyMainMenuHandlerService.PAGE_NAME + '/competencies/' + competencyId,
+            ADDON_COMPETENCY_MAIN_PAGE_NAME + '/competencies/' + competencyId,
             { params: { planId: this.planId } },
         );
     }
diff --git a/src/addons/competency/services/handlers/competency-link.ts b/src/addons/competency/services/handlers/competency-link.ts
index dbbdd1df6..2ae81e974 100644
--- a/src/addons/competency/services/handlers/competency-link.ts
+++ b/src/addons/competency/services/handlers/competency-link.ts
@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { ADDON_COMPETENCY_MAIN_PAGE_NAME } from '@addons/competency/competency.module';
 import { Injectable } from '@angular/core';
 import { CoreContentLinksHandlerBase } from '@features/contentlinks/classes/base-handler';
 import { CoreContentLinksAction } from '@features/contentlinks/services/contentlinks-delegate';
 import { CoreNavigator } from '@services/navigator';
 import { makeSingleton } from '@singletons';
 import { AddonCompetency } from '../competency';
-import { AddonCompetencyMainMenuHandlerService } from './mainmenu';
 
 /**
  * Handler to treat links to a competency in a plan or in a course.
@@ -44,7 +44,7 @@ export class AddonCompetencyCompetencyLinkHandlerService extends CoreContentLink
                 };
 
                 CoreNavigator.navigateToSitePath(
-                    '/' + AddonCompetencyMainMenuHandlerService.PAGE_NAME + '/competencies/' + params.competencyid,
+                    ADDON_COMPETENCY_MAIN_PAGE_NAME + '/competencies/' + params.competencyid,
                     { params: pageParams, siteId },
                 );
 
diff --git a/src/addons/competency/services/handlers/course-option.ts b/src/addons/competency/services/handlers/course-option.ts
index e5f1e5364..7051064ff 100644
--- a/src/addons/competency/services/handlers/course-option.ts
+++ b/src/addons/competency/services/handlers/course-option.ts
@@ -25,7 +25,7 @@ import { CoreCourseUserAdminOrNavOptionIndexed } from '@features/courses/service
 import { CoreEnrolledCourseDataWithExtraInfoAndOptions } from '@features/courses/services/courses-helper';
 import { CoreFilterHelper } from '@features/filter/services/filter-helper';
 import { ContextLevel } from '@/core/constants';
-import { AddonCompetencyMainMenuHandlerService } from './mainmenu';
+import { ADDON_COMPETENCY_MAIN_PAGE_NAME } from '@addons/competency/competency.module';
 
 /**
  * Course nav handler.
@@ -75,7 +75,7 @@ export class AddonCompetencyCourseOptionHandlerService implements CoreCourseOpti
         return {
             title: 'addon.competency.competencies',
             class: 'addon-competency-course-handler',
-            page: AddonCompetencyMainMenuHandlerService.PAGE_NAME,
+            page: ADDON_COMPETENCY_MAIN_PAGE_NAME,
         };
     }
 
diff --git a/src/addons/competency/services/handlers/mainmenu.ts b/src/addons/competency/services/handlers/mainmenu.ts
deleted file mode 100644
index 8c4130b83..000000000
--- a/src/addons/competency/services/handlers/mainmenu.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-// (C) Copyright 2015 Moodle Pty Ltd.
-//
-// 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 { Injectable } from '@angular/core';
-import { CoreMainMenuHandler, CoreMainMenuHandlerData } from '@features/mainmenu/services/mainmenu-delegate';
-import { makeSingleton } from '@singletons';
-import { AddonCompetency } from '../competency';
-
-/**
- * Handler to inject an option into main menu.
- */
-@Injectable( { providedIn: 'root' })
-export class AddonCompetencyMainMenuHandlerService implements CoreMainMenuHandler {
-
-    static readonly PAGE_NAME = 'competency';
-
-    name = 'AddonCompetency';
-    priority = 500;
-
-    /**
-     * @inheritdoc
-     */
-    async isEnabled(): Promise<boolean> {
-        // Check the user has at least one learn plan available.
-        const plans = await AddonCompetency.getLearningPlans();
-
-        return plans.length > 0;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    getDisplayData(): CoreMainMenuHandlerData {
-        return {
-            icon: 'fas-route',
-            title: 'addon.competency.myplans',
-            page: AddonCompetencyMainMenuHandlerService.PAGE_NAME,
-            class: 'addon-competency-handler',
-        };
-    }
-
-}
-export const AddonCompetencyMainMenuHandler = makeSingleton(AddonCompetencyMainMenuHandlerService);
diff --git a/src/addons/competency/services/handlers/plan-link.ts b/src/addons/competency/services/handlers/plan-link.ts
index ca4ab179b..7ac937d62 100644
--- a/src/addons/competency/services/handlers/plan-link.ts
+++ b/src/addons/competency/services/handlers/plan-link.ts
@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { ADDON_COMPETENCY_MAIN_PAGE_NAME } from '@addons/competency/competency.module';
 import { Injectable } from '@angular/core';
 import { CoreContentLinksHandlerBase } from '@features/contentlinks/classes/base-handler';
 import { CoreContentLinksAction } from '@features/contentlinks/services/contentlinks-delegate';
 import { CoreNavigator } from '@services/navigator';
 import { makeSingleton } from '@singletons';
 import { AddonCompetency } from '../competency';
-import { AddonCompetencyMainMenuHandlerService } from './mainmenu';
 
 /**
  * Handler to treat links to a plan.
@@ -36,7 +36,7 @@ export class AddonCompetencyPlanLinkHandlerService extends CoreContentLinksHandl
         return [{
             action: (siteId: string): void => {
                 CoreNavigator.navigateToSitePath(
-                    '/' + AddonCompetencyMainMenuHandlerService.PAGE_NAME + '/' + params.id,
+                    ADDON_COMPETENCY_MAIN_PAGE_NAME + '/' + params.id,
                     { siteId },
                 );
             },
diff --git a/src/addons/competency/services/handlers/plans-link.ts b/src/addons/competency/services/handlers/plans-link.ts
index e7d377f61..bfa9e8fd5 100644
--- a/src/addons/competency/services/handlers/plans-link.ts
+++ b/src/addons/competency/services/handlers/plans-link.ts
@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { ADDON_COMPETENCY_MAIN_PAGE_NAME } from '@addons/competency/competency.module';
 import { Injectable } from '@angular/core';
 import { CoreContentLinksHandlerBase } from '@features/contentlinks/classes/base-handler';
 import { CoreContentLinksAction } from '@features/contentlinks/services/contentlinks-delegate';
 import { CoreNavigator } from '@services/navigator';
 import { makeSingleton } from '@singletons';
 import { AddonCompetency } from '../competency';
-import { AddonCompetencyMainMenuHandlerService } from './mainmenu';
 
 /**
  * Handler to treat links to user plans.
@@ -36,7 +36,7 @@ export class AddonCompetencyPlansLinkHandlerService extends CoreContentLinksHand
         return [{
             action: (siteId: string): void => {
                 CoreNavigator.navigateToSitePath(
-                    '/' + AddonCompetencyMainMenuHandlerService.PAGE_NAME,
+                    ADDON_COMPETENCY_MAIN_PAGE_NAME,
                     { params: { userId: params.userid }, siteId },
                 );
 
diff --git a/src/addons/competency/services/handlers/push-click.ts b/src/addons/competency/services/handlers/push-click.ts
index 7966bbf66..12f2f7a4c 100644
--- a/src/addons/competency/services/handlers/push-click.ts
+++ b/src/addons/competency/services/handlers/push-click.ts
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { ADDON_COMPETENCY_MAIN_PAGE_NAME } from '@addons/competency/competency.module';
 import { Injectable } from '@angular/core';
 import { CorePushNotificationsClickHandler } from '@features/pushnotifications/services/push-delegate';
 import { CorePushNotificationsNotificationBasicData } from '@features/pushnotifications/services/pushnotifications';
@@ -20,7 +21,6 @@ import { CoreUrlUtils } from '@services/utils/url';
 import { CoreUtils } from '@services/utils/utils';
 import { makeSingleton } from '@singletons';
 import { AddonCompetency } from '../competency';
-import { AddonCompetencyMainMenuHandlerService } from './mainmenu';
 
 /**
  * Handler for competencies push notifications clicks.
@@ -56,7 +56,7 @@ export class AddonCompetencyPushClickHandlerService implements CorePushNotificat
 
             await CoreUtils.ignoreErrors(AddonCompetency.invalidateLearningPlan(planId, notification.site));
 
-            await CoreNavigator.navigateToSitePath('/' + AddonCompetencyMainMenuHandlerService.PAGE_NAME + '/' + planId, {
+            await CoreNavigator.navigateToSitePath(ADDON_COMPETENCY_MAIN_PAGE_NAME + '/' + planId, {
                 siteId: notification.site,
             });
 
@@ -72,7 +72,7 @@ export class AddonCompetencyPushClickHandlerService implements CorePushNotificat
 
             await CoreUtils.ignoreErrors(AddonCompetency.invalidateCompetencyInPlan(planId, competencyId, notification.site));
             await CoreNavigator.navigateToSitePath(
-                '/' + AddonCompetencyMainMenuHandlerService.PAGE_NAME + '/competencies/' + competencyId,
+                ADDON_COMPETENCY_MAIN_PAGE_NAME + '/competencies/' + competencyId,
                 {
                     params: { planId, courseId, userId },
                     siteId: notification.site,
@@ -87,7 +87,7 @@ export class AddonCompetencyPushClickHandlerService implements CorePushNotificat
 
         await CoreUtils.ignoreErrors(AddonCompetency.invalidateLearningPlans(userId, notification.site));
 
-        await CoreNavigator.navigateToSitePath('/' + AddonCompetencyMainMenuHandlerService.PAGE_NAME, {
+        await CoreNavigator.navigateToSitePath(ADDON_COMPETENCY_MAIN_PAGE_NAME, {
             params: { userId },
             siteId: notification.site,
         });
diff --git a/src/addons/competency/services/handlers/user-competency-link.ts b/src/addons/competency/services/handlers/user-competency-link.ts
index 7a1380f3a..537984f28 100644
--- a/src/addons/competency/services/handlers/user-competency-link.ts
+++ b/src/addons/competency/services/handlers/user-competency-link.ts
@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { ADDON_COMPETENCY_MAIN_PAGE_NAME } from '@addons/competency/competency.module';
 import { Injectable } from '@angular/core';
 import { CoreContentLinksHandlerBase } from '@features/contentlinks/classes/base-handler';
 import { CoreContentLinksAction } from '@features/contentlinks/services/contentlinks-delegate';
 import { CoreNavigator } from '@services/navigator';
 import { makeSingleton } from '@singletons';
 import { AddonCompetency } from '../competency';
-import { AddonCompetencyMainMenuHandlerService } from './mainmenu';
 
 /**
  * Handler to treat links to a usr competency.
@@ -37,7 +37,7 @@ export class AddonCompetencyUserCompetencyLinkHandlerService extends CoreContent
         return [{
             action: (siteId: string): void => {
                 CoreNavigator.navigateToSitePath(
-                    '/' + AddonCompetencyMainMenuHandlerService.PAGE_NAME + '/summary/' + params.id,
+                    ADDON_COMPETENCY_MAIN_PAGE_NAME + '/summary/' + params.id,
                     { siteId },
                 );
 
diff --git a/src/addons/competency/services/handlers/user.ts b/src/addons/competency/services/handlers/user.ts
index 1500085ee..356fbf94d 100644
--- a/src/addons/competency/services/handlers/user.ts
+++ b/src/addons/competency/services/handlers/user.ts
@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { ADDON_COMPETENCY_MAIN_PAGE_NAME } from '@addons/competency/competency.module';
 import { Injectable } from '@angular/core';
 import { CoreUserProfile } from '@features/user/services/user';
 import { CoreUserProfileHandler, CoreUserDelegateService, CoreUserProfileHandlerData } from '@features/user/services/user-delegate';
 import { CoreNavigator } from '@services/navigator';
 import { makeSingleton } from '@singletons';
 import { AddonCompetency } from '../competency';
-import { AddonCompetencyMainMenuHandlerService } from './mainmenu';
 
 /**
  * Profile competencies handler.
@@ -69,7 +69,7 @@ export class AddonCompetencyUserHandlerService implements CoreUserProfileHandler
                     event.preventDefault();
                     event.stopPropagation();
                     CoreNavigator.navigateToSitePath(
-                        '/' + AddonCompetencyMainMenuHandlerService.PAGE_NAME + '/course/' + courseId,
+                        ADDON_COMPETENCY_MAIN_PAGE_NAME + '/course/' + courseId,
                         {
                             params: { userId: user.id },
                         },
@@ -85,7 +85,7 @@ export class AddonCompetencyUserHandlerService implements CoreUserProfileHandler
                 action: (event, user): void => {
                     event.preventDefault();
                     event.stopPropagation();
-                    CoreNavigator.navigateToSitePath('/' + AddonCompetencyMainMenuHandlerService.PAGE_NAME, {
+                    CoreNavigator.navigateToSitePath(ADDON_COMPETENCY_MAIN_PAGE_NAME, {
                         params: { userId: user.id },
                     });
                 },

From ba2cba037964785307952852f14d0fb62dd72fb8 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 1 Oct 2021 09:28:30 +0200
Subject: [PATCH 0122/1008] MOBILE-3886 android: Fix connecting to HTTP sites

---
 config.xml                                        | 3 ++-
 resources/android/xml/network_security_config.xml | 6 ++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/config.xml b/config.xml
index 1730384cf..8e1d8d1ce 100644
--- a/config.xml
+++ b/config.xml
@@ -59,11 +59,12 @@
         <resource-file src="resources/android/icon/drawable-mdpi-smallicon.png" target="app/src/main/res/mipmap-mdpi/smallicon.png" />
         <resource-file src="resources/android/icon/drawable-hdpi-smallicon.png" target="app/src/main/res/mipmap-hdpi/smallicon.png" />
         <resource-file src="resources/android/icon/drawable-xhdpi-smallicon.png" target="app/src/main/res/mipmap-xhdpi/smallicon.png" />
+        <resource-file src="resources/android/xml/network_security_config.xml" target="app/src/main/res/xml/network_security_config.xml" />
         <edit-config file="AndroidManifest.xml" mode="merge" target="/manifest/application/activity[@android:name='MainActivity']">
             <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|screenLayout|smallestScreenSize" />
         </edit-config>
         <edit-config file="AndroidManifest.xml" mode="merge" target="/manifest/application">
-            <application android:largeHeap="true" android:usesCleartextTraffic="true" />
+            <application android:largeHeap="true" android:networkSecurityConfig="@xml/network_security_config" />
         </edit-config>
         <config-file parent="/manifest/application" target="AndroidManifest.xml">
             <meta-data android:name="firebase_analytics_collection_deactivated" android:value="true" />
diff --git a/resources/android/xml/network_security_config.xml b/resources/android/xml/network_security_config.xml
index de61259aa..dca93c079 100644
--- a/resources/android/xml/network_security_config.xml
+++ b/resources/android/xml/network_security_config.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <network-security-config>
-    <domain-config cleartextTrafficPermitted="true">
-        <domain includeSubdomains="true">localhost</domain>
-    </domain-config>
-</network-security-config>
+    <base-config cleartextTrafficPermitted="true" />
+</network-security-config>
\ No newline at end of file

From 1fbb4c3880e4789832c593270bb5dd6efe5f8502 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 30 Sep 2021 16:48:24 +0200
Subject: [PATCH 0123/1008] MOBILE-3833 forum: Fix discussion link navigation

---
 src/addons/mod/forum/forum-lazy.module.ts     |  4 +
 .../forum/pages/discussion/discussion.page.ts | 80 ++++++++++---------
 .../services/handlers/discussion-link.ts      | 13 ++-
 3 files changed, 57 insertions(+), 40 deletions(-)

diff --git a/src/addons/mod/forum/forum-lazy.module.ts b/src/addons/mod/forum/forum-lazy.module.ts
index a911348cf..121eda5c4 100644
--- a/src/addons/mod/forum/forum-lazy.module.ts
+++ b/src/addons/mod/forum/forum-lazy.module.ts
@@ -35,6 +35,10 @@ const mobileRoutes: Routes = [
         path: ':courseId/:cmId/:discussionId',
         loadChildren: () => import('./pages/discussion/discussion.module').then(m => m.AddonForumDiscussionPageModule),
     },
+    {
+        path: 'discussion/:discussionId', // Only for discussion link handling.
+        loadChildren: () => import('./pages/discussion/discussion.module').then(m => m.AddonForumDiscussionPageModule),
+    },
 ];
 
 const tabletRoutes: Routes = [
diff --git a/src/addons/mod/forum/pages/discussion/discussion.page.ts b/src/addons/mod/forum/pages/discussion/discussion.page.ts
index 3894c38c4..e1ef3b5a8 100644
--- a/src/addons/mod/forum/pages/discussion/discussion.page.ts
+++ b/src/addons/mod/forum/pages/discussion/discussion.page.ts
@@ -40,6 +40,8 @@ import {
     AddonModForumPost,
     AddonModForumProvider,
     AddonModForumPostFormData,
+    AddonModForumChangeDiscussionData,
+    AddonModForumReplyDiscussionData,
 } from '../../services/forum';
 import { AddonModForumHelper } from '../../services/forum-helper';
 import { AddonModForumOffline } from '../../services/forum-offline';
@@ -61,7 +63,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
 
     @ViewChild(IonContent) content!: IonContent;
 
-    courseId!: number;
+    courseId?: number;
     discussionId!: number;
     forum: Partial<AddonModForumData> = {};
     accessInfo: AddonModForumAccessInformation = {};
@@ -94,12 +96,12 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
     syncIcon = CoreConstants.ICON_LOADING;
     discussionStr = '';
     component = AddonModForumProvider.COMPONENT;
-    cmId!: number;
+    cmId?: number;
     canPin = false;
     availabilityMessage: string | null = null;
     leavingPage = false;
 
-    protected forumId!: number;
+    protected forumId?: number;
     protected postId?: number;
     protected parent?: number;
     protected onlineObserver?: Subscription;
@@ -123,9 +125,9 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
 
     ngOnInit(): void {
         try {
-            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
-            this.cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
-            this.forumId = CoreNavigator.getRequiredRouteNumberParam('forumId');
+            this.courseId = CoreNavigator.getRouteNumberParam('courseId');
+            this.cmId = CoreNavigator.getRouteNumberParam('cmId');
+            this.forumId = CoreNavigator.getRouteNumberParam('forumId');
             this.discussion = CoreNavigator.getRouteParam<AddonModForumDiscussion>('discussion');
             this.discussionId = this.discussion
                 ? this.discussion.discussion
@@ -187,15 +189,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
 
         // The discussion object was not passed as parameter.
         if (!this.discussion) {
-            await this.loadDiscussion(this.forumId, this.cmId, this.discussionId);
-        }
-
-        if (!this.discussion) {
-            CoreDomUtils.showErrorModal('Cannot get the discussion');
-
-            this.goBack();
-
-            return;
+            await this.loadDiscussion(this.discussionId, this.forumId, this.cmId);
         }
 
         const discussion = this.discussion;
@@ -221,7 +215,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
         }, CoreSites.getCurrentSiteId());
 
         // Invalidate discussion list if it was not read.
-        if (discussion.numunread > 0) {
+        if (this.forumId && discussion && discussion.numunread > 0) {
             AddonModForum.invalidateDiscussionsList(this.forumId);
         }
 
@@ -241,7 +235,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
         });
 
         this.changeDiscObserver = CoreEvents.on(AddonModForumProvider.CHANGE_DISCUSSION_EVENT, data => {
-            if ((this.forumId && this.forumId === data.forumId) || data.cmId === this.cmId) {
+            if (discussion && this.forumId && (this.forumId === data.forumId || data.cmId === this.cmId)) {
                 AddonModForum.invalidateDiscussionsList(this.forumId).finally(() => {
                     if (typeof data.locked != 'undefined') {
                         discussion.locked = data.locked;
@@ -289,6 +283,10 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
      * Helper function to go back.
      */
     protected goBack(): void {
+        if (this.leavingPage) {
+            return;
+        }
+
         if (this.splitView?.outletActivated) {
             CoreNavigator.navigate('../');
         } else {
@@ -420,7 +418,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
                             offlineReplies.push(reply);
 
                             // Disable reply of the parent. Reply in offline to the same post is not allowed, edit instead.
-                            onlinePostsMap[reply.parentid!].capabilities.reply = false;
+                            reply.parentid && (onlinePostsMap[reply.parentid].capabilities.reply = false);
 
                             return;
                         }),
@@ -485,7 +483,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
 
                 // The discussion object was not passed as parameter and there is no starting post.
                 if (!this.discussion) {
-                    promises.push(this.loadDiscussion(this.forumId, this.cmId, this.discussionId));
+                    promises.push(this.loadDiscussion(this.discussionId, this.forumId, this.cmId));
                 }
 
                 await Promise.all(promises);
@@ -516,7 +514,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
                     : {},
             );
 
-            if (AddonModForum.isSetPinStateAvailableForSite()) {
+            if (AddonModForum.isSetPinStateAvailableForSite() && this.forumId) {
                 // Use the canAddDiscussion WS to check if the user can pin discussions.
                 try {
                     const response = await AddonModForum.canAddDiscussionToAll(this.forumId, { cmId: this.cmId });
@@ -543,6 +541,10 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
                 AddonModForum.logDiscussionView(this.discussionId, this.forumId || -1, this.forum.name).catch(() => {
                     // Ignore errors.
                 }).finally(() => {
+                    if (!this.courseId || !this.cmId) {
+                        return;
+                    }
+
                     // Trigger mark read posts.
                     CoreEvents.trigger(AddonModForumProvider.MARK_READ_EVENT, {
                         courseId: this.courseId,
@@ -556,14 +558,14 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
     /**
      * Convenience function to load discussion.
      *
+     * @param discussionId Discussion ID.
      * @param forumId Forum ID.
      * @param cmId Forum cmid.
-     * @param discussionId Discussion ID.
      * @return Promise resolved when done.
      */
-    protected async loadDiscussion(forumId: number, cmId: number, discussionId: number): Promise<void> {
+    protected async loadDiscussion(discussionId: number, forumId?: number, cmId?: number): Promise<void> {
         // Fetch the discussion if not passed as parameter.
-        if (this.discussion || !forumId) {
+        if (this.discussion || !forumId || ! cmId) {
             return;
         }
 
@@ -588,7 +590,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
                         CoreDomUtils.showErrorModal(result.warnings[0]);
                     }
 
-                    if (result && result.updated) {
+                    if (result && result.updated && this.forumId) {
                         // Sync successful, send event.
                         CoreEvents.trigger(AddonModForumSyncProvider.MANUAL_SYNCED, {
                             forumId: this.forumId,
@@ -653,12 +655,12 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
         this.refreshIcon = CoreConstants.ICON_LOADING;
         this.syncIcon = CoreConstants.ICON_LOADING;
 
-        const promises = [
-            AddonModForum.invalidateForumData(this.courseId),
-            AddonModForum.invalidateDiscussionPosts(this.discussionId, this.forumId),
-            AddonModForum.invalidateAccessInformation(this.forumId),
-            AddonModForum.invalidateCanAddDiscussion(this.forumId),
-        ];
+        const promises: Promise<void>[] = [];
+
+        this.courseId && promises.push(AddonModForum.invalidateForumData(this.courseId));
+        promises.push(AddonModForum.invalidateDiscussionPosts(this.discussionId, this.forumId));
+        this.forumId && promises.push(AddonModForum.invalidateAccessInformation(this.forumId));
+        this.forumId && promises.push(AddonModForum.invalidateCanAddDiscussion(this.forumId));
 
         await CoreUtils.ignoreErrors(CoreUtils.allPromises(promises));
 
@@ -686,7 +688,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
      * @param locked True to lock the discussion, false to unlock.
      */
     async setLockState(locked: boolean): Promise<void> {
-        if (!this.discussion) {
+        if (!this.discussion || !this.forumId || !this.cmId) {
             return;
         }
 
@@ -696,7 +698,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
             const response = await AddonModForum.setLockState(this.forumId, this.discussionId, locked);
             this.discussion.locked = response.locked;
 
-            const data = {
+            const data: AddonModForumChangeDiscussionData = {
                 forumId: this.forumId,
                 discussionId: this.discussionId,
                 cmId: this.cmId,
@@ -718,7 +720,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
      * @param pinned True to pin the discussion, false to unpin it.
      */
     async setPinState(pinned: boolean): Promise<void> {
-        if (!this.discussion) {
+        if (!this.discussion || !this.forumId || !this.cmId) {
             return;
         }
 
@@ -729,7 +731,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
 
             this.discussion.pinned = pinned;
 
-            const data = {
+            const data: AddonModForumChangeDiscussionData = {
                 forumId: this.forumId,
                 discussionId: this.discussionId,
                 cmId: this.cmId,
@@ -751,7 +753,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
      * @param starred True to star the discussion, false to unstar it.
      */
     async toggleFavouriteState(starred: boolean): Promise<void> {
-        if (!this.discussion) {
+        if (!this.discussion || !this.forumId || !this.cmId) {
             return;
         }
 
@@ -762,7 +764,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
 
             this.discussion.starred = starred;
 
-            const data = {
+            const data: AddonModForumChangeDiscussionData = {
                 forumId: this.forumId,
                 discussionId: this.discussionId,
                 cmId: this.cmId,
@@ -782,8 +784,12 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
      * New post added.
      */
     postListChanged(): void {
+        if (!this.forumId || !this.cmId) {
+            return;
+        }
+
         // Trigger an event to notify a new reply.
-        const data = {
+        const data: AddonModForumReplyDiscussionData = {
             forumId: this.forumId,
             discussionId: this.discussionId,
             cmId: this.cmId,
diff --git a/src/addons/mod/forum/services/handlers/discussion-link.ts b/src/addons/mod/forum/services/handlers/discussion-link.ts
index 8e821ed80..922ccf4a1 100644
--- a/src/addons/mod/forum/services/handlers/discussion-link.ts
+++ b/src/addons/mod/forum/services/handlers/discussion-link.ts
@@ -55,10 +55,13 @@ export class AddonModForumDiscussionLinkHandlerService extends CoreContentLinksH
         return [{
             action: (siteId): void => {
                 const discussionId = parseInt(params.d, 10);
+                const cmId = data?.cmid && Number(data.cmid);
+                courseId = courseId || (params.courseid && Number(params.courseid)) || (params.cid && Number(params.cid));
+
                 const pageParams: Params = {
                     forumId: data?.instance && parseInt(data.instance, 10),
-                    cmId: data?.cmid && parseInt(data.cmid, 10),
-                    courseId: courseId || parseInt(params.courseid, 10) || parseInt(params.cid, 10),
+                    cmId,
+                    courseId,
                 };
 
                 if (data?.postid || params.urlHash) {
@@ -69,8 +72,12 @@ export class AddonModForumDiscussionLinkHandlerService extends CoreContentLinksH
                     pageParams.parent = parseInt(params.parent);
                 }
 
+                const path = cmId && courseId
+                    ? `${AddonModForumModuleHandlerService.PAGE_NAME}/${courseId}/${cmId}/${discussionId}`
+                    : `${AddonModForumModuleHandlerService.PAGE_NAME}/discussion/${discussionId}`;
+
                 CoreNavigator.navigateToSitePath(
-                    `${AddonModForumModuleHandlerService.PAGE_NAME}/discussion/${discussionId}`,
+                    path,
                     { siteId, params: pageParams },
                 );
             },

From a549acadcbe35d7ee50d361edbbc22b866e302d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 30 Sep 2021 17:08:01 +0200
Subject: [PATCH 0124/1008] MOBILE-3833 competencies: Fix non required param

---
 .../pages/coursecompetencies/coursecompetencies.page.ts       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/addons/competency/pages/coursecompetencies/coursecompetencies.page.ts b/src/addons/competency/pages/coursecompetencies/coursecompetencies.page.ts
index cbe9a49eb..82c7394dc 100644
--- a/src/addons/competency/pages/coursecompetencies/coursecompetencies.page.ts
+++ b/src/addons/competency/pages/coursecompetencies/coursecompetencies.page.ts
@@ -36,7 +36,7 @@ export class AddonCompetencyCourseCompetenciesPage implements OnInit {
     user?: CoreUserProfile;
     courseId!: number;
 
-    protected userId!: number;
+    protected userId?: number;
 
     /**
      * View loaded.
@@ -44,7 +44,7 @@ export class AddonCompetencyCourseCompetenciesPage implements OnInit {
     ngOnInit(): void {
         try {
             this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
-            this.userId = CoreNavigator.getRequiredRouteNumberParam('userId');
+            this.userId = CoreNavigator.getRouteNumberParam('userId');
         } catch (error) {
             CoreDomUtils.showErrorModal(error);
 

From 4a072454556a099f0ba2636a227878e241ccb036 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 1 Oct 2021 10:27:14 +0200
Subject: [PATCH 0125/1008] MOBILE-3773 filepool: Fix filepool eslint warnings

---
 src/core/services/filepool.ts | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/core/services/filepool.ts b/src/core/services/filepool.ts
index 042558991..eb4cf3fdd 100644
--- a/src/core/services/filepool.ts
+++ b/src/core/services/filepool.ts
@@ -540,8 +540,12 @@ export class CoreFilepoolProvider {
         await site.getDb().deleteRecords(PACKAGES_TABLE_NAME);
 
         entries.forEach((entry) => {
+            if (!entry.component) {
+                return;
+            }
+
             // Trigger module status changed, setting it as not downloaded.
-            this.triggerPackageStatusChanged(siteId, CoreConstants.NOT_DOWNLOADED, entry.component!, entry.componentId);
+            this.triggerPackageStatusChanged(siteId, CoreConstants.NOT_DOWNLOADED, entry.component, entry.componentId);
         });
     }
 
@@ -680,7 +684,7 @@ export class CoreFilepoolProvider {
 
         const downloadId = this.getFileDownloadId(fileUrl, path);
 
-        if (this.filePromises[siteId] && this.filePromises[siteId][downloadId]) {
+        if (this.filePromises[siteId] && this.filePromises[siteId][downloadId] !== undefined) {
             // There's already a download ongoing for this file in this location, return the promise.
             return this.filePromises[siteId][downloadId];
         } else if (!this.filePromises[siteId]) {
@@ -753,11 +757,11 @@ export class CoreFilepoolProvider {
 
             if (dirPath) {
                 // Calculate the path to the file.
-                path = file.filename;
+                path = file.filename || '';
                 if (file.filepath && file.filepath !== '/') {
                     path = file.filepath.substr(1) + path;
                 }
-                path = CoreTextUtils.concatenatePaths(dirPath, path!);
+                path = CoreTextUtils.concatenatePaths(dirPath, path);
             }
 
             if (prefetch) {
@@ -806,7 +810,7 @@ export class CoreFilepoolProvider {
     ): Promise<void> {
         const packageId = this.getPackageId(component, componentId);
 
-        if (this.packagesPromises[siteId] && this.packagesPromises[siteId][packageId]) {
+        if (this.packagesPromises[siteId] && this.packagesPromises[siteId][packageId] !== undefined) {
             // There's already a download ongoing for this package, return the promise.
             return this.packagesPromises[siteId][packageId];
         } else if (!this.packagesPromises[siteId]) {
@@ -847,11 +851,11 @@ export class CoreFilepoolProvider {
 
                 if (dirPath) {
                     // Calculate the path to the file.
-                    path = file.filename;
+                    path = file.filename || '';
                     if (file.filepath && file.filepath !== '/') {
                         path = file.filepath.substr(1) + path;
                     }
-                    path = CoreTextUtils.concatenatePaths(dirPath, path!);
+                    path = CoreTextUtils.concatenatePaths(dirPath, path);
                 }
 
                 if (prefetch) {
@@ -1459,7 +1463,7 @@ export class CoreFilepoolProvider {
 
             const downloadId = this.getFileDownloadId(fileUrl, filePath);
 
-            if (this.filePromises[siteId] && this.filePromises[siteId][downloadId]) {
+            if (this.filePromises[siteId] && this.filePromises[siteId][downloadId] !== undefined) {
                 return CoreConstants.DOWNLOADING;
             }
 
@@ -1730,7 +1734,7 @@ export class CoreFilepoolProvider {
      */
     getPackageDownloadPromise(siteId: string, component: string, componentId?: string | number): Promise<void> | undefined {
         const packageId = this.getPackageId(component, componentId);
-        if (this.packagesPromises[siteId] && this.packagesPromises[siteId][packageId]) {
+        if (this.packagesPromises[siteId] && this.packagesPromises[siteId][packageId] !== undefined) {
             return this.packagesPromises[siteId][packageId];
         }
     }
@@ -2745,7 +2749,7 @@ export class CoreFilepoolProvider {
 
         await site.getDb().updateRecords(PACKAGES_TABLE_NAME, newData, { id: packageId });
         // Success updating, trigger event.
-        this.triggerPackageStatusChanged(site.id!, newData.status, component, componentId);
+        this.triggerPackageStatusChanged(site.getId(), newData.status, component, componentId);
 
         return newData.status;
     }

From d1bd392a682fb506cd7b93238bb29c1e07ca54d6 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 4 Oct 2021 10:41:50 +0200
Subject: [PATCH 0126/1008] MOBILE-3773 video: Fix placeholder displayed if no
 poster

---
 src/core/directives/external-content.ts |  6 +++--
 src/core/directives/format-text.ts      | 31 ++++++++++++++++++++--
 src/core/services/filepool.ts           | 34 +++++++++++++++++++------
 src/core/services/utils/mimetype.ts     |  5 ++++
 src/core/services/utils/url.ts          | 13 ++++++++++
 src/core/singletons/url.ts              | 28 ++++++++++++++++++++
 6 files changed, 105 insertions(+), 12 deletions(-)

diff --git a/src/core/directives/external-content.ts b/src/core/directives/external-content.ts
index 4d84f6845..d3e157dcc 100644
--- a/src/core/directives/external-content.ts
+++ b/src/core/directives/external-content.ts
@@ -266,9 +266,11 @@ export class CoreExternalContentDirective implements AfterViewInit, OnChanges {
             finalUrl = CoreFile.convertFileSrc(finalUrl);
         }
 
-        if (!CoreUrlUtils.isLocalFileUrl(finalUrl)) {
+        if (!CoreUrlUtils.isLocalFileUrl(finalUrl) && !finalUrl.includes('#')) {
             /* In iOS, if we use the same URL in embedded file and background download then the download only
-               downloads a few bytes (cached ones). Add a hash to the URL so both URLs are different. */
+               downloads a few bytes (cached ones). Add an anchor to the URL so both URLs are different.
+               Don't add this anchor if the URL already has an anchor, otherwise other anchors might not work.
+               The downloaded URL won't have anchors so the URLs will already be different. */
             finalUrl = finalUrl + '#moodlemobile-embedded';
         }
 
diff --git a/src/core/directives/format-text.ts b/src/core/directives/format-text.ts
index 22b5d3e4a..4869c50b8 100644
--- a/src/core/directives/format-text.ts
+++ b/src/core/directives/format-text.ts
@@ -555,7 +555,7 @@ export class CoreFormatTextDirective implements OnChanges {
         });
 
         videos.forEach((video) => {
-            this.treatMedia(video);
+            this.treatMedia(video, true);
         });
 
         iframes.forEach((iframe) => {
@@ -673,8 +673,9 @@ export class CoreFormatTextDirective implements OnChanges {
      * Add media adapt class and apply CoreExternalContentDirective to the media element and its sources and tracks.
      *
      * @param element Video or audio to treat.
+     * @param isVideo Whether it's a video.
      */
-    protected treatMedia(element: HTMLElement): void {
+    protected treatMedia(element: HTMLElement, isVideo: boolean = false): void {
         this.addMediaAdaptClass(element);
         this.addExternalContent(element);
 
@@ -692,8 +693,16 @@ export class CoreFormatTextDirective implements OnChanges {
 
         const sources = Array.from(element.querySelectorAll('source'));
         const tracks = Array.from(element.querySelectorAll('track'));
+        const hasPoster = isVideo && !!element.getAttribute('poster');
+
+        if (isVideo && !hasPoster) {
+            this.fixVideoSrcPlaceholder(element);
+        }
 
         sources.forEach((source) => {
+            if (isVideo && !hasPoster) {
+                this.fixVideoSrcPlaceholder(source);
+            }
             source.setAttribute('target-src', source.getAttribute('src') || '');
             source.removeAttribute('src');
             this.addExternalContent(source);
@@ -709,6 +718,24 @@ export class CoreFormatTextDirective implements OnChanges {
         });
     }
 
+    /**
+     * Try to fix the placeholder displayed when a video doesn't have a poster.
+     *
+     * @param element Element to fix.
+     */
+    protected fixVideoSrcPlaceholder(element: HTMLElement): void {
+        const src = element.getAttribute('src');
+        if (!src) {
+            return;
+        }
+
+        if (src.match(/#t=\d/)) {
+            return;
+        }
+
+        element.setAttribute('src', src + '#t=0.001');
+    }
+
     /**
      * Add media adapt class and treat the iframe source.
      *
diff --git a/src/core/services/filepool.ts b/src/core/services/filepool.ts
index eb4cf3fdd..98efbef5f 100644
--- a/src/core/services/filepool.ts
+++ b/src/core/services/filepool.ts
@@ -47,6 +47,7 @@ import {
     CoreFilepoolQueueDBEntry,
 } from '@services/database/filepool';
 import { CoreFileHelper } from './file-helper';
+import { CoreUrl } from '@singletons/url';
 
 /*
  * Factory for handling downloading files and retrieve downloaded files.
@@ -672,6 +673,13 @@ export class CoreFilepoolProvider {
         poolFileObject?: CoreFilepoolFileEntry,
     ): Promise<string> {
         const fileId = this.getFileIdByUrl(fileUrl);
+
+        // Extract the anchor from the URL (if any).
+        const anchor = CoreUrl.getUrlAnchor(fileUrl);
+        if (anchor) {
+            fileUrl = fileUrl.replace(anchor, '');
+        }
+
         const extension = CoreMimetypeUtils.guessExtensionFromUrl(fileUrl);
         const addExtension = typeof filePath == 'undefined';
         const path = filePath || (await this.getFilePath(siteId, fileId, extension));
@@ -712,7 +720,8 @@ export class CoreFilepoolProvider {
                 extension: fileEntry.extension,
             });
 
-            return fileEntry.toURL();
+            // Add the anchor again to the local URL.
+            return fileEntry.toURL() + (anchor || '');
         }).finally(() => {
             // Download finished, delete the promise.
             delete this.filePromises[siteId][downloadId];
@@ -1015,7 +1024,10 @@ export class CoreFilepoolProvider {
                 url = await this.getInternalUrlById(siteId, fileId);
             }
 
-            return finishSuccessfulDownload(url);
+            // Add the anchor to the local URL if any.
+            const anchor = CoreUrl.getUrlAnchor(fileUrl);
+
+            return finishSuccessfulDownload(url + (anchor || ''));
         } catch (error) {
             // The file is not downloaded or it's outdated.
             this.notifyFileDownloading(siteId, fileId, links);
@@ -1284,6 +1296,9 @@ export class CoreFilepoolProvider {
             });
         }
 
+        // Remove the anchor.
+        url = CoreUrl.removeUrlAnchor(url);
+
         // Try to guess the filename the target file should have.
         // We want to keep the original file name so people can easily identify the files after the download.
         const filename = this.guessFilenameFromUrl(url);
@@ -1446,7 +1461,7 @@ export class CoreFilepoolProvider {
             return CoreConstants.NOT_DOWNLOADABLE;
         }
 
-        fileUrl = CoreFileHelper.getFileUrl(file);
+        fileUrl = CoreUrl.removeUrlAnchor(CoreFileHelper.getFileUrl(file));
         timemodified = file.timemodified || timemodified;
         revision = revision || this.getRevisionFromUrl(fileUrl);
         const fileId = this.getFileIdByUrl(fileUrl);
@@ -1556,11 +1571,14 @@ export class CoreFilepoolProvider {
 
         try {
             // We found the file entry, now look for the file on disk.
-            if (mode === 'src') {
-                return await this.getInternalSrcById(siteId, fileId);
-            } else {
-                return await this.getInternalUrlById(siteId, fileId);
-            }
+            const path = mode === 'src' ?
+                await this.getInternalSrcById(siteId, fileId) :
+                await this.getInternalUrlById(siteId, fileId);
+
+            // Add the anchor to the local URL if any.
+            const anchor = CoreUrl.getUrlAnchor(fileUrl);
+
+            return path + (anchor || '');
         } catch (error) {
             // The file is not on disk.
             // We could not retrieve the file, delete the entries associated with that ID.
diff --git a/src/core/services/utils/mimetype.ts b/src/core/services/utils/mimetype.ts
index 78ea7322f..ddf65901d 100644
--- a/src/core/services/utils/mimetype.ts
+++ b/src/core/services/utils/mimetype.ts
@@ -313,6 +313,11 @@ export class CoreMimetypeUtilsProvider {
             if (position > -1) {
                 candidate = candidate.substr(0, position);
             }
+            // Remove anchor if any.
+            position = candidate.indexOf('#');
+            if (position > -1) {
+                candidate = candidate.substr(0, position);
+            }
 
             if (EXTENSION_REGEX.test(candidate)) {
                 extension = candidate;
diff --git a/src/core/services/utils/url.ts b/src/core/services/utils/url.ts
index 2f7cd0736..79aafb51c 100644
--- a/src/core/services/utils/url.ts
+++ b/src/core/services/utils/url.ts
@@ -58,6 +58,10 @@ export class CoreUrlUtilsProvider {
      * @return URL with params.
      */
     addParamsToUrl(url: string, params?: Record<string, unknown>, anchor?: string, boolToNumber?: boolean): string {
+        // Remove any existing anchor to add the params before it.
+        const urlAndAnchor = url.split('#');
+        url = urlAndAnchor[0];
+
         let separator = url.indexOf('?') != -1 ? '&' : '?';
 
         for (const key in params) {
@@ -75,6 +79,15 @@ export class CoreUrlUtilsProvider {
             }
         }
 
+        // Re-add the anchor if any.
+        if (urlAndAnchor.length > 1) {
+            // Remove the URL from the array.
+            urlAndAnchor.shift();
+
+            // Use a join in case there is more than one #.
+            url += '#' + urlAndAnchor.join('#');
+        }
+
         if (anchor) {
             url += '#' + anchor;
         }
diff --git a/src/core/singletons/url.ts b/src/core/singletons/url.ts
index 5c8b1f10f..097f05155 100644
--- a/src/core/singletons/url.ts
+++ b/src/core/singletons/url.ts
@@ -203,4 +203,32 @@ export class CoreUrl {
             && CoreText.removeEndingSlash(partsA?.path) === CoreText.removeEndingSlash(partsB?.path);
     }
 
+    /**
+     * Get the anchor of a URL. If there's more than one they'll all be returned, separated by #.
+     * E.g. myurl.com#foo=1#bar=2 will return #foo=1#bar=2.
+     *
+     * @param url URL.
+     * @return Anchor, undefined if no anchor.
+     */
+    static getUrlAnchor(url: string): string | undefined {
+        const firstAnchorIndex = url.indexOf('#');
+        if (firstAnchorIndex === -1) {
+            return;
+        }
+
+        return url.substr(firstAnchorIndex);
+    }
+
+    /**
+     * Remove the anchor from a URL.
+     *
+     * @param url URL.
+     * @return URL without anchor if any.
+     */
+    static removeUrlAnchor(url: string): string {
+        const urlAndAnchor = url.split('#');
+
+        return urlAndAnchor[0];
+    }
+
 }

From 54a05239a6d36c1bd2474cdbc0aee7a7155d7bf3 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Mon, 4 Oct 2021 13:22:37 +0200
Subject: [PATCH 0127/1008] MOBILE-3833 ng: Optimize testing build

---
 angular.json | 14 ++++++++++++++
 package.json |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/angular.json b/angular.json
index 9bb3f23ab..e27e74ea2 100644
--- a/angular.json
+++ b/angular.json
@@ -66,6 +66,20 @@
                 }
               ]
             },
+            "testing": {
+              "optimization": {
+                "scripts": false,
+                "styles": true
+              },
+              "outputHashing": "all",
+              "sourceMap": false,
+              "extractCss": true,
+              "namedChunks": false,
+              "aot": true,
+              "extractLicenses": true,
+              "vendorChunk": false,
+              "buildOptimizer": true
+            },
             "ci": {
               "progress": false
             }
diff --git a/package.json b/package.json
index 5139ca965..cc8e30643 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "serve:test": "NODE_ENV=testing ionic serve --no-open",
     "build": "ionic build",
     "build:prod": "NODE_ENV=production ionic build --prod",
-    "build:test": "NODE_ENV=testing ionic build",
+    "build:test": "NODE_ENV=testing ionic build --configuration=testing",
     "dev:android": "ionic cordova run android --livereload",
     "dev:ios": "ionic cordova run ios",
     "prod:android": "NODE_ENV=production ionic cordova run android --prod",

From b91c548ec66045a22784d36edf6e72b869ef098c Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Mon, 4 Oct 2021 13:23:13 +0200
Subject: [PATCH 0128/1008] MOBILE-3833 build: Fix JIT for site plugins

---
 webpack.config.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webpack.config.js b/webpack.config.js
index 4525367cb..1f9aad474 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -25,6 +25,7 @@ module.exports = config => {
                 compress: {
                     toplevel: true,
                     pure_getters: true,
+                    side_effects: false,
                 },
                 keep_classnames: true,
                 keep_fnames: true,

From ed636a2e6c82a0f8272f5e6a7ae8f14a986f78a9 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Mon, 4 Oct 2021 17:14:45 +0200
Subject: [PATCH 0129/1008] MOBILE-3833 e2e: Expose ngZone service

---
 src/core/initializers/prepare-automated-tests.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/core/initializers/prepare-automated-tests.ts b/src/core/initializers/prepare-automated-tests.ts
index 46531f44f..f8e60a42d 100644
--- a/src/core/initializers/prepare-automated-tests.ts
+++ b/src/core/initializers/prepare-automated-tests.ts
@@ -12,17 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { ApplicationRef } from '@angular/core';
+import { ApplicationRef, NgZone as NgZoneService } from '@angular/core';
 import { CorePushNotifications, CorePushNotificationsProvider } from '@features/pushnotifications/services/pushnotifications';
 import { CoreApp, CoreAppProvider } from '@services/app';
 import { CoreCronDelegate, CoreCronDelegateService } from '@services/cron';
 import { CoreCustomURLSchemes, CoreCustomURLSchemesProvider } from '@services/urlschemes';
-import { Application } from '@singletons';
+import { Application, NgZone } from '@singletons';
 
 type AutomatedTestsWindow = Window & {
     appRef?: ApplicationRef;
     appProvider?: CoreAppProvider;
     cronProvider?: CoreCronDelegateService;
+    ngZone?: NgZoneService;
     pushNotifications?: CorePushNotificationsProvider;
     urlSchemes?: CoreCustomURLSchemesProvider;
 };
@@ -31,6 +32,7 @@ function initializeAutomatedTestsWindow(window: AutomatedTestsWindow) {
     window.appRef = Application.instance;
     window.appProvider = CoreApp.instance;
     window.cronProvider = CoreCronDelegate.instance;
+    window.ngZone = NgZone.instance;
     window.pushNotifications = CorePushNotifications.instance;
     window.urlSchemes = CoreCustomURLSchemes.instance;
 }

From 1928f58656f1cb83ce43fcc76f54ef3178a42088 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Mon, 4 Oct 2021 17:14:56 +0200
Subject: [PATCH 0130/1008] MOBILE-3833 chore: Formatting

---
 tests/behat/performance.feature | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/behat/performance.feature b/tests/behat/performance.feature
index f955ff63e..b3c1f40d6 100644
--- a/tests/behat/performance.feature
+++ b/tests/behat/performance.feature
@@ -1,7 +1,7 @@
 @app @javascript @performance
 Feature: Measure performance.
 
-Scenario: First Contentful Paint
+  Scenario: First Contentful Paint
     Given I start measuring "First Contentful Paint"
     When I launch the app runtime
     Then I should find "Welcome to the Moodle App!" in the app
@@ -9,7 +9,7 @@ Scenario: First Contentful Paint
     When I stop measuring "First Contentful Paint"
     Then "First Contentful Paint" should have taken less than 6 seconds
 
-Scenario: Time to Interactive
+  Scenario: Time to Interactive
     Given I start measuring "Time to Interactive"
     When I launch the app runtime
     Then I should find "Welcome to the Moodle App!" in the app
@@ -21,7 +21,7 @@ Scenario: Time to Interactive
     When I stop measuring "Time to Interactive"
     Then "Time to Interactive" should have taken less than 7 seconds
 
-Scenario: Total Blocking Time
+  Scenario: Total Blocking Time
     Given I launch the app runtime
     Then I should find "Welcome to the Moodle App!" in the app
 

From 2212ae5955dc6fa380e4ae87f2683f71475c5e28 Mon Sep 17 00:00:00 2001
From: sangnguyen <sna67@open.ac.uk>
Date: Thu, 24 Dec 2020 17:47:03 +0700
Subject: [PATCH 0131/1008] MOBILE-3667 myovervew: Fix last access sort after
 view course

---
 .../components/myoverview/myoverview.ts       | 57 ++++++++++++++-----
 .../courses/services/courses-helper.ts        | 13 +++--
 2 files changed, 52 insertions(+), 18 deletions(-)

diff --git a/src/addons/block/myoverview/components/myoverview/myoverview.ts b/src/addons/block/myoverview/components/myoverview/myoverview.ts
index 6bbe6b2a9..1d71653d0 100644
--- a/src/addons/block/myoverview/components/myoverview/myoverview.ts
+++ b/src/addons/block/myoverview/components/myoverview/myoverview.ts
@@ -16,8 +16,8 @@ import { Component, OnInit, Input, OnDestroy, ViewChild, OnChanges, SimpleChange
 import { IonSearchbar } from '@ionic/angular';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreTimeUtils } from '@services/utils/time';
-import { CoreSites } from '@services/sites';
-import { CoreCoursesProvider, CoreCourses } from '@features/courses/services/courses';
+import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
+import { CoreCoursesProvider, CoreCourses, CoreCoursesMyCoursesUpdatedEventData } from '@features/courses/services/courses';
 import { CoreCoursesHelper, CoreEnrolledCourseDataWithOptions } from '@features/courses/services/courses-helper';
 import { CoreCourseHelper, CorePrefetchStatusInfo } from '@features/course/services/course-helper';
 import { CoreCourseOptionsDelegate } from '@features/course/services/course-options-delegate';
@@ -162,7 +162,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
             CoreCoursesProvider.EVENT_MY_COURSES_UPDATED,
             (data) => {
 
-                if (data.action == CoreCoursesProvider.ACTION_ENROL || data.action == CoreCoursesProvider.ACTION_STATE_CHANGED) {
+                if (this.shouldRefreshOnUpdatedEvent(data)) {
                     this.refreshCourseList();
                 }
             },
@@ -224,16 +224,16 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
     }
 
     /**
-     * Fetch the courses for my overview.
-     *
-     * @return Promise resolved when done.
+     * @inheritdoc
      */
-    protected async fetchContent(): Promise<void> {
+    protected async fetchContent(refresh?: boolean): Promise<void> {
         const config = this.block.configsRecord;
 
         const showCategories = config?.displaycategories?.value == '1';
 
-        const courses = await CoreCoursesHelper.getUserCoursesWithOptions(this.sort, undefined, undefined, showCategories);
+        const courses = await CoreCoursesHelper.getUserCoursesWithOptions(this.sort, undefined, undefined, showCategories, {
+            readingStrategy: refresh ? CoreSitesReadingStrategy.PREFER_NETWORK : undefined,
+        });
 
         // Check to show sort by short name only if the text is visible.
         if (courses.length > 0) {
@@ -335,6 +335,41 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
         return showCondition ? (disabledCondition ? 'disabled' : 'show') : 'hidden';
     }
 
+    /**
+     * Whether list should be refreshed based on a EVENT_MY_COURSES_UPDATED event.
+     *
+     * @param data Event data.
+     * @return Whether to refresh.
+     */
+    protected shouldRefreshOnUpdatedEvent(data: CoreCoursesMyCoursesUpdatedEventData): boolean {
+        if (data.action == CoreCoursesProvider.ACTION_ENROL) {
+            // Always update if user enrolled in a course.
+            return true;
+        }
+
+        if (data.action == CoreCoursesProvider.ACTION_STATE_CHANGED) {
+            // Update list when course state changes (favourite, hidden).
+            return true;
+        }
+
+        if (data.action == CoreCoursesProvider.ACTION_VIEW && data.courseId != CoreSites.getCurrentSiteHomeId()) {
+            // User viewed a course. If it isn't the most recent accessed course, update the list.
+            let recentAccessedCourse: CoreEnrolledCourseDataWithOptions | undefined;
+            if (this.sort == 'lastaccess') {
+                recentAccessedCourse = this.courses.allincludinghidden[0];
+            } else {
+                recentAccessedCourse = Array.from(this.courses.allincludinghidden)
+                    .sort((a, b) => (b.lastaccess || 0) - (a.lastaccess || 0))[0];
+            }
+
+            if (recentAccessedCourse && data.courseId != recentAccessedCourse.id) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     /**
      * The filter has changed.
      *
@@ -403,12 +438,6 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
     protected async refreshCourseList(): Promise<void> {
         CoreEvents.trigger(CoreCoursesProvider.EVENT_MY_COURSES_REFRESHED);
 
-        try {
-            await CoreCourses.invalidateUserCourses();
-        } catch (error) {
-            // Ignore errors.
-        }
-
         await this.loadContent(true);
     }
 
diff --git a/src/core/features/courses/services/courses-helper.ts b/src/core/features/courses/services/courses-helper.ts
index 150bfb05a..89034e716 100644
--- a/src/core/features/courses/services/courses-helper.ts
+++ b/src/core/features/courses/services/courses-helper.ts
@@ -14,7 +14,7 @@
 
 import { Injectable } from '@angular/core';
 import { CoreUtils } from '@services/utils/utils';
-import { CoreSites } from '@services/sites';
+import { CoreSites, CoreSitesCommonWSOptions } from '@services/sites';
 import {
     CoreCourseAnyCourseDataWithOptions,
     CoreCourses,
@@ -216,9 +216,14 @@ export class CoreCoursesHelperProvider {
         slice: number = 0,
         filter?: string,
         loadCategoryNames: boolean = false,
+        options: CoreSitesCommonWSOptions = {},
     ): Promise<CoreEnrolledCourseDataWithOptions[]> {
 
-        let courses: CoreEnrolledCourseDataWithOptions[] = await CoreCourses.getUserCourses();
+        let courses: CoreEnrolledCourseDataWithOptions[] = await CoreCourses.getUserCourses(
+            false,
+            options.siteId,
+            options.readingStrategy,
+        );
         if (courses.length <= 0) {
             return [];
         }
@@ -227,7 +232,7 @@ export class CoreCoursesHelperProvider {
         const courseIds = courses.map((course) => course.id);
 
         // Load course options of the course.
-        promises.push(CoreCourses.getCoursesAdminAndNavOptions(courseIds).then((options) => {
+        promises.push(CoreCourses.getCoursesAdminAndNavOptions(courseIds, options.siteId).then((options) => {
             courses.forEach((course) => {
                 course.navOptions = options.navOptions[course.id];
                 course.admOptions = options.admOptions[course.id];
@@ -290,7 +295,7 @@ export class CoreCoursesHelperProvider {
             }
 
             try {
-                const completion = await AddonCourseCompletion.getCompletion(course.id);
+                const completion = await AddonCourseCompletion.getCompletion(course.id, undefined, undefined, options.siteId);
 
                 course.completed = completion?.completed;
             } catch {

From 84354cade7c240e17e1e241a2510d1850d765660 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 7 Oct 2021 08:58:05 +0200
Subject: [PATCH 0132/1008] MOBILE-3726 core: Display warning modal before open
 browser

---
 scripts/langindex.json                        |  2 ++
 .../pages/issued-badge/issued-badge.html      | 11 +++++--
 .../index/addon-mod-assign-index.html         |  2 +-
 .../addon-mod-assign-submission.html          |  2 +-
 .../index/addon-mod-book-index.html           |  2 +-
 .../index/addon-mod-chat-index.html           |  2 +-
 .../index/addon-mod-choice-index.html         |  2 +-
 .../index/addon-mod-data-index.html           |  2 +-
 .../index/addon-mod-feedback-index.html       |  2 +-
 .../index/addon-mod-folder-index.html         |  2 +-
 .../post-options-menu/post-options-menu.html  |  3 +-
 .../index/addon-mod-glossary-index.html       |  2 +-
 .../index/addon-mod-h5pactivity-index.html    |  2 +-
 .../index/addon-mod-imscp-index.html          |  2 +-
 .../index/addon-mod-lesson-index.html         |  2 +-
 .../components/index/addon-mod-lti-index.html |  2 +-
 src/addons/mod/lti/services/lti-helper.ts     |  2 +-
 .../index/addon-mod-page-index.html           |  2 +-
 .../index/addon-mod-quiz-index.html           |  5 +--
 src/addons/mod/quiz/pages/player/player.html  |  5 +--
 .../index/addon-mod-resource-index.html       |  2 +-
 .../mod/resource/components/index/index.ts    |  2 +-
 .../index/addon-mod-scorm-index.html          |  4 +--
 .../index/addon-mod-survey-index.html         |  2 +-
 .../components/index/addon-mod-url-index.html |  2 +-
 .../index/addon-mod-wiki-index.html           |  2 +-
 .../index/addon-mod-workshop-index.html       |  2 +-
 .../mod/workshop/components/index/index.ts    |  2 +-
 .../mod/workshop/components/phase/phase.ts    |  2 +-
 .../services/handlers/push-click.ts           |  9 +++--
 src/app/app.component.ts                      |  2 +-
 src/core/classes/site.ts                      | 29 +++++++++++-----
 .../context-menu/context-menu-item.ts         |  1 +
 .../core-context-menu-popover.html            |  3 +-
 src/core/constants.ts                         |  1 +
 src/core/directives/link.ts                   | 23 ++++++++-----
 .../core-course-unsupported-module.html       |  2 +-
 .../course/pages/preview/preview.html         |  3 +-
 .../courses/services/handlers/course-link.ts  |  2 +-
 .../pages/email-signup/email-signup.html      |  2 +-
 .../login/pages/email-signup/email-signup.ts  |  5 ++-
 .../features/login/services/login-helper.ts   |  4 +--
 .../settings/pages/licenses/licenses.html     |  4 +--
 src/core/features/user/pages/about/about.html |  9 ++---
 .../user/services/handlers/profile-mail.ts    |  2 +-
 src/core/lang.json                            |  2 ++
 src/core/services/sites.ts                    |  2 +-
 src/core/services/utils/dom.ts                | 24 ++++++++++----
 src/core/services/utils/utils.ts              | 19 ++++++++++-
 src/core/singletons/window.ts                 | 33 +++++++++++++++++--
 50 files changed, 177 insertions(+), 80 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 7c5324cd9..174a16271 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1578,6 +1578,7 @@
   "core.dismiss": "local_moodlemobileapp",
   "core.displayoptions": "atto_media",
   "core.done": "survey",
+  "core.dontshowagain": "local_moodlemobileapp",
   "core.download": "moodle",
   "core.downloaded": "local_moodlemobileapp",
   "core.downloadfile": "moodle",
@@ -2257,6 +2258,7 @@
   "core.viewembeddedcontent": "local_moodlemobileapp",
   "core.viewprofile": "moodle",
   "core.warningofflinedatadeleted": "local_moodlemobileapp",
+  "core.warnopeninbrowser": "local_moodlemobileapp",
   "core.whatisyourage": "moodle",
   "core.wheredoyoulive": "moodle",
   "core.whoissiteadmin": "local_moodlemobileapp",
diff --git a/src/addons/badges/pages/issued-badge/issued-badge.html b/src/addons/badges/pages/issued-badge/issued-badge.html
index cb131d0e3..0a80b561d 100644
--- a/src/addons/badges/pages/issued-badge/issued-badge.html
+++ b/src/addons/badges/pages/issued-badge/issued-badge.html
@@ -53,7 +53,9 @@
                 <ion-item class="ion-text-wrap" *ngIf="badge.issuercontact">
                     <ion-label>
                         <h2>{{ 'addon.badges.contact' | translate}}</h2>
-                        <p><a href="mailto:{{badge.issuercontact}}" core-link auto-login="no"> {{ badge.issuercontact }} </a></p>
+                        <p><a href="mailto:{{badge.issuercontact}}" core-link auto-login="no" [showBrowserWarning]="false">
+                            {{ badge.issuercontact }}
+                        </a></p>
                     </ion-label>
                 </ion-item>
             </ion-item-group>
@@ -97,7 +99,9 @@
                 <ion-item class="ion-text-wrap" *ngIf="badge.imageauthoremail">
                     <ion-label>
                         <h2>{{ 'addon.badges.imageauthoremail' | translate}}</h2>
-                        <p><a href="mailto:{{badge.imageauthoremail}}" core-link auto-login="no"> {{ badge.imageauthoremail }} </a></p>
+                        <p><a href="mailto:{{badge.imageauthoremail}}" core-link auto-login="no" [showBrowserWarning]="false">
+                            {{ badge.imageauthoremail }}
+                        </a></p>
                     </ion-label>
                 </ion-item>
                 <ion-item class="ion-text-wrap" *ngIf="badge.imageauthorurl">
@@ -165,7 +169,8 @@
                     <ion-label>
                         <h2>{{ 'addon.badges.issueremail' | translate}}</h2>
                         <p>
-                            <a href="mailto:{{badge.endorsement.issueremail}}" core-link auto-login="no">
+                            <a href="mailto:{{badge.endorsement.issueremail}}" core-link auto-login="no"
+                                [showBrowserWarning]="false">
                                 {{ badge.endorsement.issueremail }}
                             </a>
                         </p>
diff --git a/src/addons/mod/assign/components/index/addon-mod-assign-index.html b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
index 304f53c41..ef0cd7d5d 100644
--- a/src/addons/mod/assign/components/index/addon-mod-assign-index.html
+++ b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
@@ -2,7 +2,7 @@
 <core-navbar-buttons slot="end">
     <core-context-menu>
         <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt">
+            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="assign && (description || (assign.introattachments && assign.introattachments.length))"
             [priority]="800" [content]="'core.moduleintro' | translate" (action)="expandDescription()"
diff --git a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
index 2c6a40653..89d14abeb 100644
--- a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
+++ b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
@@ -353,7 +353,7 @@
                         <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
                         <ion-label>
                             <p>{{ 'addon.mod_assign.cannotgradefromapp' | translate }}</p>
-                            <ion-button expand="block" *ngIf="gradeUrl" [href]="gradeUrl" core-link >
+                            <ion-button expand="block" *ngIf="gradeUrl" [href]="gradeUrl" core-link [showBrowserWarning]="false">
                                 {{ 'core.openinbrowser' | translate }}
                                 <ion-icon name="fas-external-link-alt" slot="end" aria-hidden="true"></ion-icon>
                             </ion-button>
diff --git a/src/addons/mod/book/components/index/addon-mod-book-index.html b/src/addons/mod/book/components/index/addon-mod-book-index.html
index 27ce5e752..9a74d77b9 100644
--- a/src/addons/mod/book/components/index/addon-mod-book-index.html
+++ b/src/addons/mod/book/components/index/addon-mod-book-index.html
@@ -5,7 +5,7 @@
     </ion-button>
     <core-context-menu>
         <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt"></core-context-menu-item>
+            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false"></core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right"></core-context-menu-item>
         <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}"
diff --git a/src/addons/mod/chat/components/index/addon-mod-chat-index.html b/src/addons/mod/chat/components/index/addon-mod-chat-index.html
index 6e9094a0e..9d58151d0 100644
--- a/src/addons/mod/chat/components/index/addon-mod-chat-index.html
+++ b/src/addons/mod/chat/components/index/addon-mod-chat-index.html
@@ -2,7 +2,7 @@
 <core-navbar-buttons slot="end">
     <core-context-menu>
         <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt">
+            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right">
diff --git a/src/addons/mod/choice/components/index/addon-mod-choice-index.html b/src/addons/mod/choice/components/index/addon-mod-choice-index.html
index 05b8999d7..60a41827e 100644
--- a/src/addons/mod/choice/components/index/addon-mod-choice-index.html
+++ b/src/addons/mod/choice/components/index/addon-mod-choice-index.html
@@ -2,7 +2,7 @@
 <core-navbar-buttons slot="end">
     <core-context-menu>
         <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt">
+            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right">
diff --git a/src/addons/mod/data/components/index/addon-mod-data-index.html b/src/addons/mod/data/components/index/addon-mod-data-index.html
index b52b2562a..7f8633b5d 100644
--- a/src/addons/mod/data/components/index/addon-mod-data-index.html
+++ b/src/addons/mod/data/components/index/addon-mod-data-index.html
@@ -5,7 +5,7 @@
     </ion-button>
     <core-context-menu>
         <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt">
+            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right">
diff --git a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
index bd6f3fa27..124241f10 100644
--- a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
+++ b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
@@ -2,7 +2,7 @@
 <core-navbar-buttons slot="end">
     <core-context-menu>
         <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt">
+            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right">
diff --git a/src/addons/mod/folder/components/index/addon-mod-folder-index.html b/src/addons/mod/folder/components/index/addon-mod-folder-index.html
index e3b1799f4..4763418b3 100644
--- a/src/addons/mod/folder/components/index/addon-mod-folder-index.html
+++ b/src/addons/mod/folder/components/index/addon-mod-folder-index.html
@@ -2,7 +2,7 @@
 <core-navbar-buttons slot="end">
     <core-context-menu>
         <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt">>
+            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right">
diff --git a/src/addons/mod/forum/components/post-options-menu/post-options-menu.html b/src/addons/mod/forum/components/post-options-menu/post-options-menu.html
index 81d22d13e..e1fe50448 100644
--- a/src/addons/mod/forum/components/post-options-menu/post-options-menu.html
+++ b/src/addons/mod/forum/components/post-options-menu/post-options-menu.html
@@ -17,7 +17,8 @@
             <p  class="item-heading">{{ 'core.numwords' | translate: {'$a': wordCount} }}</p>
         </ion-label>
     </ion-item>
-    <ion-item class="ion-text-wrap" [href]="url" *ngIf="url" core-link capture="false" button detail="false">
+    <ion-item class="ion-text-wrap" [href]="url" *ngIf="url" core-link capture="false" button detail="false"
+        [showBrowserWarning]="false">
         <ion-icon name="fas-external-link-alt" slot="start" aria-hidden="true"></ion-icon>
         <ion-label>
             <p  class="item-heading">{{ 'core.openinbrowser' | translate }}</p>
diff --git a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
index 8b19195d1..02b9e0405 100644
--- a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
+++ b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
@@ -11,7 +11,7 @@
 
     <core-context-menu>
         <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt">
+            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right">
diff --git a/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html b/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
index f88b40b88..90158fa9a 100644
--- a/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
+++ b/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
@@ -10,7 +10,7 @@
             iconAction="stats-chart">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt">
+            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right">
diff --git a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
index 0397e0b29..05c5b3cff 100644
--- a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
+++ b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
@@ -5,7 +5,7 @@
     </ion-button>
     <core-context-menu>
         <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt">
+            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right">
diff --git a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
index 52ea9eed8..d8948ccbb 100644
--- a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
+++ b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
@@ -2,7 +2,7 @@
 <core-navbar-buttons slot="end">
     <core-context-menu>
         <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt">
+            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right">
diff --git a/src/addons/mod/lti/components/index/addon-mod-lti-index.html b/src/addons/mod/lti/components/index/addon-mod-lti-index.html
index 39bfcafab..c2756f087 100644
--- a/src/addons/mod/lti/components/index/addon-mod-lti-index.html
+++ b/src/addons/mod/lti/components/index/addon-mod-lti-index.html
@@ -2,7 +2,7 @@
 <core-navbar-buttons slot="end">
     <core-context-menu>
         <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt">
+            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right">
diff --git a/src/addons/mod/lti/services/lti-helper.ts b/src/addons/mod/lti/services/lti-helper.ts
index ae3d56fda..1dbf19578 100644
--- a/src/addons/mod/lti/services/lti-helper.ts
+++ b/src/addons/mod/lti/services/lti-helper.ts
@@ -74,7 +74,7 @@ export class AddonModLtiHelperProvider {
                     module,
                 };
 
-                return site.openInBrowserWithAutoLogin(module.url!);
+                return site.openInBrowserWithAutoLogin(module.url || '');
             }
 
             // Open in app.
diff --git a/src/addons/mod/page/components/index/addon-mod-page-index.html b/src/addons/mod/page/components/index/addon-mod-page-index.html
index 08b1cdd38..cce3a3faf 100644
--- a/src/addons/mod/page/components/index/addon-mod-page-index.html
+++ b/src/addons/mod/page/components/index/addon-mod-page-index.html
@@ -2,7 +2,7 @@
 <core-navbar-buttons slot="end">
     <core-context-menu>
         <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt">
+            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right">
diff --git a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
index 40a465a46..dabe2a7a9 100644
--- a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
+++ b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
@@ -2,7 +2,7 @@
 <core-navbar-buttons slot="end">
     <core-context-menu>
         <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt">
+            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right">
@@ -218,7 +218,8 @@
 
             <!-- Button to open in browser if it cannot be attempted in the app. -->
             <ion-button class="ion-margin" *ngIf="!buttonText && ((!hasSupportedQuestions && unsupportedQuestions.length) ||
-                unsupportedRules.length || behaviourSupported === false)" expand="block" [href]="externalUrl" core-link>
+                unsupportedRules.length || behaviourSupported === false)" expand="block" [href]="externalUrl" core-link
+                [showBrowserWarning]="false">
                 {{ 'core.openinbrowser' | translate }}
                 <ion-icon name="fas-external-link-alt" slot="end" aria-hidden="true"></ion-icon>
             </ion-button>
diff --git a/src/addons/mod/quiz/pages/player/player.html b/src/addons/mod/quiz/pages/player/player.html
index 31fb22135..bd8d40246 100644
--- a/src/addons/mod/quiz/pages/player/player.html
+++ b/src/addons/mod/quiz/pages/player/player.html
@@ -165,7 +165,8 @@
                 </ion-label>
             </ion-item>
 
-            <ion-button *ngIf="preventSubmitMessages.length" expand="block" [href]="moduleUrl" core-link>
+            <ion-button *ngIf="preventSubmitMessages.length" expand="block" [href]="moduleUrl" core-link
+                [showBrowserWarning]="false">
                 {{ 'core.openinbrowser' | translate }}
                 <ion-icon name="fas-external-link-alt" slot="end" aria-hidden="true"></ion-icon>
             </ion-button>
@@ -182,7 +183,7 @@
             <ion-item class="ion-text-wrap">
                 <ion-label>{{ 'addon.mod_quiz.errorparsequestions' | translate }}</ion-label>
             </ion-item>
-            <ion-button expand="block" class="ion-margin" [href]="moduleUrl" core-link>
+            <ion-button expand="block" class="ion-margin" [href]="moduleUrl" core-link [showBrowserWarning]="false">
                 {{ 'core.openinbrowser' | translate }}
                 <ion-icon name="fas-external-link-alt" slot="end" aria-hidden="true"></ion-icon>
             </ion-button>
diff --git a/src/addons/mod/resource/components/index/addon-mod-resource-index.html b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
index 411279e8b..fc449c7cf 100644
--- a/src/addons/mod/resource/components/index/addon-mod-resource-index.html
+++ b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
@@ -2,7 +2,7 @@
 <core-navbar-buttons slot="end">
     <core-context-menu>
         <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt"></core-context-menu-item>
+            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false"></core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right"></core-context-menu-item>
         <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}"
diff --git a/src/addons/mod/resource/components/index/index.ts b/src/addons/mod/resource/components/index/index.ts
index 5a0d8a430..a3a29b038 100644
--- a/src/addons/mod/resource/components/index/index.ts
+++ b/src/addons/mod/resource/components/index/index.ts
@@ -188,7 +188,7 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
         }
 
         // The resource cannot be downloaded, open the activity in browser.
-        await CoreSites.getCurrentSite()?.openInBrowserWithAutoLoginIfSameSite(this.module.url!);
+        await CoreSites.getCurrentSite()?.openInBrowserWithAutoLoginIfSameSite(this.module.url || '');
     }
 
     /**
diff --git a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
index fe53cf595..2990b1519 100644
--- a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
+++ b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
@@ -2,7 +2,7 @@
 <core-navbar-buttons slot="end">
     <core-context-menu>
         <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt">
+            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right">
@@ -185,7 +185,7 @@
                     <p class="text-danger">{{ errorMessage | translate }}</p>
                 </ion-label>
             </ion-item>
-            <ion-button class="ion-margin ion-text-wrap" expand="block" [href]="externalUrl" core-link>
+            <ion-button class="ion-margin ion-text-wrap" expand="block" [href]="externalUrl" core-link [showBrowserWarning]="false">
                 {{ 'core.openinbrowser' | translate }}
                 <ion-icon name="fas-external-link-alt" slot="end" aria-hidden="true"></ion-icon>
             </ion-button>
diff --git a/src/addons/mod/survey/components/index/addon-mod-survey-index.html b/src/addons/mod/survey/components/index/addon-mod-survey-index.html
index e17441410..80b973f89 100644
--- a/src/addons/mod/survey/components/index/addon-mod-survey-index.html
+++ b/src/addons/mod/survey/components/index/addon-mod-survey-index.html
@@ -2,7 +2,7 @@
 <core-navbar-buttons slot="end">
     <core-context-menu>
         <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt">
+            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right">
diff --git a/src/addons/mod/url/components/index/addon-mod-url-index.html b/src/addons/mod/url/components/index/addon-mod-url-index.html
index 7c13f1b46..722bdfafd 100644
--- a/src/addons/mod/url/components/index/addon-mod-url-index.html
+++ b/src/addons/mod/url/components/index/addon-mod-url-index.html
@@ -2,7 +2,7 @@
 <core-navbar-buttons slot="end">
     <core-context-menu>
         <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt"></core-context-menu-item>
+            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false"></core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right"></core-context-menu-item>
         <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}"
diff --git a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
index c28ec94d6..07a1a2638 100644
--- a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
+++ b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
@@ -14,7 +14,7 @@
 
     <core-context-menu>
         <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt">
+            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right">
diff --git a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
index 169ed21b4..d06955e61 100644
--- a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
+++ b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
@@ -2,7 +2,7 @@
 <core-navbar-buttons slot="end">
     <core-context-menu>
         <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt">
+            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right">
diff --git a/src/addons/mod/workshop/components/index/index.ts b/src/addons/mod/workshop/components/index/index.ts
index d47607361..ef11aedf7 100644
--- a/src/addons/mod/workshop/components/index/index.ts
+++ b/src/addons/mod/workshop/components/index/index.ts
@@ -355,7 +355,7 @@ export class AddonModWorkshopIndexComponent extends CoreCourseModuleMainActivity
      *
      * @param task Task to be done.
      */
-    runTask(task: AddonModWorkshopPhaseTaskData): void {
+    async runTask(task: AddonModWorkshopPhaseTaskData): Promise<void> {
         if (task.code == 'submit') {
             this.gotoSubmit();
         } else if (task.link) {
diff --git a/src/addons/mod/workshop/components/phase/phase.ts b/src/addons/mod/workshop/components/phase/phase.ts
index cc5285630..fb0030a84 100644
--- a/src/addons/mod/workshop/components/phase/phase.ts
+++ b/src/addons/mod/workshop/components/phase/phase.ts
@@ -57,7 +57,7 @@ export class AddonModWorkshopPhaseInfoComponent implements OnInit {
      *
      * @param task Task to be done.
      */
-    runTask(task: AddonModWorkshopPhaseTaskData): void {
+    async runTask(task: AddonModWorkshopPhaseTaskData): Promise<void> {
         if (task.code == 'submit') {
             // This will close the modal and go to the submit.
             ModalController.dismiss(true);
diff --git a/src/addons/notifications/services/handlers/push-click.ts b/src/addons/notifications/services/handlers/push-click.ts
index 1a4457874..c935f1ba6 100644
--- a/src/addons/notifications/services/handlers/push-click.ts
+++ b/src/addons/notifications/services/handlers/push-click.ts
@@ -104,17 +104,20 @@ export class AddonNotificationsPushClickHandlerService implements CorePushNotifi
                 case 'browser':
                     return CoreUtils.openInBrowser(url);
 
-                default:
-                    if (CoreContentLinksHelper.handleLink(url, undefined, undefined, true)) {
+                default: {
+                    const treated = await CoreContentLinksHelper.handleLink(url, undefined, undefined, true);
+                    if (treated) {
                         // Link treated, stop.
                         return;
                     }
+                }
             }
         }
 
         // No appurl or cannot be handled by the app. Try to handle the contexturl now.
         if (notification.contexturl) {
-            if (CoreContentLinksHelper.handleLink(notification.contexturl)) {
+            const treated = await CoreContentLinksHelper.handleLink(notification.contexturl);
+            if (treated) {
                 // Link treated, stop.
                 return;
             }
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 038345fff..23cf1f6c5 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -125,7 +125,7 @@ export class AppComponent implements OnInit, AfterViewInit {
                 const urlScheme = CoreUrlUtils.getUrlProtocol(url);
                 if (urlScheme && urlScheme !== 'file' && urlScheme !== 'cdvfile') {
                     // Open in browser should launch the right app if found and do nothing if not found.
-                    CoreUtils.openInBrowser(url);
+                    CoreUtils.openInBrowser(url, { showBrowserWarning: false });
 
                     // At this point the InAppBrowser is showing a "Webpage not available" error message.
                     // Try to navigate to last loaded URL so this error message isn't found.
diff --git a/src/core/classes/site.ts b/src/core/classes/site.ts
index e11c0d587..b22ad2110 100644
--- a/src/core/classes/site.ts
+++ b/src/core/classes/site.ts
@@ -32,7 +32,7 @@ import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreTimeUtils } from '@services/utils/time';
 import { CoreUrlUtils, CoreUrlParams } from '@services/utils/url';
-import { CoreUtils, PromiseDefer } from '@services/utils/utils';
+import { CoreUtils, CoreUtilsOpenInBrowserOptions, PromiseDefer } from '@services/utils/utils';
 import { CoreConstants } from '@/core/constants';
 import { SQLiteDB } from '@classes/sqlitedb';
 import { CoreError } from '@classes/errors/error';
@@ -1381,10 +1381,15 @@ export class CoreSite {
      *
      * @param url The URL to open.
      * @param alertMessage If defined, an alert will be shown before opening the browser.
+     * @param options Other options.
      * @return Promise resolved when done, rejected otherwise.
      */
-    async openInBrowserWithAutoLogin(url: string, alertMessage?: string): Promise<void> {
-        await this.openWithAutoLogin(false, url, undefined, alertMessage);
+    async openInBrowserWithAutoLogin(
+        url: string,
+        alertMessage?: string,
+        options: CoreUtilsOpenInBrowserOptions = {},
+    ): Promise<void> {
+        await this.openWithAutoLogin(false, url, options, alertMessage);
     }
 
     /**
@@ -1392,10 +1397,15 @@ export class CoreSite {
      *
      * @param url The URL to open.
      * @param alertMessage If defined, an alert will be shown before opening the browser.
+     * @param options Other options.
      * @return Promise resolved when done, rejected otherwise.
      */
-    async openInBrowserWithAutoLoginIfSameSite(url: string, alertMessage?: string): Promise<void> {
-        await this.openWithAutoLoginIfSameSite(false, url, undefined, alertMessage);
+    async openInBrowserWithAutoLoginIfSameSite(
+        url: string,
+        alertMessage?: string,
+        options: CoreUtilsOpenInBrowserOptions = {},
+    ): Promise<void> {
+        await this.openWithAutoLoginIfSameSite(false, url, options, alertMessage);
     }
 
     /**
@@ -1442,7 +1452,7 @@ export class CoreSite {
     async openWithAutoLogin(
         inApp: boolean,
         url: string,
-        options?: InAppBrowserOptions,
+        options: InAppBrowserOptions & CoreUtilsOpenInBrowserOptions = {},
         alertMessage?: string,
     ): Promise<InAppBrowserObject | void> {
         // Get the URL to open.
@@ -1458,13 +1468,14 @@ export class CoreSite {
             );
 
             await alert.onDidDismiss();
+            options.showBrowserWarning = false; // A warning already shown, no need to show another.
         }
 
         // Open the URL.
         if (inApp) {
             return CoreUtils.openInApp(url, options);
         } else {
-            return CoreUtils.openInBrowser(url);
+            return CoreUtils.openInBrowser(url, options);
         }
     }
 
@@ -1480,7 +1491,7 @@ export class CoreSite {
     async openWithAutoLoginIfSameSite(
         inApp: boolean,
         url: string,
-        options?: InAppBrowserOptions,
+        options: InAppBrowserOptions & CoreUtilsOpenInBrowserOptions = {},
         alertMessage?: string,
     ): Promise<InAppBrowserObject | void> {
         if (this.containsUrl(url)) {
@@ -1489,7 +1500,7 @@ export class CoreSite {
             if (inApp) {
                 return Promise.resolve(CoreUtils.openInApp(url, options));
             } else {
-                CoreUtils.openInBrowser(url);
+                CoreUtils.openInBrowser(url, options);
             }
         }
     }
diff --git a/src/core/components/context-menu/context-menu-item.ts b/src/core/components/context-menu/context-menu-item.ts
index 4c104231d..fd1c2fc33 100644
--- a/src/core/components/context-menu/context-menu-item.ts
+++ b/src/core/components/context-menu/context-menu-item.ts
@@ -51,6 +51,7 @@ export class CoreContextMenuItemComponent implements OnInit, OnDestroy, OnChange
     @Input() badgeClass?: number; // A class to set in the badge.
     @Input() badgeA11yText?: string; // Description for the badge, if needed.
     @Input() hidden?: boolean; // Whether the item should be hidden.
+    @Input() showBrowserWarning = true; // Whether to show a warning before opening browser (for links). Defaults to true.
     @Output() action?: EventEmitter<() => void>; // Will emit an event when the item clicked.
     @Output() onClosed?: EventEmitter<() => void>; // Will emit an event when the popover is closed because the item was clicked.
 
diff --git a/src/core/components/context-menu/core-context-menu-popover.html b/src/core/components/context-menu/core-context-menu-popover.html
index b52365b81..1c23ddabf 100644
--- a/src/core/components/context-menu/core-context-menu-popover.html
+++ b/src/core/components/context-menu/core-context-menu-popover.html
@@ -4,7 +4,8 @@
     </ion-list-header>
     <ion-item class="ion-text-wrap" *ngFor="let item of items" core-link [capture]="item.captureLink" [autoLogin]="item.autoLogin"
         [href]="item.href" (click)="itemClicked($event, item)" [attr.aria-label]="item.ariaAction" [hidden]="item.hidden"
-        [detail]="(item.href && !item.iconAction) || null" role="menuitem" [button]="(item.href && !item.iconAction)">
+        [detail]="(item.href && !item.iconAction) || null" role="menuitem" [button]="(item.href && !item.iconAction)"
+        [showBrowserWarning]="item.showBrowserWarning">
         <ion-icon *ngIf="item.iconDescription" [name]="item.iconDescription" aria-hidden="true" slot="start">
         </ion-icon>
         <ion-label>
diff --git a/src/core/constants.ts b/src/core/constants.ts
index 37a8b370f..6df64e291 100644
--- a/src/core/constants.ts
+++ b/src/core/constants.ts
@@ -63,6 +63,7 @@ export class CoreConstants {
     static readonly SETTINGS_ZOOM_LEVEL = 'CoreSettingsZoomLevel';
     static readonly SETTINGS_COLOR_SCHEME = 'CoreSettingsColorScheme';
     static readonly SETTINGS_ANALYTICS_ENABLED = 'CoreSettingsAnalyticsEnabled';
+    static readonly SETTINGS_DONT_SHOW_EXTERNAL_LINK_WARN = 'CoreSettingsDontShowExtLinkWarn';
 
     // WS constants.
     static readonly WS_TIMEOUT = 30000; // Timeout when not in WiFi.
diff --git a/src/core/directives/link.ts b/src/core/directives/link.ts
index 472b28a83..9687868e2 100644
--- a/src/core/directives/link.ts
+++ b/src/core/directives/link.ts
@@ -43,6 +43,7 @@ export class CoreLinkDirective implements OnInit {
        "no" -> Never auto-login.
        "check" -> Auto-login only if it points to the current site. Default value. */
     @Input() autoLogin = 'check';
+    @Input() showBrowserWarning = true; // Whether to show a warning before opening browser. Defaults to true.
 
     protected element: Element;
 
@@ -199,33 +200,35 @@ export class CoreLinkDirective implements OnInit {
             if (this.inApp) {
                 CoreUtils.openInApp(href);
             } else {
-                CoreUtils.openInBrowser(href);
+                CoreUtils.openInBrowser(href, { showBrowserWarning: this.showBrowserWarning });
             }
 
             return;
         }
 
+        const currentSite = CoreSites.getRequiredCurrentSite();
+
         // Check if URL does not have any protocol, so it's a relative URL.
         if (!CoreUrlUtils.isAbsoluteURL(href)) {
             // Add the site URL at the begining.
             if (href.charAt(0) == '/') {
-                href = CoreSites.getCurrentSite()!.getURL() + href;
+                href = currentSite.getURL() + href;
             } else {
-                href = CoreSites.getCurrentSite()!.getURL() + '/' + href;
+                href = currentSite.getURL() + '/' + href;
             }
         }
 
         if (this.autoLogin == 'yes') {
             if (this.inApp) {
-                await CoreSites.getCurrentSite()!.openInAppWithAutoLogin(href);
+                await currentSite.openInAppWithAutoLogin(href);
             } else {
-                await CoreSites.getCurrentSite()!.openInBrowserWithAutoLogin(href);
+                await currentSite.openInBrowserWithAutoLogin(href, undefined, { showBrowserWarning: this.showBrowserWarning });
             }
         } else if (this.autoLogin == 'no') {
             if (this.inApp) {
                 CoreUtils.openInApp(href);
             } else {
-                CoreUtils.openInBrowser(href);
+                CoreUtils.openInBrowser(href, { showBrowserWarning: this.showBrowserWarning });
             }
         } else {
             // Priority order is: core-link inApp attribute > forceOpenLinksIn setting > data-open-in HTML attribute.
@@ -239,9 +242,13 @@ export class CoreLinkDirective implements OnInit {
             }
 
             if (openInApp) {
-                await CoreSites.getCurrentSite()!.openInAppWithAutoLoginIfSameSite(href);
+                await currentSite.openInAppWithAutoLoginIfSameSite(href);
             } else {
-                await CoreSites.getCurrentSite()!.openInBrowserWithAutoLoginIfSameSite(href);
+                await currentSite.openInBrowserWithAutoLoginIfSameSite(
+                    href,
+                    undefined,
+                    { showBrowserWarning: this.showBrowserWarning },
+                );
             }
         }
     }
diff --git a/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html b/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html
index d9d9a6b4e..10fb79074 100644
--- a/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html
+++ b/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html
@@ -17,7 +17,7 @@
 
     <div *ngIf="module && module.url">
         <p><strong>{{ 'core.course.useactivityonbrowser' | translate }}</strong></p>
-        <ion-button expand="block" [href]="module.url" core-link>
+        <ion-button expand="block" [href]="module.url" core-link [showBrowserWarning]="false">
             {{ 'core.openinbrowser' | translate }}
             <ion-icon name="fas-external-link-alt" slot="end" aria-hidden="true"></ion-icon>
         </ion-button>
diff --git a/src/core/features/course/pages/preview/preview.html b/src/core/features/course/pages/preview/preview.html
index 7a0e9317e..a69893d67 100644
--- a/src/core/features/course/pages/preview/preview.html
+++ b/src/core/features/course/pages/preview/preview.html
@@ -123,7 +123,8 @@
                 <ion-icon name="fas-briefcase" slot="start" aria-hidden="true"></ion-icon>
                 <ion-label><h2>{{ 'core.course.contents' | translate }}</h2></ion-label>
             </ion-item>
-            <ion-item [href]="courseUrl" core-link [attr.aria-label]="course.fullname" button detail="false">
+            <ion-item [href]="courseUrl" core-link [attr.aria-label]="course.fullname" button detail="false"
+                [showBrowserWarning]="false">
                 <ion-icon name="fas-external-link-alt" slot="start" aria-hidden="true"></ion-icon>
                 <ion-label><h2>{{ 'core.openinbrowser' | translate }}</h2></ion-label>
             </ion-item>
diff --git a/src/core/features/courses/services/handlers/course-link.ts b/src/core/features/courses/services/handlers/course-link.ts
index 9498eb7c2..018e11d6c 100644
--- a/src/core/features/courses/services/handlers/course-link.ts
+++ b/src/core/features/courses/services/handlers/course-link.ts
@@ -222,7 +222,7 @@ export class CoreCoursesCourseLinkHandlerService extends CoreContentLinksHandler
                 try {
                     await CoreDomUtils.showConfirm(body);
 
-                    CoreSites.getCurrentSite()?.openInBrowserWithAutoLogin(url);
+                    CoreSites.getCurrentSite()?.openInBrowserWithAutoLogin(url, undefined, { showBrowserWarning: false });
                 } catch {
                     // User cancelled.
                 };
diff --git a/src/core/features/login/pages/email-signup/email-signup.html b/src/core/features/login/pages/email-signup/email-signup.html
index 928bdbce5..e630caba2 100644
--- a/src/core/features/login/pages/email-signup/email-signup.html
+++ b/src/core/features/login/pages/email-signup/email-signup.html
@@ -28,7 +28,7 @@
                     {{ 'core.login.signuprequiredfieldnotsupported' | translate }}
                 </ion-label>
             </ion-item>
-            <ion-button expand="block" class="ion-margin" [href]="signupUrl" core-link autoLogin="no">
+            <ion-button expand="block" class="ion-margin" [href]="signupUrl" core-link autoLogin="no" [showBrowserWarning]="false">
                 {{ 'core.openinbrowser' | translate }}
             </ion-button>
         </ion-list>
diff --git a/src/core/features/login/pages/email-signup/email-signup.ts b/src/core/features/login/pages/email-signup/email-signup.ts
index 6e3c673ce..02812cc92 100644
--- a/src/core/features/login/pages/email-signup/email-signup.ts
+++ b/src/core/features/login/pages/email-signup/email-signup.ts
@@ -384,7 +384,10 @@ export class CoreLoginEmailSignupPage implements OnInit {
      * Show contact information on site (we have to display again the age verification form).
      */
     showContactOnSite(): void {
-        CoreUtils.openInBrowser(CoreTextUtils.concatenatePaths(this.siteUrl, '/login/verify_age_location.php'));
+        CoreUtils.openInBrowser(
+            CoreTextUtils.concatenatePaths(this.siteUrl, '/login/verify_age_location.php'),
+            { showBrowserWarning: false },
+        );
     }
 
     /**
diff --git a/src/core/features/login/services/login-helper.ts b/src/core/features/login/services/login-helper.ts
index 8f9780fc3..d41c0b742 100644
--- a/src/core/features/login/services/login-helper.ts
+++ b/src/core/features/login/services/login-helper.ts
@@ -660,7 +660,7 @@ export class CoreLoginHelperProvider {
         });
 
         // Always open it in browser because the user might have the session stored in there.
-        CoreUtils.openInBrowser(loginUrl);
+        CoreUtils.openInBrowser(loginUrl, { showBrowserWarning: false });
         CoreApp.closeApp();
 
         return true;
@@ -692,7 +692,7 @@ export class CoreLoginHelperProvider {
                 closebuttoncaption: Translate.instant('core.login.cancel'),
             });
         } else {
-            CoreUtils.openInBrowser(loginUrl);
+            CoreUtils.openInBrowser(loginUrl, { showBrowserWarning: false });
             CoreApp.closeApp();
         }
     }
diff --git a/src/core/features/settings/pages/licenses/licenses.html b/src/core/features/settings/pages/licenses/licenses.html
index 174475380..25ae4a491 100644
--- a/src/core/features/settings/pages/licenses/licenses.html
+++ b/src/core/features/settings/pages/licenses/licenses.html
@@ -30,8 +30,8 @@
                         </p>
                         <p>{{ 'core.settings.license' | translate }}{{ 'core.labelsep' | translate }} {{ license.licenses }}</p>
                         <p><a *ngIf="license.url" [href]="license.url" core-link auto-login="no">{{ license.url }}</a></p>
-                        <p><a *ngIf="license.email" [href]="'mailto:' + license.email" core-link
-                                auto-login="no">{{ license.email }}</a></p>
+                        <p><a *ngIf="license.email" [href]="'mailto:' + license.email" core-link auto-login="no"
+                            [showBrowserWarning]="false">{{ license.email }}</a></p>
                     </ion-label>
                     <ion-button *ngIf="license.licenseUrl" [href]="license.licenseUrl" target="_blank"
                         fill="clear" slot="end" core-link auto-login="no">{{ 'core.view' | translate }}</ion-button>
diff --git a/src/core/features/user/pages/about/about.html b/src/core/features/user/pages/about/about.html
index 2e21f945a..fb08137f1 100644
--- a/src/core/features/user/pages/about/about.html
+++ b/src/core/features/user/pages/about/about.html
@@ -17,7 +17,8 @@
                 <ion-item class="ion-text-wrap" *ngIf="user.email">
                     <ion-label>
                         <h2>{{ 'core.user.email' | translate }}</h2>
-                        <p><a class="core-anchor" href="mailto:{{user.email}}" core-link auto-login="no">
+                        <p><a class="core-anchor" href="mailto:{{user.email}}" core-link auto-login="no"
+                                [showBrowserWarning]="false">
                             {{ user.email }}
                         </a></p>
                     </ion-label>
@@ -25,7 +26,7 @@
                 <ion-item class="ion-text-wrap" *ngIf="user.phone1">
                     <ion-label>
                         <h2>{{ 'core.user.phone1' | translate}}</h2>
-                        <p><a class="core-anchor" href="tel:{{user.phone1}}" core-link auto-login="no">
+                        <p><a class="core-anchor" href="tel:{{user.phone1}}" core-link auto-login="no" [showBrowserWarning]="false">
                             {{ user.phone1 }}
                         </a></p>
                     </ion-label>
@@ -33,7 +34,7 @@
                 <ion-item class="ion-text-wrap" *ngIf="user.phone2">
                     <ion-label>
                         <h2>{{ 'core.user.phone2' | translate}}</h2>
-                        <p><a class="core-anchor" href="tel:{{user.phone2}}" core-link auto-login="no">
+                        <p><a class="core-anchor" href="tel:{{user.phone2}}" core-link auto-login="no" [showBrowserWarning]="false">
                             {{ user.phone2 }}
                         </a></p>
                     </ion-label>
@@ -41,7 +42,7 @@
                 <ion-item class="ion-text-wrap" *ngIf="formattedAddress">
                     <ion-label>
                         <h2>{{ 'core.user.address' | translate}}</h2>
-                        <p><a class="core-anchor" [href]="encodedAddress" core-link auto-login="no">
+                        <p><a class="core-anchor" [href]="encodedAddress" core-link auto-login="no" [showBrowserWarning]="false">
                             {{ formattedAddress }}
                         </a></p>
                     </ion-label>
diff --git a/src/core/features/user/services/handlers/profile-mail.ts b/src/core/features/user/services/handlers/profile-mail.ts
index d2c243643..0ba0d60e9 100644
--- a/src/core/features/user/services/handlers/profile-mail.ts
+++ b/src/core/features/user/services/handlers/profile-mail.ts
@@ -56,7 +56,7 @@ export class CoreUserProfileMailHandlerService implements CoreUserProfileHandler
                 event.preventDefault();
                 event.stopPropagation();
 
-                CoreUtils.openInBrowser('mailto:' + user.email);
+                CoreUtils.openInBrowser('mailto:' + user.email, { showBrowserWarning: false });
             },
         };
     }
diff --git a/src/core/lang.json b/src/core/lang.json
index 1da713f7f..dff3a1052 100644
--- a/src/core/lang.json
+++ b/src/core/lang.json
@@ -86,6 +86,7 @@
     "dismiss": "Dismiss",
     "displayoptions": "Display options",
     "done": "Done",
+    "dontshowagain": "Don't show again.",
     "download": "Download",
     "downloaded": "Downloaded",
     "downloadfile": "Download file",
@@ -327,6 +328,7 @@
     "viewembeddedcontent": "View embedded content",
     "viewprofile": "View profile",
     "warningofflinedatadeleted": "Offline data from {{component}} '{{name}}' has been deleted. {{error}}",
+    "warnopeninbrowser": "<p>You are about to leave the app to open the following URL in your device's browser. Do you want to continue?</p>\n<p><b>{{url}}</b></p>",
     "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.",
diff --git a/src/core/services/sites.ts b/src/core/services/sites.ts
index 291d3ca5e..fd3d4c85b 100644
--- a/src/core/services/sites.ts
+++ b/src/core/services/sites.ts
@@ -731,7 +731,7 @@ export class CoreSitesProvider {
                     Translate.instant('core.updaterequired'),
                     Translate.instant('core.download'),
                     Translate.instant(siteId ? 'core.mainmenu.logout' : 'core.cancel'),
-                ).then(() => CoreUtils.openInBrowser(downloadUrl)).catch(() => {
+                ).then(() => CoreUtils.openInBrowser(downloadUrl, { showBrowserWarning: false })).catch(() => {
                     // Do nothing.
                 });
             } else {
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index 17048560b..093e072a9 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -1440,7 +1440,7 @@ export class CoreDomUtilsProvider {
             buttons.push({
                 text: Translate.instant('core.download'),
                 handler: (): void => {
-                    CoreUtils.openInBrowser(link);
+                    CoreUtils.openInBrowser(link, { showBrowserWarning: false });
                 },
             });
         }
@@ -1465,28 +1465,32 @@ export class CoreDomUtilsProvider {
      *
      * @param message Modal message.
      * @param header Modal header.
-     * @param placeholder Placeholder of the input element. By default, "Password".
+     * @param placeholderOrLabel Placeholder (for textual/numeric inputs) or label (for radio/checkbox). By default, "Password".
      * @param type Type of the input element. By default, password.
      * @param options More options to pass to the alert.
-     * @return Promise resolved with the input data if the user clicks OK, rejected if cancels.
+     * @return Promise resolved with the input data (true for checkbox/radio) if the user clicks OK, rejected if cancels.
      */
     showPrompt(
         message: string,
         header?: string,
-        placeholder?: string,
+        placeholderOrLabel?: string,
         type: TextFieldTypes | 'checkbox' | 'radio' | 'textarea' = 'password',
     ): Promise<any> { // eslint-disable-line @typescript-eslint/no-explicit-any
         return new Promise((resolve, reject) => {
-            placeholder = placeholder ?? Translate.instant('core.login.password');
+            placeholderOrLabel = placeholderOrLabel ?? Translate.instant('core.login.password');
 
+            const isCheckbox = type === 'checkbox';
+            const isRadio = type === 'radio';
             const options: AlertOptions = {
                 header,
                 message,
                 inputs: [
                     {
                         name: 'promptinput',
-                        placeholder: placeholder,
+                        placeholder: placeholderOrLabel,
+                        label: placeholderOrLabel,
                         type,
+                        value: (isCheckbox || isRadio) ? true : undefined,
                     },
                 ],
                 buttons: [
@@ -1500,7 +1504,13 @@ export class CoreDomUtilsProvider {
                     {
                         text: Translate.instant('core.ok'),
                         handler: (data) => {
-                            resolve(data.promptinput);
+                            if (isCheckbox) {
+                                resolve(data[0]);
+                            } else if (isRadio) {
+                                resolve(data);
+                            } else {
+                                resolve(data.promptinput);
+                            }
                         },
                     },
                 ],
diff --git a/src/core/services/utils/utils.ts b/src/core/services/utils/utils.ts
index b654777f7..6d06cbf3d 100644
--- a/src/core/services/utils/utils.ts
+++ b/src/core/services/utils/utils.ts
@@ -32,6 +32,7 @@ import { CoreViewerQRScannerComponent } from '@features/viewer/components/qr-sca
 import { CoreCanceledError } from '@classes/errors/cancelederror';
 import { CoreFileEntry } from '@services/file-helper';
 import { CoreConstants } from '@/core/constants';
+import { CoreWindow } from '@singletons/window';
 
 type TreeNode<T> = T & { children: TreeNode<T>[] };
 
@@ -1047,8 +1048,17 @@ export class CoreUtilsProvider {
      * Do not use for files, refer to {@link openFile}.
      *
      * @param url The URL to open.
+     * @param options Options.
      */
-    openInBrowser(url: string): void {
+    async openInBrowser(url: string, options: CoreUtilsOpenInBrowserOptions = {}): Promise<void> {
+        if (options.showBrowserWarning || options.showBrowserWarning === undefined) {
+            try {
+                await CoreWindow.confirmOpenBrowserIfNeeded(url);
+            } catch (error) {
+                return; // Cancelled, stop.
+            }
+        }
+
         window.open(url, '_system');
     }
 
@@ -1727,6 +1737,13 @@ export type CoreUtilsOpenFileOptions = {
     iOSOpenFileAction?: OpenFileAction; // Action to do when opening a file.
 };
 
+/**
+ * Options for opening in browser.
+ */
+export type CoreUtilsOpenInBrowserOptions = {
+    showBrowserWarning?: boolean; // Whether to display a warning before opening in browser. Defaults to true.
+};
+
 /**
  * Possible default picker actions.
  */
diff --git a/src/core/singletons/window.ts b/src/core/singletons/window.ts
index 2eee46bf7..5463c7521 100644
--- a/src/core/singletons/window.ts
+++ b/src/core/singletons/window.ts
@@ -14,11 +14,15 @@
 
 import { CoreContentLinksHelper } from '@features/contentlinks/services/contentlinks-helper';
 import { NavController } from '@ionic/angular';
+import { CoreConfig } from '@services/config';
 
 import { CoreFileHelper } from '@services/file-helper';
 import { CoreSites } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUrlUtils } from '@services/utils/url';
 import { CoreUtils } from '@services/utils/utils';
+import { Translate } from '@singletons';
+import { CoreConstants } from '../constants';
 
 /**
  * Options for the open function.
@@ -44,6 +48,31 @@ export class CoreWindow {
         // Nothing to do.
     }
 
+    /**
+     * Show a confirm before opening a link in browser, unless the user previously marked to not show again.
+     *
+     * @param url URL to open.
+     * @return Promise resolved if confirmed, rejected if rejected.
+     */
+    static async confirmOpenBrowserIfNeeded(url: string): Promise<void> {
+        // Check if the user decided not to see the warning.
+        const dontShowWarning = await CoreConfig.get(CoreConstants.SETTINGS_DONT_SHOW_EXTERNAL_LINK_WARN, 0);
+        if (dontShowWarning) {
+            return;
+        }
+
+        const dontShowAgain = await CoreDomUtils.showPrompt(
+            Translate.instant('core.warnopeninbrowser', { url }),
+            undefined,
+            Translate.instant('core.dontshowagain'),
+            'checkbox',
+        );
+
+        if (dontShowAgain) {
+            CoreConfig.set(CoreConstants.SETTINGS_DONT_SHOW_EXTERNAL_LINK_WARN, 1);
+        }
+    }
+
     /**
      * "Safe" implementation of window.open. It will open the URL without overriding the app.
      *
@@ -73,12 +102,12 @@ export class CoreWindow {
             }
 
             if (!treated) {
-                // Not opened in the app, open with browser. Check if we need to auto-login
+                // Not opened in the app, open with browser. Check if we need to auto-login.
                 if (!CoreSites.isLoggedIn()) {
                     // Not logged in, cannot auto-login.
                     CoreUtils.openInBrowser(url);
                 } else {
-                    await CoreSites.getCurrentSite()!.openInBrowserWithAutoLoginIfSameSite(url);
+                    await CoreSites.getRequiredCurrentSite().openInBrowserWithAutoLoginIfSameSite(url);
                 }
             }
         }

From d8cc67eab1f138d52196f2ff835a56e28db88a3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 29 Sep 2021 09:14:48 +0200
Subject: [PATCH 0133/1008] MOBILE-3103 iframe: Add fullscreen button on
 iframes header toolbar

---
 scripts/langindex.json                        |  2 +
 src/addons/mod/scorm/pages/player/player.html |  4 +-
 src/addons/mod/scorm/pages/player/player.ts   | 48 ++++++-----------
 src/core/components/iframe/core-iframe.html   |  9 ++++
 src/core/components/iframe/iframe.scss        | 11 ++++
 src/core/components/iframe/iframe.ts          | 51 ++++++++++++++++---
 src/core/lang.json                            |  2 +
 src/theme/theme.base.scss                     | 40 +++++++++++++++
 src/theme/theme.light.scss                    |  5 ++
 9 files changed, 132 insertions(+), 40 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 7c5324cd9..054a60d65 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1574,6 +1574,7 @@
   "core.dftimedate": "local_moodlemobileapp",
   "core.digitalminor": "moodle",
   "core.digitalminor_desc": "moodle",
+  "core.disablefullscreen": "h5p",
   "core.discard": "local_moodlemobileapp",
   "core.dismiss": "local_moodlemobileapp",
   "core.displayoptions": "atto_media",
@@ -1657,6 +1658,7 @@
   "core.forcepasswordchangenotice": "moodle",
   "core.fulllistofcourses": "moodle",
   "core.fullnameandsitename": "local_moodlemobileapp",
+  "core.fullscreen": "h5p",
   "core.grades.aggregatemean": "grades",
   "core.grades.aggregatesum": "grades",
   "core.grades.average": "grades",
diff --git a/src/addons/mod/scorm/pages/player/player.html b/src/addons/mod/scorm/pages/player/player.html
index 5bf9e6959..a2074e95b 100644
--- a/src/addons/mod/scorm/pages/player/player.html
+++ b/src/addons/mod/scorm/pages/player/player.html
@@ -21,7 +21,9 @@
     <core-loading [hideUntil]="loaded" class="core-loading-fullheight">
         <core-navigation-bar [previous]="previousSco" [next]="nextSco" (action)="loadSco($event)"></core-navigation-bar>
 
-        <core-iframe *ngIf="loaded && src" [src]="src" [iframeWidth]="scormWidth" [iframeHeight]="scormHeight"></core-iframe>
+        <core-iframe *ngIf="loaded && src" [src]="src" [iframeWidth]="scormWidth" [iframeHeight]="scormHeight"
+            [showFullscreenOnToolbar]="true">
+        </core-iframe>
 
         <p *ngIf="!src && errorMessage">{{ errorMessage | translate }}</p>
     </core-loading>
diff --git a/src/addons/mod/scorm/pages/player/player.ts b/src/addons/mod/scorm/pages/player/player.ts
index 74bf853c9..ad6555c82 100644
--- a/src/addons/mod/scorm/pages/player/player.ts
+++ b/src/addons/mod/scorm/pages/player/player.ts
@@ -66,7 +66,7 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
     protected moduleUrl!: string; // Module URL.
     protected newAttempt = false; // Whether to start a new attempt.
     protected organizationId?: string; // Organization ID to load.
-    protected attempt?: number; // The attempt number.
+    protected attempt = 0; // The attempt number.
     protected offline = false; // Whether it's offline mode.
     protected userData?: AddonModScormUserDataMap; // User data.
     protected initialScoId?: number; // Initial SCO ID to load.
@@ -96,7 +96,7 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
             this.newAttempt = !!CoreNavigator.getRouteBooleanParam('newAttempt');
             this.organizationId = CoreNavigator.getRouteParam('organizationId');
             this.initialScoId = CoreNavigator.getRouteNumberParam('scoId');
-            this.siteId = CoreSites.getCurrentSiteId();
+            this.siteId = CoreSites.getRequiredCurrentSite().getId();
         } catch (error) {
             CoreDomUtils.showErrorModal(error);
 
@@ -150,14 +150,12 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
         this.showToc = AddonModScorm.displayTocInPlayer(this.scorm);
 
         if (this.scorm.popup) {
-            this.mainMenuPage.changeVisibility(false);
-
             // If we receive a value > 100 we assume it's a fixed pixel size.
-            if (this.scorm.width! > 100) {
+            if (this.scorm.width && this.scorm.width > 100) {
                 this.scormWidth = this.scorm.width;
 
                 // Only get fixed size on height if width is also fixed.
-                if (this.scorm.height! > 100) {
+                if (this.scorm.height && this.scorm.height > 100) {
                     this.scormHeight = this.scorm.height;
                 }
             }
@@ -198,7 +196,7 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
             // Wait a bit to prevent collisions between this store and SCORM API's store.
             setTimeout(async () => {
                 try {
-                    AddonModScormHelper.convertAttemptToOffline(this.scorm, this.attempt!);
+                    AddonModScormHelper.convertAttemptToOffline(this.scorm, this.attempt);
                 } catch (error) {
                     CoreDomUtils.instance.showErrorModalDefault(error, 'core.error', true);
                 }
@@ -292,7 +290,7 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
             await this.determineAttemptAndMode(attemptsData);
 
             const [data, accessInfo] = await Promise.all([
-                AddonModScorm.getScormUserData(this.scorm.id, this.attempt!, {
+                AddonModScorm.getScormUserData(this.scorm.id, this.attempt, {
                     cmId: this.cmId,
                     offline: this.offline,
                 }),
@@ -319,13 +317,13 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
 
         try {
             // We need to check incomplete again: attempt number or status might have changed.
-            this.incomplete = await AddonModScorm.isAttemptIncomplete(this.scorm.id, this.attempt!, {
+            this.incomplete = await AddonModScorm.isAttemptIncomplete(this.scorm.id, this.attempt, {
                 offline: this.offline,
                 cmId: this.cmId,
             });
 
             // Get TOC.
-            this.toc = await AddonModScormHelper.getToc(this.scorm.id, this.attempt!, this.incomplete, {
+            this.toc = await AddonModScormHelper.getToc(this.scorm.id, this.attempt, this.incomplete, {
                 organization: this.organizationId,
                 offline: this.offline,
                 cmId: this.cmId,
@@ -351,7 +349,7 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
             }
 
             // No SCO defined. Get the first valid one.
-            const sco = await AddonModScormHelper.getFirstSco(this.scorm.id, this.attempt!, {
+            const sco = await AddonModScormHelper.getFirstSco(this.scorm.id, this.attempt, {
                 toc: this.toc,
                 organization: this.organizationId,
                 mode: this.mode,
@@ -383,7 +381,7 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
                 this.siteId,
                 this.scorm,
                 sco.id,
-                this.attempt!,
+                this.attempt,
                 this.userData!,
                 this.mode,
                 this.offline,
@@ -446,14 +444,14 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
         }];
 
         try {
-            AddonModScorm.saveTracks(sco.id, this.attempt!, tracks, this.scorm, this.offline);
+            AddonModScorm.saveTracks(sco.id, this.attempt, tracks, this.scorm, this.offline);
         } catch {
             // Error saving data. Go offline if needed.
             if (this.offline) {
                 return;
             }
 
-            const data = await AddonModScorm.getScormUserData(this.scorm.id, this.attempt!, {
+            const data = await AddonModScorm.getScormUserData(this.scorm.id, this.attempt, {
                 cmId: this.cmId,
             });
 
@@ -464,12 +462,12 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
 
             try {
                 // Go offline.
-                await AddonModScormHelper.convertAttemptToOffline(this.scorm, this.attempt!);
+                await AddonModScormHelper.convertAttemptToOffline(this.scorm, this.attempt);
 
                 this.offline = true;
                 this.dataModel?.setOffline(true);
 
-                await AddonModScorm.saveTracks(sco.id, this.attempt!, tracks, this.scorm, true);
+                await AddonModScorm.saveTracks(sco.id, this.attempt, tracks, this.scorm, true);
             } catch (error) {
                 CoreDomUtils.instance.showErrorModalDefault(error, 'core.error', true);
             }
@@ -528,7 +526,7 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
             value: String(CoreTimeUtils.timestamp()),
         }];
 
-        await AddonModScorm.saveTracks(scoId, this.attempt!, tracks, this.scorm, this.offline);
+        await AddonModScorm.saveTracks(scoId, this.attempt, tracks, this.scorm, this.offline);
 
         if (this.offline) {
             return;
@@ -541,22 +539,6 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
         }));
     }
 
-    /**
-     * @inheritdoc
-     */
-    ionViewDidEnter(): void {
-        if (this.scorm && this.scorm.popup) {
-            this.mainMenuPage.changeVisibility(false);
-        }
-    }
-
-    /**
-     * @inheritdoc
-     */
-    ionViewWillLeave(): void {
-        this.mainMenuPage.changeVisibility(true);
-    }
-
     /**
      * Component being destroyed.
      */
diff --git a/src/core/components/iframe/core-iframe.html b/src/core/components/iframe/core-iframe.html
index ca6c2ecce..a3dbdfae0 100644
--- a/src/core/components/iframe/core-iframe.html
+++ b/src/core/components/iframe/core-iframe.html
@@ -1,4 +1,13 @@
 <div [class.core-loading-container]="loading || !safeUrl" [ngStyle]="{'width': iframeWidth, 'height': iframeHeight}">
+
+    <core-navbar-buttons slot="end" append *ngIf="initialized && showFullscreenOnToolbar">
+        <ion-button fill="clear" (click)="toggleFullscreen()"
+            [attr.aria-label]="(fullscreen ? 'core.disablefullscreen' : 'core.fullscreen') | translate" >
+            <ion-icon *ngIf="!fullscreen" name="fas-expand" slot="icon-only" aria-hidden="true"></ion-icon>
+            <ion-icon *ngIf="fullscreen" name="fas-compress" slot="icon-only" aria-hidden="true"></ion-icon>
+        </ion-button>
+    </core-navbar-buttons>
+    
     <!-- Don't add the iframe until safeUrl is set, adding an iframe with null as src causes the iframe to load the whole app. -->
     <iframe #iframe *ngIf="safeUrl" [hidden]="loading" class="core-iframe"
         [ngStyle]="{'width': iframeWidth, 'height': iframeHeight}" [src]="safeUrl"
diff --git a/src/core/components/iframe/iframe.scss b/src/core/components/iframe/iframe.scss
index d50e6d82e..a0707c17e 100644
--- a/src/core/components/iframe/iframe.scss
+++ b/src/core/components/iframe/iframe.scss
@@ -30,3 +30,14 @@
         }
     }
 }
+
+:host-context(.core-iframe-fullscreen) {
+    position: absolute;
+    top: 0px;
+    bottom: 0px;
+    left: 0px;
+    right: 0px;
+    width: 100%;
+    height: 100%;
+    z-index: 9999;
+}
diff --git a/src/core/components/iframe/iframe.ts b/src/core/components/iframe/iframe.ts
index 48ee9a60c..4d733438b 100644
--- a/src/core/components/iframe/iframe.ts
+++ b/src/core/components/iframe/iframe.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import {
-    Component, Input, Output, ViewChild, ElementRef, EventEmitter, OnChanges, SimpleChange,
+    Component, Input, Output, ViewChild, ElementRef, EventEmitter, OnChanges, SimpleChange, OnDestroy,
 } from '@angular/core';
 import { SafeResourceUrl } from '@angular/platform-browser';
 
@@ -22,7 +22,6 @@ import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUrlUtils } from '@services/utils/url';
 import { CoreIframeUtils } from '@services/utils/iframe';
 import { CoreUtils } from '@services/utils/utils';
-import { CoreLogger } from '@singletons/logger';
 import { DomSanitizer } from '@singletons';
 
 @Component({
@@ -30,7 +29,7 @@ import { DomSanitizer } from '@singletons';
     templateUrl: 'core-iframe.html',
     styleUrls: ['iframe.scss'],
 })
-export class CoreIframeComponent implements OnChanges {
+export class CoreIframeComponent implements OnChanges, OnDestroy {
 
     static loadingTimeout = 15000;
 
@@ -39,17 +38,19 @@ export class CoreIframeComponent implements OnChanges {
     @Input() iframeWidth?: string;
     @Input() iframeHeight?: string;
     @Input() allowFullscreen?: boolean | string;
+    @Input() showFullscreenOnToolbar?: boolean | string;
     @Output() loaded: EventEmitter<HTMLIFrameElement> = new EventEmitter<HTMLIFrameElement>();
 
     loading?: boolean;
     safeUrl?: SafeResourceUrl;
     displayHelp = false;
+    fullscreen = false;
 
-    protected logger: CoreLogger;
-    protected initialized = false;
+    initialized = false;
+
+    protected style?: HTMLStyleElement;
 
     constructor() {
-        this.logger = CoreLogger.getInstance('CoreIframe');
         this.loaded = new EventEmitter<HTMLIFrameElement>();
     }
 
@@ -71,6 +72,16 @@ export class CoreIframeComponent implements OnChanges {
         this.iframeWidth = (this.iframeWidth && CoreDomUtils.formatPixelsSize(this.iframeWidth)) || '100%';
         this.iframeHeight = (this.iframeHeight && CoreDomUtils.formatPixelsSize(this.iframeHeight)) || '100%';
         this.allowFullscreen = CoreUtils.isTrueOrOne(this.allowFullscreen);
+        this.showFullscreenOnToolbar = CoreUtils.isTrueOrOne(this.showFullscreenOnToolbar);
+
+        if (this.showFullscreenOnToolbar) {
+            const shadow =
+                iframe.closest('.ion-page')?.querySelector('ion-header ion-toolbar')?.shadowRoot;
+            if (shadow) {
+                this.style = document.createElement('style');
+                shadow.appendChild(this.style);
+            }
+        }
 
         // Show loading only with external URLs.
         this.loading = !this.src || !CoreUrlUtils.isLocalFileUrl(this.src);
@@ -120,4 +131,32 @@ export class CoreIframeComponent implements OnChanges {
         CoreIframeUtils.openIframeHelpModal();
     }
 
+    /**
+     * @inheritdoc
+     */
+    ngOnDestroy(): void {
+        this.toggleFullscreen(false);
+    }
+
+    /**
+     * Toggle fullscreen mode.
+     */
+    toggleFullscreen(enable?: boolean): void {
+        if (enable !== undefined) {
+            this.fullscreen = enable;
+        } else {
+            this.fullscreen = !this.fullscreen;
+        }
+
+        if (this.style) {
+            // Done this way because of the shadow DOM.
+            this.style.textContent = this.fullscreen
+                ? '@media screen and (orientation: landscape) {\
+                    .toolbar-container { flex-direction: column-reverse !important; height: 100%; } }'
+                : '';
+        }
+
+        document.body.classList.toggle('core-iframe-fullscreen', this.fullscreen);
+    }
+
 }
diff --git a/src/core/lang.json b/src/core/lang.json
index 1da713f7f..1cea0b7f9 100644
--- a/src/core/lang.json
+++ b/src/core/lang.json
@@ -82,6 +82,7 @@
     "dftimedate": "h[:]mm A",
     "digitalminor": "Digital minor",
     "digitalminor_desc": "Please ask your parent/guardian to contact:",
+    "disablefullscreen": "Disable fullscreen",
     "discard": "Discard",
     "dismiss": "Dismiss",
     "displayoptions": "Display options",
@@ -122,6 +123,7 @@
     "forcepasswordchangenotice": "You must change your password to proceed.",
     "fulllistofcourses": "All courses",
     "fullnameandsitename": "{{fullname}} ({{sitename}})",
+    "fullscreen": "Fullscreen",
     "group": "Group",
     "groupsseparate": "Separate groups",
     "groupsvisible": "Visible groups",
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 0253a989c..769c945c3 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -384,6 +384,46 @@ ion-toolbar {
     }
 }
 
+// Iframe fullscreen manage.
+// Using router outlet to avoid changing styles on modals.
+body.core-iframe-fullscreen ion-router-outlet {
+
+    ion-tab-bar.mainmenu-tabs {
+        display: none;
+    }
+
+    --core-header-toolbar-height: 48px;
+    --core-header-toolbar-color: white;
+    --core-header-toolbar-background: black;
+    --core-header-toolbar-border-width: 0;
+
+    ion-header ion-toolbar {
+        h1, ion-back-button {
+            display: none;
+        }
+    }
+
+    @media screen and (orientation: landscape) {
+        // Place ion-header on the side and hide text
+        .ion-page {
+            flex-direction: row-reverse;
+            ion-header {
+                width: var(--core-header-toolbar-height);
+
+                ion-toolbar {
+                    height: 100%;
+                    --padding-start: 0;
+                    --padding-end: 0;
+                }
+
+                ion-buttons {
+                    flex-direction: column-reverse;
+                }
+            }
+        }
+    }
+}
+
 // Modals.
 .core-modal-fullscreen .modal-wrapper {
     position: absolute;
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 5c4114512..460d611ca 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -236,6 +236,11 @@
         --color: var(--subdued-text-color);
     }
 
+    ion-back-button {
+        --min-height: var(--a11y-min-target-size);
+        --min-width: var(--a11y-min-target-size);
+    }
+
     --core-combobox-background: var(--ion-item-background);
     --core-combobox-color: var(--black);
     --core-combobox-border-color: var(--primary);

From a4f780b7b8acdb0612fdb4e3849275680ab591c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 4 Oct 2021 16:40:06 +0200
Subject: [PATCH 0134/1008] MOBILE-3103 iframe: Manage orientation on iframes
 fullscreen

---
 package-lock.json                             | 22 +++---------
 package.json                                  |  4 +--
 src/addons/mod/scorm/pages/player/player.html |  2 +-
 src/app/app.component.ts                      |  1 -
 src/core/components/iframe/iframe.ts          | 20 +++++++++--
 ...een-viewport.ts => watch-screen-status.ts} |  2 ++
 src/core/services/screen.ts                   | 35 +++++++++++++++++++
 src/core/singletons/events.ts                 |  9 +++++
 8 files changed, 70 insertions(+), 25 deletions(-)
 rename src/core/initializers/{watch-screen-viewport.ts => watch-screen-status.ts} (95%)

diff --git a/package-lock.json b/package-lock.json
index e781ced49..1310a5e2e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -77,7 +77,6 @@
         "cordova-plugin-media-capture": "^3.0.3",
         "cordova-plugin-network-information": "^2.0.2",
         "cordova-plugin-prevent-override": "^1.0.0",
-        "cordova-plugin-screen-orientation": "^3.0.2",
         "cordova-plugin-splashscreen": "^6.0.0",
         "cordova-plugin-statusbar": "^2.4.3",
         "cordova-plugin-whitelist": "^1.3.4",
@@ -11201,18 +11200,6 @@
         }
       }
     },
-    "node_modules/cordova-plugin-screen-orientation": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-screen-orientation/-/cordova-plugin-screen-orientation-3.0.2.tgz",
-      "integrity": "sha512-2w6CMC+HGvbhogJetalwGurL2Fx8DQCCPy3wlSZHN1/W7WoQ5n9ujVozcoKrY4VaagK6bxrPFih+ElkO8Uqfzg==",
-      "engines": {
-        "cordovaDependencies": {
-          "4.0.0": {
-            "cordova": ">100"
-          }
-        }
-      }
-    },
     "node_modules/cordova-plugin-splashscreen": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/cordova-plugin-splashscreen/-/cordova-plugin-splashscreen-6.0.0.tgz",
@@ -12799,6 +12786,7 @@
       "version": "0.1.13",
       "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
       "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
+      "devOptional": true,
       "dependencies": {
         "iconv-lite": "^0.6.2"
       }
@@ -12807,6 +12795,7 @@
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz",
       "integrity": "sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==",
+      "devOptional": true,
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
       },
@@ -39888,11 +39877,6 @@
       "resolved": "https://registry.npmjs.org/cordova-plugin-prevent-override/-/cordova-plugin-prevent-override-1.0.0.tgz",
       "integrity": "sha512-/+3q5r4K5RahCpiYVmZQBjq10x4jj+6CMjYtZyx9jdMWeV+yFE+ItFcO1NeUAEWd2iHC5YPD0P2tHiHx5kscsw=="
     },
-    "cordova-plugin-screen-orientation": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-screen-orientation/-/cordova-plugin-screen-orientation-3.0.2.tgz",
-      "integrity": "sha512-2w6CMC+HGvbhogJetalwGurL2Fx8DQCCPy3wlSZHN1/W7WoQ5n9ujVozcoKrY4VaagK6bxrPFih+ElkO8Uqfzg=="
-    },
     "cordova-plugin-splashscreen": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/cordova-plugin-splashscreen/-/cordova-plugin-splashscreen-6.0.0.tgz",
@@ -41147,6 +41131,7 @@
       "version": "0.1.13",
       "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
       "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
+      "devOptional": true,
       "requires": {
         "iconv-lite": "^0.6.2"
       },
@@ -41155,6 +41140,7 @@
           "version": "0.6.2",
           "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz",
           "integrity": "sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==",
+          "devOptional": true,
           "requires": {
             "safer-buffer": ">= 2.1.2 < 3.0.0"
           }
diff --git a/package.json b/package.json
index cc8e30643..bff141856 100644
--- a/package.json
+++ b/package.json
@@ -106,7 +106,6 @@
     "cordova-plugin-media-capture": "^3.0.3",
     "cordova-plugin-network-information": "^2.0.2",
     "cordova-plugin-prevent-override": "^1.0.0",
-    "cordova-plugin-screen-orientation": "^3.0.2",
     "cordova-plugin-splashscreen": "^6.0.0",
     "cordova-plugin-statusbar": "^2.4.3",
     "cordova-plugin-whitelist": "^1.3.4",
@@ -217,7 +216,6 @@
       },
       "cordova-plugin-network-information": {},
       "@moodlehq/cordova-plugin-qrscanner": {},
-      "cordova-plugin-screen-orientation": {},
       "cordova-plugin-splashscreen": {},
       "cordova-plugin-statusbar": {},
       "cordova-plugin-whitelist": {},
@@ -247,4 +245,4 @@
   "optionalDependencies": {
     "keytar": "^7.2.0"
   }
-}
+}
\ No newline at end of file
diff --git a/src/addons/mod/scorm/pages/player/player.html b/src/addons/mod/scorm/pages/player/player.html
index a2074e95b..02e55ff42 100644
--- a/src/addons/mod/scorm/pages/player/player.html
+++ b/src/addons/mod/scorm/pages/player/player.html
@@ -22,7 +22,7 @@
         <core-navigation-bar [previous]="previousSco" [next]="nextSco" (action)="loadSco($event)"></core-navigation-bar>
 
         <core-iframe *ngIf="loaded && src" [src]="src" [iframeWidth]="scormWidth" [iframeHeight]="scormHeight"
-            [showFullscreenOnToolbar]="true">
+            [showFullscreenOnToolbar]="true" [autoFullscreenOnRotate]="true">
         </core-iframe>
 
         <p *ngIf="!src && errorMessage">{{ errorMessage | translate }}</p>
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 038345fff..4701e426f 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -63,7 +63,6 @@ export class AppComponent implements OnInit, AfterViewInit {
      * - IAB events listening.
      * - Platform pause/resume subscriptions.
      * - handleOpenURL and openWindowSafely.
-     * - Screen orientation events (probably it can be removed).
      * - Back button registering to close modal first.
      * - Note: HideKeyboardFormAccessoryBar has been moved to config.xml.
      */
diff --git a/src/core/components/iframe/iframe.ts b/src/core/components/iframe/iframe.ts
index 4d733438b..bf57b1443 100644
--- a/src/core/components/iframe/iframe.ts
+++ b/src/core/components/iframe/iframe.ts
@@ -22,7 +22,9 @@ import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUrlUtils } from '@services/utils/url';
 import { CoreIframeUtils } from '@services/utils/iframe';
 import { CoreUtils } from '@services/utils/utils';
-import { DomSanitizer } from '@singletons';
+import { DomSanitizer, StatusBar } from '@singletons';
+import { CoreEventObserver, CoreEvents } from '@singletons/events';
+import { CoreScreen, CoreScreenOrientation } from '@services/screen';
 
 @Component({
     selector: 'core-iframe',
@@ -39,6 +41,7 @@ export class CoreIframeComponent implements OnChanges, OnDestroy {
     @Input() iframeHeight?: string;
     @Input() allowFullscreen?: boolean | string;
     @Input() showFullscreenOnToolbar?: boolean | string;
+    @Input() autoFullscreenOnRotate?: boolean | string;
     @Output() loaded: EventEmitter<HTMLIFrameElement> = new EventEmitter<HTMLIFrameElement>();
 
     loading?: boolean;
@@ -49,6 +52,7 @@ export class CoreIframeComponent implements OnChanges, OnDestroy {
     initialized = false;
 
     protected style?: HTMLStyleElement;
+    protected orientationObs?: CoreEventObserver;
 
     constructor() {
         this.loaded = new EventEmitter<HTMLIFrameElement>();
@@ -73,14 +77,23 @@ export class CoreIframeComponent implements OnChanges, OnDestroy {
         this.iframeHeight = (this.iframeHeight && CoreDomUtils.formatPixelsSize(this.iframeHeight)) || '100%';
         this.allowFullscreen = CoreUtils.isTrueOrOne(this.allowFullscreen);
         this.showFullscreenOnToolbar = CoreUtils.isTrueOrOne(this.showFullscreenOnToolbar);
+        this.autoFullscreenOnRotate = CoreUtils.isTrueOrOne(this.autoFullscreenOnRotate);
 
-        if (this.showFullscreenOnToolbar) {
+        if (this.showFullscreenOnToolbar || this.autoFullscreenOnRotate) {
             const shadow =
                 iframe.closest('.ion-page')?.querySelector('ion-header ion-toolbar')?.shadowRoot;
             if (shadow) {
                 this.style = document.createElement('style');
                 shadow.appendChild(this.style);
             }
+
+            if (this.autoFullscreenOnRotate) {
+                this.toggleFullscreen(CoreScreen.isLandscape);
+
+                this.orientationObs = CoreEvents.on(CoreEvents.ORIENTATION_CHANGE, (data) => {
+                    this.toggleFullscreen(data.orientation == CoreScreenOrientation.LANDSCAPE);
+                });
+            }
         }
 
         // Show loading only with external URLs.
@@ -136,6 +149,7 @@ export class CoreIframeComponent implements OnChanges, OnDestroy {
      */
     ngOnDestroy(): void {
         this.toggleFullscreen(false);
+        this.orientationObs?.off();
     }
 
     /**
@@ -148,6 +162,8 @@ export class CoreIframeComponent implements OnChanges, OnDestroy {
             this.fullscreen = !this.fullscreen;
         }
 
+        this.fullscreen ? StatusBar.hide() : StatusBar.show();
+
         if (this.style) {
             // Done this way because of the shadow DOM.
             this.style.textContent = this.fullscreen
diff --git a/src/core/initializers/watch-screen-viewport.ts b/src/core/initializers/watch-screen-status.ts
similarity index 95%
rename from src/core/initializers/watch-screen-viewport.ts
rename to src/core/initializers/watch-screen-status.ts
index 23e1210b0..ee4d5fcf1 100644
--- a/src/core/initializers/watch-screen-viewport.ts
+++ b/src/core/initializers/watch-screen-status.ts
@@ -16,4 +16,6 @@ import { CoreScreen } from '@services/screen';
 
 export default function(): void {
     CoreScreen.watchViewport();
+
+    CoreScreen.watchOrientation();
 }
diff --git a/src/core/services/screen.ts b/src/core/services/screen.ts
index b53dcbcb7..6228f7700 100644
--- a/src/core/services/screen.ts
+++ b/src/core/services/screen.ts
@@ -17,6 +17,7 @@ import { BehaviorSubject, Observable } from 'rxjs';
 import { distinctUntilChanged, map } from 'rxjs/operators';
 
 import { makeSingleton } from '@singletons';
+import { CoreEvents } from '@singletons/events';
 
 /**
  * Screen breakpoints.
@@ -48,6 +49,14 @@ export enum CoreScreenLayout {
     TABLET = 'tablet',
 }
 
+/**
+ * Screen orientation.
+ */
+export enum CoreScreenOrientation {
+    LANDSCAPE = 'landscape',
+    PORTRAIT = 'portrait',
+}
+
 /**
  * Manage application screen.
  */
@@ -93,6 +102,32 @@ export class CoreScreenService {
         return this.layout === CoreScreenLayout.TABLET;
     }
 
+    get orientation(): CoreScreenOrientation {
+        const mql = window.matchMedia('(orientation: portrait)');
+
+        return mql.matches ? CoreScreenOrientation.PORTRAIT : CoreScreenOrientation.LANDSCAPE;
+    }
+
+    get isPortrait(): boolean {
+        return this.orientation === CoreScreenOrientation.PORTRAIT;
+    }
+
+    get isLandscape(): boolean {
+        return this.orientation === CoreScreenOrientation.LANDSCAPE;
+    }
+
+    /**
+     * Watch orientation changes.
+     */
+    watchOrientation(): void {
+        // Listen media orientation CSS queries.
+        window.matchMedia('(orientation: portrait)').addEventListener('change', (m) => {
+            const orientation = m.matches ? CoreScreenOrientation.PORTRAIT : CoreScreenOrientation.LANDSCAPE;
+
+            CoreEvents.trigger(CoreEvents.ORIENTATION_CHANGE, { orientation });
+        });
+    }
+
     /**
      * Watch viewport changes.
      */
diff --git a/src/core/singletons/events.ts b/src/core/singletons/events.ts
index 0c622f77b..49aa650a5 100644
--- a/src/core/singletons/events.ts
+++ b/src/core/singletons/events.ts
@@ -19,6 +19,7 @@ import { CoreSite, CoreSiteInfoResponse, CoreSitePublicConfigResponse } from '@c
 import { CoreFilepoolComponentFileEventData } from '@services/filepool';
 import { CoreNavigationOptions } from '@services/navigator';
 import { CoreCourseModuleCompletionData } from '@features/course/services/course-helper';
+import { CoreScreenOrientation } from '@services/screen';
 
 /**
  * Observer instance to stop listening to an event.
@@ -55,6 +56,7 @@ export interface CoreEventsData {
     [CoreEvents.COMPONENT_FILE_ACTION]: CoreFilepoolComponentFileEventData;
     [CoreEvents.FILE_SHARED]: CoreEventFileSharedData;
     [CoreEvents.APP_LAUNCHED_URL]: CoreEventAppLaunchedData;
+    [CoreEvents.ORIENTATION_CHANGE]: CoreEventOrientationData;
 }
 
 /*
@@ -387,3 +389,10 @@ export type CoreEventFileSharedData = {
 export type CoreEventAppLaunchedData = {
     url: string;
 };
+
+/**
+ * Data passed to ORIENTATION_CHANGE event.
+ */
+export type CoreEventOrientationData = {
+    orientation: CoreScreenOrientation;
+};

From 492627d326d83dd20027433c173a91e2edd1e11c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 6 Oct 2021 12:40:55 +0200
Subject: [PATCH 0135/1008] MOBILE-3103 style: Fix 0 set css vars

---
 .../recentlyaccesseditems.scss                |  2 +-
 src/addons/mod/data/data-forms.scss           |  2 +-
 .../attempt-results/attempt-results.scss      |  2 +-
 src/core/components/loading/loading.scss      |  4 ++--
 .../module-completion-legacy.scss             |  8 +++----
 .../course/components/module/module.scss      |  2 +-
 .../components/search-box/search-box.scss     |  4 ++--
 src/theme/components/discussion.scss          |  4 ++--
 src/theme/theme.base.scss                     | 24 ++++++++++++-------
 src/theme/theme.light.scss                    |  2 +-
 10 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.scss b/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.scss
index 06802f880..8a8e396ba 100644
--- a/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.scss
+++ b/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.scss
@@ -6,7 +6,7 @@
     }
 
     .core-course-module-handler {
-        --inner-border-width: 0;
+        --inner-border-width: 0px;
     }
     core-loading {
         --loading-inline-min-height: 102px;
diff --git a/src/addons/mod/data/data-forms.scss b/src/addons/mod/data/data-forms.scss
index 2834bfc25..17b000650 100644
--- a/src/addons/mod/data/data-forms.scss
+++ b/src/addons/mod/data/data-forms.scss
@@ -4,7 +4,7 @@
 :host {
     --input-border-color: var(--gray);
     --input-border-width: 1px;
-    --select-border-width: 0;
+    --select-border-width: 0px;
 
     ::ng-deep {
         table {
diff --git a/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.scss b/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.scss
index e2cfa01c3..006127a5b 100644
--- a/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.scss
+++ b/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.scss
@@ -2,7 +2,7 @@
 
 :host {
     .core-warning-item {
-        --inner-border-width: 0;
+        --inner-border-width: 0px;
     }
 
     .addon-mod_h5pactivity-attempt-result-summary {
diff --git a/src/core/components/loading/loading.scss b/src/core/components/loading/loading.scss
index 60b6358fc..41f2f3742 100644
--- a/src/core/components/loading/loading.scss
+++ b/src/core/components/loading/loading.scss
@@ -5,7 +5,7 @@
     --loading-background-inline: var(--ion-background-color-rgb);
     --loading-spinner: var(--ion-color-primary);
     --loading-text-color: var(--ion-text-color);
-    --loading-inline-margin: 0;
+    --loading-inline-margin: 0px;
     --loading-inline-min-height: 28px;
     --internal-loading-inline-min-height: var(--loading-inline-min-height);
 
@@ -19,7 +19,7 @@
     }
 
     &.core-loading-loaded {
-        --internal-loading-inline-min-height: 0;
+        --internal-loading-inline-min-height: 0px;
     }
 
     ion-spinner {
diff --git a/src/core/features/course/components/module-completion-legacy/module-completion-legacy.scss b/src/core/features/course/components/module-completion-legacy/module-completion-legacy.scss
index a0fd0020d..0eedd0acf 100644
--- a/src/core/features/course/components/module-completion-legacy/module-completion-legacy.scss
+++ b/src/core/features/course/components/module-completion-legacy/module-completion-legacy.scss
@@ -12,9 +12,9 @@
     }
 
     ion-button {
-        --padding-top: 0;
-        --padding-start: 0;
-        --padding-end: 0;
-        --padding-bottom: 0;
+        --padding-top: 0px;
+        --padding-start: 0px;
+        --padding-end: 0px;
+        --padding-bottom: 0px;
     }
 }
diff --git a/src/core/features/course/components/module/module.scss b/src/core/features/course/components/module/module.scss
index 666c11512..aaeaa86a3 100644
--- a/src/core/features/course/components/module/module.scss
+++ b/src/core/features/course/components/module/module.scss
@@ -56,7 +56,7 @@
     }
 
     .core-module-main-item.has-module-info {
-        --inner-border-width: 0;
+        --inner-border-width: 0px;
     }
 
     .core-module-module-info ion-label {
diff --git a/src/core/features/search/components/search-box/search-box.scss b/src/core/features/search/components/search-box/search-box.scss
index 2501ff47a..e3d84473a 100644
--- a/src/core/features/search/components/search-box/search-box.scss
+++ b/src/core/features/search/components/search-box/search-box.scss
@@ -32,8 +32,8 @@
     }
 
     ion-input {
-        --padding-start: 0;
-        --padding-end: 0;
+        --padding-start: 0px;
+        --padding-end: 0px;
         padding-left: 0;
         padding-right: 0;
     }
diff --git a/src/theme/components/discussion.scss b/src/theme/components/discussion.scss
index 66f450ba9..bf359a84b 100644
--- a/src/theme/components/discussion.scss
+++ b/src/theme/components/discussion.scss
@@ -39,8 +39,8 @@
         overflow: visible;
 
         &::part(native) {
-            --inner-border-width: 0;
-            --inner-padding-end: 0;
+            --inner-border-width: 0px;
+            --inner-padding-end: 0px;
             padding: 0;
             margin: 0;
         }
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 769c945c3..86eb108f3 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -375,6 +375,9 @@ ion-list.list-md {
 }
 
 // Header.
+ion-header {
+    z-index: 12; // To hide ion-slides on scroll.
+}
 ion-tabs.hide-header ion-header {
     display: none;
 }
@@ -395,7 +398,7 @@ body.core-iframe-fullscreen ion-router-outlet {
     --core-header-toolbar-height: 48px;
     --core-header-toolbar-color: white;
     --core-header-toolbar-background: black;
-    --core-header-toolbar-border-width: 0;
+    --core-header-toolbar-border-width: 0px;
 
     ion-header ion-toolbar {
         h1, ion-back-button {
@@ -412,8 +415,8 @@ body.core-iframe-fullscreen ion-router-outlet {
 
                 ion-toolbar {
                     height: 100%;
-                    --padding-start: 0;
-                    --padding-end: 0;
+                    --padding-start: 0px;
+                    --padding-end: 0px;
                 }
 
                 ion-buttons {
@@ -474,9 +477,7 @@ body.core-iframe-fullscreen ion-router-outlet {
 // Item styles
 [aria-current="page"],
 .item.item-current {
-    // TODO: Add safe area to border and RTL
-    --ion-safe-area-left: calc(-1 * var(--selected-item-border-width));
-    border-inline-start: var(--selected-item-border-width) solid var(--selected-item-color);
+    @include safe-area-border-start(var(--selected-item-border-width), solid,  var(--selected-item-color));
 }
 
 .item.item-file {
@@ -507,7 +508,7 @@ body.core-iframe-fullscreen ion-router-outlet {
         border-bottom: 3px solid var(--color-base);
 
         ion-item {
-            --inner-border-width: 0;
+            --inner-border-width: 0px;
         }
         ion-label {
             white-space: normal !important;
@@ -522,7 +523,7 @@ body.core-iframe-fullscreen ion-router-outlet {
 
         --border-width: 0 0 3px 0;
         --border-color: var(--color-base);
-        --inner-border-width: 0;
+        --inner-border-width: 0px;
         ion-icon {
             color: var(--color-base);
         }
@@ -568,7 +569,7 @@ img[core-external-content]:not([src]) {
 }
 
 ion-card ion-item:only-child {
-    --inner-border-width: 0;
+    --inner-border-width: 0px;
 }
 
 .core-course-module-handler:not(.addon-mod-label-handler) .item-heading .filter_mathjaxloader_equation div {
@@ -992,6 +993,11 @@ ion-item.item-input ion-input.has-focus {
     }
 }
 
+// Ionic set this value to 0 without px that provoked miscalculations.
+ion-item-divider {
+    --inner-padding-end: 0px;
+}
+
 // Change default outline.
 :focus-visible {
     @include core-focus-style();
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 460d611ca..1f56a2b39 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -246,7 +246,7 @@
     --core-combobox-border-color: var(--primary);
     --core-combobox-border-width: 3px;
     --core-combobox-border-all-width: 0 0 var(--core-combobox-border-width) 0;
-    --core-combobox-radius: 0;
+    --core-combobox-radius: 0px;
     --core-combobox-box-shadow: 0 3px 1px -2px rgba(0, 0, 0, .2), 0 2px 2px 0 rgba(0, 0, 0, .14), 0 1px 5px 0 rgba(0, 0, 0, .12);
 
     --selected-item-color: var(--primary);

From 0b6125c1c035d373877d4c26d6818eae3f9dc338 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 8 Oct 2021 10:57:06 +0200
Subject: [PATCH 0136/1008] MOBILE-3726 forum: Fix missing
 showBrowserWarning=false

---
 src/addons/mod/forum/components/index/index.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/addons/mod/forum/components/index/index.html b/src/addons/mod/forum/components/index/index.html
index 6cf2fe7e9..3703497a6 100644
--- a/src/addons/mod/forum/components/index/index.html
+++ b/src/addons/mod/forum/components/index/index.html
@@ -2,7 +2,8 @@
 <core-navbar-buttons slot="end">
     <core-context-menu>
         <core-context-menu-item *ngIf="externalUrl"
-            [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl" iconAction="fas-external-link-alt">
+            [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl" iconAction="fas-external-link-alt"
+            [showBrowserWarning]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right">

From f1f94228b76d31f07f1ac18d3f2ccc7ccd08ae55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 6 Oct 2021 13:06:00 +0200
Subject: [PATCH 0137/1008] MOBILE-3103 style: Fix on safe area measures

---
 .../addon-block-activitymodules.html          |  2 +-
 .../myoverview/addon-block-myoverview.html    |  6 +-
 .../addon-block-recentlyaccessedcourses.html  |  4 +-
 .../addon-block-recentlyaccesseditems.html    |  6 +-
 .../recentlyaccesseditems.scss                |  2 +-
 .../addon-block-sitemainmenu.html             |  2 +-
 .../addon-block-starredcourses.html           |  4 +-
 .../timeline/addon-block-timeline.html        |  8 +-
 .../calendar/addon-calendar-calendar.html     |  2 +-
 src/addons/calendar/pages/day/day.html        |  4 +-
 .../messages/pages/discussion/discussion.html |  6 +-
 .../addon-mod-assign-submission.html          |  2 +-
 .../index/addon-mod-book-index.html           |  2 +-
 .../index/addon-mod-chat-index.html           |  2 +-
 src/addons/mod/chat/pages/chat/chat.html      |  6 +-
 .../session-messages/session-messages.html    |  2 +-
 .../post-options-menu/post-options-menu.html  |  2 +-
 .../index/addon-mod-h5pactivity-index.html    |  2 +-
 .../index/addon-mod-imscp-index.html          |  2 +-
 .../components/index/addon-mod-lti-index.html |  2 +-
 .../index/addon-mod-page-index.html           |  2 +-
 .../index/addon-mod-resource-index.html       |  2 +-
 .../index/addon-mod-scorm-index.html          |  2 +-
 .../index/addon-mod-survey-index.html         |  2 +-
 src/core/components/combobox/combobox.scss    |  1 +
 src/core/components/loading/loading.scss      | 12 +++
 .../show-password/show-password.scss          |  9 +-
 .../components/split-view/split-view.scss     |  8 +-
 src/core/components/tabs/tabs.scss            |  2 +-
 .../core-block-course-blocks.html             |  2 +-
 .../course-blocks/course-blocks.scss          |  2 +
 .../core-block-pre-rendered.html              |  2 +-
 .../components/comments/core-comments.html    |  2 +-
 .../comments/pages/viewer/viewer.html         |  4 +-
 .../components/format/core-course-format.html |  2 +-
 .../module-info/course-module-info.scss       |  6 ++
 .../components/module-info/module-info.ts     |  1 +
 .../courses/pages/my-courses/my-courses.html  |  2 +-
 .../features/grades/pages/course/course.html  |  2 +-
 .../h5p-iframe/core-h5p-iframe.html           |  2 +-
 .../features/mainmenu/pages/menu/menu.scss    |  9 +-
 .../core-siteplugins-plugin-content.html      |  2 +-
 .../features/tag/pages/search/search.html     |  4 +-
 .../features/viewer/components/text/text.html |  2 +-
 src/theme/globals.mixins.scss                 | 93 +++++++++----------
 src/theme/theme.base.scss                     | 77 ++++++++++++++-
 46 files changed, 207 insertions(+), 115 deletions(-)
 create mode 100644 src/core/features/course/components/module-info/course-module-info.scss

diff --git a/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html b/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html
index 2306e3b4b..27d105e90 100644
--- a/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html
+++ b/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html
@@ -3,7 +3,7 @@
         <h2>{{ 'addon.block_activitymodules.pluginname' | translate }}</h2>
     </ion-label>
 </ion-item-divider>
-<core-loading [hideUntil]="loaded" [fullscreen]="false" class="margin">
+<core-loading [hideUntil]="loaded" [fullscreen]="false">
     <ion-item class="ion-text-wrap item-media" *ngFor="let entry of entries" detail="true" button
         (click)="gotoCoureListModType(entry)">
         <core-mod-icon slot="start" [modicon]="entry.icon" [modname]="entry.modName" [showAlt]="false">
diff --git a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
index b6e750c9f..2394d5a8b 100644
--- a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
+++ b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
@@ -39,8 +39,8 @@
         </core-context-menu>
     </div>
 </ion-item-divider>
-<core-loading [hideUntil]="loaded" [fullscreen]="false" class="margin">
-    <div class="safe-padding-horizontal" [hidden]="showFilter || !showSelectorFilter">
+<core-loading [hideUntil]="loaded" [fullscreen]="false">
+    <div class="safe-area-padding-horizontal" [hidden]="showFilter || !showSelectorFilter">
         <!-- "Time" selector. -->
         <core-combobox [label]="'core.show' | translate" [selection]="selectedFilter" (onChange)="selectedChanged($event)">
             <ion-select-option class="ion-text-wrap" value="allincludinghidden" *ngIf="showFilters.allincludinghidden != 'hidden'">
@@ -87,7 +87,7 @@
     </core-empty-box>
 
     <!-- List of courses. -->
-    <div class="safe-area-page">
+    <div class="safe-area-padding">
         <ion-grid class="ion-no-padding">
             <ion-row class="ion-no-padding">
                 <ion-col *ngFor="let course of filteredCourses" class="ion-no-padding"
diff --git a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html
index e24897fe1..d4a503b64 100644
--- a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html
+++ b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html
@@ -21,7 +21,7 @@
         </core-horizontal-scroll-controls>
     </div>
 </ion-item-divider>
-<core-loading [hideUntil]="loaded" [fullscreen]="false" class="safe-area-page margin">
+<core-loading [hideUntil]="loaded" [fullscreen]="false">
     <core-empty-box *ngIf="courses.length == 0" image="assets/img/icons/courses.svg" inline="true"
         [message]="'addon.block_recentlyaccessedcourses.nocourses' | translate"></core-empty-box>
     <!-- List of courses. -->
@@ -31,10 +31,12 @@
         (scroll)="scrollControls.updateScrollPosition()"
     >
         <div (onResize)="scrollControls.updateScrollPosition()" class="flex-row">
+            <div class="safe-area-pseudo-padding-start"></div>
             <ng-container *ngFor="let course of courses">
                 <core-courses-course-progress [course]="course" class="core-recentlyaccessedcourses"
                     [showDownload]="downloadCourseEnabled && downloadEnabled"></core-courses-course-progress>
             </ng-container>
+            <div class="safe-area-pseudo-padding-end"></div>
         </div>
     </div>
 </core-loading>
diff --git a/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html b/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html
index 73e52969f..cf85821ef 100644
--- a/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html
+++ b/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html
@@ -5,7 +5,7 @@
         </core-horizontal-scroll-controls>
     </div>
 </ion-item-divider>
-<core-loading [hideUntil]="loaded" [fullscreen]="false" class="safe-area-page">
+<core-loading [hideUntil]="loaded" [fullscreen]="false">
     <div
         [id]="scrollElementId"
         [hidden]="!items || items.length === 0"
@@ -13,7 +13,8 @@
         (scroll)="scrollControls.updateScrollPosition()"
     >
         <div *ngIf="items" (onResize)="scrollControls.updateScrollPosition()" class="flex-row">
-            <div *ngFor="let item of items">
+            <div class="safe-area-pseudo-padding-start"></div>
+            <div *ngFor="let item of items" class="core-horizontal-scroll-item">
                 <ion-card>
                     <ion-item class="core-course-module-handler item-media ion-text-wrap" detail="false" (click)="action($event, item)"
                         button>
@@ -35,6 +36,7 @@
                     </ion-item>
                 </ion-card>
             </div>
+            <div class="safe-area-pseudo-padding-end"></div>
         </div>
     </div>
 
diff --git a/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.scss b/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.scss
index 8a8e396ba..62c797d58 100644
--- a/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.scss
+++ b/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.scss
@@ -1,7 +1,7 @@
 @import "~theme/globals";
 
 :host {
-    .core-horizontal-scroll > div > div {
+    .core-horizontal-scroll div.core-horizontal-scroll-item {
         @include horizontal_scroll_item(80%, 250px, 300px);
     }
 
diff --git a/src/addons/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html b/src/addons/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html
index f5e50c8f7..e18016290 100644
--- a/src/addons/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html
+++ b/src/addons/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html
@@ -3,7 +3,7 @@
         <h2>{{ 'addon.block_sitemainmenu.pluginname' | translate }}</h2>
     </ion-label>
 </ion-item-divider>
-<core-loading [hideUntil]="loaded" [fullscreen]="false" class="margin">
+<core-loading [hideUntil]="loaded" [fullscreen]="false">
     <ng-container *ngIf="mainMenuBlock">
         <ion-item class="ion-text-wrap" *ngIf="mainMenuBlock.summary">
             <ion-label>
diff --git a/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html b/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html
index 703863301..32fbdc9fb 100644
--- a/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html
+++ b/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html
@@ -21,7 +21,7 @@
         </core-horizontal-scroll-controls>
     </div>
 </ion-item-divider>
-<core-loading [hideUntil]="loaded" [fullscreen]="false" class="safe-area-page margin">
+<core-loading [hideUntil]="loaded" [fullscreen]="false">
     <core-empty-box *ngIf="courses.length == 0" image="assets/img/icons/courses.svg" inline="true"
         [message]="'addon.block_starredcourses.nocourses' | translate"></core-empty-box>
     <!-- List of courses. -->
@@ -32,10 +32,12 @@
         (scroll)="scrollControls.updateScrollPosition()"
     >
         <div (onResize)="scrollControls.updateScrollPosition()" class="flex-row">
+            <div class="safe-area-pseudo-padding-start"></div>
             <ng-container *ngFor="let course of courses">
                 <core-courses-course-progress [course]="course" class="core-block_starredcourses"
                     [showDownload]="downloadCourseEnabled && downloadEnabled"></core-courses-course-progress>
             </ng-container>
+            <div class="safe-area-pseudo-padding-end"></div>
         </div>
     </div>
 </core-loading>
diff --git a/src/addons/block/timeline/components/timeline/addon-block-timeline.html b/src/addons/block/timeline/components/timeline/addon-block-timeline.html
index f8d82393d..62105627c 100644
--- a/src/addons/block/timeline/components/timeline/addon-block-timeline.html
+++ b/src/addons/block/timeline/components/timeline/addon-block-timeline.html
@@ -9,8 +9,8 @@
         </core-context-menu-item>
     </core-context-menu>
 </ion-item-divider>
-<core-loading [hideUntil]="loaded" [fullscreen]="false" class="margin">
-    <div class="safe-padding-horizontal">
+<core-loading [hideUntil]="loaded" [fullscreen]="false">
+    <div class="safe-area-padding-horizontal">
         <core-combobox [selection]="filter" (onChange)="switchFilter($event)">
             <ion-select-option class="ion-text-wrap" value="all">
                 {{ 'core.all' | translate }}
@@ -35,12 +35,12 @@
             </ion-select-option>
         </core-combobox>
     </div>
-    <core-loading [hideUntil]="timeline.loaded" [hidden]="sort != 'sortbydates'" [fullscreen]="false" class="margin">
+    <core-loading [hideUntil]="timeline.loaded" [hidden]="sort != 'sortbydates'" [fullscreen]="false">
         <addon-block-timeline-events [events]="timeline.events" showCourse="true" [canLoadMore]="timeline.canLoadMore"
             (loadMore)="loadMoreTimeline()" [from]="dataFrom" [to]="dataTo"></addon-block-timeline-events>
     </core-loading>
     <core-loading [hideUntil]="timelineCourses.loaded" [hidden]="sort != 'sortbycourses'"
-        [fullscreen]="false" class="safe-area-page margin">
+        [fullscreen]="false" class="safe-area-padding">
         <ion-grid class="ion-no-padding">
             <ion-row class="ion-no-padding">
                 <ion-col *ngFor="let course of timelineCourses.courses" class="ion-no-padding" size="12" size-md="6">
diff --git a/src/addons/calendar/components/calendar/addon-calendar-calendar.html b/src/addons/calendar/components/calendar/addon-calendar-calendar.html
index 570926c23..fe3cf2895 100644
--- a/src/addons/calendar/components/calendar/addon-calendar-calendar.html
+++ b/src/addons/calendar/components/calendar/addon-calendar-calendar.html
@@ -8,7 +8,7 @@
     </core-context-menu>
 </core-navbar-buttons>
 
-<core-loading [hideUntil]="loaded" class="safe-area-page">
+<core-loading [hideUntil]="loaded" class="safe-area-padding">
     <!-- Period name and arrows to navigate. -->
     <ion-grid class="ion-no-padding addon-calendar-navigation">
         <ion-row class="ion-align-items-center">
diff --git a/src/addons/calendar/pages/day/day.html b/src/addons/calendar/pages/day/day.html
index c0e8bb1d7..7580d07b1 100644
--- a/src/addons/calendar/pages/day/day.html
+++ b/src/addons/calendar/pages/day/day.html
@@ -26,7 +26,7 @@
     </ion-refresher>
 
     <!-- Period name and arrows to navigate. -->
-    <ion-grid class="ion-no-padding safe-area-page">
+    <ion-grid class="ion-no-padding safe-area-padding">
         <ion-row class="ion-align-items-center">
             <ion-col class="ion-text-start" *ngIf="currentMoment">
                 <ion-button fill="clear" (click)="loadPrevious()" [attr.aria-label]="'addon.calendar.dayprev' | translate">
@@ -44,7 +44,7 @@
         </ion-row>
     </ion-grid>
 
-    <core-loading [hideUntil]="loaded" class="safe-area-page">
+    <core-loading [hideUntil]="loaded" class="safe-area-padding">
         <!-- There is data to be synchronized -->
         <ion-card class="core-warning-card" *ngIf="hasOffline">
             <ion-item>
diff --git a/src/addons/messages/pages/discussion/discussion.html b/src/addons/messages/pages/discussion/discussion.html
index 346fe8573..0ac439fa6 100644
--- a/src/addons/messages/pages/discussion/discussion.html
+++ b/src/addons/messages/pages/discussion/discussion.html
@@ -60,7 +60,7 @@
     </core-navbar-buttons>
 </ion-header>
 <ion-content class="has-footer" (ionScroll)="scrollFunction()">
-    <core-loading [hideUntil]="loaded" class="safe-area-page">
+    <core-loading [hideUntil]="loaded" class="safe-area-padding-horizontal">
         <!-- Load previous messages. -->
         <core-infinite-loading [enabled]="canLoadMore" (action)="loadPrevious($event)" position="top" [error]="loadMoreError">
         </core-infinite-loading>
@@ -138,8 +138,8 @@
         </ion-fab-button>
     </ion-fab>
 </ion-content>
-<ion-footer color="light" class="footer-adjustable" *ngIf="loaded && (!conversationId || conversation)">
-    <ion-toolbar color="light">
+<ion-footer class="footer-adjustable" *ngIf="loaded && (!conversationId || conversation)">
+    <ion-toolbar [color]="footerType == 'message' ? 'contrast' : 'light'">
         <p *ngIf="footerType == 'unable'" class="ion-text-center ion-margin-horizontal">
             {{ 'addon.messages.unabletomessage' | translate }}
         </p>
diff --git a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
index 2c6a40653..7e6c0e7d4 100644
--- a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
+++ b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
@@ -1,4 +1,4 @@
-<core-loading [hideUntil]="loaded" class="margin">
+<core-loading [hideUntil]="loaded">
 
     <!-- User and status of the submission. -->
     <ion-item class="ion-text-wrap" *ngIf="!blindMarking && user" core-user-link [userId]="submitId" [courseId]="courseId"
diff --git a/src/addons/mod/book/components/index/addon-mod-book-index.html b/src/addons/mod/book/components/index/addon-mod-book-index.html
index 27ce5e752..e9760e6c1 100644
--- a/src/addons/mod/book/components/index/addon-mod-book-index.html
+++ b/src/addons/mod/book/components/index/addon-mod-book-index.html
@@ -38,7 +38,7 @@
         </ion-item>
     </ion-card>
 
-    <div class="ion-padding safe-padding-horizontal">
+    <div class="ion-padding safe-area-padding-horizontal">
         <core-navigation-bar *ngIf="displayNavBar" [previous]="previousChapter?.id"
             [previousTitle]="previousNavBarTitle" [next]="nextChapter?.id" [nextTitle]="nextNavBarTitle"
             (action)="changeChapter($event)">
diff --git a/src/addons/mod/chat/components/index/addon-mod-chat-index.html b/src/addons/mod/chat/components/index/addon-mod-chat-index.html
index 6e9094a0e..a8bfc8ee5 100644
--- a/src/addons/mod/chat/components/index/addon-mod-chat-index.html
+++ b/src/addons/mod/chat/components/index/addon-mod-chat-index.html
@@ -24,7 +24,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="loaded" class="safe-area-page">
+<core-loading [hideUntil]="loaded" class="safe-area-padding">
 
     <!-- Activity info. -->
     <core-course-module-info *ngIf="showCompletion" [module]="module" [showManualCompletion]="true"
diff --git a/src/addons/mod/chat/pages/chat/chat.html b/src/addons/mod/chat/pages/chat/chat.html
index 87e3b16e5..cd983f9f0 100644
--- a/src/addons/mod/chat/pages/chat/chat.html
+++ b/src/addons/mod/chat/pages/chat/chat.html
@@ -15,7 +15,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content class="has-footer">
-    <core-loading [hideUntil]="loaded" class="safe-area-page">
+    <core-loading [hideUntil]="loaded" class="safe-area-padding">
         <ion-list class="addon-messages-discussion-container" aria-live="polite">
             <ng-container *ngFor="let message of messages; index as index; last as last">
 
@@ -109,8 +109,8 @@
         </core-empty-box>
     </core-loading>
 </ion-content>
-<ion-footer color="light" class="footer-adjustable">
-    <ion-toolbar color="light">
+<ion-footer class="footer-adjustable">
+    <ion-toolbar [color]="isOnline && polling && loaded ? 'contrast' : 'light'">
         <p class="ion-text-center" *ngIf="!isOnline">
             {{ 'addon.mod_chat.mustbeonlinetosendmessages' | translate }}
         </p>
diff --git a/src/addons/mod/chat/pages/session-messages/session-messages.html b/src/addons/mod/chat/pages/session-messages/session-messages.html
index f9706469e..275819ac5 100644
--- a/src/addons/mod/chat/pages/session-messages/session-messages.html
+++ b/src/addons/mod/chat/pages/session-messages/session-messages.html
@@ -10,7 +10,7 @@
     <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="refreshMessages($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <core-loading [hideUntil]="loaded" class="safe-area-page">
+    <core-loading [hideUntil]="loaded" class="safe-area-padding">
         <ion-list class="addon-messages-discussion-container">
             <ng-container *ngFor="let message of messages; index as index;">
 
diff --git a/src/addons/mod/forum/components/post-options-menu/post-options-menu.html b/src/addons/mod/forum/components/post-options-menu/post-options-menu.html
index 81d22d13e..e13fe197d 100644
--- a/src/addons/mod/forum/components/post-options-menu/post-options-menu.html
+++ b/src/addons/mod/forum/components/post-options-menu/post-options-menu.html
@@ -1,4 +1,4 @@
-<core-loading [hideUntil]="loaded" [fullscreen]="false" class="margin">
+<core-loading [hideUntil]="loaded" [fullscreen]="false">
     <ion-item button class="ion-text-wrap" (click)="editPost()" *ngIf="offlinePost || (canEdit && isOnline)" detail="false">
         <ion-icon name="fas-pen" slot="start" aria-hidden="true"></ion-icon>
         <ion-label>
diff --git a/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html b/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
index f88b40b88..58d802451 100644
--- a/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
+++ b/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
@@ -34,7 +34,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="loaded" class="safe-area-page">
+<core-loading [hideUntil]="loaded" class="safe-area-padding">
 
     <!-- Activity info. -->
     <core-course-module-info *ngIf="showCompletion" [module]="module" [showManualCompletion]="true"
diff --git a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
index 0397e0b29..ceddb1278 100644
--- a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
+++ b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
@@ -26,7 +26,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="loaded" class="safe-area-page">
+<core-loading [hideUntil]="loaded" class="safe-area-padding">
 
     <!-- Activity info. -->
     <core-course-module-info *ngIf="showCompletion" [module]="module" [showManualCompletion]="true"
diff --git a/src/addons/mod/lti/components/index/addon-mod-lti-index.html b/src/addons/mod/lti/components/index/addon-mod-lti-index.html
index 39bfcafab..dbccb5c0f 100644
--- a/src/addons/mod/lti/components/index/addon-mod-lti-index.html
+++ b/src/addons/mod/lti/components/index/addon-mod-lti-index.html
@@ -17,7 +17,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="loaded" class="safe-area-page">
+<core-loading [hideUntil]="loaded" class="safe-area-padding">
 
     <!-- Activity info. -->
     <core-course-module-info *ngIf="showCompletion" [module]="module" [showManualCompletion]="true"
diff --git a/src/addons/mod/page/components/index/addon-mod-page-index.html b/src/addons/mod/page/components/index/addon-mod-page-index.html
index 08b1cdd38..5e945d0dc 100644
--- a/src/addons/mod/page/components/index/addon-mod-page-index.html
+++ b/src/addons/mod/page/components/index/addon-mod-page-index.html
@@ -23,7 +23,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="loaded" class="safe-area-page">
+<core-loading [hideUntil]="loaded" class="safe-area-padding">
 
     <!-- Activity info. -->
     <core-course-module-info *ngIf="showCompletion" [module]="module" [showManualCompletion]="true"
diff --git a/src/addons/mod/resource/components/index/addon-mod-resource-index.html b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
index 411279e8b..e5f4296aa 100644
--- a/src/addons/mod/resource/components/index/addon-mod-resource-index.html
+++ b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
@@ -18,7 +18,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="loaded" class="safe-area-page core-loading-fullheight">
+<core-loading [hideUntil]="loaded" class="safe-area-padding core-loading-fullheight">
 
     <!-- Activity info. -->
     <core-course-module-info *ngIf="showCompletion" [module]="module" [showManualCompletion]="true"
diff --git a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
index fe53cf595..4fa05f186 100644
--- a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
+++ b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
@@ -26,7 +26,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="loaded">
+<core-loading [hideUntil]="loaded" class="safe-area-padding">
 
     <!-- Activity info. -->
     <core-course-module-info *ngIf="showCompletion" [module]="module" [showManualCompletion]="true"
diff --git a/src/addons/mod/survey/components/index/addon-mod-survey-index.html b/src/addons/mod/survey/components/index/addon-mod-survey-index.html
index e17441410..384138e19 100644
--- a/src/addons/mod/survey/components/index/addon-mod-survey-index.html
+++ b/src/addons/mod/survey/components/index/addon-mod-survey-index.html
@@ -27,7 +27,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="loaded" class="safe-area-page">
+<core-loading [hideUntil]="loaded" class="safe-area-padding">
 
     <!-- Activity info. -->
     <core-course-module-info *ngIf="showCompletion" [module]="module" [showManualCompletion]="true"
diff --git a/src/core/components/combobox/combobox.scss b/src/core/components/combobox/combobox.scss
index 950503000..501321352 100644
--- a/src/core/components/combobox/combobox.scss
+++ b/src/core/components/combobox/combobox.scss
@@ -2,6 +2,7 @@
 
 :host {
     max-width: 100%;
+    @include margin-horizontal(var(--ion-safe-area-left), var(--ion-safe-area-right));
 
     ion-select,
     ion-button {
diff --git a/src/core/components/loading/loading.scss b/src/core/components/loading/loading.scss
index 41f2f3742..c3cfbf655 100644
--- a/src/core/components/loading/loading.scss
+++ b/src/core/components/loading/loading.scss
@@ -74,6 +74,18 @@
             flex-direction: row;
         }
     }
+
+    &.safe-area-padding:not(.core-loading-inline) .core-loading-content,
+    &.safe-area-padding-horizontal:not(.core-loading-inline) .core-loading-content {
+        @include safe-area-padding-horizontal(0px, 0px);
+    }
+
+    &.safe-area-padding:not(.core-loading-inline) .core-loading-content {
+        padding-bottom: var(--ion-safe-area-bottom);
+        > * {
+            --ion-safe-area-bottom: 0px;
+        }
+    }
 }
 
 :host-context(ion-item) {
diff --git a/src/core/components/show-password/show-password.scss b/src/core/components/show-password/show-password.scss
index 2fdbcf5da..b5feb9e38 100644
--- a/src/core/components/show-password/show-password.scss
+++ b/src/core/components/show-password/show-password.scss
@@ -1,3 +1,5 @@
+@import "~theme/globals";
+
 :host {
     display: contents;
 
@@ -5,7 +7,7 @@
         background: transparent;
         padding: 0 calc(var(--padding-start) / 2);
         position: absolute;
-        right: 0;
+        @include safe-area-position(null, 0px, null, null);
         margin-top: 0;
         margin-bottom: 0;
         z-index: 3;
@@ -16,11 +18,6 @@
     --padding-end: 47px !important;
 }
 
-:host-context([dir="rtl"]) ion-button {
-    left: 0;
-    right: unset;
-}
-
 :host-context(.md.item-label.stacked) ion-button {
     bottom: 0;
 }
diff --git a/src/core/components/split-view/split-view.scss b/src/core/components/split-view/split-view.scss
index aa2d3ba72..1524a38c6 100644
--- a/src/core/components/split-view/split-view.scss
+++ b/src/core/components/split-view/split-view.scss
@@ -64,18 +64,18 @@
 }
 
 :host(.menu-only) {
-    --menu-min-width: 0;
+    --menu-min-width: 0px;
     --menu-max-width: 100%;
     --content-display: none;
-    --menu-border-width: 0;
+    --menu-border-width: 0px;
     --menu-box-shadow: none;
-    --menu-z: 0;
+    --menu-z: 0px;
     --selected-item-color: transparent;
 }
 
 :host(.content-only) {
     --menu-display: none;
-    --menu-border-width: 0;
+    --menu-border-width: 0px;
 }
 
 :host(.outlet-activated) {
diff --git a/src/core/components/tabs/tabs.scss b/src/core/components/tabs/tabs.scss
index 2c383ab5b..dbc1f28e7 100644
--- a/src/core/components/tabs/tabs.scss
+++ b/src/core/components/tabs/tabs.scss
@@ -15,8 +15,8 @@
 
     ion-tab-bar.core-tabs-bar {
         position: relative;
-        width: 100%;
         background: var(--tabs-background);
+        @include safe-area-padding-end(null, 0px);
         height: var(--height);
         color: var(--tabs-color);
         -webkit-filter: drop-shadow(0px 3px 3px rgba(var(--drop-shadow)));
diff --git a/src/core/features/block/components/course-blocks/core-block-course-blocks.html b/src/core/features/block/components/course-blocks/core-block-course-blocks.html
index 74e57a9b2..120e60749 100644
--- a/src/core/features/block/components/course-blocks/core-block-course-blocks.html
+++ b/src/core/features/block/components/course-blocks/core-block-course-blocks.html
@@ -3,7 +3,7 @@
 </div>
 
 <div *ngIf="blocks && blocks.length > 0 && !hideBlocks" [class.core-hide-blocks]="hideBottomBlocks" class="core-course-blocks-side">
-    <core-loading [hideUntil]="dataLoaded" [fullscreen]="false" class="margin">
+    <core-loading [hideUntil]="dataLoaded" [fullscreen]="false">
         <ion-list>
             <!-- Course expand="block"s. -->
             <ng-container *ngFor="let block of blocks">
diff --git a/src/core/features/block/components/course-blocks/course-blocks.scss b/src/core/features/block/components/course-blocks/course-blocks.scss
index cba246bb4..c7ba5b65e 100644
--- a/src/core/features/block/components/course-blocks/course-blocks.scss
+++ b/src/core/features/block/components/course-blocks/course-blocks.scss
@@ -16,6 +16,8 @@
                 box-shadow: none !important;
                 flex-grow: 1;
                 max-width: 100%;
+
+                --ion-safe-area-right: 0px;
             }
 
             div.core-course-blocks-side {
diff --git a/src/core/features/block/components/pre-rendered-block/core-block-pre-rendered.html b/src/core/features/block/components/pre-rendered-block/core-block-pre-rendered.html
index f1cf8b8d4..46b579a07 100644
--- a/src/core/features/block/components/pre-rendered-block/core-block-pre-rendered.html
+++ b/src/core/features/block/components/pre-rendered-block/core-block-pre-rendered.html
@@ -7,7 +7,7 @@
         </h2>
     </ion-label>
 </ion-item-divider>
-<core-loading [hideUntil]="loaded" [fullscreen]="false" class="margin">
+<core-loading [hideUntil]="loaded" [fullscreen]="false">
     <ion-item *ngIf="block.contents?.content" class="ion-text-wrap core-block-content">
         <ion-label>
             <core-format-text [text]="block.contents?.content" contextLevel="block" [contextInstanceId]="block.instanceid"
diff --git a/src/core/features/comments/components/comments/core-comments.html b/src/core/features/comments/components/comments/core-comments.html
index 250109e6f..12e8d444b 100644
--- a/src/core/features/comments/components/comments/core-comments.html
+++ b/src/core/features/comments/components/comments/core-comments.html
@@ -1,5 +1,5 @@
 <ng-container *ngIf="!disabled">
-    <core-loading *ngIf="!showItem" [hideUntil]="commentsLoaded" [fullscreen]="false" class="margin">
+    <core-loading *ngIf="!showItem" [hideUntil]="commentsLoaded" [fullscreen]="false">
         <button *ngIf="!countError" (click)="openComments($event)" class="as-link">
             {{ 'core.comments.commentscount' | translate : {'$a': commentsCount} }}
         </button>
diff --git a/src/core/features/comments/pages/viewer/viewer.html b/src/core/features/comments/pages/viewer/viewer.html
index ada1872c0..b85e367b3 100644
--- a/src/core/features/comments/pages/viewer/viewer.html
+++ b/src/core/features/comments/pages/viewer/viewer.html
@@ -119,8 +119,8 @@
 
     </core-loading>
 </ion-content>
-<ion-footer color="light" class="footer-adjustable" *ngIf="commentsLoaded && canAddComments">
-    <ion-toolbar color="light">
+<ion-footer class="footer-adjustable" *ngIf="commentsLoaded && canAddComments">
+    <ion-toolbar color="contrast">
         <core-send-message-form [sendDisabled]="sending" [message]="newComment"
             (onSubmit)="addComment($event)" [placeholder]="'core.comments.addcomment' | translate">
         </core-send-message-form>
diff --git a/src/core/features/course/components/format/core-course-format.html b/src/core/features/course/components/format/core-course-format.html
index 705b9aeb7..def9a3009 100644
--- a/src/core/features/course/components/format/core-course-format.html
+++ b/src/core/features/course/components/format/core-course-format.html
@@ -98,7 +98,7 @@
                 <core-infinite-loading [enabled]="canLoadMore" (action)="showMoreActivities($event)"></core-infinite-loading>
             </div>
 
-            <ion-buttons class="ion-padding core-course-section-nav-buttons safe-padding-horizontal"
+            <ion-buttons class="ion-padding core-course-section-nav-buttons safe-area-padding-horizontal"
                 *ngIf="displaySectionSelector && sections?.length">
                 <ion-button *ngIf="previousSection" (click)="sectionChanged(previousSection)" fill="outline" color="primary"
                     [attr.aria-label]="('core.previous' | translate) + ': ' + previousSection.name">
diff --git a/src/core/features/course/components/module-info/course-module-info.scss b/src/core/features/course/components/module-info/course-module-info.scss
new file mode 100644
index 000000000..ddf0beb55
--- /dev/null
+++ b/src/core/features/course/components/module-info/course-module-info.scss
@@ -0,0 +1,6 @@
+@import '~theme/globals.scss';
+
+:host {
+    display: block;
+    @include padding-horizontal(var(--ion-safe-area-left), var(--ion-safe-area-right));
+}
\ No newline at end of file
diff --git a/src/core/features/course/components/module-info/module-info.ts b/src/core/features/course/components/module-info/module-info.ts
index c4748fe4c..254ad3c7c 100644
--- a/src/core/features/course/components/module-info/module-info.ts
+++ b/src/core/features/course/components/module-info/module-info.ts
@@ -21,6 +21,7 @@ import { CoreCourseModule, CoreCourseModuleCompletionData } from '@features/cour
 @Component({
     selector: 'core-course-module-info',
     templateUrl: 'core-course-module-info.html',
+    styleUrls: ['course-module-info.scss'],
 })
 export class CoreCourseModuleInfoComponent {
 
diff --git a/src/core/features/courses/pages/my-courses/my-courses.html b/src/core/features/courses/pages/my-courses/my-courses.html
index bb3fd00b0..2e22ce7ee 100644
--- a/src/core/features/courses/pages/my-courses/my-courses.html
+++ b/src/core/features/courses/pages/my-courses/my-courses.html
@@ -37,7 +37,7 @@
         <ion-searchbar #searchbar *ngIf="courses && courses.length > 5" [(ngModel)]="filter" (ionInput)="filterChanged($event)"
             (ionCancel)="filterChanged()" [placeholder]="'core.courses.filtermycourses' | translate">
         </ion-searchbar>
-        <ion-grid class="ion-no-padding safe-area-page">
+        <ion-grid class="ion-no-padding safe-area-padding">
             <ion-row class="ion-no-padding">
                 <ion-col *ngFor="let course of filteredCourses" class="ion-no-padding"
                     size="12" size-sm="6" size-md="6" size-lg="4" size-xl="4">
diff --git a/src/core/features/grades/pages/course/course.html b/src/core/features/grades/pages/course/course.html
index 3883ca2d3..4b301f9ba 100644
--- a/src/core/features/grades/pages/course/course.html
+++ b/src/core/features/grades/pages/course/course.html
@@ -11,7 +11,7 @@
         <ion-refresher slot="fixed" [disabled]="!grades.loaded" (ionRefresh)="refreshGrades($event.target)">
             <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
         </ion-refresher>
-        <core-loading [hideUntil]="grades.loaded" class="safe-area-page">
+        <core-loading [hideUntil]="grades.loaded" class="safe-area-padding">
             <core-empty-box *ngIf="grades.empty" icon="fas-chart-bar" [message]="'core.grades.nogradesreturned' | translate">
             </core-empty-box>
             <div *ngIf="!grades.empty" class="core-grades-container">
diff --git a/src/core/features/h5p/components/h5p-iframe/core-h5p-iframe.html b/src/core/features/h5p/components/h5p-iframe/core-h5p-iframe.html
index acb3d16ff..52020bec3 100644
--- a/src/core/features/h5p/components/h5p-iframe/core-h5p-iframe.html
+++ b/src/core/features/h5p/components/h5p-iframe/core-h5p-iframe.html
@@ -1,4 +1,4 @@
-<core-loading [hideUntil]="iframeSrc" [fullscreen]="false" class="safe-area-page">
+<core-loading [hideUntil]="iframeSrc" [fullscreen]="false" class="safe-area-padding">
     <core-iframe *ngIf="iframeSrc" [src]="iframeSrc" iframeHeight="auto" [allowFullscreen]="true" (loaded)="iframeLoaded()">
     </core-iframe>
     <script *ngIf="resizeScript && iframeSrc" type="text/javascript" [src]="resizeScript"></script>
diff --git a/src/core/features/mainmenu/pages/menu/menu.scss b/src/core/features/mainmenu/pages/menu/menu.scss
index 3bb190a5e..53f005f0d 100644
--- a/src/core/features/mainmenu/pages/menu/menu.scss
+++ b/src/core/features/mainmenu/pages/menu/menu.scss
@@ -51,12 +51,14 @@
         ion-tab-bar {
             order: -1;
             width: var(--menutabbar-size);
-            height: 100%;
+            height: calc(100% - var(--ion-safe-area-top) - var(--ion-safe-area-bottom));
             flex-direction: column;
             @include border-end(var(--border));
             box-shadow: 3px 0 3px rgba(var(--drop-shadow));
             border-top: 0;
 
+            @include padding(var(--ion-safe-area-top), 0px, var(--ion-safe-area-bottom), var(--ion-safe-area-left));
+
             ion-tab-button {
                 width: 100%;
                 height: auto;
@@ -68,6 +70,7 @@
     }
 
     .core-network-message {
+        --network-message-height: 16px;
         position: absolute;
         bottom: 0;
         left: 0;
@@ -80,6 +83,7 @@
         height: 0;
         transition: all 500ms ease-in-out;
         opacity: .8;
+        z-index: 12;
     }
 
     .core-online-message,
@@ -100,7 +104,8 @@
 
     .core-network-message {
         visibility: visible;
-        height: 16px;
+        height: var(--network-message-height);
+        padding-bottom: calc(var(--ion-safe-area-bottom, 0px) + var(--network-message-height));
         pointer-events: none;
     }
 }
diff --git a/src/core/features/siteplugins/components/plugin-content/core-siteplugins-plugin-content.html b/src/core/features/siteplugins/components/plugin-content/core-siteplugins-plugin-content.html
index 95f612eff..2126b11fb 100644
--- a/src/core/features/siteplugins/components/plugin-content/core-siteplugins-plugin-content.html
+++ b/src/core/features/siteplugins/components/plugin-content/core-siteplugins-plugin-content.html
@@ -1,4 +1,4 @@
-<core-loading [hideUntil]="dataLoaded" [fullscreen]="false" class="margin">
+<core-loading [hideUntil]="dataLoaded" [fullscreen]="false">
     <core-compile-html [text]="content" [javascript]="javascript" [jsData]="jsData" [forceCompile]="forceCompile" #compile>
     </core-compile-html>
 </core-loading>
diff --git a/src/core/features/tag/pages/search/search.html b/src/core/features/tag/pages/search/search.html
index e4b26e7bd..5afa3e371 100644
--- a/src/core/features/tag/pages/search/search.html
+++ b/src/core/features/tag/pages/search/search.html
@@ -10,7 +10,7 @@
     <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="refreshData($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <ion-grid class="safe-area-page">
+    <ion-grid class="safe-area-padding">
         <ion-row>
             <ion-col size="12" [attr.col-sm-6]="collections && collections.length > 1 ? '' : null">
                 <core-search-box (onSubmit)="searchTags($event)" (onClear)="searchTags('')" [initialSearch]="query"
@@ -28,7 +28,7 @@
             </ion-col>
         </ion-row>
     </ion-grid>
-    <core-loading [hideUntil]="loaded && !searching" class="safe-area-page">
+    <core-loading [hideUntil]="loaded && !searching" class="safe-area-padding">
         <core-empty-box *ngIf="!cloud || !cloud!.tags || !cloud!.tags.length" icon="fas-tags"
             [message]="'core.tag.notagsfound' | translate: {$a: query}"></core-empty-box>
 
diff --git a/src/core/features/viewer/components/text/text.html b/src/core/features/viewer/components/text/text.html
index cda8ec03e..10248ad3f 100644
--- a/src/core/features/viewer/components/text/text.html
+++ b/src/core/features/viewer/components/text/text.html
@@ -18,7 +18,7 @@
         <core-file *ngFor="let file of files" [file]="file" [component]="component" [componentId]="componentId"></core-file>
     </ion-card>
 </ion-content>
-<ion-footer color="light" *ngIf="displayCopyButton">
+<ion-footer *ngIf="displayCopyButton">
     <ion-button expand="block" color="light" (click)="copyText()">
         <ion-icon name="fas-copy" aria-hidden="true" slot="start"></ion-icon>
         {{ 'core.copytoclipboard' | translate }}
diff --git a/src/theme/globals.mixins.scss b/src/theme/globals.mixins.scss
index 52031a533..c871f18b3 100644
--- a/src/theme/globals.mixins.scss
+++ b/src/theme/globals.mixins.scss
@@ -50,100 +50,93 @@
 }
 
 @mixin border-start($px, $type: null, $color: null) {
-    @include ltr() {
-        border-left: $px $type $color;
-    }
+    border-left: $px $type $color;
 
     @include rtl() {
+        border-left: unset;
         border-right: $px $type $color;
     }
 }
 
 
 @mixin border-end($px, $type: null, $color: null) {
-    @include ltr() {
-        border-right: $px $type $color;
-    }
+    border-right: $px $type $color;
 
     @include rtl() {
+        border-right: unset;
         border-left: $px $type $color;
     }
 }
 
 @mixin safe-area-border-start($px, $type, $color) {
-    $safe-area-position: calc(constant(safe-area-inset-left) + #{$px});
-    $safe-area-position-env: calc(env(safe-area-inset-left) + #{$px});
+    $safe-area-position: calc(var(--ion-safe-area-left) + #{$px});
 
-    @include border-start($px, $type, $color);
-    @media screen and (orientation: landscape) {
-        @include border-start($safe-area-position, $type, $color);
-        @include border-start($safe-area-position-env, $type, $color);
-    }
+    @include border-start($safe-area-position, $type, $color);
 }
 
 @mixin safe-area-border-end($px, $type, $color) {
-    $safe-area-position: calc(constant(safe-area-inset-right) + #{$px});
-    $safe-area-position-env: calc(env(safe-area-inset-right) + #{$px});
+    $safe-area-position: calc(var(--ion-safe-area-right) + #{$px});
 
-    @include border-end($px, $type, $color);
-    @media screen and (orientation: landscape) {
-        @include border-end($safe-area-position, $type, $color);
-        @include border-end($safe-area-position-env, $type, $color);
-    }
+    @include border-end($safe-area-position, $type, $color);
 }
 
 @mixin safe-area-margin-horizontal($start, $end: $start) {
     $safe-area-end: null;
     $safe-area-start: null;
-    $safe-area-start-env: null;
-    $safe-area-end-env: null;
 
     @if ($end) {
-        $safe-area-end: calc(constant(safe-area-inset-right) + #{$end});
-        $safe-area-end-env: calc(env(safe-area-inset-right) + #{$end});
+        $safe-area-end: calc(var(--ion-safe-area-right) + #{$end});
     }
     @if ($start) {
-        $safe-area-start: calc(constant(safe-area-inset-left) + #{$start});
-        $safe-area-start-env: calc(env(safe-area-inset-left) + #{$start});
+        $safe-area-start: calc(var(--ion-safe-area-left) + #{$start});
     }
 
-    @include margin-horizontal($start, $end);
+    @include margin-horizontal($safe-area-start, $safe-area-end);
+}
 
-    @media screen and (orientation: landscape) {
-        @include margin-horizontal($safe-area-start, $safe-area-end);
-        @include margin-horizontal($safe-area-start-env, $safe-area-end-env);
+@mixin safe-area-margin-start($start, $end) {
+    $safe-area-start: calc(var(--ion-safe-area-left) + #{$start});
+
+    @include margin-horizontal($safe-area-start, $end);
+}
+
+@mixin safe-area-margin-end($start, $end) {
+    $safe-area-end: calc(var(--ion-safe-area-right) + #{$end});
+
+    @include margin-horizontal($start, $safe-area-end);
+}
+
+@mixin safe-area-padding-horizontal($start, $end: $start) {
+    $safe-area-end: null;
+    $safe-area-start: null;
+
+    @if ($end) {
+        $safe-area-end: calc(var(--ion-safe-area-right) + #{$end});
     }
+    @if ($start) {
+        $safe-area-start: calc(var(--ion-safe-area-left) + #{$start});
+    }
+
+    @include padding-horizontal($safe-area-start, $safe-area-end);
 }
 
 @mixin safe-area-padding-start($start, $end) {
-    $safe-area-start: calc(constant(safe-area-inset-left) + #{$start});
-    $safe-area-start-env: calc(env(safe-area-inset-left) + #{$start});
+    $safe-area-start: calc(var(--ion-safe-area-left) + #{$start});
 
-    @include padding-horizontal($start, $end);
-
-    @media screen and (orientation: landscape) {
-        @include padding-horizontal($safe-area-start, $end);
-        @include padding-horizontal($safe-area-start-env, $end);
-    }
+    @include padding-horizontal($safe-area-start, $end);
 }
 
 @mixin safe-area-padding-end($start, $end) {
-    $safe-area-end: calc(constant(safe-area-inset-right) + #{$end});
-    $safe-area-end-env: calc(env(safe-area-inset-right) + #{$end});
+    $safe-area-end: calc(var(--ion-safe-area-right) + #{$end});
 
-    @include padding-horizontal($start, $end);
-
-    @media screen and (orientation: landscape) {
-        @include padding-horizontal($start, $safe-area-end);
-        @include padding-horizontal($start, $safe-area-end-env);
-    }
+    @include padding-horizontal($start, $safe-area-end);
 }
 
 @mixin safe-area-position($top: null, $end: null, $bottom: null, $start: null) {
-    @include position-horizontal($start, $end);
-    @include safe-position-horizontal($start, $end);
-    top: $top;
-    bottom: $bottom;
+    $safe-area-start: calc(var(--ion-safe-area-left) + #{$start});
+    $safe-area-end: calc(var(--ion-safe-area-right) + #{$end});
+
+    @include position($top, $safe-area-end, $bottom, $safe-area-start);
 }
 
 @mixin core-headings() {
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 86eb108f3..90437ec03 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -234,6 +234,10 @@ ion-header ion-toolbar {
     }
 }
 
+ion-footer ion-toolbar.ion-color-contrast {
+    background-color: var(--contrast-background);
+}
+
 // Ionic icon.
 ion-icon {
     position: relative;
@@ -374,6 +378,44 @@ ion-list.list-md {
     padding: 0;
 }
 
+// Safe areas
+.safe-area-padding,
+.safe-area-padding-horizontal {
+    @include padding-horizontal(var(--ion-safe-area-left), var(--ion-safe-area-right));
+}
+
+.safe-area-margin,
+.safe-margin-horizontal {
+    @include margin-horizontal(var(--ion-safe-area-left), var(--ion-safe-area-right));
+}
+
+.ion-padding.safe-area-padding-horizontal {
+    @include safe-area-padding-horizontal(16px, 16px);
+}
+
+.ion-margin.safe-margin-horizontal {
+    @include safe-area-margin-horizontal(16px, 16px);
+}
+
+ion-tabs.placement-side .tabs-inner {
+    --ion-safe-area-left: 0px;
+}
+
+ion-tabs.placement-bottom .tabs-inner {
+    --ion-safe-area-bottom: 0px;
+}
+
+
+core-split-view.menu-and-content {
+    .menu {
+        --ion-safe-area-right: 0px;
+    }
+
+    .content-outlet {
+        --ion-safe-area-left: 0px;
+    }
+}
+
 // Header.
 ion-header {
     z-index: 12; // To hide ion-slides on scroll.
@@ -393,6 +435,17 @@ body.core-iframe-fullscreen ion-router-outlet {
 
     ion-tab-bar.mainmenu-tabs {
         display: none;
+
+        // Restore original safe area.
+        .tabs-inner {
+            @supports (padding-left: constant(safe-area-inset-left)) {
+                --ion-safe-area-left: constant(safe-area-inset-left);
+            }
+            
+            @supports (padding-left: env(safe-area-inset-left)) {
+                --ion-safe-area-left: env(safe-area-inset-left);
+            }
+        }
     }
 
     --core-header-toolbar-height: 48px;
@@ -411,9 +464,12 @@ body.core-iframe-fullscreen ion-router-outlet {
         .ion-page {
             flex-direction: row-reverse;
             ion-header {
-                width: var(--core-header-toolbar-height);
+                width: calc(var(--core-header-toolbar-height), var(--ion-safe-area-right));
+                @include safe-area-padding-horizontal(null, 0px);
+                background: var(--core-header-toolbar-background);
 
                 ion-toolbar {
+                    padding: 0;
                     height: 100%;
                     --padding-start: 0px;
                     --padding-end: 0px;
@@ -442,6 +498,8 @@ body.core-iframe-fullscreen ion-router-outlet {
 
 @media only screen and (min-height: 400px) and (min-width: 300px) {
     .core-modal-lateral {
+        --ion-safe-area-left: 0px;
+        --ion-safe-area-right: 0px;
 
         .modal-wrapper {
             position: absolute;
@@ -478,6 +536,13 @@ body.core-iframe-fullscreen ion-router-outlet {
 [aria-current="page"],
 .item.item-current {
     @include safe-area-border-start(var(--selected-item-border-width), solid,  var(--selected-item-color));
+    > * {
+        --ion-safe-area-left: 0px;
+    }
+
+    &::part(native) {
+        --ion-safe-area-left: 0px;
+    }
 }
 
 .item.item-file {
@@ -727,10 +792,14 @@ core-block ion-item-divider .core-button-spinner {
 
 // Horizontal scrolling elements
 .core-horizontal-scroll {
-    display: flex;
-    flex-flow: nowrap;
+    display: block;
     overflow-x: scroll;
-    flex-direction: row;
+    .safe-area-pseudo-padding-start {
+        @include padding-horizontal(var(--ion-safe-area-left), 0px);
+    }
+    .safe-area-pseudo-padding-end {
+        @include padding-horizontal(0px, var(--ion-safe-area-right));
+    }
 }
 
 // Text formats.

From 32fc43875c499e67b3aecbaa0734b5f61d5dd169 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 7 Oct 2021 11:26:08 +0200
Subject: [PATCH 0138/1008] MOBILE-3103 style: Fix zoom texts on iOS

---
 .../features/settings/services/settings-helper.ts  |  4 ++--
 src/theme/theme.base.scss                          | 14 +++++++++++++-
 src/theme/theme.light.scss                         |  1 +
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/core/features/settings/services/settings-helper.ts b/src/core/features/settings/services/settings-helper.ts
index ee07046d5..51e7a9c1f 100644
--- a/src/core/features/settings/services/settings-helper.ts
+++ b/src/core/features/settings/services/settings-helper.ts
@@ -388,8 +388,8 @@ export class CoreSettingsHelperProvider {
      */
     applyZoomLevel(zoomLevel: CoreZoomLevel): void {
         const zoom = CoreConstants.CONFIG.zoomlevels[zoomLevel];
-        // @todo MOBILE-3790 non-standard property, doesn't work everywhere.
-        document.documentElement.style.zoom = zoom + '%';
+
+        document.documentElement.style.setProperty('--zoom-level', zoom + '%');
     }
 
     /**
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 90437ec03..c040c18d3 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -1,7 +1,19 @@
 @import "./globals.scss";
 
+html.force-safe-area-margins {
+    --ion-safe-area-left: 40px;
+    --ion-safe-area-right: 40px;
+    --ion-safe-area-top: 40px;
+    --ion-safe-area-bottom: 40px;
+}
+
+// @todo MOBILE-3790 non-standard property, doesn't work everywhere.
+html {
+    zoom: var(--zoom-level);
+}
+
 body {
-    -webkit-text-size-adjust: auto;
+    -webkit-text-size-adjust: var(--zoom-level);
 }
 
 // Common styles.
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 1f56a2b39..fb0ad53ec 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -61,6 +61,7 @@
     --a11y-min-target-size: 44px;
     --a11y-focus-color: var(--primary);
     --a11y-focus-width: 2px;
+    --zoom-level: 100%;
 
     --module-icon-size: 24px;
 

From f9f60414bb30fb09a04e0c267d16f5e2a254ae62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 7 Oct 2021 14:09:12 +0200
Subject: [PATCH 0139/1008] MOBILE-3889 settings: Add developer options page

---
 scripts/langindex.json                        |   8 +
 src/core/features/settings/lang.json          |  10 +-
 .../features/settings/pages/about/about.html  |   7 +-
 .../features/settings/pages/about/about.ts    |   2 -
 src/core/features/settings/pages/dev/dev.html |  61 +++++++
 src/core/features/settings/pages/dev/dev.ts   | 149 ++++++++++++++++++
 .../settings/pages/deviceinfo/deviceinfo.html |   8 +-
 .../pages/deviceinfo/deviceinfo.module.ts     |   6 +
 .../settings/pages/deviceinfo/deviceinfo.ts   |  53 ++++++-
 .../siteplugins/services/siteplugins.ts       |   9 ++
 src/core/features/styles/services/styles.ts   |   4 +-
 11 files changed, 305 insertions(+), 12 deletions(-)
 create mode 100644 src/core/features/settings/pages/dev/dev.html
 create mode 100644 src/core/features/settings/pages/dev/dev.ts

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 18166ff20..3d0223dbb 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -2090,10 +2090,12 @@
   "core.settings.debugdisplaydescription": "local_moodlemobileapp",
   "core.settings.deletesitefiles": "local_moodlemobileapp",
   "core.settings.deletesitefilestitle": "local_moodlemobileapp",
+  "core.settings.developeroptions": "local_moodlemobileapp",
   "core.settings.deviceinfo": "local_moodlemobileapp",
   "core.settings.deviceos": "local_moodlemobileapp",
   "core.settings.disableall": "message",
   "core.settings.disabled": "lesson",
+  "core.settings.disabledfeatures": "tool_mobile",
   "core.settings.displayformat": "local_moodlemobileapp",
   "core.settings.enabledownloadsection": "local_moodlemobileapp",
   "core.settings.enablefirebaseanalytics": "local_moodlemobileapp",
@@ -2109,6 +2111,7 @@
   "core.settings.fontsize": "local_moodlemobileapp",
   "core.settings.fontsizecharacter": "block_accessibility/char",
   "core.settings.forcedsetting": "local_moodlemobileapp",
+  "core.settings.forcesafeareamargins": "local_moodlemobileapp",
   "core.settings.general": "moodle",
   "core.settings.helpusimprove": "local_moodlemobileapp",
   "core.settings.ioscookies": "local_moodlemobileapp",
@@ -2124,15 +2127,18 @@
   "core.settings.navigatoruseragent": "local_moodlemobileapp",
   "core.settings.networkstatus": "local_moodlemobileapp",
   "core.settings.opensourcelicenses": "local_moodlemobileapp",
+  "core.settings.pluginstyles": "local_moodlemobileapp",
   "core.settings.preferences": "moodle",
   "core.settings.privacypolicy": "local_moodlemobileapp",
   "core.settings.publisher": "local_moodlemobileapp",
   "core.settings.pushid": "local_moodlemobileapp",
+  "core.settings.remotestyles": "local_moodlemobileapp",
   "core.settings.reportinbackground": "local_moodlemobileapp",
   "core.settings.screen": "local_moodlemobileapp",
   "core.settings.settings": "moodle",
   "core.settings.showdownloadoptions": "local_moodlemobileapp",
   "core.settings.siteinfo": "local_moodlemobileapp",
+  "core.settings.siteplugins": "local_moodlemobileapp",
   "core.settings.sites": "moodle",
   "core.settings.spaceusage": "local_moodlemobileapp",
   "core.settings.spaceusagehelp": "local_moodlemobileapp",
@@ -2140,8 +2146,10 @@
   "core.settings.synchronizenow": "local_moodlemobileapp",
   "core.settings.synchronizenowhelp": "local_moodlemobileapp",
   "core.settings.syncsettings": "local_moodlemobileapp",
+  "core.settings.textdirection": "local_moodlemobileapp",
   "core.settings.total": "moodle",
   "core.settings.wificonnection": "local_moodlemobileapp",
+  "core.settings.youradev": "local_moodlemobileapp",
   "core.sharedfiles.chooseaccountstorefile": "local_moodlemobileapp",
   "core.sharedfiles.chooseactionrepeatedfile": "local_moodlemobileapp",
   "core.sharedfiles.errorreceivefilenosites": "local_moodlemobileapp",
diff --git a/src/core/features/settings/lang.json b/src/core/features/settings/lang.json
index 81a87ded2..55af8e563 100644
--- a/src/core/features/settings/lang.json
+++ b/src/core/features/settings/lang.json
@@ -22,10 +22,12 @@
     "debugdisplaydescription": "If enabled, error modals will display more data about the error if possible.",
     "deletesitefiles": "Are you sure that you want to delete the downloaded files and cached data from the site '{{sitename}}'? You won't be able to use the app in offline mode.",
     "deletesitefilestitle": "Delete site files",
+    "developeroptions": "Developer options",
     "deviceinfo": "Device info",
     "deviceos": "Device OS",
     "disableall": "Disable notifications",
     "disabled": "Disabled",
+    "disabledfeatures": "Disabled features",
     "displayformat": "Display format",
     "enabledownloadsection": "Enable download sections",
     "enablefirebaseanalytics": "Enable Firebase analytics",
@@ -41,6 +43,7 @@
     "fontsize": "Text size",
     "fontsizecharacter": "A",
     "forcedsetting": "This setting has been forced by your site configuration.",
+    "forcesafeareamargins": "Force safe area margins",
     "general": "General",
     "helpusimprove": "Help us improve this app",
     "ioscookies": "Cross-Website Tracking",
@@ -56,15 +59,18 @@
     "navigatoruseragent": "Navigator userAgent",
     "networkstatus": "Internet connection status",
     "opensourcelicenses": "Open Source Licences",
+    "pluginstyles": "Enable site plugin styles",
     "preferences": "Preferences",
     "privacypolicy": "Privacy policy",
     "publisher": "Publisher",
     "pushid": "Push notifications ID",
+    "remotestyles": "Enable remote styles",
     "reportinbackground": "Report errors automatically",
     "screen": "Screen information",
     "settings": "Settings",
     "showdownloadoptions": "Show download options",
     "siteinfo": "Site info",
+    "siteplugins": "Site plugins",
     "sites": "Sites",
     "spaceusage": "Space usage",
     "spaceusagehelp": "Deleting the stored information of the site will remove all the site offline data. This information allows you to use the app when offline. ",
@@ -72,6 +78,8 @@
     "synchronizenow": "Synchronise now",
     "synchronizenowhelp": "Synchronising a site will send pending changes and all offline activity stored in the device and will synchronise some data like messages and notifications.",
     "syncsettings": "Synchronisation settings",
+    "textdirection": "Text direction",
     "total": "Total",
-    "wificonnection": "Wi-Fi connection"
+    "wificonnection": "Wi-Fi connection",
+    "youradev": "You are now a developer"
 }
diff --git a/src/core/features/settings/pages/about/about.html b/src/core/features/settings/pages/about/about.html
index 807d240ce..73169981e 100644
--- a/src/core/features/settings/pages/about/about.html
+++ b/src/core/features/settings/pages/about/about.html
@@ -11,12 +11,9 @@
 
 <ion-content>
     <ion-list>
-        <ion-item class="ion-text-wrap">
-            <ion-label><h2>{{ appName }} {{ versionName }}</h2></ion-label>
-        </ion-item>
-        <ion-item button class="ion-text-wrap" (click)="openPage('deviceinfo')" detail="true">
+        <ion-item button class="ion-text-wrap" detail="false" (click)="openPage('deviceinfo')">
             <ion-icon name="fas-mobile" slot="start" aria-hidden="true"></ion-icon>
-            <ion-label>{{ 'core.settings.deviceinfo' | translate }}</ion-label>
+            <ion-label><h2>{{ appName }} {{ versionName }}</h2></ion-label>
         </ion-item>
         <ion-item button class="ion-text-wrap" (click)="openPage('licenses')" detail="true">
             <ion-icon name="far-copyright" slot="start" aria-hidden="true"></ion-icon>
diff --git a/src/core/features/settings/pages/about/about.ts b/src/core/features/settings/pages/about/about.ts
index d341352a9..9fe71636a 100644
--- a/src/core/features/settings/pages/about/about.ts
+++ b/src/core/features/settings/pages/about/about.ts
@@ -49,8 +49,6 @@ export class CoreSettingsAboutPage {
      * @param page The component deeplink name you want to push onto the navigation stack.
      */
     openPage(page: string): void {
-        // const navCtrl = this.svComponent ? this.svComponent.getMasterNav() : this.navCtrl;
-        // navCtrl.push(page);
         CoreNavigator.navigate(page);
     }
 
diff --git a/src/core/features/settings/pages/dev/dev.html b/src/core/features/settings/pages/dev/dev.html
new file mode 100644
index 000000000..1e970cc73
--- /dev/null
+++ b/src/core/features/settings/pages/dev/dev.html
@@ -0,0 +1,61 @@
+<ion-header>
+    <ion-toolbar>
+        <ion-buttons slot="start">
+            <ion-back-button [text]="'core.back' | translate"></ion-back-button>
+        </ion-buttons>
+
+        <h1>{{ 'core.settings.developeroptions' | translate }}</h1>
+
+        <ion-buttons slot="end" *ngIf="siteId">
+            <ion-button fill="clear" (click)="copyInfo()" [attr.aria-label]="'core.settings.copyinfo' | translate">
+                <ion-icon slot="icon-only" name="fas-clipboard" aria-hidden="true"></ion-icon>
+            </ion-button>
+        </ion-buttons>
+    </ion-toolbar>
+</ion-header>
+<ion-content>
+    <ion-list>
+        <ion-item class="ion-text-wrap">
+            <ion-label>
+                <h2>{{ 'core.settings.textdirection' | translate }}</h2>
+                <p>{{ direction }}</p>
+            </ion-label>
+            <ion-toggle [(ngModel)]="rtl" (ionChange)="RTLChanged()"></ion-toggle>
+        </ion-item>
+        <ion-item class="ion-text-wrap">
+            <ion-label>
+                <h2>{{ 'core.settings.forcesafeareamargins' | translate }}</h2>
+            </ion-label>
+            <ion-toggle [(ngModel)]="forceSafeAreaMargins" (ionChange)="safeAreaChanged()"></ion-toggle>
+        </ion-item>
+        <ng-container *ngIf="siteId">
+            <ion-item class="ion-text-wrap">
+                <ion-label>
+                    <h2>{{ 'core.settings.remotestyles' | translate }} <ion-badge>{{remoteStylesCount}}</ion-badge></h2>
+                </ion-label>
+                <ion-toggle [(ngModel)]="remoteStyles" (ionChange)="remoteStylesChanged()"></ion-toggle>
+            </ion-item>
+            <ion-item class="ion-text-wrap">
+                <ion-label>
+                    <h2>{{ 'core.settings.pluginstyles' | translate }} <ion-badge>{{pluginStylesCount}}</ion-badge></h2>
+                </ion-label>
+                <ion-toggle [(ngModel)]="pluginStyles" (ionChange)="pluginStylesChanged()"></ion-toggle>
+            </ion-item>
+
+            <ion-item-divider><ion-label><h2>{{ 'core.settings.disabledfeatures' | translate }}</h2></ion-label></ion-item-divider>
+            <ion-item class="ion-text-wrap" *ngFor="let feature of disabledFeatures">
+                <ion-label>
+                    <h2>{{ feature }}</h2>
+                </ion-label>
+            </ion-item>
+
+            <ion-item-divider><ion-label><h2>{{ 'core.settings.siteplugins' | translate }}</h2></ion-label></ion-item-divider>
+            <ion-item class="ion-text-wrap" *ngFor="let plugin of sitePlugins">
+                <ion-label>
+                    <h2>{{ plugin.addon }} ({{plugin.component}})</h2>
+                    <p>{{plugin.version}}</p>
+                </ion-label>
+            </ion-item>
+        </ng-container>
+    </ion-list>
+</ion-content>
diff --git a/src/core/features/settings/pages/dev/dev.ts b/src/core/features/settings/pages/dev/dev.ts
new file mode 100644
index 000000000..9b14f3e42
--- /dev/null
+++ b/src/core/features/settings/pages/dev/dev.ts
@@ -0,0 +1,149 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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, OnInit } from '@angular/core';
+import { CoreSitePlugins } from '@features/siteplugins/services/siteplugins';
+import { CoreSites } from '@services/sites';
+import { CoreUtils } from '@services/utils/utils';
+import { Platform } from '@singletons';
+
+/**
+ * Page that displays the developer options.
+ */
+@Component({
+    selector: 'page-core-app-settings-dev',
+    templateUrl: 'dev.html',
+})
+export class CoreSettingsDevPage implements OnInit {
+
+    rtl = false;
+    forceSafeAreaMargins = false;
+    direction = 'ltr';
+
+    remoteStyles = true;
+    remoteStylesCount = 0;
+    pluginStyles = true;
+    pluginStylesCount = 0;
+    sitePlugins: CoreSitePluginsBasicInfo[] = [];
+
+    disabledFeatures: string[] = [];
+
+    siteId: string | undefined;
+
+    async ngOnInit(): Promise<void> {
+        this.rtl = Platform.isRTL;
+        this.RTLChanged();
+
+        this.forceSafeAreaMargins = document.documentElement.classList.contains('force-safe-area-margins');
+        this.safeAreaChanged();
+
+        this.siteId = CoreSites.getCurrentSite()?.getId();
+
+        if (!this.siteId) {
+            return;
+        }
+
+        this.remoteStyles = false;
+        this.remoteStylesCount = 0;
+
+        this.pluginStyles = false;
+        this.pluginStylesCount = 0;
+
+        document.head.querySelectorAll('style').forEach((style) => {
+            if (this.siteId && style.id.endsWith(this.siteId)) {
+                if (style.innerHTML.length > 0) {
+                    this.remoteStylesCount++;
+                }
+                this.remoteStyles = this.remoteStyles || style.getAttribute('media') != 'disabled';
+            }
+
+            if (style.id.startsWith('siteplugin-')) {
+                if (style.innerHTML.length > 0) {
+                    this.pluginStylesCount++;
+                }
+                this.pluginStyles = this.pluginStyles || style.getAttribute('media') != 'disabled';
+            }
+        });
+
+        this.sitePlugins = CoreSitePlugins.getCurrentSitePluginList().map((plugin) => ({
+            addon: plugin.addon,
+            component: plugin.component,
+            version: plugin.version,
+        }));
+
+        const disabledFeatures = (await CoreSites.getCurrentSite()?.getPublicConfig())?.tool_mobile_disabledfeatures;
+
+        this.disabledFeatures = disabledFeatures?.split(',') || [];
+    }
+
+    /**
+     * Called when the rtl is enabled or disabled.
+     */
+    RTLChanged(): void {
+        this.direction = this.rtl ? 'rtl' : 'ltr';
+        document.dir = this.direction;
+    }
+
+    /**
+     * Called when safe area margins is enabled or disabled.
+     */
+    safeAreaChanged(): void {
+        document.documentElement.classList.toggle('force-safe-area-margins', this.forceSafeAreaMargins);
+    }
+
+    /**
+     * Called when remote styles is enabled or disabled.
+     */
+    remoteStylesChanged(): void {
+        document.head.querySelectorAll('style').forEach((style) => {
+            if (this.siteId && style.id.endsWith(this.siteId)) {
+                if (this.remoteStyles) {
+                    style.removeAttribute('media');
+                } else {
+                    style.setAttribute('media', 'disabled');
+                }
+            }
+        });
+    }
+
+    /**
+     * Called when remote styles is enabled or disabled.
+     */
+    pluginStylesChanged(): void {
+        document.head.querySelectorAll('style').forEach((style) => {
+            if (style.id.startsWith('siteplugin-')) {
+                if (this.pluginStyles) {
+                    style.removeAttribute('media');
+                } else {
+                    style.setAttribute('media', 'disabled');
+                }
+            }
+        });
+    }
+
+    /**
+     * Copies site info.
+     */
+    copyInfo(): void {
+        CoreUtils.copyToClipboard(JSON.stringify({ disabledFeatures: this.disabledFeatures, sitePlugins: this.sitePlugins }));
+    }
+
+}
+
+// Basic site plugin info.
+type CoreSitePluginsBasicInfo = {
+    component: string;
+    addon: string;
+    version: string;
+};
diff --git a/src/core/features/settings/pages/deviceinfo/deviceinfo.html b/src/core/features/settings/pages/deviceinfo/deviceinfo.html
index 162c08fce..8379b26df 100644
--- a/src/core/features/settings/pages/deviceinfo/deviceinfo.html
+++ b/src/core/features/settings/pages/deviceinfo/deviceinfo.html
@@ -16,13 +16,19 @@
 
 <ion-content>
     <ion-list>
+        <ion-item *ngIf="showDevOptions" detail="true" (click)="gotoDevOptions()">
+            <ion-icon name="fas-terminal" slot="start" aria-hidden="true"></ion-icon>
+            <ion-label class="ion-text-wrap">
+                {{ 'core.settings.developeroptions' | translate }}
+            </ion-label>
+        </ion-item>
         <ion-item (longPress)="copyItemInfo($event)">
             <ion-label class="ion-text-wrap">
                 <h2>{{ 'core.settings.appversion' | translate}}</h2>
                 <p>{{ deviceInfo.versionName }} ({{ deviceInfo.versionCode }})</p>
             </ion-label>
         </ion-item>
-        <ion-item (longPress)="copyItemInfo($event)">
+        <ion-item (longPress)="copyItemInfo($event)" (click)="enableDevOptions()">
             <ion-label class="ion-text-wrap">
                 <h2>{{ 'core.settings.compilationinfo' | translate }}</h2>
                 <p *ngIf="deviceInfo.compilationTime">{{ deviceInfo.compilationTime | coreFormatDate: "LLL Z": false }}</p>
diff --git a/src/core/features/settings/pages/deviceinfo/deviceinfo.module.ts b/src/core/features/settings/pages/deviceinfo/deviceinfo.module.ts
index d2cecabe2..2bc510b76 100644
--- a/src/core/features/settings/pages/deviceinfo/deviceinfo.module.ts
+++ b/src/core/features/settings/pages/deviceinfo/deviceinfo.module.ts
@@ -17,12 +17,17 @@ import { RouterModule, Routes } from '@angular/router';
 
 import { CoreSharedModule } from '@/core/shared.module';
 import { CoreSettingsDeviceInfoPage } from './deviceinfo';
+import { CoreSettingsDevPage } from '../dev/dev';
 
 const routes: Routes = [
     {
         path: '',
         component: CoreSettingsDeviceInfoPage,
     },
+    {
+        path: 'dev',
+        component: CoreSettingsDevPage,
+    },
 ];
 
 @NgModule({
@@ -32,6 +37,7 @@ const routes: Routes = [
     ],
     declarations: [
         CoreSettingsDeviceInfoPage,
+        CoreSettingsDevPage,
     ],
     exports: [RouterModule],
 })
diff --git a/src/core/features/settings/pages/deviceinfo/deviceinfo.ts b/src/core/features/settings/pages/deviceinfo/deviceinfo.ts
index 980adb015..2911ec1cd 100644
--- a/src/core/features/settings/pages/deviceinfo/deviceinfo.ts
+++ b/src/core/features/settings/pages/deviceinfo/deviceinfo.ts
@@ -23,6 +23,9 @@ import { CoreSites } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
 import { Subscription } from 'rxjs';
 import { CorePushNotifications } from '@features/pushnotifications/services/pushnotifications';
+import { CoreConfig } from '@services/config';
+import { CoreDomUtils } from '@services/utils/dom';
+import { CoreNavigator } from '@services/navigator';
 
 /**
  * Device Info to be shown and copied to clipboard.
@@ -69,6 +72,10 @@ export class CoreSettingsDeviceInfoPage implements OnDestroy {
     deviceOsTranslated?: string;
     currentLangName?: string;
     fsClickable = false;
+    showDevOptions = false;
+    protected devOptionsClickCounter = 0;
+    protected devOptionsForced = false;
+    protected devOptionsClickTimeout?: number;
 
     protected onlineObserver?: Subscription;
 
@@ -171,7 +178,7 @@ export class CoreSettingsDeviceInfoPage implements OnDestroy {
         this.onlineObserver = Network.onChange().subscribe(() => {
             // Execute the callback in the Angular zone, so change detection doesn't stop working.
             NgZone.run(() => {
-                this.deviceInfo!.networkStatus = appProvider.isOnline() ? 'online' : 'offline';
+                this.deviceInfo.networkStatus = appProvider.isOnline() ? 'online' : 'offline';
             });
         });
 
@@ -193,6 +200,10 @@ export class CoreSettingsDeviceInfoPage implements OnDestroy {
             this.deviceInfo.fileSystemRoot = basepath;
             this.fsClickable = fileProvider.usesHTMLAPI();
         }
+
+        const showDevOptionsOnConfig = await CoreConfig.get('showDevOptions', 0);
+        this.devOptionsForced = CoreConstants.BUILD.isDevelopment || CoreConstants.BUILD.isTesting;
+        this.showDevOptions = this.devOptionsForced || showDevOptionsOnConfig == 1;
     }
 
     /**
@@ -221,4 +232,44 @@ export class CoreSettingsDeviceInfoPage implements OnDestroy {
         this.onlineObserver && this.onlineObserver.unsubscribe();
     }
 
+    /**
+     * 5 clicks will enable dev options.
+     */
+    async enableDevOptions(): Promise<void> {
+        if (this.devOptionsForced) {
+            return;
+        }
+
+        clearTimeout(this.devOptionsClickTimeout);
+        this.devOptionsClickCounter++;
+
+        if (this.devOptionsClickCounter == 5) {
+            if (!this.showDevOptions) {
+                this.showDevOptions = true;
+                await CoreConfig.set('showDevOptions', 1);
+
+                CoreDomUtils.showToast('core.settings.youradev', true);
+            } else {
+                this.showDevOptions = false;
+                await CoreConfig.delete('showDevOptions');
+            }
+
+            this.devOptionsClickCounter = 0;
+
+            return;
+        }
+
+        this.devOptionsClickTimeout = window.setTimeout(() => {
+            this.devOptionsClickTimeout = undefined;
+            this.devOptionsClickCounter = 0;
+        }, 500);
+    }
+
+    /**
+     * Navigate to dev options.
+     */
+    gotoDevOptions(): void {
+        CoreNavigator.navigate('dev');
+    }
+
 }
diff --git a/src/core/features/siteplugins/services/siteplugins.ts b/src/core/features/siteplugins/services/siteplugins.ts
index 382c06f40..6d7fdb702 100644
--- a/src/core/features/siteplugins/services/siteplugins.ts
+++ b/src/core/features/siteplugins/services/siteplugins.ts
@@ -314,6 +314,15 @@ export class CoreSitePluginsProvider {
         return this.sitePlugins[name];
     }
 
+    /**
+     * Get the current site plugin list.
+     *
+     * @return Plugin list ws info.
+     */
+    getCurrentSitePluginList(): CoreSitePluginsWSPlugin[] {
+        return CoreUtils.objectToArray(this.sitePlugins).map((plugin) => plugin.plugin);
+    }
+
     /**
      * Invalidate all WS call to a certain method.
      *
diff --git a/src/core/features/styles/services/styles.ts b/src/core/features/styles/services/styles.ts
index b0854fe00..7bb761f42 100644
--- a/src/core/features/styles/services/styles.ts
+++ b/src/core/features/styles/services/styles.ts
@@ -330,9 +330,9 @@ export class CoreStylesService {
         (<any> element).disabled = !!disable; // eslint-disable-line @typescript-eslint/no-explicit-any
 
         if (disable) {
-            element.setAttribute('disabled', 'true');
+            element.setAttribute('media', 'disabled');
         } else {
-            element.removeAttribute('disabled');
+            element.removeAttribute('media');
         }
     }
 

From a200b97867e49d60d99043645901b543380728fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 13 Oct 2021 10:58:43 +0200
Subject: [PATCH 0140/1008] MOBILE-3865 about: Add a11y statement link

---
 scripts/langindex.json                            | 1 +
 src/core/features/settings/lang.json              | 1 +
 src/core/features/settings/pages/about/about.html | 9 +++++++++
 src/core/features/settings/pages/about/about.ts   | 1 +
 src/types/config.d.ts                             | 1 +
 5 files changed, 13 insertions(+)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 3d0223dbb..0ec207051 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -2068,6 +2068,7 @@
   "core.sending": "chat",
   "core.serverconnection": "error",
   "core.settings.about": "local_moodlemobileapp",
+  "core.settings.accessibilitystatement": "local_moodlemobileapp",
   "core.settings.appsettings": "local_moodlemobileapp",
   "core.settings.appversion": "local_moodlemobileapp",
   "core.settings.cannotsyncloggedout": "local_moodlemobileapp",
diff --git a/src/core/features/settings/lang.json b/src/core/features/settings/lang.json
index 55af8e563..edaa16204 100644
--- a/src/core/features/settings/lang.json
+++ b/src/core/features/settings/lang.json
@@ -1,5 +1,6 @@
 {
     "about": "About",
+    "accessibilitystatement": "Accessibility statement",
     "appsettings": "App settings",
     "appversion": "App version",
     "cannotsyncloggedout": "This site cannot be synchronised because you've logged out. Please try again when you're logged in the site again.",
diff --git a/src/core/features/settings/pages/about/about.html b/src/core/features/settings/pages/about/about.html
index 73169981e..255941ddc 100644
--- a/src/core/features/settings/pages/about/about.html
+++ b/src/core/features/settings/pages/about/about.html
@@ -28,6 +28,15 @@
             <ion-icon name="fas-user-shield" slot="start" aria-hidden="true"></ion-icon>
             <ion-label>{{ 'core.settings.privacypolicy' | translate }}</ion-label>
         </ion-item>
+        <ion-item
+            *ngIf="a11yStatement"
+            class="ion-text-wrap"
+            button core-link auto-login="no" [href]="a11yStatement"
+            detail="true" detailIcon="open-outline"
+        >
+            <ion-icon name="fas-universal-access" slot="start" aria-hidden="true"></ion-icon>
+            <ion-label>{{ 'core.settings.accessibilitystatement' | translate }}</ion-label>
+        </ion-item>
         <ion-item
             *ngIf="feedbackFormUrl"
             class="ion-text-wrap"
diff --git a/src/core/features/settings/pages/about/about.ts b/src/core/features/settings/pages/about/about.ts
index 9fe71636a..9135a6316 100644
--- a/src/core/features/settings/pages/about/about.ts
+++ b/src/core/features/settings/pages/about/about.ts
@@ -31,6 +31,7 @@ export class CoreSettingsAboutPage {
     versionName: string;
     privacyPolicy: string;
     feedbackFormUrl = CoreConstants.CONFIG.feedbackFormUrl ?? 'https://feedback.moodle.org/mobileapp';
+    a11yStatement = CoreConstants.CONFIG.a11yStatement ?? 'https://apps.moodle.com/admin/tool/policy/view.php?versionid=5';
 
     constructor() {
         const currentSite = CoreSites.getCurrentSite();
diff --git a/src/types/config.d.ts b/src/types/config.d.ts
index 7f3fcc65c..3d5b59ebf 100644
--- a/src/types/config.d.ts
+++ b/src/types/config.d.ts
@@ -56,4 +56,5 @@ export interface EnvironmentConfig {
     iOSDefaultOpenFileAction?: OpenFileAction;
     customMainMenuItems?: CoreMainMenuLocalizedCustomItem[];
     feedbackFormUrl?: string | false;
+    a11yStatement?: string | false;
 }

From d7e6e04f659714c3e21d8532627ac2d577c92e6a Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 14 Oct 2021 13:13:27 +0200
Subject: [PATCH 0141/1008] MOBILE-2848 lang: Send language to WebServices

---
 src/core/classes/site.ts                      | 20 ++++++++++++++++++-
 .../settings/pages/general/general.ts         |  8 +++++++-
 src/core/services/sites.ts                    | 11 ++++++++++
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/core/classes/site.ts b/src/core/classes/site.ts
index b22ad2110..5cd67966d 100644
--- a/src/core/classes/site.ts
+++ b/src/core/classes/site.ts
@@ -40,6 +40,7 @@ import { CoreWSError } from '@classes/errors/wserror';
 import { CoreLogger } from '@singletons/logger';
 import { Translate } from '@singletons';
 import { CoreIonLoadingElement } from './ion-loading';
+import { CoreLang } from '@services/lang';
 
 /**
  * QR Code type enumeration.
@@ -574,9 +575,14 @@ export class CoreSite {
 
             // Call the WS.
             try {
+                // Send the language to use. Do it after checking cache to prevent losing offline data when changing language.
+                data.moodlewssettinglang = preSets.lang ?? await CoreLang.getCurrentLanguage();
+                data.moodlewssettinglang = data.moodlewssettinglang.replace('-', '_'); // Moodle uses underscore instead of dash.
+
                 const response = await this.callOrEnqueueRequest<T>(method, data, preSets, wsPreSets);
 
                 if (preSets.saveToCache) {
+                    delete data.moodlewssettinglang;
                     this.saveToCache(method, data, response, preSets);
                 }
 
@@ -786,7 +792,8 @@ export class CoreSite {
             return;
         }
 
-        const requestsData = {
+        let lang: string | undefined;
+        const requestsData: Record<string, unknown> = {
             requests: requests.map((request) => {
                 const args = {};
                 const settings = {};
@@ -799,6 +806,11 @@ export class CoreSite {
                         if (match[1] == 'settingfilter' || match[1] == 'settingfileurl') {
                             // Undo special treatment of these settings in CoreWSProvider.convertValuesToString.
                             value = (value == 'true' ? '1' : '0');
+                        } else if (match[1] == 'settinglang') {
+                            // Use the lang globally to avoid exceptions with languages not installed.
+                            lang = value;
+
+                            return;
                         }
                         settings[match[1]] = value;
                     } else {
@@ -813,6 +825,7 @@ export class CoreSite {
                 };
             }),
         };
+        requestsData.moodlewssettinglang = lang;
 
         const wsPresets: CoreWSPreSets = {
             siteUrl: this.siteUrl,
@@ -1942,6 +1955,11 @@ export type CoreSiteWSPreSets = {
      */
     rewriteurls?: boolean;
 
+    /**
+     * Language to send to the WebService (moodlewssettinglang). Defaults to app's language.
+     */
+    lang?: string;
+
     /**
      * Defaults to true. Set to false when the expected response is null.
      */
diff --git a/src/core/features/settings/pages/general/general.ts b/src/core/features/settings/pages/general/general.ts
index 344164a37..e8ef89874 100644
--- a/src/core/features/settings/pages/general/general.ts
+++ b/src/core/features/settings/pages/general/general.ts
@@ -23,6 +23,8 @@ import { CoreSettingsHelper, CoreColorScheme, CoreZoomLevel } from '../../servic
 import { CoreApp } from '@services/app';
 import { CoreIframeUtils } from '@services/utils/iframe';
 import { Diagnostic } from '@singletons';
+import { CoreSites } from '@services/sites';
+import { CoreUtils } from '@services/utils/utils';
 
 /**
  * Page that displays the general settings.
@@ -109,7 +111,11 @@ export class CoreSettingsGeneralPage {
      * Called when a new language is selected.
      */
     languageChanged(): void {
-        CoreLang.changeCurrentLanguage(this.selectedLanguage).finally(() => {
+        CoreLang.changeCurrentLanguage(this.selectedLanguage).finally(async () => {
+            // Invalidate cache for all sites to get the content in the right language.
+            const sites = await CoreSites.getSitesInstances();
+            await CoreUtils.ignoreErrors(Promise.all(sites.map((site) => site.invalidateWsCache())));
+
             CoreEvents.trigger(CoreEvents.LANGUAGE_CHANGED, this.selectedLanguage);
         });
     }
diff --git a/src/core/services/sites.ts b/src/core/services/sites.ts
index fd3d4c85b..702ca7a50 100644
--- a/src/core/services/sites.ts
+++ b/src/core/services/sites.ts
@@ -1145,6 +1145,17 @@ export class CoreSitesProvider {
         return sites.map((site) => site.id);
     }
 
+    /**
+     * Get instances of all stored sites.
+     *
+     * @return Promise resolved when the sites are retrieved.
+     */
+    async getSitesInstances(): Promise<CoreSite[]> {
+        const siteIds = await this.getSitesIds();
+
+        return await Promise.all(siteIds.map(async (siteId) => await this.getSite(siteId)));
+    }
+
     /**
      * Login the user in a site.
      *

From 9efe5a5c09c90047c78e63601089e16a4348e667 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 14 Oct 2021 15:03:13 +0200
Subject: [PATCH 0142/1008] MOBILE-2848 eslint: Fix warnings in Site, Lang, WS

---
 src/core/classes/site.ts  | 23 +++++++++++++----------
 src/core/services/lang.ts |  6 +++---
 src/core/services/ws.ts   | 11 +++++++----
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/core/classes/site.ts b/src/core/classes/site.ts
index 5cd67966d..655b654c2 100644
--- a/src/core/classes/site.ts
+++ b/src/core/classes/site.ts
@@ -309,10 +309,7 @@ export class CoreSite {
 
         // Index function by name to speed up wsAvailable method.
         if (infos?.functions) {
-            infos.functionsByName = {};
-            infos.functions.forEach((func) => {
-                infos.functionsByName![func.name] = func;
-            });
+            infos.functionsByName = CoreUtils.arrayToObject(infos.functions, 'name');
         }
     }
 
@@ -907,7 +904,8 @@ export class CoreSite {
         preSets: CoreSiteWSPreSets,
         emergency?: boolean,
     ): Promise<T> {
-        if (!this.db || !preSets.getFromCache) {
+        const db = this.db;
+        if (!db || !preSets.getFromCache) {
             throw new CoreError('Get from cache is disabled.');
         }
 
@@ -915,11 +913,11 @@ export class CoreSite {
         let entry: CoreSiteWSCacheRecord | undefined;
 
         if (preSets.getCacheUsingCacheKey || (emergency && preSets.getEmergencyCacheUsingCacheKey)) {
-            const entries = await this.db.getRecords<CoreSiteWSCacheRecord>(CoreSite.WS_CACHE_TABLE, { key: preSets.cacheKey });
+            const entries = await db.getRecords<CoreSiteWSCacheRecord>(CoreSite.WS_CACHE_TABLE, { key: preSets.cacheKey });
 
             if (!entries.length) {
                 // Cache key not found, get by params sent.
-                entry = await this.db!.getRecord(CoreSite.WS_CACHE_TABLE, { id });
+                entry = await db.getRecord(CoreSite.WS_CACHE_TABLE, { id });
             } else {
                 if (entries.length > 1) {
                     // More than one entry found. Search the one with same ID as this call.
@@ -931,7 +929,7 @@ export class CoreSite {
                 }
             }
         } else {
-            entry = await this.db!.getRecord(CoreSite.WS_CACHE_TABLE, { id });
+            entry = await db.getRecord(CoreSite.WS_CACHE_TABLE, { id });
         }
 
         if (typeof entry == 'undefined') {
@@ -946,7 +944,7 @@ export class CoreSite {
         if (!preSets.omitExpires) {
             expirationTime = entry.expirationTime + this.getExpirationDelay(preSets.updateFrequency);
 
-            if (now > expirationTime!) {
+            if (now > expirationTime) {
                 this.logger.debug('Cached element found, but it is expired');
 
                 throw new CoreError('Cache entry is expired.');
@@ -1747,7 +1745,12 @@ export class CoreSite {
 
         if (CoreSite.MOODLE_RELEASES[data.major] === undefined) {
             // Major version not found. Use the last one.
-            data.major = Object.keys(CoreSite.MOODLE_RELEASES).pop()!;
+            const major = Object.keys(CoreSite.MOODLE_RELEASES).pop();
+            if (!major) {
+                return 0;
+            }
+
+            data.major = major;
         }
 
         return CoreSite.MOODLE_RELEASES[data.major] + data.minor;
diff --git a/src/core/services/lang.ts b/src/core/services/lang.ts
index b3eee335e..f0430b64f 100644
--- a/src/core/services/lang.ts
+++ b/src/core/services/lang.ts
@@ -403,11 +403,11 @@ export class CoreLangProvider {
 
         this.customStringsRaw = strings;
 
-        if (currentLangChanged) {
+        if (currentLangChanged && this.currentLanguage) {
             // Some lang strings have changed, emit an event to update the pipes.
             Translate.onLangChange.emit({
-                lang: this.currentLanguage!,
-                translations: Translate.translations[this.currentLanguage!],
+                lang: this.currentLanguage,
+                translations: Translate.translations[this.currentLanguage],
             });
         }
     }
diff --git a/src/core/services/ws.ts b/src/core/services/ws.ts
index bb2e63719..ff2d7e869 100644
--- a/src/core/services/ws.ts
+++ b/src/core/services/ws.ts
@@ -336,8 +336,9 @@ export class CoreWSProvider {
      * @return Promise resolved with the mimetype or '' if failure.
      */
     async getRemoteFileMimeType(url: string, ignoreCache?: boolean): Promise<string> {
-        if (this.mimeTypeCache[url] && !ignoreCache) {
-            return this.mimeTypeCache[url]!;
+        const cachedMimeType = this.mimeTypeCache[url];
+        if (cachedMimeType && !ignoreCache) {
+            return cachedMimeType;
         }
 
         try {
@@ -722,10 +723,12 @@ export class CoreWSProvider {
      */
     protected processRetryQueue(): void {
         if (this.retryCalls.length > 0 && this.retryTimeout == 0) {
-            const call = this.retryCalls.shift();
+            const call = this.retryCalls[0];
+            this.retryCalls.shift();
+
             // Add a delay between calls.
             setTimeout(() => {
-                call!.deferred.resolve(this.performPost(call!.method, call!.siteUrl, call!.data, call!.preSets));
+                call.deferred.resolve(this.performPost(call.method, call.siteUrl, call.data, call.preSets));
                 this.processRetryQueue();
             }, 200);
         } else {

From 6acced04fd7e543681ec6e69199daff1386b23f1 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 19 Oct 2021 08:19:44 +0200
Subject: [PATCH 0143/1008] MOBILE-3833 performance: Fix behat plugin branch

---
 .github/workflows/performance.yml | 2 +-
 scripts/update_lang.sh            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml
index 99894bdde..0f886e523 100644
--- a/.github/workflows/performance.yml
+++ b/.github/workflows/performance.yml
@@ -19,7 +19,7 @@ jobs:
     - name: Additional checkouts
       run: |
         git clone --branch master --depth 1 git://github.com/moodle/moodle $GITHUB_WORKSPACE/moodle
-        git clone --branch master --depth 1 git://github.com/moodlehq/moodle-local_moodlemobileapp $GITHUB_WORKSPACE/moodle/local/moodlemobileapp
+        git clone --branch integration --depth 1 git://github.com/moodlehq/moodle-local_moodlemobileapp $GITHUB_WORKSPACE/moodle/local/moodlemobileapp
         git clone --branch master --depth 1 git://github.com/moodlehq/moodle-docker $GITHUB_WORKSPACE/moodle-docker
     - name: Install npm packages
       run: npm ci
diff --git a/scripts/update_lang.sh b/scripts/update_lang.sh
index b47df3a7d..7cd9d1120 100755
--- a/scripts/update_lang.sh
+++ b/scripts/update_lang.sh
@@ -10,7 +10,7 @@ source "lang_functions.sh"
 forceLang=$1
 
 print_title 'Getting local mobile langs'
-git clone --depth 1 https://github.com/moodlehq/moodle-local_moodlemobileapp.git ../../moodle-local_moodlemobileapp
+git clone --branch integration --depth 1 https://github.com/moodlehq/moodle-local_moodlemobileapp.git ../../moodle-local_moodlemobileapp
 
 if [ -z $forceLang ]; then
     get_languages

From f17a2023f473a43f9a6090f4509aeb67761c6b1c Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 19 Oct 2021 17:51:14 +0200
Subject: [PATCH 0144/1008] MOBILE-1804 performance: Measure login & open

---
 tests/behat/performance.feature | 50 +++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/tests/behat/performance.feature b/tests/behat/performance.feature
index b3c1f40d6..264e395af 100644
--- a/tests/behat/performance.feature
+++ b/tests/behat/performance.feature
@@ -1,6 +1,20 @@
 @app @javascript @performance
 Feature: Measure performance.
 
+  Background:
+    Given the following "users" exist:
+      | username |
+      | student1 |
+    And the following "courses" exist:
+      | fullname | shortname | category |
+      | Course 1 | C1        | 0        |
+    And the following "course enrolments" exist:
+      | user     | course | role    |
+      | student1 | C1     | student |
+    And the following "activities" exist:
+      | activity | name            | intro                   | course | idnumber | option                       | section |
+      | choice   | Choice course 1 | Test choice description | C1     | choice1  | Option 1, Option 2, Option 3 | 1       |
+
   Scenario: First Contentful Paint
     Given I start measuring "First Contentful Paint"
     When I launch the app runtime
@@ -32,3 +46,39 @@ Feature: Measure performance.
 
     When I stop measuring "Total Blocking Time"
     Then "Total Blocking Time" should have taken less than 2 seconds
+
+  Scenario: Login
+    When I launch the app
+    Then I should see "Connect to Moodle"
+    But I should not see "Welcome to the Moodle App!"
+
+    When I start measuring "Login"
+    And I set the field "Your site" to "$WWWROOT" in the app
+    And I press "Connect to your site" in the app
+    And I log in as "student1"
+    Then I should find "Course 1" in the app
+
+    When I stop measuring "Login"
+    Then "Login" should have taken less than 10 seconds
+
+  Scenario: Open Activity
+    When I launch the app
+    Then I should see "Connect to Moodle"
+    But I should not see "Welcome to the Moodle App!"
+
+    And I set the field "Your site" to "$WWWROOT" in the app
+    And I press "Connect to your site" in the app
+    And I log in as "student1"
+    Then I should find "Course 1" in the app
+
+    When I reload the page
+    And I start measuring "Open Activity"
+    And I wait the app to restart
+    Then I should find "Course 1" in the app
+
+    When I press "Course 1" in the app
+    And I press "Choice course 1" in the app
+    Then I should find "Option 1" in the app
+
+    When I stop measuring "Open Activity"
+    Then "Open Activity" should have taken less than 7 seconds

From 3bc68dd28ae4c39e5cd741c3fb822833063ec4ab Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 6 Oct 2021 08:41:39 +0200
Subject: [PATCH 0145/1008] MOBILE-3887 notifications: Always use
 core_message_get_messages

---
 src/addons/notifications/pages/list/list.html |   2 +-
 src/addons/notifications/pages/list/list.ts   |  20 +-
 .../pages/settings/settings.html              |   2 +-
 .../notifications/pages/settings/settings.ts  |   8 +-
 .../services/handlers/mainmenu.ts             |   5 +-
 .../services/notifications-helper.ts          |  63 ----
 .../notifications/services/notifications.ts   | 306 ++++++++----------
 src/core/classes/site.ts                      |   1 +
 8 files changed, 149 insertions(+), 258 deletions(-)

diff --git a/src/addons/notifications/pages/list/list.html b/src/addons/notifications/pages/list/list.html
index c526fe5cf..aa11a1300 100644
--- a/src/addons/notifications/pages/list/list.html
+++ b/src/addons/notifications/pages/list/list.html
@@ -36,7 +36,7 @@
 
                 <ion-label>
                     <p class="item-heading">{{ notification.subject }}</p>
-                    <p *ngIf="notification.userfromfullname">{{ notification.userfromfullname }}</p>
+                    <p *ngIf="notification.useridfrom > 0">{{ notification.userfromfullname }}</p>
                 </ion-label>
                 <ion-note slot="end" class="ion-float-end ion-text-end">
                     {{ notification.timecreated | coreDateDayOrTime }}
diff --git a/src/addons/notifications/pages/list/list.ts b/src/addons/notifications/pages/list/list.ts
index 589e0c8c7..a6d2406a5 100644
--- a/src/addons/notifications/pages/list/list.ts
+++ b/src/addons/notifications/pages/list/list.ts
@@ -21,8 +21,11 @@ import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreEvents, CoreEventObserver } from '@singletons/events';
-import { AddonNotifications, AddonNotificationsAnyNotification, AddonNotificationsProvider } from '../../services/notifications';
-import { AddonNotificationsHelper } from '../../services/notifications-helper';
+import {
+    AddonNotifications,
+    AddonNotificationsNotificationMessageFormatted,
+    AddonNotificationsProvider,
+} from '../../services/notifications';
 import { CorePushNotificationsDelegate } from '@features/pushnotifications/services/push-delegate';
 
 /**
@@ -89,9 +92,7 @@ export class AddonNotificationsListPage implements OnInit, OnDestroy {
         this.loadMoreError = false;
 
         try {
-            const result = await AddonNotificationsHelper.getNotifications(refresh ? [] : this.notifications, {
-                onlyPopupNotifications: true,
-            });
+            const result = await AddonNotifications.getNotifications(refresh ? [] : this.notifications);
 
             const notifications = result.notifications.map((notification) => this.formatText(notification));
 
@@ -156,8 +157,9 @@ export class AddonNotificationsListPage implements OnInit, OnDestroy {
         try {
             this.loadingMarkAllNotificationsAsRead = true;
 
-            const unread = await AddonNotifications.getUnreadNotificationsCount();
+            let unread = await AddonNotifications.getUnreadNotificationsCount();
 
+            unread = typeof unread === 'string' ? parseInt(unread) : unread;
             this.canMarkAllNotificationsAsRead = unread > 0;
         } finally {
             this.loadingMarkAllNotificationsAsRead = false;
@@ -198,14 +200,14 @@ export class AddonNotificationsListPage implements OnInit, OnDestroy {
      *
      * @param notification The notification object.
      */
-    protected formatText(notification: AddonNotificationsAnyNotification): FormattedNotification {
+    protected formatText(notification: AddonNotificationsNotificationMessageFormatted): FormattedNotification {
         const formattedNotification: FormattedNotification = notification;
         formattedNotification.displayfullhtml = this.shouldDisplayFullHtml(notification);
         formattedNotification.iconurl = formattedNotification.iconurl || undefined; // Make sure the property exists.
 
         formattedNotification.mobiletext = formattedNotification.displayfullhtml ?
             notification.fullmessagehtml :
-            CoreTextUtils.replaceNewLines(formattedNotification.mobiletext!.replace(/-{4,}/ig, ''), '<br>');
+            CoreTextUtils.replaceNewLines((formattedNotification.mobiletext || '').replace(/-{4,}/ig, ''), '<br>');
 
         return formattedNotification;
     }
@@ -253,7 +255,7 @@ export class AddonNotificationsListPage implements OnInit, OnDestroy {
 
 }
 
-type FormattedNotification = AddonNotificationsAnyNotification & {
+type FormattedNotification = AddonNotificationsNotificationMessageFormatted & {
     displayfullhtml?: boolean; // Whether to display the full HTML of the notification.
     iconurl?: string;
 };
diff --git a/src/addons/notifications/pages/settings/settings.html b/src/addons/notifications/pages/settings/settings.html
index 536c149c6..e8e9e7b49 100644
--- a/src/addons/notifications/pages/settings/settings.html
+++ b/src/addons/notifications/pages/settings/settings.html
@@ -23,7 +23,7 @@
         <ion-card>
             <ion-item class="ion-text-wrap" *ngIf="preferences">
                 <ion-label>{{ 'addon.notifications.notifications' | translate }}</ion-label>
-                <ion-toggle [(ngModel)]="preferences!.enableall" (ngModelChange)="enableAll(preferences!.enableall)"></ion-toggle>
+                <ion-toggle [(ngModel)]="preferences.enableall" (ngModelChange)="enableAll(preferences.enableall)"></ion-toggle>
             </ion-item>
             <ion-item class="ion-text-wrap" *ngIf="canChangeSound">
                 <ion-label>{{ 'addon.notifications.playsound' | translate }}</ion-label>
diff --git a/src/addons/notifications/pages/settings/settings.ts b/src/addons/notifications/pages/settings/settings.ts
index f87ced644..d8cc886d3 100644
--- a/src/addons/notifications/pages/settings/settings.ts
+++ b/src/addons/notifications/pages/settings/settings.ts
@@ -161,7 +161,7 @@ export class AddonNotificationsSettingsPage implements OnInit, OnDestroy {
      * @param name Name of the selected processor.
      */
     changeProcessor(name: string): void {
-        const processor = this.preferences!.processors.find((processor) => processor.name == name);
+        const processor = this.preferences?.processors.find((processor) => processor.name == name);
 
         if (processor) {
             this.loadProcessor(processor);
@@ -246,6 +246,10 @@ export class AddonNotificationsSettingsPage implements OnInit, OnDestroy {
      * @return Promise resolved when done.
      */
     async enableAll(enable?: boolean): Promise<void> {
+        if (!this.preferences) {
+            return;
+        }
+
         const modal = await CoreDomUtils.showModalLoading('core.sending', true);
 
         try {
@@ -256,7 +260,7 @@ export class AddonNotificationsSettingsPage implements OnInit, OnDestroy {
         } catch (error) {
             // Show error and revert change.
             CoreDomUtils.showErrorModal(error);
-            this.preferences!.enableall = !this.preferences!.enableall;
+            this.preferences.enableall = !this.preferences.enableall;
         } finally {
             modal.dismiss();
         }
diff --git a/src/addons/notifications/services/handlers/mainmenu.ts b/src/addons/notifications/services/handlers/mainmenu.ts
index 5cb4584d2..e56ef86a5 100644
--- a/src/addons/notifications/services/handlers/mainmenu.ts
+++ b/src/addons/notifications/services/handlers/mainmenu.ts
@@ -112,8 +112,9 @@ export class AddonNotificationsMainMenuHandlerService implements CoreMainMenuHan
         try {
             const unreadCount = await AddonNotifications.getUnreadNotificationsCount(undefined, siteId);
 
-            this.handlerData.badge = unreadCount > 0 ? String(unreadCount) : '';
-            CorePushNotifications.updateAddonCounter('AddonNotifications', unreadCount, siteId);
+            const unreadCountNumber = typeof unreadCount === 'string' ? parseInt(unreadCount) : unreadCount;
+            this.handlerData.badge = unreadCountNumber > 0 ? String(unreadCount) : '';
+            CorePushNotifications.updateAddonCounter('AddonNotifications', unreadCountNumber, siteId);
         } catch {
             this.handlerData.badge = '';
         } finally {
diff --git a/src/addons/notifications/services/notifications-helper.ts b/src/addons/notifications/services/notifications-helper.ts
index 77adc8eec..c83bea266 100644
--- a/src/addons/notifications/services/notifications-helper.ts
+++ b/src/addons/notifications/services/notifications-helper.ts
@@ -14,20 +14,15 @@
 
 import { Injectable } from '@angular/core';
 
-import { CoreSites } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
 import { makeSingleton } from '@singletons';
 import { AddonMessageOutputDelegate } from '@addons/messageoutput/services/messageoutput-delegate';
 import {
-    AddonNotifications,
-    AddonNotificationsAnyNotification,
-    AddonNotificationsGetNotificationsOptions,
     AddonNotificationsPreferences,
     AddonNotificationsPreferencesComponent,
     AddonNotificationsPreferencesNotification,
     AddonNotificationsPreferencesNotificationProcessor,
     AddonNotificationsPreferencesProcessor,
-    AddonNotificationsProvider,
 } from './notifications';
 
 /**
@@ -58,57 +53,6 @@ export class AddonNotificationsHelperProvider {
         return formattedPreferences;
     }
 
-    /**
-     * Get some notifications. It will try to use the new WS if available.
-     *
-     * @param notifications Current list of loaded notifications. It's used to calculate the offset.
-     * @param options Other options.
-     * @return Promise resolved with notifications and if can load more.
-     */
-    async getNotifications(
-        notifications: AddonNotificationsAnyNotification[],
-        options?: AddonNotificationsHelperGetNotificationsOptions,
-    ): Promise<{notifications: AddonNotificationsAnyNotification[]; canLoadMore: boolean}> {
-
-        notifications = notifications || [];
-        options = options || {};
-        options.limit = options.limit || AddonNotificationsProvider.LIST_LIMIT;
-        options.siteId = options.siteId || CoreSites.getCurrentSiteId();
-
-        if (options.onlyPopupNotifications) {
-            return AddonNotifications.getPopupNotifications(notifications.length, options);
-        }
-
-        // Use get_messages. We need 2 calls, one for read and the other one for unread.
-        const unreadFrom = notifications.reduce((total, current) => total + (current.read ? 0 : 1), 0);
-
-        const unread = await AddonNotifications.getUnreadNotifications(unreadFrom, options);
-
-        let newNotifications = unread;
-
-        if (unread.length < options.limit) {
-            // Limit not reached. Get read notifications until reach the limit.
-            const readLimit = options.limit - unread.length;
-            const readFrom = notifications.length - unreadFrom;
-            const readOptions = Object.assign({}, options, { limit: readLimit });
-
-            try {
-                const read = await AddonNotifications.getReadNotifications(readFrom, readOptions);
-
-                newNotifications = unread.concat(read);
-            } catch (error) {
-                if (unread.length <= 0) {
-                    throw error;
-                }
-            }
-        }
-
-        return {
-            notifications: newNotifications,
-            canLoadMore: notifications.length >= options.limit,
-        };
-    }
-
     /**
      * Get a certain processor from a list of processors.
      *
@@ -207,10 +151,3 @@ export type AddonNotificationsPreferencesNotificationFormatted = AddonNotificati
 export type AddonNotificationsPreferencesProcessorFormatted = AddonNotificationsPreferencesProcessor & {
     supported?: boolean; // Calculated in the app. Whether the processor is supported in the app.
 };
-
-/**
- * Options to pass to getNotifications.
- */
-export type AddonNotificationsHelperGetNotificationsOptions = AddonNotificationsGetNotificationsOptions & {
-    onlyPopupNotifications?: boolean; // Whether to get only popup notifications.
-};
diff --git a/src/addons/notifications/services/notifications.ts b/src/addons/notifications/services/notifications.ts
index ed445daf1..69e414a14 100644
--- a/src/addons/notifications/services/notifications.ts
+++ b/src/addons/notifications/services/notifications.ts
@@ -22,6 +22,7 @@ import { CoreUser } from '@features/user/services/user';
 import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
 import { CoreLogger } from '@singletons/logger';
 import { makeSingleton } from '@singletons';
+import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate';
 
 const ROOT_CACHE_KEY = 'mmaNotifications:';
 
@@ -46,24 +47,14 @@ export class AddonNotificationsProvider {
      * Function to format notification data.
      *
      * @param notifications List of notifications.
-     * @param read Whether the notifications are read or unread.
      * @return Promise resolved with notifications.
      */
     protected async formatNotificationsData(
-        notifications: AddonNotificationsGetMessagesMessage[],
-        read?: boolean,
-    ): Promise<AddonNotificationsGetMessagesMessageFormatted[]>;
-    protected async formatNotificationsData(
-        notifications: AddonNotificationsPopupNotification[],
-        read?: boolean,
-    ): Promise<AddonNotificationsPopupNotificationFormatted[]>;
-    protected async formatNotificationsData(
-        notifications: (AddonNotificationsGetMessagesMessage | AddonNotificationsPopupNotification)[],
-        read?: boolean,
-    ): Promise<AddonNotificationsAnyNotification[]> {
+        notifications: AddonNotificationsNotificationMessage[],
+    ): Promise<AddonNotificationsNotificationMessageFormatted[]> {
 
         const promises = notifications.map(async (notificationRaw) => {
-            const notification = <AddonNotificationsAnyNotification> notificationRaw;
+            const notification = <AddonNotificationsNotificationMessageFormatted> notificationRaw;
 
             // Set message to show.
             if (notification.component && notification.component == 'mod_forum') {
@@ -75,9 +66,7 @@ export class AddonNotificationsProvider {
             notification.moodlecomponent = notification.component;
             notification.notification = 1;
             notification.notif = 1;
-            if (typeof read != 'undefined') {
-                notification.read = read;
-            }
+            notification.read = notification.timeread > 0;
 
             if (typeof notification.customdata == 'string') {
                 notification.customdata = CoreTextUtils.parseJSON<Record<string, unknown>>(notification.customdata, {});
@@ -93,6 +82,15 @@ export class AddonNotificationsProvider {
                 }
             }
 
+            if (!notification.iconurl) {
+                // The iconurl is only returned in 4.0 or above. Calculate it if not present.
+                if (notification.component && notification.component.startsWith('mod_')) {
+                    notification.iconurl = await CoreCourseModuleDelegate.getModuleIconSrc(
+                        notification.component.replace('mod_', ''),
+                    );
+                }
+            }
+
             if (notification.useridfrom > 0) {
                 // Try to get the profile picture of the user.
                 try {
@@ -153,32 +151,99 @@ export class AddonNotificationsProvider {
         return ROOT_CACHE_KEY + 'list';
     }
 
+    /**
+     * Get some notifications.
+     *
+     * @param notifications Current list of loaded notifications. It's used to calculate the offset.
+     * @param options Other options.
+     * @return Promise resolved with notifications and if can load more.
+     */
+    async getNotifications(
+        notifications: AddonNotificationsNotificationMessageFormatted[],
+        options?: AddonNotificationsGetNotificationsOptions,
+    ): Promise<{notifications: AddonNotificationsNotificationMessageFormatted[]; canLoadMore: boolean}> {
+
+        notifications = notifications || [];
+        options = options || {};
+        options.limit = options.limit || AddonNotificationsProvider.LIST_LIMIT;
+        options.siteId = options.siteId || CoreSites.getCurrentSiteId();
+        let newNotifications: AddonNotificationsNotificationMessageFormatted[];
+
+        // Request 1 more notification so we can know if there are more notifications.
+        const originalLimit = options.limit;
+        options.limit + 1;
+
+        const site = await CoreSites.getSite(options.siteId);
+
+        if (site.isVersionGreaterEqualThan('4.0')) {
+            // In 4.0 the app can request read and unread at the same time.
+            options.offset = notifications.length;
+            newNotifications = await this.getNotificationsWithStatus(
+                AddonNotificationsGetReadType.BOTH,
+                options,
+            );
+        } else {
+            // We need 2 calls, one for read and the other one for unread.
+            options.offset = notifications.reduce((total, current) => total + (current.read ? 0 : 1), 0);
+
+            const unread = await this.getNotificationsWithStatus(AddonNotificationsGetReadType.UNREAD, options);
+
+            newNotifications = unread;
+
+            if (unread.length < options.limit) {
+                // Limit not reached. Get read notifications until reach the limit.
+                const readOptions = {
+                    ...options,
+                    offset: notifications.length - options.offset,
+                    limit: options.limit - unread.length,
+                };
+
+                try {
+                    const read = await this.getNotificationsWithStatus(AddonNotificationsGetReadType.READ, readOptions);
+
+                    newNotifications = unread.concat(read);
+                } catch (error) {
+                    if (unread.length <= 0) {
+                        throw error;
+                    }
+                }
+            }
+        }
+
+        return {
+            notifications: newNotifications.slice(0, originalLimit),
+            canLoadMore: newNotifications.length > originalLimit,
+        };
+    }
+
     /**
      * Get notifications from site.
      *
      * @param read True if should get read notifications, false otherwise.
-     * @param offset Position of the first notification to get.
      * @param options Other options.
      * @return Promise resolved with notifications.
      */
-    async getNotifications(
-        read: boolean,
-        offset: number,
-        options?: AddonNotificationsGetNotificationsOptions,
-    ): Promise<AddonNotificationsGetMessagesMessageFormatted[]> {
-        options = options || {};
+    protected async getNotificationsWithStatus(
+        read: AddonNotificationsGetReadType,
+        options: AddonNotificationsGetNotificationsOptions = {},
+    ): Promise<AddonNotificationsNotificationMessageFormatted[]> {
+        options.offset = options.offset || 0;
         options.limit = options.limit || AddonNotificationsProvider.LIST_LIMIT;
 
-        this.logger.debug(`Get ${(read ? 'read' : 'unread')} notifications from ${offset}. Limit: ${options.limit}`);
+        const typeText = read === AddonNotificationsGetReadType.READ ?
+            'read' :
+            (read === AddonNotificationsGetReadType.UNREAD ? 'unread' : 'read and unread');
+        this.logger.debug(`Get ${typeText} notifications from ${options.offset}. Limit: ${options.limit}`);
 
         const site = await CoreSites.getSite(options.siteId);
+
         const data: AddonNotificationsGetMessagesWSParams = {
             useridto: site.getUserId(),
             useridfrom: 0,
             type: 'notifications',
-            read: !!read,
+            read: read,
             newestfirst: true,
-            limitfrom: offset,
+            limitfrom: options.offset,
             limitnum: options.limit,
         };
         const preSets: CoreSiteWSPreSets = {
@@ -191,78 +256,7 @@ export class AddonNotificationsProvider {
 
         const notifications = response.messages;
 
-        return this.formatNotificationsData(notifications, read);
-    }
-
-    /**
-     * Get notifications from site using the new WebService.
-     *
-     * @param offset Position of the first notification to get.
-     * @param options Other options.
-     * @return Promise resolved with notifications and if can load more.
-     */
-    async getPopupNotifications(
-        offset: number,
-        options?: AddonNotificationsGetNotificationsOptions,
-    ): Promise<{notifications: AddonNotificationsPopupNotificationFormatted[]; canLoadMore: boolean}> {
-        options = options || {};
-        options.limit = options.limit || AddonNotificationsProvider.LIST_LIMIT;
-
-        this.logger.debug(`Get popup notifications from ${offset}. Limit: ${options.limit}`);
-
-        const site = await CoreSites.getSite(options.siteId);
-        const data: AddonNotificationsPopupGetPopupNotificationsWSParams = {
-            useridto: site.getUserId(),
-            newestfirst: true,
-            offset,
-            limit: options.limit + 1, // Get one more to calculate canLoadMore.
-        };
-        const preSets: CoreSiteWSPreSets = {
-            cacheKey: this.getNotificationsCacheKey(),
-            ...CoreSites.getReadingStrategyPreSets(options.readingStrategy), // Include reading strategy preSets.
-        };
-
-        // Get notifications.
-        const response = await site.read<AddonNotificationsGetPopupNotificationsResult>(
-            'message_popup_get_popup_notifications',
-            data,
-            preSets,
-        );
-
-        const notifications = await this.formatNotificationsData(response.notifications.slice(0, options.limit));
-
-        return {
-            canLoadMore: response.notifications.length > options.limit,
-            notifications,
-        };
-    }
-
-    /**
-     * Get read notifications from site.
-     *
-     * @param offset Position of the first notification to get.
-     * @param options Other options.
-     * @return Promise resolved with notifications.
-     */
-    getReadNotifications(
-        offset: number,
-        options?: AddonNotificationsGetNotificationsOptions,
-    ): Promise<AddonNotificationsGetMessagesMessageFormatted[]> {
-        return this.getNotifications(true, offset, options);
-    }
-
-    /**
-     * Get unread notifications from site.
-     *
-     * @param offset Position of the first notification to get.
-     * @param options Other options.
-     * @return Promise resolved with notifications.
-     */
-    getUnreadNotifications(
-        offset: number,
-        options?: AddonNotificationsGetNotificationsOptions,
-    ): Promise<AddonNotificationsGetMessagesMessageFormatted[]> {
-        return this.getNotifications(false, offset, options);
+        return this.formatNotificationsData(notifications);
     }
 
     /**
@@ -272,22 +266,27 @@ export class AddonNotificationsProvider {
      * @param siteId Site ID. If not defined, use current site.
      * @return Promise resolved with the message notifications count.
      */
-    async getUnreadNotificationsCount(userId?: number, siteId?: string): Promise<number> {
+    async getUnreadNotificationsCount(userId?: number, siteId?: string): Promise<number | string> {
         const site = await CoreSites.getSite(siteId);
 
-        userId = userId || site.getUserId();
-        const params: AddonNotificationsPopupGetUnreadPopupNotificationCountWSParams = {
-            useridto: userId,
-        };
-        const preSets: CoreSiteWSPreSets = {
-            getFromCache: false,
-            emergencyCache: false,
-            saveToCache: false,
-            typeExpected: 'number',
-        };
+        // @since 4.0
+        if (site.wsAvailable('core_message_get_unread_notification_count')) {
+            // @todo
+        }
 
+        // Fallback call
         try {
-            return await site.read<number>('message_popup_get_unread_popup_notification_count', params, preSets);
+            const unread = await this.getNotificationsWithStatus(AddonNotificationsGetReadType.UNREAD, {
+                limit: AddonNotificationsProvider.LIST_LIMIT,
+                siteId,
+            });
+
+            if (unread.length === AddonNotificationsProvider.LIST_LIMIT) {
+                // Maybe there are more notifications, include a '+';
+                return unread.length + '+';
+            }
+
+            return unread.length;
         } catch {
             // Return no messages if the call fails.
             return 0;
@@ -427,7 +426,7 @@ export type AddonNotificationsGetMessagesWSParams = {
     useridto: number; // The user id who received the message, 0 for any user.
     useridfrom?: number; // The user id who send the message, 0 for any user. -10 or -20 for no-reply or support user.
     type?: string; // Type of message to return, expected values are: notifications, conversations and both.
-    read?: boolean; // True for getting read messages, false for unread.
+    read?: AddonNotificationsGetReadType; // 0=unread, 1=read. @since 4.0 it also accepts 2=both.
     newestfirst?: boolean; // True for ordering by newest first, false for oldest first.
     limitfrom?: number; // Limit from.
     limitnum?: number; // Limit number.
@@ -437,14 +436,14 @@ export type AddonNotificationsGetMessagesWSParams = {
  * Data returned by core_message_get_messages WS.
  */
 export type AddonNotificationsGetMessagesWSResponse = {
-    messages: AddonNotificationsGetMessagesMessage[];
+    messages: AddonNotificationsNotificationMessage[];
     warnings?: CoreWSExternalWarning[];
 };
 
 /**
  * Message data returned by core_message_get_messages.
  */
-export type AddonNotificationsGetMessagesMessage = {
+export type AddonNotificationsNotificationMessage = {
     id: number; // Message id.
     useridfrom: number; // User from id.
     useridto: number; // User to id.
@@ -464,70 +463,14 @@ export type AddonNotificationsGetMessagesMessage = {
     component?: string; // @since 3.7. The component that generated the notification.
     eventtype?: string; // @since 3.7. The type of notification.
     customdata?: string; // @since 3.7. Custom data to be passed to the message processor.
+    iconurl?: string; // @since 4.0. Icon URL, only for notifications.
 };
 
 /**
  * Message data returned by core_message_get_messages with some calculated data.
  */
-export type AddonNotificationsGetMessagesMessageFormatted =
-        Omit<AddonNotificationsGetMessagesMessage, 'customdata'> & AddonNotificationsNotificationCalculatedData;
-
-/**
- * Params of message_popup_get_popup_notifications WS.
- */
-export type AddonNotificationsPopupGetPopupNotificationsWSParams = {
-    useridto: number; // The user id who received the message, 0 for current user.
-    newestfirst?: boolean; // True for ordering by newest first, false for oldest first.
-    limit?: number; // The number of results to return.
-    offset?: number; // Offset the result set by a given amount.
-};
-
-/**
- * Result of WS message_popup_get_popup_notifications.
- */
-export type AddonNotificationsGetPopupNotificationsResult = {
-    notifications: AddonNotificationsPopupNotification[];
-    unreadcount: number; // The number of unread message for the given user.
-};
-
-/**
- * Notification returned by message_popup_get_popup_notifications.
- */
-export type AddonNotificationsPopupNotification = {
-    id: number; // Notification id (this is not guaranteed to be unique within this result set).
-    useridfrom: number; // User from id.
-    useridto: number; // User to id.
-    subject: string; // The notification subject.
-    shortenedsubject: string; // The notification subject shortened with ellipsis.
-    text: string; // The message text formated.
-    fullmessage: string; // The message.
-    fullmessageformat: number; // Fullmessage format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
-    fullmessagehtml: string; // The message in html.
-    smallmessage: string; // The shorten message.
-    contexturl: string; // Context URL.
-    contexturlname: string; // Context URL link name.
-    timecreated: number; // Time created.
-    timecreatedpretty: string; // Time created in a pretty format.
-    timeread: number; // Time read.
-    read: boolean; // Notification read status.
-    deleted: boolean; // Notification deletion status.
-    iconurl: string; // URL for notification icon.
-    component?: string; // The component that generated the notification.
-    eventtype?: string; // The type of notification.
-    customdata?: string; // @since 3.7. Custom data to be passed to the message processor.
-};
-
-/**
- * Notification returned by message_popup_get_popup_notifications.
- */
-export type AddonNotificationsPopupNotificationFormatted =
-        Omit<AddonNotificationsPopupNotification, 'customdata'> & AddonNotificationsNotificationCalculatedData;
-
-/**
- * Any kind of notification that can be retrieved.
- */
-export type AddonNotificationsAnyNotification =
-        AddonNotificationsPopupNotificationFormatted | AddonNotificationsGetMessagesMessageFormatted;
+export type AddonNotificationsNotificationMessageFormatted =
+        Omit<AddonNotificationsNotificationMessage, 'customdata'> & AddonNotificationsNotificationCalculatedData;
 
 /**
  * Result of WS core_message_get_user_notification_preferences.
@@ -552,13 +495,6 @@ export type AddonNotificationsNotificationCalculatedData = {
     customdata?: Record<string, unknown>; // Parsed custom data.
 };
 
-/**
- * Params of message_popup_get_unread_popup_notification_count WS.
- */
-export type AddonNotificationsPopupGetUnreadPopupNotificationCountWSParams = {
-    useridto: number; // The user id who received the message, 0 for any user.
-};
-
 /**
  * Params of core_message_mark_all_notifications_as_read WS.
  */
@@ -585,8 +521,18 @@ export type CoreMessageMarkNotificationReadWSResponse = {
 };
 
 /**
- * Options to pass to getNotifications and getPopupNotifications.
+ * Options to pass to getNotifications.
  */
 export type AddonNotificationsGetNotificationsOptions = CoreSitesCommonWSOptions & {
+    offset?: number; // Offset to use. Defaults to 0.
     limit?: number; // Number of notifications to get. Defaults to LIST_LIMIT.
 };
+
+/**
+ * Constants to get either read, unread or both notifications.
+ */
+export enum AddonNotificationsGetReadType {
+    UNREAD = 0,
+    READ = 1,
+    BOTH = 2,
+}
diff --git a/src/core/classes/site.ts b/src/core/classes/site.ts
index 655b654c2..3d7a70130 100644
--- a/src/core/classes/site.ts
+++ b/src/core/classes/site.ts
@@ -86,6 +86,7 @@ export class CoreSite {
         '3.9': 2020061500,
         '3.10': 2020110900,
         '3.11': 2021051700,
+        '4.0': 2021100300, // @todo [4.0] replace with right value when released. Using a tmp value to be able to test new things.
     };
 
     // Possible cache update frequencies.

From e55bc9ba0adc2eff01b78351d902b5697b00d6c4 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 19 Oct 2021 09:02:14 +0200
Subject: [PATCH 0146/1008] MOBILE-3887 notifications: Use new WS
 get_unread_notification_count

---
 src/addons/notifications/pages/list/list.ts   |  5 +-
 .../services/handlers/mainmenu.ts             |  9 +--
 .../notifications/services/notifications.ts   | 63 +++++++++++++++----
 3 files changed, 59 insertions(+), 18 deletions(-)

diff --git a/src/addons/notifications/pages/list/list.ts b/src/addons/notifications/pages/list/list.ts
index a6d2406a5..59f83b549 100644
--- a/src/addons/notifications/pages/list/list.ts
+++ b/src/addons/notifications/pages/list/list.ts
@@ -157,10 +157,9 @@ export class AddonNotificationsListPage implements OnInit, OnDestroy {
         try {
             this.loadingMarkAllNotificationsAsRead = true;
 
-            let unread = await AddonNotifications.getUnreadNotificationsCount();
+            const unreadCountData = await AddonNotifications.getUnreadNotificationsCount();
 
-            unread = typeof unread === 'string' ? parseInt(unread) : unread;
-            this.canMarkAllNotificationsAsRead = unread > 0;
+            this.canMarkAllNotificationsAsRead = unreadCountData.count > 0;
         } finally {
             this.loadingMarkAllNotificationsAsRead = false;
         }
diff --git a/src/addons/notifications/services/handlers/mainmenu.ts b/src/addons/notifications/services/handlers/mainmenu.ts
index e56ef86a5..a19caaae9 100644
--- a/src/addons/notifications/services/handlers/mainmenu.ts
+++ b/src/addons/notifications/services/handlers/mainmenu.ts
@@ -110,11 +110,12 @@ export class AddonNotificationsMainMenuHandlerService implements CoreMainMenuHan
         }
 
         try {
-            const unreadCount = await AddonNotifications.getUnreadNotificationsCount(undefined, siteId);
+            const unreadCountData = await AddonNotifications.getUnreadNotificationsCount(undefined, siteId);
 
-            const unreadCountNumber = typeof unreadCount === 'string' ? parseInt(unreadCount) : unreadCount;
-            this.handlerData.badge = unreadCountNumber > 0 ? String(unreadCount) : '';
-            CorePushNotifications.updateAddonCounter('AddonNotifications', unreadCountNumber, siteId);
+            this.handlerData.badge = unreadCountData.count > 0 ?
+                unreadCountData.count + (unreadCountData.hasMore ? '+' : '') :
+                '';
+            CorePushNotifications.updateAddonCounter('AddonNotifications', unreadCountData.count, siteId);
         } catch {
             this.handlerData.badge = '';
         } finally {
diff --git a/src/addons/notifications/services/notifications.ts b/src/addons/notifications/services/notifications.ts
index 69e414a14..4678f9393 100644
--- a/src/addons/notifications/services/notifications.ts
+++ b/src/addons/notifications/services/notifications.ts
@@ -266,33 +266,67 @@ export class AddonNotificationsProvider {
      * @param siteId Site ID. If not defined, use current site.
      * @return Promise resolved with the message notifications count.
      */
-    async getUnreadNotificationsCount(userId?: number, siteId?: string): Promise<number | string> {
+    async getUnreadNotificationsCount(userId?: number, siteId?: string): Promise<{ count: number; hasMore: boolean} > {
         const site = await CoreSites.getSite(siteId);
 
         // @since 4.0
         if (site.wsAvailable('core_message_get_unread_notification_count')) {
-            // @todo
+            const params: CoreMessageGetUnreadNotificationCountWSParams = {
+                useridto: userId || site.getUserId(),
+            };
+
+            const preSets: CoreSiteWSPreSets = {
+                cacheKey: this.getUnreadNotificationsCountCacheKey(params.useridto),
+                getFromCache: false, // Always try to get the latest number.
+                typeExpected: 'number',
+            };
+
+            try {
+                const count = await site.read<number>('core_message_get_unread_notification_count', params, preSets);
+
+                return {
+                    count,
+                    hasMore: false,
+                };
+            } catch {
+                // Return no notifications if the call fails.
+                return {
+                    count: 0,
+                    hasMore: false,
+                };
+            }
         }
 
         // Fallback call
         try {
             const unread = await this.getNotificationsWithStatus(AddonNotificationsGetReadType.UNREAD, {
-                limit: AddonNotificationsProvider.LIST_LIMIT,
+                limit: AddonNotificationsProvider.LIST_LIMIT + 1,
                 siteId,
             });
 
-            if (unread.length === AddonNotificationsProvider.LIST_LIMIT) {
-                // Maybe there are more notifications, include a '+';
-                return unread.length + '+';
-            }
-
-            return unread.length;
+            return {
+                count: Math.min(unread.length, AddonNotificationsProvider.LIST_LIMIT),
+                hasMore: unread.length > AddonNotificationsProvider.LIST_LIMIT,
+            };
         } catch {
-            // Return no messages if the call fails.
-            return 0;
+            // Return no notifications if the call fails.
+            return {
+                count: 0,
+                hasMore: false,
+            };
         }
     }
 
+    /**
+     * Get cache key for unread notifications count WS calls.
+     *
+     * @param userId User ID.
+     * @return Cache key.
+     */
+    protected getUnreadNotificationsCountCacheKey(userId: number): string {
+        return `${ROOT_CACHE_KEY}count:${userId}`;
+    }
+
     /**
      * Mark all message notification as read.
      *
@@ -520,6 +554,13 @@ export type CoreMessageMarkNotificationReadWSResponse = {
     warnings?: CoreWSExternalWarning[];
 };
 
+/**
+ * Params of core_message_get_unread_notification_count WS.
+ */
+export type CoreMessageGetUnreadNotificationCountWSParams = {
+    useridto: number; // User id who received the notification, 0 for any user.
+};
+
 /**
  * Options to pass to getNotifications.
  */

From f182c4ba0a0ae8e877001b5a4c62a216a8c5c036 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 21 Oct 2021 12:03:57 +0200
Subject: [PATCH 0147/1008] MOBILE-3833 file: Change logic in unconvertFileSrc

---
 src/core/services/file.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/core/services/file.ts b/src/core/services/file.ts
index 0678e3b35..2316855b8 100644
--- a/src/core/services/file.ts
+++ b/src/core/services/file.ts
@@ -1274,9 +1274,11 @@ export class CoreFileProvider {
             return src;
         }
 
-        const scheme = CoreApp.isIOS() ? CoreConstants.CONFIG.ioswebviewscheme : 'http';
+        if (CoreApp.isIOS()) {
+            return src.replace(CoreConstants.CONFIG.ioswebviewscheme + '://localhost/_app_file_', 'file://');
+        }
 
-        return src.replace(scheme + '://localhost/_app_file_', 'file://');
+        return src.replace('http://localhost/_app_file_', 'file://');
     }
 
     /**

From 5ac62106bf815c6b40d439788a22d71a25951391 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 13 Oct 2021 16:18:29 +0200
Subject: [PATCH 0148/1008] MOBILE-3686 courses: Merge available courses and
 search courses pages

---
 .../features/courses/courses-lazy.module.ts   |  12 +-
 .../available-courses/available-courses.html  |  19 --
 .../available-courses.module.ts               |  41 ----
 .../available-courses/available-courses.ts    |  78 -------
 .../courses/pages/dashboard/dashboard.ts      |   2 +-
 .../features/courses/pages/list/list.html     |  36 +++
 .../search.module.ts => list/list.module.ts}  |   8 +-
 src/core/features/courses/pages/list/list.ts  | 211 ++++++++++++++++++
 .../courses/pages/my-courses/my-courses.ts    |   2 +-
 .../features/courses/pages/search/search.html |  23 --
 .../features/courses/pages/search/search.ts   | 100 ---------
 .../services/handlers/courses-index-link.ts   |   7 +-
 .../features/sitehome/pages/index/index.ts    |   4 +-
 13 files changed, 263 insertions(+), 280 deletions(-)
 delete mode 100644 src/core/features/courses/pages/available-courses/available-courses.html
 delete mode 100644 src/core/features/courses/pages/available-courses/available-courses.module.ts
 delete mode 100644 src/core/features/courses/pages/available-courses/available-courses.ts
 create mode 100644 src/core/features/courses/pages/list/list.html
 rename src/core/features/courses/pages/{search/search.module.ts => list/list.module.ts} (87%)
 create mode 100644 src/core/features/courses/pages/list/list.ts
 delete mode 100644 src/core/features/courses/pages/search/search.html
 delete mode 100644 src/core/features/courses/pages/search/search.ts

diff --git a/src/core/features/courses/courses-lazy.module.ts b/src/core/features/courses/courses-lazy.module.ts
index 0fa55f3fb..ad6fc7cdf 100644
--- a/src/core/features/courses/courses-lazy.module.ts
+++ b/src/core/features/courses/courses-lazy.module.ts
@@ -33,16 +33,10 @@ const routes: Routes = [
                 .then(m => m.CoreCoursesCategoriesPageModule),
     },
     {
-        path: 'all',
+        path: 'list',
         loadChildren: () =>
-            import('./pages/available-courses/available-courses.module')
-                .then(m => m.CoreCoursesAvailableCoursesPageModule),
-    },
-    {
-        path: 'search',
-        loadChildren: () =>
-            import('./pages/search/search.module')
-                .then(m => m.CoreCoursesSearchPageModule),
+            import('./pages/list/list.module')
+                .then(m => m.CoreCoursesListPageModule),
     },
     {
         path: 'my',
diff --git a/src/core/features/courses/pages/available-courses/available-courses.html b/src/core/features/courses/pages/available-courses/available-courses.html
deleted file mode 100644
index 07aebce00..000000000
--- a/src/core/features/courses/pages/available-courses/available-courses.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<ion-header>
-    <ion-toolbar>
-        <ion-buttons slot="start">
-            <ion-back-button [text]="'core.back' | translate"></ion-back-button>
-        </ion-buttons>
-        <h1>{{ 'core.courses.availablecourses' | translate }}</h1>
-    </ion-toolbar>
-</ion-header>
-<ion-content>
-    <ion-refresher slot="fixed" [disabled]="!coursesLoaded" (ionRefresh)="refreshCourses($event.target)">
-        <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
-    </ion-refresher>
-    <core-loading [hideUntil]="coursesLoaded">
-        <ng-container *ngIf="courses.length > 0">
-            <core-courses-course-list-item *ngFor="let course of courses" [course]="course"></core-courses-course-list-item>
-        </ng-container>
-        <core-empty-box *ngIf="!courses.length" icon="fas-graduation-cap" [message]="'core.courses.nocourses' | translate"></core-empty-box>
-    </core-loading>
-</ion-content>
diff --git a/src/core/features/courses/pages/available-courses/available-courses.module.ts b/src/core/features/courses/pages/available-courses/available-courses.module.ts
deleted file mode 100644
index c272cfa72..000000000
--- a/src/core/features/courses/pages/available-courses/available-courses.module.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-// (C) Copyright 2015 Moodle Pty Ltd.
-//
-// 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 { RouterModule, Routes } from '@angular/router';
-
-import { CoreSharedModule } from '@/core/shared.module';
-import { CoreCoursesComponentsModule } from '../../components/components.module';
-
-import { CoreCoursesAvailableCoursesPage } from './available-courses';
-
-const routes: Routes = [
-    {
-        path: '',
-        component: CoreCoursesAvailableCoursesPage,
-    },
-];
-
-@NgModule({
-    imports: [
-        RouterModule.forChild(routes),
-        CoreSharedModule,
-        CoreCoursesComponentsModule,
-    ],
-    declarations: [
-        CoreCoursesAvailableCoursesPage,
-    ],
-    exports: [RouterModule],
-})
-export class CoreCoursesAvailableCoursesPageModule { }
diff --git a/src/core/features/courses/pages/available-courses/available-courses.ts b/src/core/features/courses/pages/available-courses/available-courses.ts
deleted file mode 100644
index c7a5b70ef..000000000
--- a/src/core/features/courses/pages/available-courses/available-courses.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-// (C) Copyright 2015 Moodle Pty Ltd.
-//
-// 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, OnInit } from '@angular/core';
-import { IonRefresher } from '@ionic/angular';
-
-import { CoreSites } from '@services/sites';
-import { CoreDomUtils } from '@services/utils/dom';
-import { CoreCourses, CoreCourseSearchedData } from '../../services/courses';
-
-/**
- * Page that displays available courses in current site.
- */
-@Component({
-    selector: 'page-core-courses-available-courses',
-    templateUrl: 'available-courses.html',
-})
-export class CoreCoursesAvailableCoursesPage implements OnInit {
-
-    courses: CoreCourseSearchedData[] = [];
-    coursesLoaded = false;
-
-    /**
-     * View loaded.
-     */
-    ngOnInit(): void {
-        this.loadCourses().finally(() => {
-            this.coursesLoaded = true;
-        });
-    }
-
-    /**
-     * Load the courses.
-     *
-     * @return Promise resolved when done.
-     */
-    protected async loadCourses(): Promise<void> {
-        const frontpageCourseId = CoreSites.getCurrentSiteHomeId();
-
-        try {
-            const courses = await CoreCourses.getCoursesByField();
-
-            this.courses = courses.filter((course) => course.id != frontpageCourseId);
-        } catch (error) {
-            CoreDomUtils.showErrorModalDefault(error, 'core.courses.errorloadcourses', true);
-        }
-    }
-
-    /**
-     * Refresh the courses.
-     *
-     * @param refresher Refresher.
-     */
-    refreshCourses(refresher: IonRefresher): void {
-        const promises: Promise<void>[] = [];
-
-        promises.push(CoreCourses.invalidateUserCourses());
-        promises.push(CoreCourses.invalidateCoursesByField());
-
-        Promise.all(promises).finally(() => {
-            this.loadCourses().finally(() => {
-                refresher?.complete();
-            });
-        });
-    }
-
-}
diff --git a/src/core/features/courses/pages/dashboard/dashboard.ts b/src/core/features/courses/pages/dashboard/dashboard.ts
index 1c67c49c9..56ef7d56c 100644
--- a/src/core/features/courses/pages/dashboard/dashboard.ts
+++ b/src/core/features/courses/pages/dashboard/dashboard.ts
@@ -167,7 +167,7 @@ export class CoreCoursesDashboardPage implements OnInit, OnDestroy {
      * Go to search courses.
      */
     async openSearch(): Promise<void> {
-        CoreNavigator.navigateToSitePath('/courses/search');
+        CoreNavigator.navigateToSitePath('/courses/list', { params : { mode: 'search' } });
     }
 
     /**
diff --git a/src/core/features/courses/pages/list/list.html b/src/core/features/courses/pages/list/list.html
new file mode 100644
index 000000000..3b2471ad6
--- /dev/null
+++ b/src/core/features/courses/pages/list/list.html
@@ -0,0 +1,36 @@
+<ion-header>
+    <ion-toolbar>
+        <ion-buttons slot="start">
+            <ion-back-button [text]="'core.back' | translate"></ion-back-button>
+        </ion-buttons>
+        <h1>{{ 'core.courses.availablecourses' | translate }}</h1>
+    </ion-toolbar>
+</ion-header>
+<ion-content>
+    <ion-refresher slot="fixed" [disabled]="!coursesLoaded" (ionRefresh)="refreshCourses($event.target)">
+        <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
+    </ion-refresher>
+    
+    <core-search-box *ngIf="searchEnabled" (onSubmit)="search($event)" (onClear)="clearSearch()"
+        [placeholder]="'core.courses.search' | translate" [searchLabel]="'core.courses.search' | translate" [autoFocus]="searchMode"
+        searchArea="CoreCoursesSearch"></core-search-box>
+
+    <core-loading [hideUntil]="coursesLoaded">
+        <ng-container *ngIf="searchMode && searchTotal > 0">
+            <ion-item-divider>
+                <ion-label><h2>{{ 'core.courses.totalcoursesearchresults' | translate:{$a: searchTotal} }}</h2></ion-label>
+            </ion-item-divider>
+        </ng-container>
+        
+        <core-courses-course-list-item *ngFor="let course of courses" [course]="course"></core-courses-course-list-item>
+
+        <core-infinite-loading [enabled]="searchMode && searchCanLoadMore" (action)="loadMoreResults($event)" [error]="searchLoadMoreError">
+        </core-infinite-loading>
+        <core-empty-box *ngIf="searchMode && !courses.length" icon="fas-search" [message]="'core.courses.nosearchresults' | translate">
+        </core-empty-box>
+
+        <core-empty-box *ngIf="!searchMode && !courses.length" icon="fas-graduation-cap" [message]="'core.courses.nocourses' | translate">
+        </core-empty-box>
+        
+    </core-loading>
+</ion-content>
diff --git a/src/core/features/courses/pages/search/search.module.ts b/src/core/features/courses/pages/list/list.module.ts
similarity index 87%
rename from src/core/features/courses/pages/search/search.module.ts
rename to src/core/features/courses/pages/list/list.module.ts
index 497e6f4d1..c0d3a2c36 100644
--- a/src/core/features/courses/pages/search/search.module.ts
+++ b/src/core/features/courses/pages/list/list.module.ts
@@ -19,12 +19,12 @@ import { CoreSharedModule } from '@/core/shared.module';
 import { CoreCoursesComponentsModule } from '../../components/components.module';
 import { CoreSearchComponentsModule } from '@features/search/components/components.module';
 
-import { CoreCoursesSearchPage } from './search';
+import { CoreCoursesListPage } from './list';
 
 const routes: Routes = [
     {
         path: '',
-        component: CoreCoursesSearchPage,
+        component: CoreCoursesListPage,
     },
 ];
 
@@ -36,8 +36,8 @@ const routes: Routes = [
         CoreSearchComponentsModule,
     ],
     declarations: [
-        CoreCoursesSearchPage,
+        CoreCoursesListPage,
     ],
     exports: [RouterModule],
 })
-export class CoreCoursesSearchPageModule { }
+export class CoreCoursesListPageModule { }
diff --git a/src/core/features/courses/pages/list/list.ts b/src/core/features/courses/pages/list/list.ts
new file mode 100644
index 000000000..12c0cf317
--- /dev/null
+++ b/src/core/features/courses/pages/list/list.ts
@@ -0,0 +1,211 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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, OnDestroy, OnInit } from '@angular/core';
+import { IonRefresher } from '@ionic/angular';
+import { CoreNavigator } from '@services/navigator';
+import { CoreSites } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
+import { CoreEventObserver, CoreEvents } from '@singletons/events';
+import { CoreCourseBasicSearchedData, CoreCourses } from '../../services/courses';
+
+type CoreCoursesListMode = 'search' | 'all';
+
+/**
+ * Page that shows a list of courses.
+ */
+@Component({
+    selector: 'page-core-courses-list',
+    templateUrl: 'list.html',
+})
+export class CoreCoursesListPage implements OnInit, OnDestroy {
+
+    searchEnabled = false;
+    searchMode = false;
+    searchCanLoadMore = false;
+    searchLoadMoreError = false;
+    searchTotal = 0;
+
+    mode: CoreCoursesListMode = 'all';
+
+    courses: CoreCourseBasicSearchedData[] = [];
+    coursesLoaded = false;
+
+    protected currentSiteId: string;
+    protected frontpageCourseId: number;
+    protected searchPage = 0;
+    protected searchText = '';
+    protected siteUpdatedObserver: CoreEventObserver;
+
+    constructor() {
+        this.currentSiteId = CoreSites.getRequiredCurrentSite().getId();
+        this.frontpageCourseId = CoreSites.getRequiredCurrentSite().getSiteHomeId();
+
+        // Refresh the enabled flags if site is updated.
+        this.siteUpdatedObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, () => {
+            this.searchEnabled = !CoreCourses.isSearchCoursesDisabledInSite();
+
+            if (!this.searchEnabled) {
+                this.searchMode = false;
+
+                this.fetchCourses();
+            }
+        }, this.currentSiteId);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    ngOnInit(): void {
+        this.mode = CoreNavigator.getRouteParam<CoreCoursesListMode>('mode') || this.mode;
+
+        if (this.mode == 'search') {
+            this.searchMode = true;
+        }
+
+        this.searchEnabled = !CoreCourses.isSearchCoursesDisabledInSite();
+        if (!this.searchEnabled) {
+            this.searchMode = false;
+        }
+
+        this.fetchCourses();
+    }
+
+    /**
+     * Load the course list.
+     *
+     * @return Promise resolved when done.
+     */
+    protected async fetchCourses(): Promise<void> {
+        try {
+            if (this.searchMode && this.searchText) {
+                await this.search(this.searchText);
+            } else {
+                await this.loadAvailableCourses();
+            }
+        } finally {
+            this.coursesLoaded = true;
+        }
+    }
+
+    /**
+     * Load the courses.
+     *
+     * @return Promise resolved when done.
+     */
+    protected async loadAvailableCourses(): Promise<void> {
+        try {
+            const courses = await CoreCourses.getCoursesByField();
+
+            this.courses = courses.filter((course) => course.id != this.frontpageCourseId);
+        } catch (error) {
+            CoreDomUtils.showErrorModalDefault(error, 'core.courses.errorloadcourses', true);
+        }
+    }
+
+    /**
+     * Refresh the courses.
+     *
+     * @param refresher Refresher.
+     */
+    refreshCourses(refresher: IonRefresher): void {
+        const promises: Promise<void>[] = [];
+
+        promises.push(CoreCourses.invalidateUserCourses());
+        promises.push(CoreCourses.invalidateCoursesByField());
+
+        Promise.all(promises).finally(() => {
+            this.fetchCourses().finally(() => {
+                refresher?.complete();
+            });
+        });
+    }
+
+    /**
+     * Search a new text.
+     *
+     * @param text The text to search.
+     */
+    async search(text: string): Promise<void> {
+        this.searchMode = true;
+        this.searchText = text;
+        this.courses = [];
+        this.searchPage = 0;
+        this.searchTotal = 0;
+
+        const modal = await CoreDomUtils.showModalLoading('core.searching', true);
+        this.searchCourses().finally(() => {
+            modal.dismiss();
+        });
+    }
+
+    /**
+     * Clear search box.
+     */
+    clearSearch(): void {
+        this.searchText = '';
+        this.courses = [];
+        this.searchPage = 0;
+        this.searchTotal = 0;
+        this.searchMode = false;
+
+        this.coursesLoaded = false;
+        this.fetchCourses();
+    }
+
+    /**
+     * Load more results.
+     *
+     * @param infiniteComplete Infinite scroll complete function. Only used from core-infinite-loading.
+     */
+    loadMoreResults(infiniteComplete?: () => void ): void {
+        this.searchCourses().finally(() => {
+            infiniteComplete && infiniteComplete();
+        });
+    }
+
+    /**
+     * Search courses or load the next page of current search.
+     *
+     * @return Promise resolved when done.
+     */
+    protected async searchCourses(): Promise<void> {
+        this.searchLoadMoreError = false;
+
+        try {
+            const response = await CoreCourses.search(this.searchText, this.searchPage);
+
+            if (this.searchPage === 0) {
+                this.courses = response.courses;
+            } else {
+                this.courses = this.courses.concat(response.courses);
+            }
+            this.searchTotal = response.total;
+
+            this.searchPage++;
+            this.searchCanLoadMore = this.courses.length < this.searchTotal;
+        } catch (error) {
+            this.searchLoadMoreError = true; // Set to prevent infinite calls with infinite-loading.
+            CoreDomUtils.showErrorModalDefault(error, 'core.courses.errorsearching', true);
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    ngOnDestroy(): void {
+        this.siteUpdatedObserver?.off();
+    }
+
+}
diff --git a/src/core/features/courses/pages/my-courses/my-courses.ts b/src/core/features/courses/pages/my-courses/my-courses.ts
index 576d7e8df..675933daf 100644
--- a/src/core/features/courses/pages/my-courses/my-courses.ts
+++ b/src/core/features/courses/pages/my-courses/my-courses.ts
@@ -204,7 +204,7 @@ export class CoreCoursesMyCoursesPage implements OnInit, OnDestroy {
      * Go to search courses.
      */
     openSearch(): void {
-        CoreNavigator.navigateToSitePath('courses/search');
+        CoreNavigator.navigateToSitePath('courses/list', { params : { mode: 'search' } });
     }
 
     /**
diff --git a/src/core/features/courses/pages/search/search.html b/src/core/features/courses/pages/search/search.html
deleted file mode 100644
index fb33940a9..000000000
--- a/src/core/features/courses/pages/search/search.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<ion-header>
-    <ion-toolbar>
-        <ion-buttons slot="start">
-            <ion-back-button [text]="'core.back' | translate"></ion-back-button>
-        </ion-buttons>
-        <h1>{{ 'core.courses.searchcourses' | translate }}</h1>
-    </ion-toolbar>
-</ion-header>
-<ion-content>
-    <core-search-box (onSubmit)="search($event)" (onClear)="clearSearch()"
-    [placeholder]="'core.courses.search' | translate" [searchLabel]="'core.courses.search' | translate" autoFocus="true"
-    searchArea="CoreCoursesSearch"></core-search-box>
-
-    <ng-container *ngIf="total > 0">
-        <ion-item-divider>
-            <ion-label><h2>{{ 'core.courses.totalcoursesearchresults' | translate:{$a: total} }}</h2></ion-label>
-        </ion-item-divider>
-        <core-courses-course-list-item *ngFor="let course of courses" [course]="course"></core-courses-course-list-item>
-        <core-infinite-loading [enabled]="canLoadMore" (action)="loadMoreResults($event)" [error]="loadMoreError">
-        </core-infinite-loading>
-    </ng-container>
-    <core-empty-box *ngIf="total == 0" icon="search" [message]="'core.courses.nosearchresults' | translate"></core-empty-box>
-</ion-content>
diff --git a/src/core/features/courses/pages/search/search.ts b/src/core/features/courses/pages/search/search.ts
deleted file mode 100644
index 651aee76f..000000000
--- a/src/core/features/courses/pages/search/search.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-// (C) Copyright 2015 Moodle Pty Ltd.
-//
-// 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 { CoreDomUtils } from '@services/utils/dom';
-import { CoreCourseBasicSearchedData, CoreCourses } from '../../services/courses';
-
-/**
- * Page that allows searching for courses.
- */
-@Component({
-    selector: 'page-core-courses-search',
-    templateUrl: 'search.html',
-})
-export class CoreCoursesSearchPage {
-
-    total = 0;
-    courses: CoreCourseBasicSearchedData[] = [];
-    canLoadMore = false;
-    loadMoreError = false;
-
-    protected page = 0;
-    protected currentSearch = '';
-
-    /**
-     * Search a new text.
-     *
-     * @param text The text to search.
-     */
-    async search(text: string): Promise<void> {
-        this.currentSearch = text;
-        this.courses = [];
-        this.page = 0;
-        this.total = 0;
-
-        const modal = await CoreDomUtils.showModalLoading('core.searching', true);
-        this.searchCourses().finally(() => {
-            modal.dismiss();
-        });
-    }
-
-    /**
-     * Clear search box.
-     */
-    clearSearch(): void {
-        this.currentSearch = '';
-        this.courses = [];
-        this.page = 0;
-        this.total = 0;
-    }
-
-    /**
-     * Load more results.
-     *
-     * @param infiniteComplete Infinite scroll complete function. Only used from core-infinite-loading.
-     */
-    loadMoreResults(infiniteComplete?: () => void ): void {
-        this.searchCourses().finally(() => {
-            infiniteComplete && infiniteComplete();
-        });
-    }
-
-    /**
-     * Search courses or load the next page of current search.
-     *
-     * @return Promise resolved when done.
-     */
-    protected async searchCourses(): Promise<void> {
-        this.loadMoreError = false;
-
-        try {
-            const response = await CoreCourses.search(this.currentSearch, this.page);
-
-            if (this.page === 0) {
-                this.courses = response.courses;
-            } else {
-                this.courses = this.courses.concat(response.courses);
-            }
-            this.total = response.total;
-
-            this.page++;
-            this.canLoadMore = this.courses.length < this.total;
-        } catch (error) {
-            this.loadMoreError = true; // Set to prevent infinite calls with infinite-loading.
-            CoreDomUtils.showErrorModalDefault(error, 'core.courses.errorsearching', true);
-        }
-    }
-
-}
diff --git a/src/core/features/courses/services/handlers/courses-index-link.ts b/src/core/features/courses/services/handlers/courses-index-link.ts
index 500287239..2ff9c3f92 100644
--- a/src/core/features/courses/services/handlers/courses-index-link.ts
+++ b/src/core/features/courses/services/handlers/courses-index-link.ts
@@ -42,14 +42,17 @@ export class CoreCoursesIndexLinkHandlerService extends CoreContentLinksHandlerB
         return [{
             action: (siteId): void => {
                 let pageName = CoreCoursesMyCoursesHomeHandlerService.PAGE_NAME;
+                const pageParams: Params = {};
 
                 if (params.categoryid) {
                     pageName += '/categories/' + params.categoryid;
                 } else {
-                    pageName += '/all';
+                    pageName += '/list';
+                    pageParams.mode = 'all';
                 }
 
-                CoreNavigator.navigateToSitePath(pageName, { siteId });
+
+                CoreNavigator.navigateToSitePath(pageName, { params: pageParams, siteId });
             },
         }];
     }
diff --git a/src/core/features/sitehome/pages/index/index.ts b/src/core/features/sitehome/pages/index/index.ts
index 7f59dae6d..fd1796d53 100644
--- a/src/core/features/sitehome/pages/index/index.ts
+++ b/src/core/features/sitehome/pages/index/index.ts
@@ -218,14 +218,14 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
      * Go to search courses.
      */
     openSearch(): void {
-        CoreNavigator.navigateToSitePath('courses/search');
+        CoreNavigator.navigateToSitePath('courses/list', { params : { mode: 'search' } });
     }
 
     /**
      * Go to available courses.
      */
     openAvailableCourses(): void {
-        CoreNavigator.navigateToSitePath('courses/all');
+        CoreNavigator.navigateToSitePath('courses/list', { params : { mode: 'all' } });
     }
 
     /**

From 18f20dc12e30700ad684f9c15f5b55c726ea040b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 13 Oct 2021 15:24:20 +0200
Subject: [PATCH 0149/1008] MOBILE-3686 ux: Add toggle options to context menu
 items

---
 src/addons/messages/pages/discussion/discussion.html  |  4 ++--
 .../messages/pages/discussion/discussion.page.ts      |  6 ++++--
 src/core/components/context-menu/context-menu-item.ts |  2 ++
 .../context-menu/core-context-menu-popover.html       | 11 ++++++++---
 src/core/features/course/pages/contents/contents.html |  4 ++--
 src/core/features/course/pages/contents/contents.ts   |  8 ++++----
 .../features/courses/pages/dashboard/dashboard.html   |  4 ++--
 .../features/courses/pages/dashboard/dashboard.ts     |  9 ---------
 src/core/features/sitehome/pages/index/index.html     |  4 ++--
 src/core/features/sitehome/pages/index/index.ts       |  9 ---------
 10 files changed, 26 insertions(+), 35 deletions(-)

diff --git a/src/addons/messages/pages/discussion/discussion.html b/src/addons/messages/pages/discussion/discussion.html
index 0ac439fa6..94fa726af 100644
--- a/src/addons/messages/pages/discussion/discussion.html
+++ b/src/addons/messages/pages/discussion/discussion.html
@@ -44,8 +44,8 @@
                 'addon.messages.muteconversation') | translate" (action)="changeMute($event)" [closeOnClick]="false"
                 [iconAction]="muteIcon"></core-context-menu-item>
             <core-context-menu-item [hidden]="!canDelete || !messages || !messages.length" [priority]="400"
-                [content]="'addon.messages.showdeletemessages' | translate" (action)="toggleDelete()"
-                [iconAction]="(showDelete ? 'far-check-square' : 'far-square')"></core-context-menu-item>
+                [content]="'addon.messages.showdeletemessages' | translate" (action)="toggleDelete(!showDelete)"
+                iconAction="toggle" [toggle]="showDelete"></core-context-menu-item>
             <core-context-menu-item [hidden]="!groupMessagingEnabled || !conversationId || isGroup || !messages || !messages.length"
                 [priority]="200" [content]="'addon.messages.deleteconversation' | translate" (action)="deleteConversation($event)"
                 [closeOnClick]="false" [iconAction]="deleteIcon"></core-context-menu-item>
diff --git a/src/addons/messages/pages/discussion/discussion.page.ts b/src/addons/messages/pages/discussion/discussion.page.ts
index bb9689cd0..c99f24161 100644
--- a/src/addons/messages/pages/discussion/discussion.page.ts
+++ b/src/addons/messages/pages/discussion/discussion.page.ts
@@ -1265,9 +1265,11 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView
 
     /**
      * Toggles delete state.
+     *
+     * @param enabled Wether to enable or disable show delete toggle.
      */
-    toggleDelete(): void {
-        this.showDelete = !this.showDelete;
+    toggleDelete(enable: boolean): void {
+        this.showDelete = enable;
     }
 
     /**
diff --git a/src/core/components/context-menu/context-menu-item.ts b/src/core/components/context-menu/context-menu-item.ts
index fd1c2fc33..4129ef889 100644
--- a/src/core/components/context-menu/context-menu-item.ts
+++ b/src/core/components/context-menu/context-menu-item.ts
@@ -38,6 +38,7 @@ export class CoreContextMenuItemComponent implements OnInit, OnDestroy, OnChange
     @Input() iconDescription?: string; // Name of the icon to be shown on the left side of the item.
     @Input() iconAction?: string; // Name of the icon to show on the right side of the item. Represents the action to do on click.
     // If is "spinner" an spinner will be shown.
+    // If is "toggle" an toggle switch will be shown.
     // If no icon or spinner is selected, no action or link will work.
     // If href but no iconAction is provided arrow-right will be used.
     @Input() iconSlash?: boolean; // Display a red slash over the icon.
@@ -52,6 +53,7 @@ export class CoreContextMenuItemComponent implements OnInit, OnDestroy, OnChange
     @Input() badgeA11yText?: string; // Description for the badge, if needed.
     @Input() hidden?: boolean; // Whether the item should be hidden.
     @Input() showBrowserWarning = true; // Whether to show a warning before opening browser (for links). Defaults to true.
+    @Input() toggle = false; // Whether the toggle is on or off.
     @Output() action?: EventEmitter<() => void>; // Will emit an event when the item clicked.
     @Output() onClosed?: EventEmitter<() => void>; // Will emit an event when the popover is closed because the item was clicked.
 
diff --git a/src/core/components/context-menu/core-context-menu-popover.html b/src/core/components/context-menu/core-context-menu-popover.html
index 1c23ddabf..4baeb6c85 100644
--- a/src/core/components/context-menu/core-context-menu-popover.html
+++ b/src/core/components/context-menu/core-context-menu-popover.html
@@ -11,11 +11,16 @@
         <ion-label>
             <p class="item-heading"><core-format-text [clean]="true" [text]="item.content" [filter]="false"></core-format-text></p>
         </ion-label>
-        <ion-icon *ngIf="(item.href || item.action) && item.iconAction && item.iconAction != 'spinner'" [name]="item.iconAction"
+        <ng-container *ngIf="(item.href || item.action) && item.iconAction">
+        <ion-icon *ngIf="item.iconAction != 'spinner' && item.iconAction != 'toggle'" [name]="item.iconAction"
             [class.icon-slash]="item.iconSlash" slot="end" aria-hidden="true">
         </ion-icon>
-        <ion-spinner *ngIf="(item.href || item.action) && item.iconAction == 'spinner'" slot="end"
-            [attr.aria-label]="'core.loading' | translate"></ion-spinner>
+        <ion-spinner *ngIf="item.iconAction == 'spinner'" slot="end"
+            [attr.aria-label]="'core.loading' | translate">
+        </ion-spinner>
+        <ion-toggle  *ngIf="item.iconAction == 'toggle'" [(ngModel)]="item.toggle" slot="end">
+        </ion-toggle>
+        </ng-container>
         <ion-badge class="{{item.badgeClass}}" slot="end" *ngIf="item.badge">
             <span [attr.ara-hidden]="!!item.badgeA11yText">{{item.badge}}</span>
             <span class="sr-only" *ngIf="item.badgeA11yText">
diff --git a/src/core/features/course/pages/contents/contents.html b/src/core/features/course/pages/contents/contents.html
index 13ad9ebba..938d20ba6 100644
--- a/src/core/features/course/pages/contents/contents.html
+++ b/src/core/features/course/pages/contents/contents.html
@@ -1,7 +1,7 @@
 <core-navbar-buttons slot="end">
     <core-context-menu>
-        <core-context-menu-item [hidden]="!displayEnableDownload" [priority]="2000" [iconAction]="downloadEnabledIcon"
-            [content]="'core.settings.showdownloadoptions' | translate" (action)="toggleDownload()">
+        <core-context-menu-item [hidden]="!displayEnableDownload" [priority]="2000" iconAction="toggle" [toggle]="downloadEnabled"
+            [content]="'core.settings.showdownloadoptions' | translate" (action)="toggleDownload(!downloadEnabled)">
         </core-context-menu-item>
         <core-context-menu-item [hidden]="!downloadCourseEnabled" [priority]="1900"
             [content]="prefetchCourseData.statusTranslatable | translate" (action)="prefetchCourse()"
diff --git a/src/core/features/course/pages/contents/contents.ts b/src/core/features/course/pages/contents/contents.ts
index 3a95835d6..7492207ed 100644
--- a/src/core/features/course/pages/contents/contents.ts
+++ b/src/core/features/course/pages/contents/contents.ts
@@ -64,7 +64,6 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
     courseMenuHandlers: CoreCourseOptionsMenuHandlerToDisplay[] = [];
     dataLoaded = false;
     downloadEnabled = false;
-    downloadEnabledIcon = 'far-square'; // Disabled by default.
     downloadCourseEnabled = false;
     moduleId?: number;
     displayEnableDownload = false;
@@ -469,10 +468,11 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
 
     /**
      * Toggle download enabled.
+     *
+     * @param enable Whether enable or disable download enabled toggle.
      */
-    toggleDownload(): void {
-        this.downloadEnabled = !this.downloadEnabled;
-        this.downloadEnabledIcon = this.downloadEnabled ? 'far-check-square' : 'far-square';
+    toggleDownload(enable: boolean): void {
+        this.downloadEnabled = enable;
     }
 
     /**
diff --git a/src/core/features/courses/pages/dashboard/dashboard.html b/src/core/features/courses/pages/dashboard/dashboard.html
index e2dc1b171..394086ca8 100644
--- a/src/core/features/courses/pages/dashboard/dashboard.html
+++ b/src/core/features/courses/pages/dashboard/dashboard.html
@@ -4,8 +4,8 @@
     </ion-button>
     <core-context-menu>
         <core-context-menu-item *ngIf="(downloadCourseEnabled || downloadCoursesEnabled)" [priority]="1000"
-        [content]="'core.settings.showdownloadoptions' | translate" (action)="toggleDownload()"
-        [iconAction]="downloadEnabledIcon"></core-context-menu-item>
+        [content]="'core.settings.showdownloadoptions' | translate" (action)="switchDownload(!downloadEnabled)"
+        iconAction="toggle" [toggle]="downloadEnabled"></core-context-menu-item>
         <core-context-menu-item *ngIf="(downloadCourseEnabled || downloadCoursesEnabled)" [priority]="500"
         [content]="'addon.storagemanager.managestorage' | translate"
         (action)="manageCoursesStorage()" iconAction="fas-archive"></core-context-menu-item>
diff --git a/src/core/features/courses/pages/dashboard/dashboard.ts b/src/core/features/courses/pages/dashboard/dashboard.ts
index 56ef7d56c..f895f177b 100644
--- a/src/core/features/courses/pages/dashboard/dashboard.ts
+++ b/src/core/features/courses/pages/dashboard/dashboard.ts
@@ -40,7 +40,6 @@ export class CoreCoursesDashboardPage implements OnInit, OnDestroy {
     downloadEnabled = false;
     downloadCourseEnabled = false;
     downloadCoursesEnabled = false;
-    downloadEnabledIcon = 'far-square';
     userId?: number;
     blocks: Partial<CoreCourseBlock>[] = [];
     loaded = false;
@@ -138,13 +137,6 @@ export class CoreCoursesDashboardPage implements OnInit, OnDestroy {
         });
     }
 
-    /**
-     * Toggle download enabled.
-     */
-    toggleDownload(): void {
-        this.switchDownload(!this.downloadEnabled);
-    }
-
     /**
      * Convenience function to switch download enabled.
      *
@@ -152,7 +144,6 @@ export class CoreCoursesDashboardPage implements OnInit, OnDestroy {
      */
     protected switchDownload(enable: boolean): void {
         this.downloadEnabled = (this.downloadCourseEnabled || this.downloadCoursesEnabled) && enable;
-        this.downloadEnabledIcon = this.downloadEnabled ? 'far-check-square' : 'far-square';
         CoreEvents.trigger(CoreCoursesProvider.EVENT_DASHBOARD_DOWNLOAD_ENABLED_CHANGED, { enabled: this.downloadEnabled });
     }
 
diff --git a/src/core/features/sitehome/pages/index/index.html b/src/core/features/sitehome/pages/index/index.html
index 9bc017b46..574e26e14 100644
--- a/src/core/features/sitehome/pages/index/index.html
+++ b/src/core/features/sitehome/pages/index/index.html
@@ -4,8 +4,8 @@
     </ion-button>
     <core-context-menu>
         <core-context-menu-item *ngIf="(downloadCourseEnabled || downloadCoursesEnabled)" [priority]="1000"
-        [content]="'core.settings.showdownloadoptions' | translate" (action)="toggleDownload()"
-        [iconAction]="downloadEnabledIcon"></core-context-menu-item>
+        [content]="'core.settings.showdownloadoptions' | translate" (action)="switchDownload(!downloadEnabled)"
+        iconAction="toggle" [toggle]="downloadEnabled"></core-context-menu-item>
         <core-context-menu-item *ngIf="(downloadCourseEnabled || downloadCoursesEnabled)" [priority]="500"
         [content]="'addon.storagemanager.managestorage' | translate"
         (action)="manageCoursesStorage()" iconAction="fas-archive"></core-context-menu-item>
diff --git a/src/core/features/sitehome/pages/index/index.ts b/src/core/features/sitehome/pages/index/index.ts
index fd1796d53..5216e6973 100644
--- a/src/core/features/sitehome/pages/index/index.ts
+++ b/src/core/features/sitehome/pages/index/index.ts
@@ -53,7 +53,6 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
     downloadEnabled = false;
     downloadCourseEnabled = false;
     downloadCoursesEnabled = false;
-    downloadEnabledIcon = 'far-square';
     newsForumModule?: NewsForum;
 
     protected updateSiteObserver?: CoreEventObserver;
@@ -189,13 +188,6 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
         });
     }
 
-    /**
-     * Toggle download enabled.
-     */
-    toggleDownload(): void {
-        this.switchDownload(!this.downloadEnabled);
-    }
-
     /**
      * Convenience function to switch download enabled.
      *
@@ -203,7 +195,6 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
      */
     protected switchDownload(enable: boolean): void {
         this.downloadEnabled = (this.downloadCourseEnabled || this.downloadCoursesEnabled) && enable;
-        this.downloadEnabledIcon = this.downloadEnabled ? 'far-check-square' : 'far-square';
         CoreEvents.trigger(CoreCoursesProvider.EVENT_DASHBOARD_DOWNLOAD_ENABLED_CHANGED, { enabled: this.downloadEnabled });
     }
 

From 8acb8b74e283f4334ddfc4f1a1d39afe70caf4ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 13 Oct 2021 16:17:40 +0200
Subject: [PATCH 0150/1008] MOBILE-3686 courses: Merge list courses and my
 courses page

---
 scripts/langindex.json                        |   1 +
 .../core-courses-course-list-item.html        |   8 +-
 .../course-list-item/course-list-item.ts      |  34 +--
 .../features/courses/courses-lazy.module.ts   |   8 +-
 src/core/features/courses/courses.module.ts   |   2 +-
 src/core/features/courses/lang.json           |   1 +
 .../features/courses/pages/list/list.html     |  14 +-
 src/core/features/courses/pages/list/list.ts  | 101 +++++++-
 .../courses/pages/my-courses/my-courses.html  |  54 -----
 .../pages/my-courses/my-courses.module.ts     |  40 ----
 .../courses/pages/my-courses/my-courses.ts    | 219 ------------------
 src/core/features/courses/services/courses.ts |  12 +
 .../features/sitehome/pages/index/index.ts    |   2 +-
 13 files changed, 147 insertions(+), 349 deletions(-)
 delete mode 100644 src/core/features/courses/pages/my-courses/my-courses.html
 delete mode 100644 src/core/features/courses/pages/my-courses/my-courses.module.ts
 delete mode 100644 src/core/features/courses/pages/my-courses/my-courses.ts

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 0ec207051..9cd4ae19c 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1551,6 +1551,7 @@
   "core.courses.selfenrolment": "local_moodlemobileapp",
   "core.courses.sendpaymentbutton": "enrol_paypal",
   "core.courses.show": "block_myoverview",
+  "core.courses.showonlyenrolled": "local_moodlemobileapp",
   "core.courses.therearecourses": "moodle",
   "core.courses.totalcoursesearchresults": "local_moodlemobileapp",
   "core.currentdevice": "local_moodlemobileapp",
diff --git a/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html b/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
index aead6199e..0d81bc533 100644
--- a/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
+++ b/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
@@ -6,6 +6,10 @@
         <img [src]="course.courseImage" core-external-content alt=""/>
     </ion-avatar>
     <ion-label>
+        <h2>
+            <core-format-text [text]="course.displayname || course.fullname" contextLevel="course" [contextInstanceId]="course.id">
+            </core-format-text>
+        </h2>
         <p *ngIf="course.categoryname || (course.displayname && course.shortname && course.fullname != course.displayname)"
             class="core-course-additional-info">
             <span *ngIf="course.categoryname" class="core-course-category">
@@ -19,10 +23,6 @@
                 </core-format-text>
             </span>
         </p>
-        <h2>
-            <core-format-text [text]="course.displayname || course.fullname" contextLevel="course" [contextInstanceId]="course.id">
-            </core-format-text>
-        </h2>
         <p *ngIf="isEnrolled && course.progress! >= 0 && course.completionusertracked !== false">
             <core-progress-bar [progress]="course.progress" a11yText="core.courses.aria:courseprogress"></core-progress-bar>
         </p>
diff --git a/src/core/features/courses/components/course-list-item/course-list-item.ts b/src/core/features/courses/components/course-list-item/course-list-item.ts
index e7778782f..e4248e0e3 100644
--- a/src/core/features/courses/components/course-list-item/course-list-item.ts
+++ b/src/core/features/courses/components/course-list-item/course-list-item.ts
@@ -15,8 +15,11 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { CoreCourseHelper } from '@features/course/services/course-helper';
 import { CoreNavigator } from '@services/navigator';
-import { CoreCourses, CoreCourseSearchedData } from '../../services/courses';
-import { CoreCoursesHelper, CoreCourseWithImageAndColor } from '../../services/courses-helper';
+import { CoreSites } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
+import { CoreEventCourseStatusChanged, CoreEventObserver, CoreEvents } from '@singletons/events';
+import { CoreCourseListItem, CoreCourses } from '../../services/courses';
+import { CoreCoursesHelper } from '../../services/courses-helper';
 
 /**
  * This directive is meant to display an item for a list of courses.
@@ -32,10 +35,7 @@ import { CoreCoursesHelper, CoreCourseWithImageAndColor } from '../../services/c
 })
 export class CoreCoursesCourseListItemComponent implements OnInit {
 
-    @Input() course!: CoreCourseSearchedData & CoreCourseWithImageAndColor & {
-        completionusertracked?: boolean; // If the user is completion tracked.
-        progress?: number | null; // Progress percentage.
-    }; // The course to render.
+    @Input() course!: CoreCourseListItem; // The course to render.
 
     icons: CoreCoursesEnrolmentIcons[] = [];
     isEnrolled = false;
@@ -46,15 +46,21 @@ export class CoreCoursesCourseListItemComponent implements OnInit {
     async ngOnInit(): Promise<void> {
         CoreCoursesHelper.loadCourseColorAndImage(this.course);
 
-        // Check if the user is enrolled in the course.
-        try {
-            const course = await CoreCourses.getUserCourse(this.course.id);
-            this.course.progress = course.progress;
-            this.course.completionusertracked = course.completionusertracked;
+        this.isEnrolled = this.course.progress !== undefined;
 
-            this.isEnrolled = true;
-        } catch {
-            this.isEnrolled = false;
+        if (!this.isEnrolled) {
+            try {
+                const course = await CoreCourses.getUserCourse(this.course.id);
+                this.course.progress = course.progress;
+                this.course.completionusertracked = course.completionusertracked;
+
+                this.isEnrolled = true;
+            } catch {
+                this.isEnrolled = false;
+            }
+        }
+
+        if (!this.isEnrolled) {
             this.icons = [];
 
             this.course.enrollmentmethods.forEach((instance) => {
diff --git a/src/core/features/courses/courses-lazy.module.ts b/src/core/features/courses/courses-lazy.module.ts
index ad6fc7cdf..cfffc2db4 100644
--- a/src/core/features/courses/courses-lazy.module.ts
+++ b/src/core/features/courses/courses-lazy.module.ts
@@ -18,7 +18,7 @@ import { RouterModule, Routes } from '@angular/router';
 const routes: Routes = [
     {
         path: '',
-        redirectTo: 'my',
+        redirectTo: 'list',
         pathMatch: 'full',
     },
     {
@@ -38,12 +38,6 @@ const routes: Routes = [
             import('./pages/list/list.module')
                 .then(m => m.CoreCoursesListPageModule),
     },
-    {
-        path: 'my',
-        loadChildren: () =>
-            import('./pages/my-courses/my-courses.module')
-                .then(m => m.CoreCoursesMyCoursesPageModule),
-    },
 ];
 
 @NgModule({
diff --git a/src/core/features/courses/courses.module.ts b/src/core/features/courses/courses.module.ts
index b07d4bc2b..25129ac4a 100644
--- a/src/core/features/courses/courses.module.ts
+++ b/src/core/features/courses/courses.module.ts
@@ -44,7 +44,7 @@ const mainMenuHomeChildrenRoutes: Routes = [
     },
     {
         path: CoreCoursesMyCoursesHomeHandlerService.PAGE_NAME,
-        loadChildren: () => import('./pages/my-courses/my-courses.module').then(m => m.CoreCoursesMyCoursesPageModule),
+        loadChildren: () => import('./pages/list/list.module').then(m => m.CoreCoursesListPageModule),
     },
 ];
 
diff --git a/src/core/features/courses/lang.json b/src/core/features/courses/lang.json
index 668442a99..47924a0bd 100644
--- a/src/core/features/courses/lang.json
+++ b/src/core/features/courses/lang.json
@@ -40,6 +40,7 @@
     "selfenrolment": "Self enrolment",
     "sendpaymentbutton": "Send payment via PayPal",
     "show": "Restore to view",
+    "showonlyenrolled": "Show only my courses",
     "therearecourses": "There are {{$a}} courses",
     "totalcoursesearchresults": "Total courses: {{$a}}"
 }
diff --git a/src/core/features/courses/pages/list/list.html b/src/core/features/courses/pages/list/list.html
index 3b2471ad6..fe2dbc491 100644
--- a/src/core/features/courses/pages/list/list.html
+++ b/src/core/features/courses/pages/list/list.html
@@ -3,7 +3,19 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ 'core.courses.availablecourses' | translate }}</h1>
+        <h1 *ngIf="!showOnlyEnrolled">{{ 'core.courses.availablecourses' | translate }}</h1>
+        <h1 *ngIf="showOnlyEnrolled">{{ 'core.courses.mycourses' | translate }}</h1>
+        <ion-buttons slot="end"></ion-buttons>
+        <core-navbar-buttons slot="end">
+            <core-context-menu>
+                <core-context-menu-item *ngIf="downloadCourseEnabled || downloadCoursesEnabled" [priority]="1000"
+                    [content]="'core.settings.showdownloadoptions' | translate" (action)="toggleDownload(!downloadEnabled)"
+                    iconAction="toggle" [toggle]="downloadEnabled"></core-context-menu-item>
+                <core-context-menu-item *ngIf="myCoursesEnabled" [priority]="900"
+                    [content]="'core.courses.showonlyenrolled' | translate" (action)="toggleEnrolled(!showOnlyEnrolled)"
+                    iconAction="toggle" [toggle]="showOnlyEnrolled"></core-context-menu-item>   
+            </core-context-menu>
+        </core-navbar-buttons>
     </ion-toolbar>
 </ion-header>
 <ion-content>
diff --git a/src/core/features/courses/pages/list/list.ts b/src/core/features/courses/pages/list/list.ts
index 12c0cf317..7d0174397 100644
--- a/src/core/features/courses/pages/list/list.ts
+++ b/src/core/features/courses/pages/list/list.ts
@@ -13,14 +13,15 @@
 // limitations under the License.
 
 import { Component, OnDestroy, OnInit } from '@angular/core';
+import { CoreCoursesHelper, CoreEnrolledCourseDataWithExtraInfo } from '@features/courses/services/courses-helper';
 import { IonRefresher } from '@ionic/angular';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
-import { CoreCourseBasicSearchedData, CoreCourses } from '../../services/courses';
+import { CoreCourseBasicSearchedData, CoreCourses, CoreCoursesProvider } from '../../services/courses';
 
-type CoreCoursesListMode = 'search' | 'all';
+type CoreCoursesListMode = 'search' | 'all' | 'my';
 
 /**
  * Page that shows a list of courses.
@@ -31,31 +32,60 @@ type CoreCoursesListMode = 'search' | 'all';
 })
 export class CoreCoursesListPage implements OnInit, OnDestroy {
 
+    downloadAllCoursesEnabled = false;
+
     searchEnabled = false;
+    myCoursesEnabled = true;
     searchMode = false;
     searchCanLoadMore = false;
     searchLoadMoreError = false;
     searchTotal = 0;
 
-    mode: CoreCoursesListMode = 'all';
+    downloadEnabled = false;
+    downloadCourseEnabled = false;
+    downloadCoursesEnabled = false;
 
-    courses: CoreCourseBasicSearchedData[] = [];
+    mode: CoreCoursesListMode = 'my';
+
+    courses: (CoreCourseBasicSearchedData|CoreEnrolledCourseDataWithExtraInfo)[] = [];
     coursesLoaded = false;
 
+    showOnlyEnrolled = false;
+
     protected currentSiteId: string;
     protected frontpageCourseId: number;
     protected searchPage = 0;
     protected searchText = '';
+    protected myCoursesObserver: CoreEventObserver;
     protected siteUpdatedObserver: CoreEventObserver;
+    protected courseIds = '';
+    protected isDestroyed = false;
 
     constructor() {
         this.currentSiteId = CoreSites.getRequiredCurrentSite().getId();
         this.frontpageCourseId = CoreSites.getRequiredCurrentSite().getSiteHomeId();
 
+        // Update list if user enrols in a course.
+        this.myCoursesObserver = CoreEvents.on(
+            CoreCoursesProvider.EVENT_MY_COURSES_UPDATED,
+            (data) => {
+
+                if (data.action == CoreCoursesProvider.ACTION_ENROL) {
+                    this.fetchCourses();
+                }
+            },
+
+            this.currentSiteId,
+        );
+
         // Refresh the enabled flags if site is updated.
         this.siteUpdatedObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, () => {
             this.searchEnabled = !CoreCourses.isSearchCoursesDisabledInSite();
+            this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
+            this.downloadCoursesEnabled = !CoreCourses.isDownloadCoursesDisabledInSite();
+            this.myCoursesEnabled = !CoreCourses.isMyCoursesDisabledInSite();
 
+            this.downloadEnabled = (this.downloadCourseEnabled || this.downloadCoursesEnabled) && this.downloadEnabled;
             if (!this.searchEnabled) {
                 this.searchMode = false;
 
@@ -68,12 +98,25 @@ export class CoreCoursesListPage implements OnInit, OnDestroy {
      * @inheritdoc
      */
     ngOnInit(): void {
+        this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
+        this.downloadCoursesEnabled = !CoreCourses.isDownloadCoursesDisabledInSite();
+
         this.mode = CoreNavigator.getRouteParam<CoreCoursesListMode>('mode') || this.mode;
 
+        this.myCoursesEnabled = !CoreCourses.isMyCoursesDisabledInSite();
+        if (this.mode == 'my' && !this.myCoursesEnabled) {
+            this.mode = 'all';
+            this.showOnlyEnrolled = false;
+        }
+
         if (this.mode == 'search') {
             this.searchMode = true;
         }
 
+        if (this.mode == 'my') {
+            this.showOnlyEnrolled = true;
+        }
+
         this.searchEnabled = !CoreCourses.isSearchCoursesDisabledInSite();
         if (!this.searchEnabled) {
             this.searchMode = false;
@@ -91,6 +134,8 @@ export class CoreCoursesListPage implements OnInit, OnDestroy {
         try {
             if (this.searchMode && this.searchText) {
                 await this.search(this.searchText);
+            } else if (this.showOnlyEnrolled) {
+                await this.loadMyCourses();
             } else {
                 await this.loadAvailableCourses();
             }
@@ -99,6 +144,24 @@ export class CoreCoursesListPage implements OnInit, OnDestroy {
         }
     }
 
+    /**
+     * Fetch the user courses.
+     *
+     * @return Promise resolved when done.
+     */
+    protected async loadMyCourses(): Promise<void> {
+        try {
+            const courses: CoreEnrolledCourseDataWithExtraInfo[] = await CoreCourses.getUserCourses();
+            this.courseIds = courses.map((course) => course.id).join(',');
+
+            await CoreCoursesHelper.loadCoursesExtraInfo(courses, true);
+
+            this.courses = courses;
+        } catch (error) {
+            !this.isDestroyed && CoreDomUtils.showErrorModalDefault(error, 'core.courses.errorloadcourses', true);
+        }
+    }
+
     /**
      * Load the courses.
      *
@@ -110,7 +173,7 @@ export class CoreCoursesListPage implements OnInit, OnDestroy {
 
             this.courses = courses.filter((course) => course.id != this.frontpageCourseId);
         } catch (error) {
-            CoreDomUtils.showErrorModalDefault(error, 'core.courses.errorloadcourses', true);
+            !this.isDestroyed && CoreDomUtils.showErrorModalDefault(error, 'core.courses.errorloadcourses', true);
         }
     }
 
@@ -124,6 +187,9 @@ export class CoreCoursesListPage implements OnInit, OnDestroy {
 
         promises.push(CoreCourses.invalidateUserCourses());
         promises.push(CoreCourses.invalidateCoursesByField());
+        if (this.courseIds) {
+            promises.push(CoreCourses.invalidateCoursesByField('ids', this.courseIds));
+        }
 
         Promise.all(promises).finally(() => {
             this.fetchCourses().finally(() => {
@@ -145,7 +211,7 @@ export class CoreCoursesListPage implements OnInit, OnDestroy {
         this.searchTotal = 0;
 
         const modal = await CoreDomUtils.showModalLoading('core.searching', true);
-        this.searchCourses().finally(() => {
+        await this.searchCourses().finally(() => {
             modal.dismiss();
         });
     }
@@ -184,7 +250,7 @@ export class CoreCoursesListPage implements OnInit, OnDestroy {
         this.searchLoadMoreError = false;
 
         try {
-            const response = await CoreCourses.search(this.searchText, this.searchPage);
+            const response = await CoreCourses.search(this.searchText, this.searchPage, undefined, this.showOnlyEnrolled);
 
             if (this.searchPage === 0) {
                 this.courses = response.courses;
@@ -197,15 +263,34 @@ export class CoreCoursesListPage implements OnInit, OnDestroy {
             this.searchCanLoadMore = this.courses.length < this.searchTotal;
         } catch (error) {
             this.searchLoadMoreError = true; // Set to prevent infinite calls with infinite-loading.
-            CoreDomUtils.showErrorModalDefault(error, 'core.courses.errorsearching', true);
+            !this.isDestroyed && CoreDomUtils.showErrorModalDefault(error, 'core.courses.errorsearching', true);
         }
     }
 
+    /**
+     * Toggle show only my courses.
+     */
+    toggleEnrolled(enabled: boolean): void {
+        this.coursesLoaded = false;
+        this.showOnlyEnrolled = enabled;
+
+        this.fetchCourses();
+    }
+
+    /**
+     * Toggle download enabled.
+     */
+    toggleDownload(enabled: boolean): void {
+        this.downloadEnabled = enabled;
+    }
+
     /**
      * @inheritdoc
      */
     ngOnDestroy(): void {
+        this.myCoursesObserver?.off();
         this.siteUpdatedObserver?.off();
+        this.isDestroyed = true;
     }
 
 }
diff --git a/src/core/features/courses/pages/my-courses/my-courses.html b/src/core/features/courses/pages/my-courses/my-courses.html
deleted file mode 100644
index 2e22ce7ee..000000000
--- a/src/core/features/courses/pages/my-courses/my-courses.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<ion-header>
-    <ion-toolbar>
-        <ion-buttons slot="start">
-            <ion-back-button [text]="'core.back' | translate"></ion-back-button>
-        </ion-buttons>
-        <h1>{{ 'core.courses.mycourses' | translate }}</h1>
-
-        <ion-buttons slot="end">
-            <core-navbar-buttons>
-                <ion-button *ngIf="searchEnabled" (click)="openSearch()"
-                    [attr.aria-label]="'core.courses.searchcourses' | translate">
-                    <ion-icon name="fas-search" slot="icon-only" aria-hidden="true"></ion-icon>
-                </ion-button>
-                <ion-button [hidden]="!downloadAllCoursesEnabled || !courses || courses.length < 2 || downloadAllCoursesLoading"
-                    (click)="prefetchCourses()" [attr.aria-label]="'core.courses.downloadcourses' | translate">
-                    <ion-icon [name]="downloadAllCoursesIcon" slot="icon-only" aria-hidden="true"></ion-icon>
-                </ion-button>
-                <ion-spinner [hidden]="!downloadAllCoursesEnabled || !courses || courses.length < 2 ||
-                    downloadAllCoursesBadge != '' || !downloadAllCoursesLoading"
-                    [attr.aria-label]="'core.loading' | translate"></ion-spinner>
-                <ion-badge [hidden]="!downloadAllCoursesEnabled || !courses || courses.length < 2 || !downloadAllCoursesLoading ||
-                    downloadAllCoursesBadge == '' || !downloadAllCoursesLoading"
-                    role="progressbar" [attr.aria-valuemax]="downloadAllCoursesTotal"
-                    [attr.aria-valuenow]="downloadAllCoursesCount" [attr.aria-valuetext]="downloadAllCoursesBadgeA11yText">
-                    {{downloadAllCoursesBadge}}
-                </ion-badge>
-            </core-navbar-buttons>
-        </ion-buttons>
-    </ion-toolbar>
-</ion-header>
-<ion-content>
-    <ion-refresher slot="fixed" [disabled]="!coursesLoaded" (ionRefresh)="refreshCourses($event.target)">
-        <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
-    </ion-refresher>
-
-    <core-loading [hideUntil]="coursesLoaded">
-        <ion-searchbar #searchbar *ngIf="courses && courses.length > 5" [(ngModel)]="filter" (ionInput)="filterChanged($event)"
-            (ionCancel)="filterChanged()" [placeholder]="'core.courses.filtermycourses' | translate">
-        </ion-searchbar>
-        <ion-grid class="ion-no-padding safe-area-padding">
-            <ion-row class="ion-no-padding">
-                <ion-col *ngFor="let course of filteredCourses" class="ion-no-padding"
-                    size="12" size-sm="6" size-md="6" size-lg="4" size-xl="4">
-                    <core-courses-course-progress [course]="course" class="core-courseoverview" showAll="true">
-                    </core-courses-course-progress>
-                </ion-col>
-            </ion-row>
-        </ion-grid>
-        <core-empty-box *ngIf="!courses || !courses.length" icon="fas-graduation-cap"
-            [message]="'core.courses.nocourses' | translate">
-            <p *ngIf="searchEnabled">{{ 'core.courses.searchcoursesadvice' | translate }}</p>
-        </core-empty-box>
-    </core-loading>
-</ion-content>
diff --git a/src/core/features/courses/pages/my-courses/my-courses.module.ts b/src/core/features/courses/pages/my-courses/my-courses.module.ts
deleted file mode 100644
index d07c58ced..000000000
--- a/src/core/features/courses/pages/my-courses/my-courses.module.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-// (C) Copyright 2015 Moodle Pty Ltd.
-//
-// 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 { RouterModule, Routes } from '@angular/router';
-
-import { CoreSharedModule } from '@/core/shared.module';
-import { CoreCoursesMyCoursesPage } from './my-courses';
-import { CoreCoursesComponentsModule } from '../../components/components.module';
-
-const routes: Routes = [
-    {
-        path: '',
-        component: CoreCoursesMyCoursesPage,
-    },
-];
-
-@NgModule({
-    imports: [
-        RouterModule.forChild(routes),
-        CoreSharedModule,
-        CoreCoursesComponentsModule,
-    ],
-    declarations: [
-        CoreCoursesMyCoursesPage,
-    ],
-    exports: [RouterModule],
-})
-export class CoreCoursesMyCoursesPageModule { }
diff --git a/src/core/features/courses/pages/my-courses/my-courses.ts b/src/core/features/courses/pages/my-courses/my-courses.ts
deleted file mode 100644
index 675933daf..000000000
--- a/src/core/features/courses/pages/my-courses/my-courses.ts
+++ /dev/null
@@ -1,219 +0,0 @@
-// (C) Copyright 2015 Moodle Pty Ltd.
-//
-// 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, OnInit, OnDestroy, ViewChild } from '@angular/core';
-import { IonSearchbar, IonRefresher } from '@ionic/angular';
-import { CoreEventObserver, CoreEvents } from '@singletons/events';
-import { CoreSites } from '@services/sites';
-import { CoreDomUtils } from '@services/utils/dom';
-import {
-    CoreCoursesProvider,
-    CoreCourses,
-} from '../../services/courses';
-import { CoreCoursesHelper, CoreEnrolledCourseDataWithExtraInfoAndOptions } from '../../services/courses-helper';
-import { CoreCourseHelper } from '@features/course/services/course-helper';
-import { CoreConstants } from '@/core/constants';
-import { CoreCourseOptionsDelegate } from '@features/course/services/course-options-delegate';
-import { CoreNavigator } from '@services/navigator';
-import { Translate } from '@singletons';
-
-/**
- * Page that displays the list of courses the user is enrolled in.
- */
-@Component({
-    selector: 'page-core-courses-my-courses',
-    templateUrl: 'my-courses.html',
-})
-export class CoreCoursesMyCoursesPage implements OnInit, OnDestroy {
-
-    @ViewChild(IonSearchbar) searchbar!: IonSearchbar;
-
-    courses: CoreEnrolledCourseDataWithExtraInfoAndOptions[] = [];
-    filteredCourses: CoreEnrolledCourseDataWithExtraInfoAndOptions[] = [];
-    searchEnabled = false;
-    filter = '';
-    showFilter = false;
-    coursesLoaded = false;
-    downloadAllCoursesIcon = CoreConstants.ICON_NOT_DOWNLOADED;
-    downloadAllCoursesLoading = false;
-    downloadAllCoursesBadge = '';
-    downloadAllCoursesEnabled = false;
-    downloadAllCoursesCount?: number;
-    downloadAllCoursesTotal?: number;
-    downloadAllCoursesBadgeA11yText = '';
-
-    protected myCoursesObserver: CoreEventObserver;
-    protected siteUpdatedObserver: CoreEventObserver;
-    protected isDestroyed = false;
-    protected courseIds = '';
-
-    constructor() {
-        // Update list if user enrols in a course.
-        this.myCoursesObserver = CoreEvents.on(
-            CoreCoursesProvider.EVENT_MY_COURSES_UPDATED,
-            (data) => {
-
-                if (data.action == CoreCoursesProvider.ACTION_ENROL) {
-                    this.fetchCourses();
-                }
-            },
-
-            CoreSites.getCurrentSiteId(),
-        );
-
-        // Refresh the enabled flags if site is updated.
-        this.siteUpdatedObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, () => {
-            this.searchEnabled = !CoreCourses.isSearchCoursesDisabledInSite();
-            this.downloadAllCoursesEnabled = !CoreCourses.isDownloadCoursesDisabledInSite();
-        }, CoreSites.getCurrentSiteId());
-    }
-
-    /**
-     * Component being initialized.
-     */
-    ngOnInit(): void {
-        this.searchEnabled = !CoreCourses.isSearchCoursesDisabledInSite();
-        this.downloadAllCoursesEnabled = !CoreCourses.isDownloadCoursesDisabledInSite();
-
-        this.fetchCourses().finally(() => {
-            this.coursesLoaded = true;
-        });
-    }
-
-    /**
-     * Fetch the user courses.
-     *
-     * @return Promise resolved when done.
-     */
-    protected async fetchCourses(): Promise<void> {
-        try {
-            const courses: CoreEnrolledCourseDataWithExtraInfoAndOptions[] = await CoreCourses.getUserCourses();
-            const courseIds = courses.map((course) => course.id);
-
-            this.courseIds = courseIds.join(',');
-
-            await CoreCoursesHelper.loadCoursesExtraInfo(courses);
-
-            const options = await CoreCourses.getCoursesAdminAndNavOptions(courseIds);
-            courses.forEach((course) => {
-                course.navOptions = options.navOptions[course.id];
-                course.admOptions = options.admOptions[course.id];
-            });
-
-            this.courses = courses;
-            this.filteredCourses = this.courses;
-            this.filter = '';
-        } catch (error) {
-            CoreDomUtils.showErrorModalDefault(error, 'core.courses.errorloadcourses', true);
-        }
-    }
-
-    /**
-     * Refresh the courses.
-     *
-     * @param refresher Refresher.
-     */
-    refreshCourses(refresher: IonRefresher): void {
-        const promises: Promise<void>[] = [];
-
-        promises.push(CoreCourses.invalidateUserCourses());
-        promises.push(CoreCourseOptionsDelegate.clearAndInvalidateCoursesOptions());
-        if (this.courseIds) {
-            promises.push(CoreCourses.invalidateCoursesByField('ids', this.courseIds));
-        }
-
-        Promise.all(promises).finally(() => {
-            this.fetchCourses().finally(() => {
-                refresher?.complete();
-            });
-        });
-    }
-
-    /**
-     * Show or hide the filter.
-     */
-    switchFilter(): void {
-        this.filter = '';
-        this.showFilter = !this.showFilter;
-        this.filteredCourses = this.courses;
-        if (this.showFilter) {
-            setTimeout(() => {
-                this.searchbar.setFocus();
-            }, 500);
-        }
-    }
-
-    /**
-     * The filter has changed.
-     *
-     * @param Received Event.
-     */
-    filterChanged(event?: Event): void {
-        const target = <HTMLInputElement>event?.target || null;
-        const newValue = target ? String(target.value).trim().toLowerCase() : null;
-        if (!newValue || !this.courses) {
-            this.filteredCourses = this.courses;
-        } else {
-            // Use displayname if available, or fullname if not.
-            if (this.courses.length > 0 && typeof this.courses[0].displayname != 'undefined') {
-                this.filteredCourses = this.courses.filter((course) => course.displayname!.toLowerCase().indexOf(newValue) > -1);
-            } else {
-                this.filteredCourses = this.courses.filter((course) => course.fullname.toLowerCase().indexOf(newValue) > -1);
-            }
-        }
-    }
-
-    /**
-     * Prefetch all the courses.
-     *
-     * @return Promise resolved when done.
-     */
-    async prefetchCourses(): Promise<void> {
-        this.downloadAllCoursesLoading = true;
-
-        try {
-            await CoreCourseHelper.confirmAndPrefetchCourses(this.courses, { onProgress: (progress) => {
-                this.downloadAllCoursesBadge = progress.count + ' / ' + progress.total;
-                this.downloadAllCoursesBadgeA11yText =
-                    Translate.instant('core.course.downloadcoursesprogressdescription', progress);
-                this.downloadAllCoursesCount = progress.count;
-                this.downloadAllCoursesTotal = progress.total;
-            } });
-        } catch (error) {
-            if (!this.isDestroyed) {
-                CoreDomUtils.showErrorModalDefault(error, 'core.course.errordownloadingcourse', true);
-            }
-        }
-
-        this.downloadAllCoursesBadge = '';
-        this.downloadAllCoursesLoading = false;
-    }
-
-    /**
-     * Go to search courses.
-     */
-    openSearch(): void {
-        CoreNavigator.navigateToSitePath('courses/list', { params : { mode: 'search' } });
-    }
-
-    /**
-     * Page destroyed.
-     */
-    ngOnDestroy(): void {
-        this.isDestroyed = true;
-        this.myCoursesObserver?.off();
-        this.siteUpdatedObserver?.off();
-    }
-
-}
diff --git a/src/core/features/courses/services/courses.ts b/src/core/features/courses/services/courses.ts
index e05585344..7b52afce7 100644
--- a/src/core/features/courses/services/courses.ts
+++ b/src/core/features/courses/services/courses.ts
@@ -20,6 +20,7 @@ import { makeSingleton } from '@singletons';
 import { CoreStatusWithWarningsWSResponse, CoreWarningsWSResponse, CoreWSExternalFile, CoreWSExternalWarning } from '@services/ws';
 import { CoreEvents } from '@singletons/events';
 import { CoreWSError } from '@classes/errors/wserror';
+import { CoreCourseWithImageAndColor } from './courses-helper';
 
 const ROOT_CACHE_KEY = 'mmCourses:';
 
@@ -1121,6 +1122,7 @@ export class CoreCoursesProvider {
      * @param text Text to search.
      * @param page Page to get.
      * @param perPage Number of courses per page. Defaults to CoreCoursesProvider.SEARCH_PER_PAGE.
+     * @param limitToEnrolled Limit to enrolled courses.
      * @param siteId Site ID. If not defined, use current site.
      * @return Promise resolved with the courses and the total of matches.
      */
@@ -1128,6 +1130,7 @@ export class CoreCoursesProvider {
         text: string,
         page: number = 0,
         perPage: number = CoreCoursesProvider.SEARCH_PER_PAGE,
+        limitToEnrolled: boolean = false,
         siteId?: string,
     ): Promise<{ total: number; courses: CoreCourseBasicSearchedData[] }> {
         const site = await CoreSites.getSite(siteId);
@@ -1136,6 +1139,7 @@ export class CoreCoursesProvider {
             criteriavalue: text,
             page: page,
             perpage: perPage,
+            limittoenrolled: limitToEnrolled,
         };
         const preSets: CoreSiteWSPreSets = {
             getFromCache: false,
@@ -1358,6 +1362,14 @@ export type CoreCourseSearchedData = CoreCourseBasicSearchedData & {
     courseformatoptions?: CoreCourseFormatOption[]; // Additional options for particular course format.
 };
 
+/**
+ * Course to render as list item.
+ */
+export type CoreCourseListItem = CoreCourseSearchedData & CoreCourseWithImageAndColor & {
+    completionusertracked?: boolean; // If the user is completion tracked.
+    progress?: number | null; // Progress percentage.
+};
+
 export type CoreCourseGetCoursesData = CoreEnrolledCourseBasicData & {
     categoryid: number; // Category id.
     categorysortorder?: number; // Sort order into the category.
diff --git a/src/core/features/sitehome/pages/index/index.ts b/src/core/features/sitehome/pages/index/index.ts
index 5216e6973..dcc3491de 100644
--- a/src/core/features/sitehome/pages/index/index.ts
+++ b/src/core/features/sitehome/pages/index/index.ts
@@ -223,7 +223,7 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
      * Go to my courses.
      */
     openMyCourses(): void {
-        CoreNavigator.navigateToSitePath('courses/my');
+        CoreNavigator.navigateToSitePath('courses/list', { params : { mode: 'my' } });
     }
 
     /**

From ad45289f4bcd88f44e66df310111d12010ba8a7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 13 Oct 2021 17:11:47 +0200
Subject: [PATCH 0151/1008] MOBILE-3686 courses: Add download options to course
 list item

---
 .../core-courses-course-list-item.html        |  10 ++
 .../course-list-item/course-list-item.ts      | 112 +++++++++++++++++-
 .../course-progress/course-progress.ts        |   5 +-
 .../features/courses/pages/list/list.html     |   3 +-
 4 files changed, 122 insertions(+), 8 deletions(-)

diff --git a/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html b/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
index 0d81bc533..425d8e3f3 100644
--- a/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
+++ b/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
@@ -34,4 +34,14 @@
             slot="end">
         </ion-icon>
     </ng-container>
+
+    <div class="core-button-spinner" *ngIf="isEnrolled && showDownload" slot="end">
+        <core-download-refresh
+            [status]="prefetchCourseData.status"
+            [statusTranslatable]="prefetchCourseData.statusTranslatable"
+            [enabled]="true"
+            canTrustDownload="false"
+            [loading]="prefetchCourseData.loading"
+            (action)="prefetchCourse()"></core-download-refresh>
+    </div>
 </ion-item>
diff --git a/src/core/features/courses/components/course-list-item/course-list-item.ts b/src/core/features/courses/components/course-list-item/course-list-item.ts
index e4248e0e3..6d4da5a97 100644
--- a/src/core/features/courses/components/course-list-item/course-list-item.ts
+++ b/src/core/features/courses/components/course-list-item/course-list-item.ts
@@ -12,8 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, Input, OnInit } from '@angular/core';
-import { CoreCourseHelper } from '@features/course/services/course-helper';
+import { Component, Input, OnChanges, OnDestroy, OnInit } from '@angular/core';
+import { CoreCourseProvider, CoreCourse } from '@features/course/services/course';
+import { CoreCourseHelper, CorePrefetchStatusInfo } from '@features/course/services/course-helper';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
@@ -33,15 +34,26 @@ import { CoreCoursesHelper } from '../../services/courses-helper';
     templateUrl: 'core-courses-course-list-item.html',
     styleUrls: ['course-list-item.scss'],
 })
-export class CoreCoursesCourseListItemComponent implements OnInit {
+export class CoreCoursesCourseListItemComponent implements OnInit, OnDestroy, OnChanges {
 
     @Input() course!: CoreCourseListItem; // The course to render.
 
+    @Input() showDownload = false; // If true, will show download button.
+
     icons: CoreCoursesEnrolmentIcons[] = [];
     isEnrolled = false;
+    prefetchCourseData: CorePrefetchStatusInfo = {
+        icon: '',
+        statusTranslatable: 'core.loading',
+        status: '',
+        loading: true,
+    };
+
+    protected courseStatusObserver?: CoreEventObserver;
+    protected isDestroyed = false;
 
     /**
-     * Component being initialized.
+     * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
         CoreCoursesHelper.loadCourseColorAndImage(this.course);
@@ -55,6 +67,10 @@ export class CoreCoursesCourseListItemComponent implements OnInit {
                 this.course.completionusertracked = course.completionusertracked;
 
                 this.isEnrolled = true;
+
+                if (this.showDownload) {
+                    this.initPrefetchCourse();
+                }
             } catch {
                 this.isEnrolled = false;
             }
@@ -91,6 +107,15 @@ export class CoreCoursesCourseListItemComponent implements OnInit {
         }
     }
 
+    /**
+     * @inheritdoc
+     */
+    ngOnChanges(): void {
+        if (this.showDownload && this.isEnrolled) {
+            this.initPrefetchCourse();
+        }
+    }
+
     /**
      * Open a course.
      *
@@ -107,6 +132,85 @@ export class CoreCoursesCourseListItemComponent implements OnInit {
         }
     }
 
+    /**
+     * Initialize prefetch course.
+     */
+    async initPrefetchCourse(): Promise<void> {
+        if (this.courseStatusObserver !== undefined) {
+            // Already initialized.
+            return;
+        }
+
+        // Listen for status change in course.
+        this.courseStatusObserver = CoreEvents.on(CoreEvents.COURSE_STATUS_CHANGED, (data: CoreEventCourseStatusChanged) => {
+            if (data.courseId == this.course.id || data.courseId == CoreCourseProvider.ALL_COURSES_CLEARED) {
+                this.updateCourseStatus(data.status);
+            }
+        }, CoreSites.getCurrentSiteId());
+
+        // Determine course prefetch icon.
+        const status = await CoreCourse.getCourseStatus(this.course.id);
+
+        this.updateCourseStatus(status);
+
+        if (this.prefetchCourseData.loading) {
+            // Course is being downloaded. Get the download promise.
+            const promise = CoreCourseHelper.getCourseDownloadPromise(this.course.id);
+            if (promise) {
+                // There is a download promise. If it fails, show an error.
+                promise.catch((error) => {
+                    if (!this.isDestroyed) {
+                        CoreDomUtils.showErrorModalDefault(error, 'core.course.errordownloadingcourse', true);
+                    }
+                });
+            } else {
+                // No download, this probably means that the app was closed while downloading. Set previous status.
+                CoreCourse.setCoursePreviousStatus(this.course.id);
+            }
+        }
+
+    }
+
+    /**
+     * Update the course status icon and title.
+     *
+     * @param status Status to show.
+     */
+    protected updateCourseStatus(status: string): void {
+        const statusData = CoreCourseHelper.getCoursePrefetchStatusInfo(status);
+
+        this.prefetchCourseData.status = statusData.status;
+        this.prefetchCourseData.icon = statusData.icon;
+        this.prefetchCourseData.statusTranslatable = statusData.statusTranslatable;
+        this.prefetchCourseData.loading = statusData.loading;
+    }
+
+    /**
+     * Prefetch the course.
+     *
+     * @param e Click event.
+     */
+    async prefetchCourse(e?: Event): Promise<void> {
+        e?.preventDefault();
+        e?.stopPropagation();
+
+        try {
+            await CoreCourseHelper.confirmAndPrefetchCourse(this.prefetchCourseData, this.course);
+        } catch (error) {
+            if (!this.isDestroyed) {
+                CoreDomUtils.showErrorModalDefault(error, 'core.course.errordownloadingcourse', true);
+            }
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    ngOnDestroy(): void {
+        this.isDestroyed = true;
+        this.courseStatusObserver?.off();
+    }
+
 }
 
 /**
diff --git a/src/core/features/courses/components/course-progress/course-progress.ts b/src/core/features/courses/components/course-progress/course-progress.ts
index c4892208b..ece9a9b50 100644
--- a/src/core/features/courses/components/course-progress/course-progress.ts
+++ b/src/core/features/courses/components/course-progress/course-progress.ts
@@ -48,8 +48,6 @@ export class CoreCoursesCourseProgressComponent implements OnInit, OnDestroy, On
     @Input() showAll = false; // If true, will show all actions, options, star and progress.
     @Input() showDownload = true; // If true, will show download button. Only works if the options menu is not shown.
 
-    courseStatus = CoreConstants.NOT_DOWNLOADED;
-    isDownloading = false;
     prefetchCourseData: CorePrefetchStatusInfo = {
         icon: '',
         statusTranslatable: 'core.loading',
@@ -64,6 +62,7 @@ export class CoreCoursesCourseProgressComponent implements OnInit, OnDestroy, On
     progress = -1;
     completionUserTracked: boolean | undefined = false;
 
+    protected courseStatus = CoreConstants.NOT_DOWNLOADED;
     protected isDestroyed = false;
     protected courseStatusObserver?: CoreEventObserver;
     protected siteUpdatedObserver?: CoreEventObserver;
@@ -109,7 +108,7 @@ export class CoreCoursesCourseProgressComponent implements OnInit, OnDestroy, On
      * Initialize prefetch course.
      */
     async initPrefetchCourse(): Promise<void> {
-        if (typeof this.courseStatusObserver != 'undefined') {
+        if (this.courseStatusObserver !== undefined) {
             // Already initialized.
             return;
         }
diff --git a/src/core/features/courses/pages/list/list.html b/src/core/features/courses/pages/list/list.html
index fe2dbc491..838ce9ae1 100644
--- a/src/core/features/courses/pages/list/list.html
+++ b/src/core/features/courses/pages/list/list.html
@@ -34,7 +34,8 @@
             </ion-item-divider>
         </ng-container>
         
-        <core-courses-course-list-item *ngFor="let course of courses" [course]="course"></core-courses-course-list-item>
+        <core-courses-course-list-item *ngFor="let course of courses" [course]="course" [showDownload]="downloadEnabled">
+        </core-courses-course-list-item>
 
         <core-infinite-loading [enabled]="searchMode && searchCanLoadMore" (action)="loadMoreResults($event)" [error]="searchLoadMoreError">
         </core-infinite-loading>

From 264309593f188968e1caddfdd72763529bda0753 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 14 Oct 2021 10:10:30 +0200
Subject: [PATCH 0152/1008] MOBILE-3686 courses: Filter my courses and add
 download to categories

---
 .../courses/pages/categories/categories.html  |  46 +++++---
 .../courses/pages/categories/categories.ts    | 110 ++++++++++++++++--
 2 files changed, 127 insertions(+), 29 deletions(-)

diff --git a/src/core/features/courses/pages/categories/categories.html b/src/core/features/courses/pages/categories/categories.html
index dece679a1..eec8dd4a5 100644
--- a/src/core/features/courses/pages/categories/categories.html
+++ b/src/core/features/courses/pages/categories/categories.html
@@ -7,6 +7,16 @@
             <core-format-text [text]="title" contextLevel="coursecat" [contextInstanceId]="currentCategory && currentCategory!.id">
             </core-format-text>
         </h1>
+        <ion-buttons slot="end">
+            <core-context-menu>
+                <core-context-menu-item *ngIf="downloadCourseEnabled || downloadCoursesEnabled" [priority]="1000"
+                    [content]="'core.settings.showdownloadoptions' | translate" (action)="toggleDownload(!downloadEnabled)"
+                    iconAction="toggle" [toggle]="downloadEnabled"></core-context-menu-item>
+                <core-context-menu-item *ngIf="myCoursesEnabled" [priority]="900"
+                    [content]="'core.courses.showonlyenrolled' | translate" (action)="toggleEnrolled(!showOnlyEnrolled)"
+                    iconAction="toggle" [toggle]="showOnlyEnrolled"></core-context-menu-item>   
+            </core-context-menu>
+        </ion-buttons>
     </ion-toolbar>
 </ion-header>
 <ion-content>
@@ -17,22 +27,18 @@
         <ion-item *ngIf="currentCategory" class="ion-text-wrap">
             <ion-icon name="fas-folder" slot="start" [attr.aria-label]="'core.category' | translate"></ion-icon>
             <ion-label>
-                <h2>
-                    <core-format-text [text]="currentCategory!.name" contextLevel="coursecat"
-                    [contextInstanceId]="currentCategory!.id"></core-format-text>
-                </h2>
-            </ion-label>
-        </ion-item>
-        <ion-item class="ion-text-wrap" *ngIf="currentCategory && currentCategory!.description">
-            <ion-label>
-                <h2>
-                    <core-format-text [text]="currentCategory!.description" maxHeight="60" contextLevel="coursecat"
-            [contextInstanceId]="currentCategory!.id"></core-format-text>
-                </h2>
+                <p class="item-heading">
+                    <core-format-text [text]="currentCategory.name" contextLevel="coursecat"
+                    [contextInstanceId]="currentCategory.id"></core-format-text>
+                </p>
+                <p *ngIf="currentCategory.description">
+                    <core-format-text [text]="currentCategory.description" maxHeight="60" contextLevel="coursecat"
+                    [contextInstanceId]="currentCategory.id"></core-format-text>
+                </p>
             </ion-label>
         </ion-item>
 
-        <div *ngIf="categories.length > 0">
+        <ng-container *ngIf="categories.length > 0">
             <ion-item-divider>
                 <ion-label>
                     <h2>{{ 'core.courses.categories' | translate }}</h2>
@@ -48,22 +54,24 @@
                             </core-format-text>
                         </h2>
                     </ion-label>
-                    <ion-badge slot="end" *ngIf="category.coursecount > 0" color="light">
+                    <ion-badge slot="end" *ngIf="!showOnlyEnrolled && category.coursecount > 0" color="light">
                         <span aria-hidden="true">{{ category.coursecount }}</span>
                         <span class="sr-only">{{ 'core.courses.therearecourses' | translate:{ $a: category.coursecount } }}</span>
                     </ion-badge>
                 </ion-item>
             </section>
-        </div>
+        </ng-container>
 
-        <div *ngIf="courses.length > 0">
+        <ng-container *ngIf="courses.length > 0">
             <ion-item-divider>
                 <ion-label>
-                    <h2>{{ 'core.courses.courses' | translate }}</h2>
+                    <h2 *ngIf="!showOnlyEnrolled">{{ 'core.courses.courses' | translate }}</h2>
+                    <h2 *ngIf="showOnlyEnrolled">{{ 'core.courses.mycourses' | translate }}</h2>
                 </ion-label>
             </ion-item-divider>
-            <core-courses-course-list-item *ngFor="let course of courses" [course]="course"></core-courses-course-list-item>
-        </div>
+            <core-courses-course-list-item *ngFor="let course of courses" [course]="course" [showDownload]="downloadEnabled">
+            </core-courses-course-list-item>
+        </ng-container>
         <core-empty-box *ngIf="!categories.length && !courses.length" icon="fas-graduation-cap"
             [message]="'core.courses.nocoursesyet' | translate">
         </core-empty-box>
diff --git a/src/core/features/courses/pages/categories/categories.ts b/src/core/features/courses/pages/categories/categories.ts
index df71c1c88..d3de228a0 100644
--- a/src/core/features/courses/pages/categories/categories.ts
+++ b/src/core/features/courses/pages/categories/categories.ts
@@ -12,14 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, OnInit } from '@angular/core';
+import { Component, OnDestroy, OnInit } from '@angular/core';
 import { IonRefresher } from '@ionic/angular';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
-import { CoreCategoryData, CoreCourses, CoreCourseSearchedData } from '../../services/courses';
+import { CoreCategoryData, CoreCourseListItem, CoreCourses, CoreCoursesProvider } from '../../services/courses';
 import { Translate } from '@singletons';
 import { CoreNavigator } from '@services/navigator';
+import { CoreEventObserver, CoreEvents } from '@singletons/events';
 
 /**
  * Page that displays a list of categories and the courses in the current category if any.
@@ -28,25 +29,64 @@ import { CoreNavigator } from '@services/navigator';
     selector: 'page-core-courses-categories',
     templateUrl: 'categories.html',
 })
-export class CoreCoursesCategoriesPage implements OnInit {
+export class CoreCoursesCategoriesPage implements OnInit, OnDestroy {
 
     title: string;
     currentCategory?: CoreCategoryData;
     categories: CoreCategoryData[] = [];
-    courses: CoreCourseSearchedData[] = [];
+    courses: CoreCourseListItem[] = [];
     categoriesLoaded = false;
+    myCoursesEnabled = true;
 
+    showOnlyEnrolled = false;
+
+    downloadEnabled = false;
+    downloadCourseEnabled = false;
+    downloadCoursesEnabled = false;
+
+    protected categoryCourses: CoreCourseListItem[] = [];
+    protected currentSiteId: string;
     protected categoryId = 0;
+    protected myCoursesObserver: CoreEventObserver;
+    protected siteUpdatedObserver: CoreEventObserver;
+    protected isDestroyed = false;
 
     constructor() {
         this.title = Translate.instant('core.courses.categories');
+        this.currentSiteId = CoreSites.getRequiredCurrentSite().getId();
+
+        // Update list if user enrols in a course.
+        this.myCoursesObserver = CoreEvents.on(
+            CoreCoursesProvider.EVENT_MY_COURSES_UPDATED,
+            (data) => {
+                if (data.action == CoreCoursesProvider.ACTION_ENROL) {
+                    this.fetchCategories();
+                }
+            },
+
+            this.currentSiteId,
+        );
+
+        // Refresh the enabled flags if site is updated.
+        this.siteUpdatedObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, () => {
+            this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
+            this.downloadCoursesEnabled = !CoreCourses.isDownloadCoursesDisabledInSite();
+            this.myCoursesEnabled = !CoreCourses.isMyCoursesDisabledInSite();
+
+            this.downloadEnabled = (this.downloadCourseEnabled || this.downloadCoursesEnabled) && this.downloadEnabled;
+        }, this.currentSiteId);
     }
 
     /**
-     * View loaded.
+     * @inheritdoc
      */
     ngOnInit(): void {
         this.categoryId = CoreNavigator.getRouteNumberParam('id') || 0;
+        this.showOnlyEnrolled = CoreNavigator.getRouteBooleanParam('enrolled') || this.showOnlyEnrolled;
+
+        this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
+        this.downloadCoursesEnabled = !CoreCourses.isDownloadCoursesDisabledInSite();
+        this.myCoursesEnabled = !CoreCourses.isMyCoursesDisabledInSite();
 
         this.fetchCategories().finally(() => {
             this.categoriesLoaded = true;
@@ -87,13 +127,14 @@ export class CoreCoursesCategoriesPage implements OnInit {
                 this.title = this.currentCategory.name;
 
                 try {
-                    this.courses = await CoreCourses.getCoursesByField('category', this.categoryId);
+                    this.categoryCourses = await CoreCourses.getCoursesByField('category', this.categoryId);
+                    await this.toggleEnrolled(this.showOnlyEnrolled);
                 } catch (error) {
-                    CoreDomUtils.showErrorModalDefault(error, 'core.courses.errorloadcourses', true);
+                    !this.isDestroyed && CoreDomUtils.showErrorModalDefault(error, 'core.courses.errorloadcourses', true);
                 }
             }
         } catch (error) {
-            CoreDomUtils.showErrorModalDefault(error, 'core.courses.errorloadcategories', true);
+            !this.isDestroyed && CoreDomUtils.showErrorModalDefault(error, 'core.courses.errorloadcategories', true);
         }
     }
 
@@ -108,7 +149,7 @@ export class CoreCoursesCategoriesPage implements OnInit {
         promises.push(CoreCourses.invalidateUserCourses());
         promises.push(CoreCourses.invalidateCategories(this.categoryId, true));
         promises.push(CoreCourses.invalidateCoursesByField('category', this.categoryId));
-        promises.push(CoreSites.getCurrentSite()!.invalidateConfig());
+        promises.push(CoreSites.getRequiredCurrentSite().invalidateConfig());
 
         Promise.all(promises).finally(() => {
             this.fetchCategories().finally(() => {
@@ -123,7 +164,56 @@ export class CoreCoursesCategoriesPage implements OnInit {
      * @param categoryId Category Id.
      */
     openCategory(categoryId: number): void {
-        CoreNavigator.navigateToSitePath('courses/categories/' + categoryId);
+        CoreNavigator.navigateToSitePath(
+            'courses/categories/' + categoryId,
+            { params: {
+                enrolled: this.showOnlyEnrolled,
+            } },
+        );
+    }
+
+    /**
+     * Toggle show only my courses.
+     *
+     * @param enable If enable or disable.
+     */
+    async toggleEnrolled(enable: boolean): Promise<void> {
+        this.showOnlyEnrolled = enable;
+
+        if (!this.showOnlyEnrolled) {
+            this.courses = this.categoryCourses;
+        } else {
+            await Promise.all(this.categoryCourses.map(async (course) => {
+                const isEnrolled = course.progress !== undefined;
+
+                if (!isEnrolled) {
+                    try {
+                        const userCourse = await CoreCourses.getUserCourse(course.id);
+                        course.progress = userCourse.progress;
+                        course.completionusertracked = userCourse.completionusertracked;
+                    } catch {
+                        // Ignore errors.
+                    }
+                }
+            }));
+            this.courses = this.categoryCourses.filter((course) => 'progress' in course);
+        }
+    }
+
+    /**
+     * Toggle download enabled.
+     */
+    toggleDownload(enabled: boolean): void {
+        this.downloadEnabled = enabled;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    ngOnDestroy(): void {
+        this.myCoursesObserver?.off();
+        this.siteUpdatedObserver?.off();
+        this.isDestroyed = true;
     }
 
 }

From 577aa3168f863c0d0ee64a59e2049309db5d9442 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 14 Oct 2021 10:36:20 +0200
Subject: [PATCH 0153/1008] MOBILE-3686 dashboard: Fix dashboard download
 options

---
 .../features/courses/pages/dashboard/dashboard.html    |  2 +-
 src/core/features/sitehome/pages/index/index.html      |  4 ++--
 src/core/features/sitehome/pages/index/index.ts        | 10 +---------
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/core/features/courses/pages/dashboard/dashboard.html b/src/core/features/courses/pages/dashboard/dashboard.html
index 394086ca8..a7f25bbee 100644
--- a/src/core/features/courses/pages/dashboard/dashboard.html
+++ b/src/core/features/courses/pages/dashboard/dashboard.html
@@ -6,7 +6,7 @@
         <core-context-menu-item *ngIf="(downloadCourseEnabled || downloadCoursesEnabled)" [priority]="1000"
         [content]="'core.settings.showdownloadoptions' | translate" (action)="switchDownload(!downloadEnabled)"
         iconAction="toggle" [toggle]="downloadEnabled"></core-context-menu-item>
-        <core-context-menu-item *ngIf="(downloadCourseEnabled || downloadCoursesEnabled)" [priority]="500"
+        <core-context-menu-item [priority]="500"
         [content]="'addon.storagemanager.managestorage' | translate"
         (action)="manageCoursesStorage()" iconAction="fas-archive"></core-context-menu-item>
     </core-context-menu>
diff --git a/src/core/features/sitehome/pages/index/index.html b/src/core/features/sitehome/pages/index/index.html
index 574e26e14..64ff7d280 100644
--- a/src/core/features/sitehome/pages/index/index.html
+++ b/src/core/features/sitehome/pages/index/index.html
@@ -3,10 +3,10 @@
         <ion-icon name="fas-search" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
     <core-context-menu>
-        <core-context-menu-item *ngIf="(downloadCourseEnabled || downloadCoursesEnabled)" [priority]="1000"
+        <core-context-menu-item [priority]="1000"
         [content]="'core.settings.showdownloadoptions' | translate" (action)="switchDownload(!downloadEnabled)"
         iconAction="toggle" [toggle]="downloadEnabled"></core-context-menu-item>
-        <core-context-menu-item *ngIf="(downloadCourseEnabled || downloadCoursesEnabled)" [priority]="500"
+        <core-context-menu-item [priority]="500"
         [content]="'addon.storagemanager.managestorage' | translate"
         (action)="manageCoursesStorage()" iconAction="fas-archive"></core-context-menu-item>
     </core-context-menu>
diff --git a/src/core/features/sitehome/pages/index/index.ts b/src/core/features/sitehome/pages/index/index.ts
index dcc3491de..b33f2e605 100644
--- a/src/core/features/sitehome/pages/index/index.ts
+++ b/src/core/features/sitehome/pages/index/index.ts
@@ -51,8 +51,6 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
     currentSite!: CoreSite;
     searchEnabled = false;
     downloadEnabled = false;
-    downloadCourseEnabled = false;
-    downloadCoursesEnabled = false;
     newsForumModule?: NewsForum;
 
     protected updateSiteObserver?: CoreEventObserver;
@@ -62,16 +60,10 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
      */
     ngOnInit(): void {
         this.searchEnabled = !CoreCourses.isSearchCoursesDisabledInSite();
-        this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
-        this.downloadCoursesEnabled = !CoreCourses.isDownloadCoursesDisabledInSite();
 
         // Refresh the enabled flags if site is updated.
         this.updateSiteObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, () => {
             this.searchEnabled = !CoreCourses.isSearchCoursesDisabledInSite();
-            this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
-            this.downloadCoursesEnabled = !CoreCourses.isDownloadCoursesDisabledInSite();
-
-            this.switchDownload(this.downloadEnabled && this.downloadCourseEnabled && this.downloadCoursesEnabled);
         }, CoreSites.getCurrentSiteId());
 
         this.currentSite = CoreSites.getRequiredCurrentSite();
@@ -194,7 +186,7 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
      * @param enable If enable or disable.
      */
     protected switchDownload(enable: boolean): void {
-        this.downloadEnabled = (this.downloadCourseEnabled || this.downloadCoursesEnabled) && enable;
+        this.downloadEnabled = enable;
         CoreEvents.trigger(CoreCoursesProvider.EVENT_DASHBOARD_DOWNLOAD_ENABLED_CHANGED, { enabled: this.downloadEnabled });
     }
 

From e789d2628023aca744a6b3d766bdb9fc1a3f9075 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 14 Oct 2021 11:02:03 +0200
Subject: [PATCH 0154/1008] MOBILE-3686 courses: Fix permanency of download
 options setting

---
 .../course/pages/contents/contents.ts         | 73 +++++++++++++------
 .../courses/pages/categories/categories.ts    | 20 ++++-
 .../courses/pages/dashboard/dashboard.html    |  8 +-
 .../courses/pages/dashboard/dashboard.ts      | 37 ++++++----
 src/core/features/courses/pages/list/list.ts  | 26 +++++--
 src/core/features/courses/services/courses.ts | 32 ++++++--
 .../features/sitehome/pages/index/index.html  | 10 +--
 .../features/sitehome/pages/index/index.ts    | 34 ++++++---
 8 files changed, 171 insertions(+), 69 deletions(-)

diff --git a/src/core/features/course/pages/contents/contents.ts b/src/core/features/course/pages/contents/contents.ts
index 7492207ed..2301f3463 100644
--- a/src/core/features/course/pages/contents/contents.ts
+++ b/src/core/features/course/pages/contents/contents.ts
@@ -18,7 +18,7 @@ import { IonContent, IonRefresher } from '@ionic/angular';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
-import { CoreCourses, CoreCourseAnyCourseData } from '@features/courses/services/courses';
+import { CoreCourses, CoreCourseAnyCourseData, CoreCoursesProvider } from '@features/courses/services/courses';
 import {
     CoreCourse,
     CoreCourseCompletionActivityStatus,
@@ -78,14 +78,34 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
     protected formatOptions?: Record<string, unknown>;
     protected completionObserver?: CoreEventObserver;
     protected courseStatusObserver?: CoreEventObserver;
+    protected siteUpdatedObserver?: CoreEventObserver;
+    protected downloadEnabledObserver?: CoreEventObserver;
     protected syncObserver?: CoreEventObserver;
     protected isDestroyed = false;
     protected modulesHaveCompletion = false;
     protected isGuest?: boolean;
     protected debouncedUpdateCachedCompletion?: () => void; // Update the cached completion after a certain time.
 
+    constructor() {
+        // Refresh the enabled flags if site is updated.
+        this.siteUpdatedObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, () => {
+            this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
+
+            this.displayEnableDownload = !CoreSites.getRequiredCurrentSite().isOfflineDisabled() &&
+                CoreCourseFormatDelegate.displayEnableDownload(this.course);
+
+            this.downloadEnabled = this.displayEnableDownload && this.downloadEnabled;
+
+            this.initListeners();
+        }, CoreSites.getCurrentSiteId());
+
+        this.downloadEnabledObserver = CoreEvents.on(CoreCoursesProvider.EVENT_DASHBOARD_DOWNLOAD_ENABLED_CHANGED, (data) => {
+            this.toggleDownload(data.enabled);
+        });
+    }
+
     /**
-     * Component being initialized.
+     * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
 
@@ -103,10 +123,12 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
         this.moduleId = CoreNavigator.getRouteNumberParam('moduleId');
         this.isGuest = CoreNavigator.getRouteBooleanParam('isGuest');
 
-        this.displayEnableDownload = !CoreSites.getCurrentSite()?.isOfflineDisabled() &&
+        this.displayEnableDownload = !CoreSites.getRequiredCurrentSite().isOfflineDisabled() &&
             CoreCourseFormatDelegate.displayEnableDownload(this.course);
         this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
 
+        this.downloadEnabled = this.displayEnableDownload && CoreCourses.getCourseDownloadOptionsEnabled();
+
         this.debouncedUpdateCachedCompletion = CoreUtils.debounce(() => {
             if (this.modulesHaveCompletion) {
                 CoreUtils.ignoreErrors(CoreCourse.getSections(this.course.id, false, true));
@@ -137,7 +159,7 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
      * @return Promise resolved when done.
      */
     protected async initListeners(): Promise<void> {
-        if (this.downloadCourseEnabled) {
+        if (this.downloadCourseEnabled && !this.courseStatusObserver) {
             // Listen for changes in course status.
             this.courseStatusObserver = CoreEvents.on(CoreEvents.COURSE_STATUS_CHANGED, (data) => {
                 if (data.courseId == this.course.id || data.courseId == CoreCourseProvider.ALL_COURSES_CLEARED) {
@@ -152,26 +174,30 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
             return;
         }
 
-        this.completionObserver = CoreEvents.on(
-            CoreEvents.COMPLETION_MODULE_VIEWED,
-            (data) => {
-                if (data && data.courseId == this.course.id) {
-                    this.refreshAfterCompletionChange(true);
+        if (!this.completionObserver) {
+            this.completionObserver = CoreEvents.on(
+                CoreEvents.COMPLETION_MODULE_VIEWED,
+                (data) => {
+                    if (data && data.courseId == this.course.id) {
+                        this.refreshAfterCompletionChange(true);
+                    }
+                },
+            );
+        }
+
+        if (!this.syncObserver) {
+            this.syncObserver = CoreEvents.on(CoreCourseSyncProvider.AUTO_SYNCED, (data) => {
+                if (!data || data.courseId != this.course.id) {
+                    return;
                 }
-            },
-        );
 
-        this.syncObserver = CoreEvents.on(CoreCourseSyncProvider.AUTO_SYNCED, (data) => {
-            if (!data || data.courseId != this.course.id) {
-                return;
-            }
+                this.refreshAfterCompletionChange(false);
 
-            this.refreshAfterCompletionChange(false);
-
-            if (data.warnings && data.warnings[0]) {
-                CoreDomUtils.showErrorModal(data.warnings[0]);
-            }
-        });
+                if (data.warnings && data.warnings[0]) {
+                    CoreDomUtils.showErrorModal(data.warnings[0]);
+                }
+            });
+        }
     }
 
     /**
@@ -472,7 +498,8 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
      * @param enable Whether enable or disable download enabled toggle.
      */
     toggleDownload(enable: boolean): void {
-        this.downloadEnabled = enable;
+        this.downloadEnabled =
+            CoreCourses.setCourseDownloadOptionsEnabled(this.displayEnableDownload && enable);
     }
 
     /**
@@ -517,6 +544,8 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
         this.completionObserver?.off();
         this.courseStatusObserver?.off();
         this.syncObserver?.off();
+        this.siteUpdatedObserver?.off();
+        this.downloadEnabledObserver?.off();
     }
 
     /**
diff --git a/src/core/features/courses/pages/categories/categories.ts b/src/core/features/courses/pages/categories/categories.ts
index d3de228a0..c5969bcae 100644
--- a/src/core/features/courses/pages/categories/categories.ts
+++ b/src/core/features/courses/pages/categories/categories.ts
@@ -49,6 +49,7 @@ export class CoreCoursesCategoriesPage implements OnInit, OnDestroy {
     protected categoryId = 0;
     protected myCoursesObserver: CoreEventObserver;
     protected siteUpdatedObserver: CoreEventObserver;
+    protected downloadEnabledObserver: CoreEventObserver;
     protected isDestroyed = false;
 
     constructor() {
@@ -75,6 +76,10 @@ export class CoreCoursesCategoriesPage implements OnInit, OnDestroy {
 
             this.downloadEnabled = (this.downloadCourseEnabled || this.downloadCoursesEnabled) && this.downloadEnabled;
         }, this.currentSiteId);
+
+        this.downloadEnabledObserver = CoreEvents.on(CoreCoursesProvider.EVENT_DASHBOARD_DOWNLOAD_ENABLED_CHANGED, (data) => {
+            this.toggleDownload(data.enabled);
+        });
     }
 
     /**
@@ -88,6 +93,9 @@ export class CoreCoursesCategoriesPage implements OnInit, OnDestroy {
         this.downloadCoursesEnabled = !CoreCourses.isDownloadCoursesDisabledInSite();
         this.myCoursesEnabled = !CoreCourses.isMyCoursesDisabledInSite();
 
+        this.downloadEnabled =
+            (this.downloadCourseEnabled || this.downloadCoursesEnabled) && CoreCourses.getCourseDownloadOptionsEnabled();
+
         this.fetchCategories().finally(() => {
             this.categoriesLoaded = true;
         });
@@ -202,17 +210,21 @@ export class CoreCoursesCategoriesPage implements OnInit, OnDestroy {
 
     /**
      * Toggle download enabled.
+     *
+     * @param enable If enable or disable.
      */
-    toggleDownload(enabled: boolean): void {
-        this.downloadEnabled = enabled;
+    toggleDownload(enable: boolean): void {
+        this.downloadEnabled =
+            CoreCourses.setCourseDownloadOptionsEnabled((this.downloadCourseEnabled || this.downloadCoursesEnabled) && enable);
     }
 
     /**
      * @inheritdoc
      */
     ngOnDestroy(): void {
-        this.myCoursesObserver?.off();
-        this.siteUpdatedObserver?.off();
+        this.myCoursesObserver.off();
+        this.siteUpdatedObserver.off();
+        this.downloadEnabledObserver.off();
         this.isDestroyed = true;
     }
 
diff --git a/src/core/features/courses/pages/dashboard/dashboard.html b/src/core/features/courses/pages/dashboard/dashboard.html
index a7f25bbee..a7dc2fc79 100644
--- a/src/core/features/courses/pages/dashboard/dashboard.html
+++ b/src/core/features/courses/pages/dashboard/dashboard.html
@@ -4,11 +4,11 @@
     </ion-button>
     <core-context-menu>
         <core-context-menu-item *ngIf="(downloadCourseEnabled || downloadCoursesEnabled)" [priority]="1000"
-        [content]="'core.settings.showdownloadoptions' | translate" (action)="switchDownload(!downloadEnabled)"
-        iconAction="toggle" [toggle]="downloadEnabled"></core-context-menu-item>
+            [content]="'core.settings.showdownloadoptions' | translate" (action)="switchDownload(!downloadEnabled)"
+            iconAction="toggle" [toggle]="downloadEnabled"></core-context-menu-item>
         <core-context-menu-item [priority]="500"
-        [content]="'addon.storagemanager.managestorage' | translate"
-        (action)="manageCoursesStorage()" iconAction="fas-archive"></core-context-menu-item>
+            [content]="'addon.storagemanager.managestorage' | translate"
+            (action)="manageCoursesStorage()" iconAction="fas-archive"></core-context-menu-item>
     </core-context-menu>
 </core-navbar-buttons>
 <ion-content>
diff --git a/src/core/features/courses/pages/dashboard/dashboard.ts b/src/core/features/courses/pages/dashboard/dashboard.ts
index f895f177b..28180ea4e 100644
--- a/src/core/features/courses/pages/dashboard/dashboard.ts
+++ b/src/core/features/courses/pages/dashboard/dashboard.ts
@@ -44,25 +44,35 @@ export class CoreCoursesDashboardPage implements OnInit, OnDestroy {
     blocks: Partial<CoreCourseBlock>[] = [];
     loaded = false;
 
-    protected updateSiteObserver?: CoreEventObserver;
-
-    /**
-     * Initialize the component.
-     */
-    ngOnInit(): void {
-        this.searchEnabled = !CoreCourses.isSearchCoursesDisabledInSite();
-        this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
-        this.downloadCoursesEnabled = !CoreCourses.isDownloadCoursesDisabledInSite();
+    protected updateSiteObserver: CoreEventObserver;
+    protected downloadEnabledObserver: CoreEventObserver;
 
+    constructor() {
         // Refresh the enabled flags if site is updated.
         this.updateSiteObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, () => {
             this.searchEnabled = !CoreCourses.isSearchCoursesDisabledInSite();
             this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
             this.downloadCoursesEnabled = !CoreCourses.isDownloadCoursesDisabledInSite();
 
-            this.switchDownload(this.downloadEnabled && this.downloadCourseEnabled && this.downloadCoursesEnabled);
+            this.switchDownload(this.downloadEnabled);
         }, CoreSites.getCurrentSiteId());
 
+        this.downloadEnabledObserver = CoreEvents.on(CoreCoursesProvider.EVENT_DASHBOARD_DOWNLOAD_ENABLED_CHANGED, (data) => {
+            this.switchDownload(data.enabled);
+        });
+    }
+
+    /**
+     * @inheritdoc
+     */
+    ngOnInit(): void {
+        this.searchEnabled = !CoreCourses.isSearchCoursesDisabledInSite();
+        this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
+        this.downloadCoursesEnabled = !CoreCourses.isDownloadCoursesDisabledInSite();
+
+        this.downloadEnabled =
+            (this.downloadCourseEnabled || this.downloadCoursesEnabled) && CoreCourses.getCourseDownloadOptionsEnabled();
+
         this.loadContent();
     }
 
@@ -143,8 +153,8 @@ export class CoreCoursesDashboardPage implements OnInit, OnDestroy {
      * @param enable If enable or disable.
      */
     protected switchDownload(enable: boolean): void {
-        this.downloadEnabled = (this.downloadCourseEnabled || this.downloadCoursesEnabled) && enable;
-        CoreEvents.trigger(CoreCoursesProvider.EVENT_DASHBOARD_DOWNLOAD_ENABLED_CHANGED, { enabled: this.downloadEnabled });
+        this.downloadEnabled =
+            CoreCourses.setCourseDownloadOptionsEnabled((this.downloadCourseEnabled || this.downloadCoursesEnabled) && enable);
     }
 
     /**
@@ -165,7 +175,8 @@ export class CoreCoursesDashboardPage implements OnInit, OnDestroy {
      * Component being destroyed.
      */
     ngOnDestroy(): void {
-        this.updateSiteObserver?.off();
+        this.updateSiteObserver.off();
+        this.downloadEnabledObserver.off();
     }
 
 }
diff --git a/src/core/features/courses/pages/list/list.ts b/src/core/features/courses/pages/list/list.ts
index 7d0174397..a510d5b5b 100644
--- a/src/core/features/courses/pages/list/list.ts
+++ b/src/core/features/courses/pages/list/list.ts
@@ -58,6 +58,7 @@ export class CoreCoursesListPage implements OnInit, OnDestroy {
     protected searchText = '';
     protected myCoursesObserver: CoreEventObserver;
     protected siteUpdatedObserver: CoreEventObserver;
+    protected downloadEnabledObserver: CoreEventObserver;
     protected courseIds = '';
     protected isDestroyed = false;
 
@@ -92,6 +93,10 @@ export class CoreCoursesListPage implements OnInit, OnDestroy {
                 this.fetchCourses();
             }
         }, this.currentSiteId);
+
+        this.downloadEnabledObserver = CoreEvents.on(CoreCoursesProvider.EVENT_DASHBOARD_DOWNLOAD_ENABLED_CHANGED, (data) => {
+            this.toggleDownload(data.enabled);
+        });
     }
 
     /**
@@ -101,6 +106,9 @@ export class CoreCoursesListPage implements OnInit, OnDestroy {
         this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
         this.downloadCoursesEnabled = !CoreCourses.isDownloadCoursesDisabledInSite();
 
+        this.downloadEnabled =
+            (this.downloadCourseEnabled || this.downloadCoursesEnabled) && CoreCourses.getCourseDownloadOptionsEnabled();
+
         this.mode = CoreNavigator.getRouteParam<CoreCoursesListMode>('mode') || this.mode;
 
         this.myCoursesEnabled = !CoreCourses.isMyCoursesDisabledInSite();
@@ -269,27 +277,33 @@ export class CoreCoursesListPage implements OnInit, OnDestroy {
 
     /**
      * Toggle show only my courses.
+     *
+     * @param enable If enable or disable.
      */
-    toggleEnrolled(enabled: boolean): void {
+    toggleEnrolled(enable: boolean): void {
         this.coursesLoaded = false;
-        this.showOnlyEnrolled = enabled;
+        this.showOnlyEnrolled = enable;
 
         this.fetchCourses();
     }
 
     /**
      * Toggle download enabled.
+     *
+     * @param enable If enable or disable.
      */
-    toggleDownload(enabled: boolean): void {
-        this.downloadEnabled = enabled;
+    toggleDownload(enable: boolean): void {
+        this.downloadEnabled =
+            CoreCourses.setCourseDownloadOptionsEnabled((this.downloadCourseEnabled || this.downloadCoursesEnabled) && enable);
     }
 
     /**
      * @inheritdoc
      */
     ngOnDestroy(): void {
-        this.myCoursesObserver?.off();
-        this.siteUpdatedObserver?.off();
+        this.myCoursesObserver.off();
+        this.siteUpdatedObserver.off();
+        this.downloadEnabledObserver.off();
         this.isDestroyed = true;
     }
 
diff --git a/src/core/features/courses/services/courses.ts b/src/core/features/courses/services/courses.ts
index 7b52afce7..9ccd82fbc 100644
--- a/src/core/features/courses/services/courses.ts
+++ b/src/core/features/courses/services/courses.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Injectable } from '@angular/core';
-import { CoreLogger } from '@singletons/logger';
 import { CoreSites, CoreSitesCommonWSOptions, CoreSitesReadingStrategy } from '@services/sites';
 import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
 import { makeSingleton } from '@singletons';
@@ -63,12 +62,9 @@ export class CoreCoursesProvider {
     static readonly STATE_HIDDEN = 'hidden';
     static readonly STATE_FAVOURITE = 'favourite';
 
-    protected logger: CoreLogger;
     protected userCoursesIds: { [id: number]: boolean } = {}; // Use an object to make it faster to search.
 
-    constructor() {
-        this.logger = CoreLogger.getInstance('CoreCoursesProvider');
-    }
+    protected downloadOptionsEnabled = false;
 
     /**
      * Whether current site supports getting course options.
@@ -1220,6 +1216,32 @@ export class CoreCoursesProvider {
         return site.write('core_course_set_favourite_courses', params);
     }
 
+    /**
+     * Get download options enabled option.
+     *
+     * @return True if enabled, false otherwise.
+     */
+    getCourseDownloadOptionsEnabled(): boolean {
+        return this.downloadOptionsEnabled;
+    }
+
+    /**
+     * Set trigger and save the download option.
+     *
+     * @param enable True to enable, false to disable.
+     * @return Current status.
+     */
+    setCourseDownloadOptionsEnabled(enable: boolean): boolean {
+        if (this.downloadOptionsEnabled == enable) {
+            return enable;
+        }
+
+        this.downloadOptionsEnabled = enable;
+        CoreEvents.trigger(CoreCoursesProvider.EVENT_DASHBOARD_DOWNLOAD_ENABLED_CHANGED, { enabled: enable });
+
+        return enable;
+    }
+
 }
 
 export const CoreCourses = makeSingleton(CoreCoursesProvider);
diff --git a/src/core/features/sitehome/pages/index/index.html b/src/core/features/sitehome/pages/index/index.html
index 64ff7d280..179a73f10 100644
--- a/src/core/features/sitehome/pages/index/index.html
+++ b/src/core/features/sitehome/pages/index/index.html
@@ -3,12 +3,12 @@
         <ion-icon name="fas-search" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
     <core-context-menu>
-        <core-context-menu-item [priority]="1000"
-        [content]="'core.settings.showdownloadoptions' | translate" (action)="switchDownload(!downloadEnabled)"
-        iconAction="toggle" [toggle]="downloadEnabled"></core-context-menu-item>
+        <core-context-menu-item [priority]="1000" *ngIf="displayEnableDownload"
+            [content]="'core.settings.showdownloadoptions' | translate" (action)="switchDownload(!downloadEnabled)"
+            iconAction="toggle" [toggle]="downloadEnabled"></core-context-menu-item>
         <core-context-menu-item [priority]="500"
-        [content]="'addon.storagemanager.managestorage' | translate"
-        (action)="manageCoursesStorage()" iconAction="fas-archive"></core-context-menu-item>
+            [content]="'addon.storagemanager.managestorage' | translate"
+            (action)="manageCoursesStorage()" iconAction="fas-archive"></core-context-menu-item>
     </core-context-menu>
 </core-navbar-buttons>
 <ion-content>
diff --git a/src/core/features/sitehome/pages/index/index.ts b/src/core/features/sitehome/pages/index/index.ts
index b33f2e605..4f2aff5c5 100644
--- a/src/core/features/sitehome/pages/index/index.ts
+++ b/src/core/features/sitehome/pages/index/index.ts
@@ -50,22 +50,32 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
     siteHomeId = 1;
     currentSite!: CoreSite;
     searchEnabled = false;
+    displayEnableDownload = false;
     downloadEnabled = false;
     newsForumModule?: NewsForum;
 
-    protected updateSiteObserver?: CoreEventObserver;
-
-    /**
-     * Page being initialized.
-     */
-    ngOnInit(): void {
-        this.searchEnabled = !CoreCourses.isSearchCoursesDisabledInSite();
+    protected updateSiteObserver: CoreEventObserver;
+    protected downloadEnabledObserver: CoreEventObserver;
 
+    constructor() {
         // Refresh the enabled flags if site is updated.
         this.updateSiteObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, () => {
             this.searchEnabled = !CoreCourses.isSearchCoursesDisabledInSite();
+
+            this.displayEnableDownload = !CoreSites.getRequiredCurrentSite().isOfflineDisabled();
         }, CoreSites.getCurrentSiteId());
 
+        this.downloadEnabledObserver = CoreEvents.on(CoreCoursesProvider.EVENT_DASHBOARD_DOWNLOAD_ENABLED_CHANGED, (data) => {
+            this.switchDownload(data.enabled);
+        });
+    }
+
+    /**
+     * @inheritdoc
+     */
+    ngOnInit(): void {
+        this.searchEnabled = !CoreCourses.isSearchCoursesDisabledInSite();
+
         this.currentSite = CoreSites.getRequiredCurrentSite();
         this.siteHomeId = CoreSites.getCurrentSiteHomeId();
 
@@ -75,6 +85,9 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
             CoreCourseHelper.openModule(module, this.siteHomeId, undefined, modParams);
         }
 
+        this.displayEnableDownload = !CoreSites.getRequiredCurrentSite().isOfflineDisabled();
+        this.downloadEnabled = CoreCourses.getCourseDownloadOptionsEnabled();
+
         this.loadContent().finally(() => {
             this.dataLoaded = true;
         });
@@ -186,8 +199,8 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
      * @param enable If enable or disable.
      */
     protected switchDownload(enable: boolean): void {
-        this.downloadEnabled = enable;
-        CoreEvents.trigger(CoreCoursesProvider.EVENT_DASHBOARD_DOWNLOAD_ENABLED_CHANGED, { enabled: this.downloadEnabled });
+        this.downloadEnabled =
+            CoreCourses.setCourseDownloadOptionsEnabled(enable);
     }
 
     /**
@@ -229,7 +242,8 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
      * Component being destroyed.
      */
     ngOnDestroy(): void {
-        this.updateSiteObserver?.off();
+        this.updateSiteObserver.off();
+        this.downloadEnabledObserver.off();
     }
 
 }

From 27ceb961276d3823bc6e37440a41363bbe9c7348 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 14 Oct 2021 12:30:19 +0200
Subject: [PATCH 0155/1008] MOBILE-3686 storage: Add manage storage in site
 preferences

---
 .../services/handlers/settings.ts             | 52 +++++++++++++++++++
 .../storagemanager/storagemanager.module.ts   |  5 ++
 2 files changed, 57 insertions(+)
 create mode 100644 src/addons/storagemanager/services/handlers/settings.ts

diff --git a/src/addons/storagemanager/services/handlers/settings.ts b/src/addons/storagemanager/services/handlers/settings.ts
new file mode 100644
index 000000000..9bcaf413c
--- /dev/null
+++ b/src/addons/storagemanager/services/handlers/settings.ts
@@ -0,0 +1,52 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { Injectable } from '@angular/core';
+
+import { makeSingleton } from '@singletons';
+import { CoreSettingsHandler, CoreSettingsHandlerData } from '@features/settings/services/settings-delegate';
+
+/**
+ * Mange storage settings handler.
+ */
+@Injectable({ providedIn: 'root' })
+export class AddonStorageManagerSettingsHandlerService implements CoreSettingsHandler {
+
+    static readonly PAGE_NAME = 'storage';
+
+    name = 'AddonStorageManager';
+    priority = 400;
+
+    /**
+     * @inheritdoc
+     */
+    async isEnabled(): Promise<boolean> {
+        return true;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    getDisplayData(): CoreSettingsHandlerData {
+        return {
+            icon: 'fas-archive',
+            title: 'addon.storagemanager.managestorage',
+            page: AddonStorageManagerSettingsHandlerService.PAGE_NAME,
+            class: 'addon-storagemanager-settings-handler',
+        };
+    }
+
+}
+
+export const AddonStorageManagerSettingsHandler = makeSingleton(AddonStorageManagerSettingsHandlerService);
diff --git a/src/addons/storagemanager/storagemanager.module.ts b/src/addons/storagemanager/storagemanager.module.ts
index 2a32b1c19..187d66cdd 100644
--- a/src/addons/storagemanager/storagemanager.module.ts
+++ b/src/addons/storagemanager/storagemanager.module.ts
@@ -17,7 +17,10 @@ import { Routes } from '@angular/router';
 import { CoreCourseOptionsDelegate } from '@features/course/services/course-options-delegate';
 import { CoreMainMenuRoutingModule } from '@features/mainmenu/mainmenu-routing.module';
 import { CoreMainMenuTabRoutingModule } from '@features/mainmenu/mainmenu-tab-routing.module';
+import { CoreSitePreferencesRoutingModule } from '@features/settings/pages/site/site-routing';
+import { CoreSettingsDelegate } from '@features/settings/services/settings-delegate';
 import { AddonStorageManagerCourseMenuHandler } from './services/handlers/course-menu';
+import { AddonStorageManagerSettingsHandler } from './services/handlers/settings';
 
 const routes: Routes = [
     {
@@ -30,6 +33,7 @@ const routes: Routes = [
     imports: [
         CoreMainMenuTabRoutingModule.forChild(routes),
         CoreMainMenuRoutingModule.forChild({ children: routes }),
+        CoreSitePreferencesRoutingModule.forChild(routes),
     ],
     exports: [CoreMainMenuRoutingModule],
     providers: [
@@ -38,6 +42,7 @@ const routes: Routes = [
             multi: true,
             useValue: () => {
                 CoreCourseOptionsDelegate.registerHandler(AddonStorageManagerCourseMenuHandler.instance);
+                CoreSettingsDelegate.registerHandler(AddonStorageManagerSettingsHandler.instance);
             },
         },
     ],

From aef7a64db7bb9958c1237566bf8a9eac96bc1211 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 14 Oct 2021 13:07:29 +0200
Subject: [PATCH 0156/1008] MOBILE-3686 courses: Do not check my courses
 disabled on list

---
 .../courses/pages/categories/categories.html       |  2 +-
 .../courses/pages/categories/categories.ts         |  3 ---
 .../features/courses/pages/dashboard/dashboard.ts  |  4 ++--
 src/core/features/courses/pages/list/list.html     |  2 +-
 src/core/features/courses/pages/list/list.ts       | 14 ++++----------
 src/core/features/courses/services/dashboard.ts    |  2 +-
 src/core/features/sitehome/pages/index/index.ts    |  4 ++--
 src/core/features/sitehome/services/sitehome.ts    | 14 +++-----------
 8 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/src/core/features/courses/pages/categories/categories.html b/src/core/features/courses/pages/categories/categories.html
index eec8dd4a5..33fb19de2 100644
--- a/src/core/features/courses/pages/categories/categories.html
+++ b/src/core/features/courses/pages/categories/categories.html
@@ -12,7 +12,7 @@
                 <core-context-menu-item *ngIf="downloadCourseEnabled || downloadCoursesEnabled" [priority]="1000"
                     [content]="'core.settings.showdownloadoptions' | translate" (action)="toggleDownload(!downloadEnabled)"
                     iconAction="toggle" [toggle]="downloadEnabled"></core-context-menu-item>
-                <core-context-menu-item *ngIf="myCoursesEnabled" [priority]="900"
+                <core-context-menu-item [priority]="900"
                     [content]="'core.courses.showonlyenrolled' | translate" (action)="toggleEnrolled(!showOnlyEnrolled)"
                     iconAction="toggle" [toggle]="showOnlyEnrolled"></core-context-menu-item>   
             </core-context-menu>
diff --git a/src/core/features/courses/pages/categories/categories.ts b/src/core/features/courses/pages/categories/categories.ts
index c5969bcae..34dd3c7a0 100644
--- a/src/core/features/courses/pages/categories/categories.ts
+++ b/src/core/features/courses/pages/categories/categories.ts
@@ -36,7 +36,6 @@ export class CoreCoursesCategoriesPage implements OnInit, OnDestroy {
     categories: CoreCategoryData[] = [];
     courses: CoreCourseListItem[] = [];
     categoriesLoaded = false;
-    myCoursesEnabled = true;
 
     showOnlyEnrolled = false;
 
@@ -72,7 +71,6 @@ export class CoreCoursesCategoriesPage implements OnInit, OnDestroy {
         this.siteUpdatedObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, () => {
             this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
             this.downloadCoursesEnabled = !CoreCourses.isDownloadCoursesDisabledInSite();
-            this.myCoursesEnabled = !CoreCourses.isMyCoursesDisabledInSite();
 
             this.downloadEnabled = (this.downloadCourseEnabled || this.downloadCoursesEnabled) && this.downloadEnabled;
         }, this.currentSiteId);
@@ -91,7 +89,6 @@ export class CoreCoursesCategoriesPage implements OnInit, OnDestroy {
 
         this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
         this.downloadCoursesEnabled = !CoreCourses.isDownloadCoursesDisabledInSite();
-        this.myCoursesEnabled = !CoreCourses.isMyCoursesDisabledInSite();
 
         this.downloadEnabled =
             (this.downloadCourseEnabled || this.downloadCoursesEnabled) && CoreCourses.getCourseDownloadOptionsEnabled();
diff --git a/src/core/features/courses/pages/dashboard/dashboard.ts b/src/core/features/courses/pages/dashboard/dashboard.ts
index 28180ea4e..712f893e5 100644
--- a/src/core/features/courses/pages/dashboard/dashboard.ts
+++ b/src/core/features/courses/pages/dashboard/dashboard.ts
@@ -148,11 +148,11 @@ export class CoreCoursesDashboardPage implements OnInit, OnDestroy {
     }
 
     /**
-     * Convenience function to switch download enabled.
+     * Switch download enabled.
      *
      * @param enable If enable or disable.
      */
-    protected switchDownload(enable: boolean): void {
+    switchDownload(enable: boolean): void {
         this.downloadEnabled =
             CoreCourses.setCourseDownloadOptionsEnabled((this.downloadCourseEnabled || this.downloadCoursesEnabled) && enable);
     }
diff --git a/src/core/features/courses/pages/list/list.html b/src/core/features/courses/pages/list/list.html
index 838ce9ae1..90593d24f 100644
--- a/src/core/features/courses/pages/list/list.html
+++ b/src/core/features/courses/pages/list/list.html
@@ -11,7 +11,7 @@
                 <core-context-menu-item *ngIf="downloadCourseEnabled || downloadCoursesEnabled" [priority]="1000"
                     [content]="'core.settings.showdownloadoptions' | translate" (action)="toggleDownload(!downloadEnabled)"
                     iconAction="toggle" [toggle]="downloadEnabled"></core-context-menu-item>
-                <core-context-menu-item *ngIf="myCoursesEnabled" [priority]="900"
+                <core-context-menu-item [priority]="900"
                     [content]="'core.courses.showonlyenrolled' | translate" (action)="toggleEnrolled(!showOnlyEnrolled)"
                     iconAction="toggle" [toggle]="showOnlyEnrolled"></core-context-menu-item>   
             </core-context-menu>
diff --git a/src/core/features/courses/pages/list/list.ts b/src/core/features/courses/pages/list/list.ts
index a510d5b5b..64edc1eee 100644
--- a/src/core/features/courses/pages/list/list.ts
+++ b/src/core/features/courses/pages/list/list.ts
@@ -35,7 +35,6 @@ export class CoreCoursesListPage implements OnInit, OnDestroy {
     downloadAllCoursesEnabled = false;
 
     searchEnabled = false;
-    myCoursesEnabled = true;
     searchMode = false;
     searchCanLoadMore = false;
     searchLoadMoreError = false;
@@ -84,7 +83,6 @@ export class CoreCoursesListPage implements OnInit, OnDestroy {
             this.searchEnabled = !CoreCourses.isSearchCoursesDisabledInSite();
             this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
             this.downloadCoursesEnabled = !CoreCourses.isDownloadCoursesDisabledInSite();
-            this.myCoursesEnabled = !CoreCourses.isMyCoursesDisabledInSite();
 
             this.downloadEnabled = (this.downloadCourseEnabled || this.downloadCoursesEnabled) && this.downloadEnabled;
             if (!this.searchEnabled) {
@@ -111,12 +109,6 @@ export class CoreCoursesListPage implements OnInit, OnDestroy {
 
         this.mode = CoreNavigator.getRouteParam<CoreCoursesListMode>('mode') || this.mode;
 
-        this.myCoursesEnabled = !CoreCourses.isMyCoursesDisabledInSite();
-        if (this.mode == 'my' && !this.myCoursesEnabled) {
-            this.mode = 'all';
-            this.showOnlyEnrolled = false;
-        }
-
         if (this.mode == 'search') {
             this.searchMode = true;
         }
@@ -140,8 +132,10 @@ export class CoreCoursesListPage implements OnInit, OnDestroy {
      */
     protected async fetchCourses(): Promise<void> {
         try {
-            if (this.searchMode && this.searchText) {
-                await this.search(this.searchText);
+            if (this.searchMode) {
+                if (this.searchText) {
+                    await this.search(this.searchText);
+                }
             } else if (this.showOnlyEnrolled) {
                 await this.loadMyCourses();
             } else {
diff --git a/src/core/features/courses/services/dashboard.ts b/src/core/features/courses/services/dashboard.ts
index 717a43206..d592f2e2d 100644
--- a/src/core/features/courses/services/dashboard.ts
+++ b/src/core/features/courses/services/dashboard.ts
@@ -107,7 +107,7 @@ export class CoreCoursesDashboardProvider {
     }
 
     /**
-     * Check if Site Home is disabled in a certain site.
+     * Check if Dashboard is disabled in a certain site.
      *
      * @param site Site. If not defined, use current site.
      * @return Whether it's disabled.
diff --git a/src/core/features/sitehome/pages/index/index.ts b/src/core/features/sitehome/pages/index/index.ts
index 4f2aff5c5..81ecc1c03 100644
--- a/src/core/features/sitehome/pages/index/index.ts
+++ b/src/core/features/sitehome/pages/index/index.ts
@@ -194,11 +194,11 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
     }
 
     /**
-     * Convenience function to switch download enabled.
+     * Switch download enabled.
      *
      * @param enable If enable or disable.
      */
-    protected switchDownload(enable: boolean): void {
+    switchDownload(enable: boolean): void {
         this.downloadEnabled =
             CoreCourses.setCourseDownloadOptionsEnabled(enable);
     }
diff --git a/src/core/features/sitehome/services/sitehome.ts b/src/core/features/sitehome/services/sitehome.ts
index 3de9e2ef9..596d144ef 100644
--- a/src/core/features/sitehome/services/sitehome.ts
+++ b/src/core/features/sitehome/services/sitehome.ts
@@ -169,20 +169,12 @@ export class CoreSiteHomeProvider {
                     // Get number of news items to show.
                     add = !!CoreSites.getCurrentSite()?.getStoredConfig('newsitems');
                     break;
-                case FrontPageItemNames['LIST_OF_CATEGORIES']:
                 case FrontPageItemNames['COMBO_LIST']:
+                    itemNumber = FrontPageItemNames['LIST_OF_CATEGORIES']; // Do not break here.
+                case FrontPageItemNames['LIST_OF_CATEGORIES']:
                 case FrontPageItemNames['LIST_OF_COURSE']:
-                    add = true;
-                    if (itemNumber == FrontPageItemNames['COMBO_LIST']) {
-                        itemNumber = FrontPageItemNames['LIST_OF_CATEGORIES'];
-                    }
-                    break;
                 case FrontPageItemNames['ENROLLED_COURSES']:
-                    if (!CoreCourses.isMyCoursesDisabledInSite()) {
-                        const courses = await CoreCourses.getUserCourses();
-
-                        add = courses.length > 0;
-                    }
+                    add = true;
                     break;
                 case FrontPageItemNames['COURSE_SEARCH_BOX']:
                     add = !CoreCourses.isSearchCoursesDisabledInSite();

From 3bc40c88fe88b143996a184869586adabf6e7554 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 14 Oct 2021 13:37:17 +0200
Subject: [PATCH 0157/1008] MOBILE-3686 courses: Fake pagination on course list
 to avoid crashing

---
 .../features/courses/pages/list/list.html     |   8 +-
 src/core/features/courses/pages/list/list.ts  | 106 ++++++++++--------
 2 files changed, 66 insertions(+), 48 deletions(-)

diff --git a/src/core/features/courses/pages/list/list.html b/src/core/features/courses/pages/list/list.html
index 90593d24f..89108f71e 100644
--- a/src/core/features/courses/pages/list/list.html
+++ b/src/core/features/courses/pages/list/list.html
@@ -19,7 +19,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-refresher slot="fixed" [disabled]="!coursesLoaded" (ionRefresh)="refreshCourses($event.target)">
+    <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="refreshCourses($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
     
@@ -27,7 +27,7 @@
         [placeholder]="'core.courses.search' | translate" [searchLabel]="'core.courses.search' | translate" [autoFocus]="searchMode"
         searchArea="CoreCoursesSearch"></core-search-box>
 
-    <core-loading [hideUntil]="coursesLoaded">
+    <core-loading [hideUntil]="loaded">
         <ng-container *ngIf="searchMode && searchTotal > 0">
             <ion-item-divider>
                 <ion-label><h2>{{ 'core.courses.totalcoursesearchresults' | translate:{$a: searchTotal} }}</h2></ion-label>
@@ -37,8 +37,10 @@
         <core-courses-course-list-item *ngFor="let course of courses" [course]="course" [showDownload]="downloadEnabled">
         </core-courses-course-list-item>
 
-        <core-infinite-loading [enabled]="searchMode && searchCanLoadMore" (action)="loadMoreResults($event)" [error]="searchLoadMoreError">
+        <core-infinite-loading [enabled]="canLoadMore" (action)="loadMoreCourses($event)" [error]="loadMoreError">
         </core-infinite-loading>
+
+
         <core-empty-box *ngIf="searchMode && !courses.length" icon="fas-search" [message]="'core.courses.nosearchresults' | translate">
         </core-empty-box>
 
diff --git a/src/core/features/courses/pages/list/list.ts b/src/core/features/courses/pages/list/list.ts
index 64edc1eee..9e192dc82 100644
--- a/src/core/features/courses/pages/list/list.ts
+++ b/src/core/features/courses/pages/list/list.ts
@@ -36,21 +36,22 @@ export class CoreCoursesListPage implements OnInit, OnDestroy {
 
     searchEnabled = false;
     searchMode = false;
-    searchCanLoadMore = false;
-    searchLoadMoreError = false;
     searchTotal = 0;
 
     downloadEnabled = false;
     downloadCourseEnabled = false;
     downloadCoursesEnabled = false;
 
-    mode: CoreCoursesListMode = 'my';
-
     courses: (CoreCourseBasicSearchedData|CoreEnrolledCourseDataWithExtraInfo)[] = [];
-    coursesLoaded = false;
+    loaded = false;
+    coursesLoaded = 0;
+    canLoadMore = false;
+    loadMoreError = false;
 
     showOnlyEnrolled = false;
 
+    protected loadedCourses: (CoreCourseBasicSearchedData|CoreEnrolledCourseDataWithExtraInfo)[] = [];
+    protected loadCoursesPerPage = 20;
     protected currentSiteId: string;
     protected frontpageCourseId: number;
     protected searchPage = 0;
@@ -107,13 +108,13 @@ export class CoreCoursesListPage implements OnInit, OnDestroy {
         this.downloadEnabled =
             (this.downloadCourseEnabled || this.downloadCoursesEnabled) && CoreCourses.getCourseDownloadOptionsEnabled();
 
-        this.mode = CoreNavigator.getRouteParam<CoreCoursesListMode>('mode') || this.mode;
+        const mode = CoreNavigator.getRouteParam<CoreCoursesListMode>('mode') || 'my';
 
-        if (this.mode == 'search') {
+        if (mode == 'search') {
             this.searchMode = true;
         }
 
-        if (this.mode == 'my') {
+        if (mode == 'my') {
             this.showOnlyEnrolled = true;
         }
 
@@ -136,47 +137,50 @@ export class CoreCoursesListPage implements OnInit, OnDestroy {
                 if (this.searchText) {
                     await this.search(this.searchText);
                 }
-            } else if (this.showOnlyEnrolled) {
-                await this.loadMyCourses();
             } else {
-                await this.loadAvailableCourses();
+                await this.loadCourses(true);
             }
         } finally {
-            this.coursesLoaded = true;
+            this.loaded = true;
         }
     }
 
     /**
-     * Fetch the user courses.
+     * Fetch the courses.
      *
+     * @param clearTheList If list needs to be reloaded.
      * @return Promise resolved when done.
      */
-    protected async loadMyCourses(): Promise<void> {
+    protected async loadCourses(clearTheList = false): Promise<void> {
+        this.loadMoreError = false;
+
         try {
-            const courses: CoreEnrolledCourseDataWithExtraInfo[] = await CoreCourses.getUserCourses();
-            this.courseIds = courses.map((course) => course.id).join(',');
+            if (clearTheList) {
+                if (this.showOnlyEnrolled) {
+                    this.loadedCourses = await CoreCourses.getUserCourses();
+                } else {
+                    const courses = await CoreCourses.getCoursesByField();
+                    this.loadedCourses = courses.filter((course) => course.id != this.frontpageCourseId);
+                }
 
-            await CoreCoursesHelper.loadCoursesExtraInfo(courses, true);
+                this.coursesLoaded = 0;
+                this.courses = [];
+            }
 
-            this.courses = courses;
+            const addCourses = this.loadedCourses.slice(this.coursesLoaded, this.coursesLoaded + this.loadCoursesPerPage);
+            await CoreCoursesHelper.loadCoursesExtraInfo(addCourses, true);
+
+            this.courses = this.courses.concat(addCourses);
+
+            this.courseIds = this.courses.map((course) => course.id).join(',');
+
+            this.coursesLoaded = this.courses.length;
+            this.canLoadMore = this.loadedCourses.length > this.courses.length;
         } catch (error) {
+            this.loadMoreError = true; // Set to prevent infinite calls with infinite-loading.
             !this.isDestroyed && CoreDomUtils.showErrorModalDefault(error, 'core.courses.errorloadcourses', true);
         }
-    }
 
-    /**
-     * Load the courses.
-     *
-     * @return Promise resolved when done.
-     */
-    protected async loadAvailableCourses(): Promise<void> {
-        try {
-            const courses = await CoreCourses.getCoursesByField();
-
-            this.courses = courses.filter((course) => course.id != this.frontpageCourseId);
-        } catch (error) {
-            !this.isDestroyed && CoreDomUtils.showErrorModalDefault(error, 'core.courses.errorloadcourses', true);
-        }
     }
 
     /**
@@ -187,10 +191,16 @@ export class CoreCoursesListPage implements OnInit, OnDestroy {
     refreshCourses(refresher: IonRefresher): void {
         const promises: Promise<void>[] = [];
 
-        promises.push(CoreCourses.invalidateUserCourses());
-        promises.push(CoreCourses.invalidateCoursesByField());
-        if (this.courseIds) {
-            promises.push(CoreCourses.invalidateCoursesByField('ids', this.courseIds));
+        if (!this.searchMode) {
+            if (this.showOnlyEnrolled) {
+                promises.push(CoreCourses.invalidateUserCourses());
+            } else {
+                promises.push(CoreCourses.invalidateCoursesByField());
+            }
+
+            if (this.courseIds) {
+                promises.push(CoreCourses.invalidateCoursesByField('ids', this.courseIds));
+            }
         }
 
         Promise.all(promises).finally(() => {
@@ -228,19 +238,25 @@ export class CoreCoursesListPage implements OnInit, OnDestroy {
         this.searchTotal = 0;
         this.searchMode = false;
 
-        this.coursesLoaded = false;
+        this.loaded = false;
         this.fetchCourses();
     }
 
     /**
-     * Load more results.
+     * Load more courses.
      *
      * @param infiniteComplete Infinite scroll complete function. Only used from core-infinite-loading.
      */
-    loadMoreResults(infiniteComplete?: () => void ): void {
-        this.searchCourses().finally(() => {
+    async loadMoreCourses(infiniteComplete?: () => void ): Promise<void> {
+        try {
+            if (this.searchMode) {
+                await this.searchCourses();
+            } else {
+                await this.loadCourses();
+            }
+        } finally {
             infiniteComplete && infiniteComplete();
-        });
+        }
     }
 
     /**
@@ -249,7 +265,7 @@ export class CoreCoursesListPage implements OnInit, OnDestroy {
      * @return Promise resolved when done.
      */
     protected async searchCourses(): Promise<void> {
-        this.searchLoadMoreError = false;
+        this.loadMoreError = false;
 
         try {
             const response = await CoreCourses.search(this.searchText, this.searchPage, undefined, this.showOnlyEnrolled);
@@ -262,9 +278,9 @@ export class CoreCoursesListPage implements OnInit, OnDestroy {
             this.searchTotal = response.total;
 
             this.searchPage++;
-            this.searchCanLoadMore = this.courses.length < this.searchTotal;
+            this.canLoadMore = this.courses.length < this.searchTotal;
         } catch (error) {
-            this.searchLoadMoreError = true; // Set to prevent infinite calls with infinite-loading.
+            this.loadMoreError = true; // Set to prevent infinite calls with infinite-loading.
             !this.isDestroyed && CoreDomUtils.showErrorModalDefault(error, 'core.courses.errorsearching', true);
         }
     }
@@ -275,7 +291,7 @@ export class CoreCoursesListPage implements OnInit, OnDestroy {
      * @param enable If enable or disable.
      */
     toggleEnrolled(enable: boolean): void {
-        this.coursesLoaded = false;
+        this.loaded = false;
         this.showOnlyEnrolled = enable;
 
         this.fetchCourses();

From 6e2bfc5286be8e509d292ba9be3ec025cbce7b0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 14 Oct 2021 15:05:53 +0200
Subject: [PATCH 0158/1008] MOBILE-3686 courses: Move my courses to a main menu
 tab

---
 src/core/features/courses/courses.module.ts   | 24 +++++++++---
 .../services/handlers/courses-index-link.ts   | 12 ++----
 ...courses-home.ts => my-courses-mainmenu.ts} | 37 ++++++-------------
 3 files changed, 33 insertions(+), 40 deletions(-)
 rename src/core/features/courses/services/handlers/{my-courses-home.ts => my-courses-mainmenu.ts} (60%)

diff --git a/src/core/features/courses/courses.module.ts b/src/core/features/courses/courses.module.ts
index 25129ac4a..925858cc0 100644
--- a/src/core/features/courses/courses.module.ts
+++ b/src/core/features/courses/courses.module.ts
@@ -15,9 +15,12 @@
 import { APP_INITIALIZER, NgModule, Type } from '@angular/core';
 import { Routes } from '@angular/router';
 import { CoreContentLinksDelegate } from '@features/contentlinks/services/contentlinks-delegate';
+import { CoreMainMenuRoutingModule } from '@features/mainmenu/mainmenu-routing.module';
+import { CoreMainMenuTabRoutingModule } from '@features/mainmenu/mainmenu-tab-routing.module';
 
 import { CoreMainMenuHomeRoutingModule } from '@features/mainmenu/pages/home/home-routing.module';
 import { CoreMainMenuHomeDelegate } from '@features/mainmenu/services/home-delegate';
+import { CoreMainMenuDelegate } from '@features/mainmenu/services/mainmenu-delegate';
 import { CorePushNotificationsDelegate } from '@features/pushnotifications/services/push-delegate';
 import { CoreCoursesProvider } from './services/courses';
 import { CoreCoursesHelperProvider } from './services/courses-helper';
@@ -28,7 +31,10 @@ import { CoreCoursesIndexLinkHandler } from './services/handlers/courses-index-l
 import { CoreDashboardHomeHandler, CoreDashboardHomeHandlerService } from './services/handlers/dashboard-home';
 import { CoreCoursesDashboardLinkHandler } from './services/handlers/dashboard-link';
 import { CoreCoursesEnrolPushClickHandler } from './services/handlers/enrol-push-click';
-import { CoreCoursesMyCoursesHomeHandler, CoreCoursesMyCoursesHomeHandlerService } from './services/handlers/my-courses-home';
+import {
+    CoreCoursesMyCoursesHomeHandler,
+    CoreCoursesMyCoursesMainMenuHandlerService,
+} from './services/handlers/my-courses-mainmenu';
 import { CoreCoursesRequestPushClickHandler } from './services/handlers/request-push-click';
 
 export const CORE_COURSES_SERVICES: Type<unknown>[] = [
@@ -42,10 +48,6 @@ const mainMenuHomeChildrenRoutes: Routes = [
         path: CoreDashboardHomeHandlerService.PAGE_NAME,
         loadChildren: () => import('./pages/dashboard/dashboard.module').then(m => m.CoreCoursesDashboardPageModule),
     },
-    {
-        path: CoreCoursesMyCoursesHomeHandlerService.PAGE_NAME,
-        loadChildren: () => import('./pages/list/list.module').then(m => m.CoreCoursesListPageModule),
-    },
 ];
 
 const mainMenuHomeSiblingRoutes: Routes = [
@@ -55,20 +57,30 @@ const mainMenuHomeSiblingRoutes: Routes = [
     },
 ];
 
+const mainMenuTabRoutes: Routes = [
+    {
+        path: CoreCoursesMyCoursesMainMenuHandlerService.PAGE_NAME,
+        loadChildren: () => import('./pages/list/list.module').then(m => m.CoreCoursesListPageModule),
+    },
+];
+
 @NgModule({
     imports: [
         CoreMainMenuHomeRoutingModule.forChild({
             children: mainMenuHomeChildrenRoutes,
             siblings: mainMenuHomeSiblingRoutes,
         }),
+        CoreMainMenuRoutingModule.forChild({ children: mainMenuTabRoutes }),
+        CoreMainMenuTabRoutingModule.forChild(mainMenuTabRoutes),
     ],
+    exports: [CoreMainMenuRoutingModule],
     providers: [
         {
             provide: APP_INITIALIZER,
             multi: true,
             useValue: () => {
                 CoreMainMenuHomeDelegate.registerHandler(CoreDashboardHomeHandler.instance);
-                CoreMainMenuHomeDelegate.registerHandler(CoreCoursesMyCoursesHomeHandler.instance);
+                CoreMainMenuDelegate.registerHandler(CoreCoursesMyCoursesHomeHandler.instance);
                 CoreContentLinksDelegate.registerHandler(CoreCoursesCourseLinkHandler.instance);
                 CoreContentLinksDelegate.registerHandler(CoreCoursesIndexLinkHandler.instance);
                 CoreContentLinksDelegate.registerHandler(CoreCoursesDashboardLinkHandler.instance);
diff --git a/src/core/features/courses/services/handlers/courses-index-link.ts b/src/core/features/courses/services/handlers/courses-index-link.ts
index 2ff9c3f92..4ca26a580 100644
--- a/src/core/features/courses/services/handlers/courses-index-link.ts
+++ b/src/core/features/courses/services/handlers/courses-index-link.ts
@@ -18,7 +18,7 @@ import { CoreContentLinksHandlerBase } from '@features/contentlinks/classes/base
 import { CoreContentLinksAction } from '@features/contentlinks/services/contentlinks-delegate';
 import { CoreNavigator } from '@services/navigator';
 import { makeSingleton } from '@singletons';
-import { CoreCoursesMyCoursesHomeHandlerService } from './my-courses-home';
+import { CoreCoursesMyCoursesMainMenuHandlerService } from './my-courses-mainmenu';
 
 /**
  * Handler to treat links to course index (list of courses).
@@ -31,17 +31,12 @@ export class CoreCoursesIndexLinkHandlerService extends CoreContentLinksHandlerB
     pattern = /\/course\/?(index\.php.*)?$/;
 
     /**
-     * Get the list of actions for a link (url).
-     *
-     * @param siteIds List of sites the URL belongs to.
-     * @param url The URL to treat.
-     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @return List of (or promise resolved with list of) actions.
+     * @inheritdoc
      */
     getActions(siteIds: string[], url: string, params: Params): CoreContentLinksAction[] {
         return [{
             action: (siteId): void => {
-                let pageName = CoreCoursesMyCoursesHomeHandlerService.PAGE_NAME;
+                let pageName = CoreCoursesMyCoursesMainMenuHandlerService.PAGE_NAME;
                 const pageParams: Params = {};
 
                 if (params.categoryid) {
@@ -51,7 +46,6 @@ export class CoreCoursesIndexLinkHandlerService extends CoreContentLinksHandlerB
                     pageParams.mode = 'all';
                 }
 
-
                 CoreNavigator.navigateToSitePath(pageName, { params: pageParams, siteId });
             },
         }];
diff --git a/src/core/features/courses/services/handlers/my-courses-home.ts b/src/core/features/courses/services/handlers/my-courses-mainmenu.ts
similarity index 60%
rename from src/core/features/courses/services/handlers/my-courses-home.ts
rename to src/core/features/courses/services/handlers/my-courses-mainmenu.ts
index 3e75bf5a8..3c3991a5c 100644
--- a/src/core/features/courses/services/handlers/my-courses-home.ts
+++ b/src/core/features/courses/services/handlers/my-courses-mainmenu.ts
@@ -13,39 +13,29 @@
 // limitations under the License.
 
 import { Injectable } from '@angular/core';
-import { CoreMainMenuHomeHandler, CoreMainMenuHomeHandlerToDisplay } from '@features/mainmenu/services/home-delegate';
+import { CoreMainMenuHandler, CoreMainMenuHandlerData } from '@features/mainmenu/services/mainmenu-delegate';
 import { CoreSiteHomeHomeHandler } from '@features/sitehome/services/handlers/sitehome-home';
+import { CoreSites } from '@services/sites';
 import { makeSingleton } from '@singletons';
 import { CoreCourses } from '../courses';
 import { CoreDashboardHomeHandler } from './dashboard-home';
 
 /**
- * Handler to add my courses into home page.
+ * Handler to add my courses into main menu.
  */
 @Injectable({ providedIn: 'root' })
-export class CoreCoursesMyCoursesHomeHandlerService implements CoreMainMenuHomeHandler {
+export class CoreCoursesMyCoursesMainMenuHandlerService implements CoreMainMenuHandler {
 
     static readonly PAGE_NAME = 'courses';
 
     name = 'CoreCoursesMyCourses';
-    priority = 900;
+    priority = 850;
 
     /**
-     * Check if the handler is enabled on a site level.
-     *
-     * @return Whether or not the handler is enabled on a site level.
+     * @inheritdoc
      */
-    isEnabled(): Promise<boolean> {
-        return this.isEnabledForSite();
-    }
-
-    /**
-     * Check if the handler is enabled on a certain site.
-     *
-     * @param siteId Site ID. If not defined, current site.
-     * @return Whether or not the handler is enabled on a site level.
-     */
-    async isEnabledForSite(siteId?: string): Promise<boolean> {
+    async isEnabled(): Promise<boolean> {
+        const siteId = CoreSites.getCurrentSiteId();
         const disabled = await CoreCourses.isMyCoursesDisabled(siteId);
 
         if (disabled) {
@@ -59,20 +49,17 @@ export class CoreCoursesMyCoursesHomeHandlerService implements CoreMainMenuHomeH
     }
 
     /**
-     * Returns the data needed to render the handler.
-     *
-     * @return Data needed to render the handler.
+     * @inheritdoc
      */
-    getDisplayData(): CoreMainMenuHomeHandlerToDisplay {
+    getDisplayData(): CoreMainMenuHandlerData {
         return {
             title: 'core.courses.mycourses',
-            page: CoreCoursesMyCoursesHomeHandlerService.PAGE_NAME,
+            page: CoreCoursesMyCoursesMainMenuHandlerService.PAGE_NAME,
             class: 'core-courses-my-courses-handler',
             icon: 'fas-graduation-cap',
-            selectPriority: 900,
         };
     }
 
 }
 
-export const CoreCoursesMyCoursesHomeHandler = makeSingleton(CoreCoursesMyCoursesHomeHandlerService);
+export const CoreCoursesMyCoursesHomeHandler = makeSingleton(CoreCoursesMyCoursesMainMenuHandlerService);

From 233e401a23dd960f975e78a38b46bab2a308bff6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 14 Oct 2021 16:41:01 +0200
Subject: [PATCH 0159/1008] MOBILE-3686 quiz: Text wrap fixes on quiz

---
 .../mod/quiz/components/index/addon-mod-quiz-index.html       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
index dabe2a7a9..94e4bcc51 100644
--- a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
+++ b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
@@ -212,12 +212,12 @@
             </ion-item>
 
             <!-- Button to start/continue. -->
-            <ion-button *ngIf="buttonText && !showStatusSpinner" expand="block" (click)="attemptQuiz()" class="ion-margin">
+            <ion-button *ngIf="buttonText && !showStatusSpinner" expand="block" (click)="attemptQuiz()" class="ion-margin ion-text-wrap">
                 {{ buttonText | translate }}
             </ion-button>
 
             <!-- Button to open in browser if it cannot be attempted in the app. -->
-            <ion-button class="ion-margin" *ngIf="!buttonText && ((!hasSupportedQuestions && unsupportedQuestions.length) ||
+            <ion-button class="ion-text-wrap ion-margin" *ngIf="!buttonText && ((!hasSupportedQuestions && unsupportedQuestions.length) ||
                 unsupportedRules.length || behaviourSupported === false)" expand="block" [href]="externalUrl" core-link
                 [showBrowserWarning]="false">
                 {{ 'core.openinbrowser' | translate }}

From ef610babd77fa4a5579a1b5877e240d66c5de8b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 15 Oct 2021 12:10:29 +0200
Subject: [PATCH 0160/1008] MOBILE-3686 core: Remove some legacy instace usage
 on singletons

---
 src/addons/blog/pages/entries/entries.ts               |  2 +-
 src/addons/mod/scorm/pages/player/player.ts            | 10 +++++-----
 src/app/app.component.ts                               |  2 +-
 .../features/siteplugins/classes/call-ws-directive.ts  |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/addons/blog/pages/entries/entries.ts b/src/addons/blog/pages/entries/entries.ts
index 1e92dcc30..165f1f405 100644
--- a/src/addons/blog/pages/entries/entries.ts
+++ b/src/addons/blog/pages/entries/entries.ts
@@ -170,7 +170,7 @@ export class AddonBlogEntriesPage implements OnInit {
                     entry.contextInstanceId = entry.userid;
                 }
 
-                entry.summary = CoreTextUtils.instance.replacePluginfileUrls(entry.summary, entry.summaryfiles || []);
+                entry.summary = CoreTextUtils.replacePluginfileUrls(entry.summary, entry.summaryfiles || []);
 
                 return CoreUser.getProfile(entry.userid, entry.courseid, true).then((user) => {
                     entry.user = user;
diff --git a/src/addons/mod/scorm/pages/player/player.ts b/src/addons/mod/scorm/pages/player/player.ts
index ad6555c82..9c4bdc9c9 100644
--- a/src/addons/mod/scorm/pages/player/player.ts
+++ b/src/addons/mod/scorm/pages/player/player.ts
@@ -118,7 +118,7 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
                 try {
                     await this.setStartTime(this.currentSco.id);
                 } catch (error) {
-                    CoreDomUtils.instance.showErrorModalDefault(error, 'addon.mod_scorm.errorgetscorm', true);
+                    CoreDomUtils.showErrorModalDefault(error, 'addon.mod_scorm.errorgetscorm', true);
                 }
             }
 
@@ -198,7 +198,7 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
                 try {
                     AddonModScormHelper.convertAttemptToOffline(this.scorm, this.attempt);
                 } catch (error) {
-                    CoreDomUtils.instance.showErrorModalDefault(error, 'core.error', true);
+                    CoreDomUtils.showErrorModalDefault(error, 'core.error', true);
                 }
 
                 this.refreshToc();
@@ -303,7 +303,7 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
             this.userData = data;
             this.accessInfo = accessInfo;
         } catch (error) {
-            CoreDomUtils.instance.showErrorModalDefault(error, 'addon.mod_scorm.errorgetscorm', true);
+            CoreDomUtils.showErrorModalDefault(error, 'addon.mod_scorm.errorgetscorm', true);
         }
     }
 
@@ -469,7 +469,7 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
 
                 await AddonModScorm.saveTracks(sco.id, this.attempt, tracks, this.scorm, true);
             } catch (error) {
-                CoreDomUtils.instance.showErrorModalDefault(error, 'core.error', true);
+                CoreDomUtils.showErrorModalDefault(error, 'core.error', true);
             }
         } finally {
             // Refresh TOC, some prerequisites might have changed.
@@ -510,7 +510,7 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
 
             await this.fetchToc();
         } catch (error) {
-            CoreDomUtils.instance.showErrorModalDefault(error, 'addon.mod_scorm.errorgetscorm', true);
+            CoreDomUtils.showErrorModalDefault(error, 'addon.mod_scorm.errorgetscorm', true);
         }
     }
 
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 84047aeca..8d21b8dfb 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -119,7 +119,7 @@ export class AppComponent implements OnInit, AfterViewInit {
                 });
                 CoreUtils.closeInAppBrowser();
 
-            } else if (CoreApp.instance.isAndroid()) {
+            } else if (CoreApp.isAndroid()) {
                 // Check if the URL has a custom URL scheme. In Android they need to be opened manually.
                 const urlScheme = CoreUrlUtils.getUrlProtocol(url);
                 if (urlScheme && urlScheme !== 'file' && urlScheme !== 'cdvfile') {
diff --git a/src/core/features/siteplugins/classes/call-ws-directive.ts b/src/core/features/siteplugins/classes/call-ws-directive.ts
index 58f9b73ab..53caf6458 100644
--- a/src/core/features/siteplugins/classes/call-ws-directive.ts
+++ b/src/core/features/siteplugins/classes/call-ws-directive.ts
@@ -124,7 +124,7 @@ export class CoreSitePluginsCallWSBaseDirective implements OnInit, OnDestroy {
     invalidate(): Promise<void> {
         const params = this.getParamsForWS();
 
-        return CoreSitePlugins.instance.invalidateCallWS(this.name, params, this.preSets);
+        return CoreSitePlugins.invalidateCallWS(this.name, params, this.preSets);
     }
 
     /**

From f5f5fd67816fa3c7e1b2dd83c1c0781a09e30d57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 19 Oct 2021 11:00:33 +0200
Subject: [PATCH 0161/1008] MOBILE-3686 core: Add 2-way data binding to context
 menu toggles

---
 .../messages/pages/discussion/discussion.html |  4 ++--
 .../pages/discussion/discussion.page.ts       |  9 ---------
 .../context-menu/context-menu-item.ts         | 18 ++++++++++++++++-
 .../context-menu/context-menu-popover.ts      |  6 ++++++
 .../core-context-menu-popover.html            | 16 +++++++--------
 .../course/pages/contents/contents.html       |  4 ++--
 .../course/pages/contents/contents.ts         |  9 +++------
 .../courses/pages/categories/categories.html  |  8 ++++----
 .../courses/pages/categories/categories.ts    | 19 ++++++------------
 .../courses/pages/dashboard/dashboard.html    |  4 ++--
 .../courses/pages/dashboard/dashboard.ts      | 11 ++++------
 .../features/courses/pages/list/list.html     | 20 +++++++++----------
 src/core/features/courses/pages/list/list.ts  | 17 +++++-----------
 src/core/features/courses/services/courses.ts |  7 ++-----
 .../features/sitehome/pages/index/index.html  |  4 ++--
 .../features/sitehome/pages/index/index.ts    |  9 +++------
 16 files changed, 76 insertions(+), 89 deletions(-)

diff --git a/src/addons/messages/pages/discussion/discussion.html b/src/addons/messages/pages/discussion/discussion.html
index 94fa726af..f38237550 100644
--- a/src/addons/messages/pages/discussion/discussion.html
+++ b/src/addons/messages/pages/discussion/discussion.html
@@ -44,8 +44,8 @@
                 'addon.messages.muteconversation') | translate" (action)="changeMute($event)" [closeOnClick]="false"
                 [iconAction]="muteIcon"></core-context-menu-item>
             <core-context-menu-item [hidden]="!canDelete || !messages || !messages.length" [priority]="400"
-                [content]="'addon.messages.showdeletemessages' | translate" (action)="toggleDelete(!showDelete)"
-                iconAction="toggle" [toggle]="showDelete"></core-context-menu-item>
+                [content]="'addon.messages.showdeletemessages' | translate"
+                iconAction="toggle" [(toggle)]="showDelete"></core-context-menu-item>
             <core-context-menu-item [hidden]="!groupMessagingEnabled || !conversationId || isGroup || !messages || !messages.length"
                 [priority]="200" [content]="'addon.messages.deleteconversation' | translate" (action)="deleteConversation($event)"
                 [closeOnClick]="false" [iconAction]="deleteIcon"></core-context-menu-item>
diff --git a/src/addons/messages/pages/discussion/discussion.page.ts b/src/addons/messages/pages/discussion/discussion.page.ts
index c99f24161..bdff8c4f9 100644
--- a/src/addons/messages/pages/discussion/discussion.page.ts
+++ b/src/addons/messages/pages/discussion/discussion.page.ts
@@ -1263,15 +1263,6 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView
         return !nextMessage || nextMessage.useridfrom != message.useridfrom || !!nextMessage.showDate;
     }
 
-    /**
-     * Toggles delete state.
-     *
-     * @param enabled Wether to enable or disable show delete toggle.
-     */
-    toggleDelete(enable: boolean): void {
-        this.showDelete = enable;
-    }
-
     /**
      * View info. If it's an individual conversation, go to the user profile.
      * If it's a group conversation, view info about the group.
diff --git a/src/core/components/context-menu/context-menu-item.ts b/src/core/components/context-menu/context-menu-item.ts
index 4129ef889..2d6a66587 100644
--- a/src/core/components/context-menu/context-menu-item.ts
+++ b/src/core/components/context-menu/context-menu-item.ts
@@ -38,7 +38,7 @@ export class CoreContextMenuItemComponent implements OnInit, OnDestroy, OnChange
     @Input() iconDescription?: string; // Name of the icon to be shown on the left side of the item.
     @Input() iconAction?: string; // Name of the icon to show on the right side of the item. Represents the action to do on click.
     // If is "spinner" an spinner will be shown.
-    // If is "toggle" an toggle switch will be shown.
+    // If is "toggle" a toggle switch will be shown.
     // If no icon or spinner is selected, no action or link will work.
     // If href but no iconAction is provided arrow-right will be used.
     @Input() iconSlash?: boolean; // Display a red slash over the icon.
@@ -56,6 +56,7 @@ export class CoreContextMenuItemComponent implements OnInit, OnDestroy, OnChange
     @Input() toggle = false; // Whether the toggle is on or off.
     @Output() action?: EventEmitter<() => void>; // Will emit an event when the item clicked.
     @Output() onClosed?: EventEmitter<() => void>; // Will emit an event when the popover is closed because the item was clicked.
+    @Output() toggleChange = new EventEmitter<boolean>();// Will emit an event when toggle changes to enable 2-way data binding.
 
     protected hasAction = false;
     protected destroyed = false;
@@ -89,6 +90,21 @@ export class CoreContextMenuItemComponent implements OnInit, OnDestroy, OnChange
         }
     }
 
+    /**
+     * Toggle changed.
+     *
+     * @param event Event.
+     */
+    toggleChanged(event: Event): void {
+        if (this.toggle === undefined) {
+            return;
+        }
+
+        event.preventDefault();
+        event.stopPropagation();
+        this.toggleChange.emit(this.toggle);
+    }
+
     /**
      * Component destroyed.
      */
diff --git a/src/core/components/context-menu/context-menu-popover.ts b/src/core/components/context-menu/context-menu-popover.ts
index 17e6e1885..46461b45f 100644
--- a/src/core/components/context-menu/context-menu-popover.ts
+++ b/src/core/components/context-menu/context-menu-popover.ts
@@ -55,6 +55,12 @@ export class CoreContextMenuPopoverComponent {
      * @return Return true if success, false if error.
      */
     itemClicked(event: Event, item: CoreContextMenuItemComponent): boolean {
+        if (item.iconAction == 'toggle' && !event.defaultPrevented) {
+            event.preventDefault();
+            event.stopPropagation();
+            item.toggle = !item.toggle;
+        }
+
         if (!!item.action && item.action.observers.length > 0) {
             event.preventDefault();
             event.stopPropagation();
diff --git a/src/core/components/context-menu/core-context-menu-popover.html b/src/core/components/context-menu/core-context-menu-popover.html
index 4baeb6c85..36091feec 100644
--- a/src/core/components/context-menu/core-context-menu-popover.html
+++ b/src/core/components/context-menu/core-context-menu-popover.html
@@ -12,14 +12,14 @@
             <p class="item-heading"><core-format-text [clean]="true" [text]="item.content" [filter]="false"></core-format-text></p>
         </ion-label>
         <ng-container *ngIf="(item.href || item.action) && item.iconAction">
-        <ion-icon *ngIf="item.iconAction != 'spinner' && item.iconAction != 'toggle'" [name]="item.iconAction"
-            [class.icon-slash]="item.iconSlash" slot="end" aria-hidden="true">
-        </ion-icon>
-        <ion-spinner *ngIf="item.iconAction == 'spinner'" slot="end"
-            [attr.aria-label]="'core.loading' | translate">
-        </ion-spinner>
-        <ion-toggle  *ngIf="item.iconAction == 'toggle'" [(ngModel)]="item.toggle" slot="end">
-        </ion-toggle>
+            <ion-icon *ngIf="item.iconAction != 'spinner' && item.iconAction != 'toggle'" [name]="item.iconAction"
+                [class.icon-slash]="item.iconSlash" slot="end" aria-hidden="true">
+            </ion-icon>
+            <ion-spinner *ngIf="item.iconAction == 'spinner'" slot="end"
+                [attr.aria-label]="'core.loading' | translate">
+            </ion-spinner>
+            <ion-toggle  *ngIf="item.iconAction == 'toggle'" [(ngModel)]="item.toggle" (ionChange)="item.toggleChanged($event)" slot="end">
+            </ion-toggle>
         </ng-container>
         <ion-badge class="{{item.badgeClass}}" slot="end" *ngIf="item.badge">
             <span [attr.ara-hidden]="!!item.badgeA11yText">{{item.badge}}</span>
diff --git a/src/core/features/course/pages/contents/contents.html b/src/core/features/course/pages/contents/contents.html
index 938d20ba6..1e2ab177a 100644
--- a/src/core/features/course/pages/contents/contents.html
+++ b/src/core/features/course/pages/contents/contents.html
@@ -1,7 +1,7 @@
 <core-navbar-buttons slot="end">
     <core-context-menu>
-        <core-context-menu-item [hidden]="!displayEnableDownload" [priority]="2000" iconAction="toggle" [toggle]="downloadEnabled"
-            [content]="'core.settings.showdownloadoptions' | translate" (action)="toggleDownload(!downloadEnabled)">
+        <core-context-menu-item [hidden]="!displayEnableDownload" [priority]="2000" iconAction="toggle" [(toggle)]="downloadEnabled"
+            [content]="'core.settings.showdownloadoptions' | translate" (action)="toggleDownload()">
         </core-context-menu-item>
         <core-context-menu-item [hidden]="!downloadCourseEnabled" [priority]="1900"
             [content]="prefetchCourseData.statusTranslatable | translate" (action)="prefetchCourse()"
diff --git a/src/core/features/course/pages/contents/contents.ts b/src/core/features/course/pages/contents/contents.ts
index 2301f3463..1cad013f4 100644
--- a/src/core/features/course/pages/contents/contents.ts
+++ b/src/core/features/course/pages/contents/contents.ts
@@ -100,7 +100,7 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
         }, CoreSites.getCurrentSiteId());
 
         this.downloadEnabledObserver = CoreEvents.on(CoreCoursesProvider.EVENT_DASHBOARD_DOWNLOAD_ENABLED_CHANGED, (data) => {
-            this.toggleDownload(data.enabled);
+            this.downloadEnabled = this.displayEnableDownload && data.enabled;
         });
     }
 
@@ -494,12 +494,9 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
 
     /**
      * Toggle download enabled.
-     *
-     * @param enable Whether enable or disable download enabled toggle.
      */
-    toggleDownload(enable: boolean): void {
-        this.downloadEnabled =
-            CoreCourses.setCourseDownloadOptionsEnabled(this.displayEnableDownload && enable);
+    toggleDownload(): void {
+        CoreCourses.setCourseDownloadOptionsEnabled(this.downloadEnabled);
     }
 
     /**
diff --git a/src/core/features/courses/pages/categories/categories.html b/src/core/features/courses/pages/categories/categories.html
index 33fb19de2..7ecd32f4b 100644
--- a/src/core/features/courses/pages/categories/categories.html
+++ b/src/core/features/courses/pages/categories/categories.html
@@ -10,11 +10,11 @@
         <ion-buttons slot="end">
             <core-context-menu>
                 <core-context-menu-item *ngIf="downloadCourseEnabled || downloadCoursesEnabled" [priority]="1000"
-                    [content]="'core.settings.showdownloadoptions' | translate" (action)="toggleDownload(!downloadEnabled)"
-                    iconAction="toggle" [toggle]="downloadEnabled"></core-context-menu-item>
+                    [content]="'core.settings.showdownloadoptions' | translate" (action)="toggleDownload()"
+                    iconAction="toggle" [(toggle)]="downloadEnabled"></core-context-menu-item>
                 <core-context-menu-item [priority]="900"
-                    [content]="'core.courses.showonlyenrolled' | translate" (action)="toggleEnrolled(!showOnlyEnrolled)"
-                    iconAction="toggle" [toggle]="showOnlyEnrolled"></core-context-menu-item>   
+                    [content]="'core.courses.showonlyenrolled' | translate" (action)="filterEnrolled()"
+                    iconAction="toggle" [(toggle)]="showOnlyEnrolled"></core-context-menu-item>   
             </core-context-menu>
         </ion-buttons>
     </ion-toolbar>
diff --git a/src/core/features/courses/pages/categories/categories.ts b/src/core/features/courses/pages/categories/categories.ts
index 34dd3c7a0..3cce72f0a 100644
--- a/src/core/features/courses/pages/categories/categories.ts
+++ b/src/core/features/courses/pages/categories/categories.ts
@@ -76,7 +76,7 @@ export class CoreCoursesCategoriesPage implements OnInit, OnDestroy {
         }, this.currentSiteId);
 
         this.downloadEnabledObserver = CoreEvents.on(CoreCoursesProvider.EVENT_DASHBOARD_DOWNLOAD_ENABLED_CHANGED, (data) => {
-            this.toggleDownload(data.enabled);
+            this.downloadEnabled = (this.downloadCourseEnabled || this.downloadCoursesEnabled) && data.enabled;
         });
     }
 
@@ -133,7 +133,7 @@ export class CoreCoursesCategoriesPage implements OnInit, OnDestroy {
 
                 try {
                     this.categoryCourses = await CoreCourses.getCoursesByField('category', this.categoryId);
-                    await this.toggleEnrolled(this.showOnlyEnrolled);
+                    await this.filterEnrolled();
                 } catch (error) {
                     !this.isDestroyed && CoreDomUtils.showErrorModalDefault(error, 'core.courses.errorloadcourses', true);
                 }
@@ -178,13 +178,9 @@ export class CoreCoursesCategoriesPage implements OnInit, OnDestroy {
     }
 
     /**
-     * Toggle show only my courses.
-     *
-     * @param enable If enable or disable.
+     * Filter my courses or not.
      */
-    async toggleEnrolled(enable: boolean): Promise<void> {
-        this.showOnlyEnrolled = enable;
-
+    async filterEnrolled(): Promise<void> {
         if (!this.showOnlyEnrolled) {
             this.courses = this.categoryCourses;
         } else {
@@ -207,12 +203,9 @@ export class CoreCoursesCategoriesPage implements OnInit, OnDestroy {
 
     /**
      * Toggle download enabled.
-     *
-     * @param enable If enable or disable.
      */
-    toggleDownload(enable: boolean): void {
-        this.downloadEnabled =
-            CoreCourses.setCourseDownloadOptionsEnabled((this.downloadCourseEnabled || this.downloadCoursesEnabled) && enable);
+    toggleDownload(): void {
+        CoreCourses.setCourseDownloadOptionsEnabled(this.downloadEnabled);
     }
 
     /**
diff --git a/src/core/features/courses/pages/dashboard/dashboard.html b/src/core/features/courses/pages/dashboard/dashboard.html
index a7dc2fc79..c4315e7d1 100644
--- a/src/core/features/courses/pages/dashboard/dashboard.html
+++ b/src/core/features/courses/pages/dashboard/dashboard.html
@@ -4,8 +4,8 @@
     </ion-button>
     <core-context-menu>
         <core-context-menu-item *ngIf="(downloadCourseEnabled || downloadCoursesEnabled)" [priority]="1000"
-            [content]="'core.settings.showdownloadoptions' | translate" (action)="switchDownload(!downloadEnabled)"
-            iconAction="toggle" [toggle]="downloadEnabled"></core-context-menu-item>
+            [content]="'core.settings.showdownloadoptions' | translate" (action)="switchDownload()"
+            iconAction="toggle" [(toggle)]="downloadEnabled"></core-context-menu-item>
         <core-context-menu-item [priority]="500"
             [content]="'addon.storagemanager.managestorage' | translate"
             (action)="manageCoursesStorage()" iconAction="fas-archive"></core-context-menu-item>
diff --git a/src/core/features/courses/pages/dashboard/dashboard.ts b/src/core/features/courses/pages/dashboard/dashboard.ts
index 712f893e5..5102614cc 100644
--- a/src/core/features/courses/pages/dashboard/dashboard.ts
+++ b/src/core/features/courses/pages/dashboard/dashboard.ts
@@ -54,11 +54,11 @@ export class CoreCoursesDashboardPage implements OnInit, OnDestroy {
             this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
             this.downloadCoursesEnabled = !CoreCourses.isDownloadCoursesDisabledInSite();
 
-            this.switchDownload(this.downloadEnabled);
+            this.downloadEnabled = (this.downloadCourseEnabled || this.downloadCoursesEnabled) && this.downloadEnabled;
         }, CoreSites.getCurrentSiteId());
 
         this.downloadEnabledObserver = CoreEvents.on(CoreCoursesProvider.EVENT_DASHBOARD_DOWNLOAD_ENABLED_CHANGED, (data) => {
-            this.switchDownload(data.enabled);
+            this.downloadEnabled = (this.downloadCourseEnabled || this.downloadCoursesEnabled) && data.enabled;
         });
     }
 
@@ -149,12 +149,9 @@ export class CoreCoursesDashboardPage implements OnInit, OnDestroy {
 
     /**
      * Switch download enabled.
-     *
-     * @param enable If enable or disable.
      */
-    switchDownload(enable: boolean): void {
-        this.downloadEnabled =
-            CoreCourses.setCourseDownloadOptionsEnabled((this.downloadCourseEnabled || this.downloadCoursesEnabled) && enable);
+    switchDownload(): void {
+        CoreCourses.setCourseDownloadOptionsEnabled(this.downloadEnabled);
     }
 
     /**
diff --git a/src/core/features/courses/pages/list/list.html b/src/core/features/courses/pages/list/list.html
index 89108f71e..114a5a78b 100644
--- a/src/core/features/courses/pages/list/list.html
+++ b/src/core/features/courses/pages/list/list.html
@@ -6,19 +6,19 @@
         <h1 *ngIf="!showOnlyEnrolled">{{ 'core.courses.availablecourses' | translate }}</h1>
         <h1 *ngIf="showOnlyEnrolled">{{ 'core.courses.mycourses' | translate }}</h1>
         <ion-buttons slot="end"></ion-buttons>
-        <core-navbar-buttons slot="end">
-            <core-context-menu>
-                <core-context-menu-item *ngIf="downloadCourseEnabled || downloadCoursesEnabled" [priority]="1000"
-                    [content]="'core.settings.showdownloadoptions' | translate" (action)="toggleDownload(!downloadEnabled)"
-                    iconAction="toggle" [toggle]="downloadEnabled"></core-context-menu-item>
-                <core-context-menu-item [priority]="900"
-                    [content]="'core.courses.showonlyenrolled' | translate" (action)="toggleEnrolled(!showOnlyEnrolled)"
-                    iconAction="toggle" [toggle]="showOnlyEnrolled"></core-context-menu-item>   
-            </core-context-menu>
-        </core-navbar-buttons>
     </ion-toolbar>
 </ion-header>
 <ion-content>
+    <core-navbar-buttons slot="end">
+        <core-context-menu>
+            <core-context-menu-item *ngIf="downloadCourseEnabled || downloadCoursesEnabled" [priority]="1000"
+                [content]="'core.settings.showdownloadoptions' | translate" (action)="toggleDownload()"
+                iconAction="toggle" [(toggle)]="downloadEnabled"></core-context-menu-item>
+            <core-context-menu-item [priority]="900"
+                [content]="'core.courses.showonlyenrolled' | translate" (action)="toggleEnrolled()"
+                iconAction="toggle" [(toggle)]="showOnlyEnrolled"></core-context-menu-item>   
+        </core-context-menu>
+    </core-navbar-buttons>
     <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="refreshCourses($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
diff --git a/src/core/features/courses/pages/list/list.ts b/src/core/features/courses/pages/list/list.ts
index 9e192dc82..04d855ffb 100644
--- a/src/core/features/courses/pages/list/list.ts
+++ b/src/core/features/courses/pages/list/list.ts
@@ -86,7 +86,7 @@ export class CoreCoursesListPage implements OnInit, OnDestroy {
             this.downloadCoursesEnabled = !CoreCourses.isDownloadCoursesDisabledInSite();
 
             this.downloadEnabled = (this.downloadCourseEnabled || this.downloadCoursesEnabled) && this.downloadEnabled;
-            if (!this.searchEnabled) {
+            if (!this.searchEnabled && this.searchMode) {
                 this.searchMode = false;
 
                 this.fetchCourses();
@@ -94,7 +94,7 @@ export class CoreCoursesListPage implements OnInit, OnDestroy {
         }, this.currentSiteId);
 
         this.downloadEnabledObserver = CoreEvents.on(CoreCoursesProvider.EVENT_DASHBOARD_DOWNLOAD_ENABLED_CHANGED, (data) => {
-            this.toggleDownload(data.enabled);
+            this.downloadEnabled = (this.downloadCourseEnabled || this.downloadCoursesEnabled) && data.enabled;
         });
     }
 
@@ -287,24 +287,17 @@ export class CoreCoursesListPage implements OnInit, OnDestroy {
 
     /**
      * Toggle show only my courses.
-     *
-     * @param enable If enable or disable.
      */
-    toggleEnrolled(enable: boolean): void {
+    toggleEnrolled(): void {
         this.loaded = false;
-        this.showOnlyEnrolled = enable;
-
         this.fetchCourses();
     }
 
     /**
      * Toggle download enabled.
-     *
-     * @param enable If enable or disable.
      */
-    toggleDownload(enable: boolean): void {
-        this.downloadEnabled =
-            CoreCourses.setCourseDownloadOptionsEnabled((this.downloadCourseEnabled || this.downloadCoursesEnabled) && enable);
+    toggleDownload(): void {
+        CoreCourses.setCourseDownloadOptionsEnabled(this.downloadEnabled);
     }
 
     /**
diff --git a/src/core/features/courses/services/courses.ts b/src/core/features/courses/services/courses.ts
index 9ccd82fbc..fa9a973c9 100644
--- a/src/core/features/courses/services/courses.ts
+++ b/src/core/features/courses/services/courses.ts
@@ -1229,17 +1229,14 @@ export class CoreCoursesProvider {
      * Set trigger and save the download option.
      *
      * @param enable True to enable, false to disable.
-     * @return Current status.
      */
-    setCourseDownloadOptionsEnabled(enable: boolean): boolean {
+    setCourseDownloadOptionsEnabled(enable: boolean): void {
         if (this.downloadOptionsEnabled == enable) {
-            return enable;
+            return;
         }
 
         this.downloadOptionsEnabled = enable;
         CoreEvents.trigger(CoreCoursesProvider.EVENT_DASHBOARD_DOWNLOAD_ENABLED_CHANGED, { enabled: enable });
-
-        return enable;
     }
 
 }
diff --git a/src/core/features/sitehome/pages/index/index.html b/src/core/features/sitehome/pages/index/index.html
index 179a73f10..4dd2ce8d5 100644
--- a/src/core/features/sitehome/pages/index/index.html
+++ b/src/core/features/sitehome/pages/index/index.html
@@ -4,8 +4,8 @@
     </ion-button>
     <core-context-menu>
         <core-context-menu-item [priority]="1000" *ngIf="displayEnableDownload"
-            [content]="'core.settings.showdownloadoptions' | translate" (action)="switchDownload(!downloadEnabled)"
-            iconAction="toggle" [toggle]="downloadEnabled"></core-context-menu-item>
+            [content]="'core.settings.showdownloadoptions' | translate" (action)="switchDownload()"
+            iconAction="toggle" [(toggle)]="downloadEnabled"></core-context-menu-item>
         <core-context-menu-item [priority]="500"
             [content]="'addon.storagemanager.managestorage' | translate"
             (action)="manageCoursesStorage()" iconAction="fas-archive"></core-context-menu-item>
diff --git a/src/core/features/sitehome/pages/index/index.ts b/src/core/features/sitehome/pages/index/index.ts
index 81ecc1c03..777d6ce9c 100644
--- a/src/core/features/sitehome/pages/index/index.ts
+++ b/src/core/features/sitehome/pages/index/index.ts
@@ -66,7 +66,7 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
         }, CoreSites.getCurrentSiteId());
 
         this.downloadEnabledObserver = CoreEvents.on(CoreCoursesProvider.EVENT_DASHBOARD_DOWNLOAD_ENABLED_CHANGED, (data) => {
-            this.switchDownload(data.enabled);
+            this.downloadEnabled = data.enabled;
         });
     }
 
@@ -195,12 +195,9 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
 
     /**
      * Switch download enabled.
-     *
-     * @param enable If enable or disable.
      */
-    switchDownload(enable: boolean): void {
-        this.downloadEnabled =
-            CoreCourses.setCourseDownloadOptionsEnabled(enable);
+    switchDownload(): void {
+        CoreCourses.setCourseDownloadOptionsEnabled(this.downloadEnabled);
     }
 
     /**

From 7ee332445515cc79cf93356c4301cad2efe0c8f2 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 20 Oct 2021 12:02:39 +0200
Subject: [PATCH 0162/1008] MOBILE-3829 notifications: Display notification
 clicked in new page

---
 .../notifications-lazy.module.ts              |  5 ++
 src/addons/notifications/pages/list/list.ts   | 45 ++--------
 .../pages/notification/notification.html      | 30 +++++++
 .../pages/notification/notification.module.ts | 40 +++++++++
 .../pages/notification/notification.ts        | 90 +++++++++++++++++++
 .../services/handlers/push-click.ts           | 10 ++-
 .../services/notifications-helper.ts          | 39 ++++++++
 .../login/pages/reconnect/reconnect.ts        |  2 +-
 8 files changed, 221 insertions(+), 40 deletions(-)
 create mode 100644 src/addons/notifications/pages/notification/notification.html
 create mode 100644 src/addons/notifications/pages/notification/notification.module.ts
 create mode 100644 src/addons/notifications/pages/notification/notification.ts

diff --git a/src/addons/notifications/notifications-lazy.module.ts b/src/addons/notifications/notifications-lazy.module.ts
index 2e0aa2445..11879c29a 100644
--- a/src/addons/notifications/notifications-lazy.module.ts
+++ b/src/addons/notifications/notifications-lazy.module.ts
@@ -27,6 +27,11 @@ function buildRoutes(injector: Injector): Routes {
             },
             loadChildren: () => import('./pages/list/list.module').then(m => m.AddonNotificationsListPageModule),
         },
+        {
+            path: 'notification',
+            loadChildren: () => import('./pages/notification/notification.module')
+                .then(m => m.AddonNotificationsNotificationPageModule),
+        },
         ...buildTabMainRoutes(injector, {
             redirectTo: 'list',
             pathMatch: 'full',
diff --git a/src/addons/notifications/pages/list/list.ts b/src/addons/notifications/pages/list/list.ts
index 59f83b549..23d0bc820 100644
--- a/src/addons/notifications/pages/list/list.ts
+++ b/src/addons/notifications/pages/list/list.ts
@@ -18,15 +18,17 @@ import { Subscription } from 'rxjs';
 
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
-import { CoreTextUtils } from '@services/utils/text';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreEvents, CoreEventObserver } from '@singletons/events';
 import {
     AddonNotifications,
-    AddonNotificationsNotificationMessageFormatted,
     AddonNotificationsProvider,
 } from '../../services/notifications';
 import { CorePushNotificationsDelegate } from '@features/pushnotifications/services/push-delegate';
+import {
+    AddonNotificationsHelper,
+    AddonNotificationsNotificationToRender,
+} from '@addons/notifications/services/notifications-helper';
 
 /**
  * Page that displays the list of notifications.
@@ -38,7 +40,7 @@ import { CorePushNotificationsDelegate } from '@features/pushnotifications/servi
 })
 export class AddonNotificationsListPage implements OnInit, OnDestroy {
 
-    notifications: FormattedNotification[] = [];
+    notifications: AddonNotificationsNotificationToRender[] = [];
     notificationsLoaded = false;
     canLoadMore = false;
     loadMoreError = false;
@@ -94,7 +96,8 @@ export class AddonNotificationsListPage implements OnInit, OnDestroy {
         try {
             const result = await AddonNotifications.getNotifications(refresh ? [] : this.notifications);
 
-            const notifications = result.notifications.map((notification) => this.formatText(notification));
+            const notifications = result.notifications
+                .map((notification) => AddonNotificationsHelper.formatNotificationText(notification));
 
             if (refresh) {
                 this.notifications = notifications;
@@ -135,7 +138,7 @@ export class AddonNotificationsListPage implements OnInit, OnDestroy {
      *
      * @param notifications Array of notification objects.
      */
-    protected async markNotificationsAsRead(notifications: FormattedNotification[]): Promise<void> {
+    protected async markNotificationsAsRead(notifications: AddonNotificationsNotificationToRender[]): Promise<void> {
         if (notifications.length > 0) {
             const promises = notifications.map(async (notification) => {
                 if (notification.read) {
@@ -194,33 +197,6 @@ export class AddonNotificationsListPage implements OnInit, OnDestroy {
         }
     }
 
-    /**
-     * Formats the text of a notification.
-     *
-     * @param notification The notification object.
-     */
-    protected formatText(notification: AddonNotificationsNotificationMessageFormatted): FormattedNotification {
-        const formattedNotification: FormattedNotification = notification;
-        formattedNotification.displayfullhtml = this.shouldDisplayFullHtml(notification);
-        formattedNotification.iconurl = formattedNotification.iconurl || undefined; // Make sure the property exists.
-
-        formattedNotification.mobiletext = formattedNotification.displayfullhtml ?
-            notification.fullmessagehtml :
-            CoreTextUtils.replaceNewLines((formattedNotification.mobiletext || '').replace(/-{4,}/ig, ''), '<br>');
-
-        return formattedNotification;
-    }
-
-    /**
-     * Check whether we should display full HTML of the notification.
-     *
-     * @param notification Notification.
-     * @return Whether to display full HTML.
-     */
-    protected shouldDisplayFullHtml(notification: FormattedNotification): boolean {
-        return notification.component == 'mod_forum' && notification.eventtype == 'digests';
-    }
-
     /**
      * User entered the page.
      */
@@ -253,8 +229,3 @@ export class AddonNotificationsListPage implements OnInit, OnDestroy {
     }
 
 }
-
-type FormattedNotification = AddonNotificationsNotificationMessageFormatted & {
-    displayfullhtml?: boolean; // Whether to display the full HTML of the notification.
-    iconurl?: string;
-};
diff --git a/src/addons/notifications/pages/notification/notification.html b/src/addons/notifications/pages/notification/notification.html
new file mode 100644
index 000000000..e4d879bb6
--- /dev/null
+++ b/src/addons/notifications/pages/notification/notification.html
@@ -0,0 +1,30 @@
+<ion-header>
+    <ion-toolbar>
+        <ion-buttons slot="start">
+            <ion-back-button [text]="'core.back' | translate"></ion-back-button>
+        </ion-buttons>
+        <h2>{{ 'addon.notifications.notifications' | translate }}</h2>
+    </ion-toolbar>
+</ion-header>
+<ion-content>
+    <core-loading [hideUntil]="loaded">
+        <ion-item class="ion-text-wrap" lines="none" [attr.aria-label]="subject">
+            <core-user-avatar *ngIf="userIdFrom > 0" slot="start" [userId]="userIdFrom" [profileUrl]="profileImageUrlFrom"
+                [fullname]="userFromFullName" [extraIcon]="iconUrl"></core-user-avatar>
+
+            <img *ngIf="userIdFrom <= 0 && iconUrl" [src]="iconUrl" alt=""
+                role="presentation" class="core-notification-icon" slot="start">
+
+            <ion-label>
+                <p class="item-heading">{{ subject }}</p>
+                <p *ngIf="userIdFrom > 0">{{ userFromFullName }}</p>
+            </ion-label>
+        </ion-item>
+        <ion-item class="ion-text-wrap">
+            <ion-label>
+                <core-format-text [text]="content | coreCreateLinks" contextLevel="system" [contextInstanceId]="0">
+                </core-format-text>
+            </ion-label>
+        </ion-item>
+    </core-loading>
+</ion-content>
diff --git a/src/addons/notifications/pages/notification/notification.module.ts b/src/addons/notifications/pages/notification/notification.module.ts
new file mode 100644
index 000000000..b316d8bd4
--- /dev/null
+++ b/src/addons/notifications/pages/notification/notification.module.ts
@@ -0,0 +1,40 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { RouterModule, Routes } from '@angular/router';
+
+import { CoreSharedModule } from '@/core/shared.module';
+import { AddonNotificationsComponentsModule } from '../../components/components.module';
+import { AddonNotificationsNotificationPage } from './notification';
+
+const routes: Routes = [
+    {
+        path: '',
+        component: AddonNotificationsNotificationPage,
+    },
+];
+
+@NgModule({
+    imports: [
+        RouterModule.forChild(routes),
+        CoreSharedModule,
+        AddonNotificationsComponentsModule,
+    ],
+    declarations: [
+        AddonNotificationsNotificationPage,
+    ],
+    exports: [RouterModule],
+})
+export class AddonNotificationsNotificationPageModule {}
diff --git a/src/addons/notifications/pages/notification/notification.ts b/src/addons/notifications/pages/notification/notification.ts
new file mode 100644
index 000000000..6b400b795
--- /dev/null
+++ b/src/addons/notifications/pages/notification/notification.ts
@@ -0,0 +1,90 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { AddonNotificationsNotificationData } from '@addons/notifications/services/handlers/push-click';
+import { AddonNotifications } from '@addons/notifications/services/notifications';
+import {
+    AddonNotificationsHelper,
+    AddonNotificationsNotificationToRender,
+} from '@addons/notifications/services/notifications-helper';
+import { Component, OnInit } from '@angular/core';
+import { CoreNavigator } from '@services/navigator';
+import { CoreDomUtils } from '@services/utils/dom';
+import { CoreUtils } from '@services/utils/utils';
+
+/**
+ * Page to render a notification.
+ */
+@Component({
+    selector: 'page-addon-notifications-notification',
+    templateUrl: 'notification.html',
+})
+export class AddonNotificationsNotificationPage implements OnInit {
+
+    subject = ''; // Notification subject.
+    content = ''; // Notification content.
+    userIdFrom = -1; // User ID who sent the notification.
+    profileImageUrlFrom?: string; // Avatar of the user who sent the notification.
+    userFromFullName?: string; // Name of the user who sent the notification.
+    iconUrl?: string; // Icon URL.
+    loaded = false;
+
+    /**
+     * @inheritdoc
+     */
+    async ngOnInit(): Promise<void> {
+        let notification: AddonNotificationsNotificationToRender | AddonNotificationsNotificationData;
+
+        try {
+            notification = CoreNavigator.getRequiredRouteParam('notification');
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
+        }
+
+        if (!('subject' in notification)) {
+            // Try to find the notification using the WebService, it contains a better message.
+            const notifId = Number(notification.savedmessageid);
+            const result = await CoreUtils.ignoreErrors(
+                AddonNotifications.getNotifications([], { siteId: notification.site }),
+            );
+
+            const foundNotification = result?.notifications.find(notif => notif.id === notifId);
+            if (foundNotification) {
+                notification = AddonNotificationsHelper.formatNotificationText(foundNotification);
+            }
+        }
+
+        if ('subject' in notification) {
+            this.subject = notification.subject;
+            this.content = notification.mobiletext || notification.fullmessagehtml;
+            this.userIdFrom = notification.useridfrom;
+            this.profileImageUrlFrom = notification.profileimageurlfrom;
+            this.userFromFullName = notification.userfromfullname;
+            this.iconUrl = notification.iconurl;
+        } else {
+            this.subject = notification.title || '';
+            this.content = notification.message || '';
+            this.userIdFrom = notification.userfromid ? Number(notification.userfromid) : -1;
+            this.profileImageUrlFrom = notification.senderImage;
+            this.userFromFullName = notification.userfromfullname;
+        }
+
+        this.loaded = true;
+    }
+
+}
diff --git a/src/addons/notifications/services/handlers/push-click.ts b/src/addons/notifications/services/handlers/push-click.ts
index c935f1ba6..2312b4e75 100644
--- a/src/addons/notifications/services/handlers/push-click.ts
+++ b/src/addons/notifications/services/handlers/push-click.ts
@@ -127,10 +127,16 @@ export class AddonNotificationsPushClickHandlerService implements CorePushNotifi
         await CoreUtils.ignoreErrors(AddonNotifications.invalidateNotificationsList(notification.site));
 
         await CoreNavigator.navigateToSitePath(
-            AddonNotificationsMainMenuHandlerService.PAGE_NAME,
+            `${AddonNotificationsMainMenuHandlerService.PAGE_NAME}/list`,
             {
                 siteId: notification.site,
                 preferCurrentTab: false,
+                nextNavigation: {
+                    path: '../notification',
+                    options: {
+                        params: { notification },
+                    },
+                },
             },
         );
     }
@@ -139,7 +145,7 @@ export class AddonNotificationsPushClickHandlerService implements CorePushNotifi
 
 export const AddonNotificationsPushClickHandler = makeSingleton(AddonNotificationsPushClickHandlerService);
 
-type AddonNotificationsNotificationData = CorePushNotificationsNotificationBasicData & {
+export type AddonNotificationsNotificationData = CorePushNotificationsNotificationBasicData & {
     contexturl?: string; // URL related to the notification.
     savedmessageid?: number; // Notification ID (optional).
     id?: number; // Notification ID (optional).
diff --git a/src/addons/notifications/services/notifications-helper.ts b/src/addons/notifications/services/notifications-helper.ts
index c83bea266..43b538796 100644
--- a/src/addons/notifications/services/notifications-helper.ts
+++ b/src/addons/notifications/services/notifications-helper.ts
@@ -18,12 +18,14 @@ import { CoreUtils } from '@services/utils/utils';
 import { makeSingleton } from '@singletons';
 import { AddonMessageOutputDelegate } from '@addons/messageoutput/services/messageoutput-delegate';
 import {
+    AddonNotificationsNotificationMessageFormatted,
     AddonNotificationsPreferences,
     AddonNotificationsPreferencesComponent,
     AddonNotificationsPreferencesNotification,
     AddonNotificationsPreferencesNotificationProcessor,
     AddonNotificationsPreferencesProcessor,
 } from './notifications';
+import { CoreTextUtils } from '@services/utils/text';
 
 /**
  * Service that provides some helper functions for notifications.
@@ -31,6 +33,25 @@ import {
 @Injectable({ providedIn: 'root' })
 export class AddonNotificationsHelperProvider {
 
+    /**
+     * Formats the text of a notification.
+     *
+     * @param notification The notification object.
+     */
+    formatNotificationText(
+        notification: AddonNotificationsNotificationMessageFormatted,
+    ): AddonNotificationsNotificationToRender {
+        const formattedNotification: AddonNotificationsNotificationToRender = notification;
+        formattedNotification.displayfullhtml = this.shouldDisplayFullHtml(notification);
+        formattedNotification.iconurl = formattedNotification.iconurl || undefined; // Make sure the property exists.
+
+        formattedNotification.mobiletext = formattedNotification.displayfullhtml ?
+            notification.fullmessagehtml :
+            CoreTextUtils.replaceNewLines((formattedNotification.mobiletext || '').replace(/-{4,}/ig, ''), '<br>');
+
+        return formattedNotification;
+    }
+
     /**
      * Format preferences data.
      *
@@ -119,6 +140,16 @@ export class AddonNotificationsHelperProvider {
         return result;
     }
 
+    /**
+     * Check whether we should display full HTML of the notification.
+     *
+     * @param notification Notification.
+     * @return Whether to display full HTML.
+     */
+    protected shouldDisplayFullHtml(notification: AddonNotificationsNotificationToRender): boolean {
+        return notification.component == 'mod_forum' && notification.eventtype == 'digests';
+    }
+
 }
 
 export const AddonNotificationsHelper = makeSingleton(AddonNotificationsHelperProvider);
@@ -151,3 +182,11 @@ export type AddonNotificationsPreferencesNotificationFormatted = AddonNotificati
 export type AddonNotificationsPreferencesProcessorFormatted = AddonNotificationsPreferencesProcessor & {
     supported?: boolean; // Calculated in the app. Whether the processor is supported in the app.
 };
+
+/**
+ * Notification with some calculated data to render it.
+ */
+export type AddonNotificationsNotificationToRender = AddonNotificationsNotificationMessageFormatted & {
+    displayfullhtml?: boolean; // Whether to display the full HTML of the notification.
+    iconurl?: string;
+};
diff --git a/src/core/features/login/pages/reconnect/reconnect.ts b/src/core/features/login/pages/reconnect/reconnect.ts
index b34720cdd..4101ed7d7 100644
--- a/src/core/features/login/pages/reconnect/reconnect.ts
+++ b/src/core/features/login/pages/reconnect/reconnect.ts
@@ -209,7 +209,7 @@ export class CoreLoginReconnectPage implements OnInit, OnDestroy {
 
             // Go to the site initial page.
             this.page
-                ? await CoreNavigator.navigateToSitePath(this.page, { params: this.pageOptions })
+                ? await CoreNavigator.navigateToSitePath(this.page, this.pageOptions)
                 : await CoreNavigator.navigateToSiteHome();
         } catch (error) {
             CoreLoginHelper.treatUserTokenError(this.siteUrl, error, this.username, password);

From d4b7de321cdfc42cfb62038001c8d551568a6ce2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 21 Oct 2021 13:20:00 +0200
Subject: [PATCH 0163/1008] MOBILE-3899 mainmenu: Hide main menu on navigation
 level > 1

---
 scripts/langindex.json                        |   2 -
 .../mod/h5pactivity/components/index/index.ts |  45 -------
 src/core/classes/tabs.ts                      |  18 +--
 .../features/mainmenu/pages/menu/menu.html    |  36 ++----
 .../features/mainmenu/pages/menu/menu.scss    |  20 ++-
 src/core/features/mainmenu/pages/menu/menu.ts | 122 ++++++------------
 src/core/lang.json                            |   2 -
 7 files changed, 75 insertions(+), 170 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 9cd4ae19c..15dc8e894 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1439,8 +1439,6 @@
   "core.completion-alt-manual-y-override": "completion",
   "core.confirmcanceledit": "local_moodlemobileapp",
   "core.confirmdeletefile": "repository",
-  "core.confirmgotabroot": "local_moodlemobileapp",
-  "core.confirmgotabrootdefault": "local_moodlemobileapp",
   "core.confirmleaveunknownchanges": "local_moodlemobileapp",
   "core.confirmloss": "local_moodlemobileapp",
   "core.confirmopeninbrowser": "local_moodlemobileapp",
diff --git a/src/addons/mod/h5pactivity/components/index/index.ts b/src/addons/mod/h5pactivity/components/index/index.ts
index d7bd10f69..cf7b0b60b 100644
--- a/src/addons/mod/h5pactivity/components/index/index.ts
+++ b/src/addons/mod/h5pactivity/components/index/index.ts
@@ -46,7 +46,6 @@ import {
 import { CoreFileHelper } from '@services/file-helper';
 import { AddonModH5PActivityModuleHandlerService } from '../../services/handlers/module';
 import { CoreMainMenuPage } from '@features/mainmenu/pages/menu/menu';
-import { Platform } from '@singletons';
 
 /**
  * Component that displays an H5P activity entry page.
@@ -81,13 +80,11 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
     isOpeningPage = false;
     canViewAllAttempts = false;
 
-    protected listeningResize = false;
     protected fetchContentDefaultError = 'addon.mod_h5pactivity.errorgetactivity';
     protected syncEventName = AddonModH5PActivitySyncProvider.AUTO_SYNCED;
     protected site: CoreSite;
     protected observer?: CoreEventObserver;
     protected messageListenerFunction: (event: MessageEvent) => Promise<void>;
-    protected resizeFunction: () => void;
 
     constructor(
         protected mainMenuPage: CoreMainMenuPage,
@@ -102,7 +99,6 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
         // Listen for messages from the iframe.
         this.messageListenerFunction = this.onIframeMessage.bind(this);
         window.addEventListener('message', this.messageListenerFunction);
-        this.resizeFunction = this.contentResized.bind(this);
     }
 
     /**
@@ -375,8 +371,6 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
         AddonModH5PActivity.logView(this.h5pActivity!.id, this.h5pActivity!.name, this.siteId);
 
         CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
-
-        this.setResizeListener();
     }
 
     /**
@@ -506,45 +500,6 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
         }
     }
 
-    /**
-     * Set the resize listener if needed.
-     */
-    setResizeListener(): void {
-        if (!this.playing || this.listeningResize) {
-            return;
-        }
-
-        this.listeningResize = true;
-        window.addEventListener('resize', this.contentResized.bind(this));
-        this.contentResized();
-    }
-
-    /**
-     * On content resize, change visibility of the main menu: show on portrait and hide on landscape.
-     */
-    contentResized(): void {
-        this.mainMenuPage.changeVisibility(Platform.isPortrait());
-    }
-
-    /**
-     * @inheritdoc
-     */
-    ionViewDidEnter(): void {
-        this.setResizeListener();
-    }
-
-    /**
-     * @inheritdoc
-     */
-    ionViewWillLeave(): void {
-        this.mainMenuPage.changeVisibility(true);
-
-        if (this.listeningResize) {
-            this.listeningResize = false;
-            window.removeEventListener('resize', this.resizeFunction);
-        }
-    }
-
     /**
      * Component destroyed.
      */
diff --git a/src/core/classes/tabs.ts b/src/core/classes/tabs.ts
index 575f4c653..d77ca5b4d 100644
--- a/src/core/classes/tabs.ts
+++ b/src/core/classes/tabs.ts
@@ -74,7 +74,7 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
     protected tabsElement?: HTMLElement; // The tabs parent element. It's the element that will be "scrolled" to hide tabs.
     protected tabBarElement?: HTMLIonTabBarElement; // The top tab bar element.
     protected tabsShown = true;
-    protected resizeFunction?: EventListenerOrEventListenerObject;
+    protected resizeFunction: EventListenerOrEventListenerObject;
     protected isDestroyed = false;
     protected isCurrentView = true;
     protected shouldSlideToInitial = false; // Whether we need to slide to the initial slide because it's out of view.
@@ -97,6 +97,8 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
         protected element: ElementRef,
     ) {
         this.backButtonFunction = this.backButtonClicked.bind(this);
+        this.resizeFunction = this.windowResized.bind(this);
+
         this.tabAction = new CoreTabsRoleTab(this);
     }
 
@@ -130,9 +132,7 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
             await this.initializeTabs();
         }
 
-        this.resizeFunction = this.windowResized.bind(this);
-
-        window.addEventListener('resize', this.resizeFunction!);
+        window.addEventListener('resize', this.resizeFunction);
     }
 
     /**
@@ -162,17 +162,17 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
 
         if (showTabs) {
             // Smooth translation.
-            this.tabBarElement!.classList.remove('tabs-hidden');
+            this.tabBarElement.classList.remove('tabs-hidden');
             if (scroll === 0) {
-                this.tabBarElement!.style.height = '';
+                this.tabBarElement.style.height = '';
                 this.previousLastScroll = this.lastScroll;
                 this.lastScroll = 0;
             } else if (scroll !== undefined) {
-                this.tabBarElement!.style.height = (this.tabBarHeight - scroll) + 'px';
+                this.tabBarElement.style.height = (this.tabBarHeight - scroll) + 'px';
             }
         } else {
-            this.tabBarElement!.classList.add('tabs-hidden');
-            this.tabBarElement!.style.height = '';
+            this.tabBarElement.classList.add('tabs-hidden');
+            this.tabBarElement.style.height = '';
         }
 
         this.tabsShown = showTabs;
diff --git a/src/core/features/mainmenu/pages/menu/menu.html b/src/core/features/mainmenu/pages/menu/menu.html
index 655919ab4..b888971dc 100644
--- a/src/core/features/mainmenu/pages/menu/menu.html
+++ b/src/core/features/mainmenu/pages/menu/menu.html
@@ -1,22 +1,12 @@
-<ion-tabs #mainTabs [hidden]="!showTabs" [class]="'placement-' + tabsPlacement" [class.tabshidden]="hidden"
-    (ionTabsDidChange)="tabChanged($event)">
-    <ion-tab-bar slot="bottom" [hidden]="hidden" class="mainmenu-tabs">
+<ion-tabs #mainTabs [hidden]="!showTabs" [class]="'placement-' + tabsPlacement"
+    [class.tabshidden]="!isMainScreen && tabsPlacement == 'bottom'" (ionTabsDidChange)="tabChanged($event)">
+    <ion-tab-bar slot="bottom" class="mainmenu-tabs"
+        [@menuShowHideAnimation]="tabsPlacement == 'side' ? '' : (isMainScreen ? 'visible' : 'hidden')">
         <ion-spinner *ngIf="!loaded" [attr.aria-label]="'core.loading' | translate"></ion-spinner>
 
-        <ion-tab-button
-            *ngFor="let tab of tabs"
-            (click)="tabClicked($event, tab.page)"
-            (keydown)="tabAction.keyDown($event)"
-            (keyup)="tabAction.keyUp(tab.page, $event)"
-            [hidden]="!loaded && tab.hide"
-            [tab]="tab.page"
-            [disabled]="tab.hide"
-            layout="label-hide"
-            class="{{tab.class}}"
-            [selected]="tab.page === selectedTab"
-            [tabindex]="selectedTab == tab.page ? 0 : -1"
-            [attr.aria-controls]="tab.id"
-        >
+        <ion-tab-button *ngFor="let tab of tabs" (keydown)="tabAction.keyDown($event)" (keyup)="tabAction.keyUp(tab.page, $event)"
+            [hidden]="!loaded && tab.hide" [tab]="tab.page" [disabled]="tab.hide" layout="label-hide" class="{{tab.class}}"
+            [selected]="tab.page === selectedTab" [tabindex]="selectedTab == tab.page ? 0 : -1" [attr.aria-controls]="tab.id">
             <ion-icon [name]="tab.icon" aria-hidden="true"></ion-icon>
             <ion-label aria-hidden="true">{{ tab.title | translate }}</ion-label>
             <ion-badge *ngIf="tab.badge" aria-hidden="true">{{ tab.badge }}</ion-badge>
@@ -26,16 +16,8 @@
             </span>
         </ion-tab-button>
 
-        <ion-tab-button
-            (click)="tabClicked($event, morePageName)"
-            (keydown)="tabAction.keyDown($event)"
-            (keyup)="tabAction.keyUp(morePageName, $event)"
-            [hidden]="!loaded"
-            [tab]="morePageName"
-            layout="label-hide"
-            [tabindex]="selectedTab == morePageName ? 0 : -1"
-            [attr.aria-controls]="morePageName"
-        >
+        <ion-tab-button (keydown)="tabAction.keyDown($event)" (keyup)="tabAction.keyUp(morePageName, $event)" [hidden]="!loaded"
+            [tab]="morePageName" layout="label-hide" [tabindex]="selectedTab == morePageName ? 0 : -1" [attr.aria-controls]="morePageName">
             <ion-icon name="fas-bars" aria-hidden="true"></ion-icon>
             <ion-label aria-hidden="true">{{ 'core.more' | translate }}</ion-label>
             <span class="sr-only">{{ 'core.more' | translate }}</span>
diff --git a/src/core/features/mainmenu/pages/menu/menu.scss b/src/core/features/mainmenu/pages/menu/menu.scss
index 53f005f0d..7f362ec1d 100644
--- a/src/core/features/mainmenu/pages/menu/menu.scss
+++ b/src/core/features/mainmenu/pages/menu/menu.scss
@@ -9,9 +9,20 @@
     }
 
     @if ($core-always-show-main-menu) {
-        ion-tab-bar[hidden] {
-            display: flex !important;
+        ion-tabs.placement-bottom ion-tab-bar {
+            height: var(--menutabbar-size) !important;
+            visibility: visible !important;
+            transform: translateY(0) !important;
         }
+    } @else {
+        ion-tabs.tabshidden.placement-bottom ion-tab-bar {
+            pointer-events: none;
+    
+            ion-tab-button {
+                height: auto;
+            }
+        }
+
     }
 
     ion-tab-button ion-icon {
@@ -56,12 +67,15 @@
             @include border-end(var(--border));
             box-shadow: 3px 0 3px rgba(var(--drop-shadow));
             border-top: 0;
+            justify-content: flex-start;
 
             @include padding(var(--ion-safe-area-top), 0px, var(--ion-safe-area-bottom), var(--ion-safe-area-left));
 
             ion-tab-button {
                 width: 100%;
-                height: auto;
+                min-height: var(--menutabbar-size);
+                flex: 0;
+
                 ion-badge {
                     top: calc(50% - 20px);
                 }
diff --git a/src/core/features/mainmenu/pages/menu/menu.ts b/src/core/features/mainmenu/pages/menu/menu.ts
index 1eb2af34f..36d929f4d 100644
--- a/src/core/features/mainmenu/pages/menu/menu.ts
+++ b/src/core/features/mainmenu/pages/menu/menu.ts
@@ -12,8 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, OnInit, OnDestroy, ViewChild, ChangeDetectorRef } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
+import { Component, OnInit, OnDestroy, ViewChild } from '@angular/core';
 import { IonTabs } from '@ionic/angular';
 import { BackButtonEvent } from '@ionic/core';
 import { Subscription } from 'rxjs';
@@ -22,11 +21,13 @@ import { CoreApp } from '@services/app';
 import { CoreEvents, CoreEventObserver } from '@singletons/events';
 import { CoreMainMenu, CoreMainMenuProvider } from '../../services/mainmenu';
 import { CoreMainMenuDelegate, CoreMainMenuHandlerToDisplay } from '../../services/mainmenu-delegate';
-import { CoreDomUtils } from '@services/utils/dom';
-import { Translate } from '@singletons';
+import { Router } from '@singletons';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreAriaRoleTab, CoreAriaRoleTabFindable } from '@classes/aria-role-tab';
 import { CoreNavigator } from '@services/navigator';
+import { filter } from 'rxjs/operators';
+import { NavigationEnd } from '@angular/router';
+import { trigger, state, style, transition, animate } from '@angular/animations';
 
 /**
  * Page that displays the main menu of the app.
@@ -34,6 +35,25 @@ import { CoreNavigator } from '@services/navigator';
 @Component({
     selector: 'page-core-mainmenu',
     templateUrl: 'menu.html',
+    animations: [
+        trigger('menuShowHideAnimation', [
+            state('hidden', style({
+                height: 0,
+                visibility: 'hidden',
+                transform: 'translateY(100%)',
+            })),
+            state('visible', style({
+                visibility: 'visible',
+            })),
+            transition('visible => hidden', [
+                style({ transform: 'translateY(0)' }),
+                animate('500ms ease-in-out', style({ transform: 'translateY(100%)' })),
+            ]),
+            transition('hidden => visible', [
+                style({ transform: 'translateY(100%)',  visibility: 'visible', height: '*' }),
+                animate('500ms ease-in-out', style({ transform: 'translateY(0)' })),
+            ]),
+        ])],
     styleUrls: ['menu.scss'],
 })
 export class CoreMainMenuPage implements OnInit, OnDestroy {
@@ -43,11 +63,12 @@ export class CoreMainMenuPage implements OnInit, OnDestroy {
     loaded = false;
     showTabs = false;
     tabsPlacement: 'bottom' | 'side' = 'bottom';
-    hidden = false;
     morePageName = CoreMainMenuProvider.MORE_PAGE_NAME;
     selectedTab?: string;
+    isMainScreen = false;
 
     protected subscription?: Subscription;
+    protected navSubscription?: Subscription;
     protected keyboardObserver?: CoreEventObserver;
     protected resizeFunction: () => void;
     protected backButtonFunction: (event: BackButtonEvent) => void;
@@ -58,21 +79,27 @@ export class CoreMainMenuPage implements OnInit, OnDestroy {
 
     tabAction: CoreMainMenuRoleTab;
 
-    constructor(
-        protected route: ActivatedRoute,
-        protected changeDetector: ChangeDetectorRef,
-    ) {
+    constructor() {
         this.resizeFunction = this.initHandlers.bind(this);
         this.backButtonFunction = this.backButtonClicked.bind(this);
         this.tabAction = new CoreMainMenuRoleTab(this);
+
+        // Listen navigation events to show or hide tabs.
+        this.navSubscription = Router.events
+            .pipe(filter(event => event instanceof NavigationEnd))
+            .subscribe(async () => {
+                this.isMainScreen = !this.mainTabs?.outlet.canGoBack();
+            });
     }
 
     /**
-     * Initialize the component.
+     * @inheritdoc
      */
-    ngOnInit(): void {
+    async ngOnInit(): Promise<void> {
         this.showTabs = true;
 
+        this.isMainScreen = !this.mainTabs?.outlet.canGoBack();
+
         this.subscription = CoreMainMenuDelegate.getHandlersObservable().subscribe((handlers) => {
             // Remove the handlers that should only appear in the More menu.
             this.allHandlers = handlers.filter((handler) => !handler.onlyInMore);
@@ -134,78 +161,16 @@ export class CoreMainMenuPage implements OnInit, OnDestroy {
     }
 
     /**
-     * Change tabs visibility to show/hide them from the view.
-     *
-     * @param visible If show or hide the tabs.
-     */
-    changeVisibility(visible: boolean): void {
-        if (this.hidden == visible) {
-            // Change needed.
-            this.hidden = !visible;
-
-            /* setTimeout(() => {
-                this.viewCtrl.getContent().resize();
-            });*/
-        }
-    }
-
-    /**
-     * Page destroyed.
+     * @inheritdoc
      */
     ngOnDestroy(): void {
         this.subscription?.unsubscribe();
+        this.navSubscription?.unsubscribe();
         window.removeEventListener('resize', this.resizeFunction);
         document.removeEventListener('ionBackButton', this.backButtonFunction);
         this.keyboardObserver?.off();
     }
 
-    /**
-     * Tab clicked.
-     *
-     * @param e Event.
-     * @param page Page of the tab.
-     */
-    async tabClicked(e: Event, page: string): Promise<void> {
-        if (this.mainTabs?.getSelected() != page) {
-            // Just change the tab.
-            return;
-        }
-
-        e.preventDefault();
-        e.stopPropagation();
-        e.stopImmediatePropagation();
-
-        // Current tab was clicked. Check if user is already at root level.
-        const isMainMenuRoot = await this.currentRouteIsMainMenuRoot();
-        if (isMainMenuRoot) {
-            return; // Already at root level, nothing to do.
-        }
-
-        // Maybe the route isn't defined as it should. Check if the current path is the tab one.
-        const currentPath = CoreNavigator.getCurrentPath();
-        if (currentPath == `/main/${page}`) {
-            return; // Already at root level, nothing to do.
-        }
-
-        // Ask the user if he wants to go back to the root page of the tab.
-        try {
-            const tab = this.tabs.find((tab) => tab.page == page);
-
-            if (tab?.title) {
-                await CoreDomUtils.showConfirm(Translate.instant('core.confirmgotabroot', {
-                    name: Translate.instant(tab.title),
-                }));
-            } else {
-                await CoreDomUtils.showConfirm(Translate.instant('core.confirmgotabrootdefault'));
-            }
-
-            // User confirmed, go to root.
-            this.mainTabs?.select(page);
-        } catch {
-            // User canceled.
-        }
-    }
-
     /**
      * Selected tab has changed.
      *
@@ -274,13 +239,6 @@ export class CoreMainMenuPage implements OnInit, OnDestroy {
  */
 class CoreMainMenuRoleTab extends CoreAriaRoleTab<CoreMainMenuPage> {
 
-    /**
-     * @inheritdoc
-     */
-    selectTab(tabId: string, e: Event): void {
-        this.componentInstance.tabClicked(e, tabId);
-    }
-
     /**
      * @inheritdoc
      */
diff --git a/src/core/lang.json b/src/core/lang.json
index 02beb3878..f067e4b9e 100644
--- a/src/core/lang.json
+++ b/src/core/lang.json
@@ -47,8 +47,6 @@
     "completion-alt-manual-y-override": "Completed: {{$a.modname}} (set by {{$a.overrideuser}}). Select to mark as not complete.",
     "confirmcanceledit": "Are you sure you want to leave this page? All changes will be lost.",
     "confirmdeletefile": "Are you sure you want to delete this file?",
-    "confirmgotabroot": "Are you sure you want to go back to {{name}}?",
-    "confirmgotabrootdefault": "Are you sure you want to go to the initial page of the current tab?",
     "confirmleaveunknownchanges": "Are you sure you want to leave this page? If you have unsaved changes they will be lost.",
     "confirmloss": "Are you sure? All changes will be lost.",
     "confirmopeninbrowser": "Do you want to open it in a web browser?",

From 3feee9e831afdc8c84c4e3e1e94380bb4bde9b3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 26 Oct 2021 16:23:09 +0200
Subject: [PATCH 0164/1008] MOBILE-3899 quiz: Fix multichoice display flex

---
 .../component/addon-qtype-multichoice.html       | 16 ++++++++++------
 .../qtype/multichoice/component/multichoice.scss |  6 +++++-
 .../question/classes/base-question-component.ts  |  4 ++++
 src/theme/components/format-text.scss            | 12 ++++--------
 4 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/src/addons/qtype/multichoice/component/addon-qtype-multichoice.html b/src/addons/qtype/multichoice/component/addon-qtype-multichoice.html
index 76137e258..65ea49dc7 100644
--- a/src/addons/qtype/multichoice/component/addon-qtype-multichoice.html
+++ b/src/addons/qtype/multichoice/component/addon-qtype-multichoice.html
@@ -2,9 +2,11 @@
     <!-- Question text first. -->
     <ion-item class="ion-text-wrap">
         <ion-label>
-            <p><core-format-text [component]="component" [componentId]="componentId" [text]="multiQuestion.text"
-                [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId">
-            </core-format-text></p>
+            <p>
+                <core-format-text [component]="component" [componentId]="componentId" [text]="multiQuestion.text"
+                    [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId">
+                </core-format-text>
+            </p>
             <p *ngIf="multiQuestion.prompt">{{ multiQuestion.prompt }}</p>
         </ion-label>
     </ion-item>
@@ -12,7 +14,8 @@
     <!-- Checkbox for multiple choice. -->
     <ng-container *ngIf="multiQuestion.multi">
         <ion-item class="ion-text-wrap answer" *ngFor="let option of multiQuestion.options">
-            <ion-label [color]='(option.isCorrect === 1 ? "success": "") + (option.isCorrect === 0 ? "danger": "")' class="flex">
+            <ion-label [color]='(option.isCorrect === 1 ? "success": "") + (option.isCorrect === 0 ? "danger": "")'
+                [class]="option.class">
                 <core-format-text [component]="component" [componentId]="componentId" [text]="option.text"
                     [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId">
                 </core-format-text>
@@ -38,9 +41,10 @@
     </ng-container>
 
     <!-- Radio buttons for single choice. -->
-    <ion-radio-group *ngIf="!multiQuestion.multi" [(ngModel)]="multiQuestion.singleChoiceModel" [name]="multiQuestion.optionsName">
+    <ion-radio-group *ngIf="!multiQuestion.multi" [(ngModel)]="multiQuestion.singleChoiceModel"
+        [name]="multiQuestion.optionsName">
         <ion-item class="ion-text-wrap answer" *ngFor="let option of multiQuestion.options">
-            <ion-label class="flex">
+            <ion-label [class]="option.class">
                 <core-format-text [component]="component" [componentId]="componentId" [text]="option.text"
                     [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId">
                 </core-format-text>
diff --git a/src/addons/qtype/multichoice/component/multichoice.scss b/src/addons/qtype/multichoice/component/multichoice.scss
index 6923b59e0..3cdbe2c85 100644
--- a/src/addons/qtype/multichoice/component/multichoice.scss
+++ b/src/addons/qtype/multichoice/component/multichoice.scss
@@ -6,7 +6,11 @@
         padding: 0 .7em;
     }
 
-    .flex {
+    .answer {
+        line-height: 2em;
+    }
+
+    .d-flex {
         display: flex !important;
     }
 
diff --git a/src/core/features/question/classes/base-question-component.ts b/src/core/features/question/classes/base-question-component.ts
index 2c8013b83..630142130 100644
--- a/src/core/features/question/classes/base-question-component.ts
+++ b/src/core/features/question/classes/base-question-component.ts
@@ -97,6 +97,7 @@ export class CoreQuestionBaseComponent {
             const radioEl = radios[i];
             const option: AddonModQuizQuestionRadioOption = {
                 id: radioEl.id,
+                class: '',
                 name: radioEl.name,
                 value: radioEl.value,
                 checked: radioEl.checked,
@@ -621,6 +622,7 @@ export class CoreQuestionBaseComponent {
             const element = options[i];
             const option: AddonModQuizQuestionRadioOption = {
                 id: element.id,
+                class: '',
                 name: element.name,
                 value: element.value,
                 checked: element.checked,
@@ -643,6 +645,7 @@ export class CoreQuestionBaseComponent {
                 // Not found, use the old format.
                 label = questionEl.querySelector('label[for="' + option.id + '"]');
             }
+            option.class = label?.className || option.class;
 
             // Check that we were able to successfully extract options required data.
             if (!label || option.name === undefined || option.value === undefined) {
@@ -736,6 +739,7 @@ export type AddonModQuizQuestionSelectOption = {
 export type AddonModQuizQuestionRadioOption = {
     id: string;
     name: string;
+    class: string;
     value: string;
     disabled: boolean;
     checked: boolean;
diff --git a/src/theme/components/format-text.scss b/src/theme/components/format-text.scss
index ddb921751..204c0612b 100644
--- a/src/theme/components/format-text.scss
+++ b/src/theme/components/format-text.scss
@@ -201,14 +201,6 @@ core-format-text {
     }
 }
 
-// Erase if core-format-text display is contents again.
-.flex > core-format-text {
-    display: flex;
-}
-.core-course-title > p.item-heading > core-format-text {
-    display: inline;
-}
-
 @keyframes loading {
     0% {
         left: -45%;
@@ -327,6 +319,10 @@ core-rich-text-editor .core-rte-editor {
         }
     }
 
+    sub, sup {
+        overflow: visible !important;
+    }
+
     .badge {
         position: initial !important;
     }

From 8d338d0c00084989e4358ba436307ee4f92b2653 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 22 Oct 2021 08:27:44 +0200
Subject: [PATCH 0165/1008] MOBILE-3828 notifications: Display HTML of
 notifications

---
 .../list/list.scss => notifications.scss}       | 16 ++++++++++++----
 src/addons/notifications/pages/list/list.html   |  2 +-
 src/addons/notifications/pages/list/list.ts     |  2 +-
 .../pages/notification/notification.ts          |  1 +
 .../services/notifications-helper.ts            | 17 -----------------
 .../notifications/services/notifications.ts     | 10 ++--------
 src/core/directives/format-text.ts              |  4 ++--
 7 files changed, 19 insertions(+), 33 deletions(-)
 rename src/addons/notifications/{pages/list/list.scss => notifications.scss} (76%)

diff --git a/src/addons/notifications/pages/list/list.scss b/src/addons/notifications/notifications.scss
similarity index 76%
rename from src/addons/notifications/pages/list/list.scss
rename to src/addons/notifications/notifications.scss
index be91e7a5c..98b92c030 100644
--- a/src/addons/notifications/pages/list/list.scss
+++ b/src/addons/notifications/notifications.scss
@@ -1,3 +1,5 @@
+@import "~theme/globals";
+
 :host {
     .core-notification-icon {
         width: 34px;
@@ -17,11 +19,17 @@
 
             .header {
                 background-color: var(--gray-lighter);
-            }
 
-            .picture {
-                width: auto;
-                text-align: center;
+                .picture {
+                    width: 48px;
+                    text-align: center;
+                    @include padding-horizontal(4px, 0px);
+                    padding-top: 8px;
+
+                    img {
+                        width: 44px !important;
+                    }
+                }
             }
 
             .subject {
diff --git a/src/addons/notifications/pages/list/list.html b/src/addons/notifications/pages/list/list.html
index aa11a1300..3aba09f1e 100644
--- a/src/addons/notifications/pages/list/list.html
+++ b/src/addons/notifications/pages/list/list.html
@@ -48,7 +48,7 @@
             <ion-item class="ion-text-wrap">
                 <ion-label>
                     <core-format-text [text]="notification.mobiletext | coreCreateLinks" contextLevel="system"
-                    [contextInstanceId]="0" [maxHeight]="notification.displayfullhtml ? 120 : null">
+                    [contextInstanceId]="0" [maxHeight]="120">
                     </core-format-text>
                 </ion-label>
             </ion-item>
diff --git a/src/addons/notifications/pages/list/list.ts b/src/addons/notifications/pages/list/list.ts
index 23d0bc820..5968a852e 100644
--- a/src/addons/notifications/pages/list/list.ts
+++ b/src/addons/notifications/pages/list/list.ts
@@ -36,7 +36,7 @@ import {
 @Component({
     selector: 'page-addon-notifications-list',
     templateUrl: 'list.html',
-    styleUrls: ['list.scss'],
+    styleUrls: ['../../notifications.scss'],
 })
 export class AddonNotificationsListPage implements OnInit, OnDestroy {
 
diff --git a/src/addons/notifications/pages/notification/notification.ts b/src/addons/notifications/pages/notification/notification.ts
index 6b400b795..f2594a9e4 100644
--- a/src/addons/notifications/pages/notification/notification.ts
+++ b/src/addons/notifications/pages/notification/notification.ts
@@ -29,6 +29,7 @@ import { CoreUtils } from '@services/utils/utils';
 @Component({
     selector: 'page-addon-notifications-notification',
     templateUrl: 'notification.html',
+    styleUrls: ['../../notifications.scss'],
 })
 export class AddonNotificationsNotificationPage implements OnInit {
 
diff --git a/src/addons/notifications/services/notifications-helper.ts b/src/addons/notifications/services/notifications-helper.ts
index 43b538796..ec2758f5b 100644
--- a/src/addons/notifications/services/notifications-helper.ts
+++ b/src/addons/notifications/services/notifications-helper.ts
@@ -25,7 +25,6 @@ import {
     AddonNotificationsPreferencesNotificationProcessor,
     AddonNotificationsPreferencesProcessor,
 } from './notifications';
-import { CoreTextUtils } from '@services/utils/text';
 
 /**
  * Service that provides some helper functions for notifications.
@@ -42,13 +41,8 @@ export class AddonNotificationsHelperProvider {
         notification: AddonNotificationsNotificationMessageFormatted,
     ): AddonNotificationsNotificationToRender {
         const formattedNotification: AddonNotificationsNotificationToRender = notification;
-        formattedNotification.displayfullhtml = this.shouldDisplayFullHtml(notification);
         formattedNotification.iconurl = formattedNotification.iconurl || undefined; // Make sure the property exists.
 
-        formattedNotification.mobiletext = formattedNotification.displayfullhtml ?
-            notification.fullmessagehtml :
-            CoreTextUtils.replaceNewLines((formattedNotification.mobiletext || '').replace(/-{4,}/ig, ''), '<br>');
-
         return formattedNotification;
     }
 
@@ -140,16 +134,6 @@ export class AddonNotificationsHelperProvider {
         return result;
     }
 
-    /**
-     * Check whether we should display full HTML of the notification.
-     *
-     * @param notification Notification.
-     * @return Whether to display full HTML.
-     */
-    protected shouldDisplayFullHtml(notification: AddonNotificationsNotificationToRender): boolean {
-        return notification.component == 'mod_forum' && notification.eventtype == 'digests';
-    }
-
 }
 
 export const AddonNotificationsHelper = makeSingleton(AddonNotificationsHelperProvider);
@@ -187,6 +171,5 @@ export type AddonNotificationsPreferencesProcessorFormatted = AddonNotifications
  * Notification with some calculated data to render it.
  */
 export type AddonNotificationsNotificationToRender = AddonNotificationsNotificationMessageFormatted & {
-    displayfullhtml?: boolean; // Whether to display the full HTML of the notification.
     iconurl?: string;
 };
diff --git a/src/addons/notifications/services/notifications.ts b/src/addons/notifications/services/notifications.ts
index 4678f9393..3a28a19dc 100644
--- a/src/addons/notifications/services/notifications.ts
+++ b/src/addons/notifications/services/notifications.ts
@@ -56,13 +56,7 @@ export class AddonNotificationsProvider {
         const promises = notifications.map(async (notificationRaw) => {
             const notification = <AddonNotificationsNotificationMessageFormatted> notificationRaw;
 
-            // Set message to show.
-            if (notification.component && notification.component == 'mod_forum') {
-                notification.mobiletext = notification.smallmessage;
-            } else {
-                notification.mobiletext = notification.fullmessage;
-            }
-
+            notification.mobiletext = notification.fullmessagehtml || notification.fullmessage || notification.smallmessage;
             notification.moodlecomponent = notification.component;
             notification.notification = 1;
             notification.notif = 1;
@@ -171,7 +165,7 @@ export class AddonNotificationsProvider {
 
         // Request 1 more notification so we can know if there are more notifications.
         const originalLimit = options.limit;
-        options.limit + 1;
+        options.limit = options.limit + 1;
 
         const site = await CoreSites.getSite(options.siteId);
 
diff --git a/src/core/directives/format-text.ts b/src/core/directives/format-text.ts
index 4869c50b8..ea1ed3e5e 100644
--- a/src/core/directives/format-text.ts
+++ b/src/core/directives/format-text.ts
@@ -166,8 +166,8 @@ export class CoreFormatTextDirective implements OnChanges {
         const originalWidth = img.attributes.getNamedItem('width');
 
         const forcedWidth = Number(originalWidth?.value);
-        if (!isNaN(forcedWidth)) {
-            if (originalWidth!.value.indexOf('%') < 0) {
+        if (originalWidth && !isNaN(forcedWidth)) {
+            if (originalWidth.value.indexOf('%') < 0) {
                 img.style.width = forcedWidth + 'px';
             } else {
                 img.style.width = forcedWidth + '%';

From dc2bbe8af1da5f408762fe0bb3ad894fdcd844c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 26 Oct 2021 16:23:09 +0200
Subject: [PATCH 0166/1008] MOBILE-3899 core: Fix non-null assertion warnings
 on linter

---
 .../features/h5p/components/h5p-iframe/h5p-iframe.ts     | 2 +-
 src/core/services/utils/text.ts                          | 4 ++--
 src/core/services/utils/time.ts                          | 8 ++++----
 src/core/singletons/colors.ts                            | 9 +++++++--
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/core/features/h5p/components/h5p-iframe/h5p-iframe.ts b/src/core/features/h5p/components/h5p-iframe/h5p-iframe.ts
index 5a921c6f8..1af3f74d2 100644
--- a/src/core/features/h5p/components/h5p-iframe/h5p-iframe.ts
+++ b/src/core/features/h5p/components/h5p-iframe/h5p-iframe.ts
@@ -63,7 +63,7 @@ export class CoreH5PIframeComponent implements OnChanges, OnDestroy {
     ) {
 
         this.logger = CoreLogger.getInstance('CoreH5PIframeComponent');
-        this.site = CoreSites.getCurrentSite()!;
+        this.site = CoreSites.getRequiredCurrentSite();
         this.siteId = this.site.getId();
         this.siteCanDownload = this.site.canDownloadFiles() && !CoreH5P.isOfflineDisabledInSite();
 
diff --git a/src/core/services/utils/text.ts b/src/core/services/utils/text.ts
index a0b157901..2ea31bf2b 100644
--- a/src/core/services/utils/text.ts
+++ b/src/core/services/utils/text.ts
@@ -254,7 +254,7 @@ export class CoreTextUtilsProvider {
         // First, we use a regexpr.
         text = text.replace(/(<([^>]+)>)/ig, '');
         // Then, we rely on the browser. We need to wrap the text to be sure is HTML.
-        text = this.convertToElement(text).textContent!;
+        text = this.convertToElement(text).textContent || '';
         // Recover or remove new lines.
         text = this.replaceNewLines(text, singleLine ? ' ' : '<br>');
 
@@ -370,7 +370,7 @@ export class CoreTextUtilsProvider {
      */
     decodeHTMLEntities(text: string): string {
         if (text) {
-            text = this.convertToElement(text).textContent!;
+            text = this.convertToElement(text).textContent || '';
         }
 
         return text;
diff --git a/src/core/services/utils/time.ts b/src/core/services/utils/time.ts
index b0c8ae3a2..684c741b0 100644
--- a/src/core/services/utils/time.ts
+++ b/src/core/services/utils/time.ts
@@ -295,19 +295,19 @@ export class CoreTimeUtilsProvider {
      * @return Readable date.
      */
     userDate(timestamp: number, format?: string, convert: boolean = true, fixDay: boolean = true, fixHour: boolean = true): string {
-        format = Translate.instant(format ? format : 'core.strftimedaydatetime');
+        format = Translate.instant(format ? format : 'core.strftimedaydatetime') as string;
 
         if (fixDay) {
-            format = format!.replace(/%d/g, '%e');
+            format = format.replace(/%d/g, '%e');
         }
 
         if (fixHour) {
-            format = format!.replace('%I', '%l');
+            format = format.replace('%I', '%l');
         }
 
         // Format could be in PHP format, convert it to moment.
         if (convert) {
-            format = this.convertPHPToMoment(format!);
+            format = this.convertPHPToMoment(format);
         }
 
         return moment(timestamp).format(format);
diff --git a/src/core/singletons/colors.ts b/src/core/singletons/colors.ts
index eea420a06..9256f5154 100644
--- a/src/core/singletons/colors.ts
+++ b/src/core/singletons/colors.ts
@@ -64,7 +64,12 @@ export class CoreColors {
         document.body.appendChild(d);
 
         // Color in RGB .
-        const rgba = getComputedStyle(d).color.match(/\d+/g)!.map((a) => parseInt(a, 10));
+        const matches = getComputedStyle(d).color.match(/\d+/g) || [];
+        if (matches.length == 0) {
+            return '';
+        }
+
+        const rgba = matches.map((a) => parseInt(a, 10));
 
         const hex = [0,1,2].map(
             (idx) => this.componentToHex(rgba[idx]),
@@ -72,7 +77,7 @@ export class CoreColors {
 
         document.body.removeChild(d);
 
-        return '#'+hex;
+        return '#' + hex;
     }
 
     /**

From d1f5ad89b7f2705bac9ef17747436c892e55bb96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 26 Oct 2021 16:23:09 +0200
Subject: [PATCH 0167/1008] MOBILE-3899 core: Fix some animations and a11y

---
 .../core-button-with-spinner.html                 |  4 ++--
 .../download-refresh/core-download-refresh.html   | 15 +++++++--------
 src/core/components/loading/core-loading.html     |  4 ++--
 .../settings/pages/space-usage/space-usage.html   |  2 +-
 .../pages/synchronization/synchronization.html    |  6 +++---
 5 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/core/components/button-with-spinner/core-button-with-spinner.html b/src/core/components/button-with-spinner/core-button-with-spinner.html
index 303eb0b3c..da739883f 100644
--- a/src/core/components/button-with-spinner/core-button-with-spinner.html
+++ b/src/core/components/button-with-spinner/core-button-with-spinner.html
@@ -1,6 +1,6 @@
-<div *ngIf="!loading" [@coreShowHideAnimation]>
+<div *ngIf="!loading" @coreShowHideAnimation>
     <ng-content></ng-content>
 </div>
 
 <!-- Spinner. -->
-<ion-spinner *ngIf="loading" [@coreShowHideAnimation] [attr.aria-label]="loadingLabel | translate"></ion-spinner>
+<ion-spinner *ngIf="loading" @coreShowHideAnimation [attr.aria-label]="loadingLabel | translate"></ion-spinner>
diff --git a/src/core/components/download-refresh/core-download-refresh.html b/src/core/components/download-refresh/core-download-refresh.html
index 9c984e977..9ba3490a9 100644
--- a/src/core/components/download-refresh/core-download-refresh.html
+++ b/src/core/components/download-refresh/core-download-refresh.html
@@ -1,25 +1,24 @@
 <ng-container *ngIf="enabled && !loading">
     <!-- Download button. -->
-    <ion-button *ngIf="status == statusNotDownloaded" fill="clear" (click)="download($event, false)" color="dark"
-        [@coreShowHideAnimation] [attr.aria-label]="(statusTranslatable || 'core.download') | translate" [size]="size">
+    <ion-button *ngIf="status == statusNotDownloaded" fill="clear" (click)="download($event, false)" color="dark" @coreShowHideAnimation
+        [attr.aria-label]="(statusTranslatable || 'core.download') | translate" [size]="size">
         <ion-icon slot="icon-only" name="cloud-download" aria-hidden="true"></ion-icon>
     </ion-button>
 
     <!-- Refresh button. -->
     <ion-button *ngIf="status == statusOutdated || (status == statusDownloaded && !canTrustDownload)" fill="clear"
-        (click)="download($event, true)" color="dark" [@coreShowHideAnimation]
+        (click)="download($event, true)" color="dark" @coreShowHideAnimation
         [attr.aria-label]="(statusTranslatable || 'core.refresh') | translate" [size]="size">
         <ion-icon slot="icon-only" name="fas-redo-alt" aria-hidden="true"></ion-icon>
     </ion-button>
 
     <!-- Downloaded status icon. -->
-    <ion-icon *ngIf="status == statusDownloaded && canTrustDownload" class="core-icon-downloaded ion-padding-horizontal"
-        color="success" name="cloud-done" [attr.aria-label]="(statusTranslatable || 'core.downloaded') | translate"
-        role="status"></ion-icon>
+    <ion-icon *ngIf="status == statusDownloaded && canTrustDownload" class="core-icon-downloaded ion-padding-horizontal" color="success"
+        name="cloud-done" [attr.aria-label]="(statusTranslatable || 'core.downloaded') | translate" role="status"></ion-icon>
 
-    <ion-spinner *ngIf="status === statusDownloading" [@coreShowHideAnimation]
+    <ion-spinner *ngIf="status === statusDownloading" @coreShowHideAnimation
         [attr.aria-label]="(statusTranslatable || 'core.downloading') | translate"></ion-spinner>
 </ng-container>
 
 <!-- Spinner. -->
-<ion-spinner *ngIf="loading" [@coreShowHideAnimation] [attr.aria-label]="'core.loading' | translate"></ion-spinner>
+<ion-spinner *ngIf="loading" @coreShowHideAnimation [attr.aria-label]="'core.loading' | translate"></ion-spinner>
diff --git a/src/core/components/loading/core-loading.html b/src/core/components/loading/core-loading.html
index 1c91e812e..569682040 100644
--- a/src/core/components/loading/core-loading.html
+++ b/src/core/components/loading/core-loading.html
@@ -1,8 +1,8 @@
-<div class="core-loading-container" *ngIf="!hideUntil" role="status" [@coreShowHideAnimation]>
+<div class="core-loading-container" *ngIf="!hideUntil" role="status" @coreShowHideAnimation>
     <ion-spinner color="primary" aria-hidden="true"></ion-spinner>
     <p class="core-loading-message" *ngIf="message" role="status">{{message}}</p>
 </div>
-<div #content class="core-loading-content" [id]="uniqueId" [attr.aria-busy]="!hideUntil" [@coreShowHideAnimation]
+<div #content class="core-loading-content" [id]="uniqueId" [attr.aria-busy]="!hideUntil" @coreShowHideAnimation
     [class.opacity-hide]="!hideUntil">
     <ng-content *ngIf="loaded">
     </ng-content>
diff --git a/src/core/features/settings/pages/space-usage/space-usage.html b/src/core/features/settings/pages/space-usage/space-usage.html
index 865cc082e..aa17b099a 100644
--- a/src/core/features/settings/pages/space-usage/space-usage.html
+++ b/src/core/features/settings/pages/space-usage/space-usage.html
@@ -19,7 +19,7 @@
     </ion-refresher>
     <core-loading [hideUntil]="loaded">
         <ion-list>
-            <ion-item *ngFor="let site of sites" [attr.aria-current]="site.id == currentSiteId ? 'page' : 'false'">
+            <ion-item *ngFor="let site of sites" [class.item-current]="site.id == currentSiteId">
                 <ion-label class="ion-text-wrap">
                     <p class="item-heading">
                         <core-format-text [text]="site.siteName" clean="true" [siteId]="site.id"></core-format-text>
diff --git a/src/core/features/settings/pages/synchronization/synchronization.html b/src/core/features/settings/pages/synchronization/synchronization.html
index 1808a9cc7..625d67b88 100644
--- a/src/core/features/settings/pages/synchronization/synchronization.html
+++ b/src/core/features/settings/pages/synchronization/synchronization.html
@@ -31,7 +31,7 @@
                     <h2>{{ 'core.settings.sites' | translate }}</h2>
                 </ion-label>
             </ion-item-divider>
-            <ion-item *ngFor="let site of sites" [attr.aria-current]="site.id == currentSiteId ? 'page' : 'false'" class="ion-text-wrap">
+            <ion-item *ngFor="let site of sites" [class.item-current]="site.id == currentSiteId" class="ion-text-wrap">
                 <ion-label>
                     <p class="item-heading">
                         <core-format-text [text]="site.siteName" clean="true" [siteId]="site.id"></core-format-text>
@@ -40,8 +40,8 @@
                     <p>{{ site.siteUrl }}</p>
                 </ion-label>
                 <core-button-with-spinner [loading]="isSynchronizing(site.id)" slot="end">
-                    <ion-button fill="clear"  (click)="synchronize(site.id)"
-                        [title]="site.siteName" [attr.aria-label]="'core.settings.synchronizenow' | translate">
+                    <ion-button fill="clear" (click)="synchronize(site.id)" [title]="site.siteName"
+                        [attr.aria-label]="'core.settings.synchronizenow' | translate">
                         <ion-icon name="fas-sync-alt" slot="icon-only" aria-hidden="true"></ion-icon>
                     </ion-button>
                 </core-button-with-spinner>

From 818979266dfd1ffa447a117ca2b7fd0ef2b20c5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 2 Nov 2021 08:57:22 +0100
Subject: [PATCH 0168/1008] MOBILE-3899 network: Show offline message at start

---
 src/app/app.component.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 8d21b8dfb..5f2359678 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -297,6 +297,9 @@ export class AppComponent implements OnInit, AfterViewInit {
             });
         });
 
+        const isOnline = CoreApp.isOnline();
+        document.body.classList.toggle('core-offline', !isOnline);
+
         // Set StatusBar properties.
         CoreApp.setStatusBarColor();
     }

From 289e8e1ce7a453be76ff6828c5df2ef2f0314220 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 20 Oct 2021 15:15:12 +0200
Subject: [PATCH 0169/1008] MOBILE-3807 menu: Change hamburger to meatballs
 more menu icon

---
 src/core/features/mainmenu/pages/menu/menu.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/features/mainmenu/pages/menu/menu.html b/src/core/features/mainmenu/pages/menu/menu.html
index b888971dc..893737e2f 100644
--- a/src/core/features/mainmenu/pages/menu/menu.html
+++ b/src/core/features/mainmenu/pages/menu/menu.html
@@ -18,7 +18,7 @@
 
         <ion-tab-button (keydown)="tabAction.keyDown($event)" (keyup)="tabAction.keyUp(morePageName, $event)" [hidden]="!loaded"
             [tab]="morePageName" layout="label-hide" [tabindex]="selectedTab == morePageName ? 0 : -1" [attr.aria-controls]="morePageName">
-            <ion-icon name="fas-bars" aria-hidden="true"></ion-icon>
+            <ion-icon name="ellipsis-horizontal" aria-hidden="true"></ion-icon>
             <ion-label aria-hidden="true">{{ 'core.more' | translate }}</ion-label>
             <span class="sr-only">{{ 'core.more' | translate }}</span>
         </ion-tab-button>

From 81fdd00902dd460b77299b9667cf38bbc101e95a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 22 Oct 2021 12:13:43 +0200
Subject: [PATCH 0170/1008] MOBILE-3807 mainmenu: Add new user menu modal

---
 .../mainmenu/components/components.module.ts  |  33 ++++
 .../user-menu-button/user-menu-button.html    |   9 ++
 .../user-menu-button/user-menu-button.ts      |  55 +++++++
 .../components/user-menu/user-menu.html       |  63 ++++++++
 .../components/user-menu/user-menu.scss       |  38 +++++
 .../components/user-menu/user-menu.ts         | 153 ++++++++++++++++++
 .../features/mainmenu/pages/more/more.html    | 147 ++++++++---------
 .../mainmenu/pages/more/more.module.ts        |   2 +
 .../features/mainmenu/pages/more/more.scss    |  18 ---
 src/core/features/mainmenu/pages/more/more.ts |  33 +---
 src/core/features/user/lang.json              |   2 +
 src/theme/globals.variables.scss              |  10 +-
 12 files changed, 431 insertions(+), 132 deletions(-)
 create mode 100644 src/core/features/mainmenu/components/components.module.ts
 create mode 100644 src/core/features/mainmenu/components/user-menu-button/user-menu-button.html
 create mode 100644 src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts
 create mode 100644 src/core/features/mainmenu/components/user-menu/user-menu.html
 create mode 100644 src/core/features/mainmenu/components/user-menu/user-menu.scss
 create mode 100644 src/core/features/mainmenu/components/user-menu/user-menu.ts

diff --git a/src/core/features/mainmenu/components/components.module.ts b/src/core/features/mainmenu/components/components.module.ts
new file mode 100644
index 000000000..9a688ae75
--- /dev/null
+++ b/src/core/features/mainmenu/components/components.module.ts
@@ -0,0 +1,33 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreSharedModule } from '@/core/shared.module';
+import { CoreMainMenuUserButtonComponent } from './user-menu-button/user-menu-button';
+import { CoreMainMenuUserMenuComponent } from './user-menu/user-menu';
+
+@NgModule({
+    declarations: [
+        CoreMainMenuUserButtonComponent,
+        CoreMainMenuUserMenuComponent,
+    ],
+    imports: [
+        CoreSharedModule,
+    ],
+    exports: [
+        CoreMainMenuUserButtonComponent,
+        CoreMainMenuUserMenuComponent,
+    ],
+})
+export class CoreMainMenuComponentsModule {}
diff --git a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.html b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.html
new file mode 100644
index 000000000..1d9f61bde
--- /dev/null
+++ b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.html
@@ -0,0 +1,9 @@
+<core-user-avatar
+    *ngIf="siteInfo"
+    [user]="siteInfo"
+    class="core-bar-button-image clickable"
+    [linkProfile]="false"
+    (ariaButtonClick)="openUserMenu($event)"
+    role="button"
+    tabindex="0"
+></core-user-avatar>
\ No newline at end of file
diff --git a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts
new file mode 100644
index 000000000..f8d3291f7
--- /dev/null
+++ b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts
@@ -0,0 +1,55 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreSiteInfo } from '@classes/site';
+import { CoreSites } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
+import { CoreMainMenuUserMenuComponent } from '../user-menu/user-menu';
+
+/**
+ * Component to display an avatar on the header to open user menu.
+ *
+ * Example: <core-user-menu-button></core-user-menu-button>
+ */
+@Component({
+    selector: 'core-user-menu-button',
+    templateUrl: 'user-menu-button.html',
+})
+export class CoreMainMenuUserButtonComponent {
+
+    siteInfo?: CoreSiteInfo;
+
+    constructor() {
+        const currentSite = CoreSites.getRequiredCurrentSite();
+
+        // @TODO: Check if the page where I currently am is at level 0.
+        this.siteInfo = currentSite.getInfo();
+    }
+
+    /**
+     * Open User menu
+     *
+     * @param event Click event.
+     */
+    openUserMenu(event: Event): void {
+        event.preventDefault();
+        event.stopPropagation();
+
+        CoreDomUtils.openModal<void>({
+            component: CoreMainMenuUserMenuComponent,
+        });
+    }
+
+}
diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.html b/src/core/features/mainmenu/components/user-menu/user-menu.html
new file mode 100644
index 000000000..8c89de390
--- /dev/null
+++ b/src/core/features/mainmenu/components/user-menu/user-menu.html
@@ -0,0 +1,63 @@
+<ion-header>
+    <ion-toolbar>
+        <ion-buttons slot="start">
+            <ion-button fill="clear" (click)="close($event)" [attr.aria-label]="'core.close' | translate">
+                <ion-icon name="fas-times" slot="icon-only" aria-hidden="true"></ion-icon>
+            </ion-button>
+        </ion-buttons>
+        <h1>
+            {{'core.user.account' | translate}}
+        </h1>
+    </ion-toolbar>
+</ion-header>
+<ion-content>
+    <core-loading [hideUntil]="true">
+        <ion-list>
+            <ion-item class="ion-text-center core-user-profile-maininfo" *ngIf="siteInfo">
+                <core-user-avatar [user]="siteInfo" [userId]="siteInfo.userid" [linkProfile]="false"></core-user-avatar>
+                <ion-label>
+                    <h2>{{ siteInfo.fullname }}</h2>
+                    <p class="core-usermenu-siteinfo core-usermenu-sitename">
+                        <core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="0" [wsNotFiltered]="true">
+                        </core-format-text>
+                    </p>
+                    <p class="core-usermenu-siteinfo core-usermenu-siteurl">{{ siteUrl }}</p>
+                </ion-label>
+            </ion-item>
+
+            <ion-item button class="ion-text-wrap core-usermenu-handler" (click)="openUserProfile($event)"
+                [attr.aria-label]="'core.user.details' | translate" detail="true">
+                <ion-icon name="fas-user" slot="start" aria-hidden="true"></ion-icon>
+                <ion-label>
+                    <p class="item-heading">{{ 'core.user.details' | translate }}</p>
+                </ion-label>
+            </ion-item>
+
+            <ion-item class="ion-text-center" *ngIf="(!handlers || !handlers.length) && !handlersLoaded">
+                <ion-label><ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner></ion-label>
+            </ion-item>
+
+            <ion-item button *ngFor="let handler of handlers" class="ion-text-wrap" (click)="handlerClicked($event, handler)"
+                [ngClass]="['core-user-menu-handler', handler.class || '']" [hidden]="handler.hidden"
+                [attr.aria-label]="handler.title | translate" detail="true">
+                <ion-icon *ngIf="handler.icon" [name]="handler.icon" slot="start" aria-hidden="true"></ion-icon>
+                <ion-label>
+                    <p class="item-heading">{{ handler.title | translate }}</p>
+                </ion-label>
+            </ion-item>
+
+            <ion-item button (click)="openPreferences($event)" [attr.aria-label]="'core.settings.preferences' | translate" detail="true">
+                <ion-icon name="fas-wrench" slot="start" aria-hidden="true"></ion-icon>
+                <ion-label>
+                    <p class="item-heading">{{ 'core.settings.preferences' | translate }}</p>
+                </ion-label>
+            </ion-item>
+        </ion-list>
+    </core-loading>
+</ion-content>
+<ion-footer class="ion-padding">
+    <ion-button (click)="logout($event)" expand="block" color="danger" [attr.aria-label]="logoutLabel | translate" class="ion-text-wrap">
+        <ion-icon name="fas-sign-out-alt" slot="start" aria-hidden="true"></ion-icon>
+        {{ logoutLabel | translate }}
+    </ion-button>
+</ion-footer>
\ No newline at end of file
diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.scss b/src/core/features/mainmenu/components/user-menu/user-menu.scss
new file mode 100644
index 000000000..7466e6dd8
--- /dev/null
+++ b/src/core/features/mainmenu/components/user-menu/user-menu.scss
@@ -0,0 +1,38 @@
+@import "~theme/globals";
+
+:host {
+    .core-user-profile-maininfo::part(native) {
+        flex-direction: column;
+    }
+
+    ::ng-deep {
+        core-user-avatar {
+            display: block;
+            --core-avatar-size: var(--core-large-avatar-size);
+            height: calc(var(--core-avatar-size) + 16px);
+
+            img {
+                margin: 8px auto;
+            }
+        }
+    }
+}
+
+
+@if ($core-user-hide-siteinfo) {
+    .core-usermenu-siteinfo {
+        display: none;
+    }
+}
+
+@if ($core-user-hide-sitename) {
+    .core-usermenu-sitename {
+        display: none;
+    }
+}
+
+@if ($core-user-hide-siteurl) {
+    .core-usermenu-siteurl {
+        display: none;
+    }
+}
diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.ts b/src/core/features/mainmenu/components/user-menu/user-menu.ts
new file mode 100644
index 000000000..71c8cc9f7
--- /dev/null
+++ b/src/core/features/mainmenu/components/user-menu/user-menu.ts
@@ -0,0 +1,153 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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, OnDestroy, OnInit } from '@angular/core';
+import { CoreSiteInfo } from '@classes/site';
+import { CoreLoginHelper } from '@features/login/services/login-helper';
+import { CoreUser, CoreUserProfile } from '@features/user/services/user';
+import { CoreUserProfileHandlerData, CoreUserDelegate, CoreUserDelegateService } from '@features/user/services/user-delegate';
+import { CoreNavigator } from '@services/navigator';
+import { CoreSites } from '@services/sites';
+import { ModalController } from '@singletons';
+import { Subscription } from 'rxjs';
+
+/**
+ * Component to display a user menu.
+ */
+@Component({
+    selector: 'core-main-menu-user-menu',
+    templateUrl: 'user-menu.html',
+    styleUrls: ['user-menu.scss'],
+})
+export class CoreMainMenuUserMenuComponent implements OnInit, OnDestroy {
+
+    siteInfo?: CoreSiteInfo;
+    siteName?: string;
+    logoutLabel = 'core.mainmenu.changesite';
+    siteUrl?: string;
+    handlers: CoreUserProfileHandlerData[] = [];
+    handlersLoaded = false;
+    user?: CoreUserProfile;
+
+    protected subscription!: Subscription;
+
+    /**
+     * @inheritdoc
+     */
+    async ngOnInit(): Promise<void> {
+
+        const currentSite = CoreSites.getRequiredCurrentSite();
+
+        this.siteInfo = currentSite.getInfo();
+        this.siteName = currentSite.getSiteName();
+        this.siteUrl = currentSite.getURL();
+        this.logoutLabel = CoreLoginHelper.getLogoutLabel(currentSite);
+
+        // Load the handlers.
+        if (this.siteInfo) {
+            this.user = await CoreUser.getProfile(this.siteInfo.userid);
+
+            this.subscription = CoreUserDelegate.getProfileHandlersFor(this.user).subscribe((handlers) => {
+                if (!handlers || !this.user) {
+                    return;
+                }
+
+                this.handlers = [];
+                handlers.forEach((handler) => {
+                    if (handler.type == CoreUserDelegateService.TYPE_NEW_PAGE) {
+                        this.handlers.push(handler.data);
+                    }
+                });
+
+                this.handlersLoaded = CoreUserDelegate.areHandlersLoaded(this.user.id);
+            });
+
+        }
+    }
+
+    /**
+     * Opens User profile page.
+     *
+     * @param event Click event.
+     */
+    async openUserProfile(event: Event): Promise<void> {
+        if (!this.siteInfo) {
+            return;
+        }
+
+        await this.close(event);
+
+        CoreNavigator.navigateToSitePath('user/about', {
+            params: {
+                userId: this.siteInfo.userid,
+            },
+        });
+    }
+
+    /**
+     * Opens preferences.
+     *
+     * @param event Click event.
+     */
+    async openPreferences(event: Event): Promise<void> {
+        await this.close(event);
+
+        CoreNavigator.navigateToSitePath('preferences');
+    }
+
+    /**
+     * A handler was clicked.
+     *
+     * @param event Click event.
+     * @param handler Handler that was clicked.
+     */
+    async handlerClicked(event: Event, handler: CoreUserProfileHandlerData): Promise<void> {
+        if (!this.user) {
+            return;
+        }
+
+        await this.close(event);
+
+        handler.action(event, this.user);
+    }
+
+    /**
+     * Logout the user.
+     *
+     * @param event Click event
+     */
+    async logout(event: Event): Promise<void> {
+        await this.close(event);
+
+        CoreSites.logout();
+    }
+
+    /**
+     * Close modal.
+     */
+    async close(event: Event): Promise<void> {
+        event.preventDefault();
+        event.stopPropagation();
+
+        await ModalController.dismiss();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    ngOnDestroy(): void {
+        this.subscription?.unsubscribe();
+    }
+
+}
diff --git a/src/core/features/mainmenu/pages/more/more.html b/src/core/features/mainmenu/pages/more/more.html
index 3f3fcff68..69a4e046c 100644
--- a/src/core/features/mainmenu/pages/more/more.html
+++ b/src/core/features/mainmenu/pages/more/more.html
@@ -5,97 +5,76 @@
         </ion-buttons>
 
         <h1><core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="0"></core-format-text></h1>
+
+        <ion-buttons slot="end">
+            <core-user-menu-button></core-user-menu-button>
+        </ion-buttons>
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <core-loading [hideUntil]="!loggedOut">
-        <ion-list>
-            <ion-item button *ngIf="siteInfo" class="ion-text-wrap" core-user-link [userId]="siteInfo.userid" detail="true">
-                <core-user-avatar [user]="siteInfo" slot="start"></core-user-avatar>
+    <ion-list>
+        <ion-item class="ion-text-center" *ngIf="(!handlers || !handlers.length) && !handlersLoaded">
+            <ion-label><ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner></ion-label>
+        </ion-item>
+        <ion-item button *ngFor="let handler of handlers" [ngClass]="['core-moremenu-handler', handler.class || '']"
+            (click)="openHandler(handler)" [attr.aria-label]="handler.title | translate" detail="true">
+            <ion-icon [name]="handler.icon" slot="start" aria-hidden="true"></ion-icon>
+            <ion-label>
+                <p class="item-heading">{{ handler.title | translate}}</p>
+            </ion-label>
+            <ion-badge slot="end" *ngIf="handler.showBadge" [hidden]="handler.loading || !handler.badge" aria-hidden="true">
+                {{handler.badge}}
+            </ion-badge>
+            <span *ngIf="handler.showBadge && handler.badge && handler.badgeA11yText" class="sr-only">
+                {{ handler.badgeA11yText | translate: {$a : handler.badge } }}
+            </span>
+            <ion-spinner slot="end" *ngIf="handler.showBadge && handler.loading" [attr.aria-label]="'core.loading' | translate">
+            </ion-spinner>
+        </ion-item>
+        <ng-container *ngFor="let item of customItems">
+            <ion-item button *ngIf="item.type != 'embedded'" [href]="item.url" [attr.aria-label]="item.label" core-link
+                [capture]="item.type == 'app'" [inApp]="item.type == 'inappbrowser'" class="core-moremenu-customitem" detail="true"
+                [detailIcon]="item.type == 'browser' ? 'open-outline' : 'chevron-forward'">
+                <ion-icon [name]="item.icon" slot="start" aria-hidden="true"></ion-icon>
                 <ion-label>
-                    <p class="item-heading">{{siteInfo.fullname}}</p>
-                    <p class="core-moremenu-siteinfo core-moremenu-sitename">
-                        <core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="0" [wsNotFiltered]="true">
-                        </core-format-text>
-                    </p>
-                    <p class="core-moremenu-siteinfo core-moremenu-siteurl">{{ siteUrl }}</p>
+                    <p class="item-heading">{{item.label}}</p>
                 </ion-label>
             </ion-item>
-            <core-spacer></core-spacer>
-            <ion-item class="ion-text-center" *ngIf="(!handlers || !handlers.length) && !handlersLoaded">
-                <ion-label><ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner></ion-label>
-            </ion-item>
-            <ion-item button *ngFor="let handler of handlers" [ngClass]="['core-moremenu-handler', handler.class || '']"
-                (click)="openHandler(handler)" [attr.aria-label]="handler.title | translate" detail="true">
-                <ion-icon [name]="handler.icon" slot="start" aria-hidden="true"></ion-icon>
+            <ion-item button *ngIf="item.type == 'embedded'" (click)="openItem(item)" [attr.aria-label]="item.label"
+                class="core-moremenu-customitem" detail="true">
+                <ion-icon [name]="item.icon" slot="start" aria-hidden="true"></ion-icon>
                 <ion-label>
-                    <p class="item-heading">{{ handler.title | translate}}</p>
-                </ion-label>
-                <ion-badge slot="end" *ngIf="handler.showBadge" [hidden]="handler.loading || !handler.badge" aria-hidden="true">
-                    {{handler.badge}}
-                </ion-badge>
-                <span *ngIf="handler.showBadge && handler.badge && handler.badgeA11yText" class="sr-only">
-                    {{ handler.badgeA11yText | translate: {$a : handler.badge } }}
-                </span>
-                <ion-spinner slot="end" *ngIf="handler.showBadge && handler.loading" [attr.aria-label]="'core.loading' | translate">
-                </ion-spinner>
-            </ion-item>
-            <ng-container *ngFor="let item of customItems">
-                <ion-item button *ngIf="item.type != 'embedded'" [href]="item.url" [attr.aria-label]="item.label" core-link
-                    [capture]="item.type == 'app'" [inApp]="item.type == 'inappbrowser'" class="core-moremenu-customitem" detail="true"
-                    [detailIcon]="item.type == 'browser' ? 'open-outline' : 'chevron-forward'">
-                    <ion-icon [name]="item.icon" slot="start" aria-hidden="true"></ion-icon>
-                    <ion-label>
-                        <p class="item-heading">{{item.label}}</p>
-                    </ion-label>
-                </ion-item>
-                <ion-item button *ngIf="item.type == 'embedded'" (click)="openItem(item)" [attr.aria-label]="item.label"
-                    class="core-moremenu-customitem" detail="true">
-                    <ion-icon [name]="item.icon" slot="start" aria-hidden="true"></ion-icon>
-                    <ion-label>
-                        <p class="item-heading">{{item.label}}</p>
-                    </ion-label>
-                </ion-item>
-            </ng-container>
-            <ion-item button *ngIf="showScanQR" (click)="scanQR()" detail="true">
-                <ion-icon name="fas-qrcode" slot="start" aria-hidden="true"></ion-icon>
-                <ion-label>
-                    <p class="item-heading">{{ 'core.scanqr' | translate }}</p>
+                    <p class="item-heading">{{item.label}}</p>
                 </ion-label>
             </ion-item>
-            <ion-item button *ngIf="showWeb && siteInfo" [href]="siteInfo.siteurl" core-link autoLogin="yes"
-                [attr.aria-label]="'core.mainmenu.website' | translate" detail="true" detailIcon="open-outline">
-                <ion-icon name="fas-globe" slot="start" aria-hidden="true"></ion-icon>
-                <ion-label>
-                    <p class="item-heading">{{ 'core.mainmenu.website' | translate }}</p>
-                </ion-label>
-            </ion-item>
-            <ion-item button *ngIf="showHelp" [href]="docsUrl" core-link autoLogin="no"
-                [attr.aria-label]="'core.mainmenu.help' | translate" detail="true" detailIcon="open-outline">
-                <ion-icon name="far-life-ring" slot="start" aria-hidden="true"></ion-icon>
-                <ion-label>
-                    <p class="item-heading">{{ 'core.mainmenu.help' | translate }}</p>
-                </ion-label>
-            </ion-item>
-            <ion-item button (click)="openPreferences()" [attr.aria-label]="'core.settings.preferences' | translate" detail="true">
-                <ion-icon name="fas-wrench" slot="start" aria-hidden="true"></ion-icon>
-                <ion-label>
-                    <p class="item-heading">{{ 'core.settings.preferences' | translate }}</p>
-                </ion-label>
-            </ion-item>
-            <ion-item button (click)="logout()" [attr.aria-label]="logoutLabel | translate" detail="true">
-                <ion-icon name="fas-sign-out-alt" slot="start" aria-hidden="true"></ion-icon>
-                <ion-label>
-                    <p class="item-heading">{{ logoutLabel | translate }}</p>
-                </ion-label>
-            </ion-item>
-            <core-spacer></core-spacer>
-            <ion-item button (click)="openSettings()" [attr.aria-label]="'core.settings.appsettings' | translate" detail="true">
-                <ion-icon name="fas-cogs" slot="start" aria-hidden="true"></ion-icon>
-                <ion-label>
-                    <p class="item-heading">{{ 'core.settings.appsettings' | translate }}</p>
-                </ion-label>
-            </ion-item>
-        </ion-list>
-    </core-loading>
+        </ng-container>
+        <ion-item button *ngIf="showScanQR" (click)="scanQR()" detail="true">
+            <ion-icon name="fas-qrcode" slot="start" aria-hidden="true"></ion-icon>
+            <ion-label>
+                <p class="item-heading">{{ 'core.scanqr' | translate }}</p>
+            </ion-label>
+        </ion-item>
+        <ion-item button *ngIf="showWeb && siteInfo" [href]="siteInfo.siteurl" core-link autoLogin="yes"
+            [attr.aria-label]="'core.mainmenu.website' | translate" detail="true" detailIcon="open-outline">
+            <ion-icon name="fas-globe" slot="start" aria-hidden="true"></ion-icon>
+            <ion-label>
+                <p class="item-heading">{{ 'core.mainmenu.website' | translate }}</p>
+            </ion-label>
+        </ion-item>
+        <ion-item button *ngIf="showHelp" [href]="docsUrl" core-link autoLogin="no"
+            [attr.aria-label]="'core.mainmenu.help' | translate" detail="true" detailIcon="open-outline">
+            <ion-icon name="far-life-ring" slot="start" aria-hidden="true"></ion-icon>
+            <ion-label>
+                <p class="item-heading">{{ 'core.mainmenu.help' | translate }}</p>
+            </ion-label>
+        </ion-item>
+    </ion-list>
 </ion-content>
+<ion-footer>
+    <ion-item button (click)="openSettings()" [attr.aria-label]="'core.settings.appsettings' | translate" detail="true">
+        <ion-icon name="fas-cogs" slot="start" aria-hidden="true"></ion-icon>
+        <ion-label>
+            <p class="item-heading">{{ 'core.settings.appsettings' | translate }}</p>
+        </ion-label>
+    </ion-item>
+</ion-footer>
diff --git a/src/core/features/mainmenu/pages/more/more.module.ts b/src/core/features/mainmenu/pages/more/more.module.ts
index 1999f1b49..770fa3d9b 100644
--- a/src/core/features/mainmenu/pages/more/more.module.ts
+++ b/src/core/features/mainmenu/pages/more/more.module.ts
@@ -19,10 +19,12 @@ import { CoreSharedModule } from '@/core/shared.module';
 import { CoreMainMenuMorePage } from './more';
 import { buildTabMainRoutes } from '@features/mainmenu/mainmenu-tab-routing.module';
 import { CoreMainMenuProvider } from '@features/mainmenu/services/mainmenu';
+import { CoreMainMenuComponentsModule } from '@features/mainmenu/components/components.module';
 
 @NgModule({
     imports: [
         CoreSharedModule,
+        CoreMainMenuComponentsModule,
     ],
     providers: [
         {
diff --git a/src/core/features/mainmenu/pages/more/more.scss b/src/core/features/mainmenu/pages/more/more.scss
index c5b62e00a..9b1b544d2 100644
--- a/src/core/features/mainmenu/pages/more/more.scss
+++ b/src/core/features/mainmenu/pages/more/more.scss
@@ -17,21 +17,3 @@ ion-item {
         color: var(--core-more-icon, inherit);
     }
 }
-
-@if ($core-more-hide-siteinfo) {
-    .core-moremenu-siteinfo {
-        display: none;
-    }
-}
-
-@if ($core-more-hide-sitename) {
-    .core-moremenu-sitename {
-        display: none;
-    }
-}
-
-@if ($core-more-hide-siteurl) {
-    .core-moremenu-siteurl {
-        display: none;
-    }
-}
diff --git a/src/core/features/mainmenu/pages/more/more.ts b/src/core/features/mainmenu/pages/more/more.ts
index 733c8a0aa..a8b93f285 100644
--- a/src/core/features/mainmenu/pages/more/more.ts
+++ b/src/core/features/mainmenu/pages/more/more.ts
@@ -18,7 +18,6 @@ import { Subscription } from 'rxjs';
 import { CoreSites } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreSiteInfo } from '@classes/site';
-import { CoreLoginHelper } from '@features/login/services/login-helper';
 import { CoreMainMenuDelegate, CoreMainMenuHandlerData } from '../../services/mainmenu-delegate';
 import { CoreMainMenu, CoreMainMenuCustomItem } from '../../services/mainmenu';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
@@ -39,19 +38,16 @@ import { Translate } from '@singletons';
 export class CoreMainMenuMorePage implements OnInit, OnDestroy {
 
     handlers?: CoreMainMenuHandlerData[];
-    allHandlers?: CoreMainMenuHandlerData[];
     handlersLoaded = false;
     siteInfo?: CoreSiteInfo;
     siteName?: string;
-    logoutLabel = 'core.mainmenu.changesite';
     showScanQR: boolean;
     showWeb?: boolean;
     showHelp?: boolean;
     docsUrl?: string;
     customItems?: CoreMainMenuCustomItem[];
-    siteUrl?: string;
-    loggedOut = false;
 
+    protected allHandlers?: CoreMainMenuHandlerData[];
     protected subscription!: Subscription;
     protected langObserver: CoreEventObserver;
     protected updateSiteObserver: CoreEventObserver;
@@ -70,7 +66,7 @@ export class CoreMainMenuMorePage implements OnInit, OnDestroy {
     }
 
     /**
-     * Initialize component.
+     * @inheritdoc
      */
     ngOnInit(): void {
         // Load the handlers.
@@ -84,7 +80,7 @@ export class CoreMainMenuMorePage implements OnInit, OnDestroy {
     }
 
     /**
-     * Page destroyed.
+     * @inheritdoc
      */
     ngOnDestroy(): void {
         window.removeEventListener('resize', this.initHandlers.bind(this));
@@ -116,16 +112,10 @@ export class CoreMainMenuMorePage implements OnInit, OnDestroy {
      * Load the site info required by the view.
      */
     protected async loadSiteInfo(): Promise<void> {
-        const currentSite = CoreSites.getCurrentSite();
-
-        if (!currentSite) {
-            return;
-        }
+        const currentSite = CoreSites.getRequiredCurrentSite();
 
         this.siteInfo = currentSite.getInfo();
         this.siteName = currentSite.getSiteName();
-        this.siteUrl = currentSite.getURL();
-        this.logoutLabel = CoreLoginHelper.getLogoutLabel(currentSite);
         this.showWeb = !currentSite.isFeatureDisabled('CoreMainMenuDelegate_website');
         this.showHelp = !currentSite.isFeatureDisabled('CoreMainMenuDelegate_help');
 
@@ -154,13 +144,6 @@ export class CoreMainMenuMorePage implements OnInit, OnDestroy {
         CoreNavigator.navigateToSitePath('viewer/iframe', { params: { title: item.label, url: item.url } });
     }
 
-    /**
-     * Open preferences.
-     */
-    openPreferences(): void {
-        CoreNavigator.navigateToSitePath('preferences');
-    }
-
     /**
      * Open settings.
      */
@@ -200,12 +183,4 @@ export class CoreMainMenuMorePage implements OnInit, OnDestroy {
         }
     }
 
-    /**
-     * Logout the user.
-     */
-    logout(): void {
-        this.loggedOut = true;
-        CoreSites.logout();
-    }
-
 }
diff --git a/src/core/features/user/lang.json b/src/core/features/user/lang.json
index 610e0fae4..3435a4c4a 100644
--- a/src/core/features/user/lang.json
+++ b/src/core/features/user/lang.json
@@ -1,5 +1,6 @@
 {
     "address": "Address",
+    "account": "Account",
     "city": "City/town",
     "contact": "Contact",
     "country": "Country",
@@ -14,6 +15,7 @@
     "interests": "Interests",
     "lastname": "Surname",
     "manager": "Manager",
+    "myprofile": "My profile",
     "newpicture": "New picture",
     "noparticipants": "No participants found for this course",
     "participants": "Participants",
diff --git a/src/theme/globals.variables.scss b/src/theme/globals.variables.scss
index e2a39b886..abc13bfce 100644
--- a/src/theme/globals.variables.scss
+++ b/src/theme/globals.variables.scss
@@ -127,7 +127,15 @@ $core-login-loading-color-dark: $text-color-dark !default;
 $core-login-hide-forgot-password: false !default;
 $core-login-hide-need-help: false !default;
 
-// Configuration options for more page.
+// Configuration options for more page. (deprecated on 4.0)
 $core-more-hide-siteinfo: false !default;
 $core-more-hide-sitename: false !default;
 $core-more-hide-siteurl: false !default;
+
+// Configuration options for user page.
+$core-user-hide-siteinfo: $core-more-hide-siteinfo !default;
+$core-user-hide-sitename: $core-more-hide-sitename !default;
+$core-user-hide-siteurl: $core-more-hide-siteurl !default;
+
+
+

From 806e29ce103469d62b550ca41404e63fd4d08ec3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 21 Oct 2021 15:09:23 +0200
Subject: [PATCH 0171/1008] MOBILE-3807 core: Add some delegates to user menu

---
 .../privatefiles/services/block-handler.ts    |  4 +-
 .../privatefiles/privatefiles-lazy.module.ts  |  4 +-
 .../privatefiles/privatefiles.module.ts       |  8 +--
 .../handlers/{mainmenu.ts => user.ts}         | 39 ++++++++-----
 .../features/grades/grades-lazy.module.ts     |  6 +-
 src/core/features/grades/grades.module.ts     |  7 +--
 .../grades/services/handlers/mainmenu.ts      | 56 -------------------
 .../features/grades/services/handlers/user.ts | 55 +++++++++++++-----
 8 files changed, 79 insertions(+), 100 deletions(-)
 rename src/addons/privatefiles/services/handlers/{mainmenu.ts => user.ts} (50%)
 delete mode 100644 src/core/features/grades/services/handlers/mainmenu.ts

diff --git a/src/addons/block/privatefiles/services/block-handler.ts b/src/addons/block/privatefiles/services/block-handler.ts
index 73c160eaf..bf4c9aaf7 100644
--- a/src/addons/block/privatefiles/services/block-handler.ts
+++ b/src/addons/block/privatefiles/services/block-handler.ts
@@ -16,7 +16,7 @@ import { Injectable } from '@angular/core';
 import { CoreBlockHandlerData } from '@features/block/services/block-delegate';
 import { CoreBlockOnlyTitleComponent } from '@features/block/components/only-title-block/only-title-block';
 import { CoreBlockBaseHandler } from '@features/block/classes/base-block-handler';
-import { AddonPrivateFilesMainMenuHandlerService } from '@/addons/privatefiles/services/handlers/mainmenu';
+import { AddonPrivateFilesUserHandlerService } from '@addons/privatefiles/services/handlers/user';
 import { makeSingleton } from '@singletons';
 
 /**
@@ -39,7 +39,7 @@ export class AddonBlockPrivateFilesHandlerService extends CoreBlockBaseHandler {
             title: 'addon.block_privatefiles.pluginname',
             class: 'addon-block-private-files',
             component: CoreBlockOnlyTitleComponent,
-            link: AddonPrivateFilesMainMenuHandlerService.PAGE_NAME,
+            link: AddonPrivateFilesUserHandlerService.PAGE_NAME,
             linkParams: { root: 'my' },
             navOptions: {
                 preferCurrentTab: false,
diff --git a/src/addons/privatefiles/privatefiles-lazy.module.ts b/src/addons/privatefiles/privatefiles-lazy.module.ts
index fa78f9da5..5791c5dc0 100644
--- a/src/addons/privatefiles/privatefiles-lazy.module.ts
+++ b/src/addons/privatefiles/privatefiles-lazy.module.ts
@@ -16,14 +16,14 @@ import { Injector, NgModule } from '@angular/core';
 import { RouterModule, ROUTES, Routes } from '@angular/router';
 
 import { buildTabMainRoutes } from '@features/mainmenu/mainmenu-tab-routing.module';
-import { AddonPrivateFilesMainMenuHandlerService } from './services/handlers/mainmenu';
+import { AddonPrivateFilesUserHandlerService } from './services/handlers/user';
 
 function buildRoutes(injector: Injector): Routes {
     return [
         {
             path: 'root',
             data: {
-                mainMenuTabRoot: AddonPrivateFilesMainMenuHandlerService.PAGE_NAME,
+                mainMenuTabRoot: AddonPrivateFilesUserHandlerService.PAGE_NAME,
             },
             loadChildren: () => import('./pages/index/index.module').then(m => m.AddonPrivateFilesIndexPageModule),
         },
diff --git a/src/addons/privatefiles/privatefiles.module.ts b/src/addons/privatefiles/privatefiles.module.ts
index ca91c9d3f..635a80afb 100644
--- a/src/addons/privatefiles/privatefiles.module.ts
+++ b/src/addons/privatefiles/privatefiles.module.ts
@@ -15,12 +15,12 @@
 import { APP_INITIALIZER, NgModule, Type } from '@angular/core';
 import { Routes } from '@angular/router';
 
-import { CoreMainMenuDelegate } from '@features/mainmenu/services/mainmenu-delegate';
 import { CoreMainMenuRoutingModule } from '@features/mainmenu/mainmenu-routing.module';
-import { AddonPrivateFilesMainMenuHandler, AddonPrivateFilesMainMenuHandlerService } from './services/handlers/mainmenu';
 import { CoreMainMenuTabRoutingModule } from '@features/mainmenu/mainmenu-tab-routing.module';
 import { AddonPrivateFilesProvider } from './services/privatefiles';
 import { AddonPrivateFilesHelperProvider } from './services/privatefiles-helper';
+import { CoreUserDelegate } from '@features/user/services/user-delegate';
+import { AddonPrivateFilesUserHandler, AddonPrivateFilesUserHandlerService } from './services/handlers/user';
 
 export const ADDON_PRIVATEFILES_SERVICES: Type<unknown>[] = [
     AddonPrivateFilesProvider,
@@ -29,7 +29,7 @@ export const ADDON_PRIVATEFILES_SERVICES: Type<unknown>[] = [
 
 const routes: Routes = [
     {
-        path: AddonPrivateFilesMainMenuHandlerService.PAGE_NAME,
+        path: AddonPrivateFilesUserHandlerService.PAGE_NAME,
         loadChildren: () => import('@/addons/privatefiles/privatefiles-lazy.module').then(m => m.AddonPrivateFilesLazyModule),
     },
 ];
@@ -45,7 +45,7 @@ const routes: Routes = [
             provide: APP_INITIALIZER,
             multi: true,
             useValue: () => {
-                CoreMainMenuDelegate.registerHandler(AddonPrivateFilesMainMenuHandler.instance);
+                CoreUserDelegate.registerHandler(AddonPrivateFilesUserHandler.instance);
             },
         },
     ],
diff --git a/src/addons/privatefiles/services/handlers/mainmenu.ts b/src/addons/privatefiles/services/handlers/user.ts
similarity index 50%
rename from src/addons/privatefiles/services/handlers/mainmenu.ts
rename to src/addons/privatefiles/services/handlers/user.ts
index 0ec18da4c..4672385b3 100644
--- a/src/addons/privatefiles/services/handlers/mainmenu.ts
+++ b/src/addons/privatefiles/services/handlers/user.ts
@@ -14,44 +14,57 @@
 
 import { Injectable } from '@angular/core';
 
-import { CoreMainMenuHandler, CoreMainMenuHandlerData } from '@features/mainmenu/services/mainmenu-delegate';
 import { AddonPrivateFiles } from '@/addons/privatefiles/services/privatefiles';
 import { makeSingleton } from '@singletons';
+import { CoreUserDelegateService, CoreUserProfileHandler, CoreUserProfileHandlerData } from '@features/user/services/user-delegate';
+import { CoreUserProfile } from '@features/user/services/user';
+import { CoreNavigator } from '@services/navigator';
+import { CoreSites } from '@services/sites';
 
 /**
- * Handler to inject an option into main menu.
+ * Handler to inject an option into user menu.
  */
 @Injectable({ providedIn: 'root' })
-export class AddonPrivateFilesMainMenuHandlerService implements CoreMainMenuHandler {
+export class AddonPrivateFilesUserHandlerService implements CoreUserProfileHandler {
 
     static readonly PAGE_NAME = 'private';
 
     name = 'AddonPrivateFiles';
-    priority = 400;
+    priority = 300;
+    type = CoreUserDelegateService.TYPE_NEW_PAGE;
+    cacheEnabled = true;
 
     /**
-     * Check if the handler is enabled on a site level.
-     *
-     * @return Whether or not the handler is enabled on a site level.
+     * @inheritdoc
      */
     async isEnabled(): Promise<boolean> {
         return AddonPrivateFiles.isPluginEnabled();
     }
 
     /**
-     * Returns the data needed to render the handler.
-     *
-     * @return Data needed to render the handler.
+     * @inheritdoc
      */
-    getDisplayData(): CoreMainMenuHandlerData {
+    async isEnabledForUser(user: CoreUserProfile): Promise<boolean> {
+        // Private files only available for the current user.
+        return user.id == CoreSites.getCurrentSiteUserId();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    getDisplayData(): CoreUserProfileHandlerData {
         return {
             icon: 'fas-folder',
             title: 'addon.privatefiles.files',
-            page: AddonPrivateFilesMainMenuHandlerService.PAGE_NAME,
             class: 'addon-privatefiles-handler',
+            action: (event): void => {
+                event.preventDefault();
+                event.stopPropagation();
+                CoreNavigator.navigateToSitePath(AddonPrivateFilesUserHandlerService.PAGE_NAME);
+            },
         };
     }
 
 }
 
-export const AddonPrivateFilesMainMenuHandler = makeSingleton(AddonPrivateFilesMainMenuHandlerService);
+export const AddonPrivateFilesUserHandler = makeSingleton(AddonPrivateFilesUserHandlerService);
diff --git a/src/core/features/grades/grades-lazy.module.ts b/src/core/features/grades/grades-lazy.module.ts
index e60242302..d825a2621 100644
--- a/src/core/features/grades/grades-lazy.module.ts
+++ b/src/core/features/grades/grades-lazy.module.ts
@@ -23,13 +23,13 @@ import { CoreGradesCoursePage } from './pages/course/course.page';
 import { CoreGradesCoursePageModule } from './pages/course/course.module';
 import { CoreGradesCoursesPage } from './pages/courses/courses.page';
 import { CoreGradesGradePage } from './pages/grade/grade.page';
-import { CoreGradesMainMenuHandlerService } from './services/handlers/mainmenu';
+import { CoreGradesUserHandlerService } from './services/handlers/user';
 
 const mobileRoutes: Routes = [
     {
         path: '',
         data: {
-            mainMenuTabRoot: CoreGradesMainMenuHandlerService.PAGE_NAME,
+            mainMenuTabRoot: CoreGradesUserHandlerService.PAGE_NAME,
         },
         component: CoreGradesCoursesPage,
     },
@@ -47,7 +47,7 @@ const tabletRoutes: Routes = [
     {
         path: '',
         data: {
-            mainMenuTabRoot: CoreGradesMainMenuHandlerService.PAGE_NAME,
+            mainMenuTabRoot: CoreGradesUserHandlerService.PAGE_NAME,
         },
         component: CoreGradesCoursesPage,
         children: [
diff --git a/src/core/features/grades/grades.module.ts b/src/core/features/grades/grades.module.ts
index b359d575c..d7ca58cf3 100644
--- a/src/core/features/grades/grades.module.ts
+++ b/src/core/features/grades/grades.module.ts
@@ -19,14 +19,12 @@ import { CoreCourseIndexRoutingModule } from '@features/course/pages/index/index
 import { CoreCourseOptionsDelegate } from '@features/course/services/course-options-delegate';
 import { CoreMainMenuRoutingModule } from '@features/mainmenu/mainmenu-routing.module';
 import { CoreMainMenuTabRoutingModule } from '@features/mainmenu/mainmenu-tab-routing.module';
-import { CoreMainMenuDelegate } from '@features/mainmenu/services/mainmenu-delegate';
 import { CoreUserDelegate } from '@features/user/services/user-delegate';
 import { CoreGradesProvider } from './services/grades';
 import { CoreGradesHelperProvider } from './services/grades-helper';
 import { CoreGradesCourseOptionHandler } from './services/handlers/course-option';
-import { CoreGradesMainMenuHandler, CoreGradesMainMenuHandlerService } from './services/handlers/mainmenu';
 import { CoreGradesOverviewLinkHandler } from './services/handlers/overview-link';
-import { CoreGradesUserHandler } from './services/handlers/user';
+import { CoreGradesUserHandler, CoreGradesUserHandlerService } from './services/handlers/user';
 import { CoreGradesUserLinkHandler } from './services/handlers/user-link';
 
 export const CORE_GRADES_SERVICES: Type<unknown>[] = [
@@ -36,7 +34,7 @@ export const CORE_GRADES_SERVICES: Type<unknown>[] = [
 
 const routes: Routes = [
     {
-        path: CoreGradesMainMenuHandlerService.PAGE_NAME,
+        path: CoreGradesUserHandlerService.PAGE_NAME,
         loadChildren: () => import('@features/grades/grades-lazy.module').then(m => m.CoreGradesLazyModule),
     },
     {
@@ -63,7 +61,6 @@ const courseIndexRoutes: Routes = [
             provide: APP_INITIALIZER,
             multi: true,
             useValue: () => {
-                CoreMainMenuDelegate.registerHandler(CoreGradesMainMenuHandler.instance);
                 CoreUserDelegate.registerHandler(CoreGradesUserHandler.instance);
                 CoreContentLinksDelegate.registerHandler(CoreGradesUserLinkHandler.instance);
                 CoreContentLinksDelegate.registerHandler(CoreGradesOverviewLinkHandler.instance);
diff --git a/src/core/features/grades/services/handlers/mainmenu.ts b/src/core/features/grades/services/handlers/mainmenu.ts
deleted file mode 100644
index 6e7a7b915..000000000
--- a/src/core/features/grades/services/handlers/mainmenu.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-// (C) Copyright 2015 Moodle Pty Ltd.
-//
-// 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 { Injectable } from '@angular/core';
-import { CoreGrades } from '@features/grades/services/grades';
-import { CoreMainMenuHandler, CoreMainMenuHandlerData } from '@features/mainmenu/services/mainmenu-delegate';
-import { makeSingleton } from '@singletons';
-
-/**
- * Handler to inject an option into main menu.
- */
-@Injectable({ providedIn: 'root' })
-export class CoreGradesMainMenuHandlerService implements CoreMainMenuHandler {
-
-    static readonly PAGE_NAME = 'grades';
-
-    name = 'CoreGrades';
-    priority = 600;
-
-    /**
-     * Check if the handler is enabled on a site level.
-     *
-     * @return Whether or not the handler is enabled on a site level.
-     */
-    isEnabled(): Promise<boolean> {
-        return CoreGrades.isCourseGradesEnabled();
-    }
-
-    /**
-     * Returns the data needed to render the handler.
-     *
-     * @return Data needed to render the handler.
-     */
-    getDisplayData(): CoreMainMenuHandlerData {
-        return {
-            icon: 'fas-chart-bar',
-            title: 'core.grades.grades',
-            page: CoreGradesMainMenuHandlerService.PAGE_NAME,
-            class: 'core-grades-coursesgrades-handler',
-        };
-    }
-
-}
-
-export const CoreGradesMainMenuHandler = makeSingleton(CoreGradesMainMenuHandlerService);
diff --git a/src/core/features/grades/services/handlers/user.ts b/src/core/features/grades/services/handlers/user.ts
index 544044018..fab0752f6 100644
--- a/src/core/features/grades/services/handlers/user.ts
+++ b/src/core/features/grades/services/handlers/user.ts
@@ -22,6 +22,7 @@ import {
     CoreUserProfileHandlerData,
 } from '@features/user/services/user-delegate';
 import { CoreNavigator } from '@services/navigator';
+import { CoreSites } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
 import { makeSingleton } from '@singletons';
 
@@ -31,6 +32,8 @@ import { makeSingleton } from '@singletons';
 @Injectable({ providedIn: 'root' })
 export class CoreGradesUserHandlerService implements CoreUserProfileHandler {
 
+    static readonly PAGE_NAME = 'grades';
+
     name = 'CoreGrades:viewGrades';
     priority = 400;
     type = CoreUserDelegateService.TYPE_NEW_PAGE;
@@ -47,32 +50,54 @@ export class CoreGradesUserHandlerService implements CoreUserProfileHandler {
      * @inheritdoc
      */
     async isEnabledForCourse(courseId?: number): Promise<boolean> {
-        return CoreUtils.ignoreErrors(CoreGrades.isPluginEnabledForCourse(courseId), false);
+        if (courseId) {
+            return CoreUtils.ignoreErrors(CoreGrades.isPluginEnabledForCourse(courseId), false);
+        } else {
+            return CoreGrades.isCourseGradesEnabled();
+        }
     }
 
     /**
      * @inheritdoc
      */
     async isEnabledForUser(user: CoreUserProfile, courseId?: number): Promise<boolean> {
-        return CoreUtils.promiseWorks(CoreGrades.getCourseGradesTable(courseId!, user.id));
+        if (courseId) {
+            return CoreUtils.promiseWorks(CoreGrades.getCourseGradesTable(courseId, user.id));
+        }
+
+        // All course grades only available for the current user.
+        return user.id == CoreSites.getCurrentSiteUserId();
     }
 
     /**
      * @inheritdoc
      */
-    getDisplayData(): CoreUserProfileHandlerData {
-        return {
-            icon: 'fas-chart-bar',
-            title: 'core.grades.grades',
-            class: 'core-grades-user-handler',
-            action: (event, user, courseId): void => {
-                event.preventDefault();
-                event.stopPropagation();
-                CoreNavigator.navigateToSitePath(`/user-grades/${courseId}`, {
-                    params: { userId: user.id },
-                });
-            },
-        };
+    getDisplayData(user: CoreUserProfile, courseId?: number): CoreUserProfileHandlerData {
+        if (courseId) {
+            return {
+                icon: 'fas-chart-bar',
+                title: 'core.grades.grades',
+                class: 'core-grades-user-handler',
+                action: (event, user, courseId): void => {
+                    event.preventDefault();
+                    event.stopPropagation();
+                    CoreNavigator.navigateToSitePath(`/user-grades/${courseId}`, {
+                        params: { userId: user.id },
+                    });
+                },
+            };
+        } else {
+            return {
+                icon: 'fas-chart-bar',
+                title: 'core.grades.grades',
+                class: 'core-grades-coursesgrades-handler',
+                action: (event): void => {
+                    event.preventDefault();
+                    event.stopPropagation();
+                    CoreNavigator.navigateToSitePath(CoreGradesUserHandlerService.PAGE_NAME);
+                },
+            };
+        }
     }
 
 }

From 434a2a90f201dbe1afefcf651d7f6475b8157705 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 21 Oct 2021 15:06:45 +0200
Subject: [PATCH 0172/1008] MOBILE-3807 core: Add user menu button to all level
 1 pages

---
 src/addons/blog/blog-lazy.module.ts           |  2 ++
 src/addons/blog/pages/entries/entries.html    |  4 +++-
 src/addons/calendar/pages/index/index.html    |  1 +
 .../calendar/pages/index/index.module.ts      |  2 ++
 .../pages/discussions-35/discussions.html     |  1 +
 .../discussions-35/discussions.module.ts      |  2 ++
 .../group-conversations.html                  |  1 +
 .../group-conversations.module.ts             |  2 ++
 src/addons/notifications/pages/list/list.html |  3 +++
 .../notifications/pages/list/list.module.ts   |  2 ++
 .../navbar-buttons/navbar-buttons.ts          | 12 +++++++---
 .../components/user-avatar/user-avatar.scss   |  8 ++++++-
 .../courses/pages/dashboard/dashboard.html    |  2 +-
 .../features/courses/pages/list/list.html     | 22 +++++++++----------
 .../courses/pages/list/list.module.ts         |  2 ++
 .../features/mainmenu/pages/home/home.html    |  1 +
 .../mainmenu/pages/home/home.module.ts        |  2 ++
 .../features/sitehome/pages/index/index.html  |  2 +-
 .../features/tag/pages/search/search.html     |  3 +++
 .../tag/pages/search/search.page.module.ts    |  2 ++
 src/theme/theme.base.scss                     |  3 ++-
 21 files changed, 60 insertions(+), 19 deletions(-)

diff --git a/src/addons/blog/blog-lazy.module.ts b/src/addons/blog/blog-lazy.module.ts
index 5fab11220..2bd801405 100644
--- a/src/addons/blog/blog-lazy.module.ts
+++ b/src/addons/blog/blog-lazy.module.ts
@@ -22,6 +22,7 @@ import { CoreCommentsComponentsModule } from '@features/comments/components/comp
 import { CoreTagComponentsModule } from '@features/tag/components/components.module';
 import { buildTabMainRoutes } from '@features/mainmenu/mainmenu-tab-routing.module';
 import { AddonBlogMainMenuHandlerService } from './services/handlers/mainmenu';
+import { CoreMainMenuComponentsModule } from '@features/mainmenu/components/components.module';
 
 function buildRoutes(injector: Injector): Routes {
     return [
@@ -39,6 +40,7 @@ function buildRoutes(injector: Injector): Routes {
         CoreSharedModule,
         CoreCommentsComponentsModule,
         CoreTagComponentsModule,
+        CoreMainMenuComponentsModule,
     ],
     exports: [RouterModule],
     providers: [
diff --git a/src/addons/blog/pages/entries/entries.html b/src/addons/blog/pages/entries/entries.html
index 6dd13b87c..60d027fcb 100644
--- a/src/addons/blog/pages/entries/entries.html
+++ b/src/addons/blog/pages/entries/entries.html
@@ -4,7 +4,9 @@
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
         <h1>{{ title | translate }}</h1>
-        <ion-buttons slot="end"></ion-buttons>
+        <ion-buttons slot="end">
+            <core-user-menu-button></core-user-menu-button>
+        </ion-buttons>
     </ion-toolbar>
 </ion-header>
 <ion-content>
diff --git a/src/addons/calendar/pages/index/index.html b/src/addons/calendar/pages/index/index.html
index 1533cc434..b67f85700 100644
--- a/src/addons/calendar/pages/index/index.html
+++ b/src/addons/calendar/pages/index/index.html
@@ -22,6 +22,7 @@
                 [content]="'core.settings.synchronizenow' | translate" (action)="doRefresh(undefined, $event, true)"
                 [iconAction]="syncIcon" [closeOnClick]="false"></core-context-menu-item>
             </core-context-menu>
+            <core-user-menu-button></core-user-menu-button>
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
diff --git a/src/addons/calendar/pages/index/index.module.ts b/src/addons/calendar/pages/index/index.module.ts
index be80e63e6..0ecbc7b6e 100644
--- a/src/addons/calendar/pages/index/index.module.ts
+++ b/src/addons/calendar/pages/index/index.module.ts
@@ -19,6 +19,7 @@ import { CoreSharedModule } from '@/core/shared.module';
 import { AddonCalendarComponentsModule } from '../../components/components.module';
 
 import { AddonCalendarIndexPage } from './index.page';
+import { CoreMainMenuComponentsModule } from '@features/mainmenu/components/components.module';
 
 const routes: Routes = [
     {
@@ -32,6 +33,7 @@ const routes: Routes = [
         RouterModule.forChild(routes),
         CoreSharedModule,
         AddonCalendarComponentsModule,
+        CoreMainMenuComponentsModule,
     ],
     declarations: [
         AddonCalendarIndexPage,
diff --git a/src/addons/messages/pages/discussions-35/discussions.html b/src/addons/messages/pages/discussions-35/discussions.html
index 5c0b2b5e3..8824fe578 100644
--- a/src/addons/messages/pages/discussions-35/discussions.html
+++ b/src/addons/messages/pages/discussions-35/discussions.html
@@ -5,6 +5,7 @@
         </ion-buttons>
         <h1>{{ 'addon.messages.messages' | translate }}</h1>
         <ion-buttons slot="end">
+            <core-user-menu-button></core-user-menu-button>
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
diff --git a/src/addons/messages/pages/discussions-35/discussions.module.ts b/src/addons/messages/pages/discussions-35/discussions.module.ts
index 15ec2604e..f26263d62 100644
--- a/src/addons/messages/pages/discussions-35/discussions.module.ts
+++ b/src/addons/messages/pages/discussions-35/discussions.module.ts
@@ -23,6 +23,7 @@ import { CoreSearchComponentsModule } from '@features/search/components/componen
 
 import { AddonMessagesDiscussions35Page } from './discussions.page';
 import { AddonMessagesMainMenuHandlerService } from '@addons/messages/services/handlers/mainmenu';
+import { CoreMainMenuComponentsModule } from '@features/mainmenu/components/components.module';
 
 const mobileRoutes: Routes = [
     {
@@ -58,6 +59,7 @@ const routes: Routes = [
         RouterModule.forChild(routes),
         CoreSharedModule,
         CoreSearchComponentsModule,
+        CoreMainMenuComponentsModule,
     ],
     declarations: [
         AddonMessagesDiscussions35Page,
diff --git a/src/addons/messages/pages/group-conversations/group-conversations.html b/src/addons/messages/pages/group-conversations/group-conversations.html
index 7d02aa119..d55475d6c 100644
--- a/src/addons/messages/pages/group-conversations/group-conversations.html
+++ b/src/addons/messages/pages/group-conversations/group-conversations.html
@@ -11,6 +11,7 @@
             <ion-button (click)="gotoSettings()" [attr.aria-label]="'addon.messages.messagepreferences' | translate">
                 <ion-icon name="fas-cog" slot="icon-only" aria-hidden="true"></ion-icon>
             </ion-button>
+            <core-user-menu-button></core-user-menu-button>
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
diff --git a/src/addons/messages/pages/group-conversations/group-conversations.module.ts b/src/addons/messages/pages/group-conversations/group-conversations.module.ts
index a4390583e..8fbcc9bae 100644
--- a/src/addons/messages/pages/group-conversations/group-conversations.module.ts
+++ b/src/addons/messages/pages/group-conversations/group-conversations.module.ts
@@ -22,6 +22,7 @@ import { CoreSharedModule } from '@/core/shared.module';
 
 import { AddonMessagesGroupConversationsPage } from './group-conversations.page';
 import { AddonMessagesMainMenuHandlerService } from '@addons/messages/services/handlers/mainmenu';
+import { CoreMainMenuComponentsModule } from '@features/mainmenu/components/components.module';
 
 const mobileRoutes: Routes = [
     {
@@ -56,6 +57,7 @@ const routes: Routes = [
     imports: [
         RouterModule.forChild(routes),
         CoreSharedModule,
+        CoreMainMenuComponentsModule,
     ],
     declarations: [
         AddonMessagesGroupConversationsPage,
diff --git a/src/addons/notifications/pages/list/list.html b/src/addons/notifications/pages/list/list.html
index aa11a1300..2863ef416 100644
--- a/src/addons/notifications/pages/list/list.html
+++ b/src/addons/notifications/pages/list/list.html
@@ -4,6 +4,9 @@
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
         <h1>{{ 'addon.notifications.notifications' | translate }}</h1>
+        <ion-buttons slot="end">
+            <core-user-menu-button></core-user-menu-button>
+        </ion-buttons>
     </ion-toolbar>
 </ion-header>
 <ion-content>
diff --git a/src/addons/notifications/pages/list/list.module.ts b/src/addons/notifications/pages/list/list.module.ts
index 5a4f6144d..b592079e7 100644
--- a/src/addons/notifications/pages/list/list.module.ts
+++ b/src/addons/notifications/pages/list/list.module.ts
@@ -18,6 +18,7 @@ import { RouterModule, Routes } from '@angular/router';
 import { CoreSharedModule } from '@/core/shared.module';
 import { AddonNotificationsComponentsModule } from '../../components/components.module';
 import { AddonNotificationsListPage } from './list';
+import { CoreMainMenuComponentsModule } from '@features/mainmenu/components/components.module';
 
 const routes: Routes = [
     {
@@ -31,6 +32,7 @@ const routes: Routes = [
         RouterModule.forChild(routes),
         CoreSharedModule,
         AddonNotificationsComponentsModule,
+        CoreMainMenuComponentsModule,
     ],
     declarations: [
         AddonNotificationsListPage,
diff --git a/src/core/components/navbar-buttons/navbar-buttons.ts b/src/core/components/navbar-buttons/navbar-buttons.ts
index 39b69167e..48439908e 100644
--- a/src/core/components/navbar-buttons/navbar-buttons.ts
+++ b/src/core/components/navbar-buttons/navbar-buttons.ts
@@ -56,7 +56,7 @@ const BUTTON_HIDDEN_CLASS = 'core-navbar-button-hidden';
 })
 export class CoreNavBarButtonsComponent implements OnInit, OnDestroy {
 
-    @ViewChild('contextMenuContainer', { read: ViewContainerRef }) container?: ViewContainerRef;
+    @ViewChild('contextMenuContainer', { read: ViewContainerRef }) container!: ViewContainerRef;
 
     // If the hidden input is true, hide all buttons.
     // eslint-disable-next-line @angular-eslint/no-input-rename
@@ -113,7 +113,13 @@ export class CoreNavBarButtonsComponent implements OnInit, OnDestroy {
 
                     // Make sure that context-menu is always at the end of buttons if any.
                     const contextMenu = buttonsContainer.querySelector('core-context-menu');
-                    contextMenu?.parentElement?.appendChild(contextMenu);
+                    const userMenu = buttonsContainer.querySelector('core-user-menu-button');
+
+                    if (userMenu) {
+                        contextMenu?.parentElement?.insertBefore(contextMenu, userMenu);
+                    } else {
+                        contextMenu?.parentElement?.appendChild(contextMenu);
+                    }
                 } else {
                     this.logger.warn('The header was found, but it didn\'t have the right ion-buttons.', selector);
                 }
@@ -177,7 +183,7 @@ export class CoreNavBarButtonsComponent implements OnInit, OnDestroy {
      */
     protected createMainContextMenu(): CoreContextMenuComponent {
         const factory = this.factoryResolver.resolveComponentFactory(CoreContextMenuComponent);
-        const componentRef = this.container!.createComponent<CoreContextMenuComponent>(factory);
+        const componentRef = this.container.createComponent<CoreContextMenuComponent>(factory);
 
         this.createdMainContextMenuElement = componentRef.location.nativeElement;
 
diff --git a/src/core/components/user-avatar/user-avatar.scss b/src/core/components/user-avatar/user-avatar.scss
index 5d99ba41d..f0e1ff20d 100644
--- a/src/core/components/user-avatar/user-avatar.scss
+++ b/src/core/components/user-avatar/user-avatar.scss
@@ -36,13 +36,19 @@
             content: "";
         }
     }
-    &.core-bar-button-image img {
+    &.core-bar-button-image {
         padding: 0;
         width: var(--core-header-toolbar-button-image-size);
         height: var(--core-header-toolbar-button-image-size);
         max-width: var(--core-header-toolbar-button-image-size);
         max-height: var(--core-header-toolbar-button-image-size);
         border-radius: 50%;
+        display: block;
+        
+        img {
+            padding: 4px;
+            border-radius: 50%;
+        }
     }
 
     .contact-status {
diff --git a/src/core/features/courses/pages/dashboard/dashboard.html b/src/core/features/courses/pages/dashboard/dashboard.html
index c4315e7d1..c79854f7a 100644
--- a/src/core/features/courses/pages/dashboard/dashboard.html
+++ b/src/core/features/courses/pages/dashboard/dashboard.html
@@ -1,4 +1,4 @@
-<core-navbar-buttons slot="end">
+<core-navbar-buttons slot="end" prepend>
     <ion-button *ngIf="searchEnabled" (click)="openSearch()" [attr.aria-label]="'core.courses.searchcourses' | translate">
         <ion-icon name="fas-search" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
diff --git a/src/core/features/courses/pages/list/list.html b/src/core/features/courses/pages/list/list.html
index 114a5a78b..ffb6b4b22 100644
--- a/src/core/features/courses/pages/list/list.html
+++ b/src/core/features/courses/pages/list/list.html
@@ -5,20 +5,20 @@
         </ion-buttons>
         <h1 *ngIf="!showOnlyEnrolled">{{ 'core.courses.availablecourses' | translate }}</h1>
         <h1 *ngIf="showOnlyEnrolled">{{ 'core.courses.mycourses' | translate }}</h1>
-        <ion-buttons slot="end"></ion-buttons>
+        <ion-buttons slot="end">
+            <core-context-menu>
+                <core-context-menu-item *ngIf="downloadCourseEnabled || downloadCoursesEnabled" [priority]="1000"
+                    [content]="'core.settings.showdownloadoptions' | translate" (action)="toggleDownload()"
+                    iconAction="toggle" [(toggle)]="downloadEnabled"></core-context-menu-item>
+                <core-context-menu-item [priority]="900"
+                    [content]="'core.courses.showonlyenrolled' | translate" (action)="toggleEnrolled()"
+                    iconAction="toggle" [(toggle)]="showOnlyEnrolled"></core-context-menu-item>   
+            </core-context-menu>
+            <core-user-menu-button></core-user-menu-button>
+        </ion-buttons>
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <core-navbar-buttons slot="end">
-        <core-context-menu>
-            <core-context-menu-item *ngIf="downloadCourseEnabled || downloadCoursesEnabled" [priority]="1000"
-                [content]="'core.settings.showdownloadoptions' | translate" (action)="toggleDownload()"
-                iconAction="toggle" [(toggle)]="downloadEnabled"></core-context-menu-item>
-            <core-context-menu-item [priority]="900"
-                [content]="'core.courses.showonlyenrolled' | translate" (action)="toggleEnrolled()"
-                iconAction="toggle" [(toggle)]="showOnlyEnrolled"></core-context-menu-item>   
-        </core-context-menu>
-    </core-navbar-buttons>
     <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="refreshCourses($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
diff --git a/src/core/features/courses/pages/list/list.module.ts b/src/core/features/courses/pages/list/list.module.ts
index c0d3a2c36..23dd52438 100644
--- a/src/core/features/courses/pages/list/list.module.ts
+++ b/src/core/features/courses/pages/list/list.module.ts
@@ -20,6 +20,7 @@ import { CoreCoursesComponentsModule } from '../../components/components.module'
 import { CoreSearchComponentsModule } from '@features/search/components/components.module';
 
 import { CoreCoursesListPage } from './list';
+import { CoreMainMenuComponentsModule } from '@features/mainmenu/components/components.module';
 
 const routes: Routes = [
     {
@@ -34,6 +35,7 @@ const routes: Routes = [
         CoreSharedModule,
         CoreCoursesComponentsModule,
         CoreSearchComponentsModule,
+        CoreMainMenuComponentsModule,
     ],
     declarations: [
         CoreCoursesListPage,
diff --git a/src/core/features/mainmenu/pages/home/home.html b/src/core/features/mainmenu/pages/home/home.html
index 903bcb8ff..e953b24c2 100644
--- a/src/core/features/mainmenu/pages/home/home.html
+++ b/src/core/features/mainmenu/pages/home/home.html
@@ -8,6 +8,7 @@
             <img src="assets/img/top_logo.png" class="core-header-logo" [alt]="siteName">
         </h1>
         <ion-buttons slot="end">
+            <core-user-menu-button></core-user-menu-button>
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
diff --git a/src/core/features/mainmenu/pages/home/home.module.ts b/src/core/features/mainmenu/pages/home/home.module.ts
index c60828634..7dcde146c 100644
--- a/src/core/features/mainmenu/pages/home/home.module.ts
+++ b/src/core/features/mainmenu/pages/home/home.module.ts
@@ -22,6 +22,7 @@ import { CoreMainMenuHomePage } from './home';
 import { MAIN_MENU_HOME_ROUTES } from './home-routing.module';
 import { buildTabMainRoutes } from '@features/mainmenu/mainmenu-tab-routing.module';
 import { CoreMainMenuHomeHandlerService } from '@features/mainmenu/services/handlers/mainmenu';
+import { CoreMainMenuComponentsModule } from '@features/mainmenu/components/components.module';
 
 function buildRoutes(injector: Injector): Routes {
     const routes = resolveModuleRoutes(injector, MAIN_MENU_HOME_ROUTES);
@@ -42,6 +43,7 @@ function buildRoutes(injector: Injector): Routes {
 @NgModule({
     imports: [
         CoreSharedModule,
+        CoreMainMenuComponentsModule,
     ],
     providers: [
         { provide: ROUTES, multi: true, useFactory: buildRoutes, deps: [Injector] },
diff --git a/src/core/features/sitehome/pages/index/index.html b/src/core/features/sitehome/pages/index/index.html
index 4dd2ce8d5..f96e2ea06 100644
--- a/src/core/features/sitehome/pages/index/index.html
+++ b/src/core/features/sitehome/pages/index/index.html
@@ -1,4 +1,4 @@
-<core-navbar-buttons slot="end">
+<core-navbar-buttons slot="end" prepend>
     <ion-button *ngIf="searchEnabled" (click)="openSearch()" [attr.aria-label]="'core.courses.searchcourses' | translate">
         <ion-icon name="fas-search" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
diff --git a/src/core/features/tag/pages/search/search.html b/src/core/features/tag/pages/search/search.html
index 5afa3e371..1f6ff37a9 100644
--- a/src/core/features/tag/pages/search/search.html
+++ b/src/core/features/tag/pages/search/search.html
@@ -4,6 +4,9 @@
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
         <h1>{{ 'core.tag.searchtags' | translate }}</h1>
+        <ion-buttons slot="end">
+            <core-user-menu-button></core-user-menu-button>
+        </ion-buttons>
     </ion-toolbar>
 </ion-header>
 <ion-content>
diff --git a/src/core/features/tag/pages/search/search.page.module.ts b/src/core/features/tag/pages/search/search.page.module.ts
index 3da4821d2..5519cb3ac 100644
--- a/src/core/features/tag/pages/search/search.page.module.ts
+++ b/src/core/features/tag/pages/search/search.page.module.ts
@@ -19,6 +19,7 @@ import { CoreSharedModule } from '@/core/shared.module';
 import { CoreSearchComponentsModule } from '@features/search/components/components.module';
 
 import { CoreTagSearchPage } from './search.page';
+import { CoreMainMenuComponentsModule } from '@features/mainmenu/components/components.module';
 
 const routes: Routes = [
     {
@@ -34,6 +35,7 @@ const routes: Routes = [
         RouterModule.forChild(routes),
         CoreSharedModule,
         CoreSearchComponentsModule,
+        CoreMainMenuComponentsModule,
     ],
     exports: [RouterModule],
 })
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index c040c18d3..f202afd2d 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -655,12 +655,13 @@ ion-card ion-item:only-child {
 
 ion-toolbar h1 img.core-bar-button-image,
 ion-toolbar h1 .core-bar-button-image img {
-    padding: 0;
+    padding: 4px;
     width: var(--core-header-toolbar-button-image-size);
     height: var(--core-header-toolbar-button-image-size);
     max-width: var(--core-header-toolbar-button-image-size);
     max-height: var(--core-header-toolbar-button-image-size);
     border-radius: 50%;
+    display: block;
 }
 
 // Action sheet.

From 0bbfb898d1c59508c201ec0e9b5ca6efb8e757a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 21 Oct 2021 15:44:53 +0200
Subject: [PATCH 0173/1008] MOBILE-3807 user: Edit avatar only from details

---
 .../components/user-menu/user-menu.scss       |   1 -
 src/core/features/user/pages/about/about.html |  21 ++-
 .../features/user/pages/about/about.page.ts   | 169 ++++++++++++++++--
 src/core/features/user/pages/about/about.scss |  44 +++++
 .../features/user/pages/profile/profile.html  |  12 +-
 .../user/pages/profile/profile.page.ts        | 125 +------------
 .../features/user/pages/profile/profile.scss  |  15 --
 7 files changed, 225 insertions(+), 162 deletions(-)
 create mode 100644 src/core/features/user/pages/about/about.scss

diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.scss b/src/core/features/mainmenu/components/user-menu/user-menu.scss
index 7466e6dd8..e6d9fd3fd 100644
--- a/src/core/features/mainmenu/components/user-menu/user-menu.scss
+++ b/src/core/features/mainmenu/components/user-menu/user-menu.scss
@@ -18,7 +18,6 @@
     }
 }
 
-
 @if ($core-user-hide-siteinfo) {
     .core-usermenu-siteinfo {
         display: none;
diff --git a/src/core/features/user/pages/about/about.html b/src/core/features/user/pages/about/about.html
index fb08137f1..b37d038f4 100644
--- a/src/core/features/user/pages/about/about.html
+++ b/src/core/features/user/pages/about/about.html
@@ -3,7 +3,7 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1 *ngIf="title">{{ title }}</h1>
+        <h1>{{ 'core.user.details' | translate }}</h1>
     </ion-toolbar>
 </ion-header>
 <ion-content>
@@ -12,6 +12,25 @@
     </ion-refresher>
     <core-loading [hideUntil]="userLoaded">
         <ion-list *ngIf="user">
+            <ion-item class="ion-text-center core-user-profile-maininfo">
+                <core-user-avatar [user]="user" [userId]="user.id" [linkProfile]="false" [checkOnline]="true">
+                        <ion-button
+                            class="edit-avatar"
+                            *ngIf="canChangeProfilePicture"
+                            (click)="changeProfilePicture()"
+                            [attr.aria-label]="'core.user.newpicture' | translate"
+                            fill="clear"
+                            color="dark"
+                        >
+                        <ion-icon slot="icon-only" name="fas-pen" aria-hidden="true"></ion-icon>
+                    </ion-button>
+                </core-user-avatar>
+                <ion-label>
+                    <h2>{{ user.fullname }}</h2>
+                    <p *ngIf="user.address"><ion-icon name="fas-map-marker-alt" [attr.aria-hidden]="true"></ion-icon> {{ user.address }}</p>
+                </ion-label>
+            </ion-item>
+
             <ion-item-group *ngIf="hasContact">
                 <ion-item-divider><ion-label><h2>{{ 'core.user.contact' | translate}}</h2></ion-label></ion-item-divider>
                 <ion-item class="ion-text-wrap" *ngIf="user.email">
diff --git a/src/core/features/user/pages/about/about.page.ts b/src/core/features/user/pages/about/about.page.ts
index 2c3e5808f..33bbdb8f9 100644
--- a/src/core/features/user/pages/about/about.page.ts
+++ b/src/core/features/user/pages/about/about.page.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, OnInit } from '@angular/core';
+import { Component, OnDestroy, OnInit } from '@angular/core';
 import { SafeUrl } from '@angular/platform-browser';
 import { IonRefresher } from '@ionic/angular';
 
@@ -20,10 +20,15 @@ import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreUtils } from '@services/utils/utils';
-import { CoreEvents } from '@singletons/events';
+import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreUser, CoreUserProfile, CoreUserProvider } from '@features/user/services/user';
 import { CoreUserHelper } from '@features/user/services/user-helper';
 import { CoreNavigator } from '@services/navigator';
+import { CoreIonLoadingElement } from '@classes/ion-loading';
+import { CoreSite } from '@classes/site';
+import { CoreFileUploaderHelper } from '@features/fileuploader/services/fileuploader-helper';
+import { CoreMimetypeUtils } from '@services/utils/mimetype';
+import { Translate } from '@singletons';
 
 /**
  * Page that displays info about a user.
@@ -31,11 +36,9 @@ import { CoreNavigator } from '@services/navigator';
 @Component({
     selector: 'page-core-user-about',
     templateUrl: 'about.html',
+    styleUrls: ['about.scss'],
 })
-export class CoreUserAboutPage implements OnInit {
-
-    protected userId!: number;
-    protected siteId: string;
+export class CoreUserAboutPage implements OnInit, OnDestroy {
 
     courseId!: number;
     userLoaded = false;
@@ -45,20 +48,46 @@ export class CoreUserAboutPage implements OnInit {
     title?: string;
     formattedAddress?: string;
     encodedAddress?: SafeUrl;
+    canChangeProfilePicture = false;
+
+    protected userId!: number;
+    protected site!: CoreSite;
+    protected obsProfileRefreshed?: CoreEventObserver;
 
     constructor() {
-        this.siteId = CoreSites.getCurrentSiteId();
+        try {
+            this.site = CoreSites.getRequiredCurrentSite();
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+            CoreNavigator.back();
+
+            return;
+        }
+
+        this.obsProfileRefreshed = CoreEvents.on(CoreUserProvider.PROFILE_REFRESHED, (data) => {
+            if (!this.user || !data.user) {
+                return;
+            }
+
+            this.user.email = data.user.email;
+            this.user.address = CoreUserHelper.formatAddress('', data.user.city, data.user.country);
+        }, CoreSites.getCurrentSiteId());
     }
 
     /**
-     * On init.
-     *
-     * @return Promise resolved when done.
+     * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
         this.userId = CoreNavigator.getRouteNumberParam('userId') || 0;
         this.courseId = CoreNavigator.getRouteNumberParam('courseId') || 0;
 
+        // Allow to change the profile image only in the app profile page.
+        this.canChangeProfilePicture =
+            !this.courseId &&
+            this.userId == this.site.getUserId() &&
+            this.site.canUploadFiles() &&
+            !CoreUser.isUpdatePictureDisabledInSite(this.site);
+
         this.fetchUser().finally(() => {
             this.userLoaded = true;
         });
@@ -83,11 +112,85 @@ export class CoreUserAboutPage implements OnInit {
 
             this.user = user;
             this.title = user.fullname;
+
+            this.user.address = CoreUserHelper.formatAddress('', user.city, user.country);
+
+            await this.checkUserImageUpdated();
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'core.user.errorloaduser', true);
         }
     }
 
+    /**
+     * Check if current user image has changed.
+     *
+     * @return Promise resolved when done.
+     */
+    protected async checkUserImageUpdated(): Promise<void> {
+        if (!this.site || !this.site.getInfo() || !this.user) {
+            return;
+        }
+
+        if (this.userId != this.site.getUserId() || !this.isUserAvatarDirty()) {
+            // Not current user or hasn't changed.
+            return;
+        }
+
+        // The current user image received is different than the one stored in site info. Assume the image was updated.
+        // Update the site info to get the right avatar in there.
+        try {
+            await CoreSites.updateSiteInfo(this.site.getId());
+        } catch {
+            // Cannot update site info. Assume the profile image is the right one.
+            CoreEvents.trigger(CoreUserProvider.PROFILE_PICTURE_UPDATED, {
+                userId: this.userId,
+                picture: this.user.profileimageurl,
+            }, this.site.getId());
+        }
+
+        if (this.isUserAvatarDirty()) {
+            // The image is still different, this means that the good one is the one in site info.
+            await this.refreshUser();
+        } else {
+            // Now they're the same, send event to use the right avatar in the rest of the app.
+            CoreEvents.trigger(CoreUserProvider.PROFILE_PICTURE_UPDATED, {
+                userId: this.userId,
+                picture: this.user.profileimageurl,
+            }, this.site.getId());
+        }
+    }
+
+    /**
+     * Opens dialog to change profile picture.
+     */
+    async changeProfilePicture(): Promise<void> {
+        const maxSize = -1;
+        const title = Translate.instant('core.user.newpicture');
+        const mimetypes = CoreMimetypeUtils.getGroupMimeInfo('image', 'mimetypes');
+        let modal: CoreIonLoadingElement | undefined;
+
+        try {
+            const result = await CoreFileUploaderHelper.selectAndUploadFile(maxSize, title, mimetypes);
+
+            modal = await CoreDomUtils.showModalLoading('core.sending', true);
+
+            const profileImageURL = await CoreUser.changeProfilePicture(result.itemid, this.userId, this.site.getId());
+
+            CoreEvents.trigger(CoreUserProvider.PROFILE_PICTURE_UPDATED, {
+                userId: this.userId,
+                picture: profileImageURL,
+            }, this.site.getId());
+
+            CoreSites.updateSiteInfo(this.site.getId());
+
+            this.refreshUser();
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+        } finally {
+            modal?.dismiss();
+        }
+    }
+
     /**
      * Refresh the user data.
      *
@@ -106,8 +209,52 @@ export class CoreUserAboutPage implements OnInit {
                 courseId: this.courseId,
                 userId: this.userId,
                 user: this.user,
-            }, this.siteId);
+            }, this.site.getId());
         }
     }
 
+    /**
+     * Check whether the user avatar is not up to date with site info.
+     *
+     * @return Whether the user avatar differs from site info cache.
+     */
+    protected isUserAvatarDirty(): boolean {
+        if (!this.user || !this.site) {
+            return false;
+        }
+
+        const courseAvatarUrl = this.normalizeAvatarUrl(this.user.profileimageurl);
+        const siteAvatarUrl = this.normalizeAvatarUrl(this.site.getInfo()?.userpictureurl);
+
+        return courseAvatarUrl !== siteAvatarUrl;
+    }
+
+    /**
+     * Normalize an avatar url regardless of theme.
+     *
+     * Given that the default image is the only one that can be changed per theme, any other url will stay the same. Note that
+     * the values returned by this function may not be valid urls, given that they are intended for string comparison.
+     *
+     * @param avatarUrl Avatar url.
+     * @return Normalized avatar string (may not be a valid url).
+     */
+    protected normalizeAvatarUrl(avatarUrl?: string): string {
+        if (!avatarUrl) {
+            return 'undefined';
+        }
+
+        if (avatarUrl.startsWith(`${this.site?.siteUrl}/theme/image.php`)) {
+            return 'default';
+        }
+
+        return avatarUrl;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    ngOnDestroy(): void {
+        this.obsProfileRefreshed?.off();
+    }
+
 }
diff --git a/src/core/features/user/pages/about/about.scss b/src/core/features/user/pages/about/about.scss
new file mode 100644
index 000000000..c5c1284cb
--- /dev/null
+++ b/src/core/features/user/pages/about/about.scss
@@ -0,0 +1,44 @@
+:host {
+
+    .core-user-profile-maininfo::part(native) {
+        flex-direction: column;
+    }
+    ::ng-deep {
+        core-user-avatar {
+            display: block;
+            --core-avatar-size: var(--core-large-avatar-size);
+            height: calc(var(--core-avatar-size) + 16px);
+
+            img {
+                margin: 8px auto;
+            }
+
+            .contact-status {
+                width: 24px !important;
+                height: 24px !important;
+                right: calc(50% - 12px -  var(--core-avatar-size) / 2) !important;
+            }
+
+            .edit-avatar {
+                position: absolute;
+                right: calc(50% - 15px -  var(--core-avatar-size) / 2);
+                bottom: -12px;
+
+                :host-context([dir="rtl"]) & {
+                    left: 0;
+                    right: unset;
+                }
+                &::part(native) {
+                    border-radius: 50%;
+                    background: var(--ion-item-background);
+                }
+            }
+        }
+    }
+
+}
+
+:host-context([dir="rtl"]) ::ng-deep core-user-avatar .edit-avatar {
+    left: -24px;
+    right: unset;
+}
diff --git a/src/core/features/user/pages/profile/profile.html b/src/core/features/user/pages/profile/profile.html
index 2bedd26e5..a5c7112e8 100644
--- a/src/core/features/user/pages/profile/profile.html
+++ b/src/core/features/user/pages/profile/profile.html
@@ -14,20 +14,10 @@
         <ion-list *ngIf="user && !isDeleted && isEnrolled">
             <ion-item class="ion-text-center core-user-profile-maininfo">
                 <core-user-avatar [user]="user" [userId]="user.id" [linkProfile]="false" [checkOnline]="true">
-                    <ion-button
-                        class="edit-avatar"
-                        *ngIf="canChangeProfilePicture"
-                        (click)="changeProfilePicture()"
-                        [attr.aria-label]="'core.user.newpicture' | translate"
-                        fill="clear"
-                        color="dark"
-                    >
-                        <ion-icon slot="icon-only" name="fas-pen" aria-hidden="true"></ion-icon>
-                    </ion-button>
                 </core-user-avatar>
                 <ion-label>
                     <h2>{{ user.fullname }}</h2>
-                    <p *ngIf="user.address">{{ user.address }}</p>
+                    <p *ngIf="user.address"><ion-icon name="fas-map-marker-alt" [attr.aria-hidden]="true"></ion-icon> {{ user.address }}</p>
                     <p *ngIf="rolesFormatted" class="ion-text-wrap">
                         <strong>{{ 'core.user.roles' | translate}}</strong>{{'core.labelsep' | translate}}
                         {{ rolesFormatted }}
diff --git a/src/core/features/user/pages/profile/profile.page.ts b/src/core/features/user/pages/profile/profile.page.ts
index 6e0f72013..d8ffe46e4 100644
--- a/src/core/features/user/pages/profile/profile.page.ts
+++ b/src/core/features/user/pages/profile/profile.page.ts
@@ -19,8 +19,6 @@ import { Subscription } from 'rxjs';
 import { CoreSite } from '@classes/site';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
-import { CoreMimetypeUtils } from '@services/utils/mimetype';
-import { Translate } from '@singletons';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import {
     CoreUser,
@@ -29,8 +27,6 @@ import {
 } from '@features/user/services/user';
 import { CoreUserHelper } from '@features/user/services/user-helper';
 import { CoreUserDelegate, CoreUserDelegateService, CoreUserProfileHandlerData } from '@features/user/services/user-delegate';
-import { CoreFileUploaderHelper } from '@features/fileuploader/services/fileuploader-helper';
-import { CoreIonLoadingElement } from '@classes/ion-loading';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreNavigator } from '@services/navigator';
 import { CoreCourses } from '@features/courses/services/courses';
@@ -54,7 +50,6 @@ export class CoreUserProfilePage implements OnInit, OnDestroy {
     title?: string;
     isDeleted = false;
     isEnrolled = true;
-    canChangeProfilePicture = false;
     rolesFormatted?: string;
     actionHandlers: CoreUserProfileHandlerData[] = [];
     newPageHandlers: CoreUserProfileHandlerData[] = [];
@@ -72,7 +67,7 @@ export class CoreUserProfilePage implements OnInit, OnDestroy {
     }
 
     /**
-     * On init.
+     * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
         try {
@@ -91,13 +86,6 @@ export class CoreUserProfilePage implements OnInit, OnDestroy {
             this.courseId = undefined;
         }
 
-        // Allow to change the profile image only in the app profile page.
-        this.canChangeProfilePicture =
-            !this.courseId &&
-            this.userId == this.site.getUserId() &&
-            this.site.canUploadFiles() &&
-            !CoreUser.isUpdatePictureDisabledInSite(this.site);
-
         try {
             await this.fetchUser();
 
@@ -154,84 +142,12 @@ export class CoreUserProfilePage implements OnInit, OnDestroy {
                 this.isLoadingHandlers = !CoreUserDelegate.areHandlersLoaded(user.id);
             });
 
-            await this.checkUserImageUpdated();
-
         } catch (error) {
             // Error is null for deleted users, do not show the modal.
             CoreDomUtils.showErrorModal(error);
         }
     }
 
-    /**
-     * Check if current user image has changed.
-     *
-     * @return Promise resolved when done.
-     */
-    protected async checkUserImageUpdated(): Promise<void> {
-        if (!this.site || !this.site.getInfo() || !this.user) {
-            return;
-        }
-
-        if (this.userId != this.site.getUserId() || !this.isUserAvatarDirty()) {
-            // Not current user or hasn't changed.
-            return;
-        }
-
-        // The current user image received is different than the one stored in site info. Assume the image was updated.
-        // Update the site info to get the right avatar in there.
-        try {
-            await CoreSites.updateSiteInfo(this.site.getId());
-        } catch {
-            // Cannot update site info. Assume the profile image is the right one.
-            CoreEvents.trigger(CoreUserProvider.PROFILE_PICTURE_UPDATED, {
-                userId: this.userId,
-                picture: this.user.profileimageurl,
-            }, this.site.getId());
-        }
-
-        if (this.isUserAvatarDirty()) {
-            // The image is still different, this means that the good one is the one in site info.
-            await this.refreshUser();
-        } else {
-            // Now they're the same, send event to use the right avatar in the rest of the app.
-            CoreEvents.trigger(CoreUserProvider.PROFILE_PICTURE_UPDATED, {
-                userId: this.userId,
-                picture: this.user.profileimageurl,
-            }, this.site.getId());
-        }
-    }
-
-    /**
-     * Opens dialog to change profile picture.
-     */
-    async changeProfilePicture(): Promise<void> {
-        const maxSize = -1;
-        const title = Translate.instant('core.user.newpicture');
-        const mimetypes = CoreMimetypeUtils.getGroupMimeInfo('image', 'mimetypes');
-        let modal: CoreIonLoadingElement | undefined;
-
-        try {
-            const result = await CoreFileUploaderHelper.selectAndUploadFile(maxSize, title, mimetypes);
-
-            modal = await CoreDomUtils.showModalLoading('core.sending', true);
-
-            const profileImageURL = await CoreUser.changeProfilePicture(result.itemid, this.userId, this.site.getId());
-
-            CoreEvents.trigger(CoreUserProvider.PROFILE_PICTURE_UPDATED, {
-                userId: this.userId,
-                picture: profileImageURL,
-            }, this.site.getId());
-
-            CoreSites.updateSiteInfo(this.site.getId());
-
-            this.refreshUser();
-        } catch (error) {
-            CoreDomUtils.showErrorModal(error);
-        } finally {
-            modal?.dismiss();
-        }
-    }
-
     /**
      * Refresh the user.
      *
@@ -285,48 +201,11 @@ export class CoreUserProfilePage implements OnInit, OnDestroy {
     }
 
     /**
-     * Page destroyed.
+     * @inheritdoc
      */
     ngOnDestroy(): void {
         this.subscription?.unsubscribe();
         this.obsProfileRefreshed.off();
     }
 
-    /**
-     * Check whether the user avatar is not up to date with site info.
-     *
-     * @return Whether the user avatar differs from site info cache.
-     */
-    private isUserAvatarDirty(): boolean {
-        if (!this.user || !this.site) {
-            return false;
-        }
-
-        const courseAvatarUrl = this.normalizeAvatarUrl(this.user.profileimageurl);
-        const siteAvatarUrl = this.normalizeAvatarUrl(this.site.getInfo()?.userpictureurl);
-
-        return courseAvatarUrl !== siteAvatarUrl;
-    }
-
-    /**
-     * Normalize an avatar url regardless of theme.
-     *
-     * Given that the default image is the only one that can be changed per theme, any other url will stay the same. Note that
-     * the values returned by this function may not be valid urls, given that they are intended for string comparison.
-     *
-     * @param avatarUrl Avatar url.
-     * @return Normalized avatar string (may not be a valid url).
-     */
-    private normalizeAvatarUrl(avatarUrl?: string): string {
-        if (!avatarUrl) {
-            return 'undefined';
-        }
-
-        if (avatarUrl.startsWith(`${this.site?.siteUrl}/theme/image.php`)) {
-            return 'default';
-        }
-
-        return avatarUrl;
-    }
-
 }
diff --git a/src/core/features/user/pages/profile/profile.scss b/src/core/features/user/pages/profile/profile.scss
index c5c1284cb..41723e265 100644
--- a/src/core/features/user/pages/profile/profile.scss
+++ b/src/core/features/user/pages/profile/profile.scss
@@ -18,21 +18,6 @@
                 height: 24px !important;
                 right: calc(50% - 12px -  var(--core-avatar-size) / 2) !important;
             }
-
-            .edit-avatar {
-                position: absolute;
-                right: calc(50% - 15px -  var(--core-avatar-size) / 2);
-                bottom: -12px;
-
-                :host-context([dir="rtl"]) & {
-                    left: 0;
-                    right: unset;
-                }
-                &::part(native) {
-                    border-radius: 50%;
-                    background: var(--ion-item-background);
-                }
-            }
         }
     }
 

From 1adda456c9c38093d9b3706e25b8f6c3d03fb192 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 22 Oct 2021 12:24:05 +0200
Subject: [PATCH 0174/1008] MOBILE-3807 more: Remove unused items on more menu
 and styling

---
 scripts/langindex.json                        |  4 +-
 .../components/user-menu/user-menu.html       | 15 ++--
 .../components/user-menu/user-menu.scss       |  5 ++
 src/core/features/mainmenu/lang.json          |  4 +-
 .../features/mainmenu/pages/more/more.html    | 16 +---
 src/core/features/mainmenu/pages/more/more.ts | 35 +++------
 .../features/settings/pages/site/site.html    | 73 ++++++++-----------
 src/core/features/settings/pages/site/site.ts | 21 ++----
 src/core/features/user/pages/about/about.html |  2 +-
 src/core/lang.json                            |  2 +-
 src/theme/theme.base.scss                     |  4 +
 11 files changed, 69 insertions(+), 112 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 15dc8e894..a06e71a3d 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1923,10 +1923,8 @@
   "core.login.yourenteredsite": "local_moodlemobileapp",
   "core.lostconnection": "local_moodlemobileapp",
   "core.mainmenu.changesite": "local_moodlemobileapp",
-  "core.mainmenu.help": "moodle",
   "core.mainmenu.home": "moodle",
   "core.mainmenu.logout": "moodle",
-  "core.mainmenu.website": "local_moodlemobileapp",
   "core.maxfilesize": "moodle",
   "core.maxsizeandattachments": "moodle",
   "core.min": "moodle",
@@ -1960,7 +1958,7 @@
   "core.mod_wiki": "wiki/pluginname",
   "core.mod_workshop": "workshop/pluginname",
   "core.moduleintro": "moodle",
-  "core.more": "moodle",
+  "core.more": "moodle/moremenu",
   "core.mygroups": "group",
   "core.name": "moodle",
   "core.needhelp": "local_moodlemobileapp",
diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.html b/src/core/features/mainmenu/components/user-menu/user-menu.html
index 8c89de390..0b2127f8d 100644
--- a/src/core/features/mainmenu/components/user-menu/user-menu.html
+++ b/src/core/features/mainmenu/components/user-menu/user-menu.html
@@ -13,7 +13,7 @@
 <ion-content>
     <core-loading [hideUntil]="true">
         <ion-list>
-            <ion-item class="ion-text-center core-user-profile-maininfo" *ngIf="siteInfo">
+            <ion-item class="ion-text-center core-user-profile-maininfo" *ngIf="siteInfo" lines="none">
                 <core-user-avatar [user]="siteInfo" [userId]="siteInfo.userid" [linkProfile]="false"></core-user-avatar>
                 <ion-label>
                     <h2>{{ siteInfo.fullname }}</h2>
@@ -21,32 +21,35 @@
                         <core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="0" [wsNotFiltered]="true">
                         </core-format-text>
                     </p>
-                    <p class="core-usermenu-siteinfo core-usermenu-siteurl">{{ siteUrl }}</p>
+                    <p class="core-usermenu-siteinfo core-usermenu-siteurl">
+                        <a [href]="siteUrl" core-link autoLogin="yes">{{ siteUrl }}</a>
+                    </p>
                 </ion-label>
             </ion-item>
 
             <ion-item button class="ion-text-wrap core-usermenu-handler" (click)="openUserProfile($event)"
-                [attr.aria-label]="'core.user.details' | translate" detail="true">
+                [attr.aria-label]="'core.user.details' | translate" detail="true" lines="none">
                 <ion-icon name="fas-user" slot="start" aria-hidden="true"></ion-icon>
                 <ion-label>
                     <p class="item-heading">{{ 'core.user.details' | translate }}</p>
                 </ion-label>
             </ion-item>
 
-            <ion-item class="ion-text-center" *ngIf="(!handlers || !handlers.length) && !handlersLoaded">
+            <ion-item class="ion-text-center" *ngIf="(!handlers || !handlers.length) && !handlersLoaded" lines="none">
                 <ion-label><ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner></ion-label>
             </ion-item>
 
             <ion-item button *ngFor="let handler of handlers" class="ion-text-wrap" (click)="handlerClicked($event, handler)"
                 [ngClass]="['core-user-menu-handler', handler.class || '']" [hidden]="handler.hidden"
-                [attr.aria-label]="handler.title | translate" detail="true">
+                [attr.aria-label]="handler.title | translate" detail="true" lines="none">
                 <ion-icon *ngIf="handler.icon" [name]="handler.icon" slot="start" aria-hidden="true"></ion-icon>
                 <ion-label>
                     <p class="item-heading">{{ handler.title | translate }}</p>
                 </ion-label>
             </ion-item>
 
-            <ion-item button (click)="openPreferences($event)" [attr.aria-label]="'core.settings.preferences' | translate" detail="true">
+            <ion-item button (click)="openPreferences($event)" [attr.aria-label]="'core.settings.preferences' | translate" detail="true"
+                class="core-user-menu-preferences">
                 <ion-icon name="fas-wrench" slot="start" aria-hidden="true"></ion-icon>
                 <ion-label>
                     <p class="item-heading">{{ 'core.settings.preferences' | translate }}</p>
diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.scss b/src/core/features/mainmenu/components/user-menu/user-menu.scss
index e6d9fd3fd..bae1b1d30 100644
--- a/src/core/features/mainmenu/components/user-menu/user-menu.scss
+++ b/src/core/features/mainmenu/components/user-menu/user-menu.scss
@@ -16,6 +16,11 @@
             }
         }
     }
+
+    .core-user-menu-preferences {
+        --inner-border-width: 0;
+        --border-width: 1px 0 0 0; 
+    }
 }
 
 @if ($core-user-hide-siteinfo) {
diff --git a/src/core/features/mainmenu/lang.json b/src/core/features/mainmenu/lang.json
index a6558e06e..0d188b98d 100644
--- a/src/core/features/mainmenu/lang.json
+++ b/src/core/features/mainmenu/lang.json
@@ -1,7 +1,5 @@
 {
     "changesite": "Change site",
-    "help": "Help",
     "home": "Home",
-    "logout": "Log out",
-    "website": "Website"
+    "logout": "Log out"
 }
diff --git a/src/core/features/mainmenu/pages/more/more.html b/src/core/features/mainmenu/pages/more/more.html
index 69a4e046c..2d111d407 100644
--- a/src/core/features/mainmenu/pages/more/more.html
+++ b/src/core/features/mainmenu/pages/more/more.html
@@ -4,7 +4,7 @@
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
 
-        <h1><core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="0"></core-format-text></h1>
+        <h1>{{ 'core.more' | translate }}</h1>
 
         <ion-buttons slot="end">
             <core-user-menu-button></core-user-menu-button>
@@ -54,20 +54,6 @@
                 <p class="item-heading">{{ 'core.scanqr' | translate }}</p>
             </ion-label>
         </ion-item>
-        <ion-item button *ngIf="showWeb && siteInfo" [href]="siteInfo.siteurl" core-link autoLogin="yes"
-            [attr.aria-label]="'core.mainmenu.website' | translate" detail="true" detailIcon="open-outline">
-            <ion-icon name="fas-globe" slot="start" aria-hidden="true"></ion-icon>
-            <ion-label>
-                <p class="item-heading">{{ 'core.mainmenu.website' | translate }}</p>
-            </ion-label>
-        </ion-item>
-        <ion-item button *ngIf="showHelp" [href]="docsUrl" core-link autoLogin="no"
-            [attr.aria-label]="'core.mainmenu.help' | translate" detail="true" detailIcon="open-outline">
-            <ion-icon name="far-life-ring" slot="start" aria-hidden="true"></ion-icon>
-            <ion-label>
-                <p class="item-heading">{{ 'core.mainmenu.help' | translate }}</p>
-            </ion-label>
-        </ion-item>
     </ion-list>
 </ion-content>
 <ion-footer>
diff --git a/src/core/features/mainmenu/pages/more/more.ts b/src/core/features/mainmenu/pages/more/more.ts
index a8b93f285..626a18d27 100644
--- a/src/core/features/mainmenu/pages/more/more.ts
+++ b/src/core/features/mainmenu/pages/more/more.ts
@@ -17,7 +17,6 @@ import { Subscription } from 'rxjs';
 
 import { CoreSites } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
-import { CoreSiteInfo } from '@classes/site';
 import { CoreMainMenuDelegate, CoreMainMenuHandlerData } from '../../services/mainmenu-delegate';
 import { CoreMainMenu, CoreMainMenuCustomItem } from '../../services/mainmenu';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
@@ -28,7 +27,7 @@ import { CoreTextUtils } from '@services/utils/text';
 import { Translate } from '@singletons';
 
 /**
- * Page that displays the main menu of the app.
+ * Page that displays the more page of the app.
  */
 @Component({
     selector: 'page-core-mainmenu-more',
@@ -39,12 +38,7 @@ export class CoreMainMenuMorePage implements OnInit, OnDestroy {
 
     handlers?: CoreMainMenuHandlerData[];
     handlersLoaded = false;
-    siteInfo?: CoreSiteInfo;
-    siteName?: string;
     showScanQR: boolean;
-    showWeb?: boolean;
-    showHelp?: boolean;
-    docsUrl?: string;
     customItems?: CoreMainMenuCustomItem[];
 
     protected allHandlers?: CoreMainMenuHandlerData[];
@@ -53,14 +47,14 @@ export class CoreMainMenuMorePage implements OnInit, OnDestroy {
     protected updateSiteObserver: CoreEventObserver;
 
     constructor() {
+        this.langObserver = CoreEvents.on(CoreEvents.LANGUAGE_CHANGED, this.loadCustomMenuItems.bind(this));
+
+        this.updateSiteObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, async () => {
+            this.customItems = await CoreMainMenu.getCustomMenuItems();
+        }, CoreSites.getCurrentSiteId());
+
+        this.loadCustomMenuItems();
 
-        this.langObserver = CoreEvents.on(CoreEvents.LANGUAGE_CHANGED, this.loadSiteInfo.bind(this));
-        this.updateSiteObserver = CoreEvents.on(
-            CoreEvents.SITE_UPDATED,
-            this.loadSiteInfo.bind(this),
-            CoreSites.getCurrentSiteId(),
-        );
-        this.loadSiteInfo();
         this.showScanQR = CoreUtils.canScanQR() &&
                 !CoreSites.getCurrentSite()?.isFeatureDisabled('CoreMainMenuDelegate_QrReader');
     }
@@ -109,18 +103,9 @@ export class CoreMainMenuMorePage implements OnInit, OnDestroy {
     }
 
     /**
-     * Load the site info required by the view.
+     * Load custom menu items.
      */
-    protected async loadSiteInfo(): Promise<void> {
-        const currentSite = CoreSites.getRequiredCurrentSite();
-
-        this.siteInfo = currentSite.getInfo();
-        this.siteName = currentSite.getSiteName();
-        this.showWeb = !currentSite.isFeatureDisabled('CoreMainMenuDelegate_website');
-        this.showHelp = !currentSite.isFeatureDisabled('CoreMainMenuDelegate_help');
-
-        this.docsUrl = await currentSite.getDocsUrl();
-
+    protected async loadCustomMenuItems(): Promise<void> {
         this.customItems = await CoreMainMenu.getCustomMenuItems();
     }
 
diff --git a/src/core/features/settings/pages/site/site.html b/src/core/features/settings/pages/site/site.html
index b28da0563..af29f5ee0 100644
--- a/src/core/features/settings/pages/site/site.html
+++ b/src/core/features/settings/pages/site/site.html
@@ -15,18 +15,6 @@
         </ion-refresher>
         <core-loading [hideUntil]="handlers.loaded">
             <ion-list>
-                <ion-item *ngIf="siteInfo" class="ion-text-wrap">
-                    <ion-label>
-                        <p class="item-heading">{{siteInfo!.fullname}}</p>
-                        <p>
-                            <core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="0"
-                                [wsNotFiltered]="true"></core-format-text>
-                        </p>
-                        <p>{{ siteUrl }}</p>
-                    </ion-label>
-                </ion-item>
-                <core-spacer></core-spacer>
-
                 <ion-item *ngFor="let handler of handlers.items" [ngClass]="['core-settings-handler', handler.class]"
                     [attr.aria-label]="handler.title | translate" detail="true" (click)="handlers.select(handler)" button
                     [attr.aria-current]="handlers.getItemAriaCurrent(handler)">
@@ -36,38 +24,37 @@
                         <p class="item-heading">{{ handler.title | translate}}</p>
                     </ion-label>
                 </ion-item>
-
-                <ion-card>
-                    <ion-item class="ion-text-wrap" *ngIf="spaceUsage">
-                        <ion-label>
-                            <p class="item-heading ion-text-wrap">{{ 'core.settings.spaceusage' | translate }}</p>
-                            <p *ngIf="spaceUsage.spaceUsage">{{ spaceUsage.spaceUsage | coreBytesToSize }}</p>
-                        </ion-label>
-                        <ion-button fill="clear" [attr.aria-label]="'core.info' | translate" (click)="showSpaceInfo()" slot="end">
-                            <ion-icon name="fas-info-circle" color="info" slot="icon-only"></ion-icon>
-                        </ion-button>
-                        <ion-button fill="clear" color="danger" slot="end" (click)="deleteSiteStorage()"
-                            [hidden]="spaceUsage.spaceUsage! + spaceUsage.cacheEntries! <= 0"
-                            [attr.aria-label]="'core.settings.deletesitefilestitle' | translate">
-                            <ion-icon name="fas-trash" slot="icon-only" aria-hidden="true"></ion-icon>
-                        </ion-button>
-                    </ion-item>
-                    <ion-item class="ion-text-wrap">
-                        <ion-label>
-                            <p class="item-heading">{{ 'core.settings.synchronizenow' | translate }}</p>
-                        </ion-label>
-                        <ion-button fill="clear" [attr.aria-label]="'core.info' | translate" (click)="showSyncInfo()" slot="end">
-                            <ion-icon name="fas-info-circle" color="info" slot="icon-only"></ion-icon>
-                        </ion-button>
-                        <core-button-with-spinner [loading]="isSynchronizing()" slot="end">
-                            <ion-button fill="clear" (click)="synchronize()"
-                                [attr.aria-label]="'core.settings.synchronizenow' | translate">
-                                <ion-icon name="fas-sync-alt" slot="icon-only" aria-hidden="true"></ion-icon>
-                            </ion-button>
-                        </core-button-with-spinner>
-                    </ion-item>
-                </ion-card>
             </ion-list>
+            <ion-card>
+                <ion-item class="ion-text-wrap" *ngIf="spaceUsage">
+                    <ion-label>
+                        <p class="item-heading ion-text-wrap">{{ 'core.settings.spaceusage' | translate }}</p>
+                        <p *ngIf="spaceUsage.spaceUsage">{{ spaceUsage.spaceUsage | coreBytesToSize }}</p>
+                    </ion-label>
+                    <ion-button fill="clear" [attr.aria-label]="'core.info' | translate" (click)="showSpaceInfo()" slot="end">
+                        <ion-icon name="fas-info-circle" color="info" slot="icon-only"></ion-icon>
+                    </ion-button>
+                    <ion-button fill="clear" color="danger" slot="end" (click)="deleteSiteStorage()"
+                        [hidden]="spaceUsage.spaceUsage! + spaceUsage.cacheEntries! <= 0"
+                        [attr.aria-label]="'core.settings.deletesitefilestitle' | translate">
+                        <ion-icon name="fas-trash" slot="icon-only" aria-hidden="true"></ion-icon>
+                    </ion-button>
+                </ion-item>
+                <ion-item class="ion-text-wrap">
+                    <ion-label>
+                        <p class="item-heading">{{ 'core.settings.synchronizenow' | translate }}</p>
+                    </ion-label>
+                    <ion-button fill="clear" [attr.aria-label]="'core.info' | translate" (click)="showSyncInfo()" slot="end">
+                        <ion-icon name="fas-info-circle" color="info" slot="icon-only"></ion-icon>
+                    </ion-button>
+                    <core-button-with-spinner [loading]="isSynchronizing()" slot="end">
+                        <ion-button fill="clear" (click)="synchronize()"
+                            [attr.aria-label]="'core.settings.synchronizenow' | translate">
+                            <ion-icon name="fas-sync-alt" slot="icon-only" aria-hidden="true"></ion-icon>
+                        </ion-button>
+                    </core-button-with-spinner>
+                </ion-item>
+            </ion-card>
         </core-loading>
     </core-split-view>
 </ion-content>
diff --git a/src/core/features/settings/pages/site/site.ts b/src/core/features/settings/pages/site/site.ts
index be7d0e313..77a366b73 100644
--- a/src/core/features/settings/pages/site/site.ts
+++ b/src/core/features/settings/pages/site/site.ts
@@ -22,7 +22,6 @@ import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreSettingsHelper, CoreSiteSpaceUsage } from '../../services/settings-helper';
 import { CoreApp } from '@services/app';
-import { CoreSiteInfo } from '@classes/site';
 import { Translate } from '@singletons';
 import { CoreNavigator } from '@services/navigator';
 import { CorePageItemsListManager } from '@classes/page-items-list-manager';
@@ -43,9 +42,6 @@ export class CoreSitePreferencesPage implements AfterViewInit, OnDestroy {
 
     isIOS: boolean;
     siteId: string;
-    siteInfo?: CoreSiteInfo;
-    siteName?: string;
-    siteUrl?: string;
     spaceUsage: CoreSiteSpaceUsage = {
         cacheEntries: 0,
         spaceUsage: 0,
@@ -60,11 +56,9 @@ export class CoreSitePreferencesPage implements AfterViewInit, OnDestroy {
         this.siteId = CoreSites.getCurrentSiteId();
         this.handlers = new CoreSettingsSitePreferencesManager(CoreSitePreferencesPage);
 
-        this.sitesObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, (data) => {
-            if (data.siteId == this.siteId) {
-                this.refreshData();
-            }
-        });
+        this.sitesObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, () => {
+            this.refreshData();
+        }, this.siteId);
     }
 
     /**
@@ -94,11 +88,6 @@ export class CoreSitePreferencesPage implements AfterViewInit, OnDestroy {
     protected async fetchData(): Promise<void> {
         this.handlers.setItems(CoreSettingsDelegate.getHandlers());
 
-        const currentSite = CoreSites.getCurrentSite();
-        this.siteInfo = currentSite!.getInfo();
-        this.siteName = currentSite!.getSiteName();
-        this.siteUrl = currentSite!.getURL();
-
         this.spaceUsage = await CoreSettingsHelper.getSiteSpaceUsage(this.siteId);
     }
 
@@ -145,7 +134,9 @@ export class CoreSitePreferencesPage implements AfterViewInit, OnDestroy {
      */
     async deleteSiteStorage(): Promise<void> {
         try {
-            this.spaceUsage = await CoreSettingsHelper.deleteSiteStorage(this.siteName || '', this.siteId);
+            const siteName = CoreSites.getRequiredCurrentSite().getSiteName();
+
+            this.spaceUsage = await CoreSettingsHelper.deleteSiteStorage(siteName, this.siteId);
         } catch {
             // Ignore cancelled confirmation modal.
         }
diff --git a/src/core/features/user/pages/about/about.html b/src/core/features/user/pages/about/about.html
index b37d038f4..cb828fb03 100644
--- a/src/core/features/user/pages/about/about.html
+++ b/src/core/features/user/pages/about/about.html
@@ -12,7 +12,7 @@
     </ion-refresher>
     <core-loading [hideUntil]="userLoaded">
         <ion-list *ngIf="user">
-            <ion-item class="ion-text-center core-user-profile-maininfo">
+            <ion-item class="ion-text-center core-user-profile-maininfo" lines="full">
                 <core-user-avatar [user]="user" [userId]="user.id" [linkProfile]="false" [checkOnline]="true">
                         <ion-button
                             class="edit-avatar"
diff --git a/src/core/lang.json b/src/core/lang.json
index f067e4b9e..2a7408ed0 100644
--- a/src/core/lang.json
+++ b/src/core/lang.json
@@ -185,7 +185,7 @@
     "mod_wiki": "Wiki",
     "mod_workshop": "Workshop",
     "moduleintro": "Description",
-    "more": "more",
+    "more": "More",
     "mygroups": "My groups",
     "name": "Name",
     "needhelp": "Need help?",
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index f202afd2d..8a62055b6 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -1039,6 +1039,10 @@ ion-item.item-multiple-inputs.only-links {
     }
 }
 
+a {
+    cursor: pointer;
+}
+
 // Case with ion-input + ion-select inside.
 ion-item.item-input.item-multiple-inputs {
     .flex-row {

From ab10d42b752fe9f8288b3efbf8782115fd7e5e62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 28 Oct 2021 09:17:12 +0200
Subject: [PATCH 0175/1008] MOBILE-3807 sites: Never erase token on logout

---
 src/core/services/sites.ts | 47 +++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 28 deletions(-)

diff --git a/src/core/services/sites.ts b/src/core/services/sites.ts
index 702ca7a50..dd0c39a2b 100644
--- a/src/core/services/sites.ts
+++ b/src/core/services/sites.ts
@@ -428,7 +428,7 @@ export class CoreSitesProvider {
 
             const result = this.isValidMoodleVersion(info);
             if (result != CoreSitesProvider.VALID_VERSION) {
-                return this.treatInvalidAppVersion(result, siteUrl);
+                return this.treatInvalidAppVersion(result);
             }
 
             const siteId = this.createSiteID(info.siteurl, info.username);
@@ -492,7 +492,7 @@ export class CoreSitesProvider {
         } catch (error) {
             // Error invaliddevice is returned by Workplace server meaning the same as connecttoworkplaceapp.
             if (error && error.errorcode == 'invaliddevice') {
-                return this.treatInvalidAppVersion(CoreSitesProvider.WORKPLACE_APP, siteUrl);
+                return this.treatInvalidAppVersion(CoreSitesProvider.WORKPLACE_APP);
             }
 
             throw error;
@@ -503,14 +503,13 @@ export class CoreSitesProvider {
      * Having the result of isValidMoodleVersion, it treats the error message to be shown.
      *
      * @param result Result returned by isValidMoodleVersion function.
-     * @param siteUrl The site url.
      * @param siteId If site is already added, it will invalidate the token.
      * @return A promise rejected with the error info.
      */
-    protected async treatInvalidAppVersion(result: number, siteUrl: string, siteId?: string): Promise<never> {
+    protected async treatInvalidAppVersion(result: number, siteId?: string): Promise<never> {
         let errorCode: string | undefined;
         let errorKey: string | undefined;
-        let translateParams;
+        let translateParams = {};
 
         switch (result) {
             case CoreSitesProvider.MOODLE_APP:
@@ -528,7 +527,7 @@ export class CoreSitesProvider {
         }
 
         if (siteId) {
-            await this.setSiteLoggedOut(siteId, true);
+            await this.setSiteLoggedOut(siteId);
         }
 
         throw new CoreSiteError({
@@ -746,7 +745,7 @@ export class CoreSitesProvider {
                 if (siteId) {
                     // Logout the currentSite and expire the token.
                     this.logout();
-                    this.setSiteLoggedOut(siteId, true);
+                    this.setSiteLoggedOut(siteId);
                 }
             });
 
@@ -1191,7 +1190,7 @@ export class CoreSitesProvider {
         this.currentSite = undefined;
 
         if (siteConfig && siteConfig.tool_mobile_forcelogout == '1') {
-            promises.push(this.setSiteLoggedOut(siteId, true));
+            promises.push(this.setSiteLoggedOut(siteId));
         }
 
         promises.push(this.removeStoredCurrentSite());
@@ -1221,34 +1220,24 @@ export class CoreSitesProvider {
             this.logger.debug(`Restore session in site ${siteId}`);
 
             await this.loadSite(siteId);
-        } catch (err) {
+        } catch {
             // No current session.
         }
     }
 
     /**
-     * Mark or unmark a site as logged out so the user needs to authenticate again.
+     * Mark a site as logged out so the user needs to authenticate again.
      *
      * @param siteId ID of the site.
-     * @param loggedOut True to set the site as logged out, false otherwise.
      * @return Promise resolved when done.
      */
-    async setSiteLoggedOut(siteId: string, loggedOut: boolean): Promise<void> {
+    protected async setSiteLoggedOut(siteId: string): Promise<void> {
         const db = await this.appDB;
         const site = await this.getSite(siteId);
-        const newValues: Partial<SiteDBEntry> = {
-            loggedOut: loggedOut ? 1 : 0,
-        };
 
-        if (loggedOut) {
-            // Erase the token for security.
-            newValues.token = '';
-            site.token = '';
-        }
+        site.setLoggedOut(true);
 
-        site.setLoggedOut(loggedOut);
-
-        await db.updateRecords(SITES_TABLE_NAME, newValues, { id: siteId });
+        await db.updateRecords(SITES_TABLE_NAME, { loggedOut: 1 }, { id: siteId });
     }
 
     /**
@@ -1315,7 +1304,7 @@ export class CoreSitesProvider {
             const versionCheck = this.isValidMoodleVersion(info);
             if (versionCheck != CoreSitesProvider.VALID_VERSION) {
                 // The Moodle version is not supported, reject.
-                return this.treatInvalidAppVersion(versionCheck, site.getURL(), site.getId());
+                return this.treatInvalidAppVersion(versionCheck, site.getId());
             }
 
             // Try to get the site config.
@@ -1344,7 +1333,7 @@ export class CoreSitesProvider {
             } finally {
                 CoreEvents.trigger(CoreEvents.SITE_UPDATED, info, siteId);
             }
-        } catch (error) {
+        } catch {
             // Ignore that we cannot fetch site info. Probably the auth token is invalid.
         }
     }
@@ -1417,7 +1406,7 @@ export class CoreSitesProvider {
             await Promise.all(promises);
 
             return ids;
-        } catch (error) {
+        } catch {
             // Shouldn't happen.
             return [];
         }
@@ -1475,8 +1464,10 @@ export class CoreSitesProvider {
      * @param siteId The site ID. If not defined, current site (if available).
      * @return Promise resolved with true if disabled.
      */
-    isFeatureDisabled(name: string, siteId?: string): Promise<boolean> {
-        return this.getSite(siteId).then((site) => site.isFeatureDisabled(name));
+    async isFeatureDisabled(name: string, siteId?: string): Promise<boolean> {
+        const site = await this.getSite(siteId);
+
+        return site.isFeatureDisabled(name);
     }
 
     /**

From 357d23c082577e4f1b4226f88fd3f9366e78b55e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 22 Oct 2021 12:57:59 +0200
Subject: [PATCH 0176/1008] MOBILE-3807 usermenu: Make lateal modal wider

---
 src/core/classes/modal-lateral-transition.ts  | 56 +++++++++++++------
 .../user-menu-button/user-menu-button.ts      |  3 +-
 src/core/services/utils/dom.ts                |  4 +-
 src/theme/globals.variables.scss              |  2 +
 src/theme/theme.base.scss                     | 27 ++++++++-
 5 files changed, 71 insertions(+), 21 deletions(-)

diff --git a/src/core/classes/modal-lateral-transition.ts b/src/core/classes/modal-lateral-transition.ts
index 551d288d7..bc481f705 100644
--- a/src/core/classes/modal-lateral-transition.ts
+++ b/src/core/classes/modal-lateral-transition.ts
@@ -22,37 +22,61 @@ import { Platform } from '@singletons';
 export function CoreModalLateralTransitionEnter(baseEl: HTMLElement): Animation {
     const OFF_RIGHT = Platform.isRTL ? '-100%' : '100%';
 
-    const backdropAnimation = createAnimation()
-        .addElement(baseEl.querySelector('ion-backdrop')!)
-        .fromTo('opacity', 0.01, 0.4);
+    const otherAnimations: Animation[] = [];
 
-    const wrapperAnimation = createAnimation()
-        .addElement(baseEl.querySelector('.modal-wrapper')!)
-        .fromTo('transform', 'translateX(' + OFF_RIGHT + ')', 'translateX(0)')
-        .fromTo('opacity', 0.8, 1);
+    const backdrop = baseEl.querySelector('ion-backdrop');
+    if (backdrop) {
+        const backdropAnimation = createAnimation()
+            .addElement(backdrop)
+            .fromTo('opacity', 0.01, 0.4);
+
+        otherAnimations.push(backdropAnimation);
+    }
+
+    const wrapper = baseEl.querySelector('.modal-wrapper');
+    if (wrapper) {
+        const wrapperAnimation = createAnimation()
+            .addElement(wrapper)
+            .fromTo('transform', 'translateX(' + OFF_RIGHT + ')', 'translateX(0)')
+            .fromTo('opacity', 0.8, 1);
+
+        otherAnimations.push(wrapperAnimation);
+    }
 
     return createAnimation()
         .addElement(baseEl)
         .easing('cubic-bezier(0.36,0.66,0.04,1)')
         .duration(300)
-        .addAnimation([backdropAnimation, wrapperAnimation]);
+        .addAnimation(otherAnimations);
 }
 
 export function CoreModalLateralTransitionLeave(baseEl: HTMLElement): Animation {
     const OFF_RIGHT = Platform.isRTL ? '-100%' : '100%';
 
-    const backdropAnimation = createAnimation()
-        .addElement(baseEl.querySelector('ion-backdrop')!)
-        .fromTo('opacity', 0.4, 0.0);
+    const otherAnimations: Animation[] = [];
 
-    const wrapperAnimation = createAnimation()
-        .addElement(baseEl.querySelector('.modal-wrapper')!)
-        .beforeStyles({ opacity: 1 })
-        .fromTo('transform', 'translateX(0)', 'translateX(' + OFF_RIGHT + ')');
+    const backdrop = baseEl.querySelector('ion-backdrop');
+    if (backdrop) {
+        const backdropAnimation = createAnimation()
+            .addElement(backdrop)
+            .fromTo('opacity', 0.4, 0.0);
+
+        otherAnimations.push(backdropAnimation);
+    }
+
+    const wrapper = baseEl.querySelector('.modal-wrapper');
+    if (wrapper) {
+        const wrapperAnimation = createAnimation()
+            .addElement(wrapper)
+            .beforeStyles({ opacity: 1 })
+            .fromTo('transform', 'translateX(0)', 'translateX(' + OFF_RIGHT + ')');
+
+        otherAnimations.push(wrapperAnimation);
+    }
 
     return createAnimation()
         .addElement(baseEl)
         .easing('cubic-bezier(0.36,0.66,0.04,1)')
         .duration(300)
-        .addAnimation([backdropAnimation, wrapperAnimation]);
+        .addAnimation(otherAnimations);
 }
diff --git a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts
index f8d3291f7..c1acf9857 100644
--- a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts
+++ b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts
@@ -47,8 +47,9 @@ export class CoreMainMenuUserButtonComponent {
         event.preventDefault();
         event.stopPropagation();
 
-        CoreDomUtils.openModal<void>({
+        CoreDomUtils.openSideModal<void>({
             component: CoreMainMenuUserMenuComponent,
+            cssClass: 'core-modal-lateral-sm',
         });
     }
 
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index 093e072a9..e4b6deb5a 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -1677,13 +1677,13 @@ export class CoreDomUtilsProvider {
         modalOptions: ModalOptions,
     ): Promise<T | undefined> {
 
-        modalOptions = Object.assign(modalOptions, {
+        modalOptions = Object.assign({
             cssClass: 'core-modal-lateral',
             showBackdrop: true,
             backdropDismiss: true,
             enterAnimation: CoreModalLateralTransitionEnter,
             leaveAnimation: CoreModalLateralTransitionLeave,
-        });
+        }, modalOptions);
 
         return await this.openModal<T>(modalOptions);
     }
diff --git a/src/theme/globals.variables.scss b/src/theme/globals.variables.scss
index abc13bfce..3a1dbff38 100644
--- a/src/theme/globals.variables.scss
+++ b/src/theme/globals.variables.scss
@@ -102,6 +102,8 @@ $screen-breakpoints: (
     xl: 1200px
 ) !default;
 
+$modal-lateral-width: 360px;
+
 $core-course-image-background: #81ecec, #74b9ff, #a29bfe, #dfe6e9, #00b894, #0984e3, #b2bec3, #fdcb6e, #fd79a8, #6c5ce7 !default;
 $core-dd-question-colors: #FFFFFF, #B0C4DE, #DCDCDC, #D8BFD8, #87CEFA, #DAA520, #FFD700, #F0E68C !default;
 $core-text-hightlight-background-color: lighten($blue, 40%) !default;
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 8a62055b6..c74dae05a 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -508,7 +508,7 @@ body.core-iframe-fullscreen ion-router-outlet {
     z-index: 100000 !important;
 }
 
-@media only screen and (min-height: 400px) and (min-width: 300px) {
+@media only screen and (min-height: 400px) and (min-width: #{$modal-lateral-width}) {
     .core-modal-lateral {
         --ion-safe-area-left: 0px;
         --ion-safe-area-right: 0px;
@@ -519,7 +519,7 @@ body.core-iframe-fullscreen ion-router-outlet {
             display: block;
             height: 100% !important;
             width: auto;
-            min-width: 300px;
+            min-width: #{$modal-lateral-width};
             box-shadow: 0 28px 48px rgba(0, 0, 0, 0.4);
         }
         ion-backdrop {
@@ -528,6 +528,29 @@ body.core-iframe-fullscreen ion-router-outlet {
     }
 }
 
+@each $breakpoint, $width in $screen-breakpoints {
+    @media only screen and (min-height: 400px) and (min-width: #{$width}) {
+        .core-modal-lateral-#{$breakpoint} {
+            --ion-safe-area-left: 0px;
+            --ion-safe-area-right: 0px;
+    
+            .modal-wrapper {
+                position: absolute;
+                @include position(0 !important, 0 !important, 0 !important, unset !important);
+                display: block;
+                height: 100% !important;
+                width: auto;
+                min-width: #{$width};
+                box-shadow: 0 28px 48px rgba(0, 0, 0, 0.4);
+            }
+            ion-backdrop {
+                visibility: visible;
+            }
+        }
+    }
+    
+}
+
 // Hidden submit button.
 .core-submit-hidden-enter {
     position: absolute;

From 03b7660d68e3aee0e826253108a439a60835139d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 22 Oct 2021 17:02:54 +0200
Subject: [PATCH 0177/1008] MOBILE-3807 sites: New change user feature

---
 scripts/langindex.json                        |   7 +-
 .../login/components/components.module.ts     |  36 ++++
 .../login/components/sites/sites.html         |  92 ++++++++++
 .../features/login/components/sites/sites.ts  | 131 ++++++++++++++
 src/core/features/login/lang.json             |  10 +-
 src/core/features/login/login-lazy.module.ts  |   8 +-
 src/core/features/login/login.module.ts       |   4 +-
 .../login/pages/site-policy/site-policy.ts    |  14 +-
 .../features/login/pages/sites/sites.html     |  64 ++++---
 src/core/features/login/pages/sites/sites.ts  |  62 +++----
 .../features/login/services/login-helper.ts   | 163 ++++++++++++++----
 .../mainmenu/components/components.module.ts  |   2 +
 .../components/user-menu/user-menu.html       | 102 ++++++-----
 .../components/user-menu/user-menu.ts         |  44 ++++-
 src/core/features/mainmenu/lang.json          |   4 +-
 src/core/features/tag/tag-lazy.module.ts      |   2 +-
 src/core/features/user/lang.json              |   2 +-
 src/core/services/app.ts                      |   2 +-
 src/core/services/sites.ts                    |  43 +----
 19 files changed, 590 insertions(+), 202 deletions(-)
 create mode 100644 src/core/features/login/components/components.module.ts
 create mode 100644 src/core/features/login/components/sites/sites.html
 create mode 100644 src/core/features/login/components/sites/sites.ts

diff --git a/scripts/langindex.json b/scripts/langindex.json
index a06e71a3d..093646fcf 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1798,6 +1798,8 @@
   "core.loading": "moodle",
   "core.loadmore": "local_moodlemobileapp",
   "core.location": "moodle",
+  "core.login.accounts": "admin",
+  "core.login.add": "moodle",
   "core.login.auth_email": "auth_email/pluginname",
   "core.login.authenticating": "local_moodlemobileapp",
   "core.login.cancel": "moodle",
@@ -1894,6 +1896,7 @@
   "core.login.reconnect": "local_moodlemobileapp",
   "core.login.reconnectdescription": "local_moodlemobileapp",
   "core.login.reconnectssodescription": "local_moodlemobileapp",
+  "core.login.removeaccount": "local_moodlemobileapp",
   "core.login.resendemail": "moodle",
   "core.login.searchby": "local_moodlemobileapp",
   "core.login.security_question": "auth",
@@ -1913,6 +1916,7 @@
   "core.login.startsignup": "moodle",
   "core.login.stillcantconnect": "local_moodlemobileapp",
   "core.login.supplyinfo": "moodle",
+  "core.login.toggleremove": "local_moodlemobileapp",
   "core.login.username": "moodle",
   "core.login.usernameoremail": "moodle",
   "core.login.usernamerequired": "local_moodlemobileapp",
@@ -1922,9 +1926,9 @@
   "core.login.youcanstillconnectwithcredentials": "local_moodlemobileapp",
   "core.login.yourenteredsite": "local_moodlemobileapp",
   "core.lostconnection": "local_moodlemobileapp",
-  "core.mainmenu.changesite": "local_moodlemobileapp",
   "core.mainmenu.home": "moodle",
   "core.mainmenu.logout": "moodle",
+  "core.mainmenu.switchaccount": "local_moodlemobileapp",
   "core.maxfilesize": "moodle",
   "core.maxsizeandattachments": "moodle",
   "core.min": "moodle",
@@ -2230,6 +2234,7 @@
   "core.updaterequireddesc": "local_moodlemobileapp",
   "core.upgraderunning": "error",
   "core.user": "moodle",
+  "core.user.account": "local_moodlemobileapp",
   "core.user.address": "moodle",
   "core.user.city": "moodle",
   "core.user.contact": "local_moodlemobileapp",
diff --git a/src/core/features/login/components/components.module.ts b/src/core/features/login/components/components.module.ts
new file mode 100644
index 000000000..37d326e79
--- /dev/null
+++ b/src/core/features/login/components/components.module.ts
@@ -0,0 +1,36 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreSharedModule } from '@/core/shared.module';
+import { CoreLoginSiteOnboardingComponent } from './site-onboarding/site-onboarding';
+import { CoreLoginSiteHelpComponent } from './site-help/site-help';
+import { CoreLoginSitesComponent } from './sites/sites';
+
+@NgModule({
+    declarations: [
+        CoreLoginSiteOnboardingComponent,
+        CoreLoginSiteHelpComponent,
+        CoreLoginSitesComponent,
+    ],
+    imports: [
+        CoreSharedModule,
+    ],
+    exports: [
+        CoreLoginSiteOnboardingComponent,
+        CoreLoginSiteHelpComponent,
+        CoreLoginSitesComponent,
+    ],
+})
+export class CoreLoginComponentsModule {}
diff --git a/src/core/features/login/components/sites/sites.html b/src/core/features/login/components/sites/sites.html
new file mode 100644
index 000000000..20ee59b87
--- /dev/null
+++ b/src/core/features/login/components/sites/sites.html
@@ -0,0 +1,92 @@
+<ion-header>
+    <ion-toolbar>
+        <ion-buttons slot="start">
+            <ion-button fill="clear" (click)="close($event)" [attr.aria-label]="'core.back' | translate">
+                <ion-icon name="arrow-back" slot="icon-only" aria-hidden="true"></ion-icon>
+            </ion-button>
+        </ion-buttons>
+
+        <h1>{{ 'core.mainmenu.switchaccount' | translate }}</h1>
+
+        <ion-buttons slot="end">
+            <ion-button fill="clear" *ngIf="accountsList.count > 1" (click)="toggleDelete()"
+                [attr.aria-label]="'core.login.toggleremove' | translate">
+                <ion-icon slot="icon-only" name="fas-pen" aria-hidden="true"></ion-icon>
+            </ion-button>
+        </ion-buttons>
+    </ion-toolbar>
+</ion-header>
+<ion-content>
+    <core-loading [hideUntil]="loaded">
+        <ion-list>
+            <ng-container *ngIf="accountsList.currentSite">
+                <ion-item-divider sticky="true">
+                    <ion-label>
+                        <h2>
+                            <core-format-text [text]="accountsList.currentSite.siteName" clean="true"
+                                [siteId]="accountsList.currentSite.id"></core-format-text>
+                        </h2>
+                        <p><a [href]="accountsList.currentSite.siteUrl" core-link autoLogin="yes">{{ accountsList.currentSite.siteUrl }}</a>
+                        </p>
+                    </ion-label>
+                </ion-item-divider>
+
+                <ion-item detail="false" class="item-current">
+                    <ion-avatar slot="start">
+                        <img [src]="accountsList.currentSite.avatar" core-external-content [siteId]="accountsList.currentSite.id"
+                            alt="{{ 'core.pictureof' | translate:{$a: accountsList.currentSite.fullName} }}"
+                            onError="this.src='assets/img/user-avatar.png'">
+                    </ion-avatar>
+                    <ion-label>
+                        <p class="item-heading">{{accountsList.currentSite.fullName}}</p>
+                    </ion-label>
+                    <ion-icon color="success" name="fas-check"></ion-icon>
+                </ion-item>
+
+                <ng-container *ngTemplateOutlet="siteList; context: {sites: accountsList.sameSite}"></ng-container>
+            </ng-container>
+
+            <ng-container *ngFor="let sites of accountsList.otherSites">
+                <ion-item-divider sticky="true" *ngIf="sites[0]">
+                    <ion-label>
+                        <h2>
+                            <core-format-text [text]="sites[0].siteName" clean="true" [siteId]="sites[0].id"></core-format-text>
+                        </h2>
+                        <p><a [href]="sites[0].siteUrl" core-link autoLogin="no">{{ sites[0].siteUrl }}</a></p>
+                    </ion-label>
+                </ion-item-divider>
+
+                <ng-container *ngTemplateOutlet="siteList; context: {sites: sites}"></ng-container>
+            </ng-container>
+
+        </ion-list>
+    </core-loading>
+    <ion-fab slot="fixed" core-fab vertical="bottom" horizontal="end">
+        <ion-fab-button (click)="add($event)" [attr.aria-label]="'core.login.add' | translate">
+            <ion-icon name="fas-plus" aria-hidden="true"></ion-icon>
+            <span class="sr-only">{{ 'core.login.add' | translate }}</span>
+        </ion-fab-button>
+    </ion-fab>
+</ion-content>
+
+<!-- Template to render a list of sites. -->
+<ng-template #siteList let-sites="sites">
+    <ion-item button *ngFor="let site of sites" (click)="login($event, site.id)" detail="true">
+        <ion-avatar slot="start">
+            <img [src]="site.avatar" core-external-content [siteId]="site.id" alt="{{ 'core.pictureof' | translate:{$a: site.fullName} }}"
+                onError="this.src='assets/img/user-avatar.png'">
+        </ion-avatar>
+        <ion-label>
+            <p class="item-heading">{{site.fullName}}</p>
+        </ion-label>
+        <ion-badge slot="end" *ngIf="!showDelete && site.badge" @coreShowHideAnimation>
+            <span aria-hidden="true">{{site.badge}}</span>
+            <span class="sr-only">{{ 'core.login.sitebadgedescription' | translate:{ count: site.badge }
+                }}</span>
+        </ion-badge>
+        <ion-button *ngIf="showDelete" slot="end" fill="clear" color="danger" (click)="deleteSite($event, site)"
+            [attr.aria-label]="'core.login.removeaccount' | translate" [@coreSlideInOut]="'fromRight'">
+            <ion-icon name="fas-trash" slot="icon-only" aria-hidden="true"></ion-icon>
+        </ion-button>
+    </ion-item>
+</ng-template>
diff --git a/src/core/features/login/components/sites/sites.ts b/src/core/features/login/components/sites/sites.ts
new file mode 100644
index 000000000..1f14b51a7
--- /dev/null
+++ b/src/core/features/login/components/sites/sites.ts
@@ -0,0 +1,131 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreDomUtils } from '@services/utils/dom';
+import { Component, OnInit } from '@angular/core';
+
+import { CoreSiteBasicInfo, CoreSites } from '@services/sites';
+import { CoreAccountsList, CoreLoginHelper } from '@features/login/services/login-helper';
+import { CoreNavigator } from '@services/navigator';
+import { CoreFilter } from '@features/filter/services/filter';
+import { CoreAnimations } from '@components/animations';
+import { ModalController } from '@singletons';
+
+/**
+ * Component that displays a "splash screen" while the app is being initialized.
+ */
+@Component({
+    selector: 'core-login-sites',
+    templateUrl: 'sites.html',
+    animations: [CoreAnimations.SLIDE_IN_OUT, CoreAnimations.SHOW_HIDE],
+})
+export class CoreLoginSitesComponent implements OnInit {
+
+    accountsList: CoreAccountsList = {
+        sameSite: [],
+        otherSites: [],
+        count: 0,
+    };
+
+    showDelete = false;
+    currentSiteId: string;
+    loaded = false;
+
+    constructor() {
+        this.currentSiteId = CoreSites.getRequiredCurrentSite().getId();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async ngOnInit(): Promise<void> {
+        this.accountsList = await CoreLoginHelper.getAccountsList(this.currentSiteId);
+        this.loaded = true;
+    }
+
+    /**
+     * Go to the page to add a site.
+     *
+     * @param event Click event.
+     */
+    async add(event: Event): Promise<void> {
+        await this.close(event, true);
+
+        await CoreLoginHelper.goToAddSite(true, true);
+    }
+
+    /**
+     * Delete a site.
+     *
+     * @param event Click event.
+     * @param site Site to delete.
+     * @return Promise resolved when done.
+     */
+    async deleteSite(event: Event, site: CoreSiteBasicInfo): Promise<void> {
+        event.stopPropagation();
+
+        let siteName = site.siteName || '';
+
+        siteName = await CoreFilter.formatText(siteName, { clean: true, singleLine: true, filter: false }, [], site.id);
+
+        try {
+            await CoreDomUtils.showDeleteConfirm('core.login.confirmdeletesite', { sitename: siteName });
+        } catch {
+            // User cancelled, stop.
+            return;
+        }
+
+        try {
+            await CoreLoginHelper.deleteAccountFromList(this.accountsList, site);
+
+            this.showDelete = false;
+        } catch (error) {
+            CoreDomUtils.showErrorModalDefault(error, 'core.login.errordeletesite', true);
+        }
+    }
+
+    /**
+     * Login in a site.
+     *
+     * @param event Click event.
+     * @param siteId The site ID.
+     * @return Promise resolved when done.
+     */
+    async login(event: Event, siteId: string): Promise<void> {
+        await this.close(event, true);
+
+        // This navigation will logout and navigate to the site home.
+        await CoreNavigator.navigateToSiteHome({ preferCurrentTab: false , siteId });
+    }
+
+    /**
+     * Toggle delete.
+     */
+    toggleDelete(): void {
+        this.showDelete = !this.showDelete;
+    }
+
+    /**
+     * Close modal.
+     *
+     * @param event Click event.
+     */
+    async close(event: Event, closeAll = false): Promise<void> {
+        event.preventDefault();
+        event.stopPropagation();
+
+        await ModalController.dismiss(closeAll);
+    }
+
+}
diff --git a/src/core/features/login/lang.json b/src/core/features/login/lang.json
index 8ebeb7fa5..53a7bf0ed 100644
--- a/src/core/features/login/lang.json
+++ b/src/core/features/login/lang.json
@@ -1,4 +1,6 @@
 {
+    "accounts": "Accounts",
+    "add": "Add a new account",
     "auth_email": "Email-based self-registration",
     "authenticating": "Authenticating",
     "cancel": "Cancel",
@@ -8,7 +10,7 @@
     "changepasswordinstructions": "You cannot change your password in the app. Please click the following button to open the site in a web browser to change your password. Take into account you need to close the browser after changing the password as you will not be redirected to the app.",
     "changepasswordlogoutinstructions": "If you prefer to change site or log out, please click the following button:",
     "changepasswordreconnectinstructions": "Click the following button to reconnect to the site. (Take into account that if you didn't change your password successfully, you would return to the previous screen).",
-    "confirmdeletesite": "Are you sure you want to delete the site {{sitename}}?",
+    "confirmdeletesite": "Are you sure you want to remove the account on {{sitename}}?",
     "connect": "Connect!",
     "connecttomoodle": "Connect to Moodle",
     "contactyouradministrator": "Contact your site administrator for further help.",
@@ -23,7 +25,7 @@
     "emailconfirmsentsuccess": "Confirmation email sent successfully",
     "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.",
+    "errordeletesite": "An error occurred while deleting this account. Please try again.",
     "errorexampleurl": "The URL https://campus.example.edu is only an example URL, it's not a real site. <strong>Please use the URL of your school or organization's site.</strong>",
     "errorqrnoscheme": "This URL isn't a valid login URL.",
     "errorupdatesite": "An error occurred while updating the site's token.",
@@ -95,11 +97,12 @@
     "reconnect": "Reconnect",
     "reconnectdescription": "Your authentication token is invalid or has expired. You have to reconnect to the site.",
     "reconnectssodescription": "Your authentication token is invalid or has expired. You have to reconnect to the site. You need to log in to the site in a browser window.",
+    "removeaccount": "Remove account",
     "resendemail": "Resend email",
     "searchby": "Search by:",
     "security_question": "Security question",
     "selectacountry": "Select a country",
-    "selectsite": "Please select your site:",
+    "selectsite": "Please select your account:",
     "signupplugindisabled": "{{$a}} is not enabled.",
     "signuprequiredfieldnotsupported": "The signup form contains a required custom field that isn't supported in the app. Please create your account using a web browser.",
     "siteaddress": "Your site",
@@ -114,6 +117,7 @@
     "startsignup": "Create new account",
     "stillcantconnect": "Still can't connect?",
     "supplyinfo": "More details",
+    "toggleremove": "Edit accounts list",
     "username": "Username",
     "usernameoremail": "Enter either username or email address",
     "usernamerequired": "Username required",
diff --git a/src/core/features/login/login-lazy.module.ts b/src/core/features/login/login-lazy.module.ts
index bab14255b..bad7099b5 100644
--- a/src/core/features/login/login-lazy.module.ts
+++ b/src/core/features/login/login-lazy.module.ts
@@ -16,9 +16,8 @@ import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
 import { CoreSharedModule } from '@/core/shared.module';
-import { CoreLoginSiteHelpComponent } from './components/site-help/site-help';
-import { CoreLoginSiteOnboardingComponent } from './components/site-onboarding/site-onboarding';
 import { CoreLoginHasSitesGuard } from './guards/has-sites';
+import { CoreLoginComponentsModule } from './components/components.module';
 
 const routes: Routes = [
     {
@@ -67,11 +66,8 @@ const routes: Routes = [
 @NgModule({
     imports: [
         CoreSharedModule,
+        CoreLoginComponentsModule,
         RouterModule.forChild(routes),
     ],
-    declarations: [
-        CoreLoginSiteHelpComponent,
-        CoreLoginSiteOnboardingComponent,
-    ],
 })
 export class CoreLoginLazyModule {}
diff --git a/src/core/features/login/login.module.ts b/src/core/features/login/login.module.ts
index caa91ea91..fdbb39639 100644
--- a/src/core/features/login/login.module.ts
+++ b/src/core/features/login/login.module.ts
@@ -35,7 +35,9 @@ const appRoutes: Routes = [
 ];
 
 @NgModule({
-    imports: [AppRoutingModule.forChild(appRoutes)],
+    imports: [
+        AppRoutingModule.forChild(appRoutes),
+    ],
     providers: [
         {
             provide: APP_INITIALIZER,
diff --git a/src/core/features/login/pages/site-policy/site-policy.ts b/src/core/features/login/pages/site-policy/site-policy.ts
index d58ee4c4e..8c4097f9e 100644
--- a/src/core/features/login/pages/site-policy/site-policy.ts
+++ b/src/core/features/login/pages/site-policy/site-policy.ts
@@ -35,17 +35,17 @@ export class CoreLoginSitePolicyPage implements OnInit {
     showInline?: boolean;
     policyLoaded?: boolean;
     protected siteId?: string;
-    protected currentSite?: CoreSite;
+    protected currentSite!: CoreSite;
 
     /**
-     * Component initialized.
+     * @inheritdoc
      */
     ngOnInit(): void {
-
         this.siteId = CoreNavigator.getRouteParam('siteId');
-        this.currentSite = CoreSites.getCurrentSite();
 
-        if (!this.currentSite) {
+        try {
+            this.currentSite = CoreSites.getRequiredCurrentSite();
+        } catch {
             // Not logged in, stop.
             this.cancel();
 
@@ -86,7 +86,7 @@ export class CoreLoginSitePolicyPage implements OnInit {
 
             const extension = CoreMimetypeUtils.getExtension(mimeType, this.sitePolicy);
             this.showInline = extension == 'html' || extension == 'htm';
-        } catch (error) {
+        } catch {
             // Unable to get mime type, assume it's not supported.
             this.showInline = false;
         } finally {
@@ -118,7 +118,7 @@ export class CoreLoginSitePolicyPage implements OnInit {
 
             // Success accepting, go to site initial page.
             // Invalidate cache since some WS don't return error if site policy is not accepted.
-            await CoreUtils.ignoreErrors(this.currentSite!.invalidateWsCache());
+            await CoreUtils.ignoreErrors(this.currentSite.invalidateWsCache());
 
             await CoreNavigator.navigateToSiteHome();
         } catch (error) {
diff --git a/src/core/features/login/pages/sites/sites.html b/src/core/features/login/pages/sites/sites.html
index 704daedff..b9d3ed2b7 100644
--- a/src/core/features/login/pages/sites/sites.html
+++ b/src/core/features/login/pages/sites/sites.html
@@ -4,11 +4,11 @@
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
 
-        <h1>{{ 'core.settings.sites' | translate }}</h1>
+        <h1>{{ 'core.login.accounts' | translate }}</h1>
 
         <ion-buttons slot="end">
-            <ion-button fill="clear" *ngIf="sites && sites.length > 0" (click)="toggleDelete()"
-                [attr.aria-label]="'core.delete' | translate">
+            <ion-button fill="clear" *ngIf="accountsList.count > 0" (click)="toggleDelete()"
+                [attr.aria-label]="'core.login.toggleremove' | translate">
                 <ion-icon slot="icon-only" name="fas-pen" aria-hidden="true"></ion-icon>
             </ion-button>
             <ion-button (click)="openSettings()" [attr.aria-label]="'core.settings.appsettings' | translate">
@@ -18,31 +18,43 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-list>
-        <ion-item button (click)="login(site.id)" *ngFor="let site of sites" detail="true">
-            <ion-avatar slot="start">
-                <img [src]="site.avatar" core-external-content [siteId]="site.id"
-                    alt="{{ 'core.pictureof' | translate:{$a: site.fullName} }}" onError="this.src='assets/img/user-avatar.png'">
-            </ion-avatar>
-            <ion-label>
-                <p class="item-heading">{{site.fullName}}</p>
-                <p><core-format-text [text]="site.siteName" clean="true" [siteId]="site.id"></core-format-text></p>
-                <p>{{site.siteUrl}}</p>
-            </ion-label>
-            <ion-badge slot="end" *ngIf="!showDelete && site.badge">
-                <span aria-hidden="true">{{site.badge}}</span>
-                <span class="sr-only">{{ 'core.login.sitebadgedescription' | translate:{ count: site.badge } }}</span>
-            </ion-badge>
-            <ion-button *ngIf="showDelete" slot="end" fill="clear" color="danger" (click)="deleteSite($event, site)"
-                [attr.aria-label]="'core.delete' | translate" [@coreSlideInOut]="'fromRight'">
-                <ion-icon name="fas-trash" slot="icon-only" aria-hidden="true"></ion-icon>
-            </ion-button>
-        </ion-item>
-    </ion-list>
+    <core-loading [hideUntil]="loaded">
+        <ion-list>
+            <ng-container *ngFor="let sites of accountsList.otherSites">
+                <ion-item-divider sticky="true" *ngIf="sites[0]">
+                    <ion-label>
+                        <h2>
+                            <core-format-text [text]="sites[0].siteName" clean="true" [siteId]="sites[0].id"></core-format-text>
+                        </h2>
+                        <p><a [href]="sites[0].siteUrl" core-link autoLogin="no">{{ sites[0].siteUrl }}</a></p>
+                    </ion-label>
+                </ion-item-divider>
+
+                <ion-item button *ngFor="let site of sites" (click)="login($event, site.id)" detail="true">
+                    <ion-avatar slot="start">
+                        <img [src]="site.avatar" core-external-content [siteId]="site.id"
+                            alt="{{ 'core.pictureof' | translate:{$a: site.fullName} }}" onError="this.src='assets/img/user-avatar.png'">
+                    </ion-avatar>
+                    <ion-label>
+                        <p class="item-heading">{{site.fullName}}</p>
+                    </ion-label>
+                    <ion-badge slot="end" *ngIf="!showDelete && site.badge" @coreShowHideAnimation>
+                        <span aria-hidden="true">{{site.badge}}</span>
+                        <span class="sr-only">{{ 'core.login.sitebadgedescription' | translate:{ count: site.badge }
+                            }}</span>
+                    </ion-badge>
+                    <ion-button *ngIf="showDelete" slot="end" fill="clear" color="danger" (click)="deleteSite($event, site)"
+                        [attr.aria-label]="'core.login.removeaccount' | translate" [@coreSlideInOut]="'fromRight'">
+                        <ion-icon name="fas-trash" slot="icon-only" aria-hidden="true"></ion-icon>
+                    </ion-button>
+                </ion-item>
+            </ng-container>
+        </ion-list>
+    </core-loading>
     <ion-fab slot="fixed" core-fab vertical="bottom" horizontal="end">
-        <ion-fab-button (click)="add()" [attr.aria-label]="'core.add' | translate">
+        <ion-fab-button (click)="add()" [attr.aria-label]="'core.login.add' | translate">
             <ion-icon name="fas-plus" aria-hidden="true"></ion-icon>
-            <span class="sr-only">{{ 'core.add' | translate }}</span>
+            <span class="sr-only">{{ 'core.login.add' | translate }}</span>
         </ion-fab-button>
     </ion-fab>
 </ion-content>
diff --git a/src/core/features/login/pages/sites/sites.ts b/src/core/features/login/pages/sites/sites.ts
index 447d79f7d..a6d3e1eeb 100644
--- a/src/core/features/login/pages/sites/sites.ts
+++ b/src/core/features/login/pages/sites/sites.ts
@@ -13,14 +13,11 @@
 // limitations under the License.
 
 import { CoreDomUtils } from '@services/utils/dom';
-import { CoreUtils } from '@services/utils/utils';
 import { Component, OnInit } from '@angular/core';
 
 import { CoreSiteBasicInfo, CoreSites } from '@services/sites';
-import { CoreLogger } from '@singletons/logger';
-import { CoreLoginHelper } from '@features/login/services/login-helper';
+import { CoreAccountsList, CoreLoginHelper } from '@features/login/services/login-helper';
 import { CoreNavigator } from '@services/navigator';
-import { CorePushNotifications } from '@features/pushnotifications/services/pushnotifications';
 import { CoreFilter } from '@features/filter/services/filter';
 import { CoreAnimations } from '@components/animations';
 
@@ -30,40 +27,33 @@ import { CoreAnimations } from '@components/animations';
 @Component({
     selector: 'page-core-login-sites',
     templateUrl: 'sites.html',
-    animations: [CoreAnimations.SLIDE_IN_OUT],
+    animations: [CoreAnimations.SLIDE_IN_OUT, CoreAnimations.SHOW_HIDE],
 })
 export class CoreLoginSitesPage implements OnInit {
 
-    sites: CoreSiteBasicInfo[] = [];
+    accountsList: CoreAccountsList = {
+        sameSite: [],
+        otherSites: [],
+        count: 0,
+    };
+
     showDelete = false;
-
-    protected logger: CoreLogger;
-
-    constructor() {
-        this.logger = CoreLogger.getInstance('CoreLoginSitesPage');
-    }
+    loaded = false;
 
     /**
-     * Component being initialized.
-     *
-     * @return Promise resolved when done.
+     * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
         if (CoreNavigator.getRouteBooleanParam('openAddSite')) {
             this.add();
         }
 
-        const sites = await CoreUtils.ignoreErrors(CoreSites.getSortedSites(), [] as CoreSiteBasicInfo[]);
+        this.accountsList = await CoreLoginHelper.getAccountsList();
+        this.loaded = true;
 
-        // Remove protocol from the url to show more url text.
-        this.sites = await Promise.all(sites.map(async (site) => {
-            site.siteUrl = site.siteUrl.replace(/^https?:\/\//, '');
-            site.badge = await CoreUtils.ignoreErrors(CorePushNotifications.getSiteCounter(site.id)) || 0;
-
-            return site;
-        }));
-
-        this.showDelete = false;
+        if (this.accountsList.count == 0) {
+            this.add();
+        }
     }
 
     /**
@@ -76,12 +66,12 @@ export class CoreLoginSitesPage implements OnInit {
     /**
      * Delete a site.
      *
-     * @param e Click event.
+     * @param event Click event.
      * @param site Site to delete.
      * @return Promise resolved when done.
      */
-    async deleteSite(e: Event, site: CoreSiteBasicInfo): Promise<void> {
-        e.stopPropagation();
+    async deleteSite(event: Event, site: CoreSiteBasicInfo): Promise<void> {
+        event.stopPropagation();
 
         let siteName = site.siteName || '';
 
@@ -95,20 +85,15 @@ export class CoreLoginSitesPage implements OnInit {
         }
 
         try {
-            await CoreSites.deleteSite(site.id);
+            await CoreLoginHelper.deleteAccountFromList(this.accountsList, site);
 
-            const index = this.sites.findIndex((listedSite) => listedSite.id == site.id);
-            index >= 0 && this.sites.splice(index, 1);
             this.showDelete = false;
 
             // If there are no sites left, go to add site.
-            const hasSites = await CoreSites.hasSites();
-
-            if (!hasSites) {
+            if (this.accountsList.count == 0) {
                 CoreLoginHelper.goToAddSite(true, true);
             }
         } catch (error) {
-            this.logger.error('Error deleting site ' + site.id, error);
             CoreDomUtils.showErrorModalDefault(error, 'core.login.errordeletesite', true);
         }
     }
@@ -116,10 +101,14 @@ export class CoreLoginSitesPage implements OnInit {
     /**
      * Login in a site.
      *
+     * @param event Click event.
      * @param siteId The site ID.
      * @return Promise resolved when done.
      */
-    async login(siteId: string): Promise<void> {
+    async login(event: Event, siteId: string): Promise<void> {
+        event.preventDefault();
+        event.stopPropagation();
+
         const modal = await CoreDomUtils.showModalLoading();
 
         try {
@@ -131,7 +120,6 @@ export class CoreLoginSitesPage implements OnInit {
                 return;
             }
         } catch (error) {
-            this.logger.error('Error loading site ' + siteId, error);
             CoreDomUtils.showErrorModalDefault(error, 'Error loading site.');
         } finally {
             modal.dismiss();
diff --git a/src/core/features/login/services/login-helper.ts b/src/core/features/login/services/login-helper.ts
index d41c0b742..545898b2b 100644
--- a/src/core/features/login/services/login-helper.ts
+++ b/src/core/features/login/services/login-helper.ts
@@ -19,7 +19,7 @@ import { Md5 } from 'ts-md5/dist/md5';
 import { CoreApp, CoreStoreConfig } from '@services/app';
 import { CoreConfig } from '@services/config';
 import { CoreEvents, CoreEventSessionExpiredData, CoreEventSiteData } from '@singletons/events';
-import { CoreSites, CoreLoginSiteInfo } from '@services/sites';
+import { CoreSites, CoreLoginSiteInfo, CoreSiteBasicInfo } from '@services/sites';
 import { CoreWS, CoreWSExternalWarning } from '@services/ws';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTextUtils } from '@services/utils/text';
@@ -35,6 +35,8 @@ import { CoreUrl } from '@singletons/url';
 import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
 import { CoreCanceledError } from '@classes/errors/cancelederror';
 import { CoreCustomURLSchemes } from '@services/urlschemes';
+import { CoreSitePlugins } from '@features/siteplugins/services/siteplugins';
+import { CorePushNotifications } from '@features/pushnotifications/services/pushnotifications';
 
 /**
  * Helper provider that provides some common features regarding authentication.
@@ -311,7 +313,7 @@ export class CoreLoginHelperProvider {
         site = site || CoreSites.getCurrentSite();
         const config = site?.getStoredConfig();
 
-        return 'core.mainmenu.' + (config && config.tool_mobile_forcelogout == '1' ? 'logout' : 'changesite');
+        return 'core.mainmenu.' + (config && config.tool_mobile_forcelogout == '1' ? 'logout' : 'switchaccount');
     }
 
     /**
@@ -407,8 +409,25 @@ export class CoreLoginHelperProvider {
      * @param showKeyboard Whether to show keyboard in the new page. Only if no fixed URL set.
      * @return Promise resolved when done.
      */
-    async goToAddSite(setRoot?: boolean, showKeyboard?: boolean): Promise<void> {
-        const [path, params] = this.getAddSiteRouteInfo(showKeyboard);
+    async goToAddSite(setRoot = false, showKeyboard = false): Promise<void> {
+        let path = '/login/sites';
+        let params: Params = { openAddSite: true , showKeyboard };
+
+        if (CoreSites.isLoggedIn()) {
+
+            if (CoreSitePlugins.hasSitePluginsLoaded) {
+                // The site has site plugins so the app will be restarted. Store the data and logout.
+                CoreApp.storeRedirect(CoreConstants.NO_SITE_ID, path, { params });
+
+                await CoreSites.logout();
+
+                return;
+            }
+
+            await CoreSites.logout();
+        } else {
+            [path, params] = this.getAddSiteRouteInfo(showKeyboard);
+        }
 
         await CoreNavigator.navigate(path, { params, reset: setRoot });
     }
@@ -1317,43 +1336,121 @@ export class CoreLoginHelperProvider {
         }
     }
 
+    /**
+     * Get the accounts list classified per site.
+     *
+     * @param currentSiteId If loggedin, current Site Id.
+     * @return Promise resolved with account list.
+     */
+    async getAccountsList(currentSiteId?: string): Promise<CoreAccountsList> {
+        const sites = await CoreUtils.ignoreErrors(CoreSites.getSortedSites(), [] as CoreSiteBasicInfo[]);
+
+        const accountsList: CoreAccountsList = {
+            sameSite: [],
+            otherSites: [],
+            count: sites.length,
+        };
+
+        let siteUrl = '';
+
+        if (currentSiteId) {
+            const index = sites.findIndex((site) => site.id == currentSiteId);
+
+            accountsList.currentSite = sites.splice(index, 1)[0];
+            siteUrl = accountsList.currentSite.siteUrl.replace(/^https?:\/\//, '').toLowerCase();
+            accountsList.currentSite.siteUrl = siteUrl;
+        }
+
+        const otherSites: Record<string, CoreSiteBasicInfo[]> = {};
+
+        // Add site counter and classify sites.
+        await Promise.all(sites.map(async (site) => {
+            site.siteUrl = site.siteUrl.replace(/^https?:\/\//, '').toLowerCase();
+            site.badge = await CoreUtils.ignoreErrors(CorePushNotifications.getSiteCounter(site.id)) || 0;
+
+            if (site.siteUrl == siteUrl) {
+                accountsList.sameSite.push(site);
+            } else {
+                if (!otherSites[site.siteUrl]) {
+                    otherSites[site.siteUrl] = [];
+                }
+
+                otherSites[site.siteUrl].push(site);
+            }
+
+            return;
+        }));
+
+        accountsList.otherSites = CoreUtils.objectToArray(otherSites);
+
+        return accountsList;
+    }
+
+    /**
+     * Find and delete a site from the list of sites.
+     *
+     * @param accountsList Account list.
+     * @param site Site to be deleted.
+     * @return Resolved when done.
+     */
+    async deleteAccountFromList(accountsList: CoreAccountsList, site: CoreSiteBasicInfo): Promise<void> {
+        await CoreSites.deleteSite(site.id);
+
+        const siteUrl = site.siteUrl;
+        let index = 0;
+
+        // Found on same site.
+        if (accountsList.sameSite.length > 0 && accountsList.sameSite[0].siteUrl == siteUrl) {
+            index = accountsList.sameSite.findIndex((listedSite) => listedSite.id == site.id);
+            if (index >= 0) {
+                accountsList.sameSite.splice(index, 1);
+                accountsList.count--;
+            }
+
+            return;
+        }
+
+        const otherSiteIndex = accountsList.otherSites.findIndex((sites) => sites.length > 0 && sites[0].siteUrl == siteUrl);
+        if (otherSiteIndex < 0) {
+            // Site Url not found.
+            return;
+        }
+
+        index = accountsList.otherSites[otherSiteIndex].findIndex((listedSite) => listedSite.id == site.id);
+        if (index >= 0) {
+            accountsList.otherSites[otherSiteIndex].splice(index, 1);
+            accountsList.count--;
+        }
+
+        if (accountsList.otherSites[otherSiteIndex].length == 0) {
+            accountsList.otherSites.splice(otherSiteIndex, 1);
+        }
+    }
+
 }
 
 export const CoreLoginHelper = makeSingleton(CoreLoginHelperProvider);
 
+/**
+ * Accounts list for selecting sites interfaces.
+ */
+export type CoreAccountsList = {
+    currentSite?: CoreSiteBasicInfo; // If logged in, current site info.
+    sameSite: CoreSiteBasicInfo[]; // If logged in, accounts info on the same site.
+    otherSites: CoreSiteBasicInfo[][]; // Other accounts in other sites.
+    count: number; // Number of sites.
+};
+
 /**
  * Data related to a SSO authentication.
  */
 export interface CoreLoginSSOData {
-    /**
-     * The site's URL.
-     */
-    siteUrl: string;
-
-    /**
-     * User's token.
-     */
-    token?: string;
-
-    /**
-     * User's private token.
-     */
-    privateToken?: string;
-
-    /**
-     * Name of the page to go after authenticated.
-     */
-    pageName?: string;
-
-    /**
-     * Options of the navigation to the page.
-     */
-    pageOptions?: CoreNavigationOptions;
-
-    /**
-     * Other params added to the login url.
-     */
-    ssoUrlParams?: CoreUrlParams;
+    siteUrl: string; // The site's URL.
+    token?: string; // User's token.
+    privateToken?: string; // User's private token.
+    pageName?: string; // Name of the page to go after authenticated.
+    pageOptions?: CoreNavigationOptions; // Options of the navigation to the page.
+    ssoUrlParams?: CoreUrlParams; // Other params added to the login url.
 };
 
 /**
diff --git a/src/core/features/mainmenu/components/components.module.ts b/src/core/features/mainmenu/components/components.module.ts
index 9a688ae75..613c1c790 100644
--- a/src/core/features/mainmenu/components/components.module.ts
+++ b/src/core/features/mainmenu/components/components.module.ts
@@ -16,6 +16,7 @@ import { NgModule } from '@angular/core';
 import { CoreSharedModule } from '@/core/shared.module';
 import { CoreMainMenuUserButtonComponent } from './user-menu-button/user-menu-button';
 import { CoreMainMenuUserMenuComponent } from './user-menu/user-menu';
+import { CoreLoginComponentsModule } from '@features/login/components/components.module';
 
 @NgModule({
     declarations: [
@@ -24,6 +25,7 @@ import { CoreMainMenuUserMenuComponent } from './user-menu/user-menu';
     ],
     imports: [
         CoreSharedModule,
+        CoreLoginComponentsModule,
     ],
     exports: [
         CoreMainMenuUserButtonComponent,
diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.html b/src/core/features/mainmenu/components/user-menu/user-menu.html
index 0b2127f8d..4cb01be69 100644
--- a/src/core/features/mainmenu/components/user-menu/user-menu.html
+++ b/src/core/features/mainmenu/components/user-menu/user-menu.html
@@ -8,59 +8,71 @@
         <h1>
             {{'core.user.account' | translate}}
         </h1>
+        <ion-buttons slot="end" *ngIf="loaded">
+            <ion-button fill="clear" *ngIf="moreSites" (click)="switchAccounts($event)"
+                [attr.aria-label]="'core.mainmenu.changeaccount' | translate">
+                <ion-icon name="fas-exchange-alt" slot="icon-only" aria-hidden="true"></ion-icon>
+            </ion-button>
+            <ion-button fill="clear" *ngIf="!moreSites" (click)="addAccount($event)"
+                [attr.aria-label]="'core.login.add' | translate">
+                <ion-icon name="fas-user-plus" slot="icon-only" aria-hidden="true"></ion-icon>
+            </ion-button>
+        </ion-buttons>
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <core-loading [hideUntil]="true">
-        <ion-list>
-            <ion-item class="ion-text-center core-user-profile-maininfo" *ngIf="siteInfo" lines="none">
-                <core-user-avatar [user]="siteInfo" [userId]="siteInfo.userid" [linkProfile]="false"></core-user-avatar>
-                <ion-label>
-                    <h2>{{ siteInfo.fullname }}</h2>
-                    <p class="core-usermenu-siteinfo core-usermenu-sitename">
-                        <core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="0" [wsNotFiltered]="true">
-                        </core-format-text>
-                    </p>
-                    <p class="core-usermenu-siteinfo core-usermenu-siteurl">
-                        <a [href]="siteUrl" core-link autoLogin="yes">{{ siteUrl }}</a>
-                    </p>
-                </ion-label>
-            </ion-item>
+    <ion-list>
+        <ion-item class="ion-text-center core-user-profile-maininfo" *ngIf="siteInfo" lines="none">
+            <core-user-avatar [user]="siteInfo" [userId]="siteInfo.userid" [linkProfile]="false"></core-user-avatar>
+            <ion-label>
+                <h2>{{ siteInfo.fullname }}</h2>
+                <p class="core-usermenu-siteinfo core-usermenu-sitename">
+                    <core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="0"
+                        [wsNotFiltered]="true">
+                    </core-format-text>
+                </p>
+                <p class="core-usermenu-siteinfo core-usermenu-siteurl">
+                    <a [href]="siteUrl" core-link autoLogin="yes">{{ siteUrl }}</a>
+                </p>
+            </ion-label>
+        </ion-item>
 
-            <ion-item button class="ion-text-wrap core-usermenu-handler" (click)="openUserProfile($event)"
-                [attr.aria-label]="'core.user.details' | translate" detail="true" lines="none">
-                <ion-icon name="fas-user" slot="start" aria-hidden="true"></ion-icon>
-                <ion-label>
-                    <p class="item-heading">{{ 'core.user.details' | translate }}</p>
-                </ion-label>
-            </ion-item>
+        <ion-item button class="ion-text-wrap core-usermenu-handler" (click)="openUserProfile($event)"
+            [attr.aria-label]="'core.user.details' | translate" detail="true" lines="none">
+            <ion-icon name="fas-user" slot="start" aria-hidden="true"></ion-icon>
+            <ion-label>
+                <p class="item-heading">{{ 'core.user.details' | translate }}</p>
+            </ion-label>
+        </ion-item>
 
-            <ion-item class="ion-text-center" *ngIf="(!handlers || !handlers.length) && !handlersLoaded" lines="none">
-                <ion-label><ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner></ion-label>
-            </ion-item>
+        <ion-item class="ion-text-center" *ngIf="(!handlers || !handlers.length) && !handlersLoaded" lines="none">
+            <ion-label>
+                <ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner>
+            </ion-label>
+        </ion-item>
 
-            <ion-item button *ngFor="let handler of handlers" class="ion-text-wrap" (click)="handlerClicked($event, handler)"
-                [ngClass]="['core-user-menu-handler', handler.class || '']" [hidden]="handler.hidden"
-                [attr.aria-label]="handler.title | translate" detail="true" lines="none">
-                <ion-icon *ngIf="handler.icon" [name]="handler.icon" slot="start" aria-hidden="true"></ion-icon>
-                <ion-label>
-                    <p class="item-heading">{{ handler.title | translate }}</p>
-                </ion-label>
-            </ion-item>
+        <ion-item button *ngFor="let handler of handlers" class="ion-text-wrap"
+            (click)="handlerClicked($event, handler)" [ngClass]="['core-user-menu-handler', handler.class || '']"
+            [hidden]="handler.hidden" [attr.aria-label]="handler.title | translate" detail="true" lines="none">
+            <ion-icon *ngIf="handler.icon" [name]="handler.icon" slot="start" aria-hidden="true"></ion-icon>
+            <ion-label>
+                <p class="item-heading">{{ handler.title | translate }}</p>
+            </ion-label>
+        </ion-item>
 
-            <ion-item button (click)="openPreferences($event)" [attr.aria-label]="'core.settings.preferences' | translate" detail="true"
-                class="core-user-menu-preferences">
-                <ion-icon name="fas-wrench" slot="start" aria-hidden="true"></ion-icon>
-                <ion-label>
-                    <p class="item-heading">{{ 'core.settings.preferences' | translate }}</p>
-                </ion-label>
-            </ion-item>
-        </ion-list>
-    </core-loading>
+        <ion-item button (click)="openPreferences($event)" [attr.aria-label]="'core.settings.preferences' | translate"
+            detail="true" class="core-user-menu-preferences">
+            <ion-icon name="fas-wrench" slot="start" aria-hidden="true"></ion-icon>
+            <ion-label>
+                <p class="item-heading">{{ 'core.settings.preferences' | translate }}</p>
+            </ion-label>
+        </ion-item>
+    </ion-list>
 </ion-content>
 <ion-footer class="ion-padding">
-    <ion-button (click)="logout($event)" expand="block" color="danger" [attr.aria-label]="logoutLabel | translate" class="ion-text-wrap">
+    <ion-button (click)="logout($event)" expand="block" color="danger"
+        [attr.aria-label]="'core.mainmenu.logout' | translate" class="ion-text-wrap">
         <ion-icon name="fas-sign-out-alt" slot="start" aria-hidden="true"></ion-icon>
-        {{ logoutLabel | translate }}
+        {{ 'core.mainmenu.logout' | translate }}
     </ion-button>
-</ion-footer>
\ No newline at end of file
+</ion-footer>
diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.ts b/src/core/features/mainmenu/components/user-menu/user-menu.ts
index 71c8cc9f7..1ec0e39ad 100644
--- a/src/core/features/mainmenu/components/user-menu/user-menu.ts
+++ b/src/core/features/mainmenu/components/user-menu/user-menu.ts
@@ -14,11 +14,13 @@
 
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { CoreSiteInfo } from '@classes/site';
+import { CoreLoginSitesComponent } from '@features/login/components/sites/sites';
 import { CoreLoginHelper } from '@features/login/services/login-helper';
 import { CoreUser, CoreUserProfile } from '@features/user/services/user';
 import { CoreUserProfileHandlerData, CoreUserDelegate, CoreUserDelegateService } from '@features/user/services/user-delegate';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
 import { ModalController } from '@singletons';
 import { Subscription } from 'rxjs';
 
@@ -34,11 +36,12 @@ export class CoreMainMenuUserMenuComponent implements OnInit, OnDestroy {
 
     siteInfo?: CoreSiteInfo;
     siteName?: string;
-    logoutLabel = 'core.mainmenu.changesite';
     siteUrl?: string;
     handlers: CoreUserProfileHandlerData[] = [];
     handlersLoaded = false;
+    loaded = false;
     user?: CoreUserProfile;
+    moreSites = false;
 
     protected subscription!: Subscription;
 
@@ -46,13 +49,16 @@ export class CoreMainMenuUserMenuComponent implements OnInit, OnDestroy {
      * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
+        // Check if there are more sites to switch.
+        const sites = await CoreSites.getSites();
+        this.moreSites = sites.length > 1;
 
         const currentSite = CoreSites.getRequiredCurrentSite();
-
         this.siteInfo = currentSite.getInfo();
         this.siteName = currentSite.getSiteName();
         this.siteUrl = currentSite.getURL();
-        this.logoutLabel = CoreLoginHelper.getLogoutLabel(currentSite);
+
+        this.loaded = true;
 
         // Load the handlers.
         if (this.siteInfo) {
@@ -133,6 +139,38 @@ export class CoreMainMenuUserMenuComponent implements OnInit, OnDestroy {
         CoreSites.logout();
     }
 
+    /**
+     * Show account selector.
+     *
+     * @param event Click event
+     */
+    async switchAccounts(event: Event): Promise<void> {
+        const thisModal = await ModalController.getTop();
+
+        event.preventDefault();
+        event.stopPropagation();
+
+        const closeAll = await CoreDomUtils.openSideModal<boolean>({
+            component: CoreLoginSitesComponent,
+            cssClass: 'core-modal-lateral-sm',
+        });
+
+        if (closeAll) {
+            await ModalController.dismiss(undefined, undefined, thisModal.id);
+        }
+    }
+
+    /**
+     * Add account.
+     *
+     * @param event Click event
+     */
+    async addAccount(event: Event): Promise<void> {
+        await this.close(event);
+
+        await CoreLoginHelper.goToAddSite(true, true);
+    }
+
     /**
      * Close modal.
      */
diff --git a/src/core/features/mainmenu/lang.json b/src/core/features/mainmenu/lang.json
index 0d188b98d..9e9977545 100644
--- a/src/core/features/mainmenu/lang.json
+++ b/src/core/features/mainmenu/lang.json
@@ -1,5 +1,5 @@
 {
-    "changesite": "Change site",
     "home": "Home",
-    "logout": "Log out"
+    "logout": "Log out",
+    "switchaccount": "Switch account"
 }
diff --git a/src/core/features/tag/tag-lazy.module.ts b/src/core/features/tag/tag-lazy.module.ts
index e0c6f7b0e..6ced82dfe 100644
--- a/src/core/features/tag/tag-lazy.module.ts
+++ b/src/core/features/tag/tag-lazy.module.ts
@@ -35,7 +35,7 @@ function buildRoutes(injector: Injector): Routes {
             data: {
                 mainMenuTabRoot: CoreTagMainMenuHandlerService.PAGE_NAME,
             },
-            loadChildren: () => import('@features/tag//pages/search/search.page.module').then(m => m.CoreTagSearchPageModule),
+            loadChildren: () => import('@features/tag/pages/search/search.page.module').then(m => m.CoreTagSearchPageModule),
         },
         CoreTagIndexAreaRoute,
         ...buildTabMainRoutes(injector, {
diff --git a/src/core/features/user/lang.json b/src/core/features/user/lang.json
index 3435a4c4a..61d41e287 100644
--- a/src/core/features/user/lang.json
+++ b/src/core/features/user/lang.json
@@ -15,12 +15,12 @@
     "interests": "Interests",
     "lastname": "Surname",
     "manager": "Manager",
-    "myprofile": "My profile",
     "newpicture": "New picture",
     "noparticipants": "No participants found for this course",
     "participants": "Participants",
     "phone1": "Phone",
     "phone2": "Mobile phone",
+    "profile": "Profile",
     "roles": "Roles",
     "sendemail": "Email",
     "student": "Student",
diff --git a/src/core/services/app.ts b/src/core/services/app.ts
index 4c5cfc1e2..b3419ce9e 100644
--- a/src/core/services/app.ts
+++ b/src/core/services/app.ts
@@ -606,7 +606,7 @@ export class CoreAppProvider {
             };
 
             localStorage.setItem('CoreRedirect', JSON.stringify(redirect));
-        } catch (ex) {
+        } catch {
             // Ignore errors.
         }
     }
diff --git a/src/core/services/sites.ts b/src/core/services/sites.ts
index dd0c39a2b..3b77bf38b 100644
--- a/src/core/services/sites.ts
+++ b/src/core/services/sites.ts
@@ -1095,7 +1095,7 @@ export class CoreSitesProvider {
     async getSortedSites(ids?: string[]): Promise<CoreSiteBasicInfo[]> {
         const sites = await this.getSites(ids);
 
-        // Sort sites by url and ful lname.
+        // Sort sites by url and fullname.
         sites.sort((a, b) => {
             // First compare by site url without the protocol.
             const urlA = a.siteUrl.replace(/^https?:\/\//, '').toLowerCase();
@@ -1754,40 +1754,13 @@ export type CoreSiteUserTokenResponse = {
  * Site's basic info.
  */
 export type CoreSiteBasicInfo = {
-    /**
-     * Site ID.
-     */
-    id: string;
-
-    /**
-     * Site URL.
-     */
-    siteUrl: string;
-
-    /**
-     * User's full name.
-     */
-    fullName?: string;
-
-    /**
-     * Site's name.
-     */
-    siteName?: string;
-
-    /**
-     * User's avatar.
-     */
-    avatar?: string;
-
-    /**
-     * Badge to display in the site.
-     */
-    badge?: number;
-
-    /**
-     * Site home ID.
-     */
-    siteHomeId?: number;
+    id: string; // Site ID.
+    siteUrl: string; // Site URL.
+    fullName?: string; // User's full name.
+    siteName?: string; // Site's name.
+    avatar?: string; // User's avatar.
+    badge?: number; // Badge to display in the site.
+    siteHomeId?: number; // Site home ID.
 };
 
 /**

From ed19df5c8e1020a12358efe55e9afa1f27fdb22b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 28 Oct 2021 11:14:49 +0200
Subject: [PATCH 0178/1008] MOBILE-3807 usermenu: Hide usermenu button when the
 path is not main

---
 .../user-menu-button/user-menu-button.html       | 12 +++---------
 .../user-menu-button/user-menu-button.ts         | 16 ++++++++++++----
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.html b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.html
index 1d9f61bde..998f7e7c0 100644
--- a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.html
+++ b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.html
@@ -1,9 +1,3 @@
-<core-user-avatar
-    *ngIf="siteInfo"
-    [user]="siteInfo"
-    class="core-bar-button-image clickable"
-    [linkProfile]="false"
-    (ariaButtonClick)="openUserMenu($event)"
-    role="button"
-    tabindex="0"
-></core-user-avatar>
\ No newline at end of file
+<core-user-avatar *ngIf="isMainScreen && siteInfo" [user]="siteInfo" class="core-bar-button-image clickable" [linkProfile]="false"
+    (ariaButtonClick)="openUserMenu($event)" role="button" tabindex="0" [attr.aria-label]="'core.user.account' | translate">
+</core-user-avatar>
diff --git a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts
index c1acf9857..d95001748 100644
--- a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts
+++ b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts
@@ -12,8 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { CoreSiteInfo } from '@classes/site';
+import { IonRouterOutlet } from '@ionic/angular';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreMainMenuUserMenuComponent } from '../user-menu/user-menu';
@@ -27,17 +28,24 @@ import { CoreMainMenuUserMenuComponent } from '../user-menu/user-menu';
     selector: 'core-user-menu-button',
     templateUrl: 'user-menu-button.html',
 })
-export class CoreMainMenuUserButtonComponent {
+export class CoreMainMenuUserButtonComponent implements OnInit {
 
     siteInfo?: CoreSiteInfo;
+    isMainScreen = false;
 
-    constructor() {
+    constructor(protected routerOutlet: IonRouterOutlet) {
         const currentSite = CoreSites.getRequiredCurrentSite();
 
-        // @TODO: Check if the page where I currently am is at level 0.
         this.siteInfo = currentSite.getInfo();
     }
 
+    /**
+     * @inheritdoc
+     */
+    ngOnInit(): void {
+        this.isMainScreen = !this.routerOutlet.canGoBack();
+    }
+
     /**
      * Open User menu
      *

From b9bf0189662f487461427e39b1662a65bf7ad09e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 28 Oct 2021 16:15:27 +0200
Subject: [PATCH 0179/1008] MOBILE-3807 usermenu: Show on side main menu bar

---
 .../components/user-menu-button/user-menu-button.scss     | 3 +++
 .../components/user-menu-button/user-menu-button.ts       | 1 +
 src/core/features/mainmenu/mainmenu-lazy.module.ts        | 2 ++
 src/core/features/mainmenu/pages/menu/menu.html           | 2 ++
 src/core/features/mainmenu/pages/menu/menu.scss           | 8 +++++++-
 5 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 src/core/features/mainmenu/components/user-menu-button/user-menu-button.scss

diff --git a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.scss b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.scss
new file mode 100644
index 000000000..15aa50df5
--- /dev/null
+++ b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.scss
@@ -0,0 +1,3 @@
+:host-context(ion-tabs.placement-side div.tabs-inner) {
+    display: none;
+}
\ No newline at end of file
diff --git a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts
index d95001748..a27782b73 100644
--- a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts
+++ b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts
@@ -27,6 +27,7 @@ import { CoreMainMenuUserMenuComponent } from '../user-menu/user-menu';
 @Component({
     selector: 'core-user-menu-button',
     templateUrl: 'user-menu-button.html',
+    styleUrls: ['user-menu-button.scss'],
 })
 export class CoreMainMenuUserButtonComponent implements OnInit {
 
diff --git a/src/core/features/mainmenu/mainmenu-lazy.module.ts b/src/core/features/mainmenu/mainmenu-lazy.module.ts
index ff9c67189..22f30d18b 100644
--- a/src/core/features/mainmenu/mainmenu-lazy.module.ts
+++ b/src/core/features/mainmenu/mainmenu-lazy.module.ts
@@ -22,6 +22,7 @@ import { MAIN_MENU_ROUTES } from './mainmenu-routing.module';
 import { CoreMainMenuPage } from './pages/menu/menu';
 import { CoreMainMenuHomeHandlerService } from './services/handlers/mainmenu';
 import { CoreMainMenuProvider } from './services/mainmenu';
+import { CoreMainMenuComponentsModule } from './components/components.module';
 
 function buildRoutes(injector: Injector): Routes {
     const routes = resolveModuleRoutes(injector, MAIN_MENU_ROUTES);
@@ -54,6 +55,7 @@ function buildRoutes(injector: Injector): Routes {
 @NgModule({
     imports: [
         CoreSharedModule,
+        CoreMainMenuComponentsModule,
     ],
     declarations: [
         CoreMainMenuPage,
diff --git a/src/core/features/mainmenu/pages/menu/menu.html b/src/core/features/mainmenu/pages/menu/menu.html
index 893737e2f..18a5bb380 100644
--- a/src/core/features/mainmenu/pages/menu/menu.html
+++ b/src/core/features/mainmenu/pages/menu/menu.html
@@ -4,6 +4,8 @@
         [@menuShowHideAnimation]="tabsPlacement == 'side' ? '' : (isMainScreen ? 'visible' : 'hidden')">
         <ion-spinner *ngIf="!loaded" [attr.aria-label]="'core.loading' | translate"></ion-spinner>
 
+        <core-user-menu-button *ngIf="loaded && tabsPlacement == 'side'"></core-user-menu-button>
+
         <ion-tab-button *ngFor="let tab of tabs" (keydown)="tabAction.keyDown($event)" (keyup)="tabAction.keyUp(tab.page, $event)"
             [hidden]="!loaded && tab.hide" [tab]="tab.page" [disabled]="tab.hide" layout="label-hide" class="{{tab.class}}"
             [selected]="tab.page === selectedTab" [tabindex]="selectedTab == tab.page ? 0 : -1" [attr.aria-controls]="tab.id">
diff --git a/src/core/features/mainmenu/pages/menu/menu.scss b/src/core/features/mainmenu/pages/menu/menu.scss
index 7f362ec1d..b359d98f0 100644
--- a/src/core/features/mainmenu/pages/menu/menu.scss
+++ b/src/core/features/mainmenu/pages/menu/menu.scss
@@ -71,7 +71,7 @@
 
             @include padding(var(--ion-safe-area-top), 0px, var(--ion-safe-area-bottom), var(--ion-safe-area-left));
 
-            ion-tab-button {
+            ion-tab-button, core-user-menu-button {
                 width: 100%;
                 min-height: var(--menutabbar-size);
                 flex: 0;
@@ -83,6 +83,12 @@
         }
     }
 
+    core-user-menu-button {
+        align-items: center;
+        display: flex;
+        justify-content: center;
+    }
+
     .core-network-message {
         --network-message-height: 16px;
         position: absolute;

From d3ffc45be334637dd65faef48f8967576b3b5eb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 29 Oct 2021 12:36:42 +0200
Subject: [PATCH 0180/1008] MOBILE-3807 usermenu: Change UI and texts

---
 scripts/langindex.json                        |  1 +
 .../login/components/sites/sites.html         |  5 +-
 .../features/login/pages/sites/sites.html     |  2 +-
 .../features/login/services/login-helper.ts   | 19 +++---
 .../components/user-menu/user-menu.html       | 37 ++++-------
 .../components/user-menu/user-menu.scss       | 16 -----
 .../pages/space-usage/space-usage.html        |  2 +-
 .../synchronization/synchronization.html      |  2 +-
 src/core/features/user/pages/about/about.html | 63 +++++++++++--------
 src/core/services/sites.ts                    | 12 ++--
 10 files changed, 71 insertions(+), 88 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 093646fcf..b269f6b62 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -2255,6 +2255,7 @@
   "core.user.participants": "moodle",
   "core.user.phone1": "moodle",
   "core.user.phone2": "moodle",
+  "core.user.profile": "moodle",
   "core.user.roles": "moodle",
   "core.user.sendemail": "local_moodlemobileapp",
   "core.user.student": "moodle/defaultcoursestudent",
diff --git a/src/core/features/login/components/sites/sites.html b/src/core/features/login/components/sites/sites.html
index 20ee59b87..5cf1c7fae 100644
--- a/src/core/features/login/components/sites/sites.html
+++ b/src/core/features/login/components/sites/sites.html
@@ -26,7 +26,8 @@
                             <core-format-text [text]="accountsList.currentSite.siteName" clean="true"
                                 [siteId]="accountsList.currentSite.id"></core-format-text>
                         </h2>
-                        <p><a [href]="accountsList.currentSite.siteUrl" core-link autoLogin="yes">{{ accountsList.currentSite.siteUrl }}</a>
+                        <p><a [href]="accountsList.currentSite.siteUrl" core-link autoLogin="yes">{{
+                                accountsList.currentSite.siteUrlWithoutProtocol }}</a>
                         </p>
                     </ion-label>
                 </ion-item-divider>
@@ -52,7 +53,7 @@
                         <h2>
                             <core-format-text [text]="sites[0].siteName" clean="true" [siteId]="sites[0].id"></core-format-text>
                         </h2>
-                        <p><a [href]="sites[0].siteUrl" core-link autoLogin="no">{{ sites[0].siteUrl }}</a></p>
+                        <p><a [href]="sites[0].siteUrl" core-link autoLogin="no">{{ sites[0].siteUrlWithoutProtocol }}</a></p>
                     </ion-label>
                 </ion-item-divider>
 
diff --git a/src/core/features/login/pages/sites/sites.html b/src/core/features/login/pages/sites/sites.html
index b9d3ed2b7..a47a65f2f 100644
--- a/src/core/features/login/pages/sites/sites.html
+++ b/src/core/features/login/pages/sites/sites.html
@@ -26,7 +26,7 @@
                         <h2>
                             <core-format-text [text]="sites[0].siteName" clean="true" [siteId]="sites[0].id"></core-format-text>
                         </h2>
-                        <p><a [href]="sites[0].siteUrl" core-link autoLogin="no">{{ sites[0].siteUrl }}</a></p>
+                        <p><a [href]="sites[0].siteUrl" core-link autoLogin="no">{{ sites[0].siteUrlWithoutProtocol }}</a></p>
                     </ion-label>
                 </ion-item-divider>
 
diff --git a/src/core/features/login/services/login-helper.ts b/src/core/features/login/services/login-helper.ts
index 545898b2b..627547671 100644
--- a/src/core/features/login/services/login-helper.ts
+++ b/src/core/features/login/services/login-helper.ts
@@ -1357,25 +1357,23 @@ export class CoreLoginHelperProvider {
             const index = sites.findIndex((site) => site.id == currentSiteId);
 
             accountsList.currentSite = sites.splice(index, 1)[0];
-            siteUrl = accountsList.currentSite.siteUrl.replace(/^https?:\/\//, '').toLowerCase();
-            accountsList.currentSite.siteUrl = siteUrl;
+            siteUrl = accountsList.currentSite.siteUrlWithoutProtocol;
         }
 
         const otherSites: Record<string, CoreSiteBasicInfo[]> = {};
 
         // Add site counter and classify sites.
         await Promise.all(sites.map(async (site) => {
-            site.siteUrl = site.siteUrl.replace(/^https?:\/\//, '').toLowerCase();
             site.badge = await CoreUtils.ignoreErrors(CorePushNotifications.getSiteCounter(site.id)) || 0;
 
-            if (site.siteUrl == siteUrl) {
+            if (site.siteUrlWithoutProtocol == siteUrl) {
                 accountsList.sameSite.push(site);
             } else {
-                if (!otherSites[site.siteUrl]) {
-                    otherSites[site.siteUrl] = [];
+                if (!otherSites[site.siteUrlWithoutProtocol]) {
+                    otherSites[site.siteUrlWithoutProtocol] = [];
                 }
 
-                otherSites[site.siteUrl].push(site);
+                otherSites[site.siteUrlWithoutProtocol].push(site);
             }
 
             return;
@@ -1396,11 +1394,11 @@ export class CoreLoginHelperProvider {
     async deleteAccountFromList(accountsList: CoreAccountsList, site: CoreSiteBasicInfo): Promise<void> {
         await CoreSites.deleteSite(site.id);
 
-        const siteUrl = site.siteUrl;
+        const siteUrl = site.siteUrlWithoutProtocol;
         let index = 0;
 
         // Found on same site.
-        if (accountsList.sameSite.length > 0 && accountsList.sameSite[0].siteUrl == siteUrl) {
+        if (accountsList.sameSite.length > 0 && accountsList.sameSite[0].siteUrlWithoutProtocol == siteUrl) {
             index = accountsList.sameSite.findIndex((listedSite) => listedSite.id == site.id);
             if (index >= 0) {
                 accountsList.sameSite.splice(index, 1);
@@ -1410,7 +1408,8 @@ export class CoreLoginHelperProvider {
             return;
         }
 
-        const otherSiteIndex = accountsList.otherSites.findIndex((sites) => sites.length > 0 && sites[0].siteUrl == siteUrl);
+        const otherSiteIndex = accountsList.otherSites.findIndex((sites) =>
+            sites.length > 0 && sites[0].siteUrlWithoutProtocol == siteUrl);
         if (otherSiteIndex < 0) {
             // Site Url not found.
             return;
diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.html b/src/core/features/mainmenu/components/user-menu/user-menu.html
index 4cb01be69..c36894446 100644
--- a/src/core/features/mainmenu/components/user-menu/user-menu.html
+++ b/src/core/features/mainmenu/components/user-menu/user-menu.html
@@ -8,32 +8,19 @@
         <h1>
             {{'core.user.account' | translate}}
         </h1>
-        <ion-buttons slot="end" *ngIf="loaded">
-            <ion-button fill="clear" *ngIf="moreSites" (click)="switchAccounts($event)"
-                [attr.aria-label]="'core.mainmenu.changeaccount' | translate">
-                <ion-icon name="fas-exchange-alt" slot="icon-only" aria-hidden="true"></ion-icon>
-            </ion-button>
-            <ion-button fill="clear" *ngIf="!moreSites" (click)="addAccount($event)"
-                [attr.aria-label]="'core.login.add' | translate">
-                <ion-icon name="fas-user-plus" slot="icon-only" aria-hidden="true"></ion-icon>
-            </ion-button>
-        </ion-buttons>
     </ion-toolbar>
 </ion-header>
 <ion-content>
     <ion-list>
-        <ion-item class="ion-text-center core-user-profile-maininfo" *ngIf="siteInfo" lines="none">
-            <core-user-avatar [user]="siteInfo" [userId]="siteInfo.userid" [linkProfile]="false"></core-user-avatar>
+        <ion-item button class="core-user-profile-maininfo" *ngIf="siteInfo" lines="full" (click)="switchAccounts($event)" detail="true"
+            [attr.aria-label]="'core.mainmenu.switchaccount' | translate">
+            <core-user-avatar [user]="siteInfo" [userId]="siteInfo.userid" [linkProfile]="false" slot="start"></core-user-avatar>
             <ion-label>
                 <h2>{{ siteInfo.fullname }}</h2>
                 <p class="core-usermenu-siteinfo core-usermenu-sitename">
-                    <core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="0"
-                        [wsNotFiltered]="true">
+                    <core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="0" [wsNotFiltered]="true">
                     </core-format-text>
                 </p>
-                <p class="core-usermenu-siteinfo core-usermenu-siteurl">
-                    <a [href]="siteUrl" core-link autoLogin="yes">{{ siteUrl }}</a>
-                </p>
             </ion-label>
         </ion-item>
 
@@ -41,7 +28,7 @@
             [attr.aria-label]="'core.user.details' | translate" detail="true" lines="none">
             <ion-icon name="fas-user" slot="start" aria-hidden="true"></ion-icon>
             <ion-label>
-                <p class="item-heading">{{ 'core.user.details' | translate }}</p>
+                <p class="item-heading">{{ 'core.user.profile' | translate }}</p>
             </ion-label>
         </ion-item>
 
@@ -51,17 +38,17 @@
             </ion-label>
         </ion-item>
 
-        <ion-item button *ngFor="let handler of handlers" class="ion-text-wrap"
-            (click)="handlerClicked($event, handler)" [ngClass]="['core-user-menu-handler', handler.class || '']"
-            [hidden]="handler.hidden" [attr.aria-label]="handler.title | translate" detail="true" lines="none">
+        <ion-item button *ngFor="let handler of handlers" class="ion-text-wrap" (click)="handlerClicked($event, handler)"
+            [ngClass]="['core-user-menu-handler', handler.class || '']" [hidden]="handler.hidden"
+            [attr.aria-label]="handler.title | translate" detail="true" lines="none">
             <ion-icon *ngIf="handler.icon" [name]="handler.icon" slot="start" aria-hidden="true"></ion-icon>
             <ion-label>
                 <p class="item-heading">{{ handler.title | translate }}</p>
             </ion-label>
         </ion-item>
 
-        <ion-item button (click)="openPreferences($event)" [attr.aria-label]="'core.settings.preferences' | translate"
-            detail="true" class="core-user-menu-preferences">
+        <ion-item button (click)="openPreferences($event)" [attr.aria-label]="'core.settings.preferences' | translate" detail="true"
+            class="core-user-menu-preferences">
             <ion-icon name="fas-wrench" slot="start" aria-hidden="true"></ion-icon>
             <ion-label>
                 <p class="item-heading">{{ 'core.settings.preferences' | translate }}</p>
@@ -70,8 +57,8 @@
     </ion-list>
 </ion-content>
 <ion-footer class="ion-padding">
-    <ion-button (click)="logout($event)" expand="block" color="danger"
-        [attr.aria-label]="'core.mainmenu.logout' | translate" class="ion-text-wrap">
+    <ion-button (click)="logout($event)" expand="block" color="danger" [attr.aria-label]="'core.mainmenu.logout' | translate"
+        class="ion-text-wrap">
         <ion-icon name="fas-sign-out-alt" slot="start" aria-hidden="true"></ion-icon>
         {{ 'core.mainmenu.logout' | translate }}
     </ion-button>
diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.scss b/src/core/features/mainmenu/components/user-menu/user-menu.scss
index bae1b1d30..74e3b93a4 100644
--- a/src/core/features/mainmenu/components/user-menu/user-menu.scss
+++ b/src/core/features/mainmenu/components/user-menu/user-menu.scss
@@ -1,22 +1,6 @@
 @import "~theme/globals";
 
 :host {
-    .core-user-profile-maininfo::part(native) {
-        flex-direction: column;
-    }
-
-    ::ng-deep {
-        core-user-avatar {
-            display: block;
-            --core-avatar-size: var(--core-large-avatar-size);
-            height: calc(var(--core-avatar-size) + 16px);
-
-            img {
-                margin: 8px auto;
-            }
-        }
-    }
-
     .core-user-menu-preferences {
         --inner-border-width: 0;
         --border-width: 1px 0 0 0; 
diff --git a/src/core/features/settings/pages/space-usage/space-usage.html b/src/core/features/settings/pages/space-usage/space-usage.html
index aa17b099a..6d1343a40 100644
--- a/src/core/features/settings/pages/space-usage/space-usage.html
+++ b/src/core/features/settings/pages/space-usage/space-usage.html
@@ -25,7 +25,7 @@
                         <core-format-text [text]="site.siteName" clean="true" [siteId]="site.id"></core-format-text>
                     </p>
                     <p class="ion-text-wrap">{{ site.fullName }}</p>
-                    <p>{{ site.siteUrl }}</p>
+                    <p>{{ site.siteUrlWithoutProtocol }}</p>
                 </ion-label>
                 <p *ngIf="site.spaceUsage !== undefined" slot="end">
                     {{ site.spaceUsage | coreBytesToSize }}
diff --git a/src/core/features/settings/pages/synchronization/synchronization.html b/src/core/features/settings/pages/synchronization/synchronization.html
index 625d67b88..31fe30857 100644
--- a/src/core/features/settings/pages/synchronization/synchronization.html
+++ b/src/core/features/settings/pages/synchronization/synchronization.html
@@ -37,7 +37,7 @@
                         <core-format-text [text]="site.siteName" clean="true" [siteId]="site.id"></core-format-text>
                     </p>
                     <p>{{ site.fullName }}</p>
-                    <p>{{ site.siteUrl }}</p>
+                    <p>{{ site.siteUrlWithoutProtocol }}</p>
                 </ion-label>
                 <core-button-with-spinner [loading]="isSynchronizing(site.id)" slot="end">
                     <ion-button fill="clear" (click)="synchronize(site.id)" [title]="site.siteName"
diff --git a/src/core/features/user/pages/about/about.html b/src/core/features/user/pages/about/about.html
index cb828fb03..03abbef38 100644
--- a/src/core/features/user/pages/about/about.html
+++ b/src/core/features/user/pages/about/about.html
@@ -3,7 +3,7 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ 'core.user.details' | translate }}</h1>
+        <h1>{{ 'core.user.profile' | translate }}</h1>
     </ion-toolbar>
 </ion-header>
 <ion-content>
@@ -14,56 +14,55 @@
         <ion-list *ngIf="user">
             <ion-item class="ion-text-center core-user-profile-maininfo" lines="full">
                 <core-user-avatar [user]="user" [userId]="user.id" [linkProfile]="false" [checkOnline]="true">
-                        <ion-button
-                            class="edit-avatar"
-                            *ngIf="canChangeProfilePicture"
-                            (click)="changeProfilePicture()"
-                            [attr.aria-label]="'core.user.newpicture' | translate"
-                            fill="clear"
-                            color="dark"
-                        >
+                    <ion-button class="edit-avatar" *ngIf="canChangeProfilePicture" (click)="changeProfilePicture()"
+                        [attr.aria-label]="'core.user.newpicture' | translate" fill="clear" color="dark">
                         <ion-icon slot="icon-only" name="fas-pen" aria-hidden="true"></ion-icon>
                     </ion-button>
                 </core-user-avatar>
                 <ion-label>
                     <h2>{{ user.fullname }}</h2>
-                    <p *ngIf="user.address"><ion-icon name="fas-map-marker-alt" [attr.aria-hidden]="true"></ion-icon> {{ user.address }}</p>
+                    <p *ngIf="user.address">
+                        <ion-icon name="fas-map-marker-alt" [attr.aria-hidden]="true"></ion-icon> {{ user.address }}
+                    </p>
                 </ion-label>
             </ion-item>
 
             <ion-item-group *ngIf="hasContact">
-                <ion-item-divider><ion-label><h2>{{ 'core.user.contact' | translate}}</h2></ion-label></ion-item-divider>
+                <ion-item-divider>
+                    <ion-label>
+                        <h2>{{ 'core.user.contact' | translate}}</h2>
+                    </ion-label>
+                </ion-item-divider>
                 <ion-item class="ion-text-wrap" *ngIf="user.email">
                     <ion-label>
                         <h2>{{ 'core.user.email' | translate }}</h2>
-                        <p><a class="core-anchor" href="mailto:{{user.email}}" core-link auto-login="no"
-                                [showBrowserWarning]="false">
-                            {{ user.email }}
-                        </a></p>
+                        <p><a class="core-anchor" href="mailto:{{user.email}}" core-link auto-login="no" [showBrowserWarning]="false">
+                                {{ user.email }}
+                            </a></p>
                     </ion-label>
                 </ion-item>
                 <ion-item class="ion-text-wrap" *ngIf="user.phone1">
                     <ion-label>
                         <h2>{{ 'core.user.phone1' | translate}}</h2>
                         <p><a class="core-anchor" href="tel:{{user.phone1}}" core-link auto-login="no" [showBrowserWarning]="false">
-                            {{ user.phone1 }}
-                        </a></p>
+                                {{ user.phone1 }}
+                            </a></p>
                     </ion-label>
                 </ion-item>
                 <ion-item class="ion-text-wrap" *ngIf="user.phone2">
                     <ion-label>
                         <h2>{{ 'core.user.phone2' | translate}}</h2>
                         <p><a class="core-anchor" href="tel:{{user.phone2}}" core-link auto-login="no" [showBrowserWarning]="false">
-                            {{ user.phone2 }}
-                        </a></p>
+                                {{ user.phone2 }}
+                            </a></p>
                     </ion-label>
                 </ion-item>
                 <ion-item class="ion-text-wrap" *ngIf="formattedAddress">
                     <ion-label>
                         <h2>{{ 'core.user.address' | translate}}</h2>
                         <p><a class="core-anchor" [href]="encodedAddress" core-link auto-login="no" [showBrowserWarning]="false">
-                            {{ formattedAddress }}
-                        </a></p>
+                                {{ formattedAddress }}
+                            </a></p>
                     </ion-label>
                 </ion-item>
                 <ion-item class="ion-text-wrap" *ngIf="user.city && !formattedAddress">
@@ -80,13 +79,17 @@
                 </ion-item>
             </ion-item-group>
             <ion-item-group *ngIf="hasDetails">
-                <ion-item-divider><ion-label><h2>{{ 'core.userdetails' | translate}}</h2></ion-label></ion-item-divider>
+                <ion-item-divider>
+                    <ion-label>
+                        <h2>{{ 'core.userdetails' | translate}}</h2>
+                    </ion-label>
+                </ion-item-divider>
                 <ion-item class="ion-text-wrap" *ngIf="user.url">
                     <ion-label>
                         <h2>{{ 'core.user.webpage' | translate}}</h2>
                         <p><a class="core-anchor" href="{{user.url}}" core-link>
-                            {{ user.url }}
-                        </a></p>
+                                {{ user.url }}
+                            </a></p>
                     </ion-label>
                 </ion-item>
                 <ion-item class="ion-text-wrap" *ngIf="user.interests">
@@ -100,11 +103,17 @@
                 </core-user-profile-field>
             </ion-item-group>
             <ion-item-group *ngIf="user.description">
-                <ion-item-divider><ion-label><h2>{{ 'core.user.description' | translate}}</h2></ion-label></ion-item-divider>
+                <ion-item-divider>
+                    <ion-label>
+                        <h2>{{ 'core.user.description' | translate}}</h2>
+                    </ion-label>
+                </ion-item-divider>
                 <ion-item class="ion-text-wrap">
                     <ion-label>
-                        <p><core-format-text [text]="user.description" contextLevel="user" [contextInstanceId]="user.id">
-                        </core-format-text></p>
+                        <p>
+                            <core-format-text [text]="user.description" contextLevel="user" [contextInstanceId]="user.id">
+                            </core-format-text>
+                        </p>
                     </ion-label>
                 </ion-item>
             </ion-item-group>
diff --git a/src/core/services/sites.ts b/src/core/services/sites.ts
index 3b77bf38b..abbcc0de6 100644
--- a/src/core/services/sites.ts
+++ b/src/core/services/sites.ts
@@ -1052,8 +1052,10 @@ export class CoreSitesProvider {
      * @param siteId The site ID. If not defined, current site (if available).
      * @return Promise resolved with site home ID.
      */
-    getSiteHomeId(siteId?: string): Promise<number> {
-        return this.getSite(siteId).then((site) => site.getSiteHomeId());
+    async getSiteHomeId(siteId?: string): Promise<number> {
+        const site = await this.getSite(siteId);
+
+        return site.getSiteHomeId();
     }
 
     /**
@@ -1074,6 +1076,7 @@ export class CoreSitesProvider {
                 const basicInfo: CoreSiteBasicInfo = {
                     id: site.id,
                     siteUrl: site.siteUrl,
+                    siteUrlWithoutProtocol: site.siteUrl.replace(/^https?:\/\//, '').toLowerCase(),
                     fullName: siteInfo?.fullname,
                     siteName: CoreConstants.CONFIG.sitename == '' ? siteInfo?.sitename: CoreConstants.CONFIG.sitename,
                     avatar: siteInfo?.userpictureurl,
@@ -1098,9 +1101,7 @@ export class CoreSitesProvider {
         // Sort sites by url and fullname.
         sites.sort((a, b) => {
             // First compare by site url without the protocol.
-            const urlA = a.siteUrl.replace(/^https?:\/\//, '').toLowerCase();
-            const urlB = b.siteUrl.replace(/^https?:\/\//, '').toLowerCase();
-            const compare = urlA.localeCompare(urlB);
+            const compare = a.siteUrlWithoutProtocol.localeCompare(b.siteUrlWithoutProtocol);
 
             if (compare !== 0) {
                 return compare;
@@ -1756,6 +1757,7 @@ export type CoreSiteUserTokenResponse = {
 export type CoreSiteBasicInfo = {
     id: string; // Site ID.
     siteUrl: string; // Site URL.
+    siteUrlWithoutProtocol: string; // Site URL without protocol.
     fullName?: string; // User's full name.
     siteName?: string; // Site's name.
     avatar?: string; // User's avatar.

From 898f01632d77aba4689512e29715f1351efb81b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 2 Nov 2021 11:42:28 +0100
Subject: [PATCH 0181/1008] MOBILE-3807 usermenu: Add badges coming from more
 menu

---
 .../components/user-menu/user-menu.html       |  8 ++++++++
 .../features/user/pages/profile/profile.html  | 19 ++++++++++++++----
 .../features/user/services/user-delegate.ts   | 20 +++++++++++++++++++
 3 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.html b/src/core/features/mainmenu/components/user-menu/user-menu.html
index c36894446..34a9184f7 100644
--- a/src/core/features/mainmenu/components/user-menu/user-menu.html
+++ b/src/core/features/mainmenu/components/user-menu/user-menu.html
@@ -45,6 +45,14 @@
             <ion-label>
                 <p class="item-heading">{{ handler.title | translate }}</p>
             </ion-label>
+            <ion-badge slot="end" *ngIf="handler.showBadge" [hidden]="handler.loading || !handler.badge" aria-hidden="true">
+                {{handler.badge}}
+            </ion-badge>
+            <span *ngIf="handler.showBadge && handler.badge && handler.badgeA11yText" class="sr-only">
+                {{ handler.badgeA11yText | translate: {$a : handler.badge } }}
+            </span>
+            <ion-spinner slot="end" *ngIf="handler.showBadge && handler.loading" [attr.aria-label]="'core.loading' | translate">
+            </ion-spinner>
         </ion-item>
 
         <ion-item button (click)="openPreferences($event)" [attr.aria-label]="'core.settings.preferences' | translate" detail="true"
diff --git a/src/core/features/user/pages/profile/profile.html b/src/core/features/user/pages/profile/profile.html
index a5c7112e8..ce58f5ae1 100644
--- a/src/core/features/user/pages/profile/profile.html
+++ b/src/core/features/user/pages/profile/profile.html
@@ -17,7 +17,9 @@
                 </core-user-avatar>
                 <ion-label>
                     <h2>{{ user.fullname }}</h2>
-                    <p *ngIf="user.address"><ion-icon name="fas-map-marker-alt" [attr.aria-hidden]="true"></ion-icon> {{ user.address }}</p>
+                    <p *ngIf="user.address">
+                        <ion-icon name="fas-map-marker-alt" [attr.aria-hidden]="true"></ion-icon> {{ user.address }}
+                    </p>
                     <p *ngIf="rolesFormatted" class="ion-text-wrap">
                         <strong>{{ 'core.user.roles' | translate}}</strong>{{'core.labelsep' | translate}}
                         {{ rolesFormatted }}
@@ -51,7 +53,9 @@
                 </ion-label>
             </ion-item>
             <ion-item class="ion-text-center core-loading-handlers" *ngIf="isLoadingHandlers">
-                <ion-label><ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner></ion-label>
+                <ion-label>
+                    <ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner>
+                </ion-label>
             </ion-item>
 
             <ion-item button *ngFor="let handler of newPageHandlers" class="ion-text-wrap" (click)="handlerClicked($event, handler)"
@@ -61,6 +65,14 @@
                 <ion-label>
                     <p class="item-heading">{{ handler.title | translate }}</p>
                 </ion-label>
+                <ion-badge slot="end" *ngIf="handler.showBadge" [hidden]="handler.loading || !handler.badge" aria-hidden="true">
+                    {{handler.badge}}
+                </ion-badge>
+                <span *ngIf="handler.showBadge && handler.badge && handler.badgeA11yText" class="sr-only">
+                    {{ handler.badgeA11yText | translate: {$a : handler.badge } }}
+                </span>
+                <ion-spinner slot="end" *ngIf="handler.showBadge && handler.loading" [attr.aria-label]="'core.loading' | translate">
+                </ion-spinner>
             </ion-item>
 
             <ion-item *ngIf="actionHandlers && actionHandlers.length">
@@ -76,8 +88,7 @@
             </ion-item>
         </ion-list>
 
-        <core-empty-box *ngIf="!user && !isDeleted && isEnrolled" icon="far-user"
-            [message]=" 'core.user.detailsnotavailable' | translate">
+        <core-empty-box *ngIf="!user && !isDeleted && isEnrolled" icon="far-user" [message]=" 'core.user.detailsnotavailable' | translate">
         </core-empty-box>
         <core-empty-box *ngIf="isDeleted" icon="far-user" [message]="'core.userdeleted' | translate"></core-empty-box>
         <core-empty-box *ngIf="!isEnrolled" icon="far-user" [message]="'core.notenrolledprofile' | translate"></core-empty-box>
diff --git a/src/core/features/user/services/user-delegate.ts b/src/core/features/user/services/user-delegate.ts
index 5901fa17d..b16a36787 100644
--- a/src/core/features/user/services/user-delegate.ts
+++ b/src/core/features/user/services/user-delegate.ts
@@ -111,6 +111,26 @@ export interface CoreUserProfileHandlerData {
      */
     spinner?: boolean;
 
+    /**
+     * If the handler has badge to show or not. Only for TYPE_NEW_PAGE.
+     */
+    showBadge?: boolean;
+
+    /**
+     * Text to display on the badge. Only used if showBadge is true and only for TYPE_NEW_PAGE.
+     */
+    badge?: string;
+
+    /**
+     * Accessibility text to add on the badge. Only used if showBadge is true and only for TYPE_NEW_PAGE.
+     */
+    badgeA11yText?: string;
+
+    /**
+     * If true, the badge number is being loaded. Only used if showBadge is true and only for TYPE_NEW_PAGE.
+     */
+    loading?: boolean;
+
     /**
      * Action to do when clicked.
      *

From 94c656d015b0ca493ec34b14c9e5fec0d6b59444 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 2 Nov 2021 08:40:40 +0100
Subject: [PATCH 0182/1008] MOBILE-3901 insights: Support insight action links

---
 scripts/langindex.json                        |   6 +
 src/addons/addons.module.ts                   |   2 +
 src/addons/report/insights/insights.module.ts |  33 ++++++
 src/addons/report/insights/lang.json          |   8 ++
 .../insights/services/handlers/action-link.ts | 104 ++++++++++++++++++
 .../report/insights/services/insights.ts      |  93 ++++++++++++++++
 src/addons/report/report.module.ts            |  23 ++++
 7 files changed, 269 insertions(+)
 create mode 100644 src/addons/report/insights/insights.module.ts
 create mode 100644 src/addons/report/insights/lang.json
 create mode 100644 src/addons/report/insights/services/handlers/action-link.ts
 create mode 100644 src/addons/report/insights/services/insights.ts
 create mode 100644 src/addons/report/report.module.ts

diff --git a/scripts/langindex.json b/scripts/langindex.json
index b269f6b62..1df9a198e 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1073,6 +1073,12 @@
   "addon.privatefiles.sitefiles": "moodle",
   "addon.qtype_essay.maxwordlimitboundary": "qtype_essay",
   "addon.qtype_essay.minwordlimitboundary": "qtype_essay",
+  "addon.report_insights.actionsaved": "report_insights",
+  "addon.report_insights.fixedack": "analytics",
+  "addon.report_insights.incorrectlyflagged": "analytics",
+  "addon.report_insights.notapplicable": "analytics",
+  "addon.report_insights.notuseful": "analytics",
+  "addon.report_insights.useful": "analytics",
   "addon.storagemanager.deletecourse": "local_moodlemobileapp",
   "addon.storagemanager.deletecourses": "local_moodlemobileapp",
   "addon.storagemanager.deletedatafrom": "local_moodlemobileapp",
diff --git a/src/addons/addons.module.ts b/src/addons/addons.module.ts
index d7fd185a5..e74659659 100644
--- a/src/addons/addons.module.ts
+++ b/src/addons/addons.module.ts
@@ -30,6 +30,7 @@ import { AddonPrivateFilesModule } from './privatefiles/privatefiles.module';
 import { AddonQbehaviourModule } from './qbehaviour/qbehaviour.module';
 import { AddonQtypeModule } from './qtype/qtype.module';
 import { AddonRemoteThemesModule } from './remotethemes/remotethemes.module';
+import { AddonReportModule } from './report/report.module';
 import { AddonStorageManagerModule } from './storagemanager/storagemanager.module';
 import { AddonUserProfileFieldModule } from './userprofilefield/userprofilefield.module';
 
@@ -51,6 +52,7 @@ import { AddonUserProfileFieldModule } from './userprofilefield/userprofilefield
         AddonQbehaviourModule,
         AddonQtypeModule,
         AddonRemoteThemesModule,
+        AddonReportModule,
         AddonStorageManagerModule,
         AddonUserProfileFieldModule,
     ],
diff --git a/src/addons/report/insights/insights.module.ts b/src/addons/report/insights/insights.module.ts
new file mode 100644
index 000000000..cd4a43f9b
--- /dev/null
+++ b/src/addons/report/insights/insights.module.ts
@@ -0,0 +1,33 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { APP_INITIALIZER, NgModule } from '@angular/core';
+
+import { CoreContentLinksDelegate } from '@features/contentlinks/services/contentlinks-delegate';
+import { AddonReportInsightsActionLinkHandler } from './services/handlers/action-link';
+
+@NgModule({
+    imports: [],
+    exports: [],
+    providers: [
+        {
+            provide: APP_INITIALIZER,
+            multi: true,
+            useValue: () => {
+                CoreContentLinksDelegate.registerHandler(AddonReportInsightsActionLinkHandler.instance);
+            },
+        },
+    ],
+})
+export class AddonReportInsightsModule {}
diff --git a/src/addons/report/insights/lang.json b/src/addons/report/insights/lang.json
new file mode 100644
index 000000000..9f2b8b7b4
--- /dev/null
+++ b/src/addons/report/insights/lang.json
@@ -0,0 +1,8 @@
+{
+    "actionsaved": "Your feedback of '{{$a}}' has been saved",
+    "fixedack": "Accept",
+    "incorrectlyflagged": "Incorrectly flagged",
+    "notapplicable": "Not applicable",
+    "notuseful": "Not useful",
+    "useful": "Useful"
+}
diff --git a/src/addons/report/insights/services/handlers/action-link.ts b/src/addons/report/insights/services/handlers/action-link.ts
new file mode 100644
index 000000000..aad2a84fc
--- /dev/null
+++ b/src/addons/report/insights/services/handlers/action-link.ts
@@ -0,0 +1,104 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { Injectable } from '@angular/core';
+
+import { CoreContentLinksHandlerBase } from '@features/contentlinks/classes/base-handler';
+import { CoreContentLinksAction } from '@features/contentlinks/services/contentlinks-delegate';
+import { CoreContentLinksHelper } from '@features/contentlinks/services/contentlinks-helper';
+import { CoreSites } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
+import { makeSingleton, Translate } from '@singletons';
+import { AddonReportInsights } from '../insights';
+
+// Bulk actions supported, along with the related lang string.
+const BULK_ACTIONS = {
+    fixed: 'addon.report_insights.fixedack',
+    incorrectlyflagged: 'addon.report_insights.incorrectlyflagged',
+    notapplicable: 'addon.report_insights.notapplicable',
+    notuseful: 'addon.report_insights.notuseful',
+    useful: 'addon.report_insights.useful',
+};
+
+/**
+ * Content links handler for calendar view page.
+ */
+@Injectable({ providedIn: 'root' })
+export class AddonReportInsightsActionLinkHandlerService extends CoreContentLinksHandlerBase {
+
+    name = 'AddonReportInsightsActionLinkHandler';
+    pattern = /\/report\/insights\/action\.php/;
+
+    /**
+     * @inheritdoc
+     */
+    getActions(
+        siteIds: string[],
+        url: string,
+        params: Record<string, string>,
+    ): CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
+        return [{
+            action: async (siteId?: string): Promise<void> => {
+                // Send the action.
+                const modal = await CoreDomUtils.showModalLoading('core.sending', true);
+
+                try {
+                    await AddonReportInsights.sendActionExecuted(params.action, [Number(params.predictionid)], siteId);
+                } catch (error) {
+                    CoreDomUtils.showErrorModal(error);
+
+                    return;
+                } finally {
+                    modal.dismiss();
+                }
+
+                if (BULK_ACTIONS[params.action]) {
+                    // Done, display a toast.
+                    CoreDomUtils.showToast(Translate.instant('addon.report_insights.actionsaved', {
+                        $a: Translate.instant(BULK_ACTIONS[params.action]),
+                    }));
+                } else if (!params.forwardurl) {
+                    // Forward URL not defined, display a toast.
+                    CoreDomUtils.showToast('core.success', true);
+                } else {
+                    // Try to open the link in the app.
+                    const forwardUrl = decodeURIComponent(params.forwardurl);
+
+                    const treated = await CoreContentLinksHelper.handleLink(forwardUrl);
+                    if (!treated) {
+                        // Cannot be opened in the app, open in browser.
+                        const site = await CoreSites.getSite(siteId);
+
+                        await site.openInBrowserWithAutoLoginIfSameSite(forwardUrl);
+                    }
+                }
+            },
+        }];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async isEnabled(siteId: string, url: string, params: Record<string, string>): Promise<boolean> {
+        if (!params.action || !params.predictionid) {
+            // Required params missing.
+            return false;
+        }
+
+        return await AddonReportInsights.canSendActionInSite(siteId);
+    }
+
+}
+
+export const AddonReportInsightsActionLinkHandler = makeSingleton(AddonReportInsightsActionLinkHandlerService);
diff --git a/src/addons/report/insights/services/insights.ts b/src/addons/report/insights/services/insights.ts
new file mode 100644
index 000000000..003a18612
--- /dev/null
+++ b/src/addons/report/insights/services/insights.ts
@@ -0,0 +1,93 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { Injectable } from '@angular/core';
+
+import { CoreSites } from '@services/sites';
+import { CoreSite } from '@classes/site';
+import { makeSingleton } from '@singletons';
+import { CoreWSExternalWarning } from '@services/ws';
+import { CoreWSError } from '@classes/errors/wserror';
+
+/**
+ * Service to handle insights.
+ */
+@Injectable({ providedIn: 'root' })
+export class AddonReportInsightsService {
+
+    /**
+     * Check if site supports sending insight actions.
+     *
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: whether it's supported.
+     */
+    async canSendActionInSite(siteId?: string): Promise<boolean> {
+        const site = await CoreSites.getSite(siteId);
+
+        return this.canSendAction(site);
+    }
+
+    /**
+     * Check if site supports sending insight actions.
+     *
+     * @param site Site. If not defined, current site.
+     * @return Whether it's supported.
+     */
+    canSendAction(site?: CoreSite): boolean {
+        site = site || CoreSites.getCurrentSite();
+
+        return !!site?.wsAvailable('report_insights_action_executed');
+    }
+
+    /**
+     * Send an action.
+     *
+     * @param actionName Action name.
+     * @param ids List of IDs.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if success.
+     */
+    async sendActionExecuted(actionName: string, ids: number[], siteId?: string): Promise<void> {
+        const site = await CoreSites.getSite(siteId);
+
+        const params: AddonReportInsightsActionExecutedWSParams = {
+            actionname: actionName,
+            predictionids: ids,
+        };
+
+        const result = await site.write<AddonReportInsightsActionExecutedWSResult>('report_insights_action_executed', params);
+
+        if (result.warnings?.length) {
+            throw new CoreWSError(result.warnings[0]);
+        }
+    }
+
+}
+
+export const AddonReportInsights = makeSingleton(AddonReportInsightsService);
+
+/**
+ * Params of WS report_insights_action_executed.
+ */
+export type AddonReportInsightsActionExecutedWSParams = {
+    actionname: string; // The name of the action.
+    predictionids: number[]; // Array of prediction ids.
+};
+
+/**
+ * Result of WS report_insights_action_executed.
+ */
+export type AddonReportInsightsActionExecutedWSResult = {
+    warnings?: CoreWSExternalWarning[];
+};
diff --git a/src/addons/report/report.module.ts b/src/addons/report/report.module.ts
new file mode 100644
index 000000000..e544caede
--- /dev/null
+++ b/src/addons/report/report.module.ts
@@ -0,0 +1,23 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { AddonReportInsightsModule } from './insights/insights.module';
+
+@NgModule({
+    imports: [
+        AddonReportInsightsModule,
+    ],
+})
+export class AddonReportModule { }

From 37f8eca9e4ebd457cc38ea1f362718870ab1936f Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 3 Nov 2021 12:59:00 +0100
Subject: [PATCH 0183/1008] MOBILE-3896 file: Allow downloading tokenpluginfile
 linked files

---
 .../qtype/ddmarker/component/ddmarker.ts      |  5 ++--
 src/core/classes/site.ts                      | 29 +++++++++++++++++++
 src/core/directives/external-content.ts       | 13 +++++----
 src/core/directives/tests/format-text.test.ts |  1 +
 .../rich-text-editor/rich-text-editor.ts      |  6 ++--
 .../question/services/question-helper.ts      |  8 ++---
 src/core/services/utils/url.ts                | 14 +++++++--
 7 files changed, 58 insertions(+), 18 deletions(-)

diff --git a/src/addons/qtype/ddmarker/component/ddmarker.ts b/src/addons/qtype/ddmarker/component/ddmarker.ts
index cc8611b95..547773271 100644
--- a/src/addons/qtype/ddmarker/component/ddmarker.ts
+++ b/src/addons/qtype/ddmarker/component/ddmarker.ts
@@ -19,7 +19,6 @@ import { CoreQuestionHelper } from '@features/question/services/question-helper'
 import { CoreFilepool } from '@services/filepool';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
-import { CoreUrlUtils } from '@services/utils/url';
 import { AddonQtypeDdMarkerQuestion } from '../classes/ddmarker';
 
 /**
@@ -142,9 +141,9 @@ export class AddonQtypeDdMarkerComponent extends CoreQuestionBaseComponent imple
         let imgSrc = this.imgSrc;
         const site = CoreSites.getCurrentSite();
 
-        if (this.imgSrc && site?.canDownloadFiles() && CoreUrlUtils.isPluginFileUrl(this.imgSrc)) {
+        if (this.imgSrc && site?.canDownloadFiles() && site.isSitePluginFileUrl(this.imgSrc)) {
             imgSrc = await CoreFilepool.getSrcByUrl(
-                site.id!,
+                site.getId(),
                 this.imgSrc,
                 this.component,
                 this.componentId,
diff --git a/src/core/classes/site.ts b/src/core/classes/site.ts
index 3d7a70130..b9b9f0191 100644
--- a/src/core/classes/site.ts
+++ b/src/core/classes/site.ts
@@ -1893,6 +1893,35 @@ export class CoreSite {
         return this.tokenPluginFileWorksPromise;
     }
 
+    /**
+     * Check if a URL to a file belongs to the site and uses the pluginfileurl or tokenpluginfileurl endpoints.
+     *
+     * @param url File URL to check.
+     * @return Whether it's a site file URL.
+     */
+    isSitePluginFileUrl(url: string): boolean {
+        const isPluginFileUrl = CoreUrlUtils.isPluginFileUrl(url) || CoreUrlUtils.isTokenPluginFileUrl(url);
+        if (!isPluginFileUrl) {
+            return false;
+        }
+
+        return this.containsUrl(url);
+    }
+
+    /**
+     * Check if a URL to a file belongs to the site and is a theme image file.
+     *
+     * @param url File URL to check.
+     * @return Whether it's a site theme image URL.
+     */
+    isSiteThemeImageUrl(url: string): boolean {
+        if (!CoreUrlUtils.isThemeImageUrl(url)) {
+            return false;
+        }
+
+        return this.containsUrl(url);
+    }
+
 }
 
 /**
diff --git a/src/core/directives/external-content.ts b/src/core/directives/external-content.ts
index d3e157dcc..efe74f020 100644
--- a/src/core/directives/external-content.ts
+++ b/src/core/directives/external-content.ts
@@ -213,8 +213,11 @@ export class CoreExternalContentDirective implements AfterViewInit, OnChanges {
 
         }
 
+        const site = await CoreSites.getSite(siteId);
+        const isSiteFile = site.isSitePluginFileUrl(url);
+
         if (!url || !url.match(/^https?:\/\//i) || CoreUrlUtils.isLocalFileUrl(url) ||
-                (tagName === 'A' && !CoreUrlUtils.isDownloadableUrl(url))) {
+                (tagName === 'A' && !(isSiteFile || site.isSiteThemeImageUrl(url) || CoreUrlUtils.isGravatarUrl(url)))) {
 
             this.logger.debug('Ignoring non-downloadable URL: ' + url);
             if (tagName === 'SOURCE') {
@@ -225,9 +228,7 @@ export class CoreExternalContentDirective implements AfterViewInit, OnChanges {
             throw new CoreError('Non-downloadable URL');
         }
 
-        const site = await CoreSites.getSite(siteId);
-
-        if (!site.canDownloadFiles() && CoreUrlUtils.isPluginFileUrl(url)) {
+        if (!site.canDownloadFiles() && isSiteFile) {
             this.element.parentElement?.removeChild(this.element); // Remove element since it'll be broken.
 
             throw new CoreError('Site doesn\'t allow downloading files.');
@@ -329,7 +330,7 @@ export class CoreExternalContentDirective implements AfterViewInit, OnChanges {
             return;
         }
 
-        let inlineStyles = this.element.getAttribute('style');
+        let inlineStyles = this.element.getAttribute('style') || '';
 
         if (!inlineStyles) {
             return;
@@ -346,7 +347,7 @@ export class CoreExternalContentDirective implements AfterViewInit, OnChanges {
             const finalUrl = await CoreFilepool.getUrlByUrl(siteId, url, this.component, this.componentId, 0, true, true);
 
             this.logger.debug('Using URL ' + finalUrl + ' for ' + url + ' in inline styles');
-            inlineStyles = inlineStyles!.replace(new RegExp(url, 'gi'), finalUrl);
+            inlineStyles = inlineStyles.replace(new RegExp(url, 'gi'), finalUrl);
         });
 
         try {
diff --git a/src/core/directives/tests/format-text.test.ts b/src/core/directives/tests/format-text.test.ts
index aea7a5ded..f55b01f99 100644
--- a/src/core/directives/tests/format-text.test.ts
+++ b/src/core/directives/tests/format-text.test.ts
@@ -125,6 +125,7 @@ describe('CoreFormatTextDirective', () => {
             getId: () => '42',
             canDownloadFiles: () => true,
             isVersionGreaterEqualThan: () => true,
+            isSitePluginFileUrl: () => false,
         });
 
         // @todo this is done because we cannot mock image being loaded, we should find an alternative...
diff --git a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
index 7a4658217..84c2931ef 100644
--- a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
+++ b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
@@ -550,8 +550,9 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
         }
 
         const elements = Array.from(this.editorElement.querySelectorAll('img'));
+        const site = CoreSites.getCurrentSite();
         const siteId = CoreSites.getCurrentSiteId();
-        const canDownloadFiles = CoreSites.getCurrentSite()!.canDownloadFiles();
+        const canDownloadFiles = !site || site.canDownloadFiles();
         elements.forEach(async (el) => {
             if (el.getAttribute('data-original-src')) {
                 // Already treated.
@@ -560,8 +561,7 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
 
             const url = el.src;
 
-            if (!url || !CoreUrlUtils.isDownloadableUrl(url) ||
-                    (!canDownloadFiles && CoreUrlUtils.isPluginFileUrl(url))) {
+            if (!url || !CoreUrlUtils.isDownloadableUrl(url) || (!canDownloadFiles && site?.isSitePluginFileUrl(url))) {
                 // Nothing to treat.
                 return;
             }
diff --git a/src/core/features/question/services/question-helper.ts b/src/core/features/question/services/question-helper.ts
index f727c2264..6aacaca8a 100644
--- a/src/core/features/question/services/question-helper.ts
+++ b/src/core/features/question/services/question-helper.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import { Injectable, EventEmitter } from '@angular/core';
+import { FileEntry, DirectoryEntry } from '@ionic-native/file/ngx';
 
 import { CoreFile } from '@services/file';
 import { CoreFileHelper } from '@services/file-helper';
@@ -20,7 +21,6 @@ import { CoreFilepool } from '@services/filepool';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTextUtils } from '@services/utils/text';
-import { CoreUrlUtils } from '@services/utils/url';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreWSFile } from '@services/ws';
 import { makeSingleton, Translate } from '@singletons';
@@ -138,7 +138,7 @@ export class CoreQuestionHelperProvider {
             // Search the radio button inside this certainty and add its data to the options array.
             const input = <HTMLInputElement> label.querySelector('input[type="radio"]');
             if (input) {
-                question.behaviourCertaintyOptions!.push({
+                question.behaviourCertaintyOptions?.push({
                     id: input.id,
                     name: input.name,
                     value: input.value,
@@ -650,7 +650,7 @@ export class CoreQuestionHelperProvider {
             }
             treated[fileUrl] = true;
 
-            if (!site.canDownloadFiles() && CoreUrlUtils.isPluginFileUrl(fileUrl)) {
+            if (!site.canDownloadFiles() && site.isSitePluginFileUrl(fileUrl)) {
                 return;
             }
 
@@ -791,7 +791,7 @@ export class CoreQuestionHelperProvider {
             }
 
             // Replace the icon with the font version.
-            const newIcon: HTMLElement = document.createElement('ion-icon');
+            const newIcon: HTMLIonIconElement = document.createElement('ion-icon');
 
             if (correct) {
                 newIcon.setAttribute('name', 'fas-check');
diff --git a/src/core/services/utils/url.ts b/src/core/services/utils/url.ts
index 79aafb51c..1fbf79211 100644
--- a/src/core/services/utils/url.ts
+++ b/src/core/services/utils/url.ts
@@ -409,7 +409,7 @@ export class CoreUrlUtilsProvider {
      * @return Whether the URL is downloadable.
      */
     isDownloadableUrl(url: string): boolean {
-        return this.isPluginFileUrl(url) || this.isThemeImageUrl(url) || this.isGravatarUrl(url);
+        return this.isPluginFileUrl(url) || this.isTokenPluginFileUrl(url) || this.isThemeImageUrl(url) || this.isGravatarUrl(url);
     }
 
     /**
@@ -470,7 +470,17 @@ export class CoreUrlUtilsProvider {
      * @return Whether the URL is a pluginfile URL.
      */
     isPluginFileUrl(url: string): boolean {
-        return url?.indexOf('/pluginfile.php') !== -1;
+        return url.indexOf('/pluginfile.php') !== -1;
+    }
+
+    /**
+     * Returns if a URL is a tokenpluginfile URL.
+     *
+     * @param url The URL to test.
+     * @return Whether the URL is a tokenpluginfile URL.
+     */
+    isTokenPluginFileUrl(url: string): boolean {
+        return url.indexOf('/tokenpluginfile.php') !== -1;
     }
 
     /**

From 2de6c75f2a4fc7177bbd39c0232fc35e823728a8 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 4 Nov 2021 10:13:13 +0100
Subject: [PATCH 0184/1008] MOBILE-3903 enrol: Fix ask password when click
 enrol link

---
 src/core/features/courses/services/handlers/course-link.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/features/courses/services/handlers/course-link.ts b/src/core/features/courses/services/handlers/course-link.ts
index 018e11d6c..7b3d944d4 100644
--- a/src/core/features/courses/services/handlers/course-link.ts
+++ b/src/core/features/courses/services/handlers/course-link.ts
@@ -284,15 +284,15 @@ export class CoreCoursesCourseLinkHandlerService extends CoreContentLinksHandler
         } catch (error) {
             modal.dismiss();
 
-            if (error && error.code === CoreCoursesProvider.ENROL_INVALID_KEY) {
+            if (error && error.errorcode === CoreCoursesProvider.ENROL_INVALID_KEY) {
                 // Invalid password. Allow the user to input password.
                 const title = Translate.instant('core.courses.selfenrolment');
-                const body = ' '; // Empty message.
+                let body = ' '; // Empty message.
                 const placeholder = Translate.instant('core.courses.password');
 
                 if (typeof password != 'undefined') {
                     // The user attempted a password. Show an error message.
-                    CoreDomUtils.showErrorModal(error);
+                    body = CoreTextUtils.getErrorMessageFromError(error) || body;
                 }
 
                 password = await CoreDomUtils.showPrompt(body, title, placeholder);

From ef00cd830401039cac6f4b62d8151dd32c31c58d Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 4 Nov 2021 14:57:41 +0100
Subject: [PATCH 0185/1008] MOBILE-3896 test: Allow using existing instance to
 mock class

---
 src/core/directives/tests/format-text.test.ts | 11 ++++--
 src/testing/utils.ts                          | 38 ++++++++++++-------
 2 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/src/core/directives/tests/format-text.test.ts b/src/core/directives/tests/format-text.test.ts
index f55b01f99..8be19f17e 100644
--- a/src/core/directives/tests/format-text.test.ts
+++ b/src/core/directives/tests/format-text.test.ts
@@ -26,6 +26,7 @@ import { CoreSites } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
 
 import { mock, mockSingleton, RenderConfig, renderTemplate, renderWrapperComponent } from '@/testing/utils';
+import { CoreDB } from '@services/db';
 
 describe('CoreFormatTextDirective', () => {
 
@@ -121,11 +122,13 @@ describe('CoreFormatTextDirective', () => {
 
     it('should use external-content directive on images', async () => {
         // Arrange
-        const site = mock<CoreSite>({
-            getId: () => '42',
+        mockSingleton(CoreDB, {
+            getDB: () => undefined,
+        });
+
+        let site = new CoreSite('42', 'https://mysite.com', 'token');
+        site = mock(site, {
             canDownloadFiles: () => true,
-            isVersionGreaterEqualThan: () => true,
-            isSitePluginFileUrl: () => false,
         });
 
         // @todo this is done because we cannot mock image being loaded, we should find an alternative...
diff --git a/src/testing/utils.ts b/src/testing/utils.ts
index a6ec2613b..4b8ecadd9 100644
--- a/src/testing/utils.ts
+++ b/src/testing/utils.ts
@@ -126,16 +126,25 @@ export interface RenderConfig {
 
 export type WrapperComponentFixture<T> = ComponentFixture<WrapperComponent<T>>;
 
-export function mock<T>(instance?: Record<string, unknown>): T;
-export function mock<T>(methods: string[], instance?: Record<string, unknown>): T;
+/**
+ * Mock a certain class, converting its methods to Mock functions and overriding the specified properties and methods.
+ *
+ * @param instance Instance to mock.
+ * @param overrides Object with the properties or methods to override, or a list of methods to override with an empty function.
+ * @return Mock instance.
+ */
+export function mock<T>(instance?: T, overrides?: string[] | Record<string, unknown>): T;
+export function mock<T>(instance?: Partial<T>, overrides?: string[] | Record<string, unknown>): Partial<T>;
 export function mock<T>(
-    methodsOrInstance: string[] | Record<string, unknown> = [],
-    instance: Record<string, unknown> = {},
-): T {
-    instance = Array.isArray(methodsOrInstance) ? instance : methodsOrInstance;
-
-    const methods = Array.isArray(methodsOrInstance) ? methodsOrInstance : [];
+    instance: T | Partial<T> = {},
+    overrides: string[] | Record<string, unknown> = {},
+): T | Partial<T> {
+    // If overrides is an object, apply them to the instance.
+    if (!Array.isArray(overrides)) {
+        Object.assign(instance, overrides);
+    }
 
+    // Convert instance functions to jest functions.
     for (const property of Object.getOwnPropertyNames(instance)) {
         const value = instance[property];
 
@@ -146,11 +155,14 @@ export function mock<T>(
         instance[property] = jest.fn((...args) => value.call(instance, ...args));
     }
 
-    for (const method of methods) {
-        instance[method] = jest.fn();
+    // If overrides is a list of methods, add them now.
+    if (Array.isArray(overrides)) {
+        for (const method of overrides) {
+            instance[method] = jest.fn();
+        }
     }
 
-    return instance as T;
+    return instance;
 }
 
 export function mockSingleton<T>(singletonClass: CoreSingletonProxy<T>, instance: T): T;
@@ -168,8 +180,8 @@ export function mockSingleton<T>(
     properties = Array.isArray(methodsOrProperties) ? properties : methodsOrProperties;
 
     const methods = Array.isArray(methodsOrProperties) ? methodsOrProperties : [];
-    const instance = getServiceInstance(singleton.injectionToken);
-    const mockInstance = mock<T>(methods, instance);
+    const instance = getServiceInstance(singleton.injectionToken) as T;
+    const mockInstance = mock(instance, methods);
 
     Object.assign(mockInstance, properties);
 

From 432f9b03ec089e55839e321c2b09744346865825 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 4 Nov 2021 11:48:53 +0100
Subject: [PATCH 0186/1008] MOBILE-3903 enrol: Check guest first for
 course/view links

---
 .../courses/services/handlers/course-link.ts  | 152 +++++++++---------
 1 file changed, 76 insertions(+), 76 deletions(-)

diff --git a/src/core/features/courses/services/handlers/course-link.ts b/src/core/features/courses/services/handlers/course-link.ts
index 7b3d944d4..dfe5426a7 100644
--- a/src/core/features/courses/services/handlers/course-link.ts
+++ b/src/core/features/courses/services/handlers/course-link.ts
@@ -90,7 +90,7 @@ export class CoreCoursesCourseLinkHandlerService extends CoreContentLinksHandler
 
                         return;
                     } else {
-                        this.actionEnrol(courseId, url, pageParams).catch(() => {
+                        this.actionOpen(courseId, url, pageParams).catch(() => {
                             // Ignore errors.
                         });
                     }
@@ -124,14 +124,14 @@ export class CoreCoursesCourseLinkHandlerService extends CoreContentLinksHandler
     }
 
     /**
-     * Action to perform when an enrol link is clicked.
+     * Try to open the course, asking the user to enrol if needed.
      *
      * @param courseId Course ID.
      * @param url Treated URL.
      * @param pageParams Params to send to the new page.
      * @return Promise resolved when done.
      */
-    protected async actionEnrol(courseId: number, url: string, pageParams: Params): Promise<void> {
+    protected async actionOpen(courseId: number, url: string, pageParams: Params): Promise<void> {
         const modal = await CoreDomUtils.showModalLoading();
         let course: CoreCourseAnyCourseData | { id: number } | undefined;
 
@@ -167,95 +167,102 @@ export class CoreCoursesCourseLinkHandlerService extends CoreContentLinksHandler
      * @param modal Modal, to dismiss when needed.
      * @return The course after self enrolling or undefined if the user has access but is not enrolled.
      */
-    protected checkSelfUserCanSelfEnrolOrAccess(
+    protected async checkSelfUserCanSelfEnrolOrAccess(
         courseId: number,
         url: string,
         modal: CoreIonLoadingElement,
     ): Promise<CoreEnrolledCourseData | undefined> {
-        // User is not enrolled in the course. Check if can self enrol.
-        return this.canSelfEnrol(courseId).then(async () => {
-            modal.dismiss();
+        const isEnrolUrl = !!url.match(/(\/enrol\/index\.php)|(\/course\/enrol\.php)/);
 
-            const isEnrolUrl = !!url.match(/(\/enrol\/index\.php)|(\/course\/enrol\.php)/);
+        if (!isEnrolUrl) {
+            // Not an enrol URL, check if the user can access the course (e.g. guest access).
+            const canAccess = await this.canAccess(courseId);
+            if (canAccess) {
+                return;
+            }
+        }
 
-            // The user can self enrol. If it's not a enrolment URL we'll ask for confirmation.
-            if (!isEnrolUrl) {
-                try {
-                    await CoreDomUtils.showConfirm(Translate.instant('core.courses.confirmselfenrol'));
-                } catch {
-                    // User cancelled. Check if the user can view the course contents (guest access or similar).
-                    await CoreCourse.getSections(courseId, false, true);
+        // User cannot access the course or it's an enrol URL. Check if can self enrol.
+        const canSelfEnrol = await this.canSelfEnrol(courseId);
 
+        if (!canSelfEnrol) {
+            if (isEnrolUrl) {
+                // Cannot self enrol, check if the user can access the course (e.g. guest access).
+                const canAccess = await this.canAccess(courseId);
+                if (canAccess) {
                     return;
                 }
             }
 
-            // Enrol URL or user confirmed.
-            try {
-                return this.selfEnrol(courseId);
-            } catch (error) {
-                if (error) {
-                    CoreDomUtils.showErrorModal(error);
-                }
+            // Cannot self enrol and cannot access. Show error and allow the user to open the link in browser.
+            modal.dismiss();
+            const notEnrolledMessage = Translate.instant('core.courses.notenroled');
+            const body = CoreTextUtils.buildSeveralParagraphsMessage(
+                [notEnrolledMessage, Translate.instant('core.confirmopeninbrowser')],
+            );
 
-                throw error;
-            }
-        }, async (error) => {
-            // Can't self enrol. Check if the user can view the course contents (guest access or similar).
             try {
-                await CoreCourse.getSections(courseId, false, true);
+                await CoreDomUtils.showConfirm(body);
+
+                CoreSites.getCurrentSite()?.openInBrowserWithAutoLogin(url, undefined, { showBrowserWarning: false });
             } catch {
-                // Error. Show error message and allow the user to open the link in browser.
-                modal.dismiss();
+                // User cancelled.
+            };
 
-                if (error) {
-                    error = CoreTextUtils.getErrorMessageFromError(error) || error;
-                }
-                if (!error) {
-                    error = Translate.instant('core.courses.notenroled');
-                }
+            throw new CoreError(notEnrolledMessage);
+        }
 
-                const body = CoreTextUtils.buildSeveralParagraphsMessage(
-                    [error, Translate.instant('core.confirmopeninbrowser')],
-                );
+        // The user can self enrol. If it's not a enrolment URL we'll ask for confirmation.
+        modal.dismiss();
 
-                try {
-                    await CoreDomUtils.showConfirm(body);
+        if (!isEnrolUrl) {
+            await CoreDomUtils.showConfirm(Translate.instant('core.courses.confirmselfenrol'));
+        }
 
-                    CoreSites.getCurrentSite()?.openInBrowserWithAutoLogin(url, undefined, { showBrowserWarning: false });
-                } catch {
-                    // User cancelled.
-                };
-
-                throw error;
+        try {
+            return await this.selfEnrol(courseId);
+        } catch (error) {
+            if (error) {
+                CoreDomUtils.showErrorModal(error);
             }
 
-            return undefined;
-        });
+            throw error;
+        }
+    }
+
+    /**
+     * Check if user can access the course.
+     *
+     * @param courseId Course ID.
+     * @return Promise resolved with boolean: whether user can access the course.
+     */
+    protected canAccess(courseId: number): Promise<boolean> {
+        return CoreUtils.promiseWorks(CoreCourse.getSections(courseId, false, true));
     }
 
     /**
      * Check if a user can be "automatically" self enrolled in a course.
      *
      * @param courseId Course ID.
-     * @return Promise resolved if user can be enrolled in a course, rejected otherwise.
+     * @return Promise resolved with boolean: whether the user can be enrolled in a course.
      */
-    protected async canSelfEnrol(courseId: number): Promise<void> {
-        // Check that the course has self enrolment enabled.
+    protected async canSelfEnrol(courseId: number): Promise<boolean> {
+        try {
+            // Check that the course has self enrolment enabled.
+            const methods = await CoreCourses.getCourseEnrolmentMethods(courseId);
 
-        const methods = await CoreCourses.getCourseEnrolmentMethods(courseId);
-        let isSelfEnrolEnabled = false;
-        let instances = 0;
-        methods.forEach((method) => {
-            if (method.type == 'self' && method.status) {
-                isSelfEnrolEnabled = true;
-                instances++;
-            }
-        });
+            let isSelfEnrolEnabled = false;
+            let instances = 0;
+            methods.forEach((method) => {
+                if (method.type == 'self' && method.status) {
+                    isSelfEnrolEnabled = true;
+                    instances++;
+                }
+            });
 
-        if (!isSelfEnrolEnabled || instances != 1) {
-            // Self enrol not enabled or more than one instance.
-            throw new CoreError('Self enrol not enabled in course');
+            return isSelfEnrolEnabled && instances === 1;
+        } catch {
+            return false;
         }
     }
 
@@ -272,12 +279,9 @@ export class CoreCoursesCourseLinkHandlerService extends CoreContentLinksHandler
         try {
             await CoreCourses.selfEnrol(courseId, password);
 
-            // Success self enrolling the user, invalidate the courses list.
-            await CoreUtils.ignoreErrors(CoreCourses.invalidateUserCourses());
-
             try {
                 // Sometimes the list of enrolled courses takes a while to be updated. Wait for it.
-                return this.waitForEnrolled(courseId, true);
+                return await this.waitForEnrolled(courseId, true);
             } finally {
                 modal.dismiss();
             }
@@ -297,7 +301,7 @@ export class CoreCoursesCourseLinkHandlerService extends CoreContentLinksHandler
 
                 password = await CoreDomUtils.showPrompt(body, title, placeholder);
 
-                return this.selfEnrol(courseId, password);
+                await this.selfEnrol(courseId, password);
             } else {
                 throw error;
             }
@@ -319,21 +323,17 @@ export class CoreCoursesCourseLinkHandlerService extends CoreContentLinksHandler
         // Check if user is enrolled in the course.
         await CoreUtils.ignoreErrors(CoreCourses.invalidateUserCourses());
         try {
-            return CoreCourses.getUserCourse(courseId);
+            return await CoreCourses.getUserCourse(courseId);
         } catch {
-
             // Not enrolled, wait a bit and try again.
             if (Date.now() - this.waitStart > 60000) {
                 // Max time reached, stop.
                 return;
             }
 
-            return new Promise((resolve, reject): void => {
-                setTimeout(() => {
-                    this.waitForEnrolled(courseId)
-                        .then(resolve).catch(reject);
-                }, 5000);
-            });
+            await CoreUtils.wait(5000);
+
+            return await this.waitForEnrolled(courseId);
         }
     }
 

From aae810d1ad32f979b5732a32b118b651ddf217a7 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 5 Nov 2021 09:37:29 +0100
Subject: [PATCH 0187/1008] MOBILE-3906 core: Update handlers after accepting
 site policy

---
 src/core/classes/delegate-sorted.ts                      | 7 +++++++
 src/core/classes/delegate.ts                             | 9 +++++++--
 src/core/features/login/pages/site-policy/site-policy.ts | 3 +++
 src/core/singletons/events.ts                            | 1 +
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/core/classes/delegate-sorted.ts b/src/core/classes/delegate-sorted.ts
index 41f9fdc5c..ea4e99cce 100644
--- a/src/core/classes/delegate-sorted.ts
+++ b/src/core/classes/delegate-sorted.ts
@@ -16,6 +16,7 @@ import { BehaviorSubject, Subject } from 'rxjs';
 import { CoreEvents } from '@singletons/events';
 import { CoreDelegate, CoreDelegateDisplayHandler, CoreDelegateToDisplay } from './delegate';
 import { CoreUtils } from '@services/utils/utils';
+import { CoreSites } from '@services/sites';
 
 /**
  * Superclass to help creating sorted delegates.
@@ -39,6 +40,12 @@ export class CoreSortedDelegate<
         super(delegateName, true);
 
         CoreEvents.on(CoreEvents.LOGOUT, this.clearSortedHandlers.bind(this));
+        CoreEvents.on(CoreEvents.SITE_POLICY_AGREED, (data) => {
+            if (data.siteId === CoreSites.getCurrentSiteId()) {
+                // Clear loaded handlers when policy is agreed. The CoreDelegate class will load them again.
+                this.clearSortedHandlers();
+            }
+        });
     }
 
     /**
diff --git a/src/core/classes/delegate.ts b/src/core/classes/delegate.ts
index f57b133f9..3e5e7aac3 100644
--- a/src/core/classes/delegate.ts
+++ b/src/core/classes/delegate.ts
@@ -98,6 +98,11 @@ export class CoreDelegate<HandlerType extends CoreDelegateHandler> {
             CoreEvents.on(CoreEvents.LOGIN, this.updateHandlers.bind(this));
             CoreEvents.on(CoreEvents.SITE_UPDATED, this.updateHandlers.bind(this));
             CoreEvents.on(CoreEvents.SITE_PLUGINS_LOADED, this.updateHandlers.bind(this));
+            CoreEvents.on(CoreEvents.SITE_POLICY_AGREED, (data) => {
+                if (data.siteId === CoreSites.getCurrentSiteId()) {
+                    this.updateHandlers();
+                }
+            });
         }
     }
 
@@ -245,14 +250,14 @@ export class CoreDelegate<HandlerType extends CoreDelegateHandler> {
         const currentSite = CoreSites.getCurrentSite();
         let promise: Promise<boolean>;
 
-        if (this.updatePromises[siteId] && this.updatePromises[siteId][handler.name]) {
+        if (this.updatePromises[siteId] && this.updatePromises[siteId][handler.name] !== undefined) {
             // There's already an update ongoing for this handler, return the promise.
             return this.updatePromises[siteId][handler.name];
         } else if (!this.updatePromises[siteId]) {
             this.updatePromises[siteId] = {};
         }
 
-        if (!CoreSites.isLoggedIn() || this.isFeatureDisabled(handler, currentSite!)) {
+        if (!currentSite || this.isFeatureDisabled(handler, currentSite)) {
             promise = Promise.resolve(false);
         } else {
             promise = Promise.resolve(handler.isEnabled()).catch(() => false);
diff --git a/src/core/features/login/pages/site-policy/site-policy.ts b/src/core/features/login/pages/site-policy/site-policy.ts
index 8c4097f9e..17aba15e3 100644
--- a/src/core/features/login/pages/site-policy/site-policy.ts
+++ b/src/core/features/login/pages/site-policy/site-policy.ts
@@ -21,6 +21,7 @@ import { CoreMimetypeUtils } from '@services/utils/mimetype';
 import { CoreLoginHelper } from '@features/login/services/login-helper';
 import { CoreSite } from '@classes/site';
 import { CoreNavigator } from '@services/navigator';
+import { CoreEvents } from '@singletons/events';
 
 /**
  * Page to accept a site policy.
@@ -120,6 +121,8 @@ export class CoreLoginSitePolicyPage implements OnInit {
             // Invalidate cache since some WS don't return error if site policy is not accepted.
             await CoreUtils.ignoreErrors(this.currentSite.invalidateWsCache());
 
+            CoreEvents.trigger(CoreEvents.SITE_POLICY_AGREED, {}, this.siteId);
+
             await CoreNavigator.navigateToSiteHome();
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'Error accepting site policy.');
diff --git a/src/core/singletons/events.ts b/src/core/singletons/events.ts
index 49aa650a5..a88ea0722 100644
--- a/src/core/singletons/events.ts
+++ b/src/core/singletons/events.ts
@@ -67,6 +67,7 @@ export class CoreEvents {
     static readonly SESSION_EXPIRED = 'session_expired';
     static readonly PASSWORD_CHANGE_FORCED = 'password_change_forced';
     static readonly USER_NOT_FULLY_SETUP = 'user_not_fully_setup';
+    static readonly SITE_POLICY_AGREED = 'site_policy_agreed';
     static readonly SITE_POLICY_NOT_AGREED = 'site_policy_not_agreed';
     static readonly LOGIN = 'login';
     static readonly LOGOUT = 'logout';

From 800ff3a4d879207baab73d150d9b99346587d1f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 4 Nov 2021 16:02:51 +0100
Subject: [PATCH 0188/1008] MOBILE-3912 login: Hide all need help buttons when
 sass var is present

---
 src/core/features/login/pages/site/site.scss | 6 ------
 src/core/features/login/pages/site/site.ts   | 4 +++-
 src/theme/theme.base.scss                    | 6 ++++++
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/core/features/login/pages/site/site.scss b/src/core/features/login/pages/site/site.scss
index 0c7b4300a..dcec7cfc7 100644
--- a/src/core/features/login/pages/site/site.scss
+++ b/src/core/features/login/pages/site/site.scss
@@ -15,12 +15,6 @@
     }
 }
 
-@if ($core-login-hide-need-help) {
-    .core-login-need-help {
-        display: none;
-    }
-}
-
 .core-login-site-connect {
     margin-top: 1.4rem;
 }
diff --git a/src/core/features/login/pages/site/site.ts b/src/core/features/login/pages/site/site.ts
index b607ac068..a00117db3 100644
--- a/src/core/features/login/pages/site/site.ts
+++ b/src/core/features/login/pages/site/site.ts
@@ -33,6 +33,7 @@ import { CoreNavigator } from '@services/navigator';
 import { CoreCustomURLSchemes, CoreCustomURLSchemesHandleError } from '@services/urlschemes';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreForms } from '@singletons/form';
+import { AlertButton } from '@ionic/core';
 
 /**
  * Site (url) chooser when adding a new site.
@@ -386,9 +387,10 @@ export class CoreLoginSitePage implements OnInit {
             message += '<p padding><a href="' + fullUrl + '" core-link>' + url + '</a></p>';
         }
 
-        const buttons = [
+        const buttons: AlertButton[] = [
             {
                 text: Translate.instant('core.needhelp'),
+                cssClass: 'core-login-need-help',
                 handler: (): void => {
                     this.showHelp();
                 },
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index c74dae05a..2b12e3e8c 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -1149,3 +1149,9 @@ iframe {
     max-width: 100%;
     background-color: var(--ion-background-color);
 }
+
+@if ($core-login-hide-need-help) {
+    .core-login-need-help {
+        display: none !important;
+    }
+}

From 375301b7886899c8d2fe0eb419e0287aa2f9f4b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 3 Nov 2021 15:56:22 +0100
Subject: [PATCH 0189/1008] MOBILE-3881 menu: Add badge on more tab

---
 .../messages/services/handlers/mainmenu.ts    | 13 ++-
 .../services/handlers/mainmenu.ts             | 21 +++--
 .../features/mainmenu/pages/menu/menu.html    |  7 +-
 .../features/mainmenu/pages/menu/menu.scss    | 35 ++++++--
 src/core/features/mainmenu/pages/menu/menu.ts | 84 ++++++++++++-------
 .../features/mainmenu/services/mainmenu.ts    | 19 +++++
 .../services/pushnotifications.ts             |  5 ++
 src/theme/theme.light.scss                    |  4 -
 8 files changed, 137 insertions(+), 51 deletions(-)

diff --git a/src/addons/messages/services/handlers/mainmenu.ts b/src/addons/messages/services/handlers/mainmenu.ts
index 7b19afaa5..564f844ba 100644
--- a/src/addons/messages/services/handlers/mainmenu.ts
+++ b/src/addons/messages/services/handlers/mainmenu.ts
@@ -23,11 +23,11 @@ import { CoreSites } from '@services/sites';
 import { CoreEvents } from '@singletons/events';
 import { CoreUtils } from '@services/utils/utils';
 import {
-    CorePushNotifications,
     CorePushNotificationsNotificationBasicData,
 } from '@features/pushnotifications/services/pushnotifications';
 import { CorePushNotificationsDelegate } from '@features/pushnotifications/services/push-delegate';
 import { makeSingleton } from '@singletons';
+import { CoreMainMenuProvider } from '@features/mainmenu/services/mainmenu';
 
 /**
  * Handler to inject an option into main menu.
@@ -90,7 +90,7 @@ export class AddonMessagesMainMenuHandlerService implements CoreMainMenuHandler,
         );
 
         // Register Badge counter.
-        CorePushNotificationsDelegate.registerCounterHandler('AddonMessages');
+        CorePushNotificationsDelegate.registerCounterHandler(AddonMessagesMainMenuHandlerService.name);
     }
 
     /**
@@ -162,7 +162,14 @@ export class AddonMessagesMainMenuHandlerService implements CoreMainMenuHandler,
         }
 
         // Update push notifications badge.
-        CorePushNotifications.updateAddonCounter('AddonMessages', totalCount, siteId);
+        CoreEvents.trigger(
+            CoreMainMenuProvider.MAIN_MENU_HANDLER_BADGE_UPDATED,
+            {
+                handler: AddonMessagesMainMenuHandlerService.name,
+                value: totalCount,
+            },
+            siteId,
+        );
     }
 
     /**
diff --git a/src/addons/notifications/services/handlers/mainmenu.ts b/src/addons/notifications/services/handlers/mainmenu.ts
index a19caaae9..bd4800729 100644
--- a/src/addons/notifications/services/handlers/mainmenu.ts
+++ b/src/addons/notifications/services/handlers/mainmenu.ts
@@ -22,6 +22,7 @@ import { CoreMainMenuHandler, CoreMainMenuHandlerData } from '@features/mainmenu
 import { CorePushNotifications } from '@features/pushnotifications/services/pushnotifications';
 import { CorePushNotificationsDelegate } from '@features/pushnotifications/services/push-delegate';
 import { AddonNotifications, AddonNotificationsProvider } from '../notifications';
+import { CoreMainMenuProvider } from '@features/mainmenu/services/mainmenu';
 
 /**
  * Handler to inject an option into main menu.
@@ -72,7 +73,7 @@ export class AddonNotificationsMainMenuHandlerService implements CoreMainMenuHan
         });
 
         // Register Badge counter.
-        CorePushNotificationsDelegate.registerCounterHandler('AddonNotifications');
+        CorePushNotificationsDelegate.registerCounterHandler(AddonNotificationsMainMenuHandlerService.name);
     }
 
     /**
@@ -112,10 +113,20 @@ export class AddonNotificationsMainMenuHandlerService implements CoreMainMenuHan
         try {
             const unreadCountData = await AddonNotifications.getUnreadNotificationsCount(undefined, siteId);
 
-            this.handlerData.badge = unreadCountData.count > 0 ?
-                unreadCountData.count + (unreadCountData.hasMore ? '+' : '') :
-                '';
-            CorePushNotifications.updateAddonCounter('AddonNotifications', unreadCountData.count, siteId);
+            this.handlerData.badge = unreadCountData.count > 0
+                ? unreadCountData.count + (unreadCountData.hasMore ? '+' : '')
+                : '';
+
+            CorePushNotifications.updateAddonCounter(AddonNotificationsMainMenuHandlerService.name, unreadCountData.count, siteId);
+
+            CoreEvents.trigger(
+                CoreMainMenuProvider.MAIN_MENU_HANDLER_BADGE_UPDATED,
+                {
+                    handler: AddonNotificationsMainMenuHandlerService.name,
+                    value: unreadCountData.count,
+                },
+                siteId,
+            );
         } catch {
             this.handlerData.badge = '';
         } finally {
diff --git a/src/core/features/mainmenu/pages/menu/menu.html b/src/core/features/mainmenu/pages/menu/menu.html
index 18a5bb380..b7a79fa7f 100644
--- a/src/core/features/mainmenu/pages/menu/menu.html
+++ b/src/core/features/mainmenu/pages/menu/menu.html
@@ -9,9 +9,9 @@
         <ion-tab-button *ngFor="let tab of tabs" (keydown)="tabAction.keyDown($event)" (keyup)="tabAction.keyUp(tab.page, $event)"
             [hidden]="!loaded && tab.hide" [tab]="tab.page" [disabled]="tab.hide" layout="label-hide" class="{{tab.class}}"
             [selected]="tab.page === selectedTab" [tabindex]="selectedTab == tab.page ? 0 : -1" [attr.aria-controls]="tab.id">
-            <ion-icon [name]="tab.icon" aria-hidden="true"></ion-icon>
+            <ion-icon class="core-tab-icon" [name]="tab.icon" aria-hidden="true"></ion-icon>
             <ion-label aria-hidden="true">{{ tab.title | translate }}</ion-label>
-            <ion-badge *ngIf="tab.badge" aria-hidden="true">{{ tab.badge }}</ion-badge>
+            <ion-badge class="core-tab-badge" *ngIf="tab.badge" aria-hidden="true">{{ tab.badge }}</ion-badge>
             <span class="sr-only">{{ tab.title | translate }}</span>
             <span *ngIf="tab.badge && tab.badgeA11yText" class="sr-only">
                 {{ tab.badgeA11yText | translate: {$a : tab.badge } }}
@@ -20,9 +20,10 @@
 
         <ion-tab-button (keydown)="tabAction.keyDown($event)" (keyup)="tabAction.keyUp(morePageName, $event)" [hidden]="!loaded"
             [tab]="morePageName" layout="label-hide" [tabindex]="selectedTab == morePageName ? 0 : -1" [attr.aria-controls]="morePageName">
-            <ion-icon name="ellipsis-horizontal" aria-hidden="true"></ion-icon>
+            <ion-icon class="core-tab-icon" name="ellipsis-horizontal" aria-hidden="true"></ion-icon>
             <ion-label aria-hidden="true">{{ 'core.more' | translate }}</ion-label>
             <span class="sr-only">{{ 'core.more' | translate }}</span>
+            <ion-icon *ngIf="moreBadge" class="core-tab-badge" name="fas-circle" aria-hidden="true"></ion-icon>
         </ion-tab-button>
     </ion-tab-bar>
 </ion-tabs>
diff --git a/src/core/features/mainmenu/pages/menu/menu.scss b/src/core/features/mainmenu/pages/menu/menu.scss
index b359d98f0..993e0cea6 100644
--- a/src/core/features/mainmenu/pages/menu/menu.scss
+++ b/src/core/features/mainmenu/pages/menu/menu.scss
@@ -25,17 +25,17 @@
 
     }
 
-    ion-tab-button ion-icon {
+    ion-tab-button ion-icon.core-tab-icon {
         text-overflow: unset;
         overflow: visible;
         text-align: center;
     }
 
-    ion-tab-button.ios ion-icon {
+    ion-tab-button.ios ion-icon.core-tab-icon {
         font-size: 25px;
     }
 
-    ion-tab-button.md ion-badge {
+    ion-tab-button.md ion-badge.core-tab-badge {
         font-size: 12px;
         font-weight: bold;
         border-radius: 10px;
@@ -48,11 +48,29 @@
         background: var(--background-selected);
     }
 
+    ion-icon.core-tab-badge {
+        color: var(--core-bottom-tabs-badge-color);
+        padding: 3px 6px 2px;
+        @include position(8px, null, null, calc(50% + 6px));
+        min-width: 12px;
+        font-size: 8px;
+        font-weight: normal;
+        box-sizing: border-box;
+        position: absolute;
+        z-index: 1;
+    }
+
+    ion-badge.core-tab-badge {
+        --background: var(--core-bottom-tabs-badge-color);
+        --color: var(--core-bottom-tabs-badge-text-color);
+    }
+
     ion-tabs.placement-bottom ion-tab-button {
-        ion-icon {
+        ion-icon.core-tab-icon {
             transition: margin 500ms ease-in-out, transform 300ms ease-in-out;
         }
-        ion-badge {
+        ion-icon.core-tab-badge,
+        ion-badge.core-tab-badge {
             top: 8px;
         }
     }
@@ -76,7 +94,8 @@
                 min-height: var(--menutabbar-size);
                 flex: 0;
 
-                ion-badge {
+                ion-icon.core-tab-badge,
+                ion-badge.core-tab-badge {
                     top: calc(50% - 20px);
                 }
             }
@@ -114,11 +133,11 @@
 
 :host-context(.core-online),
 :host-context(.core-offline) {
-    ion-tabs.placement-bottom ion-tab-button ion-icon {
+    ion-tabs.placement-bottom ion-tab-button ion-icon.core-tab-icon {
         margin-bottom: 8px;
     }
 
-    ion-tabs.placement-bottom ion-tab-button.ios ion-icon {
+    ion-tabs.placement-bottom ion-tab-button.ios ion-icon.core-tab-icon {
         margin-bottom: 14px;
     }
 
diff --git a/src/core/features/mainmenu/pages/menu/menu.ts b/src/core/features/mainmenu/pages/menu/menu.ts
index 36d929f4d..63799d858 100644
--- a/src/core/features/mainmenu/pages/menu/menu.ts
+++ b/src/core/features/mainmenu/pages/menu/menu.ts
@@ -28,6 +28,7 @@ import { CoreNavigator } from '@services/navigator';
 import { filter } from 'rxjs/operators';
 import { NavigationEnd } from '@angular/router';
 import { trigger, state, style, transition, animate } from '@angular/animations';
+import { CoreSites } from '@services/sites';
 
 /**
  * Page that displays the main menu of the app.
@@ -66,10 +67,12 @@ export class CoreMainMenuPage implements OnInit, OnDestroy {
     morePageName = CoreMainMenuProvider.MORE_PAGE_NAME;
     selectedTab?: string;
     isMainScreen = false;
+    moreBadge = false;
 
     protected subscription?: Subscription;
     protected navSubscription?: Subscription;
     protected keyboardObserver?: CoreEventObserver;
+    protected badgeUpdateObserver?: CoreEventObserver;
     protected resizeFunction: () => void;
     protected backButtonFunction: (event: BackButtonEvent) => void;
     protected selectHistory: string[] = [];
@@ -102,11 +105,17 @@ export class CoreMainMenuPage implements OnInit, OnDestroy {
 
         this.subscription = CoreMainMenuDelegate.getHandlersObservable().subscribe((handlers) => {
             // Remove the handlers that should only appear in the More menu.
-            this.allHandlers = handlers.filter((handler) => !handler.onlyInMore);
+            this.allHandlers = handlers;
 
             this.initHandlers();
         });
 
+        this.badgeUpdateObserver = CoreEvents.on(CoreMainMenuProvider.MAIN_MENU_HANDLER_BADGE_UPDATED, (data) => {
+            if (data.siteId == CoreSites.getCurrentSiteId()) {
+                this.updateMoreBadge();
+            }
+        });
+
         window.addEventListener('resize', this.resizeFunction);
         document.addEventListener('ionBackButton', this.backButtonFunction);
 
@@ -130,34 +139,52 @@ export class CoreMainMenuPage implements OnInit, OnDestroy {
      * Init handlers on change (size or handlers).
      */
     initHandlers(): void {
-        if (this.allHandlers) {
-            this.tabsPlacement = CoreMainMenu.getTabPlacement();
-
-            const handlers = this.allHandlers.slice(0, CoreMainMenu.getNumItems()); // Get main handlers.
-
-            // Re-build the list of tabs. If a handler is already in the list, use existing object to prevent re-creating the tab.
-            const newTabs: CoreMainMenuHandlerToDisplay[] = [];
-
-            for (let i = 0; i < handlers.length; i++) {
-                const handler = handlers[i];
-
-                // Check if the handler is already in the tabs list. If so, use it.
-                const tab = this.tabs.find((tab) => tab.page == handler.page);
-
-                tab ? tab.hide = false : null;
-                handler.hide = false;
-                handler.id = handler.id || 'core-mainmenu-' + CoreUtils.getUniqueId('CoreMainMenuPage');
-
-                newTabs.push(tab || handler);
-            }
-
-            this.tabs = newTabs;
-
-            // Sort them by priority so new handlers are in the right position.
-            this.tabs.sort((a, b) => (b.priority || 0) - (a.priority || 0));
-
-            this.loaded = CoreMainMenuDelegate.areHandlersLoaded();
+        if (!this.allHandlers) {
+            return;
         }
+        this.tabsPlacement = CoreMainMenu.getTabPlacement();
+
+        const handlers = this.allHandlers
+            .filter((handler) => !handler.onlyInMore)
+            .slice(0, CoreMainMenu.getNumItems()); // Get main handlers.
+
+        // Re-build the list of tabs. If a handler is already in the list, use existing object to prevent re-creating the tab.
+        const newTabs: CoreMainMenuHandlerToDisplay[] = [];
+
+        for (let i = 0; i < handlers.length; i++) {
+            const handler = handlers[i];
+
+            // Check if the handler is already in the tabs list. If so, use it.
+            const tab = this.tabs.find((tab) => tab.page == handler.page);
+
+            tab ? tab.hide = false : null;
+            handler.hide = false;
+            handler.id = handler.id || 'core-mainmenu-' + CoreUtils.getUniqueId('CoreMainMenuPage');
+
+            newTabs.push(tab || handler);
+        }
+
+        this.tabs = newTabs;
+
+        // Sort them by priority so new handlers are in the right position.
+        this.tabs.sort((a, b) => (b.priority || 0) - (a.priority || 0));
+
+        this.updateMoreBadge();
+
+        this.loaded = CoreMainMenuDelegate.areHandlersLoaded();
+
+    }
+
+    /**
+     * Check all non visible tab handlers for any badge text or number.
+     */
+    updateMoreBadge(): void {
+        if (!this.allHandlers) {
+            return;
+        }
+
+        const numItems = CoreMainMenu.getNumItems();
+        this.moreBadge = this.allHandlers.some((handler, index) => (handler.onlyInMore || index >= numItems) && !!handler.badge);
     }
 
     /**
@@ -169,6 +196,7 @@ export class CoreMainMenuPage implements OnInit, OnDestroy {
         window.removeEventListener('resize', this.resizeFunction);
         document.removeEventListener('ionBackButton', this.backButtonFunction);
         this.keyboardObserver?.off();
+        this.badgeUpdateObserver?.off();
     }
 
     /**
diff --git a/src/core/features/mainmenu/services/mainmenu.ts b/src/core/features/mainmenu/services/mainmenu.ts
index 683f8aea7..d34ecde37 100644
--- a/src/core/features/mainmenu/services/mainmenu.ts
+++ b/src/core/features/mainmenu/services/mainmenu.ts
@@ -23,6 +23,19 @@ import { Device, makeSingleton } from '@singletons';
 import { CoreArray } from '@singletons/array';
 import { CoreTextUtils } from '@services/utils/text';
 
+declare module '@singletons/events' {
+
+    /**
+     * Augment CoreEventsData interface with events specific to this service.
+     *
+     * @see https://www.typescriptlang.org/docs/handbook/declaration-merging.html#module-augmentation
+     */
+    export interface CoreEventsData {
+        [CoreMainMenuProvider.MAIN_MENU_HANDLER_BADGE_UPDATED]: CoreMainMenuHandlerBadgeUpdatedEventData;
+    }
+
+}
+
 /**
  * Service that provides some features regarding Main Menu.
  */
@@ -32,6 +45,7 @@ export class CoreMainMenuProvider {
     static readonly NUM_MAIN_HANDLERS = 4;
     static readonly ITEM_MIN_WIDTH = 72; // Min with of every item, based on 5 items on a 360 pixel wide screen.
     static readonly MORE_PAGE_NAME = 'more';
+    static readonly MAIN_MENU_HANDLER_BADGE_UPDATED = 'main_menu_handler_badge_updated';
 
     protected tablet = false;
 
@@ -339,3 +353,8 @@ type CustomMenuItemsMap = Record<string, {
         };
     };
 }>;
+
+export type CoreMainMenuHandlerBadgeUpdatedEventData = {
+    handler: string; // Handler name.
+    value: number; // New counter value.
+};
diff --git a/src/core/features/pushnotifications/services/pushnotifications.ts b/src/core/features/pushnotifications/services/pushnotifications.ts
index 6b02caf7e..9de4396d8 100644
--- a/src/core/features/pushnotifications/services/pushnotifications.ts
+++ b/src/core/features/pushnotifications/services/pushnotifications.ts
@@ -41,6 +41,7 @@ import {
 import { CoreError } from '@classes/errors/error';
 import { CoreWSExternalWarning } from '@services/ws';
 import { CoreSitesFactory } from '@services/sites-factory';
+import { CoreMainMenuProvider } from '@features/mainmenu/services/mainmenu';
 
 /**
  * Service to handle push notifications.
@@ -101,6 +102,10 @@ export class CorePushNotificationsProvider {
             }
         });
 
+        CoreEvents.on(CoreMainMenuProvider.MAIN_MENU_HANDLER_BADGE_UPDATED, (data) => {
+            this.updateAddonCounter(data.handler, data.value, data.siteId);
+        });
+
         // Listen for local notification clicks (generated by the app).
         CoreLocalNotifications.registerClick<CorePushNotificationsNotificationBasicData>(
             CorePushNotificationsProvider.COMPONENT,
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index fb0ad53ec..56998e1eb 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -97,10 +97,6 @@
         --color: var(--core-bottom-tabs-color);
         --color-selected: var(--core-bottom-tabs-color-selected);
         --background-selected: var(--core-bottom-tabs-background-selected);
-        ion-badge {
-            --background: var(--core-bottom-tabs-badge-color);
-            --color: var(--core-bottom-tabs-badge-text-color);
-        }
     }
 
     --core-link-color: var(--blue);

From 774dc32bfd7c41364927624f1863680b6370e69b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 2 Nov 2021 11:07:28 +0100
Subject: [PATCH 0190/1008] MOBILE-3881 timeline: Apply new design on timeline
 block

---
 .../components/onlineusers/onlineusers.scss   |   2 +-
 .../timeline/components/components.module.ts  |   4 -
 .../events/addon-block-timeline-events.html   | 107 ++++++++++--------
 .../timeline/components/events/events.scss    |  45 +++++++-
 .../timeline/components/events/events.ts      |  46 ++++----
 .../timeline/addon-block-timeline.html        |  27 ++---
 .../timeline/components/timeline/timeline.ts  |  48 ++++----
 src/addons/calendar/services/calendar.ts      |   5 +
 .../block/components/block/block.scss         |   4 +
 .../core-courses-course-progress.html         |  28 ++---
 src/theme/theme.base.scss                     |   7 ++
 11 files changed, 186 insertions(+), 137 deletions(-)

diff --git a/src/addons/block/onlineusers/components/onlineusers/onlineusers.scss b/src/addons/block/onlineusers/components/onlineusers/onlineusers.scss
index c3d4b4c40..c34c11af4 100644
--- a/src/addons/block/onlineusers/components/onlineusers/onlineusers.scss
+++ b/src/addons/block/onlineusers/components/onlineusers/onlineusers.scss
@@ -28,7 +28,7 @@
                 }
 
                 .userpicture {
-                    vertical-align: text-bottom;
+                    border-radius: 50%;
                 }
             }
 
diff --git a/src/addons/block/timeline/components/components.module.ts b/src/addons/block/timeline/components/components.module.ts
index dfd4a5fc4..f54298186 100644
--- a/src/addons/block/timeline/components/components.module.ts
+++ b/src/addons/block/timeline/components/components.module.ts
@@ -15,8 +15,6 @@
 import { NgModule } from '@angular/core';
 
 import { CoreSharedModule } from '@/core/shared.module';
-import { CoreCoursesComponentsModule } from '@features/courses/components/components.module';
-import { CoreCourseComponentsModule } from '@features/course/components/components.module';
 
 import { AddonBlockTimelineComponent } from './timeline/timeline';
 import { AddonBlockTimelineEventsComponent } from './events/events';
@@ -28,8 +26,6 @@ import { AddonBlockTimelineEventsComponent } from './events/events';
     ],
     imports: [
         CoreSharedModule,
-        CoreCoursesComponentsModule,
-        CoreCourseComponentsModule,
     ],
     exports: [
         AddonBlockTimelineComponent,
diff --git a/src/addons/block/timeline/components/events/addon-block-timeline-events.html b/src/addons/block/timeline/components/events/addon-block-timeline-events.html
index 0622e2e0b..7907f508c 100644
--- a/src/addons/block/timeline/components/events/addon-block-timeline-events.html
+++ b/src/addons/block/timeline/components/events/addon-block-timeline-events.html
@@ -1,50 +1,61 @@
+<ion-item lines="none" *ngIf="course">
+    <ion-label class="ion-text-wrap">
+        <h3>
+            <span class="sr-only">{{ 'core.courses.aria:coursename' | translate }}</span>
+            <core-format-text [text]="course.fullname" contextLevel="course" [contextInstanceId]="course.id"></core-format-text>
+        </h3>
+    </ion-label>
+</ion-item>
 <ion-item-group *ngFor="let dayEvents of filteredEvents">
-    <ion-item-divider [color]="dayEvents.color">
-        <ion-label><h3>{{ dayEvents.dayTimestamp * 1000 | coreFormatDate:"strftimedayshort" }}</h3></ion-label>
-    </ion-item-divider>
+    <ion-item lines="none">
+        <ion-label>
+            <h4 [class.core-bold]="!course">{{ dayEvents.dayTimestamp * 1000 | coreFormatDate:"strftimedayshort" }}</h4>
+        </ion-label>
+    </ion-item>
     <ng-container *ngFor="let event of dayEvents.events">
-        <ion-item class="ion-text-wrap core-course-module-handler item-media" detail="false" (click)="action($event, event.url)"
-            [attr.aria-label]="event.name" button>
-            <core-mod-icon *ngIf="event.iconUrl" slot="start" [modicon]="event.iconUrl" [componentId]="event.instance"
-                [modname]="event.modulename">
-            </core-mod-icon>
+        <ion-item class="addon-block-timeline-activity" detail="false" (click)="action($event, event.url)" [attr.aria-label]="event.name"
+            button lines="full">
             <ion-label>
-                <p class="item-heading">
-                    <core-format-text [text]="event.name" contextLevel="module" [contextInstanceId]="event.id"
-                        [courseId]="event.course && event.course.id">
-                    </core-format-text>
-                </p>
-                <p *ngIf="showCourse && event.course">
-                    <core-format-text [text]="event.course.fullnamedisplay" contextLevel="course"
-                        [contextInstanceId]="event.course.id">
-                    </core-format-text>
-                </p>
-
-                <ion-button fill="clear" class="ion-hide-md-up ion-text-wrap" (click)="action($event, event.action.url)"
-                    [title]="event.action.name" [disabled]="!event.action.actionable" *ngIf="event.action">
-                    {{event.action.name}}
-                    <ion-badge slot="end" class="ion-margin-start" *ngIf="event.action.showitemcount">{{event.action.itemcount}}
-                    </ion-badge>
-                </ion-button>
+                <ion-row class="ion-justify-content-between ion-align-items-center ion-no-padding">
+                    <ion-col class="addon-block-timeline-activity-main ion-no-padding">
+                        <ion-row class="ion-justify-content-between ion-align-items-center ion-nowrap ion-no-padding">
+                            <ion-col class="addon-block-timeline-activity-time ion-no-padding">
+                                <ion-badge color="light">{{event.timesort * 1000 | coreFormatDate:"strftimetime24" }}</ion-badge>
+                                <core-mod-icon *ngIf="event.iconUrl" [modicon]="event.iconUrl" [componentId]="event.instance"
+                                    [modname]="event.modulename">
+                                </core-mod-icon>
+                            </ion-col>
+                            <ion-col class="addon-block-timeline-activity-name ion-no-padding">
+                                <p class="item-heading">
+                                    <core-format-text [text]="event.activityname || event.name" contextLevel="module"
+                                        [contextInstanceId]="event.id" [courseId]="event.course && event.course.id">
+                                    </core-format-text>
+                                    <ion-badge *ngIf="event.overdue" color="danger">{{ 'addon.block_timeline.overdue' | translate }}
+                                    </ion-badge>
+                                </p>
+                                <p *ngIf="(showCourse && event.course) || event.activitystr">
+                                    <span *ngIf="showCourse && event.course">
+                                        <core-format-text [text]="event.course.fullnamedisplay" contextLevel="course"
+                                            [contextInstanceId]="event.course.id">
+                                        </core-format-text> ·
+                                    </span>
+                                    <core-format-text [text]="event.activitystr" contextLevel="module" [contextInstanceId]="event.id">
+                                    </core-format-text>
+                                </p>
+                            </ion-col>
+                        </ion-row>
+                    </ion-col>
+                    <ion-col class="addon-block-timeline-activity-action ion-no-padding">
+                        <ion-button fill="clear" (click)="action($event, event.action.url)" [title]="event.action.name"
+                            [disabled]="!event.action.actionable" *ngIf="event.action">
+                            {{event.action.name}}
+                            <ion-badge slot="end" class="ion-margin-start" *ngIf="event.action.showitemcount">
+                                {{event.action.itemcount}}
+                            </ion-badge>
+                        </ion-button>
+                    </ion-col>
+                </ion-row>
             </ion-label>
-
-            <div slot="end" class="events-info">
-                <div>
-                    <ion-badge color="light">{{event.timesort * 1000 | coreFormatDate:"strftimetime24" }}</ion-badge>
-                </div>
-                <ion-button
-                    class="ion-hide-md-down"
-                    fill="clear"
-                    (click)="action($event, event.action.url)"
-                    [title]="event.action.name"
-                    [disabled]="!event.action.actionable" *ngIf="event.action"
-                >
-                    {{event.action.name}}
-                    <ion-badge slot="end" class="ion-margin-start" *ngIf="event.action.showitemcount">
-                        {{event.action.itemcount}}
-                    </ion-badge>
-                </ion-button>
-            </div>
         </ion-item>
     </ng-container>
 </ion-item-group>
@@ -57,6 +68,10 @@
     <ion-spinner *ngIf="loadingMore" [attr.aria-label]="'core.loading' | translate"></ion-spinner>
 </div>
 
-<core-empty-box *ngIf="empty" image="assets/img/icons/activities.svg" [message]="'addon.block_timeline.noevents' | translate"
-    inline="true">
-</core-empty-box>
+<ion-item lines="none" *ngIf="empty && course">
+    <ion-label class="ion-text-wrap">
+        <p>{{'addon.block_timeline.noevents' | translate}}</p>
+    </ion-label>
+</ion-item>
+<core-empty-box *ngIf="empty && !course" image="assets/img/icons/activities.svg" inline="true"
+    [message]="'addon.block_timeline.noevents' | translate"></core-empty-box>
diff --git a/src/addons/block/timeline/components/events/events.scss b/src/addons/block/timeline/components/events/events.scss
index c863dbb2a..8ea49fcb1 100644
--- a/src/addons/block/timeline/components/events/events.scss
+++ b/src/addons/block/timeline/components/events/events.scss
@@ -1,6 +1,41 @@
-.events-info {
-    display: flex;
-    flex-direction: column;
-    text-align: end;
-    padding: 10px 0;
+@import "~theme/globals";
+
+h3 {
+    font-weight: bold;
+    font-size: 18px;
+}
+
+h4 {
+    font-size: 15px;
+}
+
+h4.core-bold {
+    font-weight: bold;
+}
+
+.addon-block-timeline-activity ion-badge {
+    @include margin-horizontal(0.25rem, 0.5rem);
+}
+
+.addon-block-timeline-activity core-mod-icon {
+    --margin-end: 0.5rem;
+}
+
+.addon-block-timeline-activity-time,
+.addon-block-timeline-activity-action {
+    flex-grow: 0;
+}
+
+.addon-block-timeline-activity-main,
+.addon-block-timeline-activity-name {
+    flex-grow: 1;
+    p {
+        overflow: hidden;
+        text-overflow: ellipsis;
+    }
+}
+
+.addon-block-timeline-activity-name {
+    flex-grow: 1;
+    overflow: hidden;
 }
diff --git a/src/addons/block/timeline/components/events/events.ts b/src/addons/block/timeline/components/events/events.ts
index b0db9c8a0..b9047ff2b 100644
--- a/src/addons/block/timeline/components/events/events.ts
+++ b/src/addons/block/timeline/components/events/events.ts
@@ -17,11 +17,11 @@ import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreTimeUtils } from '@services/utils/time';
-import { CoreUtils } from '@services/utils/utils';
 import { CoreCourse } from '@features/course/services/course';
 import moment from 'moment';
 import { CoreContentLinksHelper } from '@features/contentlinks/services/contentlinks-helper';
 import { AddonCalendarEvent } from '@addons/calendar/services/calendar';
+import { CoreEnrolledCourseDataWithOptions } from '@features/courses/services/courses-helper';
 
 /**
  * Directive to render a list of events in course overview.
@@ -34,34 +34,37 @@ import { AddonCalendarEvent } from '@addons/calendar/services/calendar';
 export class AddonBlockTimelineEventsComponent implements OnChanges {
 
     @Input() events: AddonBlockTimelineEvent[] = []; // The events to render.
-    @Input() showCourse?: boolean | string; // Whether to show the course name.
+    @Input() course?: CoreEnrolledCourseDataWithOptions; // Whether to show the course name.
     @Input() from = 0; // Number of days from today to offset the events.
     @Input() to?: number; // Number of days from today to limit the events to. If not defined, no limit.
-    @Input() canLoadMore?: boolean; // Whether more events can be loaded.
-    @Output() loadMore: EventEmitter<void>; // Notify that more events should be loaded.
+    @Input() canLoadMore = false; // Whether more events can be loaded.
+    @Output() loadMore = new EventEmitter(); // Notify that more events should be loaded.
 
+    showCourse = false; // Whether to show the course name.
     empty = true;
     loadingMore = false;
     filteredEvents: AddonBlockTimelineEventFilteredEvent[] = [];
 
-    constructor() {
-        this.loadMore = new EventEmitter();
-    }
-
     /**
-     * Detect changes on input properties.
+     * @inheritdoc
      */
     async ngOnChanges(changes: {[name: string]: SimpleChange}): Promise<void> {
-        this.showCourse = CoreUtils.isTrueOrOne(this.showCourse);
+        this.showCourse = !this.course;
 
         if (changes.events || changes.from || changes.to) {
             if (this.events && this.events.length > 0) {
                 const filteredEvents = await this.filterEventsByTime(this.from, this.to);
                 this.empty = !filteredEvents || filteredEvents.length <= 0;
 
+                const now = CoreTimeUtils.timestamp();
+
                 const eventsByDay: Record<number, AddonCalendarEvent[]> = {};
                 filteredEvents.forEach((event) => {
                     const dayTimestamp = CoreTimeUtils.getMidnightForTimestamp(event.timesort);
+
+                    // Already calculated on 4.0 onwards but this will be live.
+                    event.overdue = event.timesort < now;
+
                     if (eventsByDay[dayTimestamp]) {
                         eventsByDay[dayTimestamp].push(event);
                     } else {
@@ -69,15 +72,13 @@ export class AddonBlockTimelineEventsComponent implements OnChanges {
                     }
                 });
 
-                const todaysMidnight = CoreTimeUtils.getMidnightForTimestamp();
-                this.filteredEvents = [];
-                Object.keys(eventsByDay).forEach((key) => {
+                this.filteredEvents =  Object.keys(eventsByDay).map((key) => {
                     const dayTimestamp = parseInt(key);
-                    this.filteredEvents.push({
-                        color: dayTimestamp < todaysMidnight ? 'danger' : 'light',
+
+                    return {
                         dayTimestamp,
                         events: eventsByDay[dayTimestamp],
-                    });
+                    };
                 });
             } else {
                 this.empty = true;
@@ -94,7 +95,7 @@ export class AddonBlockTimelineEventsComponent implements OnChanges {
      */
     protected async filterEventsByTime(start: number, end?: number): Promise<AddonBlockTimelineEvent[]> {
         start = moment().add(start, 'days').startOf('day').unix();
-        end = typeof end != 'undefined' ? moment().add(end, 'days').startOf('day').unix() : end;
+        end = end !== undefined ? moment().add(end, 'days').startOf('day').unix() : end;
 
         return await Promise.all(this.events.filter((event) => {
             if (end) {
@@ -122,12 +123,12 @@ export class AddonBlockTimelineEventsComponent implements OnChanges {
     /**
      * Action clicked.
      *
-     * @param e Click event.
+     * @param event Click event.
      * @param url Url of the action.
      */
-    async action(e: Event, url: string): Promise<void> {
-        e.preventDefault();
-        e.stopPropagation();
+    async action(event: Event, url: string): Promise<void> {
+        event.preventDefault();
+        event.stopPropagation();
 
         // Fix URL format.
         url = CoreTextUtils.decodeHTMLEntities(url);
@@ -137,7 +138,7 @@ export class AddonBlockTimelineEventsComponent implements OnChanges {
         try {
             const treated = await CoreContentLinksHelper.handleLink(url);
             if (!treated) {
-                return CoreSites.getCurrentSite()?.openInBrowserWithAutoLoginIfSameSite(url);
+                return CoreSites.getRequiredCurrentSite().openInBrowserWithAutoLoginIfSameSite(url);
             }
         } finally {
             modal.dismiss();
@@ -154,5 +155,4 @@ type AddonBlockTimelineEvent = AddonCalendarEvent & {
 type AddonBlockTimelineEventFilteredEvent = {
     events: AddonBlockTimelineEvent[];
     dayTimestamp: number;
-    color: string;
 };
diff --git a/src/addons/block/timeline/components/timeline/addon-block-timeline.html b/src/addons/block/timeline/components/timeline/addon-block-timeline.html
index 62105627c..81c32360d 100644
--- a/src/addons/block/timeline/components/timeline/addon-block-timeline.html
+++ b/src/addons/block/timeline/components/timeline/addon-block-timeline.html
@@ -1,5 +1,7 @@
 <ion-item-divider sticky="true">
-    <ion-label><h2>{{ 'addon.block_timeline.pluginname' | translate }}</h2></ion-label>
+    <ion-label>
+        <h2>{{ 'addon.block_timeline.pluginname' | translate }}</h2>
+    </ion-label>
     <core-context-menu slot="end">
         <core-context-menu-item *ngIf="loaded" [priority]="900" [content]="'addon.block_timeline.sortbydates' | translate"
             (action)="switchSort('sortbydates')" [iconAction]="sort == 'sortbydates' ? 'far-dot-circle' : 'far-circle'">
@@ -18,7 +20,7 @@
             <ion-select-option class="ion-text-wrap" value="overdue">
                 {{ 'addon.block_timeline.overdue' | translate }}
             </ion-select-option>
-            <ion-select-option class="ion-text-wrap" disabled value="disabled">
+            <ion-select-option class="ion-text-wrap core-select-option-title" disabled value="disabled">
                 {{ 'addon.block_timeline.duedate' | translate }}
             </ion-select-option>
             <ion-select-option class="ion-text-wrap" value="next7days">
@@ -36,21 +38,14 @@
         </core-combobox>
     </div>
     <core-loading [hideUntil]="timeline.loaded" [hidden]="sort != 'sortbydates'" [fullscreen]="false">
-        <addon-block-timeline-events [events]="timeline.events" showCourse="true" [canLoadMore]="timeline.canLoadMore"
-            (loadMore)="loadMoreTimeline()" [from]="dataFrom" [to]="dataTo"></addon-block-timeline-events>
+        <addon-block-timeline-events [events]="timeline.events" [canLoadMore]="timeline.canLoadMore" (loadMore)="loadMore()"
+            [from]="dataFrom" [to]="dataTo"></addon-block-timeline-events>
     </core-loading>
-    <core-loading [hideUntil]="timelineCourses.loaded" [hidden]="sort != 'sortbycourses'"
-        [fullscreen]="false" class="safe-area-padding">
-        <ion-grid class="ion-no-padding">
-            <ion-row class="ion-no-padding">
-                <ion-col *ngFor="let course of timelineCourses.courses" class="ion-no-padding" size="12" size-md="6">
-                    <core-courses-course-progress [course]="course">
-                        <addon-block-timeline-events [events]="course.events" [canLoadMore]="course.canLoadMore"
-                            (loadMore)="loadMoreCourse(course)" [from]="dataFrom" [to]="dataTo"></addon-block-timeline-events>
-                    </core-courses-course-progress>
-                </ion-col>
-            </ion-row>
-        </ion-grid>
+    <core-loading [hideUntil]="timelineCourses.loaded" [hidden]="sort != 'sortbycourses'" [fullscreen]="false" class="safe-area-page">
+        <ng-container *ngFor="let course of timelineCourses.courses">
+            <addon-block-timeline-events [events]="course.events" [canLoadMore]="course.canLoadMore" (loadMore)="loadMore(course)"
+                [course]="course" [from]="dataFrom" [to]="dataTo"></addon-block-timeline-events>
+        </ng-container>
         <core-empty-box *ngIf="timelineCourses.courses.length == 0" image="assets/img/icons/courses.svg" inline="true"
             [message]="'addon.block_timeline.nocoursesinprogress' | translate"></core-empty-box>
     </core-loading>
diff --git a/src/addons/block/timeline/components/timeline/timeline.ts b/src/addons/block/timeline/components/timeline/timeline.ts
index 29f2e1487..c8ef64b77 100644
--- a/src/addons/block/timeline/components/timeline/timeline.ts
+++ b/src/addons/block/timeline/components/timeline/timeline.ts
@@ -24,6 +24,7 @@ import { CoreCoursesHelper, CoreEnrolledCourseDataWithOptions } from '@features/
 import { CoreSite } from '@classes/site';
 import { CoreCourses } from '@features/courses/services/courses';
 import { CoreCourseOptionsDelegate } from '@features/course/services/course-options-delegate';
+import { CoreNavigator } from '@services/navigator';
 
 /**
  * Component to render a timeline block.
@@ -36,7 +37,7 @@ export class AddonBlockTimelineComponent extends CoreBlockBaseComponent implemen
 
     sort = 'sortbydates';
     filter = 'next30days';
-    currentSite?: CoreSite;
+    currentSite!: CoreSite;
     timeline: {
         events: AddonCalendarEvent[];
         loaded: boolean;
@@ -66,10 +67,18 @@ export class AddonBlockTimelineComponent extends CoreBlockBaseComponent implemen
     }
 
     /**
-     * Component being initialized.
+     * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
-        this.currentSite = CoreSites.getRequiredCurrentSite();
+        try {
+            this.currentSite = CoreSites.getRequiredCurrentSite();
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
+        }
 
         this.filter = await this.currentSite.getLocalSiteConfig('AddonBlockTimelineFilter', this.filter);
         this.switchFilter(this.filter);
@@ -117,28 +126,21 @@ export class AddonBlockTimelineComponent extends CoreBlockBaseComponent implemen
         }
     }
 
-    /**
-     * Load more events.
-     */
-    async loadMoreTimeline(): Promise<void> {
-        try {
-            await this.fetchMyOverviewTimeline(this.timeline.canLoadMore);
-        } catch (error) {
-            CoreDomUtils.showErrorModalDefault(error, this.fetchContentDefaultError);
-        }
-    }
-
     /**
      * Load more events.
      *
-     * @param course Course.
+     * @param course Course. If defined, it will update the course events, timeline otherwise.
      * @return Promise resolved when done.
      */
-    async loadMoreCourse(course: AddonBlockTimelineCourse): Promise<void> {
+    async loadMore(course?: AddonBlockTimelineCourse): Promise<void> {
         try {
-            const courseEvents = await AddonBlockTimeline.getActionEventsByCourse(course.id, course.canLoadMore);
-            course.events = course.events?.concat(courseEvents.events);
-            course.canLoadMore = courseEvents.canLoadMore;
+            if (course) {
+                const courseEvents = await AddonBlockTimeline.getActionEventsByCourse(course.id, course.canLoadMore);
+                course.events = course.events?.concat(courseEvents.events);
+                course.canLoadMore = courseEvents.canLoadMore;
+            } else {
+                await this.fetchMyOverviewTimeline(this.timeline.canLoadMore);
+            }
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, this.fetchContentDefaultError);
         }
@@ -188,12 +190,12 @@ export class AddonBlockTimelineComponent extends CoreBlockBaseComponent implemen
      */
     switchFilter(filter: string): void {
         this.filter = filter;
-        this.currentSite?.setLocalSiteConfig('AddonBlockTimelineFilter', this.filter);
+        this.currentSite.setLocalSiteConfig('AddonBlockTimelineFilter', this.filter);
 
         switch (this.filter) {
             case 'overdue':
                 this.dataFrom = -14;
-                this.dataTo = 0;
+                this.dataTo = 1;
                 break;
             case 'next7days':
                 this.dataFrom = 0;
@@ -226,7 +228,7 @@ export class AddonBlockTimelineComponent extends CoreBlockBaseComponent implemen
      */
     switchSort(sort: string): void {
         this.sort = sort;
-        this.currentSite?.setLocalSiteConfig('AddonBlockTimelineSort', this.sort);
+        this.currentSite.setLocalSiteConfig('AddonBlockTimelineSort', this.sort);
 
         if (!this.timeline.loaded && this.sort == 'sortbydates') {
             this.fetchContent();
@@ -237,7 +239,7 @@ export class AddonBlockTimelineComponent extends CoreBlockBaseComponent implemen
 
 }
 
-type AddonBlockTimelineCourse = CoreEnrolledCourseDataWithOptions & {
+export type AddonBlockTimelineCourse = CoreEnrolledCourseDataWithOptions & {
     events?: AddonCalendarEvent[];
     canLoadMore?: number;
 };
diff --git a/src/addons/calendar/services/calendar.ts b/src/addons/calendar/services/calendar.ts
index b4ab29361..f21f71869 100644
--- a/src/addons/calendar/services/calendar.ts
+++ b/src/addons/calendar/services/calendar.ts
@@ -1707,14 +1707,19 @@ export type AddonCalendarEventBase = {
     userid?: number; // Userid.
     repeatid?: number; // Repeatid.
     eventcount?: number; // Eventcount.
+    component?: string; // Component.
     modulename?: string; // Modulename.
+    activityname?: string; // Activityname.
+    activitystr?: string; // Activitystr.
     instance?: number; // Instance.
     eventtype: AddonCalendarEventType; // Eventtype.
     timestart: number; // Timestart.
     timeduration: number; // Timeduration.
     timesort: number; // Timesort.
+    timeusermidnight: number; // Timeusermidnight.
     visible: number; // Visible.
     timemodified: number; // Timemodified.
+    overdue?: boolean; // Overdue.
     icon: {
         key: string; // Key.
         component: string; // Component.
diff --git a/src/core/features/block/components/block/block.scss b/src/core/features/block/components/block/block.scss
index c33c495a9..72e49c32f 100644
--- a/src/core/features/block/components/block/block.scss
+++ b/src/core/features/block/components/block/block.scss
@@ -7,4 +7,8 @@
     ion-item-divider {
         min-height: var(--item-divider-min-height);
     }
+
+    ::ng-deep core-loading {
+        --loading-inline-min-height: 44px;
+    }
 }
diff --git a/src/core/features/courses/components/course-progress/core-courses-course-progress.html b/src/core/features/courses/components/course-progress/core-courses-course-progress.html
index d36b8cb38..7adb8fcc3 100644
--- a/src/core/features/courses/components/course-progress/core-courses-course-progress.html
+++ b/src/core/features/courses/components/course-progress/core-courses-course-progress.html
@@ -1,14 +1,12 @@
 <ion-card [attr.course-color]="course.color ? null : course.colorNumber">
     <div (click)="openCourse()" class="core-course-thumb" [class.core-course-color-img]="course.courseImage"
         [style.background-color]="course.color">
-        <img *ngIf="course.courseImage" [src]="course.courseImage" core-external-content alt=""/>
+        <img *ngIf="course.courseImage" [src]="course.courseImage" core-external-content alt="" />
     </div>
     <ion-item button lines="none" (click)="openCourse()" [attr.aria-label]="course.displayname || course.fullname"
         class="core-course-header" [class.item-disabled]="course.visible == 0"
-        [class.core-course-only-title]="!showAll || progress < 0 && completionUserTracked === false"
-        detail="false">
-        <ion-label
-            class="ion-text-wrap core-course-title"
+        [class.core-course-only-title]="!showAll || progress < 0 && completionUserTracked === false" detail="false">
+        <ion-label class="ion-text-wrap core-course-title"
             [class.core-course-with-buttons]="courseOptionMenuEnabled || (downloadCourseEnabled && showDownload)"
             [class.core-course-with-spinner]="(downloadCourseEnabled && prefetchCourseData.icon == 'spinner') || showSpinner">
             <p *ngIf="course.categoryname || (course.displayname && course.shortname && course.fullname != course.displayname)"
@@ -19,8 +17,7 @@
                 </span>
                 <span *ngIf="course.categoryname && course.displayname && course.shortname && course.fullname != course.displayname"
                     class="core-course-category"> | </span>
-                <span *ngIf="course.displayname && course.shortname && course.fullname != course.displayname"
-                    class="core-course-shortname">
+                <span *ngIf="course.displayname && course.shortname && course.fullname != course.displayname" class="core-course-shortname">
                     <core-format-text [text]="course.shortname" contextLevel="course" [contextInstanceId]="course.id">
                     </core-format-text>
                 </span>
@@ -35,12 +32,8 @@
         </ion-label>
 
         <div class="core-button-spinner" *ngIf="downloadCourseEnabled && !courseOptionMenuEnabled && showDownload" slot="end">
-            <core-download-refresh
-                [status]="prefetchCourseData.status"
-                [enabled]="downloadCourseEnabled"
-                [statusTranslatable]="prefetchCourseData.statusTranslatable"
-                canTrustDownload="false"
-                [loading]="prefetchCourseData.loading"
+            <core-download-refresh [status]="prefetchCourseData.status" [enabled]="downloadCourseEnabled"
+                [statusTranslatable]="prefetchCourseData.statusTranslatable" canTrustDownload="false" [loading]="prefetchCourseData.loading"
                 (action)="prefetchCourse()"></core-download-refresh>
         </div>
 
@@ -50,9 +43,8 @@
                 [attr.aria-label]="'core.loading' | translate"></ion-spinner>
 
             <!-- Downloaded icon. -->
-            <ion-icon *ngIf="downloadCourseEnabled && prefetchCourseData.downloadSucceeded && !showSpinner"
-                class="core-icon-downloaded" name="cloud-done" color="success" role="status"
-                [attr.aria-label]="'core.downloaded' | translate"></ion-icon>
+            <ion-icon *ngIf="downloadCourseEnabled && prefetchCourseData.downloadSucceeded && !showSpinner" class="core-icon-downloaded"
+                name="cloud-done" color="success" role="status" [attr.aria-label]="'core.downloaded' | translate"></ion-icon>
 
             <!-- Options menu. -->
             <ion-button fill="clear" color="dark" (click)="showCourseOptionsMenu($event)" *ngIf="!showSpinner"
@@ -61,11 +53,9 @@
             </ion-button>
         </div>
     </ion-item>
-    <ion-item *ngIf="showAll && progress >= 0 && completionUserTracked !== false" lines="none"
-        class="core-course-progress">
+    <ion-item *ngIf="showAll && progress >= 0 && completionUserTracked !== false" lines="none" class="core-course-progress">
         <ion-label>
             <core-progress-bar [progress]="progress" a11yText="core.courses.aria:courseprogress"></core-progress-bar>
         </ion-label>
     </ion-item>
-    <ng-content></ng-content>
 </ion-card>
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index c74dae05a..4605eabae 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -788,6 +788,13 @@ ion-select::part(icon) {
     opacity: 1;
 }
 
+ion-select-popover ion-item.core-select-option-title {
+    cursor: pointer;
+    ion-radio {
+        display: none;
+    }
+}
+
 ion-searchbar {
     .searchbar-search-icon.ios {
         top: 4px;

From b98be569eae2969e7e247b0c527a6b073183be2b Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 4 Nov 2021 10:47:03 +0100
Subject: [PATCH 0191/1008] MOBILE-3905 core: Fix  getting snapshot params

---
 src/core/services/navigator.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/core/services/navigator.ts b/src/core/services/navigator.ts
index 6e5e471de..52455ad12 100644
--- a/src/core/services/navigator.ts
+++ b/src/core/services/navigator.ts
@@ -264,14 +264,16 @@ export class CoreNavigatorService {
      * @return Value of the parameter, undefined if not found.
      */
     protected getRouteSnapshotParam<T = unknown>(name: string, route?: ActivatedRoute): T | undefined {
-        if (!route?.snapshot) {
+        if (!route) {
             return;
         }
 
-        const value = route.snapshot.queryParams[name] ?? route.snapshot.params[name];
+        if (route.snapshot) {
+            const value = route.snapshot.queryParams[name] ?? route.snapshot.params[name];
 
-        if (value !== undefined) {
-            return value;
+            if (value !== undefined) {
+                return value;
+            }
         }
 
         return this.getRouteSnapshotParam(name, route.parent || undefined);

From df92c978024b3b4dfe4f0a3ec32d052b8803c544 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 4 Nov 2021 10:53:50 +0100
Subject: [PATCH 0192/1008] MOBILE-3905 user: Define mobile participant page

---
 .../pages/participants/participants.page.ts     | 17 -----------------
 .../user/services/handlers/course-option.ts     |  3 ++-
 .../features/user/user-course-lazy.module.ts    |  6 ++++--
 src/core/features/user/user.module.ts           | 14 +++++++++++++-
 4 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/src/core/features/user/pages/participants/participants.page.ts b/src/core/features/user/pages/participants/participants.page.ts
index b1508eb2b..82a9f22f0 100644
--- a/src/core/features/user/pages/participants/participants.page.ts
+++ b/src/core/features/user/pages/participants/participants.page.ts
@@ -19,7 +19,6 @@ import { CoreApp } from '@services/app';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreNavigator } from '@services/navigator';
 import { CorePageItemsListManager } from '@classes/page-items-list-manager';
-import { CoreScreen } from '@services/screen';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import { CoreUser, CoreUserProvider, CoreUserParticipant, CoreUserData } from '@features/user/services/user';
 import { CoreUtils } from '@services/utils/utils';
@@ -213,22 +212,6 @@ class CoreUserParticipantsManager extends CorePageItemsListManager<CoreUserParti
         this.courseId = courseId;
     }
 
-    /**
-     * @inheritdoc
-     */
-    async select(participant: CoreUserParticipant | CoreUserData): Promise<void> {
-        if (CoreScreen.isMobile) {
-            await CoreNavigator.navigateToSitePath(
-                '/user/profile',
-                { params: { userId: participant.id, courseId: this.courseId } },
-            );
-
-            return;
-        }
-
-        return super.select(participant);
-    }
-
     /**
      * @inheritdoc
      */
diff --git a/src/core/features/user/services/handlers/course-option.ts b/src/core/features/user/services/handlers/course-option.ts
index 9be660d77..8d0484c9e 100644
--- a/src/core/features/user/services/handlers/course-option.ts
+++ b/src/core/features/user/services/handlers/course-option.ts
@@ -21,6 +21,7 @@ import {
 } from '@features/course/services/course-options-delegate';
 import { CoreCourseUserAdminOrNavOptionIndexed } from '@features/courses/services/courses';
 import { CoreEnrolledCourseDataWithExtraInfoAndOptions } from '@features/courses/services/courses-helper';
+import { PARTICIPANTS_PAGE_NAME } from '@features/user/user.module';
 import { makeSingleton } from '@singletons';
 import { CoreUser } from '../user';
 
@@ -89,7 +90,7 @@ export class CoreUserCourseOptionHandlerService implements CoreCourseOptionsHand
         return {
             title: 'core.user.participants',
             class: 'core-user-participants-handler',
-            page: 'participants',
+            page: PARTICIPANTS_PAGE_NAME,
         };
     }
 
diff --git a/src/core/features/user/user-course-lazy.module.ts b/src/core/features/user/user-course-lazy.module.ts
index e08c9408f..9992c1ff1 100644
--- a/src/core/features/user/user-course-lazy.module.ts
+++ b/src/core/features/user/user-course-lazy.module.ts
@@ -19,17 +19,19 @@ import { CoreSharedModule } from '@/core/shared.module';
 import { CoreSearchComponentsModule } from '@features/search/components/components.module';
 
 import { CoreUserParticipantsPage } from './pages/participants/participants.page';
+import { conditionalRoutes } from '@/app/app-routing.module';
+import { CoreScreen } from '@services/screen';
 
 const routes: Routes = [
     {
         path: '',
         component: CoreUserParticipantsPage,
-        children: [
+        children: conditionalRoutes([
             {
                 path: ':userId',
                 loadChildren: () => import('@features/user/pages/profile/profile.module').then(m => m.CoreUserProfilePageModule),
             },
-        ],
+        ], () => CoreScreen.isTablet),
     },
 ];
 
diff --git a/src/core/features/user/user.module.ts b/src/core/features/user/user.module.ts
index 75901a66e..ff8bb99ad 100644
--- a/src/core/features/user/user.module.ts
+++ b/src/core/features/user/user.module.ts
@@ -35,6 +35,10 @@ import { CoreUserProvider } from './services/user';
 import { CoreUserHelperProvider } from './services/user-helper';
 import { CoreUserOfflineProvider } from './services/user-offline';
 import { CoreUserSyncProvider } from './services/user-sync';
+import { conditionalRoutes } from '@/app/app-routing.module';
+import { CoreScreen } from '@services/screen';
+import { COURSE_PAGE_NAME } from '@features/course/course.module';
+import { COURSE_INDEX_PATH } from '@features/course/course-lazy.module';
 
 export const CORE_USER_SERVICES: Type<unknown>[] = [
     CoreUserDelegateService,
@@ -45,16 +49,24 @@ export const CORE_USER_SERVICES: Type<unknown>[] = [
     CoreUserSyncProvider,
 ];
 
+export const PARTICIPANTS_PAGE_NAME = 'participants';
+
 const routes: Routes = [
     {
         path: 'user',
         loadChildren: () => import('@features/user/user-lazy.module').then(m => m.CoreUserLazyModule),
     },
+    ...conditionalRoutes([
+        {
+            path: `${COURSE_PAGE_NAME}/${COURSE_INDEX_PATH}/${PARTICIPANTS_PAGE_NAME}/:userId`,
+            loadChildren: () => import('@features/user/pages/profile/profile.module').then(m => m.CoreUserProfilePageModule),
+        },
+    ], () => CoreScreen.isMobile),
 ];
 
 const courseIndexRoutes: Routes = [
     {
-        path: 'participants',
+        path: PARTICIPANTS_PAGE_NAME,
         loadChildren: () => import('@features/user/user-course-lazy.module').then(m => m.CoreUserCourseLazyModule),
     },
 ];

From 429aecf3aaca6c0ad47fa590a70f0cacab5016b8 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 9 Nov 2021 13:08:56 +0100
Subject: [PATCH 0193/1008] MOBILE-3905 course: Swipe between participants

---
 package-lock.json                             |  14 ++
 package.json                                  |   3 +-
 src/core/classes/hammer-gesture-config.ts     |  27 ++
 .../items-management/items-manager-source.ts  | 169 +++++++++++++
 .../items-manager-sources-tracker.ts          | 141 +++++++++++
 .../classes/items-management/items-manager.ts | 192 ++++++++++++++
 .../items-management/list-items-manager.ts    | 237 ++++++++++++++++++
 .../items-management/swipe-items-manager.ts   |  97 +++++++
 src/core/classes/page-items-list-manager.ts   |   2 +
 src/core/components/components.module.ts      |   3 +
 .../swipe-navigation/swipe-navigation.html    |   5 +
 .../swipe-navigation/swipe-navigation.scss    |   7 +
 .../swipe-navigation/swipe-navigation.ts      |  41 +++
 src/core/core.module.ts                       |   4 +
 .../user/classes/participants-source.ts       |  81 ++++++
 .../pages/participants/participants.page.ts   |  79 +++---
 .../features/user/pages/profile/profile.html  | 153 ++++++-----
 .../user/pages/profile/profile.page.ts        |  66 ++++-
 .../features/user/pages/profile/profile.scss  |   3 +
 src/core/features/user/user.module.ts         |   3 +
 src/core/services/navigator.ts                |   2 +
 21 files changed, 1205 insertions(+), 124 deletions(-)
 create mode 100644 src/core/classes/hammer-gesture-config.ts
 create mode 100644 src/core/classes/items-management/items-manager-source.ts
 create mode 100644 src/core/classes/items-management/items-manager-sources-tracker.ts
 create mode 100644 src/core/classes/items-management/items-manager.ts
 create mode 100644 src/core/classes/items-management/list-items-manager.ts
 create mode 100644 src/core/classes/items-management/swipe-items-manager.ts
 create mode 100644 src/core/components/swipe-navigation/swipe-navigation.html
 create mode 100644 src/core/components/swipe-navigation/swipe-navigation.scss
 create mode 100644 src/core/components/swipe-navigation/swipe-navigation.ts
 create mode 100644 src/core/features/user/classes/participants-source.ts

diff --git a/package-lock.json b/package-lock.json
index 1310a5e2e..14a098f20 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -88,6 +88,7 @@
         "cordova.plugins.diagnostic": "^5.0.2",
         "core-js": "^3.9.1",
         "es6-promise-plugin": "^4.2.2",
+        "hammerjs": "^2.0.8",
         "jszip": "^3.5.0",
         "mathjax": "2.7.7",
         "moment": "^2.29.0",
@@ -15988,6 +15989,14 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/hammerjs": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
+      "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE=",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
     "node_modules/handle-thing": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
@@ -43687,6 +43696,11 @@
         "glogg": "^1.0.0"
       }
     },
+    "hammerjs": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
+      "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
+    },
     "handle-thing": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
diff --git a/package.json b/package.json
index bff141856..5c790b408 100644
--- a/package.json
+++ b/package.json
@@ -117,6 +117,7 @@
     "cordova.plugins.diagnostic": "^5.0.2",
     "core-js": "^3.9.1",
     "es6-promise-plugin": "^4.2.2",
+    "hammerjs": "^2.0.8",
     "jszip": "^3.5.0",
     "mathjax": "2.7.7",
     "moment": "^2.29.0",
@@ -245,4 +246,4 @@
   "optionalDependencies": {
     "keytar": "^7.2.0"
   }
-}
\ No newline at end of file
+}
diff --git a/src/core/classes/hammer-gesture-config.ts b/src/core/classes/hammer-gesture-config.ts
new file mode 100644
index 000000000..de832aa37
--- /dev/null
+++ b/src/core/classes/hammer-gesture-config.ts
@@ -0,0 +1,27 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { HammerGestureConfig } from '@angular/platform-browser';
+import { DIRECTION_ALL } from 'hammerjs';
+
+/**
+ * Application HammerJS config.
+ */
+export class CoreHammerGestureConfig extends HammerGestureConfig {
+
+    overrides = {
+        swipe: { direction: DIRECTION_ALL },
+    };
+
+}
diff --git a/src/core/classes/items-management/items-manager-source.ts b/src/core/classes/items-management/items-manager-source.ts
new file mode 100644
index 000000000..141cc6f4c
--- /dev/null
+++ b/src/core/classes/items-management/items-manager-source.ts
@@ -0,0 +1,169 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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.
+
+/**
+ * Updates listener.
+ */
+export interface CoreItemsListSourceListener<Item> {
+    onItemsUpdated(items: Item[], hasMoreItems: boolean): void;
+    onReset(): void;
+}
+
+/**
+ * Items collection source data.
+ */
+export abstract class CoreItemsManagerSource<Item = unknown> {
+
+    /**
+     * Get a string to identify instances constructed with the given arguments as being reusable.
+     *
+     * @param args Constructor arguments.
+     * @returns Id.
+     */
+    static getSourceId(...args: unknown[]): string {
+        return args.map(argument => String(argument)).join('-');
+    }
+
+    private items: Item[] | null = null;
+    private hasMoreItems = true;
+    private listeners: CoreItemsListSourceListener<Item>[] = [];
+
+    /**
+     * Check whether any page has been loaded.
+     *
+     * @returns Whether any page has been loaded.
+     */
+    isLoaded(): boolean {
+        return this.items !== null;
+    }
+
+    /**
+     * Check whether there are more pages to be loaded.
+     *
+     * @return Whether there are more pages to be loaded.
+     */
+    isCompleted(): boolean {
+        return !this.hasMoreItems;
+    }
+
+    /**
+     * Get collection items.
+     *
+     * @returns Items.
+     */
+    getItems(): Item[] | null {
+        return this.items;
+    }
+
+    /**
+     * Get the count of pages that have been loaded.
+     *
+     * @returns Pages loaded.
+     */
+    getPagesLoaded(): number {
+        if (this.items === null) {
+            return 0;
+        }
+
+        return Math.ceil(this.items.length / this.getPageLength());
+    }
+
+    /**
+     * Reset collection data.
+     */
+    reset(): void {
+        this.items = null;
+        this.hasMoreItems = true;
+
+        this.listeners.forEach(listener => listener.onReset());
+    }
+
+    /**
+     * Register a listener.
+     *
+     * @param listener Listener.
+     * @returns Unsubscribe function.
+     */
+    addListener(listener: CoreItemsListSourceListener<Item>): () => void {
+        this.listeners.push(listener);
+
+        return () => this.removeListener(listener);
+    }
+
+    /**
+     * Remove a listener.
+     *
+     * @param listener Listener.
+     */
+    removeListener(listener: CoreItemsListSourceListener<Item>): void {
+        const index = this.listeners.indexOf(listener);
+
+        if (index === -1) {
+            return;
+        }
+
+        this.listeners.splice(index, 1);
+    }
+
+    /**
+     * Reload the collection, this resets the data to the first page.
+     */
+    async reload(): Promise<void> {
+        const { items, hasMoreItems } = await this.loadPageItems(0);
+
+        this.setItems(items, hasMoreItems);
+    }
+
+    /**
+     * Load items for the next page, if any.
+     */
+    async loadNextPage(): Promise<void> {
+        if (!this.hasMoreItems) {
+            return;
+        }
+
+        const { items, hasMoreItems } = await this.loadPageItems(this.getPagesLoaded());
+
+        this.setItems((this.items ?? []).concat(items), hasMoreItems);
+    }
+
+    /**
+     * Load page items.
+     *
+     * @param page Page number (starting at 0).
+     * @return Page items data.
+     */
+    protected abstract loadPageItems(page: number): Promise<{ items: Item[]; hasMoreItems: boolean }>;
+
+    /**
+     * Get the length of each page in the collection.
+     *
+     * @return Page length.
+     */
+    protected abstract getPageLength(): number;
+
+    /**
+     * Update the collection items.
+     *
+     * @param items Items.
+     * @param hasMoreItems Whether there are more pages to be loaded.
+     */
+    protected setItems(items: Item[], hasMoreItems: boolean): void {
+        this.items = items;
+        this.hasMoreItems = hasMoreItems;
+
+        this.listeners.forEach(listener => listener.onItemsUpdated(items, hasMoreItems));
+    }
+
+}
diff --git a/src/core/classes/items-management/items-manager-sources-tracker.ts b/src/core/classes/items-management/items-manager-sources-tracker.ts
new file mode 100644
index 000000000..997f5c556
--- /dev/null
+++ b/src/core/classes/items-management/items-manager-sources-tracker.ts
@@ -0,0 +1,141 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreItemsManagerSource } from './items-manager-source';
+
+type SourceConstructor<T extends CoreItemsManagerSource = CoreItemsManagerSource> = {
+    getSourceId(...args: unknown[]): string;
+    new (...args: unknown[]): T;
+};
+type InstanceTracking = { instance: CoreItemsManagerSource; references: unknown[] };
+type Instances = Record<string, InstanceTracking>;
+
+/**
+ * Tracks CoreItemsManagerSource instances to reuse between pages.
+ */
+export class CoreItemsManagerSourcesTracker {
+
+    private static instances: WeakMap<SourceConstructor, Instances> = new WeakMap();
+    private static instanceIds: WeakMap<CoreItemsManagerSource, string> = new WeakMap();
+
+    /**
+     * Create an instance of the given source or retrieve one if it's already in use.
+     *
+     * @param constructor Source constructor.
+     * @param constructorArguments Arguments to create a new instance, used to find out if an instance already exists.
+     * @returns Source.
+     */
+    static getOrCreateSource<T extends CoreItemsManagerSource>(
+        constructor: SourceConstructor<T>,
+        constructorArguments: ConstructorParameters<SourceConstructor<T>>,
+    ): T  {
+        const id = constructor.getSourceId(...constructorArguments);
+        const constructorInstances = this.getConstructorInstances(constructor);
+
+        return constructorInstances[id]?.instance as T
+            ?? this.createInstance(id, constructor, constructorArguments);
+    }
+
+    /**
+     * Track an object referencing a source.
+     *
+     * @param source Source.
+     * @param reference Object referncing this source.
+     */
+    static addReference(source: CoreItemsManagerSource, reference: unknown): void {
+        const constructorInstances = this.getConstructorInstances(source.constructor as SourceConstructor);
+        const instanceId = this.instanceIds.get(source);
+
+        if (!instanceId) {
+            return;
+        }
+
+        if (!(instanceId in constructorInstances)) {
+            constructorInstances[instanceId] = {
+                instance: source,
+                references: [],
+            };
+        }
+
+        constructorInstances[instanceId].references.push(reference);
+    }
+
+    /**
+     * Remove a reference to an existing source, freeing it from memory if it's not referenced elsewhere.
+     *
+     * @param source Source.
+     * @param reference Object that was referncing this source.
+     */
+    static removeReference(source: CoreItemsManagerSource, reference: unknown): void {
+        const constructorInstances = this.instances.get(source.constructor as SourceConstructor);
+        const instanceId = this.instanceIds.get(source);
+        const index = constructorInstances?.[instanceId ?? '']?.references.indexOf(reference) ?? -1;
+
+        if (!constructorInstances || !instanceId || index === -1) {
+            return;
+        }
+
+        constructorInstances[instanceId].references.splice(index, 1);
+
+        if (constructorInstances[instanceId].references.length === 0) {
+            delete constructorInstances[instanceId];
+        }
+    }
+
+    /**
+     * Get instances for a given constructor.
+     *
+     * @param constructor Source constructor.
+     * @returns Constructor instances.
+     */
+    private static getConstructorInstances(constructor: SourceConstructor): Instances {
+        return this.instances.get(constructor)
+            ?? this.initialiseConstructorInstances(constructor);
+    }
+
+    /**
+     * Initialise instances for a given constructor.
+     *
+     * @param constructor Source constructor.
+     * @returns Constructor instances.
+     */
+    private static initialiseConstructorInstances(constructor: SourceConstructor): Instances {
+        const constructorInstances = {};
+
+        this.instances.set(constructor, constructorInstances);
+
+        return constructorInstances;
+    }
+
+    /**
+     * Create a new source instance.
+     *
+     * @param id Source id.
+     * @param constructor Source constructor.
+     * @param constructorArguments Source constructor arguments.
+     * @returns Source instance.
+     */
+    private static createInstance<T extends CoreItemsManagerSource>(
+        id: string,
+        constructor: SourceConstructor<T>,
+        constructorArguments: ConstructorParameters<SourceConstructor<T>>,
+    ): T {
+        const instance = new constructor(...constructorArguments);
+
+        this.instanceIds.set(instance, id);
+
+        return instance;
+    }
+
+}
diff --git a/src/core/classes/items-management/items-manager.ts b/src/core/classes/items-management/items-manager.ts
new file mode 100644
index 000000000..8ec06d964
--- /dev/null
+++ b/src/core/classes/items-management/items-manager.ts
@@ -0,0 +1,192 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { ActivatedRoute, ActivatedRouteSnapshot, Params } from '@angular/router';
+import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
+
+import { CoreItemsManagerSource } from './items-manager-source';
+import { CoreItemsManagerSourcesTracker } from './items-manager-sources-tracker';
+
+/**
+ * Helper to manage a collection of items in a page.
+ */
+export abstract class CoreItemsManager<Item = unknown> {
+
+    protected source?: { instance: CoreItemsManagerSource<Item>; unsubscribe: () => void };
+    protected itemsMap: Record<string, Item> | null = null;
+    protected selectedItem: Item | null = null;
+
+    constructor(source: CoreItemsManagerSource<Item>) {
+        this.setSource(source);
+    }
+
+    /**
+     * Get source.
+     *
+     * @returns Source.
+     */
+    getSource(): CoreItemsManagerSource<Item> {
+        if (!this.source) {
+            throw new Error('Source is missing from items manager');
+        }
+
+        return this.source.instance;
+    }
+
+    /**
+     * Set source.
+     *
+     * @param newSource New source.
+     */
+    setSource(newSource: CoreItemsManagerSource<Item> | null): void {
+        if (this.source) {
+            CoreItemsManagerSourcesTracker.removeReference(this.source.instance, this);
+
+            this.source.unsubscribe();
+            delete this.source;
+
+            this.onSourceReset();
+        }
+
+        if (newSource) {
+            CoreItemsManagerSourcesTracker.addReference(newSource, this);
+
+            this.source = {
+                instance: newSource,
+                unsubscribe: newSource.addListener({
+                    onItemsUpdated: items => this.onSourceItemsUpdated(items),
+                    onReset: () => this.onSourceReset(),
+                }),
+            };
+
+            const items = newSource.getItems();
+
+            if (items) {
+                this.onSourceItemsUpdated(items);
+            }
+        }
+    }
+
+    /**
+     * Process page destroyed operations.
+     */
+    destroy(): void {
+        this.setSource(null);
+    }
+
+    /**
+     * Get page route.
+     *
+     * @returns Current page route, if any.
+     */
+    protected abstract getCurrentPageRoute(): ActivatedRoute | null;
+
+    /**
+     * Get the path to use when navigating to an item page.
+     *
+     * @param item Item.
+     * @return Path to use when navigating to the item page.
+     */
+    protected abstract getItemPath(item: Item): string;
+
+    /**
+     * Get the path of the selected item given the current route.
+     *
+     * @param route Page route.
+     * @return Path of the selected item in the given route.
+     */
+    protected abstract getSelectedItemPath(route?: ActivatedRouteSnapshot | null): string | null;
+
+    /**
+     * Get the query parameters to use when navigating to an item page.
+     *
+     * @param item Item.
+     * @return Query parameters to use when navigating to the item page.
+     */
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    protected getItemQueryParams(item: Item): Params {
+        return {};
+    }
+
+    /**
+     * Update the selected item given the current route.
+     *
+     * @param route Current route.
+     */
+    protected updateSelectedItem(route: ActivatedRouteSnapshot | null = null): void {
+        route = route ?? this.getCurrentPageRoute()?.snapshot ?? null;
+
+        const selectedItemPath = this.getSelectedItemPath(route);
+
+        this.selectedItem = selectedItemPath
+            ? this.itemsMap?.[selectedItemPath] ?? null
+            : null;
+    }
+
+    /**
+     * Navigate to an item in the collection.
+     *
+     * @param item Item.
+     * @param options Navigation options.
+     */
+    protected async navigateToItem(
+        item: Item,
+        options: Pick<CoreNavigationOptions, 'reset' | 'replace' | 'animationDirection'> = {},
+    ): Promise<void> {
+        // Get current route in the page.
+        const route = this.getCurrentPageRoute();
+
+        if (route === null) {
+            return;
+        }
+
+        // If this item is already selected, do nothing.
+        const itemPath = this.getItemPath(item);
+        const selectedItemPath = this.getSelectedItemPath(route.snapshot);
+
+        if (selectedItemPath === itemPath) {
+            return;
+        }
+
+        // Navigate to item.
+        const params = this.getItemQueryParams(item);
+        const pathPrefix = selectedItemPath ? selectedItemPath.split('/').fill('../').join('') : '';
+
+        await CoreNavigator.navigate(pathPrefix + itemPath, { params, ...options });
+    }
+
+    /**
+     * Called when source items have been updated.
+     *
+     * @param items New items.
+     */
+    protected onSourceItemsUpdated(items: Item[]): void {
+        this.itemsMap = items.reduce((map, item) => {
+            map[this.getItemPath(item)] = item;
+
+            return map;
+        }, {});
+
+        this.updateSelectedItem();
+    }
+
+    /**
+     * Called when source has been updated.
+     */
+    protected onSourceReset(): void {
+        this.itemsMap = null;
+        this.selectedItem = null;
+    }
+
+}
diff --git a/src/core/classes/items-management/list-items-manager.ts b/src/core/classes/items-management/list-items-manager.ts
new file mode 100644
index 000000000..ff1b87ec8
--- /dev/null
+++ b/src/core/classes/items-management/list-items-manager.ts
@@ -0,0 +1,237 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { ActivatedRoute, ActivatedRouteSnapshot, UrlSegment } from '@angular/router';
+import { Subscription } from 'rxjs';
+
+import { CoreSplitViewComponent } from '@components/split-view/split-view';
+import { CoreNavigator } from '@services/navigator';
+import { CoreScreen } from '@services/screen';
+import { CoreUtils } from '@services/utils/utils';
+
+import { CoreItemsManager } from './items-manager';
+import { CoreItemsManagerSource } from './items-manager-source';
+
+/**
+ * Helper class to manage the state and routing of a list of items in a page.
+ */
+export abstract class CoreListItemsManager<Item = unknown> extends CoreItemsManager<Item> {
+
+    protected pageRouteLocator?: unknown | ActivatedRoute;
+    protected splitView?: CoreSplitViewComponent;
+    protected splitViewOutletSubscription?: Subscription;
+
+    constructor(source: CoreItemsManagerSource<Item>, pageRouteLocator: unknown | ActivatedRoute) {
+        super(source);
+
+        this.pageRouteLocator = pageRouteLocator;
+    }
+
+    get items(): Item[] {
+        return this.getSource().getItems() || [];
+    }
+
+    get loaded(): boolean {
+        return this.itemsMap !== null;
+    }
+
+    get completed(): boolean {
+        return this.getSource().isCompleted();
+    }
+
+    get empty(): boolean {
+        const items = this.getSource().getItems();
+
+        return items === null || items.length === 0;
+    }
+
+    /**
+     * Process page started operations.
+     *
+     * @param splitView Split view component.
+     */
+    async start(splitView: CoreSplitViewComponent): Promise<void> {
+        this.watchSplitViewOutlet(splitView);
+
+        // Calculate current selected item.
+        this.updateSelectedItem();
+
+        // Select default item if none is selected on a non-mobile layout.
+        if (!CoreScreen.isMobile && this.selectedItem === null && !splitView.isNested) {
+            const defaultItem = this.getDefaultItem();
+
+            if (defaultItem) {
+                this.select(defaultItem);
+            }
+        }
+
+        // Log activity.
+        await CoreUtils.ignoreErrors(this.logActivity());
+    }
+
+    /**
+     * Process page destroyed operations.
+     */
+    destroy(): void {
+        super.destroy();
+        this.splitViewOutletSubscription?.unsubscribe();
+    }
+
+    /**
+     * Watch a split view outlet to keep track of the selected item.
+     *
+     * @param splitView Split view component.
+     */
+    watchSplitViewOutlet(splitView: CoreSplitViewComponent): void {
+        this.splitView = splitView;
+        this.splitViewOutletSubscription = splitView.outletRouteObservable.subscribe(
+            route => this.updateSelectedItem(this.getPageRouteFromSplitViewOutlet(route)),
+        );
+
+        this.updateSelectedItem(this.getPageRouteFromSplitViewOutlet(splitView.outletRoute) ?? null);
+    }
+
+    /**
+     * Check whether the given item is selected or not.
+     *
+     * @param item Item.
+     * @return Whether the given item is selected.
+     */
+    isSelected(item: Item): boolean {
+        return this.selectedItem === item;
+    }
+
+    /**
+     * Return the current aria value.
+     *
+     * @param item Item.
+     * @return Will return the current value of the item if selected, false otherwise.
+     */
+    getItemAriaCurrent(item: Item): string {
+        return this.isSelected(item) ? 'page' : 'false';
+    }
+
+    /**
+     * Select an item.
+     *
+     * @param item Item.
+     */
+    async select(item: Item): Promise<void> {
+        await this.navigateToItem(item, { reset: this.resetNavigation() });
+    }
+
+    /**
+     * Reset the list of items.
+     */
+    reset(): void {
+        this.getSource().reset();
+    }
+
+    /**
+     * Reload the list of items.
+     */
+    async reload(): Promise<void> {
+        await this.getSource().reload();
+    }
+
+    /**
+     * Load items for the next page, if any.
+     */
+    async loadNextPage(): Promise<void> {
+        await this.getSource().loadNextPage();
+    }
+
+    /**
+     * Log activity when the page starts.
+     */
+    protected async logActivity(): Promise<void> {
+        // Override to log activity.
+    }
+
+    /**
+     * Check whether to reset navigation when selecting an item.
+     *
+     * @returns boolean Whether navigation should be reset.
+     */
+    protected resetNavigation(): boolean {
+        if (!CoreScreen.isTablet) {
+            return false;
+        }
+
+        return !!this.splitView && !this.splitView?.isNested;
+    }
+
+    /**
+     * Get the item that should be selected by default.
+     */
+    protected getDefaultItem(): Item | null {
+        return this.items[0] || null;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected getCurrentPageRoute(): ActivatedRoute | null {
+        if (this.pageRouteLocator instanceof ActivatedRoute) {
+            return CoreNavigator.isRouteActive(this.pageRouteLocator) ? this.pageRouteLocator : null;
+        }
+
+        return CoreNavigator.getCurrentRoute({ pageComponent: this.pageRouteLocator });
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected getSelectedItemPath(route?: ActivatedRouteSnapshot | null): string | null {
+        const segments: UrlSegment[] = [];
+
+        while ((route = route?.firstChild)) {
+            segments.push(...route.url);
+        }
+
+        return segments.map(segment => segment.path).join('/').replace(/\/+/, '/').trim() || null;
+    }
+
+    /**
+     * Get the page route given a child route on the splitview outlet.
+     *
+     * @param route Child route.
+     * @return Page route.
+     */
+    private getPageRouteFromSplitViewOutlet(route: ActivatedRouteSnapshot | null): ActivatedRouteSnapshot | null {
+        const isPageRoute = this.buildRouteMatcher();
+
+        while (route && !isPageRoute(route)) {
+            route = route.parent;
+        }
+
+        return route;
+    }
+
+    /**
+     * Build a function to check whether the given snapshot belongs to the page.
+     *
+     * @returns Route matcher.
+     */
+    private buildRouteMatcher(): (route: ActivatedRouteSnapshot) => boolean {
+        if (this.pageRouteLocator instanceof ActivatedRoute) {
+            const pageRoutePath = CoreNavigator.getRouteFullPath(this.pageRouteLocator.snapshot);
+
+            return route => CoreNavigator.getRouteFullPath(route) === pageRoutePath;
+        }
+
+        return route => route.component === this.pageRouteLocator;
+    }
+
+}
diff --git a/src/core/classes/items-management/swipe-items-manager.ts b/src/core/classes/items-management/swipe-items-manager.ts
new file mode 100644
index 000000000..18cb6b40c
--- /dev/null
+++ b/src/core/classes/items-management/swipe-items-manager.ts
@@ -0,0 +1,97 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { ActivatedRoute } from '@angular/router';
+
+import { CoreNavigator } from '@services/navigator';
+
+import { CoreItemsManager } from './items-manager';
+
+/**
+ * Helper class to manage the state and routing of a swipeable page.
+ */
+export abstract class CoreSwipeItemsManager<Item = unknown> extends CoreItemsManager<Item> {
+
+    /**
+     * Process page started operations.
+     */
+    async start(): Promise<void> {
+        this.updateSelectedItem();
+    }
+
+    /**
+     * Navigate to the next item.
+     */
+    async navigateToNextItem(): Promise<void> {
+        await this.navigateToItemBy(-1, 'back');
+    }
+
+    /**
+     * Navigate to the previous item.
+     */
+    async navigateToPreviousItem(): Promise<void> {
+        await this.navigateToItemBy(1, 'forward');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected getCurrentPageRoute(): ActivatedRoute | null {
+        return CoreNavigator.getCurrentRoute();
+    }
+
+    /**
+     * Navigate to an item by an offset.
+     *
+     * @param delta Index offset.
+     * @param animationDirection Animation direction.
+     */
+    protected async navigateToItemBy(delta: number, animationDirection: 'forward' | 'back'): Promise<void> {
+        const item = await this.getItemBy(delta);
+
+        if (!item) {
+            return;
+        }
+
+        await this.navigateToItem(item, { animationDirection, replace: true });
+    }
+
+    /**
+     * Get item by an offset.
+     *
+     * @param delta Index offset.
+     */
+    protected async getItemBy(delta: number): Promise<Item | null> {
+        const items = this.getSource().getItems();
+
+        // Get current item.
+        const index = (this.selectedItem && items?.indexOf(this.selectedItem)) ?? -1;
+
+        if (index === -1) {
+            return null;
+        }
+
+        // Get item by delta.
+        const item = items?.[index + delta] ?? null;
+
+        if (!item && !this.getSource().isCompleted()) {
+            await this.getSource().loadNextPage();
+
+            return this.getItemBy(delta);
+        }
+
+        return item;
+    }
+
+}
diff --git a/src/core/classes/page-items-list-manager.ts b/src/core/classes/page-items-list-manager.ts
index 27705ffef..920e7db66 100644
--- a/src/core/classes/page-items-list-manager.ts
+++ b/src/core/classes/page-items-list-manager.ts
@@ -22,6 +22,8 @@ import { CoreUtils } from '@services/utils/utils';
 
 /**
  * Helper class to manage the state and routing of a list of items in a page, for example on pages using a split view.
+ *
+ * @deprecated use CoreListItemsManager instead.
  */
 export abstract class CorePageItemsListManager<Item> {
 
diff --git a/src/core/components/components.module.ts b/src/core/components/components.module.ts
index b055bad15..d39a0e057 100644
--- a/src/core/components/components.module.ts
+++ b/src/core/components/components.module.ts
@@ -50,6 +50,7 @@ import { CoreShowPasswordComponent } from './show-password/show-password';
 import { CoreSitePickerComponent } from './site-picker/site-picker';
 import { CoreSplitViewComponent } from './split-view/split-view';
 import { CoreStyleComponent } from './style/style';
+import { CoreSwipeNavigationComponent } from './swipe-navigation/swipe-navigation';
 import { CoreTabComponent } from './tabs/tab';
 import { CoreTabsComponent } from './tabs/tabs';
 import { CoreTabsOutletComponent } from './tabs-outlet/tabs-outlet';
@@ -92,6 +93,7 @@ import { CoreButtonWithSpinnerComponent } from './button-with-spinner/button-wit
         CoreSitePickerComponent,
         CoreSplitViewComponent,
         CoreStyleComponent,
+        CoreSwipeNavigationComponent,
         CoreTabComponent,
         CoreTabsComponent,
         CoreTabsOutletComponent,
@@ -140,6 +142,7 @@ import { CoreButtonWithSpinnerComponent } from './button-with-spinner/button-wit
         CoreSitePickerComponent,
         CoreSplitViewComponent,
         CoreStyleComponent,
+        CoreSwipeNavigationComponent,
         CoreTabComponent,
         CoreTabsComponent,
         CoreTabsOutletComponent,
diff --git a/src/core/components/swipe-navigation/swipe-navigation.html b/src/core/components/swipe-navigation/swipe-navigation.html
new file mode 100644
index 000000000..1519bb5e4
--- /dev/null
+++ b/src/core/components/swipe-navigation/swipe-navigation.html
@@ -0,0 +1,5 @@
+<ion-slides [options]="{ allowTouchMove: !!manager }" (swipeleft)="swipeLeft()" (swiperight)="swipeRight()">
+    <ion-slide>
+        <ng-content></ng-content>
+    </ion-slide>
+</ion-slides>
diff --git a/src/core/components/swipe-navigation/swipe-navigation.scss b/src/core/components/swipe-navigation/swipe-navigation.scss
new file mode 100644
index 000000000..4baf55d1c
--- /dev/null
+++ b/src/core/components/swipe-navigation/swipe-navigation.scss
@@ -0,0 +1,7 @@
+ion-slides {
+    min-height: 100%;
+}
+
+ion-slide {
+    align-items: start;
+}
diff --git a/src/core/components/swipe-navigation/swipe-navigation.ts b/src/core/components/swipe-navigation/swipe-navigation.ts
new file mode 100644
index 000000000..a87c10b7f
--- /dev/null
+++ b/src/core/components/swipe-navigation/swipe-navigation.ts
@@ -0,0 +1,41 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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, Input } from '@angular/core';
+import { CoreSwipeItemsManager } from '@classes/items-management/swipe-items-manager';
+
+@Component({
+    selector: 'core-swipe-navigation',
+    templateUrl: 'swipe-navigation.html',
+    styleUrls: ['swipe-navigation.scss'],
+})
+export class CoreSwipeNavigationComponent {
+
+    @Input() manager?: CoreSwipeItemsManager;
+
+    /**
+     * Swipe to previous item.
+     */
+    swipeLeft(): void {
+        this.manager?.navigateToPreviousItem();
+    }
+
+    /**
+     * Swipe to next item.
+     */
+    swipeRight(): void {
+        this.manager?.navigateToNextItem();
+    }
+
+}
diff --git a/src/core/core.module.ts b/src/core/core.module.ts
index 56d5a0ee8..d5c75b618 100644
--- a/src/core/core.module.ts
+++ b/src/core/core.module.ts
@@ -14,9 +14,11 @@
 
 import { HTTP_INTERCEPTORS } from '@angular/common/http';
 import { ApplicationInitStatus, Injector, NgModule, Type } from '@angular/core';
+import { HammerModule, HAMMER_GESTURE_CONFIG } from '@angular/platform-browser';
 
 import { CoreApplicationInitStatus } from './classes/application-init-status';
 import { CoreFeaturesModule } from './features/features.module';
+import { CoreHammerGestureConfig } from './classes/hammer-gesture-config';
 import { CoreInterceptor } from './classes/interceptor';
 import { getDatabaseProviders } from './services/database';
 import { getInitializerProviders } from './initializers';
@@ -84,9 +86,11 @@ export const CORE_SERVICES: Type<unknown>[] = [
 @NgModule({
     imports: [
         CoreFeaturesModule,
+        HammerModule,
     ],
     providers: [
         { provide: HTTP_INTERCEPTORS, useClass: CoreInterceptor, multi: true },
+        { provide: HAMMER_GESTURE_CONFIG, useClass: CoreHammerGestureConfig },
         { provide: ApplicationInitStatus, useClass: CoreApplicationInitStatus, deps: [Injector] },
         ...getDatabaseProviders(),
         ...getInitializerProviders(),
diff --git a/src/core/features/user/classes/participants-source.ts b/src/core/features/user/classes/participants-source.ts
new file mode 100644
index 000000000..594ff4817
--- /dev/null
+++ b/src/core/features/user/classes/participants-source.ts
@@ -0,0 +1,81 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreItemsManagerSource } from '@classes/items-management/items-manager-source';
+
+import { CoreUser, CoreUserData, CoreUserParticipant, CoreUserProvider } from '../services/user';
+
+/**
+ * Provides a collection of course participants.
+ */
+export class CoreUserParticipantsSource extends CoreItemsManagerSource<CoreUserParticipant | CoreUserData> {
+
+    /**
+     * @inheritdoc
+     */
+    static getSourceId(courseId: number, searchQuery: string | null = null): string {
+        searchQuery = searchQuery ?? '__empty__';
+
+        return `participants-${courseId}-${searchQuery}`;
+    }
+
+    readonly COURSE_ID: number;
+    readonly SEARCH_QUERY: string | null;
+
+    constructor(courseId: number, searchQuery: string | null = null) {
+        super();
+
+        this.COURSE_ID = courseId;
+        this.SEARCH_QUERY = searchQuery;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected async loadPageItems(page: number): Promise<{ items: (CoreUserParticipant | CoreUserData)[]; hasMoreItems: boolean }> {
+        if (this.SEARCH_QUERY) {
+            const { participants, canLoadMore } = await CoreUser.searchParticipants(
+                this.COURSE_ID,
+                this.SEARCH_QUERY,
+                true,
+                page,
+                CoreUserProvider.PARTICIPANTS_LIST_LIMIT,
+            );
+
+            return {
+                items: participants,
+                hasMoreItems: canLoadMore,
+            };
+        }
+
+        const { participants, canLoadMore } = await CoreUser.getParticipants(
+            this.COURSE_ID,
+            page * CoreUserProvider.PARTICIPANTS_LIST_LIMIT,
+            CoreUserProvider.PARTICIPANTS_LIST_LIMIT,
+        );
+
+        return {
+            items: participants,
+            hasMoreItems: canLoadMore,
+        };
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected getPageLength(): number {
+        return CoreUserProvider.PARTICIPANTS_LIST_LIMIT;
+    }
+
+}
diff --git a/src/core/features/user/pages/participants/participants.page.ts b/src/core/features/user/pages/participants/participants.page.ts
index 82a9f22f0..61d2c80ed 100644
--- a/src/core/features/user/pages/participants/participants.page.ts
+++ b/src/core/features/user/pages/participants/participants.page.ts
@@ -13,15 +13,18 @@
 // limitations under the License.
 
 import { AfterViewInit, Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { Params } from '@angular/router';
 import { IonRefresher } from '@ionic/angular';
 
 import { CoreApp } from '@services/app';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreNavigator } from '@services/navigator';
-import { CorePageItemsListManager } from '@classes/page-items-list-manager';
+import { CoreListItemsManager } from '@classes/items-management/list-items-manager';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
-import { CoreUser, CoreUserProvider, CoreUserParticipant, CoreUserData } from '@features/user/services/user';
+import { CoreUser, CoreUserParticipant, CoreUserData } from '@features/user/services/user';
 import { CoreUtils } from '@services/utils/utils';
+import { CoreUserParticipantsSource } from '@features/user/classes/participants-source';
+import { CoreItemsManagerSourcesTracker } from '@classes/items-management/items-manager-sources-tracker';
 
 /**
  * Page that displays the list of course participants.
@@ -32,6 +35,7 @@ import { CoreUtils } from '@services/utils/utils';
 })
 export class CoreUserParticipantsPage implements OnInit, AfterViewInit, OnDestroy {
 
+    courseId!: number;
     participants!: CoreUserParticipantsManager;
     searchQuery: string | null = null;
     searchInProgress = false;
@@ -42,10 +46,12 @@ export class CoreUserParticipantsPage implements OnInit, AfterViewInit, OnDestro
     @ViewChild(CoreSplitViewComponent) splitView!: CoreSplitViewComponent;
 
     constructor() {
-        let courseId: number;
-
         try {
-            courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            this.participants = new CoreUserParticipantsManager(
+                CoreItemsManagerSourcesTracker.getOrCreateSource(CoreUserParticipantsSource, [this.courseId]),
+                this,
+            );
         } catch (error) {
             CoreDomUtils.showErrorModal(error);
 
@@ -54,7 +60,6 @@ export class CoreUserParticipantsPage implements OnInit, AfterViewInit, OnDestro
             return;
         }
 
-        this.participants = new CoreUserParticipantsManager(CoreUserParticipantsPage, courseId);
     }
 
     /**
@@ -103,9 +108,11 @@ export class CoreUserParticipantsPage implements OnInit, AfterViewInit, OnDestro
             return;
         }
 
+        const newSource = CoreItemsManagerSourcesTracker.getOrCreateSource(CoreUserParticipantsSource, [this.courseId]);
+
         this.searchQuery = null;
         this.searchInProgress = false;
-        this.participants.resetItems();
+        this.participants.setSource(newSource);
 
         await this.fetchInitialParticipants();
     }
@@ -118,9 +125,11 @@ export class CoreUserParticipantsPage implements OnInit, AfterViewInit, OnDestro
     async search(query: string): Promise<void> {
         CoreApp.closeKeyboard();
 
+        const newSource = CoreItemsManagerSourcesTracker.getOrCreateSource(CoreUserParticipantsSource, [this.courseId, query]);
+
         this.searchInProgress = true;
         this.searchQuery = query;
-        this.participants.resetItems();
+        this.participants.setSource(newSource);
 
         await this.fetchInitialParticipants();
 
@@ -133,8 +142,8 @@ export class CoreUserParticipantsPage implements OnInit, AfterViewInit, OnDestro
      * @param refresher Refresher.
      */
     async refreshParticipants(refresher: IonRefresher): Promise<void> {
-        await CoreUtils.ignoreErrors(CoreUser.invalidateParticipantsList(this.participants.courseId));
-        await CoreUtils.ignoreErrors(this.fetchParticipants());
+        await CoreUtils.ignoreErrors(CoreUser.invalidateParticipantsList(this.courseId));
+        await CoreUtils.ignoreErrors(this.fetchParticipants(true));
 
         refresher?.complete();
     }
@@ -146,7 +155,7 @@ export class CoreUserParticipantsPage implements OnInit, AfterViewInit, OnDestro
      */
     async fetchMoreParticipants(complete: () => void): Promise<void> {
         try {
-            await this.fetchParticipants(this.participants.items);
+            await this.fetchParticipants(false);
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'Error loading more participants');
 
@@ -161,38 +170,23 @@ export class CoreUserParticipantsPage implements OnInit, AfterViewInit, OnDestro
      */
     private async fetchInitialParticipants(): Promise<void> {
         try {
-            await this.fetchParticipants();
+            await this.fetchParticipants(true);
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'Error loading participants');
 
-            this.participants.setItems([]);
+            this.participants.reset();
         }
     }
 
     /**
      * Update the list of participants.
      *
-     * @param loadedParticipants Participants list to continue loading from.
+     * @param reload Whether to reload the list or load the next page.
      */
-    private async fetchParticipants(loadedParticipants: CoreUserParticipant[] | CoreUserData[] = []): Promise<void> {
-        if (this.searchQuery) {
-            const { participants, canLoadMore } = await CoreUser.searchParticipants(
-                this.participants.courseId,
-                this.searchQuery,
-                true,
-                Math.ceil(loadedParticipants.length / CoreUserProvider.PARTICIPANTS_LIST_LIMIT),
-                CoreUserProvider.PARTICIPANTS_LIST_LIMIT,
-            );
-
-            this.participants.setItems((loadedParticipants as CoreUserData[]).concat(participants), canLoadMore);
-        } else {
-            const { participants, canLoadMore } = await CoreUser.getParticipants(
-                this.participants.courseId,
-                loadedParticipants.length,
-            );
-
-            this.participants.setItems((loadedParticipants as CoreUserParticipant[]).concat(participants), canLoadMore);
-        }
+    private async fetchParticipants(reload: boolean): Promise<void> {
+        reload
+            ? await this.participants.reload()
+            : await this.participants.loadNextPage();
 
         this.fetchMoreParticipantsFailed = false;
     }
@@ -202,14 +196,14 @@ export class CoreUserParticipantsPage implements OnInit, AfterViewInit, OnDestro
 /**
  * Helper to manage the list of participants.
  */
-class CoreUserParticipantsManager extends CorePageItemsListManager<CoreUserParticipant | CoreUserData> {
+class CoreUserParticipantsManager extends CoreListItemsManager<CoreUserParticipant | CoreUserData> {
 
-    courseId: number;
+    page: CoreUserParticipantsPage;
 
-    constructor(pageComponent: unknown, courseId: number) {
-        super(pageComponent);
+    constructor(source: CoreUserParticipantsSource, page: CoreUserParticipantsPage) {
+        super(source, CoreUserParticipantsPage);
 
-        this.courseId = courseId;
+        this.page = page;
     }
 
     /**
@@ -219,11 +213,18 @@ class CoreUserParticipantsManager extends CorePageItemsListManager<CoreUserParti
         return participant.id.toString();
     }
 
+    /**
+     * @inheritdoc
+     */
+    protected getItemQueryParams(): Params {
+        return { search: this.page.searchQuery };
+    }
+
     /**
      * @inheritdoc
      */
     protected async logActivity(): Promise<void> {
-        await CoreUser.logParticipantsView(this.courseId);
+        await CoreUser.logParticipantsView(this.page.courseId);
     }
 
 }
diff --git a/src/core/features/user/pages/profile/profile.html b/src/core/features/user/pages/profile/profile.html
index ce58f5ae1..d4f77cb01 100644
--- a/src/core/features/user/pages/profile/profile.html
+++ b/src/core/features/user/pages/profile/profile.html
@@ -7,90 +7,87 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-refresher slot="fixed" [disabled]="!userLoaded" (ionRefresh)="refreshUser($event.target)">
-        <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
-    </ion-refresher>
-    <core-loading [hideUntil]="userLoaded">
-        <ion-list *ngIf="user && !isDeleted && isEnrolled">
-            <ion-item class="ion-text-center core-user-profile-maininfo">
-                <core-user-avatar [user]="user" [userId]="user.id" [linkProfile]="false" [checkOnline]="true">
-                </core-user-avatar>
-                <ion-label>
-                    <h2>{{ user.fullname }}</h2>
-                    <p *ngIf="user.address">
-                        <ion-icon name="fas-map-marker-alt" [attr.aria-hidden]="true"></ion-icon> {{ user.address }}
-                    </p>
-                    <p *ngIf="rolesFormatted" class="ion-text-wrap">
-                        <strong>{{ 'core.user.roles' | translate}}</strong>{{'core.labelsep' | translate}}
-                        {{ rolesFormatted }}
-                    </p>
-                </ion-label>
-            </ion-item>
-
-            <div class="core-user-communication-handlers"
-                *ngIf="(communicationHandlers && communicationHandlers.length) || isLoadingHandlers">
-                <ion-item *ngIf="communicationHandlers && communicationHandlers.length">
+    <core-swipe-navigation [manager]="users">
+        <ion-refresher slot="fixed" [disabled]="!userLoaded" (ionRefresh)="refreshUser($event.target)">
+            <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
+        </ion-refresher>
+        <core-loading [hideUntil]="userLoaded">
+            <ion-list *ngIf="user && !isDeleted && isEnrolled">
+                <ion-item class="ion-text-center core-user-profile-maininfo">
+                    <core-user-avatar [user]="user" [userId]="user.id" [linkProfile]="false" [checkOnline]="true">
+                    </core-user-avatar>
                     <ion-label>
-                        <ion-button *ngFor="let handler of communicationHandlers" expand="block" size="default"
+                        <h2>{{ user.fullname }}</h2>
+                        <p *ngIf="user.address">
+                            <ion-icon name="fas-map-marker-alt" [attr.aria-hidden]="true"></ion-icon> {{ user.address }}
+                        </p>
+                        <p *ngIf="rolesFormatted" class="ion-text-wrap">
+                            <strong>{{ 'core.user.roles' | translate}}</strong>{{'core.labelsep' | translate}}
+                            {{ rolesFormatted }}
+                        </p>
+                    </ion-label>
+                </ion-item>
+
+                <div class="core-user-communication-handlers"
+                    *ngIf="(communicationHandlers && communicationHandlers.length) || isLoadingHandlers">
+                    <ion-item *ngIf="communicationHandlers && communicationHandlers.length">
+                        <ion-label>
+                            <ion-button *ngFor="let handler of communicationHandlers" expand="block" size="default"
+                                [ngClass]="['core-user-profile-handler', handler.class || '']" (click)="handlerClicked($event, handler)"
+                                [hidden]="handler.hidden" [attr.aria-label]="handler.title | translate" [disabled]="handler.spinner">
+                                <ion-icon *ngIf="handler.icon" [name]="handler.icon" slot="start" aria-hidden="true"></ion-icon>
+                                {{ handler.title | translate }}
+                            </ion-button>
+                        </ion-label>
+                    </ion-item>
+                    <div *ngIf="isLoadingHandlers" class="ion-text-center core-loading-handlers">
+                        <ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner>
+                    </div>
+                </div>
+                <ion-item button class="ion-text-wrap core-user-profile-handler" (click)="openUserDetails()"
+                    [attr.aria-label]="'core.user.details' | translate" detail="true">
+                    <ion-icon name="fas-user" slot="start" aria-hidden="true"></ion-icon>
+                    <ion-label>
+                        <p class="item-heading">{{ 'core.user.details' | translate }}</p>
+                    </ion-label>
+                </ion-item>
+                <ion-item class="ion-text-center core-loading-handlers" *ngIf="isLoadingHandlers">
+                    <ion-label>
+                        <ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner>
+                    </ion-label>
+                </ion-item>
+                <ion-item button *ngFor="let handler of newPageHandlers" class="ion-text-wrap" (click)="handlerClicked($event, handler)"
+                    [ngClass]="['core-user-profile-handler', handler.class || '']" [hidden]="handler.hidden"
+                    [attr.aria-label]="handler.title | translate" detail="true">
+                    <ion-icon *ngIf="handler.icon" [name]="handler.icon" slot="start" aria-hidden="true"></ion-icon>
+                    <ion-label>
+                        <p class="item-heading">{{ handler.title | translate }}</p>
+                    </ion-label>
+                    <ion-badge slot="end" *ngIf="handler.showBadge" [hidden]="handler.loading || !handler.badge" aria-hidden="true">
+                        {{handler.badge}}
+                    </ion-badge>
+                    <span *ngIf="handler.showBadge && handler.badge && handler.badgeA11yText" class="sr-only">
+                        {{ handler.badgeA11yText | translate: {$a : handler.badge } }}
+                    </span>
+                    <ion-spinner slot="end" *ngIf="handler.showBadge && handler.loading" [attr.aria-label]="'core.loading' | translate">
+                    </ion-spinner>
+                </ion-item>
+                <ion-item *ngIf="actionHandlers && actionHandlers.length">
+                    <ion-label>
+                        <ion-button *ngFor="let handler of actionHandlers" expand="block" fill="outline" size="default"
                             [ngClass]="['core-user-profile-handler', handler.class || '']" (click)="handlerClicked($event, handler)"
                             [hidden]="handler.hidden" [attr.aria-label]="handler.title | translate" [disabled]="handler.spinner">
                             <ion-icon *ngIf="handler.icon" [name]="handler.icon" slot="start" aria-hidden="true"></ion-icon>
                             {{ handler.title | translate }}
+                            <ion-spinner *ngIf="handler.spinner" slot="end" [attr.aria-label]="'core.loading' | translate"></ion-spinner>
                         </ion-button>
                     </ion-label>
                 </ion-item>
-                <div *ngIf="isLoadingHandlers" class="ion-text-center core-loading-handlers">
-                    <ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner>
-                </div>
-            </div>
-
-
-            <ion-item button class="ion-text-wrap core-user-profile-handler" (click)="openUserDetails()"
-                [attr.aria-label]="'core.user.details' | translate" detail="true">
-                <ion-icon name="fas-user" slot="start" aria-hidden="true"></ion-icon>
-                <ion-label>
-                    <p class="item-heading">{{ 'core.user.details' | translate }}</p>
-                </ion-label>
-            </ion-item>
-            <ion-item class="ion-text-center core-loading-handlers" *ngIf="isLoadingHandlers">
-                <ion-label>
-                    <ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner>
-                </ion-label>
-            </ion-item>
-
-            <ion-item button *ngFor="let handler of newPageHandlers" class="ion-text-wrap" (click)="handlerClicked($event, handler)"
-                [ngClass]="['core-user-profile-handler', handler.class || '']" [hidden]="handler.hidden"
-                [attr.aria-label]="handler.title | translate" detail="true">
-                <ion-icon *ngIf="handler.icon" [name]="handler.icon" slot="start" aria-hidden="true"></ion-icon>
-                <ion-label>
-                    <p class="item-heading">{{ handler.title | translate }}</p>
-                </ion-label>
-                <ion-badge slot="end" *ngIf="handler.showBadge" [hidden]="handler.loading || !handler.badge" aria-hidden="true">
-                    {{handler.badge}}
-                </ion-badge>
-                <span *ngIf="handler.showBadge && handler.badge && handler.badgeA11yText" class="sr-only">
-                    {{ handler.badgeA11yText | translate: {$a : handler.badge } }}
-                </span>
-                <ion-spinner slot="end" *ngIf="handler.showBadge && handler.loading" [attr.aria-label]="'core.loading' | translate">
-                </ion-spinner>
-            </ion-item>
-
-            <ion-item *ngIf="actionHandlers && actionHandlers.length">
-                <ion-label>
-                    <ion-button *ngFor="let handler of actionHandlers" expand="block" fill="outline" size="default"
-                        [ngClass]="['core-user-profile-handler', handler.class || '']" (click)="handlerClicked($event, handler)"
-                        [hidden]="handler.hidden" [attr.aria-label]="handler.title | translate" [disabled]="handler.spinner">
-                        <ion-icon *ngIf="handler.icon" [name]="handler.icon" slot="start" aria-hidden="true"></ion-icon>
-                        {{ handler.title | translate }}
-                        <ion-spinner *ngIf="handler.spinner" slot="end" [attr.aria-label]="'core.loading' | translate"></ion-spinner>
-                    </ion-button>
-                </ion-label>
-            </ion-item>
-        </ion-list>
-
-        <core-empty-box *ngIf="!user && !isDeleted && isEnrolled" icon="far-user" [message]=" 'core.user.detailsnotavailable' | translate">
-        </core-empty-box>
-        <core-empty-box *ngIf="isDeleted" icon="far-user" [message]="'core.userdeleted' | translate"></core-empty-box>
-        <core-empty-box *ngIf="!isEnrolled" icon="far-user" [message]="'core.notenrolledprofile' | translate"></core-empty-box>
-    </core-loading>
+            </ion-list>
+            <core-empty-box *ngIf="!user && !isDeleted && isEnrolled" icon="far-user" [message]=" 'core.user.detailsnotavailable' | translate">
+            </core-empty-box>
+            <core-empty-box *ngIf="isDeleted" icon="far-user" [message]="'core.userdeleted' | translate"></core-empty-box>
+            <core-empty-box *ngIf="!isEnrolled" icon="far-user" [message]="'core.notenrolledprofile' | translate"></core-empty-box>
+        </core-loading>
+    </core-swipe-navigation>
 </ion-content>
diff --git a/src/core/features/user/pages/profile/profile.page.ts b/src/core/features/user/pages/profile/profile.page.ts
index d8ffe46e4..054ee18bc 100644
--- a/src/core/features/user/pages/profile/profile.page.ts
+++ b/src/core/features/user/pages/profile/profile.page.ts
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { ActivatedRoute, ActivatedRouteSnapshot, Params } from '@angular/router';
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { IonRefresher } from '@ionic/angular';
 import { Subscription } from 'rxjs';
@@ -20,16 +21,16 @@ import { CoreSite } from '@classes/site';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
-import {
-    CoreUser,
-    CoreUserProfile,
-    CoreUserProvider,
-} from '@features/user/services/user';
+import { CoreUser, CoreUserBasicData, CoreUserProfile, CoreUserProvider } from '@features/user/services/user';
 import { CoreUserHelper } from '@features/user/services/user-helper';
 import { CoreUserDelegate, CoreUserDelegateService, CoreUserProfileHandlerData } from '@features/user/services/user-delegate';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreNavigator } from '@services/navigator';
 import { CoreCourses } from '@features/courses/services/courses';
+import { CoreSwipeItemsManager } from '@classes/items-management/swipe-items-manager';
+import { CoreUserParticipantsSource } from '@features/user/classes/participants-source';
+import { CoreItemsManagerSourcesTracker } from '@classes/items-management/items-manager-sources-tracker';
+import { CoreItemsManagerSource } from '@classes/items-management/items-manager-source';
 
 @Component({
     selector: 'page-core-user-profile',
@@ -55,7 +56,10 @@ export class CoreUserProfilePage implements OnInit, OnDestroy {
     newPageHandlers: CoreUserProfileHandlerData[] = [];
     communicationHandlers: CoreUserProfileHandlerData[] = [];
 
-    constructor() {
+    users?: CoreUserSwipeItemsManager;
+    usersQueryParams: Params = {};
+
+    constructor(private route: ActivatedRoute) {
         this.obsProfileRefreshed = CoreEvents.on(CoreUserProvider.PROFILE_REFRESHED, (data) => {
             if (!this.user || !data.user) {
                 return;
@@ -86,6 +90,15 @@ export class CoreUserProfilePage implements OnInit, OnDestroy {
             this.courseId = undefined;
         }
 
+        if (this.courseId && this.route.snapshot.data.swipeManagerSource === 'participants') {
+            const search = CoreNavigator.getRouteParam('search');
+            const source = CoreItemsManagerSourcesTracker.getOrCreateSource(CoreUserParticipantsSource, [this.courseId, search]);
+            this.users = new CoreUserSwipeItemsManager(source, this);
+
+            this.usersQueryParams.search = search;
+            this.users.start();
+        }
+
         try {
             await this.fetchUser();
 
@@ -204,8 +217,49 @@ export class CoreUserProfilePage implements OnInit, OnDestroy {
      * @inheritdoc
      */
     ngOnDestroy(): void {
+        this.users?.destroy();
         this.subscription?.unsubscribe();
         this.obsProfileRefreshed.off();
     }
 
 }
+
+/**
+ * Helper to manage swiping within a collection of users.
+ */
+class CoreUserSwipeItemsManager extends CoreSwipeItemsManager<CoreUserBasicData> {
+
+    page: CoreUserProfilePage;
+
+    constructor(source: CoreItemsManagerSource<CoreUserBasicData>, page: CoreUserProfilePage) {
+        super(source);
+
+        this.page = page;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected getItemPath(item: CoreUserBasicData): string {
+        return String(item.id);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected getItemQueryParams(): Params {
+        return this.page.usersQueryParams;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected getSelectedItemPath(route?: ActivatedRouteSnapshot | null): string | null {
+        if (!route) {
+            return null;
+        }
+
+        return route.params.userId;
+    }
+
+}
diff --git a/src/core/features/user/pages/profile/profile.scss b/src/core/features/user/pages/profile/profile.scss
index 41723e265..eac82607b 100644
--- a/src/core/features/user/pages/profile/profile.scss
+++ b/src/core/features/user/pages/profile/profile.scss
@@ -19,6 +19,9 @@
                 right: calc(50% - 12px -  var(--core-avatar-size) / 2) !important;
             }
         }
+        core-loading .core-loading-content {
+            width: 100%;
+        }
     }
 
 }
diff --git a/src/core/features/user/user.module.ts b/src/core/features/user/user.module.ts
index ff8bb99ad..a8e2398a5 100644
--- a/src/core/features/user/user.module.ts
+++ b/src/core/features/user/user.module.ts
@@ -60,6 +60,9 @@ const routes: Routes = [
         {
             path: `${COURSE_PAGE_NAME}/${COURSE_INDEX_PATH}/${PARTICIPANTS_PAGE_NAME}/:userId`,
             loadChildren: () => import('@features/user/pages/profile/profile.module').then(m => m.CoreUserProfilePageModule),
+            data: {
+                swipeManagerSource: 'participants',
+            },
         },
     ], () => CoreScreen.isMobile),
 ];
diff --git a/src/core/services/navigator.ts b/src/core/services/navigator.ts
index 52455ad12..5cc058cb8 100644
--- a/src/core/services/navigator.ts
+++ b/src/core/services/navigator.ts
@@ -48,6 +48,7 @@ export type CoreRedirectPayload = {
 export type CoreNavigationOptions = Pick<NavigationOptions, 'animated'|'animation'|'animationDirection'> & {
     params?: Params;
     reset?: boolean;
+    replace?: boolean;
     preferCurrentTab?: boolean; // Default true.
     nextNavigation?: {
         path: string;
@@ -137,6 +138,7 @@ export class CoreNavigatorService {
             animationDirection: options.animationDirection,
             queryParams: CoreObject.isEmpty(options.params ?? {}) ? null : CoreObject.withoutEmpty(options.params),
             relativeTo: path.startsWith('/') ? null : this.getCurrentRoute(),
+            replaceUrl: options.replace,
         });
 
         // Remove objects from queryParams and replace them with an ID.

From 1906a62080297dc7d91702d3c043142c94f185cb Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 12 Nov 2021 12:52:45 +0100
Subject: [PATCH 0194/1008] MOBILE-3918 h5p: Fix undefined title for some
 packages

---
 src/core/features/h5p/classes/framework.ts | 19 +++++++++++++++++--
 src/core/features/h5p/classes/storage.ts   |  6 ++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/core/features/h5p/classes/framework.ts b/src/core/features/h5p/classes/framework.ts
index b54c08901..326d7dc05 100644
--- a/src/core/features/h5p/classes/framework.ts
+++ b/src/core/features/h5p/classes/framework.ts
@@ -483,6 +483,10 @@ export class CoreH5PFramework {
         if (!params.metadata) {
             params.metadata = {};
         }
+        // Add title to metadata.
+        if (typeof params.title === 'string' && !params.metadata.title) {
+            params.metadata.title = params.title;
+        }
         content.metadata = params.metadata;
         content.params = JSON.stringify(typeof params.params != 'undefined' && params.params != null ? params.params : params);
 
@@ -834,6 +838,14 @@ export class CoreH5PFramework {
             content.library.libraryId = mainLibrary.id;
         }
 
+        // Add title to 'params' to be able to add it to metadata later.
+        if (typeof content.title === 'string') {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            const params = CoreTextUtils.parseJSON<any>(content.params || '{}');
+            params.title = content.title;
+            content.params = JSON.stringify(params);
+        }
+
         const data: Partial<CoreH5PContentDBRecord> = {
             id: undefined,
             jsoncontent: content.params,
@@ -844,23 +856,26 @@ export class CoreH5PFramework {
             fileurl: fileUrl,
             timecreated: undefined,
         };
+        let contentId: number | undefined;
 
         if (typeof content.id != 'undefined') {
             data.id = content.id;
+            contentId = content.id;
         } else {
             data.timecreated = data.timemodified;
         }
 
         await db.insertRecord(CONTENT_TABLE_NAME, data);
 
-        if (!data.id) {
+        if (!contentId) {
             // New content. Get its ID.
             const entry = await db.getRecord<CoreH5PContentDBRecord>(CONTENT_TABLE_NAME, data);
 
             content.id = entry.id;
+            contentId = content.id;
         }
 
-        return content.id!;
+        return contentId;
     }
 
     /**
diff --git a/src/core/features/h5p/classes/storage.ts b/src/core/features/h5p/classes/storage.ts
index 395eee442..4fc3bcdb1 100644
--- a/src/core/features/h5p/classes/storage.ts
+++ b/src/core/features/h5p/classes/storage.ts
@@ -173,6 +173,11 @@ export class CoreH5PStorage {
 
         const content: CoreH5PContentBeingSaved = {};
 
+        // Add the 'title' if exists from 'h5p.json' data to be able to add it to metadata later.
+        if (typeof data.mainJsonData.title === 'string') {
+            content.title = data.mainJsonData.title;
+        }
+
         if (!skipContent) {
             // Find main library version.
             if (data.mainJsonData.preloadedDependencies) {
@@ -226,6 +231,7 @@ export type CoreH5PContentBeingSaved = {
     id?: number;
     params?: string;
     library?: CoreH5PContentLibrary;
+    title?: string;
 };
 
 export type CoreH5PContentLibrary = CoreH5PLibraryBasicData & {

From e7f8b554df51744cb8f08fa141fb98a6a7f4cded Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 8 Nov 2021 16:19:08 +0100
Subject: [PATCH 0195/1008] MOBILE-3833 menu: Resort main menu page priorities

---
 src/addons/blog/services/handlers/mainmenu.ts        |  2 +-
 src/addons/calendar/services/handlers/mainmenu.ts    |  2 +-
 src/addons/messages/services/handlers/mainmenu.ts    |  2 +-
 .../notifications/services/handlers/mainmenu.ts      |  2 +-
 .../courses/services/handlers/my-courses-mainmenu.ts |  2 +-
 .../features/mainmenu/services/handlers/mainmenu.ts  | 12 ++++++++++--
 src/core/features/tag/services/handlers/mainmenu.ts  |  2 +-
 7 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/addons/blog/services/handlers/mainmenu.ts b/src/addons/blog/services/handlers/mainmenu.ts
index 6b49a07ec..142a3d679 100644
--- a/src/addons/blog/services/handlers/mainmenu.ts
+++ b/src/addons/blog/services/handlers/mainmenu.ts
@@ -26,7 +26,7 @@ export class AddonBlogMainMenuHandlerService implements CoreMainMenuHandler {
     static readonly PAGE_NAME = 'blog';
 
     name = 'AddonBlog';
-    priority = 450;
+    priority = 500;
 
     /**
      * @inheritdoc
diff --git a/src/addons/calendar/services/handlers/mainmenu.ts b/src/addons/calendar/services/handlers/mainmenu.ts
index 2893888a5..209dc0bb1 100644
--- a/src/addons/calendar/services/handlers/mainmenu.ts
+++ b/src/addons/calendar/services/handlers/mainmenu.ts
@@ -26,7 +26,7 @@ export class AddonCalendarMainMenuHandlerService implements CoreMainMenuHandler
     static readonly PAGE_NAME = 'calendar';
 
     name = 'AddonCalendar';
-    priority = 900;
+    priority = 800;
 
     /**
      * Check if the handler is enabled on a site level.
diff --git a/src/addons/messages/services/handlers/mainmenu.ts b/src/addons/messages/services/handlers/mainmenu.ts
index 564f844ba..ea20c90d6 100644
--- a/src/addons/messages/services/handlers/mainmenu.ts
+++ b/src/addons/messages/services/handlers/mainmenu.ts
@@ -38,7 +38,7 @@ export class AddonMessagesMainMenuHandlerService implements CoreMainMenuHandler,
     static readonly PAGE_NAME = 'messages';
 
     name = 'AddonMessages';
-    priority = 800;
+    priority = 700;
 
     protected handler: CoreMainMenuHandlerToDisplay = {
         icon: 'fas-comments',
diff --git a/src/addons/notifications/services/handlers/mainmenu.ts b/src/addons/notifications/services/handlers/mainmenu.ts
index bd4800729..de21bc147 100644
--- a/src/addons/notifications/services/handlers/mainmenu.ts
+++ b/src/addons/notifications/services/handlers/mainmenu.ts
@@ -33,7 +33,7 @@ export class AddonNotificationsMainMenuHandlerService implements CoreMainMenuHan
     static readonly PAGE_NAME = 'notifications';
 
     name = 'AddonNotifications';
-    priority = 700;
+    priority = 600;
 
     protected handlerData: CoreMainMenuHandlerData = {
         icon: 'fas-bell',
diff --git a/src/core/features/courses/services/handlers/my-courses-mainmenu.ts b/src/core/features/courses/services/handlers/my-courses-mainmenu.ts
index 3c3991a5c..8c2c51878 100644
--- a/src/core/features/courses/services/handlers/my-courses-mainmenu.ts
+++ b/src/core/features/courses/services/handlers/my-courses-mainmenu.ts
@@ -29,7 +29,7 @@ export class CoreCoursesMyCoursesMainMenuHandlerService implements CoreMainMenuH
     static readonly PAGE_NAME = 'courses';
 
     name = 'CoreCoursesMyCourses';
-    priority = 850;
+    priority = 900;
 
     /**
      * @inheritdoc
diff --git a/src/core/features/mainmenu/services/handlers/mainmenu.ts b/src/core/features/mainmenu/services/handlers/mainmenu.ts
index 45c6bd8ba..a582228ba 100644
--- a/src/core/features/mainmenu/services/handlers/mainmenu.ts
+++ b/src/core/features/mainmenu/services/handlers/mainmenu.ts
@@ -13,6 +13,9 @@
 // limitations under the License.
 
 import { Injectable } from '@angular/core';
+import { CoreDashboardHomeHandler } from '@features/courses/services/handlers/dashboard-home';
+import { CoreSiteHomeHomeHandler } from '@features/sitehome/services/handlers/sitehome-home';
+import { CoreSites } from '@services/sites';
 import { makeSingleton } from '@singletons';
 import { CoreMainMenuHandler, CoreMainMenuHandlerData } from '../mainmenu-delegate';
 
@@ -25,13 +28,18 @@ export class CoreMainMenuHomeHandlerService implements CoreMainMenuHandler {
     static readonly PAGE_NAME = 'home';
 
     name = 'CoreHome';
-    priority = 1100;
+    priority = 1000;
 
     /**
      * @inheritdoc
      */
     async isEnabled(): Promise<boolean> {
-        return true;
+        const siteId = CoreSites.getCurrentSiteId();
+
+        const dashboardEnabled = await CoreDashboardHomeHandler.isEnabledForSite(siteId);
+        const siteHomeEnabled = await CoreSiteHomeHomeHandler.isEnabledForSite(siteId);
+
+        return dashboardEnabled || siteHomeEnabled;
     }
 
     /**
diff --git a/src/core/features/tag/services/handlers/mainmenu.ts b/src/core/features/tag/services/handlers/mainmenu.ts
index 6a434dccf..1a1a7cf77 100644
--- a/src/core/features/tag/services/handlers/mainmenu.ts
+++ b/src/core/features/tag/services/handlers/mainmenu.ts
@@ -27,7 +27,7 @@ export class CoreTagMainMenuHandlerService implements CoreMainMenuHandler {
     static readonly PAGE_NAME = 'tag';
 
     name = 'CoreTag';
-    priority = 300;
+    priority = 400;
 
     /**
      * Check if the handler is enabled on a site level.

From 89030c9bc0038455a3c9bc1902838bf0ffa0ec2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 8 Nov 2021 16:19:08 +0100
Subject: [PATCH 0196/1008] MOBILE-3833 blocks: Performance improvements

---
 .../recentlyaccessedcourses.ts                | 136 +++++++++---------
 .../starredcourses/starredcourses.ts          | 100 +++++++------
 2 files changed, 118 insertions(+), 118 deletions(-)

diff --git a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
index de9d5a8c9..4d31b6553 100644
--- a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
+++ b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
@@ -15,7 +15,12 @@
 import { Component, OnInit, OnDestroy, Input, OnChanges, SimpleChange } from '@angular/core';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreSites } from '@services/sites';
-import { CoreCoursesProvider, CoreCoursesMyCoursesUpdatedEventData, CoreCourses } from '@features/courses/services/courses';
+import {
+    CoreCoursesProvider,
+    CoreCoursesMyCoursesUpdatedEventData,
+    CoreCourses,
+    CoreCourseSummaryData,
+} from '@features/courses/services/courses';
 import { CoreCourseSearchedDataWithExtraInfoAndOptions, CoreCoursesHelper } from '@features/courses/services/courses-helper';
 import { CoreCourseHelper, CorePrefetchStatusInfo } from '@features/course/services/course-helper';
 import { CoreCourseOptionsDelegate } from '@features/course/services/course-options-delegate';
@@ -35,7 +40,7 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
 
     @Input() downloadEnabled = false;
 
-    courses: CoreCourseSearchedDataWithExtraInfoAndOptions[] = [];
+    courses: (Omit<CoreCourseSummaryData, 'visible'> & CoreCourseSearchedDataWithExtraInfoAndOptions)[] = [];
     prefetchCoursesData: CorePrefetchStatusInfo = {
         icon: '',
         statusTranslatable: 'core.loading',
@@ -52,7 +57,6 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
     protected isDestroyed = false;
     protected coursesObserver?: CoreEventObserver;
     protected updateSiteObserver?: CoreEventObserver;
-    protected courseIds = [];
     protected fetchContentDefaultError = 'Error getting recent courses data.';
 
     constructor() {
@@ -60,7 +64,7 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
     }
 
     /**
-     * Component being initialized.
+     * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
         // Generate unique id for scroll element.
@@ -82,12 +86,8 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
         this.coursesObserver = CoreEvents.on(
             CoreCoursesProvider.EVENT_MY_COURSES_UPDATED,
             (data) => {
-
-                if (this.shouldRefreshOnUpdatedEvent(data)) {
-                    this.refreshCourseList();
-                }
+                this.refreshCourseList(data);
             },
-
             CoreSites.getCurrentSiteId(),
         );
 
@@ -95,7 +95,7 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
     }
 
     /**
-     * Detect changes on input properties.
+     * @inheritdoc
      */
     ngOnChanges(changes: {[name: string]: SimpleChange}): void {
         if (changes.downloadEnabled && !changes.downloadEnabled.previousValue && this.downloadEnabled && this.loaded) {
@@ -105,21 +105,35 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
     }
 
     /**
-     * Perform the invalidate content function.
-     *
-     * @return Resolved when done.
+     * @inheritdoc
      */
     protected async invalidateContent(): Promise<void> {
+        const courseIds = this.courses.map((course) => course.id);
+
+        await this.invalidateCourses(courseIds);
+    }
+
+    /**
+     * Helper function to invalidate only selected courses.
+     *
+     * @param courseIds Course Id array.
+     * @return Promise resolved when done.
+     */
+    protected async invalidateCourses(courseIds: number[]): Promise<void> {
         const promises: Promise<void>[] = [];
 
+        // Invalidate course completion data.
         promises.push(CoreCourses.invalidateRecentCourses().finally(() =>
-            // Invalidate course completion data.
-            CoreUtils.allPromises(this.courseIds.map((courseId) =>
+            CoreUtils.allPromises(courseIds.map((courseId) =>
                 AddonCourseCompletion.invalidateCourseCompletion(courseId)))));
 
-        promises.push(CoreCourseOptionsDelegate.clearAndInvalidateCoursesOptions());
-        if (this.courseIds.length > 0) {
-            promises.push(CoreCourses.invalidateCoursesByField('ids', this.courseIds.join(',')));
+        if (courseIds.length  == 1) {
+            promises.push(CoreCourseOptionsDelegate.clearAndInvalidateCoursesOptions(courseIds[0]));
+        } else {
+            promises.push(CoreCourseOptionsDelegate.clearAndInvalidateCoursesOptions());
+        }
+        if (courseIds.length > 0) {
+            promises.push(CoreCourses.invalidateCoursesByField('ids', courseIds.join(',')));
         }
 
         await CoreUtils.allPromises(promises).finally(() => {
@@ -128,9 +142,7 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
     }
 
     /**
-     * Fetch the courses for recent courses.
-     *
-     * @return Promise resolved when done.
+     * @inheritdoc
      */
     protected async fetchContent(): Promise<void> {
         const showCategories = this.block.configsRecord && this.block.configsRecord.displaycategories &&
@@ -140,17 +152,17 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
         const courseIds = recentCourses.map((course) => course.id);
 
         // Get the courses using getCoursesByField to get more info about each course.
-        const courses: CoreCourseSearchedDataWithExtraInfoAndOptions[] = await CoreCourses.getCoursesByField(
-            'ids',
-            courseIds.join(','),
-        );
+        const courses = await CoreCourses.getCoursesByField('ids', courseIds.join(','));
 
-        // Sort them in the original order.
-        courses.sort((courseA, courseB) => courseIds.indexOf(courseA.id) - courseIds.indexOf(courseB.id));
+        this.courses = recentCourses.map((recentCourse) => {
+            const course = courses.find((course) => recentCourse.id == course.id);
+
+            return Object.assign(recentCourse, course);
+        });
 
         // Get course options and extra info.
         const options = await CoreCourses.getCoursesAdminAndNavOptions(courseIds);
-        courses.forEach((course) => {
+        this.courses.forEach((course) => {
             course.navOptions = options.navOptions[course.id];
             course.admOptions = options.admOptions[course.id];
 
@@ -161,24 +173,9 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
 
         await CoreCoursesHelper.loadCoursesColorAndImage(courses);
 
-        this.courses = courses;
-
         this.initPrefetchCoursesIcons();
     }
 
-    /**
-     * Refresh the list of courses.
-     *
-     * @return Promise resolved when done.
-     */
-    protected async refreshCourseList(): Promise<void> {
-        CoreEvents.trigger(CoreCoursesProvider.EVENT_MY_COURSES_REFRESHED);
-
-        await CoreUtils.ignoreErrors(CoreCourses.invalidateRecentCourses());
-
-        await this.loadContent(true);
-    }
-
     /**
      * Initialize the prefetch icon for selected courses.
      */
@@ -194,44 +191,39 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
     }
 
     /**
-     * Whether list should be refreshed based on a EVENT_MY_COURSES_UPDATED event.
+     * Refresh course list based on a EVENT_MY_COURSES_UPDATED event.
      *
      * @param data Event data.
-     * @return Whether to refresh.
+     * @return Promise resolved when done.
      */
-    protected shouldRefreshOnUpdatedEvent(data: CoreCoursesMyCoursesUpdatedEventData): boolean {
+    protected async refreshCourseList(data: CoreCoursesMyCoursesUpdatedEventData): Promise<void> {
         if (data.action == CoreCoursesProvider.ACTION_ENROL) {
             // Always update if user enrolled in a course.
-            return true;
+            return await this.refreshContent();
         }
 
-        if (data.action == CoreCoursesProvider.ACTION_VIEW && data.courseId != CoreSites.getCurrentSiteHomeId() &&
-                this.courses[0] && data.courseId != this.courses[0].id) {
-            // Update list if user viewed a course that isn't the most recent one and isn't site home.
-            return true;
+        const courseIndex = this.courses.findIndex((course) => course.id == data.courseId);
+        const course = this.courses[courseIndex];
+        if (data.action == CoreCoursesProvider.ACTION_VIEW && data.courseId != CoreSites.getCurrentSiteHomeId()) {
+            if (!course) {
+                // Not found, use WS update.
+                return await this.refreshContent();
+            }
+
+            // Place at the begining.
+            this.courses.splice(courseIndex, 1);
+            this.courses.unshift(course);
+
+            await this.invalidateCourses([course.id]);
         }
 
-        if (data.action == CoreCoursesProvider.ACTION_STATE_CHANGED && data.state == CoreCoursesProvider.STATE_FAVOURITE &&
-                data.courseId && this.hasCourse(data.courseId)) {
-            // Update list if a visible course is now favourite or unfavourite.
-            return true;
+        if (data.action == CoreCoursesProvider.ACTION_STATE_CHANGED &&
+            data.state == CoreCoursesProvider.STATE_FAVOURITE && course) {
+            course.isfavourite = !!data.value;
+            await this.invalidateCourses([course.id]);
+
+            this.initPrefetchCoursesIcons();
         }
-
-        return false;
-    }
-
-    /**
-     * Check if a certain course is in the list of courses.
-     *
-     * @param courseId Course ID to search.
-     * @return Whether it's in the list.
-     */
-    protected hasCourse(courseId: number): boolean {
-        if (!this.courses) {
-            return false;
-        }
-
-        return !!this.courses.find((course) => course.id == courseId);
     }
 
     /**
@@ -253,7 +245,7 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
     }
 
     /**
-     * Component being destroyed.
+     * @inheritdoc
      */
     ngOnDestroy(): void {
         this.isDestroyed = true;
diff --git a/src/addons/block/starredcourses/components/starredcourses/starredcourses.ts b/src/addons/block/starredcourses/components/starredcourses/starredcourses.ts
index b95d8084d..766c695c7 100644
--- a/src/addons/block/starredcourses/components/starredcourses/starredcourses.ts
+++ b/src/addons/block/starredcourses/components/starredcourses/starredcourses.ts
@@ -52,7 +52,6 @@ export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent im
     protected isDestroyed = false;
     protected coursesObserver?: CoreEventObserver;
     protected updateSiteObserver?: CoreEventObserver;
-    protected courseIds: number[] = [];
     protected fetchContentDefaultError = 'Error getting starred courses data.';
 
     constructor() {
@@ -60,7 +59,7 @@ export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent im
     }
 
     /**
-     * Component being initialized.
+     * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
         // Generate unique id for scroll element.
@@ -76,17 +75,12 @@ export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent im
         this.updateSiteObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, () => {
             this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
             this.downloadCoursesEnabled = !CoreCourses.isDownloadCoursesDisabledInSite();
-
         }, CoreSites.getCurrentSiteId());
 
         this.coursesObserver = CoreEvents.on(
             CoreCoursesProvider.EVENT_MY_COURSES_UPDATED,
             (data) => {
-
-                if (this.shouldRefreshOnUpdatedEvent(data)) {
-                    this.refreshCourseList();
-                }
-                this.refreshContent();
+                this.refreshCourseList(data);
             },
 
             CoreSites.getCurrentSiteId(),
@@ -96,7 +90,7 @@ export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent im
     }
 
     /**
-     * Detect changes on input properties.
+     * @inheritdoc
      */
     ngOnChanges(changes: {[name: string]: SimpleChange}): void {
         if (changes.downloadEnabled && !changes.downloadEnabled.previousValue && this.downloadEnabled && this.loaded) {
@@ -106,21 +100,35 @@ export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent im
     }
 
     /**
-     * Perform the invalidate content function.
-     *
-     * @return Resolved when done.
+     * @inheritdoc
      */
     protected async invalidateContent(): Promise<void> {
+        const courseIds = this.courses.map((course) => course.id);
+
+        await this.invalidateCourses(courseIds);
+    }
+
+    /**
+     * Helper function to invalidate only selected courses.
+     *
+     * @param courseIds Course Id array.
+     * @return Promise resolved when done.
+     */
+    protected async invalidateCourses(courseIds: number[]): Promise<void> {
         const promises: Promise<void>[] = [];
 
+        // Invalidate course completion data.
         promises.push(CoreCourses.invalidateUserCourses().finally(() =>
-            // Invalidate course completion data.
-            CoreUtils.allPromises(this.courseIds.map((courseId) =>
+            CoreUtils.allPromises(courseIds.map((courseId) =>
                 AddonCourseCompletion.invalidateCourseCompletion(courseId)))));
 
-        promises.push(CoreCourseOptionsDelegate.clearAndInvalidateCoursesOptions());
-        if (this.courseIds.length > 0) {
-            promises.push(CoreCourses.invalidateCoursesByField('ids', this.courseIds.join(',')));
+        if (courseIds.length  == 1) {
+            promises.push(CoreCourseOptionsDelegate.clearAndInvalidateCoursesOptions(courseIds[0]));
+        } else {
+            promises.push(CoreCourseOptionsDelegate.clearAndInvalidateCoursesOptions());
+        }
+        if (courseIds.length > 0) {
+            promises.push(CoreCourses.invalidateCoursesByField('ids', courseIds.join(',')));
         }
 
         await CoreUtils.allPromises(promises).finally(() => {
@@ -129,54 +137,54 @@ export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent im
     }
 
     /**
-     * Fetch the courses.
-     *
-     * @return Promise resolved when done.
+     * @inheritdoc
      */
     protected async fetchContent(): Promise<void> {
         const showCategories = this.block.configsRecord && this.block.configsRecord.displaycategories &&
             this.block.configsRecord.displaycategories.value == '1';
 
+        // @TODO: Sort won't coincide with website because timemodified is not informed.
         this.courses = await CoreCoursesHelper.getUserCoursesWithOptions('timemodified', 0, 'isfavourite', showCategories);
+
         this.initPrefetchCoursesIcons();
     }
 
     /**
-     * Refresh the list of courses.
-     *
-     * @return Promise resolved when done.
-     */
-    protected async refreshCourseList(): Promise<void> {
-        CoreEvents.trigger(CoreCoursesProvider.EVENT_MY_COURSES_REFRESHED);
-
-        try {
-            await CoreCourses.invalidateUserCourses();
-        } catch (error) {
-            // Ignore errors.
-        }
-
-        await this.loadContent(true);
-    }
-
-    /**
-     * Whether list should be refreshed based on a EVENT_MY_COURSES_UPDATED event.
+     * Refresh course list based on a EVENT_MY_COURSES_UPDATED event.
      *
      * @param data Event data.
-     * @return Whether to refresh.
+     * @return Promise resolved when done.
      */
-    protected shouldRefreshOnUpdatedEvent(data: CoreCoursesMyCoursesUpdatedEventData): boolean {
+    protected async refreshCourseList(data: CoreCoursesMyCoursesUpdatedEventData): Promise<void> {
         if (data.action == CoreCoursesProvider.ACTION_ENROL) {
             // Always update if user enrolled in a course.
             // New courses shouldn't be favourite by default, but just in case.
-            return true;
+            return await this.refreshContent();
         }
 
         if (data.action == CoreCoursesProvider.ACTION_STATE_CHANGED && data.state == CoreCoursesProvider.STATE_FAVOURITE) {
-            // Update list when making a course favourite or not.
-            return true;
-        }
+            const courseIndex = this.courses.findIndex((course) => course.id == data.courseId);
+            if (courseIndex < 0) {
+                // Not found, use WS update. Usually new favourite.
+                return await this.refreshContent();
+            }
 
-        return false;
+            const course = this.courses[courseIndex];
+            if (data.value === false) {
+                // Unfavourite, just remove.
+                this.courses.splice(courseIndex, 1);
+            } else {
+                // List is not synced, favourite course and place it at the begining.
+                course.isfavourite = !!data.value;
+
+                this.courses.splice(courseIndex, 1);
+                this.courses.unshift(course);
+            }
+
+            await this.invalidateCourses([course.id]);
+            this.initPrefetchCoursesIcons();
+
+        }
     }
 
     /**
@@ -212,7 +220,7 @@ export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent im
     }
 
     /**
-     * Component being destroyed.
+     * @inheritdoc
      */
     ngOnDestroy(): void {
         this.isDestroyed = true;

From 597949d5bddc32e2937c416fabdfcd7613b5a525 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 8 Nov 2021 16:19:08 +0100
Subject: [PATCH 0197/1008] MOBILE-3833 user-menu: Improve styles

---
 .../user-menu-button/user-menu-button.scss          | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.scss b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.scss
index 15aa50df5..8695620af 100644
--- a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.scss
+++ b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.scss
@@ -1,3 +1,12 @@
-:host-context(ion-tabs.placement-side div.tabs-inner) {
+core-user-avatar {
+    padding: 0;
+}
+
+:host-context(ion-tabs.placement-side ion-toolbar) {
     display: none;
-}
\ No newline at end of file
+}
+
+:host-context(ion-toolbar) core-user-avatar ::ng-deep img {
+    padding: 2px !important;
+    border: 1px solid var(--color);
+}

From 4c94b61eca7b0ae4d47f914b059f34a4ba877b72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 8 Nov 2021 16:19:08 +0100
Subject: [PATCH 0198/1008] MOBILE-3833 timeline: Hide courses without events

---
 .../components/timeline/addon-block-timeline.html         | 2 +-
 src/addons/block/timeline/components/timeline/timeline.ts | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/addons/block/timeline/components/timeline/addon-block-timeline.html b/src/addons/block/timeline/components/timeline/addon-block-timeline.html
index 81c32360d..a955b9b69 100644
--- a/src/addons/block/timeline/components/timeline/addon-block-timeline.html
+++ b/src/addons/block/timeline/components/timeline/addon-block-timeline.html
@@ -47,6 +47,6 @@
                 [course]="course" [from]="dataFrom" [to]="dataTo"></addon-block-timeline-events>
         </ng-container>
         <core-empty-box *ngIf="timelineCourses.courses.length == 0" image="assets/img/icons/courses.svg" inline="true"
-            [message]="'addon.block_timeline.nocoursesinprogress' | translate"></core-empty-box>
+            [message]="'addon.block_timeline.noevents' | translate"></core-empty-box>
     </core-loading>
 </core-loading>
diff --git a/src/addons/block/timeline/components/timeline/timeline.ts b/src/addons/block/timeline/components/timeline/timeline.ts
index c8ef64b77..2eb6979df 100644
--- a/src/addons/block/timeline/components/timeline/timeline.ts
+++ b/src/addons/block/timeline/components/timeline/timeline.ts
@@ -176,9 +176,15 @@ export class AddonBlockTimelineComponent extends CoreBlockBaseComponent implemen
 
             const courseEvents = await AddonBlockTimeline.getActionEventsByCourses(this.courseIds);
 
-            this.timelineCourses.courses.forEach((course) => {
+            this.timelineCourses.courses = this.timelineCourses.courses.filter((course) => {
+                if (courseEvents[course.id].events.length == 0) {
+                    return false;
+                }
+
                 course.events = courseEvents[course.id].events;
                 course.canLoadMore = courseEvents[course.id].canLoadMore;
+
+                return true;
             });
         }
     }

From 0628fc1146da4ecd72d8bb32e025fecf227a41a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 8 Nov 2021 16:19:08 +0100
Subject: [PATCH 0199/1008] MOBILE-3833 sites: Improve site sorting

---
 src/core/services/sites.ts | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/core/services/sites.ts b/src/core/services/sites.ts
index abbcc0de6..116f125dd 100644
--- a/src/core/services/sites.ts
+++ b/src/core/services/sites.ts
@@ -1090,7 +1090,7 @@ export class CoreSitesProvider {
     }
 
     /**
-     * Get the list of sites stored, sorted by URL and full name.
+     * Get the list of sites stored, sorted by sitename, URL and fullname.
      *
      * @param ids IDs of the sites to get. If not defined, return all sites.
      * @return Promise resolved when the sites are retrieved.
@@ -1098,24 +1098,28 @@ export class CoreSitesProvider {
     async getSortedSites(ids?: string[]): Promise<CoreSiteBasicInfo[]> {
         const sites = await this.getSites(ids);
 
-        // Sort sites by url and fullname.
+        // Sort sites by site name, url and then fullname.
         sites.sort((a, b) => {
-            // First compare by site url without the protocol.
-            const compare = a.siteUrlWithoutProtocol.localeCompare(b.siteUrlWithoutProtocol);
+            // First compare by site name.
+            let textA = CoreTextUtils.cleanTags(a.siteName).toLowerCase().trim();
+            let textB = CoreTextUtils.cleanTags(b.siteName).toLowerCase().trim();
 
+            let compare = textA.localeCompare(textB);
             if (compare !== 0) {
                 return compare;
             }
 
-            // If site url is the same, use fullname instead.
-            const fullNameA = a.fullName?.toLowerCase().trim();
-            const fullNameB = b.fullName?.toLowerCase().trim();
-
-            if (!fullNameA || !fullNameB) {
-                return 0;
+            // If site name is the same, use site url without the protocol.
+            compare = a.siteUrlWithoutProtocol.localeCompare(b.siteUrlWithoutProtocol);
+            if (compare !== 0) {
+                return compare;
             }
 
-            return fullNameA.localeCompare(fullNameB);
+            // Finally use fullname.
+            textA = a.fullName?.toLowerCase().trim() || '';
+            textB = b.fullName?.toLowerCase().trim() || '';
+
+            return textA.localeCompare(textB);
         });
 
         return sites;

From 4be4912864de197b2bff6d44cfc5f1c27b134539 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 15 Nov 2021 17:42:11 +0100
Subject: [PATCH 0200/1008] MOBILE-3924 licenses: Add filter license and update

---
 licenses.json                                 | 2226 ++++++++---------
 .../settings/pages/licenses/licenses.html     |   12 +-
 .../settings/pages/licenses/licenses.ts       |   60 +-
 3 files changed, 1123 insertions(+), 1175 deletions(-)

diff --git a/licenses.json b/licenses.json
index a05f284ed..f9ea6b245 100644
--- a/licenses.json
+++ b/licenses.json
@@ -1,291 +1,331 @@
 {
-  "@angular/animations@11.0.1": {
+  "@angular/animations@10.0.14": {
     "licenses": "MIT",
     "repository": "https://github.com/angular/angular",
     "publisher": "angular",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@angular/animations",
-    "licenseFile": "node_modules/@angular/animations/README.md"
+    "licenseFile": "README.md"
   },
   "@angular/common@10.0.14": {
     "licenses": "MIT",
     "repository": "https://github.com/angular/angular",
     "publisher": "angular",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@angular/common",
-    "licenseFile": "node_modules/@angular/common/README.md"
+    "licenseFile": "README.md"
   },
   "@angular/compiler@10.0.14": {
     "licenses": "MIT",
     "repository": "https://github.com/angular/angular",
     "publisher": "angular",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@angular/compiler",
-    "licenseFile": "node_modules/@angular/compiler/README.md"
+    "licenseFile": "README.md"
   },
   "@angular/core@10.0.14": {
     "licenses": "MIT",
     "repository": "https://github.com/angular/angular",
     "publisher": "angular",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@angular/core",
-    "licenseFile": "node_modules/@angular/core/README.md"
+    "licenseFile": "README.md"
   },
   "@angular/forms@10.0.14": {
     "licenses": "MIT",
     "repository": "https://github.com/angular/angular",
     "publisher": "angular",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@angular/forms",
-    "licenseFile": "node_modules/@angular/forms/README.md"
+    "licenseFile": "README.md"
   },
   "@angular/platform-browser-dynamic@10.0.14": {
     "licenses": "MIT",
     "repository": "https://github.com/angular/angular",
     "publisher": "angular",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@angular/platform-browser-dynamic",
-    "licenseFile": "node_modules/@angular/platform-browser-dynamic/README.md"
+    "licenseFile": "README.md"
   },
   "@angular/platform-browser@10.0.14": {
     "licenses": "MIT",
     "repository": "https://github.com/angular/angular",
     "publisher": "angular",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@angular/platform-browser",
-    "licenseFile": "node_modules/@angular/platform-browser/README.md"
+    "licenseFile": "README.md"
   },
   "@angular/router@10.0.14": {
     "licenses": "MIT",
     "repository": "https://github.com/angular/angular",
     "publisher": "angular",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@angular/router",
-    "licenseFile": "node_modules/@angular/router/README.md"
+    "licenseFile": "README.md"
   },
   "@ionic-native/badge@5.33.0": {
     "licenses": "MIT",
     "repository": "https://github.com/ionic-team/ionic-native",
     "publisher": "ionic",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@ionic-native/badge",
-    "licenseFile": "node_modules/@ionic-native/badge/README.md"
+    "licenseFile": "README.md"
   },
   "@ionic-native/camera@5.33.0": {
     "licenses": "MIT",
     "repository": "https://github.com/ionic-team/ionic-native",
     "publisher": "ionic",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@ionic-native/camera",
-    "licenseFile": "node_modules/@ionic-native/camera/README.md"
+    "licenseFile": "README.md"
   },
   "@ionic-native/chooser@5.33.0": {
     "licenses": "MIT",
     "repository": "https://github.com/ionic-team/ionic-native",
     "publisher": "ionic",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@ionic-native/chooser",
-    "licenseFile": "node_modules/@ionic-native/chooser/README.md"
+    "licenseFile": "README.md"
   },
   "@ionic-native/clipboard@5.33.0": {
     "licenses": "MIT",
     "repository": "https://github.com/ionic-team/ionic-native",
     "publisher": "ionic",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@ionic-native/clipboard",
-    "licenseFile": "node_modules/@ionic-native/clipboard/README.md"
+    "licenseFile": "README.md"
   },
   "@ionic-native/core@5.33.0": {
     "licenses": "MIT",
     "repository": "https://github.com/ionic-team/ionic-native",
     "publisher": "ionic",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@ionic-native/core"
+    "licenseFile": "null"
   },
   "@ionic-native/device@5.33.0": {
     "licenses": "MIT",
     "repository": "https://github.com/ionic-team/ionic-native",
     "publisher": "ionic",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@ionic-native/device",
-    "licenseFile": "node_modules/@ionic-native/device/README.md"
+    "licenseFile": "README.md"
   },
   "@ionic-native/diagnostic@5.33.0": {
     "licenses": "MIT",
     "repository": "https://github.com/ionic-team/ionic-native",
     "publisher": "ionic",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@ionic-native/diagnostic",
-    "licenseFile": "node_modules/@ionic-native/diagnostic/README.md"
+    "licenseFile": "README.md"
   },
   "@ionic-native/file-opener@5.33.0": {
     "licenses": "MIT",
     "repository": "https://github.com/ionic-team/ionic-native",
     "publisher": "ionic",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@ionic-native/file-opener",
-    "licenseFile": "node_modules/@ionic-native/file-opener/README.md"
+    "licenseFile": "README.md"
   },
   "@ionic-native/file-transfer@5.33.0": {
     "licenses": "MIT",
     "repository": "https://github.com/ionic-team/ionic-native",
     "publisher": "ionic",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@ionic-native/file-transfer",
-    "licenseFile": "node_modules/@ionic-native/file-transfer/README.md"
+    "licenseFile": "README.md"
   },
   "@ionic-native/file@5.33.0": {
     "licenses": "MIT",
     "repository": "https://github.com/ionic-team/ionic-native",
     "publisher": "ionic",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@ionic-native/file",
-    "licenseFile": "node_modules/@ionic-native/file/README.md"
+    "licenseFile": "README.md"
   },
   "@ionic-native/geolocation@5.33.0": {
     "licenses": "MIT",
     "repository": "https://github.com/ionic-team/ionic-native",
     "publisher": "ionic",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@ionic-native/geolocation",
-    "licenseFile": "node_modules/@ionic-native/geolocation/README.md"
+    "licenseFile": "README.md"
   },
   "@ionic-native/http@5.33.0": {
     "licenses": "MIT",
     "repository": "https://github.com/ionic-team/ionic-native",
     "publisher": "ionic",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@ionic-native/http",
-    "licenseFile": "node_modules/@ionic-native/http/README.md"
+    "licenseFile": "README.md"
   },
   "@ionic-native/in-app-browser@5.33.0": {
     "licenses": "MIT",
     "repository": "https://github.com/ionic-team/ionic-native",
     "publisher": "ionic",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@ionic-native/in-app-browser",
-    "licenseFile": "node_modules/@ionic-native/in-app-browser/README.md"
+    "licenseFile": "README.md"
   },
   "@ionic-native/ionic-webview@5.33.0": {
     "licenses": "MIT",
     "repository": "https://github.com/ionic-team/ionic-native",
     "publisher": "ionic",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@ionic-native/ionic-webview",
-    "licenseFile": "node_modules/@ionic-native/ionic-webview/README.md"
+    "licenseFile": "README.md"
   },
   "@ionic-native/keyboard@5.33.0": {
     "licenses": "MIT",
     "repository": "https://github.com/ionic-team/ionic-native",
     "publisher": "ionic",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@ionic-native/keyboard",
-    "licenseFile": "node_modules/@ionic-native/keyboard/README.md"
+    "licenseFile": "README.md"
   },
   "@ionic-native/local-notifications@5.33.0": {
     "licenses": "MIT",
     "repository": "https://github.com/ionic-team/ionic-native",
     "publisher": "ionic",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@ionic-native/local-notifications",
-    "licenseFile": "node_modules/@ionic-native/local-notifications/README.md"
+    "licenseFile": "README.md"
   },
   "@ionic-native/media-capture@5.33.0": {
     "licenses": "MIT",
     "repository": "https://github.com/ionic-team/ionic-native",
     "publisher": "ionic",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@ionic-native/media-capture",
-    "licenseFile": "node_modules/@ionic-native/media-capture/README.md"
+    "licenseFile": "README.md"
   },
   "@ionic-native/media@5.33.0": {
     "licenses": "MIT",
     "repository": "https://github.com/ionic-team/ionic-native",
     "publisher": "ionic",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@ionic-native/media",
-    "licenseFile": "node_modules/@ionic-native/media/README.md"
+    "licenseFile": "README.md"
   },
   "@ionic-native/network@5.33.0": {
     "licenses": "MIT",
     "repository": "https://github.com/ionic-team/ionic-native",
     "publisher": "ionic",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@ionic-native/network",
-    "licenseFile": "node_modules/@ionic-native/network/README.md"
+    "licenseFile": "README.md"
   },
   "@ionic-native/push@5.33.0": {
     "licenses": "MIT",
     "repository": "https://github.com/ionic-team/ionic-native",
     "publisher": "ionic",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@ionic-native/push",
-    "licenseFile": "node_modules/@ionic-native/push/README.md"
+    "licenseFile": "README.md"
   },
   "@ionic-native/qr-scanner@5.33.0": {
     "licenses": "MIT",
     "repository": "https://github.com/ionic-team/ionic-native",
     "publisher": "ionic",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@ionic-native/qr-scanner",
-    "licenseFile": "node_modules/@ionic-native/qr-scanner/README.md"
+    "licenseFile": "README.md"
   },
   "@ionic-native/splash-screen@5.33.0": {
     "licenses": "MIT",
     "repository": "https://github.com/ionic-team/ionic-native",
     "publisher": "ionic",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@ionic-native/splash-screen",
-    "licenseFile": "node_modules/@ionic-native/splash-screen/README.md"
+    "licenseFile": "README.md"
   },
   "@ionic-native/sqlite@5.33.0": {
     "licenses": "MIT",
     "repository": "https://github.com/ionic-team/ionic-native",
     "publisher": "ionic",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@ionic-native/sqlite",
-    "licenseFile": "node_modules/@ionic-native/sqlite/README.md"
+    "licenseFile": "README.md"
   },
   "@ionic-native/status-bar@5.33.0": {
     "licenses": "MIT",
     "repository": "https://github.com/ionic-team/ionic-native",
     "publisher": "ionic",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@ionic-native/status-bar",
-    "licenseFile": "node_modules/@ionic-native/status-bar/README.md"
+    "licenseFile": "README.md"
   },
   "@ionic-native/web-intent@5.33.0": {
     "licenses": "MIT",
     "repository": "https://github.com/ionic-team/ionic-native",
     "publisher": "ionic",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@ionic-native/web-intent",
-    "licenseFile": "node_modules/@ionic-native/web-intent/README.md"
+    "licenseFile": "README.md"
   },
   "@ionic-native/zip@5.33.0": {
     "licenses": "MIT",
     "repository": "https://github.com/ionic-team/ionic-native",
     "publisher": "ionic",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@ionic-native/zip",
-    "licenseFile": "node_modules/@ionic-native/zip/README.md"
+    "licenseFile": "README.md"
   },
   "@ionic/angular@5.6.6": {
     "licenses": "MIT",
     "repository": "https://github.com/ionic-team/ionic",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@ionic/angular",
-    "licenseFile": "node_modules/@ionic/angular/README.md"
+    "licenseFile": "README.md"
   },
   "@ionic/core@5.6.6": {
     "licenses": "MIT",
     "repository": "https://github.com/ionic-team/ionic",
     "publisher": "Ionic Team",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@ionic/core",
-    "licenseFile": "node_modules/@ionic/core/LICENSE"
+    "licenseFile": "LICENSE"
+  },
+  "@moodlehq/cordova-plugin-file-transfer@1.7.1-moodle.2": {
+    "licenses": "Apache-2.0",
+    "repository": "https://github.com/moodlemobile/cordova-plugin-file-transfer",
+    "publisher": "Apache Software Foundation",
+    "licenseFile": "LICENSE",
+    "noticeFile": "node_modules/@moodlehq/cordova-plugin-file-transfer/NOTICE"
+  },
+  "@moodlehq/cordova-plugin-inappbrowser@5.0.0-moodle.2": {
+    "licenses": "Apache-2.0",
+    "repository": "https://github.com/moodlemobile/cordova-plugin-inappbrowser",
+    "publisher": "Apache Software Foundation",
+    "licenseFile": "LICENSE",
+    "noticeFile": "node_modules/@moodlehq/cordova-plugin-inappbrowser/NOTICE"
+  },
+  "@moodlehq/cordova-plugin-ionic-webview@5.0.0-moodle.1": {
+    "licenses": "Apache-2.0",
+    "repository": "https://github.com/moodlemobile/cordova-plugin-ionic-webview",
+    "publisher": "Ionic Team",
+    "licenseFile": "LICENSE"
+  },
+  "@moodlehq/cordova-plugin-local-notification@0.9.0-moodle.3": {
+    "licenses": "Apache*",
+    "repository": "https://github.com/moodlemobile/cordova-plugin-local-notification",
+    "publisher": "Sebastián Katzer",
+    "licenseFile": "LICENSE"
+  },
+  "@moodlehq/cordova-plugin-qrscanner@3.0.1-moodle.2": {
+    "licenses": "MIT",
+    "repository": "https://github.com/moodlemobile/cordova-plugin-qrscanner",
+    "publisher": "Jason Dreyzehner",
+    "licenseFile": "LICENSE"
+  },
+  "@moodlehq/phonegap-plugin-push@2.0.0-moodle.2": {
+    "licenses": "MIT",
+    "repository": "https://github.com/moodlemobile/phonegap-plugin-push",
+    "publisher": "Erisu",
+    "licenseFile": "README.md"
   },
   "@netflix/nerror@1.1.3": {
     "licenses": "MIT",
     "repository": "https://github.com/Netflix/nerror",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@netflix/nerror",
-    "licenseFile": "node_modules/@netflix/nerror/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "@ngx-translate/core@13.0.0": {
     "licenses": "MIT",
     "repository": "https://github.com/ngx-translate/core",
     "publisher": "Olivier Combe",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@ngx-translate/core",
-    "licenseFile": "node_modules/@ngx-translate/core/README.md"
+    "licenseFile": "README.md"
   },
   "@ngx-translate/http-loader@6.0.0": {
     "licenses": "MIT",
     "repository": "https://github.com/ngx-translate/http-loader",
     "publisher": "Olivier Combe",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@ngx-translate/http-loader",
-    "licenseFile": "node_modules/@ngx-translate/http-loader/README.md"
+    "licenseFile": "README.md"
   },
   "@nodelib/fs.scandir@2.1.3": {
     "licenses": "MIT",
     "repository": "https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.scandir",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@nodelib/fs.scandir",
-    "licenseFile": "node_modules/@nodelib/fs.scandir/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "@nodelib/fs.stat@2.0.3": {
     "licenses": "MIT",
     "repository": "https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.stat",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@nodelib/fs.stat",
-    "licenseFile": "node_modules/@nodelib/fs.stat/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "@nodelib/fs.walk@1.2.4": {
     "licenses": "MIT",
     "repository": "https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.walk",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@nodelib/fs.walk",
-    "licenseFile": "node_modules/@nodelib/fs.walk/LICENSE"
+    "licenseFile": "LICENSE"
+  },
+  "@npmcli/git@2.1.0": {
+    "licenses": "ISC",
+    "repository": "https://github.com/npm/git",
+    "publisher": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "https://izs.me",
+    "licenseFile": "LICENSE"
+  },
+  "@npmcli/installed-package-contents@1.0.7": {
+    "licenses": "ISC",
+    "repository": "https://github.com/npm/installed-package-contents",
+    "publisher": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "https://izs.me",
+    "licenseFile": "LICENSE"
+  },
+  "@npmcli/move-file@1.0.1": {
+    "licenses": "MIT",
+    "repository": "https://github.com/npm/move-file",
+    "licenseFile": "LICENSE.md"
+  },
+  "@npmcli/node-gyp@1.0.2": {
+    "licenses": "ISC",
+    "publisher": "Brian Jenkins",
+    "email": "bonkydog@bonkydog.com",
+    "licenseFile": "README.md"
+  },
+  "@npmcli/promise-spawn@1.3.2": {
+    "licenses": "ISC",
+    "repository": "https://github.com/npm/promise-spawn",
+    "publisher": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "https://izs.me",
+    "licenseFile": "LICENSE"
+  },
+  "@npmcli/run-script@1.8.5": {
+    "licenses": "ISC",
+    "repository": "https://github.com/npm/run-script",
+    "publisher": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "https://izs.me",
+    "licenseFile": "LICENSE"
   },
   "@sindresorhus/is@0.14.0": {
     "licenses": "MIT",
@@ -293,84 +333,99 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@sindresorhus/is",
-    "licenseFile": "node_modules/@sindresorhus/is/license"
+    "licenseFile": "license"
   },
   "@stencil/core@2.5.2": {
     "licenses": "MIT",
     "repository": "https://github.com/ionic-team/stencil",
     "publisher": "Ionic Team",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@stencil/core",
-    "licenseFile": "node_modules/@stencil/core/LICENSE.md",
+    "licenseFile": "LICENSE.md",
     "noticeFile": "node_modules/@stencil/core/NOTICE.md"
   },
   "@szmarczak/http-timer@1.1.2": {
     "licenses": "MIT",
     "repository": "https://github.com/szmarczak/http-timer",
     "publisher": "Szymon Marczak",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@szmarczak/http-timer",
-    "licenseFile": "node_modules/@szmarczak/http-timer/LICENSE"
+    "licenseFile": "LICENSE"
+  },
+  "@tootallnate/once@1.1.2": {
+    "licenses": "MIT",
+    "repository": "https://github.com/TooTallNate/once",
+    "publisher": "Nathan Rajlich",
+    "email": "nathan@tootallnate.net",
+    "url": "http://n8.io/",
+    "licenseFile": "null"
   },
   "@types/chart.js@2.9.31": {
     "licenses": "MIT",
     "repository": "https://github.com/DefinitelyTyped/DefinitelyTyped",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@types/chart.js",
-    "licenseFile": "node_modules/@types/chart.js/LICENSE"
-  },
-  "@types/cordova-plugin-file-transfer@1.6.2": {
-    "licenses": "MIT",
-    "repository": "https://github.com/apache/cordova-plugin-file-transfer",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@types/cordova-plugin-file-transfer",
-    "licenseFile": "node_modules/@types/cordova-plugin-file-transfer/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "@types/cordova@0.0.34": {
     "licenses": "MIT",
     "repository": "https://github.com/DefinitelyTyped/DefinitelyTyped",
     "publisher": "Microsoft Open Technologies Inc",
     "email": "http://msopentech.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@ionic-native/badge/node_modules/@types/cordova",
-    "licenseFile": "node_modules/@ionic-native/badge/node_modules/@types/cordova/README.md"
+    "licenseFile": "README.md"
   },
   "@types/dom-mediacapture-record@1.0.7": {
     "licenses": "MIT",
     "repository": "https://github.com/DefinitelyTyped/DefinitelyTyped",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@types/dom-mediacapture-record",
-    "licenseFile": "node_modules/@types/dom-mediacapture-record/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "abbrev@1.1.1": {
     "licenses": "ISC",
     "repository": "https://github.com/isaacs/abbrev-js",
     "publisher": "Isaac Z. Schlueter",
     "email": "i@izs.me",
-    "path": "/Users/pau/git/moodleapp5/node_modules/abbrev",
-    "licenseFile": "node_modules/abbrev/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "accepts@1.3.7": {
     "licenses": "MIT",
     "repository": "https://github.com/jshttp/accepts",
-    "path": "/Users/pau/git/moodleapp5/node_modules/accepts",
-    "licenseFile": "node_modules/accepts/LICENSE"
+    "licenseFile": "LICENSE"
+  },
+  "agent-base@6.0.2": {
+    "licenses": "MIT",
+    "repository": "https://github.com/TooTallNate/node-agent-base",
+    "publisher": "Nathan Rajlich",
+    "email": "nathan@tootallnate.net",
+    "url": "http://n8.io/",
+    "licenseFile": "README.md"
+  },
+  "agentkeepalive@4.1.4": {
+    "licenses": "MIT",
+    "repository": "https://github.com/node-modules/agentkeepalive",
+    "publisher": "fengmk2",
+    "email": "fengmk2@gmail.com",
+    "url": "https://fengmk2.com",
+    "licenseFile": "LICENSE"
+  },
+  "aggregate-error@3.1.0": {
+    "licenses": "MIT",
+    "repository": "https://github.com/sindresorhus/aggregate-error",
+    "publisher": "Sindre Sorhus",
+    "email": "sindresorhus@gmail.com",
+    "url": "sindresorhus.com",
+    "licenseFile": "license"
   },
   "ajv@6.12.5": {
     "licenses": "MIT",
     "repository": "https://github.com/ajv-validator/ajv",
     "publisher": "Evgeny Poberezkin",
-    "path": "/Users/pau/git/moodleapp5/node_modules/ajv",
-    "licenseFile": "node_modules/ajv/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "android-versions@1.6.0": {
     "licenses": "MIT",
     "repository": "https://github.com/dvoiss/android-versions",
     "publisher": "dvoiss",
-    "path": "/Users/pau/git/moodleapp5/node_modules/android-versions",
-    "licenseFile": "node_modules/android-versions/README.md"
+    "licenseFile": "README.md"
   },
   "ansi-align@3.0.0": {
     "licenses": "ISC",
     "repository": "https://github.com/nexdrew/ansi-align",
     "publisher": "nexdrew",
-    "path": "/Users/pau/git/moodleapp5/node_modules/ansi-align",
-    "licenseFile": "node_modules/ansi-align/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "ansi-escapes@3.2.0": {
     "licenses": "MIT",
@@ -378,8 +433,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/ansi-escapes",
-    "licenseFile": "node_modules/ansi-escapes/license"
+    "licenseFile": "license"
   },
   "ansi-regex@2.1.1": {
     "licenses": "MIT",
@@ -387,8 +441,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/gauge/node_modules/ansi-regex",
-    "licenseFile": "node_modules/gauge/node_modules/ansi-regex/license"
+    "licenseFile": "license"
   },
   "ansi-regex@3.0.0": {
     "licenses": "MIT",
@@ -396,8 +449,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/ansi-regex",
-    "licenseFile": "node_modules/ansi-regex/license"
+    "licenseFile": "license"
   },
   "ansi-regex@4.1.0": {
     "licenses": "MIT",
@@ -405,8 +457,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/strip-ansi/node_modules/ansi-regex",
-    "licenseFile": "node_modules/strip-ansi/node_modules/ansi-regex/license"
+    "licenseFile": "license"
   },
   "ansi-regex@5.0.0": {
     "licenses": "MIT",
@@ -414,8 +465,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/boxen/node_modules/ansi-regex",
-    "licenseFile": "node_modules/boxen/node_modules/ansi-regex/license"
+    "licenseFile": "license"
   },
   "ansi-styles@3.2.1": {
     "licenses": "MIT",
@@ -423,8 +473,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/insight/node_modules/ansi-styles",
-    "licenseFile": "node_modules/insight/node_modules/ansi-styles/license"
+    "licenseFile": "license"
   },
   "ansi-styles@4.3.0": {
     "licenses": "MIT",
@@ -432,8 +481,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/ansi-styles",
-    "licenseFile": "node_modules/ansi-styles/license"
+    "licenseFile": "license"
   },
   "ansi@0.3.1": {
     "licenses": "MIT",
@@ -441,24 +489,21 @@
     "publisher": "Nathan Rajlich",
     "email": "nathan@tootallnate.net",
     "url": "http://tootallnate.net",
-    "path": "/Users/pau/git/moodleapp5/node_modules/ansi",
-    "licenseFile": "node_modules/ansi/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "aproba@1.2.0": {
     "licenses": "ISC",
     "repository": "https://github.com/iarna/aproba",
     "publisher": "Rebecca Turner",
     "email": "me@re-becca.org",
-    "path": "/Users/pau/git/moodleapp5/node_modules/aproba",
-    "licenseFile": "node_modules/aproba/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "are-we-there-yet@1.1.5": {
     "licenses": "ISC",
     "repository": "https://github.com/iarna/are-we-there-yet",
     "publisher": "Rebecca Turner",
     "url": "http://re-becca.org",
-    "path": "/Users/pau/git/moodleapp5/node_modules/are-we-there-yet",
-    "licenseFile": "node_modules/are-we-there-yet/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "array-find-index@1.0.2": {
     "licenses": "MIT",
@@ -466,8 +511,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/array-find-index",
-    "licenseFile": "node_modules/array-find-index/license"
+    "licenseFile": "license"
   },
   "array-flatten@1.1.1": {
     "licenses": "MIT",
@@ -475,8 +519,7 @@
     "publisher": "Blake Embrey",
     "email": "hello@blakeembrey.com",
     "url": "http://blakeembrey.me",
-    "path": "/Users/pau/git/moodleapp5/node_modules/array-flatten",
-    "licenseFile": "node_modules/array-flatten/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "array-union@2.1.0": {
     "licenses": "MIT",
@@ -484,47 +527,41 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/array-union",
-    "licenseFile": "node_modules/array-union/license"
+    "licenseFile": "license"
   },
   "asn1@0.2.4": {
     "licenses": "MIT",
     "repository": "https://github.com/joyent/node-asn1",
     "publisher": "Joyent",
     "url": "joyent.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/asn1",
-    "licenseFile": "node_modules/asn1/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "assert-plus@1.0.0": {
     "licenses": "MIT",
     "repository": "https://github.com/mcavage/node-assert-plus",
     "publisher": "Mark Cavage",
     "email": "mcavage@gmail.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/assert-plus",
-    "licenseFile": "node_modules/assert-plus/README.md"
+    "licenseFile": "README.md"
   },
   "async@2.6.3": {
     "licenses": "MIT",
     "repository": "https://github.com/caolan/async",
     "publisher": "Caolan McMahon",
-    "path": "/Users/pau/git/moodleapp5/node_modules/async",
-    "licenseFile": "node_modules/async/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "asynckit@0.4.0": {
     "licenses": "MIT",
     "repository": "https://github.com/alexindigo/asynckit",
     "publisher": "Alex Indigo",
     "email": "iam@alexindigo.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/asynckit",
-    "licenseFile": "node_modules/asynckit/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "at-least-node@1.0.0": {
     "licenses": "ISC",
     "repository": "https://github.com/RyanZim/at-least-node",
     "publisher": "Ryan Zimmerman",
     "email": "opensrc@ryanzim.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/at-least-node",
-    "licenseFile": "node_modules/at-least-node/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "aws-sign2@0.7.0": {
     "licenses": "Apache-2.0",
@@ -532,8 +569,7 @@
     "publisher": "Mikeal Rogers",
     "email": "mikeal.rogers@gmail.com",
     "url": "http://www.futurealoof.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/aws-sign2",
-    "licenseFile": "node_modules/aws-sign2/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "aws4@1.10.1": {
     "licenses": "MIT",
@@ -541,15 +577,7 @@
     "publisher": "Michael Hart",
     "email": "michael.hart.au@gmail.com",
     "url": "https://github.com/mhart",
-    "path": "/Users/pau/git/moodleapp5/node_modules/aws4",
-    "licenseFile": "node_modules/aws4/LICENSE"
-  },
-  "babel-plugin-add-header-comment@1.0.3": {
-    "licenses": "MIT",
-    "repository": "https://github.com/shopify/babel-plugin-add-header-comment",
-    "publisher": "Shopify Inc.",
-    "path": "/Users/pau/git/moodleapp5/node_modules/babel-plugin-add-header-comment",
-    "licenseFile": "node_modules/babel-plugin-add-header-comment/LICENSE.md"
+    "licenseFile": "LICENSE"
   },
   "balanced-match@1.0.0": {
     "licenses": "MIT",
@@ -557,42 +585,36 @@
     "publisher": "Julian Gruber",
     "email": "mail@juliangruber.com",
     "url": "http://juliangruber.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/balanced-match",
-    "licenseFile": "node_modules/balanced-match/LICENSE.md"
+    "licenseFile": "LICENSE.md"
   },
   "base64-js@1.3.1": {
     "licenses": "MIT",
     "repository": "https://github.com/beatgammit/base64-js",
     "publisher": "T. Jameson Little",
     "email": "t.jameson.little@gmail.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/base64-js",
-    "licenseFile": "node_modules/base64-js/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "bcrypt-pbkdf@1.0.2": {
     "licenses": "BSD-3-Clause",
     "repository": "https://github.com/joyent/node-bcrypt-pbkdf",
-    "path": "/Users/pau/git/moodleapp5/node_modules/bcrypt-pbkdf",
-    "licenseFile": "node_modules/bcrypt-pbkdf/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "big-integer@1.6.48": {
     "licenses": "Unlicense",
     "repository": "https://github.com/peterolson/BigInteger.js",
     "publisher": "Peter Olson",
     "email": "peter.e.c.olson+npm@gmail.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/big-integer",
-    "licenseFile": "node_modules/big-integer/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "bl@4.0.3": {
     "licenses": "MIT",
     "repository": "https://github.com/rvagg/bl",
-    "path": "/Users/pau/git/moodleapp5/node_modules/bl",
-    "licenseFile": "node_modules/bl/LICENSE.md"
+    "licenseFile": "LICENSE.md"
   },
   "body-parser@1.19.0": {
     "licenses": "MIT",
     "repository": "https://github.com/expressjs/body-parser",
-    "path": "/Users/pau/git/moodleapp5/node_modules/body-parser",
-    "licenseFile": "node_modules/body-parser/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "boxen@4.2.0": {
     "licenses": "MIT",
@@ -600,31 +622,27 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/boxen",
-    "licenseFile": "node_modules/boxen/license"
+    "licenseFile": "license"
   },
   "bplist-creator@0.0.8": {
     "licenses": "MIT",
     "repository": "https://github.com/nearinfinity/node-bplist-creator",
     "publisher": "Joe Ferner",
-    "path": "/Users/pau/git/moodleapp5/node_modules/bplist-creator",
-    "licenseFile": "node_modules/bplist-creator/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "bplist-parser@0.0.6": {
     "licenses": "MIT",
     "repository": "https://github.com/nearinfinity/node-bplist-parser",
     "publisher": "Joe Ferner",
     "email": "joe.ferner@nearinfinity.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/ios-sim/node_modules/bplist-parser",
-    "licenseFile": "node_modules/ios-sim/node_modules/bplist-parser/README.md"
+    "licenseFile": "README.md"
   },
   "bplist-parser@0.2.0": {
     "licenses": "MIT",
     "repository": "https://github.com/nearinfinity/node-bplist-parser",
     "publisher": "Joe Ferner",
     "email": "joe.ferner@nearinfinity.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/bplist-parser",
-    "licenseFile": "node_modules/bplist-parser/README.md"
+    "licenseFile": "README.md"
   },
   "brace-expansion@1.1.11": {
     "licenses": "MIT",
@@ -632,16 +650,14 @@
     "publisher": "Julian Gruber",
     "email": "mail@juliangruber.com",
     "url": "http://juliangruber.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/brace-expansion",
-    "licenseFile": "node_modules/brace-expansion/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "braces@3.0.2": {
     "licenses": "MIT",
     "repository": "https://github.com/micromatch/braces",
     "publisher": "Jon Schlinkert",
     "url": "https://github.com/jonschlinkert",
-    "path": "/Users/pau/git/moodleapp5/node_modules/braces",
-    "licenseFile": "node_modules/braces/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "buffer@5.7.1": {
     "licenses": "MIT",
@@ -649,14 +665,12 @@
     "publisher": "Feross Aboukhadijeh",
     "email": "feross@feross.org",
     "url": "https://feross.org",
-    "path": "/Users/pau/git/moodleapp5/node_modules/bl/node_modules/buffer",
-    "licenseFile": "node_modules/bl/node_modules/buffer/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "builtins@1.0.3": {
     "licenses": "MIT",
     "repository": "https://github.com/juliangruber/builtins",
-    "path": "/Users/pau/git/moodleapp5/node_modules/builtins",
-    "licenseFile": "node_modules/builtins/License"
+    "licenseFile": "License"
   },
   "bytes@3.0.0": {
     "licenses": "MIT",
@@ -664,8 +678,7 @@
     "publisher": "TJ Holowaychuk",
     "email": "tj@vision-media.ca",
     "url": "http://tjholowaychuk.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/bytes",
-    "licenseFile": "node_modules/bytes/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "bytes@3.1.0": {
     "licenses": "MIT",
@@ -673,8 +686,12 @@
     "publisher": "TJ Holowaychuk",
     "email": "tj@vision-media.ca",
     "url": "http://tjholowaychuk.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/body-parser/node_modules/bytes",
-    "licenseFile": "node_modules/body-parser/node_modules/bytes/LICENSE"
+    "licenseFile": "LICENSE"
+  },
+  "cacache@15.2.0": {
+    "licenses": "ISC",
+    "repository": "https://github.com/npm/cacache",
+    "licenseFile": "LICENSE.md"
   },
   "cacheable-request@6.1.0": {
     "licenses": "MIT",
@@ -682,8 +699,7 @@
     "publisher": "Luke Childs",
     "email": "lukechilds123@gmail.com",
     "url": "http://lukechilds.co.uk",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cacheable-request",
-    "licenseFile": "node_modules/cacheable-request/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "callsites@3.1.0": {
     "licenses": "MIT",
@@ -691,8 +707,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/callsites",
-    "licenseFile": "node_modules/callsites/license"
+    "licenseFile": "license"
   },
   "camelcase@5.3.1": {
     "licenses": "MIT",
@@ -700,56 +715,48 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/camelcase",
-    "licenseFile": "node_modules/camelcase/license"
+    "licenseFile": "license"
   },
   "caseless@0.12.0": {
     "licenses": "Apache-2.0",
     "repository": "https://github.com/mikeal/caseless",
     "publisher": "Mikeal Rogers",
     "email": "mikeal.rogers@gmail.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/caseless",
-    "licenseFile": "node_modules/caseless/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "chalk@2.4.2": {
     "licenses": "MIT",
     "repository": "https://github.com/chalk/chalk",
-    "path": "/Users/pau/git/moodleapp5/node_modules/insight/node_modules/chalk",
-    "licenseFile": "node_modules/insight/node_modules/chalk/license"
+    "licenseFile": "license"
   },
   "chalk@3.0.0": {
     "licenses": "MIT",
     "repository": "https://github.com/chalk/chalk",
-    "path": "/Users/pau/git/moodleapp5/node_modules/chalk",
-    "licenseFile": "node_modules/chalk/license"
+    "licenseFile": "license"
   },
   "chardet@0.7.0": {
     "licenses": "MIT",
     "repository": "https://github.com/runk/node-chardet",
     "publisher": "Dmitry Shirokov",
     "email": "deadrunk@gmail.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/chardet",
-    "licenseFile": "node_modules/chardet/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "chart.js@2.9.4": {
     "licenses": "MIT",
     "repository": "https://github.com/chartjs/Chart.js",
-    "path": "/Users/pau/git/moodleapp5/node_modules/chart.js",
-    "licenseFile": "node_modules/chart.js/LICENSE.md"
+    "licenseFile": "LICENSE.md"
   },
   "chartjs-color-string@0.6.0": {
     "licenses": "MIT",
     "repository": "https://github.com/chartjs/chartjs-color-string",
     "publisher": "Heather Arthur",
     "email": "fayearthur@gmail.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/chartjs-color-string",
-    "licenseFile": "node_modules/chartjs-color-string/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "chartjs-color@2.4.1": {
     "licenses": "MIT",
     "repository": "https://github.com/chartjs/chartjs-color",
-    "path": "/Users/pau/git/moodleapp5/node_modules/chartjs-color",
-    "licenseFile": "node_modules/chartjs-color/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "chownr@1.1.4": {
     "licenses": "ISC",
@@ -757,8 +764,15 @@
     "publisher": "Isaac Z. Schlueter",
     "email": "i@izs.me",
     "url": "http://blog.izs.me/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/tar-fs/node_modules/chownr",
-    "licenseFile": "node_modules/tar-fs/node_modules/chownr/LICENSE"
+    "licenseFile": "LICENSE"
+  },
+  "chownr@2.0.0": {
+    "licenses": "ISC",
+    "repository": "https://github.com/isaacs/chownr",
+    "publisher": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "http://blog.izs.me/",
+    "licenseFile": "LICENSE"
   },
   "ci-info@2.0.0": {
     "licenses": "MIT",
@@ -766,8 +780,15 @@
     "publisher": "Thomas Watson Steen",
     "email": "w@tson.dk",
     "url": "https://twitter.com/wa7son",
-    "path": "/Users/pau/git/moodleapp5/node_modules/ci-info",
-    "licenseFile": "node_modules/ci-info/LICENSE"
+    "licenseFile": "LICENSE"
+  },
+  "clean-stack@2.2.0": {
+    "licenses": "MIT",
+    "repository": "https://github.com/sindresorhus/clean-stack",
+    "publisher": "Sindre Sorhus",
+    "email": "sindresorhus@gmail.com",
+    "url": "sindresorhus.com",
+    "licenseFile": "license"
   },
   "cli-boxes@2.2.1": {
     "licenses": "MIT",
@@ -775,8 +796,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "https://sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cli-boxes",
-    "licenseFile": "node_modules/cli-boxes/license"
+    "licenseFile": "license"
   },
   "cli-cursor@2.1.0": {
     "licenses": "MIT",
@@ -784,16 +804,14 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cli-cursor",
-    "licenseFile": "node_modules/cli-cursor/license"
+    "licenseFile": "license"
   },
   "cli-width@2.2.1": {
     "licenses": "ISC",
     "repository": "https://github.com/knownasilya/cli-width",
     "publisher": "Ilya Radchenko",
     "email": "knownasilya@gmail.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cli-width",
-    "licenseFile": "node_modules/cli-width/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "clone-response@1.0.2": {
     "licenses": "MIT",
@@ -801,8 +819,7 @@
     "publisher": "Luke Childs",
     "email": "lukechilds123@gmail.com",
     "url": "http://lukechilds.co.uk",
-    "path": "/Users/pau/git/moodleapp5/node_modules/clone-response",
-    "licenseFile": "node_modules/clone-response/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "code-point-at@1.1.0": {
     "licenses": "MIT",
@@ -810,54 +827,47 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/code-point-at",
-    "licenseFile": "node_modules/code-point-at/license"
+    "licenseFile": "license"
   },
   "color-convert@1.9.3": {
     "licenses": "MIT",
     "repository": "https://github.com/Qix-/color-convert",
     "publisher": "Heather Arthur",
     "email": "fayearthur@gmail.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/chartjs-color/node_modules/color-convert",
-    "licenseFile": "node_modules/chartjs-color/node_modules/color-convert/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "color-convert@2.0.1": {
     "licenses": "MIT",
     "repository": "https://github.com/Qix-/color-convert",
     "publisher": "Heather Arthur",
     "email": "fayearthur@gmail.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/color-convert",
-    "licenseFile": "node_modules/color-convert/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "color-name@1.1.3": {
     "licenses": "MIT",
     "repository": "https://github.com/dfcreative/color-name",
     "publisher": "DY",
     "email": "dfcreative@gmail.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/chartjs-color/node_modules/color-name",
-    "licenseFile": "node_modules/chartjs-color/node_modules/color-name/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "color-name@1.1.4": {
     "licenses": "MIT",
     "repository": "https://github.com/colorjs/color-name",
     "publisher": "DY",
     "email": "dfcreative@gmail.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/color-name",
-    "licenseFile": "node_modules/color-name/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "colors@1.4.0": {
     "licenses": "MIT",
     "repository": "https://github.com/Marak/colors.js",
     "publisher": "Marak Squires",
-    "path": "/Users/pau/git/moodleapp5/node_modules/colors",
-    "licenseFile": "node_modules/colors/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "com-darryncampbell-cordova-plugin-intent@1.3.0": {
     "licenses": "MIT",
     "repository": "https://github.com/darryncampbell/darryncampbell-cordova-plugin-intent",
     "publisher": "Darryn Campbell",
-    "path": "/Users/pau/git/moodleapp5/node_modules/com-darryncampbell-cordova-plugin-intent",
-    "licenseFile": "node_modules/com-darryncampbell-cordova-plugin-intent/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "combined-stream@1.0.8": {
     "licenses": "MIT",
@@ -865,20 +875,17 @@
     "publisher": "Felix Geisendörfer",
     "email": "felix@debuggable.com",
     "url": "http://debuggable.com/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/combined-stream",
-    "licenseFile": "node_modules/combined-stream/License"
+    "licenseFile": "License"
   },
   "compressible@2.0.18": {
     "licenses": "MIT",
     "repository": "https://github.com/jshttp/compressible",
-    "path": "/Users/pau/git/moodleapp5/node_modules/compressible",
-    "licenseFile": "node_modules/compressible/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "compression@1.7.4": {
     "licenses": "MIT",
     "repository": "https://github.com/expressjs/compression",
-    "path": "/Users/pau/git/moodleapp5/node_modules/compression",
-    "licenseFile": "node_modules/compression/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "concat-map@0.0.1": {
     "licenses": "MIT",
@@ -886,8 +893,7 @@
     "publisher": "James Halliday",
     "email": "mail@substack.net",
     "url": "http://substack.net",
-    "path": "/Users/pau/git/moodleapp5/node_modules/concat-map",
-    "licenseFile": "node_modules/concat-map/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "conf@1.4.0": {
     "licenses": "MIT",
@@ -895,8 +901,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/conf",
-    "licenseFile": "node_modules/conf/license"
+    "licenseFile": "license"
   },
   "configstore@5.0.1": {
     "licenses": "BSD-2-Clause",
@@ -904,8 +909,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/configstore",
-    "licenseFile": "node_modules/configstore/license"
+    "licenseFile": "license"
   },
   "console-control-strings@1.1.0": {
     "licenses": "ISC",
@@ -913,108 +917,94 @@
     "publisher": "Rebecca Turner",
     "email": "me@re-becca.org",
     "url": "http://re-becca.org/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/console-control-strings",
-    "licenseFile": "node_modules/console-control-strings/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "content-disposition@0.5.3": {
     "licenses": "MIT",
     "repository": "https://github.com/jshttp/content-disposition",
     "publisher": "Douglas Christopher Wilson",
     "email": "doug@somethingdoug.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/content-disposition",
-    "licenseFile": "node_modules/content-disposition/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "content-type@1.0.4": {
     "licenses": "MIT",
     "repository": "https://github.com/jshttp/content-type",
     "publisher": "Douglas Christopher Wilson",
     "email": "doug@somethingdoug.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/content-type",
-    "licenseFile": "node_modules/content-type/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "cookie-signature@1.0.6": {
     "licenses": "MIT",
     "repository": "https://github.com/visionmedia/node-cookie-signature",
     "publisher": "TJ Holowaychuk",
     "email": "tj@learnboost.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cookie-signature",
-    "licenseFile": "node_modules/cookie-signature/Readme.md"
+    "licenseFile": "Readme.md"
   },
   "cookie@0.4.0": {
     "licenses": "MIT",
     "repository": "https://github.com/jshttp/cookie",
     "publisher": "Roman Shtylman",
     "email": "shtylman@gmail.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cookie",
-    "licenseFile": "node_modules/cookie/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "cordova-android-support-gradle-release@3.0.1": {
     "licenses": "MIT",
     "publisher": "Dave Alden",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-android-support-gradle-release",
-    "licenseFile": "node_modules/cordova-android-support-gradle-release/README.md"
+    "licenseFile": "README.md"
   },
   "cordova-android@9.1.0": {
     "licenses": "Apache-2.0",
     "repository": "https://github.com/apache/cordova-android",
     "publisher": "Apache Software Foundation",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-android",
-    "licenseFile": "node_modules/cordova-android/LICENSE",
+    "licenseFile": "LICENSE",
     "noticeFile": "node_modules/cordova-android/NOTICE"
   },
   "cordova-app-hello-world@5.0.0": {
     "licenses": "Apache-2.0",
     "repository": "https://github.com/apache/cordova-app-hello-world",
     "publisher": "Apache Software Foundation",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-app-hello-world",
-    "licenseFile": "node_modules/cordova-app-hello-world/LICENSE",
+    "licenseFile": "LICENSE",
     "noticeFile": "node_modules/cordova-app-hello-world/NOTICE"
   },
   "cordova-clipboard@1.3.0": {
     "licenses": "MIT",
     "repository": "https://github.com/ihadeed/cordova-clipboard",
     "publisher": "Ibrahim Hadeed",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-clipboard",
-    "licenseFile": "node_modules/cordova-clipboard/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "cordova-common@4.0.2": {
     "licenses": "Apache-2.0",
     "repository": "https://github.com/apache/cordova-common",
     "publisher": "Apache Software Foundation",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-common",
-    "licenseFile": "node_modules/cordova-common/LICENSE",
+    "licenseFile": "LICENSE",
     "noticeFile": "node_modules/cordova-common/NOTICE"
   },
   "cordova-create@3.0.0": {
     "licenses": "Apache-2.0",
     "repository": "https://github.com/apache/cordova-create",
     "publisher": "Apache Software Foundation",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-create",
-    "licenseFile": "node_modules/cordova-create/LICENSE",
+    "licenseFile": "LICENSE",
     "noticeFile": "node_modules/cordova-create/NOTICE"
   },
-  "cordova-fetch@3.0.0": {
+  "cordova-fetch@3.0.1": {
     "licenses": "Apache-2.0",
     "repository": "https://github.com/apache/cordova-fetch",
     "publisher": "Apache Software Foundation",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-fetch",
-    "licenseFile": "node_modules/cordova-fetch/LICENSE",
+    "licenseFile": "LICENSE",
     "noticeFile": "node_modules/cordova-fetch/NOTICE"
   },
   "cordova-ios@6.2.0": {
     "licenses": "Apache-2.0",
     "repository": "https://github.com/apache/cordova-ios",
     "publisher": "Apache Software Foundation",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-ios",
-    "licenseFile": "node_modules/cordova-ios/LICENSE",
+    "licenseFile": "LICENSE",
     "noticeFile": "node_modules/cordova-ios/NOTICE"
   },
   "cordova-lib@10.0.0": {
     "licenses": "Apache-2.0",
     "repository": "https://github.com/apache/cordova-lib",
     "publisher": "Apache Software Foundation",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-lib",
-    "licenseFile": "node_modules/cordova-lib/LICENSE",
+    "licenseFile": "LICENSE",
     "noticeFile": "node_modules/cordova-lib/NOTICE"
   },
   "cordova-plugin-add-swift-support@2.0.2": {
@@ -1023,29 +1013,25 @@
     "publisher": "Alexis Kofman",
     "email": "alexis.kofman@gmail.com",
     "url": "http://twitter.com/alexiskofman",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-plugin-add-swift-support",
-    "licenseFile": "node_modules/cordova-plugin-add-swift-support/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "cordova-plugin-advanced-http@3.1.0": {
     "licenses": "MIT",
     "repository": "https://github.com/silkimen/cordova-plugin-advanced-http",
     "publisher": "Wymsee",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-plugin-advanced-http",
-    "licenseFile": "node_modules/cordova-plugin-advanced-http/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "cordova-plugin-badge@0.8.8": {
     "licenses": "Apache*",
     "repository": "https://github.com/katzer/cordova-plugin-badge",
     "publisher": "Sebastián Katzer",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-plugin-badge",
-    "licenseFile": "node_modules/cordova-plugin-badge/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "cordova-plugin-camera@5.0.1": {
     "licenses": "Apache-2.0",
     "repository": "https://github.com/apache/cordova-plugin-camera",
     "publisher": "Apache Software Foundation",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-plugin-camera",
-    "licenseFile": "node_modules/cordova-plugin-camera/LICENSE",
+    "licenseFile": "LICENSE",
     "noticeFile": "node_modules/cordova-plugin-camera/NOTICE"
   },
   "cordova-plugin-chooser@1.3.2": {
@@ -1054,8 +1040,7 @@
     "publisher": "Cyph, Inc.",
     "email": "cordova-plugin-chooser@cyph.com",
     "url": "https://github.com/cyph",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-plugin-chooser",
-    "licenseFile": "node_modules/cordova-plugin-chooser/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "cordova-plugin-customurlscheme@5.0.2": {
     "licenses": "MIT",
@@ -1063,218 +1048,157 @@
     "publisher": "Eddy Verbruggen",
     "email": "eddyverbruggen@gmail.com",
     "url": "https://github.com/EddyVerbruggen",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-plugin-customurlscheme",
-    "licenseFile": "node_modules/cordova-plugin-customurlscheme/README.md"
+    "licenseFile": "README.md"
   },
   "cordova-plugin-device@2.0.3": {
     "licenses": "Apache-2.0",
     "repository": "https://github.com/apache/cordova-plugin-device",
     "publisher": "Apache Software Foundation",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-plugin-device",
-    "licenseFile": "node_modules/cordova-plugin-device/LICENSE",
+    "licenseFile": "LICENSE",
     "noticeFile": "node_modules/cordova-plugin-device/NOTICE"
   },
   "cordova-plugin-file-opener2@3.0.5": {
     "licenses": "MIT",
     "repository": "https://github.com/pwlin/cordova-plugin-file-opener2",
     "publisher": "pwlin05@gmail.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-plugin-file-opener2",
-    "licenseFile": "node_modules/cordova-plugin-file-opener2/LICENSE"
-  },
-  "cordova-plugin-file-transfer@2.0.0-dev": {
-    "licenses": "Apache-2.0",
-    "repository": "https://github.com/apache/cordova-plugin-file-transfer",
-    "publisher": "Apache Software Foundation",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-plugin-file-transfer",
-    "licenseFile": "node_modules/cordova-plugin-file-transfer/LICENSE",
-    "noticeFile": "node_modules/cordova-plugin-file-transfer/NOTICE"
+    "licenseFile": "LICENSE"
   },
   "cordova-plugin-file@6.0.2": {
     "licenses": "Apache-2.0",
     "repository": "https://github.com/apache/cordova-plugin-file",
     "publisher": "Apache Software Foundation",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-plugin-file",
-    "licenseFile": "node_modules/cordova-plugin-file/LICENSE",
+    "licenseFile": "LICENSE",
     "noticeFile": "node_modules/cordova-plugin-file/NOTICE"
   },
   "cordova-plugin-geolocation@4.1.0": {
     "licenses": "Apache-2.0",
     "repository": "https://github.com/apache/cordova-plugin-geolocation",
     "publisher": "Apache Software Foundation",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-plugin-geolocation",
-    "licenseFile": "node_modules/cordova-plugin-geolocation/LICENSE",
+    "licenseFile": "LICENSE",
     "noticeFile": "node_modules/cordova-plugin-geolocation/NOTICE"
   },
   "cordova-plugin-globalization@1.11.0": {
     "licenses": "Apache-2.0",
     "repository": "https://github.com/apache/cordova-plugin-globalization",
     "publisher": "Apache Software Foundation",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-plugin-globalization",
-    "licenseFile": "node_modules/cordova-plugin-globalization/LICENSE",
+    "licenseFile": "LICENSE",
     "noticeFile": "node_modules/cordova-plugin-globalization/NOTICE"
   },
-  "cordova-plugin-inappbrowser@5.0.0": {
-    "licenses": "Apache-2.0",
-    "repository": "https://github.com/apache/cordova-plugin-inappbrowser",
-    "publisher": "Apache Software Foundation",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-plugin-inappbrowser",
-    "licenseFile": "node_modules/cordova-plugin-inappbrowser/LICENSE",
-    "noticeFile": "node_modules/cordova-plugin-inappbrowser/NOTICE"
-  },
   "cordova-plugin-ionic-keyboard@2.2.0": {
     "licenses": "MIT*",
     "repository": "https://github.com/ionic-team/cordova-plugin-ionic-keyboard",
     "publisher": "Apache Software Foundation",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-plugin-ionic-keyboard",
-    "licenseFile": "node_modules/cordova-plugin-ionic-keyboard/LICENSE"
-  },
-  "cordova-plugin-ionic-webview@5.0.0": {
-    "licenses": "Apache-2.0",
-    "repository": "https://github.com/ionic-team/cordova-plugin-ionic-webview",
-    "publisher": "Ionic Team",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-plugin-ionic-webview",
-    "licenseFile": "node_modules/cordova-plugin-ionic-webview/LICENSE"
-  },
-  "cordova-plugin-local-notification@0.9.0-beta.3": {
-    "licenses": "Apache*",
-    "repository": "https://github.com/katzer/cordova-plugin-local-notifications",
-    "publisher": "Sebastián Katzer",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-plugin-local-notification",
-    "licenseFile": "node_modules/cordova-plugin-local-notification/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "cordova-plugin-media-capture@3.0.3": {
     "licenses": "Apache-2.0",
     "repository": "https://github.com/apache/cordova-plugin-media-capture",
     "publisher": "Apache Software Foundation",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-plugin-media-capture",
-    "licenseFile": "node_modules/cordova-plugin-media-capture/LICENSE",
+    "licenseFile": "LICENSE",
     "noticeFile": "node_modules/cordova-plugin-media-capture/NOTICE"
   },
   "cordova-plugin-media@5.0.3": {
     "licenses": "Apache-2.0",
     "repository": "https://github.com/apache/cordova-plugin-media",
     "publisher": "Apache Software Foundation",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-plugin-media",
-    "licenseFile": "node_modules/cordova-plugin-media/LICENSE",
+    "licenseFile": "LICENSE",
     "noticeFile": "node_modules/cordova-plugin-media/NOTICE"
   },
   "cordova-plugin-network-information@2.0.2": {
     "licenses": "Apache-2.0",
     "repository": "https://github.com/apache/cordova-plugin-network-information",
     "publisher": "Apache Software Foundation",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-plugin-network-information",
-    "licenseFile": "node_modules/cordova-plugin-network-information/LICENSE",
+    "licenseFile": "LICENSE",
     "noticeFile": "node_modules/cordova-plugin-network-information/NOTICE"
   },
-  "cordova-plugin-qrscanner@3.0.1": {
-    "licenses": "MIT",
-    "repository": "https://github.com/bitpay/cordova-plugin-qrscanner",
-    "publisher": "Jason Dreyzehner",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-plugin-qrscanner",
-    "licenseFile": "node_modules/cordova-plugin-qrscanner/LICENSE"
-  },
-  "cordova-plugin-screen-orientation@3.0.2": {
+  "cordova-plugin-prevent-override@1.0.0": {
     "licenses": "Apache-2.0",
-    "repository": "https://github.com/apache/cordova-plugin-screen-orientation",
-    "publisher": "Apache Software Foundation",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-plugin-screen-orientation",
-    "licenseFile": "node_modules/cordova-plugin-screen-orientation/LICENSE"
+    "repository": "https://github.com/moodlemobile/cordova-plugin-prevent-override",
+    "publisher": "Moodle Pty Ltd",
+    "licenseFile": "LICENSE"
   },
   "cordova-plugin-splashscreen@6.0.0": {
     "licenses": "Apache-2.0",
     "repository": "https://github.com/apache/cordova-plugin-splashscreen",
     "publisher": "Apache Software Foundation",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-plugin-splashscreen",
-    "licenseFile": "node_modules/cordova-plugin-splashscreen/LICENSE",
+    "licenseFile": "LICENSE",
     "noticeFile": "node_modules/cordova-plugin-splashscreen/NOTICE"
   },
   "cordova-plugin-statusbar@2.4.3": {
     "licenses": "Apache-2.0",
     "repository": "https://github.com/apache/cordova-plugin-statusbar",
     "publisher": "Apache Software Foundation",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-plugin-statusbar",
-    "licenseFile": "node_modules/cordova-plugin-statusbar/LICENSE",
+    "licenseFile": "LICENSE",
     "noticeFile": "node_modules/cordova-plugin-statusbar/NOTICE"
   },
   "cordova-plugin-whitelist@1.3.4": {
     "licenses": "Apache-2.0",
     "repository": "https://github.com/apache/cordova-plugin-whitelist",
     "publisher": "Apache Software Foundation",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-plugin-whitelist",
-    "licenseFile": "node_modules/cordova-plugin-whitelist/LICENSE",
+    "licenseFile": "LICENSE",
     "noticeFile": "node_modules/cordova-plugin-whitelist/NOTICE"
   },
   "cordova-plugin-wkuserscript@1.0.0": {
     "licenses": "Apache-2.0",
     "repository": "https://github.com/moodlemobile/cordova-plugin-wkuserscript",
     "publisher": "Moodle Pty Ltd",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-plugin-wkuserscript",
-    "licenseFile": "node_modules/cordova-plugin-wkuserscript/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "cordova-plugin-wkwebview-cookies@1.0.0": {
     "licenses": "Apache-2.0",
     "repository": "https://github.com/moodlemobile/cordova-plugin-wkwebview-cookies",
     "publisher": "Moodle Pty Ltd",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-plugin-wkwebview-cookies",
-    "licenseFile": "node_modules/cordova-plugin-wkwebview-cookies/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "cordova-plugin-zip@3.1.0": {
     "licenses": "BSD*",
     "repository": "https://github.com/MobileChromeApps/cordova-plugin-zip",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-plugin-zip",
-    "licenseFile": "node_modules/cordova-plugin-zip/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "cordova-serve@4.0.0": {
     "licenses": "Apache-2.0",
     "repository": "https://github.com/apache/cordova-serve",
     "publisher": "Apache Software Foundation",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-serve",
-    "licenseFile": "node_modules/cordova-serve/LICENSE",
+    "licenseFile": "LICENSE",
     "noticeFile": "node_modules/cordova-serve/NOTICE"
   },
   "cordova-sqlite-storage-dependencies@4.0.0": {
     "licenses": "MIT",
     "repository": "https://github.com/brodybits/cordova-sqlite-storage-dependencies",
     "publisher": "Christopher J. Brody",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-sqlite-storage-dependencies",
-    "licenseFile": "node_modules/cordova-sqlite-storage-dependencies/README.md"
+    "licenseFile": "README.md"
   },
   "cordova-sqlite-storage@6.0.0": {
     "licenses": "MIT",
     "repository": "https://github.com/xpbrew/cordova-sqlite-storage",
     "publisher": "various",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-sqlite-storage",
-    "licenseFile": "node_modules/cordova-sqlite-storage/LICENSE.md"
+    "licenseFile": "LICENSE.md"
   },
-  "cordova-support-google-services@1.3.2": {
+  "cordova-support-google-services@1.2.1": {
     "licenses": "MIT",
     "repository": "https://github.com/chemerisuk/cordova-support-google-services",
     "publisher": "Maksim Chemerisuk",
     "email": "chemerisuk@gmail.com",
     "url": "https://github.com/chemerisuk",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-support-google-services",
-    "licenseFile": "node_modules/cordova-support-google-services/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "cordova.plugins.diagnostic@5.0.2": {
     "licenses": "MIT",
     "repository": "https://github.com/dpa99c/cordova-diagnostic-plugin",
     "publisher": "Dave Alden",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova.plugins.diagnostic",
-    "licenseFile": "node_modules/cordova.plugins.diagnostic/README.md"
+    "licenseFile": "README.md"
   },
   "cordova@10.0.0": {
     "licenses": "Apache-2.0",
     "repository": "https://github.com/apache/cordova-cli",
     "publisher": "Apache Software Foundation",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova",
-    "licenseFile": "node_modules/cordova/LICENSE",
+    "licenseFile": "LICENSE",
     "noticeFile": "node_modules/cordova/NOTICE"
   },
   "core-js@3.9.1": {
     "licenses": "MIT",
     "repository": "https://github.com/zloirock/core-js",
-    "path": "/Users/pau/git/moodleapp5/node_modules/core-js",
-    "licenseFile": "node_modules/core-js/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "core-util-is@1.0.2": {
     "licenses": "MIT",
@@ -1282,24 +1206,21 @@
     "publisher": "Isaac Z. Schlueter",
     "email": "i@izs.me",
     "url": "http://blog.izs.me/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/core-util-is",
-    "licenseFile": "node_modules/core-util-is/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "cross-spawn@6.0.5": {
     "licenses": "MIT",
     "repository": "https://github.com/moxystudio/node-cross-spawn",
     "publisher": "André Cruz",
     "email": "andre@moxy.studio",
-    "path": "/Users/pau/git/moodleapp5/node_modules/windows-release/node_modules/cross-spawn",
-    "licenseFile": "node_modules/windows-release/node_modules/cross-spawn/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "cross-spawn@7.0.3": {
     "licenses": "MIT",
     "repository": "https://github.com/moxystudio/node-cross-spawn",
     "publisher": "André Cruz",
     "email": "andre@moxy.studio",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cross-spawn",
-    "licenseFile": "node_modules/cross-spawn/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "crypto-random-string@2.0.0": {
     "licenses": "MIT",
@@ -1307,8 +1228,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/crypto-random-string",
-    "licenseFile": "node_modules/crypto-random-string/license"
+    "licenseFile": "license"
   },
   "currently-unhandled@0.4.1": {
     "licenses": "MIT",
@@ -1316,8 +1236,7 @@
     "publisher": "James Talmage",
     "email": "james@talmage.io",
     "url": "github.com/jamestalmage",
-    "path": "/Users/pau/git/moodleapp5/node_modules/currently-unhandled",
-    "licenseFile": "node_modules/currently-unhandled/license"
+    "licenseFile": "license"
   },
   "dashdash@1.14.1": {
     "licenses": "MIT",
@@ -1325,22 +1244,26 @@
     "publisher": "Trent Mick",
     "email": "trentm@gmail.com",
     "url": "http://trentm.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/dashdash",
-    "licenseFile": "node_modules/dashdash/LICENSE.txt"
+    "licenseFile": "LICENSE.txt"
   },
   "debug@2.6.9": {
     "licenses": "MIT",
     "repository": "https://github.com/visionmedia/debug",
     "publisher": "TJ Holowaychuk",
     "email": "tj@vision-media.ca",
-    "path": "/Users/pau/git/moodleapp5/node_modules/debug",
-    "licenseFile": "node_modules/debug/LICENSE"
+    "licenseFile": "LICENSE"
+  },
+  "debug@4.3.2": {
+    "licenses": "MIT",
+    "repository": "https://github.com/visionmedia/debug",
+    "publisher": "TJ Holowaychuk",
+    "email": "tj@vision-media.ca",
+    "licenseFile": "LICENSE"
   },
   "decompress-response@3.3.0": {
     "licenses": "MIT",
     "repository": "https://github.com/sindresorhus/decompress-response",
-    "path": "/Users/pau/git/moodleapp5/node_modules/decompress-response",
-    "licenseFile": "node_modules/decompress-response/license"
+    "licenseFile": "license"
   },
   "decompress-response@4.2.1": {
     "licenses": "MIT",
@@ -1348,8 +1271,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/simple-get/node_modules/decompress-response",
-    "licenseFile": "node_modules/simple-get/node_modules/decompress-response/license"
+    "licenseFile": "license"
   },
   "dedent@0.7.0": {
     "licenses": "MIT",
@@ -1357,23 +1279,20 @@
     "publisher": "Desmond Brand",
     "email": "dmnd@desmondbrand.com",
     "url": "http://desmondbrand.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/dedent",
-    "licenseFile": "node_modules/dedent/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "deep-extend@0.6.0": {
     "licenses": "MIT",
     "repository": "https://github.com/unclechu/node-deep-extend",
     "publisher": "Viacheslav Lotsmanov",
     "email": "lotsmanov89@gmail.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/deep-extend",
-    "licenseFile": "node_modules/deep-extend/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "defer-to-connect@1.1.3": {
     "licenses": "MIT",
     "repository": "https://github.com/szmarczak/defer-to-connect",
     "publisher": "Szymon Marczak",
-    "path": "/Users/pau/git/moodleapp5/node_modules/defer-to-connect",
-    "licenseFile": "node_modules/defer-to-connect/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "delayed-stream@1.0.0": {
     "licenses": "MIT",
@@ -1381,30 +1300,26 @@
     "publisher": "Felix Geisendörfer",
     "email": "felix@debuggable.com",
     "url": "http://debuggable.com/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/delayed-stream",
-    "licenseFile": "node_modules/delayed-stream/License"
+    "licenseFile": "License"
   },
   "delegates@1.0.0": {
     "licenses": "MIT",
     "repository": "https://github.com/visionmedia/node-delegates",
-    "path": "/Users/pau/git/moodleapp5/node_modules/delegates",
-    "licenseFile": "node_modules/delegates/License"
+    "licenseFile": "License"
   },
   "dep-graph@1.1.0": {
     "licenses": "MIT*",
     "repository": "https://github.com/TrevorBurnham/dep-graph",
     "publisher": "Trevor Burnham",
     "url": "http://trevorburnham.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/dep-graph",
-    "licenseFile": "node_modules/dep-graph/README.mdown"
+    "licenseFile": "README.mdown"
   },
   "depd@1.1.2": {
     "licenses": "MIT",
     "repository": "https://github.com/dougwilson/nodejs-depd",
     "publisher": "Douglas Christopher Wilson",
     "email": "doug@somethingdoug.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/depd",
-    "licenseFile": "node_modules/depd/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "destroy@1.0.4": {
     "licenses": "MIT",
@@ -1412,25 +1327,22 @@
     "publisher": "Jonathan Ong",
     "email": "me@jongleberry.com",
     "url": "http://jongleberry.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/destroy",
-    "licenseFile": "node_modules/destroy/LICENSE"
+    "licenseFile": "LICENSE"
   },
-  "detect-indent@6.0.0": {
+  "detect-indent@6.1.0": {
     "licenses": "MIT",
     "repository": "https://github.com/sindresorhus/detect-indent",
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/detect-indent",
-    "licenseFile": "node_modules/detect-indent/license"
+    "licenseFile": "license"
   },
   "detect-libc@1.0.3": {
     "licenses": "Apache-2.0",
     "repository": "https://github.com/lovell/detect-libc",
     "publisher": "Lovell Fuller",
     "email": "npm@lovell.info",
-    "path": "/Users/pau/git/moodleapp5/node_modules/detect-libc",
-    "licenseFile": "node_modules/detect-libc/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "detect-newline@3.1.0": {
     "licenses": "MIT",
@@ -1438,8 +1350,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/detect-newline",
-    "licenseFile": "node_modules/detect-newline/license"
+    "licenseFile": "license"
   },
   "dir-glob@3.0.1": {
     "licenses": "MIT",
@@ -1447,8 +1358,7 @@
     "publisher": "Kevin Mårtensson",
     "email": "kevinmartensson@gmail.com",
     "url": "github.com/kevva",
-    "path": "/Users/pau/git/moodleapp5/node_modules/dir-glob",
-    "licenseFile": "node_modules/dir-glob/license"
+    "licenseFile": "license"
   },
   "dot-prop@4.2.1": {
     "licenses": "MIT",
@@ -1456,8 +1366,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/conf/node_modules/dot-prop",
-    "licenseFile": "node_modules/conf/node_modules/dot-prop/license"
+    "licenseFile": "license"
   },
   "dot-prop@5.3.0": {
     "licenses": "MIT",
@@ -1465,8 +1374,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/dot-prop",
-    "licenseFile": "node_modules/dot-prop/license"
+    "licenseFile": "license"
   },
   "duplexer3@0.1.4": {
     "licenses": "BSD-3-Clause",
@@ -1474,8 +1382,7 @@
     "publisher": "Conrad Pankoff",
     "email": "deoxxa@fknsrs.biz",
     "url": "http://www.fknsrs.biz/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/duplexer3",
-    "licenseFile": "node_modules/duplexer3/LICENSE.md"
+    "licenseFile": "LICENSE.md"
   },
   "ecc-jsbn@0.1.2": {
     "licenses": "MIT",
@@ -1483,8 +1390,7 @@
     "publisher": "Jeremie Miller",
     "email": "jeremie@jabber.org",
     "url": "http://jeremie.com/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/ecc-jsbn",
-    "licenseFile": "node_modules/ecc-jsbn/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "editor@1.0.0": {
     "licenses": "MIT",
@@ -1492,8 +1398,7 @@
     "publisher": "James Halliday",
     "email": "mail@substack.net",
     "url": "http://substack.net",
-    "path": "/Users/pau/git/moodleapp5/node_modules/editor",
-    "licenseFile": "node_modules/editor/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "ee-first@1.1.1": {
     "licenses": "MIT",
@@ -1501,15 +1406,13 @@
     "publisher": "Jonathan Ong",
     "email": "me@jongleberry.com",
     "url": "http://jongleberry.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/ee-first",
-    "licenseFile": "node_modules/ee-first/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "elementtree@0.1.7": {
     "licenses": "Apache-2.0",
     "repository": "https://github.com/racker/node-elementtree",
     "publisher": "Rackspace US, Inc.",
-    "path": "/Users/pau/git/moodleapp5/node_modules/elementtree",
-    "licenseFile": "node_modules/elementtree/LICENSE.txt",
+    "licenseFile": "LICENSE.txt",
     "noticeFile": "node_modules/elementtree/NOTICE"
   },
   "emoji-regex@7.0.3": {
@@ -1517,38 +1420,39 @@
     "repository": "https://github.com/mathiasbynens/emoji-regex",
     "publisher": "Mathias Bynens",
     "url": "https://mathiasbynens.be/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/emoji-regex",
-    "licenseFile": "node_modules/emoji-regex/LICENSE-MIT.txt"
+    "licenseFile": "LICENSE-MIT.txt"
   },
   "emoji-regex@8.0.0": {
     "licenses": "MIT",
     "repository": "https://github.com/mathiasbynens/emoji-regex",
     "publisher": "Mathias Bynens",
     "url": "https://mathiasbynens.be/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/boxen/node_modules/emoji-regex",
-    "licenseFile": "node_modules/boxen/node_modules/emoji-regex/LICENSE-MIT.txt"
+    "licenseFile": "LICENSE-MIT.txt"
   },
   "encodeurl@1.0.2": {
     "licenses": "MIT",
     "repository": "https://github.com/pillarjs/encodeurl",
-    "path": "/Users/pau/git/moodleapp5/node_modules/encodeurl",
-    "licenseFile": "node_modules/encodeurl/LICENSE"
+    "licenseFile": "LICENSE"
+  },
+  "encoding@0.1.13": {
+    "licenses": "MIT",
+    "repository": "https://github.com/andris9/encoding",
+    "publisher": "Andris Reinman",
+    "licenseFile": "LICENSE"
   },
   "end-of-stream@1.4.4": {
     "licenses": "MIT",
     "repository": "https://github.com/mafintosh/end-of-stream",
     "publisher": "Mathias Buus",
     "email": "mathiasbuus@gmail.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/end-of-stream",
-    "licenseFile": "node_modules/end-of-stream/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "endent@1.4.1": {
     "licenses": "MIT",
     "repository": "https://github.com/ZhouHansen/endent",
     "publisher": "zhouhancheng",
     "email": "z308114274@gmail.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/endent",
-    "licenseFile": "node_modules/endent/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "env-paths@1.0.0": {
     "licenses": "MIT",
@@ -1556,14 +1460,28 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/env-paths",
-    "licenseFile": "node_modules/env-paths/license"
+    "licenseFile": "license"
+  },
+  "env-paths@2.2.1": {
+    "licenses": "MIT",
+    "repository": "https://github.com/sindresorhus/env-paths",
+    "publisher": "Sindre Sorhus",
+    "email": "sindresorhus@gmail.com",
+    "url": "sindresorhus.com",
+    "licenseFile": "license"
+  },
+  "err-code@2.0.3": {
+    "licenses": "MIT",
+    "repository": "https://github.com/IndigoUnited/js-err-code",
+    "publisher": "IndigoUnited",
+    "email": "hello@indigounited.com",
+    "url": "http://indigounited.com",
+    "licenseFile": "README.md"
   },
   "es6-promise-plugin@4.2.2": {
     "licenses": "MIT",
     "repository": "https://github.com/vstirbu/PromisesPlugin",
-    "path": "/Users/pau/git/moodleapp5/node_modules/es6-promise-plugin",
-    "licenseFile": "node_modules/es6-promise-plugin/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "escape-goat@2.1.1": {
     "licenses": "MIT",
@@ -1571,14 +1489,12 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/escape-goat",
-    "licenseFile": "node_modules/escape-goat/license"
+    "licenseFile": "license"
   },
   "escape-html@1.0.3": {
     "licenses": "MIT",
     "repository": "https://github.com/component/escape-html",
-    "path": "/Users/pau/git/moodleapp5/node_modules/escape-html",
-    "licenseFile": "node_modules/escape-html/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "escape-string-regexp@1.0.5": {
     "licenses": "MIT",
@@ -1586,14 +1502,12 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/escape-string-regexp",
-    "licenseFile": "node_modules/escape-string-regexp/license"
+    "licenseFile": "license"
   },
   "etag@1.8.1": {
     "licenses": "MIT",
     "repository": "https://github.com/jshttp/etag",
-    "path": "/Users/pau/git/moodleapp5/node_modules/etag",
-    "licenseFile": "node_modules/etag/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "execa@1.0.0": {
     "licenses": "MIT",
@@ -1601,8 +1515,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/windows-release/node_modules/execa",
-    "licenseFile": "node_modules/windows-release/node_modules/execa/license"
+    "licenseFile": "license"
   },
   "execa@4.0.3": {
     "licenses": "MIT",
@@ -1610,24 +1523,21 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "https://sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/execa",
-    "licenseFile": "node_modules/execa/license"
+    "licenseFile": "license"
   },
   "expand-template@2.0.3": {
     "licenses": "(MIT OR WTFPL)",
     "repository": "https://github.com/ralphtheninja/expand-template",
     "publisher": "LM",
     "email": "ralphtheninja@riseup.net",
-    "path": "/Users/pau/git/moodleapp5/node_modules/expand-template",
-    "licenseFile": "node_modules/expand-template/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "express@4.17.1": {
     "licenses": "MIT",
     "repository": "https://github.com/expressjs/express",
     "publisher": "TJ Holowaychuk",
     "email": "tj@vision-media.ca",
-    "path": "/Users/pau/git/moodleapp5/node_modules/express",
-    "licenseFile": "node_modules/express/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "extend@3.0.2": {
     "licenses": "MIT",
@@ -1635,8 +1545,7 @@
     "publisher": "Stefan Thomas",
     "email": "justmoon@members.fsf.org",
     "url": "http://www.justmoon.net",
-    "path": "/Users/pau/git/moodleapp5/node_modules/extend",
-    "licenseFile": "node_modules/extend/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "external-editor@3.1.0": {
     "licenses": "MIT",
@@ -1644,43 +1553,37 @@
     "publisher": "Kevin Gravier",
     "email": "kevin@mrkmg.com",
     "url": "https://mrkmg.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/external-editor",
-    "licenseFile": "node_modules/external-editor/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "extsprintf@1.3.0": {
     "licenses": "MIT",
     "repository": "https://github.com/davepacheco/node-extsprintf",
-    "path": "/Users/pau/git/moodleapp5/node_modules/jsprim/node_modules/extsprintf",
-    "licenseFile": "node_modules/jsprim/node_modules/extsprintf/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "extsprintf@1.4.0": {
     "licenses": "MIT",
     "repository": "https://github.com/davepacheco/node-extsprintf",
-    "path": "/Users/pau/git/moodleapp5/node_modules/extsprintf",
-    "licenseFile": "node_modules/extsprintf/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "fast-deep-equal@3.1.3": {
     "licenses": "MIT",
     "repository": "https://github.com/epoberezkin/fast-deep-equal",
     "publisher": "Evgeny Poberezkin",
-    "path": "/Users/pau/git/moodleapp5/node_modules/fast-deep-equal",
-    "licenseFile": "node_modules/fast-deep-equal/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "fast-glob@3.2.4": {
     "licenses": "MIT",
     "repository": "https://github.com/mrmlnc/fast-glob",
     "publisher": "Denis Malinochkin",
     "url": "https://mrmlnc.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/fast-glob",
-    "licenseFile": "node_modules/fast-glob/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "fast-json-parse@1.0.3": {
     "licenses": "MIT",
     "repository": "https://github.com/mcollina/fast-json-parse",
     "publisher": "Matteo Collina",
     "email": "hello@matteocollina.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/fast-json-parse",
-    "licenseFile": "node_modules/fast-json-parse/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "fast-json-stable-stringify@2.1.0": {
     "licenses": "MIT",
@@ -1688,16 +1591,14 @@
     "publisher": "James Halliday",
     "email": "mail@substack.net",
     "url": "http://substack.net",
-    "path": "/Users/pau/git/moodleapp5/node_modules/fast-json-stable-stringify",
-    "licenseFile": "node_modules/fast-json-stable-stringify/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "fastq@1.8.0": {
     "licenses": "ISC",
     "repository": "https://github.com/mcollina/fastq",
     "publisher": "Matteo Collina",
     "email": "hello@matteocollina.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/fastq",
-    "licenseFile": "node_modules/fastq/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "figures@2.0.0": {
     "licenses": "MIT",
@@ -1705,24 +1606,21 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/figures",
-    "licenseFile": "node_modules/figures/license"
+    "licenseFile": "license"
   },
   "fill-range@7.0.1": {
     "licenses": "MIT",
     "repository": "https://github.com/jonschlinkert/fill-range",
     "publisher": "Jon Schlinkert",
     "url": "https://github.com/jonschlinkert",
-    "path": "/Users/pau/git/moodleapp5/node_modules/fill-range",
-    "licenseFile": "node_modules/fill-range/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "finalhandler@1.1.2": {
     "licenses": "MIT",
     "repository": "https://github.com/pillarjs/finalhandler",
     "publisher": "Douglas Christopher Wilson",
     "email": "doug@somethingdoug.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/finalhandler",
-    "licenseFile": "node_modules/finalhandler/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "find-up@2.1.0": {
     "licenses": "MIT",
@@ -1730,8 +1628,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/find-up",
-    "licenseFile": "node_modules/find-up/license"
+    "licenseFile": "license"
   },
   "forever-agent@0.6.1": {
     "licenses": "Apache-2.0",
@@ -1739,8 +1636,7 @@
     "publisher": "Mikeal Rogers",
     "email": "mikeal.rogers@gmail.com",
     "url": "http://www.futurealoof.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/forever-agent",
-    "licenseFile": "node_modules/forever-agent/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "form-data@2.3.3": {
     "licenses": "MIT",
@@ -1748,14 +1644,12 @@
     "publisher": "Felix Geisendörfer",
     "email": "felix@debuggable.com",
     "url": "http://debuggable.com/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/form-data",
-    "licenseFile": "node_modules/form-data/License"
+    "licenseFile": "License"
   },
   "forwarded@0.1.2": {
     "licenses": "MIT",
     "repository": "https://github.com/jshttp/forwarded",
-    "path": "/Users/pau/git/moodleapp5/node_modules/forwarded",
-    "licenseFile": "node_modules/forwarded/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "fresh@0.5.2": {
     "licenses": "MIT",
@@ -1763,24 +1657,29 @@
     "publisher": "TJ Holowaychuk",
     "email": "tj@vision-media.ca",
     "url": "http://tjholowaychuk.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/fresh",
-    "licenseFile": "node_modules/fresh/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "fs-constants@1.0.0": {
     "licenses": "MIT",
     "repository": "https://github.com/mafintosh/fs-constants",
     "publisher": "Mathias Buus",
     "url": "@mafintosh",
-    "path": "/Users/pau/git/moodleapp5/node_modules/fs-constants",
-    "licenseFile": "node_modules/fs-constants/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "fs-extra@9.1.0": {
     "licenses": "MIT",
     "repository": "https://github.com/jprichardson/node-fs-extra",
     "publisher": "JP Richardson",
     "email": "jprichardson@gmail.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/fs-extra",
-    "licenseFile": "node_modules/fs-extra/LICENSE"
+    "licenseFile": "LICENSE"
+  },
+  "fs-minipass@2.1.0": {
+    "licenses": "ISC",
+    "repository": "https://github.com/npm/fs-minipass",
+    "publisher": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "http://blog.izs.me/",
+    "licenseFile": "LICENSE"
   },
   "fs.realpath@1.0.0": {
     "licenses": "ISC",
@@ -1788,16 +1687,14 @@
     "publisher": "Isaac Z. Schlueter",
     "email": "i@izs.me",
     "url": "http://blog.izs.me/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/fs.realpath",
-    "licenseFile": "node_modules/fs.realpath/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "gauge@2.7.4": {
     "licenses": "ISC",
     "repository": "https://github.com/iarna/gauge",
     "publisher": "Rebecca Turner",
     "email": "me@re-becca.org",
-    "path": "/Users/pau/git/moodleapp5/node_modules/gauge",
-    "licenseFile": "node_modules/gauge/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "get-stream@4.1.0": {
     "licenses": "MIT",
@@ -1805,8 +1702,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/windows-release/node_modules/get-stream",
-    "licenseFile": "node_modules/windows-release/node_modules/get-stream/license"
+    "licenseFile": "license"
   },
   "get-stream@5.2.0": {
     "licenses": "MIT",
@@ -1814,16 +1710,14 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "https://sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/get-stream",
-    "licenseFile": "node_modules/get-stream/license"
+    "licenseFile": "license"
   },
   "getpass@0.1.7": {
     "licenses": "MIT",
     "repository": "https://github.com/arekinath/node-getpass",
     "publisher": "Alex Wilson",
     "email": "alex.wilson@joyent.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/getpass",
-    "licenseFile": "node_modules/getpass/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "github-from-package@0.0.0": {
     "licenses": "MIT",
@@ -1831,8 +1725,7 @@
     "publisher": "James Halliday",
     "email": "mail@substack.net",
     "url": "http://substack.net",
-    "path": "/Users/pau/git/moodleapp5/node_modules/github-from-package",
-    "licenseFile": "node_modules/github-from-package/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "glob-parent@5.1.1": {
     "licenses": "ISC",
@@ -1840,8 +1733,7 @@
     "publisher": "Gulp Team",
     "email": "team@gulpjs.com",
     "url": "https://gulpjs.com/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/glob-parent",
-    "licenseFile": "node_modules/glob-parent/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "glob@7.1.6": {
     "licenses": "ISC",
@@ -1849,17 +1741,15 @@
     "publisher": "Isaac Z. Schlueter",
     "email": "i@izs.me",
     "url": "http://blog.izs.me/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/glob",
-    "licenseFile": "node_modules/glob/LICENSE"
+    "licenseFile": "LICENSE"
   },
-  "global-dirs@2.0.1": {
+  "global-dirs@2.1.0": {
     "licenses": "MIT",
     "repository": "https://github.com/sindresorhus/global-dirs",
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
-    "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/global-dirs",
-    "licenseFile": "node_modules/global-dirs/license"
+    "url": "https://sindresorhus.com",
+    "licenseFile": "license"
   },
   "globby@11.0.1": {
     "licenses": "MIT",
@@ -1867,20 +1757,24 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/globby",
-    "licenseFile": "node_modules/globby/license"
+    "licenseFile": "license"
   },
   "got@9.6.0": {
     "licenses": "MIT",
     "repository": "https://github.com/sindresorhus/got",
-    "path": "/Users/pau/git/moodleapp5/node_modules/got",
-    "licenseFile": "node_modules/got/license"
+    "licenseFile": "license"
   },
   "graceful-fs@4.2.4": {
     "licenses": "ISC",
     "repository": "https://github.com/isaacs/node-graceful-fs",
-    "path": "/Users/pau/git/moodleapp5/node_modules/graceful-fs",
-    "licenseFile": "node_modules/graceful-fs/LICENSE"
+    "licenseFile": "LICENSE"
+  },
+  "hammerjs@2.0.8": {
+    "licenses": "MIT",
+    "repository": "https://github.com/hammerjs/hammer.js",
+    "publisher": "Jorik Tangelder",
+    "email": "j.tangelder@gmail.com",
+    "licenseFile": "LICENSE.md"
   },
   "har-schema@2.0.0": {
     "licenses": "ISC",
@@ -1888,8 +1782,7 @@
     "publisher": "Ahmad Nassri",
     "email": "ahmad@ahmadnassri.com",
     "url": "https://www.ahmadnassri.com/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/har-schema",
-    "licenseFile": "node_modules/har-schema/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "har-validator@5.1.5": {
     "licenses": "MIT",
@@ -1897,8 +1790,7 @@
     "publisher": "Ahmad Nassri",
     "email": "ahmad@ahmadnassri.com",
     "url": "https://www.ahmadnassri.com/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/har-validator",
-    "licenseFile": "node_modules/har-validator/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "has-flag@3.0.0": {
     "licenses": "MIT",
@@ -1906,8 +1798,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/insight/node_modules/has-flag",
-    "licenseFile": "node_modules/insight/node_modules/has-flag/license"
+    "licenseFile": "license"
   },
   "has-flag@4.0.0": {
     "licenses": "MIT",
@@ -1915,16 +1806,14 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/has-flag",
-    "licenseFile": "node_modules/has-flag/license"
+    "licenseFile": "license"
   },
   "has-unicode@2.0.1": {
     "licenses": "ISC",
     "repository": "https://github.com/iarna/has-unicode",
     "publisher": "Rebecca Turner",
     "email": "me@re-becca.org",
-    "path": "/Users/pau/git/moodleapp5/node_modules/has-unicode",
-    "licenseFile": "node_modules/has-unicode/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "has-yarn@2.1.0": {
     "licenses": "MIT",
@@ -1932,8 +1821,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/has-yarn",
-    "licenseFile": "node_modules/has-yarn/license"
+    "licenseFile": "license"
   },
   "hosted-git-info@2.8.8": {
     "licenses": "ISC",
@@ -1941,8 +1829,15 @@
     "publisher": "Rebecca Turner",
     "email": "me@re-becca.org",
     "url": "http://re-becca.org",
-    "path": "/Users/pau/git/moodleapp5/node_modules/init-package-json/node_modules/hosted-git-info",
-    "licenseFile": "node_modules/init-package-json/node_modules/hosted-git-info/LICENSE"
+    "licenseFile": "LICENSE"
+  },
+  "hosted-git-info@2.8.9": {
+    "licenses": "ISC",
+    "repository": "https://github.com/npm/hosted-git-info",
+    "publisher": "Rebecca Turner",
+    "email": "me@re-becca.org",
+    "url": "http://re-becca.org",
+    "licenseFile": "LICENSE"
   },
   "hosted-git-info@3.0.5": {
     "licenses": "ISC",
@@ -1950,8 +1845,15 @@
     "publisher": "Rebecca Turner",
     "email": "me@re-becca.org",
     "url": "http://re-becca.org",
-    "path": "/Users/pau/git/moodleapp5/node_modules/hosted-git-info",
-    "licenseFile": "node_modules/hosted-git-info/LICENSE"
+    "licenseFile": "LICENSE"
+  },
+  "hosted-git-info@4.0.2": {
+    "licenses": "ISC",
+    "repository": "https://github.com/npm/hosted-git-info",
+    "publisher": "Rebecca Turner",
+    "email": "me@re-becca.org",
+    "url": "http://re-becca.org",
+    "licenseFile": "LICENSE"
   },
   "http-cache-semantics@4.1.0": {
     "licenses": "BSD-2-Clause",
@@ -1959,8 +1861,7 @@
     "publisher": "Kornel Lesiński",
     "email": "kornel@geekhood.net",
     "url": "https://kornel.ski/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/http-cache-semantics",
-    "licenseFile": "node_modules/http-cache-semantics/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "http-errors@1.7.2": {
     "licenses": "MIT",
@@ -1968,15 +1869,29 @@
     "publisher": "Jonathan Ong",
     "email": "me@jongleberry.com",
     "url": "http://jongleberry.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/http-errors",
-    "licenseFile": "node_modules/http-errors/LICENSE"
+    "licenseFile": "LICENSE"
+  },
+  "http-proxy-agent@4.0.1": {
+    "licenses": "MIT",
+    "repository": "https://github.com/TooTallNate/node-http-proxy-agent",
+    "publisher": "Nathan Rajlich",
+    "email": "nathan@tootallnate.net",
+    "url": "http://n8.io/",
+    "licenseFile": "README.md"
   },
   "http-signature@1.2.0": {
     "licenses": "MIT",
     "repository": "https://github.com/joyent/node-http-signature",
     "publisher": "Joyent, Inc",
-    "path": "/Users/pau/git/moodleapp5/node_modules/http-signature",
-    "licenseFile": "node_modules/http-signature/LICENSE"
+    "licenseFile": "LICENSE"
+  },
+  "https-proxy-agent@5.0.0": {
+    "licenses": "MIT",
+    "repository": "https://github.com/TooTallNate/node-https-proxy-agent",
+    "publisher": "Nathan Rajlich",
+    "email": "nathan@tootallnate.net",
+    "url": "http://n8.io/",
+    "licenseFile": "README.md"
   },
   "human-signals@1.1.1": {
     "licenses": "Apache-2.0",
@@ -1984,16 +1899,29 @@
     "publisher": "ehmicky",
     "email": "ehmicky@gmail.com",
     "url": "https://github.com/ehmicky",
-    "path": "/Users/pau/git/moodleapp5/node_modules/human-signals",
-    "licenseFile": "node_modules/human-signals/LICENSE"
+    "licenseFile": "LICENSE"
+  },
+  "humanize-ms@1.2.1": {
+    "licenses": "MIT",
+    "repository": "https://github.com/node-modules/humanize-ms",
+    "publisher": "dead-horse",
+    "email": "dead_horse@qq.com",
+    "url": "http://deadhorse.me",
+    "licenseFile": "LICENSE"
   },
   "iconv-lite@0.4.24": {
     "licenses": "MIT",
     "repository": "https://github.com/ashtuchkin/iconv-lite",
     "publisher": "Alexander Shtuchkin",
     "email": "ashtuchkin@gmail.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/iconv-lite",
-    "licenseFile": "node_modules/iconv-lite/LICENSE"
+    "licenseFile": "LICENSE"
+  },
+  "iconv-lite@0.6.2": {
+    "licenses": "MIT",
+    "repository": "https://github.com/ashtuchkin/iconv-lite",
+    "publisher": "Alexander Shtuchkin",
+    "email": "ashtuchkin@gmail.com",
+    "licenseFile": "LICENSE"
   },
   "ieee754@1.1.13": {
     "licenses": "BSD-3-Clause",
@@ -2001,21 +1929,26 @@
     "publisher": "Feross Aboukhadijeh",
     "email": "feross@feross.org",
     "url": "http://feross.org",
-    "path": "/Users/pau/git/moodleapp5/node_modules/ieee754",
-    "licenseFile": "node_modules/ieee754/LICENSE"
+    "licenseFile": "LICENSE"
+  },
+  "ignore-walk@3.0.3": {
+    "licenses": "ISC",
+    "repository": "https://github.com/isaacs/ignore-walk",
+    "publisher": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "http://blog.izs.me/",
+    "licenseFile": "LICENSE"
   },
   "ignore@5.1.8": {
     "licenses": "MIT",
     "repository": "https://github.com/kaelzhang/node-ignore",
     "publisher": "kael",
-    "path": "/Users/pau/git/moodleapp5/node_modules/ignore",
-    "licenseFile": "node_modules/ignore/LICENSE-MIT"
+    "licenseFile": "LICENSE-MIT"
   },
   "immediate@3.0.6": {
     "licenses": "MIT",
     "repository": "https://github.com/calvinmetcalf/immediate",
-    "path": "/Users/pau/git/moodleapp5/node_modules/immediate",
-    "licenseFile": "node_modules/immediate/LICENSE.txt"
+    "licenseFile": "LICENSE.txt"
   },
   "import-fresh@3.2.1": {
     "licenses": "MIT",
@@ -2023,8 +1956,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/import-fresh",
-    "licenseFile": "node_modules/import-fresh/license"
+    "licenseFile": "license"
   },
   "import-lazy@2.1.0": {
     "licenses": "MIT",
@@ -2032,8 +1964,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/import-lazy",
-    "licenseFile": "node_modules/import-lazy/license"
+    "licenseFile": "license"
   },
   "imurmurhash@0.1.4": {
     "licenses": "MIT",
@@ -2041,8 +1972,23 @@
     "publisher": "Jens Taylor",
     "email": "jensyt@gmail.com",
     "url": "https://github.com/homebrewing",
-    "path": "/Users/pau/git/moodleapp5/node_modules/imurmurhash",
-    "licenseFile": "node_modules/imurmurhash/README.md"
+    "licenseFile": "README.md"
+  },
+  "indent-string@4.0.0": {
+    "licenses": "MIT",
+    "repository": "https://github.com/sindresorhus/indent-string",
+    "publisher": "Sindre Sorhus",
+    "email": "sindresorhus@gmail.com",
+    "url": "sindresorhus.com",
+    "licenseFile": "license"
+  },
+  "infer-owner@1.0.4": {
+    "licenses": "ISC",
+    "repository": "https://github.com/npm/infer-owner",
+    "publisher": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "https://izs.me",
+    "licenseFile": "LICENSE"
   },
   "inflight@1.0.6": {
     "licenses": "ISC",
@@ -2050,20 +1996,17 @@
     "publisher": "Isaac Z. Schlueter",
     "email": "i@izs.me",
     "url": "http://blog.izs.me/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/inflight",
-    "licenseFile": "node_modules/inflight/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "inherits@2.0.3": {
     "licenses": "ISC",
     "repository": "https://github.com/isaacs/inherits",
-    "path": "/Users/pau/git/moodleapp5/node_modules/http-errors/node_modules/inherits",
-    "licenseFile": "node_modules/http-errors/node_modules/inherits/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "inherits@2.0.4": {
     "licenses": "ISC",
     "repository": "https://github.com/isaacs/inherits",
-    "path": "/Users/pau/git/moodleapp5/node_modules/inherits",
-    "licenseFile": "node_modules/inherits/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "ini@1.3.5": {
     "licenses": "ISC",
@@ -2071,8 +2014,15 @@
     "publisher": "Isaac Z. Schlueter",
     "email": "i@izs.me",
     "url": "http://blog.izs.me/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/ini",
-    "licenseFile": "node_modules/ini/LICENSE"
+    "licenseFile": "LICENSE"
+  },
+  "ini@1.3.7": {
+    "licenses": "ISC",
+    "repository": "https://github.com/isaacs/ini",
+    "publisher": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "http://blog.izs.me/",
+    "licenseFile": "LICENSE"
   },
   "init-package-json@1.10.3": {
     "licenses": "ISC",
@@ -2080,16 +2030,14 @@
     "publisher": "Isaac Z. Schlueter",
     "email": "i@izs.me",
     "url": "http://blog.izs.me/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/init-package-json",
-    "licenseFile": "node_modules/init-package-json/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "inquirer@6.5.2": {
     "licenses": "MIT",
     "repository": "https://github.com/SBoudrias/Inquirer.js",
     "publisher": "Simon Boudrias",
     "email": "admin@simonboudrias.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/inquirer",
-    "licenseFile": "node_modules/inquirer/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "insight@0.10.3": {
     "licenses": "BSD-2-Clause",
@@ -2097,31 +2045,20 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/insight",
-    "licenseFile": "node_modules/insight/license"
-  },
-  "install@0.8.9": {
-    "licenses": "MIT",
-    "repository": "https://github.com/benjamn/install",
-    "publisher": "Ben Newman",
-    "email": "bn@cs.stanford.edu",
-    "path": "/Users/pau/git/moodleapp5/node_modules/install",
-    "licenseFile": "node_modules/install/LICENSE"
+    "licenseFile": "license"
   },
   "ionicons@5.5.1": {
     "licenses": "MIT",
     "repository": "https://github.com/ionic-team/ionicons",
     "publisher": "Ben Sperry",
     "url": "https://twitter.com/benjsperry",
-    "path": "/Users/pau/git/moodleapp5/node_modules/ionicons",
-    "licenseFile": "node_modules/ionicons/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "ios-sim@8.0.2": {
     "licenses": "MIT",
     "repository": "https://github.com/ios-control/ios-sim",
     "publisher": "Shazron Abdullah",
-    "path": "/Users/pau/git/moodleapp5/node_modules/ios-sim",
-    "licenseFile": "node_modules/ios-sim/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "ip-regex@2.1.0": {
     "licenses": "MIT",
@@ -2129,16 +2066,21 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/ip-regex",
-    "licenseFile": "node_modules/ip-regex/license"
+    "licenseFile": "license"
+  },
+  "ip@1.1.5": {
+    "licenses": "MIT",
+    "repository": "https://github.com/indutny/node-ip",
+    "publisher": "Fedor Indutny",
+    "email": "fedor@indutny.com",
+    "licenseFile": "README.md"
   },
   "ipaddr.js@1.9.1": {
     "licenses": "MIT",
     "repository": "https://github.com/whitequark/ipaddr.js",
     "publisher": "whitequark",
     "email": "whitequark@whitequark.org",
-    "path": "/Users/pau/git/moodleapp5/node_modules/ipaddr.js",
-    "licenseFile": "node_modules/ipaddr.js/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "is-ci@2.0.0": {
     "licenses": "MIT",
@@ -2146,8 +2088,7 @@
     "publisher": "Thomas Watson Steen",
     "email": "w@tson.dk",
     "url": "https://twitter.com/wa7son",
-    "path": "/Users/pau/git/moodleapp5/node_modules/is-ci",
-    "licenseFile": "node_modules/is-ci/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "is-docker@2.1.1": {
     "licenses": "MIT",
@@ -2155,16 +2096,14 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "https://sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/is-docker",
-    "licenseFile": "node_modules/is-docker/license"
+    "licenseFile": "license"
   },
   "is-extglob@2.1.1": {
     "licenses": "MIT",
     "repository": "https://github.com/jonschlinkert/is-extglob",
     "publisher": "Jon Schlinkert",
     "url": "https://github.com/jonschlinkert",
-    "path": "/Users/pau/git/moodleapp5/node_modules/is-extglob",
-    "licenseFile": "node_modules/is-extglob/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "is-fullwidth-code-point@1.0.0": {
     "licenses": "MIT",
@@ -2172,8 +2111,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/gauge/node_modules/is-fullwidth-code-point",
-    "licenseFile": "node_modules/gauge/node_modules/is-fullwidth-code-point/license"
+    "licenseFile": "license"
   },
   "is-fullwidth-code-point@2.0.0": {
     "licenses": "MIT",
@@ -2181,8 +2119,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/is-fullwidth-code-point",
-    "licenseFile": "node_modules/is-fullwidth-code-point/license"
+    "licenseFile": "license"
   },
   "is-fullwidth-code-point@3.0.0": {
     "licenses": "MIT",
@@ -2190,16 +2127,14 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/boxen/node_modules/is-fullwidth-code-point",
-    "licenseFile": "node_modules/boxen/node_modules/is-fullwidth-code-point/license"
+    "licenseFile": "license"
   },
   "is-glob@4.0.1": {
     "licenses": "MIT",
     "repository": "https://github.com/micromatch/is-glob",
     "publisher": "Jon Schlinkert",
     "url": "https://github.com/jonschlinkert",
-    "path": "/Users/pau/git/moodleapp5/node_modules/is-glob",
-    "licenseFile": "node_modules/is-glob/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "is-installed-globally@0.3.2": {
     "licenses": "MIT",
@@ -2207,8 +2142,15 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/is-installed-globally",
-    "licenseFile": "node_modules/is-installed-globally/license"
+    "licenseFile": "license"
+  },
+  "is-lambda@1.0.1": {
+    "licenses": "MIT",
+    "repository": "https://github.com/watson/is-lambda",
+    "publisher": "Thomas Watson Steen",
+    "email": "w@tson.dk",
+    "url": "https://twitter.com/wa7son",
+    "licenseFile": "LICENSE"
   },
   "is-npm@4.0.0": {
     "licenses": "MIT",
@@ -2216,16 +2158,14 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/is-npm",
-    "licenseFile": "node_modules/is-npm/license"
+    "licenseFile": "license"
   },
   "is-number@7.0.0": {
     "licenses": "MIT",
     "repository": "https://github.com/jonschlinkert/is-number",
     "publisher": "Jon Schlinkert",
     "url": "https://github.com/jonschlinkert",
-    "path": "/Users/pau/git/moodleapp5/node_modules/is-number",
-    "licenseFile": "node_modules/is-number/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "is-obj@1.0.1": {
     "licenses": "MIT",
@@ -2233,8 +2173,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/conf/node_modules/is-obj",
-    "licenseFile": "node_modules/conf/node_modules/is-obj/license"
+    "licenseFile": "license"
   },
   "is-obj@2.0.0": {
     "licenses": "MIT",
@@ -2242,8 +2181,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/is-obj",
-    "licenseFile": "node_modules/is-obj/license"
+    "licenseFile": "license"
   },
   "is-path-inside@3.0.2": {
     "licenses": "MIT",
@@ -2251,8 +2189,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/is-path-inside",
-    "licenseFile": "node_modules/is-path-inside/license"
+    "licenseFile": "license"
   },
   "is-stream@1.1.0": {
     "licenses": "MIT",
@@ -2260,8 +2197,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/windows-release/node_modules/is-stream",
-    "licenseFile": "node_modules/windows-release/node_modules/is-stream/license"
+    "licenseFile": "license"
   },
   "is-stream@2.0.0": {
     "licenses": "MIT",
@@ -2269,8 +2205,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/is-stream",
-    "licenseFile": "node_modules/is-stream/license"
+    "licenseFile": "license"
   },
   "is-typedarray@1.0.0": {
     "licenses": "MIT",
@@ -2278,8 +2213,7 @@
     "publisher": "Hugh Kennedy",
     "email": "hughskennedy@gmail.com",
     "url": "http://hughsk.io/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/is-typedarray",
-    "licenseFile": "node_modules/is-typedarray/LICENSE.md"
+    "licenseFile": "LICENSE.md"
   },
   "is-wsl@2.2.0": {
     "licenses": "MIT",
@@ -2287,16 +2221,14 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/is-wsl",
-    "licenseFile": "node_modules/is-wsl/license"
+    "licenseFile": "license"
   },
   "is-yarn-global@0.3.0": {
     "licenses": "MIT",
     "repository": "https://github.com/LitoMore/is-yarn-global",
     "publisher": "LitoMore",
     "url": "litomore@gmail.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/is-yarn-global",
-    "licenseFile": "node_modules/is-yarn-global/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "isarray@1.0.0": {
     "licenses": "MIT",
@@ -2304,8 +2236,7 @@
     "publisher": "Julian Gruber",
     "email": "mail@juliangruber.com",
     "url": "http://juliangruber.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/isarray",
-    "licenseFile": "node_modules/isarray/README.md"
+    "licenseFile": "README.md"
   },
   "isexe@2.0.0": {
     "licenses": "ISC",
@@ -2313,31 +2244,27 @@
     "publisher": "Isaac Z. Schlueter",
     "email": "i@izs.me",
     "url": "http://blog.izs.me/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/isexe",
-    "licenseFile": "node_modules/isexe/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "isobject@4.0.0": {
     "licenses": "MIT",
     "repository": "https://github.com/jonschlinkert/isobject",
     "publisher": "Jon Schlinkert",
     "url": "https://github.com/jonschlinkert",
-    "path": "/Users/pau/git/moodleapp5/node_modules/isobject",
-    "licenseFile": "node_modules/isobject/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "isstream@0.1.2": {
     "licenses": "MIT",
     "repository": "https://github.com/rvagg/isstream",
     "publisher": "Rod Vagg",
     "email": "rod@vagg.org",
-    "path": "/Users/pau/git/moodleapp5/node_modules/isstream",
-    "licenseFile": "node_modules/isstream/LICENSE.md"
+    "licenseFile": "LICENSE.md"
   },
   "jsbn@0.1.1": {
     "licenses": "MIT",
     "repository": "https://github.com/andyperlitch/jsbn",
     "publisher": "Tom Wu",
-    "path": "/Users/pau/git/moodleapp5/node_modules/jsbn",
-    "licenseFile": "node_modules/jsbn/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "json-buffer@3.0.0": {
     "licenses": "MIT",
@@ -2345,23 +2272,20 @@
     "publisher": "Dominic Tarr",
     "email": "dominic.tarr@gmail.com",
     "url": "http://dominictarr.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/json-buffer",
-    "licenseFile": "node_modules/json-buffer/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "json-parse-even-better-errors@2.3.1": {
     "licenses": "MIT",
     "repository": "https://github.com/npm/json-parse-even-better-errors",
     "publisher": "Kat Marchán",
     "email": "kzm@zkat.tech",
-    "path": "/Users/pau/git/moodleapp5/node_modules/json-parse-even-better-errors",
-    "licenseFile": "node_modules/json-parse-even-better-errors/LICENSE.md"
+    "licenseFile": "LICENSE.md"
   },
   "json-schema-traverse@0.4.1": {
     "licenses": "MIT",
     "repository": "https://github.com/epoberezkin/json-schema-traverse",
     "publisher": "Evgeny Poberezkin",
-    "path": "/Users/pau/git/moodleapp5/node_modules/json-schema-traverse",
-    "licenseFile": "node_modules/json-schema-traverse/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "json-schema@0.2.3": {
     "licenses": [
@@ -2370,8 +2294,7 @@
     ],
     "repository": "https://github.com/kriszyp/json-schema",
     "publisher": "Kris Zyp",
-    "path": "/Users/pau/git/moodleapp5/node_modules/json-schema",
-    "licenseFile": "node_modules/json-schema/README.md"
+    "licenseFile": "README.md"
   },
   "json-stringify-safe@5.0.1": {
     "licenses": "ISC",
@@ -2379,36 +2302,38 @@
     "publisher": "Isaac Z. Schlueter",
     "email": "i@izs.me",
     "url": "http://blog.izs.me",
-    "path": "/Users/pau/git/moodleapp5/node_modules/json-stringify-safe",
-    "licenseFile": "node_modules/json-stringify-safe/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "jsonfile@6.1.0": {
     "licenses": "MIT",
     "repository": "https://github.com/jprichardson/node-jsonfile",
     "publisher": "JP Richardson",
     "email": "jprichardson@gmail.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/jsonfile",
-    "licenseFile": "node_modules/jsonfile/LICENSE"
+    "licenseFile": "LICENSE"
+  },
+  "jsonparse@1.3.1": {
+    "licenses": "MIT",
+    "repository": "https://github.com/creationix/jsonparse",
+    "publisher": "Tim Caswell",
+    "email": "tim@creationix.com",
+    "licenseFile": "LICENSE"
   },
   "jsprim@1.4.1": {
     "licenses": "MIT",
     "repository": "https://github.com/joyent/node-jsprim",
-    "path": "/Users/pau/git/moodleapp5/node_modules/jsprim",
-    "licenseFile": "node_modules/jsprim/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "jszip@3.5.0": {
     "licenses": "(MIT OR GPL-3.0)",
     "repository": "https://github.com/Stuk/jszip",
     "publisher": "Stuart Knightley",
     "email": "stuart@stuartk.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/jszip",
-    "licenseFile": "node_modules/jszip/LICENSE.markdown"
+    "licenseFile": "LICENSE.markdown"
   },
   "keytar@7.2.0": {
     "licenses": "MIT",
     "repository": "https://github.com/atom/node-keytar",
-    "path": "/Users/pau/git/moodleapp5/node_modules/keytar",
-    "licenseFile": "node_modules/keytar/LICENSE.md"
+    "licenseFile": "LICENSE.md"
   },
   "keyv@3.1.0": {
     "licenses": "MIT",
@@ -2416,8 +2341,7 @@
     "publisher": "Luke Childs",
     "email": "lukechilds123@gmail.com",
     "url": "http://lukechilds.co.uk",
-    "path": "/Users/pau/git/moodleapp5/node_modules/keyv",
-    "licenseFile": "node_modules/keyv/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "latest-version@5.1.0": {
     "licenses": "MIT",
@@ -2425,14 +2349,12 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/latest-version",
-    "licenseFile": "node_modules/latest-version/license"
+    "licenseFile": "license"
   },
   "lie@3.3.0": {
     "licenses": "MIT",
     "repository": "https://github.com/calvinmetcalf/lie",
-    "path": "/Users/pau/git/moodleapp5/node_modules/lie",
-    "licenseFile": "node_modules/lie/license.md"
+    "licenseFile": "license.md"
   },
   "locate-path@2.0.0": {
     "licenses": "MIT",
@@ -2440,8 +2362,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/locate-path",
-    "licenseFile": "node_modules/locate-path/license"
+    "licenseFile": "license"
   },
   "lodash.debounce@4.0.8": {
     "licenses": "MIT",
@@ -2449,16 +2370,14 @@
     "publisher": "John-David Dalton",
     "email": "john.david.dalton@gmail.com",
     "url": "http://allyoucanleet.com/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/lodash.debounce",
-    "licenseFile": "node_modules/lodash.debounce/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "lodash@4.17.20": {
     "licenses": "MIT",
     "repository": "https://github.com/lodash/lodash",
     "publisher": "John-David Dalton",
     "email": "john.david.dalton@gmail.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/lodash",
-    "licenseFile": "node_modules/lodash/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "loud-rejection@2.2.0": {
     "licenses": "MIT",
@@ -2466,8 +2385,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/loud-rejection",
-    "licenseFile": "node_modules/loud-rejection/license"
+    "licenseFile": "license"
   },
   "lowercase-keys@1.0.1": {
     "licenses": "MIT",
@@ -2475,8 +2393,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/lowercase-keys",
-    "licenseFile": "node_modules/lowercase-keys/license"
+    "licenseFile": "license"
   },
   "lowercase-keys@2.0.0": {
     "licenses": "MIT",
@@ -2484,16 +2401,14 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cacheable-request/node_modules/lowercase-keys",
-    "licenseFile": "node_modules/cacheable-request/node_modules/lowercase-keys/license"
+    "licenseFile": "license"
   },
   "lru-cache@6.0.0": {
     "licenses": "ISC",
     "repository": "https://github.com/isaacs/node-lru-cache",
     "publisher": "Isaac Z. Schlueter",
     "email": "i@izs.me",
-    "path": "/Users/pau/git/moodleapp5/node_modules/lru-cache",
-    "licenseFile": "node_modules/lru-cache/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "macos-release@2.4.1": {
     "licenses": "MIT",
@@ -2501,8 +2416,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "https://sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/macos-release",
-    "licenseFile": "node_modules/macos-release/license"
+    "licenseFile": "license"
   },
   "make-dir@1.3.0": {
     "licenses": "MIT",
@@ -2510,8 +2424,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/conf/node_modules/make-dir",
-    "licenseFile": "node_modules/conf/node_modules/make-dir/license"
+    "licenseFile": "license"
   },
   "make-dir@3.1.0": {
     "licenses": "MIT",
@@ -2519,28 +2432,31 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/make-dir",
-    "licenseFile": "node_modules/make-dir/license"
+    "licenseFile": "license"
+  },
+  "make-fetch-happen@9.0.4": {
+    "licenses": "ISC",
+    "repository": "https://github.com/npm/make-fetch-happen",
+    "publisher": "Kat Marchán",
+    "email": "kzm@zkat.tech",
+    "licenseFile": "LICENSE"
   },
   "mathjax@2.7.7": {
     "licenses": "Apache-2.0",
     "repository": "https://github.com/mathjax/MathJax",
-    "path": "/Users/pau/git/moodleapp5/node_modules/mathjax",
-    "licenseFile": "node_modules/mathjax/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "md5-file@5.0.0": {
     "licenses": "MIT",
     "repository": "https://github.com/roryrjb/md5-file",
-    "path": "/Users/pau/git/moodleapp5/node_modules/md5-file",
-    "licenseFile": "node_modules/md5-file/LICENSE.md"
+    "licenseFile": "LICENSE.md"
   },
   "media-typer@0.3.0": {
     "licenses": "MIT",
     "repository": "https://github.com/jshttp/media-typer",
     "publisher": "Douglas Christopher Wilson",
     "email": "doug@somethingdoug.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/media-typer",
-    "licenseFile": "node_modules/media-typer/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "merge-descriptors@1.0.1": {
     "licenses": "MIT",
@@ -2548,48 +2464,41 @@
     "publisher": "Jonathan Ong",
     "email": "me@jongleberry.com",
     "url": "http://jongleberry.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/merge-descriptors",
-    "licenseFile": "node_modules/merge-descriptors/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "merge-stream@2.0.0": {
     "licenses": "MIT",
     "repository": "https://github.com/grncdr/merge-stream",
     "publisher": "Stephen Sugden",
     "email": "me@stephensugden.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/merge-stream",
-    "licenseFile": "node_modules/merge-stream/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "merge2@1.4.1": {
     "licenses": "MIT",
     "repository": "https://github.com/teambition/merge2",
-    "path": "/Users/pau/git/moodleapp5/node_modules/merge2",
-    "licenseFile": "node_modules/merge2/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "methods@1.1.2": {
     "licenses": "MIT",
     "repository": "https://github.com/jshttp/methods",
-    "path": "/Users/pau/git/moodleapp5/node_modules/methods",
-    "licenseFile": "node_modules/methods/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "micromatch@4.0.2": {
     "licenses": "MIT",
     "repository": "https://github.com/micromatch/micromatch",
     "publisher": "Jon Schlinkert",
     "url": "https://github.com/jonschlinkert",
-    "path": "/Users/pau/git/moodleapp5/node_modules/micromatch",
-    "licenseFile": "node_modules/micromatch/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "mime-db@1.44.0": {
     "licenses": "MIT",
     "repository": "https://github.com/jshttp/mime-db",
-    "path": "/Users/pau/git/moodleapp5/node_modules/mime-db",
-    "licenseFile": "node_modules/mime-db/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "mime-types@2.1.27": {
     "licenses": "MIT",
     "repository": "https://github.com/jshttp/mime-types",
-    "path": "/Users/pau/git/moodleapp5/node_modules/mime-types",
-    "licenseFile": "node_modules/mime-types/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "mime@1.6.0": {
     "licenses": "MIT",
@@ -2597,8 +2506,7 @@
     "publisher": "Robert Kieffer",
     "email": "robert@broofa.com",
     "url": "http://github.com/broofa",
-    "path": "/Users/pau/git/moodleapp5/node_modules/mime",
-    "licenseFile": "node_modules/mime/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "mimic-fn@1.2.0": {
     "licenses": "MIT",
@@ -2606,8 +2514,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/restore-cursor/node_modules/mimic-fn",
-    "licenseFile": "node_modules/restore-cursor/node_modules/mimic-fn/license"
+    "licenseFile": "license"
   },
   "mimic-fn@2.1.0": {
     "licenses": "MIT",
@@ -2615,8 +2522,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/mimic-fn",
-    "licenseFile": "node_modules/mimic-fn/license"
+    "licenseFile": "license"
   },
   "mimic-response@1.0.1": {
     "licenses": "MIT",
@@ -2624,8 +2530,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/mimic-response",
-    "licenseFile": "node_modules/mimic-response/license"
+    "licenseFile": "license"
   },
   "mimic-response@2.1.0": {
     "licenses": "MIT",
@@ -2633,8 +2538,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "https://sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/simple-get/node_modules/mimic-response",
-    "licenseFile": "node_modules/simple-get/node_modules/mimic-response/license"
+    "licenseFile": "license"
   },
   "minimatch@3.0.4": {
     "licenses": "ISC",
@@ -2642,8 +2546,7 @@
     "publisher": "Isaac Z. Schlueter",
     "email": "i@izs.me",
     "url": "http://blog.izs.me",
-    "path": "/Users/pau/git/moodleapp5/node_modules/minimatch",
-    "licenseFile": "node_modules/minimatch/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "minimist@1.2.0": {
     "licenses": "MIT",
@@ -2651,8 +2554,7 @@
     "publisher": "James Halliday",
     "email": "mail@substack.net",
     "url": "http://substack.net",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova.plugins.diagnostic/node_modules/minimist",
-    "licenseFile": "node_modules/cordova.plugins.diagnostic/node_modules/minimist/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "minimist@1.2.5": {
     "licenses": "MIT",
@@ -2660,16 +2562,78 @@
     "publisher": "James Halliday",
     "email": "mail@substack.net",
     "url": "http://substack.net",
-    "path": "/Users/pau/git/moodleapp5/node_modules/minimist",
-    "licenseFile": "node_modules/minimist/LICENSE"
+    "licenseFile": "LICENSE"
+  },
+  "minipass-collect@1.0.2": {
+    "licenses": "ISC",
+    "publisher": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "https://izs.me",
+    "licenseFile": "LICENSE"
+  },
+  "minipass-fetch@1.3.4": {
+    "licenses": "MIT",
+    "repository": "https://github.com/npm/minipass-fetch",
+    "licenseFile": "LICENSE"
+  },
+  "minipass-flush@1.0.5": {
+    "licenses": "ISC",
+    "repository": "https://github.com/isaacs/minipass-flush",
+    "publisher": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "https://izs.me",
+    "licenseFile": "LICENSE"
+  },
+  "minipass-json-stream@1.0.1": {
+    "licenses": "MIT",
+    "repository": "https://github.com/npm/minipass-json-stream",
+    "publisher": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "https://izs.me",
+    "licenseFile": "LICENSE"
+  },
+  "minipass-pipeline@1.2.4": {
+    "licenses": "ISC",
+    "publisher": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "https://izs.me",
+    "licenseFile": "LICENSE"
+  },
+  "minipass-sized@1.0.3": {
+    "licenses": "ISC",
+    "repository": "https://github.com/isaacs/minipass-sized",
+    "publisher": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "https://izs.me",
+    "licenseFile": "LICENSE"
+  },
+  "minipass@3.1.3": {
+    "licenses": "ISC",
+    "repository": "https://github.com/isaacs/minipass",
+    "publisher": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "http://blog.izs.me/",
+    "licenseFile": "LICENSE"
+  },
+  "minizlib@2.1.2": {
+    "licenses": "MIT",
+    "repository": "https://github.com/isaacs/minizlib",
+    "publisher": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "http://blog.izs.me/",
+    "licenseFile": "LICENSE"
   },
   "mkdirp-classic@0.5.3": {
     "licenses": "MIT",
     "repository": "https://github.com/mafintosh/mkdirp-classic",
     "publisher": "Mathias Buus",
     "url": "@mafintosh",
-    "path": "/Users/pau/git/moodleapp5/node_modules/mkdirp-classic",
-    "licenseFile": "node_modules/mkdirp-classic/LICENSE"
+    "licenseFile": "LICENSE"
+  },
+  "mkdirp@1.0.4": {
+    "licenses": "MIT",
+    "repository": "https://github.com/isaacs/node-mkdirp",
+    "licenseFile": "LICENSE"
   },
   "moment@2.29.0": {
     "licenses": "MIT",
@@ -2677,28 +2641,29 @@
     "publisher": "Iskren Ivov Chernev",
     "email": "iskren.chernev@gmail.com",
     "url": "https://github.com/ichernev",
-    "path": "/Users/pau/git/moodleapp5/node_modules/moment",
-    "licenseFile": "node_modules/moment/LICENSE"
+    "licenseFile": "LICENSE"
   },
-  "moodlemobile@3.9.5": {
+  "moodlemobile@3.9.6-dev": {
     "licenses": "Apache-2.0",
-    "repository": "https://github.com/moodlehq/moodlemobile2",
+    "repository": "https://github.com/moodlehq/moodleapp",
     "publisher": "Moodle Pty Ltd.",
     "email": "mobile@moodle.com",
-    "path": "/Users/pau/git/moodleapp5",
     "licenseFile": "README.md"
   },
   "ms@2.0.0": {
     "licenses": "MIT",
     "repository": "https://github.com/zeit/ms",
-    "path": "/Users/pau/git/moodleapp5/node_modules/ms",
-    "licenseFile": "node_modules/ms/license.md"
+    "licenseFile": "license.md"
   },
   "ms@2.1.1": {
     "licenses": "MIT",
     "repository": "https://github.com/zeit/ms",
-    "path": "/Users/pau/git/moodleapp5/node_modules/send/node_modules/ms",
-    "licenseFile": "node_modules/send/node_modules/ms/license.md"
+    "licenseFile": "license.md"
+  },
+  "ms@2.1.2": {
+    "licenses": "MIT",
+    "repository": "https://github.com/zeit/ms",
+    "licenseFile": "license.md"
   },
   "mute-stream@0.0.7": {
     "licenses": "ISC",
@@ -2706,8 +2671,7 @@
     "publisher": "Isaac Z. Schlueter",
     "email": "i@izs.me",
     "url": "http://blog.izs.me/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/inquirer/node_modules/mute-stream",
-    "licenseFile": "node_modules/inquirer/node_modules/mute-stream/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "mute-stream@0.0.8": {
     "licenses": "ISC",
@@ -2715,52 +2679,52 @@
     "publisher": "Isaac Z. Schlueter",
     "email": "i@izs.me",
     "url": "http://blog.izs.me/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/mute-stream",
-    "licenseFile": "node_modules/mute-stream/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "napi-build-utils@1.0.2": {
     "licenses": "MIT",
     "repository": "https://github.com/inspiredware/napi-build-utils",
     "publisher": "Jim Schlight",
-    "path": "/Users/pau/git/moodleapp5/node_modules/napi-build-utils",
-    "licenseFile": "node_modules/napi-build-utils/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "negotiator@0.6.2": {
     "licenses": "MIT",
     "repository": "https://github.com/jshttp/negotiator",
-    "path": "/Users/pau/git/moodleapp5/node_modules/negotiator",
-    "licenseFile": "node_modules/negotiator/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "nice-try@1.0.5": {
     "licenses": "MIT",
     "repository": "https://github.com/electerious/nice-try",
-    "path": "/Users/pau/git/moodleapp5/node_modules/nice-try",
-    "licenseFile": "node_modules/nice-try/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "nl.kingsquare.cordova.background-audio@1.0.1": {
     "licenses": "MIT",
     "repository": "https://github.com/AubreyHewes/cordova-background-audio",
-    "path": "/Users/pau/git/moodleapp5/node_modules/nl.kingsquare.cordova.background-audio",
-    "licenseFile": "node_modules/nl.kingsquare.cordova.background-audio/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "node-abi@2.19.3": {
     "licenses": "MIT",
     "repository": "https://github.com/lgeiger/node-abi",
     "publisher": "Lukas Geiger",
-    "path": "/Users/pau/git/moodleapp5/node_modules/node-abi",
-    "licenseFile": "node_modules/node-abi/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "node-addon-api@3.0.2": {
     "licenses": "MIT",
     "repository": "https://github.com/nodejs/node-addon-api",
-    "path": "/Users/pau/git/moodleapp5/node_modules/node-addon-api",
-    "licenseFile": "node_modules/node-addon-api/LICENSE.md"
+    "licenseFile": "LICENSE.md"
+  },
+  "node-gyp@7.1.2": {
+    "licenses": "MIT",
+    "repository": "https://github.com/nodejs/node-gyp",
+    "publisher": "Nathan Rajlich",
+    "email": "nathan@tootallnate.net",
+    "url": "http://tootallnate.net",
+    "licenseFile": "LICENSE"
   },
   "noop-logger@0.1.1": {
     "licenses": "MIT",
     "repository": "https://github.com/segmentio/noop-logger",
-    "path": "/Users/pau/git/moodleapp5/node_modules/noop-logger",
-    "licenseFile": "node_modules/noop-logger/Readme.md"
+    "licenseFile": "Readme.md"
   },
   "nopt@1.0.9": {
     "licenses": "MIT",
@@ -2768,8 +2732,7 @@
     "publisher": "Isaac Z. Schlueter",
     "email": "i@izs.me",
     "url": "http://blog.izs.me/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/ios-sim/node_modules/nopt",
-    "licenseFile": "node_modules/ios-sim/node_modules/nopt/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "nopt@4.0.3": {
     "licenses": "ISC",
@@ -2777,8 +2740,7 @@
     "publisher": "Isaac Z. Schlueter",
     "email": "i@izs.me",
     "url": "http://blog.izs.me/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/nopt",
-    "licenseFile": "node_modules/nopt/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "nopt@5.0.0": {
     "licenses": "ISC",
@@ -2786,25 +2748,35 @@
     "publisher": "Isaac Z. Schlueter",
     "email": "i@izs.me",
     "url": "http://blog.izs.me/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-ios/node_modules/nopt",
-    "licenseFile": "node_modules/cordova-ios/node_modules/nopt/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "normalize-package-data@2.5.0": {
     "licenses": "BSD-2-Clause",
     "repository": "https://github.com/npm/normalize-package-data",
     "publisher": "Meryn Stol",
     "email": "merynstol@gmail.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/normalize-package-data",
-    "licenseFile": "node_modules/normalize-package-data/LICENSE"
+    "licenseFile": "LICENSE"
   },
-  "normalize-url@4.5.0": {
+  "normalize-url@4.5.1": {
     "licenses": "MIT",
     "repository": "https://github.com/sindresorhus/normalize-url",
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/normalize-url",
-    "licenseFile": "node_modules/normalize-url/license"
+    "licenseFile": "license"
+  },
+  "npm-bundled@1.1.1": {
+    "licenses": "ISC",
+    "repository": "https://github.com/npm/npm-bundled",
+    "publisher": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "http://blog.izs.me/",
+    "licenseFile": "LICENSE"
+  },
+  "npm-install-checks@4.0.0": {
+    "licenses": "BSD-2-Clause",
+    "repository": "https://github.com/npm/npm-install-checks",
+    "licenseFile": "LICENSE"
   },
   "npm-normalize-package-bin@1.0.1": {
     "licenses": "ISC",
@@ -2812,8 +2784,7 @@
     "publisher": "Isaac Z. Schlueter",
     "email": "i@izs.me",
     "url": "https://izs.me",
-    "path": "/Users/pau/git/moodleapp5/node_modules/npm-normalize-package-bin",
-    "licenseFile": "node_modules/npm-normalize-package-bin/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "npm-package-arg@6.1.1": {
     "licenses": "ISC",
@@ -2821,8 +2792,7 @@
     "publisher": "Isaac Z. Schlueter",
     "email": "i@izs.me",
     "url": "http://blog.izs.me/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/init-package-json/node_modules/npm-package-arg",
-    "licenseFile": "node_modules/init-package-json/node_modules/npm-package-arg/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "npm-package-arg@8.0.1": {
     "licenses": "ISC",
@@ -2830,8 +2800,44 @@
     "publisher": "Isaac Z. Schlueter",
     "email": "i@izs.me",
     "url": "http://blog.izs.me/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/npm-package-arg",
-    "licenseFile": "node_modules/npm-package-arg/LICENSE"
+    "licenseFile": "LICENSE"
+  },
+  "npm-package-arg@8.1.5": {
+    "licenses": "ISC",
+    "repository": "https://github.com/npm/npm-package-arg",
+    "publisher": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "http://blog.izs.me/",
+    "licenseFile": "LICENSE"
+  },
+  "npm-packlist@2.2.2": {
+    "licenses": "ISC",
+    "repository": "https://github.com/npm/npm-packlist",
+    "publisher": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "http://blog.izs.me/",
+    "licenseFile": "LICENSE"
+  },
+  "npm-pick-manifest@6.1.0": {
+    "licenses": "ISC",
+    "repository": "https://github.com/npm/npm-pick-manifest",
+    "publisher": "Kat Marchán",
+    "email": "kzm@sykosomatic.org",
+    "licenseFile": "LICENSE.md"
+  },
+  "npm-pick-manifest@6.1.1": {
+    "licenses": "ISC",
+    "repository": "https://github.com/npm/npm-pick-manifest",
+    "publisher": "Kat Marchán",
+    "email": "kzm@sykosomatic.org",
+    "licenseFile": "LICENSE.md"
+  },
+  "npm-registry-fetch@11.0.0": {
+    "licenses": "ISC",
+    "repository": "https://github.com/npm/npm-registry-fetch",
+    "publisher": "Kat Marchán",
+    "email": "kzm@sykosomatic.org",
+    "licenseFile": "LICENSE.md"
   },
   "npm-run-path@2.0.2": {
     "licenses": "MIT",
@@ -2839,8 +2845,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/windows-release/node_modules/npm-run-path",
-    "licenseFile": "node_modules/windows-release/node_modules/npm-run-path/license"
+    "licenseFile": "license"
   },
   "npm-run-path@4.0.1": {
     "licenses": "MIT",
@@ -2848,8 +2853,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/npm-run-path",
-    "licenseFile": "node_modules/npm-run-path/license"
+    "licenseFile": "license"
   },
   "npmlog@4.1.2": {
     "licenses": "ISC",
@@ -2857,8 +2861,7 @@
     "publisher": "Isaac Z. Schlueter",
     "email": "i@izs.me",
     "url": "http://blog.izs.me/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/npmlog",
-    "licenseFile": "node_modules/npmlog/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "number-is-nan@1.0.1": {
     "licenses": "MIT",
@@ -2866,8 +2869,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/number-is-nan",
-    "licenseFile": "node_modules/number-is-nan/license"
+    "licenseFile": "license"
   },
   "oauth-sign@0.9.0": {
     "licenses": "Apache-2.0",
@@ -2875,8 +2877,7 @@
     "publisher": "Mikeal Rogers",
     "email": "mikeal.rogers@gmail.com",
     "url": "http://www.futurealoof.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/oauth-sign",
-    "licenseFile": "node_modules/oauth-sign/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "object-assign@4.1.1": {
     "licenses": "MIT",
@@ -2884,30 +2885,26 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/object-assign",
-    "licenseFile": "node_modules/object-assign/license"
+    "licenseFile": "license"
   },
   "objectorarray@1.0.4": {
     "licenses": "ISC",
     "repository": "https://github.com/ZhouHansen/objectnotnull",
     "publisher": "zhouhancheng",
     "email": "z308114274@gmail.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/objectorarray",
-    "licenseFile": "node_modules/objectorarray/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "on-finished@2.3.0": {
     "licenses": "MIT",
     "repository": "https://github.com/jshttp/on-finished",
-    "path": "/Users/pau/git/moodleapp5/node_modules/on-finished",
-    "licenseFile": "node_modules/on-finished/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "on-headers@1.0.2": {
     "licenses": "MIT",
     "repository": "https://github.com/jshttp/on-headers",
     "publisher": "Douglas Christopher Wilson",
     "email": "doug@somethingdoug.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/on-headers",
-    "licenseFile": "node_modules/on-headers/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "once@1.4.0": {
     "licenses": "ISC",
@@ -2915,8 +2912,7 @@
     "publisher": "Isaac Z. Schlueter",
     "email": "i@izs.me",
     "url": "http://blog.izs.me/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/once",
-    "licenseFile": "node_modules/once/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "onetime@2.0.1": {
     "licenses": "MIT",
@@ -2924,8 +2920,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/restore-cursor/node_modules/onetime",
-    "licenseFile": "node_modules/restore-cursor/node_modules/onetime/license"
+    "licenseFile": "license"
   },
   "onetime@5.1.2": {
     "licenses": "MIT",
@@ -2933,8 +2928,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "https://sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/onetime",
-    "licenseFile": "node_modules/onetime/license"
+    "licenseFile": "license"
   },
   "open@7.3.0": {
     "licenses": "MIT",
@@ -2942,8 +2936,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "https://sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/open",
-    "licenseFile": "node_modules/open/license"
+    "licenseFile": "license"
   },
   "os-homedir@1.0.2": {
     "licenses": "MIT",
@@ -2951,8 +2944,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/os-homedir",
-    "licenseFile": "node_modules/os-homedir/license"
+    "licenseFile": "license"
   },
   "os-name@3.1.0": {
     "licenses": "MIT",
@@ -2960,8 +2952,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/os-name",
-    "licenseFile": "node_modules/os-name/license"
+    "licenseFile": "license"
   },
   "os-tmpdir@1.0.2": {
     "licenses": "MIT",
@@ -2969,8 +2960,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/os-tmpdir",
-    "licenseFile": "node_modules/os-tmpdir/license"
+    "licenseFile": "license"
   },
   "osenv@0.1.5": {
     "licenses": "ISC",
@@ -2978,8 +2968,7 @@
     "publisher": "Isaac Z. Schlueter",
     "email": "i@izs.me",
     "url": "http://blog.izs.me/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/osenv",
-    "licenseFile": "node_modules/osenv/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "p-cancelable@1.1.0": {
     "licenses": "MIT",
@@ -2987,8 +2976,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/p-cancelable",
-    "licenseFile": "node_modules/p-cancelable/license"
+    "licenseFile": "license"
   },
   "p-finally@1.0.0": {
     "licenses": "MIT",
@@ -2996,8 +2984,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/p-finally",
-    "licenseFile": "node_modules/p-finally/license"
+    "licenseFile": "license"
   },
   "p-limit@1.3.0": {
     "licenses": "MIT",
@@ -3005,8 +2992,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/p-limit",
-    "licenseFile": "node_modules/p-limit/license"
+    "licenseFile": "license"
   },
   "p-locate@2.0.0": {
     "licenses": "MIT",
@@ -3014,8 +3000,15 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/p-locate",
-    "licenseFile": "node_modules/p-locate/license"
+    "licenseFile": "license"
+  },
+  "p-map@4.0.0": {
+    "licenses": "MIT",
+    "repository": "https://github.com/sindresorhus/p-map",
+    "publisher": "Sindre Sorhus",
+    "email": "sindresorhus@gmail.com",
+    "url": "https://sindresorhus.com",
+    "licenseFile": "license"
   },
   "p-try@1.0.0": {
     "licenses": "MIT",
@@ -3023,8 +3016,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/p-limit/node_modules/p-try",
-    "licenseFile": "node_modules/p-limit/node_modules/p-try/license"
+    "licenseFile": "license"
   },
   "p-try@2.2.0": {
     "licenses": "MIT",
@@ -3032,8 +3024,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/p-try",
-    "licenseFile": "node_modules/p-try/license"
+    "licenseFile": "license"
   },
   "package-json@6.5.0": {
     "licenses": "MIT",
@@ -3041,14 +3032,20 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/package-json",
-    "licenseFile": "node_modules/package-json/license"
+    "licenseFile": "license"
+  },
+  "pacote@11.3.5": {
+    "licenses": "ISC",
+    "repository": "https://github.com/npm/pacote",
+    "publisher": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "https://izs.me",
+    "licenseFile": "LICENSE"
   },
   "pako@1.0.11": {
     "licenses": "(MIT AND Zlib)",
     "repository": "https://github.com/nodeca/pako",
-    "path": "/Users/pau/git/moodleapp5/node_modules/pako",
-    "licenseFile": "node_modules/pako/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "parent-module@1.0.1": {
     "licenses": "MIT",
@@ -3056,14 +3053,12 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/parent-module",
-    "licenseFile": "node_modules/parent-module/license"
+    "licenseFile": "license"
   },
   "parseurl@1.3.3": {
     "licenses": "MIT",
     "repository": "https://github.com/pillarjs/parseurl",
-    "path": "/Users/pau/git/moodleapp5/node_modules/parseurl",
-    "licenseFile": "node_modules/parseurl/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "path-exists@3.0.0": {
     "licenses": "MIT",
@@ -3071,8 +3066,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/path-exists",
-    "licenseFile": "node_modules/path-exists/license"
+    "licenseFile": "license"
   },
   "path-is-absolute@1.0.1": {
     "licenses": "MIT",
@@ -3080,8 +3074,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/path-is-absolute",
-    "licenseFile": "node_modules/path-is-absolute/license"
+    "licenseFile": "license"
   },
   "path-is-inside@1.0.2": {
     "licenses": "(WTFPL OR MIT)",
@@ -3089,8 +3082,7 @@
     "publisher": "Domenic Denicola",
     "email": "d@domenic.me",
     "url": "https://domenic.me",
-    "path": "/Users/pau/git/moodleapp5/node_modules/path-is-inside",
-    "licenseFile": "node_modules/path-is-inside/LICENSE.txt"
+    "licenseFile": "LICENSE.txt"
   },
   "path-key@2.0.1": {
     "licenses": "MIT",
@@ -3098,8 +3090,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/windows-release/node_modules/path-key",
-    "licenseFile": "node_modules/windows-release/node_modules/path-key/license"
+    "licenseFile": "license"
   },
   "path-key@3.1.1": {
     "licenses": "MIT",
@@ -3107,22 +3098,19 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/path-key",
-    "licenseFile": "node_modules/path-key/license"
+    "licenseFile": "license"
   },
   "path-parse@1.0.6": {
     "licenses": "MIT",
     "repository": "https://github.com/jbgutierrez/path-parse",
     "publisher": "Javier Blanco",
     "email": "http://jbgutierrez.info",
-    "path": "/Users/pau/git/moodleapp5/node_modules/path-parse",
-    "licenseFile": "node_modules/path-parse/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "path-to-regexp@0.1.7": {
     "licenses": "MIT",
     "repository": "https://github.com/component/path-to-regexp",
-    "path": "/Users/pau/git/moodleapp5/node_modules/path-to-regexp",
-    "licenseFile": "node_modules/path-to-regexp/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "path-type@4.0.0": {
     "licenses": "MIT",
@@ -3130,38 +3118,21 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/path-type",
-    "licenseFile": "node_modules/path-type/license"
+    "licenseFile": "license"
   },
   "performance-now@2.1.0": {
     "licenses": "MIT",
     "repository": "https://github.com/braveg1rl/performance-now",
     "publisher": "Braveg1rl",
     "email": "braveg1rl@outlook.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/performance-now",
-    "licenseFile": "node_modules/performance-now/license.txt"
-  },
-  "phonegap-plugin-multidex@1.0.0": {
-    "licenses": "MIT",
-    "repository": "https://github.com/phonegap/phonegap-plugin-multidex",
-    "publisher": "Adobe PhoneGap Team",
-    "path": "/Users/pau/git/moodleapp5/node_modules/phonegap-plugin-multidex",
-    "licenseFile": "node_modules/phonegap-plugin-multidex/README.md"
-  },
-  "phonegap-plugin-push@2.2.3": {
-    "licenses": "MIT",
-    "repository": "https://github.com/phonegap/phonegap-plugin-push",
-    "publisher": "Adobe PhoneGap Team",
-    "path": "/Users/pau/git/moodleapp5/node_modules/phonegap-plugin-push",
-    "licenseFile": "node_modules/phonegap-plugin-push/README.md"
+    "licenseFile": "license.txt"
   },
   "picomatch@2.2.2": {
     "licenses": "MIT",
     "repository": "https://github.com/micromatch/picomatch",
     "publisher": "Jon Schlinkert",
     "url": "https://github.com/jonschlinkert",
-    "path": "/Users/pau/git/moodleapp5/node_modules/picomatch",
-    "licenseFile": "node_modules/picomatch/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "pify@3.0.0": {
     "licenses": "MIT",
@@ -3169,8 +3140,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/conf/node_modules/pify",
-    "licenseFile": "node_modules/conf/node_modules/pify/license"
+    "licenseFile": "license"
   },
   "pify@4.0.1": {
     "licenses": "MIT",
@@ -3178,8 +3148,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/pify",
-    "licenseFile": "node_modules/pify/license"
+    "licenseFile": "license"
   },
   "pify@5.0.0": {
     "licenses": "MIT",
@@ -3187,8 +3156,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "https://sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-fetch/node_modules/pify",
-    "licenseFile": "node_modules/cordova-fetch/node_modules/pify/license"
+    "licenseFile": "license"
   },
   "pkg-up@2.0.0": {
     "licenses": "MIT",
@@ -3196,24 +3164,21 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/pkg-up",
-    "licenseFile": "node_modules/pkg-up/license"
+    "licenseFile": "license"
   },
   "plist@3.0.1": {
     "licenses": "MIT",
     "repository": "https://github.com/TooTallNate/node-plist",
     "publisher": "Nathan Rajlich",
     "email": "nathan@tootallnate.net",
-    "path": "/Users/pau/git/moodleapp5/node_modules/plist",
-    "licenseFile": "node_modules/plist/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "prebuild-install@6.0.0": {
     "licenses": "MIT",
     "repository": "https://github.com/prebuild/prebuild-install",
     "publisher": "Mathias Buus",
     "url": "@mafintosh",
-    "path": "/Users/pau/git/moodleapp5/node_modules/prebuild-install",
-    "licenseFile": "node_modules/prebuild-install/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "prepend-http@2.0.0": {
     "licenses": "MIT",
@@ -3221,14 +3186,28 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/prepend-http",
-    "licenseFile": "node_modules/prepend-http/license"
+    "licenseFile": "license"
   },
   "process-nextick-args@2.0.1": {
     "licenses": "MIT",
     "repository": "https://github.com/calvinmetcalf/process-nextick-args",
-    "path": "/Users/pau/git/moodleapp5/node_modules/process-nextick-args",
-    "licenseFile": "node_modules/process-nextick-args/license.md"
+    "licenseFile": "license.md"
+  },
+  "promise-inflight@1.0.1": {
+    "licenses": "ISC",
+    "repository": "https://github.com/iarna/promise-inflight",
+    "publisher": "Rebecca Turner",
+    "email": "me@re-becca.org",
+    "url": "http://re-becca.org/",
+    "licenseFile": "LICENSE"
+  },
+  "promise-retry@2.0.1": {
+    "licenses": "MIT",
+    "repository": "https://github.com/IndigoUnited/node-promise-retry",
+    "publisher": "IndigoUnited",
+    "email": "hello@indigounited.com",
+    "url": "http://indigounited.com",
+    "licenseFile": "LICENSE"
   },
   "promzard@0.3.0": {
     "licenses": "ISC",
@@ -3236,22 +3215,19 @@
     "publisher": "Isaac Z. Schlueter",
     "email": "i@izs.me",
     "url": "http://blog.izs.me/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/promzard",
-    "licenseFile": "node_modules/promzard/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "properties-parser@0.3.1": {
     "licenses": "MIT",
     "repository": "https://github.com/xavi-/node-properties-parser",
-    "path": "/Users/pau/git/moodleapp5/node_modules/properties-parser",
-    "licenseFile": "node_modules/properties-parser/README.markdown"
+    "licenseFile": "README.markdown"
   },
   "proxy-addr@2.0.6": {
     "licenses": "MIT",
     "repository": "https://github.com/jshttp/proxy-addr",
     "publisher": "Douglas Christopher Wilson",
     "email": "doug@somethingdoug.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/proxy-addr",
-    "licenseFile": "node_modules/proxy-addr/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "psl@1.8.0": {
     "licenses": "MIT",
@@ -3259,33 +3235,29 @@
     "publisher": "Lupo Montero",
     "email": "lupomontero@gmail.com",
     "url": "https://lupomontero.com/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/psl",
-    "licenseFile": "node_modules/psl/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "pump@3.0.0": {
     "licenses": "MIT",
     "repository": "https://github.com/mafintosh/pump",
     "publisher": "Mathias Buus Madsen",
     "email": "mathiasbuus@gmail.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/pump",
-    "licenseFile": "node_modules/pump/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "punycode@2.1.1": {
     "licenses": "MIT",
     "repository": "https://github.com/bestiejs/punycode.js",
     "publisher": "Mathias Bynens",
     "url": "https://mathiasbynens.be/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/punycode",
-    "licenseFile": "node_modules/punycode/LICENSE-MIT.txt"
+    "licenseFile": "LICENSE-MIT.txt"
   },
-  "pupa@2.0.1": {
+  "pupa@2.1.1": {
     "licenses": "MIT",
     "repository": "https://github.com/sindresorhus/pupa",
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/pupa",
-    "licenseFile": "node_modules/pupa/license"
+    "licenseFile": "license"
   },
   "q@1.5.1": {
     "licenses": "MIT",
@@ -3293,26 +3265,22 @@
     "publisher": "Kris Kowal",
     "email": "kris@cixar.com",
     "url": "https://github.com/kriskowal",
-    "path": "/Users/pau/git/moodleapp5/node_modules/q",
-    "licenseFile": "node_modules/q/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "qrcode-reader@1.0.4": {
     "licenses": "Apache-2.0",
     "repository": "https://github.com/edi9999/jsqrcode",
-    "path": "/Users/pau/git/moodleapp5/node_modules/qrcode-reader",
-    "licenseFile": "node_modules/qrcode-reader/COPYING"
+    "licenseFile": "COPYING"
   },
   "qs@6.5.2": {
     "licenses": "BSD-3-Clause",
     "repository": "https://github.com/ljharb/qs",
-    "path": "/Users/pau/git/moodleapp5/node_modules/request/node_modules/qs",
-    "licenseFile": "node_modules/request/node_modules/qs/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "qs@6.7.0": {
     "licenses": "BSD-3-Clause",
     "repository": "https://github.com/ljharb/qs",
-    "path": "/Users/pau/git/moodleapp5/node_modules/qs",
-    "licenseFile": "node_modules/qs/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "range-parser@1.2.1": {
     "licenses": "MIT",
@@ -3320,8 +3288,7 @@
     "publisher": "TJ Holowaychuk",
     "email": "tj@vision-media.ca",
     "url": "http://tjholowaychuk.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/range-parser",
-    "licenseFile": "node_modules/range-parser/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "raw-body@2.4.0": {
     "licenses": "MIT",
@@ -3329,8 +3296,7 @@
     "publisher": "Jonathan Ong",
     "email": "me@jongleberry.com",
     "url": "http://jongleberry.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/raw-body",
-    "licenseFile": "node_modules/raw-body/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "rc@1.2.8": {
     "licenses": "(BSD-2-Clause OR MIT OR Apache-2.0)",
@@ -3338,8 +3304,7 @@
     "publisher": "Dominic Tarr",
     "email": "dominic.tarr@gmail.com",
     "url": "dominictarr.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/rc",
-    "licenseFile": "node_modules/rc/LICENSE.APACHE2"
+    "licenseFile": "LICENSE.APACHE2"
   },
   "read-chunk@3.2.0": {
     "licenses": "MIT",
@@ -3347,8 +3312,15 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/read-chunk",
-    "licenseFile": "node_modules/read-chunk/license"
+    "licenseFile": "license"
+  },
+  "read-package-json-fast@2.0.3": {
+    "licenses": "ISC",
+    "repository": "https://github.com/npm/read-package-json-fast",
+    "publisher": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "https://izs.me",
+    "licenseFile": "LICENSE"
   },
   "read-package-json@2.1.2": {
     "licenses": "ISC",
@@ -3356,8 +3328,7 @@
     "publisher": "Isaac Z. Schlueter",
     "email": "i@izs.me",
     "url": "http://blog.izs.me/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/read-package-json",
-    "licenseFile": "node_modules/read-package-json/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "read@1.0.7": {
     "licenses": "ISC",
@@ -3365,28 +3336,24 @@
     "publisher": "Isaac Z. Schlueter",
     "email": "i@izs.me",
     "url": "http://blog.izs.me/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/read",
-    "licenseFile": "node_modules/read/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "readable-stream@2.3.7": {
     "licenses": "MIT",
     "repository": "https://github.com/nodejs/readable-stream",
-    "path": "/Users/pau/git/moodleapp5/node_modules/readable-stream",
-    "licenseFile": "node_modules/readable-stream/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "readable-stream@3.6.0": {
     "licenses": "MIT",
     "repository": "https://github.com/nodejs/readable-stream",
-    "path": "/Users/pau/git/moodleapp5/node_modules/bl/node_modules/readable-stream",
-    "licenseFile": "node_modules/bl/node_modules/readable-stream/LICENSE"
+    "licenseFile": "LICENSE"
   },
-  "registry-auth-token@4.2.0": {
+  "registry-auth-token@4.2.1": {
     "licenses": "MIT",
     "repository": "https://github.com/rexxars/registry-auth-token",
     "publisher": "Espen Hovlandsdal",
     "email": "espen@hovlandsdal.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/registry-auth-token",
-    "licenseFile": "node_modules/registry-auth-token/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "registry-url@5.1.0": {
     "licenses": "MIT",
@@ -3394,16 +3361,14 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/registry-url",
-    "licenseFile": "node_modules/registry-url/license"
+    "licenseFile": "license"
   },
   "request@2.88.2": {
     "licenses": "Apache-2.0",
     "repository": "https://github.com/request/request",
     "publisher": "Mikeal Rogers",
     "email": "mikeal.rogers@gmail.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/request",
-    "licenseFile": "node_modules/request/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "resolve-from@4.0.0": {
     "licenses": "MIT",
@@ -3411,8 +3376,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/resolve-from",
-    "licenseFile": "node_modules/resolve-from/license"
+    "licenseFile": "license"
   },
   "resolve@1.17.0": {
     "licenses": "MIT",
@@ -3420,15 +3384,13 @@
     "publisher": "James Halliday",
     "email": "mail@substack.net",
     "url": "http://substack.net",
-    "path": "/Users/pau/git/moodleapp5/node_modules/resolve",
-    "licenseFile": "node_modules/resolve/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "responselike@1.0.2": {
     "licenses": "MIT",
     "repository": "https://github.com/lukechilds/responselike",
     "publisher": "lukechilds",
-    "path": "/Users/pau/git/moodleapp5/node_modules/responselike",
-    "licenseFile": "node_modules/responselike/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "restore-cursor@2.0.0": {
     "licenses": "MIT",
@@ -3436,16 +3398,22 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/restore-cursor",
-    "licenseFile": "node_modules/restore-cursor/license"
+    "licenseFile": "license"
+  },
+  "retry@0.12.0": {
+    "licenses": "MIT",
+    "repository": "https://github.com/tim-kos/node-retry",
+    "publisher": "Tim Koschützki",
+    "email": "tim@debuggable.com",
+    "url": "http://debuggable.com/",
+    "licenseFile": "License"
   },
   "reusify@1.0.4": {
     "licenses": "MIT",
     "repository": "https://github.com/mcollina/reusify",
     "publisher": "Matteo Collina",
     "email": "hello@matteocollina.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/reusify",
-    "licenseFile": "node_modules/reusify/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "rimraf@3.0.2": {
     "licenses": "ISC",
@@ -3453,16 +3421,14 @@
     "publisher": "Isaac Z. Schlueter",
     "email": "i@izs.me",
     "url": "http://blog.izs.me/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/rimraf",
-    "licenseFile": "node_modules/rimraf/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "run-async@2.4.1": {
     "licenses": "MIT",
     "repository": "https://github.com/SBoudrias/run-async",
     "publisher": "Simon Boudrias",
     "email": "admin@simonboudrias.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/run-async",
-    "licenseFile": "node_modules/run-async/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "run-parallel@1.1.9": {
     "licenses": "MIT",
@@ -3470,16 +3436,14 @@
     "publisher": "Feross Aboukhadijeh",
     "email": "feross@feross.org",
     "url": "http://feross.org/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/run-parallel",
-    "licenseFile": "node_modules/run-parallel/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "rxjs@6.5.5": {
     "licenses": "Apache-2.0",
     "repository": "https://github.com/reactivex/rxjs",
     "publisher": "Ben Lesh",
     "email": "ben@benlesh.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/rxjs",
-    "licenseFile": "node_modules/rxjs/LICENSE.txt"
+    "licenseFile": "LICENSE.txt"
   },
   "safe-buffer@5.1.2": {
     "licenses": "MIT",
@@ -3487,8 +3451,7 @@
     "publisher": "Feross Aboukhadijeh",
     "email": "feross@feross.org",
     "url": "http://feross.org",
-    "path": "/Users/pau/git/moodleapp5/node_modules/safe-buffer",
-    "licenseFile": "node_modules/safe-buffer/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "safer-buffer@2.1.2": {
     "licenses": "MIT",
@@ -3496,8 +3459,7 @@
     "publisher": "Nikita Skovoroda",
     "email": "chalkerx@gmail.com",
     "url": "https://github.com/ChALkeR",
-    "path": "/Users/pau/git/moodleapp5/node_modules/safer-buffer",
-    "licenseFile": "node_modules/safer-buffer/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "sax@1.1.4": {
     "licenses": "ISC",
@@ -3505,15 +3467,13 @@
     "publisher": "Isaac Z. Schlueter",
     "email": "i@izs.me",
     "url": "http://blog.izs.me/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/sax",
-    "licenseFile": "node_modules/sax/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "sdp@1.5.4": {
     "licenses": "MIT",
     "repository": "https://github.com/fippo/sdp",
     "publisher": "Philipp Hancke",
-    "path": "/Users/pau/git/moodleapp5/node_modules/sdp",
-    "licenseFile": "node_modules/sdp/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "semver-diff@3.1.1": {
     "licenses": "MIT",
@@ -3521,62 +3481,53 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/semver-diff",
-    "licenseFile": "node_modules/semver-diff/license"
+    "licenseFile": "license"
   },
   "semver@5.6.0": {
     "licenses": "ISC",
     "repository": "https://github.com/npm/node-semver",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-android-support-gradle-release/node_modules/semver",
-    "licenseFile": "node_modules/cordova-android-support-gradle-release/node_modules/semver/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "semver@5.7.1": {
     "licenses": "ISC",
     "repository": "https://github.com/npm/node-semver",
-    "path": "/Users/pau/git/moodleapp5/node_modules/init-package-json/node_modules/semver",
-    "licenseFile": "node_modules/init-package-json/node_modules/semver/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "semver@6.3.0": {
     "licenses": "ISC",
     "repository": "https://github.com/npm/node-semver",
-    "path": "/Users/pau/git/moodleapp5/node_modules/make-dir/node_modules/semver",
-    "licenseFile": "node_modules/make-dir/node_modules/semver/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "semver@7.3.2": {
     "licenses": "ISC",
     "repository": "https://github.com/npm/node-semver",
-    "path": "/Users/pau/git/moodleapp5/node_modules/semver",
-    "licenseFile": "node_modules/semver/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "semver@7.3.5": {
     "licenses": "ISC",
     "repository": "https://github.com/npm/node-semver",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-android/node_modules/semver",
-    "licenseFile": "node_modules/cordova-android/node_modules/semver/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "send@0.17.1": {
     "licenses": "MIT",
     "repository": "https://github.com/pillarjs/send",
     "publisher": "TJ Holowaychuk",
     "email": "tj@vision-media.ca",
-    "path": "/Users/pau/git/moodleapp5/node_modules/send",
-    "licenseFile": "node_modules/send/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "serve-static@1.14.1": {
     "licenses": "MIT",
     "repository": "https://github.com/expressjs/serve-static",
     "publisher": "Douglas Christopher Wilson",
     "email": "doug@somethingdoug.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/serve-static",
-    "licenseFile": "node_modules/serve-static/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "set-blocking@2.0.0": {
     "licenses": "ISC",
     "repository": "https://github.com/yargs/set-blocking",
     "publisher": "Ben Coe",
     "email": "ben@npmjs.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/set-blocking",
-    "licenseFile": "node_modules/set-blocking/LICENSE.txt"
+    "licenseFile": "LICENSE.txt"
   },
   "set-immediate-shim@1.0.1": {
     "licenses": "MIT",
@@ -3584,15 +3535,13 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/set-immediate-shim",
-    "licenseFile": "node_modules/set-immediate-shim/readme.md"
+    "licenseFile": "readme.md"
   },
   "setprototypeof@1.1.1": {
     "licenses": "ISC",
     "repository": "https://github.com/wesleytodd/setprototypeof",
     "publisher": "Wes Todd",
-    "path": "/Users/pau/git/moodleapp5/node_modules/setprototypeof",
-    "licenseFile": "node_modules/setprototypeof/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "shebang-command@1.2.0": {
     "licenses": "MIT",
@@ -3600,8 +3549,7 @@
     "publisher": "Kevin Martensson",
     "email": "kevinmartensson@gmail.com",
     "url": "github.com/kevva",
-    "path": "/Users/pau/git/moodleapp5/node_modules/windows-release/node_modules/shebang-command",
-    "licenseFile": "node_modules/windows-release/node_modules/shebang-command/license"
+    "licenseFile": "license"
   },
   "shebang-command@2.0.0": {
     "licenses": "MIT",
@@ -3609,8 +3557,7 @@
     "publisher": "Kevin Mårtensson",
     "email": "kevinmartensson@gmail.com",
     "url": "github.com/kevva",
-    "path": "/Users/pau/git/moodleapp5/node_modules/shebang-command",
-    "licenseFile": "node_modules/shebang-command/license"
+    "licenseFile": "license"
   },
   "shebang-regex@1.0.0": {
     "licenses": "MIT",
@@ -3618,8 +3565,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/windows-release/node_modules/shebang-regex",
-    "licenseFile": "node_modules/windows-release/node_modules/shebang-regex/license"
+    "licenseFile": "license"
   },
   "shebang-regex@3.0.0": {
     "licenses": "MIT",
@@ -3627,31 +3573,27 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/shebang-regex",
-    "licenseFile": "node_modules/shebang-regex/license"
+    "licenseFile": "license"
   },
   "shelljs@0.2.6": {
     "licenses": "BSD*",
     "repository": "https://github.com/arturadib/shelljs",
     "publisher": "Artur Adib",
     "email": "aadib@mozilla.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/simctl/node_modules/shelljs",
-    "licenseFile": "node_modules/simctl/node_modules/shelljs/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "signal-exit@3.0.3": {
     "licenses": "ISC",
     "repository": "https://github.com/tapjs/signal-exit",
     "publisher": "Ben Coe",
     "email": "ben@npmjs.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/signal-exit",
-    "licenseFile": "node_modules/signal-exit/LICENSE.txt"
+    "licenseFile": "LICENSE.txt"
   },
   "simctl@2.0.0": {
     "licenses": "MIT",
     "repository": "https://github.com/ios-control/simctl",
     "publisher": "Shazron Abdullah",
-    "path": "/Users/pau/git/moodleapp5/node_modules/simctl",
-    "licenseFile": "node_modules/simctl/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "simple-concat@1.0.1": {
     "licenses": "MIT",
@@ -3659,8 +3601,7 @@
     "publisher": "Feross Aboukhadijeh",
     "email": "feross@feross.org",
     "url": "https://feross.org",
-    "path": "/Users/pau/git/moodleapp5/node_modules/simple-concat",
-    "licenseFile": "node_modules/simple-concat/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "simple-get@3.1.0": {
     "licenses": "MIT",
@@ -3668,15 +3609,13 @@
     "publisher": "Feross Aboukhadijeh",
     "email": "feross@feross.org",
     "url": "http://feross.org/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/simple-get",
-    "licenseFile": "node_modules/simple-get/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "simple-plist@1.1.1": {
     "licenses": "MIT",
     "repository": "https://github.com/wollardj/node-simple-plist",
     "publisher": "Joe Wollard",
-    "path": "/Users/pau/git/moodleapp5/node_modules/simple-plist",
-    "licenseFile": "node_modules/simple-plist/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "slash@3.0.0": {
     "licenses": "MIT",
@@ -3684,8 +3623,27 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/slash",
-    "licenseFile": "node_modules/slash/license"
+    "licenseFile": "license"
+  },
+  "smart-buffer@4.1.0": {
+    "licenses": "MIT",
+    "repository": "https://github.com/JoshGlazebrook/smart-buffer",
+    "publisher": "Josh Glazebrook",
+    "licenseFile": "LICENSE"
+  },
+  "socks-proxy-agent@5.0.1": {
+    "licenses": "MIT",
+    "repository": "https://github.com/TooTallNate/node-socks-proxy-agent",
+    "publisher": "Nathan Rajlich",
+    "email": "nathan@tootallnate.net",
+    "url": "http://n8.io/",
+    "licenseFile": "README.md"
+  },
+  "socks@2.3.3": {
+    "licenses": "MIT",
+    "repository": "https://github.com/JoshGlazebrook/socks",
+    "publisher": "Josh Glazebrook",
+    "licenseFile": "LICENSE"
   },
   "spdx-correct@3.1.1": {
     "licenses": "Apache-2.0",
@@ -3693,15 +3651,13 @@
     "publisher": "Kyle E. Mitchell",
     "email": "kyle@kemitchell.com",
     "url": "https://kemitchell.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/spdx-correct",
-    "licenseFile": "node_modules/spdx-correct/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "spdx-exceptions@2.3.0": {
     "licenses": "CC-BY-3.0",
     "repository": "https://github.com/kemitchell/spdx-exceptions.json",
     "publisher": "The Linux Foundation",
-    "path": "/Users/pau/git/moodleapp5/node_modules/spdx-exceptions",
-    "licenseFile": "node_modules/spdx-exceptions/README.md"
+    "licenseFile": "README.md"
   },
   "spdx-expression-parse@3.0.1": {
     "licenses": "MIT",
@@ -3709,37 +3665,39 @@
     "publisher": "Kyle E. Mitchell",
     "email": "kyle@kemitchell.com",
     "url": "https://kemitchell.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/spdx-expression-parse",
-    "licenseFile": "node_modules/spdx-expression-parse/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "spdx-license-ids@3.0.6": {
     "licenses": "CC0-1.0",
     "repository": "https://github.com/jslicense/spdx-license-ids",
     "publisher": "Shinnosuke Watanabe",
     "url": "https://github.com/shinnn",
-    "path": "/Users/pau/git/moodleapp5/node_modules/spdx-license-ids",
-    "licenseFile": "node_modules/spdx-license-ids/README.md"
+    "licenseFile": "README.md"
   },
   "sshpk@1.16.1": {
     "licenses": "MIT",
     "repository": "https://github.com/joyent/node-sshpk",
     "publisher": "Joyent, Inc",
-    "path": "/Users/pau/git/moodleapp5/node_modules/sshpk",
-    "licenseFile": "node_modules/sshpk/LICENSE"
+    "licenseFile": "LICENSE"
+  },
+  "ssri@8.0.1": {
+    "licenses": "ISC",
+    "repository": "https://github.com/npm/ssri",
+    "publisher": "Kat Marchán",
+    "email": "kzm@sykosomatic.org",
+    "licenseFile": "LICENSE.md"
   },
   "statuses@1.5.0": {
     "licenses": "MIT",
     "repository": "https://github.com/jshttp/statuses",
-    "path": "/Users/pau/git/moodleapp5/node_modules/statuses",
-    "licenseFile": "node_modules/statuses/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "stream-buffers@2.2.0": {
     "licenses": "Unlicense",
     "repository": "https://github.com/samcday/node-stream-buffer",
     "publisher": "Sam Day",
     "email": "me@samcday.com.au",
-    "path": "/Users/pau/git/moodleapp5/node_modules/stream-buffers",
-    "licenseFile": "node_modules/stream-buffers/README.md"
+    "licenseFile": "README.md"
   },
   "string-width@1.0.2": {
     "licenses": "MIT",
@@ -3747,8 +3705,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/gauge/node_modules/string-width",
-    "licenseFile": "node_modules/gauge/node_modules/string-width/license"
+    "licenseFile": "license"
   },
   "string-width@2.1.1": {
     "licenses": "MIT",
@@ -3756,8 +3713,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/string-width",
-    "licenseFile": "node_modules/string-width/license"
+    "licenseFile": "license"
   },
   "string-width@3.1.0": {
     "licenses": "MIT",
@@ -3765,39 +3721,34 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/ansi-align/node_modules/string-width",
-    "licenseFile": "node_modules/ansi-align/node_modules/string-width/license"
+    "licenseFile": "license"
   },
-  "string-width@4.2.0": {
+  "string-width@4.2.2": {
     "licenses": "MIT",
     "repository": "https://github.com/sindresorhus/string-width",
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/boxen/node_modules/string-width",
-    "licenseFile": "node_modules/boxen/node_modules/string-width/license"
+    "licenseFile": "license"
   },
   "string.prototype.codepointat@0.2.1": {
     "licenses": "MIT",
     "repository": "https://github.com/mathiasbynens/String.prototype.codePointAt",
     "publisher": "Mathias Bynens",
     "url": "https://mathiasbynens.be/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/string.prototype.codepointat",
-    "licenseFile": "node_modules/string.prototype.codepointat/LICENSE-MIT.txt"
+    "licenseFile": "LICENSE-MIT.txt"
   },
   "string_decoder@1.1.1": {
     "licenses": "MIT",
     "repository": "https://github.com/nodejs/string_decoder",
-    "path": "/Users/pau/git/moodleapp5/node_modules/string_decoder",
-    "licenseFile": "node_modules/string_decoder/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "stringify-package@1.0.1": {
     "licenses": "ISC",
     "repository": "https://github.com/npm/stringify-package",
     "publisher": "Kat Marchán",
     "email": "kzm@zkat.tech",
-    "path": "/Users/pau/git/moodleapp5/node_modules/stringify-package",
-    "licenseFile": "node_modules/stringify-package/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "strip-ansi@3.0.1": {
     "licenses": "MIT",
@@ -3805,8 +3756,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/gauge/node_modules/strip-ansi",
-    "licenseFile": "node_modules/gauge/node_modules/strip-ansi/license"
+    "licenseFile": "license"
   },
   "strip-ansi@4.0.0": {
     "licenses": "MIT",
@@ -3814,8 +3764,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/string-width/node_modules/strip-ansi",
-    "licenseFile": "node_modules/string-width/node_modules/strip-ansi/license"
+    "licenseFile": "license"
   },
   "strip-ansi@5.2.0": {
     "licenses": "MIT",
@@ -3823,8 +3772,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/strip-ansi",
-    "licenseFile": "node_modules/strip-ansi/license"
+    "licenseFile": "license"
   },
   "strip-ansi@6.0.0": {
     "licenses": "MIT",
@@ -3832,8 +3780,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/boxen/node_modules/strip-ansi",
-    "licenseFile": "node_modules/boxen/node_modules/strip-ansi/license"
+    "licenseFile": "license"
   },
   "strip-bom@4.0.0": {
     "licenses": "MIT",
@@ -3841,8 +3788,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/strip-bom",
-    "licenseFile": "node_modules/strip-bom/license"
+    "licenseFile": "license"
   },
   "strip-eof@1.0.0": {
     "licenses": "MIT",
@@ -3850,8 +3796,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/strip-eof",
-    "licenseFile": "node_modules/strip-eof/license"
+    "licenseFile": "license"
   },
   "strip-final-newline@2.0.0": {
     "licenses": "MIT",
@@ -3859,8 +3804,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/strip-final-newline",
-    "licenseFile": "node_modules/strip-final-newline/license"
+    "licenseFile": "license"
   },
   "strip-json-comments@2.0.1": {
     "licenses": "MIT",
@@ -3868,8 +3812,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/strip-json-comments",
-    "licenseFile": "node_modules/strip-json-comments/license"
+    "licenseFile": "license"
   },
   "supports-color@5.5.0": {
     "licenses": "MIT",
@@ -3877,8 +3820,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/insight/node_modules/supports-color",
-    "licenseFile": "node_modules/insight/node_modules/supports-color/license"
+    "licenseFile": "license"
   },
   "supports-color@7.2.0": {
     "licenses": "MIT",
@@ -3886,48 +3828,50 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/supports-color",
-    "licenseFile": "node_modules/supports-color/license"
+    "licenseFile": "license"
   },
-  "systeminformation@4.27.7": {
+  "systeminformation@4.34.23": {
     "licenses": "MIT",
     "repository": "https://github.com/sebhildebrandt/systeminformation",
     "publisher": "Sebastian Hildebrandt",
     "email": "hildebrandt@plus-innovations.com",
     "url": "https://plus-innovations.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/systeminformation",
-    "licenseFile": "node_modules/systeminformation/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "tail@0.4.0": {
     "licenses": "MIT*",
     "repository": "https://github.com/lucagrulla/node-tail",
     "publisher": "Luca Grulla",
-    "path": "/Users/pau/git/moodleapp5/node_modules/tail",
-    "licenseFile": "node_modules/tail/README.md"
+    "licenseFile": "README.md"
   },
   "tar-fs@2.1.1": {
     "licenses": "MIT",
     "repository": "https://github.com/mafintosh/tar-fs",
     "publisher": "Mathias Buus",
-    "path": "/Users/pau/git/moodleapp5/node_modules/tar-fs",
-    "licenseFile": "node_modules/tar-fs/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "tar-stream@2.1.4": {
     "licenses": "MIT",
     "repository": "https://github.com/mafintosh/tar-stream",
     "publisher": "Mathias Buus",
     "email": "mathiasbuus@gmail.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/tar-stream",
-    "licenseFile": "node_modules/tar-stream/LICENSE"
+    "licenseFile": "LICENSE"
   },
-  "term-size@2.2.0": {
+  "tar@6.1.1": {
+    "licenses": "ISC",
+    "repository": "https://github.com/npm/node-tar",
+    "publisher": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "http://blog.izs.me/",
+    "licenseFile": "LICENSE"
+  },
+  "term-size@2.2.1": {
     "licenses": "MIT",
     "repository": "https://github.com/sindresorhus/term-size",
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
-    "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/term-size",
-    "licenseFile": "node_modules/term-size/license"
+    "url": "https://sindresorhus.com",
+    "licenseFile": "license"
   },
   "through@2.3.8": {
     "licenses": "MIT",
@@ -3935,8 +3879,7 @@
     "publisher": "Dominic Tarr",
     "email": "dominic.tarr@gmail.com",
     "url": "dominictarr.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/through",
-    "licenseFile": "node_modules/through/LICENSE.APACHE2"
+    "licenseFile": "LICENSE.APACHE2"
   },
   "tmp@0.0.33": {
     "licenses": "MIT",
@@ -3944,8 +3887,7 @@
     "publisher": "KARASZI István",
     "email": "github@spam.raszi.hu",
     "url": "http://raszi.hu/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/external-editor/node_modules/tmp",
-    "licenseFile": "node_modules/external-editor/node_modules/tmp/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "tmp@0.2.1": {
     "licenses": "MIT",
@@ -3953,8 +3895,7 @@
     "publisher": "KARASZI István",
     "email": "github@spam.raszi.hu",
     "url": "http://raszi.hu/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/tmp",
-    "licenseFile": "node_modules/tmp/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "to-readable-stream@1.0.0": {
     "licenses": "MIT",
@@ -3962,74 +3903,64 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/to-readable-stream",
-    "licenseFile": "node_modules/to-readable-stream/license"
+    "licenseFile": "license"
   },
   "to-regex-range@5.0.1": {
     "licenses": "MIT",
     "repository": "https://github.com/micromatch/to-regex-range",
     "publisher": "Jon Schlinkert",
     "url": "https://github.com/jonschlinkert",
-    "path": "/Users/pau/git/moodleapp5/node_modules/to-regex-range",
-    "licenseFile": "node_modules/to-regex-range/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "toidentifier@1.0.0": {
     "licenses": "MIT",
     "repository": "https://github.com/component/toidentifier",
     "publisher": "Douglas Christopher Wilson",
     "email": "doug@somethingdoug.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/toidentifier",
-    "licenseFile": "node_modules/toidentifier/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "tough-cookie@2.5.0": {
     "licenses": "BSD-3-Clause",
     "repository": "https://github.com/salesforce/tough-cookie",
     "publisher": "Jeremy Stashewsky",
     "email": "jstash@gmail.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/request/node_modules/tough-cookie",
-    "licenseFile": "node_modules/request/node_modules/tough-cookie/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "tough-cookie@3.0.1": {
     "licenses": "BSD-3-Clause",
     "repository": "https://github.com/salesforce/tough-cookie",
     "publisher": "Jeremy Stashewsky",
     "email": "jstash@gmail.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/tough-cookie",
-    "licenseFile": "node_modules/tough-cookie/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "ts-md5@1.2.7": {
     "licenses": "MIT",
     "repository": "https://github.com/cotag/ts-md5",
-    "path": "/Users/pau/git/moodleapp5/node_modules/ts-md5",
-    "licenseFile": "node_modules/ts-md5/README.md"
+    "licenseFile": "README.md"
   },
   "tslib@1.13.0": {
     "licenses": "0BSD",
     "repository": "https://github.com/Microsoft/tslib",
     "publisher": "Microsoft Corp.",
-    "path": "/Users/pau/git/moodleapp5/node_modules/rxjs/node_modules/tslib",
-    "licenseFile": "node_modules/rxjs/node_modules/tslib/LICENSE.txt"
+    "licenseFile": "LICENSE.txt"
   },
   "tslib@1.14.1": {
     "licenses": "0BSD",
     "repository": "https://github.com/Microsoft/tslib",
     "publisher": "Microsoft Corp.",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@ionic/angular/node_modules/tslib",
-    "licenseFile": "node_modules/@ionic/angular/node_modules/tslib/LICENSE.txt"
+    "licenseFile": "LICENSE.txt"
   },
   "tslib@2.0.1": {
     "licenses": "0BSD",
     "repository": "https://github.com/Microsoft/tslib",
     "publisher": "Microsoft Corp.",
-    "path": "/Users/pau/git/moodleapp5/node_modules/tslib",
-    "licenseFile": "node_modules/tslib/LICENSE.txt"
+    "licenseFile": "LICENSE.txt"
   },
   "tslib@2.2.0": {
     "licenses": "0BSD",
     "repository": "https://github.com/Microsoft/tslib",
     "publisher": "Microsoft Corp.",
-    "path": "/Users/pau/git/moodleapp5/node_modules/@ionic/core/node_modules/tslib",
-    "licenseFile": "node_modules/@ionic/core/node_modules/tslib/LICENSE.txt"
+    "licenseFile": "LICENSE.txt"
   },
   "tunnel-agent@0.6.0": {
     "licenses": "Apache-2.0",
@@ -4037,15 +3968,13 @@
     "publisher": "Mikeal Rogers",
     "email": "mikeal.rogers@gmail.com",
     "url": "http://www.futurealoof.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/tunnel-agent",
-    "licenseFile": "node_modules/tunnel-agent/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "tweetnacl@0.14.5": {
     "licenses": "Unlicense",
     "repository": "https://github.com/dchest/tweetnacl-js",
     "publisher": "TweetNaCl-js contributors",
-    "path": "/Users/pau/git/moodleapp5/node_modules/tweetnacl",
-    "licenseFile": "node_modules/tweetnacl/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "type-fest@0.8.1": {
     "licenses": "(MIT OR CC0-1.0)",
@@ -4053,14 +3982,12 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/type-fest",
-    "licenseFile": "node_modules/type-fest/license"
+    "licenseFile": "license"
   },
   "type-is@1.6.18": {
     "licenses": "MIT",
     "repository": "https://github.com/jshttp/type-is",
-    "path": "/Users/pau/git/moodleapp5/node_modules/type-is",
-    "licenseFile": "node_modules/type-is/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "typedarray-to-buffer@3.1.5": {
     "licenses": "MIT",
@@ -4068,24 +3995,37 @@
     "publisher": "Feross Aboukhadijeh",
     "email": "feross@feross.org",
     "url": "http://feross.org/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/typedarray-to-buffer",
-    "licenseFile": "node_modules/typedarray-to-buffer/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "underscore@1.11.0": {
     "licenses": "MIT",
     "repository": "https://github.com/jashkenas/underscore",
     "publisher": "Jeremy Ashkenas",
     "email": "jeremy@documentcloud.org",
-    "path": "/Users/pau/git/moodleapp5/node_modules/underscore",
-    "licenseFile": "node_modules/underscore/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "underscore@1.2.1": {
     "licenses": "MIT*",
     "repository": "https://github.com/documentcloud/underscore",
     "publisher": "Jeremy Ashkenas",
     "email": "jeremy@documentcloud.org",
-    "path": "/Users/pau/git/moodleapp5/node_modules/dep-graph/node_modules/underscore",
-    "licenseFile": "node_modules/dep-graph/node_modules/underscore/LICENSE"
+    "licenseFile": "LICENSE"
+  },
+  "unique-filename@1.1.1": {
+    "licenses": "ISC",
+    "repository": "https://github.com/iarna/unique-filename",
+    "publisher": "Rebecca Turner",
+    "email": "me@re-becca.org",
+    "url": "http://re-becca.org/",
+    "licenseFile": "LICENSE"
+  },
+  "unique-slug@2.0.2": {
+    "licenses": "ISC",
+    "repository": "https://github.com/iarna/unique-slug",
+    "publisher": "Rebecca Turner",
+    "email": "me@re-becca.org",
+    "url": "http://re-becca.org",
+    "licenseFile": "LICENSE"
   },
   "unique-string@2.0.0": {
     "licenses": "MIT",
@@ -4093,32 +4033,28 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/unique-string",
-    "licenseFile": "node_modules/unique-string/license"
+    "licenseFile": "license"
   },
   "universalify@2.0.0": {
     "licenses": "MIT",
     "repository": "https://github.com/RyanZim/universalify",
     "publisher": "Ryan Zimmerman",
     "email": "opensrc@ryanzim.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/universalify",
-    "licenseFile": "node_modules/universalify/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "unorm@1.6.0": {
     "licenses": "MIT*",
     "repository": "https://github.com/walling/unorm",
     "publisher": "Bjarke Walling",
     "email": "bwp@bwp.dk",
-    "path": "/Users/pau/git/moodleapp5/node_modules/unorm",
-    "licenseFile": "node_modules/unorm/LICENSE.md"
+    "licenseFile": "LICENSE.md"
   },
   "unpipe@1.0.0": {
     "licenses": "MIT",
     "repository": "https://github.com/stream-utils/unpipe",
     "publisher": "Douglas Christopher Wilson",
     "email": "doug@somethingdoug.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/unpipe",
-    "licenseFile": "node_modules/unpipe/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "update-notifier@4.1.3": {
     "licenses": "BSD-2-Clause",
@@ -4126,16 +4062,14 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "https://sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/update-notifier",
-    "licenseFile": "node_modules/update-notifier/license"
+    "licenseFile": "license"
   },
   "uri-js@4.4.0": {
     "licenses": "BSD-2-Clause",
     "repository": "https://github.com/garycourt/uri-js",
     "publisher": "Gary Court",
     "email": "gary.court@gmail.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/uri-js",
-    "licenseFile": "node_modules/uri-js/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "url-parse-lax@3.0.0": {
     "licenses": "MIT",
@@ -4143,8 +4077,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/url-parse-lax",
-    "licenseFile": "node_modules/url-parse-lax/license"
+    "licenseFile": "license"
   },
   "util-deprecate@1.0.2": {
     "licenses": "MIT",
@@ -4152,8 +4085,7 @@
     "publisher": "Nathan Rajlich",
     "email": "nathan@tootallnate.net",
     "url": "http://n8.io/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/util-deprecate",
-    "licenseFile": "node_modules/util-deprecate/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "utils-merge@1.0.1": {
     "licenses": "MIT",
@@ -4161,27 +4093,23 @@
     "publisher": "Jared Hanson",
     "email": "jaredhanson@gmail.com",
     "url": "http://www.jaredhanson.net/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/utils-merge",
-    "licenseFile": "node_modules/utils-merge/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "uuid@3.4.0": {
     "licenses": "MIT",
     "repository": "https://github.com/uuidjs/uuid",
-    "path": "/Users/pau/git/moodleapp5/node_modules/uuid",
-    "licenseFile": "node_modules/uuid/LICENSE.md"
+    "licenseFile": "LICENSE.md"
   },
   "uuid@7.0.3": {
     "licenses": "MIT",
     "repository": "https://github.com/uuidjs/uuid",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-ios/node_modules/uuid",
-    "licenseFile": "node_modules/cordova-ios/node_modules/uuid/LICENSE.md"
+    "licenseFile": "LICENSE.md"
   },
   "valid-identifier@0.0.2": {
     "licenses": "Apache-2.0",
     "repository": "https://github.com/purplecabbage/valid-identifier",
     "publisher": "Jesse MacFadyen",
-    "path": "/Users/pau/git/moodleapp5/node_modules/valid-identifier",
-    "licenseFile": "node_modules/valid-identifier/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "validate-npm-package-license@3.0.4": {
     "licenses": "Apache-2.0",
@@ -4189,42 +4117,36 @@
     "publisher": "Kyle E. Mitchell",
     "email": "kyle@kemitchell.com",
     "url": "https://kemitchell.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/validate-npm-package-license",
-    "licenseFile": "node_modules/validate-npm-package-license/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "validate-npm-package-name@3.0.0": {
     "licenses": "ISC",
     "repository": "https://github.com/npm/validate-npm-package-name",
     "publisher": "zeke",
-    "path": "/Users/pau/git/moodleapp5/node_modules/validate-npm-package-name",
-    "licenseFile": "node_modules/validate-npm-package-name/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "vary@1.1.2": {
     "licenses": "MIT",
     "repository": "https://github.com/jshttp/vary",
     "publisher": "Douglas Christopher Wilson",
     "email": "doug@somethingdoug.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/vary",
-    "licenseFile": "node_modules/vary/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "verror@1.10.0": {
     "licenses": "MIT",
     "repository": "https://github.com/davepacheco/node-verror",
-    "path": "/Users/pau/git/moodleapp5/node_modules/verror",
-    "licenseFile": "node_modules/verror/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "webrtc-adapter@3.4.3": {
     "licenses": "BSD-3-Clause",
     "repository": "https://github.com/webrtc/adapter",
-    "path": "/Users/pau/git/moodleapp5/node_modules/webrtc-adapter",
-    "licenseFile": "node_modules/webrtc-adapter/LICENSE.md"
+    "licenseFile": "LICENSE.md"
   },
   "which-pm-runs@1.0.0": {
     "licenses": "MIT",
     "repository": "https://github.com/zkochan/which-pm-runs",
     "publisher": "Zoltan Kochan",
-    "path": "/Users/pau/git/moodleapp5/node_modules/which-pm-runs",
-    "licenseFile": "node_modules/which-pm-runs/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "which@1.3.1": {
     "licenses": "ISC",
@@ -4232,8 +4154,7 @@
     "publisher": "Isaac Z. Schlueter",
     "email": "i@izs.me",
     "url": "http://blog.izs.me",
-    "path": "/Users/pau/git/moodleapp5/node_modules/windows-release/node_modules/which",
-    "licenseFile": "node_modules/windows-release/node_modules/which/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "which@2.0.2": {
     "licenses": "ISC",
@@ -4241,8 +4162,7 @@
     "publisher": "Isaac Z. Schlueter",
     "email": "i@izs.me",
     "url": "http://blog.izs.me",
-    "path": "/Users/pau/git/moodleapp5/node_modules/which",
-    "licenseFile": "node_modules/which/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "wide-align@1.1.3": {
     "licenses": "ISC",
@@ -4250,8 +4170,7 @@
     "publisher": "Rebecca Turner",
     "email": "me@re-becca.org",
     "url": "http://re-becca.org/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/wide-align",
-    "licenseFile": "node_modules/wide-align/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "widest-line@3.1.0": {
     "licenses": "MIT",
@@ -4259,8 +4178,7 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/widest-line",
-    "licenseFile": "node_modules/widest-line/license"
+    "licenseFile": "license"
   },
   "windows-release@3.3.3": {
     "licenses": "MIT",
@@ -4268,16 +4186,14 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "https://sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/windows-release",
-    "licenseFile": "node_modules/windows-release/license"
+    "licenseFile": "license"
   },
   "with-open-file@0.1.7": {
     "licenses": "MIT",
     "repository": "https://github.com/raphinesse/with-open-file",
     "publisher": "Raphael von der Grün",
     "email": "raphinesse@gmail.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/with-open-file",
-    "licenseFile": "node_modules/with-open-file/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "wrappy@1.0.2": {
     "licenses": "ISC",
@@ -4285,8 +4201,7 @@
     "publisher": "Isaac Z. Schlueter",
     "email": "i@izs.me",
     "url": "http://blog.izs.me/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/wrappy",
-    "licenseFile": "node_modules/wrappy/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "write-file-atomic@2.4.3": {
     "licenses": "ISC",
@@ -4294,8 +4209,7 @@
     "publisher": "Rebecca Turner",
     "email": "me@re-becca.org",
     "url": "http://re-becca.org",
-    "path": "/Users/pau/git/moodleapp5/node_modules/conf/node_modules/write-file-atomic",
-    "licenseFile": "node_modules/conf/node_modules/write-file-atomic/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "write-file-atomic@3.0.3": {
     "licenses": "ISC",
@@ -4303,22 +4217,19 @@
     "publisher": "Rebecca Turner",
     "email": "me@re-becca.org",
     "url": "http://re-becca.org",
-    "path": "/Users/pau/git/moodleapp5/node_modules/write-file-atomic",
-    "licenseFile": "node_modules/write-file-atomic/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "xcode@2.1.0": {
     "licenses": "Apache-2.0",
     "repository": "https://github.com/apache/cordova-node-xcode",
     "publisher": "Apache Software Foundation",
-    "path": "/Users/pau/git/moodleapp5/node_modules/xcode",
-    "licenseFile": "node_modules/xcode/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "xcode@3.0.1": {
     "licenses": "Apache-2.0",
     "repository": "https://github.com/apache/cordova-node-xcode",
     "publisher": "Apache Software Foundation",
-    "path": "/Users/pau/git/moodleapp5/node_modules/cordova-ios/node_modules/xcode",
-    "licenseFile": "node_modules/cordova-ios/node_modules/xcode/LICENSE",
+    "licenseFile": "LICENSE",
     "noticeFile": "node_modules/cordova-ios/node_modules/xcode/NOTICE"
   },
   "xdg-basedir@4.0.0": {
@@ -4327,23 +4238,20 @@
     "publisher": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/xdg-basedir",
-    "licenseFile": "node_modules/xdg-basedir/license"
+    "licenseFile": "license"
   },
   "xml-escape@1.1.0": {
     "licenses": "MIT*",
     "repository": "https://github.com/miketheprogrammer/xml-escape",
     "publisher": "Michael Hernandez - michael.hernandez1988@gmail.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/xml-escape",
-    "licenseFile": "node_modules/xml-escape/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "xmlbuilder@9.0.7": {
     "licenses": "MIT",
     "repository": "https://github.com/oozcitak/xmlbuilder-js",
     "publisher": "Ozgur Ozcitak",
     "email": "oozcitak@gmail.com",
-    "path": "/Users/pau/git/moodleapp5/node_modules/xmlbuilder",
-    "licenseFile": "node_modules/xmlbuilder/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "xmldom@0.1.31": {
     "licenses": "MIT*",
@@ -4351,8 +4259,7 @@
     "publisher": "jindw",
     "email": "jindw@xidea.org",
     "url": "http://www.xidea.org",
-    "path": "/Users/pau/git/moodleapp5/node_modules/xmldom",
-    "licenseFile": "node_modules/xmldom/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "yallist@4.0.0": {
     "licenses": "ISC",
@@ -4360,15 +4267,12 @@
     "publisher": "Isaac Z. Schlueter",
     "email": "i@izs.me",
     "url": "http://blog.izs.me/",
-    "path": "/Users/pau/git/moodleapp5/node_modules/yallist",
-    "licenseFile": "node_modules/yallist/LICENSE"
+    "licenseFile": "LICENSE"
   },
   "zone.js@0.10.3": {
     "licenses": "MIT",
     "repository": "https://github.com/angular/angular",
     "publisher": "Brian Ford",
-    "path": "/Users/pau/git/moodleapp5/node_modules/zone.js",
-    "licenseFile": "node_modules/zone.js/LICENSE"
+    "licenseFile": "LICENSE"
   }
 }
-
diff --git a/src/core/features/settings/pages/licenses/licenses.html b/src/core/features/settings/pages/licenses/licenses.html
index 25ae4a491..0be97cb16 100644
--- a/src/core/features/settings/pages/licenses/licenses.html
+++ b/src/core/features/settings/pages/licenses/licenses.html
@@ -9,6 +9,9 @@
 </ion-header>
 <ion-content>
     <core-loading [hideUntil]="loaded">
+        <ion-searchbar [(ngModel)]="textFilter" (ionInput)="filterChanged($event.target)" (ionCancel)="filterChanged($event.target)"
+            [placeholder]="'core.filter' | translate">
+        </ion-searchbar>
         <ion-list>
             <ion-item button *ngIf="error" class="ion-text-wrap" [href]="licensesUrl" core-link auto-login="no">
                 <ion-label>
@@ -21,8 +24,7 @@
                 <ion-item *ngFor="let license of licenses" class="ion-text-wrap">
                     <ion-label>
                         <p class="item-heading">
-                            <a *ngIf="license.repository" [href]="license.repository" core-link
-                                auto-login="no">{{ license.name }}</a>
+                            <a *ngIf="license.repository" [href]="license.repository" core-link auto-login="no">{{ license.name }}</a>
                             <ng-container *ngIf="!license.repository">{{ license.name }}</ng-container> - {{ license.version }}
                         </p>
                         <p class="item-heading" *ngIf="license.publisher">
@@ -31,10 +33,10 @@
                         <p>{{ 'core.settings.license' | translate }}{{ 'core.labelsep' | translate }} {{ license.licenses }}</p>
                         <p><a *ngIf="license.url" [href]="license.url" core-link auto-login="no">{{ license.url }}</a></p>
                         <p><a *ngIf="license.email" [href]="'mailto:' + license.email" core-link auto-login="no"
-                            [showBrowserWarning]="false">{{ license.email }}</a></p>
+                                [showBrowserWarning]="false">{{ license.email }}</a></p>
                     </ion-label>
-                    <ion-button *ngIf="license.licenseUrl" [href]="license.licenseUrl" target="_blank"
-                        fill="clear" slot="end" core-link auto-login="no">{{ 'core.view' | translate }}</ion-button>
+                    <ion-button *ngIf="license.licenseUrl" [href]="license.licenseUrl" target="_blank" fill="clear" slot="end" core-link
+                        auto-login="no">{{ 'core.view' | translate }}</ion-button>
                 </ion-item>
             </ng-container>
         </ion-list>
diff --git a/src/core/features/settings/pages/licenses/licenses.ts b/src/core/features/settings/pages/licenses/licenses.ts
index fa7830aff..6110dc6f3 100644
--- a/src/core/features/settings/pages/licenses/licenses.ts
+++ b/src/core/features/settings/pages/licenses/licenses.ts
@@ -15,6 +15,7 @@
 import { Component, OnInit } from '@angular/core';
 import { CoreConstants } from '@/core/constants';
 import { Http } from '@singletons';
+import { IonSearchbar } from '@ionic/angular';
 
 /**
  * Defines license info
@@ -22,7 +23,7 @@ import { Http } from '@singletons';
 interface CoreSettingsLicense {
     name: string;
     version: string;
-    licenses: string;
+    licenses: string | string[];
     repository?: string;
     publisher?: string;
     url?: string;
@@ -44,39 +45,48 @@ export class CoreSettingsLicensesPage implements OnInit {
     loaded = false;
     licenses: CoreSettingsLicense[] = [];
     error = false;
+    textFilter = '';
+    appLicenseVersion: string;
+
+    protected allLicenses: CoreSettingsLicense[] = [];
 
     constructor() {
-        let version = 'v' + CoreConstants.CONFIG.versionname;
-        if (version.indexOf('-') > 0) {
-            version = 'integration';
-        }
+        this.appLicenseVersion = CoreConstants.CONFIG.versionname.indexOf('-') > 0
+            ? 'integration'
+            : 'v' + CoreConstants.CONFIG.versionname;
 
-        this.licensesUrl = 'https://raw.githubusercontent.com/moodlehq/moodleapp/' + version + '/licenses.json';
+        this.licensesUrl = 'https://raw.githubusercontent.com/moodlehq/moodleapp/' + this.appLicenseVersion + '/licenses.json';
     }
 
     /**
-     * View loaded.
+     * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
         try {
             const licenses = await Http.get(this.licensesUrl).toPromise();
-            this.licenses = Object.keys(licenses).map((name) => {
+            this.allLicenses = Object.keys(licenses).map((name) => {
                 const license = licenses[name];
 
                 const nameSplit = name.lastIndexOf('@');
                 license.name = name.substring(0, nameSplit);
                 license.version = name.substring(nameSplit + 1);
+                if (Array.isArray(license.licenses)) {
+                    license.licenses = license.licenses.join(', ');
+                }
 
                 if (license.repository) {
                     license.repository = license.repository.replace('git://', 'https://');
                     if (license.repository.indexOf('github.com') > 0) {
-                        license.licenseUrl = license.repository + '/blob/' + license.version + '/' + license.licenseFile;
+                        const version = license.name == 'moodlemobile' ? this.appLicenseVersion : license.version;
+                        license.licenseUrl = license.repository + '/blob/' + version + '/' + license.licenseFile;
                     }
                 }
 
                 return license;
             });
 
+            this.filterLicenses();
+
             this.error = false;
         } catch {
             this.error = true;
@@ -85,4 +95,36 @@ export class CoreSettingsLicensesPage implements OnInit {
         this.loaded = true;
     }
 
+    /**
+     * Filter licenses using filter text.
+     */
+    filterLicenses(): void {
+        const filter = this.textFilter.trim().toLowerCase();
+
+        if (filter == '') {
+            this.licenses = this.allLicenses;
+
+            return;
+        }
+
+        this.licenses = this.allLicenses.filter((license) => license.name.toLowerCase().indexOf(filter) >=0 ||
+            license.version.toLowerCase().indexOf(filter) >=0 ||
+            typeof license.licenses == 'string' && license.licenses.toLowerCase().indexOf(filter) >=0 ||
+            license.repository && license.repository.toLowerCase().indexOf(filter) >=0 ||
+            license.publisher && license.publisher.toLowerCase().indexOf(filter) >=0 ||
+            license.url && license.url.toLowerCase().indexOf(filter) >=0 ||
+            license.email && license.email.toLowerCase().indexOf(filter) >=0);
+    }
+
+    /**
+     * Text filter changed.
+     *
+     * @param target Searchbar element.
+     */
+    filterChanged(target: IonSearchbar): void {
+        this.textFilter = target.value || '';
+
+        this.filterLicenses();
+    }
+
 }

From 1547b66ec9a405a8c94e74b74f0f1730052ee40d Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 16 Nov 2021 11:08:51 +0100
Subject: [PATCH 0201/1008] MOBILE-3917 h5p: Check missing dependencies

---
 scripts/lang_functions.php                 |  1 +
 scripts/langindex.json                     |  1 +
 src/core/features/h5p/classes/core.ts      |  7 ++
 src/core/features/h5p/classes/framework.ts | 15 +++-
 src/core/features/h5p/classes/helper.ts    |  2 +-
 src/core/features/h5p/classes/storage.ts   | 16 ++--
 src/core/features/h5p/classes/validator.ts | 91 +++++++++++++++++++++-
 src/core/features/h5p/lang.json            |  3 +-
 src/core/features/h5p/services/h5p.ts      |  2 +-
 9 files changed, 123 insertions(+), 15 deletions(-)

diff --git a/scripts/lang_functions.php b/scripts/lang_functions.php
index a0cd6f9ba..cd363ee48 100644
--- a/scripts/lang_functions.php
+++ b/scripts/lang_functions.php
@@ -246,6 +246,7 @@ function build_lang($lang, $keys) {
         }
 
         if ($value->file != 'local_moodlemobileapp') {
+            $text = str_replace('$a->@', '$a.', $text);
             $text = str_replace('$a->', '$a.', $text);
             $text = str_replace('{$a', '{{$a', $text);
             $text = str_replace('}', '}}', $text);
diff --git a/scripts/langindex.json b/scripts/langindex.json
index 1df9a198e..3fbdd7b43 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1749,6 +1749,7 @@
   "core.h5p.licensee": "h5p",
   "core.h5p.licenseextras": "h5p",
   "core.h5p.licenseversion": "h5p",
+  "core.h5p.missingdependency": "h5p",
   "core.h5p.nocopyright": "h5p",
   "core.h5p.offlineDialogBody": "h5p",
   "core.h5p.offlineDialogHeader": "h5p",
diff --git a/src/core/features/h5p/classes/core.ts b/src/core/features/h5p/classes/core.ts
index 1e6a90502..6ba4aeec8 100644
--- a/src/core/features/h5p/classes/core.ts
+++ b/src/core/features/h5p/classes/core.ts
@@ -987,6 +987,13 @@ export type CoreH5PLibraryBasicData = {
     minorVersion: number; // Minor version.
 };
 
+/**
+ * Data about a missing library.
+ */
+export type CoreH5PMissingLibrary = CoreH5PLibraryBasicData & {
+    libString: string; // Library that has the dependency.
+};
+
 /**
  * Library basic data including patch version.
  */
diff --git a/src/core/features/h5p/classes/framework.ts b/src/core/features/h5p/classes/framework.ts
index 326d7dc05..cfb77cac5 100644
--- a/src/core/features/h5p/classes/framework.ts
+++ b/src/core/features/h5p/classes/framework.ts
@@ -42,6 +42,7 @@ import { CoreH5PSemantics } from './content-validator';
 import { CoreH5PContentBeingSaved, CoreH5PLibraryBeingSaved } from './storage';
 import { CoreH5PLibraryAddTo, CoreH5PLibraryMetadataSettings } from './validator';
 import { CoreH5PMetadata } from './metadata';
+import { Translate } from '@singletons';
 
 /**
  * Equivalent to Moodle's implementation of H5PFrameworkInterface.
@@ -742,14 +743,14 @@ export class CoreH5PFramework {
     /**
      * Save what libraries a library is depending on.
      *
-     * @param libraryId Library Id for the library we're saving dependencies for.
+     * @param library Library data for the library we're saving dependencies for.
      * @param dependencies List of dependencies as associative arrays containing machineName, majorVersion, minorVersion.
      * @param dependencytype The type of dependency.
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when done.
      */
     async saveLibraryDependencies(
-        libraryId: number,
+        library: CoreH5PLibraryBeingSaved,
         dependencies: CoreH5PLibraryBasicData[],
         dependencyType: string,
         siteId?: string,
@@ -761,9 +762,17 @@ export class CoreH5PFramework {
             // Get the ID of the library.
             const dependencyId = await this.getLibraryIdByData(dependency, siteId);
 
+            if (!dependencyId) {
+                // Missing dependency. It should have been detected before installing the package.
+                throw new CoreError(Translate.instant('core.h5p.missingdependency', { $a: {
+                    lib: CoreH5PCore.libraryToString(library),
+                    dep: CoreH5PCore.libraryToString(dependency),
+                } }));
+            }
+
             // Create the relation.
             const entry: Partial<CoreH5PLibraryDependencyDBRecord> = {
-                libraryid: libraryId,
+                libraryid: library.libraryId,
                 requiredlibraryid: dependencyId,
                 dependencytype: dependencyType,
             };
diff --git a/src/core/features/h5p/classes/helper.ts b/src/core/features/h5p/classes/helper.ts
index bfb7b9537..23e447b93 100644
--- a/src/core/features/h5p/classes/helper.ts
+++ b/src/core/features/h5p/classes/helper.ts
@@ -211,7 +211,7 @@ export class CoreH5PHelper {
             // Read the contents of the unzipped dir, process them and store them.
             const contents = await CoreFile.getDirectoryContents(destFolder);
 
-            const filesData = await CoreH5P.h5pValidator.processH5PFiles(destFolder, contents);
+            const filesData = await CoreH5P.h5pValidator.processH5PFiles(destFolder, contents, siteId);
 
             const content = await CoreH5P.h5pStorage.savePackage(filesData, folderName, fileUrl, false, siteId);
 
diff --git a/src/core/features/h5p/classes/storage.ts b/src/core/features/h5p/classes/storage.ts
index 4fc3bcdb1..c79bdd305 100644
--- a/src/core/features/h5p/classes/storage.ts
+++ b/src/core/features/h5p/classes/storage.ts
@@ -119,24 +119,26 @@ export class CoreH5PStorage {
                 return;
             }
 
-            const libId = libraryData.libraryId;
-
-            libraryIds.push(libId);
+            libraryIds.push(libraryData.libraryId);
 
             // Remove any old dependencies.
-            await this.h5pFramework.deleteLibraryDependencies(libId, siteId);
+            await this.h5pFramework.deleteLibraryDependencies(libraryData.libraryId, siteId);
 
             // Insert the different new ones.
             const promises: Promise<void>[] = [];
 
             if (typeof libraryData.preloadedDependencies != 'undefined') {
-                promises.push(this.h5pFramework.saveLibraryDependencies(libId, libraryData.preloadedDependencies, 'preloaded'));
+                promises.push(this.h5pFramework.saveLibraryDependencies(
+                    libraryData,
+                    libraryData.preloadedDependencies,
+                    'preloaded',
+                ));
             }
             if (typeof libraryData.dynamicDependencies != 'undefined') {
-                promises.push(this.h5pFramework.saveLibraryDependencies(libId, libraryData.dynamicDependencies, 'dynamic'));
+                promises.push(this.h5pFramework.saveLibraryDependencies(libraryData, libraryData.dynamicDependencies, 'dynamic'));
             }
             if (typeof libraryData.editorDependencies != 'undefined') {
-                promises.push(this.h5pFramework.saveLibraryDependencies(libId, libraryData.editorDependencies, 'editor'));
+                promises.push(this.h5pFramework.saveLibraryDependencies(libraryData, libraryData.editorDependencies, 'editor'));
             }
 
             await Promise.all(promises);
diff --git a/src/core/features/h5p/classes/validator.ts b/src/core/features/h5p/classes/validator.ts
index e3ec91d49..ac300f409 100644
--- a/src/core/features/h5p/classes/validator.ts
+++ b/src/core/features/h5p/classes/validator.ts
@@ -12,17 +12,23 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { CoreError } from '@classes/errors/error';
 import { FileEntry, DirectoryEntry } from '@ionic-native/file/ngx';
 import { CoreFile, CoreFileFormat } from '@services/file';
 import { CoreTextUtils } from '@services/utils/text';
+import { Translate } from '@singletons';
 import { CoreH5PSemantics } from './content-validator';
-import { CoreH5PCore, CoreH5PLibraryBasicData } from './core';
+import { CoreH5PCore, CoreH5PLibraryBasicData, CoreH5PMissingLibrary } from './core';
+import { CoreH5PFramework } from './framework';
 
 /**
  * Equivalent to H5P's H5PValidator class.
  */
 export class CoreH5PValidator {
 
+    constructor(public h5pFramework: CoreH5PFramework) {
+    }
+
     /**
      * Get library data.
      * This function won't validate most things because it should've been done by the server already.
@@ -49,6 +55,57 @@ export class CoreH5PValidator {
         return libraryData;
     }
 
+    /**
+     * Use the dependency declarations to find any missing libraries.
+     *
+     * @param libraries Libraries to check.
+     * @return Promise resolved with the missing dependencies.
+     */
+    protected getMissingLibraries(libraries: CoreH5PLibrariesJsonData): Record<string, CoreH5PMissingLibrary> {
+        const missing: Record<string, CoreH5PMissingLibrary> = {};
+
+        Object.values(libraries).forEach((library) => {
+            if (typeof library.preloadedDependencies !== 'undefined') {
+                Object.assign(missing, this.getMissingDependencies(library.preloadedDependencies, library, libraries));
+            }
+            if (typeof library.dynamicDependencies !== 'undefined') {
+                Object.assign(missing, this.getMissingDependencies(library.dynamicDependencies, library, libraries));
+            }
+            if (typeof library.editorDependencies !== 'undefined') {
+                Object.assign(missing, this.getMissingDependencies(library.editorDependencies, library, libraries));
+            }
+        });
+
+        return missing;
+    }
+
+    /**
+     * Helper function for getMissingLibraries, searches for dependency required libraries in the provided list of libraries.
+     *
+     * @param dependencies Dependencies to check.
+     * @param library Library that has these dependencies.
+     * @param libraries Libraries.
+     * @return Promise resolved with missing dependencies.
+     */
+    protected getMissingDependencies(
+        dependencies: CoreH5PLibraryBasicData[],
+        library: CoreH5PLibraryJsonData,
+        libraries: CoreH5PLibrariesJsonData,
+    ): Record<string, CoreH5PLibraryBasicData> {
+        const missing: Record<string, CoreH5PMissingLibrary> = {};
+
+        dependencies.forEach((dependency) => {
+            const libString  = CoreH5PCore.libraryToString(dependency);
+            if (!libraries[libString]) {
+                missing[libString] = Object.assign(dependency, {
+                    libString: CoreH5PCore.libraryToString(library),
+                });
+            }
+        });
+
+        return missing;
+    }
+
     /**
      * Get library data for all libraries in an H5P package.
      *
@@ -106,9 +163,14 @@ export class CoreH5PValidator {
      *
      * @param packagePath The path to the package folder.
      * @param entries List of files and directories in the root of the package folder.
+     * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when done.
      */
-    async processH5PFiles(packagePath: string, entries: (DirectoryEntry | FileEntry)[]): Promise<CoreH5PMainJSONFilesData> {
+    async processH5PFiles(
+        packagePath: string,
+        entries: (DirectoryEntry | FileEntry)[],
+        siteId?: string,
+    ): Promise<CoreH5PMainJSONFilesData> {
 
         // Read the needed files.
         const results = await Promise.all([
@@ -117,6 +179,31 @@ export class CoreH5PValidator {
             this.getPackageLibrariesData(packagePath, entries),
         ]);
 
+        // Check if there are missing libraries.
+        const missingLibraries = this.getMissingLibraries(results[2]);
+
+        // Check if the missing libraries are already installed in the app.
+        await Promise.all(Object.keys(missingLibraries).map(async (libString) => {
+            const dependency = missingLibraries[libString];
+            const dependencyId = await this.h5pFramework.getLibraryIdByData(dependency, siteId);
+
+            if (dependencyId) {
+                // Lib is installed.
+                delete missingLibraries[libString];
+            }
+        }));
+
+        if (Object.keys(missingLibraries).length > 0) {
+            // Missing library, throw error.
+            const libString = Object.keys(missingLibraries)[0];
+            const missingLibrary = missingLibraries[libString];
+
+            throw new CoreError(Translate.instant('core.h5p.missingdependency', { $a: {
+                lib: missingLibrary.libString,
+                dep: libString,
+            } }));
+        }
+
         return {
             librariesJsonData: results[2],
             mainJsonData: results[0],
diff --git a/src/core/features/h5p/lang.json b/src/core/features/h5p/lang.json
index 19018057f..3f62f0325 100644
--- a/src/core/features/h5p/lang.json
+++ b/src/core/features/h5p/lang.json
@@ -59,6 +59,7 @@
     "licensee": "Licensee",
     "licenseextras": "Licence extras",
     "licenseversion": "Licence version",
+    "missingdependency": "Missing dependency {{$a.dep}} required by {{$a.lib}}.",
     "nocopyright": "No copyright information available for this content.",
     "offlineDialogBody": "We were unable to send information about your completion of this task. Please check your internet connection.",
     "offlineDialogHeader": "Your connection to the server was lost",
@@ -90,4 +91,4 @@
     "years": "Year(s)",
     "yearsfrom": "Years (from)",
     "yearsto": "Years (to)"
-}
\ No newline at end of file
+}
diff --git a/src/core/features/h5p/services/h5p.ts b/src/core/features/h5p/services/h5p.ts
index f4d9b27ac..92bf18bc8 100644
--- a/src/core/features/h5p/services/h5p.ts
+++ b/src/core/features/h5p/services/h5p.ts
@@ -48,8 +48,8 @@ export class CoreH5PProvider {
     constructor() {
         this.queueRunner = new CoreQueueRunner(1);
 
-        this.h5pValidator = new CoreH5PValidator();
         this.h5pFramework = new CoreH5PFramework();
+        this.h5pValidator = new CoreH5PValidator(this.h5pFramework);
         this.h5pCore = new CoreH5PCore(this.h5pFramework);
         this.h5pStorage = new CoreH5PStorage(this.h5pCore, this.h5pFramework);
         this.h5pPlayer = new CoreH5PPlayer(this.h5pCore, this.h5pStorage);

From 8cd89ead85db55fd7c4fe5d472bee15ba15ecbb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 12 Nov 2021 16:32:54 +0100
Subject: [PATCH 0202/1008] MOBILE-3914 course: Add side blocks component and
 replace it

---
 scripts/langindex.json                        |   2 +
 src/core/components/empty-box/empty-box.scss  |   4 -
 .../block/components/components.module.ts     |   9 +-
 .../core-block-course-blocks.html             |  15 --
 .../course-blocks/course-blocks.scss          |  61 ------
 .../side-blocks-button.html                   |   3 +
 .../side-blocks-button.scss                   |  29 +++
 .../side-blocks-button/side-blocks-button.ts  |  45 ++++
 .../components/side-blocks/side-blocks.html   |  26 +++
 .../side-blocks.ts}                           |  62 ++----
 src/core/features/block/lang.json             |   6 +-
 .../features/block/services/block-helper.ts   |  16 ++
 .../components/format/core-course-format.html | 203 +++++++++---------
 .../course/components/format/format.ts        |  23 +-
 .../features/sitehome/pages/index/index.html  |  95 ++++----
 .../features/sitehome/pages/index/index.ts    |  35 ++-
 src/theme/theme.light.scss                    |   7 -
 17 files changed, 328 insertions(+), 313 deletions(-)
 delete mode 100644 src/core/features/block/components/course-blocks/core-block-course-blocks.html
 delete mode 100644 src/core/features/block/components/course-blocks/course-blocks.scss
 create mode 100644 src/core/features/block/components/side-blocks-button/side-blocks-button.html
 create mode 100644 src/core/features/block/components/side-blocks-button/side-blocks-button.scss
 create mode 100644 src/core/features/block/components/side-blocks-button/side-blocks-button.ts
 create mode 100644 src/core/features/block/components/side-blocks/side-blocks.html
 rename src/core/features/block/components/{course-blocks/course-blocks.ts => side-blocks/side-blocks.ts} (61%)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 1df9a198e..94f7fe43e 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1399,6 +1399,8 @@
   "core.areyousure": "moodle",
   "core.back": "moodle",
   "core.block.blocks": "moodle",
+  "core.block.noblocks": "error",
+  "core.block.opendrawerblocks": "moodle",
   "core.browser": "local_moodlemobileapp",
   "core.cancel": "moodle",
   "core.cannotconnect": "local_moodlemobileapp",
diff --git a/src/core/components/empty-box/empty-box.scss b/src/core/components/empty-box/empty-box.scss
index 99ffdc978..b0b3c2254 100644
--- a/src/core/components/empty-box/empty-box.scss
+++ b/src/core/components/empty-box/empty-box.scss
@@ -72,7 +72,3 @@
         height: auto;
     }
 }
-
-:host-context(core-block-course-blocks) .core-empty-box {
-    position: relative;
-}
diff --git a/src/core/features/block/components/components.module.ts b/src/core/features/block/components/components.module.ts
index 7d64e292d..ab8bf883c 100644
--- a/src/core/features/block/components/components.module.ts
+++ b/src/core/features/block/components/components.module.ts
@@ -16,15 +16,17 @@ import { NgModule } from '@angular/core';
 import { CoreBlockComponent } from './block/block';
 import { CoreBlockOnlyTitleComponent } from './only-title-block/only-title-block';
 import { CoreBlockPreRenderedComponent } from './pre-rendered-block/pre-rendered-block';
-import { CoreBlockCourseBlocksComponent } from './course-blocks/course-blocks';
 import { CoreSharedModule } from '@/core/shared.module';
+import { CoreBlockSideBlocksComponent } from './side-blocks/side-blocks';
+import { CoreBlockSideBlocksButtonComponent } from './side-blocks-button/side-blocks-button';
 
 @NgModule({
     declarations: [
         CoreBlockComponent,
         CoreBlockOnlyTitleComponent,
         CoreBlockPreRenderedComponent,
-        CoreBlockCourseBlocksComponent,
+        CoreBlockSideBlocksComponent,
+        CoreBlockSideBlocksButtonComponent,
     ],
     imports: [
         CoreSharedModule,
@@ -33,7 +35,8 @@ import { CoreSharedModule } from '@/core/shared.module';
         CoreBlockComponent,
         CoreBlockOnlyTitleComponent,
         CoreBlockPreRenderedComponent,
-        CoreBlockCourseBlocksComponent,
+        CoreBlockSideBlocksComponent,
+        CoreBlockSideBlocksButtonComponent,
     ],
 })
 export class CoreBlockComponentsModule {}
diff --git a/src/core/features/block/components/course-blocks/core-block-course-blocks.html b/src/core/features/block/components/course-blocks/core-block-course-blocks.html
deleted file mode 100644
index 120e60749..000000000
--- a/src/core/features/block/components/course-blocks/core-block-course-blocks.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<div class="core-course-blocks-content">
-    <ng-content></ng-content>
-</div>
-
-<div *ngIf="blocks && blocks.length > 0 && !hideBlocks" [class.core-hide-blocks]="hideBottomBlocks" class="core-course-blocks-side">
-    <core-loading [hideUntil]="dataLoaded" [fullscreen]="false">
-        <ion-list>
-            <!-- Course expand="block"s. -->
-            <ng-container *ngFor="let block of blocks">
-                <core-block *ngIf="block.visible" [block]="block" contextLevel="course" [instanceId]="courseId"
-                    [extraData]="{'downloadEnabled': downloadEnabled}"></core-block>
-            </ng-container>
-        </ion-list>
-    </core-loading>
-</div>
diff --git a/src/core/features/block/components/course-blocks/course-blocks.scss b/src/core/features/block/components/course-blocks/course-blocks.scss
deleted file mode 100644
index c7ba5b65e..000000000
--- a/src/core/features/block/components/course-blocks/course-blocks.scss
+++ /dev/null
@@ -1,61 +0,0 @@
-:host {
-    --side-blocks-box-shadow: var(--core-menu-box-shadow-start);
-
-    &.core-no-blocks .core-course-blocks-content {
-        height: auto;
-    }
-
-    &.core-has-blocks {
-        @media (min-width: 768px) {
-            display: flex;
-
-            flex-direction: row;
-            flex-wrap: nowrap;
-
-            .core-course-blocks-content {
-                box-shadow: none !important;
-                flex-grow: 1;
-                max-width: 100%;
-
-                --ion-safe-area-right: 0px;
-            }
-
-            div.core-course-blocks-side {
-                max-width: var(--side-blocks-max-width);
-                min-width: var(--side-blocks-min-width);
-                box-shadow: var(--side-blocks-box-shadow);
-                z-index: 2;
-            }
-
-            .core-course-blocks-content,
-            div.core-course-blocks-side {
-                position: relative;
-                height: 100%;
-
-                .core-loading-center,
-                core-loading.core-loading-loaded {
-                    position: initial;
-                }
-            }
-        }
-
-        @media (max-width: 767.98px) {
-            // Disable scroll on individual columns.
-            div.core-course-blocks-side {
-                height: auto;
-
-                &.core-hide-blocks {
-                    display: none;
-                }
-            }
-        }
-    }
-}
-
-:host-context([dir="rtl"]).core-has-blocks {
-    @media (min-width: 768px) {
-        div.core-course-blocks-side {
-            box-shadow: var(--side-blocks-box-shadow);
-        }
-    }
-}
diff --git a/src/core/features/block/components/side-blocks-button/side-blocks-button.html b/src/core/features/block/components/side-blocks-button/side-blocks-button.html
new file mode 100644
index 000000000..b4d634937
--- /dev/null
+++ b/src/core/features/block/components/side-blocks-button/side-blocks-button.html
@@ -0,0 +1,3 @@
+<ion-button (click)="openBlocks()" [attr.aria-label]="'core.block.opendrawerblocks' | translate">
+    <ion-icon name="fas-cubes" slot="icon-only" aria-hidden="true"></ion-icon>
+</ion-button>
diff --git a/src/core/features/block/components/side-blocks-button/side-blocks-button.scss b/src/core/features/block/components/side-blocks-button/side-blocks-button.scss
new file mode 100644
index 000000000..3e9277bfc
--- /dev/null
+++ b/src/core/features/block/components/side-blocks-button/side-blocks-button.scss
@@ -0,0 +1,29 @@
+@import "~theme/globals";
+
+:host {
+    @include position(50%, 0px, null, null);
+    position: fixed;
+    z-index: 10;
+
+    ion-button {
+        margin: 0;
+        --padding-start: 0.5em;
+        --padding-end: 0;
+        --border-radius: 2em 0 0 2em;
+
+        &::part(native) {
+            @include core-transition(padding, 200ms);
+        }
+        
+        &:hover {
+            --padding-end: 1.2em;
+            --padding-start: 1em;
+        }
+    }
+}
+
+:host-context([dir=rtl]) {
+    ion-button {
+        --border-radius: 0 2em 2em 0;
+    }
+}
diff --git a/src/core/features/block/components/side-blocks-button/side-blocks-button.ts b/src/core/features/block/components/side-blocks-button/side-blocks-button.ts
new file mode 100644
index 000000000..71f3e4898
--- /dev/null
+++ b/src/core/features/block/components/side-blocks-button/side-blocks-button.ts
@@ -0,0 +1,45 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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, Input } from '@angular/core';
+import { CoreDomUtils } from '@services/utils/dom';
+import { CoreBlockSideBlocksComponent } from '../side-blocks/side-blocks';
+
+/**
+ * Component that displays a button to open blocks.
+ */
+@Component({
+    selector: 'core-block-side-blocks-button',
+    templateUrl: 'side-blocks-button.html',
+    styleUrls: ['side-blocks-button.scss'],
+})
+export class CoreBlockSideBlocksButtonComponent {
+
+    @Input() courseId!: number;
+    @Input() downloadEnabled = false;
+
+    /**
+     * Open side blocks.
+     */
+    openBlocks(): void {
+        CoreDomUtils.openSideModal({
+            component: CoreBlockSideBlocksComponent,
+            componentProps: {
+                courseId: this.courseId,
+                downloadEnabled: this.downloadEnabled,
+            },
+        });
+    }
+
+}
diff --git a/src/core/features/block/components/side-blocks/side-blocks.html b/src/core/features/block/components/side-blocks/side-blocks.html
new file mode 100644
index 000000000..627139e3c
--- /dev/null
+++ b/src/core/features/block/components/side-blocks/side-blocks.html
@@ -0,0 +1,26 @@
+<ion-header>
+    <ion-toolbar>
+        <h1>{{ 'core.block.blocks' | translate }}</h1>
+        <ion-buttons slot="end">
+            <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
+                <ion-icon name="fas-times" slot="icon-only" aria-hidden=true></ion-icon>
+            </ion-button>
+        </ion-buttons>
+    </ion-toolbar>
+</ion-header>
+<ion-content>
+    <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="doRefresh($event.target)">
+        <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
+    </ion-refresher>
+    <core-loading [hideUntil]="loaded">
+        <ion-list *ngIf="blocks.length > 0">
+            <ng-container *ngFor="let block of blocks">
+                <core-block *ngIf="block.visible" [block]="block" contextLevel="course" [instanceId]="courseId"
+                    [extraData]="{'downloadEnabled': downloadEnabled}"></core-block>
+            </ng-container>
+        </ion-list>
+
+        <core-empty-box *ngIf="blocks.length == 0" icon="fas-cubes" [message]="'core.block.noblocks' | translate">
+        </core-empty-box>
+    </core-loading>
+</ion-content>
diff --git a/src/core/features/block/components/course-blocks/course-blocks.ts b/src/core/features/block/components/side-blocks/side-blocks.ts
similarity index 61%
rename from src/core/features/block/components/course-blocks/course-blocks.ts
rename to src/core/features/block/components/side-blocks/side-blocks.ts
index ad8b01d5f..18dc3c9ca 100644
--- a/src/core/features/block/components/course-blocks/course-blocks.ts
+++ b/src/core/features/block/components/side-blocks/side-blocks.ts
@@ -12,50 +12,38 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, ViewChildren, Input, OnInit, QueryList, ElementRef } from '@angular/core';
-import { IonContent } from '@ionic/angular';
+import { Component, ViewChildren, Input, OnInit, QueryList } from '@angular/core';
+import { ModalController } from '@singletons';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreCourse, CoreCourseBlock } from '@features/course/services/course';
 import { CoreBlockHelper } from '../../services/block-helper';
 import { CoreBlockComponent } from '../block/block';
 import { CoreUtils } from '@services/utils/utils';
+import { IonRefresher } from '@ionic/angular';
 
 /**
- * Component that displays the list of course blocks.
+ * Component that displays the list of side blocks.
  */
 @Component({
-    selector: 'core-block-course-blocks',
-    templateUrl: 'core-block-course-blocks.html',
-    styleUrls: ['course-blocks.scss'],
+    selector: 'core-block-side-blocks',
+    templateUrl: 'side-blocks.html',
 })
-export class CoreBlockCourseBlocksComponent implements OnInit {
+export class CoreBlockSideBlocksComponent implements OnInit {
 
     @Input() courseId!: number;
-    @Input() hideBlocks = false;
-    @Input() hideBottomBlocks = false;
     @Input() downloadEnabled = false;
 
     @ViewChildren(CoreBlockComponent) blocksComponents?: QueryList<CoreBlockComponent>;
 
-    dataLoaded = false;
+    loaded = false;
     blocks: CoreCourseBlock[] = [];
 
-    protected element: HTMLElement;
-
-    constructor(
-        element: ElementRef,
-        protected content: IonContent,
-    ) {
-        this.element = element.nativeElement;
-    }
-
     /**
-     * Component being initialized.
+     * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
-        this.element.classList.add('core-no-blocks');
         this.loadContent().finally(() => {
-            this.dataLoaded = true;
+            this.loaded = true;
         });
     }
 
@@ -87,7 +75,6 @@ export class CoreBlockCourseBlocksComponent implements OnInit {
      * @return Promise resolved when done.
      */
     async loadContent(): Promise<void> {
-
         try {
             this.blocks = await CoreBlockHelper.getCourseBlocks(this.courseId);
         } catch (error) {
@@ -95,29 +82,26 @@ export class CoreBlockCourseBlocksComponent implements OnInit {
 
             this.blocks = [];
         }
-
-        const scrollElement = await this.content.getScrollElement();
-        if (!this.hideBlocks && this.blocks.length > 0) {
-            this.element.classList.add('core-has-blocks');
-            this.element.classList.remove('core-no-blocks');
-
-            scrollElement.classList.add('core-course-block-with-blocks');
-        } else {
-            this.element.classList.remove('core-has-blocks');
-            this.element.classList.add('core-no-blocks');
-            scrollElement.classList.remove('core-course-block-with-blocks');
-        }
     }
 
     /**
-     * Refresh data.
+     * Refresh the data.
      *
-     * @return Promise resolved when done.
+     * @param refresher Refresher.
      */
-    async doRefresh(): Promise<void> {
+    async doRefresh(refresher?: IonRefresher): Promise<void> {
         await CoreUtils.ignoreErrors(this.invalidateBlocks());
 
-        await this.loadContent();
+        await this.loadContent().finally(() => {
+            refresher?.complete();
+        });
+    }
+
+    /**
+     * Close modal.
+     */
+    closeModal(): void {
+        ModalController.dismiss();
     }
 
 }
diff --git a/src/core/features/block/lang.json b/src/core/features/block/lang.json
index 9b136b8ee..cc3f3c95a 100644
--- a/src/core/features/block/lang.json
+++ b/src/core/features/block/lang.json
@@ -1,3 +1,5 @@
 {
-    "blocks": "Blocks"
-}
\ No newline at end of file
+    "blocks": "Blocks",
+    "noblocks": "No blocks found!",
+    "opendrawerblocks": "Open block drawer"
+}
diff --git a/src/core/features/block/services/block-helper.ts b/src/core/features/block/services/block-helper.ts
index c946bd75b..00b33cd23 100644
--- a/src/core/features/block/services/block-helper.ts
+++ b/src/core/features/block/services/block-helper.ts
@@ -54,6 +54,22 @@ export class CoreBlockHelperProvider {
         return blocks;
     }
 
+    /**
+     * Returns if the course has any block.
+     *
+     * @param courseId Course ID.
+     * @return Wether course has blocks.
+     */
+    async hasCourseBlocks(courseId: number): Promise<boolean> {
+        try {
+            const blocks = await this.getCourseBlocks(courseId);
+
+            return blocks.length > 0;
+        } catch {
+            return false;
+        }
+    }
+
 }
 
 export const CoreBlockHelper = makeSingleton(CoreBlockHelperProvider);
diff --git a/src/core/features/course/components/format/core-course-format.html b/src/core/features/course/components/format/core-course-format.html
index def9a3009..e4b211c67 100644
--- a/src/core/features/course/components/format/core-course-format.html
+++ b/src/core/features/course/components/format/core-course-format.html
@@ -6,126 +6,115 @@
         </core-context-menu-item>
     </core-context-menu>
 </core-navbar-buttons>
+<core-dynamic-component [component]="courseFormatComponent" [data]="data">
+    <!-- Default course format. -->
+    <core-loading [hideUntil]="loaded">
+        <!-- Section selector. -->
+        <core-dynamic-component [component]="sectionSelectorComponent" [data]="data">
 
-<core-block-course-blocks *ngIf="loaded" [courseId]="course!.id" [hideBlocks]="!displayBlocks" [downloadEnabled]="downloadEnabled"
-    [hideBottomBlocks]="selectedSection && selectedSection.id == allSectionsId && canLoadMore">
+            <div *ngIf="displaySectionSelector && sections && hasSeveralSections"
+                class="ion-text-wrap ion-justify-content-between ion-align-items-center core-button-selector-row"
+                [class.core-section-download]="downloadEnabled">
+                <core-combobox [modalOptions]="sectionSelectorModalOptions" interface="modal" listboxId="core-course-section-button"
+                    icon="fas-folder" [label]="'core.course.section' | translate"
+                    [selection]="selectedSection ? selectedSection.name : 'core.course.sections' | translate"
+                    (onChange)="sectionChanged($event)">
+                    <span slot="text">
+                        <core-format-text *ngIf="selectedSection" [text]="selectedSection.name" contextLevel="course"
+                            [contextInstanceId]="course?.id" [clean]="true" [singleLine]="true">
+                        </core-format-text>
+                        <ng-container *ngIf="!selectedSection">{{ 'core.course.sections' | translate }}</ng-container>
+                    </span>
+                </core-combobox>
+                <!-- Section download. -->
+                <ng-container *ngTemplateOutlet="sectionDownloadTemplate; context: {section: selectedSection}"></ng-container>
+            </div>
+        </core-dynamic-component>
 
-    <core-dynamic-component [component]="courseFormatComponent" [data]="data">
-        <!-- Default course format. -->
-        <core-loading [hideUntil]="loaded">
-            <!-- Section selector. -->
-            <core-dynamic-component [component]="sectionSelectorComponent" [data]="data">
-
-                <div *ngIf="displaySectionSelector && sections && hasSeveralSections"
-                    class="ion-text-wrap ion-justify-content-between ion-align-items-center core-button-selector-row"
-                    [class.core-section-download]="downloadEnabled">
-                    <core-combobox
-                        [modalOptions]="sectionSelectorModalOptions"
-                        interface="modal"
-                        listboxId="core-course-section-button"
-                        icon="fas-folder"
-                        [label]="'core.course.section' | translate"
-                        [selection]="selectedSection ? selectedSection.name : 'core.course.sections' | translate"
-                        (onChange)="sectionChanged($event)"
-                    >
-                        <span slot="text">
-                            <core-format-text *ngIf="selectedSection" [text]="selectedSection.name" contextLevel="course"
-                                [contextInstanceId]="course?.id" [clean]="true" [singleLine]="true">
-                            </core-format-text>
-                            <ng-container *ngIf="!selectedSection">{{ 'core.course.sections' | translate }}</ng-container>
-                        </span>
-                    </core-combobox>
-                    <!-- Section download. -->
-                    <ng-container *ngTemplateOutlet="sectionDownloadTemplate; context: {section: selectedSection}"></ng-container>
+        <!-- Course summary. By default we only display the course progress. -->
+        <core-dynamic-component [component]="courseSummaryComponent" [data]="data">
+            <ion-list lines="none" class="core-format-progress-list" *ngIf="imageThumb || (selectedSection?.id == allSectionsId && progress !== undefined) ||
+                    (selectedSection && selectedSection.id != allSectionsId &&
+                    (selectedSection.availabilityinfo || selectedSection.visible === 0))">
+                <div *ngIf="imageThumb" class="core-course-thumb">
+                    <img [src]="imageThumb" core-external-content alt="" />
                 </div>
+                <ng-container *ngIf="selectedSection">
+                    <ion-item class="core-course-progress" *ngIf="selectedSection?.id == allSectionsId && progress !== undefined">
+                        <core-progress-bar [progress]="progress" a11yText="core.course.aria:sectionprogress">
+                        </core-progress-bar>
+                    </ion-item>
+                    <ion-item *ngIf="selectedSection && selectedSection.id != allSectionsId &&
+                        (selectedSection.availabilityinfo || selectedSection.visible === 0)">
+                        <ion-badge color="info" class="ion-text-wrap"
+                            *ngIf="selectedSection.visible === 0 && selectedSection.uservisible !== false">
+                            {{ 'core.course.hiddenfromstudents' | translate }}
+                        </ion-badge>
+                        <ion-badge color="info" class="ion-text-wrap"
+                            *ngIf="selectedSection.visible === 0 && selectedSection.uservisible === false">
+                            {{ 'core.notavailable' | translate }}
+                        </ion-badge>
+                        <ion-badge color="info" class="ion-text-wrap" *ngIf="selectedSection.availabilityinfo">
+                            <core-format-text [text]="selectedSection.availabilityinfo" contextLevel="course"
+                                [contextInstanceId]="course?.id">
+                            </core-format-text>
+                        </ion-badge>
+                    </ion-item>
+                </ng-container>
+            </ion-list>
+        </core-dynamic-component>
+
+        <!-- Single section. -->
+        <div *ngIf="selectedSection && selectedSection.id != allSectionsId">
+            <core-dynamic-component [component]="singleSectionComponent" [data]="data">
+                <ng-container *ngTemplateOutlet="sectionTemplate; context: {section: selectedSection}"></ng-container>
+                <core-empty-box *ngIf="!selectedSection.hasContent" icon="fas-th-large"
+                    [message]="'core.course.nocontentavailable' | translate">
+                </core-empty-box>
+            </core-dynamic-component>
+        </div>
+
+        <!-- Multiple sections. -->
+        <div *ngIf="selectedSection && selectedSection.id == allSectionsId">
+            <core-dynamic-component [component]="allSectionsComponent" [data]="data">
+                <ng-container *ngFor="let section of sections; index as i">
+                    <ng-container *ngIf="i <= showSectionId">
+                        <ng-container *ngTemplateOutlet="sectionTemplate; context: {section: section}"></ng-container>
+                    </ng-container>
+                </ng-container>
             </core-dynamic-component>
 
-            <!-- Course summary. By default we only display the course progress. -->
-            <core-dynamic-component [component]="courseSummaryComponent" [data]="data">
-                <ion-list lines="none" class="core-format-progress-list"
-                    *ngIf="imageThumb || (selectedSection?.id == allSectionsId && progress !== undefined) ||
-                        (selectedSection && selectedSection.id != allSectionsId &&
-                        (selectedSection.availabilityinfo || selectedSection.visible === 0))">
-                    <div *ngIf="imageThumb" class="core-course-thumb">
-                        <img [src]="imageThumb" core-external-content alt=""/>
-                    </div>
-                    <ng-container *ngIf="selectedSection">
-                        <ion-item class="core-course-progress"
-                            *ngIf="selectedSection?.id == allSectionsId && progress !== undefined">
-                            <core-progress-bar [progress]="progress" a11yText="core.course.aria:sectionprogress">
-                            </core-progress-bar>
-                        </ion-item>
-                        <ion-item *ngIf="selectedSection && selectedSection.id != allSectionsId &&
-                            (selectedSection.availabilityinfo || selectedSection.visible === 0)">
-                            <ion-badge color="info" class="ion-text-wrap"
-                                *ngIf="selectedSection.visible === 0 && selectedSection.uservisible !== false">
-                                {{ 'core.course.hiddenfromstudents' | translate }}
-                            </ion-badge>
-                            <ion-badge color="info" class="ion-text-wrap"
-                                *ngIf="selectedSection.visible === 0 && selectedSection.uservisible === false">
-                                {{ 'core.notavailable' | translate }}
-                            </ion-badge>
-                            <ion-badge color="info" class="ion-text-wrap" *ngIf="selectedSection.availabilityinfo">
-                                <core-format-text [text]="selectedSection.availabilityinfo" contextLevel="course"
-                                    [contextInstanceId]="course?.id">
-                                </core-format-text>
-                            </ion-badge>
-                        </ion-item>
-                    </ng-container>
-                </ion-list>
-            </core-dynamic-component>
+            <core-infinite-loading [enabled]="canLoadMore" (action)="showMoreActivities($event)"></core-infinite-loading>
+        </div>
 
-            <!-- Single section. -->
-            <div *ngIf="selectedSection && selectedSection.id != allSectionsId">
-                <core-dynamic-component [component]="singleSectionComponent" [data]="data">
-                    <ng-container *ngTemplateOutlet="sectionTemplate; context: {section: selectedSection}"></ng-container>
-                    <core-empty-box *ngIf="!selectedSection.hasContent" icon="fas-th-large"
-                        [message]="'core.course.nocontentavailable' | translate">
-                    </core-empty-box>
-                </core-dynamic-component>
-            </div>
+        <ion-buttons class="ion-padding core-course-section-nav-buttons safe-area-padding-horizontal"
+            *ngIf="displaySectionSelector && sections?.length">
+            <ion-button *ngIf="previousSection" (click)="sectionChanged(previousSection)" fill="outline" color="primary"
+                [attr.aria-label]="('core.previous' | translate) + ': ' + previousSection.name">
+                <ion-icon name="fas-chevron-left" slot="icon-only" aria-hidden="true"></ion-icon>
+                <core-format-text class="sr-only" [text]="previousSection.name" contextLevel="course" [contextInstanceId]="course?.id">
+                </core-format-text>
+            </ion-button>
+            <ion-button *ngIf="nextSection" (click)="sectionChanged(nextSection)" fill="solid" color="primary"
+                [attr.aria-label]="('core.next' | translate) + ': ' + nextSection.name">
+                <core-format-text class="sr-only" [text]="nextSection.name" contextLevel="course" [contextInstanceId]="course?.id">
+                </core-format-text>
+                <ion-icon name="fas-chevron-right" slot="icon-only" aria-hidden="true"></ion-icon>
+            </ion-button>
+        </ion-buttons>
 
-            <!-- Multiple sections. -->
-            <div *ngIf="selectedSection && selectedSection.id == allSectionsId">
-                <core-dynamic-component [component]="allSectionsComponent" [data]="data">
-                    <ng-container *ngFor="let section of sections; index as i">
-                        <ng-container *ngIf="i <= showSectionId">
-                            <ng-container *ngTemplateOutlet="sectionTemplate; context: {section: section}"></ng-container>
-                        </ng-container>
-                    </ng-container>
-                </core-dynamic-component>
-
-                <core-infinite-loading [enabled]="canLoadMore" (action)="showMoreActivities($event)"></core-infinite-loading>
-            </div>
-
-            <ion-buttons class="ion-padding core-course-section-nav-buttons safe-area-padding-horizontal"
-                *ngIf="displaySectionSelector && sections?.length">
-                <ion-button *ngIf="previousSection" (click)="sectionChanged(previousSection)" fill="outline" color="primary"
-                    [attr.aria-label]="('core.previous' | translate) + ': ' + previousSection.name">
-                    <ion-icon name="fas-chevron-left" slot="icon-only" aria-hidden="true"></ion-icon>
-                    <core-format-text class="sr-only" [text]="previousSection.name" contextLevel="course"
-                        [contextInstanceId]="course?.id">
-                    </core-format-text>
-                </ion-button>
-                <ion-button *ngIf="nextSection" (click)="sectionChanged(nextSection)" fill="solid" color="primary"
-                    [attr.aria-label]="('core.next' | translate) + ': ' + nextSection.name">
-                    <core-format-text class="sr-only" [text]="nextSection.name" contextLevel="course"
-                        [contextInstanceId]="course?.id">
-                    </core-format-text>
-                    <ion-icon name="fas-chevron-right" slot="icon-only" aria-hidden="true"></ion-icon>
-                </ion-button>
-            </ion-buttons>
-        </core-loading>
-    </core-dynamic-component>
-</core-block-course-blocks>
+        <core-block-side-blocks-button *ngIf="course && displayBlocks && hasBlocks" [courseId]="course.id"
+            [downloadEnabled]="downloadEnabled">
+        </core-block-side-blocks-button>
+    </core-loading>
+</core-dynamic-component>
 
 <!-- Template to render a section. -->
 <ng-template #sectionTemplate let-section="section">
     <section *ngIf="!section.hiddenbynumsections && section.id != allSectionsId && section.id != stealthModulesSectionId">
         <!-- Title is only displayed when viewing all sections. -->
         <ion-item-divider *ngIf="selectedSection?.id == allSectionsId && section.name" class="ion-text-wrap" color="light"
-            [class.core-section-download]="downloadEnabled"
-            [class.item-dimmed]="section.visible === 0 || section.uservisible === false">
+            [class.core-section-download]="downloadEnabled" [class.item-dimmed]="section.visible === 0 || section.uservisible === false">
             <ion-label>
                 <h2>
                     <core-format-text [text]="section.name" contextLevel="course" [contextInstanceId]="course?.id">
diff --git a/src/core/features/course/components/format/format.ts b/src/core/features/course/components/format/format.ts
index a76e10358..6e8ae36bc 100644
--- a/src/core/features/course/components/format/format.ts
+++ b/src/core/features/course/components/format/format.ts
@@ -24,7 +24,6 @@ import {
     ViewChildren,
     QueryList,
     Type,
-    ViewChild,
     ElementRef,
 } from '@angular/core';
 import { ModalOptions } from '@ionic/core';
@@ -48,8 +47,8 @@ import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { IonContent, IonRefresher } from '@ionic/angular';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreCourseModulePrefetchDelegate } from '@features/course/services/module-prefetch-delegate';
-import { CoreBlockCourseBlocksComponent } from '@features/block/components/course-blocks/course-blocks';
 import { CoreCourseSectionSelectorComponent } from '../section-selector/section-selector';
+import { CoreBlockHelper } from '@features/block/services/block-helper';
 
 /**
  * Component to display course contents using a certain format. If the format isn't found, use default one.
@@ -79,7 +78,6 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
     @Output() completionChanged = new EventEmitter<CoreCourseModuleCompletionData>(); // Notify when any module completion changes.
 
     @ViewChildren(CoreDynamicComponent) dynamicComponents?: QueryList<CoreDynamicComponent>;
-    @ViewChild(CoreBlockCourseBlocksComponent) courseBlocksComponent?: CoreBlockCourseBlocksComponent;
 
     // All the possible component classes.
     courseFormatComponent?: Type<unknown>;
@@ -92,8 +90,9 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
     showSectionId = 0;
     data: Record<string, unknown> = {}; // Data to pass to the components.
 
-    displaySectionSelector?: boolean;
-    displayBlocks?: boolean;
+    displaySectionSelector = false;
+    displayBlocks = false;
+    hasBlocks = false;
     selectedSection?: CoreCourseSection;
     previousSection?: CoreCourseSection;
     nextSection?: CoreCourseSection;
@@ -180,7 +179,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
     /**
      * Detect changes on input properties.
      */
-    ngOnChanges(changes: { [name: string]: SimpleChange }): void {
+    async ngOnChanges(changes: { [name: string]: SimpleChange }): Promise<void> {
         this.setInputData();
         this.sectionSelectorModalOptions.componentProps!.course = this.course;
         this.sectionSelectorModalOptions.componentProps!.sections = this.sections;
@@ -191,6 +190,9 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
 
             this.displaySectionSelector = CoreCourseFormatDelegate.displaySectionSelector(this.course);
             this.displayBlocks = CoreCourseFormatDelegate.displayBlocks(this.course);
+
+            this.hasBlocks = await CoreBlockHelper.hasCourseBlocks(this.course.id);
+
             this.updateProgress();
 
             if ('overviewfiles' in this.course) {
@@ -498,8 +500,13 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
             await component.callComponentFunction('doRefresh', [refresher, done, afterCompletionChange]);
         }) || [];
 
-        if (this.courseBlocksComponent) {
-            promises.push(this.courseBlocksComponent.doRefresh());
+        if (this.course) {
+            const courseId = this.course.id;
+            promises.push(CoreCourse.invalidateCourseBlocks(courseId).then(async () => {
+                this.hasBlocks = await CoreBlockHelper.hasCourseBlocks(courseId);
+
+                return;
+            }));
         }
 
         await Promise.all(promises);
diff --git a/src/core/features/sitehome/pages/index/index.html b/src/core/features/sitehome/pages/index/index.html
index f96e2ea06..9220391ae 100644
--- a/src/core/features/sitehome/pages/index/index.html
+++ b/src/core/features/sitehome/pages/index/index.html
@@ -3,11 +3,9 @@
         <ion-icon name="fas-search" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
     <core-context-menu>
-        <core-context-menu-item [priority]="1000" *ngIf="displayEnableDownload"
-            [content]="'core.settings.showdownloadoptions' | translate" (action)="switchDownload()"
-            iconAction="toggle" [(toggle)]="downloadEnabled"></core-context-menu-item>
-        <core-context-menu-item [priority]="500"
-            [content]="'addon.storagemanager.managestorage' | translate"
+        <core-context-menu-item [priority]="1000" *ngIf="displayEnableDownload" [content]="'core.settings.showdownloadoptions' | translate"
+            (action)="switchDownload()" iconAction="toggle" [(toggle)]="downloadEnabled"></core-context-menu-item>
+        <core-context-menu-item [priority]="500" [content]="'addon.storagemanager.managestorage' | translate"
             (action)="manageCoursesStorage()" iconAction="fas-archive"></core-context-menu-item>
     </core-context-menu>
 </core-navbar-buttons>
@@ -15,49 +13,52 @@
     <ion-refresher slot="fixed" [disabled]="!dataLoaded" (ionRefresh)="doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <core-block-course-blocks [courseId]="siteHomeId" [downloadEnabled]="downloadEnabled">
-        <core-loading [hideUntil]="dataLoaded">
-                <ion-list>
-                    <!-- Site home main contents. -->
-                    <ng-container *ngIf="section && section.hasContent">
-                        <ion-item class="ion-text-wrap" *ngIf="section.summary">
-                            <ion-label><core-format-text [text]="section.summary" contextLevel="course" [contextInstanceId]="siteHomeId">
-                            </core-format-text></ion-label>
-                        </ion-item>
+    <core-loading [hideUntil]="dataLoaded">
+        <ion-list>
+            <!-- Site home main contents. -->
+            <ng-container *ngIf="section && section.hasContent">
+                <ion-item class="ion-text-wrap" *ngIf="section.summary">
+                    <ion-label>
+                        <core-format-text [text]="section.summary" contextLevel="course" [contextInstanceId]="siteHomeId">
+                        </core-format-text>
+                    </ion-label>
+                </ion-item>
 
-                        <core-course-module *ngFor="let module of section.modules" [module]="module" [courseId]="siteHomeId"
-                            [downloadEnabled]="downloadEnabled" [section]="section"></core-course-module>
-                    </ng-container>
+                <core-course-module *ngFor="let module of section.modules" [module]="module" [courseId]="siteHomeId"
+                    [downloadEnabled]="downloadEnabled" [section]="section"></core-course-module>
+            </ng-container>
 
-                    <!-- Site home items: news, categories, courses, etc. -->
-                    <ng-container *ngIf="items.length > 0">
-                        <core-spacer *ngIf="section && section!.hasContent"></core-spacer>
-                        <ng-container *ngFor="let item of items">
-                            <ng-container [ngSwitch]="item">
-                                <ng-container *ngSwitchCase="'LIST_OF_COURSE'">
-                                    <ng-template *ngTemplateOutlet="allCourseList"></ng-template>
-                                </ng-container>
-                                <ng-container *ngSwitchCase="'LIST_OF_CATEGORIES'">
-                                    <ng-template *ngTemplateOutlet="categories"></ng-template>
-                                </ng-container>
-                                <ng-container *ngSwitchCase="'COURSE_SEARCH_BOX'">
-                                    <ng-template *ngTemplateOutlet="courseSearch"></ng-template>
-                                </ng-container>
-                                <ng-container *ngSwitchCase="'ENROLLED_COURSES'">
-                                    <ng-template *ngTemplateOutlet="enrolledCourseList"></ng-template>
-                                </ng-container>
-                                <ng-container *ngSwitchCase="'NEWS_ITEMS'">
-                                    <ng-template *ngTemplateOutlet="news"></ng-template>
-                                </ng-container>
-                            </ng-container>
+            <!-- Site home items: news, categories, courses, etc. -->
+            <ng-container *ngIf="items.length > 0">
+                <core-spacer *ngIf="section && section!.hasContent"></core-spacer>
+                <ng-container *ngFor="let item of items">
+                    <ng-container [ngSwitch]="item">
+                        <ng-container *ngSwitchCase="'LIST_OF_COURSE'">
+                            <ng-template *ngTemplateOutlet="allCourseList"></ng-template>
+                        </ng-container>
+                        <ng-container *ngSwitchCase="'LIST_OF_CATEGORIES'">
+                            <ng-template *ngTemplateOutlet="categories"></ng-template>
+                        </ng-container>
+                        <ng-container *ngSwitchCase="'COURSE_SEARCH_BOX'">
+                            <ng-template *ngTemplateOutlet="courseSearch"></ng-template>
+                        </ng-container>
+                        <ng-container *ngSwitchCase="'ENROLLED_COURSES'">
+                            <ng-template *ngTemplateOutlet="enrolledCourseList"></ng-template>
+                        </ng-container>
+                        <ng-container *ngSwitchCase="'NEWS_ITEMS'">
+                            <ng-template *ngTemplateOutlet="news"></ng-template>
                         </ng-container>
                     </ng-container>
-                </ion-list>
-            <core-empty-box *ngIf="!hasContent" icon="fas-box-open" [message]="'core.course.nocontentavailable' | translate">
+                </ng-container>
+            </ng-container>
+        </ion-list>
+        <core-block-side-blocks-button *ngIf="hasBlocks" [courseId]="siteHomeId" [downloadEnabled]="downloadEnabled">
+        </core-block-side-blocks-button>
 
-            </core-empty-box>
-        </core-loading>
-    </core-block-course-blocks>
+        <core-empty-box *ngIf="!hasContent" icon="fas-box-open" [message]="'core.course.nocontentavailable' | translate">
+
+        </core-empty-box>
+    </core-loading>
 </ion-content>
 
 <ng-template #allCourseList>
@@ -88,13 +89,17 @@
     <ion-item button class="ion-text-wrap" (click)="openMyCourses()" detail="true">
         <ion-icon name="fas-graduation-cap" fixed-width slot="start" aria-hidden="true">
         </ion-icon>
-        <ion-label><h2>{{ 'core.courses.mycourses' | translate}}</h2></ion-label>
+        <ion-label>
+            <h2>{{ 'core.courses.mycourses' | translate}}</h2>
+        </ion-label>
     </ion-item>
 </ng-template>
 
 <ng-template #courseSearch>
     <ion-item button class="ion-text-wrap" (click)="openSearch()" detail="true">
         <ion-icon name="fas-search" slot="start" aria-hidden="true"></ion-icon>
-        <ion-label><h2>{{ 'core.courses.searchcourses' | translate}}</h2></ion-label>
+        <ion-label>
+            <h2>{{ 'core.courses.searchcourses' | translate}}</h2>
+        </ion-label>
     </ion-item>
 </ng-template>
diff --git a/src/core/features/sitehome/pages/index/index.ts b/src/core/features/sitehome/pages/index/index.ts
index 777d6ce9c..eae6406f8 100644
--- a/src/core/features/sitehome/pages/index/index.ts
+++ b/src/core/features/sitehome/pages/index/index.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { Component, OnDestroy, OnInit } from '@angular/core';
 import { IonRefresher } from '@ionic/angular';
 import { Params } from '@angular/router';
 
@@ -24,10 +24,11 @@ import { CoreSiteHome } from '@features/sitehome/services/sitehome';
 import { CoreCourses, CoreCoursesProvider } from '@features//courses/services/courses';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreCourseHelper, CoreCourseModule } from '@features/course/services/course-helper';
-import { CoreBlockCourseBlocksComponent } from '@features/block/components/course-blocks/course-blocks';
 import { CoreCourseModuleDelegate, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
 import { CoreCourseModulePrefetchDelegate } from '@features/course/services/module-prefetch-delegate';
 import { CoreNavigator } from '@services/navigator';
+import { CoreBlockHelper } from '@features/block/services/block-helper';
+import { CoreUtils } from '@services/utils/utils';
 
 /**
  * Page that displays site home index.
@@ -38,14 +39,13 @@ import { CoreNavigator } from '@services/navigator';
 })
 export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
 
-    @ViewChild(CoreBlockCourseBlocksComponent) courseBlocksComponent?: CoreBlockCourseBlocksComponent;
-
     dataLoaded = false;
     section?: CoreCourseWSSection & {
         hasContent?: boolean;
     };
 
     hasContent = false;
+    hasBlocks = false;
     items: string[] = [];
     siteHomeId = 1;
     currentSite!: CoreSite;
@@ -106,8 +106,8 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
         this.items = await CoreSiteHome.getFrontPageItems(config.frontpageloggedin);
         this.hasContent = this.items.length > 0;
 
-        if (this.items.some((item) => item == 'NEWS_ITEMS')) {
-            // Get the news forum.
+        // Get the news forum.
+        if (this.items.includes('NEWS_ITEMS')) {
             try {
                 const forum = await CoreSiteHome.getNewsForum(this.siteHomeId);
                 this.newsForumModule = await CoreCourse.getModule(forum.cmid, forum.course);
@@ -140,17 +140,17 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
             }
 
             // Add log in Moodle.
-            CoreCourse.logView(
+            CoreUtils.ignoreErrors(CoreCourse.logView(
                 this.siteHomeId,
                 undefined,
                 undefined,
                 this.currentSite.getInfo()?.sitename,
-            ).catch(() => {
-                // Ignore errors.
-            });
+            ));
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'core.course.couldnotloadsectioncontent', true);
         }
+
+        this.hasBlocks = await CoreBlockHelper.hasCourseBlocks(this.siteHomeId);
     }
 
     /**
@@ -170,24 +170,15 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
             return;
         }));
 
+        promises.push(CoreCourse.invalidateCourseBlocks(this.siteHomeId));
+
         if (this.section && this.section.modules) {
             // Invalidate modules prefetch data.
             promises.push(CoreCourseModulePrefetchDelegate.invalidateModules(this.section.modules, this.siteHomeId));
         }
 
-        if (this.courseBlocksComponent) {
-            promises.push(this.courseBlocksComponent.invalidateBlocks());
-        }
-
         Promise.all(promises).finally(async () => {
-            const p2: Promise<unknown>[] = [];
-
-            p2.push(this.loadContent());
-            if (this.courseBlocksComponent) {
-                p2.push(this.courseBlocksComponent.loadContent());
-            }
-
-            await Promise.all(p2).finally(() => {
+            await this.loadContent().finally(() => {
                 refresher?.complete();
             });
         });
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 56998e1eb..fa001efb9 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -197,13 +197,6 @@
         --background: var(--core-progressbar-background);
     }
 
-    --core-side-blocks-max-width: 30%;
-    --core-side-blocks-min-width: 280px;
-    core-block-course-blocks {
-        --side-blocks-max-width: var(--core-side-blocks-max-width);
-        --side-blocks-min-width: var(--core-side-blocks-min-width);
-    }
-
     --ion-item-background:        #{$ion-item-background};
     --ion-item-detail-icon-color: var(--gray-darker);
     --ion-item-detail-icon-font-size: 20px;

From 0bfe870af1dffed5f9b1447c65e28bea8e36861e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 12 Nov 2021 16:32:54 +0100
Subject: [PATCH 0203/1008] MOBILE-3914 dashboard: Add side blocks on dashboard

---
 .../components/side-blocks/side-blocks.ts     | 15 ++++--
 .../courses/pages/dashboard/dashboard.html    | 13 ++---
 .../courses/pages/dashboard/dashboard.ts      |  8 +++-
 .../features/courses/services/dashboard.ts    | 47 ++++++++++++++++++-
 .../services/handlers/dashboard-home.ts       |  2 +-
 5 files changed, 72 insertions(+), 13 deletions(-)

diff --git a/src/core/features/block/components/side-blocks/side-blocks.ts b/src/core/features/block/components/side-blocks/side-blocks.ts
index 18dc3c9ca..eefc8f527 100644
--- a/src/core/features/block/components/side-blocks/side-blocks.ts
+++ b/src/core/features/block/components/side-blocks/side-blocks.ts
@@ -20,6 +20,7 @@ import { CoreBlockHelper } from '../../services/block-helper';
 import { CoreBlockComponent } from '../block/block';
 import { CoreUtils } from '@services/utils/utils';
 import { IonRefresher } from '@ionic/angular';
+import { CoreCoursesDashboard } from '@features/courses/services/dashboard';
 
 /**
  * Component that displays the list of side blocks.
@@ -30,7 +31,7 @@ import { IonRefresher } from '@ionic/angular';
 })
 export class CoreBlockSideBlocksComponent implements OnInit {
 
-    @Input() courseId!: number;
+    @Input() courseId?: number;
     @Input() downloadEnabled = false;
 
     @ViewChildren(CoreBlockComponent) blocksComponents?: QueryList<CoreBlockComponent>;
@@ -55,8 +56,10 @@ export class CoreBlockSideBlocksComponent implements OnInit {
     async invalidateBlocks(): Promise<void> {
         const promises: Promise<void>[] = [];
 
-        if (CoreBlockHelper.canGetCourseBlocks()) {
+        if (this.courseId) {
             promises.push(CoreCourse.invalidateCourseBlocks(this.courseId));
+        } else {
+            promises.push(CoreCoursesDashboard.invalidateDashboardBlocks());
         }
 
         // Invalidate the blocks.
@@ -76,7 +79,13 @@ export class CoreBlockSideBlocksComponent implements OnInit {
      */
     async loadContent(): Promise<void> {
         try {
-            this.blocks = await CoreBlockHelper.getCourseBlocks(this.courseId);
+            if (this.courseId) {
+                this.blocks = await CoreBlockHelper.getCourseBlocks(this.courseId);
+            } else {
+                const blocks = await CoreCoursesDashboard.getDashboardBlocks();
+
+                this.blocks = blocks.sideBlocks;
+            }
         } catch (error) {
             CoreDomUtils.showErrorModal(error);
 
diff --git a/src/core/features/courses/pages/dashboard/dashboard.html b/src/core/features/courses/pages/dashboard/dashboard.html
index c79854f7a..ee5fb7421 100644
--- a/src/core/features/courses/pages/dashboard/dashboard.html
+++ b/src/core/features/courses/pages/dashboard/dashboard.html
@@ -4,10 +4,9 @@
     </ion-button>
     <core-context-menu>
         <core-context-menu-item *ngIf="(downloadCourseEnabled || downloadCoursesEnabled)" [priority]="1000"
-            [content]="'core.settings.showdownloadoptions' | translate" (action)="switchDownload()"
-            iconAction="toggle" [(toggle)]="downloadEnabled"></core-context-menu-item>
-        <core-context-menu-item [priority]="500"
-            [content]="'addon.storagemanager.managestorage' | translate"
+            [content]="'core.settings.showdownloadoptions' | translate" (action)="switchDownload()" iconAction="toggle"
+            [(toggle)]="downloadEnabled"></core-context-menu-item>
+        <core-context-menu-item [priority]="500" [content]="'addon.storagemanager.managestorage' | translate"
             (action)="manageCoursesStorage()" iconAction="fas-archive"></core-context-menu-item>
     </core-context-menu>
 </core-navbar-buttons>
@@ -20,11 +19,13 @@
         <ion-list>
             <ng-container *ngFor="let block of blocks">
                 <core-block *ngIf="block.visible" [block]="block" contextLevel="user" [instanceId]="userId"
-                [extraData]="{'downloadEnabled': downloadEnabled}"></core-block>
+                    [extraData]="{'downloadEnabled': downloadEnabled}"></core-block>
             </ng-container>
         </ion-list>
 
-        <core-empty-box *ngIf="blocks.length == 0" icon="fas-th-large" [message]="'core.course.nocontentavailable' | translate">
+        <core-block-side-blocks-button *ngIf="hasSideBlocks" [downloadEnabled]="downloadEnabled"></core-block-side-blocks-button>
+
+        <core-empty-box *ngIf="blocks.length == 0" icon="fas-cubes" [message]="'core.course.nocontentavailable' | translate">
         </core-empty-box>
     </core-loading>
 </ion-content>
diff --git a/src/core/features/courses/pages/dashboard/dashboard.ts b/src/core/features/courses/pages/dashboard/dashboard.ts
index 5102614cc..2b7448a0b 100644
--- a/src/core/features/courses/pages/dashboard/dashboard.ts
+++ b/src/core/features/courses/pages/dashboard/dashboard.ts
@@ -23,6 +23,7 @@ import { CoreDomUtils } from '@services/utils/dom';
 import { CoreCourseBlock } from '@features/course/services/course';
 import { CoreBlockComponent } from '@features/block/components/block/block';
 import { CoreNavigator } from '@services/navigator';
+import { CoreBlockDelegate } from '@features/block/services/block-delegate';
 
 /**
  * Page that displays the dashboard page.
@@ -36,6 +37,7 @@ export class CoreCoursesDashboardPage implements OnInit, OnDestroy {
 
     @ViewChildren(CoreBlockComponent) blocksComponents?: QueryList<CoreBlockComponent>;
 
+    hasSideBlocks = false;
     searchEnabled = false;
     downloadEnabled = false;
     downloadCourseEnabled = false;
@@ -88,7 +90,11 @@ export class CoreCoursesDashboardPage implements OnInit, OnDestroy {
             this.userId = CoreSites.getCurrentSiteUserId();
 
             try {
-                this.blocks = await CoreCoursesDashboard.getDashboardBlocks();
+                const blocks = await CoreCoursesDashboard.getDashboardBlocks();
+
+                this.blocks = blocks.mainBlocks;
+
+                this.hasSideBlocks = CoreBlockDelegate.hasSupportedBlock(blocks.sideBlocks);
             } catch (error) {
                 CoreDomUtils.showErrorModal(error);
 
diff --git a/src/core/features/courses/services/dashboard.ts b/src/core/features/courses/services/dashboard.ts
index d592f2e2d..76823a0b2 100644
--- a/src/core/features/courses/services/dashboard.ts
+++ b/src/core/features/courses/services/dashboard.ts
@@ -38,14 +38,14 @@ export class CoreCoursesDashboardProvider {
     }
 
     /**
-     * Get dashboard blocks.
+     * Get dashboard blocks from WS.
      *
      * @param userId User ID. Default, current user.
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with the list of blocks.
      * @since 3.6
      */
-    async getDashboardBlocks(userId?: number, siteId?: string): Promise<CoreCourseBlock[]> {
+    protected async getDashboardBlocksFromWS(userId?: number, siteId?: string): Promise<CoreCourseBlock[]> {
         const site = await CoreSites.getSite(siteId);
 
         const params: CoreBlockGetDashboardBlocksWSParams = {
@@ -63,6 +63,44 @@ export class CoreCoursesDashboardProvider {
         return result.blocks || [];
     }
 
+    /**
+     * Get dashboard blocks.
+     *
+     * @param userId User ID. Default, current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the list of blocks.
+     */
+    async getDashboardBlocks(userId?: number, siteId?: string): Promise<CoreCoursesDashboardBlocks> {
+        const blocks = await CoreCoursesDashboard.getDashboardBlocksFromWS(userId, siteId);
+
+        let mainBlocks: CoreCourseBlock[] = [];
+        let sideBlocks: CoreCourseBlock[] = [];
+
+        blocks.forEach((block) => {
+            if (block.region == 'content' || block.region == 'main') {
+                mainBlocks.push(block);
+            } else {
+                sideBlocks.push(block);
+            }
+        });
+
+        if (mainBlocks.length == 0) {
+            mainBlocks = [];
+            sideBlocks = [];
+
+            blocks.forEach((block) => {
+                if (block.region.match('side')) {
+                    sideBlocks.push(block);
+                } else {
+                    mainBlocks.push(block);
+                }
+            });
+        }
+
+        return { mainBlocks, sideBlocks };
+
+    }
+
     /**
      * Invalidates dashboard blocks WS call.
      *
@@ -122,6 +160,11 @@ export class CoreCoursesDashboardProvider {
 
 export const CoreCoursesDashboard = makeSingleton(CoreCoursesDashboardProvider);
 
+export type CoreCoursesDashboardBlocks = {
+    mainBlocks: CoreCourseBlock[];
+    sideBlocks: CoreCourseBlock[];
+};
+
 /**
  * Params of core_block_get_dashboard_blocks WS.
  */
diff --git a/src/core/features/courses/services/handlers/dashboard-home.ts b/src/core/features/courses/services/handlers/dashboard-home.ts
index 998a6fac7..0076031a8 100644
--- a/src/core/features/courses/services/handlers/dashboard-home.ts
+++ b/src/core/features/courses/services/handlers/dashboard-home.ts
@@ -68,7 +68,7 @@ export class CoreDashboardHomeHandlerService implements CoreMainMenuHomeHandler
         if (dashboardAvailable && blocksEnabled) {
             const blocks = await CoreCoursesDashboard.getDashboardBlocks(undefined, siteId);
 
-            return CoreBlockDelegate.hasSupportedBlock(blocks);
+            return CoreBlockDelegate.hasSupportedBlock(blocks.mainBlocks) || CoreBlockDelegate.hasSupportedBlock(blocks.sideBlocks);
         }
 
         // Check if my overview is enabled. If it's enabled we will fake enabled blocks.

From d990fa44f97993b3260b0e6d8eb6aa1f2a7a1e3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 16 Nov 2021 13:12:36 +0100
Subject: [PATCH 0204/1008] MOBILE-3914 utils: Close modal before navigating

---
 src/core/services/utils/dom.ts | 53 +++++++++++++++++++++++++++-------
 1 file changed, 43 insertions(+), 10 deletions(-)

diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index e4b6deb5a..610b1753b 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -29,7 +29,15 @@ import { CoreIonLoadingElement } from '@classes/ion-loading';
 import { CoreCanceledError } from '@classes/errors/cancelederror';
 import { CoreAnyError, CoreError } from '@classes/errors/error';
 import { CoreSilentError } from '@classes/errors/silenterror';
-import { makeSingleton, Translate, AlertController, ToastController, PopoverController, ModalController } from '@singletons';
+import {
+    makeSingleton,
+    Translate,
+    AlertController,
+    ToastController,
+    PopoverController,
+    ModalController,
+    Router,
+} from '@singletons';
 import { CoreLogger } from '@singletons/logger';
 import { CoreFileSizeSum } from '@services/plugin-file-delegate';
 import { CoreNetworkError } from '@classes/errors/network-error';
@@ -41,6 +49,9 @@ import { CoreZoomLevel } from '@features/settings/services/settings-helper';
 import { CoreErrorWithTitle } from '@classes/errors/errorwithtitle';
 import { AddonFilterMultilangHandler } from '@addons/filter/multilang/services/handlers/multilang';
 import { CoreSites } from '@services/sites';
+import { NavigationStart } from '@angular/router';
+import { filter } from 'rxjs/operators';
+import { Subscription } from 'rxjs';
 
 /*
  * "Utils" service with helper functions for UI, DOM elements and HTML code.
@@ -1651,18 +1662,32 @@ export class CoreDomUtilsProvider {
     /**
      * Opens a Modal.
      *
-     * @param modalOptions Modal Options.
+     * @param options Modal Options.
      */
     async openModal<T = unknown>(
-        modalOptions: ModalOptions,
+        options: OpenModalOptions,
     ): Promise<T | undefined> {
 
+        const { waitForDismissCompleted, closeOnNavigate, ...modalOptions } = options;
+        const listenCloseEvents = closeOnNavigate ?? true; // Default to true.
+
         const modal = await ModalController.create(modalOptions);
 
+        let navSubscription: Subscription | undefined;
+        if (listenCloseEvents) {
+            // Listen navigation events to close modals.
+            navSubscription = Router.events
+                .pipe(filter(event => event instanceof NavigationStart))
+                .subscribe(async () => {
+                    modal.dismiss();
+                });
+        }
+
         await modal.present();
 
-        // If onDidDismiss is nedded we can add a new param to the function to wait one function or the other.
-        const result = await modal.onWillDismiss<T>();
+        const result = waitForDismissCompleted ? await modal.onDidDismiss<T>() : await modal.onWillDismiss<T>();
+        navSubscription?.unsubscribe();
+
         if (result?.data) {
             return result?.data;
         }
@@ -1671,21 +1696,21 @@ export class CoreDomUtilsProvider {
     /**
      * Opens a side Modal.
      *
-     * @param modalOptions Modal Options.
+     * @param options Modal Options.
      */
     async openSideModal<T = unknown>(
-        modalOptions: ModalOptions,
+        options: OpenModalOptions,
     ): Promise<T | undefined> {
 
-        modalOptions = Object.assign({
+        options = Object.assign({
             cssClass: 'core-modal-lateral',
             showBackdrop: true,
             backdropDismiss: true,
             enterAnimation: CoreModalLateralTransitionEnter,
             leaveAnimation: CoreModalLateralTransitionLeave,
-        }, modalOptions);
+        }, options);
 
-        return await this.openModal<T>(modalOptions);
+        return await this.openModal<T>(options);
     }
 
     /**
@@ -2012,3 +2037,11 @@ export const CoreDomUtils = makeSingleton(CoreDomUtilsProvider);
 export type OpenPopoverOptions = PopoverOptions & {
     waitForDismissCompleted?: boolean;
 };
+
+/**
+ * Options for the openModal function.
+ */
+export type OpenModalOptions = ModalOptions & {
+    waitForDismissCompleted?: boolean;
+    closeOnNavigate?: boolean; // Default true.
+};

From 7c5a7050e9155a0ee0b851b9d0fc8ca287a4f96f Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 17 Nov 2021 08:41:21 +0100
Subject: [PATCH 0205/1008] MOBILE-3902 notifications: Warn admin if push are
 disabled

---
 scripts/langindex.json                        |  2 +
 src/addons/notifications/lang.json            |  1 +
 .../notifications/notifications.module.ts     |  3 +-
 .../notifications/services/notifications.ts   | 97 ++++++++++++++++++-
 src/core/lang.json                            |  1 +
 src/core/services/utils/dom.ts                | 57 ++++++++---
 6 files changed, 142 insertions(+), 19 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 94f7fe43e..489993f04 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1063,6 +1063,7 @@
   "addon.notifications.notificationpreferences": "message",
   "addon.notifications.notifications": "local_moodlemobileapp",
   "addon.notifications.playsound": "local_moodlemobileapp",
+  "addon.notifications.pushdisabledwarning": "local_moodlemobileapp",
   "addon.notifications.therearentnotificationsyet": "local_moodlemobileapp",
   "addon.notifications.unreadnotification": "message",
   "addon.privatefiles.couldnotloadfiles": "local_moodlemobileapp",
@@ -1667,6 +1668,7 @@
   "core.fulllistofcourses": "moodle",
   "core.fullnameandsitename": "local_moodlemobileapp",
   "core.fullscreen": "h5p",
+  "core.goto": "local_moodlemobileapp",
   "core.grades.aggregatemean": "grades",
   "core.grades.aggregatesum": "grades",
   "core.grades.average": "grades",
diff --git a/src/addons/notifications/lang.json b/src/addons/notifications/lang.json
index b3c02b52e..ef4ffefe4 100644
--- a/src/addons/notifications/lang.json
+++ b/src/addons/notifications/lang.json
@@ -4,6 +4,7 @@
     "notificationpreferences": "Notification preferences",
     "notifications": "Notifications",
     "playsound": "Play sound",
+    "pushdisabledwarning": "Your users are not receiving any notification from this site on their mobile devices. Enable mobile notifications in the Notification settings page.",
     "therearentnotificationsyet": "There are no notifications.",
     "unreadnotification": "Unread notification: {{$a}}"
 }
diff --git a/src/addons/notifications/notifications.module.ts b/src/addons/notifications/notifications.module.ts
index 0f2142d22..6ea333938 100644
--- a/src/addons/notifications/notifications.module.ts
+++ b/src/addons/notifications/notifications.module.ts
@@ -26,7 +26,7 @@ import { AddonNotificationsCronHandler } from './services/handlers/cron';
 import { AddonNotificationsPushClickHandler } from './services/handlers/push-click';
 import { AddonNotificationsSettingsHandler, AddonNotificationsSettingsHandlerService } from './services/handlers/settings';
 import { CoreSitePreferencesRoutingModule } from '@features/settings/pages/site/site-routing';
-import { AddonNotificationsProvider } from './services/notifications';
+import { AddonNotifications, AddonNotificationsProvider } from './services/notifications';
 import { AddonNotificationsHelperProvider } from './services/notifications-helper';
 
 export const ADDON_NOTIFICATIONS_SERVICES: Type<unknown>[] = [
@@ -65,6 +65,7 @@ const preferencesRoutes: Routes = [
                 CoreSettingsDelegate.registerHandler(AddonNotificationsSettingsHandler.instance);
 
                 AddonNotificationsMainMenuHandler.initialize();
+                AddonNotifications.initialize();
             },
         },
     ],
diff --git a/src/addons/notifications/services/notifications.ts b/src/addons/notifications/services/notifications.ts
index 3a28a19dc..bd1732ba3 100644
--- a/src/addons/notifications/services/notifications.ts
+++ b/src/addons/notifications/services/notifications.ts
@@ -14,15 +14,18 @@
 
 import { Injectable } from '@angular/core';
 
-import { CoreSites, CoreSitesCommonWSOptions } from '@services/sites';
+import { CoreSites, CoreSitesCommonWSOptions, CoreSitesReadingStrategy } from '@services/sites';
 import { CoreWSExternalWarning } from '@services/ws';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreTimeUtils } from '@services/utils/time';
 import { CoreUser } from '@features/user/services/user';
 import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
 import { CoreLogger } from '@singletons/logger';
-import { makeSingleton } from '@singletons';
+import { makeSingleton, Translate } from '@singletons';
 import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate';
+import { CoreEvents } from '@singletons/events';
+import { CoreDomUtils } from '@services/utils/dom';
+import { CoreUtils } from '@services/utils/utils';
 
 const ROOT_CACHE_KEY = 'mmaNotifications:';
 
@@ -43,6 +46,15 @@ export class AddonNotificationsProvider {
         this.logger = CoreLogger.getInstance('AddonNotificationsProvider');
     }
 
+    /**
+     * Initialize the service.
+     */
+    initialize(): void {
+        CoreEvents.on(CoreEvents.LOGIN, (data) => {
+            this.warnPushDisabledForAdmin(data.siteId);
+        });
+    }
+
     /**
      * Function to format notification data.
      *
@@ -115,16 +127,17 @@ export class AddonNotificationsProvider {
     /**
      * Get notification preferences.
      *
-     * @param siteId Site ID. If not defined, use current site.
+     * @param options Options.
      * @return Promise resolved with the notification preferences.
      */
-    async getNotificationPreferences(siteId?: string): Promise<AddonNotificationsPreferences> {
+    async getNotificationPreferences(options: CoreSitesCommonWSOptions = {}): Promise<AddonNotificationsPreferences> {
         this.logger.debug('Get notification preferences');
 
-        const site = await CoreSites.getSite(siteId);
+        const site = await CoreSites.getSite(options.siteId);
         const preSets: CoreSiteWSPreSets = {
             cacheKey: this.getNotificationPreferencesCacheKey(),
             updateFrequency: CoreSite.FREQUENCY_SOMETIMES,
+            ...CoreSites.getReadingStrategyPreSets(options.readingStrategy), // Include reading strategy preSets.
         };
 
         const data = await site.read<AddonNotificationsGetUserNotificationPreferencesResult>(
@@ -382,6 +395,80 @@ export class AddonNotificationsProvider {
         await site.invalidateWsCacheForKey(this.getNotificationsCacheKey());
     }
 
+    /**
+     * Is user is an admin and push are disabled, notify him.
+     *
+     * @param siteId Site ID.
+     * @return Promise resolved when done.
+     */
+    protected async warnPushDisabledForAdmin(siteId?: string): Promise<void> {
+        if (!siteId) {
+            return;
+        }
+
+        try {
+            const site = await CoreSites.getSite(siteId);
+
+            if (!site.getInfo()?.userissiteadmin) {
+                // Not an admin or we don't know, stop.
+                return;
+            }
+
+            // Check if the admin already asked not to be reminded.
+            const dontAsk = await site.getLocalSiteConfig('AddonNotificationsDontRemindPushDisabled', 0);
+            if (dontAsk) {
+                return;
+            }
+
+            // Check if push are disabled.
+            const preferences = await this.getNotificationPreferences({
+                readingStrategy: CoreSitesReadingStrategy.ONLY_NETWORK,
+                siteId,
+            });
+
+            const processor = preferences.processors.find(processor => processor.name === 'airnotifier');
+            if (processor) {
+                // Enabled.
+                return;
+            }
+
+            // Warn the admin.
+            const dontShowAgain = await CoreDomUtils.showPrompt(
+                Translate.instant('addon.notifications.pushdisabledwarning'),
+                undefined,
+                Translate.instant('core.dontshowagain'),
+                'checkbox',
+                [
+                    {
+                        text: Translate.instant('core.ok'),
+                    },
+                    {
+                        text: Translate.instant('core.goto', { $a: Translate.instant('core.settings.settings') }),
+                        handler: (data, resolve) => {
+                            resolve(data[0]);
+
+                            const url = CoreTextUtils.concatenatePaths(
+                                site.getURL(),
+                                site.isVersionGreaterEqualThan('3.11') ?
+                                    'message/output/airnotifier/checkconfiguration.php' :
+                                    'admin/message.php',
+                            );
+
+                            // Don't try auto-login, admins cannot use it.
+                            CoreUtils.openInBrowser(url);
+                        },
+                    },
+                ],
+            );
+
+            if (dontShowAgain) {
+                await site.setLocalSiteConfig('AddonNotificationsDontRemindPushDisabled', 1);
+            }
+        } catch {
+            // Ignore errors.
+        }
+    }
+
 }
 
 export const AddonNotifications = makeSingleton(AddonNotificationsProvider);
diff --git a/src/core/lang.json b/src/core/lang.json
index 2a7408ed0..08efb25f7 100644
--- a/src/core/lang.json
+++ b/src/core/lang.json
@@ -123,6 +123,7 @@
     "fulllistofcourses": "All courses",
     "fullnameandsitename": "{{fullname}} ({{sitename}})",
     "fullscreen": "Fullscreen",
+    "goto": "Go to {{$a}}",
     "group": "Group",
     "groupsseparate": "Separate groups",
     "groupsvisible": "Visible groups",
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index 610b1753b..bc52b22fe 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -1478,7 +1478,7 @@ export class CoreDomUtilsProvider {
      * @param header Modal header.
      * @param placeholderOrLabel Placeholder (for textual/numeric inputs) or label (for radio/checkbox). By default, "Password".
      * @param type Type of the input element. By default, password.
-     * @param options More options to pass to the alert.
+     * @param buttons Buttons. If not provided, OK and Cancel buttons will be displayed.
      * @return Promise resolved with the input data (true for checkbox/radio) if the user clicks OK, rejected if cancels.
      */
     showPrompt(
@@ -1486,12 +1486,25 @@ export class CoreDomUtilsProvider {
         header?: string,
         placeholderOrLabel?: string,
         type: TextFieldTypes | 'checkbox' | 'radio' | 'textarea' = 'password',
+        buttons?: PromptButton[],
     ): Promise<any> { // eslint-disable-line @typescript-eslint/no-explicit-any
         return new Promise((resolve, reject) => {
             placeholderOrLabel = placeholderOrLabel ?? Translate.instant('core.login.password');
 
             const isCheckbox = type === 'checkbox';
             const isRadio = type === 'radio';
+
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            const resolvePromise = (data: any) => {
+                if (isCheckbox) {
+                    resolve(data[0]);
+                } else if (isRadio) {
+                    resolve(data);
+                } else {
+                    resolve(data.promptinput);
+                }
+            };
+
             const options: AlertOptions = {
                 header,
                 message,
@@ -1504,7 +1517,25 @@ export class CoreDomUtilsProvider {
                         value: (isCheckbox || isRadio) ? true : undefined,
                     },
                 ],
-                buttons: [
+            };
+
+            if (buttons?.length) {
+                options.buttons = buttons.map((button) => ({
+                    ...button,
+                    handler: (data) => {
+                        if (!button.handler) {
+                            // Just resolve the promise.
+                            resolvePromise(data);
+
+                            return;
+                        }
+
+                        button.handler(data, resolve, reject);
+                    },
+                }));
+            } else {
+                // Default buttons.
+                options.buttons = [
                     {
                         text: Translate.instant('core.cancel'),
                         role: 'cancel',
@@ -1514,18 +1545,10 @@ export class CoreDomUtilsProvider {
                     },
                     {
                         text: Translate.instant('core.ok'),
-                        handler: (data) => {
-                            if (isCheckbox) {
-                                resolve(data[0]);
-                            } else if (isRadio) {
-                                resolve(data);
-                            } else {
-                                resolve(data.promptinput);
-                            }
-                        },
+                        handler: resolvePromise,
                     },
-                ],
-            };
+                ];
+            }
 
             this.showAlertWithOptions(options);
         });
@@ -2045,3 +2068,11 @@ export type OpenModalOptions = ModalOptions & {
     waitForDismissCompleted?: boolean;
     closeOnNavigate?: boolean; // Default true.
 };
+
+/**
+ * Buttons for prompt alert.
+ */
+export type PromptButton = Omit<AlertButton, 'handler'> & {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    handler?: (value: any, resolve: (value: any) => void, reject: (reason: any) => void) => void;
+};

From 3cfa76f7f7784e8d69b3857cf8ef48732777b6ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 16 Nov 2021 22:47:54 +0100
Subject: [PATCH 0206/1008] MOBILE-3914 blocks: Add blocks to single activity
 courses

---
 .../side-blocks-button.html                   |  2 +-
 .../components/side-blocks/side-blocks.html   |  2 +-
 .../core-course-format-single-activity.html   |  3 +
 .../components/singleactivity.ts              | 18 ++++-
 .../handlers/singleactivity-format.ts         | 72 +++++--------------
 .../singleactivity/singleactivity.module.ts   |  2 +
 6 files changed, 39 insertions(+), 60 deletions(-)

diff --git a/src/core/features/block/components/side-blocks-button/side-blocks-button.html b/src/core/features/block/components/side-blocks-button/side-blocks-button.html
index b4d634937..d38d89e7f 100644
--- a/src/core/features/block/components/side-blocks-button/side-blocks-button.html
+++ b/src/core/features/block/components/side-blocks-button/side-blocks-button.html
@@ -1,3 +1,3 @@
 <ion-button (click)="openBlocks()" [attr.aria-label]="'core.block.opendrawerblocks' | translate">
-    <ion-icon name="fas-cubes" slot="icon-only" aria-hidden="true"></ion-icon>
+    <ion-icon name="fas-chevron-left" slot="icon-only" aria-hidden="true"></ion-icon>
 </ion-button>
diff --git a/src/core/features/block/components/side-blocks/side-blocks.html b/src/core/features/block/components/side-blocks/side-blocks.html
index 627139e3c..52408d9f2 100644
--- a/src/core/features/block/components/side-blocks/side-blocks.html
+++ b/src/core/features/block/components/side-blocks/side-blocks.html
@@ -20,7 +20,7 @@
             </ng-container>
         </ion-list>
 
-        <core-empty-box *ngIf="blocks.length == 0" icon="fas-cubes" [message]="'core.block.noblocks' | translate">
+        <core-empty-box *ngIf="blocks.length == 0" icon="fas-th-large" [message]="'core.block.noblocks' | translate">
         </core-empty-box>
     </core-loading>
 </ion-content>
diff --git a/src/core/features/course/format/singleactivity/components/core-course-format-single-activity.html b/src/core/features/course/format/singleactivity/components/core-course-format-single-activity.html
index 1f3a37007..17cf0dd0f 100644
--- a/src/core/features/course/format/singleactivity/components/core-course-format-single-activity.html
+++ b/src/core/features/course/format/singleactivity/components/core-course-format-single-activity.html
@@ -1 +1,4 @@
 <core-dynamic-component [component]="componentClass" [data]="data"></core-dynamic-component>
+
+<core-block-side-blocks-button *ngIf="course && hasBlocks" [courseId]="course.id" [downloadEnabled]="downloadEnabled">
+</core-block-side-blocks-button>
diff --git a/src/core/features/course/format/singleactivity/components/singleactivity.ts b/src/core/features/course/format/singleactivity/components/singleactivity.ts
index ade822ac2..3fd7cf5c0 100644
--- a/src/core/features/course/format/singleactivity/components/singleactivity.ts
+++ b/src/core/features/course/format/singleactivity/components/singleactivity.ts
@@ -20,6 +20,8 @@ import { CoreDynamicComponent } from '@components/dynamic-component/dynamic-comp
 import { CoreCourseAnyCourseData } from '@features/courses/services/courses';
 import { IonRefresher } from '@ionic/angular';
 import { CoreCourseModuleCompletionData, CoreCourseSectionWithStatus } from '@features/course/services/course-helper';
+import { CoreBlockHelper } from '@features/block/services/block-helper';
+import { CoreCourse } from '@features/course/services/course';
 
 /**
  * Component to display single activity format. It will determine the right component to use and instantiate it.
@@ -44,12 +46,13 @@ export class CoreCourseFormatSingleActivityComponent implements OnChanges {
 
     componentClass?: Type<unknown>; // The class of the component to render.
     data: Record<string | number, unknown> = {}; // Data to pass to the component.
+    hasBlocks = false;
 
     /**
-     * Detect changes on input properties.
+     * @inheritdoc
      */
     async ngOnChanges(changes: { [name: string]: SimpleChange }): Promise<void> {
-        if (!changes.course || !changes.sections) {
+        if (!changes.course && !changes.sections) {
             return;
         }
 
@@ -57,6 +60,8 @@ export class CoreCourseFormatSingleActivityComponent implements OnChanges {
             return;
         }
 
+        this.hasBlocks = await CoreBlockHelper.hasCourseBlocks(this.course.id);
+
         // In single activity the module should only have 1 section and 1 module. Get the module.
         const module = this.sections?.[0].modules?.[0];
 
@@ -85,6 +90,15 @@ export class CoreCourseFormatSingleActivityComponent implements OnChanges {
         }
 
         await this.dynamicComponent?.callComponentFunction('doRefresh', [refresher, done]);
+
+        if (this.course) {
+            const courseId = this.course.id;
+            await CoreCourse.invalidateCourseBlocks(courseId).then(async () => {
+                this.hasBlocks = await CoreBlockHelper.hasCourseBlocks(courseId);
+
+                return;
+            });
+        }
     }
 
     /**
diff --git a/src/core/features/course/format/singleactivity/services/handlers/singleactivity-format.ts b/src/core/features/course/format/singleactivity/services/handlers/singleactivity-format.ts
index 9efe6fc27..3ce49d231 100644
--- a/src/core/features/course/format/singleactivity/services/handlers/singleactivity-format.ts
+++ b/src/core/features/course/format/singleactivity/services/handlers/singleactivity-format.ts
@@ -31,43 +31,28 @@ export class CoreCourseFormatSingleActivityHandlerService implements CoreCourseF
     format = 'singleactivity';
 
     /**
-     * Whether or not the handler is enabled on a site level.
-     *
-     * @return True or promise resolved with true if enabled.
+     * @inheritdoc
      */
     async isEnabled(): Promise<boolean> {
         return true;
     }
 
     /**
-     * Whether it allows seeing all sections at the same time. Defaults to true.
-     *
-     * @param course The course to check.
-     * @return Whether it can view all sections.
+     * @inheritdoc
      */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    canViewAllSections(course: CoreCourseAnyCourseData): boolean {
+    canViewAllSections(): boolean {
         return false;
     }
 
     /**
-     * Whether the option blocks should be displayed. Defaults to true.
-     *
-     * @param course The course to check.
-     * @return Whether it can display blocks.
+     * @inheritdoc
      */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    displayBlocks(course: CoreCourseAnyCourseData): boolean {
-        return false;
+    displayBlocks(): boolean {
+        return true;
     }
 
     /**
-     * Get the title to use in course page. If not defined, course displayname or fullname.
-     * This function will be called without sections first, and then call it again when the sections are retrieved.
-     *
-     * @param course The course.
-     * @param sections List of sections.
-     * @return Title.
+     * @inheritdoc
      */
     getCourseTitle(course: CoreCourseAnyCourseData, sections?: CoreCourseWSSection[]): string {
         if (sections?.[0]?.modules?.[0]) {
@@ -84,34 +69,21 @@ export class CoreCourseFormatSingleActivityHandlerService implements CoreCourseF
     }
 
     /**
-     * Whether the option to enable section/module download should be displayed. Defaults to true.
-     *
-     * @param course The course to check.
-     * @return Whether the option to enable section/module download should be displayed
+     * @inheritdoc
      */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    displayEnableDownload(course: CoreCourseAnyCourseData): boolean {
+    displayEnableDownload(): boolean {
         return false;
     }
 
     /**
-     * Whether the default section selector should be displayed. Defaults to true.
-     *
-     * @param course The course to check.
-     * @return Whether the default section selector should be displayed.
+     * @inheritdoc
      */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    displaySectionSelector(course: CoreCourseAnyCourseData): boolean {
+    displaySectionSelector(): boolean {
         return false;
     }
 
     /**
-     * Whether the course refresher should be displayed. If it returns false, a refresher must be included in the course format,
-     * and the doRefresh method of CoreCourseSectionPage must be called on refresh. Defaults to true.
-     *
-     * @param course The course to check.
-     * @param sections List of course sections.
-     * @return Whether the refresher should be displayed.
+     * @inheritdoc
      */
     displayRefresher(course: CoreCourseAnyCourseData, sections: CoreCourseWSSection[]): boolean {
         if (sections?.[0]?.modules?.[0]) {
@@ -122,28 +94,16 @@ export class CoreCourseFormatSingleActivityHandlerService implements CoreCourseF
     }
 
     /**
-     * Return the Component to use to display the course format instead of using the default one.
-     * Use it if you want to display a format completely different from the default one.
-     * If you want to customize the default format there are several methods to customize parts of it.
-     * It's recommended to return the class of the component, but you can also return an instance of the component.
-     *
-     * @param course The course to render.
-     * @return The component (or promise resolved with component) to use, undefined if not found.
+     * @inheritdoc
      */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async getCourseFormatComponent(course: CoreCourseAnyCourseData): Promise<Type<unknown>> {
+    async getCourseFormatComponent(): Promise<Type<unknown>> {
         return CoreCourseFormatSingleActivityComponent;
     }
 
     /**
-     * Whether the view should be refreshed when completion changes. If your course format doesn't display
-     * activity completion then you should return false.
-     *
-     * @param course The course.
-     * @return Whether course view should be refreshed when an activity completion changes.
+     * @inheritdoc
      */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async shouldRefreshWhenCompletionChanges(course: CoreCourseAnyCourseData): Promise<boolean> {
+    async shouldRefreshWhenCompletionChanges(): Promise<boolean> {
         return false;
     }
 
diff --git a/src/core/features/course/format/singleactivity/singleactivity.module.ts b/src/core/features/course/format/singleactivity/singleactivity.module.ts
index c42f04b27..5060d7511 100644
--- a/src/core/features/course/format/singleactivity/singleactivity.module.ts
+++ b/src/core/features/course/format/singleactivity/singleactivity.module.ts
@@ -18,6 +18,7 @@ import { CoreSharedModule } from '@/core/shared.module';
 import { CoreCourseFormatDelegate } from '@features/course/services/format-delegate';
 import { CoreCourseFormatSingleActivityComponent } from './components/singleactivity';
 import { CoreCourseFormatSingleActivityHandler } from './services/handlers/singleactivity-format';
+import { CoreBlockComponentsModule } from '@features/block/components/components.module';
 
 @NgModule({
     declarations: [
@@ -25,6 +26,7 @@ import { CoreCourseFormatSingleActivityHandler } from './services/handlers/singl
     ],
     imports: [
         CoreSharedModule,
+        CoreBlockComponentsModule,
     ],
     providers: [
         {

From ee6263a0063328ac4b72f1f606a6d73eb549ada5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 16 Nov 2021 22:47:54 +0100
Subject: [PATCH 0207/1008] MOBILE-3914 menu: Fix more badge calculation

---
 src/core/features/mainmenu/pages/menu/menu.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/core/features/mainmenu/pages/menu/menu.ts b/src/core/features/mainmenu/pages/menu/menu.ts
index 63799d858..465352809 100644
--- a/src/core/features/mainmenu/pages/menu/menu.ts
+++ b/src/core/features/mainmenu/pages/menu/menu.ts
@@ -183,8 +183,13 @@ export class CoreMainMenuPage implements OnInit, OnDestroy {
             return;
         }
 
-        const numItems = CoreMainMenu.getNumItems();
-        this.moreBadge = this.allHandlers.some((handler, index) => (handler.onlyInMore || index >= numItems) && !!handler.badge);
+        // Calculate the main handlers not to display them in this view.
+        const mainHandlers = this.allHandlers
+            .filter((handler) => !handler.onlyInMore)
+            .slice(0, CoreMainMenu.getNumItems());
+
+        // Use only the handlers that don't appear in the main view.
+        this.moreBadge = this.allHandlers.some((handler) => mainHandlers.indexOf(handler) == -1 && !!handler.badge);
     }
 
     /**

From 204995a18a754c9c0b857482957d17fc6651f5dc Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 17 Nov 2021 10:36:57 +0100
Subject: [PATCH 0208/1008] MOBILE-3695 push: Allow unregister device when site
 logged out

---
 src/core/classes/site.ts                      |  7 ++++-
 .../services/pushnotifications.ts             | 27 ++++++++++---------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/core/classes/site.ts b/src/core/classes/site.ts
index b9b9f0191..ea5786eca 100644
--- a/src/core/classes/site.ts
+++ b/src/core/classes/site.ts
@@ -51,6 +51,11 @@ export enum CoreSiteQRCodeType {
     QR_CODE_LOGIN = 2, // QR code type login value
 }
 
+// WS that we allow to call even if the site is logged out.
+const ALLOWED_LOGGEDOUT_WS = [
+    'core_user_remove_user_device',
+];
+
 /**
  * Class that represents a site (combination of site + user).
  * It will have all the site data and provide utility functions regarding a site.
@@ -496,7 +501,7 @@ export class CoreSite {
      */
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     async request<T = unknown>(method: string, data: any, preSets: CoreSiteWSPreSets, retrying?: boolean): Promise<T> {
-        if (this.isLoggedOut()) {
+        if (this.isLoggedOut() && !ALLOWED_LOGGEDOUT_WS.includes(method)) {
             // Site is logged out, it cannot call WebServices.
             CoreEvents.trigger(CoreEvents.SESSION_EXPIRED, {}, this.id);
 
diff --git a/src/core/features/pushnotifications/services/pushnotifications.ts b/src/core/features/pushnotifications/services/pushnotifications.ts
index 9de4396d8..ba07fa9d3 100644
--- a/src/core/features/pushnotifications/services/pushnotifications.ts
+++ b/src/core/features/pushnotifications/services/pushnotifications.ts
@@ -519,20 +519,10 @@ export class CorePushNotificationsProvider {
             appid: CoreConstants.CONFIG.app_id,
             uuid:  Device.uuid,
         };
+        let response: CoreUserRemoveUserDeviceWSResponse;
 
         try {
-            const response = await site.write<CoreUserRemoveUserDeviceWSResponse>('core_user_remove_user_device', data);
-
-            if (!response || !response.removed) {
-                throw new CoreError('Cannot unregister device');
-            }
-
-            await CoreUtils.ignoreErrors(Promise.all([
-                // Remove the device from the local DB.
-                site.getDb().deleteRecords(REGISTERED_DEVICES_TABLE_NAME, this.getRegisterData()),
-                // Remove pending unregisters for this site.
-                db.deleteRecords(PENDING_UNREGISTER_TABLE_NAME, { siteid: site.getId() }),
-            ]));
+            response = await site.write<CoreUserRemoveUserDeviceWSResponse>('core_user_remove_user_device', data);
         } catch (error) {
             if (CoreUtils.isWebServiceError(error)) {
                 throw error;
@@ -546,7 +536,20 @@ export class CorePushNotificationsProvider {
                 info: JSON.stringify(site.getInfo()),
             };
             await db.insertRecord(PENDING_UNREGISTER_TABLE_NAME, entry);
+
+            return;
         }
+
+        if (!response.removed) {
+            throw new CoreError('Cannot unregister device');
+        }
+
+        await CoreUtils.ignoreErrors(Promise.all([
+            // Remove the device from the local DB.
+            site.getDb().deleteRecords(REGISTERED_DEVICES_TABLE_NAME, this.getRegisterData()),
+            // Remove pending unregisters for this site.
+            db.deleteRecords(PENDING_UNREGISTER_TABLE_NAME, { siteid: site.getId() }),
+        ]));
     }
 
     /**

From 87246e40d31fcd734748cf1d65f7d664ff4dc04f Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 22 Nov 2021 11:22:00 +0100
Subject: [PATCH 0209/1008] MOBILE-3935 core: Allow changing IAB toolbar colors

---
 package-lock.json                | 16 +++++----
 package.json                     |  2 +-
 src/core/services/app.ts         | 10 +-----
 src/core/services/utils/utils.ts | 56 +++++++++++++++++++++++++++-----
 src/core/singletons/colors.ts    | 19 +++++++++++
 src/types/config.d.ts            |  1 +
 6 files changed, 79 insertions(+), 25 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 14a098f20..ea2219902 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -44,7 +44,7 @@
         "@ionic-native/zip": "^5.33.0",
         "@ionic/angular": "^5.6.6",
         "@moodlehq/cordova-plugin-file-transfer": "1.7.1-moodle.2",
-        "@moodlehq/cordova-plugin-inappbrowser": "5.0.0-moodle.2",
+        "@moodlehq/cordova-plugin-inappbrowser": "5.0.0-moodle.3",
         "@moodlehq/cordova-plugin-ionic-webview": "5.0.0-moodle.1",
         "@moodlehq/cordova-plugin-local-notification": "0.9.0-moodle.3",
         "@moodlehq/cordova-plugin-qrscanner": "3.0.1-moodle.2",
@@ -5126,9 +5126,10 @@
       }
     },
     "node_modules/@moodlehq/cordova-plugin-inappbrowser": {
-      "version": "5.0.0-moodle.2",
-      "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-inappbrowser/-/cordova-plugin-inappbrowser-5.0.0-moodle.2.tgz",
-      "integrity": "sha512-0JOLHUFEJC3fv4OQuyr2kwNyrb7oeyjmfFLQ+LcKO41e6UOnNy/du0hU7Yz9Rh8B2zGcebvSwMrN+cRSCqlipQ==",
+      "version": "5.0.0-moodle.3",
+      "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-inappbrowser/-/cordova-plugin-inappbrowser-5.0.0-moodle.3.tgz",
+      "integrity": "sha512-BDW53W8BzHIJY6lqV3IyYIO9Rh3qi/nA3qkwZjvJiw7iohlQMeR67LV+bXjM4I8N1PTGoBSXiS5BmaS9NFi/1A==",
+      "dev": true,
       "engines": {
         "cordovaDependencies": {
           "0.2.3": {
@@ -35196,9 +35197,10 @@
       "integrity": "sha512-nvddQelAwPXmvjv0YJJwuf2xFNi78ZmTa47BgtHGebOvdKpmcbphkOQAVN7KMheL4J3KNE9DbMBHwEHkGGkH4g=="
     },
     "@moodlehq/cordova-plugin-inappbrowser": {
-      "version": "5.0.0-moodle.2",
-      "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-inappbrowser/-/cordova-plugin-inappbrowser-5.0.0-moodle.2.tgz",
-      "integrity": "sha512-0JOLHUFEJC3fv4OQuyr2kwNyrb7oeyjmfFLQ+LcKO41e6UOnNy/du0hU7Yz9Rh8B2zGcebvSwMrN+cRSCqlipQ=="
+      "version": "5.0.0-moodle.3",
+      "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-inappbrowser/-/cordova-plugin-inappbrowser-5.0.0-moodle.3.tgz",
+      "integrity": "sha512-BDW53W8BzHIJY6lqV3IyYIO9Rh3qi/nA3qkwZjvJiw7iohlQMeR67LV+bXjM4I8N1PTGoBSXiS5BmaS9NFi/1A==",
+      "dev": true
     },
     "@moodlehq/cordova-plugin-ionic-webview": {
       "version": "5.0.0-moodle.1",
diff --git a/package.json b/package.json
index 5c790b408..6a006d22f 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
     "@ionic-native/zip": "^5.33.0",
     "@ionic/angular": "^5.6.6",
     "@moodlehq/cordova-plugin-file-transfer": "1.7.1-moodle.2",
-    "@moodlehq/cordova-plugin-inappbrowser": "5.0.0-moodle.2",
+    "@moodlehq/cordova-plugin-inappbrowser": "5.0.0-moodle.3",
     "@moodlehq/cordova-plugin-ionic-webview": "5.0.0-moodle.1",
     "@moodlehq/cordova-plugin-local-notification": "0.9.0-moodle.3",
     "@moodlehq/cordova-plugin-qrscanner": "3.0.1-moodle.2",
diff --git a/src/core/services/app.ts b/src/core/services/app.ts
index b3419ce9e..cbbdeb207 100644
--- a/src/core/services/app.ts
+++ b/src/core/services/app.ts
@@ -638,15 +638,7 @@ export class CoreAppProvider {
 
         if (!color) {
             // Get the default color to change it.
-            const element = document.querySelector('ion-header ion-toolbar');
-            if (element) {
-                color = getComputedStyle(element).getPropertyValue('--background').trim();
-            } else {
-                // Fallback, it won't always work.
-                color = getComputedStyle(document.body).getPropertyValue('--core-header-toolbar-background').trim();
-            }
-
-            color = CoreColors.getColorHex(color);
+            color = CoreColors.getToolbarBackgroundColor();
         }
 
         // Make darker on Android, except white.
diff --git a/src/core/services/utils/utils.ts b/src/core/services/utils/utils.ts
index 6d06cbf3d..eba5fc793 100644
--- a/src/core/services/utils/utils.ts
+++ b/src/core/services/utils/utils.ts
@@ -33,6 +33,7 @@ import { CoreCanceledError } from '@classes/errors/cancelederror';
 import { CoreFileEntry } from '@services/file-helper';
 import { CoreConstants } from '@/core/constants';
 import { CoreWindow } from '@singletons/window';
+import { CoreColors } from '@singletons/colors';
 
 type TreeNode<T> = T & { children: TreeNode<T>[] };
 
@@ -981,14 +982,8 @@ export class CoreUtilsProvider {
 
         options = options || {};
         options.usewkwebview = 'yes'; // Force WKWebView in iOS.
-
-        if (!options.enableViewPortScale) {
-            options.enableViewPortScale = 'yes'; // Enable zoom on iOS.
-        }
-
-        if (!options.allowInlineMediaPlayback) {
-            options.allowInlineMediaPlayback = 'yes'; // Allow playing inline videos in iOS.
-        }
+        options.enableViewPortScale = options.enableViewPortScale ?? 'yes'; // Enable zoom on iOS by default.
+        options.allowInlineMediaPlayback = options.allowInlineMediaPlayback ?? 'yes'; // Allow playing inline videos in iOS.
 
         if (!options.location && CoreApp.isIOS() && url.indexOf('file://') === 0) {
             // The URL uses file protocol, don't show it on iOS.
@@ -996,6 +991,8 @@ export class CoreUtilsProvider {
             options.location = 'no';
         }
 
+        this.setInAppBrowserToolbarColors(options);
+
         this.iabInstance = InAppBrowser.create(url, '_blank', options);
 
         if (CoreApp.isMobile()) {
@@ -1043,6 +1040,49 @@ export class CoreUtilsProvider {
         return this.iabInstance;
     }
 
+    /**
+     * Given some IAB options, set the toolbar colors properties to the right values.
+     *
+     * @param options Options to change.
+     * @return Changed options.
+     */
+    protected setInAppBrowserToolbarColors(options: InAppBrowserOptions): InAppBrowserOptions {
+        if (options.toolbarcolor) {
+            // Color already set.
+            return options;
+        }
+
+        // Color not set. Check if it needs to be changed automatically.
+        let bgColor: string | undefined;
+        let textColor: string | undefined;
+
+        if (CoreConstants.CONFIG.iabToolbarColors === 'auto') {
+            bgColor = CoreColors.getToolbarBackgroundColor();
+        } else if (CoreConstants.CONFIG.iabToolbarColors && typeof CoreConstants.CONFIG.iabToolbarColors === 'object') {
+            bgColor = CoreConstants.CONFIG.iabToolbarColors.background;
+            textColor = CoreConstants.CONFIG.iabToolbarColors.text;
+        }
+
+        if (!bgColor) {
+            // Use default color. In iOS, use black background color since the default is transparent and doesn't look good.
+            options.locationcolor = '#000000';
+
+            return options;
+        }
+
+        if (!textColor) {
+            textColor = CoreColors.isWhiteContrastingBetter(bgColor) ? '#ffffff' : '#000000';
+        }
+
+        options.toolbarcolor = bgColor;
+        options.closebuttoncolor = textColor;
+        options.navigationbuttoncolor = textColor;
+        options.locationcolor = bgColor;
+        options.locationtextcolor = textColor;
+
+        return options;
+    }
+
     /**
      * Open a URL using a browser.
      * Do not use for files, refer to {@link openFile}.
diff --git a/src/core/singletons/colors.ts b/src/core/singletons/colors.ts
index 9256f5154..97a2eac81 100644
--- a/src/core/singletons/colors.ts
+++ b/src/core/singletons/colors.ts
@@ -140,4 +140,23 @@ export class CoreColors {
         return ('0' + c.toString(16)).slice(-2);
     }
 
+    /**
+     * Get the toolbar's current background color.
+     *
+     * @return Color in hex format.
+     */
+    static getToolbarBackgroundColor(): string {
+        const element = document.querySelector('ion-header ion-toolbar');
+        let color: string;
+
+        if (element) {
+            color = getComputedStyle(element).getPropertyValue('--background').trim();
+        } else {
+            // Fallback, it won't always work.
+            color = getComputedStyle(document.body).getPropertyValue('--core-header-toolbar-background').trim();
+        }
+
+        return CoreColors.getColorHex(color);
+    }
+
 }
diff --git a/src/types/config.d.ts b/src/types/config.d.ts
index 3d5b59ebf..14b0b5a51 100644
--- a/src/types/config.d.ts
+++ b/src/types/config.d.ts
@@ -57,4 +57,5 @@ export interface EnvironmentConfig {
     customMainMenuItems?: CoreMainMenuLocalizedCustomItem[];
     feedbackFormUrl?: string | false;
     a11yStatement?: string | false;
+    iabToolbarColors?: 'auto' | { background: string; text?: string } | null;
 }

From 47c913f434daa09fd4071cc3fcfe601ec989276c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 10 Nov 2021 13:30:31 +0100
Subject: [PATCH 0210/1008] MOBILE-3909 calendar: Change reminders to time
 before

---
 scripts/langindex.json                        |   7 +
 .../calendar/components/components.module.ts  |   3 +
 .../reminder-time-modal.html                  |  59 +++++++
 .../reminder-time-modal.ts                    | 156 ++++++++++++++++++
 src/addons/calendar/lang.json                 |   4 +-
 src/addons/calendar/pages/event/event.html    |  20 +--
 src/addons/calendar/pages/event/event.page.ts | 111 +++++++------
 .../calendar/pages/settings/settings.html     |  14 +-
 .../calendar/pages/settings/settings.ts       |  51 +++++-
 .../calendar/services/calendar-helper.ts      |  61 +++++++
 src/addons/calendar/services/calendar.ts      | 150 ++++++++++++++---
 .../calendar/services/database/calendar.ts    |  52 +++++-
 src/core/lang.json                            |   5 +
 13 files changed, 581 insertions(+), 112 deletions(-)
 create mode 100644 src/addons/calendar/components/reminder-time-modal/reminder-time-modal.html
 create mode 100644 src/addons/calendar/components/reminder-time-modal/reminder-time-modal.ts

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 489993f04..0f108b2c5 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -140,6 +140,7 @@
   "addon.calendar.sunday": "calendar",
   "addon.calendar.thu": "calendar",
   "addon.calendar.thursday": "calendar",
+  "addon.calendar.timebefore": "local_moodlemobileapp",
   "addon.calendar.today": "calendar",
   "addon.calendar.tomorrow": "calendar",
   "addon.calendar.tue": "calendar",
@@ -153,6 +154,7 @@
   "addon.calendar.typeopen": "calendar",
   "addon.calendar.typesite": "calendar",
   "addon.calendar.typeuser": "calendar",
+  "addon.calendar.units": "qtype_numerical",
   "addon.calendar.upcomingevents": "calendar",
   "addon.calendar.userevents": "calendar",
   "addon.calendar.wed": "calendar",
@@ -1562,6 +1564,7 @@
   "core.courses.therearecourses": "moodle",
   "core.courses.totalcoursesearchresults": "local_moodlemobileapp",
   "core.currentdevice": "local_moodlemobileapp",
+  "core.custom": "form",
   "core.datastoredoffline": "local_moodlemobileapp",
   "core.date": "moodle",
   "core.day": "moodle",
@@ -1943,6 +1946,8 @@
   "core.maxsizeandattachments": "moodle",
   "core.min": "moodle",
   "core.mins": "moodle",
+  "core.minute": "moodle",
+  "core.minutes": "moodle",
   "core.misc": "admin",
   "core.mod_assign": "assign/pluginname",
   "core.mod_assignment": "assignment/pluginname",
@@ -2283,6 +2288,8 @@
   "core.viewprofile": "moodle",
   "core.warningofflinedatadeleted": "local_moodlemobileapp",
   "core.warnopeninbrowser": "local_moodlemobileapp",
+  "core.week": "moodle",
+  "core.weeks": "moodle",
   "core.whatisyourage": "moodle",
   "core.wheredoyoulive": "moodle",
   "core.whoissiteadmin": "local_moodlemobileapp",
diff --git a/src/addons/calendar/components/components.module.ts b/src/addons/calendar/components/components.module.ts
index 22b2b7100..283909027 100644
--- a/src/addons/calendar/components/components.module.ts
+++ b/src/addons/calendar/components/components.module.ts
@@ -19,12 +19,14 @@ import { CoreSharedModule } from '@/core/shared.module';
 import { AddonCalendarCalendarComponent } from './calendar/calendar';
 import { AddonCalendarUpcomingEventsComponent } from './upcoming-events/upcoming-events';
 import { AddonCalendarFilterPopoverComponent } from './filter/filter';
+import { AddonCalendarReminderTimeModalComponent } from './reminder-time-modal/reminder-time-modal';
 
 @NgModule({
     declarations: [
         AddonCalendarCalendarComponent,
         AddonCalendarUpcomingEventsComponent,
         AddonCalendarFilterPopoverComponent,
+        AddonCalendarReminderTimeModalComponent,
     ],
     imports: [
         CoreSharedModule,
@@ -35,6 +37,7 @@ import { AddonCalendarFilterPopoverComponent } from './filter/filter';
         AddonCalendarCalendarComponent,
         AddonCalendarUpcomingEventsComponent,
         AddonCalendarFilterPopoverComponent,
+        AddonCalendarReminderTimeModalComponent,
     ],
 })
 export class AddonCalendarComponentsModule {}
diff --git a/src/addons/calendar/components/reminder-time-modal/reminder-time-modal.html b/src/addons/calendar/components/reminder-time-modal/reminder-time-modal.html
new file mode 100644
index 000000000..ad47dee3a
--- /dev/null
+++ b/src/addons/calendar/components/reminder-time-modal/reminder-time-modal.html
@@ -0,0 +1,59 @@
+<ion-header>
+    <ion-toolbar>
+        <h2>{{ 'addon.calendar.reminders' | translate }}</h2>
+        <ion-buttons slot="end">
+            <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
+                <ion-icon slot="icon-only" name="fas-times" aria-hidden="true"></ion-icon>
+            </ion-button>
+        </ion-buttons>
+    </ion-toolbar>
+</ion-header>
+<ion-content>
+    <ion-radio-group [(ngModel)]="radioValue" class="ion-text-wrap">
+        <!-- Preset options. -->
+        <ion-item *ngIf="allowDisable">
+            <ion-label>
+                <p>{{ 'core.settings.disabled' | translate }}</p>
+            </ion-label>
+            <ion-radio slot="end" value="disabled"></ion-radio>
+        </ion-item>
+        <ion-item *ngFor="let option of presetOptions">
+            <ion-label>
+                <p>{{ option.label }}</p>
+            </ion-label>
+            <ion-radio slot="end" [value]="option.radioValue"></ion-radio>
+        </ion-item>
+
+        <!-- Custom value. -->
+        <ion-item lines="none" class="ion-text-wrap">
+            <ion-label>
+                <p>{{ 'core.custom' | translate }}</p>
+            </ion-label>
+            <ion-radio slot="end" value="custom"></ion-radio>
+        </ion-item>
+        <ion-item class="ion-text-wrap">
+            <ion-label></ion-label>
+
+            <div class="flex-row">
+                <!-- Input to enter the value. -->
+                <ion-input type="number" name="customvalue" [(ngModel)]="customValue" [disabled]="radioValue != 'custom'"
+                    placeholder="10">
+                </ion-input>
+
+                <!-- Units. -->
+                <label class="accesshide" for="reminderUnits">{{ 'addon.calendar.units' | translate }}</label>
+                <ion-select id="reminderUnits" name="customunits" [(ngModel)]="customUnits" interface="action-sheet"
+                    [disabled]="radioValue != 'custom'" slot="end"
+                    [interfaceOptions]="{header: 'addon.calendar.units' | translate}">
+                    <ion-select-option *ngFor="let option of customUnitsOptions" [value]="option.value">
+                        {{ option.label | translate }}
+                    </ion-select-option>
+                </ion-select>
+            </div>
+        </ion-item>
+    </ion-radio-group>
+
+    <ion-button class="ion-margin" expand="block" (click)="saveReminder()" [disabled]="radioValue == 'custom' && !customValue">
+        {{ 'core.done' | translate }}
+    </ion-button>
+</ion-content>
diff --git a/src/addons/calendar/components/reminder-time-modal/reminder-time-modal.ts b/src/addons/calendar/components/reminder-time-modal/reminder-time-modal.ts
new file mode 100644
index 000000000..f505fde21
--- /dev/null
+++ b/src/addons/calendar/components/reminder-time-modal/reminder-time-modal.ts
@@ -0,0 +1,156 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { AddonCalendar, AddonCalendarReminderUnits, AddonCalendarValueAndUnit } from '@addons/calendar/services/calendar';
+import { Component, Input, OnInit } from '@angular/core';
+import { CoreDomUtils } from '@services/utils/dom';
+import { ModalController } from '@singletons';
+
+/**
+ * Modal to choose a reminder time.
+ */
+@Component({
+    selector: 'addon-calendar-new-reminder-modal',
+    templateUrl: 'reminder-time-modal.html',
+})
+export class AddonCalendarReminderTimeModalComponent implements OnInit {
+
+    @Input() initialValue?: AddonCalendarValueAndUnit;
+    @Input() allowDisable?: boolean;
+
+    radioValue = '5m';
+    customValue = '10';
+    customUnits = AddonCalendarReminderUnits.MINUTE;
+
+    presetOptions = [
+        {
+            radioValue: '5m',
+            value: 5,
+            unit: AddonCalendarReminderUnits.MINUTE,
+            label: '',
+        },
+        {
+            radioValue: '10m',
+            value: 10,
+            unit: AddonCalendarReminderUnits.MINUTE,
+            label: '',
+        },
+        {
+            radioValue: '30m',
+            value: 30,
+            unit: AddonCalendarReminderUnits.MINUTE,
+            label: '',
+        },
+        {
+            radioValue: '1h',
+            value: 1,
+            unit: AddonCalendarReminderUnits.HOUR,
+            label: '',
+        },
+        {
+            radioValue: '12h',
+            value: 12,
+            unit: AddonCalendarReminderUnits.HOUR,
+            label: '',
+        },
+        {
+            radioValue: '1d',
+            value: 1,
+            unit: AddonCalendarReminderUnits.DAY,
+            label: '',
+        },
+    ];
+
+    customUnitsOptions = [
+        {
+            value: AddonCalendarReminderUnits.MINUTE,
+            label: 'core.minutes',
+        },
+        {
+            value: AddonCalendarReminderUnits.HOUR,
+            label: 'core.hours',
+        },
+        {
+            value: AddonCalendarReminderUnits.DAY,
+            label: 'core.days',
+        },
+        {
+            value: AddonCalendarReminderUnits.WEEK,
+            label: 'core.weeks',
+        },
+    ];
+
+    /**
+     * @inheritdoc
+     */
+    async ngOnInit(): Promise<void> {
+        this.presetOptions.forEach((option) => {
+            option.label = AddonCalendar.getUnitValueLabel(option.value, option.unit);
+        });
+
+        if (!this.initialValue) {
+            return;
+        }
+
+        if (this.initialValue.value === 0) {
+            this.radioValue = 'disabled';
+        } else {
+            // Search if it's one of the preset options.
+            const option = this.presetOptions.find(option =>
+                option.value === this.initialValue?.value && option.unit === this.initialValue.unit);
+
+            if (option) {
+                this.radioValue = option.radioValue;
+            } else {
+                // It's a custom value.
+                this.radioValue = 'custom';
+                this.customValue = String(this.initialValue.value);
+                this.customUnits = this.initialValue.unit;
+            }
+        }
+    }
+
+    /**
+     * Close the modal.
+     */
+    closeModal(): void {
+        ModalController.dismiss();
+    }
+
+    /**
+     * Save the reminder.
+     */
+    saveReminder(): void {
+        if (this.radioValue === 'disabled') {
+            ModalController.dismiss(0);
+        } else if (this.radioValue === 'custom') {
+            const value = parseInt(this.customValue, 10);
+            if (!value) {
+                CoreDomUtils.showErrorModal('core.errorinvalidform', true);
+
+                return;
+            }
+
+            ModalController.dismiss(Math.abs(value) * this.customUnits);
+        } else {
+            const option = this.presetOptions.find(option => option.radioValue === this.radioValue);
+            if (!option) {
+                return;
+            }
+
+            ModalController.dismiss(option.unit * option.value);
+        }
+    }
+
+}
diff --git a/src/addons/calendar/lang.json b/src/addons/calendar/lang.json
index 8b1748f6b..a71e8921b 100644
--- a/src/addons/calendar/lang.json
+++ b/src/addons/calendar/lang.json
@@ -41,6 +41,7 @@
     "noevents": "There are no events",
     "nopermissiontoupdatecalendar": "Sorry, but you do not have permission to update the calendar event.",
     "reminders": "Reminders",
+    "units": "Units",
     "repeatedevents": "Repeated events",
     "repeateditall": "Also apply changes to the other {{$a}} events in this repeat series",
     "repeateditthis": "Apply changes to this event only",
@@ -54,6 +55,7 @@
     "sunday": "Sunday",
     "thu": "Thu",
     "thursday": "Thursday",
+    "timebefore": "{{value}} {{units}} before",
     "today": "Today",
     "tomorrow": "Tomorrow",
     "tue": "Tue",
@@ -73,4 +75,4 @@
     "wednesday": "Wednesday",
     "when": "When",
     "yesterday": "Yesterday"
-}
\ No newline at end of file
+}
diff --git a/src/addons/calendar/pages/event/event.html b/src/addons/calendar/pages/event/event.html
index 493b41712..3874350f4 100644
--- a/src/addons/calendar/pages/event/event.html
+++ b/src/addons/calendar/pages/event/event.html
@@ -123,34 +123,26 @@
                 </ion-label>
             </ion-item>
             <ng-container *ngFor="let reminder of reminders">
-                <ion-item *ngIf="reminder.time > 0 || defaultTime > 0" class="ion-text-wrap"
-                    [class.item-dimmed]="(reminder.time == -1 ? (event.timestart - defaultTime) : reminder.time) <= currentTime!">
+                <ion-item *ngIf="reminder.timestamp > 0" class="ion-text-wrap"
+                    [class.item-dimmed]="reminder.timestamp <= currentTime">
                     <ion-label>
-                        <p *ngIf="reminder.time == -1">
-                            {{ 'core.defaultvalue' | translate :{$a: ((event.timestart - defaultTime) * 1000) | coreFormatDate } }}
-                        </p>
-                        <p *ngIf="reminder.time > 0">{{ reminder.time * 1000 | coreFormatDate }}</p>
+                        <p>{{ reminder.label }}</p>
                     </ion-label>
                     <ion-button fill="clear" (click)="cancelNotification(reminder.id, $event)"
-                        [attr.aria-label]="'core.delete' | translate" slot="end"
-                        *ngIf="(reminder.time == -1 ? (event.timestart - defaultTime) : reminder.time) > currentTime!">
+                        [attr.aria-label]="'core.delete' | translate" slot="end" *ngIf="reminder.timestamp > currentTime">
                         <ion-icon name="fas-trash" color="danger" slot="icon-only" aria-hidden="true"></ion-icon>
                     </ion-button>
                 </ion-item>
             </ng-container>
 
-            <ng-container *ngIf="event.timestart + event.timeduration > currentTime!">
+            <ng-container *ngIf="event.timestart > currentTime">
                 <ion-item>
                     <ion-label>
-                        <ion-button expand="block" color="primary" (click)="notificationPicker.open()">
+                        <ion-button expand="block" color="primary" (click)="addReminder()">
                             {{ 'addon.calendar.setnewreminder' | translate }}
                         </ion-button>
                     </ion-label>
                 </ion-item>
-                <ion-datetime #notificationPicker hidden [(ngModel)]="notificationTimeText"
-                    [displayFormat]="notificationFormat" [min]="notificationMin" [max]="notificationMax"
-                    [doneText]="'core.add' | translate" (ionChange)="addNotificationTime()" [monthNames]="monthNames">
-                </ion-datetime>
             </ng-container>
         </ion-card>
     </core-loading>
diff --git a/src/addons/calendar/pages/event/event.page.ts b/src/addons/calendar/pages/event/event.page.ts
index 9ddc41f58..bb21b880d 100644
--- a/src/addons/calendar/pages/event/event.page.ts
+++ b/src/addons/calendar/pages/event/event.page.ts
@@ -20,7 +20,7 @@ import {
     AddonCalendarEventToDisplay,
     AddonCalendarProvider,
 } from '../../services/calendar';
-import { AddonCalendarHelper } from '../../services/calendar-helper';
+import { AddonCalendarEventReminder, AddonCalendarHelper } from '../../services/calendar-helper';
 import { AddonCalendarOffline } from '../../services/calendar-offline';
 import { AddonCalendarSync, AddonCalendarSyncEvents, AddonCalendarSyncProvider } from '../../services/calendar-sync';
 import { CoreApp } from '@services/app';
@@ -36,10 +36,9 @@ import { Network, NgZone, Translate } from '@singletons';
 import { Subscription } from 'rxjs';
 import { CoreNavigator } from '@services/navigator';
 import { CoreUtils } from '@services/utils/utils';
-import { AddonCalendarReminderDBRecord } from '../../services/database/calendar';
 import { ActivatedRoute } from '@angular/router';
 import { CoreConstants } from '@/core/constants';
-import { CoreLang } from '@services/lang';
+import { AddonCalendarReminderTimeModalComponent } from '@addons/calendar/components/reminder-time-modal/reminder-time-modal';
 
 /**
  * Page that displays a single calendar event.
@@ -57,13 +56,11 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
     protected syncObserver: CoreEventObserver;
     protected manualSyncObserver: CoreEventObserver;
     protected onlineObserver: Subscription;
+    protected defaultTimeChangedObserver: CoreEventObserver;
     protected currentSiteId: string;
+    protected updateCurrentTime?: number;
 
     eventLoaded = false;
-    notificationFormat?: string;
-    notificationMin?: string;
-    notificationMax?: string;
-    notificationTimeText?: string;
     event?: AddonCalendarEventToDisplay;
     courseId?: number;
     courseName = '';
@@ -72,19 +69,16 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
     notificationsEnabled = false;
     moduleUrl = '';
     categoryPath = '';
-    currentTime?: number;
-    defaultTime = 0;
-    reminders: AddonCalendarReminderDBRecord[] = [];
+    currentTime = -1;
+    reminders: AddonCalendarEventReminder[] = [];
     canEdit = false;
     hasOffline = false;
     isOnline = false;
     syncIcon = CoreConstants.ICON_LOADING; // Sync icon.
-    monthNames?: string[];
 
     constructor(
         protected route: ActivatedRoute,
     ) {
-
         this.notificationsEnabled = CoreLocalNotifications.isAvailable();
         this.siteHomeId = CoreSites.getCurrentSiteHomeId();
         this.currentSiteId = CoreSites.getCurrentSiteId();
@@ -121,21 +115,35 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
                 this.isOnline = CoreApp.isOnline();
             });
         });
+
+        // Reload reminders if default notification time changes.
+        this.defaultTimeChangedObserver = CoreEvents.on(AddonCalendarProvider.DEFAULT_NOTIFICATION_TIME_CHANGED, () => {
+            this.loadReminders();
+
+            if (this.event) {
+                AddonCalendar.scheduleEventsNotifications([this.event]);
+            }
+        }, this.currentSiteId);
+
+        // Set and update current time. Use a 5 seconds error margin.
+        this.currentTime = CoreTimeUtils.timestamp();
+        this.updateCurrentTime = window.setInterval(() => {
+            this.currentTime = CoreTimeUtils.timestamp();
+        }, 5000);
     }
 
-    protected async initReminders(): Promise<void> {
-        if (this.notificationsEnabled) {
-            this.monthNames = CoreLang.getMonthNames();
-
-            this.reminders = await AddonCalendar.getEventReminders(this.eventId);
-            this.defaultTime = await AddonCalendar.getDefaultNotificationTime() * 60;
-
-            // Calculate format to use.
-            this.notificationFormat =
-                CoreTimeUtils.fixFormatForDatetime(CoreTimeUtils.convertPHPToMoment(
-                    Translate.instant('core.strftimedatetime'),
-                ));
+    /**
+     * Load reminders.
+     *
+     * @return Promise resolved when done.
+     */
+    protected async loadReminders(): Promise<void> {
+        if (!this.notificationsEnabled || !this.event) {
+            return;
         }
+
+        const reminders = await AddonCalendar.getEventReminders(this.eventId, this.currentSiteId);
+        this.reminders = await AddonCalendarHelper.formatReminders(reminders, this.event.timestart, this.currentSiteId);
     }
 
     /**
@@ -155,7 +163,6 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
         this.syncIcon = CoreConstants.ICON_LOADING;
 
         this.fetchEvent();
-        this.initReminders();
     }
 
     /**
@@ -209,6 +216,10 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
             const event = await AddonCalendar.getEventById(this.eventId);
             this.event = await AddonCalendarHelper.formatEventData(event);
 
+            // Load reminders, and re-schedule them if needed (maybe the event time has changed).
+            this.loadReminders();
+            AddonCalendar.scheduleEventsNotifications([this.event]);
+
             try {
                 const offlineEvent = AddonCalendarHelper.formatOfflineEventData(
                     await AddonCalendarOffline.getEvent(this.eventId),
@@ -223,29 +234,21 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
                 this.hasOffline = false;
             }
 
-            this.currentTime = CoreTimeUtils.timestamp();
-            this.notificationMin = CoreTimeUtils.userDate(this.currentTime * 1000, 'YYYY-MM-DDTHH:mm', false);
-            this.notificationMax = CoreTimeUtils.userDate(
-                (this.event!.timestart + this.event!.timeduration) * 1000,
-                'YYYY-MM-DDTHH:mm',
-                false,
-            );
-
             // Reset some of the calculated data.
             this.categoryPath = '';
             this.courseName = '';
             this.courseUrl = '';
             this.moduleUrl = '';
 
-            if (this.event!.moduleIcon) {
+            if (this.event.moduleIcon) {
                 // It's a module event, translate the module name to the current language.
-                const name = CoreCourse.translateModuleName(this.event!.modulename || '');
+                const name = CoreCourse.translateModuleName(this.event.modulename || '');
                 if (name.indexOf('core.mod_') === -1) {
-                    this.event!.modulename = name;
+                    this.event.modulename = name;
                 }
 
                 // Get the module URL.
-                this.moduleUrl = this.event!.url || '';
+                this.moduleUrl = this.event.url || '';
             }
 
             const promises: Promise<void>[] = [];
@@ -310,22 +313,23 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
     /**
      * Add a reminder for this event.
      */
-    async addNotificationTime(): Promise<void> {
-        if (this.notificationTimeText && this.event && this.event.id) {
-            let notificationTime = CoreTimeUtils.convertToTimestamp(this.notificationTimeText);
-
-            const currentTime = CoreTimeUtils.timestamp();
-            const minute = Math.floor(currentTime / 60) * 60;
-
-            // Check if the notification time is in the same minute as we are, so the notification is triggered.
-            if (notificationTime >= minute && notificationTime < minute + 60) {
-                notificationTime = currentTime + 1;
-            }
-
-            await AddonCalendar.addEventReminder(this.event, notificationTime);
-            this.reminders = await AddonCalendar.getEventReminders(this.eventId);
-            this.notificationTimeText = undefined;
+    async addReminder(): Promise<void> {
+        if (!this.event || !this.event.id) {
+            return;
         }
+
+        const reminderTime = await CoreDomUtils.openModal<number>({
+            component: AddonCalendarReminderTimeModalComponent,
+        });
+
+        if (reminderTime === undefined) {
+            // User canceled.
+            return;
+        }
+
+        await AddonCalendar.addEventReminder(this.event, reminderTime, this.currentSiteId);
+
+        await this.loadReminders();
     }
 
     /**
@@ -345,7 +349,7 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
 
             try {
                 await AddonCalendar.deleteEventReminder(id);
-                this.reminders = await AddonCalendar.getEventReminders(this.eventId);
+                await this.loadReminders();
             } catch (error) {
                 CoreDomUtils.showErrorModalDefault(error, 'Error deleting reminder');
             } finally {
@@ -549,6 +553,7 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
         this.syncObserver?.off();
         this.manualSyncObserver?.off();
         this.onlineObserver?.unsubscribe();
+        clearInterval(this.updateCurrentTime);
     }
 
 }
diff --git a/src/addons/calendar/pages/settings/settings.html b/src/addons/calendar/pages/settings/settings.html
index 8cc5f6dee..8ebb4f579 100644
--- a/src/addons/calendar/pages/settings/settings.html
+++ b/src/addons/calendar/pages/settings/settings.html
@@ -8,18 +8,10 @@
 </ion-header>
 <ion-content>
     <ion-list>
-        <ion-item *ngIf="defaultTime != -1">
+        <ion-item *ngIf="defaultTimeLabel">
             <ion-label>{{ 'addon.calendar.defaultnotificationtime' | translate }}</ion-label>
-            <ion-select [(ngModel)]="defaultTime" (ionChange)="updateDefaultTime(defaultTime)" interface="action-sheet"
-                [interfaceOptions]="{header: 'addon.calendar.defaultnotificationtime' | translate}">
-                <ion-select-option [value]="0">{{ 'core.settings.disabled' | translate }}</ion-select-option>
-                <ion-select-option [value]="10">{{ 600 | coreDuration }}</ion-select-option>
-                <ion-select-option [value]="30">{{ 1800 | coreDuration }}</ion-select-option>
-                <ion-select-option [value]="60">{{ 3600 | coreDuration }}</ion-select-option>
-                <ion-select-option [value]="120">{{ 7200 | coreDuration }}</ion-select-option>
-                <ion-select-option [value]="360">{{ 21600 | coreDuration }}</ion-select-option>
-                <ion-select-option [value]="720">{{ 43200 | coreDuration }}</ion-select-option>
-                <ion-select-option [value]="1440">{{ 86400 | coreDuration }}</ion-select-option>
+            <ion-select [(ngModel)]="defaultTimeLabel" (click)="changeDefaultTime($event)">
+                <ion-select-option [value]="defaultTimeLabel">{{ defaultTimeLabel }}</ion-select-option>
             </ion-select>
         </ion-item>
     </ion-list>
diff --git a/src/addons/calendar/pages/settings/settings.ts b/src/addons/calendar/pages/settings/settings.ts
index a42184f2d..ec1ee3455 100644
--- a/src/addons/calendar/pages/settings/settings.ts
+++ b/src/addons/calendar/pages/settings/settings.ts
@@ -13,9 +13,16 @@
 // limitations under the License.
 
 import { Component, OnInit } from '@angular/core';
-import { AddonCalendar, AddonCalendarProvider } from '../../services/calendar';
+import {
+    AddonCalendar,
+    AddonCalendarProvider,
+    AddonCalendarReminderUnits,
+    AddonCalendarValueAndUnit,
+} from '../../services/calendar';
 import { CoreEvents } from '@singletons/events';
 import { CoreSites } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
+import { AddonCalendarReminderTimeModalComponent } from '@addons/calendar/components/reminder-time-modal/reminder-time-modal';
 
 /**
  * Page that displays the calendar settings.
@@ -26,13 +33,51 @@ import { CoreSites } from '@services/sites';
 })
 export class AddonCalendarSettingsPage implements OnInit {
 
-    defaultTime = -1;
+    defaultTimeLabel = '';
+
+    protected defaultTime: AddonCalendarValueAndUnit = {
+        value: 0,
+        unit: AddonCalendarReminderUnits.MINUTE,
+    };
 
     /**
      * View loaded.
      */
     async ngOnInit(): Promise<void> {
-        this.defaultTime = await AddonCalendar.getDefaultNotificationTime();
+        const defaultTime = await AddonCalendar.getDefaultNotificationTime();
+
+        this.defaultTime = AddonCalendarProvider.convertSecondsToValueAndUnit(defaultTime);
+        this.defaultTimeLabel = AddonCalendar.getUnitValueLabel(this.defaultTime.value, this.defaultTime.unit);
+    }
+
+    /**
+     * Change default time.
+     *
+     * @param e Event.
+     * @return Promise resolved when done.
+     */
+    async changeDefaultTime(e: Event): Promise<void> {
+        e.stopPropagation();
+        e.stopImmediatePropagation();
+        e.preventDefault();
+
+        const reminderTime = await CoreDomUtils.openModal<number>({
+            component: AddonCalendarReminderTimeModalComponent,
+            componentProps: {
+                initialValue: this.defaultTime,
+                allowDisable: true,
+            },
+        });
+
+        if (reminderTime === undefined) {
+            // User canceled.
+            return;
+        }
+
+        this.defaultTime = AddonCalendarProvider.convertSecondsToValueAndUnit(reminderTime);
+        this.defaultTimeLabel = AddonCalendar.getUnitValueLabel(this.defaultTime.value, this.defaultTime.unit);
+
+        this.updateDefaultTime(reminderTime);
     }
 
     /**
diff --git a/src/addons/calendar/services/calendar-helper.ts b/src/addons/calendar/services/calendar-helper.ts
index 447745701..1cf856436 100644
--- a/src/addons/calendar/services/calendar-helper.ts
+++ b/src/addons/calendar/services/calendar-helper.ts
@@ -23,6 +23,7 @@ import {
     AddonCalendarEventType,
     AddonCalendarGetEventsEvent,
     AddonCalendarProvider,
+    AddonCalendarReminderUnits,
     AddonCalendarWeek,
     AddonCalendarWeekDay,
 } from './calendar';
@@ -35,6 +36,7 @@ import { makeSingleton } from '@singletons';
 import { AddonCalendarSyncInvalidateEvent } from './calendar-sync';
 import { AddonCalendarOfflineEventDBRecord } from './database/calendar-offline';
 import { CoreCategoryData } from '@features/courses/services/courses';
+import { AddonCalendarReminderDBRecord } from './database/calendar';
 
 /**
  * Context levels enumeration.
@@ -282,6 +284,55 @@ export class AddonCalendarHelperProvider {
         }
     }
 
+    /**
+     * Format reminders, adding calculated data.
+     *
+     * @param reminders Reminders.
+     * @param timestart Event timestart.
+     * @param siteId Site ID.
+     * @return Formatted reminders.
+     */
+    async formatReminders(
+        reminders: AddonCalendarReminderDBRecord[],
+        timestart: number,
+        siteId?: string,
+    ): Promise<AddonCalendarEventReminder[]> {
+        const defaultTime = await AddonCalendar.getDefaultNotificationTime(siteId);
+
+        const formattedReminders = <AddonCalendarEventReminder[]> reminders;
+        const eventTimestart = timestart;
+        let defaultTimeValue: number | undefined;
+        let defaultTimeUnit: AddonCalendarReminderUnits | undefined;
+
+        if (defaultTime > 0) {
+            const data = AddonCalendarProvider.convertSecondsToValueAndUnit(defaultTime);
+            defaultTimeValue = data.value;
+            defaultTimeUnit = data.unit;
+        }
+
+        return formattedReminders.map((reminder) => {
+            if (reminder.time === null) {
+                // Default time. Check if default notifications are disabled.
+                if (defaultTimeValue !== undefined && defaultTimeUnit) {
+                    reminder.value = defaultTimeValue;
+                    reminder.unit = defaultTimeUnit;
+                    reminder.timestamp = eventTimestart - reminder.value * reminder.unit;
+                }
+            } else {
+                const data = AddonCalendarProvider.convertSecondsToValueAndUnit(reminder.time);
+                reminder.value = data.value;
+                reminder.unit = data.unit;
+                reminder.timestamp = eventTimestart - reminder.time;
+            }
+
+            if (reminder.value && reminder.unit) {
+                reminder.label = AddonCalendar.getUnitValueLabel(reminder.value, reminder.unit, reminder.time === null);
+            }
+
+            return reminder;
+        });
+    }
+
     /**
      * Get options (name & value) for each allowed event type.
      *
@@ -725,3 +776,13 @@ export type AddonCalendarEventTypeOption = {
     name: string;
     value: AddonCalendarEventType;
 };
+
+/**
+ * Formatted event reminder.
+ */
+export type AddonCalendarEventReminder = AddonCalendarReminderDBRecord & {
+    value?: number; // Amount of time.
+    unit?: AddonCalendarReminderUnits; // Units.
+    timestamp?: number; // Timestamp (in seconds).
+    label?: string; // Label to represent the reminder.
+};
diff --git a/src/addons/calendar/services/calendar.ts b/src/addons/calendar/services/calendar.ts
index f21f71869..5ea82fe81 100644
--- a/src/addons/calendar/services/calendar.ts
+++ b/src/addons/calendar/services/calendar.ts
@@ -53,6 +53,16 @@ export enum AddonCalendarEventType {
     USER = 'user',
 }
 
+/**
+ * Units to set a reminder.
+ */
+export enum AddonCalendarReminderUnits {
+    MINUTE = CoreConstants.SECONDS_MINUTE,
+    HOUR = CoreConstants.SECONDS_HOUR,
+    DAY = CoreConstants.SECONDS_DAY,
+    WEEK = CoreConstants.SECONDS_WEEK,
+}
+
 declare module '@singletons/events' {
 
     /**
@@ -72,6 +82,21 @@ declare module '@singletons/events' {
 
 }
 
+const REMINDER_UNITS_LABELS = {
+    single: {
+        [AddonCalendarReminderUnits.MINUTE]: 'core.minute',
+        [AddonCalendarReminderUnits.HOUR]: 'core.hour',
+        [AddonCalendarReminderUnits.DAY]: 'core.day',
+        [AddonCalendarReminderUnits.WEEK]: 'core.week',
+    },
+    multi: {
+        [AddonCalendarReminderUnits.MINUTE]: 'core.minutes',
+        [AddonCalendarReminderUnits.HOUR]: 'core.hours',
+        [AddonCalendarReminderUnits.DAY]: 'core.days',
+        [AddonCalendarReminderUnits.WEEK]: 'core.weeks',
+    },
+};
+
 /**
  * Service to handle calendar events.
  */
@@ -82,7 +107,7 @@ export class AddonCalendarProvider {
     static readonly COMPONENT = 'AddonCalendarEvents';
     static readonly DEFAULT_NOTIFICATION_TIME_CHANGED = 'AddonCalendarDefaultNotificationTimeChangedEvent';
     static readonly DEFAULT_NOTIFICATION_TIME_SETTING = 'mmaCalendarDefaultNotifTime';
-    static readonly DEFAULT_NOTIFICATION_TIME = 60;
+    static readonly DEFAULT_NOTIFICATION_TIME = 3600;
     static readonly STARTING_WEEK_DAY = 'addon_calendar_starting_week_day';
     static readonly NEW_EVENT_EVENT = 'addon_calendar_new_event';
     static readonly NEW_EVENT_DISCARDED_EVENT = 'addon_calendar_new_event_discarded';
@@ -156,6 +181,41 @@ export class AddonCalendarProvider {
         return !!site?.isVersionGreaterEqualThan('3.7.1');
     }
 
+    /**
+     * Given a number of seconds, convert it to a unit&value format compatible with reminders.
+     *
+     * @param seconds Number of seconds.
+     * @return Value and unit.
+     */
+    static convertSecondsToValueAndUnit(seconds: number): AddonCalendarValueAndUnit {
+        if (seconds <= 0) {
+            return {
+                value: 0,
+                unit: AddonCalendarReminderUnits.MINUTE,
+            };
+        } else if (seconds % AddonCalendarReminderUnits.WEEK === 0) {
+            return {
+                value: seconds / AddonCalendarReminderUnits.WEEK,
+                unit: AddonCalendarReminderUnits.WEEK,
+            };
+        } else if (seconds % AddonCalendarReminderUnits.DAY === 0) {
+            return {
+                value: seconds / AddonCalendarReminderUnits.DAY,
+                unit: AddonCalendarReminderUnits.DAY,
+            };
+        } else if (seconds % AddonCalendarReminderUnits.HOUR === 0) {
+            return {
+                value: seconds / AddonCalendarReminderUnits.HOUR,
+                unit: AddonCalendarReminderUnits.HOUR,
+            };
+        } else {
+            return {
+                value: seconds / AddonCalendarReminderUnits.MINUTE,
+                unit: AddonCalendarReminderUnits.MINUTE,
+            };
+        }
+    }
+
     /**
      * Delete an event.
      *
@@ -248,7 +308,7 @@ export class AddonCalendarProvider {
             REMINDERS_TABLE,
             { eventid: eventId },
         ).then((reminders) =>
-            Promise.all(reminders.map((reminder) => this.deleteEventReminder(reminder.id!, siteId)))));
+            Promise.all(reminders.map((reminder) => this.deleteEventReminder(reminder.id, siteId)))));
 
         try {
             await Promise.all(promises);
@@ -548,7 +608,7 @@ export class AddonCalendarProvider {
      * Get the configured default notification time.
      *
      * @param siteId ID of the site. If not defined, use current site.
-     * @return Promise resolved with the default time.
+     * @return Promise resolved with the default time (in seconds).
      */
     async getDefaultNotificationTime(siteId?: string): Promise<number> {
         siteId = siteId || CoreSites.getCurrentSiteId();
@@ -678,24 +738,27 @@ export class AddonCalendarProvider {
     /**
      * Adds an event reminder and schedule a new notification.
      *
-     * @param event Event to update its notification time.
-     * @param time New notification setting timestamp.
+     * @param event Event to set the reminder.
+     * @param time Amount of seconds of the reminder. Undefined for default reminder.
      * @param siteId ID of the site the event belongs to. If not defined, use current site.
      * @return Promise resolved when the notification is updated.
      */
     async addEventReminder(
         event: { id: number; timestart: number; timeduration: number; name: string},
-        time: number,
+        time?: number | null,
         siteId?: string,
     ): Promise<void> {
         const site = await CoreSites.getSite(siteId);
-        const reminder: AddonCalendarReminderDBRecord = {
+        const reminder: Partial<AddonCalendarReminderDBRecord> = {
             eventid: event.id,
-            time: time,
+            time: time ?? null,
         };
+
         const reminderId = await site.getDb().insertRecord(REMINDERS_TABLE, reminder);
 
-        await this.scheduleEventNotification(event, reminderId, time, site.getId());
+        const timestamp = time ? event.timestart - time : time;
+
+        await this.scheduleEventNotification(event, reminderId, timestamp, site.getId());
     }
 
     /**
@@ -1022,6 +1085,35 @@ export class AddonCalendarProvider {
                 (categoryId ? categoryId : '');
     }
 
+    /**
+     * Given a value and a unit, return the translated label.
+     *
+     * @param value Value.
+     * @param unit Unit.
+     * @param addDefaultLabel Whether to add the "Default" text.
+     * @return Translated label.
+     */
+    getUnitValueLabel(value: number, unit: AddonCalendarReminderUnits, addDefaultLabel = false): string {
+        if (value === 0) {
+            return Translate.instant('core.settings.disabled');
+        }
+
+        const unitsLabel = value === 1 ?
+            REMINDER_UNITS_LABELS.single[unit] :
+            REMINDER_UNITS_LABELS.multi[unit];
+
+        const label = Translate.instant('addon.calendar.timebefore', {
+            units: Translate.instant(unitsLabel),
+            value: value,
+        });
+
+        if (addDefaultLabel) {
+            return Translate.instant('core.defaultvalue', { $a: label });
+        }
+
+        return label;
+    }
+
     /**
      * Get upcoming calendar events.
      *
@@ -1335,14 +1427,14 @@ export class AddonCalendarProvider {
      *
      * @param event Event to schedule.
      * @param reminderId The reminder ID.
-     * @param time Notification setting time (in minutes). E.g. 10 means "notificate 10 minutes before start".
+     * @param time Notification timestamp (in seconds). Undefined for default time.
      * @param siteId Site ID the event belongs to. If not defined, use current site.
      * @return Promise resolved when the notification is scheduled.
      */
     protected async scheduleEventNotification(
         event: { id: number; timestart: number; name: string},
         reminderId: number,
-        time: number,
+        time?: number | null,
         siteId?: string,
     ): Promise<void> {
 
@@ -1357,16 +1449,16 @@ export class AddonCalendarProvider {
             return CoreLocalNotifications.cancel(reminderId, AddonCalendarProvider.COMPONENT, siteId);
         }
 
-        if (time == -1) {
-            // If time is -1, get event default time to calculate the notification time.
+        if (!time) {
+            // Get event default time to calculate the notification time.
             time = await this.getDefaultNotificationTime(siteId);
 
-            if (time == 0) {
+            if (time === 0) {
                 // Default notification time is disabled, do not show.
                 return CoreLocalNotifications.cancel(reminderId, AddonCalendarProvider.COMPONENT, siteId);
             }
 
-            time = event.timestart - (time * 60);
+            time = event.timestart - time;
         }
 
         time = time * 1000;
@@ -1417,17 +1509,18 @@ export class AddonCalendarProvider {
         siteId = siteId || CoreSites.getCurrentSiteId();
 
         const promises = events.map(async (event) => {
-            const timeEnd = (event.timestart + event.timeduration) * 1000;
-
-            if (timeEnd <= new Date().getTime()) {
-                // The event has finished already, don't schedule it.
+            if (event.timestart * 1000 <= Date.now()) {
+                // The event has already started, don't schedule it.
                 return this.deleteLocalEvent(event.id, siteId);
             }
 
             const reminders = await this.getEventReminders(event.id, siteId);
 
-            const p2 = reminders.map((reminder: AddonCalendarReminderDBRecord) =>
-                this.scheduleEventNotification(event, (reminder.id!), reminder.time, siteId));
+            const p2 = reminders.map((reminder) => {
+                const time = reminder.time ? event.timestart - reminder.time : reminder.time;
+
+                return this.scheduleEventNotification(event, reminder.id, time, siteId);
+            });
 
             await Promise.all(p2);
         });
@@ -1467,7 +1560,8 @@ export class AddonCalendarProvider {
             const reminders = await this.getEventReminders(event.id, siteId);
 
             if (reminders.length == 0) {
-                this.addEventReminder(event, -1, siteId);
+                // No reminders, create the default one.
+                this.addEventReminder(event, undefined, siteId);
             }
         }
 
@@ -1537,9 +1631,7 @@ export class AddonCalendarProvider {
         const site = await CoreSites.getSite(siteId);
         siteId = site.getId();
 
-        await Promise.all(events.map((event: AddonCalendarGetEventsEvent| AddonCalendarCalendarEvent) =>
-            // If event does not exist on the DB, schedule the reminder.
-            this.storeEventInLocalDb(event, siteId)));
+        await Promise.all(events.map((event) => this.storeEventInLocalDb(event, siteId)));
     }
 
     /**
@@ -2154,3 +2246,11 @@ type AddonCalendarPushNotificationData = {
     reminderId: number;
     siteId: string;
 };
+
+/**
+ * Value and unit for reminders.
+ */
+export type AddonCalendarValueAndUnit = {
+    value: number;
+    unit: AddonCalendarReminderUnits;
+};
diff --git a/src/addons/calendar/services/database/calendar.ts b/src/addons/calendar/services/database/calendar.ts
index c6d3acd3d..643a5ae98 100644
--- a/src/addons/calendar/services/database/calendar.ts
+++ b/src/addons/calendar/services/database/calendar.ts
@@ -14,7 +14,8 @@
 
 import { SQLiteDB } from '@classes/sqlitedb';
 import { CoreSiteSchema } from '@services/sites';
-import { AddonCalendarEventType } from '../calendar';
+import { CoreUtils } from '@services/utils/utils';
+import { AddonCalendar, AddonCalendarEventType } from '../calendar';
 
 /**
  * Database variables for AddonDatabase service.
@@ -23,7 +24,7 @@ export const EVENTS_TABLE = 'addon_calendar_events_3';
 export const REMINDERS_TABLE = 'addon_calendar_reminders';
 export const CALENDAR_SITE_SCHEMA: CoreSiteSchema = {
     name: 'AddonCalendarProvider',
-    version: 3,
+    version: 4,
     canBeCleared: [EVENTS_TABLE],
     tables: [
         {
@@ -199,8 +200,9 @@ export const CALENDAR_SITE_SCHEMA: CoreSiteSchema = {
             ],
         },
     ],
-    async migrate(db: SQLiteDB, oldVersion: number): Promise<void> {
+    async migrate(db: SQLiteDB, oldVersion: number, siteId: string): Promise<void> {
         if (oldVersion < 3) {
+            // Migrate calendar events. New format @since 3.7.
             let oldTable = 'addon_calendar_events_2';
 
             try {
@@ -212,6 +214,46 @@ export const CALENDAR_SITE_SCHEMA: CoreSiteSchema = {
 
             await db.migrateTable(oldTable, EVENTS_TABLE);
         }
+
+        if (oldVersion < 4) {
+            // Migrate reminders. New format @since 4.0.
+            const defaultTime = await CoreUtils.ignoreErrors(AddonCalendar.getDefaultNotificationTime(siteId));
+            if (defaultTime) {
+                // Convert from minutes to seconds.
+                AddonCalendar.setDefaultNotificationTime(defaultTime * 60, siteId);
+            }
+
+            const records = await db.getAllRecords<AddonCalendarReminderDBRecord>(REMINDERS_TABLE);
+            const events: Record<number, AddonCalendarEventDBRecord> = {};
+
+            await Promise.all(records.map(async (record) => {
+                // Get the event to compare the reminder time with the event time.
+                if (!events[record.eventid]) {
+                    try {
+                        events[record.eventid] = await db.getRecord(EVENTS_TABLE, { id: record.eventid });
+                    } catch {
+                        // Event not found in local DB, shouldn't happen. Delete the reminder.
+                        await db.deleteRecords(REMINDERS_TABLE, { id: record.id });
+
+                        return;
+                    }
+                }
+
+                if (!record.time || record.time === -1) {
+                    // Default reminder. Use null now.
+                    record.time = null;
+                } else if (record.time > events[record.eventid].timestart) {
+                    // Reminder is after the event, delete it.
+                    await db.deleteRecords(REMINDERS_TABLE, { id: record.id });
+
+                    return;
+                } else {
+                    record.time = events[record.eventid].timestart - record.time;
+                }
+
+                return this.insertRecord(REMINDERS_TABLE, record);
+            }));
+        }
     },
 };
 
@@ -257,7 +299,7 @@ export type AddonCalendarEventDBRecord = {
 };
 
 export type AddonCalendarReminderDBRecord = {
-    id?: number;
+    id: number;
     eventid: number;
-    time: number;
+    time: number | null; // Number of seconds before the event, null for default time.
 };
diff --git a/src/core/lang.json b/src/core/lang.json
index 08efb25f7..99182daa6 100644
--- a/src/core/lang.json
+++ b/src/core/lang.json
@@ -60,6 +60,7 @@
     "coursedetails": "Course details",
     "coursenogroups": "You are not a member of any group of this course.",
     "currentdevice": "Current device",
+    "custom": "Custom",
     "datastoredoffline": "Data stored in the device because it couldn't be sent. It will be sent automatically later.",
     "date": "Date",
     "day": "day",
@@ -157,6 +158,8 @@
     "maxsizeandattachments": "Maximum file size: {{$a.size}}, maximum number of files: {{$a.attachments}}",
     "min": "min",
     "mins": "mins",
+    "minute": "minute",
+    "minutes": "minutes",
     "misc": "Miscellaneous",
     "mod_assign": "Assignment",
     "mod_assignment": "Assignment 2.2 (Disabled)",
@@ -330,6 +333,8 @@
     "viewprofile": "View profile",
     "warningofflinedatadeleted": "Offline data from {{component}} '{{name}}' has been deleted. {{error}}",
     "warnopeninbrowser": "<p>You are about to leave the app to open the following URL in your device's browser. Do you want to continue?</p>\n<p><b>{{url}}</b></p>",
+    "week": "week",
+    "weeks": "weeks",
     "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.",

From 56596ad30e8d6e4b68bc301d5b1a75227556e83c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 11 Nov 2021 10:02:53 +0100
Subject: [PATCH 0211/1008] MOBILE-3909 calendar: Fix non-null assertion eslint
 warnings

---
 .../calendar/components/calendar/calendar.ts  | 26 +++++++--------
 .../upcoming-events/upcoming-events.ts        |  6 ++--
 src/addons/calendar/pages/day/day.page.ts     |  4 +--
 .../pages/edit-event/edit-event.page.ts       | 19 +++++++----
 src/addons/calendar/pages/event/event.page.ts |  9 ++---
 .../calendar/services/calendar-helper.ts      | 24 +++++++-------
 .../calendar/services/calendar-offline.ts     |  2 +-
 src/addons/calendar/services/calendar-sync.ts |  9 ++---
 src/addons/calendar/services/calendar.ts      | 33 +++++++++++--------
 .../services/database/calendar-offline.ts     |  2 +-
 .../calendar/services/database/calendar.ts    |  2 +-
 src/addons/messages/services/messages-sync.ts |  5 +--
 src/addons/mod/assign/services/assign-sync.ts |  5 +--
 src/addons/mod/choice/services/choice-sync.ts |  5 +--
 src/addons/mod/data/services/data-sync.ts     |  5 +--
 .../mod/feedback/services/feedback-sync.ts    |  5 +--
 src/addons/mod/forum/services/forum-sync.ts   | 10 +++---
 .../mod/glossary/services/glossary-sync.ts    |  5 +--
 .../h5pactivity/services/h5pactivity-sync.ts  |  5 +--
 src/addons/mod/quiz/services/quiz-sync.ts     |  5 +--
 src/addons/mod/scorm/services/scorm-sync.ts   |  5 +--
 src/addons/mod/survey/services/survey-sync.ts |  5 +--
 src/addons/mod/wiki/services/wiki-sync.ts     |  5 +--
 .../mod/workshop/services/workshop-sync.ts    |  5 +--
 src/addons/notes/services/notes-sync.ts       |  5 +--
 src/core/classes/base-sync.ts                 | 22 ++++---------
 .../comments/services/comments-sync.ts        |  5 +--
 src/core/features/course/services/sync.ts     |  5 +--
 .../features/rating/services/rating-sync.ts   |  5 +--
 src/core/features/user/services/user-sync.ts  |  5 +--
 30 files changed, 139 insertions(+), 114 deletions(-)

diff --git a/src/addons/calendar/components/calendar/calendar.ts b/src/addons/calendar/components/calendar/calendar.ts
index 5575e917c..a4b2178bc 100644
--- a/src/addons/calendar/components/calendar/calendar.ts
+++ b/src/addons/calendar/components/calendar/calendar.ts
@@ -94,7 +94,7 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
             this.obsDefaultTimeChange = CoreEvents.on(AddonCalendarProvider.DEFAULT_NOTIFICATION_TIME_CHANGED, () => {
                 this.weeks.forEach((week) => {
                     week.days.forEach((day) => {
-                        AddonCalendar.scheduleEventsNotifications(day.eventsFormated!);
+                        AddonCalendar.scheduleEventsNotifications(day.eventsFormated || []);
                     });
                 });
             }, this.currentSiteId);
@@ -150,7 +150,7 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
 
         if (this.weeks) {
             // Check if there's any change in the filter object.
-            const changes = this.differ.diff(this.filter!);
+            const changes = this.differ.diff(this.filter || {});
             if (changes) {
                 this.filterEvents();
             }
@@ -173,8 +173,8 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
             this.offlineEvents = AddonCalendarHelper.classifyIntoMonths(events);
 
             // Get the IDs of events edited in offline.
-            const filtered = events.filter((event) => event.id! > 0);
-            this.offlineEditedEventsIds = filtered.map((event) => event.id!);
+            const filtered = events.filter((event) => event.id > 0);
+            this.offlineEditedEventsIds = filtered.map((event) => event.id);
 
             return;
         }));
@@ -261,7 +261,7 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
                     isPast = day.ispast;
 
                     if (day.istoday) {
-                        day.eventsFormated!.forEach((event) => {
+                        day.eventsFormated?.forEach((event) => {
                             event.ispast = this.isEventPast(event);
                         });
                     }
@@ -306,8 +306,8 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
         this.weeks.forEach((week) => {
             week.days.forEach((day) => {
                 day.filteredEvents = AddonCalendarHelper.getFilteredEvents(
-                    day.eventsFormated!,
-                    this.filter!,
+                    day.eventsFormated || [],
+                    this.filter,
                     this.categories,
                 );
 
@@ -466,14 +466,14 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
             week.days.forEach((day) => {
 
                 // Schedule notifications for the events retrieved (only future events will be scheduled).
-                AddonCalendar.scheduleEventsNotifications(day.eventsFormated!);
+                AddonCalendar.scheduleEventsNotifications(day.eventsFormated || []);
 
                 if (monthOfflineEvents || this.deletedEvents.length) {
                     // There is offline data, merge it.
 
                     if (this.deletedEvents.length) {
                         // Mark as deleted the events that were deleted in offline.
-                        day.eventsFormated!.forEach((event) => {
+                        day.eventsFormated?.forEach((event) => {
                             event.deleted = this.deletedEvents.indexOf(event.id) != -1;
                         });
                     }
@@ -483,10 +483,10 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
                         day.events = day.events.filter((event) => this.offlineEditedEventsIds.indexOf(event.id) == -1);
                     }
 
-                    if (monthOfflineEvents && monthOfflineEvents[day.mday]) {
+                    if (monthOfflineEvents && monthOfflineEvents[day.mday] && day.eventsFormated) {
                         // Add the offline events (either new or edited).
                         day.eventsFormated =
-                            AddonCalendarHelper.sortEvents(day.eventsFormated!.concat(monthOfflineEvents[day.mday]));
+                            AddonCalendarHelper.sortEvents(day.eventsFormated.concat(monthOfflineEvents[day.mday]));
                     }
                 }
             });
@@ -505,7 +505,7 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
 
         this.weeks.forEach((week) => {
             week.days.forEach((day) => {
-                const event = day.eventsFormated!.find((event) => event.id == eventId);
+                const event = day.eventsFormated?.find((event) => event.id == eventId);
 
                 if (event) {
                     event.deleted = false;
@@ -521,7 +521,7 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
      * @return True if it's in the past.
      */
     protected isEventPast(event: { timestart: number; timeduration: number}): boolean {
-        return (event.timestart + event.timeduration) < this.currentTime!;
+        return (event.timestart + event.timeduration) < (this.currentTime || CoreTimeUtils.timestamp());
     }
 
     /**
diff --git a/src/addons/calendar/components/upcoming-events/upcoming-events.ts b/src/addons/calendar/components/upcoming-events/upcoming-events.ts
index 7566c6d14..f59363845 100644
--- a/src/addons/calendar/components/upcoming-events/upcoming-events.ts
+++ b/src/addons/calendar/components/upcoming-events/upcoming-events.ts
@@ -106,7 +106,7 @@ export class AddonCalendarUpcomingEventsComponent implements OnInit, DoCheck, On
      */
     ngDoCheck(): void {
         // Check if there's any change in the filter object.
-        const changes = this.differ.diff(this.filter!);
+        const changes = this.differ.diff(this.filter || {});
         if (changes) {
             this.filterEvents();
         }
@@ -183,7 +183,7 @@ export class AddonCalendarUpcomingEventsComponent implements OnInit, DoCheck, On
 
         // Re-calculate the formatted time so it uses the device date.
         const promises = this.events.map((event) =>
-            AddonCalendar.formatEventTime(event, this.timeFormat!).then((time) => {
+            AddonCalendar.formatEventTime(event, this.timeFormat).then((time) => {
                 event.formattedtime = time;
 
                 return;
@@ -221,7 +221,7 @@ export class AddonCalendarUpcomingEventsComponent implements OnInit, DoCheck, On
      * Filter events based on the filter popover.
      */
     protected filterEvents(): void {
-        this.filteredEvents = AddonCalendarHelper.getFilteredEvents(this.events, this.filter!, this.categories);
+        this.filteredEvents = AddonCalendarHelper.getFilteredEvents(this.events, this.filter, this.categories);
     }
 
     /**
diff --git a/src/addons/calendar/pages/day/day.page.ts b/src/addons/calendar/pages/day/day.page.ts
index f02bc54d1..8e6d707eb 100644
--- a/src/addons/calendar/pages/day/day.page.ts
+++ b/src/addons/calendar/pages/day/day.page.ts
@@ -286,7 +286,7 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
                 this.offlineEvents = AddonCalendarHelper.classifyIntoMonths(offlineEvents);
 
                 // Get the IDs of events edited in offline.
-                this.offlineEditedEventsIds = offlineEvents.filter((event) => event.id! > 0).map((event) => event.id!);
+                this.offlineEditedEventsIds = offlineEvents.filter((event) => event.id > 0).map((event) => event.id);
 
                 return;
             }));
@@ -361,7 +361,7 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
         const promises = this.events.map((event) => {
             event.ispast = this.isPastDay || (this.isCurrentDay && this.isEventPast(event));
 
-            return AddonCalendar.formatEventTime(event, this.timeFormat!, true, dayTime).then((time) => {
+            return AddonCalendar.formatEventTime(event, this.timeFormat, true, dayTime).then((time) => {
                 event.formattedtime = time;
 
                 return;
diff --git a/src/addons/calendar/pages/edit-event/edit-event.page.ts b/src/addons/calendar/pages/edit-event/edit-event.page.ts
index 366e07fa9..e16c88b09 100644
--- a/src/addons/calendar/pages/edit-event/edit-event.page.ts
+++ b/src/addons/calendar/pages/edit-event/edit-event.page.ts
@@ -171,17 +171,19 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy, CanLeave {
 
             if (this.eventId && !this.gotEventData) {
                 // Editing an event, get the event data. Wait for sync first.
+                const eventId = this.eventId;
+
                 promises.push(AddonCalendarSync.waitForSync(AddonCalendarSyncProvider.SYNC_ID).then(async () => {
                     // Do not block if the scope is already destroyed.
                     if (!this.isDestroyed && this.eventId) {
-                        CoreSync.blockOperation(AddonCalendarProvider.COMPONENT, this.eventId);
+                        CoreSync.blockOperation(AddonCalendarProvider.COMPONENT, eventId);
                     }
 
                     let eventForm: AddonCalendarEvent | AddonCalendarOfflineEventDBRecord | undefined;
 
                     // Get the event offline data if there's any.
                     try {
-                        eventForm = await AddonCalendarOffline.getEvent(this.eventId!);
+                        eventForm = await AddonCalendarOffline.getEvent(eventId);
 
                         this.hasOffline = true;
                     } catch {
@@ -189,9 +191,9 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy, CanLeave {
                         this.hasOffline = false;
                     }
 
-                    if (this.eventId! > 0) {
+                    if (eventId > 0) {
                         // It's an online event. get its data from server.
-                        const event = await AddonCalendar.getEventById(this.eventId!);
+                        const event = await AddonCalendar.getEventById(eventId);
 
                         if (!eventForm) {
                             eventForm = event; // Use offline data first.
@@ -562,7 +564,7 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy, CanLeave {
             if (event) {
                 CoreEvents.trigger(
                     AddonCalendarProvider.NEW_EVENT_EVENT,
-                    { eventId: event.id! },
+                    { eventId: event.id },
                     this.currentSite.getId(),
                 );
             } else {
@@ -578,10 +580,15 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy, CanLeave {
      * Discard an offline saved discussion.
      */
     async discard(): Promise<void> {
+        if (!this.eventId) {
+            return;
+        }
+
         try {
             await CoreDomUtils.showConfirm(Translate.instant('core.areyousure'));
+
             try {
-                await AddonCalendarOffline.deleteEvent(this.eventId!);
+                await AddonCalendarOffline.deleteEvent(this.eventId);
 
                 CoreForms.triggerFormCancelledEvent(this.formElement, this.currentSite.getId());
 
diff --git a/src/addons/calendar/pages/event/event.page.ts b/src/addons/calendar/pages/event/event.page.ts
index bb21b880d..1d320f9ff 100644
--- a/src/addons/calendar/pages/event/event.page.ts
+++ b/src/addons/calendar/pages/event/event.page.ts
@@ -214,7 +214,8 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
         try {
             // Get the event data.
             const event = await AddonCalendar.getEventById(this.eventId);
-            this.event = await AddonCalendarHelper.formatEventData(event);
+            const formattedEvent = await AddonCalendarHelper.formatEventData(event);
+            this.event = formattedEvent;
 
             // Load reminders, and re-schedule them if needed (maybe the event time has changed).
             this.loadReminders();
@@ -266,7 +267,7 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
             // If it's a group event, get the name of the group.
             if (courseId && this.event.groupid) {
                 promises.push(CoreGroups.getUserGroupsInCourse(courseId).then((groups) => {
-                    const group = groups.find((group) => group.id == this.event!.groupid);
+                    const group = groups.find((group) => group.id == formattedEvent.groupid);
 
                     this.groupName = group ? group.name : '';
 
@@ -289,14 +290,14 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
 
             // Check if event was deleted in offine.
             promises.push(AddonCalendarOffline.isEventDeleted(this.eventId).then((deleted) => {
-                this.event!.deleted = deleted;
+                formattedEvent.deleted = deleted;
 
                 return;
             }));
 
             // Re-calculate the formatted time so it uses the device date.
             promises.push(AddonCalendar.getCalendarTimeFormat().then(async (timeFormat) => {
-                this.event!.formattedtime = await AddonCalendar.formatEventTime(this.event!, timeFormat);
+                formattedEvent.formattedtime = await AddonCalendar.formatEventTime(formattedEvent, timeFormat);
 
                 return;
             }));
diff --git a/src/addons/calendar/services/calendar-helper.ts b/src/addons/calendar/services/calendar-helper.ts
index 1cf856436..b1a2081ec 100644
--- a/src/addons/calendar/services/calendar-helper.ts
+++ b/src/addons/calendar/services/calendar-helper.ts
@@ -222,7 +222,7 @@ export class AddonCalendarHelperProvider {
     formatOfflineEventData(event: AddonCalendarOfflineEventDBRecord): AddonCalendarEventToDisplay {
 
         const eventFormatted: AddonCalendarEventToDisplay = {
-            id: event.id!,
+            id: event.id,
             name: event.name,
             timestart: event.timestart,
             eventtype: event.eventtype,
@@ -386,7 +386,7 @@ export class AddonCalendarHelperProvider {
         year: number,
         month: number,
         siteId?: string,
-    ): Promise<{ daynames: Partial<AddonCalendarDayName>[]; weeks: Partial<AddonCalendarWeek>[] }> {
+    ): Promise<{ daynames: Partial<AddonCalendarDayName>[]; weeks: AddonCalendarWeek[] }> {
         const site = await CoreSites.getSite(siteId);
         // Get starting week day user preference, fallback to site configuration.
         let startWeekDayStr = site.getStoredConfig('calendar_startwday');
@@ -395,7 +395,7 @@ export class AddonCalendarHelperProvider {
 
         const today = moment();
         const isCurrentMonth = today.year() == year && today.month() == month - 1;
-        const weeks: Partial<AddonCalendarWeek>[] = [];
+        const weeks: AddonCalendarWeek[] = [];
 
         let date = moment({ year, month: month - 1, date: 1 });
         for (let mday = 1; mday <= date.daysInMonth(); mday++) {
@@ -422,7 +422,7 @@ export class AddonCalendarHelperProvider {
             }
 
             // Add day to current week.
-            weeks[weeks.length - 1].days!.push({
+            weeks[weeks.length - 1].days.push({
                 events: [],
                 hasevents: false,
                 mday: date.date(),
@@ -501,11 +501,11 @@ export class AddonCalendarHelperProvider {
      */
     getFilteredEvents(
         events: AddonCalendarEventToDisplay[],
-        filter: AddonCalendarFilter,
+        filter: AddonCalendarFilter | undefined,
         categories: { [id: number]: CoreCategoryData },
     ): AddonCalendarEventToDisplay[] {
         // Do not filter.
-        if (!filter.filtered) {
+        if (!filter || !filter.filtered) {
             return events;
         }
 
@@ -526,9 +526,9 @@ export class AddonCalendarHelperProvider {
      * Check if an event should be displayed based on the filter.
      *
      * @param event Event object.
+     * @param categories Categories indexed by ID.
      * @param courseId Course ID to filter.
      * @param categoryId Category ID the course belongs to.
-     * @param categories Categories indexed by ID.
      * @return Whether it should be displayed.
      */
     protected shouldDisplayEvent(
@@ -543,7 +543,7 @@ export class AddonCalendarHelperProvider {
         }
 
         if (event.eventtype == 'category' && categories) {
-            if (!event.categoryid || !Object.keys(categories).length) {
+            if (!event.categoryid || !Object.keys(categories).length || !categoryId) {
                 // We can't tell if the course belongs to the category, display them all.
                 return true;
             }
@@ -554,7 +554,7 @@ export class AddonCalendarHelperProvider {
             }
 
             // Check parent categories.
-            let category = categories[categoryId!];
+            let category = categories[categoryId];
             while (category) {
                 if (!category.parent) {
                     // Category doesn't have parent, stop.
@@ -618,7 +618,7 @@ export class AddonCalendarHelperProvider {
                     await AddonCalendar.getLocalEventsByRepeatIdFromLocalDb(eventData.repeatid, site.id);
 
                 await CoreUtils.allPromises(repeatedEvents.map((event) =>
-                    AddonCalendar.invalidateEvent(event.id!)));
+                    AddonCalendar.invalidateEvent(event.id)));
 
                 return;
             }
@@ -721,7 +721,7 @@ export class AddonCalendarHelperProvider {
      */
     refreshAfterChangeEvent(
         event: {
-            id?: number;
+            id: number;
             repeatid?: number;
             timestart: number;
         },
@@ -730,7 +730,7 @@ export class AddonCalendarHelperProvider {
     ): Promise<void> {
         return this.refreshAfterChangeEvents(
             [{
-                id: event.id!,
+                id: event.id,
                 repeatid: event.repeatid,
                 timestart: event.timestart,
                 repeated: repeated,
diff --git a/src/addons/calendar/services/calendar-offline.ts b/src/addons/calendar/services/calendar-offline.ts
index d34586f91..e34ea7eb7 100644
--- a/src/addons/calendar/services/calendar-offline.ts
+++ b/src/addons/calendar/services/calendar-offline.ts
@@ -110,7 +110,7 @@ export class AddonCalendarOfflineProvider {
     async getAllEditedEventsIds(siteId?: string): Promise<number[]> {
         const events = await this.getAllEditedEvents(siteId);
 
-        return events.map((event) => event.id!);
+        return events.map((event) => event.id);
     }
 
     /**
diff --git a/src/addons/calendar/services/calendar-sync.ts b/src/addons/calendar/services/calendar-sync.ts
index 5d6fcad20..b6d4d0cf6 100644
--- a/src/addons/calendar/services/calendar-sync.ts
+++ b/src/addons/calendar/services/calendar-sync.ts
@@ -100,9 +100,10 @@ export class AddonCalendarSyncProvider extends CoreSyncBaseProvider<AddonCalenda
     async syncEvents(siteId?: string): Promise<AddonCalendarSyncEvents> {
         siteId = siteId || CoreSites.getCurrentSiteId();
 
-        if (this.isSyncing(AddonCalendarSyncProvider.SYNC_ID, siteId)) {
+        const currentSyncPromise = this.getOngoingSync(AddonCalendarSyncProvider.SYNC_ID, siteId);
+        if (currentSyncPromise) {
             // There's already a sync ongoing for this site, return the promise.
-            return this.getOngoingSync(AddonCalendarSyncProvider.SYNC_ID, siteId)!;
+            return currentSyncPromise;
         }
 
         this.logger.debug('Try to sync calendar events for site ' + siteId);
@@ -272,7 +273,7 @@ export class AddonCalendarSyncProvider extends CoreSyncBaseProvider<AddonCalenda
             });
 
             // Event sent, delete the offline data.
-            return AddonCalendarOffline.deleteEvent(event.id!, siteId);
+            return AddonCalendarOffline.deleteEvent(event.id, siteId);
 
         } catch (error) {
             if (!CoreUtils.isWebServiceError(error)) {
@@ -283,7 +284,7 @@ export class AddonCalendarSyncProvider extends CoreSyncBaseProvider<AddonCalenda
             // The WebService has thrown an error, this means that the event cannot be created. Delete it.
             result.updated = true;
 
-            await AddonCalendarOffline.deleteEvent(event.id!, siteId);
+            await AddonCalendarOffline.deleteEvent(event.id, siteId);
 
             // Event deleted, add a warning.
             this.addOfflineDataDeletedWarning(result.warnings, event.name, error);
diff --git a/src/addons/calendar/services/calendar.ts b/src/addons/calendar/services/calendar.ts
index 5ea82fe81..d7b0842d1 100644
--- a/src/addons/calendar/services/calendar.ts
+++ b/src/addons/calendar/services/calendar.ts
@@ -366,7 +366,7 @@ export class AddonCalendarProvider {
      */
     async formatEventTime(
         event: AddonCalendarEventToDisplay,
-        format: string,
+        format?: string,
         useCommonWords = true,
         seenDay?: number,
         showTime = 0,
@@ -716,18 +716,18 @@ export class AddonCalendarProvider {
         eventConverted.iscategoryevent = originalEvent.eventtype == AddonCalendarEventType.CATEGORY;
         eventConverted.normalisedeventtype = this.getEventType(recordAsRecord);
         try {
-            eventConverted.category = CoreTextUtils.parseJSON(recordAsRecord.category!);
+            eventConverted.category = CoreTextUtils.parseJSON(recordAsRecord.category || '');
         } catch {
             // Ignore errors.
         }
 
         try {
-            eventConverted.course = CoreTextUtils.parseJSON(recordAsRecord.course!);
+            eventConverted.course = CoreTextUtils.parseJSON(recordAsRecord.course || '');
         } catch {
             // Ignore errors.
         }
         try {
-            eventConverted.subscription = CoreTextUtils.parseJSON(recordAsRecord.subscription!);
+            eventConverted.subscription = CoreTextUtils.parseJSON(recordAsRecord.subscription || '');
         } catch {
             // Ignore errors.
         }
@@ -918,6 +918,10 @@ export class AddonCalendarProvider {
         const start = initialTime + (CoreConstants.SECONDS_DAY * daysToStart);
         const end = start + (CoreConstants.SECONDS_DAY * daysInterval) - 1;
 
+        const events = {
+            courseids: <number[]> [],
+            groupids: <number[]> [],
+        };
         const params: AddonCalendarGetCalendarEventsWSParams = {
             options: {
                 userevents: true,
@@ -925,23 +929,20 @@ export class AddonCalendarProvider {
                 timestart: start,
                 timeend: end,
             },
-            events: {
-                courseids: [],
-                groupids: [],
-            },
+            events: events,
         };
 
         const promises: Promise<void>[] = [];
 
         promises.push(CoreCourses.getUserCourses(false, siteId).then((courses) => {
-            params.events!.courseids = courses.map((course) => course.id);
-            params.events!.courseids.push(site.getSiteHomeId()); // Add front page.
+            events.courseids = courses.map((course) => course.id);
+            events.courseids.push(site.getSiteHomeId()); // Add front page.
 
             return;
         }));
 
         promises.push(CoreGroups.getAllUserGroups(siteId).then((groups) => {
-            params.events!.groupids = groups.map((group) => group.id);
+            events.groupids = groups.map((group) => group.id);
 
             return;
         }));
@@ -1697,6 +1698,7 @@ export class AddonCalendarProvider {
         siteId?: string,
     ): Promise<AddonCalendarEvent> {
         const site = await CoreSites.getSite(siteId);
+
         // Add data that is "hidden" in web.
         formData.id = eventId;
         formData.userid = site.getUserId();
@@ -1707,12 +1709,14 @@ export class AddonCalendarProvider {
         } else {
             formData['_qf__core_calendar_local_event_forms_create'] = 1;
         }
+
         const params: AddonCalendarSubmitCreateUpdateFormWSParams = {
             formdata: CoreUtils.objectToGetParams(formData),
         };
         const result =
             await site.write<AddonCalendarSubmitCreateUpdateFormWSResponse>('core_calendar_submit_create_update_form', params);
-        if (result.validationerror) {
+
+        if (result.validationerror || !result.event) {
             // Simulate a WS error.
             throw new CoreWSError({
                 message: Translate.instant('core.invalidformdata'),
@@ -1720,7 +1724,7 @@ export class AddonCalendarProvider {
             });
         }
 
-        return result.event!;
+        return result.event;
     }
 
 }
@@ -2180,7 +2184,8 @@ type AddonCalendarSubmitCreateUpdateFormWSParams = {
 /**
  * Form data on AddonCalendarSubmitCreateUpdateFormWSParams.
  */
-export type AddonCalendarSubmitCreateUpdateFormDataWSParams = Omit<AddonCalendarOfflineEventDBRecord, 'description'> & {
+export type AddonCalendarSubmitCreateUpdateFormDataWSParams = Omit<AddonCalendarOfflineEventDBRecord, 'id'|'description'> & {
+    id?: number;
     description?: {
         text: string;
         format: number;
diff --git a/src/addons/calendar/services/database/calendar-offline.ts b/src/addons/calendar/services/database/calendar-offline.ts
index 046dc59f5..5e08f8378 100644
--- a/src/addons/calendar/services/database/calendar-offline.ts
+++ b/src/addons/calendar/services/database/calendar-offline.ts
@@ -135,7 +135,7 @@ export const CALENDAR_OFFLINE_SITE_SCHEMA: CoreSiteSchema = {
 };
 
 export type AddonCalendarOfflineEventDBRecord = {
-    id?: number; // Negative for offline entries.
+    id: number; // Negative for offline entries.
     name: string;
     timestart: number;
     eventtype: AddonCalendarEventType;
diff --git a/src/addons/calendar/services/database/calendar.ts b/src/addons/calendar/services/database/calendar.ts
index 643a5ae98..9a890b79f 100644
--- a/src/addons/calendar/services/database/calendar.ts
+++ b/src/addons/calendar/services/database/calendar.ts
@@ -258,7 +258,7 @@ export const CALENDAR_SITE_SCHEMA: CoreSiteSchema = {
 };
 
 export type AddonCalendarEventDBRecord = {
-    id?: number;
+    id: number;
     name: string;
     description: string;
     eventtype: AddonCalendarEventType;
diff --git a/src/addons/messages/services/messages-sync.ts b/src/addons/messages/services/messages-sync.ts
index 9a29b9f7d..cdcc4dd6c 100644
--- a/src/addons/messages/services/messages-sync.ts
+++ b/src/addons/messages/services/messages-sync.ts
@@ -147,9 +147,10 @@ export class AddonMessagesSyncProvider extends CoreSyncBaseProvider<AddonMessage
 
         const syncId = this.getSyncId(conversationId, userId);
 
-        if (this.isSyncing(syncId, siteId)) {
+        const currentSyncPromise = this.getOngoingSync(syncId, siteId);
+        if (currentSyncPromise) {
             // There's already a sync ongoing for this conversation, return the promise.
-            return this.getOngoingSync(syncId, siteId)!;
+            return currentSyncPromise;
         }
 
         return this.addOngoingSync(syncId, this.performSyncDiscussion(conversationId, userId, siteId), siteId);
diff --git a/src/addons/mod/assign/services/assign-sync.ts b/src/addons/mod/assign/services/assign-sync.ts
index e47429236..99420a9a1 100644
--- a/src/addons/mod/assign/services/assign-sync.ts
+++ b/src/addons/mod/assign/services/assign-sync.ts
@@ -163,9 +163,10 @@ export class AddonModAssignSyncProvider extends CoreCourseActivitySyncBaseProvid
     async syncAssign(assignId: number, siteId?: string): Promise<AddonModAssignSyncResult> {
         siteId = siteId || CoreSites.getCurrentSiteId();
 
-        if (this.isSyncing(assignId, siteId)) {
+        const currentSyncPromise = this.getOngoingSync(assignId, siteId);
+        if (currentSyncPromise) {
             // There's already a sync ongoing for this assign, return the promise.
-            return this.getOngoingSync(assignId, siteId)!;
+            return currentSyncPromise;
         }
 
         // Verify that assign isn't blocked.
diff --git a/src/addons/mod/choice/services/choice-sync.ts b/src/addons/mod/choice/services/choice-sync.ts
index a27a01f05..ed2537467 100644
--- a/src/addons/mod/choice/services/choice-sync.ts
+++ b/src/addons/mod/choice/services/choice-sync.ts
@@ -122,9 +122,10 @@ export class AddonModChoiceSyncProvider extends CoreCourseActivitySyncBaseProvid
         siteId = site.getId();
 
         const syncId = this.getSyncId(choiceId, userId);
-        if (this.isSyncing(syncId, siteId)) {
+        const currentSyncPromise = this.getOngoingSync(syncId, siteId);
+        if (currentSyncPromise) {
             // There's already a sync ongoing for this discussion, return the promise.
-            return this.getOngoingSync(syncId, siteId)!;
+            return currentSyncPromise;
         }
 
         this.logger.debug(`Try to sync choice '${choiceId}' for user '${userId}'`);
diff --git a/src/addons/mod/data/services/data-sync.ts b/src/addons/mod/data/services/data-sync.ts
index a010247c4..9a947ffcb 100644
--- a/src/addons/mod/data/services/data-sync.ts
+++ b/src/addons/mod/data/services/data-sync.ts
@@ -135,9 +135,10 @@ export class AddonModDataSyncProvider extends CoreCourseActivitySyncBaseProvider
     syncDatabase(dataId: number, siteId?: string): Promise<AddonModDataSyncResult> {
         siteId = siteId || CoreSites.getCurrentSiteId();
 
-        if (this.isSyncing(dataId, siteId)) {
+        const currentSyncPromise = this.getOngoingSync(dataId, siteId);
+        if (currentSyncPromise) {
             // There's already a sync ongoing for this database, return the promise.
-            return this.getOngoingSync(dataId, siteId)!;
+            return currentSyncPromise;
         }
 
         // Verify that database isn't blocked.
diff --git a/src/addons/mod/feedback/services/feedback-sync.ts b/src/addons/mod/feedback/services/feedback-sync.ts
index d404ed6f2..8b6702b8a 100644
--- a/src/addons/mod/feedback/services/feedback-sync.ts
+++ b/src/addons/mod/feedback/services/feedback-sync.ts
@@ -130,9 +130,10 @@ export class AddonModFeedbackSyncProvider extends CoreCourseActivitySyncBaseProv
     syncFeedback(feedbackId: number, siteId?: string): Promise<AddonModFeedbackSyncResult> {
         siteId = siteId || CoreSites.getCurrentSiteId();
 
-        if (this.isSyncing(feedbackId, siteId)) {
+        const currentSyncPromise = this.getOngoingSync(feedbackId, siteId);
+        if (currentSyncPromise) {
             // There's already a sync ongoing for this feedback, return the promise.
-            return this.getOngoingSync(feedbackId, siteId)!;
+            return currentSyncPromise;
         }
 
         // Verify that feedback isn't blocked.
diff --git a/src/addons/mod/forum/services/forum-sync.ts b/src/addons/mod/forum/services/forum-sync.ts
index fae896b0c..65925b3d7 100644
--- a/src/addons/mod/forum/services/forum-sync.ts
+++ b/src/addons/mod/forum/services/forum-sync.ts
@@ -198,10 +198,11 @@ export class AddonModForumSyncProvider extends CoreCourseActivitySyncBaseProvide
         siteId = siteId || CoreSites.getCurrentSiteId();
 
         const syncId = this.getForumSyncId(forumId, userId);
+        const currentSyncPromise = this.getOngoingSync(syncId, siteId);
 
-        if (this.isSyncing(syncId, siteId)) {
+        if (currentSyncPromise) {
             // There's already a sync ongoing for this discussion, return the promise.
-            return this.getOngoingSync(syncId, siteId)!;
+            return currentSyncPromise;
         }
 
         // Verify that forum isn't blocked.
@@ -429,10 +430,11 @@ export class AddonModForumSyncProvider extends CoreCourseActivitySyncBaseProvide
         siteId = siteId || CoreSites.getCurrentSiteId();
 
         const syncId = this.getDiscussionSyncId(discussionId, userId);
+        const currentSyncPromise = this.getOngoingSync(syncId, siteId);
 
-        if (this.isSyncing(syncId, siteId)) {
+        if (currentSyncPromise) {
             // There's already a sync ongoing for this discussion, return the promise.
-            return this.getOngoingSync(syncId, siteId)!;
+            return currentSyncPromise;
         }
 
         // Verify that forum isn't blocked.
diff --git a/src/addons/mod/glossary/services/glossary-sync.ts b/src/addons/mod/glossary/services/glossary-sync.ts
index 80a2fbe0d..8d0844cb4 100644
--- a/src/addons/mod/glossary/services/glossary-sync.ts
+++ b/src/addons/mod/glossary/services/glossary-sync.ts
@@ -144,9 +144,10 @@ export class AddonModGlossarySyncProvider extends CoreCourseActivitySyncBaseProv
         siteId = siteId || CoreSites.getCurrentSiteId();
 
         const syncId = this.getGlossarySyncId(glossaryId, userId);
-        if (this.isSyncing(syncId, siteId)) {
+        const currentSyncPromise = this.getOngoingSync(syncId, siteId);
+        if (currentSyncPromise) {
             // There's already a sync ongoing for this glossary, return the promise.
-            return this.getOngoingSync(syncId, siteId)!;
+            return currentSyncPromise;
         }
 
         // Verify that glossary isn't blocked.
diff --git a/src/addons/mod/h5pactivity/services/h5pactivity-sync.ts b/src/addons/mod/h5pactivity/services/h5pactivity-sync.ts
index 10aeb200d..95b5748ca 100644
--- a/src/addons/mod/h5pactivity/services/h5pactivity-sync.ts
+++ b/src/addons/mod/h5pactivity/services/h5pactivity-sync.ts
@@ -108,9 +108,10 @@ export class AddonModH5PActivitySyncProvider extends CoreCourseActivitySyncBaseP
             throw new CoreNetworkError();
         }
 
-        if (this.isSyncing(contextId, siteId)) {
+        const currentSyncPromise = this.getOngoingSync(contextId, siteId);
+        if (currentSyncPromise) {
             // There's already a sync ongoing for this discussion, return the promise.
-            return this.getOngoingSync(contextId, siteId)!;
+            return currentSyncPromise;
         }
 
         return this.addOngoingSync(contextId, this.syncActivityData(contextId, siteId), siteId);
diff --git a/src/addons/mod/quiz/services/quiz-sync.ts b/src/addons/mod/quiz/services/quiz-sync.ts
index 25c101242..6990384f1 100644
--- a/src/addons/mod/quiz/services/quiz-sync.ts
+++ b/src/addons/mod/quiz/services/quiz-sync.ts
@@ -263,9 +263,10 @@ export class AddonModQuizSyncProvider extends CoreCourseActivitySyncBaseProvider
     syncQuiz(quiz: AddonModQuizQuizWSData, askPreflight?: boolean, siteId?: string): Promise<AddonModQuizSyncResult> {
         siteId = siteId || CoreSites.getCurrentSiteId();
 
-        if (this.isSyncing(quiz.id, siteId)) {
+        const currentSyncPromise = this.getOngoingSync(quiz.id, siteId);
+        if (currentSyncPromise) {
             // There's already a sync ongoing for this quiz, return the promise.
-            return this.getOngoingSync(quiz.id, siteId)!;
+            return currentSyncPromise;
         }
 
         // Verify that quiz isn't blocked.
diff --git a/src/addons/mod/scorm/services/scorm-sync.ts b/src/addons/mod/scorm/services/scorm-sync.ts
index 3ebcfec81..5c9e1f158 100644
--- a/src/addons/mod/scorm/services/scorm-sync.ts
+++ b/src/addons/mod/scorm/services/scorm-sync.ts
@@ -579,9 +579,10 @@ export class AddonModScormSyncProvider extends CoreCourseActivitySyncBaseProvide
     syncScorm(scorm: AddonModScormScorm, siteId?: string): Promise<AddonModScormSyncResult> {
         siteId = siteId || CoreSites.getCurrentSiteId();
 
-        if (this.isSyncing(scorm.id, siteId)) {
+        const currentSyncPromise = this.getOngoingSync(scorm.id, siteId);
+        if (currentSyncPromise) {
             // There's already a sync ongoing for this SCORM, return the promise.
-            return this.getOngoingSync(scorm.id, siteId)!;
+            return currentSyncPromise;
         }
 
         // Verify that SCORM isn't blocked.
diff --git a/src/addons/mod/survey/services/survey-sync.ts b/src/addons/mod/survey/services/survey-sync.ts
index f9c70bf91..e128b0b1e 100644
--- a/src/addons/mod/survey/services/survey-sync.ts
+++ b/src/addons/mod/survey/services/survey-sync.ts
@@ -124,10 +124,11 @@ export class AddonModSurveySyncProvider extends CoreCourseActivitySyncBaseProvid
         userId = userId || site.getUserId();
 
         const syncId = this.getSyncId(surveyId, userId);
+        const currentSyncPromise = this.getOngoingSync(syncId, siteId);
 
-        if (this.isSyncing(syncId, siteId)) {
+        if (currentSyncPromise) {
             // There's already a sync ongoing for this site, return the promise.
-            return this.getOngoingSync(syncId, siteId)!;
+            return currentSyncPromise;
         }
 
         this.logger.debug(`Try to sync survey '${surveyId}' for user '${userId}'`);
diff --git a/src/addons/mod/wiki/services/wiki-sync.ts b/src/addons/mod/wiki/services/wiki-sync.ts
index 691a08e9b..da3d9ae21 100644
--- a/src/addons/mod/wiki/services/wiki-sync.ts
+++ b/src/addons/mod/wiki/services/wiki-sync.ts
@@ -167,10 +167,11 @@ export class AddonModWikiSyncProvider extends CoreSyncBaseProvider<AddonModWikiS
         siteId = siteId || CoreSites.getCurrentSiteId();
 
         const subwikiBlockId = this.getSubwikiBlockId(subwikiId, wikiId, userId, groupId);
+        const currentSyncPromise = this.getOngoingSync(subwikiBlockId, siteId);
 
-        if (this.isSyncing(subwikiBlockId, siteId)) {
+        if (currentSyncPromise) {
             // There's already a sync ongoing for this subwiki, return the promise.
-            return this.getOngoingSync(subwikiBlockId, siteId)!;
+            return currentSyncPromise;
         }
 
         // Verify that subwiki isn't blocked.
diff --git a/src/addons/mod/workshop/services/workshop-sync.ts b/src/addons/mod/workshop/services/workshop-sync.ts
index f156c3e36..da2ec1f73 100644
--- a/src/addons/mod/workshop/services/workshop-sync.ts
+++ b/src/addons/mod/workshop/services/workshop-sync.ts
@@ -129,9 +129,10 @@ export class AddonModWorkshopSyncProvider extends CoreSyncBaseProvider<AddonModW
     syncWorkshop(workshopId: number, siteId?: string): Promise<AddonModWorkshopSyncResult> {
         siteId = siteId || CoreSites.getCurrentSiteId();
 
-        if (this.isSyncing(workshopId, siteId)) {
+        const currentSyncPromise = this.getOngoingSync(workshopId, siteId);
+        if (currentSyncPromise) {
             // There's already a sync ongoing for this discussion, return the promise.
-            return this.getOngoingSync(workshopId, siteId)!;
+            return currentSyncPromise;
         }
 
         // Verify that workshop isn't blocked.
diff --git a/src/addons/notes/services/notes-sync.ts b/src/addons/notes/services/notes-sync.ts
index a9dfac04d..218b18418 100644
--- a/src/addons/notes/services/notes-sync.ts
+++ b/src/addons/notes/services/notes-sync.ts
@@ -112,9 +112,10 @@ export class AddonNotesSyncProvider extends CoreSyncBaseProvider<AddonNotesSyncR
     syncNotes(courseId: number, siteId?: string): Promise<AddonNotesSyncResult> {
         siteId = siteId || CoreSites.getCurrentSiteId();
 
-        if (this.isSyncing(courseId, siteId)) {
+        const currentSyncPromise = this.getOngoingSync(courseId, siteId);
+        if (currentSyncPromise) {
             // There's already a sync ongoing for notes, return the promise.
-            return this.getOngoingSync(courseId, siteId)!;
+            return currentSyncPromise;
         }
 
         this.logger.debug('Try to sync notes for course ' + courseId);
diff --git a/src/core/classes/base-sync.ts b/src/core/classes/base-sync.ts
index 9c5fc0229..8849ec24c 100644
--- a/src/core/classes/base-sync.ts
+++ b/src/core/classes/base-sync.ts
@@ -105,7 +105,7 @@ export class CoreSyncBaseProvider<T = void> {
         try {
             return await promise;
         } finally {
-            delete this.syncPromises[siteId!][uniqueId];
+            delete this.syncPromises[siteId][uniqueId];
         }
     }
 
@@ -133,15 +133,11 @@ export class CoreSyncBaseProvider<T = void> {
      */
     getOngoingSync(id: string | number, siteId?: string): Promise<T> | undefined {
         siteId = siteId || CoreSites.getCurrentSiteId();
-
-        if (!this.isSyncing(id, siteId)) {
-            return;
-        }
-
-        // There's already a sync ongoing for this id, return the promise.
         const uniqueId = this.getUniqueSyncId(id);
 
-        return this.syncPromises[siteId][uniqueId];
+        if (this.syncPromises[siteId] && this.syncPromises[siteId][uniqueId] !== undefined) {
+            return this.syncPromises[siteId][uniqueId];
+        }
     }
 
     /**
@@ -223,11 +219,7 @@ export class CoreSyncBaseProvider<T = void> {
      * @return Whether it's synchronizing.
      */
     isSyncing(id: string | number, siteId?: string): boolean {
-        siteId = siteId || CoreSites.getCurrentSiteId();
-
-        const uniqueId = this.getUniqueSyncId(id);
-
-        return !!(this.syncPromises[siteId] && this.syncPromises[siteId][uniqueId]);
+        return !!this.getOngoingSync(id, siteId);
     }
 
     /**
@@ -331,10 +323,10 @@ export class CoreSyncBaseProvider<T = void> {
      */
     protected get componentTranslate(): string {
         if (!this.componentTranslateInternal) {
-            this.componentTranslateInternal = Translate.instant(this.componentTranslatableString);
+            this.componentTranslateInternal = <string> Translate.instant(this.componentTranslatableString);
         }
 
-        return this.componentTranslateInternal!;
+        return this.componentTranslateInternal;
     }
 
 }
diff --git a/src/core/features/comments/services/comments-sync.ts b/src/core/features/comments/services/comments-sync.ts
index 1055c8c4b..f402366f8 100644
--- a/src/core/features/comments/services/comments-sync.ts
+++ b/src/core/features/comments/services/comments-sync.ts
@@ -158,10 +158,11 @@ export class CoreCommentsSyncProvider extends CoreSyncBaseProvider<CoreCommentsS
         siteId = siteId || CoreSites.getCurrentSiteId();
 
         const syncId = this.getSyncId(contextLevel, instanceId, component, itemId, area);
+        const currentSyncPromise = this.getOngoingSync(syncId, siteId);
 
-        if (this.isSyncing(syncId, siteId)) {
+        if (currentSyncPromise) {
             // There's already a sync ongoing for comments, return the promise.
-            return this.getOngoingSync(syncId, siteId)!;
+            return currentSyncPromise;
         }
 
         this.logger.debug('Try to sync comments ' + syncId + ' in site ' + siteId);
diff --git a/src/core/features/course/services/sync.ts b/src/core/features/course/services/sync.ts
index 3516f578d..3b29dc151 100644
--- a/src/core/features/course/services/sync.ts
+++ b/src/core/features/course/services/sync.ts
@@ -117,9 +117,10 @@ export class CoreCourseSyncProvider extends CoreSyncBaseProvider<CoreCourseSyncR
     async syncCourse(courseId: number, siteId?: string): Promise<CoreCourseSyncResult> {
         siteId = siteId || CoreSites.getCurrentSiteId();
 
-        if (this.isSyncing(courseId, siteId)) {
+        const currentSyncPromise = this.getOngoingSync(courseId, siteId);
+        if (currentSyncPromise) {
             // There's already a sync ongoing for this discussion, return the promise.
-            return this.getOngoingSync(courseId, siteId)!;
+            return currentSyncPromise;
         }
 
         this.logger.debug(`Try to sync course '${courseId}'`);
diff --git a/src/core/features/rating/services/rating-sync.ts b/src/core/features/rating/services/rating-sync.ts
index 9e6027ca9..09f1af9c2 100644
--- a/src/core/features/rating/services/rating-sync.ts
+++ b/src/core/features/rating/services/rating-sync.ts
@@ -157,9 +157,10 @@ export class CoreRatingSyncProvider extends CoreSyncBaseProvider<CoreRatingSyncI
         siteId = siteId || CoreSites.getCurrentSiteId();
 
         const syncId = this.getItemSetSyncId(component, ratingArea, contextLevel, instanceId, itemSetId);
-        if (this.isSyncing(syncId, siteId)) {
+        const currentSyncPromise = this.getOngoingSync(syncId, siteId);
+        if (currentSyncPromise) {
             // There's already a sync ongoing for this item set, return the promise.
-            return this.getOngoingSync(syncId, siteId)!;
+            return currentSyncPromise;
         }
 
         this.logger.debug(`Try to sync ratings of component '${component}' rating area '${ratingArea}'` +
diff --git a/src/core/features/user/services/user-sync.ts b/src/core/features/user/services/user-sync.ts
index 7f5eca734..a09fd892c 100644
--- a/src/core/features/user/services/user-sync.ts
+++ b/src/core/features/user/services/user-sync.ts
@@ -54,10 +54,11 @@ export class CoreUserSyncProvider extends CoreSyncBaseProvider<string[]> {
         siteId = siteId || CoreSites.getCurrentSiteId();
 
         const syncId = 'preferences';
+        const currentSyncPromise = this.getOngoingSync(syncId, siteId);
 
-        if (this.isSyncing(syncId, siteId)) {
+        if (currentSyncPromise) {
             // There's already a sync ongoing, return the promise.
-            return this.getOngoingSync(syncId, siteId)!;
+            return currentSyncPromise;
         }
 
         this.logger.debug('Try to sync user preferences');

From b31b0764a5834fdab0ff80aacf15f52f1de84e6a Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 15 Nov 2021 09:03:58 +0100
Subject: [PATCH 0212/1008] MOBILE-3909 calendar: Allow setting reminders for
 offline events

---
 src/addons/calendar/pages/day/day.page.ts     |   7 +-
 .../pages/edit-event/edit-event.page.ts       |   5 +-
 src/addons/calendar/pages/event/event.html    |   4 +-
 src/addons/calendar/pages/event/event.page.ts | 209 ++++++++++++------
 src/addons/calendar/pages/index/index.page.ts |   7 +-
 .../calendar/services/calendar-helper.ts      |   2 +
 src/addons/calendar/services/calendar-sync.ts |   7 +-
 src/addons/calendar/services/calendar.ts      |  12 +-
 8 files changed, 166 insertions(+), 87 deletions(-)

diff --git a/src/addons/calendar/pages/day/day.page.ts b/src/addons/calendar/pages/day/day.page.ts
index 8e6d707eb..19963cb62 100644
--- a/src/addons/calendar/pages/day/day.page.ts
+++ b/src/addons/calendar/pages/day/day.page.ts
@@ -521,12 +521,7 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
      * @param eventId Event to load.
      */
     gotoEvent(eventId: number): void {
-        if (eventId < 0) {
-            // It's an offline event, go to the edit page.
-            this.openEdit(eventId);
-        } else {
-            CoreNavigator.navigateToSitePath(`/calendar/event/${eventId}`);
-        }
+        CoreNavigator.navigateToSitePath(`/calendar/event/${eventId}`);
     }
 
     /**
diff --git a/src/addons/calendar/pages/edit-event/edit-event.page.ts b/src/addons/calendar/pages/edit-event/edit-event.page.ts
index e16c88b09..1ea01493d 100644
--- a/src/addons/calendar/pages/edit-event/edit-event.page.ts
+++ b/src/addons/calendar/pages/edit-event/edit-event.page.ts
@@ -564,7 +564,10 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy, CanLeave {
             if (event) {
                 CoreEvents.trigger(
                     AddonCalendarProvider.NEW_EVENT_EVENT,
-                    { eventId: event.id },
+                    {
+                        eventId: event.id,
+                        oldEventId: this.eventId,
+                    },
                     this.currentSite.getId(),
                 );
             } else {
diff --git a/src/addons/calendar/pages/event/event.html b/src/addons/calendar/pages/event/event.html
index 3874350f4..e2279bd11 100644
--- a/src/addons/calendar/pages/event/event.html
+++ b/src/addons/calendar/pages/event/event.html
@@ -21,8 +21,8 @@
                     [priority]="400" [content]="'core.settings.synchronizenow' | translate" (action)="doRefresh(undefined, $event, true)"
                     [iconAction]="syncIcon" [closeOnClick]="false">
                 </core-context-menu-item>
-                <core-context-menu-item [hidden]="!canEdit || !event || !event.canedit || event.deleted" [priority]="300"
-                    [content]="'core.edit' | translate" (action)="openEdit()" iconAction="fas-edit">
+                <core-context-menu-item [hidden]="!event || !event.canedit || event.deleted || (!canEdit && event.id > 0)"
+                    [priority]="300" [content]="'core.edit' | translate" (action)="openEdit()" iconAction="fas-edit">
                 </core-context-menu-item>
                 <core-context-menu-item [hidden]="!event || !event.candelete || event.deleted" [priority]="200"
                     [content]="'core.delete' | translate" (action)="deleteEvent()"
diff --git a/src/addons/calendar/pages/event/event.page.ts b/src/addons/calendar/pages/event/event.page.ts
index 1d320f9ff..ac44adc68 100644
--- a/src/addons/calendar/pages/event/event.page.ts
+++ b/src/addons/calendar/pages/event/event.page.ts
@@ -52,6 +52,7 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
 
     protected eventId!: number;
     protected siteHomeId: number;
+    protected newEventObserver: CoreEventObserver;
     protected editEventObserver: CoreEventObserver;
     protected syncObserver: CoreEventObserver;
     protected manualSyncObserver: CoreEventObserver;
@@ -88,7 +89,16 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
 
         // Listen for event edited. If current event is edited, reload the data.
         this.editEventObserver = CoreEvents.on(AddonCalendarProvider.EDIT_EVENT_EVENT, (data) => {
-            if (data && data.eventId == this.eventId) {
+            if (data && data.eventId === this.eventId) {
+                this.eventLoaded = false;
+                this.refreshEvent(true, false);
+            }
+        }, this.currentSiteId);
+
+        // Listen for event created. If user edits the data of a new offline event or it's sent to server, this event is triggered.
+        this.newEventObserver = CoreEvents.on(AddonCalendarProvider.NEW_EVENT_EVENT, (data) => {
+            if (this.eventId < 0 && data && (data.eventId === this.eventId || data.oldEventId === this.eventId)) {
+                this.eventId = data.eventId;
                 this.eventLoaded = false;
                 this.refreshEvent(true, false);
             }
@@ -173,53 +183,22 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
      * @return Promise resolved when done.
      */
     async fetchEvent(sync = false, showErrors = false): Promise<void> {
-        let deleted = false;
-
         this.isOnline = CoreApp.isOnline();
 
         if (sync) {
-            // Try to synchronize offline events.
-            try {
-                const result = await AddonCalendarSync.syncEvents();
-                if (result.warnings && result.warnings.length) {
-                    CoreDomUtils.showErrorModal(result.warnings[0]);
-                }
+            const deleted = await this.syncEvents(showErrors);
 
-                if (result.deleted && result.deleted.indexOf(this.eventId) != -1) {
-                    // This event was deleted during the sync.
-                    deleted = true;
-                }
-
-                if (result.updated) {
-                    // Trigger a manual sync event.
-                    result.source = 'event';
-
-                    CoreEvents.trigger(
-                        AddonCalendarSyncProvider.MANUAL_SYNCED,
-                        result,
-                        this.currentSiteId,
-                    );
-                }
-            } catch (error) {
-                if (showErrors) {
-                    CoreDomUtils.showErrorModalDefault(error, 'core.errorsync', true);
-                }
+            if (deleted) {
+                return;
             }
         }
 
-        if (deleted) {
-            return;
-        }
-
         try {
             // Get the event data.
-            const event = await AddonCalendar.getEventById(this.eventId);
-            const formattedEvent = await AddonCalendarHelper.formatEventData(event);
-            this.event = formattedEvent;
-
-            // Load reminders, and re-schedule them if needed (maybe the event time has changed).
-            this.loadReminders();
-            AddonCalendar.scheduleEventsNotifications([this.event]);
+            if (this.eventId >= 0) {
+                const event = await AddonCalendar.getEventById(this.eventId);
+                this.event = await AddonCalendarHelper.formatEventData(event);
+            }
 
             try {
                 const offlineEvent = AddonCalendarHelper.formatOfflineEventData(
@@ -228,13 +207,28 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
 
                 // There is offline data, apply it.
                 this.hasOffline = true;
-
-                this.event = Object.assign(this.event, offlineEvent);
+                this.event = Object.assign(this.event || {}, offlineEvent);
             } catch {
                 // No offline data.
                 this.hasOffline = false;
+
+                if (this.eventId < 0) {
+                    // It's an offline event, but it wasn't found. Shouldn't happen.
+                    CoreDomUtils.showErrorModal('Event not found.');
+                    CoreNavigator.back();
+
+                    return;
+                }
             }
 
+            if (!this.event) {
+                return; // At this point we should always have the event, adding this check to avoid TS errors.
+            }
+
+            // Load reminders, and re-schedule them if needed (maybe the event time has changed).
+            this.loadReminders();
+            AddonCalendar.scheduleEventsNotifications([this.event]);
+
             // Reset some of the calculated data.
             this.categoryPath = '';
             this.courseName = '';
@@ -253,6 +247,7 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
             }
 
             const promises: Promise<void>[] = [];
+            const event = this.event;
 
             const courseId = this.event.courseid;
             if (courseId != this.siteHomeId) {
@@ -266,16 +261,7 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
 
             // If it's a group event, get the name of the group.
             if (courseId && this.event.groupid) {
-                promises.push(CoreGroups.getUserGroupsInCourse(courseId).then((groups) => {
-                    const group = groups.find((group) => group.id == formattedEvent.groupid);
-
-                    this.groupName = group ? group.name : '';
-
-                    return;
-                }).catch(() => {
-                    // Error getting groups, just don't show the group name.
-                    this.groupName = '';
-                }));
+                promises.push(this.loadGroupName(this.event, courseId));
             }
 
             if (this.event.iscategoryevent && this.event.category) {
@@ -290,14 +276,14 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
 
             // Check if event was deleted in offine.
             promises.push(AddonCalendarOffline.isEventDeleted(this.eventId).then((deleted) => {
-                formattedEvent.deleted = deleted;
+                event.deleted = deleted;
 
                 return;
             }));
 
             // Re-calculate the formatted time so it uses the device date.
             promises.push(AddonCalendar.getCalendarTimeFormat().then(async (timeFormat) => {
-                formattedEvent.formattedtime = await AddonCalendar.formatEventTime(formattedEvent, timeFormat);
+                event.formattedtime = await AddonCalendar.formatEventTime(event, timeFormat);
 
                 return;
             }));
@@ -311,6 +297,69 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
         this.syncIcon = CoreConstants.ICON_SYNC;
     }
 
+    /**
+     * Sync offline events.
+     *
+     * @param showErrors Whether to show sync errors to the user.
+     * @return Promise resolved with boolean: whether event was deleted on sync.
+     */
+    protected async syncEvents(showErrors = false): Promise<boolean> {
+        let deleted = false;
+
+        // Try to synchronize offline events.
+        try {
+            const result = await AddonCalendarSync.syncEvents();
+            if (result.warnings && result.warnings.length) {
+                CoreDomUtils.showErrorModal(result.warnings[0]);
+            }
+
+            if (result.deleted && result.deleted.indexOf(this.eventId) != -1) {
+                // This event was deleted during the sync.
+                deleted = true;
+            } else if (this.eventId < 0 && result.offlineIdMap[this.eventId]) {
+                // Event was created, use the online ID.
+                this.eventId = result.offlineIdMap[this.eventId];
+            }
+
+            if (result.updated) {
+                // Trigger a manual sync event.
+                result.source = 'event';
+
+                CoreEvents.trigger(
+                    AddonCalendarSyncProvider.MANUAL_SYNCED,
+                    result,
+                    this.currentSiteId,
+                );
+            }
+        } catch (error) {
+            if (showErrors) {
+                CoreDomUtils.showErrorModalDefault(error, 'core.errorsync', true);
+            }
+        }
+
+        return deleted;
+    }
+
+    /**
+     * Load group name.
+     *
+     * @param event Event.
+     * @param courseId Course ID.
+     * @return Promise resolved when done.
+     */
+    protected async loadGroupName(event: AddonCalendarEventToDisplay, courseId: number): Promise<void> {
+        try {
+            const groups = await CoreGroups.getUserGroupsInCourse(courseId);
+
+            const group = groups.find((group) => group.id == event.groupid);
+            this.groupName = group ? group.name : '';
+
+        } catch {
+            // Error getting groups, just don't show the group name.
+            this.groupName = '';
+        }
+    }
+
     /**
      * Add a reminder for this event.
      */
@@ -392,7 +441,9 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
 
         const promises: Promise<void>[] = [];
 
-        promises.push(AddonCalendar.invalidateEvent(this.eventId));
+        if (this.eventId > 0) {
+            promises.push(AddonCalendar.invalidateEvent(this.eventId));
+        }
         promises.push(AddonCalendar.invalidateTimeFormat());
 
         await CoreUtils.allPromisesIgnoringErrors(promises);
@@ -459,9 +510,14 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
         const modal = await CoreDomUtils.showModalLoading('core.sending', true);
 
         try {
-            const sent = await AddonCalendar.deleteEvent(this.event.id, this.event.name, deleteAll);
+            let onlineEventDeleted = false;
+            if (this.event.id < 0) {
+                await AddonCalendarOffline.deleteEvent(this.event.id);
+            } else {
+                onlineEventDeleted = await AddonCalendar.deleteEvent(this.event.id, this.event.name, deleteAll);
+            }
 
-            if (sent) {
+            if (onlineEventDeleted) {
                 // Event deleted, invalidate right days & months.
                 try {
                     await AddonCalendarHelper.refreshAfterChangeEvent(this.event, deleteAll ? this.event.eventcount : 1);
@@ -471,12 +527,16 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
             }
 
             // Trigger an event.
-            CoreEvents.trigger(AddonCalendarProvider.DELETED_EVENT_EVENT, {
-                eventId: this.eventId,
-                sent: sent,
-            }, CoreSites.getCurrentSiteId());
+            if (this.event.id < 0) {
+                CoreEvents.trigger(AddonCalendarProvider.NEW_EVENT_DISCARDED_EVENT, {}, CoreSites.getCurrentSiteId());
+            } else {
+                CoreEvents.trigger(AddonCalendarProvider.DELETED_EVENT_EVENT, {
+                    eventId: this.eventId,
+                    sent: onlineEventDeleted,
+                }, CoreSites.getCurrentSiteId());
+            }
 
-            if (sent) {
+            if (onlineEventDeleted || this.event.id < 0) {
                 CoreDomUtils.showToast('addon.calendar.eventcalendareventdeleted', true, 3000);
 
                 // Event deleted, close the view.
@@ -537,11 +597,21 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
             // Event was deleted, close the view.
             CoreNavigator.back();
         } else if (data.events && (!isManual || data.source != 'event')) {
-            const event = data.events.find((ev) => ev.id == this.eventId);
+            if (this.eventId < 0) {
+                if (data.offlineIdMap[this.eventId]) {
+                    // Event was created, use the online ID.
+                    this.eventId = data.offlineIdMap[this.eventId];
 
-            if (event) {
-                this.eventLoaded = false;
-                this.refreshEvent();
+                    this.eventLoaded = false;
+                    this.refreshEvent();
+                }
+            } else {
+                const event = data.events.find((ev) => ev.id == this.eventId);
+
+                if (event) {
+                    this.eventLoaded = false;
+                    this.refreshEvent();
+                }
             }
         }
     }
@@ -550,10 +620,11 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
      * Page destroyed.
      */
     ngOnDestroy(): void {
-        this.editEventObserver?.off();
-        this.syncObserver?.off();
-        this.manualSyncObserver?.off();
-        this.onlineObserver?.unsubscribe();
+        this.editEventObserver.off();
+        this.syncObserver.off();
+        this.manualSyncObserver.off();
+        this.onlineObserver.unsubscribe();
+        this.newEventObserver.off();
         clearInterval(this.updateCurrentTime);
     }
 
diff --git a/src/addons/calendar/pages/index/index.page.ts b/src/addons/calendar/pages/index/index.page.ts
index 7e4f1eeb2..f2c8fb51b 100644
--- a/src/addons/calendar/pages/index/index.page.ts
+++ b/src/addons/calendar/pages/index/index.page.ts
@@ -301,12 +301,7 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy {
      * @param eventId Event to load.
      */
     gotoEvent(eventId: number): void {
-        if (eventId < 0) {
-            // It's an offline event, go to the edit page.
-            this.openEdit(eventId);
-        } else {
-            CoreNavigator.navigateToSitePath(`/calendar/event/${eventId}`);
-        }
+        CoreNavigator.navigateToSitePath(`/calendar/event/${eventId}`);
     }
 
     /**
diff --git a/src/addons/calendar/services/calendar-helper.ts b/src/addons/calendar/services/calendar-helper.ts
index b1a2081ec..d441b1c1d 100644
--- a/src/addons/calendar/services/calendar-helper.ts
+++ b/src/addons/calendar/services/calendar-helper.ts
@@ -245,6 +245,8 @@ export class AddonCalendarHelperProvider {
             format: 1,
             visible: 1,
             offline: true,
+            canedit: event.id < 0,
+            candelete: event.id < 0,
             timeduration: 0,
         };
 
diff --git a/src/addons/calendar/services/calendar-sync.ts b/src/addons/calendar/services/calendar-sync.ts
index b6d4d0cf6..56f3e8a3c 100644
--- a/src/addons/calendar/services/calendar-sync.ts
+++ b/src/addons/calendar/services/calendar-sync.ts
@@ -124,6 +124,7 @@ export class AddonCalendarSyncProvider extends CoreSyncBaseProvider<AddonCalenda
         const result: AddonCalendarSyncEvents = {
             warnings: [],
             events: [],
+            offlineIdMap: {},
             deleted: [],
             toinvalidate: [],
             updated: false,
@@ -256,10 +257,13 @@ export class AddonCalendarSyncProvider extends CoreSyncBaseProvider<AddonCalenda
         ); // Clone the object because it will be modified in the submit function.
 
         try {
-            const newEvent = await AddonCalendar.submitEventOnline(eventId > 0 ? eventId : 0, data, siteId);
+            const newEvent = await AddonCalendar.submitEventOnline(eventId, data, siteId);
 
             result.updated = true;
             result.events.push(newEvent);
+            if (eventId < 0) {
+                result.offlineIdMap[eventId] = newEvent.id;
+            }
 
             // Add data to invalidate.
             const numberOfRepetitions = data.repeat ? data.repeats :
@@ -298,6 +302,7 @@ export const AddonCalendarSync = makeSingleton(AddonCalendarSyncProvider);
 export type AddonCalendarSyncEvents = {
     warnings: string[];
     events: AddonCalendarEvent[];
+    offlineIdMap: Record<number, number>; // Map offline ID with online ID for created events.
     deleted: number[];
     toinvalidate: AddonCalendarSyncInvalidateEvent[];
     updated: boolean;
diff --git a/src/addons/calendar/services/calendar.ts b/src/addons/calendar/services/calendar.ts
index d7b0842d1..93780709c 100644
--- a/src/addons/calendar/services/calendar.ts
+++ b/src/addons/calendar/services/calendar.ts
@@ -1687,7 +1687,7 @@ export class AddonCalendarProvider {
     /**
      * Submit an event, either to create it or to edit it. It will fail if offline or cannot connect.
      *
-     * @param eventId ID of the event. If undefined/null, create a new event.
+     * @param eventId ID of the event. If undefined/null or negative number, create a new event.
      * @param formData Form data.
      * @param siteId Site ID. If not provided, current site.
      * @return Promise resolved when done.
@@ -1700,7 +1700,7 @@ export class AddonCalendarProvider {
         const site = await CoreSites.getSite(siteId);
 
         // Add data that is "hidden" in web.
-        formData.id = eventId;
+        formData.id = eventId > 0 ? eventId : 0;
         formData.userid = site.getUserId();
         formData.visible = 1;
         formData.instance = 0;
@@ -1724,6 +1724,13 @@ export class AddonCalendarProvider {
             });
         }
 
+        if (eventId < 0) {
+            // Offline event has been sent. Change reminders eventid if any.
+            await CoreUtils.ignoreErrors(
+                site.getDb().updateRecords(REMINDERS_TABLE, { eventid: result.event.id }, { eventid: eventId }),
+            );
+        }
+
         return result.event;
     }
 
@@ -2240,6 +2247,7 @@ export type AddonCalendarEventToDisplay = Partial<AddonCalendarCalendarEvent> &
  */
 export type AddonCalendarUpdatedEventEvent = {
     eventId: number;
+    oldEventId?: number; // Old event ID. Used when an offline event is sent.
     sent?: boolean;
 };
 

From e86d49742a5acd749bccdb6dd7b40a6a80140e7f Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 15 Nov 2021 14:29:51 +0100
Subject: [PATCH 0213/1008] MOBILE-3909 calendar: Allow setting reminders when
 creating event

---
 .../calendar/pages/edit-event/edit-event.html |  26 ++++
 .../pages/edit-event/edit-event.page.ts       |  79 +++++++++++-
 .../calendar/services/calendar-offline.ts     |   6 +-
 src/addons/calendar/services/calendar.ts      | 122 ++++++++++++------
 src/core/services/local-notifications.ts      |  12 +-
 5 files changed, 201 insertions(+), 44 deletions(-)

diff --git a/src/addons/calendar/pages/edit-event/edit-event.html b/src/addons/calendar/pages/edit-event/edit-event.html
index 859291287..eb12ca46b 100644
--- a/src/addons/calendar/pages/edit-event/edit-event.html
+++ b/src/addons/calendar/pages/edit-event/edit-event.html
@@ -225,6 +225,32 @@
                         </ion-item>
                     </ion-radio-group>
                 </div>
+
+                <!-- Reminders. Right now, only allow adding them here for new events. -->
+                <ng-container *ngIf="notificationsEnabled && !eventId">
+                    <ion-item-divider class="addon-calendar-reminders-title">
+                        <ion-label>
+                            <p class="item-heading">{{ 'addon.calendar.reminders' | translate }}</p>
+                        </ion-label>
+                    </ion-item-divider>
+                    <ion-item *ngFor="let reminder of reminders" class="ion-text-wrap">
+                        <ion-label>
+                            <p>{{ reminder.label }}</p>
+                        </ion-label>
+                        <ion-button fill="clear" (click)="removeReminder(reminder)" [attr.aria-label]="'core.delete' | translate"
+                            slot="end">
+                            <ion-icon name="fas-trash" color="danger" slot="icon-only" aria-hidden="true"></ion-icon>
+                        </ion-button>
+                    </ion-item>
+
+                    <ion-item>
+                        <ion-label>
+                            <ion-button expand="block" color="light" (click)="addReminder()">
+                                {{ 'addon.calendar.setnewreminder' | translate }}
+                            </ion-button>
+                        </ion-label>
+                    </ion-item>
+                </ng-container>
             </div>
 
             <ion-item>
diff --git a/src/addons/calendar/pages/edit-event/edit-event.page.ts b/src/addons/calendar/pages/edit-event/edit-event.page.ts
index 1ea01493d..1d9b23c0d 100644
--- a/src/addons/calendar/pages/edit-event/edit-event.page.ts
+++ b/src/addons/calendar/pages/edit-event/edit-event.page.ts
@@ -33,7 +33,7 @@ import {
     AddonCalendarSubmitCreateUpdateFormDataWSParams,
 } from '../../services/calendar';
 import { AddonCalendarOffline } from '../../services/calendar-offline';
-import { AddonCalendarEventTypeOption, AddonCalendarHelper } from '../../services/calendar-helper';
+import { AddonCalendarEventReminder, AddonCalendarEventTypeOption, AddonCalendarHelper } from '../../services/calendar-helper';
 import { AddonCalendarSync, AddonCalendarSyncProvider } from '../../services/calendar-sync';
 import { CoreSite } from '@classes/site';
 import { Translate } from '@singletons';
@@ -43,6 +43,8 @@ import { CoreError } from '@classes/errors/error';
 import { CoreNavigator } from '@services/navigator';
 import { CanLeave } from '@guards/can-leave';
 import { CoreForms } from '@singletons/form';
+import { CoreLocalNotifications } from '@services/local-notifications';
+import { AddonCalendarReminderTimeModalComponent } from '@addons/calendar/components/reminder-time-modal/reminder-time-modal';
 
 /**
  * Page that displays a form to create/edit an event.
@@ -83,6 +85,10 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy, CanLeave {
     groupControl: FormControl;
     descriptionControl: FormControl;
 
+    // Reminders.
+    notificationsEnabled = false;
+    reminders: AddonCalendarEventCandidateReminder[] = [];
+
     protected courseId!: number;
     protected originalData?: AddonCalendarOfflineEventDBRecord;
     protected currentSite: CoreSite;
@@ -95,6 +101,7 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy, CanLeave {
         protected fb: FormBuilder,
     ) {
         this.currentSite = CoreSites.getRequiredCurrentSite();
+        this.notificationsEnabled = CoreLocalNotifications.isAvailable();
         this.errors = {
             required: Translate.instant('core.required'),
         };
@@ -140,6 +147,7 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy, CanLeave {
         this.form.addControl('timedurationuntil', this.fb.control(currentDate));
         this.form.addControl('courseid', this.fb.control(this.courseId));
 
+        this.initReminders();
         this.fetchData().finally(() => {
             this.originalData = CoreUtils.clone(this.form.value);
             this.loaded = true;
@@ -519,7 +527,9 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy, CanLeave {
         let event: AddonCalendarEvent | AddonCalendarOfflineEventDBRecord;
 
         try {
-            const result = await AddonCalendar.submitEvent(this.eventId, data);
+            const result = await AddonCalendar.submitEvent(this.eventId, data, {
+                reminders: this.reminders,
+            });
             event = result.event;
 
             CoreForms.triggerFormSubmittedEvent(this.formElement, result.sent, this.currentSite.getId());
@@ -630,6 +640,69 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy, CanLeave {
         }
     }
 
+    /**
+     * Init reminders.
+     *
+     * @return Promise resolved when done.
+     */
+    protected async initReminders(): Promise<void> {
+        if (!this.notificationsEnabled) {
+            return;
+        }
+
+        // Check if default reminders are enabled.
+        const defaultTime = await AddonCalendar.getDefaultNotificationTime(this.currentSite.getId());
+        if (defaultTime === 0) {
+            return;
+        }
+
+        const data = AddonCalendarProvider.convertSecondsToValueAndUnit(defaultTime);
+
+        // Add default reminder.
+        this.reminders.push({
+            time: null,
+            value: data.value,
+            unit: data.unit,
+            label: AddonCalendar.getUnitValueLabel(data.value, data.unit, true),
+        });
+    }
+
+    /**
+     * Add a reminder.
+     */
+    async addReminder(): Promise<void> {
+        const reminderTime = await CoreDomUtils.openModal<number>({
+            component: AddonCalendarReminderTimeModalComponent,
+        });
+
+        if (reminderTime === undefined) {
+            // User canceled.
+            return;
+        }
+
+        const data = AddonCalendarProvider.convertSecondsToValueAndUnit(reminderTime);
+
+        // Add reminder.
+        this.reminders.push({
+            time: reminderTime,
+            value: data.value,
+            unit: data.unit,
+            label: AddonCalendar.getUnitValueLabel(data.value, data.unit),
+        });
+    }
+
+    /**
+     * Remove a reminder.
+     *
+     * @param reminder The reminder to remove.
+     */
+    removeReminder(reminder: AddonCalendarEventCandidateReminder): void {
+        const index = this.reminders.indexOf(reminder);
+        if (index != -1) {
+            this.reminders.splice(index, 1);
+        }
+    }
+
     /**
      * Page destroyed.
      */
@@ -639,3 +712,5 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy, CanLeave {
     }
 
 }
+
+type AddonCalendarEventCandidateReminder = Omit<AddonCalendarEventReminder, 'id'|'eventid'>;
diff --git a/src/addons/calendar/services/calendar-offline.ts b/src/addons/calendar/services/calendar-offline.ts
index e34ea7eb7..5d11344fa 100644
--- a/src/addons/calendar/services/calendar-offline.ts
+++ b/src/addons/calendar/services/calendar-offline.ts
@@ -215,20 +215,18 @@ export class AddonCalendarOfflineProvider {
     /**
      * Offline version for adding a new discussion to a forum.
      *
-     * @param eventId Event ID. If it's a new event, set it to undefined/null.
+     * @param eventId Event ID. Negative value to edit offline event. If it's a new event, set it to undefined/null.
      * @param data Event data.
-     * @param timeCreated The time the event was created. If not defined, current time.
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with the stored event.
      */
     async saveEvent(
         eventId: number | undefined,
         data: AddonCalendarSubmitCreateUpdateFormDataWSParams,
-        timeCreated?: number,
         siteId?: string,
     ): Promise<AddonCalendarOfflineEventDBRecord> {
         const site = await CoreSites.getSite(siteId);
-        timeCreated = timeCreated || Date.now();
+        const timeCreated = Date.now();
         const event: AddonCalendarOfflineEventDBRecord = {
             id: eventId || -timeCreated,
             name: data.name,
diff --git a/src/addons/calendar/services/calendar.ts b/src/addons/calendar/services/calendar.ts
index 93780709c..815254572 100644
--- a/src/addons/calendar/services/calendar.ts
+++ b/src/addons/calendar/services/calendar.ts
@@ -744,7 +744,7 @@ export class AddonCalendarProvider {
      * @return Promise resolved when the notification is updated.
      */
     async addEventReminder(
-        event: { id: number; timestart: number; timeduration: number; name: string},
+        event: { id: number; timestart: number; name: string},
         time?: number | null,
         siteId?: string,
     ): Promise<void> {
@@ -836,7 +836,7 @@ export class AddonCalendarProvider {
             preSets.emergencyCache = false;
         }
         const response: AddonCalendarCalendarDay = await site.read('core_calendar_get_calendar_day_view', params, preSets);
-        this.storeEventsInLocalDB(response.events, siteId);
+        this.storeEventsInLocalDB(response.events, { siteId });
 
         return response;
     }
@@ -1040,7 +1040,7 @@ export class AddonCalendarProvider {
         const response = await site.read<AddonCalendarMonth>('core_calendar_get_calendar_monthly_view', params, preSets);
         response.weeks.forEach((week) => {
             week.days.forEach((day) => {
-                this.storeEventsInLocalDB(day.events as AddonCalendarCalendarEvent[], siteId);
+                this.storeEventsInLocalDB(day.events as AddonCalendarCalendarEvent[], { siteId });
             });
         });
 
@@ -1153,7 +1153,7 @@ export class AddonCalendarProvider {
         }
 
         const response = await site.read<AddonCalendarUpcoming>('core_calendar_get_calendar_upcoming_view', params, preSets);
-        this.storeEventsInLocalDB(response.events, siteId);
+        this.storeEventsInLocalDB(response.events, { siteId });
 
         return response;
     }
@@ -1548,21 +1548,29 @@ export class AddonCalendarProvider {
      * Store an event in local DB as it is.
      *
      * @param event Event to store.
-     * @param siteId ID of the site the event belongs to. If not defined, use current site.
+     * @param options Options.
      * @return Promise resolved when stored.
      */
-    async storeEventInLocalDb(event: AddonCalendarGetEventsEvent | AddonCalendarCalendarEvent, siteId?: string): Promise<void> {
-        const site = await CoreSites.getSite(siteId);
-        siteId = site.getId();
-        try {
-            await this.getEventFromLocalDb(event.id, site.id);
-        } catch {
-            // Event does not exist. Check if any reminder exists first.
-            const reminders = await this.getEventReminders(event.id, siteId);
+    protected async storeEventInLocalDb(
+        event: AddonCalendarGetEventsEvent | AddonCalendarCalendarEvent | AddonCalendarEvent,
+        options: AddonCalendarStoreEventsOptions = {},
+    ): Promise<void> {
+        const site = await CoreSites.getSite(options.siteId);
+        const siteId = site.getId();
+        const addDefaultReminder = options.addDefaultReminder ?? true;
 
-            if (reminders.length == 0) {
-                // No reminders, create the default one.
-                this.addEventReminder(event, undefined, siteId);
+        if (addDefaultReminder) {
+            // Add default reminder if the event isn't stored already and doesn't have any reminder.
+            try {
+                await this.getEventFromLocalDb(event.id, siteId);
+            } catch {
+                // Event does not exist.
+                const reminders = await this.getEventReminders(event.id, siteId);
+
+                if (reminders.length === 0) {
+                    // No reminders, create the default one.
+                    this.addEventReminder(event, undefined, siteId);
+                }
             }
         }
 
@@ -1600,12 +1608,17 @@ export class AddonCalendarProvider {
                 viewurl: event.viewurl,
                 isactionevent: event.isactionevent ? 1 : 0,
                 url: event.url,
-                islastday: event.islastday ? 1 : 0,
-                popupname: event.popupname,
-                mindaytimestamp: event.mindaytimestamp,
-                maxdaytimestamp: event.maxdaytimestamp,
-                draggable: event.draggable ? 1 : 0,
             });
+
+            if ('islastday' in event) {
+                eventRecord = Object.assign(eventRecord, {
+                    islastday: event.islastday ? 1 : 0,
+                    popupname: event.popupname,
+                    mindaytimestamp: event.mindaytimestamp,
+                    maxdaytimestamp: event.maxdaytimestamp,
+                    draggable: event.draggable ? 1 : 0,
+                });
+            }
         } else if ('uuid' in event) {
             eventRecord = Object.assign(eventRecord, {
                 courseid: event.courseid,
@@ -1622,23 +1635,20 @@ export class AddonCalendarProvider {
      * Store events in local DB.
      *
      * @param events Events to store.
-     * @param siteId ID of the site the event belongs to. If not defined, use current site.
+     * @param options Options.
      * @return Promise resolved when the events are stored.
      */
     protected async storeEventsInLocalDB(
-        events: (AddonCalendarGetEventsEvent | AddonCalendarCalendarEvent)[],
-        siteId?: string,
+        events: (AddonCalendarGetEventsEvent | AddonCalendarCalendarEvent | AddonCalendarEvent)[],
+        options: AddonCalendarStoreEventsOptions = {},
     ): Promise<void> {
-        const site = await CoreSites.getSite(siteId);
-        siteId = site.getId();
-
-        await Promise.all(events.map((event) => this.storeEventInLocalDb(event, siteId)));
+        await Promise.all(events.map((event) => this.storeEventInLocalDb(event, options)));
     }
 
     /**
      * Submit a calendar event.
      *
-     * @param eventId ID of the event. If undefined/null, create a new event.
+     * @param eventId ID of the event. Negative value to edit offline event. If undefined/null, create a new event.
      * @param formData Form data.
      * @param timeCreated The time the event was created. Only if modifying a new offline event.
      * @param forceOffline True to always save it in offline.
@@ -1648,19 +1658,26 @@ export class AddonCalendarProvider {
     async submitEvent(
         eventId: number | undefined,
         formData: AddonCalendarSubmitCreateUpdateFormDataWSParams,
-        timeCreated?: number,
-        forceOffline = false,
-        siteId?: string,
+        options: AddonCalendarSubmitEventOptions = {},
     ): Promise<{sent: boolean; event: AddonCalendarOfflineEventDBRecord | AddonCalendarEvent}> {
 
-        siteId = siteId || CoreSites.getCurrentSiteId();
+        const siteId = options.siteId || CoreSites.getCurrentSiteId();
 
         // Function to store the event to be synchronized later.
-        const storeOffline = (): Promise<{ sent: boolean; event: AddonCalendarOfflineEventDBRecord }> =>
-            AddonCalendarOffline.saveEvent(eventId, formData, timeCreated, siteId).then((event) =>
-                ({ sent: false, event }));
+        const storeOffline = async (): Promise<{ sent: boolean; event: AddonCalendarOfflineEventDBRecord }> => {
+            const event = await AddonCalendarOffline.saveEvent(eventId, formData, siteId);
 
-        if (forceOffline || !CoreApp.isOnline()) {
+            // Now save the reminders if any.
+            if (options.reminders) {
+                await CoreUtils.ignoreErrors(
+                    Promise.all(options.reminders.map((reminder) => this.addEventReminder(event, reminder.time, siteId))),
+                );
+            }
+
+            return { sent: false, event };
+        };
+
+        if (options.forceOffline || !CoreApp.isOnline()) {
             // App is offline, store the event.
             return storeOffline();
         }
@@ -1672,6 +1689,13 @@ export class AddonCalendarProvider {
         try {
             const event = await this.submitEventOnline(eventId, formData, siteId);
 
+            // Now save the reminders if any.
+            if (options.reminders) {
+                await CoreUtils.ignoreErrors(
+                    Promise.all(options.reminders.map((reminder) => this.addEventReminder(event, reminder.time, siteId))),
+                );
+            }
+
             return ({ sent: true, event });
         } catch (error) {
             if (error && !CoreUtils.isWebServiceError(error)) {
@@ -1731,6 +1755,11 @@ export class AddonCalendarProvider {
             );
         }
 
+        if (formData.id === 0) {
+            // Store the new event in local DB.
+            await CoreUtils.ignoreErrors(this.storeEventInLocalDb(result.event, { addDefaultReminder: false, siteId }));
+        }
+
         return result.event;
     }
 
@@ -2267,3 +2296,22 @@ export type AddonCalendarValueAndUnit = {
     value: number;
     unit: AddonCalendarReminderUnits;
 };
+
+/**
+ * Options to pass to submit event.
+ */
+export type AddonCalendarSubmitEventOptions = {
+    reminders?: {
+        time: number | null;
+    }[];
+    forceOffline?: boolean;
+    siteId?: string; // Site ID. If not defined, current site.
+};
+
+/**
+ * Options to pass to store events in local DB.
+ */
+export type AddonCalendarStoreEventsOptions = {
+    addDefaultReminder?: boolean; // Whether to add default reminder for new events with no reminders. Defaults to true.
+    siteId?: string; // Site ID. If not defined, current site.
+};
diff --git a/src/core/services/local-notifications.ts b/src/core/services/local-notifications.ts
index c6547f8fe..9b69435e0 100644
--- a/src/core/services/local-notifications.ts
+++ b/src/core/services/local-notifications.ts
@@ -653,9 +653,19 @@ export class CoreLocalNotificationsProvider {
      */
     async trigger(notification: ILocalNotification): Promise<number> {
         const db = await this.appDB;
+        let time = Date.now();
+        if (notification.trigger?.at) {
+            // The type says "at" is a Date, but in Android we can receive timestamps instead.
+            if (typeof notification.trigger.at === 'number') {
+                time = <number> notification.trigger.at;
+            } else {
+                time = notification.trigger.at.getTime();
+            }
+        }
+
         const entry = {
             id: notification.id,
-            at: notification.trigger && notification.trigger.at ? notification.trigger.at.getTime() : Date.now(),
+            at: time,
         };
 
         return db.insertRecord(TRIGGERED_TABLE_NAME, entry);

From 55a3c0539cd0e4cfc29a022885e7b82558799967 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 15 Nov 2021 14:30:41 +0100
Subject: [PATCH 0214/1008] MOBILE-3909 core: Fix unregister device if token is
 expired

---
 src/core/classes/site.ts                       |  3 +--
 .../services/pushnotifications.ts              |  8 +++++++-
 src/core/services/utils/utils.ts               | 18 +++++++++++++++---
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/core/classes/site.ts b/src/core/classes/site.ts
index ea5786eca..5dac39fee 100644
--- a/src/core/classes/site.ts
+++ b/src/core/classes/site.ts
@@ -591,8 +591,7 @@ export class CoreSite {
 
                 return response;
             } catch (error) {
-                if (error.errorcode == 'invalidtoken' ||
-                    (error.errorcode == 'accessexception' && error.message.indexOf('Invalid token - token expired') > -1)) {
+                if (CoreUtils.isExpiredTokenError(error)) {
                     if (initialToken !== this.token && !retrying) {
                         // Token has changed, retry with the new token.
                         preSets.getFromCache = false; // Don't check cache now. Also, it will skip ongoingRequests.
diff --git a/src/core/features/pushnotifications/services/pushnotifications.ts b/src/core/features/pushnotifications/services/pushnotifications.ts
index ba07fa9d3..a4aadf0a7 100644
--- a/src/core/features/pushnotifications/services/pushnotifications.ts
+++ b/src/core/features/pushnotifications/services/pushnotifications.ts
@@ -524,7 +524,13 @@ export class CorePushNotificationsProvider {
         try {
             response = await site.write<CoreUserRemoveUserDeviceWSResponse>('core_user_remove_user_device', data);
         } catch (error) {
-            if (CoreUtils.isWebServiceError(error)) {
+            if (CoreUtils.isWebServiceError(error) || CoreUtils.isExpiredTokenError(error)) {
+                // Cannot unregister. Don't try again.
+                await CoreUtils.ignoreErrors(db.deleteRecords(PENDING_UNREGISTER_TABLE_NAME, {
+                    token: site.getToken(),
+                    siteid: site.getId(),
+                }));
+
                 throw error;
             }
 
diff --git a/src/core/services/utils/utils.ts b/src/core/services/utils/utils.ts
index 6d06cbf3d..938a48778 100644
--- a/src/core/services/utils/utils.ts
+++ b/src/core/services/utils/utils.ts
@@ -850,7 +850,7 @@ export class CoreUtilsProvider {
     }
 
     /**
-     * Given an error returned by a WS call, check if the error is generated by the app or it has been returned by the WebSwervice.
+     * Given an error returned by a WS call, check if the error is generated by the app or it has been returned by the WebService.
      *
      * @param error Error to check.
      * @return Whether the error was returned by the WebService.
@@ -858,10 +858,22 @@ export class CoreUtilsProvider {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     isWebServiceError(error: any): boolean {
         return error && (typeof error.warningcode != 'undefined' || (typeof error.errorcode != 'undefined' &&
-                error.errorcode != 'invalidtoken' && error.errorcode != 'userdeleted' && error.errorcode != 'upgraderunning' &&
+                error.errorcode != 'userdeleted' && error.errorcode != 'upgraderunning' &&
                 error.errorcode != 'forcepasswordchangenotice' && error.errorcode != 'usernotfullysetup' &&
                 error.errorcode != 'sitepolicynotagreed' && error.errorcode != 'sitemaintenance' &&
-                (error.errorcode != 'accessexception' || error.message.indexOf('Invalid token - token expired') == -1)));
+                !this.isExpiredTokenError(error)));
+    }
+
+    /**
+     * Given an error returned by a WS call, check if the error is a token expired error.
+     *
+     * @param error Error to check.
+     * @return Whether the error is a token expired error.
+     */
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    isExpiredTokenError(error: any): boolean {
+        return error.errorcode === 'invalidtoken' ||
+            (error.errorcode === 'accessexception' && error.message.includes('Invalid token - token expired'));
     }
 
     /**

From 1f5908ed66429e2e732b10e0b360071d02ab560c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 17 Nov 2021 14:32:17 +0100
Subject: [PATCH 0215/1008] MOBILE-3909 calendar: Reorder and reduce height of
 edit page

---
 .../calendar/pages/edit-event/edit-event.html | 237 ++++++++----------
 .../pages/edit-event/edit-event.page.ts       |   8 -
 2 files changed, 110 insertions(+), 135 deletions(-)

diff --git a/src/addons/calendar/pages/edit-event/edit-event.html b/src/addons/calendar/pages/edit-event/edit-event.html
index eb12ca46b..469fc2e7c 100644
--- a/src/addons/calendar/pages/edit-event/edit-event.html
+++ b/src/addons/calendar/pages/edit-event/edit-event.html
@@ -113,146 +113,129 @@
                 </ion-item>
             </ng-container>
 
-            <!-- Advanced options. -->
-            <ion-item button class="ion-text-wrap divider" (click)="toggleAdvanced()" detail="false">
-                <ion-icon *ngIf="!advanced" name="fas-caret-right" flip-rtl slot="start" aria-hidden="true"></ion-icon>
-                <ion-icon *ngIf="advanced" name="fas-caret-down" slot="start" aria-hidden="true"></ion-icon>
-                <ion-label>
-                    <p class="item-heading" *ngIf="!advanced">{{ 'core.showmore' | translate }}</p>
-                    <p class="item-heading" *ngIf="advanced">{{ 'core.showless' | translate }}</p>
-                </ion-label>
-            </ion-item>
-
-            <div [hidden]="!advanced">
-                <!-- Description. -->
-                <ion-item class="ion-text-wrap">
-                    <ion-label position="stacked">
-                        <p class="item-heading">{{ 'core.description' | translate }}</p>
+            <!-- Reminders. Right now, only allow adding them here for new events. -->
+            <ng-container *ngIf="notificationsEnabled && !eventId">
+                <ion-item-divider class="addon-calendar-reminders-title">
+                    <ion-label>
+                        <p class="item-heading">{{ 'addon.calendar.reminders' | translate }}</p>
                     </ion-label>
-                    <core-rich-text-editor [control]="descriptionControl" [attr.aria-label]="'core.description' | translate"
-                        [placeholder]="'core.description' | translate" name="description" [component]="component"
-                        [componentId]="eventId" [autoSave]="false"></core-rich-text-editor>
-                </ion-item>
-
-                <!-- Location. -->
-                <ion-item class="ion-text-wrap">
-                    <ion-label position="stacked">
-                        <p class="item-heading">{{ 'core.location' | translate }}</p>
+                    <ion-button fill="clear" color="dark" (click)="addReminder()" slot="end"
+                        [attr.aria-label]="'addon.calendar.setnewreminder' | translate">
+                        <ion-icon name="fas-plus" slot="icon-only" aria-hidden="true"></ion-icon>
+                    </ion-button>
+                </ion-item-divider>
+                <ion-item *ngFor="let reminder of reminders" class="ion-text-wrap">
+                    <ion-label>
+                        <p>{{ reminder.label }}</p>
                     </ion-label>
-                    <ion-input type="text" name="location" [placeholder]="'core.location' | translate" formControlName="location">
-                    </ion-input>
+                    <ion-button fill="clear" (click)="removeReminder(reminder)" [attr.aria-label]="'core.delete' | translate"
+                        slot="end">
+                        <ion-icon name="fas-trash" color="danger" slot="icon-only" aria-hidden="true"></ion-icon>
+                    </ion-button>
                 </ion-item>
+            </ng-container>
 
-                <!-- Duration. -->
-                <div class="ion-text-wrap addon-calendar-radio-container">
-                    <ion-radio-group formControlName="duration">
-                        <ion-item-divider class="addon-calendar-radio-title">
-                            <ion-label>
-                                <p class="item-heading">{{ 'addon.calendar.eventduration' | translate }}</p>
-                            </ion-label>
-                        </ion-item-divider>
-                        <ion-item>
-                            <ion-label>
-                                <p>{{ 'addon.calendar.durationnone' | translate }}</p>
-                            </ion-label>
-                            <ion-radio slot="end" [value]="0"></ion-radio>
-                        </ion-item>
-                        <ion-item lines="none">
-                            <ion-label>
-                                <p>{{ 'addon.calendar.durationuntil' | translate }}</p>
-                            </ion-label>
-                            <ion-radio slot="end" [value]="1"></ion-radio>
-                        </ion-item>
-                        <ion-item>
-                            <ion-label position="stacked"></ion-label>
-                            <ion-datetime formControlName="timedurationuntil" [max]="maxDate" [min]="minDate"
-                                [placeholder]="'addon.calendar.durationuntil' | translate"
-                                [displayFormat]="dateFormat" [disabled]="form.controls.duration.value != 1"
-                                display-timezone="utc">
-                            </ion-datetime>
-                        </ion-item>
-                        <ion-item lines="none">
-                            <ion-label>
-                                <p>{{ 'addon.calendar.durationminutes' | translate }}</p>
-                            </ion-label>
-                            <ion-radio slot="end" [value]="2"></ion-radio>
-                        </ion-item>
-                        <ion-item>
-                            <ion-label class="sr-only">{{ 'addon.calendar.durationminutes' | translate }}</ion-label>
-                            <ion-input type="number" name="timedurationminutes" slot="end"
-                                [placeholder]="'addon.calendar.durationminutes' | translate"
-                                formControlName="timedurationminutes" [disabled]="form.controls.duration.value != 2"></ion-input>
-                        </ion-item>
-                    </ion-radio-group>
-                </div>
-
-                <!-- Repeat (for new events). -->
-                <ng-container *ngIf="!eventId || eventId < 0">
-                    <ion-item class="ion-text-wrap divider" lines="none">
+            <!-- Duration. -->
+            <div class="ion-text-wrap addon-calendar-radio-container">
+                <ion-radio-group formControlName="duration">
+                    <ion-item-divider class="addon-calendar-radio-title">
                         <ion-label>
-                            <p class="item-heading">{{ 'addon.calendar.repeatevent' | translate }}</p>
-                        </ion-label>
-                        <ion-checkbox slot="end" formControlName="repeat"></ion-checkbox>
-                    </ion-item>
-                    <ion-item class="ion-text-wrap">
-                        <ion-label position="stacked">
-                            <p>{{ 'addon.calendar.repeatweeksl' | translate }}</p>
-                        </ion-label>
-                        <ion-input type="number" name="repeats" formControlName="repeats" [disabled]="!form.controls.repeat.value">
-                        </ion-input>
-                    </ion-item>
-                </ng-container>
-
-                <!-- Apply to all events or just this one (editing repeated events). -->
-                <div *ngIf="eventRepeatId" class="ion-text-wrap addon-calendar-radio-container">
-                    <ion-radio-group formControlName="repeateditall">
-                        <ion-item-divider class="addon-calendar-radio-title">
-                            <ion-label>
-                                <p class="item-heading">{{ 'addon.calendar.repeatedevents' | translate }}</p>
-                            </ion-label>
-                        </ion-item-divider>
-                        <ion-item>
-                            <ion-label>
-                                <p>{{ 'addon.calendar.repeateditall' | translate:{$a: otherEventsCount} }}</p>
-                            </ion-label>
-                            <ion-radio slot="end" value="1"></ion-radio>
-                        </ion-item>
-                        <ion-item>
-                            <ion-label>
-                                <p>{{ 'addon.calendar.repeateditthis' | translate }}</p>
-                            </ion-label>
-                            <ion-radio slot="end" value="0"></ion-radio>
-                        </ion-item>
-                    </ion-radio-group>
-                </div>
-
-                <!-- Reminders. Right now, only allow adding them here for new events. -->
-                <ng-container *ngIf="notificationsEnabled && !eventId">
-                    <ion-item-divider class="addon-calendar-reminders-title">
-                        <ion-label>
-                            <p class="item-heading">{{ 'addon.calendar.reminders' | translate }}</p>
+                            <p class="item-heading">{{ 'addon.calendar.eventduration' | translate }}</p>
                         </ion-label>
                     </ion-item-divider>
-                    <ion-item *ngFor="let reminder of reminders" class="ion-text-wrap">
-                        <ion-label>
-                            <p>{{ reminder.label }}</p>
-                        </ion-label>
-                        <ion-button fill="clear" (click)="removeReminder(reminder)" [attr.aria-label]="'core.delete' | translate"
-                            slot="end">
-                            <ion-icon name="fas-trash" color="danger" slot="icon-only" aria-hidden="true"></ion-icon>
-                        </ion-button>
-                    </ion-item>
-
                     <ion-item>
                         <ion-label>
-                            <ion-button expand="block" color="light" (click)="addReminder()">
-                                {{ 'addon.calendar.setnewreminder' | translate }}
-                            </ion-button>
+                            <p>{{ 'addon.calendar.durationnone' | translate }}</p>
                         </ion-label>
+                        <ion-radio slot="end" [value]="0"></ion-radio>
                     </ion-item>
-                </ng-container>
+                    <ion-item lines="none">
+                        <ion-label>
+                            <p>{{ 'addon.calendar.durationuntil' | translate }}</p>
+                        </ion-label>
+                        <ion-radio slot="end" [value]="1"></ion-radio>
+                    </ion-item>
+                    <ion-item *ngIf="form.controls.duration.value === 1">
+                        <ion-label position="stacked"></ion-label>
+                        <ion-datetime formControlName="timedurationuntil" [max]="maxDate" [min]="minDate"
+                            [placeholder]="'addon.calendar.durationuntil' | translate"
+                            [displayFormat]="dateFormat" display-timezone="utc">
+                        </ion-datetime>
+                    </ion-item>
+                    <ion-item lines="none">
+                        <ion-label>
+                            <p>{{ 'addon.calendar.durationminutes' | translate }}</p>
+                        </ion-label>
+                        <ion-radio slot="end" [value]="2"></ion-radio>
+                    </ion-item>
+                    <ion-item *ngIf="form.controls.duration.value === 2">
+                        <ion-label class="sr-only">{{ 'addon.calendar.durationminutes' | translate }}</ion-label>
+                        <ion-input type="number" name="timedurationminutes" slot="end"
+                            [placeholder]="'addon.calendar.durationminutes' | translate"
+                            formControlName="timedurationminutes"></ion-input>
+                    </ion-item>
+                </ion-radio-group>
             </div>
 
+            <!-- Repeat (for new events). -->
+            <ng-container *ngIf="!eventId || eventId < 0">
+                <ion-item class="ion-text-wrap divider" lines="none">
+                    <ion-label>
+                        <p class="item-heading">{{ 'addon.calendar.repeatevent' | translate }}</p>
+                    </ion-label>
+                    <ion-checkbox slot="end" formControlName="repeat"></ion-checkbox>
+                </ion-item>
+                <ion-item class="ion-text-wrap">
+                    <ion-label position="stacked">
+                        <p>{{ 'addon.calendar.repeatweeksl' | translate }}</p>
+                    </ion-label>
+                    <ion-input type="number" name="repeats" formControlName="repeats" [disabled]="!form.controls.repeat.value">
+                    </ion-input>
+                </ion-item>
+            </ng-container>
+
+            <!-- Apply to all events or just this one (editing repeated events). -->
+            <div *ngIf="eventRepeatId" class="ion-text-wrap addon-calendar-radio-container">
+                <ion-radio-group formControlName="repeateditall">
+                    <ion-item-divider class="addon-calendar-radio-title">
+                        <ion-label>
+                            <p class="item-heading">{{ 'addon.calendar.repeatedevents' | translate }}</p>
+                        </ion-label>
+                    </ion-item-divider>
+                    <ion-item>
+                        <ion-label>
+                            <p>{{ 'addon.calendar.repeateditall' | translate:{$a: otherEventsCount} }}</p>
+                        </ion-label>
+                        <ion-radio slot="end" value="1"></ion-radio>
+                    </ion-item>
+                    <ion-item>
+                        <ion-label>
+                            <p>{{ 'addon.calendar.repeateditthis' | translate }}</p>
+                        </ion-label>
+                        <ion-radio slot="end" value="0"></ion-radio>
+                    </ion-item>
+                </ion-radio-group>
+            </div>
+
+            <!-- Description. -->
+            <ion-item class="ion-text-wrap">
+                <ion-label position="stacked">
+                    <p class="item-heading">{{ 'core.description' | translate }}</p>
+                </ion-label>
+                <core-rich-text-editor [control]="descriptionControl" [attr.aria-label]="'core.description' | translate"
+                    [placeholder]="'core.description' | translate" name="description" [component]="component"
+                    [componentId]="eventId" [autoSave]="false"></core-rich-text-editor>
+            </ion-item>
+
+            <!-- Location. -->
+            <ion-item class="ion-text-wrap">
+                <ion-label position="stacked">
+                    <p class="item-heading">{{ 'core.location' | translate }}</p>
+                </ion-label>
+                <ion-input type="text" name="location" [placeholder]="'core.location' | translate" formControlName="location">
+                </ion-input>
+            </ion-item>
+
             <ion-item>
                 <ion-label>
                     <ion-row>
diff --git a/src/addons/calendar/pages/edit-event/edit-event.page.ts b/src/addons/calendar/pages/edit-event/edit-event.page.ts
index 1d9b23c0d..d7bcfd094 100644
--- a/src/addons/calendar/pages/edit-event/edit-event.page.ts
+++ b/src/addons/calendar/pages/edit-event/edit-event.page.ts
@@ -70,7 +70,6 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy, CanLeave {
     groups: CoreGroup[] = [];
     loadingGroups = false;
     courseGroupSet = false;
-    advanced = false;
     errors: Record<string, string>;
     error = false;
     eventRepeatId?: number;
@@ -441,13 +440,6 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy, CanLeave {
         }
     }
 
-    /**
-     * Show or hide advanced form fields.
-     */
-    toggleAdvanced(): void {
-        this.advanced = !this.advanced;
-    }
-
     selectDuration(duration: string): void {
         this.form.controls.duration.setValue(duration);
     }

From 320c2fdfd575d720d28fd152e4bd7aa9f24de124 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 22 Nov 2021 17:02:52 +0100
Subject: [PATCH 0216/1008] MOBILE-3909 calendar: Fix event reminder migration

---
 src/addons/calendar/services/database/calendar.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/addons/calendar/services/database/calendar.ts b/src/addons/calendar/services/database/calendar.ts
index 9a890b79f..c7591fa5c 100644
--- a/src/addons/calendar/services/database/calendar.ts
+++ b/src/addons/calendar/services/database/calendar.ts
@@ -251,7 +251,7 @@ export const CALENDAR_SITE_SCHEMA: CoreSiteSchema = {
                     record.time = events[record.eventid].timestart - record.time;
                 }
 
-                return this.insertRecord(REMINDERS_TABLE, record);
+                return db.insertRecord(REMINDERS_TABLE, record);
             }));
         }
     },

From d9cc05cc37bb6ed51ad40f6e40b171468ea4b2f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 24 Nov 2021 15:40:43 +0100
Subject: [PATCH 0217/1008] MOBILE-3913 core: Add icon option to combobox

---
 src/core/components/combobox/combobox.scss    |  4 ++
 src/core/components/combobox/combobox.ts      | 40 +++++++++++++------
 .../components/combobox/core-combobox.html    | 33 ++++++---------
 3 files changed, 44 insertions(+), 33 deletions(-)

diff --git a/src/core/components/combobox/combobox.scss b/src/core/components/combobox/combobox.scss
index 501321352..110a97d5f 100644
--- a/src/core/components/combobox/combobox.scss
+++ b/src/core/components/combobox/combobox.scss
@@ -87,6 +87,10 @@ ion-select {
         background: var(--background-focused);
         opacity: var(--background-focused-opacity);
     }
+
+    &[hidden] {
+        display: none !important;
+    }
 }
 
 ion-button {
diff --git a/src/core/components/combobox/combobox.ts b/src/core/components/combobox/combobox.ts
index 617e6801d..c66579939 100644
--- a/src/core/components/combobox/combobox.ts
+++ b/src/core/components/combobox/combobox.ts
@@ -12,10 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, EventEmitter, Input, Output, ViewEncapsulation } from '@angular/core';
+import { Component, EventEmitter, Input, Output, ViewChild, ViewEncapsulation } from '@angular/core';
 import { Translate } from '@singletons';
 import { ModalOptions } from '@ionic/core';
 import { CoreDomUtils } from '@services/utils/dom';
+import { IonSelect } from '@ionic/angular';
 
 /**
  * Component that show a combo select button (combobox).
@@ -43,6 +44,8 @@ import { CoreDomUtils } from '@services/utils/dom';
 })
 export class CoreComboboxComponent {
 
+    @ViewChild(IonSelect) select!: IonSelect;
+
     @Input() interface: 'popover' | 'modal' = 'popover';
     @Input() label = Translate.instant('core.show'); // Aria label.
     @Input() disabled = false;
@@ -51,26 +54,37 @@ export class CoreComboboxComponent {
 
     // Additional options when interface modal is selected.
     @Input() icon?: string; // Icon for modal interface.
+    @Input() badge?: number; // Badge number to show near the icon.
     @Input() modalOptions?: ModalOptions; // Will emit an event the value changed.
     @Input() listboxId = '';
 
     expanded = false;
 
-    async showModal(): Promise<void> {
-        if (this.expanded || !this.modalOptions) {
-            return;
-        }
-        this.expanded = true;
+    /**
+     * Shows combobox modal.
+     *
+     * @param event Event.
+     * @return Promise resolved when done.
+     */
+    async openSelect(event?: UIEvent): Promise<void> {
+        if (this.interface == 'modal') {
+            if (this.expanded || !this.modalOptions) {
+                return;
+            }
+            this.expanded = true;
 
-        if (this.listboxId) {
-            this.modalOptions.id = this.listboxId;
-        }
+            if (this.listboxId) {
+                this.modalOptions.id = this.listboxId;
+            }
 
-        const data = await CoreDomUtils.openModal(this.modalOptions);
-        this.expanded = false;
+            const data = await CoreDomUtils.openModal(this.modalOptions);
+            this.expanded = false;
 
-        if (data) {
-            this.onChange.emit(data);
+            if (data) {
+                this.onChange.emit(data);
+            }
+        } else if (this.select) {
+            this.select.open(event);
         }
     }
 
diff --git a/src/core/components/combobox/core-combobox.html b/src/core/components/combobox/core-combobox.html
index aad62d2af..6b3d2ceb2 100644
--- a/src/core/components/combobox/core-combobox.html
+++ b/src/core/components/combobox/core-combobox.html
@@ -1,27 +1,20 @@
-<ion-select
-    *ngIf="interface != 'modal'"
-    class="ion-text-start"
-    [(ngModel)]="selection"
-    (ngModelChange)="onChange.emit(selection)"
-    [interface]="interface"
-    [attr.aria-label]="label + ': ' + selection"
-    [disabled]="disabled"
->
+<ion-button (click)="openSelect($event)" color="light" *ngIf="interface != 'modal' && icon" [disabled]="disabled">
+    <ion-icon [name]="icon" [attr.aria-label]="label" slot="start">
+    </ion-icon>
+    <ion-badge *ngIf="badge && badge > 0" slot="start">{{badge}}</ion-badge>
+    <div class="select-icon" role="presentation" aria-hidden="true">
+        <div class="select-icon-inner"></div>
+    </div>
+</ion-button>
+<ion-select *ngIf="interface != 'modal'" class="ion-text-start" [(ngModel)]="selection" (ngModelChange)="onChange.emit(selection)"
+    [interface]="interface" [attr.aria-label]="label + ': ' + selection" [disabled]="disabled" [hidden]="!!icon">
     <ng-content></ng-content>
 </ion-select>
 
-<ion-button
-    *ngIf="interface == 'modal'"
-    aria-haspopup="listbox"
-    aria-controls="addon-mod-forum-sort-order-selector"
-    [attr.aria-owns]="listboxId"
-    [attr.aria-expanded]="expanded"
-    (click)="showModal()"
-    [disabled]="disabled"
-    expand="block"
-    role="combobox"
->
+<ion-button *ngIf="interface == 'modal'" aria-haspopup="listbox" [attr.aria-controls]="listboxId" [attr.aria-owns]="listboxId"
+    [attr.aria-expanded]="expanded" (click)="openSelect()" [disabled]="disabled" expand="block" role="combobox">
     <ion-icon *ngIf="icon" [name]="icon" slot="start" aria-hidden="true"></ion-icon>
+    <ion-badge *ngIf="badge && badge > 0" slot="start">{{badge}}</ion-badge>
     <span class="sr-only" *ngIf="label">{{ label }}:</span>
     <div class="select-text">
         <slot name="text">{{selection}}</slot>

From 127877486be4a03191e58ac25215227340e07781 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 24 Nov 2021 15:40:43 +0100
Subject: [PATCH 0218/1008] MOBILE-3913 timeline: Show both dropdown selectors
 on the block contents

---
 .../timeline/addon-block-timeline.html        | 72 ++++++++++---------
 1 file changed, 39 insertions(+), 33 deletions(-)

diff --git a/src/addons/block/timeline/components/timeline/addon-block-timeline.html b/src/addons/block/timeline/components/timeline/addon-block-timeline.html
index a955b9b69..dbf981cdb 100644
--- a/src/addons/block/timeline/components/timeline/addon-block-timeline.html
+++ b/src/addons/block/timeline/components/timeline/addon-block-timeline.html
@@ -2,41 +2,47 @@
     <ion-label>
         <h2>{{ 'addon.block_timeline.pluginname' | translate }}</h2>
     </ion-label>
-    <core-context-menu slot="end">
-        <core-context-menu-item *ngIf="loaded" [priority]="900" [content]="'addon.block_timeline.sortbydates' | translate"
-            (action)="switchSort('sortbydates')" [iconAction]="sort == 'sortbydates' ? 'far-dot-circle' : 'far-circle'">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="loaded" [priority]="800" [content]="'addon.block_timeline.sortbycourses' | translate"
-            (action)="switchSort('sortbycourses')" [iconAction]="sort == 'sortbycourses' ? 'far-dot-circle' : 'far-circle'">
-        </core-context-menu-item>
-    </core-context-menu>
 </ion-item-divider>
 <core-loading [hideUntil]="loaded" [fullscreen]="false">
-    <div class="safe-area-padding-horizontal">
-        <core-combobox [selection]="filter" (onChange)="switchFilter($event)">
-            <ion-select-option class="ion-text-wrap" value="all">
-                {{ 'core.all' | translate }}
-            </ion-select-option>
-            <ion-select-option class="ion-text-wrap" value="overdue">
-                {{ 'addon.block_timeline.overdue' | translate }}
-            </ion-select-option>
-            <ion-select-option class="ion-text-wrap core-select-option-title" disabled value="disabled">
-                {{ 'addon.block_timeline.duedate' | translate }}
-            </ion-select-option>
-            <ion-select-option class="ion-text-wrap" value="next7days">
-                {{ 'addon.block_timeline.next7days' | translate }}
-            </ion-select-option>
-            <ion-select-option class="ion-text-wrap" value="next30days">
-                {{ 'addon.block_timeline.next30days' | translate }}
-            </ion-select-option>
-            <ion-select-option class="ion-text-wrap" value="next3months">
-                {{ 'addon.block_timeline.next3months' | translate }}
-            </ion-select-option>
-            <ion-select-option class="ion-text-wrap" value="next6months">
-                {{ 'addon.block_timeline.next6months' | translate }}
-            </ion-select-option>
-        </core-combobox>
-    </div>
+    <ion-row class="ion-no-padding ion-justify-content-between">
+        <ion-col size="auto" class="ion-no-padding">
+            <core-combobox [selection]="filter" (onChange)="switchFilter($event)" icon="fas-filter">
+                <ion-select-option class="ion-text-wrap" value="all">
+                    {{ 'core.all' | translate }}
+                </ion-select-option>
+                <ion-select-option class="ion-text-wrap" value="overdue">
+                    {{ 'addon.block_timeline.overdue' | translate }}
+                </ion-select-option>
+                <ion-select-option class="ion-text-wrap core-select-option-title" disabled value="disabled">
+                    {{ 'addon.block_timeline.duedate' | translate }}
+                </ion-select-option>
+                <ion-select-option class="ion-text-wrap" value="next7days">
+                    {{ 'addon.block_timeline.next7days' | translate }}
+                </ion-select-option>
+                <ion-select-option class="ion-text-wrap" value="next30days">
+                    {{ 'addon.block_timeline.next30days' | translate }}
+                </ion-select-option>
+                <ion-select-option class="ion-text-wrap" value="next3months">
+                    {{ 'addon.block_timeline.next3months' | translate }}
+                </ion-select-option>
+                <ion-select-option class="ion-text-wrap" value="next6months">
+                    {{ 'addon.block_timeline.next6months' | translate }}
+                </ion-select-option>
+            </core-combobox>
+        </ion-col>
+        <ion-col size="auto" class="ion-no-padding">
+            <core-combobox [label]="'core.sortby' | translate" [selection]="sort" (onChange)="switchSort($event)"
+                icon="fas-sort-amount-down-alt">
+                <ion-select-option class="ion-text-wrap" value="sortbydates">
+                    {{'addon.block_timeline.sortbydates' | translate}}
+                </ion-select-option>
+                <ion-select-option class="ion-text-wrap" value="sortbycourses">
+                    {{'addon.block_timeline.sortbycourses' | translate}}
+                </ion-select-option>
+            </core-combobox>
+        </ion-col>
+    </ion-row>
+
     <core-loading [hideUntil]="timeline.loaded" [hidden]="sort != 'sortbydates'" [fullscreen]="false">
         <addon-block-timeline-events [events]="timeline.events" [canLoadMore]="timeline.canLoadMore" (loadMore)="loadMore()"
             [from]="dataFrom" [to]="dataTo"></addon-block-timeline-events>

From c8f7b753a882028b97640f771f77e0273fefde11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 24 Nov 2021 15:40:43 +0100
Subject: [PATCH 0219/1008] MOBILE-3913 timeline: Search activities on timeline
 block

---
 scripts/langindex.json                        |  1 +
 .../timeline/components/components.module.ts  |  2 +
 .../timeline/components/events/events.ts      |  2 +-
 .../timeline/addon-block-timeline.html        | 16 ++++++-
 .../timeline/components/timeline/timeline.ts  | 23 ++++++++--
 src/addons/block/timeline/lang.json           |  3 +-
 .../block/timeline/services/timeline.ts       | 46 ++++++++++++-------
 src/addons/calendar/services/calendar.ts      |  3 ++
 src/core/components/combobox/combobox.scss    |  1 +
 src/core/directives/auto-focus.ts             |  2 +-
 .../components/side-blocks/side-blocks.scss   | 13 ++++++
 .../components/side-blocks/side-blocks.ts     |  1 +
 .../components/search-box/search-box.scss     | 14 ++++--
 .../components/search-box/search-box.ts       |  4 +-
 src/theme/theme.base.scss                     |  1 +
 15 files changed, 101 insertions(+), 31 deletions(-)
 create mode 100644 src/core/features/block/components/side-blocks/side-blocks.scss

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 6f9b71abf..a8d9ddc2b 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -73,6 +73,7 @@
   "addon.block_timeline.noevents": "block_timeline",
   "addon.block_timeline.overdue": "block_timeline",
   "addon.block_timeline.pluginname": "block_timeline",
+  "addon.block_timeline.searchevents": "block_timeline",
   "addon.block_timeline.sortbycourses": "block_timeline",
   "addon.block_timeline.sortbydates": "block_timeline",
   "addon.blog.blog": "blog",
diff --git a/src/addons/block/timeline/components/components.module.ts b/src/addons/block/timeline/components/components.module.ts
index f54298186..00c06106d 100644
--- a/src/addons/block/timeline/components/components.module.ts
+++ b/src/addons/block/timeline/components/components.module.ts
@@ -18,6 +18,7 @@ import { CoreSharedModule } from '@/core/shared.module';
 
 import { AddonBlockTimelineComponent } from './timeline/timeline';
 import { AddonBlockTimelineEventsComponent } from './events/events';
+import { CoreSearchComponentsModule } from '@features/search/components/components.module';
 
 @NgModule({
     declarations: [
@@ -26,6 +27,7 @@ import { AddonBlockTimelineEventsComponent } from './events/events';
     ],
     imports: [
         CoreSharedModule,
+        CoreSearchComponentsModule,
     ],
     exports: [
         AddonBlockTimelineComponent,
diff --git a/src/addons/block/timeline/components/events/events.ts b/src/addons/block/timeline/components/events/events.ts
index b9047ff2b..4e0155873 100644
--- a/src/addons/block/timeline/components/events/events.ts
+++ b/src/addons/block/timeline/components/events/events.ts
@@ -52,7 +52,7 @@ export class AddonBlockTimelineEventsComponent implements OnChanges {
         this.showCourse = !this.course;
 
         if (changes.events || changes.from || changes.to) {
-            if (this.events && this.events.length > 0) {
+            if (this.events) {
                 const filteredEvents = await this.filterEventsByTime(this.from, this.to);
                 this.empty = !filteredEvents || filteredEvents.length <= 0;
 
diff --git a/src/addons/block/timeline/components/timeline/addon-block-timeline.html b/src/addons/block/timeline/components/timeline/addon-block-timeline.html
index dbf981cdb..a0774f1d9 100644
--- a/src/addons/block/timeline/components/timeline/addon-block-timeline.html
+++ b/src/addons/block/timeline/components/timeline/addon-block-timeline.html
@@ -4,7 +4,7 @@
     </ion-label>
 </ion-item-divider>
 <core-loading [hideUntil]="loaded" [fullscreen]="false">
-    <ion-row class="ion-no-padding ion-justify-content-between">
+    <ion-row class="ion-no-padding ion-justify-content-between ion-align-items-center">
         <ion-col size="auto" class="ion-no-padding">
             <core-combobox [selection]="filter" (onChange)="switchFilter($event)" icon="fas-filter">
                 <ion-select-option class="ion-text-wrap" value="all">
@@ -30,6 +30,12 @@
                 </ion-select-option>
             </core-combobox>
         </ion-col>
+        <ion-col class="ion-no-padding ion-hide-md-down" *ngIf="searchEnabled">
+            <!-- Filter courses. -->
+            <core-search-box (onSubmit)="searchTextChanged($event)" (onClear)="searchTextChanged()"
+                [placeholder]="'addon.block_timeline.searchevents' | translate" autocorrect="off" spellcheck="false" lengthCheck="2"
+                searchArea="AddonBlockTimeline"></core-search-box>
+        </ion-col>
         <ion-col size="auto" class="ion-no-padding">
             <core-combobox [label]="'core.sortby' | translate" [selection]="sort" (onChange)="switchSort($event)"
                 icon="fas-sort-amount-down-alt">
@@ -42,6 +48,14 @@
             </core-combobox>
         </ion-col>
     </ion-row>
+    <ion-row class="ion-no-padding ion-hide-md-up" *ngIf="searchEnabled">
+        <ion-col class="ion-no-padding">
+            <!-- Filter courses. -->
+            <core-search-box (onSubmit)="searchTextChanged($event)" (onClear)="searchTextChanged()"
+                [placeholder]="'addon.block_timeline.searchevents' | translate" autocorrect="off" spellcheck="false" lengthCheck="2"
+                searchArea="AddonBlockTimeline"></core-search-box>
+        </ion-col>
+    </ion-row>
 
     <core-loading [hideUntil]="timeline.loaded" [hidden]="sort != 'sortbydates'" [fullscreen]="false">
         <addon-block-timeline-events [events]="timeline.events" [canLoadMore]="timeline.canLoadMore" (loadMore)="loadMore()"
diff --git a/src/addons/block/timeline/components/timeline/timeline.ts b/src/addons/block/timeline/components/timeline/timeline.ts
index 2eb6979df..969658ee7 100644
--- a/src/addons/block/timeline/components/timeline/timeline.ts
+++ b/src/addons/block/timeline/components/timeline/timeline.ts
@@ -59,6 +59,9 @@ export class AddonBlockTimelineComponent extends CoreBlockBaseComponent implemen
     dataFrom?: number;
     dataTo?: number;
 
+    searchEnabled = false;
+    searchText = '';
+
     protected courseIds: number[] = [];
     protected fetchContentDefaultError = 'Error getting timeline data.';
 
@@ -85,6 +88,8 @@ export class AddonBlockTimelineComponent extends CoreBlockBaseComponent implemen
 
         this.sort = await this.currentSite.getLocalSiteConfig('AddonBlockTimelineSort', this.sort);
 
+        this.searchEnabled = this.currentSite.isVersionGreaterEqualThan('4.0');
+
         super.ngOnInit();
     }
 
@@ -135,7 +140,8 @@ export class AddonBlockTimelineComponent extends CoreBlockBaseComponent implemen
     async loadMore(course?: AddonBlockTimelineCourse): Promise<void> {
         try {
             if (course) {
-                const courseEvents = await AddonBlockTimeline.getActionEventsByCourse(course.id, course.canLoadMore);
+                const courseEvents =
+                    await AddonBlockTimeline.getActionEventsByCourse(course.id, course.canLoadMore, this.searchText);
                 course.events = course.events?.concat(courseEvents.events);
                 course.canLoadMore = courseEvents.canLoadMore;
             } else {
@@ -153,7 +159,7 @@ export class AddonBlockTimelineComponent extends CoreBlockBaseComponent implemen
      * @return Promise resolved when done.
      */
     protected async fetchMyOverviewTimeline(afterEventId?: number): Promise<void> {
-        const events = await AddonBlockTimeline.getActionEventsByTimesort(afterEventId);
+        const events = await AddonBlockTimeline.getActionEventsByTimesort(afterEventId, this.searchText);
 
         this.timeline.events = events.events;
         this.timeline.canLoadMore = events.canLoadMore;
@@ -174,7 +180,7 @@ export class AddonBlockTimelineComponent extends CoreBlockBaseComponent implemen
         if (this.timelineCourses.courses.length > 0) {
             this.courseIds = this.timelineCourses.courses.map((course) => course.id);
 
-            const courseEvents = await AddonBlockTimeline.getActionEventsByCourses(this.courseIds);
+            const courseEvents = await AddonBlockTimeline.getActionEventsByCourses(this.courseIds, this.searchText);
 
             this.timelineCourses.courses = this.timelineCourses.courses.filter((course) => {
                 if (courseEvents[course.id].events.length == 0) {
@@ -243,6 +249,17 @@ export class AddonBlockTimelineComponent extends CoreBlockBaseComponent implemen
         }
     }
 
+    /**
+     * Search text changed.
+     *
+     * @param searchValue Search value
+     */
+    searchTextChanged(searchValue = ''): void {
+        this.searchText = searchValue || '';
+
+        this.fetchContent();
+    }
+
 }
 
 export type AddonBlockTimelineCourse = CoreEnrolledCourseDataWithOptions & {
diff --git a/src/addons/block/timeline/lang.json b/src/addons/block/timeline/lang.json
index fbd482f47..10c8b2859 100644
--- a/src/addons/block/timeline/lang.json
+++ b/src/addons/block/timeline/lang.json
@@ -8,6 +8,7 @@
     "noevents": "No upcoming activities due",
     "overdue": "Overdue",
     "pluginname": "Timeline",
+    "searchevents": "Search by activity type or name",
     "sortbycourses": "Sort by courses",
     "sortbydates": "Sort by dates"
-}
\ No newline at end of file
+}
diff --git a/src/addons/block/timeline/services/timeline.ts b/src/addons/block/timeline/services/timeline.ts
index c2e646f00..0dbddde01 100644
--- a/src/addons/block/timeline/services/timeline.ts
+++ b/src/addons/block/timeline/services/timeline.ts
@@ -26,7 +26,6 @@ import {
 import moment from 'moment';
 import { makeSingleton } from '@singletons';
 import { CoreSiteWSPreSets } from '@classes/site';
-import { CoreError } from '@classes/errors/error';
 
 // Cache key was maintained from block myoverview when blocks were splitted.
 const ROOT_CACHE_KEY = 'myoverview:';
@@ -45,12 +44,14 @@ export class AddonBlockTimelineProvider {
      *
      * @param courseId Only events in this course.
      * @param afterEventId The last seen event id.
+     * @param searchValue The value a user wishes to search against.
      * @param siteId Site ID. If not defined, use current site.
      * @return Promise resolved when the info is retrieved.
      */
     async getActionEventsByCourse(
         courseId: number,
         afterEventId?: number,
+        searchValue = '',
         siteId?: string,
     ): Promise<{ events: AddonCalendarEvent[]; canLoadMore?: number }> {
         const site = await CoreSites.getSite(siteId);
@@ -70,17 +71,18 @@ export class AddonBlockTimelineProvider {
             cacheKey: this.getActionEventsByCourseCacheKey(courseId),
         };
 
+        if (searchValue != '') {
+            data.searchvalue = searchValue;
+            preSets.getFromCache = false;
+        }
+
         const courseEvents = await site.read<AddonCalendarEvents>(
             'core_calendar_get_action_events_by_course',
             data,
             preSets,
         );
 
-        if (courseEvents && courseEvents.events) {
-            return this.treatCourseEvents(courseEvents, time);
-        }
-
-        throw new CoreError('No events returned on core_calendar_get_action_events_by_course.');
+        return this.treatCourseEvents(courseEvents, time);
     }
 
     /**
@@ -98,10 +100,12 @@ export class AddonBlockTimelineProvider {
      *
      * @param courseIds Course IDs.
      * @param siteId Site ID. If not defined, use current site.
+     * @param searchValue The value a user wishes to search against.
      * @return Promise resolved when the info is retrieved.
      */
     async getActionEventsByCourses(
         courseIds: number[],
+        searchValue = '',
         siteId?: string,
     ): Promise<{[courseId: string]: { events: AddonCalendarEvent[]; canLoadMore?: number } }> {
         const site = await CoreSites.getSite(siteId);
@@ -117,6 +121,11 @@ export class AddonBlockTimelineProvider {
             cacheKey: this.getActionEventsByCoursesCacheKey(),
         };
 
+        if (searchValue != '') {
+            data.searchvalue = searchValue;
+            preSets.getFromCache = false;
+        }
+
         const events = await site.read<AddonCalendarEventsGroupedByCourse>(
             'core_calendar_get_action_events_by_courses',
             data,
@@ -145,11 +154,13 @@ export class AddonBlockTimelineProvider {
      * Get calendar action events based on the timesort value.
      *
      * @param afterEventId The last seen event id.
+     * @param searchValue The value a user wishes to search against.
      * @param siteId Site ID. If not defined, use current site.
      * @return Promise resolved when the info is retrieved.
      */
     async getActionEventsByTimesort(
         afterEventId?: number,
+        searchValue = '',
         siteId?: string,
     ): Promise<{ events: AddonCalendarEvent[]; canLoadMore?: number }> {
         const site = await CoreSites.getSite(siteId);
@@ -171,25 +182,26 @@ export class AddonBlockTimelineProvider {
             uniqueCacheKey: true,
         };
 
+        if (searchValue != '') {
+            data.searchvalue = searchValue;
+            preSets.getFromCache = false;
+        }
+
         const result = await site.read<AddonCalendarEvents>(
             'core_calendar_get_action_events_by_timesort',
             data,
             preSets,
         );
 
-        if (result && result.events) {
-            const canLoadMore = result.events.length >= limitnum ? result.lastid : undefined;
+        const canLoadMore = result.events.length >= limitnum ? result.lastid : undefined;
 
-            // Filter events by time in case it uses cache.
-            const events = result.events.filter((element) => element.timesort >= timesortfrom);
+        // Filter events by time in case it uses cache.
+        const events = result.events.filter((element) => element.timesort >= timesortfrom);
 
-            return {
-                events,
-                canLoadMore,
-            };
-        }
-
-        throw new CoreError('No events returned on core_calendar_get_action_events_by_timesort.');
+        return {
+            events,
+            canLoadMore,
+        };
     }
 
     /**
diff --git a/src/addons/calendar/services/calendar.ts b/src/addons/calendar/services/calendar.ts
index 815254572..17c60c3bf 100644
--- a/src/addons/calendar/services/calendar.ts
+++ b/src/addons/calendar/services/calendar.ts
@@ -1785,6 +1785,7 @@ export type AddonCalendarGetActionEventsByCoursesWSParams = {
     timesortfrom?: number; // Time sort from.
     timesortto?: number; // Time sort to.
     limitnum?: number; // Limit number.
+    searchvalue?: string; // The value a user wishes to search against.
 };
 
 /**
@@ -1804,6 +1805,7 @@ export type AddonCalendarGetActionEventsByCourseWSParams = {
     timesortto?: number; // Time sort to.
     aftereventid?: number; // The last seen event id.
     limitnum?: number; // Limit number.
+    searchvalue?: string; // The value a user wishes to search against.
 };
 
 /**
@@ -1816,6 +1818,7 @@ export type AddonCalendarGetActionEventsByTimesortWSParams = {
     limitnum?: number; // Limit number.
     limittononsuspendedevents?: boolean; // Limit the events to courses the user is not suspended in.
     userid?: number; // The user id.
+    searchvalue?: string; // The value a user wishes to search against.
 };
 
 /**
diff --git a/src/core/components/combobox/combobox.scss b/src/core/components/combobox/combobox.scss
index 110a97d5f..566c1274e 100644
--- a/src/core/components/combobox/combobox.scss
+++ b/src/core/components/combobox/combobox.scss
@@ -2,6 +2,7 @@
 
 :host {
     max-width: 100%;
+    display: block;
     @include margin-horizontal(var(--ion-safe-area-left), var(--ion-safe-area-right));
 
     ion-select,
diff --git a/src/core/directives/auto-focus.ts b/src/core/directives/auto-focus.ts
index 190f90d19..6aeb4d829 100644
--- a/src/core/directives/auto-focus.ts
+++ b/src/core/directives/auto-focus.ts
@@ -52,7 +52,7 @@ export class CoreAutoFocusDirective implements AfterViewInit {
     /**
      * Function to focus the element.
      *
-     * @param retries Internal param to stop retrying then 0.
+     * @param retries Internal param to stop retrying on 0.
      */
     protected setFocus(retries = 10): void {
         if (retries == 0) {
diff --git a/src/core/features/block/components/side-blocks/side-blocks.scss b/src/core/features/block/components/side-blocks/side-blocks.scss
new file mode 100644
index 000000000..fc2f730f2
--- /dev/null
+++ b/src/core/features/block/components/side-blocks/side-blocks.scss
@@ -0,0 +1,13 @@
+@import "~theme/globals";
+
+:host ::ng-deep core-block {
+    @include media-breakpoint-up(md) {
+        .ion-hide-md-down {
+            display: none !important;
+        }
+
+        .ion-hide-md-up {
+            display: block !important;
+        }
+    }
+}
diff --git a/src/core/features/block/components/side-blocks/side-blocks.ts b/src/core/features/block/components/side-blocks/side-blocks.ts
index eefc8f527..0f817a4a0 100644
--- a/src/core/features/block/components/side-blocks/side-blocks.ts
+++ b/src/core/features/block/components/side-blocks/side-blocks.ts
@@ -28,6 +28,7 @@ import { CoreCoursesDashboard } from '@features/courses/services/dashboard';
 @Component({
     selector: 'core-block-side-blocks',
     templateUrl: 'side-blocks.html',
+    styleUrls: ['side-blocks.scss'],
 })
 export class CoreBlockSideBlocksComponent implements OnInit {
 
diff --git a/src/core/features/search/components/search-box/search-box.scss b/src/core/features/search/components/search-box/search-box.scss
index e3d84473a..4848d54b9 100644
--- a/src/core/features/search/components/search-box/search-box.scss
+++ b/src/core/features/search/components/search-box/search-box.scss
@@ -1,5 +1,5 @@
 :host {
-    height: 73px;
+    min-height: 61px;
     display: block;
     position: relative;
 
@@ -8,13 +8,12 @@
         left: 0;
         right: 0;
         z-index: 4;
-        margin-top: 10px;
-        margin-bottom: 10px;
+        margin-top: 8px;
+        margin-bottom: 8px;
     }
 
     ion-button.button {
-        margin-left: 0;
-        margin-right: 0;
+        margin: 0;
     }
 
     .core-search-history {
@@ -37,4 +36,9 @@
         padding-left: 0;
         padding-right: 0;
     }
+
+
+    ion-item {
+        --min-height: var(--a11y-min-target-size);
+    }
 }
diff --git a/src/core/features/search/components/search-box/search-box.ts b/src/core/features/search/components/search-box/search-box.ts
index 5270c4f1b..275647525 100644
--- a/src/core/features/search/components/search-box/search-box.ts
+++ b/src/core/features/search/components/search-box/search-box.ts
@@ -41,8 +41,8 @@ export class CoreSearchBoxComponent implements OnInit {
     @Input() searchLabel?: string; // Label to be used on action button.
     @Input() placeholder?: string; // Placeholder text for search text input.
     @Input() autocorrect = 'on'; // Enables/disable Autocorrection on search text input.
-    @Input() spellcheck?: string | boolean = true; // Enables/disable Spellchecker on search text input.
-    @Input() autoFocus?: string | boolean; // Enables/disable Autofocus when entering view.
+    @Input() spellcheck: string | boolean = true; // Enables/disable Spellchecker on search text input.
+    @Input() autoFocus: string | boolean = false; // Enables/disable Autofocus when entering view.
     @Input() lengthCheck = 3; // Check value length before submit. If 0, any string will be submitted.
     @Input() showClear = true; // Show/hide clear button.
     @Input() disabled = false; // Disables the input text.
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 45f9de0ab..c4c8a8d00 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -172,6 +172,7 @@ ion-app.ios ion-header h2 {
 .item.ion-text-wrap ion-label core-format-text .core-format-text-content > *,
 .fake-ion-item.ion-text-wrap core-format-text .core-format-text-content > * {
     white-space: normal;
+    overflow: inherit;
 }
 
 .item.ion-text-wrap ion-label {

From 29f6d6cd396c35a3c27a3bb7869cd3b9fcb866c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 8 Nov 2021 16:19:08 +0100
Subject: [PATCH 0220/1008] MOBILE-3806 course: Merge course progress and
 course list items components

---
 .../myoverview/addon-block-myoverview.html    |  10 +-
 .../addon-block-recentlyaccessedcourses.html  |  20 +-
 .../addon-block-starredcourses.html           |  22 +-
 .../core-courses-course-list-item.html        | 157 +++++++++---
 .../course-list-item/course-list-item.scss    | 176 +++++++++++++-
 .../course-list-item/course-list-item.ts      | 229 ++++++++++++++++--
 .../course-progress/course-progress.scss      |   6 -
 .../course-progress/course-progress.ts        |   1 -
 .../courses/pages/categories/categories.html  |  18 +-
 src/core/features/courses/services/courses.ts |   7 +-
 src/theme/theme.base.scss                     |   4 +
 11 files changed, 536 insertions(+), 114 deletions(-)

diff --git a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
index 2394d5a8b..884437ea6 100644
--- a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
+++ b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
@@ -90,11 +90,11 @@
     <div class="safe-area-padding">
         <ion-grid class="ion-no-padding">
             <ion-row class="ion-no-padding">
-                <ion-col *ngFor="let course of filteredCourses" class="ion-no-padding"
-                    size="12" size-sm="6" size-md="6" size-lg="4" size-xl="3">
-                    <core-courses-course-progress [course]="course" class="core-courseoverview" showAll="true"
-                        [showDownload]="downloadCourseEnabled && downloadEnabled">
-                    </core-courses-course-progress>
+                <ion-col *ngFor="let course of filteredCourses" class="ion-no-padding" size="12" size-sm="6" size-md="6" size-lg="4"
+                    size-xl="3">
+                    <core-courses-course-list-item [course]="course" class="core-courseoverview"
+                        [showDownload]="downloadCourseEnabled && downloadEnabled" [layout]="selectedLayout">
+                    </core-courses-course-list-item>
                 </ion-col>
             </ion-row>
         </ion-grid>
diff --git a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html
index d4a503b64..07c5b2027 100644
--- a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html
+++ b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html
@@ -8,13 +8,13 @@
                 (click)="prefetchCourses()" [attr.aria-label]="'core.courses.downloadcourses' | translate">
                 <ion-icon [name]="prefetchCoursesData.icon" slot="icon-only" aria-hidden="true"></ion-icon>
             </ion-button>
-            <ion-badge class="core-course-download-courses-progress" *ngIf="prefetchCoursesData.badge"
-                role="progressbar" [attr.aria-valuemax]="prefetchCoursesData.total"
-                [attr.aria-valuenow]="prefetchCoursesData.count" [attr.aria-valuetext]="prefetchCoursesData.badgeA11yText">
+            <ion-badge class="core-course-download-courses-progress" *ngIf="prefetchCoursesData.badge" role="progressbar"
+                [attr.aria-valuemax]="prefetchCoursesData.total" [attr.aria-valuenow]="prefetchCoursesData.count"
+                [attr.aria-valuetext]="prefetchCoursesData.badgeA11yText">
                 {{prefetchCoursesData.badge}}
             </ion-badge>
-            <ion-spinner *ngIf="!prefetchCoursesData.icon || prefetchCoursesData.loading"
-                [attr.aria-label]="'core.loading' | translate"></ion-spinner>
+            <ion-spinner *ngIf="!prefetchCoursesData.icon || prefetchCoursesData.loading" [attr.aria-label]="'core.loading' | translate">
+            </ion-spinner>
         </div>
 
         <core-horizontal-scroll-controls #scrollControls [aria-controls]="scrollElementId">
@@ -25,16 +25,12 @@
     <core-empty-box *ngIf="courses.length == 0" image="assets/img/icons/courses.svg" inline="true"
         [message]="'addon.block_recentlyaccessedcourses.nocourses' | translate"></core-empty-box>
     <!-- List of courses. -->
-    <div
-        [id]="scrollElementId"
-        class="core-horizontal-scroll"
-        (scroll)="scrollControls.updateScrollPosition()"
-    >
+    <div [id]="scrollElementId" class="core-horizontal-scroll" (scroll)="scrollControls.updateScrollPosition()">
         <div (onResize)="scrollControls.updateScrollPosition()" class="flex-row">
             <div class="safe-area-pseudo-padding-start"></div>
             <ng-container *ngFor="let course of courses">
-                <core-courses-course-progress [course]="course" class="core-recentlyaccessedcourses"
-                    [showDownload]="downloadCourseEnabled && downloadEnabled"></core-courses-course-progress>
+                <core-courses-course-list-item [course]="course" class="core-recentlyaccessedcourses" layout="summarycard"
+                    [showDownload]="downloadCourseEnabled && downloadEnabled"></core-courses-course-list-item>
             </ng-container>
             <div class="safe-area-pseudo-padding-end"></div>
         </div>
diff --git a/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html b/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html
index 32fbdc9fb..8de46a904 100644
--- a/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html
+++ b/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html
@@ -8,13 +8,13 @@
                 (click)="prefetchCourses()" [attr.aria-label]="'core.courses.downloadcourses' | translate">
                 <ion-icon [name]="prefetchCoursesData.icon" slot="icon-only" aria-hidden="true"></ion-icon>
             </ion-button>
-            <ion-badge class="core-course-download-courses-progress" *ngIf="prefetchCoursesData.badge"
-                role="progressbar" [attr.aria-valuemax]="prefetchCoursesData.total"
-                [attr.aria-valuenow]="prefetchCoursesData.count" [attr.aria-valuetext]="prefetchCoursesData.badgeA11yText">
+            <ion-badge class="core-course-download-courses-progress" *ngIf="prefetchCoursesData.badge" role="progressbar"
+                [attr.aria-valuemax]="prefetchCoursesData.total" [attr.aria-valuenow]="prefetchCoursesData.count"
+                [attr.aria-valuetext]="prefetchCoursesData.badgeA11yText">
                 {{prefetchCoursesData.badge}}
             </ion-badge>
-            <ion-spinner *ngIf="!prefetchCoursesData.icon || prefetchCoursesData.loading"
-                [attr.aria-label]="'core.loading' | translate"></ion-spinner>
+            <ion-spinner *ngIf="!prefetchCoursesData.icon || prefetchCoursesData.loading" [attr.aria-label]="'core.loading' | translate">
+            </ion-spinner>
         </div>
 
         <core-horizontal-scroll-controls #scrollControls [aria-controls]="scrollElementId">
@@ -25,17 +25,13 @@
     <core-empty-box *ngIf="courses.length == 0" image="assets/img/icons/courses.svg" inline="true"
         [message]="'addon.block_starredcourses.nocourses' | translate"></core-empty-box>
     <!-- List of courses. -->
-    <div
-        [hidden]="courses.length === 0"
-        [id]="scrollElementId"
-        class="core-horizontal-scroll"
-        (scroll)="scrollControls.updateScrollPosition()"
-    >
+    <div [hidden]="courses.length === 0" [id]="scrollElementId" class="core-horizontal-scroll"
+        (scroll)="scrollControls.updateScrollPosition()">
         <div (onResize)="scrollControls.updateScrollPosition()" class="flex-row">
             <div class="safe-area-pseudo-padding-start"></div>
             <ng-container *ngFor="let course of courses">
-                <core-courses-course-progress [course]="course" class="core-block_starredcourses"
-                    [showDownload]="downloadCourseEnabled && downloadEnabled"></core-courses-course-progress>
+                <core-courses-course-list-item [course]="course" class="core-block_starredcourses" layout="summarycard"
+                    [showDownload]="downloadCourseEnabled && downloadEnabled"></core-courses-course-list-item>
             </ng-container>
             <div class="safe-area-pseudo-padding-end"></div>
         </div>
diff --git a/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html b/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
index 425d8e3f3..772b58c0b 100644
--- a/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
+++ b/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
@@ -1,47 +1,124 @@
-<ion-item class="ion-text-wrap" (click)="openCourse()" [class.item-disabled]="course.visible == 0"
-    [attr.aria-label]="course.displayname || course.fullname" detail="true" button>
-    <ion-icon *ngIf="!course.courseImage" name="fas-graduation-cap" slot="start" class="course-icon"
-        [attr.course-color]="course.color ? null : course.colorNumber" [style.color]="course.color"></ion-icon>
-    <ion-avatar *ngIf="course.courseImage" slot="start">
-        <img [src]="course.courseImage" core-external-content alt=""/>
+<ion-item class="ion-text-wrap core-course-list-item" (click)="openCourse()" [class.item-disabled]="course.visible == 0"
+    [class.item-dimmed]="course.hidden" [attr.aria-label]="course.displayname || course.fullname" detail="true" button
+    *ngIf="layout == 'list' || layout == 'listwithenrol'">
+    <ion-icon *ngIf="!course.courseImage" name="fas-graduation-cap" slot="start" class="course-icon core-course-thumb"
+        [attr.course-color]="course.color ? null : course.colorNumber" [style.color]="course.color">
+    </ion-icon>
+    <ion-avatar *ngIf="course.courseImage" slot="start" class="core-course-thumb">
+        <img [src]="course.courseImage" core-external-content alt="" />
     </ion-avatar>
     <ion-label>
-        <h2>
-            <core-format-text [text]="course.displayname || course.fullname" contextLevel="course" [contextInstanceId]="course.id">
-            </core-format-text>
-        </h2>
-        <p *ngIf="course.categoryname || (course.displayname && course.shortname && course.fullname != course.displayname)"
-            class="core-course-additional-info">
-            <span *ngIf="course.categoryname" class="core-course-category">
-                <core-format-text [text]="course.categoryname"></core-format-text>
-            </span>
-            <span *ngIf="course.categoryname && course.displayname && course.shortname && course.fullname != course.displayname"
-                class="core-course-category"> | </span>
-            <span *ngIf="course.displayname && course.shortname && course.fullname != course.displayname"
-                class="core-course-shortname">
-                <core-format-text [text]="course.shortname" contextLevel="course" [contextInstanceId]="course.id">
-                </core-format-text>
-            </span>
-        </p>
-        <p *ngIf="isEnrolled && course.progress! >= 0 && course.completionusertracked !== false">
-            <core-progress-bar [progress]="course.progress" a11yText="core.courses.aria:courseprogress"></core-progress-bar>
+        <ion-row>
+            <ion-col>
+                <p *ngIf="course.categoryname || (course.displayname && course.shortname && course.fullname != course.displayname)"
+                    class="core-course-additional-info">
+                    <span *ngIf="course.categoryname" class="core-course-category">
+                        <core-format-text [text]="course.categoryname"></core-format-text>
+                    </span>
+                    <span *ngIf="course.categoryname && course.displayname && course.shortname && course.fullname != course.displayname"
+                        class="core-course-category"> | </span>
+                    <span *ngIf="course.displayname && course.shortname && course.fullname != course.displayname"
+                        class="core-course-shortname">
+                        <core-format-text [text]="course.shortname" contextLevel="course" [contextInstanceId]="course.id">
+                        </core-format-text>
+                    </span>
+                </p>
+                <p class="item-heading">
+                    <ion-icon name="fas-star" *ngIf="course.isfavourite" [attr.aria-label]="'core.courses.favourite' | translate">
+                    </ion-icon>
+                    <span class="sr-only" *ngIf="course.isfavourite">{{ 'core.courses.aria:favourite' | translate }}</span>
+                    <span class="sr-only">{{ 'core.courses.aria:coursename' | translate }}</span>
+                    <core-format-text [text]="course.fullname" contextLevel="course" [contextInstanceId]="course.id">
+                    </core-format-text>
+                </p>
+            </ion-col>
+            <ion-col size="auto">
+                <ng-container *ngIf="!isEnrolled">
+                    <ion-icon *ngFor="let icon of enrolmentIcons" color="dark" size="small" [name]="icon.icon"
+                        [title]="icon.label | translate" [attr.aria-label]="icon.label | translate">
+                    </ion-icon>
+                </ng-container>
+                <ng-container *ngIf="isEnrolled">
+                    <ng-container *ngTemplateOutlet="download"></ng-container>
+                </ng-container>
+            </ion-col>
+        </ion-row>
+        <p *ngIf="isEnrolled && progress! >= 0 && completionUserTracked !== false">
+            <core-progress-bar [progress]="progress" a11yText="core.courses.aria:courseprogress"></core-progress-bar>
         </p>
     </ion-label>
-    <ng-container *ngIf="!isEnrolled">
-        <ion-icon *ngFor="let icon of icons" color="dark" size="small" [name]="icon.icon"
-            [title]="icon.label | translate"
-            [attr.aria-label]="icon.label | translate"
-            slot="end">
-        </ion-icon>
-    </ng-container>
 
-    <div class="core-button-spinner" *ngIf="isEnrolled && showDownload" slot="end">
-        <core-download-refresh
-            [status]="prefetchCourseData.status"
-            [statusTranslatable]="prefetchCourseData.statusTranslatable"
-            [enabled]="true"
-            canTrustDownload="false"
-            [loading]="prefetchCourseData.loading"
+</ion-item>
+
+<ion-card [attr.course-color]="course.color ? null : course.colorNumber" *ngIf="layout == 'card' || layout == 'summarycard'"
+    class="core-course-list-card" [class.item-dimmed]="course.hidden">
+    <div (click)="openCourse()" class="core-course-thumb" [class.core-course-color-img]="course.courseImage"
+        [style.background-color]="course.color">
+        <img *ngIf="course.courseImage" [src]="course.courseImage" core-external-content alt="" />
+    </div>
+    <ion-item button lines="none" (click)="openCourse()" [attr.aria-label]="course.displayname || course.fullname"
+        class="core-course-header" [class.item-disabled]="course.visible == 0"
+        [class.core-course-only-title]="layout == 'summarycard' || progress < 0 && completionUserTracked === false" detail="false">
+        <ion-label class="ion-text-wrap core-course-title">
+            <ion-row>
+                <ion-col>
+                    <p *ngIf="course.categoryname || (course.displayname && course.shortname && course.fullname != course.displayname)"
+                        class="core-course-additional-info">
+                        <span class="sr-only">{{ 'core.courses.aria:coursecategory' | translate }}</span>
+                        <span *ngIf="course.categoryname" class="core-course-category">
+                            <core-format-text [text]="course.categoryname"></core-format-text>
+                        </span>
+                        <span *ngIf="course.categoryname && course.displayname && course.shortname && course.fullname != course.displayname"
+                            class="core-course-category"> | </span>
+                        <span *ngIf="course.displayname && course.shortname && course.fullname != course.displayname"
+                            class="core-course-shortname">
+                            <core-format-text [text]="course.shortname" contextLevel="course" [contextInstanceId]="course.id">
+                            </core-format-text>
+                        </span>
+                    </p>
+                    <p class="item-heading">
+                        <ion-icon name="fas-star" *ngIf="course.isfavourite" [attr.aria-label]="'core.courses.favourite' | translate">
+                        </ion-icon>
+                        <span class="sr-only" *ngIf="course.isfavourite">{{ 'core.courses.aria:favourite' | translate }}</span>
+                        <span class="sr-only">{{ 'core.courses.aria:coursename' | translate }}</span>
+                        <core-format-text [text]="course.fullname" contextLevel="course" [contextInstanceId]="course.id">
+                        </core-format-text>
+                    </p>
+                </ion-col>
+                <ion-col size="auto"
+                    *ngIf="isEnrolled && ((downloadCourseEnabled && !courseOptionMenuEnabled && showDownload) || courseOptionMenuEnabled)">
+                    <ng-container *ngTemplateOutlet="download"></ng-container>
+                </ion-col>
+            </ion-row>
+            <div *ngIf="layout == 'card' && progress >= 0 && completionUserTracked !== false" lines="none" class="core-course-progress">
+                <core-progress-bar [progress]="progress" a11yText="core.courses.aria:courseprogress"></core-progress-bar>
+            </div>
+
+        </ion-label>
+    </ion-item>
+</ion-card>
+
+
+<ng-template #download>
+    <div class="core-button-spinner" *ngIf="downloadCourseEnabled && !courseOptionMenuEnabled && showDownload">
+        <core-download-refresh [status]="prefetchCourseData.status" [enabled]="downloadCourseEnabled"
+            [statusTranslatable]="prefetchCourseData.statusTranslatable" canTrustDownload="false" [loading]="prefetchCourseData.loading"
             (action)="prefetchCourse()"></core-download-refresh>
     </div>
-</ion-item>
+
+    <div class="core-button-spinner" *ngIf="courseOptionMenuEnabled">
+        <!-- Download course spinner. -->
+        <ion-spinner *ngIf="(downloadCourseEnabled && prefetchCourseData.icon == 'spinner') || showSpinner"
+            [attr.aria-label]="'core.loading' | translate"></ion-spinner>
+
+        <!-- Downloaded icon. -->
+        <ion-icon *ngIf="downloadCourseEnabled && prefetchCourseData.downloadSucceeded && !showSpinner" class="core-icon-downloaded"
+            name="cloud-done" color="success" role="status" [attr.aria-label]="'core.downloaded' | translate"></ion-icon>
+
+        <!-- Options menu. -->
+        <ion-button fill="clear" color="dark" (click)="showCourseOptionsMenu($event)" *ngIf="!showSpinner"
+            [attr.aria-label]="('core.displayoptions' | translate)">
+            <ion-icon name="ellipsis-vertical" slot="icon-only" aria-hidden="true"></ion-icon>
+        </ion-button>
+    </div>
+</ng-template>
diff --git a/src/core/features/courses/components/course-list-item/course-list-item.scss b/src/core/features/courses/components/course-list-item/course-list-item.scss
index 4807e1b59..928f993e2 100644
--- a/src/core/features/courses/components/course-list-item/course-list-item.scss
+++ b/src/core/features/courses/components/course-list-item/course-list-item.scss
@@ -1,13 +1,12 @@
 @import "~theme/globals";
 
-:host {
+.core-course-list-item {
     .course-icon {
         color: white;
         background: var(--gray-light);
         padding: 8px;
         font-size: 24px;
         border-radius: 50%;
-        margin-inline-end: 16px;
         -webkit-transition: all 50ms ease-in-out;
         transition: all 50ms ease-in-out;
     }
@@ -22,4 +21,177 @@
         -webkit-transition: all 50ms ease-in-out;
         transition: all 50ms ease-in-out;
     }
+
+    .core-course-thumb {
+        @include margin(12px, 16px, 12px, null);
+        align-self: flex-start;
+    }
+
+    .core-course-summary {
+        margin-top: 12px;
+    }
+}
+
+.item-heading ion-icon {
+    margin-right: 4px;
+    color: var(--core-star-color);
+}
+
+ion-card {
+    --vertical-margin: 12px;
+
+    display: flex;
+    flex-direction: column;
+    align-self: stretch;
+    height: calc(100% - var(--vertical-margin) - var(--vertical-margin));
+    margin-top: var(--vertical-margin);
+    margin-bottom: var(--vertical-margin);
+
+    @for $i from 0 to length($core-course-image-background) {
+        &[course-color="#{$i}"] .core-course-thumb {
+            background: var(--core-course-color-#{$i});
+        }
+    }
+
+    ion-row {
+        min-height: var(--a11y-min-target-size);
+        ion-col .core-button-spinner {
+            min-width: calc(var(--a11y-min-target-size) + 16px);
+        }
+    }
+
+    .core-course-thumb {
+        padding-top: 40%;
+        width: 100%;
+        overflow: hidden;
+        cursor: pointer;
+        pointer-events: auto;
+        position: relative;
+        background-position: center;
+        background-size: cover;
+        -webkit-transition: all 50ms ease-in-out;
+        transition: all 50ms ease-in-out;
+
+        &.core-course-color-img {
+            background: var(--ion-item-background);
+        }
+
+        img {
+            position: absolute;
+            top: 0;
+            bottom: 0;
+            right: 0;
+            left: 0;
+            margin: auto;
+        }
+    }
+
+    @if ($core-course-hide-thumb-on-cards) {
+        .core-course-thumb {
+            display: none;
+        }
+    }
+
+    @if ($core-course-thumb-on-cards-background) {
+        .core-course-thumb {
+            background: $core-course-thumb-on-cards-background !important;
+        }
+    }
+
+    .core-course-additional-info {
+        margin-bottom: 8px;
+    }
+
+    .core-course-header {
+        flex-grow: 1;
+        display: flex;
+        flex-direction: column;
+
+        --inner-padding-end: 0px;
+
+        &::part(native) {
+            flex-grow: 1;
+            align-items: self-start;
+        }
+
+        &.core-course-only-title {
+            &::part(native) {
+                flex-grow: 1;
+            }
+
+        }
+
+        .core-course-title {
+            margin: 12px 0;
+            flex-grow: 1;
+            width: 100%;
+            max-width: 100%;
+        }
+
+        .core-button-spinner {
+            margin: 0;
+        }
+        .core-button-spinner ion-spinner {
+            vertical-align: top; // the better option for most scenarios
+            vertical-align: -webkit-baseline-middle; // the best for those that support it
+        }
+
+        .core-button-spinner .core-icon-downloaded {
+            font-size: 28.8px;
+            margin-top: 8px;
+            vertical-align: top;
+        }
+
+        .item-button[icon-only] {
+            min-width: 50px;
+            width: 50px;
+        }
+    }
+
+    @if ($core-course-hide-progress-on-cards) {
+        .core-course-progress {
+            display: none;
+        }
+    }
+}
+
+button {
+    z-index: 1;
+}
+
+:host-context(.core-horizontal-scroll) {
+    @include horizontal_scroll_item(80%, 250px, 300px);
+    
+    ion-card {
+        .core-course-thumb {
+            padding-top: 30%;
+        }
+
+        ion-item.core-course-header {
+            --padding-start: 4px;
+            
+            .core-course-title {
+                margin: 7px 0;
+
+                .item-heading ion-icon {
+                    margin-right: 2px;
+                }
+            }
+            .core-button-spinner {
+                min-height: 40px;
+                min-width: 40px;
+
+                ion-spinner {
+                    width: 20px;
+                    height: 20px;
+                }
+            }
+            .item-button[icon-only] {
+                min-width: 40px;
+                width: 40px;
+                padding: 8px;
+            }
+
+        }
+    }
 }
diff --git a/src/core/features/courses/components/course-list-item/course-list-item.ts b/src/core/features/courses/components/course-list-item/course-list-item.ts
index 6d4da5a97..98e98ba99 100644
--- a/src/core/features/courses/components/course-list-item/course-list-item.ts
+++ b/src/core/features/courses/components/course-list-item/course-list-item.ts
@@ -12,15 +12,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { CoreConstants } from '@/core/constants';
 import { Component, Input, OnChanges, OnDestroy, OnInit } from '@angular/core';
 import { CoreCourseProvider, CoreCourse } from '@features/course/services/course';
 import { CoreCourseHelper, CorePrefetchStatusInfo } from '@features/course/services/course-helper';
+import { CoreUser } from '@features/user/services/user';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
+import { Translate } from '@singletons';
 import { CoreEventCourseStatusChanged, CoreEventObserver, CoreEvents } from '@singletons/events';
-import { CoreCourseListItem, CoreCourses } from '../../services/courses';
-import { CoreCoursesHelper } from '../../services/courses-helper';
+import { CoreCourseListItem, CoreCourses, CoreCoursesProvider } from '../../services/courses';
+import { CoreCoursesHelper, CoreEnrolledCourseDataWithExtraInfoAndOptions } from '../../services/courses-helper';
+import { CoreCoursesCourseOptionsMenuComponent } from '../course-options-menu/course-options-menu';
 
 /**
  * This directive is meant to display an item for a list of courses.
@@ -37,10 +41,10 @@ import { CoreCoursesHelper } from '../../services/courses-helper';
 export class CoreCoursesCourseListItemComponent implements OnInit, OnDestroy, OnChanges {
 
     @Input() course!: CoreCourseListItem; // The course to render.
-
     @Input() showDownload = false; // If true, will show download button.
+    @Input() layout: 'listwithenrol'|'summarycard'|'list'|'card' = 'listwithenrol';
 
-    icons: CoreCoursesEnrolmentIcons[] = [];
+    enrolmentIcons: CoreCoursesEnrolmentIcons[] = [];
     isEnrolled = false;
     prefetchCourseData: CorePrefetchStatusInfo = {
         icon: '',
@@ -49,8 +53,16 @@ export class CoreCoursesCourseListItemComponent implements OnInit, OnDestroy, On
         loading: true,
     };
 
-    protected courseStatusObserver?: CoreEventObserver;
+    showSpinner = false;
+    downloadCourseEnabled = false;
+    courseOptionMenuEnabled = false;
+    progress = -1;
+    completionUserTracked: boolean | undefined = false;
+
+    protected courseStatus = CoreConstants.NOT_DOWNLOADED;
     protected isDestroyed = false;
+    protected courseStatusObserver?: CoreEventObserver;
+    protected siteUpdatedObserver?: CoreEventObserver;
 
     /**
      * @inheritdoc
@@ -58,48 +70,71 @@ export class CoreCoursesCourseListItemComponent implements OnInit, OnDestroy, On
     async ngOnInit(): Promise<void> {
         CoreCoursesHelper.loadCourseColorAndImage(this.course);
 
-        this.isEnrolled = this.course.progress !== undefined;
+        // Assume is enroled if mode is not listwithenrol.
+        this.isEnrolled = this.layout != 'listwithenrol' || this.course.progress !== undefined;
 
         if (!this.isEnrolled) {
             try {
                 const course = await CoreCourses.getUserCourse(this.course.id);
-                this.course.progress = course.progress;
-                this.course.completionusertracked = course.completionusertracked;
+                this.course = Object.assign(this.course, course);
+                this.updateCourseFields();
 
                 this.isEnrolled = true;
-
-                if (this.showDownload) {
-                    this.initPrefetchCourse();
-                }
             } catch {
                 this.isEnrolled = false;
             }
         }
 
-        if (!this.isEnrolled) {
-            this.icons = [];
+        if (this.isEnrolled) {
+            if (this.showDownload) {
+                this.initPrefetchCourse();
+            }
+
+            this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
+
+            if (this.downloadCourseEnabled) {
+                this.initPrefetchCourse();
+            }
+
+            // This field is only available from 3.6 onwards.
+            this.courseOptionMenuEnabled = (this.layout != 'listwithenrol' && this.layout != 'summarycard') &&
+                this.course.isfavourite !== undefined;
+
+            // Refresh the enabled flag if site is updated.
+            this.siteUpdatedObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, () => {
+                const wasEnabled = this.downloadCourseEnabled;
+
+                this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
+
+                if (!wasEnabled && this.downloadCourseEnabled) {
+                    // Download course is enabled now, initialize it.
+                    this.initPrefetchCourse();
+                }
+            }, CoreSites.getCurrentSiteId());
+        } else if ('enrollmentmethods' in this.course) {
+            this.enrolmentIcons = [];
 
             this.course.enrollmentmethods.forEach((instance) => {
                 if (instance === 'self') {
-                    this.icons.push({
+                    this.enrolmentIcons.push({
                         label: 'core.courses.selfenrolment',
                         icon: 'fas-key',
                     });
                 } else if (instance === 'guest') {
-                    this.icons.push({
+                    this.enrolmentIcons.push({
                         label: 'core.courses.allowguests',
                         icon: 'fas-unlock',
                     });
                 } else if (instance === 'paypal') {
-                    this.icons.push({
+                    this.enrolmentIcons.push({
                         label: 'core.courses.paypalaccepted',
                         icon: 'fab-paypal',
                     });
                 }
             });
 
-            if (this.icons.length == 0) {
-                this.icons.push({
+            if (this.enrolmentIcons.length == 0) {
+                this.enrolmentIcons.push({
                     label: 'core.courses.notenrollable',
                     icon: 'fas-lock',
                 });
@@ -114,6 +149,16 @@ export class CoreCoursesCourseListItemComponent implements OnInit, OnDestroy, On
         if (this.showDownload && this.isEnrolled) {
             this.initPrefetchCourse();
         }
+
+        this.updateCourseFields();
+    }
+
+    /**
+     * Helper function to update course fields.
+     */
+    protected updateCourseFields(): void {
+        this.progress = 'progress' in this.course ? this.course.progress || -1 : -1;
+        this.completionUserTracked = 'completionusertracked' in this.course && this.course.completionusertracked;
     }
 
     /**
@@ -179,6 +224,7 @@ export class CoreCoursesCourseListItemComponent implements OnInit, OnDestroy, On
     protected updateCourseStatus(status: string): void {
         const statusData = CoreCourseHelper.getCoursePrefetchStatusInfo(status);
 
+        this.courseStatus = status;
         this.prefetchCourseData.status = statusData.status;
         this.prefetchCourseData.icon = statusData.icon;
         this.prefetchCourseData.statusTranslatable = statusData.statusTranslatable;
@@ -188,11 +234,11 @@ export class CoreCoursesCourseListItemComponent implements OnInit, OnDestroy, On
     /**
      * Prefetch the course.
      *
-     * @param e Click event.
+     * @param event Click event.
      */
-    async prefetchCourse(e?: Event): Promise<void> {
-        e?.preventDefault();
-        e?.stopPropagation();
+    async prefetchCourse(event?: Event): Promise<void> {
+        event?.preventDefault();
+        event?.stopPropagation();
 
         try {
             await CoreCourseHelper.confirmAndPrefetchCourse(this.prefetchCourseData, this.course);
@@ -203,12 +249,149 @@ export class CoreCoursesCourseListItemComponent implements OnInit, OnDestroy, On
         }
     }
 
+    /**
+     * Delete the course.
+     */
+    async deleteCourse(): Promise<void> {
+        try {
+            await CoreDomUtils.showDeleteConfirm('core.course.confirmdeletestoreddata');
+        } catch (error) {
+            if (CoreDomUtils.isCanceledError(error)) {
+                throw error;
+            }
+
+            return;
+        }
+
+        const modal = await CoreDomUtils.showModalLoading();
+
+        try {
+            await CoreCourseHelper.deleteCourseFiles(this.course.id);
+        } catch (error) {
+            CoreDomUtils.showErrorModalDefault(error, Translate.instant('core.errordeletefile'));
+        } finally {
+            modal.dismiss();
+        }
+    }
+
+    /**
+     * Show the context menu.
+     *
+     * @param event Click Event.
+     */
+    async showCourseOptionsMenu(event: Event): Promise<void> {
+        event.preventDefault();
+        event.stopPropagation();
+
+        const popoverData = await CoreDomUtils.openPopover<string>({
+            component: CoreCoursesCourseOptionsMenuComponent,
+            componentProps: {
+                course: this.course,
+                prefetch: this.prefetchCourseData,
+            },
+            event: event,
+        });
+
+        switch (popoverData) {
+            case 'download':
+                if (!this.prefetchCourseData.loading) {
+                    this.prefetchCourse(event);
+                }
+                break;
+            case 'delete':
+                if (this.courseStatus == 'downloaded' || this.courseStatus == 'outdated') {
+                    this.deleteCourse();
+                }
+                break;
+            case 'hide':
+                this.setCourseHidden(true);
+                break;
+            case 'show':
+                this.setCourseHidden(false);
+                break;
+            case 'favourite':
+                this.setCourseFavourite(true);
+                break;
+            case 'unfavourite':
+                this.setCourseFavourite(false);
+                break;
+            default:
+                break;
+        }
+
+    }
+
+    /**
+     * Hide/Unhide the course from the course list.
+     *
+     * @param hide True to hide and false to show.
+     */
+    protected async setCourseHidden(hide: boolean): Promise<void> {
+        this.showSpinner = true;
+
+        // We should use null to unset the preference.
+        try {
+            await CoreUser.updateUserPreference(
+                'block_myoverview_hidden_course_' + this.course.id,
+                hide ? '1' : undefined,
+            );
+
+            this.course.hidden = hide;
+
+            (<CoreEnrolledCourseDataWithExtraInfoAndOptions> this.course).hidden = hide;
+            CoreEvents.trigger(CoreCoursesProvider.EVENT_MY_COURSES_UPDATED, {
+                courseId: this.course.id,
+                course: this.course,
+                action: CoreCoursesProvider.ACTION_STATE_CHANGED,
+                state: CoreCoursesProvider.STATE_HIDDEN,
+                value: hide,
+            }, CoreSites.getCurrentSiteId());
+
+        } catch (error) {
+            if (!this.isDestroyed) {
+                CoreDomUtils.showErrorModalDefault(error, 'Error changing course visibility.');
+            }
+        } finally {
+            this.showSpinner = false;
+        }
+    }
+
+    /**
+     * Favourite/Unfavourite the course from the course list.
+     *
+     * @param favourite True to favourite and false to unfavourite.
+     */
+    protected async setCourseFavourite(favourite: boolean): Promise<void> {
+        this.showSpinner = true;
+
+        try {
+            await CoreCourses.setFavouriteCourse(this.course.id, favourite);
+
+            this.course.isfavourite = favourite;
+            CoreEvents.trigger(CoreCoursesProvider.EVENT_MY_COURSES_UPDATED, {
+                courseId: this.course.id,
+                course: this.course,
+                action: CoreCoursesProvider.ACTION_STATE_CHANGED,
+                state: CoreCoursesProvider.STATE_FAVOURITE,
+                value: favourite,
+            }, CoreSites.getCurrentSiteId());
+
+        } catch (error) {
+            if (!this.isDestroyed) {
+                CoreDomUtils.showErrorModalDefault(error, 'Error changing course favourite attribute.');
+            }
+        } finally {
+            this.showSpinner = false;
+        }
+    }
+
     /**
      * @inheritdoc
      */
     ngOnDestroy(): void {
         this.isDestroyed = true;
         this.courseStatusObserver?.off();
+        this.siteUpdatedObserver?.off();
     }
 
 }
diff --git a/src/core/features/courses/components/course-progress/course-progress.scss b/src/core/features/courses/components/course-progress/course-progress.scss
index 07024b58f..28a70f437 100644
--- a/src/core/features/courses/components/course-progress/course-progress.scss
+++ b/src/core/features/courses/components/course-progress/course-progress.scss
@@ -151,9 +151,3 @@
         }
     }
 }
-
-:host-context(body.version-3-1) {
-    .core-course-thumb{
-        display: none;
-    }
-}
diff --git a/src/core/features/courses/components/course-progress/course-progress.ts b/src/core/features/courses/components/course-progress/course-progress.ts
index ece9a9b50..626c6c9a8 100644
--- a/src/core/features/courses/components/course-progress/course-progress.ts
+++ b/src/core/features/courses/components/course-progress/course-progress.ts
@@ -221,7 +221,6 @@ export class CoreCoursesCourseProgressComponent implements OnInit, OnDestroy, On
             component: CoreCoursesCourseOptionsMenuComponent,
             componentProps: {
                 course: this.course,
-                courseStatus: this.courseStatus,
                 prefetch: this.prefetchCourseData,
             },
             event: e,
diff --git a/src/core/features/courses/pages/categories/categories.html b/src/core/features/courses/pages/categories/categories.html
index 7ecd32f4b..495001569 100644
--- a/src/core/features/courses/pages/categories/categories.html
+++ b/src/core/features/courses/pages/categories/categories.html
@@ -10,11 +10,10 @@
         <ion-buttons slot="end">
             <core-context-menu>
                 <core-context-menu-item *ngIf="downloadCourseEnabled || downloadCoursesEnabled" [priority]="1000"
-                    [content]="'core.settings.showdownloadoptions' | translate" (action)="toggleDownload()"
-                    iconAction="toggle" [(toggle)]="downloadEnabled"></core-context-menu-item>
-                <core-context-menu-item [priority]="900"
-                    [content]="'core.courses.showonlyenrolled' | translate" (action)="filterEnrolled()"
-                    iconAction="toggle" [(toggle)]="showOnlyEnrolled"></core-context-menu-item>   
+                    [content]="'core.settings.showdownloadoptions' | translate" (action)="toggleDownload()" iconAction="toggle"
+                    [(toggle)]="downloadEnabled"></core-context-menu-item>
+                <core-context-menu-item [priority]="900" [content]="'core.courses.showonlyenrolled' | translate" (action)="filterEnrolled()"
+                    iconAction="toggle" [(toggle)]="showOnlyEnrolled"></core-context-menu-item>
             </core-context-menu>
         </ion-buttons>
     </ion-toolbar>
@@ -28,12 +27,12 @@
             <ion-icon name="fas-folder" slot="start" [attr.aria-label]="'core.category' | translate"></ion-icon>
             <ion-label>
                 <p class="item-heading">
-                    <core-format-text [text]="currentCategory.name" contextLevel="coursecat"
-                    [contextInstanceId]="currentCategory.id"></core-format-text>
+                    <core-format-text [text]="currentCategory.name" contextLevel="coursecat" [contextInstanceId]="currentCategory.id">
+                    </core-format-text>
                 </p>
                 <p *ngIf="currentCategory.description">
                     <core-format-text [text]="currentCategory.description" maxHeight="60" contextLevel="coursecat"
-                    [contextInstanceId]="currentCategory.id"></core-format-text>
+                        [contextInstanceId]="currentCategory.id"></core-format-text>
                 </p>
             </ion-label>
         </ion-item>
@@ -45,8 +44,7 @@
                 </ion-label>
             </ion-item-divider>
             <section *ngFor="let category of categories">
-                <ion-item button class="ion-text-wrap" (click)="openCategory(category.id)" [attr.aria-label]="category.name"
-                    detail="true">
+                <ion-item button class="ion-text-wrap" (click)="openCategory(category.id)" [attr.aria-label]="category.name" detail="true">
                     <ion-icon name="fas-folder" slot="start" [attr.aria-label]="'core.category' | translate"></ion-icon>
                     <ion-label>
                         <h2>
diff --git a/src/core/features/courses/services/courses.ts b/src/core/features/courses/services/courses.ts
index fa9a973c9..c28874747 100644
--- a/src/core/features/courses/services/courses.ts
+++ b/src/core/features/courses/services/courses.ts
@@ -19,7 +19,7 @@ import { makeSingleton } from '@singletons';
 import { CoreStatusWithWarningsWSResponse, CoreWarningsWSResponse, CoreWSExternalFile, CoreWSExternalWarning } from '@services/ws';
 import { CoreEvents } from '@singletons/events';
 import { CoreWSError } from '@classes/errors/wserror';
-import { CoreCourseWithImageAndColor } from './courses-helper';
+import { CoreCourseAnyCourseDataWithExtraInfoAndOptions, CoreCourseWithImageAndColor } from './courses-helper';
 
 const ROOT_CACHE_KEY = 'mmCourses:';
 
@@ -1384,7 +1384,10 @@ export type CoreCourseSearchedData = CoreCourseBasicSearchedData & {
 /**
  * Course to render as list item.
  */
-export type CoreCourseListItem = CoreCourseSearchedData & CoreCourseWithImageAndColor & {
+export type CoreCourseListItem = ((CoreCourseSearchedData & CoreCourseWithImageAndColor) |
+CoreCourseAnyCourseDataWithExtraInfoAndOptions) & {
+    isfavourite?: boolean; // If the user marked this course a favourite.
+    hidden?: boolean; // If the user hide the course from the dashboard.
     completionusertracked?: boolean; // If the user is completion tracked.
     progress?: number | null; // Progress percentage.
 };
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index c4c8a8d00..c7150accd 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -1163,3 +1163,7 @@ iframe {
         display: none !important;
     }
 }
+
+ion-grid.core-no-grid > ion-row {
+    display: block;
+}
\ No newline at end of file

From 69584e361c1021c6893d88c36cd53baaed0708fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 8 Nov 2021 16:19:08 +0100
Subject: [PATCH 0221/1008] MOBILE-3806 myoverview: Add layout selector

---
 .../myoverview/addon-block-myoverview.html    |  35 +++--
 .../components/myoverview/myoverview.ts       | 139 ++++++++++++------
 src/addons/block/myoverview/lang.json         |   2 +
 3 files changed, 122 insertions(+), 54 deletions(-)

diff --git a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
index 884437ea6..422f1b3e7 100644
--- a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
+++ b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
@@ -4,20 +4,19 @@
     </ion-label>
     <div slot="end" class="flex-row">
         <!-- Download all courses. -->
-        <div *ngIf="downloadCoursesEnabled && downloadEnabled && filteredCourses.length > 1 && !showFilter"
-            class="core-button-spinner">
-            <ion-button *ngIf="!prefetchCoursesData[selectedFilter].loading" fill="clear" color="dark" (click)="prefetchCourses()"
+        <div *ngIf="downloadCoursesEnabled && downloadEnabled && filteredCourses.length > 1 && !showFilter" class="core-button-spinner">
+            <ion-button *ngIf="!prefetchCoursesData[timeSelectorFilter].loading" fill="clear" color="dark" (click)="prefetchCourses()"
                 [attr.aria-label]="'core.courses.downloadcourses' | translate">
-                <ion-icon [name]="prefetchCoursesData[selectedFilter].icon" slot="icon-only" aria-hidden="true">
+                <ion-icon [name]="prefetchCoursesData[timeSelectorFilter].icon" slot="icon-only" aria-hidden="true">
                 </ion-icon>
             </ion-button>
-            <ion-badge class="core-course-download-courses-progress" *ngIf="prefetchCoursesData[selectedFilter].badge"
-                role="progressbar" [attr.aria-valuemax]="prefetchCoursesData[selectedFilter].total"
-                [attr.aria-valuenow]="prefetchCoursesData[selectedFilter].count"
-                [attr.aria-valuetext]="prefetchCoursesData[selectedFilter].badgeA11yText">
-                {{prefetchCoursesData[selectedFilter].badge}}
+            <ion-badge class="core-course-download-courses-progress" *ngIf="prefetchCoursesData[timeSelectorFilter].badge"
+                role="progressbar" [attr.aria-valuemax]="prefetchCoursesData[timeSelectorFilter].total"
+                [attr.aria-valuenow]="prefetchCoursesData[timeSelectorFilter].count"
+                [attr.aria-valuetext]="prefetchCoursesData[timeSelectorFilter].badgeA11yText">
+                {{prefetchCoursesData[timeSelectorFilter].badge}}
             </ion-badge>
-            <ion-spinner *ngIf="prefetchCoursesData[selectedFilter].loading" [attr.aria-label]="'core.loading' | translate">
+            <ion-spinner *ngIf="prefetchCoursesData[timeSelectorFilter].loading" [attr.aria-label]="'core.loading' | translate">
             </ion-spinner>
         </div>
         <core-context-menu>
@@ -40,9 +39,9 @@
     </div>
 </ion-item-divider>
 <core-loading [hideUntil]="loaded" [fullscreen]="false">
-    <div class="safe-area-padding-horizontal" [hidden]="showFilter || !showSelectorFilter">
+    <div class="safe-area-padding-horizontal" [hidden]="showFilter || !showTimeSelectorFilter">
         <!-- "Time" selector. -->
-        <core-combobox [label]="'core.show' | translate" [selection]="selectedFilter" (onChange)="selectedChanged($event)">
+        <core-combobox [label]="'core.show' | translate" [selection]="timeSelectorFilter" (onChange)="timeSelectorChanged($event)">
             <ion-select-option class="ion-text-wrap" value="allincludinghidden" *ngIf="showFilters.allincludinghidden != 'hidden'">
                 {{ 'addon.block_myoverview.allincludinghidden' | translate }}
             </ion-select-option>
@@ -77,6 +76,16 @@
         </core-combobox>
     </div>
 
+    <div class="safe-area-padding-horizontal" [hidden]="showFilter || layouts.length <= 1">
+        <!-- "Layouts" selector. -->
+        <core-combobox [label]="'core.show' | translate" [selection]="selectedLayout" (onChange)="layoutChanged($event)">
+            <ng-container *ngFor="let layout of layouts">
+                <ion-select-option class="ion-text-wrap" [value]="layout">{{ 'addon.block_myoverview.'+layout | translate }}
+                </ion-select-option>
+            </ng-container>
+        </core-combobox>
+    </div>
+
     <!-- Filter courses. -->
     <ion-searchbar #searchbar *ngIf="showFilter" [(ngModel)]="courses.filter" (ionInput)="filterChanged($event)"
         (ionCancel)="filterChanged($event)" [placeholder]="'core.courses.filtermycourses' | translate">
@@ -88,7 +97,7 @@
 
     <!-- List of courses. -->
     <div class="safe-area-padding">
-        <ion-grid class="ion-no-padding">
+        <ion-grid class="ion-no-padding" [class.core-no-grid]="selectedLayout != 'card'">
             <ion-row class="ion-no-padding">
                 <ion-col *ngFor="let course of filteredCourses" class="ion-no-padding" size="12" size-sm="6" size-md="6" size-lg="4"
                     size-xl="3">
diff --git a/src/addons/block/myoverview/components/myoverview/myoverview.ts b/src/addons/block/myoverview/components/myoverview/myoverview.ts
index 1d71653d0..0f3cf060f 100644
--- a/src/addons/block/myoverview/components/myoverview/myoverview.ts
+++ b/src/addons/block/myoverview/components/myoverview/myoverview.ts
@@ -59,54 +59,54 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
         value: string;
     }[] = [];
 
-    selectedFilter = 'inprogress';
+    timeSelectorFilter = 'inprogress';
     sort = 'fullname';
     currentSite?: CoreSite;
     filteredCourses: CoreEnrolledCourseDataWithOptions[] = [];
-    prefetchCoursesData = {
-        all: <CorePrefetchStatusInfo> {
+    prefetchCoursesData: Record<string, CorePrefetchStatusInfo> = {
+        all: {
             icon: '',
             statusTranslatable: 'core.loading',
             status: '',
             loading: true,
         },
-        allincludinghidden: <CorePrefetchStatusInfo> {
+        allincludinghidden: {
             icon: '',
             statusTranslatable: 'core.loading',
             status: '',
             loading: true,
         },
-        inprogress: <CorePrefetchStatusInfo> {
+        inprogress: {
             icon: '',
             statusTranslatable: 'core.loading',
             status: '',
             loading: true,
         },
-        past: <CorePrefetchStatusInfo> {
+        past: {
             icon: '',
             statusTranslatable: 'core.loading',
             status: '',
             loading: true,
         },
-        future: <CorePrefetchStatusInfo> {
+        future: {
             icon: '',
             statusTranslatable: 'core.loading',
             status: '',
             loading: true,
         },
-        favourite: <CorePrefetchStatusInfo> {
+        favourite: {
             icon: '',
             statusTranslatable: 'core.loading',
             status: '',
             loading: true,
         },
-        hidden: <CorePrefetchStatusInfo> {
+        hidden: {
             icon: '',
             statusTranslatable: 'core.loading',
             status: '',
             loading: true,
         },
-        custom: <CorePrefetchStatusInfo> {
+        custom: {
             icon: '',
             statusTranslatable: '',
             status: '',
@@ -126,12 +126,15 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
     };
 
     showFilter = false;
-    showSelectorFilter = false;
+    showTimeSelectorFilter = false;
     showSortFilter = false;
     downloadCourseEnabled = false;
     downloadCoursesEnabled = false;
     showSortByShortName = false;
 
+    layouts: AddonBlockMyOverviewLayouts[] = [];
+    selectedLayout: AddonBlockMyOverviewLayouts = 'card';
+
     protected prefetchIconsInitialized = false;
     protected isDestroyed = false;
     protected coursesObserver?: CoreEventObserver;
@@ -169,21 +172,31 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
             CoreSites.getCurrentSiteId(),
         );
 
-        this.currentSite = CoreSites.getCurrentSite();
+        this.currentSite = CoreSites.getRequiredCurrentSite();
 
         const promises: Promise<void>[] = [];
-        if (this.currentSite) {
-            promises.push(this.currentSite.getLocalSiteConfig('AddonBlockMyOverviewSort', this.sort).then((value) => {
-                this.sort = value;
+        promises.push(this.currentSite.getLocalSiteConfig('AddonBlockMyOverviewSort', this.sort).then((value) => {
+            this.sort = value;
 
-                return;
-            }));
-            promises.push(this.currentSite.getLocalSiteConfig('AddonBlockMyOverviewFilter', this.selectedFilter).then((value) => {
-                this.selectedFilter = value;
+            return;
+        }));
+        promises.push(this.currentSite.getLocalSiteConfig(
+            'AddonBlockMyOverviewFilter',
+            this.timeSelectorFilter,
+        ).then((value) => {
+            this.timeSelectorFilter = value;
 
-                return;
-            }));
-        }
+            return;
+        }));
+
+        promises.push(this.currentSite.getLocalSiteConfig(
+            'AddonBlockMyOverviewLayout',
+            this.selectedLayout,
+        ).then((value) => {
+            this.selectedLayout = value;
+
+            return;
+        }));
 
         Promise.all(promises).finally(() => {
             super.ngOnInit();
@@ -229,6 +242,8 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
     protected async fetchContent(refresh?: boolean): Promise<void> {
         const config = this.block.configsRecord;
 
+        this.loadLayouts(config?.layouts?.value.split(','));
+
         const showCategories = config?.displaycategories?.value == '1';
 
         const courses = await CoreCoursesHelper.getUserCoursesWithOptions(this.sort, undefined, undefined, showCategories, {
@@ -280,23 +295,23 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
             this.courses.future.length === 0,
         );
 
-        this.showSelectorFilter = courses.length > 0 && (this.courses.past.length > 0 || this.courses.future.length > 0 ||
+        this.showTimeSelectorFilter = courses.length > 0 && (this.courses.past.length > 0 || this.courses.future.length > 0 ||
                 typeof courses[0].enddate != 'undefined');
 
         this.showFilters.hidden = this.getShowFilterValue(
-            this.showSelectorFilter && typeof courses[0].hidden != 'undefined' &&
+            this.showTimeSelectorFilter && typeof courses[0].hidden != 'undefined' &&
                 (!config || config.displaygroupinghidden?.value == '1'),
             this.courses.hidden.length === 0,
         );
 
         this.showFilters.favourite = this.getShowFilterValue(
-            this.showSelectorFilter && typeof courses[0].isfavourite != 'undefined' &&
+            this.showTimeSelectorFilter && typeof courses[0].isfavourite != 'undefined' &&
                 (!config || config.displaygroupingstarred?.value == '1' || config.displaygroupingfavourites?.value == '1'),
             this.courses.favourite.length === 0,
         );
 
         this.showFilters.custom = this.getShowFilterValue(
-            this.showSelectorFilter && config?.displaygroupingcustomfield?.value == '1' && !!config?.customfieldsexport?.value,
+            this.showTimeSelectorFilter && config?.displaygroupingcustomfield?.value == '1' && !!config?.customfieldsexport?.value,
             false,
         );
         if (this.showFilters.custom == 'show') {
@@ -305,25 +320,54 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
             this.customFilter = [];
         }
 
-        if (this.showSelectorFilter) {
+        if (this.showTimeSelectorFilter) {
             // Check if any selector is shown and not disabled.
-            this.showSelectorFilter = Object.keys(this.showFilters).some((key) => this.showFilters[key] == 'show');
+            this.showTimeSelectorFilter = Object.keys(this.showFilters).some((key) => this.showFilters[key] == 'show');
 
-            if (!this.showSelectorFilter) {
+            if (!this.showTimeSelectorFilter) {
                 // All filters disabled, display all the courses.
                 this.showFilters.all = 'show';
             }
         }
 
-        if (!this.showSelectorFilter) {
+        if (!this.showTimeSelectorFilter) {
             // No selector, display all the courses.
-            this.selectedFilter = 'all';
+            this.timeSelectorFilter = 'all';
         }
-        this.setCourseFilter(this.selectedFilter);
+        this.setCourseFilter(this.timeSelectorFilter);
 
         this.initPrefetchCoursesIcons();
     }
 
+    /**
+     * Load block layouts.
+     *
+     * @param layouts Config available layouts.
+     */
+    protected loadLayouts(layouts: string[] = []): void {
+        this.layouts = [];
+
+        layouts.forEach((layout) => {
+            if (layout == '') {
+                return;
+            }
+
+            const validLayout: AddonBlockMyOverviewLayouts = layout == 'summary' ? 'list' : layout as AddonBlockMyOverviewLayouts;
+            if (!this.layouts.includes(validLayout)) {
+                this.layouts.push(validLayout);
+            }
+        });
+
+        // If no layout is available use card.
+        if (this.layouts.length == 0) {
+            this.layouts = ['card'];
+        }
+
+        if (!this.layouts.includes(this.selectedLayout)) {
+            this.selectedLayout = this.layouts[0];
+        }
+    }
+
     /**
      * Helper function to help with filter values.
      *
@@ -417,7 +461,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
      * @return Promise resolved when done.
      */
     async prefetchCourses(): Promise<void> {
-        const selected = this.selectedFilter;
+        const selected = this.timeSelectorFilter;
         const initialIcon = this.prefetchCoursesData[selected].icon;
 
         try {
@@ -442,13 +486,14 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
     }
 
     /**
-     * The selected courses filter have changed.
+     * The layout have changed.
      *
-     * @param filter New filter
+     * @param layout New layout.
      */
-    selectedChanged(filter: string): void {
-        this.selectedFilter = filter;
-        this.setCourseFilter(this.selectedFilter);
+    layoutChanged(layout: AddonBlockMyOverviewLayouts): void {
+        this.selectedLayout = layout;
+
+        this.currentSite?.setLocalSiteConfig('AddonBlockMyOverviewLayout', layout);
     }
 
     /**
@@ -457,7 +502,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
      * @param filter Filter name to set.
      */
     protected async setCourseFilter(filter: string): Promise<void> {
-        this.selectedFilter = filter;
+        this.timeSelectorFilter = filter;
 
         if (this.showFilters.custom == 'show' && filter.startsWith('custom-') &&
             typeof this.customFilter[filter.substr(7)] != 'undefined') {
@@ -497,6 +542,16 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
         }
     }
 
+    /**
+     * The time selector courses filter have changed.
+     *
+     * @param filter New filter
+     */
+    timeSelectorChanged(filter: string): void {
+        this.timeSelectorFilter = filter;
+        this.setCourseFilter(this.timeSelectorFilter);
+    }
+
     /**
      * Init courses filters.
      *
@@ -556,7 +611,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
             }
         });
 
-        this.setCourseFilter(this.selectedFilter);
+        this.setCourseFilter(this.timeSelectorFilter);
     }
 
     /**
@@ -580,7 +635,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
         if (this.showFilter) {
             this.filteredCourses = this.courses.allincludinghidden;
         } else {
-            this.setCourseFilter(this.selectedFilter);
+            this.setCourseFilter(this.timeSelectorFilter);
         }
     }
 
@@ -614,3 +669,5 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
     }
 
 }
+
+type AddonBlockMyOverviewLayouts = 'card'|'list';
diff --git a/src/addons/block/myoverview/lang.json b/src/addons/block/myoverview/lang.json
index 7bca82636..19cbb6144 100644
--- a/src/addons/block/myoverview/lang.json
+++ b/src/addons/block/myoverview/lang.json
@@ -1,11 +1,13 @@
 {
     "all": "All (except removed from view)",
     "allincludinghidden": "All",
+    "card": "Card",
     "favourites": "Starred",
     "future": "Future",
     "hiddencourses": "Removed from view",
     "inprogress": "In progress",
     "lastaccessed": "Last accessed",
+    "list": "List",
     "nocourses": "No courses",
     "past": "Past",
     "pluginname": "Course overview",

From 8a04123132c95f03d206649fee912a4b79b3cfbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 8 Nov 2021 16:19:08 +0100
Subject: [PATCH 0222/1008] MOBILE-3806 my: Add myoverview to my courses page

---
 src/core/features/courses/courses.module.ts   |   2 +-
 src/core/features/courses/pages/my/my.html    |  32 +++++
 .../features/courses/pages/my/my.module.ts    |  63 ++++++++++
 src/core/features/courses/pages/my/my.scss    |   3 +
 src/core/features/courses/pages/my/my.ts      | 117 ++++++++++++++++++
 .../services/handlers/my-courses-mainmenu.ts  |  11 +-
 6 files changed, 225 insertions(+), 3 deletions(-)
 create mode 100644 src/core/features/courses/pages/my/my.html
 create mode 100644 src/core/features/courses/pages/my/my.module.ts
 create mode 100644 src/core/features/courses/pages/my/my.scss
 create mode 100644 src/core/features/courses/pages/my/my.ts

diff --git a/src/core/features/courses/courses.module.ts b/src/core/features/courses/courses.module.ts
index 925858cc0..f4f801622 100644
--- a/src/core/features/courses/courses.module.ts
+++ b/src/core/features/courses/courses.module.ts
@@ -60,7 +60,7 @@ const mainMenuHomeSiblingRoutes: Routes = [
 const mainMenuTabRoutes: Routes = [
     {
         path: CoreCoursesMyCoursesMainMenuHandlerService.PAGE_NAME,
-        loadChildren: () => import('./pages/list/list.module').then(m => m.CoreCoursesListPageModule),
+        loadChildren: () => import('./pages/my/my.module').then(m => m.CoreCoursesMyCoursesPageModule),
     },
 ];
 
diff --git a/src/core/features/courses/pages/my/my.html b/src/core/features/courses/pages/my/my.html
new file mode 100644
index 000000000..cd7224b05
--- /dev/null
+++ b/src/core/features/courses/pages/my/my.html
@@ -0,0 +1,32 @@
+<ion-header>
+    <ion-toolbar>
+        <ion-buttons slot="start">
+            <ion-back-button [text]="'core.back' | translate"></ion-back-button>
+        </ion-buttons>
+        <h1>{{ 'core.courses.mycourses' | translate }}</h1>
+        <ion-buttons slot="end">
+            <ion-button *ngIf="searchEnabled" (click)="openSearch()" [attr.aria-label]="'core.courses.searchcourses' | translate">
+                <ion-icon name="fas-search" slot="icon-only" aria-hidden="true"></ion-icon>
+            </ion-button>
+            <core-context-menu>
+                <core-context-menu-item *ngIf="(downloadCourseEnabled || downloadCoursesEnabled)" [priority]="1000"
+                    [content]="'core.settings.showdownloadoptions' | translate" (action)="toggleDownload()" iconAction="toggle"
+                    [(toggle)]="downloadEnabled"></core-context-menu-item>
+                <core-context-menu-item [priority]="500" [content]="'addon.storagemanager.managestorage' | translate"
+                    (action)="manageCoursesStorage()" iconAction="fas-archive"></core-context-menu-item>
+            </core-context-menu>
+            <core-user-menu-button></core-user-menu-button>
+        </ion-buttons>
+    </ion-toolbar>
+</ion-header>
+<ion-content>
+    <ion-refresher slot="fixed" (ionRefresh)="refresh($event.target)">
+        <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
+    </ion-refresher>
+    <ion-list>
+        <!-- My courses blocks. -->
+        <core-block [block]="{name: 'myoverview', visible: true}" contextLevel="user" [instanceId]="userId"
+            [extraData]="{'downloadEnabled': downloadEnabled}">
+        </core-block>
+    </ion-list>
+</ion-content>
diff --git a/src/core/features/courses/pages/my/my.module.ts b/src/core/features/courses/pages/my/my.module.ts
new file mode 100644
index 000000000..a86c67dff
--- /dev/null
+++ b/src/core/features/courses/pages/my/my.module.ts
@@ -0,0 +1,63 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { Injector, NgModule } from '@angular/core';
+import { RouterModule, ROUTES, Routes } from '@angular/router';
+
+import { CoreSharedModule } from '@/core/shared.module';
+import { CoreBlockComponentsModule } from '@features/block/components/components.module';
+
+import { CoreCoursesMyCoursesPage } from './my';
+import { CoreMainMenuComponentsModule } from '@features/mainmenu/components/components.module';
+import { buildTabMainRoutes } from '@features/mainmenu/mainmenu-tab-routing.module';
+
+function buildRoutes(injector: Injector): Routes {
+    return [
+        {
+            path: '',
+            component: CoreCoursesMyCoursesPage,
+        },
+        {
+            path: 'list',
+            loadChildren: () =>
+                import('../list/list.module')
+                    .then(m => m.CoreCoursesListPageModule),
+        },
+        ...buildTabMainRoutes(injector, {
+            redirectTo: '',
+            pathMatch: 'full',
+        }),
+    ];
+}
+
+@NgModule({
+    imports: [
+        CoreSharedModule,
+        CoreBlockComponentsModule,
+        CoreMainMenuComponentsModule,
+    ],
+    providers: [
+        {
+            provide: ROUTES,
+            multi: true,
+            deps: [Injector],
+            useFactory: buildRoutes,
+        },
+    ],
+    declarations: [
+        CoreCoursesMyCoursesPage,
+    ],
+    exports: [RouterModule],
+})
+export class CoreCoursesMyCoursesPageModule { }
diff --git a/src/core/features/courses/pages/my/my.scss b/src/core/features/courses/pages/my/my.scss
new file mode 100644
index 000000000..05e886016
--- /dev/null
+++ b/src/core/features/courses/pages/my/my.scss
@@ -0,0 +1,3 @@
+:host ::ng-deep ion-item-divider {
+    display: none !important;
+}
diff --git a/src/core/features/courses/pages/my/my.ts b/src/core/features/courses/pages/my/my.ts
new file mode 100644
index 000000000..09c02acad
--- /dev/null
+++ b/src/core/features/courses/pages/my/my.ts
@@ -0,0 +1,117 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { CoreBlockComponent } from '@features/block/components/block/block';
+import { IonRefresher } from '@ionic/angular';
+import { CoreNavigator } from '@services/navigator';
+import { CoreSites } from '@services/sites';
+import { CoreUtils } from '@services/utils/utils';
+import { CoreEventObserver, CoreEvents } from '@singletons/events';
+import { CoreCourses, CoreCoursesProvider } from '../../services/courses';
+
+/**
+ * Page that shows a my courses.
+ */
+@Component({
+    selector: 'page-core-courses-my',
+    templateUrl: 'my.html',
+    styleUrls: ['my.scss'],
+})
+export class CoreCoursesMyCoursesPage implements OnInit, OnDestroy {
+
+    @ViewChild(CoreBlockComponent) block!: CoreBlockComponent;
+
+    searchEnabled = false;
+    downloadEnabled = false;
+    downloadCourseEnabled = false;
+    downloadCoursesEnabled = false;
+    userId: number;
+
+    protected updateSiteObserver: CoreEventObserver;
+    protected downloadEnabledObserver: CoreEventObserver;
+
+    constructor() {
+        // Refresh the enabled flags if site is updated.
+        this.updateSiteObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, () => {
+            this.searchEnabled = !CoreCourses.isSearchCoursesDisabledInSite();
+            this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
+            this.downloadCoursesEnabled = !CoreCourses.isDownloadCoursesDisabledInSite();
+
+            this.downloadEnabled = (this.downloadCourseEnabled || this.downloadCoursesEnabled) && this.downloadEnabled;
+        }, CoreSites.getCurrentSiteId());
+
+        this.downloadEnabledObserver = CoreEvents.on(CoreCoursesProvider.EVENT_DASHBOARD_DOWNLOAD_ENABLED_CHANGED, (data) => {
+            this.downloadEnabled = (this.downloadCourseEnabled || this.downloadCoursesEnabled) && data.enabled;
+        });
+
+        this.userId = CoreSites.getCurrentSiteUserId();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    ngOnInit(): void {
+        this.searchEnabled = !CoreCourses.isSearchCoursesDisabledInSite();
+        this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
+        this.downloadCoursesEnabled = !CoreCourses.isDownloadCoursesDisabledInSite();
+
+        this.downloadEnabled =
+            (this.downloadCourseEnabled || this.downloadCoursesEnabled) && CoreCourses.getCourseDownloadOptionsEnabled();
+
+    }
+
+    /**
+     * Switch download enabled.
+     */
+    switchDownload(): void {
+        CoreCourses.setCourseDownloadOptionsEnabled(this.downloadEnabled);
+    }
+
+    /**
+     * Open page to manage courses storage.
+     */
+    manageCoursesStorage(): void {
+        CoreNavigator.navigateToSitePath('/storage');
+    }
+
+    /**
+     * Go to search courses.
+     */
+    async openSearch(): Promise<void> {
+        CoreNavigator.navigateToSitePath('/list', { params : { mode: 'search' } });
+    }
+
+    /**
+     * Refresh the data.
+     *
+     * @param refresher Refresher.
+     */
+    async refresh(refresher?: IonRefresher): Promise<void> {
+        if (this.block) {
+            await CoreUtils.ignoreErrors(this.block.doRefresh());
+        }
+
+        refresher?.complete();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    ngOnDestroy(): void {
+        this.updateSiteObserver?.off();
+        this.downloadEnabledObserver?.off();
+    }
+
+}
diff --git a/src/core/features/courses/services/handlers/my-courses-mainmenu.ts b/src/core/features/courses/services/handlers/my-courses-mainmenu.ts
index 8c2c51878..4d27add17 100644
--- a/src/core/features/courses/services/handlers/my-courses-mainmenu.ts
+++ b/src/core/features/courses/services/handlers/my-courses-mainmenu.ts
@@ -26,7 +26,7 @@ import { CoreDashboardHomeHandler } from './dashboard-home';
 @Injectable({ providedIn: 'root' })
 export class CoreCoursesMyCoursesMainMenuHandlerService implements CoreMainMenuHandler {
 
-    static readonly PAGE_NAME = 'courses';
+    static readonly PAGE_NAME = 'my';
 
     name = 'CoreCoursesMyCourses';
     priority = 900;
@@ -35,13 +35,20 @@ export class CoreCoursesMyCoursesMainMenuHandlerService implements CoreMainMenuH
      * @inheritdoc
      */
     async isEnabled(): Promise<boolean> {
-        const siteId = CoreSites.getCurrentSiteId();
+        const site = CoreSites.getRequiredCurrentSite();
+
+        const siteId = site.getId();
         const disabled = await CoreCourses.isMyCoursesDisabled(siteId);
 
         if (disabled) {
             return false;
         }
 
+        if (site.isVersionGreaterEqualThan('4.0')) {
+            return true;
+        }
+
+        // Dashboard cannot be disabled on 3.5 or 3.6 so it will never show this tab.
         const dashboardEnabled = await CoreDashboardHomeHandler.isEnabledForSite(siteId);
         const siteHomeEnabled = await CoreSiteHomeHomeHandler.isEnabledForSite(siteId);
 

From c24bb2e5cc9e638915b769259d6a0d18bf6cd06c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 8 Nov 2021 16:19:08 +0100
Subject: [PATCH 0223/1008] MOBILE-3806 myoverview: Renew filter interface

---
 scripts/langindex.json                        |   7 +-
 .../components/components.module.ts           |   2 +
 .../filteroptions/filteroptions.html          |  56 ++
 .../components/filteroptions/filteroptions.ts |  44 +
 .../myoverview/addon-block-myoverview.html    | 132 ++-
 .../components/myoverview/myoverview.ts       | 825 +++++++++---------
 src/addons/block/myoverview/lang.json         |   4 +-
 .../core-courses-course-list-item.html        |   4 +-
 src/core/lang.json                            |   1 +
 9 files changed, 587 insertions(+), 488 deletions(-)
 create mode 100644 src/addons/block/myoverview/components/filteroptions/filteroptions.html
 create mode 100644 src/addons/block/myoverview/components/filteroptions/filteroptions.ts

diff --git a/scripts/langindex.json b/scripts/langindex.json
index a8d9ddc2b..db1744aee 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -40,11 +40,13 @@
   "addon.block_learningplans.pluginname": "block_lp",
   "addon.block_myoverview.all": "block_myoverview",
   "addon.block_myoverview.allincludinghidden": "block_myoverview",
-  "addon.block_myoverview.favourites": "block_myoverview",
+  "addon.block_myoverview.aria:hiddencourses": "block_myoverview",
+  "addon.block_myoverview.card": "block_myoverview",
+  "addon.block_myoverview.favouritesonly": "local_moodlemobileapp",
   "addon.block_myoverview.future": "block_myoverview",
-  "addon.block_myoverview.hiddencourses": "block_myoverview",
   "addon.block_myoverview.inprogress": "block_myoverview",
   "addon.block_myoverview.lastaccessed": "block_myoverview",
+  "addon.block_myoverview.list": "block_myoverview",
   "addon.block_myoverview.nocourses": "block_myoverview",
   "addon.block_myoverview.past": "block_myoverview",
   "addon.block_myoverview.pluginname": "block_myoverview",
@@ -1400,6 +1402,7 @@
   "core.allparticipants": "moodle",
   "core.answer": "moodle",
   "core.answered": "quiz",
+  "core.applyfilters": "user",
   "core.areyousure": "moodle",
   "core.back": "moodle",
   "core.block.blocks": "moodle",
diff --git a/src/addons/block/myoverview/components/components.module.ts b/src/addons/block/myoverview/components/components.module.ts
index c1829bd61..49e53a2f4 100644
--- a/src/addons/block/myoverview/components/components.module.ts
+++ b/src/addons/block/myoverview/components/components.module.ts
@@ -17,10 +17,12 @@ import { NgModule } from '@angular/core';
 import { CoreSharedModule } from '@/core/shared.module';
 import { CoreCoursesComponentsModule } from '@features/courses/components/components.module';
 import { AddonBlockMyOverviewComponent } from './myoverview/myoverview';
+import { AddonBlockMyOverviewFilterOptionsComponent } from './filteroptions/filteroptions';
 
 @NgModule({
     declarations: [
         AddonBlockMyOverviewComponent,
+        AddonBlockMyOverviewFilterOptionsComponent,
     ],
     imports: [
         CoreSharedModule,
diff --git a/src/addons/block/myoverview/components/filteroptions/filteroptions.html b/src/addons/block/myoverview/components/filteroptions/filteroptions.html
new file mode 100644
index 000000000..414d1fbd4
--- /dev/null
+++ b/src/addons/block/myoverview/components/filteroptions/filteroptions.html
@@ -0,0 +1,56 @@
+<ion-header>
+    <ion-toolbar>
+        <h1>{{ 'core.courses.filtermycourses' | translate }}</h1>
+        <ion-buttons slot="end">
+            <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
+                <ion-icon name="fas-times" slot="icon-only" aria-hidden=true></ion-icon>
+            </ion-button>
+        </ion-buttons>
+    </ion-toolbar>
+</ion-header>
+<ion-content>
+    <ion-list>
+        <ion-radio-group [(ngModel)]="options.timeFilterSelected">
+            <ion-item class="ion-text-wrap" *ngIf="options.show.all">
+                <ion-label>{{'addon.block_myoverview.allincludinghidden' | translate}}</ion-label>
+                <ion-radio slot="end" value="all"></ion-radio>
+            </ion-item>
+            <ion-item class="ion-text-wrap" *ngIf="options.show.inprogress">
+                <ion-label>{{'addon.block_myoverview.inprogress' | translate}}</ion-label>
+                <ion-radio slot="end" value="inprogress"></ion-radio>
+            </ion-item>
+            <ion-item class="ion-text-wrap" *ngIf="options.show.future">
+                <ion-label>{{'addon.block_myoverview.future' | translate}}</ion-label>
+                <ion-radio slot="end" value="future"></ion-radio>
+            </ion-item>
+            <ion-item class="ion-text-wrap" *ngIf="options.show.past">
+                <ion-label>{{'addon.block_myoverview.past' | translate}}</ion-label>
+                <ion-radio slot="end" value="past"></ion-radio>
+            </ion-item>
+        </ion-radio-group>
+
+        <core-spacer *ngIf="options.show.custom"></core-spacer>
+        <ion-radio-group [(ngModel)]="options.customSelected" *ngIf="options.show.custom" allowEmptySelection="true">
+            <ion-item class="ion-text-wrap" *ngFor="let customOption of options.customFilters">
+                <ion-label>{{customOption.name}}</ion-label>
+                <ion-radio slot="end" [value]="customOption.value"></ion-radio>
+            </ion-item>
+        </ion-radio-group>
+
+        <core-spacer></core-spacer>
+        <ion-item *ngIf="options.show.favourite">
+            <ion-label>{{ 'addon.block_myoverview.favouritesonly' | translate }}</ion-label>
+            <ion-toggle [(ngModel)]="options.favouriteSelected"></ion-toggle>
+        </ion-item>
+
+        <ion-item *ngIf="options.show.hidden">
+            <ion-label>{{ 'addon.block_myoverview.aria:hiddencourses' | translate }}</ion-label>
+            <ion-toggle [(ngModel)]="options.hiddenSelected"></ion-toggle>
+        </ion-item>
+    </ion-list>
+</ion-content>
+<ion-footer class="ion-padding">
+    <ion-button (click)="apply()" expand="block" [attr.aria-label]="'core.applyfilters' | translate" class="ion-text-wrap">
+        {{ 'core.applyfilters' | translate }}
+    </ion-button>
+</ion-footer>
diff --git a/src/addons/block/myoverview/components/filteroptions/filteroptions.ts b/src/addons/block/myoverview/components/filteroptions/filteroptions.ts
new file mode 100644
index 000000000..93b9d753a
--- /dev/null
+++ b/src/addons/block/myoverview/components/filteroptions/filteroptions.ts
@@ -0,0 +1,44 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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, Input } from '@angular/core';
+import { ModalController } from '@singletons';
+import { AddonBlockMyOverviewFilterOptions } from '../myoverview/myoverview';
+
+/**
+ * Component to render a my overview filter options.
+ */
+@Component({
+    selector: 'addon-block-myoverview-filter-options',
+    templateUrl: 'filteroptions.html',
+})
+export class AddonBlockMyOverviewFilterOptionsComponent {
+
+    @Input() options!: AddonBlockMyOverviewFilterOptions;
+
+    /**
+     * Appl filters.
+     */
+    apply(): void {
+        ModalController.dismiss(this.options);
+    }
+
+    /**
+     * Close modal.
+     */
+    closeModal(): void {
+        ModalController.dismiss();
+    }
+
+}
diff --git a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
index 422f1b3e7..121ae723b 100644
--- a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
+++ b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
@@ -4,105 +4,81 @@
     </ion-label>
     <div slot="end" class="flex-row">
         <!-- Download all courses. -->
-        <div *ngIf="downloadCoursesEnabled && downloadEnabled && filteredCourses.length > 1 && !showFilter" class="core-button-spinner">
-            <ion-button *ngIf="!prefetchCoursesData[timeSelectorFilter].loading" fill="clear" color="dark" (click)="prefetchCourses()"
+        <div *ngIf="downloadCoursesEnabled && downloadEnabled && filteredCourses.length > 1" class="core-button-spinner">
+            <ion-button *ngIf="!prefetchCoursesData.loading" fill="clear" color="dark" (click)="prefetchCourses()"
                 [attr.aria-label]="'core.courses.downloadcourses' | translate">
-                <ion-icon [name]="prefetchCoursesData[timeSelectorFilter].icon" slot="icon-only" aria-hidden="true">
+                <ion-icon [name]="prefetchCoursesData.icon" slot="icon-only" aria-hidden="true">
                 </ion-icon>
             </ion-button>
-            <ion-badge class="core-course-download-courses-progress" *ngIf="prefetchCoursesData[timeSelectorFilter].badge"
-                role="progressbar" [attr.aria-valuemax]="prefetchCoursesData[timeSelectorFilter].total"
-                [attr.aria-valuenow]="prefetchCoursesData[timeSelectorFilter].count"
-                [attr.aria-valuetext]="prefetchCoursesData[timeSelectorFilter].badgeA11yText">
-                {{prefetchCoursesData[timeSelectorFilter].badge}}
+            <ion-badge class="core-course-download-courses-progress" *ngIf="prefetchCoursesData.badge" role="progressbar"
+                [attr.aria-valuemax]="prefetchCoursesData.total" [attr.aria-valuenow]="prefetchCoursesData.count"
+                [attr.aria-valuetext]="prefetchCoursesData.badgeA11yText">
+                {{prefetchCoursesData.badge}}
             </ion-badge>
-            <ion-spinner *ngIf="prefetchCoursesData[timeSelectorFilter].loading" [attr.aria-label]="'core.loading' | translate">
+            <ion-spinner *ngIf="prefetchCoursesData.loading" [attr.aria-label]="'core.loading' | translate">
             </ion-spinner>
         </div>
-        <core-context-menu>
-            <core-context-menu-item *ngIf="loaded && showFilterSwitchButton()" [priority]="1000"
-                [content]="'core.courses.filtermycourses' | translate" (action)="switchFilter()" iconAction="fas-filter"
-                (onClosed)="switchFilterClosed()"></core-context-menu-item>
-            <core-context-menu-item *ngIf="loaded && showSortFilter" [priority]="900"
-                content="{{('core.sortby' | translate) + ' ' + ('addon.block_myoverview.title' | translate)}}"
-                (action)="switchSort('fullname')" [iconAction]="sort == 'fullname' ? 'far-dot-circle' : 'far-circle'">
-            </core-context-menu-item>
-            <core-context-menu-item *ngIf="loaded && showSortFilter && showSortByShortName" [priority]="800"
-                content="{{('core.sortby' | translate) + ' ' + ('addon.block_myoverview.shortname' | translate)}}"
-                (action)="switchSort('shortname')" [iconAction]="sort == 'shortname' ? 'far-dot-circle' : 'far-circle'">
-            </core-context-menu-item>
-            <core-context-menu-item *ngIf="loaded && showSortFilter" [priority]="700"
-                content="{{('core.sortby' | translate) + ' ' + ('addon.block_myoverview.lastaccessed' | translate)}}"
-                (action)="switchSort('lastaccess')" [iconAction]="sort == 'lastaccess' ? 'far-dot-circle' : 'far-circle'">
-            </core-context-menu-item>
-        </core-context-menu>
     </div>
 </ion-item-divider>
 <core-loading [hideUntil]="loaded" [fullscreen]="false">
-    <div class="safe-area-padding-horizontal" [hidden]="showFilter || !showTimeSelectorFilter">
-        <!-- "Time" selector. -->
-        <core-combobox [label]="'core.show' | translate" [selection]="timeSelectorFilter" (onChange)="timeSelectorChanged($event)">
-            <ion-select-option class="ion-text-wrap" value="allincludinghidden" *ngIf="showFilters.allincludinghidden != 'hidden'">
-                {{ 'addon.block_myoverview.allincludinghidden' | translate }}
-            </ion-select-option>
-            <ion-select-option class="ion-text-wrap" value="all" *ngIf="showFilters.all != 'hidden'">
-                {{ 'addon.block_myoverview.all' | translate }}
-            </ion-select-option>
-            <ion-select-option class="ion-text-wrap" value="inprogress" *ngIf="showFilters.inprogress != 'hidden'"
-                [disabled]="showFilters.inprogress == 'disabled'">
-                {{ 'addon.block_myoverview.inprogress' | translate }}
-            </ion-select-option>
-            <ion-select-option class="ion-text-wrap" value="future" *ngIf="showFilters.future != 'hidden'"
-                [disabled]="showFilters.future == 'disabled'">
-                {{ 'addon.block_myoverview.future' | translate }}
-            </ion-select-option>
-            <ion-select-option class="ion-text-wrap" value="past" *ngIf="showFilters.past != 'hidden'"
-                [disabled]="showFilters.past == 'disabled'">
-                {{ 'addon.block_myoverview.past' | translate }}
-            </ion-select-option>
-            <ng-container *ngIf="showFilters.custom != 'hidden'">
-                <ng-container *ngFor="let customOption of customFilter; let index = index">
-                    <ion-select-option class="ion-text-wrap" value="custom-{{index}}">{{ customOption.name }}</ion-select-option>
-                </ng-container>
-            </ng-container>
-            <ion-select-option class="ion-text-wrap" value="favourite" *ngIf="showFilters.favourite != 'hidden'"
-                [disabled]="showFilters.favourite == 'disabled'">
-                {{ 'addon.block_myoverview.favourites' | translate }}
-            </ion-select-option>
-            <ion-select-option class="ion-text-wrap" value="hidden" *ngIf="showFilters.hidden != 'hidden'"
-                [disabled]="showFilters.hidden == 'disabled'">
-                {{ 'addon.block_myoverview.hiddencourses' | translate }}
-            </ion-select-option>
-        </core-combobox>
-    </div>
 
-    <div class="safe-area-padding-horizontal" [hidden]="showFilter || layouts.length <= 1">
-        <!-- "Layouts" selector. -->
-        <core-combobox [label]="'core.show' | translate" [selection]="selectedLayout" (onChange)="layoutChanged($event)">
-            <ng-container *ngFor="let layout of layouts">
-                <ion-select-option class="ion-text-wrap" [value]="layout">{{ 'addon.block_myoverview.'+layout | translate }}
+    <ion-row class="ion-no-padding ion-justify-content-between" *ngIf="hasCourses">
+        <ion-col size="auto" class="ion-no-padding" *ngIf="filters.enabled">
+            <core-combobox interface="modal" [label]="'core.courses.filtermycourses' | translate" (onChange)="filterOptionsChanged($event)"
+                icon="fas-filter" [badge]="filters.count" [modalOptions]="filterModalOptions">
+            </core-combobox>
+        </ion-col>
+        <ion-col class="ion-no-padding">
+            <!-- Filter courses. -->
+            <ion-searchbar class="ion-hide-md-down" [(ngModel)]="textFilter" (ionInput)="filterTextChanged($event.target)"
+                (ionCancel)="filterTextChanged($event.target)" [placeholder]="'core.filter' | translate">
+            </ion-searchbar>
+        </ion-col>
+        <ion-col size="auto" class="ion-no-padding" *ngIf="sort.enabled">
+            <core-combobox [label]="'core.sortby' | translate" [selection]="sort.selected" (onChange)="sortCourses($event)"
+                icon="fas-sort-amount-down-alt">
+                <ion-select-option class="ion-text-wrap" value="fullname">
+                    {{'addon.block_myoverview.title' | translate}}
                 </ion-select-option>
-            </ng-container>
-        </core-combobox>
-    </div>
-
-    <!-- Filter courses. -->
-    <ion-searchbar #searchbar *ngIf="showFilter" [(ngModel)]="courses.filter" (ionInput)="filterChanged($event)"
-        (ionCancel)="filterChanged($event)" [placeholder]="'core.courses.filtermycourses' | translate">
-    </ion-searchbar>
+                <ion-select-option class="ion-text-wrap" value="shortname" *ngIf="sort.shortnameEnabled">
+                    {{'addon.block_myoverview.shortname' | translate}}
+                </ion-select-option>
+                <ion-select-option class="ion-text-wrap" value="lastaccess">
+                    {{'addon.block_myoverview.lastaccessed' | translate}}
+                </ion-select-option>
+            </core-combobox>
+        </ion-col>
+        <ion-col size="auto" class="ion-no-padding" *ngIf="layouts.options.length > 1">
+            <!-- "Layouts" selector. -->
+            <core-combobox [label]="'core.show' | translate" [selection]="layouts.selected" (onChange)="saveLayout($event)" icon="fas-th">
+                <ng-container *ngFor="let layout of layouts.options">
+                    <ion-select-option class="ion-text-wrap" [value]="layout">{{ 'addon.block_myoverview.'+layout | translate }}
+                    </ion-select-option>
+                </ng-container>
+            </core-combobox>
+        </ion-col>
+    </ion-row>
+    <ion-row class="ion-no-padding ion-hide-md-up" *ngIf="hasCourses">
+        <ion-col class="ion-no-padding">
+            <!-- Filter courses. -->
+            <ion-searchbar [(ngModel)]="textFilter" (ionInput)="filterTextChanged($event.target)"
+                (ionCancel)="filterTextChanged($event.target)" [placeholder]="'core.filter' | translate">
+            </ion-searchbar>
+        </ion-col>
+    </ion-row>
 
     <core-empty-box *ngIf="filteredCourses.length == 0" image="assets/img/icons/courses.svg"
         [message]="'addon.block_myoverview.nocourses' | translate" inline="true">
     </core-empty-box>
 
     <!-- List of courses. -->
-    <div class="safe-area-padding">
-        <ion-grid class="ion-no-padding" [class.core-no-grid]="selectedLayout != 'card'">
+    <div class="safe-area-padding" *ngIf="hasCourses">
+        <ion-grid class="ion-no-padding" [class.core-no-grid]="layouts.selected != 'card'">
             <ion-row class="ion-no-padding">
                 <ion-col *ngFor="let course of filteredCourses" class="ion-no-padding" size="12" size-sm="6" size-md="6" size-lg="4"
                     size-xl="3">
                     <core-courses-course-list-item [course]="course" class="core-courseoverview"
-                        [showDownload]="downloadCourseEnabled && downloadEnabled" [layout]="selectedLayout">
+                        [showDownload]="downloadCourseEnabled && downloadEnabled" [layout]="layouts.selected">
                     </core-courses-course-list-item>
                 </ion-col>
             </ion-row>
diff --git a/src/addons/block/myoverview/components/myoverview/myoverview.ts b/src/addons/block/myoverview/components/myoverview/myoverview.ts
index 0f3cf060f..a3970be95 100644
--- a/src/addons/block/myoverview/components/myoverview/myoverview.ts
+++ b/src/addons/block/myoverview/components/myoverview/myoverview.ts
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, OnInit, Input, OnDestroy, ViewChild, OnChanges, SimpleChange } from '@angular/core';
-import { IonSearchbar } from '@ionic/angular';
+import { Component, OnInit, Input, OnDestroy, OnChanges, SimpleChange } from '@angular/core';
+import { ModalOptions } from '@ionic/core';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreTimeUtils } from '@services/utils/time';
 import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
@@ -27,8 +27,10 @@ import { CoreUtils } from '@services/utils/utils';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTextUtils } from '@services/utils/text';
 import { AddonCourseCompletion } from '@/addons/coursecompletion/services/coursecompletion';
+import { AddonBlockMyOverviewFilterOptionsComponent } from '../filteroptions/filteroptions';
+import { IonSearchbar } from '@ionic/angular';
 
-const FILTER_PRIORITY = ['all', 'allincludinghidden', 'inprogress', 'future', 'past', 'favourite', 'hidden', 'custom'];
+const FILTER_PRIORITY: AddonBlockMyOverviewTimeFilters[] = ['all', 'inprogress', 'future', 'past'];
 
 /**
  * Component to render a my overview block.
@@ -39,107 +41,62 @@ const FILTER_PRIORITY = ['all', 'allincludinghidden', 'inprogress', 'future', 'p
 })
 export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implements OnInit, OnChanges, OnDestroy {
 
-    @ViewChild('searchbar') searchbar?: IonSearchbar;
     @Input() downloadEnabled = false;
 
-    courses = {
-        filter: '',
-        all: <CoreEnrolledCourseDataWithOptions[]> [],
-        allincludinghidden: <CoreEnrolledCourseDataWithOptions[]> [],
-        past: <CoreEnrolledCourseDataWithOptions[]> [],
-        inprogress: <CoreEnrolledCourseDataWithOptions[]> [],
-        future: <CoreEnrolledCourseDataWithOptions[]> [],
-        favourite: <CoreEnrolledCourseDataWithOptions[]> [],
-        hidden: <CoreEnrolledCourseDataWithOptions[]> [],
-        custom: <CoreEnrolledCourseDataWithOptions[]> [], // Leave it empty to avoid download all those courses.
-    };
-
-    customFilter: {
-        name: string;
-        value: string;
-    }[] = [];
-
-    timeSelectorFilter = 'inprogress';
-    sort = 'fullname';
-    currentSite?: CoreSite;
     filteredCourses: CoreEnrolledCourseDataWithOptions[] = [];
-    prefetchCoursesData: Record<string, CorePrefetchStatusInfo> = {
-        all: {
-            icon: '',
-            statusTranslatable: 'core.loading',
-            status: '',
-            loading: true,
-        },
-        allincludinghidden: {
-            icon: '',
-            statusTranslatable: 'core.loading',
-            status: '',
-            loading: true,
-        },
-        inprogress: {
-            icon: '',
-            statusTranslatable: 'core.loading',
-            status: '',
-            loading: true,
-        },
-        past: {
-            icon: '',
-            statusTranslatable: 'core.loading',
-            status: '',
-            loading: true,
-        },
-        future: {
-            icon: '',
-            statusTranslatable: 'core.loading',
-            status: '',
-            loading: true,
-        },
-        favourite: {
-            icon: '',
-            statusTranslatable: 'core.loading',
-            status: '',
-            loading: true,
-        },
-        hidden: {
-            icon: '',
-            statusTranslatable: 'core.loading',
-            status: '',
-            loading: true,
-        },
-        custom: {
-            icon: '',
-            statusTranslatable: '',
-            status: '',
-            loading: false,
-        }, // Leave it empty to avoid download all those courses.
+
+    prefetchCoursesData: CorePrefetchStatusInfo = {
+        icon: '',
+        statusTranslatable: 'core.loading',
+        status: '',
+        loading: true,
     };
 
-    showFilters = { // Options are show, disabled, hidden.
-        all: 'show',
-        allincludinghidden: 'show',
-        past: 'show',
-        inprogress: 'show',
-        future: 'show',
-        favourite: 'show',
-        hidden: 'show',
-        custom: 'hidden',
-    };
-
-    showFilter = false;
-    showTimeSelectorFilter = false;
-    showSortFilter = false;
     downloadCourseEnabled = false;
     downloadCoursesEnabled = false;
-    showSortByShortName = false;
 
-    layouts: AddonBlockMyOverviewLayouts[] = [];
-    selectedLayout: AddonBlockMyOverviewLayouts = 'card';
+    filters: AddonBlockMyOverviewFilterOptions = {
+        enabled: false,
+        show: { // Options are visible, disabled, hidden.
+            all: true,
+            past: true,
+            inprogress: true,
+            future: true,
+            favourite: true,
+            hidden: true,
+            custom: false,
+        },
+        timeFilterSelected: 'inprogress',
+        favouriteSelected: false,
+        hiddenSelected: false,
+        customFilters: [],
+        count: 0,
+    };
 
+    filterModalOptions: ModalOptions = {
+        component: AddonBlockMyOverviewFilterOptionsComponent,
+    };
+
+    layouts: AddonBlockMyOverviewLayoutOptions = {
+        options: [],
+        selected: 'card',
+    };
+
+    sort: AddonBlockMyOverviewSortOptions = {
+        shortnameEnabled: false,
+        selected: 'fullname',
+        enabled: false,
+    };
+
+    textFilter = '';
+    hasCourses = false;
+
+    protected currentSite!: CoreSite;
+    protected allCourses: CoreEnrolledCourseDataWithOptions[] = [];
     protected prefetchIconsInitialized = false;
     protected isDestroyed = false;
     protected coursesObserver?: CoreEventObserver;
     protected updateSiteObserver?: CoreEventObserver;
-    protected courseIds: number[] = [];
     protected fetchContentDefaultError = 'Error getting my overview data.';
 
     constructor() {
@@ -147,7 +104,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
     }
 
     /**
-     * Component being initialized.
+     * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
         // Refresh the enabled flags if enabled.
@@ -164,10 +121,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
         this.coursesObserver = CoreEvents.on(
             CoreCoursesProvider.EVENT_MY_COURSES_UPDATED,
             (data) => {
-
-                if (this.shouldRefreshOnUpdatedEvent(data)) {
-                    this.refreshCourseList();
-                }
+                this.refreshCourseList(data);
             },
             CoreSites.getCurrentSiteId(),
         );
@@ -175,25 +129,62 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
         this.currentSite = CoreSites.getRequiredCurrentSite();
 
         const promises: Promise<void>[] = [];
-        promises.push(this.currentSite.getLocalSiteConfig('AddonBlockMyOverviewSort', this.sort).then((value) => {
-            this.sort = value;
 
-            return;
-        }));
         promises.push(this.currentSite.getLocalSiteConfig(
-            'AddonBlockMyOverviewFilter',
-            this.timeSelectorFilter,
+            'AddonBlockMyOverviewSort',
+            this.sort.selected,
         ).then((value) => {
-            this.timeSelectorFilter = value;
+            this.sort.selected = value;
 
             return;
         }));
 
         promises.push(this.currentSite.getLocalSiteConfig(
             'AddonBlockMyOverviewLayout',
-            this.selectedLayout,
+            this.layouts.selected,
         ).then((value) => {
-            this.selectedLayout = value;
+            this.layouts.selected = value;
+
+            return;
+        }));
+
+        // Wait for the migration.
+        await this.currentSite.getLocalSiteConfig<string>(
+            'AddonBlockMyOverviewFilter',
+            this.filters.timeFilterSelected,
+        ).then(async (value) => {
+            if (FILTER_PRIORITY.includes(value as AddonBlockMyOverviewTimeFilters)) {
+                this.filters.timeFilterSelected = value as AddonBlockMyOverviewTimeFilters;
+
+                return;
+            }
+
+            // Migrate setting.
+            this.filters.hiddenSelected = value == 'allincludinghidden' || value == 'hidden';
+
+            if (value == 'favourite') {
+                this.filters.favouriteSelected = true;
+            } else {
+                this.filters.favouriteSelected = false;
+            }
+
+            return await this.saveFilters('all');
+        });
+
+        promises.push(this.currentSite.getLocalSiteConfig(
+            'AddonBlockMyOverviewFavouriteFilter',
+            this.filters.favouriteSelected ? 1 : 0,
+        ).then((value) => {
+            this.filters.favouriteSelected = value == 1;
+
+            return;
+        }));
+
+        promises.push(this.currentSite.getLocalSiteConfig(
+            'AddonBlockMyOverviewHiddenFilter',
+            this.filters.hiddenSelected ? 1 : 0,
+        ).then((value) => {
+            this.filters.hiddenSelected = value == 1;
 
             return;
         }));
@@ -204,7 +195,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
     }
 
     /**
-     * Detect changes on input properties.
+     * @inheritdoc
      */
     ngOnChanges(changes: {[name: string]: SimpleChange}): void {
         if (changes.downloadEnabled && !changes.downloadEnabled.previousValue && this.downloadEnabled && this.loaded) {
@@ -214,21 +205,35 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
     }
 
     /**
-     * Perform the invalidate content function.
-     *
-     * @return Resolved when done.
+     * @inheritdoc
      */
     protected async invalidateContent(): Promise<void> {
+        const courseIds = this.allCourses.map((course) => course.id);
+
+        await this.invalidateCourses(courseIds);
+    }
+
+    /**
+     * Helper function to invalidate only selected courses.
+     *
+     * @param courseIds Course Id array.
+     * @return Promise resolved when done.
+     */
+    protected async invalidateCourses(courseIds: number[]): Promise<void> {
         const promises: Promise<void>[] = [];
 
         // Invalidate course completion data.
         promises.push(CoreCourses.invalidateUserCourses().finally(() =>
-            CoreUtils.allPromises(this.courseIds.map((courseId) =>
+            CoreUtils.allPromises(courseIds.map((courseId) =>
                 AddonCourseCompletion.invalidateCourseCompletion(courseId)))));
 
-        promises.push(CoreCourseOptionsDelegate.clearAndInvalidateCoursesOptions());
-        if (this.courseIds.length > 0) {
-            promises.push(CoreCourses.invalidateCoursesByField('ids', this.courseIds.join(',')));
+        if (courseIds.length  == 1) {
+            promises.push(CoreCourseOptionsDelegate.clearAndInvalidateCoursesOptions(courseIds[0]));
+        } else {
+            promises.push(CoreCourseOptionsDelegate.clearAndInvalidateCoursesOptions());
+        }
+        if (courseIds.length > 0) {
+            promises.push(CoreCourses.invalidateCoursesByField('ids', courseIds.join(',')));
         }
 
         await CoreUtils.allPromises(promises).finally(() => {
@@ -242,101 +247,88 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
     protected async fetchContent(refresh?: boolean): Promise<void> {
         const config = this.block.configsRecord;
 
-        this.loadLayouts(config?.layouts?.value.split(','));
-
         const showCategories = config?.displaycategories?.value == '1';
 
-        const courses = await CoreCoursesHelper.getUserCoursesWithOptions(this.sort, undefined, undefined, showCategories, {
-            readingStrategy: refresh ? CoreSitesReadingStrategy.PREFER_NETWORK : undefined,
-        });
+        this.allCourses = await CoreCoursesHelper.getUserCoursesWithOptions(
+            this.sort.selected,
+            undefined,
+            undefined,
+            showCategories,
+            {
+                readingStrategy: refresh ? CoreSitesReadingStrategy.PREFER_NETWORK : undefined,
+            },
+        );
+
+        this.hasCourses = this.allCourses.length > 0;
+
+        this.loadSort();
+        this.loadLayouts(config?.layouts?.value.split(','));
+        this.loadFilters(config);
+    }
+
+    /**
+     * Load sort.
+     */
+    protected loadSort(): void {
+        const sampleCourse = this.allCourses[0];
 
         // Check to show sort by short name only if the text is visible.
-        if (courses.length > 0) {
-            const sampleCourse = courses[0];
-            this.showSortByShortName = !!sampleCourse.displayname && !!sampleCourse.shortname &&
-                sampleCourse.fullname != sampleCourse.displayname;
-        }
+        this.sort.shortnameEnabled = !!sampleCourse?.displayname && !!sampleCourse?.shortname &&
+            sampleCourse?.fullname != sampleCourse?.displayname;
 
         // Rollback to sort by full name if user is sorting by short name then Moodle web change the config.
-        if (!this.showSortByShortName && this.sort === 'shortname') {
-            this.switchSort('fullname');
+        if (!this.sort.shortnameEnabled && this.sort.selected === 'shortname') {
+            this.saveSort('fullname');
         }
 
-        this.courseIds = courses.map((course) => course.id);
+        this.sort.enabled = sampleCourse?.lastaccess !== undefined;
+    }
 
-        this.showSortFilter = courses.length > 0 && typeof courses[0].lastaccess != 'undefined';
+    /**
+     * Load filters.
+     *
+     * @param config Block configuration.
+     */
+    protected loadFilters(
+        config?: Record<string, { name: string; value: string; type: string }>,
+    ): void {
+        this.textFilter = '';
 
-        this.initCourseFilters(courses);
+        const sampleCourse = this.allCourses[0];
 
-        this.courses.filter = '';
-        this.showFilter = false;
+        // Do not show hidden if config it's not present (before 3.8) but if hidden is enabled.
+        this.filters.show.hidden =
+            config?.displaygroupingallincludinghidden?.value == '1' ||
+            sampleCourse.hidden !== undefined && (!config || config.displaygroupinghidden?.value == '1');
 
-        this.showFilters.all = this.getShowFilterValue(
-            !config || config.displaygroupingall?.value == '1',
-            this.courses.all.length === 0,
-        );
-        // Do not show allincludinghiddenif config it's not present (before 3.8).
-        this.showFilters.allincludinghidden =
-            this.getShowFilterValue(
-                config?.displaygroupingallincludinghidden?.value == '1',
-                this.courses.allincludinghidden.length === 0,
-            );
+        this.filters.show.all =  !config || config.displaygroupingall?.value == '1';
+        this.filters.show.inprogress = !config || config.displaygroupinginprogress?.value == '1';
+        this.filters.show.past = !config || config.displaygroupingpast?.value == '1';
+        this.filters.show.future = !config || config.displaygroupingfuture?.value == '1';
 
-        this.showFilters.inprogress = this.getShowFilterValue(
-            !config || config.displaygroupinginprogress?.value == '1',
-            this.courses.inprogress.length === 0,
-        );
-        this.showFilters.past = this.getShowFilterValue(
-            !config || config.displaygroupingpast?.value == '1',
-            this.courses.past.length === 0,
-        );
-        this.showFilters.future = this.getShowFilterValue(
-            !config || config.displaygroupingfuture?.value == '1',
-            this.courses.future.length === 0,
-        );
+        this.filters.show.favourite = sampleCourse.isfavourite !== undefined &&
+            (!config || config.displaygroupingstarred?.value == '1' || config.displaygroupingfavourites?.value == '1');
 
-        this.showTimeSelectorFilter = courses.length > 0 && (this.courses.past.length > 0 || this.courses.future.length > 0 ||
-                typeof courses[0].enddate != 'undefined');
+        this.filters.show.custom = config?.displaygroupingcustomfield?.value == '1' && !!config?.customfieldsexport?.value;
 
-        this.showFilters.hidden = this.getShowFilterValue(
-            this.showTimeSelectorFilter && typeof courses[0].hidden != 'undefined' &&
-                (!config || config.displaygroupinghidden?.value == '1'),
-            this.courses.hidden.length === 0,
-        );
+        this.filters.customFilters = this.filters.show.custom
+            ? CoreTextUtils.parseJSON(config?.customfieldsexport?.value || '[]', [])
+            : [];
 
-        this.showFilters.favourite = this.getShowFilterValue(
-            this.showTimeSelectorFilter && typeof courses[0].isfavourite != 'undefined' &&
-                (!config || config.displaygroupingstarred?.value == '1' || config.displaygroupingfavourites?.value == '1'),
-            this.courses.favourite.length === 0,
-        );
+        // Check if any selector is shown and not disabled.
+        this.filters.enabled = Object.keys(this.filters.show).some((key) => this.filters.show[key]);
 
-        this.showFilters.custom = this.getShowFilterValue(
-            this.showTimeSelectorFilter && config?.displaygroupingcustomfield?.value == '1' && !!config?.customfieldsexport?.value,
-            false,
-        );
-        if (this.showFilters.custom == 'show') {
-            this.customFilter = CoreTextUtils.parseJSON(config?.customfieldsexport?.value || '[]', []);
-        } else {
-            this.customFilter = [];
+        if (!this.filters.enabled) {
+            // All filters disabled, display all the courses.
+            this.filters.show.all = true;
+            this.saveFilters('all');
         }
 
-        if (this.showTimeSelectorFilter) {
-            // Check if any selector is shown and not disabled.
-            this.showTimeSelectorFilter = Object.keys(this.showFilters).some((key) => this.showFilters[key] == 'show');
+        this.filterModalOptions.componentProps = {
+            options: Object.assign({}, this.filters),
+        };
 
-            if (!this.showTimeSelectorFilter) {
-                // All filters disabled, display all the courses.
-                this.showFilters.all = 'show';
-            }
-        }
-
-        if (!this.showTimeSelectorFilter) {
-            // No selector, display all the courses.
-            this.timeSelectorFilter = 'all';
-        }
-        this.setCourseFilter(this.timeSelectorFilter);
-
-        this.initPrefetchCoursesIcons();
+        this.filterCourses();
     }
 
     /**
@@ -344,8 +336,14 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
      *
      * @param layouts Config available layouts.
      */
-    protected loadLayouts(layouts: string[] = []): void {
-        this.layouts = [];
+    protected loadLayouts(layouts?: string[]): void {
+        this.layouts.options = [];
+
+        if (layouts === undefined) {
+            this.layouts.options = ['card', 'list'];
+
+            return;
+        }
 
         layouts.forEach((layout) => {
             if (layout == '') {
@@ -353,95 +351,71 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
             }
 
             const validLayout: AddonBlockMyOverviewLayouts = layout == 'summary' ? 'list' : layout as AddonBlockMyOverviewLayouts;
-            if (!this.layouts.includes(validLayout)) {
-                this.layouts.push(validLayout);
+            if (!this.layouts.options.includes(validLayout)) {
+                this.layouts.options.push(validLayout);
             }
         });
 
         // If no layout is available use card.
-        if (this.layouts.length == 0) {
-            this.layouts = ['card'];
+        if (this.layouts.options.length == 0) {
+            this.layouts.options = ['card'];
         }
 
-        if (!this.layouts.includes(this.selectedLayout)) {
-            this.selectedLayout = this.layouts[0];
+        if (!this.layouts.options.includes(this.layouts.selected)) {
+            this.layouts.selected = this.layouts.options[0];
         }
     }
 
     /**
-     * Helper function to help with filter values.
-     *
-     * @param showCondition     If true, filter will be shown.
-     * @param disabledCondition If true, and showCondition is also met, it will be shown as disabled.
-     * @return                   show / disabled / hidden value.
-     */
-    protected getShowFilterValue(showCondition: boolean, disabledCondition: boolean): string {
-        return showCondition ? (disabledCondition ? 'disabled' : 'show') : 'hidden';
-    }
-
-    /**
-     * Whether list should be refreshed based on a EVENT_MY_COURSES_UPDATED event.
+     * Refresh course list based on a EVENT_MY_COURSES_UPDATED event.
      *
      * @param data Event data.
-     * @return Whether to refresh.
+     * @return Promise resolved when done.
      */
-    protected shouldRefreshOnUpdatedEvent(data: CoreCoursesMyCoursesUpdatedEventData): boolean {
+    protected async refreshCourseList(data: CoreCoursesMyCoursesUpdatedEventData): Promise<void> {
         if (data.action == CoreCoursesProvider.ACTION_ENROL) {
             // Always update if user enrolled in a course.
-            return true;
+            return await this.refreshContent();
         }
 
+        const course = this.allCourses.find((course) => course.id == data.courseId);
         if (data.action == CoreCoursesProvider.ACTION_STATE_CHANGED) {
-            // Update list when course state changes (favourite, hidden).
-            return true;
+            if (!course) {
+                // Not found, use WS update.
+                return await this.refreshContent();
+            }
+
+            if (data.state == CoreCoursesProvider.STATE_FAVOURITE) {
+                course.isfavourite = !!data.value;
+            }
+
+            if (data.state == CoreCoursesProvider.STATE_HIDDEN) {
+                course.hidden = !!data.value;
+            }
+
+            await this.invalidateCourses([course.id]);
+            await this.filterCourses();
         }
 
         if (data.action == CoreCoursesProvider.ACTION_VIEW && data.courseId != CoreSites.getCurrentSiteHomeId()) {
-            // User viewed a course. If it isn't the most recent accessed course, update the list.
-            let recentAccessedCourse: CoreEnrolledCourseDataWithOptions | undefined;
-            if (this.sort == 'lastaccess') {
-                recentAccessedCourse = this.courses.allincludinghidden[0];
-            } else {
-                recentAccessedCourse = Array.from(this.courses.allincludinghidden)
-                    .sort((a, b) => (b.lastaccess || 0) - (a.lastaccess || 0))[0];
+            if (!course) {
+                // Not found, use WS update.
+                return await this.refreshContent();
             }
 
-            if (recentAccessedCourse && data.courseId != recentAccessedCourse.id) {
-                return true;
-            }
-        }
+            course.lastaccess = CoreTimeUtils.timestamp();
 
-        return false;
-    }
-
-    /**
-     * The filter has changed.
-     *
-     * @param Received Event.
-     */
-    filterChanged(event: Event): void {
-        const target = <HTMLInputElement>event?.target || null;
-
-        const newValue = target?.value.trim().toLowerCase();
-        if (!newValue || this.courses.allincludinghidden.length <= 0) {
-            this.filteredCourses = this.courses.allincludinghidden;
-        } else {
-            // Use displayname if available, or fullname if not.
-            if (this.courses.allincludinghidden.length > 0 &&
-                    typeof this.courses.allincludinghidden[0].displayname != 'undefined') {
-                this.filteredCourses = this.courses.allincludinghidden.filter((course) =>
-                    course.displayname && course.displayname.toLowerCase().indexOf(newValue) > -1);
-            } else {
-                this.filteredCourses = this.courses.allincludinghidden.filter((course) =>
-                    course.fullname.toLowerCase().indexOf(newValue) > -1);
-            }
+            await this.invalidateCourses([course.id]);
+            await this.filterCourses();
         }
     }
 
     /**
      * Initialize the prefetch icon for selected courses.
+     *
+     * @return Promise resolved when done.
      */
-    protected initPrefetchCoursesIcons(): void {
+    protected async initPrefetchCoursesIcons(): Promise<void> {
         if (this.prefetchIconsInitialized || !this.downloadEnabled) {
             // Already initialized.
             return;
@@ -449,10 +423,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
 
         this.prefetchIconsInitialized = true;
 
-        Object.keys(this.prefetchCoursesData).forEach(async (filter) => {
-            this.prefetchCoursesData[filter] =
-                await CoreCourseHelper.initPrefetchCoursesIcons(this.courses[filter], this.prefetchCoursesData[filter]);
-        });
+        this.prefetchCoursesData = await CoreCourseHelper.initPrefetchCoursesIcons(this.filteredCourses, this.prefetchCoursesData);
     }
 
     /**
@@ -461,206 +432,218 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
      * @return Promise resolved when done.
      */
     async prefetchCourses(): Promise<void> {
-        const selected = this.timeSelectorFilter;
-        const initialIcon = this.prefetchCoursesData[selected].icon;
+        const initialIcon = this.prefetchCoursesData.icon;
 
         try {
-            await CoreCourseHelper.prefetchCourses(this.courses[selected], this.prefetchCoursesData[selected]);
+            await CoreCourseHelper.prefetchCourses(this.filteredCourses, this.prefetchCoursesData);
         } catch (error) {
             if (!this.isDestroyed) {
                 CoreDomUtils.showErrorModalDefault(error, 'core.course.errordownloadingcourse', true);
-                this.prefetchCoursesData[selected].icon = initialIcon;
+                this.prefetchCoursesData.icon = initialIcon;
             }
         }
     }
 
     /**
-     * Refresh the list of courses.
+     * Text filter changed.
      *
-     * @return Promise resolved when done.
+     * @param target Searchbar element.
      */
-    protected async refreshCourseList(): Promise<void> {
-        CoreEvents.trigger(CoreCoursesProvider.EVENT_MY_COURSES_REFRESHED);
+    filterTextChanged(target: IonSearchbar): void {
+        this.textFilter = target.value || '';
 
-        await this.loadContent(true);
-    }
-
-    /**
-     * The layout have changed.
-     *
-     * @param layout New layout.
-     */
-    layoutChanged(layout: AddonBlockMyOverviewLayouts): void {
-        this.selectedLayout = layout;
-
-        this.currentSite?.setLocalSiteConfig('AddonBlockMyOverviewLayout', layout);
+        this.filterCourses();
     }
 
     /**
      * Set selected courses filter.
-     *
-     * @param filter Filter name to set.
      */
-    protected async setCourseFilter(filter: string): Promise<void> {
-        this.timeSelectorFilter = filter;
+    protected async filterCourses(): Promise<void> {
+        this.filters.count = 0;
 
-        if (this.showFilters.custom == 'show' && filter.startsWith('custom-') &&
-            typeof this.customFilter[filter.substr(7)] != 'undefined') {
+        let timeFilter = this.filters.timeFilterSelected;
 
-            const filterName = this.block.configsRecord!.customfiltergrouping.value;
-            const filterValue = this.customFilter[filter.substr(7)].value;
+        // Filter is not active, take the first active or all.
+        if (!this.filters.show[timeFilter]) {
+            timeFilter = FILTER_PRIORITY.find((name) => this.filters.show[name]) || 'all';
+
+            this.saveFilters(timeFilter);
+        }
+
+        if (timeFilter !== 'all') {
+            this.filters.count++;
+        }
+
+        this.filteredCourses = this.allCourses;
+
+        const customFilterName = this.block.configsRecord?.customfiltergrouping.value;
+        const customFilterValue = this.filters.customSelected;
+        if (customFilterName && this.filters.show.custom && customFilterValue !== undefined) {
+            this.filters.count++;
 
             this.loaded = false;
             try {
-                const courses = await CoreCourses.getEnrolledCoursesByCustomField(filterName, filterValue);
+                const courses = await CoreCourses.getEnrolledCoursesByCustomField(customFilterName, customFilterValue);
 
-                // Get the courses information from allincludinghidden to get the max info about the course.
                 const courseIds = courses.map((course) => course.id);
 
-                this.filteredCourses = this.courses.allincludinghidden.filter((allCourse) =>
-                    courseIds.indexOf(allCourse.id) !== -1);
+                this.filteredCourses = this.filteredCourses.filter((course) => courseIds.includes(course.id));
             } catch (error) {
                 CoreDomUtils.showErrorModalDefault(error, this.fetchContentDefaultError);
             } finally {
                 this.loaded = true;
             }
+        }
 
+        const onlyFavourite = this.filters.show.favourite && this.filters.favouriteSelected;
+        if (onlyFavourite) {
+            this.filters.count++;
+        }
+
+        const showHidden = this.filters.show.hidden && this.filters.hiddenSelected;
+        if (showHidden) {
+            this.filters.count++;
+        }
+
+        // Time filter, favourite and hidden.
+        const today = CoreTimeUtils.timestamp();
+        this.filteredCourses = this.filteredCourses.filter((course) => {
+            let include = timeFilter == 'all';
+
+            if (!include) {
+                if ((course.enddate && course.enddate < today) || course.completed) {
+                    // Courses that have already ended.
+                    include = timeFilter == 'past';
+                } else if (course.startdate && course.startdate > today) {
+                    // Courses that have not started yet.
+                    include = timeFilter == 'future';
+                } else {
+                    // Courses still in progress.
+                    include = timeFilter == 'inprogress';
+                }
+            }
+
+            if (onlyFavourite) {
+                include = include && !!course.isfavourite;
+            }
+
+            if (!showHidden) {
+                include = include && !course.hidden;
+            }
+
+            return include;
+        });
+
+        // Text filter.
+        const value = this.textFilter.trim().toLowerCase();
+        if (value != '' && this.filteredCourses.length > 0) {
+            // Use displayname if available, or fullname if not.
+            if (this.filteredCourses[0].displayname !== undefined) {
+                this.filteredCourses = this.filteredCourses.filter((course) =>
+                    course.displayname && course.displayname.toLowerCase().indexOf(value) > -1);
+            } else {
+                this.filteredCourses = this.filteredCourses.filter((course) =>
+                    course.fullname.toLowerCase().indexOf(value) > -1);
+            }
+        }
+
+        this.sortCourses(this.sort.selected);
+
+        // Refresh prefetch data (if enabled).
+        this.prefetchIconsInitialized = false;
+        this.initPrefetchCoursesIcons();
+    }
+
+    /**
+     * Sort courses
+     *
+     * @param sort Sort by value.
+     */
+    sortCourses(sort: string): void {
+        if (!this.sort.enabled) {
             return;
         }
 
-        // Only save the filter if not a custom one.
-        this.currentSite?.setLocalSiteConfig('AddonBlockMyOverviewFilter', filter);
-
-        if (this.showFilters[filter] == 'show') {
-            this.filteredCourses = this.courses[filter];
-        } else {
-            const activeFilter = FILTER_PRIORITY.find((name) => this.showFilters[name] == 'show');
-
-            if (activeFilter) {
-                this.setCourseFilter(activeFilter);
-            }
-        }
-    }
-
-    /**
-     * The time selector courses filter have changed.
-     *
-     * @param filter New filter
-     */
-    timeSelectorChanged(filter: string): void {
-        this.timeSelectorFilter = filter;
-        this.setCourseFilter(this.timeSelectorFilter);
-    }
-
-    /**
-     * Init courses filters.
-     *
-     * @param courses Courses to filter.
-     */
-    initCourseFilters(courses: CoreEnrolledCourseDataWithOptions[]): void {
-        this.courses.allincludinghidden = courses;
-
-        if (this.showSortFilter) {
-            if (this.sort == 'lastaccess') {
-                courses.sort((a, b) => (b.lastaccess || 0) - (a.lastaccess || 0));
-            } else if (this.sort == 'fullname') {
-                courses.sort((a, b) => {
-                    const compareA = a.fullname.toLowerCase();
-                    const compareB = b.fullname.toLowerCase();
-
-                    return compareA.localeCompare(compareB);
-                });
-            } else if (this.sort == 'shortname') {
-                courses.sort((a, b) => {
-                    const compareA = a.shortname.toLowerCase();
-                    const compareB = b.shortname.toLowerCase();
-
-                    return compareA.localeCompare(compareB);
-                });
-            }
+        if (this.sort.selected != sort) {
+            this.saveSort(sort);
         }
 
-        this.courses.all = [];
-        this.courses.past = [];
-        this.courses.inprogress = [];
-        this.courses.future = [];
-        this.courses.favourite = [];
-        this.courses.hidden = [];
+        if (this.sort.selected == 'lastaccess') {
+            this.filteredCourses.sort((a, b) => (b.lastaccess || 0) - (a.lastaccess || 0));
+        } else if (this.sort.selected == 'fullname') {
+            this.filteredCourses.sort((a, b) => {
+                const compareA = a.fullname.toLowerCase();
+                const compareB = b.fullname.toLowerCase();
 
-        const today = CoreTimeUtils.timestamp();
-        courses.forEach((course) => {
-            if (course.hidden) {
-                this.courses.hidden.push(course);
-            } else {
-                this.courses.all.push(course);
+                return compareA.localeCompare(compareB);
+            });
+        } else if (this.sort.selected == 'shortname') {
+            this.filteredCourses.sort((a, b) => {
+                const compareA = a.shortname.toLowerCase();
+                const compareB = b.shortname.toLowerCase();
 
-                if ((course.enddate && course.enddate < today) || course.completed) {
-                    // Courses that have already ended.
-                    this.courses.past.push(course);
-                } else if (course.startdate && course.startdate > today) {
-                    // Courses that have not started yet.
-                    this.courses.future.push(course);
-                } else {
-                    // Courses still in progress.
-                    this.courses.inprogress.push(course);
-                }
-
-                if (course.isfavourite) {
-                    this.courses.favourite.push(course);
-                }
-            }
-        });
-
-        this.setCourseFilter(this.timeSelectorFilter);
-    }
-
-    /**
-     * The selected courses sort filter have changed.
-     *
-     * @param sort New sorting.
-     */
-    switchSort(sort: string): void {
-        this.sort = sort;
-        this.currentSite?.setLocalSiteConfig('AddonBlockMyOverviewSort', this.sort);
-        this.initCourseFilters(this.courses.allincludinghidden);
-    }
-
-    /**
-     * Show or hide the filter.
-     */
-    switchFilter(): void {
-        this.showFilter = !this.showFilter;
-        this.courses.filter = '';
-
-        if (this.showFilter) {
-            this.filteredCourses = this.courses.allincludinghidden;
-        } else {
-            this.setCourseFilter(this.timeSelectorFilter);
-        }
-    }
-
-    /**
-     * Popover closed after clicking switch filter.
-     */
-    switchFilterClosed(): void {
-        if (this.showFilter) {
-            setTimeout(() => {
-                this.searchbar?.setFocus();
+                return compareA.localeCompare(compareB);
             });
         }
     }
 
     /**
-     * If switch button that enables the filter input is shown or not.
+     * Saves filters value.
      *
-     * @return If switch button that enables the filter input is shown or not.
+     * @param timeFilter New time filter.
+     * @return Promise resolved when done.
      */
-    showFilterSwitchButton(): boolean {
-        return this.loaded && this.courses.allincludinghidden && this.courses.allincludinghidden.length > 5;
+    async saveFilters(timeFilter: AddonBlockMyOverviewTimeFilters): Promise<void> {
+        this.filters.timeFilterSelected = timeFilter;
+
+        this.filterModalOptions.componentProps = {
+            options: Object.assign({}, this.filters),
+        };
+
+        await Promise.all([
+            this.currentSite.setLocalSiteConfig('AddonBlockMyOverviewFilter', this.filters.timeFilterSelected),
+            this.currentSite.setLocalSiteConfig('AddonBlockMyOverviewFavouriteFilter', this.filters.favouriteSelected ? 1 : 0),
+            this.currentSite.setLocalSiteConfig('AddonBlockMyOverviewHiddenFilter', this.filters.hiddenSelected ? 1 : 0),
+        ]);
     }
 
     /**
-     * Component being destroyed.
+     * Saves layout value.
+     *
+     * @param layout New layout.
+     * @return Promise resolved when done.
+     */
+    async saveLayout(layout: AddonBlockMyOverviewLayouts): Promise<void> {
+        this.layouts.selected = layout;
+
+        await this.currentSite.setLocalSiteConfig('AddonBlockMyOverviewLayout', this.layouts.selected);
+    }
+
+    /**
+     * Saves sort courses value.
+     *
+     * @param sort New sorting.
+     * @return Promise resolved when done.
+     */
+    async saveSort(sort: string): Promise<void> {
+        this.sort.selected = sort;
+
+        await this.currentSite.setLocalSiteConfig('AddonBlockMyOverviewSort', this.sort.selected);
+    }
+
+    /**
+     * Opens display Options modal.
+     *
+     * @return Promise resolved when done.
+     */
+    filterOptionsChanged(modalData: AddonBlockMyOverviewFilterOptions): void {
+        this.filters = modalData;
+        this.saveFilters(this.filters.timeFilterSelected);
+        this.filterCourses();
+    }
+
+    /**
+     * @inheritdoc
      */
     ngOnDestroy(): void {
         this.isDestroyed = true;
@@ -671,3 +654,37 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
 }
 
 type AddonBlockMyOverviewLayouts = 'card'|'list';
+type AddonBlockMyOverviewTimeFilters = 'all'|'inprogress'|'future'|'past';
+
+export type AddonBlockMyOverviewFilterOptions = {
+    enabled: boolean;
+    show: {
+        all: boolean;
+        inprogress: boolean;
+        future: boolean;
+        past: boolean;
+        favourite: boolean;
+        hidden: boolean;
+        custom: boolean;
+    };
+    timeFilterSelected: AddonBlockMyOverviewTimeFilters;
+    favouriteSelected: boolean;
+    hiddenSelected: boolean;
+    customFilters: {
+        name: string;
+        value: string;
+    }[];
+    customSelected?: string;
+    count: number;
+};
+
+type AddonBlockMyOverviewLayoutOptions = {
+    options: AddonBlockMyOverviewLayouts[];
+    selected: AddonBlockMyOverviewLayouts;
+};
+
+type AddonBlockMyOverviewSortOptions = {
+    shortnameEnabled: boolean;
+    selected: string;
+    enabled: boolean;
+};
diff --git a/src/addons/block/myoverview/lang.json b/src/addons/block/myoverview/lang.json
index 19cbb6144..9b0831599 100644
--- a/src/addons/block/myoverview/lang.json
+++ b/src/addons/block/myoverview/lang.json
@@ -1,10 +1,10 @@
 {
     "all": "All (except removed from view)",
     "allincludinghidden": "All",
+    "aria:hiddencourses": "Show courses removed from view",
     "card": "Card",
-    "favourites": "Starred",
+    "favouritesonly": "Show starred courses only",
     "future": "Future",
-    "hiddencourses": "Removed from view",
     "inprogress": "In progress",
     "lastaccessed": "Last accessed",
     "list": "List",
diff --git a/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html b/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
index 772b58c0b..73b78fa5a 100644
--- a/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
+++ b/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
@@ -9,7 +9,7 @@
     </ion-avatar>
     <ion-label>
         <ion-row>
-            <ion-col>
+            <ion-col class="ion-align-self-center">
                 <p *ngIf="course.categoryname || (course.displayname && course.shortname && course.fullname != course.displayname)"
                     class="core-course-additional-info">
                     <span *ngIf="course.categoryname" class="core-course-category">
@@ -32,7 +32,7 @@
                     </core-format-text>
                 </p>
             </ion-col>
-            <ion-col size="auto">
+            <ion-col size="auto" class="ion-align-self-center">
                 <ng-container *ngIf="!isEnrolled">
                     <ion-icon *ngFor="let icon of enrolmentIcons" color="dark" size="small" [name]="icon.icon"
                         [title]="icon.label | translate" [attr.aria-label]="icon.label | translate">
diff --git a/src/core/lang.json b/src/core/lang.json
index 99182daa6..793e0da74 100644
--- a/src/core/lang.json
+++ b/src/core/lang.json
@@ -7,6 +7,7 @@
     "all": "All",
     "allgroups": "All groups",
     "allparticipants": "All participants",
+    "applyfilters": "Apply filters",
     "answer": "Answer",
     "answered": "Answered",
     "areyousure": "Are you sure?",

From 3f201849a4b2d4030395262d12c96cb7190b316e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 15 Nov 2021 16:08:49 +0100
Subject: [PATCH 0224/1008] MOBILE-3806 dashboard: Remove download all courses
 from some blocks

---
 .../addon-block-recentlyaccessedcourses.html  | 17 +----
 .../recentlyaccessedcourses.ts                | 67 +------------------
 .../addon-block-starredcourses.html           | 14 ----
 .../starredcourses/starredcourses.ts          | 66 +-----------------
 4 files changed, 8 insertions(+), 156 deletions(-)

diff --git a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html
index 07c5b2027..6f10e6e92 100644
--- a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html
+++ b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html
@@ -3,20 +3,6 @@
         <h2>{{ 'addon.block_recentlyaccessedcourses.pluginname' | translate }}</h2>
     </ion-label>
     <div slot="end" class="flex-row">
-        <div *ngIf="downloadCoursesEnabled && downloadEnabled && courses && courses.length > 1" class="core-button-spinner">
-            <ion-button *ngIf="prefetchCoursesData.icon && !prefetchCoursesData.loading" fill="clear" color="dark"
-                (click)="prefetchCourses()" [attr.aria-label]="'core.courses.downloadcourses' | translate">
-                <ion-icon [name]="prefetchCoursesData.icon" slot="icon-only" aria-hidden="true"></ion-icon>
-            </ion-button>
-            <ion-badge class="core-course-download-courses-progress" *ngIf="prefetchCoursesData.badge" role="progressbar"
-                [attr.aria-valuemax]="prefetchCoursesData.total" [attr.aria-valuenow]="prefetchCoursesData.count"
-                [attr.aria-valuetext]="prefetchCoursesData.badgeA11yText">
-                {{prefetchCoursesData.badge}}
-            </ion-badge>
-            <ion-spinner *ngIf="!prefetchCoursesData.icon || prefetchCoursesData.loading" [attr.aria-label]="'core.loading' | translate">
-            </ion-spinner>
-        </div>
-
         <core-horizontal-scroll-controls #scrollControls [aria-controls]="scrollElementId">
         </core-horizontal-scroll-controls>
     </div>
@@ -25,7 +11,8 @@
     <core-empty-box *ngIf="courses.length == 0" image="assets/img/icons/courses.svg" inline="true"
         [message]="'addon.block_recentlyaccessedcourses.nocourses' | translate"></core-empty-box>
     <!-- List of courses. -->
-    <div [id]="scrollElementId" class="core-horizontal-scroll" (scroll)="scrollControls.updateScrollPosition()">
+    <div [hidden]="courses.length === 0" [id]="scrollElementId" class="core-horizontal-scroll"
+        (scroll)="scrollControls.updateScrollPosition()">
         <div (onResize)="scrollControls.updateScrollPosition()" class="flex-row">
             <div class="safe-area-pseudo-padding-start"></div>
             <ng-container *ngFor="let course of courses">
diff --git a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
index 4d31b6553..f55b37aea 100644
--- a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
+++ b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, OnInit, OnDestroy, Input, OnChanges, SimpleChange } from '@angular/core';
+import { Component, OnInit, OnDestroy, Input } from '@angular/core';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreSites } from '@services/sites';
 import {
@@ -22,12 +22,10 @@ import {
     CoreCourseSummaryData,
 } from '@features/courses/services/courses';
 import { CoreCourseSearchedDataWithExtraInfoAndOptions, CoreCoursesHelper } from '@features/courses/services/courses-helper';
-import { CoreCourseHelper, CorePrefetchStatusInfo } from '@features/course/services/course-helper';
 import { CoreCourseOptionsDelegate } from '@features/course/services/course-options-delegate';
 import { AddonCourseCompletion } from '@/addons/coursecompletion/services/coursecompletion';
 import { CoreBlockBaseComponent } from '@features/block/classes/base-block-component';
 import { CoreUtils } from '@services/utils/utils';
-import { CoreDomUtils } from '@services/utils/dom';
 
 /**
  * Component to render a recent courses block.
@@ -36,24 +34,15 @@ import { CoreDomUtils } from '@services/utils/dom';
     selector: 'addon-block-recentlyaccessedcourses',
     templateUrl: 'addon-block-recentlyaccessedcourses.html',
 })
-export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseComponent implements OnInit, OnChanges, OnDestroy {
+export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseComponent implements OnInit, OnDestroy {
 
     @Input() downloadEnabled = false;
 
     courses: (Omit<CoreCourseSummaryData, 'visible'> & CoreCourseSearchedDataWithExtraInfoAndOptions)[] = [];
-    prefetchCoursesData: CorePrefetchStatusInfo = {
-        icon: '',
-        statusTranslatable: 'core.loading',
-        status: '',
-        loading: true,
-        badge: '',
-    };
 
     downloadCourseEnabled = false;
-    downloadCoursesEnabled = false;
     scrollElementId!: string;
 
-    protected prefetchIconsInitialized = false;
     protected isDestroyed = false;
     protected coursesObserver?: CoreEventObserver;
     protected updateSiteObserver?: CoreEventObserver;
@@ -74,12 +63,10 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
 
         // Refresh the enabled flags if enabled.
         this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
-        this.downloadCoursesEnabled = !CoreCourses.isDownloadCoursesDisabledInSite();
 
         // Refresh the enabled flags if site is updated.
         this.updateSiteObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, () => {
             this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
-            this.downloadCoursesEnabled = !CoreCourses.isDownloadCoursesDisabledInSite();
 
         }, CoreSites.getCurrentSiteId());
 
@@ -94,16 +81,6 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
         super.ngOnInit();
     }
 
-    /**
-     * @inheritdoc
-     */
-    ngOnChanges(changes: {[name: string]: SimpleChange}): void {
-        if (changes.downloadEnabled && !changes.downloadEnabled.previousValue && this.downloadEnabled && this.loaded) {
-            // Download all courses is enabled now, initialize it.
-            this.initPrefetchCoursesIcons();
-        }
-    }
-
     /**
      * @inheritdoc
      */
@@ -136,9 +113,7 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
             promises.push(CoreCourses.invalidateCoursesByField('ids', courseIds.join(',')));
         }
 
-        await CoreUtils.allPromises(promises).finally(() => {
-            this.prefetchIconsInitialized = false;
-        });
+        await CoreUtils.allPromises(promises);
     }
 
     /**
@@ -172,22 +147,6 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
         });
 
         await CoreCoursesHelper.loadCoursesColorAndImage(courses);
-
-        this.initPrefetchCoursesIcons();
-    }
-
-    /**
-     * Initialize the prefetch icon for selected courses.
-     */
-    protected async initPrefetchCoursesIcons(): Promise<void> {
-        if (this.prefetchIconsInitialized || !this.downloadEnabled) {
-            // Already initialized.
-            return;
-        }
-
-        this.prefetchIconsInitialized = true;
-
-        this.prefetchCoursesData = await CoreCourseHelper.initPrefetchCoursesIcons(this.courses, this.prefetchCoursesData);
     }
 
     /**
@@ -221,26 +180,6 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
             data.state == CoreCoursesProvider.STATE_FAVOURITE && course) {
             course.isfavourite = !!data.value;
             await this.invalidateCourses([course.id]);
-
-            this.initPrefetchCoursesIcons();
-        }
-    }
-
-    /**
-     * Prefetch all the shown courses.
-     *
-     * @return Promise resolved when done.
-     */
-    async prefetchCourses(): Promise<void> {
-        const initialIcon = this.prefetchCoursesData.icon;
-
-        try {
-            await CoreCourseHelper.prefetchCourses(this.courses, this.prefetchCoursesData);
-        } catch (error) {
-            if (!this.isDestroyed) {
-                CoreDomUtils.showErrorModalDefault(error, 'core.course.errordownloadingcourse', true);
-                this.prefetchCoursesData.icon = initialIcon;
-            }
         }
     }
 
diff --git a/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html b/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html
index 8de46a904..3697b8439 100644
--- a/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html
+++ b/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html
@@ -3,20 +3,6 @@
         <h2>{{ 'addon.block_starredcourses.pluginname' | translate }}</h2>
     </ion-label>
     <div slot="end" class="flex-row">
-        <div *ngIf="downloadCoursesEnabled && downloadEnabled && courses && courses.length > 1" class="core-button-spinner">
-            <ion-button *ngIf="prefetchCoursesData.icon && !prefetchCoursesData.loading" fill="clear" color="dark"
-                (click)="prefetchCourses()" [attr.aria-label]="'core.courses.downloadcourses' | translate">
-                <ion-icon [name]="prefetchCoursesData.icon" slot="icon-only" aria-hidden="true"></ion-icon>
-            </ion-button>
-            <ion-badge class="core-course-download-courses-progress" *ngIf="prefetchCoursesData.badge" role="progressbar"
-                [attr.aria-valuemax]="prefetchCoursesData.total" [attr.aria-valuenow]="prefetchCoursesData.count"
-                [attr.aria-valuetext]="prefetchCoursesData.badgeA11yText">
-                {{prefetchCoursesData.badge}}
-            </ion-badge>
-            <ion-spinner *ngIf="!prefetchCoursesData.icon || prefetchCoursesData.loading" [attr.aria-label]="'core.loading' | translate">
-            </ion-spinner>
-        </div>
-
         <core-horizontal-scroll-controls #scrollControls [aria-controls]="scrollElementId">
         </core-horizontal-scroll-controls>
     </div>
diff --git a/src/addons/block/starredcourses/components/starredcourses/starredcourses.ts b/src/addons/block/starredcourses/components/starredcourses/starredcourses.ts
index 766c695c7..38fd77081 100644
--- a/src/addons/block/starredcourses/components/starredcourses/starredcourses.ts
+++ b/src/addons/block/starredcourses/components/starredcourses/starredcourses.ts
@@ -12,17 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, OnInit, OnDestroy, Input, OnChanges, SimpleChange } from '@angular/core';
+import { Component, OnInit, OnDestroy, Input } from '@angular/core';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreSites } from '@services/sites';
 import { CoreCoursesProvider, CoreCoursesMyCoursesUpdatedEventData, CoreCourses } from '@features/courses/services/courses';
 import { CoreCoursesHelper, CoreEnrolledCourseDataWithOptions } from '@features/courses/services/courses-helper';
-import { CoreCourseHelper, CorePrefetchStatusInfo } from '@features/course/services/course-helper';
 import { CoreCourseOptionsDelegate } from '@features/course/services/course-options-delegate';
 import { AddonCourseCompletion } from '@/addons/coursecompletion/services/coursecompletion';
 import { CoreBlockBaseComponent } from '@features/block/classes/base-block-component';
 import { CoreUtils } from '@services/utils/utils';
-import { CoreDomUtils } from '@services/utils/dom';
 
 /**
  * Component to render a starred courses block.
@@ -31,24 +29,15 @@ import { CoreDomUtils } from '@services/utils/dom';
     selector: 'addon-block-starredcourses',
     templateUrl: 'addon-block-starredcourses.html',
 })
-export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent implements OnInit, OnChanges, OnDestroy {
+export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent implements OnInit, OnDestroy {
 
     @Input() downloadEnabled = false;
 
     courses: CoreEnrolledCourseDataWithOptions [] = [];
-    prefetchCoursesData: CorePrefetchStatusInfo = {
-        icon: '',
-        statusTranslatable: 'core.loading',
-        status: '',
-        loading: true,
-        badge: '',
-    };
 
     downloadCourseEnabled = false;
-    downloadCoursesEnabled = false;
     scrollElementId!: string;
 
-    protected prefetchIconsInitialized = false;
     protected isDestroyed = false;
     protected coursesObserver?: CoreEventObserver;
     protected updateSiteObserver?: CoreEventObserver;
@@ -69,12 +58,10 @@ export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent im
 
         // Refresh the enabled flags if enabled.
         this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
-        this.downloadCoursesEnabled = !CoreCourses.isDownloadCoursesDisabledInSite();
 
         // Refresh the enabled flags if site is updated.
         this.updateSiteObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, () => {
             this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
-            this.downloadCoursesEnabled = !CoreCourses.isDownloadCoursesDisabledInSite();
         }, CoreSites.getCurrentSiteId());
 
         this.coursesObserver = CoreEvents.on(
@@ -89,16 +76,6 @@ export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent im
         super.ngOnInit();
     }
 
-    /**
-     * @inheritdoc
-     */
-    ngOnChanges(changes: {[name: string]: SimpleChange}): void {
-        if (changes.downloadEnabled && !changes.downloadEnabled.previousValue && this.downloadEnabled && this.loaded) {
-            // Download all courses is enabled now, initialize it.
-            this.initPrefetchCoursesIcons();
-        }
-    }
-
     /**
      * @inheritdoc
      */
@@ -131,9 +108,7 @@ export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent im
             promises.push(CoreCourses.invalidateCoursesByField('ids', courseIds.join(',')));
         }
 
-        await CoreUtils.allPromises(promises).finally(() => {
-            this.prefetchIconsInitialized = false;
-        });
+        await CoreUtils.allPromises(promises);
     }
 
     /**
@@ -145,8 +120,6 @@ export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent im
 
         // @TODO: Sort won't coincide with website because timemodified is not informed.
         this.courses = await CoreCoursesHelper.getUserCoursesWithOptions('timemodified', 0, 'isfavourite', showCategories);
-
-        this.initPrefetchCoursesIcons();
     }
 
     /**
@@ -182,43 +155,10 @@ export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent im
             }
 
             await this.invalidateCourses([course.id]);
-            this.initPrefetchCoursesIcons();
 
         }
     }
 
-    /**
-     * Initialize the prefetch icon for selected courses.
-     */
-    protected async initPrefetchCoursesIcons(): Promise<void> {
-        if (this.prefetchIconsInitialized || !this.downloadEnabled) {
-            // Already initialized.
-            return;
-        }
-
-        this.prefetchIconsInitialized = true;
-
-        this.prefetchCoursesData = await CoreCourseHelper.initPrefetchCoursesIcons(this.courses, this.prefetchCoursesData);
-    }
-
-    /**
-     * Prefetch all the shown courses.
-     *
-     * @return Promise resolved when done.
-     */
-    async prefetchCourses(): Promise<void> {
-        const initialIcon = this.prefetchCoursesData.icon;
-
-        try {
-            return CoreCourseHelper.prefetchCourses(this.courses, this.prefetchCoursesData);
-        } catch (error) {
-            if (!this.isDestroyed) {
-                CoreDomUtils.showErrorModalDefault(error, 'core.course.errordownloadingcourse', true);
-                this.prefetchCoursesData.icon = initialIcon;
-            }
-        }
-    }
-
     /**
      * @inheritdoc
      */

From f69deb31b9e299d522dd8fdd4db99fbb45a87bdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 15 Nov 2021 17:02:52 +0100
Subject: [PATCH 0225/1008] MOBILE-3806 my: Always show Download courses on my
 courses page

---
 scripts/langindex.json                        |  1 +
 .../myoverview/addon-block-myoverview.html    |  2 +-
 .../components/myoverview/myoverview.ts       |  2 +-
 .../features/course/services/course-helper.ts | 31 +++++++++++++++++--
 src/core/features/courses/lang.json           |  1 +
 src/core/features/courses/pages/my/my.html    | 12 ++++---
 src/core/features/courses/pages/my/my.ts      | 31 ++++++++-----------
 7 files changed, 54 insertions(+), 26 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index db1744aee..df6d554e3 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1556,6 +1556,7 @@
   "core.courses.password": "local_moodlemobileapp",
   "core.courses.paymentrequired": "moodle",
   "core.courses.paypalaccepted": "enrol_paypal",
+  "core.courses.refreshcourses": "local_moodlemobileapp",
   "core.courses.reload": "moodle",
   "core.courses.removefromfavourites": "block_myoverview",
   "core.courses.search": "moodle",
diff --git a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
index 121ae723b..6c3d9ffa6 100644
--- a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
+++ b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
@@ -6,7 +6,7 @@
         <!-- Download all courses. -->
         <div *ngIf="downloadCoursesEnabled && downloadEnabled && filteredCourses.length > 1" class="core-button-spinner">
             <ion-button *ngIf="!prefetchCoursesData.loading" fill="clear" color="dark" (click)="prefetchCourses()"
-                [attr.aria-label]="'core.courses.downloadcourses' | translate">
+                [attr.aria-label]="prefetchCoursesData.statusTranslatable | translate">
                 <ion-icon [name]="prefetchCoursesData.icon" slot="icon-only" aria-hidden="true">
                 </ion-icon>
             </ion-button>
diff --git a/src/addons/block/myoverview/components/myoverview/myoverview.ts b/src/addons/block/myoverview/components/myoverview/myoverview.ts
index a3970be95..d99e22201 100644
--- a/src/addons/block/myoverview/components/myoverview/myoverview.ts
+++ b/src/addons/block/myoverview/components/myoverview/myoverview.ts
@@ -415,7 +415,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
      *
      * @return Promise resolved when done.
      */
-    protected async initPrefetchCoursesIcons(): Promise<void> {
+    async initPrefetchCoursesIcons(): Promise<void> {
         if (this.prefetchIconsInitialized || !this.downloadEnabled) {
             // Already initialized.
             return;
diff --git a/src/core/features/course/services/course-helper.ts b/src/core/features/course/services/course-helper.ts
index b87b0ab95..768470957 100644
--- a/src/core/features/course/services/course-helper.ts
+++ b/src/core/features/course/services/course-helper.ts
@@ -429,7 +429,7 @@ export class CoreCourseHelperProvider {
         const siteId = CoreSites.getCurrentSiteId();
 
         // Confirm the download without checking size because it could take a while.
-        await CoreDomUtils.showConfirm(Translate.instant('core.areyousure'));
+        await CoreDomUtils.showConfirm(Translate.instant('core.areyousure'), Translate.instant('core.courses.downloadcourses'));
 
         const total = courses.length;
         let count = 0;
@@ -1209,7 +1209,7 @@ export class CoreCourseHelperProvider {
 
         const status = await this.determineCoursesStatus(courses);
 
-        prefetch = this.getCoursePrefetchStatusInfo(status);
+        prefetch = this.getCoursesPrefetchStatusInfo(status);
 
         if (prefetch.loading) {
             // It seems all courses are being downloaded, show a download button instead.
@@ -1381,6 +1381,33 @@ export class CoreCourseHelperProvider {
         return prefetchStatus;
     }
 
+    /**
+     * Get a courses status icon and the langkey to use as a title from status.
+     *
+     * @param status Courses status.
+     * @return Prefetch status info.
+     */
+    getCoursesPrefetchStatusInfo(status: string): CorePrefetchStatusInfo {
+        const prefetchStatus: CorePrefetchStatusInfo = {
+            status: status,
+            icon: this.getPrefetchStatusIcon(status, false),
+            statusTranslatable: '',
+            loading: false,
+        };
+
+        if (status == CoreConstants.DOWNLOADED) {
+            // Always show refresh icon, we cannot know if there's anything new in course options.
+            prefetchStatus.statusTranslatable = 'core.courses.refreshcourses';
+        } else if (status == CoreConstants.DOWNLOADING) {
+            prefetchStatus.statusTranslatable = 'core.downloading';
+            prefetchStatus.loading = true;
+        } else {
+            prefetchStatus.statusTranslatable = 'core.courses.downloadcourses';
+        }
+
+        return prefetchStatus;
+    }
+
     /**
      * Get the icon given the status and if trust the download status.
      *
diff --git a/src/core/features/courses/lang.json b/src/core/features/courses/lang.json
index 47924a0bd..70b5a0b79 100644
--- a/src/core/features/courses/lang.json
+++ b/src/core/features/courses/lang.json
@@ -32,6 +32,7 @@
     "password": "Enrolment key",
     "paymentrequired": "This course requires a payment for entry.",
     "paypalaccepted": "PayPal payments accepted",
+    "refreshcourses": "Refresh courses",
     "reload": "Reload",
     "removefromfavourites": "Unstar this course",
     "search": "Search",
diff --git a/src/core/features/courses/pages/my/my.html b/src/core/features/courses/pages/my/my.html
index cd7224b05..83e679d1a 100644
--- a/src/core/features/courses/pages/my/my.html
+++ b/src/core/features/courses/pages/my/my.html
@@ -9,9 +9,13 @@
                 <ion-icon name="fas-search" slot="icon-only" aria-hidden="true"></ion-icon>
             </ion-button>
             <core-context-menu>
-                <core-context-menu-item *ngIf="(downloadCourseEnabled || downloadCoursesEnabled)" [priority]="1000"
-                    [content]="'core.settings.showdownloadoptions' | translate" (action)="toggleDownload()" iconAction="toggle"
-                    [(toggle)]="downloadEnabled"></core-context-menu-item>
+                <core-context-menu-item *ngIf="downloadCoursesEnabled && myOverviewBlock && myOverviewBlock.filteredCourses.length > 1"
+                    [priority]="1000" [content]="myOverviewBlock?.prefetchCoursesData.statusTranslatable | translate"
+                    (action)="myOverviewBlock?.prefetchCourses()"
+                    [iconAction]="myOverviewBlock?.prefetchCoursesData.loading ? 'spinner' : myOverviewBlock?.prefetchCoursesData.icon"
+                    [badge]="myOverviewBlock?.prefetchCoursesData.badge"
+                    [badgeA11yText]="myOverviewBlock?.prefetchCoursesData.badgeA11yText">
+                </core-context-menu-item>
                 <core-context-menu-item [priority]="500" [content]="'addon.storagemanager.managestorage' | translate"
                     (action)="manageCoursesStorage()" iconAction="fas-archive"></core-context-menu-item>
             </core-context-menu>
@@ -26,7 +30,7 @@
     <ion-list>
         <!-- My courses blocks. -->
         <core-block [block]="{name: 'myoverview', visible: true}" contextLevel="user" [instanceId]="userId"
-            [extraData]="{'downloadEnabled': downloadEnabled}">
+            [extraData]="{'downloadEnabled': true}">
         </core-block>
     </ion-list>
 </ion-content>
diff --git a/src/core/features/courses/pages/my/my.ts b/src/core/features/courses/pages/my/my.ts
index 09c02acad..9c98a25a4 100644
--- a/src/core/features/courses/pages/my/my.ts
+++ b/src/core/features/courses/pages/my/my.ts
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { AddonBlockMyOverviewComponent } from '@addons/block/myoverview/components/myoverview/myoverview';
 import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { CoreBlockComponent } from '@features/block/components/block/block';
 import { IonRefresher } from '@ionic/angular';
@@ -19,7 +20,7 @@ import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
-import { CoreCourses, CoreCoursesProvider } from '../../services/courses';
+import { CoreCourses } from '../../services/courses';
 
 /**
  * Page that shows a my courses.
@@ -34,28 +35,19 @@ export class CoreCoursesMyCoursesPage implements OnInit, OnDestroy {
     @ViewChild(CoreBlockComponent) block!: CoreBlockComponent;
 
     searchEnabled = false;
-    downloadEnabled = false;
-    downloadCourseEnabled = false;
     downloadCoursesEnabled = false;
     userId: number;
+    myOverviewBlock?: AddonBlockMyOverviewComponent;
 
     protected updateSiteObserver: CoreEventObserver;
-    protected downloadEnabledObserver: CoreEventObserver;
 
     constructor() {
         // Refresh the enabled flags if site is updated.
         this.updateSiteObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, () => {
             this.searchEnabled = !CoreCourses.isSearchCoursesDisabledInSite();
-            this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
             this.downloadCoursesEnabled = !CoreCourses.isDownloadCoursesDisabledInSite();
-
-            this.downloadEnabled = (this.downloadCourseEnabled || this.downloadCoursesEnabled) && this.downloadEnabled;
         }, CoreSites.getCurrentSiteId());
 
-        this.downloadEnabledObserver = CoreEvents.on(CoreCoursesProvider.EVENT_DASHBOARD_DOWNLOAD_ENABLED_CHANGED, (data) => {
-            this.downloadEnabled = (this.downloadCourseEnabled || this.downloadCoursesEnabled) && data.enabled;
-        });
-
         this.userId = CoreSites.getCurrentSiteUserId();
     }
 
@@ -64,19 +56,23 @@ export class CoreCoursesMyCoursesPage implements OnInit, OnDestroy {
      */
     ngOnInit(): void {
         this.searchEnabled = !CoreCourses.isSearchCoursesDisabledInSite();
-        this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
         this.downloadCoursesEnabled = !CoreCourses.isDownloadCoursesDisabledInSite();
 
-        this.downloadEnabled =
-            (this.downloadCourseEnabled || this.downloadCoursesEnabled) && CoreCourses.getCourseDownloadOptionsEnabled();
+        this.loadBlock();
 
     }
 
     /**
-     * Switch download enabled.
+     * Load my overview block instance.
      */
-    switchDownload(): void {
-        CoreCourses.setCourseDownloadOptionsEnabled(this.downloadEnabled);
+    protected loadBlock(): void {
+        setTimeout(() => {
+            if (!this.block) {
+                return this.loadBlock();
+            }
+
+            this.myOverviewBlock = this.block?.dynamicComponent?.instance as AddonBlockMyOverviewComponent;
+        }, 500);
     }
 
     /**
@@ -111,7 +107,6 @@ export class CoreCoursesMyCoursesPage implements OnInit, OnDestroy {
      */
     ngOnDestroy(): void {
         this.updateSiteObserver?.off();
-        this.downloadEnabledObserver?.off();
     }
 
 }

From 84e97ef5cfe02a14b26c8547960f1f2b50a8aa12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 17 Nov 2021 17:26:22 +0100
Subject: [PATCH 0226/1008] MOBILE-3806 courses: Reduce usage of course image
 and color number

---
 .../recentlyaccessedcourses.ts                |  4 +-
 .../courses/services/courses-helper.ts        | 86 ++++++++-----------
 2 files changed, 37 insertions(+), 53 deletions(-)

diff --git a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
index f55b37aea..b6aef6614 100644
--- a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
+++ b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
@@ -21,7 +21,7 @@ import {
     CoreCourses,
     CoreCourseSummaryData,
 } from '@features/courses/services/courses';
-import { CoreCourseSearchedDataWithExtraInfoAndOptions, CoreCoursesHelper } from '@features/courses/services/courses-helper';
+import { CoreCourseSearchedDataWithExtraInfoAndOptions } from '@features/courses/services/courses-helper';
 import { CoreCourseOptionsDelegate } from '@features/course/services/course-options-delegate';
 import { AddonCourseCompletion } from '@/addons/coursecompletion/services/coursecompletion';
 import { CoreBlockBaseComponent } from '@features/block/classes/base-block-component';
@@ -145,8 +145,6 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
                 course.categoryname = '';
             }
         });
-
-        await CoreCoursesHelper.loadCoursesColorAndImage(courses);
     }
 
     /**
diff --git a/src/core/features/courses/services/courses-helper.ts b/src/core/features/courses/services/courses-helper.ts
index 89034e716..3cf1a014d 100644
--- a/src/core/features/courses/services/courses-helper.ts
+++ b/src/core/features/courses/services/courses-helper.ts
@@ -32,6 +32,8 @@ import { AddonCourseCompletion } from '@/addons/coursecompletion/services/course
 @Injectable({ providedIn: 'root' })
 export class CoreCoursesHelperProvider {
 
+    protected courseSiteColors: Record<string, (string | undefined)[]> = {};
+
     /**
      * Get the courses to display the course picker popover. If a courseId is specified, it will also return its categoryId.
      *
@@ -72,11 +74,10 @@ export class CoreCoursesHelperProvider {
      * @param courseByField Course returned by core_course_get_courses_by_field.
      * @param addCategoryName Whether add category name or not.
      */
-    loadCourseExtraInfo(
+    protected loadCourseExtraInfo(
         course: CoreEnrolledCourseDataWithExtraInfo,
         courseByField: CoreCourseSearchedData,
         addCategoryName: boolean = false,
-        colors?: (string | undefined)[],
     ): void {
         if (courseByField) {
             course.displayname = courseByField.displayname;
@@ -85,18 +86,8 @@ export class CoreCoursesHelperProvider {
         } else {
             delete course.displayname;
         }
-
-        this.loadCourseColorAndImage(course, colors);
     }
 
-    /**
-     * Given a list of courses returned by core_enrol_get_users_courses, load some extra data using the WebService
-     * core_course_get_courses_by_field if available.
-     *
-     * @param courses List of courses.
-     * @param loadCategoryNames Whether load category names or not.
-     * @return Promise resolved when done.
-     */
     /**
      * Loads the color of courses or the thumb image.
      *
@@ -107,11 +98,8 @@ export class CoreCoursesHelperProvider {
         if (!courses.length) {
             return;
         }
-        const colors = await this.loadCourseSiteColors();
 
-        courses.forEach((course) => {
-            this.loadCourseColorAndImage(course, colors);
-        });
+        await Promise.all(courses.map((course) => this.loadCourseColorAndImage(course)));
     }
 
     /**
@@ -131,32 +119,19 @@ export class CoreCoursesHelperProvider {
         let coursesInfo = {};
         let courseInfoAvailable = false;
 
-        const promises: Promise<void>[] = [];
-        let colors: (string | undefined)[] = [];
-
-        promises.push(this.loadCourseSiteColors().then((loadedColors) => {
-            colors = loadedColors;
-
-            return;
-        }));
-
         if (loadCategoryNames || (courses[0].overviewfiles === undefined && courses[0].displayname === undefined)) {
             const courseIds = courses.map((course) => course.id).join(',');
 
             courseInfoAvailable = true;
 
             // Get the extra data for the courses.
-            promises.push(CoreCourses.getCoursesByField('ids', courseIds).then((coursesInfos) => {
-                coursesInfo = CoreUtils.arrayToObject(coursesInfos, 'id');
+            const coursesInfosArray = await CoreCourses.getCoursesByField('ids', courseIds);
 
-                return;
-            }));
+            coursesInfo = CoreUtils.arrayToObject(coursesInfosArray, 'id');
         }
 
-        await Promise.all(promises);
-
         courses.forEach((course) => {
-            this.loadCourseExtraInfo(course, courseInfoAvailable ? coursesInfo[course.id] : course, loadCategoryNames, colors);
+            this.loadCourseExtraInfo(course, courseInfoAvailable ? coursesInfo[course.id] : course, loadCategoryNames);
         });
     }
 
@@ -166,18 +141,30 @@ export class CoreCoursesHelperProvider {
      * @return course colors RGB.
      */
     protected async loadCourseSiteColors(): Promise<(string | undefined)[]> {
-        const site = CoreSites.getCurrentSite();
+        const site = CoreSites.getRequiredCurrentSite();
+        const siteId = site.getId();
+
+        if (this.courseSiteColors[siteId] !== undefined) {
+            return this.courseSiteColors[siteId];
+        }
+
+        if (!site.isVersionGreaterEqualThan('3.8')) {
+            this.courseSiteColors[siteId] = [];
+
+            return [];
+        }
+
         const colors: (string | undefined)[] = [];
 
-        if (site?.isVersionGreaterEqualThan('3.8')) {
-            try {
-                const configs = await site.getConfig();
-                for (let x = 0; x < 10; x++) {
-                    colors[x] = configs['core_admin_coursecolor' + (x + 1)] || undefined;
-                }
-            } catch {
-                // Ignore errors.
+        try {
+            const configs = await site.getConfig();
+            for (let x = 0; x < 10; x++) {
+                colors[x] = configs['core_admin_coursecolor' + (x + 1)] || undefined;
             }
+
+            this.courseSiteColors[siteId] = colors;
+        } catch {
+            // Ignore errors.
         }
 
         return colors;
@@ -187,19 +174,18 @@ export class CoreCoursesHelperProvider {
      * Loads the color of the course or the thumb image.
      *
      * @param course Course data.
-     * @param colors Colors loaded.
      */
-    async loadCourseColorAndImage(course: CoreCourseWithImageAndColor, colors?: (string | undefined)[]): Promise<void> {
-        if (!colors) {
-            colors = await this.loadCourseSiteColors();
-        }
-
+    async loadCourseColorAndImage(course: CoreCourseWithImageAndColor): Promise<void> {
         if (course.overviewfiles && course.overviewfiles[0]) {
             course.courseImage = course.overviewfiles[0].fileurl;
-        } else {
-            course.colorNumber = course.id % 10;
-            course.color = colors.length ? colors[course.colorNumber] : undefined;
+
+            return;
         }
+
+        const colors = await this.loadCourseSiteColors();
+
+        course.colorNumber = course.id % 10;
+        course.color = colors.length ? colors[course.colorNumber] : undefined;
     }
 
     /**

From dc08698aac57f2b00170d44a9e8a0ecd46786599 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 25 Nov 2021 11:52:28 +0100
Subject: [PATCH 0227/1008] MOBILE-3806 course: Fix and improve course list
 item

---
 .../core-courses-course-list-item.html        | 72 +++++++------------
 .../course-list-item/course-list-item.ts      | 10 +--
 .../course-progress/course-progress.ts        |  6 +-
 3 files changed, 36 insertions(+), 52 deletions(-)

diff --git a/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html b/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
index 73b78fa5a..91e596ed5 100644
--- a/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
+++ b/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
@@ -10,27 +10,7 @@
     <ion-label>
         <ion-row>
             <ion-col class="ion-align-self-center">
-                <p *ngIf="course.categoryname || (course.displayname && course.shortname && course.fullname != course.displayname)"
-                    class="core-course-additional-info">
-                    <span *ngIf="course.categoryname" class="core-course-category">
-                        <core-format-text [text]="course.categoryname"></core-format-text>
-                    </span>
-                    <span *ngIf="course.categoryname && course.displayname && course.shortname && course.fullname != course.displayname"
-                        class="core-course-category"> | </span>
-                    <span *ngIf="course.displayname && course.shortname && course.fullname != course.displayname"
-                        class="core-course-shortname">
-                        <core-format-text [text]="course.shortname" contextLevel="course" [contextInstanceId]="course.id">
-                        </core-format-text>
-                    </span>
-                </p>
-                <p class="item-heading">
-                    <ion-icon name="fas-star" *ngIf="course.isfavourite" [attr.aria-label]="'core.courses.favourite' | translate">
-                    </ion-icon>
-                    <span class="sr-only" *ngIf="course.isfavourite">{{ 'core.courses.aria:favourite' | translate }}</span>
-                    <span class="sr-only">{{ 'core.courses.aria:coursename' | translate }}</span>
-                    <core-format-text [text]="course.fullname" contextLevel="course" [contextInstanceId]="course.id">
-                    </core-format-text>
-                </p>
+                <ng-container *ngTemplateOutlet="mainInfo"></ng-container>
             </ion-col>
             <ion-col size="auto" class="ion-align-self-center">
                 <ng-container *ngIf="!isEnrolled">
@@ -47,11 +27,10 @@
             <core-progress-bar [progress]="progress" a11yText="core.courses.aria:courseprogress"></core-progress-bar>
         </p>
     </ion-label>
-
 </ion-item>
 
 <ion-card [attr.course-color]="course.color ? null : course.colorNumber" *ngIf="layout == 'card' || layout == 'summarycard'"
-    class="core-course-list-card" [class.item-dimmed]="course.hidden">
+    class="core-course-list-card" [class.item-dimmed]="course.hidden" [attr.aria-label]="course.displayname || course.fullname">
     <div (click)="openCourse()" class="core-course-thumb" [class.core-course-color-img]="course.courseImage"
         [style.background-color]="course.color">
         <img *ngIf="course.courseImage" [src]="course.courseImage" core-external-content alt="" />
@@ -62,28 +41,7 @@
         <ion-label class="ion-text-wrap core-course-title">
             <ion-row>
                 <ion-col>
-                    <p *ngIf="course.categoryname || (course.displayname && course.shortname && course.fullname != course.displayname)"
-                        class="core-course-additional-info">
-                        <span class="sr-only">{{ 'core.courses.aria:coursecategory' | translate }}</span>
-                        <span *ngIf="course.categoryname" class="core-course-category">
-                            <core-format-text [text]="course.categoryname"></core-format-text>
-                        </span>
-                        <span *ngIf="course.categoryname && course.displayname && course.shortname && course.fullname != course.displayname"
-                            class="core-course-category"> | </span>
-                        <span *ngIf="course.displayname && course.shortname && course.fullname != course.displayname"
-                            class="core-course-shortname">
-                            <core-format-text [text]="course.shortname" contextLevel="course" [contextInstanceId]="course.id">
-                            </core-format-text>
-                        </span>
-                    </p>
-                    <p class="item-heading">
-                        <ion-icon name="fas-star" *ngIf="course.isfavourite" [attr.aria-label]="'core.courses.favourite' | translate">
-                        </ion-icon>
-                        <span class="sr-only" *ngIf="course.isfavourite">{{ 'core.courses.aria:favourite' | translate }}</span>
-                        <span class="sr-only">{{ 'core.courses.aria:coursename' | translate }}</span>
-                        <core-format-text [text]="course.fullname" contextLevel="course" [contextInstanceId]="course.id">
-                        </core-format-text>
-                    </p>
+                    <ng-container *ngTemplateOutlet="mainInfo"></ng-container>
                 </ion-col>
                 <ion-col size="auto"
                     *ngIf="isEnrolled && ((downloadCourseEnabled && !courseOptionMenuEnabled && showDownload) || courseOptionMenuEnabled)">
@@ -122,3 +80,27 @@
         </ion-button>
     </div>
 </ng-template>
+
+<ng-template #mainInfo>
+    <p *ngIf="course.categoryname || (course.displayname && course.shortname && course.fullname != course.displayname)"
+        class="core-course-additional-info">
+        <span *ngIf="course.categoryname" class="core-course-category">
+            <span class="sr-only">{{ 'core.courses.aria:coursecategory' | translate }}</span>
+            <core-format-text [text]="course.categoryname"></core-format-text>
+        </span>
+        <span *ngIf="course.categoryname && course.displayname && course.shortname && course.fullname != course.displayname"
+            class="core-course-category"> | </span>
+        <span *ngIf="course.displayname && course.shortname && course.fullname != course.displayname" class="core-course-shortname">
+            <core-format-text [text]="course.shortname" contextLevel="course" [contextInstanceId]="course.id">
+            </core-format-text>
+        </span>
+    </p>
+    <p class="item-heading">
+        <ion-icon name="fas-star" *ngIf="course.isfavourite" [attr.aria-label]="'core.courses.favourite' | translate">
+        </ion-icon>
+        <span class="sr-only" *ngIf="course.isfavourite">{{ 'core.courses.aria:favourite' | translate }}</span>
+        <span class="sr-only">{{ 'core.courses.aria:coursename' | translate }}</span>
+        <core-format-text [text]="course.fullname" contextLevel="course" [contextInstanceId]="course.id">
+        </core-format-text>
+    </p>
+</ng-template>
diff --git a/src/core/features/courses/components/course-list-item/course-list-item.ts b/src/core/features/courses/components/course-list-item/course-list-item.ts
index 98e98ba99..70304420b 100644
--- a/src/core/features/courses/components/course-list-item/course-list-item.ts
+++ b/src/core/features/courses/components/course-list-item/course-list-item.ts
@@ -250,13 +250,13 @@ export class CoreCoursesCourseListItemComponent implements OnInit, OnDestroy, On
     }
 
     /**
-     * Delete the course.
+     * Delete course stored data.
      */
-    async deleteCourse(): Promise<void> {
+    async deleteCourseStoredData(): Promise<void> {
         try {
             await CoreDomUtils.showDeleteConfirm('core.course.confirmdeletestoreddata');
         } catch (error) {
-            if (CoreDomUtils.isCanceledError(error)) {
+            if (!CoreDomUtils.isCanceledError(error)) {
                 throw error;
             }
 
@@ -299,8 +299,8 @@ export class CoreCoursesCourseListItemComponent implements OnInit, OnDestroy, On
                 }
                 break;
             case 'delete':
-                if (this.courseStatus == 'downloaded' || this.courseStatus == 'outdated') {
-                    this.deleteCourse();
+                if (this.courseStatus == CoreConstants.DOWNLOADED || this.courseStatus == CoreConstants.OUTDATED) {
+                    this.deleteCourseStoredData();
                 }
                 break;
             case 'hide':
diff --git a/src/core/features/courses/components/course-progress/course-progress.ts b/src/core/features/courses/components/course-progress/course-progress.ts
index 626c6c9a8..7b1e37c7b 100644
--- a/src/core/features/courses/components/course-progress/course-progress.ts
+++ b/src/core/features/courses/components/course-progress/course-progress.ts
@@ -35,6 +35,8 @@ import { CoreUser } from '@features/user/services/user';
  *
  * <core-courses-course-progress [course]="course">
  * </core-courses-course-progress>
+ *
+ * @deprecated since 4.0 Use core-courses-course-list-item instead.
  */
 @Component({
     selector: 'core-courses-course-progress',
@@ -175,7 +177,7 @@ export class CoreCoursesCourseProgressComponent implements OnInit, OnDestroy, On
         try {
             await CoreDomUtils.showDeleteConfirm('core.course.confirmdeletestoreddata');
         } catch (error) {
-            if (CoreDomUtils.isCanceledError(error)) {
+            if (!CoreDomUtils.isCanceledError(error)) {
                 throw error;
             }
 
@@ -233,7 +235,7 @@ export class CoreCoursesCourseProgressComponent implements OnInit, OnDestroy, On
                 }
                 break;
             case 'delete':
-                if (this.courseStatus == 'downloaded' || this.courseStatus == 'outdated') {
+                if (this.courseStatus == CoreConstants.DOWNLOADED || this.courseStatus == CoreConstants.OUTDATED) {
                     this.deleteCourse();
                 }
                 break;

From 63ce74ab91ffdcea2695c26457e11f69b32a61df Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 25 Nov 2021 12:19:50 +0100
Subject: [PATCH 0228/1008] MOBILE-3941 login: Don't open browser if URL set
 and QR button

---
 .../features/login/pages/credentials/credentials.ts    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/core/features/login/pages/credentials/credentials.ts b/src/core/features/login/pages/credentials/credentials.ts
index ad4e804ce..f8777a1d3 100644
--- a/src/core/features/login/pages/credentials/credentials.ts
+++ b/src/core/features/login/pages/credentials/credentials.ts
@@ -94,7 +94,7 @@ export class CoreLoginCredentialsPage implements OnInit, OnDestroy {
 
         if (this.isFixedUrlSet || !this.siteConfig) {
             // Fixed URL or not siteConfig retrieved from params, we need to check if it uses browser SSO login.
-            this.checkSite(this.siteUrl);
+            this.checkSite(this.siteUrl, true);
         } else {
             this.siteChecked = true;
             this.pageLoaded = true;
@@ -128,9 +128,10 @@ export class CoreLoginCredentialsPage implements OnInit, OnDestroy {
      * This should be used only if a fixed URL is set, otherwise this check is already performed in CoreLoginSitePage.
      *
      * @param siteUrl Site URL to check.
+     * @param onInit Whether the check site is done when initializing the page.
      * @return Promise resolved when done.
      */
-    protected async checkSite(siteUrl: string): Promise<void> {
+    protected async checkSite(siteUrl: string, onInit = false): Promise<void> {
         this.pageLoaded = false;
 
         // If the site is configured with http:// protocol we force that one, otherwise we use default mode.
@@ -149,6 +150,11 @@ export class CoreLoginCredentialsPage implements OnInit, OnDestroy {
                 // SSO. User needs to authenticate in a browser.
                 this.isBrowserSSO = true;
 
+                if (this.showScanQR && onInit) {
+                    // Don't open browser automatically, let the user view the scan QR button.
+                    return;
+                }
+
                 // Check that there's no SSO authentication ongoing and the view hasn't changed.
                 if (!CoreApp.isSSOAuthenticationOngoing() && !this.viewLeft) {
                     CoreLoginHelper.confirmAndOpenBrowserForSSOLogin(

From dcda71f06f5439b78d31aae615cf2bce4b4d7c16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 26 Nov 2021 14:02:50 +0100
Subject: [PATCH 0229/1008] MOBILE-3806 course: Fix hidden 0% progress

---
 .../course-list-item/core-courses-course-list-item.html        | 3 +--
 .../courses/components/course-list-item/course-list-item.ts    | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html b/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
index 91e596ed5..e6255cc27 100644
--- a/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
+++ b/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
@@ -30,7 +30,7 @@
 </ion-item>
 
 <ion-card [attr.course-color]="course.color ? null : course.colorNumber" *ngIf="layout == 'card' || layout == 'summarycard'"
-    class="core-course-list-card" [class.item-dimmed]="course.hidden" [attr.aria-label]="course.displayname || course.fullname">
+    class="core-course-list-card" [class.item-dimmed]="course.hidden">
     <div (click)="openCourse()" class="core-course-thumb" [class.core-course-color-img]="course.courseImage"
         [style.background-color]="course.color">
         <img *ngIf="course.courseImage" [src]="course.courseImage" core-external-content alt="" />
@@ -51,7 +51,6 @@
             <div *ngIf="layout == 'card' && progress >= 0 && completionUserTracked !== false" lines="none" class="core-course-progress">
                 <core-progress-bar [progress]="progress" a11yText="core.courses.aria:courseprogress"></core-progress-bar>
             </div>
-
         </ion-label>
     </ion-item>
 </ion-card>
diff --git a/src/core/features/courses/components/course-list-item/course-list-item.ts b/src/core/features/courses/components/course-list-item/course-list-item.ts
index 70304420b..bf9d4419f 100644
--- a/src/core/features/courses/components/course-list-item/course-list-item.ts
+++ b/src/core/features/courses/components/course-list-item/course-list-item.ts
@@ -157,7 +157,7 @@ export class CoreCoursesCourseListItemComponent implements OnInit, OnDestroy, On
      * Helper function to update course fields.
      */
     protected updateCourseFields(): void {
-        this.progress = 'progress' in this.course ? this.course.progress || -1 : -1;
+        this.progress = 'progress' in this.course && typeof this.course.progress == 'number' ? this.course.progress : -1;
         this.completionUserTracked = 'completionusertracked' in this.course && this.course.completionusertracked;
     }
 

From 6722c14397c3b44950baaac7484d4333b002d29d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 30 Nov 2021 09:22:01 +0100
Subject: [PATCH 0230/1008] MOBILE-3833 lang: Add suffix param to get_languages

---
 scripts/lang_functions.sh | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/scripts/lang_functions.sh b/scripts/lang_functions.sh
index ef7de3a0f..6b5b4ece3 100755
--- a/scripts/lang_functions.sh
+++ b/scripts/lang_functions.sh
@@ -102,6 +102,15 @@ function get_language {
     pushd $LANGPACKSFOLDER > /dev/null
 
     curl -s $MOODLEORG_URL/$lastversion/$lang.zip --output $lang.zip > /dev/null
+    size=$(du -k "$lang.zip" | cut -f 1)
+    if [ ! -n $lang.zip ] || [ $size -le 60 ]; then
+        echo "Wrong language name or corrupt file for $lang"
+        rm $lang.zip
+
+        popd > /dev/null
+        return
+    fi
+
     rm -R $lang > /dev/null 2>&1> /dev/null
     unzip -o -u $lang.zip > /dev/null
 
@@ -114,6 +123,8 @@ function get_language {
 
 # Entry function to get all language files.
 function get_languages {
+    suffix=$1
+
     get_last_version
 
     if [ -d $LANGPACKSFOLDER ]; then
@@ -131,6 +142,7 @@ function get_languages {
 
     if [ $AWS_SERVICE -eq 1 ]; then
         get_all_languages_aws
+        suffix=''
     else
         echo "Fallback language list will only get current installation languages"
         get_installed_languages
@@ -138,5 +150,9 @@ function get_languages {
 
     for lang in $langs; do
         get_language "$lang"
+
+        if [ $suffix != '' ]; then
+            get_language "$lang$suffix"
+        fi
     done
 }

From 8e86fbd924ae20286c957ed19b285805f001816f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 29 Nov 2021 13:02:45 +0100
Subject: [PATCH 0231/1008] MOBILE-3833 behat: Adapt performance tests

---
 tests/behat/performance.feature | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/behat/performance.feature b/tests/behat/performance.feature
index 264e395af..f90a81ce9 100644
--- a/tests/behat/performance.feature
+++ b/tests/behat/performance.feature
@@ -56,7 +56,7 @@ Feature: Measure performance.
     And I set the field "Your site" to "$WWWROOT" in the app
     And I press "Connect to your site" in the app
     And I log in as "student1"
-    Then I should find "Course 1" in the app
+    And I should find "Timeline" in the app
 
     When I stop measuring "Login"
     Then "Login" should have taken less than 10 seconds
@@ -69,16 +69,18 @@ Feature: Measure performance.
     And I set the field "Your site" to "$WWWROOT" in the app
     And I press "Connect to your site" in the app
     And I log in as "student1"
-    Then I should find "Course 1" in the app
+    Then I press "My courses" in the app
+    And I should find "Course 1" in the app
 
     When I reload the page
     And I start measuring "Open Activity"
     And I wait the app to restart
     Then I should find "Course 1" in the app
 
-    When I press "Course 1" in the app
+    When I enter the course "Course 1" in the app
     And I press "Choice course 1" in the app
     Then I should find "Option 1" in the app
 
     When I stop measuring "Open Activity"
-    Then "Open Activity" should have taken less than 7 seconds
+    # TODO Check back to 7s or review perfect timings
+    Then "Open Activity" should have taken less than 8 seconds

From 56e51e9e60fcb9bb92708720bba30ab602af383b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 17 Nov 2021 11:46:37 +0100
Subject: [PATCH 0232/1008] MOBILE-3810 ionic: Prevent modal from opening twice

---
 src/core/services/utils/dom.ts | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index bc52b22fe..c23675e5c 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -71,6 +71,7 @@ export class CoreDomUtilsProvider {
     protected instances: WeakMap<Element, unknown> = new WeakMap(); // Store component/directive instances indexed by element.
     protected debugDisplay = false; // Whether to display debug messages. Store it in a variable to make it synchronous.
     protected displayedAlerts: Record<string, HTMLIonAlertElement> = {}; // To prevent duplicated alerts.
+    protected displayedModals: Record<string, HTMLIonModalElement> = {}; // To prevent duplicated modals.
     protected activeLoadingModals: CoreIonLoadingElement[] = [];
     protected logger: CoreLogger;
 
@@ -1690,26 +1691,37 @@ export class CoreDomUtilsProvider {
     async openModal<T = unknown>(
         options: OpenModalOptions,
     ): Promise<T | undefined> {
-
         const { waitForDismissCompleted, closeOnNavigate, ...modalOptions } = options;
         const listenCloseEvents = closeOnNavigate ?? true; // Default to true.
 
-        const modal = await ModalController.create(modalOptions);
+        // TODO: Improve this if we need two modals with same component open at the same time.
+        const modalId = <string> Md5.hashAsciiStr(options.component?.toString() || '');
+
+        const modal = this.displayedModals[modalId]
+            ? this.displayedModals[modalId]
+            : await ModalController.create(modalOptions);
 
         let navSubscription: Subscription | undefined;
-        if (listenCloseEvents) {
-            // Listen navigation events to close modals.
-            navSubscription = Router.events
-                .pipe(filter(event => event instanceof NavigationStart))
-                .subscribe(async () => {
-                    modal.dismiss();
-                });
-        }
 
-        await modal.present();
+        if (!this.displayedModals[modalId]) {
+            // Store the modal and remove it when dismissed.
+            this.displayedModals[modalId] = modal;
+
+            if (listenCloseEvents) {
+                // Listen navigation events to close modals.
+                navSubscription = Router.events
+                    .pipe(filter(event => event instanceof NavigationStart))
+                    .subscribe(async () => {
+                        modal.dismiss();
+                    });
+            }
+
+            await modal.present();
+        }
 
         const result = waitForDismissCompleted ? await modal.onDidDismiss<T>() : await modal.onWillDismiss<T>();
         navSubscription?.unsubscribe();
+        delete this.displayedModals[modalId];
 
         if (result?.data) {
             return result?.data;

From 8a3ae5e081c0651ebf48d6b0f2fb6e6646aefa3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 16 Nov 2021 14:10:43 +0100
Subject: [PATCH 0233/1008] MOBILE-3810 module: Fix getIconSrc on course module
 handler

---
 .../mod/resource/services/handlers/module.ts  | 28 ++++++++++++++++++-
 src/core/components/mod-icon/mod-icon.ts      |  4 +--
 .../course/services/module-delegate.ts        |  8 ++++--
 3 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/src/addons/mod/resource/services/handlers/module.ts b/src/addons/mod/resource/services/handlers/module.ts
index 69a3d2ce8..275ea61f7 100644
--- a/src/addons/mod/resource/services/handlers/module.ts
+++ b/src/addons/mod/resource/services/handlers/module.ts
@@ -15,7 +15,7 @@
 import { CoreConstants } from '@/core/constants';
 import { Injectable, Type } from '@angular/core';
 import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
-import { CoreCourse } from '@features/course/services/course';
+import { CoreCourse, CoreCourseWSModule } from '@features/course/services/course';
 import { CoreCourseModule } from '@features/course/services/course-helper';
 import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
 import { CoreCourseModulePrefetchDelegate } from '@features/course/services/module-prefetch-delegate';
@@ -226,6 +226,32 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase
         };
     }
 
+    /**
+     * @inheritdoc
+     */
+    async getIconSrc(module?: CoreCourseWSModule): Promise<string | undefined> {
+        if (!module) {
+            return;
+        }
+        let mimetypeIcon = '';
+
+        if ('contentsinfo' in module && module.contentsinfo) {
+            // No need to use the list of files.
+            const mimetype = module.contentsinfo.mimetypes[0];
+            if (mimetype) {
+                mimetypeIcon = CoreMimetypeUtils.getMimetypeIcon(mimetype);
+            }
+
+        } else if (module.contents && module.contents[0]) {
+            const files = module.contents;
+            const file = files[0];
+
+            mimetypeIcon = CoreMimetypeUtils.getFileIcon(file.filename || '');
+        }
+
+        return await CoreCourse.getModuleIconSrc(module.modname, module.modicon, mimetypeIcon);
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/src/core/components/mod-icon/mod-icon.ts b/src/core/components/mod-icon/mod-icon.ts
index eba805215..c9c6b70ac 100644
--- a/src/core/components/mod-icon/mod-icon.ts
+++ b/src/core/components/mod-icon/mod-icon.ts
@@ -15,7 +15,7 @@
 import { Component, Input, OnChanges, OnInit, SimpleChange } from '@angular/core';
 import { CoreCourse } from '@features/course/services/course';
 
-const assetsPath = 'assets/img/mod/';
+const assetsPath = 'assets/img/';
 const fallbackModName = 'external-tool';
 
 /**
@@ -51,7 +51,7 @@ export class CoreModIconComponent implements OnInit, OnChanges {
      * @inheritdoc
      */
     ngOnChanges(changes: { [name: string]: SimpleChange }): void {
-        if (changes && changes.modicon && changes.modicon.previousValue) {
+        if (changes && changes.modicon && changes.modicon.previousValue !== undefined) {
             this.setIcon();
         }
     }
diff --git a/src/core/features/course/services/module-delegate.ts b/src/core/features/course/services/module-delegate.ts
index f967c89a5..e5f918d1f 100644
--- a/src/core/features/course/services/module-delegate.ts
+++ b/src/core/features/course/services/module-delegate.ts
@@ -80,9 +80,10 @@ export interface CoreCourseModuleHandler extends CoreDelegateHandler {
     /**
      * Get the icon src for the module.
      *
+     * @param module: Module to get the icon from.
      * @return The icon src.
      */
-    getIconSrc?(module: CoreCourseWSModule): Promise<string> | string | undefined;
+    getIconSrc?(module?: CoreCourseWSModule): Promise<string | undefined> | string | undefined;
 
     /**
      * Check if this type of module supports a certain feature.
@@ -343,10 +344,11 @@ export class CoreCourseModuleDelegateService extends CoreDelegate<CoreCourseModu
      *
      * @param modname The name of the module type.
      * @param modicon The mod icon string.
+     * @param module The module to use.
      * @return Promise resolved with the icon src.
      */
-    async getModuleIconSrc(modname: string, modicon?: string): Promise<string> {
-        const icon = await this.executeFunctionOnEnabled<Promise<string>>(modname, 'getIconSrc');
+    async getModuleIconSrc(modname: string, modicon?: string, module?: CoreCourseWSModule): Promise<string> {
+        const icon = await this.executeFunctionOnEnabled<Promise<string>>(modname, 'getIconSrc', [module]);
 
         return icon || await CoreCourse.getModuleIconSrc(modname, modicon) || '';
     }

From dace9898d04967d4871bde0220a44bcb3f83971f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 16 Nov 2021 12:58:46 +0100
Subject: [PATCH 0234/1008] MOBILE-3810 module: Add basic info to
 core-course-module-info

---
 .../index/addon-mod-assign-index.html         | 67 +++++++---------
 .../index/addon-mod-book-index.html           | 25 +++---
 .../index/addon-mod-chat-index.html           | 16 ++--
 .../index/addon-mod-choice-index.html         | 31 ++++----
 .../index/addon-mod-data-index.html           | 27 +++----
 .../index/addon-mod-feedback-index.html       | 39 ++++------
 .../index/addon-mod-folder-index.html         | 17 ++--
 .../mod/forum/components/index/index.html     | 77 ++++++++-----------
 .../index/addon-mod-glossary-index.html       | 30 ++++----
 .../index/addon-mod-h5pactivity-index.html    | 24 +++---
 .../index/addon-mod-imscp-index.html          | 11 ++-
 .../index/addon-mod-lesson-index.html         | 26 +++----
 .../components/index/addon-mod-lti-index.html | 17 ++--
 .../index/addon-mod-page-index.html           | 16 ++--
 .../index/addon-mod-quiz-index.html           | 62 +++++++--------
 .../index/addon-mod-resource-index.html       | 18 ++---
 .../index/addon-mod-scorm-index.html          | 26 +++----
 .../index/addon-mod-survey-index.html         | 45 +++++------
 .../components/index/addon-mod-url-index.html | 16 ++--
 .../index/addon-mod-wiki-index.html           | 33 ++++----
 src/addons/mod/wiki/pages/index/index.ts      |  4 +-
 .../index/addon-mod-workshop-index.html       | 40 ++++++----
 .../course/classes/main-resource-component.ts |  4 +-
 .../module-description/module-description.ts  |  4 +-
 .../module-info/core-course-module-info.html  | 53 +++++++++----
 .../module-info/course-module-info.scss       |  6 +-
 .../components/module-info/module-info.ts     | 35 ++++++++-
 .../core-course-unsupported-module.html       |  5 +-
 28 files changed, 365 insertions(+), 409 deletions(-)

diff --git a/src/addons/mod/assign/components/index/addon-mod-assign-index.html b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
index ef0cd7d5d..1efbaa292 100644
--- a/src/addons/mod/assign/components/index/addon-mod-assign-index.html
+++ b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
@@ -1,15 +1,14 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
     <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false">
+        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
+            iconAction="fas-external-link-alt" [showBrowserWarning]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="assign && (description || (assign.introattachments && assign.introattachments.length))"
-            [priority]="800" [content]="'core.moduleintro' | translate" (action)="expandDescription()"
-            iconAction="fas-arrow-right">
+            [priority]="800" [content]="'core.moduleintro' | translate" (action)="expandDescription()" iconAction="fas-arrow-right">
         </core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}"
-            iconAction="far-newspaper" (action)="gotoBlog()">
+        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
+            (action)="gotoBlog()">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="loaded && !hasOffline && isOnline" [priority]="700" [content]="'core.refresh' | translate"
             (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false">
@@ -31,26 +30,15 @@
 <core-loading [hideUntil]="loaded">
 
     <!-- Activity info. -->
-    <core-course-module-info *ngIf="showCompletion" [module]="module" [showManualCompletion]="true"
-        (completionChanged)="onCompletionChange()">
+    <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
+        [component]="component" [componentId]="componentId" [courseId]="courseId">
+        <ion-list inset="true" description *ngIf="assign && assign.introattachments && assign.introattachments.length">
+            <core-file *ngFor="let file of assign.introattachments" [file]="file" [component]="component" [componentId]="componentId">
+            </core-file>
+        </ion-list>
     </core-course-module-info>
 
-    <!-- Description and intro attachments. -->
-    <ion-card *ngIf="description">
-        <ion-item class="ion-text-wrap">
-            <ion-label>
-                <core-format-text [text]="description" [component]="component" [componentId]="componentId" maxHeight="120"
-                    contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"
-                    (onClick)="expandDescription($event)">
-                </core-format-text>
-            </ion-label>
-        </ion-item>
-    </ion-card>
 
-    <ion-card *ngIf="assign && assign.introattachments && assign.introattachments.length">
-        <core-file *ngFor="let file of assign.introattachments" [file]="file" [component]="component" [componentId]="componentId">
-        </core-file>
-    </ion-card>
 
     <!-- Assign has something offline. -->
     <ion-card class="core-warning-card" *ngIf="hasOffline">
@@ -90,8 +78,7 @@
             </ion-item>
 
             <!-- Summary of all submissions. -->
-            <ion-item class="ion-text-wrap" *ngIf="summary && summary.participantcount" (click)="goToSubmissionList()" detail="true"
-                button>
+            <ion-item class="ion-text-wrap" *ngIf="summary && summary.participantcount" (click)="goToSubmissionList()" detail="true" button>
                 <ion-label>
                     <h2 *ngIf="assign.teamsubmission">{{ 'addon.mod_assign.numberofteams' | translate }}</h2>
                     <h2 *ngIf="!assign.teamsubmission">{{ 'addon.mod_assign.numberofparticipants' | translate }}</h2>
@@ -109,48 +96,48 @@
 
             <!-- Summary of submissions with draft status. -->
             <ion-item class="ion-text-wrap" *ngIf="assign.submissiondrafts && summary && summary.submissionsenabled"
-                [class.hide-detail]="!summary.submissiondraftscount"
-                detail="true"
-                [button]="summary.submissiondraftscount"
+                [class.hide-detail]="!summary.submissiondraftscount" detail="true" [button]="summary.submissiondraftscount"
                 (click)="goToSubmissionList(submissionStatusDraft, !!summary.submissiondraftscount)">
-                <ion-label><h2>{{ 'addon.mod_assign.numberofdraftsubmissions' | translate }}</h2></ion-label>
+                <ion-label>
+                    <h2>{{ 'addon.mod_assign.numberofdraftsubmissions' | translate }}</h2>
+                </ion-label>
                 <ion-badge slot="end" color="primary">
                     <span aria-hidden="true">{{ summary.submissiondraftscount }}</span>
                     <span class="sr-only">
                         {{ 'addon.mod_assign.numberofdraftsubmissionscountdescription' | translate:
-                            {count: summary.submissiondraftscount} }}
+                        {count: summary.submissiondraftscount} }}
                     </span>
                 </ion-badge>
             </ion-item>
 
             <!-- Summary of submissions with submitted status. -->
             <ion-item class="ion-text-wrap" *ngIf="summary && summary.submissionsenabled"
-                [class.hide-detail]="!summary.submissionssubmittedcount"
-                detail="true"
-                [button]="summary.submissionssubmittedcount"
+                [class.hide-detail]="!summary.submissionssubmittedcount" detail="true" [button]="summary.submissionssubmittedcount"
                 (click)="goToSubmissionList(submissionStatusSubmitted, !!summary.submissionssubmittedcount)">
-                <ion-label><h2>{{ 'addon.mod_assign.numberofsubmittedassignments' | translate }}</h2></ion-label>
+                <ion-label>
+                    <h2>{{ 'addon.mod_assign.numberofsubmittedassignments' | translate }}</h2>
+                </ion-label>
                 <ion-badge slot="end" color="primary">
                     <span aria-hidden="true">{{ summary.submissionssubmittedcount }}</span>
                     <span class="sr-only">
                         {{ 'addon.mod_assign.numberofsubmittedassignmentscountdescription' | translate:
-                            {count: summary.submissionssubmittedcount} }}
+                        {count: summary.submissionssubmittedcount} }}
                     </span>
                 </ion-badge>
             </ion-item>
 
             <!-- Summary of submissions that need grading. -->
             <ion-item class="ion-text-wrap" *ngIf="summary && summary.submissionsenabled && !assign.teamsubmission"
-                [class.hide-detail]="!needsGradingAvailable"
-                detail="true"
-                [button]="needsGradingAvailable"
+                [class.hide-detail]="!needsGradingAvailable" detail="true" [button]="needsGradingAvailable"
                 (click)="goToSubmissionList(needGrading, needsGradingAvailable)">
-                <ion-label><h2>{{ 'addon.mod_assign.numberofsubmissionsneedgrading' | translate }}</h2></ion-label>
+                <ion-label>
+                    <h2>{{ 'addon.mod_assign.numberofsubmissionsneedgrading' | translate }}</h2>
+                </ion-label>
                 <ion-badge slot="end" color="primary">
                     <span aria-hidden="true">{{ summary.submissionsneedgradingcount }}</span>
                     <span class="sr-only">
                         {{ 'addon.mod_assign.numberofsubmissionsneedgradingcountdescription' | translate:
-                            {count: summary.submissionsneedgradingcount} }}
+                        {count: summary.submissionsneedgradingcount} }}
                     </span>
                 </ion-badge>
             </ion-item>
diff --git a/src/addons/mod/book/components/index/addon-mod-book-index.html b/src/addons/mod/book/components/index/addon-mod-book-index.html
index 7be6e735b..f6f090647 100644
--- a/src/addons/mod/book/components/index/addon-mod-book-index.html
+++ b/src/addons/mod/book/components/index/addon-mod-book-index.html
@@ -4,12 +4,12 @@
         <ion-icon name="fas-bookmark" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
     <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false"></core-context-menu-item>
+        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
+            iconAction="fas-external-link-alt" [showBrowserWarning]="false"></core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right"></core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}"
-            iconAction="far-newspaper" (action)="gotoBlog()"></core-context-menu-item>
+        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
+            (action)="gotoBlog()"></core-context-menu-item>
         <core-context-menu-item [priority]="700" [content]="'core.refresh' | translate" (action)="doRefresh(null, $event)"
             [iconAction]="refreshIcon" [closeOnClick]="false"></core-context-menu-item>
         <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="600" [content]="prefetchText" (action)="prefetch($event)"
@@ -24,13 +24,10 @@
 <core-loading [hideUntil]="loaded">
 
     <!-- Activity info. -->
-    <core-course-module-info *ngIf="showCompletion" [module]="module" [showManualCompletion]="true"
-        (completionChanged)="onCompletionChange()">
+    <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
+        [component]="component" [componentId]="componentId" [courseId]="courseId">
     </core-course-module-info>
 
-    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId"
-        contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-course-module-description>
-
     <ion-card class="core-warning-card" *ngIf="warning">
         <ion-item>
             <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
@@ -39,9 +36,8 @@
     </ion-card>
 
     <div class="ion-padding safe-area-padding-horizontal">
-        <core-navigation-bar *ngIf="displayNavBar" [previous]="previousChapter?.id"
-            [previousTitle]="previousNavBarTitle" [next]="nextChapter?.id" [nextTitle]="nextNavBarTitle"
-            (action)="changeChapter($event)">
+        <core-navigation-bar *ngIf="displayNavBar" [previous]="previousChapter?.id" [previousTitle]="previousNavBarTitle"
+            [next]="nextChapter?.id" [nextTitle]="nextNavBarTitle" (action)="changeChapter($event)">
         </core-navigation-bar>
 
         <core-format-text [component]="component" [componentId]="componentId" [text]="chapterContent" contextLevel="module"
@@ -51,9 +47,8 @@
             <core-tag-list [tags]="tags"></core-tag-list>
         </div>
 
-        <core-navigation-bar *ngIf="displayNavBar" [previous]="previousChapter?.id"
-            [previousTitle]="previousNavBarTitle" [next]="nextChapter?.id" [nextTitle]="nextNavBarTitle"
-            (action)="changeChapter($event)"></core-navigation-bar>
+        <core-navigation-bar *ngIf="displayNavBar" [previous]="previousChapter?.id" [previousTitle]="previousNavBarTitle"
+            [next]="nextChapter?.id" [nextTitle]="nextNavBarTitle" (action)="changeChapter($event)"></core-navigation-bar>
     </div>
 
 </core-loading>
diff --git a/src/addons/mod/chat/components/index/addon-mod-chat-index.html b/src/addons/mod/chat/components/index/addon-mod-chat-index.html
index 8f1069746..93265acea 100644
--- a/src/addons/mod/chat/components/index/addon-mod-chat-index.html
+++ b/src/addons/mod/chat/components/index/addon-mod-chat-index.html
@@ -1,14 +1,14 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
     <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false">
+        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
+            iconAction="fas-external-link-alt" [showBrowserWarning]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right">
         </core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}"
-            iconAction="far-newspaper" (action)="gotoBlog()">
+        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
+            (action)="gotoBlog()">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="loaded && isOnline" [priority]="700" [content]="'core.refresh' | translate"
             (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false">
@@ -27,14 +27,10 @@
 <core-loading [hideUntil]="loaded" class="safe-area-padding">
 
     <!-- Activity info. -->
-    <core-course-module-info *ngIf="showCompletion" [module]="module" [showManualCompletion]="true"
-        (completionChanged)="onCompletionChange()">
+    <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
+        [component]="component" [componentId]="componentId" [courseId]="courseId">
     </core-course-module-info>
 
-    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId"
-        contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
-    </core-course-module-description>
-
     <ion-card *ngIf="chatInfo" class="core-info-card">
         <ion-item>
             <ion-icon name="fas-clock" slot="start" aria-hidden="true"></ion-icon>
diff --git a/src/addons/mod/choice/components/index/addon-mod-choice-index.html b/src/addons/mod/choice/components/index/addon-mod-choice-index.html
index 60a41827e..f0e2aa0f5 100644
--- a/src/addons/mod/choice/components/index/addon-mod-choice-index.html
+++ b/src/addons/mod/choice/components/index/addon-mod-choice-index.html
@@ -1,14 +1,14 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
     <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false">
+        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
+            iconAction="fas-external-link-alt" [showBrowserWarning]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right">
         </core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}"
-            iconAction="far-newspaper" (action)="gotoBlog()">
+        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
+            (action)="gotoBlog()">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="loaded && !hasOffline && isOnline" [priority]="700" [content]="'core.refresh' | translate"
             (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false">
@@ -29,14 +29,10 @@
 <core-loading [hideUntil]="loaded">
 
     <!-- Activity info. -->
-    <core-course-module-info *ngIf="showCompletion" [module]="module" [showManualCompletion]="true"
-        (completionChanged)="onCompletionChange()">
+    <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
+        [component]="component" [componentId]="componentId" [courseId]="courseId">
     </core-course-module-info>
 
-    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId"
-        contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
-    </core-course-module-description>
-
     <!-- Activity availability messages -->
     <ion-card class="core-info-card" *ngIf="choiceNotOpenYet">
         <ion-item>
@@ -54,8 +50,7 @@
             <ion-label>
                 <p *ngIf="options.length">
                     {{ 'addon.mod_choice.yourselection' | translate }}
-                    <core-format-text [text]="options[0].text" contextLevel="module" [contextInstanceId]="module.id"
-                        [courseId]="courseId">
+                    <core-format-text [text]="options[0].text" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
                     </core-format-text>
                 </p>
                 <p>{{ 'addon.mod_choice.expired' | translate:{$a: closeTimeReadable} }}</p>
@@ -145,10 +140,12 @@
                                 </p>
                             </ion-label>
                         </ion-item-divider>
-                        <ion-item *ngFor="let user of result.userresponses" core-user-link [courseId]="courseId"
-                            [userId]="user.userid" [attr.aria-label]="user.fullname" class="ion-text-wrap">
+                        <ion-item *ngFor="let user of result.userresponses" core-user-link [courseId]="courseId" [userId]="user.userid"
+                            [attr.aria-label]="user.fullname" class="ion-text-wrap">
                             <core-user-avatar [user]="user" slot="start" [courseId]="courseId"></core-user-avatar>
-                            <ion-label><p>{{user.fullname}}</p></ion-label>
+                            <ion-label>
+                                <p>{{user.fullname}}</p>
+                            </ion-label>
                         </ion-item>
                     </ion-item-group>
                 </ion-col>
@@ -159,7 +156,9 @@
     <ion-card class="core-info-card" *ngIf="!canSeeResults && !choiceNotOpenYet">
         <ion-item>
             <ion-icon name="fas-info-circle" slot="start" aria-hidden="true"></ion-icon>
-            <ion-label><p>{{ 'addon.mod_choice.noresultsviewable' | translate }}</p></ion-label>
+            <ion-label>
+                <p>{{ 'addon.mod_choice.noresultsviewable' | translate }}</p>
+            </ion-label>
         </ion-item>
     </ion-card>
 </core-loading>
diff --git a/src/addons/mod/data/components/index/addon-mod-data-index.html b/src/addons/mod/data/components/index/addon-mod-data-index.html
index 7f8633b5d..f8a993361 100644
--- a/src/addons/mod/data/components/index/addon-mod-data-index.html
+++ b/src/addons/mod/data/components/index/addon-mod-data-index.html
@@ -4,28 +4,27 @@
         <ion-icon name="fas-search" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
     <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false">
+        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
+            iconAction="fas-external-link-alt" [showBrowserWarning]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right">
         </core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}"
-            iconAction="far-newspaper" (action)="gotoBlog()">
+        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
+            (action)="gotoBlog()">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="loaded && !(hasOffline || hasOfflineRatings) && isOnline" [priority]="700"
-            [content]="'core.refresh' | translate" (action)="doRefresh(null, $event)" [iconAction]="refreshIcon"
-            [closeOnClick]="false">
+            [content]="'core.refresh' | translate" (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="loaded && (hasOffline || hasOfflineRatings) && isOnline" [priority]="600"
             [content]="'core.settings.synchronizenow' | translate" (action)="doRefresh(null, $event, true)" [iconAction]="syncIcon"
             [closeOnClick]="false">
         </core-context-menu-item>
-        <core-context-menu-item [priority]="500" *ngIf="canAdd" [content]="'addon.mod_data.addentries' | translate"
-            iconAction="fas-plus" (action)="gotoAddEntries()">
+        <core-context-menu-item [priority]="500" *ngIf="canAdd" [content]="'addon.mod_data.addentries' | translate" iconAction="fas-plus"
+            (action)="gotoAddEntries()">
         </core-context-menu-item>
-        <core-context-menu-item [priority]="400" *ngIf="firstEntry" [content]="'addon.mod_data.single' | translate"
-            iconAction="fas-file" (action)="gotoEntry(firstEntry)">
+        <core-context-menu-item [priority]="400" *ngIf="firstEntry" [content]="'addon.mod_data.single' | translate" iconAction="fas-file"
+            (action)="gotoEntry(firstEntry)">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="300" [content]="prefetchText" (action)="prefetch($event)"
             [iconAction]="prefetchStatusIcon" [closeOnClick]="false">
@@ -40,14 +39,10 @@
 <core-loading [hideUntil]="loaded">
 
     <!-- Activity info. -->
-    <core-course-module-info *ngIf="showCompletion" [module]="module" [showManualCompletion]="true"
-        (completionChanged)="onCompletionChange()">
+    <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
+        [component]="component" [componentId]="componentId" [courseId]="courseId">
     </core-course-module-info>
 
-    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId"
-        contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
-    </core-course-module-description>
-
     <!-- Data done in offline but not synchronized -->
     <ion-card class="core-warning-card" *ngIf="hasOffline || hasOfflineRatings">
         <ion-item>
diff --git a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
index 124241f10..b6852c689 100644
--- a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
+++ b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
@@ -1,14 +1,14 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
     <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false">
+        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
+            iconAction="fas-external-link-alt" [showBrowserWarning]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right">
         </core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}"
-            iconAction="far-newspaper" (action)="gotoBlog()">
+        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
+            (action)="gotoBlog()">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="loaded && !hasOffline && isOnline" [priority]="700" [content]="'core.refresh' | translate"
             (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false">
@@ -29,22 +29,18 @@
 <core-loading [hideUntil]="loaded">
 
     <!-- Activity info. -->
-    <core-course-module-info *ngIf="showCompletion" [module]="module" [showManualCompletion]="true"
-        (completionChanged)="onCompletionChange()">
+    <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
+        [component]="component" [componentId]="componentId" [courseId]="courseId">
     </core-course-module-info>
 
-    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId"
-        contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
-    </core-course-module-description>
-
     <core-tabs [hideUntil]="tabsReady" [selectedIndex]="firstSelectedTab">
         <core-tab [title]="'addon.mod_feedback.overview' | translate" id="overview" (ionSelect)="tabChanged('overview')">
             <ng-template>
                 <ng-container *ngTemplateOutlet="tabOverview"></ng-container>
             </ng-template>
         </core-tab>
-        <core-tab *ngIf="showAnalysis && access && access.canviewreports" id="analysis"
-            [title]="'addon.mod_feedback.analysis' | translate" (ionSelect)="tabChanged('analysis')">
+        <core-tab *ngIf="showAnalysis && access && access.canviewreports" id="analysis" [title]="'addon.mod_feedback.analysis' | translate"
+            (ionSelect)="tabChanged('analysis')">
             <ng-template>
                 <ng-container *ngTemplateOutlet="tabAnalysis"></ng-container>
             </ng-template>
@@ -73,10 +69,8 @@
                 </ion-select-option>
             </ion-select>
         </ion-item>
-        <ion-item class="ion-text-wrap" (click)="openRespondents()"
-            [class.hide-detail]="!(access.canviewreports && completedCount > 0)"
-            detail="true"
-            [button]="access.canviewreports && completedCount > 0">
+        <ion-item class="ion-text-wrap" (click)="openRespondents()" [class.hide-detail]="!(access.canviewreports && completedCount > 0)"
+            detail="true" [button]="access.canviewreports && completedCount > 0">
             <ion-label>
                 <h2>{{ 'addon.mod_feedback.completed_feedbacks' | translate }}</h2>
             </ion-label>
@@ -87,8 +81,8 @@
                 </span>
             </ion-badge>
         </ion-item>
-        <ion-item class="ion-text-wrap" *ngIf="!access.isanonymous && access.canviewreports" (click)="openNonRespondents()"
-            detail="true" button>
+        <ion-item class="ion-text-wrap" *ngIf="!access.isanonymous && access.canviewreports" (click)="openNonRespondents()" detail="true"
+            button>
             <ion-label>
                 <h2>{{ 'addon.mod_feedback.show_nonrespondents' | translate }}</h2>
             </ion-label>
@@ -208,12 +202,12 @@
                     <ion-label>
                         <p class="item-heading">
                             {{item.num}}. <core-format-text [component]="component" [componentId]="componentId" [text]="item.name"
-                            contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
+                                contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
                             </core-format-text>
                         </p>
                         <p>
-                            <core-format-text [component]="component" [componentId]="componentId" [text]="item.label"
-                                contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
+                            <core-format-text [component]="component" [componentId]="componentId" [text]="item.label" contextLevel="module"
+                                [contextInstanceId]="module.id" [courseId]="courseId">
                             </core-format-text>
                         </p>
                         <ng-container [ngSwitch]="item.templateName">
@@ -232,8 +226,7 @@
                             </ng-container>
                             <ng-container *ngSwitchCase="'chart'">
                                 <core-chart [type]="item.chartType" [data]="item.chartData" [labels]="item.labels" height="300"
-                                    contextLevel="module" [contextInstanceId]="module.id" [wsNotFiltered]="true"
-                                    [courseId]="courseId">
+                                    contextLevel="module" [contextInstanceId]="module.id" [wsNotFiltered]="true" [courseId]="courseId">
                                 </core-chart>
                                 <p *ngIf="item.average">
                                     {{ 'addon.mod_feedback.average' | translate }}: {{item.average | number : '1.2-2'}}
diff --git a/src/addons/mod/folder/components/index/addon-mod-folder-index.html b/src/addons/mod/folder/components/index/addon-mod-folder-index.html
index 4763418b3..e44e8a1b7 100644
--- a/src/addons/mod/folder/components/index/addon-mod-folder-index.html
+++ b/src/addons/mod/folder/components/index/addon-mod-folder-index.html
@@ -1,14 +1,14 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
     <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false">
+        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
+            iconAction="fas-external-link-alt" [showBrowserWarning]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right">
         </core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}"
-             iconAction="far-newspaper" (action)="gotoBlog()">
+        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
+            (action)="gotoBlog()">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="!subfolder" [priority]="700" [content]="'core.refresh' | translate"
             (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false">
@@ -26,14 +26,11 @@
 <core-loading [hideUntil]="loaded">
 
     <!-- Activity info. -->
-    <core-course-module-info *ngIf="showCompletion" [module]="module" [showManualCompletion]="true"
-        (completionChanged)="onCompletionChange()">
+    <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
+        [component]="component" [componentId]="componentId" [courseId]="courseId">
+        <h3 *ngIf="subfolder" title>{{subfolder.filename}}</h3>
     </core-course-module-info>
 
-    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId"
-        contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
-    </core-course-module-description>
-
     <ion-list *ngIf="contents && (contents.files.length + contents.folders.length > 0)">
         <ng-container *ngFor="let folder of contents.folders">
             <ion-item class="item-file" (click)="openFolder(folder)" detail="true" button>
diff --git a/src/addons/mod/forum/components/index/index.html b/src/addons/mod/forum/components/index/index.html
index 3703497a6..642a96d2f 100644
--- a/src/addons/mod/forum/components/index/index.html
+++ b/src/addons/mod/forum/components/index/index.html
@@ -1,38 +1,30 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
     <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl"
-            [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl" iconAction="fas-external-link-alt"
-            [showBrowserWarning]="false">
+        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
+            iconAction="fas-external-link-alt" [showBrowserWarning]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right">
         </core-context-menu-item>
-        <core-context-menu-item *ngIf="blog"
-            [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper" (action)="gotoBlog()">
+        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
+            (action)="gotoBlog()">
         </core-context-menu-item>
-        <core-context-menu-item
-            *ngIf="discussions.loaded && !(hasOffline || hasOfflineRatings) && isOnline"
-            [priority]="700" [content]="'addon.mod_forum.refreshdiscussions' | translate" [iconAction]="refreshIcon" [closeOnClick]="false"
+        <core-context-menu-item *ngIf="discussions.loaded && !(hasOffline || hasOfflineRatings) && isOnline" [priority]="700"
+            [content]="'addon.mod_forum.refreshdiscussions' | translate" [iconAction]="refreshIcon" [closeOnClick]="false"
             (action)="doRefresh(null, $event)">
         </core-context-menu-item>
-        <core-context-menu-item
-            *ngIf="discussions.loaded && (hasOffline || hasOfflineRatings) && isOnline"
-            [priority]="600" [content]="'core.settings.synchronizenow' | translate" [iconAction]="syncIcon" [closeOnClick]="false"
+        <core-context-menu-item *ngIf="discussions.loaded && (hasOffline || hasOfflineRatings) && isOnline" [priority]="600"
+            [content]="'core.settings.synchronizenow' | translate" [iconAction]="syncIcon" [closeOnClick]="false"
             (action)="doRefresh(null, $event, true)">
         </core-context-menu-item>
-        <core-context-menu-item *ngIf="prefetchStatusIcon"
-            [priority]="500" [content]="prefetchText" [iconAction]="prefetchStatusIcon" [closeOnClick]="false"
-            (action)="prefetch($event)">
+        <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="500" [content]="prefetchText" [iconAction]="prefetchStatusIcon"
+            [closeOnClick]="false" (action)="prefetch($event)">
         </core-context-menu-item>
-        <core-context-menu-item *ngIf="size"
-            iconDescription="fas-archive" iconAction="fas-trash"
-            [priority]="400" [content]="'core.clearstoreddata' | translate:{$a: size}" [closeOnClick]="false"
-            (action)="removeFiles($event)">
+        <core-context-menu-item *ngIf="size" iconDescription="fas-archive" iconAction="fas-trash" [priority]="400"
+            [content]="'core.clearstoreddata' | translate:{$a: size}" [closeOnClick]="false" (action)="removeFiles($event)">
         </core-context-menu-item>
-        <core-context-menu-item *ngIf="sortingAvailable"
-            iconAction="fas-sort"
-            [priority]="300" [content]="'core.sort' | translate"
+        <core-context-menu-item *ngIf="sortingAvailable" iconAction="fas-sort" [priority]="300" [content]="'core.sort' | translate"
             (action)="showSortOrderSelector()">
         </core-context-menu-item>
     </core-context-menu>
@@ -46,15 +38,16 @@
 
     <core-loading [hideUntil]="discussions.loaded">
         <!-- Activity info. -->
-        <core-course-module-info *ngIf="showCompletion" [module]="module" [showManualCompletion]="true"
-            (completionChanged)="onCompletionChange()">
+        <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()"
+            [description]="forum && forum.type != 'single' && description" [component]="component"
+            [componentId]="componentId" [courseId]="courseId">
+            <ion-item>
+                <ion-label>
+                    {{descriptionNote}}
+                </ion-label>
+            </ion-item>
         </core-course-module-info>
 
-        <core-course-module-description *ngIf="forum && forum.type != 'single'"
-            [description]="description" [component]="component" [componentId]="componentId" [note]="descriptionNote"
-            contextLevel="module" [contextInstanceId]="module && module.id" [courseId]="courseId">
-        </core-course-module-description>
-
         <!-- Forum discussions found to be synchronized -->
         <ion-card class="core-warning-card" *ngIf="hasOffline || hasOfflineRatings">
             <ion-item>
@@ -72,23 +65,17 @@
         </ion-card>
 
         <ng-container *ngIf="forum">
-            <core-empty-box *ngIf="discussions.empty" icon="far-comments"
-                [message]="'addon.mod_forum.forumnodiscussionsyet' | translate">
+            <core-empty-box *ngIf="discussions.empty" icon="far-comments" [message]="'addon.mod_forum.forumnodiscussionsyet' | translate">
             </core-empty-box>
 
             <div *ngIf="!discussions.empty && sortingAvailable && selectedSortOrder" class="ion-text-wrap">
-                <core-combobox
-                    [modalOptions]="sortOrderSelectorModalOptions"
-                    listboxId="addon-mod-forum-sort-selector"
-                    [label]="('core.sort' | translate)"
-                    (onChange)="setSortOrder($event)"
-                    [selection]="selectedSortOrder.label | translate"
+                <core-combobox [modalOptions]="sortOrderSelectorModalOptions" listboxId="addon-mod-forum-sort-selector"
+                    [label]="('core.sort' | translate)" (onChange)="setSortOrder($event)" [selection]="selectedSortOrder.label | translate"
                     interface="modal">
                 </core-combobox>
             </div>
 
-            <ion-item *ngFor="let discussion of discussions.items"
-                class="addon-mod-forum-discussion" detail="true"
+            <ion-item *ngFor="let discussion of discussions.items" class="addon-mod-forum-discussion" detail="true"
                 [lines]="discussion.groupname && 'none'" [attr.aria-current]="discussions.getItemAriaCurrent(discussion)"
                 (click)="discussions.select(discussion)" button>
                 <ion-label>
@@ -98,15 +85,12 @@
                                 [attr.aria-label]="'addon.mod_forum.discussionpinned' | translate"></ion-icon>
                             <ion-icon name="fas-star" class="addon-forum-star" *ngIf="!discussion.pinned && discussion.starred"
                                 [attr.aria-label]="'addon.mod_forum.favourites' | translate"></ion-icon>
-                            <core-format-text
-                                [text]="discussion.subject"
-                                contextLevel="module" [contextInstanceId]="module && module.id" [courseId]="courseId">
+                            <core-format-text [text]="discussion.subject" contextLevel="module" [contextInstanceId]="module && module.id"
+                                [courseId]="courseId">
                             </core-format-text>
                         </p>
-                        <ion-button *ngIf="canPin || discussion.canlock || discussion.canfavourite"
-                            fill="clear" color="dark"
-                            [attr.aria-label]="('core.displayoptions' | translate)"
-                            (click)="showOptionsMenu($event, discussion)">
+                        <ion-button *ngIf="canPin || discussion.canlock || discussion.canfavourite" fill="clear" color="dark"
+                            [attr.aria-label]="('core.displayoptions' | translate)" (click)="showOptionsMenu($event, discussion)">
                             <ion-icon name="ellipsis-vertical" slot="icon-only" aria-hidden="true">
                             </ion-icon>
                         </ion-button>
@@ -158,8 +142,7 @@
                 </ion-label>
             </ion-item>
 
-            <core-infinite-loading
-                [enabled]="discussions.onlineLoaded && !discussions.completed" [error]="discussions.fetchFailed"
+            <core-infinite-loading [enabled]="discussions.onlineLoaded && !discussions.completed" [error]="discussions.fetchFailed"
                 (action)="fetchMoreDiscussions($event)">
             </core-infinite-loading>
         </ng-container>
diff --git a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
index 02b9e0405..61cee7db8 100644
--- a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
+++ b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
@@ -10,18 +10,17 @@
     </ion-button>
 
     <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false">
+        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
+            iconAction="fas-external-link-alt" [showBrowserWarning]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right">
         </core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}"
-            iconAction="far-newspaper" (action)="gotoBlog()">
+        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
+            (action)="gotoBlog()">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="loaded && !(hasOffline || hasOfflineRatings) && isOnline" [priority]="700"
-            [content]="'core.refresh' | translate" (action)="doRefresh(null, $event)" [iconAction]="refreshIcon"
-            [closeOnClick]="false">
+            [content]="'core.refresh' | translate" (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="loaded && (hasOffline || hasOfflineRatings) && isOnline" [priority]="600"
             (action)="doRefresh(null, $event, true)" [content]="'core.settings.synchronizenow' | translate" [iconAction]="syncIcon"
@@ -51,14 +50,10 @@
 
     <core-loading [hideUntil]="loaded">
         <!-- Activity info. -->
-        <core-course-module-info *ngIf="showCompletion && !isSearch" [module]="module" [showManualCompletion]="true"
-            (completionChanged)="onCompletionChange()">
+        <core-course-module-info *ngIf="!isSearch" [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
+            [component]="component" [componentId]="componentId" [courseId]="courseId">
         </core-course-module-info>
 
-        <core-course-module-description *ngIf="!isSearch" [description]="description" [component]="component" [componentId]="componentId"
-            contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
-        </core-course-module-description>
-
         <!-- Has offline data to be synchronized -->
         <ion-card class="core-warning-card" *ngIf="hasOffline || hasOfflineRatings">
             <ion-item>
@@ -69,7 +64,9 @@
 
         <ion-list *ngIf="!isSearch && entries.offlineEntries.length > 0">
             <ion-item-divider>
-                <ion-label><h2>{{ 'addon.mod_glossary.entriestobesynced' | translate }}</h2></ion-label>
+                <ion-label>
+                    <h2>{{ 'addon.mod_glossary.entriestobesynced' | translate }}</h2>
+                </ion-label>
             </ion-item-divider>
             <ion-item *ngFor="let entry of entries.offlineEntries" (click)="entries.select(entry)" detail="false" button
                 [attr.aria-current]="entries.getItemAriaCurrent(entry)">
@@ -84,11 +81,12 @@
         <ion-list *ngIf="entries.onlineEntries.length > 0">
             <ng-container *ngFor="let entry of entries.onlineEntries; let index = index">
                 <ion-item-divider *ngIf="getDivider && showDivider(entry, entries.onlineEntries[index - 1])">
-                    <ion-label><h2>{{ getDivider!(entry) }}</h2></ion-label>
+                    <ion-label>
+                        <h2>{{ getDivider!(entry) }}</h2>
+                    </ion-label>
                 </ion-item-divider>
 
-                <ion-item button (click)="entries.select(entry)" [attr.aria-current]="entries.getItemAriaCurrent(entry)"
-                    detail="false">
+                <ion-item button (click)="entries.select(entry)" [attr.aria-current]="entries.getItemAriaCurrent(entry)" detail="false">
                     <ion-label>
                         <core-format-text [text]="entry.concept" contextLevel="module" [contextInstanceId]="glossary!.coursemodule"
                             [courseId]="courseId">
diff --git a/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html b/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
index ca3d3524f..1811b5b44 100644
--- a/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
+++ b/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
@@ -5,18 +5,17 @@
             [priority]="1000" [content]="'addon.mod_h5pactivity.review_my_attempts' | translate" (action)="viewMyAttempts()"
             iconAction="stats-chart">
         </core-context-menu-item>
-        <core-context-menu-item *ngIf="canViewAllAttempts"
-            [priority]="1000" [content]="'addon.mod_h5pactivity.review_attempts' | translate" (action)="viewAllAttempts()"
-            iconAction="stats-chart">
+        <core-context-menu-item *ngIf="canViewAllAttempts" [priority]="1000" [content]="'addon.mod_h5pactivity.review_attempts' | translate"
+            (action)="viewAllAttempts()" iconAction="stats-chart">
         </core-context-menu-item>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false">
+        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
+            iconAction="fas-external-link-alt" [showBrowserWarning]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right">
         </core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}"
-            iconAction="far-newspaper" (action)="gotoBlog()">
+        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
+            (action)="gotoBlog()">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="loaded && !hasOffline && isOnline" [priority]="700" [content]="'core.refresh' | translate"
             (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false">
@@ -37,14 +36,10 @@
 <core-loading [hideUntil]="loaded" class="safe-area-padding">
 
     <!-- Activity info. -->
-    <core-course-module-info *ngIf="showCompletion" [module]="module" [showManualCompletion]="true"
-        (completionChanged)="onCompletionChange()">
+    <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
+        [component]="component" [componentId]="componentId" [courseId]="courseId">
     </core-course-module-info>
 
-    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId"
-        contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
-    </core-course-module-description>
-
     <!-- Offline data stored. -->
     <ion-card class="core-warning-card" *ngIf="hasOffline">
         <ion-item>
@@ -79,8 +74,7 @@
         </ion-item>
 
         <!-- Button to download the package. -->
-        <ion-button *ngIf="!downloading && needsDownload" class="ion-text-wrap ion-margin" expand="block"
-            (click)="downloadAndPlay($event)">
+        <ion-button *ngIf="!downloading && needsDownload" class="ion-text-wrap ion-margin" expand="block" (click)="downloadAndPlay($event)">
             {{ 'addon.mod_h5pactivity.downloadh5pfile' | translate }}
         </ion-button>
 
diff --git a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
index 98901925b..4f15b3bc9 100644
--- a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
+++ b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
@@ -4,14 +4,14 @@
         <ion-icon name="fas-bookmark" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
     <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false">
+        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
+            iconAction="fas-external-link-alt" [showBrowserWarning]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right">
         </core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}"
-            iconAction="far-newspaper" (action)="gotoBlog()">
+        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
+            (action)="gotoBlog()">
         </core-context-menu-item>
         <core-context-menu-item [priority]="700" [content]="'core.refresh' | translate" (action)="doRefresh(null, $event)"
             [iconAction]="refreshIcon" [closeOnClick]="false">
@@ -29,8 +29,7 @@
 <core-loading [hideUntil]="loaded" class="safe-area-padding">
 
     <!-- Activity info. -->
-    <core-course-module-info *ngIf="showCompletion" [module]="module" [showManualCompletion]="true"
-        (completionChanged)="onCompletionChange()">
+    <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()">
     </core-course-module-info>
 
     <ion-card class="core-warning-card" *ngIf="warning">
diff --git a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
index d8948ccbb..aa28071e4 100644
--- a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
+++ b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
@@ -1,14 +1,14 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
     <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false">
+        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
+            iconAction="fas-external-link-alt" [showBrowserWarning]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right">
         </core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}"
-            iconAction="far-newspaper" (action)="gotoBlog()">
+        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
+            (action)="gotoBlog()">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="loaded && !hasOffline && isOnline" [priority]="700" [content]="'core.refresh' | translate"
             (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false">
@@ -33,14 +33,10 @@
             <ng-template>
 
                 <!-- Activity info. -->
-                <core-course-module-info *ngIf="showCompletion" [module]="module" [showManualCompletion]="true"
-                    (completionChanged)="onCompletionChange()">
+                <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
+                    [component]="component" [componentId]="componentId" [courseId]="courseId">
                 </core-course-module-info>
 
-                <core-course-module-description [description]="description" [component]="component" [componentId]="componentId"
-                    contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
-                </core-course-module-description>
-
                 <!-- Prevent access messages. Only show the first one. -->
                 <ion-card class="core-info-card" *ngIf="lesson && preventReasons.length">
                     <ion-item>
@@ -132,13 +128,11 @@
 
                             <ng-container *ngIf="!leftDuringTimed && !finishedOffline">
                                 <!-- User hasn't left during the session, show a start button. -->
-                                <ion-button class="ion-text-wrap ion-margin" expand="block" *ngIf="!canManage"
-                                    (click)="start(false)">
+                                <ion-button class="ion-text-wrap ion-margin" expand="block" *ngIf="!canManage" (click)="start(false)">
                                     {{ 'core.start' | translate }}
                                     <ion-icon name="fas-chevron-right" slot="end" aria-hidden="true"></ion-icon>
                                 </ion-button>
-                                <ion-button class="ion-text-wrap ion-margin" expand="block" *ngIf="canManage"
-                                    (click)="start(false)">
+                                <ion-button class="ion-text-wrap ion-margin" expand="block" *ngIf="canManage" (click)="start(false)">
                                     {{ 'addon.mod_lesson.preview' | translate }}
                                     <ion-icon name="fas-search" slot="end" aria-hidden="true"></ion-icon>
                                 </ion-button>
@@ -295,8 +289,8 @@
                             <ion-card-title>{{ 'addon.mod_lesson.overview' | translate }}</ion-card-title>
                         </ion-card-header>
 
-                        <ion-item class="ion-text-wrap" *ngFor="let student of overview.students" button
-                            (click)="openRetake(student.id)" detail="true">
+                        <ion-item class="ion-text-wrap" *ngFor="let student of overview.students" button (click)="openRetake(student.id)"
+                            detail="true">
                             <core-user-avatar [user]="student" slot="start" [userId]="student.id" [courseId]="courseId">
                             </core-user-avatar>
                             <ion-label>
diff --git a/src/addons/mod/lti/components/index/addon-mod-lti-index.html b/src/addons/mod/lti/components/index/addon-mod-lti-index.html
index 184f09284..ef10e579e 100644
--- a/src/addons/mod/lti/components/index/addon-mod-lti-index.html
+++ b/src/addons/mod/lti/components/index/addon-mod-lti-index.html
@@ -1,14 +1,14 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
     <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false">
+        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
+            iconAction="fas-external-link-alt" [showBrowserWarning]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right">
         </core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}"
-            iconAction="far-newspaper" (action)="gotoBlog()">
+        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
+            (action)="gotoBlog()">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="loaded && isOnline" [priority]="700" [content]="'core.refresh' | translate"
             (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false">
@@ -20,14 +20,11 @@
 <core-loading [hideUntil]="loaded" class="safe-area-padding">
 
     <!-- Activity info. -->
-    <core-course-module-info *ngIf="showCompletion" [module]="module" [showManualCompletion]="true"
-        (completionChanged)="onCompletionChange()">
+    <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()"
+        [description]="lti && lti.showdescriptionlaunch && description" [component]="component" [componentId]="componentId"
+        [courseId]="courseId">
     </core-course-module-info>
 
-    <core-course-module-description *ngIf="lti && lti.showdescriptionlaunch" [description]="description" [component]="component"
-        [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
-    </core-course-module-description>
-
     <div class="ion-padding">
         <ion-button expand="block" (click)="launch()">
             <ion-icon name="fas-external-link-alt" slot="start" aria-hidden="true"></ion-icon>
diff --git a/src/addons/mod/page/components/index/addon-mod-page-index.html b/src/addons/mod/page/components/index/addon-mod-page-index.html
index fcc229d26..2dcb76d66 100644
--- a/src/addons/mod/page/components/index/addon-mod-page-index.html
+++ b/src/addons/mod/page/components/index/addon-mod-page-index.html
@@ -1,14 +1,14 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
     <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false">
+        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
+            iconAction="fas-external-link-alt" [showBrowserWarning]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right">
         </core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}"
-            iconAction="far-newspaper" (action)="gotoBlog()">
+        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
+            (action)="gotoBlog()">
         </core-context-menu-item>
         <core-context-menu-item [priority]="700" [content]="'core.refresh' | translate" (action)="doRefresh(null, $event)"
             [iconAction]="refreshIcon" [closeOnClick]="false">
@@ -26,14 +26,10 @@
 <core-loading [hideUntil]="loaded" class="safe-area-padding">
 
     <!-- Activity info. -->
-    <core-course-module-info *ngIf="showCompletion" [module]="module" [showManualCompletion]="true"
-        (completionChanged)="onCompletionChange()">
+    <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="displayDescription && description"
+        [component]="component" [componentId]="componentId" [courseId]="courseId">
     </core-course-module-info>
 
-    <core-course-module-description *ngIf="displayDescription" [description]="description" [component]="component"
-        [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
-    </core-course-module-description>
-
     <ion-card class="core-warning-card" *ngIf="warning">
         <ion-item>
             <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
diff --git a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
index 94e4bcc51..519746fe0 100644
--- a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
+++ b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
@@ -1,14 +1,14 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
     <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false">
+        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
+            iconAction="fas-external-link-alt" [showBrowserWarning]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right">
         </core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}"
-            [iconAction]="'far-newspaper'" (action)="gotoBlog()">
+        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" [iconAction]="'far-newspaper'"
+            (action)="gotoBlog()">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="loaded && !hasOffline && isOnline" [priority]="700" [content]="'core.refresh' | translate"
             (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false">
@@ -29,19 +29,17 @@
 <core-loading [hideUntil]="loaded">
 
     <!-- Activity info. -->
-    <core-course-module-info *ngIf="showCompletion" [module]="module" [showManualCompletion]="true"
-        (completionChanged)="onCompletionChange()">
+    <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
+        [component]="component" [componentId]="componentId" [courseId]="courseId">
     </core-course-module-info>
 
-    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId"
-        contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
-    </core-course-module-description>
-
     <!-- Access rules description messages. -->
     <ion-card *ngIf="gradeMethodReadable || accessRules.length || syncTime">
         <ion-list>
             <ion-item class="ion-text-wrap" *ngFor="let rule of accessRules">
-                <ion-label><p>{{ rule }}</p></ion-label>
+                <ion-label>
+                    <p>{{ rule }}</p>
+                </ion-label>
             </ion-item>
             <ion-item class="ion-text-wrap" *ngIf="gradeMethodReadable">
                 <ion-label>
@@ -55,7 +53,7 @@
                     <p>{{ 'addon.mod_quiz.outof' | translate: { $a: {
                         grade: bestGrade.gradetopass,
                         maxgrade: quiz.gradeFormatted
-                    } } }}</p>
+                        } } }}</p>
                 </ion-label>
             </ion-item>
             <ion-item class="ion-text-wrap" *ngIf="syncTime">
@@ -96,15 +94,9 @@
             </ion-item>
             <div role="rowgroup">
                 <!-- List of attempts. -->
-                <ion-item
-                    button
-                    detail="true"
-                    *ngFor="let attempt of attempts"
-                    class="ion-text-wrap"
-                    [ngClass]='{"addon-mod_quiz-highlighted": attempt.highlightGrade}'
-                    [attr.aria-label]="'core.seemoredetail' | translate"
-                    (click)="viewAttempt(attempt.id)"
-                >
+                <ion-item button detail="true" *ngFor="let attempt of attempts" class="ion-text-wrap"
+                    [ngClass]='{"addon-mod_quiz-highlighted": attempt.highlightGrade}' [attr.aria-label]="'core.seemoredetail' | translate"
+                    (click)="viewAttempt(attempt.id)">
                     <ion-label>
                         <ion-row class="ion-align-items-center" role="row">
                             <ion-col class="ion-text-center" *ngIf="quiz.showAttemptColumn && attempt.preview" role="cell">
@@ -142,17 +134,21 @@
             <ion-item class="ion-text-wrap" *ngIf="gradebookFeedback">
                 <ion-label>
                     <p class="item-heading">{{ 'addon.mod_quiz.comment' | translate }}</p>
-                    <p><core-format-text [component]="component" [componentId]="componentId" [text]="gradebookFeedback"
-                        contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
-                    </core-format-text></p>
+                    <p>
+                        <core-format-text [component]="component" [componentId]="componentId" [text]="gradebookFeedback"
+                            contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
+                        </core-format-text>
+                    </p>
                 </ion-label>
             </ion-item>
             <ion-item class="ion-text-wrap" *ngIf="quiz.showFeedbackColumn && overallFeedback">
                 <ion-label>
                     <p class="item-heading">{{ 'addon.mod_quiz.overallfeedback' | translate }}</p>
-                    <p><core-format-text [component]="component" [componentId]="componentId" [text]="overallFeedback"
-                        contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
-                    </core-format-text></p>
+                    <p>
+                        <core-format-text [component]="component" [componentId]="componentId" [text]="overallFeedback" contextLevel="module"
+                            [contextInstanceId]="module.id" [courseId]="courseId">
+                        </core-format-text>
+                    </p>
                 </ion-label>
             </ion-item>
         </ion-list>
@@ -163,10 +159,14 @@
         <ion-list>
             <!-- Error messages. -->
             <ion-item class="ion-text-wrap core-danger-item addon-mod_quiz-prevent-messages" *ngFor="let message of preventMessages">
-                <ion-label><p>{{ message }}</p></ion-label>
+                <ion-label>
+                    <p>{{ message }}</p>
+                </ion-label>
             </ion-item>
             <ion-item class="ion-text-wrap core-danger-item addon-mod_quiz-no-questions" *ngIf="quiz.hasquestions === 0">
-                <ion-label><p>{{ 'addon.mod_quiz.noquestions' | translate }}</p></ion-label>
+                <ion-label>
+                    <p>{{ 'addon.mod_quiz.noquestions' | translate }}</p>
+                </ion-label>
             </ion-item>
             <ion-item class="ion-text-wrap core-danger-item addon-mod_quiz-unsupported-questions"
                 *ngIf="!hasSupportedQuestions && unsupportedQuestions.length">
@@ -226,7 +226,9 @@
 
             <!-- Spinner shown while downloading or calculating. -->
             <ion-item class="ion-text-center" *ngIf="showStatusSpinner">
-                <ion-label><ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner></ion-label>
+                <ion-label>
+                    <ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner>
+                </ion-label>
             </ion-item>
         </ion-list>
     </ion-card>
diff --git a/src/addons/mod/resource/components/index/addon-mod-resource-index.html b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
index 704d31dd1..4c8e7daf6 100644
--- a/src/addons/mod/resource/components/index/addon-mod-resource-index.html
+++ b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
@@ -1,12 +1,12 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
     <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false"></core-context-menu-item>
+        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
+            iconAction="fas-external-link-alt" [showBrowserWarning]="false"></core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right"></core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}"
-            iconAction="far-newspaper" (action)="gotoBlog()"></core-context-menu-item>
+        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
+            (action)="gotoBlog()"></core-context-menu-item>
         <core-context-menu-item [priority]="700" [content]="'core.refresh' | translate" (action)="doRefresh(null, $event)"
             [iconAction]="refreshIcon" [closeOnClick]="false"></core-context-menu-item>
         <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="600" [content]="prefetchText" (action)="prefetch($event)"
@@ -21,15 +21,11 @@
 <core-loading [hideUntil]="loaded" class="safe-area-padding core-loading-fullheight">
 
     <!-- Activity info. -->
-    <core-course-module-info *ngIf="showCompletion" [module]="module" [showManualCompletion]="true"
-        (completionChanged)="onCompletionChange()">
+    <core-course-module-info [module]="module" [courseId]="courseId" (completionChanged)="onCompletionChange()"
+        [description]="mode != 'iframe' && (mode != 'embedded' || displayDescription) && description" [component]="component"
+        [componentId]="componentId">
     </core-course-module-info>
 
-    <core-course-module-description *ngIf="mode != 'iframe' && (mode != 'embedded' || displayDescription)"
-        [description]="description" [component]="component" [componentId]="componentId" contextLevel="module"
-        [contextInstanceId]="module.id" [courseId]="courseId">
-    </core-course-module-description>
-
     <ion-card class="core-warning-card" *ngIf="warning">
         <ion-item>
             <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
diff --git a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
index 23c75ba08..58f417175 100644
--- a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
+++ b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
@@ -1,14 +1,14 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
     <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false">
+        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
+            iconAction="fas-external-link-alt" [showBrowserWarning]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right">
         </core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}"
-            iconAction="far-newspaper" (action)="gotoBlog()">
+        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
+            (action)="gotoBlog()">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="loaded && !hasOffline && isOnline" [priority]="700" [content]="'core.refresh' | translate"
             (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false">
@@ -29,14 +29,10 @@
 <core-loading [hideUntil]="loaded" class="safe-area-padding">
 
     <!-- Activity info. -->
-    <core-course-module-info *ngIf="showCompletion" [module]="module" [showManualCompletion]="true"
-        (completionChanged)="onCompletionChange()">
+    <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
+        [component]="component" [componentId]="componentId" [courseId]="courseId">
     </core-course-module-info>
 
-    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId"
-        contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
-    </core-course-module-description>
-
     <!-- Warning message. -->
     <ion-card class="core-info-card" *ngIf="scorm && scorm.warningMessage">
         <ion-item>
@@ -134,8 +130,8 @@
             <ion-list>
                 <ion-item class="ion-text-wrap" *ngIf="organizations.length > 1">
                     <ion-label>{{ 'addon.mod_scorm.organizations' | translate }}</ion-label>
-                    <ion-select [(ngModel)]="currentOrganization.identifier" (ionChange)="loadOrganization()"
-                        interface="action-sheet" [interfaceOptions]="{header: 'addon.mod_scorm.organizations' | translate}">
+                    <ion-select [(ngModel)]="currentOrganization.identifier" (ionChange)="loadOrganization()" interface="action-sheet"
+                        [interfaceOptions]="{header: 'addon.mod_scorm.organizations' | translate}">
                         <ion-select-option *ngFor="let org of organizations" [value]="org.identifier">
                             {{ org.title }}
                         </ion-select-option>
@@ -155,8 +151,7 @@
                         <p>{{ currentOrganization.title }}</p>
                         <div *ngFor="let sco of toc" class="core-padding-{{sco.level}} addon-mod_scorm-type-{{sco.scormtype}}">
                             <p *ngIf="sco.isvisible">
-                                <ion-icon *ngIf="sco.icon" [name]="sco.icon.icon" [attr.aria-label]="sco.icon.description"
-                                    slot="start">
+                                <ion-icon *ngIf="sco.icon" [name]="sco.icon.icon" [attr.aria-label]="sco.icon.description" slot="start">
                                 </ion-icon>
                                 <button class="as-link" *ngIf="sco.prereq && sco.launch" (click)="open($event, false, sco.id)">
                                     <core-format-text [text]="sco.title" contextLevel="module" [contextInstanceId]="module.id"
@@ -205,8 +200,7 @@
             <ion-list>
                 <ng-container *ngIf="!downloading && !skip">
                     <!-- Create new attempt -->
-                    <ion-item class="ion-text-wrap"
-                        *ngIf="!scorm.forcenewattempt && numAttempts > 0 && !incomplete && attemptsLeft > 0">
+                    <ion-item class="ion-text-wrap" *ngIf="!scorm.forcenewattempt && numAttempts > 0 && !incomplete && attemptsLeft > 0">
                         <ion-label>{{ 'addon.mod_scorm.newattempt' | translate }}</ion-label>
                         <ion-checkbox slot="end" name="newAttempt" [(ngModel)]="startNewAttempt">
                         </ion-checkbox>
diff --git a/src/addons/mod/survey/components/index/addon-mod-survey-index.html b/src/addons/mod/survey/components/index/addon-mod-survey-index.html
index 5bf012e3e..16ebaa871 100644
--- a/src/addons/mod/survey/components/index/addon-mod-survey-index.html
+++ b/src/addons/mod/survey/components/index/addon-mod-survey-index.html
@@ -1,21 +1,21 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
     <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false">
+        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
+            iconAction="fas-external-link-alt" [showBrowserWarning]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right">
         </core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}"
-            iconAction="far-newspaper" (action)="gotoBlog()">
+        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
+            (action)="gotoBlog()">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="loaded && !hasOffline && isOnline" [priority]="700" [content]="'core.refresh' | translate"
             (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="loaded && hasOffline && isOnline" [priority]="600"
-            [content]="'core.settings.synchronizenow' | translate" (action)="doRefresh(null, $event, true)"
-            [iconAction]="syncIcon" [closeOnClick]="false">
+            [content]="'core.settings.synchronizenow' | translate" (action)="doRefresh(null, $event, true)" [iconAction]="syncIcon"
+            [closeOnClick]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="500" [content]="prefetchText" (action)="prefetch($event)"
             [iconAction]="prefetchStatusIcon" [closeOnClick]="false">
@@ -30,15 +30,11 @@
 <core-loading [hideUntil]="loaded" class="safe-area-padding">
 
     <!-- Activity info. -->
-    <core-course-module-info *ngIf="showCompletion" [module]="module" [showManualCompletion]="true"
-        (completionChanged)="onCompletionChange()">
+    <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()"
+        [description]="survey && !survey.surveydone && !hasOffline && description" [component]="component"
+        [componentId]="componentId" [courseId]="courseId">
     </core-course-module-info>
 
-    <core-course-module-description *ngIf="survey && !survey.surveydone && !hasOffline" [description]="description"
-        [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id"
-        [courseId]="courseId">
-    </core-course-module-description>
-
     <!-- Survey already done -->
     <ion-card class="ion-padding" *ngIf="survey && survey.surveydone">
         <p class="ion-padding">{{ 'addon.mod_survey.surveycompletednograph' | translate }}</p>
@@ -63,7 +59,7 @@
             <ng-container *ngFor="let question of questions; let questionIndex=index; let isEven=even;"
                 class="ion-no-padding ion-text-wrap">
                 <!-- Parent question (Category header) -->
-                <ng-container *ngIf="question.multiArray?.length" >
+                <ng-container *ngIf="question.multiArray?.length">
                     <h3 class="ion-padding-horizontal" [class.ion-padding-top]="questionIndex == 1">{{ question.text }}</h3>
                     <ion-row class="ion-align-items-center ion-hide-md-down ion-padding">
                         <ion-col size="7" class="ion-padding">{{ 'addon.mod_survey.responses' | translate }}</ion-col>
@@ -73,15 +69,16 @@
                         </ion-col>
                     </ion-row>
                     <ion-item class="ion-text-wrap addon-mod_survey-question" [class.even]="isEven" lines="full">
-                        <ion-label><p>{{ question.intro }}</p></ion-label>
+                        <ion-label>
+                            <p>{{ question.intro }}</p>
+                        </ion-label>
                     </ion-item>
                 </ng-container>
 
                 <!-- Subquestion -->
                 <ng-container *ngIf="question.parent !== 0">
                     <ion-radio-group [(ngModel)]="answers[question.name]" [required]="question.required" [name]="question.name">
-                        <ion-row *ngIf="question.parent !== 0" class="ion-align-items-center ion-padding-horizontal"
-                            [class.even]="isEven">
+                        <ion-row *ngIf="question.parent !== 0" class="ion-align-items-center ion-padding-horizontal" [class.even]="isEven">
 
                             <ion-col size="7">
                                 <ion-label id="addon-mod_survey-{{question.id}}">
@@ -93,19 +90,17 @@
 
                             <!-- Tablet view: radio buttons -->
                             <ion-col class="ion-hide-md-down ion-text-center" size="1"
-                                *ngFor="let option of question.optionsArray; let value=index;"
-                                >
+                                *ngFor="let option of question.optionsArray; let value=index;">
                                 <!-- Empty slot to avoid errors on migration tslint checks -->
                                 <ion-radio [value]="value + 1" [attr.aria-label]="question.num + '. '+question.text + ': ' + option">
                                 </ion-radio>
                             </ion-col>
                             <ion-col class="ion-hide-md-up" size="5">
                                 <ion-select class="ion-padding" [(ngModel)]="answers[question.name]" [required]="question.required"
-                                    [attr.aria-labelledby]="'addon-mod_survey-'+question.id" interface="action-sheet"
-                                    [name]="question.name" [interfaceOptions]="{header: question.text}">
+                                    [attr.aria-labelledby]="'addon-mod_survey-'+question.id" interface="action-sheet" [name]="question.name"
+                                    [interfaceOptions]="{header: question.text}">
                                     <ion-select-option value="-1" selected disabled>{{ 'core.choose' | translate }}</ion-select-option>
-                                    <ion-select-option *ngFor="let option of question.optionsArray; let value=index;"
-                                        [value]="value +1">
+                                    <ion-select-option *ngFor="let option of question.optionsArray; let value=index;" [value]="value +1">
                                         {{option}}
                                     </ion-select-option>
                                 </ion-select>
@@ -126,8 +121,8 @@
                         </ion-col>
                         <ion-col size="5">
                             <ion-select class="ion-padding" [(ngModel)]="answers[question.name]" [required]="question.required"
-                                [attr.aria-labelledby]="'addon-mod_survey-'+question.id" interface="action-sheet"
-                                [name]="question.name" [interfaceOptions]="{header: question.text}">
+                                [attr.aria-labelledby]="'addon-mod_survey-'+question.id" interface="action-sheet" [name]="question.name"
+                                [interfaceOptions]="{header: question.text}">
                                 <ion-select-option *ngFor="let option of question.optionsArray; let value=index;" [value]="value">
                                     {{option}}
                                 </ion-select-option>
diff --git a/src/addons/mod/url/components/index/addon-mod-url-index.html b/src/addons/mod/url/components/index/addon-mod-url-index.html
index 722bdfafd..491e186eb 100644
--- a/src/addons/mod/url/components/index/addon-mod-url-index.html
+++ b/src/addons/mod/url/components/index/addon-mod-url-index.html
@@ -1,12 +1,12 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
     <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false"></core-context-menu-item>
+        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
+            iconAction="fas-external-link-alt" [showBrowserWarning]="false"></core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right"></core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}"
-            iconAction="far-newspaper" (action)="gotoBlog()"></core-context-menu-item>
+        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
+            (action)="gotoBlog()"></core-context-menu-item>
         <core-context-menu-item [priority]="700" [content]="'core.refresh' | translate" (action)="doRefresh(null, $event)"
             [iconAction]="refreshIcon" [closeOnClick]="false"></core-context-menu-item>
     </core-context-menu>
@@ -16,14 +16,10 @@
 <core-loading [hideUntil]="loaded" class="core-loading-fullheight">
 
     <!-- Activity info. -->
-    <core-course-module-info *ngIf="showCompletion" [module]="module" [showManualCompletion]="true"
-        (completionChanged)="onCompletionChange()">
+    <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="displayDescription && description"
+        [component]="component" [componentId]="componentId" [courseId]="courseId">
     </core-course-module-info>
 
-    <core-course-module-description *ngIf="displayDescription" [description]="description" [component]="component"
-        [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
-    </core-course-module-description>
-
     <div *ngIf="shouldIframe || (shouldEmbed && isOther)" class="addon-mod_url-embedded-url">
         <core-iframe [src]="url"></core-iframe>
     </div>
diff --git a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
index 07a1a2638..5eecab5a1 100644
--- a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
+++ b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
@@ -1,8 +1,8 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
     <!-- Select subwiki. -->
-    <ion-button *ngIf="subwikiData.count > 1" (click)="showSubwikiPicker($event)"
-        [attr.aria-label]="'addon.mod_wiki.subwiki' | translate" aria-haspopup="true">
+    <ion-button *ngIf="subwikiData.count > 1" (click)="showSubwikiPicker($event)" [attr.aria-label]="'addon.mod_wiki.subwiki' | translate"
+        aria-haspopup="true">
         <ion-icon *ngIf="!groupWiki" name="fas-user" aria-hidden="true"></ion-icon>
         <ion-icon *ngIf="groupWiki" name="fas-users" aria-hidden="true"></ion-icon>
     </ion-button>
@@ -13,18 +13,17 @@
     </ion-button>
 
     <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false">
+        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
+            iconAction="fas-external-link-alt" [showBrowserWarning]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right">
         </core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}"
-            iconAction="far-newspaper" (action)="gotoBlog()">
+        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
+            (action)="gotoBlog()">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="loaded && !hasOffline && isOnline && !pageIsOffline" [priority]="700"
-            [content]="'core.refresh' | translate" (action)="doRefresh(null, $event)" [iconAction]="refreshIcon"
-            [closeOnClick]="false">
+            [content]="'core.refresh' | translate" (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="loaded && isOnline && (hasOffline || pageIsOffline)" [priority]="600"
             [content]="'core.settings.synchronizenow' | translate" (action)="doRefresh(null, $event, true)" [iconAction]="syncIcon"
@@ -33,8 +32,8 @@
         <core-context-menu-item *ngIf="canEdit && (isOnline || pageIsOffline)" [priority]="590" [content]="'core.edit' | translate"
             iconAction="fas-edit" (action)="goToEditPage()">
         </core-context-menu-item>
-        <core-context-menu-item *ngIf="canEdit" [priority]="580" [content]="'addon.mod_wiki.createpage' | translate"
-            iconAction="fas-plus" (action)="goToNewPage()">
+        <core-context-menu-item *ngIf="canEdit" [priority]="580" [content]="'addon.mod_wiki.createpage' | translate" iconAction="fas-plus"
+            (action)="goToNewPage()">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="500" [content]="prefetchText" (action)="prefetch($event)"
             [iconAction]="prefetchStatusIcon" [closeOnClick]="false">
@@ -49,15 +48,12 @@
 <core-loading [hideUntil]="loaded">
 
     <!-- Activity info. -->
-    <core-course-module-info *ngIf="showCompletion" [module]="module" [showManualCompletion]="true"
-        (completionChanged)="onCompletionChange()">
+    <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
+        [component]="component" [componentId]="componentId" [courseId]="courseId">
+        <h3 *ngIf="pageTitle" title>{{pageTitle}}</h3>
     </core-course-module-info>
 
-    <div *ngIf="description || pageIsOffline || hasOffline || pageWarning">
-        <core-course-module-description [description]="description" [component]="component" [componentId]="componentId"
-            contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
-        </core-course-module-description>
-
+    <div *ngIf="pageIsOffline || hasOffline || pageWarning">
         <!-- Wiki has something offline. -->
         <ion-card class="core-warning-card" *ngIf="pageIsOffline || hasOffline">
             <ion-item>
@@ -82,8 +78,7 @@
             <core-format-text *ngIf="pageContent" [component]="component" [componentId]="componentId" [text]="pageContent"
                 contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
             </core-format-text>
-            <core-empty-box *ngIf="!pageContent" icon="fas-file-alt" [message]="'addon.mod_wiki.nocontent' | translate"
-                inline="true">
+            <core-empty-box *ngIf="!pageContent" icon="fas-file-alt" [message]="'addon.mod_wiki.nocontent' | translate" inline="true">
             </core-empty-box>
         </article>
 
diff --git a/src/addons/mod/wiki/pages/index/index.ts b/src/addons/mod/wiki/pages/index/index.ts
index 3b6058055..e98a10c9f 100644
--- a/src/addons/mod/wiki/pages/index/index.ts
+++ b/src/addons/mod/wiki/pages/index/index.ts
@@ -52,9 +52,7 @@ export class AddonModWikiIndexPage extends CoreCourseModuleMainActivityPage<Addo
     }
 
     /**
-     * Update some data based on the data received.
-     *
-     * @param data The data received.
+     * @inheritdoc
      */
     updateData(data: { name: string } | string): void {
         if (typeof data == 'string') {
diff --git a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
index d06955e61..35f7cac49 100644
--- a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
+++ b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
@@ -1,14 +1,14 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
     <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt" [showBrowserWarning]="false">
+        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
+            iconAction="fas-external-link-alt" [showBrowserWarning]="false">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right">
         </core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}"
-            iconAction="far-newspaper" (action)="gotoBlog()">
+        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
+            (action)="gotoBlog()">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="loaded && !hasOffline && isOnline" [priority]="700" [content]="'core.refresh' | translate"
             (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false">
@@ -22,15 +22,15 @@
         </core-context-menu-item>
         <core-context-menu-item *ngIf="size" [priority]="200" [content]="'core.clearstoreddata' | translate:{$a: size}"
             iconDescription="fas-archive" (action)="removeFiles($event)" iconAction="fas-trash" [closeOnClick]="false">
-        </core-context-menu-item>    </core-context-menu>
+        </core-context-menu-item>
+    </core-context-menu>
 </core-navbar-buttons>
 
 <!-- Content. -->
 <core-loading [hideUntil]="loaded">
 
     <!-- Activity info. -->
-    <core-course-module-info *ngIf="showCompletion" [module]="module" [showManualCompletion]="true"
-        (completionChanged)="onCompletionChange()">
+    <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()">
     </core-course-module-info>
 
     <ion-card *ngIf="phases">
@@ -87,9 +87,8 @@
                 <ion-item class="ion-text-wrap">
                     <ion-label>
                         <h2>{{ 'addon.mod_workshop.conclusion' | translate }}</h2>
-                        <core-format-text fullOnClick="true" [component]="component" [componentId]="module.id"
-                            [text]="workshop!.conclusion" contextLevel="module" [contextInstanceId]="module.id"
-                            [courseId]="courseId">
+                        <core-format-text fullOnClick="true" [component]="component" [componentId]="module.id" [text]="workshop!.conclusion"
+                            contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
                         </core-format-text>
                     </ion-label>
                 </ion-item>
@@ -97,7 +96,9 @@
 
             <ion-card *ngIf="userGrades">
                 <ion-item-divider class="ion-text-wrap">
-                    <ion-label><h2>{{ 'addon.mod_workshop.yourgrades' | translate }}</h2></ion-label>
+                    <ion-label>
+                        <h2>{{ 'addon.mod_workshop.yourgrades' | translate }}</h2>
+                    </ion-label>
                 </ion-item-divider>
                 <ion-item class="ion-text-wrap" *ngIf="userGrades.submissionlongstrgrade">
                     <ion-label>
@@ -120,8 +121,7 @@
                 <ion-label>
                     <h2>{{ 'addon.mod_workshop.areainstructauthors' | translate }}</h2>
                     <core-format-text fullOnClick="true" [component]="component" [componentId]="module.id"
-                        [text]="workshop!.instructauthors" contextLevel="module" [contextInstanceId]="module.id"
-                        [courseId]="courseId">
+                        [text]="workshop!.instructauthors" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
                     </core-format-text>
                 </ion-label>
             </ion-item>
@@ -166,7 +166,9 @@
         <ng-container *ngIf="workshop!.phase >= PHASE_CLOSED">
             <ion-card *ngIf="publishedSubmissions && publishedSubmissions.length">
                 <ion-item-divider class="ion-text-wrap">
-                    <ion-label><h2>{{ 'addon.mod_workshop.publishedsubmissions' | translate }}</h2></ion-label>
+                    <ion-label>
+                        <h2>{{ 'addon.mod_workshop.publishedsubmissions' | translate }}</h2>
+                    </ion-label>
                 </ion-item-divider>
                 <ng-container *ngFor="let submission of publishedSubmissions">
                     <addon-mod-workshop-submission [submission]="submission" [courseId]="workshop!.course" [module]="module"
@@ -192,10 +194,14 @@
 
             <ion-card *ngIf="canAssess">
                 <ion-item-divider class="ion-text-wrap">
-                    <ion-label><h2>{{ 'addon.mod_workshop.assignedassessments' | translate }}</h2></ion-label>
+                    <ion-label>
+                        <h2>{{ 'addon.mod_workshop.assignedassessments' | translate }}</h2>
+                    </ion-label>
                 </ion-item-divider>
                 <ion-item class="ion-text-wrap" *ngIf="!assessments || !assessments.length">
-                    <ion-label><p>{{ 'addon.mod_workshop.assignedassessmentsnone' | translate }}</p></ion-label>
+                    <ion-label>
+                        <p>{{ 'addon.mod_workshop.assignedassessmentsnone' | translate }}</p>
+                    </ion-label>
                 </ion-item>
                 <ng-container *ngFor="let assessment of (assessments || [])">
                     <addon-mod-workshop-submission [submission]="assessment.submission" [assessment]="assessment"
@@ -203,7 +209,7 @@
                         class="core-as-item">
                     </addon-mod-workshop-submission>
                 </ng-container>
-            </ion-card >
+            </ion-card>
         </ng-container>
 
         <!-- MULTIPLE PHASES SUBMISSION OR GREATER only teachers -->
diff --git a/src/core/features/course/classes/main-resource-component.ts b/src/core/features/course/classes/main-resource-component.ts
index e01d48d86..722907a73 100644
--- a/src/core/features/course/classes/main-resource-component.ts
+++ b/src/core/features/course/classes/main-resource-component.ts
@@ -70,7 +70,6 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
     isDestroyed = false; // Whether the component is destroyed, used when calling fillContextMenu.
     contextMenuStatusObserver?: CoreEventObserver; // Observer of package status, used when calling fillContextMenu.
     contextFileStatusObserver?: CoreEventObserver; // Observer of file status, used when calling fillContextMenu.
-    showCompletion = false; // Whether to show completion inside the activity.
 
     protected fetchContentDefaultError = 'core.course.errorgetmodule'; // Default error to show when loading contents.
     protected isCurrentView = false; // Whether the component is in the current view.
@@ -80,6 +79,7 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
     protected completionObserver?: CoreEventObserver;
     protected logger: CoreLogger;
     protected debouncedUpdateModule?: () => void; // Update the module after a certain time.
+    protected showCompletion = false; // Whether to show completion inside the activity.
 
     constructor(
         @Optional() @Inject('') loggerName: string = 'CoreCourseModuleMainResourceComponent',
@@ -97,7 +97,7 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
         this.componentId = this.module.id;
         this.externalUrl = this.module.url;
         this.courseId = this.courseId || this.module.course!;
-        this.showCompletion = !!CoreSites.getCurrentSite()?.isVersionGreaterEqualThan('3.11');
+        this.showCompletion = !!CoreSites.getRequiredCurrentSite().isVersionGreaterEqualThan('3.11');
 
         if (this.showCompletion) {
             CoreCourseHelper.calculateModuleCompletionData(this.module, this.courseId);
diff --git a/src/core/features/course/components/module-description/module-description.ts b/src/core/features/course/components/module-description/module-description.ts
index d5fcf1139..6fc2ed236 100644
--- a/src/core/features/course/components/module-description/module-description.ts
+++ b/src/core/features/course/components/module-description/module-description.ts
@@ -28,7 +28,9 @@ import { Component, Input } from '@angular/core';
  *
  * Example usage:
  *
- * <core-course-module-description [description]="myDescription"></core-course-module-description
+ * <core-course-module-description [description]="myDescription"></core-course-module-description>
+ *
+ * @deprecated since 4.0 use core-course-module-info
  */
 @Component({
     selector: 'core-course-module-description',
diff --git a/src/core/features/course/components/module-info/core-course-module-info.html b/src/core/features/course/components/module-info/core-course-module-info.html
index d69b3148a..acd0b90e5 100644
--- a/src/core/features/course/components/module-info/core-course-module-info.html
+++ b/src/core/features/course/components/module-info/core-course-module-info.html
@@ -1,18 +1,37 @@
-<ion-card *ngIf="module.dates?.length || (module.completiondata && (module.completiondata.isautomatic || showManualCompletion))">
-    <ion-item class="ion-text-wrap">
-        <ion-label>
-            <!-- Activity dates. -->
-            <div *ngIf="module.dates && module.dates.length" class="core-module-dates">
-                <p *ngFor="let date of module.dates">
-                    <strong>{{ date.label }}</strong> {{ date.timestamp * 1000 | coreFormatDate:'strftimedatetime' }}
-                </p>
-            </div>
+<ion-item class="ion-text-wrap" lines="none">
+    <core-mod-icon slot="start" [modicon]="modicon" [modname]="module.modname" [componentId]="module.instance">
+    </core-mod-icon>
+    <ion-label>
+        <h2>
+            <core-format-text [text]="module.name" contextLevel="module" [component]="component" [componentId]="componentId"
+                [contextInstanceId]="module.id" [courseId]="courseId">
+            </core-format-text>
+        </h2>
+        <ng-content select="[title]"></ng-content>
+    </ion-label>
+</ion-item>
+<ion-item class="ion-text-wrap" *ngIf="description" lines="none">
+    <ion-label>
+        <core-format-text [text]="description" [component]="component" [componentId]="componentId" contextLevel="module"
+            [contextInstanceId]="module.id" [courseId]="courseId" maxHeight="120">
+        </core-format-text>
+    </ion-label>
+</ion-item>
+<ng-content select="[description]"></ng-content>
+<ion-item class="ion-text-wrap" lines="none" *ngIf="showCompletion && (module.dates?.length || module.completiondata)">
+    <ion-label>
+        <!-- Activity dates. -->
+        <div *ngIf="module.dates && module.dates.length" class="core-module-dates">
+            <p *ngFor="let date of module.dates">
+                <strong>{{ date.label }}</strong> {{ date.timestamp * 1000 | coreFormatDate:'strftimedatetime' }}
+            </p>
+        </div>
 
-            <!-- Module completion. -->
-            <core-course-module-completion *ngIf="module.completiondata" [completion]="module.completiondata"
-                [moduleName]="module.name" [moduleId]="module.id" [showCompletionConditions]="true"
-                [showManualCompletion]="showManualCompletion" (completionChanged)="completionChanged.emit($event)">
-            </core-course-module-completion>
-        </ion-label>
-    </ion-item>
-</ion-card>
+        <!-- Module completion. -->
+        <core-course-module-completion *ngIf="module.completiondata" [completion]="module.completiondata" [moduleName]="module.name"
+            [moduleId]="module.id" [showCompletionConditions]="true" [showManualCompletion]="true"
+            (completionChanged)="completionChanged.emit($event)">
+        </core-course-module-completion>
+    </ion-label>
+</ion-item>
+<ng-content></ng-content>
diff --git a/src/core/features/course/components/module-info/course-module-info.scss b/src/core/features/course/components/module-info/course-module-info.scss
index ddf0beb55..a4d1bf7e1 100644
--- a/src/core/features/course/components/module-info/course-module-info.scss
+++ b/src/core/features/course/components/module-info/course-module-info.scss
@@ -2,5 +2,9 @@
 
 :host {
     display: block;
+    box-shadow: 0px 3px 3px rgba(var(--drop-shadow));
+    margin-bottom: 8px;
+    background-color: var(--contrast-background);
+    
     @include padding-horizontal(var(--ion-safe-area-left), var(--ion-safe-area-right));
-}
\ No newline at end of file
+}
diff --git a/src/core/features/course/components/module-info/module-info.ts b/src/core/features/course/components/module-info/module-info.ts
index 254ad3c7c..13cbd4e40 100644
--- a/src/core/features/course/components/module-info/module-info.ts
+++ b/src/core/features/course/components/module-info/module-info.ts
@@ -12,21 +12,48 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { CoreCourseModule, CoreCourseModuleCompletionData } from '@features/course/services/course-helper';
+import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate';
+import { CoreSites } from '@services/sites';
 
 /**
- * Display info about a module: dates and completion.
+ * Display info about a module:
+ *
+ * Description:
+ * Module descriptions are shortened by default, allowing the user to see the full description by clicking in it.
+ *
+ * Completion dates, status and buttons.
+ *
+ * You can add also add custom information that will be included at the end.
  */
 @Component({
     selector: 'core-course-module-info',
     templateUrl: 'core-course-module-info.html',
     styleUrls: ['course-module-info.scss'],
 })
-export class CoreCourseModuleInfoComponent {
+export class CoreCourseModuleInfoComponent implements OnInit {
 
     @Input() module!: CoreCourseModule; // The module to render.
-    @Input() showManualCompletion = false; // Whether to show manual completion.
+    @Input() courseId!: number; // The courseId the module belongs to.
+
+    @Input() component!: string; // Component for format text directive.
+    @Input() componentId!: string | number; // Component ID to use in conjunction with the component.
+
+    @Input() description?: string | false; // The description to display. If false, no description will be shown.
+
     @Output() completionChanged = new EventEmitter<CoreCourseModuleCompletionData>(); // Notify when completion changes.
 
+    modicon = '';
+    showCompletion = false; // Whether to show completion.
+
+    /**
+     * @inheritdoc
+     */
+    async ngOnInit(): Promise<void> {
+        this.modicon = await CoreCourseModuleDelegate.getModuleIconSrc(this.module.modname, this.module.modicon, this.module);
+
+        this.showCompletion = CoreSites.getRequiredCurrentSite().isVersionGreaterEqualThan('3.11');
+    }
+
 }
diff --git a/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html b/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html
index 10fb79074..4e27e6c44 100644
--- a/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html
+++ b/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html
@@ -1,7 +1,6 @@
 <div class="ion-padding">
-    <core-course-module-description [description]="module?.description" contextLevel="module"
-        [contextInstanceId]="module?.id" [courseId]="courseId">
-    </core-course-module-description>
+    <core-course-module-info [description]="module?.description" [courseId]="courseId" [module]="module">
+    </core-course-module-info>
 
     <h2 *ngIf="!isDisabledInSite && isSupportedByTheApp">{{ 'core.whoops' | translate }}</h2>
     <h2 *ngIf="isDisabledInSite || !isSupportedByTheApp">{{ 'core.uhoh' | translate }}</h2>

From f31fc5a6df2ec8a21212141a302745450ee6494d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 17 Nov 2021 11:46:37 +0100
Subject: [PATCH 0235/1008] MOBILE-3810 format-text: Remove format text full
 view and review toggle

---
 .../addon-mod-assign-feedback-plugin.html     |   6 +-
 .../addon-mod-assign-submission-plugin.html   |   6 +-
 .../addon-mod-assign-feedback-comments.html   |  15 +-
 ...ddon-mod-assign-submission-onlinetext.html |  17 +--
 .../index/addon-mod-workshop-index.html       |   8 +-
 src/core/directives/format-text.ts            | 128 ++++++++----------
 .../core-course-module-description.html       |   7 +-
 .../module-info/core-course-module-info.html  |   2 +-
 .../components/module/core-course-module.html |  64 +++------
 .../course/pages/preview/preview.html         |  66 ++++-----
 .../courses/pages/categories/categories.html  |   2 +-
 .../courses/services/courses-helper.ts        |   2 +-
 .../features/grades/pages/grade/grade.html    |  27 ++--
 src/core/services/utils/text.ts               |   2 +-
 src/theme/components/format-text.scss         |  88 ++++++------
 src/theme/theme.base.scss                     |   2 +-
 16 files changed, 212 insertions(+), 230 deletions(-)

diff --git a/src/addons/mod/assign/components/feedback-plugin/addon-mod-assign-feedback-plugin.html b/src/addons/mod/assign/components/feedback-plugin/addon-mod-assign-feedback-plugin.html
index 0c6116e3c..fce2551b7 100644
--- a/src/addons/mod/assign/components/feedback-plugin/addon-mod-assign-feedback-plugin.html
+++ b/src/addons/mod/assign/components/feedback-plugin/addon-mod-assign-feedback-plugin.html
@@ -1,4 +1,3 @@
-
 <core-dynamic-component [component]="pluginComponent" [data]="data">
     <!-- This content will be replaced by the component if found. -->
     <core-loading [hideUntil]="pluginLoaded">
@@ -9,9 +8,8 @@
                     {{ 'addon.mod_assign.feedbacknotsupported' | translate }}
                 </ion-badge>
                 <p *ngIf="text">
-                    <core-format-text [component]="component" [componentId]="assign.cmid" [maxHeight]="80" [fullOnClick]="true"
-                        [fullTitle]="plugin.name" [text]="text" contextLevel="module" [contextInstanceId]="assign.cmid"
-                        [courseId]="assign.course">
+                    <core-format-text [component]="component" [componentId]="assign.cmid" [maxHeight]="120" [text]="text"
+                        contextLevel="module" [contextInstanceId]="assign.cmid" [courseId]="assign.course">
                     </core-format-text>
                 </p>
                 <core-file *ngFor="let file of files" [file]="file" [component]="component" [componentId]="assign.cmid"
diff --git a/src/addons/mod/assign/components/submission-plugin/addon-mod-assign-submission-plugin.html b/src/addons/mod/assign/components/submission-plugin/addon-mod-assign-submission-plugin.html
index 9ec50a95c..0359f704c 100644
--- a/src/addons/mod/assign/components/submission-plugin/addon-mod-assign-submission-plugin.html
+++ b/src/addons/mod/assign/components/submission-plugin/addon-mod-assign-submission-plugin.html
@@ -1,4 +1,3 @@
-
 <core-dynamic-component [component]="pluginComponent" [data]="data">
     <!-- This content will be replaced by the component if found. -->
     <core-loading [hideUntil]="pluginLoaded">
@@ -9,9 +8,8 @@
                     {{ 'addon.mod_assign.submissionnotsupported' | translate }}
                 </ion-badge>
                 <p *ngIf="text">
-                    <core-format-text [component]="component" [componentId]="assign.cmid" [maxHeight]="80" [fullOnClick]="true"
-                        [fullTitle]="plugin.name" [text]="text" contextLevel="module" [contextInstanceId]="assign.cmid"
-                        [courseId]="assign.course">
+                    <core-format-text [component]="component" [componentId]="assign.cmid" [maxHeight]="120" [text]="text"
+                        contextLevel="module" [contextInstanceId]="assign.cmid" [courseId]="assign.course">
                     </core-format-text>
                 </p>
                 <core-file *ngFor="let file of files" [file]="file" [component]="component" [componentId]="assign.cmid"
diff --git a/src/addons/mod/assign/feedback/comments/component/addon-mod-assign-feedback-comments.html b/src/addons/mod/assign/feedback/comments/component/addon-mod-assign-feedback-comments.html
index b56fbcdd8..4a125adc0 100644
--- a/src/addons/mod/assign/feedback/comments/component/addon-mod-assign-feedback-comments.html
+++ b/src/addons/mod/assign/feedback/comments/component/addon-mod-assign-feedback-comments.html
@@ -3,16 +3,14 @@
     <ion-label>
         <h2>{{ plugin.name }}</h2>
         <p>
-            <core-format-text [component]="component" [componentId]="assign.cmid" [maxHeight]="80" [fullOnClick]="true"
-                [fullTitle]="plugin.name" [text]="text" contextLevel="module" [contextInstanceId]="assign.cmid"
-                [courseId]="assign.course">
+            <core-format-text [component]="component" [componentId]="assign.cmid" [maxHeight]="120" [text]="text" contextLevel="module"
+                [contextInstanceId]="assign.cmid" [courseId]="assign.course">
             </core-format-text>
         </p>
     </ion-label>
     <div slot="end">
         <div class="ion-text-end">
-            <ion-button fill="clear" *ngIf="canEdit" (click)="editComment()" color="dark"
-                [attr.aria-label]="'core.edit' | translate">
+            <ion-button fill="clear" *ngIf="canEdit" (click)="editComment()" color="dark" [attr.aria-label]="'core.edit' | translate">
                 <ion-icon name="fas-pen" slot="icon-only" aria-hidden="true"></ion-icon>
             </ion-button>
         </div>
@@ -25,9 +23,8 @@
 <!-- Edit -->
 <ion-item class="ion-text-wrap" *ngIf="edit && loaded">
     <ion-label class="sr-only">{{ plugin.name }}</ion-label>
-    <core-rich-text-editor [control]="control" [placeholder]="plugin.name"
-        name="assignfeedbackcomments_editor" [component]="component" [componentId]="assign.cmid" [autoSave]="true"
-        contextLevel="module" [contextInstanceId]="assign.cmid" elementId="assignfeedbackcomments_editor"
-        [draftExtraParams]="{userid: userId, action: 'grade'}">
+    <core-rich-text-editor [control]="control" [placeholder]="plugin.name" name="assignfeedbackcomments_editor" [component]="component"
+        [componentId]="assign.cmid" [autoSave]="true" contextLevel="module" [contextInstanceId]="assign.cmid"
+        elementId="assignfeedbackcomments_editor" [draftExtraParams]="{userid: userId, action: 'grade'}">
     </core-rich-text-editor>
 </ion-item>
diff --git a/src/addons/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html b/src/addons/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html
index 6660c6c4f..f17a5dca5 100644
--- a/src/addons/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html
+++ b/src/addons/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html
@@ -4,9 +4,8 @@
         <h2>{{ plugin.name }}</h2>
         <p *ngIf="words">{{ 'addon.mod_assign.numwords' | translate: {'$a': words} }}</p>
         <p>
-            <core-format-text [component]="component" [componentId]="assign.cmid" [maxHeight]="80" [fullOnClick]="true"
-                [fullTitle]="plugin.name" [text]="text" contextLevel="module" [contextInstanceId]="assign.cmid"
-                [courseId]="assign.course">
+            <core-format-text [component]="component" [componentId]="assign.cmid" [maxHeight]="120" [text]="text" contextLevel="module"
+                [contextInstanceId]="assign.cmid" [courseId]="assign.course">
             </core-format-text>
         </p>
     </ion-label>
@@ -15,7 +14,9 @@
 <!-- Edit -->
 <div *ngIf="edit && loaded">
     <ion-item-divider class="ion-text-wrap" sticky="true">
-        <ion-label><h2>{{ plugin.name }}</h2></ion-label>
+        <ion-label>
+            <h2>{{ plugin.name }}</h2>
+        </ion-label>
     </ion-item-divider>
     <ion-item class="ion-text-wrap" *ngIf="wordLimitEnabled && words >= 0">
         <ion-label>
@@ -25,10 +26,10 @@
     </ion-item>
     <ion-item class="ion-text-wrap">
         <ion-label class="sr-only">{{ plugin.name }}</ion-label>
-        <core-rich-text-editor [control]="control" [placeholder]="plugin.name"
-            name="onlinetext_editor_text" (contentChanged)="onChange($event)" [component]="component"
-            [componentId]="assign.cmid" [autoSave]="true" contextLevel="module" [contextInstanceId]="assign.cmid"
-            elementId="onlinetext_editor" [draftExtraParams]="{userid: currentUserId, action: 'editsubmission'}">
+        <core-rich-text-editor [control]="control" [placeholder]="plugin.name" name="onlinetext_editor_text"
+            (contentChanged)="onChange($event)" [component]="component" [componentId]="assign.cmid" [autoSave]="true" contextLevel="module"
+            [contextInstanceId]="assign.cmid" elementId="onlinetext_editor"
+            [draftExtraParams]="{userid: currentUserId, action: 'editsubmission'}">
         </core-rich-text-editor>
     </ion-item>
 </div>
diff --git a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
index 35f7cac49..4004119c0 100644
--- a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
+++ b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
@@ -87,7 +87,7 @@
                 <ion-item class="ion-text-wrap">
                     <ion-label>
                         <h2>{{ 'addon.mod_workshop.conclusion' | translate }}</h2>
-                        <core-format-text fullOnClick="true" [component]="component" [componentId]="module.id" [text]="workshop!.conclusion"
+                        <core-format-text [maxHeight]="120" [component]="component" [componentId]="module.id" [text]="workshop!.conclusion"
                             contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
                         </core-format-text>
                     </ion-label>
@@ -120,8 +120,8 @@
             <ion-item class="ion-text-wrap">
                 <ion-label>
                     <h2>{{ 'addon.mod_workshop.areainstructauthors' | translate }}</h2>
-                    <core-format-text fullOnClick="true" [component]="component" [componentId]="module.id"
-                        [text]="workshop!.instructauthors" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
+                    <core-format-text [maxHeight]="120" [component]="component" [componentId]="module.id" [text]="workshop!.instructauthors"
+                        contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
                     </core-format-text>
                 </ion-label>
             </ion-item>
@@ -184,7 +184,7 @@
                 <ion-item class="ion-text-wrap">
                     <ion-label>
                         <h2>{{ 'addon.mod_workshop.areainstructreviewers' | translate }}</h2>
-                        <core-format-text fullOnClick="true" [component]="component" [componentId]="module.id"
+                        <core-format-text [maxHeight]="120" [component]="component" [componentId]="module.id"
                             [text]="workshop!.instructreviewers" contextLevel="module" [contextInstanceId]="module.id"
                             [courseId]="courseId">
                         </core-format-text>
diff --git a/src/core/directives/format-text.ts b/src/core/directives/format-text.ts
index ea1ed3e5e..10c220e72 100644
--- a/src/core/directives/format-text.ts
+++ b/src/core/directives/format-text.ts
@@ -61,8 +61,6 @@ export class CoreFormatTextDirective implements OnChanges {
     @Input() adaptImg?: boolean | string = true; // Whether to adapt images to screen width.
     @Input() clean?: boolean | string; // Whether all the HTML tags should be removed.
     @Input() singleLine?: boolean | string; // Whether new lines should be removed (all text in single line). Only if clean=true.
-    @Input() fullOnClick?: boolean | string; // Whether it should open a new page with the full contents on click.
-    @Input() fullTitle?: string; // Title to use in full view. Defaults to "Description".
     @Input() highlight?: string; // Text to highlight.
     @Input() filter?: boolean | string; // Whether to filter the text. If not defined, true if contextLevel and instanceId are set.
     @Input() contextLevel?: string; // The context level of the text.
@@ -73,6 +71,8 @@ export class CoreFormatTextDirective implements OnChanges {
     @Input() openLinksInApp?: boolean; // Whether links should be opened in InAppBrowser.
     @Input() hideIfEmpty = false; // If true, the tag will contain nothing if text is empty.
 
+    @Input() fullOnClick?: boolean | string; // @deprecated on 4.0 Won't do anything.
+    @Input() fullTitle?: string; // @deprecated on 4.0 Won't do anything..
     /**
      * Max height in pixels to render the content box. It should be 50 at least to make sense.
      * Using this parameter will force display: block to calculate height better.
@@ -84,10 +84,11 @@ export class CoreFormatTextDirective implements OnChanges {
     @Output() onClick: EventEmitter<void> = new EventEmitter(); // Called when clicked.
 
     protected element: HTMLElement;
-    protected showMoreDisplayed = false;
+    protected expanded = false;
     protected loadingChangedListener?: CoreEventObserver;
     protected emptyText = '';
     protected contentSpan: HTMLElement;
+    protected toggleExpandEnabled = false;
 
     constructor(
         element: ElementRef,
@@ -114,11 +115,12 @@ export class CoreFormatTextDirective implements OnChanges {
     }
 
     /**
-     * Detect changes on input properties.
+     * @inheritdoc
      */
     ngOnChanges(changes: { [name: string]: SimpleChange }): void {
         if (changes.text || changes.filter || changes.contextLevel || changes.contextInstanceId) {
-            this.hideShowMore();
+            this.setExpandButtonEnabled(false);
+
             this.formatAndRenderContents();
         }
     }
@@ -267,37 +269,61 @@ export class CoreFormatTextDirective implements OnChanges {
         this.element.style.maxHeight = initialMaxHeight;
 
         // If cannot calculate height, shorten always.
-        if (!height || height > this.maxHeight) {
-            if (!this.showMoreDisplayed) {
-                this.displayShowMore();
-            }
-        } else if (this.showMoreDisplayed) {
-            this.hideShowMore();
-        }
+        this.setExpandButtonEnabled(!height || height > this.maxHeight);
     }
 
     /**
-     * Display the "Show more" in the element.
+     * Sets if expand button is enabled or not.
+     *
+     * @param enable Wether enable or disable.
      */
-    protected displayShowMore(): void {
-        const expandInFullview = CoreUtils.isTrueOrOne(this.fullOnClick) || false;
-        const showMoreButton = document.createElement('ion-button');
+    protected setExpandButtonEnabled(enable: boolean): void {
+        this.toggleExpandEnabled = enable;
+        this.element.classList.toggle('core-text-formatted', enable);
 
-        showMoreButton.classList.add('core-show-more');
-        showMoreButton.setAttribute('fill', 'clear');
-        showMoreButton.innerHTML = Translate.instant('core.showmore');
-        this.element.appendChild(showMoreButton);
-
-        if (expandInFullview) {
-            this.element.classList.add('core-expand-in-fullview');
-        } else {
-            showMoreButton.setAttribute('aria-expanded', 'false');
+        if (!enable || this.element.querySelector('ion-button.core-format-text-toggle'))  {
+            return;
         }
-        this.element.classList.add('core-text-formatted');
-        this.element.classList.add('core-shortened');
-        this.element.style.maxHeight = this.maxHeight + 'px';
 
-        this.showMoreDisplayed = true;
+        // Add expand/collapse buttons
+        const toggleButton = document.createElement('ion-button');
+        toggleButton.classList.add('core-format-text-toggle');
+        toggleButton.setAttribute('fill', 'clear');
+
+        const toggleText = document.createElement('span');
+        toggleText.classList.add('core-format-text-toggle-text');
+        toggleButton.appendChild(toggleText);
+
+        const expandArrow = document.createElement('span');
+        expandArrow.classList.add('core-format-text-arrow');
+        toggleButton.appendChild(expandArrow);
+
+        this.element.appendChild(toggleButton);
+
+        this.toggleExpand(this.expanded);
+    }
+
+    /**
+     * Expand or collapse text.
+     *
+     * @param expand Wether expand or collapse text. If undefined, will toggle.
+     */
+    protected toggleExpand(expand?: boolean): void {
+        if (expand === undefined) {
+            expand = !this.expanded;
+        }
+        this.expanded = expand;
+        this.element.classList.toggle('core-text-format-expanded', expand);
+        this.element.classList.toggle('core-text-format-collapsed', !expand);
+        this.element.style.maxHeight = expand ? '' : this.maxHeight + 'px';
+
+        const toggleButton = this.element.querySelector('ion-button.core-format-text-toggle');
+        const toggleText = toggleButton?.querySelector('.core-format-text-toggle-text');
+        if (!toggleButton || !toggleText) {
+            return;
+        }
+        toggleText.innerHTML = expand ? Translate.instant('core.showless') : Translate.instant('core.showmore');
+        toggleButton.setAttribute('aria-expanded', expand ? 'true' : 'false');
     }
 
     /**
@@ -321,9 +347,7 @@ export class CoreFormatTextDirective implements OnChanges {
             return;
         }
 
-        const expandInFullview = CoreUtils.isTrueOrOne(this.fullOnClick) || false;
-
-        if (!expandInFullview && !this.showMoreDisplayed) {
+        if (!this.toggleExpandEnabled) {
             // Nothing to do on click, just stop.
             return;
         }
@@ -331,28 +355,7 @@ export class CoreFormatTextDirective implements OnChanges {
         e.preventDefault();
         e.stopPropagation();
 
-        if (!expandInFullview) {
-            // Change class.
-            this.element.classList.toggle('core-shortened');
-
-            return;
-        } else {
-            // Open a new state with the contents.
-            const filter = typeof this.filter != 'undefined' ? CoreUtils.isTrueOrOne(this.filter) : undefined;
-
-            CoreTextUtils.viewText(
-                this.fullTitle || Translate.instant('core.description'),
-                this.text,
-                {
-                    component: this.component,
-                    componentId: this.componentId,
-                    filter: filter,
-                    contextLevel: this.contextLevel,
-                    instanceId: this.contextInstanceId,
-                    courseId: this.courseId,
-                },
-            );
-        }
+        this.toggleExpand();
     }
 
     /**
@@ -361,6 +364,7 @@ export class CoreFormatTextDirective implements OnChanges {
     protected finishRender(): void {
         // Show the element again.
         this.element.classList.remove('core-format-text-loading');
+
         // Emit the afterRender output.
         this.afterRender.emit();
     }
@@ -393,7 +397,7 @@ export class CoreFormatTextDirective implements OnChanges {
 
         this.contentSpan.innerHTML = ''; // Remove current contents.
         if (this.maxHeight && result.div.innerHTML != '' &&
-                (this.fullOnClick || (window.innerWidth < 576 || window.innerHeight < 576))) { // Don't collapse in big screens.
+                (window.innerWidth < 576 || window.innerHeight < 576)) { // Don't collapse in big screens.
 
             // Move the children to the current element to be able to calculate the height.
             CoreDomUtils.moveChildren(result.div, this.contentSpan);
@@ -655,20 +659,6 @@ export class CoreFormatTextDirective implements OnChanges {
         return CoreDomUtils.getElementHeight(element) || 0;
     }
 
-    /**
-     * "Hide" the "Show more" in the element if it's shown.
-     */
-    protected hideShowMore(): void {
-        const showMoreButton = this.element.querySelector('ion-button.core-show-more');
-        showMoreButton?.remove();
-
-        this.element.classList.remove('core-expand-in-fullview');
-        this.element.classList.remove('core-text-formatted');
-        this.element.classList.remove('core-shortened');
-        this.element.style.maxHeight = '';
-        this.showMoreDisplayed = false;
-    }
-
     /**
      * Add media adapt class and apply CoreExternalContentDirective to the media element and its sources and tracks.
      *
diff --git a/src/core/features/course/components/module-description/core-course-module-description.html b/src/core/features/course/components/module-description/core-course-module-description.html
index e07546c5a..0f6d34c0a 100644
--- a/src/core/features/course/components/module-description/core-course-module-description.html
+++ b/src/core/features/course/components/module-description/core-course-module-description.html
@@ -1,9 +1,8 @@
 <ion-card *ngIf="description">
     <ion-item class="ion-text-wrap">
         <ion-label>
-            <core-format-text [text]="description" [component]="component" [componentId]="componentId"
-                [maxHeight]="showFull && showFull !== 'false' ? 0 : 120" fullOnClick="true" [contextLevel]="contextLevel"
-                [contextInstanceId]="contextInstanceId" [courseId]="courseId">
+            <core-format-text [text]="description" [component]="component" [componentId]="componentId" [maxHeight]="120"
+                [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId">
             </core-format-text>
         </ion-label>
     </ion-item>
@@ -12,4 +11,4 @@
             <ion-note slot="end">{{ note }}</ion-note>
         </ion-label>
     </ion-item>
-</ion-card>
\ No newline at end of file
+</ion-card>
diff --git a/src/core/features/course/components/module-info/core-course-module-info.html b/src/core/features/course/components/module-info/core-course-module-info.html
index acd0b90e5..8aac777b4 100644
--- a/src/core/features/course/components/module-info/core-course-module-info.html
+++ b/src/core/features/course/components/module-info/core-course-module-info.html
@@ -13,7 +13,7 @@
 <ion-item class="ion-text-wrap" *ngIf="description" lines="none">
     <ion-label>
         <core-format-text [text]="description" [component]="component" [componentId]="componentId" contextLevel="module"
-            [contextInstanceId]="module.id" [courseId]="courseId" maxHeight="120">
+            [contextInstanceId]="module.id" [courseId]="courseId" [maxHeight]="120">
         </core-format-text>
     </ion-label>
 </ion-item>
diff --git a/src/core/features/course/components/module/core-course-module.html b/src/core/features/course/components/module/core-course-module.html
index 630c19e11..ea1bec5df 100644
--- a/src/core/features/course/components/module/core-course-module.html
+++ b/src/core/features/course/components/module/core-course-module.html
@@ -1,17 +1,12 @@
 <ng-container *ngIf="module.handlerData && module.visibleoncoursepage !== 0">
     <ng-container *ngIf="!module.handlerData.loading">
-        <ion-item
-            id="core-course-module-{{module.id}}"
+        <ion-item id="core-course-module-{{module.id}}"
             class="ion-text-wrap core-course-module-handler core-module-main-item {{module.handlerData.class}}"
-            (click)="moduleClicked($event)"
-            [attr.aria-label]="module.handlerData.a11yTitle"
-            [ngClass]="{
+            (click)="moduleClicked($event)" [attr.aria-label]="module.handlerData.a11yTitle" [ngClass]="{
                 'has-module-info': hasInfo,
                 'item-media': module.handlerData.icon,
                 'item-dimmed': module.visible === 0 || module.uservisible === false
-            }"
-            [button]="module.handlerData.action && module.uservisible"
-            detail="false">
+            }" [button]="module.handlerData.action && module.uservisible" detail="false">
 
             <core-mod-icon slot="start" *ngIf="module.handlerData.icon" [modicon]="module.handlerData.icon" [modname]="module.modname"
                 [componentId]="module.instance">
@@ -23,11 +18,8 @@
                         [courseId]="courseId" [attr.aria-label]="module.handlerData.a11yTitle + ', ' + modNameTranslated">
                     </core-format-text>
                 </p>
-                <ion-badge
-                    *ngIf="module.handlerData.extraBadge"
-                    [color]="module.handlerData.extraBadgeColor"
-                    class="ion-text-wrap ion-text-start"
-                >
+                <ion-badge *ngIf="module.handlerData.extraBadge" [color]="module.handlerData.extraBadgeColor"
+                    class="ion-text-wrap ion-text-start">
                     <span [innerHTML]="module.handlerData.extraBadge"></span>
                 </ion-badge>
                 <ion-badge *ngIf="module.visible === 0 && (!section || section.visible)" class="ion-text-wrap">
@@ -47,12 +39,8 @@
                 </ion-badge>
             </ion-label>
             <!-- Buttons. -->
-            <div
-                slot="end"
-                *ngIf="module.uservisible !== false"
-                class="buttons core-module-buttons"
-                [ngClass]="{'core-button-completion': module.completiondata && showLegacyCompletion}"
-            >
+            <div slot="end" *ngIf="module.uservisible !== false" class="buttons core-module-buttons"
+                [ngClass]="{'core-button-completion': module.completiondata && showLegacyCompletion}">
                 <!-- Module completion (legacy). -->
                 <core-course-module-completion-legacy *ngIf="module.completiondata && showLegacyCompletion"
                     [completion]="module.completiondata" [moduleName]="module.name" [moduleId]="module.id"
@@ -60,31 +48,24 @@
                 </core-course-module-completion-legacy>
 
                 <div class="core-module-buttons-more">
-                    <core-download-refresh [status]="downloadStatus" [enabled]="downloadEnabled"
-                        [canTrustDownload]="true" [loading]="spinner || module.handlerData.spinner"
-                        (action)="download($event)" size="small">
+                    <core-download-refresh [status]="downloadStatus" [enabled]="downloadEnabled" [canTrustDownload]="true"
+                        [loading]="spinner || module.handlerData.spinner" (action)="download($event)" size="small">
                     </core-download-refresh>
 
                     <!-- Buttons defined by the module handler. -->
                     <ion-button fill="clear" *ngFor="let button of module.handlerData.buttons" color="dark" size="small"
                         [hidden]="button.hidden || spinner || module.handlerData.spinner" class="core-animate-show-hide"
-                        (click)="buttonClicked($event, button)"
-                        [attr.aria-label]="button.label | translate:{$a: module.handlerData.title}">
+                        (click)="buttonClicked($event, button)" [attr.aria-label]="button.label | translate:{$a: module.handlerData.title}">
                         <ion-icon [name]="button.icon" slot="icon-only" aria-hidden="true"></ion-icon>
                     </ion-button>
                 </div>
             </div>
         </ion-item>
-        <ion-item
-            *ngIf="hasInfo"
-            id="core-course-module-{{module.id}}-info"
-            class="ion-text-wrap core-course-module-handler core-module-module-info {{module.handlerData.class}}"
-            [ngClass]="{
+        <ion-item *ngIf="hasInfo" id="core-course-module-{{module.id}}-info"
+            class="ion-text-wrap core-course-module-handler core-module-module-info {{module.handlerData.class}}" [ngClass]="{
                 'item-media': module.handlerData.icon,
                 'item-dimmed': module.visible === 0 || module.uservisible === false
-            }"
-            detail="false"
-        >
+            }" detail="false">
             <ion-label>
                 <!-- Activity dates. -->
                 <div *ngIf="showActivityDates && module.dates && module.dates.length" class="core-module-dates">
@@ -94,12 +75,12 @@
                 </div>
 
                 <!-- Module completion. -->
-                <core-course-module-completion *ngIf="module.completiondata" [completion]="module.completiondata"
-                    [moduleName]="module.name" [moduleId]="module.id" [showCompletionConditions]="showCompletionConditions"
+                <core-course-module-completion *ngIf="module.completiondata" [completion]="module.completiondata" [moduleName]="module.name"
+                    [moduleId]="module.id" [showCompletionConditions]="showCompletionConditions"
                     [showManualCompletion]="showManualCompletion" (completionChanged)="completionChanged.emit($event)">
                 </core-course-module-completion>
 
-                <core-format-text class="core-module-description" *ngIf="module.description" maxHeight="80" [text]="module.description"
+                <core-format-text class="core-module-description" *ngIf="module.description" [maxHeight]="80" [text]="module.description"
                     contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
                 </core-format-text>
             </ion-label>
@@ -107,14 +88,11 @@
     </ng-container>
 
     <!-- Loading. -->
-    <ion-item *ngIf="module.handlerData.loading"
-        role="status"
-        class="ion-text-wrap"
-        id="core-course-module-{{module.id}}"
+    <ion-item *ngIf="module.handlerData.loading" role="status" class="ion-text-wrap" id="core-course-module-{{module.id}}"
         [attr.aria-label]="module.handlerData.a11yTitle"
-        [ngClass]="['core-course-module-handler', 'core-module-loading', module.handlerData.class]"
-        detail="false"
-    >
-        <ion-label><ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner></ion-label>
+        [ngClass]="['core-course-module-handler', 'core-module-loading', module.handlerData.class]" detail="false">
+        <ion-label>
+            <ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner>
+        </ion-label>
     </ion-item>
 </ng-container>
diff --git a/src/core/features/course/pages/preview/preview.html b/src/core/features/course/pages/preview/preview.html
index a69893d67..49a16a7ab 100644
--- a/src/core/features/course/pages/preview/preview.html
+++ b/src/core/features/course/pages/preview/preview.html
@@ -15,7 +15,7 @@
     <core-loading [hideUntil]="dataLoaded">
         <div *ngIf="courseImageUrl" class="core-course-thumb-parallax">
             <div (click)="openCourse()" class="core-course-thumb">
-                <img [src]="courseImageUrl" core-external-content alt=""/>
+                <img [src]="courseImageUrl" core-external-content alt="" />
             </div>
         </div>
         <div class="core-course-thumb-parallax-content" *ngIf="course">
@@ -27,8 +27,10 @@
                         <core-format-text [text]="course.fullname" contextLevel="course" [contextInstanceId]="course.id">
                         </core-format-text>
                     </h2>
-                    <p *ngIf="course.categoryname"><core-format-text [text]="course.categoryname"
-                        contextLevel="coursecat" [contextInstanceId]="course.categoryid"></core-format-text></p>
+                    <p *ngIf="course.categoryname">
+                        <core-format-text [text]="course.categoryname" contextLevel="coursecat" [contextInstanceId]="course.categoryid">
+                        </core-format-text>
+                    </p>
                     <p *ngIf="course.startdate">
                         {{course.startdate * 1000 | coreFormatDate:"strftimedatefullshort" }}
                         <span *ngIf="course.enddate"> - {{course.enddate * 1000 | coreFormatDate:"strftimedatefullshort" }}</span>
@@ -38,7 +40,7 @@
 
             <ion-item class="ion-text-wrap" *ngIf="course.summary" detail="false">
                 <ion-label>
-                    <core-format-text [text]="course.summary" maxHeight="120" contextLevel="course" [contextInstanceId]="course.id">
+                    <core-format-text [text]="course.summary" [maxHeight]="120" contextLevel="course" [contextInstanceId]="course.id">
                     </core-format-text>
                 </ion-label>
             </ion-item>
@@ -51,8 +53,7 @@
                 </ion-item-divider>
                 <ion-item class="ion-text-wrap" *ngFor="let contact of course.contacts" core-user-link [userId]="contact.id"
                     [courseId]="isEnrolled ? course.id : null" [attr.aria-label]="'core.viewprofile' | translate" detail="true">
-                    <core-user-avatar [user]="contact" slot="start" [userId]="contact.id"
-                        [courseId]="isEnrolled ? course.id : null">
+                    <core-user-avatar [user]="contact" slot="start" [userId]="contact.id" [courseId]="isEnrolled ? course.id : null">
                     </core-user-avatar>
                     <ion-label>
                         <p class="item-heading">{{contact.fullname}}</p>
@@ -63,20 +64,20 @@
 
             <ion-item class="ion-text-wrap" *ngIf="course.customfields">
                 <ion-label>
-                <ng-container *ngFor="let field of course.customfields">
-                    <div *ngIf="field.value"
-                        class="core-customfield core-customfield_{{field.type}} core-customfield_{{field.shortname}}">
-                        <span class="core-customfieldname">
-                            <core-format-text [text]="field.name" contextLevel="course" [contextInstanceId]="course.id">
-                            </core-format-text>
-                        </span><span class="core-customfieldseparator">: </span>
-                        <span class="core-customfieldvalue">
-                            <core-format-text [text]="field.value" maxHeight="120" contextLevel="course"
-                            [contextInstanceId]="course.id">
-                            </core-format-text>
-                        </span>
-                    </div>
-                </ng-container>
+                    <ng-container *ngFor="let field of course.customfields">
+                        <div *ngIf="field.value"
+                            class="core-customfield core-customfield_{{field.type}} core-customfield_{{field.shortname}}">
+                            <span class="core-customfieldname">
+                                <core-format-text [text]="field.name" contextLevel="course" [contextInstanceId]="course.id">
+                                </core-format-text>
+                            </span><span class="core-customfieldseparator">: </span>
+                            <span class="core-customfieldvalue">
+                                <core-format-text [text]="field.value" [maxHeight]="120" contextLevel="course"
+                                    [contextInstanceId]="course.id">
+                                </core-format-text>
+                            </span>
+                        </div>
+                    </ng-container>
                 </ion-label>
             </ion-item>
 
@@ -100,19 +101,19 @@
                 </ion-label>
             </ion-item>
             <ion-item *ngIf="!isEnrolled && !selfEnrolInstances.length && !paypalEnabled">
-                <ion-label><p>{{ 'core.courses.notenrollable' | translate }}</p></ion-label>
+                <ion-label>
+                    <p>{{ 'core.courses.notenrollable' | translate }}</p>
+                </ion-label>
             </ion-item>
             <ion-item *ngIf="canAccessCourse && downloadCourseEnabled" (click)="prefetchCourse()" detail="false"
-                    [attr.aria-label]="prefetchCourseData.statusTranslatable | translate" button>
+                [attr.aria-label]="prefetchCourseData.statusTranslatable | translate" button>
                 <ion-icon *ngIf="(prefetchCourseData.status != statusDownloaded) && !prefetchCourseData.loading"
                     [name]="prefetchCourseData.icon" slot="start" aria-hidden="true">
                 </ion-icon>
-                <ion-icon *ngIf="(prefetchCourseData.status == statusDownloaded) && !prefetchCourseData.loading"
-                    slot="start" [name]="prefetchCourseData.icon" color="success"
-                    aria-hidden="true" role="status">
+                <ion-icon *ngIf="(prefetchCourseData.status == statusDownloaded) && !prefetchCourseData.loading" slot="start"
+                    [name]="prefetchCourseData.icon" color="success" aria-hidden="true" role="status">
                 </ion-icon>
-                <ion-spinner *ngIf="prefetchCourseData.loading" slot="start"
-                    [attr.aria-label]="'core.loading' | translate"></ion-spinner>
+                <ion-spinner *ngIf="prefetchCourseData.loading" slot="start" [attr.aria-label]="'core.loading' | translate"></ion-spinner>
                 <ion-label>
                     <h2 *ngIf="prefetchCourseData.status != statusDownloaded">{{ 'core.course.downloadcourse' | translate }}</h2>
                     <h2 *ngIf="prefetchCourseData.status == statusDownloaded">{{ 'core.course.refreshcourse' | translate }}</h2>
@@ -121,12 +122,15 @@
             <ion-item button (click)="openCourse()" [attr.aria-label]="course.fullname" *ngIf="!avoidOpenCourse && canAccessCourse"
                 detail="true">
                 <ion-icon name="fas-briefcase" slot="start" aria-hidden="true"></ion-icon>
-                <ion-label><h2>{{ 'core.course.contents' | translate }}</h2></ion-label>
+                <ion-label>
+                    <h2>{{ 'core.course.contents' | translate }}</h2>
+                </ion-label>
             </ion-item>
-            <ion-item [href]="courseUrl" core-link [attr.aria-label]="course.fullname" button detail="false"
-                [showBrowserWarning]="false">
+            <ion-item [href]="courseUrl" core-link [attr.aria-label]="course.fullname" button detail="false" [showBrowserWarning]="false">
                 <ion-icon name="fas-external-link-alt" slot="start" aria-hidden="true"></ion-icon>
-                <ion-label><h2>{{ 'core.openinbrowser' | translate }}</h2></ion-label>
+                <ion-label>
+                    <h2>{{ 'core.openinbrowser' | translate }}</h2>
+                </ion-label>
             </ion-item>
         </div>
     </core-loading>
diff --git a/src/core/features/courses/pages/categories/categories.html b/src/core/features/courses/pages/categories/categories.html
index 495001569..0baf6bdff 100644
--- a/src/core/features/courses/pages/categories/categories.html
+++ b/src/core/features/courses/pages/categories/categories.html
@@ -31,7 +31,7 @@
                     </core-format-text>
                 </p>
                 <p *ngIf="currentCategory.description">
-                    <core-format-text [text]="currentCategory.description" maxHeight="60" contextLevel="coursecat"
+                    <core-format-text [text]="currentCategory.description" [maxHeight]="120" contextLevel="coursecat"
                         [contextInstanceId]="currentCategory.id"></core-format-text>
                 </p>
             </ion-label>
diff --git a/src/core/features/courses/services/courses-helper.ts b/src/core/features/courses/services/courses-helper.ts
index 3cf1a014d..df8e4e92c 100644
--- a/src/core/features/courses/services/courses-helper.ts
+++ b/src/core/features/courses/services/courses-helper.ts
@@ -251,7 +251,7 @@ export class CoreCoursesHelperProvider {
             case 'lastaccess':
                 courses.sort((a, b) => (b.lastaccess || 0) - (a.lastaccess || 0));
                 break;
-            // @todo Time modified property is not defined in CoreEnrolledCourseDataWithOptions, so it won't do nothing.
+            // @todo Time modified property is not defined in CoreEnrolledCourseDataWithOptions, so it Won't do anything.
             // case 'timemodified':
             //    courses.sort((a, b) => b.timemodified - a.timemodified);
             //    break;
diff --git a/src/core/features/grades/pages/grade/grade.html b/src/core/features/grades/pages/grade/grade.html
index 9abe2b1f3..f565c8388 100644
--- a/src/core/features/grades/pages/grade/grade.html
+++ b/src/core/features/grades/pages/grade/grade.html
@@ -14,26 +14,29 @@
         <core-empty-box *ngIf="!grade" icon="fas-chart-bar" [message]="'core.grades.nogradesreturned' | translate"></core-empty-box>
 
         <ion-list *ngIf="grade">
-            <ion-item *ngIf="grade.itemname && grade.link" class="ion-text-wrap" detail="true" [href]="grade.link" core-link
-            capture="true">
+            <ion-item *ngIf="grade.itemname && grade.link" class="ion-text-wrap" detail="true" [href]="grade.link" core-link capture="true">
                 <ion-icon *ngIf="grade.icon" name="{{grade.icon}}" slot="start" [attr.aria-label]="grade.iconAlt"></ion-icon>
-                <img *ngIf="grade.image && !grade.itemmodule" [src]="grade.image && grade.itemmodule" slot="start" [alt]="grade.iconAlt"/>
+                <img *ngIf="grade.image && !grade.itemmodule" [src]="grade.image && grade.itemmodule" slot="start" [alt]="grade.iconAlt" />
                 <core-mod-icon *ngIf="grade.image && grade.itemmodule" [modicon]="grade.image" slot="start" [modname]="grade.itemmodule">
                 </core-mod-icon>
                 <ion-label>
-                    <h2><core-format-text [text]="grade.itemname" contextLevel="course" [contextInstanceId]="courseId">
-                    </core-format-text></h2>
+                    <h2>
+                        <core-format-text [text]="grade.itemname" contextLevel="course" [contextInstanceId]="courseId">
+                        </core-format-text>
+                    </h2>
                 </ion-label>
             </ion-item>
 
-            <ion-item *ngIf="grade.itemname && !grade.link" class="ion-text-wrap" >
+            <ion-item *ngIf="grade.itemname && !grade.link" class="ion-text-wrap">
                 <ion-icon *ngIf="grade.icon" name="{{grade.icon}}" slot="start" [attr.aria-label]="grade.iconAlt"></ion-icon>
-                <img *ngIf="grade.image && !grade.itemmodule" [src]="grade.image" slot="start" [alt]="grade.iconAlt"/>
+                <img *ngIf="grade.image && !grade.itemmodule" [src]="grade.image" slot="start" [alt]="grade.iconAlt" />
                 <core-mod-icon *ngIf="grade.image && grade.itemmodule" [modicon]="grade.image" slot="start" [modname]="grade.itemmodule">
                 </core-mod-icon>
                 <ion-label>
-                    <h2><core-format-text [text]="grade.itemname" contextLevel="course" [contextInstanceId]="courseId">
-                    </core-format-text></h2>
+                    <h2>
+                        <core-format-text [text]="grade.itemname" contextLevel="course" [contextInstanceId]="courseId">
+                        </core-format-text>
+                    </h2>
                 </ion-label>
             </ion-item>
 
@@ -89,8 +92,10 @@
             <ion-item class="ion-text-wrap" *ngIf="grade.feedback">
                 <ion-label>
                     <h2>{{ 'core.grades.feedback' | translate}}</h2>
-                    <p><core-format-text [fullTitle]="'core.grades.feedback' | translate" maxHeight="60" fullOnClick="true"
-                        [text]="grade.feedback" contextLevel="course" [contextInstanceId]="courseId"></core-format-text></p>
+                    <p>
+                        <core-format-text [maxHeight]="120" [text]="grade.feedback" contextLevel="course" [contextInstanceId]="courseId">
+                        </core-format-text>
+                    </p>
                 </ion-label>
             </ion-item>
 
diff --git a/src/core/services/utils/text.ts b/src/core/services/utils/text.ts
index 2ea31bf2b..362298e18 100644
--- a/src/core/services/utils/text.ts
+++ b/src/core/services/utils/text.ts
@@ -571,7 +571,7 @@ export class CoreTextUtilsProvider {
 
         const regex = new RegExp('(' + searchText + ')', 'gi');
 
-        return text.replace(regex, '<span class="matchtext">$1</span>');
+        return text.replace(regex, '<mark class="matchtext">$1</mark>');
     }
 
     /**
diff --git a/src/theme/components/format-text.scss b/src/theme/components/format-text.scss
index 204c0612b..7ac616332 100644
--- a/src/theme/components/format-text.scss
+++ b/src/theme/components/format-text.scss
@@ -51,11 +51,15 @@ core-format-text {
             display: inline;
         }
 
-        .core-show-more {
+        .core-format-text-toggle {
             display: none !important;
         }
     }
 
+    .core-format-text-toggle {
+        display: none;
+    }
+
     .core-format-text-content {
         opacity: 1;
         @include core-transition(opacity, 200ms);
@@ -84,30 +88,45 @@ core-format-text {
             cursor: pointer;
             pointer-events: auto;
 
-            .core-show-more {
-                display: none;
+            .core-format-text-toggle {
+                display: block;
+                position: absolute;
+                bottom: 0;
+                left: 0;
+                right: 0;
+                text-align: center;
+                z-index: 7;
+                text-transform: none;
+                text-align: end;
+                font-size: 14px;
+                background-color: var(--core-format-text-background);
+                color: var(--text-color);
+                margin: 0;
+
+                
+                .core-format-text-arrow {
+                    width: var(--a11y-min-target-size);
+                    height: var(--a11y-min-target-size);
+
+                    background-position: center;
+                    background-repeat: no-repeat;
+                    background-size: 14px 14px;
+                    @include core-transition(transform, 500ms);
+
+                    @include push-arrow-color(626262, true);
+
+                    @include darkmode() {
+                        @include push-arrow-color(ffffff, true);
+                    }
+                }
             }
 
-            &:not(.core-shortened) {
-                max-height: none !important;
-            }
-
-            &.core-shortened {
+            &.core-text-format-collapsed {
                 overflow: hidden;
                 min-height: 50px;
 
-                .core-show-more {
-                    text-transform: none;
-                    text-align: end;
-                    font-size: 14px;
-                    display: block;
-                    position: absolute;
-                    @include position(null, 0, 0, null);
-                    z-index: 7;
-                    background-color: var(--core-format-text-background);
-                    color: var(--text-color);
-                    @include padding(null, null, null, 10px);
-                    margin: 0;
+                .core-format-text-arrow {
+                    transform: rotate(90deg);
                 }
 
                 &:before {
@@ -115,26 +134,19 @@ core-format-text {
                     height: 100%;
                     position: absolute;
                     @include position(null, 0, 0, 0);
-                    background: -webkit-linear-gradient(top, rgba(var(--core-format-text-background-gradient-rgb), 0) calc(100% - 50px), rgba(var(--core-format-text-background-gradient-rgb), 1) calc(100% - 15px));
-                    background: linear-gradient(to bottom, rgba(var(--core-format-text-background-gradient-rgb), 0) calc(100% - 50px), rgba(var(--core-format-text-background-gradient-rgb), 1) calc(100% - 15px));
+                    background: -webkit-linear-gradient(top, rgba(var(--core-format-text-background-gradient-rgb), 0) calc(100% - 60px), rgba(var(--core-format-text-background-gradient-rgb), 1) calc(100% - 40px));
+                    background: linear-gradient(to bottom, rgba(var(--core-format-text-background-gradient-rgb), 0) calc(100% - 60px), rgba(var(--core-format-text-background-gradient-rgb), 1) calc(100% - 40px));
                     z-index: 6;
                 }
             }
-        }
 
-        &.core-expand-in-fullview {
-            cursor: pointer;
+            &.core-text-format-expanded {
+                max-height: none !important;
 
-            .core-show-more {
-                @include push-arrow-color(626262, true);
-                @include padding-horizontal(null, 5px);
-                @include background-position(end, 5px, center);
+                padding-bottom: 50px; // So the Show less button can fit.
 
-                background-repeat: no-repeat;
-                background-size: 14px 14px;
-
-                @include darkmode() {
-                    @include push-arrow-color(ffffff, true);
+                .core-format-text-arrow {
+                    transform: rotate(-90deg);
                 }
             }
         }
@@ -143,10 +155,10 @@ core-format-text {
     @if ($core-format-text-never-shorten) {
         &[maxHeight],
         &[ng-reflect-max-height] {
-            &.core-text-formatted.core-shortened {
+            &.core-text-formatted.core-text-format-expanded {
                 max-height: none !important;
 
-                .core-show-more {
+                .core-format-text-toggle {
                     display: none !important;
                 }
 
@@ -354,7 +366,7 @@ core-rich-text-editor .core-rte-editor {
         height: 30px;
         display: inline-block;
         border: 1px solid var(--gray-dark);
-        background: var(--background-contrast);
+        background: var(--contrast-background);
         padding: 6px 8px;
         border-radius: 4px;
         margin-left: 2px;
@@ -363,7 +375,7 @@ core-rich-text-editor .core-rte-editor {
     }
 
     select {
-        background-color: var(--background-contrast);
+        background-color: var(--contrast-background);
         background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%22292.4%22%20height%3D%22292.4%22%3E%3Cpath%20fill%3D%22%23000000%22%20d%3D%22M287%2069.4a17.6%2017.6%200%200%200-13-5.4H18.4c-5%200-9.3%201.8-12.9%205.4A17.6%2017.6%200%200%200%200%2082.2c0%205%201.8%209.3%205.4%2012.9l128%20127.9c3.6%203.6%207.8%205.4%2012.8%205.4s9.2-1.8%2012.8-5.4L287%2095c3.5-3.5%205.4-7.8%205.4-12.8%200-5-1.9-9.2-5.5-12.8z%22%2F%3E%3C%2Fsvg%3E');
         background-repeat: no-repeat, repeat;
         background-position: right .7em top 50%, 0 0;
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index c7150accd..12b4b04a1 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -848,7 +848,7 @@ core-block ion-item-divider .core-button-spinner {
 
 // Text formats.
 // Highlight text.
-.matchtext {
+mark, .matchtext {
     background-color: var(--text-hightlight-background-color);
 }
 

From a0687821aea8933d60e6babbd78081f52b2f2949 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 17 Nov 2021 11:46:37 +0100
Subject: [PATCH 0236/1008] MOBILE-3810 module: Add data to sync to module info

---
 .../components/index/addon-mod-assign-index.html     | 12 +-----------
 .../components/index/addon-mod-choice-index.html     | 10 +---------
 .../data/components/index/addon-mod-data-index.html  | 10 +---------
 .../components/index/addon-mod-feedback-index.html   | 10 +---------
 src/addons/mod/forum/components/index/index.html     | 12 ++----------
 .../components/index/addon-mod-glossary-index.html   | 10 +---------
 .../index/addon-mod-h5pactivity-index.html           | 10 +---------
 .../components/index/addon-mod-lesson-index.html     | 10 +---------
 .../quiz/components/index/addon-mod-quiz-index.html  | 11 ++---------
 .../components/index/addon-mod-scorm-index.html      | 10 +---------
 .../components/index/addon-mod-survey-index.html     | 12 ++----------
 .../components/index/addon-mod-workshop-index.html   | 10 +---------
 .../module-info/core-course-module-info.html         |  8 ++++++++
 .../components/module-info/course-module-info.scss   |  1 +
 .../course/components/module-info/module-info.ts     |  6 ++++++
 .../features/courses/pages/dashboard/dashboard.ts    |  1 -
 16 files changed, 30 insertions(+), 113 deletions(-)

diff --git a/src/addons/mod/assign/components/index/addon-mod-assign-index.html b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
index 1efbaa292..fd835cefd 100644
--- a/src/addons/mod/assign/components/index/addon-mod-assign-index.html
+++ b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
@@ -31,23 +31,13 @@
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
-        [component]="component" [componentId]="componentId" [courseId]="courseId">
+        [component]="component" [componentId]="componentId" [courseId]="courseId" [hasDataToSync]="hasOffline">
         <ion-list inset="true" description *ngIf="assign && assign.introattachments && assign.introattachments.length">
             <core-file *ngFor="let file of assign.introattachments" [file]="file" [component]="component" [componentId]="componentId">
             </core-file>
         </ion-list>
     </core-course-module-info>
 
-
-
-    <!-- Assign has something offline. -->
-    <ion-card class="core-warning-card" *ngIf="hasOffline">
-        <ion-item>
-            <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
-            <ion-label>{{ 'core.hasdatatosync' | translate: {$a: moduleName} }}</ion-label>
-        </ion-item>
-    </ion-card>
-
     <!-- User can view all submissions (teacher). -->
     <ng-container *ngIf="assign && canViewAllSubmissions">
         <ion-list class="core-list-align-detail-right">
diff --git a/src/addons/mod/choice/components/index/addon-mod-choice-index.html b/src/addons/mod/choice/components/index/addon-mod-choice-index.html
index f0e2aa0f5..a767fe487 100644
--- a/src/addons/mod/choice/components/index/addon-mod-choice-index.html
+++ b/src/addons/mod/choice/components/index/addon-mod-choice-index.html
@@ -30,7 +30,7 @@
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
-        [component]="component" [componentId]="componentId" [courseId]="courseId">
+        [component]="component" [componentId]="componentId" [courseId]="courseId" [hasDataToSync]="hasOffline">
     </core-course-module-info>
 
     <!-- Activity availability messages -->
@@ -58,14 +58,6 @@
         </ion-item>
     </ion-card>
 
-    <!-- Choice done in offline but not synchronized -->
-    <ion-card class="core-warning-card" *ngIf="hasOffline">
-        <ion-item>
-            <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
-            <ion-label>{{ 'core.hasdatatosync' | translate:{$a: moduleName} }}</ion-label>
-        </ion-item>
-    </ion-card>
-
     <!-- Inform what will happen with the choices. -->
     <ion-card class="core-info-card" *ngIf="canEdit && publishInfo && options.length">
         <ion-item>
diff --git a/src/addons/mod/data/components/index/addon-mod-data-index.html b/src/addons/mod/data/components/index/addon-mod-data-index.html
index f8a993361..8a1f45d10 100644
--- a/src/addons/mod/data/components/index/addon-mod-data-index.html
+++ b/src/addons/mod/data/components/index/addon-mod-data-index.html
@@ -40,17 +40,9 @@
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
-        [component]="component" [componentId]="componentId" [courseId]="courseId">
+        [component]="component" [componentId]="componentId" [courseId]="courseId" [hasDataToSync]="hasOffline || hasOfflineRatings">
     </core-course-module-info>
 
-    <!-- Data done in offline but not synchronized -->
-    <ion-card class="core-warning-card" *ngIf="hasOffline || hasOfflineRatings">
-        <ion-item>
-            <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
-            <ion-label>{{ 'core.hasdatatosync' | translate: {$a: moduleName} }}</ion-label>
-        </ion-item>
-    </ion-card>
-
     <ion-item class="ion-text-wrap" *ngIf="groupInfo && (groupInfo.separateGroups || groupInfo.visibleGroups)">
         <ion-label id="addon-data-groupslabel">
             <ng-container *ngIf="groupInfo.separateGroups">{{'core.groupsseparate' | translate }}</ng-container>
diff --git a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
index b6852c689..aacd8344e 100644
--- a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
+++ b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
@@ -30,7 +30,7 @@
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
-        [component]="component" [componentId]="componentId" [courseId]="courseId">
+        [component]="component" [componentId]="componentId" [courseId]="courseId" [hasDataToSync]="hasOffline">
     </core-course-module-info>
 
     <core-tabs [hideUntil]="tabsReady" [selectedIndex]="firstSelectedTab">
@@ -106,14 +106,6 @@
     <core-loading [hideUntil]="tabsLoaded.overview">
         <ng-container *ngTemplateOutlet="basicInfo"></ng-container>
 
-        <!-- Feedback done in offline but not synchronized -->
-        <ion-card class="core-warning-card" *ngIf="hasOffline">
-            <ion-item>
-                <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
-                <ion-label>{{ 'core.hasdatatosync' | translate:{$a: moduleName} }}</ion-label>
-            </ion-item>
-        </ion-card>
-
         <ion-card class="core-info-card" *ngIf="access && access.cancomplete && !access.isopen">
             <ion-item>
                 <ion-icon name="fas-question-circle" slot="start" aria-hidden="true"></ion-icon>
diff --git a/src/addons/mod/forum/components/index/index.html b/src/addons/mod/forum/components/index/index.html
index 642a96d2f..e61fce1ef 100644
--- a/src/addons/mod/forum/components/index/index.html
+++ b/src/addons/mod/forum/components/index/index.html
@@ -39,8 +39,8 @@
     <core-loading [hideUntil]="discussions.loaded">
         <!-- Activity info. -->
         <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()"
-            [description]="forum && forum.type != 'single' && description" [component]="component"
-            [componentId]="componentId" [courseId]="courseId">
+            [description]="forum && forum.type != 'single' && description" [component]="component" [componentId]="componentId"
+            [courseId]="courseId" [hasDataToSync]="hasOffline || hasOfflineRatings">
             <ion-item>
                 <ion-label>
                     {{descriptionNote}}
@@ -48,14 +48,6 @@
             </ion-item>
         </core-course-module-info>
 
-        <!-- Forum discussions found to be synchronized -->
-        <ion-card class="core-warning-card" *ngIf="hasOffline || hasOfflineRatings">
-            <ion-item>
-                <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
-                <ion-label>{{ 'core.hasdatatosync' | translate:{$a: moduleName} }}</ion-label>
-            </ion-item>
-        </ion-card>
-
         <!-- Cut-off date or due date message -->
         <ion-card class="core-info-card" *ngIf="availabilityMessage">
             <ion-item>
diff --git a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
index 61cee7db8..b0095c394 100644
--- a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
+++ b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
@@ -51,17 +51,9 @@
     <core-loading [hideUntil]="loaded">
         <!-- Activity info. -->
         <core-course-module-info *ngIf="!isSearch" [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
-            [component]="component" [componentId]="componentId" [courseId]="courseId">
+            [component]="component" [componentId]="componentId" [courseId]="courseId" [hasDataToSync]="hasOffline || hasOfflineRatings">
         </core-course-module-info>
 
-        <!-- Has offline data to be synchronized -->
-        <ion-card class="core-warning-card" *ngIf="hasOffline || hasOfflineRatings">
-            <ion-item>
-                <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
-                <ion-label>{{ 'core.hasdatatosync' | translate:{$a: moduleName} }}</ion-label>
-            </ion-item>
-        </ion-card>
-
         <ion-list *ngIf="!isSearch && entries.offlineEntries.length > 0">
             <ion-item-divider>
                 <ion-label>
diff --git a/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html b/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
index 1811b5b44..4c7b7cd88 100644
--- a/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
+++ b/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
@@ -37,17 +37,9 @@
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
-        [component]="component" [componentId]="componentId" [courseId]="courseId">
+        [component]="component" [componentId]="componentId" [courseId]="courseId" [hasDataToSync]="hasOffline">
     </core-course-module-info>
 
-    <!-- Offline data stored. -->
-    <ion-card class="core-warning-card" *ngIf="hasOffline">
-        <ion-item>
-            <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
-            <ion-label>{{ 'core.hasdatatosync' | translate: {$a: moduleName} }}</ion-label>
-        </ion-item>
-    </ion-card>
-
     <!-- Offline disabled. -->
     <ion-card class="core-warning-card" *ngIf="!siteCanDownload && playing">
         <ion-item>
diff --git a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
index aa28071e4..a9eeb2a60 100644
--- a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
+++ b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
@@ -34,7 +34,7 @@
 
                 <!-- Activity info. -->
                 <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
-                    [component]="component" [componentId]="componentId" [courseId]="courseId">
+                    [component]="component" [componentId]="componentId" [courseId]="courseId" [hasDataToSync]="hasOffline">
                 </core-course-module-info>
 
                 <!-- Prevent access messages. Only show the first one. -->
@@ -45,14 +45,6 @@
                     </ion-item>
                 </ion-card>
 
-                <!-- Lesson has data to be synchronized -->
-                <ion-card class="core-warning-card" *ngIf="hasOffline">
-                    <ion-item>
-                        <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
-                        <ion-label>{{ 'core.hasdatatosync' | translate: {$a: moduleName} }}</ion-label>
-                    </ion-item>
-                </ion-card>
-
                 <!-- Input password for protected lessons. -->
                 <ion-card *ngIf="askPassword">
                     <form (ngSubmit)="submitPassword($event, passwordinput)" #passwordForm>
diff --git a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
index 519746fe0..cf49f5b7b 100644
--- a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
+++ b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
@@ -30,7 +30,8 @@
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
-        [component]="component" [componentId]="componentId" [courseId]="courseId">
+        [component]="component" [componentId]="componentId" [courseId]="courseId"
+        [hasDataToSync]="buttonText && hasOffline && !showStatusSpinner">
     </core-course-module-info>
 
     <!-- Access rules description messages. -->
@@ -194,14 +195,6 @@
                 </ion-label>
             </ion-item>
 
-            <!-- Quiz has data to be synchronized -->
-            <ion-card class="core-warning-card" *ngIf="buttonText && hasOffline && !showStatusSpinner">
-                <ion-item class="ion-text-wrap">
-                    <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
-                    <ion-label>{{ 'core.hasdatatosync' | translate: {$a: moduleName} }}</ion-label>
-                </ion-item>
-            </ion-card>
-
             <!-- Other warnings. -->
             <ion-item class="core-warning-item ion-text-wrap" *ngIf="hasSupportedQuestions && unsupportedQuestions.length">
                 <ion-label>
diff --git a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
index 58f417175..f184db40a 100644
--- a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
+++ b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
@@ -30,7 +30,7 @@
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
-        [component]="component" [componentId]="componentId" [courseId]="courseId">
+        [component]="component" [componentId]="componentId" [courseId]="courseId" [hasDataToSync]="!errorMessage && hasOffline">
     </core-course-module-info>
 
     <!-- Warning message. -->
@@ -113,14 +113,6 @@
             </ion-list>
         </ion-card>
 
-        <!-- Synchronization warning. -->
-        <ion-card class="core-warning-card" *ngIf="!errorMessage && hasOffline">
-            <ion-item>
-                <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
-                <ion-label>{{ 'core.hasdatatosync' | translate: {$a: moduleName} }}</ion-label>
-            </ion-item>
-        </ion-card>
-
         <!-- TOC. -->
         <ion-card *ngIf="scorm && organizations && !skip &&
             ((scorm.displaycoursestructure && organizations.length) || organizations.length > 1)" class="addon-mod_scorm-toc">
diff --git a/src/addons/mod/survey/components/index/addon-mod-survey-index.html b/src/addons/mod/survey/components/index/addon-mod-survey-index.html
index 16ebaa871..b5042fbf5 100644
--- a/src/addons/mod/survey/components/index/addon-mod-survey-index.html
+++ b/src/addons/mod/survey/components/index/addon-mod-survey-index.html
@@ -31,8 +31,8 @@
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()"
-        [description]="survey && !survey.surveydone && !hasOffline && description" [component]="component"
-        [componentId]="componentId" [courseId]="courseId">
+        [description]="survey && !survey.surveydone && !hasOffline && description" [component]="component" [componentId]="componentId"
+        [courseId]="courseId" [hasDataToSync]="hasOffline">
     </core-course-module-info>
 
     <!-- Survey already done -->
@@ -44,14 +44,6 @@
         </ion-button>
     </ion-card>
 
-    <!-- Survey done in offline but not synchronized -->
-    <ion-card class="core-warning-card" *ngIf="hasOffline">
-        <ion-item>
-            <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
-            <ion-label>{{ 'core.hasdatatosync' | translate: {$a: moduleName} }}</ion-label>
-        </ion-item>
-    </ion-card>
-
     <!-- Survey questions -->
     <form *ngIf="survey && !survey.surveydone && !hasOffline && questions && questions.length">
 
diff --git a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
index 4004119c0..1aedc639d 100644
--- a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
+++ b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
@@ -30,7 +30,7 @@
 <core-loading [hideUntil]="loaded">
 
     <!-- Activity info. -->
-    <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()">
+    <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [hasDataToSync]="hasOffline">
     </core-course-module-info>
 
     <ion-card *ngIf="phases">
@@ -60,14 +60,6 @@
         </ng-container>
     </ion-card>
 
-    <!-- Has something offline. -->
-    <ion-card class="core-warning-card" *ngIf="hasOffline">
-        <ion-item>
-            <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
-            <ion-label>{{ 'core.hasdatatosync' | translate: {$a: moduleName} }}</ion-label>
-        </ion-item>
-    </ion-card>
-
     <!-- Description (setup phase only) -->
     <ion-card *ngIf="description && workshop && workshop!.phase == PHASE_SETUP">
         <ion-item class="ion-text-wrap">
diff --git a/src/core/features/course/components/module-info/core-course-module-info.html b/src/core/features/course/components/module-info/core-course-module-info.html
index 8aac777b4..a169e3604 100644
--- a/src/core/features/course/components/module-info/core-course-module-info.html
+++ b/src/core/features/course/components/module-info/core-course-module-info.html
@@ -35,3 +35,11 @@
     </ion-label>
 </ion-item>
 <ng-content></ng-content>
+
+<!-- Activity has something offline. -->
+<ion-card class="core-warning-card" *ngIf="hasDataToSync">
+    <ion-item>
+        <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
+        <ion-label>{{ 'core.hasdatatosync' | translate: {$a: moduleNameTranslated} }}</ion-label>
+    </ion-item>
+</ion-card>
diff --git a/src/core/features/course/components/module-info/course-module-info.scss b/src/core/features/course/components/module-info/course-module-info.scss
index a4d1bf7e1..0a0b5bce7 100644
--- a/src/core/features/course/components/module-info/course-module-info.scss
+++ b/src/core/features/course/components/module-info/course-module-info.scss
@@ -4,6 +4,7 @@
     display: block;
     box-shadow: 0px 3px 3px rgba(var(--drop-shadow));
     margin-bottom: 8px;
+    padding-bottom: 1px; // To allow margins inside.
     background-color: var(--contrast-background);
     
     @include padding-horizontal(var(--ion-safe-area-left), var(--ion-safe-area-right));
diff --git a/src/core/features/course/components/module-info/module-info.ts b/src/core/features/course/components/module-info/module-info.ts
index 13cbd4e40..063ebc88f 100644
--- a/src/core/features/course/components/module-info/module-info.ts
+++ b/src/core/features/course/components/module-info/module-info.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { CoreCourse } from '@features/course/services/course';
 import { CoreCourseModule, CoreCourseModuleCompletionData } from '@features/course/services/course-helper';
 import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate';
 import { CoreSites } from '@services/sites';
@@ -42,10 +43,13 @@ export class CoreCourseModuleInfoComponent implements OnInit {
 
     @Input() description?: string | false; // The description to display. If false, no description will be shown.
 
+    @Input() hasDataToSync = false; // If the activity has any data to be synced.
+
     @Output() completionChanged = new EventEmitter<CoreCourseModuleCompletionData>(); // Notify when completion changes.
 
     modicon = '';
     showCompletion = false; // Whether to show completion.
+    moduleNameTranslated = '';
 
     /**
      * @inheritdoc
@@ -53,6 +57,8 @@ export class CoreCourseModuleInfoComponent implements OnInit {
     async ngOnInit(): Promise<void> {
         this.modicon = await CoreCourseModuleDelegate.getModuleIconSrc(this.module.modname, this.module.modicon, this.module);
 
+        this.moduleNameTranslated = CoreCourse.translateModuleName(this.module.modname || '');
+
         this.showCompletion = CoreSites.getRequiredCurrentSite().isVersionGreaterEqualThan('3.11');
     }
 
diff --git a/src/core/features/courses/pages/dashboard/dashboard.ts b/src/core/features/courses/pages/dashboard/dashboard.ts
index 2b7448a0b..e86d2d72a 100644
--- a/src/core/features/courses/pages/dashboard/dashboard.ts
+++ b/src/core/features/courses/pages/dashboard/dashboard.ts
@@ -109,7 +109,6 @@ export class CoreCoursesDashboardPage implements OnInit, OnDestroy {
             this.blocks = [];
         }
 
-        // this.dashboardEnabled = this.blockDelegate.hasSupportedBlock(this.blocks);
         this.loaded = true;
     }
 

From 57b5266198d315263b7e9af0a085e0c0cb63c84d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 17 Nov 2021 11:46:37 +0100
Subject: [PATCH 0237/1008] MOBILE-3810 tabs: Disabled top tabs hide on scroll

---
 src/core/classes/tabs.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/core/classes/tabs.ts b/src/core/classes/tabs.ts
index d77ca5b4d..d2b593398 100644
--- a/src/core/classes/tabs.ts
+++ b/src/core/classes/tabs.ts
@@ -43,8 +43,9 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
 
     // Minimum tab's width.
     protected static readonly MIN_TAB_WIDTH = 107;
-    // Max height that allows tab hiding.
-    protected static readonly MAX_HEIGHT_TO_HIDE_TABS = 768;
+    // @todo [4.0]
+    // Max height that allows tab hiding. WARNING: Hide tabs on scroll disabled. If confirmed, remove the associated code.
+    protected static readonly MAX_HEIGHT_TO_HIDE_TABS = 0;
 
     @Input() selectedIndex = 0; // Index of the tab to select.
     @Input() hideUntil = false; // Determine when should the contents be shown.
@@ -179,7 +180,7 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
     }
 
     /**
-     * Detect changes on input properties.
+     * @inheritdoc
      */
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     ngOnChanges(changes: Record<string, SimpleChange>): void {

From d8718c5eaae68dc3f48b83d10ce995746c45b1af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 19 Nov 2021 13:20:00 +0100
Subject: [PATCH 0238/1008] MOBILE-3810 core: Collapsible headers

---
 src/addons/mod/assign/pages/index/index.html  |   2 +-
 src/addons/mod/book/pages/index/index.html    |   5 +-
 src/addons/mod/chat/pages/index/index.html    |   2 +-
 src/addons/mod/choice/pages/index/index.html  |   2 +-
 src/addons/mod/data/pages/index/index.html    |   2 +-
 .../mod/feedback/pages/index/index.html       |   2 +-
 .../index/addon-mod-folder-index.html         |   3 +-
 src/addons/mod/folder/pages/index/index.html  |   2 +-
 src/addons/mod/forum/pages/index/index.html   |   2 +-
 .../mod/glossary/pages/index/index.html       |   2 +-
 .../mod/h5pactivity/pages/index/index.html    |   2 +-
 src/addons/mod/imscp/pages/index/index.html   |   2 +-
 src/addons/mod/lesson/pages/index/index.html  |   5 +-
 src/addons/mod/lti/pages/index/index.html     |   2 +-
 src/addons/mod/page/pages/index/index.html    |   2 +-
 src/addons/mod/quiz/pages/index/index.html    |   2 +-
 .../mod/resource/pages/index/index.html       |   5 +-
 src/addons/mod/scorm/pages/index/index.html   |   2 +-
 src/addons/mod/survey/pages/index/index.html  |   2 +-
 src/addons/mod/url/pages/index/index.html     |   2 +-
 src/addons/mod/wiki/components/index/index.ts |  19 +-
 src/addons/mod/wiki/pages/index/index.html    |   6 +-
 src/addons/mod/wiki/pages/index/index.ts      |   7 +-
 .../mod/workshop/pages/index/index.html       |   2 +-
 src/core/classes/tabs.ts                      |   6 +-
 .../components/split-view/split-view.scss     |   3 +-
 src/core/directives/collapsible-header.ts     | 257 ++++++++++++++++++
 src/core/directives/directives.module.ts      |   3 +
 .../module-info/core-course-module-info.html  |   6 +-
 .../core-course-unsupported-module.html       |   6 +-
 .../unsupported-module.html                   |   2 +-
 src/theme/globals.mixins.scss                 |  12 +-
 src/theme/theme.base.scss                     | 138 +++++++---
 33 files changed, 424 insertions(+), 93 deletions(-)
 create mode 100644 src/core/directives/collapsible-header.ts

diff --git a/src/addons/mod/assign/pages/index/index.html b/src/addons/mod/assign/pages/index/index.html
index 8e1a710bc..c64cbdfdd 100644
--- a/src/addons/mod/assign/pages/index/index.html
+++ b/src/addons/mod/assign/pages/index/index.html
@@ -1,4 +1,4 @@
-<ion-header>
+<ion-header collapsible>
     <ion-toolbar>
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
diff --git a/src/addons/mod/book/pages/index/index.html b/src/addons/mod/book/pages/index/index.html
index 495b0b976..2d7faf457 100644
--- a/src/addons/mod/book/pages/index/index.html
+++ b/src/addons/mod/book/pages/index/index.html
@@ -1,4 +1,4 @@
-<ion-header>
+<ion-header collapsible>
     <ion-toolbar>
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
@@ -17,7 +17,6 @@
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
-    <addon-mod-book-index [module]="module" [courseId]="courseId" [initialChapterId]="chapterId"
-        (dataRetrieved)="updateData($event)">
+    <addon-mod-book-index [module]="module" [courseId]="courseId" [initialChapterId]="chapterId" (dataRetrieved)="updateData($event)">
     </addon-mod-book-index>
 </ion-content>
diff --git a/src/addons/mod/chat/pages/index/index.html b/src/addons/mod/chat/pages/index/index.html
index b228480b8..de71fbf74 100644
--- a/src/addons/mod/chat/pages/index/index.html
+++ b/src/addons/mod/chat/pages/index/index.html
@@ -1,4 +1,4 @@
-<ion-header>
+<ion-header collapsible>
     <ion-toolbar>
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
diff --git a/src/addons/mod/choice/pages/index/index.html b/src/addons/mod/choice/pages/index/index.html
index 9497c99fb..6f8b727cd 100644
--- a/src/addons/mod/choice/pages/index/index.html
+++ b/src/addons/mod/choice/pages/index/index.html
@@ -1,4 +1,4 @@
-<ion-header>
+<ion-header collapsible>
     <ion-toolbar>
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
diff --git a/src/addons/mod/data/pages/index/index.html b/src/addons/mod/data/pages/index/index.html
index 669549eb4..5d0caa151 100644
--- a/src/addons/mod/data/pages/index/index.html
+++ b/src/addons/mod/data/pages/index/index.html
@@ -1,4 +1,4 @@
-<ion-header>
+<ion-header collapsible>
     <ion-toolbar>
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
diff --git a/src/addons/mod/feedback/pages/index/index.html b/src/addons/mod/feedback/pages/index/index.html
index f7c6c173a..8eb3987ad 100644
--- a/src/addons/mod/feedback/pages/index/index.html
+++ b/src/addons/mod/feedback/pages/index/index.html
@@ -1,4 +1,4 @@
-<ion-header>
+<ion-header collapsible>
     <ion-toolbar>
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
diff --git a/src/addons/mod/folder/components/index/addon-mod-folder-index.html b/src/addons/mod/folder/components/index/addon-mod-folder-index.html
index e44e8a1b7..cb1093a10 100644
--- a/src/addons/mod/folder/components/index/addon-mod-folder-index.html
+++ b/src/addons/mod/folder/components/index/addon-mod-folder-index.html
@@ -26,9 +26,8 @@
 <core-loading [hideUntil]="loaded">
 
     <!-- Activity info. -->
-    <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
+    <core-course-module-info *ngIf="!subfolder" [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
         [component]="component" [componentId]="componentId" [courseId]="courseId">
-        <h3 *ngIf="subfolder" title>{{subfolder.filename}}</h3>
     </core-course-module-info>
 
     <ion-list *ngIf="contents && (contents.files.length + contents.folders.length > 0)">
diff --git a/src/addons/mod/folder/pages/index/index.html b/src/addons/mod/folder/pages/index/index.html
index 198e37e5f..a3d8d8626 100644
--- a/src/addons/mod/folder/pages/index/index.html
+++ b/src/addons/mod/folder/pages/index/index.html
@@ -1,4 +1,4 @@
-<ion-header>
+<ion-header collapsible>
     <ion-toolbar>
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
diff --git a/src/addons/mod/forum/pages/index/index.html b/src/addons/mod/forum/pages/index/index.html
index c98bfc3a1..c72371b3f 100644
--- a/src/addons/mod/forum/pages/index/index.html
+++ b/src/addons/mod/forum/pages/index/index.html
@@ -1,4 +1,4 @@
-<ion-header>
+<ion-header collapsible>
     <ion-toolbar>
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
diff --git a/src/addons/mod/glossary/pages/index/index.html b/src/addons/mod/glossary/pages/index/index.html
index 2183e2bf6..c1b066a21 100644
--- a/src/addons/mod/glossary/pages/index/index.html
+++ b/src/addons/mod/glossary/pages/index/index.html
@@ -1,4 +1,4 @@
-<ion-header>
+<ion-header collapsible>
     <ion-toolbar>
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
diff --git a/src/addons/mod/h5pactivity/pages/index/index.html b/src/addons/mod/h5pactivity/pages/index/index.html
index 2f3d19f98..1001692cf 100644
--- a/src/addons/mod/h5pactivity/pages/index/index.html
+++ b/src/addons/mod/h5pactivity/pages/index/index.html
@@ -1,4 +1,4 @@
-<ion-header>
+<ion-header collapsible>
     <ion-toolbar>
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
diff --git a/src/addons/mod/imscp/pages/index/index.html b/src/addons/mod/imscp/pages/index/index.html
index fd8b7e083..98a8c22b2 100644
--- a/src/addons/mod/imscp/pages/index/index.html
+++ b/src/addons/mod/imscp/pages/index/index.html
@@ -1,4 +1,4 @@
-<ion-header>
+<ion-header collapsible>
     <ion-toolbar>
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
diff --git a/src/addons/mod/lesson/pages/index/index.html b/src/addons/mod/lesson/pages/index/index.html
index 4c5603526..ba95ea502 100644
--- a/src/addons/mod/lesson/pages/index/index.html
+++ b/src/addons/mod/lesson/pages/index/index.html
@@ -1,4 +1,4 @@
-<ion-header>
+<ion-header collapsible>
     <ion-toolbar>
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
@@ -17,7 +17,6 @@
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
-    <addon-mod-lesson-index [module]="module" [courseId]="courseId" [group]="group" [action]="action"
-        (dataRetrieved)="updateData($event)">
+    <addon-mod-lesson-index [module]="module" [courseId]="courseId" [group]="group" [action]="action" (dataRetrieved)="updateData($event)">
     </addon-mod-lesson-index>
 </ion-content>
diff --git a/src/addons/mod/lti/pages/index/index.html b/src/addons/mod/lti/pages/index/index.html
index bd9a3da32..f742d5232 100644
--- a/src/addons/mod/lti/pages/index/index.html
+++ b/src/addons/mod/lti/pages/index/index.html
@@ -1,4 +1,4 @@
-<ion-header>
+<ion-header collapsible>
     <ion-toolbar>
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
diff --git a/src/addons/mod/page/pages/index/index.html b/src/addons/mod/page/pages/index/index.html
index 464a81a0b..a5db017ea 100644
--- a/src/addons/mod/page/pages/index/index.html
+++ b/src/addons/mod/page/pages/index/index.html
@@ -1,4 +1,4 @@
-<ion-header>
+<ion-header collapsible>
     <ion-toolbar>
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
diff --git a/src/addons/mod/quiz/pages/index/index.html b/src/addons/mod/quiz/pages/index/index.html
index 9fcb5b5c2..2cbf6b449 100644
--- a/src/addons/mod/quiz/pages/index/index.html
+++ b/src/addons/mod/quiz/pages/index/index.html
@@ -1,4 +1,4 @@
-<ion-header>
+<ion-header collapsible>
     <ion-toolbar>
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
diff --git a/src/addons/mod/resource/pages/index/index.html b/src/addons/mod/resource/pages/index/index.html
index 0a03b540b..d86648348 100644
--- a/src/addons/mod/resource/pages/index/index.html
+++ b/src/addons/mod/resource/pages/index/index.html
@@ -1,4 +1,4 @@
-<ion-header>
+<ion-header collapsible>
     <ion-toolbar>
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
@@ -14,8 +14,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-refresher slot="fixed"
-        [disabled]="!activityComponent?.loaded || activityComponent?.mode == 'iframe'"
+    <ion-refresher slot="fixed" [disabled]="!activityComponent?.loaded || activityComponent?.mode == 'iframe'"
         (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
diff --git a/src/addons/mod/scorm/pages/index/index.html b/src/addons/mod/scorm/pages/index/index.html
index 8b0a62177..2e3a4ded7 100644
--- a/src/addons/mod/scorm/pages/index/index.html
+++ b/src/addons/mod/scorm/pages/index/index.html
@@ -1,4 +1,4 @@
-<ion-header>
+<ion-header collapsible>
     <ion-toolbar>
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
diff --git a/src/addons/mod/survey/pages/index/index.html b/src/addons/mod/survey/pages/index/index.html
index e4c9e1717..8d0ffd272 100644
--- a/src/addons/mod/survey/pages/index/index.html
+++ b/src/addons/mod/survey/pages/index/index.html
@@ -1,4 +1,4 @@
-<ion-header>
+<ion-header collapsible>
     <ion-toolbar>
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
diff --git a/src/addons/mod/url/pages/index/index.html b/src/addons/mod/url/pages/index/index.html
index 6b546f69f..b93cbc153 100644
--- a/src/addons/mod/url/pages/index/index.html
+++ b/src/addons/mod/url/pages/index/index.html
@@ -1,4 +1,4 @@
-<ion-header>
+<ion-header collapsible>
     <ion-toolbar>
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
diff --git a/src/addons/mod/wiki/components/index/index.ts b/src/addons/mod/wiki/components/index/index.ts
index 8bbd2a3a8..1ae8303a8 100644
--- a/src/addons/mod/wiki/components/index/index.ts
+++ b/src/addons/mod/wiki/components/index/index.ts
@@ -135,6 +135,8 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
         }
 
         if (!this.wiki) {
+            CoreNavigator.back();
+
             return;
         }
 
@@ -143,7 +145,7 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
                 await AddonModWiki.logView(this.wiki.id, this.wiki.name);
 
                 CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
-            } catch (error) {
+            } catch {
                 // Ignore errors.
             }
         } else {
@@ -210,7 +212,7 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * @inheritdoc
      */
-    protected async fetchContent(refresh: boolean = false, sync: boolean = false, showErrors: boolean = false): Promise<void> {
+    protected async fetchContent(refresh = false, sync = false, showErrors = false): Promise<void> {
         try {
             // Get the wiki instance.
             this.wiki = await AddonModWiki.getWiki(this.courseId, this.module.id);
@@ -219,6 +221,7 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
                 // Page not loaded yet, emit the data to update the page title.
                 this.dataRetrieved.emit(this.wiki);
             }
+
             AddonModWiki.wikiPageOpened(this.wiki.id, this.currentPath);
 
             if (sync) {
@@ -299,14 +302,14 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
 
         // No page ID but we received a title. This means we're trying to load an offline page.
         try {
-            const title = this.pageTitle || this.wiki!.firstpagetitle!;
+            const title = this.pageTitle || this.wiki?.firstpagetitle || '';
 
             const offlinePage = await AddonModWikiOffline.getNewPage(
                 title,
-                this.currentSubwiki!.id,
-                this.currentSubwiki!.wikiid,
-                this.currentSubwiki!.userid,
-                this.currentSubwiki!.groupid,
+                this.currentSubwiki?.id,
+                this.currentSubwiki?.wikiid,
+                this.currentSubwiki?.userid,
+                this.currentSubwiki?.groupid,
             );
 
             this.pageIsOffline = true;
@@ -321,7 +324,7 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
                     this.currentPage = data.pageId;
 
                     // Stop listening for new page events.
-                    this.newPageObserver!.off();
+                    this.newPageObserver?.off();
                     this.newPageObserver = undefined;
 
                     await this.showLoadingAndFetch(true, false);
diff --git a/src/addons/mod/wiki/pages/index/index.html b/src/addons/mod/wiki/pages/index/index.html
index fab061635..e8db7c3b0 100644
--- a/src/addons/mod/wiki/pages/index/index.html
+++ b/src/addons/mod/wiki/pages/index/index.html
@@ -1,4 +1,4 @@
-<ion-header>
+<ion-header collapsible>
     <ion-toolbar>
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
@@ -7,6 +7,10 @@
             <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
             </core-format-text>
         </h1>
+        <p>
+            <core-format-text [text]="pageTitle" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
+            </core-format-text>
+        </p>
 
         <ion-buttons slot="end">
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addons/mod/wiki/pages/index/index.ts b/src/addons/mod/wiki/pages/index/index.ts
index e98a10c9f..0d374feaa 100644
--- a/src/addons/mod/wiki/pages/index/index.ts
+++ b/src/addons/mod/wiki/pages/index/index.ts
@@ -47,8 +47,6 @@ export class AddonModWikiIndexPage extends CoreCourseModuleMainActivityPage<Addo
         this.subwikiId = CoreNavigator.getRouteNumberParam('subwikiId');
         this.userId = CoreNavigator.getRouteNumberParam('userId');
         this.groupId = CoreNavigator.getRouteNumberParam('groupId');
-
-        this.title = this.pageTitle || this.module.name;
     }
 
     /**
@@ -57,10 +55,9 @@ export class AddonModWikiIndexPage extends CoreCourseModuleMainActivityPage<Addo
     updateData(data: { name: string } | string): void {
         if (typeof data == 'string') {
             // We received the title to display.
-            this.title = data;
+            this.pageTitle = data;
         } else {
-            // We received a wiki instance.
-            this.title = this.pageTitle || data.name || this.title;
+            super.updateData(data);
         }
     }
 
diff --git a/src/addons/mod/workshop/pages/index/index.html b/src/addons/mod/workshop/pages/index/index.html
index 409e997b4..e408424a4 100644
--- a/src/addons/mod/workshop/pages/index/index.html
+++ b/src/addons/mod/workshop/pages/index/index.html
@@ -1,4 +1,4 @@
-<ion-header>
+<ion-header collapsible>
     <ion-toolbar>
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
diff --git a/src/core/classes/tabs.ts b/src/core/classes/tabs.ts
index d2b593398..b03b8f827 100644
--- a/src/core/classes/tabs.ts
+++ b/src/core/classes/tabs.ts
@@ -26,7 +26,7 @@ import {
     SimpleChange,
 } from '@angular/core';
 import { IonSlides } from '@ionic/angular';
-import { BackButtonEvent } from '@ionic/core';
+import { BackButtonEvent, ScrollDetail } from '@ionic/core';
 import { Subscription } from 'rxjs';
 
 import { Platform, Translate } from '@singletons';
@@ -625,8 +625,8 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
 
         content.scrollEvents = true;
         this.scrollElements[id] = scroll;
-        content.addEventListener('ionScroll', (e: CustomEvent): void => {
-            this.showHideTabs(parseInt(e.detail.scrollTop, 10), scroll);
+        content.addEventListener('ionScroll', (e: CustomEvent<ScrollDetail>): void => {
+            this.showHideTabs(e.detail.scrollTop, scroll);
         });
     }
 
diff --git a/src/core/components/split-view/split-view.scss b/src/core/components/split-view/split-view.scss
index 1524a38c6..deb84173f 100644
--- a/src/core/components/split-view/split-view.scss
+++ b/src/core/components/split-view/split-view.scss
@@ -15,14 +15,13 @@
     left: 0;
     display: flex;
     position: absolute;
-    inset: 0;
     flex-direction: row;
     flex-wrap: nowrap;
     contain: strict;
 
     .menu,
     .content-outlet {
-        top: 0;
+        top: var(--offset-top);
         right: 0;
         bottom: 0;
         left: 0;
diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts
new file mode 100644
index 000000000..11191f7c6
--- /dev/null
+++ b/src/core/directives/collapsible-header.ts
@@ -0,0 +1,257 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { Directive, ElementRef, OnDestroy } from '@angular/core';
+import { ScrollDetail } from '@ionic/core';
+import { CoreUtils } from '@services/utils/utils';
+import { Platform } from '@singletons';
+import { CoreEventObserver, CoreEvents } from '@singletons/events';
+import { CoreMath } from '@singletons/math';
+
+/**
+ * Directive to make ion-header collapsible.
+ * Ion content should have h1 tag inside.
+ *
+ * Example usage:
+ *
+ * <ion-header collapsible>
+ */
+@Directive({
+    selector: 'ion-header[collapsible]',
+})
+export class CoreCollapsibleHeaderDirective implements OnDestroy {
+
+    protected scrollElement?: HTMLElement;
+    protected loadingObserver: CoreEventObserver;
+    protected content?: HTMLIonContentElement | null;
+    protected header: HTMLIonHeaderElement;
+    protected titleTopDifference = 1;
+    protected h1StartDifference = 0;
+    protected headerH1FontSize = 0;
+    protected contentH1FontSize = 0;
+    protected headerSubHeadingFontSize = 0;
+    protected contentSubHeadingFontSize = 0;
+    protected subHeadingStartDifference = 0;
+
+    constructor(el: ElementRef) {
+        this.header = el.nativeElement;
+
+        this.loadingObserver = CoreEvents.on(CoreEvents.CORE_LOADING_CHANGED, async (data) => {
+            const loadingId = await this.getLoadingId();
+            if (loadingId && data.loaded && data.uniqueId == loadingId) {
+                // Remove event when loading is done.
+                this.loadingObserver.off();
+
+                // Wait to render.
+                await CoreUtils.nextTick();
+                this.setupRealTitle();
+            }
+        });
+    }
+
+    /**
+     * Gets the loading content id to wait for the loading to finish.
+     *
+     * @TODO: If no core-loading is present, load directly. Take into account content needs to be initialized.
+     *
+     * @return Promise resolved with Loading Id, if any.
+     */
+    protected async getLoadingId(): Promise<string | undefined> {
+        if (!this.content) {
+            this.content = this.header.parentElement?.querySelector('ion-content:not(.disable-scroll-y)');
+
+            if (!this.content) {
+                this.cannotCollapse();
+
+                return;
+            }
+        }
+
+        return this.content.querySelector('core-loading .core-loading-content')?.id;
+    }
+
+    /**
+     * Call this function when header is not collapsible.
+     */
+    protected cannotCollapse(): void {
+        this.loadingObserver.off();
+        this.header.classList.add('core-header-collapsed');
+    }
+
+    /**
+     * Gets the real title on ion content to watch scroll.
+     *
+     * @return Promise resolved when done.
+     */
+    protected async setupRealTitle(): Promise<void> {
+
+        if (!this.content) {
+            this.cannotCollapse();
+
+            return;
+        }
+
+        const title = this.content.querySelector<HTMLElement>('.collapsible-title, h1');
+        const contentH1 = this.content.querySelector<HTMLElement>('h1');
+        const headerH1 = this.header.querySelector<HTMLElement>('h1');
+        if (!title || !contentH1 || !headerH1) {
+            this.cannotCollapse();
+
+            return;
+        }
+
+        this.titleTopDifference = contentH1.getBoundingClientRect().top - headerH1.getBoundingClientRect().top;
+
+        // Split view part.
+        const contentAux = this.header.parentElement?.querySelector<HTMLElement>('ion-content.disable-scroll-y');
+        if (contentAux) {
+            if (contentAux.querySelector('core-split-view.menu-and-content')) {
+                this.cannotCollapse();
+                title.remove();
+
+                return;
+            }
+            contentAux.style.setProperty('--offset-top', this.header.clientHeight + 'px');
+        }
+
+        const headerH1Styles = getComputedStyle(headerH1);
+        const contentH1Styles = getComputedStyle(contentH1);
+
+        if (Platform.isRTL) {
+            this.h1StartDifference = contentH1.getBoundingClientRect().right -
+                (headerH1.getBoundingClientRect().right - parseFloat(headerH1Styles.paddingRight));
+        } else {
+            this.h1StartDifference = contentH1.getBoundingClientRect().left -
+                (headerH1.getBoundingClientRect().left + parseFloat(headerH1Styles.paddingLeft));
+        }
+
+        this.headerH1FontSize = parseFloat(headerH1Styles.fontSize);
+        this.contentH1FontSize = parseFloat(contentH1Styles.fontSize);
+
+        // Transfer font styles.
+        Array.from(headerH1Styles).forEach((styleName) => {
+            if (styleName != 'font-size' && (styleName.startsWith('font-') || styleName.startsWith('letter-'))) {
+                contentH1.style.setProperty(styleName, headerH1Styles.getPropertyValue(styleName));
+            }
+        });
+        contentH1.style.setProperty(
+            '--max-width',
+            (parseFloat(headerH1Styles.width)
+                -parseFloat(headerH1Styles.paddingLeft)
+                -parseFloat(headerH1Styles.paddingRight)
+                +'px'),
+        );
+
+        contentH1.setAttribute('aria-hidden', 'true');
+
+        // Add something under the hood to change the page background.
+        let color = getComputedStyle(title).getPropertyValue('backgroundColor').trim();
+        if (color == '') {
+            color = getComputedStyle(title).getPropertyValue('--background').trim();
+        }
+
+        const underHeader = document.createElement('div');
+        underHeader.classList.add('core-underheader');
+        underHeader.style.setProperty('height', this.header.clientHeight + 'px');
+        underHeader.style.setProperty('background', color);
+        this.content.shadowRoot?.querySelector('#background-content')?.prepend(underHeader);
+
+        this.content.style.setProperty('--offset-top', this.header.clientHeight + 'px');
+
+        // Subheading.
+        const headerSubHeading = this.header.querySelector<HTMLElement>('h2,.subheading');
+        const contentSubHeading = title.querySelector<HTMLElement>('h2,.subheading');
+        if (headerSubHeading && contentSubHeading) {
+            const headerSubHeadingStyles = getComputedStyle(headerSubHeading);
+            this.headerSubHeadingFontSize = parseFloat(headerSubHeadingStyles.fontSize);
+
+            const contentSubHeadingStyles = getComputedStyle(contentSubHeading);
+            this.contentSubHeadingFontSize = parseFloat(contentSubHeadingStyles.fontSize);
+
+            if (Platform.isRTL) {
+                this.subHeadingStartDifference = contentSubHeading.getBoundingClientRect().right -
+                    (headerSubHeading.getBoundingClientRect().right - parseFloat(headerSubHeadingStyles.paddingRight));
+            } else {
+                this.subHeadingStartDifference = contentSubHeading.getBoundingClientRect().left -
+                    (headerSubHeading.getBoundingClientRect().left + parseFloat(headerSubHeadingStyles.paddingLeft));
+            }
+
+            contentSubHeading.setAttribute('aria-hidden', 'true');
+        }
+
+        this.content.scrollEvents = true;
+        this.content.addEventListener('ionScroll', (e: CustomEvent<ScrollDetail>): void => {
+            this.onScroll(title, contentH1, contentSubHeading, e.detail);
+        });
+    }
+
+    /**
+     * On scroll function.
+     *
+     * @param title Title on ion content.
+     * @param contentH1 Heading 1 of title, if found.
+     * @param scrollDetail Event details.
+     */
+    protected onScroll(
+        title: HTMLElement,
+        contentH1: HTMLElement,
+        contentSubheading: HTMLElement | null,
+        scrollDetail: ScrollDetail,
+    ): void {
+        const progress = CoreMath.clamp(scrollDetail.scrollTop / this.titleTopDifference, 0, 1);
+        const collapsed = progress >= 1;
+
+        // Check total collapse.
+        this.header.classList.toggle('core-header-collapsed', collapsed);
+        title.classList.toggle('collapsible-title-collapsed', collapsed);
+        title.classList.toggle('collapsible-title-collapse-started', scrollDetail.scrollTop > 0);
+
+        if (collapsed) {
+            contentH1.style.transform = 'translateX(-' + this.h1StartDifference + 'px)';
+            contentH1.style.setProperty('font-size', this.headerH1FontSize + 'px');
+
+            if (contentSubheading) {
+                contentSubheading.style.transform = 'translateX(-' + this.subHeadingStartDifference + 'px)';
+                contentSubheading.style.setProperty('font-size', this.headerSubHeadingFontSize + 'px');
+            }
+
+            return;
+        }
+
+        // Zoom font-size out.
+        const newFontSize = this.contentH1FontSize - ((this.contentH1FontSize - this.headerH1FontSize) * progress);
+        contentH1.style.setProperty('font-size', newFontSize + 'px');
+
+        // Move.
+        const newStart = - this.h1StartDifference * progress;
+        contentH1.style.transform = 'translateX(' + newStart + 'px)';
+
+        if (contentSubheading) {
+            const newFontSize = this.contentSubHeadingFontSize -
+                ((this.contentSubHeadingFontSize - this.headerSubHeadingFontSize) * progress);
+            contentSubheading.style.setProperty('font-size', newFontSize + 'px');
+
+            const newStart = - this.subHeadingStartDifference * progress;
+            contentSubheading.style.transform = 'translateX(' + newStart + 'px)';
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    ngOnDestroy(): void {
+        this.loadingObserver.off();
+    }
+
+}
diff --git a/src/core/directives/directives.module.ts b/src/core/directives/directives.module.ts
index 84a102748..e1d6dc959 100644
--- a/src/core/directives/directives.module.ts
+++ b/src/core/directives/directives.module.ts
@@ -27,6 +27,7 @@ import { CoreUserLinkDirective } from './user-link';
 import { CoreAriaButtonClickDirective } from './aria-button';
 import { CoreOnResizeDirective } from './on-resize';
 import { CoreDownloadFileDirective } from './download-file';
+import { CoreCollapsibleHeaderDirective } from './collapsible-header';
 
 @NgModule({
     declarations: [
@@ -43,6 +44,7 @@ import { CoreDownloadFileDirective } from './download-file';
         CoreAriaButtonClickDirective,
         CoreOnResizeDirective,
         CoreDownloadFileDirective,
+        CoreCollapsibleHeaderDirective,
     ],
     exports: [
         CoreAutoFocusDirective,
@@ -58,6 +60,7 @@ import { CoreDownloadFileDirective } from './download-file';
         CoreAriaButtonClickDirective,
         CoreOnResizeDirective,
         CoreDownloadFileDirective,
+        CoreCollapsibleHeaderDirective,
     ],
 })
 export class CoreDirectivesModule {}
diff --git a/src/core/features/course/components/module-info/core-course-module-info.html b/src/core/features/course/components/module-info/core-course-module-info.html
index a169e3604..7afb15368 100644
--- a/src/core/features/course/components/module-info/core-course-module-info.html
+++ b/src/core/features/course/components/module-info/core-course-module-info.html
@@ -1,12 +1,12 @@
-<ion-item class="ion-text-wrap" lines="none">
+<ion-item class="ion-text-wrap collapsible-title" lines="none">
     <core-mod-icon slot="start" [modicon]="modicon" [modname]="module.modname" [componentId]="module.instance">
     </core-mod-icon>
     <ion-label>
-        <h2>
+        <h1>
             <core-format-text [text]="module.name" contextLevel="module" [component]="component" [componentId]="componentId"
                 [contextInstanceId]="module.id" [courseId]="courseId">
             </core-format-text>
-        </h2>
+        </h1>
         <ng-content select="[title]"></ng-content>
     </ion-label>
 </ion-item>
diff --git a/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html b/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html
index 4e27e6c44..6b7fe1848 100644
--- a/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html
+++ b/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html
@@ -1,7 +1,7 @@
-<div class="ion-padding">
-    <core-course-module-info [description]="module?.description" [courseId]="courseId" [module]="module">
-    </core-course-module-info>
+<core-course-module-info [description]="module?.description" [courseId]="courseId" [module]="module">
+</core-course-module-info>
 
+<div class="ion-padding">
     <h2 *ngIf="!isDisabledInSite && isSupportedByTheApp">{{ 'core.whoops' | translate }}</h2>
     <h2 *ngIf="isDisabledInSite || !isSupportedByTheApp">{{ 'core.uhoh' | translate }}</h2>
 
diff --git a/src/core/features/course/pages/unsupported-module/unsupported-module.html b/src/core/features/course/pages/unsupported-module/unsupported-module.html
index 417963a21..c5e22195d 100644
--- a/src/core/features/course/pages/unsupported-module/unsupported-module.html
+++ b/src/core/features/course/pages/unsupported-module/unsupported-module.html
@@ -1,4 +1,4 @@
-<ion-header>
+<ion-header collapsible>
     <ion-toolbar>
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
diff --git a/src/theme/globals.mixins.scss b/src/theme/globals.mixins.scss
index c871f18b3..84089a4dd 100644
--- a/src/theme/globals.mixins.scss
+++ b/src/theme/globals.mixins.scss
@@ -23,12 +23,12 @@
     // border: var(--a11y-focus-width) solid var(--a11y-focus-color);
 }
 
-@mixin core-transition($where: all, $time: 500ms) {
-    -webkit-transition: $where $time ease-in-out;
-    -moz-transition: $where $time ease-in-out;
-    -ms-transition: $where $time ease-in-out;
-    -o-transition: $where $time ease-in-out;
-    transition: $where $time ease-in-out;
+@mixin core-transition($property: all, $duration: 500ms, $timing-function: ease-in-out) {
+    -webkit-transition: $property $duration $timing-function;
+    -moz-transition: $property $duration $timing-function;
+    -ms-transition: $property $duration $timing-function;
+    -o-transition: $property $duration $timing-function;
+    transition: $property $duration $timing-function;
 }
 
 @mixin push-arrow-color($color: dedede, $flip-rtl: false) {
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 12b4b04a1..4b9278132 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -119,45 +119,50 @@ body {
     }
 }
 
-// Some styles taken from ion-title
-ion-header h1,
-ion-header h2 {
-    display: block;
-    transform: translateZ(0);
-    --color: initial;
-    color: var(--color);
-    margin: 0;
-    width: 100%;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden;
-    pointer-events: auto;
+ion-header ion-title{
+    h1, h2, .subheading {
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+        margin: 0;
+    }
 
     .filter_mathjaxloader_equation div {
         display: inline !important;
     }
 }
 
-ion-app.md ion-header h1,
-ion-app.md ion-header h2 {
+ion-app.md ion-header ion-title{
     @include padding(0, 20px);
-    font-size: 20px;
-    font-weight: 500;
-    letter-spacing: .0125em;
+
+    h1, h2, .subheading {
+        font-size: 20px;
+        font-weight: 500;
+        letter-spacing: .0125em;
+    }
+
+    h1 + h2,
+    h1 + .subheading {
+        font-size: 14px;
+        font-weight: 400;
+    }
 }
 
-ion-app.ios ion-header h1,
-ion-app.ios ion-header h2 {
-    @include position(0, null, null, 0);
-    @include padding(0, 90px, 0);
+ion-app.ios ion-header ion-title {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
 
-    position: absolute;
-    text-align: center;
-    font-size: 17px;
-    font-weight: 600;
-    line-height: var(--core-header-toolbar-height);
-    box-sizing: border-box;
-    pointer-events: none;
+    h1, h2, .subheading {
+        font-size: 17px;
+        font-weight: 600;
+    }
+
+    h1 + h2,
+    h1 + .subheading {
+        font-size: 14px;
+        font-weight: 400;
+    }
 }
 
 
@@ -901,9 +906,13 @@ ion-back-button.md::part(text) {
     display: none;
 }
 
-// Hide close button because when present is read on voice over.
-ion-fab[core-fab] ion-fab-button::part(close-icon) {
-    display: none;
+ion-fab[core-fab] {
+    position: fixed;
+    
+    // Hide close button because when present is read on voice over.
+    ion-fab-button::part(close-icon) {
+        display: none;
+    }
 }
 
 .core-media-adapt-width {
@@ -1166,4 +1175,67 @@ iframe {
 
 ion-grid.core-no-grid > ion-row {
     display: block;
-}
\ No newline at end of file
+}
+
+ion-header[collapsible] {
+    @include core-transition(all, 500ms);
+
+    ion-title {
+        @include core-transition(opacity, 0ms);
+    }
+
+    &:not(.core-header-collapsed) {
+        ion-toolbar {
+            --core-header-toolbar-background: rgba(255, 255, 255, 0);
+            --core-header-toolbar-border-width: 0;
+        }
+
+        ion-title, &::after {
+            opacity: 0;
+            z-index: 0;
+        }
+    }
+}
+
+.collapsible-title {
+    overflow: visible;
+    *, h1, h2, .subheading {
+        @include core-transition(all, 200ms, linear);
+    }
+
+    ion-label {
+        overflow: visible !important;
+    }
+
+    h1, h2, .subheading {
+        --max-width: none;
+    }
+}
+
+ion-app.ios .collapsible-title h1 {
+    font-weight: 600; // Default heading weight.
+}
+ion-app.md .collapsible-title h1 {
+    font-weight: 500; // Default heading weight.
+    letter-spacing: .0125em;
+}
+
+.collapsible-title.collapsible-title-collapsed {
+    ion-label, h1, h2, .subheading {
+        opacity: 0;
+    }
+}
+
+.collapsible-title.collapsible-title-collapse-started {
+    * {
+        opacity: 0;
+    }
+    ion-label, h1, h2, .subheading {
+        opacity: 1;
+    }
+    h1, h2, .subheading {
+        max-width: var(--max-width);
+        white-space: nowrap;
+        overflow: hidden;
+    }
+}

From ccfad3b1acee41f59702aa6a7334991224005c38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 23 Nov 2021 15:06:01 +0100
Subject: [PATCH 0239/1008] MOBILE-3810 core: Wrap header titles with ion-title

---
 .../pages/issued-badge/issued-badge.html      |  45 +++++---
 .../badges/pages/user-badges/user-badges.html |   7 +-
 src/addons/blog/pages/entries/entries.html    |  14 +--
 .../reminder-time-modal.html                  |  10 +-
 src/addons/calendar/pages/day/day.html        |  12 +-
 .../calendar/pages/edit-event/edit-event.html |  32 +++---
 src/addons/calendar/pages/event/event.html    |  52 ++++-----
 src/addons/calendar/pages/index/index.html    |  25 ++---
 .../calendar/pages/settings/settings.html     |   4 +-
 .../pages/competencies/competencies.html      |   4 +-
 .../pages/competency/competency.html          |  22 ++--
 .../competencysummary/competencysummary.html  |   8 +-
 .../coursecompetencies.html                   |  29 ++---
 src/addons/competency/pages/plan/plan.html    |  19 ++--
 .../competency/pages/planlist/planlist.html   |  10 +-
 .../coursecompletion/pages/report/report.html |  16 ++-
 .../airnotifier/pages/devices/devices.html    |   9 +-
 .../conversation-info/conversation-info.html  |  10 +-
 .../messages/pages/contacts-35/contacts.html  |  25 +++--
 .../messages/pages/contacts/contacts.html     |  16 +--
 .../messages/pages/discussion/discussion.html |  72 ++++++------
 .../pages/discussions-35/discussions.html     |  28 +++--
 .../group-conversations.html                  | 106 +++++++++---------
 src/addons/messages/pages/search/search.html  |  22 ++--
 .../messages/pages/settings/settings.html     |  57 +++++-----
 .../edit-feedback-modal.html                  |   7 +-
 src/addons/mod/assign/pages/edit/edit.html    |  10 +-
 src/addons/mod/assign/pages/index/index.html  |  10 +-
 .../submission-list/submission-list.html      |  10 +-
 .../submission-review/submission-review.html  |  10 +-
 src/addons/mod/book/components/toc/toc.html   |  10 +-
 src/addons/mod/book/pages/index/index.html    |  10 +-
 .../components/users-modal/users-modal.html   |  10 +-
 src/addons/mod/chat/pages/chat/chat.html      |  18 +--
 src/addons/mod/chat/pages/index/index.html    |  10 +-
 .../session-messages/session-messages.html    |   9 +-
 .../mod/chat/pages/sessions/sessions.html     |   4 +-
 src/addons/mod/choice/pages/index/index.html  |  10 +-
 .../mod/data/components/search/search.html    |  17 ++-
 src/addons/mod/data/pages/edit/edit.html      |  10 +-
 src/addons/mod/data/pages/entry/entry.html    |  31 ++---
 src/addons/mod/data/pages/index/index.html    |  10 +-
 .../mod/feedback/pages/attempt/attempt.html   |  16 +--
 src/addons/mod/feedback/pages/form/form.html  |  51 ++++-----
 .../mod/feedback/pages/index/index.html       |  10 +-
 .../pages/nonrespondents/nonrespondents.html  |   8 +-
 .../pages/respondents/respondents.html        |  12 +-
 src/addons/mod/folder/pages/index/index.html  |  10 +-
 .../sort-order-selector.html                  |   4 +-
 .../forum/pages/discussion/discussion.html    |  90 +++++++--------
 src/addons/mod/forum/pages/index/index.html   |  10 +-
 .../pages/new-discussion/new-discussion.html  |  35 +++---
 src/addons/mod/glossary/pages/edit/edit.html  |  31 ++---
 .../mod/glossary/pages/entry/entry.html       |  34 +++---
 .../mod/glossary/pages/index/index.html       |  10 +-
 .../attempt-results/attempt-results.html      |  38 +++----
 .../mod/h5pactivity/pages/index/index.html    |  10 +-
 .../pages/user-attempts/user-attempts.html    |  12 +-
 .../pages/users-attempts/users-attempts.html  |  12 +-
 src/addons/mod/imscp/components/toc/toc.html  |   4 +-
 src/addons/mod/imscp/pages/index/index.html   |  10 +-
 .../components/menu-modal/menu-modal.html     |  21 ++--
 .../password-modal/password-modal.html        |   9 +-
 src/addons/mod/lesson/pages/index/index.html  |  10 +-
 .../mod/lesson/pages/player/player.html       |  75 ++++++-------
 .../lesson/pages/user-retake/user-retake.html |  29 ++---
 src/addons/mod/lti/pages/index/index.html     |  10 +-
 src/addons/mod/page/pages/index/index.html    |  10 +-
 .../navigation-modal/navigation-modal.html    |  13 ++-
 .../preflight-modal/preflight-modal.html      |   5 +-
 .../mod/quiz/pages/attempt/attempt.html       |  16 +--
 src/addons/mod/quiz/pages/index/index.html    |  10 +-
 src/addons/mod/quiz/pages/player/player.html  |  41 ++++---
 src/addons/mod/quiz/pages/review/review.html  |  14 +--
 .../mod/resource/pages/index/index.html       |  10 +-
 src/addons/mod/scorm/components/toc/toc.html  |   7 +-
 src/addons/mod/scorm/pages/index/index.html   |  10 +-
 src/addons/mod/scorm/pages/player/player.html |  14 ++-
 src/addons/mod/survey/pages/index/index.html  |   8 +-
 src/addons/mod/url/pages/index/index.html     |   8 +-
 .../index/addon-mod-wiki-index.html           |   4 +-
 src/addons/mod/wiki/components/map/map.html   |  11 +-
 src/addons/mod/wiki/pages/edit/edit.html      |  21 ++--
 src/addons/mod/wiki/pages/index/index.html    |  18 +--
 .../mod/workshop/components/phase/phase.html  |  11 +-
 .../workshop/pages/assessment/assessment.html |  31 ++---
 .../edit-submission/edit-submission.html      |   9 +-
 .../mod/workshop/pages/index/index.html       |  10 +-
 .../workshop/pages/submission/submission.html |  34 +++---
 .../notes/components/add/add-modal.html       |   7 +-
 src/addons/notes/pages/list/list.html         |  25 +++--
 src/addons/notifications/pages/list/list.html |  18 +--
 .../pages/notification/notification.html      |   7 +-
 .../pages/settings/settings.html              |  16 ++-
 .../privatefiles/pages/index/index.html       |  12 +-
 .../pages/course-storage/course-storage.html  |  11 +-
 .../courses-storage/courses-storage.html      |  11 +-
 .../components/side-blocks/side-blocks.html   |   4 +-
 .../comments/pages/viewer/viewer.html         |  39 +++----
 .../choose-site-modal/choose-site-modal.html  |  14 +--
 .../section-selector/section-selector.html    |  10 +-
 .../features/course/pages/index/index.html    |   8 +-
 .../pages/list-mod-type/list-mod-type.html    |  13 ++-
 .../course/pages/preview/preview.html         |   8 +-
 .../unsupported-module.html                   |  10 +-
 .../self-enrol-password.html                  |  15 +--
 .../courses/pages/categories/categories.html  |  10 +-
 .../features/courses/pages/list/list.html     |  25 +++--
 src/core/features/courses/pages/my/my.html    |   4 +-
 .../capture-media/capture-media.html          |  10 +-
 .../features/grades/pages/course/course.html  |  47 +++-----
 .../grades/pages/courses/courses.html         |  30 ++---
 .../features/grades/pages/grade/grade.html    |   4 +-
 .../login/components/site-help/site-help.html |  11 +-
 .../site-onboarding/site-onboarding.html      |   2 +-
 .../login/components/sites/sites.html         |   4 +-
 .../change-password/change-password.html      |   4 +-
 .../login/pages/credentials/credentials.html  |  38 ++++---
 .../pages/email-signup/email-signup.html      |  32 ++++--
 .../forgotten-password.html                   |  12 +-
 .../login/pages/reconnect/reconnect.html      |  22 ++--
 .../login/pages/site-policy/site-policy.html  |  16 ++-
 src/core/features/login/pages/site/site.html  |  17 +--
 .../features/login/pages/sites/sites.html     |   4 +-
 .../components/user-menu/user-menu.html       |  10 +-
 .../features/mainmenu/pages/home/home.html    |  13 ++-
 .../features/mainmenu/pages/more/more.html    |   8 +-
 .../components/ratings/ratings-modal.html     |   4 +-
 .../features/settings/pages/about/about.html  |  36 +++---
 src/core/features/settings/pages/dev/dev.html |  22 +++-
 .../settings/pages/deviceinfo/deviceinfo.html |  11 +-
 .../settings/pages/general/general.html       |   8 +-
 .../features/settings/pages/index/index.html  |   8 +-
 .../settings/pages/licenses/licenses.html     |   4 +-
 .../features/settings/pages/site/site.html    |   7 +-
 .../pages/space-usage/space-usage.html        |   4 +-
 .../synchronization/synchronization.html      |   4 +-
 .../components/list-modal/list-modal.html     |  13 +--
 .../pages/choose-site/choose-site.html        |  11 +-
 .../features/sharedfiles/pages/list/list.html |   8 +-
 .../pages/module-index/module-index.html      |   4 +-
 .../pages/plugin-page/plugin-page.html        |  11 +-
 .../tag/pages/index-area/index-area.html      |   8 +-
 src/core/features/tag/pages/index/index.html  |   7 +-
 .../features/tag/pages/search/search.html     |   9 +-
 src/core/features/user/pages/about/about.html |   4 +-
 .../features/user/pages/profile/profile.html  |   7 +-
 .../viewer/components/image/image.html        |   4 +-
 .../components/qr-scanner/qr-scanner.html     |   4 +-
 .../features/viewer/components/text/text.html |   9 +-
 .../features/viewer/pages/iframe/iframe.html  |   4 +-
 151 files changed, 1334 insertions(+), 1154 deletions(-)

diff --git a/src/addons/badges/pages/issued-badge/issued-badge.html b/src/addons/badges/pages/issued-badge/issued-badge.html
index 0a80b561d..d4865c4c9 100644
--- a/src/addons/badges/pages/issued-badge/issued-badge.html
+++ b/src/addons/badges/pages/issued-badge/issued-badge.html
@@ -3,8 +3,10 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1 *ngIf="badge">{{ badge.name }}</h1>
-        <h1 *ngIf="!badge">{{ 'addon.badges.badges' | translate }}</h1>
+        <ion-title>
+            <h1 *ngIf="badge">{{ badge.name }}</h1>
+            <h1 *ngIf="!badge">{{ 'addon.badges.badges' | translate }}</h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
@@ -54,8 +56,8 @@
                     <ion-label>
                         <h2>{{ 'addon.badges.contact' | translate}}</h2>
                         <p><a href="mailto:{{badge.issuercontact}}" core-link auto-login="no" [showBrowserWarning]="false">
-                            {{ badge.issuercontact }}
-                        </a></p>
+                                {{ badge.issuercontact }}
+                            </a></p>
                     </ion-label>
                 </ion-item>
             </ion-item-group>
@@ -100,8 +102,8 @@
                     <ion-label>
                         <h2>{{ 'addon.badges.imageauthoremail' | translate}}</h2>
                         <p><a href="mailto:{{badge.imageauthoremail}}" core-link auto-login="no" [showBrowserWarning]="false">
-                            {{ badge.imageauthoremail }}
-                        </a></p>
+                                {{ badge.imageauthoremail }}
+                            </a></p>
                     </ion-label>
                 </ion-item>
                 <ion-item class="ion-text-wrap" *ngIf="badge.imageauthorurl">
@@ -157,7 +159,9 @@
             <!-- Endorsement -->
             <ion-item-group *ngIf="badge.endorsement">
                 <ion-item-divider>
-                    <ion-label><h2>{{ 'addon.badges.bendorsement' | translate}}</h2></ion-label>
+                    <ion-label>
+                        <h2>{{ 'addon.badges.bendorsement' | translate}}</h2>
+                    </ion-label>
                 </ion-item-divider>
                 <ion-item class="ion-text-wrap" *ngIf="badge.endorsement.issuername">
                     <ion-label>
@@ -169,8 +173,7 @@
                     <ion-label>
                         <h2>{{ 'addon.badges.issueremail' | translate}}</h2>
                         <p>
-                            <a href="mailto:{{badge.endorsement.issueremail}}" core-link auto-login="no"
-                                [showBrowserWarning]="false">
+                            <a href="mailto:{{badge.endorsement.issueremail}}" core-link auto-login="no" [showBrowserWarning]="false">
                                 {{ badge.endorsement.issueremail }}
                             </a>
                         </p>
@@ -205,27 +208,39 @@
             <!-- Related badges -->
             <ion-item-group *ngIf="badge.relatedbadges">
                 <ion-item-divider>
-                    <ion-label><h2>{{ 'addon.badges.relatedbages' | translate}}</h2></ion-label>
+                    <ion-label>
+                        <h2>{{ 'addon.badges.relatedbages' | translate}}</h2>
+                    </ion-label>
                 </ion-item-divider>
                 <ion-item class="ion-text-wrap" *ngFor="let relatedBadge of badge.relatedbadges">
-                    <ion-label><h2>{{ relatedBadge.name }}</h2></ion-label>
+                    <ion-label>
+                        <h2>{{ relatedBadge.name }}</h2>
+                    </ion-label>
                 </ion-item>
                 <ion-item class="ion-text-wrap" *ngIf="badge.relatedbadges.length == 0">
-                    <ion-label><h2>{{ 'addon.badges.norelated' | translate}}</h2></ion-label>
+                    <ion-label>
+                        <h2>{{ 'addon.badges.norelated' | translate}}</h2>
+                    </ion-label>
                 </ion-item>
             </ion-item-group>
 
             <!-- Competencies alignment -->
             <ion-item-group *ngIf="badge.alignment">
                 <ion-item-divider>
-                    <ion-label><h2>{{ 'addon.badges.alignment' | translate}}</h2></ion-label>
+                    <ion-label>
+                        <h2>{{ 'addon.badges.alignment' | translate}}</h2>
+                    </ion-label>
                 </ion-item-divider>
                 <ion-item class="ion-text-wrap" *ngFor="let alignment of badge.alignment" [href]="alignment.targeturl" core-link
                     auto-login="no">
-                    <ion-label><h2>{{ alignment.targetname }}</h2></ion-label>
+                    <ion-label>
+                        <h2>{{ alignment.targetname }}</h2>
+                    </ion-label>
                 </ion-item>
                 <ion-item class="ion-text-wrap" *ngIf="badge.alignment.length == 0">
-                    <ion-label><h2>{{ 'addon.badges.noalignment' | translate}}</h2></ion-label>
+                    <ion-label>
+                        <h2>{{ 'addon.badges.noalignment' | translate}}</h2>
+                    </ion-label>
                 </ion-item>
             </ion-item-group>
         </ng-container>
diff --git a/src/addons/badges/pages/user-badges/user-badges.html b/src/addons/badges/pages/user-badges/user-badges.html
index a04a3e761..8b872cbea 100644
--- a/src/addons/badges/pages/user-badges/user-badges.html
+++ b/src/addons/badges/pages/user-badges/user-badges.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ 'addon.badges.badges' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'addon.badges.badges' | translate }}</h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
@@ -12,8 +14,7 @@
             <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
         </ion-refresher>
         <core-loading [hideUntil]="badges.loaded">
-            <core-empty-box *ngIf="badges.empty" icon="fas-trophy"
-                [message]="'addon.badges.nobadges' | translate">
+            <core-empty-box *ngIf="badges.empty" icon="fas-trophy" [message]="'addon.badges.nobadges' | translate">
             </core-empty-box>
 
             <ion-list *ngIf="!badges.empty" class="ion-no-margin">
diff --git a/src/addons/blog/pages/entries/entries.html b/src/addons/blog/pages/entries/entries.html
index 60d027fcb..550ee3fd2 100644
--- a/src/addons/blog/pages/entries/entries.html
+++ b/src/addons/blog/pages/entries/entries.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ title | translate }}</h1>
+        <ion-title>
+            <h1>{{ title | translate }}</h1>
+        </ion-title>
         <ion-buttons slot="end">
             <core-user-menu-button></core-user-menu-button>
         </ion-buttons>
@@ -18,8 +20,7 @@
             <ion-label>{{ 'addon.blog.showonlyyourentries' | translate }}</ion-label>
             <ion-toggle [(ngModel)]="onlyMyEntries" (ionChange)="onlyMyEntriesToggleChanged(onlyMyEntries)"></ion-toggle>
         </ion-item>
-        <core-empty-box *ngIf="entries && entries.length == 0" icon="far-newspaper"
-            [message]="'addon.blog.noentriesyet' | translate">
+        <core-empty-box *ngIf="entries && entries.length == 0" icon="far-newspaper" [message]="'addon.blog.noentriesyet' | translate">
         </core-empty-box>
         <ng-container *ngFor="let entry of entries">
             <ion-card *ngIf="!onlyMyEntries || entry.userid == currentUserId">
@@ -27,8 +28,7 @@
                     <core-user-avatar [user]="entry.user" slot="start" [courseId]="entry.courseid"></core-user-avatar>
                     <ion-label>
                         <p class="item-heading">
-                            <core-format-text [text]="entry.subject" [contextLevel]="contextLevel"
-                                [contextInstanceId]="contextInstanceId">
+                            <core-format-text [text]="entry.subject" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId">
                             </core-format-text>
                             <ion-note class="ion-float-end ion-padding-start ion-text-end">
                                 {{ 'addon.blog.' + entry.publishTranslated! | translate}}
@@ -68,8 +68,8 @@
                 </ion-card-content>
                 <div class="ion-text-center ion-margin-bottom" *ngIf="entry.lastmodified > entry.created">
                     <ion-note>
-                        <ion-icon name="fas-clock"
-                            [attr.aria-label]="'core.lastmodified' | translate"></ion-icon> {{entry.lastmodified | coreTimeAgo}}
+                        <ion-icon name="fas-clock" [attr.aria-label]="'core.lastmodified' | translate"></ion-icon> {{entry.lastmodified |
+                        coreTimeAgo}}
                     </ion-note>
                 </div>
             </ion-card>
diff --git a/src/addons/calendar/components/reminder-time-modal/reminder-time-modal.html b/src/addons/calendar/components/reminder-time-modal/reminder-time-modal.html
index ad47dee3a..cdf45cb20 100644
--- a/src/addons/calendar/components/reminder-time-modal/reminder-time-modal.html
+++ b/src/addons/calendar/components/reminder-time-modal/reminder-time-modal.html
@@ -1,6 +1,8 @@
 <ion-header>
     <ion-toolbar>
-        <h2>{{ 'addon.calendar.reminders' | translate }}</h2>
+        <ion-title>
+            <h2>{{ 'addon.calendar.reminders' | translate }}</h2>
+        </ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
                 <ion-icon slot="icon-only" name="fas-times" aria-hidden="true"></ion-icon>
@@ -36,15 +38,13 @@
 
             <div class="flex-row">
                 <!-- Input to enter the value. -->
-                <ion-input type="number" name="customvalue" [(ngModel)]="customValue" [disabled]="radioValue != 'custom'"
-                    placeholder="10">
+                <ion-input type="number" name="customvalue" [(ngModel)]="customValue" [disabled]="radioValue != 'custom'" placeholder="10">
                 </ion-input>
 
                 <!-- Units. -->
                 <label class="accesshide" for="reminderUnits">{{ 'addon.calendar.units' | translate }}</label>
                 <ion-select id="reminderUnits" name="customunits" [(ngModel)]="customUnits" interface="action-sheet"
-                    [disabled]="radioValue != 'custom'" slot="end"
-                    [interfaceOptions]="{header: 'addon.calendar.units' | translate}">
+                    [disabled]="radioValue != 'custom'" slot="end" [interfaceOptions]="{header: 'addon.calendar.units' | translate}">
                     <ion-select-option *ngFor="let option of customUnitsOptions" [value]="option.value">
                         {{ option.label | translate }}
                     </ion-select-option>
diff --git a/src/addons/calendar/pages/day/day.html b/src/addons/calendar/pages/day/day.html
index 7580d07b1..ef0fe2306 100644
--- a/src/addons/calendar/pages/day/day.html
+++ b/src/addons/calendar/pages/day/day.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ 'addon.calendar.calendarevents' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'addon.calendar.calendarevents' | translate }}</h1>
+        </ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="openFilter($event)" [attr.aria-label]="'core.filter' | translate">
                 <ion-icon slot="icon-only" name="fas-filter" aria-hidden="true"></ion-icon>
@@ -13,8 +15,8 @@
                     iconAction="fas-calendar-day" (action)="goToCurrentDay()">
                 </core-context-menu-item>
                 <core-context-menu-item [hidden]="!loaded || !hasOffline || !isOnline" [priority]="400"
-                    [content]="'core.settings.synchronizenow' | translate" (action)="doRefresh(undefined, $event)"
-                    [iconAction]="syncIcon" [closeOnClick]="false">
+                    [content]="'core.settings.synchronizenow' | translate" (action)="doRefresh(undefined, $event)" [iconAction]="syncIcon"
+                    [closeOnClick]="false">
                 </core-context-menu-item>
             </core-context-menu>
         </ion-buttons>
@@ -60,7 +62,7 @@
         <ion-list *ngIf="filteredEvents && filteredEvents.length" class="ion-no-margin">
             <ng-container *ngFor="let event of filteredEvents">
                 <ion-item class="addon-calendar-event ion-text-wrap" [attr.aria-label]="event.name" (click)="gotoEvent(event.id)"
-                [class.item-dimmed]="event.ispast" [ngClass]="['addon-calendar-eventtype-'+event.eventtype]" button detail="true">
+                    [class.item-dimmed]="event.ispast" [ngClass]="['addon-calendar-eventtype-'+event.eventtype]" button detail="true">
                     <core-mod-icon *ngIf="event.moduleIcon" [modicon]="event.moduleIcon" slot="start" [showAlt]="false"
                         [modname]="event.modname" [componentId]="event.instance">
                     </core-mod-icon>
@@ -74,7 +76,7 @@
                         </span>
                         <p class="item-heading">
                             <core-format-text [text]="event.name" [contextLevel]="event.contextLevel"
-                            [contextInstanceId]="event.contextInstanceId"></core-format-text>
+                                [contextInstanceId]="event.contextInstanceId"></core-format-text>
                         </p>
                         <p [innerHTML]="event.formattedtime"></p>
                     </ion-label>
diff --git a/src/addons/calendar/pages/edit-event/edit-event.html b/src/addons/calendar/pages/edit-event/edit-event.html
index 469fc2e7c..0ba264922 100644
--- a/src/addons/calendar/pages/edit-event/edit-event.html
+++ b/src/addons/calendar/pages/edit-event/edit-event.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ title | translate }}</h1>
+        <ion-title>
+            <h1>{{ title | translate }}</h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
@@ -40,12 +42,8 @@
                     <p class="item-heading" [core-mark-required]="true">{{ 'addon.calendar.eventkind' | translate }}</p>
                 </ion-label>
                 <p *ngIf="eventTypes.length == 1" slot="end">{{eventTypes[0].name | translate }}</p>
-                <ion-select
-                    *ngIf="eventTypes.length > 1"
-                    formControlName="eventtype"
-                    interface="action-sheet"
-                    [interfaceOptions]="{header: 'addon.calendar.eventkind' | translate}"
-                >
+                <ion-select *ngIf="eventTypes.length > 1" formControlName="eventtype" interface="action-sheet"
+                    [interfaceOptions]="{header: 'addon.calendar.eventkind' | translate}">
                     <ion-select-option *ngFor="let type of eventTypes" [value]="type.value">
                         {{ type.name | translate }}
                     </ion-select-option>
@@ -83,8 +81,7 @@
                     <ion-label>
                         <p class="item-heading" [core-mark-required]="true">{{ 'core.course' | translate }}</p>
                     </ion-label>
-                    <ion-select formControlName="groupcourseid"
-                        interface="action-sheet" [placeholder]="'core.noselection' | translate"
+                    <ion-select formControlName="groupcourseid" interface="action-sheet" [placeholder]="'core.noselection' | translate"
                         (ionChange)="groupCourseSelected()" [interfaceOptions]="{header: 'core.course' | translate}">
                         <ion-select-option *ngFor="let course of courses" [value]="course.id">
                             {{ course.fullname }}
@@ -93,7 +90,9 @@
                 </ion-item>
                 <!-- The course has no groups. -->
                 <ion-item class="ion-text-wrap core-danger-item" *ngIf="!loadingGroups && courseGroupSet && !groups.length">
-                    <ion-label><p>{{ 'core.coursenogroups' | translate }}</p></ion-label>
+                    <ion-label>
+                        <p>{{ 'core.coursenogroups' | translate }}</p>
+                    </ion-label>
                 </ion-item>
                 <!-- Select the group. -->
                 <ion-item class="ion-text-wrap" *ngIf="!loadingGroups && groups.length > 0">
@@ -128,8 +127,7 @@
                     <ion-label>
                         <p>{{ reminder.label }}</p>
                     </ion-label>
-                    <ion-button fill="clear" (click)="removeReminder(reminder)" [attr.aria-label]="'core.delete' | translate"
-                        slot="end">
+                    <ion-button fill="clear" (click)="removeReminder(reminder)" [attr.aria-label]="'core.delete' | translate" slot="end">
                         <ion-icon name="fas-trash" color="danger" slot="icon-only" aria-hidden="true"></ion-icon>
                     </ion-button>
                 </ion-item>
@@ -158,8 +156,7 @@
                     <ion-item *ngIf="form.controls.duration.value === 1">
                         <ion-label position="stacked"></ion-label>
                         <ion-datetime formControlName="timedurationuntil" [max]="maxDate" [min]="minDate"
-                            [placeholder]="'addon.calendar.durationuntil' | translate"
-                            [displayFormat]="dateFormat" display-timezone="utc">
+                            [placeholder]="'addon.calendar.durationuntil' | translate" [displayFormat]="dateFormat" display-timezone="utc">
                         </ion-datetime>
                     </ion-item>
                     <ion-item lines="none">
@@ -171,8 +168,7 @@
                     <ion-item *ngIf="form.controls.duration.value === 2">
                         <ion-label class="sr-only">{{ 'addon.calendar.durationminutes' | translate }}</ion-label>
                         <ion-input type="number" name="timedurationminutes" slot="end"
-                            [placeholder]="'addon.calendar.durationminutes' | translate"
-                            formControlName="timedurationminutes"></ion-input>
+                            [placeholder]="'addon.calendar.durationminutes' | translate" formControlName="timedurationminutes"></ion-input>
                     </ion-item>
                 </ion-radio-group>
             </div>
@@ -223,8 +219,8 @@
                     <p class="item-heading">{{ 'core.description' | translate }}</p>
                 </ion-label>
                 <core-rich-text-editor [control]="descriptionControl" [attr.aria-label]="'core.description' | translate"
-                    [placeholder]="'core.description' | translate" name="description" [component]="component"
-                    [componentId]="eventId" [autoSave]="false"></core-rich-text-editor>
+                    [placeholder]="'core.description' | translate" name="description" [component]="component" [componentId]="eventId"
+                    [autoSave]="false"></core-rich-text-editor>
             </ion-item>
 
             <!-- Location. -->
diff --git a/src/addons/calendar/pages/event/event.html b/src/addons/calendar/pages/event/event.html
index e2279bd11..8744742c3 100644
--- a/src/addons/calendar/pages/event/event.html
+++ b/src/addons/calendar/pages/event/event.html
@@ -3,30 +3,31 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1 *ngIf="event">
-            <core-mod-icon *ngIf="event.moduleIcon" [modicon]="event.moduleIcon" [showAlt]="false"
-                [modname]="event.modulename" [componentId]="event.instance"></core-mod-icon>
-            <ion-icon *ngIf="event.eventIcon && !event.moduleIcon" [name]="event.eventIcon" aria-hidden="true"></ion-icon>
-            <!-- Add the icon title so accessibility tools read it. -->
-            <span class="sr-only">
-                {{ 'addon.calendar.type' + event.formattedType | translate }}
-                <span class="sr-only" *ngIf="event.moduleIcon && event.iconTitle">{{ event.iconTitle }}</span>
-            </span>
-            <core-format-text [text]="event.name" [contextLevel]="event.contextLevel"
-                [contextInstanceId]="event.contextInstanceId"></core-format-text>
-        </h1>
+        <ion-title>
+            <h1 *ngIf="event">
+                <core-mod-icon *ngIf="event.moduleIcon" [modicon]="event.moduleIcon" [showAlt]="false" [modname]="event.modulename"
+                    [componentId]="event.instance"></core-mod-icon>
+                <ion-icon *ngIf="event.eventIcon && !event.moduleIcon" [name]="event.eventIcon" aria-hidden="true"></ion-icon>
+                <!-- Add the icon title so accessibility tools read it. -->
+                <span class="sr-only">
+                    {{ 'addon.calendar.type' + event.formattedType | translate }}
+                    <span class="sr-only" *ngIf="event.moduleIcon && event.iconTitle">{{ event.iconTitle }}</span>
+                </span>
+                <core-format-text [text]="event.name" [contextLevel]="event.contextLevel" [contextInstanceId]="event.contextInstanceId">
+                </core-format-text>
+            </h1>
+        </ion-title>
         <ion-buttons slot="end">
             <core-context-menu>
-                <core-context-menu-item [hidden]="!eventLoaded || (!hasOffline && event && !event.deleted) || !isOnline"
-                    [priority]="400" [content]="'core.settings.synchronizenow' | translate" (action)="doRefresh(undefined, $event, true)"
+                <core-context-menu-item [hidden]="!eventLoaded || (!hasOffline && event && !event.deleted) || !isOnline" [priority]="400"
+                    [content]="'core.settings.synchronizenow' | translate" (action)="doRefresh(undefined, $event, true)"
                     [iconAction]="syncIcon" [closeOnClick]="false">
                 </core-context-menu-item>
-                <core-context-menu-item [hidden]="!event || !event.canedit || event.deleted || (!canEdit && event.id > 0)"
-                    [priority]="300" [content]="'core.edit' | translate" (action)="openEdit()" iconAction="fas-edit">
+                <core-context-menu-item [hidden]="!event || !event.canedit || event.deleted || (!canEdit && event.id > 0)" [priority]="300"
+                    [content]="'core.edit' | translate" (action)="openEdit()" iconAction="fas-edit">
                 </core-context-menu-item>
                 <core-context-menu-item [hidden]="!event || !event.candelete || event.deleted" [priority]="200"
-                    [content]="'core.delete' | translate" (action)="deleteEvent()"
-                    iconAction="fas-trash"></core-context-menu-item>
+                    [content]="'core.delete' | translate" (action)="deleteEvent()" iconAction="fas-trash"></core-context-menu-item>
                 <core-context-menu-item [hidden]="!event || !event.deleted" [priority]="200" [content]="'core.restore' | translate"
                     (action)="undoDelete()" iconAction="fas-undo-alt"></core-context-menu-item>
             </core-context-menu>
@@ -52,7 +53,7 @@
                     <ion-label>
                         <h2>{{ 'addon.calendar.when' | translate }}</h2>
                         <core-format-text [text]="event.formattedtime" [contextLevel]="event.contextLevel"
-                        [contextInstanceId]="event.contextInstanceId"></core-format-text>
+                            [contextInstanceId]="event.contextInstanceId"></core-format-text>
                     </ion-label>
                     <ion-note slot="end" *ngIf="event.deleted">
                         <ion-icon name="fas-trash" aria-hidden="true"></ion-icon> {{ 'core.deletedoffline' | translate }}
@@ -82,8 +83,10 @@
                 <ion-item class="ion-text-wrap" *ngIf="categoryPath">
                     <ion-label>
                         <h2>{{ 'core.category' | translate}}</h2>
-                        <p><core-format-text [text]="categoryPath" contextLevel="coursecat"
-                            [contextInstanceId]="event.categoryid"></core-format-text></p>
+                        <p>
+                            <core-format-text [text]="categoryPath" contextLevel="coursecat" [contextInstanceId]="event.categoryid">
+                            </core-format-text>
+                        </p>
                     </ion-label>
                 </ion-item>
                 <ion-item class="ion-text-wrap" *ngIf="event.description">
@@ -123,13 +126,12 @@
                 </ion-label>
             </ion-item>
             <ng-container *ngFor="let reminder of reminders">
-                <ion-item *ngIf="reminder.timestamp > 0" class="ion-text-wrap"
-                    [class.item-dimmed]="reminder.timestamp <= currentTime">
+                <ion-item *ngIf="reminder.timestamp > 0" class="ion-text-wrap" [class.item-dimmed]="reminder.timestamp <= currentTime">
                     <ion-label>
                         <p>{{ reminder.label }}</p>
                     </ion-label>
-                    <ion-button fill="clear" (click)="cancelNotification(reminder.id, $event)"
-                        [attr.aria-label]="'core.delete' | translate" slot="end" *ngIf="reminder.timestamp > currentTime">
+                    <ion-button fill="clear" (click)="cancelNotification(reminder.id, $event)" [attr.aria-label]="'core.delete' | translate"
+                        slot="end" *ngIf="reminder.timestamp > currentTime">
                         <ion-icon name="fas-trash" color="danger" slot="icon-only" aria-hidden="true"></ion-icon>
                     </ion-button>
                 </ion-item>
diff --git a/src/addons/calendar/pages/index/index.html b/src/addons/calendar/pages/index/index.html
index b67f85700..8675bca95 100644
--- a/src/addons/calendar/pages/index/index.html
+++ b/src/addons/calendar/pages/index/index.html
@@ -3,24 +3,24 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ (showCalendar ? 'addon.calendar.calendarevents' : 'addon.calendar.upcomingevents') | translate }}</h1>
+        <ion-title>
+            <h1>{{ (showCalendar ? 'addon.calendar.calendarevents' : 'addon.calendar.upcomingevents') | translate }}</h1>
+        </ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="openFilter($event)" [attr.aria-label]="'core.filter' | translate">
                 <ion-icon slot="icon-only" name="fas-filter" aria-hidden="true"></ion-icon>
             </ion-button>
             <core-context-menu>
-                <core-context-menu-item *ngIf="showCalendar" [priority]="800"
-                [content]="'addon.calendar.upcomingevents' | translate" iconAction="fas-th-list"
-                (action)="toggleDisplay()"></core-context-menu-item>
-                <core-context-menu-item *ngIf="!showCalendar" [priority]="800"
-                [content]="'addon.calendar.monthlyview' | translate" iconAction="fas-calendar-alt"
-                (action)="toggleDisplay()"></core-context-menu-item>
-                <core-context-menu-item [hidden]="!notificationsEnabled" [priority]="600"
-                [content]="'core.settings.settings' | translate" (action)="openSettings()" iconAction="fas-cogs">
+                <core-context-menu-item *ngIf="showCalendar" [priority]="800" [content]="'addon.calendar.upcomingevents' | translate"
+                    iconAction="fas-th-list" (action)="toggleDisplay()"></core-context-menu-item>
+                <core-context-menu-item *ngIf="!showCalendar" [priority]="800" [content]="'addon.calendar.monthlyview' | translate"
+                    iconAction="fas-calendar-alt" (action)="toggleDisplay()"></core-context-menu-item>
+                <core-context-menu-item [hidden]="!notificationsEnabled" [priority]="600" [content]="'core.settings.settings' | translate"
+                    (action)="openSettings()" iconAction="fas-cogs">
                 </core-context-menu-item>
                 <core-context-menu-item [hidden]="!loaded || !hasOffline || !isOnline" [priority]="400"
-                [content]="'core.settings.synchronizenow' | translate" (action)="doRefresh(undefined, $event, true)"
-                [iconAction]="syncIcon" [closeOnClick]="false"></core-context-menu-item>
+                    [content]="'core.settings.synchronizenow' | translate" (action)="doRefresh(undefined, $event, true)"
+                    [iconAction]="syncIcon" [closeOnClick]="false"></core-context-menu-item>
             </core-context-menu>
             <core-user-menu-button></core-user-menu-button>
         </ion-buttons>
@@ -43,8 +43,7 @@
         [displayNavButtons]="showCalendar" (onEventClicked)="gotoEvent($event)" (onDayClicked)="gotoDay($event)">
     </addon-calendar-calendar>
 
-    <addon-calendar-upcoming-events *ngIf="loadUpcoming" [hidden]="showCalendar" [filter]="filter"
-        (onEventClicked)="gotoEvent($event)">
+    <addon-calendar-upcoming-events *ngIf="loadUpcoming" [hidden]="showCalendar" [filter]="filter" (onEventClicked)="gotoEvent($event)">
     </addon-calendar-upcoming-events>
 
     <!-- Create a calendar event. -->
diff --git a/src/addons/calendar/pages/settings/settings.html b/src/addons/calendar/pages/settings/settings.html
index 8ebb4f579..d8982f79b 100644
--- a/src/addons/calendar/pages/settings/settings.html
+++ b/src/addons/calendar/pages/settings/settings.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ 'core.settings.settings' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'core.settings.settings' | translate }}</h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
diff --git a/src/addons/competency/pages/competencies/competencies.html b/src/addons/competency/pages/competencies/competencies.html
index c2b651541..911270667 100644
--- a/src/addons/competency/pages/competencies/competencies.html
+++ b/src/addons/competency/pages/competencies/competencies.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ title }}</h1>
+        <ion-title>
+            <h1>{{ title }}</h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
diff --git a/src/addons/competency/pages/competency/competency.html b/src/addons/competency/pages/competency/competency.html
index cc34b86b0..d70e9e806 100644
--- a/src/addons/competency/pages/competency/competency.html
+++ b/src/addons/competency/pages/competency/competency.html
@@ -3,9 +3,11 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1 *ngIf="competency">
-            {{ competency.competency.competency.shortname }} <small>{{ competency.competency.competency.idnumber }}</small>
-        </h1>
+        <ion-title>
+            <h1 *ngIf="competency">
+                {{ competency.competency.competency.shortname }} <small>{{ competency.competency.competency.idnumber }}</small>
+            </h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
@@ -16,7 +18,9 @@
         <ion-card *ngIf="user">
             <ion-item class="ion-text-wrap">
                 <core-user-avatar [user]="user" slot="start"></core-user-avatar>
-                <ion-label><h2>{{ user.fullname }}</h2></ion-label>
+                <ion-label>
+                    <h2>{{ user.fullname }}</h2>
+                </ion-label>
             </ion-item>
         </ion-card>
 
@@ -32,11 +36,9 @@
                 <ion-label>
                     <p class="item-heading">{{ 'addon.competency.path' | translate }}</p>
                     <p>
-                        <a *ngIf="competency.competency.comppath.showlinks"
-                            [href]="competency.competency.comppath.pluginbaseurl + '/competencies.php?competencyframeworkid=' +
+                        <a *ngIf="competency.competency.comppath.showlinks" [href]="competency.competency.comppath.pluginbaseurl + '/competencies.php?competencyframeworkid=' +
                             competency.competency.comppath.framework.id + '&pagecontextid=' +
-                            competency.competency.comppath.pagecontextid"
-                            core-link>
+                            competency.competency.comppath.pagecontextid" core-link>
                             {{ competency.competency.comppath.framework.name }}
                         </a>
                         <ng-container *ngIf="!competency.competency.comppath.showlinks">
@@ -129,7 +131,9 @@
                 </ion-item>
                 <ion-item class="ion-text-wrap">
                     <ion-label>
-                        <p><ion-badge color="dark">{{ evidence.gradename }}</ion-badge></p>
+                        <p>
+                            <ion-badge color="dark">{{ evidence.gradename }}</ion-badge>
+                        </p>
                         <p class="ion-margin-top" *ngIf="evidence.description">{{ evidence.description }}</p>
                         <blockquote *ngIf="evidence.note">{{ evidence.note }}</blockquote>
                     </ion-label>
diff --git a/src/addons/competency/pages/competencysummary/competencysummary.html b/src/addons/competency/pages/competencysummary/competencysummary.html
index 664344804..1467f6e50 100644
--- a/src/addons/competency/pages/competencysummary/competencysummary.html
+++ b/src/addons/competency/pages/competencysummary/competencysummary.html
@@ -3,9 +3,11 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1 *ngIf="competency">
-            {{ competency.competency.shortname }} <small>{{ competency.competency.idnumber }}</small>
-        </h1>
+        <ion-title>
+            <h1 *ngIf="competency">
+                {{ competency.competency.shortname }} <small>{{ competency.competency.idnumber }}</small>
+            </h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
diff --git a/src/addons/competency/pages/coursecompetencies/coursecompetencies.html b/src/addons/competency/pages/coursecompetencies/coursecompetencies.html
index a0e2f63e3..fa1cf08bc 100644
--- a/src/addons/competency/pages/coursecompetencies/coursecompetencies.html
+++ b/src/addons/competency/pages/coursecompetencies/coursecompetencies.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ 'addon.competency.coursecompetencies' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'addon.competency.coursecompetencies' | translate }}</h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
@@ -24,7 +26,7 @@
                 <ion-label>
                     <span id="addon-competency-course-{{courseId}}-progress">
                         {{ 'addon.competency.xcompetenciesproficientoutofyincourse' | translate: {$a:
-                            {x: competencies.statistics.proficientcompetencycount, y: competencies.statistics.competencycount} } }}
+                        {x: competencies.statistics.proficientcompetencycount, y: competencies.statistics.competencycount} } }}
                     </span>
                     <core-progress-bar [progress]="competencies.statistics.proficientcompetencypercentage"
                         ariaDescribedBy="addon-competency-course-{{courseId}}-progress">
@@ -48,13 +50,15 @@
             {{ 'addon.competency.coursecompetencies' | translate }}
         </h2>
         <ion-card *ngIf="user">
-             <ion-item class="ion-text-wrap">
+            <ion-item class="ion-text-wrap">
                 <core-user-avatar [user]="user" slot="start"></core-user-avatar>
-               <ion-label><h2>{{ user.fullname }}</h2></ion-label>
+                <ion-label>
+                    <h2>{{ user.fullname }}</h2>
+                </ion-label>
             </ion-item>
         </ion-card>
-        <core-empty-box *ngIf="competencies && competencies.statistics.competencycount == 0"
-            icon="fas-award" message="{{ 'addon.competency.nocompetenciesincourse' | translate }}">
+        <core-empty-box *ngIf="competencies && competencies.statistics.competencycount == 0" icon="fas-award"
+            message="{{ 'addon.competency.nocompetenciesincourse' | translate }}">
         </core-empty-box>
 
         <div *ngIf="competencies">
@@ -81,10 +85,9 @@
                         <div>
                             <p class="item-heading">{{ 'addon.competency.path' | translate }}</p>
                             <p>
-                                <a *ngIf="competency.comppath.showlinks"
-                                    [href]="competency.comppath.pluginbaseurl + '/competencies.php?competencyframeworkid=' +
-                                    competency.comppath.framework.id + '&pagecontextid=' + competency.comppath.pagecontextid"
-                                    core-link [title]="competency.comppath.framework.name">
+                                <a *ngIf="competency.comppath.showlinks" [href]="competency.comppath.pluginbaseurl + '/competencies.php?competencyframeworkid=' +
+                                    competency.comppath.framework.id + '&pagecontextid=' + competency.comppath.pagecontextid" core-link
+                                    [title]="competency.comppath.framework.name">
                                     {{ competency.comppath.framework.name }}
                                 </a>
                                 <ng-container *ngIf="!competency.comppath.showlinks">
@@ -103,7 +106,7 @@
                         </div>
                         <div *ngIf="competencies.statistics.canmanagecoursecompetencies">
                             <p class="item-heading">{{ 'addon.competency.uponcoursecompletion' | translate }}</p>
-                             <ng-container *ngFor="let ruleoutcome of competency.ruleoutcomeoptions">
+                            <ng-container *ngFor="let ruleoutcome of competency.ruleoutcomeoptions">
                                 <span *ngIf="ruleoutcome.selected">{{ ruleoutcome.text }}</span>
                             </ng-container>
                         </div>
@@ -131,8 +134,8 @@
                             <ion-item class="ion-text-wrap" *ngFor="let plan of competency.plans" [href]="plan.url"
                                 [attr.aria-label]="plan.name" core-link capture="true">
                                 <ion-label>
-                                   <core-format-text [text]="plan.name" contextLevel="user" [contextInstanceId]="plan.userid">
-                                   </core-format-text>
+                                    <core-format-text [text]="plan.name" contextLevel="user" [contextInstanceId]="plan.userid">
+                                    </core-format-text>
                                 </ion-label>
                             </ion-item>
                         </div>
diff --git a/src/addons/competency/pages/plan/plan.html b/src/addons/competency/pages/plan/plan.html
index edebcf7ba..ff5035a62 100644
--- a/src/addons/competency/pages/plan/plan.html
+++ b/src/addons/competency/pages/plan/plan.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1 *ngIf="plan">{{plan.plan.name}}</h1>
+        <ion-title>
+            <h1 *ngIf="plan">{{plan.plan.name}}</h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
@@ -18,14 +20,13 @@
                     <h2>{{ user.fullname }}</h2>
                 </ion-label>
             </ion-item>
-       </ion-card>
+        </ion-card>
         <ion-card *ngIf="plan">
             <ion-list>
                 <ion-item class="ion-text-wrap" *ngIf="plan.plan.description" lines="none">
                     <ion-label>
                         <p>
-                            <core-format-text [text]="plan.plan.description" contextLevel="user"
-                                [contextInstanceId]="plan.plan.userid">
+                            <core-format-text [text]="plan.plan.description" contextLevel="user" [contextInstanceId]="plan.plan.userid">
                             </core-format-text>
                         </p>
                     </ion-label>
@@ -53,7 +54,7 @@
                         <p class="item-heading">{{ 'addon.competency.progress' | translate }}</p>
                         <p>
                             {{ 'addon.competency.xcompetenciesproficientoutofy' | translate:
-                                {$a: {x: plan.proficientcompetencycount, y: plan.competencycount} } }}
+                            {$a: {x: plan.proficientcompetencycount, y: plan.competencycount} } }}
                         </p>
                         <core-progress-bar [progress]="plan.proficientcompetencypercentage"
                             [text]="plan.proficientcompetencypercentageformatted"
@@ -74,15 +75,15 @@
                     </ion-label>
                 </ion-item>
                 <ion-item class="ion-text-wrap" *ngFor="let competency of plan.competencies"
-                    (click)="openCompetency(competency.competency.id)"
-                    [attr.aria-label]="competency.competency.shortname" detail="true" button>
+                    (click)="openCompetency(competency.competency.id)" [attr.aria-label]="competency.competency.shortname" detail="true"
+                    button>
                     <ion-label>
                         <p class="item-heading">{{competency.competency.shortname}} <em>{{competency.competency.idnumber}}</em></p>
                     </ion-label>
                     <ion-badge *ngIf="competency.usercompetencyplan" slot="end"
                         [color]="competency.usercompetencyplan.proficiency ? 'success' : 'danger'">
-                            {{ competency.usercompetencyplan.gradename }}
-                        </ion-badge>
+                        {{ competency.usercompetencyplan.gradename }}
+                    </ion-badge>
                     <ion-badge *ngIf="!competency.usercompetencyplan" slot="end"
                         [color]="competency.usercompetency.proficiency ? 'success' : 'danger'">
                         {{ competency.usercompetency.gradename }}
diff --git a/src/addons/competency/pages/planlist/planlist.html b/src/addons/competency/pages/planlist/planlist.html
index 1b037fe48..214120779 100644
--- a/src/addons/competency/pages/planlist/planlist.html
+++ b/src/addons/competency/pages/planlist/planlist.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ 'addon.competency.userplans' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'addon.competency.userplans' | translate }}</h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
@@ -16,8 +18,8 @@
 
             </core-empty-box>
             <ion-list *ngIf="!plans.empty" class="ion-no-margin">
-                <ion-item class="ion-text-wrap" *ngFor="let plan of plans.items" [attr.aria-label]="plan.name"
-                    (click)="plans.select(plan)" [attr.aria-current]="plans.getItemAriaCurrent(plan)" button detail="true">
+                <ion-item class="ion-text-wrap" *ngFor="let plan of plans.items" [attr.aria-label]="plan.name" (click)="plans.select(plan)"
+                    [attr.aria-current]="plans.getItemAriaCurrent(plan)" button detail="true">
                     <ion-label>
                         <p class="item-heading">{{ plan.name }}</p>
                         <p *ngIf="plan.duedate > 0">
@@ -30,4 +32,4 @@
             </ion-list>
         </core-loading>
     </core-split-view>
-    </ion-content>
+</ion-content>
diff --git a/src/addons/coursecompletion/pages/report/report.html b/src/addons/coursecompletion/pages/report/report.html
index bc71b97f4..4c29301db 100644
--- a/src/addons/coursecompletion/pages/report/report.html
+++ b/src/addons/coursecompletion/pages/report/report.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ 'addon.coursecompletion.coursecompletion' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'addon.coursecompletion.coursecompletion' | translate }}</h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
@@ -28,14 +30,18 @@
         </ion-card>
         <ion-card *ngIf="completion && tracked">
             <ion-item-divider>
-                <ion-label><h2>{{ 'addon.coursecompletion.requiredcriteria' | translate }}</h2></ion-label>
+                <ion-label>
+                    <h2>{{ 'addon.coursecompletion.requiredcriteria' | translate }}</h2>
+                </ion-label>
             </ion-item-divider>
             <ion-item class="ion-hide-md-up ion-text-wrap" *ngFor="let criteria of completion.completions">
                 <ion-label>
                     <p class="item-heading">
                         <core-format-text clean="true" [text]="criteria.details.criteria" [filter]="false"></core-format-text>
                     </p>
-                    <p><core-format-text clean="true" [text]="criteria.details.requirement" [filter]="false"></core-format-text></p>
+                    <p>
+                        <core-format-text clean="true" [text]="criteria.details.requirement" [filter]="false"></core-format-text>
+                    </p>
                 </ion-label>
                 <strong slot="end">{{ criteria.status }}</strong>
             </ion-item>
@@ -73,7 +79,9 @@
         </ion-card>
         <ion-card *ngIf="showSelfComplete && tracked">
             <ion-item-divider>
-                <ion-label><h2>{{ 'addon.coursecompletion.manualselfcompletion' | translate }}</h2></ion-label>
+                <ion-label>
+                    <h2>{{ 'addon.coursecompletion.manualselfcompletion' | translate }}</h2>
+                </ion-label>
             </ion-item-divider>
             <ion-item>
                 <ion-label>
diff --git a/src/addons/messageoutput/airnotifier/pages/devices/devices.html b/src/addons/messageoutput/airnotifier/pages/devices/devices.html
index 02ea186de..255e061b5 100644
--- a/src/addons/messageoutput/airnotifier/pages/devices/devices.html
+++ b/src/addons/messageoutput/airnotifier/pages/devices/devices.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ 'addon.messageoutput_airnotifier.processorsettingsdesc' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'addon.messageoutput_airnotifier.processorsettingsdesc' | translate }}</h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
@@ -21,10 +23,7 @@
                     <p>{{ device.platform }} {{ device.version }}</p>
                 </ion-label>
                 <core-button-with-spinner [loading]="device.updating" slot="end">
-                    <ion-toggle
-                        [(ngModel)]="device.enable"
-                        (ngModelChange)="enableDevice(device, device.enable)"
-                    >
+                    <ion-toggle [(ngModel)]="device.enable" (ngModelChange)="enableDevice(device, device.enable)">
                     </ion-toggle>
                 </core-button-with-spinner>
             </ion-item>
diff --git a/src/addons/messages/components/conversation-info/conversation-info.html b/src/addons/messages/components/conversation-info/conversation-info.html
index 8a311ea57..59f120624 100644
--- a/src/addons/messages/components/conversation-info/conversation-info.html
+++ b/src/addons/messages/components/conversation-info/conversation-info.html
@@ -1,6 +1,8 @@
 <ion-header>
     <ion-toolbar>
-        <h2>{{ 'addon.messages.groupinfo' | translate }}</h2>
+        <ion-title>
+            <h2>{{ 'addon.messages.groupinfo' | translate }}</h2>
+        </ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
                 <ion-icon name="fas-times" slot="icon-only" aria-hidden="true"></ion-icon>
@@ -18,7 +20,7 @@
             <ion-label>
                 <div class="large-avatar">
                     <img class="avatar" [src]="conversation!.imageurl" core-external-content [alt]="conversation!.name"
-                    onError="this.src='assets/img/group-avatar.png'">
+                        onError="this.src='assets/img/group-avatar.png'">
                 </div>
                 <h2>
                     <core-format-text [text]="conversation!.name" contextLevel="system" [contextInstanceId]="0"></core-format-text>
@@ -32,8 +34,8 @@
             </ion-label>
         </ion-item>
 
-        <ion-item class="ion-text-wrap addon-messages-conversation-item" *ngFor="let member of members"
-            (click)="closeModal(member.id)" detail="true" button>
+        <ion-item class="ion-text-wrap addon-messages-conversation-item" *ngFor="let member of members" (click)="closeModal(member.id)"
+            detail="true" button>
             <core-user-avatar [user]="member" [linkProfile]="false" [checkOnline]="member.showonlinestatus" slot="start">
             </core-user-avatar>
             <ion-label>
diff --git a/src/addons/messages/pages/contacts-35/contacts.html b/src/addons/messages/pages/contacts-35/contacts.html
index 21e96c278..285f07231 100644
--- a/src/addons/messages/pages/contacts-35/contacts.html
+++ b/src/addons/messages/pages/contacts-35/contacts.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ 'addon.messages.contacts' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'addon.messages.contacts' | translate }}</h1>
+        </ion-title>
         <ion-buttons slot="end">
         </ion-buttons>
     </ion-toolbar>
@@ -14,9 +16,8 @@
             <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
         </ion-refresher>
 
-        <core-search-box (onSubmit)="search($event)" (onClear)="clearSearch()"
-            [placeholder]="'addon.messages.contactname' | translate" autocorrect="off" spellcheck="false" lengthCheck="2"
-            [disabled]="!loaded" searchArea="AddonMessagesContacts"></core-search-box>
+        <core-search-box (onSubmit)="search($event)" (onClear)="clearSearch()" [placeholder]="'addon.messages.contactname' | translate"
+            autocorrect="off" spellcheck="false" lengthCheck="2" [disabled]="!loaded" searchArea="AddonMessagesContacts"></core-search-box>
 
         <core-loading [hideUntil]="loaded" [message]="loadingMessage">
             <core-empty-box *ngIf="!hasContacts && searchString == ''" icon="fas-address-book"
@@ -28,17 +29,23 @@
             <ion-list *ngFor="let contactType of contactTypes" class="ion-no-margin">
                 <ng-container *ngIf="contacts[contactType] && (contacts[contactType].length > 0 || contactType === searchType)">
                     <ion-item-divider>
-                        <ion-label><p class="item-heading">{{ 'addon.messages.type_' + contactType | translate }}</p></ion-label>
-                        <ion-note slot="end" class="ion-padding-end"><ion-badge>{{ contacts[contactType].length }}</ion-badge></ion-note>
+                        <ion-label>
+                            <p class="item-heading">{{ 'addon.messages.type_' + contactType | translate }}</p>
+                        </ion-label>
+                        <ion-note slot="end" class="ion-padding-end">
+                            <ion-badge>{{ contacts[contactType].length }}</ion-badge>
+                        </ion-note>
                     </ion-item-divider>
                     <ng-container *ngFor="let contact of contacts[contactType]">
                         <!-- Don't show deleted users -->
                         <ion-item class="ion-text-wrap addon-messages-conversation-item"
-                            *ngIf="contact.profileimageurl || contact.profileimageurlsmall"
-                            [attr.aria-label]="contact.fullname" (click)="gotoDiscussion(contact.id)" detail="true" button
+                            *ngIf="contact.profileimageurl || contact.profileimageurlsmall" [attr.aria-label]="contact.fullname"
+                            (click)="gotoDiscussion(contact.id)" detail="true" button
                             [attr.aria-current]="contact.id == discussionUserId ? 'page' : 'false'">
                             <core-user-avatar [user]="contact" slot="start" [checkOnline]="contact.showonlinestatus"></core-user-avatar>
-                            <ion-label><p class="item-heading">{{ contact.fullname }}</p></ion-label>
+                            <ion-label>
+                                <p class="item-heading">{{ contact.fullname }}</p>
+                            </ion-label>
                         </ion-item>
                     </ng-container>
                 </ng-container>
diff --git a/src/addons/messages/pages/contacts/contacts.html b/src/addons/messages/pages/contacts/contacts.html
index 26e59ea71..8a3cacd95 100644
--- a/src/addons/messages/pages/contacts/contacts.html
+++ b/src/addons/messages/pages/contacts/contacts.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ 'addon.messages.contacts' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'addon.messages.contacts' | translate }}</h1>
+        </ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="gotoSearch()" [attr.aria-label]="'addon.messages.searchcombined' | translate">
                 <ion-icon name="fas-search" slot="icon-only" aria-hidden="true"></ion-icon>
@@ -26,8 +28,8 @@
                             <ion-item class="ion-text-wrap addon-messages-conversation-item" (click)="selectUser(contact.id)" button
                                 *ngFor="let contact of confirmedContacts" [attr.aria-label]="contact.fullname" detail="true"
                                 [attr.aria-current]="contact.id == selectedUserId ? 'page' : 'false'">
-                                <core-user-avatar slot="start" [user]="contact"
-                                    [checkOnline]="contact.showonlinestatus" [linkProfile]="false">
+                                <core-user-avatar slot="start" [user]="contact" [checkOnline]="contact.showonlinestatus"
+                                    [linkProfile]="false">
                                 </core-user-avatar>
                                 <ion-label>
                                     <p class="item-heading">
@@ -45,8 +47,8 @@
                             [message]="'addon.messages.nocontactsgetstarted' | translate">
                         </core-empty-box>
 
-                        <core-infinite-loading [enabled]="confirmedCanLoadMore" (action)="loadMore($event)"
-                            [error]="confirmedLoadMoreError" position="bottom">
+                        <core-infinite-loading [enabled]="confirmedCanLoadMore" (action)="loadMore($event)" [error]="confirmedLoadMoreError"
+                            position="bottom">
                         </core-infinite-loading>
                     </core-loading>
                 </ng-template>
@@ -77,8 +79,8 @@
                         <core-empty-box *ngIf="!requests.length" icon="far-address-book"
                             [message]="'addon.messages.nocontactrequests' | translate">
                         </core-empty-box>
-                        <core-infinite-loading [enabled]="requestsCanLoadMore" (action)="loadMore($event)"
-                            [error]="requestsLoadMoreError" position="bottom">
+                        <core-infinite-loading [enabled]="requestsCanLoadMore" (action)="loadMore($event)" [error]="requestsLoadMoreError"
+                            position="bottom">
                         </core-infinite-loading>
                     </core-loading>
                 </ng-template>
diff --git a/src/addons/messages/pages/discussion/discussion.html b/src/addons/messages/pages/discussion/discussion.html
index f38237550..06978fd47 100644
--- a/src/addons/messages/pages/discussion/discussion.html
+++ b/src/addons/messages/pages/discussion/discussion.html
@@ -3,59 +3,56 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <img *ngIf="loaded && !otherMember && conversationImage" class="core-bar-button-image" [src]="conversationImage"
-                alt="" onError="this.src='assets/img/group-avatar.png'" core-external-content role="presentation"
-                [siteId]="siteId || null">
-            <core-user-avatar *ngIf="loaded && otherMember" class="core-bar-button-image" [user]="otherMember"
-                [linkProfile]="false" [checkOnline]="otherMember.showonlinestatus">
-            </core-user-avatar>
-            <core-format-text [text]="title" contextLevel="system" [contextInstanceId]="0"></core-format-text>
-            <ion-icon *ngIf="conversation && conversation.isfavourite" name="fas-star"
-                [attr.aria-label]="'core.favourites' | translate">
-            </ion-icon>
-            <ion-icon *ngIf="conversation && conversation.ismuted" name="fas-bell-slash"
-                [attr.aria-label]="'addon.messages.mutedconversation' | translate">
-            </ion-icon>
-        </h1>
+        <ion-title>
+            <h1>
+                <img *ngIf="loaded && !otherMember && conversationImage" class="core-bar-button-image" [src]="conversationImage" alt=""
+                    onError="this.src='assets/img/group-avatar.png'" core-external-content role="presentation" [siteId]="siteId || null">
+                <core-user-avatar *ngIf="loaded && otherMember" class="core-bar-button-image" [user]="otherMember" [linkProfile]="false"
+                    [checkOnline]="otherMember.showonlinestatus">
+                </core-user-avatar>
+                <core-format-text [text]="title" contextLevel="system" [contextInstanceId]="0"></core-format-text>
+                <ion-icon *ngIf="conversation && conversation.isfavourite" name="fas-star"
+                    [attr.aria-label]="'core.favourites' | translate">
+                </ion-icon>
+                <ion-icon *ngIf="conversation && conversation.ismuted" name="fas-bell-slash"
+                    [attr.aria-label]="'addon.messages.mutedconversation' | translate">
+                </ion-icon>
+            </h1>
+        </ion-title>
         <ion-buttons slot="end"></ion-buttons>
     </ion-toolbar>
     <core-navbar-buttons slot="end">
         <core-context-menu [attr.aria-label]="'addon.messages.conversationactions' | translate">
             <core-context-menu-item [hidden]="isSelf || !showInfo || isGroup" [priority]="1000"
-                [content]="'addon.messages.info' | translate" (action)="viewInfo()"
-                iconAction="fas-info-circle"></core-context-menu-item>
+                [content]="'addon.messages.info' | translate" (action)="viewInfo()" iconAction="fas-info-circle"></core-context-menu-item>
             <core-context-menu-item [hidden]="isSelf || !showInfo || !isGroup" [priority]="1000"
-                [content]="'addon.messages.groupinfo' | translate" (action)="viewInfo()"
-                iconAction="fas-info-circle"></core-context-menu-item>
-            <core-context-menu-item [hidden]="!groupMessagingEnabled || !conversation" [priority]="800"
-                [content]="(conversation && conversation.isfavourite ? 'addon.messages.removefromfavourites' :
-                'addon.messages.addtofavourites') | translate"
-                (action)="changeFavourite($event)" [closeOnClick]="false" [iconAction]="favouriteIcon"
-                [iconSlash]="favouriteIconSlash"></core-context-menu-item>
+                [content]="'addon.messages.groupinfo' | translate" (action)="viewInfo()" iconAction="fas-info-circle">
+            </core-context-menu-item>
+            <core-context-menu-item [hidden]="!groupMessagingEnabled || !conversation" [priority]="800" [content]="(conversation && conversation.isfavourite ? 'addon.messages.removefromfavourites' :
+                'addon.messages.addtofavourites') | translate" (action)="changeFavourite($event)" [closeOnClick]="false"
+                [iconAction]="favouriteIcon" [iconSlash]="favouriteIconSlash"></core-context-menu-item>
             <core-context-menu-item [hidden]="isSelf || !otherMember || otherMember.isblocked" [priority]="700"
                 [content]="'addon.messages.blockuser' | translate" (action)="blockUser()" [iconAction]="blockIcon">
             </core-context-menu-item>
             <core-context-menu-item [hidden]="isSelf || !otherMember || !otherMember.isblocked" [priority]="700"
                 [content]="'addon.messages.unblockuser' | translate" (action)="unblockUser()" [iconAction]="blockIcon">
             </core-context-menu-item>
-            <core-context-menu-item [hidden]="isSelf || !muteEnabled || !conversation" [priority]="600"
-                [content]="(conversation && conversation.ismuted ? 'addon.messages.unmuteconversation' :
+            <core-context-menu-item [hidden]="isSelf || !muteEnabled || !conversation" [priority]="600" [content]="(conversation && conversation.ismuted ? 'addon.messages.unmuteconversation' :
                 'addon.messages.muteconversation') | translate" (action)="changeMute($event)" [closeOnClick]="false"
                 [iconAction]="muteIcon"></core-context-menu-item>
             <core-context-menu-item [hidden]="!canDelete || !messages || !messages.length" [priority]="400"
-                [content]="'addon.messages.showdeletemessages' | translate"
-                iconAction="toggle" [(toggle)]="showDelete"></core-context-menu-item>
+                [content]="'addon.messages.showdeletemessages' | translate" iconAction="toggle" [(toggle)]="showDelete">
+            </core-context-menu-item>
             <core-context-menu-item [hidden]="!groupMessagingEnabled || !conversationId || isGroup || !messages || !messages.length"
                 [priority]="200" [content]="'addon.messages.deleteconversation' | translate" (action)="deleteConversation($event)"
                 [closeOnClick]="false" [iconAction]="deleteIcon"></core-context-menu-item>
             <core-context-menu-item
-                [hidden]="isSelf || !otherMember || otherMember.iscontact || requestContactSent || requestContactReceived"
-                [priority]="100" [content]="'addon.messages.addtoyourcontacts' | translate" (action)="createContactRequest()"
-                [iconAction]="addRemoveIcon"></core-context-menu-item>
+                [hidden]="isSelf || !otherMember || otherMember.iscontact || requestContactSent || requestContactReceived" [priority]="100"
+                [content]="'addon.messages.addtoyourcontacts' | translate" (action)="createContactRequest()" [iconAction]="addRemoveIcon">
+            </core-context-menu-item>
             <core-context-menu-item [hidden]="isSelf || !otherMember || !otherMember.iscontact" [priority]="100"
-                [content]="'addon.messages.removefromyourcontacts' | translate" (action)="removeContact()"
-                [iconAction]="addRemoveIcon" [iconSlash]="true"></core-context-menu-item>
+                [content]="'addon.messages.removefromyourcontacts' | translate" (action)="removeContact()" [iconAction]="addRemoveIcon"
+                [iconSlash]="true"></core-context-menu-item>
         </core-context-menu>
     </core-navbar-buttons>
 </ion-header>
@@ -72,15 +69,13 @@
 
         <h2 class="sr-only">{{ title }}</h2>
 
-        <ion-list class="addon-messages-discussion-container" [class.addon-messages-discussion-group]="isGroup"
-            [attr.aria-live]="'polite'">
+        <ion-list class="addon-messages-discussion-container" [class.addon-messages-discussion-group]="isGroup" [attr.aria-live]="'polite'">
             <ng-container *ngFor="let message of messages; index as index; last as last">
                 <h3 class="ion-text-center addon-messages-date" *ngIf="message.showDate">
                     {{ message.timecreated | coreFormatDate: "strftimedayshort" }}
                 </h3>
 
-                <ion-chip class="addon-messages-unreadfrom" *ngIf="unreadMessageFrom && message.id == unreadMessageFrom"
-                    color="light">
+                <ion-chip class="addon-messages-unreadfrom" *ngIf="unreadMessageFrom && message.id == unreadMessageFrom" color="light">
                     <ion-label>{{ 'addon.messages.newmessages' | translate }}</ion-label>
                     <ion-icon name="fas-arrow-down" aria-hidden="true"></ion-icon>
                 </ion-chip>
@@ -93,8 +88,7 @@
                     <ion-label>
                         <!-- User data. -->
                         <div *ngIf="message.showUserData" class="item-heading addon-message-user">
-                            <core-user-avatar slot="start" [user]="members[message.useridfrom]" [linkProfile]="false"
-                                aria-hidden="true">
+                            <core-user-avatar slot="start" [user]="members[message.useridfrom]" [linkProfile]="false" aria-hidden="true">
                             </core-user-avatar>
                             <div>{{ members[message.useridfrom].fullname }}</div>
                         </div>
diff --git a/src/addons/messages/pages/discussions-35/discussions.html b/src/addons/messages/pages/discussions-35/discussions.html
index 8824fe578..63fa5426d 100644
--- a/src/addons/messages/pages/discussions-35/discussions.html
+++ b/src/addons/messages/pages/discussions-35/discussions.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ 'addon.messages.messages' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'addon.messages.messages' | translate }}</h1>
+        </ion-title>
         <ion-buttons slot="end">
             <core-user-menu-button></core-user-menu-button>
         </ion-buttons>
@@ -15,9 +17,9 @@
             <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
         </ion-refresher>
 
-        <core-search-box (onSubmit)="searchMessage($event)" (onClear)="clearSearch()"
-            [placeholder]=" 'addon.messages.message' | translate" autocorrect="off" spellcheck="false" lengthCheck="2"
-            [disabled]="!loaded" searchArea="AddonMessagesDiscussions" [autoFocus]="false"></core-search-box>
+        <core-search-box (onSubmit)="searchMessage($event)" (onClear)="clearSearch()" [placeholder]=" 'addon.messages.message' | translate"
+            autocorrect="off" spellcheck="false" lengthCheck="2" [disabled]="!loaded" searchArea="AddonMessagesDiscussions"
+            [autoFocus]="false"></core-search-box>
 
         <core-loading [hideUntil]="loaded" [message]="loadingMessage">
 
@@ -26,7 +28,9 @@
                 <ion-item class="ion-text-wrap addon-message-discussion" (click)="gotoContacts()"
                     [attr.aria-label]="'addon.messages.contacts' | translate" detail="true" button>
                     <ion-icon name="fas-address-book" slot="start" aria-hidden="true"></ion-icon>
-                    <ion-label><h2>{{ 'addon.messages.contacts' | translate }}</h2></ion-label>
+                    <ion-label>
+                        <h2>{{ 'addon.messages.contacts' | translate }}</h2>
+                    </ion-label>
                 </ion-item>
 
                 <ng-container *ngIf="search.showResults">
@@ -34,7 +38,9 @@
                         <ion-label>
                             <h2>{{ 'core.searchresults' | translate }}</h2>
                         </ion-label>
-                        <ion-note slot="end" class="ion-padding-end"><ion-badge>{{ search.results.length }}</ion-badge></ion-note>
+                        <ion-note slot="end" class="ion-padding-end">
+                            <ion-badge>{{ search.results.length }}</ion-badge>
+                        </ion-note>
                     </ion-item-divider>
                     <ion-item class="ion-text-wrap addon-message-discussion" *ngFor="let result of search.results" button
                         [attr.aria-label]="result.fullname" (click)="gotoDiscussion(result.userid, result.messageid)"
@@ -42,8 +48,10 @@
                         <core-user-avatar [user]="result" slot="start" [checkOnline]="result.showonlinestatus"></core-user-avatar>
                         <ion-label>
                             <p class="item-heading">{{ result.fullname }}</p>
-                            <p><core-format-text clean="true" singleLine="true" [text]="result.lastmessage" contextLevel="system"
-                                [contextInstanceId]="0"></core-format-text></p>
+                            <p>
+                                <core-format-text clean="true" singleLine="true" [text]="result.lastmessage" contextLevel="system"
+                                    [contextInstanceId]="0"></core-format-text>
+                            </p>
                         </ion-label>
                     </ion-item>
                 </ng-container>
@@ -67,8 +75,8 @@
                                 </ion-note>
                             </div>
                             <p>
-                                <core-format-text clean="true" singleLine="true" [text]="discussion.message!.message"
-                                    contextLevel="system" [contextInstanceId]="0">
+                                <core-format-text clean="true" singleLine="true" [text]="discussion.message!.message" contextLevel="system"
+                                    [contextInstanceId]="0">
                                 </core-format-text>
                             </p>
                         </ion-label>
diff --git a/src/addons/messages/pages/group-conversations/group-conversations.html b/src/addons/messages/pages/group-conversations/group-conversations.html
index d55475d6c..bfd14752d 100644
--- a/src/addons/messages/pages/group-conversations/group-conversations.html
+++ b/src/addons/messages/pages/group-conversations/group-conversations.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ 'addon.messages.messages' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'addon.messages.messages' | translate }}</h1>
+        </ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="gotoSearch()" [attr.aria-label]="'addon.messages.searchcombined' | translate">
                 <ion-icon name="fas-search" slot="icon-only" aria-hidden="true"></ion-icon>
@@ -25,28 +27,25 @@
             <ion-list>
                 <ion-item class="ion-text-wrap addon-message-discussion" (click)="gotoContacts()" detail="true" button>
                     <ion-icon name="fas-address-book" slot="start" aria-hidden="true"></ion-icon>
-                    <ion-label><h2>{{ 'addon.messages.contacts' | translate }}</h2></ion-label>
+                    <ion-label>
+                        <h2>{{ 'addon.messages.contacts' | translate }}</h2>
+                    </ion-label>
                     <ion-badge *ngIf="contactRequestsCount > 0" slot="end" aria-hidden="true">{{contactRequestsCount}}</ion-badge>
                     <span *ngIf="contactRequestsCount > 0" class="sr-only">
                         {{ 'addon.messages.pendingcontactrequests' | translate:{$a: contactRequestsCount} }}
                     </span>
                 </ion-item>
                 <!-- Favourite conversations. -->
-                <ion-item
-                    button
-                    class="ion-text-wrap divider"
-                    (click)="toggle(favourites)"
-                    sticky="true"
+                <ion-item button class="ion-text-wrap divider" (click)="toggle(favourites)" sticky="true"
                     [attr.aria-label]="(favourites.expanded ? 'core.collapse' : 'core.expand') | translate"
-                    [attr.aria-expanded]="favourites.expanded"
-                    aria-controls="addon-messages-groupconversations-favourite"
-                    role="heading"
-                    detail="false"
-                >
+                    [attr.aria-expanded]="favourites.expanded" aria-controls="addon-messages-groupconversations-favourite" role="heading"
+                    detail="false">
                     <ion-icon *ngIf="!favourites.expanded" name="fas-caret-right" flip-rtl slot="start" aria-hidden="true">
                     </ion-icon>
                     <ion-icon *ngIf="favourites.expanded" name="fas-caret-down" slot="start" aria-hidden="true"></ion-icon>
-                    <ion-label><h2>{{ 'core.favourites' | translate }} ({{ favourites.count }})</h2></ion-label>
+                    <ion-label>
+                        <h2>{{ 'core.favourites' | translate }} ({{ favourites.count }})</h2>
+                    </ion-label>
                     <ion-badge slot="end" *ngIf="favourites.unread" aria-hidden="true">{{ favourites.unread }}</ion-badge>
                     <span *ngIf="favourites.unread" class="sr-only">
                         {{ 'addon.messages.unreadconversations' | translate:{$a: favourites.unread} }}
@@ -60,28 +59,26 @@
                     <core-infinite-loading [enabled]="favourites.canLoadMore" (action)="loadMoreConversations(favourites, $event)"
                         [error]="favourites.loadMoreError"></core-infinite-loading>
                     <ion-item class="ion-text-wrap" *ngIf="favourites.conversations && favourites.conversations.length == 0">
-                        <ion-label><p>{{ 'addon.messages.nofavourites' | translate }}</p></ion-label>
+                        <ion-label>
+                            <p>{{ 'addon.messages.nofavourites' | translate }}</p>
+                        </ion-label>
                     </ion-item>
                 </div>
                 <ion-item class="ion-text-center" *ngIf="favourites.loading">
-                    <ion-label><ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner></ion-label>
+                    <ion-label>
+                        <ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner>
+                    </ion-label>
                 </ion-item>
 
                 <!-- Group conversations. -->
-                <ion-item
-                    button
-                    class="divider ion-text-wrap"
-                    (click)="toggle(group)"
-                    sticky="true"
-                    [attr.aria-label]="(group.expanded ? 'core.collapse' : 'core.expand') | translate"
-                    [attr.aria-expanded]="group.expanded"
-                    aria-controls="addon-messages-groupconversations-group"
-                    role="heading"
-                    detail="false"
-                >
+                <ion-item button class="divider ion-text-wrap" (click)="toggle(group)" sticky="true"
+                    [attr.aria-label]="(group.expanded ? 'core.collapse' : 'core.expand') | translate" [attr.aria-expanded]="group.expanded"
+                    aria-controls="addon-messages-groupconversations-group" role="heading" detail="false">
                     <ion-icon *ngIf="!group.expanded" name="fas-caret-right" flip-rtl slot="start" aria-hidden="true"></ion-icon>
                     <ion-icon *ngIf="group.expanded" name="fas-caret-down" slot="start" aria-hidden="true"></ion-icon>
-                    <ion-label><h2>{{ 'addon.messages.groupconversations' | translate }} ({{ group.count }})</h2></ion-label>
+                    <ion-label>
+                        <h2>{{ 'addon.messages.groupconversations' | translate }} ({{ group.count }})</h2>
+                    </ion-label>
                     <ion-badge slot="end" *ngIf="group.unread" aria-hidden="true">{{ group.unread }}</ion-badge>
                     <span *ngIf="group.unread" class="sr-only">
                         {{ 'addon.messages.unreadconversations' | translate:{$a: group.unread} }}
@@ -95,24 +92,21 @@
                     <core-infinite-loading [enabled]="group.canLoadMore" (action)="loadMoreConversations(group, $event)"
                         [error]="group.loadMoreError"></core-infinite-loading>
                     <ion-item class="ion-text-wrap" *ngIf="group.conversations && group.conversations.length == 0">
-                        <ion-label><p>{{ 'addon.messages.nogroupconversations' | translate }}</p></ion-label>
+                        <ion-label>
+                            <p>{{ 'addon.messages.nogroupconversations' | translate }}</p>
+                        </ion-label>
                     </ion-item>
                 </div>
                 <ion-item class="ion-text-center" *ngIf="group.loading">
-                    <ion-label><ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner></ion-label>
+                    <ion-label>
+                        <ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner>
+                    </ion-label>
                 </ion-item>
 
-                <ion-item
-                    button
-                    class="divider ion-text-wrap"
-                    (click)="toggle(individual)"
-                    sticky="true"
+                <ion-item button class="divider ion-text-wrap" (click)="toggle(individual)" sticky="true"
                     [attr.aria-label]="(individual.expanded ? 'core.collapse' : 'core.expand') | translate"
-                    [attr.aria-expanded]="individual.expanded"
-                    aria-controls="addon-messages-groupconversations-individual"
-                    role="heading"
-                    detail="false"
-                >
+                    [attr.aria-expanded]="individual.expanded" aria-controls="addon-messages-groupconversations-individual" role="heading"
+                    detail="false">
                     <ion-icon *ngIf="!individual.expanded" name="fas-caret-right" flip-rtl slot="start" aria-hidden="true">
                     </ion-icon>
                     <ion-icon *ngIf="individual.expanded" name="fas-caret-down" slot="start" aria-hidden="true"></ion-icon>
@@ -132,11 +126,15 @@
                     <core-infinite-loading [enabled]="individual.canLoadMore" (action)="loadMoreConversations(individual, $event)"
                         [error]="individual.loadMoreError"></core-infinite-loading>
                     <ion-item class="ion-text-wrap" *ngIf="individual.conversations && individual.conversations.length == 0">
-                        <ion-label><p>{{ 'addon.messages.noindividualconversations' | translate }}</p></ion-label>
+                        <ion-label>
+                            <p>{{ 'addon.messages.noindividualconversations' | translate }}</p>
+                        </ion-label>
                     </ion-item>
                 </div>
                 <ion-item class="ion-text-center" *ngIf="individual.loading">
-                    <ion-label><ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner></ion-label>
+                    <ion-label>
+                        <ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner>
+                    </ion-label>
                 </ion-item>
 
             </ion-list>
@@ -147,28 +145,27 @@
 <!-- Template to render a list of conversations. -->
 <ng-template #conversationsTemplate let-conversations="conversations">
     <ion-item class="ion-text-wrap addon-message-discussion" *ngFor="let conversation of conversations" button detail="false"
-        [attr.aria-label]="conversation.name" (click)="gotoConversation(conversation.id, conversation.userid)"
-        [attr.aria-current]="((conversation.id && conversation.id == selectedConversationId) ||
+        [attr.aria-label]="conversation.name" (click)="gotoConversation(conversation.id, conversation.userid)" [attr.aria-current]="((conversation.id && conversation.id == selectedConversationId) ||
             (conversation.userid && conversation.userid == selectedUserId)) ? 'page': 'false'"
         id="addon-message-conversation-{{ conversation.id ? conversation.id : 'user-' + conversation.userid }}">
         <!-- Group conversation image. -->
         <ion-avatar slot="start" *ngIf="conversation.type == typeGroup">
             <img [src]="conversation.imageurl" [alt]="conversation.name" core-external-content
-            onError="this.src='assets/img/group-avatar.png'">
+                onError="this.src='assets/img/group-avatar.png'">
         </ion-avatar>
 
         <!-- Avatar for individual conversations. -->
-        <core-user-avatar *ngIf="conversation.type != typeGroup" core-user-avatar [user]="conversation.otherUser"
-            [linkProfile]="false" [checkOnline]="conversation.showonlinestatus" slot="start"></core-user-avatar>
+        <core-user-avatar *ngIf="conversation.type != typeGroup" core-user-avatar [user]="conversation.otherUser" [linkProfile]="false"
+            [checkOnline]="conversation.showonlinestatus" slot="start"></core-user-avatar>
 
         <ion-label>
             <div class="flex-row ion-justify-content-between">
                 <p class="item-heading">
                     <core-format-text [text]="conversation.name" contextLevel="system" [contextInstanceId]="0"></core-format-text>
-                    <ion-icon name="fas-user-slash" *ngIf="conversation.isblocked"
-                        [title]="'addon.messages.contactblocked' | translate"></ion-icon>
-                    <ion-icon *ngIf="conversation.ismuted" name="fas-volume-mute"
-                        [title]="'addon.messages.mutedconversation' | translate"></ion-icon>
+                    <ion-icon name="fas-user-slash" *ngIf="conversation.isblocked" [title]="'addon.messages.contactblocked' | translate">
+                    </ion-icon>
+                    <ion-icon *ngIf="conversation.ismuted" name="fas-volume-mute" [title]="'addon.messages.mutedconversation' | translate">
+                    </ion-icon>
                 </p>
                 <ion-note *ngIf="conversation.lastmessagedate > 0 || conversation.unreadcount">
                     <span *ngIf="conversation.lastmessagedate > 0" class="addon-message-last-message-date">
@@ -180,16 +177,17 @@
                     </span>
                 </ion-note>
             </div>
-            <p *ngIf="conversation.subname"><core-format-text [text]="conversation.subname" contextLevel="system"
-                [contextInstanceId]="0"></core-format-text></p>
+            <p *ngIf="conversation.subname">
+                <core-format-text [text]="conversation.subname" contextLevel="system" [contextInstanceId]="0"></core-format-text>
+            </p>
             <p class="addon-message-last-message">
                 <span *ngIf="conversation.sentfromcurrentuser" class="addon-message-last-message-user">
                     {{ 'addon.messages.you' | translate }}
                 </span>
                 <span *ngIf="!conversation.sentfromcurrentuser && conversation.type == typeGroup && conversation.members[0]"
                     class="addon-message-last-message-user">{{ conversation.members[0].fullname + ':' }}</span>
-                <core-format-text clean="true" singleLine="true" [text]="conversation.lastmessage"
-                    class="addon-message-last-message-text" contextLevel="system" [contextInstanceId]="0"></core-format-text>
+                <core-format-text clean="true" singleLine="true" [text]="conversation.lastmessage" class="addon-message-last-message-text"
+                    contextLevel="system" [contextInstanceId]="0"></core-format-text>
             </p>
         </ion-label>
     </ion-item>
diff --git a/src/addons/messages/pages/search/search.html b/src/addons/messages/pages/search/search.html
index d3700d20e..6c5d98f08 100644
--- a/src/addons/messages/pages/search/search.html
+++ b/src/addons/messages/pages/search/search.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ 'addon.messages.searchcombined' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'addon.messages.searchcombined' | translate }}</h1>
+        </ion-title>
         <ion-buttons slot="end">
         </ion-buttons>
     </ion-toolbar>
@@ -23,8 +25,7 @@
                     [error]="messages.loadMoreError"></core-infinite-loading>
             </ion-list>
 
-            <core-empty-box
-                *ngIf="displayResults && !contacts.results.length && !nonContacts.results.length && !messages.results.length"
+            <core-empty-box *ngIf="displayResults && !contacts.results.length && !nonContacts.results.length && !messages.results.length"
                 icon="fas-search" [message]="'core.noresults' | translate">
             </core-empty-box>
         </core-loading>
@@ -35,20 +36,20 @@
 <ng-template #resultsTemplate let-item="item">
     <ng-container *ngIf="item.results.length > 0">
         <ion-item-divider class="ion-text-wrap">
-            <ion-label><h2>{{ item.titleString | translate }}</h2></ion-label>
+            <ion-label>
+                <h2>{{ item.titleString | translate }}</h2>
+            </ion-label>
         </ion-item-divider>
 
         <!-- List of results -->
         <ion-item class="addon-message-discussion ion-text-wrap" *ngFor="let result of item.results" [attr.aria-label]="result.fullname"
-            (click)="openConversation(result)" [attr.aria-current]="result == selectedResult ? 'page' : 'false'" detail="true"
-            button>
+            (click)="openConversation(result)" [attr.aria-current]="result == selectedResult ? 'page' : 'false'" detail="true" button>
             <core-user-avatar slot="start" [user]="result" [checkOnline]="true" [linkProfile]="false"></core-user-avatar>
             <ion-label>
                 <p class="item-heading">
                     <core-format-text [text]="result.fullname" [highlight]="result.highlightName" [filter]="false">
                     </core-format-text>
-                    <ion-icon name="fas-ban" *ngIf="result.isblocked"
-                        [attr.aria-label]="'addon.messages.contactblocked' | translate">
+                    <ion-icon name="fas-ban" *ngIf="result.isblocked" [attr.aria-label]="'addon.messages.contactblocked' | translate">
                     </ion-icon>
                 </p>
                 <ion-note *ngIf="result.lastmessagedate > 0">
@@ -58,9 +59,8 @@
                     <span *ngIf="result.sentfromcurrentuser" class="addon-message-last-message-user">
                         {{ 'addon.messages.you' | translate }}
                     </span>
-                    <core-format-text clean="true" singleLine="true" [text]="result.lastmessage"
-                        [highlight]="result.highlightMessage" contextLevel="system" [contextInstanceId]="0"
-                        class="addon-message-last-message-text"></core-format-text>
+                    <core-format-text clean="true" singleLine="true" [text]="result.lastmessage" [highlight]="result.highlightMessage"
+                        contextLevel="system" [contextInstanceId]="0" class="addon-message-last-message-text"></core-format-text>
                 </p>
             </ion-label>
         </ion-item>
diff --git a/src/addons/messages/pages/settings/settings.html b/src/addons/messages/pages/settings/settings.html
index 9a1721a24..997cc0277 100644
--- a/src/addons/messages/pages/settings/settings.html
+++ b/src/addons/messages/pages/settings/settings.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ 'addon.messages.messages' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'addon.messages.messages' | translate }}</h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
@@ -14,15 +16,17 @@
         <!-- Contactable privacy. -->
         <ion-card>
             <ion-item *ngIf="!advancedContactable">
-              <ion-label>{{ 'addon.messages.blocknoncontacts' | translate }}</ion-label>
-              <ion-toggle [(ngModel)]="contactablePrivacy" (ngModelChange)="saveContactablePrivacy(contactablePrivacy)">
-              </ion-toggle>
+                <ion-label>{{ 'addon.messages.blocknoncontacts' | translate }}</ion-label>
+                <ion-toggle [(ngModel)]="contactablePrivacy" (ngModelChange)="saveContactablePrivacy(contactablePrivacy)">
+                </ion-toggle>
             </ion-item>
 
             <ion-list *ngIf="advancedContactable" class="ion-text-wrap">
                 <ion-radio-group [(ngModel)]="contactablePrivacy" (ionChange)="saveContactablePrivacy(contactablePrivacy)">
                     <ion-item-divider>
-                        <ion-label><h2>{{ 'addon.messages.contactableprivacy' | translate }}</h2></ion-label>
+                        <ion-label>
+                            <h2>{{ 'addon.messages.contactableprivacy' | translate }}</h2>
+                        </ion-label>
                     </ion-item-divider>
                     <ion-item>
                         <ion-label>{{ 'addon.messages.contactableprivacy_onlycontacts' | translate }}</ion-label>
@@ -66,16 +70,9 @@
                         <ng-container *ngIf="groupMessagingEnabled">
                             <ion-item class="ion-text-wrap">
                                 <ion-label>{{ processor.displayname }}</ion-label>
-                                <core-button-with-spinner
-                                    *ngIf="!preferences.disableall"
-                                    [loading]="!!notification.updating"
-                                    slot="end"
-                                >
-                                    <ion-toggle
-                                        *ngIf="!processor.locked"
-                                        [(ngModel)]="processor.checked"
-                                        (ngModelChange)="changePreference(notification, '', processor)"
-                                    >
+                                <core-button-with-spinner *ngIf="!preferences.disableall" [loading]="!!notification.updating" slot="end">
+                                    <ion-toggle *ngIf="!processor.locked" [(ngModel)]="processor.checked"
+                                        (ngModelChange)="changePreference(notification, '', processor)">
                                     </ion-toggle>
                                     <ion-note *ngIf="processor.locked">
                                         {{ processor.lockedmessage }}
@@ -92,15 +89,11 @@
                             <ion-row class="ion-text-wrap ion-hide-md-down ion-align-items-center">
                                 <ion-col class="ion-margin-horizontal">{{ processor.displayname }}</ion-col>
                                 <ion-col size="2" class="ion-text-center" *ngFor="let state of ['loggedin', 'loggedoff']">
-                                    <core-button-with-spinner
-                                        *ngIf="!preferences.disableall"
-                                        [loading]="notification.updating && notification.updating[state]"
-                                    >
+                                    <core-button-with-spinner *ngIf="!preferences.disableall"
+                                        [loading]="notification.updating && notification.updating[state]">
                                         <!-- If notifications not disabled, show toggle. -->
-                                        <ion-toggle *ngIf="!processor.locked"
-                                            [(ngModel)]="processor[state].checked"
-                                            (ngModelChange)="changePreference(notification, state, processor)"
-                                        >
+                                        <ion-toggle *ngIf="!processor.locked" [(ngModel)]="processor[state].checked"
+                                            (ngModelChange)="changePreference(notification, state, processor)">
                                         </ion-toggle>
                                         <div class="ion-padding text-gray" *ngIf="processor.locked">
                                             {{'core.settings.locked' | translate }}
@@ -118,14 +111,10 @@
                                 If notifications are disabled, show "Disabled" instead of toggle. -->
                             <ion-item *ngFor="let state of ['loggedin', 'loggedoff']" class="ion-text-wrap ion-hide-md-up">
                                 <ion-label>{{ 'core.settings.' + state | translate }}</ion-label>
-                                <core-button-with-spinner slot="end"
-                                    *ngIf="!preferences.disableall"
-                                    [loading]="notification.updating && notification.updating[state]"
-                                >
-                                    <ion-toggle *ngIf="!processor.locked"
-                                        [(ngModel)]="processor[state].checked"
-                                        (ngModelChange)="changePreference(notification, state, processor)"
-                                    >
+                                <core-button-with-spinner slot="end" *ngIf="!preferences.disableall"
+                                    [loading]="notification.updating && notification.updating[state]">
+                                    <ion-toggle *ngIf="!processor.locked" [(ngModel)]="processor[state].checked"
+                                        (ngModelChange)="changePreference(notification, state, processor)">
                                     </ion-toggle>
                                     <ion-note *ngIf="processor.locked">
                                         {{'core.settings.locked' | translate }}
@@ -144,7 +133,11 @@
         <!-- General settings. -->
         <ion-card>
             <ion-list class="ion-text-wrap">
-                <ion-item-divider><ion-label><h2>{{ 'core.settings.general' | translate }}</h2></ion-label></ion-item-divider>
+                <ion-item-divider>
+                    <ion-label>
+                        <h2>{{ 'core.settings.general' | translate }}</h2>
+                    </ion-label>
+                </ion-item-divider>
                 <ion-item class="ion-text-wrap">
                     <ion-label>
                         <p class="item-heading">{{ 'addon.messages.useentertosend' | translate }}</p>
diff --git a/src/addons/mod/assign/components/edit-feedback-modal/edit-feedback-modal.html b/src/addons/mod/assign/components/edit-feedback-modal/edit-feedback-modal.html
index 6e5868cce..f24b5d9b3 100644
--- a/src/addons/mod/assign/components/edit-feedback-modal/edit-feedback-modal.html
+++ b/src/addons/mod/assign/components/edit-feedback-modal/edit-feedback-modal.html
@@ -1,6 +1,8 @@
 <ion-header>
     <ion-toolbar>
-        <h2>{{ plugin.name }}</h2>
+        <ion-title>
+            <h2>{{ plugin.name }}</h2>
+        </ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
                 <ion-icon slot="icon-only" name="fas-times" aria-hidden="true"></ion-icon>
@@ -10,8 +12,7 @@
 </ion-header>
 <ion-content>
     <form name="addon-mod_assign-edit-feedback-form" *ngIf="userId && plugin" #editFeedbackForm>
-        <addon-mod-assign-feedback-plugin [assign]="assign" [submission]="submission" [userId]="userId"
-            [plugin]="plugin" [edit]="true">
+        <addon-mod-assign-feedback-plugin [assign]="assign" [submission]="submission" [userId]="userId" [plugin]="plugin" [edit]="true">
         </addon-mod-assign-feedback-plugin>
         <ion-button expand="block" (click)="done($event)">{{ 'core.done' | translate }}</ion-button>
     </form>
diff --git a/src/addons/mod/assign/pages/edit/edit.html b/src/addons/mod/assign/pages/edit/edit.html
index 0b4882748..fab97200b 100644
--- a/src/addons/mod/assign/pages/edit/edit.html
+++ b/src/addons/mod/assign/pages/edit/edit.html
@@ -3,10 +3,12 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="moduleId" [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="moduleId" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="save()">
                 {{ 'core.save' | translate }}
diff --git a/src/addons/mod/assign/pages/index/index.html b/src/addons/mod/assign/pages/index/index.html
index c64cbdfdd..0d424c637 100644
--- a/src/addons/mod/assign/pages/index/index.html
+++ b/src/addons/mod/assign/pages/index/index.html
@@ -3,10 +3,12 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
 
         <ion-buttons slot="end">
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addons/mod/assign/pages/submission-list/submission-list.html b/src/addons/mod/assign/pages/submission-list/submission-list.html
index 6485d2520..3d9cb57a0 100644
--- a/src/addons/mod/assign/pages/submission-list/submission-list.html
+++ b/src/addons/mod/assign/pages/submission-list/submission-list.html
@@ -3,10 +3,12 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="moduleId" [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="moduleId" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
 
         <ion-buttons slot="end"></ion-buttons>
     </ion-toolbar>
diff --git a/src/addons/mod/assign/pages/submission-review/submission-review.html b/src/addons/mod/assign/pages/submission-review/submission-review.html
index fa5c6d28a..227dfca1d 100644
--- a/src/addons/mod/assign/pages/submission-review/submission-review.html
+++ b/src/addons/mod/assign/pages/submission-review/submission-review.html
@@ -3,10 +3,12 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="moduleId" [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="moduleId" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
 
         <ion-buttons slot="end"></ion-buttons>
     </ion-toolbar>
diff --git a/src/addons/mod/book/components/toc/toc.html b/src/addons/mod/book/components/toc/toc.html
index 7028b51d4..42165ea28 100644
--- a/src/addons/mod/book/components/toc/toc.html
+++ b/src/addons/mod/book/components/toc/toc.html
@@ -1,6 +1,8 @@
 <ion-header>
     <ion-toolbar>
-        <h1>{{ 'addon.mod_book.toc' | translate }}</h1>
+        <ion-title>
+            <h2>{{ 'addon.mod_book.toc' | translate }}</h2>
+        </ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
                 <ion-icon name="fas-times" slot="icon-only" aria-hidden=true></ion-icon>
@@ -12,14 +14,12 @@
     <nav>
         <ion-list>
             <ion-item class="ion-text-wrap" *ngFor="let chapter of chapters" (click)="loadChapter(chapter.id)"
-                [attr.aria-current]="selected == chapter.id ? 'page' : 'false'" button
-                [class.item-dimmed]="chapter.hidden" detail="false">
+                [attr.aria-current]="selected == chapter.id ? 'page' : 'false'" button [class.item-dimmed]="chapter.hidden" detail="false">
                 <ion-label>
                     <p [class.ion-padding-start]="addPadding && chapter.level == 1 ? true : null" class="item-heading">
                         <span *ngIf="showNumbers" class="addon-mod-book-number">{{chapter.indexNumber}}&nbsp;</span>
                         <span *ngIf="showBullets" class="addon-mod-book-bullet">&bull;&nbsp;</span>
-                        <core-format-text [text]="chapter.title" contextLevel="module" [contextInstanceId]="moduleId"
-                            [courseId]="courseId">
+                        <core-format-text [text]="chapter.title" contextLevel="module" [contextInstanceId]="moduleId" [courseId]="courseId">
                         </core-format-text>
                     </p>
                 </ion-label>
diff --git a/src/addons/mod/book/pages/index/index.html b/src/addons/mod/book/pages/index/index.html
index 2d7faf457..2c06606d2 100644
--- a/src/addons/mod/book/pages/index/index.html
+++ b/src/addons/mod/book/pages/index/index.html
@@ -3,10 +3,12 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
         <ion-buttons slot="end">
             <!-- The buttons defined by the component will be added in here. -->
         </ion-buttons>
diff --git a/src/addons/mod/chat/components/users-modal/users-modal.html b/src/addons/mod/chat/components/users-modal/users-modal.html
index 248b463f5..b0b09c140 100644
--- a/src/addons/mod/chat/components/users-modal/users-modal.html
+++ b/src/addons/mod/chat/components/users-modal/users-modal.html
@@ -1,9 +1,8 @@
 <ion-header>
     <ion-toolbar>
-        <ion-buttons slot="start">
-            <ion-back-button [text]="'core.back' | translate"></ion-back-button>
-        </ion-buttons>
-        <h2>{{ 'addon.mod_chat.currentusers' | translate }}</h2>
+        <ion-title>
+            <h2>{{ 'addon.mod_chat.currentusers' | translate }}</h2>
+        </ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
                 <ion-icon slot="icon-only" name="fas-times" aria-hidden="true"></ion-icon>
@@ -13,8 +12,7 @@
 </ion-header>
 <ion-content>
     <core-loading [hideUntil]="usersLoaded">
-        <ion-item class="ion-text-wrap" *ngFor="let user of users"
-            [class.addon-mod-chat-user]="currentUserId != user.id && isOnline">
+        <ion-item class="ion-text-wrap" *ngFor="let user of users" [class.addon-mod-chat-user]="currentUserId != user.id && isOnline">
 
             <core-user-avatar [user]="user" slot="start" [linkProfile]="false"></core-user-avatar>
             <ion-label>
diff --git a/src/addons/mod/chat/pages/chat/chat.html b/src/addons/mod/chat/pages/chat/chat.html
index cd983f9f0..558eb4165 100644
--- a/src/addons/mod/chat/pages/chat/chat.html
+++ b/src/addons/mod/chat/pages/chat/chat.html
@@ -3,10 +3,12 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="cmId" [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="cmId" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" *ngIf="loaded" (click)="showChatUsers()" [attr.aria-label]="'core.users' | translate">
                 <ion-icon name="fas-users" slot="icon-only" aria-hidden="true"></ion-icon>
@@ -72,7 +74,7 @@
                             {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }}
                             <strong>
                                 {{ message.userfullname }} <core-format-text [text]="message.message" contextLevel="module"
-                                [contextInstanceId]="cmId" [courseId]="courseId" (afterRender)="last && scrollToBottom()">
+                                    [contextInstanceId]="cmId" [courseId]="courseId" (afterRender)="last && scrollToBottom()">
                                 </core-format-text>
                             </strong>
                         </span>
@@ -81,8 +83,7 @@
 
                 <ion-item *ngIf="!message.special" class="ion-text-wrap addon-message"
                     [class.addon-message-mine]="message.userid == currentUserId"
-                    [class.addon-message-not-mine]="message.userid != currentUserId"
-                    [class.addon-message-no-user]="!message.showUserData"
+                    [class.addon-message-not-mine]="message.userid != currentUserId" [class.addon-message-no-user]="!message.showUserData"
                     [@coreSlideInOut]="message.userid == currentUserId ? '' : 'fromLeft'">
                     <ion-label>
                         <!-- User data. -->
@@ -104,8 +105,7 @@
             </ng-container>
         </ion-list>
 
-        <core-empty-box *ngIf="!messages || messages.length <= 0" icon="far-comments"
-            [message]="'addon.mod_chat.nomessages' | translate">
+        <core-empty-box *ngIf="!messages || messages.length <= 0" icon="far-comments" [message]="'addon.mod_chat.nomessages' | translate">
         </core-empty-box>
     </core-loading>
 </ion-content>
diff --git a/src/addons/mod/chat/pages/index/index.html b/src/addons/mod/chat/pages/index/index.html
index de71fbf74..ed096fe29 100644
--- a/src/addons/mod/chat/pages/index/index.html
+++ b/src/addons/mod/chat/pages/index/index.html
@@ -3,10 +3,12 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
         <ion-buttons slot="end">
             <!-- The buttons defined by the component will be added in here. -->
         </ion-buttons>
diff --git a/src/addons/mod/chat/pages/session-messages/session-messages.html b/src/addons/mod/chat/pages/session-messages/session-messages.html
index 275819ac5..7d0a57911 100644
--- a/src/addons/mod/chat/pages/session-messages/session-messages.html
+++ b/src/addons/mod/chat/pages/session-messages/session-messages.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ 'addon.mod_chat.messages' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'addon.mod_chat.messages' | translate }}</h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
@@ -67,7 +69,7 @@
                             {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }}
                             <strong>
                                 {{ message.userfullname }} <core-format-text [text]="message.message" contextLevel="module"
-                                [contextInstanceId]="cmId" [courseId]="courseId"></core-format-text>
+                                    [contextInstanceId]="cmId" [courseId]="courseId"></core-format-text>
                             </strong>
                         </span>
                     </ion-badge>
@@ -75,8 +77,7 @@
 
                 <ion-item *ngIf="!message.special" class="ion-text-wrap addon-message"
                     [class.addon-message-mine]="message.userid == currentUserId"
-                    [class.addon-message-not-mine]="message.userid != currentUserId"
-                    [class.addon-message-no-user]="!message.showUserData">
+                    [class.addon-message-not-mine]="message.userid != currentUserId" [class.addon-message-no-user]="!message.showUserData">
                     <ion-label>
                         <!-- User data. -->
                         <h2 class="addon-message-user">
diff --git a/src/addons/mod/chat/pages/sessions/sessions.html b/src/addons/mod/chat/pages/sessions/sessions.html
index afd0cac47..d4f7bf45e 100644
--- a/src/addons/mod/chat/pages/sessions/sessions.html
+++ b/src/addons/mod/chat/pages/sessions/sessions.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ 'addon.mod_chat.chatreport' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'addon.mod_chat.chatreport' | translate }}</h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
diff --git a/src/addons/mod/choice/pages/index/index.html b/src/addons/mod/choice/pages/index/index.html
index 6f8b727cd..7c56322d2 100644
--- a/src/addons/mod/choice/pages/index/index.html
+++ b/src/addons/mod/choice/pages/index/index.html
@@ -3,10 +3,12 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
         <ion-buttons slot="end">
             <!-- The buttons defined by the component will be added in here. -->
         </ion-buttons>
diff --git a/src/addons/mod/data/components/search/search.html b/src/addons/mod/data/components/search/search.html
index d137cabcc..e7dee1e2e 100644
--- a/src/addons/mod/data/components/search/search.html
+++ b/src/addons/mod/data/components/search/search.html
@@ -1,9 +1,8 @@
 <ion-header>
     <ion-toolbar>
-        <ion-buttons slot="start">
-            <ion-back-button [text]="'core.back' | translate"></ion-back-button>
-        </ion-buttons>
-        <h2>{{ 'addon.mod_data.search' | translate }}</h2>
+        <ion-title>
+            <h2>{{ 'addon.mod_data.search' | translate }}</h2>
+        </ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
                 <ion-icon name="fas-times" slot="icon-only" aria-hidden=true></ion-icon>
@@ -20,14 +19,14 @@
         <ion-list class="ion-no-margin">
             <ion-item [hidden]="search.searchingAdvanced">
                 <ion-label class="sr-only">{{ 'addon.mod_data.search' | translate}}</ion-label>
-                <ion-input type="text" placeholder="{{ 'addon.mod_data.search' | translate}}"
-                    [(ngModel)]="search.text" name="text" formControlName="text">
+                <ion-input type="text" placeholder="{{ 'addon.mod_data.search' | translate}}" [(ngModel)]="search.text" name="text"
+                    formControlName="text">
                 </ion-input>
             </ion-item>
             <ion-item class="ion-text-wrap">
                 <ion-label position="stacked">{{ 'core.sortby' | translate }}</ion-label>
-                <ion-select interface="action-sheet" name="sortBy" formControlName="sortBy"
-                    [placeholder]="'core.sortby' | translate" [interfaceOptions]="{header: 'core.sortby' | translate}">
+                <ion-select interface="action-sheet" name="sortBy" formControlName="sortBy" [placeholder]="'core.sortby' | translate"
+                    [interfaceOptions]="{header: 'core.sortby' | translate}">
                     <optgroup *ngIf="fieldsArray.length" label="{{ 'addon.mod_data.fields' | translate }}">
                         <ion-select-option *ngFor="let field of fieldsArray" [value]="field.id">{{field.name}}</ion-select-option>
                     </optgroup>
@@ -42,7 +41,7 @@
                     </optgroup>
                 </ion-select>
             </ion-item>
-            <ion-list >
+            <ion-list>
                 <ion-radio-group [(ngModel)]="search.sortDirection" name="sortDirection" formControlName="sortDirection">
                     <ion-item>
                         <ion-label>{{ 'addon.mod_data.ascending' | translate }}</ion-label>
diff --git a/src/addons/mod/data/pages/edit/edit.html b/src/addons/mod/data/pages/edit/edit.html
index 05ec1f563..6ace095f7 100644
--- a/src/addons/mod/data/pages/edit/edit.html
+++ b/src/addons/mod/data/pages/edit/edit.html
@@ -3,10 +3,12 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
         <ion-buttons slot="end">
             <ion-button *ngIf="entry" fill="clear" (click)="save($event)">
                 {{ 'core.save' | translate }}
diff --git a/src/addons/mod/data/pages/entry/entry.html b/src/addons/mod/data/pages/entry/entry.html
index 539db3691..015b40c88 100644
--- a/src/addons/mod/data/pages/entry/entry.html
+++ b/src/addons/mod/data/pages/entry/entry.html
@@ -3,15 +3,16 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-refresher slot="fixed"
-        [disabled]="!entryLoaded || !(isPullingToRefresh || !renderingEntry && !loadingRating && !loadingComments)"
+    <ion-refresher slot="fixed" [disabled]="!entryLoaded || !(isPullingToRefresh || !renderingEntry && !loadingRating && !loadingComments)"
         (ionRefresh)="refreshDatabase($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
@@ -40,23 +41,23 @@
         <div class="addon-data-contents addon-data-entry addon-data-entries-{{database.id}}" *ngIf="database && entry">
             <core-style [css]="database.csstemplate" prefix=".addon-data-entries-{{database.id}}"></core-style>
 
-            <core-compile-html [text]="entryHtml" [jsData]="jsData" [extraImports]="extraImports"
-                (compiling)="setRenderingEntry($event)"></core-compile-html>
+            <core-compile-html [text]="entryHtml" [jsData]="jsData" [extraImports]="extraImports" (compiling)="setRenderingEntry($event)">
+            </core-compile-html>
         </div>
 
-        <core-rating-rate *ngIf="database && entry && ratingInfo && (!database.approval || entry.approved)"
-            [ratingInfo]="ratingInfo" contextLevel="module" [instanceId]="database.coursemodule" [itemId]="entry.id" [itemSetId]="0"
-            [courseId]="courseId" [aggregateMethod]="database.assessed" [scaleId]="database.scale" [userId]="entry.userid"
-            (onLoading)="setLoadingRating($event)" (onUpdate)="ratingUpdated()">
+        <core-rating-rate *ngIf="database && entry && ratingInfo && (!database.approval || entry.approved)" [ratingInfo]="ratingInfo"
+            contextLevel="module" [instanceId]="database.coursemodule" [itemId]="entry.id" [itemSetId]="0" [courseId]="courseId"
+            [aggregateMethod]="database.assessed" [scaleId]="database.scale" [userId]="entry.userid" (onLoading)="setLoadingRating($event)"
+            (onUpdate)="ratingUpdated()">
         </core-rating-rate>
         <core-rating-aggregate *ngIf="database && entry && ratingInfo" [ratingInfo]="ratingInfo" contextLevel="module"
             [instanceId]="database.coursemodule" [itemId]="entry.id" [courseId]="courseId" [aggregateMethod]="database.assessed"
             [scaleId]="database.scale">
         </core-rating-aggregate>
 
-        <core-comments *ngIf="database && database.comments && entry && entry.id > 0 && commentsEnabled"
-            contextLevel="module" [instanceId]="database.coursemodule" component="mod_data" [itemId]="entry.id"
-            area="database_entry" [courseId]="courseId" (onLoading)="setLoadingComments($event)" [showItem]="true">
+        <core-comments *ngIf="database && database.comments && entry && entry.id > 0 && commentsEnabled" contextLevel="module"
+            [instanceId]="database.coursemodule" component="mod_data" [itemId]="entry.id" area="database_entry" [courseId]="courseId"
+            (onLoading)="setLoadingComments($event)" [showItem]="true">
         </core-comments>
 
         <ion-grid *ngIf="hasPrevious || hasNext">
diff --git a/src/addons/mod/data/pages/index/index.html b/src/addons/mod/data/pages/index/index.html
index 5d0caa151..46e4a1dd9 100644
--- a/src/addons/mod/data/pages/index/index.html
+++ b/src/addons/mod/data/pages/index/index.html
@@ -3,10 +3,12 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
 
         <ion-buttons slot="end">
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addons/mod/feedback/pages/attempt/attempt.html b/src/addons/mod/feedback/pages/attempt/attempt.html
index 77edc5f38..909f8e6a0 100644
--- a/src/addons/mod/feedback/pages/attempt/attempt.html
+++ b/src/addons/mod/feedback/pages/attempt/attempt.html
@@ -3,12 +3,12 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <ng-container *ngIf="attempt">{{ attempt.fullname }}</ng-container>
-            <ng-container *ngIf="anonAttempt">
+        <ion-title>
+            <h1 *ngIf="attempt">{{ attempt.fullname }}</h1>
+            <h1 *ngIf="anonAttempt">
                 {{ 'addon.mod_feedback.response_nr' |translate }}: {{anonAttempt.number}}
-            </ng-container>
-        </h1>
+            </h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
@@ -30,7 +30,7 @@
                         ({{ 'addon.mod_feedback.anonymous' |translate }})
                     </h2>
                 </ion-label>
-            </ion-item >
+            </ion-item>
             <ng-container *ngIf="items && items.length">
                 <ng-container *ngFor="let item of items">
                     <core-spacer *ngIf="item.typ == 'pagebreak'"></core-spacer>
@@ -38,8 +38,8 @@
                         <ion-label>
                             <h2 *ngIf="item.name" [core-mark-required]="item.required">
                                 <span *ngIf="feedback!.autonumbering && item.itemnumber">{{item.itemnumber}}. </span>
-                                <core-format-text [component]="component" [componentId]="cmId" [text]="item.name"
-                                    contextLevel="module" [contextInstanceId]="cmId" [courseId]="courseId">
+                                <core-format-text [component]="component" [componentId]="cmId" [text]="item.name" contextLevel="module"
+                                    [contextInstanceId]="cmId" [courseId]="courseId">
                                 </core-format-text>
                             </h2>
                             <p *ngIf="item.submittedValue">
diff --git a/src/addons/mod/feedback/pages/form/form.html b/src/addons/mod/feedback/pages/form/form.html
index 3f67b5a17..4ed5b620f 100644
--- a/src/addons/mod/feedback/pages/form/form.html
+++ b/src/addons/mod/feedback/pages/form/form.html
@@ -3,10 +3,12 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="cmId" [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="cmId" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
@@ -28,22 +30,20 @@
                             <ion-label [position]="item.hasTextInput ? 'stacked' : undefined">
                                 <p *ngIf="item.name" [core-mark-required]="item.required">
                                     <span *ngIf="feedback!.autonumbering && item.itemnumber">{{item.itemnumber}}. </span>
-                                    <core-format-text [component]="component" [componentId]="cmId" [text]="item.name"
-                                        contextLevel="module" [contextInstanceId]="cmId" [courseId]="courseId" [wsNotFiltered]="true">
+                                    <core-format-text [component]="component" [componentId]="cmId" [text]="item.name" contextLevel="module"
+                                        [contextInstanceId]="cmId" [courseId]="courseId" [wsNotFiltered]="true">
                                     </core-format-text>
                                     <span *ngIf="item.postfix" class="addon-mod_feedback-postfix">{{item.postfix}}</span>
                                 </p>
                                 <p *ngIf="item.templateName == 'label'">
-                                    <core-format-text [component]="component" [componentId]="cmId"
-                                        [text]="item.presentation" contextLevel="module" [contextInstanceId]="cmId"
-                                        [wsNotFiltered]="true" [courseId]="courseId">
+                                    <core-format-text [component]="component" [componentId]="cmId" [text]="item.presentation"
+                                        contextLevel="module" [contextInstanceId]="cmId" [wsNotFiltered]="true" [courseId]="courseId">
                                     </core-format-text>
                                 </p>
                             </ion-label>
 
-                            <ion-input *ngIf="item.templateName == 'textfield'" type="text" [(ngModel)]="item.value"
-                                autocorrect="off" name="{{item.typ}}_{{item.id}}" maxlength="{{item.length}}"
-                                [required]="item.required">
+                            <ion-input *ngIf="item.templateName == 'textfield'" type="text" [(ngModel)]="item.value" autocorrect="off"
+                                name="{{item.typ}}_{{item.id}}" maxlength="{{item.length}}" [required]="item.required">
                             </ion-input>
 
                             <ng-container *ngIf="item.templateName == 'numeric'">
@@ -56,8 +56,8 @@
                                 </ion-text>
                             </ng-container>
 
-                            <ion-textarea *ngIf="item.templateName == 'textarea'" [required]="item.required"
-                                name="{{item.typ}}_{{item.id}}" [(ngModel)]="item.value">
+                            <ion-textarea *ngIf="item.templateName == 'textarea'" [required]="item.required" name="{{item.typ}}_{{item.id}}"
+                                [(ngModel)]="item.value">
                             </ion-textarea>
 
                             <ion-select *ngIf="item.templateName == 'multichoice-d'" [required]="item.required"
@@ -65,20 +65,18 @@
                                 [interfaceOptions]="{header: item.name}">
                                 <ion-select-option *ngFor="let option of item.choices" [value]="option.value">
                                     <core-format-text [component]="component" [componentId]="cmId" [text]="option.label"
-                                        contextLevel="module" [contextInstanceId]="cmId" [wsNotFiltered]="true"
-                                        [courseId]="courseId">
+                                        contextLevel="module" [contextInstanceId]="cmId" [wsNotFiltered]="true" [courseId]="courseId">
                                     </core-format-text>
                                 </ion-select-option>
                             </ion-select>
                         </ion-item>
 
-                        <ion-radio-group *ngIf="item.templateName == 'multichoice-r'" [(ngModel)]="item.value"
-                            [required]="item.required" name="{{item.typ}}_{{item.id}}">
+                        <ion-radio-group *ngIf="item.templateName == 'multichoice-r'" [(ngModel)]="item.value" [required]="item.required"
+                            name="{{item.typ}}_{{item.id}}">
                             <ion-item *ngFor="let option of item.choices">
                                 <ion-label>
-                                    <core-format-text [component]="component" [componentId]="cmId"
-                                        [text]="option.label" contextLevel="module" [contextInstanceId]="cmId"
-                                        [wsNotFiltered]="true" [courseId]="courseId">
+                                    <core-format-text [component]="component" [componentId]="cmId" [text]="option.label"
+                                        contextLevel="module" [contextInstanceId]="cmId" [wsNotFiltered]="true" [courseId]="courseId">
                                     </core-format-text>
                                 </ion-label>
                                 <ion-radio slot="start" [value]="option.value"></ion-radio>
@@ -89,19 +87,18 @@
                             <ion-item *ngFor="let option of item.choices">
                                 <ion-label>
                                     <core-format-text [component]="component" [componentId]="cmId" [text]="option.label"
-                                        contextLevel="module" [contextInstanceId]="cmId" [wsNotFiltered]="true"
-                                        [courseId]="courseId">
+                                        contextLevel="module" [contextInstanceId]="cmId" [wsNotFiltered]="true" [courseId]="courseId">
                                     </core-format-text>
                                 </ion-label>
-                                <ion-checkbox [required]="item.required" name="{{item.typ}}_{{item.id}}"
-                                    [(ngModel)]="option.checked" value="option.value">
+                                <ion-checkbox [required]="item.required" name="{{item.typ}}_{{item.id}}" [(ngModel)]="option.checked"
+                                    value="option.value">
                                 </ion-checkbox>
                             </ion-item>
                         </ng-container>
 
                         <ng-container *ngIf="item.templateName == 'captcha'">
-                            <core-recaptcha *ngIf="!preview && !offline" [publicKey]="item.captcha.recaptchapublickey"
-                                [model]="item" modelValueName="value">
+                            <core-recaptcha *ngIf="!preview && !offline" [publicKey]="item.captcha.recaptchapublickey" [model]="item"
+                                modelValueName="value">
                             </core-recaptcha>
                             <div *ngIf="!preview && (!item.captcha || offline)" class="core-warning-card">
                                 <ion-item>
diff --git a/src/addons/mod/feedback/pages/index/index.html b/src/addons/mod/feedback/pages/index/index.html
index 8eb3987ad..fa031ccc7 100644
--- a/src/addons/mod/feedback/pages/index/index.html
+++ b/src/addons/mod/feedback/pages/index/index.html
@@ -3,10 +3,12 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
         <ion-buttons slot="end">
             <!-- The buttons defined by the component will be added in here. -->
         </ion-buttons>
diff --git a/src/addons/mod/feedback/pages/nonrespondents/nonrespondents.html b/src/addons/mod/feedback/pages/nonrespondents/nonrespondents.html
index 9dd84ed46..7f85fd6dd 100644
--- a/src/addons/mod/feedback/pages/nonrespondents/nonrespondents.html
+++ b/src/addons/mod/feedback/pages/nonrespondents/nonrespondents.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ 'addon.mod_feedback.responses' |translate }}</h1>
+        <ion-title>
+            <h1>{{ 'addon.mod_feedback.responses' |translate }}</h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
@@ -27,7 +29,9 @@
             </ion-item>
 
             <ion-item-divider>
-                <ion-label><h2>{{ 'addon.mod_feedback.non_respondents_students' | translate : {$a: total } }}</h2></ion-label>
+                <ion-label>
+                    <h2>{{ 'addon.mod_feedback.non_respondents_students' | translate : {$a: total } }}</h2>
+                </ion-label>
             </ion-item-divider>
             <ng-container *ngIf="total > 0">
                 <ion-item *ngFor="let user of users" class="ion-text-wrap">
diff --git a/src/addons/mod/feedback/pages/respondents/respondents.html b/src/addons/mod/feedback/pages/respondents/respondents.html
index 54bd44f9b..51c2184d0 100644
--- a/src/addons/mod/feedback/pages/respondents/respondents.html
+++ b/src/addons/mod/feedback/pages/respondents/respondents.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ 'addon.mod_feedback.responses' |translate }}</h1>
+        <ion-title>
+            <h1>{{ 'addon.mod_feedback.responses' |translate }}</h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
@@ -48,7 +50,9 @@
                         {{ 'core.loadmore' | translate }}
                     </ion-button>
                     <ion-item *ngIf="responses.responses.canLoadMore && loadingMore" class="ion-text-center">
-                        <ion-label><ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner></ion-label>
+                        <ion-label>
+                            <ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner>
+                        </ion-label>
                     </ion-item>
                 </ng-container>
 
@@ -71,7 +75,9 @@
                         {{ 'core.loadmore' | translate }}
                     </ion-button>
                     <ion-item *ngIf="responses.anonResponses.canLoadMore && loadingMore" class="ion-text-center">
-                        <ion-label><ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner></ion-label>
+                        <ion-label>
+                            <ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner>
+                        </ion-label>
                     </ion-item>
                 </ng-container>
             </ion-list>
diff --git a/src/addons/mod/folder/pages/index/index.html b/src/addons/mod/folder/pages/index/index.html
index a3d8d8626..442b976ec 100644
--- a/src/addons/mod/folder/pages/index/index.html
+++ b/src/addons/mod/folder/pages/index/index.html
@@ -3,10 +3,12 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
 
         <ion-buttons slot="end">
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addons/mod/forum/components/sort-order-selector/sort-order-selector.html b/src/addons/mod/forum/components/sort-order-selector/sort-order-selector.html
index 278563d0c..45ff21577 100644
--- a/src/addons/mod/forum/components/sort-order-selector/sort-order-selector.html
+++ b/src/addons/mod/forum/components/sort-order-selector/sort-order-selector.html
@@ -1,6 +1,8 @@
 <ion-header>
     <ion-toolbar>
-        <h2 id="addon-mod-forum-sort-order-label">{{ 'core.sort' | translate }}</h2>
+        <ion-title>
+            <h2 id="addon-mod-forum-sort-order-label">{{ 'core.sort' | translate }}</h2>
+        </ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
                 <ion-icon name="fas-times" slot="icon-only" aria-hidden="true"></ion-icon>
diff --git a/src/addons/mod/forum/pages/discussion/discussion.html b/src/addons/mod/forum/pages/discussion/discussion.html
index 6cc5bb804..8753e0b5d 100644
--- a/src/addons/mod/forum/pages/discussion/discussion.html
+++ b/src/addons/mod/forum/pages/discussion/discussion.html
@@ -3,10 +3,12 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1 *ngIf="startingPost">
-            <core-format-text contextLevel="module" [text]="startingPost.subject" [contextInstanceId]="cmId" [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1 *ngIf="startingPost">
+                <core-format-text contextLevel="module" [text]="startingPost.subject" [contextInstanceId]="cmId" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
         <ion-buttons slot="end">
             <!-- The context menu will be added in here. -->
         </ion-buttons>
@@ -14,48 +16,41 @@
 </ion-header>
 <core-navbar-buttons slot="end">
     <core-context-menu>
-        <core-context-menu-item *ngIf="discussionLoaded && !postHasOffline && isOnline"
-            [priority]="650" [content]="'addon.mod_forum.refreshposts' | translate" [iconAction]="refreshIcon" [closeOnClick]="false"
+        <core-context-menu-item *ngIf="discussionLoaded && !postHasOffline && isOnline" [priority]="650"
+            [content]="'addon.mod_forum.refreshposts' | translate" [iconAction]="refreshIcon" [closeOnClick]="false"
             (action)="doRefresh(null, $event)">
         </core-context-menu-item>
-        <core-context-menu-item *ngIf="discussionLoaded && isMobile && postHasOffline && isOnline"
-            [priority]="550" [content]="'core.settings.synchronizenow' | translate" [iconAction]="syncIcon" [closeOnClick]="false"
+        <core-context-menu-item *ngIf="discussionLoaded && isMobile && postHasOffline && isOnline" [priority]="550"
+            [content]="'core.settings.synchronizenow' | translate" [iconAction]="syncIcon" [closeOnClick]="false"
             (action)="doRefresh(null, $event, true)">
         </core-context-menu-item>
-        <core-context-menu-item [hidden]="sort == 'flat-oldest'"
-            [priority]="500" [content]="'addon.mod_forum.modeflatoldestfirst' | translate" iconAction="fas-arrow-down"
-            (action)="changeSort('flat-oldest')">
+        <core-context-menu-item [hidden]="sort == 'flat-oldest'" [priority]="500"
+            [content]="'addon.mod_forum.modeflatoldestfirst' | translate" iconAction="fas-arrow-down" (action)="changeSort('flat-oldest')">
         </core-context-menu-item>
-        <core-context-menu-item [hidden]="sort == 'flat-newest'"
-            [priority]="450" [content]="'addon.mod_forum.modeflatnewestfirst' | translate" iconAction="fas-arrow-up"
-            (action)="changeSort('flat-newest')">
+        <core-context-menu-item [hidden]="sort == 'flat-newest'" [priority]="450"
+            [content]="'addon.mod_forum.modeflatnewestfirst' | translate" iconAction="fas-arrow-up" (action)="changeSort('flat-newest')">
         </core-context-menu-item>
-        <core-context-menu-item [hidden]="sort == 'nested'"
-            [priority]="400" [content]="'addon.mod_forum.modenested' | translate" iconAction="fas-exchange-alt"
-            (action)="changeSort('nested')">
+        <core-context-menu-item [hidden]="sort == 'nested'" [priority]="400" [content]="'addon.mod_forum.modenested' | translate"
+            iconAction="fas-exchange-alt" (action)="changeSort('nested')">
         </core-context-menu-item>
-        <core-context-menu-item [hidden]="!discussion || !discussion.canlock || discussion.locked"
-            [priority]="300" [content]="'addon.mod_forum.lockdiscussion' | translate" iconAction="fas-lock"
-            (action)="setLockState(true)">
+        <core-context-menu-item [hidden]="!discussion || !discussion.canlock || discussion.locked" [priority]="300"
+            [content]="'addon.mod_forum.lockdiscussion' | translate" iconAction="fas-lock" (action)="setLockState(true)">
         </core-context-menu-item>
-        <core-context-menu-item [hidden]="!discussion || !discussion.canlock || !discussion.locked"
-            [priority]="300" [content]="'addon.mod_forum.unlockdiscussion' | translate" iconAction="fas-unlock"
-            (action)="setLockState(false)">
+        <core-context-menu-item [hidden]="!discussion || !discussion.canlock || !discussion.locked" [priority]="300"
+            [content]="'addon.mod_forum.unlockdiscussion' | translate" iconAction="fas-unlock" (action)="setLockState(false)">
         </core-context-menu-item>
-        <core-context-menu-item [hidden]="!discussion || !canPin || discussion.pinned"
-            [priority]="250" [content]="'addon.mod_forum.pindiscussion' | translate" iconAction="fas-map-pin"
-            (action)="setPinState(true)">
+        <core-context-menu-item [hidden]="!discussion || !canPin || discussion.pinned" [priority]="250"
+            [content]="'addon.mod_forum.pindiscussion' | translate" iconAction="fas-map-pin" (action)="setPinState(true)">
         </core-context-menu-item>
-        <core-context-menu-item [hidden]="!discussion || !canPin || !discussion.pinned"
-            [priority]="250" [content]="'addon.mod_forum.unpindiscussion' | translate" [iconSlash]="true" iconAction="fas-map-pin"
+        <core-context-menu-item [hidden]="!discussion || !canPin || !discussion.pinned" [priority]="250"
+            [content]="'addon.mod_forum.unpindiscussion' | translate" [iconSlash]="true" iconAction="fas-map-pin"
             (action)="setPinState(false)">
         </core-context-menu-item>
-        <core-context-menu-item [hidden]="!discussion || !discussion.canfavourite || discussion.starred"
-            [priority]="200" [content]="'addon.mod_forum.addtofavourites' | translate" iconAction="fas-star"
-            (action)="toggleFavouriteState(true)">
+        <core-context-menu-item [hidden]="!discussion || !discussion.canfavourite || discussion.starred" [priority]="200"
+            [content]="'addon.mod_forum.addtofavourites' | translate" iconAction="fas-star" (action)="toggleFavouriteState(true)">
         </core-context-menu-item>
-        <core-context-menu-item [hidden]="!discussion || !discussion.canfavourite || !discussion.starred"
-            [priority]="200" [content]="'addon.mod_forum.removefromfavourites' | translate" iconAction="fas-star" [iconSlash]="true"
+        <core-context-menu-item [hidden]="!discussion || !discussion.canfavourite || !discussion.starred" [priority]="200"
+            [content]="'addon.mod_forum.removefromfavourites' | translate" iconAction="fas-star" [iconSlash]="true"
             (action)="toggleFavouriteState(false)">
         </core-context-menu-item>
     </core-context-menu>
@@ -90,25 +85,20 @@
         </ion-card>
 
         <div *ngIf="startingPost" class="ion-margin-bottom">
-            <addon-mod-forum-post
-                [post]="startingPost" [discussion]="discussion" [courseId]="courseId" [highlight]="true"
-                [discussionId]="discussionId" [component]="component" [componentId]="cmId"
-                [formData]="formData" [originalData]="originalData" [forum]="forum" [accessInfo]="accessInfo"
-                [trackPosts]="trackPosts" [ratingInfo]="ratingInfo" [leavingPage]="leavingPage"
-                (onPostChange)="postListChanged()">
+            <addon-mod-forum-post [post]="startingPost" [discussion]="discussion" [courseId]="courseId" [highlight]="true"
+                [discussionId]="discussionId" [component]="component" [componentId]="cmId" [formData]="formData"
+                [originalData]="originalData" [forum]="forum" [accessInfo]="accessInfo" [trackPosts]="trackPosts" [ratingInfo]="ratingInfo"
+                [leavingPage]="leavingPage" (onPostChange)="postListChanged()">
             </addon-mod-forum-post>
         </div>
 
         <ion-card *ngIf="sort != 'nested'">
             <ng-container *ngFor="let post of posts; first as first">
                 <core-spacer *ngIf="!first"></core-spacer>
-                <addon-mod-forum-post
-                    [post]="post" [courseId]="courseId" [discussionId]="discussionId"
-                    [component]="component" [componentId]="cmId" [formData]="formData"
-                    [originalData]="originalData" [parentSubject]="postSubjects[post.parentid]"
+                <addon-mod-forum-post [post]="post" [courseId]="courseId" [discussionId]="discussionId" [component]="component"
+                    [componentId]="cmId" [formData]="formData" [originalData]="originalData" [parentSubject]="postSubjects[post.parentid]"
                     [forum]="forum" [accessInfo]="accessInfo" [trackPosts]="trackPosts" [ratingInfo]="ratingInfo"
-                    [leavingPage]="leavingPage"
-                    (onPostChange)="postListChanged()">
+                    [leavingPage]="leavingPage" (onPostChange)="postListChanged()">
                 </addon-mod-forum-post>
             </ng-container>
         </ion-card>
@@ -121,12 +111,10 @@
 
         <ng-template #nestedPosts let-post="post">
             <ion-card>
-                <addon-mod-forum-post
-                    [post]="post" [courseId]="courseId" [discussionId]="discussionId" [component]="component"
-                    [componentId]="cmId" [formData]="formData" [originalData]="originalData"
-                    [parentSubject]="postSubjects[post.parentid]" [forum]="forum" [accessInfo]="accessInfo"
-                    [trackPosts]="trackPosts" [ratingInfo]="ratingInfo" [leavingPage]="leavingPage"
-                    (onPostChange)="postListChanged()">
+                <addon-mod-forum-post [post]="post" [courseId]="courseId" [discussionId]="discussionId" [component]="component"
+                    [componentId]="cmId" [formData]="formData" [originalData]="originalData" [parentSubject]="postSubjects[post.parentid]"
+                    [forum]="forum" [accessInfo]="accessInfo" [trackPosts]="trackPosts" [ratingInfo]="ratingInfo"
+                    [leavingPage]="leavingPage" (onPostChange)="postListChanged()">
                 </addon-mod-forum-post>
             </ion-card>
             <div class="ion-padding-start" *ngIf="post.children && post.children.length && post.children[0].subject">
diff --git a/src/addons/mod/forum/pages/index/index.html b/src/addons/mod/forum/pages/index/index.html
index c72371b3f..0a1366b3d 100644
--- a/src/addons/mod/forum/pages/index/index.html
+++ b/src/addons/mod/forum/pages/index/index.html
@@ -3,10 +3,12 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
         <ion-buttons slot="end">
             <!-- The buttons defined by the component will be added in here. -->
         </ion-buttons>
diff --git a/src/addons/mod/forum/pages/new-discussion/new-discussion.html b/src/addons/mod/forum/pages/new-discussion/new-discussion.html
index 6155f595b..b083956f4 100644
--- a/src/addons/mod/forum/pages/new-discussion/new-discussion.html
+++ b/src/addons/mod/forum/pages/new-discussion/new-discussion.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ 'addon.mod_forum.addanewdiscussion' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'addon.mod_forum.addanewdiscussion' | translate }}</h1>
+        </ion-title>
         <ion-buttons slot="end">
             <!-- The context menu will be added in here. -->
         </ion-buttons>
@@ -18,9 +20,8 @@
         <form *ngIf="showForm" #newDiscFormEl>
             <ion-item>
                 <ion-label position="stacked">{{ 'addon.mod_forum.subject' | translate }}</ion-label>
-                <ion-input
-                    [(ngModel)]="newDiscussion.subject"
-                    type="text" [placeholder]="'addon.mod_forum.subject' | translate" name="subject">
+                <ion-input [(ngModel)]="newDiscussion.subject" type="text" [placeholder]="'addon.mod_forum.subject' | translate"
+                    name="subject">
                 </ion-input>
             </ion-item>
             <ion-item>
@@ -31,19 +32,14 @@
                     (contentChanged)="onMessageChange($event)">
                 </core-rich-text-editor>
             </ion-item>
-            <ion-item
-                button
-                class="divider ion-text-wrap"
-                (click)="toggleAdvanced()"
-                detail="false"
-                [attr.aria-expanded]="advanced"
-                [attr.aria-label]="(advanced ? 'core.hideadvanced' : 'core.showadvanced') | translate"
-                role="heading"
-                aria-controls="addon-mod-forum-new-discussion-advanced"
-            >
+            <ion-item button class="divider ion-text-wrap" (click)="toggleAdvanced()" detail="false" [attr.aria-expanded]="advanced"
+                [attr.aria-label]="(advanced ? 'core.hideadvanced' : 'core.showadvanced') | translate" role="heading"
+                aria-controls="addon-mod-forum-new-discussion-advanced">
                 <ion-icon *ngIf="!advanced" name="fas-caret-right" flip-rtl slot="start" aria-hidden="true"></ion-icon>
                 <ion-icon *ngIf="advanced" name="fas-caret-down" slot="start" aria-hidden="true"></ion-icon>
-                <ion-label><h2>{{ 'addon.mod_forum.advanced' | translate }}</h2></ion-label>
+                <ion-label>
+                    <h2>{{ 'addon.mod_forum.advanced' | translate }}</h2>
+                </ion-label>
             </ion-item>
             <div *ngIf="advanced" id="addon-mod-forum-new-discussion-advanced">
                 <ion-item *ngIf="showGroups && groupIds.length > 1 && accessInfo.cancanposttomygroups">
@@ -66,17 +62,16 @@
                     <ion-label>{{ 'addon.mod_forum.discussionpinned' | translate }}</ion-label>
                     <ion-toggle [(ngModel)]="newDiscussion.pin" name="pin"></ion-toggle>
                 </ion-item>
-                <core-attachments *ngIf="canCreateAttachments && forum && forum.maxattachments > 0"
-                    [files]="newDiscussion.files" [maxSize]="forum.maxbytes" [maxSubmissions]="forum.maxattachments"
-                    [component]="component" [componentId]="forum.cmid" [allowOffline]="true" [courseId]="courseId">
+                <core-attachments *ngIf="canCreateAttachments && forum && forum.maxattachments > 0" [files]="newDiscussion.files"
+                    [maxSize]="forum.maxbytes" [maxSubmissions]="forum.maxattachments" [component]="component" [componentId]="forum.cmid"
+                    [allowOffline]="true" [courseId]="courseId">
                 </core-attachments>
             </div>
             <ion-item>
                 <ion-label>
                     <ion-row>
                         <ion-col>
-                            <ion-button
-                                expand="block" [disabled]="newDiscussion.subject == '' || newDiscussion.message == null"
+                            <ion-button expand="block" [disabled]="newDiscussion.subject == '' || newDiscussion.message == null"
                                 (click)="add()">
                                 {{ 'addon.mod_forum.posttoforum' | translate }}
                             </ion-button>
diff --git a/src/addons/mod/glossary/pages/edit/edit.html b/src/addons/mod/glossary/pages/edit/edit.html
index 9ab191489..55faf51fe 100644
--- a/src/addons/mod/glossary/pages/edit/edit.html
+++ b/src/addons/mod/glossary/pages/edit/edit.html
@@ -3,10 +3,12 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1 *ngIf="glossary">
-            <core-format-text [text]="glossary.name" contextLevel="module" [contextInstanceId]="cmId" [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1 *ngIf="glossary">
+                <core-format-text [text]="glossary.name" contextLevel="module" [contextInstanceId]="cmId" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
@@ -14,16 +16,15 @@
         <form #editFormEl *ngIf="glossary">
             <ion-item>
                 <ion-label position="stacked">{{ 'addon.mod_glossary.concept' | translate }}</ion-label>
-                <ion-input type="text" [placeholder]="'addon.mod_glossary.concept' | translate" [(ngModel)]="entry.concept"
-                    name="concept">
+                <ion-input type="text" [placeholder]="'addon.mod_glossary.concept' | translate" [(ngModel)]="entry.concept" name="concept">
                 </ion-input>
             </ion-item>
             <ion-item>
                 <ion-label position="stacked">{{ 'addon.mod_glossary.definition' | translate }}</ion-label>
                 <core-rich-text-editor [control]="definitionControl" (contentChanged)="onDefinitionChange($event)"
-                    [placeholder]="'addon.mod_glossary.definition' | translate" name="addon_mod_glossary_edit"
-                    [component]="component" [componentId]="cmId" [autoSave]="true" contextLevel="module"
-                    [contextInstanceId]="cmId" elementId="definition_editor" [draftExtraParams]="editorExtraParams">
+                    [placeholder]="'addon.mod_glossary.definition' | translate" name="addon_mod_glossary_edit" [component]="component"
+                    [componentId]="cmId" [autoSave]="true" contextLevel="module" [contextInstanceId]="cmId" elementId="definition_editor"
+                    [draftExtraParams]="editorExtraParams">
                 </core-rich-text-editor>
             </ion-item>
             <ion-item *ngIf="categories.length > 0">
@@ -47,14 +48,18 @@
                 </ion-textarea>
             </ion-item>
             <ion-item-divider>
-                <ion-label><h2>{{ 'addon.mod_glossary.attachment' | translate }}</h2></ion-label>
+                <ion-label>
+                    <h2>{{ 'addon.mod_glossary.attachment' | translate }}</h2>
+                </ion-label>
             </ion-item-divider>
-            <core-attachments [files]="attachments" [component]="component" [componentId]="glossary.coursemodule"
-                [allowOffline]="true" [courseId]="courseId">
+            <core-attachments [files]="attachments" [component]="component" [componentId]="glossary.coursemodule" [allowOffline]="true"
+                [courseId]="courseId">
             </core-attachments>
             <ng-container *ngIf="glossary.usedynalink">
                 <ion-item-divider>
-                    <ion-label><h2>{{ 'addon.mod_glossary.linking' | translate }}</h2></ion-label>
+                    <ion-label>
+                        <h2>{{ 'addon.mod_glossary.linking' | translate }}</h2>
+                    </ion-label>
                 </ion-item-divider>
                 <ion-item class="ion-text-wrap">
                     <ion-label>{{ 'addon.mod_glossary.entryusedynalink' | translate }}</ion-label>
diff --git a/src/addons/mod/glossary/pages/entry/entry.html b/src/addons/mod/glossary/pages/entry/entry.html
index 4e644e998..03737a4a1 100644
--- a/src/addons/mod/glossary/pages/entry/entry.html
+++ b/src/addons/mod/glossary/pages/entry/entry.html
@@ -3,10 +3,12 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1 *ngIf="entry">
-            <core-format-text [text]="entry.concept" contextLevel="module" [contextInstanceId]="componentId" [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1 *ngIf="entry">
+                <core-format-text [text]="entry.concept" contextLevel="module" [contextInstanceId]="componentId" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
@@ -39,14 +41,13 @@
             </ion-item>
             <ion-item class="ion-text-wrap">
                 <ion-label>
-                    <core-format-text [component]="component" [componentId]="componentId" [text]="entry.definition"
-                        contextLevel="module" [contextInstanceId]="componentId" [courseId]="courseId">
+                    <core-format-text [component]="component" [componentId]="componentId" [text]="entry.definition" contextLevel="module"
+                        [contextInstanceId]="componentId" [courseId]="courseId">
                     </core-format-text>
                 </ion-label>
             </ion-item>
             <div *ngIf="entry.attachment" lines="none">
-                <core-file *ngFor="let file of entry.attachments" [file]="file" [component]="component"
-                    [componentId]="componentId">
+                <core-file *ngFor="let file of entry.attachments" [file]="file" [component]="component" [componentId]="componentId">
                 </core-file>
             </div>
             <ion-item class="ion-text-wrap" *ngIf="tagsEnabled && entry && entry.tags && entry.tags.length > 0">
@@ -56,20 +57,21 @@
                 </ion-label>
             </ion-item>
             <ion-item class="ion-text-wrap" *ngIf="!entry.approved">
-                <ion-label><p><em>{{ 'addon.mod_glossary.entrypendingapproval' | translate }}</em></p></ion-label>
+                <ion-label>
+                    <p><em>{{ 'addon.mod_glossary.entrypendingapproval' | translate }}</em></p>
+                </ion-label>
             </ion-item>
-            <core-comments *ngIf="glossary && glossary.allowcomments && entry && entry.id > 0 && commentsEnabled"
-                contextLevel="module" [instanceId]="glossary.coursemodule" component="mod_glossary"
-                [itemId]="entry.id" area="glossary_entry" [courseId]="glossary.course" [showItem]="true">
+            <core-comments *ngIf="glossary && glossary.allowcomments && entry && entry.id > 0 && commentsEnabled" contextLevel="module"
+                [instanceId]="glossary.coursemodule" component="mod_glossary" [itemId]="entry.id" area="glossary_entry"
+                [courseId]="glossary.course" [showItem]="true">
             </core-comments>
             <core-rating-rate *ngIf="glossary && ratingInfo" [ratingInfo]="ratingInfo" contextLevel="module"
                 [instanceId]="glossary.coursemodule" [itemId]="entry.id" [itemSetId]="0" [courseId]="glossary.course"
-                [aggregateMethod]="glossary.assessed" [scaleId]="glossary.scale" [userId]="entry.userid"
-                (onUpdate)="ratingUpdated()">
+                [aggregateMethod]="glossary.assessed" [scaleId]="glossary.scale" [userId]="entry.userid" (onUpdate)="ratingUpdated()">
             </core-rating-rate>
             <core-rating-aggregate *ngIf="glossary && ratingInfo" [ratingInfo]="ratingInfo" contextLevel="module"
-                [instanceId]="glossary.coursemodule" [itemId]="entry.id" [courseId]="glossary.course"
-                [aggregateMethod]="glossary.assessed" [scaleId]="glossary.scale">
+                [instanceId]="glossary.coursemodule" [itemId]="entry.id" [courseId]="glossary.course" [aggregateMethod]="glossary.assessed"
+                [scaleId]="glossary.scale">
             </core-rating-aggregate>
         </ng-container>
 
diff --git a/src/addons/mod/glossary/pages/index/index.html b/src/addons/mod/glossary/pages/index/index.html
index c1b066a21..501b8f25d 100644
--- a/src/addons/mod/glossary/pages/index/index.html
+++ b/src/addons/mod/glossary/pages/index/index.html
@@ -3,10 +3,12 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
         <ion-buttons slot="end">
             <!-- The buttons defined by the component will be added in here. -->
         </ion-buttons>
diff --git a/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.html b/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.html
index f643a4047..d4022f31c 100644
--- a/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.html
+++ b/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.html
@@ -3,11 +3,13 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text *ngIf="h5pActivity" [text]="h5pActivity.name" contextLevel="module"
-                [contextInstanceId]="h5pActivity.coursemodule" [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text *ngIf="h5pActivity" [text]="h5pActivity.name" contextLevel="module"
+                    [contextInstanceId]="h5pActivity.coursemodule" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
@@ -62,15 +64,15 @@
                     <ion-item class="ion-text-wrap" lines="none">
                         <ion-label>
                             <h2>{{ 'addon.mod_h5pactivity.outcome' | translate }}</h2>
-                            <p *ngIf="attempt.success !== null && attempt.success" >
+                            <p *ngIf="attempt.success !== null && attempt.success">
                                 <ion-icon name="fas-check-circle" aria-hidden="true"></ion-icon>
                                 {{ 'addon.mod_h5pactivity.attempt_success_pass' | translate }}
                             </p>
-                            <p *ngIf="attempt.success !== null && !attempt.success" >
+                            <p *ngIf="attempt.success !== null && !attempt.success">
                                 <ion-icon name="far-circle" aria-hidden="true"></ion-icon>
                                 {{ 'addon.mod_h5pactivity.attempt_success_fail' | translate }}
                             </p>
-                            <p *ngIf="attempt.success === null" >
+                            <p *ngIf="attempt.success === null">
                                 {{ 'addon.mod_h5pactivity.attempt_success_unknown' | translate }}
                             </p>
                         </ion-label>
@@ -89,15 +91,15 @@
                 <ion-card *ngFor="let result of attempt.results">
                     <ion-card-header class="ion-text-wrap">
                         <ion-card-title>
-                            <core-format-text [text]="result.description" [component]="component" [componentId]="cmId"
-                                contextLevel="module" [contextInstanceId]="cmId" [courseId]="courseId">
+                            <core-format-text [text]="result.description" [component]="component" [componentId]="cmId" contextLevel="module"
+                                [contextInstanceId]="cmId" [courseId]="courseId">
                             </core-format-text>
                         </ion-card-title>
                     </ion-card-header>
                     <ion-item *ngIf="result.content" class="ion-text-wrap">
                         <ion-label>
-                            <core-format-text [text]="result.content" [component]="component" [componentId]="cmId"
-                                contextLevel="module" [contextInstanceId]="cmId" [courseId]="courseId">
+                            <core-format-text [text]="result.content" [component]="component" [componentId]="cmId" contextLevel="module"
+                                [contextInstanceId]="cmId" [courseId]="courseId">
                             </core-format-text>
                         </ion-label>
                     </ion-item>
@@ -113,8 +115,7 @@
                                 </ion-row>
                             </ion-label>
                         </ion-item>
-                        <ion-item *ngFor="let option of result.options"
-                            class="ion-text-wrap addon-mod_h5pactivity-result-table-row">
+                        <ion-item *ngFor="let option of result.options" class="ion-text-wrap addon-mod_h5pactivity-result-table-row">
                             <ion-label>
                                 <ion-row class="ion-align-items-center">
                                     <ion-col class="ion-text-center">
@@ -124,8 +125,7 @@
                                     </ion-col>
                                     <ion-col class="ion-text-center">
                                         <ng-container *ngIf="option.correctanswer">
-                                            <ng-container
-                                                *ngTemplateOutlet="answerTemplate; context: {answer: option.correctanswer}">
+                                            <ng-container *ngTemplateOutlet="answerTemplate; context: {answer: option.correctanswer}">
                                             </ng-container>
                                         </ng-container>
                                     </ion-col>
@@ -143,9 +143,9 @@
                         <ion-item *ngIf="result.maxscore" class="ion-text-wrap ion-text-end addon-mod_h5pactivity-result-score">
                             <ion-label>
                                 <p><strong>
-                                    {{ 'addon.mod_h5pactivity.score' | translate }}:
-                                     {{ 'addon.mod_h5pactivity.score_out_of' | translate:{$a: result} }}
-                                </strong></p>
+                                        {{ 'addon.mod_h5pactivity.score' | translate }}:
+                                        {{ 'addon.mod_h5pactivity.score_out_of' | translate:{$a: result} }}
+                                    </strong></p>
                             </ion-label>
                         </ion-item>
                     </ng-container>
diff --git a/src/addons/mod/h5pactivity/pages/index/index.html b/src/addons/mod/h5pactivity/pages/index/index.html
index 1001692cf..6ac751048 100644
--- a/src/addons/mod/h5pactivity/pages/index/index.html
+++ b/src/addons/mod/h5pactivity/pages/index/index.html
@@ -3,10 +3,12 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
 
         <ion-buttons slot="end">
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.html b/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.html
index 31ca8fcd6..5432ccb09 100644
--- a/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.html
+++ b/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.html
@@ -3,11 +3,13 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text *ngIf="h5pActivity" [text]="h5pActivity.name" contextLevel="module"
-                [contextInstanceId]="h5pActivity.coursemodule" [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text *ngIf="h5pActivity" [text]="h5pActivity.name" contextLevel="module"
+                    [contextInstanceId]="h5pActivity.coursemodule" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
diff --git a/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.html b/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.html
index 37ed87b63..375cb84cc 100644
--- a/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.html
+++ b/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.html
@@ -3,11 +3,13 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text *ngIf="h5pActivity" [text]="h5pActivity.name" contextLevel="module"
-                [contextInstanceId]="h5pActivity.coursemodule" [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text *ngIf="h5pActivity" [text]="h5pActivity.name" contextLevel="module"
+                    [contextInstanceId]="h5pActivity.coursemodule" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
diff --git a/src/addons/mod/imscp/components/toc/toc.html b/src/addons/mod/imscp/components/toc/toc.html
index 2d06279f9..e9aee76c6 100644
--- a/src/addons/mod/imscp/components/toc/toc.html
+++ b/src/addons/mod/imscp/components/toc/toc.html
@@ -1,6 +1,8 @@
 <ion-header>
     <ion-toolbar>
-        <h1>{{ 'addon.mod_imscp.toc' | translate }}</h1>
+        <ion-title>
+            <h2>{{ 'addon.mod_imscp.toc' | translate }}</h2>
+        </ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
                 <ion-icon name="fas-times" slot="icon-only" aria-hidden=true></ion-icon>
diff --git a/src/addons/mod/imscp/pages/index/index.html b/src/addons/mod/imscp/pages/index/index.html
index 98a8c22b2..712346154 100644
--- a/src/addons/mod/imscp/pages/index/index.html
+++ b/src/addons/mod/imscp/pages/index/index.html
@@ -3,10 +3,12 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
 
         <ion-buttons slot="end">
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addons/mod/lesson/components/menu-modal/menu-modal.html b/src/addons/mod/lesson/components/menu-modal/menu-modal.html
index c70b46229..80e242f0b 100644
--- a/src/addons/mod/lesson/components/menu-modal/menu-modal.html
+++ b/src/addons/mod/lesson/components/menu-modal/menu-modal.html
@@ -1,7 +1,8 @@
 <ion-header>
     <ion-toolbar>
-        <h2>{{ pageInstance?.lesson?.name }}</h2>
-
+        <ion-title>
+            <h2>{{ pageInstance?.lesson?.name }}</h2>
+        </ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
                 <ion-icon slot="icon-only" name="fas-times" aria-hidden="true"></ion-icon>
@@ -15,7 +16,9 @@
             <!-- Media file. -->
             <ng-container *ngIf="pageInstance.mediaFile">
                 <ion-item-divider>
-                    <ion-label><h2>{{ 'addon.mod_lesson.linkedmedia' | translate }}</h2></ion-label>
+                    <ion-label>
+                        <h2>{{ 'addon.mod_lesson.linkedmedia' | translate }}</h2>
+                    </ion-label>
                 </ion-item-divider>
                 <core-file [file]="pageInstance.mediaFile" [component]="pageInstance.component"
                     [componentId]="pageInstance.lesson?.coursemodule">
@@ -25,16 +28,20 @@
             <!-- Lesson menu. -->
             <ng-container *ngIf="pageInstance.displayMenu">
                 <ion-item-divider>
-                    <ion-label><h2>{{ 'addon.mod_lesson.lessonmenu' | translate }}</h2></ion-label>
+                    <ion-label>
+                        <h2>{{ 'addon.mod_lesson.lessonmenu' | translate }}</h2>
+                    </ion-label>
                 </ion-item-divider>
                 <ion-item class="ion-text-center" *ngIf="pageInstance.loadingMenu">
-                    <ion-label><ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner></ion-label>
+                    <ion-label>
+                        <ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner>
+                    </ion-label>
                 </ion-item>
                 <div *ngIf="!pageInstance.loadingMenu">
                     <ng-container *ngFor="let page of pageInstance.lessonPages">
                         <ion-item class="ion-text-wrap" *ngIf="page.display && page.displayinmenublock" (click)="loadPage(page.id)"
-                            [attr.aria-current]="!pageInstance.eolData && pageInstance.currentPage == page.id ? 'page' : 'false'"
-                            button detail="true">
+                            [attr.aria-current]="!pageInstance.eolData && pageInstance.currentPage == page.id ? 'page' : 'false'" button
+                            detail="true">
                             <ion-label>
                                 <core-format-text [text]="page.title" contextLevel="module" [courseId]="pageInstance.courseId"
                                     [contextInstanceId]="pageInstance.lesson?.coursemodule">
diff --git a/src/addons/mod/lesson/components/password-modal/password-modal.html b/src/addons/mod/lesson/components/password-modal/password-modal.html
index fe3013504..1f033719b 100644
--- a/src/addons/mod/lesson/components/password-modal/password-modal.html
+++ b/src/addons/mod/lesson/components/password-modal/password-modal.html
@@ -1,7 +1,8 @@
 <ion-header>
     <ion-toolbar>
-        <h2>{{ 'core.login.password' | translate }}</h2>
-
+        <ion-title>
+            <h2>{{ 'core.login.password' | translate }}</h2>
+        </ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
                 <ion-icon slot="icon-only" name="fas-times" aria-hidden="true"></ion-icon>
@@ -14,8 +15,8 @@
         <ion-item>
             <ion-label>{{ 'addon.mod_lesson.enterpassword' | translate }}</ion-label>
             <core-show-password name="password">
-                <ion-input name="password" type="password" placeholder="{{ 'core.login.password' | translate }}"
-                    core-auto-focus #passwordinput [clearOnEdit]="false">
+                <ion-input name="password" type="password" placeholder="{{ 'core.login.password' | translate }}" core-auto-focus
+                    #passwordinput [clearOnEdit]="false">
                 </ion-input>
             </core-show-password>
         </ion-item>
diff --git a/src/addons/mod/lesson/pages/index/index.html b/src/addons/mod/lesson/pages/index/index.html
index ba95ea502..a6b75a913 100644
--- a/src/addons/mod/lesson/pages/index/index.html
+++ b/src/addons/mod/lesson/pages/index/index.html
@@ -3,10 +3,12 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
         <ion-buttons slot="end">
             <!-- The buttons defined by the component will be added in here. -->
         </ion-buttons>
diff --git a/src/addons/mod/lesson/pages/player/player.html b/src/addons/mod/lesson/pages/player/player.html
index b5a0a9e7b..0a55d7838 100644
--- a/src/addons/mod/lesson/pages/player/player.html
+++ b/src/addons/mod/lesson/pages/player/player.html
@@ -3,11 +3,12 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="lesson?.coursemodule"
-                [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="lesson?.coursemodule" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" *ngIf="displayMenu || mediaFile" [attr.aria-label]="'addon.mod_lesson.lessonmenu' | translate"
                 (click)="showMenu()">
@@ -46,15 +47,14 @@
             <ion-card *ngIf="!eolData && !processData">
                 <!-- Content page. -->
                 <ion-item class="ion-text-wrap" *ngIf="!question && pageContent">
-                    <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="pageContent"
-                        contextLevel="module" [contextInstanceId]="lesson.coursemodule" [courseId]="courseId">
+                    <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="pageContent" contextLevel="module"
+                        [contextInstanceId]="lesson.coursemodule" [courseId]="courseId">
                     </core-format-text>
                 </ion-item>
 
                 <!-- Question page. -->
                 <!-- We need to set ngIf loaded to make formGroup directive restart every time a page changes, see MOBILE-2540. -->
-                <form *ngIf="question && loaded" [formGroup]="questionForm" #questionFormEl
-                    (ngSubmit)="submitQuestion($event)">
+                <form *ngIf="question && loaded" [formGroup]="questionForm" #questionFormEl (ngSubmit)="submitQuestion($event)">
 
                     <ion-item-divider class="ion-text-wrap" *ngIf="pageContent">
                         <ion-label>
@@ -91,8 +91,8 @@
                                     <h3 class="item-heading">{{ 'addon.mod_lesson.youranswer' | translate }}</h3>
                                     <p>
                                         <core-format-text [component]="component" [componentId]="lesson?.coursemodule"
-                                            [text]="question.useranswer" contextLevel="module"
-                                            [contextInstanceId]="lesson?.coursemodule" [courseId]="courseId">
+                                            [text]="question.useranswer" contextLevel="module" [contextInstanceId]="lesson?.coursemodule"
+                                            [courseId]="courseId">
                                         </core-format-text>
                                     </p>
                                 </ion-label>
@@ -105,9 +105,8 @@
                             <ion-radio-group *ngIf="!question.multi" [formControlName]="question.controlName">
                                 <ion-item class="ion-text-wrap" *ngFor="let option of question.options">
                                     <ion-label>
-                                        <core-format-text [component]="component" [componentId]="lesson.coursemodule"
-                                            [text]="option.text" contextLevel="module" [contextInstanceId]="lesson?.coursemodule"
-                                            [courseId]="courseId">
+                                        <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="option.text"
+                                            contextLevel="module" [contextInstanceId]="lesson?.coursemodule" [courseId]="courseId">
                                         </core-format-text>
                                     </ion-label>
                                     <ion-radio slot="end" [id]="option.id" [value]="option.value" [disabled]="option.disabled">
@@ -119,9 +118,8 @@
                             <ng-container *ngIf="question.multi">
                                 <ion-item class="ion-text-wrap" *ngFor="let option of question.options">
                                     <ion-label>
-                                        <core-format-text [component]="component" [componentId]="lesson?.coursemodule"
-                                            [text]="option.text" contextLevel="module" [contextInstanceId]="lesson?.coursemodule"
-                                            [courseId]="courseId">
+                                        <core-format-text [component]="component" [componentId]="lesson?.coursemodule" [text]="option.text"
+                                            contextLevel="module" [contextInstanceId]="lesson?.coursemodule" [courseId]="courseId">
                                         </core-format-text>
                                     </ion-label>
                                     <ion-checkbox [id]="option.id" [formControlName]="option.name" slot="end"></ion-checkbox>
@@ -133,10 +131,12 @@
                         <ng-container *ngSwitchCase="'matching'">
                             <ion-item class="ion-text-wrap" *ngFor="let row of question.rows">
                                 <ion-label>
-                                    <p><core-format-text id="addon-mod_lesson-matching-{{row.id}}" [component]="component"
-                                        [componentId]="lesson?.coursemodule" [text]="row.text" contextLevel="module"
-                                        [contextInstanceId]="lesson?.coursemodule" [courseId]="courseId">
-                                    </core-format-text></p>
+                                    <p>
+                                        <core-format-text id="addon-mod_lesson-matching-{{row.id}}" [component]="component"
+                                            [componentId]="lesson?.coursemodule" [text]="row.text" contextLevel="module"
+                                            [contextInstanceId]="lesson?.coursemodule" [courseId]="courseId">
+                                        </core-format-text>
+                                    </p>
                                 </ion-label>
                                 <ion-select [id]="row.id" [formControlName]="row.name" interface="action-sheet"
                                     [attr.aria-labelledby]="'addon-mod_lesson-matching-' + row.id">
@@ -161,8 +161,8 @@
                 <ion-grid *ngIf="pageButtons?.length" class="ion-text-wrap addon-mod_lesson-pagebuttons">
                     <ion-row class="ion-align-items-center">
                         <ion-col *ngFor="let button of pageButtons" size="12" size-md="6" size-lg="3" col-xl>
-                            <ion-button expand="block" fill="outline" [id]="button.id"
-                                (click)="buttonClicked(button.data)" class="ion-text-wrap button-no-uppercase">
+                            <ion-button expand="block" fill="outline" [id]="button.id" (click)="buttonClicked(button.data)"
+                                class="ion-text-wrap button-no-uppercase">
                                 {{ button.content }}
                             </ion-button>
                         </ion-col>
@@ -213,8 +213,7 @@
                 <ion-item class="ion-text-wrap" *ngIf="eolData.displayscorewithessays" lines="none">
                     <ion-label [innerHTML]="eolData.displayscorewithessays.message"></ion-label>
                 </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="!eolData.displayscorewithessays && eolData.displayscorewithoutessays"
-                    lines="none">
+                <ion-item class="ion-text-wrap" *ngIf="!eolData.displayscorewithessays && eolData.displayscorewithoutessays" lines="none">
                     <ion-label>{{ eolData.displayscorewithoutessays.message }}</ion-label>
                 </ion-item>
                 <ion-item class="ion-text-wrap" *ngIf="eolData.yourcurrentgradeisoutof" lines="none">
@@ -247,19 +246,17 @@
                     <ion-label>{{ eolData.modattemptsnoteacher.message }}</ion-label>
                 </ion-item>
                 <!-- If activity link was successfully formatted, render the button. -->
-                <ion-button *ngIf="activityLink && activityLink.formatted"
-                    expand="block" color="light" [href]="activityLink.href" core-link [capture]="true"
-                    class="ion-text-wrap ion-margin button-no-uppercase">
-                    <core-format-text [text]="activityLink.label" contextLevel="module"
-                        [contextInstanceId]="lesson?.coursemodule" [courseId]="courseId">
+                <ion-button *ngIf="activityLink && activityLink.formatted" expand="block" color="light" [href]="activityLink.href" core-link
+                    [capture]="true" class="ion-text-wrap ion-margin button-no-uppercase">
+                    <core-format-text [text]="activityLink.label" contextLevel="module" [contextInstanceId]="lesson?.coursemodule"
+                        [courseId]="courseId">
                     </core-format-text>
                 </ion-button>
-                <ion-item class="ion-text-wrap" *ngIf="activityLink && !activityLink.formatted"
-                    lines="none">
+                <ion-item class="ion-text-wrap" *ngIf="activityLink && !activityLink.formatted" lines="none">
                     <!-- Activity link wasn't formatted, render the original link. -->
                     <ion-label>
-                        <core-format-text [text]="activityLink.label" contextLevel="module"
-                            [contextInstanceId]="lesson?.coursemodule" [courseId]="courseId">
+                        <core-format-text [text]="activityLink.label" contextLevel="module" [contextInstanceId]="lesson?.coursemodule"
+                            [courseId]="courseId">
                         </core-format-text>
                     </ion-label>
                 </ion-item>
@@ -267,15 +264,14 @@
 
             <!-- Feedback returned when processing an action. -->
             <ion-list *ngIf="processData">
-                <ion-item class="ion-text-wrap" *ngIf="processData.ongoingscore && !processData.reviewmode" >
+                <ion-item class="ion-text-wrap" *ngIf="processData.ongoingscore && !processData.reviewmode">
                     <ion-label>{{ processData.ongoingscore }}</ion-label>
                 </ion-item>
                 <ion-item class="ion-text-wrap" *ngIf="!processData.reviewmode || review">
                     <ion-label>
                         <div *ngIf="!processData.reviewmode">
-                            <core-format-text [component]="component" [componentId]="lesson?.coursemodule"
-                                [text]="processData.feedback" contextLevel="module" [contextInstanceId]="lesson?.coursemodule"
-                                [courseId]="courseId">
+                            <core-format-text [component]="component" [componentId]="lesson?.coursemodule" [text]="processData.feedback"
+                                contextLevel="module" [contextInstanceId]="lesson?.coursemodule" [courseId]="courseId">
                             </core-format-text>
                         </div>
                         <div *ngIf="review">
@@ -286,8 +282,7 @@
                     </ion-label>
                 </ion-item>
 
-                <ion-button expand="block" class="ion-text-wrap ion-margin" color="light" *ngIf="review"
-                    (click)="changePage(LESSON_EOL)">
+                <ion-button expand="block" class="ion-text-wrap ion-margin" color="light" *ngIf="review" (click)="changePage(LESSON_EOL)">
                     {{ 'addon.mod_lesson.finish' | translate }}
                 </ion-button>
                 <ion-button expand="block" class="ion-text-wrap ion-margin" color="light" *ngFor="let button of processDataButtons"
diff --git a/src/addons/mod/lesson/pages/user-retake/user-retake.html b/src/addons/mod/lesson/pages/user-retake/user-retake.html
index a9f17d998..9d0c40651 100644
--- a/src/addons/mod/lesson/pages/user-retake/user-retake.html
+++ b/src/addons/mod/lesson/pages/user-retake/user-retake.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ 'addon.mod_lesson.detailedstats' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'addon.mod_lesson.detailedstats' | translate }}</h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
@@ -133,8 +135,8 @@
                                     <ion-label>
                                         <p>
                                             <core-format-text [component]="component" [componentId]="lesson?.coursemodule"
-                                                [text]="answer[0].content" contextLevel="module"
-                                                [contextInstanceId]="lesson?.coursemodule" [courseId]="courseId">
+                                                [text]="answer[0].content" contextLevel="module" [contextInstanceId]="lesson?.coursemodule"
+                                                [courseId]="courseId">
                                             </core-format-text>
                                         </p>
                                         <ion-badge *ngIf="answer[1]" color="dark">
@@ -144,8 +146,7 @@
                                             </core-format-text>
                                         </ion-badge>
                                     </ion-label>
-                                    <ion-checkbox [attr.name]="answer[0].name" [ngModel]="answer[0].checked" [disabled]="true"
-                                        slot="end">
+                                    <ion-checkbox [attr.name]="answer[0].name" [ngModel]="answer[0].checked" [disabled]="true" slot="end">
                                     </ion-checkbox>
                                 </ion-item>
 
@@ -213,15 +214,13 @@
                                 <!-- Another page (end of branch, ...). -->
                                 <ion-label>
                                     <p>
-                                        <core-format-text [component]="component" [componentId]="lesson?.coursemodule"
-                                            [text]="answer[0]" contextLevel="module" [contextInstanceId]="lesson?.coursemodule"
-                                            [courseId]="courseId">
+                                        <core-format-text [component]="component" [componentId]="lesson?.coursemodule" [text]="answer[0]"
+                                            contextLevel="module" [contextInstanceId]="lesson?.coursemodule" [courseId]="courseId">
                                         </core-format-text>
                                     </p>
                                     <ion-badge *ngIf="answer[1]" color="dark">
-                                        <core-format-text [component]="component" [componentId]="lesson?.coursemodule"
-                                            [text]="answer[1]" contextLevel="module" [contextInstanceId]="lesson?.coursemodule"
-                                            [courseId]="courseId">
+                                        <core-format-text [component]="component" [componentId]="lesson?.coursemodule" [text]="answer[1]"
+                                            contextLevel="module" [contextInstanceId]="lesson?.coursemodule" [courseId]="courseId">
                                         </core-format-text>
                                     </ion-badge>
                                 </ion-label>
@@ -233,14 +232,16 @@
                                 <h3 class="item-heading">{{ 'addon.mod_lesson.response' | translate }}</h3>
                                 <p>
                                     <core-format-text [component]="component" [componentId]="lesson?.coursemodule"
-                                        [text]="page.answerdata.response" contextLevel="module"
-                                        [contextInstanceId]="lesson?.coursemodule" [courseId]="courseId">
+                                        [text]="page.answerdata.response" contextLevel="module" [contextInstanceId]="lesson?.coursemodule"
+                                        [courseId]="courseId">
                                     </core-format-text>
                                 </p>
                             </ion-label>
                         </ion-item>
                         <ion-item class="ion-text-wrap" *ngIf="page.answerdata.score">
-                            <ion-label><p>{{page.answerdata.score}}</p></ion-label>
+                            <ion-label>
+                                <p>{{page.answerdata.score}}</p>
+                            </ion-label>
                         </ion-item>
                     </div>
                 </ion-card>
diff --git a/src/addons/mod/lti/pages/index/index.html b/src/addons/mod/lti/pages/index/index.html
index f742d5232..9b7017a3f 100644
--- a/src/addons/mod/lti/pages/index/index.html
+++ b/src/addons/mod/lti/pages/index/index.html
@@ -3,10 +3,12 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
 
         <ion-buttons slot="end">
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addons/mod/page/pages/index/index.html b/src/addons/mod/page/pages/index/index.html
index a5db017ea..cab819bed 100644
--- a/src/addons/mod/page/pages/index/index.html
+++ b/src/addons/mod/page/pages/index/index.html
@@ -3,10 +3,12 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
         <ion-buttons slot="end">
             <!-- The buttons defined by the component will be added in here. -->
         </ion-buttons>
diff --git a/src/addons/mod/quiz/components/navigation-modal/navigation-modal.html b/src/addons/mod/quiz/components/navigation-modal/navigation-modal.html
index 676df5862..9899cb608 100644
--- a/src/addons/mod/quiz/components/navigation-modal/navigation-modal.html
+++ b/src/addons/mod/quiz/components/navigation-modal/navigation-modal.html
@@ -1,7 +1,8 @@
 <ion-header>
     <ion-toolbar>
-        <h2>{{ 'addon.mod_quiz.quiznavigation' | translate }}</h2>
-
+        <ion-title>
+            <h2>{{ 'addon.mod_quiz.quiznavigation' | translate }}</h2>
+        </ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
                 <ion-icon slot="icon-only" name="fas-times" aria-hidden="true"></ion-icon>
@@ -41,12 +42,12 @@
                 <ion-icon *ngIf="question.stateClass == 'core-question-correct'" name="fas-check" color="success"
                     [attr.aria-label]="question.status" slot="end">
                 </ion-icon>
-                <ion-icon *ngIf="question.stateClass == 'core-question-partiallycorrect'" name="fas-check-square"
-                    color="warning" [attr.aria-label]="question.status" slot="end">
+                <ion-icon *ngIf="question.stateClass == 'core-question-partiallycorrect'" name="fas-check-square" color="warning"
+                    [attr.aria-label]="question.status" slot="end">
                 </ion-icon>
                 <ion-icon *ngIf="question.stateClass == 'core-question-incorrect' ||
-                    question.stateClass == 'core-question-notanswered'" name="fas-times" color="danger"
-                    [attr.aria-label]="question.status" slot="end">
+                    question.stateClass == 'core-question-notanswered'" name="fas-times" color="danger" [attr.aria-label]="question.status"
+                    slot="end">
                 </ion-icon>
             </ion-item>
 
diff --git a/src/addons/mod/quiz/components/preflight-modal/preflight-modal.html b/src/addons/mod/quiz/components/preflight-modal/preflight-modal.html
index 870360c9e..c642e6cc9 100644
--- a/src/addons/mod/quiz/components/preflight-modal/preflight-modal.html
+++ b/src/addons/mod/quiz/components/preflight-modal/preflight-modal.html
@@ -1,7 +1,8 @@
 <ion-header>
     <ion-toolbar>
-        <h2>{{ title | translate }}</h2>
-
+        <ion-title>
+            <h2>{{ title | translate }}</h2>
+        </ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
                 <ion-icon slot="icon-only" name="fas-times" aria-hidden="true"></ion-icon>
diff --git a/src/addons/mod/quiz/pages/attempt/attempt.html b/src/addons/mod/quiz/pages/attempt/attempt.html
index e709c561d..adf13e110 100644
--- a/src/addons/mod/quiz/pages/attempt/attempt.html
+++ b/src/addons/mod/quiz/pages/attempt/attempt.html
@@ -3,11 +3,13 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text *ngIf="quiz" [text]="quiz.name" contextLevel="module" [contextInstanceId]="quiz.coursemodule"
-                [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text *ngIf="quiz" [text]="quiz.name" contextLevel="module" [contextInstanceId]="quiz.coursemodule"
+                    [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
@@ -45,8 +47,8 @@
                 <ion-label>
                     <h2>{{ 'addon.mod_quiz.feedback' | translate }}</h2>
                     <p>
-                        <core-format-text [component]="component" [componentId]="componentId" [text]="feedback"
-                            contextLevel="module" [contextInstanceId]="cmId" [courseId]="courseId">
+                        <core-format-text [component]="component" [componentId]="componentId" [text]="feedback" contextLevel="module"
+                            [contextInstanceId]="cmId" [courseId]="courseId">
                         </core-format-text>
                     </p>
                 </ion-label>
diff --git a/src/addons/mod/quiz/pages/index/index.html b/src/addons/mod/quiz/pages/index/index.html
index 2cbf6b449..9a58a95ff 100644
--- a/src/addons/mod/quiz/pages/index/index.html
+++ b/src/addons/mod/quiz/pages/index/index.html
@@ -3,10 +3,12 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
 
         <ion-buttons slot="end">
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addons/mod/quiz/pages/player/player.html b/src/addons/mod/quiz/pages/player/player.html
index bd8d40246..b234f85ef 100644
--- a/src/addons/mod/quiz/pages/player/player.html
+++ b/src/addons/mod/quiz/pages/player/player.html
@@ -3,11 +3,13 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text *ngIf="quiz" [text]="quiz.name" contextLevel="module" [contextInstanceId]="quiz.coursemodule"
-                [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text *ngIf="quiz" [text]="quiz.name" contextLevel="module" [contextInstanceId]="quiz.coursemodule"
+                    [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
 
         <ion-buttons slot="end">
             <ion-button fill="clear" id="addon-mod_quiz-connection-error-button" [hidden]="!autoSaveError"
@@ -15,8 +17,7 @@
                 aria-haspopup="dialog">
                 <ion-icon name="fas-exclamation-circle" slot="icon-only" aria-hidden="true"></ion-icon>
             </ion-button>
-            <ion-button *ngIf="navigation.length" [attr.aria-label]="'addon.mod_quiz.opentoc' | translate"
-                (click)="openNavigation()">
+            <ion-button *ngIf="navigation.length" [attr.aria-label]="'addon.mod_quiz.opentoc' | translate" (click)="openNavigation()">
                 <ion-icon name="fas-bookmark" slot="icon-only" aria-hidden="true"></ion-icon>
             </ion-button>
         </ion-buttons>
@@ -24,8 +25,7 @@
     <!-- Navigation arrows and time left. -->
     <ion-toolbar *ngIf="loaded && endTime && questions.length && !quizAborted && !showSummary" color="light">
         <ion-title>
-            <core-timer [endTime]="endTime" (finished)="timeUp()" [timerText]="'addon.mod_quiz.timeleft' | translate"
-                [align]="'center'">
+            <core-timer [endTime]="endTime" (finished)="timeUp()" [timerText]="'addon.mod_quiz.timeleft' | translate" [align]="'center'">
             </core-timer>
         </ion-title>
         <ion-buttons slot="end">
@@ -79,10 +79,9 @@
                     </ion-item-divider>
 
                     <!-- Body of the question. -->
-                    <core-question class="ion-text-wrap" [question]="question" [component]="component"
-                        [componentId]="cmId" [attemptId]="attempt!.id" [usageId]="attempt!.uniqueid"
-                        [offlineEnabled]="offline" contextLevel="module" [contextInstanceId]="cmId"
-                        [courseId]="courseId" [preferredBehaviour]="quiz!.preferredbehaviour" [review]="false"
+                    <core-question class="ion-text-wrap" [question]="question" [component]="component" [componentId]="cmId"
+                        [attemptId]="attempt!.id" [usageId]="attempt!.uniqueid" [offlineEnabled]="offline" contextLevel="module"
+                        [contextInstanceId]="cmId" [courseId]="courseId" [preferredBehaviour]="quiz!.preferredbehaviour" [review]="false"
                         (onAbort)="abortQuiz()" (buttonClicked)="behaviourButtonClicked($event)">
                     </core-question>
                 </ion-card>
@@ -92,7 +91,7 @@
         <!-- Go to next or previous page. -->
         <ion-grid class="ion-text-wrap" *ngIf="questions.length && !quizAborted && !showSummary">
             <ion-row>
-                <ion-col *ngIf="previousPage >= 0" >
+                <ion-col *ngIf="previousPage >= 0">
                     <ion-button expand="block" color="light" (click)="changePage(previousPage)">
                         <ion-icon name="fas-chevron-left" slot="start" aria-hidden="true"></ion-icon>
                         {{ 'core.previous' | translate }}
@@ -131,8 +130,8 @@
             <!-- List of questions of the summary table. -->
             <ng-container *ngFor="let question of summaryQuestions">
                 <ion-item *ngIf="question.number" (click)="changePage(question.page, false, question.slot)"
-                    [attr.aria-label]="'core.question.questionno' | translate:{$a: question.number}"
-                    [detail]="!isSequential && canReturn" [button]="!isSequential && canReturn">
+                    [attr.aria-label]="'core.question.questionno' | translate:{$a: question.number}" [detail]="!isSequential && canReturn"
+                    [button]="!isSequential && canReturn">
                     <ion-label>
                         <ion-row class="ion-align-items-center">
                             <ion-col size="3" class="ion-text-center">{{ question.number }}</ion-col>
@@ -153,8 +152,7 @@
             </ion-item>
 
             <!-- Time left (if quiz is timed). -->
-            <core-timer *ngIf="endTime" [endTime]="endTime" (finished)="timeUp()"
-                [timerText]="'addon.mod_quiz.timeleft' | translate">
+            <core-timer *ngIf="endTime" [endTime]="endTime" (finished)="timeUp()" [timerText]="'addon.mod_quiz.timeleft' | translate">
             </core-timer>
 
             <!-- List of messages explaining why the quiz cannot be submitted. -->
@@ -165,15 +163,14 @@
                 </ion-label>
             </ion-item>
 
-            <ion-button *ngIf="preventSubmitMessages.length" expand="block" [href]="moduleUrl" core-link
-                [showBrowserWarning]="false">
+            <ion-button *ngIf="preventSubmitMessages.length" expand="block" [href]="moduleUrl" core-link [showBrowserWarning]="false">
                 {{ 'core.openinbrowser' | translate }}
                 <ion-icon name="fas-external-link-alt" slot="end" aria-hidden="true"></ion-icon>
             </ion-button>
 
             <!-- Button to submit the quiz. -->
-            <ion-button *ngIf="!attempt!.finishedOffline && !preventSubmitMessages.length" expand="block"
-                class="ion-margin" (click)="finishAttempt(true)">
+            <ion-button *ngIf="!attempt!.finishedOffline && !preventSubmitMessages.length" expand="block" class="ion-margin"
+                (click)="finishAttempt(true)">
                 {{ 'addon.mod_quiz.submitallandfinish' | translate }}
             </ion-button>
         </ion-card>
diff --git a/src/addons/mod/quiz/pages/review/review.html b/src/addons/mod/quiz/pages/review/review.html
index 214c2e0e9..be30538f5 100644
--- a/src/addons/mod/quiz/pages/review/review.html
+++ b/src/addons/mod/quiz/pages/review/review.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ 'addon.mod_quiz.review' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'addon.mod_quiz.review' | translate }}</h1>
+        </ion-title>
 
         <ion-buttons slot="end">
             <ion-button fill="clear" *ngIf="navigation.length" [attr.aria-label]="'addon.mod_quiz.opentoc' | translate"
@@ -75,8 +77,8 @@
                 <ion-item class="ion-text-wrap" *ngFor="let data of additionalData">
                     <ion-label>
                         <p class="item-heading">{{ data.title }}</p>
-                        <core-format-text [component]="component" [componentId]="cmId" [text]="data.content"
-                            contextLevel="module" [contextInstanceId]="cmId" [courseId]="courseId">
+                        <core-format-text [component]="component" [componentId]="cmId" [text]="data.content" contextLevel="module"
+                            [contextInstanceId]="cmId" [courseId]="courseId">
                         </core-format-text>
                     </ion-label>
                 </ion-item>
@@ -107,8 +109,7 @@
                     <!-- Body of the question. -->
                     <core-question class="ion-text-wrap" [question]="question" [component]="component" [componentId]="cmId"
                         [attemptId]="attempt.id" [usageId]="attempt.uniqueid" [offlineEnabled]="false" contextLevel="module"
-                        [contextInstanceId]="cmId" [courseId]="courseId" [review]="true"
-                        [preferredBehaviour]="quiz?.preferredbehaviour">
+                        [contextInstanceId]="cmId" [courseId]="courseId" [review]="true" [preferredBehaviour]="quiz?.preferredbehaviour">
                     </core-question>
                 </ion-card>
             </div>
@@ -130,8 +131,7 @@
                 </ion-button>
             </ion-col>
             <ion-col class="ion-text-end">
-                <ion-button color="light" *ngIf="nextPage >= -1" (click)="changePage(nextPage)"
-                    [attr.aria-label]="'core.next' | translate">
+                <ion-button color="light" *ngIf="nextPage >= -1" (click)="changePage(nextPage)" [attr.aria-label]="'core.next' | translate">
                     <ion-icon name="fas-chevron-right" slot="icon-only" aria-hidden="true"></ion-icon>
                 </ion-button>
             </ion-col>
diff --git a/src/addons/mod/resource/pages/index/index.html b/src/addons/mod/resource/pages/index/index.html
index d86648348..ac1c3727e 100644
--- a/src/addons/mod/resource/pages/index/index.html
+++ b/src/addons/mod/resource/pages/index/index.html
@@ -3,10 +3,12 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
 
         <ion-buttons slot="end">
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addons/mod/scorm/components/toc/toc.html b/src/addons/mod/scorm/components/toc/toc.html
index 6240aebd5..01163c6fc 100644
--- a/src/addons/mod/scorm/components/toc/toc.html
+++ b/src/addons/mod/scorm/components/toc/toc.html
@@ -1,6 +1,8 @@
 <ion-header>
     <ion-toolbar>
-        <h1>{{ 'addon.mod_scorm.toc' | translate }}</h1>
+        <ion-title>
+            <h2>{{ 'addon.mod_scorm.toc' | translate }}</h2>
+        </ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
                 <ion-icon slot="icon-only" name="fas-times" aria-hidden="true"></ion-icon>
@@ -36,8 +38,7 @@
                     <ion-icon *ngIf="sco.icon" [name]="sco.icon.icon" [attr.aria-label]="sco.icon.description" slot="start">
                     </ion-icon>
                     <ion-label>
-                        <core-format-text [text]="sco.title" contextLevel="module" [contextInstanceId]="moduleId"
-                            [courseId]="courseId">
+                        <core-format-text [text]="sco.title" contextLevel="module" [contextInstanceId]="moduleId" [courseId]="courseId">
                         </core-format-text>
                         <span *ngIf="accessInfo && accessInfo.canviewscores && sco.scoreraw">
                             ({{ 'addon.mod_scorm.score' | translate }}: {{sco.scoreraw}})
diff --git a/src/addons/mod/scorm/pages/index/index.html b/src/addons/mod/scorm/pages/index/index.html
index 2e3a4ded7..fc1e6f57f 100644
--- a/src/addons/mod/scorm/pages/index/index.html
+++ b/src/addons/mod/scorm/pages/index/index.html
@@ -3,10 +3,12 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
         <ion-buttons slot="end">
             <!-- The buttons defined by the component will be added in here. -->
         </ion-buttons>
diff --git a/src/addons/mod/scorm/pages/player/player.html b/src/addons/mod/scorm/pages/player/player.html
index 02e55ff42..469a6bd01 100644
--- a/src/addons/mod/scorm/pages/player/player.html
+++ b/src/addons/mod/scorm/pages/player/player.html
@@ -3,14 +3,16 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="cmId" [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="cmId" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
         <ion-buttons slot="end">
             <core-button-with-spinner *ngIf="showToc" [loading]="loadingToc">
-                <ion-button fill="clear" *ngIf="toc.length" (click)="openToc()"
-                    [attr.aria-label]="'addon.mod_scorm.toc' | translate" aria-haspopup="true">
+                <ion-button fill="clear" *ngIf="toc.length" (click)="openToc()" [attr.aria-label]="'addon.mod_scorm.toc' | translate"
+                    aria-haspopup="true">
                     <ion-icon name="fas-bookmark" slot="icon-only" aria-hidden="true"></ion-icon>
                 </ion-button>
             </core-button-with-spinner>
diff --git a/src/addons/mod/survey/pages/index/index.html b/src/addons/mod/survey/pages/index/index.html
index 8d0ffd272..808d88eb1 100644
--- a/src/addons/mod/survey/pages/index/index.html
+++ b/src/addons/mod/survey/pages/index/index.html
@@ -3,9 +3,11 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text>
+            </h1>
+        </ion-title>
 
         <ion-buttons slot="end">
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addons/mod/url/pages/index/index.html b/src/addons/mod/url/pages/index/index.html
index b93cbc153..45dc4198c 100644
--- a/src/addons/mod/url/pages/index/index.html
+++ b/src/addons/mod/url/pages/index/index.html
@@ -3,9 +3,11 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id"></core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id"></core-format-text>
+            </h1>
+        </ion-title>
 
         <ion-buttons slot="end">
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
index 5eecab5a1..e6628246f 100644
--- a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
+++ b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
@@ -50,13 +50,13 @@
     <!-- Activity info. -->
     <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
         [component]="component" [componentId]="componentId" [courseId]="courseId">
-        <h3 *ngIf="pageTitle" title>{{pageTitle}}</h3>
+        <h2 *ngIf="pageTitle" title>{{pageTitle}}</h2>
     </core-course-module-info>
 
     <div *ngIf="pageIsOffline || hasOffline || pageWarning">
         <!-- Wiki has something offline. -->
         <ion-card class="core-warning-card" *ngIf="pageIsOffline || hasOffline">
-            <ion-item>
+            <ion-item class="ion-text-wrap">
                 <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
                 <ion-label>
                     <span *ngIf="pageIsOffline">{{ 'core.hasdatatosync' | translate:{$a: pageStr} }}</span>
diff --git a/src/addons/mod/wiki/components/map/map.html b/src/addons/mod/wiki/components/map/map.html
index 3a205d1c8..c8c1a44cb 100644
--- a/src/addons/mod/wiki/components/map/map.html
+++ b/src/addons/mod/wiki/components/map/map.html
@@ -1,6 +1,8 @@
 <ion-header>
     <ion-toolbar>
-        <h1>{{ 'addon.mod_wiki.map' | translate }}</h1>
+        <ion-title>
+            <h2>{{ 'addon.mod_wiki.map' | translate }}</h2>
+        </ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
                 <ion-icon slot="icon-only" name="fas-times" aria-hidden="true"></ion-icon>
@@ -18,14 +20,15 @@
             </ion-item>
             <ng-container *ngFor="let letter of map">
                 <ion-item-divider *ngIf="letter.label">
-                    <ion-label><h2>{{ letter.label }}</h2></ion-label>
+                    <ion-label>
+                        <h2>{{ letter.label }}</h2>
+                    </ion-label>
                 </ion-item-divider>
                 <ion-item class="ion-text-wrap" *ngFor="let page of letter.pages" (click)="goToPage(page)"
                     [attr.aria-current]="selectedTitle == page.title ? 'page' : 'false'" button detail="false">
                     <ion-icon name="fas-home" slot="start" *ngIf="page.firstpage" aria-hidden="true"></ion-icon>
                     <ion-label>
-                        <core-format-text [text]="page.title" contextLevel="module" [contextInstanceId]="moduleId"
-                            [courseId]="courseId">
+                        <core-format-text [text]="page.title" contextLevel="module" [contextInstanceId]="moduleId" [courseId]="courseId">
                         </core-format-text>
                     </ion-label>
                     <ion-note *ngIf="!page.id" slot="end">
diff --git a/src/addons/mod/wiki/pages/edit/edit.html b/src/addons/mod/wiki/pages/edit/edit.html
index 3d30531df..d44b5db2d 100644
--- a/src/addons/mod/wiki/pages/edit/edit.html
+++ b/src/addons/mod/wiki/pages/edit/edit.html
@@ -3,10 +3,12 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="cmId" [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="cmId" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
 
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="save()">
@@ -20,20 +22,19 @@
         <form [formGroup]="pageForm" #editPageForm *ngIf="loaded">
             <ion-item class="ion-text-wrap" *ngIf="canEditTitle">
                 <ion-label class="sr-only">{{ 'addon.mod_wiki.newpagetitle' | translate }}</ion-label>
-                <ion-input name="title" type="text" [placeholder]="'addon.mod_wiki.newpagetitle' | translate"
-                    formControlName="title">
+                <ion-input name="title" type="text" [placeholder]="'addon.mod_wiki.newpagetitle' | translate" formControlName="title">
                 </ion-input>
             </ion-item>
 
             <ion-item>
                 <ion-label class="sr-only">{{ 'core.content' | translate }}</ion-label>
-                <core-rich-text-editor [control]="contentControl" [placeholder]="'core.content' | translate"
-                    name="wiki_page_content" [component]="component" [componentId]="cmId" [autoSave]="true" contextLevel="module"
-                    [contextInstanceId]="cmId" elementId="newcontent_editor" [draftExtraParams]="editorExtraParams">
+                <core-rich-text-editor [control]="contentControl" [placeholder]="'core.content' | translate" name="wiki_page_content"
+                    [component]="component" [componentId]="cmId" [autoSave]="true" contextLevel="module" [contextInstanceId]="cmId"
+                    elementId="newcontent_editor" [draftExtraParams]="editorExtraParams">
                 </core-rich-text-editor>
             </ion-item>
 
-            <ion-item *ngIf="wrongVersionLock" class="ion-text-center addon-mod_wiki-wrongversionlock" >
+            <ion-item *ngIf="wrongVersionLock" class="ion-text-center addon-mod_wiki-wrongversionlock">
                 <ion-label>
                     <ion-badge color="danger" class="ion-padding">{{ 'addon.mod_wiki.wrongversionlock' | translate }}</ion-badge>
                 </ion-label>
diff --git a/src/addons/mod/wiki/pages/index/index.html b/src/addons/mod/wiki/pages/index/index.html
index e8db7c3b0..6c07ead01 100644
--- a/src/addons/mod/wiki/pages/index/index.html
+++ b/src/addons/mod/wiki/pages/index/index.html
@@ -3,14 +3,16 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
-            </core-format-text>
-        </h1>
-        <p>
-            <core-format-text [text]="pageTitle" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
-            </core-format-text>
-        </p>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+            <h2>
+                <core-format-text [text]="pageTitle" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
+                </core-format-text>
+            </h2>
+        </ion-title>
 
         <ion-buttons slot="end">
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addons/mod/workshop/components/phase/phase.html b/src/addons/mod/workshop/components/phase/phase.html
index 63ba0446c..407551e37 100644
--- a/src/addons/mod/workshop/components/phase/phase.html
+++ b/src/addons/mod/workshop/components/phase/phase.html
@@ -1,9 +1,8 @@
 <ion-header>
     <ion-toolbar>
-        <ion-buttons slot="start">
-            <ion-back-button [text]="'core.back' | translate"></ion-back-button>
-        </ion-buttons>
-        <h2>{{ 'addon.mod_workshop.userplan' | translate }}</h2>
+        <ion-title>
+            <h2>{{ 'addon.mod_workshop.userplan' | translate }}</h2>
+        </ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
                 <ion-icon name="fas-times" slot="icon-only" aria-hidden=true></ion-icon>
@@ -30,8 +29,8 @@
                 <ion-icon slot="end" name="fas-external-link-alt" aria-hidden="true"></ion-icon>
             </ion-item>
             <ion-item class="ion-text-wrap" *ngFor="let task of phase.tasks"
-                [class.item-dimmed]="phase.code != workshopPhase || (task.code == 'submit' && !showSubmit)"
-                (click)="runTask(task)" detail="false" button>
+                [class.item-dimmed]="phase.code != workshopPhase || (task.code == 'submit' && !showSubmit)" (click)="runTask(task)"
+                detail="false" button>
                 <ion-icon slot="start" name="far-circle" *ngIf="task.completed == null"
                     [attr.aria-label]="'addon.mod_workshop.tasktodo' | translate"></ion-icon>
                 <ion-icon slot="start" name="fas-times-circle" color="danger" *ngIf="task.completed == ''"
diff --git a/src/addons/mod/workshop/pages/assessment/assessment.html b/src/addons/mod/workshop/pages/assessment/assessment.html
index 3415a603c..b5de87146 100644
--- a/src/addons/mod/workshop/pages/assessment/assessment.html
+++ b/src/addons/mod/workshop/pages/assessment/assessment.html
@@ -3,11 +3,13 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="workshop && workshop.coursemodule"
-                [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="workshop && workshop.coursemodule"
+                    [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
         <ion-buttons slot="end" [hidden]="!evaluating">
             <ion-button fill="clear" (click)="saveEvaluation()">
                 {{ 'core.save' | translate }}
@@ -48,14 +50,15 @@
             </ion-label>
         </ion-item>
 
-        <addon-mod-workshop-assessment-strategy
-            *ngIf="assessment && assessmentId && showGrade(assessment.grade) && workshop && access" [workshop]="workshop"
-            [access]="access" [assessmentId]="assessmentId" [userId]="profile && profile.id" [strategy]="strategy">
+        <addon-mod-workshop-assessment-strategy *ngIf="assessment && assessmentId && showGrade(assessment.grade) && workshop && access"
+            [workshop]="workshop" [access]="access" [assessmentId]="assessmentId" [userId]="profile && profile.id" [strategy]="strategy">
         </addon-mod-workshop-assessment-strategy>
 
         <form [formGroup]="evaluateForm" *ngIf="evaluating" #evaluateFormEl>
             <ion-item class="ion-text-wrap">
-                <ion-label><h2>{{ 'addon.mod_workshop.assessmentsettings' | translate }}</h2></ion-label>
+                <ion-label>
+                    <h2>{{ 'addon.mod_workshop.assessmentsettings' | translate }}</h2>
+                </ion-label>
             </ion-item>
             <ion-item class="ion-text-wrap" *ngIf="access?.canallocate">
                 <ion-label position="stacked">
@@ -85,16 +88,16 @@
             </ion-item>
             <ion-item *ngIf="access?.canoverridegrades">
                 <ion-label position="stacked">{{ 'addon.mod_workshop.feedbackreviewer' | translate }}</ion-label>
-                <core-rich-text-editor [control]="evaluateForm.controls['text']" name="text"
-                    [autoSave]="true" contextLevel="module" [contextInstanceId]="workshop?.coursemodule"
-                    elementId="feedbackreviewer_editor" [draftExtraParams]="{asid: assessmentId}">
+                <core-rich-text-editor [control]="evaluateForm.controls['text']" name="text" [autoSave]="true" contextLevel="module"
+                    [contextInstanceId]="workshop?.coursemodule" elementId="feedbackreviewer_editor"
+                    [draftExtraParams]="{asid: assessmentId}">
                 </core-rich-text-editor>
             </ion-item>
         </form>
         <ion-list *ngIf="!evaluating && evaluate && evaluate.text">
             <ion-item class="ion-text-wrap">
-                <core-user-avatar *ngIf="evaluateByProfile" [user]="evaluateByProfile" slot="start"
-                    [courseId]="courseId" [userId]="evaluateByProfile.id"></core-user-avatar>
+                <core-user-avatar *ngIf="evaluateByProfile" [user]="evaluateByProfile" slot="start" [courseId]="courseId"
+                    [userId]="evaluateByProfile.id"></core-user-avatar>
                 <ion-label>
                     <h2 *ngIf="evaluateByProfile && evaluateByProfile.fullname">
                         {{ 'addon.mod_workshop.feedbackby' | translate : {$a: evaluateByProfile.fullname} }}
diff --git a/src/addons/mod/workshop/pages/edit-submission/edit-submission.html b/src/addons/mod/workshop/pages/edit-submission/edit-submission.html
index ad52ca562..e7c928aad 100644
--- a/src/addons/mod/workshop/pages/edit-submission/edit-submission.html
+++ b/src/addons/mod/workshop/pages/edit-submission/edit-submission.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ 'addon.mod_workshop.editsubmission' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'addon.mod_workshop.editsubmission' | translate }}</h1>
+        </ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="save()" [attr.aria-label]="'core.save' | translate">
                 {{ 'core.save' | translate }}
@@ -38,9 +40,8 @@
             </ion-item>
 
             <core-attachments *ngIf="fileAvailable" [files]="attachments" [maxSize]="workshop.maxbytes"
-                [maxSubmissions]="workshop.nattachments" [component]="component" [componentId]="workshop.coursemodule"
-                allowOffline="true" [acceptedTypes]="workshop.submissionfiletypes" [required]="fileRequired"
-                [courseId]="workshop.course">
+                [maxSubmissions]="workshop.nattachments" [component]="component" [componentId]="workshop.coursemodule" allowOffline="true"
+                [acceptedTypes]="workshop.submissionfiletypes" [required]="fileRequired" [courseId]="workshop.course">
             </core-attachments>
         </form>
     </core-loading>
diff --git a/src/addons/mod/workshop/pages/index/index.html b/src/addons/mod/workshop/pages/index/index.html
index e408424a4..9b639898c 100644
--- a/src/addons/mod/workshop/pages/index/index.html
+++ b/src/addons/mod/workshop/pages/index/index.html
@@ -3,10 +3,12 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
         <ion-buttons slot="end">
             <!-- The buttons defined by the component will be added in here. -->
         </ion-buttons>
diff --git a/src/addons/mod/workshop/pages/submission/submission.html b/src/addons/mod/workshop/pages/submission/submission.html
index eed70a42b..754b7456a 100644
--- a/src/addons/mod/workshop/pages/submission/submission.html
+++ b/src/addons/mod/workshop/pages/submission/submission.html
@@ -3,10 +3,12 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text *ngIf="title" [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text *ngIf="title" [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
         <ion-buttons slot="end" [hidden]="!loaded">
             <ion-button *ngIf="assessmentId && access.assessingallowed" fill="clear" (click)="saveAssessment()"
                 [attr.aria-label]="'core.save' | translate">
@@ -55,8 +57,7 @@
                     <h2 *ngIf="evaluateByProfile && evaluateByProfile.fullname">
                         {{ 'addon.mod_workshop.feedbackby' | translate : {$a: evaluateByProfile.fullname} }}
                     </h2>
-                    <core-format-text [text]="evaluate?.text" contextLevel="module" [contextInstanceId]="module.id"
-                        [courseId]="courseId">
+                    <core-format-text [text]="evaluate?.text" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
                     </core-format-text>
                 </ion-label>
             </ion-item>
@@ -68,8 +69,8 @@
                     <h2>{{ 'addon.mod_workshop.yourassessment' | translate }}</h2>
                 </ion-label>
             </ion-item>
-            <addon-mod-workshop-assessment [submission]="submission" [assessment]="ownAssessment" [courseId]="courseId"
-                [access]="access" [module]="module" [workshop]="workshop">
+            <addon-mod-workshop-assessment [submission]="submission" [assessment]="ownAssessment" [courseId]="courseId" [access]="access"
+                [module]="module" [workshop]="workshop">
             </addon-mod-workshop-assessment>
         </ion-list>
 
@@ -92,8 +93,8 @@
                     <h2>{{ 'addon.mod_workshop.givengrades' | translate }}</h2>
                 </ion-label>
             </ion-item>
-            <addon-mod-workshop-assessment *ngFor="let reviewer of submissionInfo.reviewerof" [assessment]="reviewer"
-                [courseId]="courseId" [module]="module" [workshop]="workshop" [access]="access">
+            <addon-mod-workshop-assessment *ngFor="let reviewer of submissionInfo.reviewerof" [assessment]="reviewer" [courseId]="courseId"
+                [module]="module" [workshop]="workshop" [access]="access">
             </addon-mod-workshop-assessment>
         </ion-list>
 
@@ -126,21 +127,20 @@
             </ion-item>
             <ion-item>
                 <ion-label position="stacked">{{ 'addon.mod_workshop.feedbackauthor' | translate }}</ion-label>
-                <core-rich-text-editor [control]="feedbackForm.controls['text']" name="text"
-                    [autoSave]="true" contextLevel="module" [contextInstanceId]="module.id" elementId="feedbackauthor_editor"
-                    [draftExtraParams]="{id: submissionId}">
+                <core-rich-text-editor [control]="feedbackForm.controls['text']" name="text" [autoSave]="true" contextLevel="module"
+                    [contextInstanceId]="module.id" elementId="feedbackauthor_editor" [draftExtraParams]="{id: submissionId}">
                 </core-rich-text-editor>
             </ion-item>
         </form>
 
-        <addon-mod-workshop-assessment-strategy *ngIf="assessmentId" [workshop]="workshop" [access]="access"
-            [assessmentId]="assessmentId" [userId]="assessmentUserId" [strategy]="strategy" [edit]="access.assessingallowed">
+        <addon-mod-workshop-assessment-strategy *ngIf="assessmentId" [workshop]="workshop" [access]="access" [assessmentId]="assessmentId"
+            [userId]="assessmentUserId" [strategy]="strategy" [edit]="access.assessingallowed">
         </addon-mod-workshop-assessment-strategy>
 
         <ion-list *ngIf="assessmentId && !access.assessingallowed && assessment?.feedbackreviewer">
             <ion-item class="ion-text-wrap">
-                <core-user-avatar *ngIf="evaluateGradingByProfile" [user]="evaluateGradingByProfile" slot="start"
-                    [courseId]="courseId" [userId]="evaluateGradingByProfile.id"></core-user-avatar>
+                <core-user-avatar *ngIf="evaluateGradingByProfile" [user]="evaluateGradingByProfile" slot="start" [courseId]="courseId"
+                    [userId]="evaluateGradingByProfile.id"></core-user-avatar>
                 <ion-label>
                     <h2 *ngIf="evaluateGradingByProfile && evaluateGradingByProfile.fullname">
                         {{ 'addon.mod_workshop.feedbackby' | translate : {$a: evaluateGradingByProfile.fullname} }}
diff --git a/src/addons/notes/components/add/add-modal.html b/src/addons/notes/components/add/add-modal.html
index 1f30665e1..e3cb5c858 100644
--- a/src/addons/notes/components/add/add-modal.html
+++ b/src/addons/notes/components/add/add-modal.html
@@ -1,6 +1,8 @@
 <ion-header>
     <ion-toolbar>
-        <h2>{{ 'addon.notes.addnewnote' | translate }}</h2>
+        <ion-title>
+            <h2>{{ 'addon.notes.addnewnote' | translate }}</h2>
+        </ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
                 <ion-icon name="fas-times" slot="icon-only" aria-hidden=true></ion-icon>
@@ -20,8 +22,7 @@
         </ion-item>
         <ion-item>
             <ion-label class="sr-only">{{ 'addon.notes.note' | translate }}</ion-label>
-            <ion-textarea placeholder="{{ 'addon.notes.note' | translate }}" rows="5" [(ngModel)]="text" name="text"
-                required="required">
+            <ion-textarea placeholder="{{ 'addon.notes.note' | translate }}" rows="5" [(ngModel)]="text" name="text" required="required">
             </ion-textarea>
         </ion-item>
         <div class="ion-padding">
diff --git a/src/addons/notes/pages/list/list.html b/src/addons/notes/pages/list/list.html
index b643fd01c..e3a373bbe 100644
--- a/src/addons/notes/pages/list/list.html
+++ b/src/addons/notes/pages/list/list.html
@@ -4,7 +4,9 @@
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
 
-        <h1>{{ 'addon.notes.notes' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'addon.notes.notes' | translate }}</h1>
+        </ion-title>
         <ion-buttons slot="end">
         </ion-buttons>
     </ion-toolbar>
@@ -15,13 +17,12 @@
         <ion-icon name="fas-pen" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
     <core-context-menu>
-        <core-context-menu-item [hidden]="!(notesLoaded && !hasOffline)" [priority]="100"
-            [content]="'core.refresh' | translate" (action)="refreshNotes(false)"
-            [iconAction]="refreshIcon" [closeOnClick]="true">
+        <core-context-menu-item [hidden]="!(notesLoaded && !hasOffline)" [priority]="100" [content]="'core.refresh' | translate"
+            (action)="refreshNotes(false)" [iconAction]="refreshIcon" [closeOnClick]="true">
         </core-context-menu-item>
         <core-context-menu-item [hidden]="!(notesLoaded && hasOffline)" [priority]="100"
-            [content]="'core.settings.synchronizenow' | translate" (action)="refreshNotes(true)"
-            [iconAction]="syncIcon" [closeOnClick]="false"></core-context-menu-item>
+            [content]="'core.settings.synchronizenow' | translate" (action)="refreshNotes(true)" [iconAction]="syncIcon"
+            [closeOnClick]="false"></core-context-menu-item>
     </core-context-menu>
 </core-navbar-buttons>
 <ion-content>
@@ -32,7 +33,9 @@
     <core-loading [hideUntil]="notesLoaded">
         <ion-item class="ion-text-wrap" *ngIf="user">
             <core-user-avatar [user]="user" [courseId]="courseId" slot="start" [linkProfile]="false"></core-user-avatar>
-            <ion-label><h2>{{user!.fullname}}</h2></ion-label>
+            <ion-label>
+                <h2>{{user!.fullname}}</h2>
+            </ion-label>
         </ion-item>
 
         <core-combobox [selection]="type" (onChange)="typeChanged($event)">
@@ -83,14 +86,16 @@
                         [attr.aria-label]="'core.restore' | translate">
                         <ion-icon name="fas-undo-alt" slot="icon-only" aria-hidden="true"></ion-icon>
                     </ion-button>
-                    <ion-button *ngIf="showDelete && !note.deleted && (type != 'personal' || note.usermodified == currentUserId)"
-                        slot="end" fill="clear" [@coreSlideInOut]="'fromRight'" color="danger" (click)="deleteNote($event, note)"
+                    <ion-button *ngIf="showDelete && !note.deleted && (type != 'personal' || note.usermodified == currentUserId)" slot="end"
+                        fill="clear" [@coreSlideInOut]="'fromRight'" color="danger" (click)="deleteNote($event, note)"
                         [attr.aria-label]="'core.delete' | translate">
                         <ion-icon name="fas-trash" slot="icon-only" aria-hidden="true"></ion-icon>
                     </ion-button>
                 </ion-item>
                 <ion-item class="ion-text-wrap">
-                    <ion-label><core-format-text [text]="note.content" [filter]="false"></core-format-text></ion-label>
+                    <ion-label>
+                        <core-format-text [text]="note.content" [filter]="false"></core-format-text>
+                    </ion-label>
                 </ion-item>
             </ion-card>
         </ng-container>
diff --git a/src/addons/notifications/pages/list/list.html b/src/addons/notifications/pages/list/list.html
index a500d7296..18af2d97b 100644
--- a/src/addons/notifications/pages/list/list.html
+++ b/src/addons/notifications/pages/list/list.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ 'addon.notifications.notifications' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'addon.notifications.notifications' | translate }}</h1>
+        </ion-title>
         <ion-buttons slot="end">
             <core-user-menu-button></core-user-menu-button>
         </ion-buttons>
@@ -15,8 +17,7 @@
     </ion-refresher>
     <core-loading [hideUntil]="notificationsLoaded">
         <div class="ion-padding" *ngIf="canMarkAllNotificationsAsRead">
-            <ion-button [disabled]="loadingMarkAllNotificationsAsRead" expand="block" (click)="markAllNotificationsAsRead()"
-                color="light">
+            <ion-button [disabled]="loadingMarkAllNotificationsAsRead" expand="block" (click)="markAllNotificationsAsRead()" color="light">
                 <ion-icon slot="start" name="fas-check" aria-hidden="true" *ngIf="!loadingMarkAllNotificationsAsRead"></ion-icon>
                 <ion-spinner slot="start" [attr.aria-label]="'core.loading' | translate" *ngIf="loadingMarkAllNotificationsAsRead">
                 </ion-spinner>
@@ -25,8 +26,7 @@
         </div>
 
         <ion-card *ngFor="let notification of notifications">
-            <ion-item class="ion-text-wrap" lines="none"
-                [attr.aria-label]="
+            <ion-item class="ion-text-wrap" lines="none" [attr.aria-label]="
                     notification.timeread
                     ? notification.subject
                     : 'addon.notifications.unreadnotification' | translate: {$a: notification.subject}">
@@ -34,8 +34,8 @@
                     [profileUrl]="notification.profileimageurlfrom" [fullname]="notification.userfromfullname"
                     [userId]="notification.useridfrom" [extraIcon]="notification.iconurl"></core-user-avatar>
 
-                <img *ngIf="notification.useridfrom <= 0 && notification.iconurl" [src]="notification.iconurl" alt=""
-                    role="presentation" class="core-notification-icon" slot="start">
+                <img *ngIf="notification.useridfrom <= 0 && notification.iconurl" [src]="notification.iconurl" alt="" role="presentation"
+                    class="core-notification-icon" slot="start">
 
                 <ion-label>
                     <p class="item-heading">{{ notification.subject }}</p>
@@ -50,8 +50,8 @@
             </ion-item>
             <ion-item class="ion-text-wrap">
                 <ion-label>
-                    <core-format-text [text]="notification.mobiletext | coreCreateLinks" contextLevel="system"
-                    [contextInstanceId]="0" [maxHeight]="120">
+                    <core-format-text [text]="notification.mobiletext | coreCreateLinks" contextLevel="system" [contextInstanceId]="0"
+                        [maxHeight]="120">
                     </core-format-text>
                 </ion-label>
             </ion-item>
diff --git a/src/addons/notifications/pages/notification/notification.html b/src/addons/notifications/pages/notification/notification.html
index e4d879bb6..b227ffc7f 100644
--- a/src/addons/notifications/pages/notification/notification.html
+++ b/src/addons/notifications/pages/notification/notification.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h2>{{ 'addon.notifications.notifications' | translate }}</h2>
+        <ion-title>
+            <h2>{{ 'addon.notifications.notifications' | translate }}</h2>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
@@ -12,8 +14,7 @@
             <core-user-avatar *ngIf="userIdFrom > 0" slot="start" [userId]="userIdFrom" [profileUrl]="profileImageUrlFrom"
                 [fullname]="userFromFullName" [extraIcon]="iconUrl"></core-user-avatar>
 
-            <img *ngIf="userIdFrom <= 0 && iconUrl" [src]="iconUrl" alt=""
-                role="presentation" class="core-notification-icon" slot="start">
+            <img *ngIf="userIdFrom <= 0 && iconUrl" [src]="iconUrl" alt="" role="presentation" class="core-notification-icon" slot="start">
 
             <ion-label>
                 <p class="item-heading">{{ subject }}</p>
diff --git a/src/addons/notifications/pages/settings/settings.html b/src/addons/notifications/pages/settings/settings.html
index e8e9e7b49..cafdb246d 100644
--- a/src/addons/notifications/pages/settings/settings.html
+++ b/src/addons/notifications/pages/settings/settings.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ 'addon.notifications.notifications' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'addon.notifications.notifications' | translate }}</h1>
+        </ion-title>
         <ion-buttons slot="end">
         </ion-buttons>
     </ion-toolbar>
@@ -65,8 +67,7 @@
                                 !(notification.processorsByName[currentProcessor!.name][state] &&
                                 notification.processorsByName[currentProcessor!.name][state].updating)">
                             </ion-spinner>
-                            <ion-toggle
-                                *ngIf="preferences!.enableall && !notification.processorsByName[currentProcessor!.name].locked"
+                            <ion-toggle *ngIf="preferences!.enableall && !notification.processorsByName[currentProcessor!.name].locked"
                                 [(ngModel)]="notification.processorsByName[currentProcessor!.name][state].checked"
                                 (ngModelChange)="changePreference(notification, state)"
                                 [disabled]="notification.processorsByName[currentProcessor!.name][state].updating">
@@ -88,18 +89,15 @@
                 <!-- If notifications enabled, show toggles. If disabled, show "Disabled" instead of toggle. -->
                 <ion-item *ngFor="let state of ['loggedin', 'loggedoff']" class="ion-text-wrap ion-hide-md-up" lines="none">
                     <ion-label>{{ 'core.settings.' + state | translate }}</ion-label>
-                    <ion-spinner slot="end"
-                        *ngIf="preferences!.enableall && (notification.processorsByName[currentProcessor!.name][state] &&
+                    <ion-spinner slot="end" *ngIf="preferences!.enableall && (notification.processorsByName[currentProcessor!.name][state] &&
                         notification.processorsByName[currentProcessor!.name][state].updating)">
                     </ion-spinner>
-                    <ion-toggle slot="end"
-                        *ngIf="preferences!.enableall && !notification.processorsByName[currentProcessor!.name].locked"
+                    <ion-toggle slot="end" *ngIf="preferences!.enableall && !notification.processorsByName[currentProcessor!.name].locked"
                         [(ngModel)]="notification.processorsByName[currentProcessor!.name][state].checked"
                         (ngModelChange)="changePreference(notification, state)"
                         [disabled]="notification.processorsByName[currentProcessor!.name][state].updating">
                     </ion-toggle>
-                    <span slot="end"
-                        *ngIf="preferences!.enableall && notification.processorsByName[currentProcessor!.name].locked"
+                    <span slot="end" *ngIf="preferences!.enableall && notification.processorsByName[currentProcessor!.name].locked"
                         class="text-gray">
                         {{'core.settings.locked' | translate }}
                     </span>
diff --git a/src/addons/privatefiles/pages/index/index.html b/src/addons/privatefiles/pages/index/index.html
index d0550c4b7..3ddf3e3f7 100644
--- a/src/addons/privatefiles/pages/index/index.html
+++ b/src/addons/privatefiles/pages/index/index.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ title }}</h1>
+        <ion-title>
+            <h1>{{ title }}</h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
@@ -25,9 +27,11 @@
 
         <!-- Display info about space used and space left. -->
         <ion-card class="core-info-card" *ngIf="userQuota && filesInfo && filesInfo.filecount > 0">
-            <ion-item><ion-label>
-            {{ 'core.quotausage' | translate:{$a: {used: spaceUsed, total: userQuotaReadable} } }}
-            </ion-label></ion-item>
+            <ion-item>
+                <ion-label>
+                    {{ 'core.quotausage' | translate:{$a: {used: spaceUsed, total: userQuotaReadable} } }}
+                </ion-label>
+            </ion-item>
         </ion-card>
 
         <!-- List of files. -->
diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.html b/src/addons/storagemanager/pages/course-storage/course-storage.html
index a2417b7ac..42371c995 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.html
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ 'addon.storagemanager.managestorage' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'addon.storagemanager.managestorage' | translate }}</h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
@@ -20,8 +22,7 @@
                     </ion-label>
                     <p slot="end" class="ion-text-end">{{ totalSize | coreBytesToSize }}</p>
                     <ion-button slot="end" (click)="deleteForCourse()" [disabled]="totalSize == 0">
-                        <ion-icon name="fas-trash" slot="icon-only"
-                            [attr.aria-label]="'addon.storagemanager.deletecourse' | translate">
+                        <ion-icon name="fas-trash" slot="icon-only" [attr.aria-label]="'addon.storagemanager.deletecourse' | translate">
                         </ion-icon>
                     </ion-button>
                 </ion-item>
@@ -45,8 +46,8 @@
                 <ion-card-content>
                     <ng-container *ngFor="let module of section.modules">
                         <ion-item class="ion-no-padding" *ngIf="module.totalSize! > 0">
-                            <core-mod-icon slot="start" *ngIf="module.handlerData!.icon"
-                                [modicon]="module.handlerData!.icon" [modname]="module.modname" [componentId]="module.instance">
+                            <core-mod-icon slot="start" *ngIf="module.handlerData!.icon" [modicon]="module.handlerData!.icon"
+                                [modname]="module.modname" [componentId]="module.instance">
                             </core-mod-icon>
                             <ion-label class="ion-text-wrap">
                                 <h3 class="{{module.handlerData!.class}} addon-storagemanager-module-size">
diff --git a/src/addons/storagemanager/pages/courses-storage/courses-storage.html b/src/addons/storagemanager/pages/courses-storage/courses-storage.html
index 41c1f226a..ca9eb3b53 100644
--- a/src/addons/storagemanager/pages/courses-storage/courses-storage.html
+++ b/src/addons/storagemanager/pages/courses-storage/courses-storage.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ 'addon.storagemanager.managestorage' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'addon.storagemanager.managestorage' | translate }}</h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
@@ -14,12 +16,13 @@
                 <p class="ion-text-wrap">{{ 'addon.storagemanager.info' | translate }}</p>
                 <ion-item class="size ion-text-wrap ion-no-padding" lines="none">
                     <ion-icon name="fas-archive" slot="start" aria-hidden="true"></ion-icon>
-                    <ion-label><h2 class="ion-text-wrap">{{ 'addon.storagemanager.storageused' | translate }}</h2></ion-label>
+                    <ion-label>
+                        <h2 class="ion-text-wrap">{{ 'addon.storagemanager.storageused' | translate }}</h2>
+                    </ion-label>
                     <p slot="end" class="ion-text-end">{{ totalSize | coreBytesToSize }}</p>
                     <ion-button slot="end" (click)="deleteCompletelyDownloadedCourses()"
                         [disabled]="completelyDownloadedCourses.length === 0">
-                        <ion-icon name="fas-trash" slot="icon-only"
-                            ariaLabel="{{ 'addon.storagemanager.deletecourses' | translate }}">
+                        <ion-icon name="fas-trash" slot="icon-only" ariaLabel="{{ 'addon.storagemanager.deletecourses' | translate }}">
                         </ion-icon>
                     </ion-button>
                 </ion-item>
diff --git a/src/core/features/block/components/side-blocks/side-blocks.html b/src/core/features/block/components/side-blocks/side-blocks.html
index 52408d9f2..4b08c5b01 100644
--- a/src/core/features/block/components/side-blocks/side-blocks.html
+++ b/src/core/features/block/components/side-blocks/side-blocks.html
@@ -1,6 +1,8 @@
 <ion-header>
     <ion-toolbar>
-        <h1>{{ 'core.block.blocks' | translate }}</h1>
+        <ion-title>
+            <h2>{{ 'core.block.blocks' | translate }}</h2>
+        </ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
                 <ion-icon name="fas-times" slot="icon-only" aria-hidden=true></ion-icon>
diff --git a/src/core/features/comments/pages/viewer/viewer.html b/src/core/features/comments/pages/viewer/viewer.html
index b85e367b3..1534cdcef 100644
--- a/src/core/features/comments/pages/viewer/viewer.html
+++ b/src/core/features/comments/pages/viewer/viewer.html
@@ -3,19 +3,20 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text [text]="title" [contextLevel]="contextLevel" [contextInstanceId]="instanceId" [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="title" [contextLevel]="contextLevel" [contextInstanceId]="instanceId" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
         <ion-buttons slot="end">
             <ion-button *ngIf="canDeleteComments" slot="end" fill="clear" (click)="toggleDelete()"
                 [attr.aria-label]="'core.toggledelete' | translate">
                 <ion-icon name="fas-pen" slot="icon-only" aria-hidden="true"></ion-icon>
             </ion-button>
             <core-context-menu>
-                <core-context-menu-item [hidden]="!(commentsLoaded && !hasOffline)" [priority]="100"
-                    [content]="'core.refresh' | translate" (action)="refreshComments(false)" [iconAction]="refreshIcon"
-                    [closeOnClick]="true">
+                <core-context-menu-item [hidden]="!(commentsLoaded && !hasOffline)" [priority]="100" [content]="'core.refresh' | translate"
+                    (action)="refreshComments(false)" [iconAction]="refreshIcon" [closeOnClick]="true">
                 </core-context-menu-item>
                 <core-context-menu-item [hidden]="!(commentsLoaded && hasOffline)" [priority]="100"
                     [content]="'core.settings.synchronizenow' | translate" (action)="refreshComments(true)" [iconAction]="syncIcon"
@@ -30,8 +31,7 @@
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
     <core-loading [hideUntil]="commentsLoaded">
-        <core-empty-box *ngIf="!comments || !comments.length" icon="fas-comments"
-            [message]="'core.comments.nocomments' | translate">
+        <core-empty-box *ngIf="!comments || !comments.length" icon="fas-comments" [message]="'core.comments.nocomments' | translate">
         </core-empty-box>
 
         <!-- Load previous messages. -->
@@ -45,10 +45,8 @@
                     {{ comment.timecreated * 1000 | coreFormatDate: "strftimedayshort" }}
                 </p>
 
-                <ion-item class="ion-text-wrap addon-message"
-                    [class.addon-message-mine]="comment.userid == currentUserId"
-                    [class.addon-message-not-mine]="comment.userid != currentUserId"
-                    [class.addon-message-no-user]="!comment.showUserData"
+                <ion-item class="ion-text-wrap addon-message" [class.addon-message-mine]="comment.userid == currentUserId"
+                    [class.addon-message-not-mine]="comment.userid != currentUserId" [class.addon-message-no-user]="!comment.showUserData"
                     [@coreSlideInOut]="comment.userid == currentUserId ? '' : 'fromLeft'">
                     <ion-label>
                         <!-- User data. -->
@@ -88,10 +86,7 @@
                 </ion-item>
             </ng-container>
 
-            <ion-item
-                *ngIf="offlineComment"
-                class="ion-text-wrap addon-message addon-message-mine"
-            >
+            <ion-item *ngIf="offlineComment" class="ion-text-wrap addon-message addon-message-mine">
                 <ion-label>
                     <!-- User data. -->
                     <p class="ion-text-center">
@@ -109,9 +104,9 @@
                     <ion-icon name="fas-clock" aria-hidden="true"></ion-icon> {{ 'core.notsent' | translate }}
                 </ion-note>
                 <div class="tail"></div>
-                <ion-button *ngIf="showDelete" slot="end" fill="clear"
-                    [@coreSlideInOut]="'fromRight'" color="danger" (click)="deleteComment($event, offlineComment)"
-                    [attr.aria-label]="'core.delete' | translate" class="addon-messages-delete-button">
+                <ion-button *ngIf="showDelete" slot="end" fill="clear" [@coreSlideInOut]="'fromRight'" color="danger"
+                    (click)="deleteComment($event, offlineComment)" [attr.aria-label]="'core.delete' | translate"
+                    class="addon-messages-delete-button">
                     <ion-icon name="fas-trash" slot="icon-only" aria-hidden="true"></ion-icon>
                 </ion-button>
             </ion-item>
@@ -121,8 +116,8 @@
 </ion-content>
 <ion-footer class="footer-adjustable" *ngIf="commentsLoaded && canAddComments">
     <ion-toolbar color="contrast">
-        <core-send-message-form [sendDisabled]="sending" [message]="newComment"
-            (onSubmit)="addComment($event)" [placeholder]="'core.comments.addcomment' | translate">
+        <core-send-message-form [sendDisabled]="sending" [message]="newComment" (onSubmit)="addComment($event)"
+            [placeholder]="'core.comments.addcomment' | translate">
         </core-send-message-form>
     </ion-toolbar>
 </ion-footer>
diff --git a/src/core/features/contentlinks/components/choose-site-modal/choose-site-modal.html b/src/core/features/contentlinks/components/choose-site-modal/choose-site-modal.html
index 173e993fb..f166b4111 100644
--- a/src/core/features/contentlinks/components/choose-site-modal/choose-site-modal.html
+++ b/src/core/features/contentlinks/components/choose-site-modal/choose-site-modal.html
@@ -1,9 +1,8 @@
 <ion-header>
     <ion-toolbar>
-        <ion-buttons slot="start">
-            <ion-back-button [text]="'core.back' | translate"></ion-back-button>
-        </ion-buttons>
-        <h2>{{ 'core.contentlinks.chooseaccount' | translate }}</h2>
+        <ion-title>
+            <h2>{{ 'core.contentlinks.chooseaccount' | translate }}</h2>
+        </ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
                 <ion-icon slot="icon-only" name="fas-times" aria-hidden="true"></ion-icon>
@@ -23,12 +22,13 @@
             <ion-item *ngFor="let site of sites" (click)="siteClicked(site.id)" detail="false" button>
                 <ion-avatar slot="start">
                     <img [src]="site.avatar" core-external-content [siteId]="site.id"
-                        alt="{{ 'core.pictureof' | translate:{$a: site.fullName} }}"
-                        onError="this.src='assets/img/user-avatar.png'">
+                        alt="{{ 'core.pictureof' | translate:{$a: site.fullName} }}" onError="this.src='assets/img/user-avatar.png'">
                 </ion-avatar>
                 <ion-label>
                     <p class="item-heading">{{site.fullName}}</p>
-                    <p><core-format-text [text]="site.siteName" clean="true" [siteId]="site.id"></core-format-text></p>
+                    <p>
+                        <core-format-text [text]="site.siteName" clean="true" [siteId]="site.id"></core-format-text>
+                    </p>
                     <p>{{site.siteUrl}}</p>
                 </ion-label>
             </ion-item>
diff --git a/src/core/features/course/components/section-selector/section-selector.html b/src/core/features/course/components/section-selector/section-selector.html
index c30817397..82b2bf8b0 100644
--- a/src/core/features/course/components/section-selector/section-selector.html
+++ b/src/core/features/course/components/section-selector/section-selector.html
@@ -1,6 +1,8 @@
 <ion-header>
     <ion-toolbar>
-        <h2 id="core-course-section-selector-label">{{ 'core.course.sections' | translate }}</h2>
+        <ion-title>
+            <h2 id="core-course-section-selector-label">{{ 'core.course.sections' | translate }}</h2>
+        </ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
                 <ion-icon slot="icon-only" name="fas-times" aria-hidden="true"></ion-icon>
@@ -26,12 +28,10 @@
                         a11yText="core.course.aria:sectionprogress">
                     </core-progress-bar>
 
-                    <ion-badge color="info" *ngIf="section.visible === 0 && section.uservisible !== false"
-                        class="ion-text-wrap">
+                    <ion-badge color="info" *ngIf="section.visible === 0 && section.uservisible !== false" class="ion-text-wrap">
                         {{ 'core.course.hiddenfromstudents' | translate }}
                     </ion-badge>
-                    <ion-badge color="info" *ngIf="section.visible === 0 && section.uservisible === false"
-                        class="ion-text-wrap">
+                    <ion-badge color="info" *ngIf="section.visible === 0 && section.uservisible === false" class="ion-text-wrap">
                         {{ 'core.notavailable' | translate }}
                     </ion-badge>
                     <ion-badge color="info" *ngIf="section.availabilityinfo" class="ion-text-wrap">
diff --git a/src/core/features/course/pages/index/index.html b/src/core/features/course/pages/index/index.html
index 592166aad..b1776e63f 100644
--- a/src/core/features/course/pages/index/index.html
+++ b/src/core/features/course/pages/index/index.html
@@ -3,9 +3,11 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text [text]="title" contextLevel="course" [contextInstanceId]="course?.id"></core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="title" contextLevel="course" [contextInstanceId]="course?.id"></core-format-text>
+            </h1>
+        </ion-title>
 
         <ion-buttons slot="end"></ion-buttons>
     </ion-toolbar>
diff --git a/src/core/features/course/pages/list-mod-type/list-mod-type.html b/src/core/features/course/pages/list-mod-type/list-mod-type.html
index 4466314bd..1d6d7d2aa 100644
--- a/src/core/features/course/pages/list-mod-type/list-mod-type.html
+++ b/src/core/features/course/pages/list-mod-type/list-mod-type.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ title }}</h1>
+        <ion-title>
+            <h1>{{ title }}</h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
@@ -11,15 +13,14 @@
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
     <core-loading [hideUntil]="loaded">
-        <core-empty-box *ngIf="!sections || !sections.length" icon="fas-box-open"
-            [message]="'core.course.nocontentavailable' | translate">
+        <core-empty-box *ngIf="!sections || !sections.length" icon="fas-box-open" [message]="'core.course.nocontentavailable' | translate">
         </core-empty-box>
 
         <ion-list>
-            <ng-container *ngFor="let section of sections" >
+            <ng-container *ngFor="let section of sections">
                 <ng-container *ngFor="let module of section.modules">
-                    <core-course-module *ngIf="module.visibleoncoursepage !== 0" [module]="module" [section]="section"
-                        [courseId]="courseId" [downloadEnabled]="downloadEnabled">
+                    <core-course-module *ngIf="module.visibleoncoursepage !== 0" [module]="module" [section]="section" [courseId]="courseId"
+                        [downloadEnabled]="downloadEnabled">
                     </core-course-module>
                 </ng-container>
             </ng-container>
diff --git a/src/core/features/course/pages/preview/preview.html b/src/core/features/course/pages/preview/preview.html
index 49a16a7ab..92b3ff1eb 100644
--- a/src/core/features/course/pages/preview/preview.html
+++ b/src/core/features/course/pages/preview/preview.html
@@ -3,9 +3,11 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text [text]="course?.fullname" contextLevel="course" [contextInstanceId]="course?.id"></core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="course?.fullname" contextLevel="course" [contextInstanceId]="course?.id"></core-format-text>
+            </h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
diff --git a/src/core/features/course/pages/unsupported-module/unsupported-module.html b/src/core/features/course/pages/unsupported-module/unsupported-module.html
index c5e22195d..6760fda91 100644
--- a/src/core/features/course/pages/unsupported-module/unsupported-module.html
+++ b/src/core/features/course/pages/unsupported-module/unsupported-module.html
@@ -3,10 +3,12 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text [text]="module?.name" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="module?.name" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
 
         <ion-buttons slot="end">
             <core-context-menu>
diff --git a/src/core/features/courses/components/self-enrol-password/self-enrol-password.html b/src/core/features/courses/components/self-enrol-password/self-enrol-password.html
index e718d5487..45b60f5e3 100644
--- a/src/core/features/courses/components/self-enrol-password/self-enrol-password.html
+++ b/src/core/features/courses/components/self-enrol-password/self-enrol-password.html
@@ -1,7 +1,8 @@
 <ion-header>
     <ion-toolbar>
-        <h2>{{ 'core.courses.selfenrolment' | translate }}</h2>
-
+        <ion-title>
+            <h2>{{ 'core.courses.selfenrolment' | translate }}</h2>
+        </ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="close()" [attr.aria-label]="'core.close' | translate">
                 <ion-icon name="fas-times" slot="icon-only" aria-hidden="true"></ion-icon>
@@ -14,14 +15,8 @@
         <ion-item>
             <ion-label class="sr-only">{{ 'core.courses.password' | translate }}</ion-label>
             <core-show-password name="password">
-                <ion-input
-                    class="ion-text-wrap core-ioninput-password"
-                    name="password"
-                    type="password"
-                    placeholder="{{ 'core.courses.password' | translate }}"
-                    [(ngModel)]="password"
-                    core-auto-focus
-                    [clearOnEdit]="false">
+                <ion-input class="ion-text-wrap core-ioninput-password" name="password" type="password"
+                    placeholder="{{ 'core.courses.password' | translate }}" [(ngModel)]="password" core-auto-focus [clearOnEdit]="false">
                 </ion-input>
             </core-show-password>
         </ion-item>
diff --git a/src/core/features/courses/pages/categories/categories.html b/src/core/features/courses/pages/categories/categories.html
index 0baf6bdff..e087575a3 100644
--- a/src/core/features/courses/pages/categories/categories.html
+++ b/src/core/features/courses/pages/categories/categories.html
@@ -3,10 +3,12 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text [text]="title" contextLevel="coursecat" [contextInstanceId]="currentCategory && currentCategory!.id">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="title" contextLevel="coursecat" [contextInstanceId]="currentCategory && currentCategory!.id">
+                </core-format-text>
+            </h1>
+        </ion-title>
         <ion-buttons slot="end">
             <core-context-menu>
                 <core-context-menu-item *ngIf="downloadCourseEnabled || downloadCoursesEnabled" [priority]="1000"
diff --git a/src/core/features/courses/pages/list/list.html b/src/core/features/courses/pages/list/list.html
index ffb6b4b22..a75e9d3b0 100644
--- a/src/core/features/courses/pages/list/list.html
+++ b/src/core/features/courses/pages/list/list.html
@@ -3,16 +3,17 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1 *ngIf="!showOnlyEnrolled">{{ 'core.courses.availablecourses' | translate }}</h1>
-        <h1 *ngIf="showOnlyEnrolled">{{ 'core.courses.mycourses' | translate }}</h1>
+        <ion-title>
+            <h1 *ngIf="!showOnlyEnrolled">{{ 'core.courses.availablecourses' | translate }}</h1>
+            <h1 *ngIf="showOnlyEnrolled">{{ 'core.courses.mycourses' | translate }}</h1>
+        </ion-title>
         <ion-buttons slot="end">
             <core-context-menu>
                 <core-context-menu-item *ngIf="downloadCourseEnabled || downloadCoursesEnabled" [priority]="1000"
-                    [content]="'core.settings.showdownloadoptions' | translate" (action)="toggleDownload()"
-                    iconAction="toggle" [(toggle)]="downloadEnabled"></core-context-menu-item>
-                <core-context-menu-item [priority]="900"
-                    [content]="'core.courses.showonlyenrolled' | translate" (action)="toggleEnrolled()"
-                    iconAction="toggle" [(toggle)]="showOnlyEnrolled"></core-context-menu-item>   
+                    [content]="'core.settings.showdownloadoptions' | translate" (action)="toggleDownload()" iconAction="toggle"
+                    [(toggle)]="downloadEnabled"></core-context-menu-item>
+                <core-context-menu-item [priority]="900" [content]="'core.courses.showonlyenrolled' | translate" (action)="toggleEnrolled()"
+                    iconAction="toggle" [(toggle)]="showOnlyEnrolled"></core-context-menu-item>
             </core-context-menu>
             <core-user-menu-button></core-user-menu-button>
         </ion-buttons>
@@ -22,7 +23,7 @@
     <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="refreshCourses($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    
+
     <core-search-box *ngIf="searchEnabled" (onSubmit)="search($event)" (onClear)="clearSearch()"
         [placeholder]="'core.courses.search' | translate" [searchLabel]="'core.courses.search' | translate" [autoFocus]="searchMode"
         searchArea="CoreCoursesSearch"></core-search-box>
@@ -30,10 +31,12 @@
     <core-loading [hideUntil]="loaded">
         <ng-container *ngIf="searchMode && searchTotal > 0">
             <ion-item-divider>
-                <ion-label><h2>{{ 'core.courses.totalcoursesearchresults' | translate:{$a: searchTotal} }}</h2></ion-label>
+                <ion-label>
+                    <h2>{{ 'core.courses.totalcoursesearchresults' | translate:{$a: searchTotal} }}</h2>
+                </ion-label>
             </ion-item-divider>
         </ng-container>
-        
+
         <core-courses-course-list-item *ngFor="let course of courses" [course]="course" [showDownload]="downloadEnabled">
         </core-courses-course-list-item>
 
@@ -46,6 +49,6 @@
 
         <core-empty-box *ngIf="!searchMode && !courses.length" icon="fas-graduation-cap" [message]="'core.courses.nocourses' | translate">
         </core-empty-box>
-        
+
     </core-loading>
 </ion-content>
diff --git a/src/core/features/courses/pages/my/my.html b/src/core/features/courses/pages/my/my.html
index 83e679d1a..af8a8f2fa 100644
--- a/src/core/features/courses/pages/my/my.html
+++ b/src/core/features/courses/pages/my/my.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ 'core.courses.mycourses' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'core.courses.mycourses' | translate }}</h1>
+        </ion-title>
         <ion-buttons slot="end">
             <ion-button *ngIf="searchEnabled" (click)="openSearch()" [attr.aria-label]="'core.courses.searchcourses' | translate">
                 <ion-icon name="fas-search" slot="icon-only" aria-hidden="true"></ion-icon>
diff --git a/src/core/features/emulator/components/capture-media/capture-media.html b/src/core/features/emulator/components/capture-media/capture-media.html
index 19c040eba..f7be75b5c 100644
--- a/src/core/features/emulator/components/capture-media/capture-media.html
+++ b/src/core/features/emulator/components/capture-media/capture-media.html
@@ -1,6 +1,8 @@
 <ion-header>
     <ion-toolbar>
-        <h1 *ngIf="title">{{ title | translate }}</h1>
+        <ion-title>
+            <h1 *ngIf="title">{{ title | translate }}</h1>
+        </ion-title>
 
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="cancel()">{{ 'core.cancel' | translate }}</ion-button>
@@ -30,8 +32,7 @@
                 <canvas [hidden]="hasCaptured || isCordovaAudioCapture" class="core-audio-canvas" #streamAudio></canvas>
 
                 <!-- Button to start/stop in mobile devices. -->
-                <ion-button fill="clear" *ngIf="!hasCaptured && isCordovaAudioCapture" (click)="actionClicked()"
-                    [attr.aria-label]="title">
+                <ion-button fill="clear" *ngIf="!hasCaptured && isCordovaAudioCapture" (click)="actionClicked()" [attr.aria-label]="title">
                     <ion-icon *ngIf="!isCapturing" name="fas-microphone" slot="icon-only" aria-hidden="true"></ion-icon>
                     <ion-icon *ngIf="isCapturing" name="fas-square" slot="icon-only" aria-hidden="true"></ion-icon>
                 </ion-button>
@@ -47,8 +48,7 @@
     <ion-row>
         <ion-col></ion-col>
         <ion-col class="ion-text-center">
-            <ion-button fill="clear" *ngIf="!hasCaptured && !isCordovaAudioCapture" (click)="actionClicked()"
-                [attr.aria-label]="title">
+            <ion-button fill="clear" *ngIf="!hasCaptured && !isCordovaAudioCapture" (click)="actionClicked()" [attr.aria-label]="title">
                 <ion-icon *ngIf="!isCapturing && isAudio" name="fas-microphone" slot="icon-only" aria-hidden="true"></ion-icon>
                 <ion-icon *ngIf="!isCapturing && isVideo" name="fas-video" slot="icon-only" aria-hidden="true"></ion-icon>
                 <ion-icon *ngIf="isImage" name="fas-camera" slot="icon-only" aria-hidden="true"></ion-icon>
diff --git a/src/core/features/grades/pages/course/course.html b/src/core/features/grades/pages/course/course.html
index 4b301f9ba..b4e94d4d0 100644
--- a/src/core/features/grades/pages/course/course.html
+++ b/src/core/features/grades/pages/course/course.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ 'core.grades.grades' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'core.grades.grades' | translate }}</h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
@@ -18,54 +20,33 @@
                 <table cellspacing="0" cellpadding="0" class="core-grades-table">
                     <thead>
                         <tr>
-                            <th
-                                *ngFor="let column of grades.columns"
-                                id="{{column.name}}"
-                                class="ion-text-start"
-                                [class.ion-hide-md-down]="column.hiddenPhone"
-                                [attr.colspan]="column.colspan"
-                            >
+                            <th *ngFor="let column of grades.columns" id="{{column.name}}" class="ion-text-start"
+                                [class.ion-hide-md-down]="column.hiddenPhone" [attr.colspan]="column.colspan">
                                 {{ 'core.grades.' + column.name | translate }}
                             </th>
                         </tr>
                     </thead>
                     <tbody>
-                        <tr
-                            *ngFor="let row of grades.rows"
-                            role="button row"
-                            [attr.tabindex]="row.itemtype != 'category' ? 0 : null"
-                            (ariaButtonClick)="row.itemtype != 'category' && grades.select(row)"
-                            [class]="row.rowclass"
-                            [ngClass]='{"core-grades-grade-clickable": row.itemtype != "category"}'
-                        >
+                        <tr *ngFor="let row of grades.rows" role="button row" [attr.tabindex]="row.itemtype != 'category' ? 0 : null"
+                            (ariaButtonClick)="row.itemtype != 'category' && grades.select(row)" [class]="row.rowclass"
+                            [ngClass]='{"core-grades-grade-clickable": row.itemtype != "category"}'>
                             <ng-container *ngIf="row.itemtype">
-                                <td
-                                    *ngIf="row.itemtype == 'category'"
-                                    class="core-grades-table-category"
-                                    [attr.rowspan]="row.rowspan"
-                                ></td>
-                                <th
-                                    class="core-grades-table-gradeitem ion-text-start"
-                                    [class.column-itemname]="row.itemtype == 'category'"
-                                    [attr.aria-current]="grades.getItemAriaCurrent(row)"
-                                    [attr.colspan]="row.colspan"
-                                >
+                                <td *ngIf="row.itemtype == 'category'" class="core-grades-table-category" [attr.rowspan]="row.rowspan"></td>
+                                <th class="core-grades-table-gradeitem ion-text-start" [class.column-itemname]="row.itemtype == 'category'"
+                                    [attr.aria-current]="grades.getItemAriaCurrent(row)" [attr.colspan]="row.colspan">
                                     <ion-icon *ngIf="row.icon" name="{{row.icon}}" slot="start" [attr.aria-label]="row.iconAlt">
                                     </ion-icon>
                                     <img *ngIf="row.image && !row.itemmodule" [src]="row.image" slot="start" class="core-module-icon"
-                                        [alt]="row.iconAlt"/>
+                                        [alt]="row.iconAlt" />
                                     <core-mod-icon *ngIf="row.image && row.itemmodule" [modicon]="row.image" slot="start"
                                         [modname]="row.itemmodule">
                                     </core-mod-icon>
                                     <span [innerHTML]="row.gradeitem"></span>
                                 </th>
                                 <ng-container *ngFor="let column of grades.columns">
-                                    <td
-                                        *ngIf="column.name != 'gradeitem' && row[column.name] != undefined"
+                                    <td *ngIf="column.name != 'gradeitem' && row[column.name] != undefined"
                                         [class]="'ion-text-start core-grades-table-' + column.name"
-                                        [class.ion-hide-md-down]="column.hiddenPhone"
-                                        [innerHTML]="row[column.name]"
-                                    ></td>
+                                        [class.ion-hide-md-down]="column.hiddenPhone" [innerHTML]="row[column.name]"></td>
                                 </ng-container>
                             </ng-container>
                         </tr>
diff --git a/src/core/features/grades/pages/courses/courses.html b/src/core/features/grades/pages/courses/courses.html
index c977b811f..13902dfcb 100644
--- a/src/core/features/grades/pages/courses/courses.html
+++ b/src/core/features/grades/pages/courses/courses.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ 'core.grades.grades' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'core.grades.grades' | translate }}</h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
@@ -12,28 +14,16 @@
             <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
         </ion-refresher>
         <core-loading [hideUntil]="courses.loaded">
-            <core-empty-box
-                *ngIf="courses.empty"
-                icon="fas-chart-bar"
-                [message]="'core.grades.nogradesreturned' | translate"
-            ></core-empty-box>
+            <core-empty-box *ngIf="courses.empty" icon="fas-chart-bar" [message]="'core.grades.nogradesreturned' | translate">
+            </core-empty-box>
 
             <ion-list *ngIf="!courses.empty">
-                <ion-item
-                    *ngFor="let course of courses.items"
-                    [attr.aria-label]="course.courseFullName"
-                    [attr.aria-current]="courses.getItemAriaCurrent(course)"
-                    class="ion-text-wrap"
-                    button
-                    detail="true"
-                    (click)="courses.select(course)"
-                >
+                <ion-item *ngFor="let course of courses.items" [attr.aria-label]="course.courseFullName"
+                    [attr.aria-current]="courses.getItemAriaCurrent(course)" class="ion-text-wrap" button detail="true"
+                    (click)="courses.select(course)">
                     <ion-label>
-                        <core-format-text
-                            [text]="course.courseFullName"
-                            [contextInstanceId]="course.courseid"
-                            contextLevel="course"
-                        ></core-format-text>
+                        <core-format-text [text]="course.courseFullName" [contextInstanceId]="course.courseid" contextLevel="course">
+                        </core-format-text>
                     </ion-label>
                     <ion-badge slot="end" color="light">
                         <span class="sr-only" *ngIf="course.grade && course.grade != '-'">
diff --git a/src/core/features/grades/pages/grade/grade.html b/src/core/features/grades/pages/grade/grade.html
index f565c8388..ddb6bf6d2 100644
--- a/src/core/features/grades/pages/grade/grade.html
+++ b/src/core/features/grades/pages/grade/grade.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ 'core.grades.grade' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'core.grades.grade' | translate }}</h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
diff --git a/src/core/features/login/components/site-help/site-help.html b/src/core/features/login/components/site-help/site-help.html
index 17f803afe..10242b5cd 100644
--- a/src/core/features/login/components/site-help/site-help.html
+++ b/src/core/features/login/components/site-help/site-help.html
@@ -1,7 +1,8 @@
 <ion-header>
     <ion-toolbar>
-        <h2>{{ 'core.login.help' | translate }}</h2>
-
+        <ion-title>
+            <h2>{{ 'core.login.help' | translate }}</h2>
+        </ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="closeHelp()" [attr.aria-label]="'core.close' | translate">
                 <ion-icon slot="icon-only" name="fas-times" aria-hidden="true"></ion-icon>
@@ -48,8 +49,10 @@
         </ion-item>
         <ion-item class="ion-text-wrap">
             <ion-label>
-                <p><core-format-text [text]="'core.login.faqsetupsiteanswer' | translate:{$link: setupLinkHtml}" [filter]="false">
-                </core-format-text></p>
+                <p>
+                    <core-format-text [text]="'core.login.faqsetupsiteanswer' | translate:{$link: setupLinkHtml}" [filter]="false">
+                    </core-format-text>
+                </p>
             </ion-label>
         </ion-item>
         <ion-item class="ion-text-wrap">
diff --git a/src/core/features/login/components/site-onboarding/site-onboarding.html b/src/core/features/login/components/site-onboarding/site-onboarding.html
index 67ef6d1cb..cd000ea2b 100644
--- a/src/core/features/login/components/site-onboarding/site-onboarding.html
+++ b/src/core/features/login/components/site-onboarding/site-onboarding.html
@@ -5,7 +5,7 @@
                 <ion-icon slot="icon-only" name="fas-arrow-left" aria-hidden="true"></ion-icon>
             </ion-button>
         </ion-buttons>
-
+        <ion-title></ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="skip($event)" [attr.aria-label]="'core.skip' | translate">
                 {{'core.skip' | translate}}
diff --git a/src/core/features/login/components/sites/sites.html b/src/core/features/login/components/sites/sites.html
index 5cf1c7fae..66eea2e81 100644
--- a/src/core/features/login/components/sites/sites.html
+++ b/src/core/features/login/components/sites/sites.html
@@ -6,7 +6,9 @@
             </ion-button>
         </ion-buttons>
 
-        <h1>{{ 'core.mainmenu.switchaccount' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'core.mainmenu.switchaccount' | translate }}</h1>
+        </ion-title>
 
         <ion-buttons slot="end">
             <ion-button fill="clear" *ngIf="accountsList.count > 1" (click)="toggleDelete()"
diff --git a/src/core/features/login/pages/change-password/change-password.html b/src/core/features/login/pages/change-password/change-password.html
index 4ac4410a5..d3b0e44e7 100644
--- a/src/core/features/login/pages/change-password/change-password.html
+++ b/src/core/features/login/pages/change-password/change-password.html
@@ -4,7 +4,9 @@
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
 
-        <h1>{{ 'core.login.changepassword' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'core.login.changepassword' | translate }}</h1>
+        </ion-title>
 
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="showHelp()" [attr.aria-label]="'core.help' | translate">
diff --git a/src/core/features/login/pages/credentials/credentials.html b/src/core/features/login/pages/credentials/credentials.html
index 364f1fe3b..bd28dced2 100644
--- a/src/core/features/login/pages/credentials/credentials.html
+++ b/src/core/features/login/pages/credentials/credentials.html
@@ -4,7 +4,9 @@
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
 
-        <h1>{{ 'core.login.login' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'core.login.login' | translate }}</h1>
+        </ion-title>
 
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="openSettings()" [attr.aria-label]="'core.settings.appsettings' | translate">
@@ -31,17 +33,15 @@
         <form [formGroup]="credForm" (ngSubmit)="login($event)" class="core-login-form" #credentialsForm>
             <ion-item *ngIf="siteChecked && !isBrowserSSO">
                 <ion-label class="sr-only">{{ 'core.login.username' | translate }}</ion-label>
-                <ion-input type="text" name="username" placeholder="{{ 'core.login.username' | translate }}"
-                    formControlName="username" autocapitalize="none" autocorrect="off" autocomplete="username" enterkeyhint="next"
-                    required="true">
+                <ion-input type="text" name="username" placeholder="{{ 'core.login.username' | translate }}" formControlName="username"
+                    autocapitalize="none" autocorrect="off" autocomplete="username" enterkeyhint="next" required="true">
                 </ion-input>
             </ion-item>
             <ion-item *ngIf="siteChecked && !isBrowserSSO" class="ion-margin-bottom">
                 <ion-label class="sr-only">{{ 'core.login.password' | translate }}</ion-label>
                 <core-show-password name="password">
                     <ion-input name="password" type="password" placeholder="{{ 'core.login.password' | translate }}"
-                        formControlName="password" [clearOnEdit]="false" autocomplete="current-password" enterkeyhint="go"
-                        required="true">
+                        formControlName="password" [clearOnEdit]="false" autocomplete="current-password" enterkeyhint="go" required="true">
                     </ion-input>
                 </core-show-password>
             </ion-item>
@@ -49,7 +49,7 @@
                 class="ion-margin core-login-login-button">
                 {{ 'core.login.loginbutton' | translate }}
             </ion-button>
-             <!-- Remove this once Ionic fixes this bug: https://github.com/ionic-team/ionic-framework/issues/19368 -->
+            <!-- Remove this once Ionic fixes this bug: https://github.com/ionic-team/ionic-framework/issues/19368 -->
             <input type="submit" class="core-submit-hidden-enter" />
 
             <ng-container *ngIf="showScanQR">
@@ -62,20 +62,16 @@
         </form>
 
         <!-- Forgotten password option. -->
-        <ion-button
-            *ngIf="showForgottenPassword"
-            expand="block"
-            fill="clear"
-            color="dark"
-            class="core-login-forgotten-password core-button-as-link ion-text-wrap"
-            (click)="forgottenPassword()"
-        >
+        <ion-button *ngIf="showForgottenPassword" expand="block" fill="clear" color="dark"
+            class="core-login-forgotten-password core-button-as-link ion-text-wrap" (click)="forgottenPassword()">
             <ion-label>{{ 'core.login.forgotten' | translate }}</ion-label>
         </ion-button>
 
         <ion-list *ngIf="identityProviders && identityProviders.length" class="ion-padding-top core-login-identity-providers">
             <ion-item class="ion-text-wrap" lines="none">
-                <ion-label><h3 class="item-heading">{{ 'core.login.potentialidps' | translate }}</h3></ion-label>
+                <ion-label>
+                    <h3 class="item-heading">{{ 'core.login.potentialidps' | translate }}</h3>
+                </ion-label>
             </ion-item>
             <ion-item button *ngFor="let provider of identityProviders" class="ion-text-wrap core-oauth-icon"
                 (click)="oauthClicked(provider)" [attr.aria-label]="provider.name" detail="false">
@@ -86,10 +82,16 @@
 
         <ion-list *ngIf="canSignup" class="ion-padding-top core-login-sign-up">
             <ion-item class="ion-text-wrap" lines="none">
-                <ion-label><h3 class="item-heading">{{ 'core.login.firsttime' | translate }}</h3></ion-label>
+                <ion-label>
+                    <h3 class="item-heading">{{ 'core.login.firsttime' | translate }}</h3>
+                </ion-label>
             </ion-item>
             <ion-item class="ion-text-wrap" lines="none" *ngIf="authInstructions">
-                <ion-label><p><core-format-text [text]="authInstructions" [filter]="false"></core-format-text></p></ion-label>
+                <ion-label>
+                    <p>
+                        <core-format-text [text]="authInstructions" [filter]="false"></core-format-text>
+                    </p>
+                </ion-label>
             </ion-item>
             <ion-button expand="block" class="ion-margin ion-text-wrap" color="light" (click)="openEmailSignup()">
                 {{ 'core.login.startsignup' | translate }}
diff --git a/src/core/features/login/pages/email-signup/email-signup.html b/src/core/features/login/pages/email-signup/email-signup.html
index e630caba2..ddd61f93a 100644
--- a/src/core/features/login/pages/email-signup/email-signup.html
+++ b/src/core/features/login/pages/email-signup/email-signup.html
@@ -4,7 +4,9 @@
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
 
-        <h1>{{ 'core.login.newaccount' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'core.login.newaccount' | translate }}</h1>
+        </ion-title>
 
         <ion-buttons slot="end">
             <ion-button fill="clear" *ngIf="authInstructions" (click)="showAuthInstructions()"
@@ -34,11 +36,13 @@
         </ion-list>
 
         <!-- Age verification. -->
-        <form *ngIf="allRequiredSupported && settingsLoaded && settings && ageDigitalConsentVerification"
-            [formGroup]="ageVerificationForm" (ngSubmit)="verifyAge($event)" #ageForm>
+        <form *ngIf="allRequiredSupported && settingsLoaded && settings && ageDigitalConsentVerification" [formGroup]="ageVerificationForm"
+            (ngSubmit)="verifyAge($event)" #ageForm>
 
             <ion-item-divider class="ion-text-wrap">
-                <ion-label><h3>{{ 'core.agelocationverification' | translate }}</h3></ion-label>
+                <ion-label>
+                    <h3>{{ 'core.agelocationverification' | translate }}</h3>
+                </ion-label>
             </ion-item-divider>
 
             <ion-item class="ion-text-wrap">
@@ -73,8 +77,8 @@
         </form>
 
         <!-- Signup form. -->
-        <form *ngIf="allRequiredSupported && settingsLoaded && settings && !ageDigitalConsentVerification"
-            [formGroup]="signupForm" (ngSubmit)="create($event)" #signupFormEl>
+        <form *ngIf="allRequiredSupported && settingsLoaded && settings && !ageDigitalConsentVerification" [formGroup]="signupForm"
+            (ngSubmit)="create($event)" #signupFormEl>
 
             <ion-item class="ion-text-wrap ion-text-center">
                 <ion-label>
@@ -90,14 +94,16 @@
 
             <!-- Username and password. -->
             <ion-item-divider class="ion-text-wrap">
-                <ion-label><h3>{{ 'core.login.createuserandpass' | translate }}</h3></ion-label>
+                <ion-label>
+                    <h3>{{ 'core.login.createuserandpass' | translate }}</h3>
+                </ion-label>
             </ion-item-divider>
             <ion-item class="ion-text-wrap">
                 <ion-label position="stacked">
                     <span core-mark-required="true">{{ 'core.login.username' | translate }}</span>
                 </ion-label>
-                <ion-input type="text" name="username" placeholder="{{ 'core.login.username' | translate }}"
-                    formControlName="username" autocapitalize="none" autocorrect="off">
+                <ion-input type="text" name="username" placeholder="{{ 'core.login.username' | translate }}" formControlName="username"
+                    autocapitalize="none" autocorrect="off">
                 </ion-input>
                 <core-input-errors [control]="signupForm.controls.username" [errorMessages]="usernameErrors"></core-input-errors>
             </ion-item>
@@ -169,7 +175,9 @@
             <!-- Other categories. -->
             <ng-container *ngFor="let category of categories">
                 <ion-item-divider class="ion-text-wrap">
-                    <ion-label><p class="item-heading">{{ category.name }}</p></ion-label>
+                    <ion-label>
+                        <p class="item-heading">{{ category.name }}</p>
+                    </ion-label>
                 </ion-item-divider>
                 <core-user-profile-field *ngFor="let field of category.fields" [field]="field" [edit]="true" [signup]="true"
                     registerAuth="email" [form]="signupForm"></core-user-profile-field>
@@ -188,7 +196,9 @@
             <!-- Site policy (if any). -->
             <ng-container *ngIf="settings.sitepolicy">
                 <ion-item-divider class="ion-text-wrap">
-                    <ion-label><h3>{{ 'core.login.policyagreement' | translate }}</h3></ion-label>
+                    <ion-label>
+                        <h3>{{ 'core.login.policyagreement' | translate }}</h3>
+                    </ion-label>
                 </ion-item-divider>
                 <ion-item class="ion-text-wrap">
                     <ion-label>
diff --git a/src/core/features/login/pages/forgotten-password/forgotten-password.html b/src/core/features/login/pages/forgotten-password/forgotten-password.html
index 015eb8d7e..2798c9b99 100644
--- a/src/core/features/login/pages/forgotten-password/forgotten-password.html
+++ b/src/core/features/login/pages/forgotten-password/forgotten-password.html
@@ -4,7 +4,9 @@
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
 
-        <h1>{{ 'core.login.passwordforgotten' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'core.login.passwordforgotten' | translate }}</h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
@@ -16,7 +18,9 @@
     <ion-card>
         <form [formGroup]="myForm" (ngSubmit)="resetPassword($event)" #resetPasswordForm>
             <ion-item-divider class="ion-text-wrap">
-                <ion-label><h2>{{ 'core.login.searchby' | translate }}</h2></ion-label>
+                <ion-label>
+                    <h2>{{ 'core.login.searchby' | translate }}</h2>
+                </ion-label>
             </ion-item-divider>
             <ion-radio-group formControlName="field">
                 <ion-item>
@@ -30,8 +34,8 @@
             </ion-radio-group>
             <ion-item>
                 <ion-label class="sr-only">{{ 'core.login.usernameoremail' | translate }}</ion-label>
-                <ion-input type="text" name="value" placeholder="{{ 'core.login.usernameoremail' | translate }}"
-                    formControlName="value" autocapitalize="none" autocorrect="off" [core-auto-focus]="autoFocus">
+                <ion-input type="text" name="value" placeholder="{{ 'core.login.usernameoremail' | translate }}" formControlName="value"
+                    autocapitalize="none" autocorrect="off" [core-auto-focus]="autoFocus">
                 </ion-input>
             </ion-item>
             <ion-button type="submit" class="ion-margin" expand="block" [disabled]="!myForm.valid">
diff --git a/src/core/features/login/pages/reconnect/reconnect.html b/src/core/features/login/pages/reconnect/reconnect.html
index 23445a7ae..5d41ab921 100644
--- a/src/core/features/login/pages/reconnect/reconnect.html
+++ b/src/core/features/login/pages/reconnect/reconnect.html
@@ -4,7 +4,9 @@
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
 
-        <h1>{{ 'core.login.reconnect' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'core.login.reconnect' | translate }}</h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content class="ion-padding" (keydown)="keyDown($event)" (keyup)="keyUp($event)">
@@ -71,24 +73,20 @@
     </form>
 
     <!-- Forgotten password option. -->
-    <ion-button
-        *ngIf="showForgottenPassword && !isOAuth"
-        expand="block"
-        fill="clear"
-        color="dark"
-        class="core-login-forgotten-password core-button-as-link ion-text-wrap"
-        (click)="forgottenPassword()"
-    >
+    <ion-button *ngIf="showForgottenPassword && !isOAuth" expand="block" fill="clear" color="dark"
+        class="core-login-forgotten-password core-button-as-link ion-text-wrap" (click)="forgottenPassword()">
         <ion-label>{{ 'core.login.forgotten' | translate }}</ion-label>
     </ion-button>
 
     <!-- Identity providers. -->
     <ion-list *ngIf="identityProviders && identityProviders.length" class="ion-padding-top core-login-identity-providers">
         <ion-item class="ion-text-wrap" lines="none">
-            <ion-label><h3 class="item-heading">{{ 'core.login.potentialidps' | translate }}</h3></ion-label>
+            <ion-label>
+                <h3 class="item-heading">{{ 'core.login.potentialidps' | translate }}</h3>
+            </ion-label>
         </ion-item>
-        <ion-item button *ngFor="let provider of identityProviders" class="ion-text-wrap core-oauth-icon"
-            (click)="oauthClicked(provider)" detail="false">
+        <ion-item button *ngFor="let provider of identityProviders" class="ion-text-wrap core-oauth-icon" (click)="oauthClicked(provider)"
+            detail="false">
             <img [src]="provider.iconurl" alt="" role="presentation" width="32" height="32" slot="start">
             <ion-label>{{provider.name}}</ion-label>
         </ion-item>
diff --git a/src/core/features/login/pages/site-policy/site-policy.html b/src/core/features/login/pages/site-policy/site-policy.html
index 4d870ab9a..0218d615b 100644
--- a/src/core/features/login/pages/site-policy/site-policy.html
+++ b/src/core/features/login/pages/site-policy/site-policy.html
@@ -4,19 +4,25 @@
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
 
-        <h1>{{ 'core.login.policyagreement' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'core.login.policyagreement' | translate }}</h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
     <core-loading [hideUntil]="policyLoaded">
         <ion-list *ngIf="sitePolicy">
             <ion-item class="ion-text-wrap">
-                <ion-label><p>{{ 'core.login.policyagree' | translate }}</p></ion-label>
+                <ion-label>
+                    <p>{{ 'core.login.policyagree' | translate }}</p>
+                </ion-label>
             </ion-item>
             <ion-item class="ion-text-wrap">
-                <ion-label><p>
-                    <a [href]="sitePolicy" core-link [capture]="false">{{ 'core.login.policyagreementclick' | translate }}</a>
-                </p></ion-label>
+                <ion-label>
+                    <p>
+                        <a [href]="sitePolicy" core-link [capture]="false">{{ 'core.login.policyagreementclick' | translate }}</a>
+                    </p>
+                </ion-label>
             </ion-item>
             <ion-card *ngIf="showInline">
                 <core-iframe [src]="sitePolicy"></core-iframe>
diff --git a/src/core/features/login/pages/site/site.html b/src/core/features/login/pages/site/site.html
index 08da8b895..6302070b4 100644
--- a/src/core/features/login/pages/site/site.html
+++ b/src/core/features/login/pages/site/site.html
@@ -4,7 +4,9 @@
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
 
-        <h1>{{ 'core.login.connecttomoodle' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'core.login.connecttomoodle' | translate }}</h1>
+        </ion-title>
 
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="openSettings()" [attr.aria-label]="'core.settings.appsettings' | translate">
@@ -14,8 +16,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content class="ion-padding">
-    <div class="ion-text-center ion-padding ion-margin-bottom core-login-site-logo"
-        [class.hidden]="hasSites || enteredSiteUrl">
+    <div class="ion-text-center ion-padding ion-margin-bottom core-login-site-logo" [class.hidden]="hasSites || enteredSiteUrl">
         <img src="assets/img/login_logo.png" class="avatar-full login-logo" role="presentation" alt="">
     </div>
     <form [formGroup]="siteForm" (ngSubmit)="connect($event, siteForm.value.siteUrl)" *ngIf="!fixedSites" #siteFormEl>
@@ -108,14 +109,8 @@
     </ng-container>
 
     <!-- Help. -->
-    <ion-button
-        class="ion-margin-top core-login-need-help core-button-as-link ion-text-wrap"
-        (click)="showHelp()"
-        aria-haspopup="dialog"
-        expand="block"
-        fill="clear"
-        color="dark"
-    >
+    <ion-button class="ion-margin-top core-login-need-help core-button-as-link ion-text-wrap" (click)="showHelp()" aria-haspopup="dialog"
+        expand="block" fill="clear" color="dark">
         <ion-label>{{ 'core.needhelp' | translate }}</ion-label>
     </ion-button>
 </ion-content>
diff --git a/src/core/features/login/pages/sites/sites.html b/src/core/features/login/pages/sites/sites.html
index a47a65f2f..994b7e7df 100644
--- a/src/core/features/login/pages/sites/sites.html
+++ b/src/core/features/login/pages/sites/sites.html
@@ -4,7 +4,9 @@
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
 
-        <h1>{{ 'core.login.accounts' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'core.login.accounts' | translate }}</h1>
+        </ion-title>
 
         <ion-buttons slot="end">
             <ion-button fill="clear" *ngIf="accountsList.count > 0" (click)="toggleDelete()"
diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.html b/src/core/features/mainmenu/components/user-menu/user-menu.html
index 34a9184f7..2f30c77d8 100644
--- a/src/core/features/mainmenu/components/user-menu/user-menu.html
+++ b/src/core/features/mainmenu/components/user-menu/user-menu.html
@@ -1,13 +1,15 @@
 <ion-header>
     <ion-toolbar>
-        <ion-buttons slot="start">
+        <ion-title>
+            <h2>
+                {{'core.user.account' | translate}}
+            </h2>
+        </ion-title>
+        <ion-buttons slot="end">
             <ion-button fill="clear" (click)="close($event)" [attr.aria-label]="'core.close' | translate">
                 <ion-icon name="fas-times" slot="icon-only" aria-hidden="true"></ion-icon>
             </ion-button>
         </ion-buttons>
-        <h1>
-            {{'core.user.account' | translate}}
-        </h1>
     </ion-toolbar>
 </ion-header>
 <ion-content>
diff --git a/src/core/features/mainmenu/pages/home/home.html b/src/core/features/mainmenu/pages/home/home.html
index e953b24c2..7f670c80a 100644
--- a/src/core/features/mainmenu/pages/home/home.html
+++ b/src/core/features/mainmenu/pages/home/home.html
@@ -3,10 +3,12 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="0"></core-format-text>
-            <img src="assets/img/top_logo.png" class="core-header-logo" [alt]="siteName">
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="0"></core-format-text>
+                <img src="assets/img/top_logo.png" class="core-header-logo" [alt]="siteName">
+            </h1>
+        </ion-title>
         <ion-buttons slot="end">
             <core-user-menu-button></core-user-menu-button>
         </ion-buttons>
@@ -15,6 +17,5 @@
 <core-loading [hideUntil]="loaded">
     <core-empty-box *ngIf="tabs.length == 0" icon="fas-home" [message]="'core.courses.nocourses' | translate"></core-empty-box>
 </core-loading>
-<core-tabs-outlet *ngIf="tabs.length > 0" [selectedIndex]="selectedTab" [hideUntil]="loaded" [tabs]="tabs"
-    (ionChange)="tabSelected()">
+<core-tabs-outlet *ngIf="tabs.length > 0" [selectedIndex]="selectedTab" [hideUntil]="loaded" [tabs]="tabs" (ionChange)="tabSelected()">
 </core-tabs-outlet>
diff --git a/src/core/features/mainmenu/pages/more/more.html b/src/core/features/mainmenu/pages/more/more.html
index 2d111d407..9f8869ba6 100644
--- a/src/core/features/mainmenu/pages/more/more.html
+++ b/src/core/features/mainmenu/pages/more/more.html
@@ -4,7 +4,9 @@
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
 
-        <h1>{{ 'core.more' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'core.more' | translate }}</h1>
+        </ion-title>
 
         <ion-buttons slot="end">
             <core-user-menu-button></core-user-menu-button>
@@ -14,7 +16,9 @@
 <ion-content>
     <ion-list>
         <ion-item class="ion-text-center" *ngIf="(!handlers || !handlers.length) && !handlersLoaded">
-            <ion-label><ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner></ion-label>
+            <ion-label>
+                <ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner>
+            </ion-label>
         </ion-item>
         <ion-item button *ngFor="let handler of handlers" [ngClass]="['core-moremenu-handler', handler.class || '']"
             (click)="openHandler(handler)" [attr.aria-label]="handler.title | translate" detail="true">
diff --git a/src/core/features/rating/components/ratings/ratings-modal.html b/src/core/features/rating/components/ratings/ratings-modal.html
index 1eef7adfc..484398ae5 100644
--- a/src/core/features/rating/components/ratings/ratings-modal.html
+++ b/src/core/features/rating/components/ratings/ratings-modal.html
@@ -1,6 +1,8 @@
 <ion-header>
     <ion-toolbar>
-        <h2>{{ 'core.rating.ratings' | translate }}</h2>
+        <ion-title>
+            <h2>{{ 'core.rating.ratings' | translate }}</h2>
+        </ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
                 <ion-icon slot="icon-only" name="fas-times" aria-hidden="true"></ion-icon>
diff --git a/src/core/features/settings/pages/about/about.html b/src/core/features/settings/pages/about/about.html
index 255941ddc..061f88ec3 100644
--- a/src/core/features/settings/pages/about/about.html
+++ b/src/core/features/settings/pages/about/about.html
@@ -3,9 +3,11 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            {{ 'core.settings.about' | translate}}
-        </h1>
+        <ion-title>
+            <h1>
+                {{ 'core.settings.about' | translate}}
+            </h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 
@@ -13,36 +15,26 @@
     <ion-list>
         <ion-item button class="ion-text-wrap" detail="false" (click)="openPage('deviceinfo')">
             <ion-icon name="fas-mobile" slot="start" aria-hidden="true"></ion-icon>
-            <ion-label><h2>{{ appName }} {{ versionName }}</h2></ion-label>
+            <ion-label>
+                <h2>{{ appName }} {{ versionName }}</h2>
+            </ion-label>
         </ion-item>
         <ion-item button class="ion-text-wrap" (click)="openPage('licenses')" detail="true">
             <ion-icon name="far-copyright" slot="start" aria-hidden="true"></ion-icon>
             <ion-label>{{ 'core.settings.opensourcelicenses' | translate }}</ion-label>
         </ion-item>
-        <ion-item
-            *ngIf="privacyPolicy"
-            class="ion-text-wrap"
-            button core-link auto-login="no" [href]="privacyPolicy"
-            detail="true" detailIcon="open-outline"
-        >
+        <ion-item *ngIf="privacyPolicy" class="ion-text-wrap" button core-link auto-login="no" [href]="privacyPolicy" detail="true"
+            detailIcon="open-outline">
             <ion-icon name="fas-user-shield" slot="start" aria-hidden="true"></ion-icon>
             <ion-label>{{ 'core.settings.privacypolicy' | translate }}</ion-label>
         </ion-item>
-        <ion-item
-            *ngIf="a11yStatement"
-            class="ion-text-wrap"
-            button core-link auto-login="no" [href]="a11yStatement"
-            detail="true" detailIcon="open-outline"
-        >
+        <ion-item *ngIf="a11yStatement" class="ion-text-wrap" button core-link auto-login="no" [href]="a11yStatement" detail="true"
+            detailIcon="open-outline">
             <ion-icon name="fas-universal-access" slot="start" aria-hidden="true"></ion-icon>
             <ion-label>{{ 'core.settings.accessibilitystatement' | translate }}</ion-label>
         </ion-item>
-        <ion-item
-            *ngIf="feedbackFormUrl"
-            class="ion-text-wrap"
-            button core-link [href]="feedbackFormUrl"
-            detail="true" detailIcon="open-outline"
-        >
+        <ion-item *ngIf="feedbackFormUrl" class="ion-text-wrap" button core-link [href]="feedbackFormUrl" detail="true"
+            detailIcon="open-outline">
             <ion-icon name="fas-bullhorn" slot="start" aria-hidden="true"></ion-icon>
             <ion-label>{{ 'core.settings.helpusimprove' | translate }}</ion-label>
         </ion-item>
diff --git a/src/core/features/settings/pages/dev/dev.html b/src/core/features/settings/pages/dev/dev.html
index 1e970cc73..2140d1bfa 100644
--- a/src/core/features/settings/pages/dev/dev.html
+++ b/src/core/features/settings/pages/dev/dev.html
@@ -4,7 +4,9 @@
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
 
-        <h1>{{ 'core.settings.developeroptions' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'core.settings.developeroptions' | translate }}</h1>
+        </ion-title>
 
         <ion-buttons slot="end" *ngIf="siteId">
             <ion-button fill="clear" (click)="copyInfo()" [attr.aria-label]="'core.settings.copyinfo' | translate">
@@ -31,25 +33,35 @@
         <ng-container *ngIf="siteId">
             <ion-item class="ion-text-wrap">
                 <ion-label>
-                    <h2>{{ 'core.settings.remotestyles' | translate }} <ion-badge>{{remoteStylesCount}}</ion-badge></h2>
+                    <h2>{{ 'core.settings.remotestyles' | translate }} <ion-badge>{{remoteStylesCount}}</ion-badge>
+                    </h2>
                 </ion-label>
                 <ion-toggle [(ngModel)]="remoteStyles" (ionChange)="remoteStylesChanged()"></ion-toggle>
             </ion-item>
             <ion-item class="ion-text-wrap">
                 <ion-label>
-                    <h2>{{ 'core.settings.pluginstyles' | translate }} <ion-badge>{{pluginStylesCount}}</ion-badge></h2>
+                    <h2>{{ 'core.settings.pluginstyles' | translate }} <ion-badge>{{pluginStylesCount}}</ion-badge>
+                    </h2>
                 </ion-label>
                 <ion-toggle [(ngModel)]="pluginStyles" (ionChange)="pluginStylesChanged()"></ion-toggle>
             </ion-item>
 
-            <ion-item-divider><ion-label><h2>{{ 'core.settings.disabledfeatures' | translate }}</h2></ion-label></ion-item-divider>
+            <ion-item-divider>
+                <ion-label>
+                    <h2>{{ 'core.settings.disabledfeatures' | translate }}</h2>
+                </ion-label>
+            </ion-item-divider>
             <ion-item class="ion-text-wrap" *ngFor="let feature of disabledFeatures">
                 <ion-label>
                     <h2>{{ feature }}</h2>
                 </ion-label>
             </ion-item>
 
-            <ion-item-divider><ion-label><h2>{{ 'core.settings.siteplugins' | translate }}</h2></ion-label></ion-item-divider>
+            <ion-item-divider>
+                <ion-label>
+                    <h2>{{ 'core.settings.siteplugins' | translate }}</h2>
+                </ion-label>
+            </ion-item-divider>
             <ion-item class="ion-text-wrap" *ngFor="let plugin of sitePlugins">
                 <ion-label>
                     <h2>{{ plugin.addon }} ({{plugin.component}})</h2>
diff --git a/src/core/features/settings/pages/deviceinfo/deviceinfo.html b/src/core/features/settings/pages/deviceinfo/deviceinfo.html
index 8379b26df..ed8401cd8 100644
--- a/src/core/features/settings/pages/deviceinfo/deviceinfo.html
+++ b/src/core/features/settings/pages/deviceinfo/deviceinfo.html
@@ -3,9 +3,11 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            {{ 'core.settings.deviceinfo' | translate }}
-        </h1>
+        <ion-title>
+            <h1>
+                {{ 'core.settings.deviceinfo' | translate }}
+            </h1>
+        </ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="copyInfo()" [attr.aria-label]="'core.settings.copyinfo' | translate">
                 <ion-icon slot="icon-only" name="fas-clipboard" aria-hidden="true"></ion-icon>
@@ -37,7 +39,8 @@
         </ion-item>
         <ion-item *ngIf="deviceInfo.siteUrl" (longPress)="copyItemInfo($event)">
             <ion-label class="ion-text-wrap">
-                <h2>{{ 'core.settings.siteinfo' | translate }}<ng-container *ngIf="deviceInfo.isPrefixedUrl"> *</ng-container></h2>
+                <h2>{{ 'core.settings.siteinfo' | translate }}<ng-container *ngIf="deviceInfo.isPrefixedUrl"> *</ng-container>
+                </h2>
                 <p><a [href]="deviceInfo.siteUrl" core-link auto-login="yes">{{ deviceInfo.siteUrl }}</a></p>
                 <p *ngIf="deviceInfo.siteVersion">{{ deviceInfo.siteVersion }}</p>
                 <p *ngIf="deviceInfo.siteId">{{ deviceInfo.siteId }}</p>
diff --git a/src/core/features/settings/pages/general/general.html b/src/core/features/settings/pages/general/general.html
index a859ca45f..530926a4a 100644
--- a/src/core/features/settings/pages/general/general.html
+++ b/src/core/features/settings/pages/general/general.html
@@ -4,7 +4,9 @@
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
 
-        <h1>{{ 'core.settings.general' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'core.settings.general' | translate }}</h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
@@ -46,7 +48,9 @@
             </ion-select>
         </ion-item>
         <ion-item text-wrap *ngIf="colorSchemes.length > 0 && selectedScheme=='system' && isAndroid">
-            <ion-label><p>{{ 'core.settings.colorscheme-system-notice' | translate }}</p></ion-label>
+            <ion-label>
+                <p>{{ 'core.settings.colorscheme-system-notice' | translate }}</p>
+            </ion-label>
         </ion-item>
         <ion-item class="ion-text-wrap">
             <ion-label>
diff --git a/src/core/features/settings/pages/index/index.html b/src/core/features/settings/pages/index/index.html
index d56fe5e76..aa88d9c50 100644
--- a/src/core/features/settings/pages/index/index.html
+++ b/src/core/features/settings/pages/index/index.html
@@ -3,15 +3,17 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ 'core.settings.appsettings' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'core.settings.appsettings' | translate }}</h1>
+        </ion-title>
         <ion-buttons slot="end"></ion-buttons>
     </ion-toolbar>
 </ion-header>
 <ion-content>
     <core-split-view>
         <ion-list>
-            <ion-item *ngFor="let section of sections.items" [attr.aria-current]="sections.getItemAriaCurrent(section)" button
-                detail="true" (click)="sections.select(section)">
+            <ion-item *ngFor="let section of sections.items" [attr.aria-current]="sections.getItemAriaCurrent(section)" button detail="true"
+                (click)="sections.select(section)">
                 <ion-icon [name]="section.icon" slot="start" aria-hidden="true"></ion-icon>
                 <ion-label>{{ section.name | translate }}</ion-label>
             </ion-item>
diff --git a/src/core/features/settings/pages/licenses/licenses.html b/src/core/features/settings/pages/licenses/licenses.html
index 0be97cb16..8306bb9e9 100644
--- a/src/core/features/settings/pages/licenses/licenses.html
+++ b/src/core/features/settings/pages/licenses/licenses.html
@@ -4,7 +4,9 @@
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
 
-        <h1>{{ 'core.settings.opensourcelicenses' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'core.settings.opensourcelicenses' | translate }}</h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
diff --git a/src/core/features/settings/pages/site/site.html b/src/core/features/settings/pages/site/site.html
index af29f5ee0..3361e02ab 100644
--- a/src/core/features/settings/pages/site/site.html
+++ b/src/core/features/settings/pages/site/site.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ 'core.settings.preferences' | translate}}</h1>
+        <ion-title>
+            <h1>{{ 'core.settings.preferences' | translate}}</h1>
+        </ion-title>
         <ion-buttons slot="end">
         </ion-buttons>
     </ion-toolbar>
@@ -48,8 +50,7 @@
                         <ion-icon name="fas-info-circle" color="info" slot="icon-only"></ion-icon>
                     </ion-button>
                     <core-button-with-spinner [loading]="isSynchronizing()" slot="end">
-                        <ion-button fill="clear" (click)="synchronize()"
-                            [attr.aria-label]="'core.settings.synchronizenow' | translate">
+                        <ion-button fill="clear" (click)="synchronize()" [attr.aria-label]="'core.settings.synchronizenow' | translate">
                             <ion-icon name="fas-sync-alt" slot="icon-only" aria-hidden="true"></ion-icon>
                         </ion-button>
                     </core-button-with-spinner>
diff --git a/src/core/features/settings/pages/space-usage/space-usage.html b/src/core/features/settings/pages/space-usage/space-usage.html
index 6d1343a40..51bd07d89 100644
--- a/src/core/features/settings/pages/space-usage/space-usage.html
+++ b/src/core/features/settings/pages/space-usage/space-usage.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ 'core.settings.spaceusage' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'core.settings.spaceusage' | translate }}</h1>
+        </ion-title>
         <ion-buttons slot="end">
             <core-navbar-buttons>
                 <ion-button (click)="showInfo()" [attr.aria-label]="'core.info' | translate">
diff --git a/src/core/features/settings/pages/synchronization/synchronization.html b/src/core/features/settings/pages/synchronization/synchronization.html
index 31fe30857..cb0243de0 100644
--- a/src/core/features/settings/pages/synchronization/synchronization.html
+++ b/src/core/features/settings/pages/synchronization/synchronization.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ 'core.settings.synchronization' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'core.settings.synchronization' | translate }}</h1>
+        </ion-title>
         <ion-buttons slot="end">
             <core-navbar-buttons>
                 <ion-button (click)="showInfo()" [attr.aria-label]="'core.info' | translate">
diff --git a/src/core/features/sharedfiles/components/list-modal/list-modal.html b/src/core/features/sharedfiles/components/list-modal/list-modal.html
index 602b672ac..682496ad4 100644
--- a/src/core/features/sharedfiles/components/list-modal/list-modal.html
+++ b/src/core/features/sharedfiles/components/list-modal/list-modal.html
@@ -1,10 +1,8 @@
 <ion-header>
     <ion-toolbar>
-        <ion-buttons slot="start">
-            <ion-back-button [text]="'core.back' | translate"></ion-back-button>
-        </ion-buttons>
-        <h2>{{ title }}</h2>
-
+        <ion-title>
+            <h2>{{ title }}</h2>
+        </ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
                 <ion-icon name="fas-times" slot="icon-only" aria-hidden=true></ion-icon>
@@ -13,8 +11,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <core-shared-files-list [siteId]="siteId" [mimetypes]="mimetypes" [isModal]="true" [manage]="manage" [pick]="pick"
-        [path]="path" [showSitePicker]="!hideSitePicker" (onPathChanged)="calculateTitle($event)"
-        (onFilePicked)="filePicked($event)">
+    <core-shared-files-list [siteId]="siteId" [mimetypes]="mimetypes" [isModal]="true" [manage]="manage" [pick]="pick" [path]="path"
+        [showSitePicker]="!hideSitePicker" (onPathChanged)="calculateTitle($event)" (onFilePicked)="filePicked($event)">
     </core-shared-files-list>
 </ion-content>
diff --git a/src/core/features/sharedfiles/pages/choose-site/choose-site.html b/src/core/features/sharedfiles/pages/choose-site/choose-site.html
index 23a7b4e54..f931b9365 100644
--- a/src/core/features/sharedfiles/pages/choose-site/choose-site.html
+++ b/src/core/features/sharedfiles/pages/choose-site/choose-site.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ 'core.sharedfiles.sharedfiles' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'core.sharedfiles.sharedfiles' | translate }}</h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
@@ -18,12 +20,13 @@
             <ion-item *ngFor="let site of sites" (click)="storeInSite(site.id)" detail="false" button>
                 <ion-avatar slot="start" aria-hidden="true">
                     <img [src]="site.avatar" core-external-content [siteId]="site.id"
-                        alt="{{ 'core.pictureof' | translate:{$a: site.fullname} }}"
-                        onError="this.src='assets/img/user-avatar.png'">
+                        alt="{{ 'core.pictureof' | translate:{$a: site.fullname} }}" onError="this.src='assets/img/user-avatar.png'">
                 </ion-avatar>
                 <ion-label>
                     <p class="item-heading">{{site.fullName}}</p>
-                    <p><core-format-text clean="true" [text]="site.siteName" [siteId]="site.id"></core-format-text></p>
+                    <p>
+                        <core-format-text clean="true" [text]="site.siteName" [siteId]="site.id"></core-format-text>
+                    </p>
                     <p>{{site.siteUrl}}</p>
                 </ion-label>
             </ion-item>
diff --git a/src/core/features/sharedfiles/pages/list/list.html b/src/core/features/sharedfiles/pages/list/list.html
index 02ed894b9..b5b619acd 100644
--- a/src/core/features/sharedfiles/pages/list/list.html
+++ b/src/core/features/sharedfiles/pages/list/list.html
@@ -3,11 +3,13 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ title }}</h1>
+        <ion-title>
+            <h1>{{ title }}</h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <core-shared-files-list [siteId]="siteId" [mimetypes]="mimetypes" [isModal]="false" [manage]="manage" [pick]="false"
-        [path]="path" [showSitePicker]="showSitePicker" (onPathChanged)="calculateTitle($event)">
+    <core-shared-files-list [siteId]="siteId" [mimetypes]="mimetypes" [isModal]="false" [manage]="manage" [pick]="false" [path]="path"
+        [showSitePicker]="showSitePicker" (onPathChanged)="calculateTitle($event)">
     </core-shared-files-list>
 </ion-content>
diff --git a/src/core/features/siteplugins/pages/module-index/module-index.html b/src/core/features/siteplugins/pages/module-index/module-index.html
index b8136da60..7bbd67a91 100644
--- a/src/core/features/siteplugins/pages/module-index/module-index.html
+++ b/src/core/features/siteplugins/pages/module-index/module-index.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ title }}</h1>
+        <ion-title>
+            <h1>{{ title }}</h1>
+        </ion-title>
 
         <ion-buttons slot="end">
             <!-- If the site plugin defines some buttons using core-nav-buttons, they will be added here. -->
diff --git a/src/core/features/siteplugins/pages/plugin-page/plugin-page.html b/src/core/features/siteplugins/pages/plugin-page/plugin-page.html
index ebc4634fb..704dea867 100644
--- a/src/core/features/siteplugins/pages/plugin-page/plugin-page.html
+++ b/src/core/features/siteplugins/pages/plugin-page/plugin-page.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1 *ngIf="title">{{ title | translate }}</h1>
+        <ion-title>
+            <h1 *ngIf="title">{{ title | translate }}</h1>
+        </ion-title>
 
         <ion-buttons slot="end">
             <!-- If the site plugin defines some buttons using core-nav-buttons, they will be added here. -->
@@ -11,11 +13,10 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-refresher slot="fixed" [disabled]="!ptrEnabled || !content || !content.dataLoaded"
-        (ionRefresh)="refreshData($event.target)">
+    <ion-refresher slot="fixed" [disabled]="!ptrEnabled || !content || !content.dataLoaded" (ionRefresh)="refreshData($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <core-site-plugins-plugin-content [component]="component" [method]="method" [args]="args" [preSets]="preSets"
-        [initResult]="initResult" [data]="jsData" [pageTitle]="title">
+    <core-site-plugins-plugin-content [component]="component" [method]="method" [args]="args" [preSets]="preSets" [initResult]="initResult"
+        [data]="jsData" [pageTitle]="title">
     </core-site-plugins-plugin-content>
 </ion-content>
diff --git a/src/core/features/tag/pages/index-area/index-area.html b/src/core/features/tag/pages/index-area/index-area.html
index 2d1727416..5a03671d8 100644
--- a/src/core/features/tag/pages/index-area/index-area.html
+++ b/src/core/features/tag/pages/index-area/index-area.html
@@ -3,9 +3,11 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            {{ 'core.tag.itemstaggedwith' | translate: { $a: {tagarea: areaNameKey | translate, tag: tagName} } }}
-        </h1>
+        <ion-title>
+            <h1>
+                {{ 'core.tag.itemstaggedwith' | translate: { $a: {tagarea: areaNameKey | translate, tag: tagName} } }}
+            </h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
diff --git a/src/core/features/tag/pages/index/index.html b/src/core/features/tag/pages/index/index.html
index 8e9376122..151b3f93f 100644
--- a/src/core/features/tag/pages/index/index.html
+++ b/src/core/features/tag/pages/index/index.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ 'core.tag.tag' | translate }}: {{ tagName }}</h1>
+        <ion-title>
+            <h1>{{ 'core.tag.tag' | translate }}: {{ tagName }}</h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 
@@ -19,8 +21,7 @@
                     <ion-label class="ion-text-wrap">{{ 'core.tag.warningareasnotsupported' | translate }}</ion-label>
                 </ion-item>
                 <ion-item class="ion-text-wrap" *ngFor="let area of areas" [attr.aria-label]="area.nameKey | translate"
-                    (click)="openArea(area)" [attr.aria-current]="area!.id == selectedAreaId ? 'page' : 'false'" button
-                    detail="true">
+                    (click)="openArea(area)" [attr.aria-current]="area!.id == selectedAreaId ? 'page' : 'false'" button detail="true">
                     <ion-label>
                         <h2>{{ area!.nameKey | translate }}</h2>
                     </ion-label>
diff --git a/src/core/features/tag/pages/search/search.html b/src/core/features/tag/pages/search/search.html
index 1f6ff37a9..b6d2a5d8b 100644
--- a/src/core/features/tag/pages/search/search.html
+++ b/src/core/features/tag/pages/search/search.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ 'core.tag.searchtags' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'core.tag.searchtags' | translate }}</h1>
+        </ion-title>
         <ion-buttons slot="end">
             <core-user-menu-button></core-user-menu-button>
         </ion-buttons>
@@ -16,9 +18,8 @@
     <ion-grid class="safe-area-padding">
         <ion-row>
             <ion-col size="12" [attr.col-sm-6]="collections && collections.length > 1 ? '' : null">
-                <core-search-box (onSubmit)="searchTags($event)" (onClear)="searchTags('')" [initialSearch]="query"
-                    [disabled]="searching" autocorrect="off" [spellcheck]="false" [autoFocus]="false" [lengthCheck]="0"
-                    searchArea="CoreTag"></core-search-box>
+                <core-search-box (onSubmit)="searchTags($event)" (onClear)="searchTags('')" [initialSearch]="query" [disabled]="searching"
+                    autocorrect="off" [spellcheck]="false" [autoFocus]="false" [lengthCheck]="0" searchArea="CoreTag"></core-search-box>
             </ion-col>
             <ion-col size="12" size-sm="6" *ngIf="collections && collections.length > 1">
                 <core-combobox [selection]="collectionId" (onChange)="searchTags($event)" [disabled]="searching">
diff --git a/src/core/features/user/pages/about/about.html b/src/core/features/user/pages/about/about.html
index 03abbef38..e4858a324 100644
--- a/src/core/features/user/pages/about/about.html
+++ b/src/core/features/user/pages/about/about.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ 'core.user.profile' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'core.user.profile' | translate }}</h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
diff --git a/src/core/features/user/pages/profile/profile.html b/src/core/features/user/pages/profile/profile.html
index d4f77cb01..cad242abd 100644
--- a/src/core/features/user/pages/profile/profile.html
+++ b/src/core/features/user/pages/profile/profile.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1 *ngIf="title">{{ title }}</h1>
+        <ion-title>
+            <h1 *ngIf="title">{{ title }}</h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
@@ -84,7 +86,8 @@
                     </ion-label>
                 </ion-item>
             </ion-list>
-            <core-empty-box *ngIf="!user && !isDeleted && isEnrolled" icon="far-user" [message]=" 'core.user.detailsnotavailable' | translate">
+            <core-empty-box *ngIf="!user && !isDeleted && isEnrolled" icon="far-user"
+                [message]=" 'core.user.detailsnotavailable' | translate">
             </core-empty-box>
             <core-empty-box *ngIf="isDeleted" icon="far-user" [message]="'core.userdeleted' | translate"></core-empty-box>
             <core-empty-box *ngIf="!isEnrolled" icon="far-user" [message]="'core.notenrolledprofile' | translate"></core-empty-box>
diff --git a/src/core/features/viewer/components/image/image.html b/src/core/features/viewer/components/image/image.html
index 371f95368..c55c50d93 100644
--- a/src/core/features/viewer/components/image/image.html
+++ b/src/core/features/viewer/components/image/image.html
@@ -1,6 +1,8 @@
 <ion-header>
     <ion-toolbar>
-        <h2>{{ title }}</h2>
+        <ion-title>
+            <h2>{{ title }}</h2>
+        </ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
                 <ion-icon name="fas-times" slot="icon-only" aria-hidden=true></ion-icon>
diff --git a/src/core/features/viewer/components/qr-scanner/qr-scanner.html b/src/core/features/viewer/components/qr-scanner/qr-scanner.html
index bb77c94b5..a8e2757c0 100644
--- a/src/core/features/viewer/components/qr-scanner/qr-scanner.html
+++ b/src/core/features/viewer/components/qr-scanner/qr-scanner.html
@@ -1,6 +1,8 @@
 <ion-header>
     <ion-toolbar>
-        <h2>{{ title }}</h2>
+        <ion-title>
+            <h2>{{ title }}</h2>
+        </ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
                 <ion-icon name="fas-times" slot="icon-only" aria-hidden=true></ion-icon>
diff --git a/src/core/features/viewer/components/text/text.html b/src/core/features/viewer/components/text/text.html
index 10248ad3f..851bf8f03 100644
--- a/src/core/features/viewer/components/text/text.html
+++ b/src/core/features/viewer/components/text/text.html
@@ -1,7 +1,8 @@
 <ion-header>
     <ion-toolbar>
-        <h2>{{ title }}</h2>
-
+        <ion-title>
+            <h2>{{ title }}</h2>
+        </ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
                 <ion-icon slot="icon-only" name="fas-times" aria-hidden="true"></ion-icon>
@@ -10,8 +11,8 @@
     </ion-toolbar>
 </ion-header>
 <ion-content class="ion-padding">
-    <core-format-text [text]="content" [component]="component" [componentId]="componentId" [filter]="filter"
-        [contextLevel]="contextLevel" [contextInstanceId]="instanceId" [courseId]="courseId">
+    <core-format-text [text]="content" [component]="component" [componentId]="componentId" [filter]="filter" [contextLevel]="contextLevel"
+        [contextInstanceId]="instanceId" [courseId]="courseId">
     </core-format-text>
 
     <ion-card *ngIf="files?.length">
diff --git a/src/core/features/viewer/pages/iframe/iframe.html b/src/core/features/viewer/pages/iframe/iframe.html
index 270821cfa..5b2ae550d 100644
--- a/src/core/features/viewer/pages/iframe/iframe.html
+++ b/src/core/features/viewer/pages/iframe/iframe.html
@@ -3,7 +3,9 @@
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>{{ title }}</h1>
+        <ion-title>
+            <h1>{{ title }}</h1>
+        </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>

From a3b3277ea14b43db7c79b8d72237bcfbcfabe013 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 23 Nov 2021 15:05:14 +0100
Subject: [PATCH 0240/1008] MOBILE-3810 core: Customize page transition

---
 src/app/app.module.ts               |   5 +-
 src/core/classes/page-transition.ts | 366 ++++++++++++++++++++++++++++
 2 files changed, 369 insertions(+), 2 deletions(-)
 create mode 100644 src/core/classes/page-transition.ts

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 555132d45..6da789ef6 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -21,7 +21,7 @@ import { HttpClient, HttpClientModule } from '@angular/common/http';
 import { TranslateModule, TranslateLoader } from '@ngx-translate/core';
 import { TranslateHttpLoader } from '@ngx-translate/http-loader';
 
-import { IonicModule, IonicRouteStrategy, iosTransitionAnimation } from '@ionic/angular';
+import { IonicModule, IonicRouteStrategy } from '@ionic/angular';
 
 import { CoreModule } from '@/core/core.module';
 import { AddonsModule } from '@/addons/addons.module';
@@ -31,6 +31,7 @@ import { AppRoutingModule } from './app-routing.module';
 import { JitCompilerFactory } from '@angular/platform-browser-dynamic';
 import { CoreCronDelegate } from '@services/cron';
 import { CoreSiteInfoCronHandler } from '@services/handlers/site-info-cron';
+import { moodleTransitionAnimation } from '@classes/page-transition';
 
 // For translate loader. AoT requires an exported function for factories.
 export function createTranslateLoader(http: HttpClient): TranslateHttpLoader {
@@ -44,7 +45,7 @@ export function createTranslateLoader(http: HttpClient): TranslateHttpLoader {
         BrowserAnimationsModule,
         IonicModule.forRoot(
             {
-                navAnimation: iosTransitionAnimation,
+                navAnimation: moodleTransitionAnimation,
             },
         ),
         HttpClientModule, // HttpClient is used to make JSON requests. It fails for HEAD requests because there is no content.
diff --git a/src/core/classes/page-transition.ts b/src/core/classes/page-transition.ts
new file mode 100644
index 000000000..7443f6c55
--- /dev/null
+++ b/src/core/classes/page-transition.ts
@@ -0,0 +1,366 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { createAnimation } from '@ionic/angular';
+import { Animation, NavOptions } from '@ionic/core';
+
+/**
+ * Adaptation from Ionic 5 iOs transition.
+ *
+ * https://github.com/ionic-team/ionic-framework/blob/5.8.x/core/src/utils/transition/ios.transition.ts
+ * Removed large title options, translucent header, buttons-collapse and header-collapse-condense-inactive.
+ * Changed large title check by collapsible header.
+ */
+
+const DURATION = 540;
+
+const getIonPageElement = (element: HTMLElement): HTMLElement | null => {
+    if (element.classList.contains('ion-page')) {
+        return element;
+    }
+
+    const ionPage: HTMLElement | null = element.querySelector(':scope > .ion-page, :scope > ion-nav, :scope > ion-tabs');
+    if (ionPage) {
+        return ionPage;
+    }
+
+    // idk, return the original element so at least something animates and we don't have a null pointer
+    return element;
+};
+
+export interface TransitionOptions extends NavOptions {
+    progressCallback?: ((ani: Animation | undefined) => void);
+    baseEl: HTMLElement;
+    enteringEl: HTMLElement;
+    leavingEl: HTMLElement | undefined;
+};
+
+export const shadow = <T extends Element>(el: T): ShadowRoot | T => el.shadowRoot || el;
+
+export const moodleTransitionAnimation = (navEl: HTMLElement, opts: TransitionOptions): Animation => {
+    const EASING = 'cubic-bezier(0.32,0.72,0,1)';
+    const OPACITY = 'opacity';
+    const TRANSFORM = 'transform';
+    const CENTER = '0%';
+    const OFF_OPACITY = 0.8;
+
+    const isRTL = navEl.ownerDocument.dir === 'rtl';
+    const OFF_RIGHT = isRTL ? '-99.5%' : '99.5%';
+    const OFF_LEFT = isRTL ? '33%' : '-33%';
+
+    const enteringEl = opts.enteringEl;
+    const leavingEl = opts.leavingEl;
+
+    const backDirection = (opts.direction === 'back');
+    const contentEl = enteringEl.querySelector(':scope > ion-content');
+    const headerEls = enteringEl.querySelectorAll(':scope > ion-header > *:not(ion-toolbar), :scope > ion-footer > *');
+    const enteringToolBarEls = enteringEl.querySelectorAll(':scope > ion-header > ion-toolbar');
+
+    const rootAnimation = createAnimation();
+    const enteringContentAnimation = createAnimation();
+
+    rootAnimation
+        .addElement(enteringEl)
+        .duration(opts.duration || DURATION)
+        .easing(opts.easing || EASING)
+        .fill('both')
+        .beforeRemoveClass('ion-page-invisible');
+
+    if (leavingEl && navEl) {
+        const navDecorAnimation = createAnimation();
+        navDecorAnimation.addElement(navEl);
+        rootAnimation.addAnimation(navDecorAnimation);
+    }
+
+    if (!contentEl && enteringToolBarEls.length === 0 && headerEls.length === 0) {
+        enteringContentAnimation.addElement(
+            enteringEl.querySelector(':scope > .ion-page, :scope > ion-nav, :scope > ion-tabs') || [],
+        );
+    } else {
+        enteringContentAnimation.addElement(contentEl || []);
+        enteringContentAnimation.addElement(headerEls);
+    }
+
+    rootAnimation.addAnimation(enteringContentAnimation);
+
+    if (backDirection) {
+        enteringContentAnimation
+            .beforeClearStyles([OPACITY])
+            .fromTo('transform', `translateX(${OFF_LEFT})`, `translateX(${CENTER})`)
+            .fromTo(OPACITY, OFF_OPACITY, 1);
+    } else {
+        // entering content, forward direction
+        enteringContentAnimation
+            .beforeClearStyles([OPACITY])
+            .fromTo('transform', `translateX(${OFF_RIGHT})`, `translateX(${CENTER})`);
+    }
+
+    if (contentEl) {
+        const enteringTransitionEffectEl: HTMLElement | null = shadow(contentEl).querySelector('.transition-effect');
+        if (enteringTransitionEffectEl) {
+            const enteringTransitionCoverEl: HTMLElement | null = enteringTransitionEffectEl.querySelector('.transition-cover');
+            const enteringTransitionShadowEl: HTMLElement | null = enteringTransitionEffectEl.querySelector('.transition-shadow');
+
+            if (!enteringTransitionCoverEl || !enteringTransitionShadowEl) {
+                return rootAnimation;
+            }
+
+            const enteringTransitionEffect = createAnimation();
+            const enteringTransitionCover = createAnimation();
+            const enteringTransitionShadow = createAnimation();
+
+            enteringTransitionEffect
+                .addElement(enteringTransitionEffectEl)
+                .beforeStyles({ opacity: '1', display: 'block' })
+                .afterStyles({ opacity: '', display: '' });
+
+            enteringTransitionCover
+                .addElement(enteringTransitionCoverEl)
+                .beforeClearStyles([OPACITY])
+                .fromTo(OPACITY, 0, 0.1);
+
+            enteringTransitionShadow
+                .addElement(enteringTransitionShadowEl)
+                .beforeClearStyles([OPACITY])
+                .fromTo(OPACITY, 0.03, 0.70);
+
+            enteringTransitionEffect.addAnimation([enteringTransitionCover, enteringTransitionShadow]);
+            enteringContentAnimation.addAnimation([enteringTransitionEffect]);
+        }
+    }
+
+    const enteringContentHasCollapsibleTitle = enteringEl.querySelector('ion-header[collapsible]');
+    enteringToolBarEls.forEach(enteringToolBarEl => {
+        const enteringToolBar = createAnimation();
+        enteringToolBar.addElement(enteringToolBarEl);
+        rootAnimation.addAnimation(enteringToolBar);
+
+        const enteringTitle = createAnimation();
+        enteringTitle.addElement(enteringToolBarEl.querySelector('ion-title') || []);
+
+        const enteringToolBarButtons = createAnimation();
+        const buttons: HTMLIonButtonsElement[] = Array.from(enteringToolBarEl.querySelectorAll('ion-buttons,[menuToggle]'));
+
+        enteringToolBarButtons.addElement(buttons);
+
+        const enteringToolBarItems = createAnimation();
+        enteringToolBarItems.addElement(
+            enteringToolBarEl.querySelectorAll(':scope > *:not(ion-title):not(ion-buttons):not([menuToggle])'),
+        );
+
+        const enteringToolBarBg = createAnimation();
+        enteringToolBarBg.addElement(shadow(enteringToolBarEl).querySelector('.toolbar-background') || []);
+
+        const enteringBackButton = createAnimation();
+        const backButtonEl = enteringToolBarEl.querySelector('ion-back-button');
+
+        if (backButtonEl) {
+            enteringBackButton.addElement(backButtonEl);
+        }
+
+        enteringToolBar.addAnimation(
+            [enteringTitle, enteringToolBarButtons, enteringToolBarItems, enteringToolBarBg, enteringBackButton],
+        );
+        enteringToolBarButtons.fromTo(OPACITY, 0.01, 1);
+        enteringToolBarItems.fromTo(OPACITY, 0.01, 1);
+
+        if (backDirection) {
+            enteringTitle
+                .fromTo('transform', `translateX(${OFF_LEFT})`, `translateX(${CENTER})`)
+                .fromTo(OPACITY, 0.01, 1);
+
+            enteringToolBarItems.fromTo('transform', `translateX(${OFF_LEFT})`, `translateX(${CENTER})`);
+
+            // back direction, entering page has a back button
+            enteringBackButton.fromTo(OPACITY, 0.01, 1);
+        } else {
+            // entering toolbar, forward direction
+            if (!enteringContentHasCollapsibleTitle) {
+                enteringTitle
+                    .fromTo('transform', `translateX(${OFF_RIGHT})`, `translateX(${CENTER})`)
+                    .fromTo(OPACITY, 0.01, 1);
+            }
+
+            enteringToolBarItems.fromTo('transform', `translateX(${OFF_RIGHT})`, `translateX(${CENTER})`);
+            enteringToolBarBg.beforeClearStyles([OPACITY, 'transform']);
+
+            enteringToolBarBg.fromTo(OPACITY, 0.01, 'var(--opacity)');
+
+            // forward direction, entering page has a back button
+            enteringBackButton.fromTo(OPACITY, 0.01, 1);
+
+            if (backButtonEl) {
+                const enteringBackBtnText = createAnimation();
+                enteringBackBtnText
+                    .addElement(shadow(backButtonEl).querySelector('.button-text') || [])
+                    .fromTo('transform', (isRTL ? 'translateX(-100px)' : 'translateX(100px)'), 'translateX(0px)');
+
+                enteringToolBar.addAnimation(enteringBackBtnText);
+            }
+        }
+    });
+
+    // setup leaving view
+    if (leavingEl) {
+        const leavingContent = createAnimation();
+        const leavingContentEl = leavingEl.querySelector(':scope > ion-content');
+        const leavingToolBarEls = leavingEl.querySelectorAll(':scope > ion-header > ion-toolbar');
+        const leavingHeaderEls = leavingEl.querySelectorAll(':scope > ion-header > *:not(ion-toolbar), :scope > ion-footer > *');
+
+        if (!leavingContentEl && leavingToolBarEls.length === 0 && leavingHeaderEls.length === 0) {
+            leavingContent.addElement(
+                leavingEl.querySelector(':scope > .ion-page, :scope > ion-nav, :scope > ion-tabs') || [],
+            );
+        } else {
+            leavingContent.addElement(leavingContentEl || []);
+            leavingContent.addElement(leavingHeaderEls);
+        }
+
+        rootAnimation.addAnimation(leavingContent);
+
+        if (backDirection) {
+            // leaving content, back direction
+            leavingContent
+                .beforeClearStyles([OPACITY])
+                .fromTo('transform', `translateX(${CENTER})`, (isRTL ? 'translateX(-100%)' : 'translateX(100%)'));
+
+            const leavingPage = getIonPageElement(leavingEl) as HTMLElement;
+            rootAnimation.afterAddWrite(() => {
+                if (rootAnimation.getDirection() === 'normal') {
+                    leavingPage.style.setProperty('display', 'none');
+                }
+            });
+
+        } else {
+            // leaving content, forward direction
+            leavingContent
+                .fromTo('transform', `translateX(${CENTER})`, `translateX(${OFF_LEFT})`)
+                .fromTo(OPACITY, 1, OFF_OPACITY);
+        }
+
+        if (leavingContentEl) {
+            const leavingTransitionEffectEl = shadow(leavingContentEl).querySelector('.transition-effect');
+
+            if (leavingTransitionEffectEl) {
+                const leavingTransitionCoverEl = leavingTransitionEffectEl.querySelector('.transition-cover');
+                const leavingTransitionShadowEl = leavingTransitionEffectEl.querySelector('.transition-shadow');
+
+                const leavingTransitionEffect = createAnimation();
+                const leavingTransitionCover = createAnimation();
+                const leavingTransitionShadow = createAnimation();
+
+                leavingTransitionEffect
+                    .addElement(leavingTransitionEffectEl)
+                    .beforeStyles({ opacity: '1', display: 'block' })
+                    .afterStyles({ opacity: '', display: '' });
+
+                leavingTransitionCover
+                    .addElement(leavingTransitionCoverEl || [])
+                    .beforeClearStyles([OPACITY])
+                    .fromTo(OPACITY, 0.1, 0);
+
+                leavingTransitionShadow
+                    .addElement(leavingTransitionShadowEl || [])
+                    .beforeClearStyles([OPACITY])
+                    .fromTo(OPACITY, 0.70, 0.03);
+
+                leavingTransitionEffect.addAnimation([leavingTransitionCover, leavingTransitionShadow]);
+                leavingContent.addAnimation([leavingTransitionEffect]);
+            }
+        }
+
+        leavingToolBarEls.forEach(leavingToolBarEl => {
+            const leavingToolBar = createAnimation();
+            leavingToolBar.addElement(leavingToolBarEl);
+
+            const leavingTitle = createAnimation();
+            leavingTitle.addElement(leavingToolBarEl.querySelector('ion-title') || []);
+
+            const leavingToolBarButtons = createAnimation();
+            const buttons: HTMLIonButtonsElement[] = Array.from(leavingToolBarEl.querySelectorAll('ion-buttons,[menuToggle]'));
+
+            leavingToolBarButtons.addElement(buttons);
+
+            const leavingToolBarItems = createAnimation();
+            const leavingToolBarItemEls =
+                leavingToolBarEl.querySelectorAll(':scope > *:not(ion-title):not(ion-buttons):not([menuToggle])');
+            if (leavingToolBarItemEls.length > 0) {
+                leavingToolBarItems.addElement(leavingToolBarItemEls);
+            }
+
+            const leavingToolBarBg = createAnimation();
+            leavingToolBarBg.addElement(shadow(leavingToolBarEl).querySelector('.toolbar-background') || []);
+
+            const leavingBackButton = createAnimation();
+            const backButtonEl = leavingToolBarEl.querySelector('ion-back-button');
+            if (backButtonEl) {
+                leavingBackButton.addElement(backButtonEl);
+            }
+
+            leavingToolBar.addAnimation(
+                [leavingTitle, leavingToolBarButtons, leavingToolBarItems, leavingBackButton, leavingToolBarBg],
+            );
+            rootAnimation.addAnimation(leavingToolBar);
+
+            // fade out leaving toolbar items
+            leavingBackButton.fromTo(OPACITY, 0.99, 0);
+
+            leavingToolBarButtons.fromTo(OPACITY, 0.99, 0);
+            leavingToolBarItems.fromTo(OPACITY, 0.99, 0);
+
+            if (backDirection) {
+                // leaving toolbar, back direction
+                leavingTitle
+                    .fromTo('transform', `translateX(${CENTER})`, (isRTL ? 'translateX(-100%)' : 'translateX(100%)'))
+                    .fromTo(OPACITY, 0.99, 0);
+
+                leavingToolBarItems.fromTo(
+                    'transform',
+                    `translateX(${CENTER})`,
+                    (isRTL ? 'translateX(-100%)' : 'translateX(100%)'),
+                );
+                leavingToolBarBg.beforeClearStyles([OPACITY, 'transform']);
+                // leaving toolbar, back direction, and there's no entering toolbar
+                // should just slide out, no fading out
+                leavingToolBarBg.fromTo(OPACITY, 'var(--opacity)', 0);
+
+                if (backButtonEl) {
+                    const leavingBackBtnText = createAnimation();
+                    leavingBackBtnText
+                        .addElement(shadow(backButtonEl).querySelector('.button-text') || [])
+                        .fromTo('transform', `translateX(${CENTER})`, `translateX(${(isRTL ? -124 : 124) + 'px'})`);
+                    leavingToolBar.addAnimation(leavingBackBtnText);
+                }
+
+            } else {
+                // leaving toolbar, forward direction
+                leavingTitle
+                    .fromTo('transform', `translateX(${CENTER})`, `translateX(${OFF_LEFT})`)
+                    .fromTo(OPACITY, 0.99, 0)
+                    .afterClearStyles([TRANSFORM, OPACITY]);
+
+                leavingToolBarItems
+                    .fromTo('transform', `translateX(${CENTER})`, `translateX(${OFF_LEFT})`)
+                    .afterClearStyles([TRANSFORM, OPACITY]);
+
+                leavingBackButton.afterClearStyles([OPACITY]);
+                leavingTitle.afterClearStyles([OPACITY]);
+                leavingToolBarButtons.afterClearStyles([OPACITY]);
+            }
+        });
+    }
+
+    return rootAnimation;
+
+};

From ea207e8d3e4a30f4e869093e4d4fe017a073e83d Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 1 Dec 2021 14:53:15 +0100
Subject: [PATCH 0241/1008] MOBILE-3833 behat: Implement privacy provider

---
 .../behat-plugin/classes/privacy/provider.php | 32 +++++++++++++++++++
 .../lang/en/local_moodleappbehat.php          |  1 +
 2 files changed, 33 insertions(+)
 create mode 100644 scripts/templates/behat-plugin/classes/privacy/provider.php

diff --git a/scripts/templates/behat-plugin/classes/privacy/provider.php b/scripts/templates/behat-plugin/classes/privacy/provider.php
new file mode 100644
index 000000000..297b4b455
--- /dev/null
+++ b/scripts/templates/behat-plugin/classes/privacy/provider.php
@@ -0,0 +1,32 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace local_moodleappbehat\privacy;
+
+use core_privacy\local\metadata\null_provider;
+
+defined('MOODLE_INTERNAL') || die();
+
+class provider implements null_provider {
+
+    /**
+     * @inheritdoc
+     */
+    public static function get_reason() : string {
+        return 'privacy_metadata';
+    }
+
+}
diff --git a/scripts/templates/behat-plugin/lang/en/local_moodleappbehat.php b/scripts/templates/behat-plugin/lang/en/local_moodleappbehat.php
index ba8d678e0..8a54fd660 100644
--- a/scripts/templates/behat-plugin/lang/en/local_moodleappbehat.php
+++ b/scripts/templates/behat-plugin/lang/en/local_moodleappbehat.php
@@ -1,3 +1,4 @@
 <?php
 
 $string['pluginname'] = 'Moodle App Behat (auto-generated)';
+$string['privacy_metadata'] = 'This plugin should only be used in development environments, and it does not store any user data.';

From ba2819b6513ecc2daa483dfe94da3daa3ce8ed68 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 1 Dec 2021 15:01:38 +0100
Subject: [PATCH 0242/1008] MOBILE-3833 chore: Configure formatting settings

---
 .vscode/settings.json | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index e2f79e54b..592fc58af 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,5 +1,23 @@
 {
 
+    /**
+     * Formatting.
+     */
+    "editor.defaultFormatter": "dbaeumer.vscode-eslint",
+    "[html]": {
+        "editor.defaultFormatter": "vscode.html-language-features",
+    },
+    "editor.formatOnSave": true,
+    "eslint.format.enable": true,
+    "html.format.endWithNewline": true,
+    "html.format.wrapLineLength": 140,
+    "files.trimFinalNewlines": true,
+    "files.insertFinalNewline": true,
+    "files.trimTrailingWhitespace": true,
+
+    /**
+     * Config files.
+     */
     "files.associations": {
         "moodle.config.json": "jsonc",
         "moodle.config.*.json": "jsonc",

From deda45648637409144937638581535f90a7dd2f1 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 1 Dec 2021 15:55:25 +0100
Subject: [PATCH 0243/1008] MOBILE-3833 chore: Format html files

---
 .../addon-block-activitymodules.html          |  3 +-
 .../addon-block-recentlyaccesseditems.html    | 16 ++--
 .../addon-block-sitemainmenu.html             |  4 +-
 .../calendar/addon-calendar-calendar.html     | 35 +++-----
 .../filter/addon-calendar-filter-popover.html |  4 +-
 .../addon-calendar-upcoming-events.html       |  2 +-
 .../addon-mod-assign-submission.html          | 72 +++++++++--------
 .../addon-mod-assign-feedback-editpdf.html    |  3 +-
 .../addon-mod-assign-feedback-file.html       |  3 +-
 .../addon-mod-assign-submission-comments.html |  4 +-
 .../addon-mod-assign-submission-file.html     |  4 +-
 .../action/addon-mod-data-action.html         |  4 +-
 .../component/addon-mod-data-field-file.html  |  4 +-
 .../addon-mod-data-field-picture.html         | 12 +--
 .../addon-mod-data-field-textarea.html        |  6 +-
 .../post-options-menu/post-options-menu.html  | 11 ++-
 .../mod/forum/components/post/post.html       | 67 ++++++----------
 .../addon-mod-wiki-subwiki-picker.html        |  7 +-
 ...shop-assessment-strategy-accumulative.html |  8 +-
 ...workshop-assessment-strategy-comments.html | 11 +--
 ...orkshop-assessment-strategy-numerrors.html |  7 +-
 ...d-workshop-assessment-strategy-rubric.html | 13 +--
 ...ddon-mod-workshop-assessment-strategy.html | 23 +++---
 .../addon-mod-workshop-submission.html        | 23 +++---
 .../addon-qbehaviour-deferredcbm.html         |  6 +-
 .../component/addon-qtype-calculated.html     | 14 ++--
 .../component/addon-qtype-ddimageortext.html  |  5 +-
 .../component/addon-qtype-ddmarker.html       |  3 +-
 .../ddwtos/component/addon-qtype-ddwtos.html  |  9 +--
 .../component/addon-qtype-description.html    |  6 +-
 .../essay/component/addon-qtype-essay.html    | 13 ++-
 .../component/addon-qtype-gapselect.html      |  5 +-
 .../match/component/addon-qtype-match.html    |  9 +--
 .../component/addon-qtype-multianswer.html    |  5 +-
 .../component/addon-qtype-multichoice.html    | 14 ++--
 .../component/addon-qtype-shortanswer.html    |  8 +-
 .../addon-user-profile-field-datetime.html    |  4 +-
 .../addon-user-profile-field-menu.html        |  7 +-
 .../addon-user-profile-field-text.html        |  7 +-
 .../addon-user-profile-field-textarea.html    | 11 +--
 .../attachments/core-attachments.html         |  7 +-
 .../core-context-menu-popover.html            |  9 ++-
 src/core/components/file/core-file.html       |  8 +-
 src/core/components/iframe/core-iframe.html   | 18 ++---
 .../local-file/core-local-file.html           |  3 +-
 src/core/components/mod-icon/mod-icon.html    | 24 ++----
 .../progress-bar/core-progress-bar.html       |  4 +-
 .../core-send-message-form.html               | 26 ++----
 .../components/split-view/split-view.html     |  3 +-
 .../tabs-outlet/core-tabs-outlet.html         | 22 ++---
 src/core/components/tabs/core-tabs.html       | 22 ++---
 src/core/components/timer/core-timer.html     |  3 +-
 .../user-avatar/core-user-avatar.html         | 15 +---
 .../core-block-only-title.html                |  4 +-
 .../core-block-pre-rendered.html              |  7 +-
 .../components/comments/core-comments.html    | 27 +++----
 .../core-course-module-completion.html        |  9 +--
 .../core-course-module-manual-completion.html |  3 +-
 .../tag-area/core-course-tag-area.html        |  4 +-
 .../course/pages/contents/contents.html       | 10 +--
 .../core-courses-course-options-menu.html     | 24 ++++--
 .../core-editor-rich-text-editor.html         | 80 ++++++-------------
 .../components/question/core-question.html    | 13 ++-
 .../search-box/core-search-box.html           | 14 ++--
 .../sharedfiles/components/list/list.html     |  7 +-
 .../tag/components/feed/core-tag-feed.html    |  3 +-
 .../tag-area/core-user-tag-area.html          |  2 +-
 .../user/pages/participants/participants.html | 19 ++---
 68 files changed, 364 insertions(+), 498 deletions(-)

diff --git a/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html b/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html
index 27d105e90..1c23cf54f 100644
--- a/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html
+++ b/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html
@@ -4,8 +4,7 @@
     </ion-label>
 </ion-item-divider>
 <core-loading [hideUntil]="loaded" [fullscreen]="false">
-    <ion-item class="ion-text-wrap item-media" *ngFor="let entry of entries" detail="true" button
-        (click)="gotoCoureListModType(entry)">
+    <ion-item class="ion-text-wrap item-media" *ngFor="let entry of entries" detail="true" button (click)="gotoCoureListModType(entry)">
         <core-mod-icon slot="start" [modicon]="entry.icon" [modname]="entry.modName" [showAlt]="false">
         </core-mod-icon>
         <ion-label>{{ entry.name }}</ion-label>
diff --git a/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html b/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html
index cf85821ef..e93ac8cd1 100644
--- a/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html
+++ b/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html
@@ -1,25 +1,23 @@
 <ion-item-divider sticky="true">
-    <ion-label><h2>{{ 'addon.block_recentlyaccesseditems.pluginname' | translate }}</h2></ion-label>
+    <ion-label>
+        <h2>{{ 'addon.block_recentlyaccesseditems.pluginname' | translate }}</h2>
+    </ion-label>
     <div slot="end">
         <core-horizontal-scroll-controls #scrollControls [aria-controls]="scrollElementId">
         </core-horizontal-scroll-controls>
     </div>
 </ion-item-divider>
 <core-loading [hideUntil]="loaded" [fullscreen]="false">
-    <div
-        [id]="scrollElementId"
-        [hidden]="!items || items.length === 0"
-        class="core-horizontal-scroll"
-        (scroll)="scrollControls.updateScrollPosition()"
-    >
+    <div [id]="scrollElementId" [hidden]="!items || items.length === 0" class="core-horizontal-scroll"
+        (scroll)="scrollControls.updateScrollPosition()">
         <div *ngIf="items" (onResize)="scrollControls.updateScrollPosition()" class="flex-row">
             <div class="safe-area-pseudo-padding-start"></div>
             <div *ngFor="let item of items" class="core-horizontal-scroll-item">
                 <ion-card>
                     <ion-item class="core-course-module-handler item-media ion-text-wrap" detail="false" (click)="action($event, item)"
                         button>
-                        <core-mod-icon slot="start" *ngIf="item.iconUrl" [modicon]="item.iconUrl"
-                            [modname]="item.modname" [componentId]="item.cmid" [showAlt]="false">
+                        <core-mod-icon slot="start" *ngIf="item.iconUrl" [modicon]="item.iconUrl" [modname]="item.modname"
+                            [componentId]="item.cmid" [showAlt]="false">
                         </core-mod-icon>
                         <ion-label>
                             <!-- Add the icon title so accessibility tools read it. -->
diff --git a/src/addons/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html b/src/addons/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html
index e18016290..c650ba61e 100644
--- a/src/addons/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html
+++ b/src/addons/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html
@@ -7,8 +7,8 @@
     <ng-container *ngIf="mainMenuBlock">
         <ion-item class="ion-text-wrap" *ngIf="mainMenuBlock.summary">
             <ion-label>
-                <core-format-text [text]="mainMenuBlock.summary" [component]="component" [componentId]="siteHomeId"
-                    contextLevel="course" [contextInstanceId]="siteHomeId"></core-format-text>
+                <core-format-text [text]="mainMenuBlock.summary" [component]="component" [componentId]="siteHomeId" contextLevel="course"
+                    [contextInstanceId]="siteHomeId"></core-format-text>
             </ion-label>
         </ion-item>
 
diff --git a/src/addons/calendar/components/calendar/addon-calendar-calendar.html b/src/addons/calendar/components/calendar/addon-calendar-calendar.html
index fe3cf2895..3030a2b5a 100644
--- a/src/addons/calendar/components/calendar/addon-calendar-calendar.html
+++ b/src/addons/calendar/components/calendar/addon-calendar-calendar.html
@@ -1,10 +1,9 @@
-
 <!-- Add buttons to the nav bar. -->
 <core-navbar-buttons slot="end" prepend>
     <core-context-menu>
         <core-context-menu-item *ngIf="canNavigate && !isCurrentMonth && displayNavButtons" [priority]="900"
-        [content]="'addon.calendar.currentmonth' | translate" iconAction="fas-calendar-day"
-        (action)="goToCurrentMonth()"></core-context-menu-item>
+            [content]="'addon.calendar.currentmonth' | translate" iconAction="fas-calendar-day" (action)="goToCurrentMonth()">
+        </core-context-menu-item>
     </core-context-menu>
 </core-navbar-buttons>
 
@@ -46,20 +45,13 @@
             <ion-row *ngFor="let week of weeks" class="addon-calendar-week" role="row">
                 <!-- Empty slots (first week). -->
                 <ion-col *ngFor="let value of week.prepadding" class="dayblank addon-calendar-day" role="cell"></ion-col>
-                <ion-col
-                    *ngFor="let day of week.days"
-                    class="addon-calendar-day ion-text-center"
-                    [ngClass]='{
+                <ion-col *ngFor="let day of week.days" class="addon-calendar-day ion-text-center" [ngClass]='{
                         "hasevents": day.hasevents,
                         "today": isCurrentMonth && day.istoday,
                         "weekend": day.isweekend,
                         "duration_finish": day.haslastdayofevent
-                    }'
-                    [class.addon-calendar-event-past-day]="isPastMonth || day.ispast"
-                    role="cell"
-                    tabindex="0"
-                    (ariaButtonClick)="dayClicked(day.mday)"
-                >
+                    }' [class.addon-calendar-event-past-day]="isPastMonth || day.ispast" role="cell" tabindex="0"
+                    (ariaButtonClick)="dayClicked(day.mday)">
                     <p class="addon-calendar-day-number" role="button">
                         <span aria-hidden="true">{{ day.mday }}</span>
                         <span class="sr-only">{{ day.periodName | translate }}</span>
@@ -67,24 +59,19 @@
 
                     <!-- In phone, display some dots to indicate the type of events. -->
                     <p class="ion-hide-md-up addon-calendar-dot-types"><span *ngFor="let type of day.calendareventtypes"
-                        class="calendar_event_type calendar_event_{{type}}"></span></p>
+                            class="calendar_event_type calendar_event_{{type}}"></span></p>
 
                     <!-- In tablet, display list of events. -->
                     <div class="ion-hide-md-down addon-calendar-day-events">
                         <ng-container *ngFor="let event of day.filteredEvents | slice:0:4; let index = index">
-                            <div
-                                *ngIf="index < 3 || day.filteredEvents.length == 4"
-                                class="addon-calendar-event"
-                                [class.addon-calendar-event-past]="event.ispast"
-                                role="button"
-                                tabindex="0"
-                                (ariaButtonClick)="eventClicked(event, $event)"
-                            >
+                            <div *ngIf="index < 3 || day.filteredEvents.length == 4" class="addon-calendar-event"
+                                [class.addon-calendar-event-past]="event.ispast" role="button" tabindex="0"
+                                (ariaButtonClick)="eventClicked(event, $event)">
                                 <span class="calendar_event_type calendar_event_{{event.formattedType}}"></span>
                                 <ion-icon *ngIf="event.offline && !event.deleted" name="fas-clock"
                                     [attr.aria-label]="'core.notsent' | translate"></ion-icon>
-                                <ion-icon *ngIf="event.deleted" name="fas-trash"
-                                    [attr.aria-label]="'core.deletedoffline' | translate"></ion-icon>
+                                <ion-icon *ngIf="event.deleted" name="fas-trash" [attr.aria-label]="'core.deletedoffline' | translate">
+                                </ion-icon>
                                 <span class="addon-calendar-event-time">
                                     {{ event.timestart * 1000 | coreFormatDate: timeFormat }}
                                 </span>
diff --git a/src/addons/calendar/components/filter/addon-calendar-filter-popover.html b/src/addons/calendar/components/filter/addon-calendar-filter-popover.html
index 590a32b27..fd88358b3 100644
--- a/src/addons/calendar/components/filter/addon-calendar-filter-popover.html
+++ b/src/addons/calendar/components/filter/addon-calendar-filter-popover.html
@@ -8,7 +8,9 @@
     <ng-container *ngIf="filter.course || filter.category || filter.group">
         <ion-radio-group [(ngModel)]="courseId" (ionChange)="onChange()">
             <ion-item class="ion-text-wrap" *ngFor="let course of courses">
-                <ion-label><core-format-text [text]="course.fullname"></core-format-text></ion-label>
+                <ion-label>
+                    <core-format-text [text]="course.fullname"></core-format-text>
+                </ion-label>
                 <ion-radio slot="end" [value]="course.id"></ion-radio>
             </ion-item>
         </ion-radio-group>
diff --git a/src/addons/calendar/components/upcoming-events/addon-calendar-upcoming-events.html b/src/addons/calendar/components/upcoming-events/addon-calendar-upcoming-events.html
index 30c9c2224..143eec51c 100644
--- a/src/addons/calendar/components/upcoming-events/addon-calendar-upcoming-events.html
+++ b/src/addons/calendar/components/upcoming-events/addon-calendar-upcoming-events.html
@@ -18,7 +18,7 @@
                     </span>
                     <p class="item-heading">
                         <core-format-text [text]="event.name" [contextLevel]="event.contextLevel"
-                        [contextInstanceId]="event.contextInstanceId"></core-format-text>
+                            [contextInstanceId]="event.contextInstanceId"></core-format-text>
                     </p>
                     <p [innerHTML]="event.formattedtime"></p>
                 </ion-label>
diff --git a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
index 7858fdad1..506fea6e4 100644
--- a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
+++ b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
@@ -31,8 +31,8 @@
         <!-- View the submission tab. -->
         <core-tab [title]="'addon.mod_assign.submission' | translate" id="submission">
             <ng-template>
-                <addon-mod-assign-submission-plugin *ngFor="let plugin of submissionPlugins"
-                    [assign]="assign" [submission]="userSubmission" [plugin]="plugin">
+                <addon-mod-assign-submission-plugin *ngFor="let plugin of submissionPlugins" [assign]="assign" [submission]="userSubmission"
+                    [plugin]="plugin">
                 </addon-mod-assign-submission-plugin>
 
                 <!-- Render some data about the submission. -->
@@ -56,8 +56,7 @@
                         <p *ngIf="assign!.intro"
                             [innerHTML]="'addon.mod_assign.allowsubmissionsfromdatesummary' | translate: {'$a': fromDate}">
                         </p>
-                        <p *ngIf="!assign!.intro"
-                            [innerHTML]="'addon.mod_assign.allowsubmissionsanddescriptionfromdatesummary' | translate:
+                        <p *ngIf="!assign!.intro" [innerHTML]="'addon.mod_assign.allowsubmissionsanddescriptionfromdatesummary' | translate:
                                 {'$a': fromDate}">
                         </p>
                     </ion-label>
@@ -66,8 +65,8 @@
                 <ion-item class="ion-text-wrap" *ngIf="showDates && assign!.duedate && !isSubmittedForGrading">
                     <ion-label>
                         <h2>{{ 'addon.mod_assign.duedate' | translate }}</h2>
-                        <p *ngIf="assign!.duedate" >{{ assign!.duedate * 1000 | coreFormatDate }}</p>
-                        <p *ngIf="!assign!.duedate" >{{ 'addon.mod_assign.duedateno' | translate }}</p>
+                        <p *ngIf="assign!.duedate">{{ assign!.duedate * 1000 | coreFormatDate }}</p>
+                        <p *ngIf="!assign!.duedate">{{ 'addon.mod_assign.duedateno' | translate }}</p>
                     </ion-label>
                 </ion-item>
 
@@ -78,8 +77,7 @@
                     </ion-label>
                 </ion-item>
 
-                <ion-item class="ion-text-wrap"
-                    *ngIf="assign!.duedate && lastAttempt?.extensionduedate && !isSubmittedForGrading">
+                <ion-item class="ion-text-wrap" *ngIf="assign!.duedate && lastAttempt?.extensionduedate && !isSubmittedForGrading">
                     <ion-label>
                         <h2>{{ 'addon.mod_assign.extensionduedate' | translate }}</h2>
                         <p>{{ lastAttempt!.extensionduedate * 1000 | coreFormatDate }}</p>
@@ -91,11 +89,11 @@
                         <h2>{{ 'addon.mod_assign.attemptnumber' | translate }}</h2>
                         <p *ngIf="assign!.maxattempts == unlimitedAttempts">
                             {{ 'addon.mod_assign.outof' | translate :
-                                {'$a': {'current': currentAttempt, 'total': maxAttemptsText} } }}
+                            {'$a': {'current': currentAttempt, 'total': maxAttemptsText} } }}
                         </p>
                         <p *ngIf="assign!.maxattempts != unlimitedAttempts">
                             {{ 'addon.mod_assign.outof' | translate :
-                                {'$a': {'current': currentAttempt, 'total': assign!.maxattempts} } }}
+                            {'$a': {'current': currentAttempt, 'total': assign!.maxattempts} } }}
                         </p>
                     </ion-label>
                 </ion-item>
@@ -105,13 +103,11 @@
                     <ion-label>
                         <div *ngIf="!unsupportedEditPlugins.length && !showErrorStatementEdit">
                             <!-- If has offline data, show edit. -->
-                            <ion-button expand="block" class="ion-text-wrap" color="primary" *ngIf="hasOffline"
-                                (click)="goToEdit()">
+                            <ion-button expand="block" class="ion-text-wrap" color="primary" *ngIf="hasOffline" (click)="goToEdit()">
                                 {{ 'addon.mod_assign.editsubmission' | translate }}
                             </ion-button>
                             <!-- If no submission or is new, show add submission. -->
-                            <ion-button expand="block" class="ion-text-wrap" color="primary"
-                                *ngIf="!hasOffline &&
+                            <ion-button expand="block" class="ion-text-wrap" color="primary" *ngIf="!hasOffline &&
                                     (!userSubmission || !userSubmission!.status || userSubmission!.status == statusNew)"
                                 (click)="goToEdit()">
                                 {{ 'addon.mod_assign.addsubmission' | translate }}
@@ -127,8 +123,7 @@
                                 </ion-button>
                             </ng-container>
                             <!-- Else show editsubmission. -->
-                            <ion-button expand="block" class="ion-text-wrap" color="primary"
-                                *ngIf="!hasOffline && userSubmission && userSubmission!.status &&
+                            <ion-button expand="block" class="ion-text-wrap" color="primary" *ngIf="!hasOffline && userSubmission && userSubmission!.status &&
                                     userSubmission!.status != statusNew &&
                                     userSubmission!.status != statusReopened" (click)="goToEdit()">
                                 {{ 'addon.mod_assign.editsubmission' | translate }}
@@ -156,8 +151,7 @@
                     <!-- Submit button. -->
                     <ion-item class="ion-text-wrap" *ngIf="!showErrorStatementSubmit">
                         <ion-label>
-                            <ion-button expand="block" class="ion-text-wrap"
-                                (click)="submitForGrading(acceptStatement)">
+                            <ion-button expand="block" class="ion-text-wrap" (click)="submitForGrading(acceptStatement)">
                                 {{ 'addon.mod_assign.submitassignment' | translate }}
                             </ion-button>
                             <p>{{ 'addon.mod_assign.submitassignment_help' | translate }}</p>
@@ -175,14 +169,18 @@
 
                 <!-- Team members that need to submit it too. -->
                 <ion-item-divider class="ion-text-wrap" *ngIf="membersToSubmit && membersToSubmit.length > 0">
-                    <ion-label><h2>{{ 'addon.mod_assign.userswhoneedtosubmit' | translate: {$a: ''} }}</h2></ion-label>
+                    <ion-label>
+                        <h2>{{ 'addon.mod_assign.userswhoneedtosubmit' | translate: {$a: ''} }}</h2>
+                    </ion-label>
                 </ion-item-divider>
                 <ng-container *ngIf="membersToSubmit && membersToSubmit.length > 0 && !blindMarking">
                     <ng-container *ngFor="let user of membersToSubmit">
-                        <ion-item class="ion-text-wrap" core-user-link [userId]="user.id"
-                            [courseId]="courseId" [attr.aria-label]="user.fullname">
+                        <ion-item class="ion-text-wrap" core-user-link [userId]="user.id" [courseId]="courseId"
+                            [attr.aria-label]="user.fullname">
                             <core-user-avatar [user]="user" slot="start"></core-user-avatar>
-                            <ion-label><h2>{{ user.fullname }}</h2></ion-label>
+                            <ion-label>
+                                <h2>{{ user.fullname }}</h2>
+                            </ion-label>
                         </ion-item>
                     </ng-container>
                 </ng-container>
@@ -196,12 +194,13 @@
 
                 <!-- Submission is locked. -->
                 <ion-item class="ion-text-wrap" *ngIf="lastAttempt?.locked">
-                    <ion-label><h2>{{ 'addon.mod_assign.submissionslocked' | translate }}</h2></ion-label>
+                    <ion-label>
+                        <h2>{{ 'addon.mod_assign.submissionslocked' | translate }}</h2>
+                    </ion-label>
                 </ion-item>
 
                 <!-- Editing status. -->
-                <ion-item class="ion-text-wrap"
-                    *ngIf="lastAttempt && isSubmittedForGrading && lastAttempt!.caneditowner !== undefined"
+                <ion-item class="ion-text-wrap" *ngIf="lastAttempt && isSubmittedForGrading && lastAttempt!.caneditowner !== undefined"
                     [ngClass]="{submissioneditable: lastAttempt!.caneditowner, submissionnoteditable: !lastAttempt!.caneditowner}">
                     <ion-label>
                         <h2>{{ 'addon.mod_assign.editingstatus' | translate }}</h2>
@@ -220,7 +219,9 @@
                     *ngIf="feedback?.gradefordisplay && (!isGrading || grade.method != 'simple')">
                     <ion-label>
                         <h2>{{ 'addon.mod_assign.currentgrade' | translate }}</h2>
-                        <p><core-format-text [text]="feedback!.gradefordisplay" [filter]="false"></core-format-text></p>
+                        <p>
+                            <core-format-text [text]="feedback!.gradefordisplay" [filter]="false"></core-format-text>
+                        </p>
                     </ion-label>
                     <ion-button slot="end" *ngIf="feedback!.advancedgrade" (click)="showAdvancedGrade()"
                         [attr.aria-label]="'core.showadvanced' |translate">
@@ -243,7 +244,9 @@
 
                     <!-- Grade using a scale. -->
                     <ion-item class="ion-text-wrap" *ngIf="grade.method == 'simple' && grade.scale">
-                        <ion-label><h2>{{ 'addon.mod_assign.grade' | translate }}</h2></ion-label>
+                        <ion-label>
+                            <h2>{{ 'addon.mod_assign.grade' | translate }}</h2>
+                        </ion-label>
                         <ion-select [(ngModel)]="grade.grade" interface="action-sheet" [disabled]="grade.disabled"
                             [interfaceOptions]="{header: 'addon.mod_assign.grade' | translate}">
                             <ion-select-option *ngFor="let grade of grade.scale" [value]="grade.value">
@@ -254,10 +257,11 @@
 
                     <!-- Outcomes. -->
                     <ion-item class="ion-text-wrap" *ngFor="let outcome of gradeInfo!.outcomes">
-                        <ion-label><h2>{{ outcome.name }}</h2></ion-label>
-                        <ion-select *ngIf="canSaveGrades && outcome.itemNumber" [(ngModel)]="outcome.selectedId"
-                            interface="action-sheet" [disabled]="gradeInfo!.disabled"
-                            [interfaceOptions]="{header: outcome.name }">
+                        <ion-label>
+                            <h2>{{ outcome.name }}</h2>
+                        </ion-label>
+                        <ion-select *ngIf="canSaveGrades && outcome.itemNumber" [(ngModel)]="outcome.selectedId" interface="action-sheet"
+                            [disabled]="gradeInfo!.disabled" [interfaceOptions]="{header: outcome.name }">
                             <ion-select-option *ngFor="let grade of outcome.options" [value]="grade.value">
                                 {{grade.label}}
                             </ion-select-option>
@@ -310,11 +314,11 @@
                             <h2>{{ 'addon.mod_assign.attemptsettings' | translate }}</h2>
                             <p *ngIf="assign!.maxattempts == unlimitedAttempts">
                                 {{ 'addon.mod_assign.outof' | translate :
-                                    {'$a': {'current': currentAttempt, 'total': maxAttemptsText} } }}
+                                {'$a': {'current': currentAttempt, 'total': maxAttemptsText} } }}
                             </p>
                             <p *ngIf="assign!.maxattempts != unlimitedAttempts">
                                 {{ 'addon.mod_assign.outof' | translate :
-                                    {'$a': {'current': currentAttempt, 'total': assign!.maxattempts} } }}
+                                {'$a': {'current': currentAttempt, 'total': assign!.maxattempts} } }}
                             </p>
                             <p>
                                 {{ 'addon.mod_assign.attemptreopenmethod' | translate }}:
@@ -322,7 +326,7 @@
                             </p>
                         </ion-label>
                     </ion-item>
-                    <ion-item *ngIf="canSaveGrades && allowAddAttempt" >
+                    <ion-item *ngIf="canSaveGrades && allowAddAttempt">
                         <ion-label>{{ 'addon.mod_assign.addattempt' | translate }}</ion-label>
                         <ion-toggle [(ngModel)]="grade.addAttempt"></ion-toggle>
                     </ion-item>
diff --git a/src/addons/mod/assign/feedback/editpdf/component/addon-mod-assign-feedback-editpdf.html b/src/addons/mod/assign/feedback/editpdf/component/addon-mod-assign-feedback-editpdf.html
index d6f66aad3..d50b9ae85 100644
--- a/src/addons/mod/assign/feedback/editpdf/component/addon-mod-assign-feedback-editpdf.html
+++ b/src/addons/mod/assign/feedback/editpdf/component/addon-mod-assign-feedback-editpdf.html
@@ -3,8 +3,7 @@
     <ion-label>
         <h2>{{plugin.name}}</h2>
         <ng-container>
-            <core-file *ngFor="let file of files" [file]="file" [component]="component" [componentId]="assign.cmid"
-                [alwaysDownload]="true">
+            <core-file *ngFor="let file of files" [file]="file" [component]="component" [componentId]="assign.cmid" [alwaysDownload]="true">
             </core-file>
         </ng-container>
     </ion-label>
diff --git a/src/addons/mod/assign/feedback/file/component/addon-mod-assign-feedback-file.html b/src/addons/mod/assign/feedback/file/component/addon-mod-assign-feedback-file.html
index d6f66aad3..d50b9ae85 100644
--- a/src/addons/mod/assign/feedback/file/component/addon-mod-assign-feedback-file.html
+++ b/src/addons/mod/assign/feedback/file/component/addon-mod-assign-feedback-file.html
@@ -3,8 +3,7 @@
     <ion-label>
         <h2>{{plugin.name}}</h2>
         <ng-container>
-            <core-file *ngFor="let file of files" [file]="file" [component]="component" [componentId]="assign.cmid"
-                [alwaysDownload]="true">
+            <core-file *ngFor="let file of files" [file]="file" [component]="component" [componentId]="assign.cmid" [alwaysDownload]="true">
             </core-file>
         </ng-container>
     </ion-label>
diff --git a/src/addons/mod/assign/submission/comments/component/addon-mod-assign-submission-comments.html b/src/addons/mod/assign/submission/comments/component/addon-mod-assign-submission-comments.html
index 882718fc8..157d9f527 100644
--- a/src/addons/mod/assign/submission/comments/component/addon-mod-assign-submission-comments.html
+++ b/src/addons/mod/assign/submission/comments/component/addon-mod-assign-submission-comments.html
@@ -1,8 +1,8 @@
 <ion-item *ngIf="commentsEnabled" class="ion-text-wrap" (click)="showComments($event)" detail="true" button>
     <ion-label>
         <h2>{{plugin.name}}</h2>
-        <core-comments contextLevel="module" [instanceId]="assign.cmid" component="assignsubmission_comments"
-            [itemId]="submission.id" area="submission_comments" [title]="plugin.name" [courseId]="assign.course">
+        <core-comments contextLevel="module" [instanceId]="assign.cmid" component="assignsubmission_comments" [itemId]="submission.id"
+            area="submission_comments" [title]="plugin.name" [courseId]="assign.course">
         </core-comments>
     </ion-label>
 </ion-item>
diff --git a/src/addons/mod/assign/submission/file/component/addon-mod-assign-submission-file.html b/src/addons/mod/assign/submission/file/component/addon-mod-assign-submission-file.html
index af3d5235f..65b01b48e 100644
--- a/src/addons/mod/assign/submission/file/component/addon-mod-assign-submission-file.html
+++ b/src/addons/mod/assign/submission/file/component/addon-mod-assign-submission-file.html
@@ -11,7 +11,9 @@
 <!-- Edit -->
 <div *ngIf="edit">
     <ion-item-divider class="ion-text-wrap" sticky="true">
-        <ion-label><h2>{{ plugin.name }}</h2></ion-label>
+        <ion-label>
+            <h2>{{ plugin.name }}</h2>
+        </ion-label>
     </ion-item-divider>
     <core-attachments [files]="files" [maxSize]="maxSize" [maxSubmissions]="maxSubmissions" [courseId]="assign.course"
         [component]="component" [componentId]="assign.cmid" [acceptedTypes]="acceptedTypes" [allowOffline]="allowOffline">
diff --git a/src/addons/mod/data/components/action/addon-mod-data-action.html b/src/addons/mod/data/components/action/addon-mod-data-action.html
index f1e415554..ee307cfd9 100644
--- a/src/addons/mod/data/components/action/addon-mod-data-action.html
+++ b/src/addons/mod/data/components/action/addon-mod-data-action.html
@@ -24,7 +24,7 @@
 </ion-button>
 
 <core-comments *ngIf="action == 'comments' && mode == 'list'" contextLevel="module" [instanceId]="database.coursemodule"
-component="mod_data" [itemId]="entry.id" area="database_entry" [courseId]="database.course">
+    component="mod_data" [itemId]="entry.id" area="database_entry" [courseId]="database.course">
 </core-comments>
 
 <span *ngIf="action == 'timeadded'">{{ entry.timecreated * 1000 | coreFormatDate }}</span>
@@ -32,7 +32,7 @@ component="mod_data" [itemId]="entry.id" area="database_entry" [courseId]="datab
 
 <a *ngIf="action == 'userpicture'" core-user-link [courseId]="database.course" [userId]="entry.userid" [title]="entry.fullname">
     <img class="avatar-round" [src]="userPicture" [alt]="'core.pictureof' | translate:{$a: entry.fullname}" core-external-content
-    onError="this.src='assets/img/user-avatar.png'">
+        onError="this.src='assets/img/user-avatar.png'">
 </a>
 
 <a *ngIf="action == 'user' && entry" core-user-link [courseId]="database.course" [userId]="entry.userid" [title]="entry.fullname">
diff --git a/src/addons/mod/data/fields/file/component/addon-mod-data-field-file.html b/src/addons/mod/data/fields/file/component/addon-mod-data-field-file.html
index 286e96940..09e90442f 100644
--- a/src/addons/mod/data/fields/file/component/addon-mod-data-field-file.html
+++ b/src/addons/mod/data/fields/file/component/addon-mod-data-field-file.html
@@ -1,7 +1,7 @@
 <span *ngIf="editMode && form">
     <span [core-mark-required]="field.required" class="core-mark-required"></span>
-    <core-attachments [files]="files" [maxSize]="maxSizeBytes" maxSubmissions="1" [component]="component"
-        [componentId]="componentId" [allowOffline]="true" [courseId]="database?.course">
+    <core-attachments [files]="files" [maxSize]="maxSizeBytes" maxSubmissions="1" [component]="component" [componentId]="componentId"
+        [allowOffline]="true" [courseId]="database?.course">
     </core-attachments>
     <core-input-errors *ngIf="error" [errorText]="error"></core-input-errors>
 </span>
diff --git a/src/addons/mod/data/fields/picture/component/addon-mod-data-field-picture.html b/src/addons/mod/data/fields/picture/component/addon-mod-data-field-picture.html
index bf10ea74e..4a9e62bb7 100644
--- a/src/addons/mod/data/fields/picture/component/addon-mod-data-field-picture.html
+++ b/src/addons/mod/data/fields/picture/component/addon-mod-data-field-picture.html
@@ -1,12 +1,12 @@
 <span *ngIf="editMode && form" [formGroup]="form">
     <span [core-mark-required]="field.required" class="core-mark-required"></span>
-    <core-attachments [files]="files" [maxSize]="maxSizeBytes" maxSubmissions="1" [component]="component"
-        [componentId]="componentId" [allowOffline]="true" acceptedTypes="image" [courseId]="database?.course">
+    <core-attachments [files]="files" [maxSize]="maxSizeBytes" maxSubmissions="1" [component]="component" [componentId]="componentId"
+        [allowOffline]="true" acceptedTypes="image" [courseId]="database?.course">
     </core-attachments>
     <core-input-errors *ngIf="error" [errorText]="error"></core-input-errors>
 
     <ion-label position="stacked">{{ 'addon.mod_data.alttext' | translate }}</ion-label>
-    <ion-input type="text" [formControlName]="'f_'+field.id+'_alttext'" [placeholder]=" 'addon.mod_data.alttext' | translate" >
+    <ion-input type="text" [formControlName]="'f_'+field.id+'_alttext'" [placeholder]=" 'addon.mod_data.alttext' | translate">
     </ion-input>
 </span>
 
@@ -15,8 +15,8 @@
 </span>
 
 <button class="as-link" *ngIf="listMode && imageUrl" (click)="navigateEntry()">
-    <img [src]="imageUrl" [alt]="title" class="core-media-adapt-width listMode_picture" core-external-content/>
+    <img [src]="imageUrl" [alt]="title" class="core-media-adapt-width listMode_picture" core-external-content />
 </button>
 
-<img *ngIf="showMode && imageUrl" [src]="imageUrl" [alt]="title" class="core-media-adapt-width listMode_picture"
-    [attr.width]="width" [attr.height]="height" core-external-content/>
+<img *ngIf="showMode && imageUrl" [src]="imageUrl" [alt]="title" class="core-media-adapt-width listMode_picture" [attr.width]="width"
+    [attr.height]="height" core-external-content />
diff --git a/src/addons/mod/data/fields/textarea/component/addon-mod-data-field-textarea.html b/src/addons/mod/data/fields/textarea/component/addon-mod-data-field-textarea.html
index 73d83c17d..1b4e97cae 100644
--- a/src/addons/mod/data/fields/textarea/component/addon-mod-data-field-textarea.html
+++ b/src/addons/mod/data/fields/textarea/component/addon-mod-data-field-textarea.html
@@ -2,9 +2,9 @@
     <ion-input *ngIf="searchMode" type="text" [placeholder]="field.name" [formControlName]="'f_'+field.id"></ion-input>
 
     <span *ngIf="editMode" [core-mark-required]="field.required" class="core-mark-required"></span>
-    <core-rich-text-editor *ngIf="editMode" [control]="form.controls['f_'+field.id]" [placeholder]="field.name"
-        [name]="'f_'+field.id" [component]="component" [componentId]="componentId" [autoSave]="true"
-        contextLevel="module" [contextInstanceId]="componentId" [elementId]="'field_'+field.id" ngDefaultControl>
+    <core-rich-text-editor *ngIf="editMode" [control]="form.controls['f_'+field.id]" [placeholder]="field.name" [name]="'f_'+field.id"
+        [component]="component" [componentId]="componentId" [autoSave]="true" contextLevel="module" [contextInstanceId]="componentId"
+        [elementId]="'field_'+field.id" ngDefaultControl>
     </core-rich-text-editor>
     <core-input-errors *ngIf="error && editMode" [control]="form.controls['f_'+field.id]" [errorText]="error"></core-input-errors>
 </span>
diff --git a/src/addons/mod/forum/components/post-options-menu/post-options-menu.html b/src/addons/mod/forum/components/post-options-menu/post-options-menu.html
index eed4aa8ac..ee0955932 100644
--- a/src/addons/mod/forum/components/post-options-menu/post-options-menu.html
+++ b/src/addons/mod/forum/components/post-options-menu/post-options-menu.html
@@ -8,20 +8,19 @@
     <ion-item button class="ion-text-wrap" (click)="deletePost()" *ngIf="offlinePost || (canDelete && isOnline)" detail="false">
         <ion-icon name="fas-trash" slot="start" aria-hidden="true"></ion-icon>
         <ion-label>
-            <p  class="item-heading" *ngIf="!offlinePost">{{ 'addon.mod_forum.delete' | translate }}</p>
-            <p  class="item-heading" *ngIf="offlinePost">{{ 'core.discard' | translate }}</p>
+            <p class="item-heading" *ngIf="!offlinePost">{{ 'addon.mod_forum.delete' | translate }}</p>
+            <p class="item-heading" *ngIf="offlinePost">{{ 'core.discard' | translate }}</p>
         </ion-label>
     </ion-item>
     <ion-item class="ion-text-wrap" *ngIf="wordCount">
         <ion-label>
-            <p  class="item-heading">{{ 'core.numwords' | translate: {'$a': wordCount} }}</p>
+            <p class="item-heading">{{ 'core.numwords' | translate: {'$a': wordCount} }}</p>
         </ion-label>
     </ion-item>
-    <ion-item class="ion-text-wrap" [href]="url" *ngIf="url" core-link capture="false" button detail="false"
-        [showBrowserWarning]="false">
+    <ion-item class="ion-text-wrap" [href]="url" *ngIf="url" core-link capture="false" button detail="false" [showBrowserWarning]="false">
         <ion-icon name="fas-external-link-alt" slot="start" aria-hidden="true"></ion-icon>
         <ion-label>
-            <p  class="item-heading">{{ 'core.openinbrowser' | translate }}</p>
+            <p class="item-heading">{{ 'core.openinbrowser' | translate }}</p>
         </ion-label>
     </ion-item>
 </core-loading>
diff --git a/src/addons/mod/forum/components/post/post.html b/src/addons/mod/forum/components/post/post.html
index 7a3223a80..77feb0f7e 100644
--- a/src/addons/mod/forum/components/post/post.html
+++ b/src/addons/mod/forum/components/post/post.html
@@ -8,22 +8,19 @@
                             <ion-icon name="fas-map-pin" *ngIf="discussion && !post.parentid && discussion.pinned"
                                 [attr.aria-label]="'addon.mod_forum.discussionpinned' | translate">
                             </ion-icon>
-                            <ion-icon name="fas-star" class="addon-forum-star"
-                                [attr.aria-label]="'addon.mod_forum.favourites' | translate"
+                            <ion-icon name="fas-star" class="addon-forum-star" [attr.aria-label]="'addon.mod_forum.favourites' | translate"
                                 *ngIf="discussion && !post.parentid && !discussion.pinned && discussion.starred">
                             </ion-icon>
-                            <core-format-text
-                                [text]="post.subject"
-                                contextLevel="module" [contextInstanceId]="forum && forum.cmid" [courseId]="courseId">
+                            <core-format-text [text]="post.subject" contextLevel="module" [contextInstanceId]="forum && forum.cmid"
+                                [courseId]="courseId">
                             </core-format-text>
                         </h2>
                         <ion-note *ngIf="trackPosts && post.unread" class="ion-float-end ion-padding-start ion-text-end"
                             [attr.aria-label]="'addon.mod_forum.unread' | translate">
                             <ion-icon name="fas-circle" color="primary" aria-hidden="true"></ion-icon>
                         </ion-note>
-                        <ion-button *ngIf="optionsMenuEnabled"
-                            fill="clear" color="dark" [attr.aria-label]="('core.displayoptions' | translate)"
-                            (click)="showOptionsMenu($event)">
+                        <ion-button *ngIf="optionsMenuEnabled" fill="clear" color="dark"
+                            [attr.aria-label]="('core.displayoptions' | translate)" (click)="showOptionsMenu($event)">
                             <ion-icon name="ellipsis-vertical" slot="icon-only" aria-hidden="true">
                             </ion-icon>
                         </ion-button>
@@ -50,9 +47,8 @@
                                 [attr.aria-label]="'addon.mod_forum.unread' | translate">
                                 <ion-icon name="fas-circle" color="primary" aria-hidden="true"></ion-icon>
                             </ion-note>
-                            <ion-button *ngIf="optionsMenuEnabled"
-                                fill="clear" color="dark" [attr.aria-label]="('core.displayoptions' | translate)"
-                                (click)="showOptionsMenu($event)">
+                            <ion-button *ngIf="optionsMenuEnabled" fill="clear" color="dark"
+                                [attr.aria-label]="('core.displayoptions' | translate)" (click)="showOptionsMenu($event)">
                                 <ion-icon name="ellipsis-vertical" slot="icon-only" aria-hidden="true"></ion-icon>
                             </ion-button>
                         </ng-container>
@@ -64,8 +60,8 @@
             <div class="ion-padding-bottom" *ngIf="post.isprivatereply">
                 <ion-note color="danger">{{ 'addon.mod_forum.postisprivatereply' | translate }}</ion-note>
             </div>
-            <core-format-text [component]="component" [componentId]="componentId" [text]="post.message"
-                contextLevel="module" [contextInstanceId]="forum && forum.cmid" [courseId]="courseId">
+            <core-format-text [component]="component" [componentId]="componentId" [text]="post.message" contextLevel="module"
+                [contextInstanceId]="forum && forum.cmid" [courseId]="courseId">
             </core-format-text>
             <div lines="none" *ngIf="post.attachments && post.attachments.length > 0">
                 <core-files [files]="post.attachments" [component]="component" [componentId]="componentId" showInline="true">
@@ -79,23 +75,19 @@
                     <core-tag-list [tags]="post.tags"></core-tag-list>
                 </ion-label>
             </ion-item>
-            <core-rating-rate *ngIf="forum && ratingInfo"
-                [ratingInfo]="ratingInfo" contextLevel="module" [instanceId]="componentId" [itemId]="post.id"
-                [itemSetId]="discussionId" [courseId]="courseId" [aggregateMethod]="forum.assessed" [scaleId]="forum.scale"
-                [userId]="post.author.id" (onUpdate)="ratingUpdated()">
+            <core-rating-rate *ngIf="forum && ratingInfo" [ratingInfo]="ratingInfo" contextLevel="module" [instanceId]="componentId"
+                [itemId]="post.id" [itemSetId]="discussionId" [courseId]="courseId" [aggregateMethod]="forum.assessed"
+                [scaleId]="forum.scale" [userId]="post.author.id" (onUpdate)="ratingUpdated()">
             </core-rating-rate>
-            <core-rating-aggregate *ngIf="forum && ratingInfo"
-                [ratingInfo]="ratingInfo" contextLevel="module" [instanceId]="componentId" [itemId]="post.id"
-                [courseId]="courseId" [aggregateMethod]="forum.assessed" [scaleId]="forum.scale">
+            <core-rating-aggregate *ngIf="forum && ratingInfo" [ratingInfo]="ratingInfo" contextLevel="module" [instanceId]="componentId"
+                [itemId]="post.id" [courseId]="courseId" [aggregateMethod]="forum.assessed" [scaleId]="forum.scale">
             </core-rating-aggregate>
 
             <ion-item *ngIf="post.id > 0 && post.capabilities.reply && !post.isprivatereply"
                 class="ion-no-padding ion-text-end addon-forum-reply-button">
                 <ion-label>
-                    <ion-button fill="clear" size="small"
-                        [attr.aria-controls]="'addon-forum-reply-edit-form-' + uniqueId"
-                        [attr.aria-expanded]="formData.replyingTo === post.id"
-                        (click)="showReplyForm($event)">
+                    <ion-button fill="clear" size="small" [attr.aria-controls]="'addon-forum-reply-edit-form-' + uniqueId"
+                        [attr.aria-expanded]="formData.replyingTo === post.id" (click)="showReplyForm($event)">
                         <ion-icon name="fas-reply" slot="start" aria-hidden="true"></ion-icon>
                         {{ 'addon.mod_forum.reply' | translate }}
                     </ion-button>
@@ -104,21 +96,18 @@
         </div>
     </ng-container>
 
-    <form *ngIf="showForm"
-        [id]="'addon-forum-reply-edit-form-' + uniqueId" #replyFormEl>
+    <form *ngIf="showForm" [id]="'addon-forum-reply-edit-form-' + uniqueId" #replyFormEl>
         <ion-item>
             <ion-label position="stacked">{{ 'addon.mod_forum.subject' | translate }}</ion-label>
-            <ion-input type="text" [placeholder]="'addon.mod_forum.subject' | translate" [(ngModel)]="formData.subject"
-                name="subject">
+            <ion-input type="text" [placeholder]="'addon.mod_forum.subject' | translate" [(ngModel)]="formData.subject" name="subject">
             </ion-input>
         </ion-item>
         <ion-item>
             <ion-label position="stacked">{{ 'addon.mod_forum.message' | translate }}</ion-label>
-            <core-rich-text-editor elementId="message" contextLevel="module"
-                [control]="messageControl" [placeholder]="'addon.mod_forum.replyplaceholder' | translate"
-                [name]="'mod_forum_reply_' + post.id" [component]="component" [componentId]="componentId" [autoSave]="true"
-                [contextInstanceId]="forum && forum.cmid" [draftExtraParams]="{reply: post.id}"
-                (contentChanged)="onMessageChange($event)">
+            <core-rich-text-editor elementId="message" contextLevel="module" [control]="messageControl"
+                [placeholder]="'addon.mod_forum.replyplaceholder' | translate" [name]="'mod_forum_reply_' + post.id" [component]="component"
+                [componentId]="componentId" [autoSave]="true" [contextInstanceId]="forum && forum.cmid"
+                [draftExtraParams]="{reply: post.id}" (contentChanged)="onMessageChange($event)">
             </core-rich-text-editor>
         </ion-item>
         <ion-item class="ion-text-wrap" *ngIf="accessInfo.canpostprivatereply">
@@ -126,14 +115,9 @@
             <ion-checkbox slot="end" [(ngModel)]="formData.isprivatereply" name="isprivatereply"></ion-checkbox>
         </ion-item>
         <ng-container *ngIf="forum.id && forum.maxattachments > 0">
-            <ion-item
-                button
-                class="divider ion-text-wrap"
-                (click)="toggleAdvanced()" detail="false"
-                [attr.aria-expanded]="advanced"
+            <ion-item button class="divider ion-text-wrap" (click)="toggleAdvanced()" detail="false" [attr.aria-expanded]="advanced"
                 [attr.aria-controls]="'addon-forum-reply-edit-form-advanced-' + uniqueId"
-                [attr.aria-label]="(advanced ? 'core.hideadvanced' : 'core.showadvanced') | translate"
-            >
+                [attr.aria-label]="(advanced ? 'core.hideadvanced' : 'core.showadvanced') | translate">
                 <ion-icon *ngIf="!advanced" name="fas-caret-right" flip-rtl slot="start" aria-hidden="true"></ion-icon>
                 <ion-icon *ngIf="advanced" name="fas-caret-down" slot="start" aria-hidden="true"></ion-icon>
                 <ion-label>
@@ -141,8 +125,7 @@
                 </ion-label>
             </ion-item>
             <div *ngIf="advanced" [id]="'addon-forum-reply-edit-form-advanced-' + uniqueId">
-                <core-attachments
-                    [files]="formData.files" [maxSize]="forum.maxbytes" [maxSubmissions]="forum.maxattachments"
+                <core-attachments [files]="formData.files" [maxSize]="forum.maxbytes" [maxSubmissions]="forum.maxattachments"
                     [component]="component" [componentId]="forum.cmid" [allowOffline]="true" [courseId]="courseId">
                 </core-attachments>
             </div>
diff --git a/src/addons/mod/wiki/components/subwiki-picker/addon-mod-wiki-subwiki-picker.html b/src/addons/mod/wiki/components/subwiki-picker/addon-mod-wiki-subwiki-picker.html
index 467eb9d19..44224516e 100644
--- a/src/addons/mod/wiki/components/subwiki-picker/addon-mod-wiki-subwiki-picker.html
+++ b/src/addons/mod/wiki/components/subwiki-picker/addon-mod-wiki-subwiki-picker.html
@@ -1,11 +1,12 @@
 <ion-list>
     <ng-container *ngFor="let group of subwikis">
         <ion-item-divider *ngIf="group.label">
-            <ion-label><h2>{{ group.label }}</h2></ion-label>
+            <ion-label>
+                <h2>{{ group.label }}</h2>
+            </ion-label>
         </ion-item-divider>
         <ion-item class="ion-text-wrap" *ngFor="let subwiki of group.subwikis" (click)="openSubwiki(subwiki)"
-            [attr.disabled]="!subwiki.canedit && subwiki.id <= 0"
-            [button]="subwiki.canedit || subwiki.id > 0"
+            [attr.disabled]="!subwiki.canedit && subwiki.id <= 0" [button]="subwiki.canedit || subwiki.id > 0"
             [attr.aria-current]="isSubwikiSelected(subwiki) ? 'page' : 'false'" detail="false">
             <ion-label>{{ subwiki.name }}</ion-label>
             <ion-icon *ngIf="isSubwikiSelected(subwiki)" name="fas-check" slot="end" aria-hidden="true"></ion-icon>
diff --git a/src/addons/mod/workshop/assessment/accumulative/component/addon-mod-workshop-assessment-strategy-accumulative.html b/src/addons/mod/workshop/assessment/accumulative/component/addon-mod-workshop-assessment-strategy-accumulative.html
index a65648ab1..16790ec5e 100644
--- a/src/addons/mod/workshop/assessment/accumulative/component/addon-mod-workshop-assessment-strategy-accumulative.html
+++ b/src/addons/mod/workshop/assessment/accumulative/component/addon-mod-workshop-assessment-strategy-accumulative.html
@@ -3,19 +3,17 @@
         <ion-item class="ion-text-wrap">
             <ion-label>
                 <h2>{{ field.dimtitle }}</h2>
-                <core-format-text [text]="field.description" contextLevel="module" [contextInstanceId]="moduleId"
-                    [courseId]="courseId">
+                <core-format-text [text]="field.description" contextLevel="module" [contextInstanceId]="moduleId" [courseId]="courseId">
                 </core-format-text>
             </ion-label>
         </ion-item>
         <ion-item *ngIf="edit && field.grades">
             <ion-label position="stacked">
                 <span [core-mark-required]="true">
-                {{ 'addon.mod_workshop_assessment_accumulative.dimensiongradefor' | translate : {'$a': field.dimtitle } }}
+                    {{ 'addon.mod_workshop_assessment_accumulative.dimensiongradefor' | translate : {'$a': field.dimtitle } }}
                 </span>
             </ion-label>
-            <ion-select [(ngModel)]="selectedValues[n].grade" interface="action-sheet"
-                [interfaceOptions]="{header: 'addon.mod_workshop_assessment_accumulative.dimensiongradefor' |
+            <ion-select [(ngModel)]="selectedValues[n].grade" interface="action-sheet" [interfaceOptions]="{header: 'addon.mod_workshop_assessment_accumulative.dimensiongradefor' |
                     translate : {'$a': field.dimtitle }}">
                 <ion-select-option *ngFor="let grade of field.grades" [value]="grade.value">{{grade.label}}</ion-select-option>
             </ion-select>
diff --git a/src/addons/mod/workshop/assessment/comments/component/addon-mod-workshop-assessment-strategy-comments.html b/src/addons/mod/workshop/assessment/comments/component/addon-mod-workshop-assessment-strategy-comments.html
index fe2566390..4badf862d 100644
--- a/src/addons/mod/workshop/assessment/comments/component/addon-mod-workshop-assessment-strategy-comments.html
+++ b/src/addons/mod/workshop/assessment/comments/component/addon-mod-workshop-assessment-strategy-comments.html
@@ -3,8 +3,7 @@
         <ion-item class="ion-text-wrap">
             <ion-label>
                 <h2>{{ field.dimtitle }}</h2>
-                <core-format-text [text]="field.description" contextLevel="module" [contextInstanceId]="moduleId"
-                    [courseId]="courseId">
+                <core-format-text [text]="field.description" contextLevel="module" [contextInstanceId]="moduleId" [courseId]="courseId">
                 </core-format-text>
             </ion-label>
         </ion-item>
@@ -22,9 +21,11 @@
         <ion-item *ngIf="!edit" class="ion-text-wrap">
             <ion-label>
                 <h2>{{ 'addon.mod_workshop_assessment_comments.dimensioncommentfor' | translate : {'$a': field.dimtitle } }}</h2>
-                <p><core-format-text [text]="selectedValues[n].peercomment" contextLevel="module" [contextInstanceId]="moduleId"
-                    [courseId]="courseId">
-                </core-format-text></p>
+                <p>
+                    <core-format-text [text]="selectedValues[n].peercomment" contextLevel="module" [contextInstanceId]="moduleId"
+                        [courseId]="courseId">
+                    </core-format-text>
+                </p>
             </ion-label>
         </ion-item>
     </ion-card>
diff --git a/src/addons/mod/workshop/assessment/numerrors/component/addon-mod-workshop-assessment-strategy-numerrors.html b/src/addons/mod/workshop/assessment/numerrors/component/addon-mod-workshop-assessment-strategy-numerrors.html
index 5449e5872..b742587b4 100644
--- a/src/addons/mod/workshop/assessment/numerrors/component/addon-mod-workshop-assessment-strategy-numerrors.html
+++ b/src/addons/mod/workshop/assessment/numerrors/component/addon-mod-workshop-assessment-strategy-numerrors.html
@@ -3,8 +3,7 @@
         <ion-item class="ion-text-wrap">
             <ion-label>
                 <h2>{{ field.dimtitle }}</h2>
-                <core-format-text [text]="field.description" contextLevel="module" [contextInstanceId]="moduleId"
-                    [courseId]="courseId">
+                <core-format-text [text]="field.description" contextLevel="module" [contextInstanceId]="moduleId" [courseId]="courseId">
                 </core-format-text>
             </ion-label>
         </ion-item>
@@ -26,7 +25,9 @@
                     <ion-radio slot="start" [value]="-1" [disabled]="!edit"></ion-radio>
                 </ion-item>
                 <ion-item>
-                    <ion-label><core-format-text [text]="field.grade1" [filter]="false"></core-format-text></ion-label>
+                    <ion-label>
+                        <core-format-text [text]="field.grade1" [filter]="false"></core-format-text>
+                    </ion-label>
                     <ion-radio slot="start" [value]="1" [disabled]="!edit"></ion-radio>
                 </ion-item>
             </ion-radio-group>
diff --git a/src/addons/mod/workshop/assessment/rubric/component/addon-mod-workshop-assessment-strategy-rubric.html b/src/addons/mod/workshop/assessment/rubric/component/addon-mod-workshop-assessment-strategy-rubric.html
index 1b4387116..1920e85c8 100644
--- a/src/addons/mod/workshop/assessment/rubric/component/addon-mod-workshop-assessment-strategy-rubric.html
+++ b/src/addons/mod/workshop/assessment/rubric/component/addon-mod-workshop-assessment-strategy-rubric.html
@@ -3,20 +3,21 @@
         <ion-item class="ion-text-wrap">
             <ion-label>
                 <h2 [core-mark-required]="edit">{{ field.dimtitle }}</h2>
-                <core-format-text [text]="field.description" contextLevel="module" [contextInstanceId]="moduleId"
-                    [courseId]="courseId">
+                <core-format-text [text]="field.description" contextLevel="module" [contextInstanceId]="moduleId" [courseId]="courseId">
                 </core-format-text>
             </ion-label>
             <core-input-errors *ngIf="edit && fieldErrors['chosenlevelid_' + n]" [errorText]="fieldErrors['chosenlevelid_' + n]">
-                </core-input-errors>
+            </core-input-errors>
         </ion-item>
         <ion-list>
             <ion-radio-group [(ngModel)]="selectedValues[n].chosenlevelid" [name]="'chosenlevelid_' + n">
                 <ion-item *ngFor="let subfield of field.fields">
                     <ion-label>
-                        <p><core-format-text [text]="subfield.definition" contextLevel="module"
-                            [contextInstanceId]="moduleId" [courseId]="courseId">
-                        </core-format-text></p>
+                        <p>
+                            <core-format-text [text]="subfield.definition" contextLevel="module" [contextInstanceId]="moduleId"
+                                [courseId]="courseId">
+                            </core-format-text>
+                        </p>
                     </ion-label>
                     <ion-radio slot="start" [value]="subfield.levelid" [disabled]="!edit"></ion-radio>
                 </ion-item>
diff --git a/src/addons/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html b/src/addons/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html
index 42baab58b..d3bc0cf0b 100644
--- a/src/addons/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html
+++ b/src/addons/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html
@@ -17,7 +17,9 @@
         <ion-card *ngIf="assessmentStrategyLoaded && overallFeedkback &&
             (edit || data.assessment?.feedbackauthor || data.assessment?.feedbackattachmentfiles?.length) ">
             <ion-item class="ion-text-wrap">
-                <ion-label><h2>{{ 'addon.mod_workshop.overallfeedback' | translate }}</h2></ion-label>
+                <ion-label>
+                    <h2>{{ 'addon.mod_workshop.overallfeedback' | translate }}</h2>
+                </ion-label>
             </ion-item>
             <ion-item position="stacked" *ngIf="edit">
                 <ion-label position="stacked">
@@ -25,19 +27,17 @@
                         {{ 'addon.mod_workshop.feedbackauthor' | translate }}
                     </span>
                 </ion-label>
-                <core-rich-text-editor [control]="feedbackControl" [component]="component"
-                    [componentId]="workshop.coursemodule" [autoSave]="true" contextLevel="module"
-                    [contextInstanceId]="workshop.coursemodule" elementId="feedbackauthor_editor"
+                <core-rich-text-editor [control]="feedbackControl" [component]="component" [componentId]="workshop.coursemodule"
+                    [autoSave]="true" contextLevel="module" [contextInstanceId]="workshop.coursemodule" elementId="feedbackauthor_editor"
                     [draftExtraParams]="{asid: assessmentId}" (contentChanged)="onFeedbackChange($event)">
                 </core-rich-text-editor>
-                <core-input-errors
-                    *ngIf="overallFeedkbackRequired && data.fieldErrors && data.fieldErrors['feedbackauthor']"
+                <core-input-errors *ngIf="overallFeedkbackRequired && data.fieldErrors && data.fieldErrors['feedbackauthor']"
                     [errorText]="data.fieldErrors['feedbackauthor']">
                 </core-input-errors>
             </ion-item>
             <core-attachments *ngIf="edit && workshop.overallfeedbackfiles" [files]="data.assessment?.feedbackattachmentfiles"
-                [maxSize]="workshop.overallfeedbackmaxbytes" [maxSubmissions]="workshop.overallfeedbackfiles"
-                [component]="component" [componentId]="componentId" [allowOffline]="true" [courseId]="workshop.course">
+                [maxSize]="workshop.overallfeedbackmaxbytes" [maxSubmissions]="workshop.overallfeedbackfiles" [component]="component"
+                [componentId]="componentId" [allowOffline]="true" [courseId]="workshop.course">
             </core-attachments>
             <ion-item *ngIf="edit && access && access.canallocate">
                 <ion-label position="stacked">
@@ -57,11 +57,10 @@
                     </core-format-text>
                 </ion-label>
             </ion-item>
-            <ion-item *ngIf="!edit && workshop.overallfeedbackfiles && data.assessment?.feedbackattachmentfiles?.length"
-                lines="none">
+            <ion-item *ngIf="!edit && workshop.overallfeedbackfiles && data.assessment?.feedbackattachmentfiles?.length" lines="none">
                 <ion-label>
-                    <core-files [files]="data.assessment?.feedbackattachmentfiles" [component]="component"
-                        [componentId]="componentId"></core-files>
+                    <core-files [files]="data.assessment?.feedbackattachmentfiles" [component]="component" [componentId]="componentId">
+                    </core-files>
                 </ion-label>
             </ion-item>
         </ion-card>
diff --git a/src/addons/mod/workshop/components/submission/addon-mod-workshop-submission.html b/src/addons/mod/workshop/components/submission/addon-mod-workshop-submission.html
index 82de0e97e..f69d312a9 100644
--- a/src/addons/mod/workshop/components/submission/addon-mod-workshop-submission.html
+++ b/src/addons/mod/workshop/components/submission/addon-mod-workshop-submission.html
@@ -5,13 +5,11 @@
             </core-user-avatar>
             <ion-label>
                 <h2>
-                    <core-format-text [text]="submission.title" contextLevel="module" [contextInstanceId]="module.id"
-                        [courseId]="courseId">
+                    <core-format-text [text]="submission.title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
                     </core-format-text>
                 </h2>
                 <p *ngIf="profile && profile?.fullname">{{profile.fullname}}</p>
-                <p *ngIf="showGrade(submission.grade)"
-                    [class.addon-has-overriden-grade]="showGrade(submission.gradeover)">
+                <p *ngIf="showGrade(submission.grade)" [class.addon-has-overriden-grade]="showGrade(submission.gradeover)">
                     {{ 'addon.mod_workshop.submissiongradeof' | translate:{$a: workshop.grade } }}: {{submission.grade}}
                 </p>
                 <p *ngIf="showGrade(submission.gradeover)" class="addon-overriden-grade">
@@ -36,8 +34,8 @@
         </ion-item>
         <ion-item class="ion-text-wrap" *ngIf="submission.content">
             <ion-label>
-                <core-format-text [component]="component" [componentId]="componentId" [text]="submission.content"
-                    contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
+                <core-format-text [component]="component" [componentId]="componentId" [text]="submission.content" contextLevel="module"
+                    [contextInstanceId]="module.id" [courseId]="courseId">
                 </core-format-text>
             </ion-label>
         </ion-item>
@@ -71,8 +69,7 @@
         </core-user-avatar>
         <ion-label>
             <h2>
-                <core-format-text [text]="submission.title" contextLevel="module" [contextInstanceId]="module.id"
-                    [courseId]="courseId">
+                <core-format-text [text]="submission.title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
                 </core-format-text>
             </h2>
             <p *ngIf="profile && profile.fullname">{{profile.fullname}}</p>
@@ -92,19 +89,19 @@
                 {{ 'addon.mod_workshop.gradinggradeof' | translate:{$a: workshop.gradinggrade } }}: {{submission.gradinggrade}}
             </p>
 
-            <ion-badge *ngIf="assessment && (showGrade(assessment.grade) || assessment.offline)" color="success"
-                class="ion-text-wrap">
+            <ion-badge *ngIf="assessment && (showGrade(assessment.grade) || assessment.offline)" color="success" class="ion-text-wrap">
                 {{ 'addon.mod_workshop.assessedsubmission' | translate }}
             </ion-badge>
-            <ion-badge *ngIf="assessment && !showGrade(assessment.grade) && !assessment.offline" color="danger"
-                class="ion-text-wrap">
+            <ion-badge *ngIf="assessment && !showGrade(assessment.grade) && !assessment.offline" color="danger" class="ion-text-wrap">
                 {{ 'addon.mod_workshop.notassessed' | translate }}
             </ion-badge>
 
         </ion-label>
         <ion-note slot="end" *ngIf="submission.timemodified">
             {{submission.timemodified | coreDateDayOrTime}}
-            <div *ngIf="offline"><ion-icon name="fas-clock" aria-hidden="true"></ion-icon> {{ 'core.notsent' | translate }}</div>
+            <div *ngIf="offline">
+                <ion-icon name="fas-clock" aria-hidden="true"></ion-icon> {{ 'core.notsent' | translate }}
+            </div>
             <div *ngIf="submission.deleted">
                 <ion-icon name="fas-trash" aria-hidden="true"></ion-icon> {{ 'core.deletedoffline' | translate }}
             </div>
diff --git a/src/addons/qbehaviour/deferredcbm/component/addon-qbehaviour-deferredcbm.html b/src/addons/qbehaviour/deferredcbm/component/addon-qbehaviour-deferredcbm.html
index 76dfebf56..92e1b8dd8 100644
--- a/src/addons/qbehaviour/deferredcbm/component/addon-qbehaviour-deferredcbm.html
+++ b/src/addons/qbehaviour/deferredcbm/component/addon-qbehaviour-deferredcbm.html
@@ -1,6 +1,8 @@
 <div *ngIf="question && question.behaviourCertaintyOptions && question.behaviourCertaintyOptions.length">
-    <ion-item class="ion-text-wrap addon-qbehaviour-deferredcbm-certainty-title" >
-        <ion-label><p>{{ 'core.question.certainty' | translate }}</p></ion-label>
+    <ion-item class="ion-text-wrap addon-qbehaviour-deferredcbm-certainty-title">
+        <ion-label>
+            <p>{{ 'core.question.certainty' | translate }}</p>
+        </ion-label>
     </ion-item>
 
     <ion-radio-group [(ngModel)]="question.behaviourCertaintySelected" [name]="question.behaviourCertaintyOptions[0].name">
diff --git a/src/addons/qtype/calculated/component/addon-qtype-calculated.html b/src/addons/qtype/calculated/component/addon-qtype-calculated.html
index 40d2d9f42..ee44ea280 100644
--- a/src/addons/qtype/calculated/component/addon-qtype-calculated.html
+++ b/src/addons/qtype/calculated/component/addon-qtype-calculated.html
@@ -1,8 +1,8 @@
 <ion-list class="addon-qtype-calculated-container" *ngIf="calcQuestion && (calcQuestion.text || calcQuestion.text === '')">
     <ion-item class="ion-text-wrap">
         <ion-label>
-            <core-format-text [component]="component" [componentId]="componentId" [text]="calcQuestion.text"
-                [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId">
+            <core-format-text [component]="component" [componentId]="componentId" [text]="calcQuestion.text" [contextLevel]="contextLevel"
+                [contextInstanceId]="contextInstanceId" [courseId]="courseId">
             </core-format-text>
         </ion-label>
     </ion-item>
@@ -23,8 +23,8 @@
 
             <!-- Input to enter the answer. -->
             <ion-input type="text" [attr.name]="calcQuestion.input.name"
-                [placeholder]="calcQuestion.input.readOnly ? '' : 'core.question.answer' | translate"
-                [value]="calcQuestion.input.value" [disabled]="calcQuestion.input.readOnly" autocorrect="off">
+                [placeholder]="calcQuestion.input.readOnly ? '' : 'core.question.answer' | translate" [value]="calcQuestion.input.value"
+                [disabled]="calcQuestion.input.readOnly" autocorrect="off">
             </ion-input>
 
             <!-- Display unit select after the answer input. -->
@@ -48,9 +48,9 @@
     <label *ngIf="calcQuestion!.select!.accessibilityLabel" class="accesshide" for="{{calcQuestion!.select!.id}}">
         {{ calcQuestion!.select!.accessibilityLabel }}
     </label>
-    <ion-select id="{{calcQuestion!.select!.id}}" [name]="calcQuestion!.select!.name"
-        [(ngModel)]="calcQuestion!.select!.selected" interface="action-sheet" [disabled]="calcQuestion!.select!.disabled"
-        [slot]="calcQuestion?.selectFirst ? 'start' : 'end'" [interfaceOptions]="{header: 'addon.mod_quiz.unit' | translate}">
+    <ion-select id="{{calcQuestion!.select!.id}}" [name]="calcQuestion!.select!.name" [(ngModel)]="calcQuestion!.select!.selected"
+        interface="action-sheet" [disabled]="calcQuestion!.select!.disabled" [slot]="calcQuestion?.selectFirst ? 'start' : 'end'"
+        [interfaceOptions]="{header: 'addon.mod_quiz.unit' | translate}">
         <ion-select-option *ngFor="let option of calcQuestion!.select!.options" [value]="option.value">
             {{option.label}}
         </ion-select-option>
diff --git a/src/addons/qtype/ddimageortext/component/addon-qtype-ddimageortext.html b/src/addons/qtype/ddimageortext/component/addon-qtype-ddimageortext.html
index ff872fb90..e19589d6b 100644
--- a/src/addons/qtype/ddimageortext/component/addon-qtype-ddimageortext.html
+++ b/src/addons/qtype/ddimageortext/component/addon-qtype-ddimageortext.html
@@ -11,9 +11,8 @@
                 </ion-item>
             </ion-card>
 
-            <core-format-text [component]="component" [componentId]="componentId" [text]="ddQuestion.text"
-                [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId"
-                (afterRender)="textRendered()">
+            <core-format-text [component]="component" [componentId]="componentId" [text]="ddQuestion.text" [contextLevel]="contextLevel"
+                [contextInstanceId]="contextInstanceId" [courseId]="courseId" (afterRender)="textRendered()">
             </core-format-text>
         </ion-label>
     </ion-item>
diff --git a/src/addons/qtype/ddmarker/component/addon-qtype-ddmarker.html b/src/addons/qtype/ddmarker/component/addon-qtype-ddmarker.html
index c4d1bae1b..05ede1302 100644
--- a/src/addons/qtype/ddmarker/component/addon-qtype-ddmarker.html
+++ b/src/addons/qtype/ddmarker/component/addon-qtype-ddmarker.html
@@ -11,8 +11,7 @@
                 </ion-item>
             </ion-card>
             <core-format-text [component]="component" [componentId]="componentId" [text]="ddQuestion.text" #questiontext
-                [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId"
-                (afterRender)="textRendered()">
+                [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId" (afterRender)="textRendered()">
             </core-format-text>
         </ion-label>
     </ion-item>
diff --git a/src/addons/qtype/ddwtos/component/addon-qtype-ddwtos.html b/src/addons/qtype/ddwtos/component/addon-qtype-ddwtos.html
index 1403f3d22..bb9260055 100644
--- a/src/addons/qtype/ddwtos/component/addon-qtype-ddwtos.html
+++ b/src/addons/qtype/ddwtos/component/addon-qtype-ddwtos.html
@@ -10,13 +10,12 @@
             </ion-item>
         </ion-card>
         <div class="addon-qtype-ddwtos-container">
-            <core-format-text [component]="component" [componentId]="componentId" [text]="ddQuestion.text"
-                [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId" #questiontext
-                (afterRender)="textRendered()">
+            <core-format-text [component]="component" [componentId]="componentId" [text]="ddQuestion.text" [contextLevel]="contextLevel"
+                [contextInstanceId]="contextInstanceId" [courseId]="courseId" #questiontext (afterRender)="textRendered()">
             </core-format-text>
 
-            <core-format-text *ngIf="ddQuestion.answers" [component]="component" [componentId]="componentId"
-                [text]="ddQuestion.answers" [filter]="false" (afterRender)="answersRendered()">
+            <core-format-text *ngIf="ddQuestion.answers" [component]="component" [componentId]="componentId" [text]="ddQuestion.answers"
+                [filter]="false" (afterRender)="answersRendered()">
             </core-format-text>
 
             <div class="drags"></div>
diff --git a/src/addons/qtype/description/component/addon-qtype-description.html b/src/addons/qtype/description/component/addon-qtype-description.html
index d323be103..089d5912a 100644
--- a/src/addons/qtype/description/component/addon-qtype-description.html
+++ b/src/addons/qtype/description/component/addon-qtype-description.html
@@ -1,11 +1,11 @@
 <ion-list *ngIf="question && (question.text || question.text === '')">
     <!-- "Seen" hidden input -->
-    <input *ngIf="seenInput" type="hidden" [name]="seenInput.name" [value]="seenInput.value" >
+    <input *ngIf="seenInput" type="hidden" [name]="seenInput.name" [value]="seenInput.value">
 
     <ion-item class="ion-text-wrap">
         <ion-label>
-            <core-format-text [component]="component" [componentId]="componentId" [text]="question.text"
-                [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId">
+            <core-format-text [component]="component" [componentId]="componentId" [text]="question.text" [contextLevel]="contextLevel"
+                [contextInstanceId]="contextInstanceId" [courseId]="courseId">
             </core-format-text>
         </ion-label>
     </ion-item>
diff --git a/src/addons/qtype/essay/component/addon-qtype-essay.html b/src/addons/qtype/essay/component/addon-qtype-essay.html
index a70656f8a..dffb87858 100644
--- a/src/addons/qtype/essay/component/addon-qtype-essay.html
+++ b/src/addons/qtype/essay/component/addon-qtype-essay.html
@@ -2,8 +2,8 @@
     <!-- Question text. -->
     <ion-item class="ion-text-wrap">
         <ion-label>
-            <core-format-text [component]="component" [componentId]="componentId" [text]="essayQuestion.text"
-                [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId">
+            <core-format-text [component]="component" [componentId]="componentId" [text]="essayQuestion.text" [contextLevel]="contextLevel"
+                [contextInstanceId]="contextInstanceId" [courseId]="courseId">
             </core-format-text>
         </ion-label>
     </ion-item>
@@ -15,13 +15,12 @@
             <ion-label class="sr-only">{{ 'core.question.answer' | translate }}</ion-label>
             <!-- "Format" and draftid hidden inputs -->
             <input *ngIf="essayQuestion.formatInput" type="hidden" [name]="essayQuestion.formatInput.name"
-                [value]="essayQuestion.formatInput.value" >
+                [value]="essayQuestion.formatInput.value">
             <input *ngIf="essayQuestion.answerDraftIdInput" type="hidden" [name]="essayQuestion.answerDraftIdInput.name"
-                [value]="essayQuestion.answerDraftIdInput.value" >
+                [value]="essayQuestion.answerDraftIdInput.value">
             <!-- Plain text textarea. -->
             <ion-textarea *ngIf="essayQuestion.isPlainText" class="core-question-textarea"
-                [ngClass]='{"core-monospaced": essayQuestion.isMonospaced}'
-                placeholder="{{ 'core.question.answer' | translate }}"
+                [ngClass]='{"core-monospaced": essayQuestion.isMonospaced}' placeholder="{{ 'core.question.answer' | translate }}"
                 [attr.name]="essayQuestion.textarea.name" [ngModel]="essayQuestion.textarea.text">
             </ion-textarea>
             <!-- Rich text editor. -->
@@ -56,7 +55,7 @@
             </core-attachments>
 
             <input *ngIf="essayQuestion.attachmentsDraftIdInput" type="hidden" [name]="essayQuestion.attachmentsDraftIdInput.name"
-                [value]="essayQuestion.attachmentsDraftIdInput.value" >
+                [value]="essayQuestion.attachmentsDraftIdInput.value">
 
             <!-- Attachments not supported in this site. -->
             <ion-item *ngIf="!uploadFilesSupported" class="ion-text-wrap core-danger-item">
diff --git a/src/addons/qtype/gapselect/component/addon-qtype-gapselect.html b/src/addons/qtype/gapselect/component/addon-qtype-gapselect.html
index b6ebd47da..7bb2c46df 100644
--- a/src/addons/qtype/gapselect/component/addon-qtype-gapselect.html
+++ b/src/addons/qtype/gapselect/component/addon-qtype-gapselect.html
@@ -1,9 +1,8 @@
 <ion-list class="addon-qtype-gapselect-container" *ngIf="question && (question.text || question.text === '')">
     <ion-item class="ion-text-wrap">
         <ion-label>
-            <core-format-text [component]="component" [componentId]="componentId" [text]="question.text"
-                [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId"
-                (afterRender)="questionRendered()">
+            <core-format-text [component]="component" [componentId]="componentId" [text]="question.text" [contextLevel]="contextLevel"
+                [contextInstanceId]="contextInstanceId" [courseId]="courseId" (afterRender)="questionRendered()">
             </core-format-text>
         </ion-label>
     </ion-item>
diff --git a/src/addons/qtype/match/component/addon-qtype-match.html b/src/addons/qtype/match/component/addon-qtype-match.html
index 2c896e133..fc813738d 100644
--- a/src/addons/qtype/match/component/addon-qtype-match.html
+++ b/src/addons/qtype/match/component/addon-qtype-match.html
@@ -1,16 +1,15 @@
 <section class="addon-qtype-match-container" *ngIf="matchQuestion && matchQuestion.loaded">
     <ion-item class="ion-text-wrap">
         <ion-label>
-            <core-format-text [component]="component" [componentId]="componentId" [text]="matchQuestion.text"
-                [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId">
+            <core-format-text [component]="component" [componentId]="componentId" [text]="matchQuestion.text" [contextLevel]="contextLevel"
+                [contextInstanceId]="contextInstanceId" [courseId]="courseId">
             </core-format-text>
         </ion-label>
     </ion-item>
     <ion-item class="ion-text-wrap" *ngFor="let row of matchQuestion.rows">
         <ion-label>
-            <core-format-text id="addon-qtype-match-question-{{row.id}}" [component]="component"
-                [componentId]="componentId" [text]="row.text" [contextLevel]="contextLevel"
-                [contextInstanceId]="contextInstanceId" [courseId]="courseId">
+            <core-format-text id="addon-qtype-match-question-{{row.id}}" [component]="component" [componentId]="componentId"
+                [text]="row.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId">
             </core-format-text>
             <label class="accesshide" for="{{row.id}}" *ngIf="row.accessibilityLabel">
                 {{ row.accessibilityLabel }}
diff --git a/src/addons/qtype/multianswer/component/addon-qtype-multianswer.html b/src/addons/qtype/multianswer/component/addon-qtype-multianswer.html
index 2f64ecb03..db188b1f2 100644
--- a/src/addons/qtype/multianswer/component/addon-qtype-multianswer.html
+++ b/src/addons/qtype/multianswer/component/addon-qtype-multianswer.html
@@ -1,8 +1,7 @@
 <ion-list class="addon-qtype-multianswer-container" *ngIf="question && (question.text || question.text === '')">
     <div class="fake-ion-item ion-text-wrap">
-        <core-format-text [component]="component" [componentId]="componentId" [text]="question.text"
-            [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId"
-            (afterRender)="questionRendered()">
+        <core-format-text [component]="component" [componentId]="componentId" [text]="question.text" [contextLevel]="contextLevel"
+            [contextInstanceId]="contextInstanceId" [courseId]="courseId" (afterRender)="questionRendered()">
         </core-format-text>
     </div>
 </ion-list>
diff --git a/src/addons/qtype/multichoice/component/addon-qtype-multichoice.html b/src/addons/qtype/multichoice/component/addon-qtype-multichoice.html
index 65ea49dc7..b94cebadc 100644
--- a/src/addons/qtype/multichoice/component/addon-qtype-multichoice.html
+++ b/src/addons/qtype/multichoice/component/addon-qtype-multichoice.html
@@ -14,10 +14,9 @@
     <!-- Checkbox for multiple choice. -->
     <ng-container *ngIf="multiQuestion.multi">
         <ion-item class="ion-text-wrap answer" *ngFor="let option of multiQuestion.options">
-            <ion-label [color]='(option.isCorrect === 1 ? "success": "") + (option.isCorrect === 0 ? "danger": "")'
-                [class]="option.class">
-                <core-format-text [component]="component" [componentId]="componentId" [text]="option.text"
-                    [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId">
+            <ion-label [color]='(option.isCorrect === 1 ? "success": "") + (option.isCorrect === 0 ? "danger": "")' [class]="option.class">
+                <core-format-text [component]="component" [componentId]="componentId" [text]="option.text" [contextLevel]="contextLevel"
+                    [contextInstanceId]="contextInstanceId" [courseId]="courseId">
                 </core-format-text>
                 <div *ngIf="option.feedback" class="specificfeedback">
                     <core-format-text [component]="component" [componentId]="componentId" [text]="option.feedback"
@@ -41,12 +40,11 @@
     </ng-container>
 
     <!-- Radio buttons for single choice. -->
-    <ion-radio-group *ngIf="!multiQuestion.multi" [(ngModel)]="multiQuestion.singleChoiceModel"
-        [name]="multiQuestion.optionsName">
+    <ion-radio-group *ngIf="!multiQuestion.multi" [(ngModel)]="multiQuestion.singleChoiceModel" [name]="multiQuestion.optionsName">
         <ion-item class="ion-text-wrap answer" *ngFor="let option of multiQuestion.options">
             <ion-label [class]="option.class">
-                <core-format-text [component]="component" [componentId]="componentId" [text]="option.text"
-                    [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId">
+                <core-format-text [component]="component" [componentId]="componentId" [text]="option.text" [contextLevel]="contextLevel"
+                    [contextInstanceId]="contextInstanceId" [courseId]="courseId">
                 </core-format-text>
                 <div *ngIf="option.feedback" class="specificfeedback">
                     <core-format-text [component]="component" [componentId]="componentId" [text]="option.feedback"
diff --git a/src/addons/qtype/shortanswer/component/addon-qtype-shortanswer.html b/src/addons/qtype/shortanswer/component/addon-qtype-shortanswer.html
index d4c2b2a9f..3a12a4766 100644
--- a/src/addons/qtype/shortanswer/component/addon-qtype-shortanswer.html
+++ b/src/addons/qtype/shortanswer/component/addon-qtype-shortanswer.html
@@ -1,8 +1,8 @@
 <ion-list *ngIf="textQuestion && (textQuestion.text || textQuestion.text === '')">
     <ion-item class="ion-text-wrap addon-qtype-shortanswer-text">
         <ion-label>
-            <core-format-text [component]="component" [componentId]="componentId" [text]="textQuestion.text"
-                [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId">
+            <core-format-text [component]="component" [componentId]="componentId" [text]="textQuestion.text" [contextLevel]="contextLevel"
+                [contextInstanceId]="contextInstanceId" [courseId]="courseId">
             </core-format-text>
         </ion-label>
     </ion-item>
@@ -13,8 +13,8 @@
             [attr.name]="textQuestion.input.name" [value]="textQuestion.input.value" autocorrect="off"
             [disabled]="textQuestion.input.readOnly">
         </ion-input>
-        <ion-icon *ngIf="textQuestion.input.correctIcon" class="core-correct-icon" slot="end"
-            [name]="textQuestion.input.correctIcon" [color]="[textQuestion.input.correctIconColor]">
+        <ion-icon *ngIf="textQuestion.input.correctIcon" class="core-correct-icon" slot="end" [name]="textQuestion.input.correctIcon"
+            [color]="[textQuestion.input.correctIconColor]">
         </ion-icon>
     </ion-item>
 </ion-list>
diff --git a/src/addons/userprofilefield/datetime/component/addon-user-profile-field-datetime.html b/src/addons/userprofilefield/datetime/component/addon-user-profile-field-datetime.html
index aa541feba..98a7e153b 100644
--- a/src/addons/userprofilefield/datetime/component/addon-user-profile-field-datetime.html
+++ b/src/addons/userprofilefield/datetime/component/addon-user-profile-field-datetime.html
@@ -11,8 +11,8 @@
     <ion-label position="stacked">
         <span [core-mark-required]="required">{{ field.name }}</span>
     </ion-label>
-    <ion-datetime [formControlName]="modelName" [placeholder]="'core.choosedots' | translate" [displayFormat]="format"
-        [max]="max" [min]="min" [monthNames]="monthNames">
+    <ion-datetime [formControlName]="modelName" [placeholder]="'core.choosedots' | translate" [displayFormat]="format" [max]="max"
+        [min]="min" [monthNames]="monthNames">
     </ion-datetime>
     <core-input-errors [control]="form.controls[modelName]"></core-input-errors>
 </ion-item>
diff --git a/src/addons/userprofilefield/menu/component/addon-user-profile-field-menu.html b/src/addons/userprofilefield/menu/component/addon-user-profile-field-menu.html
index 8b5a78c24..b31734b71 100644
--- a/src/addons/userprofilefield/menu/component/addon-user-profile-field-menu.html
+++ b/src/addons/userprofilefield/menu/component/addon-user-profile-field-menu.html
@@ -2,9 +2,10 @@
 <ion-item *ngIf="!edit && field && field.name">
     <ion-label>
         <h2>{{ field.name }}</h2>
-        <p><core-format-text [text]="value" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"
-            [courseId]="courseId">
-        </core-format-text></p>
+        <p>
+            <core-format-text [text]="value" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId">
+            </core-format-text>
+        </p>
     </ion-label>
 </ion-item>
 
diff --git a/src/addons/userprofilefield/text/component/addon-user-profile-field-text.html b/src/addons/userprofilefield/text/component/addon-user-profile-field-text.html
index 618ad2253..4ee87abe6 100644
--- a/src/addons/userprofilefield/text/component/addon-user-profile-field-text.html
+++ b/src/addons/userprofilefield/text/component/addon-user-profile-field-text.html
@@ -2,9 +2,10 @@
 <ion-item *ngIf="!edit && field && field.name">
     <ion-label>
         <h2>{{ field.name }}</h2>
-        <p><core-format-text [text]="value" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"
-            [courseId]="courseId">
-        </core-format-text></p>
+        <p>
+            <core-format-text [text]="value" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId">
+            </core-format-text>
+        </p>
     </ion-label>
 </ion-item>
 
diff --git a/src/addons/userprofilefield/textarea/component/addon-user-profile-field-textarea.html b/src/addons/userprofilefield/textarea/component/addon-user-profile-field-textarea.html
index 5efeb1254..bd1a41891 100644
--- a/src/addons/userprofilefield/textarea/component/addon-user-profile-field-textarea.html
+++ b/src/addons/userprofilefield/textarea/component/addon-user-profile-field-textarea.html
@@ -2,9 +2,10 @@
 <ion-item *ngIf="!edit && field && field.name">
     <ion-label>
         <h2>{{ field.name }}</h2>
-        <p><core-format-text [text]="value" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"
-            [courseId]="courseId">
-        </core-format-text></p>
+        <p>
+            <core-format-text [text]="value" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId">
+            </core-format-text>
+        </p>
     </ion-label>
 </ion-item>
 
@@ -14,7 +15,7 @@
         <span [core-mark-required]="required">{{ field.name }}</span>
         <core-input-errors [control]="control"></core-input-errors>
     </ion-label>
-    <core-rich-text-editor [control]="control" [placeholder]="field.name" [autoSave]="true"
-        [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [elementId]="modelName">
+    <core-rich-text-editor [control]="control" [placeholder]="field.name" [autoSave]="true" [contextLevel]="contextLevel"
+        [contextInstanceId]="contextInstanceId" [elementId]="modelName">
     </core-rich-text-editor>
 </ion-item>
diff --git a/src/core/components/attachments/core-attachments.html b/src/core/components/attachments/core-attachments.html
index 612a5a3a6..46fbc7693 100644
--- a/src/core/components/attachments/core-attachments.html
+++ b/src/core/components/attachments/core-attachments.html
@@ -19,13 +19,12 @@
 </ion-item>
 <div *ngFor="let file of files; let index=index">
     <!-- Files already attached to the submission, either in online or in offline. -->
-    <core-file *ngIf="!file.name" [file]="file" [component]="component" [componentId]="componentId"
-        [canDelete]="true" (onDelete)="delete(index, true)" [canDownload]="!file.offline">
+    <core-file *ngIf="!file.name" [file]="file" [component]="component" [componentId]="componentId" [canDelete]="true"
+        (onDelete)="delete(index, true)" [canDownload]="!file.offline">
     </core-file>
 
     <!-- Files added to draft but not attached to submission yet. -->
-    <core-local-file *ngIf="file.name" [file]="file" [manage]="true" (onDelete)="delete(index, false)"
-        (onRename)="renamed(index, $event)">
+    <core-local-file *ngIf="file.name" [file]="file" [manage]="true" (onDelete)="delete(index, false)" (onRename)="renamed(index, $event)">
     </core-local-file>
 </div>
 
diff --git a/src/core/components/context-menu/core-context-menu-popover.html b/src/core/components/context-menu/core-context-menu-popover.html
index 36091feec..7e73792da 100644
--- a/src/core/components/context-menu/core-context-menu-popover.html
+++ b/src/core/components/context-menu/core-context-menu-popover.html
@@ -9,16 +9,17 @@
         <ion-icon *ngIf="item.iconDescription" [name]="item.iconDescription" aria-hidden="true" slot="start">
         </ion-icon>
         <ion-label>
-            <p class="item-heading"><core-format-text [clean]="true" [text]="item.content" [filter]="false"></core-format-text></p>
+            <p class="item-heading">
+                <core-format-text [clean]="true" [text]="item.content" [filter]="false"></core-format-text>
+            </p>
         </ion-label>
         <ng-container *ngIf="(item.href || item.action) && item.iconAction">
             <ion-icon *ngIf="item.iconAction != 'spinner' && item.iconAction != 'toggle'" [name]="item.iconAction"
                 [class.icon-slash]="item.iconSlash" slot="end" aria-hidden="true">
             </ion-icon>
-            <ion-spinner *ngIf="item.iconAction == 'spinner'" slot="end"
-                [attr.aria-label]="'core.loading' | translate">
+            <ion-spinner *ngIf="item.iconAction == 'spinner'" slot="end" [attr.aria-label]="'core.loading' | translate">
             </ion-spinner>
-            <ion-toggle  *ngIf="item.iconAction == 'toggle'" [(ngModel)]="item.toggle" (ionChange)="item.toggleChanged($event)" slot="end">
+            <ion-toggle *ngIf="item.iconAction == 'toggle'" [(ngModel)]="item.toggle" (ionChange)="item.toggleChanged($event)" slot="end">
             </ion-toggle>
         </ng-container>
         <ion-badge class="{{item.badgeClass}}" slot="end" *ngIf="item.badge">
diff --git a/src/core/components/file/core-file.html b/src/core/components/file/core-file.html
index 7081fa1e1..a5e2fbc7c 100644
--- a/src/core/components/file/core-file.html
+++ b/src/core/components/file/core-file.html
@@ -8,8 +8,8 @@
         <p *ngIf="showTime">{{ timemodified * 1000 | coreFormatDate }}</p>
     </ion-label>
     <div slot="end" class="flex-row">
-        <core-download-refresh [status]="state" [enabled]="canDownload" [loading]="isDownloading"
-            [canTrustDownload]="!alwaysDownload" (action)="download()" size="small">
+        <core-download-refresh [status]="state" [enabled]="canDownload" [loading]="isDownloading" [canTrustDownload]="!alwaysDownload"
+            (action)="download()" size="small">
         </core-download-refresh>
 
         <ion-button fill="clear" *ngIf="isDownloaded && isIOS" (click)="openFile($event, true)" color="dark"
@@ -17,8 +17,8 @@
             <ion-icon slot="icon-only" [name]="openButtonIcon" aria-hidden="true"></ion-icon>
         </ion-button>
 
-        <ion-button fill="clear" *ngIf="!isDownloading && canDelete" (click)="delete($event)"
-            [attr.aria-label]="'core.delete' | translate" color="danger" size="small">
+        <ion-button fill="clear" *ngIf="!isDownloading && canDelete" (click)="delete($event)" [attr.aria-label]="'core.delete' | translate"
+            color="danger" size="small">
             <ion-icon slot="icon-only" name="fas-trash" aria-hidden="true"></ion-icon>
         </ion-button>
     </div>
diff --git a/src/core/components/iframe/core-iframe.html b/src/core/components/iframe/core-iframe.html
index a3dbdfae0..776cfbbee 100644
--- a/src/core/components/iframe/core-iframe.html
+++ b/src/core/components/iframe/core-iframe.html
@@ -2,25 +2,19 @@
 
     <core-navbar-buttons slot="end" append *ngIf="initialized && showFullscreenOnToolbar">
         <ion-button fill="clear" (click)="toggleFullscreen()"
-            [attr.aria-label]="(fullscreen ? 'core.disablefullscreen' : 'core.fullscreen') | translate" >
+            [attr.aria-label]="(fullscreen ? 'core.disablefullscreen' : 'core.fullscreen') | translate">
             <ion-icon *ngIf="!fullscreen" name="fas-expand" slot="icon-only" aria-hidden="true"></ion-icon>
             <ion-icon *ngIf="fullscreen" name="fas-compress" slot="icon-only" aria-hidden="true"></ion-icon>
         </ion-button>
     </core-navbar-buttons>
-    
+
     <!-- Don't add the iframe until safeUrl is set, adding an iframe with null as src causes the iframe to load the whole app. -->
-    <iframe #iframe *ngIf="safeUrl" [hidden]="loading" class="core-iframe"
-        [ngStyle]="{'width': iframeWidth, 'height': iframeHeight}" [src]="safeUrl"
-        [attr.allowfullscreen]="allowFullscreen ? 'allowfullscreen' : null">
+    <iframe #iframe *ngIf="safeUrl" [hidden]="loading" class="core-iframe" [ngStyle]="{'width': iframeWidth, 'height': iframeHeight}"
+        [src]="safeUrl" [attr.allowfullscreen]="allowFullscreen ? 'allowfullscreen' : null">
     </iframe>
 
-    <ion-button
-        *ngIf="!loading && displayHelp"
-        color="dark" expand="block" fill="clear"
-        (click)="openIframeHelpModal()"
-        aria-haspopup="dialog"
-        class="core-button-as-link core-iframe-help"
-    >
+    <ion-button *ngIf="!loading && displayHelp" color="dark" expand="block" fill="clear" (click)="openIframeHelpModal()"
+        aria-haspopup="dialog" class="core-button-as-link core-iframe-help">
         {{ 'core.iframehelp' | translate }}
     </ion-button>
 
diff --git a/src/core/components/local-file/core-local-file.html b/src/core/components/local-file/core-local-file.html
index c558c7f7f..52a52eb4e 100644
--- a/src/core/components/local-file/core-local-file.html
+++ b/src/core/components/local-file/core-local-file.html
@@ -18,8 +18,7 @@
         </ion-input>
 
         <div class="buttons" slot="end">
-            <ion-button fill="clear" *ngIf="isIOS" (click)="openFile($event, true)"
-                [attr.aria-label]="openButtonLabel | translate">
+            <ion-button fill="clear" *ngIf="isIOS" (click)="openFile($event, true)" [attr.aria-label]="openButtonLabel | translate">
                 <ion-icon slot="icon-only" [name]="openButtonIcon" aria-hidden="true"></ion-icon>
             </ion-button>
 
diff --git a/src/core/components/mod-icon/mod-icon.html b/src/core/components/mod-icon/mod-icon.html
index 4ce9eef5c..58842cb13 100644
--- a/src/core/components/mod-icon/mod-icon.html
+++ b/src/core/components/mod-icon/mod-icon.html
@@ -1,19 +1,5 @@
-<img
-    *ngIf="!isLocalUrl"
-    [src]="icon"
-    [alt]="showAlt ? modNameTranslated : ''"
-    [attr.role]="!showAlt ? 'presentation' : null" 
-    class="core-module-icon"
-    core-external-content
-    [component]="linkIconWithComponent ? modname : null"
-    [componentId]="linkIconWithComponent ? componentId : null"
-    (error)="loadFallbackIcon()"
->
-<img
-    *ngIf="isLocalUrl"
-    [src]="icon"
-    [alt]="showAlt ? modNameTranslated : ''"
-    [attr.role]="!showAlt ? 'presentation' : null" 
-    class="core-module-icon"
-    (error)="loadFallbackIcon()"
->
\ No newline at end of file
+<img *ngIf="!isLocalUrl" [src]="icon" [alt]="showAlt ? modNameTranslated : ''" [attr.role]="!showAlt ? 'presentation' : null"
+    class="core-module-icon" core-external-content [component]="linkIconWithComponent ? modname : null"
+    [componentId]="linkIconWithComponent ? componentId : null" (error)="loadFallbackIcon()">
+<img *ngIf="isLocalUrl" [src]="icon" [alt]="showAlt ? modNameTranslated : ''" [attr.role]="!showAlt ? 'presentation' : null"
+    class="core-module-icon" (error)="loadFallbackIcon()">
diff --git a/src/core/components/progress-bar/core-progress-bar.html b/src/core/components/progress-bar/core-progress-bar.html
index 90f75d9df..6d62b02e0 100644
--- a/src/core/components/progress-bar/core-progress-bar.html
+++ b/src/core/components/progress-bar/core-progress-bar.html
@@ -1,6 +1,6 @@
 <ng-container *ngIf="progress >= 0">
-    <progress max="100" [value]="progress" role="progressbar" [attr.aria-valuenow]="progress"
-        [attr.aria-valuetext]="progressBarValueText" [attr.aria-describedby]="ariaDescribedBy">
+    <progress max="100" [value]="progress" role="progressbar" [attr.aria-valuenow]="progress" [attr.aria-valuetext]="progressBarValueText"
+        [attr.aria-describedby]="ariaDescribedBy">
     </progress>
     <div class="core-progress-text">
         <span class="sr-only" *ngIf="a11yText">{{ a11yText | translate }}</span>
diff --git a/src/core/components/send-message-form/core-send-message-form.html b/src/core/components/send-message-form/core-send-message-form.html
index 9d1efea42..44691f99e 100644
--- a/src/core/components/send-message-form/core-send-message-form.html
+++ b/src/core/components/send-message-form/core-send-message-form.html
@@ -1,24 +1,12 @@
 <form #messageForm>
-    <textarea
-        class="core-send-message-input"
-        [attr.aria-label]="placeholder"
-        [core-auto-focus]="showKeyboard"
-        [placeholder]="placeholder"
-        rows="1"
-        [core-auto-rows]="message"
-        [(ngModel)]="message"
-        name="message"
-        (onResize)="textareaResized()"
-        (keyup.enter)="enterKeyUp($event)"
-        (keyup.control.enter)="enterKeyUp($event, 'control')"
-        (keyup.meta.enter)="enterKeyUp($event, 'meta')"
-        (keydown.enter)="enterKeyDown($event)"
-        (keydown.control.enter)="enterKeyDown($event, 'control')"
-        (keydown.meta.enter)="enterKeyDown($event, 'meta')"
-    >
+    <textarea class="core-send-message-input" [attr.aria-label]="placeholder" [core-auto-focus]="showKeyboard" [placeholder]="placeholder"
+        rows="1" [core-auto-rows]="message" [(ngModel)]="message" name="message" (onResize)="textareaResized()"
+        (keyup.enter)="enterKeyUp($event)" (keyup.control.enter)="enterKeyUp($event, 'control')"
+        (keyup.meta.enter)="enterKeyUp($event, 'meta')" (keydown.enter)="enterKeyDown($event)"
+        (keydown.control.enter)="enterKeyDown($event, 'control')" (keydown.meta.enter)="enterKeyDown($event, 'meta')">
     </textarea>
-    <ion-button fill="clear" size="large" type="submit" [disabled]="!message || sendDisabled"
-        [attr.aria-label]="'core.send' | translate" [core-suppress-events] (onClick)="submitForm($event)">
+    <ion-button fill="clear" size="large" type="submit" [disabled]="!message || sendDisabled" [attr.aria-label]="'core.send' | translate"
+        [core-suppress-events] (onClick)="submitForm($event)">
         <ion-icon name="send" color="dark" slot="icon-only" aria-hidden="true" flip-rtl></ion-icon>
     </ion-button>
 </form>
diff --git a/src/core/components/split-view/split-view.html b/src/core/components/split-view/split-view.html
index 569af4224..392589cd9 100644
--- a/src/core/components/split-view/split-view.html
+++ b/src/core/components/split-view/split-view.html
@@ -2,6 +2,5 @@
     <ng-content></ng-content>
 </ion-content>
 <ion-router-outlet class="content-outlet"></ion-router-outlet>
-<core-empty-box class="content-placeholder" icon="fas-arrow-circle-left" [message]="placeholderText | translate"
-    [flipIconRtl]="true">
+<core-empty-box class="content-placeholder" icon="fas-arrow-circle-left" [message]="placeholderText | translate" [flipIconRtl]="true">
 </core-empty-box>
diff --git a/src/core/components/tabs-outlet/core-tabs-outlet.html b/src/core/components/tabs-outlet/core-tabs-outlet.html
index 750bdbc8d..7ef200d94 100644
--- a/src/core/components/tabs-outlet/core-tabs-outlet.html
+++ b/src/core/components/tabs-outlet/core-tabs-outlet.html
@@ -9,24 +9,12 @@
                 <ion-slides (ionSlideDidChange)="slideChanged()" [options]="slidesOpts" [dir]="direction" role="tablist"
                     [attr.aria-label]="description">
                     <ng-container *ngFor="let tab of tabs">
-                        <ion-slide
-                            role="presentation"
-                            [id]="tab.id! + '-tab'"
-                            class="tab-slide"
-                            tabindex="-1"
+                        <ion-slide role="presentation" [id]="tab.id! + '-tab'" class="tab-slide" tabindex="-1"
                             [class.selected]="selected == tab.id">
-                            <ion-tab-button
-                                (ionTabButtonClick)="selectTab(tab.id, $event)"
-                                (keydown)="tabAction.keyDown($event)"
-                                (keyup)="tabAction.keyUp(tab.id, $event)"
-                                [tab]="tab.page"
-                                [layout]="layout"
-                                class="{{tab.class}}"
-                                role="tab"
-                                [attr.aria-controls]="tab.id"
-                                [attr.aria-selected]="selected == tab.id"
-                                [tabindex]="selected == tab.id ? 0 : -1"
-                            >
+                            <ion-tab-button (ionTabButtonClick)="selectTab(tab.id, $event)" (keydown)="tabAction.keyDown($event)"
+                                (keyup)="tabAction.keyUp(tab.id, $event)" [tab]="tab.page" [layout]="layout" class="{{tab.class}}"
+                                role="tab" [attr.aria-controls]="tab.id" [attr.aria-selected]="selected == tab.id"
+                                [tabindex]="selected == tab.id ? 0 : -1">
                                 <ion-icon *ngIf="tab.icon" [name]="tab.icon" aria-hidden="true"></ion-icon>
                                 <ion-label>
                                     {{ tab.title | translate}}
diff --git a/src/core/components/tabs/core-tabs.html b/src/core/components/tabs/core-tabs.html
index e43ca49c3..8e2ea5ee7 100644
--- a/src/core/components/tabs/core-tabs.html
+++ b/src/core/components/tabs/core-tabs.html
@@ -8,24 +8,12 @@
             <ion-slides (ionSlideDidChange)="slideChanged()" [options]="slidesOpts" [dir]="direction" role="tablist"
                 [attr.aria-label]="description">
                 <ng-container *ngFor="let tab of tabs">
-                    <ion-slide
-                        *ngIf="tab.enabled"
-                        role="presentation"
-                        [hidden]="!hideUntil"
-                        class="tab-slide"
-                        [id]="tab.id! + '-tab'"
+                    <ion-slide *ngIf="tab.enabled" role="presentation" [hidden]="!hideUntil" class="tab-slide" [id]="tab.id! + '-tab'"
                         [class.selected]="selected == tab.id">
-                        <ion-tab-button
-                            (click)="selectTab(tab.id, $event)"
-                            (keydown)="tabAction.keyDown($event)"
-                            (keyup)="tabAction.keyUp(tab.id, $event)"
-                            class="{{tab.class}}"
-                            [layout]="layout"
-                            role="tab"
-                            [attr.aria-controls]="tab.id"
-                            [attr.aria-selected]="selected == tab.id"
-                            [tabindex]="selected == tab.id ? 0 : -1"
-                        >
+                        <ion-tab-button (click)="selectTab(tab.id, $event)" (keydown)="tabAction.keyDown($event)"
+                            (keyup)="tabAction.keyUp(tab.id, $event)" class="{{tab.class}}" [layout]="layout" role="tab"
+                            [attr.aria-controls]="tab.id" [attr.aria-selected]="selected == tab.id"
+                            [tabindex]="selected == tab.id ? 0 : -1">
                             <ion-icon *ngIf="tab.icon" [name]="tab.icon" aria-hidden="true"></ion-icon>
                             <ion-label>
                                 {{ tab.title | translate}}
diff --git a/src/core/components/timer/core-timer.html b/src/core/components/timer/core-timer.html
index 98212c438..27ecb46df 100644
--- a/src/core/components/timer/core-timer.html
+++ b/src/core/components/timer/core-timer.html
@@ -1,5 +1,4 @@
-<ion-item lines="none" class="core-timer" role="timer"
-    [ngClass]="{'ion-text-center': align == 'center', 'ion-text-end': align == 'right'}">
+<ion-item lines="none" class="core-timer" role="timer" [ngClass]="{'ion-text-center': align == 'center', 'ion-text-end': align == 'right'}">
     <ion-icon name="fas-clock" slot="start" aria-hidden="true"></ion-icon>
     <ion-label>
         <span *ngIf="timeLeft && timeLeft > 0 && timerText" class="core-timer-text">{{ timerText }}</span>
diff --git a/src/core/components/user-avatar/core-user-avatar.html b/src/core/components/user-avatar/core-user-avatar.html
index 474334be0..9007a6d40 100644
--- a/src/core/components/user-avatar/core-user-avatar.html
+++ b/src/core/components/user-avatar/core-user-avatar.html
@@ -1,15 +1,6 @@
-<img
-    *ngIf="avatarUrl"
-    [src]="avatarUrl"
-    [alt]="'core.pictureof' | translate:{$a: fullname}"
-    core-external-content
-    onError="this.src='assets/img/user-avatar.png'"
-    (ariaButtonClick)="gotoProfile($event)"
-    [attr.aria-hidden]="!linkProfile"
-    [attr.role]="linkProfile ? 'button' : null"
-    [attr.tabindex]="linkProfile ? 0 : null"
-    [class.clickable]="linkProfile"
->
+<img *ngIf="avatarUrl" [src]="avatarUrl" [alt]="'core.pictureof' | translate:{$a: fullname}" core-external-content
+    onError="this.src='assets/img/user-avatar.png'" (ariaButtonClick)="gotoProfile($event)" [attr.aria-hidden]="!linkProfile"
+    [attr.role]="linkProfile ? 'button' : null" [attr.tabindex]="linkProfile ? 0 : null" [class.clickable]="linkProfile">
 
 <img *ngIf="!avatarUrl" src="assets/img/user-avatar.png" [alt]="'core.pictureof' | translate:{$a: fullname}"
     (ariaButtonClick)="gotoProfile($event)" [attr.aria-hidden]="!linkProfile" [attr.role]="linkProfile ? 'button' : null"
diff --git a/src/core/features/block/components/only-title-block/core-block-only-title.html b/src/core/features/block/components/only-title-block/core-block-only-title.html
index cfdeb1a04..d3e85a924 100644
--- a/src/core/features/block/components/only-title-block/core-block-only-title.html
+++ b/src/core/features/block/components/only-title-block/core-block-only-title.html
@@ -1,3 +1,5 @@
 <ion-item button class="ion-text-wrap divider" (click)="gotoBlock()" detail="true">
-    <ion-label><h2>{{ title | translate }}</h2></ion-label>
+    <ion-label>
+        <h2>{{ title | translate }}</h2>
+    </ion-label>
 </ion-item>
diff --git a/src/core/features/block/components/pre-rendered-block/core-block-pre-rendered.html b/src/core/features/block/components/pre-rendered-block/core-block-pre-rendered.html
index 46b579a07..c109a16d1 100644
--- a/src/core/features/block/components/pre-rendered-block/core-block-pre-rendered.html
+++ b/src/core/features/block/components/pre-rendered-block/core-block-pre-rendered.html
@@ -1,8 +1,7 @@
 <ion-item-divider class="ion-text-wrap" *ngIf="title" sticky="true">
     <ion-label>
         <h2>
-            <core-format-text [text]="title | translate" contextLevel="block" [contextInstanceId]="block.instanceid"
-            [courseId]="courseId">
+            <core-format-text [text]="title | translate" contextLevel="block" [contextInstanceId]="block.instanceid" [courseId]="courseId">
             </core-format-text>
         </h2>
     </ion-label>
@@ -11,14 +10,14 @@
     <ion-item *ngIf="block.contents?.content" class="ion-text-wrap core-block-content">
         <ion-label>
             <core-format-text [text]="block.contents?.content" contextLevel="block" [contextInstanceId]="block.instanceid"
-            [courseId]="courseId">
+                [courseId]="courseId">
             </core-format-text>
         </ion-label>
     </ion-item>
     <ion-item *ngIf="block.contents?.footer" class="ion-text-wrap core-block-footer">
         <ion-label>
             <core-format-text [text]="block.contents?.footer" contextLevel="block" [contextInstanceId]="block.instanceid"
-            [courseId]="courseId">
+                [courseId]="courseId">
             </core-format-text>
         </ion-label>
     </ion-item>
diff --git a/src/core/features/comments/components/comments/core-comments.html b/src/core/features/comments/components/comments/core-comments.html
index 12e8d444b..0eb566d94 100644
--- a/src/core/features/comments/components/comments/core-comments.html
+++ b/src/core/features/comments/components/comments/core-comments.html
@@ -7,21 +7,16 @@
             {{ 'core.comments.commentsnotworking' | translate }}
         </div>
     </core-loading>
-    <ion-item
-        *ngIf="showItem"
-        button
-        [detail]="!countError && commentsLoaded"
-        (click)="openComments($event)"
-        [disabled]="countError">
-            <ion-label>
-                <core-loading [hideUntil]="commentsLoaded" [fullscreen]="false">
-                    <p *ngIf="!countError" class="item-heading">
-                        {{ 'core.comments.commentscount' | translate : {'$a': commentsCount} }}
-                    </p>
-                    <p *ngIf="countError">
-                        {{ 'core.comments.commentsnotworking' | translate }}
-                    </p>
-                </core-loading>
-            </ion-label>
+    <ion-item *ngIf="showItem" button [detail]="!countError && commentsLoaded" (click)="openComments($event)" [disabled]="countError">
+        <ion-label>
+            <core-loading [hideUntil]="commentsLoaded" [fullscreen]="false">
+                <p *ngIf="!countError" class="item-heading">
+                    {{ 'core.comments.commentscount' | translate : {'$a': commentsCount} }}
+                </p>
+                <p *ngIf="countError">
+                    {{ 'core.comments.commentsnotworking' | translate }}
+                </p>
+            </core-loading>
+        </ion-label>
     </ion-item>
 </ng-container>
diff --git a/src/core/features/course/components/module-completion/core-course-module-completion.html b/src/core/features/course/components/module-completion/core-course-module-completion.html
index ffce38a8b..a42b2b831 100644
--- a/src/core/features/course/components/module-completion/core-course-module-completion.html
+++ b/src/core/features/course/components/module-completion/core-course-module-completion.html
@@ -3,18 +3,15 @@
 
     <ng-container *ngIf="completion.istrackeduser">
         <ng-container *ngFor="let rule of details">
-            <ion-badge *ngIf="rule.statuscomplete" color="success" role="listitem"
-                [attr.aria-label]="rule.accessibleDescription">
+            <ion-badge *ngIf="rule.statuscomplete" color="success" role="listitem" [attr.aria-label]="rule.accessibleDescription">
                 <strong>{{ 'core.course.completion_automatic:done' | translate }}</strong> {{ rule.rulevalue.description }}
             </ion-badge>
 
-            <ion-badge *ngIf="rule.statuscompletefail" color="danger" role="listitem"
-                [attr.aria-label]="rule.accessibleDescription">
+            <ion-badge *ngIf="rule.statuscompletefail" color="danger" role="listitem" [attr.aria-label]="rule.accessibleDescription">
                 <strong>{{ 'core.course.completion_automatic:failed' | translate }}</strong> {{ rule.rulevalue.description }}
             </ion-badge>
 
-            <ion-badge *ngIf="rule.statusincomplete" color="medium" role="listitem"
-                [attr.aria-label]="rule.accessibleDescription">
+            <ion-badge *ngIf="rule.statusincomplete" color="medium" role="listitem" [attr.aria-label]="rule.accessibleDescription">
                 <strong>{{ 'core.course.completion_automatic:todo' | translate }}</strong> {{ rule.rulevalue.description }}
             </ion-badge>
         </ng-container>
diff --git a/src/core/features/course/components/module-manual-completion/core-course-module-manual-completion.html b/src/core/features/course/components/module-manual-completion/core-course-module-manual-completion.html
index 0f0ce4be8..ab4055ff0 100644
--- a/src/core/features/course/components/module-manual-completion/core-course-module-manual-completion.html
+++ b/src/core/features/course/components/module-manual-completion/core-course-module-manual-completion.html
@@ -2,8 +2,7 @@
 
     <ng-container *ngIf="completion.istrackeduser">
         <ng-container *ngIf="completion.state">
-            <ion-button color="success" fill="outline" [attr.aria-label]="accessibleDescription"
-                (click)="completionClicked($event)">
+            <ion-button color="success" fill="outline" [attr.aria-label]="accessibleDescription" (click)="completionClicked($event)">
                 <ion-icon name="fas-check" slot="start" aria-hidden="true"></ion-icon>
                 {{ 'core.course.completion_manual:done' | translate }}
             </ion-button>
diff --git a/src/core/features/course/components/tag-area/core-course-tag-area.html b/src/core/features/course/components/tag-area/core-course-tag-area.html
index adfc48551..aa0f0df2b 100644
--- a/src/core/features/course/components/tag-area/core-course-tag-area.html
+++ b/src/core/features/course/components/tag-area/core-course-tag-area.html
@@ -1,5 +1,5 @@
-<ion-item class="ion-text-wrap" *ngFor="let item of items" (click)="openCourse(item.courseId)" [attr.aria-label]="item.courseName"
-    button detail="true">
+<ion-item class="ion-text-wrap" *ngFor="let item of items" (click)="openCourse(item.courseId)" [attr.aria-label]="item.courseName" button
+    detail="true">
     <ion-icon name="fas-graduation-cap" slot="start" aria-hidden="true"></ion-icon>
     <ion-label>
         <p class="item-heading">{{ item.courseName }}</p>
diff --git a/src/core/features/course/pages/contents/contents.html b/src/core/features/course/pages/contents/contents.html
index 1e2ab177a..9c1633cad 100644
--- a/src/core/features/course/pages/contents/contents.html
+++ b/src/core/features/course/pages/contents/contents.html
@@ -4,8 +4,8 @@
             [content]="'core.settings.showdownloadoptions' | translate" (action)="toggleDownload()">
         </core-context-menu-item>
         <core-context-menu-item [hidden]="!downloadCourseEnabled" [priority]="1900"
-            [content]="prefetchCourseData.statusTranslatable | translate" (action)="prefetchCourse()"
-            [iconAction]="prefetchCourseData.icon" [closeOnClick]="false">
+            [content]="prefetchCourseData.statusTranslatable | translate" (action)="prefetchCourse()" [iconAction]="prefetchCourseData.icon"
+            [closeOnClick]="false">
         </core-context-menu-item>
         <core-context-menu-item [priority]="1800" [content]="'core.course.coursesummary' | translate" (action)="openCourseSummary()"
             iconAction="fas-graduation-cap">
@@ -21,9 +21,9 @@
     </ion-refresher>
 
     <core-loading [hideUntil]="dataLoaded">
-        <core-course-format [course]="course" [sections]="sections" [initialSectionId]="sectionId"
-            [initialSectionNumber]="sectionNumber" [downloadEnabled]="downloadEnabled" [moduleId]="moduleId"
-            (completionChanged)="onCompletionChange($event)" class="core-course-format-{{course.format}}">
+        <core-course-format [course]="course" [sections]="sections" [initialSectionId]="sectionId" [initialSectionNumber]="sectionNumber"
+            [downloadEnabled]="downloadEnabled" [moduleId]="moduleId" (completionChanged)="onCompletionChange($event)"
+            class="core-course-format-{{course.format}}">
         </core-course-format>
     </core-loading>
 </ion-content>
diff --git a/src/core/features/courses/components/course-options-menu/core-courses-course-options-menu.html b/src/core/features/courses/components/course-options-menu/core-courses-course-options-menu.html
index 4a038c90d..59db9a4dc 100644
--- a/src/core/features/courses/components/course-options-menu/core-courses-course-options-menu.html
+++ b/src/core/features/courses/components/course-options-menu/core-courses-course-options-menu.html
@@ -1,26 +1,38 @@
 <ion-item button class="ion-text-wrap" (click)="action('download')" *ngIf="downloadCourseEnabled" detail="false">
     <ion-icon *ngIf="!prefetch.loading" [name]="prefetch.icon" slot="start" aria-hidden="true"></ion-icon>
     <ion-spinner *ngIf="prefetch.loading" slot="start" [attr.aria-label]="'core.loading' | translate"></ion-spinner>
-    <ion-label><h2>{{ prefetch.statusTranslatable | translate }}</h2></ion-label>
+    <ion-label>
+        <h2>{{ prefetch.statusTranslatable | translate }}</h2>
+    </ion-label>
 </ion-item>
 <ion-item button class="ion-text-wrap" (click)="action('delete')" detail="false"
     *ngIf="prefetch.status == 'downloaded' || prefetch.status == 'outdated'">
     <ion-icon name="fas-trash" slot="start" aria-hidden="true"></ion-icon>
-    <ion-label><h2>{{ 'addon.storagemanager.deletecourse' | translate }}</h2></ion-label>
+    <ion-label>
+        <h2>{{ 'addon.storagemanager.deletecourse' | translate }}</h2>
+    </ion-label>
 </ion-item>
 <ion-item button class="ion-text-wrap" (click)="action('hide')" *ngIf="!course.hidden" detail="false">
     <ion-icon name="fas-eye" slot="start" aria-hidden="true"></ion-icon>
-    <ion-label><h2>{{ 'core.courses.hidecourse' | translate }}</h2></ion-label>
+    <ion-label>
+        <h2>{{ 'core.courses.hidecourse' | translate }}</h2>
+    </ion-label>
 </ion-item>
 <ion-item button class="ion-text-wrap" (click)="action('show')" *ngIf="course.hidden" detail="false">
     <ion-icon name="fas-eye-slash" slot="start" aria-hidden="true"></ion-icon>
-    <ion-label><h2>{{ 'core.courses.show' | translate }}</h2></ion-label>
+    <ion-label>
+        <h2>{{ 'core.courses.show' | translate }}</h2>
+    </ion-label>
 </ion-item>
 <ion-item button class="ion-text-wrap" (click)="action('favourite')" *ngIf="!course.isfavourite" detail="false">
     <ion-icon name="fas-star" slot="start" aria-hidden="true"></ion-icon>
-    <ion-label><h2>{{ 'core.courses.addtofavourites' | translate }}</h2></ion-label>
+    <ion-label>
+        <h2>{{ 'core.courses.addtofavourites' | translate }}</h2>
+    </ion-label>
 </ion-item>
 <ion-item button class="ion-text-wrap" (click)="action('unfavourite')" *ngIf="course.isfavourite" detail="false">
     <ion-icon name="far-star" slot="start" aria-hidden="true"></ion-icon>
-    <ion-label><h2>{{ 'core.courses.removefromfavourites' | translate }}</h2></ion-label>
+    <ion-label>
+        <h2>{{ 'core.courses.removefromfavourites' | translate }}</h2>
+    </ion-label>
 </ion-item>
diff --git a/src/core/features/editor/components/rich-text-editor/core-editor-rich-text-editor.html b/src/core/features/editor/components/rich-text-editor/core-editor-rich-text-editor.html
index 61bc945d4..94c9dc386 100644
--- a/src/core/features/editor/components/rich-text-editor/core-editor-rich-text-editor.html
+++ b/src/core/features/editor/components/rich-text-editor/core-editor-rich-text-editor.html
@@ -1,29 +1,11 @@
 <div class="core-rte-editor-container" (click)="focusRTE()" [class.toolbar-hidden]="toolbarHidden">
-    <div
-        [hidden]="!rteEnabled"
-        #editor
-        class="core-rte-editor"
-        role="textbox"
-        contenteditable="true"
-        [attr.aria-labelledby]="ariaLabelledBy"
-        [attr.data-placeholder-text]="placeholder"
-        (focus)="showToolbar($event)"
-        (blur)="hideToolbar($event)"
-    >
+    <div [hidden]="!rteEnabled" #editor class="core-rte-editor" role="textbox" contenteditable="true"
+        [attr.aria-labelledby]="ariaLabelledBy" [attr.data-placeholder-text]="placeholder" (focus)="showToolbar($event)"
+        (blur)="hideToolbar($event)">
     </div>
 
-    <ion-textarea
-        [hidden]="rteEnabled"
-        #textarea
-        class="core-textarea"
-        role="textbox"
-        [attr.name]="name"
-        ngControl="control"
-        [placeholder]="placeholder"
-        (ionChange)="onChange()"
-        (ionFocus)="showToolbar($event)"
-        (ionBlur)="hideToolbar($event)"
-    >
+    <ion-textarea [hidden]="rteEnabled" #textarea class="core-textarea" role="textbox" [attr.name]="name" ngControl="control"
+        [placeholder]="placeholder" (ionChange)="onChange()" (ionFocus)="showToolbar($event)" (ionBlur)="hideToolbar($event)">
     </ion-textarea>
 
     <div class="core-rte-info-message" *ngIf="infoMessage">
@@ -33,9 +15,8 @@
 </div>
 
 <div #toolbar class="core-rte-toolbar" [class.toolbar-hidden]="toolbarHidden">
-    <button *ngIf="toolbarArrows" class="toolbar-arrow" [class.toolbar-arrow-hidden]="toolbarPrevHidden"
-        (click)="toolbarPrev($event)" (keyup)="toolbarPrev($event)"
-        (mousedown)="downAction($event)" (keydown)="downAction($event)"
+    <button *ngIf="toolbarArrows" class="toolbar-arrow" [class.toolbar-arrow-hidden]="toolbarPrevHidden" (click)="toolbarPrev($event)"
+        (keyup)="toolbarPrev($event)" (mousedown)="downAction($event)" (keydown)="downAction($event)"
         [attr.aria-label]="'core.previous' | translate">
         <ion-icon name="fas-chevron-left" aria-hidden="true"></ion-icon>
     </button>
@@ -58,8 +39,7 @@
         <ion-slide>
             <button [disabled]="!rteEnabled" [attr.aria-pressed]="toolbarStyles.u" [title]="'core.editor.underline' | translate"
                 (click)="buttonAction($event, 'underline', 'u')" (keyup)="buttonAction($event, 'underline', 'u')"
-                (mousedown)="downAction($event)" (keydown)="downAction($event)"
-                >
+                (mousedown)="downAction($event)" (keydown)="downAction($event)">
                 <ion-icon name="fas-underline" aria-hidden="true"></ion-icon>
             </button>
         </ion-slide>
@@ -72,35 +52,34 @@
         </ion-slide>
         <ion-slide>
             <button [disabled]="!rteEnabled" [attr.aria-pressed]="toolbarStyles.p" [title]="'core.editor.p' | translate"
-                (click)="buttonAction($event, 'p', 'block')" (keyup)="buttonAction($event, 'p', 'block')"
-                (mousedown)="downAction($event)" (keydown)="downAction($event)">
+                (click)="buttonAction($event, 'p', 'block')" (keyup)="buttonAction($event, 'p', 'block')" (mousedown)="downAction($event)"
+                (keydown)="downAction($event)">
                 <ion-icon name="fas-paragraph" aria-hidden="true"></ion-icon>
             </button>
         </ion-slide>
         <ion-slide>
             <button [disabled]="!rteEnabled" [attr.aria-pressed]="toolbarStyles.h3" [title]="'core.editor.h3' | translate"
-                (click)="buttonAction($event, 'h3', 'block')" (keyup)="buttonAction($event, 'h3', 'block')"
-                (mousedown)="downAction($event)" (keydown)="downAction($event)" >
+                (click)="buttonAction($event, 'h3', 'block')" (keyup)="buttonAction($event, 'h3', 'block')" (mousedown)="downAction($event)"
+                (keydown)="downAction($event)">
                 <ion-icon name="fas-heading" aria-hidden="true"></ion-icon><span aria-hidden="true">3</span>
             </button>
         </ion-slide>
         <ion-slide>
             <button [disabled]="!rteEnabled" [attr.aria-pressed]="toolbarStyles.h4" [title]="'core.editor.h4' | translate"
-                (click)="buttonAction($event, 'h4', 'block')" (keyup)="buttonAction($event, 'h4', 'block')"
-                (mousedown)="downAction($event)" (keydown)="downAction($event)">
+                (click)="buttonAction($event, 'h4', 'block')" (keyup)="buttonAction($event, 'h4', 'block')" (mousedown)="downAction($event)"
+                (keydown)="downAction($event)">
                 <ion-icon name="fas-heading" aria-hidden="true"></ion-icon><span aria-hidden="true">4</span>
             </button>
         </ion-slide>
         <ion-slide>
             <button [disabled]="!rteEnabled" [attr.aria-pressed]="toolbarStyles.h5" [title]="'core.editor.h5' | translate"
-                (click)="buttonAction($event, 'h5', 'block')" (keyup)="buttonAction($event, 'h5', 'block')"
-                (mousedown)="downAction($event)" (keydown)="downAction($event)">
+                (click)="buttonAction($event, 'h5', 'block')" (keyup)="buttonAction($event, 'h5', 'block')" (mousedown)="downAction($event)"
+                (keydown)="downAction($event)">
                 <ion-icon name="fas-heading" aria-hidden="true"></ion-icon><span aria-hidden="true">5</span>
             </button>
         </ion-slide>
         <ion-slide>
-            <button [disabled]="!rteEnabled" [attr.aria-pressed]="toolbarStyles.ul"
-                [title]="'core.editor.unorderedlist' | translate"
+            <button [disabled]="!rteEnabled" [attr.aria-pressed]="toolbarStyles.ul" [title]="'core.editor.unorderedlist' | translate"
                 (click)="buttonAction($event, 'insertUnorderedList')" (click)="buttonAction($event, 'insertUnorderedList')"
                 (mousedown)="downAction($event)" (keydown)="downAction($event)">
                 <ion-icon name="fas-list-ul" aria-hidden="true"></ion-icon>
@@ -114,40 +93,33 @@
             </button>
         </ion-slide>
         <ion-slide>
-            <button [disabled]="!rteEnabled"
-                (click)="buttonAction($event, 'removeFormat')" (keyup)="buttonAction($event, 'removeFormat')"
-                (mousedown)="downAction($event)" (keydown)="downAction($event)"
-                [title]="'core.editor.clear' | translate">
+            <button [disabled]="!rteEnabled" (click)="buttonAction($event, 'removeFormat')" (keyup)="buttonAction($event, 'removeFormat')"
+                (mousedown)="downAction($event)" (keydown)="downAction($event)" [title]="'core.editor.clear' | translate">
                 <ion-icon name="fas-eraser" aria-hidden="true"></ion-icon>
             </button>
         </ion-slide>
         <ion-slide *ngIf="canScanQR">
-            <button [disabled]="!rteEnabled"
-                (click)="scanQR($event)" (keyup)="scanQR($event)"
-                (mousedown)="stopBubble($event)" (keydown)="stopBubble($event)"
-                [title]="'core.scanqr' | translate">
+            <button [disabled]="!rteEnabled" (click)="scanQR($event)" (keyup)="scanQR($event)" (mousedown)="stopBubble($event)"
+                (keydown)="stopBubble($event)" [title]="'core.scanqr' | translate">
                 <ion-icon name="fas-qrcode" aria-hidden="true"></ion-icon>
             </button>
         </ion-slide>
         <ion-slide>
-            <button [attr.aria-pressed]="!rteEnabled" [title]="'core.editor.toggle' | translate"
-                (click)="toggleEditor($event)" (keyup)="toggleEditor($event)"
-                (mousedown)="downAction($event)" (keydown)="downAction($event)">
+            <button [attr.aria-pressed]="!rteEnabled" [title]="'core.editor.toggle' | translate" (click)="toggleEditor($event)"
+                (keyup)="toggleEditor($event)" (mousedown)="downAction($event)" (keydown)="downAction($event)">
                 <ion-icon name="fas-code" aria-hidden="true"></ion-icon>
             </button>
         </ion-slide>
         <ion-slide *ngIf="isPhone">
-            <button [title]="'core.editor.hidetoolbar' | translate"
-                (click)="hideToolbar($event)" (keyup)="hideToolbar($event)"
+            <button [title]="'core.editor.hidetoolbar' | translate" (click)="hideToolbar($event)" (keyup)="hideToolbar($event)"
                 (mousedown)="downAction($event)" (keydown)="downAction($event)">
                 <ion-icon name="fas-times" aria-hidden="true"></ion-icon>
             </button>
         </ion-slide>
     </ion-slides>
     <button *ngIf="toolbarArrows" class="toolbar-arrow" [class.toolbar-arrow-hidden]="toolbarNextHidden"
-        [attr.aria-label]="'core.next' | translate"
-        (click)="toolbarNext($event)" (keyup)="toolbarNext($event)"
-        (mousedown)="downAction($event)" (keydown)="downAction($event)" >
+        [attr.aria-label]="'core.next' | translate" (click)="toolbarNext($event)" (keyup)="toolbarNext($event)"
+        (mousedown)="downAction($event)" (keydown)="downAction($event)">
         <ion-icon name="fas-chevron-right" aria-hidden="true"></ion-icon>
     </button>
 </div>
diff --git a/src/core/features/question/components/question/core-question.html b/src/core/features/question/components/question/core-question.html
index 6e22b31bf..fb523c3e3 100644
--- a/src/core/features/question/components/question/core-question.html
+++ b/src/core/features/question/components/question/core-question.html
@@ -1,4 +1,3 @@
-
 <!-- Question contents. -->
 <core-dynamic-component *ngIf="loaded" [component]="componentClass" [data]="data" class="core-question-{{question?.slot}}">
     <!-- This content will only be shown if there's no component to render the question. -->
@@ -6,7 +5,7 @@
 </core-dynamic-component>
 
 <!-- Sequence check input. -->
-<input *ngIf="seqCheck" type="hidden" name="{{seqCheck.name}}" value="{{seqCheck.value}}" >
+<input *ngIf="seqCheck" type="hidden" name="{{seqCheck.name}}" value="{{seqCheck.value}}">
 
 <!-- Question behaviour components. -->
 <core-dynamic-component *ngFor="let componentClass of behaviourComponents" [component]="componentClass" [data]="data">
@@ -15,7 +14,7 @@
 <!-- Question validation error. -->
 <ion-item class="ion-text-wrap core-danger-item" *ngIf="validationError">
     <ion-label>
-    	<p>{{ validationError }}</p>
+        <p>{{ validationError }}</p>
     </ion-label>
 </ion-item>
 
@@ -28,8 +27,8 @@
 <!-- Question feedback. -->
 <ion-item class="ion-text-wrap core-question-feedback-container" *ngIf="question && question.feedbackHtml">
     <ion-label>
-        <core-format-text [component]="component" [componentId]="componentId" [text]="question.feedbackHtml"
-            [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId">
+        <core-format-text [component]="component" [componentId]="componentId" [text]="question.feedbackHtml" [contextLevel]="contextLevel"
+            [contextInstanceId]="contextInstanceId" [courseId]="courseId">
         </core-format-text>
     </ion-label>
 </ion-item>
@@ -37,8 +36,8 @@
 <!-- Question comment. -->
 <ion-item class="ion-text-wrap core-question-comment" *ngIf="question && question.commentHtml">
     <ion-label>
-        <core-format-text [component]="component" [componentId]="componentId" [text]="question.commentHtml"
-            [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId">
+        <core-format-text [component]="component" [componentId]="componentId" [text]="question.commentHtml" [contextLevel]="contextLevel"
+            [contextInstanceId]="contextInstanceId" [courseId]="courseId">
         </core-format-text>
     </ion-label>
 </ion-item>
diff --git a/src/core/features/search/components/search-box/core-search-box.html b/src/core/features/search/components/search-box/core-search-box.html
index 79aac7e7f..66dedb5c2 100644
--- a/src/core/features/search/components/search-box/core-search-box.html
+++ b/src/core/features/search/components/search-box/core-search-box.html
@@ -2,23 +2,21 @@
     <form (ngSubmit)="submitForm($event)" role="search" #searchForm>
         <ion-item>
             <ion-label class="sr-only">{{ placeholder }}</ion-label>
-            <ion-input type="search" name="search" [(ngModel)]="searchText" [placeholder]="placeholder"
-                [autocorrect]="autocorrect" [spellcheck]="spellcheck" [core-auto-focus]="autoFocus"
-                [disabled]="disabled" role="searchbox" (ionFocus)="focus($event)">
+            <ion-input type="search" name="search" [(ngModel)]="searchText" [placeholder]="placeholder" [autocorrect]="autocorrect"
+                [spellcheck]="spellcheck" [core-auto-focus]="autoFocus" [disabled]="disabled" role="searchbox" (ionFocus)="focus($event)">
             </ion-input>
             <ion-button slot="end" fill="clear" type="submit" [attr.aria-label]="searchLabel"
                 [disabled]="disabled || !searchText || (searchText.length < lengthCheck)">
                 <ion-icon name="fas-search" slot="icon-only" aria-hidden="true"></ion-icon>
             </ion-button>
-            <ion-button *ngIf="showClear" slot="end" fill="clear"
-                [attr.aria-label]="'core.clearsearch' | translate" [disabled]="searched == '' || disabled"
-                (click)="clearForm()">
+            <ion-button *ngIf="showClear" slot="end" fill="clear" [attr.aria-label]="'core.clearsearch' | translate"
+                [disabled]="searched == '' || disabled" (click)="clearForm()">
                 <ion-icon name="fas-backspace" slot="icon-only" aria-hidden="true" flip-rtl></ion-icon>
             </ion-button>
         </ion-item>
         <ion-list class="core-search-history" [hidden]="!historyShown">
-            <ion-item button class="ion-text-wrap" *ngFor="let item of history"
-                (click)="historyClicked($event, item.searchedtext)" tabindex="0" detail="true">
+            <ion-item button class="ion-text-wrap" *ngFor="let item of history" (click)="historyClicked($event, item.searchedtext)"
+                tabindex="0" detail="true">
                 <ion-icon name="fas-history" slot="start" aria-hidden="true">
                 </ion-icon>
                 <ion-label>{{item.searchedtext}}</ion-label>
diff --git a/src/core/features/sharedfiles/components/list/list.html b/src/core/features/sharedfiles/components/list/list.html
index 2bdcaf4a2..e3ae1898e 100644
--- a/src/core/features/sharedfiles/components/list/list.html
+++ b/src/core/features/sharedfiles/components/list/list.html
@@ -9,8 +9,8 @@
 <core-loading [hideUntil]="filesLoaded" [fullscreen]="false">
     <ion-list *ngIf="files && files.length > 0">
         <ng-container *ngFor="let file of files; let idx = index">
-            <core-local-file *ngIf="file.isFile" [file]="file" [manage]="manage" [overrideClick]="pick"
-                (onClick)="filePicked(file)" (onDelete)="fileDeleted(idx)" (onRename)="fileRenamed(idx, $event)">
+            <core-local-file *ngIf="file.isFile" [file]="file" [manage]="manage" [overrideClick]="pick" (onClick)="filePicked(file)"
+                (onDelete)="fileDeleted(idx)" (onRename)="fileRenamed(idx, $event)">
             </core-local-file>
 
             <ion-item button *ngIf="!file.isFile" class="ion-text-wrap item-file" (click)="openFolder(file)" detail="true">
@@ -22,8 +22,7 @@
         </ng-container>
     </ion-list>
 
-    <core-empty-box *ngIf="files && !files.length && manage" icon="fas-folder"
-        [message]="'core.sharedfiles.nosharedfiles' | translate">
+    <core-empty-box *ngIf="files && !files.length && manage" icon="fas-folder" [message]="'core.sharedfiles.nosharedfiles' | translate">
     </core-empty-box>
 
     <core-empty-box *ngIf="files && !files.length && !manage" icon="fas-folder"
diff --git a/src/core/features/tag/components/feed/core-tag-feed.html b/src/core/features/tag/components/feed/core-tag-feed.html
index 1be13ee74..629c2189c 100644
--- a/src/core/features/tag/components/feed/core-tag-feed.html
+++ b/src/core/features/tag/components/feed/core-tag-feed.html
@@ -1,7 +1,6 @@
 <ion-item class="ion-text-wrap" *ngFor="let item of items" [href]="item.url" core-link [capture]="true">
     <ion-avatar slot="start" *ngIf="item.avatarUrl">
-        <img [src]="item.avatarUrl" core-external-content alt="" role="presentation"
-            onError="this.src='assets/img/user-avatar.png'">
+        <img [src]="item.avatarUrl" core-external-content alt="" role="presentation" onError="this.src='assets/img/user-avatar.png'">
     </ion-avatar>
     <core-mod-icon *ngIf="item.iconUrl" [modicon]="item.iconUrl" slot="start" [showAlt]="false">
     </core-mod-icon>
diff --git a/src/core/features/user/components/tag-area/core-user-tag-area.html b/src/core/features/user/components/tag-area/core-user-tag-area.html
index e2bd39803..f4f4a9392 100644
--- a/src/core/features/user/components/tag-area/core-user-tag-area.html
+++ b/src/core/features/user/components/tag-area/core-user-tag-area.html
@@ -3,4 +3,4 @@
     <ion-label>
         <h2>{{ item.heading }}</h2>
     </ion-label>
-</ion-item>
\ No newline at end of file
+</ion-item>
diff --git a/src/core/features/user/pages/participants/participants.html b/src/core/features/user/pages/participants/participants.html
index 073b09582..6fa6a38d8 100644
--- a/src/core/features/user/pages/participants/participants.html
+++ b/src/core/features/user/pages/participants/participants.html
@@ -6,15 +6,12 @@
 
 <ion-content>
     <core-split-view>
-        <ion-refresher slot="fixed" [disabled]="!participants.loaded || searchInProgress"
-            (ionRefresh)="refreshParticipants($event.target)">
+        <ion-refresher slot="fixed" [disabled]="!participants.loaded || searchInProgress" (ionRefresh)="refreshParticipants($event.target)">
             <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
         </ion-refresher>
 
-        <core-search-box *ngIf="showSearchBox"
-            [disabled]="searchInProgress" [spellcheck]="false" [autoFocus]="true" [lengthCheck]="1"
-            autocorrect="off" searchArea="CoreUserParticipants"
-            (onSubmit)="search($event)" (onClear)="clearSearch()">
+        <core-search-box *ngIf="showSearchBox" [disabled]="searchInProgress" [spellcheck]="false" [autoFocus]="true" [lengthCheck]="1"
+            autocorrect="off" searchArea="CoreUserParticipants" (onSubmit)="search($event)" (onClear)="clearSearch()">
         </core-search-box>
 
         <core-loading [hideUntil]="participants.loaded">
@@ -27,9 +24,9 @@
             </core-empty-box>
 
             <ion-list *ngIf="!participants.empty">
-                <ion-item *ngFor="let participant of participants.items"
-                    class="ion-text-wrap" [attr.aria-current]="participants.getItemAriaCurrent(participant)"
-                    [attr.aria-label]="participant.fullname" (click)="participants.select(participant)" button detail="true">
+                <ion-item *ngFor="let participant of participants.items" class="ion-text-wrap"
+                    [attr.aria-current]="participants.getItemAriaCurrent(participant)" [attr.aria-label]="participant.fullname"
+                    (click)="participants.select(participant)" button detail="true">
 
                     <core-user-avatar [user]="participant" [linkProfile]="false" [checkOnline]="true" slot="start">
                     </core-user-avatar>
@@ -57,8 +54,8 @@
 
                 </ion-item>
             </ion-list>
-            <core-infinite-loading [enabled]="participants.loaded && !participants.completed"
-                (action)="fetchMoreParticipants($event)" [error]="fetchMoreParticipantsFailed">
+            <core-infinite-loading [enabled]="participants.loaded && !participants.completed" (action)="fetchMoreParticipants($event)"
+                [error]="fetchMoreParticipantsFailed">
             </core-infinite-loading>
         </core-loading>
     </core-split-view>

From e42cab8d8b8f653cf94fd2b80739463d1b2d8269 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 17 Nov 2021 12:29:45 +0100
Subject: [PATCH 0244/1008] MOBILE-3926 core: Disable tablet swipe navigation

---
 .../swipe-navigation/swipe-navigation.html          |  2 +-
 .../components/swipe-navigation/swipe-navigation.ts | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/core/components/swipe-navigation/swipe-navigation.html b/src/core/components/swipe-navigation/swipe-navigation.html
index 1519bb5e4..1a47ecb89 100644
--- a/src/core/components/swipe-navigation/swipe-navigation.html
+++ b/src/core/components/swipe-navigation/swipe-navigation.html
@@ -1,4 +1,4 @@
-<ion-slides [options]="{ allowTouchMove: !!manager }" (swipeleft)="swipeLeft()" (swiperight)="swipeRight()">
+<ion-slides [options]="{ allowTouchMove: enabled }" (swipeleft)="swipeLeft()" (swiperight)="swipeRight()">
     <ion-slide>
         <ng-content></ng-content>
     </ion-slide>
diff --git a/src/core/components/swipe-navigation/swipe-navigation.ts b/src/core/components/swipe-navigation/swipe-navigation.ts
index a87c10b7f..57dab122d 100644
--- a/src/core/components/swipe-navigation/swipe-navigation.ts
+++ b/src/core/components/swipe-navigation/swipe-navigation.ts
@@ -14,6 +14,7 @@
 
 import { Component, Input } from '@angular/core';
 import { CoreSwipeItemsManager } from '@classes/items-management/swipe-items-manager';
+import { CoreScreen } from '@services/screen';
 
 @Component({
     selector: 'core-swipe-navigation',
@@ -24,10 +25,18 @@ export class CoreSwipeNavigationComponent {
 
     @Input() manager?: CoreSwipeItemsManager;
 
+    get enabled(): boolean {
+        return CoreScreen.isMobile && !!this.manager;
+    }
+
     /**
      * Swipe to previous item.
      */
     swipeLeft(): void {
+        if (!this.enabled) {
+            return;
+        }
+
         this.manager?.navigateToPreviousItem();
     }
 
@@ -35,6 +44,10 @@ export class CoreSwipeNavigationComponent {
      * Swipe to next item.
      */
     swipeRight(): void {
+        if (!this.enabled) {
+            return;
+        }
+
         this.manager?.navigateToNextItem();
     }
 

From 2c8ef511305002d06ae93af758d38860076ad644 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 17 Nov 2021 12:30:10 +0100
Subject: [PATCH 0245/1008] MOBILE-3926 core: Update swipe navigation styles

---
 .../swipe-navigation/swipe-navigation.scss           | 12 ++++++++++++
 src/core/features/user/pages/profile/profile.scss    |  3 ---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/core/components/swipe-navigation/swipe-navigation.scss b/src/core/components/swipe-navigation/swipe-navigation.scss
index 4baf55d1c..05c7d60e5 100644
--- a/src/core/components/swipe-navigation/swipe-navigation.scss
+++ b/src/core/components/swipe-navigation/swipe-navigation.scss
@@ -5,3 +5,15 @@ ion-slides {
 ion-slide {
     align-items: start;
 }
+
+::ng-deep {
+
+    core-loading .core-loading-content {
+        width: 100%;
+    }
+
+    ion-refresher.refresher-native {
+        z-index: 2;
+    }
+
+}
diff --git a/src/core/features/user/pages/profile/profile.scss b/src/core/features/user/pages/profile/profile.scss
index eac82607b..41723e265 100644
--- a/src/core/features/user/pages/profile/profile.scss
+++ b/src/core/features/user/pages/profile/profile.scss
@@ -19,9 +19,6 @@
                 right: calc(50% - 12px -  var(--core-avatar-size) / 2) !important;
             }
         }
-        core-loading .core-loading-content {
-            width: 100%;
-        }
     }
 
 }

From d6d5429ee13e5adb5f7b917e51b9724dd4a9939d Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 17 Nov 2021 12:31:05 +0100
Subject: [PATCH 0246/1008] MOBILE-3926 core: Add Source generic to managers

---
 .../items-management/items-manager-sources-tracker.ts | 11 ++++++-----
 src/core/classes/items-management/items-manager.ts    | 10 +++++-----
 .../classes/items-management/list-items-manager.ts    |  7 +++++--
 .../classes/items-management/swipe-items-manager.ts   |  7 ++++++-
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/core/classes/items-management/items-manager-sources-tracker.ts b/src/core/classes/items-management/items-manager-sources-tracker.ts
index 997f5c556..8b7f5743e 100644
--- a/src/core/classes/items-management/items-manager-sources-tracker.ts
+++ b/src/core/classes/items-management/items-manager-sources-tracker.ts
@@ -18,6 +18,7 @@ type SourceConstructor<T extends CoreItemsManagerSource = CoreItemsManagerSource
     getSourceId(...args: unknown[]): string;
     new (...args: unknown[]): T;
 };
+type SourceConstuctorInstance<T> = T extends { new(...args: unknown[]): infer P } ? P : never;
 type InstanceTracking = { instance: CoreItemsManagerSource; references: unknown[] };
 type Instances = Record<string, InstanceTracking>;
 
@@ -36,14 +37,14 @@ export class CoreItemsManagerSourcesTracker {
      * @param constructorArguments Arguments to create a new instance, used to find out if an instance already exists.
      * @returns Source.
      */
-    static getOrCreateSource<T extends CoreItemsManagerSource>(
-        constructor: SourceConstructor<T>,
-        constructorArguments: ConstructorParameters<SourceConstructor<T>>,
-    ): T  {
+    static getOrCreateSource<T extends CoreItemsManagerSource, C extends SourceConstructor<T>>(
+        constructor: C,
+        constructorArguments: ConstructorParameters<C>,
+    ): SourceConstuctorInstance<C> {
         const id = constructor.getSourceId(...constructorArguments);
         const constructorInstances = this.getConstructorInstances(constructor);
 
-        return constructorInstances[id]?.instance as T
+        return constructorInstances[id]?.instance as SourceConstuctorInstance<C>
             ?? this.createInstance(id, constructor, constructorArguments);
     }
 
diff --git a/src/core/classes/items-management/items-manager.ts b/src/core/classes/items-management/items-manager.ts
index 8ec06d964..ebab07bc7 100644
--- a/src/core/classes/items-management/items-manager.ts
+++ b/src/core/classes/items-management/items-manager.ts
@@ -21,13 +21,13 @@ import { CoreItemsManagerSourcesTracker } from './items-manager-sources-tracker'
 /**
  * Helper to manage a collection of items in a page.
  */
-export abstract class CoreItemsManager<Item = unknown> {
+export abstract class CoreItemsManager<Item = unknown, Source extends CoreItemsManagerSource<Item> = CoreItemsManagerSource<Item>> {
 
-    protected source?: { instance: CoreItemsManagerSource<Item>; unsubscribe: () => void };
+    protected source?: { instance: Source; unsubscribe: () => void };
     protected itemsMap: Record<string, Item> | null = null;
     protected selectedItem: Item | null = null;
 
-    constructor(source: CoreItemsManagerSource<Item>) {
+    constructor(source: Source) {
         this.setSource(source);
     }
 
@@ -36,7 +36,7 @@ export abstract class CoreItemsManager<Item = unknown> {
      *
      * @returns Source.
      */
-    getSource(): CoreItemsManagerSource<Item> {
+    getSource(): Source {
         if (!this.source) {
             throw new Error('Source is missing from items manager');
         }
@@ -49,7 +49,7 @@ export abstract class CoreItemsManager<Item = unknown> {
      *
      * @param newSource New source.
      */
-    setSource(newSource: CoreItemsManagerSource<Item> | null): void {
+    setSource(newSource: Source | null): void {
         if (this.source) {
             CoreItemsManagerSourcesTracker.removeReference(this.source.instance, this);
 
diff --git a/src/core/classes/items-management/list-items-manager.ts b/src/core/classes/items-management/list-items-manager.ts
index ff1b87ec8..cfb7f4750 100644
--- a/src/core/classes/items-management/list-items-manager.ts
+++ b/src/core/classes/items-management/list-items-manager.ts
@@ -26,13 +26,16 @@ import { CoreItemsManagerSource } from './items-manager-source';
 /**
  * Helper class to manage the state and routing of a list of items in a page.
  */
-export abstract class CoreListItemsManager<Item = unknown> extends CoreItemsManager<Item> {
+export abstract class CoreListItemsManager<
+    Item = unknown,
+    Source extends CoreItemsManagerSource<Item> = CoreItemsManagerSource<Item>
+> extends CoreItemsManager<Item, Source> {
 
     protected pageRouteLocator?: unknown | ActivatedRoute;
     protected splitView?: CoreSplitViewComponent;
     protected splitViewOutletSubscription?: Subscription;
 
-    constructor(source: CoreItemsManagerSource<Item>, pageRouteLocator: unknown | ActivatedRoute) {
+    constructor(source: Source, pageRouteLocator: unknown | ActivatedRoute) {
         super(source);
 
         this.pageRouteLocator = pageRouteLocator;
diff --git a/src/core/classes/items-management/swipe-items-manager.ts b/src/core/classes/items-management/swipe-items-manager.ts
index 18cb6b40c..c18c3398d 100644
--- a/src/core/classes/items-management/swipe-items-manager.ts
+++ b/src/core/classes/items-management/swipe-items-manager.ts
@@ -17,11 +17,16 @@ import { ActivatedRoute } from '@angular/router';
 import { CoreNavigator } from '@services/navigator';
 
 import { CoreItemsManager } from './items-manager';
+import { CoreItemsManagerSource } from './items-manager-source';
 
 /**
  * Helper class to manage the state and routing of a swipeable page.
  */
-export abstract class CoreSwipeItemsManager<Item = unknown> extends CoreItemsManager<Item> {
+export abstract class CoreSwipeItemsManager<
+    Item = unknown,
+    Source extends CoreItemsManagerSource<Item> = CoreItemsManagerSource<Item>
+>
+    extends CoreItemsManager<Item, Source> {
 
     /**
      * Process page started operations.

From 7857e5b79c4509f62b396fb9d526c65c3d4c563e Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 17 Nov 2021 12:32:07 +0100
Subject: [PATCH 0247/1008] MOBILE-3926 core: Support non-paginated sources

---
 .../items-management/items-manager-source.ts        | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/core/classes/items-management/items-manager-source.ts b/src/core/classes/items-management/items-manager-source.ts
index 141cc6f4c..0a4ae17a2 100644
--- a/src/core/classes/items-management/items-manager-source.ts
+++ b/src/core/classes/items-management/items-manager-source.ts
@@ -76,7 +76,12 @@ export abstract class CoreItemsManagerSource<Item = unknown> {
             return 0;
         }
 
-        return Math.ceil(this.items.length / this.getPageLength());
+        const pageLength = this.getPageLength();
+        if (pageLength === null) {
+            return 1;
+        }
+
+        return Math.ceil(this.items.length / pageLength);
     }
 
     /**
@@ -149,9 +154,11 @@ export abstract class CoreItemsManagerSource<Item = unknown> {
     /**
      * Get the length of each page in the collection.
      *
-     * @return Page length.
+     * @return Page length; null for collections that don't support pagination.
      */
-    protected abstract getPageLength(): number;
+    protected getPageLength(): number | null {
+        return null;
+    }
 
     /**
      * Update the collection items.

From 9987c3bcf9bb7d90ba7712abc17c86a9555d482e Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 17 Nov 2021 12:35:44 +0100
Subject: [PATCH 0248/1008] MOBILE-3926 badges: Implement swipe navigation

---
 .../badges/classes/user-badges-source.ts      |  42 ++
 .../pages/issued-badge/issued-badge.html      | 440 +++++++++---------
 .../pages/issued-badge/issued-badge.page.ts   |  50 +-
 .../pages/user-badges/user-badges.page.ts     |  51 +-
 .../items-manager-sources-tracker.ts          |   4 +-
 5 files changed, 332 insertions(+), 255 deletions(-)
 create mode 100644 src/addons/badges/classes/user-badges-source.ts

diff --git a/src/addons/badges/classes/user-badges-source.ts b/src/addons/badges/classes/user-badges-source.ts
new file mode 100644
index 000000000..ee1b6ed5f
--- /dev/null
+++ b/src/addons/badges/classes/user-badges-source.ts
@@ -0,0 +1,42 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreItemsManagerSource } from '@classes/items-management/items-manager-source';
+import { AddonBadges, AddonBadgesUserBadge } from '../services/badges';
+
+/**
+ * Provides a collection of user badges.
+ */
+export class AddonBadgesUserBadgesSource extends CoreItemsManagerSource<AddonBadgesUserBadge> {
+
+    readonly COURSE_ID: number;
+    readonly USER_ID: number;
+
+    constructor(courseId: number, userId: number) {
+        super();
+
+        this.COURSE_ID = courseId;
+        this.USER_ID = userId;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected async loadPageItems(): Promise<{ items: AddonBadgesUserBadge[]; hasMoreItems: boolean }> {
+        const badges = await AddonBadges.getUserBadges(this.COURSE_ID, this.USER_ID);
+
+        return { items: badges, hasMoreItems: false };
+    }
+
+}
diff --git a/src/addons/badges/pages/issued-badge/issued-badge.html b/src/addons/badges/pages/issued-badge/issued-badge.html
index d4865c4c9..4e7ac334e 100644
--- a/src/addons/badges/pages/issued-badge/issued-badge.html
+++ b/src/addons/badges/pages/issued-badge/issued-badge.html
@@ -10,239 +10,241 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-refresher slot="fixed" [disabled]="!badgeLoaded" (ionRefresh)="refreshBadges($event.target)">
-        <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
-    </ion-refresher>
-    <core-loading [hideUntil]="badgeLoaded">
-        <ion-item-group *ngIf="badge">
-            <ion-item class="ion-text-wrap ion-text-center">
-                <ion-label>
-                    <img *ngIf="badge.badgeurl" class="large-avatar" [src]="badge.badgeurl" core-external-content [alt]="badge.name" />
-                    <ion-badge color="danger" *ngIf="badge.dateexpire && currentTime >= badge.dateexpire">
-                        {{ 'addon.badges.expired' | translate }}
-                    </ion-badge>
-                </ion-label>
-            </ion-item>
-        </ion-item-group>
-
-        <ion-item-group *ngIf="user">
-            <ion-item-divider>
-                <ion-label>
-                    <h2>{{ 'addon.badges.recipientdetails' | translate}}</h2>
-                </ion-label>
-            </ion-item-divider>
-            <ion-item class="ion-text-wrap">
-                <ion-label>
-                    <h2>{{ 'core.name' | translate}}</h2>
-                    <p>{{ user.fullname }}</p>
-                </ion-label>
-            </ion-item>
-        </ion-item-group>
-
-        <ng-container *ngIf="badge">
-            <ion-item-group>
-                <ion-item-divider>
+    <core-swipe-navigation [manager]="badges">
+        <ion-refresher slot="fixed" [disabled]="!badgeLoaded" (ionRefresh)="refreshBadges($event.target)">
+            <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
+        </ion-refresher>
+        <core-loading [hideUntil]="badgeLoaded">
+            <ion-item-group *ngIf="badge">
+                <ion-item class="ion-text-wrap ion-text-center">
                     <ion-label>
-                        <h2>{{ 'addon.badges.issuerdetails' | translate}}</h2>
-                    </ion-label>
-                </ion-item-divider>
-                <ion-item class="ion-text-wrap" *ngIf="badge.issuername">
-                    <ion-label>
-                        <h2>{{ 'addon.badges.issuername' | translate}}</h2>
-                        <p>{{ badge.issuername }}</p>
-                    </ion-label>
-                </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="badge.issuercontact">
-                    <ion-label>
-                        <h2>{{ 'addon.badges.contact' | translate}}</h2>
-                        <p><a href="mailto:{{badge.issuercontact}}" core-link auto-login="no" [showBrowserWarning]="false">
-                                {{ badge.issuercontact }}
-                            </a></p>
+                        <img *ngIf="badge.badgeurl" class="large-avatar" [src]="badge.badgeurl" core-external-content [alt]="badge.name" />
+                        <ion-badge color="danger" *ngIf="badge.dateexpire && currentTime >= badge.dateexpire">
+                            {{ 'addon.badges.expired' | translate }}
+                        </ion-badge>
                     </ion-label>
                 </ion-item>
             </ion-item-group>
 
-            <ion-item-group>
+            <ion-item-group *ngIf="user">
                 <ion-item-divider>
                     <ion-label>
-                        <h2>{{ 'addon.badges.badgedetails' | translate}}</h2>
+                        <h2>{{ 'addon.badges.recipientdetails' | translate}}</h2>
                     </ion-label>
                 </ion-item-divider>
-                <ion-item class="ion-text-wrap" *ngIf="badge.name">
+                <ion-item class="ion-text-wrap">
                     <ion-label>
                         <h2>{{ 'core.name' | translate}}</h2>
-                        <p>{{ badge.name }}</p>
-                    </ion-label>
-                </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="badge.version">
-                    <ion-label>
-                        <h2>{{ 'addon.badges.version' | translate}}</h2>
-                        <p>{{ badge.version }}</p>
-                    </ion-label>
-                </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="badge.language">
-                    <ion-label>
-                        <h2>{{ 'addon.badges.language' | translate}}</h2>
-                        <p>{{ badge.language }}</p>
-                    </ion-label>
-                </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="badge.description">
-                    <ion-label>
-                        <h2>{{ 'core.description' | translate}}</h2>
-                        <p>{{ badge.description }}</p>
-                    </ion-label>
-                </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="badge.imageauthorname">
-                    <ion-label>
-                        <h2>{{ 'addon.badges.imageauthorname' | translate}}</h2>
-                        <p>{{ badge.imageauthorname }}</p>
-                    </ion-label>
-                </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="badge.imageauthoremail">
-                    <ion-label>
-                        <h2>{{ 'addon.badges.imageauthoremail' | translate}}</h2>
-                        <p><a href="mailto:{{badge.imageauthoremail}}" core-link auto-login="no" [showBrowserWarning]="false">
-                                {{ badge.imageauthoremail }}
-                            </a></p>
-                    </ion-label>
-                </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="badge.imageauthorurl">
-                    <ion-label>
-                        <h2>{{ 'addon.badges.imageauthorurl' | translate}}</h2>
-                        <p><a [href]="badge.imageauthorurl" core-link auto-login="no"> {{ badge.imageauthorurl }} </a></p>
-                    </ion-label>
-                </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="badge.imagecaption">
-                    <ion-label>
-                        <h2>{{ 'addon.badges.imagecaption' | translate}}</h2>
-                        <p>{{ badge.imagecaption }}</p>
-                    </ion-label>
-                </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="course">
-                    <ion-label>
-                        <h2>{{ 'core.course' | translate}}</h2>
-                        <p>
-                            <core-format-text [text]="course.fullname" contextLevel="course" [contextInstanceId]="courseId">
-                            </core-format-text>
-                        </p>
-                    </ion-label>
-                </ion-item>
-                <!-- Criteria (not yet available) -->
-            </ion-item-group>
-
-            <ion-item-group>
-                <ion-item-divider>
-                    <ion-label>
-                        <h2>{{ 'addon.badges.issuancedetails' | translate}}</h2>
-                    </ion-label>
-                </ion-item-divider>
-                <ion-item class="ion-text-wrap" *ngIf="badge.dateissued">
-                    <ion-label>
-                        <h2>{{ 'addon.badges.dateawarded' | translate}}</h2>
-                        <p>{{badge.dateissued * 1000 | coreFormatDate }}</p>
-                    </ion-label>
-                </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="badge.dateexpire">
-                    <ion-label>
-                        <h2>{{ 'addon.badges.expirydate' | translate}}</h2>
-                        <p>
-                            {{ badge.dateexpire * 1000 | coreFormatDate }}
-                            <span class="text-danger" *ngIf="currentTime >= badge.dateexpire">
-                                {{ 'addon.badges.warnexpired' | translate }}
-                            </span>
-                        </p>
-                    </ion-label>
-                </ion-item>
-                <!-- Evidence (not yet available) -->
-            </ion-item-group>
-
-            <!-- Endorsement -->
-            <ion-item-group *ngIf="badge.endorsement">
-                <ion-item-divider>
-                    <ion-label>
-                        <h2>{{ 'addon.badges.bendorsement' | translate}}</h2>
-                    </ion-label>
-                </ion-item-divider>
-                <ion-item class="ion-text-wrap" *ngIf="badge.endorsement.issuername">
-                    <ion-label>
-                        <h2>{{ 'addon.badges.issuername' | translate}}</h2>
-                        <p>{{ badge.endorsement.issuername }}</p>
-                    </ion-label>
-                </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="badge.endorsement.issueremail">
-                    <ion-label>
-                        <h2>{{ 'addon.badges.issueremail' | translate}}</h2>
-                        <p>
-                            <a href="mailto:{{badge.endorsement.issueremail}}" core-link auto-login="no" [showBrowserWarning]="false">
-                                {{ badge.endorsement.issueremail }}
-                            </a>
-                        </p>
-                    </ion-label>
-                </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="badge.endorsement.issuerurl">
-                    <ion-label>
-                        <h2>{{ 'addon.badges.issuerurl' | translate}}</h2>
-                        <p><a [href]="badge.endorsement.issuerurl" core-link auto-login="no"> {{ badge.endorsement.issuerurl }} </a></p>
-                    </ion-label>
-                </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="badge.endorsement.dateissued">
-                    <ion-label>
-                        <h2>{{ 'addon.badges.dateawarded' | translate}}</h2>
-                        <p>{{ badge.endorsement.dateissued * 1000 | coreFormatDate }}</p>
-                    </ion-label>
-                </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="badge.endorsement.claimid">
-                    <ion-label>
-                        <h2>{{ 'addon.badges.claimid' | translate}}</h2>
-                        <p><a [href]="badge.endorsement.claimid" core-link auto-login="no"> {{ badge.endorsement.claimid }} </a></p>
-                    </ion-label>
-                </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="badge.endorsement.claimcomment">
-                    <ion-label>
-                        <h2>{{ 'addon.badges.claimcomment' | translate}}</h2>
-                        <p>{{ badge.endorsement.claimcomment }}</p>
+                        <p>{{ user.fullname }}</p>
                     </ion-label>
                 </ion-item>
             </ion-item-group>
 
-            <!-- Related badges -->
-            <ion-item-group *ngIf="badge.relatedbadges">
-                <ion-item-divider>
-                    <ion-label>
-                        <h2>{{ 'addon.badges.relatedbages' | translate}}</h2>
-                    </ion-label>
-                </ion-item-divider>
-                <ion-item class="ion-text-wrap" *ngFor="let relatedBadge of badge.relatedbadges">
-                    <ion-label>
-                        <h2>{{ relatedBadge.name }}</h2>
-                    </ion-label>
-                </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="badge.relatedbadges.length == 0">
-                    <ion-label>
-                        <h2>{{ 'addon.badges.norelated' | translate}}</h2>
-                    </ion-label>
-                </ion-item>
-            </ion-item-group>
+            <ng-container *ngIf="badge">
+                <ion-item-group>
+                    <ion-item-divider>
+                        <ion-label>
+                            <h2>{{ 'addon.badges.issuerdetails' | translate}}</h2>
+                        </ion-label>
+                    </ion-item-divider>
+                    <ion-item class="ion-text-wrap" *ngIf="badge.issuername">
+                        <ion-label>
+                            <h2>{{ 'addon.badges.issuername' | translate}}</h2>
+                            <p>{{ badge.issuername }}</p>
+                        </ion-label>
+                    </ion-item>
+                    <ion-item class="ion-text-wrap" *ngIf="badge.issuercontact">
+                        <ion-label>
+                            <h2>{{ 'addon.badges.contact' | translate}}</h2>
+                            <p><a href="mailto:{{badge.issuercontact}}" core-link auto-login="no" [showBrowserWarning]="false">
+                                    {{ badge.issuercontact }}
+                                </a></p>
+                        </ion-label>
+                    </ion-item>
+                </ion-item-group>
 
-            <!-- Competencies alignment -->
-            <ion-item-group *ngIf="badge.alignment">
-                <ion-item-divider>
-                    <ion-label>
-                        <h2>{{ 'addon.badges.alignment' | translate}}</h2>
-                    </ion-label>
-                </ion-item-divider>
-                <ion-item class="ion-text-wrap" *ngFor="let alignment of badge.alignment" [href]="alignment.targeturl" core-link
-                    auto-login="no">
-                    <ion-label>
-                        <h2>{{ alignment.targetname }}</h2>
-                    </ion-label>
-                </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="badge.alignment.length == 0">
-                    <ion-label>
-                        <h2>{{ 'addon.badges.noalignment' | translate}}</h2>
-                    </ion-label>
-                </ion-item>
-            </ion-item-group>
-        </ng-container>
-    </core-loading>
+                <ion-item-group>
+                    <ion-item-divider>
+                        <ion-label>
+                            <h2>{{ 'addon.badges.badgedetails' | translate}}</h2>
+                        </ion-label>
+                    </ion-item-divider>
+                    <ion-item class="ion-text-wrap" *ngIf="badge.name">
+                        <ion-label>
+                            <h2>{{ 'core.name' | translate}}</h2>
+                            <p>{{ badge.name }}</p>
+                        </ion-label>
+                    </ion-item>
+                    <ion-item class="ion-text-wrap" *ngIf="badge.version">
+                        <ion-label>
+                            <h2>{{ 'addon.badges.version' | translate}}</h2>
+                            <p>{{ badge.version }}</p>
+                        </ion-label>
+                    </ion-item>
+                    <ion-item class="ion-text-wrap" *ngIf="badge.language">
+                        <ion-label>
+                            <h2>{{ 'addon.badges.language' | translate}}</h2>
+                            <p>{{ badge.language }}</p>
+                        </ion-label>
+                    </ion-item>
+                    <ion-item class="ion-text-wrap" *ngIf="badge.description">
+                        <ion-label>
+                            <h2>{{ 'core.description' | translate}}</h2>
+                            <p>{{ badge.description }}</p>
+                        </ion-label>
+                    </ion-item>
+                    <ion-item class="ion-text-wrap" *ngIf="badge.imageauthorname">
+                        <ion-label>
+                            <h2>{{ 'addon.badges.imageauthorname' | translate}}</h2>
+                            <p>{{ badge.imageauthorname }}</p>
+                        </ion-label>
+                    </ion-item>
+                    <ion-item class="ion-text-wrap" *ngIf="badge.imageauthoremail">
+                        <ion-label>
+                            <h2>{{ 'addon.badges.imageauthoremail' | translate}}</h2>
+                            <p><a href="mailto:{{badge.imageauthoremail}}" core-link auto-login="no" [showBrowserWarning]="false">
+                                    {{ badge.imageauthoremail }}
+                                </a></p>
+                        </ion-label>
+                    </ion-item>
+                    <ion-item class="ion-text-wrap" *ngIf="badge.imageauthorurl">
+                        <ion-label>
+                            <h2>{{ 'addon.badges.imageauthorurl' | translate}}</h2>
+                            <p><a [href]="badge.imageauthorurl" core-link auto-login="no"> {{ badge.imageauthorurl }} </a></p>
+                        </ion-label>
+                    </ion-item>
+                    <ion-item class="ion-text-wrap" *ngIf="badge.imagecaption">
+                        <ion-label>
+                            <h2>{{ 'addon.badges.imagecaption' | translate}}</h2>
+                            <p>{{ badge.imagecaption }}</p>
+                        </ion-label>
+                    </ion-item>
+                    <ion-item class="ion-text-wrap" *ngIf="course">
+                        <ion-label>
+                            <h2>{{ 'core.course' | translate}}</h2>
+                            <p>
+                                <core-format-text [text]="course.fullname" contextLevel="course" [contextInstanceId]="courseId">
+                                </core-format-text>
+                            </p>
+                        </ion-label>
+                    </ion-item>
+                    <!-- Criteria (not yet available) -->
+                </ion-item-group>
+
+                <ion-item-group>
+                    <ion-item-divider>
+                        <ion-label>
+                            <h2>{{ 'addon.badges.issuancedetails' | translate}}</h2>
+                        </ion-label>
+                    </ion-item-divider>
+                    <ion-item class="ion-text-wrap" *ngIf="badge.dateissued">
+                        <ion-label>
+                            <h2>{{ 'addon.badges.dateawarded' | translate}}</h2>
+                            <p>{{badge.dateissued * 1000 | coreFormatDate }}</p>
+                        </ion-label>
+                    </ion-item>
+                    <ion-item class="ion-text-wrap" *ngIf="badge.dateexpire">
+                        <ion-label>
+                            <h2>{{ 'addon.badges.expirydate' | translate}}</h2>
+                            <p>
+                                {{ badge.dateexpire * 1000 | coreFormatDate }}
+                                <span class="text-danger" *ngIf="currentTime >= badge.dateexpire">
+                                    {{ 'addon.badges.warnexpired' | translate }}
+                                </span>
+                            </p>
+                        </ion-label>
+                    </ion-item>
+                    <!-- Evidence (not yet available) -->
+                </ion-item-group>
+
+                <!-- Endorsement -->
+                <ion-item-group *ngIf="badge.endorsement">
+                    <ion-item-divider>
+                        <ion-label>
+                            <h2>{{ 'addon.badges.bendorsement' | translate}}</h2>
+                        </ion-label>
+                    </ion-item-divider>
+                    <ion-item class="ion-text-wrap" *ngIf="badge.endorsement.issuername">
+                        <ion-label>
+                            <h2>{{ 'addon.badges.issuername' | translate}}</h2>
+                            <p>{{ badge.endorsement.issuername }}</p>
+                        </ion-label>
+                    </ion-item>
+                    <ion-item class="ion-text-wrap" *ngIf="badge.endorsement.issueremail">
+                        <ion-label>
+                            <h2>{{ 'addon.badges.issueremail' | translate}}</h2>
+                            <p>
+                                <a href="mailto:{{badge.endorsement.issueremail}}" core-link auto-login="no" [showBrowserWarning]="false">
+                                    {{ badge.endorsement.issueremail }}
+                                </a>
+                            </p>
+                        </ion-label>
+                    </ion-item>
+                    <ion-item class="ion-text-wrap" *ngIf="badge.endorsement.issuerurl">
+                        <ion-label>
+                            <h2>{{ 'addon.badges.issuerurl' | translate}}</h2>
+                            <p><a [href]="badge.endorsement.issuerurl" core-link auto-login="no"> {{ badge.endorsement.issuerurl }} </a></p>
+                        </ion-label>
+                    </ion-item>
+                    <ion-item class="ion-text-wrap" *ngIf="badge.endorsement.dateissued">
+                        <ion-label>
+                            <h2>{{ 'addon.badges.dateawarded' | translate}}</h2>
+                            <p>{{ badge.endorsement.dateissued * 1000 | coreFormatDate }}</p>
+                        </ion-label>
+                    </ion-item>
+                    <ion-item class="ion-text-wrap" *ngIf="badge.endorsement.claimid">
+                        <ion-label>
+                            <h2>{{ 'addon.badges.claimid' | translate}}</h2>
+                            <p><a [href]="badge.endorsement.claimid" core-link auto-login="no"> {{ badge.endorsement.claimid }} </a></p>
+                        </ion-label>
+                    </ion-item>
+                    <ion-item class="ion-text-wrap" *ngIf="badge.endorsement.claimcomment">
+                        <ion-label>
+                            <h2>{{ 'addon.badges.claimcomment' | translate}}</h2>
+                            <p>{{ badge.endorsement.claimcomment }}</p>
+                        </ion-label>
+                    </ion-item>
+                </ion-item-group>
+
+                <!-- Related badges -->
+                <ion-item-group *ngIf="badge.relatedbadges">
+                    <ion-item-divider>
+                        <ion-label>
+                            <h2>{{ 'addon.badges.relatedbages' | translate}}</h2>
+                        </ion-label>
+                    </ion-item-divider>
+                    <ion-item class="ion-text-wrap" *ngFor="let relatedBadge of badge.relatedbadges">
+                        <ion-label>
+                            <h2>{{ relatedBadge.name }}</h2>
+                        </ion-label>
+                    </ion-item>
+                    <ion-item class="ion-text-wrap" *ngIf="badge.relatedbadges.length == 0">
+                        <ion-label>
+                            <h2>{{ 'addon.badges.norelated' | translate}}</h2>
+                        </ion-label>
+                    </ion-item>
+                </ion-item-group>
+
+                <!-- Competencies alignment -->
+                <ion-item-group *ngIf="badge.alignment">
+                    <ion-item-divider>
+                        <ion-label>
+                            <h2>{{ 'addon.badges.alignment' | translate}}</h2>
+                        </ion-label>
+                    </ion-item-divider>
+                    <ion-item class="ion-text-wrap" *ngFor="let alignment of badge.alignment" [href]="alignment.targeturl" core-link
+                        auto-login="no">
+                        <ion-label>
+                            <h2>{{ alignment.targetname }}</h2>
+                        </ion-label>
+                    </ion-item>
+                    <ion-item class="ion-text-wrap" *ngIf="badge.alignment.length == 0">
+                        <ion-label>
+                            <h2>{{ 'addon.badges.noalignment' | translate}}</h2>
+                        </ion-label>
+                    </ion-item>
+                </ion-item-group>
+            </ng-container>
+        </core-loading>
+    </core-swipe-navigation>
 </ion-content>
diff --git a/src/addons/badges/pages/issued-badge/issued-badge.page.ts b/src/addons/badges/pages/issued-badge/issued-badge.page.ts
index 959ac2dac..bd9764a36 100644
--- a/src/addons/badges/pages/issued-badge/issued-badge.page.ts
+++ b/src/addons/badges/pages/issued-badge/issued-badge.page.ts
@@ -22,7 +22,10 @@ import { AddonBadges, AddonBadgesUserBadge } from '../../services/badges';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreCourses, CoreEnrolledCourseData } from '@features/courses/services/courses';
 import { CoreNavigator } from '@services/navigator';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, ActivatedRouteSnapshot, Params } from '@angular/router';
+import { CoreSwipeItemsManager } from '@classes/items-management/swipe-items-manager';
+import { CoreItemsManagerSourcesTracker } from '@classes/items-management/items-manager-sources-tracker';
+import { AddonBadgesUserBadgesSource } from '@addons/badges/classes/user-badges-source';
 
 /**
  * Page that displays the list of calendar events.
@@ -40,12 +43,11 @@ export class AddonBadgesIssuedBadgePage implements OnInit {
     user?: CoreUserProfile;
     course?: CoreEnrolledCourseData;
     badge?: AddonBadgesUserBadge;
+    badges?: AddonBadgesUserBadgesSwipeManager;
     badgeLoaded = false;
     currentTime = 0;
 
-    constructor(
-        protected route: ActivatedRoute,
-    ) { }
+    constructor(protected route: ActivatedRoute) { }
 
     /**
      * View loaded.
@@ -58,6 +60,11 @@ export class AddonBadgesIssuedBadgePage implements OnInit {
         this.fetchIssuedBadge().finally(() => {
             this.badgeLoaded = true;
         });
+
+        const source = CoreItemsManagerSourcesTracker.getOrCreateSource(AddonBadgesUserBadgesSource, [this.courseId, this.userId]);
+        this.badges = new AddonBadgesUserBadgesSwipeManager(source);
+
+        this.badges.start();
     }
 
     /**
@@ -110,3 +117,38 @@ export class AddonBadgesIssuedBadgePage implements OnInit {
     }
 
 }
+
+/**
+ * Helper to manage swiping within a collection of user badges.
+ */
+class AddonBadgesUserBadgesSwipeManager extends CoreSwipeItemsManager<AddonBadgesUserBadge, AddonBadgesUserBadgesSource> {
+
+    /**
+     * @inheritdoc
+     */
+    protected getItemPath(badge: AddonBadgesUserBadge): string {
+        return String(badge.uniquehash);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected getItemQueryParams(): Params {
+        return {
+            courseId: this.getSource().COURSE_ID,
+            userId: this.getSource().USER_ID,
+        };
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected getSelectedItemPath(route?: ActivatedRouteSnapshot | null): string | null {
+        if (!route) {
+            return null;
+        }
+
+        return route.params.badgeHash;
+    }
+
+}
diff --git a/src/addons/badges/pages/user-badges/user-badges.page.ts b/src/addons/badges/pages/user-badges/user-badges.page.ts
index b5eef4a15..5900ff36a 100644
--- a/src/addons/badges/pages/user-badges/user-badges.page.ts
+++ b/src/addons/badges/pages/user-badges/user-badges.page.ts
@@ -19,10 +19,12 @@ import { CoreTimeUtils } from '@services/utils/time';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreSites } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
-import { CorePageItemsListManager } from '@classes/page-items-list-manager';
 import { Params } from '@angular/router';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import { CoreNavigator } from '@services/navigator';
+import { CoreListItemsManager } from '@classes/items-management/list-items-manager';
+import { AddonBadgesUserBadgesSource } from '@addons/badges/classes/user-badges-source';
+import { CoreItemsManagerSourcesTracker } from '@classes/items-management/items-manager-sources-tracker';
 
 /**
  * Page that displays the list of calendar events.
@@ -34,7 +36,7 @@ import { CoreNavigator } from '@services/navigator';
 export class AddonBadgesUserBadgesPage implements AfterViewInit, OnDestroy {
 
     currentTime = 0;
-    badges: AddonBadgesUserBadgesManager;
+    badges: AddonBadgesUserBadgesListManager;
 
     @ViewChild(CoreSplitViewComponent) splitView!: CoreSplitViewComponent;
 
@@ -47,7 +49,10 @@ export class AddonBadgesUserBadgesPage implements AfterViewInit, OnDestroy {
             courseId = 0;
         }
 
-        this.badges = new AddonBadgesUserBadgesManager(AddonBadgesUserBadgesPage, courseId, userId);
+        this.badges = new AddonBadgesUserBadgesListManager(
+            CoreItemsManagerSourcesTracker.getOrCreateSource(AddonBadgesUserBadgesSource, [courseId, userId]),
+            AddonBadgesUserBadgesPage,
+        );
     }
 
     /**
@@ -72,8 +77,13 @@ export class AddonBadgesUserBadgesPage implements AfterViewInit, OnDestroy {
      * @param refresher Refresher.
      */
     async refreshBadges(refresher?: IonRefresher): Promise<void> {
-        await CoreUtils.ignoreErrors(AddonBadges.invalidateUserBadges(this.badges.courseId, this.badges.userId));
-        await CoreUtils.ignoreErrors(this.fetchBadges());
+        await CoreUtils.ignoreErrors(
+            AddonBadges.invalidateUserBadges(
+                this.badges.getSource().COURSE_ID,
+                this.badges.getSource().USER_ID,
+            ),
+        );
+        await CoreUtils.ignoreErrors(this.badges.reload());
 
         refresher?.complete();
     }
@@ -85,39 +95,20 @@ export class AddonBadgesUserBadgesPage implements AfterViewInit, OnDestroy {
         this.currentTime = CoreTimeUtils.timestamp();
 
         try {
-            await this.fetchBadges();
+            await this.badges.reload();
         } catch (message) {
             CoreDomUtils.showErrorModalDefault(message, 'Error loading badges');
 
-            this.badges.setItems([]);
+            this.badges.reset();
         }
     }
 
-    /**
-     * Update the list of badges.
-     */
-    private async fetchBadges(): Promise<void> {
-        const badges = await AddonBadges.getUserBadges(this.badges.courseId, this.badges.userId);
-
-        this.badges.setItems(badges);
-    }
-
 }
 
 /**
- * Helper class to manage badges.
+ * Helper class to manage badges list.
  */
-class AddonBadgesUserBadgesManager extends CorePageItemsListManager<AddonBadgesUserBadge> {
-
-    courseId: number;
-    userId: number;
-
-    constructor(pageComponent: unknown, courseId: number, userId: number) {
-        super(pageComponent);
-
-        this.courseId = courseId;
-        this.userId = userId;
-    }
+class AddonBadgesUserBadgesListManager extends CoreListItemsManager<AddonBadgesUserBadge, AddonBadgesUserBadgesSource> {
 
     /**
      * @inheritdoc
@@ -131,8 +122,8 @@ class AddonBadgesUserBadgesManager extends CorePageItemsListManager<AddonBadgesU
      */
     protected getItemQueryParams(): Params {
         return {
-            courseId: this.courseId,
-            userId: this.userId,
+            courseId: this.getSource().COURSE_ID,
+            userId: this.getSource().USER_ID,
         };
     }
 
diff --git a/src/core/classes/items-management/items-manager-sources-tracker.ts b/src/core/classes/items-management/items-manager-sources-tracker.ts
index 8b7f5743e..e3c2f16b9 100644
--- a/src/core/classes/items-management/items-manager-sources-tracker.ts
+++ b/src/core/classes/items-management/items-manager-sources-tracker.ts
@@ -58,7 +58,7 @@ export class CoreItemsManagerSourcesTracker {
         const constructorInstances = this.getConstructorInstances(source.constructor as SourceConstructor);
         const instanceId = this.instanceIds.get(source);
 
-        if (!instanceId) {
+        if (instanceId === undefined) {
             return;
         }
 
@@ -83,7 +83,7 @@ export class CoreItemsManagerSourcesTracker {
         const instanceId = this.instanceIds.get(source);
         const index = constructorInstances?.[instanceId ?? '']?.references.indexOf(reference) ?? -1;
 
-        if (!constructorInstances || !instanceId || index === -1) {
+        if (!constructorInstances || instanceId === undefined || index === -1) {
             return;
         }
 

From 57532fd393fc5c9f763fbec6b2a8d4c3a70c9159 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 17 Nov 2021 13:06:55 +0100
Subject: [PATCH 0249/1008] MOBILE-3833 user: Fix handler cache clear

---
 src/core/features/user/services/user-delegate.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/core/features/user/services/user-delegate.ts b/src/core/features/user/services/user-delegate.ts
index b16a36787..df503bc7d 100644
--- a/src/core/features/user/services/user-delegate.ts
+++ b/src/core/features/user/services/user-delegate.ts
@@ -397,8 +397,14 @@ export class CoreUserDelegateService extends CoreDelegate<CoreUserProfileHandler
      */
     protected clearHandlerCache(courseId?: number, userId?: number): void {
         if (courseId && userId) {
+            const cacheKey = this.getCacheKey(courseId, userId);
+
             Object.keys(this.enabledHandlers).forEach((name) => {
-                delete this.enabledForUserCache[name][this.getCacheKey(courseId, userId)];
+                const cache = this.enabledForUserCache[name];
+
+                if (cache) {
+                    delete cache[cacheKey];
+                }
             });
         } else {
             this.enabledForUserCache = {};

From c041e2a314eca6e1c7b3930cfd43c242141e74cd Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Mon, 22 Nov 2021 14:30:17 +0100
Subject: [PATCH 0250/1008] MOBILE-3926 core: Simplify swipe implementation

---
 .../badges/classes/user-badges-source.ts      |  4 ++--
 .../pages/issued-badge/issued-badge.page.ts   |  6 +-----
 .../items-management/items-manager-source.ts  |  6 +++---
 .../classes/items-management/items-manager.ts |  6 +++---
 .../items-management/swipe-items-manager.ts   | 21 ++++++++++++++++++-
 .../user/pages/profile/profile.page.ts        |  6 +-----
 6 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/src/addons/badges/classes/user-badges-source.ts b/src/addons/badges/classes/user-badges-source.ts
index ee1b6ed5f..1ece130e0 100644
--- a/src/addons/badges/classes/user-badges-source.ts
+++ b/src/addons/badges/classes/user-badges-source.ts
@@ -33,10 +33,10 @@ export class AddonBadgesUserBadgesSource extends CoreItemsManagerSource<AddonBad
     /**
      * @inheritdoc
      */
-    protected async loadPageItems(): Promise<{ items: AddonBadgesUserBadge[]; hasMoreItems: boolean }> {
+    protected async loadPageItems(): Promise<{ items: AddonBadgesUserBadge[] }> {
         const badges = await AddonBadges.getUserBadges(this.COURSE_ID, this.USER_ID);
 
-        return { items: badges, hasMoreItems: false };
+        return { items: badges };
     }
 
 }
diff --git a/src/addons/badges/pages/issued-badge/issued-badge.page.ts b/src/addons/badges/pages/issued-badge/issued-badge.page.ts
index bd9764a36..f89064f85 100644
--- a/src/addons/badges/pages/issued-badge/issued-badge.page.ts
+++ b/src/addons/badges/pages/issued-badge/issued-badge.page.ts
@@ -143,11 +143,7 @@ class AddonBadgesUserBadgesSwipeManager extends CoreSwipeItemsManager<AddonBadge
     /**
      * @inheritdoc
      */
-    protected getSelectedItemPath(route?: ActivatedRouteSnapshot | null): string | null {
-        if (!route) {
-            return null;
-        }
-
+    protected getSelectedItemPathFromRoute(route: ActivatedRouteSnapshot): string | null {
         return route.params.badgeHash;
     }
 
diff --git a/src/core/classes/items-management/items-manager-source.ts b/src/core/classes/items-management/items-manager-source.ts
index 0a4ae17a2..c794a776f 100644
--- a/src/core/classes/items-management/items-manager-source.ts
+++ b/src/core/classes/items-management/items-manager-source.ts
@@ -127,7 +127,7 @@ export abstract class CoreItemsManagerSource<Item = unknown> {
     async reload(): Promise<void> {
         const { items, hasMoreItems } = await this.loadPageItems(0);
 
-        this.setItems(items, hasMoreItems);
+        this.setItems(items, hasMoreItems ?? false);
     }
 
     /**
@@ -140,7 +140,7 @@ export abstract class CoreItemsManagerSource<Item = unknown> {
 
         const { items, hasMoreItems } = await this.loadPageItems(this.getPagesLoaded());
 
-        this.setItems((this.items ?? []).concat(items), hasMoreItems);
+        this.setItems((this.items ?? []).concat(items), hasMoreItems ?? false);
     }
 
     /**
@@ -149,7 +149,7 @@ export abstract class CoreItemsManagerSource<Item = unknown> {
      * @param page Page number (starting at 0).
      * @return Page items data.
      */
-    protected abstract loadPageItems(page: number): Promise<{ items: Item[]; hasMoreItems: boolean }>;
+    protected abstract loadPageItems(page: number): Promise<{ items: Item[]; hasMoreItems?: boolean }>;
 
     /**
      * Get the length of each page in the collection.
diff --git a/src/core/classes/items-management/items-manager.ts b/src/core/classes/items-management/items-manager.ts
index ebab07bc7..edc277469 100644
--- a/src/core/classes/items-management/items-manager.ts
+++ b/src/core/classes/items-management/items-manager.ts
@@ -101,10 +101,10 @@ export abstract class CoreItemsManager<Item = unknown, Source extends CoreItemsM
     protected abstract getItemPath(item: Item): string;
 
     /**
-     * Get the path of the selected item given the current route.
+     * Get the path of the selected item.
      *
-     * @param route Page route.
-     * @return Path of the selected item in the given route.
+     * @param route Page route, if any.
+     * @return Path of the selected item.
      */
     protected abstract getSelectedItemPath(route?: ActivatedRouteSnapshot | null): string | null;
 
diff --git a/src/core/classes/items-management/swipe-items-manager.ts b/src/core/classes/items-management/swipe-items-manager.ts
index c18c3398d..b15e59870 100644
--- a/src/core/classes/items-management/swipe-items-manager.ts
+++ b/src/core/classes/items-management/swipe-items-manager.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, ActivatedRouteSnapshot } from '@angular/router';
 
 import { CoreNavigator } from '@services/navigator';
 
@@ -49,6 +49,14 @@ export abstract class CoreSwipeItemsManager<
         await this.navigateToItemBy(1, 'forward');
     }
 
+    /**
+     * Get the path of the selected item given the current route.
+     *
+     * @param route Page route.
+     * @return Path of the selected item in the given route.
+     */
+    protected abstract getSelectedItemPathFromRoute(route: ActivatedRouteSnapshot): string | null;
+
     /**
      * @inheritdoc
      */
@@ -56,6 +64,17 @@ export abstract class CoreSwipeItemsManager<
         return CoreNavigator.getCurrentRoute();
     }
 
+    /**
+     * @inheritdoc
+     */
+    protected getSelectedItemPath(route?: ActivatedRouteSnapshot | null): string | null {
+        if (!route) {
+            return null;
+        }
+
+        return this.getSelectedItemPathFromRoute(route);
+    }
+
     /**
      * Navigate to an item by an offset.
      *
diff --git a/src/core/features/user/pages/profile/profile.page.ts b/src/core/features/user/pages/profile/profile.page.ts
index 054ee18bc..c9b2622c2 100644
--- a/src/core/features/user/pages/profile/profile.page.ts
+++ b/src/core/features/user/pages/profile/profile.page.ts
@@ -254,11 +254,7 @@ class CoreUserSwipeItemsManager extends CoreSwipeItemsManager<CoreUserBasicData>
     /**
      * @inheritdoc
      */
-    protected getSelectedItemPath(route?: ActivatedRouteSnapshot | null): string | null {
-        if (!route) {
-            return null;
-        }
-
+    protected getSelectedItemPathFromRoute(route: ActivatedRouteSnapshot): string | null {
         return route.params.userId;
     }
 

From f45f984d8ea63cebbe3ec0921f8680d4b7451b41 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Mon, 22 Nov 2021 15:08:31 +0100
Subject: [PATCH 0251/1008] MOBILE-3926 assign: Submissions swipe navigation

---
 .../mod/assign/classes/submissions-source.ts  | 238 +++++++++++++
 .../submission-list/submission-list.html      |   6 +-
 .../submission-list/submission-list.page.ts   | 317 +++++-------------
 .../submission-review/submission-review.html  |  18 +-
 .../submission-review/submission-review.ts    |  67 +++-
 .../items-management/items-manager-source.ts  |   8 +-
 .../items-management/list-items-manager.ts    |  28 +-
 src/core/services/navigator.ts                |   2 +-
 8 files changed, 424 insertions(+), 260 deletions(-)
 create mode 100644 src/addons/mod/assign/classes/submissions-source.ts

diff --git a/src/addons/mod/assign/classes/submissions-source.ts b/src/addons/mod/assign/classes/submissions-source.ts
new file mode 100644
index 000000000..f9a21f280
--- /dev/null
+++ b/src/addons/mod/assign/classes/submissions-source.ts
@@ -0,0 +1,238 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreItemsManagerSource } from '@classes/items-management/items-manager-source';
+import { CoreGroupInfo, CoreGroups } from '@services/groups';
+import { CoreSites } from '@services/sites';
+import { CoreUtils } from '@services/utils/utils';
+import { Translate } from '@singletons';
+import { CoreEvents } from '@singletons/events';
+import {
+    AddonModAssign,
+    AddonModAssignAssign,
+    AddonModAssignGrade,
+    AddonModAssignProvider,
+    AddonModAssignSubmission,
+} from '../services/assign';
+import { AddonModAssignHelper, AddonModAssignSubmissionFormatted } from '../services/assign-helper';
+import { AddonModAssignOffline } from '../services/assign-offline';
+import { AddonModAssignSync, AddonModAssignSyncProvider } from '../services/assign-sync';
+
+/**
+ * Provides a collection of assignment submissions.
+ */
+export class AddonModAssignSubmissionsSource extends CoreItemsManagerSource<AddonModAssignSubmissionForList> {
+
+    /**
+     * @inheritdoc
+     */
+    static getSourceId(courseId: number, moduleId: number, selectedStatus?: string): string {
+        selectedStatus = selectedStatus ?? '__empty__';
+
+        return `submissions-${courseId}-${moduleId}-${selectedStatus}`;
+    }
+
+    readonly COURSE_ID: number;
+    readonly MODULE_ID: number;
+    readonly SELECTED_STATUS: string | undefined;
+
+    assign?: AddonModAssignAssign;
+    groupId = 0;
+    groupInfo: CoreGroupInfo = {
+        groups: [],
+        separateGroups: false,
+        visibleGroups: false,
+        defaultGroupId: 0,
+    };
+
+    protected submissionsData: { canviewsubmissions: boolean; submissions?: AddonModAssignSubmission[] } = {
+        canviewsubmissions: false,
+    };
+
+    constructor(courseId: number, moduleId: number, selectedStatus?: string) {
+        super();
+
+        this.COURSE_ID = courseId;
+        this.MODULE_ID = moduleId;
+        this.SELECTED_STATUS = selectedStatus;
+    }
+
+    /**
+     * Invalidate assignment cache.
+     */
+    async invalidateCache(): Promise<void> {
+        await Promise.all([
+            AddonModAssign.invalidateAssignmentData(this.COURSE_ID),
+            this.assign && AddonModAssign.invalidateAllSubmissionData(this.assign.id),
+            this.assign && AddonModAssign.invalidateAssignmentUserMappingsData(this.assign.id),
+            this.assign && AddonModAssign.invalidateAssignmentGradesData(this.assign.id),
+            this.assign && AddonModAssign.invalidateListParticipantsData(this.assign.id),
+        ]);
+    }
+
+    /**
+     * Load assignment.
+     */
+    async loadAssignment(sync: boolean = false): Promise<void> {
+        // Get assignment data.
+        this.assign = await AddonModAssign.getAssignment(this.COURSE_ID, this.MODULE_ID);
+
+        if (sync) {
+            try {
+                // Try to synchronize data.
+                const result = await AddonModAssignSync.syncAssign(this.assign.id);
+
+                if (result && result.updated) {
+                    CoreEvents.trigger(
+                        AddonModAssignSyncProvider.MANUAL_SYNCED,
+                        {
+                            assignId: this.assign.id,
+                            warnings: result.warnings,
+                            gradesBlocked: result.gradesBlocked,
+                            context: 'submission-list',
+                        },
+                        CoreSites.getCurrentSiteId(),
+                    );
+                }
+            } catch (error) {
+                // Ignore errors, probably user is offline or sync is blocked.
+            }
+        }
+
+        // Get assignment submissions.
+        this.submissionsData = await AddonModAssign.getSubmissions(this.assign.id, { cmId: this.assign.cmid });
+
+        if (!this.submissionsData.canviewsubmissions) {
+            // User shouldn't be able to reach here.
+            throw new Error('Cannot view submissions.');
+        }
+
+        // Check if groupmode is enabled to avoid showing wrong numbers.
+        this.groupInfo = await CoreGroups.getActivityGroupInfo(this.assign.cmid, false);
+
+        this.groupId = CoreGroups.validateGroupId(this.groupId, this.groupInfo);
+
+        await this.reload();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected async loadPageItems(): Promise<{ items: AddonModAssignSubmissionForList[] }> {
+        const assign = this.assign;
+
+        if (!assign) {
+            throw new Error('Can\'t load submissions without assignment');
+        }
+
+        // Fetch submissions and grades.
+        const submissions =
+            await AddonModAssignHelper.getSubmissionsUserData(
+                assign,
+                this.submissionsData.submissions,
+                this.groupId,
+            );
+        // Get assignment grades only if workflow is not enabled to check grading date.
+        const grades = !assign.markingworkflow
+            ? await AddonModAssign.getAssignmentGrades(assign.id, { cmId: assign.cmid })
+            : [];
+
+        // Filter the submissions to get only the ones with the right status and add some extra data.
+        const getNeedGrading = this.SELECTED_STATUS == AddonModAssignProvider.NEED_GRADING;
+        const searchStatus = getNeedGrading ? AddonModAssignProvider.SUBMISSION_STATUS_SUBMITTED : this.SELECTED_STATUS;
+
+        const promises: Promise<void>[] = [];
+        const showSubmissions: AddonModAssignSubmissionForList[] = [];
+
+        submissions.forEach((submission: AddonModAssignSubmissionForList) => {
+            if (!searchStatus || searchStatus == submission.status) {
+                promises.push(
+                    CoreUtils.ignoreErrors(
+                        AddonModAssignOffline.getSubmissionGrade(assign.id, submission.userid),
+                    ).then(async (data) => {
+                        if (getNeedGrading) {
+                            // Only show the submissions that need to be graded.
+                            const add = await AddonModAssign.needsSubmissionToBeGraded(submission, assign.id);
+
+                            if (!add) {
+                                return;
+                            }
+                        }
+
+                        // Load offline grades.
+                        const notSynced = !!data && submission.timemodified < data.timemodified;
+
+                        if (submission.gradingstatus == 'graded' && !assign.markingworkflow) {
+                            // Get the last grade of the submission.
+                            const grade = grades
+                                .filter((grade) => grade.userid == submission.userid)
+                                .reduce(
+                                    (a, b) => (a && a.timemodified > b.timemodified ? a : b),
+                                    <AddonModAssignGrade | undefined> undefined,
+                                );
+
+                            if (grade && grade.timemodified < submission.timemodified) {
+                                submission.gradingstatus = AddonModAssignProvider.GRADED_FOLLOWUP_SUBMIT;
+                            }
+                        }
+                        submission.statusColor = AddonModAssign.getSubmissionStatusColor(submission.status);
+                        submission.gradingColor = AddonModAssign.getSubmissionGradingStatusColor(
+                            submission.gradingstatus,
+                        );
+
+                        // Show submission status if not submitted for grading.
+                        if (submission.statusColor != 'success' || !submission.gradingstatus) {
+                            submission.statusTranslated = Translate.instant(
+                                'addon.mod_assign.submissionstatus_' + submission.status,
+                            );
+                        } else {
+                            submission.statusTranslated = '';
+                        }
+
+                        if (notSynced) {
+                            submission.gradingStatusTranslationId = 'addon.mod_assign.gradenotsynced';
+                            submission.gradingColor = '';
+                        } else if (submission.statusColor != 'danger' || submission.gradingColor != 'danger') {
+                            // Show grading status if one of the statuses is not done.
+                            submission.gradingStatusTranslationId = AddonModAssign.getSubmissionGradingStatusTranslationId(
+                                submission.gradingstatus,
+                            );
+                        } else {
+                            submission.gradingStatusTranslationId = '';
+                        }
+
+                        showSubmissions.push(submission);
+
+                        return;
+                    }),
+                );
+            }
+        });
+
+        await Promise.all(promises);
+
+        return { items: showSubmissions };
+    }
+
+}
+
+/**
+ * Calculated data for an assign submission.
+ */
+export type AddonModAssignSubmissionForList = AddonModAssignSubmissionFormatted & {
+    statusColor?: string; // Calculated in the app. Color of the submission status.
+    gradingColor?: string; // Calculated in the app. Color of the submission grading status.
+    statusTranslated?: string; // Calculated in the app. Translated text of the submission status.
+    gradingStatusTranslationId?: string; // Calculated in the app. Key of the text of the submission grading status.
+};
diff --git a/src/addons/mod/assign/pages/submission-list/submission-list.html b/src/addons/mod/assign/pages/submission-list/submission-list.html
index 3d9cb57a0..0a6635371 100644
--- a/src/addons/mod/assign/pages/submission-list/submission-list.html
+++ b/src/addons/mod/assign/pages/submission-list/submission-list.html
@@ -16,10 +16,10 @@
 
 <ion-content>
     <core-split-view>
-        <ion-refresher slot="fixed" [disabled]="!loaded || !submissions.loaded" (ionRefresh)="refreshList($event.target)">
+        <ion-refresher slot="fixed" [disabled]="!submissions.loaded" (ionRefresh)="refreshList($event.target)">
             <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
         </ion-refresher>
-        <core-loading [hideUntil]="loaded && submissions.loaded">
+        <core-loading [hideUntil]="submissions.loaded">
             <core-empty-box *ngIf="!submissions || submissions.empty" icon="fas-file-signature"
                 [message]="'addon.mod_assign.submissionstatus_' | translate">
             </core-empty-box>
@@ -32,7 +32,7 @@
                     <ion-label id="addon-assign-groupslabel" *ngIf="groupInfo.visibleGroups">
                         {{ 'core.groupsvisible' | translate }}
                     </ion-label>
-                    <ion-select [(ngModel)]="groupId" (ionChange)="setGroup(groupId)" aria-labelledby="addon-assign-groupslabel"
+                    <ion-select [(ngModel)]="groupId" (ionChange)="reloadSubmissions()" aria-labelledby="addon-assign-groupslabel"
                         interface="action-sheet" slot="end" [interfaceOptions]="{header: 'core.group' | translate}">
                         <ion-select-option *ngFor="let groupOpt of groupInfo.groups" [value]="groupOpt.id">
                             {{groupOpt.name}}
diff --git a/src/addons/mod/assign/pages/submission-list/submission-list.page.ts b/src/addons/mod/assign/pages/submission-list/submission-list.page.ts
index 90f02a382..0803f1e86 100644
--- a/src/addons/mod/assign/pages/submission-list/submission-list.page.ts
+++ b/src/addons/mod/assign/pages/submission-list/submission-list.page.ts
@@ -14,28 +14,20 @@
 
 import { Component, OnDestroy, AfterViewInit, ViewChild } from '@angular/core';
 import { Params } from '@angular/router';
-import { CorePageItemsListManager } from '@classes/page-items-list-manager';
+import { CoreItemsManagerSourcesTracker } from '@classes/items-management/items-manager-sources-tracker';
+import { CoreListItemsManager } from '@classes/items-management/list-items-manager';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import { IonRefresher } from '@ionic/angular';
-import { CoreGroupInfo, CoreGroups } from '@services/groups';
+import { CoreGroupInfo } from '@services/groups';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
-import { CoreUtils } from '@services/utils/utils';
 import { Translate } from '@singletons';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
-import {
-    AddonModAssignAssign,
-    AddonModAssignSubmission,
-    AddonModAssignProvider,
-    AddonModAssign,
-    AddonModAssignGrade,
-} from '../../services/assign';
-import { AddonModAssignHelper, AddonModAssignSubmissionFormatted } from '../../services/assign-helper';
-import { AddonModAssignOffline } from '../../services/assign-offline';
+import { AddonModAssignSubmissionForList, AddonModAssignSubmissionsSource } from '../../classes/submissions-source';
+import { AddonModAssignAssign, AddonModAssignProvider } from '../../services/assign';
 import {
     AddonModAssignSyncProvider,
-    AddonModAssignSync,
     AddonModAssignManualSyncData,
     AddonModAssignAutoSyncData,
 } from '../../services/assign-sync';
@@ -51,47 +43,26 @@ export class AddonModAssignSubmissionListPage implements AfterViewInit, OnDestro
 
     @ViewChild(CoreSplitViewComponent) splitView!: CoreSplitViewComponent;
 
-    title = ''; // Title to display.
-    assign?: AddonModAssignAssign; // Assignment.
-    submissions: AddonModAssignSubmissionListManager; // List of submissions
-    loaded = false; // Whether data has been loaded.
-    groupId = 0; // Group ID to show.
-    courseId!: number; // Course ID the assignment belongs to.
-    moduleId!: number; // Module ID the submission belongs to.
+    title = '';
+    submissions!: AddonModAssignSubmissionListManager; // List of submissions
 
-    groupInfo: CoreGroupInfo = {
-        groups: [],
-        separateGroups: false,
-        visibleGroups: false,
-        defaultGroupId: 0,
-    };
-
-    protected selectedStatus?: string; // The status to see.
     protected gradedObserver: CoreEventObserver; // Observer to refresh data when a grade changes.
     protected syncObserver: CoreEventObserver; // Observer to refresh data when the async is synchronized.
-    protected submissionsData: { canviewsubmissions: boolean; submissions?: AddonModAssignSubmission[] } = {
-        canviewsubmissions: false,
-    };
+    protected sourceUnsubscribe?: () => void;
 
     constructor() {
-        this.submissions = new AddonModAssignSubmissionListManager(AddonModAssignSubmissionListPage);
-
         // Update data if some grade changes.
         this.gradedObserver = CoreEvents.on(
             AddonModAssignProvider.GRADED_EVENT,
             (data) => {
                 if (
-                    this.loaded &&
-                    this.assign &&
-                    data.assignmentId == this.assign.id &&
+                    this.submissions.loaded &&
+                    this.submissions.getSource().assign &&
+                    data.assignmentId == this.submissions.getSource().assign?.id &&
                     data.userId == CoreSites.getCurrentSiteUserId()
                 ) {
                     // Grade changed, refresh the data.
-                    this.loaded = false;
-
-                    this.refreshAllData(true).finally(() => {
-                        this.loaded = true;
-                    });
+                    this.refreshAllData(true);
                 }
             },
             CoreSites.getCurrentSiteId(),
@@ -102,29 +73,36 @@ export class AddonModAssignSubmissionListPage implements AfterViewInit, OnDestro
         this.syncObserver = CoreEvents.onMultiple<AddonModAssignAutoSyncData | AddonModAssignManualSyncData>(
             events,
             (data) => {
-                if (!this.loaded || ('context' in data && data.context == 'submission-list')) {
+                if (!this.submissions.loaded || ('context' in data && data.context == 'submission-list')) {
                     return;
                 }
 
-                this.loaded = false;
-
-                this.refreshAllData(false).finally(() => {
-                    this.loaded = true;
-                });
+                this.refreshAllData(false);
             },
             CoreSites.getCurrentSiteId(),
         );
-    }
 
-    /**
-     * Component being initialized.
-     */
-    ngAfterViewInit(): void {
         try {
-            this.moduleId = CoreNavigator.getRequiredRouteNumberParam('cmId');
-            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
-            this.groupId = CoreNavigator.getRouteNumberParam('groupId') || 0;
-            this.selectedStatus = CoreNavigator.getRouteParam('status');
+            const moduleId = CoreNavigator.getRequiredRouteNumberParam('cmId');
+            const courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            const groupId = CoreNavigator.getRouteNumberParam('groupId') || 0;
+            const selectedStatus = CoreNavigator.getRouteParam('status');
+            const submissionsSource = CoreItemsManagerSourcesTracker.getOrCreateSource(
+                AddonModAssignSubmissionsSource,
+                [courseId, moduleId, selectedStatus],
+            );
+
+            submissionsSource.groupId = groupId;
+            this.sourceUnsubscribe = submissionsSource.addListener({
+                onItemsUpdated: () => {
+                    this.title = this.submissions.getSource().assign?.name || this.title;
+                },
+            });
+
+            this.submissions = new AddonModAssignSubmissionListManager(
+                submissionsSource,
+                AddonModAssignSubmissionListPage,
+            );
         } catch (error) {
             CoreDomUtils.showErrorModal(error);
 
@@ -132,18 +110,48 @@ export class AddonModAssignSubmissionListPage implements AfterViewInit, OnDestro
 
             return;
         }
+    }
+
+    get assign(): AddonModAssignAssign | undefined {
+        return this.submissions.getSource().assign;
+    }
+
+    get groupInfo(): CoreGroupInfo {
+        return this.submissions.getSource().groupInfo;
+    }
+
+    get moduleId(): number {
+        return this.submissions.getSource().MODULE_ID;
+    }
+
+    get courseId(): number {
+        return this.submissions.getSource().COURSE_ID;
+    }
+
+    get groupId(): number {
+        return this.submissions.getSource().groupId;
+    }
+
+    set groupId(value: number) {
+        this.submissions.getSource().groupId = value;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    ngAfterViewInit(): void {
+        const selectedStatus = this.submissions.getSource().SELECTED_STATUS;
+        this.title = Translate.instant(
+            selectedStatus
+                ? (
+                    selectedStatus === AddonModAssignProvider.NEED_GRADING
+                        ? 'addon.mod_assign.numberofsubmissionsneedgrading'
+                        : `addon.mod_assign.submissionstatus_${selectedStatus}`
+                )
+                : 'addon.mod_assign.numberofparticipants',
+        );
 
-        if (this.selectedStatus) {
-            if (this.selectedStatus == AddonModAssignProvider.NEED_GRADING) {
-                this.title = Translate.instant('addon.mod_assign.numberofsubmissionsneedgrading');
-            } else {
-                this.title = Translate.instant('addon.mod_assign.submissionstatus_' + this.selectedStatus);
-            }
-        } else {
-            this.title = Translate.instant('addon.mod_assign.numberofparticipants');
-        }
         this.fetchAssignment(true).finally(() => {
-            this.loaded = true;
             this.submissions.start(this.splitView);
         });
     }
@@ -156,148 +164,12 @@ export class AddonModAssignSubmissionListPage implements AfterViewInit, OnDestro
      */
     protected async fetchAssignment(sync = false): Promise<void> {
         try {
-            // Get assignment data.
-            this.assign = await AddonModAssign.getAssignment(this.courseId, this.moduleId);
-
-            this.title = this.assign.name || this.title;
-
-            if (sync) {
-                try {
-                    // Try to synchronize data.
-                    const result = await AddonModAssignSync.syncAssign(this.assign.id);
-
-                    if (result && result.updated) {
-                        CoreEvents.trigger(
-                            AddonModAssignSyncProvider.MANUAL_SYNCED,
-                            {
-                                assignId: this.assign.id,
-                                warnings: result.warnings,
-                                gradesBlocked: result.gradesBlocked,
-                                context: 'submission-list',
-                            },
-                            CoreSites.getCurrentSiteId(),
-                        );
-                    }
-                } catch (error) {
-                    // Ignore errors, probably user is offline or sync is blocked.
-                }
-            }
-
-            // Get assignment submissions.
-            this.submissionsData = await AddonModAssign.getSubmissions(this.assign.id, { cmId: this.assign.cmid });
-
-            if (!this.submissionsData.canviewsubmissions) {
-                // User shouldn't be able to reach here.
-                throw new Error('Cannot view submissions.');
-            }
-
-            // Check if groupmode is enabled to avoid showing wrong numbers.
-            this.groupInfo = await CoreGroups.getActivityGroupInfo(this.assign.cmid, false);
-
-            await this.setGroup(CoreGroups.validateGroupId(this.groupId, this.groupInfo));
+            await this.submissions.getSource().loadAssignment(sync);
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'Error getting assigment data.');
         }
     }
 
-    /**
-     * Set group to see the summary.
-     *
-     * @param groupId Group ID.
-     * @return Resolved when done.
-     */
-    async setGroup(groupId: number): Promise<void> {
-        this.groupId = groupId;
-
-        // Fetch submissions and grades.
-        const submissions =
-            await AddonModAssignHelper.getSubmissionsUserData(
-                this.assign!,
-                this.submissionsData.submissions,
-                this.groupId,
-            );
-        // Get assignment grades only if workflow is not enabled to check grading date.
-        const grades = !this.assign!.markingworkflow
-            ? await AddonModAssign.getAssignmentGrades(this.assign!.id, { cmId: this.assign!.cmid })
-            : [];
-
-        // Filter the submissions to get only the ones with the right status and add some extra data.
-        const getNeedGrading = this.selectedStatus == AddonModAssignProvider.NEED_GRADING;
-        const searchStatus = getNeedGrading ? AddonModAssignProvider.SUBMISSION_STATUS_SUBMITTED : this.selectedStatus;
-
-        const promises: Promise<void>[] = [];
-        const showSubmissions: AddonModAssignSubmissionForList[] = [];
-
-        submissions.forEach((submission: AddonModAssignSubmissionForList) => {
-            if (!searchStatus || searchStatus == submission.status) {
-                promises.push(
-                    CoreUtils.ignoreErrors(
-                        AddonModAssignOffline.getSubmissionGrade(this.assign!.id, submission.userid),
-                    ).then(async (data) => {
-                        if (getNeedGrading) {
-                            // Only show the submissions that need to be graded.
-                            const add = await AddonModAssign.needsSubmissionToBeGraded(submission, this.assign!.id);
-
-                            if (!add) {
-                                return;
-                            }
-                        }
-
-                        // Load offline grades.
-                        const notSynced = !!data && submission.timemodified < data.timemodified;
-
-                        if (submission.gradingstatus == 'graded' && !this.assign!.markingworkflow) {
-                            // Get the last grade of the submission.
-                            const grade = grades
-                                .filter((grade) => grade.userid == submission.userid)
-                                .reduce(
-                                    (a, b) => (a && a.timemodified > b.timemodified ? a : b),
-                                    <AddonModAssignGrade | undefined> undefined,
-                                );
-
-                            if (grade && grade.timemodified < submission.timemodified) {
-                                submission.gradingstatus = AddonModAssignProvider.GRADED_FOLLOWUP_SUBMIT;
-                            }
-                        }
-                        submission.statusColor = AddonModAssign.getSubmissionStatusColor(submission.status);
-                        submission.gradingColor = AddonModAssign.getSubmissionGradingStatusColor(
-                            submission.gradingstatus,
-                        );
-
-                        // Show submission status if not submitted for grading.
-                        if (submission.statusColor != 'success' || !submission.gradingstatus) {
-                            submission.statusTranslated = Translate.instant(
-                                'addon.mod_assign.submissionstatus_' + submission.status,
-                            );
-                        } else {
-                            submission.statusTranslated = '';
-                        }
-
-                        if (notSynced) {
-                            submission.gradingStatusTranslationId = 'addon.mod_assign.gradenotsynced';
-                            submission.gradingColor = '';
-                        } else if (submission.statusColor != 'danger' || submission.gradingColor != 'danger') {
-                            // Show grading status if one of the statuses is not done.
-                            submission.gradingStatusTranslationId = AddonModAssign.getSubmissionGradingStatusTranslationId(
-                                submission.gradingstatus,
-                            );
-                        } else {
-                            submission.gradingStatusTranslationId = '';
-                        }
-
-                        showSubmissions.push(submission);
-
-                        return;
-                    }),
-                );
-            }
-        });
-
-        await Promise.all(promises);
-
-        this.submissions.setItems(showSubmissions);
-    }
-
     /**
      * Refresh all the data.
      *
@@ -305,18 +177,8 @@ export class AddonModAssignSubmissionListPage implements AfterViewInit, OnDestro
      * @return Promise resolved when done.
      */
     protected async refreshAllData(sync?: boolean): Promise<void> {
-        const promises: Promise<void>[] = [];
-
-        promises.push(AddonModAssign.invalidateAssignmentData(this.courseId));
-        if (this.assign) {
-            promises.push(AddonModAssign.invalidateAllSubmissionData(this.assign.id));
-            promises.push(AddonModAssign.invalidateAssignmentUserMappingsData(this.assign.id));
-            promises.push(AddonModAssign.invalidateAssignmentGradesData(this.assign.id));
-            promises.push(AddonModAssign.invalidateListParticipantsData(this.assign.id));
-        }
-
         try {
-            await Promise.all(promises);
+            await this.submissions.getSource().invalidateCache();
         } finally {
             this.fetchAssignment(sync);
         }
@@ -333,6 +195,13 @@ export class AddonModAssignSubmissionListPage implements AfterViewInit, OnDestro
         });
     }
 
+    /**
+     * Reload submissions list.
+     */
+    async reloadSubmissions(): Promise<void> {
+        await this.submissions.reload();
+    }
+
     /**
      * Component being destroyed.
      */
@@ -340,6 +209,7 @@ export class AddonModAssignSubmissionListPage implements AfterViewInit, OnDestro
         this.gradedObserver?.off();
         this.syncObserver?.off();
         this.submissions.destroy();
+        this.sourceUnsubscribe && this.sourceUnsubscribe();
     }
 
 }
@@ -347,11 +217,8 @@ export class AddonModAssignSubmissionListPage implements AfterViewInit, OnDestro
 /**
  * Helper class to manage submissions.
  */
-class AddonModAssignSubmissionListManager extends CorePageItemsListManager<AddonModAssignSubmissionForList> {
-
-    constructor(pageComponent: unknown) {
-        super(pageComponent);
-    }
+class AddonModAssignSubmissionListManager
+    extends CoreListItemsManager<AddonModAssignSubmissionForList, AddonModAssignSubmissionsSource> {
 
     /**
      * @inheritdoc
@@ -366,17 +233,9 @@ class AddonModAssignSubmissionListManager extends CorePageItemsListManager<Addon
     protected getItemQueryParams(submission: AddonModAssignSubmissionForList): Params {
         return {
             blindId: submission.blindid,
+            groupId: this.getSource().groupId,
+            selectedStatus: this.getSource().SELECTED_STATUS,
         };
     }
 
 }
-
-/**
- * Calculated data for an assign submission.
- */
-type AddonModAssignSubmissionForList = AddonModAssignSubmissionFormatted & {
-    statusColor?: string; // Calculated in the app. Color of the submission status.
-    gradingColor?: string; // Calculated in the app. Color of the submission grading status.
-    statusTranslated?: string; // Calculated in the app. Translated text of the submission status.
-    gradingStatusTranslationId?: string; // Calculated in the app. Key of the text of the submission grading status.
-};
diff --git a/src/addons/mod/assign/pages/submission-review/submission-review.html b/src/addons/mod/assign/pages/submission-review/submission-review.html
index 227dfca1d..3655e0816 100644
--- a/src/addons/mod/assign/pages/submission-review/submission-review.html
+++ b/src/addons/mod/assign/pages/submission-review/submission-review.html
@@ -20,12 +20,14 @@
     </core-navbar-buttons>
 </ion-header>
 <ion-content>
-
-    <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="refreshSubmission($event.target)">
-        <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
-    </ion-refresher>
-    <core-loading [hideUntil]="loaded">
-        <addon-mod-assign-submission [courseId]="courseId" [moduleId]="moduleId" [submitId]="submitId" [blindId]="blindId">
-        </addon-mod-assign-submission>
-    </core-loading>
+    <core-swipe-navigation [manager]="submissions">
+        <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="refreshSubmission($event.target)">
+            <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
+        </ion-refresher>
+        <core-loading [hideUntil]="loaded">
+            <addon-mod-assign-submission *ngIf="loaded"
+                [courseId]="courseId" [moduleId]="moduleId" [submitId]="submitId" [blindId]="blindId">
+            </addon-mod-assign-submission>
+        </core-loading>
+    </core-swipe-navigation>
 </ion-content>
diff --git a/src/addons/mod/assign/pages/submission-review/submission-review.ts b/src/addons/mod/assign/pages/submission-review/submission-review.ts
index 803074c9f..02a3e4e3b 100644
--- a/src/addons/mod/assign/pages/submission-review/submission-review.ts
+++ b/src/addons/mod/assign/pages/submission-review/submission-review.ts
@@ -12,14 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
+import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute, ActivatedRouteSnapshot, Params } from '@angular/router';
+import { CoreItemsManagerSourcesTracker } from '@classes/items-management/items-manager-sources-tracker';
+import { CoreSwipeItemsManager } from '@classes/items-management/swipe-items-manager';
 import { CoreCourse } from '@features/course/services/course';
 import { CanLeave } from '@guards/can-leave';
 import { IonRefresher } from '@ionic/angular';
 import { CoreNavigator } from '@services/navigator';
 import { CoreScreen } from '@services/screen';
 import { CoreDomUtils } from '@services/utils/dom';
+import { AddonModAssignSubmissionForList, AddonModAssignSubmissionsSource } from '../../classes/submissions-source';
 import { AddonModAssignSubmissionComponent } from '../../components/submission/submission';
 import { AddonModAssign, AddonModAssignAssign } from '../../services/assign';
 
@@ -30,11 +33,12 @@ import { AddonModAssign, AddonModAssignAssign } from '../../services/assign';
     selector: 'page-addon-mod-assign-submission-review',
     templateUrl: 'submission-review.html',
 })
-export class AddonModAssignSubmissionReviewPage implements OnInit, CanLeave {
+export class AddonModAssignSubmissionReviewPage implements OnInit, OnDestroy, CanLeave {
 
     @ViewChild(AddonModAssignSubmissionComponent) submissionComponent?: AddonModAssignSubmissionComponent;
 
     title = ''; // Title to display.
+    submissions?: AddonModAssignSubmissionSwipeItemsManager;
     moduleId!: number; // Module ID the submission belongs to.
     courseId!: number; // Course ID the assignment belongs to.
     submitId!: number; // User that did the submission.
@@ -46,9 +50,7 @@ export class AddonModAssignSubmissionReviewPage implements OnInit, CanLeave {
     protected blindMarking = false; // Whether it uses blind marking.
     protected forceLeave = false; // To allow leaving the page without checking for changes.
 
-    constructor(
-        protected route: ActivatedRoute,
-    ) { }
+    constructor(protected route: ActivatedRoute) { }
 
     /**
      * Component being initialized.
@@ -60,6 +62,19 @@ export class AddonModAssignSubmissionReviewPage implements OnInit, CanLeave {
                 this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
                 this.submitId = CoreNavigator.getRouteNumberParam('submitId') || 0;
                 this.blindId = CoreNavigator.getRouteNumberParam('blindId', { params });
+                const groupId = CoreNavigator.getRequiredRouteNumberParam('groupId');
+                const selectedStatus = CoreNavigator.getRouteParam('selectedStatus');
+                const submissionsSource = CoreItemsManagerSourcesTracker.getOrCreateSource(
+                    AddonModAssignSubmissionsSource,
+                    [this.courseId, this.moduleId, selectedStatus],
+                );
+
+                this.submissions?.destroy();
+
+                submissionsSource.groupId = groupId;
+                this.submissions = new AddonModAssignSubmissionSwipeItemsManager(submissionsSource);
+
+                this.submissions.start();
             } catch (error) {
                 CoreDomUtils.showErrorModal(error);
 
@@ -74,6 +89,13 @@ export class AddonModAssignSubmissionReviewPage implements OnInit, CanLeave {
         });
     }
 
+    /**
+     * @inheritdoc
+     */
+    ngOnDestroy(): void {
+        this.submissions?.destroy();
+    }
+
     /**
      * Check if we can leave the page or not.
      *
@@ -190,3 +212,36 @@ export class AddonModAssignSubmissionReviewPage implements OnInit, CanLeave {
     }
 
 }
+
+/**
+ * Helper to manage swiping within a collection of submissions.
+ */
+class AddonModAssignSubmissionSwipeItemsManager
+    extends CoreSwipeItemsManager<AddonModAssignSubmissionForList, AddonModAssignSubmissionsSource> {
+
+    /**
+     * @inheritdoc
+     */
+    protected getItemPath(submission: AddonModAssignSubmissionForList): string {
+        return String(submission.submitid);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected getItemQueryParams(submission: AddonModAssignSubmissionForList): Params {
+        return {
+            blindId: submission.blindid,
+            groupId: this.getSource().groupId,
+            selectedStatus: this.getSource().SELECTED_STATUS,
+        };
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected getSelectedItemPathFromRoute(route: ActivatedRouteSnapshot): string | null {
+        return route.params.submitId;
+    }
+
+}
diff --git a/src/core/classes/items-management/items-manager-source.ts b/src/core/classes/items-management/items-manager-source.ts
index c794a776f..68baccf70 100644
--- a/src/core/classes/items-management/items-manager-source.ts
+++ b/src/core/classes/items-management/items-manager-source.ts
@@ -16,8 +16,8 @@
  * Updates listener.
  */
 export interface CoreItemsListSourceListener<Item> {
-    onItemsUpdated(items: Item[], hasMoreItems: boolean): void;
-    onReset(): void;
+    onItemsUpdated?(items: Item[], hasMoreItems: boolean): void;
+    onReset?(): void;
 }
 
 /**
@@ -91,7 +91,7 @@ export abstract class CoreItemsManagerSource<Item = unknown> {
         this.items = null;
         this.hasMoreItems = true;
 
-        this.listeners.forEach(listener => listener.onReset());
+        this.listeners.forEach(listener => listener.onReset?.call(listener));
     }
 
     /**
@@ -170,7 +170,7 @@ export abstract class CoreItemsManagerSource<Item = unknown> {
         this.items = items;
         this.hasMoreItems = hasMoreItems;
 
-        this.listeners.forEach(listener => listener.onItemsUpdated(items, hasMoreItems));
+        this.listeners.forEach(listener => listener.onItemsUpdated?.call(listener, items, hasMoreItems));
     }
 
 }
diff --git a/src/core/classes/items-management/list-items-manager.ts b/src/core/classes/items-management/list-items-manager.ts
index cfb7f4750..9bbf3fdfc 100644
--- a/src/core/classes/items-management/list-items-manager.ts
+++ b/src/core/classes/items-management/list-items-manager.ts
@@ -70,15 +70,6 @@ export abstract class CoreListItemsManager<
         // Calculate current selected item.
         this.updateSelectedItem();
 
-        // Select default item if none is selected on a non-mobile layout.
-        if (!CoreScreen.isMobile && this.selectedItem === null && !splitView.isNested) {
-            const defaultItem = this.getDefaultItem();
-
-            if (defaultItem) {
-                this.select(defaultItem);
-            }
-        }
-
         // Log activity.
         await CoreUtils.ignoreErrors(this.logActivity());
     }
@@ -175,6 +166,25 @@ export abstract class CoreListItemsManager<
         return !!this.splitView && !this.splitView?.isNested;
     }
 
+    /**
+     * @inheritdoc
+     */
+    protected updateSelectedItem(route: ActivatedRouteSnapshot | null = null): void {
+        super.updateSelectedItem(route);
+
+        if (CoreScreen.isMobile || this.selectedItem !== null || this.splitView?.isNested) {
+            return;
+        }
+
+        const defaultItem = this.getDefaultItem();
+
+        if (!defaultItem) {
+            return;
+        }
+
+        this.select(defaultItem);
+    }
+
     /**
      * Get the item that should be selected by default.
      */
diff --git a/src/core/services/navigator.ts b/src/core/services/navigator.ts
index 5cc058cb8..8d7d02c81 100644
--- a/src/core/services/navigator.ts
+++ b/src/core/services/navigator.ts
@@ -290,7 +290,7 @@ export class CoreNavigatorService {
      * @param routeOptions Optional routeOptions to get the params or route value from. If missing, it will autodetect.
      * @return Value of the parameter, undefined if not found.
      */
-    getRouteParam<T = unknown>(name: string, routeOptions: CoreNavigatorCurrentRouteOptions = {}): T | undefined {
+    getRouteParam<T = string>(name: string, routeOptions: CoreNavigatorCurrentRouteOptions = {}): T | undefined {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         let value: any;
 

From e8d00269951dd3d86a199bf2574b14c0c2a4d268 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 25 Nov 2021 12:42:22 +0100
Subject: [PATCH 0252/1008] MOBILE-3926 core: Move item path getters to source

---
 .../badges/classes/user-badges-source.ts      | 18 +++++++++
 .../pages/issued-badge/issued-badge.page.ts   | 37 ++-----------------
 .../pages/user-badges/user-badges.page.ts     | 29 +--------------
 .../mod/assign/classes/submissions-source.ts  | 19 ++++++++++
 .../submission-list/submission-list.page.ts   | 31 +---------------
 .../submission-review/submission-review.ts    | 25 ++-----------
 .../items-management/items-manager-source.ts  | 21 +++++++++++
 .../classes/items-management/items-manager.ts | 31 +++++++---------
 .../items-management/list-items-manager.ts    |  8 ++--
 .../items-management/swipe-items-manager.ts   | 28 +++++++-------
 .../user/classes/participants-source.ts       | 15 ++++++++
 .../pages/participants/participants.page.ts   | 29 ++-------------
 .../user/pages/profile/profile.page.ts        | 33 ++---------------
 13 files changed, 122 insertions(+), 202 deletions(-)

diff --git a/src/addons/badges/classes/user-badges-source.ts b/src/addons/badges/classes/user-badges-source.ts
index 1ece130e0..ea36a237f 100644
--- a/src/addons/badges/classes/user-badges-source.ts
+++ b/src/addons/badges/classes/user-badges-source.ts
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { Params } from '@angular/router';
 import { CoreItemsManagerSource } from '@classes/items-management/items-manager-source';
 import { AddonBadges, AddonBadgesUserBadge } from '../services/badges';
 
@@ -30,6 +31,23 @@ export class AddonBadgesUserBadgesSource extends CoreItemsManagerSource<AddonBad
         this.USER_ID = userId;
     }
 
+    /**
+     * @inheritdoc
+     */
+    getItemPath(badge: AddonBadgesUserBadge): string {
+        return badge.uniquehash;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    getItemQueryParams(): Params {
+        return {
+            courseId: this.COURSE_ID,
+            userId: this.USER_ID,
+        };
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/src/addons/badges/pages/issued-badge/issued-badge.page.ts b/src/addons/badges/pages/issued-badge/issued-badge.page.ts
index f89064f85..907e04c89 100644
--- a/src/addons/badges/pages/issued-badge/issued-badge.page.ts
+++ b/src/addons/badges/pages/issued-badge/issued-badge.page.ts
@@ -22,7 +22,7 @@ import { AddonBadges, AddonBadgesUserBadge } from '../../services/badges';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreCourses, CoreEnrolledCourseData } from '@features/courses/services/courses';
 import { CoreNavigator } from '@services/navigator';
-import { ActivatedRoute, ActivatedRouteSnapshot, Params } from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
 import { CoreSwipeItemsManager } from '@classes/items-management/swipe-items-manager';
 import { CoreItemsManagerSourcesTracker } from '@classes/items-management/items-manager-sources-tracker';
 import { AddonBadgesUserBadgesSource } from '@addons/badges/classes/user-badges-source';
@@ -43,7 +43,7 @@ export class AddonBadgesIssuedBadgePage implements OnInit {
     user?: CoreUserProfile;
     course?: CoreEnrolledCourseData;
     badge?: AddonBadgesUserBadge;
-    badges?: AddonBadgesUserBadgesSwipeManager;
+    badges?: CoreSwipeItemsManager;
     badgeLoaded = false;
     currentTime = 0;
 
@@ -62,7 +62,7 @@ export class AddonBadgesIssuedBadgePage implements OnInit {
         });
 
         const source = CoreItemsManagerSourcesTracker.getOrCreateSource(AddonBadgesUserBadgesSource, [this.courseId, this.userId]);
-        this.badges = new AddonBadgesUserBadgesSwipeManager(source);
+        this.badges = new CoreSwipeItemsManager(source);
 
         this.badges.start();
     }
@@ -117,34 +117,3 @@ export class AddonBadgesIssuedBadgePage implements OnInit {
     }
 
 }
-
-/**
- * Helper to manage swiping within a collection of user badges.
- */
-class AddonBadgesUserBadgesSwipeManager extends CoreSwipeItemsManager<AddonBadgesUserBadge, AddonBadgesUserBadgesSource> {
-
-    /**
-     * @inheritdoc
-     */
-    protected getItemPath(badge: AddonBadgesUserBadge): string {
-        return String(badge.uniquehash);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected getItemQueryParams(): Params {
-        return {
-            courseId: this.getSource().COURSE_ID,
-            userId: this.getSource().USER_ID,
-        };
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected getSelectedItemPathFromRoute(route: ActivatedRouteSnapshot): string | null {
-        return route.params.badgeHash;
-    }
-
-}
diff --git a/src/addons/badges/pages/user-badges/user-badges.page.ts b/src/addons/badges/pages/user-badges/user-badges.page.ts
index 5900ff36a..e614c3bac 100644
--- a/src/addons/badges/pages/user-badges/user-badges.page.ts
+++ b/src/addons/badges/pages/user-badges/user-badges.page.ts
@@ -19,7 +19,6 @@ import { CoreTimeUtils } from '@services/utils/time';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreSites } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
-import { Params } from '@angular/router';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import { CoreNavigator } from '@services/navigator';
 import { CoreListItemsManager } from '@classes/items-management/list-items-manager';
@@ -36,7 +35,7 @@ import { CoreItemsManagerSourcesTracker } from '@classes/items-management/items-
 export class AddonBadgesUserBadgesPage implements AfterViewInit, OnDestroy {
 
     currentTime = 0;
-    badges: AddonBadgesUserBadgesListManager;
+    badges: CoreListItemsManager<AddonBadgesUserBadge, AddonBadgesUserBadgesSource>;
 
     @ViewChild(CoreSplitViewComponent) splitView!: CoreSplitViewComponent;
 
@@ -49,7 +48,7 @@ export class AddonBadgesUserBadgesPage implements AfterViewInit, OnDestroy {
             courseId = 0;
         }
 
-        this.badges = new AddonBadgesUserBadgesListManager(
+        this.badges = new CoreListItemsManager(
             CoreItemsManagerSourcesTracker.getOrCreateSource(AddonBadgesUserBadgesSource, [courseId, userId]),
             AddonBadgesUserBadgesPage,
         );
@@ -104,27 +103,3 @@ export class AddonBadgesUserBadgesPage implements AfterViewInit, OnDestroy {
     }
 
 }
-
-/**
- * Helper class to manage badges list.
- */
-class AddonBadgesUserBadgesListManager extends CoreListItemsManager<AddonBadgesUserBadge, AddonBadgesUserBadgesSource> {
-
-    /**
-     * @inheritdoc
-     */
-    protected getItemPath(badge: AddonBadgesUserBadge): string {
-        return badge.uniquehash;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected getItemQueryParams(): Params {
-        return {
-            courseId: this.getSource().COURSE_ID,
-            userId: this.getSource().USER_ID,
-        };
-    }
-
-}
diff --git a/src/addons/mod/assign/classes/submissions-source.ts b/src/addons/mod/assign/classes/submissions-source.ts
index f9a21f280..fce121386 100644
--- a/src/addons/mod/assign/classes/submissions-source.ts
+++ b/src/addons/mod/assign/classes/submissions-source.ts
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { Params } from '@angular/router';
 import { CoreItemsManagerSource } from '@classes/items-management/items-manager-source';
 import { CoreGroupInfo, CoreGroups } from '@services/groups';
 import { CoreSites } from '@services/sites';
@@ -68,6 +69,24 @@ export class AddonModAssignSubmissionsSource extends CoreItemsManagerSource<Addo
         this.SELECTED_STATUS = selectedStatus;
     }
 
+    /**
+     * @inheritdoc
+     */
+    getItemPath(submission: AddonModAssignSubmissionForList): string {
+        return String(submission.submitid);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    getItemQueryParams(submission: AddonModAssignSubmissionForList): Params {
+        return {
+            blindId: submission.blindid,
+            groupId: this.groupId,
+            selectedStatus: this.SELECTED_STATUS,
+        };
+    }
+
     /**
      * Invalidate assignment cache.
      */
diff --git a/src/addons/mod/assign/pages/submission-list/submission-list.page.ts b/src/addons/mod/assign/pages/submission-list/submission-list.page.ts
index 0803f1e86..c8cb848f9 100644
--- a/src/addons/mod/assign/pages/submission-list/submission-list.page.ts
+++ b/src/addons/mod/assign/pages/submission-list/submission-list.page.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Component, OnDestroy, AfterViewInit, ViewChild } from '@angular/core';
-import { Params } from '@angular/router';
 import { CoreItemsManagerSourcesTracker } from '@classes/items-management/items-manager-sources-tracker';
 import { CoreListItemsManager } from '@classes/items-management/list-items-manager';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
@@ -44,7 +43,7 @@ export class AddonModAssignSubmissionListPage implements AfterViewInit, OnDestro
     @ViewChild(CoreSplitViewComponent) splitView!: CoreSplitViewComponent;
 
     title = '';
-    submissions!: AddonModAssignSubmissionListManager; // List of submissions
+    submissions!: CoreListItemsManager<AddonModAssignSubmissionForList, AddonModAssignSubmissionsSource>; // List of submissions
 
     protected gradedObserver: CoreEventObserver; // Observer to refresh data when a grade changes.
     protected syncObserver: CoreEventObserver; // Observer to refresh data when the async is synchronized.
@@ -99,7 +98,7 @@ export class AddonModAssignSubmissionListPage implements AfterViewInit, OnDestro
                 },
             });
 
-            this.submissions = new AddonModAssignSubmissionListManager(
+            this.submissions = new CoreListItemsManager(
                 submissionsSource,
                 AddonModAssignSubmissionListPage,
             );
@@ -213,29 +212,3 @@ export class AddonModAssignSubmissionListPage implements AfterViewInit, OnDestro
     }
 
 }
-
-/**
- * Helper class to manage submissions.
- */
-class AddonModAssignSubmissionListManager
-    extends CoreListItemsManager<AddonModAssignSubmissionForList, AddonModAssignSubmissionsSource> {
-
-    /**
-     * @inheritdoc
-     */
-    protected getItemPath(submission: AddonModAssignSubmissionForList): string {
-        return String(submission.submitid);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected getItemQueryParams(submission: AddonModAssignSubmissionForList): Params {
-        return {
-            blindId: submission.blindid,
-            groupId: this.getSource().groupId,
-            selectedStatus: this.getSource().SELECTED_STATUS,
-        };
-    }
-
-}
diff --git a/src/addons/mod/assign/pages/submission-review/submission-review.ts b/src/addons/mod/assign/pages/submission-review/submission-review.ts
index 02a3e4e3b..015c73425 100644
--- a/src/addons/mod/assign/pages/submission-review/submission-review.ts
+++ b/src/addons/mod/assign/pages/submission-review/submission-review.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute, ActivatedRouteSnapshot, Params } from '@angular/router';
+import { ActivatedRoute, ActivatedRouteSnapshot } from '@angular/router';
 import { CoreItemsManagerSourcesTracker } from '@classes/items-management/items-manager-sources-tracker';
 import { CoreSwipeItemsManager } from '@classes/items-management/swipe-items-manager';
 import { CoreCourse } from '@features/course/services/course';
@@ -22,7 +22,7 @@ import { IonRefresher } from '@ionic/angular';
 import { CoreNavigator } from '@services/navigator';
 import { CoreScreen } from '@services/screen';
 import { CoreDomUtils } from '@services/utils/dom';
-import { AddonModAssignSubmissionForList, AddonModAssignSubmissionsSource } from '../../classes/submissions-source';
+import { AddonModAssignSubmissionsSource } from '../../classes/submissions-source';
 import { AddonModAssignSubmissionComponent } from '../../components/submission/submission';
 import { AddonModAssign, AddonModAssignAssign } from '../../services/assign';
 
@@ -216,26 +216,7 @@ export class AddonModAssignSubmissionReviewPage implements OnInit, OnDestroy, Ca
 /**
  * Helper to manage swiping within a collection of submissions.
  */
-class AddonModAssignSubmissionSwipeItemsManager
-    extends CoreSwipeItemsManager<AddonModAssignSubmissionForList, AddonModAssignSubmissionsSource> {
-
-    /**
-     * @inheritdoc
-     */
-    protected getItemPath(submission: AddonModAssignSubmissionForList): string {
-        return String(submission.submitid);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected getItemQueryParams(submission: AddonModAssignSubmissionForList): Params {
-        return {
-            blindId: submission.blindid,
-            groupId: this.getSource().groupId,
-            selectedStatus: this.getSource().SELECTED_STATUS,
-        };
-    }
+class AddonModAssignSubmissionSwipeItemsManager extends CoreSwipeItemsManager {
 
     /**
      * @inheritdoc
diff --git a/src/core/classes/items-management/items-manager-source.ts b/src/core/classes/items-management/items-manager-source.ts
index 68baccf70..5a00e5c9c 100644
--- a/src/core/classes/items-management/items-manager-source.ts
+++ b/src/core/classes/items-management/items-manager-source.ts
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { Params } from '@angular/router';
+
 /**
  * Updates listener.
  */
@@ -143,6 +145,25 @@ export abstract class CoreItemsManagerSource<Item = unknown> {
         this.setItems((this.items ?? []).concat(items), hasMoreItems ?? false);
     }
 
+    /**
+     * Get the query parameters to use when navigating to an item page.
+     *
+     * @param item Item.
+     * @return Query parameters to use when navigating to the item page.
+     */
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    getItemQueryParams(item: Item): Params {
+        return {};
+    }
+
+    /**
+     * Get the path to use when navigating to an item page.
+     *
+     * @param item Item.
+     * @return Path to use when navigating to the item page.
+     */
+    abstract getItemPath(item: Item): string;
+
     /**
      * Load page items.
      *
diff --git a/src/core/classes/items-management/items-manager.ts b/src/core/classes/items-management/items-manager.ts
index edc277469..f2be8bd67 100644
--- a/src/core/classes/items-management/items-manager.ts
+++ b/src/core/classes/items-management/items-manager.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { ActivatedRoute, ActivatedRouteSnapshot, Params } from '@angular/router';
+import { ActivatedRoute, ActivatedRouteSnapshot } from '@angular/router';
 import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
 
 import { CoreItemsManagerSource } from './items-manager-source';
@@ -93,12 +93,12 @@ export abstract class CoreItemsManager<Item = unknown, Source extends CoreItemsM
     protected abstract getCurrentPageRoute(): ActivatedRoute | null;
 
     /**
-     * Get the path to use when navigating to an item page.
+     * Get the path of the selected item given the current route.
      *
-     * @param item Item.
-     * @return Path to use when navigating to the item page.
+     * @param route Page route.
+     * @return Path of the selected item in the given route.
      */
-    protected abstract getItemPath(item: Item): string;
+    protected abstract getSelectedItemPathFromRoute(route: ActivatedRouteSnapshot): string | null;
 
     /**
      * Get the path of the selected item.
@@ -106,17 +106,12 @@ export abstract class CoreItemsManager<Item = unknown, Source extends CoreItemsM
      * @param route Page route, if any.
      * @return Path of the selected item.
      */
-    protected abstract getSelectedItemPath(route?: ActivatedRouteSnapshot | null): string | null;
+    protected getSelectedItemPath(route?: ActivatedRouteSnapshot | null): string | null {
+        if (!route) {
+            return null;
+        }
 
-    /**
-     * Get the query parameters to use when navigating to an item page.
-     *
-     * @param item Item.
-     * @return Query parameters to use when navigating to the item page.
-     */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    protected getItemQueryParams(item: Item): Params {
-        return {};
+        return this.getSelectedItemPathFromRoute(route);
     }
 
     /**
@@ -152,7 +147,7 @@ export abstract class CoreItemsManager<Item = unknown, Source extends CoreItemsM
         }
 
         // If this item is already selected, do nothing.
-        const itemPath = this.getItemPath(item);
+        const itemPath = this.getSource().getItemPath(item);
         const selectedItemPath = this.getSelectedItemPath(route.snapshot);
 
         if (selectedItemPath === itemPath) {
@@ -160,7 +155,7 @@ export abstract class CoreItemsManager<Item = unknown, Source extends CoreItemsM
         }
 
         // Navigate to item.
-        const params = this.getItemQueryParams(item);
+        const params = this.getSource().getItemQueryParams(item);
         const pathPrefix = selectedItemPath ? selectedItemPath.split('/').fill('../').join('') : '';
 
         await CoreNavigator.navigate(pathPrefix + itemPath, { params, ...options });
@@ -173,7 +168,7 @@ export abstract class CoreItemsManager<Item = unknown, Source extends CoreItemsM
      */
     protected onSourceItemsUpdated(items: Item[]): void {
         this.itemsMap = items.reduce((map, item) => {
-            map[this.getItemPath(item)] = item;
+            map[this.getSource().getItemPath(item)] = item;
 
             return map;
         }, {});
diff --git a/src/core/classes/items-management/list-items-manager.ts b/src/core/classes/items-management/list-items-manager.ts
index 9bbf3fdfc..a9e22b9a7 100644
--- a/src/core/classes/items-management/list-items-manager.ts
+++ b/src/core/classes/items-management/list-items-manager.ts
@@ -26,7 +26,7 @@ import { CoreItemsManagerSource } from './items-manager-source';
 /**
  * Helper class to manage the state and routing of a list of items in a page.
  */
-export abstract class CoreListItemsManager<
+export class CoreListItemsManager<
     Item = unknown,
     Source extends CoreItemsManagerSource<Item> = CoreItemsManagerSource<Item>
 > extends CoreItemsManager<Item, Source> {
@@ -206,10 +206,12 @@ export abstract class CoreListItemsManager<
     /**
      * @inheritdoc
      */
-    protected getSelectedItemPath(route?: ActivatedRouteSnapshot | null): string | null {
+    protected getSelectedItemPathFromRoute(route: ActivatedRouteSnapshot): string | null {
         const segments: UrlSegment[] = [];
 
-        while ((route = route?.firstChild)) {
+        while (route.firstChild) {
+            route = route.firstChild;
+
             segments.push(...route.url);
         }
 
diff --git a/src/core/classes/items-management/swipe-items-manager.ts b/src/core/classes/items-management/swipe-items-manager.ts
index b15e59870..3dd41cd4f 100644
--- a/src/core/classes/items-management/swipe-items-manager.ts
+++ b/src/core/classes/items-management/swipe-items-manager.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { ActivatedRoute, ActivatedRouteSnapshot } from '@angular/router';
+import { ActivatedRoute, ActivatedRouteSnapshot, UrlSegment } from '@angular/router';
 
 import { CoreNavigator } from '@services/navigator';
 
@@ -22,7 +22,7 @@ import { CoreItemsManagerSource } from './items-manager-source';
 /**
  * Helper class to manage the state and routing of a swipeable page.
  */
-export abstract class CoreSwipeItemsManager<
+export class CoreSwipeItemsManager<
     Item = unknown,
     Source extends CoreItemsManagerSource<Item> = CoreItemsManagerSource<Item>
 >
@@ -49,14 +49,6 @@ export abstract class CoreSwipeItemsManager<
         await this.navigateToItemBy(1, 'forward');
     }
 
-    /**
-     * Get the path of the selected item given the current route.
-     *
-     * @param route Page route.
-     * @return Path of the selected item in the given route.
-     */
-    protected abstract getSelectedItemPathFromRoute(route: ActivatedRouteSnapshot): string | null;
-
     /**
      * @inheritdoc
      */
@@ -67,12 +59,20 @@ export abstract class CoreSwipeItemsManager<
     /**
      * @inheritdoc
      */
-    protected getSelectedItemPath(route?: ActivatedRouteSnapshot | null): string | null {
-        if (!route) {
-            return null;
+    protected getSelectedItemPathFromRoute(route: ActivatedRouteSnapshot): string | null {
+        const segments: UrlSegment[] = [];
+
+        while (route) {
+            segments.push(...route.url);
+
+            if (!route.firstChild) {
+                break;
+            }
+
+            route = route.firstChild;
         }
 
-        return this.getSelectedItemPathFromRoute(route);
+        return segments.map(segment => segment.path).join('/').replace(/\/+/, '/').trim() || null;
     }
 
     /**
diff --git a/src/core/features/user/classes/participants-source.ts b/src/core/features/user/classes/participants-source.ts
index 594ff4817..9aa6e4db1 100644
--- a/src/core/features/user/classes/participants-source.ts
+++ b/src/core/features/user/classes/participants-source.ts
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { Params } from '@angular/router';
 import { CoreItemsManagerSource } from '@classes/items-management/items-manager-source';
 
 import { CoreUser, CoreUserData, CoreUserParticipant, CoreUserProvider } from '../services/user';
@@ -40,6 +41,20 @@ export class CoreUserParticipantsSource extends CoreItemsManagerSource<CoreUserP
         this.SEARCH_QUERY = searchQuery;
     }
 
+    /**
+     * @inheritdoc
+     */
+    getItemPath(user: CoreUserParticipant | CoreUserData): string {
+        return user.id.toString();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    getItemQueryParams(): Params {
+        return { search: this.SEARCH_QUERY };
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/src/core/features/user/pages/participants/participants.page.ts b/src/core/features/user/pages/participants/participants.page.ts
index 61d2c80ed..73f6410f8 100644
--- a/src/core/features/user/pages/participants/participants.page.ts
+++ b/src/core/features/user/pages/participants/participants.page.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { AfterViewInit, Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
-import { Params } from '@angular/router';
 import { IonRefresher } from '@ionic/angular';
 
 import { CoreApp } from '@services/app';
@@ -50,7 +49,7 @@ export class CoreUserParticipantsPage implements OnInit, AfterViewInit, OnDestro
             this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
             this.participants = new CoreUserParticipantsManager(
                 CoreItemsManagerSourcesTracker.getOrCreateSource(CoreUserParticipantsSource, [this.courseId]),
-                this,
+                CoreUserParticipantsPage,
             );
         } catch (error) {
             CoreDomUtils.showErrorModal(error);
@@ -196,35 +195,13 @@ export class CoreUserParticipantsPage implements OnInit, AfterViewInit, OnDestro
 /**
  * Helper to manage the list of participants.
  */
-class CoreUserParticipantsManager extends CoreListItemsManager<CoreUserParticipant | CoreUserData> {
-
-    page: CoreUserParticipantsPage;
-
-    constructor(source: CoreUserParticipantsSource, page: CoreUserParticipantsPage) {
-        super(source, CoreUserParticipantsPage);
-
-        this.page = page;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected getItemPath(participant: CoreUserParticipant | CoreUserData): string {
-        return participant.id.toString();
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected getItemQueryParams(): Params {
-        return { search: this.page.searchQuery };
-    }
+class CoreUserParticipantsManager extends CoreListItemsManager<CoreUserParticipant | CoreUserData, CoreUserParticipantsSource> {
 
     /**
      * @inheritdoc
      */
     protected async logActivity(): Promise<void> {
-        await CoreUser.logParticipantsView(this.page.courseId);
+        await CoreUser.logParticipantsView(this.getSource().COURSE_ID);
     }
 
 }
diff --git a/src/core/features/user/pages/profile/profile.page.ts b/src/core/features/user/pages/profile/profile.page.ts
index c9b2622c2..bcfc6bad3 100644
--- a/src/core/features/user/pages/profile/profile.page.ts
+++ b/src/core/features/user/pages/profile/profile.page.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { ActivatedRoute, ActivatedRouteSnapshot, Params } from '@angular/router';
+import { ActivatedRoute, ActivatedRouteSnapshot } from '@angular/router';
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { IonRefresher } from '@ionic/angular';
 import { Subscription } from 'rxjs';
@@ -21,7 +21,7 @@ import { CoreSite } from '@classes/site';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
-import { CoreUser, CoreUserBasicData, CoreUserProfile, CoreUserProvider } from '@features/user/services/user';
+import { CoreUser, CoreUserProfile, CoreUserProvider } from '@features/user/services/user';
 import { CoreUserHelper } from '@features/user/services/user-helper';
 import { CoreUserDelegate, CoreUserDelegateService, CoreUserProfileHandlerData } from '@features/user/services/user-delegate';
 import { CoreUtils } from '@services/utils/utils';
@@ -30,7 +30,6 @@ import { CoreCourses } from '@features/courses/services/courses';
 import { CoreSwipeItemsManager } from '@classes/items-management/swipe-items-manager';
 import { CoreUserParticipantsSource } from '@features/user/classes/participants-source';
 import { CoreItemsManagerSourcesTracker } from '@classes/items-management/items-manager-sources-tracker';
-import { CoreItemsManagerSource } from '@classes/items-management/items-manager-source';
 
 @Component({
     selector: 'page-core-user-profile',
@@ -57,7 +56,6 @@ export class CoreUserProfilePage implements OnInit, OnDestroy {
     communicationHandlers: CoreUserProfileHandlerData[] = [];
 
     users?: CoreUserSwipeItemsManager;
-    usersQueryParams: Params = {};
 
     constructor(private route: ActivatedRoute) {
         this.obsProfileRefreshed = CoreEvents.on(CoreUserProvider.PROFILE_REFRESHED, (data) => {
@@ -93,9 +91,8 @@ export class CoreUserProfilePage implements OnInit, OnDestroy {
         if (this.courseId && this.route.snapshot.data.swipeManagerSource === 'participants') {
             const search = CoreNavigator.getRouteParam('search');
             const source = CoreItemsManagerSourcesTracker.getOrCreateSource(CoreUserParticipantsSource, [this.courseId, search]);
-            this.users = new CoreUserSwipeItemsManager(source, this);
+            this.users = new CoreUserSwipeItemsManager(source);
 
-            this.usersQueryParams.search = search;
             this.users.start();
         }
 
@@ -227,29 +224,7 @@ export class CoreUserProfilePage implements OnInit, OnDestroy {
 /**
  * Helper to manage swiping within a collection of users.
  */
-class CoreUserSwipeItemsManager extends CoreSwipeItemsManager<CoreUserBasicData> {
-
-    page: CoreUserProfilePage;
-
-    constructor(source: CoreItemsManagerSource<CoreUserBasicData>, page: CoreUserProfilePage) {
-        super(source);
-
-        this.page = page;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected getItemPath(item: CoreUserBasicData): string {
-        return String(item.id);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected getItemQueryParams(): Params {
-        return this.page.usersQueryParams;
-    }
+class CoreUserSwipeItemsManager extends CoreSwipeItemsManager {
 
     /**
      * @inheritdoc

From 70ff7a375aa1c75236af485d9c1c6c609b48a898 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 25 Nov 2021 13:00:58 +0100
Subject: [PATCH 0253/1008] MOBILE-3926 glossary: Entries swipe navigation

---
 .../classes/glossary-entries-source.ts        | 381 +++++++++++++++
 .../classes/glossary-entries-swipe-manager.ts |  52 +++
 .../index/addon-mod-glossary-index.html       |   8 +-
 .../mod/glossary/components/index/index.ts    | 437 +++++-------------
 .../components/mode-picker/mode-picker.ts     |   2 +-
 src/addons/mod/glossary/glossary.module.ts    |   6 +
 src/addons/mod/glossary/pages/edit/edit.html  | 131 +++---
 src/addons/mod/glossary/pages/edit/edit.ts    |  81 +++-
 .../mod/glossary/pages/entry/entry.html       | 134 +++---
 src/addons/mod/glossary/pages/entry/entry.ts  |  49 +-
 .../items-management/items-manager-source.ts  |   6 +-
 11 files changed, 812 insertions(+), 475 deletions(-)
 create mode 100644 src/addons/mod/glossary/classes/glossary-entries-source.ts
 create mode 100644 src/addons/mod/glossary/classes/glossary-entries-swipe-manager.ts

diff --git a/src/addons/mod/glossary/classes/glossary-entries-source.ts b/src/addons/mod/glossary/classes/glossary-entries-source.ts
new file mode 100644
index 000000000..42fbe67c5
--- /dev/null
+++ b/src/addons/mod/glossary/classes/glossary-entries-source.ts
@@ -0,0 +1,381 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { Params } from '@angular/router';
+import { CoreItemsManagerSource } from '@classes/items-management/items-manager-source';
+import {
+    AddonModGlossary,
+    AddonModGlossaryEntry,
+    AddonModGlossaryGetEntriesOptions,
+    AddonModGlossaryGetEntriesWSResponse,
+    AddonModGlossaryGlossary,
+    AddonModGlossaryProvider,
+} from '../services/glossary';
+import { AddonModGlossaryOffline, AddonModGlossaryOfflineEntry } from '../services/glossary-offline';
+
+/**
+ * Provides a collection of glossary entries.
+ */
+export class AddonModGlossaryEntriesSource extends CoreItemsManagerSource<AddonModGlossaryEntryItem> {
+
+    static readonly NEW_ENTRY: AddonModGlossaryNewEntryForm = { newEntry: true };
+
+    readonly COURSE_ID: number;
+    readonly CM_ID: number;
+    readonly GLOSSARY_PATH_PREFIX: string;
+
+    isSearch = false;
+    hasSearched = false;
+    fetchMode?: AddonModGlossaryFetchMode;
+    viewMode?: string;
+    glossary?: AddonModGlossaryGlossary;
+    onlineEntries: AddonModGlossaryEntry[] = [];
+    offlineEntries: AddonModGlossaryOfflineEntry[] = [];
+
+    protected fetchFunction?: (options?: AddonModGlossaryGetEntriesOptions) => AddonModGlossaryGetEntriesWSResponse;
+    protected fetchInvalidate?: () => Promise<void>;
+
+    constructor(courseId: number, cmId: number, glossaryPathPrefix: string) {
+        super();
+
+        this.COURSE_ID = courseId;
+        this.CM_ID = cmId;
+        this.GLOSSARY_PATH_PREFIX = glossaryPathPrefix;
+    }
+
+    /**
+     * Type guard to infer NewEntryForm objects.
+     *
+     * @param entry Item to check.
+     * @return Whether the item is a new entry form.
+     */
+    isNewEntryForm(entry: AddonModGlossaryEntryItem): entry is AddonModGlossaryNewEntryForm {
+        return 'newEntry' in entry;
+    }
+
+    /**
+     * Type guard to infer entry objects.
+     *
+     * @param entry Item to check.
+     * @return Whether the item is an offline entry.
+     */
+    isOnlineEntry(entry: AddonModGlossaryEntryItem): entry is AddonModGlossaryEntry {
+        return 'id' in entry;
+    }
+
+    /**
+     * Type guard to infer entry objects.
+     *
+     * @param entry Item to check.
+     * @return Whether the item is an offline entry.
+     */
+    isOfflineEntry(entry: AddonModGlossaryEntryItem): entry is AddonModGlossaryOfflineEntry {
+        return !this.isNewEntryForm(entry) && !this.isOnlineEntry(entry);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    getItemPath(entry: AddonModGlossaryEntryItem): string {
+        if (this.isOnlineEntry(entry)) {
+            return `${this.GLOSSARY_PATH_PREFIX}entry/${entry.id}`;
+        }
+
+        if (this.isOfflineEntry(entry)) {
+            return `${this.GLOSSARY_PATH_PREFIX}edit/${entry.timecreated}`;
+        }
+
+        return `${this.GLOSSARY_PATH_PREFIX}edit/0`;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    getItemQueryParams(entry: AddonModGlossaryEntryItem): Params {
+        const params: Params = {
+            cmId: this.CM_ID,
+            courseId: this.COURSE_ID,
+        };
+
+        if (this.isOfflineEntry(entry)) {
+            params.concept = entry.concept;
+        }
+
+        return params;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    getPagesLoaded(): number {
+        if (this.items === null) {
+            return 0;
+        }
+
+        return Math.ceil(this.onlineEntries.length / this.getPageLength());
+    }
+
+    /**
+     * Start searching.
+     */
+    startSearch(): void {
+        this.isSearch = true;
+    }
+
+    /**
+     * Stop searching and restore unfiltered collection.
+     *
+     * @param cachedOnlineEntries Cached online entries.
+     * @param hasMoreOnlineEntries Whether there were more online entries.
+     */
+    stopSearch(cachedOnlineEntries: AddonModGlossaryEntry[], hasMoreOnlineEntries: boolean): void {
+        if (!this.fetchMode) {
+            return;
+        }
+
+        this.isSearch = false;
+        this.hasSearched = false;
+        this.onlineEntries = cachedOnlineEntries;
+        this.hasMoreItems = hasMoreOnlineEntries;
+    }
+
+    /**
+     * Set search query.
+     *
+     * @param query Search query.
+     */
+    search(query: string): void {
+        if (!this.glossary) {
+            return;
+        }
+
+        this.fetchFunction = AddonModGlossary.getEntriesBySearch.bind(
+            AddonModGlossary.instance,
+            this.glossary.id,
+            query,
+            true,
+            'CONCEPT',
+            'ASC',
+        );
+        this.fetchInvalidate = AddonModGlossary.invalidateEntriesBySearch.bind(
+            AddonModGlossary.instance,
+            this.glossary.id,
+            query,
+            true,
+            'CONCEPT',
+            'ASC',
+        );
+        this.hasSearched = true;
+    }
+
+    /**
+     * Load glossary.
+     */
+    async loadGlossary(): Promise<void> {
+        this.glossary = await AddonModGlossary.getGlossary(this.COURSE_ID, this.CM_ID);
+    }
+
+    /**
+     * Invalidate glossary cache.
+     */
+    async invalidateCache(): Promise<void> {
+        await Promise.all([
+            AddonModGlossary.invalidateCourseGlossaries(this.COURSE_ID),
+            this.fetchInvalidate && this.fetchInvalidate(),
+            this.glossary && AddonModGlossary.invalidateCategories(this.glossary.id),
+        ]);
+    }
+
+    /**
+     * Change fetch mode.
+     *
+     * @param mode New mode.
+     */
+    switchMode(mode: AddonModGlossaryFetchMode): void {
+        if (!this.glossary) {
+            throw new Error('Can\'t switch entries mode without a glossary!');
+        }
+
+        this.fetchMode = mode;
+        this.isSearch = false;
+
+        switch (mode) {
+            case 'author_all':
+                // Browse by author.
+                this.viewMode = 'author';
+                this.fetchFunction = AddonModGlossary.getEntriesByAuthor.bind(
+                    AddonModGlossary.instance,
+                    this.glossary.id,
+                    'ALL',
+                    'LASTNAME',
+                    'ASC',
+                );
+                this.fetchInvalidate = AddonModGlossary.invalidateEntriesByAuthor.bind(
+                    AddonModGlossary.instance,
+                    this.glossary.id,
+                    'ALL',
+                    'LASTNAME',
+                    'ASC',
+                );
+                break;
+
+            case 'cat_all':
+                // Browse by category.
+                this.viewMode = 'cat';
+                this.fetchFunction = AddonModGlossary.getEntriesByCategory.bind(
+                    AddonModGlossary.instance,
+                    this.glossary.id,
+                    AddonModGlossaryProvider.SHOW_ALL_CATEGORIES,
+                );
+                this.fetchInvalidate = AddonModGlossary.invalidateEntriesByCategory.bind(
+                    AddonModGlossary.instance,
+                    this.glossary.id,
+                    AddonModGlossaryProvider.SHOW_ALL_CATEGORIES,
+                );
+                break;
+
+            case 'newest_first':
+                // Newest first.
+                this.viewMode = 'date';
+                this.fetchFunction = AddonModGlossary.getEntriesByDate.bind(
+                    AddonModGlossary.instance,
+                    this.glossary.id,
+                    'CREATION',
+                    'DESC',
+                );
+                this.fetchInvalidate = AddonModGlossary.invalidateEntriesByDate.bind(
+                    AddonModGlossary.instance,
+                    this.glossary.id,
+                    'CREATION',
+                    'DESC',
+                );
+                break;
+
+            case 'recently_updated':
+                // Recently updated.
+                this.viewMode = 'date';
+                this.fetchFunction = AddonModGlossary.getEntriesByDate.bind(
+                    AddonModGlossary.instance,
+                    this.glossary.id,
+                    'UPDATE',
+                    'DESC',
+                );
+                this.fetchInvalidate = AddonModGlossary.invalidateEntriesByDate.bind(
+                    AddonModGlossary.instance,
+                    this.glossary.id,
+                    'UPDATE',
+                    'DESC',
+                );
+                break;
+
+            case 'letter_all':
+            default:
+                // Consider it is 'letter_all'.
+                this.viewMode = 'letter';
+                this.fetchMode = 'letter_all';
+                this.fetchFunction = AddonModGlossary.getEntriesByLetter.bind(
+                    AddonModGlossary.instance,
+                    this.glossary.id,
+                    'ALL',
+                );
+                this.fetchInvalidate = AddonModGlossary.invalidateEntriesByLetter.bind(
+                    AddonModGlossary.instance,
+                    this.glossary.id,
+                    'ALL',
+                );
+                break;
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected async loadPageItems(page: number): Promise<{ items: AddonModGlossaryEntryItem[]; hasMoreItems: boolean }> {
+        const glossary = this.glossary;
+        const fetchFunction = this.fetchFunction;
+
+        if (!glossary || !fetchFunction) {
+            throw new Error('Can\'t load entries without glossary or fetch function');
+        }
+
+        const entries: AddonModGlossaryEntryItem[] = [];
+
+        if (page === 0) {
+            const offlineEntries = await AddonModGlossaryOffline.getGlossaryNewEntries(glossary.id);
+
+            offlineEntries.sort((a, b) => a.concept.localeCompare(b.concept));
+
+            entries.push(AddonModGlossaryEntriesSource.NEW_ENTRY);
+            entries.push(...offlineEntries);
+        }
+
+        const from = page * this.getPageLength();
+        const pageEntries = await fetchFunction({ from, cmId: this.CM_ID });
+
+        entries.push(...pageEntries.entries);
+
+        return {
+            items: entries,
+            hasMoreItems: from + pageEntries.entries.length < pageEntries.count,
+        };
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected getPageLength(): number {
+        return AddonModGlossaryProvider.LIMIT_ENTRIES;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected setItems(entries: AddonModGlossaryEntryItem[], hasMoreItems: boolean): void {
+        this.onlineEntries = [];
+        this.offlineEntries = [];
+
+        entries.forEach(entry => {
+            this.isOnlineEntry(entry) && this.onlineEntries.push(entry);
+            this.isOfflineEntry(entry) && this.offlineEntries.push(entry);
+        });
+
+        super.setItems(entries, hasMoreItems);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    reset(): void {
+        this.onlineEntries = [];
+        this.offlineEntries = [];
+
+        super.reset();
+    }
+
+}
+
+/**
+ * Type of items that can be held by the entries manager.
+ */
+export type AddonModGlossaryEntryItem = AddonModGlossaryEntry | AddonModGlossaryOfflineEntry | AddonModGlossaryNewEntryForm;
+
+/**
+ * Type to select the new entry form.
+ */
+export type AddonModGlossaryNewEntryForm = { newEntry: true };
+
+/**
+ * Fetch mode to sort entries.
+ */
+export type AddonModGlossaryFetchMode = 'author_all' | 'cat_all' | 'newest_first' | 'recently_updated' | 'letter_all';
diff --git a/src/addons/mod/glossary/classes/glossary-entries-swipe-manager.ts b/src/addons/mod/glossary/classes/glossary-entries-swipe-manager.ts
new file mode 100644
index 000000000..45015a760
--- /dev/null
+++ b/src/addons/mod/glossary/classes/glossary-entries-swipe-manager.ts
@@ -0,0 +1,52 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreSwipeItemsManager } from '@classes/items-management/swipe-items-manager';
+import { AddonModGlossaryEntriesSource, AddonModGlossaryEntryItem } from './glossary-entries-source';
+
+/**
+ * Helper to manage swiping within a collection of glossary entries.
+ */
+export abstract class AddonModGlossaryEntriesSwipeManager
+    extends CoreSwipeItemsManager<AddonModGlossaryEntryItem, AddonModGlossaryEntriesSource> {
+
+    /**
+     * @inheritdoc
+     */
+    async navigateToNextItem(): Promise<void> {
+        let delta = -1;
+        const item = await this.getItemBy(-1);
+
+        if (item && this.getSource().isNewEntryForm(item)) {
+            delta--;
+        }
+
+        await this.navigateToItemBy(delta, 'back');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async navigateToPreviousItem(): Promise<void> {
+        let delta = 1;
+        const item = await this.getItemBy(1);
+
+        if (item && this.getSource().isNewEntryForm(item)) {
+            delta++;
+        }
+
+        await this.navigateToItemBy(delta, 'forward');
+    }
+
+}
diff --git a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
index b0095c394..c8a816a25 100644
--- a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
+++ b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
@@ -54,7 +54,7 @@
             [component]="component" [componentId]="componentId" [courseId]="courseId" [hasDataToSync]="hasOffline || hasOfflineRatings">
         </core-course-module-info>
 
-        <ion-list *ngIf="!isSearch && entries.offlineEntries.length > 0">
+        <ion-list *ngIf="!isSearch && entries && entries.offlineEntries.length > 0">
             <ion-item-divider>
                 <ion-label>
                     <h2>{{ 'addon.mod_glossary.entriestobesynced' | translate }}</h2>
@@ -70,7 +70,7 @@
             </ion-item>
         </ion-list>
 
-        <ion-list *ngIf="entries.onlineEntries.length > 0">
+        <ion-list *ngIf="entries && entries.onlineEntries.length > 0">
             <ng-container *ngFor="let entry of entries.onlineEntries; let index = index">
                 <ion-item-divider *ngIf="getDivider && showDivider(entry, entries.onlineEntries[index - 1])">
                     <ion-label>
@@ -88,11 +88,11 @@
             </ng-container>
         </ion-list>
 
-        <core-empty-box *ngIf="entries.empty && (!isSearch || hasSearched)" icon="fas-list"
+        <core-empty-box *ngIf="(!entries || entries.empty) && (!isSearch || hasSearched)" icon="fas-list"
             [message]="'addon.mod_glossary.noentriesfound' | translate">
         </core-empty-box>
 
-        <core-infinite-loading [enabled]="!entries.completed" [error]="loadMoreError" (action)="loadMoreEntries($event)">
+        <core-infinite-loading [enabled]="entries && !entries.completed" [error]="loadMoreError" (action)="loadMoreEntries($event)">
         </core-infinite-loading>
     </core-loading>
 
diff --git a/src/addons/mod/glossary/components/index/index.ts b/src/addons/mod/glossary/components/index/index.ts
index 41db3e7d1..1e5c4d361 100644
--- a/src/addons/mod/glossary/components/index/index.ts
+++ b/src/addons/mod/glossary/components/index/index.ts
@@ -14,8 +14,9 @@
 
 import { ContextLevel } from '@/core/constants';
 import { AfterViewInit, Component, OnDestroy, OnInit, Optional, ViewChild } from '@angular/core';
-import { ActivatedRoute, Params } from '@angular/router';
-import { CorePageItemsListManager } from '@classes/page-items-list-manager';
+import { ActivatedRoute } from '@angular/router';
+import { CoreItemsManagerSourcesTracker } from '@classes/items-management/items-manager-sources-tracker';
+import { CoreListItemsManager } from '@classes/items-management/list-items-manager';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import { CoreCourseModuleMainActivityComponent } from '@features/course/classes/main-activity-component';
 import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
@@ -29,16 +30,19 @@ import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTextUtils } from '@services/utils/text';
 import { Translate } from '@singletons';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
+import {
+    AddonModGlossaryEntriesSource,
+    AddonModGlossaryEntryItem,
+    AddonModGlossaryFetchMode,
+} from '../../classes/glossary-entries-source';
 import {
     AddonModGlossary,
     AddonModGlossaryEntry,
     AddonModGlossaryEntryWithCategory,
-    AddonModGlossaryGetEntriesOptions,
-    AddonModGlossaryGetEntriesWSResponse,
     AddonModGlossaryGlossary,
     AddonModGlossaryProvider,
 } from '../../services/glossary';
-import { AddonModGlossaryOffline, AddonModGlossaryOfflineEntry } from '../../services/glossary-offline';
+import { AddonModGlossaryOfflineEntry } from '../../services/glossary-offline';
 import {
     AddonModGlossaryAutoSyncData,
     AddonModGlossarySyncProvider,
@@ -63,23 +67,17 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
     component = AddonModGlossaryProvider.COMPONENT;
     moduleName = 'glossary';
 
-    isSearch = false;
-    hasSearched = false;
     canAdd = false;
     loadMoreError = false;
-    loadingMessage?: string;
-    entries: AddonModGlossaryEntriesManager;
+    loadingMessage: string;
+    entries!: AddonModGlossaryEntriesManager;
     hasOfflineRatings = false;
-    glossary?: AddonModGlossaryGlossary;
 
     protected syncEventName = AddonModGlossarySyncProvider.AUTO_SYNCED;
-    protected fetchFunction?: (options?: AddonModGlossaryGetEntriesOptions) => AddonModGlossaryGetEntriesWSResponse;
-    protected fetchInvalidate?: () => Promise<void>;
     protected addEntryObserver?: CoreEventObserver;
-    protected fetchMode?: AddonModGlossaryFetchMode;
-    protected viewMode?: string;
     protected fetchedEntriesCanLoadMore = false;
     protected fetchedEntries: AddonModGlossaryEntry[] = [];
+    protected sourceUnsubscribe?: () => void;
     protected ratingOfflineObserver?: CoreEventObserver;
     protected ratingSyncObserver?: CoreEventObserver;
 
@@ -87,26 +85,47 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
     showDivider: (entry: AddonModGlossaryEntry, previous?: AddonModGlossaryEntry) => boolean = () => false;
 
     constructor(
-        route: ActivatedRoute,
+        protected route: ActivatedRoute,
         protected content?: IonContent,
-        @Optional() courseContentsPage?: CoreCourseContentsPage,
+        @Optional() protected courseContentsPage?: CoreCourseContentsPage,
     ) {
         super('AddonModGlossaryIndexComponent', content, courseContentsPage);
 
-        this.entries = new AddonModGlossaryEntriesManager(
-            route.component,
-            this,
-            courseContentsPage ? `${AddonModGlossaryModuleHandlerService.PAGE_NAME}/` : '',
-        );
+        this.loadingMessage = Translate.instant('core.loading');
+    }
+
+    get glossary(): AddonModGlossaryGlossary | undefined {
+        return this.entries.getSource().glossary;
+    }
+
+    get isSearch(): boolean {
+        return this.entries.getSource().isSearch;
+    }
+
+    get hasSearched(): boolean {
+        return this.entries.getSource().hasSearched;
     }
 
     /**
      * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
-        super.ngOnInit();
+        await super.ngOnInit();
 
-        this.loadingMessage = Translate.instant('core.loading');
+        // Initialize entries manager.
+        const source = CoreItemsManagerSourcesTracker.getOrCreateSource(
+            AddonModGlossaryEntriesSource,
+            [this.courseId, this.module.id, this.courseContentsPage ? `${AddonModGlossaryModuleHandlerService.PAGE_NAME}/` : ''],
+        );
+
+        this.entries = new AddonModGlossaryEntriesManager(
+            source,
+            this.route.component,
+        );
+
+        this.sourceUnsubscribe = source.addListener({
+            onItemsUpdated: items => this.hasOffline = !!items.find(item => source.isOfflineEntry(item)),
+        });
 
         // When an entry is added, we reload the data.
         this.addEntryObserver = CoreEvents.on(AddonModGlossaryProvider.ADD_ENTRY_EVENT, (data) => {
@@ -143,11 +162,9 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
             return;
         }
 
-        this.entries.start(this.splitView);
+        await this.entries.start(this.splitView);
 
         try {
-            await AddonModGlossary.logView(this.glossary.id, this.viewMode!, this.glossary.name);
-
             CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
         } catch (error) {
             // Ignore errors.
@@ -159,14 +176,18 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
      */
     protected async fetchContent(refresh: boolean = false, sync: boolean = false, showErrors: boolean = false): Promise<void> {
         try {
-            this.glossary = await AddonModGlossary.getGlossary(this.courseId, this.module.id);
+            await this.entries.getSource().loadGlossary();
+
+            if (!this.glossary) {
+                return;
+            }
 
             this.description = this.glossary.intro || this.description;
             this.canAdd = !!this.glossary.canaddentry || false;
 
             this.dataRetrieved.emit(this.glossary);
 
-            if (!this.fetchMode) {
+            if (!this.entries.getSource().fetchMode) {
                 this.switchMode('letter_all');
             }
 
@@ -177,7 +198,7 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
 
             const [hasOfflineRatings] = await Promise.all([
                 CoreRatingOffline.hasRatings('mod_glossary', 'entry', ContextLevel.MODULE, this.glossary.coursemodule),
-                this.fetchEntries(),
+                refresh ? this.entries.reload() : this.entries.loadNextPage(),
             ]);
 
             this.hasOfflineRatings = hasOfflineRatings;
@@ -186,59 +207,11 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
         }
     }
 
-    /**
-     * Convenience function to fetch entries.
-     *
-     * @param append True if fetched entries are appended to exsiting ones.
-     * @return Promise resolved when done.
-     */
-    protected async fetchEntries(append: boolean = false): Promise<void> {
-        if (!this.fetchFunction) {
-            return;
-        }
-
-        this.loadMoreError = false;
-        const from = append ? this.entries.onlineEntries.length : 0;
-
-        const result = await this.fetchFunction({
-            from: from,
-            cmId: this.module.id,
-        });
-
-        const hasMoreEntries = from + result.entries.length < result.count;
-
-        if (append) {
-            this.entries.setItems(this.entries.items.concat(result.entries), hasMoreEntries);
-        } else {
-            this.entries.setOnlineEntries(result.entries, hasMoreEntries);
-        }
-
-        // Now get the ofline entries.
-        // Check if there are responses stored in offline.
-        const offlineEntries = await AddonModGlossaryOffline.getGlossaryNewEntries(this.glossary!.id);
-
-        offlineEntries.sort((a, b) => a.concept.localeCompare(b.concept));
-        this.hasOffline = !!offlineEntries.length;
-        this.entries.setOfflineEntries(offlineEntries);
-    }
-
     /**
      * @inheritdoc
      */
     protected async invalidateContent(): Promise<void> {
-        const promises: Promise<void>[] = [];
-
-        if (this.fetchInvalidate) {
-            promises.push(this.fetchInvalidate());
-        }
-
-        promises.push(AddonModGlossary.invalidateCourseGlossaries(this.courseId));
-
-        if (this.glossary) {
-            promises.push(AddonModGlossary.invalidateCategories(this.glossary.id));
-        }
-
-        await Promise.all(promises);
+        await this.entries.getSource().invalidateCache();
     }
 
     /**
@@ -277,109 +250,50 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
      * @param mode New mode.
      */
     protected switchMode(mode: AddonModGlossaryFetchMode): void {
-        this.fetchMode = mode;
-        this.isSearch = false;
+        this.entries.getSource().switchMode(mode);
 
         switch (mode) {
             case 'author_all':
                 // Browse by author.
-                this.viewMode = 'author';
-                this.fetchFunction = AddonModGlossary.getEntriesByAuthor.bind(
-                    AddonModGlossary.instance,
-                    this.glossary!.id,
-                    'ALL',
-                    'LASTNAME',
-                    'ASC',
-                );
-                this.fetchInvalidate = AddonModGlossary.invalidateEntriesByAuthor.bind(
-                    AddonModGlossary.instance,
-                    this.glossary!.id,
-                    'ALL',
-                    'LASTNAME',
-                    'ASC',
-                );
                 this.getDivider = (entry) => entry.userfullname;
                 this.showDivider = (entry, previous) => !previous || entry.userid != previous.userid;
                 break;
 
-            case 'cat_all':
+            case 'cat_all': {
                 // Browse by category.
-                this.viewMode = 'cat';
-                this.fetchFunction = AddonModGlossary.getEntriesByCategory.bind(
-                    AddonModGlossary.instance,
-                    this.glossary!.id,
-                    AddonModGlossaryProvider.SHOW_ALL_CATEGORIES,
-                );
-                this.fetchInvalidate = AddonModGlossary.invalidateEntriesByCategory.bind(
-                    AddonModGlossary.instance,
-                    this.glossary!.id,
-                    AddonModGlossaryProvider.SHOW_ALL_CATEGORIES,
-                );
-                this.getDivider = (entry: AddonModGlossaryEntryWithCategory) => entry.categoryname || '';
-                this.showDivider = (entry, previous) => !previous || this.getDivider!(entry) != this.getDivider!(previous);
+                const getDivider = (entry: AddonModGlossaryEntryWithCategory) => entry.categoryname || '';
+
+                this.getDivider = getDivider;
+                this.showDivider = (entry, previous) => !previous || getDivider(entry) != getDivider(previous);
                 break;
+            }
 
             case 'newest_first':
                 // Newest first.
-                this.viewMode = 'date';
-                this.fetchFunction = AddonModGlossary.getEntriesByDate.bind(
-                    AddonModGlossary.instance,
-                    this.glossary!.id,
-                    'CREATION',
-                    'DESC',
-                );
-                this.fetchInvalidate = AddonModGlossary.invalidateEntriesByDate.bind(
-                    AddonModGlossary.instance,
-                    this.glossary!.id,
-                    'CREATION',
-                    'DESC',
-                );
                 this.getDivider = undefined;
                 this.showDivider = () => false;
                 break;
 
             case 'recently_updated':
                 // Recently updated.
-                this.viewMode = 'date';
-                this.fetchFunction = AddonModGlossary.getEntriesByDate.bind(
-                    AddonModGlossary.instance,
-                    this.glossary!.id,
-                    'UPDATE',
-                    'DESC',
-                );
-                this.fetchInvalidate = AddonModGlossary.invalidateEntriesByDate.bind(
-                    AddonModGlossary.instance,
-                    this.glossary!.id,
-                    'UPDATE',
-                    'DESC',
-                );
                 this.getDivider = undefined;
                 this.showDivider = () => false;
                 break;
 
             case 'letter_all':
-            default:
+            default: {
                 // Consider it is 'letter_all'.
-                this.viewMode = 'letter';
-                this.fetchMode = 'letter_all';
-                this.fetchFunction = AddonModGlossary.getEntriesByLetter.bind(
-                    AddonModGlossary.instance,
-                    this.glossary!.id,
-                    'ALL',
-                );
-                this.fetchInvalidate = AddonModGlossary.invalidateEntriesByLetter.bind(
-                    AddonModGlossary.instance,
-                    this.glossary!.id,
-                    'ALL',
-                );
-                this.getDivider = (entry) => {
+                const getDivider = (entry) => {
                     // Try to get the first letter without HTML tags.
                     const noTags = CoreTextUtils.cleanTags(entry.concept);
 
                     return (noTags || entry.concept).substr(0, 1).toUpperCase();
                 };
-                this.showDivider = (entry, previous) => !previous || this.getDivider!(entry) != this.getDivider!(previous);
+
+                this.getDivider = getDivider;
+                this.showDivider = (entry, previous) => !previous || getDivider(entry) != getDivider(previous);
                 break;
+            }
         }
     }
 
@@ -391,7 +305,9 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
      */
     async loadMoreEntries(infiniteComplete?: () => void): Promise<void> {
         try {
-            await this.fetchEntries(true);
+            this.loadMoreError = false;
+
+            await this.entries.loadNextPage();
         } catch (error) {
             this.loadMoreError = true;
             CoreDomUtils.showErrorModalDefault(error, 'addon.mod_glossary.errorloadingentries', true);
@@ -406,21 +322,34 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
      * @param event Event.
      */
     async openModePicker(event: MouseEvent): Promise<void> {
-        const mode = await CoreDomUtils.openPopover<AddonModGlossaryFetchMode>({
+        if (!this.glossary) {
+            return;
+        }
+
+        const previousMode = this.entries.getSource().fetchMode;
+        const newMode = await CoreDomUtils.openPopover<AddonModGlossaryFetchMode>({
             component: AddonModGlossaryModePickerPopoverComponent,
             componentProps: {
-                browseModes: this.glossary!.browsemodes,
-                selectedMode: this.isSearch ? '' : this.fetchMode,
+                browseModes: this.glossary.browsemodes,
+                selectedMode: this.isSearch ? '' : previousMode,
             },
             event,
         });
 
-        if (mode) {
-            if (mode !== this.fetchMode) {
-                this.changeFetchMode(mode);
-            } else if (this.isSearch) {
-                this.toggleSearch();
-            }
+        if (!newMode) {
+            return;
+        }
+
+        if (newMode !== previousMode) {
+            this.changeFetchMode(newMode);
+
+            return;
+        }
+
+        if (this.isSearch) {
+            this.toggleSearch();
+
+            return;
         }
     }
 
@@ -429,20 +358,22 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
      */
     toggleSearch(): void {
         if (this.isSearch) {
-            this.isSearch = false;
-            this.hasSearched = false;
-            this.entries.setOnlineEntries(this.fetchedEntries, this.fetchedEntriesCanLoadMore);
-            this.switchMode(this.fetchMode!);
-        } else {
-            // Search for entries. The fetch function will be set when searching.
-            this.getDivider = undefined;
-            this.showDivider = () => false;
-            this.isSearch = true;
+            const fetchMode = this.entries.getSource().fetchMode;
 
-            this.fetchedEntries = this.entries.onlineEntries;
-            this.fetchedEntriesCanLoadMore = !this.entries.completed;
-            this.entries.setItems([], false);
+            fetchMode && this.switchMode(fetchMode);
+            this.entries.getSource().stopSearch(this.fetchedEntries, this.fetchedEntriesCanLoadMore);
+
+            return;
         }
+
+        // Search for entries. The fetch function will be set when searching.
+        this.fetchedEntries = this.entries.getSource().onlineEntries;
+        this.fetchedEntriesCanLoadMore = !this.entries.completed;
+        this.getDivider = undefined;
+        this.showDivider = () => false;
+
+        this.entries.reset();
+        this.entries.getSource().startSearch();
     }
 
     /**
@@ -451,7 +382,6 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
      * @param mode Mode.
      */
     changeFetchMode(mode: AddonModGlossaryFetchMode): void {
-        this.isSearch = false;
         this.loadingMessage = Translate.instant('core.loading');
         this.content?.scrollToTop();
         this.switchMode(mode);
@@ -463,7 +393,7 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
      * Opens new entry editor.
      */
     openNewEntry(): void {
-        this.entries.select({ newEntry: true });
+        this.entries.select(AddonModGlossaryEntriesSource.NEW_ENTRY);
     }
 
     /**
@@ -473,24 +403,9 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
      */
     search(query: string): void {
         this.loadingMessage = Translate.instant('core.searching');
-        this.fetchFunction = AddonModGlossary.getEntriesBySearch.bind(
-            AddonModGlossary.instance,
-            this.glossary!.id,
-            query,
-            true,
-            'CONCEPT',
-            'ASC',
-        );
-        this.fetchInvalidate = AddonModGlossary.invalidateEntriesBySearch.bind(
-            AddonModGlossary.instance,
-            this.glossary!.id,
-            query,
-            true,
-            'CONCEPT',
-            'ASC',
-        );
         this.loaded = false;
-        this.hasSearched = true;
+
+        this.entries.getSource().search(query);
         this.loadContent();
     }
 
@@ -503,154 +418,44 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
         this.addEntryObserver?.off();
         this.ratingOfflineObserver?.off();
         this.ratingSyncObserver?.off();
+        this.sourceUnsubscribe?.call(null);
+        this.entries.destroy();
     }
 
 }
 
-/**
- * Type to select the new entry form.
- */
-type NewEntryForm = { newEntry: true };
-
-/**
- * Type of items that can be held by the entries manager.
- */
-type EntryItem = AddonModGlossaryEntry | AddonModGlossaryOfflineEntry | NewEntryForm;
-
 /**
  * Entries manager.
  */
-class AddonModGlossaryEntriesManager extends CorePageItemsListManager<EntryItem> {
+class AddonModGlossaryEntriesManager extends CoreListItemsManager<AddonModGlossaryEntryItem, AddonModGlossaryEntriesSource> {
 
-    onlineEntries: AddonModGlossaryEntry[] = [];
-    offlineEntries: AddonModGlossaryOfflineEntry[] = [];
-
-    protected glossaryPathPrefix: string;
-    protected component: AddonModGlossaryIndexComponent;
-
-    constructor(
-        pageComponent: unknown,
-        component: AddonModGlossaryIndexComponent,
-        glossaryPathPrefix: string,
-    ) {
-        super(pageComponent);
-
-        this.component = component;
-        this.glossaryPathPrefix = glossaryPathPrefix;
+    get offlineEntries(): AddonModGlossaryOfflineEntry[] {
+        return this.getSource().offlineEntries;
     }
 
-    /**
-     * Type guard to infer NewEntryForm objects.
-     *
-     * @param entry Item to check.
-     * @return Whether the item is a new entry form.
-     */
-    isNewEntryForm(entry: EntryItem): entry is NewEntryForm {
-        return 'newEntry' in entry;
-    }
-
-    /**
-     * Type guard to infer entry objects.
-     *
-     * @param entry Item to check.
-     * @return Whether the item is an offline entry.
-     */
-    isOfflineEntry(entry: EntryItem): entry is AddonModGlossaryOfflineEntry {
-        return !this.isNewEntryForm(entry) && !this.isOnlineEntry(entry);
-    }
-
-    /**
-     * Type guard to infer entry objects.
-     *
-     * @param entry Item to check.
-     * @return Whether the item is an offline entry.
-     */
-    isOnlineEntry(entry: EntryItem): entry is AddonModGlossaryEntry {
-        return 'id' in entry;
-    }
-
-    /**
-     * Update online entries items.
-     *
-     * @param onlineEntries Online entries.
-     */
-    setOnlineEntries(onlineEntries: AddonModGlossaryEntry[], hasMoreItems: boolean = false): void {
-        this.setItems((<EntryItem[]> this.offlineEntries).concat(onlineEntries), hasMoreItems);
-    }
-
-    /**
-     * Update offline entries items.
-     *
-     * @param offlineEntries Offline entries.
-     */
-    setOfflineEntries(offlineEntries: AddonModGlossaryOfflineEntry[]): void {
-        this.setItems((<EntryItem[]> offlineEntries).concat(this.onlineEntries), this.hasMoreItems);
+    get onlineEntries(): AddonModGlossaryEntry[] {
+        return this.getSource().onlineEntries;
     }
 
     /**
      * @inheritdoc
      */
-    setItems(entries: EntryItem[], hasMoreItems: boolean = false): void {
-        super.setItems(entries, hasMoreItems);
-
-        this.onlineEntries = [];
-        this.offlineEntries = [];
-        this.items.forEach(entry => {
-            if (this.isOfflineEntry(entry)) {
-                this.offlineEntries.push(entry);
-            } else if (this.isOnlineEntry(entry)) {
-                this.onlineEntries.push(entry);
-            }
-        });
+    protected getDefaultItem(): AddonModGlossaryEntryItem | null {
+        return this.getSource().onlineEntries[0] || null;
     }
 
     /**
      * @inheritdoc
      */
-    resetItems(): void {
-        super.resetItems();
-        this.onlineEntries = [];
-        this.offlineEntries = [];
-    }
+    protected async logActivity(): Promise<void> {
+        const glossary = this.getSource().glossary;
+        const viewMode = this.getSource().viewMode;
 
-    /**
-     * @inheritdoc
-     */
-    protected getItemPath(entry: EntryItem): string {
-        if (this.isOnlineEntry(entry)) {
-            return `${this.glossaryPathPrefix}entry/${entry.id}`;
+        if (!glossary || !viewMode) {
+            return;
         }
 
-        if (this.isOfflineEntry(entry)) {
-            return `${this.glossaryPathPrefix}edit/${entry.timecreated}`;
-        }
-
-        return `${this.glossaryPathPrefix}edit/0`;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    getItemQueryParams(entry: EntryItem): Params {
-        const params: Params = {
-            cmId: this.component.module.id,
-            courseId: this.component.courseId,
-        };
-
-        if (this.isOfflineEntry(entry)) {
-            params.concept = entry.concept;
-        }
-
-        return params;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected getDefaultItem(): EntryItem | null {
-        return this.onlineEntries[0] || null;
+        await AddonModGlossary.logView(glossary.id, viewMode, glossary.name);
     }
 
 }
-
-export type AddonModGlossaryFetchMode = 'author_all' | 'cat_all' | 'newest_first' | 'recently_updated' | 'letter_all';
diff --git a/src/addons/mod/glossary/components/mode-picker/mode-picker.ts b/src/addons/mod/glossary/components/mode-picker/mode-picker.ts
index e3e08071b..d808d3b76 100644
--- a/src/addons/mod/glossary/components/mode-picker/mode-picker.ts
+++ b/src/addons/mod/glossary/components/mode-picker/mode-picker.ts
@@ -14,7 +14,7 @@
 
 import { Component, Input, OnInit } from '@angular/core';
 import { PopoverController } from '@singletons';
-import { AddonModGlossaryFetchMode } from '../index';
+import { AddonModGlossaryFetchMode } from '../../classes/glossary-entries-source';
 
 /**
  * Component to display the mode picker.
diff --git a/src/addons/mod/glossary/glossary.module.ts b/src/addons/mod/glossary/glossary.module.ts
index 9a4b09793..1b3e27e42 100644
--- a/src/addons/mod/glossary/glossary.module.ts
+++ b/src/addons/mod/glossary/glossary.module.ts
@@ -51,10 +51,12 @@ const mainMenuRoutes: Routes = [
     {
         path: `${AddonModGlossaryModuleHandlerService.PAGE_NAME}/entry/:entryId`,
         loadChildren: () => import('./pages/entry/entry.module').then(m => m.AddonModGlossaryEntryPageModule),
+        data: { swipeEnabled: false },
     },
     {
         path: `${AddonModGlossaryModuleHandlerService.PAGE_NAME}/edit/:timecreated`,
         loadChildren: () => import('./pages/edit/edit.module').then(m => m.AddonModGlossaryEditPageModule),
+        data: { swipeEnabled: false },
     },
     {
         path: AddonModGlossaryModuleHandlerService.PAGE_NAME,
@@ -65,10 +67,12 @@ const mainMenuRoutes: Routes = [
             {
                 path: `${COURSE_CONTENTS_PATH}/${AddonModGlossaryModuleHandlerService.PAGE_NAME}/entry/:entryId`,
                 loadChildren: () => import('./pages/entry/entry.module').then(m => m.AddonModGlossaryEntryPageModule),
+                data: { glossaryPathPrefix: `${AddonModGlossaryModuleHandlerService.PAGE_NAME}/` },
             },
             {
                 path: `${COURSE_CONTENTS_PATH}/${AddonModGlossaryModuleHandlerService.PAGE_NAME}/edit/:timecreated`,
                 loadChildren: () => import('./pages/edit/edit.module').then(m => m.AddonModGlossaryEditPageModule),
+                data: { glossaryPathPrefix: `${AddonModGlossaryModuleHandlerService.PAGE_NAME}/` },
             },
         ],
         () => CoreScreen.isMobile,
@@ -80,10 +84,12 @@ const courseContentsRoutes: Routes = conditionalRoutes(
         {
             path: `${AddonModGlossaryModuleHandlerService.PAGE_NAME}/entry/:entryId`,
             loadChildren: () => import('./pages/entry/entry.module').then(m => m.AddonModGlossaryEntryPageModule),
+            data: { glossaryPathPrefix: `${AddonModGlossaryModuleHandlerService.PAGE_NAME}/` },
         },
         {
             path: `${AddonModGlossaryModuleHandlerService.PAGE_NAME}/edit/:timecreated`,
             loadChildren: () => import('./pages/edit/edit.module').then(m => m.AddonModGlossaryEditPageModule),
+            data: { glossaryPathPrefix: `${AddonModGlossaryModuleHandlerService.PAGE_NAME}/` },
         },
     ],
     () => CoreScreen.isTablet,
diff --git a/src/addons/mod/glossary/pages/edit/edit.html b/src/addons/mod/glossary/pages/edit/edit.html
index 55faf51fe..4b195ebab 100644
--- a/src/addons/mod/glossary/pages/edit/edit.html
+++ b/src/addons/mod/glossary/pages/edit/edit.html
@@ -12,72 +12,75 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <core-loading [hideUntil]="loaded">
-        <form #editFormEl *ngIf="glossary">
-            <ion-item>
-                <ion-label position="stacked">{{ 'addon.mod_glossary.concept' | translate }}</ion-label>
-                <ion-input type="text" [placeholder]="'addon.mod_glossary.concept' | translate" [(ngModel)]="entry.concept" name="concept">
-                </ion-input>
-            </ion-item>
-            <ion-item>
-                <ion-label position="stacked">{{ 'addon.mod_glossary.definition' | translate }}</ion-label>
-                <core-rich-text-editor [control]="definitionControl" (contentChanged)="onDefinitionChange($event)"
-                    [placeholder]="'addon.mod_glossary.definition' | translate" name="addon_mod_glossary_edit" [component]="component"
-                    [componentId]="cmId" [autoSave]="true" contextLevel="module" [contextInstanceId]="cmId" elementId="definition_editor"
-                    [draftExtraParams]="editorExtraParams">
-                </core-rich-text-editor>
-            </ion-item>
-            <ion-item *ngIf="categories.length > 0">
-                <ion-label position="stacked" id="addon-mod-glossary-categories-label">
-                    {{ 'addon.mod_glossary.categories' | translate }}
-                </ion-label>
-                <ion-select [(ngModel)]="options.categories" multiple="true" aria-labelledby="addon-mod-glossary-categories-label"
-                    interface="action-sheet" [placeholder]="'addon.mod_glossary.categories' | translate" name="categories"
-                    [interfaceOptions]="{header: 'addon.mod_glossary.categories' | translate}">
-                    <ion-select-option *ngFor="let category of categories" [value]="category.id">
-                        {{ category.name }}
-                    </ion-select-option>
-                </ion-select>
-            </ion-item>
-            <ion-item>
-                <ion-label position="stacked" id="addon-mod-glossary-aliases-label">
-                    {{ 'addon.mod_glossary.aliases' | translate }}
-                </ion-label>
-                <ion-textarea [(ngModel)]="options.aliases" rows="1" [core-auto-rows]="options.aliases"
-                    aria-labelledby="addon-mod-glossary-aliases-label" name="aliases">
-                </ion-textarea>
-            </ion-item>
-            <ion-item-divider>
-                <ion-label>
-                    <h2>{{ 'addon.mod_glossary.attachment' | translate }}</h2>
-                </ion-label>
-            </ion-item-divider>
-            <core-attachments [files]="attachments" [component]="component" [componentId]="glossary.coursemodule" [allowOffline]="true"
-                [courseId]="courseId">
-            </core-attachments>
-            <ng-container *ngIf="glossary.usedynalink">
+    <core-swipe-navigation [manager]="entries">
+        <core-loading [hideUntil]="loaded">
+            <form #editFormEl *ngIf="glossary">
+                <ion-item>
+                    <ion-label position="stacked">{{ 'addon.mod_glossary.concept' | translate }}</ion-label>
+                    <ion-input type="text" [placeholder]="'addon.mod_glossary.concept' | translate" [(ngModel)]="entry.concept"
+                        name="concept">
+                    </ion-input>
+                </ion-item>
+                <ion-item>
+                    <ion-label position="stacked">{{ 'addon.mod_glossary.definition' | translate }}</ion-label>
+                    <core-rich-text-editor [control]="definitionControl" (contentChanged)="onDefinitionChange($event)"
+                        [placeholder]="'addon.mod_glossary.definition' | translate" name="addon_mod_glossary_edit" [component]="component"
+                        [componentId]="cmId" [autoSave]="true" contextLevel="module" [contextInstanceId]="cmId"
+                        elementId="definition_editor" [draftExtraParams]="editorExtraParams">
+                    </core-rich-text-editor>
+                </ion-item>
+                <ion-item *ngIf="categories.length > 0">
+                    <ion-label position="stacked" id="addon-mod-glossary-categories-label">
+                        {{ 'addon.mod_glossary.categories' | translate }}
+                    </ion-label>
+                    <ion-select [(ngModel)]="options.categories" multiple="true" aria-labelledby="addon-mod-glossary-categories-label"
+                        interface="action-sheet" [placeholder]="'addon.mod_glossary.categories' | translate" name="categories"
+                        [interfaceOptions]="{header: 'addon.mod_glossary.categories' | translate}">
+                        <ion-select-option *ngFor="let category of categories" [value]="category.id">
+                            {{ category.name }}
+                        </ion-select-option>
+                    </ion-select>
+                </ion-item>
+                <ion-item>
+                    <ion-label position="stacked" id="addon-mod-glossary-aliases-label">
+                        {{ 'addon.mod_glossary.aliases' | translate }}
+                    </ion-label>
+                    <ion-textarea [(ngModel)]="options.aliases" rows="1" [core-auto-rows]="options.aliases"
+                        aria-labelledby="addon-mod-glossary-aliases-label" name="aliases">
+                    </ion-textarea>
+                </ion-item>
                 <ion-item-divider>
                     <ion-label>
-                        <h2>{{ 'addon.mod_glossary.linking' | translate }}</h2>
+                        <h2>{{ 'addon.mod_glossary.attachment' | translate }}</h2>
                     </ion-label>
                 </ion-item-divider>
-                <ion-item class="ion-text-wrap">
-                    <ion-label>{{ 'addon.mod_glossary.entryusedynalink' | translate }}</ion-label>
-                    <ion-toggle [(ngModel)]="options.usedynalink" name="usedynalink"></ion-toggle>
-                </ion-item>
-                <ion-item class="ion-text-wrap">
-                    <ion-label>{{ 'addon.mod_glossary.casesensitive' | translate }}</ion-label>
-                    <ion-toggle [disabled]="!options.usedynalink" [(ngModel)]="options.casesensitive" name="casesensitive">
-                    </ion-toggle>
-                </ion-item>
-                <ion-item class="ion-text-wrap">
-                    <ion-label>{{ 'addon.mod_glossary.fullmatch' | translate }}</ion-label>
-                    <ion-toggle [disabled]="!options.usedynalink" [(ngModel)]="options.fullmatch" name="fullmatch"></ion-toggle>
-                </ion-item>
-            </ng-container>
-            <ion-button class="ion-margin" expand="block" [disabled]="!entry.concept || !entry.definition" (click)="save()">
-                {{ 'core.save' | translate }}
-            </ion-button>
-        </form>
-    </core-loading>
+                <core-attachments [files]="attachments" [component]="component" [componentId]="glossary.coursemodule" [allowOffline]="true"
+                    [courseId]="courseId">
+                </core-attachments>
+                <ng-container *ngIf="glossary.usedynalink">
+                    <ion-item-divider>
+                        <ion-label>
+                            <h2>{{ 'addon.mod_glossary.linking' | translate }}</h2>
+                        </ion-label>
+                    </ion-item-divider>
+                    <ion-item class="ion-text-wrap">
+                        <ion-label>{{ 'addon.mod_glossary.entryusedynalink' | translate }}</ion-label>
+                        <ion-toggle [(ngModel)]="options.usedynalink" name="usedynalink"></ion-toggle>
+                    </ion-item>
+                    <ion-item class="ion-text-wrap">
+                        <ion-label>{{ 'addon.mod_glossary.casesensitive' | translate }}</ion-label>
+                        <ion-toggle [disabled]="!options.usedynalink" [(ngModel)]="options.casesensitive" name="casesensitive">
+                        </ion-toggle>
+                    </ion-item>
+                    <ion-item class="ion-text-wrap">
+                        <ion-label>{{ 'addon.mod_glossary.fullmatch' | translate }}</ion-label>
+                        <ion-toggle [disabled]="!options.usedynalink" [(ngModel)]="options.fullmatch" name="fullmatch"></ion-toggle>
+                    </ion-item>
+                </ng-container>
+                <ion-button class="ion-margin" expand="block" [disabled]="!entry.concept || !entry.definition" (click)="save()">
+                    {{ 'core.save' | translate }}
+                </ion-button>
+            </form>
+        </core-loading>
+    </core-swipe-navigation>
 </ion-content>
diff --git a/src/addons/mod/glossary/pages/edit/edit.ts b/src/addons/mod/glossary/pages/edit/edit.ts
index 33f384fc3..dfb06aa5d 100644
--- a/src/addons/mod/glossary/pages/edit/edit.ts
+++ b/src/addons/mod/glossary/pages/edit/edit.ts
@@ -12,9 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, OnInit, ViewChild, ElementRef, Optional } from '@angular/core';
+import { Component, OnInit, ViewChild, ElementRef, Optional, OnDestroy } from '@angular/core';
 import { FormControl } from '@angular/forms';
+import { ActivatedRoute, ActivatedRouteSnapshot } from '@angular/router';
 import { CoreError } from '@classes/errors/error';
+import { CoreItemsManagerSourcesTracker } from '@classes/items-management/items-manager-sources-tracker';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import { CoreFileUploader, CoreFileUploaderStoreFilesResult } from '@features/fileuploader/services/fileuploader';
 import { CanLeave } from '@guards/can-leave';
@@ -26,6 +28,8 @@ import { CoreTextUtils } from '@services/utils/text';
 import { Translate } from '@singletons';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreForms } from '@singletons/form';
+import { AddonModGlossaryEntriesSource } from '../../classes/glossary-entries-source';
+import { AddonModGlossaryEntriesSwipeManager } from '../../classes/glossary-entries-swipe-manager';
 import {
     AddonModGlossary,
     AddonModGlossaryCategory,
@@ -45,7 +49,7 @@ import { AddonModGlossaryOffline } from '../../services/glossary-offline';
     selector: 'page-addon-mod-glossary-edit',
     templateUrl: 'edit.html',
 })
-export class AddonModGlossaryEditPage implements OnInit, CanLeave {
+export class AddonModGlossaryEditPage implements OnInit, OnDestroy, CanLeave {
 
     @ViewChild('editFormEl') formElement?: ElementRef;
 
@@ -64,6 +68,8 @@ export class AddonModGlossaryEditPage implements OnInit, CanLeave {
         timecreated: 0,
     };
 
+    entries?: AddonModGlossaryEditEntriesSwipeManager;
+
     options = {
         categories: <string[]> [],
         aliases: '',
@@ -80,18 +86,30 @@ export class AddonModGlossaryEditPage implements OnInit, CanLeave {
     protected originalData?: AddonModGlossaryNewEntryWithFiles;
     protected saved = false;
 
-    constructor(@Optional() protected splitView: CoreSplitViewComponent) {}
+    constructor(protected route: ActivatedRoute, @Optional() protected splitView: CoreSplitViewComponent) {}
 
     /**
      * Component being initialized.
      */
-    ngOnInit(): void {
+    async ngOnInit(): Promise<void> {
         try {
+            const routeData = this.route.snapshot.data;
             this.cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
             this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
             this.timecreated = CoreNavigator.getRequiredRouteNumberParam('timecreated');
             this.concept = CoreNavigator.getRouteParam<string>('concept') || '';
             this.editorExtraParams.timecreated = this.timecreated;
+
+            if (this.timecreated !== 0 && (routeData.swipeEnabled ?? true)) {
+                const source = CoreItemsManagerSourcesTracker.getOrCreateSource(
+                    AddonModGlossaryEntriesSource,
+                    [this.courseId, this.cmId, routeData.glossaryPathPrefix ?? ''],
+                );
+
+                this.entries = new AddonModGlossaryEditEntriesSwipeManager(source);
+
+                await this.entries.start();
+            }
         } catch (error) {
             CoreDomUtils.showErrorModal(error);
 
@@ -103,6 +121,13 @@ export class AddonModGlossaryEditPage implements OnInit, CanLeave {
         this.fetchData();
     }
 
+    /**
+     * @inheritdoc
+     */
+    ngOnDestroy(): void {
+        this.entries?.destroy();
+    }
+
     /**
      * Fetch required data.
      *
@@ -134,7 +159,11 @@ export class AddonModGlossaryEditPage implements OnInit, CanLeave {
      * @return Promise resolved when done.
      */
     protected async loadOfflineData(): Promise<void> {
-        const entry = await AddonModGlossaryOffline.getNewEntry(this.glossary!.id, this.concept, this.timecreated);
+        if (!this.glossary) {
+            return;
+        }
+
+        const entry = await AddonModGlossaryOffline.getNewEntry(this.glossary.id, this.concept, this.timecreated);
 
         this.entry.concept = entry.concept || '';
         this.entry.definition = entry.definition || '';
@@ -159,7 +188,7 @@ export class AddonModGlossaryEditPage implements OnInit, CanLeave {
 
         // Treat offline attachments if any.
         if (entry.attachments?.offline) {
-            this.attachments = await AddonModGlossaryHelper.getStoredFiles(this.glossary!.id, entry.concept, entry.timecreated);
+            this.attachments = await AddonModGlossaryHelper.getStoredFiles(this.glossary.id, entry.concept, entry.timecreated);
 
             this.originalData.files = this.attachments.slice();
         }
@@ -236,6 +265,10 @@ export class AddonModGlossaryEditPage implements OnInit, CanLeave {
         definition = CoreTextUtils.formatHtmlLines(definition);
 
         try {
+            if (!this.glossary) {
+                return;
+            }
+
             // Upload attachments first if any.
             const { saveOffline, attachmentsResult } = await this.uploadAttachments(timecreated);
 
@@ -244,7 +277,7 @@ export class AddonModGlossaryEditPage implements OnInit, CanLeave {
                 categories: this.options.categories.join(','),
             };
 
-            if (this.glossary!.usedynalink) {
+            if (this.glossary.usedynalink) {
                 options.usedynalink = this.options.usedynalink ? 1 : 0;
                 if (this.options.usedynalink) {
                     options.casesensitive = this.options.casesensitive ? 1 : 0;
@@ -253,9 +286,9 @@ export class AddonModGlossaryEditPage implements OnInit, CanLeave {
             }
 
             if (saveOffline) {
-                if (this.entry && !this.glossary!.allowduplicatedentries) {
+                if (this.entry && !this.glossary.allowduplicatedentries) {
                     // Check if the entry is duplicated in online or offline mode.
-                    const isUsed = await AddonModGlossary.isConceptUsed(this.glossary!.id, this.entry.concept, {
+                    const isUsed = await AddonModGlossary.isConceptUsed(this.glossary.id, this.entry.concept, {
                         timeCreated: this.entry.timecreated,
                         cmId: this.cmId,
                     });
@@ -268,7 +301,7 @@ export class AddonModGlossaryEditPage implements OnInit, CanLeave {
 
                 // Save entry in offline.
                 await AddonModGlossaryOffline.addNewEntry(
-                    this.glossary!.id,
+                    this.glossary.id,
                     this.entry.concept,
                     definition,
                     this.courseId,
@@ -283,7 +316,7 @@ export class AddonModGlossaryEditPage implements OnInit, CanLeave {
                 // Try to send it to server.
                 // Don't allow offline if there are attachments since they were uploaded fine.
                 await AddonModGlossary.addEntry(
-                    this.glossary!.id,
+                    this.glossary.id,
                     this.entry.concept,
                     definition,
                     this.courseId,
@@ -293,7 +326,7 @@ export class AddonModGlossaryEditPage implements OnInit, CanLeave {
                         timeCreated: timecreated,
                         discardEntry: this.entry,
                         allowOffline: !this.attachments.length,
-                        checkDuplicates: !this.glossary!.allowduplicatedentries,
+                        checkDuplicates: !this.glossary.allowduplicatedentries,
                     },
                 );
             }
@@ -303,12 +336,12 @@ export class AddonModGlossaryEditPage implements OnInit, CanLeave {
 
             if (entryId) {
                 // Data sent to server, delete stored files (if any).
-                AddonModGlossaryHelper.deleteStoredFiles(this.glossary!.id, this.entry.concept, timecreated);
+                AddonModGlossaryHelper.deleteStoredFiles(this.glossary.id, this.entry.concept, timecreated);
                 CoreEvents.trigger(CoreEvents.ACTIVITY_DATA_SENT, { module: 'glossary' });
             }
 
             CoreEvents.trigger(AddonModGlossaryProvider.ADD_ENTRY_EVENT, {
-                glossaryId: this.glossary!.id,
+                glossaryId: this.glossary.id,
                 entryId: entryId,
             }, CoreSites.getCurrentSiteId());
 
@@ -342,7 +375,7 @@ export class AddonModGlossaryEditPage implements OnInit, CanLeave {
     protected async uploadAttachments(
         timecreated: number,
     ): Promise<{saveOffline: boolean; attachmentsResult?: number | CoreFileUploaderStoreFilesResult}> {
-        if (!this.attachments.length) {
+        if (!this.attachments.length || !this.glossary) {
             return {
                 saveOffline: false,
             };
@@ -352,7 +385,7 @@ export class AddonModGlossaryEditPage implements OnInit, CanLeave {
             const attachmentsResult = await CoreFileUploader.uploadOrReuploadFiles(
                 this.attachments,
                 AddonModGlossaryProvider.COMPONENT,
-                this.glossary!.id,
+                this.glossary.id,
             );
 
             return {
@@ -362,7 +395,7 @@ export class AddonModGlossaryEditPage implements OnInit, CanLeave {
         } catch {
             // Cannot upload them in online, save them in offline.
             const attachmentsResult = await AddonModGlossaryHelper.storeFiles(
-                this.glossary!.id,
+                this.glossary.id,
                 this.entry.concept,
                 timecreated,
                 this.attachments,
@@ -387,3 +420,17 @@ export class AddonModGlossaryEditPage implements OnInit, CanLeave {
     }
 
 }
+
+/**
+ * Helper to manage swiping within a collection of glossary entries.
+ */
+class AddonModGlossaryEditEntriesSwipeManager extends AddonModGlossaryEntriesSwipeManager {
+
+    /**
+     * @inheritdoc
+     */
+    protected getSelectedItemPathFromRoute(route: ActivatedRouteSnapshot): string | null {
+        return `${this.getSource().GLOSSARY_PATH_PREFIX}edit/${route.params.timecreated}`;
+    }
+
+}
diff --git a/src/addons/mod/glossary/pages/entry/entry.html b/src/addons/mod/glossary/pages/entry/entry.html
index 03737a4a1..e5d870d40 100644
--- a/src/addons/mod/glossary/pages/entry/entry.html
+++ b/src/addons/mod/glossary/pages/entry/entry.html
@@ -12,73 +12,75 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="doRefresh($event.target)">
-        <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
-    </ion-refresher>
+    <core-swipe-navigation [manager]="entries">
+        <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="doRefresh($event.target)">
+            <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
+        </ion-refresher>
 
-    <core-loading [hideUntil]="loaded">
-        <ng-container *ngIf="entry && loaded">
-            <ion-item class="ion-text-wrap" *ngIf="showAuthor">
-                <core-user-avatar [user]="entry" slot="start"></core-user-avatar>
-                <ion-label>
-                    <h2>
-                        <core-format-text [text]="entry.concept" contextLevel="module" [contextInstanceId]="componentId"
-                            [courseId]="courseId">
+        <core-loading [hideUntil]="loaded">
+            <ng-container *ngIf="entry && loaded">
+                <ion-item class="ion-text-wrap" *ngIf="showAuthor">
+                    <core-user-avatar [user]="entry" slot="start"></core-user-avatar>
+                    <ion-label>
+                        <h2>
+                            <core-format-text [text]="entry.concept" contextLevel="module" [contextInstanceId]="componentId"
+                                [courseId]="courseId">
+                            </core-format-text>
+                        </h2>
+                        <p>{{ entry.userfullname }}</p>
+                    </ion-label>
+                    <ion-note slot="end" *ngIf="showDate">{{ entry.timemodified | coreDateDayOrTime }}</ion-note>
+                </ion-item>
+                <ion-item class="ion-text-wrap" *ngIf="!showAuthor">
+                    <ion-label>
+                        <p class="item-heading">
+                            <core-format-text [text]="entry.concept" contextLevel="module" [contextInstanceId]="componentId">
+                            </core-format-text>
+                        </p>
+                    </ion-label>
+                    <ion-note slot="end" *ngIf="showDate">{{ entry.timemodified | coreDateDayOrTime }}</ion-note>
+                </ion-item>
+                <ion-item class="ion-text-wrap">
+                    <ion-label>
+                        <core-format-text [component]="component" [componentId]="componentId" [text]="entry.definition"
+                            contextLevel="module" [contextInstanceId]="componentId" [courseId]="courseId">
                         </core-format-text>
-                    </h2>
-                    <p>{{ entry.userfullname }}</p>
-                </ion-label>
-                <ion-note slot="end" *ngIf="showDate">{{ entry.timemodified | coreDateDayOrTime }}</ion-note>
-            </ion-item>
-            <ion-item class="ion-text-wrap" *ngIf="!showAuthor">
-                <ion-label>
-                    <p class="item-heading">
-                        <core-format-text [text]="entry.concept" contextLevel="module" [contextInstanceId]="componentId">
-                        </core-format-text>
-                    </p>
-                </ion-label>
-                <ion-note slot="end" *ngIf="showDate">{{ entry.timemodified | coreDateDayOrTime }}</ion-note>
-            </ion-item>
-            <ion-item class="ion-text-wrap">
-                <ion-label>
-                    <core-format-text [component]="component" [componentId]="componentId" [text]="entry.definition" contextLevel="module"
-                        [contextInstanceId]="componentId" [courseId]="courseId">
-                    </core-format-text>
-                </ion-label>
-            </ion-item>
-            <div *ngIf="entry.attachment" lines="none">
-                <core-file *ngFor="let file of entry.attachments" [file]="file" [component]="component" [componentId]="componentId">
-                </core-file>
-            </div>
-            <ion-item class="ion-text-wrap" *ngIf="tagsEnabled && entry && entry.tags && entry.tags.length > 0">
-                <ion-label>
-                    <div slot="start">{{ 'core.tag.tags' | translate }}:</div>
-                    <core-tag-list [tags]="entry.tags"></core-tag-list>
-                </ion-label>
-            </ion-item>
-            <ion-item class="ion-text-wrap" *ngIf="!entry.approved">
-                <ion-label>
-                    <p><em>{{ 'addon.mod_glossary.entrypendingapproval' | translate }}</em></p>
-                </ion-label>
-            </ion-item>
-            <core-comments *ngIf="glossary && glossary.allowcomments && entry && entry.id > 0 && commentsEnabled" contextLevel="module"
-                [instanceId]="glossary.coursemodule" component="mod_glossary" [itemId]="entry.id" area="glossary_entry"
-                [courseId]="glossary.course" [showItem]="true">
-            </core-comments>
-            <core-rating-rate *ngIf="glossary && ratingInfo" [ratingInfo]="ratingInfo" contextLevel="module"
-                [instanceId]="glossary.coursemodule" [itemId]="entry.id" [itemSetId]="0" [courseId]="glossary.course"
-                [aggregateMethod]="glossary.assessed" [scaleId]="glossary.scale" [userId]="entry.userid" (onUpdate)="ratingUpdated()">
-            </core-rating-rate>
-            <core-rating-aggregate *ngIf="glossary && ratingInfo" [ratingInfo]="ratingInfo" contextLevel="module"
-                [instanceId]="glossary.coursemodule" [itemId]="entry.id" [courseId]="glossary.course" [aggregateMethod]="glossary.assessed"
-                [scaleId]="glossary.scale">
-            </core-rating-aggregate>
-        </ng-container>
+                    </ion-label>
+                </ion-item>
+                <div *ngIf="entry.attachment" lines="none">
+                    <core-file *ngFor="let file of entry.attachments" [file]="file" [component]="component" [componentId]="componentId">
+                    </core-file>
+                </div>
+                <ion-item class="ion-text-wrap" *ngIf="tagsEnabled && entry && entry.tags && entry.tags.length > 0">
+                    <ion-label>
+                        <div slot="start">{{ 'core.tag.tags' | translate }}:</div>
+                        <core-tag-list [tags]="entry.tags"></core-tag-list>
+                    </ion-label>
+                </ion-item>
+                <ion-item class="ion-text-wrap" *ngIf="!entry.approved">
+                    <ion-label>
+                        <p><em>{{ 'addon.mod_glossary.entrypendingapproval' | translate }}</em></p>
+                    </ion-label>
+                </ion-item>
+                <core-comments *ngIf="glossary && glossary.allowcomments && entry && entry.id > 0 && commentsEnabled" contextLevel="module"
+                    [instanceId]="glossary.coursemodule" component="mod_glossary" [itemId]="entry.id" area="glossary_entry"
+                    [courseId]="glossary.course" [showItem]="true">
+                </core-comments>
+                <core-rating-rate *ngIf="glossary && ratingInfo" [ratingInfo]="ratingInfo" contextLevel="module"
+                    [instanceId]="glossary.coursemodule" [itemId]="entry.id" [itemSetId]="0" [courseId]="glossary.course"
+                    [aggregateMethod]="glossary.assessed" [scaleId]="glossary.scale" [userId]="entry.userid" (onUpdate)="ratingUpdated()">
+                </core-rating-rate>
+                <core-rating-aggregate *ngIf="glossary && ratingInfo" [ratingInfo]="ratingInfo" contextLevel="module"
+                    [instanceId]="glossary.coursemodule" [itemId]="entry.id" [courseId]="glossary.course"
+                    [aggregateMethod]="glossary.assessed" [scaleId]="glossary.scale">
+                </core-rating-aggregate>
+            </ng-container>
 
-        <ion-card *ngIf="!entry" class="core-warning-card">
-            <ion-item>
-                <ion-label>{{ 'addon.mod_glossary.errorloadingentry' | translate }}</ion-label>
-            </ion-item>
-        </ion-card>
-    </core-loading>
+            <ion-card *ngIf="!entry" class="core-warning-card">
+                <ion-item>
+                    <ion-label>{{ 'addon.mod_glossary.errorloadingentry' | translate }}</ion-label>
+                </ion-item>
+            </ion-card>
+        </core-loading>
+    </core-swipe-navigation>
 </ion-content>
diff --git a/src/addons/mod/glossary/pages/entry/entry.ts b/src/addons/mod/glossary/pages/entry/entry.ts
index ae3c836e4..d88b470c1 100644
--- a/src/addons/mod/glossary/pages/entry/entry.ts
+++ b/src/addons/mod/glossary/pages/entry/entry.ts
@@ -12,7 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, OnInit, ViewChild } from '@angular/core';
+import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute, ActivatedRouteSnapshot } from '@angular/router';
+import { CoreItemsManagerSourcesTracker } from '@classes/items-management/items-manager-sources-tracker';
 import { CoreCommentsCommentsComponent } from '@features/comments/components/comments/comments';
 import { CoreComments } from '@features/comments/services/comments';
 import { CoreRatingInfo } from '@features/rating/services/rating';
@@ -21,6 +23,8 @@ import { IonRefresher } from '@ionic/angular';
 import { CoreNavigator } from '@services/navigator';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
+import { AddonModGlossaryEntriesSource } from '../../classes/glossary-entries-source';
+import { AddonModGlossaryEntriesSwipeManager } from '../../classes/glossary-entries-swipe-manager';
 import {
     AddonModGlossary,
     AddonModGlossaryEntry,
@@ -35,13 +39,14 @@ import {
     selector: 'page-addon-mod-glossary-entry',
     templateUrl: 'entry.html',
 })
-export class AddonModGlossaryEntryPage implements OnInit {
+export class AddonModGlossaryEntryPage implements OnInit, OnDestroy {
 
     @ViewChild(CoreCommentsCommentsComponent) comments?: CoreCommentsCommentsComponent;
 
     component = AddonModGlossaryProvider.COMPONENT;
     componentId?: number;
     entry?: AddonModGlossaryEntry;
+    entries?: AddonModGlossaryEntryEntriesSwipeManager;
     glossary?: AddonModGlossaryGlossary;
     loaded = false;
     showAuthor = false;
@@ -53,15 +58,30 @@ export class AddonModGlossaryEntryPage implements OnInit {
 
     protected entryId!: number;
 
+    constructor(protected route: ActivatedRoute) {}
+
     /**
      * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
         try {
+            const routeData = this.route.snapshot.data;
             this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
             this.entryId = CoreNavigator.getRequiredRouteNumberParam('entryId');
             this.tagsEnabled = CoreTag.areTagsAvailableInSite();
             this.commentsEnabled = !CoreComments.areCommentsDisabledInSite();
+
+            if (routeData.swipeEnabled ?? true) {
+                const cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
+                const source = CoreItemsManagerSourcesTracker.getOrCreateSource(
+                    AddonModGlossaryEntriesSource,
+                    [this.courseId, cmId, routeData.glossaryPathPrefix ?? ''],
+                );
+
+                this.entries = new AddonModGlossaryEntryEntriesSwipeManager(source);
+
+                await this.entries.start();
+            }
         } catch (error) {
             CoreDomUtils.showErrorModal(error);
 
@@ -73,16 +93,23 @@ export class AddonModGlossaryEntryPage implements OnInit {
         try {
             await this.fetchEntry();
 
-            if (!this.glossary) {
+            if (!this.glossary || !this.componentId) {
                 return;
             }
 
-            await CoreUtils.ignoreErrors(AddonModGlossary.logEntryView(this.entryId, this.componentId!, this.glossary.name));
+            await CoreUtils.ignoreErrors(AddonModGlossary.logEntryView(this.entryId, this.componentId, this.glossary.name));
         } finally {
             this.loaded = true;
         }
     }
 
+    /**
+     * @inheritdoc
+     */
+    ngOnDestroy(): void {
+        this.entries?.destroy();
+    }
+
     /**
      * Refresh the data.
      *
@@ -152,3 +179,17 @@ export class AddonModGlossaryEntryPage implements OnInit {
     }
 
 }
+
+/**
+ * Helper to manage swiping within a collection of glossary entries.
+ */
+class AddonModGlossaryEntryEntriesSwipeManager extends AddonModGlossaryEntriesSwipeManager {
+
+    /**
+     * @inheritdoc
+     */
+    protected getSelectedItemPathFromRoute(route: ActivatedRouteSnapshot): string | null {
+        return `${this.getSource().GLOSSARY_PATH_PREFIX}entry/${route.params.entryId}`;
+    }
+
+}
diff --git a/src/core/classes/items-management/items-manager-source.ts b/src/core/classes/items-management/items-manager-source.ts
index 5a00e5c9c..e512747ec 100644
--- a/src/core/classes/items-management/items-manager-source.ts
+++ b/src/core/classes/items-management/items-manager-source.ts
@@ -37,9 +37,9 @@ export abstract class CoreItemsManagerSource<Item = unknown> {
         return args.map(argument => String(argument)).join('-');
     }
 
-    private items: Item[] | null = null;
-    private hasMoreItems = true;
-    private listeners: CoreItemsListSourceListener<Item>[] = [];
+    protected items: Item[] | null = null;
+    protected hasMoreItems = true;
+    protected listeners: CoreItemsListSourceListener<Item>[] = [];
 
     /**
      * Check whether any page has been loaded.

From 651461b01e7640ab0dd6fbe3a7a4a1c8fedceda9 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 1 Dec 2021 13:59:19 +0100
Subject: [PATCH 0254/1008] MOBILE-3926 forum: Discussions swipe navigation

---
 .../forum/classes/forum-discussions-source.ts | 265 +++++++++++
 .../forum-discussions-swipe-manager.ts        |  52 ++
 .../mod/forum/components/index/index.html     |  24 +-
 .../mod/forum/components/index/index.ts       | 445 +++++++-----------
 src/addons/mod/forum/forum.module.ts          |   5 +
 .../forum/pages/discussion/discussion.html    | 132 +++---
 .../forum/pages/discussion/discussion.page.ts |  34 +-
 .../pages/new-discussion/new-discussion.html  | 137 +++---
 .../new-discussion/new-discussion.page.ts     |  36 +-
 .../mod/glossary/components/index/index.ts    |   4 +-
 .../items-management/items-manager-source.ts  |  27 +-
 .../items-management/list-items-manager.ts    |   6 +-
 .../items-management/swipe-items-manager.ts   |   2 +-
 .../pages/participants/participants.page.ts   |   2 +-
 14 files changed, 729 insertions(+), 442 deletions(-)
 create mode 100644 src/addons/mod/forum/classes/forum-discussions-source.ts
 create mode 100644 src/addons/mod/forum/classes/forum-discussions-swipe-manager.ts

diff --git a/src/addons/mod/forum/classes/forum-discussions-source.ts b/src/addons/mod/forum/classes/forum-discussions-source.ts
new file mode 100644
index 000000000..7a08b4e8d
--- /dev/null
+++ b/src/addons/mod/forum/classes/forum-discussions-source.ts
@@ -0,0 +1,265 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { Params } from '@angular/router';
+import { CoreItemsManagerSource } from '@classes/items-management/items-manager-source';
+import { CoreUser } from '@features/user/services/user';
+import {
+    AddonModForum,
+    AddonModForumData,
+    AddonModForumDiscussion,
+    AddonModForumProvider,
+    AddonModForumSortOrder,
+} from '../services/forum';
+import { AddonModForumOffline, AddonModForumOfflineDiscussion } from '../services/forum-offline';
+
+export class AddonModForumDiscussionsSource extends CoreItemsManagerSource<AddonModForumDiscussionItem> {
+
+    static readonly NEW_DISCUSSION: AddonModForumNewDiscussionForm = { newDiscussion: true };
+
+    readonly DISCUSSIONS_PATH_PREFIX: string;
+    readonly COURSE_ID: number;
+    readonly CM_ID: number;
+
+    forum?: AddonModForumData;
+    trackPosts = false;
+    usesGroups = false;
+    selectedSortOrder: AddonModForumSortOrder | null = null;
+
+    constructor(courseId: number, cmId: number, discussionsPathPrefix: string) {
+        super();
+
+        this.DISCUSSIONS_PATH_PREFIX = discussionsPathPrefix;
+        this.COURSE_ID = courseId;
+        this.CM_ID = cmId;
+    }
+
+    /**
+     * Type guard to infer NewDiscussionForm objects.
+     *
+     * @param discussion Item to check.
+     * @return Whether the item is a new discussion form.
+     */
+    isNewDiscussionForm(discussion: AddonModForumDiscussionItem): discussion is AddonModForumNewDiscussionForm {
+        return 'newDiscussion' in discussion;
+    }
+
+    /**
+     * Type guard to infer AddonModForumDiscussion objects.
+     *
+     * @param discussion Item to check.
+     * @return Whether the item is an online discussion.
+     */
+    isOfflineDiscussion(discussion: AddonModForumDiscussionItem): discussion is AddonModForumOfflineDiscussion {
+        return !this.isNewDiscussionForm(discussion) && !this.isOnlineDiscussion(discussion);
+    }
+
+    /**
+     * Type guard to infer AddonModForumDiscussion objects.
+     *
+     * @param discussion Item to check.
+     * @return Whether the item is an online discussion.
+     */
+    isOnlineDiscussion(discussion: AddonModForumDiscussionItem): discussion is AddonModForumDiscussion {
+        return 'id' in discussion;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    getItemPath(discussion: AddonModForumDiscussionItem): string {
+        if (this.isOnlineDiscussion(discussion)) {
+            return this.DISCUSSIONS_PATH_PREFIX + discussion.discussion;
+        }
+
+        if (this.isOfflineDiscussion(discussion)) {
+            return `${this.DISCUSSIONS_PATH_PREFIX}new/${discussion.timecreated}`;
+        }
+
+        return `${this.DISCUSSIONS_PATH_PREFIX}new/0`;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    getItemQueryParams(discussion: AddonModForumDiscussionItem): Params {
+        return {
+            courseId: this.COURSE_ID,
+            cmId: this.CM_ID,
+            forumId: this.forum?.id,
+            ...(this.isOnlineDiscussion(discussion) ? { discussion, trackPosts: this.trackPosts } : {}),
+        };
+    }
+
+    /**
+     * @inheritdoc
+     */
+    getPagesLoaded(): number {
+        if (this.items === null) {
+            return 0;
+        }
+
+        const onlineEntries = this.items.filter(item => this.isOnlineDiscussion(item));
+
+        return Math.ceil(onlineEntries.length / this.getPageLength());
+    }
+
+    /**
+     * @inheritdoc
+     */
+    getPageLength(): number {
+        return AddonModForumProvider.DISCUSSIONS_PER_PAGE;
+    }
+
+    /**
+     * Load forum.
+     */
+    async loadForum(): Promise<void> {
+        this.forum = await AddonModForum.getForum(this.COURSE_ID, this.CM_ID);
+
+        if (typeof this.forum.istracked != 'undefined') {
+            this.trackPosts = this.forum.istracked;
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected async loadPageItems(page: number): Promise<{ items: AddonModForumDiscussionItem[]; hasMoreItems: boolean }> {
+        const discussions: AddonModForumDiscussionItem[] = [];
+
+        if (page === 0) {
+            const offlineDiscussions = await this.loadOfflineDiscussions();
+
+            discussions.push(AddonModForumDiscussionsSource.NEW_DISCUSSION);
+            discussions.push(...offlineDiscussions);
+        }
+
+        const { discussions: onlineDiscussions, canLoadMore } = await this.loadOnlineDiscussions(page);
+
+        discussions.push(...onlineDiscussions);
+
+        return {
+            items: discussions,
+            hasMoreItems: canLoadMore,
+        };
+    }
+
+    /**
+     * Load online discussions for the given page.
+     *
+     * @param page Page.
+     * @returns Online discussions info.
+     */
+    private async loadOnlineDiscussions(page: number): Promise<{
+        discussions: AddonModForumDiscussionItem[];
+        canLoadMore: boolean;
+    }> {
+        if (!this.forum || !this.selectedSortOrder) {
+            throw new Error('Can\'t load discussions without a forum or selected sort order');
+        }
+
+        const response = await AddonModForum.getDiscussions(this.forum.id, {
+            cmId: this.forum.cmid,
+            sortOrder: this.selectedSortOrder.value,
+            page,
+        });
+        let discussions = response.discussions;
+
+        if (this.usesGroups) {
+            discussions = await AddonModForum.formatDiscussionsGroups(this.forum.cmid, discussions);
+        }
+
+        // Hide author for first post and type single.
+        if (this.forum.type === 'single') {
+            for (const discussion of discussions) {
+                if (discussion.userfullname && discussion.parent === 0) {
+                    discussion.userfullname = false;
+                    break;
+                }
+            }
+        }
+
+        // If any discussion has unread posts, the whole forum is being tracked.
+        if (typeof this.forum.istracked === 'undefined' && !this.trackPosts) {
+            for (const discussion of discussions) {
+                if (discussion.numunread > 0) {
+                    this.trackPosts = true;
+                    break;
+                }
+            }
+        }
+
+        return { discussions, canLoadMore: response.canLoadMore };
+    }
+
+    /**
+     * Load offline discussions.
+     *
+     * @returns Offline discussions.
+     */
+    private async loadOfflineDiscussions(): Promise<AddonModForumOfflineDiscussion[]> {
+        if (!this.forum) {
+            throw new Error('Can\'t load discussions without a forum');
+        }
+
+        const forum = this.forum;
+        let offlineDiscussions = await AddonModForumOffline.getNewDiscussions(forum.id);
+
+        if (offlineDiscussions.length === 0) {
+            return [];
+        }
+
+        if (this.usesGroups) {
+            offlineDiscussions = await AddonModForum.formatDiscussionsGroups(forum.cmid, offlineDiscussions);
+        }
+
+        // Fill user data for Offline discussions (should be already cached).
+        const promises = offlineDiscussions.map(async (offlineDiscussion) => {
+            const discussion = offlineDiscussion as unknown as AddonModForumDiscussion;
+
+            if (discussion.parent === 0 || forum.type === 'single') {
+                // Do not show author for first post and type single.
+                return;
+            }
+
+            try {
+                const user = await CoreUser.getProfile(discussion.userid, this.COURSE_ID, true);
+
+                discussion.userfullname = user.fullname;
+                discussion.userpictureurl = user.profileimageurl;
+            } catch (error) {
+                // Ignore errors.
+            }
+        });
+
+        await Promise.all(promises);
+
+        // Sort discussion by time (newer first).
+        offlineDiscussions.sort((a, b) => b.timecreated - a.timecreated);
+
+        return offlineDiscussions;
+    }
+
+}
+
+/**
+ * Type to select the new discussion form.
+ */
+export type AddonModForumNewDiscussionForm = { newDiscussion: true };
+
+/**
+ * Type of items that can be held by the discussions manager.
+ */
+export type AddonModForumDiscussionItem = AddonModForumDiscussion | AddonModForumOfflineDiscussion | AddonModForumNewDiscussionForm;
diff --git a/src/addons/mod/forum/classes/forum-discussions-swipe-manager.ts b/src/addons/mod/forum/classes/forum-discussions-swipe-manager.ts
new file mode 100644
index 000000000..d409a6f58
--- /dev/null
+++ b/src/addons/mod/forum/classes/forum-discussions-swipe-manager.ts
@@ -0,0 +1,52 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreSwipeItemsManager } from '@classes/items-management/swipe-items-manager';
+import { AddonModForumDiscussionItem, AddonModForumDiscussionsSource } from './forum-discussions-source';
+
+/**
+ * Helper to manage swiping within a collection of discussions.
+ */
+export class AddonModForumDiscussionsSwipeManager
+    extends CoreSwipeItemsManager<AddonModForumDiscussionItem, AddonModForumDiscussionsSource> {
+
+    /**
+     * @inheritdoc
+     */
+    async navigateToNextItem(): Promise<void> {
+        let delta = -1;
+        const item = await this.getItemBy(-1);
+
+        if (item && this.getSource().isNewDiscussionForm(item)) {
+            delta--;
+        }
+
+        await this.navigateToItemBy(delta, 'back');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async navigateToPreviousItem(): Promise<void> {
+        let delta = 1;
+        const item = await this.getItemBy(1);
+
+        if (item && this.getSource().isNewDiscussionForm(item)) {
+            delta++;
+        }
+
+        await this.navigateToItemBy(delta, 'forward');
+    }
+
+}
diff --git a/src/addons/mod/forum/components/index/index.html b/src/addons/mod/forum/components/index/index.html
index e61fce1ef..d282b828e 100644
--- a/src/addons/mod/forum/components/index/index.html
+++ b/src/addons/mod/forum/components/index/index.html
@@ -10,11 +10,11 @@
         <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
             (action)="gotoBlog()">
         </core-context-menu-item>
-        <core-context-menu-item *ngIf="discussions.loaded && !(hasOffline || hasOfflineRatings) && isOnline" [priority]="700"
+        <core-context-menu-item *ngIf="discussions && discussions.loaded && !(hasOffline || hasOfflineRatings) && isOnline" [priority]="700"
             [content]="'addon.mod_forum.refreshdiscussions' | translate" [iconAction]="refreshIcon" [closeOnClick]="false"
             (action)="doRefresh(null, $event)">
         </core-context-menu-item>
-        <core-context-menu-item *ngIf="discussions.loaded && (hasOffline || hasOfflineRatings) && isOnline" [priority]="600"
+        <core-context-menu-item *ngIf="discussions && discussions.loaded && (hasOffline || hasOfflineRatings) && isOnline" [priority]="600"
             [content]="'core.settings.synchronizenow' | translate" [iconAction]="syncIcon" [closeOnClick]="false"
             (action)="doRefresh(null, $event, true)">
         </core-context-menu-item>
@@ -32,11 +32,11 @@
 
 <!-- Content. -->
 <core-split-view>
-    <ion-refresher slot="fixed" [disabled]="!discussions.loaded" (ionRefresh)="doRefresh($event.target)">
+    <ion-refresher slot="fixed" [disabled]="discussions && !discussions.loaded" (ionRefresh)="doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
-    <core-loading [hideUntil]="discussions.loaded">
+    <core-loading [hideUntil]="discussions && discussions.loaded">
         <!-- Activity info. -->
         <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()"
             [description]="forum && forum.type != 'single' && description" [component]="component" [componentId]="componentId"
@@ -57,17 +57,18 @@
         </ion-card>
 
         <ng-container *ngIf="forum">
-            <core-empty-box *ngIf="discussions.empty" icon="far-comments" [message]="'addon.mod_forum.forumnodiscussionsyet' | translate">
+            <core-empty-box *ngIf="!discussions || discussions.empty" icon="far-comments"
+                [message]="'addon.mod_forum.forumnodiscussionsyet' | translate">
             </core-empty-box>
 
-            <div *ngIf="!discussions.empty && sortingAvailable && selectedSortOrder" class="ion-text-wrap">
+            <div *ngIf="discussions && !discussions.empty && sortingAvailable && selectedSortOrder" class="ion-text-wrap">
                 <core-combobox [modalOptions]="sortOrderSelectorModalOptions" listboxId="addon-mod-forum-sort-selector"
                     [label]="('core.sort' | translate)" (onChange)="setSortOrder($event)" [selection]="selectedSortOrder.label | translate"
                     interface="modal">
                 </core-combobox>
             </div>
 
-            <ion-item *ngFor="let discussion of discussions.items" class="addon-mod-forum-discussion" detail="true"
+            <ion-item *ngFor="let discussion of discussionsItems" class="addon-mod-forum-discussion" detail="true"
                 [lines]="discussion.groupname && 'none'" [attr.aria-current]="discussions.getItemAriaCurrent(discussion)"
                 (click)="discussions.select(discussion)" button>
                 <ion-label>
@@ -96,17 +97,16 @@
                                 <ion-icon name="fas-users" [attr.aria-label]="'addon.mod_forum.group' | translate">
                                 </ion-icon> {{ discussion.groupname }}
                             </p>
-                            <p *ngIf="discussions.isOnlineDiscussion(discussion)">
+                            <p *ngIf="isOnlineDiscussion(discussion)">
                                 {{discussion.created * 1000 | coreFormatDate: "strftimerecentfull"}}
                             </p>
-                            <p *ngIf="discussions.isOfflineDiscussion(discussion)">
+                            <p *ngIf="isOfflineDiscussion(discussion)">
                                 <ion-icon name="fas-clock" aria-hidden="true"></ion-icon>
                                 {{ 'core.notsent' | translate }}
                             </p>
                         </div>
                     </div>
-                    <ion-row *ngIf="discussions.isOnlineDiscussion(discussion)"
-                        class="ion-text-center addon-mod-forum-discussion-more-info">
+                    <ion-row *ngIf="isOnlineDiscussion(discussion)" class="ion-text-center addon-mod-forum-discussion-more-info">
                         <ion-col class="ion-text-start">
                             <ion-note>
                                 <ion-icon name="fas-clock" aria-hidden="true"></ion-icon> {{ 'addon.mod_forum.lastpost' | translate }}
@@ -134,7 +134,7 @@
                 </ion-label>
             </ion-item>
 
-            <core-infinite-loading [enabled]="discussions.onlineLoaded && !discussions.completed" [error]="discussions.fetchFailed"
+            <core-infinite-loading [enabled]="discussions && discussions.loaded && !discussions.completed" [error]="fetchFailed"
                 (action)="fetchMoreDiscussions($event)">
             </core-infinite-loading>
         </ng-container>
diff --git a/src/addons/mod/forum/components/index/index.ts b/src/addons/mod/forum/components/index/index.ts
index 2312f7ff4..e7a778d3b 100644
--- a/src/addons/mod/forum/components/index/index.ts
+++ b/src/addons/mod/forum/components/index/index.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { Component, Optional, OnInit, OnDestroy, ViewChild, AfterViewInit } from '@angular/core';
-import { ActivatedRoute, Params } from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
 import { IonContent } from '@ionic/angular';
 import { ModalOptions } from '@ionic/core';
 
@@ -27,7 +27,7 @@ import {
     AddonModForumNewDiscussionData,
     AddonModForumReplyDiscussionData,
 } from '@addons/mod/forum/services/forum';
-import { AddonModForumOffline, AddonModForumOfflineDiscussion } from '@addons/mod/forum/services/forum-offline';
+import { AddonModForumOffline } from '@addons/mod/forum/services/forum-offline';
 import { Translate } from '@singletons';
 import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
 import { AddonModForumHelper } from '@addons/mod/forum/services/forum-helper';
@@ -44,7 +44,6 @@ import { CoreUser } from '@features/user/services/user';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreCourse } from '@features/course/services/course';
-import { CorePageItemsListManager } from '@classes/page-items-list-manager';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import { AddonModForumDiscussionOptionsMenuComponent } from '../discussion-options-menu/discussion-options-menu';
 import { AddonModForumSortOrderSelectorComponent } from '../sort-order-selector/sort-order-selector';
@@ -56,6 +55,9 @@ import { CoreRatingProvider } from '@features/rating/services/rating';
 import { CoreRatingSyncProvider } from '@features/rating/services/rating-sync';
 import { CoreRatingOffline } from '@features/rating/services/rating-offline';
 import { ContextLevel } from '@/core/constants';
+import { AddonModForumDiscussionItem, AddonModForumDiscussionsSource } from '../../classes/forum-discussions-source';
+import { CoreListItemsManager } from '@classes/items-management/list-items-manager';
+import { CoreItemsManagerSourcesTracker } from '@classes/items-management/items-manager-sources-tracker';
 
 /**
  * Component that displays a forum entry page.
@@ -72,24 +74,21 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
     component = AddonModForumProvider.COMPONENT;
     moduleName = 'forum';
     descriptionNote?: string;
-    forum?: AddonModForumData;
-    discussions: AddonModForumDiscussionsManager;
+    discussions!: AddonModForumDiscussionsManager;
+    discussionsItems: AddonModForumDiscussionItem[] = [];
+    fetchFailed = false;
     canAddDiscussion = false;
     addDiscussionText!: string;
     availabilityMessage: string | null = null;
     sortingAvailable!: boolean;
     sortOrders: AddonModForumSortOrder[] = [];
-    selectedSortOrder: AddonModForumSortOrder | null = null;
     canPin = false;
-    trackPosts = false;
     hasOfflineRatings = false;
     sortOrderSelectorModalOptions: ModalOptions = {
         component: AddonModForumSortOrderSelectorComponent,
     };
 
     protected syncEventName = AddonModForumSyncProvider.AUTO_SYNCED;
-    protected page = 0;
-    protected usesGroups = false;
     protected syncManualObserver?: CoreEventObserver; // It will observe the sync manual event.
     protected replyObserver?: CoreEventObserver;
     protected newDiscObserver?: CoreEventObserver;
@@ -97,19 +96,42 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
     protected changeDiscObserver?: CoreEventObserver;
     protected ratingOfflineObserver?: CoreEventObserver;
     protected ratingSyncObserver?: CoreEventObserver;
+    protected sourceUnsubscribe?: () => void;
 
     constructor(
-        route: ActivatedRoute,
+        public route: ActivatedRoute,
         @Optional() protected content?: IonContent,
         @Optional() courseContentsPage?: CoreCourseContentsPage,
     ) {
         super('AddonModForumIndexComponent', content, courseContentsPage);
+    }
 
-        this.discussions = new AddonModForumDiscussionsManager(
-            route.component,
-            this,
-            courseContentsPage ? `${AddonModForumModuleHandlerService.PAGE_NAME}/` : '',
-        );
+    get forum(): AddonModForumData | undefined {
+        return this.discussions?.getSource().forum;
+    }
+
+    get selectedSortOrder(): AddonModForumSortOrder | undefined {
+        return this.discussions?.getSource().selectedSortOrder ?? undefined;
+    }
+
+    /**
+     * Check whether a discussion is online.
+     *
+     * @param discussion Discussion
+     * @return Whether the discussion is online.
+     */
+    isOnlineDiscussion(discussion: AddonModForumDiscussionItem): boolean {
+        return this.discussions && this.discussions.getSource().isOnlineDiscussion(discussion);
+    }
+
+    /**
+     * Check whether a discussion is offline.
+     *
+     * @param discussion Discussion
+     * @return Whether the discussion is offline.
+     */
+    isOfflineDiscussion(discussion: AddonModForumDiscussionItem): boolean {
+        return this.discussions && this.discussions.getSource().isOfflineDiscussion(discussion);
     }
 
     /**
@@ -126,6 +148,48 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
 
         await super.ngOnInit();
 
+        // Initialize discussions manager.
+        const source = CoreItemsManagerSourcesTracker.getOrCreateSource(
+            AddonModForumDiscussionsSource,
+            [this.courseId, this.module.id, this.courseContentsPage ? `${AddonModForumModuleHandlerService.PAGE_NAME}/` : ''],
+        );
+
+        this.sourceUnsubscribe = source.addListener({
+            onItemsUpdated: async discussions => {
+                this.discussionsItems = discussions.filter(discussion => !source.isNewDiscussionForm(discussion));
+
+                if (!this.forum) {
+                    return;
+                }
+
+                // Check if there are replies for discussions stored in offline.
+                const hasOffline = await AddonModForumOffline.hasForumReplies(this.forum.id);
+
+                this.hasOffline = this.hasOffline || hasOffline;
+
+                if (hasOffline) {
+                    // Only update new fetched discussions.
+                    const promises = discussions.map(async (discussion) => {
+                        if (!this.discussions.getSource().isOnlineDiscussion(discussion)) {
+                            return;
+                        }
+
+                        // Get offline discussions.
+                        const replies = await AddonModForumOffline.getDiscussionReplies(discussion.discussion);
+
+                        discussion.numreplies = Number(discussion.numreplies) + replies.length;
+                    });
+
+                    await Promise.all(promises);
+                }
+            },
+            onReset: () => {
+                this.discussionsItems = [];
+            },
+        });
+
+        this.discussions = new AddonModForumDiscussionsManager(source, this);
+
         // Refresh data if this forum discussion is synchronized from discussions list.
         this.syncManualObserver = CoreEvents.on(AddonModForumSyncProvider.MANUAL_SYNCED, (data) => {
             this.autoSyncEventReceived(data);
@@ -141,12 +205,16 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
             this.eventReceived.bind(this, false),
         );
         this.changeDiscObserver = CoreEvents.on(AddonModForumProvider.CHANGE_DISCUSSION_EVENT, data => {
-            if ((this.forum && this.forum.id === data.forumId) || data.cmId === this.module.id) {
-                AddonModForum.invalidateDiscussionsList(this.forum!.id).finally(() => {
+            if (!this.forum) {
+                return;
+            }
+
+            if (this.forum.id === data.forumId || data.cmId === this.module.id) {
+                AddonModForum.invalidateDiscussionsList(this.forum.id).finally(() => {
                     if (data.discussionId) {
                         // Discussion changed, search it in the list of discussions.
                         const discussion = this.discussions.items.find(
-                            (disc) => this.discussions.isOnlineDiscussion(disc) && data.discussionId == disc.discussion,
+                            (disc) => this.discussions.getSource().isOnlineDiscussion(disc) && data.discussionId == disc.discussion,
                         ) as AddonModForumDiscussion;
 
                         if (discussion) {
@@ -196,20 +264,6 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
     async ngAfterViewInit(): Promise<void> {
         await this.loadContent(false, true);
 
-        if (!this.forum) {
-            return;
-        }
-
-        CoreUtils.ignoreErrors(
-            AddonModForum.instance
-                .logView(this.forum.id, this.forum.name)
-                .then(async () => {
-                    CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
-
-                    return;
-                }),
-        );
-
         this.discussions.start(this.splitView);
     }
 
@@ -226,6 +280,8 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
         this.changeDiscObserver && this.changeDiscObserver.off();
         this.ratingOfflineObserver && this.ratingOfflineObserver.off();
         this.ratingSyncObserver && this.ratingSyncObserver.off();
+        this.sourceUnsubscribe && this.sourceUnsubscribe();
+        this.discussions.destroy();
     }
 
     /**
@@ -236,19 +292,21 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
      * @param showErrors Wether to show errors to the user or hide them.
      */
     protected async fetchContent(refresh: boolean = false, sync: boolean = false, showErrors: boolean = false): Promise<void> {
-        this.discussions.fetchFailed = false;
-
-        const promises: Promise<void>[] = [];
-
-        promises.push(this.fetchForum(sync, showErrors));
-        promises.push(this.fetchSortOrderPreference());
+        this.fetchFailed = false;
 
         try {
-            await Promise.all(promises);
             await Promise.all([
-                this.fetchOfflineDiscussions(),
-                this.fetchDiscussions(refresh),
-                CoreRatingOffline.hasRatings('mod_forum', 'post', ContextLevel.MODULE, this.forum!.cmid).then((hasRatings) => {
+                this.fetchForum(sync, showErrors),
+                this.fetchSortOrderPreference(),
+            ]);
+
+            if (!this.forum) {
+                return;
+            }
+
+            await Promise.all([
+                refresh ? this.discussions.reload() : this.discussions.load(),
+                CoreRatingOffline.hasRatings('mod_forum', 'post', ContextLevel.MODULE, this.forum.cmid).then((hasRatings) => {
                     this.hasOfflineRatings = hasRatings;
 
                     return;
@@ -258,7 +316,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
             if (refresh) {
                 CoreDomUtils.showErrorModalDefault(error, 'addon.mod_forum.errorgetforum', true);
 
-                this.discussions.fetchFailed = true; // Set to prevent infinite calls with infinite-loading.
+                this.fetchFailed = true; // Set to prevent infinite calls with infinite-loading.
             } else {
                 // Get forum failed, retry without using cache since it might be a new activity.
                 await this.refreshContent(sync);
@@ -273,19 +331,19 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
             return;
         }
 
-        const forum = await AddonModForum.getForum(this.courseId, this.module.id);
+        await this.discussions.getSource().loadForum();
 
-        this.forum = forum;
+        if (!this.forum) {
+            return;
+        }
+
+        const forum = this.forum;
         this.description = forum.intro || this.description;
         this.availabilityMessage = AddonModForumHelper.getAvailabilityMessage(forum);
         this.descriptionNote = Translate.instant('addon.mod_forum.numdiscussions', {
             numdiscussions: forum.numdiscussions,
         });
 
-        if (typeof forum.istracked != 'undefined') {
-            this.trackPosts = forum.istracked;
-        }
-
         this.dataRetrieved.emit(forum);
 
         switch (forum.type) {
@@ -319,10 +377,10 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
         // Check if the activity uses groups.
         promises.push(
             CoreGroups.instance
-                .getActivityGroupMode(this.forum.cmid)
+                .getActivityGroupMode(forum.cmid)
                 .then(async mode => {
-                    this.usesGroups = mode === CoreGroupsProvider.SEPARATEGROUPS
-                                    || mode === CoreGroupsProvider.VISIBLEGROUPS;
+                    this.discussions.getSource().usesGroups =
+                        mode === CoreGroupsProvider.SEPARATEGROUPS || mode === CoreGroupsProvider.VISIBLEGROUPS;
 
                     return;
                 }),
@@ -330,14 +388,14 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
 
         promises.push(
             AddonModForum.instance
-                .getAccessInformation(this.forum.id, { cmId: this.module.id })
+                .getAccessInformation(forum.id, { cmId: this.module.id })
                 .then(async accessInfo => {
                     // Disallow adding discussions if cut-off date is reached and the user has not the
                     // capability to override it.
                     // Just in case the forum was fetched from WS when the cut-off date was not reached but it is now.
-                    const cutoffDateReached = AddonModForumHelper.isCutoffDateReached(this.forum!)
+                    const cutoffDateReached = AddonModForumHelper.isCutoffDateReached(forum)
                                     && !accessInfo.cancanoverridecutoff;
-                    this.canAddDiscussion = !!this.forum?.cancreatediscussions && !cutoffDateReached;
+                    this.canAddDiscussion = !!forum.cancreatediscussions && !cutoffDateReached;
 
                     return;
                 }),
@@ -347,7 +405,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
             // Use the canAddDiscussion WS to check if the user can pin discussions.
             promises.push(
                 AddonModForum.instance
-                    .canAddDiscussionToAll(this.forum.id, { cmId: this.module.id })
+                    .canAddDiscussionToAll(forum.id, { cmId: this.module.id })
                     .then(async response => {
                         this.canPin = !!response.canpindiscussions;
 
@@ -366,124 +424,6 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
         await Promise.all(promises);
     }
 
-    /**
-     * Convenience function to fetch offline discussions.
-     *
-     * @return Promise resolved when done.
-     */
-    protected async fetchOfflineDiscussions(): Promise<void> {
-        const forum = this.forum!;
-        let offlineDiscussions = await AddonModForumOffline.getNewDiscussions(forum.id);
-        this.hasOffline = !!offlineDiscussions.length;
-
-        if (!this.hasOffline) {
-            this.discussions.setOfflineDiscussions([]);
-
-            return;
-        }
-
-        if (this.usesGroups) {
-            offlineDiscussions = await AddonModForum.formatDiscussionsGroups(forum.cmid, offlineDiscussions);
-        }
-
-        // Fill user data for Offline discussions (should be already cached).
-        const promises = offlineDiscussions.map(async (offlineDiscussion) => {
-            const discussion = offlineDiscussion as unknown as AddonModForumDiscussion;
-
-            if (discussion.parent === 0 || forum.type === 'single') {
-                // Do not show author for first post and type single.
-                return;
-            }
-
-            try {
-                const user = await CoreUser.getProfile(discussion.userid, this.courseId, true);
-
-                discussion.userfullname = user.fullname;
-                discussion.userpictureurl = user.profileimageurl;
-            } catch (error) {
-                // Ignore errors.
-            }
-        });
-
-        await Promise.all(promises);
-
-        // Sort discussion by time (newer first).
-        offlineDiscussions.sort((a, b) => b.timecreated - a.timecreated);
-
-        this.discussions.setOfflineDiscussions(offlineDiscussions);
-    }
-
-    /**
-     * Convenience function to get forum discussions.
-     *
-     * @param refresh Whether we're refreshing data.
-     * @return Promise resolved when done.
-     */
-    protected async fetchDiscussions(refresh: boolean): Promise<void> {
-        const forum = this.forum!;
-        this.discussions.fetchFailed = false;
-
-        if (refresh) {
-            this.page = 0;
-        }
-
-        const response = await AddonModForum.getDiscussions(forum.id, {
-            cmId: forum.cmid,
-            sortOrder: this.selectedSortOrder!.value,
-            page: this.page,
-        });
-        let discussions = response.discussions;
-
-        if (this.usesGroups) {
-            discussions = await AddonModForum.formatDiscussionsGroups(forum.cmid, discussions);
-        }
-
-        // Hide author for first post and type single.
-        if (forum.type === 'single') {
-            for (const discussion of discussions) {
-                if (discussion.userfullname && discussion.parent === 0) {
-                    discussion.userfullname = false;
-                    break;
-                }
-            }
-        }
-
-        // If any discussion has unread posts, the whole forum is being tracked.
-        if (typeof forum.istracked === 'undefined' && !this.trackPosts) {
-            for (const discussion of discussions) {
-                if (discussion.numunread > 0) {
-                    this.trackPosts = true;
-                    break;
-                }
-            }
-        }
-
-        if (this.page === 0) {
-            this.discussions.setOnlineDiscussions(discussions, response.canLoadMore);
-        } else {
-            this.discussions.setItems(this.discussions.items.concat(discussions), response.canLoadMore);
-        }
-
-        this.page++;
-
-        // Check if there are replies for discussions stored in offline.
-        const hasOffline = await AddonModForumOffline.hasForumReplies(forum.id);
-
-        this.hasOffline = this.hasOffline || hasOffline;
-
-        if (hasOffline) {
-            // Only update new fetched discussions.
-            const promises = discussions.map(async (discussion) => {
-                // Get offline discussions.
-                const replies = await AddonModForumOffline.getDiscussionReplies(discussion.discussion);
-
-                discussion.numreplies = Number(discussion.numreplies) + replies.length;
-            });
-
-            await Promise.all(promises);
-        }
-    }
-
     /**
      * Convenience function to load more forum discussions.
      *
@@ -492,11 +432,13 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
      */
     async fetchMoreDiscussions(complete: () => void): Promise<void> {
         try {
-            await this.fetchDiscussions(false);
+            this.fetchFailed = false;
+
+            await this.discussions.load();
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'addon.mod_forum.errorgetforum', true);
 
-            this.discussions.fetchFailed = true;
+            this.fetchFailed = true;
         } finally {
             complete();
         }
@@ -521,9 +463,13 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
         };
 
         const value = await getSortOrder();
+        const selectedOrder = this.sortOrders.find(sortOrder => sortOrder.value === value) || this.sortOrders[0];
 
-        this.selectedSortOrder = this.sortOrders.find(sortOrder => sortOrder.value === value) || this.sortOrders[0];
-        this.sortOrderSelectorModalOptions.componentProps!.selected = this.selectedSortOrder.value;
+        this.discussions.getSource().selectedSortOrder = selectedOrder;
+
+        if (this.sortOrderSelectorModalOptions.componentProps) {
+            this.sortOrderSelectorModalOptions.componentProps.selected = selectedOrder.value;
+        }
     }
 
     /**
@@ -597,11 +543,11 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
                 if (isNewDiscussion && CoreScreen.isTablet) {
                     const newDiscussionData = data as AddonModForumNewDiscussionData;
                     const discussion = this.discussions.items.find(disc => {
-                        if (this.discussions.isOfflineDiscussion(disc)) {
+                        if (this.discussions.getSource().isOfflineDiscussion(disc)) {
                             return disc.timecreated === newDiscussionData.discTimecreated;
                         }
 
-                        if (this.discussions.isOnlineDiscussion(disc)) {
+                        if (this.discussions.getSource().isOnlineDiscussion(disc)) {
                             return CoreArray.contains(newDiscussionData.discussionIds ?? [], disc.discussion);
                         }
 
@@ -625,7 +571,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
      * @param timeCreated Creation time of the offline discussion.
      */
     openNewDiscussion(): void {
-        this.discussions.select({ newDiscussion: true });
+        this.discussions.select(AddonModForumDiscussionsSource.NEW_DISCUSSION);
     }
 
     /**
@@ -634,10 +580,13 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
      * @param sortOrder Sort order new data.
      */
     async setSortOrder(sortOrder: AddonModForumSortOrder): Promise<void> {
-        if (sortOrder.value != this.selectedSortOrder?.value) {
-            this.selectedSortOrder = sortOrder;
-            this.sortOrderSelectorModalOptions.componentProps!.selected = this.selectedSortOrder.value;
-            this.page = 0;
+        if (sortOrder.value != this.discussions.getSource().selectedSortOrder?.value) {
+            this.discussions.getSource().selectedSortOrder = sortOrder;
+            this.discussions.getSource().setDirty(true);
+
+            if (this.sortOrderSelectorModalOptions.componentProps) {
+                this.sortOrderSelectorModalOptions.componentProps.selected = sortOrder.value;
+            }
 
             try {
                 await CoreUser.setUserPreference(AddonModForumProvider.PREFERENCE_SORTORDER, sortOrder.value.toFixed(0));
@@ -666,6 +615,10 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
      * @param discussion Discussion.
      */
     async showOptionsMenu(event: Event, discussion: AddonModForumDiscussion): Promise<void> {
+        if (!this.forum) {
+            return;
+        }
+
         event.preventDefault();
         event.stopPropagation();
 
@@ -673,7 +626,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
             component: AddonModForumDiscussionOptionsMenuComponent,
             componentProps: {
                 discussion,
-                forumId: this.forum!.id,
+                forumId: this.forum.id,
                 cmId: this.module.id,
             },
             event,
@@ -698,125 +651,47 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
 
 }
 
-/**
- * Type to select the new discussion form.
- */
-type NewDiscussionForm = { newDiscussion: true };
-
-/**
- * Type of items that can be held by the discussions manager.
- */
-type DiscussionItem = AddonModForumDiscussion | AddonModForumOfflineDiscussion | NewDiscussionForm;
-
 /**
  * Discussions manager.
  */
-class AddonModForumDiscussionsManager extends CorePageItemsListManager<DiscussionItem> {
+class AddonModForumDiscussionsManager extends CoreListItemsManager<AddonModForumDiscussionItem, AddonModForumDiscussionsSource> {
 
-    onlineLoaded = false;
-    fetchFailed = false;
+    page: AddonModForumIndexComponent;
 
-    private discussionsPathPrefix: string;
-    private component: AddonModForumIndexComponent;
+    constructor(source: AddonModForumDiscussionsSource, page: AddonModForumIndexComponent) {
+        super(source, page.route.component);
 
-    constructor(pageComponent: unknown, component: AddonModForumIndexComponent, discussionsPathPrefix: string) {
-        super(pageComponent);
-
-        this.component = component;
-        this.discussionsPathPrefix = discussionsPathPrefix;
-    }
-
-    get loaded(): boolean {
-        return super.loaded && (this.onlineLoaded || this.fetchFailed);
-    }
-
-    get onlineDiscussions(): AddonModForumDiscussion[] {
-        return this.items.filter(discussion => this.isOnlineDiscussion(discussion)) as AddonModForumDiscussion[];
+        this.page = page;
     }
 
     /**
      * @inheritdoc
      */
-    getItemQueryParams(discussion: DiscussionItem): Params {
-        return {
-            courseId: this.component.courseId,
-            cmId: this.component.module.id,
-            forumId: this.component.forum!.id,
-            ...(this.isOnlineDiscussion(discussion) ? { discussion, trackPosts: this.component.trackPosts } : {}),
-        };
-    }
+    protected getDefaultItem(): AddonModForumDiscussionItem | null {
+        const source = this.getSource();
 
-    /**
-     * Type guard to infer NewDiscussionForm objects.
-     *
-     * @param discussion Item to check.
-     * @return Whether the item is a new discussion form.
-     */
-    isNewDiscussionForm(discussion: DiscussionItem): discussion is NewDiscussionForm {
-        return 'newDiscussion' in discussion;
-    }
-
-    /**
-     * Type guard to infer AddonModForumDiscussion objects.
-     *
-     * @param discussion Item to check.
-     * @return Whether the item is an online discussion.
-     */
-    isOfflineDiscussion(discussion: DiscussionItem): discussion is AddonModForumOfflineDiscussion {
-        return !this.isNewDiscussionForm(discussion)
-            && !this.isOnlineDiscussion(discussion);
-    }
-
-    /**
-     * Type guard to infer AddonModForumDiscussion objects.
-     *
-     * @param discussion Item to check.
-     * @return Whether the item is an online discussion.
-     */
-    isOnlineDiscussion(discussion: DiscussionItem): discussion is AddonModForumDiscussion {
-        return 'id' in discussion;
-    }
-
-    /**
-     * Update online discussion items.
-     *
-     * @param onlineDiscussions Online discussions
-     */
-    setOnlineDiscussions(onlineDiscussions: AddonModForumDiscussion[], hasMoreItems: boolean = false): void {
-        const otherDiscussions = this.items.filter(discussion => !this.isOnlineDiscussion(discussion));
-
-        this.setItems(otherDiscussions.concat(onlineDiscussions), hasMoreItems);
-        this.onlineLoaded = true;
-    }
-
-    /**
-     * Update offline discussion items.
-     *
-     * @param offlineDiscussions Offline discussions
-     */
-    setOfflineDiscussions(offlineDiscussions: AddonModForumOfflineDiscussion[]): void {
-        const otherDiscussions = this.items.filter(discussion => !this.isOfflineDiscussion(discussion));
-
-        this.setItems((offlineDiscussions as DiscussionItem[]).concat(otherDiscussions), this.hasMoreItems);
+        return this.items.find(discussion => !source.isNewDiscussionForm(discussion)) || null;
     }
 
     /**
      * @inheritdoc
      */
-    protected getItemPath(discussion: DiscussionItem): string {
-        const getRelativePath = () => {
-            if (this.isOnlineDiscussion(discussion)) {
-                return discussion.discussion;
-            }
+    protected async logActivity(): Promise<void> {
+        const forum = this.getSource().forum;
 
-            if (this.isOfflineDiscussion(discussion)) {
-                return `new/${discussion.timecreated}`;
-            }
+        if (!forum) {
+            return;
+        }
 
-            return 'new/0';
-        };
+        CoreUtils.ignoreErrors(
+            AddonModForum.instance
+                .logView(forum.id, forum.name)
+                .then(async () => {
+                    CoreCourse.checkModuleCompletion(this.page.courseId, this.page.module.completiondata);
 
-        return this.discussionsPathPrefix + getRelativePath();
+                    return;
+                }),
+        );
     }
 
 }
diff --git a/src/addons/mod/forum/forum.module.ts b/src/addons/mod/forum/forum.module.ts
index ec0c89af1..aa1fd3a18 100644
--- a/src/addons/mod/forum/forum.module.ts
+++ b/src/addons/mod/forum/forum.module.ts
@@ -55,6 +55,7 @@ const mainMenuRoutes: Routes = [
     {
         path: `${AddonModForumModuleHandlerService.PAGE_NAME}/discussion/:discussionId`,
         loadChildren: () => import('./pages/discussion/discussion.module').then(m => m.AddonForumDiscussionPageModule),
+        data: { swipeEnabled: false },
     },
     {
         path: AddonModForumModuleHandlerService.PAGE_NAME,
@@ -66,10 +67,12 @@ const mainMenuRoutes: Routes = [
                 path: `${COURSE_CONTENTS_PATH}/${AddonModForumModuleHandlerService.PAGE_NAME}/new/:timeCreated`,
                 loadChildren: () => import('./pages/new-discussion/new-discussion.module')
                     .then(m => m.AddonForumNewDiscussionPageModule),
+                data: { discussionsPathPrefix: `${AddonModForumModuleHandlerService.PAGE_NAME}/` },
             },
             {
                 path: `${COURSE_CONTENTS_PATH}/${AddonModForumModuleHandlerService.PAGE_NAME}/:discussionId`,
                 loadChildren: () => import('./pages/discussion/discussion.module').then(m => m.AddonForumDiscussionPageModule),
+                data: { discussionsPathPrefix: `${AddonModForumModuleHandlerService.PAGE_NAME}/` },
             },
         ],
         () => CoreScreen.isMobile,
@@ -82,10 +85,12 @@ const courseContentsRoutes: Routes = conditionalRoutes(
             path: `${AddonModForumModuleHandlerService.PAGE_NAME}/new/:timeCreated`,
             loadChildren: () => import('./pages/new-discussion/new-discussion.module')
                 .then(m => m.AddonForumNewDiscussionPageModule),
+            data: { discussionsPathPrefix: `${AddonModForumModuleHandlerService.PAGE_NAME}/` },
         },
         {
             path: `${AddonModForumModuleHandlerService.PAGE_NAME}/:discussionId`,
             loadChildren: () => import('./pages/discussion/discussion.module').then(m => m.AddonForumDiscussionPageModule),
+            data: { discussionsPathPrefix: `${AddonModForumModuleHandlerService.PAGE_NAME}/` },
         },
     ],
     () => CoreScreen.isTablet,
diff --git a/src/addons/mod/forum/pages/discussion/discussion.html b/src/addons/mod/forum/pages/discussion/discussion.html
index 8753e0b5d..e022d7c11 100644
--- a/src/addons/mod/forum/pages/discussion/discussion.html
+++ b/src/addons/mod/forum/pages/discussion/discussion.html
@@ -56,72 +56,74 @@
     </core-context-menu>
 </core-navbar-buttons>
 <ion-content>
-    <ion-refresher slot="fixed" [disabled]="!discussionLoaded" (ionRefresh)="doRefresh($event.target)">
-        <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
-    </ion-refresher>
+    <core-swipe-navigation [manager]="discussions">
+        <ion-refresher slot="fixed" [disabled]="!discussionLoaded" (ionRefresh)="doRefresh($event.target)">
+            <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
+        </ion-refresher>
 
-    <core-loading [hideUntil]="discussionLoaded">
-        <!-- Discussion replies found to be synchronized -->
-        <ion-card class="core-warning-card" *ngIf="postHasOffline || hasOfflineRatings">
-            <ion-item>
-                <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
-                <ion-label>{{ 'core.hasdatatosync' | translate:{$a: discussionStr} }}</ion-label>
-            </ion-item>
-        </ion-card>
-
-        <!-- Cut-off date or due date message -->
-        <ion-card class="core-info-card" *ngIf="availabilityMessage">
-            <ion-item>
-                <ion-icon name="fas-info-circle" slot="start" aria-hidden="true"></ion-icon>
-                <ion-label>{{ availabilityMessage }}</ion-label>
-            </ion-item>
-        </ion-card>
-
-        <ion-card class="core-info-card" *ngIf="discussion && discussion.locked">
-            <ion-item>
-                <ion-icon name="fas-lock" slot="start" aria-hidden="true"></ion-icon>
-                <ion-label>{{ 'addon.mod_forum.discussionlocked' | translate }}</ion-label>
-            </ion-item>
-        </ion-card>
-
-        <div *ngIf="startingPost" class="ion-margin-bottom">
-            <addon-mod-forum-post [post]="startingPost" [discussion]="discussion" [courseId]="courseId" [highlight]="true"
-                [discussionId]="discussionId" [component]="component" [componentId]="cmId" [formData]="formData"
-                [originalData]="originalData" [forum]="forum" [accessInfo]="accessInfo" [trackPosts]="trackPosts" [ratingInfo]="ratingInfo"
-                [leavingPage]="leavingPage" (onPostChange)="postListChanged()">
-            </addon-mod-forum-post>
-        </div>
-
-        <ion-card *ngIf="sort != 'nested'">
-            <ng-container *ngFor="let post of posts; first as first">
-                <core-spacer *ngIf="!first"></core-spacer>
-                <addon-mod-forum-post [post]="post" [courseId]="courseId" [discussionId]="discussionId" [component]="component"
-                    [componentId]="cmId" [formData]="formData" [originalData]="originalData" [parentSubject]="postSubjects[post.parentid]"
-                    [forum]="forum" [accessInfo]="accessInfo" [trackPosts]="trackPosts" [ratingInfo]="ratingInfo"
-                    [leavingPage]="leavingPage" (onPostChange)="postListChanged()">
-                </addon-mod-forum-post>
-            </ng-container>
-        </ion-card>
-
-        <ng-container *ngIf="sort == 'nested'">
-            <ng-container *ngFor="let post of posts">
-                <ng-container *ngTemplateOutlet="nestedPosts; context: {post: post}"></ng-container>
-            </ng-container>
-        </ng-container>
-
-        <ng-template #nestedPosts let-post="post">
-            <ion-card>
-                <addon-mod-forum-post [post]="post" [courseId]="courseId" [discussionId]="discussionId" [component]="component"
-                    [componentId]="cmId" [formData]="formData" [originalData]="originalData" [parentSubject]="postSubjects[post.parentid]"
-                    [forum]="forum" [accessInfo]="accessInfo" [trackPosts]="trackPosts" [ratingInfo]="ratingInfo"
-                    [leavingPage]="leavingPage" (onPostChange)="postListChanged()">
-                </addon-mod-forum-post>
+        <core-loading [hideUntil]="discussionLoaded">
+            <!-- Discussion replies found to be synchronized -->
+            <ion-card class="core-warning-card" *ngIf="postHasOffline || hasOfflineRatings">
+                <ion-item>
+                    <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
+                    <ion-label>{{ 'core.hasdatatosync' | translate:{$a: discussionStr} }}</ion-label>
+                </ion-item>
             </ion-card>
-            <div class="ion-padding-start" *ngIf="post.children && post.children.length && post.children[0].subject">
-                <ng-container *ngFor="let child of post.children">
-                    <ng-container *ngTemplateOutlet="nestedPosts; context: {post: child}"></ng-container>
-                </ng-container>
+
+            <!-- Cut-off date or due date message -->
+            <ion-card class="core-info-card" *ngIf="availabilityMessage">
+                <ion-item>
+                    <ion-icon name="fas-info-circle" slot="start" aria-hidden="true"></ion-icon>
+                    <ion-label>{{ availabilityMessage }}</ion-label>
+                </ion-item>
+            </ion-card>
+
+            <ion-card class="core-info-card" *ngIf="discussion && discussion.locked">
+                <ion-item>
+                    <ion-icon name="fas-lock" slot="start" aria-hidden="true"></ion-icon>
+                    <ion-label>{{ 'addon.mod_forum.discussionlocked' | translate }}</ion-label>
+                </ion-item>
+            </ion-card>
+
+            <div *ngIf="startingPost" class="ion-margin-bottom">
+                <addon-mod-forum-post [post]="startingPost" [discussion]="discussion" [courseId]="courseId" [highlight]="true"
+                    [discussionId]="discussionId" [component]="component" [componentId]="cmId" [formData]="formData"
+                    [originalData]="originalData" [forum]="forum" [accessInfo]="accessInfo" [trackPosts]="trackPosts"
+                    [ratingInfo]="ratingInfo" [leavingPage]="leavingPage" (onPostChange)="postListChanged()">
+                </addon-mod-forum-post>
             </div>
-        </ng-template>
-    </core-loading>
+
+            <ion-card *ngIf="sort != 'nested'">
+                <ng-container *ngFor="let post of posts; first as first">
+                    <core-spacer *ngIf="!first"></core-spacer>
+                    <addon-mod-forum-post [post]="post" [courseId]="courseId" [discussionId]="discussionId" [component]="component"
+                        [componentId]="cmId" [formData]="formData" [originalData]="originalData"
+                        [parentSubject]="postSubjects[post.parentid]" [forum]="forum" [accessInfo]="accessInfo" [trackPosts]="trackPosts"
+                        [ratingInfo]="ratingInfo" [leavingPage]="leavingPage" (onPostChange)="postListChanged()">
+                    </addon-mod-forum-post>
+                </ng-container>
+            </ion-card>
+
+            <ng-container *ngIf="sort == 'nested'">
+                <ng-container *ngFor="let post of posts">
+                    <ng-container *ngTemplateOutlet="nestedPosts; context: {post: post}"></ng-container>
+                </ng-container>
+            </ng-container>
+
+            <ng-template #nestedPosts let-post="post">
+                <ion-card>
+                    <addon-mod-forum-post [post]="post" [courseId]="courseId" [discussionId]="discussionId" [component]="component"
+                        [componentId]="cmId" [formData]="formData" [originalData]="originalData"
+                        [parentSubject]="postSubjects[post.parentid]" [forum]="forum" [accessInfo]="accessInfo" [trackPosts]="trackPosts"
+                        [ratingInfo]="ratingInfo" [leavingPage]="leavingPage" (onPostChange)="postListChanged()">
+                    </addon-mod-forum-post>
+                </ion-card>
+                <div class="ion-padding-start" *ngIf="post.children && post.children.length && post.children[0].subject">
+                    <ng-container *ngFor="let child of post.children">
+                        <ng-container *ngTemplateOutlet="nestedPosts; context: {post: child}"></ng-container>
+                    </ng-container>
+                </div>
+            </ng-template>
+        </core-loading>
+    </core-swipe-navigation>
 </ion-content>
diff --git a/src/addons/mod/forum/pages/discussion/discussion.page.ts b/src/addons/mod/forum/pages/discussion/discussion.page.ts
index e1ef3b5a8..103b9355b 100644
--- a/src/addons/mod/forum/pages/discussion/discussion.page.ts
+++ b/src/addons/mod/forum/pages/discussion/discussion.page.ts
@@ -14,6 +14,8 @@
 
 import { ContextLevel, CoreConstants } from '@/core/constants';
 import { Component, OnDestroy, ViewChild, OnInit, AfterViewInit, ElementRef, Optional } from '@angular/core';
+import { ActivatedRoute, ActivatedRouteSnapshot } from '@angular/router';
+import { CoreItemsManagerSourcesTracker } from '@classes/items-management/items-manager-sources-tracker';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import { CoreFileUploader } from '@features/fileuploader/services/fileuploader';
 import { CoreRatingInfo, CoreRatingProvider } from '@features/rating/services/rating';
@@ -32,6 +34,8 @@ import { Network, NgZone, Translate } from '@singletons';
 import { CoreArray } from '@singletons/array';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { Subscription } from 'rxjs';
+import { AddonModForumDiscussionsSource } from '../../classes/forum-discussions-source';
+import { AddonModForumDiscussionsSwipeManager } from '../../classes/forum-discussions-swipe-manager';
 import {
     AddonModForum,
     AddonModForumAccessInformation,
@@ -68,6 +72,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
     forum: Partial<AddonModForumData> = {};
     accessInfo: AddonModForumAccessInformation = {};
     discussion?: AddonModForumDiscussion;
+    discussions?: AddonModForumDiscussionDiscussionsSwipeManager;
     startingPost?: Post;
     posts!: Post[];
     discussionLoaded = false;
@@ -117,14 +122,16 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
     constructor(
         @Optional() protected splitView: CoreSplitViewComponent,
         protected elementRef: ElementRef,
+        protected route: ActivatedRoute,
     ) {}
 
     get isMobile(): boolean {
         return CoreScreen.isMobile;
     }
 
-    ngOnInit(): void {
+    async ngOnInit(): Promise<void> {
         try {
+            const routeData = this.route.snapshot.data;
             this.courseId = CoreNavigator.getRouteNumberParam('courseId');
             this.cmId = CoreNavigator.getRouteNumberParam('cmId');
             this.forumId = CoreNavigator.getRouteNumberParam('forumId');
@@ -136,6 +143,16 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
             this.postId = CoreNavigator.getRouteNumberParam('postId');
             this.parent = CoreNavigator.getRouteNumberParam('parent');
 
+            if (this.courseId && this.cmId && (routeData.swipeEnabled ?? true)) {
+                this.discussions = new AddonModForumDiscussionDiscussionsSwipeManager(
+                    CoreItemsManagerSourcesTracker.getOrCreateSource(
+                        AddonModForumDiscussionsSource,
+                        [this.courseId, this.cmId, routeData.discussionsPathPrefix ?? ''],
+                    ),
+                );
+
+                await this.discussions.start();
+            }
         } catch (error) {
             CoreDomUtils.showErrorModal(error);
 
@@ -311,6 +328,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
      */
     ngOnDestroy(): void {
         this.onlineObserver && this.onlineObserver.unsubscribe();
+        this.discussions && this.discussions.destroy();
     }
 
     /**
@@ -839,3 +857,17 @@ export type AddonModForumSharedPostFormData = Omit<AddonModForumPostFormData, 'i
     id?: number; // ID when editing an online reply.
     syncId?: string; // Sync ID if some post has blocked synchronization.
 };
+
+/**
+ * Helper to manage swiping within a collection of discussions.
+ */
+class AddonModForumDiscussionDiscussionsSwipeManager extends AddonModForumDiscussionsSwipeManager {
+
+    /**
+     * @inheritdoc
+     */
+    protected getSelectedItemPathFromRoute(route: ActivatedRouteSnapshot): string | null {
+        return this.getSource().DISCUSSIONS_PATH_PREFIX + route.params.discussionId;
+    }
+
+}
diff --git a/src/addons/mod/forum/pages/new-discussion/new-discussion.html b/src/addons/mod/forum/pages/new-discussion/new-discussion.html
index b083956f4..e84f01638 100644
--- a/src/addons/mod/forum/pages/new-discussion/new-discussion.html
+++ b/src/addons/mod/forum/pages/new-discussion/new-discussion.html
@@ -12,76 +12,77 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-refresher slot="fixed" [disabled]="!groupsLoaded" (ionRefresh)="refreshGroups($event.target)">
-        <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
-    </ion-refresher>
-
-    <core-loading [hideUntil]="groupsLoaded">
-        <form *ngIf="showForm" #newDiscFormEl>
-            <ion-item>
-                <ion-label position="stacked">{{ 'addon.mod_forum.subject' | translate }}</ion-label>
-                <ion-input [(ngModel)]="newDiscussion.subject" type="text" [placeholder]="'addon.mod_forum.subject' | translate"
-                    name="subject">
-                </ion-input>
-            </ion-item>
-            <ion-item>
-                <ion-label position="stacked">{{ 'addon.mod_forum.message' | translate }}</ion-label>
-                <core-rich-text-editor name="addon_mod_forum_new_discussion" contextLevel="module" elementId="message"
-                    [control]="messageControl" [placeholder]="'addon.mod_forum.message' | translate" [component]="component"
-                    [componentId]="forum.cmid" [autoSave]="true" [contextInstanceId]="forum.cmid"
-                    (contentChanged)="onMessageChange($event)">
-                </core-rich-text-editor>
-            </ion-item>
-            <ion-item button class="divider ion-text-wrap" (click)="toggleAdvanced()" detail="false" [attr.aria-expanded]="advanced"
-                [attr.aria-label]="(advanced ? 'core.hideadvanced' : 'core.showadvanced') | translate" role="heading"
-                aria-controls="addon-mod-forum-new-discussion-advanced">
-                <ion-icon *ngIf="!advanced" name="fas-caret-right" flip-rtl slot="start" aria-hidden="true"></ion-icon>
-                <ion-icon *ngIf="advanced" name="fas-caret-down" slot="start" aria-hidden="true"></ion-icon>
-                <ion-label>
-                    <h2>{{ 'addon.mod_forum.advanced' | translate }}</h2>
-                </ion-label>
-            </ion-item>
-            <div *ngIf="advanced" id="addon-mod-forum-new-discussion-advanced">
-                <ion-item *ngIf="showGroups && groupIds.length > 1 && accessInfo.cancanposttomygroups">
-                    <ion-label>{{ 'addon.mod_forum.posttomygroups' | translate }}</ion-label>
-                    <ion-toggle [(ngModel)]="newDiscussion.postToAllGroups" name="postallgroups"></ion-toggle>
-                </ion-item>
-                <ion-item *ngIf="showGroups">
-                    <ion-label id="addon-mod-forum-groupslabel">{{ 'addon.mod_forum.group' | translate }}</ion-label>
-                    <ion-select [(ngModel)]="newDiscussion.groupId" [disabled]="newDiscussion.postToAllGroups"
-                        aria-labelledby="addon-mod-forum-groupslabel" interface="action-sheet" name="groupid"
-                        [interfaceOptions]="{header: 'addon.mod_forum.group' | translate}">
-                        <ion-select-option *ngFor="let group of groups" [value]="group.id">{{ group.name }}</ion-select-option>
-                    </ion-select>
+    <core-swipe-navigation [manager]="discussions">
+        <ion-refresher slot="fixed" [disabled]="!groupsLoaded" (ionRefresh)="refreshGroups($event.target)">
+            <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
+        </ion-refresher>
+        <core-loading [hideUntil]="groupsLoaded">
+            <form *ngIf="showForm" #newDiscFormEl>
+                <ion-item>
+                    <ion-label position="stacked">{{ 'addon.mod_forum.subject' | translate }}</ion-label>
+                    <ion-input [(ngModel)]="newDiscussion.subject" type="text" [placeholder]="'addon.mod_forum.subject' | translate"
+                        name="subject">
+                    </ion-input>
                 </ion-item>
                 <ion-item>
-                    <ion-label>{{ 'addon.mod_forum.discussionsubscription' | translate }}</ion-label>
-                    <ion-toggle [(ngModel)]="newDiscussion.subscribe" name="subscribe"></ion-toggle>
+                    <ion-label position="stacked">{{ 'addon.mod_forum.message' | translate }}</ion-label>
+                    <core-rich-text-editor name="addon_mod_forum_new_discussion" contextLevel="module" elementId="message"
+                        [control]="messageControl" [placeholder]="'addon.mod_forum.message' | translate" [component]="component"
+                        [componentId]="forum.cmid" [autoSave]="true" [contextInstanceId]="forum.cmid"
+                        (contentChanged)="onMessageChange($event)">
+                    </core-rich-text-editor>
                 </ion-item>
-                <ion-item *ngIf="canPin">
-                    <ion-label>{{ 'addon.mod_forum.discussionpinned' | translate }}</ion-label>
-                    <ion-toggle [(ngModel)]="newDiscussion.pin" name="pin"></ion-toggle>
+                <ion-item button class="divider ion-text-wrap" (click)="toggleAdvanced()" detail="false" [attr.aria-expanded]="advanced"
+                    [attr.aria-label]="(advanced ? 'core.hideadvanced' : 'core.showadvanced') | translate" role="heading"
+                    aria-controls="addon-mod-forum-new-discussion-advanced">
+                    <ion-icon *ngIf="!advanced" name="fas-caret-right" flip-rtl slot="start" aria-hidden="true"></ion-icon>
+                    <ion-icon *ngIf="advanced" name="fas-caret-down" slot="start" aria-hidden="true"></ion-icon>
+                    <ion-label>
+                        <h2>{{ 'addon.mod_forum.advanced' | translate }}</h2>
+                    </ion-label>
                 </ion-item>
-                <core-attachments *ngIf="canCreateAttachments && forum && forum.maxattachments > 0" [files]="newDiscussion.files"
-                    [maxSize]="forum.maxbytes" [maxSubmissions]="forum.maxattachments" [component]="component" [componentId]="forum.cmid"
-                    [allowOffline]="true" [courseId]="courseId">
-                </core-attachments>
-            </div>
-            <ion-item>
-                <ion-label>
-                    <ion-row>
-                        <ion-col>
-                            <ion-button expand="block" [disabled]="newDiscussion.subject == '' || newDiscussion.message == null"
-                                (click)="add()">
-                                {{ 'addon.mod_forum.posttoforum' | translate }}
-                            </ion-button>
-                        </ion-col>
-                        <ion-col *ngIf="hasOffline">
-                            <ion-button expand="block" color="light" (click)="discard()">{{ 'core.discard' | translate }}</ion-button>
-                        </ion-col>
-                    </ion-row>
-                </ion-label>
-            </ion-item>
-        </form>
-    </core-loading>
+                <div *ngIf="advanced" id="addon-mod-forum-new-discussion-advanced">
+                    <ion-item *ngIf="showGroups && groupIds.length > 1 && accessInfo.cancanposttomygroups">
+                        <ion-label>{{ 'addon.mod_forum.posttomygroups' | translate }}</ion-label>
+                        <ion-toggle [(ngModel)]="newDiscussion.postToAllGroups" name="postallgroups"></ion-toggle>
+                    </ion-item>
+                    <ion-item *ngIf="showGroups">
+                        <ion-label id="addon-mod-forum-groupslabel">{{ 'addon.mod_forum.group' | translate }}</ion-label>
+                        <ion-select [(ngModel)]="newDiscussion.groupId" [disabled]="newDiscussion.postToAllGroups"
+                            aria-labelledby="addon-mod-forum-groupslabel" interface="action-sheet" name="groupid"
+                            [interfaceOptions]="{header: 'addon.mod_forum.group' | translate}">
+                            <ion-select-option *ngFor="let group of groups" [value]="group.id">{{ group.name }}</ion-select-option>
+                        </ion-select>
+                    </ion-item>
+                    <ion-item>
+                        <ion-label>{{ 'addon.mod_forum.discussionsubscription' | translate }}</ion-label>
+                        <ion-toggle [(ngModel)]="newDiscussion.subscribe" name="subscribe"></ion-toggle>
+                    </ion-item>
+                    <ion-item *ngIf="canPin">
+                        <ion-label>{{ 'addon.mod_forum.discussionpinned' | translate }}</ion-label>
+                        <ion-toggle [(ngModel)]="newDiscussion.pin" name="pin"></ion-toggle>
+                    </ion-item>
+                    <core-attachments *ngIf="canCreateAttachments && forum && forum.maxattachments > 0" [files]="newDiscussion.files"
+                        [maxSize]="forum.maxbytes" [maxSubmissions]="forum.maxattachments" [component]="component"
+                        [componentId]="forum.cmid" [allowOffline]="true" [courseId]="courseId">
+                    </core-attachments>
+                </div>
+                <ion-item>
+                    <ion-label>
+                        <ion-row>
+                            <ion-col>
+                                <ion-button expand="block" [disabled]="newDiscussion.subject == '' || newDiscussion.message == null"
+                                    (click)="add()">
+                                    {{ 'addon.mod_forum.posttoforum' | translate }}
+                                </ion-button>
+                            </ion-col>
+                            <ion-col *ngIf="hasOffline">
+                                <ion-button expand="block" color="light" (click)="discard()">{{ 'core.discard' | translate }}</ion-button>
+                            </ion-col>
+                        </ion-row>
+                    </ion-label>
+                </ion-item>
+            </form>
+        </core-loading>
+    </core-swipe-navigation>
 </ion-content>
diff --git a/src/addons/mod/forum/pages/new-discussion/new-discussion.page.ts b/src/addons/mod/forum/pages/new-discussion/new-discussion.page.ts
index f5495fb71..7e9efa79a 100644
--- a/src/addons/mod/forum/pages/new-discussion/new-discussion.page.ts
+++ b/src/addons/mod/forum/pages/new-discussion/new-discussion.page.ts
@@ -40,6 +40,10 @@ import { CoreTextUtils } from '@services/utils/text';
 import { CanLeave } from '@guards/can-leave';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import { CoreForms } from '@singletons/form';
+import { AddonModForumDiscussionsSwipeManager } from '../../classes/forum-discussions-swipe-manager';
+import { ActivatedRoute, ActivatedRouteSnapshot } from '@angular/router';
+import { CoreItemsManagerSourcesTracker } from '@classes/items-management/items-manager-sources-tracker';
+import { AddonModForumDiscussionsSource } from '../../classes/forum-discussions-source';
 
 type NewDiscussionData = {
     subject: string;
@@ -88,6 +92,8 @@ export class AddonModForumNewDiscussionPage implements OnInit, OnDestroy, CanLea
     accessInfo: AddonModForumAccessInformation = {};
     courseId!: number;
 
+    discussions?: AddonModForumNewDiscussionDiscussionsSwipeManager;
+
     protected cmId!: number;
     protected forumId!: number;
     protected timeCreated!: number;
@@ -97,17 +103,29 @@ export class AddonModForumNewDiscussionPage implements OnInit, OnDestroy, CanLea
     protected originalData?: Partial<NewDiscussionData>;
     protected forceLeave = false;
 
-    constructor(@Optional() protected splitView: CoreSplitViewComponent) {}
+    constructor(protected route: ActivatedRoute, @Optional() protected splitView: CoreSplitViewComponent) {}
 
     /**
      * Component being initialized.
      */
-    ngOnInit(): void {
+    async ngOnInit(): Promise<void> {
         try {
+            const routeData = this.route.snapshot.data;
             this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
             this.cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
             this.forumId = CoreNavigator.getRequiredRouteNumberParam('forumId');
             this.timeCreated = CoreNavigator.getRequiredRouteNumberParam('timeCreated');
+
+            if (this.timeCreated !== 0 && (routeData.swipeEnabled ?? true)) {
+                const source = CoreItemsManagerSourcesTracker.getOrCreateSource(
+                    AddonModForumDiscussionsSource,
+                    [this.courseId, this.cmId, routeData.discussionsPathPrefix ?? ''],
+                );
+
+                this.discussions = new AddonModForumNewDiscussionDiscussionsSwipeManager(source);
+
+                await this.discussions.start();
+            }
         } catch (error) {
             CoreDomUtils.showErrorModal(error);
 
@@ -625,3 +643,17 @@ export class AddonModForumNewDiscussionPage implements OnInit, OnDestroy, CanLea
     }
 
 }
+
+/**
+ * Helper to manage swiping within a collection of discussions.
+ */
+class AddonModForumNewDiscussionDiscussionsSwipeManager extends AddonModForumDiscussionsSwipeManager {
+
+    /**
+     * @inheritdoc
+     */
+    protected getSelectedItemPathFromRoute(route: ActivatedRouteSnapshot): string | null {
+        return `${this.getSource().DISCUSSIONS_PATH_PREFIX}new/${route.params.timeCreated}`;
+    }
+
+}
diff --git a/src/addons/mod/glossary/components/index/index.ts b/src/addons/mod/glossary/components/index/index.ts
index 1e5c4d361..6f250813b 100644
--- a/src/addons/mod/glossary/components/index/index.ts
+++ b/src/addons/mod/glossary/components/index/index.ts
@@ -198,7 +198,7 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
 
             const [hasOfflineRatings] = await Promise.all([
                 CoreRatingOffline.hasRatings('mod_glossary', 'entry', ContextLevel.MODULE, this.glossary.coursemodule),
-                refresh ? this.entries.reload() : this.entries.loadNextPage(),
+                refresh ? this.entries.reload() : this.entries.load(),
             ]);
 
             this.hasOfflineRatings = hasOfflineRatings;
@@ -307,7 +307,7 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
         try {
             this.loadMoreError = false;
 
-            await this.entries.loadNextPage();
+            await this.entries.load();
         } catch (error) {
             this.loadMoreError = true;
             CoreDomUtils.showErrorModalDefault(error, 'addon.mod_glossary.errorloadingentries', true);
diff --git a/src/core/classes/items-management/items-manager-source.ts b/src/core/classes/items-management/items-manager-source.ts
index e512747ec..29acf445f 100644
--- a/src/core/classes/items-management/items-manager-source.ts
+++ b/src/core/classes/items-management/items-manager-source.ts
@@ -40,6 +40,7 @@ export abstract class CoreItemsManagerSource<Item = unknown> {
     protected items: Item[] | null = null;
     protected hasMoreItems = true;
     protected listeners: CoreItemsListSourceListener<Item>[] = [];
+    protected dirty = false;
 
     /**
      * Check whether any page has been loaded.
@@ -59,6 +60,17 @@ export abstract class CoreItemsManagerSource<Item = unknown> {
         return !this.hasMoreItems;
     }
 
+    /**
+     * Set whether the source as dirty.
+     *
+     * When a source is dirty, the next load request will reload items from the beginning.
+     *
+     * @param dirty Whether source should be marked as dirty or not.
+     */
+    setDirty(dirty: boolean): void {
+        this.dirty = dirty;
+    }
+
     /**
      * Get collection items.
      *
@@ -92,6 +104,7 @@ export abstract class CoreItemsManagerSource<Item = unknown> {
     reset(): void {
         this.items = null;
         this.hasMoreItems = true;
+        this.dirty = false;
 
         this.listeners.forEach(listener => listener.onReset?.call(listener));
     }
@@ -129,13 +142,23 @@ export abstract class CoreItemsManagerSource<Item = unknown> {
     async reload(): Promise<void> {
         const { items, hasMoreItems } = await this.loadPageItems(0);
 
+        this.dirty = false;
         this.setItems(items, hasMoreItems ?? false);
     }
 
     /**
-     * Load items for the next page, if any.
+     * Load more items, if any.
      */
-    async loadNextPage(): Promise<void> {
+    async load(): Promise<void> {
+        if (this.dirty) {
+            const { items, hasMoreItems } = await this.loadPageItems(0);
+
+            this.dirty = false;
+            this.setItems(items, hasMoreItems ?? false);
+
+            return;
+        }
+
         if (!this.hasMoreItems) {
             return;
         }
diff --git a/src/core/classes/items-management/list-items-manager.ts b/src/core/classes/items-management/list-items-manager.ts
index a9e22b9a7..baacfdefc 100644
--- a/src/core/classes/items-management/list-items-manager.ts
+++ b/src/core/classes/items-management/list-items-manager.ts
@@ -140,10 +140,10 @@ export class CoreListItemsManager<
     }
 
     /**
-     * Load items for the next page, if any.
+     * Load more items, if any.
      */
-    async loadNextPage(): Promise<void> {
-        await this.getSource().loadNextPage();
+    async load(): Promise<void> {
+        await this.getSource().load();
     }
 
     /**
diff --git a/src/core/classes/items-management/swipe-items-manager.ts b/src/core/classes/items-management/swipe-items-manager.ts
index 3dd41cd4f..918cab741 100644
--- a/src/core/classes/items-management/swipe-items-manager.ts
+++ b/src/core/classes/items-management/swipe-items-manager.ts
@@ -110,7 +110,7 @@ export class CoreSwipeItemsManager<
         const item = items?.[index + delta] ?? null;
 
         if (!item && !this.getSource().isCompleted()) {
-            await this.getSource().loadNextPage();
+            await this.getSource().load();
 
             return this.getItemBy(delta);
         }
diff --git a/src/core/features/user/pages/participants/participants.page.ts b/src/core/features/user/pages/participants/participants.page.ts
index 73f6410f8..a15ed9a11 100644
--- a/src/core/features/user/pages/participants/participants.page.ts
+++ b/src/core/features/user/pages/participants/participants.page.ts
@@ -185,7 +185,7 @@ export class CoreUserParticipantsPage implements OnInit, AfterViewInit, OnDestro
     private async fetchParticipants(reload: boolean): Promise<void> {
         reload
             ? await this.participants.reload()
-            : await this.participants.loadNextPage();
+            : await this.participants.load();
 
         this.fetchMoreParticipantsFailed = false;
     }

From a06f64832bc0e2e475de2c22ff1ba58757084723 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 3 Dec 2021 13:45:23 +0100
Subject: [PATCH 0255/1008] MOBILE-3099 course: Add module navigation component

---
 scripts/langindex.json                        |   4 +
 .../index/addon-mod-assign-index.html         |   2 +
 .../index/addon-mod-book-index.html           |   3 +
 .../mod/chat/components/components.module.ts  |   2 -
 .../index/addon-mod-chat-index.html           |   3 +
 .../index/addon-mod-choice-index.html         |   3 +
 .../index/addon-mod-data-index.html           |   3 +
 .../index/addon-mod-feedback-index.html       |   3 +
 .../index/addon-mod-folder-index.html         |   3 +
 .../mod/forum/components/index/index.html     |   3 +
 .../index/addon-mod-glossary-index.html       |   3 +
 .../index/addon-mod-h5pactivity-index.html    |   3 +
 .../mod/h5pactivity/components/index/index.ts |   2 -
 .../index/addon-mod-imscp-index.html          |   3 +
 .../index/addon-mod-lesson-index.html         |   3 +
 .../components/index/addon-mod-lti-index.html |   3 +
 .../index/addon-mod-page-index.html           |   3 +
 .../index/addon-mod-quiz-index.html           |   3 +
 .../index/addon-mod-resource-index.html       |   6 +-
 .../index/addon-mod-scorm-index.html          |   3 +
 .../index/addon-mod-survey-index.html         |   3 +
 .../components/index/addon-mod-url-index.html |   5 +-
 .../index/addon-mod-wiki-index.html           |   3 +
 .../index/addon-mod-workshop-index.html       |   3 +
 .../course/classes/module-base-handler.ts     |   9 +-
 .../course/components/components.module.ts    |   3 +
 .../core-course-module-navigation.html        |  16 +
 .../module-navigation/module-navigation.scss  |  43 +++
 .../module-navigation/module-navigation.ts    | 335 ++++++++++++++++++
 .../course/components/module/module.ts        |   2 +-
 src/core/features/course/lang.json            |   4 +
 .../course/services/module-delegate.ts        |   7 +-
 .../components/components.module.ts           |   2 +
 .../core-siteplugins-module-index.html        |   5 +-
 src/theme/theme.light.scss                    |   3 +
 35 files changed, 490 insertions(+), 14 deletions(-)
 create mode 100644 src/core/features/course/components/module-navigation/core-course-module-navigation.html
 create mode 100644 src/core/features/course/components/module-navigation/module-navigation.scss
 create mode 100644 src/core/features/course/components/module-navigation/module-navigation.ts

diff --git a/scripts/langindex.json b/scripts/langindex.json
index df6d554e3..cc6776547 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1507,6 +1507,10 @@
   "core.course.errordownloadingcourse": "local_moodlemobileapp",
   "core.course.errordownloadingsection": "local_moodlemobileapp",
   "core.course.errorgetmodule": "local_moodlemobileapp",
+  "core.course.gotonextactivity": "local_moodlemobileapp",
+  "core.course.gotonextactivitynotfound": "local_moodlemobileapp",
+  "core.course.gotopreviousactivity": "local_moodlemobileapp",
+  "core.course.gotopreviousactivitynotfound": "local_moodlemobileapp",
   "core.course.hiddenfromstudents": "moodle",
   "core.course.hiddenoncoursepage": "moodle",
   "core.course.insufficientavailablequota": "local_moodlemobileapp",
diff --git a/src/addons/mod/assign/components/index/addon-mod-assign-index.html b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
index fd835cefd..2382ff0e7 100644
--- a/src/addons/mod/assign/components/index/addon-mod-assign-index.html
+++ b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
@@ -147,3 +147,5 @@
         [moduleId]="module.id">
     </addon-mod-assign-submission>
 </core-loading>
+
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id"></core-course-module-navigation>
diff --git a/src/addons/mod/book/components/index/addon-mod-book-index.html b/src/addons/mod/book/components/index/addon-mod-book-index.html
index f6f090647..dc1e2dcda 100644
--- a/src/addons/mod/book/components/index/addon-mod-book-index.html
+++ b/src/addons/mod/book/components/index/addon-mod-book-index.html
@@ -52,3 +52,6 @@
     </div>
 
 </core-loading>
+
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+</core-course-module-navigation>
diff --git a/src/addons/mod/chat/components/components.module.ts b/src/addons/mod/chat/components/components.module.ts
index 954e3a8b4..c0bdb4ad4 100644
--- a/src/addons/mod/chat/components/components.module.ts
+++ b/src/addons/mod/chat/components/components.module.ts
@@ -27,8 +27,6 @@ import { AddonModChatUsersModalComponent } from './users-modal/users-modal';
         CoreSharedModule,
         CoreCourseComponentsModule,
     ],
-    providers: [
-    ],
     exports: [
         AddonModChatIndexComponent,
         AddonModChatUsersModalComponent,
diff --git a/src/addons/mod/chat/components/index/addon-mod-chat-index.html b/src/addons/mod/chat/components/index/addon-mod-chat-index.html
index 93265acea..046853afd 100644
--- a/src/addons/mod/chat/components/index/addon-mod-chat-index.html
+++ b/src/addons/mod/chat/components/index/addon-mod-chat-index.html
@@ -47,3 +47,6 @@
         </ion-button>
     </ng-container>
 </core-loading>
+
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+</core-course-module-navigation>
diff --git a/src/addons/mod/choice/components/index/addon-mod-choice-index.html b/src/addons/mod/choice/components/index/addon-mod-choice-index.html
index a767fe487..4d291227e 100644
--- a/src/addons/mod/choice/components/index/addon-mod-choice-index.html
+++ b/src/addons/mod/choice/components/index/addon-mod-choice-index.html
@@ -155,6 +155,9 @@
     </ion-card>
 </core-loading>
 
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+</core-course-module-navigation>
+
 <!-- Template to render a choice option label. -->
 <ng-template #optionLabelTemplate let-option="option">
     <p>
diff --git a/src/addons/mod/data/components/index/addon-mod-data-index.html b/src/addons/mod/data/components/index/addon-mod-data-index.html
index 8a1f45d10..1bb70403b 100644
--- a/src/addons/mod/data/components/index/addon-mod-data-index.html
+++ b/src/addons/mod/data/components/index/addon-mod-data-index.html
@@ -138,6 +138,9 @@
 
 </core-loading>
 
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+</core-course-module-navigation>
+
 <ion-fab slot="fixed" core-fab vertical="bottom" horizontal="end" *ngIf="canAdd">
     <ion-fab-button (click)="gotoAddEntries()" [attr.aria-label]="'addon.mod_data.addentries' | translate">
         <ion-icon name="fas-plus" aria-hidden="true"></ion-icon>
diff --git a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
index aacd8344e..c9cb04c87 100644
--- a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
+++ b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
@@ -55,6 +55,9 @@
     </core-tabs>
 </core-loading>
 
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+</core-course-module-navigation>
+
 <ng-template #basicInfo>
     <ion-list *ngIf="access && access.canviewanalysis && !access.isempty">
         <ion-item class="ion-text-wrap" *ngIf="groupInfo && (groupInfo.separateGroups || groupInfo.visibleGroups)">
diff --git a/src/addons/mod/folder/components/index/addon-mod-folder-index.html b/src/addons/mod/folder/components/index/addon-mod-folder-index.html
index cb1093a10..6c8d1aaeb 100644
--- a/src/addons/mod/folder/components/index/addon-mod-folder-index.html
+++ b/src/addons/mod/folder/components/index/addon-mod-folder-index.html
@@ -48,3 +48,6 @@
         [message]=" 'addon.mod_folder.emptyfilelist' | translate"></core-empty-box>
 
 </core-loading>
+
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+</core-course-module-navigation>
diff --git a/src/addons/mod/forum/components/index/index.html b/src/addons/mod/forum/components/index/index.html
index d282b828e..63cd1b7b6 100644
--- a/src/addons/mod/forum/components/index/index.html
+++ b/src/addons/mod/forum/components/index/index.html
@@ -140,6 +140,9 @@
         </ng-container>
     </core-loading>
 
+    <core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+    </core-course-module-navigation>
+
     <ion-fab slot="fixed" core-fab vertical="bottom" horizontal="end" *ngIf="forum && canAddDiscussion">
         <ion-fab-button (click)="openNewDiscussion()" [attr.aria-label]="addDiscussionText">
             <ion-icon name="fas-plus" aria-hidden="true"></ion-icon>
diff --git a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
index c8a816a25..d6f12a61e 100644
--- a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
+++ b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
@@ -96,6 +96,9 @@
         </core-infinite-loading>
     </core-loading>
 
+    <core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+    </core-course-module-navigation>
+
     <ion-fab slot="fixed" core-fab vertical="bottom" horizontal="end" *ngIf="canAdd">
         <ion-fab-button (click)="openNewEntry()" [attr.aria-label]="'addon.mod_glossary.addentry' | translate">
             <ion-icon name="fas-plus" aria-hidden="true"></ion-icon>
diff --git a/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html b/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
index 4c7b7cd88..300b5feb7 100644
--- a/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
+++ b/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
@@ -84,3 +84,6 @@
         [trackComponent]="trackComponent" [contextId]="h5pActivity?.context">
     </core-h5p-iframe>
 </core-loading>
+
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+</core-course-module-navigation>
diff --git a/src/addons/mod/h5pactivity/components/index/index.ts b/src/addons/mod/h5pactivity/components/index/index.ts
index cf7b0b60b..762c6fefe 100644
--- a/src/addons/mod/h5pactivity/components/index/index.ts
+++ b/src/addons/mod/h5pactivity/components/index/index.ts
@@ -45,7 +45,6 @@ import {
 } from '../../services/h5pactivity-sync';
 import { CoreFileHelper } from '@services/file-helper';
 import { AddonModH5PActivityModuleHandlerService } from '../../services/handlers/module';
-import { CoreMainMenuPage } from '@features/mainmenu/pages/menu/menu';
 
 /**
  * Component that displays an H5P activity entry page.
@@ -87,7 +86,6 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
     protected messageListenerFunction: (event: MessageEvent) => Promise<void>;
 
     constructor(
-        protected mainMenuPage: CoreMainMenuPage,
         protected content?: IonContent,
         @Optional() courseContentsPage?: CoreCourseContentsPage,
     ) {
diff --git a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
index 4f15b3bc9..52a6d1eb9 100644
--- a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
+++ b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
@@ -47,3 +47,6 @@
         <core-iframe [src]="src"></core-iframe>
     </div>
 </core-loading>
+
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+</core-course-module-navigation>
diff --git a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
index a9eeb2a60..0219bef8c 100644
--- a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
+++ b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
@@ -297,3 +297,6 @@
         </core-tab>
     </core-tabs>
 </core-loading>
+
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+</core-course-module-navigation>
diff --git a/src/addons/mod/lti/components/index/addon-mod-lti-index.html b/src/addons/mod/lti/components/index/addon-mod-lti-index.html
index ef10e579e..20cf1a86e 100644
--- a/src/addons/mod/lti/components/index/addon-mod-lti-index.html
+++ b/src/addons/mod/lti/components/index/addon-mod-lti-index.html
@@ -32,3 +32,6 @@
         </ion-button>
     </div>
 </core-loading>
+
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+</core-course-module-navigation>
diff --git a/src/addons/mod/page/components/index/addon-mod-page-index.html b/src/addons/mod/page/components/index/addon-mod-page-index.html
index 2dcb76d66..078f5c5c9 100644
--- a/src/addons/mod/page/components/index/addon-mod-page-index.html
+++ b/src/addons/mod/page/components/index/addon-mod-page-index.html
@@ -48,3 +48,6 @@
     </div>
 
 </core-loading>
+
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+</core-course-module-navigation>
diff --git a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
index cf49f5b7b..5d39ece10 100644
--- a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
+++ b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
@@ -226,3 +226,6 @@
         </ion-list>
     </ion-card>
 </core-loading>
+
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+</core-course-module-navigation>
diff --git a/src/addons/mod/resource/components/index/addon-mod-resource-index.html b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
index 4c8e7daf6..9638db04e 100644
--- a/src/addons/mod/resource/components/index/addon-mod-resource-index.html
+++ b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
@@ -18,7 +18,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="loaded" class="safe-area-padding core-loading-fullheight">
+<core-loading [hideUntil]="loaded" class="safe-area-padding">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [courseId]="courseId" (completionChanged)="onCompletionChange()"
@@ -59,5 +59,7 @@
             {{ 'core.openwith' | translate }}
         </ion-button>
     </ng-container>
-
 </core-loading>
+
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+</core-course-module-navigation>
diff --git a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
index f184db40a..37ae91bfa 100644
--- a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
+++ b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
@@ -236,3 +236,6 @@
         </ion-card>
     </ng-container>
 </core-loading>
+
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+</core-course-module-navigation>
diff --git a/src/addons/mod/survey/components/index/addon-mod-survey-index.html b/src/addons/mod/survey/components/index/addon-mod-survey-index.html
index b5042fbf5..345c10b5a 100644
--- a/src/addons/mod/survey/components/index/addon-mod-survey-index.html
+++ b/src/addons/mod/survey/components/index/addon-mod-survey-index.html
@@ -147,3 +147,6 @@
     </form>
 
 </core-loading>
+
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+</core-course-module-navigation>
diff --git a/src/addons/mod/url/components/index/addon-mod-url-index.html b/src/addons/mod/url/components/index/addon-mod-url-index.html
index 491e186eb..7026fddf3 100644
--- a/src/addons/mod/url/components/index/addon-mod-url-index.html
+++ b/src/addons/mod/url/components/index/addon-mod-url-index.html
@@ -13,7 +13,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="loaded" class="core-loading-fullheight">
+<core-loading [hideUntil]="loaded">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="displayDescription && description"
@@ -52,3 +52,6 @@
         </ion-item>
     </ion-list>
 </core-loading>
+
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+</core-course-module-navigation>
diff --git a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
index e6628246f..ee8fec538 100644
--- a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
+++ b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
@@ -89,6 +89,9 @@
     </div>
 </core-loading>
 
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+</core-course-module-navigation>
+
 <ion-fab slot="fixed" core-fab vertical="bottom" horizontal="end" *ngIf="canEdit">
     <ion-fab-button (click)="goToNewPage()" [attr.aria-label]="'addon.mod_wiki.createpage' | translate">
         <ion-icon name="fas-plus" aria-hidden="true"></ion-icon>
diff --git a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
index 1aedc639d..8a5e5543d 100644
--- a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
+++ b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
@@ -253,3 +253,6 @@
         </ion-card>
     </div>
 </core-loading>
+
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+</core-course-module-navigation>
diff --git a/src/core/features/course/classes/module-base-handler.ts b/src/core/features/course/classes/module-base-handler.ts
index f45aa6a53..474fb231c 100644
--- a/src/core/features/course/classes/module-base-handler.ts
+++ b/src/core/features/course/classes/module-base-handler.ts
@@ -45,13 +45,18 @@ export class CoreModuleHandlerBase implements Partial<CoreCourseModuleHandler> {
             title: module.name,
             class: 'addon-mod_' + module.modname + '-handler',
             showDownloadButton: true,
-            action: (event: Event, module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions): void => {
+            action: async (
+                event: Event,
+                module: CoreCourseModule,
+                courseId: number,
+                options?: CoreNavigationOptions,
+            ): Promise<void> => {
                 options = options || {};
                 options.params = options.params || {};
                 Object.assign(options.params, { module });
                 const routeParams = '/' + courseId + '/' + module.id;
 
-                CoreNavigator.navigateToSitePath(this.pageName + routeParams, options);
+                await CoreNavigator.navigateToSitePath(this.pageName + routeParams, options);
             },
         };
     }
diff --git a/src/core/features/course/components/components.module.ts b/src/core/features/course/components/components.module.ts
index 3680f6f36..516a43111 100644
--- a/src/core/features/course/components/components.module.ts
+++ b/src/core/features/course/components/components.module.ts
@@ -26,6 +26,7 @@ import { CoreCourseUnsupportedModuleComponent } from './unsupported-module/unsup
 import { CoreCourseModuleCompletionLegacyComponent } from './module-completion-legacy/module-completion-legacy';
 import { CoreCourseModuleInfoComponent } from './module-info/module-info';
 import { CoreCourseModuleManualCompletionComponent } from './module-manual-completion/module-manual-completion';
+import { CoreCourseModuleNavigationComponent } from './module-navigation/module-navigation';
 
 @NgModule({
     declarations: [
@@ -39,6 +40,7 @@ import { CoreCourseModuleManualCompletionComponent } from './module-manual-compl
         CoreCourseSectionSelectorComponent,
         CoreCourseTagAreaComponent,
         CoreCourseUnsupportedModuleComponent,
+        CoreCourseModuleNavigationComponent,
     ],
     imports: [
         CoreBlockComponentsModule,
@@ -55,6 +57,7 @@ import { CoreCourseModuleManualCompletionComponent } from './module-manual-compl
         CoreCourseSectionSelectorComponent,
         CoreCourseTagAreaComponent,
         CoreCourseUnsupportedModuleComponent,
+        CoreCourseModuleNavigationComponent,
     ],
 })
 export class CoreCourseComponentsModule {}
diff --git a/src/core/features/course/components/module-navigation/core-course-module-navigation.html b/src/core/features/course/components/module-navigation/core-course-module-navigation.html
new file mode 100644
index 000000000..74fc6f584
--- /dev/null
+++ b/src/core/features/course/components/module-navigation/core-course-module-navigation.html
@@ -0,0 +1,16 @@
+<core-loading [hideUntil]="loaded" [fullscreen]="false">
+    <ion-row class="ion-justify-content-between ion-align-items-center ion-no-padding" *ngIf="previousModule || nextModule">
+        <ion-col size="auto">
+            <ion-button fill="clear" class="core-course-previous-module" *ngIf="previousModule" (click)="goToActivity(false)"
+                [attr.aria-label]="'core.course.gotopreviousactivity' | translate">
+                <ion-icon name="fas-arrow-left" slot="icon-only" aria-hidden="true"></ion-icon>
+            </ion-button>
+        </ion-col>
+        <ion-col size="auto">
+            <ion-button fill="clear" class="core-course-next-module" *ngIf="nextModule" (click)="goToActivity(true)"
+                [attr.aria-label]="'core.course.gotonextactivity' | translate">
+                <ion-icon name="fas-arrow-right" slot="icon-only" aria-hidden="true"></ion-icon>
+            </ion-button>
+        </ion-col>
+    </ion-row>
+</core-loading>
diff --git a/src/core/features/course/components/module-navigation/module-navigation.scss b/src/core/features/course/components/module-navigation/module-navigation.scss
new file mode 100644
index 000000000..2a8b74f54
--- /dev/null
+++ b/src/core/features/course/components/module-navigation/module-navigation.scss
@@ -0,0 +1,43 @@
+@import "~theme/globals";
+
+:host {
+    --height: var(--core-course-module-navigation-height, var(--core-course-module-navigation-max-height));
+    --background: var(--core-course-module-navigation-background);
+
+    height: var(--height);
+    width: 100%;
+    background-color: var(--background);
+    display: block;
+    bottom: 0;
+    z-index: 3;
+    box-shadow: 0px -3px 3px rgba(var(--drop-shadow));
+
+    @include core-transition(all, 200ms);
+
+    ion-col {
+        padding: 2px;
+    }
+
+    core-loading {
+        text-align: center;
+    }
+    
+    ion-buttom {
+        margin-top: 5px;
+        margin-bottom: 5px;
+    }
+
+    core-loading {
+        --loading-inline-min-height: var(--height);
+    }
+}
+
+:host-context(.core-iframe-fullscreen) {
+    opacity: 0 !important;
+    height: 0 !important;
+}
+
+:host-context(core-course-format.core-course-format-singleactivity) {
+    opacity: 0 !important;
+    height: 0 !important;
+}
diff --git a/src/core/features/course/components/module-navigation/module-navigation.ts b/src/core/features/course/components/module-navigation/module-navigation.ts
new file mode 100644
index 000000000..627f0bbd5
--- /dev/null
+++ b/src/core/features/course/components/module-navigation/module-navigation.ts
@@ -0,0 +1,335 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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, ElementRef, Input, OnDestroy, OnInit } from '@angular/core';
+import { CoreCourse, CoreCourseProvider, CoreCourseWSSection } from '@features/course/services/course';
+import { CoreCourseModule } from '@features/course/services/course-helper';
+import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate';
+import { IonContent } from '@ionic/angular';
+import { ScrollDetail } from '@ionic/core';
+import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
+import { CoreUtils } from '@services/utils/utils';
+import { CoreEventObserver, CoreEvents } from '@singletons/events';
+
+/**
+ * Component to show a button to go to the next resource/activity.
+ *
+ * Example usage:
+ * <core-course-module-navigation [courseId]="courseId" [currentModuleId]="module.id"></core-course-module-navigation>
+ */
+@Component({
+    selector: 'core-course-module-navigation',
+    templateUrl: 'core-course-module-navigation.html',
+    styleUrls: ['module-navigation.scss'],
+})
+export class CoreCourseModuleNavigationComponent implements OnInit, OnDestroy {
+
+    @Input() courseId!: number; // Course ID.
+    @Input() currentModuleId!: number; // Current module ID.
+
+    nextModule?: CoreCourseModule;
+    previousModule?: CoreCourseModule;
+    loaded = false;
+
+    protected element: HTMLElement;
+    protected initialHeight = 0;
+    protected initialPaddingBottom = 0;
+    protected previousTop = 0;
+    protected content?: HTMLIonContentElement | null;
+    protected completionObserver: CoreEventObserver;
+
+    constructor(el: ElementRef, protected ionContent: IonContent) {
+        const siteId = CoreSites.getCurrentSiteId();
+
+        this.element = el.nativeElement;
+        this.element.setAttribute('slot', 'fixed');
+
+        this.completionObserver = CoreEvents.on(CoreEvents.COMPLETION_MODULE_VIEWED, async (data) => {
+            if (data && data.courseId == this.courseId) {
+                // Check if now there's a next module.
+                await this.setNextAndPreviousModules(
+                    CoreSitesReadingStrategy.PREFER_NETWORK,
+                    !this.nextModule,
+                    !this.previousModule,
+                );
+            }
+        }, siteId);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async ngOnInit(): Promise<void> {
+        try {
+            await this.setNextAndPreviousModules(CoreSitesReadingStrategy.PREFER_CACHE);
+        } finally {
+            this.loaded = true;
+
+            await CoreUtils.nextTicks(50);
+            this.listenScrollEvents();
+        }
+    }
+
+    /**
+     * Setup scroll event listener.
+     *
+     * @param retries Number of retries left.
+     */
+    protected async listenScrollEvents(retries = 3): Promise<void> {
+        this.initialHeight = this.element.getBoundingClientRect().height;
+
+        if (this.initialHeight == 0 && retries > 0) {
+            await CoreUtils.nextTicks(50);
+
+            this.listenScrollEvents(retries - 1);
+
+            return;
+        }
+        // Set a minimum height value.
+        this.initialHeight = this.initialHeight || 56;
+
+        this.content = this.element.closest('ion-content');
+
+        if (!this.content) {
+            return;
+        }
+
+        // Special case where there's no navigation.
+        const courseFormat = this.element.closest('core-course-format.core-course-format-singleactivity');
+        if (courseFormat) {
+            this.element.remove();
+            this.ngOnDestroy();
+
+            return;
+        }
+
+        // Move element to the nearest ion-content if it's not the parent.
+        if (this.element.parentElement?.nodeName != 'ION-CONTENT') {
+            this.content.appendChild(this.element);
+        }
+
+        // Set a padding to not overlap elements.
+        this.initialPaddingBottom = parseFloat(this.content.style.getPropertyValue('--padding-bottom') || '0');
+        this.content.style.setProperty('--padding-bottom', this.initialPaddingBottom + this.initialHeight + 'px');
+        const scroll = await this.content.getScrollElement();
+        this.content.scrollEvents = true;
+
+        this.setBarHeight(this.initialHeight);
+        this.content.addEventListener('ionScroll', (e: CustomEvent<ScrollDetail>): void => {
+            if (!this.content) {
+                return;
+            }
+
+            this.onScroll(e.detail.scrollTop, scroll.scrollHeight - scroll.offsetHeight);
+        });
+
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async ngOnDestroy(): Promise<void> {
+        this.completionObserver.off();
+        this.content?.style.setProperty('--padding-bottom', this.initialPaddingBottom + 'px');
+    }
+
+    /**
+     * Set previous and next modules.
+     *
+     * @param readingStrategy Reading strategy.
+     * @param checkNext Check next module.
+     * @param checkPrevious Check previous module.
+     * @return Promise resolved when done.
+     */
+    protected async setNextAndPreviousModules(
+        readingStrategy: CoreSitesReadingStrategy,
+        checkNext = true,
+        checkPrevious = true,
+    ): Promise<void> {
+        if (!checkNext && !checkPrevious) {
+            return;
+        }
+
+        const preSets = CoreSites.getReadingStrategyPreSets(readingStrategy);
+
+        const sections = await CoreCourse.getSections(this.courseId, false, true, preSets);
+
+        // Search the next module.
+        let currentModuleIndex = -1;
+
+        const currentSectionIndex = sections.findIndex((section) => {
+            if (!this.isSectionAvailable(section)) {
+                // User cannot view the section, skip it.
+                return false;
+            }
+
+            currentModuleIndex = section.modules.findIndex((module: CoreCourseModule) => module.id == this.currentModuleId);
+
+            return currentModuleIndex >= 0;
+        });
+
+        if (currentSectionIndex < 0) {
+            // Nothing found. Return.
+
+            return;
+        }
+
+        if (checkNext) {
+            // Find next Module.
+            this.nextModule = undefined;
+            for (let i = currentSectionIndex; i < sections.length && this.nextModule == undefined; i++) {
+                const section = sections[i];
+
+                if (!this.isSectionAvailable(section)) {
+                    // User cannot view the section, skip it.
+                    continue;
+                }
+
+                const startModule = i == currentSectionIndex ? currentModuleIndex + 1 : 0;
+                for (let j = startModule; j < section.modules.length && this.nextModule == undefined; j++) {
+                    const module = section.modules[j];
+
+                    const found = await this.isModuleAvailable(module, section.id);
+                    if (found) {
+                        this.nextModule = module;
+                    }
+                }
+            }
+        }
+
+        if (checkPrevious) {
+            // Find previous Module.
+            this.previousModule = undefined;
+            for (let i = currentSectionIndex; i >= 0 && this.previousModule == undefined; i--) {
+                const section = sections[i];
+
+                if (!this.isSectionAvailable(section)) {
+                    // User cannot view the section, skip it.
+                    continue;
+                }
+
+                const startModule = i == currentSectionIndex ? currentModuleIndex - 1 : section.modules.length - 1;
+                for (let j = startModule; j >= 0 && this.previousModule == undefined; j--) {
+                    const module = section.modules[j];
+
+                    const found = await this.isModuleAvailable(module, section.id);
+                    if (found) {
+                        this.previousModule = module;
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Module is visible by the user and it has a specific view (e.g. not a label).
+     *
+     * @param module Module to check.
+     * @param sectionId Section ID the module belongs to.
+     * @return Wether the module is available to the user or not.
+     */
+    protected async isModuleAvailable(module: CoreCourseModule, sectionId: number): Promise<boolean> {
+        if (module.uservisible === false || !CoreCourse.instance.moduleHasView(module)) {
+            return false;
+        }
+
+        if (!module.handlerData) {
+            module.handlerData =
+                await CoreCourseModuleDelegate.getModuleDataFor(module.modname, module, this.courseId, sectionId);
+        }
+
+        return !!module.handlerData?.action;
+    }
+
+    /**
+     * Section is visible by the user and its not stealth
+     *
+     * @param section Section to check.
+     * @return Wether the module is available to the user or not.
+     */
+    protected isSectionAvailable(section: CoreCourseWSSection): boolean {
+        return section.uservisible !== false && section.id != CoreCourseProvider.STEALTH_MODULES_SECTION_ID;
+    }
+
+    /**
+     * Go to next/previous module.
+     *
+     * @return Promise resolved when done.
+     */
+    async goToActivity(next = true): Promise<void> {
+        if (!this.loaded) {
+            return;
+        }
+
+        const modal = await CoreDomUtils.showModalLoading();
+
+        // Re-calculate module in case a new module was made visible.
+        await CoreUtils.ignoreErrors(this.setNextAndPreviousModules(CoreSitesReadingStrategy.PREFER_NETWORK, next, !next));
+
+        modal.dismiss();
+
+        const module = next ? this.nextModule : this.previousModule;
+        if (!module) {
+            // It seems the module was hidden. Show a message.
+            CoreDomUtils.instance.showErrorModal(
+                next ? 'core.course.gotonextactivitynotfound' : 'core.course.gotopreviousactivitynotfound',
+                true,
+            );
+
+            return;
+        }
+
+        if (!module.handlerData?.action) {
+            return;
+        }
+
+        module.handlerData.action(new Event('click'), module, this.courseId, { replace: true });
+    }
+
+    /**
+     * On scroll function.
+     *
+     * @param top Scroll top measure.
+     * @param maxScroll Scroll height.
+     */
+    protected onScroll(top: number, maxScroll: number): void {
+        if (top == 0 || top == maxScroll) {
+            // Reset.
+            this.setBarHeight(this.initialHeight);
+        } else {
+            const diffHeight = this.element.clientHeight - (top - this.previousTop);
+            this.setBarHeight(diffHeight);
+        }
+
+        this.previousTop = top;
+    }
+
+    /**
+     * Sets the bar height.
+     *
+     * @param height The new bar height.
+     */
+    protected setBarHeight(height: number): void {
+        if (height <= 0) {
+            height = 0;
+        } else if (height > this.initialHeight) {
+            height = this.initialHeight;
+        }
+
+        this.element.style.opacity = height == 0 ? '0' : '1';
+        this.content?.style.setProperty('--core-course-module-navigation-height', height + 'px');
+    }
+
+}
diff --git a/src/core/features/course/components/module/module.ts b/src/core/features/course/components/module/module.ts
index 5431e5114..b077bd66f 100644
--- a/src/core/features/course/components/module/module.ts
+++ b/src/core/features/course/components/module/module.ts
@@ -161,7 +161,7 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy {
         event.preventDefault();
         event.stopPropagation();
 
-        button.action(event, this.module!, this.courseId!);
+        button.action(event, this.module, this.courseId!);
     }
 
     /**
diff --git a/src/core/features/course/lang.json b/src/core/features/course/lang.json
index 7afa1a068..bba7ba758 100644
--- a/src/core/features/course/lang.json
+++ b/src/core/features/course/lang.json
@@ -27,6 +27,10 @@
     "confirmpartialdownloadsize": "You are about to download <strong>at least</strong> {{size}}.{{availableSpace}} Are you sure you want to continue?",
     "confirmlimiteddownload": "You are not currently connected to Wi-Fi. ",
     "contents": "Contents",
+    "gotonextactivity": "Continue to next activity",
+    "gotonextactivitynotfound": "Next activity not found. It's possible that it has been hidden or deleted.",
+    "gotopreviousactivity": "Continue to previous activity",
+    "gotopreviousactivitynotfound": "Previous activity not found. It's possible that it has been hidden or deleted.",
     "couldnotloadsectioncontent": "Could not load the section content. Please try again later.",
     "couldnotloadsections": "Could not load the sections. Please try again later.",
     "coursesummary": "Course summary",
diff --git a/src/core/features/course/services/module-delegate.ts b/src/core/features/course/services/module-delegate.ts
index e5f918d1f..66dec4184 100644
--- a/src/core/features/course/services/module-delegate.ts
+++ b/src/core/features/course/services/module-delegate.ts
@@ -167,8 +167,9 @@ export interface CoreCourseModuleHandlerData {
      * @param module The module object.
      * @param courseId The course ID.
      * @param options Options for the navigation.
+     * @return Promise resolved when done.
      */
-    action?(event: Event, module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions): void;
+    action?(event: Event, module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions): Promise<void> | void;
 
     /**
      * Updates the status of the module.
@@ -236,8 +237,10 @@ export interface CoreCourseModuleHandlerButton {
      * @param event The click event.
      * @param module The module object.
      * @param courseId The course ID.
+     * @param options Options for the navigation.
+     * @return Promise resolved when done.
      */
-    action(event: Event, module: CoreCourseModule, courseId: number): void;
+    action(event: Event, module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions): Promise<void> | void;
 }
 
 /**
diff --git a/src/core/features/siteplugins/components/components.module.ts b/src/core/features/siteplugins/components/components.module.ts
index 2969000e5..b9482e300 100644
--- a/src/core/features/siteplugins/components/components.module.ts
+++ b/src/core/features/siteplugins/components/components.module.ts
@@ -28,6 +28,7 @@ import { CoreSitePluginsAssignSubmissionComponent } from './assign-submission/as
 import { CoreSitePluginsWorkshopAssessmentStrategyComponent } from './workshop-assessment-strategy/workshop-assessment-strategy';
 import { CoreSitePluginsBlockComponent } from './block/block';
 import { CoreSitePluginsOnlyTitleBlockComponent } from './only-title-block/only-title-block';
+import { CoreCourseComponentsModule } from '@features/course/components/components.module';
 
 @NgModule({
     declarations: [
@@ -47,6 +48,7 @@ import { CoreSitePluginsOnlyTitleBlockComponent } from './only-title-block/only-
     imports: [
         CoreSharedModule,
         CoreCompileHtmlComponentModule,
+        CoreCourseComponentsModule,
     ],
     exports: [
         CoreSitePluginsPluginContentComponent,
diff --git a/src/core/features/siteplugins/components/module-index/core-siteplugins-module-index.html b/src/core/features/siteplugins/components/module-index/core-siteplugins-module-index.html
index 930a6e0a0..ac5c6b837 100644
--- a/src/core/features/siteplugins/components/module-index/core-siteplugins-module-index.html
+++ b/src/core/features/siteplugins/components/module-index/core-siteplugins-module-index.html
@@ -11,8 +11,7 @@
         </core-context-menu-item>
         <core-context-menu-item [hidden]="!displayRefresh || (
             content?.compileComponent?.componentInstance?.displayRefresh === false)" [priority]="700"
-            [content]="'core.refresh' | translate" (action)="doRefresh(null, $event)" [iconAction]="refreshIcon"
-            [closeOnClick]="false">
+            [content]="'core.refresh' | translate" (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false">
         </core-context-menu-item>
         <core-context-menu-item [hidden]="!displayPrefetch || !prefetchStatusIcon || (
             content?.compileComponent?.componentInstance?.displayPrefetch === false)" [priority]="600" [content]="prefetchText"
@@ -30,3 +29,5 @@
     [initResult]="initResult" [data]="jsData" [pageTitle]="pageTitle" [preSets]="preSets" (onContentLoaded)="contentLoaded($event)"
     (onLoadingContent)="contentLoading()">
 </core-site-plugins-plugin-content>
+
+<core-course-module-navigation *ngIf="module" [courseId]="courseId" [currentModuleId]="module.id"></core-course-module-navigation>
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index fa001efb9..a4b0b935e 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -257,6 +257,9 @@
 
     --core-courseimage-on-course-height: 150px;
 
+    --core-course-module-navigation-max-height: 56px;
+    --core-course-module-navigation-background: var(--contrast-background);
+
     --addon-calendar-event-category-color: var(--purple);
     --addon-calendar-event-course-color: var(--red);
     --addon-calendar-event-group-color: var(--yellow);

From 4ee4862492c376526394e33c668a3d3b3e937895 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 1 Dec 2021 11:07:00 +0100
Subject: [PATCH 0256/1008] MOBILE-3099 core: Remove fullheight loading
 component

---
 src/addons/mod/scorm/pages/player/player.html |  2 +-
 src/core/components/loading/loading.scss      |  5 +----
 .../capture-media/capture-media.html          |  2 +-
 .../features/viewer/pages/iframe/iframe.html  |  2 +-
 src/core/services/utils/dom.ts                | 22 +++++++++----------
 5 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/addons/mod/scorm/pages/player/player.html b/src/addons/mod/scorm/pages/player/player.html
index 469a6bd01..f7f23bd11 100644
--- a/src/addons/mod/scorm/pages/player/player.html
+++ b/src/addons/mod/scorm/pages/player/player.html
@@ -20,7 +20,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <core-loading [hideUntil]="loaded" class="core-loading-fullheight">
+    <core-loading [hideUntil]="loaded">
         <core-navigation-bar [previous]="previousSco" [next]="nextSco" (action)="loadSco($event)"></core-navigation-bar>
 
         <core-iframe *ngIf="loaded && src" [src]="src" [iframeWidth]="scormWidth" [iframeHeight]="scormHeight"
diff --git a/src/core/components/loading/loading.scss b/src/core/components/loading/loading.scss
index c3cfbf655..3861b04e2 100644
--- a/src/core/components/loading/loading.scss
+++ b/src/core/components/loading/loading.scss
@@ -44,6 +44,7 @@
     }
 
     .core-loading-content {
+        display: contents;
         @include core-transition(opacity, 200ms);
     }
 
@@ -51,10 +52,6 @@
         @include margin(10px, 0, 0, 0);
     }
 
-    &.core-loading-fullheight .core-loading-content {
-        height: 100%;
-    }
-
     &.core-loading-loaded {
         position: unset;
         display: contents;
diff --git a/src/core/features/emulator/components/capture-media/capture-media.html b/src/core/features/emulator/components/capture-media/capture-media.html
index f7be75b5c..f85e62a51 100644
--- a/src/core/features/emulator/components/capture-media/capture-media.html
+++ b/src/core/features/emulator/components/capture-media/capture-media.html
@@ -11,7 +11,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <core-loading [hideUntil]="readyToCapture" class="core-loading-fullheight">
+    <core-loading [hideUntil]="readyToCapture">
         <div class="core-av-wrapper">
             <!-- Video stream for image and video. -->
             <video *ngIf="!isAudio" [hidden]="hasCaptured" class="core-webcam-stream" autoplay #streamVideo></video>
diff --git a/src/core/features/viewer/pages/iframe/iframe.html b/src/core/features/viewer/pages/iframe/iframe.html
index 5b2ae550d..213a23e16 100644
--- a/src/core/features/viewer/pages/iframe/iframe.html
+++ b/src/core/features/viewer/pages/iframe/iframe.html
@@ -9,7 +9,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <core-loading [hideUntil]="finalUrl" class="core-loading-fullheight">
+    <core-loading [hideUntil]="finalUrl">
         <core-iframe *ngIf="finalUrl" [src]="finalUrl"></core-iframe>
     </core-loading>
 </ion-content>
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index c23675e5c..77a664817 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -975,7 +975,7 @@ export class CoreDomUtilsProvider {
      * @deprecated since 3.9.5. Use directly the IonContent class.
      */
     scrollTo(content: IonContent, x: number, y: number, duration?: number): Promise<void> {
-        return content?.scrollToPoint(x, y, duration || 0);
+        return content.scrollToPoint(x, y, duration || 0);
     }
 
     /**
@@ -987,7 +987,7 @@ export class CoreDomUtilsProvider {
      * @deprecated since 3.9.5. Use directly the IonContent class.
      */
     scrollToBottom(content: IonContent, duration?: number): Promise<void> {
-        return content?.scrollToBottom(duration);
+        return content.scrollToBottom(duration);
     }
 
     /**
@@ -999,7 +999,7 @@ export class CoreDomUtilsProvider {
      * @deprecated since 3.9.5. Use directly the IonContent class.
      */
     scrollToTop(content: IonContent, duration?: number): Promise<void> {
-        return content?.scrollToTop(duration);
+        return content.scrollToTop(duration);
     }
 
     /**
@@ -1010,9 +1010,9 @@ export class CoreDomUtilsProvider {
      */
     async getContentHeight(content: IonContent): Promise<number> {
         try {
-            const scrollElement = await content?.getScrollElement();
+            const scrollElement = await content.getScrollElement();
 
-            return scrollElement?.clientHeight || 0;
+            return scrollElement.clientHeight || 0;
         } catch (error) {
             return 0;
         }
@@ -1026,9 +1026,9 @@ export class CoreDomUtilsProvider {
      */
     async getScrollHeight(content: IonContent): Promise<number> {
         try {
-            const scrollElement = await content?.getScrollElement();
+            const scrollElement = await content.getScrollElement();
 
-            return scrollElement?.scrollHeight || 0;
+            return scrollElement.scrollHeight || 0;
         } catch (error) {
             return 0;
         }
@@ -1042,9 +1042,9 @@ export class CoreDomUtilsProvider {
      */
     async getScrollTop(content: IonContent): Promise<number> {
         try {
-            const scrollElement = await content?.getScrollElement();
+            const scrollElement = await content.getScrollElement();
 
-            return scrollElement?.scrollTop || 0;
+            return scrollElement.scrollTop || 0;
         } catch (error) {
             return 0;
         }
@@ -1065,7 +1065,7 @@ export class CoreDomUtilsProvider {
             return false;
         }
 
-        content?.scrollToPoint(position[0], position[1], duration || 0);
+        content.scrollToPoint(position[0], position[1], duration || 0);
 
         return true;
     }
@@ -1097,7 +1097,7 @@ export class CoreDomUtilsProvider {
                 return false;
             }
 
-            content?.scrollToPoint(position[0], position[1], duration || 0);
+            content.scrollToPoint(position[0], position[1], duration || 0);
 
             return true;
         } catch (error) {

From 2e312209428e2a5195c3025ad93af4ae405616f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 30 Nov 2021 13:12:50 +0100
Subject: [PATCH 0257/1008] MOBILE-3099 fab: Adapt fab to add correct paddings

---
 .../components/split-view/split-view.scss     |  1 +
 src/core/directives/fab.ts                    | 57 ++++++++++---------
 src/theme/theme.base.scss                     |  9 ++-
 3 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/src/core/components/split-view/split-view.scss b/src/core/components/split-view/split-view.scss
index deb84173f..a333f7623 100644
--- a/src/core/components/split-view/split-view.scss
+++ b/src/core/components/split-view/split-view.scss
@@ -22,6 +22,7 @@
     .menu,
     .content-outlet {
         top: var(--offset-top);
+        height: calc(100% - var(--offset-top));
         right: 0;
         bottom: 0;
         left: 0;
diff --git a/src/core/directives/fab.ts b/src/core/directives/fab.ts
index d3d0677cb..d8cd1db30 100644
--- a/src/core/directives/fab.ts
+++ b/src/core/directives/fab.ts
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Directive, ElementRef, OnDestroy } from '@angular/core';
-import { IonContent } from '@ionic/angular';
+import { Directive, ElementRef, OnDestroy, OnInit } from '@angular/core';
+import { CoreUtils } from '@services/utils/utils';
 
 /**
  * Directive to move ion-fab components as direct children of the nearest ion-content.
@@ -25,47 +25,50 @@ import { IonContent } from '@ionic/angular';
 @Directive({
     selector: 'ion-fab[core-fab]',
 })
-export class CoreFabDirective implements OnDestroy {
+export class CoreFabDirective implements OnInit, OnDestroy {
 
-    protected static readonly PADDINGBOTTOM = 56;
-
-    protected scrollElement?: HTMLElement;
-    protected done = false;
     protected element: HTMLElement;
+    protected content?: HTMLIonContentElement | null;
+    protected initialPaddingBottom = 0;
 
-    constructor(el: ElementRef, protected content: IonContent) {
+    constructor(el: ElementRef) {
         this.element = el.nativeElement;
-        this.asyncInit();
+        this.element.setAttribute('slot', 'fixed');
     }
 
     /**
-     * Initialize Component.
+     * @inheritdoc
      */
-    async asyncInit(): Promise<void> {
-        if (this.content) {
-            this.scrollElement = await this.content.getScrollElement();
-            if (!this.done) {
-                // Move element to the nearest ion-content if it's not the parent
-                if (this.element.parentElement?.nodeName != 'ION-CONTENT') {
-                    const ionContent = this.element.closest('ion-content');
-                    ionContent?.appendChild(this.element);
-                }
+    async ngOnInit(retries = 3): Promise<void> {
+        this.content = this.element.closest('ion-content');
+        if (!this.content) {
+            if(retries > 0) {
+                await CoreUtils.nextTicks(50);
 
-                // Add space at the bottom to let the user see the whole content.
-                const bottom = parseInt(this.scrollElement.style.paddingBottom, 10) || 0;
-                this.scrollElement.style.paddingBottom = (bottom + CoreFabDirective.PADDINGBOTTOM) + 'px';
-                this.done = true;
+                this.ngOnInit(retries - 1);
             }
+
+            return;
         }
+
+        const initialHeight = this.element.getBoundingClientRect().height || 56;
+
+        // Move element to the nearest ion-content if it's not the parent
+        if (this.element.parentElement?.nodeName != 'ION-CONTENT') {
+            this.content.appendChild(this.element);
+        }
+
+        // Add space at the bottom to let the user see the whole content.
+        this.initialPaddingBottom = parseFloat(this.content.style.getPropertyValue('--padding-bottom') || '0');
+        this.content.style.setProperty('--padding-bottom', this.initialPaddingBottom + initialHeight + 'px');
     }
 
     /**
-     * Destroy component.
+     * @inheritdoc
      */
     ngOnDestroy(): void {
-        if (this.done && this.scrollElement) {
-            const bottom = parseInt(this.scrollElement.style.paddingBottom, 10) || 0;
-            this.scrollElement.style.paddingBottom = (bottom - CoreFabDirective.PADDINGBOTTOM) + 'px';
+        if (this.content) {
+            this.content.style.setProperty('--padding-bottom', this.initialPaddingBottom + 'px');
         }
     }
 
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 4b9278132..51f3cb7f2 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -906,13 +906,16 @@ ion-back-button.md::part(text) {
     display: none;
 }
 
+// Hide close button because when present is read on voice over.
 ion-fab[core-fab] {
-    position: fixed;
-    
-    // Hide close button because when present is read on voice over.
     ion-fab-button::part(close-icon) {
         display: none;
     }
+} 
+
+core-course-module-navigation + ion-fab {
+    bottom: calc(var(--core-course-module-navigation-height, 0px) + 10px);
+    @include core-transition(all, 200ms);
 }
 
 .core-media-adapt-width {

From ba5697b4e70634d4f855a84bd3fee1dfa59468df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 30 Nov 2021 13:58:42 +0100
Subject: [PATCH 0258/1008] MOBILE-3099 course: Improve navigation bar with an
 slide bar

---
 .../index/addon-mod-book-index.html           |  22 ++--
 src/addons/mod/book/components/index/index.ts |  50 +++++----
 src/addons/mod/book/services/book.ts          |  30 ------
 .../index/addon-mod-imscp-index.html          |   4 +-
 .../mod/imscp/components/index/index.scss     |   2 -
 .../mod/imscp/components/index/index.ts       |  49 +++++----
 src/addons/mod/imscp/services/imscp.ts        |  59 +---------
 src/addons/mod/scorm/pages/player/player.html |   2 +-
 src/addons/mod/scorm/pages/player/player.ts   |  37 +++++--
 src/addons/mod/scorm/services/scorm-helper.ts |  30 ++----
 .../navigation-bar/core-navigation-bar.html   |  54 +++++-----
 .../navigation-bar/navigation-bar.scss        |  18 +++-
 .../navigation-bar/navigation-bar.ts          | 101 ++++++++++++++----
 upgrade.txt                                   |   2 +
 14 files changed, 232 insertions(+), 228 deletions(-)

diff --git a/src/addons/mod/book/components/index/addon-mod-book-index.html b/src/addons/mod/book/components/index/addon-mod-book-index.html
index dc1e2dcda..ce5420250 100644
--- a/src/addons/mod/book/components/index/addon-mod-book-index.html
+++ b/src/addons/mod/book/components/index/addon-mod-book-index.html
@@ -35,20 +35,20 @@
         </ion-item>
     </ion-card>
 
-    <div class="ion-padding safe-area-padding-horizontal">
-        <core-navigation-bar *ngIf="displayNavBar" [previous]="previousChapter?.id" [previousTitle]="previousNavBarTitle"
-            [next]="nextChapter?.id" [nextTitle]="nextNavBarTitle" (action)="changeChapter($event)">
+    <div class="safe-area-padding-horizontal">
+        <core-navigation-bar *ngIf="displayNavBar" [items]="navigationItems" [showTitles]="displayTitlesInNavBar"
+            previousTranslate="addon.mod_book.navprevtitle" nextTranslate="addon.mod_book.navnexttitle" (action)="changeChapter($event.id)">
         </core-navigation-bar>
 
-        <core-format-text [component]="component" [componentId]="componentId" [text]="chapterContent" contextLevel="module"
-            [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text>
-        <div class="ion-margin-top" *ngIf="tagsEnabled && tags?.length > 0">
-            <strong>{{ 'core.tag.tags' | translate }}: </strong>
-            <core-tag-list [tags]="tags"></core-tag-list>
-        </div>
+        <div class="ion-padding">
+            <core-format-text [component]="component" [componentId]="componentId" [text]="chapterContent" contextLevel="module"
+                [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text>
 
-        <core-navigation-bar *ngIf="displayNavBar" [previous]="previousChapter?.id" [previousTitle]="previousNavBarTitle"
-            [next]="nextChapter?.id" [nextTitle]="nextNavBarTitle" (action)="changeChapter($event)"></core-navigation-bar>
+            <div class="ion-margin-top" *ngIf="tagsEnabled && tags?.length > 0">
+                <strong>{{ 'core.tag.tags' | translate }}: </strong>
+                <core-tag-list [tags]="tags"></core-tag-list>
+            </div>
+        </div>
     </div>
 
 </core-loading>
diff --git a/src/addons/mod/book/components/index/index.ts b/src/addons/mod/book/components/index/index.ts
index 352b6cdd0..5d3281c25 100644
--- a/src/addons/mod/book/components/index/index.ts
+++ b/src/addons/mod/book/components/index/index.ts
@@ -26,11 +26,11 @@ import {
 import { CoreTag, CoreTagItem } from '@features/tag/services/tag';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
-import { Translate } from '@singletons';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreCourse } from '@features/course/services/course';
 import { AddonModBookTocComponent } from '../toc/toc';
 import { CoreConstants } from '@/core/constants';
+import { CoreNavigationBarItem } from '@components/navigation-bar/navigation-bar';
 
 /**
  * Component that displays a book.
@@ -45,19 +45,16 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
 
     component = AddonModBookProvider.COMPONENT;
     chapterContent?: string;
-    previousChapter?: AddonModBookTocChapter;
-    nextChapter?: AddonModBookTocChapter;
     tagsEnabled = false;
-    displayNavBar = true;
-    previousNavBarTitle?: string;
-    nextNavBarTitle?: string;
     warning = '';
     tags?: CoreTagItem[];
+    displayNavBar = true;
+    navigationItems: CoreNavigationBarItem<AddonModBookTocChapter>[] = [];
+    displayTitlesInNavBar = false;
 
     protected chapters: AddonModBookTocChapter[] = [];
     protected currentChapter?: number;
     protected book?: AddonModBookBookWSData;
-    protected displayTitlesInNavBar = false;
     protected contentsMap: AddonModBookContentsMap = {};
 
     constructor(
@@ -148,14 +145,18 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
                 }
             }
 
-            if (typeof this.currentChapter == 'undefined') {
+            if (this.currentChapter === undefined) {
                 // Load the first chapter.
                 this.currentChapter = AddonModBook.getFirstChapter(this.chapters);
             }
 
+            if (this.currentChapter === undefined) {
+                return;
+            }
+
             // Show chapter.
             try {
-                await this.loadChapter(this.currentChapter!, refresh);
+                await this.loadChapter(this.currentChapter, refresh);
 
                 this.warning = downloadResult?.failed ? this.getErrorDownloadingSomeFilesMessage(downloadResult.error!) : '';
             } catch {
@@ -199,15 +200,10 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
             this.tags = this.tagsEnabled ? this.contentsMap[this.currentChapter].tags : [];
 
             this.chapterContent = content;
-            this.previousChapter = AddonModBook.getPreviousChapter(this.chapters, chapterId);
-            this.nextChapter = AddonModBook.getNextChapter(this.chapters, chapterId);
 
-            this.previousNavBarTitle = this.previousChapter && this.displayTitlesInNavBar
-                ? Translate.instant('addon.mod_book.navprevtitle', { $a: this.previousChapter.title })
-                : '';
-            this.nextNavBarTitle = this.nextChapter && this.displayTitlesInNavBar
-                ? Translate.instant('addon.mod_book.navnexttitle', { $a: this.nextChapter.title })
-                : '';
+            if (this.displayNavBar) {
+                this.navigationItems = this.getNavigationItems(chapterId);
+            }
 
             // Chapter loaded, log view. We don't return the promise because we don't want to block the user for this.
             await CoreUtils.ignoreErrors(AddonModBook.logView(
@@ -216,8 +212,11 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
                 this.module.name,
             ));
 
+            const currentChapterIndex = this.chapters.findIndex((chapter) => chapter.id == chapterId);
+            const isLastChapter = currentChapterIndex < 0 || this.chapters[currentChapterIndex + 1] === undefined;
+
             // Module is completed when last chapter is viewed, so we only check completion if the last is reached.
-            if (!this.nextChapter) {
+            if (isLastChapter) {
                 CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
             }
         } catch (error) {
@@ -230,4 +229,19 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
         }
     }
 
+    /**
+     * Converts chapters to navigation items.
+     *
+     * @param chapterId Current chapter Id.
+     * @return Navigation items.
+     */
+    protected getNavigationItems(chapterId: number): CoreNavigationBarItem<AddonModBookTocChapter>[] {
+        return this.chapters.map((chapter) => ({
+            item: chapter,
+            title: chapter.title,
+            current: chapter.id == chapterId,
+            enabled: true,
+        }));
+    }
+
 }
diff --git a/src/addons/mod/book/services/book.ts b/src/addons/mod/book/services/book.ts
index edf9c5800..9cd689d84 100644
--- a/src/addons/mod/book/services/book.ts
+++ b/src/addons/mod/book/services/book.ts
@@ -216,36 +216,6 @@ export class AddonModBookProvider {
         return chapters[0].id;
     }
 
-    /**
-     * Get the next chapter to the given one.
-     *
-     * @param chapters The chapters list.
-     * @param chapterId The current chapter.
-     * @return The next chapter.
-     */
-    getNextChapter(chapters: AddonModBookTocChapter[], chapterId: number): AddonModBookTocChapter | undefined {
-        const currentChapterIndex = chapters.findIndex((chapter) => chapter.id == chapterId);
-
-        if (currentChapterIndex >= 0 && typeof chapters[currentChapterIndex + 1] != 'undefined') {
-            return chapters[currentChapterIndex + 1];
-        }
-    }
-
-    /**
-     * Get the previous chapter to the given one.
-     *
-     * @param chapters The chapters list.
-     * @param chapterId The current chapter.
-     * @return The next chapter.
-     */
-    getPreviousChapter(chapters: AddonModBookTocChapter[], chapterId: number): AddonModBookTocChapter | undefined {
-        const currentChapterIndex = chapters.findIndex((chapter) => chapter.id == chapterId);
-
-        if (currentChapterIndex > 0) {
-            return chapters[currentChapterIndex - 1];
-        }
-    }
-
     /**
      * Get the book toc as an array.
      *
diff --git a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
index 52a6d1eb9..056553b9f 100644
--- a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
+++ b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
@@ -40,9 +40,7 @@
     </ion-card>
 
     <div class="addon-mod-imscp-container">
-        <core-navigation-bar [previous]="previousItem" [next]="nextItem" (action)="loadItem($event)" [info]="description"
-            [title]="'core.description' | translate" [component]="component" [componentId]="componentId" contextLevel="module"
-            [contextInstanceId]="module.id" [courseId]="courseId">
+        <core-navigation-bar [items]="navigationItems" (action)="loadItem($event)">
         </core-navigation-bar>
         <core-iframe [src]="src"></core-iframe>
     </div>
diff --git a/src/addons/mod/imscp/components/index/index.scss b/src/addons/mod/imscp/components/index/index.scss
index 42c755d23..78b62ae20 100644
--- a/src/addons/mod/imscp/components/index/index.scss
+++ b/src/addons/mod/imscp/components/index/index.scss
@@ -1,6 +1,4 @@
 .addon-mod-imscp-container {
-    position: absolute;
-    width: 100%;
     height: 100%;
     display: flex;
     flex-direction: column;
diff --git a/src/addons/mod/imscp/components/index/index.ts b/src/addons/mod/imscp/components/index/index.ts
index b905e10e8..502478fab 100644
--- a/src/addons/mod/imscp/components/index/index.ts
+++ b/src/addons/mod/imscp/components/index/index.ts
@@ -14,6 +14,7 @@
 
 import { Component, OnInit, Optional } from '@angular/core';
 import { CoreSilentError } from '@classes/errors/silenterror';
+import { CoreNavigationBarItem } from '@components/navigation-bar/navigation-bar';
 import { CoreCourseModuleMainResourceComponent } from '@features/course/classes/main-resource-component';
 import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
 import { CoreCourse } from '@features/course/services/course';
@@ -32,22 +33,19 @@ import { AddonModImscpTocComponent } from '../toc/toc';
 export class AddonModImscpIndexComponent extends CoreCourseModuleMainResourceComponent implements OnInit {
 
     component = AddonModImscpProvider.COMPONENT;
-
-    items: AddonModImscpTocItem[] = [];
-    currentItem?: string;
     src = '';
     warning = '';
+    navigationItems: CoreNavigationBarItem<AddonModImscpTocItem>[] = [];
 
-    // Initialize empty previous/next to prevent showing arrows for an instant before they're hidden.
-    previousItem = '';
-    nextItem = '';
+    protected items: AddonModImscpTocItem[] = [];
+    protected currentHref?: string;
 
     constructor(@Optional() courseContentsPage?: CoreCourseContentsPage) {
         super('AddonModImscpIndexComponent', courseContentsPage);
     }
 
     /**
-     * Component being initialized.
+     * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
         super.ngOnInit();
@@ -90,19 +88,19 @@ export class AddonModImscpIndexComponent extends CoreCourseModuleMainResourceCom
 
             this.items = AddonModImscp.createItemList(contents);
 
-            if (this.items.length && typeof this.currentItem == 'undefined') {
-                this.currentItem = this.items[0].href;
+            if (this.items.length && this.currentHref === undefined) {
+                this.currentHref = this.items[0].href;
             }
 
             try {
-                await this.loadItem(this.currentItem);
+                await this.loadItemHref(this.currentHref);
             } catch (error) {
                 CoreDomUtils.showErrorModalDefault(error, 'addon.mod_imscp.deploymenterror', true);
 
                 throw new CoreSilentError(error);
             }
 
-            this.warning = downloadResult!.failed ? this.getErrorDownloadingSomeFilesMessage(downloadResult!.error!) : '';
+            this.warning = downloadResult.failed ? this.getErrorDownloadingSomeFilesMessage(downloadResult.error!) : '';
 
         } finally {
             // Pass false because downloadResourceIfNeeded already invalidates and refresh data if refresh=true.
@@ -113,14 +111,18 @@ export class AddonModImscpIndexComponent extends CoreCourseModuleMainResourceCom
     /**
      * Loads an item.
      *
-     * @param itemId Item ID.
+     * @param itemHref Item Href.
      * @return Promise resolved when done.
      */
-    async loadItem(itemId?: string): Promise<void> {
-        const src = await AddonModImscp.getIframeSrc(this.module, itemId);
-        this.currentItem = itemId;
-        this.previousItem = itemId ? AddonModImscp.getPreviousItem(this.items, itemId) : '';
-        this.nextItem = itemId ? AddonModImscp.getNextItem(this.items, itemId) : '';
+    async loadItemHref(itemHref?: string): Promise<void> {
+        const src = await AddonModImscp.getIframeSrc(this.module, itemHref);
+        this.currentHref = itemHref;
+
+        this.navigationItems = this.items.map((item) => ({
+            item: item,
+            current: item.href == this.currentHref,
+            enabled: !!item.href,
+        }));
 
         if (this.src && src == this.src) {
             // Re-loading same page. Set it to empty and then re-set the src in the next digest so it detects it has changed.
@@ -133,6 +135,15 @@ export class AddonModImscpIndexComponent extends CoreCourseModuleMainResourceCom
         }
     }
 
+    /**
+     * Loads an item.
+     *
+     * @param item Item.
+     */
+    loadItem(item: AddonModImscpTocItem): void {
+        this.loadItemHref(item.href);
+    }
+
     /**
      * Show the TOC.
      */
@@ -142,12 +153,12 @@ export class AddonModImscpIndexComponent extends CoreCourseModuleMainResourceCom
             component: AddonModImscpTocComponent,
             componentProps: {
                 items: this.items,
-                selected: this.currentItem,
+                selected: this.currentHref,
             },
         });
 
         if (modalData) {
-            this.loadItem(modalData);
+            this.loadItemHref(modalData);
         }
     }
 
diff --git a/src/addons/mod/imscp/services/imscp.ts b/src/addons/mod/imscp/services/imscp.ts
index 746cabcbc..3783cf37d 100644
--- a/src/addons/mod/imscp/services/imscp.ts
+++ b/src/addons/mod/imscp/services/imscp.ts
@@ -70,63 +70,6 @@ export class AddonModImscpProvider {
         return items;
     }
 
-    /**
-     * Get the previous item to the given one.
-     *
-     * @param items The items list.
-     * @param itemId The current item.
-     * @return The previous item id.
-     */
-    getPreviousItem(items: AddonModImscpTocItem[], itemId: string): string {
-        const position = this.getItemPosition(items, itemId);
-
-        if (position == -1) {
-            return '';
-        }
-
-        for (let i = position - 1; i >= 0; i--) {
-            if (items[i] && items[i].href) {
-                return items[i].href;
-            }
-        }
-
-        return '';
-    }
-
-    /**
-     * Get the next item to the given one.
-     *
-     * @param items The items list.
-     * @param itemId The current item.
-     * @return The next item id.
-     */
-    getNextItem(items: AddonModImscpTocItem[], itemId: string): string {
-        const position = this.getItemPosition(items, itemId);
-
-        if (position == -1) {
-            return '';
-        }
-
-        for (let i = position + 1; i < items.length; i++) {
-            if (items[i] && items[i].href) {
-                return items[i].href;
-            }
-        }
-
-        return '';
-    }
-
-    /**
-     * Get the position of a item.
-     *
-     * @param items The items list.
-     * @param itemId The item to search.
-     * @return The item position.
-     */
-    protected getItemPosition(items: AddonModImscpTocItem[], itemId: string): number {
-        return items.findIndex((item) => item.href == itemId);
-    }
-
     /**
      * Check if we should ommit the file download.
      *
@@ -242,7 +185,7 @@ export class AddonModImscpProvider {
         const siteId = CoreSites.getCurrentSiteId();
 
         try {
-            const dirPath = await CoreFilepool.getPackageDirUrlByUrl(siteId, module!.url!);
+            const dirPath = await CoreFilepool.getPackageDirUrlByUrl(siteId, module.url!);
 
             return CoreTextUtils.concatenatePaths(dirPath, itemHref);
         } catch (error) {
diff --git a/src/addons/mod/scorm/pages/player/player.html b/src/addons/mod/scorm/pages/player/player.html
index f7f23bd11..73bb4de59 100644
--- a/src/addons/mod/scorm/pages/player/player.html
+++ b/src/addons/mod/scorm/pages/player/player.html
@@ -21,7 +21,7 @@
 </ion-header>
 <ion-content>
     <core-loading [hideUntil]="loaded">
-        <core-navigation-bar [previous]="previousSco" [next]="nextSco" (action)="loadSco($event)"></core-navigation-bar>
+        <core-navigation-bar [items]="navigationItems" (action)="loadSco($event)"></core-navigation-bar>
 
         <core-iframe *ngIf="loaded && src" [src]="src" [iframeWidth]="scormWidth" [iframeHeight]="scormHeight"
             [showFullscreenOnToolbar]="true" [autoFullscreenOnRotate]="true">
diff --git a/src/addons/mod/scorm/pages/player/player.ts b/src/addons/mod/scorm/pages/player/player.ts
index 9c4bdc9c9..d6dabb226 100644
--- a/src/addons/mod/scorm/pages/player/player.ts
+++ b/src/addons/mod/scorm/pages/player/player.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import { Component, OnInit, OnDestroy } from '@angular/core';
+import { CoreNavigationBarItem } from '@components/navigation-bar/navigation-bar';
 import { CoreMainMenuPage } from '@features/mainmenu/pages/menu/menu';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
@@ -50,8 +51,6 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
     loadingToc = true; // Whether the TOC is being loaded.
     toc: AddonModScormTOCScoWithIcon[] = []; // List of SCOs.
     loaded = false; // Whether the data has been loaded.
-    previousSco?: AddonModScormScoWithData; // Previous SCO.
-    nextSco?: AddonModScormScoWithData; // Next SCO.
     src?: string; // Iframe src.
     errorMessage?: string; // Error message.
     accessInfo?: AddonModScormGetScormAccessInformationWSResponse; // Access information.
@@ -60,6 +59,7 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
     incomplete = false; // Whether last attempt is incomplete.
     cmId!: number; // Course module ID.
     courseId!: number; // Course ID.
+    navigationItems: CoreNavigationBarItem<AddonModScormTOCScoWithIcon>[] = [];
 
     protected siteId!: string;
     protected mode!: string; // Mode to play the SCORM.
@@ -110,6 +110,8 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
             await this.fetchData();
 
             if (!this.currentSco) {
+                CoreNavigator.back();
+
                 return;
             }
 
@@ -176,14 +178,20 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
         }, this.siteId);
 
         this.launchNextObserver = CoreEvents.on(AddonModScormProvider.LAUNCH_NEXT_SCO_EVENT, (data) => {
-            if (data.scormId === this.scorm.id && this.nextSco) {
-                this.loadSco(this.nextSco);
+            if (data.scormId === this.scorm.id && this.currentSco) {
+                const nextSco = AddonModScormHelper.getNextScoFromToc(this.toc, this.currentSco.id);
+                if (nextSco) {
+                    this.loadSco(nextSco);
+                }
             }
         }, this.siteId);
 
         this.launchPrevObserver = CoreEvents.on(AddonModScormProvider.LAUNCH_PREV_SCO_EVENT, (data) => {
-            if (data.scormId === this.scorm.id && this.previousSco) {
-                this.loadSco(this.previousSco);
+            if (data.scormId === this.scorm.id && this.currentSco) {
+                const previousSco = AddonModScormHelper.getPreviousScoFromToc(this.toc, this.currentSco.id);
+                if (previousSco) {
+                    this.loadSco(previousSco);
+                }
             }
         }, this.siteId);
 
@@ -211,9 +219,16 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
      *
      * @param scoId Current SCO ID.
      */
-    protected calculateNextAndPreviousSco(scoId: number): void {
-        this.previousSco = AddonModScormHelper.getPreviousScoFromToc(this.toc, scoId);
-        this.nextSco = AddonModScormHelper.getNextScoFromToc(this.toc, scoId);
+    protected calculateNavigationItems(scoId: number): void {
+        this.navigationItems = this.toc
+            .filter((item) => item.isvisible)
+            .map<CoreNavigationBarItem<AddonModScormTOCScoWithIcon>>((item) =>
+            ({
+                item: item,
+                title: item.title,
+                current: item.id == scoId,
+                enabled: !!(item.prereq && item.launch),
+            }));
     }
 
     /**
@@ -398,7 +413,7 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
         this.currentSco = sco;
         this.title = sco.title || this.scorm.name; // Try to use SCO title.
 
-        this.calculateNextAndPreviousSco(sco.id);
+        this.calculateNavigationItems(sco.id);
 
         // Load the SCO source.
         this.loadScoSrc(sco);
@@ -540,7 +555,7 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
     }
 
     /**
-     * Component being destroyed.
+     * @inheritdoc
      */
     ngOnDestroy(): void {
         // Empty src when leaving the state so unload event is triggered in the iframe.
diff --git a/src/addons/mod/scorm/services/scorm-helper.ts b/src/addons/mod/scorm/services/scorm-helper.ts
index d62311a2c..ffc21754c 100644
--- a/src/addons/mod/scorm/services/scorm-helper.ts
+++ b/src/addons/mod/scorm/services/scorm-helper.ts
@@ -280,18 +280,13 @@ export class AddonModScormHelperProvider {
      * @return Next SCO.
      */
     getNextScoFromToc(toc: AddonModScormScoWithData[], scoId: number): AddonModScormScoWithData | undefined {
-        for (let i = 0; i < toc.length; i++) {
-            if (toc[i].id != scoId) {
-                continue;
-            }
+        const currentTocIndex = toc.findIndex((item) => item.id == scoId);
 
-            // We found the current SCO. Now search the next visible SCO with fulfilled prerequisites.
-            for (let j = i + 1; j < toc.length; j++) {
-                if (toc[j].isvisible && toc[j].prereq && toc[j].launch) {
-                    return toc[j];
-                }
+        // We found the current SCO. Now search the next visible SCO with fulfilled prerequisites.
+        for (let j = currentTocIndex + 1; j < toc.length; j++) {
+            if (toc[j].isvisible && toc[j].prereq && toc[j].launch) {
+                return toc[j];
             }
-            break;
         }
     }
 
@@ -303,18 +298,13 @@ export class AddonModScormHelperProvider {
      * @return Previous SCO.
      */
     getPreviousScoFromToc(toc: AddonModScormScoWithData[], scoId: number): AddonModScormScoWithData | undefined {
-        for (let i = 0; i < toc.length; i++) {
-            if (toc[i].id != scoId) {
-                continue;
-            }
+        const currentTocIndex = toc.findIndex((item) => item.id == scoId);
 
-            // We found the current SCO. Now let's search the previous visible SCO with fulfilled prerequisites.
-            for (let j = i - 1; j >= 0; j--) {
-                if (toc[j].isvisible && toc[j].prereq && toc[j].launch) {
-                    return toc[j];
-                }
+        // We found the current SCO. Now let's search the previous visible SCO with fulfilled prerequisites.
+        for (let j = currentTocIndex - 1; j >= 0; j--) {
+            if (toc[j].isvisible && toc[j].prereq && toc[j].launch) {
+                return toc[j];
             }
-            break;
         }
     }
 
diff --git a/src/core/components/navigation-bar/core-navigation-bar.html b/src/core/components/navigation-bar/core-navigation-bar.html
index 175e0f549..3f5b6df49 100644
--- a/src/core/components/navigation-bar/core-navigation-bar.html
+++ b/src/core/components/navigation-bar/core-navigation-bar.html
@@ -1,27 +1,27 @@
-<ion-grid class="ion-no-padding ion-padding-bottom" *ngIf="previous || info || next">
-    <ion-row>
-        <ion-col class="ion-text-start ion-padding-end" [size]="info ? 4 : 6">
-            <ion-button *ngIf="previous" class="core-navigation-bar-arrow" fill="outline"
-                [attr.aria-label]="previousTitle || ('core.previous' | translate)" (click)="action?.emit(previous)">
-                <ion-icon name="fas-arrow-left" [slot]="previousTitle ? 'start' : 'icon-only'" aria-hidden="true"></ion-icon>
-                <core-format-text *ngIf="previousTitle" [text]="previousTitle" [component]="component" [componentId]="componentId"
-                    [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId" aria-hidden="true">
-                </core-format-text>
-            </ion-button>
-        </ion-col>
-        <ion-col class="ion-text-center" size="4" *ngIf="info">
-            <ion-button fill="clear" (click)="showInfo()" [attr.aria-label]="title">
-                <ion-icon slot="icon-only" name="fas-info-circle" aria-hidden="true"></ion-icon>
-            </ion-button>
-        </ion-col>
-        <ion-col class="ion-text-end ion-padding-start" [size]="info ? 4 : 6">
-            <ion-button *ngIf="next" class="core-navigation-bar-arrow" [attr.aria-label]="nextTitle || ('core.next' | translate)"
-                (click)="action?.emit(next)">
-                <core-format-text *ngIf="nextTitle" [text]="nextTitle" [component]="component" [componentId]="componentId"
-                    [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId" aria-hidden="true">
-                </core-format-text>
-                <ion-icon name="fas-arrow-right" [slot]="nextTitle ? 'end' : 'icon-only'" aria-hidden="true"></ion-icon>
-            </ion-button>
-        </ion-col>
-    </ion-row>
-</ion-grid>
+<ion-row class="ion-justify-content-between ion-align-items-center ion-no-padding"
+    *ngIf="previousIndex >= 0 || nextIndex >= 0 || items.length > 1">
+    <ion-col class="ion-text-start ion-padding-end" [size]="showTitles ? 4 : 3">
+        <ion-button *ngIf="previousIndex >=0" class="core-navigation-bar-arrow" fill="clear" [attr.aria-label]="previousTitle"
+            (click)="navigate(previousIndex)">
+            <ion-icon name="fas-arrow-left" [slot]="showTitles ? 'start' : 'icon-only'" aria-hidden="true"></ion-icon>
+            <core-format-text *ngIf="showTitles" [text]="previousTitle" [component]="component" [componentId]="componentId"
+                [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId" aria-hidden="true">
+            </core-format-text>
+        </ion-button>
+    </ion-col>
+    <ion-col class="ion-text-center" [size]="showTitles ? 4 : 6">
+        <ion-range min="0" [max]="items.length -1" debounce="500" snaps="true" (ionChange)="navigateOnRange($event.target)"
+            [value]="currentIndex">
+            <p slot="end">{{currentIndex + 1}} / {{items.length}}</p>
+        </ion-range>
+    </ion-col>
+    <ion-col class="ion-text-end ion-padding-start" [size]="showTitles ? 4 : 3">
+        <ion-button fill="clear" *ngIf="nextIndex >= 0" class="core-navigation-bar-arrow" [attr.aria-label]="nextTitle"
+            (click)="navigate(nextIndex)">
+            <core-format-text *ngIf="showTitles" [text]="nextTitle" [component]="component" [componentId]="componentId"
+                [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId" aria-hidden="true">
+            </core-format-text>
+            <ion-icon name="fas-arrow-right" [slot]="showTitles ? 'end' : 'icon-only'" aria-hidden="true"></ion-icon>
+        </ion-button>
+    </ion-col>
+</ion-row>
diff --git a/src/core/components/navigation-bar/navigation-bar.scss b/src/core/components/navigation-bar/navigation-bar.scss
index f48edf9b3..b79c274dd 100644
--- a/src/core/components/navigation-bar/navigation-bar.scss
+++ b/src/core/components/navigation-bar/navigation-bar.scss
@@ -1,7 +1,15 @@
-.core-navigation-bar-arrow {
-    text-transform: none;
-    max-width: 100%;
-    ion-icon {
-        flex-shrink: 0;
+:host {
+    --background: var(--core-course-module-navigation-background);
+
+    width: 100%;
+    background-color: var(--background);
+    display: block;
+
+    .core-navigation-bar-arrow {
+        text-transform: none;
+        max-width: 100%;
+        ion-icon {
+            flex-shrink: 0;
+        }
     }
 }
diff --git a/src/core/components/navigation-bar/navigation-bar.ts b/src/core/components/navigation-bar/navigation-bar.ts
index 71f2f28ef..92681ea06 100644
--- a/src/core/components/navigation-bar/navigation-bar.ts
+++ b/src/core/components/navigation-bar/navigation-bar.ts
@@ -12,48 +12,103 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { CoreTextUtils } from '@services/utils/text';
+import { Component, EventEmitter, Input, OnChanges, Output, SimpleChange } from '@angular/core';
+import { Translate } from '@singletons';
 
 /**
- * Component to show a "bar" with arrows to navigate forward/backward and a "info" icon to display more data.
+ * Component to show a "bar" with arrows to navigate forward/backward and an slider to move around.
  *
  * This directive will show two arrows at the left and right of the screen to navigate to previous/next item when clicked.
- * If no previous/next item is defined, that arrow won't be shown. It will also show a button to show more info.
+ * If no previous/next item is defined, that arrow won't be shown.
  *
  * Example usage:
- * <core-navigation-bar [previous]="prevItem" [next]="nextItem" (action)="goTo($event)"></core-navigation-bar>
+ * <core-navigation-bar [items]="items" (action)="goTo($event)"></core-navigation-bar>
  */
 @Component({
     selector: 'core-navigation-bar',
     templateUrl: 'core-navigation-bar.html',
     styleUrls: ['navigation-bar.scss'],
 })
-export class CoreNavigationBarComponent {
+export class CoreNavigationBarComponent implements OnChanges {
 
-    @Input() previous?: unknown; // Previous item. If not defined, the previous arrow won't be shown.
-    @Input() previousTitle?: string; // Previous item title. If not defined, only the arrow will be shown.
-    @Input() next?: unknown; // Next item. If not defined, the next arrow won't be shown.
-    @Input() nextTitle?: string; // Next item title. If not defined, only the arrow will be shown.
-    @Input() info = ''; // Info to show when clicking the info button. If not defined, the info button won't be shown.
-    @Input() title = ''; // Title to show when seeing the info (new page).
+    @Input() items: CoreNavigationBarItem[] = []; // List of items.
+    @Input() showTitles = false; // Display titles on buttons.
+    @Input() previousTranslate = 'core.previous'; // Previous translatable text, can admit $a variable.
+    @Input() nextTranslate = 'core.next'; // Next translatable text, can admit $a variable.
     @Input() component?: string; // Component the bar belongs to.
     @Input() componentId?: number; // Component ID.
     @Input() contextLevel?: string; // The context level.
     @Input() contextInstanceId?: number; // The instance ID related to the context.
     @Input() courseId?: number; // Course ID the text belongs to. It can be used to improve performance with filters.
-    @Output() action?: EventEmitter<unknown> =
-        new EventEmitter<unknown>(); // Function to call when arrow is clicked. Will receive as a param the item to load.
 
-    showInfo(): void {
-        CoreTextUtils.viewText(this.title, this.info, {
-            component: this.component,
-            componentId: this.componentId,
-            filter: true,
-            contextLevel: this.contextLevel,
-            instanceId: this.contextInstanceId,
-            courseId: this.courseId,
-        });
+    previousTitle?: string; // Previous item title.
+    nextTitle?: string; // Next item title.
+    previousIndex = -1; // Previous item index. If -1, the previous arrow won't be shown.
+    nextIndex = -1; // Next item index. If -1, the next arrow won't be shown.
+    currentIndex = 0;
+
+    // Function to call when arrow is clicked. Will receive as a param the item to load.
+    @Output() action: EventEmitter<unknown> = new EventEmitter<unknown>();
+
+    /**
+     * @inheritdoc
+     */
+    ngOnChanges(changes: {[name: string]: SimpleChange}): void {
+        if (!changes.items || !this.items.length) {
+            return;
+        }
+
+        this.currentIndex = this.items.findIndex((item) => item.current);
+        if (this.currentIndex < 0) {
+            return;
+        }
+
+        this.nextIndex = this.items[this.currentIndex + 1]?.enabled ? this.currentIndex + 1 : -1;
+        if (this.nextIndex >= 0) {
+            this.nextTitle = Translate.instant(this.nextTranslate, { $a: this.items[this.nextIndex].title || '' });
+        }
+
+        this.previousIndex = this.items[this.currentIndex - 1]?.enabled ? this.currentIndex - 1 : -1;
+        if (this.previousIndex >= 0) {
+            this.previousTitle = Translate.instant(this.previousTranslate, { $a: this.items[this.previousIndex].title || '' });
+        }
+    }
+
+    /**
+     * Navigate to an item.
+     *
+     * @param itemIndex Selected item index.
+     */
+    navigate(itemIndex: number): void {
+        if (this.currentIndex == itemIndex || !this.items[itemIndex].enabled) {
+            return;
+        }
+
+        this.currentIndex = itemIndex;
+        this.action.emit(this.items[itemIndex].item);
+    }
+
+    /**
+     * Navigate to an item with the range component.
+     *
+     * @param target: Element changed.
+     */
+    navigateOnRange(target: HTMLIonRangeElement): void {
+        const selectedIndex = target.value as number; // Single value, use number.
+        if (!this.items[selectedIndex].enabled) {
+            target.value = this.currentIndex;
+
+            return;
+        }
+
+        this.navigate(selectedIndex);
     }
 
 }
+
+export type CoreNavigationBarItem<T = unknown> = {
+    item: T;
+    title?: string;
+    current: boolean;
+    enabled: boolean;
+};
diff --git a/upgrade.txt b/upgrade.txt
index 19393ed60..4f36e38bc 100644
--- a/upgrade.txt
+++ b/upgrade.txt
@@ -4,6 +4,8 @@ information provided here is intended especially for developers.
 === 3.9.6 ===
 
 - The parameters of the functions confirmAndPrefetchCourse and confirmAndPrefetchCourses have changed, they now accept an object with options.
+- Component core-navigation-bar changed to add an slider inside. previous, previousTitle, next, nextTitle, info and title have been removed.
+  Now you have to pass all items and 3 optional params have been added.
 
 === 3.9.5 ===
 

From a19bb744d92e57b3e5a2550c9757fa3b3794c1bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 1 Dec 2021 12:16:33 +0100
Subject: [PATCH 0259/1008] MOBILE-3099 course: Improve module has view check

---
 src/addons/mod/label/services/handlers/module.ts | 1 +
 src/core/features/course/services/course.ts      | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/src/addons/mod/label/services/handlers/module.ts b/src/addons/mod/label/services/handlers/module.ts
index fe1306f3e..495e9cd51 100644
--- a/src/addons/mod/label/services/handlers/module.ts
+++ b/src/addons/mod/label/services/handlers/module.ts
@@ -39,6 +39,7 @@ export class AddonModLabelModuleHandlerService extends CoreModuleHandlerBase imp
         [CoreConstants.FEATURE_GRADE_OUTCOMES]: false,
         [CoreConstants.FEATURE_BACKUP_MOODLE2]: true,
         [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true,
+        [CoreConstants.FEATURE_NO_VIEW_LINK]: true,
     };
 
     /**
diff --git a/src/core/features/course/services/course.ts b/src/core/features/course/services/course.ts
index 81505df14..49590c2af 100644
--- a/src/core/features/course/services/course.ts
+++ b/src/core/features/course/services/course.ts
@@ -44,6 +44,7 @@ import { CoreSitePlugins } from '@features/siteplugins/services/siteplugins';
 import { CoreCourseAutoSyncData, CoreCourseSyncProvider } from './sync';
 import { CoreTagItem } from '@features/tag/services/tag';
 import { CoreNavigator } from '@services/navigator';
+import { CoreCourseModuleDelegate } from './module-delegate';
 
 const ROOT_CACHE_KEY = 'mmCourse:';
 
@@ -1058,6 +1059,14 @@ export class CoreCourseProvider {
      * @return Whether the module has a view page.
      */
     moduleHasView(module: CoreCourseModuleSummary | CoreCourseWSModule): boolean {
+        if ('modname' in module) {
+            // noviewlink was introduced in 3.8.5, use supports feature as a fallback.
+            if (module.noviewlink ||
+                CoreCourseModuleDelegate.supportsFeature(module.modname, CoreConstants.FEATURE_NO_VIEW_LINK, false)) {
+                return false;
+            }
+        }
+
         return !!module.url;
     }
 

From 132007b2079b95fc01ae75d527f21088fda035d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 1 Dec 2021 16:19:26 +0100
Subject: [PATCH 0260/1008] MOBILE-3099 core: Improve collapsible headers
 loading search

---
 src/core/directives/collapsible-header.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts
index 11191f7c6..626a5e7b6 100644
--- a/src/core/directives/collapsible-header.ts
+++ b/src/core/directives/collapsible-header.ts
@@ -48,8 +48,12 @@ export class CoreCollapsibleHeaderDirective implements OnDestroy {
         this.header = el.nativeElement;
 
         this.loadingObserver = CoreEvents.on(CoreEvents.CORE_LOADING_CHANGED, async (data) => {
+            if (!data.loaded) {
+                return;
+            }
+
             const loadingId = await this.getLoadingId();
-            if (loadingId && data.loaded && data.uniqueId == loadingId) {
+            if (loadingId && data.uniqueId == loadingId) {
                 // Remove event when loading is done.
                 this.loadingObserver.off();
 
@@ -78,7 +82,7 @@ export class CoreCollapsibleHeaderDirective implements OnDestroy {
             }
         }
 
-        return this.content.querySelector('core-loading .core-loading-content')?.id;
+        return this.content.querySelector('core-loading.core-loading-loaded:not(.core-loading-inline) .core-loading-content')?.id;
     }
 
     /**

From 007835b6b800818725d5a8063dc3a9ce8eb15d9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 1 Dec 2021 12:26:46 +0100
Subject: [PATCH 0261/1008] MOBILE-3099 module: Add preview page to show
 restricted activities

---
 .../mod/url/services/handlers/module.ts       |   9 +-
 .../course/classes/module-base-handler.ts     |  29 ++++-
 .../module-info/core-course-module-info.html  |  13 +-
 .../components/module-info/module-info.ts     |   2 +
 .../core-course-module-manual-completion.html |   8 +-
 .../module-navigation/module-navigation.ts    |  41 +++---
 .../components/module/core-course-module.html |   4 +-
 .../core-course-unsupported-module.html       |   3 -
 .../features/course/course-lazy.module.ts     |   6 +-
 .../pages/module-preview/module-preview.html  |  65 ++++++++++
 .../module-preview.module.ts}                 |   8 +-
 .../module-preview/module-preview.page.ts     | 118 ++++++++++++++++++
 .../unsupported-module.html                   |  27 ----
 .../unsupported-module.page.ts                |  54 --------
 .../services/handlers/default-module.ts       |  18 ++-
 .../course/services/module-delegate.ts        |  31 +++++
 .../classes/handlers/module-handler.ts        |  35 ++++--
 17 files changed, 323 insertions(+), 148 deletions(-)
 create mode 100644 src/core/features/course/pages/module-preview/module-preview.html
 rename src/core/features/course/pages/{unsupported-module/unsupported-module.module.ts => module-preview/module-preview.module.ts} (83%)
 create mode 100644 src/core/features/course/pages/module-preview/module-preview.page.ts
 delete mode 100644 src/core/features/course/pages/unsupported-module/unsupported-module.html
 delete mode 100644 src/core/features/course/pages/unsupported-module/unsupported-module.page.ts

diff --git a/src/addons/mod/url/services/handlers/module.ts b/src/addons/mod/url/services/handlers/module.ts
index e6257f845..69c7d2c4b 100644
--- a/src/addons/mod/url/services/handlers/module.ts
+++ b/src/addons/mod/url/services/handlers/module.ts
@@ -19,7 +19,7 @@ import { CoreModuleHandlerBase } from '@features/course/classes/module-base-hand
 import { CoreCourse } from '@features/course/services/course';
 import { CoreCourseModule } from '@features/course/services/course-helper';
 import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
-import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
+import { CoreNavigationOptions } from '@services/navigator';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
 import { makeSingleton } from '@singletons';
@@ -90,12 +90,7 @@ export class AddonModUrlModuleHandlerService extends CoreModuleHandlerBase imple
                     if (shouldOpen) {
                         openUrl(module, courseId);
                     } else {
-                        options = options || {};
-                        options.params = options.params || {};
-                        Object.assign(options.params, { module });
-                        const routeParams = '/' + courseId + '/' + module.id;
-
-                        CoreNavigator.navigateToSitePath(AddonModUrlModuleHandlerService.PAGE_NAME + routeParams, options);
+                        this.openActivityPage(module, courseId, options);
                     }
                 } finally {
                     modal.dismiss();
diff --git a/src/core/features/course/classes/module-base-handler.ts b/src/core/features/course/classes/module-base-handler.ts
index 474fb231c..3d59a9d00 100644
--- a/src/core/features/course/classes/module-base-handler.ts
+++ b/src/core/features/course/classes/module-base-handler.ts
@@ -51,14 +51,31 @@ export class CoreModuleHandlerBase implements Partial<CoreCourseModuleHandler> {
                 courseId: number,
                 options?: CoreNavigationOptions,
             ): Promise<void> => {
-                options = options || {};
-                options.params = options.params || {};
-                Object.assign(options.params, { module });
-                const routeParams = '/' + courseId + '/' + module.id;
-
-                await CoreNavigator.navigateToSitePath(this.pageName + routeParams, options);
+                await this.openActivityPage(module, courseId, options);
             },
         };
     }
 
+    /**
+     * Opens the activity page.
+     *
+     * @param module The module object.
+     * @param courseId The course ID.
+     * @param options Options for the navigation.
+     * @return Promise resolved when done.
+     */
+    async openActivityPage(module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions): Promise<void> {
+        if (!CoreCourse.moduleHasView(module)) {
+            return;
+        }
+
+        options = options || {};
+        options.params = options.params || {};
+        Object.assign(options.params, { module });
+
+        const routeParams = '/' + courseId + '/' + module.id;
+
+        await CoreNavigator.navigateToSitePath(this.pageName + routeParams, options);
+    }
+
 }
diff --git a/src/core/features/course/components/module-info/core-course-module-info.html b/src/core/features/course/components/module-info/core-course-module-info.html
index 7afb15368..702b6ff54 100644
--- a/src/core/features/course/components/module-info/core-course-module-info.html
+++ b/src/core/features/course/components/module-info/core-course-module-info.html
@@ -13,24 +13,25 @@
 <ion-item class="ion-text-wrap" *ngIf="description" lines="none">
     <ion-label>
         <core-format-text [text]="description" [component]="component" [componentId]="componentId" contextLevel="module"
-            [contextInstanceId]="module.id" [courseId]="courseId" [maxHeight]="120">
+            [contextInstanceId]="module.id" [courseId]="courseId" [maxHeight]="expandDescription ? null : 120">
         </core-format-text>
     </ion-label>
 </ion-item>
 <ng-content select="[description]"></ng-content>
-<ion-item class="ion-text-wrap" lines="none" *ngIf="showCompletion && (module.dates?.length || module.completiondata)">
+<ion-item class="ion-text-wrap" lines="none" *ngIf="showCompletion && (module.dates?.length ||
+        (module.completiondata && (module.completiondata.isautomatic || showManualCompletion) && module.uservisible))">
     <ion-label>
         <!-- Activity dates. -->
-        <div *ngIf="module.dates && module.dates.length" class="core-module-dates">
+        <div *ngIf="module.dates?.length" class="core-module-dates">
             <p *ngFor="let date of module.dates">
                 <strong>{{ date.label }}</strong> {{ date.timestamp * 1000 | coreFormatDate:'strftimedatetime' }}
             </p>
         </div>
 
         <!-- Module completion. -->
-        <core-course-module-completion *ngIf="module.completiondata" [completion]="module.completiondata" [moduleName]="module.name"
-            [moduleId]="module.id" [showCompletionConditions]="true" [showManualCompletion]="true"
-            (completionChanged)="completionChanged.emit($event)">
+        <core-course-module-completion *ngIf="module.completiondata && module.uservisible" [completion]="module.completiondata"
+            [moduleName]="module.name" [moduleId]="module.id" [showCompletionConditions]="true"
+            [showManualCompletion]="showManualCompletion" (completionChanged)="completionChanged.emit($event)">
         </core-course-module-completion>
     </ion-label>
 </ion-item>
diff --git a/src/core/features/course/components/module-info/module-info.ts b/src/core/features/course/components/module-info/module-info.ts
index 063ebc88f..2c958c99f 100644
--- a/src/core/features/course/components/module-info/module-info.ts
+++ b/src/core/features/course/components/module-info/module-info.ts
@@ -36,12 +36,14 @@ import { CoreSites } from '@services/sites';
 export class CoreCourseModuleInfoComponent implements OnInit {
 
     @Input() module!: CoreCourseModule; // The module to render.
+    @Input() showManualCompletion = true; // Whether to show manual completion, true by default.
     @Input() courseId!: number; // The courseId the module belongs to.
 
     @Input() component!: string; // Component for format text directive.
     @Input() componentId!: string | number; // Component ID to use in conjunction with the component.
 
     @Input() description?: string | false; // The description to display. If false, no description will be shown.
+    @Input() expandDescription = false; // If the description should be expanded by default.
 
     @Input() hasDataToSync = false; // If the activity has any data to be synced.
 
diff --git a/src/core/features/course/components/module-manual-completion/core-course-module-manual-completion.html b/src/core/features/course/components/module-manual-completion/core-course-module-manual-completion.html
index ab4055ff0..d205a5a65 100644
--- a/src/core/features/course/components/module-manual-completion/core-course-module-manual-completion.html
+++ b/src/core/features/course/components/module-manual-completion/core-course-module-manual-completion.html
@@ -2,20 +2,22 @@
 
     <ng-container *ngIf="completion.istrackeduser">
         <ng-container *ngIf="completion.state">
-            <ion-button color="success" fill="outline" [attr.aria-label]="accessibleDescription" (click)="completionClicked($event)">
+            <ion-button color="success" expand="block" fill="outline" [attr.aria-label]="accessibleDescription"
+                (click)="completionClicked($event)">
                 <ion-icon name="fas-check" slot="start" aria-hidden="true"></ion-icon>
                 {{ 'core.course.completion_manual:done' | translate }}
             </ion-button>
         </ng-container>
         <ng-container *ngIf="!completion.state">
-            <ion-button color="light" [attr.aria-label]="accessibleDescription" (click)="completionClicked($event)">
+            <ion-button color="dark" expand="block" fill="outline" [attr.aria-label]="accessibleDescription"
+                (click)="completionClicked($event)">
                 {{ 'core.course.completion_manual:markdone' | translate }}
             </ion-button>
         </ng-container>
     </ng-container>
 
     <ng-container *ngIf="!completion.istrackeduser">
-        <ion-button disabled="true" color="light">
+        <ion-button disabled="true" color="dark" expand="block" fill="outline">
             {{ 'core.course.completion_manual:markdone' | translate }}
         </ion-button>
     </ng-container>
diff --git a/src/core/features/course/components/module-navigation/module-navigation.ts b/src/core/features/course/components/module-navigation/module-navigation.ts
index 627f0bbd5..dfb9602a4 100644
--- a/src/core/features/course/components/module-navigation/module-navigation.ts
+++ b/src/core/features/course/components/module-navigation/module-navigation.ts
@@ -14,10 +14,11 @@
 
 import { Component, ElementRef, Input, OnDestroy, OnInit } from '@angular/core';
 import { CoreCourse, CoreCourseProvider, CoreCourseWSSection } from '@features/course/services/course';
-import { CoreCourseModule } from '@features/course/services/course-helper';
+import { CoreCourseModule, CoreCourseSection } from '@features/course/services/course-helper';
 import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate';
 import { IonContent } from '@ionic/angular';
 import { ScrollDetail } from '@ionic/core';
+import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
 import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
@@ -41,6 +42,8 @@ export class CoreCourseModuleNavigationComponent implements OnInit, OnDestroy {
 
     nextModule?: CoreCourseModule;
     previousModule?: CoreCourseModule;
+    nextModuleSection?: CoreCourseSection;
+    previousModuleSection?: CoreCourseSection;
     loaded = false;
 
     protected element: HTMLElement;
@@ -201,9 +204,10 @@ export class CoreCourseModuleNavigationComponent implements OnInit, OnDestroy {
                 for (let j = startModule; j < section.modules.length && this.nextModule == undefined; j++) {
                     const module = section.modules[j];
 
-                    const found = await this.isModuleAvailable(module, section.id);
+                    const found = await this.isModuleAvailable(module);
                     if (found) {
                         this.nextModule = module;
+                        this.nextModuleSection = section;
                     }
                 }
             }
@@ -224,9 +228,10 @@ export class CoreCourseModuleNavigationComponent implements OnInit, OnDestroy {
                 for (let j = startModule; j >= 0 && this.previousModule == undefined; j--) {
                     const module = section.modules[j];
 
-                    const found = await this.isModuleAvailable(module, section.id);
+                    const found = await this.isModuleAvailable(module);
                     if (found) {
                         this.previousModule = module;
+                        this.previousModuleSection = section;
                     }
                 }
             }
@@ -237,20 +242,10 @@ export class CoreCourseModuleNavigationComponent implements OnInit, OnDestroy {
      * Module is visible by the user and it has a specific view (e.g. not a label).
      *
      * @param module Module to check.
-     * @param sectionId Section ID the module belongs to.
      * @return Wether the module is available to the user or not.
      */
-    protected async isModuleAvailable(module: CoreCourseModule, sectionId: number): Promise<boolean> {
-        if (module.uservisible === false || !CoreCourse.instance.moduleHasView(module)) {
-            return false;
-        }
-
-        if (!module.handlerData) {
-            module.handlerData =
-                await CoreCourseModuleDelegate.getModuleDataFor(module.modname, module, this.courseId, sectionId);
-        }
-
-        return !!module.handlerData?.action;
+    protected async isModuleAvailable(module: CoreCourseModule): Promise<boolean> {
+        return CoreCourse.instance.moduleHasView(module);
     }
 
     /**
@@ -291,11 +286,19 @@ export class CoreCourseModuleNavigationComponent implements OnInit, OnDestroy {
             return;
         }
 
-        if (!module.handlerData?.action) {
-            return;
+        if (module.uservisible === false) {
+            const section = next ? this.nextModuleSection : this.previousModuleSection;
+            const options: CoreNavigationOptions = {
+                replace: true,
+                params: {
+                    module,
+                    section,
+                },
+            };
+            CoreNavigator.navigateToSitePath('course/' + this.courseId + '/' + module.id +'/module-preview', options);
+        } else {
+            CoreCourseModuleDelegate.openActivityPage(module.modname, module, this.courseId, { replace: true });
         }
-
-        module.handlerData.action(new Event('click'), module, this.courseId, { replace: true });
     }
 
     /**
diff --git a/src/core/features/course/components/module/core-course-module.html b/src/core/features/course/components/module/core-course-module.html
index ea1bec5df..65637562c 100644
--- a/src/core/features/course/components/module/core-course-module.html
+++ b/src/core/features/course/components/module/core-course-module.html
@@ -75,8 +75,8 @@
                 </div>
 
                 <!-- Module completion. -->
-                <core-course-module-completion *ngIf="module.completiondata" [completion]="module.completiondata" [moduleName]="module.name"
-                    [moduleId]="module.id" [showCompletionConditions]="showCompletionConditions"
+                <core-course-module-completion *ngIf="module.completiondata && module.uservisible" [completion]="module.completiondata"
+                    [moduleName]="module.name" [moduleId]="module.id" [showCompletionConditions]="showCompletionConditions"
                     [showManualCompletion]="showManualCompletion" (completionChanged)="completionChanged.emit($event)">
                 </core-course-module-completion>
 
diff --git a/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html b/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html
index 6b7fe1848..a55256ca3 100644
--- a/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html
+++ b/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html
@@ -1,6 +1,3 @@
-<core-course-module-info [description]="module?.description" [courseId]="courseId" [module]="module">
-</core-course-module-info>
-
 <div class="ion-padding">
     <h2 *ngIf="!isDisabledInSite && isSupportedByTheApp">{{ 'core.whoops' | translate }}</h2>
     <h2 *ngIf="isDisabledInSite || !isSupportedByTheApp">{{ 'core.uhoh' | translate }}</h2>
diff --git a/src/core/features/course/course-lazy.module.ts b/src/core/features/course/course-lazy.module.ts
index 80f28334e..5233864dd 100644
--- a/src/core/features/course/course-lazy.module.ts
+++ b/src/core/features/course/course-lazy.module.ts
@@ -23,9 +23,9 @@ const routes: Routes = [
         loadChildren: () => import('./pages/index/index.module').then( m => m.CoreCourseIndexPageModule),
     },
     {
-        path: ':courseId/unsupported-module',
-        loadChildren: () => import('./pages/unsupported-module/unsupported-module.module')
-            .then( m => m.CoreCourseUnsupportedModulePageModule),
+        path: ':courseId/:cmId/module-preview',
+        loadChildren: () => import('./pages/module-preview/module-preview.module')
+            .then( m => m.CoreCourseModulePreviewPageModule),
     },
     {
         path: ':courseId/list-mod-type',
diff --git a/src/core/features/course/pages/module-preview/module-preview.html b/src/core/features/course/pages/module-preview/module-preview.html
new file mode 100644
index 000000000..8f352f3b5
--- /dev/null
+++ b/src/core/features/course/pages/module-preview/module-preview.html
@@ -0,0 +1,65 @@
+<ion-header collapsible>
+    <ion-toolbar>
+        <ion-buttons slot="start">
+            <ion-back-button [text]="'core.back' | translate"></ion-back-button>
+        </ion-buttons>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
+
+        <ion-buttons slot="end">
+            <core-context-menu>
+                <core-context-menu-item [priority]="900" *ngIf="module.url" [href]="module!.url"
+                    [content]="'core.openinbrowser' | translate" iconAction="fas-external-link-alt">
+                </core-context-menu-item>
+            </core-context-menu>
+        </ion-buttons>
+    </ion-toolbar>
+</ion-header>
+<ion-content>
+    <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="doRefresh($event.target)">
+        <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
+    </ion-refresher>
+    <core-loading [hideUntil]="loaded">
+        <core-course-module-info [module]="module" [courseId]="courseId" [description]="module.description" [component]="module.modname"
+            [componentId]="module.id" (completionChanged)="onCompletionChange()" [expandDescription]="true"
+            [showManualCompletion]="showManualCompletion">
+
+            <div class="safe-area-padding-horizontal ion-padding" *ngIf="module.handlerData?.extraBadge">
+                <ion-badge class="ion-text-wrap ion-text-start" [color]="module.handlerData?.extraBadgeColor">
+                    <span [innerHTML]="module.handlerData?.extraBadge"></span>
+                </ion-badge>
+            </div>
+            <div class="safe-area-padding-horizontal ion-padding" *ngIf="module.visible === 0 && (!section || section.visible)">
+                <ion-badge class="ion-text-wrap">
+                    {{ 'core.course.hiddenfromstudents' | translate }}
+                </ion-badge>
+            </div>
+            <div class="safe-area-padding-horizontal ion-padding" *ngIf="module.visible !== 0 && module.isStealth">
+                <ion-badge class="ion-text-wrap">
+                    {{ 'core.course.hiddenoncoursepage' | translate }}
+                </ion-badge>
+            </div>
+            <div class="safe-area-padding-horizontal ion-padding core-module-availabilityinfo" *ngIf="module.availabilityinfo">
+                <ion-badge class="ion-text-wrap">{{ 'core.restricted' | translate }}</ion-badge>
+                <div>
+                    <core-format-text [text]="module.availabilityinfo" contextLevel="module" [contextInstanceId]="module.id"
+                        [courseId]="courseId" class="ion-text-wrap">
+                    </core-format-text>
+                </div>
+            </div>
+            <div class="safe-area-padding-horizontal ion-padding" *ngIf="module.completiondata?.offline">
+                <ion-badge color="warning" class="ion-text-wrap">
+                    {{ 'core.course.manualcompletionnotsynced' | translate }}
+                </ion-badge>
+            </div>
+
+            <core-course-unsupported-module *ngIf="unsupported" [module]="module" [courseId]="courseId"></core-course-unsupported-module>
+        </core-course-module-info>
+    </core-loading>
+
+    <core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id"></core-course-module-navigation>
+</ion-content>
diff --git a/src/core/features/course/pages/unsupported-module/unsupported-module.module.ts b/src/core/features/course/pages/module-preview/module-preview.module.ts
similarity index 83%
rename from src/core/features/course/pages/unsupported-module/unsupported-module.module.ts
rename to src/core/features/course/pages/module-preview/module-preview.module.ts
index 596d96650..ab346fcb0 100644
--- a/src/core/features/course/pages/unsupported-module/unsupported-module.module.ts
+++ b/src/core/features/course/pages/module-preview/module-preview.module.ts
@@ -16,13 +16,13 @@ import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
 import { CoreSharedModule } from '@/core/shared.module';
-import { CoreCourseUnsupportedModulePage } from './unsupported-module.page';
+import { CoreCourseModulePreviewPage } from './module-preview.page';
 import { CoreCourseComponentsModule } from '@features/course/components/components.module';
 
 const routes: Routes = [
     {
         path: '',
-        component: CoreCourseUnsupportedModulePage,
+        component: CoreCourseModulePreviewPage,
     },
 ];
 
@@ -33,8 +33,8 @@ const routes: Routes = [
         CoreCourseComponentsModule,
     ],
     declarations: [
-        CoreCourseUnsupportedModulePage,
+        CoreCourseModulePreviewPage,
     ],
     exports: [RouterModule],
 })
-export class CoreCourseUnsupportedModulePageModule {}
+export class CoreCourseModulePreviewPageModule { }
diff --git a/src/core/features/course/pages/module-preview/module-preview.page.ts b/src/core/features/course/pages/module-preview/module-preview.page.ts
new file mode 100644
index 000000000..51dc29b23
--- /dev/null
+++ b/src/core/features/course/pages/module-preview/module-preview.page.ts
@@ -0,0 +1,118 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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, OnInit } from '@angular/core';
+import { CoreCourse } from '@features/course/services/course';
+import { CoreCourseHelper, CoreCourseModule, CoreCourseSection } from '@features/course/services/course-helper';
+import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate';
+import { IonRefresher } from '@ionic/angular';
+import { CoreNavigator } from '@services/navigator';
+import { CoreDomUtils } from '@services/utils/dom';
+import { CoreUtils } from '@services/utils/utils';
+
+/**
+ * Page that displays a module preview.
+ */
+@Component({
+    selector: 'page-core-course-module-preview',
+    templateUrl: 'module-preview.html',
+})
+export class CoreCourseModulePreviewPage implements OnInit {
+
+    title!: string;
+    module!: CoreCourseModule;
+    section?: CoreCourseSection; // The section the module belongs to.
+    courseId!: number;
+    loaded = false;
+    unsupported = false;
+    showManualCompletion = false;
+
+    protected debouncedUpdateModule?: () => void; // Update the module after a certain time.
+
+    /**
+     * @inheritdoc
+     */
+    async ngOnInit(): Promise<void> {
+        try {
+            this.module = CoreNavigator.getRequiredRouteParam<CoreCourseModule>('module');
+            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            this.section = CoreNavigator.getRouteParam<CoreCourseSection>('section');
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
+        }
+
+        this.debouncedUpdateModule = CoreUtils.debounce(() => {
+            this.doRefresh();
+        }, 10000);
+
+        await this.fetchModule();
+    }
+
+    /**
+     * Fetch module.
+     *
+     * @return Promise resolved when done.
+     */
+    protected async fetchModule(refresh = false): Promise<void> {
+        if (refresh) {
+            this.module = await CoreCourse.getModule(this.module.id, this.courseId);
+        }
+
+        CoreCourseHelper.calculateModuleCompletionData(this.module, this.courseId);
+
+        await CoreCourseHelper.loadModuleOfflineCompletion(this.courseId, this.module);
+
+        this.unsupported = !CoreCourseModuleDelegate.getHandlerName(this.module.modname);
+        if (!this.unsupported) {
+            this.module.handlerData =
+                await CoreCourseModuleDelegate.getModuleDataFor(this.module.modname, this.module, this.courseId);
+        }
+
+        this.title = this.module.name;
+
+        this.showManualCompletion = await CoreCourseModuleDelegate.manualCompletionAlwaysShown(this.module);
+
+        this.loaded = true;
+    }
+
+    /**
+     * Refresh the data.
+     *
+     * @param refresher Refresher.
+     * @return Promise resolved when done.
+     */
+    async doRefresh(refresher?: IonRefresher): Promise<void> {
+
+        await CoreCourse.invalidateModule(this.module.id);
+
+        this.fetchModule(true);
+
+        refresher?.complete();
+    }
+
+    /**
+     * The completion of the modules has changed.
+     *
+     * @return Promise resolved when done.
+     */
+    async onCompletionChange(): Promise<void> {
+        // Update the module data after a while.
+        this.debouncedUpdateModule?.();
+    }
+
+}
diff --git a/src/core/features/course/pages/unsupported-module/unsupported-module.html b/src/core/features/course/pages/unsupported-module/unsupported-module.html
deleted file mode 100644
index 6760fda91..000000000
--- a/src/core/features/course/pages/unsupported-module/unsupported-module.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<ion-header collapsible>
-    <ion-toolbar>
-        <ion-buttons slot="start">
-            <ion-back-button [text]="'core.back' | translate"></ion-back-button>
-        </ion-buttons>
-        <ion-title>
-            <h1>
-                <core-format-text [text]="module?.name" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
-                </core-format-text>
-            </h1>
-        </ion-title>
-
-        <ion-buttons slot="end">
-            <core-context-menu>
-                <core-context-menu-item [priority]="900" *ngIf="module?.url" [href]="module!.url"
-                    [content]="'core.openinbrowser' | translate" iconAction="fas-external-link-alt">
-                </core-context-menu-item>
-                <core-context-menu-item [priority]="800" *ngIf="module?.description" [content]="'core.moduleintro' | translate"
-                    (action)="expandDescription()" iconAction="fas-arrow-right">
-                </core-context-menu-item>
-            </core-context-menu>
-        </ion-buttons>
-    </ion-toolbar>
-</ion-header>
-<ion-content>
-    <core-course-unsupported-module [module]="module" [courseId]="courseId"></core-course-unsupported-module>
-</ion-content>
diff --git a/src/core/features/course/pages/unsupported-module/unsupported-module.page.ts b/src/core/features/course/pages/unsupported-module/unsupported-module.page.ts
deleted file mode 100644
index 78bb28a44..000000000
--- a/src/core/features/course/pages/unsupported-module/unsupported-module.page.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-// (C) Copyright 2015 Moodle Pty Ltd.
-//
-// 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, OnInit } from '@angular/core';
-
-import { CoreCourseWSModule } from '@features/course/services/course';
-import { CoreNavigator } from '@services/navigator';
-import { CoreTextUtils } from '@services/utils/text';
-import { Translate } from '@singletons';
-
-/**
- * Page that displays info about an unsupported module.
- */
-@Component({
-    selector: 'page-core-course-unsupported-module',
-    templateUrl: 'unsupported-module.html',
-})
-export class CoreCourseUnsupportedModulePage implements OnInit {
-
-    module?: CoreCourseWSModule;
-    courseId?: number;
-
-    /**
-     * @inheritDoc
-     */
-    ngOnInit(): void {
-        this.module = CoreNavigator.getRouteParam('module');
-        this.courseId = CoreNavigator.getRouteNumberParam('courseId');
-    }
-
-    /**
-     * Expand the description.
-     */
-    expandDescription(): void {
-        CoreTextUtils.viewText(Translate.instant('core.description'), this.module!.description!, {
-            filter: true,
-            contextLevel: 'module',
-            instanceId: this.module!.id,
-            courseId: this.courseId,
-        });
-    }
-
-}
diff --git a/src/core/features/course/services/handlers/default-module.ts b/src/core/features/course/services/handlers/default-module.ts
index 25bf41663..6e8cb25d6 100644
--- a/src/core/features/course/services/handlers/default-module.ts
+++ b/src/core/features/course/services/handlers/default-module.ts
@@ -49,14 +49,11 @@ export class CoreCourseModuleDefaultHandler implements CoreCourseModuleHandler {
             icon: await CoreCourse.getModuleIconSrc(module.modname, module.modicon),
             title: module.name,
             class: 'core-course-default-handler core-course-module-' + module.modname + '-handler',
-            action: (event: Event, module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions) => {
+            action: async (event: Event, module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions) => {
                 event.preventDefault();
                 event.stopPropagation();
 
-                options = options || {};
-                options.params = { module };
-
-                CoreNavigator.navigateToSitePath('course/' + courseId + '/unsupported-module', options);
+                await this.openActivityPage(module, courseId, options);
             },
         };
 
@@ -92,4 +89,15 @@ export class CoreCourseModuleDefaultHandler implements CoreCourseModuleHandler {
         return true;
     }
 
+    /**
+     * @inheritdoc
+     */
+    async openActivityPage(module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions): Promise<void> {
+        options = options || {};
+        options.params = options.params || {};
+        Object.assign(options.params, { module });
+
+        await CoreNavigator.navigateToSitePath('course/' + courseId + '/' + module.id +'/module-preview', options);
+    }
+
 }
diff --git a/src/core/features/course/services/module-delegate.ts b/src/core/features/course/services/module-delegate.ts
index 66dec4184..2776043ff 100644
--- a/src/core/features/course/services/module-delegate.ts
+++ b/src/core/features/course/services/module-delegate.ts
@@ -102,6 +102,16 @@ export interface CoreCourseModuleHandler extends CoreDelegateHandler {
      * @return Promise resolved with boolean: whether the manual completion should always be displayed.
      */
     manualCompletionAlwaysShown?(module: CoreCourseModule): Promise<boolean>;
+
+    /**
+     * Opens the activity page.
+     *
+     * @param module The module object.
+     * @param courseId The course ID.
+     * @param options Options for the navigation.
+     * @return Promise resolved when done.
+     */
+    openActivityPage(module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions): Promise<void>;
 }
 
 /**
@@ -295,6 +305,27 @@ export class CoreCourseModuleDelegateService extends CoreDelegate<CoreCourseModu
         );
     }
 
+    /**
+     * Opens the activity page.
+     *
+     * @param module The module object.
+     * @param courseId The course ID.
+     * @param options Options for the navigation.
+     * @return Promise resolved when done.
+     */
+    async openActivityPage(
+        modname: string,
+        module: CoreCourseModule,
+        courseId: number,
+        options?: CoreNavigationOptions,
+    ): Promise<void> {
+        return await this.executeFunctionOnEnabled<void>(
+            modname,
+            'openActivityPage',
+            [module, courseId, options],
+        );
+    }
+
     /**
      * Check if a certain module type is disabled in a site.
      *
diff --git a/src/core/features/siteplugins/classes/handlers/module-handler.ts b/src/core/features/siteplugins/classes/handlers/module-handler.ts
index 1276a3a87..847d2894b 100644
--- a/src/core/features/siteplugins/classes/handlers/module-handler.ts
+++ b/src/core/features/siteplugins/classes/handlers/module-handler.ts
@@ -15,7 +15,7 @@
 import { Type } from '@angular/core';
 
 import { CoreConstants } from '@/core/constants';
-import { CoreCourseAnyModuleData, CoreCourseWSModule } from '@features/course/services/course';
+import { CoreCourse, CoreCourseAnyModuleData, CoreCourseWSModule } from '@features/course/services/course';
 import { CoreCourseModule } from '@features/course/services/course-helper';
 import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
 import { CoreSitePluginsModuleIndexComponent } from '@features/siteplugins/components/module-index/module-index';
@@ -92,17 +92,16 @@ export class CoreSitePluginsModuleHandler extends CoreSitePluginsBaseHandler imp
 
         if (this.handlerSchema.method) {
             // There is a method, add an action.
-            handlerData.action = (event: Event, module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions) => {
+            handlerData.action = async (
+                event: Event,
+                module: CoreCourseModule,
+                courseId: number,
+                options?: CoreNavigationOptions,
+            ) => {
                 event.preventDefault();
                 event.stopPropagation();
 
-                options = options || {};
-                options.params = {
-                    title: module.name,
-                    module,
-                };
-
-                CoreNavigator.navigateToSitePath(`siteplugins/module/${courseId}/${module.id}`, options);
+                await this.openActivityPage(module, courseId, options);
             };
         }
 
@@ -229,4 +228,22 @@ export class CoreSitePluginsModuleHandler extends CoreSitePluginsBaseHandler imp
         return false;
     }
 
+    /**
+     * @inheritdoc
+     */
+    async openActivityPage(module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions): Promise<void> {
+        if (!CoreCourse.moduleHasView(module)) {
+            return;
+        }
+
+        options = options || {};
+        options.params = options.params || {};
+        Object.assign(options.params, {
+            title: module.name,
+            module,
+        });
+
+        CoreNavigator.navigateToSitePath(`siteplugins/module/${courseId}/${module.id}`, options);
+    }
+
 }

From ac08c758cecde68e9168a5e5a13f1cb2cb30a5ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 3 Dec 2021 11:10:44 +0100
Subject: [PATCH 0262/1008] MOBILE-3923 blocks: Fix recently accessed courses
 3.7 downwards

---
 .../recentlyaccessedcourses.ts                | 35 ++++++++++++++++---
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
index b6aef6614..6bbad0d5d 100644
--- a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
+++ b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
@@ -21,11 +21,16 @@ import {
     CoreCourses,
     CoreCourseSummaryData,
 } from '@features/courses/services/courses';
-import { CoreCourseSearchedDataWithExtraInfoAndOptions } from '@features/courses/services/courses-helper';
+import {
+    CoreCourseSearchedDataWithExtraInfoAndOptions,
+    CoreCoursesHelper,
+    CoreEnrolledCourseDataWithOptions,
+} from '@features/courses/services/courses-helper';
 import { CoreCourseOptionsDelegate } from '@features/course/services/course-options-delegate';
 import { AddonCourseCompletion } from '@/addons/coursecompletion/services/coursecompletion';
 import { CoreBlockBaseComponent } from '@features/block/classes/base-block-component';
 import { CoreUtils } from '@services/utils/utils';
+import { CoreSite } from '@classes/site';
 
 /**
  * Component to render a recent courses block.
@@ -38,11 +43,12 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
 
     @Input() downloadEnabled = false;
 
-    courses: (Omit<CoreCourseSummaryData, 'visible'> & CoreCourseSearchedDataWithExtraInfoAndOptions)[] = [];
+    courses: AddonBlockRecentlyAccessedCourse[] = [];
 
     downloadCourseEnabled = false;
     scrollElementId!: string;
 
+    protected site!: CoreSite;
     protected isDestroyed = false;
     protected coursesObserver?: CoreEventObserver;
     protected updateSiteObserver?: CoreEventObserver;
@@ -50,6 +56,8 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
 
     constructor() {
         super('AddonBlockRecentlyAccessedCoursesComponent');
+
+        this.site = CoreSites.getRequiredCurrentSite();
     }
 
     /**
@@ -68,14 +76,14 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
         this.updateSiteObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, () => {
             this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
 
-        }, CoreSites.getCurrentSiteId());
+        }, this.site.getId());
 
         this.coursesObserver = CoreEvents.on(
             CoreCoursesProvider.EVENT_MY_COURSES_UPDATED,
             (data) => {
                 this.refreshCourseList(data);
             },
-            CoreSites.getCurrentSiteId(),
+            this.site.getId(),
         );
 
         super.ngOnInit();
@@ -99,8 +107,12 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
     protected async invalidateCourses(courseIds: number[]): Promise<void> {
         const promises: Promise<void>[] = [];
 
+        const invalidateCoursePromise = this.site.isVersionGreaterEqualThan('3.8')
+            ? CoreCourses.invalidateRecentCourses()
+            : CoreCourses.invalidateUserCourses();
+
         // Invalidate course completion data.
-        promises.push(CoreCourses.invalidateRecentCourses().finally(() =>
+        promises.push(invalidateCoursePromise.finally(() =>
             CoreUtils.allPromises(courseIds.map((courseId) =>
                 AddonCourseCompletion.invalidateCourseCompletion(courseId)))));
 
@@ -123,6 +135,13 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
         const showCategories = this.block.configsRecord && this.block.configsRecord.displaycategories &&
             this.block.configsRecord.displaycategories.value == '1';
 
+        // WS is failing on 3.7 and 3.6, use a fallback.
+        if (!this.site.isVersionGreaterEqualThan('3.8')) {
+            this.courses = await CoreCoursesHelper.getUserCoursesWithOptions('lastaccess', 10, undefined, showCategories);
+
+            return;
+        }
+
         const recentCourses = await CoreCourses.getRecentCourses();
         const courseIds = recentCourses.map((course) => course.id);
 
@@ -191,3 +210,9 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
     }
 
 }
+
+type AddonBlockRecentlyAccessedCourse =
+    (Omit<CoreCourseSummaryData, 'visible'> & CoreCourseSearchedDataWithExtraInfoAndOptions) |
+    (CoreEnrolledCourseDataWithOptions & {
+        categoryname?: string; // Category name,
+    });

From 9837e6d3b35099650abaa5ec97f08fb874bb8cb5 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 3 Dec 2021 14:18:22 +0100
Subject: [PATCH 0263/1008] MOBILE-3803 config: Move group WS constants to
 config file

---
 moodle.config.json       | 4 +++-
 src/core/classes/site.ts | 9 +++++----
 src/types/config.d.ts    | 2 ++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/moodle.config.json b/moodle.config.json
index 99348b609..7896c81ce 100644
--- a/moodle.config.json
+++ b/moodle.config.json
@@ -97,5 +97,7 @@
     "appstores": {
         "android": "com.moodle.moodlemobile",
         "ios": "id633359593"
-    }
+    },
+    "wsrequestqueuelimit": 10,
+    "wsrequestqueuedelay": 50
 }
diff --git a/src/core/classes/site.ts b/src/core/classes/site.ts
index 5dac39fee..7b03c32bf 100644
--- a/src/core/classes/site.ts
+++ b/src/core/classes/site.ts
@@ -66,8 +66,6 @@ const ALLOWED_LOGGEDOUT_WS = [
  */
 export class CoreSite {
 
-    static readonly REQUEST_QUEUE_DELAY = 50; // Maximum number of miliseconds to wait before processing the queue.
-    static readonly REQUEST_QUEUE_LIMIT = 10; // Maximum number of requests allowed in the queue.
     static readonly REQUEST_QUEUE_FORCE_WS = false; // Use "tool_mobile_call_external_functions" even for calling a single function.
 
     // Constants for cache update frequency.
@@ -756,10 +754,13 @@ export class CoreSite {
     protected enqueueRequest<T>(request: RequestQueueItem<T>): Promise<T> {
         this.requestQueue.push(request);
 
-        if (this.requestQueue.length >= CoreSite.REQUEST_QUEUE_LIMIT) {
+        if (this.requestQueue.length >= CoreConstants.CONFIG.wsrequestqueuelimit) {
             this.processRequestQueue();
         } else if (!this.requestQueueTimeout) {
-            this.requestQueueTimeout = window.setTimeout(this.processRequestQueue.bind(this), CoreSite.REQUEST_QUEUE_DELAY);
+            this.requestQueueTimeout = window.setTimeout(
+                this.processRequestQueue.bind(this),
+                CoreConstants.CONFIG.wsrequestqueuedelay,
+            );
         }
 
         return request.deferred.promise;
diff --git a/src/types/config.d.ts b/src/types/config.d.ts
index 14b0b5a51..c5df37dcd 100644
--- a/src/types/config.d.ts
+++ b/src/types/config.d.ts
@@ -58,4 +58,6 @@ export interface EnvironmentConfig {
     feedbackFormUrl?: string | false;
     a11yStatement?: string | false;
     iabToolbarColors?: 'auto' | { background: string; text?: string } | null;
+    wsrequestqueuelimit: number; // Maximum number of requests allowed in the queue.
+    wsrequestqueuedelay: number; // Maximum number of miliseconds to wait before processing the queue.
 }

From d6a409fafcf38e8941fb38e6b65f3fcf79fc6bae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 1 Dec 2021 15:02:32 +0100
Subject: [PATCH 0264/1008] MOBILE-3940 my: Use new mypage param when
 retrieving dashboard blocks

---
 .../block/timeline/services/block-handler.ts  |  4 +-
 .../block/timeline/services/timeline.ts       | 14 ----
 .../courses/pages/dashboard/dashboard.ts      |  5 +-
 src/core/features/courses/pages/my/my.html    | 17 +++--
 src/core/features/courses/pages/my/my.ts      | 64 +++++++++++++++----
 .../features/courses/services/dashboard.ts    | 41 ++++++++----
 .../services/handlers/dashboard-home.ts       | 18 ++++--
 7 files changed, 108 insertions(+), 55 deletions(-)

diff --git a/src/addons/block/timeline/services/block-handler.ts b/src/addons/block/timeline/services/block-handler.ts
index d05574786..0675654c3 100644
--- a/src/addons/block/timeline/services/block-handler.ts
+++ b/src/addons/block/timeline/services/block-handler.ts
@@ -19,7 +19,7 @@ import { CoreCourses } from '@features/courses/services/courses';
 import { AddonBlockTimelineComponent } from '@addons/block/timeline/components/timeline/timeline';
 import { CoreBlockBaseHandler } from '@features/block/classes/base-block-handler';
 import { makeSingleton } from '@singletons';
-import { AddonBlockTimeline } from './timeline';
+import { CoreCoursesDashboard } from '@features/courses/services/dashboard';
 
 /**
  * Block handler.
@@ -36,7 +36,7 @@ export class AddonBlockTimelineHandlerService extends CoreBlockBaseHandler {
      * @return Whether or not the handler is enabled on a site level.
      */
     async isEnabled(): Promise<boolean> {
-        const enabled = await AddonBlockTimeline.isAvailable();
+        const enabled = !CoreCoursesDashboard.isDisabledInSite();
         const currentSite = CoreSites.getCurrentSite();
 
         return enabled && ((currentSite && currentSite.isVersionGreaterEqualThan('3.6')) ||
diff --git a/src/addons/block/timeline/services/timeline.ts b/src/addons/block/timeline/services/timeline.ts
index 0dbddde01..fe06a1aa6 100644
--- a/src/addons/block/timeline/services/timeline.ts
+++ b/src/addons/block/timeline/services/timeline.ts
@@ -14,7 +14,6 @@
 
 import { Injectable } from '@angular/core';
 import { CoreSites } from '@services/sites';
-import { CoreCoursesDashboard } from '@features/courses/services/dashboard';
 import {
     AddonCalendarEvents,
     AddonCalendarEventsGroupedByCourse,
@@ -251,19 +250,6 @@ export class AddonBlockTimelineProvider {
         await site.invalidateWsCacheForKeyStartingWith(this.getActionEventsByTimesortPrefixCacheKey());
     }
 
-    /**
-     * Returns whether or not My Overview is available for a certain site.
-     *
-     * @param siteId Site ID. If not defined, current site.
-     * @return Promise resolved with true if available, resolved with false or rejected otherwise.
-     */
-    async isAvailable(siteId?: string): Promise<boolean> {
-        const site = await CoreSites.getSite(siteId);
-
-        // Check if dashboard is disabled.
-        return !CoreCoursesDashboard.isDisabledInSite(site);
-    }
-
     /**
      * Handles course events, filtering and treating if more can be loaded.
      *
diff --git a/src/core/features/courses/pages/dashboard/dashboard.ts b/src/core/features/courses/pages/dashboard/dashboard.ts
index e86d2d72a..739b75755 100644
--- a/src/core/features/courses/pages/dashboard/dashboard.ts
+++ b/src/core/features/courses/pages/dashboard/dashboard.ts
@@ -85,8 +85,9 @@ export class CoreCoursesDashboardPage implements OnInit, OnDestroy {
      */
     protected async loadContent(): Promise<void> {
         const available = await CoreCoursesDashboard.isAvailable();
+        const disabled = await CoreCoursesDashboard.isDisabled();
 
-        if (available) {
+        if (available && !disabled) {
             this.userId = CoreSites.getCurrentSiteUserId();
 
             try {
@@ -101,7 +102,7 @@ export class CoreCoursesDashboardPage implements OnInit, OnDestroy {
                 // Cannot get the blocks, just show dashboard if needed.
                 this.loadFallbackBlocks();
             }
-        } else if (!CoreCoursesDashboard.isDisabledInSite()) {
+        } else if (!available) {
             // Not available, but not disabled either. Use fallback.
             this.loadFallbackBlocks();
         } else {
diff --git a/src/core/features/courses/pages/my/my.html b/src/core/features/courses/pages/my/my.html
index af8a8f2fa..bdd93c60b 100644
--- a/src/core/features/courses/pages/my/my.html
+++ b/src/core/features/courses/pages/my/my.html
@@ -26,13 +26,16 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-refresher slot="fixed" (ionRefresh)="refresh($event.target)">
+    <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="refresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <ion-list>
-        <!-- My courses blocks. -->
-        <core-block [block]="{name: 'myoverview', visible: true}" contextLevel="user" [instanceId]="userId"
-            [extraData]="{'downloadEnabled': true}">
-        </core-block>
-    </ion-list>
+    <core-loading [hideUntil]="loaded">
+        <ion-list>
+            <core-block *ngIf="loadedBlock?.visible" [block]="loadedBlock" contextLevel="user" [instanceId]="userId"
+                [extraData]="{'downloadEnabled': true}"></core-block>
+        </ion-list>
+
+        <core-empty-box *ngIf="!loadedBlock" icon="fas-cubes" [message]="'core.course.nocontentavailable' | translate">
+        </core-empty-box>
+    </core-loading>
 </ion-content>
diff --git a/src/core/features/courses/pages/my/my.ts b/src/core/features/courses/pages/my/my.ts
index 9c98a25a4..45365fd23 100644
--- a/src/core/features/courses/pages/my/my.ts
+++ b/src/core/features/courses/pages/my/my.ts
@@ -15,6 +15,8 @@
 import { AddonBlockMyOverviewComponent } from '@addons/block/myoverview/components/myoverview/myoverview';
 import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { CoreBlockComponent } from '@features/block/components/block/block';
+import { CoreCourseBlock } from '@features/course/services/course';
+import { CoreCoursesDashboard, CoreCoursesDashboardProvider } from '@features/courses/services/dashboard';
 import { IonRefresher } from '@ionic/angular';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
@@ -37,7 +39,9 @@ export class CoreCoursesMyCoursesPage implements OnInit, OnDestroy {
     searchEnabled = false;
     downloadCoursesEnabled = false;
     userId: number;
+    loadedBlock?: Partial<CoreCourseBlock>;
     myOverviewBlock?: AddonBlockMyOverviewComponent;
+    loaded = false;
 
     protected updateSiteObserver: CoreEventObserver;
 
@@ -58,21 +62,49 @@ export class CoreCoursesMyCoursesPage implements OnInit, OnDestroy {
         this.searchEnabled = !CoreCourses.isSearchCoursesDisabledInSite();
         this.downloadCoursesEnabled = !CoreCourses.isDownloadCoursesDisabledInSite();
 
-        this.loadBlock();
+        this.loadContent();
 
     }
 
     /**
      * Load my overview block instance.
      */
-    protected loadBlock(): void {
-        setTimeout(() => {
-            if (!this.block) {
-                return this.loadBlock();
-            }
+    protected async loadContent(): Promise<void> {
+        const available = await CoreCoursesDashboard.isAvailable();
+        const disabled = await CoreCourses.isMyCoursesDisabled();
 
-            this.myOverviewBlock = this.block?.dynamicComponent?.instance as AddonBlockMyOverviewComponent;
-        }, 500);
+        if (available && !disabled) {
+            try {
+                const blocks = await CoreCoursesDashboard.getDashboardBlocksFromWS(CoreCoursesDashboardProvider.MY_PAGE_COURSES);
+
+                this.loadedBlock = blocks.find((block) => block.name == 'myoverview');
+
+                await CoreUtils.nextTicks(2);
+
+                this.myOverviewBlock = this.block?.dynamicComponent?.instance as AddonBlockMyOverviewComponent;
+            } catch {
+                // Cannot get the blocks, just show the block if needed.
+                this.loadFallbackBlock();
+            }
+        } else if (!available) {
+            // WS not available, or my courses page not available. show fallback block.
+            this.loadFallbackBlock();
+        } else {
+            // Disabled.
+            this.loadedBlock = undefined;
+        }
+
+        this.loaded = true;
+    }
+
+    /**
+     * Load fallback blocks.
+     */
+    protected loadFallbackBlock(): void {
+        this.loadedBlock = {
+            name: 'myoverview',
+            visible: true,
+        };
     }
 
     /**
@@ -95,11 +127,21 @@ export class CoreCoursesMyCoursesPage implements OnInit, OnDestroy {
      * @param refresher Refresher.
      */
     async refresh(refresher?: IonRefresher): Promise<void> {
-        if (this.block) {
-            await CoreUtils.ignoreErrors(this.block.doRefresh());
+
+        const promises: Promise<void>[] = [];
+
+        promises.push(CoreCoursesDashboard.invalidateDashboardBlocks(CoreCoursesDashboardProvider.MY_PAGE_COURSES));
+
+        // Invalidate the blocks.
+        if (this.myOverviewBlock) {
+            promises.push(CoreUtils.ignoreErrors(this.myOverviewBlock.doRefresh()));
         }
 
-        refresher?.complete();
+        Promise.all(promises).finally(() => {
+            this.loadContent().finally(() => {
+                refresher?.complete();
+            });
+        });
     }
 
     /**
diff --git a/src/core/features/courses/services/dashboard.ts b/src/core/features/courses/services/dashboard.ts
index 76823a0b2..97e86c2d2 100644
--- a/src/core/features/courses/services/dashboard.ts
+++ b/src/core/features/courses/services/dashboard.ts
@@ -18,6 +18,7 @@ import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
 import { CoreCourseBlock } from '@features/course/services/course';
 import { CoreStatusWithWarningsWSResponse } from '@services/ws';
 import { makeSingleton } from '@singletons';
+import { CoreError } from '@classes/errors/error';
 
 const ROOT_CACHE_KEY = 'CoreCoursesDashboard:';
 
@@ -27,32 +28,47 @@ const ROOT_CACHE_KEY = 'CoreCoursesDashboard:';
 @Injectable({ providedIn: 'root' })
 export class CoreCoursesDashboardProvider {
 
+    static readonly MY_PAGE_DEFAULT = '__default';
+    static readonly MY_PAGE_COURSES = '__courses';
+
     /**
      * Get cache key for dashboard blocks WS calls.
      *
+     * @param myPage What my page to return blocks of. Default MY_PAGE_DEFAULT.
      * @param userId User ID. Default, 0 means current user.
      * @return Cache key.
      */
-    protected getDashboardBlocksCacheKey(userId: number = 0): string {
-        return ROOT_CACHE_KEY + 'blocks:' + userId;
+    protected getDashboardBlocksCacheKey(myPage = CoreCoursesDashboardProvider.MY_PAGE_DEFAULT, userId: number = 0): string {
+        return ROOT_CACHE_KEY + 'blocks:' + myPage + ':' + userId;
     }
 
     /**
      * Get dashboard blocks from WS.
      *
+     * @param myPage What my page to return blocks of. Default MY_PAGE_DEFAULT.
      * @param userId User ID. Default, current user.
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with the list of blocks.
      * @since 3.6
      */
-    protected async getDashboardBlocksFromWS(userId?: number, siteId?: string): Promise<CoreCourseBlock[]> {
+    async getDashboardBlocksFromWS(
+        myPage = CoreCoursesDashboardProvider.MY_PAGE_DEFAULT,
+        userId?: number,
+        siteId?: string,
+    ): Promise<CoreCourseBlock[]> {
         const site = await CoreSites.getSite(siteId);
 
         const params: CoreBlockGetDashboardBlocksWSParams = {
             returncontents: true,
         };
+        if (CoreSites.getRequiredCurrentSite().isVersionGreaterEqualThan('4.0')) {
+            params.mypage = myPage;
+        } else if (myPage != CoreCoursesDashboardProvider.MY_PAGE_DEFAULT) {
+            throw new CoreError('mypage param is no accessible on core_block_get_dashboard_blocks');
+        }
+
         const preSets: CoreSiteWSPreSets = {
-            cacheKey: this.getDashboardBlocksCacheKey(userId),
+            cacheKey: this.getDashboardBlocksCacheKey(myPage, userId),
             updateFrequency: CoreSite.FREQUENCY_RARELY,
         };
         if (userId) {
@@ -71,7 +87,7 @@ export class CoreCoursesDashboardProvider {
      * @return Promise resolved with the list of blocks.
      */
     async getDashboardBlocks(userId?: number, siteId?: string): Promise<CoreCoursesDashboardBlocks> {
-        const blocks = await CoreCoursesDashboard.getDashboardBlocksFromWS(userId, siteId);
+        const blocks = await this.getDashboardBlocksFromWS(CoreCoursesDashboardProvider.MY_PAGE_DEFAULT, userId, siteId);
 
         let mainBlocks: CoreCourseBlock[] = [];
         let sideBlocks: CoreCourseBlock[] = [];
@@ -104,14 +120,19 @@ export class CoreCoursesDashboardProvider {
     /**
      * Invalidates dashboard blocks WS call.
      *
+     * @param myPage What my page to return blocks of. Default MY_PAGE_DEFAULT.
      * @param userId User ID. Default, current user.
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when the data is invalidated.
      */
-    async invalidateDashboardBlocks(userId?: number, siteId?: string): Promise<void> {
+    async invalidateDashboardBlocks(
+        myPage = CoreCoursesDashboardProvider.MY_PAGE_DEFAULT,
+        userId?: number,
+        siteId?: string,
+    ): Promise<void> {
         const site = await CoreSites.getSite(siteId);
 
-        return await site.invalidateWsCacheForKey(this.getDashboardBlocksCacheKey(userId));
+        return await site.invalidateWsCacheForKey(this.getDashboardBlocksCacheKey(myPage, userId));
     }
 
     /**
@@ -124,11 +145,6 @@ export class CoreCoursesDashboardProvider {
     async isAvailable(siteId?: string): Promise<boolean> {
         const site = await CoreSites.getSite(siteId);
 
-        // First check if it's disabled.
-        if (this.isDisabledInSite(site)) {
-            return false;
-        }
-
         return site.wsAvailable('core_block_get_dashboard_blocks');
     }
 
@@ -171,6 +187,7 @@ export type CoreCoursesDashboardBlocks = {
 type CoreBlockGetDashboardBlocksWSParams = {
     userid?: number; // User id (optional), default is current user.
     returncontents?: boolean; // Whether to return the block contents.
+    mypage?: string; // @since 4.0. What my page to return blocks of. Default MY_PAGE_DEFAULT.
 };
 
 /**
diff --git a/src/core/features/courses/services/handlers/dashboard-home.ts b/src/core/features/courses/services/handlers/dashboard-home.ts
index 0076031a8..c06582993 100644
--- a/src/core/features/courses/services/handlers/dashboard-home.ts
+++ b/src/core/features/courses/services/handlers/dashboard-home.ts
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { AddonBlockTimeline } from '@addons/block/timeline/services/timeline';
 import { Injectable } from '@angular/core';
 import { CoreBlockDelegate } from '@features/block/services/block-delegate';
 import { CoreMainMenuHomeHandler, CoreMainMenuHomeHandlerToDisplay } from '@features/mainmenu/services/home-delegate';
@@ -49,6 +48,7 @@ export class CoreDashboardHomeHandlerService implements CoreMainMenuHomeHandler
         const promises: Promise<void>[] = [];
         let blocksEnabled = false;
         let dashboardAvailable = false;
+        let dashboardEnabled = false;
 
         // Check if blocks and 3.6 dashboard is enabled.
         promises.push(CoreBlockDelegate.areBlocksDisabled(siteId).then((disabled) => {
@@ -57,7 +57,13 @@ export class CoreDashboardHomeHandlerService implements CoreMainMenuHomeHandler
             return;
         }));
 
-        promises.push(CoreCoursesDashboard.isAvailable().then((available) => {
+        promises.push(CoreCoursesDashboard.isDisabled(siteId).then((disabled) => {
+            dashboardEnabled = !disabled;
+
+            return;
+        }));
+
+        promises.push(CoreCoursesDashboard.isAvailable(siteId).then((available) => {
             dashboardAvailable = available;
 
             return;
@@ -65,16 +71,14 @@ export class CoreDashboardHomeHandlerService implements CoreMainMenuHomeHandler
 
         await Promise.all(promises);
 
-        if (dashboardAvailable && blocksEnabled) {
+        if (dashboardAvailable && dashboardEnabled && blocksEnabled) {
             const blocks = await CoreCoursesDashboard.getDashboardBlocks(undefined, siteId);
 
             return CoreBlockDelegate.hasSupportedBlock(blocks.mainBlocks) || CoreBlockDelegate.hasSupportedBlock(blocks.sideBlocks);
         }
 
-        // Check if my overview is enabled. If it's enabled we will fake enabled blocks.
-        const timelineEnabled = await AddonBlockTimeline.isAvailable();
-
-        return timelineEnabled && blocksEnabled;
+        // Dashboard is enabled but not available, we will fake blocks.
+        return dashboardEnabled && blocksEnabled;
     }
 
     /**

From 297df3874452d0edb91fd2f16205d086f64c9bcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 3 Dec 2021 11:10:44 +0100
Subject: [PATCH 0265/1008] MOBILE-3923 starredcourses: Use fallback WS if
 timemodified not present

---
 .../starredcourses/starredcourses.ts          |  58 ++++++++--
 .../starredcourses/services/starredcourses.ts | 101 ++++++++++++++++++
 src/core/features/course/services/course.ts   |   1 +
 .../courses/services/courses-helper.ts        |  10 +-
 src/core/features/courses/services/courses.ts |   1 +
 5 files changed, 160 insertions(+), 11 deletions(-)
 create mode 100644 src/addons/block/starredcourses/services/starredcourses.ts

diff --git a/src/addons/block/starredcourses/components/starredcourses/starredcourses.ts b/src/addons/block/starredcourses/components/starredcourses/starredcourses.ts
index 38fd77081..8e58120ad 100644
--- a/src/addons/block/starredcourses/components/starredcourses/starredcourses.ts
+++ b/src/addons/block/starredcourses/components/starredcourses/starredcourses.ts
@@ -16,11 +16,17 @@ import { Component, OnInit, OnDestroy, Input } from '@angular/core';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreSites } from '@services/sites';
 import { CoreCoursesProvider, CoreCoursesMyCoursesUpdatedEventData, CoreCourses } from '@features/courses/services/courses';
-import { CoreCoursesHelper, CoreEnrolledCourseDataWithOptions } from '@features/courses/services/courses-helper';
+import {
+    CoreCourseSearchedDataWithExtraInfoAndOptions,
+    CoreCoursesHelper,
+    CoreEnrolledCourseDataWithOptions,
+} from '@features/courses/services/courses-helper';
 import { CoreCourseOptionsDelegate } from '@features/course/services/course-options-delegate';
 import { AddonCourseCompletion } from '@/addons/coursecompletion/services/coursecompletion';
 import { CoreBlockBaseComponent } from '@features/block/classes/base-block-component';
 import { CoreUtils } from '@services/utils/utils';
+import { CoreSite } from '@classes/site';
+import { AddonBlockStarredCourse, AddonBlockStarredCourses } from '../../services/starredcourses';
 
 /**
  * Component to render a starred courses block.
@@ -33,11 +39,12 @@ export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent im
 
     @Input() downloadEnabled = false;
 
-    courses: CoreEnrolledCourseDataWithOptions [] = [];
+    courses: AddonBlockStarredCoursesCourse[] = [];
 
     downloadCourseEnabled = false;
     scrollElementId!: string;
 
+    protected site!: CoreSite;
     protected isDestroyed = false;
     protected coursesObserver?: CoreEventObserver;
     protected updateSiteObserver?: CoreEventObserver;
@@ -45,6 +52,8 @@ export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent im
 
     constructor() {
         super('AddonBlockStarredCoursesComponent');
+
+        this.site = CoreSites.getRequiredCurrentSite();
     }
 
     /**
@@ -94,8 +103,12 @@ export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent im
     protected async invalidateCourses(courseIds: number[]): Promise<void> {
         const promises: Promise<void>[] = [];
 
+        const invalidateCoursePromise = this.site.isVersionGreaterEqualThan('4.0')
+            ? CoreCourses.invalidateUserCourses()
+            : AddonBlockStarredCourses.invalidateStarredCourses();
+
         // Invalidate course completion data.
-        promises.push(CoreCourses.invalidateUserCourses().finally(() =>
+        promises.push(invalidateCoursePromise.finally(() =>
             CoreUtils.allPromises(courseIds.map((courseId) =>
                 AddonCourseCompletion.invalidateCourseCompletion(courseId)))));
 
@@ -118,8 +131,36 @@ export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent im
         const showCategories = this.block.configsRecord && this.block.configsRecord.displaycategories &&
             this.block.configsRecord.displaycategories.value == '1';
 
-        // @TODO: Sort won't coincide with website because timemodified is not informed.
-        this.courses = await CoreCoursesHelper.getUserCoursesWithOptions('timemodified', 0, 'isfavourite', showCategories);
+        if (this.site.isVersionGreaterEqualThan('4.0')) {
+            this.courses = await CoreCoursesHelper.getUserCoursesWithOptions('timemodified', 0, 'isfavourite', showCategories);
+
+            return;
+        }
+
+        // Timemodified not present, use the block WS to retrieve the info.
+        const starredCourses = await AddonBlockStarredCourses.getStarredCourses();
+
+        const courseIds = starredCourses.map((course) => course.id);
+
+        // Get the courses using getCoursesByField to get more info about each course.
+        const courses = await CoreCourses.getCoursesByField('ids', courseIds.join(','));
+
+        this.courses = starredCourses.map((recentCourse) => {
+            const course = courses.find((course) => recentCourse.id == course.id);
+
+            return Object.assign(recentCourse, course);
+        });
+
+        // Get course options and extra info.
+        const options = await CoreCourses.getCoursesAdminAndNavOptions(courseIds);
+        this.courses.forEach((course) => {
+            course.navOptions = options.navOptions[course.id];
+            course.admOptions = options.admOptions[course.id];
+
+            if (!showCategories) {
+                course.categoryname = '';
+            }
+        });
     }
 
     /**
@@ -155,7 +196,6 @@ export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent im
             }
 
             await this.invalidateCourses([course.id]);
-
         }
     }
 
@@ -169,3 +209,9 @@ export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent im
     }
 
 }
+
+type AddonBlockStarredCoursesCourse =
+    (AddonBlockStarredCourse & CoreCourseSearchedDataWithExtraInfoAndOptions) |
+    (CoreEnrolledCourseDataWithOptions & {
+        categoryname?: string; // Category name,
+    });
diff --git a/src/addons/block/starredcourses/services/starredcourses.ts b/src/addons/block/starredcourses/services/starredcourses.ts
new file mode 100644
index 000000000..839b05dd5
--- /dev/null
+++ b/src/addons/block/starredcourses/services/starredcourses.ts
@@ -0,0 +1,101 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { Injectable } from '@angular/core';
+import { CoreSites } from '@services/sites';
+import { CoreSiteWSPreSets } from '@classes/site';
+import { makeSingleton } from '@singletons';
+
+const ROOT_CACHE_KEY = 'AddonBlockStarredCourses:';
+
+/**
+ * Service that provides some features regarding starred courses.
+ */
+@Injectable( { providedIn: 'root' })
+export class AddonBlockStarredCoursesProvider {
+
+    /**
+     * Get cache key for get starred courrses value WS call.
+     *
+     * @return Cache key.
+     */
+    protected getStarredCoursesCacheKey(): string {
+        return ROOT_CACHE_KEY + ':starredcourses';
+    }
+
+    /**
+     * Get starred courrses.
+     *
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Promise resolved when the info is retrieved.
+     */
+    async getStarredCourses(siteId?: string): Promise<AddonBlockStarredCourse[]> {
+        const site = await CoreSites.getSite(siteId);
+
+        const preSets: CoreSiteWSPreSets = {
+            cacheKey: this.getStarredCoursesCacheKey(),
+        };
+
+        return await site.read<AddonBlockStarredCourse[]>('block_starredcourses_get_starred_courses', undefined, preSets);
+    }
+
+    /**
+     * Invalidates get starred courrses WS call.
+     *
+     * @param siteId Site ID to invalidate. If not defined, use current site.
+     * @return Promise resolved when the data is invalidated.
+     */
+    async invalidateStarredCourses(siteId?: string): Promise<void> {
+        const site = await CoreSites.getSite(siteId);
+
+        await site.invalidateWsCacheForKey(this.getStarredCoursesCacheKey());
+    }
+
+}
+export const AddonBlockStarredCourses = makeSingleton(AddonBlockStarredCoursesProvider);
+
+/**
+ * Params of block_starredcourses_get_starred_courses WS.
+ */
+export type AddonBlockStarredCoursesGetStarredCoursesWSParams = {
+    limit?: number; // Limit.
+    offset?: number; // Offset.
+};
+
+/**
+ * Data returned by block_starredcourses_get_starred_courses WS.
+ */
+export type AddonBlockStarredCourse = {
+    id: number; // Id.
+    fullname: string; // Fullname.
+    shortname: string; // Shortname.
+    idnumber: string; // Idnumber.
+    summary: string; // Summary.
+    summaryformat: number; // Summary format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
+    startdate: number; // Startdate.
+    enddate: number; // Enddate.
+    visible: boolean; // Visible.
+    showactivitydates: boolean; // Showactivitydates.
+    showcompletionconditions: boolean; // Showcompletionconditions.
+    fullnamedisplay: string; // Fullnamedisplay.
+    viewurl: string; // Viewurl.
+    courseimage: string; // Courseimage.
+    progress?: number; // Progress.
+    hasprogress: boolean; // Hasprogress.
+    isfavourite: boolean; // Isfavourite.
+    hidden: boolean; // Hidden.
+    timeaccess?: number; // Timeaccess.
+    showshortname: boolean; // Showshortname.
+    coursecategory: string; // Coursecategory.
+};
diff --git a/src/core/features/course/services/course.ts b/src/core/features/course/services/course.ts
index 81505df14..4fb140fc1 100644
--- a/src/core/features/course/services/course.ts
+++ b/src/core/features/course/services/course.ts
@@ -1299,6 +1299,7 @@ export type CoreCourseSummary = {
     coursecategory: string; // @since 3.7. Coursecategory.
     showactivitydates: boolean | null; // @since 3.11. Whether the activity dates are shown or not.
     showcompletionconditions: boolean | null; // @since 3.11. Whether the activity completion conditions are shown or not.
+    timemodified?: number; // @since 4.0. Last time course settings were updated (timestamp).
 };
 
 /**
diff --git a/src/core/features/courses/services/courses-helper.ts b/src/core/features/courses/services/courses-helper.ts
index df8e4e92c..62f98ed70 100644
--- a/src/core/features/courses/services/courses-helper.ts
+++ b/src/core/features/courses/services/courses-helper.ts
@@ -236,7 +236,7 @@ export class CoreCoursesHelperProvider {
                 courses = courses.filter((course) => !!course.isfavourite);
                 break;
             default:
-            // Filter not implemented.
+                // Filter not implemented.
         }
 
         switch (sort) {
@@ -251,10 +251,10 @@ export class CoreCoursesHelperProvider {
             case 'lastaccess':
                 courses.sort((a, b) => (b.lastaccess || 0) - (a.lastaccess || 0));
                 break;
-            // @todo Time modified property is not defined in CoreEnrolledCourseDataWithOptions, so it Won't do anything.
-            // case 'timemodified':
-            //    courses.sort((a, b) => b.timemodified - a.timemodified);
-            //    break;
+            // Time modified property is defined on Moodle 4.0.
+            case 'timemodified':
+                courses.sort((a, b) => (b.timemodified || 0) - (a.timemodified || 0));
+                break;
             case 'shortname':
                 courses.sort((a, b) => {
                     const compareA = a.shortname.toLowerCase();
diff --git a/src/core/features/courses/services/courses.ts b/src/core/features/courses/services/courses.ts
index c28874747..002d3fc28 100644
--- a/src/core/features/courses/services/courses.ts
+++ b/src/core/features/courses/services/courses.ts
@@ -1328,6 +1328,7 @@ export type CoreEnrolledCourseData = CoreEnrolledCourseBasicData & {
     overviewfiles?: CoreWSExternalFile[];
     showactivitydates?: boolean; // @since 3.11. Whether the activity dates are shown or not.
     showcompletionconditions?: boolean; // @since 3.11. Whether the activity completion conditions are shown or not.
+    timemodified?: number; // @since 4.0. Last time course settings were updated (timestamp).
 };
 
 /**

From 53ce905a9c8cc8abcb0f5b8e5724269afbc14381 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 3 Dec 2021 15:53:50 +0100
Subject: [PATCH 0266/1008] MOBILE-3900 myoverview: Honour course graces
 periods

---
 .../components/myoverview/myoverview.ts       | 31 +++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/addons/block/myoverview/components/myoverview/myoverview.ts b/src/addons/block/myoverview/components/myoverview/myoverview.ts
index d99e22201..fa7e2f7fa 100644
--- a/src/addons/block/myoverview/components/myoverview/myoverview.ts
+++ b/src/addons/block/myoverview/components/myoverview/myoverview.ts
@@ -29,6 +29,7 @@ import { CoreTextUtils } from '@services/utils/text';
 import { AddonCourseCompletion } from '@/addons/coursecompletion/services/coursecompletion';
 import { AddonBlockMyOverviewFilterOptionsComponent } from '../filteroptions/filteroptions';
 import { IonSearchbar } from '@ionic/angular';
+import moment from 'moment';
 
 const FILTER_PRIORITY: AddonBlockMyOverviewTimeFilters[] = ['all', 'inprogress', 'future', 'past'];
 
@@ -98,6 +99,8 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
     protected coursesObserver?: CoreEventObserver;
     protected updateSiteObserver?: CoreEventObserver;
     protected fetchContentDefaultError = 'Error getting my overview data.';
+    protected gradePeriodAfter = 0;
+    protected gradePeriodBefore = 0;
 
     constructor() {
         super('AddonBlockMyOverviewComponent');
@@ -261,6 +264,9 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
 
         this.hasCourses = this.allCourses.length > 0;
 
+        this.gradePeriodAfter = parseInt(await this.currentSite.getConfig('coursegraceperiodafter', refresh), 10) || 0;
+        this.gradePeriodBefore = parseInt(await this.currentSite.getConfig('coursegraceperiodbefore', refresh), 10) || 0;
+
         this.loadSort();
         this.loadLayouts(config?.layouts?.value.split(','));
         this.loadFilters(config);
@@ -507,14 +513,15 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
 
         // Time filter, favourite and hidden.
         const today = CoreTimeUtils.timestamp();
+
         this.filteredCourses = this.filteredCourses.filter((course) => {
             let include = timeFilter == 'all';
 
             if (!include) {
-                if ((course.enddate && course.enddate < today) || course.completed) {
+                if ((course.enddate && this.courseClassifyEndDate(course.enddate) < today) || course.completed) {
                     // Courses that have already ended.
                     include = timeFilter == 'past';
-                } else if (course.startdate && course.startdate > today) {
+                } else if (course.startdate && this.courseClassifyStartDate(course.startdate) > today) {
                     // Courses that have not started yet.
                     include = timeFilter == 'future';
                 } else {
@@ -554,6 +561,26 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
         this.initPrefetchCoursesIcons();
     }
 
+    /**
+     * This function calculates the end date to use for display classification purposes, incorporating the grace period, if any.
+     *
+     * @param endDate Course end date.
+     * @return The new enddate.
+     */
+    protected courseClassifyEndDate(endDate: number): number {
+        return moment(endDate).add(this.gradePeriodAfter, 'days').valueOf();
+    }
+
+    /**
+     * This function calculates the start date to use for display classification purposes, incorporating the grace period, if any.
+     *
+     * @param startDate Course start date.
+     * @return The new startdate.
+     */
+    protected courseClassifyStartDate(startDate: number): number {
+        return moment(startDate).subtract(this.gradePeriodBefore, 'days').valueOf();
+    }
+
     /**
      * Sort courses
      *

From bb2361458afc642bce9ae4d2dc9e1a5a1ffe2fca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 9 Dec 2021 12:28:44 +0100
Subject: [PATCH 0267/1008] MOBILE-3833 core: Fix collapsible header when
 animating

---
 src/core/directives/collapsible-header.ts | 24 ++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts
index 626a5e7b6..656d5d15e 100644
--- a/src/core/directives/collapsible-header.ts
+++ b/src/core/directives/collapsible-header.ts
@@ -106,6 +106,12 @@ export class CoreCollapsibleHeaderDirective implements OnDestroy {
             return;
         }
 
+        // Wait animations to finish.
+        const animations = this.content.getAnimations();
+        await Promise.all(animations.map(async (animation) => {
+            await animation.finished;
+        }));
+
         const title = this.content.querySelector<HTMLElement>('.collapsible-title, h1');
         const contentH1 = this.content.querySelector<HTMLElement>('h1');
         const headerH1 = this.header.querySelector<HTMLElement>('h1');
@@ -133,11 +139,17 @@ export class CoreCollapsibleHeaderDirective implements OnDestroy {
         const contentH1Styles = getComputedStyle(contentH1);
 
         if (Platform.isRTL) {
-            this.h1StartDifference = contentH1.getBoundingClientRect().right -
-                (headerH1.getBoundingClientRect().right - parseFloat(headerH1Styles.paddingRight));
+            // Checking position over parent because transition may not be finished.
+            const contentH1Position = contentH1.getBoundingClientRect().right - this.content.getBoundingClientRect().right;
+            const headerH1Position = headerH1.getBoundingClientRect().right - this.header.getBoundingClientRect().right;
+
+            this.h1StartDifference = Math.round(contentH1Position - (headerH1Position - parseFloat(headerH1Styles.paddingRight)));
         } else {
-            this.h1StartDifference = contentH1.getBoundingClientRect().left -
-                (headerH1.getBoundingClientRect().left + parseFloat(headerH1Styles.paddingLeft));
+            // Checking position over parent because transition may not be finished.
+            const contentH1Position = contentH1.getBoundingClientRect().left - this.content.getBoundingClientRect().left;
+            const headerH1Position = headerH1.getBoundingClientRect().left - this.header.getBoundingClientRect().left;
+
+            this.h1StartDifference = Math.round(contentH1Position - (headerH1Position + parseFloat(headerH1Styles.paddingLeft)));
         }
 
         this.headerH1FontSize = parseFloat(headerH1Styles.fontSize);
@@ -145,7 +157,9 @@ export class CoreCollapsibleHeaderDirective implements OnDestroy {
 
         // Transfer font styles.
         Array.from(headerH1Styles).forEach((styleName) => {
-            if (styleName != 'font-size' && (styleName.startsWith('font-') || styleName.startsWith('letter-'))) {
+            if (styleName != 'font-size' &&
+                styleName != 'font-family' &&
+                (styleName.startsWith('font-') || styleName.startsWith('letter-'))) {
                 contentH1.style.setProperty(styleName, headerH1Styles.getPropertyValue(styleName));
             }
         });

From c666d3f36b69ebccda371c57ae4c56c45f0a448c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 9 Dec 2021 12:29:01 +0100
Subject: [PATCH 0268/1008] MOBILE-3833 core: Fix movement of the navigation
 bar

---
 .../pages/discussion/discussion.page.ts       |  2 +-
 .../module-navigation/module-navigation.ts    | 42 ++++++++++++-------
 src/theme/theme.base.scss                     | 10 ++---
 3 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/src/addons/messages/pages/discussion/discussion.page.ts b/src/addons/messages/pages/discussion/discussion.page.ts
index bdff8c4f9..ca9028029 100644
--- a/src/addons/messages/pages/discussion/discussion.page.ts
+++ b/src/addons/messages/pages/discussion/discussion.page.ts
@@ -495,7 +495,7 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView
     /**
      * Set the new message badge number and set scroll listener if needed.
      *
-     * @param addMessages NUmber of messages still to be read.
+     * @param addMessages Number of messages still to be read.
      */
     protected setNewMessagesBadge(addMessages: number): void {
         if (this.newMessages == 0 && addMessages > 0) {
diff --git a/src/core/features/course/components/module-navigation/module-navigation.ts b/src/core/features/course/components/module-navigation/module-navigation.ts
index dfb9602a4..c6cc18ae9 100644
--- a/src/core/features/course/components/module-navigation/module-navigation.ts
+++ b/src/core/features/course/components/module-navigation/module-navigation.ts
@@ -23,6 +23,7 @@ import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
+import { CoreMath } from '@singletons/math';
 
 /**
  * Component to show a button to go to the next resource/activity.
@@ -50,6 +51,8 @@ export class CoreCourseModuleNavigationComponent implements OnInit, OnDestroy {
     protected initialHeight = 0;
     protected initialPaddingBottom = 0;
     protected previousTop = 0;
+    protected previousHeight = 0;
+    protected stickTimeout?: number;
     protected content?: HTMLIonContentElement | null;
     protected completionObserver: CoreEventObserver;
 
@@ -102,6 +105,7 @@ export class CoreCourseModuleNavigationComponent implements OnInit, OnDestroy {
         }
         // Set a minimum height value.
         this.initialHeight = this.initialHeight || 56;
+        this.previousHeight = this.initialHeight;
 
         this.content = this.element.closest('ion-content');
 
@@ -118,6 +122,8 @@ export class CoreCourseModuleNavigationComponent implements OnInit, OnDestroy {
             return;
         }
 
+        this.content.classList.add('has-core-course-module-navigation');
+
         // Move element to the nearest ion-content if it's not the parent.
         if (this.element.parentElement?.nodeName != 'ION-CONTENT') {
             this.content.appendChild(this.element);
@@ -135,7 +141,7 @@ export class CoreCourseModuleNavigationComponent implements OnInit, OnDestroy {
                 return;
             }
 
-            this.onScroll(e.detail.scrollTop, scroll.scrollHeight - scroll.offsetHeight);
+            this.onScroll(e.detail, scroll);
         });
 
     }
@@ -304,19 +310,21 @@ export class CoreCourseModuleNavigationComponent implements OnInit, OnDestroy {
     /**
      * On scroll function.
      *
-     * @param top Scroll top measure.
-     * @param maxScroll Scroll height.
+     * @param scrollDetail Scroll detail object.
+     * @param scrollElement Scroll element to calculate maxScroll.
      */
-    protected onScroll(top: number, maxScroll: number): void {
-        if (top == 0 || top == maxScroll) {
+    protected onScroll(scrollDetail: ScrollDetail, scrollElement: HTMLElement): void {
+        const maxScroll = scrollElement.scrollHeight - scrollElement.offsetHeight;
+        if (scrollDetail.scrollTop <= 0 || scrollDetail.scrollTop >= maxScroll) {
             // Reset.
             this.setBarHeight(this.initialHeight);
         } else {
-            const diffHeight = this.element.clientHeight - (top - this.previousTop);
-            this.setBarHeight(diffHeight);
-        }
+            let newHeight = this.previousHeight - (scrollDetail.scrollTop - this.previousTop);
+            newHeight = CoreMath.clamp(newHeight, 0, this.initialHeight);
 
-        this.previousTop = top;
+            this.setBarHeight(newHeight);
+        }
+        this.previousTop = scrollDetail.scrollTop;
     }
 
     /**
@@ -325,14 +333,20 @@ export class CoreCourseModuleNavigationComponent implements OnInit, OnDestroy {
      * @param height The new bar height.
      */
     protected setBarHeight(height: number): void {
-        if (height <= 0) {
-            height = 0;
-        } else if (height > this.initialHeight) {
-            height = this.initialHeight;
+        if (this.stickTimeout) {
+            clearTimeout(this.stickTimeout);
         }
 
-        this.element.style.opacity = height == 0 ? '0' : '1';
+        this.element.style.opacity = height <= 0 ? '0' : '1';
         this.content?.style.setProperty('--core-course-module-navigation-height', height + 'px');
+        this.previousHeight = height;
+
+        if (height > 0 && height < this.initialHeight) {
+            // Finish opening or closing the bar.
+            const newHeight = height < this.initialHeight / 2 ? 0 : this.initialHeight;
+
+            this.stickTimeout = window.setTimeout(() => this.setBarHeight(newHeight), 500);
+        }
     }
 
 }
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 51f3cb7f2..d13635f92 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -459,7 +459,7 @@ body.core-iframe-fullscreen ion-router-outlet {
             @supports (padding-left: constant(safe-area-inset-left)) {
                 --ion-safe-area-left: constant(safe-area-inset-left);
             }
-            
+
             @supports (padding-left: env(safe-area-inset-left)) {
                 --ion-safe-area-left: env(safe-area-inset-left);
             }
@@ -539,7 +539,7 @@ body.core-iframe-fullscreen ion-router-outlet {
         .core-modal-lateral-#{$breakpoint} {
             --ion-safe-area-left: 0px;
             --ion-safe-area-right: 0px;
-    
+
             .modal-wrapper {
                 position: absolute;
                 @include position(0 !important, 0 !important, 0 !important, unset !important);
@@ -554,7 +554,7 @@ body.core-iframe-fullscreen ion-router-outlet {
             }
         }
     }
-    
+
 }
 
 // Hidden submit button.
@@ -911,9 +911,9 @@ ion-fab[core-fab] {
     ion-fab-button::part(close-icon) {
         display: none;
     }
-} 
+}
 
-core-course-module-navigation + ion-fab {
+ion-content.has-core-course-module-navigation ion-fab {
     bottom: calc(var(--core-course-module-navigation-height, 0px) + 10px);
     @include core-transition(all, 200ms);
 }

From fd4271997c8fdda99321b1602a67d61024386fdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 9 Dec 2021 16:48:57 +0100
Subject: [PATCH 0269/1008] MOBILE-3833 swipe: Fix page width on swipe pages

---
 src/core/components/swipe-navigation/swipe-navigation.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/core/components/swipe-navigation/swipe-navigation.scss b/src/core/components/swipe-navigation/swipe-navigation.scss
index 05c7d60e5..046438a5a 100644
--- a/src/core/components/swipe-navigation/swipe-navigation.scss
+++ b/src/core/components/swipe-navigation/swipe-navigation.scss
@@ -9,6 +9,7 @@ ion-slide {
 ::ng-deep {
 
     core-loading .core-loading-content {
+        display: block;
         width: 100%;
     }
 

From ae21dab1f4c2d60158e6a9913b5dd39665d3772d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 9 Dec 2021 16:50:57 +0100
Subject: [PATCH 0270/1008] MOBILE-3833 npm: Upgrade packages

---
 package-lock.json | 109 ++++++++++++++++++++++++----------------------
 package.json      |   4 +-
 2 files changed, 59 insertions(+), 54 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ea2219902..db53b00b6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -42,7 +42,7 @@
         "@ionic-native/status-bar": "^5.33.0",
         "@ionic-native/web-intent": "^5.33.0",
         "@ionic-native/zip": "^5.33.0",
-        "@ionic/angular": "^5.6.6",
+        "@ionic/angular": "^5.9.2",
         "@moodlehq/cordova-plugin-file-transfer": "1.7.1-moodle.2",
         "@moodlehq/cordova-plugin-inappbrowser": "5.0.0-moodle.3",
         "@moodlehq/cordova-plugin-ionic-webview": "5.0.0-moodle.1",
@@ -3695,11 +3695,11 @@
       "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
     },
     "node_modules/@ionic/angular": {
-      "version": "5.6.6",
-      "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-5.6.6.tgz",
-      "integrity": "sha512-0psh2n4Y/3sx0e2Yj4WmNcukz0nrETEiJE6Fl4CldoB8QHZcXGi0hKrPAcbGSAF0+lAJ58+Z5Gp/HQVm/MQOMA==",
+      "version": "5.9.2",
+      "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-5.9.2.tgz",
+      "integrity": "sha512-5GzKg+l4au3xFECky2v/USlRsmTAXgvNO5Zalt7NUXc//VJIL2lQvswojE6FBWuM/xR5W0CWbJdFth19TaZWVQ==",
       "dependencies": {
-        "@ionic/core": "5.6.6",
+        "@ionic/core": "5.9.2",
         "tslib": "^1.9.3"
       },
       "peerDependencies": {
@@ -4197,20 +4197,15 @@
       }
     },
     "node_modules/@ionic/core": {
-      "version": "5.6.6",
-      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.6.6.tgz",
-      "integrity": "sha512-EbVIXOTVVPxBo7hsarBpRSFNsQ22wBFtWkKmrmliieknG5LUkf5WZBpj4EENQhzYA6c+//7/nfhcD9pWgtAofA==",
+      "version": "5.9.2",
+      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.9.2.tgz",
+      "integrity": "sha512-1ZqSBS8R6tGQsc+LsLxIRv0q3Ww6jwgJXLvdn6FmVWfpPbBvT+CjCuU9hqJ5qwM+atErblUMYSexvvpws8lGAA==",
       "dependencies": {
         "@stencil/core": "^2.4.0",
-        "ionicons": "^5.5.1",
+        "ionicons": "^5.5.3",
         "tslib": "^2.1.0"
       }
     },
-    "node_modules/@ionic/core/node_modules/tslib": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz",
-      "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w=="
-    },
     "node_modules/@ionic/utils-array": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-2.1.5.tgz",
@@ -5129,7 +5124,6 @@
       "version": "5.0.0-moodle.3",
       "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-inappbrowser/-/cordova-plugin-inappbrowser-5.0.0-moodle.3.tgz",
       "integrity": "sha512-BDW53W8BzHIJY6lqV3IyYIO9Rh3qi/nA3qkwZjvJiw7iohlQMeR67LV+bXjM4I8N1PTGoBSXiS5BmaS9NFi/1A==",
-      "dev": true,
       "engines": {
         "cordovaDependencies": {
           "0.2.3": {
@@ -5657,9 +5651,9 @@
       }
     },
     "node_modules/@stencil/core": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.5.2.tgz",
-      "integrity": "sha512-bgjPXkSzzg1WnTgVUm6m5ZzpKt602WmA/QljODAW1xVN40OHJdbGblzF/F6MFzqv2c5Cy30CB41arc8qADIdcQ==",
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.11.0.tgz",
+      "integrity": "sha512-/IubCWhVXCguyMUp/3zGrg3c882+RJNg/zpiKfyfJL3kRCOwe+/MD8OoAXVGdd+xAohZKIi1Ik+EHFlsptsjLg==",
       "bin": {
         "stencil": "bin/stencil"
       },
@@ -17077,11 +17071,23 @@
       }
     },
     "node_modules/ionicons": {
-      "version": "5.5.1",
-      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.1.tgz",
-      "integrity": "sha512-1auVisfaXmkmxINer8Q3kJGHP1vSxk86hf7By95eJ+Av9+oBcNuAEBfSe3jaMaGRVxVw8U/2j23MFq7R3c0HPg==",
+      "version": "5.5.4",
+      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.4.tgz",
+      "integrity": "sha512-3ph8X9my3inhabWEZ7N0XRA0MnnNQ1v9a602mLNgWsIXnxE9G5BybIZ/pws/OZZ/hoNlvSjk801N03yL9/FNgQ==",
       "dependencies": {
-        "@stencil/core": "^2.5.0"
+        "@stencil/core": "~2.10.0"
+      }
+    },
+    "node_modules/ionicons/node_modules/@stencil/core": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.10.0.tgz",
+      "integrity": "sha512-15rWMTPQ/sp0lSV82HVCXkIya3QLN+uBl7pqK4JnTrp4HiLrzLmNbWjbvgCs55gw0lULbCIGbRIEsFz+Pe/Q+A==",
+      "bin": {
+        "stencil": "bin/stencil"
+      },
+      "engines": {
+        "node": ">=12.10.0",
+        "npm": ">=6.0.0"
       }
     },
     "node_modules/ios-sim": {
@@ -28592,9 +28598,9 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz",
-      "integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ=="
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+      "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
     },
     "node_modules/tsutils": {
       "version": "3.17.1",
@@ -34108,11 +34114,11 @@
       }
     },
     "@ionic/angular": {
-      "version": "5.6.6",
-      "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-5.6.6.tgz",
-      "integrity": "sha512-0psh2n4Y/3sx0e2Yj4WmNcukz0nrETEiJE6Fl4CldoB8QHZcXGi0hKrPAcbGSAF0+lAJ58+Z5Gp/HQVm/MQOMA==",
+      "version": "5.9.2",
+      "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-5.9.2.tgz",
+      "integrity": "sha512-5GzKg+l4au3xFECky2v/USlRsmTAXgvNO5Zalt7NUXc//VJIL2lQvswojE6FBWuM/xR5W0CWbJdFth19TaZWVQ==",
       "requires": {
-        "@ionic/core": "5.6.6",
+        "@ionic/core": "5.9.2",
         "tslib": "^1.9.3"
       },
       "dependencies": {
@@ -34475,20 +34481,13 @@
       }
     },
     "@ionic/core": {
-      "version": "5.6.6",
-      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.6.6.tgz",
-      "integrity": "sha512-EbVIXOTVVPxBo7hsarBpRSFNsQ22wBFtWkKmrmliieknG5LUkf5WZBpj4EENQhzYA6c+//7/nfhcD9pWgtAofA==",
+      "version": "5.9.2",
+      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.9.2.tgz",
+      "integrity": "sha512-1ZqSBS8R6tGQsc+LsLxIRv0q3Ww6jwgJXLvdn6FmVWfpPbBvT+CjCuU9hqJ5qwM+atErblUMYSexvvpws8lGAA==",
       "requires": {
         "@stencil/core": "^2.4.0",
-        "ionicons": "^5.5.1",
+        "ionicons": "^5.5.3",
         "tslib": "^2.1.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz",
-          "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w=="
-        }
       }
     },
     "@ionic/utils-array": {
@@ -35199,8 +35198,7 @@
     "@moodlehq/cordova-plugin-inappbrowser": {
       "version": "5.0.0-moodle.3",
       "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-inappbrowser/-/cordova-plugin-inappbrowser-5.0.0-moodle.3.tgz",
-      "integrity": "sha512-BDW53W8BzHIJY6lqV3IyYIO9Rh3qi/nA3qkwZjvJiw7iohlQMeR67LV+bXjM4I8N1PTGoBSXiS5BmaS9NFi/1A==",
-      "dev": true
+      "integrity": "sha512-BDW53W8BzHIJY6lqV3IyYIO9Rh3qi/nA3qkwZjvJiw7iohlQMeR67LV+bXjM4I8N1PTGoBSXiS5BmaS9NFi/1A=="
     },
     "@moodlehq/cordova-plugin-ionic-webview": {
       "version": "5.0.0-moodle.1",
@@ -35562,9 +35560,9 @@
       }
     },
     "@stencil/core": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.5.2.tgz",
-      "integrity": "sha512-bgjPXkSzzg1WnTgVUm6m5ZzpKt602WmA/QljODAW1xVN40OHJdbGblzF/F6MFzqv2c5Cy30CB41arc8qADIdcQ=="
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.11.0.tgz",
+      "integrity": "sha512-/IubCWhVXCguyMUp/3zGrg3c882+RJNg/zpiKfyfJL3kRCOwe+/MD8OoAXVGdd+xAohZKIi1Ik+EHFlsptsjLg=="
     },
     "@szmarczak/http-timer": {
       "version": "1.1.2",
@@ -44594,11 +44592,18 @@
       "dev": true
     },
     "ionicons": {
-      "version": "5.5.1",
-      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.1.tgz",
-      "integrity": "sha512-1auVisfaXmkmxINer8Q3kJGHP1vSxk86hf7By95eJ+Av9+oBcNuAEBfSe3jaMaGRVxVw8U/2j23MFq7R3c0HPg==",
+      "version": "5.5.4",
+      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.4.tgz",
+      "integrity": "sha512-3ph8X9my3inhabWEZ7N0XRA0MnnNQ1v9a602mLNgWsIXnxE9G5BybIZ/pws/OZZ/hoNlvSjk801N03yL9/FNgQ==",
       "requires": {
-        "@stencil/core": "^2.5.0"
+        "@stencil/core": "~2.10.0"
+      },
+      "dependencies": {
+        "@stencil/core": {
+          "version": "2.10.0",
+          "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.10.0.tgz",
+          "integrity": "sha512-15rWMTPQ/sp0lSV82HVCXkIya3QLN+uBl7pqK4JnTrp4HiLrzLmNbWjbvgCs55gw0lULbCIGbRIEsFz+Pe/Q+A=="
+        }
       }
     },
     "ios-sim": {
@@ -53782,9 +53787,9 @@
       }
     },
     "tslib": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz",
-      "integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ=="
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+      "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
     },
     "tsutils": {
       "version": "3.17.1",
diff --git a/package.json b/package.json
index 6a006d22f..b093c50ae 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
     "@ionic-native/status-bar": "^5.33.0",
     "@ionic-native/web-intent": "^5.33.0",
     "@ionic-native/zip": "^5.33.0",
-    "@ionic/angular": "^5.6.6",
+    "@ionic/angular": "^5.9.2",
     "@moodlehq/cordova-plugin-file-transfer": "1.7.1-moodle.2",
     "@moodlehq/cordova-plugin-inappbrowser": "5.0.0-moodle.3",
     "@moodlehq/cordova-plugin-ionic-webview": "5.0.0-moodle.1",
@@ -124,7 +124,7 @@
     "nl.kingsquare.cordova.background-audio": "^1.0.1",
     "rxjs": "~6.5.5",
     "ts-md5": "^1.2.7",
-    "tslib": "^2.0.1",
+    "tslib": "^2.3.1",
     "zone.js": "~0.10.3"
   },
   "devDependencies": {

From 0360240916802ff170ee2865b369ce57a2044d5c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 10 Dec 2021 14:52:40 +0100
Subject: [PATCH 0271/1008] MOBILE-3833 core: Increase wsrequestqueuedelay to
 100

---
 moodle.config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/moodle.config.json b/moodle.config.json
index 7896c81ce..fceb21ac4 100644
--- a/moodle.config.json
+++ b/moodle.config.json
@@ -99,5 +99,5 @@
         "ios": "id633359593"
     },
     "wsrequestqueuelimit": 10,
-    "wsrequestqueuedelay": 50
+    "wsrequestqueuedelay": 100
 }

From d8d6936183ceda5c0c2a92578d4aba54189ccbe7 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 13 Dec 2021 11:26:17 +0100
Subject: [PATCH 0272/1008] MOBILE-3833 core: Change version number to 4.0

---
 config.xml         | 2 +-
 moodle.config.json | 4 ++--
 package-lock.json  | 4 ++--
 package.json       | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config.xml b/config.xml
index 8e1d8d1ce..af78de0e8 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="39600" id="com.moodle.moodlemobile" ios-CFBundleVersion="3.9.6.0" version="3.9.6-dev" versionCode="39600" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-versionCode="40000" id="com.moodle.moodlemobile" ios-CFBundleVersion="4.0.0.0" version="4.0.0-dev" versionCode="40000" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>Moodle</name>
     <description>Moodle official app</description>
     <author email="mobile@moodle.com" href="http://moodle.com">Moodle Mobile team</author>
diff --git a/moodle.config.json b/moodle.config.json
index fceb21ac4..feafc94b6 100644
--- a/moodle.config.json
+++ b/moodle.config.json
@@ -1,8 +1,8 @@
 {
     "app_id": "com.moodle.moodlemobile",
     "appname": "Moodle Mobile",
-    "versioncode": 3960,
-    "versionname": "3.9.6-dev",
+    "versioncode": 4000,
+    "versionname": "4.0.0-dev",
     "cache_update_frequency_usually": 420000,
     "cache_update_frequency_often": 1200000,
     "cache_update_frequency_sometimes": 3600000,
diff --git a/package-lock.json b/package-lock.json
index db53b00b6..c8e706569 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "moodlemobile",
-  "version": "3.9.6-dev",
+  "version": "4.0.0-dev",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "moodlemobile",
-      "version": "3.9.6-dev",
+      "version": "4.0.0-dev",
       "license": "Apache-2.0",
       "dependencies": {
         "@angular/animations": "~10.0.14",
diff --git a/package.json b/package.json
index b093c50ae..75ccf9301 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "moodlemobile",
-  "version": "3.9.6-dev",
+  "version": "4.0.0-dev",
   "description": "The official app for Moodle.",
   "author": {
     "name": "Moodle Pty Ltd.",

From aebbfbe6c7dd66781844517940aa5d7f5bc73e32 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 13 Dec 2021 11:21:18 +0100
Subject: [PATCH 0273/1008] MOBILE-3833 core: Export config in dev version

---
 src/core/initializers/export-data.ts | 33 ++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 src/core/initializers/export-data.ts

diff --git a/src/core/initializers/export-data.ts b/src/core/initializers/export-data.ts
new file mode 100644
index 000000000..1abdb4239
--- /dev/null
+++ b/src/core/initializers/export-data.ts
@@ -0,0 +1,33 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { EnvironmentConfig } from '@/types/config';
+import { CoreConstants } from '../constants';
+
+type DevelopmentWindow = Window & {
+    coreConstantsConfig?: EnvironmentConfig;
+};
+
+function exportData(window: DevelopmentWindow) {
+    window.coreConstantsConfig = CoreConstants.CONFIG;
+}
+
+export default function(): void {
+    if (!CoreConstants.CONFIG.versionname.includes('-dev')) {
+        // Only export data in development.
+        return;
+    }
+
+    exportData(window);
+}

From 871e81774bb53b7012ceb22ed112cd223441cedf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 13 Dec 2021 12:18:38 +0100
Subject: [PATCH 0274/1008] MOBILE-3833 dashboard: Fix WS exceptions on
 get_recent_courses and grace

---
 .../block/myoverview/components/myoverview/myoverview.ts | 9 +++++++--
 .../recentlyaccessedcourses/recentlyaccessedcourses.ts   | 8 +++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/addons/block/myoverview/components/myoverview/myoverview.ts b/src/addons/block/myoverview/components/myoverview/myoverview.ts
index fa7e2f7fa..4d3a0bc78 100644
--- a/src/addons/block/myoverview/components/myoverview/myoverview.ts
+++ b/src/addons/block/myoverview/components/myoverview/myoverview.ts
@@ -264,8 +264,13 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
 
         this.hasCourses = this.allCourses.length > 0;
 
-        this.gradePeriodAfter = parseInt(await this.currentSite.getConfig('coursegraceperiodafter', refresh), 10) || 0;
-        this.gradePeriodBefore = parseInt(await this.currentSite.getConfig('coursegraceperiodbefore', refresh), 10) || 0;
+        try {
+            this.gradePeriodAfter = parseInt(await this.currentSite.getConfig('coursegraceperiodafter', refresh), 10);
+            this.gradePeriodBefore = parseInt(await this.currentSite.getConfig('coursegraceperiodbefore', refresh), 10);
+        } catch {
+            this.gradePeriodAfter = 0;
+            this.gradePeriodBefore = 0;
+        }
 
         this.loadSort();
         this.loadLayouts(config?.layouts?.value.split(','));
diff --git a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
index 6bbad0d5d..9eaa906e6 100644
--- a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
+++ b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
@@ -135,14 +135,16 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
         const showCategories = this.block.configsRecord && this.block.configsRecord.displaycategories &&
             this.block.configsRecord.displaycategories.value == '1';
 
-        // WS is failing on 3.7 and 3.6, use a fallback.
-        if (!this.site.isVersionGreaterEqualThan('3.8')) {
+        let recentCourses: CoreCourseSummaryData[] = [];
+        try {
+            recentCourses = await CoreCourses.getRecentCourses();
+        } catch {
+            // WS is failing on 3.7 and bellow, use a fallback.
             this.courses = await CoreCoursesHelper.getUserCoursesWithOptions('lastaccess', 10, undefined, showCategories);
 
             return;
         }
 
-        const recentCourses = await CoreCourses.getRecentCourses();
         const courseIds = recentCourses.map((course) => course.id);
 
         // Get the courses using getCoursesByField to get more info about each course.

From 007fbe0ab2dd68984c689359e4393258cd00c347 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 13 Dec 2021 15:07:01 +0100
Subject: [PATCH 0275/1008] MOBILE-3946 completion: Fix bug detecting automatic
 completion

---
 src/addons/mod/h5pactivity/components/index/index.ts        | 4 ++--
 src/core/features/course/classes/main-activity-component.ts | 6 +-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/addons/mod/h5pactivity/components/index/index.ts b/src/addons/mod/h5pactivity/components/index/index.ts
index 762c6fefe..0f8e18d6f 100644
--- a/src/addons/mod/h5pactivity/components/index/index.ts
+++ b/src/addons/mod/h5pactivity/components/index/index.ts
@@ -362,11 +362,11 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
     /**
      * Play the package.
      */
-    play(): void {
+    async play(): Promise<void> {
         this.playing = true;
 
         // Mark the activity as viewed.
-        AddonModH5PActivity.logView(this.h5pActivity!.id, this.h5pActivity!.name, this.siteId);
+        await AddonModH5PActivity.logView(this.h5pActivity!.id, this.h5pActivity!.name, this.siteId);
 
         CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
     }
diff --git a/src/core/features/course/classes/main-activity-component.ts b/src/core/features/course/classes/main-activity-component.ts
index fa0d93546..3288f7d65 100644
--- a/src/core/features/course/classes/main-activity-component.ts
+++ b/src/core/features/course/classes/main-activity-component.ts
@@ -203,11 +203,7 @@ export class CoreCourseModuleMainActivityComponent extends CoreCourseModuleMainR
 
         try {
             if (refresh && this.showCompletion) {
-                try {
-                    this.module = await CoreCourse.getModule(this.module.id, this.courseId);
-                } catch {
-                    // Ignore errors.
-                }
+                await CoreUtils.ignoreErrors(this.fetchModule());
             }
 
             await this.fetchContent(refresh, sync, showErrors);

From 322285e9ff8fc6f5e3bbbd27fd3ee11d373a56a5 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 29 Sep 2021 07:55:34 +0200
Subject: [PATCH 0276/1008] MOBILE-3873 bbb: Initial implementation of BBB

---
 .../bigbluebuttonbn-lazy.module.ts            |  38 ++
 .../bigbluebuttonbn/bigbluebuttonbn.module.ts |  54 +++
 .../components/components.module.ts           |  34 ++
 .../components/index/index.html               |  40 ++
 .../bigbluebuttonbn/components/index/index.ts |  63 ++++
 src/addons/mod/bigbluebuttonbn/lang.json      |   3 +
 .../bigbluebuttonbn/pages/index/index.html    |  21 ++
 .../mod/bigbluebuttonbn/pages/index/index.ts  |  30 ++
 .../services/bigbluebuttonbn.ts               | 351 ++++++++++++++++++
 .../services/handlers/index-link.ts           |  33 ++
 .../services/handlers/list-link.ts            |  33 ++
 .../services/handlers/module.ts               |  79 ++++
 src/addons/mod/mod.module.ts                  |   2 +
 13 files changed, 781 insertions(+)
 create mode 100644 src/addons/mod/bigbluebuttonbn/bigbluebuttonbn-lazy.module.ts
 create mode 100644 src/addons/mod/bigbluebuttonbn/bigbluebuttonbn.module.ts
 create mode 100644 src/addons/mod/bigbluebuttonbn/components/components.module.ts
 create mode 100644 src/addons/mod/bigbluebuttonbn/components/index/index.html
 create mode 100644 src/addons/mod/bigbluebuttonbn/components/index/index.ts
 create mode 100644 src/addons/mod/bigbluebuttonbn/lang.json
 create mode 100644 src/addons/mod/bigbluebuttonbn/pages/index/index.html
 create mode 100644 src/addons/mod/bigbluebuttonbn/pages/index/index.ts
 create mode 100644 src/addons/mod/bigbluebuttonbn/services/bigbluebuttonbn.ts
 create mode 100644 src/addons/mod/bigbluebuttonbn/services/handlers/index-link.ts
 create mode 100644 src/addons/mod/bigbluebuttonbn/services/handlers/list-link.ts
 create mode 100644 src/addons/mod/bigbluebuttonbn/services/handlers/module.ts

diff --git a/src/addons/mod/bigbluebuttonbn/bigbluebuttonbn-lazy.module.ts b/src/addons/mod/bigbluebuttonbn/bigbluebuttonbn-lazy.module.ts
new file mode 100644
index 000000000..e2152edb4
--- /dev/null
+++ b/src/addons/mod/bigbluebuttonbn/bigbluebuttonbn-lazy.module.ts
@@ -0,0 +1,38 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { RouterModule, Routes } from '@angular/router';
+import { CoreSharedModule } from '@/core/shared.module';
+import { AddonModBBBComponentsModule } from './components/components.module';
+import { AddonModBBBIndexPage } from './pages/index/index';
+
+const routes: Routes = [
+    {
+        path: ':courseId/:cmId',
+        component: AddonModBBBIndexPage,
+    },
+];
+
+@NgModule({
+    imports: [
+        RouterModule.forChild(routes),
+        CoreSharedModule,
+        AddonModBBBComponentsModule,
+    ],
+    declarations: [
+        AddonModBBBIndexPage,
+    ],
+})
+export class AddonModBBBLazyModule {}
diff --git a/src/addons/mod/bigbluebuttonbn/bigbluebuttonbn.module.ts b/src/addons/mod/bigbluebuttonbn/bigbluebuttonbn.module.ts
new file mode 100644
index 000000000..f80d7b44f
--- /dev/null
+++ b/src/addons/mod/bigbluebuttonbn/bigbluebuttonbn.module.ts
@@ -0,0 +1,54 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { APP_INITIALIZER, NgModule, Type } from '@angular/core';
+import { Routes } from '@angular/router';
+import { CoreContentLinksDelegate } from '@features/contentlinks/services/contentlinks-delegate';
+import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate';
+import { CoreMainMenuTabRoutingModule } from '@features/mainmenu/mainmenu-tab-routing.module';
+import { AddonModBBBComponentsModule } from './components/components.module';
+import { AddonModBBBService } from './services/bigbluebuttonbn';
+import { AddonModBBBIndexLinkHandler } from './services/handlers/index-link';
+import { AddonModBBBListLinkHandler } from './services/handlers/list-link';
+import { AddonModBBBModuleHandler, ADDON_MOD_BBB_MAIN_MENU_PAGE_NAME } from './services/handlers/module';
+
+export const ADDON_MOD_BBB_SERVICES: Type<unknown>[] = [
+    AddonModBBBService,
+];
+
+const routes: Routes = [
+    {
+        path: ADDON_MOD_BBB_MAIN_MENU_PAGE_NAME,
+        loadChildren: () => import('./bigbluebuttonbn-lazy.module').then(m => m.AddonModBBBLazyModule),
+    },
+];
+
+@NgModule({
+    imports: [
+        CoreMainMenuTabRoutingModule.forChild(routes),
+        AddonModBBBComponentsModule,
+    ],
+    providers: [
+        {
+            provide: APP_INITIALIZER,
+            multi: true,
+            useValue: () => {
+                CoreCourseModuleDelegate.registerHandler(AddonModBBBModuleHandler.instance);
+                CoreContentLinksDelegate.registerHandler(AddonModBBBIndexLinkHandler.instance);
+                CoreContentLinksDelegate.registerHandler(AddonModBBBListLinkHandler.instance);
+            },
+        },
+    ],
+})
+export class AddonModBBBModule {}
diff --git a/src/addons/mod/bigbluebuttonbn/components/components.module.ts b/src/addons/mod/bigbluebuttonbn/components/components.module.ts
new file mode 100644
index 000000000..d786b230c
--- /dev/null
+++ b/src/addons/mod/bigbluebuttonbn/components/components.module.ts
@@ -0,0 +1,34 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { AddonModBBBIndexComponent } from './index/index';
+import { CoreSharedModule } from '@/core/shared.module';
+import { CoreCourseComponentsModule } from '@features/course/components/components.module';
+
+@NgModule({
+    declarations: [
+        AddonModBBBIndexComponent,
+    ],
+    imports: [
+        CoreSharedModule,
+        CoreCourseComponentsModule,
+    ],
+    providers: [
+    ],
+    exports: [
+        AddonModBBBIndexComponent,
+    ],
+})
+export class AddonModBBBComponentsModule {}
diff --git a/src/addons/mod/bigbluebuttonbn/components/index/index.html b/src/addons/mod/bigbluebuttonbn/components/index/index.html
new file mode 100644
index 000000000..82385fa9a
--- /dev/null
+++ b/src/addons/mod/bigbluebuttonbn/components/index/index.html
@@ -0,0 +1,40 @@
+<!-- Buttons to add to the header. -->
+<core-navbar-buttons slot="end">
+    <core-context-menu>
+        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
+            [href]="externalUrl" iconAction="fas-external-link-alt">
+        </core-context-menu-item>
+        <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
+            (action)="expandDescription()" iconAction="fas-arrow-right">
+        </core-context-menu-item>
+        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}"
+            iconAction="far-newspaper" (action)="gotoBlog()">
+        </core-context-menu-item>
+        <core-context-menu-item *ngIf="loaded && isOnline" [priority]="700" [content]="'core.refresh' | translate"
+            (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false">
+        </core-context-menu-item>
+        <core-context-menu-item *ngIf="loaded && hasOffline && isOnline" [priority]="600"
+            [content]="'core.settings.synchronizenow' | translate" (action)="doRefresh(null, $event, true)" [iconAction]="syncIcon"
+            [closeOnClick]="false">
+        </core-context-menu-item>
+        <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="500" [content]="prefetchText" (action)="prefetch($event)"
+            [iconAction]="prefetchStatusIcon" [closeOnClick]="false">
+        </core-context-menu-item>
+    </core-context-menu>
+</core-navbar-buttons>
+
+<!-- Content. -->
+<core-loading [hideUntil]="loaded" class="safe-area-page">
+
+    <!-- Activity info. -->
+    <core-course-module-info *ngIf="showCompletion" [module]="module" [showManualCompletion]="true"
+        (completionChanged)="onCompletionChange()">
+    </core-course-module-info>
+
+    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId"
+        contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
+    </core-course-module-description>
+
+    <!-- TODO -->
+    <p>TODO: BBB native content</p>
+</core-loading>
diff --git a/src/addons/mod/bigbluebuttonbn/components/index/index.ts b/src/addons/mod/bigbluebuttonbn/components/index/index.ts
new file mode 100644
index 000000000..a2427c8f4
--- /dev/null
+++ b/src/addons/mod/bigbluebuttonbn/components/index/index.ts
@@ -0,0 +1,63 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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, OnInit, Optional } from '@angular/core';
+import { CoreCourseModuleMainActivityComponent } from '@features/course/classes/main-activity-component';
+import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
+import { IonContent } from '@ionic/angular';
+import { AddonModBBBData, AddonModBBBService } from '../../services/bigbluebuttonbn';
+
+/**
+ * Component that displays a Big Blue Button activity.
+ */
+@Component({
+    selector: 'addon-mod-bbb-index',
+    templateUrl: 'index.html',
+})
+export class AddonModBBBIndexComponent extends CoreCourseModuleMainActivityComponent implements OnInit {
+
+    component = AddonModBBBService.COMPONENT;
+    moduleName = 'bigbluebuttonbn';
+    bbb?: AddonModBBBData;
+
+    constructor(
+        protected content?: IonContent,
+        @Optional() courseContentsPage?: CoreCourseContentsPage,
+    ) {
+        super('AddonModBBBIndexComponent', content, courseContentsPage);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async ngOnInit(): Promise<void> {
+        super.ngOnInit();
+
+        await this.loadContent();
+
+        // @todo
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected async fetchContent(refresh: boolean = false): Promise<void> {
+        try {
+            // @todo
+        } finally {
+            this.fillContextMenu(refresh);
+        }
+    }
+
+}
diff --git a/src/addons/mod/bigbluebuttonbn/lang.json b/src/addons/mod/bigbluebuttonbn/lang.json
new file mode 100644
index 000000000..a87fdb56f
--- /dev/null
+++ b/src/addons/mod/bigbluebuttonbn/lang.json
@@ -0,0 +1,3 @@
+{
+    "view_error_unable_join_student": "BeeUnable to connect to the BigBlueButton server. Please contact your Teacher or the Administrator.p"
+}
diff --git a/src/addons/mod/bigbluebuttonbn/pages/index/index.html b/src/addons/mod/bigbluebuttonbn/pages/index/index.html
new file mode 100644
index 000000000..f8b7babdf
--- /dev/null
+++ b/src/addons/mod/bigbluebuttonbn/pages/index/index.html
@@ -0,0 +1,21 @@
+<ion-header>
+    <ion-toolbar>
+        <ion-buttons slot="start">
+            <ion-back-button [text]="'core.back' | translate"></ion-back-button>
+        </ion-buttons>
+        <h1>
+            <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
+            </core-format-text>
+        </h1>
+        <ion-buttons slot="end">
+            <!-- The buttons defined by the component will be added in here. -->
+        </ion-buttons>
+    </ion-toolbar>
+</ion-header>
+<ion-content>
+    <ion-refresher slot="fixed" [disabled]="!activityComponent?.loaded" (ionRefresh)="activityComponent?.doRefresh($event.target)">
+        <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
+    </ion-refresher>
+
+    <addon-mod-bbb-index [module]="module" [courseId]="courseId" (dataRetrieved)="updateData($event)"></addon-mod-bbb-index>
+</ion-content>
diff --git a/src/addons/mod/bigbluebuttonbn/pages/index/index.ts b/src/addons/mod/bigbluebuttonbn/pages/index/index.ts
new file mode 100644
index 000000000..3b5c6ddf7
--- /dev/null
+++ b/src/addons/mod/bigbluebuttonbn/pages/index/index.ts
@@ -0,0 +1,30 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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, ViewChild } from '@angular/core';
+import { CoreCourseModuleMainActivityPage } from '@features/course/classes/main-activity-page';
+import { AddonModBBBIndexComponent } from '../../components/index/index';
+
+/**
+ * Page that displays a Big Blue Button activity.
+ */
+@Component({
+    selector: 'page-addon-mod-bbb-index',
+    templateUrl: 'index.html',
+})
+export class AddonModBBBIndexPage extends CoreCourseModuleMainActivityPage<AddonModBBBIndexComponent> {
+
+    @ViewChild(AddonModBBBIndexComponent) activityComponent?: AddonModBBBIndexComponent;
+
+}
diff --git a/src/addons/mod/bigbluebuttonbn/services/bigbluebuttonbn.ts b/src/addons/mod/bigbluebuttonbn/services/bigbluebuttonbn.ts
new file mode 100644
index 000000000..f1ed9f3cf
--- /dev/null
+++ b/src/addons/mod/bigbluebuttonbn/services/bigbluebuttonbn.ts
@@ -0,0 +1,351 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { Injectable } from '@angular/core';
+import { CoreError } from '@classes/errors/error';
+import { CoreWSError } from '@classes/errors/wserror';
+import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
+import { CoreCourseCommonModWSOptions } from '@features/course/services/course';
+import { CoreCourseLogHelper } from '@features/course/services/log-helper';
+import { CoreSites, CoreSitesCommonWSOptions } from '@services/sites';
+import { CoreWSExternalFile, CoreWSExternalWarning } from '@services/ws';
+import { makeSingleton, Translate } from '@singletons';
+
+const ROOT_CACHE_KEY = 'AddonModBBB:';
+
+/**
+ * Service that provides some features for Big Blue Button activity.
+ */
+@Injectable({ providedIn: 'root' })
+export class AddonModBBBService {
+
+    static readonly COMPONENT = 'mmaModBigBlueButtonBN';
+
+    /**
+     * Get a BBB activity.
+     *
+     * @param courseId Course ID.
+     * @param cmId Course module ID.
+     * @param options Other options.
+     * @return Promise resolved when the activity is retrieved.
+     */
+    async getBBB(courseId: number, cmId: number, options: CoreSitesCommonWSOptions = {}): Promise<AddonModBBBData> {
+        const site = await CoreSites.getSite(options.siteId);
+
+        const params: AddonModBBBGetBigBlueButtonBNsByCoursesWSParams = {
+            courseids: [courseId],
+        };
+        const preSets: CoreSiteWSPreSets = {
+            cacheKey: this.getBBBsCacheKey(courseId),
+            updateFrequency: CoreSite.FREQUENCY_RARELY,
+            component: AddonModBBBService.COMPONENT,
+            ...CoreSites.getReadingStrategyPreSets(options.readingStrategy), // Include reading strategy preSets.
+        };
+
+        const response = await site.read<AddonModBBBGetBigBlueButtonBNsByCoursesWSResponse>(
+            'mod_bigbluebuttonbn_get_bigbluebuttonbns_by_courses',
+            params,
+            preSets,
+        );
+
+        const bbb = response.bigbluebuttonbns.find((bbb) => bbb.coursemodule == cmId);
+        if (bbb) {
+            return bbb;
+        }
+
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
+    }
+
+    /**
+     * Get cache key for get BBB WS call.
+     *
+     * @param courseId Course ID.
+     * @return Cache key.
+     */
+    protected getBBBsCacheKey(courseId: number): string {
+        return ROOT_CACHE_KEY + 'bbb:' + courseId;
+    }
+
+    /**
+     * Get join URL for a BBB activity.
+     *
+     * @param cmId Course module ID.
+     * @param groupId Group ID, 0 means that the function will determine the user group.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the list of messages.
+     */
+    async getJoinUrl(
+        cmId: number,
+        groupId: number = 0,
+        siteId?: string,
+    ): Promise<string> {
+        const site = await CoreSites.getSite(siteId);
+
+        const params: AddonModBBBGetJoinUrlWSParams = {
+            cmid: cmId,
+            groupid: groupId,
+        };
+
+        // Don't use cache.
+        const response = await site.write<AddonModBBBGetJoinUrlWSResponse>(
+            'mod_bigbluebuttonbn_get_join_url',
+            params,
+        );
+
+        if (response.warnings?.length) {
+            throw new CoreWSError(response.warnings[0]);
+        }
+
+        if (!response.join_url) {
+            // Shouldn't happen, if there are no warning the app should always receive the URL.
+            throw new CoreError(
+                Translate.instant('addon.mod_bigbluebuttonbn.view_error_unable_join_studentview_error_unable_join_student'),
+            );
+        }
+
+        return response.join_url;
+    }
+
+    /**
+     * Get meeting info for a BBB activity.
+     *
+     * @param id BBB ID.
+     * @param groupId Group ID, 0 means that the function will determine the user group.
+     * @param options Other options.
+     * @return Promise resolved with the list of messages.
+     */
+    async getMeetingInfo(
+        id: number,
+        groupId: number = 0,
+        options: CoreCourseCommonModWSOptions = {},
+    ): Promise<AddonModBBBMeetingInfoWSResponse> {
+        const site = await CoreSites.getSite(options.siteId);
+
+        const params: AddonModBBBMeetingInfoWSParams = {
+            bigbluebuttonbnid: id,
+            groupid: groupId,
+        };
+        const preSets: CoreSiteWSPreSets = {
+            cacheKey: this.getMeetingInfoCacheKey(id, groupId),
+            component: AddonModBBBService.COMPONENT,
+            componentId: options.cmId,
+            ...CoreSites.getReadingStrategyPreSets(options.readingStrategy), // Include reading strategy preSets.
+        };
+
+        return await site.read<AddonModBBBMeetingInfoWSResponse>(
+            'mod_bigbluebuttonbn_meeting_info',
+            params,
+            preSets,
+        );
+    }
+
+    /**
+     * Get cache key for meeting info WS call.
+     *
+     * @param id BBB ID.
+     * @param groupId Group ID, 0 means that the function will determine the user group.
+     * @return Cache key.
+     */
+    protected getMeetingInfoCacheKey(id: number, groupId: number = 0): string {
+        return this.getMeetingInfoCacheKeyPrefix(id) + groupId;
+    }
+
+    /**
+     * Get cache key prefix for meeting info WS call.
+     *
+     * @param id BBB ID.
+     * @return Cache key prefix.
+     */
+    protected getMeetingInfoCacheKeyPrefix(id: number): string {
+        return ROOT_CACHE_KEY + 'meetingInfo:' + id + ':';
+    }
+
+    /**
+     * Report a BBB as being viewed.
+     *
+     * @param id BBB instance ID.
+     * @param name Name of the BBB.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the WS call is successful.
+     */
+    async logView(id: number, name?: string, siteId?: string): Promise<void> {
+        const params: AddonModBBBViewBigBlueButtonBNWSParams = {
+            bigbluebuttonbnid: id,
+        };
+
+        await CoreCourseLogHelper.logSingle(
+            'mod_bigbluebuttonbn_view_bigbluebuttonbn',
+            params,
+            AddonModBBBService.COMPONENT,
+            id,
+            name,
+            'bigbluebuttonbn',
+            {},
+            siteId,
+        );
+    }
+
+    /**
+     * Invalidate BBBs.
+     *
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
+     */
+    async invalidateBBBs(courseId: number, siteId?: string): Promise<void> {
+        const site = await CoreSites.getSite(siteId);
+
+        await site.invalidateWsCacheForKey(this.getBBBsCacheKey(courseId));
+    }
+
+    /**
+     * Invalidate meeting info for a certain group.
+     *
+     * @param id BBB ID.
+     * @param groupId Group ID, 0 means that the function will determine the user group.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
+     */
+    async invalidateMeetingInfo(id: number, groupId: number = 0, siteId?: string): Promise<void> {
+        const site = await CoreSites.getSite(siteId);
+
+        await site.invalidateWsCacheForKey(this.getMeetingInfoCacheKey(id, groupId));
+    }
+
+    /**
+     * Invalidate meeting info for all groups.
+     *
+     * @param id BBB ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
+     */
+    async invalidateAllGroupsMeetingInfo(id: number, siteId?: string): Promise<void> {
+        const site = await CoreSites.getSite(siteId);
+
+        await site.invalidateWsCacheForKeyStartingWith(this.getMeetingInfoCacheKeyPrefix(id));
+    }
+
+    /**
+     * Returns whether or not the BBB plugin is enabled for a certain site.
+     *
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with true if enabled, resolved with false or rejected otherwise.
+     * @since 4.0, but the WebServices were backported to the plugin so it can be supported in older versions.
+     */
+    async isPluginEnabled(siteId?: string): Promise<boolean> {
+        const site = await CoreSites.getSite(siteId);
+
+        return site.wsAvailable('mod_bigbluebuttonbn_meeting_info');
+    }
+
+}
+
+export const AddonModBBB = makeSingleton(AddonModBBBService);
+
+/**
+ * Params of mod_bigbluebuttonbn_get_bigbluebuttonbns_by_courses WS.
+ */
+export type AddonModBBBGetBigBlueButtonBNsByCoursesWSParams = {
+    courseids?: number[]; // Array of course ids.
+};
+
+/**
+ * Data returned by mod_bigbluebuttonbn_get_bigbluebuttonbns_by_courses WS.
+ */
+export type AddonModBBBGetBigBlueButtonBNsByCoursesWSResponse = {
+    bigbluebuttonbns: AddonModBBBData[];
+    warnings?: CoreWSExternalWarning[];
+};
+
+/**
+ * BBB data returned by mod_bigbluebuttonbn_get_bigbluebuttonbns_by_courses.
+ */
+export type AddonModBBBData = {
+    id: number; // Module id.
+    coursemodule: number; // Course module id.
+    course: number; // Course id.
+    name: string; // Name.
+    intro: string; // Description.
+    meetingid: string; // Meeting id.
+    introformat?: number; // Intro format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
+    introfiles: CoreWSExternalFile[];
+    timemodified: number; // Last time the instance was modified.
+    section: number; // Course section id.
+    visible: number; // Module visibility.
+    groupmode: number; // Group mode.
+    groupingid: number; // Grouping id.
+};
+
+/**
+ * Params of mod_bigbluebuttonbn_meeting_info WS.
+ */
+export type AddonModBBBMeetingInfoWSParams = {
+    bigbluebuttonbnid: number; // Bigbluebuttonbn instance id.
+    groupid?: number; // Bigbluebuttonbn group id.
+    updatecache?: boolean; // Update cache ?.
+};
+
+/**
+ * Data returned by mod_bigbluebuttonbn_meeting_info WS.
+ */
+export type AddonModBBBMeetingInfoWSResponse = {
+    cmid: number; // CM id.
+    userlimit: number; // User limit.
+    bigbluebuttonbnid: string; // Bigbluebuttonbn instance id.
+    meetingid: string; // Meeting id.
+    openingtime?: string; // Opening time.
+    closingtime?: string; // Closing time.
+    statusrunning?: boolean; // Status running.
+    statusclosed?: boolean; // Status closed.
+    statusopen?: boolean; // Status open.
+    statusmessage?: string; // Status message.
+    startedat?: number; // Started at.
+    moderatorcount?: number; // Moderator count.
+    participantcount?: number; // Participant count.
+    moderatorplural?: boolean; // Several moderators ?.
+    participantplural?: boolean; // Several participants ?.
+    canjoin: boolean; // Can join.
+    ismoderator: boolean; // Is moderator.
+    presentations: {
+        url: string; // Presentation URL.
+        iconname: string; // Icon name.
+        icondesc: string; // Icon text.
+        name: string; // Presentation name.
+    }[];
+    joinurl: string; // Join URL.
+};
+
+/**
+ * Params of mod_bigbluebuttonbn_get_join_url WS.
+ */
+export type AddonModBBBGetJoinUrlWSParams = {
+    cmid: number; // Course module id.
+    groupid?: number; // Bigbluebuttonbn group id.
+};
+
+/**
+ * Data returned by mod_bigbluebuttonbn_get_join_url WS.
+ */
+export type AddonModBBBGetJoinUrlWSResponse = {
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    join_url?: string; // Can join session.
+    warnings?: CoreWSExternalWarning[];
+};
+
+/**
+ * Params of mod_bigbluebuttonbn_view_bigbluebuttonbn WS.
+ */
+export type AddonModBBBViewBigBlueButtonBNWSParams = {
+    bigbluebuttonbnid: number; // Bigbluebuttonbn instance id.
+};
diff --git a/src/addons/mod/bigbluebuttonbn/services/handlers/index-link.ts b/src/addons/mod/bigbluebuttonbn/services/handlers/index-link.ts
new file mode 100644
index 000000000..2c89a1398
--- /dev/null
+++ b/src/addons/mod/bigbluebuttonbn/services/handlers/index-link.ts
@@ -0,0 +1,33 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { Injectable } from '@angular/core';
+import { CoreContentLinksModuleIndexHandler } from '@features/contentlinks/classes/module-index-handler';
+import { makeSingleton } from '@singletons';
+
+/**
+ * Handler to treat links to Big Blue Button activity.
+ */
+@Injectable({ providedIn: 'root' })
+export class AddonModBBBIndexLinkHandlerService extends CoreContentLinksModuleIndexHandler {
+
+    name = 'AddonModBBBIndexLinkHandlerService';
+
+    constructor() {
+        super('AddonModBBB', 'bigbluebuttonbn', 'bn');
+    }
+
+}
+
+export const AddonModBBBIndexLinkHandler = makeSingleton(AddonModBBBIndexLinkHandlerService);
diff --git a/src/addons/mod/bigbluebuttonbn/services/handlers/list-link.ts b/src/addons/mod/bigbluebuttonbn/services/handlers/list-link.ts
new file mode 100644
index 000000000..3933fc7ea
--- /dev/null
+++ b/src/addons/mod/bigbluebuttonbn/services/handlers/list-link.ts
@@ -0,0 +1,33 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { Injectable } from '@angular/core';
+import { CoreContentLinksModuleListHandler } from '@features/contentlinks/classes/module-list-handler';
+import { makeSingleton } from '@singletons';
+
+/**
+ * Handler to treat links to Big Blue Button list page.
+ */
+@Injectable({ providedIn: 'root' })
+export class AddonModBBBListLinkHandlerService extends CoreContentLinksModuleListHandler {
+
+    name = 'AddonModBBBListLinkHandler';
+
+    constructor() {
+        super('AddonModBBB', 'bigbluebuttonbn');
+    }
+
+}
+
+export const AddonModBBBListLinkHandler = makeSingleton(AddonModBBBListLinkHandlerService);
diff --git a/src/addons/mod/bigbluebuttonbn/services/handlers/module.ts b/src/addons/mod/bigbluebuttonbn/services/handlers/module.ts
new file mode 100644
index 000000000..b3febceb6
--- /dev/null
+++ b/src/addons/mod/bigbluebuttonbn/services/handlers/module.ts
@@ -0,0 +1,79 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreConstants } from '@/core/constants';
+import { Injectable, Type } from '@angular/core';
+import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
+import { CoreCourseAnyModuleData } from '@features/course/services/course';
+import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
+import { makeSingleton } from '@singletons';
+import { AddonModBBBIndexComponent } from '../../components/index';
+import { AddonModBBB } from '../bigbluebuttonbn';
+
+export const ADDON_MOD_BBB_MAIN_MENU_PAGE_NAME = 'mod_bigbluebuttonbn';
+
+/**
+ * Handler to support Big Blue Button activities.
+ */
+@Injectable({ providedIn: 'root' })
+export class AddonModBBBModuleHandlerService extends CoreModuleHandlerBase implements CoreCourseModuleHandler {
+
+    name = 'AddonModBBB';
+    modName = 'bigbluebuttonbn';
+    protected pageName = ADDON_MOD_BBB_MAIN_MENU_PAGE_NAME;
+
+    supportedFeatures = {
+        [CoreConstants.FEATURE_GROUPS]: true,
+        [CoreConstants.FEATURE_GROUPINGS]: true,
+        [CoreConstants.FEATURE_MOD_INTRO]: true,
+        [CoreConstants.FEATURE_COMPLETION_TRACKS_VIEWS]: true,
+        [CoreConstants.FEATURE_GRADE_HAS_GRADE]: false,
+        [CoreConstants.FEATURE_GRADE_OUTCOMES]: true,
+        [CoreConstants.FEATURE_BACKUP_MOODLE2]: true,
+        [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true,
+    };
+
+    /**
+     * @inheritdoc
+     */
+    async isEnabled(): Promise<boolean> {
+        return AddonModBBB.isPluginEnabled();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    getData(
+        module: CoreCourseAnyModuleData,
+        courseId: number,
+        sectionId?: number,
+        forCoursePage?: boolean,
+    ): CoreCourseModuleHandlerData {
+        const data = super.getData(module, courseId, sectionId, forCoursePage);
+
+        data.showDownloadButton = false;
+
+        return data;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async getMainComponent(): Promise<Type<unknown>> {
+        return AddonModBBBIndexComponent;
+    }
+
+}
+
+export const AddonModBBBModuleHandler = makeSingleton(AddonModBBBModuleHandlerService);
diff --git a/src/addons/mod/mod.module.ts b/src/addons/mod/mod.module.ts
index 1c3e3fe0e..f5f039c55 100644
--- a/src/addons/mod/mod.module.ts
+++ b/src/addons/mod/mod.module.ts
@@ -15,6 +15,7 @@
 import { NgModule } from '@angular/core';
 
 import { AddonModAssignModule } from './assign/assign.module';
+import { AddonModBBBModule } from './bigbluebuttonbn/bigbluebuttonbn.module';
 import { AddonModBookModule } from './book/book.module';
 import { AddonModChatModule } from './chat/chat.module';
 import { AddonModChoiceModule } from './choice/choice.module';
@@ -40,6 +41,7 @@ import { AddonModWorkshopModule } from './workshop/workshop.module';
 @NgModule({
     imports: [
         AddonModAssignModule,
+        AddonModBBBModule,
         AddonModBookModule,
         AddonModChatModule,
         AddonModChoiceModule,

From fd8d433f0588c452685dd3da7148f36b3abaca97 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 29 Sep 2021 11:32:09 +0200
Subject: [PATCH 0277/1008] MOBILE-3873 bbb: Allow both inapp support and site
 plugin support

---
 .../services/handlers/module.ts               | 27 ++++++++++++++-
 .../components/module-index/module-index.ts   |  6 +++-
 .../services/siteplugins-helper.ts            |  8 +++--
 .../siteplugins/services/siteplugins.ts       | 34 ++++++++++++++++---
 4 files changed, 66 insertions(+), 9 deletions(-)

diff --git a/src/addons/mod/bigbluebuttonbn/services/handlers/module.ts b/src/addons/mod/bigbluebuttonbn/services/handlers/module.ts
index b3febceb6..4863be94e 100644
--- a/src/addons/mod/bigbluebuttonbn/services/handlers/module.ts
+++ b/src/addons/mod/bigbluebuttonbn/services/handlers/module.ts
@@ -17,6 +17,8 @@ import { Injectable, Type } from '@angular/core';
 import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
 import { CoreCourseAnyModuleData } from '@features/course/services/course';
 import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
+import { CoreSitePluginsModuleHandler } from '@features/siteplugins/classes/handlers/module-handler';
+import { CoreSitePlugins } from '@features/siteplugins/services/siteplugins';
 import { makeSingleton } from '@singletons';
 import { AddonModBBBIndexComponent } from '../../components/index';
 import { AddonModBBB } from '../bigbluebuttonbn';
@@ -32,6 +34,7 @@ export class AddonModBBBModuleHandlerService extends CoreModuleHandlerBase imple
     name = 'AddonModBBB';
     modName = 'bigbluebuttonbn';
     protected pageName = ADDON_MOD_BBB_MAIN_MENU_PAGE_NAME;
+    protected sitePluginHandler?: CoreSitePluginsModuleHandler;
 
     supportedFeatures = {
         [CoreConstants.FEATURE_GROUPS]: true,
@@ -48,7 +51,21 @@ export class AddonModBBBModuleHandlerService extends CoreModuleHandlerBase imple
      * @inheritdoc
      */
     async isEnabled(): Promise<boolean> {
-        return AddonModBBB.isPluginEnabled();
+        const enabled = await AddonModBBB.isPluginEnabled();
+
+        if (enabled) {
+            delete this.sitePluginHandler;
+            this.name = 'AddonModBBB';
+
+            return true;
+        }
+
+        // Native support not available in this site. Check if it's supported by site plugin.
+        this.sitePluginHandler = CoreSitePlugins.getModuleHandlerInstance(this.modName);
+        // Change the handler name to be able to retrieve the plugin data in component.
+        this.name = this.sitePluginHandler?.name || this.name;
+
+        return !!this.sitePluginHandler;
     }
 
     /**
@@ -60,6 +77,10 @@ export class AddonModBBBModuleHandlerService extends CoreModuleHandlerBase imple
         sectionId?: number,
         forCoursePage?: boolean,
     ): CoreCourseModuleHandlerData {
+        if (this.sitePluginHandler) {
+            return this.sitePluginHandler.getData(module, courseId, sectionId, forCoursePage);
+        }
+
         const data = super.getData(module, courseId, sectionId, forCoursePage);
 
         data.showDownloadButton = false;
@@ -71,6 +92,10 @@ export class AddonModBBBModuleHandlerService extends CoreModuleHandlerBase imple
      * @inheritdoc
      */
     async getMainComponent(): Promise<Type<unknown>> {
+        if (this.sitePluginHandler) {
+            return this.sitePluginHandler.getMainComponent();
+        }
+
         return AddonModBBBIndexComponent;
     }
 
diff --git a/src/core/features/siteplugins/components/module-index/module-index.ts b/src/core/features/siteplugins/components/module-index/module-index.ts
index 5e83cbc9d..499458d36 100644
--- a/src/core/features/siteplugins/components/module-index/module-index.ts
+++ b/src/core/features/siteplugins/components/module-index/module-index.ts
@@ -161,7 +161,11 @@ export class CoreSitePluginsModuleIndexComponent implements OnInit, OnDestroy, C
      * Expand the description.
      */
     expandDescription(): void {
-        CoreTextUtils.viewText(Translate.instant('core.description'), this.description!, {
+        if (!this.description) {
+            return;
+        }
+
+        CoreTextUtils.viewText(Translate.instant('core.description'), this.description, {
             component: this.component,
             componentId: this.module.id,
             filter: true,
diff --git a/src/core/features/siteplugins/services/siteplugins-helper.ts b/src/core/features/siteplugins/services/siteplugins-helper.ts
index 3ce97bba9..2d674dac2 100644
--- a/src/core/features/siteplugins/services/siteplugins-helper.ts
+++ b/src/core/features/siteplugins/services/siteplugins-helper.ts
@@ -205,7 +205,7 @@ export class CoreSitePluginsHelperProvider {
             undefined,
             undefined,
             undefined,
-            handlerSchema.styles!.version,
+            handlerSchema.styles?.version,
         );
 
         // File is downloaded, get the contents.
@@ -378,8 +378,9 @@ export class CoreSitePluginsHelperProvider {
 
         if (plugin.parsedHandlers) {
             // Register all the handlers.
-            await CoreUtils.allPromises(Object.keys(plugin.parsedHandlers).map(async (name) => {
-                await this.registerHandler(plugin, name, plugin.parsedHandlers![name]);
+            const parsedHandlers = plugin.parsedHandlers;
+            await CoreUtils.allPromises(Object.keys(parsedHandlers).map(async (name) => {
+                await this.registerHandler(plugin, name, parsedHandlers[name]);
             }));
         }
     }
@@ -891,6 +892,7 @@ export class CoreSitePluginsHelperProvider {
 
         const moduleHandler = new CoreSitePluginsModuleHandler(uniqueName, modName, plugin, handlerSchema, initResult);
         CoreCourseModuleDelegate.registerHandler(moduleHandler);
+        CoreSitePlugins.setModuleHandlerInstance(modName, moduleHandler);
 
         if (handlerSchema.offlinefunctions && Object.keys(handlerSchema.offlinefunctions).length) {
             // Register the prefetch handler.
diff --git a/src/core/features/siteplugins/services/siteplugins.ts b/src/core/features/siteplugins/services/siteplugins.ts
index 6d7fdb702..c03ffbe91 100644
--- a/src/core/features/siteplugins/services/siteplugins.ts
+++ b/src/core/features/siteplugins/services/siteplugins.ts
@@ -28,6 +28,7 @@ import { CoreWSExternalFile, CoreWSExternalWarning } from '@services/ws';
 import { makeSingleton } from '@singletons';
 import { CoreEvents } from '@singletons/events';
 import { CoreLogger } from '@singletons/logger';
+import { CoreSitePluginsModuleHandler } from '../classes/handlers/module-handler';
 
 const ROOT_CACHE_KEY = 'CoreSitePlugins:';
 
@@ -44,6 +45,8 @@ export class CoreSitePluginsProvider {
     protected sitePlugins: {[name: string]: CoreSitePluginsHandler} = {}; // Site plugins registered.
     protected sitePluginPromises: {[name: string]: Promise<void>} = {}; // Promises of loading plugins.
     protected fetchPluginsDeferred: PromiseDefer<void>;
+    protected moduleHandlerInstances: Record<string, CoreSitePluginsModuleHandler> = {};
+
     hasSitePluginsLoaded = false;
     sitePluginsFinishedLoading = false;
 
@@ -262,7 +265,7 @@ export class CoreSitePluginsProvider {
         switch (paramName) {
             case 'courseids':
                 // The WS needs the list of course IDs. Create the list.
-                return [courseId!];
+                return [courseId || 0];
 
             case component + 'id':
                 // The WS needs the instance id.
@@ -540,10 +543,13 @@ export class CoreSitePluginsProvider {
             return;
         }
 
+        const siteInstance = site;
+        const offlineFunctions = handlerSchema.offlinefunctions;
+
         await Promise.all(Object.keys(handlerSchema.offlinefunctions).map(async(method) => {
-            if (site!.wsAvailable(method)) {
+            if (siteInstance.wsAvailable(method)) {
                 // The method is a WS.
-                const paramsList = handlerSchema.offlinefunctions![method];
+                const paramsList = offlineFunctions[method];
                 const cacheKey = this.getCallWSCacheKey(method, args);
                 let params: Record<string, unknown> = {};
 
@@ -584,7 +590,7 @@ export class CoreSitePluginsProvider {
             // Prefetch the files in the content.
             if (result.files.length) {
                 await CoreFilepool.downloadOrPrefetchFiles(
-                    site!.getId(),
+                    siteInstance.getId(),
                     result.files,
                     !!prefetch,
                     false,
@@ -657,6 +663,26 @@ export class CoreSitePluginsProvider {
         return this.fetchPluginsDeferred.promise;
     }
 
+    /**
+     * Get a module hander instance, if present.
+     *
+     * @param modName Mod name without "mod_".
+     * @return Handler instance, undefined if not found.
+     */
+    getModuleHandlerInstance(modName: string): CoreSitePluginsModuleHandler | undefined {
+        return this.moduleHandlerInstances[modName];
+    }
+
+    /**
+     * Set a module hander instance.
+     *
+     * @param modName Mod name.
+     * @param handler Handler instance.
+     */
+    setModuleHandlerInstance(modName: string, handler: CoreSitePluginsModuleHandler): void {
+        this.moduleHandlerInstances[modName] = handler;
+    }
+
 }
 
 export const CoreSitePlugins = makeSingleton(CoreSitePluginsProvider);

From 30fdefd1db6deaf404c84ac387057f8c92253654 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 30 Sep 2021 10:59:54 +0200
Subject: [PATCH 0278/1008] MOBILE-3873 bbb: Support BBB activity

---
 scripts/langindex.json                        |  13 ++
 .../mod/assign/classes/submissions-source.ts  |   1 +
 .../mod/assign/components/index/index.ts      |   1 +
 .../components/index/index.html               |  94 ++++++++++++-
 .../components/index/index.scss               |   7 +
 .../bigbluebuttonbn/components/index/index.ts | 123 +++++++++++++++++-
 src/addons/mod/bigbluebuttonbn/lang.json      |  14 +-
 .../services/bigbluebuttonbn.ts               |   4 +-
 .../services/handlers/module.ts               |  10 +-
 .../mod/workshop/components/index/index.ts    |   1 +
 src/core/services/groups.ts                   |   8 ++
 11 files changed, 263 insertions(+), 13 deletions(-)
 create mode 100644 src/addons/mod/bigbluebuttonbn/components/index/index.scss

diff --git a/scripts/langindex.json b/scripts/langindex.json
index cc6776547..d9f55134b 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -433,6 +433,19 @@
   "addon.mod_assign_submission_file.pluginname": "assignsubmission_file",
   "addon.mod_assign_submission_onlinetext.pluginname": "assignsubmission_onlinetext",
   "addon.mod_assign_submission_onlinetext.wordlimitexceeded": "assignsubmission_onlinetext",
+  "addon.mod_bigbluebuttonbn.mod_form_field_closingtime": "bigbluebuttonbn",
+  "addon.mod_bigbluebuttonbn.mod_form_field_openingtime": "bigbluebuttonbn",
+  "addon.mod_bigbluebuttonbn.userlimitreached": "bigbluebuttonbn",
+  "addon.mod_bigbluebuttonbn.view_conference_action_join": "bigbluebuttonbn",
+  "addon.mod_bigbluebuttonbn.view_error_unable_join_student": "bigbluebuttonbn",
+  "addon.mod_bigbluebuttonbn.view_groups_selection_warning": "bigbluebuttonbn",
+  "addon.mod_bigbluebuttonbn.view_message_conference_in_progress": "bigbluebuttonbn",
+  "addon.mod_bigbluebuttonbn.view_message_conference_room_ready": "bigbluebuttonbn",
+  "addon.mod_bigbluebuttonbn.view_message_moderator": "bigbluebuttonbn",
+  "addon.mod_bigbluebuttonbn.view_message_moderators": "bigbluebuttonbn",
+  "addon.mod_bigbluebuttonbn.view_message_session_started_at": "bigbluebuttonbn",
+  "addon.mod_bigbluebuttonbn.view_message_viewer": "bigbluebuttonbn",
+  "addon.mod_bigbluebuttonbn.view_message_viewers": "bigbluebuttonbn",
   "addon.mod_book.errorchapter": "book",
   "addon.mod_book.modulenameplural": "book",
   "addon.mod_book.navnexttitle": "book",
diff --git a/src/addons/mod/assign/classes/submissions-source.ts b/src/addons/mod/assign/classes/submissions-source.ts
index fce121386..b0905d5fe 100644
--- a/src/addons/mod/assign/classes/submissions-source.ts
+++ b/src/addons/mod/assign/classes/submissions-source.ts
@@ -55,6 +55,7 @@ export class AddonModAssignSubmissionsSource extends CoreItemsManagerSource<Addo
         separateGroups: false,
         visibleGroups: false,
         defaultGroupId: 0,
+        canAccessAllGroups: false,
     };
 
     protected submissionsData: { canviewsubmissions: boolean; submissions?: AddonModAssignSubmission[] } = {
diff --git a/src/addons/mod/assign/components/index/index.ts b/src/addons/mod/assign/components/index/index.ts
index 93ec6e8f2..80a089d2b 100644
--- a/src/addons/mod/assign/components/index/index.ts
+++ b/src/addons/mod/assign/components/index/index.ts
@@ -71,6 +71,7 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
         separateGroups: false,
         visibleGroups: false,
         defaultGroupId: 0,
+        canAccessAllGroups: false,
     };
 
     // Status.
diff --git a/src/addons/mod/bigbluebuttonbn/components/index/index.html b/src/addons/mod/bigbluebuttonbn/components/index/index.html
index 82385fa9a..88ae1dc38 100644
--- a/src/addons/mod/bigbluebuttonbn/components/index/index.html
+++ b/src/addons/mod/bigbluebuttonbn/components/index/index.html
@@ -35,6 +35,96 @@
         contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
     </core-course-module-description>
 
-    <!-- TODO -->
-    <p>TODO: BBB native content</p>
+    <ng-container *ngIf="groupInfo && (groupInfo.separateGroups || groupInfo.visibleGroups)">
+        <ion-card class="core-info-card" *ngIf="groupInfo.groups && groupInfo.groups.length > 1">
+            <ion-item>
+                <ion-icon name="fas-question-circle" slot="start" aria-hidden="true"></ion-icon>
+                <ion-label>{{ 'addon.mod_bigbluebuttonbn.view_groups_selection_warning' | translate }}</ion-label>
+            </ion-item>
+        </ion-card>
+
+        <ion-item class="ion-text-wrap" >
+            <ion-label id="addon-bigbluebuttonbn-groupslabel">
+                <ng-container *ngIf="groupInfo.separateGroups">{{'core.groupsseparate' | translate }}</ng-container>
+                <ng-container *ngIf="groupInfo.visibleGroups">{{'core.groupsvisible' | translate }}</ng-container>
+            </ion-label>
+            <ion-select [(ngModel)]="groupId" (ionChange)="groupChanged()" aria-labelledby="addon-bigbluebuttonbn-groupslabel"
+                interface="action-sheet" [interfaceOptions]="{header: 'core.group' | translate}">
+                <ion-select-option *ngFor="let groupOpt of groupInfo.groups" [value]="groupOpt.id">
+                    {{groupOpt.name}}
+                </ion-select-option>
+            </ion-select>
+        </ion-item>
+    </ng-container>
+
+    <ng-container *ngIf="meetingInfo">
+        <ion-item class="ion-text-wrap" *ngIf="meetingInfo.openingtime">
+            <ion-label>
+                <h3>{{ 'addon.mod_bigbluebuttonbn.mod_form_field_openingtime' | translate }}</h3>
+            </ion-label>
+            <p slot="end">{{ meetingInfo.openingtime * 1000 | coreFormatDate }}</p>
+        </ion-item>
+        <ion-item class="ion-text-wrap" *ngIf="meetingInfo.closingtime">
+            <ion-label>
+                <h3>{{ 'addon.mod_bigbluebuttonbn.mod_form_field_closingtime' | translate }}</h3>
+            </ion-label>
+            <p slot="end">{{ meetingInfo.closingtime * 1000 | coreFormatDate }}</p>
+        </ion-item>
+
+        <ion-item class="ion-text-wrap" *ngIf="meetingInfo.canjoin && !meetingInfo.statusrunning">
+            <ion-label>
+                <p>{{ 'addon.mod_bigbluebuttonbn.view_message_conference_room_ready' | translate }}</p>
+            </ion-label>
+        </ion-item>
+
+        <ng-container *ngIf="meetingInfo.statusrunning">
+            <ion-item class="ion-text-wrap">
+                <ion-label>
+                    <p>{{ 'addon.mod_bigbluebuttonbn.view_message_conference_in_progress' | translate }}</p>
+                </ion-label>
+            </ion-item>
+
+            <ion-item class="ion-text-wrap" *ngIf="meetingInfo.startedat">
+                <ion-label>
+                    <h3>{{ 'addon.mod_bigbluebuttonbn.view_message_session_started_at' | translate }}</h3>
+                </ion-label>
+                <p slot="end">{{ meetingInfo.startedat * 1000 | coreFormatDate: "strftimetime" }}</p>
+            </ion-item>
+
+            <ion-item class="ion-text-wrap">
+                <ion-label>
+                    <h3 *ngIf="meetingInfo.moderatorplural">
+                        {{ 'addon.mod_bigbluebuttonbn.view_message_moderators' | translate }}
+                    </h3>
+                    <h3 *ngIf="!meetingInfo.moderatorplural">
+                        {{ 'addon.mod_bigbluebuttonbn.view_message_moderator' | translate }}
+                    </h3>
+                </ion-label>
+                <p slot="end">{{ meetingInfo.moderatorcount }}</p>
+            </ion-item>
+
+            <ion-item class="ion-text-wrap">
+                <ion-label>
+                    <h3 *ngIf="meetingInfo.participantplural">
+                        {{ 'addon.mod_bigbluebuttonbn.view_message_viewers' | translate }}
+                    </h3>
+                    <h3 *ngIf="!meetingInfo.participantplural">
+                        {{ 'addon.mod_bigbluebuttonbn.view_message_viewer' | translate }}
+                    </h3>
+                </ion-label>
+                <p slot="end">{{ meetingInfo.participantcount }}</p>
+            </ion-item>
+        </ng-container>
+
+        <ion-button *ngIf="meetingInfo.canjoin" class="ion-margin" expand="block" (click)="joinRoom()">
+            {{ 'addon.mod_bigbluebuttonbn.view_conference_action_join' | translate }}
+        </ion-button>
+
+        <ion-card *ngIf="!meetingInfo.canjoin" class="core-warning-card">
+            <ion-item class="ion-text-wrap">
+                <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
+                <ion-label>{{ meetingInfo.statusmessage }}</ion-label>
+            </ion-item>
+        </ion-card>
+    </ng-container>
 </core-loading>
diff --git a/src/addons/mod/bigbluebuttonbn/components/index/index.scss b/src/addons/mod/bigbluebuttonbn/components/index/index.scss
new file mode 100644
index 000000000..66566a376
--- /dev/null
+++ b/src/addons/mod/bigbluebuttonbn/components/index/index.scss
@@ -0,0 +1,7 @@
+@import "~theme/globals";
+
+:host {
+    ion-item > p[slot="end"] {
+        font-size: 14px;
+    }
+}
diff --git a/src/addons/mod/bigbluebuttonbn/components/index/index.ts b/src/addons/mod/bigbluebuttonbn/components/index/index.ts
index a2427c8f4..3f62eea6e 100644
--- a/src/addons/mod/bigbluebuttonbn/components/index/index.ts
+++ b/src/addons/mod/bigbluebuttonbn/components/index/index.ts
@@ -15,8 +15,13 @@
 import { Component, OnInit, Optional } from '@angular/core';
 import { CoreCourseModuleMainActivityComponent } from '@features/course/classes/main-activity-component';
 import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
+import { CoreCourse } from '@features/course/services/course';
 import { IonContent } from '@ionic/angular';
-import { AddonModBBBData, AddonModBBBService } from '../../services/bigbluebuttonbn';
+import { CoreGroupInfo, CoreGroups } from '@services/groups';
+import { CoreDomUtils } from '@services/utils/dom';
+import { CoreUtils } from '@services/utils/utils';
+import { Translate } from '@singletons';
+import { AddonModBBB, AddonModBBBData, AddonModBBBMeetingInfoWSResponse, AddonModBBBService } from '../../services/bigbluebuttonbn';
 
 /**
  * Component that displays a Big Blue Button activity.
@@ -24,12 +29,16 @@ import { AddonModBBBData, AddonModBBBService } from '../../services/bigbluebutto
 @Component({
     selector: 'addon-mod-bbb-index',
     templateUrl: 'index.html',
+    styleUrls: ['index.scss'],
 })
 export class AddonModBBBIndexComponent extends CoreCourseModuleMainActivityComponent implements OnInit {
 
     component = AddonModBBBService.COMPONENT;
     moduleName = 'bigbluebuttonbn';
     bbb?: AddonModBBBData;
+    groupInfo?: CoreGroupInfo;
+    groupId = 0;
+    meetingInfo?: AddonModBBBMeetingInfoWSResponse;
 
     constructor(
         protected content?: IonContent,
@@ -46,7 +55,17 @@ export class AddonModBBBIndexComponent extends CoreCourseModuleMainActivityCompo
 
         await this.loadContent();
 
-        // @todo
+        if (!this.bbb) {
+            return;
+        }
+
+        try {
+            await AddonModBBB.logView(this.bbb.id, this.bbb.name);
+
+            CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
+        } catch {
+            // Ignore errors.
+        }
     }
 
     /**
@@ -54,10 +73,108 @@ export class AddonModBBBIndexComponent extends CoreCourseModuleMainActivityCompo
      */
     protected async fetchContent(refresh: boolean = false): Promise<void> {
         try {
-            // @todo
+            this.bbb = await AddonModBBB.getBBB(this.courseId, this.module.id);
+
+            this.description = this.bbb.intro;
+            this.dataRetrieved.emit(this.bbb);
+
+            this.groupInfo = await CoreGroups.getActivityGroupInfo(this.module.id, false);
+
+            this.groupId = CoreGroups.validateGroupId(this.groupId, this.groupInfo);
+
+            await this.fetchMeetingInfo();
         } finally {
             this.fillContextMenu(refresh);
         }
     }
 
+    /**
+     * Get meeting info.
+     *
+     * @return Promise resolved when done.
+     */
+    async fetchMeetingInfo(): Promise<void> {
+        if (!this.bbb) {
+            return;
+        }
+
+        this.meetingInfo = await AddonModBBB.getMeetingInfo(this.bbb.id, this.groupId);
+
+        if (this.meetingInfo.statusrunning && this.meetingInfo.userlimit > 0) {
+            const count = (this.meetingInfo.participantcount || 0) + (this.meetingInfo.moderatorcount || 0);
+            if (count === this.meetingInfo.userlimit) {
+                this.meetingInfo.statusmessage = Translate.instant('addon.mod_bigbluebuttonbn.userlimitreached');
+            }
+        }
+    }
+
+    /**
+     * Update meeting info.
+     *
+     * @return Promise resolved when done.
+     */
+    async updateMeetingInfo(): Promise<void> {
+        if (!this.bbb) {
+            return;
+        }
+
+        await AddonModBBB.invalidateAllGroupsMeetingInfo(this.bbb.id);
+
+        await this.fetchMeetingInfo();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected async invalidateContent(): Promise<void> {
+        const promises: Promise<void>[] = [];
+
+        promises.push(AddonModBBB.invalidateBBBs(this.courseId));
+        promises.push(CoreGroups.invalidateActivityGroupInfo(this.module.id));
+
+        if (this.bbb) {
+            promises.push(AddonModBBB.invalidateAllGroupsMeetingInfo(this.bbb.id));
+        }
+
+        await Promise.all(promises);
+    }
+
+    /**
+     * Group changed, reload some data.
+     *
+     * @return Promise resolved when done.
+     */
+    async groupChanged(): Promise<void> {
+        this.loaded = false;
+
+        try {
+            await this.fetchMeetingInfo();
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+        } finally {
+            this.loaded = true;
+        }
+    }
+
+    /**
+     * Join the room.
+     *
+     * @return Promise resolved when done.
+     */
+    async joinRoom(): Promise<void> {
+        const modal = await CoreDomUtils.showModalLoading();
+
+        try {
+            const joinUrl = await AddonModBBB.getJoinUrl(this.module.id, this.groupId);
+
+            CoreUtils.openInBrowser(joinUrl);
+
+            this.updateMeetingInfo();
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+        } finally {
+            modal.dismiss();
+        }
+    }
+
 }
diff --git a/src/addons/mod/bigbluebuttonbn/lang.json b/src/addons/mod/bigbluebuttonbn/lang.json
index a87fdb56f..ccc84da16 100644
--- a/src/addons/mod/bigbluebuttonbn/lang.json
+++ b/src/addons/mod/bigbluebuttonbn/lang.json
@@ -1,3 +1,15 @@
 {
-    "view_error_unable_join_student": "BeeUnable to connect to the BigBlueButton server. Please contact your Teacher or the Administrator.p"
+    "mod_form_field_closingtime": "Join closed",
+    "mod_form_field_openingtime": "Join open",
+    "userlimitreached": "The number of users allowed in a meeting has been reached.",
+    "view_conference_action_join": "Join session",
+    "view_error_unable_join_student": "Unable to connect to the BigBlueButton server. Please contact your Teacher or the Administrator.",
+    "view_groups_selection_warning": "There is a conference room for each group and you have access to more than one. Be sure to select the correct one.",
+    "view_message_conference_in_progress": "This conference is in progress.",
+    "view_message_conference_room_ready": "This conference room is ready. You can join the session now.",
+    "view_message_moderator": "moderator",
+    "view_message_moderators": "moderators",
+    "view_message_session_started_at": "This session started at",
+    "view_message_viewer": "viewer",
+    "view_message_viewers": "viewers"
 }
diff --git a/src/addons/mod/bigbluebuttonbn/services/bigbluebuttonbn.ts b/src/addons/mod/bigbluebuttonbn/services/bigbluebuttonbn.ts
index f1ed9f3cf..74c672d55 100644
--- a/src/addons/mod/bigbluebuttonbn/services/bigbluebuttonbn.ts
+++ b/src/addons/mod/bigbluebuttonbn/services/bigbluebuttonbn.ts
@@ -304,8 +304,8 @@ export type AddonModBBBMeetingInfoWSResponse = {
     userlimit: number; // User limit.
     bigbluebuttonbnid: string; // Bigbluebuttonbn instance id.
     meetingid: string; // Meeting id.
-    openingtime?: string; // Opening time.
-    closingtime?: string; // Closing time.
+    openingtime?: number; // Opening time.
+    closingtime?: number; // Closing time.
     statusrunning?: boolean; // Status running.
     statusclosed?: boolean; // Status closed.
     statusopen?: boolean; // Status open.
diff --git a/src/addons/mod/bigbluebuttonbn/services/handlers/module.ts b/src/addons/mod/bigbluebuttonbn/services/handlers/module.ts
index 4863be94e..85956b4ed 100644
--- a/src/addons/mod/bigbluebuttonbn/services/handlers/module.ts
+++ b/src/addons/mod/bigbluebuttonbn/services/handlers/module.ts
@@ -15,7 +15,7 @@
 import { CoreConstants } from '@/core/constants';
 import { Injectable, Type } from '@angular/core';
 import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
-import { CoreCourseAnyModuleData } from '@features/course/services/course';
+import { CoreCourseModule } from '@features/course/services/course-helper';
 import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
 import { CoreSitePluginsModuleHandler } from '@features/siteplugins/classes/handlers/module-handler';
 import { CoreSitePlugins } from '@features/siteplugins/services/siteplugins';
@@ -71,17 +71,17 @@ export class AddonModBBBModuleHandlerService extends CoreModuleHandlerBase imple
     /**
      * @inheritdoc
      */
-    getData(
-        module: CoreCourseAnyModuleData,
+    async getData(
+        module: CoreCourseModule,
         courseId: number,
         sectionId?: number,
         forCoursePage?: boolean,
-    ): CoreCourseModuleHandlerData {
+    ): Promise<CoreCourseModuleHandlerData> {
         if (this.sitePluginHandler) {
             return this.sitePluginHandler.getData(module, courseId, sectionId, forCoursePage);
         }
 
-        const data = super.getData(module, courseId, sectionId, forCoursePage);
+        const data = await super.getData(module, courseId, sectionId, forCoursePage);
 
         data.showDownloadButton = false;
 
diff --git a/src/addons/mod/workshop/components/index/index.ts b/src/addons/mod/workshop/components/index/index.ts
index ef11aedf7..91c8bba44 100644
--- a/src/addons/mod/workshop/components/index/index.ts
+++ b/src/addons/mod/workshop/components/index/index.ts
@@ -82,6 +82,7 @@ export class AddonModWorkshopIndexComponent extends CoreCourseModuleMainActivity
         separateGroups: false,
         visibleGroups: false,
         defaultGroupId: 0,
+        canAccessAllGroups: false,
     };
 
     canSubmit = false;
diff --git a/src/core/services/groups.ts b/src/core/services/groups.ts
index 7aad3f30c..b0d63b803 100644
--- a/src/core/services/groups.ts
+++ b/src/core/services/groups.ts
@@ -151,6 +151,7 @@ export class CoreGroupsProvider {
         const groupInfo: CoreGroupInfo = {
             groups: [],
             defaultGroupId: 0,
+            canAccessAllGroups: false,
         };
 
         const groupMode = await this.getActivityGroupMode(cmId, siteId, ignoreCache);
@@ -161,6 +162,8 @@ export class CoreGroupsProvider {
         let result: CoreGroupGetActivityAllowedGroupsWSResponse;
         if (groupInfo.separateGroups || groupInfo.visibleGroups) {
             result = await this.getActivityAllowedGroups(cmId, userId, siteId, ignoreCache);
+
+            groupInfo.canAccessAllGroups = !!result.canaccessallgroups;
         } else {
             result = {
                 groups: [],
@@ -471,6 +474,11 @@ export type CoreGroupInfo = {
      * The group ID to use by default. If all participants is visible, 0 will be used. First group ID otherwise.
      */
     defaultGroupId: number;
+
+    /**
+     * Whether the user has the capability to access all groups in the context.
+     */
+    canAccessAllGroups: boolean;
 };
 
 /**

From 93ea867deccfa80da445c8e975de6dd3942d2537 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 1 Dec 2021 11:17:59 +0100
Subject: [PATCH 0279/1008] MOBILE-3873 bbb: Let moderators end the meeting

---
 scripts/langindex.json                        |  3 ++
 .../components/index/index.html               |  5 +++
 .../bigbluebuttonbn/components/index/index.ts | 45 ++++++++++++++++++-
 src/addons/mod/bigbluebuttonbn/lang.json      |  3 ++
 .../services/bigbluebuttonbn.ts               | 31 +++++++++++++
 5 files changed, 85 insertions(+), 2 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index d9f55134b..5a800908f 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -433,9 +433,12 @@
   "addon.mod_assign_submission_file.pluginname": "assignsubmission_file",
   "addon.mod_assign_submission_onlinetext.pluginname": "assignsubmission_onlinetext",
   "addon.mod_assign_submission_onlinetext.wordlimitexceeded": "assignsubmission_onlinetext",
+  "addon.mod_bigbluebuttonbn.end_session_confirm": "bigbluebuttonbn",
+  "addon.mod_bigbluebuttonbn.end_session_confirm_title": "bigbluebuttonbn",
   "addon.mod_bigbluebuttonbn.mod_form_field_closingtime": "bigbluebuttonbn",
   "addon.mod_bigbluebuttonbn.mod_form_field_openingtime": "bigbluebuttonbn",
   "addon.mod_bigbluebuttonbn.userlimitreached": "bigbluebuttonbn",
+  "addon.mod_bigbluebuttonbn.view_conference_action_end": "bigbluebuttonbn",
   "addon.mod_bigbluebuttonbn.view_conference_action_join": "bigbluebuttonbn",
   "addon.mod_bigbluebuttonbn.view_error_unable_join_student": "bigbluebuttonbn",
   "addon.mod_bigbluebuttonbn.view_groups_selection_warning": "bigbluebuttonbn",
diff --git a/src/addons/mod/bigbluebuttonbn/components/index/index.html b/src/addons/mod/bigbluebuttonbn/components/index/index.html
index 88ae1dc38..dcc1e84e1 100644
--- a/src/addons/mod/bigbluebuttonbn/components/index/index.html
+++ b/src/addons/mod/bigbluebuttonbn/components/index/index.html
@@ -120,6 +120,11 @@
             {{ 'addon.mod_bigbluebuttonbn.view_conference_action_join' | translate }}
         </ion-button>
 
+        <ion-button *ngIf="meetingInfo.statusrunning && meetingInfo.ismoderator" color="light" class="ion-margin" expand="block"
+            (click)="endMeeting()">
+            {{ 'addon.mod_bigbluebuttonbn.view_conference_action_end' | translate }}
+        </ion-button>
+
         <ion-card *ngIf="!meetingInfo.canjoin" class="core-warning-card">
             <ion-item class="ion-text-wrap">
                 <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
diff --git a/src/addons/mod/bigbluebuttonbn/components/index/index.ts b/src/addons/mod/bigbluebuttonbn/components/index/index.ts
index 3f62eea6e..b47e7b356 100644
--- a/src/addons/mod/bigbluebuttonbn/components/index/index.ts
+++ b/src/addons/mod/bigbluebuttonbn/components/index/index.ts
@@ -45,6 +45,7 @@ export class AddonModBBBIndexComponent extends CoreCourseModuleMainActivityCompo
         @Optional() courseContentsPage?: CoreCourseContentsPage,
     ) {
         super('AddonModBBBIndexComponent', content, courseContentsPage);
+        (<any>window).ths = this;
     }
 
     /**
@@ -118,9 +119,15 @@ export class AddonModBBBIndexComponent extends CoreCourseModuleMainActivityCompo
             return;
         }
 
-        await AddonModBBB.invalidateAllGroupsMeetingInfo(this.bbb.id);
+        this.loaded = false;
 
-        await this.fetchMeetingInfo();
+        try {
+            await AddonModBBB.invalidateAllGroupsMeetingInfo(this.bbb.id);
+
+            await this.fetchMeetingInfo();
+        } finally {
+            this.loaded = true;
+        }
     }
 
     /**
@@ -177,4 +184,38 @@ export class AddonModBBBIndexComponent extends CoreCourseModuleMainActivityCompo
         }
     }
 
+    /**
+     * End the meeting.
+     *
+     * @return Promise resolved when done.
+     */
+    async endMeeting(): Promise<void> {
+        if (!this.bbb) {
+            return;
+        }
+
+        try {
+            await CoreDomUtils.showConfirm(
+                Translate.instant('addon.mod_bigbluebuttonbn.end_session_confirm'),
+                Translate.instant('addon.mod_bigbluebuttonbn.end_session_confirm_title'),
+                Translate.instant('core.yes'),
+            );
+        } catch {
+            // User canceled.
+            return;
+        }
+
+        const modal = await CoreDomUtils.showModalLoading();
+
+        try {
+            await AddonModBBB.endMeeting(this.bbb.id, this.groupId);
+
+            this.updateMeetingInfo();
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+        } finally {
+            modal.dismiss();
+        }
+    }
+
 }
diff --git a/src/addons/mod/bigbluebuttonbn/lang.json b/src/addons/mod/bigbluebuttonbn/lang.json
index ccc84da16..dba17cf44 100644
--- a/src/addons/mod/bigbluebuttonbn/lang.json
+++ b/src/addons/mod/bigbluebuttonbn/lang.json
@@ -1,7 +1,10 @@
 {
+    "end_session_confirm": "Are you sure you want to end the virtual classroom session?",
+    "end_session_confirm_title": "Really end session?",
     "mod_form_field_closingtime": "Join closed",
     "mod_form_field_openingtime": "Join open",
     "userlimitreached": "The number of users allowed in a meeting has been reached.",
+    "view_conference_action_end": "End session",
     "view_conference_action_join": "Join session",
     "view_error_unable_join_student": "Unable to connect to the BigBlueButton server. Please contact your Teacher or the Administrator.",
     "view_groups_selection_warning": "There is a conference room for each group and you have access to more than one. Be sure to select the correct one.",
diff --git a/src/addons/mod/bigbluebuttonbn/services/bigbluebuttonbn.ts b/src/addons/mod/bigbluebuttonbn/services/bigbluebuttonbn.ts
index 74c672d55..4889b310d 100644
--- a/src/addons/mod/bigbluebuttonbn/services/bigbluebuttonbn.ts
+++ b/src/addons/mod/bigbluebuttonbn/services/bigbluebuttonbn.ts
@@ -32,6 +32,29 @@ export class AddonModBBBService {
 
     static readonly COMPONENT = 'mmaModBigBlueButtonBN';
 
+    /**
+     * End a meeting.
+     *
+     * @param id BBB ID.
+     * @param groupId Group ID, 0 means that the function will determine the user group.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
+     */
+    async endMeeting(
+        id: number,
+        groupId: number = 0,
+        siteId?: string,
+    ): Promise<void> {
+        const site = await CoreSites.getSite(siteId);
+
+        const params: AddonModBBBEndMeetingWSParams = {
+            bigbluebuttonbnid: id,
+            groupid: groupId,
+        };
+
+        await site.write('mod_bigbluebuttonbn_end_meeting', params);
+    }
+
     /**
      * Get a BBB activity.
      *
@@ -349,3 +372,11 @@ export type AddonModBBBGetJoinUrlWSResponse = {
 export type AddonModBBBViewBigBlueButtonBNWSParams = {
     bigbluebuttonbnid: number; // Bigbluebuttonbn instance id.
 };
+
+/**
+ * Params of mod_bigbluebuttonbn_end_meeting WS.
+ */
+export type AddonModBBBEndMeetingWSParams = {
+    bigbluebuttonbnid: number; // Bigbluebuttonbn instance id.
+    groupid?: number; // Bigbluebuttonbn group id.
+};

From b9747416e54742f566b30ed56746e61b1bf9d2d9 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 14 Dec 2021 08:50:37 +0100
Subject: [PATCH 0280/1008] MOBILE-3949 cordova: Use fork of cordova-plugin-zip

---
 package-lock.json | 36 ++++++++++++++++++------------------
 package.json      |  4 ++--
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c8e706569..7871f8a11 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -48,6 +48,7 @@
         "@moodlehq/cordova-plugin-ionic-webview": "5.0.0-moodle.1",
         "@moodlehq/cordova-plugin-local-notification": "0.9.0-moodle.3",
         "@moodlehq/cordova-plugin-qrscanner": "3.0.1-moodle.2",
+        "@moodlehq/cordova-plugin-zip": "3.1.0-moodle.1",
         "@moodlehq/phonegap-plugin-push": "2.0.0-moodle.2",
         "@ngx-translate/core": "^13.0.0",
         "@ngx-translate/http-loader": "^6.0.0",
@@ -82,7 +83,6 @@
         "cordova-plugin-whitelist": "^1.3.4",
         "cordova-plugin-wkuserscript": "^1.0.0",
         "cordova-plugin-wkwebview-cookies": "^1.0.0",
-        "cordova-plugin-zip": "^3.1.0",
         "cordova-sqlite-storage": "^6.0.0",
         "cordova-support-google-services": "^1.2.1",
         "cordova.plugins.diagnostic": "^5.0.2",
@@ -95,7 +95,7 @@
         "nl.kingsquare.cordova.background-audio": "^1.0.1",
         "rxjs": "~6.5.5",
         "ts-md5": "^1.2.7",
-        "tslib": "^2.0.1",
+        "tslib": "^2.3.1",
         "zone.js": "~0.10.3"
       },
       "devDependencies": {
@@ -5198,6 +5198,17 @@
         "webrtc-adapter": "^3.1.4"
       }
     },
+    "node_modules/@moodlehq/cordova-plugin-zip": {
+      "version": "3.1.0-moodle.1",
+      "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-zip/-/cordova-plugin-zip-3.1.0-moodle.1.tgz",
+      "integrity": "sha512-QD5S6bsm6awJrNMb8YN/vkYghKAMfZMHccdimx6s1i5S9fgZUSf7L477NJqjFu62imVZYJIJuavBbw5fR/562w==",
+      "engines": [
+        {
+          "name": "cordova",
+          "version": ">=3.3.0"
+        }
+      ]
+    },
     "node_modules/@moodlehq/phonegap-plugin-push": {
       "version": "2.0.0-moodle.2",
       "resolved": "https://registry.npmjs.org/@moodlehq/phonegap-plugin-push/-/phonegap-plugin-push-2.0.0-moodle.2.tgz",
@@ -11269,17 +11280,6 @@
         }
       }
     },
-    "node_modules/cordova-plugin-zip": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-zip/-/cordova-plugin-zip-3.1.0.tgz",
-      "integrity": "sha1-F2yCSOog058c+VnvXmFWrMqWshc=",
-      "engines": [
-        {
-          "name": "cordova",
-          "version": ">=3.3.0"
-        }
-      ]
-    },
     "node_modules/cordova-serve": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/cordova-serve/-/cordova-serve-4.0.0.tgz",
@@ -35219,6 +35219,11 @@
         "webrtc-adapter": "^3.1.4"
       }
     },
+    "@moodlehq/cordova-plugin-zip": {
+      "version": "3.1.0-moodle.1",
+      "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-zip/-/cordova-plugin-zip-3.1.0-moodle.1.tgz",
+      "integrity": "sha512-QD5S6bsm6awJrNMb8YN/vkYghKAMfZMHccdimx6s1i5S9fgZUSf7L477NJqjFu62imVZYJIJuavBbw5fR/562w=="
+    },
     "@moodlehq/phonegap-plugin-push": {
       "version": "2.0.0-moodle.2",
       "resolved": "https://registry.npmjs.org/@moodlehq/phonegap-plugin-push/-/phonegap-plugin-push-2.0.0-moodle.2.tgz",
@@ -39911,11 +39916,6 @@
       "resolved": "https://registry.npmjs.org/cordova-plugin-wkwebview-cookies/-/cordova-plugin-wkwebview-cookies-1.0.0.tgz",
       "integrity": "sha512-bQRnc/1UNu2XDb6ds+RuAZGA8FM2MuQb4z45J/CaDfjSs60OSvxGVKo3okrM/okYosZqWJFygrPah0MK3lDERQ=="
     },
-    "cordova-plugin-zip": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-zip/-/cordova-plugin-zip-3.1.0.tgz",
-      "integrity": "sha1-F2yCSOog058c+VnvXmFWrMqWshc="
-    },
     "cordova-serve": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/cordova-serve/-/cordova-serve-4.0.0.tgz",
diff --git a/package.json b/package.json
index 75ccf9301..a0b638549 100644
--- a/package.json
+++ b/package.json
@@ -111,7 +111,7 @@
     "cordova-plugin-whitelist": "^1.3.4",
     "cordova-plugin-wkuserscript": "^1.0.0",
     "cordova-plugin-wkwebview-cookies": "^1.0.0",
-    "cordova-plugin-zip": "^3.1.0",
+    "@moodlehq/cordova-plugin-zip": "3.1.0-moodle.1",
     "cordova-sqlite-storage": "^6.0.0",
     "cordova-support-google-services": "^1.2.1",
     "cordova.plugins.diagnostic": "^5.0.2",
@@ -222,7 +222,7 @@
       "cordova-plugin-whitelist": {},
       "cordova-plugin-wkuserscript": {},
       "cordova-plugin-wkwebview-cookies": {},
-      "cordova-plugin-zip": {},
+      "@moodlehq/cordova-plugin-zip": {},
       "cordova-sqlite-storage": {},
       "@moodlehq/phonegap-plugin-push": {
         "ANDROID_SUPPORT_V13_VERSION": "28.0.0",

From c611e2d2d4d4b988105f248581f6bea58e5b5c7a Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 13 Dec 2021 16:44:48 +0100
Subject: [PATCH 0281/1008] MOBILE-3873 bbb: Apply latest UI changes for
 activities

---
 .../components/index/index.html               | 25 ++++-----
 .../bigbluebuttonbn/components/index/index.ts |  1 -
 .../bigbluebuttonbn/pages/index/index.html    | 12 ++--
 src/assets/img/mod/bigbluebuttonbn.svg        | 55 +++++++++++++++++++
 src/core/features/course/services/course.ts   |  2 +-
 5 files changed, 73 insertions(+), 22 deletions(-)
 create mode 100644 src/assets/img/mod/bigbluebuttonbn.svg

diff --git a/src/addons/mod/bigbluebuttonbn/components/index/index.html b/src/addons/mod/bigbluebuttonbn/components/index/index.html
index dcc1e84e1..a5a2baeb8 100644
--- a/src/addons/mod/bigbluebuttonbn/components/index/index.html
+++ b/src/addons/mod/bigbluebuttonbn/components/index/index.html
@@ -1,22 +1,18 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
     <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate"
-            [href]="externalUrl" iconAction="fas-external-link-alt">
+        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
+            iconAction="fas-external-link-alt">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
             (action)="expandDescription()" iconAction="fas-arrow-right">
         </core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}"
-            iconAction="far-newspaper" (action)="gotoBlog()">
+        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
+            (action)="gotoBlog()">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="loaded && isOnline" [priority]="700" [content]="'core.refresh' | translate"
             (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false">
         </core-context-menu-item>
-        <core-context-menu-item *ngIf="loaded && hasOffline && isOnline" [priority]="600"
-            [content]="'core.settings.synchronizenow' | translate" (action)="doRefresh(null, $event, true)" [iconAction]="syncIcon"
-            [closeOnClick]="false">
-        </core-context-menu-item>
         <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="500" [content]="prefetchText" (action)="prefetch($event)"
             [iconAction]="prefetchStatusIcon" [closeOnClick]="false">
         </core-context-menu-item>
@@ -27,14 +23,10 @@
 <core-loading [hideUntil]="loaded" class="safe-area-page">
 
     <!-- Activity info. -->
-    <core-course-module-info *ngIf="showCompletion" [module]="module" [showManualCompletion]="true"
-        (completionChanged)="onCompletionChange()">
+    <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
+        [component]="component" [componentId]="componentId" [courseId]="courseId">
     </core-course-module-info>
 
-    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId"
-        contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
-    </core-course-module-description>
-
     <ng-container *ngIf="groupInfo && (groupInfo.separateGroups || groupInfo.visibleGroups)">
         <ion-card class="core-info-card" *ngIf="groupInfo.groups && groupInfo.groups.length > 1">
             <ion-item>
@@ -43,7 +35,7 @@
             </ion-item>
         </ion-card>
 
-        <ion-item class="ion-text-wrap" >
+        <ion-item class="ion-text-wrap">
             <ion-label id="addon-bigbluebuttonbn-groupslabel">
                 <ng-container *ngIf="groupInfo.separateGroups">{{'core.groupsseparate' | translate }}</ng-container>
                 <ng-container *ngIf="groupInfo.visibleGroups">{{'core.groupsvisible' | translate }}</ng-container>
@@ -133,3 +125,6 @@
         </ion-card>
     </ng-container>
 </core-loading>
+
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+</core-course-module-navigation>
diff --git a/src/addons/mod/bigbluebuttonbn/components/index/index.ts b/src/addons/mod/bigbluebuttonbn/components/index/index.ts
index b47e7b356..16ff70143 100644
--- a/src/addons/mod/bigbluebuttonbn/components/index/index.ts
+++ b/src/addons/mod/bigbluebuttonbn/components/index/index.ts
@@ -45,7 +45,6 @@ export class AddonModBBBIndexComponent extends CoreCourseModuleMainActivityCompo
         @Optional() courseContentsPage?: CoreCourseContentsPage,
     ) {
         super('AddonModBBBIndexComponent', content, courseContentsPage);
-        (<any>window).ths = this;
     }
 
     /**
diff --git a/src/addons/mod/bigbluebuttonbn/pages/index/index.html b/src/addons/mod/bigbluebuttonbn/pages/index/index.html
index f8b7babdf..5d8e5197e 100644
--- a/src/addons/mod/bigbluebuttonbn/pages/index/index.html
+++ b/src/addons/mod/bigbluebuttonbn/pages/index/index.html
@@ -1,12 +1,14 @@
-<ion-header>
+<ion-header collapsible>
     <ion-toolbar>
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
-        <h1>
-            <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
-            </core-format-text>
-        </h1>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
         <ion-buttons slot="end">
             <!-- The buttons defined by the component will be added in here. -->
         </ion-buttons>
diff --git a/src/assets/img/mod/bigbluebuttonbn.svg b/src/assets/img/mod/bigbluebuttonbn.svg
new file mode 100644
index 000000000..7b92ab21b
--- /dev/null
+++ b/src/assets/img/mod/bigbluebuttonbn.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="24px" height="24px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-58.9473" y1="84.1865" x2="58.9479" y2="-84.1852">
+			<stop  offset="0" style="stop-color:#283274"/>
+			<stop  offset="0.7088" style="stop-color:#293275"/>
+			<stop  offset="0.967" style="stop-color:#273F87"/>
+		</linearGradient>
+<symbol  id="New_Symbol" viewBox="-107.423 -107.423 214.847 214.846">
+	<g>
+		<path fill="url(#SVGID_1_)" stroke="#5D6AA4" stroke-width="9.3191" d="M102.765,0c0-56.755-46.009-102.764-102.765-102.764
+			c-56.754,0-102.764,46.009-102.764,102.764S-56.754,102.764,0,102.764C56.756,102.764,102.765,56.755,102.765,0z"/>
+		
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="-75.0186" y1="112.8037" x2="-15.8528" y2="28.3063" gradientTransform="matrix(1 0 0 1 18.4946 -31.9512)">
+			<stop  offset="0" style="stop-color:#BEC7E5"/>
+			<stop  offset="0.0956" style="stop-color:#B5BEDE"/>
+			<stop  offset="0.2524" style="stop-color:#9CA5CC"/>
+			<stop  offset="0.4508" style="stop-color:#747DAE"/>
+			<stop  offset="0.6809" style="stop-color:#3D4684"/>
+			<stop  offset="0.7582" style="stop-color:#293275"/>
+		</linearGradient>
+		<path fill="url(#SVGID_2_)" d="M0.282,98.502C26.323,98.31,54.293,87.893,74.49,63.84C73.631,43.207,36.703,22.057,5.886-1.229
+			c-25.857-19.538-65.427-37.86-92.487-45.059c-25.73,49.263-7.016,96.619,25.25,123.238C-46.256,90.16-23.508,98.679,0.282,98.502z
+			"/>
+	</g>
+	<g>
+		<g>
+			<path d="M55.602-25.561c0-8.678-3.055-16.072-9.16-22.179c-6.11-6.109-13.501-9.16-22.179-9.16h-37.367
+				c-8.679,0-16.073,3.051-22.179,9.16c-6.11,6.106-9.162,13.501-9.162,22.179v93.779c6.656,0,12.336-3.254,17.046-9.764
+				c4.708-6.509,7.062-14.344,7.062-23.505v-60.511c0-4.821,2.411-7.231,7.232-7.231h37.367c4.821,0,7.231,2.41,7.231,7.231V3.128
+				c0,4.66-2.41,7.07-7.231,7.232H17.03c-9.323,0.324-17.2,2.757-23.626,7.304c-6.43,4.543-9.643,10.145-9.643,16.805h40.501
+				c8.678,0,16.068-3.056,22.179-9.161c6.105-6.11,9.16-13.5,9.16-22.18V-25.561z"/>
+		</g>
+	</g>
+	<g opacity="0.46">
+		<g>
+			<path fill="#FFFFFF" d="M55.602-25.561c0-8.678-3.055-16.072-9.16-22.179c-6.11-6.109-13.501-9.16-22.179-9.16h-37.367
+				c-8.679,0-16.073,3.051-22.179,9.16c-6.11,6.106-9.162,13.501-9.162,22.179v93.779c6.656,0,12.336-3.254,17.046-9.764
+				c4.708-6.509,7.062-14.344,7.062-23.505v-60.511c0-4.821,2.411-7.231,7.232-7.231h37.367c4.821,0,7.231,2.41,7.231,7.231V3.128
+				c0,4.66-2.41,7.07-7.231,7.232H17.03c-9.323,0.324-17.2,2.757-23.626,7.304c-6.43,4.543-9.643,10.145-9.643,16.805h40.501
+				c8.678,0,16.068-3.056,22.179-9.161c6.105-6.11,9.16-13.5,9.16-22.18V-25.561z"/>
+		</g>
+	</g>
+	<g>
+		<path fill="#FFFFFF" d="M53.829-26.788c0-8.678-3.055-16.072-9.16-22.179c-6.11-6.109-13.501-9.16-22.18-9.16h-37.367
+			c-8.679,0-16.073,3.051-22.179,9.16c-6.109,6.106-9.16,13.501-9.16,22.179v93.779c6.655,0,12.336-3.255,17.045-9.764
+			c4.708-6.509,7.062-14.345,7.062-23.505v-60.511c0-4.821,2.41-7.231,7.232-7.231h37.367c4.821,0,7.232,2.41,7.232,7.231V1.901
+			c0,4.66-2.411,7.07-7.232,7.232h-7.232C5.935,9.457-1.942,11.89-8.368,16.438c-6.43,4.542-9.644,10.144-9.644,16.803h40.501
+			c8.679,0,16.069-3.055,22.18-9.16c6.105-6.109,9.16-13.5,9.16-22.179V-26.788z"/>
+	</g>
+</symbol>
+<use xlink:href="#New_Symbol"  width="214.847" height="214.846" x="-107.423" y="-107.423" transform="matrix(0.1376 0 0 -0.1376 14.9995 15)" overflow="visible"/>
+</svg>
diff --git a/src/core/features/course/services/course.ts b/src/core/features/course/services/course.ts
index acea7dd52..6d5b8ea86 100644
--- a/src/core/features/course/services/course.ts
+++ b/src/core/features/course/services/course.ts
@@ -87,7 +87,7 @@ export class CoreCourseProvider {
     readonly CORE_MODULES = [
         'assign', 'assignment', 'book', 'chat', 'choice', 'data', 'database', 'date', 'external-tool',
         'feedback', 'file', 'folder', 'forum', 'glossary', 'ims', 'imscp', 'label', 'lesson', 'lti', 'page', 'quiz',
-        'resource', 'scorm', 'survey', 'url', 'wiki', 'workshop', 'h5pactivity',
+        'resource', 'scorm', 'survey', 'url', 'wiki', 'workshop', 'h5pactivity', 'bigbluebuttonbn',
     ];
 
     protected logger: CoreLogger;

From c7a32b3e09232098314e9b7ab139cd9272402eee Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 15 Dec 2021 09:10:39 +0100
Subject: [PATCH 0282/1008] MOBILE-3946 h5p: Refresh completion when H5P is
 finished

---
 .../mod/h5pactivity/components/index/index.ts | 16 ++++++--
 .../mod/h5pactivity/services/h5pactivity.ts   | 40 +++++++++++++++++++
 2 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/src/addons/mod/h5pactivity/components/index/index.ts b/src/addons/mod/h5pactivity/components/index/index.ts
index 0f8e18d6f..d54c0db3e 100644
--- a/src/addons/mod/h5pactivity/components/index/index.ts
+++ b/src/addons/mod/h5pactivity/components/index/index.ts
@@ -37,6 +37,7 @@ import {
     AddonModH5PActivityAccessInfo,
     AddonModH5PActivityData,
     AddonModH5PActivityProvider,
+    AddonModH5PActivityXAPIData,
 } from '../../services/h5pactivity';
 import {
     AddonModH5PActivitySync,
@@ -409,7 +410,8 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
      * @return Promise resolved when done.
      */
     protected async onIframeMessage(event: MessageEvent): Promise<void> {
-        if (!event.data || !CoreXAPI.canPostStatementsInSite(this.site) || !this.isCurrentXAPIPost(event.data)) {
+        const data = event.data;
+        if (!data || !CoreXAPI.canPostStatementsInSite(this.site) || !this.isCurrentXAPIPost(data)) {
             return;
         }
 
@@ -423,8 +425,8 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
 
             const sent = await CoreXAPI.postStatements(
                 this.h5pActivity!.context,
-                event.data.component,
-                JSON.stringify(event.data.statements),
+                data.component,
+                JSON.stringify(data.statements),
                 options,
             );
 
@@ -437,6 +439,12 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
                 } catch (error) {
                     // Ignore errors.
                 }
+
+                // Check if the H5P has ended. Final statements don't include a subContentId.
+                const hasEnded = data.statements.some(statement => !statement.object.id.includes('subContentId='));
+                if (hasEnded) {
+                    CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
+                }
             }
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'Error sending tracking data.');
@@ -450,7 +458,7 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
      * @return Whether it's an XAPI post statement of the current activity.
      */
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    protected isCurrentXAPIPost(data: any): boolean {
+    protected isCurrentXAPIPost(data: any): data is AddonModH5PActivityXAPIData {
         if (data.environment != 'moodleapp' || data.context != 'h5p' || data.action != 'xapi_post_statement' || !data.statements) {
             return false;
         }
diff --git a/src/addons/mod/h5pactivity/services/h5pactivity.ts b/src/addons/mod/h5pactivity/services/h5pactivity.ts
index f3e3b0c1a..e43b39bdd 100644
--- a/src/addons/mod/h5pactivity/services/h5pactivity.ts
+++ b/src/addons/mod/h5pactivity/services/h5pactivity.ts
@@ -1128,3 +1128,43 @@ declare module '@singletons/events' {
     }
 
 }
+
+/**
+ * Data to be sent using xAPI.
+ */
+export type AddonModH5PActivityXAPIData = {
+    action: string;
+    component: string;
+    context: string;
+    environment: string;
+    statements: AddonModH5PActivityStatement[];
+};
+
+/**
+ * xAPI statement.
+ */
+export type AddonModH5PActivityStatement = {
+    actor: Record<string, string>;
+    context: Record<string, unknown>;
+    object: {
+        id: string;
+        definition: Record<string, unknown>;
+        objectType: string;
+    };
+    result: {
+        completion: boolean;
+        duration: string;
+        score: {
+            min: number;
+            max: number;
+            raw: number;
+            scaled: number;
+        };
+        success?: boolean;
+        response?: string;
+    };
+    verb: {
+        id: string;
+        display: Record<string, string>;
+    };
+};

From 171a122ec931c4b1e6df98564ee54290af0f63ae Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 15 Dec 2021 09:23:08 +0100
Subject: [PATCH 0283/1008] MOBILE-3946 h5pactivity: Fix non-null assertion
 eslint warnings

---
 .../mod/h5pactivity/components/index/index.ts | 72 ++++++++++++++-----
 .../pages/attempt-results/attempt-results.ts  | 10 ++-
 .../pages/user-attempts/user-attempts.ts      | 10 ++-
 .../pages/users-attempts/users-attempts.ts    | 22 ++++--
 .../mod/h5pactivity/services/h5pactivity.ts   | 14 ++--
 5 files changed, 94 insertions(+), 34 deletions(-)

diff --git a/src/addons/mod/h5pactivity/components/index/index.ts b/src/addons/mod/h5pactivity/components/index/index.ts
index d54c0db3e..f8cb4d015 100644
--- a/src/addons/mod/h5pactivity/components/index/index.ts
+++ b/src/addons/mod/h5pactivity/components/index/index.ts
@@ -166,7 +166,11 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
      * @return Promise resolved when done.
      */
     protected async checkHasOffline(): Promise<void> {
-        this.hasOffline = await CoreXAPIOffline.contextHasStatements(this.h5pActivity!.context, this.siteId);
+        if (!this.h5pActivity) {
+            return;
+        }
+
+        this.hasOffline = await CoreXAPIOffline.contextHasStatements(this.h5pActivity.context, this.siteId);
     }
 
     /**
@@ -175,7 +179,11 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
      * @return Promise resolved when done.
      */
     protected async fetchAccessInfo(): Promise<void> {
-        this.accessInfo = await AddonModH5PActivity.getAccessInformation(this.h5pActivity!.id, {
+        if (!this.h5pActivity) {
+            return;
+        }
+
+        this.accessInfo = await AddonModH5PActivity.getAccessInformation(this.h5pActivity.id, {
             cmId: this.module.id,
             siteId: this.siteId,
         });
@@ -187,12 +195,12 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
      * @return Promise resolved when done.
      */
     protected async fetchDeployedFileData(): Promise<void> {
-        if (!this.siteCanDownload) {
+        if (!this.siteCanDownload || !this.h5pActivity) {
             // Cannot download the file, no need to fetch the file data.
             return;
         }
 
-        this.deployedFile = await AddonModH5PActivity.getDeployedFile(this.h5pActivity!, {
+        this.deployedFile = await AddonModH5PActivity.getDeployedFile(this.h5pActivity, {
             displayOptions: this.displayOptions,
             siteId: this.siteId,
         });
@@ -217,10 +225,14 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
      * @return Promise resolved when done.
      */
     protected async calculateFileState(): Promise<void> {
+        if (!this.fileUrl || !this.deployedFile) {
+            return;
+        }
+
         this.state = await CoreFilepool.getFileStateByUrl(
             this.site.getId(),
-            this.fileUrl!,
-            this.deployedFile!.timemodified,
+            this.fileUrl,
+            this.deployedFile.timemodified,
         );
 
         this.showFileState();
@@ -268,6 +280,10 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
         event?.preventDefault();
         event?.stopPropagation();
 
+        if (!this.deployedFile) {
+            return;
+        }
+
         if (!CoreApp.isOnline()) {
             CoreDomUtils.showErrorModal('core.networkerrormsg', true);
 
@@ -276,7 +292,7 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
 
         try {
             // Confirm the download if needed.
-            await CoreDomUtils.confirmDownloadSize({ size: this.deployedFile!.filesize!, total: true });
+            await CoreDomUtils.confirmDownloadSize({ size: this.deployedFile.filesize || 0, total: true });
 
             await this.downloadDeployedFile();
 
@@ -317,17 +333,22 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
      * @return Promise resolved when done.
      */
     protected async downloadDeployedFile(): Promise<void> {
+        if (!this.fileUrl || !this.deployedFile) {
+            return;
+        }
+
+        const deployedFile = this.deployedFile;
         this.downloading = true;
         this.progressMessage = 'core.downloading';
 
         try {
             await CoreFilepool.downloadUrl(
                 this.site.getId(),
-                this.fileUrl!,
+                this.fileUrl,
                 false,
                 this.component,
                 this.componentId,
-                this.deployedFile!.timemodified,
+                deployedFile.timemodified,
                 (data: DownloadProgressData) => {
                     if (!data) {
                         return;
@@ -341,7 +362,7 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
                         this.progressMessage = data.message;
                     } else if (data.loaded !== undefined) {
                         // Downloading or unzipping.
-                        const totalSize = this.progressMessage == 'core.downloading' ? this.deployedFile!.filesize : data.total;
+                        const totalSize = this.progressMessage == 'core.downloading' ? deployedFile.filesize : data.total;
 
                         if (totalSize !== undefined) {
                             const percentageNumber = (Number(data.loaded / totalSize) * 100);
@@ -364,10 +385,14 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
      * Play the package.
      */
     async play(): Promise<void> {
+        if (!this.h5pActivity) {
+            return;
+        }
+
         this.playing = true;
 
         // Mark the activity as viewed.
-        await AddonModH5PActivity.logView(this.h5pActivity!.id, this.h5pActivity!.name, this.siteId);
+        await AddonModH5PActivity.logView(this.h5pActivity.id, this.h5pActivity.name, this.siteId);
 
         CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
     }
@@ -411,7 +436,7 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
      */
     protected async onIframeMessage(event: MessageEvent): Promise<void> {
         const data = event.data;
-        if (!data || !CoreXAPI.canPostStatementsInSite(this.site) || !this.isCurrentXAPIPost(data)) {
+        if (!data || !this.h5pActivity || !CoreXAPI.canPostStatementsInSite(this.site) || !this.isCurrentXAPIPost(data)) {
             return;
         }
 
@@ -419,12 +444,12 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
             const options = {
                 offline: this.hasOffline,
                 courseId: this.courseId,
-                extra: this.h5pActivity!.name,
+                extra: this.h5pActivity.name,
                 siteId: this.site.getId(),
             };
 
             const sent = await CoreXAPI.postStatements(
-                this.h5pActivity!.context,
+                this.h5pActivity.context,
                 data.component,
                 JSON.stringify(data.statements),
                 options,
@@ -435,7 +460,7 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
             if (sent) {
                 try {
                     // Invalidate attempts.
-                    await AddonModH5PActivity.invalidateUserAttempts(this.h5pActivity!.id, undefined, this.siteId);
+                    await AddonModH5PActivity.invalidateUserAttempts(this.h5pActivity.id, undefined, this.siteId);
                 } catch (error) {
                     // Ignore errors.
                 }
@@ -459,6 +484,10 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
      */
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     protected isCurrentXAPIPost(data: any): data is AddonModH5PActivityXAPIData {
+        if (!this.h5pActivity) {
+            return false;
+        }
+
         if (data.environment != 'moodleapp' || data.context != 'h5p' || data.action != 'xapi_post_statement' || !data.statements) {
             return false;
         }
@@ -476,14 +505,21 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
 
         const match = trackingUrl.match(/xapi\/activity\/(\d+)/);
 
-        return match && match[1] == this.h5pActivity!.context;
+        return match && match[1] == this.h5pActivity.context;
     }
 
     /**
      * @inheritdoc
      */
-    protected sync(): Promise<AddonModH5PActivitySyncResult> {
-        return AddonModH5PActivitySync.syncActivity(this.h5pActivity!.context, this.site.getId());
+    protected async sync(): Promise<AddonModH5PActivitySyncResult> {
+        if (!this.h5pActivity) {
+            return {
+                updated: false,
+                warnings: [],
+            };
+        }
+
+        return await AddonModH5PActivitySync.syncActivity(this.h5pActivity.context, this.site.getId());
     }
 
     /**
diff --git a/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.ts b/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.ts
index 113d66430..ad89f085f 100644
--- a/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.ts
+++ b/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.ts
@@ -65,7 +65,9 @@ export class AddonModH5PActivityAttemptResultsPage implements OnInit {
         try {
             await this.fetchData();
 
-            await AddonModH5PActivity.logViewReport(this.h5pActivity!.id, this.h5pActivity!.name, { attemptId: this.attemptId });
+            if (this.h5pActivity) {
+                await AddonModH5PActivity.logViewReport(this.h5pActivity.id, this.h5pActivity.name, { attemptId: this.attemptId });
+            }
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'Error loading attempt.');
         } finally {
@@ -105,8 +107,12 @@ export class AddonModH5PActivityAttemptResultsPage implements OnInit {
      * @return Promise resolved when done.
      */
     protected async fetchUserProfile(): Promise<void> {
+        if (!this.attempt) {
+            return;
+        }
+
         try {
-            this.user = await CoreUser.getProfile(this.attempt!.userid, this.courseId, true);
+            this.user = await CoreUser.getProfile(this.attempt.userid, this.courseId, true);
         } catch (error) {
             // Ignore errors.
         }
diff --git a/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.ts b/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.ts
index cda950b21..0165feb15 100644
--- a/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.ts
+++ b/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.ts
@@ -68,7 +68,9 @@ export class AddonModH5PActivityUserAttemptsPage implements OnInit {
         try {
             await this.fetchData();
 
-            await AddonModH5PActivity.logViewReport(this.h5pActivity!.id, this.h5pActivity!.name, { userId: this.userId });
+            if (this.h5pActivity) {
+                await AddonModH5PActivity.logViewReport(this.h5pActivity.id, this.h5pActivity.name, { userId: this.userId });
+            }
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'Error loading attempts.');
         } finally {
@@ -107,7 +109,11 @@ export class AddonModH5PActivityUserAttemptsPage implements OnInit {
      * @return Promise resolved when done.
      */
     protected async fetchAttempts(): Promise<void> {
-        this.attemptsData = await AddonModH5PActivity.getUserAttempts(this.h5pActivity!.id, {
+        if (!this.h5pActivity) {
+            return;
+        }
+
+        this.attemptsData = await AddonModH5PActivity.getUserAttempts(this.h5pActivity.id, {
             cmId: this.cmId,
             userId: this.userId,
         });
diff --git a/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.ts b/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.ts
index 65d0f2510..0d45c30b5 100644
--- a/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.ts
+++ b/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.ts
@@ -63,7 +63,9 @@ export class AddonModH5PActivityUsersAttemptsPage implements OnInit {
         try {
             await this.fetchData();
 
-            await AddonModH5PActivity.logViewReport(this.h5pActivity!.id, this.h5pActivity!.name);
+            if (this.h5pActivity) {
+                await AddonModH5PActivity.logViewReport(this.h5pActivity.id, this.h5pActivity.name);
+            }
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'Error loading attempts.');
         } finally {
@@ -103,16 +105,20 @@ export class AddonModH5PActivityUsersAttemptsPage implements OnInit {
      * @return Promise resolved when done.
      */
     protected async fetchUsers(refresh?: boolean): Promise<void> {
+        if (!this.h5pActivity) {
+            return;
+        }
+
         if (refresh) {
             this.page = 0;
         }
 
-        const result = await AddonModH5PActivity.getUsersAttempts(this.h5pActivity!.id, {
+        const result = await AddonModH5PActivity.getUsersAttempts(this.h5pActivity.id, {
             cmId: this.cmId,
             page: this.page,
         });
 
-        const formattedUsers = await this.formatUsers(result.users);
+        const formattedUsers = await this.formatUsers(this.h5pActivity, result.users);
 
         if (this.page === 0) {
             this.users = formattedUsers;
@@ -127,17 +133,21 @@ export class AddonModH5PActivityUsersAttemptsPage implements OnInit {
     /**
      * Format users data.
      *
+     * @param h5pActivity Activity data.
      * @param users Users to format.
      * @return Formatted users.
      */
-    protected async formatUsers(users: AddonModH5PActivityUserAttempts[]): Promise<AddonModH5PActivityUserAttemptsFormatted[]> {
+    protected async formatUsers(
+        h5pActivity: AddonModH5PActivityData,
+        users: AddonModH5PActivityUserAttempts[],
+    ): Promise<AddonModH5PActivityUserAttemptsFormatted[]> {
         return await Promise.all(users.map(async (user: AddonModH5PActivityUserAttemptsFormatted) => {
             user.user = await CoreUser.getProfile(user.userid, this.courseId, true);
 
             // Calculate the score of the user.
-            if (this.h5pActivity!.grademethod === AddonModH5PActivityProvider.GRADEMANUAL) {
+            if (h5pActivity.grademethod === AddonModH5PActivityProvider.GRADEMANUAL) {
                 // No score.
-            } else if (this.h5pActivity!.grademethod === AddonModH5PActivityProvider.GRADEAVERAGEATTEMPT) {
+            } else if (h5pActivity.grademethod === AddonModH5PActivityProvider.GRADEAVERAGEATTEMPT) {
                 if (user.attempts.length) {
                     // Calculate the average.
                     const sumScores = user.attempts.reduce((sumScores, attempt) =>
diff --git a/src/addons/mod/h5pactivity/services/h5pactivity.ts b/src/addons/mod/h5pactivity/services/h5pactivity.ts
index e43b39bdd..d8a80aee4 100644
--- a/src/addons/mod/h5pactivity/services/h5pactivity.ts
+++ b/src/addons/mod/h5pactivity/services/h5pactivity.ts
@@ -216,8 +216,8 @@ export class AddonModH5PActivityProvider {
 
         const optionsWithPage: AddonModH5PActivityGetAllUsersAttemptsOptions = {
             ...options,
-            page: 0,
         };
+        optionsWithPage.page = 0;
         let canLoadMore = true;
         let users: AddonModH5PActivityUserAttempts[] = [];
 
@@ -225,7 +225,7 @@ export class AddonModH5PActivityProvider {
             try {
                 const result = await this.getUsersAttempts(id, optionsWithPage);
 
-                optionsWithPage.page = optionsWithPage.page! + 1;
+                optionsWithPage.page = optionsWithPage.page + 1;
                 users = users.concat(result.users);
                 canLoadMore = result.canLoadMore;
             } catch (error) {
@@ -359,10 +359,11 @@ export class AddonModH5PActivityProvider {
 
         const params: AddonModH5pactivityGetResultsWSParams = {
             h5pactivityid: id,
-            attemptids: [attemptId],
         };
+        params.attemptids = [attemptId];
+
         const preSets: CoreSiteWSPreSets = {
-            cacheKey: this.getAttemptResultsCacheKey(id, params.attemptids!),
+            cacheKey: this.getAttemptResultsCacheKey(id, params.attemptids),
             updateFrequency: CoreSite.FREQUENCY_SOMETIMES,
             component: AddonModH5PActivityProvider.COMPONENT,
             componentId: options.cmId,
@@ -610,10 +611,11 @@ export class AddonModH5PActivityProvider {
         try {
             const params: AddonModH5pactivityGetAttemptsWSParams = {
                 h5pactivityid: id,
-                userids: [userId],
             };
+            params.userids = [userId];
+
             const preSets: CoreSiteWSPreSets = {
-                cacheKey: this.getUserAttemptsCacheKey(id, params.userids!),
+                cacheKey: this.getUserAttemptsCacheKey(id, params.userids),
                 updateFrequency: CoreSite.FREQUENCY_SOMETIMES,
                 component: AddonModH5PActivityProvider.COMPONENT,
                 componentId: options.cmId,

From a4c60925d99ab53b9a74cd1e32c14f3262db5614 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 15 Dec 2021 12:30:35 +0100
Subject: [PATCH 0284/1008] MOBILE-3833 sitehome: Update userhomepage site info
 type

---
 src/core/classes/site.ts                              | 11 ++++++++++-
 .../sitehome/services/handlers/sitehome-home.ts       |  4 +++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/core/classes/site.ts b/src/core/classes/site.ts
index 7b03c32bf..201b23ba1 100644
--- a/src/core/classes/site.ts
+++ b/src/core/classes/site.ts
@@ -2118,7 +2118,7 @@ export type CoreSiteInfoResponse = {
     usercanmanageownfiles?: boolean; // True if the user can manage his own files.
     userquota?: number; // User quota (bytes). 0 means user can ignore the quota.
     usermaxuploadfilesize?: number; // User max upload file size (bytes). -1 means the user can ignore the upload file size.
-    userhomepage?: number; // The default home page for the user: 0 for the site home, 1 for dashboard.
+    userhomepage?: CoreSiteInfoUserHomepage; // The default home page for the user.
     userprivateaccesskey?: string; // Private user access key for fetching files.
     siteid?: number; // Site course ID.
     sitecalendartype?: string; // Calendar type set in the site.
@@ -2139,6 +2139,15 @@ export type CoreSiteInfo = CoreSiteInfoResponse & {
     };
 };
 
+/**
+ * Enum constants that define default user home page.
+ */
+export enum CoreSiteInfoUserHomepage {
+    HOMEPAGE_SITE = 0, // Site home.
+    HOMEPAGE_MY = 1, // Dashboard.
+    HOMEPAGE_MYCOURSES = 3, // My courses.
+};
+
 /**
  * Result of WS tool_mobile_get_config.
  */
diff --git a/src/core/features/sitehome/services/handlers/sitehome-home.ts b/src/core/features/sitehome/services/handlers/sitehome-home.ts
index f5866cda7..dfae92fd4 100644
--- a/src/core/features/sitehome/services/handlers/sitehome-home.ts
+++ b/src/core/features/sitehome/services/handlers/sitehome-home.ts
@@ -17,6 +17,7 @@ import { CoreSites } from '@services/sites';
 import { CoreMainMenuHomeHandler, CoreMainMenuHomeHandlerToDisplay } from '@features/mainmenu/services/home-delegate';
 import { CoreSiteHome } from '../sitehome';
 import { makeSingleton } from '@singletons';
+import { CoreSiteInfoUserHomepage } from '@classes/site';
 
 /**
  * Handler to add site home into home page.
@@ -55,7 +56,8 @@ export class CoreSiteHomeHomeHandlerService implements CoreMainMenuHomeHandler {
      */
     getDisplayData(): CoreMainMenuHomeHandlerToDisplay {
         const site = CoreSites.getCurrentSite();
-        const displaySiteHome = site?.getInfo() && site?.getInfo()?.userhomepage === 0;
+
+        const displaySiteHome = site?.getInfo() && site?.getInfo()?.userhomepage === CoreSiteInfoUserHomepage.HOMEPAGE_SITE;
 
         return {
             title: 'core.sitehome.sitehome',

From 22178c6aef0ce7d6b83f98b1d82f5fa9132b0ec4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 15 Dec 2021 12:59:27 +0100
Subject: [PATCH 0285/1008] MOBILE-3833 core: Fix getAnimations when not
 available

---
 src/core/directives/collapsible-header.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts
index 656d5d15e..0249849c3 100644
--- a/src/core/directives/collapsible-header.ts
+++ b/src/core/directives/collapsible-header.ts
@@ -107,7 +107,7 @@ export class CoreCollapsibleHeaderDirective implements OnDestroy {
         }
 
         // Wait animations to finish.
-        const animations = this.content.getAnimations();
+        const animations = (this.content.getAnimations && this.content.getAnimations()) || [];
         await Promise.all(animations.map(async (animation) => {
             await animation.finished;
         }));

From 2ae55d04fb7302713781271f87c4f2da660fadb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 14 Dec 2021 15:13:55 +0100
Subject: [PATCH 0286/1008] MOBILE-3950 image: Restore zoom on image viewer

---
 scripts/langindex.json                        |  4 +-
 .../swipe-navigation/swipe-navigation.scss    |  2 +-
 src/core/directives/format-text.ts            |  2 +-
 .../viewer/components/image/image.html        | 43 ++++++++----
 .../viewer/components/image/image.scss        | 18 ++---
 .../features/viewer/components/image/image.ts | 69 +++++++++++++++++--
 src/core/lang.json                            |  4 +-
 src/core/services/utils/dom.ts                |  4 +-
 src/theme/theme.base.scss                     | 21 ++++++
 9 files changed, 132 insertions(+), 35 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 5a800908f..26f2815f3 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -2327,5 +2327,7 @@
   "core.years": "moodle",
   "core.yes": "moodle",
   "core.youreoffline": "local_moodlemobileapp",
-  "core.youreonline": "local_moodlemobileapp"
+  "core.youreonline": "local_moodlemobileapp",
+  "core.zoomin": "local_moodlemobileapp",
+  "core.zoomout": "local_moodlemobileapp"
 }
diff --git a/src/core/components/swipe-navigation/swipe-navigation.scss b/src/core/components/swipe-navigation/swipe-navigation.scss
index 046438a5a..d0dbcaffd 100644
--- a/src/core/components/swipe-navigation/swipe-navigation.scss
+++ b/src/core/components/swipe-navigation/swipe-navigation.scss
@@ -9,7 +9,7 @@ ion-slide {
 ::ng-deep {
 
     core-loading .core-loading-content {
-        display: block;
+        display: block !important;
         width: 100%;
     }
 
diff --git a/src/core/directives/format-text.ts b/src/core/directives/format-text.ts
index 10c220e72..fdb95c34a 100644
--- a/src/core/directives/format-text.ts
+++ b/src/core/directives/format-text.ts
@@ -235,7 +235,7 @@ export class CoreFormatTextDirective implements OnChanges {
             button.addEventListener('click', (e: Event) => {
                 e.preventDefault();
                 e.stopPropagation();
-                CoreDomUtils.viewImage(imgSrc, img.getAttribute('alt'), this.component, this.componentId, true);
+                CoreDomUtils.viewImage(imgSrc, img.getAttribute('alt'), this.component, this.componentId);
             });
 
             img.parentNode?.appendChild(button);
diff --git a/src/core/features/viewer/components/image/image.html b/src/core/features/viewer/components/image/image.html
index c55c50d93..c1096c614 100644
--- a/src/core/features/viewer/components/image/image.html
+++ b/src/core/features/viewer/components/image/image.html
@@ -1,16 +1,29 @@
-<ion-header>
-    <ion-toolbar>
-        <ion-title>
-            <h2>{{ title }}</h2>
-        </ion-title>
-        <ion-buttons slot="end">
-            <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
-                <ion-icon name="fas-times" slot="icon-only" aria-hidden=true></ion-icon>
-            </ion-button>
-        </ion-buttons>
-    </ion-toolbar>
-</ion-header>
-<!-- @todo: zoom="true" maxZoom="2" . Now we need to use ionSlider? -->
-<ion-content [scrollX]="true" [scrollY]="true" class="core-zoom-pane">
-    <img [src]="image" [alt]="title" core-external-content [component]="component" [componentId]="componentId">
+<ion-content>
+    <ion-slides [options]="slidesOpts">
+        <ion-slide>
+            <div class="swiper-zoom-container">
+                <img [src]="image" [alt]="title" core-external-content [component]="component" [componentId]="componentId">
+            </div>
+        </ion-slide>
+    </ion-slides>
 </ion-content>
+<ion-footer>
+    <ion-row class="ion-justify-content-between ion-align-items-center ion-no-padding">
+        <ion-col size="auto">
+            <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
+                <ion-icon name="fas-times" slot="icon-only" aria-hidden="true"></ion-icon>
+            </ion-button>
+        </ion-col>
+        <ion-col></ion-col>
+        <ion-col size="auto" *ngIf="slidesSwiper">
+            <ion-button fill="clear" [attr.aria-label]="'core.zoomout' | translate" (click)="zoom(false)">
+                <ion-icon name="fas-search-minus" slot="icon-only" aria-hidden="true"></ion-icon>
+            </ion-button>
+        </ion-col>
+        <ion-col size="auto" *ngIf="slidesSwiper">
+            <ion-button fill="clear" [attr.aria-label]="'core.zoomin' | translate" (click)="zoom(true)">
+                <ion-icon name="fas-search-plus" slot="icon-only" aria-hidden="true"></ion-icon>
+            </ion-button>
+        </ion-col>
+    </ion-row>
+</ion-footer>
diff --git a/src/core/features/viewer/components/image/image.scss b/src/core/features/viewer/components/image/image.scss
index c8b0d2f62..9d8036854 100644
--- a/src/core/features/viewer/components/image/image.scss
+++ b/src/core/features/viewer/components/image/image.scss
@@ -1,9 +1,11 @@
-:host {
-    .core-zoom-pane {
-        height: 100%;
-
-        img {
-            max-width: none;
-        }
-    }
+ion-slides {
+    height: 100%;
+}
+
+img {
+    max-width: 100%;
+}
+
+ion-footer {
+    background: var(--contrast-background);
 }
diff --git a/src/core/features/viewer/components/image/image.ts b/src/core/features/viewer/components/image/image.ts
index ddb52fe3d..09fe88b40 100644
--- a/src/core/features/viewer/components/image/image.ts
+++ b/src/core/features/viewer/components/image/image.ts
@@ -12,9 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, Input, OnInit } from '@angular/core';
-
+import { AfterViewInit, Component, ElementRef, Input, OnInit, ViewChild } from '@angular/core';
+import { IonSlides } from '@ionic/angular';
 import { ModalController, Translate } from '@singletons';
+import { CoreMath } from '@singletons/math';
 
 /**
  * Modal component to view an image.
@@ -24,17 +25,46 @@ import { ModalController, Translate } from '@singletons';
     templateUrl: 'image.html',
     styleUrls: ['image.scss'],
 })
-export class CoreViewerImageComponent implements OnInit {
+export class CoreViewerImageComponent implements OnInit, AfterViewInit {
 
-    @Input() title?: string; // Modal title.
-    @Input() image?: string; // Image URL.
+    @ViewChild(IonSlides) protected slides?: IonSlides;
+
+    @Input() title = ''; // Modal title.
+    @Input() image = ''; // Image URL.
     @Input() component?: string; // Component to use in external-content.
     @Input() componentId?: string | number; // Component ID to use in external-content.
 
+    slidesOpts = {
+        slidesPerView: 1,
+        centerInsufficientSlides: true,
+        centerSlides: true,
+        zoom: {
+            maxRatio: 8,
+            minRatio: 0.5, // User can zoom out to 0.5 only using pinch gesture.
+        },
+    };
+
+    protected zoomRatio = 1;
+
+    slidesSwiper: any; // eslint-disable-line @typescript-eslint/no-explicit-any
+
+    constructor(protected element: ElementRef<HTMLElement>) {
+    }
+
+    /**
+     * @inheritdoc
+     */
     ngOnInit(): void {
         this.title = this.title || Translate.instant('core.imageviewer');
     }
 
+    /**
+     * @inheritdoc
+     */
+    async ngAfterViewInit(): Promise<void> {
+        this.slidesSwiper = await this.slides?.getSwiper();
+    }
+
     /**
      * Close modal.
      */
@@ -42,4 +72,33 @@ export class CoreViewerImageComponent implements OnInit {
         ModalController.dismiss();
     }
 
+    /**
+     * Zoom In or Out.
+     *
+     * @param zoomIn: True to zoom in, false to zoom out.
+     */
+    zoom(zoomIn = true): void {
+        const imageElement = this.element.nativeElement.querySelector('img');
+
+        if (!this.slidesSwiper || !imageElement) {
+            return;
+        }
+
+        zoomIn
+            ? this.zoomRatio *= 2
+            : this.zoomRatio /= 2;
+
+        // Using 1 as minimum for manual zoom.
+        this.zoomRatio = CoreMath.clamp(this.zoomRatio, 1, this.slidesOpts.zoom.maxRatio);
+
+        if (this.zoomRatio > 1) {
+            this.slidesSwiper.zoom.in();
+
+            imageElement.style.transform =
+                'translate3d(0px, 0px, 0px) scale(' + this.zoomRatio + ')';
+        } else {
+            this.slidesSwiper.zoom.out();
+        }
+    }
+
 }
diff --git a/src/core/lang.json b/src/core/lang.json
index 793e0da74..ce0aebea4 100644
--- a/src/core/lang.json
+++ b/src/core/lang.json
@@ -347,5 +347,7 @@
     "years": "years",
     "yes": "Yes",
     "youreoffline": "You are offline",
-    "youreonline": "You are back online"
+    "youreonline": "You are back online",
+    "zoomin": "Zoom In",
+    "zoomout": "Zoom Out"
 }
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index 77a664817..d097ee912 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -1787,14 +1787,12 @@ export class CoreDomUtilsProvider {
      * @param title Title of the page or modal.
      * @param component Component to link the image to if needed.
      * @param componentId An ID to use in conjunction with the component.
-     * @param fullScreen Whether the modal should be full screen.
      */
     async viewImage(
         image: string,
         title?: string | null,
         component?: string,
         componentId?: string | number,
-        fullScreen?: boolean,
     ): Promise<void> {
         if (!image) {
             return;
@@ -1808,7 +1806,7 @@ export class CoreDomUtilsProvider {
                 component,
                 componentId,
             },
-            cssClass: fullScreen ? 'core-modal-fullscreen' : '',
+            cssClass: 'core-modal-transparent',
         });
 
     }
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index d13635f92..0500be86e 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -510,6 +510,27 @@ body.core-iframe-fullscreen ion-router-outlet {
     height: 100% !important;
 }
 
+.core-modal-transparent {
+
+    ion-backdrop {
+        backdrop-filter: blur(8px);
+    }
+
+    .modal-wrapper {
+        backdrop-filter: blur(12px);
+        --background: rgba(10, 10, 10, 0.2);
+
+        ion-content {
+            --background: transparent !important;
+        }
+        position: absolute;
+        @include position(0 !important, null, null, 0 !important);
+        display: block;
+        width: 100% !important;
+        height: 100% !important;
+    }
+}
+
 .core-modal-force-on-top {
     z-index: 100000 !important;
 }

From c9f464e756e371d408ec70c07781e7213e4ece27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 15 Dec 2021 12:04:48 +0100
Subject: [PATCH 0287/1008] MOBILE-3950 core: Fix prevent opening modal twice
 when suddenly closed

---
 src/core/services/utils/dom.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index d097ee912..b3052137e 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -1703,6 +1703,9 @@ export class CoreDomUtilsProvider {
 
         let navSubscription: Subscription | undefined;
 
+        // Get the promise before presenting to get result if modal is suddenly hidden.
+        const resultPromise = waitForDismissCompleted ? modal.onDidDismiss<T>() : modal.onWillDismiss<T>();
+
         if (!this.displayedModals[modalId]) {
             // Store the modal and remove it when dismissed.
             this.displayedModals[modalId] = modal;
@@ -1719,7 +1722,8 @@ export class CoreDomUtilsProvider {
             await modal.present();
         }
 
-        const result = waitForDismissCompleted ? await modal.onDidDismiss<T>() : await modal.onWillDismiss<T>();
+        const result = await resultPromise;
+
         navSubscription?.unsubscribe();
         delete this.displayedModals[modalId];
 

From 9bf939ab2fb31c5d3900d1bc3326f6d24b9f077a Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 23 Nov 2021 11:23:31 +0100
Subject: [PATCH 0288/1008] MOBILE-3927 book: Add swipe to book

---
 .../index/addon-mod-book-index.html           |  21 ++-
 .../mod/book/components/index/index.scss      |   9 +
 src/addons/mod/book/components/index/index.ts | 170 ++++++++++++------
 src/core/services/utils/dom.ts                |  14 +-
 4 files changed, 151 insertions(+), 63 deletions(-)
 create mode 100644 src/addons/mod/book/components/index/index.scss

diff --git a/src/addons/mod/book/components/index/addon-mod-book-index.html b/src/addons/mod/book/components/index/addon-mod-book-index.html
index ce5420250..e85705f95 100644
--- a/src/addons/mod/book/components/index/addon-mod-book-index.html
+++ b/src/addons/mod/book/components/index/addon-mod-book-index.html
@@ -40,15 +40,18 @@
             previousTranslate="addon.mod_book.navprevtitle" nextTranslate="addon.mod_book.navnexttitle" (action)="changeChapter($event.id)">
         </core-navigation-bar>
 
-        <div class="ion-padding">
-            <core-format-text [component]="component" [componentId]="componentId" [text]="chapterContent" contextLevel="module"
-                [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text>
-
-            <div class="ion-margin-top" *ngIf="tagsEnabled && tags?.length > 0">
-                <strong>{{ 'core.tag.tags' | translate }}: </strong>
-                <core-tag-list [tags]="tags"></core-tag-list>
-            </div>
-        </div>
+        <ion-slides (ionSlideWillChange)="slideChanged()" [options]="slidesOpts">
+            <ion-slide *ngFor="let chapter of loadedChapters">
+                <div class="ion-padding">
+                    <core-format-text [component]="component" [componentId]="componentId" [text]="chapter.content" contextLevel="module"
+                        [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text>
+                    <div class="ion-margin-top" *ngIf="tagsEnabled && chapter.tags?.length > 0">
+                        <strong>{{ 'core.tag.tags' | translate }}: </strong>
+                        <core-tag-list [tags]="chapter.tags"></core-tag-list>
+                    </div>
+                </div>
+            </ion-slide>
+        </ion-slides>
     </div>
 
 </core-loading>
diff --git a/src/addons/mod/book/components/index/index.scss b/src/addons/mod/book/components/index/index.scss
new file mode 100644
index 000000000..6b0b7043d
--- /dev/null
+++ b/src/addons/mod/book/components/index/index.scss
@@ -0,0 +1,9 @@
+:host {
+    ion-slide {
+        display: block;
+        font-size: inherit;
+        justify-content: start;
+        align-items: start;
+        text-align: start;
+    }
+}
diff --git a/src/addons/mod/book/components/index/index.ts b/src/addons/mod/book/components/index/index.ts
index 5d3281c25..34ac81fa0 100644
--- a/src/addons/mod/book/components/index/index.ts
+++ b/src/addons/mod/book/components/index/index.ts
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, Optional, Input, OnInit } from '@angular/core';
-import { IonContent } from '@ionic/angular';
+import { Component, Optional, Input, OnInit, ViewChild, ElementRef } from '@angular/core';
+import { IonContent, IonSlides } from '@ionic/angular';
 import { CoreCourseModuleMainResourceComponent } from '@features/course/classes/main-resource-component';
 import {
     AddonModBookProvider,
@@ -31,6 +31,8 @@ import { CoreCourse } from '@features/course/services/course';
 import { AddonModBookTocComponent } from '../toc/toc';
 import { CoreConstants } from '@/core/constants';
 import { CoreNavigationBarItem } from '@components/navigation-bar/navigation-bar';
+import { CoreError } from '@classes/errors/error';
+import { Translate } from '@singletons';
 
 /**
  * Component that displays a book.
@@ -38,30 +40,43 @@ import { CoreNavigationBarItem } from '@components/navigation-bar/navigation-bar
 @Component({
     selector: 'addon-mod-book-index',
     templateUrl: 'addon-mod-book-index.html',
+    styleUrls: ['index.scss'],
 })
 export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComponent implements OnInit {
 
+    @ViewChild(IonSlides) slides?: IonSlides;
+
     @Input() initialChapterId?: number; // The initial chapter ID to load.
 
     component = AddonModBookProvider.COMPONENT;
-    chapterContent?: string;
+    loadedChapters: LoadedChapter[] = [];
+    previousChapter?: AddonModBookTocChapter;
+    nextChapter?: AddonModBookTocChapter;
     tagsEnabled = false;
     warning = '';
     tags?: CoreTagItem[];
     displayNavBar = true;
     navigationItems: CoreNavigationBarItem<AddonModBookTocChapter>[] = [];
     displayTitlesInNavBar = false;
+    slidesOpts = {
+        initialSlide: 0,
+        autoHeight: true,
+    };
 
     protected chapters: AddonModBookTocChapter[] = [];
     protected currentChapter?: number;
     protected book?: AddonModBookBookWSData;
     protected contentsMap: AddonModBookContentsMap = {};
+    protected element: HTMLElement;
 
     constructor(
+        elementRef: ElementRef,
         protected content?: IonContent,
         @Optional() courseContentsPage?: CoreCourseContentsPage,
     ) {
         super('AddonModBookIndexComponent', courseContentsPage);
+
+        this.element = elementRef.nativeElement;
     }
 
     /**
@@ -102,10 +117,13 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
      * @return Promise resolved when done.
      */
     changeChapter(chapterId: number): void {
-        if (chapterId && chapterId != this.currentChapter) {
-            this.loaded = false;
-            this.refreshIcon = CoreConstants.ICON_LOADING;
-            this.loadChapter(chapterId, true);
+        if (!chapterId || chapterId === this.currentChapter) {
+            return;
+        }
+
+        const index = this.loadedChapters.findIndex(chapter => chapter.id === chapterId);
+        if (index > -1) {
+            this.slides?.slideTo(index);
         }
     }
 
@@ -138,10 +156,11 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
 
             if (typeof this.currentChapter == 'undefined' && typeof this.initialChapterId != 'undefined' && this.chapters) {
                 // Initial chapter set. Validate that the chapter exists.
-                const chapter = this.chapters.find((chapter) => chapter.id == this.initialChapterId);
+                const index = this.chapters.findIndex((chapter) => chapter.id == this.initialChapterId);
 
-                if (chapter) {
+                if (index >= 0) {
                     this.currentChapter = this.initialChapterId;
+                    this.slidesOpts.initialSlide = index;
                 }
             }
 
@@ -154,14 +173,12 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
                 return;
             }
 
-            // Show chapter.
-            try {
-                await this.loadChapter(this.currentChapter, refresh);
+            await this.loadChapters();
 
-                this.warning = downloadResult?.failed ? this.getErrorDownloadingSomeFilesMessage(downloadResult.error!) : '';
-            } catch {
-                // Ignore errors, they're handled inside the loadChapter function.
-            }
+            // Show chapter.
+            await this.viewChapter(this.currentChapter, refresh);
+
+            this.warning = downloadResult?.failed ? this.getErrorDownloadingSomeFilesMessage(downloadResult.error!) : '';
         } finally {
             // Pass false because downloadResourceIfNeeded already invalidates and refresh data if refresh=true.
             this.fillContextMenu(false);
@@ -184,49 +201,94 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
     }
 
     /**
-     * Load a book chapter.
+     * Load book chapters.
+     *
+     * @return Promise resolved when done.
+     */
+    protected async loadChapters(): Promise<void> {
+        try {
+            const newChapters = await Promise.all(this.chapters.map(async (chapter) => {
+                const content = await AddonModBook.getChapterContent(this.contentsMap, chapter.id, this.module.id);
+
+                return {
+                    id: chapter.id,
+                    content,
+                    tags: this.tagsEnabled ? this.contentsMap[chapter.id].tags : [],
+                };
+            }));
+
+            let newIndex = -1;
+            if (this.loadedChapters.length && newChapters.length != this.loadedChapters.length) {
+                // Number of chapters has changed. Search the chapter to display, otherwise it could change automatically.
+                newIndex = this.chapters.findIndex((chapter) => chapter.id === this.currentChapter);
+            }
+
+            this.loadedChapters = newChapters;
+
+            if (newIndex > -1) {
+                this.slides?.slideTo(newIndex, 0, false);
+            }
+        } catch (exception) {
+            const error = exception ?? new CoreError(Translate.instant('addon.mod_book.errorchapter'));
+            if (!error.message) {
+                error.message = Translate.instant('addon.mod_book.errorchapter');
+            }
+
+            throw error;
+        }
+    }
+
+    /**
+     * View a book chapter.
      *
      * @param chapterId Chapter to load.
      * @param logChapterId Whether chapter ID should be passed to the log view function.
      * @return Promise resolved when done.
      */
-    protected async loadChapter(chapterId: number, logChapterId: boolean): Promise<void> {
+    protected async viewChapter(chapterId: number, logChapterId: boolean): Promise<void> {
         this.currentChapter = chapterId;
-        this.content?.scrollToTop();
 
-        try {
-            const content = await AddonModBook.getChapterContent(this.contentsMap, chapterId, this.module.id);
-
-            this.tags = this.tagsEnabled ? this.contentsMap[this.currentChapter].tags : [];
-
-            this.chapterContent = content;
-
-            if (this.displayNavBar) {
-                this.navigationItems = this.getNavigationItems(chapterId);
-            }
-
-            // Chapter loaded, log view. We don't return the promise because we don't want to block the user for this.
-            await CoreUtils.ignoreErrors(AddonModBook.logView(
-                this.module.instance!,
-                logChapterId ? chapterId : undefined,
-                this.module.name,
-            ));
-
-            const currentChapterIndex = this.chapters.findIndex((chapter) => chapter.id == chapterId);
-            const isLastChapter = currentChapterIndex < 0 || this.chapters[currentChapterIndex + 1] === undefined;
-
-            // Module is completed when last chapter is viewed, so we only check completion if the last is reached.
-            if (isLastChapter) {
-                CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
-            }
-        } catch (error) {
-            CoreDomUtils.showErrorModalDefault(error, 'addon.mod_book.errorchapter', true);
-
-            throw error;
-        } finally {
-            this.loaded = true;
-            this.refreshIcon = CoreConstants.ICON_REFRESH;
+        if (this.displayNavBar) {
+            this.navigationItems = this.getNavigationItems(chapterId);
         }
+
+        // Chapter loaded, log view.
+        await CoreUtils.ignoreErrors(AddonModBook.logView(
+            this.module.instance!,
+            logChapterId ? chapterId : undefined,
+            this.module.name,
+        ));
+
+        const currentChapterIndex = this.chapters.findIndex((chapter) => chapter.id == chapterId);
+        const isLastChapter = currentChapterIndex < 0 || this.chapters[currentChapterIndex + 1] === undefined;
+
+        // Module is completed when last chapter is viewed, so we only check completion if the last is reached.
+        if (isLastChapter) {
+            CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
+        }
+    }
+
+    /**
+     * Slide has changed.
+     *
+     * @return Promise resolved when done.
+     */
+    async slideChanged(): Promise<void> {
+        if (!this.slides) {
+            return;
+        }
+
+        const scrollElement = await this.content?.getScrollElement();
+        const container = this.element.querySelector<HTMLElement>('.addon-mod_book-container');
+
+        if (container && (!scrollElement || CoreDomUtils.isElementOutsideOfScreen(scrollElement, container, 'top'))) {
+            // Scroll to top.
+            container.scrollIntoView({ behavior: 'smooth' });
+        }
+
+        const index = await this.slides.getActiveIndex();
+
+        this.viewChapter(this.loadedChapters[index].id, true);
     }
 
     /**
@@ -245,3 +307,9 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
     }
 
 }
+
+type LoadedChapter = {
+    id: number;
+    content: string;
+    tags?: CoreTagItem[];
+};
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index b3052137e..ba8d78d07 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -769,21 +769,29 @@ export class CoreDomUtilsProvider {
      *
      * @param scrollEl The element that must be scrolled.
      * @param element DOM element to check.
+     * @param point The point of the element to check.
      * @return Whether the element is outside of the viewport.
      */
-    isElementOutsideOfScreen(scrollEl: HTMLElement, element: HTMLElement): boolean {
+    isElementOutsideOfScreen(scrollEl: HTMLElement, element: HTMLElement, point: 'top' | 'mid' | 'bottom' = 'mid'): boolean {
         const elementRect = element.getBoundingClientRect();
 
         if (!elementRect) {
             return false;
         }
 
-        const elementMidPoint = Math.round((elementRect.bottom + elementRect.top) / 2);
+        let elementPoint: number;
+        if (point === 'top') {
+            elementPoint = elementRect.top;
+        } else if (point === 'bottom') {
+            elementPoint = elementRect.bottom;
+        } else {
+            elementPoint = Math.round((elementRect.bottom + elementRect.top) / 2);
+        }
 
         const scrollElRect = scrollEl.getBoundingClientRect();
         const scrollTopPos = scrollElRect?.top || 0;
 
-        return elementMidPoint > window.innerHeight || elementMidPoint < scrollTopPos;
+        return elementPoint > window.innerHeight || elementPoint < scrollTopPos;
     }
 
     /**

From 6674262bb7adbc2b4b62640089d66b4243fcbc43 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 24 Nov 2021 09:34:33 +0100
Subject: [PATCH 0289/1008] MOBILE-3927 calendar: Add swipe to calendar monthly
 view

---
 .../calendar/addon-calendar-calendar.html     | 144 +++---
 .../components/calendar/calendar.scss         |  12 +
 .../calendar/components/calendar/calendar.ts  | 415 +++++++++++-------
 .../upcoming-events/upcoming-events.ts        |   8 +-
 src/core/services/utils/time.ts               |  80 ++++
 5 files changed, 429 insertions(+), 230 deletions(-)

diff --git a/src/addons/calendar/components/calendar/addon-calendar-calendar.html b/src/addons/calendar/components/calendar/addon-calendar-calendar.html
index 3030a2b5a..f102136be 100644
--- a/src/addons/calendar/components/calendar/addon-calendar-calendar.html
+++ b/src/addons/calendar/components/calendar/addon-calendar-calendar.html
@@ -17,7 +17,10 @@
                 </ion-button>
             </ion-col>
             <ion-col class="ion-text-center addon-calendar-period">
-                <h2 id="addon-calendar-monthname">{{ periodName }}</h2>
+                <h2 id="addon-calendar-monthname">
+                    {{ periodName }}
+                    <ion-spinner *ngIf="!monthLoaded" class="addon-calendar-loading-month"></ion-spinner>
+                </h2>
             </ion-col>
             <ion-col class="ion-text-end" *ngIf="canNavigate">
                 <ion-button fill="clear" (click)="loadNext()" [attr.aria-label]="'core.next' | translate">
@@ -27,74 +30,81 @@
         </ion-row>
     </ion-grid>
 
-    <!-- Calendar view. -->
-    <ion-grid class="addon-calendar-months" role="table" aria-describedby="addon-calendar-monthname">
-        <div role="rowgroup">
-            <!-- List of days. -->
-            <ion-row role="row">
-                <ion-col class="ion-text-center addon-calendar-weekday" *ngFor="let day of weekDays" role="columnheader">
-                    <span class="sr-only">{{ day.fullname | translate }}</span>
-                    <span class="ion-hide-md-up" aria-hidden="true">{{ day.shortname | translate }}</span>
-                    <span class="ion-hide-md-down" aria-hidden="true">{{ day.fullname | translate }}</span>
-                </ion-col>
-            </ion-row>
-        </div>
-        <div role="rowgroup">
+    <ion-slides *ngIf="loaded" (ionSlideWillChange)="slideChanged()" [options]="{initialSlide: 1}">
+        <ion-slide *ngFor="let month of preloadedMonths">
+            <!-- Calendar view. -->
+            <ion-grid class="addon-calendar-months" role="table" aria-describedby="addon-calendar-monthname">
+                <div role="rowgroup">
+                    <!-- List of days. -->
+                    <ion-row role="row">
+                        <ion-col class="ion-text-center addon-calendar-weekday" *ngFor="let day of month.weekDays" role="columnheader">
+                            <span class="sr-only">{{ day.fullname | translate }}</span>
+                            <span class="ion-hide-md-up" aria-hidden="true">{{ day.shortname | translate }}</span>
+                            <span class="ion-hide-md-down" aria-hidden="true">{{ day.fullname | translate }}</span>
+                        </ion-col>
+                    </ion-row>
+                </div>
+                <div role="rowgroup">
+                    <!-- Weeks. -->
+                    <ion-row *ngFor="let week of month.weeks" class="addon-calendar-week" role="row">
+                        <!-- Empty slots (first week). -->
+                        <ion-col *ngFor="let value of week.prepadding" class="dayblank addon-calendar-day" role="cell">
+                        </ion-col>
+                        <ion-col *ngFor="let day of week.days" class="addon-calendar-day ion-text-center" [ngClass]='{
+                                "hasevents": day.hasevents,
+                                "today": isCurrentMonth && day.istoday,
+                                "weekend": day.isweekend,
+                                "duration_finish": day.haslastdayofevent
+                            }' [class.addon-calendar-event-past-day]="isPastMonth || day.ispast" role="cell" tabindex="0"
+                            (ariaButtonClick)="dayClicked(day.mday)">
+                            <p class="addon-calendar-day-number" role="button">
+                                <span aria-hidden="true">{{ day.mday }}</span>
+                                <span class="sr-only">{{ day.periodName | translate }}</span>
+                            </p>
 
-            <!-- Weeks. -->
-            <ion-row *ngFor="let week of weeks" class="addon-calendar-week" role="row">
-                <!-- Empty slots (first week). -->
-                <ion-col *ngFor="let value of week.prepadding" class="dayblank addon-calendar-day" role="cell"></ion-col>
-                <ion-col *ngFor="let day of week.days" class="addon-calendar-day ion-text-center" [ngClass]='{
-                        "hasevents": day.hasevents,
-                        "today": isCurrentMonth && day.istoday,
-                        "weekend": day.isweekend,
-                        "duration_finish": day.haslastdayofevent
-                    }' [class.addon-calendar-event-past-day]="isPastMonth || day.ispast" role="cell" tabindex="0"
-                    (ariaButtonClick)="dayClicked(day.mday)">
-                    <p class="addon-calendar-day-number" role="button">
-                        <span aria-hidden="true">{{ day.mday }}</span>
-                        <span class="sr-only">{{ day.periodName | translate }}</span>
-                    </p>
+                            <!-- In phone, display some dots to indicate the type of events. -->
+                            <p class="ion-hide-md-up addon-calendar-dot-types"><span *ngFor="let type of day.calendareventtypes"
+                                    class="calendar_event_type calendar_event_{{type}}"></span></p>
 
-                    <!-- In phone, display some dots to indicate the type of events. -->
-                    <p class="ion-hide-md-up addon-calendar-dot-types"><span *ngFor="let type of day.calendareventtypes"
-                            class="calendar_event_type calendar_event_{{type}}"></span></p>
-
-                    <!-- In tablet, display list of events. -->
-                    <div class="ion-hide-md-down addon-calendar-day-events">
-                        <ng-container *ngFor="let event of day.filteredEvents | slice:0:4; let index = index">
-                            <div *ngIf="index < 3 || day.filteredEvents.length == 4" class="addon-calendar-event"
-                                [class.addon-calendar-event-past]="event.ispast" role="button" tabindex="0"
-                                (ariaButtonClick)="eventClicked(event, $event)">
-                                <span class="calendar_event_type calendar_event_{{event.formattedType}}"></span>
-                                <ion-icon *ngIf="event.offline && !event.deleted" name="fas-clock"
-                                    [attr.aria-label]="'core.notsent' | translate"></ion-icon>
-                                <ion-icon *ngIf="event.deleted" name="fas-trash" [attr.aria-label]="'core.deletedoffline' | translate">
-                                </ion-icon>
-                                <span class="addon-calendar-event-time">
-                                    {{ event.timestart * 1000 | coreFormatDate: timeFormat }}
-                                </span>
-                                <core-mod-icon *ngIf="event.moduleIcon" [modicon]="event.moduleIcon" [showAlt]="false"
-                                    [modname]="event.modulename" [componentId]="event.instance">
-                                </core-mod-icon>
-                                <!-- Add the icon title so accessibility tools read it. -->
-                                <span class="sr-only">
-                                    {{ 'addon.calendar.type' + event.formattedType | translate }}
-                                    <span class="sr-only" *ngIf="event.moduleIcon && event.iconTitle">{{ event.iconTitle }}</span>
-                                </span>
-                                <span class="addon-calendar-event-name">{{event.name}}</span>
+                            <!-- In tablet, display list of events. -->
+                            <div class="ion-hide-md-down addon-calendar-day-events" *ngIf="day.filteredEvents">
+                                <ng-container *ngFor="let event of day.filteredEvents | slice:0:4; let index = index">
+                                    <div *ngIf="index < 3 || day.filteredEvents.length == 4" class="addon-calendar-event"
+                                        [class.addon-calendar-event-past]="event.ispast" role="button" tabindex="0"
+                                        (ariaButtonClick)="eventClicked(event, $event)">
+                                        <span class="calendar_event_type calendar_event_{{event.formattedType}}"></span>
+                                        <ion-icon *ngIf="event.offline && !event.deleted" name="fas-clock"
+                                            [attr.aria-label]="'core.notsent' | translate"></ion-icon>
+                                        <ion-icon *ngIf="event.deleted" name="fas-trash"
+                                            [attr.aria-label]="'core.deletedoffline' | translate"></ion-icon>
+                                        <span class="addon-calendar-event-time">
+                                            {{ event.timestart * 1000 | coreFormatDate: timeFormat }}
+                                        </span>
+                                        <core-mod-icon *ngIf="event.moduleIcon" [modicon]="event.moduleIcon" [showAlt]="false"
+                                            [modname]="event.modulename" [componentId]="event.instance">
+                                        </core-mod-icon>
+                                        <!-- Add the icon title so accessibility tools read it. -->
+                                        <span class="sr-only">
+                                            {{ 'addon.calendar.type' + event.formattedType | translate }}
+                                            <span class="sr-only" *ngIf="event.moduleIcon && event.iconTitle">
+                                                {{ event.iconTitle }}
+                                            </span>
+                                        </span>
+                                        <span class="addon-calendar-event-name">{{event.name}}</span>
+                                    </div>
+                                </ng-container>
+                                <p *ngIf="day.filteredEvents.length > 4" class="addon-calendar-day-more">
+                                    <b>{{ 'core.nummore' | translate:{$a: day.filteredEvents.length - 3} }}</b>
+                                </p>
                             </div>
-                        </ng-container>
-                        <p *ngIf="day.filteredEvents.length > 4" class="addon-calendar-day-more">
-                            <b>{{ 'core.nummore' | translate:{$a: day.filteredEvents.length - 3} }}</b>
-                        </p>
-                    </div>
-                </ion-col>
-                <!-- Empty slots (last week). -->
-                <ion-col *ngFor="let value of week.postpadding" class="dayblank addon-calendar-day" role="cell"></ion-col>
-            </ion-row>
-        </div>
-    </ion-grid>
+                        </ion-col>
+                        <!-- Empty slots (last week). -->
+                        <ion-col *ngFor="let value of week.postpadding" class="dayblank addon-calendar-day" role="cell">
+                        </ion-col>
+                    </ion-row>
+                </div>
+            </ion-grid>
+        </ion-slide>
+    </ion-slides>
 
 </core-loading>
diff --git a/src/addons/calendar/components/calendar/calendar.scss b/src/addons/calendar/components/calendar/calendar.scss
index acbcccf6b..24e0c2e99 100644
--- a/src/addons/calendar/components/calendar/calendar.scss
+++ b/src/addons/calendar/components/calendar/calendar.scss
@@ -98,6 +98,10 @@
             margin-top: 10px;
             font-size: 1.2rem;
         }
+
+        .addon-calendar-loading-month {
+            height: 20px;
+        }
     }
 
     .addon-calendar-weekday {
@@ -154,6 +158,14 @@
             display: block;
         }
     }
+
+    ion-slide {
+        display: block;
+        font-size: inherit;
+        justify-content: start;
+        align-items: start;
+        text-align: start;
+    }
 }
 
 :host-context([dir=rtl]) {
diff --git a/src/addons/calendar/components/calendar/calendar.ts b/src/addons/calendar/components/calendar/calendar.ts
index a4b2178bc..02939b032 100644
--- a/src/addons/calendar/components/calendar/calendar.ts
+++ b/src/addons/calendar/components/calendar/calendar.ts
@@ -22,11 +22,12 @@ import {
     EventEmitter,
     KeyValueDiffers,
     KeyValueDiffer,
+    ViewChild,
 } from '@angular/core';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
-import { CoreTimeUtils } from '@services/utils/time';
+import { CoreTimeUtils, YearAndMonth } from '@services/utils/time';
 import { CoreUtils } from '@services/utils/utils';
 import {
     AddonCalendar,
@@ -41,6 +42,7 @@ import { AddonCalendarOffline } from '../../services/calendar-offline';
 import { CoreCategoryData, CoreCourses } from '@features/courses/services/courses';
 import { CoreApp } from '@services/app';
 import { CoreLocalNotifications } from '@services/local-notifications';
+import { IonSlides } from '@ionic/angular';
 
 /**
  * Component that displays a calendar.
@@ -52,6 +54,8 @@ import { CoreLocalNotifications } from '@services/local-notifications';
 })
 export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestroy {
 
+    @ViewChild(IonSlides) slides?: IonSlides;
+
     @Input() initialYear?: number; // Initial year to load.
     @Input() initialMonth?: number; // Initial month to load.
     @Input() filter?: AddonCalendarFilter; // Filter to apply.
@@ -61,15 +65,14 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
     @Output() onDayClicked = new EventEmitter<{day: number; month: number; year: number}>();
 
     periodName?: string;
-    weekDays: AddonCalendarWeekDaysTranslationKeys[] = [];
-    weeks: AddonCalendarWeek[] = [];
+    preloadedMonths: PreloadedMonth[] = [];
     loaded = false;
+    monthLoaded = false;
     timeFormat?: string;
     isCurrentMonth = false;
     isPastMonth = false;
 
-    protected year: number;
-    protected month: number;
+    protected visibleMonth: YearAndMonth;
     protected categoriesRetrieved = false;
     protected categories: { [id: number]: CoreCategoryData } = {};
     protected currentSiteId: string;
@@ -92,9 +95,15 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
         if (CoreLocalNotifications.isAvailable()) {
             // Re-schedule events if default time changes.
             this.obsDefaultTimeChange = CoreEvents.on(AddonCalendarProvider.DEFAULT_NOTIFICATION_TIME_CHANGED, () => {
-                this.weeks.forEach((week) => {
-                    week.days.forEach((day) => {
-                        AddonCalendar.scheduleEventsNotifications(day.eventsFormated || []);
+                this.preloadedMonths.forEach((month) => {
+                    if (!month.loaded) {
+                        return;
+                    }
+
+                    month.weeks.forEach((week) => {
+                        week.days.forEach((day) => {
+                            AddonCalendar.scheduleEventsNotifications(day.eventsFormated || []);
+                        });
                     });
                 });
             }, this.currentSiteId);
@@ -124,16 +133,18 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
 
         const now = new Date();
 
-        this.year = now.getFullYear();
-        this.month = now.getMonth() + 1;
+        this.visibleMonth = {
+            year: now.getFullYear(),
+            monthNumber: now.getMonth() + 1,
+        };
     }
 
     /**
      * Component loaded.
      */
     ngOnInit(): void {
-        this.year = this.initialYear ? this.initialYear : this.year;
-        this.month = this.initialMonth ? this.initialMonth : this.month;
+        this.visibleMonth.year = this.initialYear ?? this.visibleMonth.year;
+        this.visibleMonth.monthNumber = this.initialMonth ?? this.visibleMonth.monthNumber;
 
         this.calculateIsCurrentMonth();
 
@@ -148,11 +159,15 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
         this.displayNavButtons = typeof this.displayNavButtons == 'undefined' ? true :
             CoreUtils.isTrueOrOne(this.displayNavButtons);
 
-        if (this.weeks) {
+        if (this.preloadedMonths.length) {
             // Check if there's any change in the filter object.
             const changes = this.differ.diff(this.filter || {});
             if (changes) {
-                this.filterEvents();
+                this.preloadedMonths.forEach((month) => {
+                    if (month.loaded) {
+                        this.filterEvents(month.weeks);
+                    }
+                });
             }
         }
     }
@@ -196,7 +211,7 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
         try {
             await Promise.all(promises);
 
-            await this.fetchEvents();
+            await this.viewMonth();
 
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'addon.calendar.errorloadevents', true);
@@ -206,72 +221,162 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
     }
 
     /**
-     * Fetch the events for current month.
+     * Load or preload a month.
      *
+     * @param year Year.
+     * @param monthNumber Month number.
+     * @param preload Whether to "preload" the month. When preloading, no events will be fetched.
      * @return Promise resolved when done.
      */
-    async fetchEvents(): Promise<void> {
-        // Don't pass courseId and categoryId, we'll filter them locally.
-        let result: { daynames: Partial<AddonCalendarDayName>[]; weeks: Partial<AddonCalendarWeek>[] };
-        try {
-            result = await AddonCalendar.getMonthlyEvents(this.year, this.month);
-        } catch (error) {
-            if (!CoreApp.isOnline()) {
-                // Allow navigating to non-cached months in offline (behave as if using emergency cache).
-                result = await AddonCalendarHelper.getOfflineMonthWeeks(this.year, this.month);
-            } else {
-                throw error;
-            }
+    async loadMonth(month: YearAndMonth, preload = false): Promise<void> {
+        // Check if it's already loaded.
+        const existingMonth = this.findPreloadedMonth(month);
+        if (existingMonth && ((existingMonth.loaded && !existingMonth.needsRefresh) || preload)) {
+            return;
         }
 
-        // Calculate the period name. We don't use the one in result because it's in server's language.
-        this.periodName = CoreTimeUtils.userDate(
-            new Date(this.year, this.month - 1).getTime(),
-            'core.strftimemonthyear',
-        );
-        this.weekDays = AddonCalendar.getWeekDays(result.daynames[0].dayno);
-        this.weeks = result.weeks as AddonCalendarWeek[];
-        this.calculateIsCurrentMonth();
+        if (!preload) {
+            this.monthLoaded = false;
+        }
 
-        await Promise.all(this.weeks.map(async (week) => {
-            await Promise.all(week.days.map(async (day) => {
-                day.periodName = CoreTimeUtils.userDate(
-                    new Date(this.year, this.month - 1, day.mday).getTime(),
-                    'core.strftimedaydate',
-                );
-                day.eventsFormated = day.eventsFormated || [];
-                day.filteredEvents = day.filteredEvents || [];
-                // Format online events.
-                const onlineEventsFormatted = await Promise.all(
-                    day.events.map(async (event) => AddonCalendarHelper.formatEventData(event)),
-                );
+        try {
+            // Load or preload the weeks.
+            let result: { daynames: Partial<AddonCalendarDayName>[]; weeks: Partial<AddonCalendarWeek>[] };
+            if (preload) {
+                result = await AddonCalendarHelper.getOfflineMonthWeeks(month.year, month.monthNumber);
+            } else {
+                try {
+                    // Don't pass courseId and categoryId, we'll filter them locally.
+                    result = await AddonCalendar.getMonthlyEvents(month.year, month.monthNumber);
+                } catch (error) {
+                    if (!CoreApp.isOnline()) {
+                        // Allow navigating to non-cached months in offline (behave as if using emergency cache).
+                        result = await AddonCalendarHelper.getOfflineMonthWeeks(month.year, month.monthNumber);
+                    } else {
+                        throw error;
+                    }
+                }
+            }
 
-                day.eventsFormated = day.eventsFormated.concat(onlineEventsFormatted);
-            }));
-        }));
-
-        if (this.isCurrentMonth) {
+            const weekDays = AddonCalendar.getWeekDays(result.daynames[0].dayno);
+            const weeks = result.weeks as AddonCalendarWeek[];
+            const isCurrentMonth = CoreTimeUtils.isCurrentMonth(month);
             const currentDay = new Date().getDate();
             let isPast = true;
 
-            this.weeks.forEach((week) => {
-                week.days.forEach((day) => {
-                    day.istoday = day.mday == currentDay;
-                    day.ispast = isPast && !day.istoday;
-                    isPast = day.ispast;
+            await Promise.all(weeks.map(async (week) => {
+                await Promise.all(week.days.map(async (day) => {
+                    day.periodName = CoreTimeUtils.userDate(
+                        new Date(month.year, month.monthNumber - 1, day.mday).getTime(),
+                        'core.strftimedaydate',
+                    );
+                    day.eventsFormated = day.eventsFormated || [];
+                    day.filteredEvents = day.filteredEvents || [];
+                    // Format online events.
+                    const onlineEventsFormatted = await Promise.all(
+                        day.events.map(async (event) => AddonCalendarHelper.formatEventData(event)),
+                    );
 
-                    if (day.istoday) {
-                        day.eventsFormated?.forEach((event) => {
-                            event.ispast = this.isEventPast(event);
-                        });
+                    day.eventsFormated = day.eventsFormated.concat(onlineEventsFormatted);
+
+                    if (isCurrentMonth) {
+                        day.istoday = day.mday == currentDay;
+                        day.ispast = isPast && !day.istoday;
+                        isPast = day.ispast;
+
+                        if (day.istoday) {
+                            day.eventsFormated?.forEach((event) => {
+                                event.ispast = this.isEventPast(event);
+                            });
+                        }
                     }
-                });
+                }));
+            }));
+
+            if (!preload) {
+                // Merge the online events with offline data.
+                this.mergeEvents(month, weeks);
+                // Filter events by course.
+                this.filterEvents(weeks);
+            }
+
+            if (existingMonth) {
+                // Month already exists, update it.
+                existingMonth.loaded = !preload;
+                existingMonth.weeks = weeks;
+                existingMonth.weekDays = weekDays;
+
+                return;
+            }
+
+            // Add the preloaded month at the right position.
+            const preloadedMonth: PreloadedMonth = {
+                ...month,
+                loaded: !preload,
+                weeks,
+                weekDays,
+            };
+            const previousMonth = CoreTimeUtils.getPreviousMonth(month);
+            const nextMonth = CoreTimeUtils.getNextMonth(month);
+            const activeIndex = await this.slides?.getActiveIndex();
+
+            const added = this.preloadedMonths.some((month, index) => {
+                let positionToInsert = -1;
+                if (CoreTimeUtils.isSameMonth(month, previousMonth)) {
+                    // Previous month found, add the month after it.
+                    positionToInsert = index + 1;
+                }
+
+                if (CoreTimeUtils.isSameMonth(month, nextMonth)) {
+                    // Next month found, add the month before it.
+                    positionToInsert = index;
+                }
+
+                if (positionToInsert > -1) {
+                    this.preloadedMonths.splice(positionToInsert, 0, preloadedMonth);
+                    if (activeIndex !== undefined && positionToInsert <= activeIndex) {
+                        // Added a slide before the active one, keep current slide.
+                        this.slides?.slideTo(activeIndex + 1, 0, false);
+                    }
+
+                    return true;
+                }
             });
+
+            if (!added) {
+                // Previous and next months not found, this probably means the array is still empty. Add it at the end.
+                this.preloadedMonths.push(preloadedMonth);
+            }
+        } finally {
+            if (!preload) {
+                this.monthLoaded = true;
+            }
+        }
+    }
+
+    /**
+     * Load current month and preload next and previous ones.
+     *
+     * @return Promise resolved when done.
+     */
+    async viewMonth(): Promise<void> {
+        // Calculate the period name. We don't use the one in result because it's in server's language.
+        this.periodName = CoreTimeUtils.userDate(
+            new Date(this.visibleMonth.year, this.visibleMonth.monthNumber - 1).getTime(),
+            'core.strftimemonthyear',
+        );
+        this.calculateIsCurrentMonth();
+
+        try {
+            // Load current month, and preload next and previous ones.
+            await Promise.all([
+                this.loadMonth(this.visibleMonth, false),
+                this.loadMonth(CoreTimeUtils.getPreviousMonth(this.visibleMonth), true),
+                this.loadMonth(CoreTimeUtils.getNextMonth(this.visibleMonth), true),
+            ]);
+        } catch (error) {
+            CoreDomUtils.showErrorModalDefault(error, 'addon.calendar.errorloadevents', true);
         }
-        // Merge the online events with offline data.
-        this.mergeEvents();
-        // Filter events by course.
-        this.filterEvents();
     }
 
     /**
@@ -301,9 +406,11 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
 
     /**
      * Filter events based on the filter popover.
+     *
+     * @param weeks Weeks with the events to filter.
      */
-    filterEvents(): void {
-        this.weeks.forEach((week) => {
+    filterEvents(weeks: AddonCalendarWeek[]): void {
+        weeks.forEach((week) => {
             week.days.forEach((day) => {
                 day.filteredEvents = AddonCalendarHelper.getFilteredEvents(
                     day.eventsFormated || [],
@@ -323,18 +430,20 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
      * @param afterChange Whether the refresh is done after an event has changed or has been synced.
      * @return Promise resolved when done.
      */
-    async refreshData(afterChange?: boolean): Promise<void> {
+    async refreshData(): Promise<void> {
         const promises: Promise<void>[] = [];
 
-        // Don't invalidate monthly events after a change, it has already been handled.
-        if (!afterChange) {
-            promises.push(AddonCalendar.invalidateMonthlyEvents(this.year, this.month));
-        }
+        promises.push(AddonCalendar.invalidateMonthlyEvents(this.visibleMonth.year, this.visibleMonth.monthNumber));
         promises.push(CoreCourses.invalidateCategories(0, true));
         promises.push(AddonCalendar.invalidateTimeFormat());
 
         this.categoriesRetrieved = false; // Get categories again.
 
+        const preloadedMonth = this.findPreloadedMonth(this.visibleMonth);
+        if (preloadedMonth) {
+            preloadedMonth.needsRefresh = true;
+        }
+
         await Promise.all(promises);
 
         this.fetchData();
@@ -343,35 +452,15 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
     /**
      * Load next month.
      */
-    async loadNext(): Promise<void> {
-        this.increaseMonth();
-
-        this.loaded = false;
-
-        try {
-            await this.fetchEvents();
-        } catch (error) {
-            CoreDomUtils.showErrorModalDefault(error, 'addon.calendar.errorloadevents', true);
-            this.decreaseMonth();
-        }
-        this.loaded = true;
+    loadNext(): void {
+        this.slides?.slideNext();
     }
 
     /**
      * Load previous month.
      */
-    async loadPrevious(): Promise<void> {
-        this.decreaseMonth();
-
-        this.loaded = false;
-
-        try {
-            await this.fetchEvents();
-        } catch (error) {
-            CoreDomUtils.showErrorModalDefault(error, 'addon.calendar.errorloadevents', true);
-            this.increaseMonth();
-        }
-        this.loaded = true;
+    loadPrevious(): void {
+        this.slides?.slidePrev();
     }
 
     /**
@@ -391,78 +480,46 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
      * @param day Day.
      */
     dayClicked(day: number): void {
-        this.onDayClicked.emit({ day: day, month: this.month, year: this.year });
+        this.onDayClicked.emit({ day: day, month: this.visibleMonth.monthNumber, year: this.visibleMonth.year });
     }
 
     /**
      * Check if user is viewing the current month.
      */
     calculateIsCurrentMonth(): void {
-        const now = new Date();
-
         this.currentTime = CoreTimeUtils.timestamp();
-
-        this.isCurrentMonth = this.year == now.getFullYear() && this.month == now.getMonth() + 1;
-        this.isPastMonth = this.year < now.getFullYear() || (this.year == now.getFullYear() && this.month < now.getMonth() + 1);
+        this.isCurrentMonth = CoreTimeUtils.isCurrentMonth(this.visibleMonth);
+        this.isPastMonth = CoreTimeUtils.isCurrentMonth(this.visibleMonth);
     }
 
     /**
      * Go to current month.
      */
     async goToCurrentMonth(): Promise<void> {
+
         const now = new Date();
-        const initialMonth = this.month;
-        const initialYear = this.year;
+        const currentMonth = {
+            monthNumber: now.getMonth() + 1,
+            year: now.getFullYear(),
+        };
 
-        this.month = now.getMonth() + 1;
-        this.year = now.getFullYear();
-
-        this.loaded = false;
-
-        try {
-            await this.fetchEvents();
-            this.isCurrentMonth = true;
-        } catch (error) {
-            CoreDomUtils.showErrorModalDefault(error, 'addon.calendar.errorloadevents', true);
-            this.year = initialYear;
-            this.month = initialMonth;
-        }
-
-        this.loaded = true;
-    }
-
-    /**
-     * Decrease the current month.
-     */
-    protected decreaseMonth(): void {
-        if (this.month === 1) {
-            this.month = 12;
-            this.year--;
-        } else {
-            this.month--;
-        }
-    }
-
-    /**
-     * Increase the current month.
-     */
-    protected increaseMonth(): void {
-        if (this.month === 12) {
-            this.month = 1;
-            this.year++;
-        } else {
-            this.month++;
+        const index = this.preloadedMonths.findIndex((month) => CoreTimeUtils.isSameMonth(month, currentMonth));
+        if (index > -1) {
+            this.slides?.slideTo(index);
         }
     }
 
     /**
      * Merge online events with the offline events of that period.
+     *
+     * @param month Month.
+     * @param weeks Weeks with the events to filter.
      */
-    protected mergeEvents(): void {
+    protected mergeEvents(month: YearAndMonth, weeks: AddonCalendarWeek[]): void {
         const monthOfflineEvents: { [day: number]: AddonCalendarEventToDisplay[] } =
-            this.offlineEvents[AddonCalendarHelper.getMonthId(this.year, this.month)];
+            this.offlineEvents[AddonCalendarHelper.getMonthId(month.year, month.monthNumber)];
 
-        this.weeks.forEach((week) => {
+        weeks.forEach((week) => {
             week.days.forEach((day) => {
 
                 // Schedule notifications for the events retrieved (only future events will be scheduled).
@@ -498,18 +555,20 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
      *
      * @param eventId Event ID.
      */
-    protected undeleteEvent(eventId: number): void {
-        if (!this.weeks) {
-            return;
-        }
+    protected async undeleteEvent(eventId: number): Promise<void> {
+        this.preloadedMonths.forEach((month) => {
+            if (!month.loaded) {
+                return;
+            }
 
-        this.weeks.forEach((week) => {
-            week.days.forEach((day) => {
-                const event = day.eventsFormated?.find((event) => event.id == eventId);
+            month.weeks.forEach((week) => {
+                week.days.forEach((day) => {
+                    const event = day.eventsFormated?.find((event) => event.id == eventId);
 
-                if (event) {
-                    event.deleted = false;
-                }
+                    if (event) {
+                        event.deleted = false;
+                    }
+                });
             });
         });
     }
@@ -524,6 +583,38 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
         return (event.timestart + event.timeduration) < (this.currentTime || CoreTimeUtils.timestamp());
     }
 
+    /**
+     * Slide has changed.
+     *
+     * @return Promise resolved when done.
+     */
+    async slideChanged(): Promise<void> {
+        if (!this.slides) {
+            return;
+        }
+
+        const index = await this.slides.getActiveIndex();
+        const preloadedMonth = this.preloadedMonths[index];
+        if (!preloadedMonth) {
+            return;
+        }
+
+        this.visibleMonth.year = preloadedMonth.year;
+        this.visibleMonth.monthNumber = preloadedMonth.monthNumber;
+
+        await this.viewMonth();
+    }
+
+    /**
+     * Find a certain preloaded month.
+     *
+     * @param month Month to search.
+     * @return Preloaded month, undefined if not found.
+     */
+    protected findPreloadedMonth(month: YearAndMonth): PreloadedMonth | undefined {
+        return this.preloadedMonths.find(preloadedMonth => CoreTimeUtils.isSameMonth(month, preloadedMonth));
+    }
+
     /**
      * Component destroyed.
      */
@@ -533,3 +624,13 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
     }
 
 }
+
+/**
+ * Preloaded month.
+ */
+type PreloadedMonth = YearAndMonth & {
+    loaded: boolean; // Whether the events have been loaded.
+    weekDays: AddonCalendarWeekDaysTranslationKeys[];
+    weeks: AddonCalendarWeek[];
+    needsRefresh?: boolean; // Whether the events needs to be re-loaded.
+};
diff --git a/src/addons/calendar/components/upcoming-events/upcoming-events.ts b/src/addons/calendar/components/upcoming-events/upcoming-events.ts
index f59363845..a11c5f81b 100644
--- a/src/addons/calendar/components/upcoming-events/upcoming-events.ts
+++ b/src/addons/calendar/components/upcoming-events/upcoming-events.ts
@@ -227,16 +227,12 @@ export class AddonCalendarUpcomingEventsComponent implements OnInit, DoCheck, On
     /**
      * Refresh events.
      *
-     * @param afterChange Whether the refresh is done after an event has changed or has been synced.
      * @return Promise resolved when done.
      */
-    async refreshData(afterChange?: boolean): Promise<void> {
+    async refreshData(): Promise<void> {
         const promises: Promise<void>[] = [];
 
-        // Don't invalidate upcoming events after a change, it has already been handled.
-        if (!afterChange) {
-            promises.push(AddonCalendar.invalidateAllUpcomingEvents());
-        }
+        promises.push(AddonCalendar.invalidateAllUpcomingEvents());
         promises.push(CoreCourses.invalidateCategories(0, true));
         promises.push(AddonCalendar.invalidateLookAhead());
         promises.push(AddonCalendar.invalidateTimeFormat());
diff --git a/src/core/services/utils/time.ts b/src/core/services/utils/time.ts
index 684c741b0..cd9c449f3 100644
--- a/src/core/services/utils/time.ts
+++ b/src/core/services/utils/time.ts
@@ -389,6 +389,86 @@ export class CoreTimeUtilsProvider {
         return String(moment().year() - 20);
     }
 
+    /**
+     * Given a year and a month, return the previous month and its year.
+     *
+     * @param month Year and month.
+     * @return Previous month and its year.
+     */
+    getPreviousMonth(month: YearAndMonth): YearAndMonth {
+        if (month.monthNumber === 1) {
+            return {
+                monthNumber: 12,
+                year: month.year - 1,
+            };
+        }
+
+        return {
+            monthNumber: month.monthNumber - 1,
+            year: month.year,
+        };
+    }
+
+    /**
+     * Given a year and a month, return the next month and its year.
+     *
+     * @param month Year and month.
+     * @return Next month and its year.
+     */
+    getNextMonth(month: YearAndMonth): YearAndMonth {
+        if (month.monthNumber === 12) {
+            return {
+                monthNumber: 1,
+                year: month.year + 1,
+            };
+        }
+
+        return {
+            monthNumber: month.monthNumber + 1,
+            year: month.year,
+        };
+    }
+
+    /**
+     * Check if a certain month is current month.
+     *
+     * @param month Year and month.
+     * @return Whether it's current month.
+     */
+    isCurrentMonth(month: YearAndMonth): boolean {
+        const now = new Date();
+
+        return month.year == now.getFullYear() && month.monthNumber == now.getMonth() + 1;
+    }
+
+    /**
+     * Check if a certain month is a past month.
+     *
+     * @param month Year and month.
+     * @return Whether it's a past month.
+     */
+    isPastMonth(month: YearAndMonth): boolean {
+        const now = new Date();
+
+        return month.year < now.getFullYear() || (month.year == now.getFullYear() && month.monthNumber < now.getMonth() + 1);
+    }
+
+    /**
+     * Check if two months are the same.
+     *
+     * @param monthA Month A.
+     * @param monthB Month B.
+     * @return Whether it's same month.
+     */
+    isSameMonth(monthA: YearAndMonth, monthB: YearAndMonth): boolean {
+        return monthA.monthNumber === monthB.monthNumber && monthA.year === monthB.year;
+    }
+
 }
 
 export const CoreTimeUtils = makeSingleton(CoreTimeUtilsProvider);
+
+export type YearAndMonth = {
+    year: number; // Year number.
+    monthNumber: number; // Month number (1 to 12).
+};

From 741880f8df3c2a84087dbc2edf5e9a49c5b50677 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 10 Dec 2021 07:19:33 +0100
Subject: [PATCH 0290/1008] MOBILE-3927 swipe: Create swipe-slides component
 and refactor managers

---
 .../badges/classes/user-badges-source.ts      |   4 +-
 .../pages/issued-badge/issued-badge.page.ts   |   7 +-
 .../pages/user-badges/user-badges.page.ts     |   4 +-
 .../calendar/addon-calendar-calendar.html     |  15 +-
 .../calendar/components/calendar/calendar.ts  | 686 +++++++++---------
 .../mod/assign/classes/submissions-source.ts  |   4 +-
 .../submission-list/submission-list.page.ts   |   4 +-
 .../submission-review/submission-review.ts    |   4 +-
 .../index/addon-mod-book-index.html           |  14 +-
 src/addons/mod/book/components/index/index.ts | 253 ++++---
 .../forum/classes/forum-discussions-source.ts |   4 +-
 .../mod/forum/components/index/index.ts       |   4 +-
 .../forum/pages/discussion/discussion.page.ts |   4 +-
 .../new-discussion/new-discussion.page.ts     |   4 +-
 .../classes/glossary-entries-source.ts        |   4 +-
 .../mod/glossary/components/index/index.ts    |   4 +-
 src/addons/mod/glossary/pages/edit/edit.ts    |   4 +-
 src/addons/mod/glossary/pages/entry/entry.ts  |   4 +-
 .../items-management/items-manager-source.ts  | 133 +---
 .../classes/items-management/items-manager.ts |  96 +--
 .../items-management/list-items-manager.ts    |   8 +-
 .../routed-items-manager-source.ts            | 150 ++++
 ...> routed-items-manager-sources-tracker.ts} |  20 +-
 .../items-management/routed-items-manager.ts  | 135 ++++
 .../slides-dynamic-items-manager-source.ts    | 141 ++++
 .../slides-dynamic-items-manager.ts           |  38 +
 .../slides-items-manager-source.ts            | 121 +++
 .../items-management/slides-items-manager.ts  |  47 ++
 .../items-management/swipe-items-manager.ts   |   8 +-
 src/core/components/components.module.ts      |   3 +
 .../components/swipe-slides/swipe-slides.html |   6 +
 .../swipe-slides/swipe-slides.scss}           |   0
 .../components/swipe-slides/swipe-slides.ts   | 263 +++++++
 .../user/classes/participants-source.ts       |   4 +-
 .../pages/participants/participants.page.ts   |  11 +-
 .../user/pages/profile/profile.page.ts        |   7 +-
 36 files changed, 1496 insertions(+), 722 deletions(-)
 create mode 100644 src/core/classes/items-management/routed-items-manager-source.ts
 rename src/core/classes/items-management/{items-manager-sources-tracker.ts => routed-items-manager-sources-tracker.ts} (83%)
 create mode 100644 src/core/classes/items-management/routed-items-manager.ts
 create mode 100644 src/core/classes/items-management/slides-dynamic-items-manager-source.ts
 create mode 100644 src/core/classes/items-management/slides-dynamic-items-manager.ts
 create mode 100644 src/core/classes/items-management/slides-items-manager-source.ts
 create mode 100644 src/core/classes/items-management/slides-items-manager.ts
 create mode 100644 src/core/components/swipe-slides/swipe-slides.html
 rename src/{addons/mod/book/components/index/index.scss => core/components/swipe-slides/swipe-slides.scss} (100%)
 create mode 100644 src/core/components/swipe-slides/swipe-slides.ts

diff --git a/src/addons/badges/classes/user-badges-source.ts b/src/addons/badges/classes/user-badges-source.ts
index ea36a237f..e7aac1ed7 100644
--- a/src/addons/badges/classes/user-badges-source.ts
+++ b/src/addons/badges/classes/user-badges-source.ts
@@ -13,13 +13,13 @@
 // limitations under the License.
 
 import { Params } from '@angular/router';
-import { CoreItemsManagerSource } from '@classes/items-management/items-manager-source';
+import { CoreRoutedItemsManagerSource } from '@classes/items-management/routed-items-manager-source';
 import { AddonBadges, AddonBadgesUserBadge } from '../services/badges';
 
 /**
  * Provides a collection of user badges.
  */
-export class AddonBadgesUserBadgesSource extends CoreItemsManagerSource<AddonBadgesUserBadge> {
+export class AddonBadgesUserBadgesSource extends CoreRoutedItemsManagerSource<AddonBadgesUserBadge> {
 
     readonly COURSE_ID: number;
     readonly USER_ID: number;
diff --git a/src/addons/badges/pages/issued-badge/issued-badge.page.ts b/src/addons/badges/pages/issued-badge/issued-badge.page.ts
index 907e04c89..c48a21034 100644
--- a/src/addons/badges/pages/issued-badge/issued-badge.page.ts
+++ b/src/addons/badges/pages/issued-badge/issued-badge.page.ts
@@ -24,8 +24,8 @@ import { CoreCourses, CoreEnrolledCourseData } from '@features/courses/services/
 import { CoreNavigator } from '@services/navigator';
 import { ActivatedRoute } from '@angular/router';
 import { CoreSwipeItemsManager } from '@classes/items-management/swipe-items-manager';
-import { CoreItemsManagerSourcesTracker } from '@classes/items-management/items-manager-sources-tracker';
 import { AddonBadgesUserBadgesSource } from '@addons/badges/classes/user-badges-source';
+import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
 
 /**
  * Page that displays the list of calendar events.
@@ -61,7 +61,10 @@ export class AddonBadgesIssuedBadgePage implements OnInit {
             this.badgeLoaded = true;
         });
 
-        const source = CoreItemsManagerSourcesTracker.getOrCreateSource(AddonBadgesUserBadgesSource, [this.courseId, this.userId]);
+        const source = CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(
+            AddonBadgesUserBadgesSource,
+            [this.courseId, this.userId],
+        );
         this.badges = new CoreSwipeItemsManager(source);
 
         this.badges.start();
diff --git a/src/addons/badges/pages/user-badges/user-badges.page.ts b/src/addons/badges/pages/user-badges/user-badges.page.ts
index e614c3bac..31ba89d84 100644
--- a/src/addons/badges/pages/user-badges/user-badges.page.ts
+++ b/src/addons/badges/pages/user-badges/user-badges.page.ts
@@ -23,7 +23,7 @@ import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import { CoreNavigator } from '@services/navigator';
 import { CoreListItemsManager } from '@classes/items-management/list-items-manager';
 import { AddonBadgesUserBadgesSource } from '@addons/badges/classes/user-badges-source';
-import { CoreItemsManagerSourcesTracker } from '@classes/items-management/items-manager-sources-tracker';
+import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
 
 /**
  * Page that displays the list of calendar events.
@@ -49,7 +49,7 @@ export class AddonBadgesUserBadgesPage implements AfterViewInit, OnDestroy {
         }
 
         this.badges = new CoreListItemsManager(
-            CoreItemsManagerSourcesTracker.getOrCreateSource(AddonBadgesUserBadgesSource, [courseId, userId]),
+            CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(AddonBadgesUserBadgesSource, [courseId, userId]),
             AddonBadgesUserBadgesPage,
         );
     }
diff --git a/src/addons/calendar/components/calendar/addon-calendar-calendar.html b/src/addons/calendar/components/calendar/addon-calendar-calendar.html
index f102136be..40ba979c3 100644
--- a/src/addons/calendar/components/calendar/addon-calendar-calendar.html
+++ b/src/addons/calendar/components/calendar/addon-calendar-calendar.html
@@ -19,7 +19,8 @@
             <ion-col class="ion-text-center addon-calendar-period">
                 <h2 id="addon-calendar-monthname">
                     {{ periodName }}
-                    <ion-spinner *ngIf="!monthLoaded" class="addon-calendar-loading-month"></ion-spinner>
+                    <ion-spinner *ngIf="manager && !manager.getSource().monthLoaded" class="addon-calendar-loading-month">
+                    </ion-spinner>
                 </h2>
             </ion-col>
             <ion-col class="ion-text-end" *ngIf="canNavigate">
@@ -30,14 +31,14 @@
         </ion-row>
     </ion-grid>
 
-    <ion-slides *ngIf="loaded" (ionSlideWillChange)="slideChanged()" [options]="{initialSlide: 1}">
-        <ion-slide *ngFor="let month of preloadedMonths">
+    <core-swipe-slides [manager]="manager" (onWillChange)="slideChanged($event)">
+        <ng-template let-item="item">
             <!-- Calendar view. -->
             <ion-grid class="addon-calendar-months" role="table" aria-describedby="addon-calendar-monthname">
                 <div role="rowgroup">
                     <!-- List of days. -->
                     <ion-row role="row">
-                        <ion-col class="ion-text-center addon-calendar-weekday" *ngFor="let day of month.weekDays" role="columnheader">
+                        <ion-col class="ion-text-center addon-calendar-weekday" *ngFor="let day of item.weekDays" role="columnheader">
                             <span class="sr-only">{{ day.fullname | translate }}</span>
                             <span class="ion-hide-md-up" aria-hidden="true">{{ day.shortname | translate }}</span>
                             <span class="ion-hide-md-down" aria-hidden="true">{{ day.fullname | translate }}</span>
@@ -46,7 +47,7 @@
                 </div>
                 <div role="rowgroup">
                     <!-- Weeks. -->
-                    <ion-row *ngFor="let week of month.weeks" class="addon-calendar-week" role="row">
+                    <ion-row *ngFor="let week of item.weeks" class="addon-calendar-week" role="row">
                         <!-- Empty slots (first week). -->
                         <ion-col *ngFor="let value of week.prepadding" class="dayblank addon-calendar-day" role="cell">
                         </ion-col>
@@ -104,7 +105,7 @@
                     </ion-row>
                 </div>
             </ion-grid>
-        </ion-slide>
-    </ion-slides>
+        </ng-template>
+    </core-swipe-slides>
 
 </core-loading>
diff --git a/src/addons/calendar/components/calendar/calendar.ts b/src/addons/calendar/components/calendar/calendar.ts
index 02939b032..6a0f3a4c5 100644
--- a/src/addons/calendar/components/calendar/calendar.ts
+++ b/src/addons/calendar/components/calendar/calendar.ts
@@ -42,7 +42,9 @@ import { AddonCalendarOffline } from '../../services/calendar-offline';
 import { CoreCategoryData, CoreCourses } from '@features/courses/services/courses';
 import { CoreApp } from '@services/app';
 import { CoreLocalNotifications } from '@services/local-notifications';
-import { IonSlides } from '@ionic/angular';
+import { CoreSwipeCurrentItemData, CoreSwipeSlidesComponent } from '@components/swipe-slides/swipe-slides';
+import { CoreSwipeSlidesDynamicItemsManagerSource } from '@classes/items-management/slides-dynamic-items-manager-source';
+import { CoreSwipeSlidesDynamicItemsManager } from '@classes/items-management/slides-dynamic-items-manager';
 
 /**
  * Component that displays a calendar.
@@ -54,7 +56,7 @@ import { IonSlides } from '@ionic/angular';
 })
 export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestroy {
 
-    @ViewChild(IonSlides) slides?: IonSlides;
+    @ViewChild(CoreSwipeSlidesComponent) slides?: CoreSwipeSlidesComponent<PreloadedMonth>;
 
     @Input() initialYear?: number; // Initial year to load.
     @Input() initialMonth?: number; // Initial month to load.
@@ -65,22 +67,12 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
     @Output() onDayClicked = new EventEmitter<{day: number; month: number; year: number}>();
 
     periodName?: string;
-    preloadedMonths: PreloadedMonth[] = [];
+    manager?: CoreSwipeSlidesDynamicItemsManager<PreloadedMonth, AddonCalendarMonthSlidesItemsManagerSource>;
     loaded = false;
-    monthLoaded = false;
-    timeFormat?: string;
     isCurrentMonth = false;
     isPastMonth = false;
 
-    protected visibleMonth: YearAndMonth;
-    protected categoriesRetrieved = false;
-    protected categories: { [id: number]: CoreCategoryData } = {};
     protected currentSiteId: string;
-    protected offlineEvents: { [monthId: string]: { [day: number]: AddonCalendarEventToDisplay[] } } =
-        {}; // Offline events classified in month & day.
-
-    protected offlineEditedEventsIds: number[] = []; // IDs of events edited in offline.
-    protected deletedEvents: number[] = []; // Events deleted in offline.
     protected currentTime?: number;
     protected differ: KeyValueDiffer<unknown, unknown>; // To detect changes in the data input.
     // Observers.
@@ -95,7 +87,7 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
         if (CoreLocalNotifications.isAvailable()) {
             // Re-schedule events if default time changes.
             this.obsDefaultTimeChange = CoreEvents.on(AddonCalendarProvider.DEFAULT_NOTIFICATION_TIME_CHANGED, () => {
-                this.preloadedMonths.forEach((month) => {
+                this.manager?.getSource().getItems()?.forEach((month) => {
                     if (!month.loaded) {
                         return;
                     }
@@ -121,30 +113,32 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
                 this.undeleteEvent(data.eventId);
 
                 // Remove it from the list of deleted events if it's there.
-                const index = this.deletedEvents.indexOf(data.eventId);
-                if (index != -1) {
-                    this.deletedEvents.splice(index, 1);
+                const index = this.manager?.getSource().deletedEvents.indexOf(data.eventId);
+                if (index !== undefined && index != -1) {
+                    this.manager?.getSource().deletedEvents.splice(index, 1);
                 }
             },
             this.currentSiteId,
         );
 
         this.differ = differs.find([]).create();
-
-        const now = new Date();
-
-        this.visibleMonth = {
-            year: now.getFullYear(),
-            monthNumber: now.getMonth() + 1,
-        };
     }
 
     /**
      * Component loaded.
      */
     ngOnInit(): void {
-        this.visibleMonth.year = this.initialYear ?? this.visibleMonth.year;
-        this.visibleMonth.monthNumber = this.initialMonth ?? this.visibleMonth.monthNumber;
+        const now = new Date();
+
+        this.canNavigate = typeof this.canNavigate == 'undefined' ? true : CoreUtils.isTrueOrOne(this.canNavigate);
+        this.displayNavButtons = typeof this.displayNavButtons == 'undefined' ? true :
+            CoreUtils.isTrueOrOne(this.displayNavButtons);
+
+        const source = new AddonCalendarMonthSlidesItemsManagerSource(this, {
+            year: this.initialYear ?? now.getFullYear(),
+            monthNumber: this.initialMonth ?? now.getMonth() + 1,
+        });
+        this.manager = new CoreSwipeSlidesDynamicItemsManager(source);
 
         this.calculateIsCurrentMonth();
 
@@ -155,15 +149,13 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
      * Detect and act upon changes that Angular can’t or won’t detect on its own (objects and arrays).
      */
     ngDoCheck(): void {
-        this.canNavigate = typeof this.canNavigate == 'undefined' ? true : CoreUtils.isTrueOrOne(this.canNavigate);
-        this.displayNavButtons = typeof this.displayNavButtons == 'undefined' ? true :
-            CoreUtils.isTrueOrOne(this.displayNavButtons);
+        const items = this.manager?.getSource().getItems();
 
-        if (this.preloadedMonths.length) {
+        if (items?.length) {
             // Check if there's any change in the filter object.
             const changes = this.differ.diff(this.filter || {});
             if (changes) {
-                this.preloadedMonths.forEach((month) => {
+                items.forEach((month) => {
                     if (month.loaded) {
                         this.filterEvents(month.weeks);
                     }
@@ -172,47 +164,20 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
         }
     }
 
+    get timeFormat(): string {
+        return this.manager?.getSource().timeFormat || 'core.strftimetime';
+    }
+
     /**
      * Fetch contacts.
      *
      * @return Promise resolved when done.
      */
     async fetchData(): Promise<void> {
-        const promises: Promise<void>[] = [];
-
-        promises.push(this.loadCategories());
-
-        // Get offline events.
-        promises.push(AddonCalendarOffline.getAllEditedEvents().then((events) => {
-            // Classify them by month.
-            this.offlineEvents = AddonCalendarHelper.classifyIntoMonths(events);
-
-            // Get the IDs of events edited in offline.
-            const filtered = events.filter((event) => event.id > 0);
-            this.offlineEditedEventsIds = filtered.map((event) => event.id);
-
-            return;
-        }));
-
-        // Get events deleted in offline.
-        promises.push(AddonCalendarOffline.getAllDeletedEventsIds().then((ids) => {
-            this.deletedEvents = ids;
-
-            return;
-        }));
-
-        // Get time format to use.
-        promises.push(AddonCalendar.getCalendarTimeFormat().then((value) => {
-            this.timeFormat = value;
-
-            return;
-        }));
-
         try {
-            await Promise.all(promises);
-
-            await this.viewMonth();
+            await this.manager?.getSource().fetchData();
 
+            await this.manager?.getSource().load();
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'addon.calendar.errorloadevents', true);
         }
@@ -221,20 +186,310 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
     }
 
     /**
-     * Load or preload a month.
+     * Load current month and preload next and previous ones.
      *
-     * @param year Year.
-     * @param monthNumber Month number.
-     * @param preload Whether to "preload" the month. When preloading, no events will be fetched.
      * @return Promise resolved when done.
      */
-    async loadMonth(month: YearAndMonth, preload = false): Promise<void> {
-        // Check if it's already loaded.
-        const existingMonth = this.findPreloadedMonth(month);
-        if (existingMonth && ((existingMonth.loaded && !existingMonth.needsRefresh) || preload)) {
+    async viewMonth(month: YearAndMonth): Promise<void> {
+        // Calculate the period name. We don't use the one in result because it's in server's language.
+        this.periodName = CoreTimeUtils.userDate(
+            new Date(month.year, month.monthNumber - 1).getTime(),
+            'core.strftimemonthyear',
+        );
+        this.calculateIsCurrentMonth();
+    }
+
+    /**
+     * Filter events based on the filter popover.
+     *
+     * @param weeks Weeks with the events to filter.
+     */
+    filterEvents(weeks: AddonCalendarWeek[]): void {
+        weeks.forEach((week) => {
+            week.days.forEach((day) => {
+                day.filteredEvents = AddonCalendarHelper.getFilteredEvents(
+                    day.eventsFormated || [],
+                    this.filter,
+                    this.manager?.getSource().categories || {},
+                );
+
+                // Re-calculate some properties.
+                AddonCalendarHelper.calculateDayData(day, day.filteredEvents);
+            });
+        });
+    }
+
+    /**
+     * Refresh events.
+     *
+     * @param afterChange Whether the refresh is done after an event has changed or has been synced.
+     * @return Promise resolved when done.
+     */
+    async refreshData(): Promise<void> {
+        const visibleMonth = this.slides?.getCurrentItem() || null;
+
+        await this.manager?.getSource().invalidateContent(visibleMonth);
+
+        await this.fetchData();
+    }
+
+    /**
+     * Load next month.
+     */
+    loadNext(): void {
+        this.slides?.slideNext();
+    }
+
+    /**
+     * Load previous month.
+     */
+    loadPrevious(): void {
+        this.slides?.slidePrev();
+    }
+
+    /**
+     * An event was clicked.
+     *
+     * @param calendarEvent Calendar event..
+     * @param event Mouse event.
+     */
+    eventClicked(calendarEvent: AddonCalendarEventToDisplay, event: Event): void {
+        this.onEventClicked.emit(calendarEvent.id);
+        event.stopPropagation();
+    }
+
+    /**
+     * A day was clicked.
+     *
+     * @param day Day.
+     */
+    dayClicked(day: number): void {
+        const visibleMonth = this.slides?.getCurrentItem();
+        if (!visibleMonth) {
             return;
         }
 
+        this.onDayClicked.emit({ day: day, month: visibleMonth.monthNumber, year: visibleMonth.year });
+    }
+
+    /**
+     * Check if user is viewing the current month.
+     */
+    calculateIsCurrentMonth(): void {
+        const visibleMonth = this.slides?.getCurrentItem();
+        if (!visibleMonth) {
+            return;
+        }
+
+        this.currentTime = CoreTimeUtils.timestamp();
+        this.isCurrentMonth = CoreTimeUtils.isCurrentMonth(visibleMonth);
+        this.isPastMonth = CoreTimeUtils.isCurrentMonth(visibleMonth);
+    }
+
+    /**
+     * Go to current month.
+     */
+    async goToCurrentMonth(): Promise<void> {
+        const now = new Date();
+        const currentMonth = {
+            monthNumber: now.getMonth() + 1,
+            year: now.getFullYear(),
+        };
+
+        this.slides?.slideToItem(currentMonth);
+    }
+
+    /**
+     * Undelete a certain event.
+     *
+     * @param eventId Event ID.
+     */
+    protected async undeleteEvent(eventId: number): Promise<void> {
+        this.manager?.getSource().getItems()?.forEach((month) => {
+            if (!month.loaded) {
+                return;
+            }
+
+            month.weeks.forEach((week) => {
+                week.days.forEach((day) => {
+                    const event = day.eventsFormated?.find((event) => event.id == eventId);
+
+                    if (event) {
+                        event.deleted = false;
+                    }
+                });
+            });
+        });
+    }
+
+    /**
+     * Returns if the event is in the past or not.
+     *
+     * @param event Event object.
+     * @return True if it's in the past.
+     */
+    isEventPast(event: { timestart: number; timeduration: number}): boolean {
+        return (event.timestart + event.timeduration) < (this.currentTime || CoreTimeUtils.timestamp());
+    }
+
+    /**
+     * Slide has changed.
+     *
+     * @param data Data about new item.
+     */
+    slideChanged(data: CoreSwipeCurrentItemData<PreloadedMonth>): void {
+        this.viewMonth(data.item);
+    }
+
+    /**
+     * Component destroyed.
+     */
+    ngOnDestroy(): void {
+        this.undeleteEventObserver?.off();
+        this.obsDefaultTimeChange?.off();
+    }
+
+}
+
+/**
+ * Preloaded month.
+ */
+type PreloadedMonth = YearAndMonth & {
+    loaded: boolean; // Whether the events have been loaded.
+    weekDays: AddonCalendarWeekDaysTranslationKeys[];
+    weeks: AddonCalendarWeek[];
+    needsRefresh?: boolean; // Whether the events needs to be re-loaded.
+};
+
+// CoreSwipeSlidesDynamicItemsManagerSource
+
+/**
+ * Helper to manage swiping within a collection of chapters.
+ */
+class AddonCalendarMonthSlidesItemsManagerSource extends CoreSwipeSlidesDynamicItemsManagerSource<PreloadedMonth> {
+
+    monthLoaded = false;
+    categories: { [id: number]: CoreCategoryData } = {};
+    // Offline events classified in month & day.
+    offlineEvents: { [monthId: string]: { [day: number]: AddonCalendarEventToDisplay[] } } = {};
+    offlineEditedEventsIds: number[] = []; // IDs of events edited in offline.
+    deletedEvents: number[] = []; // Events deleted in offline.
+    timeFormat?: string;
+
+    protected calendarComponent: AddonCalendarCalendarComponent;
+    protected categoriesRetrieved = false;
+
+    constructor(component: AddonCalendarCalendarComponent, initialMonth: YearAndMonth) {
+        super(initialMonth);
+
+        this.calendarComponent = component;
+    }
+
+    /**
+     * Fetch data.
+     *
+     * @return Promise resolved when done.
+     */
+    async fetchData(): Promise<void> {
+        await Promise.all([
+            this.loadCategories(),
+            this.loadOfflineEvents(),
+            this.loadOfflineDeletedEvents(),
+            this.loadTimeFormat(),
+        ]);
+    }
+
+    /**
+     * Load categories to be able to filter events.
+     *
+     * @return Promise resolved when done.
+     */
+    async loadCategories(): Promise<void> {
+        if (this.categoriesRetrieved) {
+            // Already retrieved, stop.
+            return;
+        }
+
+        try {
+            const cats = await CoreCourses.getCategories(0, true);
+            this.categoriesRetrieved = true;
+            this.categories = {};
+
+            // Index categories by ID.
+            cats.forEach((category) => {
+                this.categories[category.id] = category;
+            });
+        } catch {
+            // Ignore errors.
+        }
+    }
+
+    /**
+     * Load events created or edited in offline.
+     *
+     * @return Promise resolved when done.
+     */
+    async loadOfflineEvents(): Promise<void> {
+        // Get offline events.
+        const events = await AddonCalendarOffline.getAllEditedEvents();
+
+        // Classify them by month.
+        this.offlineEvents = AddonCalendarHelper.classifyIntoMonths(events);
+
+        // Get the IDs of events edited in offline.
+        const filtered = events.filter((event) => event.id > 0);
+        this.offlineEditedEventsIds = filtered.map((event) => event.id);
+    }
+
+    /**
+     * Load events deleted in offline.
+     *
+     * @return Promise resolved when done.
+     */
+    async loadOfflineDeletedEvents(): Promise<void> {
+        this.deletedEvents = await AddonCalendarOffline.getAllDeletedEventsIds();
+    }
+
+    /**
+     * Load time format.
+     *
+     * @return Promise resolved when done.
+     */
+    async loadTimeFormat(): Promise<void> {
+        this.timeFormat = await AddonCalendar.getCalendarTimeFormat();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    getItemId(item: YearAndMonth): string | number {
+        return `${item.year}#${item.monthNumber}`;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    getPreviousItem(item: YearAndMonth): YearAndMonth | null {
+        return CoreTimeUtils.getPreviousMonth(item);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    getNextItem(item: YearAndMonth): YearAndMonth | null {
+        return CoreTimeUtils.getNextMonth(item);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async loadItemData(month: YearAndMonth, preload = false): Promise<PreloadedMonth | null> {
+        // Check if it's already loaded.
+        const existingMonth = this.getItem(month);
+        if (existingMonth && ((existingMonth.loaded && !existingMonth.needsRefresh) || preload)) {
+            return existingMonth;
+        }
+
         if (!preload) {
             this.monthLoaded = false;
         }
@@ -286,7 +541,7 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
 
                         if (day.istoday) {
                             day.eventsFormated?.forEach((event) => {
-                                event.ispast = this.isEventPast(event);
+                                event.ispast = this.calendarComponent.isEventPast(event);
                             });
                         }
                     }
@@ -297,7 +552,7 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
                 // Merge the online events with offline data.
                 this.mergeEvents(month, weeks);
                 // Filter events by course.
-                this.filterEvents(weeks);
+                this.calendarComponent.filterEvents(weeks);
             }
 
             if (existingMonth) {
@@ -306,47 +561,16 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
                 existingMonth.weeks = weeks;
                 existingMonth.weekDays = weekDays;
 
-                return;
+                return existingMonth;
             }
 
             // Add the preloaded month at the right position.
-            const preloadedMonth: PreloadedMonth = {
+            return {
                 ...month,
                 loaded: !preload,
                 weeks,
                 weekDays,
             };
-            const previousMonth = CoreTimeUtils.getPreviousMonth(month);
-            const nextMonth = CoreTimeUtils.getNextMonth(month);
-            const activeIndex = await this.slides?.getActiveIndex();
-
-            const added = this.preloadedMonths.some((month, index) => {
-                let positionToInsert = -1;
-                if (CoreTimeUtils.isSameMonth(month, previousMonth)) {
-                    // Previous month found, add the month after it.
-                    positionToInsert = index + 1;
-                }
-
-                if (CoreTimeUtils.isSameMonth(month, nextMonth)) {
-                    // Next month found, add the month before it.
-                    positionToInsert = index;
-                }
-
-                if (positionToInsert > -1) {
-                    this.preloadedMonths.splice(positionToInsert, 0, preloadedMonth);
-                    if (activeIndex !== undefined && positionToInsert <= activeIndex) {
-                        // Added a slide before the active one, keep current slide.
-                        this.slides?.slideTo(activeIndex + 1, 0, false);
-                    }
-
-                    return true;
-                }
-            });
-
-            if (!added) {
-                // Previous and next months not found, this probably means the array is still empty. Add it at the end.
-                this.preloadedMonths.push(preloadedMonth);
-            }
         } finally {
             if (!preload) {
                 this.monthLoaded = true;
@@ -354,168 +578,13 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
         }
     }
 
-    /**
-     * Load current month and preload next and previous ones.
-     *
-     * @return Promise resolved when done.
-     */
-    async viewMonth(): Promise<void> {
-        // Calculate the period name. We don't use the one in result because it's in server's language.
-        this.periodName = CoreTimeUtils.userDate(
-            new Date(this.visibleMonth.year, this.visibleMonth.monthNumber - 1).getTime(),
-            'core.strftimemonthyear',
-        );
-        this.calculateIsCurrentMonth();
-
-        try {
-            // Load current month, and preload next and previous ones.
-            await Promise.all([
-                this.loadMonth(this.visibleMonth, false),
-                this.loadMonth(CoreTimeUtils.getPreviousMonth(this.visibleMonth), true),
-                this.loadMonth(CoreTimeUtils.getNextMonth(this.visibleMonth), true),
-            ]);
-        } catch (error) {
-            CoreDomUtils.showErrorModalDefault(error, 'addon.calendar.errorloadevents', true);
-        }
-    }
-
-    /**
-     * Load categories to be able to filter events.
-     *
-     * @return Promise resolved when done.
-     */
-    protected async loadCategories(): Promise<void> {
-        if (this.categoriesRetrieved) {
-            // Already retrieved, stop.
-            return;
-        }
-
-        try {
-            const cats = await CoreCourses.getCategories(0, true);
-            this.categoriesRetrieved = true;
-            this.categories = {};
-
-            // Index categories by ID.
-            cats.forEach((category) => {
-                this.categories[category.id] = category;
-            });
-        } catch {
-            // Ignore errors.
-        }
-    }
-
-    /**
-     * Filter events based on the filter popover.
-     *
-     * @param weeks Weeks with the events to filter.
-     */
-    filterEvents(weeks: AddonCalendarWeek[]): void {
-        weeks.forEach((week) => {
-            week.days.forEach((day) => {
-                day.filteredEvents = AddonCalendarHelper.getFilteredEvents(
-                    day.eventsFormated || [],
-                    this.filter,
-                    this.categories,
-                );
-
-                // Re-calculate some properties.
-                AddonCalendarHelper.calculateDayData(day, day.filteredEvents);
-            });
-        });
-    }
-
-    /**
-     * Refresh events.
-     *
-     * @param afterChange Whether the refresh is done after an event has changed or has been synced.
-     * @return Promise resolved when done.
-     */
-    async refreshData(): Promise<void> {
-        const promises: Promise<void>[] = [];
-
-        promises.push(AddonCalendar.invalidateMonthlyEvents(this.visibleMonth.year, this.visibleMonth.monthNumber));
-        promises.push(CoreCourses.invalidateCategories(0, true));
-        promises.push(AddonCalendar.invalidateTimeFormat());
-
-        this.categoriesRetrieved = false; // Get categories again.
-
-        const preloadedMonth = this.findPreloadedMonth(this.visibleMonth);
-        if (preloadedMonth) {
-            preloadedMonth.needsRefresh = true;
-        }
-
-        await Promise.all(promises);
-
-        this.fetchData();
-    }
-
-    /**
-     * Load next month.
-     */
-    loadNext(): void {
-        this.slides?.slideNext();
-    }
-
-    /**
-     * Load previous month.
-     */
-    loadPrevious(): void {
-        this.slides?.slidePrev();
-    }
-
-    /**
-     * An event was clicked.
-     *
-     * @param calendarEvent Calendar event..
-     * @param event Mouse event.
-     */
-    eventClicked(calendarEvent: AddonCalendarEventToDisplay, event: Event): void {
-        this.onEventClicked.emit(calendarEvent.id);
-        event.stopPropagation();
-    }
-
-    /**
-     * A day was clicked.
-     *
-     * @param day Day.
-     */
-    dayClicked(day: number): void {
-        this.onDayClicked.emit({ day: day, month: this.visibleMonth.monthNumber, year: this.visibleMonth.year });
-    }
-
-    /**
-     * Check if user is viewing the current month.
-     */
-    calculateIsCurrentMonth(): void {
-        this.currentTime = CoreTimeUtils.timestamp();
-        this.isCurrentMonth = CoreTimeUtils.isCurrentMonth(this.visibleMonth);
-        this.isPastMonth = CoreTimeUtils.isCurrentMonth(this.visibleMonth);
-    }
-
-    /**
-     * Go to current month.
-     */
-    async goToCurrentMonth(): Promise<void> {
-
-        const now = new Date();
-        const currentMonth = {
-            monthNumber: now.getMonth() + 1,
-            year: now.getFullYear(),
-        };
-
-        const index = this.preloadedMonths.findIndex((month) => CoreTimeUtils.isSameMonth(month, currentMonth));
-        if (index > -1) {
-            this.slides?.slideTo(index);
-        }
-    }
-
     /**
      * Merge online events with the offline events of that period.
      *
      * @param month Month.
      * @param weeks Weeks with the events to filter.
      */
-    protected mergeEvents(month: YearAndMonth, weeks: AddonCalendarWeek[]): void {
+    mergeEvents(month: YearAndMonth, weeks: AddonCalendarWeek[]): void {
         const monthOfflineEvents: { [day: number]: AddonCalendarEventToDisplay[] } =
             this.offlineEvents[AddonCalendarHelper.getMonthId(month.year, month.monthNumber)];
 
@@ -551,86 +620,27 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
     }
 
     /**
-     * Undelete a certain event.
-     *
-     * @param eventId Event ID.
-     */
-    protected async undeleteEvent(eventId: number): Promise<void> {
-        this.preloadedMonths.forEach((month) => {
-            if (!month.loaded) {
-                return;
-            }
-
-            month.weeks.forEach((week) => {
-                week.days.forEach((day) => {
-                    const event = day.eventsFormated?.find((event) => event.id == eventId);
-
-                    if (event) {
-                        event.deleted = false;
-                    }
-                });
-            });
-        });
-    }
-
-    /**
-     * Returns if the event is in the past or not.
-     *
-     * @param event Event object.
-     * @return True if it's in the past.
-     */
-    protected isEventPast(event: { timestart: number; timeduration: number}): boolean {
-        return (event.timestart + event.timeduration) < (this.currentTime || CoreTimeUtils.timestamp());
-    }
-
-    /**
-     * Slide has changed.
+     * Invalidate content.
      *
+     * @param visibleMonth The current visible month.
      * @return Promise resolved when done.
      */
-    async slideChanged(): Promise<void> {
-        if (!this.slides) {
-            return;
+    async invalidateContent(visibleMonth: PreloadedMonth | null): Promise<void> {
+        const promises: Promise<void>[] = [];
+
+        if (visibleMonth) {
+            promises.push(AddonCalendar.invalidateMonthlyEvents(visibleMonth.year, visibleMonth.monthNumber));
+        }
+        promises.push(CoreCourses.invalidateCategories(0, true));
+        promises.push(AddonCalendar.invalidateTimeFormat());
+
+        this.categoriesRetrieved = false; // Get categories again.
+
+        if (visibleMonth) {
+            visibleMonth.needsRefresh = true;
         }
 
-        const index = await this.slides.getActiveIndex();
-        const preloadedMonth = this.preloadedMonths[index];
-        if (!preloadedMonth) {
-            return;
-        }
-
-        this.visibleMonth.year = preloadedMonth.year;
-        this.visibleMonth.monthNumber = preloadedMonth.monthNumber;
-
-        await this.viewMonth();
-    }
-
-    /**
-     * Find a certain preloaded month.
-     *
-     * @param month Month to search.
-     * @return Preloaded month, undefined if not found.
-     */
-    protected findPreloadedMonth(month: YearAndMonth): PreloadedMonth | undefined {
-        return this.preloadedMonths.find(preloadedMonth => CoreTimeUtils.isSameMonth(month, preloadedMonth));
-    }
-
-    /**
-     * Component destroyed.
-     */
-    ngOnDestroy(): void {
-        this.undeleteEventObserver?.off();
-        this.obsDefaultTimeChange?.off();
+        await Promise.all(promises);
     }
 
 }
-
-/**
- * Preloaded month.
- */
-type PreloadedMonth = YearAndMonth & {
-    loaded: boolean; // Whether the events have been loaded.
-    weekDays: AddonCalendarWeekDaysTranslationKeys[];
-    weeks: AddonCalendarWeek[];
-    needsRefresh?: boolean; // Whether the events needs to be re-loaded.
-};
diff --git a/src/addons/mod/assign/classes/submissions-source.ts b/src/addons/mod/assign/classes/submissions-source.ts
index b0905d5fe..a1c36e70c 100644
--- a/src/addons/mod/assign/classes/submissions-source.ts
+++ b/src/addons/mod/assign/classes/submissions-source.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { Params } from '@angular/router';
-import { CoreItemsManagerSource } from '@classes/items-management/items-manager-source';
+import { CoreRoutedItemsManagerSource } from '@classes/items-management/routed-items-manager-source';
 import { CoreGroupInfo, CoreGroups } from '@services/groups';
 import { CoreSites } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
@@ -33,7 +33,7 @@ import { AddonModAssignSync, AddonModAssignSyncProvider } from '../services/assi
 /**
  * Provides a collection of assignment submissions.
  */
-export class AddonModAssignSubmissionsSource extends CoreItemsManagerSource<AddonModAssignSubmissionForList> {
+export class AddonModAssignSubmissionsSource extends CoreRoutedItemsManagerSource<AddonModAssignSubmissionForList> {
 
     /**
      * @inheritdoc
diff --git a/src/addons/mod/assign/pages/submission-list/submission-list.page.ts b/src/addons/mod/assign/pages/submission-list/submission-list.page.ts
index c8cb848f9..e0b09e3b2 100644
--- a/src/addons/mod/assign/pages/submission-list/submission-list.page.ts
+++ b/src/addons/mod/assign/pages/submission-list/submission-list.page.ts
@@ -13,8 +13,8 @@
 // limitations under the License.
 
 import { Component, OnDestroy, AfterViewInit, ViewChild } from '@angular/core';
-import { CoreItemsManagerSourcesTracker } from '@classes/items-management/items-manager-sources-tracker';
 import { CoreListItemsManager } from '@classes/items-management/list-items-manager';
+import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import { IonRefresher } from '@ionic/angular';
 import { CoreGroupInfo } from '@services/groups';
@@ -86,7 +86,7 @@ export class AddonModAssignSubmissionListPage implements AfterViewInit, OnDestro
             const courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
             const groupId = CoreNavigator.getRouteNumberParam('groupId') || 0;
             const selectedStatus = CoreNavigator.getRouteParam('status');
-            const submissionsSource = CoreItemsManagerSourcesTracker.getOrCreateSource(
+            const submissionsSource = CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(
                 AddonModAssignSubmissionsSource,
                 [courseId, moduleId, selectedStatus],
             );
diff --git a/src/addons/mod/assign/pages/submission-review/submission-review.ts b/src/addons/mod/assign/pages/submission-review/submission-review.ts
index 015c73425..7f2e278cd 100644
--- a/src/addons/mod/assign/pages/submission-review/submission-review.ts
+++ b/src/addons/mod/assign/pages/submission-review/submission-review.ts
@@ -14,7 +14,7 @@
 
 import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, ActivatedRouteSnapshot } from '@angular/router';
-import { CoreItemsManagerSourcesTracker } from '@classes/items-management/items-manager-sources-tracker';
+import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
 import { CoreSwipeItemsManager } from '@classes/items-management/swipe-items-manager';
 import { CoreCourse } from '@features/course/services/course';
 import { CanLeave } from '@guards/can-leave';
@@ -64,7 +64,7 @@ export class AddonModAssignSubmissionReviewPage implements OnInit, OnDestroy, Ca
                 this.blindId = CoreNavigator.getRouteNumberParam('blindId', { params });
                 const groupId = CoreNavigator.getRequiredRouteNumberParam('groupId');
                 const selectedStatus = CoreNavigator.getRouteParam('selectedStatus');
-                const submissionsSource = CoreItemsManagerSourcesTracker.getOrCreateSource(
+                const submissionsSource = CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(
                     AddonModAssignSubmissionsSource,
                     [this.courseId, this.moduleId, selectedStatus],
                 );
diff --git a/src/addons/mod/book/components/index/addon-mod-book-index.html b/src/addons/mod/book/components/index/addon-mod-book-index.html
index e85705f95..83787d103 100644
--- a/src/addons/mod/book/components/index/addon-mod-book-index.html
+++ b/src/addons/mod/book/components/index/addon-mod-book-index.html
@@ -40,18 +40,18 @@
             previousTranslate="addon.mod_book.navprevtitle" nextTranslate="addon.mod_book.navnexttitle" (action)="changeChapter($event.id)">
         </core-navigation-bar>
 
-        <ion-slides (ionSlideWillChange)="slideChanged()" [options]="slidesOpts">
-            <ion-slide *ngFor="let chapter of loadedChapters">
+        <core-swipe-slides [manager]="manager" [options]="slidesOpts" (onWillChange)="slideChanged($event)">
+            <ng-template let-item="item">
                 <div class="ion-padding">
-                    <core-format-text [component]="component" [componentId]="componentId" [text]="chapter.content" contextLevel="module"
+                    <core-format-text [component]="component" [componentId]="componentId" [text]="item.content" contextLevel="module"
                         [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text>
-                    <div class="ion-margin-top" *ngIf="tagsEnabled && chapter.tags?.length > 0">
+                    <div class="ion-margin-top" *ngIf="tagsEnabled && item.tags?.length > 0">
                         <strong>{{ 'core.tag.tags' | translate }}: </strong>
-                        <core-tag-list [tags]="chapter.tags"></core-tag-list>
+                        <core-tag-list [tags]="item.tags"></core-tag-list>
                     </div>
                 </div>
-            </ion-slide>
-        </ion-slides>
+            </ng-template>
+        </core-swipe-slides>
     </div>
 
 </core-loading>
diff --git a/src/addons/mod/book/components/index/index.ts b/src/addons/mod/book/components/index/index.ts
index 34ac81fa0..4c9f35cbd 100644
--- a/src/addons/mod/book/components/index/index.ts
+++ b/src/addons/mod/book/components/index/index.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Component, Optional, Input, OnInit, ViewChild, ElementRef } from '@angular/core';
-import { IonContent, IonSlides } from '@ionic/angular';
 import { CoreCourseModuleMainResourceComponent } from '@features/course/classes/main-resource-component';
 import {
     AddonModBookProvider,
@@ -29,10 +28,13 @@ import { CoreCourseContentsPage } from '@features/course/pages/contents/contents
 import { CoreUtils } from '@services/utils/utils';
 import { CoreCourse } from '@features/course/services/course';
 import { AddonModBookTocComponent } from '../toc/toc';
-import { CoreConstants } from '@/core/constants';
 import { CoreNavigationBarItem } from '@components/navigation-bar/navigation-bar';
 import { CoreError } from '@classes/errors/error';
 import { Translate } from '@singletons';
+import { CoreSwipeCurrentItemData, CoreSwipeSlidesComponent, CoreSwipeSlidesOptions } from '@components/swipe-slides/swipe-slides';
+import { CoreSwipeSlidesItemsManagerSource } from '@classes/items-management/slides-items-manager-source';
+import { CoreCourseModule } from '@features/course/services/course-helper';
+import { CoreSwipeSlidesItemsManager } from '@classes/items-management/slides-items-manager';
 
 /**
  * Component that displays a book.
@@ -40,38 +42,32 @@ import { Translate } from '@singletons';
 @Component({
     selector: 'addon-mod-book-index',
     templateUrl: 'addon-mod-book-index.html',
-    styleUrls: ['index.scss'],
 })
 export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComponent implements OnInit {
 
-    @ViewChild(IonSlides) slides?: IonSlides;
+    @ViewChild(CoreSwipeSlidesComponent) slides?: CoreSwipeSlidesComponent;
 
     @Input() initialChapterId?: number; // The initial chapter ID to load.
 
     component = AddonModBookProvider.COMPONENT;
-    loadedChapters: LoadedChapter[] = [];
+    manager?: CoreSwipeSlidesItemsManager<LoadedChapter, AddonModBookSlidesItemsManagerSource>;
     previousChapter?: AddonModBookTocChapter;
     nextChapter?: AddonModBookTocChapter;
     tagsEnabled = false;
     warning = '';
-    tags?: CoreTagItem[];
     displayNavBar = true;
     navigationItems: CoreNavigationBarItem<AddonModBookTocChapter>[] = [];
     displayTitlesInNavBar = false;
-    slidesOpts = {
-        initialSlide: 0,
+    slidesOpts: CoreSwipeSlidesOptions = {
         autoHeight: true,
+        scrollOnChange: 'top',
     };
 
-    protected chapters: AddonModBookTocChapter[] = [];
     protected currentChapter?: number;
-    protected book?: AddonModBookBookWSData;
-    protected contentsMap: AddonModBookContentsMap = {};
     protected element: HTMLElement;
 
     constructor(
         elementRef: ElementRef,
-        protected content?: IonContent,
         @Optional() courseContentsPage?: CoreCourseContentsPage,
     ) {
         super('AddonModBookIndexComponent', courseContentsPage);
@@ -86,9 +82,25 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
         super.ngOnInit();
 
         this.tagsEnabled = CoreTag.areTagsAvailableInSite();
+        const source = new AddonModBookSlidesItemsManagerSource(
+            this.courseId,
+            this.module,
+            this.tagsEnabled,
+            this.initialChapterId,
+        );
+        this.manager = new CoreSwipeSlidesItemsManager(source);
+
         this.loadContent();
     }
 
+    get book(): AddonModBookBookWSData | undefined {
+        return this.manager?.getSource().book;
+    }
+
+    get chapters(): AddonModBookTocChapter[] {
+        return this.manager?.getSource().chapters || [];
+    }
+
     /**
      * Show the TOC.
      */
@@ -121,10 +133,7 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
             return;
         }
 
-        const index = this.loadedChapters.findIndex(chapter => chapter.id === chapterId);
-        if (index > -1) {
-            this.slides?.slideTo(index);
-        }
+        this.slides?.slideToItem({ id: chapterId });
     }
 
     /**
@@ -132,8 +141,8 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
      *
      * @return Resolved when done.
      */
-    protected invalidateContent(): Promise<void> {
-        return AddonModBook.invalidateContent(this.module.id, this.courseId);
+    protected async invalidateContent(): Promise<void> {
+        await this.manager?.getSource().invalidateContent();
     }
 
     /**
@@ -144,100 +153,35 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
      */
     protected async fetchContent(refresh = false): Promise<void> {
         try {
-            const downloadResult = await this.downloadResourceIfNeeded(refresh);
-
-            await this.loadBookData();
-
-            // Get contents. No need to refresh, it has been done in downloadResourceIfNeeded.
-            const contents = await CoreCourse.getModuleContents(this.module, this.courseId);
-
-            this.contentsMap = AddonModBook.getContentsMap(contents);
-            this.chapters = AddonModBook.getTocList(contents);
-
-            if (typeof this.currentChapter == 'undefined' && typeof this.initialChapterId != 'undefined' && this.chapters) {
-                // Initial chapter set. Validate that the chapter exists.
-                const index = this.chapters.findIndex((chapter) => chapter.id == this.initialChapterId);
-
-                if (index >= 0) {
-                    this.currentChapter = this.initialChapterId;
-                    this.slidesOpts.initialSlide = index;
-                }
-            }
-
-            if (this.currentChapter === undefined) {
-                // Load the first chapter.
-                this.currentChapter = AddonModBook.getFirstChapter(this.chapters);
-            }
-
-            if (this.currentChapter === undefined) {
+            const source = this.manager?.getSource();
+            if (!source) {
                 return;
             }
 
-            await this.loadChapters();
+            const downloadResult = await this.downloadResourceIfNeeded(refresh);
 
-            // Show chapter.
-            await this.viewChapter(this.currentChapter, refresh);
+            const book = await source.loadBookData();
 
-            this.warning = downloadResult?.failed ? this.getErrorDownloadingSomeFilesMessage(downloadResult.error!) : '';
+            if (book) {
+                this.dataRetrieved.emit(book);
+
+                this.description = book.intro;
+                this.displayNavBar = book.navstyle != AddonModBookNavStyle.TOC_ONLY;
+                this.displayTitlesInNavBar = book.navstyle == AddonModBookNavStyle.TEXT;
+            }
+
+            // Get contents. No need to refresh, it has been done in downloadResourceIfNeeded.
+            await source.loadContents();
+
+            await source.load();
+
+            this.warning = downloadResult?.failed ? this.getErrorDownloadingSomeFilesMessage(downloadResult.error || '') : '';
         } finally {
             // Pass false because downloadResourceIfNeeded already invalidates and refresh data if refresh=true.
             this.fillContextMenu(false);
         }
     }
 
-    /**
-     * Load book data from WS.
-     *
-     * @return Promise resolved when done.
-     */
-    protected async loadBookData(): Promise<void> {
-        this.book = await AddonModBook.getBook(this.courseId, this.module.id);
-
-        this.dataRetrieved.emit(this.book);
-
-        this.description = this.book.intro;
-        this.displayNavBar = this.book.navstyle != AddonModBookNavStyle.TOC_ONLY;
-        this.displayTitlesInNavBar = this.book.navstyle == AddonModBookNavStyle.TEXT;
-    }
-
-    /**
-     * Load book chapters.
-     *
-     * @return Promise resolved when done.
-     */
-    protected async loadChapters(): Promise<void> {
-        try {
-            const newChapters = await Promise.all(this.chapters.map(async (chapter) => {
-                const content = await AddonModBook.getChapterContent(this.contentsMap, chapter.id, this.module.id);
-
-                return {
-                    id: chapter.id,
-                    content,
-                    tags: this.tagsEnabled ? this.contentsMap[chapter.id].tags : [],
-                };
-            }));
-
-            let newIndex = -1;
-            if (this.loadedChapters.length && newChapters.length != this.loadedChapters.length) {
-                // Number of chapters has changed. Search the chapter to display, otherwise it could change automatically.
-                newIndex = this.chapters.findIndex((chapter) => chapter.id === this.currentChapter);
-            }
-
-            this.loadedChapters = newChapters;
-
-            if (newIndex > -1) {
-                this.slides?.slideTo(newIndex, 0, false);
-            }
-        } catch (exception) {
-            const error = exception ?? new CoreError(Translate.instant('addon.mod_book.errorchapter'));
-            if (!error.message) {
-                error.message = Translate.instant('addon.mod_book.errorchapter');
-            }
-
-            throw error;
-        }
-    }
-
     /**
      * View a book chapter.
      *
@@ -271,24 +215,10 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
     /**
      * Slide has changed.
      *
-     * @return Promise resolved when done.
+     * @param data Data about new item.
      */
-    async slideChanged(): Promise<void> {
-        if (!this.slides) {
-            return;
-        }
-
-        const scrollElement = await this.content?.getScrollElement();
-        const container = this.element.querySelector<HTMLElement>('.addon-mod_book-container');
-
-        if (container && (!scrollElement || CoreDomUtils.isElementOutsideOfScreen(scrollElement, container, 'top'))) {
-            // Scroll to top.
-            container.scrollIntoView({ behavior: 'smooth' });
-        }
-
-        const index = await this.slides.getActiveIndex();
-
-        this.viewChapter(this.loadedChapters[index].id, true);
+    slideChanged(data: CoreSwipeCurrentItemData<LoadedChapter>): void {
+        this.viewChapter(data.item.id, true);
     }
 
     /**
@@ -313,3 +243,90 @@ type LoadedChapter = {
     content: string;
     tags?: CoreTagItem[];
 };
+
+/**
+ * Helper to manage swiping within a collection of chapters.
+ */
+class AddonModBookSlidesItemsManagerSource extends CoreSwipeSlidesItemsManagerSource<LoadedChapter> {
+
+    readonly COURSE_ID: number;
+    readonly MODULE: CoreCourseModule;
+    readonly TAGS_ENABLED: boolean;
+
+    book?: AddonModBookBookWSData;
+    chapters: AddonModBookTocChapter[] = [];
+    contentsMap: AddonModBookContentsMap = {};
+
+    constructor(courseId: number, module: CoreCourseModule, tagsEnabled: boolean, initialChapterId?: number) {
+        super(initialChapterId ? { id: initialChapterId } : undefined);
+
+        this.COURSE_ID = courseId;
+        this.MODULE = module;
+        this.TAGS_ENABLED = tagsEnabled;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    getItemId(item: LoadedChapter): string | number {
+        return item.id;
+    }
+
+    /**
+     * Load book data from WS.
+     *
+     * @return Promise resolved when done.
+     */
+    async loadBookData(): Promise<AddonModBookBookWSData> {
+        this.book = await AddonModBook.getBook(this.COURSE_ID, this.MODULE.id);
+
+        return this.book;
+    }
+
+    /**
+     * Load module contents.
+     */
+    async loadContents(): Promise<void> {
+        // Get contents. No need to refresh, it has been done in downloadResourceIfNeeded.
+        const contents = await CoreCourse.getModuleContents(this.MODULE, this.COURSE_ID);
+
+        this.contentsMap = AddonModBook.getContentsMap(contents);
+        this.chapters = AddonModBook.getTocList(contents);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected async loadItems(): Promise<LoadedChapter[]> {
+        try {
+            const newChapters = await Promise.all(this.chapters.map(async (chapter) => {
+                const content = await AddonModBook.getChapterContent(this.contentsMap, chapter.id, this.MODULE.id);
+
+                return {
+                    id: chapter.id,
+                    content,
+                    tags: this.TAGS_ENABLED ? this.contentsMap[chapter.id].tags : [],
+                };
+            }));
+
+            return newChapters;
+        } catch (exception) {
+            const error = exception ?? new CoreError(Translate.instant('addon.mod_book.errorchapter'));
+            if (!error.message) {
+                error.message = Translate.instant('addon.mod_book.errorchapter');
+            }
+
+            throw error;
+        }
+    }
+
+    /**
+     * Perform the invalidate content function.
+     *
+     * @return Resolved when done.
+     */
+    invalidateContent(): Promise<void> {
+        return AddonModBook.invalidateContent(this.MODULE.id, this.COURSE_ID);
+    }
+
+}
diff --git a/src/addons/mod/forum/classes/forum-discussions-source.ts b/src/addons/mod/forum/classes/forum-discussions-source.ts
index 7a08b4e8d..26bd22967 100644
--- a/src/addons/mod/forum/classes/forum-discussions-source.ts
+++ b/src/addons/mod/forum/classes/forum-discussions-source.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { Params } from '@angular/router';
-import { CoreItemsManagerSource } from '@classes/items-management/items-manager-source';
+import { CoreRoutedItemsManagerSource } from '@classes/items-management/routed-items-manager-source';
 import { CoreUser } from '@features/user/services/user';
 import {
     AddonModForum,
@@ -24,7 +24,7 @@ import {
 } from '../services/forum';
 import { AddonModForumOffline, AddonModForumOfflineDiscussion } from '../services/forum-offline';
 
-export class AddonModForumDiscussionsSource extends CoreItemsManagerSource<AddonModForumDiscussionItem> {
+export class AddonModForumDiscussionsSource extends CoreRoutedItemsManagerSource<AddonModForumDiscussionItem> {
 
     static readonly NEW_DISCUSSION: AddonModForumNewDiscussionForm = { newDiscussion: true };
 
diff --git a/src/addons/mod/forum/components/index/index.ts b/src/addons/mod/forum/components/index/index.ts
index e7a778d3b..696f762da 100644
--- a/src/addons/mod/forum/components/index/index.ts
+++ b/src/addons/mod/forum/components/index/index.ts
@@ -57,7 +57,7 @@ import { CoreRatingOffline } from '@features/rating/services/rating-offline';
 import { ContextLevel } from '@/core/constants';
 import { AddonModForumDiscussionItem, AddonModForumDiscussionsSource } from '../../classes/forum-discussions-source';
 import { CoreListItemsManager } from '@classes/items-management/list-items-manager';
-import { CoreItemsManagerSourcesTracker } from '@classes/items-management/items-manager-sources-tracker';
+import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
 
 /**
  * Component that displays a forum entry page.
@@ -149,7 +149,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
         await super.ngOnInit();
 
         // Initialize discussions manager.
-        const source = CoreItemsManagerSourcesTracker.getOrCreateSource(
+        const source = CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(
             AddonModForumDiscussionsSource,
             [this.courseId, this.module.id, this.courseContentsPage ? `${AddonModForumModuleHandlerService.PAGE_NAME}/` : ''],
         );
diff --git a/src/addons/mod/forum/pages/discussion/discussion.page.ts b/src/addons/mod/forum/pages/discussion/discussion.page.ts
index 103b9355b..0b6428ae0 100644
--- a/src/addons/mod/forum/pages/discussion/discussion.page.ts
+++ b/src/addons/mod/forum/pages/discussion/discussion.page.ts
@@ -15,7 +15,7 @@
 import { ContextLevel, CoreConstants } from '@/core/constants';
 import { Component, OnDestroy, ViewChild, OnInit, AfterViewInit, ElementRef, Optional } from '@angular/core';
 import { ActivatedRoute, ActivatedRouteSnapshot } from '@angular/router';
-import { CoreItemsManagerSourcesTracker } from '@classes/items-management/items-manager-sources-tracker';
+import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import { CoreFileUploader } from '@features/fileuploader/services/fileuploader';
 import { CoreRatingInfo, CoreRatingProvider } from '@features/rating/services/rating';
@@ -145,7 +145,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
 
             if (this.courseId && this.cmId && (routeData.swipeEnabled ?? true)) {
                 this.discussions = new AddonModForumDiscussionDiscussionsSwipeManager(
-                    CoreItemsManagerSourcesTracker.getOrCreateSource(
+                    CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(
                         AddonModForumDiscussionsSource,
                         [this.courseId, this.cmId, routeData.discussionsPathPrefix ?? ''],
                     ),
diff --git a/src/addons/mod/forum/pages/new-discussion/new-discussion.page.ts b/src/addons/mod/forum/pages/new-discussion/new-discussion.page.ts
index 7e9efa79a..699eaf7ec 100644
--- a/src/addons/mod/forum/pages/new-discussion/new-discussion.page.ts
+++ b/src/addons/mod/forum/pages/new-discussion/new-discussion.page.ts
@@ -42,8 +42,8 @@ import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import { CoreForms } from '@singletons/form';
 import { AddonModForumDiscussionsSwipeManager } from '../../classes/forum-discussions-swipe-manager';
 import { ActivatedRoute, ActivatedRouteSnapshot } from '@angular/router';
-import { CoreItemsManagerSourcesTracker } from '@classes/items-management/items-manager-sources-tracker';
 import { AddonModForumDiscussionsSource } from '../../classes/forum-discussions-source';
+import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
 
 type NewDiscussionData = {
     subject: string;
@@ -117,7 +117,7 @@ export class AddonModForumNewDiscussionPage implements OnInit, OnDestroy, CanLea
             this.timeCreated = CoreNavigator.getRequiredRouteNumberParam('timeCreated');
 
             if (this.timeCreated !== 0 && (routeData.swipeEnabled ?? true)) {
-                const source = CoreItemsManagerSourcesTracker.getOrCreateSource(
+                const source = CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(
                     AddonModForumDiscussionsSource,
                     [this.courseId, this.cmId, routeData.discussionsPathPrefix ?? ''],
                 );
diff --git a/src/addons/mod/glossary/classes/glossary-entries-source.ts b/src/addons/mod/glossary/classes/glossary-entries-source.ts
index 42fbe67c5..d1dd67b5c 100644
--- a/src/addons/mod/glossary/classes/glossary-entries-source.ts
+++ b/src/addons/mod/glossary/classes/glossary-entries-source.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { Params } from '@angular/router';
-import { CoreItemsManagerSource } from '@classes/items-management/items-manager-source';
+import { CoreRoutedItemsManagerSource } from '@classes/items-management/routed-items-manager-source';
 import {
     AddonModGlossary,
     AddonModGlossaryEntry,
@@ -27,7 +27,7 @@ import { AddonModGlossaryOffline, AddonModGlossaryOfflineEntry } from '../servic
 /**
  * Provides a collection of glossary entries.
  */
-export class AddonModGlossaryEntriesSource extends CoreItemsManagerSource<AddonModGlossaryEntryItem> {
+export class AddonModGlossaryEntriesSource extends CoreRoutedItemsManagerSource<AddonModGlossaryEntryItem> {
 
     static readonly NEW_ENTRY: AddonModGlossaryNewEntryForm = { newEntry: true };
 
diff --git a/src/addons/mod/glossary/components/index/index.ts b/src/addons/mod/glossary/components/index/index.ts
index 6f250813b..7599c7afc 100644
--- a/src/addons/mod/glossary/components/index/index.ts
+++ b/src/addons/mod/glossary/components/index/index.ts
@@ -15,8 +15,8 @@
 import { ContextLevel } from '@/core/constants';
 import { AfterViewInit, Component, OnDestroy, OnInit, Optional, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { CoreItemsManagerSourcesTracker } from '@classes/items-management/items-manager-sources-tracker';
 import { CoreListItemsManager } from '@classes/items-management/list-items-manager';
+import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import { CoreCourseModuleMainActivityComponent } from '@features/course/classes/main-activity-component';
 import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
@@ -113,7 +113,7 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
         await super.ngOnInit();
 
         // Initialize entries manager.
-        const source = CoreItemsManagerSourcesTracker.getOrCreateSource(
+        const source = CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(
             AddonModGlossaryEntriesSource,
             [this.courseId, this.module.id, this.courseContentsPage ? `${AddonModGlossaryModuleHandlerService.PAGE_NAME}/` : ''],
         );
diff --git a/src/addons/mod/glossary/pages/edit/edit.ts b/src/addons/mod/glossary/pages/edit/edit.ts
index dfb06aa5d..2edc0d440 100644
--- a/src/addons/mod/glossary/pages/edit/edit.ts
+++ b/src/addons/mod/glossary/pages/edit/edit.ts
@@ -16,7 +16,7 @@ import { Component, OnInit, ViewChild, ElementRef, Optional, OnDestroy } from '@
 import { FormControl } from '@angular/forms';
 import { ActivatedRoute, ActivatedRouteSnapshot } from '@angular/router';
 import { CoreError } from '@classes/errors/error';
-import { CoreItemsManagerSourcesTracker } from '@classes/items-management/items-manager-sources-tracker';
+import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import { CoreFileUploader, CoreFileUploaderStoreFilesResult } from '@features/fileuploader/services/fileuploader';
 import { CanLeave } from '@guards/can-leave';
@@ -101,7 +101,7 @@ export class AddonModGlossaryEditPage implements OnInit, OnDestroy, CanLeave {
             this.editorExtraParams.timecreated = this.timecreated;
 
             if (this.timecreated !== 0 && (routeData.swipeEnabled ?? true)) {
-                const source = CoreItemsManagerSourcesTracker.getOrCreateSource(
+                const source = CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(
                     AddonModGlossaryEntriesSource,
                     [this.courseId, this.cmId, routeData.glossaryPathPrefix ?? ''],
                 );
diff --git a/src/addons/mod/glossary/pages/entry/entry.ts b/src/addons/mod/glossary/pages/entry/entry.ts
index d88b470c1..41dfb3b8c 100644
--- a/src/addons/mod/glossary/pages/entry/entry.ts
+++ b/src/addons/mod/glossary/pages/entry/entry.ts
@@ -14,7 +14,7 @@
 
 import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, ActivatedRouteSnapshot } from '@angular/router';
-import { CoreItemsManagerSourcesTracker } from '@classes/items-management/items-manager-sources-tracker';
+import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
 import { CoreCommentsCommentsComponent } from '@features/comments/components/comments/comments';
 import { CoreComments } from '@features/comments/services/comments';
 import { CoreRatingInfo } from '@features/rating/services/rating';
@@ -73,7 +73,7 @@ export class AddonModGlossaryEntryPage implements OnInit, OnDestroy {
 
             if (routeData.swipeEnabled ?? true) {
                 const cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
-                const source = CoreItemsManagerSourcesTracker.getOrCreateSource(
+                const source = CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(
                     AddonModGlossaryEntriesSource,
                     [this.courseId, cmId, routeData.glossaryPathPrefix ?? ''],
                 );
diff --git a/src/core/classes/items-management/items-manager-source.ts b/src/core/classes/items-management/items-manager-source.ts
index 29acf445f..c6b8fd275 100644
--- a/src/core/classes/items-management/items-manager-source.ts
+++ b/src/core/classes/items-management/items-manager-source.ts
@@ -12,13 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Params } from '@angular/router';
-
 /**
  * Updates listener.
  */
 export interface CoreItemsListSourceListener<Item> {
-    onItemsUpdated?(items: Item[], hasMoreItems: boolean): void;
+    onItemsUpdated?(items: Item[]): void;
     onReset?(): void;
 }
 
@@ -27,39 +25,19 @@ export interface CoreItemsListSourceListener<Item> {
  */
 export abstract class CoreItemsManagerSource<Item = unknown> {
 
-    /**
-     * Get a string to identify instances constructed with the given arguments as being reusable.
-     *
-     * @param args Constructor arguments.
-     * @returns Id.
-     */
-    static getSourceId(...args: unknown[]): string {
-        return args.map(argument => String(argument)).join('-');
-    }
-
     protected items: Item[] | null = null;
-    protected hasMoreItems = true;
     protected listeners: CoreItemsListSourceListener<Item>[] = [];
     protected dirty = false;
 
     /**
-     * Check whether any page has been loaded.
+     * Check whether any item has been loaded.
      *
-     * @returns Whether any page has been loaded.
+     * @returns Whether any item has been loaded.
      */
     isLoaded(): boolean {
         return this.items !== null;
     }
 
-    /**
-     * Check whether there are more pages to be loaded.
-     *
-     * @return Whether there are more pages to be loaded.
-     */
-    isCompleted(): boolean {
-        return !this.hasMoreItems;
-    }
-
     /**
      * Set whether the source as dirty.
      *
@@ -80,35 +58,21 @@ export abstract class CoreItemsManagerSource<Item = unknown> {
         return this.items;
     }
 
-    /**
-     * Get the count of pages that have been loaded.
-     *
-     * @returns Pages loaded.
-     */
-    getPagesLoaded(): number {
-        if (this.items === null) {
-            return 0;
-        }
-
-        const pageLength = this.getPageLength();
-        if (pageLength === null) {
-            return 1;
-        }
-
-        return Math.ceil(this.items.length / pageLength);
-    }
-
     /**
      * Reset collection data.
      */
     reset(): void {
         this.items = null;
-        this.hasMoreItems = true;
         this.dirty = false;
 
         this.listeners.forEach(listener => listener.onReset?.call(listener));
     }
 
+    /**
+     * Load items.
+     */
+    abstract load(): Promise<void>;
+
     /**
      * Register a listener.
      *
@@ -136,85 +100,22 @@ export abstract class CoreItemsManagerSource<Item = unknown> {
         this.listeners.splice(index, 1);
     }
 
-    /**
-     * Reload the collection, this resets the data to the first page.
-     */
-    async reload(): Promise<void> {
-        const { items, hasMoreItems } = await this.loadPageItems(0);
-
-        this.dirty = false;
-        this.setItems(items, hasMoreItems ?? false);
-    }
-
-    /**
-     * Load more items, if any.
-     */
-    async load(): Promise<void> {
-        if (this.dirty) {
-            const { items, hasMoreItems } = await this.loadPageItems(0);
-
-            this.dirty = false;
-            this.setItems(items, hasMoreItems ?? false);
-
-            return;
-        }
-
-        if (!this.hasMoreItems) {
-            return;
-        }
-
-        const { items, hasMoreItems } = await this.loadPageItems(this.getPagesLoaded());
-
-        this.setItems((this.items ?? []).concat(items), hasMoreItems ?? false);
-    }
-
-    /**
-     * Get the query parameters to use when navigating to an item page.
-     *
-     * @param item Item.
-     * @return Query parameters to use when navigating to the item page.
-     */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    getItemQueryParams(item: Item): Params {
-        return {};
-    }
-
-    /**
-     * Get the path to use when navigating to an item page.
-     *
-     * @param item Item.
-     * @return Path to use when navigating to the item page.
-     */
-    abstract getItemPath(item: Item): string;
-
-    /**
-     * Load page items.
-     *
-     * @param page Page number (starting at 0).
-     * @return Page items data.
-     */
-    protected abstract loadPageItems(page: number): Promise<{ items: Item[]; hasMoreItems?: boolean }>;
-
-    /**
-     * Get the length of each page in the collection.
-     *
-     * @return Page length; null for collections that don't support pagination.
-     */
-    protected getPageLength(): number | null {
-        return null;
-    }
-
     /**
      * Update the collection items.
      *
      * @param items Items.
-     * @param hasMoreItems Whether there are more pages to be loaded.
      */
-    protected setItems(items: Item[], hasMoreItems: boolean): void {
+    protected setItems(items: Item[]): void {
         this.items = items;
-        this.hasMoreItems = hasMoreItems;
 
-        this.listeners.forEach(listener => listener.onItemsUpdated?.call(listener, items, hasMoreItems));
+        this.notifyItemsUpdated();
+    }
+
+    /**
+     * Notify that items have been updated.
+     */
+    protected notifyItemsUpdated(): void {
+        this.listeners.forEach(listener => listener.onItemsUpdated?.call(listener, this.items));
     }
 
 }
diff --git a/src/core/classes/items-management/items-manager.ts b/src/core/classes/items-management/items-manager.ts
index f2be8bd67..dda251c1e 100644
--- a/src/core/classes/items-management/items-manager.ts
+++ b/src/core/classes/items-management/items-manager.ts
@@ -12,16 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { ActivatedRoute, ActivatedRouteSnapshot } from '@angular/router';
-import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
-
 import { CoreItemsManagerSource } from './items-manager-source';
-import { CoreItemsManagerSourcesTracker } from './items-manager-sources-tracker';
 
 /**
  * Helper to manage a collection of items in a page.
  */
-export abstract class CoreItemsManager<Item = unknown, Source extends CoreItemsManagerSource<Item> = CoreItemsManagerSource<Item>> {
+export abstract class CoreItemsManager<
+    Item = unknown,
+    Source extends CoreItemsManagerSource<Item> = CoreItemsManagerSource<Item>,
+> {
 
     protected source?: { instance: Source; unsubscribe: () => void };
     protected itemsMap: Record<string, Item> | null = null;
@@ -51,8 +50,6 @@ export abstract class CoreItemsManager<Item = unknown, Source extends CoreItemsM
      */
     setSource(newSource: Source | null): void {
         if (this.source) {
-            CoreItemsManagerSourcesTracker.removeReference(this.source.instance, this);
-
             this.source.unsubscribe();
             delete this.source;
 
@@ -60,8 +57,6 @@ export abstract class CoreItemsManager<Item = unknown, Source extends CoreItemsM
         }
 
         if (newSource) {
-            CoreItemsManagerSourcesTracker.addReference(newSource, this);
-
             this.source = {
                 instance: newSource,
                 unsubscribe: newSource.addListener({
@@ -86,79 +81,21 @@ export abstract class CoreItemsManager<Item = unknown, Source extends CoreItemsM
     }
 
     /**
-     * Get page route.
+     * Get selected item.
      *
-     * @returns Current page route, if any.
+     * @return Selected item, null if none.
      */
-    protected abstract getCurrentPageRoute(): ActivatedRoute | null;
-
-    /**
-     * Get the path of the selected item given the current route.
-     *
-     * @param route Page route.
-     * @return Path of the selected item in the given route.
-     */
-    protected abstract getSelectedItemPathFromRoute(route: ActivatedRouteSnapshot): string | null;
-
-    /**
-     * Get the path of the selected item.
-     *
-     * @param route Page route, if any.
-     * @return Path of the selected item.
-     */
-    protected getSelectedItemPath(route?: ActivatedRouteSnapshot | null): string | null {
-        if (!route) {
-            return null;
-        }
-
-        return this.getSelectedItemPathFromRoute(route);
+    getSelectedItem(): Item | null {
+        return this.selectedItem;
     }
 
     /**
-     * Update the selected item given the current route.
+     * Set selected item.
      *
-     * @param route Current route.
+     * @param item Item, null if none.
      */
-    protected updateSelectedItem(route: ActivatedRouteSnapshot | null = null): void {
-        route = route ?? this.getCurrentPageRoute()?.snapshot ?? null;
-
-        const selectedItemPath = this.getSelectedItemPath(route);
-
-        this.selectedItem = selectedItemPath
-            ? this.itemsMap?.[selectedItemPath] ?? null
-            : null;
-    }
-
-    /**
-     * Navigate to an item in the collection.
-     *
-     * @param item Item.
-     * @param options Navigation options.
-     */
-    protected async navigateToItem(
-        item: Item,
-        options: Pick<CoreNavigationOptions, 'reset' | 'replace' | 'animationDirection'> = {},
-    ): Promise<void> {
-        // Get current route in the page.
-        const route = this.getCurrentPageRoute();
-
-        if (route === null) {
-            return;
-        }
-
-        // If this item is already selected, do nothing.
-        const itemPath = this.getSource().getItemPath(item);
-        const selectedItemPath = this.getSelectedItemPath(route.snapshot);
-
-        if (selectedItemPath === itemPath) {
-            return;
-        }
-
-        // Navigate to item.
-        const params = this.getSource().getItemQueryParams(item);
-        const pathPrefix = selectedItemPath ? selectedItemPath.split('/').fill('../').join('') : '';
-
-        await CoreNavigator.navigate(pathPrefix + itemPath, { params, ...options });
+    setSelectedItem(item: Item | null): void {
+        this.selectedItem = item;
     }
 
     /**
@@ -166,14 +103,9 @@ export abstract class CoreItemsManager<Item = unknown, Source extends CoreItemsM
      *
      * @param items New items.
      */
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     protected onSourceItemsUpdated(items: Item[]): void {
-        this.itemsMap = items.reduce((map, item) => {
-            map[this.getSource().getItemPath(item)] = item;
-
-            return map;
-        }, {});
-
-        this.updateSelectedItem();
+        // Nothing to do.
     }
 
     /**
diff --git a/src/core/classes/items-management/list-items-manager.ts b/src/core/classes/items-management/list-items-manager.ts
index baacfdefc..9229b1de4 100644
--- a/src/core/classes/items-management/list-items-manager.ts
+++ b/src/core/classes/items-management/list-items-manager.ts
@@ -20,16 +20,16 @@ import { CoreNavigator } from '@services/navigator';
 import { CoreScreen } from '@services/screen';
 import { CoreUtils } from '@services/utils/utils';
 
-import { CoreItemsManager } from './items-manager';
-import { CoreItemsManagerSource } from './items-manager-source';
+import { CoreRoutedItemsManagerSource } from './routed-items-manager-source';
+import { CoreRoutedItemsManager } from './routed-items-manager';
 
 /**
  * Helper class to manage the state and routing of a list of items in a page.
  */
 export class CoreListItemsManager<
     Item = unknown,
-    Source extends CoreItemsManagerSource<Item> = CoreItemsManagerSource<Item>
-> extends CoreItemsManager<Item, Source> {
+    Source extends CoreRoutedItemsManagerSource<Item> = CoreRoutedItemsManagerSource<Item>
+> extends CoreRoutedItemsManager<Item, Source> {
 
     protected pageRouteLocator?: unknown | ActivatedRoute;
     protected splitView?: CoreSplitViewComponent;
diff --git a/src/core/classes/items-management/routed-items-manager-source.ts b/src/core/classes/items-management/routed-items-manager-source.ts
new file mode 100644
index 000000000..6b53c913a
--- /dev/null
+++ b/src/core/classes/items-management/routed-items-manager-source.ts
@@ -0,0 +1,150 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { Params } from '@angular/router';
+import { CoreItemsManagerSource } from './items-manager-source';
+
+/**
+ * Routed items collection source data.
+ */
+export abstract class CoreRoutedItemsManagerSource<Item = unknown> extends CoreItemsManagerSource<Item> {
+
+    protected hasMoreItems = true;
+
+    /**
+     * Get a string to identify instances constructed with the given arguments as being reusable.
+     *
+     * @param args Constructor arguments.
+     * @returns Id.
+     */
+    static getSourceId(...args: unknown[]): string {
+        return args.map(argument => String(argument)).join('-');
+    }
+
+    /**
+     * Check whether there are more pages to be loaded.
+     *
+     * @return Whether there are more pages to be loaded.
+     */
+    isCompleted(): boolean {
+        return !this.hasMoreItems;
+    }
+
+    /**
+     * Get the count of pages that have been loaded.
+     *
+     * @returns Pages loaded.
+     */
+    getPagesLoaded(): number {
+        if (this.items === null) {
+            return 0;
+        }
+
+        const pageLength = this.getPageLength();
+        if (pageLength === null) {
+            return 1;
+        }
+
+        return Math.ceil(this.items.length / pageLength);
+    }
+
+    /**
+     * Reset collection data.
+     */
+    reset(): void {
+        this.hasMoreItems = true;
+
+        super.reset();
+    }
+
+    /**
+     * Reload the collection, this resets the data to the first page.
+     */
+    async reload(): Promise<void> {
+        this.dirty = true;
+
+        await this.load();
+    }
+
+    /**
+     * Load more items, if any.
+     */
+    async load(): Promise<void> {
+        if (this.dirty) {
+            const { items, hasMoreItems } = await this.loadPageItems(0);
+
+            this.dirty = false;
+            this.setItems(items, hasMoreItems ?? false);
+
+            return;
+        }
+
+        if (!this.hasMoreItems) {
+            return;
+        }
+
+        const { items, hasMoreItems } = await this.loadPageItems(this.getPagesLoaded());
+
+        this.setItems((this.items ?? []).concat(items), hasMoreItems ?? false);
+    }
+
+    /**
+     * Load page items.
+     *
+     * @param page Page number (starting at 0).
+     * @return Page items data.
+     */
+    protected abstract loadPageItems(page: number): Promise<{ items: Item[]; hasMoreItems?: boolean }>;
+
+    /**
+     * Get the length of each page in the collection.
+     *
+     * @return Page length; null for collections that don't support pagination.
+     */
+    protected getPageLength(): number | null {
+        return null;
+    }
+
+    /**
+     * Update the collection items.
+     *
+     * @param items Items.
+     * @param hasMoreItems Whether there are more pages to be loaded.
+     */
+    protected setItems(items: Item[], hasMoreItems = false): void {
+        this.hasMoreItems = hasMoreItems;
+
+        super.setItems(items);
+    }
+
+    /**
+     * Get the query parameters to use when navigating to an item page.
+     *
+     * @param item Item.
+     * @return Query parameters to use when navigating to the item page.
+     */
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    getItemQueryParams(item: Item): Params {
+        return {};
+    }
+
+    /**
+     * Get the path to use when navigating to an item page.
+     *
+     * @param item Item.
+     * @return Path to use when navigating to the item page.
+     */
+    abstract getItemPath(item: Item): string;
+
+}
diff --git a/src/core/classes/items-management/items-manager-sources-tracker.ts b/src/core/classes/items-management/routed-items-manager-sources-tracker.ts
similarity index 83%
rename from src/core/classes/items-management/items-manager-sources-tracker.ts
rename to src/core/classes/items-management/routed-items-manager-sources-tracker.ts
index e3c2f16b9..6d0e0b740 100644
--- a/src/core/classes/items-management/items-manager-sources-tracker.ts
+++ b/src/core/classes/items-management/routed-items-manager-sources-tracker.ts
@@ -12,23 +12,23 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { CoreItemsManagerSource } from './items-manager-source';
+import { CoreRoutedItemsManagerSource } from './routed-items-manager-source';
 
-type SourceConstructor<T extends CoreItemsManagerSource = CoreItemsManagerSource> = {
+type SourceConstructor<T extends CoreRoutedItemsManagerSource = CoreRoutedItemsManagerSource> = {
     getSourceId(...args: unknown[]): string;
     new (...args: unknown[]): T;
 };
 type SourceConstuctorInstance<T> = T extends { new(...args: unknown[]): infer P } ? P : never;
-type InstanceTracking = { instance: CoreItemsManagerSource; references: unknown[] };
+type InstanceTracking = { instance: CoreRoutedItemsManagerSource; references: unknown[] };
 type Instances = Record<string, InstanceTracking>;
 
 /**
- * Tracks CoreItemsManagerSource instances to reuse between pages.
+ * Tracks CoreRoutedItemsManagerSource instances to reuse between pages.
  */
-export class CoreItemsManagerSourcesTracker {
+export class CoreRoutedItemsManagerSourcesTracker {
 
     private static instances: WeakMap<SourceConstructor, Instances> = new WeakMap();
-    private static instanceIds: WeakMap<CoreItemsManagerSource, string> = new WeakMap();
+    private static instanceIds: WeakMap<CoreRoutedItemsManagerSource, string> = new WeakMap();
 
     /**
      * Create an instance of the given source or retrieve one if it's already in use.
@@ -37,7 +37,7 @@ export class CoreItemsManagerSourcesTracker {
      * @param constructorArguments Arguments to create a new instance, used to find out if an instance already exists.
      * @returns Source.
      */
-    static getOrCreateSource<T extends CoreItemsManagerSource, C extends SourceConstructor<T>>(
+    static getOrCreateSource<T extends CoreRoutedItemsManagerSource, C extends SourceConstructor<T>>(
         constructor: C,
         constructorArguments: ConstructorParameters<C>,
     ): SourceConstuctorInstance<C> {
@@ -54,7 +54,7 @@ export class CoreItemsManagerSourcesTracker {
      * @param source Source.
      * @param reference Object referncing this source.
      */
-    static addReference(source: CoreItemsManagerSource, reference: unknown): void {
+    static addReference(source: CoreRoutedItemsManagerSource, reference: unknown): void {
         const constructorInstances = this.getConstructorInstances(source.constructor as SourceConstructor);
         const instanceId = this.instanceIds.get(source);
 
@@ -78,7 +78,7 @@ export class CoreItemsManagerSourcesTracker {
      * @param source Source.
      * @param reference Object that was referncing this source.
      */
-    static removeReference(source: CoreItemsManagerSource, reference: unknown): void {
+    static removeReference(source: CoreRoutedItemsManagerSource, reference: unknown): void {
         const constructorInstances = this.instances.get(source.constructor as SourceConstructor);
         const instanceId = this.instanceIds.get(source);
         const index = constructorInstances?.[instanceId ?? '']?.references.indexOf(reference) ?? -1;
@@ -127,7 +127,7 @@ export class CoreItemsManagerSourcesTracker {
      * @param constructorArguments Source constructor arguments.
      * @returns Source instance.
      */
-    private static createInstance<T extends CoreItemsManagerSource>(
+    private static createInstance<T extends CoreRoutedItemsManagerSource>(
         id: string,
         constructor: SourceConstructor<T>,
         constructorArguments: ConstructorParameters<SourceConstructor<T>>,
diff --git a/src/core/classes/items-management/routed-items-manager.ts b/src/core/classes/items-management/routed-items-manager.ts
new file mode 100644
index 000000000..fe8aa8d38
--- /dev/null
+++ b/src/core/classes/items-management/routed-items-manager.ts
@@ -0,0 +1,135 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { ActivatedRoute, ActivatedRouteSnapshot } from '@angular/router';
+import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
+import { CoreItemsManager } from './items-manager';
+
+import { CoreRoutedItemsManagerSource } from './routed-items-manager-source';
+import { CoreRoutedItemsManagerSourcesTracker } from './routed-items-manager-sources-tracker';
+
+/**
+ * Helper to manage a collection of items in a page.
+ */
+export abstract class CoreRoutedItemsManager<
+    Item = unknown,
+    Source extends CoreRoutedItemsManagerSource<Item> = CoreRoutedItemsManagerSource<Item>,
+> extends CoreItemsManager<Item, Source> {
+
+    /**
+     * @inheritdoc
+     */
+    setSource(newSource: Source | null): void {
+        if (this.source) {
+            CoreRoutedItemsManagerSourcesTracker.removeReference(this.source.instance, this);
+        }
+
+        if (newSource) {
+            CoreRoutedItemsManagerSourcesTracker.addReference(newSource, this);
+        }
+
+        super.setSource(newSource);
+    }
+
+    /**
+     * Get page route.
+     *
+     * @returns Current page route, if any.
+     */
+    protected abstract getCurrentPageRoute(): ActivatedRoute | null;
+
+    /**
+     * Get the path of the selected item given the current route.
+     *
+     * @param route Page route.
+     * @return Path of the selected item in the given route.
+     */
+    protected abstract getSelectedItemPathFromRoute(route: ActivatedRouteSnapshot): string | null;
+
+    /**
+     * Get the path of the selected item.
+     *
+     * @param route Page route, if any.
+     * @return Path of the selected item.
+     */
+    protected getSelectedItemPath(route?: ActivatedRouteSnapshot | null): string | null {
+        if (!route) {
+            return null;
+        }
+
+        return this.getSelectedItemPathFromRoute(route);
+    }
+
+    /**
+     * Update the selected item given the current route.
+     *
+     * @param route Current route.
+     */
+    protected updateSelectedItem(route: ActivatedRouteSnapshot | null = null): void {
+        route = route ?? this.getCurrentPageRoute()?.snapshot ?? null;
+
+        const selectedItemPath = this.getSelectedItemPath(route);
+
+        const selectedItem = selectedItemPath
+            ? this.itemsMap?.[selectedItemPath] ?? null
+            : null;
+        this.setSelectedItem(selectedItem);
+    }
+
+    /**
+     * Navigate to an item in the collection.
+     *
+     * @param item Item.
+     * @param options Navigation options.
+     */
+    protected async navigateToItem(
+        item: Item,
+        options: Pick<CoreNavigationOptions, 'reset' | 'replace' | 'animationDirection'> = {},
+    ): Promise<void> {
+        // Get current route in the page.
+        const route = this.getCurrentPageRoute();
+
+        if (route === null) {
+            return;
+        }
+
+        // If this item is already selected, do nothing.
+        const itemPath = this.getSource().getItemPath(item);
+        const selectedItemPath = this.getSelectedItemPath(route.snapshot);
+
+        if (selectedItemPath === itemPath) {
+            return;
+        }
+
+        // Navigate to item.
+        const params = this.getSource().getItemQueryParams(item);
+        const pathPrefix = selectedItemPath ? selectedItemPath.split('/').fill('../').join('') : '';
+
+        await CoreNavigator.navigate(pathPrefix + itemPath, { params, ...options });
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected onSourceItemsUpdated(items: Item[]): void {
+        this.itemsMap = items.reduce((map, item) => {
+            map[this.getSource().getItemPath(item)] = item;
+
+            return map;
+        }, {});
+
+        this.updateSelectedItem();
+    }
+
+}
diff --git a/src/core/classes/items-management/slides-dynamic-items-manager-source.ts b/src/core/classes/items-management/slides-dynamic-items-manager-source.ts
new file mode 100644
index 000000000..9422f7514
--- /dev/null
+++ b/src/core/classes/items-management/slides-dynamic-items-manager-source.ts
@@ -0,0 +1,141 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreSwipeSlidesItemsManagerSource } from './slides-items-manager-source';
+
+/**
+ * Items collection source data for "swipe slides".
+ */
+export abstract class CoreSwipeSlidesDynamicItemsManagerSource<Item = unknown> extends CoreSwipeSlidesItemsManagerSource<Item> {
+
+    /**
+     * @inheritdoc
+     */
+    async load(): Promise<void> {
+        if (this.initialItem) {
+            // Load the initial item.
+            await this.loadItem(this.initialItem);
+        }
+
+        this.setInitialized();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected async loadItems(): Promise<Item[]> {
+        // Not used in dynamic slides.
+        return [];
+    }
+
+    /**
+     * Load a certain item and preload next and previous ones.
+     *
+     * @param item Basic data about the item to load.
+     * @return Promise resolved when done.
+     */
+    async loadItem(item: Partial<Item>): Promise<void> {
+        const previousItem = this.getPreviousItem(item);
+        const nextItem = this.getNextItem(item);
+
+        await Promise.all([
+            this.loadItemInList(item, false),
+            previousItem ? this.loadItemInList(previousItem, true) : undefined,
+            nextItem ? this.loadItemInList(nextItem, true) : undefined,
+        ]);
+    }
+
+    /**
+     * Load or preload a certain item and add it to the list.
+     *
+     * @param item Basic data about the item to load.
+     * @param preload Whether to preload.
+     * @return Promise resolved when done.
+     */
+    async loadItemInList(item: Partial<Item>, preload = false): Promise<void> {
+        const preloadedItem = await this.loadItemData(item, preload);
+        if (!preloadedItem) {
+            return;
+        }
+
+        // Add the item at the right position.
+        const existingItem = this.getItem(item);
+        if (existingItem) {
+            // Already in list, no need to add it.
+            return;
+        }
+
+        if (!this.items) {
+            this.items = [];
+        }
+
+        const previousItem = this.getPreviousItem(item);
+        const nextItem = this.getNextItem(item);
+        const previousItemId = previousItem ? this.getItemId(previousItem) : null;
+        const nextItemId = nextItem ? this.getItemId(nextItem) : null;
+
+        const added = this.items.some((item, index) => {
+            const itemId = this.getItemId(item);
+            let positionToInsert = -1;
+            if (itemId === previousItemId) {
+                // Previous item found, add the item after it.
+                positionToInsert = index + 1;
+            }
+
+            if (itemId === nextItemId) {
+                // Next item found, add the item before it.
+                positionToInsert = index;
+            }
+
+            if (positionToInsert > -1) {
+                this.items?.splice(positionToInsert, 0, preloadedItem);
+
+                return true;
+            }
+        });
+
+        if (!added) {
+            // Previous and next items not found, this probably means the array is still empty. Add it at the end.
+            this.items.push(preloadedItem);
+        }
+
+        this.notifyItemsUpdated();
+    }
+
+    /**
+     * Load or preload a certain item data.
+     *
+     * @param item Basic data about the item to load.
+     * @param preload Whether to preload.
+     * @return Promise resolved with item. Resolve with null if item is not valid (e.g. there are no more items).
+     */
+    abstract loadItemData(item: Partial<Item>, preload: boolean): Promise<Item | null>;
+
+    /**
+     * Return the data to identify the previous item.
+     *
+     * @param item Data about the item.
+     * @return Previous item data. Null if no previous item.
+     */
+    abstract getPreviousItem(item: Partial<Item>): Partial<Item> | null;
+
+    /**
+     * Return the data to identify the next item.
+     *
+     * @param item Data about the item.
+     * @return Next item data. Null if no next item.
+     */
+    abstract getNextItem(item: Partial<Item>): Partial<Item> | null;
+
+}
diff --git a/src/core/classes/items-management/slides-dynamic-items-manager.ts b/src/core/classes/items-management/slides-dynamic-items-manager.ts
new file mode 100644
index 000000000..cacae1282
--- /dev/null
+++ b/src/core/classes/items-management/slides-dynamic-items-manager.ts
@@ -0,0 +1,38 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreSwipeSlidesDynamicItemsManagerSource } from './slides-dynamic-items-manager-source';
+import { CoreSwipeSlidesItemsManager } from './slides-items-manager';
+
+/**
+ * Helper class to manage items for core-swipe-slides.
+ */
+export class CoreSwipeSlidesDynamicItemsManager<
+    Item = unknown,
+    Source extends CoreSwipeSlidesDynamicItemsManagerSource<Item> = CoreSwipeSlidesDynamicItemsManagerSource<Item>,
+> extends CoreSwipeSlidesItemsManager<Item, Source> {
+
+    /**
+     * @inheritdoc
+     */
+    setSelectedItem(item: Item | null): void {
+        super.setSelectedItem(item);
+
+        if (item) {
+            // Load the item if not loaded yet.
+            this.getSource().loadItem(item);
+        }
+    }
+
+}
diff --git a/src/core/classes/items-management/slides-items-manager-source.ts b/src/core/classes/items-management/slides-items-manager-source.ts
new file mode 100644
index 000000000..e45c9d5b9
--- /dev/null
+++ b/src/core/classes/items-management/slides-items-manager-source.ts
@@ -0,0 +1,121 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreItemsManagerSource } from './items-manager-source';
+
+/**
+ * Items collection source data for "swipe slides".
+ */
+export abstract class CoreSwipeSlidesItemsManagerSource<Item = unknown> extends CoreItemsManagerSource<Item> {
+
+    protected initialItem?: Partial<Item>;
+    protected initialized = false;
+    protected initializePromise: Promise<void>;
+    protected resolveInitialize!: () => void;
+
+    constructor(initialItem?: Partial<Item>) {
+        super();
+
+        this.initialItem = initialItem;
+        this.initializePromise = new Promise(resolve => this.resolveInitialize = resolve);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    isLoaded(): boolean {
+        return this.initialized && super.isLoaded();
+    }
+
+    /**
+     * Return a promise that is resolved when the source is initialized.
+     *
+     * @return Promise.
+     */
+    waitForInitialized(): Promise<void> {
+        return this.initializePromise;
+    }
+
+    /**
+     * Mark the source as initialized.
+     */
+    protected setInitialized(): void {
+        this.initialized = true;
+        this.resolveInitialize();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async load(): Promise<void> {
+        const items = await this.loadItems();
+
+        this.setItems(items);
+        this.setInitialized();
+    }
+
+    /**
+     * Load items.
+     *
+     * @return Items list.
+     */
+    protected abstract loadItems(): Promise<Item[]>;
+
+    /**
+     * Get a certain item.
+     *
+     * @param item Partial data about the item to search.
+     * @return Item, null if not found.
+     */
+    getItem(item: Partial<Item>): Item | null {
+        const index = this.getItemPosition(item);
+
+        return this.items?.[index] ?? null;
+    }
+
+    /**
+     * Get a certain item position.
+     *
+     * @param item Item to search.
+     * @return Item position, -1 if not found.
+     */
+    getItemPosition(item: Partial<Item>): number {
+        const itemId = this.getItemId(item);
+        const index = this.items?.findIndex((listItem) => itemId === this.getItemId(listItem));
+
+        return index ?? -1;
+    }
+
+    /**
+     * Get initial item position.
+     *
+     * @return Initial item position.
+     */
+    getInitialPosition(): number {
+        if (!this.initialItem) {
+            return 0;
+        }
+
+        return this.getItemPosition(this.initialItem);
+    }
+
+    /**
+     * Get the ID of an item.
+     *
+     * @param item Data about the item.
+     * @return Item ID.
+     */
+    abstract getItemId(item: Partial<Item>): string | number;
+
+}
diff --git a/src/core/classes/items-management/slides-items-manager.ts b/src/core/classes/items-management/slides-items-manager.ts
new file mode 100644
index 000000000..8c01ef571
--- /dev/null
+++ b/src/core/classes/items-management/slides-items-manager.ts
@@ -0,0 +1,47 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreItemsManager } from './items-manager';
+import { CoreSwipeSlidesItemsManagerSource } from './slides-items-manager-source';
+
+/**
+ * Helper class to manage items for core-swipe-slides.
+ */
+export class CoreSwipeSlidesItemsManager<
+    Item = unknown,
+    Source extends CoreSwipeSlidesItemsManagerSource<Item> = CoreSwipeSlidesItemsManagerSource<Item>,
+> extends CoreItemsManager<Item, Source> {
+
+    /**
+     * @inheritdoc
+     */
+    protected onSourceItemsUpdated(items: Item[]): void {
+        this.itemsMap = items.reduce((map, item) => {
+            map[this.getSource().getItemId(item)] = item;
+
+            return map;
+        }, {});
+    }
+
+    /**
+     * Get item by ID.
+     *
+     * @param id ID
+     * @return Item, null if not found.
+     */
+    getItemById(id: string): Item | null {
+        return this.itemsMap?.[id] ?? null;
+    }
+
+}
diff --git a/src/core/classes/items-management/swipe-items-manager.ts b/src/core/classes/items-management/swipe-items-manager.ts
index 918cab741..0290206ef 100644
--- a/src/core/classes/items-management/swipe-items-manager.ts
+++ b/src/core/classes/items-management/swipe-items-manager.ts
@@ -16,17 +16,17 @@ import { ActivatedRoute, ActivatedRouteSnapshot, UrlSegment } from '@angular/rou
 
 import { CoreNavigator } from '@services/navigator';
 
-import { CoreItemsManager } from './items-manager';
-import { CoreItemsManagerSource } from './items-manager-source';
+import { CoreRoutedItemsManager } from './routed-items-manager';
+import { CoreRoutedItemsManagerSource } from './routed-items-manager-source';
 
 /**
  * Helper class to manage the state and routing of a swipeable page.
  */
 export class CoreSwipeItemsManager<
     Item = unknown,
-    Source extends CoreItemsManagerSource<Item> = CoreItemsManagerSource<Item>
+    Source extends CoreRoutedItemsManagerSource<Item> = CoreRoutedItemsManagerSource<Item>
 >
-    extends CoreItemsManager<Item, Source> {
+    extends CoreRoutedItemsManager<Item, Source> {
 
     /**
      * Process page started operations.
diff --git a/src/core/components/components.module.ts b/src/core/components/components.module.ts
index d39a0e057..ae31faa41 100644
--- a/src/core/components/components.module.ts
+++ b/src/core/components/components.module.ts
@@ -60,6 +60,7 @@ import { CoreComboboxComponent } from './combobox/combobox';
 import { CoreSpacerComponent } from './spacer/spacer';
 import { CoreHorizontalScrollControlsComponent } from './horizontal-scroll-controls/horizontal-scroll-controls';
 import { CoreButtonWithSpinnerComponent } from './button-with-spinner/button-with-spinner';
+import { CoreSwipeSlidesComponent } from './swipe-slides/swipe-slides';
 
 @NgModule({
     declarations: [
@@ -94,6 +95,7 @@ import { CoreButtonWithSpinnerComponent } from './button-with-spinner/button-wit
         CoreSplitViewComponent,
         CoreStyleComponent,
         CoreSwipeNavigationComponent,
+        CoreSwipeSlidesComponent,
         CoreTabComponent,
         CoreTabsComponent,
         CoreTabsOutletComponent,
@@ -143,6 +145,7 @@ import { CoreButtonWithSpinnerComponent } from './button-with-spinner/button-wit
         CoreSplitViewComponent,
         CoreStyleComponent,
         CoreSwipeNavigationComponent,
+        CoreSwipeSlidesComponent,
         CoreTabComponent,
         CoreTabsComponent,
         CoreTabsOutletComponent,
diff --git a/src/core/components/swipe-slides/swipe-slides.html b/src/core/components/swipe-slides/swipe-slides.html
new file mode 100644
index 000000000..461366344
--- /dev/null
+++ b/src/core/components/swipe-slides/swipe-slides.html
@@ -0,0 +1,6 @@
+<ion-slides *ngIf="manager && manager.getSource().isLoaded()" (ionSlideWillChange)="slideWillChange()"
+    (ionSlideDidChange)="slideDidChange()" [options]="options">
+    <ion-slide *ngFor="let item of manager.getSource().getItems()">
+        <ng-container *ngIf="template" [ngTemplateOutlet]="template" [ngTemplateOutletContext]="{item: item}"></ng-container>
+    </ion-slide>
+</ion-slides>
diff --git a/src/addons/mod/book/components/index/index.scss b/src/core/components/swipe-slides/swipe-slides.scss
similarity index 100%
rename from src/addons/mod/book/components/index/index.scss
rename to src/core/components/swipe-slides/swipe-slides.scss
diff --git a/src/core/components/swipe-slides/swipe-slides.ts b/src/core/components/swipe-slides/swipe-slides.ts
new file mode 100644
index 000000000..ac88f6e8e
--- /dev/null
+++ b/src/core/components/swipe-slides/swipe-slides.ts
@@ -0,0 +1,263 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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, ContentChild, ElementRef, EventEmitter, Input, OnChanges, OnDestroy, Output, TemplateRef, ViewChild,
+} from '@angular/core';
+import { CoreSwipeSlidesItemsManager } from '@classes/items-management/slides-items-manager';
+import { IonContent, IonSlides } from '@ionic/angular';
+import { CoreDomUtils } from '@services/utils/dom';
+
+/**
+ * Helper component to display swipable slides.
+ */
+@Component({
+    selector: 'core-swipe-slides',
+    templateUrl: 'swipe-slides.html',
+    styleUrls: ['swipe-slides.scss'],
+})
+export class CoreSwipeSlidesComponent<Item = unknown> implements OnChanges, OnDestroy {
+
+    @Input() manager?: CoreSwipeSlidesItemsManager<Item>;
+    @Input() options: CoreSwipeSlidesOptions = {};
+    @Output() onInit = new EventEmitter<CoreSwipeCurrentItemData<Item>>();
+    @Output() onWillChange = new EventEmitter<CoreSwipeCurrentItemData<Item>>();
+    @Output() onDidChange = new EventEmitter<CoreSwipeCurrentItemData<Item>>();
+
+    @ViewChild(IonSlides) slides?: IonSlides;
+    @ContentChild(TemplateRef) template?: TemplateRef<unknown>; // Template defined by the content.
+
+    protected hostElement: HTMLElement;
+    protected unsubscribe?: () => void;
+
+    constructor(
+        elementRef: ElementRef<HTMLElement>,
+        protected content?: IonContent,
+    ) {
+        this.hostElement = elementRef.nativeElement;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    ngOnChanges(): void {
+        if (!this.unsubscribe && this.manager) {
+            this.initialize(this.manager);
+        }
+    }
+
+    /**
+     * Initialize some properties based on the manager.
+     */
+    protected async initialize(manager: CoreSwipeSlidesItemsManager<Item>): Promise<void> {
+        this.unsubscribe = manager.getSource().addListener({
+            onItemsUpdated: () => this.onItemsUpdated(),
+        });
+
+        // Don't call default callbacks on init, emit our own events instead.
+        // This is because default callbacks aren't triggered for position 0, and to prevent auto scroll on init.
+        this.options.runCallbacksOnInit = false;
+
+        await manager.getSource().waitForInitialized();
+
+        if (this.options.initialSlide === undefined) {
+            // Calculate the initial slide.
+            const position = manager.getSource().getInitialPosition();
+            this.options.initialSlide = position > - 1 ? position : 0;
+        }
+
+        // Emit change events with the initial item.
+        const items = manager.getSource().getItems();
+        if (!items || !items.length) {
+            return;
+        }
+
+        // Validate that the initial position is inside the valid range.
+        let initialPosition = this.options.initialSlide as number;
+        if (initialPosition < 0) {
+            initialPosition = 0;
+        } else if (initialPosition >= items.length) {
+            initialPosition = items.length - 1;
+        }
+
+        const initialItemData = {
+            index: initialPosition,
+            item: items[initialPosition],
+        };
+
+        manager.setSelectedItem(items[initialPosition]);
+        this.onWillChange.emit(initialItemData);
+        this.onDidChange.emit(initialItemData);
+    }
+
+    /**
+     * Slide to a certain position.
+     *
+     * @param index Position.
+     * @param speed Animation speed.
+     * @param runCallbacks Whether to run callbacks.
+     */
+    slideToIndex(index: number, speed?: number, runCallbacks?: boolean): void {
+        this.slides?.slideTo(index, speed, runCallbacks);
+    }
+
+    /**
+     * Slide to a certain item.
+     *
+     * @param item Item.
+     * @param speed Animation speed.
+     * @param runCallbacks Whether to run callbacks.
+     */
+    slideToItem(item: Partial<Item>, speed?: number, runCallbacks?: boolean): void {
+        const index = this.manager?.getSource().getItemPosition(item) ?? -1;
+        if (index != -1) {
+            this.slides?.slideTo(index, speed, runCallbacks);
+        }
+    }
+
+    /**
+     * Slide to next slide.
+     *
+     * @param speed Animation speed.
+     * @param runCallbacks Whether to run callbacks.
+     */
+    slideNext(speed?: number, runCallbacks?: boolean): void {
+        this.slides?.slideNext(speed, runCallbacks);
+    }
+
+    /**
+     * Slide to previous slide.
+     *
+     * @param speed Animation speed.
+     * @param runCallbacks Whether to run callbacks.
+     */
+    slidePrev(speed?: number, runCallbacks?: boolean): void {
+        this.slides?.slidePrev(speed, runCallbacks);
+    }
+
+    /**
+     * Get current item.
+     *
+     * @return Current item. Undefined if no current item yet.
+     */
+    getCurrentItem(): Item | null {
+        return this.manager?.getSelectedItem() || null;
+    }
+
+    /**
+     * Called when items list has been updated.
+     *
+     * @param items New items.
+     */
+    protected onItemsUpdated(): void {
+        const currentItem = this.getCurrentItem();
+
+        if (!currentItem || !this.manager) {
+            return;
+        }
+
+        // Keep the same slide in case the list has changed.
+        const newIndex = this.manager.getSource().getItemPosition(currentItem) ?? -1;
+        if (newIndex != -1) {
+            this.slides?.slideTo(newIndex, 0, false);
+        }
+    }
+
+    /**
+     * Slide will change.
+     */
+    async slideWillChange(): Promise<void> {
+        const currentItemData = await this.getCurrentSlideItemData();
+        if (!currentItemData) {
+            return;
+        }
+
+        this.manager?.setSelectedItem(currentItemData.item);
+
+        this.onWillChange.emit(currentItemData);
+
+        if (this.options.scrollOnChange !== 'top') {
+            return;
+        }
+
+        // Scroll top. This can be improved in the future to keep the scroll for each slide.
+        const scrollElement = await this.content?.getScrollElement();
+
+        if (!scrollElement || CoreDomUtils.isElementOutsideOfScreen(scrollElement, this.hostElement, 'top')) {
+            // Scroll to top.
+            this.hostElement.scrollIntoView({ behavior: 'smooth' });
+        }
+    }
+
+    /**
+     * Slide did change.
+     */
+    async slideDidChange(): Promise<void> {
+        const currentItemData = await this.getCurrentSlideItemData();
+        if (!currentItemData) {
+            return;
+        }
+
+        this.onDidChange.emit(currentItemData);
+    }
+
+    /**
+     * Get current item and index based on current slide.
+     *
+     * @return Promise resolved with current item data. Null if not found.
+     */
+    protected async getCurrentSlideItemData(): Promise<CoreSwipeCurrentItemData<Item> | null> {
+        if (!this.slides || !this.manager) {
+            return null;
+        }
+
+        const index = await this.slides.getActiveIndex();
+        const items = this.manager.getSource().getItems();
+        const currentItem = items && items[index];
+
+        if (!currentItem) {
+            return null;
+        }
+
+        return {
+            item: currentItem,
+            index,
+        };
+    }
+
+    /**
+     * @inheritdoc
+     */
+    ngOnDestroy(): void {
+        this.unsubscribe && this.unsubscribe();
+    }
+
+}
+
+/**
+ * Options to pass to the component.
+ *
+ * @todo Change unknown with the right type once Swiper library is used.
+ */
+export type CoreSwipeSlidesOptions = Record<string, unknown> & {
+    scrollOnChange?: 'top' | 'none'; // Scroll behaviour on change slide. By default, none.
+};
+
+/**
+ * Data about current item.
+ */
+export type CoreSwipeCurrentItemData<Item> = {
+    index: number;
+    item: Item;
+};
diff --git a/src/core/features/user/classes/participants-source.ts b/src/core/features/user/classes/participants-source.ts
index 9aa6e4db1..892341ab1 100644
--- a/src/core/features/user/classes/participants-source.ts
+++ b/src/core/features/user/classes/participants-source.ts
@@ -13,14 +13,14 @@
 // limitations under the License.
 
 import { Params } from '@angular/router';
-import { CoreItemsManagerSource } from '@classes/items-management/items-manager-source';
+import { CoreRoutedItemsManagerSource } from '@classes/items-management/routed-items-manager-source';
 
 import { CoreUser, CoreUserData, CoreUserParticipant, CoreUserProvider } from '../services/user';
 
 /**
  * Provides a collection of course participants.
  */
-export class CoreUserParticipantsSource extends CoreItemsManagerSource<CoreUserParticipant | CoreUserData> {
+export class CoreUserParticipantsSource extends CoreRoutedItemsManagerSource<CoreUserParticipant | CoreUserData> {
 
     /**
      * @inheritdoc
diff --git a/src/core/features/user/pages/participants/participants.page.ts b/src/core/features/user/pages/participants/participants.page.ts
index a15ed9a11..3ff362630 100644
--- a/src/core/features/user/pages/participants/participants.page.ts
+++ b/src/core/features/user/pages/participants/participants.page.ts
@@ -23,7 +23,7 @@ import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import { CoreUser, CoreUserParticipant, CoreUserData } from '@features/user/services/user';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreUserParticipantsSource } from '@features/user/classes/participants-source';
-import { CoreItemsManagerSourcesTracker } from '@classes/items-management/items-manager-sources-tracker';
+import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
 
 /**
  * Page that displays the list of course participants.
@@ -48,7 +48,7 @@ export class CoreUserParticipantsPage implements OnInit, AfterViewInit, OnDestro
         try {
             this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
             this.participants = new CoreUserParticipantsManager(
-                CoreItemsManagerSourcesTracker.getOrCreateSource(CoreUserParticipantsSource, [this.courseId]),
+                CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(CoreUserParticipantsSource, [this.courseId]),
                 CoreUserParticipantsPage,
             );
         } catch (error) {
@@ -107,7 +107,7 @@ export class CoreUserParticipantsPage implements OnInit, AfterViewInit, OnDestro
             return;
         }
 
-        const newSource = CoreItemsManagerSourcesTracker.getOrCreateSource(CoreUserParticipantsSource, [this.courseId]);
+        const newSource = CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(CoreUserParticipantsSource, [this.courseId]);
 
         this.searchQuery = null;
         this.searchInProgress = false;
@@ -124,7 +124,10 @@ export class CoreUserParticipantsPage implements OnInit, AfterViewInit, OnDestro
     async search(query: string): Promise<void> {
         CoreApp.closeKeyboard();
 
-        const newSource = CoreItemsManagerSourcesTracker.getOrCreateSource(CoreUserParticipantsSource, [this.courseId, query]);
+        const newSource = CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(
+            CoreUserParticipantsSource,
+            [this.courseId, query],
+        );
 
         this.searchInProgress = true;
         this.searchQuery = query;
diff --git a/src/core/features/user/pages/profile/profile.page.ts b/src/core/features/user/pages/profile/profile.page.ts
index bcfc6bad3..ee7c6e39c 100644
--- a/src/core/features/user/pages/profile/profile.page.ts
+++ b/src/core/features/user/pages/profile/profile.page.ts
@@ -29,7 +29,7 @@ import { CoreNavigator } from '@services/navigator';
 import { CoreCourses } from '@features/courses/services/courses';
 import { CoreSwipeItemsManager } from '@classes/items-management/swipe-items-manager';
 import { CoreUserParticipantsSource } from '@features/user/classes/participants-source';
-import { CoreItemsManagerSourcesTracker } from '@classes/items-management/items-manager-sources-tracker';
+import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
 
 @Component({
     selector: 'page-core-user-profile',
@@ -90,7 +90,10 @@ export class CoreUserProfilePage implements OnInit, OnDestroy {
 
         if (this.courseId && this.route.snapshot.data.swipeManagerSource === 'participants') {
             const search = CoreNavigator.getRouteParam('search');
-            const source = CoreItemsManagerSourcesTracker.getOrCreateSource(CoreUserParticipantsSource, [this.courseId, search]);
+            const source = CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(
+                CoreUserParticipantsSource,
+                [this.courseId, search],
+            );
             this.users = new CoreUserSwipeItemsManager(source);
 
             this.users.start();

From d527695977bf58f1ed5f4417be4c96dd6a87c64c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 10 Dec 2021 14:50:55 +0100
Subject: [PATCH 0291/1008] MOBILE-3927 calendar: Add swipe to calendar daily
 view

---
 .../calendar/components/calendar/calendar.ts  | 136 ++-
 src/addons/calendar/pages/day/day.html        | 132 +--
 src/addons/calendar/pages/day/day.page.ts     | 781 ++++++++++--------
 src/addons/calendar/pages/day/day.scss        |   4 +
 src/addons/calendar/pages/index/index.page.ts |  16 +-
 .../calendar/services/calendar-helper.ts      |  26 +-
 .../slides-dynamic-items-manager-source.ts    |  84 +-
 .../slides-dynamic-items-manager.ts           |   4 +-
 .../components/swipe-slides/swipe-slides.scss |   6 +
 src/core/services/utils/time.ts               | 121 ++-
 10 files changed, 800 insertions(+), 510 deletions(-)

diff --git a/src/addons/calendar/components/calendar/calendar.ts b/src/addons/calendar/components/calendar/calendar.ts
index 6a0f3a4c5..36614d3d5 100644
--- a/src/addons/calendar/components/calendar/calendar.ts
+++ b/src/addons/calendar/components/calendar/calendar.ts
@@ -43,7 +43,10 @@ import { CoreCategoryData, CoreCourses } from '@features/courses/services/course
 import { CoreApp } from '@services/app';
 import { CoreLocalNotifications } from '@services/local-notifications';
 import { CoreSwipeCurrentItemData, CoreSwipeSlidesComponent } from '@components/swipe-slides/swipe-slides';
-import { CoreSwipeSlidesDynamicItemsManagerSource } from '@classes/items-management/slides-dynamic-items-manager-source';
+import {
+    CoreSwipeSlidesDynamicItem,
+    CoreSwipeSlidesDynamicItemsManagerSource,
+} from '@classes/items-management/slides-dynamic-items-manager-source';
 import { CoreSwipeSlidesDynamicItemsManager } from '@classes/items-management/slides-dynamic-items-manager';
 
 /**
@@ -113,8 +116,8 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
                 this.undeleteEvent(data.eventId);
 
                 // Remove it from the list of deleted events if it's there.
-                const index = this.manager?.getSource().deletedEvents.indexOf(data.eventId);
-                if (index !== undefined && index != -1) {
+                const index = this.manager?.getSource().deletedEvents.indexOf(data.eventId) ?? -1;
+                if (index != -1) {
                     this.manager?.getSource().deletedEvents.splice(index, 1);
                 }
             },
@@ -128,15 +131,15 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
      * Component loaded.
      */
     ngOnInit(): void {
-        const now = new Date();
+        const currentMonth = CoreTimeUtils.getCurrentMonth();
 
         this.canNavigate = typeof this.canNavigate == 'undefined' ? true : CoreUtils.isTrueOrOne(this.canNavigate);
         this.displayNavButtons = typeof this.displayNavButtons == 'undefined' ? true :
             CoreUtils.isTrueOrOne(this.displayNavButtons);
 
         const source = new AddonCalendarMonthSlidesItemsManagerSource(this, {
-            year: this.initialYear ?? now.getFullYear(),
-            monthNumber: this.initialMonth ?? now.getMonth() + 1,
+            year: this.initialYear ?? currentMonth.year,
+            monthNumber: this.initialMonth ?? currentMonth.monthNumber,
         });
         this.manager = new CoreSwipeSlidesDynamicItemsManager(source);
 
@@ -157,7 +160,7 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
             if (changes) {
                 items.forEach((month) => {
                     if (month.loaded) {
-                        this.filterEvents(month.weeks);
+                        this.manager?.getSource().filterEvents(month.weeks, this.filter);
                     }
                 });
             }
@@ -177,7 +180,7 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
         try {
             await this.manager?.getSource().fetchData();
 
-            await this.manager?.getSource().load();
+            await this.manager?.getSource().load(this.manager?.getSelectedItem());
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'addon.calendar.errorloadevents', true);
         }
@@ -186,11 +189,9 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
     }
 
     /**
-     * Load current month and preload next and previous ones.
-     *
-     * @return Promise resolved when done.
+     * Update data related to month being viewed.
      */
-    async viewMonth(month: YearAndMonth): Promise<void> {
+    viewMonth(month: YearAndMonth): void {
         // Calculate the period name. We don't use the one in result because it's in server's language.
         this.periodName = CoreTimeUtils.userDate(
             new Date(month.year, month.monthNumber - 1).getTime(),
@@ -199,35 +200,19 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
         this.calculateIsCurrentMonth();
     }
 
-    /**
-     * Filter events based on the filter popover.
-     *
-     * @param weeks Weeks with the events to filter.
-     */
-    filterEvents(weeks: AddonCalendarWeek[]): void {
-        weeks.forEach((week) => {
-            week.days.forEach((day) => {
-                day.filteredEvents = AddonCalendarHelper.getFilteredEvents(
-                    day.eventsFormated || [],
-                    this.filter,
-                    this.manager?.getSource().categories || {},
-                );
-
-                // Re-calculate some properties.
-                AddonCalendarHelper.calculateDayData(day, day.filteredEvents);
-            });
-        });
-    }
-
     /**
      * Refresh events.
      *
      * @param afterChange Whether the refresh is done after an event has changed or has been synced.
      * @return Promise resolved when done.
      */
-    async refreshData(): Promise<void> {
+    async refreshData(afterChange = false): Promise<void> {
         const visibleMonth = this.slides?.getCurrentItem() || null;
 
+        if (afterChange) {
+            this.manager?.getSource().markAllItemsDirty();
+        }
+
         await this.manager?.getSource().invalidateContent(visibleMonth);
 
         await this.fetchData();
@@ -282,8 +267,8 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
         }
 
         this.currentTime = CoreTimeUtils.timestamp();
-        this.isCurrentMonth = CoreTimeUtils.isCurrentMonth(visibleMonth);
-        this.isPastMonth = CoreTimeUtils.isCurrentMonth(visibleMonth);
+        this.isCurrentMonth = CoreTimeUtils.isSameMonth(visibleMonth, CoreTimeUtils.getCurrentMonth());
+        this.isPastMonth = CoreTimeUtils.isPastMonth(visibleMonth);
     }
 
     /**
@@ -305,20 +290,22 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
      * @param eventId Event ID.
      */
     protected async undeleteEvent(eventId: number): Promise<void> {
-        this.manager?.getSource().getItems()?.forEach((month) => {
+        this.manager?.getSource().getItems()?.some((month) => {
             if (!month.loaded) {
-                return;
+                return false;
             }
 
-            month.weeks.forEach((week) => {
-                week.days.forEach((day) => {
-                    const event = day.eventsFormated?.find((event) => event.id == eventId);
+            return month.weeks.some((week) => week.days.some((day) => {
+                const event = day.eventsFormated?.find((event) => event.id == eventId);
 
-                    if (event) {
-                        event.deleted = false;
-                    }
-                });
-            });
+                if (event) {
+                    event.deleted = false;
+
+                    return true;
+                }
+
+                return false;
+            }));
         });
     }
 
@@ -354,17 +341,13 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
 /**
  * Preloaded month.
  */
-type PreloadedMonth = YearAndMonth & {
-    loaded: boolean; // Whether the events have been loaded.
+type PreloadedMonth = YearAndMonth & CoreSwipeSlidesDynamicItem & {
     weekDays: AddonCalendarWeekDaysTranslationKeys[];
     weeks: AddonCalendarWeek[];
-    needsRefresh?: boolean; // Whether the events needs to be re-loaded.
 };
 
-// CoreSwipeSlidesDynamicItemsManagerSource
-
 /**
- * Helper to manage swiping within a collection of chapters.
+ * Helper to manage swiping within months.
  */
 class AddonCalendarMonthSlidesItemsManagerSource extends CoreSwipeSlidesDynamicItemsManagerSource<PreloadedMonth> {
 
@@ -399,6 +382,27 @@ class AddonCalendarMonthSlidesItemsManagerSource extends CoreSwipeSlidesDynamicI
         ]);
     }
 
+    /**
+     * Filter events based on the filter popover.
+     *
+     * @param weeks Weeks with the events to filter.
+     * @param filter Filter to apply.
+     */
+    filterEvents(weeks: AddonCalendarWeek[], filter?: AddonCalendarFilter): void {
+        weeks.forEach((week) => {
+            week.days.forEach((day) => {
+                day.filteredEvents = AddonCalendarHelper.getFilteredEvents(
+                    day.eventsFormated || [],
+                    filter,
+                    this.categories,
+                );
+
+                // Re-calculate some properties.
+                AddonCalendarHelper.calculateDayData(day, day.filteredEvents);
+            });
+        });
+    }
+
     /**
      * Load categories to be able to filter events.
      *
@@ -437,8 +441,7 @@ class AddonCalendarMonthSlidesItemsManagerSource extends CoreSwipeSlidesDynamicI
         this.offlineEvents = AddonCalendarHelper.classifyIntoMonths(events);
 
         // Get the IDs of events edited in offline.
-        const filtered = events.filter((event) => event.id > 0);
-        this.offlineEditedEventsIds = filtered.map((event) => event.id);
+        this.offlineEditedEventsIds = events.filter((event) => event.id > 0).map((event) => event.id);
     }
 
     /**
@@ -463,7 +466,7 @@ class AddonCalendarMonthSlidesItemsManagerSource extends CoreSwipeSlidesDynamicI
      * @inheritdoc
      */
     getItemId(item: YearAndMonth): string | number {
-        return `${item.year}#${item.monthNumber}`;
+        return AddonCalendarHelper.getMonthId(item);
     }
 
     /**
@@ -484,12 +487,6 @@ class AddonCalendarMonthSlidesItemsManagerSource extends CoreSwipeSlidesDynamicI
      * @inheritdoc
      */
     async loadItemData(month: YearAndMonth, preload = false): Promise<PreloadedMonth | null> {
-        // Check if it's already loaded.
-        const existingMonth = this.getItem(month);
-        if (existingMonth && ((existingMonth.loaded && !existingMonth.needsRefresh) || preload)) {
-            return existingMonth;
-        }
-
         if (!preload) {
             this.monthLoaded = false;
         }
@@ -515,7 +512,7 @@ class AddonCalendarMonthSlidesItemsManagerSource extends CoreSwipeSlidesDynamicI
 
             const weekDays = AddonCalendar.getWeekDays(result.daynames[0].dayno);
             const weeks = result.weeks as AddonCalendarWeek[];
-            const isCurrentMonth = CoreTimeUtils.isCurrentMonth(month);
+            const isCurrentMonth = CoreTimeUtils.isSameMonth(month, CoreTimeUtils.getCurrentMonth());
             const currentDay = new Date().getDate();
             let isPast = true;
 
@@ -552,22 +549,11 @@ class AddonCalendarMonthSlidesItemsManagerSource extends CoreSwipeSlidesDynamicI
                 // Merge the online events with offline data.
                 this.mergeEvents(month, weeks);
                 // Filter events by course.
-                this.calendarComponent.filterEvents(weeks);
+                this.filterEvents(weeks, this.calendarComponent.filter);
             }
 
-            if (existingMonth) {
-                // Month already exists, update it.
-                existingMonth.loaded = !preload;
-                existingMonth.weeks = weeks;
-                existingMonth.weekDays = weekDays;
-
-                return existingMonth;
-            }
-
-            // Add the preloaded month at the right position.
             return {
                 ...month,
-                loaded: !preload,
                 weeks,
                 weekDays,
             };
@@ -586,7 +572,7 @@ class AddonCalendarMonthSlidesItemsManagerSource extends CoreSwipeSlidesDynamicI
      */
     mergeEvents(month: YearAndMonth, weeks: AddonCalendarWeek[]): void {
         const monthOfflineEvents: { [day: number]: AddonCalendarEventToDisplay[] } =
-            this.offlineEvents[AddonCalendarHelper.getMonthId(month.year, month.monthNumber)];
+            this.offlineEvents[AddonCalendarHelper.getMonthId(month)];
 
         weeks.forEach((week) => {
             week.days.forEach((day) => {
@@ -637,7 +623,7 @@ class AddonCalendarMonthSlidesItemsManagerSource extends CoreSwipeSlidesDynamicI
         this.categoriesRetrieved = false; // Get categories again.
 
         if (visibleMonth) {
-            visibleMonth.needsRefresh = true;
+            visibleMonth.dirty = true;
         }
 
         await Promise.all(promises);
diff --git a/src/addons/calendar/pages/day/day.html b/src/addons/calendar/pages/day/day.html
index ef0fe2306..28b8bf934 100644
--- a/src/addons/calendar/pages/day/day.html
+++ b/src/addons/calendar/pages/day/day.html
@@ -14,7 +14,7 @@
                 <core-context-menu-item *ngIf="!isCurrentDay" [priority]="900" [content]="'addon.calendar.today' | translate"
                     iconAction="fas-calendar-day" (action)="goToCurrentDay()">
                 </core-context-menu-item>
-                <core-context-menu-item [hidden]="!loaded || !hasOffline || !isOnline" [priority]="400"
+                <core-context-menu-item [hidden]="!loaded || !this.visibleDayHasOffline() || !isOnline" [priority]="400"
                     [content]="'core.settings.synchronizenow' | translate" (action)="doRefresh(undefined, $event)" [iconAction]="syncIcon"
                     [closeOnClick]="false">
                 </core-context-menu-item>
@@ -27,70 +27,78 @@
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
-    <!-- Period name and arrows to navigate. -->
-    <ion-grid class="ion-no-padding safe-area-padding">
-        <ion-row class="ion-align-items-center">
-            <ion-col class="ion-text-start" *ngIf="currentMoment">
-                <ion-button fill="clear" (click)="loadPrevious()" [attr.aria-label]="'addon.calendar.dayprev' | translate">
-                    <ion-icon name="fas-chevron-left" slot="icon-only" aria-hidden="true"></ion-icon>
-                </ion-button>
-            </ion-col>
-            <ion-col class="ion-text-center addon-calendar-period">
-                <h3>{{ periodName }}</h3>
-            </ion-col>
-            <ion-col class="ion-text-end" *ngIf="currentMoment">
-                <ion-button fill="clear" (click)="loadNext()" [attr.aria-label]="'addon.calendar.daynext' | translate">
-                    <ion-icon name="fas-chevron-right" slot="icon-only" aria-hidden="true"></ion-icon>
-                </ion-button>
-            </ion-col>
-        </ion-row>
-    </ion-grid>
+    <core-loading [hideUntil]="loaded">
+        <!-- Period name and arrows to navigate. -->
+        <ion-grid class="ion-no-padding safe-area-padding">
+            <ion-row class="ion-align-items-center">
+                <ion-col class="ion-text-start">
+                    <ion-button fill="clear" (click)="loadPrevious()" [attr.aria-label]="'addon.calendar.dayprev' | translate">
+                        <ion-icon name="fas-chevron-left" slot="icon-only" aria-hidden="true"></ion-icon>
+                    </ion-button>
+                </ion-col>
+                <ion-col class="ion-text-center addon-calendar-period">
+                    <h3>{{ periodName }}</h3>
+                </ion-col>
+                <ion-col class="ion-text-end">
+                    <ion-button fill="clear" (click)="loadNext()" [attr.aria-label]="'addon.calendar.daynext' | translate">
+                        <ion-icon name="fas-chevron-right" slot="icon-only" aria-hidden="true"></ion-icon>
+                    </ion-button>
+                </ion-col>
+            </ion-row>
+        </ion-grid>
 
-    <core-loading [hideUntil]="loaded" class="safe-area-padding">
-        <!-- There is data to be synchronized -->
-        <ion-card class="core-warning-card" *ngIf="hasOffline">
-            <ion-item>
-                <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
-                <ion-label>{{ 'core.hasdatatosync' | translate:{$a: 'core.day' | translate} }}</ion-label>
-            </ion-item>
-        </ion-card>
+        <core-swipe-slides [manager]="manager" (onWillChange)="slideChanged($event)">
+            <ng-template let-item="item">
+                <core-loading [hideUntil]="item.loaded" class="safe-area-padding">
+                    <!-- There is data to be synchronized -->
+                    <ion-card class="core-warning-card" *ngIf="item.hasOffline">
+                        <ion-item>
+                            <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
+                            <ion-label>{{ 'core.hasdatatosync' | translate:{$a: 'core.day' | translate} }}</ion-label>
+                        </ion-item>
+                    </ion-card>
 
-        <core-empty-box *ngIf="!filteredEvents || !filteredEvents.length" icon="fas-calendar" inline="true"
-            [message]="'addon.calendar.noevents' | translate">
-        </core-empty-box>
+                    <core-empty-box *ngIf="!item.filteredEvents || !item.filteredEvents.length" icon="fas-calendar" inline="true"
+                        [message]="'addon.calendar.noevents' | translate">
+                    </core-empty-box>
 
-        <ion-list *ngIf="filteredEvents && filteredEvents.length" class="ion-no-margin">
-            <ng-container *ngFor="let event of filteredEvents">
-                <ion-item class="addon-calendar-event ion-text-wrap" [attr.aria-label]="event.name" (click)="gotoEvent(event.id)"
-                    [class.item-dimmed]="event.ispast" [ngClass]="['addon-calendar-eventtype-'+event.eventtype]" button detail="true">
-                    <core-mod-icon *ngIf="event.moduleIcon" [modicon]="event.moduleIcon" slot="start" [showAlt]="false"
-                        [modname]="event.modname" [componentId]="event.instance">
-                    </core-mod-icon>
-                    <ion-icon *ngIf="event.eventIcon && !event.moduleIcon" [name]="event.eventIcon" slot="start" aria-hidden="true">
-                    </ion-icon>
-                    <ion-label>
-                        <!-- Add the icon title so accessibility tools read it. -->
-                        <span class="sr-only">
-                            {{ 'addon.calendar.type' + event.formattedType | translate }}
-                            <span class="sr-only" *ngIf="event.moduleIcon && event.iconTitle">{{ event.iconTitle }}</span>
-                        </span>
-                        <p class="item-heading">
-                            <core-format-text [text]="event.name" [contextLevel]="event.contextLevel"
-                                [contextInstanceId]="event.contextInstanceId"></core-format-text>
-                        </p>
-                        <p [innerHTML]="event.formattedtime"></p>
-                    </ion-label>
-                    <ion-note *ngIf="event.offline && !event.deleted" slot="end">
-                        <ion-icon name="fas-clock" aria-hidden="true"></ion-icon>
-                        <span class="ion-text-wrap">{{ 'core.notsent' | translate }}</span>
-                    </ion-note>
-                    <ion-note *ngIf="event.deleted" slot="end">
-                        <ion-icon name="fas-trash" aria-hidden="true"></ion-icon>
-                        <span class="ion-text-wrap">{{ 'core.deletedoffline' | translate }}</span>
-                    </ion-note>
-                </ion-item>
-            </ng-container>
-        </ion-list>
+                    <ion-list *ngIf="item.filteredEvents && item.filteredEvents.length" class="ion-no-margin">
+                        <ng-container *ngFor="let event of item.filteredEvents">
+                            <ion-item class="addon-calendar-event ion-text-wrap" [attr.aria-label]="event.name"
+                                (click)="gotoEvent(event.id)" [class.item-dimmed]="event.ispast"
+                                [ngClass]="['addon-calendar-eventtype-'+event.eventtype]" button detail="true">
+                                <core-mod-icon *ngIf="event.moduleIcon" [modicon]="event.moduleIcon" slot="start" [showAlt]="false"
+                                    [modname]="event.modname" [componentId]="event.instance">
+                                </core-mod-icon>
+                                <ion-icon *ngIf="event.eventIcon && !event.moduleIcon" [name]="event.eventIcon" slot="start"
+                                    aria-hidden="true">
+                                </ion-icon>
+                                <ion-label>
+                                    <!-- Add the icon title so accessibility tools read it. -->
+                                    <span class="sr-only">
+                                        {{ 'addon.calendar.type' + event.formattedType | translate }}
+                                        <span class="sr-only" *ngIf="event.moduleIcon && event.iconTitle">{{ event.iconTitle }}</span>
+                                    </span>
+                                    <p class="item-heading">
+                                        <core-format-text [text]="event.name" [contextLevel]="event.contextLevel"
+                                            [contextInstanceId]="event.contextInstanceId"></core-format-text>
+                                    </p>
+                                    <p [innerHTML]="event.formattedtime"></p>
+                                </ion-label>
+                                <ion-note *ngIf="event.offline && !event.deleted" slot="end">
+                                    <ion-icon name="fas-clock" aria-hidden="true"></ion-icon>
+                                    <span class="ion-text-wrap">{{ 'core.notsent' | translate }}</span>
+                                </ion-note>
+                                <ion-note *ngIf="event.deleted" slot="end">
+                                    <ion-icon name="fas-trash" aria-hidden="true"></ion-icon>
+                                    <span class="ion-text-wrap">{{ 'core.deletedoffline' | translate }}</span>
+                                </ion-note>
+                            </ion-item>
+                        </ng-container>
+                    </ion-list>
+                </core-loading>
+            </ng-template>
+        </core-swipe-slides>
     </core-loading>
 
     <!-- Create a calendar event. -->
diff --git a/src/addons/calendar/pages/day/day.page.ts b/src/addons/calendar/pages/day/day.page.ts
index 19963cb62..86039c369 100644
--- a/src/addons/calendar/pages/day/day.page.ts
+++ b/src/addons/calendar/pages/day/day.page.ts
@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, OnInit, OnDestroy } from '@angular/core';
+import { Component, OnInit, OnDestroy, ViewChild } from '@angular/core';
 import { IonRefresher } from '@ionic/angular';
 import { CoreApp } from '@services/app';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreLocalNotifications } from '@services/local-notifications';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
-import { CoreTimeUtils } from '@services/utils/time';
+import { CoreTimeUtils, YearMonthDay } from '@services/utils/time';
 import {
     AddonCalendarProvider,
     AddonCalendar,
@@ -40,6 +40,12 @@ import { Params } from '@angular/router';
 import { Subscription } from 'rxjs';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreConstants } from '@/core/constants';
+import { CoreSwipeSlidesDynamicItemsManager } from '@classes/items-management/slides-dynamic-items-manager';
+import { CoreSwipeCurrentItemData, CoreSwipeSlidesComponent } from '@components/swipe-slides/swipe-slides';
+import {
+    CoreSwipeSlidesDynamicItem,
+    CoreSwipeSlidesDynamicItemsManagerSource,
+} from '@classes/items-management/slides-dynamic-items-manager-source';
 
 /**
  * Page that displays the calendar events for a certain day.
@@ -51,20 +57,9 @@ import { CoreConstants } from '@/core/constants';
 })
 export class AddonCalendarDayPage implements OnInit, OnDestroy {
 
-    protected currentSiteId: string;
-    protected year!: number;
-    protected month!: number;
-    protected day!: number;
-    protected categories: { [id: number]: CoreCategoryData } = {};
-    protected events: AddonCalendarEventToDisplay[] = []; // Events (both online and offline).
-    protected onlineEvents: AddonCalendarEventToDisplay[] = [];
-    protected offlineEvents: { [monthId: string]: { [day: number]: AddonCalendarEventToDisplay[] } } =
-        {}; // Offline events classified in month & day.
+    @ViewChild(CoreSwipeSlidesComponent) slides?: CoreSwipeSlidesComponent<PreloadedDay>;
 
-    protected offlineEditedEventsIds: number[] = []; // IDs of events edited in offline.
-    protected deletedEvents: number[] = []; // Events deleted in offline.
-    protected timeFormat?: string;
-    protected currentTime!: number;
+    protected currentSiteId: string;
 
     // Observers.
     protected newEventObserver: CoreEventObserver;
@@ -79,16 +74,11 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
     protected filterChangedObserver: CoreEventObserver;
 
     periodName?: string;
-    filteredEvents: AddonCalendarEventToDisplay [] = [];
-    canCreate = false;
-    courses: Partial<CoreEnrolledCourseData>[] = [];
+    manager?: CoreSwipeSlidesDynamicItemsManager<PreloadedDay, AddonCalendarDaySlidesItemsManagerSource>;
     loaded = false;
-    hasOffline = false;
     isOnline = false;
     syncIcon = CoreConstants.ICON_LOADING;
     isCurrentDay = false;
-    isPastDay = false;
-    currentMoment!: moment.Moment;
     filter: AddonCalendarFilter = {
         filtered: false,
         courseId: undefined,
@@ -106,7 +96,9 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
         if (CoreLocalNotifications.isAvailable()) {
             // Re-schedule events if default time changes.
             this.obsDefaultTimeChange = CoreEvents.on(AddonCalendarProvider.DEFAULT_NOTIFICATION_TIME_CHANGED, () => {
-                AddonCalendar.scheduleEventsNotifications(this.onlineEvents);
+                this.manager?.getSource().getItems()?.forEach(day => {
+                    AddonCalendar.scheduleEventsNotifications(day.onlineEvents);
+                });
             }, this.currentSiteId);
         }
 
@@ -115,7 +107,7 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
             AddonCalendarProvider.NEW_EVENT_EVENT,
             (data) => {
                 if (data && data.eventId) {
-                    this.loaded = false;
+                    this.manager?.getSource().markAllItemsUnloaded();
                     this.refreshData(true, true);
                 }
             },
@@ -124,7 +116,7 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
 
         // Listen for new event discarded event. When it does, reload the data.
         this.discardedObserver = CoreEvents.on(AddonCalendarProvider.NEW_EVENT_DISCARDED_EVENT, () => {
-            this.loaded = false;
+            this.manager?.getSource().markAllItemsUnloaded();
             this.refreshData(true, true);
         }, this.currentSiteId);
 
@@ -133,7 +125,7 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
             AddonCalendarProvider.EDIT_EVENT_EVENT,
             (data) => {
                 if (data && data.eventId) {
-                    this.loaded = false;
+                    this.manager?.getSource().markAllItemsUnloaded();
                     this.refreshData(true, true);
                 }
             },
@@ -142,14 +134,16 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
 
         // Refresh data if calendar events are synchronized automatically.
         this.syncObserver = CoreEvents.on(AddonCalendarSyncProvider.AUTO_SYNCED, () => {
-            this.loaded = false;
+            this.manager?.getSource().markAllItemsUnloaded();
             this.refreshData(false, true);
         }, this.currentSiteId);
 
         // Refresh data if calendar events are synchronized manually but not by this page.
         this.manualSyncObserver = CoreEvents.on(AddonCalendarSyncProvider.MANUAL_SYNCED, (data) => {
-            if (data && (data.source != 'day' || data.year != this.year || data.month != this.month || data.day != this.day)) {
-                this.loaded = false;
+            const visibleDay = this.slides?.getCurrentItem();
+            if (data && (data.source != 'day' || !visibleDay || data.day === undefined || data.year != visibleDay.year ||
+                    data.month != visibleDay.monthNumber || data.day != visibleDay.dayNumber)) {
+                this.manager?.getSource().markAllItemsUnloaded();
                 this.refreshData(false, true);
             }
         }, this.currentSiteId);
@@ -160,10 +154,9 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
             (data) => {
                 if (data && !data.sent) {
                     // Event was deleted in offline. Just mark it as deleted, no need to refresh.
-                    this.hasOffline = this.markAsDeleted(data.eventId, true) || this.hasOffline;
-                    this.deletedEvents.push(data.eventId);
+                    this.manager?.getSource().markAsDeleted(data.eventId, true);
                 } else {
-                    this.loaded = false;
+                    this.manager?.getSource().markAllItemsUnloaded();
                     this.refreshData(false, true);
                 }
             },
@@ -179,26 +172,7 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
                 }
 
                 // Mark it as undeleted, no need to refresh.
-                const found = this.markAsDeleted(data.eventId, false);
-
-                // Remove it from the list of deleted events if it's there.
-                const index = this.deletedEvents.indexOf(data.eventId);
-                if (index != -1) {
-                    this.deletedEvents.splice(index, 1);
-                }
-
-                if (found) {
-                // The deleted event belongs to current list. Re-calculate "hasOffline".
-                    this.hasOffline = false;
-
-                    if (this.events.length != this.onlineEvents.length) {
-                        this.hasOffline = true;
-                    } else {
-                        const event = this.events.find((event) => event.deleted || event.offline);
-
-                        this.hasOffline = !!event;
-                    }
-                }
+                this.manager?.getSource().markAsDeleted(data.eventId, false);
             },
             this.currentSiteId,
         );
@@ -209,9 +183,9 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
                 this.filter = data;
 
                 // Course viewed has changed, check if the user can create events for this course calendar.
-                this.canCreate = await AddonCalendarHelper.canEditEvents(this.filter.courseId);
+                await this.manager?.getSource().loadCanCreate(this.filter.courseId);
 
-                this.filterEvents();
+                this.manager?.getSource().filterAllDayEvents(this.filter);
             },
         );
 
@@ -240,17 +214,27 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
 
         this.filter.filtered = typeof this.filter.courseId != 'undefined' || types.some((name) => !this.filter[name]);
 
-        const now = new Date();
-        this.year = CoreNavigator.getRouteNumberParam('year') || now.getFullYear();
-        this.month = CoreNavigator.getRouteNumberParam('month') || (now.getMonth() + 1);
-        this.day = CoreNavigator.getRouteNumberParam('day') || now.getDate();
+        const currentDay = CoreTimeUtils.getCurrentDay();
+        const source = new AddonCalendarDaySlidesItemsManagerSource(this, {
+            year: CoreNavigator.getRouteNumberParam('year') ?? currentDay.year,
+            monthNumber: CoreNavigator.getRouteNumberParam('month') ?? currentDay.monthNumber,
+            dayNumber: CoreNavigator.getRouteNumberParam('day') ?? currentDay.dayNumber,
+        });
+        this.manager = new CoreSwipeSlidesDynamicItemsManager(source);
 
-        this.calculateCurrentMoment();
         this.calculateIsCurrentDay();
 
         this.fetchData(true);
     }
 
+    get canCreate(): boolean {
+        return this.manager?.getSource().canCreate || false;
+    }
+
+    get timeFormat(): string {
+        return this.manager?.getSource().timeFormat || 'core.strftimetime';
+    }
+
     /**
      * Fetch all the data required for the view.
      *
@@ -259,7 +243,6 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
      * @return Promise resolved when done.
      */
     async fetchData(sync?: boolean): Promise<void> {
-
         this.syncIcon = CoreConstants.ICON_LOADING;
         this.isOnline = CoreApp.isOnline();
 
@@ -268,53 +251,9 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
         }
 
         try {
-            const promises: Promise<void>[] = [];
+            await this.manager?.getSource().fetchData(this.filter.courseId);
 
-            // Load courses for the popover.
-            promises.push(CoreCoursesHelper.getCoursesForPopover(this.filter.courseId).then((data) => {
-                this.courses = data.courses;
-
-                return;
-            }));
-
-            // Get categories.
-            promises.push(this.loadCategories());
-
-            // Get offline events.
-            promises.push(AddonCalendarOffline.getAllEditedEvents().then((offlineEvents) => {
-                // Classify them by month & day.
-                this.offlineEvents = AddonCalendarHelper.classifyIntoMonths(offlineEvents);
-
-                // Get the IDs of events edited in offline.
-                this.offlineEditedEventsIds = offlineEvents.filter((event) => event.id > 0).map((event) => event.id);
-
-                return;
-            }));
-
-            // Get events deleted in offline.
-            promises.push(AddonCalendarOffline.getAllDeletedEventsIds().then((ids) => {
-                this.deletedEvents = ids;
-
-                return;
-            }));
-
-            // Check if user can create events.
-            promises.push(AddonCalendarHelper.canEditEvents(this.filter.courseId).then((canEdit) => {
-                this.canCreate = canEdit;
-
-                return;
-            }));
-
-            // Get user preferences.
-            promises.push(AddonCalendar.getCalendarTimeFormat().then((value) => {
-                this.timeFormat = value;
-
-                return;
-            }));
-
-            await Promise.all(promises);
-
-            await this.fetchEvents();
+            await this.manager?.getSource().load(this.manager?.getSelectedItem());
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'addon.calendar.errorloadevents', true);
         }
@@ -324,104 +263,14 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
     }
 
     /**
-     * Fetch the events for current day.
-     *
-     * @return Promise resolved when done.
+     * Update data related to day being viewed.
      */
-    async fetchEvents(): Promise<void> {
-        let result: AddonCalendarCalendarDay;
-        try {
-            // Don't pass courseId and categoryId, we'll filter them locally.
-            result = await AddonCalendar.getDayEvents(this.year, this.month, this.day);
-            this.onlineEvents = await Promise.all(result.events.map((event) => AddonCalendarHelper.formatEventData(event)));
-        } catch (error) {
-            if (CoreApp.isOnline()) {
-                throw error;
-            }
-            // Allow navigating to non-cached days in offline (behave as if using emergency cache).
-            this.onlineEvents = [];
-        }
-
-        // Calculate the period name. We don't use the one in result because it's in server's language.
+    viewDay(day: YearMonthDay): void {
         this.periodName = CoreTimeUtils.userDate(
-            new Date(this.year, this.month - 1, this.day).getTime(),
+            new Date(day.year, day.monthNumber - 1, day.dayNumber).getTime(),
             'core.strftimedaydate',
         );
-
-        // Schedule notifications for the events retrieved (only future events will be scheduled).
-        AddonCalendar.scheduleEventsNotifications(this.onlineEvents);
-        // Merge the online events with offline data.
-        this.events = this.mergeEvents();
-        // Filter events by course.
-        this.filterEvents();
         this.calculateIsCurrentDay();
-        // Re-calculate the formatted time so it uses the device date.
-        const dayTime = this.currentMoment.unix() * 1000;
-
-        const promises = this.events.map((event) => {
-            event.ispast = this.isPastDay || (this.isCurrentDay && this.isEventPast(event));
-
-            return AddonCalendar.formatEventTime(event, this.timeFormat, true, dayTime).then((time) => {
-                event.formattedtime = time;
-
-                return;
-            });
-        });
-
-        await Promise.all(promises);
-    }
-
-    /**
-     * Merge online events with the offline events of that period.
-     *
-     * @return Merged events.
-     */
-    protected mergeEvents(): AddonCalendarEventToDisplay[] {
-        this.hasOffline = false;
-
-        if (!Object.keys(this.offlineEvents).length && !this.deletedEvents.length) {
-            // No offline events, nothing to merge.
-            return this.onlineEvents;
-        }
-
-        const monthOfflineEvents = this.offlineEvents[AddonCalendarHelper.getMonthId(this.year, this.month)];
-        const dayOfflineEvents = monthOfflineEvents && monthOfflineEvents[this.day];
-        let result = this.onlineEvents;
-
-        if (this.deletedEvents.length) {
-            // Mark as deleted the events that were deleted in offline.
-            result.forEach((event) => {
-                event.deleted = this.deletedEvents.indexOf(event.id) != -1;
-
-                if (event.deleted) {
-                    this.hasOffline = true;
-                }
-            });
-        }
-
-        if (this.offlineEditedEventsIds.length) {
-            // Remove the online events that were modified in offline.
-            result = result.filter((event) => this.offlineEditedEventsIds.indexOf(event.id) == -1);
-
-            if (result.length != this.onlineEvents.length) {
-                this.hasOffline = true;
-            }
-        }
-
-        if (dayOfflineEvents && dayOfflineEvents.length) {
-            // Add the offline events (either new or edited).
-            this.hasOffline = true;
-            result = AddonCalendarHelper.sortEvents(result.concat(dayOfflineEvents));
-        }
-
-        return result;
-    }
-
-    /**
-     * Filter events based on the filter popover.
-     */
-    protected filterEvents(): void {
-        this.filteredEvents = AddonCalendarHelper.getFilteredEvents(this.events, this.filter, this.categories);
     }
 
     /**
@@ -452,37 +301,12 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
     async refreshData(sync?: boolean, afterChange?: boolean): Promise<void> {
         this.syncIcon = CoreConstants.ICON_LOADING;
 
-        const promises: Promise<void>[] = [];
+        const visibleDay = this.slides?.getCurrentItem() || null;
 
         // Don't invalidate day events after a change, it has already been handled.
-        if (!afterChange) {
-            promises.push(AddonCalendar.invalidateDayEvents(this.year, this.month, this.day));
-        }
-        promises.push(AddonCalendar.invalidateAllowedEventTypes());
-        promises.push(CoreCourses.invalidateCategories(0, true));
-        promises.push(AddonCalendar.invalidateTimeFormat());
+        await this.manager?.getSource().invalidateContent(visibleDay, !afterChange);
 
-        await Promise.all(promises).finally(() =>
-            this.fetchData(sync));
-    }
-
-    /**
-     * Load categories to be able to filter events.
-     *
-     * @return Promise resolved when done.
-     */
-    protected async loadCategories(): Promise<void> {
-        try {
-            const cats = await CoreCourses.getCategories(0, true);
-            this.categories = {};
-
-            // Index categories by ID.
-            cats.forEach((category) => {
-                this.categories[category.id] = category;
-            });
-        } catch {
-            // Ignore errors.
-        }
+        await this.fetchData(sync);
     }
 
     /**
@@ -501,11 +325,16 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
 
             if (result.updated) {
                 // Trigger a manual sync event.
+                const visibleDay = this.slides?.getCurrentItem();
                 result.source = 'day';
-                result.day = this.day;
-                result.month = this.month;
-                result.year = this.year;
 
+                if (visibleDay) {
+                    result.day = visibleDay.dayNumber;
+                    result.month = visibleDay.monthNumber;
+                    result.year = visibleDay.year;
+                }
+
+                this.manager?.getSource().markAllItemsUnloaded();
                 CoreEvents.trigger(AddonCalendarSyncProvider.MANUAL_SYNCED, result, this.currentSiteId);
             }
         } catch (error) {
@@ -533,7 +362,7 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
         await CoreDomUtils.openPopover({
             component: AddonCalendarFilterPopoverComponent,
             componentProps: {
-                courses: this.courses,
+                courses: this.manager?.getSource().courses,
                 filter: this.filter,
             },
             event,
@@ -551,7 +380,12 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
         if (!eventId) {
             // It's a new event, set the time.
             eventId = 0;
-            params.timestamp = moment().year(this.year).month(this.month - 1).date(this.day).unix() * 1000;
+
+            const visibleDay = this.slides?.getCurrentItem();
+            if (visibleDay) {
+                params.timestamp = moment().year(visibleDay.year).month(visibleDay.monthNumber - 1).date(visibleDay.dayNumber)
+                    .unix() * 1000;
+            }
         }
 
         if (this.filter.courseId) {
@@ -561,141 +395,76 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
         CoreNavigator.navigateToSitePath(`/calendar/edit/${eventId}`, { params });
     }
 
-    /**
-     * Calculate current moment.
-     */
-    calculateCurrentMoment(): void {
-        this.currentMoment = moment().year(this.year).month(this.month - 1).date(this.day);
-    }
-
     /**
      * Check if user is viewing the current day.
      */
     calculateIsCurrentDay(): void {
-        const now = new Date();
+        const visibleDay = this.slides?.getCurrentItem();
+        if (!visibleDay) {
+            return;
+        }
 
-        this.currentTime = CoreTimeUtils.timestamp();
+        this.isCurrentDay = visibleDay.isCurrentDay;
+    }
 
-        this.isCurrentDay = this.year == now.getFullYear() && this.month == now.getMonth() + 1 && this.day == now.getDate();
-        this.isPastDay = this.year < now.getFullYear() || (this.year == now.getFullYear() && this.month < now.getMonth()) ||
-            (this.year == now.getFullYear() && this.month == now.getMonth() + 1 && this.day < now.getDate());
+    /**
+     * Check whether visible day has offline data.
+     *
+     * @return Whether visible day has offline data.
+     */
+    visibleDayHasOffline(): boolean {
+        const visibleDay = this.slides?.getCurrentItem();
+
+        return !!visibleDay && visibleDay.hasOffline;
     }
 
     /**
      * Go to current day.
      */
     async goToCurrentDay(): Promise<void> {
-        const now = new Date();
-        const initialDay = this.day;
-        const initialMonth = this.month;
-        const initialYear = this.year;
-
-        this.day = now.getDate();
-        this.month = now.getMonth() + 1;
-        this.year = now.getFullYear();
-        this.calculateCurrentMoment();
+        const manager = this.manager;
+        const slides = this.slides;
+        if (!manager || !slides) {
+            return;
+        }
 
+        const currentDay = CoreTimeUtils.getCurrentDay();
         this.loaded = false;
 
         try {
-            await this.fetchEvents();
+            // Make sure the day is loaded.
+            await manager.getSource().loadItem(currentDay);
 
+            slides.slideToItem(currentDay);
             this.isCurrentDay = true;
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'addon.calendar.errorloadevents', true);
-
-            this.year = initialYear;
-            this.month = initialMonth;
-            this.day = initialDay;
-            this.calculateCurrentMoment();
+        } finally {
+            this.loaded = true;
         }
-
-        this.loaded = true;
     }
 
     /**
      * Load next day.
      */
     async loadNext(): Promise<void> {
-        this.increaseDay();
-
-        this.loaded = false;
-
-        try {
-            await this.fetchEvents();
-        } catch (error) {
-            CoreDomUtils.showErrorModalDefault(error, 'addon.calendar.errorloadevents', true);
-            this.decreaseDay();
-        }
-        this.loaded = true;
+        this.slides?.slideNext();
     }
 
     /**
      * Load previous day.
      */
     async loadPrevious(): Promise<void> {
-        this.decreaseDay();
-
-        this.loaded = false;
-
-        try {
-            await this.fetchEvents();
-        } catch (error) {
-            CoreDomUtils.showErrorModalDefault(error, 'addon.calendar.errorloadevents', true);
-            this.increaseDay();
-        }
-        this.loaded = true;
+        this.slides?.slidePrev();
     }
 
     /**
-     * Decrease the current day.
-     */
-    protected decreaseDay(): void {
-        this.currentMoment.subtract(1, 'day');
-
-        this.year = this.currentMoment.year();
-        this.month = this.currentMoment.month() + 1;
-        this.day = this.currentMoment.date();
-    }
-
-    /**
-     * Increase the current day.
-     */
-    protected increaseDay(): void {
-        this.currentMoment.add(1, 'day');
-
-        this.year = this.currentMoment.year();
-        this.month = this.currentMoment.month() + 1;
-        this.day = this.currentMoment.date();
-    }
-
-    /**
-     * Find an event and mark it as deleted.
+     * Slide has changed.
      *
-     * @param eventId Event ID.
-     * @param deleted Whether to mark it as deleted or not.
-     * @return Whether the event was found.
+     * @param data Data about new item.
      */
-    protected markAsDeleted(eventId: number, deleted: boolean): boolean {
-        const event = this.onlineEvents.find((event) => event.id == eventId);
-
-        if (event) {
-            event.deleted = deleted;
-
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns if the event is in the past or not.
-     *
-     * @param event Event object.
-     * @return True if it's in the past.
-     */
-    isEventPast(event: AddonCalendarEventToDisplay): boolean {
-        return (event.timestart + event.timeduration) < this.currentTime;
+    slideChanged(data: CoreSwipeCurrentItemData<PreloadedDay>): void {
+        this.viewDay(data.item);
     }
 
     /**
@@ -715,3 +484,359 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
     }
 
 }
+
+/**
+ * Preloaded month.
+ */
+type PreloadedDay = YearMonthDay & CoreSwipeSlidesDynamicItem & {
+    events: AddonCalendarEventToDisplay[]; // Events (both online and offline).
+    onlineEvents: AddonCalendarEventToDisplay[];
+    filteredEvents: AddonCalendarEventToDisplay[];
+    isCurrentDay: boolean;
+    isPastDay: boolean;
+    hasOffline: boolean; // Whether the day has offline data.
+};
+
+/**
+ * Helper to manage swiping within days.
+ */
+class AddonCalendarDaySlidesItemsManagerSource extends CoreSwipeSlidesDynamicItemsManagerSource<PreloadedDay> {
+
+    courses: Partial<CoreEnrolledCourseData>[] = [];
+    // Offline events classified in month & day.
+    offlineEvents: Record<string, Record<number, AddonCalendarEventToDisplay[]>> = {};
+    offlineEditedEventsIds: number[] = []; // IDs of events edited in offline.
+    categories: { [id: number]: CoreCategoryData } = {};
+    deletedEvents: number[] = []; // Events deleted in offline.
+    timeFormat?: string;
+    canCreate = false;
+
+    protected dayPage: AddonCalendarDayPage;
+    protected categoriesRetrieved = false;
+
+    constructor(page: AddonCalendarDayPage, initialDay: YearMonthDay) {
+        super(initialDay);
+
+        this.dayPage = page;
+    }
+
+    /**
+     * Fetch data.
+     *
+     * @param courseId Current selected course id (if any).
+     * @return Promise resolved when done.
+     */
+    async fetchData(courseId?: number): Promise<void> {
+        await Promise.all([
+            this.loadCourses(courseId),
+            this.loadCanCreate(courseId),
+            this.loadCategories(),
+            this.loadOfflineEvents(),
+            this.loadOfflineDeletedEvents(),
+            this.loadTimeFormat(),
+        ]);
+    }
+
+    /**
+     * Filter all loaded days events based on the filter popover.
+     *
+     * @param filter Filter to apply.
+     */
+    filterAllDayEvents(filter: AddonCalendarFilter): void {
+        this.getItems()?.forEach(day => this.filterEvents(day, filter));
+    }
+
+    /**
+     * Filter events of a certain day based on the filter popover.
+     *
+     * @param day Day with the events.
+     * @param filter Filter to apply.
+     */
+    filterEvents(day: PreloadedDay, filter: AddonCalendarFilter): void {
+        day.filteredEvents = AddonCalendarHelper.getFilteredEvents(day.events, filter, this.categories);
+    }
+
+    /**
+     * Load courses.
+     *
+     * @param courseId Current selected course id (if any).
+     * @return Promise resolved when done.
+     */
+    async loadCourses(courseId?: number): Promise<void> {
+        const data = await CoreCoursesHelper.getCoursesForPopover(courseId);
+
+        this.courses = data.courses;
+    }
+
+    /**
+     * Load whether user can create events.
+     *
+     * @param courseId Current selected course id (if any).
+     * @return Promise resolved when done.
+     */
+    async loadCanCreate(courseId?: number): Promise<void> {
+        this.canCreate = await AddonCalendarHelper.canEditEvents(courseId);
+    }
+
+    /**
+     * Load categories to be able to filter events.
+     *
+     * @return Promise resolved when done.
+     */
+    async loadCategories(): Promise<void> {
+        if (this.categoriesRetrieved) {
+            // Already retrieved, stop.
+            return;
+        }
+
+        try {
+            const cats = await CoreCourses.getCategories(0, true);
+            this.categoriesRetrieved = true;
+            this.categories = {};
+
+            // Index categories by ID.
+            cats.forEach((category) => {
+                this.categories[category.id] = category;
+            });
+        } catch {
+            // Ignore errors.
+        }
+    }
+
+    /**
+     * Load events created or edited in offline.
+     *
+     * @return Promise resolved when done.
+     */
+    async loadOfflineEvents(): Promise<void> {
+        // Get offline events.
+        const events = await AddonCalendarOffline.getAllEditedEvents();
+
+        // Classify them by month & day.
+        this.offlineEvents = AddonCalendarHelper.classifyIntoMonths(events);
+
+        // Get the IDs of events edited in offline.
+        this.offlineEditedEventsIds = events.filter((event) => event.id > 0).map((event) => event.id);
+    }
+
+    /**
+     * Load events deleted in offline.
+     *
+     * @return Promise resolved when done.
+     */
+    async loadOfflineDeletedEvents(): Promise<void> {
+        this.deletedEvents = await AddonCalendarOffline.getAllDeletedEventsIds();
+    }
+
+    /**
+     * Load time format.
+     *
+     * @return Promise resolved when done.
+     */
+    async loadTimeFormat(): Promise<void> {
+        this.timeFormat = await AddonCalendar.getCalendarTimeFormat();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    getItemId(item: YearMonthDay): string | number {
+        return AddonCalendarHelper.getDayId(item);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    getPreviousItem(item: YearMonthDay): YearMonthDay | null {
+        return CoreTimeUtils.getPreviousDay(item);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    getNextItem(item: YearMonthDay): YearMonthDay | null {
+        return CoreTimeUtils.getNextDay(item);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async loadItemData(day: YearMonthDay, preload = false): Promise<PreloadedDay | null> {
+        const preloadedDay: PreloadedDay = {
+            ...day,
+            hasOffline: false,
+            events: [],
+            onlineEvents: [],
+            filteredEvents: [],
+            isCurrentDay: CoreTimeUtils.isSameDay(day, CoreTimeUtils.getCurrentDay()),
+            isPastDay: CoreTimeUtils.isPastDay(day),
+        };
+
+        if (preload) {
+            return preloadedDay;
+        }
+
+        let result: AddonCalendarCalendarDay;
+
+        try {
+            // Don't pass courseId and categoryId, we'll filter them locally.
+            result = await AddonCalendar.getDayEvents(day.year, day.monthNumber, day.dayNumber);
+            preloadedDay.onlineEvents = await Promise.all(
+                result.events.map((event) => AddonCalendarHelper.formatEventData(event)),
+            );
+        } catch (error) {
+            // Allow navigating to non-cached days in offline (behave as if using emergency cache).
+            if (CoreApp.isOnline()) {
+                throw error;
+            }
+        }
+
+        // Schedule notifications for the events retrieved (only future events will be scheduled).
+        AddonCalendar.scheduleEventsNotifications(preloadedDay.onlineEvents);
+
+        // Merge the online events with offline data.
+        preloadedDay.events = this.mergeEvents(preloadedDay);
+
+        // Filter events by course.
+        this.filterEvents(preloadedDay, this.dayPage.filter);
+
+        // Re-calculate the formatted time so it uses the device date.
+        const dayTime = moment().year(day.year).month(day.monthNumber - 1).date(day.dayNumber).unix() * 1000;
+        const currentTime = CoreTimeUtils.timestamp();
+
+        const promises = preloadedDay.events.map(async (event) => {
+            event.ispast = preloadedDay.isPastDay || (preloadedDay.isCurrentDay && this.isEventPast(event, currentTime));
+            event.formattedtime = await AddonCalendar.formatEventTime(event, this.dayPage.timeFormat, true, dayTime);
+        });
+
+        await Promise.all(promises);
+
+        return preloadedDay;
+    }
+
+    /**
+     * Returns if the event is in the past or not.
+     *
+     * @param event Event object.
+     * @param currentTime Current time.
+     * @return True if it's in the past.
+     */
+    isEventPast(event: AddonCalendarEventToDisplay, currentTime: number): boolean {
+        return (event.timestart + event.timeduration) < currentTime;
+    }
+
+    /**
+     * Merge online events with the offline events of that period.
+     *
+     * @param day Day with the events.
+     * @return Merged events.
+     */
+    mergeEvents(day: PreloadedDay): AddonCalendarEventToDisplay[] {
+        day.hasOffline = false;
+
+        if (!Object.keys(this.offlineEvents).length && !this.deletedEvents.length) {
+            // No offline events, nothing to merge.
+            return day.onlineEvents;
+        }
+
+        const monthOfflineEvents = this.offlineEvents[AddonCalendarHelper.getMonthId(day)];
+        const dayOfflineEvents = monthOfflineEvents && monthOfflineEvents[day.dayNumber];
+        let result = day.onlineEvents;
+
+        if (this.deletedEvents.length) {
+            // Mark as deleted the events that were deleted in offline.
+            result.forEach((event) => {
+                event.deleted = this.deletedEvents.indexOf(event.id) != -1;
+
+                if (event.deleted) {
+                    day.hasOffline = true;
+                }
+            });
+        }
+
+        if (this.offlineEditedEventsIds.length) {
+            // Remove the online events that were modified in offline.
+            result = result.filter((event) => this.offlineEditedEventsIds.indexOf(event.id) == -1);
+
+            if (result.length != day.onlineEvents.length) {
+                day.hasOffline = true;
+            }
+        }
+
+        if (dayOfflineEvents && dayOfflineEvents.length) {
+            // Add the offline events (either new or edited).
+            day.hasOffline = true;
+            result = AddonCalendarHelper.sortEvents(result.concat(dayOfflineEvents));
+        }
+
+        return result;
+    }
+
+    /**
+     * Invalidate content.
+     *
+     * @param visibleDay The current visible day.
+     * @param invalidateDayEvents Whether to invalidate visible day events.
+     * @return Promise resolved when done.
+     */
+    async invalidateContent(visibleDay: PreloadedDay | null, invalidateDayEvents?: boolean): Promise<void> {
+        const promises: Promise<void>[] = [];
+
+        if (invalidateDayEvents && visibleDay) {
+            promises.push(AddonCalendar.invalidateDayEvents(visibleDay.year, visibleDay.monthNumber, visibleDay.dayNumber));
+        }
+        promises.push(AddonCalendar.invalidateAllowedEventTypes());
+        promises.push(CoreCourses.invalidateCategories(0, true));
+        promises.push(AddonCalendar.invalidateTimeFormat());
+
+        this.categoriesRetrieved = false; // Get categories again.
+
+        if (visibleDay) {
+            visibleDay.dirty = true;
+        }
+
+        await Promise.all(promises);
+    }
+
+    /**
+     * Find an event and mark it as deleted.
+     *
+     * @param eventId Event ID.
+     * @param deleted Whether to mark it as deleted or not.
+     */
+    markAsDeleted(eventId: number, deleted: boolean): void {
+        // Mark the event as deleted or not.
+        this.getItems()?.some(day => {
+            const event = day.onlineEvents.find((event) => event.id == eventId);
+
+            if (!event) {
+                return false;
+            }
+
+            event.deleted = deleted;
+
+            if (deleted) {
+                day.hasOffline = true;
+            } else {
+                // Re-calculate "hasOffline".
+                day.hasOffline = day.events.length != day.onlineEvents.length ||
+                    day.events.some((event) => event.deleted || event.offline);
+            }
+
+            return true;
+        });
+
+        // Add it or remove it from the list of deleted events.
+        if (deleted) {
+            if (!this.deletedEvents.includes(eventId)) {
+                this.deletedEvents.push(eventId);
+            }
+        } else {
+            const index = this.deletedEvents.indexOf(eventId);
+            if (index != -1) {
+                this.deletedEvents.splice(index, 1);
+            }
+        }
+    }
+
+}
diff --git a/src/addons/calendar/pages/day/day.scss b/src/addons/calendar/pages/day/day.scss
index a2b9031b0..d3fdad33c 100644
--- a/src/addons/calendar/pages/day/day.scss
+++ b/src/addons/calendar/pages/day/day.scss
@@ -6,4 +6,8 @@
             font-size: 1.2rem;
         }
     }
+
+    core-swipe-slides {
+        --swipe-slides-min-height: calc(100% - 52px);
+    }
 }
diff --git a/src/addons/calendar/pages/index/index.page.ts b/src/addons/calendar/pages/index/index.page.ts
index f2c8fb51b..ba5d5366d 100644
--- a/src/addons/calendar/pages/index/index.page.ts
+++ b/src/addons/calendar/pages/index/index.page.ts
@@ -92,7 +92,7 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy {
             (data) => {
                 if (data && data.eventId) {
                     this.loaded = false;
-                    this.refreshData(true, false);
+                    this.refreshData(true, false, true);
                 }
             },
             this.currentSiteId,
@@ -101,7 +101,7 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy {
         // Listen for new event discarded event. When it does, reload the data.
         this.discardedObserver = CoreEvents.on(AddonCalendarProvider.NEW_EVENT_DISCARDED_EVENT, () => {
             this.loaded = false;
-            this.refreshData(true, false);
+            this.refreshData(true, false, true);
         }, this.currentSiteId);
 
         // Listen for events edited. When an event is edited, reload the data.
@@ -110,7 +110,7 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy {
             (data) => {
                 if (data && data.eventId) {
                     this.loaded = false;
-                    this.refreshData(true, false);
+                    this.refreshData(true, false, true);
                 }
             },
             this.currentSiteId,
@@ -119,21 +119,21 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy {
         // Refresh data if calendar events are synchronized automatically.
         this.syncObserver = CoreEvents.on(AddonCalendarSyncProvider.AUTO_SYNCED, () => {
             this.loaded = false;
-            this.refreshData(false, false);
+            this.refreshData(false, false, true);
         }, this.currentSiteId);
 
         // Refresh data if calendar events are synchronized manually but not by this page.
         this.manualSyncObserver = CoreEvents.on(AddonCalendarSyncProvider.MANUAL_SYNCED, (data) => {
             if (data && data.source != 'index') {
                 this.loaded = false;
-                this.refreshData(false, false);
+                this.refreshData(false, false, true);
             }
         }, this.currentSiteId);
 
         // Update the events when an event is deleted.
         this.deleteEventObserver = CoreEvents.on(AddonCalendarProvider.DELETED_EVENT_EVENT, () => {
             this.loaded = false;
-            this.refreshData(false, false);
+            this.refreshData(false, false, true);
         }, this.currentSiteId);
 
         // Update the "hasOffline" property if an event deleted in offline is restored.
@@ -278,7 +278,7 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy {
      * @param afterChange Whether the refresh is done after an event has changed or has been synced.
      * @return Promise resolved when done.
      */
-    async refreshData(sync = false, showErrors = false): Promise<void> {
+    async refreshData(sync = false, showErrors = false, afterChange = false): Promise<void> {
         this.syncIcon = CoreConstants.ICON_LOADING;
 
         const promises: Promise<void>[] = [];
@@ -287,7 +287,7 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy {
 
         // Refresh the sub-component.
         if (this.showCalendar && this.calendarComponent) {
-            promises.push(this.calendarComponent.refreshData());
+            promises.push(this.calendarComponent.refreshData(afterChange));
         } else if (!this.showCalendar && this.upcomingEventsComponent) {
             promises.push(this.upcomingEventsComponent.refreshData());
         }
diff --git a/src/addons/calendar/services/calendar-helper.ts b/src/addons/calendar/services/calendar-helper.ts
index d441b1c1d..74f588a7b 100644
--- a/src/addons/calendar/services/calendar-helper.ts
+++ b/src/addons/calendar/services/calendar-helper.ts
@@ -37,6 +37,7 @@ import { AddonCalendarSyncInvalidateEvent } from './calendar-sync';
 import { AddonCalendarOfflineEventDBRecord } from './database/calendar-offline';
 import { CoreCategoryData } from '@features/courses/services/courses';
 import { AddonCalendarReminderDBRecord } from './database/calendar';
+import { YearAndMonth, YearMonthDay } from '@services/utils/time';
 
 /**
  * Context levels enumeration.
@@ -140,7 +141,7 @@ export class AddonCalendarHelperProvider {
 
             // Add the event to all the days it lasts.
             while (!treatedDay.isAfter(endDay, 'day')) {
-                const monthId = this.getMonthId(treatedDay.year(), treatedDay.month() + 1);
+                const monthId = this.getMonthId({ year: treatedDay.year(), monthNumber: treatedDay.month() + 1 });
                 const day = treatedDay.date();
 
                 if (!result[monthId]) {
@@ -364,14 +365,23 @@ export class AddonCalendarHelperProvider {
     }
 
     /**
-     * Get the month "id" (year + month).
+     * Get the month "id".
      *
-     * @param year Year.
-     * @param month Month.
+     * @param month Month data.
      * @return The "id".
      */
-    getMonthId(year: number, month: number): string {
-        return year + '#' + month;
+    getMonthId(month: YearAndMonth): string {
+        return `${month.year}#${month.monthNumber}`;
+    }
+
+    /**
+     * Get the day "id".
+     *
+     * @param day Day data.
+     * @return The "id".
+     */
+    getDayId(day: YearMonthDay): string {
+        return `${day.year}#${day.monthNumber}#${day.dayNumber}`;
     }
 
     /**
@@ -650,7 +660,7 @@ export class AddonCalendarHelperProvider {
             fetchTimestarts.map((fetchTime) => {
                 const day = moment(new Date(fetchTime * 1000));
 
-                const monthId = this.getMonthId(day.year(), day.month() + 1);
+                const monthId = this.getMonthId({ year: day.year(), monthNumber: day.month() + 1 });
                 if (!treatedMonths[monthId]) {
                     // Month not refetch or invalidated already, do it now.
                     treatedMonths[monthId] = true;
@@ -686,7 +696,7 @@ export class AddonCalendarHelperProvider {
             invalidateTimestarts.map((fetchTime) => {
                 const day = moment(new Date(fetchTime * 1000));
 
-                const monthId = this.getMonthId(day.year(), day.month() + 1);
+                const monthId = this.getMonthId({ year: day.year(), monthNumber: day.month() + 1 });
                 if (!treatedMonths[monthId]) {
                     // Month not refetch or invalidated already, do it now.
                     treatedMonths[monthId] = true;
diff --git a/src/core/classes/items-management/slides-dynamic-items-manager-source.ts b/src/core/classes/items-management/slides-dynamic-items-manager-source.ts
index 9422f7514..a7324ebbc 100644
--- a/src/core/classes/items-management/slides-dynamic-items-manager-source.ts
+++ b/src/core/classes/items-management/slides-dynamic-items-manager-source.ts
@@ -17,15 +17,22 @@ import { CoreSwipeSlidesItemsManagerSource } from './slides-items-manager-source
 /**
  * Items collection source data for "swipe slides".
  */
-export abstract class CoreSwipeSlidesDynamicItemsManagerSource<Item = unknown> extends CoreSwipeSlidesItemsManagerSource<Item> {
+export abstract class CoreSwipeSlidesDynamicItemsManagerSource<Item extends CoreSwipeSlidesDynamicItem>
+    extends CoreSwipeSlidesItemsManagerSource<Item> {
+
+    // Items being loaded, to prevent loading them twice.
+    protected loadingItems: Record<string, boolean> = {};
 
     /**
      * @inheritdoc
      */
-    async load(): Promise<void> {
-        if (this.initialItem) {
+    async load(currentItem?: Partial<Item> | null): Promise<void> {
+        if (!this.initialized && this.initialItem) {
             // Load the initial item.
             await this.loadItem(this.initialItem);
+        } else if (this.initialized && currentItem) {
+            // Reload current item if needed.
+            await this.loadItem(currentItem);
         }
 
         this.setInitialized();
@@ -64,7 +71,7 @@ export abstract class CoreSwipeSlidesDynamicItemsManagerSource<Item = unknown> e
      * @return Promise resolved when done.
      */
     async loadItemInList(item: Partial<Item>, preload = false): Promise<void> {
-        const preloadedItem = await this.loadItemData(item, preload);
+        const preloadedItem = await this.performLoadItemData(item, preload);
         if (!preloadedItem) {
             return;
         }
@@ -113,6 +120,70 @@ export abstract class CoreSwipeSlidesDynamicItemsManagerSource<Item = unknown> e
         this.notifyItemsUpdated();
     }
 
+    /**
+     * Load or preload a certain item data.
+     * This helper function will check some common cases so they don't have to be replicated in all loadItemData implementations.
+     *
+     * @param item Basic data about the item to load.
+     * @param preload Whether to preload.
+     * @return Promise resolved with item. Resolve with null if already loading or item is not valid (e.g. there are no more items).
+     */
+    protected async performLoadItemData(item: Partial<Item>, preload: boolean): Promise<Item | null> {
+        const itemId = this.getItemId(item);
+
+        if (!itemId || this.loadingItems[itemId]) {
+            // Not valid or already loading, ignore it.
+            return null;
+        }
+
+        const existingItem = this.getItem(item);
+        if (existingItem && ((existingItem.loaded && !existingItem.dirty) || preload)) {
+            // Already loaded, or preloading an already preloaded item.
+            return existingItem;
+        }
+
+        // Load the item.
+        this.loadingItems[itemId] = true;
+
+        try {
+            const itemData = await this.loadItemData(item, preload);
+
+            if (itemData && !preload) {
+                itemData.loaded = true;
+                itemData.dirty = false;
+            }
+
+            if (existingItem && itemData) {
+                // Update item that is already in list.
+                Object.assign(existingItem, itemData);
+
+                return existingItem;
+            }
+
+            return itemData;
+        } finally {
+            this.loadingItems[itemId] = false;
+        }
+    }
+
+    /**
+     * Mark all items as dirty.
+     */
+    markAllItemsDirty(): void {
+        this.getItems()?.forEach(item => {
+            item.dirty = true;
+        });
+    }
+
+    /**
+     * Mark all items as not loaded.
+     */
+    markAllItemsUnloaded(): void {
+        this.getItems()?.forEach(item => {
+            item.loaded = false;
+        });
+    }
+
     /**
      * Load or preload a certain item data.
      *
@@ -139,3 +210,8 @@ export abstract class CoreSwipeSlidesDynamicItemsManagerSource<Item = unknown> e
     abstract getNextItem(item: Partial<Item>): Partial<Item> | null;
 
 }
+
+export type CoreSwipeSlidesDynamicItem = {
+    loaded?: boolean; // Whether the item has been loaded. This value can affect UI (e.g. to display a spinner).
+    dirty?: boolean; // Whether the item data needs to be reloaded. This value usually shouldn't affect UI.
+};
diff --git a/src/core/classes/items-management/slides-dynamic-items-manager.ts b/src/core/classes/items-management/slides-dynamic-items-manager.ts
index cacae1282..718e71389 100644
--- a/src/core/classes/items-management/slides-dynamic-items-manager.ts
+++ b/src/core/classes/items-management/slides-dynamic-items-manager.ts
@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { CoreSwipeSlidesDynamicItemsManagerSource } from './slides-dynamic-items-manager-source';
+import { CoreSwipeSlidesDynamicItem, CoreSwipeSlidesDynamicItemsManagerSource } from './slides-dynamic-items-manager-source';
 import { CoreSwipeSlidesItemsManager } from './slides-items-manager';
 
 /**
  * Helper class to manage items for core-swipe-slides.
  */
 export class CoreSwipeSlidesDynamicItemsManager<
-    Item = unknown,
+    Item extends CoreSwipeSlidesDynamicItem,
     Source extends CoreSwipeSlidesDynamicItemsManagerSource<Item> = CoreSwipeSlidesDynamicItemsManagerSource<Item>,
 > extends CoreSwipeSlidesItemsManager<Item, Source> {
 
diff --git a/src/core/components/swipe-slides/swipe-slides.scss b/src/core/components/swipe-slides/swipe-slides.scss
index 6b0b7043d..71cf2f9f6 100644
--- a/src/core/components/swipe-slides/swipe-slides.scss
+++ b/src/core/components/swipe-slides/swipe-slides.scss
@@ -1,4 +1,10 @@
 :host {
+    --swipe-slides-min-height: auto;
+
+    ion-slides {
+        min-height: var(--swipe-slides-min-height);
+    }
+
     ion-slide {
         display: block;
         font-size: inherit;
diff --git a/src/core/services/utils/time.ts b/src/core/services/utils/time.ts
index cd9c449f3..5c8e420de 100644
--- a/src/core/services/utils/time.ts
+++ b/src/core/services/utils/time.ts
@@ -396,16 +396,12 @@ export class CoreTimeUtilsProvider {
      * @return Previous month and its year.
      */
     getPreviousMonth(month: YearAndMonth): YearAndMonth {
-        if (month.monthNumber === 1) {
-            return {
-                monthNumber: 12,
-                year: month.year - 1,
-            };
-        }
+        const dayMoment = moment().year(month.year).month(month.monthNumber - 1);
+        dayMoment.subtract(1, 'month');
 
         return {
-            monthNumber: month.monthNumber - 1,
-            year: month.year,
+            year: dayMoment.year(),
+            monthNumber: dayMoment.month() + 1,
         };
     }
 
@@ -416,29 +412,27 @@ export class CoreTimeUtilsProvider {
      * @return Next month and its year.
      */
     getNextMonth(month: YearAndMonth): YearAndMonth {
-        if (month.monthNumber === 12) {
-            return {
-                monthNumber: 1,
-                year: month.year + 1,
-            };
-        }
+        const dayMoment = moment().year(month.year).month(month.monthNumber - 1);
+        dayMoment.add(1, 'month');
 
         return {
-            monthNumber: month.monthNumber + 1,
-            year: month.year,
+            year: dayMoment.year(),
+            monthNumber: dayMoment.month() + 1,
         };
     }
 
     /**
-     * Check if a certain month is current month.
+     * Get current month.
      *
-     * @param month Year and month.
-     * @return Whether it's current month.
+     * @return Current month.
      */
-    isCurrentMonth(month: YearAndMonth): boolean {
+    getCurrentMonth(): YearAndMonth {
         const now = new Date();
 
-        return month.year == now.getFullYear() && month.monthNumber == now.getMonth() + 1;
+        return {
+            year: now.getFullYear(),
+            monthNumber: now.getMonth() + 1,
+        };
     }
 
     /**
@@ -454,8 +448,6 @@ export class CoreTimeUtilsProvider {
     }
 
     /**
-     * Check if two months are the same.
-     *
      * @param monthA Month A.
      * @param monthB Month B.
      * @return Whether it's same month.
@@ -464,11 +456,94 @@ export class CoreTimeUtilsProvider {
         return monthA.monthNumber === monthB.monthNumber && monthA.year === monthB.year;
     }
 
+    /**
+     * Given a day data, return the previous day.
+     *
+     * @param day Day.
+     * @return Previous day.
+     */
+    getPreviousDay(day: YearMonthDay): YearMonthDay {
+        const dayMoment = moment().year(day.year).month(day.monthNumber - 1).date(day.dayNumber);
+        dayMoment.subtract(1, 'day');
+
+        return {
+            year: dayMoment.year(),
+            monthNumber: dayMoment.month() + 1,
+            dayNumber: dayMoment.date(),
+        };
+    }
+
+    /**
+     * Given a day data, return the next day.
+     *
+     * @param day Day.
+     * @return Next day.
+     */
+    getNextDay(day: YearMonthDay): YearMonthDay {
+        const dayMoment = moment().year(day.year).month(day.monthNumber - 1).date(day.dayNumber);
+        dayMoment.add(1, 'day');
+
+        return {
+            year: dayMoment.year(),
+            monthNumber: dayMoment.month() + 1,
+            dayNumber: dayMoment.date(),
+        };
+    }
+
+    /**
+     * Get current day.
+     *
+     * @return Current day.
+     */
+    getCurrentDay(): YearMonthDay {
+        const now = new Date();
+
+        return {
+            year: now.getFullYear(),
+            monthNumber: now.getMonth() + 1,
+            dayNumber: now.getDate(),
+        };
+    }
+
+    /**
+     * Check if a certain day is a past day.
+     *
+     * @param day Day.
+     * @return Whether it's a past day.
+     */
+    isPastDay(day: YearMonthDay): boolean {
+        const now = new Date();
+
+        return day.year < now.getFullYear() || (day.year === now.getFullYear() && day.monthNumber < now.getMonth() + 1) ||
+            (day.year === now.getFullYear() && day.monthNumber === now.getMonth() + 1 && day.dayNumber < now.getDate());
+    }
+
+    /**
+     * Check if two days are the same.
+     *
+     * @param dayA Day A.
+     * @param dayB Day B.
+     * @return Whether it's same day.
+     */
+    isSameDay(dayA: YearMonthDay, dayB: YearMonthDay): boolean {
+        return dayA.dayNumber === dayB.dayNumber && dayA.monthNumber === dayB.monthNumber && dayA.year === dayB.year;
+    }
+
 }
 
 export const CoreTimeUtils = makeSingleton(CoreTimeUtilsProvider);
 
+/**
+ * Data to identify a month.
+ */
 export type YearAndMonth = {
     year: number; // Year number.
     monthNumber: number; // Month number (1 to 12).
 };
+
+/**
+ * Data to identify a day.
+ */
+export type YearMonthDay = YearAndMonth & {
+    dayNumber: number; // Day number.
+};

From 8f4b2df43ab46aabddda681d33d1b075917962fe Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 20 Dec 2021 12:42:34 +0100
Subject: [PATCH 0292/1008] MOBILE-3948 h5p: User uniqueness by id instead of
 email

---
 .../h5p/assets/moodle/js/h5p_overrides.js     | 43 ++++++++++++++++++-
 src/core/features/h5p/classes/helper.ts       | 15 +++----
 2 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/src/core/features/h5p/assets/moodle/js/h5p_overrides.js b/src/core/features/h5p/assets/moodle/js/h5p_overrides.js
index c9350e204..b4758cf31 100644
--- a/src/core/features/h5p/assets/moodle/js/h5p_overrides.js
+++ b/src/core/features/h5p/assets/moodle/js/h5p_overrides.js
@@ -52,4 +52,45 @@ H5P.getMoodleComponent = function () {
         return H5PIntegration.moodleComponent;
     }
     return undefined;
-};
\ No newline at end of file
+};
+
+/**
+ * Set the actor. (Moved to overrides due to MDL-69467)
+ */
+ H5P.XAPIEvent.prototype.setActor = function () {
+    if (H5PIntegration.user !== undefined) {
+        this.data.statement.actor = {
+            'name': H5PIntegration.user.name,
+            'objectType': 'Agent'
+        };
+        if (H5PIntegration.user.id !== undefined) {
+            this.data.statement.actor.account = {
+                'name': H5PIntegration.user.id,
+                'homePage': H5PIntegration.siteUrl
+            }
+        } else if (H5PIntegration.user.mail !== undefined) {
+            this.data.statement.actor.mbox = 'mailto:' + H5PIntegration.user.mail;
+        }
+    } else {
+        var uuid;
+        try {
+            if (localStorage.H5PUserUUID) {
+                uuid = localStorage.H5PUserUUID;
+            } else {
+                uuid = H5P.createUUID();
+                localStorage.H5PUserUUID = uuid;
+            }
+        }
+        catch (err) {
+            // LocalStorage and Cookies are probably disabled. Do not track the user.
+            uuid = 'not-trackable-' + H5P.createUUID();
+        }
+        this.data.statement.actor = {
+            'account': {
+                'name': uuid,
+                'homePage': H5PIntegration.siteUrl
+            },
+            'objectType': 'Agent'
+        };
+    }
+};
diff --git a/src/core/features/h5p/classes/helper.ts b/src/core/features/h5p/classes/helper.ts
index 23e447b93..7e685b06b 100644
--- a/src/core/features/h5p/classes/helper.ts
+++ b/src/core/features/h5p/classes/helper.ts
@@ -19,10 +19,8 @@ import { CoreSites } from '@services/sites';
 import { CoreMimetypeUtils } from '@services/utils/mimetype';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreUtils } from '@services/utils/utils';
-import { CoreUser } from '@features/user/services/user';
 import { CoreH5P } from '../services/h5p';
 import { CoreH5PCore, CoreH5PDisplayOptions } from './core';
-import { Translate } from '@singletons';
 import { CoreError } from '@classes/errors/error';
 
 /**
@@ -117,11 +115,11 @@ export class CoreH5PHelper {
 
         const site = await CoreSites.getSite(siteId);
 
-        const userId = site.getUserId();
-        const user = await CoreUtils.ignoreErrors(CoreUser.getProfile(userId, undefined, false, siteId));
+        const info = site.getInfo();
 
-        if (!user || !user.email) {
-            throw new CoreError(Translate.instant('core.h5p.errorgetemail'));
+        if (!info) {
+            // Shouldn't happen for authenticated sites.
+            throw new CoreError('Site info could not be fetched.');
         }
 
         const basePath = CoreFile.getBasePathInstant();
@@ -151,7 +149,7 @@ export class CoreH5PHelper {
             l10n: {
                 H5P: CoreH5P.h5pCore.getLocalization(), // eslint-disable-line @typescript-eslint/naming-convention
             },
-            user: { name: site.getInfo()!.fullname, mail: user.email },
+            user: { name: info.username, id: info.userid },
             hubIsEnabled: false,
             reportingIsEnabled: false,
             crossorigin: null,
@@ -252,7 +250,8 @@ export type CoreH5PCoreSettings = {
     };
     user: {
         name: string;
-        mail: string;
+        id?: number;
+        mail?: string;
     };
     hubIsEnabled: boolean;
     reportingIsEnabled: boolean;

From 372c5920a7b2c53ed03cf8a76eb63067cb999134 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 16 Dec 2021 12:29:13 +0100
Subject: [PATCH 0293/1008] MOBILE-3927 swipe: Apply IR changes

---
 .../pages/issued-badge/issued-badge.page.ts   |   6 +-
 .../calendar/addon-calendar-calendar.html     |  16 +-
 .../calendar/components/calendar/calendar.ts  | 350 +++++++++---------
 src/addons/calendar/pages/day/day.html        |  18 +-
 src/addons/calendar/pages/day/day.page.ts     | 232 ++++++------
 .../calendar/services/calendar-helper.ts      |  19 +-
 src/addons/calendar/services/calendar-sync.ts |   5 +-
 .../submission-review/submission-review.ts    |   4 +-
 .../index/addon-mod-book-index.html           |  10 +-
 src/addons/mod/book/components/index/index.ts |  70 ++--
 .../forum-discussions-swipe-manager.ts        |   4 +-
 .../classes/glossary-entries-swipe-manager.ts |   4 +-
 .../items-management/items-manager-source.ts  |  39 +-
 .../classes/items-management/items-manager.ts |  62 +++-
 .../items-management/routed-items-manager.ts  |  13 +-
 ...r.ts => swipe-navigation-items-manager.ts} |   4 +-
 ...pe-slides-dynamic-items-manager-source.ts} |  54 +--
 ... => swipe-slides-dynamic-items-manager.ts} |   4 +-
 ...s => swipe-slides-items-manager-source.ts} |  72 ++--
 ...nager.ts => swipe-slides-items-manager.ts} |  20 +-
 .../swipe-navigation/swipe-navigation.ts      |   4 +-
 .../components/swipe-slides/swipe-slides.html |   5 +-
 .../components/swipe-slides/swipe-slides.ts   |  60 ++-
 .../user/pages/profile/profile.page.ts        |   4 +-
 src/core/services/utils/dom.ts                |  33 +-
 src/core/services/utils/time.ts               | 155 --------
 26 files changed, 591 insertions(+), 676 deletions(-)
 rename src/core/classes/items-management/{swipe-items-manager.ts => swipe-navigation-items-manager.ts} (97%)
 rename src/core/classes/items-management/{slides-dynamic-items-manager-source.ts => swipe-slides-dynamic-items-manager-source.ts} (77%)
 rename src/core/classes/items-management/{slides-dynamic-items-manager.ts => swipe-slides-dynamic-items-manager.ts} (89%)
 rename src/core/classes/items-management/{slides-items-manager-source.ts => swipe-slides-items-manager-source.ts} (50%)
 rename src/core/classes/items-management/{slides-items-manager.ts => swipe-slides-items-manager.ts} (66%)

diff --git a/src/addons/badges/pages/issued-badge/issued-badge.page.ts b/src/addons/badges/pages/issued-badge/issued-badge.page.ts
index c48a21034..4a9285995 100644
--- a/src/addons/badges/pages/issued-badge/issued-badge.page.ts
+++ b/src/addons/badges/pages/issued-badge/issued-badge.page.ts
@@ -23,7 +23,7 @@ import { CoreUtils } from '@services/utils/utils';
 import { CoreCourses, CoreEnrolledCourseData } from '@features/courses/services/courses';
 import { CoreNavigator } from '@services/navigator';
 import { ActivatedRoute } from '@angular/router';
-import { CoreSwipeItemsManager } from '@classes/items-management/swipe-items-manager';
+import { CoreSwipeNavigationItemsManager } from '@classes/items-management/swipe-navigation-items-manager';
 import { AddonBadgesUserBadgesSource } from '@addons/badges/classes/user-badges-source';
 import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
 
@@ -43,7 +43,7 @@ export class AddonBadgesIssuedBadgePage implements OnInit {
     user?: CoreUserProfile;
     course?: CoreEnrolledCourseData;
     badge?: AddonBadgesUserBadge;
-    badges?: CoreSwipeItemsManager;
+    badges?: CoreSwipeNavigationItemsManager;
     badgeLoaded = false;
     currentTime = 0;
 
@@ -65,7 +65,7 @@ export class AddonBadgesIssuedBadgePage implements OnInit {
             AddonBadgesUserBadgesSource,
             [this.courseId, this.userId],
         );
-        this.badges = new CoreSwipeItemsManager(source);
+        this.badges = new CoreSwipeNavigationItemsManager(source);
 
         this.badges.start();
     }
diff --git a/src/addons/calendar/components/calendar/addon-calendar-calendar.html b/src/addons/calendar/components/calendar/addon-calendar-calendar.html
index 40ba979c3..ca1e7dc08 100644
--- a/src/addons/calendar/components/calendar/addon-calendar-calendar.html
+++ b/src/addons/calendar/components/calendar/addon-calendar-calendar.html
@@ -1,7 +1,7 @@
 <!-- Add buttons to the nav bar. -->
 <core-navbar-buttons slot="end" prepend>
     <core-context-menu>
-        <core-context-menu-item *ngIf="canNavigate && !isCurrentMonth && displayNavButtons" [priority]="900"
+        <core-context-menu-item *ngIf="canNavigate && !selectedMonthIsCurrent() && displayNavButtons" [priority]="900"
             [content]="'addon.calendar.currentmonth' | translate" iconAction="fas-calendar-day" (action)="goToCurrentMonth()">
         </core-context-menu-item>
     </core-context-menu>
@@ -19,7 +19,7 @@
             <ion-col class="ion-text-center addon-calendar-period">
                 <h2 id="addon-calendar-monthname">
                     {{ periodName }}
-                    <ion-spinner *ngIf="manager && !manager.getSource().monthLoaded" class="addon-calendar-loading-month">
+                    <ion-spinner *ngIf="!selectedMonthLoaded()" class="addon-calendar-loading-month">
                     </ion-spinner>
                 </h2>
             </ion-col>
@@ -31,14 +31,14 @@
         </ion-row>
     </ion-grid>
 
-    <core-swipe-slides [manager]="manager" (onWillChange)="slideChanged($event)">
-        <ng-template let-item="item">
+    <core-swipe-slides [manager]="manager">
+        <ng-template let-month="item">
             <!-- Calendar view. -->
             <ion-grid class="addon-calendar-months" role="table" aria-describedby="addon-calendar-monthname">
                 <div role="rowgroup">
                     <!-- List of days. -->
                     <ion-row role="row">
-                        <ion-col class="ion-text-center addon-calendar-weekday" *ngFor="let day of item.weekDays" role="columnheader">
+                        <ion-col class="ion-text-center addon-calendar-weekday" *ngFor="let day of month.weekDays" role="columnheader">
                             <span class="sr-only">{{ day.fullname | translate }}</span>
                             <span class="ion-hide-md-up" aria-hidden="true">{{ day.shortname | translate }}</span>
                             <span class="ion-hide-md-down" aria-hidden="true">{{ day.fullname | translate }}</span>
@@ -47,16 +47,16 @@
                 </div>
                 <div role="rowgroup">
                     <!-- Weeks. -->
-                    <ion-row *ngFor="let week of item.weeks" class="addon-calendar-week" role="row">
+                    <ion-row *ngFor="let week of month.weeks" class="addon-calendar-week" role="row">
                         <!-- Empty slots (first week). -->
                         <ion-col *ngFor="let value of week.prepadding" class="dayblank addon-calendar-day" role="cell">
                         </ion-col>
                         <ion-col *ngFor="let day of week.days" class="addon-calendar-day ion-text-center" [ngClass]='{
                                 "hasevents": day.hasevents,
-                                "today": isCurrentMonth && day.istoday,
+                                "today": month.isCurrentMonth && day.istoday,
                                 "weekend": day.isweekend,
                                 "duration_finish": day.haslastdayofevent
-                            }' [class.addon-calendar-event-past-day]="isPastMonth || day.ispast" role="cell" tabindex="0"
+                            }' [class.addon-calendar-event-past-day]="month.isPastMonth || day.ispast" role="cell" tabindex="0"
                             (ariaButtonClick)="dayClicked(day.mday)">
                             <p class="addon-calendar-day-number" role="button">
                                 <span aria-hidden="true">{{ day.mday }}</span>
diff --git a/src/addons/calendar/components/calendar/calendar.ts b/src/addons/calendar/components/calendar/calendar.ts
index 36614d3d5..ed3e500c7 100644
--- a/src/addons/calendar/components/calendar/calendar.ts
+++ b/src/addons/calendar/components/calendar/calendar.ts
@@ -27,7 +27,7 @@ import {
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
-import { CoreTimeUtils, YearAndMonth } from '@services/utils/time';
+import { CoreTimeUtils } from '@services/utils/time';
 import { CoreUtils } from '@services/utils/utils';
 import {
     AddonCalendar,
@@ -42,12 +42,13 @@ import { AddonCalendarOffline } from '../../services/calendar-offline';
 import { CoreCategoryData, CoreCourses } from '@features/courses/services/courses';
 import { CoreApp } from '@services/app';
 import { CoreLocalNotifications } from '@services/local-notifications';
-import { CoreSwipeCurrentItemData, CoreSwipeSlidesComponent } from '@components/swipe-slides/swipe-slides';
+import { CoreSwipeSlidesComponent } from '@components/swipe-slides/swipe-slides';
 import {
     CoreSwipeSlidesDynamicItem,
     CoreSwipeSlidesDynamicItemsManagerSource,
-} from '@classes/items-management/slides-dynamic-items-manager-source';
-import { CoreSwipeSlidesDynamicItemsManager } from '@classes/items-management/slides-dynamic-items-manager';
+} from '@classes/items-management/swipe-slides-dynamic-items-manager-source';
+import { CoreSwipeSlidesDynamicItemsManager } from '@classes/items-management/swipe-slides-dynamic-items-manager';
+import moment from 'moment';
 
 /**
  * Component that displays a calendar.
@@ -72,15 +73,13 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
     periodName?: string;
     manager?: CoreSwipeSlidesDynamicItemsManager<PreloadedMonth, AddonCalendarMonthSlidesItemsManagerSource>;
     loaded = false;
-    isCurrentMonth = false;
-    isPastMonth = false;
 
     protected currentSiteId: string;
-    protected currentTime?: number;
     protected differ: KeyValueDiffer<unknown, unknown>; // To detect changes in the data input.
-    // Observers.
+    // Observers and listeners.
     protected undeleteEventObserver: CoreEventObserver;
     protected obsDefaultTimeChange?: CoreEventObserver;
+    protected managerUnsubscribe?: () => void;
 
     constructor(
         differs: KeyValueDiffers,
@@ -95,7 +94,7 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
                         return;
                     }
 
-                    month.weeks.forEach((week) => {
+                    month.weeks?.forEach((week) => {
                         week.days.forEach((day) => {
                             AddonCalendar.scheduleEventsNotifications(day.eventsFormated || []);
                         });
@@ -131,19 +130,20 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
      * Component loaded.
      */
     ngOnInit(): void {
-        const currentMonth = CoreTimeUtils.getCurrentMonth();
-
         this.canNavigate = typeof this.canNavigate == 'undefined' ? true : CoreUtils.isTrueOrOne(this.canNavigate);
         this.displayNavButtons = typeof this.displayNavButtons == 'undefined' ? true :
             CoreUtils.isTrueOrOne(this.displayNavButtons);
 
-        const source = new AddonCalendarMonthSlidesItemsManagerSource(this, {
-            year: this.initialYear ?? currentMonth.year,
-            monthNumber: this.initialMonth ?? currentMonth.monthNumber,
-        });
+        const source = new AddonCalendarMonthSlidesItemsManagerSource(this, moment({
+            year: this.initialYear,
+            month: this.initialMonth ? this.initialMonth - 1 : undefined,
+        }));
         this.manager = new CoreSwipeSlidesDynamicItemsManager(source);
-
-        this.calculateIsCurrentMonth();
+        this.managerUnsubscribe = this.manager.addListener({
+            onSelectedItemUpdated: (item) => {
+                this.onMonthViewed(item);
+            },
+        });
 
         this.fetchData();
     }
@@ -159,7 +159,7 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
             const changes = this.differ.diff(this.filter || {});
             if (changes) {
                 items.forEach((month) => {
-                    if (month.loaded) {
+                    if (month.loaded && month.weeks) {
                         this.manager?.getSource().filterEvents(month.weeks, this.filter);
                     }
                 });
@@ -190,14 +190,15 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
 
     /**
      * Update data related to month being viewed.
+     *
+     * @param month Month being viewed.
      */
-    viewMonth(month: YearAndMonth): void {
+    onMonthViewed(month: MonthBasicData): void {
         // Calculate the period name. We don't use the one in result because it's in server's language.
         this.periodName = CoreTimeUtils.userDate(
-            new Date(month.year, month.monthNumber - 1).getTime(),
+            month.moment.unix() * 1000,
             'core.strftimemonthyear',
         );
-        this.calculateIsCurrentMonth();
     }
 
     /**
@@ -207,13 +208,13 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
      * @return Promise resolved when done.
      */
     async refreshData(afterChange = false): Promise<void> {
-        const visibleMonth = this.slides?.getCurrentItem() || null;
+        const selectedMonth = this.manager?.getSelectedItem() || null;
 
         if (afterChange) {
             this.manager?.getSource().markAllItemsDirty();
         }
 
-        await this.manager?.getSource().invalidateContent(visibleMonth);
+        await this.manager?.getSource().invalidateContent(selectedMonth);
 
         await this.fetchData();
     }
@@ -249,39 +250,53 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
      * @param day Day.
      */
     dayClicked(day: number): void {
-        const visibleMonth = this.slides?.getCurrentItem();
-        if (!visibleMonth) {
+        const selectedMonth = this.manager?.getSelectedItem();
+        if (!selectedMonth) {
             return;
         }
 
-        this.onDayClicked.emit({ day: day, month: visibleMonth.monthNumber, year: visibleMonth.year });
-    }
-
-    /**
-     * Check if user is viewing the current month.
-     */
-    calculateIsCurrentMonth(): void {
-        const visibleMonth = this.slides?.getCurrentItem();
-        if (!visibleMonth) {
-            return;
-        }
-
-        this.currentTime = CoreTimeUtils.timestamp();
-        this.isCurrentMonth = CoreTimeUtils.isSameMonth(visibleMonth, CoreTimeUtils.getCurrentMonth());
-        this.isPastMonth = CoreTimeUtils.isPastMonth(visibleMonth);
+        this.onDayClicked.emit({ day: day, month: selectedMonth.moment.month() + 1, year: selectedMonth.moment.year() });
     }
 
     /**
      * Go to current month.
      */
     async goToCurrentMonth(): Promise<void> {
-        const now = new Date();
-        const currentMonth = {
-            monthNumber: now.getMonth() + 1,
-            year: now.getFullYear(),
-        };
+        const manager = this.manager;
+        const slides = this.slides;
+        if (!manager || !slides) {
+            return;
+        }
 
-        this.slides?.slideToItem(currentMonth);
+        const currentMonth = {
+            moment: moment(),
+        };
+        this.loaded = false;
+
+        try {
+            // Make sure the day is loaded.
+            await manager.getSource().loadItem(currentMonth);
+
+            slides.slideToItem(currentMonth);
+        } catch (error) {
+            CoreDomUtils.showErrorModalDefault(error, 'addon.calendar.errorloadevents', true);
+        } finally {
+            this.loaded = true;
+        }
+    }
+
+    /**
+     * Check whether selected month is loaded.
+     */
+    selectedMonthLoaded(): boolean {
+        return !!this.manager?.getSelectedItem()?.loaded;
+    }
+
+    /**
+     * Check whether selected month is current month.
+     */
+    selectedMonthIsCurrent(): boolean {
+        return !!this.manager?.getSelectedItem()?.isCurrentMonth;
     }
 
     /**
@@ -295,7 +310,7 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
                 return false;
             }
 
-            return month.weeks.some((week) => week.days.some((day) => {
+            return month.weeks?.some((week) => week.days.some((day) => {
                 const event = day.eventsFormated?.find((event) => event.id == eventId);
 
                 if (event) {
@@ -309,41 +324,32 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
         });
     }
 
-    /**
-     * Returns if the event is in the past or not.
-     *
-     * @param event Event object.
-     * @return True if it's in the past.
-     */
-    isEventPast(event: { timestart: number; timeduration: number}): boolean {
-        return (event.timestart + event.timeduration) < (this.currentTime || CoreTimeUtils.timestamp());
-    }
-
-    /**
-     * Slide has changed.
-     *
-     * @param data Data about new item.
-     */
-    slideChanged(data: CoreSwipeCurrentItemData<PreloadedMonth>): void {
-        this.viewMonth(data.item);
-    }
-
     /**
      * Component destroyed.
      */
     ngOnDestroy(): void {
         this.undeleteEventObserver?.off();
         this.obsDefaultTimeChange?.off();
+        this.managerUnsubscribe && this.managerUnsubscribe();
     }
 
 }
 
+/**
+ * Basic data to identify a month.
+ */
+type MonthBasicData = {
+    moment: moment.Moment;
+};
+
 /**
  * Preloaded month.
  */
-type PreloadedMonth = YearAndMonth & CoreSwipeSlidesDynamicItem & {
-    weekDays: AddonCalendarWeekDaysTranslationKeys[];
-    weeks: AddonCalendarWeek[];
+type PreloadedMonth = MonthBasicData & CoreSwipeSlidesDynamicItem & {
+    weekDays?: AddonCalendarWeekDaysTranslationKeys[];
+    weeks?: AddonCalendarWeek[];
+    isCurrentMonth?: boolean;
+    isPastMonth?: boolean;
 };
 
 /**
@@ -351,8 +357,7 @@ type PreloadedMonth = YearAndMonth & CoreSwipeSlidesDynamicItem & {
  */
 class AddonCalendarMonthSlidesItemsManagerSource extends CoreSwipeSlidesDynamicItemsManagerSource<PreloadedMonth> {
 
-    monthLoaded = false;
-    categories: { [id: number]: CoreCategoryData } = {};
+    categories?: { [id: number]: CoreCategoryData };
     // Offline events classified in month & day.
     offlineEvents: { [monthId: string]: { [day: number]: AddonCalendarEventToDisplay[] } } = {};
     offlineEditedEventsIds: number[] = []; // IDs of events edited in offline.
@@ -360,10 +365,9 @@ class AddonCalendarMonthSlidesItemsManagerSource extends CoreSwipeSlidesDynamicI
     timeFormat?: string;
 
     protected calendarComponent: AddonCalendarCalendarComponent;
-    protected categoriesRetrieved = false;
 
-    constructor(component: AddonCalendarCalendarComponent, initialMonth: YearAndMonth) {
-        super(initialMonth);
+    constructor(component: AddonCalendarCalendarComponent, initialMoment: moment.Moment) {
+        super({ moment: initialMoment });
 
         this.calendarComponent = component;
     }
@@ -394,7 +398,7 @@ class AddonCalendarMonthSlidesItemsManagerSource extends CoreSwipeSlidesDynamicI
                 day.filteredEvents = AddonCalendarHelper.getFilteredEvents(
                     day.eventsFormated || [],
                     filter,
-                    this.categories,
+                    this.categories || {},
                 );
 
                 // Re-calculate some properties.
@@ -409,20 +413,16 @@ class AddonCalendarMonthSlidesItemsManagerSource extends CoreSwipeSlidesDynamicI
      * @return Promise resolved when done.
      */
     async loadCategories(): Promise<void> {
-        if (this.categoriesRetrieved) {
+        if (this.categories) {
             // Already retrieved, stop.
             return;
         }
 
         try {
-            const cats = await CoreCourses.getCategories(0, true);
-            this.categoriesRetrieved = true;
-            this.categories = {};
+            const categories = await CoreCourses.getCategories(0, true);
 
             // Index categories by ID.
-            cats.forEach((category) => {
-                this.categories[category.id] = category;
-            });
+            this.categories = CoreUtils.arrayToObject(categories, 'id');
         } catch {
             // Ignore errors.
         }
@@ -465,103 +465,104 @@ class AddonCalendarMonthSlidesItemsManagerSource extends CoreSwipeSlidesDynamicI
     /**
      * @inheritdoc
      */
-    getItemId(item: YearAndMonth): string | number {
-        return AddonCalendarHelper.getMonthId(item);
+    getItemId(item: MonthBasicData): string | number {
+        return AddonCalendarHelper.getMonthId(item.moment);
     }
 
     /**
      * @inheritdoc
      */
-    getPreviousItem(item: YearAndMonth): YearAndMonth | null {
-        return CoreTimeUtils.getPreviousMonth(item);
+    getPreviousItem(item: MonthBasicData): MonthBasicData | null {
+        return {
+            moment: item.moment.clone().subtract(1, 'month'),
+        };
     }
 
     /**
      * @inheritdoc
      */
-    getNextItem(item: YearAndMonth): YearAndMonth | null {
-        return CoreTimeUtils.getNextMonth(item);
+    getNextItem(item: MonthBasicData): MonthBasicData | null {
+        return {
+            moment: item.moment.clone().add(1, 'month'),
+        };
     }
 
     /**
      * @inheritdoc
      */
-    async loadItemData(month: YearAndMonth, preload = false): Promise<PreloadedMonth | null> {
-        if (!preload) {
-            this.monthLoaded = false;
-        }
+    async loadItemData(month: MonthBasicData, preload = false): Promise<PreloadedMonth | null> {
+        // Load or preload the weeks.
+        let result: { daynames: Partial<AddonCalendarDayName>[]; weeks: Partial<AddonCalendarWeek>[] };
+        const year = month.moment.year();
+        const monthNumber = month.moment.month() + 1;
 
-        try {
-            // Load or preload the weeks.
-            let result: { daynames: Partial<AddonCalendarDayName>[]; weeks: Partial<AddonCalendarWeek>[] };
-            if (preload) {
-                result = await AddonCalendarHelper.getOfflineMonthWeeks(month.year, month.monthNumber);
-            } else {
-                try {
-                    // Don't pass courseId and categoryId, we'll filter them locally.
-                    result = await AddonCalendar.getMonthlyEvents(month.year, month.monthNumber);
-                } catch (error) {
-                    if (!CoreApp.isOnline()) {
-                        // Allow navigating to non-cached months in offline (behave as if using emergency cache).
-                        result = await AddonCalendarHelper.getOfflineMonthWeeks(month.year, month.monthNumber);
-                    } else {
-                        throw error;
-                    }
+        if (preload) {
+            result = await AddonCalendarHelper.getOfflineMonthWeeks(year, monthNumber);
+        } else {
+            try {
+                // Don't pass courseId and categoryId, we'll filter them locally.
+                result = await AddonCalendar.getMonthlyEvents(year, monthNumber);
+            } catch (error) {
+                if (!CoreApp.isOnline()) {
+                    // Allow navigating to non-cached months in offline (behave as if using emergency cache).
+                    result = await AddonCalendarHelper.getOfflineMonthWeeks(year, monthNumber);
+                } else {
+                    throw error;
                 }
             }
-
-            const weekDays = AddonCalendar.getWeekDays(result.daynames[0].dayno);
-            const weeks = result.weeks as AddonCalendarWeek[];
-            const isCurrentMonth = CoreTimeUtils.isSameMonth(month, CoreTimeUtils.getCurrentMonth());
-            const currentDay = new Date().getDate();
-            let isPast = true;
-
-            await Promise.all(weeks.map(async (week) => {
-                await Promise.all(week.days.map(async (day) => {
-                    day.periodName = CoreTimeUtils.userDate(
-                        new Date(month.year, month.monthNumber - 1, day.mday).getTime(),
-                        'core.strftimedaydate',
-                    );
-                    day.eventsFormated = day.eventsFormated || [];
-                    day.filteredEvents = day.filteredEvents || [];
-                    // Format online events.
-                    const onlineEventsFormatted = await Promise.all(
-                        day.events.map(async (event) => AddonCalendarHelper.formatEventData(event)),
-                    );
-
-                    day.eventsFormated = day.eventsFormated.concat(onlineEventsFormatted);
-
-                    if (isCurrentMonth) {
-                        day.istoday = day.mday == currentDay;
-                        day.ispast = isPast && !day.istoday;
-                        isPast = day.ispast;
-
-                        if (day.istoday) {
-                            day.eventsFormated?.forEach((event) => {
-                                event.ispast = this.calendarComponent.isEventPast(event);
-                            });
-                        }
-                    }
-                }));
-            }));
-
-            if (!preload) {
-                // Merge the online events with offline data.
-                this.mergeEvents(month, weeks);
-                // Filter events by course.
-                this.filterEvents(weeks, this.calendarComponent.filter);
-            }
-
-            return {
-                ...month,
-                weeks,
-                weekDays,
-            };
-        } finally {
-            if (!preload) {
-                this.monthLoaded = true;
-            }
         }
+
+        const weekDays = AddonCalendar.getWeekDays(result.daynames[0].dayno);
+        const weeks = result.weeks as AddonCalendarWeek[];
+        const currentDay = new Date().getDate();
+        const currentTime = CoreTimeUtils.timestamp();
+        let isPast = true;
+
+        const preloadedMonth: PreloadedMonth = {
+            ...month,
+            weeks,
+            weekDays,
+            isCurrentMonth: month.moment.isSame(moment(), 'month'),
+            isPastMonth: month.moment.isBefore(moment(), 'month'),
+        };
+
+        await Promise.all(weeks.map(async (week) => {
+            await Promise.all(week.days.map(async (day) => {
+                day.periodName = CoreTimeUtils.userDate(
+                    month.moment.unix() * 1000,
+                    'core.strftimedaydate',
+                );
+                day.eventsFormated = day.eventsFormated || [];
+                day.filteredEvents = day.filteredEvents || [];
+                // Format online events.
+                const onlineEventsFormatted = await Promise.all(
+                    day.events.map(async (event) => AddonCalendarHelper.formatEventData(event)),
+                );
+
+                day.eventsFormated = day.eventsFormated.concat(onlineEventsFormatted);
+
+                if (preloadedMonth.isCurrentMonth) {
+                    day.istoday = day.mday == currentDay;
+                    day.ispast = isPast && !day.istoday;
+                    isPast = day.ispast;
+
+                    if (day.istoday) {
+                        day.eventsFormated?.forEach((event) => {
+                            event.ispast = this.isEventPast(event, currentTime);
+                        });
+                    }
+                }
+            }));
+        }));
+
+        if (!preload) {
+            // Merge the online events with offline data.
+            this.mergeEvents(month, weeks);
+            // Filter events by course.
+            this.filterEvents(weeks, this.calendarComponent.filter);
+        }
+
+        return preloadedMonth;
     }
 
     /**
@@ -570,9 +571,9 @@ class AddonCalendarMonthSlidesItemsManagerSource extends CoreSwipeSlidesDynamicI
      * @param month Month.
      * @param weeks Weeks with the events to filter.
      */
-    mergeEvents(month: YearAndMonth, weeks: AddonCalendarWeek[]): void {
+    mergeEvents(month: MonthBasicData, weeks: AddonCalendarWeek[]): void {
         const monthOfflineEvents: { [day: number]: AddonCalendarEventToDisplay[] } =
-            this.offlineEvents[AddonCalendarHelper.getMonthId(month)];
+            this.offlineEvents[AddonCalendarHelper.getMonthId(month.moment)];
 
         weeks.forEach((week) => {
             week.days.forEach((day) => {
@@ -605,25 +606,36 @@ class AddonCalendarMonthSlidesItemsManagerSource extends CoreSwipeSlidesDynamicI
         });
     }
 
+    /**
+     * Returns if the event is in the past or not.
+     *
+     * @param event Event object.
+     * @param currentTime Current time.
+     * @return True if it's in the past.
+     */
+    isEventPast(event: { timestart: number; timeduration: number}, currentTime: number): boolean {
+        return (event.timestart + event.timeduration) < currentTime;
+    }
+
     /**
      * Invalidate content.
      *
-     * @param visibleMonth The current visible month.
+     * @param selectedMonth The current selected month.
      * @return Promise resolved when done.
      */
-    async invalidateContent(visibleMonth: PreloadedMonth | null): Promise<void> {
+    async invalidateContent(selectedMonth: PreloadedMonth | null): Promise<void> {
         const promises: Promise<void>[] = [];
 
-        if (visibleMonth) {
-            promises.push(AddonCalendar.invalidateMonthlyEvents(visibleMonth.year, visibleMonth.monthNumber));
+        if (selectedMonth) {
+            promises.push(AddonCalendar.invalidateMonthlyEvents(selectedMonth.moment.year(), selectedMonth.moment.month() + 1));
         }
         promises.push(CoreCourses.invalidateCategories(0, true));
         promises.push(AddonCalendar.invalidateTimeFormat());
 
-        this.categoriesRetrieved = false; // Get categories again.
+        this.categories = undefined; // Get categories again.
 
-        if (visibleMonth) {
-            visibleMonth.dirty = true;
+        if (selectedMonth) {
+            selectedMonth.dirty = true;
         }
 
         await Promise.all(promises);
diff --git a/src/addons/calendar/pages/day/day.html b/src/addons/calendar/pages/day/day.html
index 28b8bf934..01a7daceb 100644
--- a/src/addons/calendar/pages/day/day.html
+++ b/src/addons/calendar/pages/day/day.html
@@ -11,10 +11,10 @@
                 <ion-icon slot="icon-only" name="fas-filter" aria-hidden="true"></ion-icon>
             </ion-button>
             <core-context-menu>
-                <core-context-menu-item *ngIf="!isCurrentDay" [priority]="900" [content]="'addon.calendar.today' | translate"
+                <core-context-menu-item *ngIf="!selectedDayIsCurrent()" [priority]="900" [content]="'addon.calendar.today' | translate"
                     iconAction="fas-calendar-day" (action)="goToCurrentDay()">
                 </core-context-menu-item>
-                <core-context-menu-item [hidden]="!loaded || !this.visibleDayHasOffline() || !isOnline" [priority]="400"
+                <core-context-menu-item [hidden]="!loaded || !selectedDayHasOffline() || !isOnline" [priority]="400"
                     [content]="'core.settings.synchronizenow' | translate" (action)="doRefresh(undefined, $event)" [iconAction]="syncIcon"
                     [closeOnClick]="false">
                 </core-context-menu-item>
@@ -47,23 +47,23 @@
             </ion-row>
         </ion-grid>
 
-        <core-swipe-slides [manager]="manager" (onWillChange)="slideChanged($event)">
-            <ng-template let-item="item">
-                <core-loading [hideUntil]="item.loaded" class="safe-area-padding">
+        <core-swipe-slides [manager]="manager">
+            <ng-template let-day="item">
+                <core-loading [hideUntil]="day.loaded" class="safe-area-padding">
                     <!-- There is data to be synchronized -->
-                    <ion-card class="core-warning-card" *ngIf="item.hasOffline">
+                    <ion-card class="core-warning-card" *ngIf="day.hasOffline">
                         <ion-item>
                             <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
                             <ion-label>{{ 'core.hasdatatosync' | translate:{$a: 'core.day' | translate} }}</ion-label>
                         </ion-item>
                     </ion-card>
 
-                    <core-empty-box *ngIf="!item.filteredEvents || !item.filteredEvents.length" icon="fas-calendar" inline="true"
+                    <core-empty-box *ngIf="!day.filteredEvents || !day.filteredEvents.length" icon="fas-calendar" inline="true"
                         [message]="'addon.calendar.noevents' | translate">
                     </core-empty-box>
 
-                    <ion-list *ngIf="item.filteredEvents && item.filteredEvents.length" class="ion-no-margin">
-                        <ng-container *ngFor="let event of item.filteredEvents">
+                    <ion-list *ngIf="day.filteredEvents && day.filteredEvents.length" class="ion-no-margin">
+                        <ng-container *ngFor="let event of day.filteredEvents">
                             <ion-item class="addon-calendar-event ion-text-wrap" [attr.aria-label]="event.name"
                                 (click)="gotoEvent(event.id)" [class.item-dimmed]="event.ispast"
                                 [ngClass]="['addon-calendar-eventtype-'+event.eventtype]" button detail="true">
diff --git a/src/addons/calendar/pages/day/day.page.ts b/src/addons/calendar/pages/day/day.page.ts
index 86039c369..984d5931b 100644
--- a/src/addons/calendar/pages/day/day.page.ts
+++ b/src/addons/calendar/pages/day/day.page.ts
@@ -19,7 +19,7 @@ import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreLocalNotifications } from '@services/local-notifications';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
-import { CoreTimeUtils, YearMonthDay } from '@services/utils/time';
+import { CoreTimeUtils } from '@services/utils/time';
 import {
     AddonCalendarProvider,
     AddonCalendar,
@@ -40,12 +40,12 @@ import { Params } from '@angular/router';
 import { Subscription } from 'rxjs';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreConstants } from '@/core/constants';
-import { CoreSwipeSlidesDynamicItemsManager } from '@classes/items-management/slides-dynamic-items-manager';
-import { CoreSwipeCurrentItemData, CoreSwipeSlidesComponent } from '@components/swipe-slides/swipe-slides';
+import { CoreSwipeSlidesDynamicItemsManager } from '@classes/items-management/swipe-slides-dynamic-items-manager';
+import { CoreSwipeSlidesComponent } from '@components/swipe-slides/swipe-slides';
 import {
     CoreSwipeSlidesDynamicItem,
     CoreSwipeSlidesDynamicItemsManagerSource,
-} from '@classes/items-management/slides-dynamic-items-manager-source';
+} from '@classes/items-management/swipe-slides-dynamic-items-manager-source';
 
 /**
  * Page that displays the calendar events for a certain day.
@@ -72,13 +72,13 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
     protected onlineObserver: Subscription;
     protected obsDefaultTimeChange?: CoreEventObserver;
     protected filterChangedObserver: CoreEventObserver;
+    protected managerUnsubscribe?: () => void;
 
     periodName?: string;
     manager?: CoreSwipeSlidesDynamicItemsManager<PreloadedDay, AddonCalendarDaySlidesItemsManagerSource>;
     loaded = false;
     isOnline = false;
     syncIcon = CoreConstants.ICON_LOADING;
-    isCurrentDay = false;
     filter: AddonCalendarFilter = {
         filtered: false,
         courseId: undefined,
@@ -97,7 +97,7 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
             // Re-schedule events if default time changes.
             this.obsDefaultTimeChange = CoreEvents.on(AddonCalendarProvider.DEFAULT_NOTIFICATION_TIME_CHANGED, () => {
                 this.manager?.getSource().getItems()?.forEach(day => {
-                    AddonCalendar.scheduleEventsNotifications(day.onlineEvents);
+                    AddonCalendar.scheduleEventsNotifications(day.onlineEvents || []);
                 });
             }, this.currentSiteId);
         }
@@ -140,9 +140,8 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
 
         // Refresh data if calendar events are synchronized manually but not by this page.
         this.manualSyncObserver = CoreEvents.on(AddonCalendarSyncProvider.MANUAL_SYNCED, (data) => {
-            const visibleDay = this.slides?.getCurrentItem();
-            if (data && (data.source != 'day' || !visibleDay || data.day === undefined || data.year != visibleDay.year ||
-                    data.month != visibleDay.monthNumber || data.day != visibleDay.dayNumber)) {
+            const selectedDay = this.manager?.getSelectedItem();
+            if (data && (data.source != 'day' || !selectedDay || !data.moment || !selectedDay.moment.isSame(data.moment, 'day'))) {
                 this.manager?.getSource().markAllItemsUnloaded();
                 this.refreshData(false, true);
             }
@@ -214,15 +213,18 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
 
         this.filter.filtered = typeof this.filter.courseId != 'undefined' || types.some((name) => !this.filter[name]);
 
-        const currentDay = CoreTimeUtils.getCurrentDay();
-        const source = new AddonCalendarDaySlidesItemsManagerSource(this, {
-            year: CoreNavigator.getRouteNumberParam('year') ?? currentDay.year,
-            monthNumber: CoreNavigator.getRouteNumberParam('month') ?? currentDay.monthNumber,
-            dayNumber: CoreNavigator.getRouteNumberParam('day') ?? currentDay.dayNumber,
-        });
+        const month = CoreNavigator.getRouteNumberParam('month');
+        const source = new AddonCalendarDaySlidesItemsManagerSource(this, moment({
+            year: CoreNavigator.getRouteNumberParam('year'),
+            month: month ? month - 1 : undefined,
+            date: CoreNavigator.getRouteNumberParam('day'),
+        }));
         this.manager = new CoreSwipeSlidesDynamicItemsManager(source);
-
-        this.calculateIsCurrentDay();
+        this.managerUnsubscribe = this.manager.addListener({
+            onSelectedItemUpdated: (item) => {
+                this.onDayViewed(item);
+            },
+        });
 
         this.fetchData(true);
     }
@@ -264,13 +266,14 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
 
     /**
      * Update data related to day being viewed.
+     *
+     * @param day Day viewed.
      */
-    viewDay(day: YearMonthDay): void {
+    onDayViewed(day: DayBasicData): void {
         this.periodName = CoreTimeUtils.userDate(
-            new Date(day.year, day.monthNumber - 1, day.dayNumber).getTime(),
+            day.moment.unix() * 1000,
             'core.strftimedaydate',
         );
-        this.calculateIsCurrentDay();
     }
 
     /**
@@ -301,10 +304,10 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
     async refreshData(sync?: boolean, afterChange?: boolean): Promise<void> {
         this.syncIcon = CoreConstants.ICON_LOADING;
 
-        const visibleDay = this.slides?.getCurrentItem() || null;
+        const selectedDay = this.manager?.getSelectedItem() || null;
 
         // Don't invalidate day events after a change, it has already been handled.
-        await this.manager?.getSource().invalidateContent(visibleDay, !afterChange);
+        await this.manager?.getSource().invalidateContent(selectedDay, !afterChange);
 
         await this.fetchData(sync);
     }
@@ -325,14 +328,9 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
 
             if (result.updated) {
                 // Trigger a manual sync event.
-                const visibleDay = this.slides?.getCurrentItem();
+                const selectedDay = this.manager?.getSelectedItem();
                 result.source = 'day';
-
-                if (visibleDay) {
-                    result.day = visibleDay.dayNumber;
-                    result.month = visibleDay.monthNumber;
-                    result.year = visibleDay.year;
-                }
+                result.moment = selectedDay?.moment;
 
                 this.manager?.getSource().markAllItemsUnloaded();
                 CoreEvents.trigger(AddonCalendarSyncProvider.MANUAL_SYNCED, result, this.currentSiteId);
@@ -344,6 +342,13 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
         }
     }
 
+    /**
+     * Check whether selected day is current day.
+     */
+    selectedDayIsCurrent(): boolean {
+        return !!this.manager?.getSelectedItem()?.isCurrentDay;
+    }
+
     /**
      * Navigate to a particular event.
      *
@@ -381,10 +386,9 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
             // It's a new event, set the time.
             eventId = 0;
 
-            const visibleDay = this.slides?.getCurrentItem();
-            if (visibleDay) {
-                params.timestamp = moment().year(visibleDay.year).month(visibleDay.monthNumber - 1).date(visibleDay.dayNumber)
-                    .unix() * 1000;
+            const selectedDay = this.manager?.getSelectedItem();
+            if (selectedDay) {
+                params.timestamp = selectedDay.moment.unix() * 1000;
             }
         }
 
@@ -396,26 +400,14 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
     }
 
     /**
-     * Check if user is viewing the current day.
-     */
-    calculateIsCurrentDay(): void {
-        const visibleDay = this.slides?.getCurrentItem();
-        if (!visibleDay) {
-            return;
-        }
-
-        this.isCurrentDay = visibleDay.isCurrentDay;
-    }
-
-    /**
-     * Check whether visible day has offline data.
+     * Check whether selected day has offline data.
      *
-     * @return Whether visible day has offline data.
+     * @return Whether selected day has offline data.
      */
-    visibleDayHasOffline(): boolean {
-        const visibleDay = this.slides?.getCurrentItem();
+    selectedDayHasOffline(): boolean {
+        const selectedDay = this.manager?.getSelectedItem();
 
-        return !!visibleDay && visibleDay.hasOffline;
+        return !!(selectedDay?.hasOffline);
     }
 
     /**
@@ -428,7 +420,9 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
             return;
         }
 
-        const currentDay = CoreTimeUtils.getCurrentDay();
+        const currentDay = {
+            moment: moment(),
+        };
         this.loaded = false;
 
         try {
@@ -436,7 +430,6 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
             await manager.getSource().loadItem(currentDay);
 
             slides.slideToItem(currentDay);
-            this.isCurrentDay = true;
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'addon.calendar.errorloadevents', true);
         } finally {
@@ -458,15 +451,6 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
         this.slides?.slidePrev();
     }
 
-    /**
-     * Slide has changed.
-     *
-     * @param data Data about new item.
-     */
-    slideChanged(data: CoreSwipeCurrentItemData<PreloadedDay>): void {
-        this.viewDay(data.item);
-    }
-
     /**
      * Page destroyed.
      */
@@ -481,20 +465,28 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
         this.onlineObserver?.unsubscribe();
         this.filterChangedObserver?.off();
         this.obsDefaultTimeChange?.off();
+        this.managerUnsubscribe && this.managerUnsubscribe();
     }
 
 }
 
+/**
+ * Basic data to identify a day.
+ */
+type DayBasicData = {
+    moment: moment.Moment;
+};
+
 /**
  * Preloaded month.
  */
-type PreloadedDay = YearMonthDay & CoreSwipeSlidesDynamicItem & {
-    events: AddonCalendarEventToDisplay[]; // Events (both online and offline).
-    onlineEvents: AddonCalendarEventToDisplay[];
-    filteredEvents: AddonCalendarEventToDisplay[];
-    isCurrentDay: boolean;
-    isPastDay: boolean;
-    hasOffline: boolean; // Whether the day has offline data.
+type PreloadedDay = DayBasicData & CoreSwipeSlidesDynamicItem & {
+    events?: AddonCalendarEventToDisplay[]; // Events (both online and offline).
+    onlineEvents?: AddonCalendarEventToDisplay[];
+    filteredEvents?: AddonCalendarEventToDisplay[];
+    isCurrentDay?: boolean;
+    isPastDay?: boolean;
+    hasOffline?: boolean; // Whether the day has offline data.
 };
 
 /**
@@ -506,16 +498,15 @@ class AddonCalendarDaySlidesItemsManagerSource extends CoreSwipeSlidesDynamicIte
     // Offline events classified in month & day.
     offlineEvents: Record<string, Record<number, AddonCalendarEventToDisplay[]>> = {};
     offlineEditedEventsIds: number[] = []; // IDs of events edited in offline.
-    categories: { [id: number]: CoreCategoryData } = {};
-    deletedEvents: number[] = []; // Events deleted in offline.
+    categories?: { [id: number]: CoreCategoryData };
+    deletedEvents?: Set<number>; // Events deleted in offline.
     timeFormat?: string;
     canCreate = false;
 
     protected dayPage: AddonCalendarDayPage;
-    protected categoriesRetrieved = false;
 
-    constructor(page: AddonCalendarDayPage, initialDay: YearMonthDay) {
-        super(initialDay);
+    constructor(page: AddonCalendarDayPage, initialMoment: moment.Moment) {
+        super({ moment: initialMoment });
 
         this.dayPage = page;
     }
@@ -553,7 +544,7 @@ class AddonCalendarDaySlidesItemsManagerSource extends CoreSwipeSlidesDynamicIte
      * @param filter Filter to apply.
      */
     filterEvents(day: PreloadedDay, filter: AddonCalendarFilter): void {
-        day.filteredEvents = AddonCalendarHelper.getFilteredEvents(day.events, filter, this.categories);
+        day.filteredEvents = AddonCalendarHelper.getFilteredEvents(day.events || [], filter, this.categories || {});
     }
 
     /**
@@ -584,20 +575,16 @@ class AddonCalendarDaySlidesItemsManagerSource extends CoreSwipeSlidesDynamicIte
      * @return Promise resolved when done.
      */
     async loadCategories(): Promise<void> {
-        if (this.categoriesRetrieved) {
+        if (this.categories) {
             // Already retrieved, stop.
             return;
         }
 
         try {
-            const cats = await CoreCourses.getCategories(0, true);
-            this.categoriesRetrieved = true;
-            this.categories = {};
+            const categories = await CoreCourses.getCategories(0, true);
 
             // Index categories by ID.
-            cats.forEach((category) => {
-                this.categories[category.id] = category;
-            });
+            this.categories = CoreUtils.arrayToObject(categories, 'id');
         } catch {
             // Ignore errors.
         }
@@ -625,7 +612,9 @@ class AddonCalendarDaySlidesItemsManagerSource extends CoreSwipeSlidesDynamicIte
      * @return Promise resolved when done.
      */
     async loadOfflineDeletedEvents(): Promise<void> {
-        this.deletedEvents = await AddonCalendarOffline.getAllDeletedEventsIds();
+        const deletedEventsIds = await AddonCalendarOffline.getAllDeletedEventsIds();
+
+        this.deletedEvents = new Set(deletedEventsIds);
     }
 
     /**
@@ -640,36 +629,40 @@ class AddonCalendarDaySlidesItemsManagerSource extends CoreSwipeSlidesDynamicIte
     /**
      * @inheritdoc
      */
-    getItemId(item: YearMonthDay): string | number {
-        return AddonCalendarHelper.getDayId(item);
+    getItemId(item: DayBasicData): string | number {
+        return AddonCalendarHelper.getDayId(item.moment);
     }
 
     /**
      * @inheritdoc
      */
-    getPreviousItem(item: YearMonthDay): YearMonthDay | null {
-        return CoreTimeUtils.getPreviousDay(item);
+    getPreviousItem(item: DayBasicData): DayBasicData | null {
+        return {
+            moment: item.moment.clone().subtract(1, 'day'),
+        };
     }
 
     /**
      * @inheritdoc
      */
-    getNextItem(item: YearMonthDay): YearMonthDay | null {
-        return CoreTimeUtils.getNextDay(item);
+    getNextItem(item: DayBasicData): DayBasicData | null {
+        return {
+            moment: item.moment.clone().add(1, 'day'),
+        };
     }
 
     /**
      * @inheritdoc
      */
-    async loadItemData(day: YearMonthDay, preload = false): Promise<PreloadedDay | null> {
+    async loadItemData(day: DayBasicData, preload = false): Promise<PreloadedDay | null> {
         const preloadedDay: PreloadedDay = {
             ...day,
             hasOffline: false,
             events: [],
             onlineEvents: [],
             filteredEvents: [],
-            isCurrentDay: CoreTimeUtils.isSameDay(day, CoreTimeUtils.getCurrentDay()),
-            isPastDay: CoreTimeUtils.isPastDay(day),
+            isCurrentDay: day.moment.isSame(moment(), 'day'),
+            isPastDay: day.moment.isBefore(moment(), 'day'),
         };
 
         if (preload) {
@@ -680,7 +673,7 @@ class AddonCalendarDaySlidesItemsManagerSource extends CoreSwipeSlidesDynamicIte
 
         try {
             // Don't pass courseId and categoryId, we'll filter them locally.
-            result = await AddonCalendar.getDayEvents(day.year, day.monthNumber, day.dayNumber);
+            result = await AddonCalendar.getDayEvents(day.moment.year(), day.moment.month() + 1, day.moment.date());
             preloadedDay.onlineEvents = await Promise.all(
                 result.events.map((event) => AddonCalendarHelper.formatEventData(event)),
             );
@@ -692,7 +685,7 @@ class AddonCalendarDaySlidesItemsManagerSource extends CoreSwipeSlidesDynamicIte
         }
 
         // Schedule notifications for the events retrieved (only future events will be scheduled).
-        AddonCalendar.scheduleEventsNotifications(preloadedDay.onlineEvents);
+        AddonCalendar.scheduleEventsNotifications(preloadedDay.onlineEvents || []);
 
         // Merge the online events with offline data.
         preloadedDay.events = this.mergeEvents(preloadedDay);
@@ -701,7 +694,7 @@ class AddonCalendarDaySlidesItemsManagerSource extends CoreSwipeSlidesDynamicIte
         this.filterEvents(preloadedDay, this.dayPage.filter);
 
         // Re-calculate the formatted time so it uses the device date.
-        const dayTime = moment().year(day.year).month(day.monthNumber - 1).date(day.dayNumber).unix() * 1000;
+        const dayTime = day.moment.unix() * 1000;
         const currentTime = CoreTimeUtils.timestamp();
 
         const promises = preloadedDay.events.map(async (event) => {
@@ -734,19 +727,19 @@ class AddonCalendarDaySlidesItemsManagerSource extends CoreSwipeSlidesDynamicIte
     mergeEvents(day: PreloadedDay): AddonCalendarEventToDisplay[] {
         day.hasOffline = false;
 
-        if (!Object.keys(this.offlineEvents).length && !this.deletedEvents.length) {
+        if (!Object.keys(this.offlineEvents).length && !this.deletedEvents?.size) {
             // No offline events, nothing to merge.
-            return day.onlineEvents;
+            return day.onlineEvents || [];
         }
 
-        const monthOfflineEvents = this.offlineEvents[AddonCalendarHelper.getMonthId(day)];
-        const dayOfflineEvents = monthOfflineEvents && monthOfflineEvents[day.dayNumber];
-        let result = day.onlineEvents;
+        const monthOfflineEvents = this.offlineEvents[AddonCalendarHelper.getMonthId(day.moment)];
+        const dayOfflineEvents = monthOfflineEvents && monthOfflineEvents[day.moment.date()];
+        let result = day.onlineEvents || [];
 
-        if (this.deletedEvents.length) {
+        if (this.deletedEvents?.size) {
             // Mark as deleted the events that were deleted in offline.
             result.forEach((event) => {
-                event.deleted = this.deletedEvents.indexOf(event.id) != -1;
+                event.deleted = this.deletedEvents?.has(event.id);
 
                 if (event.deleted) {
                     day.hasOffline = true;
@@ -758,7 +751,7 @@ class AddonCalendarDaySlidesItemsManagerSource extends CoreSwipeSlidesDynamicIte
             // Remove the online events that were modified in offline.
             result = result.filter((event) => this.offlineEditedEventsIds.indexOf(event.id) == -1);
 
-            if (result.length != day.onlineEvents.length) {
+            if (result.length != day.onlineEvents?.length) {
                 day.hasOffline = true;
             }
         }
@@ -775,24 +768,28 @@ class AddonCalendarDaySlidesItemsManagerSource extends CoreSwipeSlidesDynamicIte
     /**
      * Invalidate content.
      *
-     * @param visibleDay The current visible day.
-     * @param invalidateDayEvents Whether to invalidate visible day events.
+     * @param selectedDay The current selected day.
+     * @param invalidateDayEvents Whether to invalidate selected day events.
      * @return Promise resolved when done.
      */
-    async invalidateContent(visibleDay: PreloadedDay | null, invalidateDayEvents?: boolean): Promise<void> {
+    async invalidateContent(selectedDay: PreloadedDay | null, invalidateDayEvents?: boolean): Promise<void> {
         const promises: Promise<void>[] = [];
 
-        if (invalidateDayEvents && visibleDay) {
-            promises.push(AddonCalendar.invalidateDayEvents(visibleDay.year, visibleDay.monthNumber, visibleDay.dayNumber));
+        if (invalidateDayEvents && selectedDay) {
+            promises.push(AddonCalendar.invalidateDayEvents(
+                selectedDay.moment.year(),
+                selectedDay.moment.month() + 1,
+                selectedDay.moment.date(),
+            ));
         }
         promises.push(AddonCalendar.invalidateAllowedEventTypes());
         promises.push(CoreCourses.invalidateCategories(0, true));
         promises.push(AddonCalendar.invalidateTimeFormat());
 
-        this.categoriesRetrieved = false; // Get categories again.
+        this.categories = undefined; // Get categories again.
 
-        if (visibleDay) {
-            visibleDay.dirty = true;
+        if (selectedDay) {
+            selectedDay.dirty = true;
         }
 
         await Promise.all(promises);
@@ -807,7 +804,7 @@ class AddonCalendarDaySlidesItemsManagerSource extends CoreSwipeSlidesDynamicIte
     markAsDeleted(eventId: number, deleted: boolean): void {
         // Mark the event as deleted or not.
         this.getItems()?.some(day => {
-            const event = day.onlineEvents.find((event) => event.id == eventId);
+            const event = day.onlineEvents?.find((event) => event.id == eventId);
 
             if (!event) {
                 return false;
@@ -819,8 +816,8 @@ class AddonCalendarDaySlidesItemsManagerSource extends CoreSwipeSlidesDynamicIte
                 day.hasOffline = true;
             } else {
                 // Re-calculate "hasOffline".
-                day.hasOffline = day.events.length != day.onlineEvents.length ||
-                    day.events.some((event) => event.deleted || event.offline);
+                day.hasOffline = day.events?.length != day.onlineEvents?.length ||
+                    day.events?.some((event) => event.deleted || event.offline);
             }
 
             return true;
@@ -828,14 +825,9 @@ class AddonCalendarDaySlidesItemsManagerSource extends CoreSwipeSlidesDynamicIte
 
         // Add it or remove it from the list of deleted events.
         if (deleted) {
-            if (!this.deletedEvents.includes(eventId)) {
-                this.deletedEvents.push(eventId);
-            }
+            this.deletedEvents?.add(eventId);
         } else {
-            const index = this.deletedEvents.indexOf(eventId);
-            if (index != -1) {
-                this.deletedEvents.splice(index, 1);
-            }
+            this.deletedEvents?.delete(eventId);
         }
     }
 
diff --git a/src/addons/calendar/services/calendar-helper.ts b/src/addons/calendar/services/calendar-helper.ts
index 74f588a7b..776c2b38d 100644
--- a/src/addons/calendar/services/calendar-helper.ts
+++ b/src/addons/calendar/services/calendar-helper.ts
@@ -37,7 +37,6 @@ import { AddonCalendarSyncInvalidateEvent } from './calendar-sync';
 import { AddonCalendarOfflineEventDBRecord } from './database/calendar-offline';
 import { CoreCategoryData } from '@features/courses/services/courses';
 import { AddonCalendarReminderDBRecord } from './database/calendar';
-import { YearAndMonth, YearMonthDay } from '@services/utils/time';
 
 /**
  * Context levels enumeration.
@@ -141,7 +140,7 @@ export class AddonCalendarHelperProvider {
 
             // Add the event to all the days it lasts.
             while (!treatedDay.isAfter(endDay, 'day')) {
-                const monthId = this.getMonthId({ year: treatedDay.year(), monthNumber: treatedDay.month() + 1 });
+                const monthId = this.getMonthId(treatedDay);
                 const day = treatedDay.date();
 
                 if (!result[monthId]) {
@@ -367,21 +366,21 @@ export class AddonCalendarHelperProvider {
     /**
      * Get the month "id".
      *
-     * @param month Month data.
+     * @param moment Month moment.
      * @return The "id".
      */
-    getMonthId(month: YearAndMonth): string {
-        return `${month.year}#${month.monthNumber}`;
+    getMonthId(moment: moment.Moment): string {
+        return `${moment.year()}#${moment.month() + 1}`;
     }
 
     /**
      * Get the day "id".
      *
-     * @param day Day data.
+     * @param day Day moment.
      * @return The "id".
      */
-    getDayId(day: YearMonthDay): string {
-        return `${day.year}#${day.monthNumber}#${day.dayNumber}`;
+    getDayId(moment: moment.Moment): string {
+        return `${this.getMonthId(moment)}#${moment.date()}`;
     }
 
     /**
@@ -660,7 +659,7 @@ export class AddonCalendarHelperProvider {
             fetchTimestarts.map((fetchTime) => {
                 const day = moment(new Date(fetchTime * 1000));
 
-                const monthId = this.getMonthId({ year: day.year(), monthNumber: day.month() + 1 });
+                const monthId = this.getMonthId(day);
                 if (!treatedMonths[monthId]) {
                     // Month not refetch or invalidated already, do it now.
                     treatedMonths[monthId] = true;
@@ -696,7 +695,7 @@ export class AddonCalendarHelperProvider {
             invalidateTimestarts.map((fetchTime) => {
                 const day = moment(new Date(fetchTime * 1000));
 
-                const monthId = this.getMonthId({ year: day.year(), monthNumber: day.month() + 1 });
+                const monthId = this.getMonthId(day);
                 if (!treatedMonths[monthId]) {
                     // Month not refetch or invalidated already, do it now.
                     treatedMonths[monthId] = true;
diff --git a/src/addons/calendar/services/calendar-sync.ts b/src/addons/calendar/services/calendar-sync.ts
index 56f3e8a3c..12d26e5bb 100644
--- a/src/addons/calendar/services/calendar-sync.ts
+++ b/src/addons/calendar/services/calendar-sync.ts
@@ -29,6 +29,7 @@ import { AddonCalendarHelper } from './calendar-helper';
 import { makeSingleton, Translate } from '@singletons';
 import { CoreSync } from '@services/sync';
 import { CoreNetworkError } from '@classes/errors/network-error';
+import moment from 'moment';
 
 /**
  * Service to sync calendar.
@@ -307,9 +308,7 @@ export type AddonCalendarSyncEvents = {
     toinvalidate: AddonCalendarSyncInvalidateEvent[];
     updated: boolean;
     source?: string; // Added on pages.
-    day?: number; // Added on day page.
-    month?: number; // Added on day page.
-    year?: number; // Added on day page.
+    moment?: moment.Moment; // Added on day page.
 };
 
 export type AddonCalendarSyncInvalidateEvent = {
diff --git a/src/addons/mod/assign/pages/submission-review/submission-review.ts b/src/addons/mod/assign/pages/submission-review/submission-review.ts
index 7f2e278cd..20342ef15 100644
--- a/src/addons/mod/assign/pages/submission-review/submission-review.ts
+++ b/src/addons/mod/assign/pages/submission-review/submission-review.ts
@@ -15,7 +15,7 @@
 import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, ActivatedRouteSnapshot } from '@angular/router';
 import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
-import { CoreSwipeItemsManager } from '@classes/items-management/swipe-items-manager';
+import { CoreSwipeNavigationItemsManager } from '@classes/items-management/swipe-navigation-items-manager';
 import { CoreCourse } from '@features/course/services/course';
 import { CanLeave } from '@guards/can-leave';
 import { IonRefresher } from '@ionic/angular';
@@ -216,7 +216,7 @@ export class AddonModAssignSubmissionReviewPage implements OnInit, OnDestroy, Ca
 /**
  * Helper to manage swiping within a collection of submissions.
  */
-class AddonModAssignSubmissionSwipeItemsManager extends CoreSwipeItemsManager {
+class AddonModAssignSubmissionSwipeItemsManager extends CoreSwipeNavigationItemsManager {
 
     /**
      * @inheritdoc
diff --git a/src/addons/mod/book/components/index/addon-mod-book-index.html b/src/addons/mod/book/components/index/addon-mod-book-index.html
index 83787d103..247a4b5c7 100644
--- a/src/addons/mod/book/components/index/addon-mod-book-index.html
+++ b/src/addons/mod/book/components/index/addon-mod-book-index.html
@@ -40,14 +40,14 @@
             previousTranslate="addon.mod_book.navprevtitle" nextTranslate="addon.mod_book.navnexttitle" (action)="changeChapter($event.id)">
         </core-navigation-bar>
 
-        <core-swipe-slides [manager]="manager" [options]="slidesOpts" (onWillChange)="slideChanged($event)">
-            <ng-template let-item="item">
+        <core-swipe-slides [manager]="manager" [options]="slidesOpts">
+            <ng-template let-chapter="item">
                 <div class="ion-padding">
-                    <core-format-text [component]="component" [componentId]="componentId" [text]="item.content" contextLevel="module"
+                    <core-format-text [component]="component" [componentId]="componentId" [text]="chapter.content" contextLevel="module"
                         [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text>
-                    <div class="ion-margin-top" *ngIf="tagsEnabled && item.tags?.length > 0">
+                    <div class="ion-margin-top" *ngIf="chapter.tags?.length > 0">
                         <strong>{{ 'core.tag.tags' | translate }}: </strong>
-                        <core-tag-list [tags]="item.tags"></core-tag-list>
+                        <core-tag-list [tags]="chapter.tags"></core-tag-list>
                     </div>
                 </div>
             </ng-template>
diff --git a/src/addons/mod/book/components/index/index.ts b/src/addons/mod/book/components/index/index.ts
index 4c9f35cbd..d7f78d112 100644
--- a/src/addons/mod/book/components/index/index.ts
+++ b/src/addons/mod/book/components/index/index.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, Optional, Input, OnInit, ViewChild, ElementRef } from '@angular/core';
+import { Component, Optional, Input, OnInit, ViewChild, ElementRef, OnDestroy } from '@angular/core';
 import { CoreCourseModuleMainResourceComponent } from '@features/course/classes/main-resource-component';
 import {
     AddonModBookProvider,
@@ -31,10 +31,11 @@ import { AddonModBookTocComponent } from '../toc/toc';
 import { CoreNavigationBarItem } from '@components/navigation-bar/navigation-bar';
 import { CoreError } from '@classes/errors/error';
 import { Translate } from '@singletons';
-import { CoreSwipeCurrentItemData, CoreSwipeSlidesComponent, CoreSwipeSlidesOptions } from '@components/swipe-slides/swipe-slides';
-import { CoreSwipeSlidesItemsManagerSource } from '@classes/items-management/slides-items-manager-source';
+import { CoreSwipeSlidesComponent, CoreSwipeSlidesOptions } from '@components/swipe-slides/swipe-slides';
+import { CoreSwipeSlidesItemsManagerSource } from '@classes/items-management/swipe-slides-items-manager-source';
 import { CoreCourseModule } from '@features/course/services/course-helper';
-import { CoreSwipeSlidesItemsManager } from '@classes/items-management/slides-items-manager';
+import { CoreSwipeSlidesItemsManager } from '@classes/items-management/swipe-slides-items-manager';
+import { CoreTextUtils } from '@services/utils/text';
 
 /**
  * Component that displays a book.
@@ -43,7 +44,7 @@ import { CoreSwipeSlidesItemsManager } from '@classes/items-management/slides-it
     selector: 'addon-mod-book-index',
     templateUrl: 'addon-mod-book-index.html',
 })
-export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComponent implements OnInit {
+export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy {
 
     @ViewChild(CoreSwipeSlidesComponent) slides?: CoreSwipeSlidesComponent;
 
@@ -51,9 +52,6 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
 
     component = AddonModBookProvider.COMPONENT;
     manager?: CoreSwipeSlidesItemsManager<LoadedChapter, AddonModBookSlidesItemsManagerSource>;
-    previousChapter?: AddonModBookTocChapter;
-    nextChapter?: AddonModBookTocChapter;
-    tagsEnabled = false;
     warning = '';
     displayNavBar = true;
     navigationItems: CoreNavigationBarItem<AddonModBookTocChapter>[] = [];
@@ -63,8 +61,9 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
         scrollOnChange: 'top',
     };
 
-    protected currentChapter?: number;
+    protected firstLoad = true;
     protected element: HTMLElement;
+    protected managerUnsubscribe?: () => void;
 
     constructor(
         elementRef: ElementRef,
@@ -81,14 +80,18 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
     async ngOnInit(): Promise<void> {
         super.ngOnInit();
 
-        this.tagsEnabled = CoreTag.areTagsAvailableInSite();
         const source = new AddonModBookSlidesItemsManagerSource(
             this.courseId,
             this.module,
-            this.tagsEnabled,
+            CoreTag.areTagsAvailableInSite(),
             this.initialChapterId,
         );
         this.manager = new CoreSwipeSlidesItemsManager(source);
+        this.managerUnsubscribe = this.manager.addListener({
+            onSelectedItemUpdated: (item) => {
+                this.onChapterViewed(item.id);
+            },
+        });
 
         this.loadContent();
     }
@@ -106,12 +109,14 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
      */
     async showToc(): Promise<void> {
         // Create the toc modal.
+        const visibleChapter = this.manager?.getSelectedItem();
+
         const modalData = await CoreDomUtils.openSideModal<number>({
             component: AddonModBookTocComponent,
             componentProps: {
                 moduleId: this.module.id,
                 chapters: this.chapters,
-                selected: this.currentChapter,
+                selected: visibleChapter,
                 courseId: this.courseId,
                 book: this.book,
             },
@@ -129,7 +134,7 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
      * @return Promise resolved when done.
      */
     changeChapter(chapterId: number): void {
-        if (!chapterId || chapterId === this.currentChapter) {
+        if (!chapterId) {
             return;
         }
 
@@ -183,14 +188,15 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
     }
 
     /**
-     * View a book chapter.
+     * Update data related to chapter being viewed.
      *
-     * @param chapterId Chapter to load.
-     * @param logChapterId Whether chapter ID should be passed to the log view function.
+     * @param chapterId Chapter viewed.
      * @return Promise resolved when done.
      */
-    protected async viewChapter(chapterId: number, logChapterId: boolean): Promise<void> {
-        this.currentChapter = chapterId;
+    protected async onChapterViewed(chapterId: number): Promise<void> {
+        // Don't log the chapter ID when the user has just opened the book.
+        const logChapterId = this.firstLoad;
+        this.firstLoad = false;
 
         if (this.displayNavBar) {
             this.navigationItems = this.getNavigationItems(chapterId);
@@ -212,15 +218,6 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
         }
     }
 
-    /**
-     * Slide has changed.
-     *
-     * @param data Data about new item.
-     */
-    slideChanged(data: CoreSwipeCurrentItemData<LoadedChapter>): void {
-        this.viewChapter(data.item.id, true);
-    }
-
     /**
      * Converts chapters to navigation items.
      *
@@ -236,11 +233,20 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
         }));
     }
 
+    /**
+     * @inheritdoc
+     */
+    ngOnDestroy(): void {
+        super.ngOnDestroy();
+
+        this.managerUnsubscribe && this.managerUnsubscribe();
+    }
+
 }
 
 type LoadedChapter = {
     id: number;
-    content: string;
+    content?: string;
     tags?: CoreTagItem[];
 };
 
@@ -287,7 +293,6 @@ class AddonModBookSlidesItemsManagerSource extends CoreSwipeSlidesItemsManagerSo
      * Load module contents.
      */
     async loadContents(): Promise<void> {
-        // Get contents. No need to refresh, it has been done in downloadResourceIfNeeded.
         const contents = await CoreCourse.getModuleContents(this.MODULE, this.COURSE_ID);
 
         this.contentsMap = AddonModBook.getContentsMap(contents);
@@ -310,10 +315,9 @@ class AddonModBookSlidesItemsManagerSource extends CoreSwipeSlidesItemsManagerSo
             }));
 
             return newChapters;
-        } catch (exception) {
-            const error = exception ?? new CoreError(Translate.instant('addon.mod_book.errorchapter'));
-            if (!error.message) {
-                error.message = Translate.instant('addon.mod_book.errorchapter');
+        } catch (error) {
+            if (!CoreTextUtils.getErrorMessageFromError(error)) {
+                throw new CoreError(Translate.instant('addon.mod_book.errorchapter'));
             }
 
             throw error;
diff --git a/src/addons/mod/forum/classes/forum-discussions-swipe-manager.ts b/src/addons/mod/forum/classes/forum-discussions-swipe-manager.ts
index d409a6f58..2b1ca1e99 100644
--- a/src/addons/mod/forum/classes/forum-discussions-swipe-manager.ts
+++ b/src/addons/mod/forum/classes/forum-discussions-swipe-manager.ts
@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { CoreSwipeItemsManager } from '@classes/items-management/swipe-items-manager';
+import { CoreSwipeNavigationItemsManager } from '@classes/items-management/swipe-navigation-items-manager';
 import { AddonModForumDiscussionItem, AddonModForumDiscussionsSource } from './forum-discussions-source';
 
 /**
  * Helper to manage swiping within a collection of discussions.
  */
 export class AddonModForumDiscussionsSwipeManager
-    extends CoreSwipeItemsManager<AddonModForumDiscussionItem, AddonModForumDiscussionsSource> {
+    extends CoreSwipeNavigationItemsManager<AddonModForumDiscussionItem, AddonModForumDiscussionsSource> {
 
     /**
      * @inheritdoc
diff --git a/src/addons/mod/glossary/classes/glossary-entries-swipe-manager.ts b/src/addons/mod/glossary/classes/glossary-entries-swipe-manager.ts
index 45015a760..c6fc2bb57 100644
--- a/src/addons/mod/glossary/classes/glossary-entries-swipe-manager.ts
+++ b/src/addons/mod/glossary/classes/glossary-entries-swipe-manager.ts
@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { CoreSwipeItemsManager } from '@classes/items-management/swipe-items-manager';
+import { CoreSwipeNavigationItemsManager } from '@classes/items-management/swipe-navigation-items-manager';
 import { AddonModGlossaryEntriesSource, AddonModGlossaryEntryItem } from './glossary-entries-source';
 
 /**
  * Helper to manage swiping within a collection of glossary entries.
  */
 export abstract class AddonModGlossaryEntriesSwipeManager
-    extends CoreSwipeItemsManager<AddonModGlossaryEntryItem, AddonModGlossaryEntriesSource> {
+    extends CoreSwipeNavigationItemsManager<AddonModGlossaryEntryItem, AddonModGlossaryEntriesSource> {
 
     /**
      * @inheritdoc
diff --git a/src/core/classes/items-management/items-manager-source.ts b/src/core/classes/items-management/items-manager-source.ts
index c6b8fd275..4a2c7de2e 100644
--- a/src/core/classes/items-management/items-manager-source.ts
+++ b/src/core/classes/items-management/items-manager-source.ts
@@ -15,7 +15,7 @@
 /**
  * Updates listener.
  */
-export interface CoreItemsListSourceListener<Item> {
+export interface CoreItemsManagerSourceListener<Item> {
     onItemsUpdated?(items: Item[]): void;
     onReset?(): void;
 }
@@ -26,16 +26,40 @@ export interface CoreItemsListSourceListener<Item> {
 export abstract class CoreItemsManagerSource<Item = unknown> {
 
     protected items: Item[] | null = null;
-    protected listeners: CoreItemsListSourceListener<Item>[] = [];
+    protected listeners: CoreItemsManagerSourceListener<Item>[] = [];
     protected dirty = false;
+    protected loaded = false;
+    protected loadedPromise: Promise<void>;
+    protected resolveLoaded!: () => void;
+
+    constructor() {
+        this.loadedPromise = new Promise(resolve => this.resolveLoaded = resolve);
+    }
 
     /**
-     * Check whether any item has been loaded.
+     * Check whether data is loaded.
      *
-     * @returns Whether any item has been loaded.
+     * @returns Whether data is loaded.
      */
     isLoaded(): boolean {
-        return this.items !== null;
+        return this.loaded;
+    }
+
+    /**
+     * Return a promise that is resolved when the data is loaded.
+     *
+     * @return Promise.
+     */
+    waitForLoaded(): Promise<void> {
+        return this.loadedPromise;
+    }
+
+    /**
+     * Mark the source as initialized.
+     */
+    protected setLoaded(): void {
+        this.loaded = true;
+        this.resolveLoaded();
     }
 
     /**
@@ -79,7 +103,7 @@ export abstract class CoreItemsManagerSource<Item = unknown> {
      * @param listener Listener.
      * @returns Unsubscribe function.
      */
-    addListener(listener: CoreItemsListSourceListener<Item>): () => void {
+    addListener(listener: CoreItemsManagerSourceListener<Item>): () => void {
         this.listeners.push(listener);
 
         return () => this.removeListener(listener);
@@ -90,7 +114,7 @@ export abstract class CoreItemsManagerSource<Item = unknown> {
      *
      * @param listener Listener.
      */
-    removeListener(listener: CoreItemsListSourceListener<Item>): void {
+    removeListener(listener: CoreItemsManagerSourceListener<Item>): void {
         const index = this.listeners.indexOf(listener);
 
         if (index === -1) {
@@ -107,6 +131,7 @@ export abstract class CoreItemsManagerSource<Item = unknown> {
      */
     protected setItems(items: Item[]): void {
         this.items = items;
+        this.setLoaded();
 
         this.notifyItemsUpdated();
     }
diff --git a/src/core/classes/items-management/items-manager.ts b/src/core/classes/items-management/items-manager.ts
index dda251c1e..2cc88a2ac 100644
--- a/src/core/classes/items-management/items-manager.ts
+++ b/src/core/classes/items-management/items-manager.ts
@@ -14,6 +14,13 @@
 
 import { CoreItemsManagerSource } from './items-manager-source';
 
+/**
+ * Listeners.
+ */
+export interface CoreItemsanagerListener<Item> {
+    onSelectedItemUpdated?(item: Item): void;
+}
+
 /**
  * Helper to manage a collection of items in a page.
  */
@@ -25,6 +32,7 @@ export abstract class CoreItemsManager<
     protected source?: { instance: Source; unsubscribe: () => void };
     protected itemsMap: Record<string, Item> | null = null;
     protected selectedItem: Item | null = null;
+    protected listeners: CoreItemsanagerListener<Item>[] = [];
 
     constructor(source: Source) {
         this.setSource(source);
@@ -96,6 +104,35 @@ export abstract class CoreItemsManager<
      */
     setSelectedItem(item: Item | null): void {
         this.selectedItem = item;
+
+        this.listeners.forEach(listener => listener.onSelectedItemUpdated?.call(listener, item));
+    }
+
+    /**
+     * Register a listener.
+     *
+     * @param listener Listener.
+     * @returns Unsubscribe function.
+     */
+    addListener(listener: CoreItemsanagerListener<Item>): () => void {
+        this.listeners.push(listener);
+
+        return () => this.removeListener(listener);
+    }
+
+    /**
+     * Remove a listener.
+     *
+     * @param listener Listener.
+     */
+    removeListener(listener: CoreItemsanagerListener<Item>): void {
+        const index = this.listeners.indexOf(listener);
+
+        if (index === -1) {
+            return;
+        }
+
+        this.listeners.splice(index, 1);
     }
 
     /**
@@ -103,9 +140,12 @@ export abstract class CoreItemsManager<
      *
      * @param items New items.
      */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     protected onSourceItemsUpdated(items: Item[]): void {
-        // Nothing to do.
+        this.itemsMap = items.reduce((map, item) => {
+            map[this.getItemId(item)] = item;
+
+            return map;
+        }, {});
     }
 
     /**
@@ -116,4 +156,22 @@ export abstract class CoreItemsManager<
         this.selectedItem = null;
     }
 
+    /**
+     * Get item by ID.
+     *
+     * @param id ID
+     * @return Item, null if not found.
+     */
+    getItemById(id: string | number): Item | null {
+        return this.itemsMap?.[id] ?? null;
+    }
+
+    /**
+     * Get an ID to identify an item.
+     *
+     * @param item Data about the item.
+     * @return Item ID.
+     */
+    abstract getItemId(item: Item): string | number;
+
 }
diff --git a/src/core/classes/items-management/routed-items-manager.ts b/src/core/classes/items-management/routed-items-manager.ts
index fe8aa8d38..6feb244cc 100644
--- a/src/core/classes/items-management/routed-items-manager.ts
+++ b/src/core/classes/items-management/routed-items-manager.ts
@@ -123,13 +123,16 @@ export abstract class CoreRoutedItemsManager<
      * @inheritdoc
      */
     protected onSourceItemsUpdated(items: Item[]): void {
-        this.itemsMap = items.reduce((map, item) => {
-            map[this.getSource().getItemPath(item)] = item;
-
-            return map;
-        }, {});
+        super.onSourceItemsUpdated(items);
 
         this.updateSelectedItem();
     }
 
+    /**
+     * @inheritdoc
+     */
+    getItemId(item: Item): string | number {
+        return this.getSource().getItemPath(item);
+    }
+
 }
diff --git a/src/core/classes/items-management/swipe-items-manager.ts b/src/core/classes/items-management/swipe-navigation-items-manager.ts
similarity index 97%
rename from src/core/classes/items-management/swipe-items-manager.ts
rename to src/core/classes/items-management/swipe-navigation-items-manager.ts
index 0290206ef..a156cedc9 100644
--- a/src/core/classes/items-management/swipe-items-manager.ts
+++ b/src/core/classes/items-management/swipe-navigation-items-manager.ts
@@ -22,7 +22,7 @@ import { CoreRoutedItemsManagerSource } from './routed-items-manager-source';
 /**
  * Helper class to manage the state and routing of a swipeable page.
  */
-export class CoreSwipeItemsManager<
+export class CoreSwipeNavigationItemsManager<
     Item = unknown,
     Source extends CoreRoutedItemsManagerSource<Item> = CoreRoutedItemsManagerSource<Item>
 >
@@ -99,7 +99,7 @@ export class CoreSwipeItemsManager<
     protected async getItemBy(delta: number): Promise<Item | null> {
         const items = this.getSource().getItems();
 
-        // Get current item.
+        // Get selected item.
         const index = (this.selectedItem && items?.indexOf(this.selectedItem)) ?? -1;
 
         if (index === -1) {
diff --git a/src/core/classes/items-management/slides-dynamic-items-manager-source.ts b/src/core/classes/items-management/swipe-slides-dynamic-items-manager-source.ts
similarity index 77%
rename from src/core/classes/items-management/slides-dynamic-items-manager-source.ts
rename to src/core/classes/items-management/swipe-slides-dynamic-items-manager-source.ts
index a7324ebbc..cd54848c8 100644
--- a/src/core/classes/items-management/slides-dynamic-items-manager-source.ts
+++ b/src/core/classes/items-management/swipe-slides-dynamic-items-manager-source.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { CoreSwipeSlidesItemsManagerSource } from './slides-items-manager-source';
+import { CoreSwipeSlidesItemsManagerSource } from './swipe-slides-items-manager-source';
 
 /**
  * Items collection source data for "swipe slides".
@@ -26,16 +26,16 @@ export abstract class CoreSwipeSlidesDynamicItemsManagerSource<Item extends Core
     /**
      * @inheritdoc
      */
-    async load(currentItem?: Partial<Item> | null): Promise<void> {
-        if (!this.initialized && this.initialItem) {
+    async load(selectedItem?: Item | null): Promise<void> {
+        if (!this.loaded && this.initialItem) {
             // Load the initial item.
             await this.loadItem(this.initialItem);
-        } else if (this.initialized && currentItem) {
-            // Reload current item if needed.
-            await this.loadItem(currentItem);
+        } else if (this.loaded && selectedItem) {
+            // Reload selected item if needed.
+            await this.loadItem(selectedItem);
         }
 
-        this.setInitialized();
+        this.setLoaded();
     }
 
     /**
@@ -49,35 +49,35 @@ export abstract class CoreSwipeSlidesDynamicItemsManagerSource<Item extends Core
     /**
      * Load a certain item and preload next and previous ones.
      *
-     * @param item Basic data about the item to load.
+     * @param item Item to load.
      * @return Promise resolved when done.
      */
-    async loadItem(item: Partial<Item>): Promise<void> {
+    async loadItem(item: Item): Promise<void> {
         const previousItem = this.getPreviousItem(item);
         const nextItem = this.getNextItem(item);
 
         await Promise.all([
             this.loadItemInList(item, false),
-            previousItem ? this.loadItemInList(previousItem, true) : undefined,
-            nextItem ? this.loadItemInList(nextItem, true) : undefined,
+            previousItem && this.loadItemInList(previousItem, true),
+            nextItem && this.loadItemInList(nextItem, true),
         ]);
     }
 
     /**
      * Load or preload a certain item and add it to the list.
      *
-     * @param item Basic data about the item to load.
+     * @param item Item to load.
      * @param preload Whether to preload.
      * @return Promise resolved when done.
      */
-    async loadItemInList(item: Partial<Item>, preload = false): Promise<void> {
+    async loadItemInList(item: Item, preload = false): Promise<void> {
         const preloadedItem = await this.performLoadItemData(item, preload);
         if (!preloadedItem) {
             return;
         }
 
         // Add the item at the right position.
-        const existingItem = this.getItem(item);
+        const existingItem = this.getItem(this.getItemId(item));
         if (existingItem) {
             // Already in list, no need to add it.
             return;
@@ -94,19 +94,19 @@ export abstract class CoreSwipeSlidesDynamicItemsManagerSource<Item extends Core
 
         const added = this.items.some((item, index) => {
             const itemId = this.getItemId(item);
-            let positionToInsert = -1;
+            let indexToInsert = -1;
             if (itemId === previousItemId) {
                 // Previous item found, add the item after it.
-                positionToInsert = index + 1;
+                indexToInsert = index + 1;
             }
 
             if (itemId === nextItemId) {
                 // Next item found, add the item before it.
-                positionToInsert = index;
+                indexToInsert = index;
             }
 
-            if (positionToInsert > -1) {
-                this.items?.splice(positionToInsert, 0, preloadedItem);
+            if (indexToInsert > -1) {
+                this.items?.splice(indexToInsert, 0, preloadedItem);
 
                 return true;
             }
@@ -124,19 +124,19 @@ export abstract class CoreSwipeSlidesDynamicItemsManagerSource<Item extends Core
      * Load or preload a certain item data.
      * This helper function will check some common cases so they don't have to be replicated in all loadItemData implementations.
      *
-     * @param item Basic data about the item to load.
+     * @param item Item to load.
      * @param preload Whether to preload.
      * @return Promise resolved with item. Resolve with null if already loading or item is not valid (e.g. there are no more items).
      */
-    protected async performLoadItemData(item: Partial<Item>, preload: boolean): Promise<Item | null> {
+    protected async performLoadItemData(item: Item, preload: boolean): Promise<Item | null> {
         const itemId = this.getItemId(item);
 
-        if (!itemId || this.loadingItems[itemId]) {
-            // Not valid or already loading, ignore it.
+        if (this.loadingItems[itemId]) {
+            // Already loading, ignore it.
             return null;
         }
 
-        const existingItem = this.getItem(item);
+        const existingItem = this.getItem(itemId);
         if (existingItem && ((existingItem.loaded && !existingItem.dirty) || preload)) {
             // Already loaded, or preloading an already preloaded item.
             return existingItem;
@@ -191,7 +191,7 @@ export abstract class CoreSwipeSlidesDynamicItemsManagerSource<Item extends Core
      * @param preload Whether to preload.
      * @return Promise resolved with item. Resolve with null if item is not valid (e.g. there are no more items).
      */
-    abstract loadItemData(item: Partial<Item>, preload: boolean): Promise<Item | null>;
+    abstract loadItemData(item: Item, preload: boolean): Promise<Item | null>;
 
     /**
      * Return the data to identify the previous item.
@@ -199,7 +199,7 @@ export abstract class CoreSwipeSlidesDynamicItemsManagerSource<Item extends Core
      * @param item Data about the item.
      * @return Previous item data. Null if no previous item.
      */
-    abstract getPreviousItem(item: Partial<Item>): Partial<Item> | null;
+    abstract getPreviousItem(item: Item): Item | null;
 
     /**
      * Return the data to identify the next item.
@@ -207,7 +207,7 @@ export abstract class CoreSwipeSlidesDynamicItemsManagerSource<Item extends Core
      * @param item Data about the item.
      * @return Next item data. Null if no next item.
      */
-    abstract getNextItem(item: Partial<Item>): Partial<Item> | null;
+    abstract getNextItem(item: Item): Item | null;
 
 }
 
diff --git a/src/core/classes/items-management/slides-dynamic-items-manager.ts b/src/core/classes/items-management/swipe-slides-dynamic-items-manager.ts
similarity index 89%
rename from src/core/classes/items-management/slides-dynamic-items-manager.ts
rename to src/core/classes/items-management/swipe-slides-dynamic-items-manager.ts
index 718e71389..6bbb5d542 100644
--- a/src/core/classes/items-management/slides-dynamic-items-manager.ts
+++ b/src/core/classes/items-management/swipe-slides-dynamic-items-manager.ts
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { CoreSwipeSlidesDynamicItem, CoreSwipeSlidesDynamicItemsManagerSource } from './slides-dynamic-items-manager-source';
-import { CoreSwipeSlidesItemsManager } from './slides-items-manager';
+import { CoreSwipeSlidesDynamicItem, CoreSwipeSlidesDynamicItemsManagerSource } from './swipe-slides-dynamic-items-manager-source';
+import { CoreSwipeSlidesItemsManager } from './swipe-slides-items-manager';
 
 /**
  * Helper class to manage items for core-swipe-slides.
diff --git a/src/core/classes/items-management/slides-items-manager-source.ts b/src/core/classes/items-management/swipe-slides-items-manager-source.ts
similarity index 50%
rename from src/core/classes/items-management/slides-items-manager-source.ts
rename to src/core/classes/items-management/swipe-slides-items-manager-source.ts
index e45c9d5b9..7dd41b754 100644
--- a/src/core/classes/items-management/slides-items-manager-source.ts
+++ b/src/core/classes/items-management/swipe-slides-items-manager-source.ts
@@ -19,40 +19,12 @@ import { CoreItemsManagerSource } from './items-manager-source';
  */
 export abstract class CoreSwipeSlidesItemsManagerSource<Item = unknown> extends CoreItemsManagerSource<Item> {
 
-    protected initialItem?: Partial<Item>;
-    protected initialized = false;
-    protected initializePromise: Promise<void>;
-    protected resolveInitialize!: () => void;
+    protected initialItem?: Item;
 
-    constructor(initialItem?: Partial<Item>) {
+    constructor(initialItem?: Item) {
         super();
 
         this.initialItem = initialItem;
-        this.initializePromise = new Promise(resolve => this.resolveInitialize = resolve);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    isLoaded(): boolean {
-        return this.initialized && super.isLoaded();
-    }
-
-    /**
-     * Return a promise that is resolved when the source is initialized.
-     *
-     * @return Promise.
-     */
-    waitForInitialized(): Promise<void> {
-        return this.initializePromise;
-    }
-
-    /**
-     * Mark the source as initialized.
-     */
-    protected setInitialized(): void {
-        this.initialized = true;
-        this.resolveInitialize();
     }
 
     /**
@@ -62,7 +34,6 @@ export abstract class CoreSwipeSlidesItemsManagerSource<Item = unknown> extends
         const items = await this.loadItems();
 
         this.setItems(items);
-        this.setInitialized();
     }
 
     /**
@@ -75,47 +46,56 @@ export abstract class CoreSwipeSlidesItemsManagerSource<Item = unknown> extends
     /**
      * Get a certain item.
      *
-     * @param item Partial data about the item to search.
+     * @param id Item ID.
      * @return Item, null if not found.
      */
-    getItem(item: Partial<Item>): Item | null {
-        const index = this.getItemPosition(item);
+    getItem(id: string | number): Item | null {
+        const index = this.getItemIndexById(id);
 
         return this.items?.[index] ?? null;
     }
 
     /**
-     * Get a certain item position.
+     * Get a certain item index.
      *
-     * @param item Item to search.
-     * @return Item position, -1 if not found.
+     * @param item Item.
+     * @return Item index, -1 if not found.
      */
-    getItemPosition(item: Partial<Item>): number {
-        const itemId = this.getItemId(item);
-        const index = this.items?.findIndex((listItem) => itemId === this.getItemId(listItem));
+    getItemIndex(item: Item): number {
+        return this.getItemIndexById(this.getItemId(item));
+    }
+
+    /**
+     * Get a certain item index.
+     *
+     * @param id Item ID.
+     * @return Item index, -1 if not found.
+     */
+    getItemIndexById(id: string | number): number {
+        const index = this.items?.findIndex((listItem) => id === this.getItemId(listItem));
 
         return index ?? -1;
     }
 
     /**
-     * Get initial item position.
+     * Get initial item index.
      *
-     * @return Initial item position.
+     * @return Initial item index.
      */
-    getInitialPosition(): number {
+    getInitialItemIndex(): number {
         if (!this.initialItem) {
             return 0;
         }
 
-        return this.getItemPosition(this.initialItem);
+        return this.getItemIndex(this.initialItem);
     }
 
     /**
      * Get the ID of an item.
      *
-     * @param item Data about the item.
+     * @param item Item.
      * @return Item ID.
      */
-    abstract getItemId(item: Partial<Item>): string | number;
+    abstract getItemId(item: Item): string | number;
 
 }
diff --git a/src/core/classes/items-management/slides-items-manager.ts b/src/core/classes/items-management/swipe-slides-items-manager.ts
similarity index 66%
rename from src/core/classes/items-management/slides-items-manager.ts
rename to src/core/classes/items-management/swipe-slides-items-manager.ts
index 8c01ef571..5cd254b70 100644
--- a/src/core/classes/items-management/slides-items-manager.ts
+++ b/src/core/classes/items-management/swipe-slides-items-manager.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { CoreItemsManager } from './items-manager';
-import { CoreSwipeSlidesItemsManagerSource } from './slides-items-manager-source';
+import { CoreSwipeSlidesItemsManagerSource } from './swipe-slides-items-manager-source';
 
 /**
  * Helper class to manage items for core-swipe-slides.
@@ -26,22 +26,8 @@ export class CoreSwipeSlidesItemsManager<
     /**
      * @inheritdoc
      */
-    protected onSourceItemsUpdated(items: Item[]): void {
-        this.itemsMap = items.reduce((map, item) => {
-            map[this.getSource().getItemId(item)] = item;
-
-            return map;
-        }, {});
-    }
-
-    /**
-     * Get item by ID.
-     *
-     * @param id ID
-     * @return Item, null if not found.
-     */
-    getItemById(id: string): Item | null {
-        return this.itemsMap?.[id] ?? null;
+    getItemId(item: Item): string | number {
+        return this.getSource().getItemId(item);
     }
 
 }
diff --git a/src/core/components/swipe-navigation/swipe-navigation.ts b/src/core/components/swipe-navigation/swipe-navigation.ts
index 57dab122d..c26e0ab67 100644
--- a/src/core/components/swipe-navigation/swipe-navigation.ts
+++ b/src/core/components/swipe-navigation/swipe-navigation.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { Component, Input } from '@angular/core';
-import { CoreSwipeItemsManager } from '@classes/items-management/swipe-items-manager';
+import { CoreSwipeNavigationItemsManager } from '@classes/items-management/swipe-navigation-items-manager';
 import { CoreScreen } from '@services/screen';
 
 @Component({
@@ -23,7 +23,7 @@ import { CoreScreen } from '@services/screen';
 })
 export class CoreSwipeNavigationComponent {
 
-    @Input() manager?: CoreSwipeItemsManager;
+    @Input() manager?: CoreSwipeNavigationItemsManager;
 
     get enabled(): boolean {
         return CoreScreen.isMobile && !!this.manager;
diff --git a/src/core/components/swipe-slides/swipe-slides.html b/src/core/components/swipe-slides/swipe-slides.html
index 461366344..fc18d8c18 100644
--- a/src/core/components/swipe-slides/swipe-slides.html
+++ b/src/core/components/swipe-slides/swipe-slides.html
@@ -1,6 +1,5 @@
-<ion-slides *ngIf="manager && manager.getSource().isLoaded()" (ionSlideWillChange)="slideWillChange()"
-    (ionSlideDidChange)="slideDidChange()" [options]="options">
-    <ion-slide *ngFor="let item of manager.getSource().getItems()">
+<ion-slides *ngIf="loaded" (ionSlideWillChange)="slideWillChange()" (ionSlideDidChange)="slideDidChange()" [options]="options">
+    <ion-slide *ngFor="let item of items">
         <ng-container *ngIf="template" [ngTemplateOutlet]="template" [ngTemplateOutletContext]="{item: item}"></ng-container>
     </ion-slide>
 </ion-slides>
diff --git a/src/core/components/swipe-slides/swipe-slides.ts b/src/core/components/swipe-slides/swipe-slides.ts
index ac88f6e8e..139393670 100644
--- a/src/core/components/swipe-slides/swipe-slides.ts
+++ b/src/core/components/swipe-slides/swipe-slides.ts
@@ -15,9 +15,10 @@
 import {
     Component, ContentChild, ElementRef, EventEmitter, Input, OnChanges, OnDestroy, Output, TemplateRef, ViewChild,
 } from '@angular/core';
-import { CoreSwipeSlidesItemsManager } from '@classes/items-management/slides-items-manager';
+import { CoreSwipeSlidesItemsManager } from '@classes/items-management/swipe-slides-items-manager';
 import { IonContent, IonSlides } from '@ionic/angular';
-import { CoreDomUtils } from '@services/utils/dom';
+import { CoreDomUtils, VerticalPoint } from '@services/utils/dom';
+import { CoreMath } from '@singletons/math';
 
 /**
  * Helper component to display swipable slides.
@@ -31,7 +32,6 @@ export class CoreSwipeSlidesComponent<Item = unknown> implements OnChanges, OnDe
 
     @Input() manager?: CoreSwipeSlidesItemsManager<Item>;
     @Input() options: CoreSwipeSlidesOptions = {};
-    @Output() onInit = new EventEmitter<CoreSwipeCurrentItemData<Item>>();
     @Output() onWillChange = new EventEmitter<CoreSwipeCurrentItemData<Item>>();
     @Output() onDidChange = new EventEmitter<CoreSwipeCurrentItemData<Item>>();
 
@@ -57,6 +57,14 @@ export class CoreSwipeSlidesComponent<Item = unknown> implements OnChanges, OnDe
         }
     }
 
+    get items(): Item[] {
+        return this.manager?.getSource().getItems() || [];
+    }
+
+    get loaded(): boolean {
+        return !!this.manager?.getSource().isLoaded();
+    }
+
     /**
      * Initialize some properties based on the manager.
      */
@@ -66,15 +74,15 @@ export class CoreSwipeSlidesComponent<Item = unknown> implements OnChanges, OnDe
         });
 
         // Don't call default callbacks on init, emit our own events instead.
-        // This is because default callbacks aren't triggered for position 0, and to prevent auto scroll on init.
+        // This is because default callbacks aren't triggered for index 0, and to prevent auto scroll on init.
         this.options.runCallbacksOnInit = false;
 
-        await manager.getSource().waitForInitialized();
+        await manager.getSource().waitForLoaded();
 
         if (this.options.initialSlide === undefined) {
             // Calculate the initial slide.
-            const position = manager.getSource().getInitialPosition();
-            this.options.initialSlide = position > - 1 ? position : 0;
+            const index = manager.getSource().getInitialItemIndex();
+            this.options.initialSlide = Math.max(index, 0);
         }
 
         // Emit change events with the initial item.
@@ -83,28 +91,23 @@ export class CoreSwipeSlidesComponent<Item = unknown> implements OnChanges, OnDe
             return;
         }
 
-        // Validate that the initial position is inside the valid range.
-        let initialPosition = this.options.initialSlide as number;
-        if (initialPosition < 0) {
-            initialPosition = 0;
-        } else if (initialPosition >= items.length) {
-            initialPosition = items.length - 1;
-        }
+        // Validate that the initial index is inside the valid range.
+        const initialIndex = CoreMath.clamp(this.options.initialSlide as number, 0, items.length - 1);
 
         const initialItemData = {
-            index: initialPosition,
-            item: items[initialPosition],
+            index: initialIndex,
+            item: items[initialIndex],
         };
 
-        manager.setSelectedItem(items[initialPosition]);
+        manager.setSelectedItem(items[initialIndex]);
         this.onWillChange.emit(initialItemData);
         this.onDidChange.emit(initialItemData);
     }
 
     /**
-     * Slide to a certain position.
+     * Slide to a certain index.
      *
-     * @param index Position.
+     * @param index Index.
      * @param speed Animation speed.
      * @param runCallbacks Whether to run callbacks.
      */
@@ -119,8 +122,8 @@ export class CoreSwipeSlidesComponent<Item = unknown> implements OnChanges, OnDe
      * @param speed Animation speed.
      * @param runCallbacks Whether to run callbacks.
      */
-    slideToItem(item: Partial<Item>, speed?: number, runCallbacks?: boolean): void {
-        const index = this.manager?.getSource().getItemPosition(item) ?? -1;
+    slideToItem(item: Item, speed?: number, runCallbacks?: boolean): void {
+        const index = this.manager?.getSource().getItemIndex(item) ?? -1;
         if (index != -1) {
             this.slides?.slideTo(index, speed, runCallbacks);
         }
@@ -146,29 +149,20 @@ export class CoreSwipeSlidesComponent<Item = unknown> implements OnChanges, OnDe
         this.slides?.slidePrev(speed, runCallbacks);
     }
 
-    /**
-     * Get current item.
-     *
-     * @return Current item. Undefined if no current item yet.
-     */
-    getCurrentItem(): Item | null {
-        return this.manager?.getSelectedItem() || null;
-    }
-
     /**
      * Called when items list has been updated.
      *
      * @param items New items.
      */
     protected onItemsUpdated(): void {
-        const currentItem = this.getCurrentItem();
+        const currentItem = this.manager?.getSelectedItem();
 
         if (!currentItem || !this.manager) {
             return;
         }
 
         // Keep the same slide in case the list has changed.
-        const newIndex = this.manager.getSource().getItemPosition(currentItem) ?? -1;
+        const newIndex = this.manager.getSource().getItemIndex(currentItem) ?? -1;
         if (newIndex != -1) {
             this.slides?.slideTo(newIndex, 0, false);
         }
@@ -194,7 +188,7 @@ export class CoreSwipeSlidesComponent<Item = unknown> implements OnChanges, OnDe
         // Scroll top. This can be improved in the future to keep the scroll for each slide.
         const scrollElement = await this.content?.getScrollElement();
 
-        if (!scrollElement || CoreDomUtils.isElementOutsideOfScreen(scrollElement, this.hostElement, 'top')) {
+        if (!scrollElement || CoreDomUtils.isElementOutsideOfScreen(scrollElement, this.hostElement, VerticalPoint.TOP)) {
             // Scroll to top.
             this.hostElement.scrollIntoView({ behavior: 'smooth' });
         }
diff --git a/src/core/features/user/pages/profile/profile.page.ts b/src/core/features/user/pages/profile/profile.page.ts
index ee7c6e39c..69a8fcd26 100644
--- a/src/core/features/user/pages/profile/profile.page.ts
+++ b/src/core/features/user/pages/profile/profile.page.ts
@@ -27,7 +27,7 @@ import { CoreUserDelegate, CoreUserDelegateService, CoreUserProfileHandlerData }
 import { CoreUtils } from '@services/utils/utils';
 import { CoreNavigator } from '@services/navigator';
 import { CoreCourses } from '@features/courses/services/courses';
-import { CoreSwipeItemsManager } from '@classes/items-management/swipe-items-manager';
+import { CoreSwipeNavigationItemsManager } from '@classes/items-management/swipe-navigation-items-manager';
 import { CoreUserParticipantsSource } from '@features/user/classes/participants-source';
 import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
 
@@ -227,7 +227,7 @@ export class CoreUserProfilePage implements OnInit, OnDestroy {
 /**
  * Helper to manage swiping within a collection of users.
  */
-class CoreUserSwipeItemsManager extends CoreSwipeItemsManager {
+class CoreUserSwipeItemsManager extends CoreSwipeNavigationItemsManager {
 
     /**
      * @inheritdoc
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index ba8d78d07..9b22c544e 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -772,7 +772,11 @@ export class CoreDomUtilsProvider {
      * @param point The point of the element to check.
      * @return Whether the element is outside of the viewport.
      */
-    isElementOutsideOfScreen(scrollEl: HTMLElement, element: HTMLElement, point: 'top' | 'mid' | 'bottom' = 'mid'): boolean {
+    isElementOutsideOfScreen(
+        scrollEl: HTMLElement,
+        element: HTMLElement,
+        point: VerticalPoint = VerticalPoint.MID,
+    ): boolean {
         const elementRect = element.getBoundingClientRect();
 
         if (!elementRect) {
@@ -780,12 +784,18 @@ export class CoreDomUtilsProvider {
         }
 
         let elementPoint: number;
-        if (point === 'top') {
-            elementPoint = elementRect.top;
-        } else if (point === 'bottom') {
-            elementPoint = elementRect.bottom;
-        } else {
-            elementPoint = Math.round((elementRect.bottom + elementRect.top) / 2);
+        switch (point) {
+            case VerticalPoint.TOP:
+                elementPoint = elementRect.top;
+                break;
+
+            case VerticalPoint.BOTTOM:
+                elementPoint = elementRect.bottom;
+                break;
+
+            case VerticalPoint.MID:
+                elementPoint = Math.round((elementRect.bottom + elementRect.top) / 2);
+                break;
         }
 
         const scrollElRect = scrollEl.getBoundingClientRect();
@@ -2098,3 +2108,12 @@ export type PromptButton = Omit<AlertButton, 'handler'> & {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     handler?: (value: any, resolve: (value: any) => void, reject: (reason: any) => void) => void;
 };
+
+/**
+ * Vertical points for an element.
+ */
+export enum VerticalPoint {
+    TOP = 'top',
+    MID = 'mid',
+    BOTTOM = 'bottom',
+}
diff --git a/src/core/services/utils/time.ts b/src/core/services/utils/time.ts
index 5c8e420de..684c741b0 100644
--- a/src/core/services/utils/time.ts
+++ b/src/core/services/utils/time.ts
@@ -389,161 +389,6 @@ export class CoreTimeUtilsProvider {
         return String(moment().year() - 20);
     }
 
-    /**
-     * Given a year and a month, return the previous month and its year.
-     *
-     * @param month Year and month.
-     * @return Previous month and its year.
-     */
-    getPreviousMonth(month: YearAndMonth): YearAndMonth {
-        const dayMoment = moment().year(month.year).month(month.monthNumber - 1);
-        dayMoment.subtract(1, 'month');
-
-        return {
-            year: dayMoment.year(),
-            monthNumber: dayMoment.month() + 1,
-        };
-    }
-
-    /**
-     * Given a year and a month, return the next month and its year.
-     *
-     * @param month Year and month.
-     * @return Next month and its year.
-     */
-    getNextMonth(month: YearAndMonth): YearAndMonth {
-        const dayMoment = moment().year(month.year).month(month.monthNumber - 1);
-        dayMoment.add(1, 'month');
-
-        return {
-            year: dayMoment.year(),
-            monthNumber: dayMoment.month() + 1,
-        };
-    }
-
-    /**
-     * Get current month.
-     *
-     * @return Current month.
-     */
-    getCurrentMonth(): YearAndMonth {
-        const now = new Date();
-
-        return {
-            year: now.getFullYear(),
-            monthNumber: now.getMonth() + 1,
-        };
-    }
-
-    /**
-     * Check if a certain month is a past month.
-     *
-     * @param month Year and month.
-     * @return Whether it's a past month.
-     */
-    isPastMonth(month: YearAndMonth): boolean {
-        const now = new Date();
-
-        return month.year < now.getFullYear() || (month.year == now.getFullYear() && month.monthNumber < now.getMonth() + 1);
-    }
-
-    /**
-     * @param monthA Month A.
-     * @param monthB Month B.
-     * @return Whether it's same month.
-     */
-    isSameMonth(monthA: YearAndMonth, monthB: YearAndMonth): boolean {
-        return monthA.monthNumber === monthB.monthNumber && monthA.year === monthB.year;
-    }
-
-    /**
-     * Given a day data, return the previous day.
-     *
-     * @param day Day.
-     * @return Previous day.
-     */
-    getPreviousDay(day: YearMonthDay): YearMonthDay {
-        const dayMoment = moment().year(day.year).month(day.monthNumber - 1).date(day.dayNumber);
-        dayMoment.subtract(1, 'day');
-
-        return {
-            year: dayMoment.year(),
-            monthNumber: dayMoment.month() + 1,
-            dayNumber: dayMoment.date(),
-        };
-    }
-
-    /**
-     * Given a day data, return the next day.
-     *
-     * @param day Day.
-     * @return Next day.
-     */
-    getNextDay(day: YearMonthDay): YearMonthDay {
-        const dayMoment = moment().year(day.year).month(day.monthNumber - 1).date(day.dayNumber);
-        dayMoment.add(1, 'day');
-
-        return {
-            year: dayMoment.year(),
-            monthNumber: dayMoment.month() + 1,
-            dayNumber: dayMoment.date(),
-        };
-    }
-
-    /**
-     * Get current day.
-     *
-     * @return Current day.
-     */
-    getCurrentDay(): YearMonthDay {
-        const now = new Date();
-
-        return {
-            year: now.getFullYear(),
-            monthNumber: now.getMonth() + 1,
-            dayNumber: now.getDate(),
-        };
-    }
-
-    /**
-     * Check if a certain day is a past day.
-     *
-     * @param day Day.
-     * @return Whether it's a past day.
-     */
-    isPastDay(day: YearMonthDay): boolean {
-        const now = new Date();
-
-        return day.year < now.getFullYear() || (day.year === now.getFullYear() && day.monthNumber < now.getMonth() + 1) ||
-            (day.year === now.getFullYear() && day.monthNumber === now.getMonth() + 1 && day.dayNumber < now.getDate());
-    }
-
-    /**
-     * Check if two days are the same.
-     *
-     * @param dayA Day A.
-     * @param dayB Day B.
-     * @return Whether it's same day.
-     */
-    isSameDay(dayA: YearMonthDay, dayB: YearMonthDay): boolean {
-        return dayA.dayNumber === dayB.dayNumber && dayA.monthNumber === dayB.monthNumber && dayA.year === dayB.year;
-    }
-
 }
 
 export const CoreTimeUtils = makeSingleton(CoreTimeUtilsProvider);
-
-/**
- * Data to identify a month.
- */
-export type YearAndMonth = {
-    year: number; // Year number.
-    monthNumber: number; // Month number (1 to 12).
-};
-
-/**
- * Data to identify a day.
- */
-export type YearMonthDay = YearAndMonth & {
-    dayNumber: number; // Day number.
-};

From 13fbaf0b0f9702a4d61464aa386b8719b4afe1f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 16 Dec 2021 10:44:09 +0100
Subject: [PATCH 0294/1008] MOBILE-3833 course: Use completion enums

---
 .../course/classes/main-resource-component.ts |  4 +-
 .../course/components/format/format.ts        |  3 +-
 .../module-completion-legacy.ts               | 26 ++++----
 .../module-completion/module-completion.ts    | 10 +--
 .../section-selector/section-selector.ts      | 14 +++--
 .../module-preview/module-preview.page.ts     |  2 +-
 .../features/course/services/course-helper.ts | 32 ++++++----
 src/core/features/course/services/course.ts   | 61 +++++++++++++++----
 8 files changed, 101 insertions(+), 51 deletions(-)

diff --git a/src/core/features/course/classes/main-resource-component.ts b/src/core/features/course/classes/main-resource-component.ts
index 722907a73..defb40723 100644
--- a/src/core/features/course/classes/main-resource-component.ts
+++ b/src/core/features/course/classes/main-resource-component.ts
@@ -100,7 +100,7 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
         this.showCompletion = !!CoreSites.getRequiredCurrentSite().isVersionGreaterEqualThan('3.11');
 
         if (this.showCompletion) {
-            CoreCourseHelper.calculateModuleCompletionData(this.module, this.courseId);
+            CoreCourseHelper.calculateModuleCompletionData(this.module);
             CoreCourseHelper.loadModuleOfflineCompletion(this.courseId, this.module);
 
             this.completionObserver = CoreEvents.on(CoreEvents.COMPLETION_MODULE_VIEWED, async (data) => {
@@ -428,7 +428,7 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
     protected async fetchModule(): Promise<void> {
         const module = await CoreCourse.getModule(this.module.id, this.courseId);
 
-        CoreCourseHelper.calculateModuleCompletionData(module, this.courseId);
+        CoreCourseHelper.calculateModuleCompletionData(module);
 
         await CoreCourseHelper.loadModuleOfflineCompletion(this.courseId, module);
 
diff --git a/src/core/features/course/components/format/format.ts b/src/core/features/course/components/format/format.ts
index 6e8ae36bc..f351df992 100644
--- a/src/core/features/course/components/format/format.ts
+++ b/src/core/features/course/components/format/format.ts
@@ -33,6 +33,7 @@ import { CoreDynamicComponent } from '@components/dynamic-component/dynamic-comp
 import { CoreCourseAnyCourseData } from '@features/courses/services/courses';
 import {
     CoreCourse,
+    CoreCourseModuleCompletionStatus,
     CoreCourseProvider,
 } from '@features/course/services/course';
 import {
@@ -643,7 +644,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
 
         const moduleProgressPercent = 100 / (completionModules || 1);
         // Use min/max here to avoid floating point rounding errors over/under-flowing the progress bar.
-        if (completionData.state === CoreCourseProvider.COMPLETION_COMPLETE) {
+        if (completionData.state === CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE) {
             this.course.progress = Math.min(100, this.course.progress + moduleProgressPercent);
         } else {
             this.course.progress = Math.max(0, this.course.progress - moduleProgressPercent);
diff --git a/src/core/features/course/components/module-completion-legacy/module-completion-legacy.ts b/src/core/features/course/components/module-completion-legacy/module-completion-legacy.ts
index 8eca20fe0..1b9e0b453 100644
--- a/src/core/features/course/components/module-completion-legacy/module-completion-legacy.ts
+++ b/src/core/features/course/components/module-completion-legacy/module-completion-legacy.ts
@@ -15,7 +15,7 @@
 import { Component } from '@angular/core';
 
 import { CoreUser } from '@features/user/services/user';
-import { CoreCourseProvider } from '@features/course/services/course';
+import { CoreCourseModuleCompletionStatus, CoreCourseModuleCompletionTracking } from '@features/course/services/course';
 import { CoreFilterHelper } from '@features/filter/services/filter-helper';
 import { Translate } from '@singletons';
 import { CoreCourseModuleCompletionBaseComponent } from '@features/course/classes/module-completion';
@@ -52,28 +52,28 @@ export class CoreCourseModuleCompletionLegacyComponent extends CoreCourseModuleC
         let langKey: string | undefined;
         let image: string | undefined;
 
-        if (this.completion.tracking === CoreCourseProvider.COMPLETION_TRACKING_MANUAL &&
-                this.completion.state === CoreCourseProvider.COMPLETION_INCOMPLETE) {
+        if (this.completion.tracking === CoreCourseModuleCompletionTracking.COMPLETION_TRACKING_MANUAL &&
+                this.completion.state === CoreCourseModuleCompletionStatus.COMPLETION_INCOMPLETE) {
             image = 'completion-manual-n';
             langKey = 'core.completion-alt-manual-n';
-        } else if (this.completion.tracking === CoreCourseProvider.COMPLETION_TRACKING_MANUAL &&
-                this.completion.state === CoreCourseProvider.COMPLETION_COMPLETE) {
+        } else if (this.completion.tracking === CoreCourseModuleCompletionTracking.COMPLETION_TRACKING_MANUAL &&
+                this.completion.state === CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE) {
             image = 'completion-manual-y';
             langKey = 'core.completion-alt-manual-y';
-        } else if (this.completion.tracking === CoreCourseProvider.COMPLETION_TRACKING_AUTOMATIC &&
-                this.completion.state === CoreCourseProvider.COMPLETION_INCOMPLETE) {
+        } else if (this.completion.tracking === CoreCourseModuleCompletionTracking.COMPLETION_TRACKING_AUTOMATIC &&
+                this.completion.state === CoreCourseModuleCompletionStatus.COMPLETION_INCOMPLETE) {
             image = 'completion-auto-n';
             langKey = 'core.completion-alt-auto-n';
-        } else if (this.completion.tracking === CoreCourseProvider.COMPLETION_TRACKING_AUTOMATIC &&
-                this.completion.state === CoreCourseProvider.COMPLETION_COMPLETE) {
+        } else if (this.completion.tracking === CoreCourseModuleCompletionTracking.COMPLETION_TRACKING_AUTOMATIC &&
+                this.completion.state === CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE) {
             image = 'completion-auto-y';
             langKey = 'core.completion-alt-auto-y';
-        } else if (this.completion.tracking === CoreCourseProvider.COMPLETION_TRACKING_AUTOMATIC &&
-                this.completion.state === CoreCourseProvider.COMPLETION_COMPLETE_PASS) {
+        } else if (this.completion.tracking === CoreCourseModuleCompletionTracking.COMPLETION_TRACKING_AUTOMATIC &&
+                this.completion.state === CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE_PASS) {
             image = 'completion-auto-pass';
             langKey = 'core.completion-alt-auto-pass';
-        } else if (this.completion.tracking === CoreCourseProvider.COMPLETION_TRACKING_AUTOMATIC &&
-                this.completion.state === CoreCourseProvider.COMPLETION_COMPLETE_FAIL) {
+        } else if (this.completion.tracking === CoreCourseModuleCompletionTracking.COMPLETION_TRACKING_AUTOMATIC &&
+                this.completion.state === CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE_FAIL) {
             image = 'completion-auto-fail';
             langKey = 'core.completion-alt-auto-fail';
         }
diff --git a/src/core/features/course/components/module-completion/module-completion.ts b/src/core/features/course/components/module-completion/module-completion.ts
index 92fbb0b0e..33fab2dd5 100644
--- a/src/core/features/course/components/module-completion/module-completion.ts
+++ b/src/core/features/course/components/module-completion/module-completion.ts
@@ -15,7 +15,7 @@
 import { Component, Input } from '@angular/core';
 
 import { CoreCourseModuleCompletionBaseComponent } from '@features/course/classes/module-completion';
-import { CoreCourseModuleWSRuleDetails, CoreCourseProvider } from '@features/course/services/course';
+import { CoreCourseModuleCompletionStatus, CoreCourseModuleWSRuleDetails } from '@features/course/services/course';
 import { CoreUser } from '@features/user/services/user';
 import { Translate } from '@singletons';
 
@@ -51,10 +51,10 @@ export class CoreCourseModuleCompletionComponent extends CoreCourseModuleComplet
 
         // Format rules.
         this.details = await Promise.all(this.completion.details.map(async (rule: CompletionRule) => {
-            rule.statuscomplete = rule.rulevalue.status == CoreCourseProvider.COMPLETION_COMPLETE ||
-                    rule.rulevalue.status == CoreCourseProvider.COMPLETION_COMPLETE_PASS;
-            rule.statuscompletefail = rule.rulevalue.status == CoreCourseProvider.COMPLETION_COMPLETE_FAIL;
-            rule.statusincomplete = rule.rulevalue.status == CoreCourseProvider.COMPLETION_INCOMPLETE;
+            rule.statuscomplete = rule.rulevalue.status == CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE ||
+                    rule.rulevalue.status == CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE_PASS;
+            rule.statuscompletefail = rule.rulevalue.status == CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE_FAIL;
+            rule.statusincomplete = rule.rulevalue.status == CoreCourseModuleCompletionStatus.COMPLETION_INCOMPLETE;
             rule.accessibleDescription = null;
 
             if (this.completion!.overrideby) {
diff --git a/src/core/features/course/components/section-selector/section-selector.ts b/src/core/features/course/components/section-selector/section-selector.ts
index c2fdc2069..e71790478 100644
--- a/src/core/features/course/components/section-selector/section-selector.ts
+++ b/src/core/features/course/components/section-selector/section-selector.ts
@@ -15,7 +15,11 @@
 import { Component, Input, OnInit } from '@angular/core';
 
 import { CoreCourseSection } from '@features/course/services/course-helper';
-import { CoreCourseProvider } from '@features/course/services/course';
+import {
+    CoreCourseModuleCompletionStatus,
+    CoreCourseModuleCompletionTracking,
+    CoreCourseProvider,
+} from '@features/course/services/course';
 import { CoreCourseAnyCourseData } from '@features/courses/services/courses';
 import { CoreUtils } from '@services/utils/utils';
 import { ModalController } from '@singletons';
@@ -56,14 +60,14 @@ export class CoreCourseSectionSelectorComponent implements OnInit {
             let complete = 0;
             let total = 0;
             section.modules.forEach((module) => {
-                if (!module.uservisible || module.completiondata === undefined || module.completiondata.tracking === undefined ||
-                        module.completiondata.tracking <= CoreCourseProvider.COMPLETION_TRACKING_NONE) {
+                if (!module.uservisible || module.completiondata === undefined ||
+                        module.completiondata.tracking == CoreCourseModuleCompletionTracking.COMPLETION_TRACKING_NONE) {
                     return;
                 }
 
                 total++;
-                if (module.completiondata.state == CoreCourseProvider.COMPLETION_COMPLETE ||
-                        module.completiondata.state == CoreCourseProvider.COMPLETION_COMPLETE_PASS) {
+                if (module.completiondata.state == CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE ||
+                        module.completiondata.state == CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE_PASS) {
                     complete++;
                 }
             });
diff --git a/src/core/features/course/pages/module-preview/module-preview.page.ts b/src/core/features/course/pages/module-preview/module-preview.page.ts
index 51dc29b23..01b58cbe6 100644
--- a/src/core/features/course/pages/module-preview/module-preview.page.ts
+++ b/src/core/features/course/pages/module-preview/module-preview.page.ts
@@ -73,7 +73,7 @@ export class CoreCourseModulePreviewPage implements OnInit {
             this.module = await CoreCourse.getModule(this.module.id, this.courseId);
         }
 
-        CoreCourseHelper.calculateModuleCompletionData(this.module, this.courseId);
+        CoreCourseHelper.calculateModuleCompletionData(this.module);
 
         await CoreCourseHelper.loadModuleOfflineCompletion(this.courseId, this.module);
 
diff --git a/src/core/features/course/services/course-helper.ts b/src/core/features/course/services/course-helper.ts
index 768470957..8d246dcd2 100644
--- a/src/core/features/course/services/course-helper.ts
+++ b/src/core/features/course/services/course-helper.ts
@@ -25,6 +25,8 @@ import {
     CoreCourseWSModule,
     CoreCourseProvider,
     CoreCourseWSSection,
+    CoreCourseModuleCompletionTracking,
+    CoreCourseModuleCompletionStatus,
 } from './course';
 import { CoreConstants } from '@/core/constants';
 import { CoreLogger } from '@singletons/logger';
@@ -200,8 +202,8 @@ export class CoreCourseHelperProvider {
                 );
 
                 if (module.completiondata) {
-                    this.calculateModuleCompletionData(module, courseId, courseName);
-                } else if (completionStatus && typeof completionStatus[module.id] != 'undefined') {
+                    this.calculateModuleCompletionData(module, undefined, courseName);
+                } else if (completionStatus && completionStatus[module.id] !== undefined) {
                     // Should not happen on > 3.6. Check if activity has completions and if it's marked.
                     const activityStatus = completionStatus[module.id];
 
@@ -229,18 +231,18 @@ export class CoreCourseHelperProvider {
      * Calculate completion data of a module.
      *
      * @param module Module.
-     * @param courseId Course ID of the module.
+     * @param courseId Not used since 4.0
      * @param courseName Course name.
      */
-    calculateModuleCompletionData(module: CoreCourseModule, courseId: number, courseName?: string): void {
+    calculateModuleCompletionData(module: CoreCourseModule, courseId?: number, courseName?: string): void {
         if (!module.completiondata || !module.completion) {
             return;
         }
 
-        module.completiondata.courseId = courseId;
-        module.completiondata.courseName = courseName;
+        module.completiondata.courseId = module.course;
         module.completiondata.tracking = module.completion;
         module.completiondata.cmid = module.id;
+        module.completiondata.courseName = courseName;
     }
 
     /**
@@ -2069,7 +2071,8 @@ export class CoreCourseHelperProvider {
             return;
         }
 
-        if (typeof completion.cmid == 'undefined' || completion.tracking !== 1) {
+        if (completion.cmid === undefined ||
+            completion.tracking !== CoreCourseModuleCompletionTracking.COMPLETION_TRACKING_MANUAL) {
             return;
         }
 
@@ -2077,14 +2080,15 @@ export class CoreCourseHelperProvider {
         event?.stopPropagation();
 
         const modal = await CoreDomUtils.showModalLoading();
-        completion.state = completion.state === 1 ? 0 : 1;
+        completion.state = completion.state === CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE
+            ? CoreCourseModuleCompletionStatus.COMPLETION_INCOMPLETE
+            : CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE;
 
         try {
             const response = await CoreCourse.markCompletedManually(
                 completion.cmid,
-                completion.state === 1,
+                completion.state === CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE,
                 completion.courseId!,
-                completion.courseName,
             );
 
             if (response.offline) {
@@ -2093,7 +2097,11 @@ export class CoreCourseHelperProvider {
 
             return response;
         } catch (error) {
-            completion.state = completion.state === 1 ? 0 : 1;
+            // Restore previous state.
+            completion.state = completion.state === CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE
+                ? CoreCourseModuleCompletionStatus.COMPLETION_INCOMPLETE
+                : CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE;
+
             CoreDomUtils.showErrorModalDefault(error, 'core.errorchangecompletion', true);
         } finally {
             modal.dismiss();
@@ -2139,7 +2147,7 @@ export type CoreCourseModule = Omit<CoreCourseWSModule, 'completiondata'> & {
 export type CoreCourseModuleCompletionData = CoreCourseModuleWSCompletionData & {
     courseId?: number;
     courseName?: string;
-    tracking?: number;
+    tracking?: CoreCourseModuleCompletionTracking;
     cmid?: number;
     offline?: boolean;
 };
diff --git a/src/core/features/course/services/course.ts b/src/core/features/course/services/course.ts
index 6d5b8ea86..7beed88f3 100644
--- a/src/core/features/course/services/course.ts
+++ b/src/core/features/course/services/course.ts
@@ -61,6 +61,25 @@ declare module '@singletons/events' {
 
 }
 
+/**
+ * Completion status valid values.
+ */
+export enum CoreCourseModuleCompletionStatus {
+    COMPLETION_INCOMPLETE = 0,
+    COMPLETION_COMPLETE = 1,
+    COMPLETION_COMPLETE_PASS = 2,
+    COMPLETION_COMPLETE_FAIL = 3,
+}
+
+/**
+ * Completion tracking valid values.
+ */
+export enum CoreCourseModuleCompletionTracking {
+    COMPLETION_TRACKING_NONE = 0,
+    COMPLETION_TRACKING_MANUAL = 1,
+    COMPLETION_TRACKING_AUTOMATIC = 2,
+}
+
 /**
  * Service that provides some features regarding a course.
  */
@@ -73,13 +92,34 @@ export class CoreCourseProvider {
     static readonly ACCESS_DEFAULT = 'courses_access_default';
     static readonly ALL_COURSES_CLEARED = -1;
 
+    /**
+     * @deprecated since 4.0, use CoreCourseModuleCompletionTracking.COMPLETION_TRACKING_NONE instead.
+     */
     static readonly COMPLETION_TRACKING_NONE = 0;
+    /**
+     * @deprecated since 4.0, use CoreCourseModuleCompletionTracking.COMPLETION_TRACKING_MANUAL instead.
+     */
     static readonly COMPLETION_TRACKING_MANUAL = 1;
+    /**
+     * @deprecated since 4.0, use CoreCourseModuleCompletionTracking.COMPLETION_TRACKING_AUTOMATIC instead.
+     */
     static readonly COMPLETION_TRACKING_AUTOMATIC = 2;
 
+    /**
+     * @deprecated since 4.0, use CoreCourseModuleCompletionStatus.COMPLETION_INCOMPLETE instead.
+     */
     static readonly COMPLETION_INCOMPLETE = 0;
+    /**
+     * @deprecated since 4.0, use CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE instead.
+     */
     static readonly COMPLETION_COMPLETE = 1;
+    /**
+     * @deprecated since 4.0, use CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE_PASS instead.
+     */
     static readonly COMPLETION_COMPLETE_PASS = 2;
+    /**
+     * @deprecated since 4.0, use CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE_FAIL instead.
+     */
     static readonly COMPLETION_COMPLETE_FAIL = 3;
 
     static readonly COMPONENT = 'CoreCourse';
@@ -151,7 +191,8 @@ export class CoreCourseProvider {
      * @param completion Completion status of the module.
      */
     checkModuleCompletion(courseId: number, completion?: CoreCourseModuleCompletionData): void {
-        if (completion && completion.tracking === CoreCourseProvider.COMPLETION_TRACKING_AUTOMATIC && completion.state === 0) {
+        if (completion && completion.tracking === CoreCourseModuleCompletionTracking.COMPLETION_TRACKING_AUTOMATIC &&
+            completion.state === CoreCourseModuleCompletionStatus.COMPLETION_INCOMPLETE) {
             this.invalidateSections(courseId).finally(() => {
                 CoreEvents.trigger(CoreEvents.COMPLETION_MODULE_VIEWED, {
                     courseId: courseId,
@@ -256,7 +297,7 @@ export class CoreCourseProvider {
                     const onlineCompletion = completionStatus[offlineCompletion.cmid];
 
                     // If the activity uses manual completion, override the value with the offline one.
-                    if (onlineCompletion.tracking === 1) {
+                    if (onlineCompletion.tracking === CoreCourseModuleCompletionTracking.COMPLETION_TRACKING_MANUAL) {
                         onlineCompletion.state = offlineCompletion.completed;
                         onlineCompletion.offline = true;
                     }
@@ -986,7 +1027,7 @@ export class CoreCourseProvider {
             CoreCourseOffline.markCompletedManually(cmId, completed, courseId, courseName, siteId);
 
         // The offline function requires a courseId and it could be missing because it's a calculated field.
-        if (!CoreApp.isOnline() && courseId) {
+        if (!CoreApp.isOnline()) {
             // App is offline, store the action.
             return storeOffline();
         }
@@ -996,18 +1037,14 @@ export class CoreCourseProvider {
             const result = await this.markCompletedManuallyOnline(cmId, completed, siteId);
 
             // Data sent to server, if there is some offline data delete it now.
-            try {
-                await CoreCourseOffline.deleteManualCompletion(cmId, siteId);
-            } catch {
-                // Ignore errors, shouldn't happen.
-            }
+            await CoreUtils.ignoreErrors(CoreCourseOffline.deleteManualCompletion(cmId, siteId));
 
             // Invalidate module now, completion has changed.
             await this.invalidateModule(cmId, siteId);
 
             return result;
         } catch (error) {
-            if (CoreUtils.isWebServiceError(error) || !courseId) {
+            if (CoreUtils.isWebServiceError(error)) {
                 // The WebService has thrown an error, this means that responses cannot be submitted.
                 throw error;
             } else {
@@ -1346,7 +1383,7 @@ export type CoreCourseCompletionActivityStatus = {
     instance: number; // Instance ID.
     state: number; // Completion state value: 0 means incomplete, 1 complete, 2 complete pass, 3 complete fail.
     timecompleted: number; // Timestamp for completed activity.
-    tracking: number; // Type of tracking: 0 means none, 1 manual, 2 automatic.
+    tracking: CoreCourseModuleCompletionTracking; // Type of tracking: 0 means none, 1 manual, 2 automatic.
     overrideby?: number | null; // The user id who has overriden the status, or null.
     valueused?: boolean; // Whether the completion status affects the availability of another activity.
     hascompletion?: boolean; // @since 3.11. Whether this activity module has completion enabled.
@@ -1497,7 +1534,7 @@ export type CoreCourseWSModule = {
     afterlink?: string; // After link info to be displayed.
     customdata?: string; // Custom data (JSON encoded).
     noviewlink?: boolean; // Whether the module has no view page.
-    completion?: number; // Type of completion tracking: 0 means none, 1 manual, 2 automatic.
+    completion?: CoreCourseModuleCompletionTracking; // Type of completion tracking: 0 means none, 1 manual, 2 automatic.
     completiondata?: CoreCourseModuleWSCompletionData; // Module completion data.
     contents?: CoreCourseModuleContentFile[];
     dates?: {
@@ -1517,7 +1554,7 @@ export type CoreCourseWSModule = {
  * Module completion data.
  */
 export type CoreCourseModuleWSCompletionData = {
-    state: number; // Completion state value: 0 means incomplete, 1 complete, 2 complete pass, 3 complete fail.
+    state: CoreCourseModuleCompletionStatus; // Completion state value.
     timecompleted: number; // Timestamp for completion status.
     overrideby: number | null; // The user id who has overriden the status.
     valueused?: boolean; // Whether the completion status affects the availability of another activity.

From 9b19735e513590e9cd00c70df2c43623e35a3f54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 16 Dec 2021 10:46:07 +0100
Subject: [PATCH 0295/1008] MOBILE-3833 course: Improve course module type

---
 .../course/classes/main-resource-component.ts |   2 +-
 .../directives/download-module-main-file.ts   |   2 +-
 src/core/features/course/services/course.ts   | 165 ++++++++++--------
 .../services/module-prefetch-delegate.ts      |   2 +-
 4 files changed, 100 insertions(+), 71 deletions(-)

diff --git a/src/core/features/course/classes/main-resource-component.ts b/src/core/features/course/classes/main-resource-component.ts
index defb40723..24572a903 100644
--- a/src/core/features/course/classes/main-resource-component.ts
+++ b/src/core/features/course/classes/main-resource-component.ts
@@ -96,7 +96,7 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
         this.description = this.module.description;
         this.componentId = this.module.id;
         this.externalUrl = this.module.url;
-        this.courseId = this.courseId || this.module.course!;
+        this.courseId = this.courseId || this.module.course;
         this.showCompletion = !!CoreSites.getRequiredCurrentSite().isVersionGreaterEqualThan('3.11');
 
         if (this.showCompletion) {
diff --git a/src/core/features/course/directives/download-module-main-file.ts b/src/core/features/course/directives/download-module-main-file.ts
index 6f63da894..2756f916f 100644
--- a/src/core/features/course/directives/download-module-main-file.ts
+++ b/src/core/features/course/directives/download-module-main-file.ts
@@ -71,7 +71,7 @@ export class CoreCourseDownloadModuleMainFileDirective implements OnInit {
 
                 await CoreCourseHelper.downloadModuleAndOpenFile(
                     this.module,
-                    courseId ?? this.module.course!,
+                    courseId ?? this.module.course,
                     this.component,
                     componentId,
                     this.files,
diff --git a/src/core/features/course/services/course.ts b/src/core/features/course/services/course.ts
index 7beed88f3..3d440e2a8 100644
--- a/src/core/features/course/services/course.ts
+++ b/src/core/features/course/services/course.ts
@@ -437,13 +437,14 @@ export class CoreCourseProvider {
         // Helper function to do the WS request without processing the result.
         const doRequest = async (
             site: CoreSite,
+            courseId: number,
             moduleId: number,
             modName: string | undefined,
             includeStealth: boolean,
             preferCache: boolean,
-        ): Promise<CoreCourseWSSection[]> => {
+        ): Promise<CoreCourseGetContentsWSSection[]> => {
             const params: CoreCourseGetContentsParams = {
-                courseid: courseId!,
+                courseid: courseId,
             };
             params.options = [];
 
@@ -480,7 +481,7 @@ export class CoreCourseProvider {
             }
 
             try {
-                const sections = await site.read<CoreCourseWSSection[]>('core_course_get_contents', params, preSets);
+                const sections = await site.read<CoreCourseGetContentsWSResponse>('core_course_get_contents', params, preSets);
 
                 return sections;
             } catch {
@@ -488,10 +489,10 @@ export class CoreCourseProvider {
                 if (!ignoreCache && !CoreApp.isOnline()) {
                     if (includeStealth) {
                         // Older versions didn't include the includestealthmodules option.
-                        return doRequest(site, moduleId, modName, false, true);
+                        return doRequest(site, courseId, moduleId, modName, false, true);
                     } else if (modName) {
                         // Falback to the request for the given moduleId only.
-                        return doRequest(site, moduleId, undefined, this.canRequestStealthModules(site), true);
+                        return doRequest(site, courseId, moduleId, undefined, this.canRequestStealthModules(site), true);
                     }
                 }
 
@@ -505,13 +506,13 @@ export class CoreCourseProvider {
             courseId = module.course;
         }
 
-        let sections: CoreCourseWSSection[];
+        let sections: CoreCourseGetContentsWSSection[];
         try {
             const site = await CoreSites.getSite(siteId);
             // We have courseId, we can use core_course_get_contents for compatibility.
             this.logger.debug(`Getting module ${moduleId} in course ${courseId}`);
 
-            sections = await doRequest(site, moduleId, modName, this.canRequestStealthModules(site), preferCache);
+            sections = await doRequest(site, courseId, moduleId, modName, this.canRequestStealthModules(site), preferCache);
         } catch {
             // Error getting the module. Try to get all contents (without filtering by module).
             const preSets: CoreSiteWSPreSets = {
@@ -526,7 +527,7 @@ export class CoreCourseProvider {
             sections = await this.getSections(courseId, false, false, preSets, siteId);
         }
 
-        let foundModule: CoreCourseWSModule | undefined;
+        let foundModule: CoreCourseGetContentsWSModule | undefined;
 
         const foundSection = sections.some((section) => {
             if (sectionId != null &&
@@ -543,9 +544,10 @@ export class CoreCourseProvider {
         });
 
         if (foundSection && foundModule) {
-            foundModule.course = courseId;
-
-            return foundModule;
+            return {
+                ...foundModule,
+                course: courseId,
+            };
         }
 
         throw new CoreError(Translate.instant('core.course.modulenotfound'));
@@ -586,21 +588,19 @@ export class CoreCourseProvider {
     async getModuleBasicGradeInfo(moduleId: number, siteId?: string): Promise<CoreCourseModuleGradeInfo | undefined> {
         const info = await this.getModuleBasicInfo(moduleId, siteId);
 
-        const grade: CoreCourseModuleGradeInfo = {
-            advancedgrading: info.advancedgrading,
-            grade: info.grade,
-            gradecat: info.gradecat,
-            gradepass: info.gradepass,
-            outcomes: info.outcomes,
-            scale: info.scale,
-        };
-
         if (
-            typeof grade.grade != 'undefined' ||
-            typeof grade.advancedgrading != 'undefined' ||
-            typeof grade.outcomes != 'undefined'
+            info.grade !== undefined ||
+            info.advancedgrading !== undefined ||
+            info.outcomes !== undefined
         ) {
-            return grade;
+            return {
+                advancedgrading: info.advancedgrading,
+                grade: info.grade,
+                gradecat: info.gradecat,
+                gradepass: info.gradepass,
+                outcomes: info.outcomes,
+                scale: info.scale,
+            };
         }
 
     }
@@ -763,32 +763,33 @@ export class CoreCourseProvider {
 
         const params: CoreCourseGetContentsParams = {
             courseid: courseId,
-            options: [
-                {
-                    name: 'excludemodules',
-                    value: excludeModules,
-                },
-                {
-                    name: 'excludecontents',
-                    value: excludeContents,
-                },
-            ],
         };
+        params.options = [
+            {
+                name: 'excludemodules',
+                value: excludeModules,
+            },
+            {
+                name: 'excludecontents',
+                value: excludeContents,
+            },
+        ];
+
         if (this.canRequestStealthModules(site)) {
-            params.options!.push({
+            params.options.push({
                 name: 'includestealthmodules',
                 value: includeStealthModules,
             });
         }
 
-        let sections: CoreCourseWSSection[];
+        let sections: CoreCourseGetContentsWSSection[];
         try {
             sections = await site.read('core_course_get_contents', params, preSets);
         } catch {
             // Error getting the data, it could fail because we added a new parameter and the call isn't cached.
             // Retry without the new parameter and forcing cache.
             preSets.omitExpires = true;
-            params.options!.splice(-1, 1);
+            params.options.splice(-1, 1);
             sections = await site.read('core_course_get_contents', params, preSets);
         }
 
@@ -796,15 +797,22 @@ export class CoreCourseProvider {
         let showSections = true;
         if (courseId == siteHomeId) {
             const storedNumSections = site.getStoredConfig('numsections');
-            showSections = typeof storedNumSections != 'undefined' && !!storedNumSections;
+            showSections = storedNumSections !== undefined && !!storedNumSections;
         }
 
-        if (typeof showSections != 'undefined' && !showSections && sections.length > 0) {
+        if (showSections !== undefined && !showSections && sections.length > 0) {
             // Get only the last section (Main menu block section).
             sections.pop();
         }
 
-        return sections;
+        // Add course to all modules.
+        return sections.map((section) => ({
+            ...section,
+            modules: section.modules.map((module) => ({
+                ...module,
+                course: courseId,
+            })),
+        }));
     }
 
     /**
@@ -1474,7 +1482,12 @@ export type CoreCourseGetContentsParams = {
 /**
  * Data returned by core_course_get_contents WS.
  */
-export type CoreCourseWSSection = {
+type CoreCourseGetContentsWSResponse = CoreCourseGetContentsWSSection[];
+
+/**
+ * Section data returned by core_course_get_contents WS.
+ */
+type CoreCourseGetContentsWSSection = {
     id: number; // Section ID.
     name: string; // Section name.
     visible?: number; // Is the section visible.
@@ -1484,38 +1497,14 @@ export type CoreCourseWSSection = {
     hiddenbynumsections?: number; // Whether is a section hidden in the course format.
     uservisible?: boolean; // Is the section visible for the user?.
     availabilityinfo?: string; // Availability information.
-    modules: CoreCourseWSModule[];
+    modules: CoreCourseGetContentsWSModule[]; // List of module.
 };
 
 /**
- * Params of core_course_get_course_module WS.
+ * Module data returned by core_course_get_contents WS.
  */
-type CoreCourseGetCourseModuleWSParams = {
-    cmid: number; // The course module id.
-};
-
-/**
- * Params of core_course_get_course_module_by_instance WS.
- */
-type CoreCourseGetCourseModuleByInstanceWSParams = {
-    module: string; // The module name.
-    instance: number; // The module instance id.
-};
-
-/**
- * Data returned by core_course_get_course_module and core_course_get_course_module_by_instance WS.
- */
-export type CoreCourseGetCourseModuleWSResponse = {
-    cm: CoreCourseModuleBasicInfo;
-    warnings?: CoreWSExternalWarning[];
-};
-
-/**
- * Course module data returned by the WS.
- */
-export type CoreCourseWSModule = {
+type CoreCourseGetContentsWSModule = {
     id: number; // Activity id.
-    course?: number; // The course id.
     url?: string; // Activity url.
     name: string; // Activity module name.
     instance?: number; // Instance id.
@@ -1537,6 +1526,7 @@ export type CoreCourseWSModule = {
     completion?: CoreCourseModuleCompletionTracking; // Type of completion tracking: 0 means none, 1 manual, 2 automatic.
     completiondata?: CoreCourseModuleWSCompletionData; // Module completion data.
     contents?: CoreCourseModuleContentFile[];
+    downloadcontent?: number; // @since 4.0 The download content value.
     dates?: {
         label: string;
         timestamp: number;
@@ -1550,6 +1540,43 @@ export type CoreCourseWSModule = {
     };
 };
 
+/**
+ * Data returned by core_course_get_contents WS.
+ */
+export type CoreCourseWSSection = Omit<CoreCourseGetContentsWSSection, 'modules'> & {
+    modules: CoreCourseWSModule[]; // List of module.
+};
+
+/**
+ * Params of core_course_get_course_module WS.
+ */
+type CoreCourseGetCourseModuleWSParams = {
+    cmid: number; // The course module id.
+};
+
+/**
+ * Params of core_course_get_course_module_by_instance WS.
+ */
+type CoreCourseGetCourseModuleByInstanceWSParams = {
+    module: string; // The module name.
+    instance: number; // The module instance id.
+};
+
+/**
+ * Data returned by core_course_get_course_module and core_course_get_course_module_by_instance WS.
+ */
+type CoreCourseGetCourseModuleWSResponse = {
+    cm: CoreCourseModuleBasicInfo;
+    warnings?: CoreWSExternalWarning[];
+};
+
+/**
+ * Course module data returned by the WS with course added.
+ */
+export type CoreCourseWSModule = CoreCourseGetContentsWSModule & {
+    course: number; // The course id.
+};
+
 /**
  * Module completion data.
  */
@@ -1649,9 +1676,11 @@ export type CoreCourseModuleBasicInfo = CoreCourseModuleGradeInfo & {
     visibleoncoursepage?: number; // If visible on course page.
     visibleold?: number; // Visible old.
     completiongradeitemnumber?: number; // Completion grade item.
+    completionpassgrade?: number; // @since 4.0. Completion pass grade setting.
     completionview?: number; // Completion view setting.
     completionexpected?: number; // Completion time expected.
     showdescription?: number; // If the description is showed.
+    downloadcontent?: number; // @since 4.0. The download content value.
     availability?: string; // Availability settings.
 };
 
diff --git a/src/core/features/course/services/module-prefetch-delegate.ts b/src/core/features/course/services/module-prefetch-delegate.ts
index ff494e60a..f835799eb 100644
--- a/src/core/features/course/services/module-prefetch-delegate.ts
+++ b/src/core/features/course/services/module-prefetch-delegate.ts
@@ -182,7 +182,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
             if (!CoreFilepool.getPackageDownloadPromise(siteId, handler.component, module.id)) {
                 // Not handled, the app was probably restarted or something weird happened.
                 // Re-start download (files already on queue or already downloaded will be skipped).
-                handler.prefetch(module, module.course!);
+                handler.prefetch(module, module.course);
             }
         } else if (handler.determineStatus) {
             // The handler implements a determineStatus function. Apply it.

From 7d7f738d05c5c4c68a17e778b1dcc9ed783cdf50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 16 Dec 2021 10:46:40 +0100
Subject: [PATCH 0296/1008] MOBILE-3833 chore: Reduce typeof undefined usage

---
 src/addons/badges/services/badges.ts          |  2 +-
 src/addons/badges/services/handlers/user.ts   |  2 +-
 .../activitymodules/activitymodules.ts        |  4 +--
 .../blog/services/handlers/course-option.ts   |  2 +-
 src/addons/calendar/pages/day/day.page.ts     |  2 +-
 src/addons/calendar/services/calendar.ts      |  2 +-
 .../competencysummary/competencysummary.ts    |  2 +-
 .../services/handlers/course-option.ts        |  4 +--
 .../services/coursecompletion.ts              |  6 ++--
 .../services/handlers/mathjaxloader.ts        |  6 ++--
 .../pages/discussion/discussion.page.ts       |  4 +--
 .../pages/discussions-35/discussions.page.ts  |  4 +--
 .../group-conversations.page.ts               | 10 +++---
 .../services/handlers/discussion-link.ts      |  4 +--
 src/addons/messages/services/messages-sync.ts |  4 +--
 src/addons/messages/services/messages.ts      | 12 +++----
 .../classes/base-feedback-plugin-component.ts |  2 +-
 .../mod/assign/components/index/index.ts      |  4 +--
 .../components/submission/submission.ts       |  8 ++---
 .../feedback/comments/services/handler.ts     |  6 ++--
 .../submission-review/submission-review.ts    |  2 +-
 .../mod/assign/services/assign-helper.ts      |  2 +-
 src/addons/mod/book/services/book.ts          |  2 +-
 src/addons/mod/data/components/index/index.ts |  4 +--
 .../mod/data/components/search/search.ts      |  2 +-
 .../data/fields/latlong/component/latlong.ts  |  4 +--
 .../data/fields/latlong/services/handler.ts   |  2 +-
 .../data/fields/picture/services/handler.ts   |  2 +-
 src/addons/mod/data/pages/edit/edit.ts        |  2 +-
 src/addons/mod/data/pages/entry/entry.ts      |  8 ++---
 src/addons/mod/data/services/data-helper.ts   |  4 +--
 src/addons/mod/data/services/data-offline.ts  |  2 +-
 src/addons/mod/data/services/data-sync.ts     |  2 +-
 src/addons/mod/data/services/data.ts          | 10 +++---
 .../data/services/handlers/approve-link.ts    |  2 +-
 .../mod/data/services/handlers/delete-link.ts |  2 +-
 .../mod/data/services/handlers/edit-link.ts   |  2 +-
 .../mod/data/services/handlers/show-link.ts   |  4 +--
 .../mod/feedback/components/index/index.ts    |  6 ++--
 .../pages/nonrespondents/nonrespondents.ts    |  2 +-
 .../feedback/pages/respondents/respondents.ts |  2 +-
 .../mod/feedback/services/feedback-helper.ts  | 18 +++++-----
 src/addons/mod/feedback/services/feedback.ts  |  6 ++--
 .../services/handlers/analysis-link.ts        |  2 +-
 .../services/handlers/complete-link.ts        |  4 +--
 .../feedback/services/handlers/print-link.ts  |  2 +-
 .../services/handlers/show-entries-link.ts    |  2 +-
 .../handlers/show-non-respondents-link.ts     |  2 +-
 .../forum/classes/forum-discussions-source.ts |  4 +--
 .../mod/forum/components/index/index.ts       |  8 ++---
 .../post-options-menu/post-options-menu.ts    |  2 +-
 .../forum/pages/discussion/discussion.page.ts | 10 +++---
 src/addons/mod/forum/services/forum-sync.ts   |  2 +-
 src/addons/mod/forum/services/forum.ts        |  6 ++--
 .../mod/forum/services/handlers/post-link.ts  |  2 +-
 .../mod/glossary/services/glossary-helper.ts  |  2 +-
 src/addons/mod/glossary/services/glossary.ts  |  2 +-
 .../glossary/services/handlers/edit-link.ts   |  2 +-
 .../services/handlers/report-link.ts          |  2 +-
 .../mod/lesson/services/lesson-helper.ts      |  2 +-
 src/addons/mod/lesson/services/lesson.ts      | 22 ++++++------
 src/addons/mod/page/components/index/index.ts |  4 +--
 .../password/services/handlers/password.ts    |  4 +--
 src/addons/mod/quiz/components/index/index.ts |  2 +-
 .../mod/quiz/pages/attempt/attempt.page.ts    |  2 +-
 .../mod/quiz/pages/player/player.page.ts      |  4 +--
 .../mod/quiz/pages/review/review.page.ts      |  6 ++--
 .../mod/quiz/services/handlers/prefetch.ts    |  4 +--
 src/addons/mod/quiz/services/quiz.ts          |  6 ++--
 .../mod/resource/components/index/index.ts    |  2 +-
 .../mod/scorm/components/index/index.ts       |  2 +-
 .../mod/scorm/services/scorm-offline.ts       |  4 +--
 src/addons/mod/scorm/services/scorm-sync.ts   |  2 +-
 src/addons/mod/scorm/services/scorm.ts        | 28 +++++++--------
 src/addons/mod/url/components/index/index.ts  |  2 +-
 src/addons/mod/wiki/components/index/index.ts | 16 ++++-----
 .../mod/wiki/services/handlers/edit-link.ts   |  2 +-
 .../services/handlers/page-or-map-link.ts     |  2 +-
 src/addons/mod/wiki/services/wiki.ts          |  2 +-
 .../mod/workshop/components/index/index.ts    |  2 +-
 .../workshop/services/handlers/prefetch.ts    |  4 +--
 .../mod/workshop/services/workshop-helper.ts  |  6 ++--
 src/addons/mod/workshop/services/workshop.ts  |  4 +--
 src/addons/notes/pages/list/list.page.ts      |  2 +-
 .../notes/services/handlers/course-option.ts  |  2 +-
 src/addons/notes/services/notes-sync.ts       |  2 +-
 .../ddimageortext/component/ddimageortext.ts  | 10 +++---
 src/addons/qtype/ddmarker/classes/ddmarker.ts |  2 +-
 .../qtype/ddmarker/component/ddmarker.ts      | 10 +++---
 src/addons/qtype/ddwtos/component/ddwtos.ts   |  2 +-
 src/addons/qtype/essay/component/essay.ts     |  2 +-
 .../qtype/essay/services/handlers/essay.ts    | 10 +++---
 .../checkbox/services/handlers/checkbox.ts    |  2 +-
 src/core/classes/base-sync.ts                 |  2 +-
 src/core/classes/cache.ts                     |  2 +-
 src/core/classes/delegate.ts                  |  6 ++--
 src/core/classes/errors/ajaxwserror.ts        |  2 +-
 src/core/classes/interceptor.ts               |  2 +-
 src/core/classes/site.ts                      | 34 +++++++++----------
 src/core/classes/sqlitedb.ts                  | 14 ++++----
 src/core/classes/tabs.ts                      |  4 +--
 src/core/components/chart/chart.ts            |  2 +-
 src/core/components/chrono/chrono.ts          |  2 +-
 .../components/progress-bar/progress-bar.ts   |  2 +-
 .../components/tabs-outlet/tabs-outlet.ts     |  2 +-
 src/core/directives/format-text.ts            |  4 +--
 src/core/directives/link.ts                   |  4 +--
 src/core/directives/supress-events.ts         |  2 +-
 .../comments/components/comments/comments.ts  |  2 +-
 .../comments/pages/viewer/viewer.page.ts      |  2 +-
 .../comments/services/comments-sync.ts        |  2 +-
 .../features/comments/services/comments.ts    |  4 +--
 .../classes/module-index-handler.ts           |  2 +-
 .../services/contentlinks-delegate.ts         |  2 +-
 .../course/classes/module-prefetch-handler.ts |  2 +-
 .../course/components/format/format.ts        |  6 ++--
 .../weeks/services/handlers/weeks-format.ts   |  2 +-
 .../course/pages/contents/contents.ts         |  4 +--
 .../pages/list-mod-type/list-mod-type.page.ts |  2 +-
 .../course/pages/preview/preview.page.ts      |  2 +-
 .../features/course/services/course-helper.ts |  6 ++--
 .../services/course-options-delegate.ts       |  2 +-
 src/core/features/course/services/course.ts   |  8 ++---
 .../services/module-prefetch-delegate.ts      | 14 ++++----
 .../course-progress/course-progress.ts        |  2 +-
 .../courses/services/courses-helper.ts        |  4 +--
 src/core/features/courses/services/courses.ts |  6 ++--
 .../courses/services/handlers/course-link.ts  |  4 +--
 .../rich-text-editor/rich-text-editor.ts      | 14 ++++----
 .../emulator/services/capture-helper.ts       |  2 +-
 src/core/features/emulator/services/file.ts   |  4 +--
 .../services/fileuploader-helper.ts           |  6 ++--
 src/core/features/filter/services/filter.ts   |  4 +--
 .../features/grades/services/grades-helper.ts | 12 +++----
 src/core/features/grades/services/grades.ts   |  2 +-
 .../grades/services/handlers/course-option.ts |  4 +--
 .../features/h5p/classes/content-validator.ts | 22 ++++++------
 src/core/features/h5p/classes/core.ts         |  2 +-
 src/core/features/h5p/classes/framework.ts    | 20 +++++------
 src/core/features/h5p/classes/metadata.ts     |  4 +--
 src/core/features/h5p/classes/storage.ts      |  8 ++---
 src/core/features/h5p/classes/validator.ts    |  6 ++--
 .../login/pages/email-signup/email-signup.ts  |  2 +-
 .../features/login/services/login-helper.ts   |  8 ++---
 src/core/features/mainmenu/pages/home/home.ts |  2 +-
 .../features/mainmenu/services/mainmenu.ts    |  2 +-
 .../services/push-delegate.ts                 |  8 ++---
 .../classes/base-question-component.ts        |  6 ++--
 .../question/services/question-helper.ts      |  2 +-
 .../features/rating/components/rate/rate.ts   |  2 +-
 .../settings/services/settings-helper.ts      |  2 +-
 .../classes/call-ws-click-directive.ts        |  4 +--
 .../classes/handlers/module-handler.ts        |  2 +-
 .../siteplugins/directives/call-ws.ts         |  2 +-
 .../siteplugins/services/siteplugins.ts       |  8 ++---
 .../user/services/handlers/course-option.ts   |  4 +--
 .../features/user/services/user-delegate.ts   |  4 +--
 .../features/user/services/user-offline.ts    |  2 +-
 .../services/user-profile-field-delegate.ts   |  2 +-
 src/core/features/user/services/user.ts       |  2 +-
 src/core/initializers/index.ts                |  2 +-
 src/core/pipes/format-date.ts                 |  2 +-
 src/core/services/config.ts                   |  2 +-
 src/core/services/cron.ts                     |  2 +-
 src/core/services/db.ts                       |  4 +--
 src/core/services/file-helper.ts              |  2 +-
 src/core/services/file.ts                     |  8 ++---
 src/core/services/filepool.ts                 | 24 ++++++-------
 src/core/services/groups.ts                   |  2 +-
 src/core/services/lang.ts                     |  8 ++---
 src/core/services/local-notifications.ts      | 10 +++---
 src/core/services/plugin-file-delegate.ts     |  2 +-
 src/core/services/sites.ts                    | 20 +++++------
 src/core/services/utils/dom.ts                | 12 +++----
 src/core/services/utils/mimetype.ts           |  8 ++---
 src/core/services/utils/text.ts               |  8 ++---
 src/core/services/utils/time.ts               |  4 +--
 src/core/services/utils/url.ts                |  4 +--
 src/core/services/utils/utils.ts              | 26 +++++++-------
 src/core/services/ws.ts                       | 24 ++++++-------
 src/core/singletons/events.ts                 |  2 +-
 181 files changed, 463 insertions(+), 463 deletions(-)

diff --git a/src/addons/badges/services/badges.ts b/src/addons/badges/services/badges.ts
index d95e4f733..df39a9595 100644
--- a/src/addons/badges/services/badges.ts
+++ b/src/addons/badges/services/badges.ts
@@ -83,7 +83,7 @@ export class AddonBadgesProvider {
             badge.alignment = badge.alignment || badge.competencies;
 
             // Check that the alignment is valid, they were broken in 3.7.
-            if (badge.alignment && badge.alignment[0] && typeof badge.alignment[0].targetname == 'undefined') {
+            if (badge.alignment && badge.alignment[0] && badge.alignment[0].targetname === undefined) {
                 // If any badge lacks targetname it means they are affected by the Moodle bug, don't display them.
                 delete badge.alignment;
             }
diff --git a/src/addons/badges/services/handlers/user.ts b/src/addons/badges/services/handlers/user.ts
index 52e44fb69..5e3a5bc44 100644
--- a/src/addons/badges/services/handlers/user.ts
+++ b/src/addons/badges/services/handlers/user.ts
@@ -49,7 +49,7 @@ export class AddonBadgesUserHandlerService implements CoreUserProfileHandler {
         courseId: number,
         navOptions?: CoreCourseUserAdminOrNavOptionIndexed,
     ): Promise<boolean> {
-        if (navOptions && typeof navOptions.badges != 'undefined') {
+        if (navOptions && navOptions.badges !== undefined) {
             return navOptions.badges;
         }
 
diff --git a/src/addons/block/activitymodules/components/activitymodules/activitymodules.ts b/src/addons/block/activitymodules/components/activitymodules/activitymodules.ts
index fdeb9a967..60db4a0c0 100644
--- a/src/addons/block/activitymodules/components/activitymodules/activitymodules.ts
+++ b/src/addons/block/activitymodules/components/activitymodules/activitymodules.ts
@@ -67,13 +67,13 @@ export class AddonBlockActivityModulesComponent extends CoreBlockBaseComponent i
 
             section.modules.forEach((mod) => {
                 if (mod.uservisible === false || !CoreCourse.moduleHasView(mod) ||
-                    typeof modFullNames[mod.modname] != 'undefined') {
+                    modFullNames[mod.modname] !== undefined) {
                     // Ignore this module.
                     return;
                 }
 
                 // Get the archetype of the module type.
-                if (typeof archetypes[mod.modname] == 'undefined') {
+                if (archetypes[mod.modname] === undefined) {
                     archetypes[mod.modname] = CoreCourseModuleDelegate.supportsFeature<number>(
                         mod.modname,
                         CoreConstants.FEATURE_MOD_ARCHETYPE,
diff --git a/src/addons/blog/services/handlers/course-option.ts b/src/addons/blog/services/handlers/course-option.ts
index c15f4b4de..c935a221d 100644
--- a/src/addons/blog/services/handlers/course-option.ts
+++ b/src/addons/blog/services/handlers/course-option.ts
@@ -62,7 +62,7 @@ export class AddonBlogCourseOptionHandlerService implements CoreCourseOptionsHan
     ): Promise<boolean> {
         const enabled = await CoreCourseHelper.hasABlockNamed(courseId, 'blog_menu');
 
-        if (enabled && navOptions && typeof navOptions.blogs != 'undefined') {
+        if (enabled && navOptions && navOptions.blogs !== undefined) {
             return navOptions.blogs;
         }
 
diff --git a/src/addons/calendar/pages/day/day.page.ts b/src/addons/calendar/pages/day/day.page.ts
index 984d5931b..b806ed84c 100644
--- a/src/addons/calendar/pages/day/day.page.ts
+++ b/src/addons/calendar/pages/day/day.page.ts
@@ -211,7 +211,7 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
         this.filter.courseId = CoreNavigator.getRouteNumberParam('courseId');
         this.filter.categoryId = CoreNavigator.getRouteNumberParam('categoryId');
 
-        this.filter.filtered = typeof this.filter.courseId != 'undefined' || types.some((name) => !this.filter[name]);
+        this.filter.filtered = this.filter.courseId !== undefined || types.some((name) => !this.filter[name]);
 
         const month = CoreNavigator.getRouteNumberParam('month');
         const source = new AddonCalendarDaySlidesItemsManagerSource(this, moment({
diff --git a/src/addons/calendar/services/calendar.ts b/src/addons/calendar/services/calendar.ts
index 17c60c3bf..69473fb05 100644
--- a/src/addons/calendar/services/calendar.ts
+++ b/src/addons/calendar/services/calendar.ts
@@ -538,7 +538,7 @@ export class AddonCalendarProvider {
             // Ignore errors.
         }
 
-        if (typeof value == 'undefined' || value === null) {
+        if (value === undefined || value === null) {
             value = site.getStoredConfig('calendar_lookahead');
         }
 
diff --git a/src/addons/competency/pages/competencysummary/competencysummary.ts b/src/addons/competency/pages/competencysummary/competencysummary.ts
index fa810bf2b..5119dd2c8 100644
--- a/src/addons/competency/pages/competencysummary/competencysummary.ts
+++ b/src/addons/competency/pages/competencysummary/competencysummary.ts
@@ -70,7 +70,7 @@ export class AddonCompetencyCompetencySummaryPage implements OnInit {
     protected async fetchCompetency(): Promise<void> {
         try {
             const result = await AddonCompetency.getCompetencySummary(this.competencyId);
-            if (!this.contextLevel || typeof this.contextInstanceId == 'undefined') {
+            if (!this.contextLevel || this.contextInstanceId === undefined) {
                 // Context not specified, use user context.
                 this.contextLevel = ContextLevel.USER;
                 this.contextInstanceId = result.usercompetency!.userid;
diff --git a/src/addons/competency/services/handlers/course-option.ts b/src/addons/competency/services/handlers/course-option.ts
index 7051064ff..d46c2d6fa 100644
--- a/src/addons/competency/services/handlers/course-option.ts
+++ b/src/addons/competency/services/handlers/course-option.ts
@@ -55,7 +55,7 @@ export class AddonCompetencyCourseOptionHandlerService implements CoreCourseOpti
             return false; // Not enabled for guests.
         }
 
-        if (navOptions && typeof navOptions.competencies != 'undefined') {
+        if (navOptions && navOptions.competencies !== undefined) {
             return navOptions.competencies;
         }
 
@@ -83,7 +83,7 @@ export class AddonCompetencyCourseOptionHandlerService implements CoreCourseOpti
      * @inheritdoc
      */
     async invalidateEnabledForCourse(courseId: number, navOptions?: CoreCourseUserAdminOrNavOptionIndexed): Promise<void> {
-        if (navOptions && typeof navOptions.competencies != 'undefined') {
+        if (navOptions && navOptions.competencies !== undefined) {
             // No need to invalidate anything.
             return;
         }
diff --git a/src/addons/coursecompletion/services/coursecompletion.ts b/src/addons/coursecompletion/services/coursecompletion.ts
index 21898f3c6..0fa9d22ec 100644
--- a/src/addons/coursecompletion/services/coursecompletion.ts
+++ b/src/addons/coursecompletion/services/coursecompletion.ts
@@ -172,12 +172,12 @@ export class AddonCourseCompletionProvider {
         const course = await CoreCourses.getUserCourse(courseId, preferCache);
 
         if (course) {
-            if (typeof course.enablecompletion != 'undefined' && !course.enablecompletion) {
+            if (course.enablecompletion !== undefined && !course.enablecompletion) {
                 // Completion not enabled for the course.
                 return false;
             }
 
-            if (typeof course.completionhascriteria != 'undefined' && !course.completionhascriteria) {
+            if (course.completionhascriteria !== undefined && !course.completionhascriteria) {
                 // No criteria, cannot view completion.
                 return false;
             }
@@ -206,7 +206,7 @@ export class AddonCourseCompletionProvider {
 
                 // If the site is returning the completionhascriteria then the user can view his own completion.
                 // We already checked the value in isPluginViewEnabledForCourse.
-                if (course && typeof course.completionhascriteria != 'undefined') {
+                if (course && course.completionhascriteria !== undefined) {
                     return true;
                 }
             }
diff --git a/src/addons/filter/mathjaxloader/services/handlers/mathjaxloader.ts b/src/addons/filter/mathjaxloader/services/handlers/mathjaxloader.ts
index a0aab60bf..2f9ae9056 100644
--- a/src/addons/filter/mathjaxloader/services/handlers/mathjaxloader.ts
+++ b/src/addons/filter/mathjaxloader/services/handlers/mathjaxloader.ts
@@ -86,7 +86,7 @@ export class AddonFilterMathJaxLoaderHandlerService extends CoreFilterDefaultHan
 
         // Update MathJax locale if app language changes.
         CoreEvents.on(CoreEvents.LANGUAGE_CHANGED, (lang: string) => {
-            if (typeof this.window.MathJax == 'undefined') {
+            if (this.window.MathJax === undefined) {
                 return;
             }
 
@@ -223,7 +223,7 @@ export class AddonFilterMathJaxLoaderHandlerService extends CoreFilterDefaultHan
                 if (!this._configured) {
                     const lang = this._lang;
 
-                    if (typeof that.window.MathJax != 'undefined') {
+                    if (that.window.MathJax !== undefined) {
                         that.window.MathJax.Hub.Queue(() => {
                             that.window.MathJax.Localization.setLocale(lang);
                         });
@@ -238,7 +238,7 @@ export class AddonFilterMathJaxLoaderHandlerService extends CoreFilterDefaultHan
                     this._setLocale();
                 }
 
-                if (typeof that.window.MathJax != 'undefined') {
+                if (that.window.MathJax !== undefined) {
                     const processDelay = that.window.MathJax.Hub.processSectionDelay;
                     // Set the process section delay to 0 when updating the formula.
                     that.window.MathJax.Hub.processSectionDelay = 0;
diff --git a/src/addons/messages/pages/discussion/discussion.page.ts b/src/addons/messages/pages/discussion/discussion.page.ts
index ca9028029..7c4176af1 100644
--- a/src/addons/messages/pages/discussion/discussion.page.ts
+++ b/src/addons/messages/pages/discussion/discussion.page.ts
@@ -205,7 +205,7 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView
                 message.useridfrom;
 
         let added = false;
-        if (typeof this.keepMessageMap[message.hash] === 'undefined') {
+        if (this.keepMessageMap[message.hash] === undefined) {
             // Message not added to the list. Add it now.
             this.messages.push(message);
             added = message.useridfrom != this.currentUserId;
@@ -1277,7 +1277,7 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView
                 },
             });
 
-            if (typeof userId != 'undefined') {
+            if (userId !== undefined) {
                 const splitViewLoaded = CoreNavigator.isCurrentPathInTablet('**/messages/**/discussion');
 
                 // Open user conversation.
diff --git a/src/addons/messages/pages/discussions-35/discussions.page.ts b/src/addons/messages/pages/discussions-35/discussions.page.ts
index 5c904cbae..ad60b73e9 100644
--- a/src/addons/messages/pages/discussions-35/discussions.page.ts
+++ b/src/addons/messages/pages/discussions-35/discussions.page.ts
@@ -77,7 +77,7 @@ export class AddonMessagesDiscussions35Page implements OnInit, OnDestroy {
                 if (data.userId && this.discussions) {
                     const discussion = this.discussions.find((disc) => disc.message!.user == data.userId);
 
-                    if (typeof discussion == 'undefined') {
+                    if (discussion === undefined) {
                         this.loaded = false;
                         this.refreshData().finally(() => {
                             this.loaded = true;
@@ -99,7 +99,7 @@ export class AddonMessagesDiscussions35Page implements OnInit, OnDestroy {
                 if (data.userId && this.discussions) {
                     const discussion = this.discussions.find((disc) => disc.message!.user == data.userId);
 
-                    if (typeof discussion != 'undefined') {
+                    if (discussion !== undefined) {
                     // A discussion has been read reset counter.
                         discussion.unread = false;
 
diff --git a/src/addons/messages/pages/group-conversations/group-conversations.page.ts b/src/addons/messages/pages/group-conversations/group-conversations.page.ts
index f4d884458..47d6ba354 100644
--- a/src/addons/messages/pages/group-conversations/group-conversations.page.ts
+++ b/src/addons/messages/pages/group-conversations/group-conversations.page.ts
@@ -118,7 +118,7 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
                 // Search the conversation to update.
                 const conversation = this.findConversation(data.conversationId, data.userId, expandedOption);
 
-                if (typeof conversation == 'undefined') {
+                if (conversation === undefined) {
                 // Probably a new conversation, refresh the list.
                     this.loaded = false;
                     this.refreshData().finally(() => {
@@ -152,7 +152,7 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
             if (data.conversationId) {
                 const conversation = this.findConversation(data.conversationId);
 
-                if (typeof conversation != 'undefined') {
+                if (conversation !== undefined) {
                     // A conversation has been read reset counter.
                     conversation.unreadcount = 0;
 
@@ -318,7 +318,7 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
             await Promise.all(promises);
 
             // The expanded status hasn't been initialized. Do it now.
-            if (typeof this.favourites.expanded == 'undefined' && (this.selectedConversationId || this.selectedUserId)) {
+            if (this.favourites.expanded === undefined && (this.selectedConversationId || this.selectedUserId)) {
                 // A certain conversation should be opened.
                 // We don't know which option it belongs to, so we need to fetch the data for all of them.
                 const promises: Promise<void>[] = [];
@@ -355,7 +355,7 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
      * @return Promise resolved when done.
      */
     protected async fetchDataForExpandedOption(): Promise<void> {
-        if (typeof this.favourites.expanded == 'undefined') {
+        if (this.favourites.expanded === undefined) {
             // Calculate which option should be expanded initially.
             this.favourites.expanded = this.favourites.count != 0 && !this.group.unread && !this.individual.unread;
             this.group.expanded = !this.favourites.expanded && this.group.count != 0 && !this.individual.unread;
@@ -572,7 +572,7 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
 
                 if (conversation) {
                     // Check if it's the last message. Offline messages are considered more recent than sent messages.
-                    if (typeof conversation.lastmessage === 'undefined' || conversation.lastmessage === null ||
+                    if (conversation.lastmessage === undefined || conversation.lastmessage === null ||
                             !conversation.lastmessagepending || (conversation.lastmessagedate || 0) <= message.timecreated / 1000) {
 
                         this.addLastOfflineMessage(conversation, message);
diff --git a/src/addons/messages/services/handlers/discussion-link.ts b/src/addons/messages/services/handlers/discussion-link.ts
index b0fae3fce..2eb03cdec 100644
--- a/src/addons/messages/services/handlers/discussion-link.ts
+++ b/src/addons/messages/services/handlers/discussion-link.ts
@@ -69,12 +69,12 @@ export class AddonMessagesDiscussionLinkHandlerService extends CoreContentLinksH
             return false;
         }
 
-        if (typeof params.id == 'undefined' && typeof params.user2 == 'undefined') {
+        if (params.id === undefined && params.user2 === undefined) {
             // Other user not defined, cannot treat the URL.
             return false;
         }
 
-        if (typeof params.user1 != 'undefined') {
+        if (params.user1 !== undefined) {
             // Check if user1 is the current user, since the app only supports current user.
             const site = await CoreSites.getSite(siteId);
 
diff --git a/src/addons/messages/services/messages-sync.ts b/src/addons/messages/services/messages-sync.ts
index cdcc4dd6c..64edaf6df 100644
--- a/src/addons/messages/services/messages-sync.ts
+++ b/src/addons/messages/services/messages-sync.ts
@@ -107,7 +107,7 @@ export class AddonMessagesSyncProvider extends CoreSyncBaseProvider<AddonMessage
         // Sync all conversations.
         conversationIds.forEach((conversationId) => {
             promises.push(this.syncDiscussion(conversationId, undefined, siteId).then((result) => {
-                if (typeof result == 'undefined') {
+                if (result === undefined) {
                     return;
                 }
 
@@ -120,7 +120,7 @@ export class AddonMessagesSyncProvider extends CoreSyncBaseProvider<AddonMessage
 
         userIds.forEach((userId) => {
             promises.push(this.syncDiscussion(undefined, userId, siteId).then((result) => {
-                if (typeof result == 'undefined') {
+                if (result === undefined) {
                     return;
                 }
 
diff --git a/src/addons/messages/services/messages.ts b/src/addons/messages/services/messages.ts
index 1498691b6..ba07393c5 100644
--- a/src/addons/messages/services/messages.ts
+++ b/src/addons/messages/services/messages.ts
@@ -317,7 +317,7 @@ export class AddonMessagesProvider {
             userid: userId,
         };
 
-        if (typeof read != 'undefined') {
+        if (read !== undefined) {
             params.read = read;
         }
 
@@ -1075,10 +1075,10 @@ export class AddonMessagesProvider {
             preSets.getFromCache = false;
             preSets.emergencyCache = false;
         }
-        if (typeof type != 'undefined' && type != null) {
+        if (type !== undefined && type != null) {
             params.type = type;
         }
-        if (typeof favourites != 'undefined' && favourites != null) {
+        if (favourites !== undefined && favourites != null) {
             params.favourites = !!favourites;
         }
         if (site.isVersionGreaterEqualThan('3.7') && type != AddonMessagesProvider.MESSAGE_CONVERSATION_TYPE_GROUP) {
@@ -1244,7 +1244,7 @@ export class AddonMessagesProvider {
             userId: number,
             userFullname: string,
         ): void => {
-            if (typeof discussions[userId] === 'undefined') {
+            if (discussions[userId] === undefined) {
                 discussions[userId] = {
                     fullname: userFullname,
                     profileimageurl: '',
@@ -1259,7 +1259,7 @@ export class AddonMessagesProvider {
 
             // Extract the most recent message. Pending messages are considered more recent than messages already sent.
             const discMessage = discussions[userId].message;
-            if (typeof discMessage === 'undefined' || (!discMessage.pending && message.pending) ||
+            if (discMessage === undefined || (!discMessage.pending && message.pending) ||
                 (discMessage.pending == message.pending && (discMessage.timecreated < message.timecreated ||
                     (discMessage.timecreated == message.timecreated && discMessage.id < messageId)))) {
 
@@ -2646,7 +2646,7 @@ export class AddonMessagesProvider {
             conversationid: conversationId,
             messages: messages.map((message) => ({
                 text: message.text,
-                textformat: typeof message.textformat != 'undefined' ? message.textformat : 1,
+                textformat: message.textformat !== undefined ? message.textformat : 1,
             })),
         };
 
diff --git a/src/addons/mod/assign/classes/base-feedback-plugin-component.ts b/src/addons/mod/assign/classes/base-feedback-plugin-component.ts
index b44226f47..2bc825f83 100644
--- a/src/addons/mod/assign/classes/base-feedback-plugin-component.ts
+++ b/src/addons/mod/assign/classes/base-feedback-plugin-component.ts
@@ -57,7 +57,7 @@ export class AddonModAssignFeedbackPluginBaseComponent {
             },
         });
 
-        if (typeof modalData == 'undefined') {
+        if (modalData === undefined) {
             throw new CoreCanceledError(); // User cancelled.
         }
 
diff --git a/src/addons/mod/assign/components/index/index.ts b/src/addons/mod/assign/components/index/index.ts
index 80a089d2b..0aa2a9a8e 100644
--- a/src/addons/mod/assign/components/index/index.ts
+++ b/src/addons/mod/assign/components/index/index.ts
@@ -304,7 +304,7 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
      * @param hasSubmissions If the status has any submission.
      */
     goToSubmissionList(status?: string, hasSubmissions = false): void {
-        if (typeof status != 'undefined' && !hasSubmissions) {
+        if (status !== undefined && !hasSubmissions) {
             return;
         }
 
@@ -312,7 +312,7 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
             groupId: this.group || 0,
             moduleName: this.moduleName,
         };
-        if (typeof status != 'undefined') {
+        if (status !== undefined) {
             params.status = status;
         }
 
diff --git a/src/addons/mod/assign/components/submission/submission.ts b/src/addons/mod/assign/components/submission/submission.ts
index 4256c120a..5b7b69785 100644
--- a/src/addons/mod/assign/components/submission/submission.ts
+++ b/src/addons/mod/assign/components/submission/submission.ts
@@ -380,7 +380,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
             for (const x in this.gradeInfo.outcomes) {
                 const outcome = this.gradeInfo.outcomes[x];
 
-                if (this.originalGrades.outcomes[outcome.id] == 'undefined' ||
+                if (this.originalGrades.outcomes[outcome.id] === undefined ||
                         this.originalGrades.outcomes[outcome.id] != outcome.selectedId) {
                     return true;
                 }
@@ -726,7 +726,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
 
             if (submissionGrade.outcomes && Object.keys(submissionGrade.outcomes).length && this.gradeInfo?.outcomes) {
                 this.gradeInfo.outcomes.forEach((outcome) => {
-                    if (typeof submissionGrade.outcomes[outcome.itemNumber!] != 'undefined') {
+                    if (submissionGrade.outcomes[outcome.itemNumber!] !== undefined) {
                         // If outcome has been modified from gradebook, do not use offline.
                         if (outcome.modified! < submissionGrade.timemodified) {
                             outcome.selectedId = submissionGrade.outcomes[outcome.itemNumber!];
@@ -944,7 +944,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
 
         // Check if grading method is simple or not.
         if (this.gradeInfo.advancedgrading && this.gradeInfo.advancedgrading[0] &&
-                typeof this.gradeInfo.advancedgrading[0].method != 'undefined') {
+                this.gradeInfo.advancedgrading[0].method !== undefined) {
             this.grade.method = this.gradeInfo.advancedgrading[0].method || 'simple';
         } else {
             this.grade.method = 'simple';
@@ -1039,7 +1039,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
         }
 
         const submissionStatementMissing = !!this.assign!.requiresubmissionstatement &&
-            typeof this.assign!.submissionstatement == 'undefined';
+            this.assign!.submissionstatement === undefined;
 
         this.canSubmit = !this.isSubmittedForGrading && !this.submittedOffline && (submissionStatus.lastattempt.cansubmit ||
             (this.hasOffline && AddonModAssign.canSubmitOffline(this.assign!, submissionStatus)));
diff --git a/src/addons/mod/assign/feedback/comments/services/handler.ts b/src/addons/mod/assign/feedback/comments/services/handler.ts
index 1b288988c..02a8bc342 100644
--- a/src/addons/mod/assign/feedback/comments/services/handler.ts
+++ b/src/addons/mod/assign/feedback/comments/services/handler.ts
@@ -69,7 +69,7 @@ export class AddonModAssignFeedbackCommentsHandlerService implements AddonModAss
      */
     discardDraft(assignId: number, userId: number, siteId?: string): void {
         const id = this.getDraftId(assignId, userId, siteId);
-        if (typeof this.drafts[id] != 'undefined') {
+        if (this.drafts[id] !== undefined) {
             delete this.drafts[id];
         }
     }
@@ -95,7 +95,7 @@ export class AddonModAssignFeedbackCommentsHandlerService implements AddonModAss
     getDraft(assignId: number, userId: number, siteId?: string): AddonModAssignFeedbackCommentsDraftData | undefined {
         const id = this.getDraftId(assignId, userId, siteId);
 
-        if (typeof this.drafts[id] != 'undefined') {
+        if (this.drafts[id] !== undefined) {
             return this.drafts[id];
         }
     }
@@ -164,7 +164,7 @@ export class AddonModAssignFeedbackCommentsHandlerService implements AddonModAss
         const initialText = AddonModAssign.getSubmissionPluginText(plugin);
         const newText = AddonModAssignFeedbackCommentsHandler.getTextFromInputData(plugin, inputData);
 
-        if (typeof newText == 'undefined') {
+        if (newText === undefined) {
             return false;
         }
 
diff --git a/src/addons/mod/assign/pages/submission-review/submission-review.ts b/src/addons/mod/assign/pages/submission-review/submission-review.ts
index 20342ef15..a51cf4bc4 100644
--- a/src/addons/mod/assign/pages/submission-review/submission-review.ts
+++ b/src/addons/mod/assign/pages/submission-review/submission-review.ts
@@ -142,7 +142,7 @@ export class AddonModAssignSubmissionReviewPage implements OnInit, OnDestroy, Ca
 
         // Grades can be saved if simple grading.
         if (gradeInfo.advancedgrading && gradeInfo.advancedgrading[0] &&
-                typeof gradeInfo.advancedgrading[0].method != 'undefined') {
+                gradeInfo.advancedgrading[0].method !== undefined) {
 
             const method = gradeInfo.advancedgrading[0].method || 'simple';
             this.canSaveGrades = method == 'simple';
diff --git a/src/addons/mod/assign/services/assign-helper.ts b/src/addons/mod/assign/services/assign-helper.ts
index 739c93d47..680bfbdaa 100644
--- a/src/addons/mod/assign/services/assign-helper.ts
+++ b/src/addons/mod/assign/services/assign-helper.ts
@@ -406,7 +406,7 @@ export class AddonModAssignHelperProvider {
 
         submissions.forEach((submission) => {
             submission.submitid = submission.userid && submission.userid > 0 ? submission.userid : submission.blindid;
-            if (typeof submission.submitid == 'undefined' || submission.submitid <= 0) {
+            if (submission.submitid === undefined || submission.submitid <= 0) {
                 return;
             }
 
diff --git a/src/addons/mod/book/services/book.ts b/src/addons/mod/book/services/book.ts
index 9cd689d84..1efa28d21 100644
--- a/src/addons/mod/book/services/book.ts
+++ b/src/addons/mod/book/services/book.ts
@@ -223,7 +223,7 @@ export class AddonModBookProvider {
      * @return The toc.
      */
     getToc(contents: CoreCourseModuleContentFile[]): AddonModBookTocChapterParsed[] {
-        if (!contents || !contents.length || typeof contents[0].content == 'undefined') {
+        if (!contents || !contents.length || contents[0].content === undefined) {
             return [];
         }
 
diff --git a/src/addons/mod/data/components/index/index.ts b/src/addons/mod/data/components/index/index.ts
index adec614b3..df7ca92aa 100644
--- a/src/addons/mod/data/components/index/index.ts
+++ b/src/addons/mod/data/components/index/index.ts
@@ -191,7 +191,7 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
      * @return True if refresh is needed, false otherwise.
      */
     protected isRefreshSyncNeeded(syncEventData: AddonModDataAutoSyncData): boolean {
-        if (this.database && syncEventData.dataId == this.database.id && typeof syncEventData.entryId == 'undefined') {
+        if (this.database && syncEventData.dataId == this.database.id && syncEventData.entryId === undefined) {
             this.loaded = false;
             // Refresh the data.
             this.content?.scrollToTop();
@@ -309,7 +309,7 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
 
         this.entriesRendered = '';
 
-        this.foundRecordsTranslationData = typeof entries.maxcount != 'undefined'
+        this.foundRecordsTranslationData = entries.maxcount !== undefined
             ? {
                 num: entries.totalcount,
                 max: entries.maxcount,
diff --git a/src/addons/mod/data/components/search/search.ts b/src/addons/mod/data/components/search/search.ts
index 4221b769a..42fbd7e54 100644
--- a/src/addons/mod/data/components/search/search.ts
+++ b/src/addons/mod/data/components/search/search.ts
@@ -69,7 +69,7 @@ export class AddonModDataSearchComponent implements OnInit {
     ngOnInit(): void {
         this.advancedIndexed = {};
         this.search.advanced?.forEach((field) => {
-            if (typeof field != 'undefined') {
+            if (field !== undefined) {
                 this.advancedIndexed[field.name] = field.value
                     ? CoreTextUtils.parseJSON(field.value, '')
                     : '';
diff --git a/src/addons/mod/data/fields/latlong/component/latlong.ts b/src/addons/mod/data/fields/latlong/component/latlong.ts
index a638544e4..87f1634d7 100644
--- a/src/addons/mod/data/fields/latlong/component/latlong.ts
+++ b/src/addons/mod/data/fields/latlong/component/latlong.ts
@@ -48,7 +48,7 @@ export class AddonModDataFieldLatlongComponent extends AddonModDataFieldPluginCo
      * @return Readable Latitude and logitude.
      */
     formatLatLong(north?: number, east?: number): string {
-        if (typeof north !== 'undefined' || typeof east !== 'undefined') {
+        if (north !== undefined || east !== undefined) {
             north = north || 0;
             east = east || 0;
             const northFixed = Math.abs(north).toFixed(4);
@@ -69,7 +69,7 @@ export class AddonModDataFieldLatlongComponent extends AddonModDataFieldPluginCo
      */
     getLatLongLink(north?: number, east?: number): SafeUrl {
         let url = '';
-        if (typeof north !== 'undefined' || typeof east !== 'undefined') {
+        if (north !== undefined || east !== undefined) {
             const northFixed = north ? north.toFixed(4) : '0.0000';
             const eastFixed = east ? east.toFixed(4) : '0.0000';
 
diff --git a/src/addons/mod/data/fields/latlong/services/handler.ts b/src/addons/mod/data/fields/latlong/services/handler.ts
index 4eed24cc1..03ab0a829 100644
--- a/src/addons/mod/data/fields/latlong/services/handler.ts
+++ b/src/addons/mod/data/fields/latlong/services/handler.ts
@@ -104,7 +104,7 @@ export class AddonModDataFieldLatlongHandlerService implements AddonModDataField
 
         // The lat long class has two values that need to be checked.
         inputData.forEach((value) => {
-            if (typeof value.value != 'undefined' && value.value != '') {
+            if (value.value !== undefined && value.value != '') {
                 valueCount++;
             }
         });
diff --git a/src/addons/mod/data/fields/picture/services/handler.ts b/src/addons/mod/data/fields/picture/services/handler.ts
index d0b503c13..d6e4dd4a5 100644
--- a/src/addons/mod/data/fields/picture/services/handler.ts
+++ b/src/addons/mod/data/fields/picture/services/handler.ts
@@ -135,7 +135,7 @@ export class AddonModDataFieldPictureHandlerService implements AddonModDataField
         }
 
         const found = inputData.some((input) => {
-            if (typeof input.subfield != 'undefined' && input.subfield == 'file') {
+            if (input.subfield !== undefined && input.subfield == 'file') {
                 return !!input.value;
             }
 
diff --git a/src/addons/mod/data/pages/edit/edit.ts b/src/addons/mod/data/pages/edit/edit.ts
index 5af31f6ed..74f60c73f 100644
--- a/src/addons/mod/data/pages/edit/edit.ts
+++ b/src/addons/mod/data/pages/edit/edit.ts
@@ -110,7 +110,7 @@ export class AddonModDataEditPage implements OnInit {
         }
 
         // If entryId is lower than 0 or null, it is a new entry or an offline entry.
-        this.isEditing = typeof this.entryId != 'undefined' && this.entryId > 0;
+        this.isEditing = this.entryId !== undefined && this.entryId > 0;
 
         this.title = this.module.name;
 
diff --git a/src/addons/mod/data/pages/entry/entry.ts b/src/addons/mod/data/pages/entry/entry.ts
index 95e37b326..df8ebb5be 100644
--- a/src/addons/mod/data/pages/entry/entry.ts
+++ b/src/addons/mod/data/pages/entry/entry.ts
@@ -98,7 +98,7 @@ export class AddonModDataEntryPage implements OnInit, OnDestroy {
 
         // Refresh data if this discussion is synchronized automatically.
         this.syncObserver = CoreEvents.on(AddonModDataSyncProvider.AUTO_SYNCED, (data) => {
-            if (typeof data.entryId == 'undefined') {
+            if (data.entryId === undefined) {
                 return;
             }
 
@@ -299,7 +299,7 @@ export class AddonModDataEntryPage implements OnInit, OnDestroy {
      * @return Resolved when done.
      */
     protected async setEntryFromOffset(): Promise<void> {
-        if (typeof this.offset == 'undefined' && typeof this.entryId != 'undefined') {
+        if (this.offset === undefined && this.entryId !== undefined) {
             // Entry id passed as navigation parameter instead of the offset.
             // We don't display next/previous buttons in this case.
             this.hasNext = false;
@@ -313,7 +313,7 @@ export class AddonModDataEntryPage implements OnInit, OnDestroy {
         }
 
         const perPage = AddonModDataProvider.PER_PAGE;
-        const page = typeof this.offset != 'undefined' && this.offset >= 0
+        const page = this.offset !== undefined && this.offset >= 0
             ? Math.floor(this.offset / perPage)
             : 0;
 
@@ -329,7 +329,7 @@ export class AddonModDataEntryPage implements OnInit, OnDestroy {
 
         // Index of the entry when concatenating offline and online page entries.
         let pageIndex = 0;
-        if (typeof this.offset == 'undefined') {
+        if (this.offset === undefined) {
             // No offset passed, display the first entry.
             pageIndex = 0;
         } else if (this.offset > 0) {
diff --git a/src/addons/mod/data/services/data-helper.ts b/src/addons/mod/data/services/data-helper.ts
index 869f2be38..18fa06b70 100644
--- a/src/addons/mod/data/services/data-helper.ts
+++ b/src/addons/mod/data/services/data-helper.ts
@@ -86,7 +86,7 @@ export class AddonModDataHelperProvider {
                     record.groupid = action.groupid;
 
                     action.fields.forEach((offlineContent) => {
-                        if (typeof offlineContents[offlineContent.fieldid] == 'undefined') {
+                        if (offlineContents[offlineContent.fieldid] === undefined) {
                             offlineContents[offlineContent.fieldid] = {};
                         }
 
@@ -270,7 +270,7 @@ export class AddonModDataHelperProvider {
             result.hasOfflineActions = !!actions.length;
 
             actions.forEach((action) => {
-                if (typeof offlineActions[action.entryid] == 'undefined') {
+                if (offlineActions[action.entryid] === undefined) {
                     offlineActions[action.entryid] = [];
                 }
                 offlineActions[action.entryid].push(action);
diff --git a/src/addons/mod/data/services/data-offline.ts b/src/addons/mod/data/services/data-offline.ts
index 19d8638fe..67fdb5b78 100644
--- a/src/addons/mod/data/services/data-offline.ts
+++ b/src/addons/mod/data/services/data-offline.ts
@@ -262,7 +262,7 @@ export class AddonModDataOfflineProvider {
         const site = await CoreSites.getSite(siteId);
 
         timemodified = timemodified || new Date().getTime();
-        entryId = typeof entryId == 'undefined' || entryId === null ? -timemodified : entryId;
+        entryId = entryId === undefined || entryId === null ? -timemodified : entryId;
 
         const entry: AddonModDataEntryDBRecord = {
             dataid: dataId,
diff --git a/src/addons/mod/data/services/data-sync.ts b/src/addons/mod/data/services/data-sync.ts
index 9a947ffcb..1549bf5f9 100644
--- a/src/addons/mod/data/services/data-sync.ts
+++ b/src/addons/mod/data/services/data-sync.ts
@@ -197,7 +197,7 @@ export class AddonModDataSyncProvider extends CoreCourseActivitySyncBaseProvider
         const offlineEntries: Record<number, AddonModDataOfflineAction[]> = {};
 
         offlineActions.forEach((entry) => {
-            if (typeof offlineEntries[entry.entryid] == 'undefined') {
+            if (offlineEntries[entry.entryid] === undefined) {
                 offlineEntries[entry.entryid] = [];
             }
 
diff --git a/src/addons/mod/data/services/data.ts b/src/addons/mod/data/services/data.ts
index 4dd6ce8e8..8c7e4e993 100644
--- a/src/addons/mod/data/services/data.ts
+++ b/src/addons/mod/data/services/data.ts
@@ -188,7 +188,7 @@ export class AddonModDataProvider {
             data,
         };
 
-        if (typeof groupId !== 'undefined') {
+        if (groupId !== undefined) {
             params.groupid = groupId;
         }
 
@@ -1004,16 +1004,16 @@ export class AddonModDataProvider {
             componentId: options.cmId,
             ...CoreSites.getReadingStrategyPreSets(options.readingStrategy), // Include reading strategy preSets.
         };
-        if (typeof options.sort != 'undefined') {
+        if (options.sort !== undefined) {
             params.sort = options.sort;
         }
-        if (typeof options.order !== 'undefined') {
+        if (options.order !== undefined) {
             params.order = options.order;
         }
-        if (typeof options.search !== 'undefined') {
+        if (options.search !== undefined) {
             params.search = options.search;
         }
-        if (typeof options.advSearch !== 'undefined') {
+        if (options.advSearch !== undefined) {
             params.advsearch = options.advSearch;
         }
         const response = await site.read<AddonModDataSearchEntriesWSResponse>('mod_data_search_entries', params, preSets);
diff --git a/src/addons/mod/data/services/handlers/approve-link.ts b/src/addons/mod/data/services/handlers/approve-link.ts
index 5d3072634..f6802bca2 100644
--- a/src/addons/mod/data/services/handlers/approve-link.ts
+++ b/src/addons/mod/data/services/handlers/approve-link.ts
@@ -50,7 +50,7 @@ export class AddonModDataApproveLinkHandlerService extends CoreContentLinksHandl
      * @inheritdoc
      */
     async isEnabled(siteId: string, url: string, params: Params): Promise<boolean> {
-        if (typeof params.d == 'undefined' || (typeof params.approve == 'undefined' && typeof params.disapprove == 'undefined')) {
+        if (params.d === undefined || (params.approve === undefined && params.disapprove === undefined)) {
             // Required fields not defined. Cannot treat the URL.
             return false;
         }
diff --git a/src/addons/mod/data/services/handlers/delete-link.ts b/src/addons/mod/data/services/handlers/delete-link.ts
index e17e662b6..71b0d8125 100644
--- a/src/addons/mod/data/services/handlers/delete-link.ts
+++ b/src/addons/mod/data/services/handlers/delete-link.ts
@@ -48,7 +48,7 @@ export class AddonModDataDeleteLinkHandlerService extends CoreContentLinksHandle
      * @inheritdoc
      */
     async isEnabled(siteId: string, url: string, params: Params): Promise<boolean> {
-        if (typeof params.d == 'undefined' || typeof params.delete == 'undefined') {
+        if (params.d === undefined || params.delete === undefined) {
             // Required fields not defined. Cannot treat the URL.
             return false;
         }
diff --git a/src/addons/mod/data/services/handlers/edit-link.ts b/src/addons/mod/data/services/handlers/edit-link.ts
index e759b20e2..de515049c 100644
--- a/src/addons/mod/data/services/handlers/edit-link.ts
+++ b/src/addons/mod/data/services/handlers/edit-link.ts
@@ -66,7 +66,7 @@ export class AddonModDataEditLinkHandlerService extends CoreContentLinksHandlerB
      * @inheritdoc
      */
     async isEnabled(siteId: string, url: string, params: Params): Promise<boolean> {
-        if (typeof params.d == 'undefined') {
+        if (params.d === undefined) {
             // Id not defined. Cannot treat the URL.
             return false;
         }
diff --git a/src/addons/mod/data/services/handlers/show-link.ts b/src/addons/mod/data/services/handlers/show-link.ts
index f1279506a..1804755af 100644
--- a/src/addons/mod/data/services/handlers/show-link.ts
+++ b/src/addons/mod/data/services/handlers/show-link.ts
@@ -77,12 +77,12 @@ export class AddonModDataShowLinkHandlerService extends CoreContentLinksHandlerB
      * @inheritdoc
      */
     async isEnabled(siteId: string, url: string, params: Params): Promise<boolean> {
-        if (typeof params.d == 'undefined') {
+        if (params.d === undefined) {
             // Id not defined. Cannot treat the URL.
             return false;
         }
 
-        if ((!params.mode || params.mode != 'single') && typeof params.rid == 'undefined') {
+        if ((!params.mode || params.mode != 'single') && params.rid === undefined) {
             return false;
         }
 
diff --git a/src/addons/mod/feedback/components/index/index.ts b/src/addons/mod/feedback/components/index/index.ts
index 3e77a7941..bfa04b763 100644
--- a/src/addons/mod/feedback/components/index/index.ts
+++ b/src/addons/mod/feedback/components/index/index.ts
@@ -299,7 +299,7 @@ export class AddonModFeedbackIndexComponent extends CoreCourseModuleMainActivity
                 item.data = <string[]> item.data.map((dataItem) => {
                     const parsed = <Record<string, string>> CoreTextUtils.parseJSON(dataItem);
 
-                    return typeof parsed.show != 'undefined' ? parsed.show : false;
+                    return parsed.show !== undefined ? parsed.show : false;
                 }).filter((dataItem) => dataItem); // Filter false entries.
 
             case 'textfield':
@@ -312,7 +312,7 @@ export class AddonModFeedbackIndexComponent extends CoreCourseModuleMainActivity
                 const parsedData = <Record<string, string | number>[]> item.data.map((dataItem) => {
                     const parsed = <Record<string, string | number>> CoreTextUtils.parseJSON(dataItem);
 
-                    return typeof parsed.answertext != 'undefined' ? parsed : false;
+                    return parsed.answertext !== undefined ? parsed : false;
                 }).filter((dataItem) => dataItem); // Filter false entries.
 
                 // Format labels.
@@ -320,7 +320,7 @@ export class AddonModFeedbackIndexComponent extends CoreCourseModuleMainActivity
                     dataItem.quotient = (<number> dataItem.quotient * 100).toFixed(2);
                     let label = '';
 
-                    if (typeof dataItem.value != 'undefined') {
+                    if (dataItem.value !== undefined) {
                         label = '(' + dataItem.value + ') ';
                     }
                     label += dataItem.answertext;
diff --git a/src/addons/mod/feedback/pages/nonrespondents/nonrespondents.ts b/src/addons/mod/feedback/pages/nonrespondents/nonrespondents.ts
index 12d312bc0..db568a32a 100644
--- a/src/addons/mod/feedback/pages/nonrespondents/nonrespondents.ts
+++ b/src/addons/mod/feedback/pages/nonrespondents/nonrespondents.ts
@@ -100,7 +100,7 @@ export class AddonModFeedbackNonRespondentsPage implements OnInit {
     protected async loadGroupUsers(groupId?: number): Promise<void> {
         this.loadMoreError = false;
 
-        if (typeof groupId == 'undefined') {
+        if (groupId === undefined) {
             this.page++;
         } else {
             this.selectedGroup = groupId;
diff --git a/src/addons/mod/feedback/pages/respondents/respondents.ts b/src/addons/mod/feedback/pages/respondents/respondents.ts
index 3ef2266a7..73a95a75f 100644
--- a/src/addons/mod/feedback/pages/respondents/respondents.ts
+++ b/src/addons/mod/feedback/pages/respondents/respondents.ts
@@ -115,7 +115,7 @@ export class AddonModFeedbackRespondentsPage implements AfterViewInit {
      * @return Resolved with the attempts loaded.
      */
     protected async loadGroupAttempts(groupId?: number): Promise<void> {
-        if (typeof groupId == 'undefined') {
+        if (groupId === undefined) {
             this.page++;
             this.loadingMore = true;
         } else {
diff --git a/src/addons/mod/feedback/services/feedback-helper.ts b/src/addons/mod/feedback/services/feedback-helper.ts
index 05751c7f5..bb0e6d6af 100644
--- a/src/addons/mod/feedback/services/feedback-helper.ts
+++ b/src/addons/mod/feedback/services/feedback-helper.ts
@@ -178,7 +178,7 @@ export class AddonModFeedbackHelperProvider {
         try {
             const module = await CoreCourse.getModuleBasicInfo(Number(params.id), siteId);
 
-            if (typeof params.showcompleted == 'undefined') {
+            if (params.showcompleted === undefined) {
                 // Param showcompleted not defined. Show entry list.
                 await CoreNavigator.navigateToSitePath(
                     AddonModFeedbackModuleHandlerService.PAGE_NAME + `/${module.course}/${module.id}/respondents`,
@@ -269,7 +269,7 @@ export class AddonModFeedbackHelperProvider {
 
         if (type == MODE_COURSE || type == MODE_CATEGORY) {
             formItem.presentation = formItem.otherdata;
-            formItem.value = typeof formItem.rawValue != 'undefined' ? formItem.rawValue : formItem.otherdata;
+            formItem.value = formItem.rawValue !== undefined ? formItem.rawValue : formItem.otherdata;
         } else if (type == MODE_RESPONSETIME) {
             formItem.value = '__CURRENT__TIMESTAMP__';
 
@@ -298,7 +298,7 @@ export class AddonModFeedbackHelperProvider {
 
         const formItem: AddonModFeedbackNumericItem = Object.assign(item, {
             templateName: 'numeric',
-            value: typeof item.rawValue != 'undefined' ? Number(item.rawValue) : '',
+            value: item.rawValue !== undefined ? Number(item.rawValue) : '',
             rangefrom: typeof rangeFrom == 'number' && !isNaN(rangeFrom) ? range[0] : '',
             rangeto: typeof rangeTo == 'number' && !isNaN(rangeTo) ? rangeTo : '',
             hasTextInput: true,
@@ -318,7 +318,7 @@ export class AddonModFeedbackHelperProvider {
         return Object.assign(item, {
             templateName: 'textfield',
             length: Number(item.presentation.split(AddonModFeedbackProvider.LINE_SEP)[1]) || 255,
-            value: typeof item.rawValue != 'undefined' ? item.rawValue : '',
+            value: item.rawValue !== undefined ? item.rawValue : '',
             hasTextInput: true,
         });
     }
@@ -332,7 +332,7 @@ export class AddonModFeedbackHelperProvider {
     protected getItemFormTextarea(item: AddonModFeedbackItem): AddonModFeedbackFormBasicItem {
         return Object.assign(item, {
             templateName: 'textarea',
-            value: typeof item.rawValue != 'undefined' ? item.rawValue : '',
+            value: item.rawValue !== undefined ? item.rawValue : '',
             hasTextInput: true,
         });
     }
@@ -373,12 +373,12 @@ export class AddonModFeedbackHelperProvider {
 
         if (formItem.subtype === 'r' && formItem.options.search(AddonModFeedbackProvider.MULTICHOICE_HIDENOSELECT) == -1) {
             formItem.choices.unshift({ value: 0, label: Translate.instant('addon.mod_feedback.not_selected') });
-            formItem.value = typeof formItem.rawValue != 'undefined' ? Number(formItem.rawValue) : 0;
+            formItem.value = formItem.rawValue !== undefined ? Number(formItem.rawValue) : 0;
         } else if (formItem.subtype === 'd') {
             formItem.choices.unshift({ value: 0, label: '' });
-            formItem.value = typeof formItem.rawValue != 'undefined' ? Number(formItem.rawValue) : 0;
+            formItem.value = formItem.rawValue !== undefined ? Number(formItem.rawValue) : 0;
         } else if (formItem.subtype === 'c') {
-            if (typeof formItem.rawValue != 'undefined') {
+            if (formItem.rawValue !== undefined) {
                 formItem.rawValue = String(formItem.rawValue);
                 const values = formItem.rawValue.split(AddonModFeedbackProvider.LINE_SEP);
                 formItem.choices.forEach((choice) => {
@@ -392,7 +392,7 @@ export class AddonModFeedbackHelperProvider {
                 });
             }
         } else {
-            formItem.value = typeof formItem.rawValue != 'undefined' ? Number(formItem.rawValue) : '';
+            formItem.value = formItem.rawValue !== undefined ? Number(formItem.rawValue) : '';
         }
 
         return formItem;
diff --git a/src/addons/mod/feedback/services/feedback.ts b/src/addons/mod/feedback/services/feedback.ts
index c1a254df3..814640e9f 100644
--- a/src/addons/mod/feedback/services/feedback.ts
+++ b/src/addons/mod/feedback/services/feedback.ts
@@ -87,7 +87,7 @@ export class AddonModFeedbackProvider {
         let values: AddonModFeedbackResponseValue[];
 
         if (subtype === 'c') {
-            if (typeof item.rawValue == 'undefined') {
+            if (item.rawValue === undefined) {
                 values = [''];
             } else {
                 item.rawValue = '' + item.rawValue;
@@ -146,7 +146,7 @@ export class AddonModFeedbackProvider {
             });
 
             filledItems.forEach((itemData) => {
-                if (itemData.hasvalue && typeof values[itemData.id] != 'undefined') {
+                if (itemData.hasvalue && values[itemData.id] !== undefined) {
                     itemData.rawValue = values[itemData.id];
                 }
             });
@@ -182,7 +182,7 @@ export class AddonModFeedbackProvider {
         });
 
         offlineValuesArray.forEach((value) => {
-            if (typeof offlineValues[value.item] == 'undefined') {
+            if (offlineValues[value.item] === undefined) {
                 offlineValues[value.item] = [];
             }
             offlineValues[value.item].push(value.value);
diff --git a/src/addons/mod/feedback/services/handlers/analysis-link.ts b/src/addons/mod/feedback/services/handlers/analysis-link.ts
index 8081f4bee..58a015234 100644
--- a/src/addons/mod/feedback/services/handlers/analysis-link.ts
+++ b/src/addons/mod/feedback/services/handlers/analysis-link.ts
@@ -78,7 +78,7 @@ export class AddonModFeedbackAnalysisLinkHandlerService extends CoreContentLinks
      * @inheritdoc
      */
     async isEnabled(siteId: string, url: string, params: Record<string, string>): Promise<boolean> {
-        if (typeof params.id == 'undefined') {
+        if (params.id === undefined) {
             // Cannot treat the URL.
             return false;
         }
diff --git a/src/addons/mod/feedback/services/handlers/complete-link.ts b/src/addons/mod/feedback/services/handlers/complete-link.ts
index f0bc0ac94..1415653fd 100644
--- a/src/addons/mod/feedback/services/handlers/complete-link.ts
+++ b/src/addons/mod/feedback/services/handlers/complete-link.ts
@@ -49,7 +49,7 @@ export class AddonModFeedbackCompleteLinkHandlerService extends CoreContentLinks
                         AddonModFeedbackModuleHandlerService.PAGE_NAME + `/${module.course}/${module.id}/form`,
                         {
                             params: {
-                                page: typeof params.gopage != 'undefined' ? Number(params.gopage) : undefined,
+                                page: params.gopage !== undefined ? Number(params.gopage) : undefined,
                             },
                             siteId,
                         },
@@ -67,7 +67,7 @@ export class AddonModFeedbackCompleteLinkHandlerService extends CoreContentLinks
      * @inheritdoc
      */
     async isEnabled(siteId: string, url: string, params: Record<string, string>): Promise<boolean> {
-        if (typeof params.id == 'undefined') {
+        if (params.id === undefined) {
             return false;
         }
 
diff --git a/src/addons/mod/feedback/services/handlers/print-link.ts b/src/addons/mod/feedback/services/handlers/print-link.ts
index 1a287d5ad..20205347c 100644
--- a/src/addons/mod/feedback/services/handlers/print-link.ts
+++ b/src/addons/mod/feedback/services/handlers/print-link.ts
@@ -67,7 +67,7 @@ export class AddonModFeedbackPrintLinkHandlerService extends CoreContentLinksHan
      * @inheritdoc
      */
     async isEnabled(siteId: string, url: string, params: Record<string, string>): Promise<boolean> {
-        if (typeof params.id == 'undefined') {
+        if (params.id === undefined) {
             return false;
         }
 
diff --git a/src/addons/mod/feedback/services/handlers/show-entries-link.ts b/src/addons/mod/feedback/services/handlers/show-entries-link.ts
index 1d1f857d4..30f3b7c15 100644
--- a/src/addons/mod/feedback/services/handlers/show-entries-link.ts
+++ b/src/addons/mod/feedback/services/handlers/show-entries-link.ts
@@ -44,7 +44,7 @@ export class AddonModFeedbackShowEntriesLinkHandlerService extends CoreContentLi
      * @inheritdoc
      */
     async isEnabled(siteId: string, url: string, params: Record<string, string>): Promise<boolean> {
-        if (typeof params.id == 'undefined') {
+        if (params.id === undefined) {
             // Cannot treat the URL.
             return false;
         }
diff --git a/src/addons/mod/feedback/services/handlers/show-non-respondents-link.ts b/src/addons/mod/feedback/services/handlers/show-non-respondents-link.ts
index cccaadcad..992b9be0d 100644
--- a/src/addons/mod/feedback/services/handlers/show-non-respondents-link.ts
+++ b/src/addons/mod/feedback/services/handlers/show-non-respondents-link.ts
@@ -61,7 +61,7 @@ export class AddonModFeedbackShowNonRespondentsLinkHandlerService extends CoreCo
      * @inheritdoc
      */
     async isEnabled(siteId: string, url: string, params: Record<string, string>): Promise<boolean> {
-        if (typeof params.id == 'undefined') {
+        if (params.id === undefined) {
             // Cannot treat the URL.
             return false;
         }
diff --git a/src/addons/mod/forum/classes/forum-discussions-source.ts b/src/addons/mod/forum/classes/forum-discussions-source.ts
index 26bd22967..7ef18281f 100644
--- a/src/addons/mod/forum/classes/forum-discussions-source.ts
+++ b/src/addons/mod/forum/classes/forum-discussions-source.ts
@@ -128,7 +128,7 @@ export class AddonModForumDiscussionsSource extends CoreRoutedItemsManagerSource
     async loadForum(): Promise<void> {
         this.forum = await AddonModForum.getForum(this.COURSE_ID, this.CM_ID);
 
-        if (typeof this.forum.istracked != 'undefined') {
+        if (this.forum.istracked !== undefined) {
             this.trackPosts = this.forum.istracked;
         }
     }
@@ -192,7 +192,7 @@ export class AddonModForumDiscussionsSource extends CoreRoutedItemsManagerSource
         }
 
         // If any discussion has unread posts, the whole forum is being tracked.
-        if (typeof this.forum.istracked === 'undefined' && !this.trackPosts) {
+        if (this.forum.istracked === undefined && !this.trackPosts) {
             for (const discussion of discussions) {
                 if (discussion.numunread > 0) {
                     this.trackPosts = true;
diff --git a/src/addons/mod/forum/components/index/index.ts b/src/addons/mod/forum/components/index/index.ts
index 696f762da..9afeb028e 100644
--- a/src/addons/mod/forum/components/index/index.ts
+++ b/src/addons/mod/forum/components/index/index.ts
@@ -218,13 +218,13 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
                         ) as AddonModForumDiscussion;
 
                         if (discussion) {
-                            if (typeof data.locked != 'undefined') {
+                            if (data.locked !== undefined) {
                                 discussion.locked = data.locked;
                             }
-                            if (typeof data.pinned != 'undefined') {
+                            if (data.pinned !== undefined) {
                                 discussion.pinned = data.pinned;
                             }
-                            if (typeof data.starred != 'undefined') {
+                            if (data.starred !== undefined) {
                                 discussion.starred = data.starred;
                             }
 
@@ -232,7 +232,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
                         }
                     }
 
-                    if (typeof data.deleted != 'undefined' && data.deleted) {
+                    if (data.deleted !== undefined && data.deleted) {
                         if (data.post?.parentid == 0 && CoreScreen.isTablet && !this.discussions.empty) {
                             // Discussion deleted, clear details page.
                             this.discussions.select(this.discussions[0]);
diff --git a/src/addons/mod/forum/components/post-options-menu/post-options-menu.ts b/src/addons/mod/forum/components/post-options-menu/post-options-menu.ts
index fd1662e5a..ad13a1e84 100644
--- a/src/addons/mod/forum/components/post-options-menu/post-options-menu.ts
+++ b/src/addons/mod/forum/components/post-options-menu/post-options-menu.ts
@@ -69,7 +69,7 @@ export class AddonModForumPostOptionsMenuComponent implements OnInit, OnDestroy
             return;
         }
 
-        if (typeof this.post.capabilities.delete == 'undefined') {
+        if (this.post.capabilities.delete === undefined) {
             if (this.forumId) {
                 try {
                     this.post =
diff --git a/src/addons/mod/forum/pages/discussion/discussion.page.ts b/src/addons/mod/forum/pages/discussion/discussion.page.ts
index 0b6428ae0..12bf5c553 100644
--- a/src/addons/mod/forum/pages/discussion/discussion.page.ts
+++ b/src/addons/mod/forum/pages/discussion/discussion.page.ts
@@ -254,17 +254,17 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
         this.changeDiscObserver = CoreEvents.on(AddonModForumProvider.CHANGE_DISCUSSION_EVENT, data => {
             if (discussion && this.forumId && (this.forumId === data.forumId || data.cmId === this.cmId)) {
                 AddonModForum.invalidateDiscussionsList(this.forumId).finally(() => {
-                    if (typeof data.locked != 'undefined') {
+                    if (data.locked !== undefined) {
                         discussion.locked = data.locked;
                     }
-                    if (typeof data.pinned != 'undefined') {
+                    if (data.pinned !== undefined) {
                         discussion.pinned = data.pinned;
                     }
-                    if (typeof data.starred != 'undefined') {
+                    if (data.starred !== undefined) {
                         discussion.starred = data.starred;
                     }
 
-                    if (typeof data.deleted != 'undefined' && data.deleted) {
+                    if (data.deleted !== undefined && data.deleted) {
                         if (!data.post?.parentid) {
                             this.goBack();
                         } else {
@@ -469,7 +469,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
                 // Now try to get the forum.
                 const forum = await this.fetchForum();
                 // "forum.istracked" is more reliable than "trackPosts".
-                if (typeof forum.istracked != 'undefined') {
+                if (forum.istracked !== undefined) {
                     this.trackPosts = forum.istracked;
                 }
 
diff --git a/src/addons/mod/forum/services/forum-sync.ts b/src/addons/mod/forum/services/forum-sync.ts
index 65925b3d7..f033e9d22 100644
--- a/src/addons/mod/forum/services/forum-sync.ts
+++ b/src/addons/mod/forum/services/forum-sync.ts
@@ -379,7 +379,7 @@ export class AddonModForumSyncProvider extends CoreCourseActivitySyncBaseProvide
 
         // Do not sync same discussion twice.
         replies.forEach((reply) => {
-            if (typeof promises[reply.discussionid] != 'undefined') {
+            if (promises[reply.discussionid] !== undefined) {
                 return;
             }
             promises[reply.discussionid] = this.syncDiscussionReplies(reply.discussionid, userId, siteId);
diff --git a/src/addons/mod/forum/services/forum.ts b/src/addons/mod/forum/services/forum.ts
index 131706f96..fb1b53bbd 100644
--- a/src/addons/mod/forum/services/forum.ts
+++ b/src/addons/mod/forum/services/forum.ts
@@ -253,11 +253,11 @@ export class AddonModForumProvider {
             throw new Error('Invalid response calling mod_forum_can_add_discussion');
         }
 
-        if (typeof result.canpindiscussions == 'undefined') {
+        if (result.canpindiscussions === undefined) {
             // WS doesn't support it yet, default it to false to prevent students from seeing the option.
             result.canpindiscussions = false;
         }
-        if (typeof result.cancreateattachment == 'undefined') {
+        if (result.cancreateattachment === undefined) {
             // WS doesn't support it yet, default it to true since usually the users will be able to create them.
             result.cancreateattachment = true;
         }
@@ -816,7 +816,7 @@ export class AddonModForumProvider {
             discussions: [] as AddonModForumDiscussion[],
             error: false,
         };
-        let numPages = typeof options.numPages == 'undefined' ? -1 : options.numPages;
+        let numPages = options.numPages === undefined ? -1 : options.numPages;
 
         if (!numPages) {
             return result;
diff --git a/src/addons/mod/forum/services/handlers/post-link.ts b/src/addons/mod/forum/services/handlers/post-link.ts
index 7aa3042f3..79002b558 100644
--- a/src/addons/mod/forum/services/handlers/post-link.ts
+++ b/src/addons/mod/forum/services/handlers/post-link.ts
@@ -78,7 +78,7 @@ export class AddonModForumPostLinkHandlerService extends CoreContentLinksHandler
      * @return Whether the handler is enabled for the URL and site.
      */
     async isEnabled(siteId: string, url: string, params: Params): Promise<boolean> {
-        return typeof params.forum != 'undefined';
+        return params.forum !== undefined;
     }
 
 }
diff --git a/src/addons/mod/glossary/services/glossary-helper.ts b/src/addons/mod/glossary/services/glossary-helper.ts
index 1e25ddffd..ce1dcc587 100644
--- a/src/addons/mod/glossary/services/glossary-helper.ts
+++ b/src/addons/mod/glossary/services/glossary-helper.ts
@@ -71,7 +71,7 @@ export class AddonModGlossaryHelperProvider {
         files: CoreFileEntry[],
         original?: AddonModGlossaryNewEntryWithFiles,
     ): boolean {
-        if (!original || typeof original.concept == 'undefined') {
+        if (!original || original.concept === undefined) {
             // There is no original data.
             return !!(entry.definition || entry.concept || files.length > 0);
         }
diff --git a/src/addons/mod/glossary/services/glossary.ts b/src/addons/mod/glossary/services/glossary.ts
index 033adbe77..eeb8ec937 100644
--- a/src/addons/mod/glossary/services/glossary.ts
+++ b/src/addons/mod/glossary/services/glossary.ts
@@ -583,7 +583,7 @@ export class AddonModGlossaryProvider {
             try {
                 const data = await this.getStoredDataForEntry(entryId, site.getId());
 
-                if (typeof data.from != 'undefined') {
+                if (data.from !== undefined) {
                     const response = await CoreUtils.ignoreErrors(
                         this.getEntryFromList(data.glossaryId, entryId, data.from, false, options),
                     );
diff --git a/src/addons/mod/glossary/services/handlers/edit-link.ts b/src/addons/mod/glossary/services/handlers/edit-link.ts
index f72ea2667..ffc4b3203 100644
--- a/src/addons/mod/glossary/services/handlers/edit-link.ts
+++ b/src/addons/mod/glossary/services/handlers/edit-link.ts
@@ -70,7 +70,7 @@ export class AddonModGlossaryEditLinkHandlerService extends CoreContentLinksHand
      * @inheritdoc
      */
     async isEnabled(siteId: string, url: string, params: Record<string, string>): Promise<boolean> {
-        return typeof params.cmid != 'undefined';
+        return params.cmid !== undefined;
     }
 
 }
diff --git a/src/addons/mod/h5pactivity/services/handlers/report-link.ts b/src/addons/mod/h5pactivity/services/handlers/report-link.ts
index ee6b8c9ab..760d0b72e 100644
--- a/src/addons/mod/h5pactivity/services/handlers/report-link.ts
+++ b/src/addons/mod/h5pactivity/services/handlers/report-link.ts
@@ -56,7 +56,7 @@ export class AddonModH5PActivityReportLinkHandlerService extends CoreContentLink
 
                     const module = await CoreCourse.getModuleBasicInfoByInstance(instanceId, 'h5pactivity', siteId);
 
-                    if (typeof params.attemptid != 'undefined') {
+                    if (params.attemptid !== undefined) {
                         this.openAttemptResults(module.id, Number(params.attemptid), courseId, siteId);
                     } else {
                         const userId = params.userid ? Number(params.userid) : undefined;
diff --git a/src/addons/mod/lesson/services/lesson-helper.ts b/src/addons/mod/lesson/services/lesson-helper.ts
index cebbb9f88..669a9bd5b 100644
--- a/src/addons/mod/lesson/services/lesson-helper.ts
+++ b/src/addons/mod/lesson/services/lesson-helper.ts
@@ -416,7 +416,7 @@ export class AddonModLessonHelperProvider {
             // Treat each option.
             let controlAdded = false;
             options.forEach((option) => {
-                if (typeof option.value == 'undefined') {
+                if (option.value === undefined) {
                     // Option not valid, ignore it.
                     return;
                 }
diff --git a/src/addons/mod/lesson/services/lesson.ts b/src/addons/mod/lesson/services/lesson.ts
index a89470d6d..5f78849ec 100644
--- a/src/addons/mod/lesson/services/lesson.ts
+++ b/src/addons/mod/lesson/services/lesson.ts
@@ -418,11 +418,11 @@ export class AddonModLessonProvider {
         }
 
         // The name was changed to "answer_editor" in 3.7. Before it was just "answer". Support both cases.
-        if (typeof data['answer_editor[text]'] != 'undefined') {
+        if (data['answer_editor[text]'] !== undefined) {
             studentAnswer = data['answer_editor[text]'];
         } else if (typeof data.answer_editor == 'object') {
             studentAnswer = (<{text: string}> data.answer_editor).text;
-        } else if (typeof data['answer[text]'] != 'undefined') {
+        } else if (data['answer[text]'] !== undefined) {
             studentAnswer = data['answer[text]'];
         } else if (typeof data.answer == 'object') {
             studentAnswer = (<{text: string}> data.answer).text;
@@ -505,7 +505,7 @@ export class AddonModLessonProvider {
             value = CoreTextUtils.decodeHTML(value);
             userResponse.push(value);
 
-            if (typeof answers[id] != 'undefined') {
+            if (answers[id] !== undefined) {
                 const answer = answers[id];
 
                 result.studentanswer += '<br />' + answer.answer + ' = ' + value;
@@ -606,7 +606,7 @@ export class AddonModLessonProvider {
                             nHits++;
                         } else {
                             // Always use the first student wrong answer.
-                            if (typeof wrongPageId == 'undefined') {
+                            if (wrongPageId === undefined) {
                                 wrongPageId = answer.jumpto;
                             }
                             // Save the answer id for scoring.
@@ -621,7 +621,7 @@ export class AddonModLessonProvider {
                     nCorrect++;
 
                     // Save the first jumpto.
-                    if (typeof correctPageId == 'undefined') {
+                    if (correctPageId === undefined) {
                         correctPageId = answer.jumpto;
                     }
                     // Save the answer id for scoring.
@@ -644,7 +644,7 @@ export class AddonModLessonProvider {
             }
         } else {
             // Only one answer allowed.
-            if (typeof data.answerid == 'undefined' || (!data.answerid && Number(data.answerid) !== 0)) {
+            if (data.answerid === undefined || (!data.answerid && Number(data.answerid) !== 0)) {
                 result.noanswer = true;
 
                 return;
@@ -1501,7 +1501,7 @@ export class AddonModLessonProvider {
 
         const response = await site.read<AddonModLessonGetLessonWSResponse>('mod_lesson_get_lesson', params, preSets);
 
-        if (typeof response.lesson.ongoing == 'undefined') {
+        if (response.lesson.ongoing === undefined) {
             // Basic data not received, password is wrong. Remove stored password.
             this.removeStoredPassword(lessonId, site.id);
 
@@ -1788,7 +1788,7 @@ export class AddonModLessonProvider {
         const jumps: AddonModLessonPossibleJumps = {};
 
         response.jumps.forEach((jump) => {
-            if (typeof jumps[jump.pageid] == 'undefined') {
+            if (jumps[jump.pageid] === undefined) {
                 jumps[jump.pageid] = {};
             }
             jumps[jump.pageid][jump.jumpto] = jump;
@@ -2886,7 +2886,7 @@ export class AddonModLessonProvider {
                 if (options.pageIndex[lastAttempt.pageid].qtype == AddonModLessonProvider.LESSON_PAGE_ESSAY) {
                     // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     const score: number | undefined = (<any> lastAttempt.useranswer)?.score;
-                    if (typeof score != 'undefined') {
+                    if (score !== undefined) {
                         result.earned += score;
                     }
                     result.nmanual++;
@@ -2917,7 +2917,7 @@ export class AddonModLessonProvider {
             for (const answerId in answers) {
                 const answer = answers[answerId];
 
-                if (typeof bestScores[answer.pageid] == 'undefined') {
+                if (bestScores[answer.pageid] === undefined) {
                     bestScores[answer.pageid] = answer.score || 0;
                 } else if (bestScores[answer.pageid] < (answer.score || 0)) {
                     bestScores[answer.pageid] = answer.score || 0;
@@ -3271,7 +3271,7 @@ export class AddonModLessonProvider {
 
         if (lesson.review && !result.correctanswer && !result.isessayquestion) {
             // Calculate the number of question attempt in the page if it isn't calculated already.
-            if (typeof nAttempts == 'undefined') {
+            if (nAttempts === undefined) {
                 const result = await this.getQuestionsAttempts(lesson.id, retake, {
                     cmId: lesson.coursemodule,
                     pageId: pageData.page.id,
diff --git a/src/addons/mod/page/components/index/index.ts b/src/addons/mod/page/components/index/index.ts
index 3017d9bf1..a58d49a3a 100644
--- a/src/addons/mod/page/components/index/index.ts
+++ b/src/addons/mod/page/components/index/index.ts
@@ -113,9 +113,9 @@ export class AddonModPageIndexComponent extends CoreCourseModuleMainResourceComp
             const options: Record<string, string | boolean> =
                 CoreTextUtils.unserialize(this.page.displayoptions) || {};
 
-            this.displayDescription = typeof options.printintro == 'undefined' ||
+            this.displayDescription = options.printintro === undefined ||
                     CoreUtils.isTrueOrOne(options.printintro);
-            this.displayTimemodified = typeof options.printlastmodified == 'undefined' ||
+            this.displayTimemodified = options.printlastmodified === undefined ||
                     CoreUtils.isTrueOrOne(options.printlastmodified);
         } else {
             this.displayDescription = true;
diff --git a/src/addons/mod/quiz/accessrules/password/services/handlers/password.ts b/src/addons/mod/quiz/accessrules/password/services/handlers/password.ts
index 447b336b6..b61c24d84 100644
--- a/src/addons/mod/quiz/accessrules/password/services/handlers/password.ts
+++ b/src/addons/mod/quiz/accessrules/password/services/handlers/password.ts
@@ -48,7 +48,7 @@ export class AddonModQuizAccessPasswordHandlerService implements AddonModQuizAcc
         prefetch?: boolean,
         siteId?: string,
     ): Promise<void> {
-        if (typeof preflightData.quizpassword != 'undefined') {
+        if (preflightData.quizpassword !== undefined) {
             return;
         }
 
@@ -134,7 +134,7 @@ export class AddonModQuizAccessPasswordHandlerService implements AddonModQuizAcc
         siteId?: string,
     ): Promise<void> {
         // The password is right, store it to use it automatically in following executions.
-        if (typeof preflightData.quizpassword != 'undefined') {
+        if (preflightData.quizpassword !== undefined) {
             return this.storePassword(quiz.id, preflightData.quizpassword, siteId);
         }
     }
diff --git a/src/addons/mod/quiz/components/index/index.ts b/src/addons/mod/quiz/components/index/index.ts
index 078c97054..92bdfd881 100644
--- a/src/addons/mod/quiz/components/index/index.ts
+++ b/src/addons/mod/quiz/components/index/index.ts
@@ -615,7 +615,7 @@ export class AddonModQuizIndexComponent extends CoreCourseModuleMainActivityComp
 
         await Promise.all(promises);
 
-        const grade = typeof this.gradebookData?.grade != 'undefined' ? this.gradebookData.grade : this.bestGrade?.grade;
+        const grade = this.gradebookData?.grade !== undefined ? this.gradebookData.grade : this.bestGrade?.grade;
         const quizGrade = AddonModQuiz.formatGrade(grade, quiz.decimalpoints);
 
         // Calculate data to construct the header of the attempts table.
diff --git a/src/addons/mod/quiz/pages/attempt/attempt.page.ts b/src/addons/mod/quiz/pages/attempt/attempt.page.ts
index 85481178d..8906d97f2 100644
--- a/src/addons/mod/quiz/pages/attempt/attempt.page.ts
+++ b/src/addons/mod/quiz/pages/attempt/attempt.page.ts
@@ -186,7 +186,7 @@ export class AddonModQuizAttemptPage implements OnInit {
             promises.push(AddonModQuiz.invalidateQuizAccessInformation(this.quiz.id));
             promises.push(AddonModQuiz.invalidateCombinedReviewOptionsForUser(this.quiz.id));
 
-            if (this.attempt && typeof this.feedback != 'undefined') {
+            if (this.attempt && this.feedback !== undefined) {
                 promises.push(AddonModQuiz.invalidateFeedback(this.quiz.id));
             }
         }
diff --git a/src/addons/mod/quiz/pages/player/player.page.ts b/src/addons/mod/quiz/pages/player/player.page.ts
index c2da33f1b..16e1a22de 100644
--- a/src/addons/mod/quiz/pages/player/player.page.ts
+++ b/src/addons/mod/quiz/pages/player/player.page.ts
@@ -261,7 +261,7 @@ export class AddonModQuizPlayerPage implements OnInit, OnDestroy, CanLeave {
         if (page != -1 && (this.attempt.state == AddonModQuizProvider.ATTEMPT_OVERDUE || this.attempt.finishedOffline)) {
             // We can't load a page if overdue or the local attempt is finished.
             return;
-        } else if (page == this.attempt.currentpage && !this.showSummary && typeof slot != 'undefined') {
+        } else if (page == this.attempt.currentpage && !this.showSummary && slot !== undefined) {
             // Navigating to a question in the current page.
             this.scrollToQuestion(slot);
 
@@ -317,7 +317,7 @@ export class AddonModQuizPlayerPage implements OnInit, OnDestroy, CanLeave {
         } finally {
             this.loaded = true;
 
-            if (typeof slot != 'undefined') {
+            if (slot !== undefined) {
                 // Scroll to the question. Give some time to the questions to render.
                 setTimeout(() => {
                     this.scrollToQuestion(slot);
diff --git a/src/addons/mod/quiz/pages/review/review.page.ts b/src/addons/mod/quiz/pages/review/review.page.ts
index 98d01d3da..07fb1c5cd 100644
--- a/src/addons/mod/quiz/pages/review/review.page.ts
+++ b/src/addons/mod/quiz/pages/review/review.page.ts
@@ -116,7 +116,7 @@ export class AddonModQuizReviewPage implements OnInit {
      * @param slot Slot of the question to scroll to.
      */
     async changePage(page: number, fromModal?: boolean, slot?: number): Promise<void> {
-        if (typeof slot != 'undefined' && (this.attempt!.currentpage == -1 || page == this.currentPage)) {
+        if (slot !== undefined && (this.attempt!.currentpage == -1 || page == this.currentPage)) {
             // Scrol to a certain question in the current page.
             this.scrollToQuestion(slot);
 
@@ -136,7 +136,7 @@ export class AddonModQuizReviewPage implements OnInit {
         } finally {
             this.loaded = true;
 
-            if (typeof slot != 'undefined') {
+            if (slot !== undefined) {
                 // Scroll to the question. Give some time to the questions to render.
                 setTimeout(() => {
                     this.scrollToQuestion(slot);
@@ -286,7 +286,7 @@ export class AddonModQuizReviewPage implements OnInit {
         if (this.options!.someoptions.marks >= AddonModQuizProvider.QUESTION_OPTIONS_MARK_AND_MAX &&
                 AddonModQuiz.quizHasGrades(this.quiz)) {
 
-            if (data.grade === null || typeof data.grade == 'undefined') {
+            if (data.grade === null || data.grade === undefined) {
                 this.readableGrade = AddonModQuiz.formatGrade(data.grade, this.quiz.decimalpoints);
             } else {
                 // Show raw marks only if they are different from the grade (like on the entry page).
diff --git a/src/addons/mod/quiz/services/handlers/prefetch.ts b/src/addons/mod/quiz/services/handlers/prefetch.ts
index 47b61b959..e1d035e83 100644
--- a/src/addons/mod/quiz/services/handlers/prefetch.ts
+++ b/src/addons/mod/quiz/services/handlers/prefetch.ts
@@ -120,7 +120,7 @@ export class AddonModQuizPrefetchHandlerService extends CoreCourseActivityPrefet
             }
 
             const attemptGrade = AddonModQuiz.rescaleGrade(attempt.sumgrades, quiz, false);
-            if (typeof attemptGrade == 'undefined') {
+            if (attemptGrade === undefined) {
                 return;
             }
 
@@ -421,7 +421,7 @@ export class AddonModQuizPrefetchHandlerService extends CoreCourseActivityPrefet
         if (AddonModQuiz.isAttemptFinished(attempt.state)) {
             // Attempt is finished, get feedback and review data.
             const attemptGrade = AddonModQuiz.rescaleGrade(attempt.sumgrades, quiz, false);
-            if (typeof attemptGrade != 'undefined') {
+            if (attemptGrade !== undefined) {
                 promises.push(AddonModQuiz.getFeedbackForGrade(quiz.id, Number(attemptGrade), modOptions));
             }
 
diff --git a/src/addons/mod/quiz/services/quiz.ts b/src/addons/mod/quiz/services/quiz.ts
index c3cc895df..bc8793596 100644
--- a/src/addons/mod/quiz/services/quiz.ts
+++ b/src/addons/mod/quiz/services/quiz.ts
@@ -425,7 +425,7 @@ export class AddonModQuizProvider {
         attemptId: number,
         options: AddonModQuizGetAttemptReviewOptions = {},
     ): Promise<AddonModQuizGetAttemptReviewResponse> {
-        const page = typeof options.page == 'undefined' ? -1 : options.page;
+        const page = options.page === undefined ? -1 : options.page;
 
         const site = await CoreSites.getSite(options.siteId);
 
@@ -620,7 +620,7 @@ export class AddonModQuizProvider {
      * @return Number of decimals.
      */
     getGradeDecimals(quiz: AddonModQuizQuizWSData): number {
-        if (typeof quiz.questiondecimalpoints == 'undefined') {
+        if (quiz.questiondecimalpoints === undefined) {
             quiz.questiondecimalpoints = -1;
         }
 
@@ -1029,7 +1029,7 @@ export class AddonModQuizProvider {
     ): Promise<AddonModQuizAttemptWSData[]> {
 
         const status = options.status || 'all';
-        const includePreviews = typeof options.includePreviews == 'undefined' ? true : options.includePreviews;
+        const includePreviews = options.includePreviews === undefined ? true : options.includePreviews;
 
         const site = await CoreSites.getSite(options.siteId);
 
diff --git a/src/addons/mod/resource/components/index/index.ts b/src/addons/mod/resource/components/index/index.ts
index a3a29b038..8b95a597a 100644
--- a/src/addons/mod/resource/components/index/index.ts
+++ b/src/addons/mod/resource/components/index/index.ts
@@ -116,7 +116,7 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
             resource.displayoptions ? CoreTextUtils.unserialize(resource.displayoptions) : {};
 
         try {
-            this.displayDescription = typeof options.printintro == 'undefined' || !!options.printintro;
+            this.displayDescription = options.printintro === undefined || !!options.printintro;
             this.dataRetrieved.emit(resource);
 
             if (AddonModResourceHelper.isDisplayedInIframe(this.module)) {
diff --git a/src/addons/mod/scorm/components/index/index.ts b/src/addons/mod/scorm/components/index/index.ts
index 945ba9112..44985f6d1 100644
--- a/src/addons/mod/scorm/components/index/index.ts
+++ b/src/addons/mod/scorm/components/index/index.ts
@@ -203,7 +203,7 @@ export class AddonModScormIndexComponent extends CoreCourseModuleMainActivityCom
             this.accessInfo = accessInfo;
 
             // Check whether to launch the SCORM immediately.
-            if (typeof this.skip == 'undefined') {
+            if (this.skip === undefined) {
                 this.skip = !this.hasOffline && !this.errorMessage &&
                     (!this.scorm.lastattemptlock || this.attemptsLeft > 0) &&
                     this.accessInfo.canskipview && !this.accessInfo.canviewreport &&
diff --git a/src/addons/mod/scorm/services/scorm-offline.ts b/src/addons/mod/scorm/services/scorm-offline.ts
index 2971656e9..9f9874486 100644
--- a/src/addons/mod/scorm/services/scorm-offline.ts
+++ b/src/addons/mod/scorm/services/scorm-offline.ts
@@ -682,7 +682,7 @@ export class AddonModScormOfflineProvider {
             scoid: scoId,
             attempt,
             element: element,
-            value: typeof value == 'undefined' ? null : JSON.stringify(value),
+            value: value === undefined ? null : JSON.stringify(value),
             timemodified: CoreTimeUtils.timestamp(),
             synced: 0,
         };
@@ -937,7 +937,7 @@ export class AddonModScormOfflineProvider {
         param: string,
         ifEmpty: AddonModScormDataValue = '',
     ): AddonModScormDataValue {
-        if (typeof userData[param] != 'undefined') {
+        if (userData[param] !== undefined) {
             return userData[param];
         }
 
diff --git a/src/addons/mod/scorm/services/scorm-sync.ts b/src/addons/mod/scorm/services/scorm-sync.ts
index 5c9e1f158..520864d6e 100644
--- a/src/addons/mod/scorm/services/scorm-sync.ts
+++ b/src/addons/mod/scorm/services/scorm-sync.ts
@@ -476,7 +476,7 @@ export class AddonModScormSyncProvider extends CoreCourseActivitySyncBaseProvide
                 await this.syncScorm(scorm, siteId) :
                 await this.syncScormIfNeeded(scorm, siteId);
 
-            if (typeof data != 'undefined') {
+            if (data !== undefined) {
                 // We tried to sync. Send event.
                 CoreEvents.trigger(AddonModScormSyncProvider.AUTO_SYNCED, {
                     scormId: scorm.id,
diff --git a/src/addons/mod/scorm/services/scorm.ts b/src/addons/mod/scorm/services/scorm.ts
index a5cd5ecb9..528e68c6a 100644
--- a/src/addons/mod/scorm/services/scorm.ts
+++ b/src/addons/mod/scorm/services/scorm.ts
@@ -331,7 +331,7 @@ export class AddonModScormProvider {
                     set.forEach((setElement) => {
                         setElement = setElement.trim();
 
-                        if (typeof trackData[setElement] != 'undefined' &&
+                        if (trackData[setElement] !== undefined &&
                                 (trackData[setElement].status == 'completed' || trackData[setElement].status == 'passed')) {
                             count++;
                         }
@@ -350,11 +350,11 @@ export class AddonModScormProvider {
                     matches = element.match(reOther)!;
                     element = matches[1].trim();
 
-                    if (typeof trackData[element] != 'undefined') {
+                    if (trackData[element] !== undefined) {
                         let value = matches[3].trim().replace(/('|")/gi, '');
                         let oper: string;
 
-                        if (typeof STATUSES[value] != 'undefined') {
+                        if (STATUSES[value] !== undefined) {
                             value = STATUSES[value];
                         }
 
@@ -370,7 +370,7 @@ export class AddonModScormProvider {
                     }
                 } else {
                     // Everything else must be an element defined like S45 ...
-                    if (typeof trackData[element] != 'undefined' &&
+                    if (trackData[element] !== undefined &&
                             (trackData[element].status == 'completed' || trackData[element].status == 'passed')) {
                         element = 'true';
                     } else {
@@ -395,7 +395,7 @@ export class AddonModScormProvider {
      * @return Grade to display.
      */
     formatGrade(scorm: AddonModScormScorm, grade: number): string {
-        if (typeof grade == 'undefined' || grade == -1) {
+        if (grade === undefined || grade == -1) {
             return Translate.instant('core.none');
         }
 
@@ -607,8 +607,8 @@ export class AddonModScormProvider {
                 attemptScore.scos++;
             }
 
-            if (userData.score_raw || (typeof scorm.scormtype != 'undefined' &&
-                        scorm.scormtype == 'sco' && typeof userData.score_raw != 'undefined')) {
+            if (userData.score_raw || (scorm.scormtype !== undefined &&
+                        scorm.scormtype == 'sco' && userData.score_raw !== undefined)) {
 
                 const scoreRaw = parseFloat(<string> userData.score_raw);
                 attemptScore.values++;
@@ -912,14 +912,14 @@ export class AddonModScormProvider {
             }
 
             // Check isvisible attribute.
-            sco.isvisible = typeof scoData.isvisible == 'undefined' || (!!scoData.isvisible && scoData.isvisible !== 'false');
+            sco.isvisible = scoData.isvisible === undefined || (!!scoData.isvisible && scoData.isvisible !== 'false');
             // Check pre-requisites status.
-            sco.prereq = typeof scoData.prerequisites == 'undefined' ||
+            sco.prereq = scoData.prerequisites === undefined ||
                 this.evalPrerequisites(<string> scoData.prerequisites, trackDataBySCO);
             // Add status.
-            sco.status = (typeof scoData.status == 'undefined' || scoData.status === '') ? 'notattempted' : <string> scoData.status;
+            sco.status = (scoData.status === undefined || scoData.status === '') ? 'notattempted' : <string> scoData.status;
             // Exit var.
-            sco.exitvar = typeof scoData.exitvar == 'undefined' ? 'cmi.core.exit' : <string> scoData.exitvar;
+            sco.exitvar = scoData.exitvar === undefined ? 'cmi.core.exit' : <string> scoData.exitvar;
             sco.exitvalue = <string> scoData[sco.exitvar];
             // Copy score.
             sco.scoreraw = scoData.score_raw;
@@ -1109,7 +1109,7 @@ export class AddonModScormProvider {
         }
 
         // If the SCORM isn't available the WS returns a warning and it doesn't return timeopen and timeclosed.
-        if (typeof currentScorm.timeopen == 'undefined') {
+        if (currentScorm.timeopen === undefined) {
             const warning = response.warnings?.find(warning => warning.itemid === currentScorm.id);
             currentScorm.warningMessage = warning?.message;
         }
@@ -1339,7 +1339,7 @@ export class AddonModScormProvider {
      * @return Whether the SCORM is downloadable.
      */
     isScormDownloadable(scorm: AddonModScormScorm): boolean {
-        return typeof scorm.protectpackagedownloads != 'undefined' && scorm.protectpackagedownloads === false;
+        return scorm.protectpackagedownloads !== undefined && scorm.protectpackagedownloads === false;
     }
 
     /**
@@ -1635,7 +1635,7 @@ export class AddonModScormProvider {
 
         const component = AddonModScormProvider.COMPONENT;
 
-        if (typeof isOutdated == 'undefined') {
+        if (isOutdated === undefined) {
             // Calculate if it's outdated.
             const data = await CoreUtils.ignoreErrors(CoreFilepool.getPackageData(siteId, component, scorm.coursemodule));
 
diff --git a/src/addons/mod/url/components/index/index.ts b/src/addons/mod/url/components/index/index.ts
index e92c6541e..db01da3b2 100644
--- a/src/addons/mod/url/components/index/index.ts
+++ b/src/addons/mod/url/components/index/index.ts
@@ -92,7 +92,7 @@ export class AddonModUrlIndexComponent extends CoreCourseModuleMainResourceCompo
 
             if (url.displayoptions) {
                 const unserialized = CoreTextUtils.unserialize<AddonModUrlDisplayOptions>(url.displayoptions);
-                this.displayDescription = typeof unserialized.printintro == 'undefined' || !!unserialized.printintro;
+                this.displayDescription = unserialized.printintro === undefined || !!unserialized.printintro;
             }
 
             // Try to get module contents, it's needed to get the URL with parameters.
diff --git a/src/addons/mod/wiki/components/index/index.ts b/src/addons/mod/wiki/components/index/index.ts
index 1ae8303a8..45ea90277 100644
--- a/src/addons/mod/wiki/components/index/index.ts
+++ b/src/addons/mod/wiki/components/index/index.ts
@@ -959,28 +959,28 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
                         candidateSubwikiId = subwiki.id;
                     }
 
-                    if (typeof candidateSubwikiId != 'undefined') {
+                    if (candidateSubwikiId !== undefined) {
                         if (candidateSubwikiId > 0) {
                             // Subwiki found and created, no need to keep looking.
                             candidateFirstPage = Number(i);
                             break;
-                        } else if (typeof candidateNoFirstPage == 'undefined') {
+                        } else if (candidateNoFirstPage === undefined) {
                             candidateNoFirstPage = Number(i);
                         }
-                    } else if (typeof firstCanEdit == 'undefined') {
+                    } else if (firstCanEdit === undefined) {
                         firstCanEdit = Number(i);
                     }
                 }
             }
 
             let subWikiToTake: number;
-            if (typeof candidateFirstPage != 'undefined') {
+            if (candidateFirstPage !== undefined) {
                 // Take the candidate that already has the first page created.
                 subWikiToTake = candidateFirstPage;
-            } else if (typeof candidateNoFirstPage != 'undefined') {
+            } else if (candidateNoFirstPage !== undefined) {
                 // No first page created, take the first candidate.
                 subWikiToTake = candidateNoFirstPage;
-            } else if (typeof firstCanEdit != 'undefined') {
+            } else if (firstCanEdit !== undefined) {
                 // None selected, take the first the user can edit.
                 subWikiToTake = firstCanEdit;
             } else {
@@ -989,7 +989,7 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
             }
 
             const subwiki = subwikiList[subWikiToTake];
-            if (typeof subwiki != 'undefined') {
+            if (subwiki !== undefined) {
                 this.setSelectedWiki(subwiki.id, subwiki.userid, subwiki.groupid);
             }
         }
@@ -1022,7 +1022,7 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
             // As we loop over each subwiki, add it to the current group
             subwikiList.forEach((subwiki) => {
                 // Add the subwiki to the currently active grouping.
-                if (typeof subwiki.canedit == 'undefined') {
+                if (subwiki.canedit === undefined) {
                     noGrouping.subwikis.push(subwiki);
                 } else if (subwiki.canedit) {
                     myGroupsGrouping.subwikis.push(subwiki);
diff --git a/src/addons/mod/wiki/services/handlers/edit-link.ts b/src/addons/mod/wiki/services/handlers/edit-link.ts
index 6a164a954..ea0fd3a82 100644
--- a/src/addons/mod/wiki/services/handlers/edit-link.ts
+++ b/src/addons/mod/wiki/services/handlers/edit-link.ts
@@ -54,7 +54,7 @@ export class AddonModWikiEditLinkHandlerService extends CoreContentLinksHandlerB
                     const module = await CoreCourse.getModuleBasicInfoByInstance(pageContents.wikiid, 'wiki', siteId);
 
                     let section = '';
-                    if (typeof params.section != 'undefined') {
+                    if (params.section !== undefined) {
                         section = params.section.replace(/\+/g, ' ');
                     }
 
diff --git a/src/addons/mod/wiki/services/handlers/page-or-map-link.ts b/src/addons/mod/wiki/services/handlers/page-or-map-link.ts
index 78bf94f5f..cc9043db3 100644
--- a/src/addons/mod/wiki/services/handlers/page-or-map-link.ts
+++ b/src/addons/mod/wiki/services/handlers/page-or-map-link.ts
@@ -97,7 +97,7 @@ export class AddonModWikiPageOrMapLinkHandlerService extends CoreContentLinksHan
         if (params.id && !isMap) {
             // ID param is more prioritary than pageid in index page, it's a index URL.
             return false;
-        } else if (isMap && typeof params.option != 'undefined' && params.option != '5') {
+        } else if (isMap && params.option !== undefined && params.option != '5') {
             // Map link but the option isn't "Page list", not supported.
             return false;
         }
diff --git a/src/addons/mod/wiki/services/wiki.ts b/src/addons/mod/wiki/services/wiki.ts
index 580e9f20d..c237c7856 100644
--- a/src/addons/mod/wiki/services/wiki.ts
+++ b/src/addons/mod/wiki/services/wiki.ts
@@ -58,7 +58,7 @@ export class AddonModWikiProvider {
      * @param wikiId wiki Id, if not provided all will be cleared.
      */
     clearSubwikiList(wikiId?: number): void {
-        if (typeof wikiId == 'undefined') {
+        if (wikiId === undefined) {
             this.subwikiListsCache = {};
         } else {
             delete this.subwikiListsCache[wikiId];
diff --git a/src/addons/mod/workshop/components/index/index.ts b/src/addons/mod/workshop/components/index/index.ts
index 91c8bba44..f3cd51e4d 100644
--- a/src/addons/mod/workshop/components/index/index.ts
+++ b/src/addons/mod/workshop/components/index/index.ts
@@ -322,7 +322,7 @@ export class AddonModWorkshopIndexComponent extends CoreCourseModuleMainActivity
 
             const offlineData = await AddonModWorkshopHelper.applyOfflineData(submission, this.offlineSubmissions);
 
-            if (typeof offlineData != 'undefined') {
+            if (offlineData !== undefined) {
                 this.grades!.push(offlineData);
             }
         }));
diff --git a/src/addons/mod/workshop/services/handlers/prefetch.ts b/src/addons/mod/workshop/services/handlers/prefetch.ts
index ad986d253..7700b19cf 100644
--- a/src/addons/mod/workshop/services/handlers/prefetch.ts
+++ b/src/addons/mod/workshop/services/handlers/prefetch.ts
@@ -160,7 +160,7 @@ export class AddonModWorkshopPrefetchHandlerService extends CoreCourseActivityPr
             return {
                 workshop,
                 groups,
-                files: files.filter((file) => typeof file !== 'undefined'),
+                files: files.filter((file) => file !== undefined),
             };
         } catch (error) {
             if (options.omitFail) {
@@ -168,7 +168,7 @@ export class AddonModWorkshopPrefetchHandlerService extends CoreCourseActivityPr
                 return {
                     workshop,
                     groups,
-                    files: files.filter((file) => typeof file !== 'undefined'),
+                    files: files.filter((file) => file !== undefined),
                 };
             }
 
diff --git a/src/addons/mod/workshop/services/workshop-helper.ts b/src/addons/mod/workshop/services/workshop-helper.ts
index 7f355f5ac..94eb54851 100644
--- a/src/addons/mod/workshop/services/workshop-helper.ts
+++ b/src/addons/mod/workshop/services/workshop-helper.ts
@@ -460,7 +460,7 @@ export class AddonModWorkshopHelperProvider {
             return submission;
         }
 
-        if (typeof submission == 'undefined') {
+        if (submission === undefined) {
             submission = {
                 id: 0,
                 workshopid: 0,
@@ -559,7 +559,7 @@ export class AddonModWorkshopHelperProvider {
             return value;
         }
 
-        if (value == null || typeof value == 'undefined') {
+        if (value == null || value === undefined) {
             return undefined;
         }
 
@@ -602,7 +602,7 @@ export class AddonModWorkshopHelperProvider {
      * @return If grade should be shown or not.
      */
     showGrade(grade?: number|string): boolean {
-        return typeof grade !== 'undefined' && grade !== null;
+        return grade !== undefined && grade !== null;
     }
 
 }
diff --git a/src/addons/mod/workshop/services/workshop.ts b/src/addons/mod/workshop/services/workshop.ts
index 53bc85119..59ab0c196 100644
--- a/src/addons/mod/workshop/services/workshop.ts
+++ b/src/addons/mod/workshop/services/workshop.ts
@@ -263,8 +263,8 @@ export class AddonModWorkshopProvider {
         }
 
         // Set submission types for Moodle 3.5.
-        if (typeof workshop.submissiontypetext == 'undefined') {
-            if (typeof workshop.nattachments != 'undefined' && workshop.nattachments > 0) {
+        if (workshop.submissiontypetext === undefined) {
+            if (workshop.nattachments !== undefined && workshop.nattachments > 0) {
                 workshop.submissiontypetext = AddonModWorkshopSubmissionType.SUBMISSION_TYPE_AVAILABLE;
                 workshop.submissiontypefile = AddonModWorkshopSubmissionType.SUBMISSION_TYPE_AVAILABLE;
             } else {
diff --git a/src/addons/notes/pages/list/list.page.ts b/src/addons/notes/pages/list/list.page.ts
index 4480fc250..be375f2dd 100644
--- a/src/addons/notes/pages/list/list.page.ts
+++ b/src/addons/notes/pages/list/list.page.ts
@@ -195,7 +195,7 @@ export class AddonNotesListPage implements OnInit, OnDestroy {
             },
         });
 
-        if (typeof modalData != 'undefined') {
+        if (modalData !== undefined) {
 
             if (modalData.sent && modalData.type) {
                 if (modalData.type != this.type) {
diff --git a/src/addons/notes/services/handlers/course-option.ts b/src/addons/notes/services/handlers/course-option.ts
index 80ae7da99..646af845c 100644
--- a/src/addons/notes/services/handlers/course-option.ts
+++ b/src/addons/notes/services/handlers/course-option.ts
@@ -52,7 +52,7 @@ export class AddonNotesCourseOptionHandlerService implements CoreCourseOptionsHa
             return false; // Not enabled for guests.
         }
 
-        if (navOptions && typeof navOptions.notes != 'undefined') {
+        if (navOptions && navOptions.notes !== undefined) {
             return navOptions.notes;
         }
 
diff --git a/src/addons/notes/services/notes-sync.ts b/src/addons/notes/services/notes-sync.ts
index 218b18418..ba85ee026 100644
--- a/src/addons/notes/services/notes-sync.ts
+++ b/src/addons/notes/services/notes-sync.ts
@@ -75,7 +75,7 @@ export class AddonNotesSyncProvider extends CoreSyncBaseProvider<AddonNotesSyncR
                 ? this.syncNotes(courseId, siteId)
                 : this.syncNotesIfNeeded(courseId, siteId));
 
-            if (typeof result != 'undefined') {
+            if (result !== undefined) {
                 // Sync successful, send event.
                 CoreEvents.trigger(AddonNotesSyncProvider.AUTO_SYNCED, {
                     courseId,
diff --git a/src/addons/qtype/ddimageortext/component/ddimageortext.ts b/src/addons/qtype/ddimageortext/component/ddimageortext.ts
index 88d011139..993f64f04 100644
--- a/src/addons/qtype/ddimageortext/component/ddimageortext.ts
+++ b/src/addons/qtype/ddimageortext/component/ddimageortext.ts
@@ -59,7 +59,7 @@ export class AddonQtypeDdImageOrTextComponent extends CoreQuestionBaseComponent
         const ddArea = element.querySelector('.ddarea');
 
         this.ddQuestion.text = CoreDomUtils.getContentsOfElement(element, '.qtext');
-        if (!ddArea || typeof this.ddQuestion.text == 'undefined') {
+        if (!ddArea || this.ddQuestion.text === undefined) {
             this.logger.warn('Aborting because of an error parsing question.', this.ddQuestion.slot);
 
             return CoreQuestionHelper.showComponentError(this.onAbort);
@@ -71,18 +71,18 @@ export class AddonQtypeDdImageOrTextComponent extends CoreQuestionBaseComponent
 
         if (this.ddQuestion.initObjects) {
             // Moodle version = 3.5.
-            if (typeof this.ddQuestion.initObjects.drops != 'undefined') {
+            if (this.ddQuestion.initObjects.drops !== undefined) {
                 this.drops = <unknown[]> this.ddQuestion.initObjects.drops;
             }
-            if (typeof this.ddQuestion.initObjects.readonly != 'undefined') {
+            if (this.ddQuestion.initObjects.readonly !== undefined) {
                 this.ddQuestion.readOnly = !!this.ddQuestion.initObjects.readonly;
             }
         } else if (this.ddQuestion.amdArgs) {
             // Moodle version >= 3.6.
-            if (typeof this.ddQuestion.amdArgs[1] != 'undefined') {
+            if (this.ddQuestion.amdArgs[1] !== undefined) {
                 this.ddQuestion.readOnly = !!this.ddQuestion.amdArgs[1];
             }
-            if (typeof this.ddQuestion.amdArgs[2] != 'undefined') {
+            if (this.ddQuestion.amdArgs[2] !== undefined) {
                 this.drops = <unknown[]> this.ddQuestion.amdArgs[2];
             }
         }
diff --git a/src/addons/qtype/ddmarker/classes/ddmarker.ts b/src/addons/qtype/ddmarker/classes/ddmarker.ts
index a8fca0b21..1e747e0de 100644
--- a/src/addons/qtype/ddmarker/classes/ddmarker.ts
+++ b/src/addons/qtype/ddmarker/classes/ddmarker.ts
@@ -499,7 +499,7 @@ export class AddonQtypeDdMarkerQuestion {
         const dragging = !!this.doc.dragItemBeingDragged(choiceNo);
         const coords: number[][] = [];
 
-        if (fv !== '' && typeof fv != 'undefined' && fv !== null) {
+        if (fv !== '' && fv !== undefined && fv !== null) {
             // Get all the coordinates in the input and add them to the coords list.
             const coordsStrings = fv.split(';');
 
diff --git a/src/addons/qtype/ddmarker/component/ddmarker.ts b/src/addons/qtype/ddmarker/component/ddmarker.ts
index 547773271..27bd8ca14 100644
--- a/src/addons/qtype/ddmarker/component/ddmarker.ts
+++ b/src/addons/qtype/ddmarker/component/ddmarker.ts
@@ -64,7 +64,7 @@ export class AddonQtypeDdMarkerComponent extends CoreQuestionBaseComponent imple
         const ddForm = element.querySelector('.ddform');
 
         this.ddQuestion.text = CoreDomUtils.getContentsOfElement(element, '.qtext');
-        if (!ddArea || !ddForm || typeof this.ddQuestion.text == 'undefined') {
+        if (!ddArea || !ddForm || this.ddQuestion.text === undefined) {
             this.logger.warn('Aborting because of an error parsing question.', this.ddQuestion.slot);
 
             return CoreQuestionHelper.showComponentError(this.onAbort);
@@ -82,10 +82,10 @@ export class AddonQtypeDdMarkerComponent extends CoreQuestionBaseComponent imple
 
         if (this.ddQuestion.initObjects) {
             // Moodle version = 3.5.
-            if (typeof this.ddQuestion.initObjects.dropzones != 'undefined') {
+            if (this.ddQuestion.initObjects.dropzones !== undefined) {
                 this.dropZones = <unknown[]> this.ddQuestion.initObjects.dropzones;
             }
-            if (typeof this.ddQuestion.initObjects.readonly != 'undefined') {
+            if (this.ddQuestion.initObjects.readonly !== undefined) {
                 this.ddQuestion.readOnly = !!this.ddQuestion.initObjects.readonly;
             }
         } else if (this.ddQuestion.amdArgs) {
@@ -97,12 +97,12 @@ export class AddonQtypeDdMarkerComponent extends CoreQuestionBaseComponent imple
                 nextIndex++;
             }
 
-            if (typeof this.ddQuestion.amdArgs[nextIndex] != 'undefined') {
+            if (this.ddQuestion.amdArgs[nextIndex] !== undefined) {
                 this.ddQuestion.readOnly = !!this.ddQuestion.amdArgs[nextIndex];
             }
             nextIndex++;
 
-            if (typeof this.ddQuestion.amdArgs[nextIndex] != 'undefined') {
+            if (this.ddQuestion.amdArgs[nextIndex] !== undefined) {
                 this.dropZones = <unknown[]> this.ddQuestion.amdArgs[nextIndex];
             }
         }
diff --git a/src/addons/qtype/ddwtos/component/ddwtos.ts b/src/addons/qtype/ddwtos/component/ddwtos.ts
index bbafd79cc..befd2c3a3 100644
--- a/src/addons/qtype/ddwtos/component/ddwtos.ts
+++ b/src/addons/qtype/ddwtos/component/ddwtos.ts
@@ -74,7 +74,7 @@ export class AddonQtypeDdwtosComponent extends CoreQuestionBaseComponent impleme
         this.ddQuestion.answers = answerContainer.outerHTML;
 
         this.ddQuestion.text = CoreDomUtils.getContentsOfElement(element, '.qtext');
-        if (typeof this.ddQuestion.text == 'undefined') {
+        if (this.ddQuestion.text === undefined) {
             this.logger.warn('Aborting because of an error parsing question.', this.ddQuestion.slot);
 
             return CoreQuestionHelper.showComponentError(this.onAbort);
diff --git a/src/addons/qtype/essay/component/essay.ts b/src/addons/qtype/essay/component/essay.ts
index 16e1c75d2..64df2a9fc 100644
--- a/src/addons/qtype/essay/component/essay.ts
+++ b/src/addons/qtype/essay/component/essay.ts
@@ -45,7 +45,7 @@ export class AddonQtypeEssayComponent extends CoreQuestionBaseComponent implemen
      * Component being initialized.
      */
     ngOnInit(): void {
-        this.uploadFilesSupported = typeof this.question?.responsefileareas != 'undefined';
+        this.uploadFilesSupported = this.question?.responsefileareas !== undefined;
         this.initEssayComponent(this.review);
         this.essayQuestion = this.question;
 
diff --git a/src/addons/qtype/essay/services/handlers/essay.ts b/src/addons/qtype/essay/services/handlers/essay.ts
index cb6c91646..707c9737e 100644
--- a/src/addons/qtype/essay/services/handlers/essay.ts
+++ b/src/addons/qtype/essay/services/handlers/essay.ts
@@ -143,7 +143,7 @@ export class AddonQtypeEssayHandlerService implements CoreQuestionHandler {
      */
     getPreventSubmitMessage(question: CoreQuestionQuestionParsed): string | undefined {
         const element = CoreDomUtils.convertToElement(question.html);
-        const uploadFilesSupported = typeof question.responsefileareas != 'undefined';
+        const uploadFilesSupported = question.responsefileareas !== undefined;
 
         if (!uploadFilesSupported && element.querySelector('div[id*=filemanager]')) {
             // The question allows attachments. Since the app cannot attach files yet we will prevent submitting the question.
@@ -229,7 +229,7 @@ export class AddonQtypeEssayHandlerService implements CoreQuestionHandler {
     ): number {
 
         const hasTextAnswer = !!answers.answer;
-        const uploadFilesSupported = typeof question.responsefileareas != 'undefined';
+        const uploadFilesSupported = question.responsefileareas !== undefined;
         const allowedOptions = this.getAllowedOptions(question);
 
         if (hasTextAnswer && this.checkInputWordCount(question, <string> answers.answer, undefined)) {
@@ -281,7 +281,7 @@ export class AddonQtypeEssayHandlerService implements CoreQuestionHandler {
         component: string,
         componentId: string | number,
     ): number {
-        if (typeof question.responsefileareas == 'undefined') {
+        if (question.responsefileareas === undefined) {
             return -1;
         }
 
@@ -309,7 +309,7 @@ export class AddonQtypeEssayHandlerService implements CoreQuestionHandler {
         component: string,
         componentId: string | number,
     ): boolean {
-        const uploadFilesSupported = typeof question.responsefileareas != 'undefined';
+        const uploadFilesSupported = question.responsefileareas !== undefined;
         const allowedOptions = this.getAllowedOptions(question);
 
         // First check the inline text.
@@ -355,7 +355,7 @@ export class AddonQtypeEssayHandlerService implements CoreQuestionHandler {
         // Search the textarea to get its name.
         const textarea = <HTMLTextAreaElement> element.querySelector('textarea[name*=_answer]');
 
-        if (textarea && typeof answers[textarea.name] != 'undefined') {
+        if (textarea && answers[textarea.name] !== undefined) {
             await this.prepareTextAnswer(question, answers, textarea, siteId);
         }
 
diff --git a/src/addons/userprofilefield/checkbox/services/handlers/checkbox.ts b/src/addons/userprofilefield/checkbox/services/handlers/checkbox.ts
index 887770465..643738a62 100644
--- a/src/addons/userprofilefield/checkbox/services/handlers/checkbox.ts
+++ b/src/addons/userprofilefield/checkbox/services/handlers/checkbox.ts
@@ -56,7 +56,7 @@ export class AddonUserProfileFieldCheckboxHandlerService implements CoreUserProf
     ): Promise<CoreUserProfileFieldHandlerData | undefined> {
         const name = 'profile_field_' + field.shortname;
 
-        if (typeof formValues[name] != 'undefined') {
+        if (formValues[name] !== undefined) {
             return {
                 type: 'checkbox',
                 name: name,
diff --git a/src/core/classes/base-sync.ts b/src/core/classes/base-sync.ts
index 8849ec24c..417b03ff6 100644
--- a/src/core/classes/base-sync.ts
+++ b/src/core/classes/base-sync.ts
@@ -244,7 +244,7 @@ export class CoreSyncBaseProvider<T = void> {
      * @return Promise resolved when the time is set.
      */
     async setSyncTime(id: string | number, siteId?: string, time?: number): Promise<void> {
-        time = typeof time != 'undefined' ? time : Date.now();
+        time = time !== undefined ? time : Date.now();
 
         await CoreSync.insertOrUpdateSyncRecord(this.component, id, { time: time }, siteId);
     }
diff --git a/src/core/classes/cache.ts b/src/core/classes/cache.ts
index 833ecac56..325669148 100644
--- a/src/core/classes/cache.ts
+++ b/src/core/classes/cache.ts
@@ -58,7 +58,7 @@ export class CoreCache {
     getValue<T = unknown>(id: string, name: string, ignoreInvalidate = false): T | undefined {
         const entry = this.getEntry(id);
 
-        if (entry[name] && typeof entry[name].value != 'undefined') {
+        if (entry[name] && entry[name].value !== undefined) {
             const now = Date.now();
             // Invalidate after 5 minutes.
             if (ignoreInvalidate || entry[name].timemodified + 300000 >= now) {
diff --git a/src/core/classes/delegate.ts b/src/core/classes/delegate.ts
index 3e5e7aac3..588f0ce9f 100644
--- a/src/core/classes/delegate.ts
+++ b/src/core/classes/delegate.ts
@@ -199,7 +199,7 @@ export class CoreDelegate<HandlerType extends CoreDelegateHandler> {
      * @return If the handler is registered or not.
      */
     hasHandler(name: string, enabled: boolean = false): boolean {
-        return enabled ? typeof this.enabledHandlers[name] !== 'undefined' : typeof this.handlers[name] !== 'undefined';
+        return enabled ? this.enabledHandlers[name] !== undefined : this.handlers[name] !== undefined;
     }
 
     /**
@@ -226,7 +226,7 @@ export class CoreDelegate<HandlerType extends CoreDelegateHandler> {
     registerHandler(handler: HandlerType): boolean {
         const key = handler[this.handlerNameProperty] || handler.name;
 
-        if (typeof this.handlers[key] !== 'undefined') {
+        if (this.handlers[key] !== undefined) {
             this.logger.log(`Handler '${handler[this.handlerNameProperty]}' already registered`);
 
             return false;
@@ -293,7 +293,7 @@ export class CoreDelegate<HandlerType extends CoreDelegateHandler> {
      * @return Whether is enabled or disabled in site.
      */
     protected isFeatureDisabled(handler: HandlerType, site: CoreSite): boolean {
-        return typeof this.featurePrefix != 'undefined' && site.isFeatureDisabled(this.featurePrefix + handler.name);
+        return this.featurePrefix !== undefined && site.isFeatureDisabled(this.featurePrefix + handler.name);
     }
 
     /**
diff --git a/src/core/classes/errors/ajaxwserror.ts b/src/core/classes/errors/ajaxwserror.ts
index 338a0706a..b21eedd1b 100644
--- a/src/core/classes/errors/ajaxwserror.ts
+++ b/src/core/classes/errors/ajaxwserror.ts
@@ -41,7 +41,7 @@ export class CoreAjaxWSError extends CoreError {
         this.backtrace = error.backtrace;
 
         this.available = available;
-        if (typeof this.available == 'undefined') {
+        if (this.available === undefined) {
             if (this.errorcode) {
                 this.available = this.errorcode == 'invalidrecord' ? -1 : 1;
             } else {
diff --git a/src/core/classes/interceptor.ts b/src/core/classes/interceptor.ts
index 34c8e4f4d..5ddbe7d11 100644
--- a/src/core/classes/interceptor.ts
+++ b/src/core/classes/interceptor.ts
@@ -53,7 +53,7 @@ export class CoreInterceptor implements HttpInterceptor {
                     innerObj[fullSubName] = subValue;
                     query += this.serialize(innerObj) + '&';
                 }
-            } else if (addNull || (typeof value != 'undefined' && value !== null)) {
+            } else if (addNull || (value !== undefined && value !== null)) {
                 query += encodeURIComponent(name) + '=' + encodeURIComponent(value) + '&';
             }
         }
diff --git a/src/core/classes/site.ts b/src/core/classes/site.ts
index 201b23ba1..b6f17c472 100644
--- a/src/core/classes/site.ts
+++ b/src/core/classes/site.ts
@@ -355,7 +355,7 @@ export class CoreSite {
      * @return Whether the user authenticated in the site using an OAuth method.
      */
     isOAuth(): boolean {
-        return this.oauthId != null && typeof this.oauthId != 'undefined';
+        return this.oauthId != null && this.oauthId !== undefined;
     }
 
     /**
@@ -366,7 +366,7 @@ export class CoreSite {
     canAccessMyFiles(): boolean {
         const info = this.getInfo();
 
-        return !!(info && (typeof info.usercanmanageownfiles === 'undefined' || info.usercanmanageownfiles));
+        return !!(info && (info.usercanmanageownfiles === undefined || info.usercanmanageownfiles));
     }
 
     /**
@@ -390,7 +390,7 @@ export class CoreSite {
     canUseAdvancedFeature(featureName: string, whenUndefined: boolean = true): boolean {
         const info = this.getInfo();
 
-        if (typeof info?.advancedfeatures === 'undefined') {
+        if (info?.advancedfeatures === undefined) {
             return whenUndefined;
         }
 
@@ -444,13 +444,13 @@ export class CoreSite {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     read<T = unknown>(method: string, data: any, preSets?: CoreSiteWSPreSets): Promise<T> {
         preSets = preSets || {};
-        if (typeof preSets.getFromCache == 'undefined') {
+        if (preSets.getFromCache === undefined) {
             preSets.getFromCache = true;
         }
-        if (typeof preSets.saveToCache == 'undefined') {
+        if (preSets.saveToCache === undefined) {
             preSets.saveToCache = true;
         }
-        if (typeof preSets.reusePending == 'undefined') {
+        if (preSets.reusePending === undefined) {
             preSets.reusePending = true;
         }
 
@@ -468,13 +468,13 @@ export class CoreSite {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     write<T = unknown>(method: string, data: any, preSets?: CoreSiteWSPreSets): Promise<T> {
         preSets = preSets || {};
-        if (typeof preSets.getFromCache == 'undefined') {
+        if (preSets.getFromCache === undefined) {
             preSets.getFromCache = false;
         }
-        if (typeof preSets.saveToCache == 'undefined') {
+        if (preSets.saveToCache === undefined) {
             preSets.saveToCache = false;
         }
-        if (typeof preSets.emergencyCache == 'undefined') {
+        if (preSets.emergencyCache === undefined) {
             preSets.emergencyCache = false;
         }
 
@@ -655,7 +655,7 @@ export class CoreSite {
                     this.saveToCache(method, data, error, preSets);
 
                     throw new CoreWSError(error);
-                } else if (typeof preSets.emergencyCache !== 'undefined' && !preSets.emergencyCache) {
+                } else if (preSets.emergencyCache !== undefined && !preSets.emergencyCache) {
                     this.logger.debug(`WS call '${method}' failed. Emergency cache is forbidden, rejecting.`);
 
                     throw new CoreWSError(error);
@@ -681,7 +681,7 @@ export class CoreSite {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         }).then((response: any) => {
             // Check if the response is an error, this happens if the error was stored in the cache.
-            if (response && (typeof response.exception != 'undefined' || typeof response.errorcode != 'undefined')) {
+            if (response && (response.exception !== undefined || response.errorcode !== undefined)) {
                 throw new CoreWSError(response);
             }
 
@@ -857,7 +857,7 @@ export class CoreSite {
                 } else {
                     let responseData = response.data ? CoreTextUtils.parseJSON(response.data) : {};
                     // Match the behaviour of CoreWSProvider.call when no response is expected.
-                    const responseExpected = typeof wsPresets.responseExpected == 'undefined' || wsPresets.responseExpected;
+                    const responseExpected = wsPresets.responseExpected === undefined || wsPresets.responseExpected;
                     if (!responseExpected && (responseData == null || responseData === '')) {
                         responseData = {};
                     }
@@ -938,7 +938,7 @@ export class CoreSite {
             entry = await db.getRecord(CoreSite.WS_CACHE_TABLE, { id });
         }
 
-        if (typeof entry == 'undefined') {
+        if (entry === undefined) {
             throw new CoreError('Cache entry not valid.');
         }
 
@@ -957,7 +957,7 @@ export class CoreSite {
             }
         }
 
-        if (typeof entry.data != 'undefined') {
+        if (entry.data !== undefined) {
             if (!expirationTime) {
                 this.logger.info(`Cached element found, id: ${id}. Expiration time ignored.`);
             } else {
@@ -1206,7 +1206,7 @@ export class CoreSite {
      * @return Fixed URL.
      */
     fixPluginfileURL(url: string): string {
-        const accessKey = this.tokenPluginFileWorks || typeof this.tokenPluginFileWorks == 'undefined' ?
+        const accessKey = this.tokenPluginFileWorks || this.tokenPluginFileWorks === undefined ?
             this.infos && this.infos.userprivateaccesskey : undefined;
 
         return CoreUrlUtils.fixPluginfileURL(url, this.token || '', this.siteUrl, accessKey);
@@ -1829,7 +1829,7 @@ export class CoreSite {
 
             return <T> entry.value;
         } catch (error) {
-            if (typeof defaultValue != 'undefined') {
+            if (defaultValue !== undefined) {
                 return defaultValue;
             }
 
@@ -1876,7 +1876,7 @@ export class CoreSite {
         if (!CoreUrlUtils.canUseTokenPluginFile(url, this.siteUrl, this.infos && this.infos.userprivateaccesskey)) {
             // Cannot use tokenpluginfile.
             return Promise.resolve(false);
-        } else if (typeof this.tokenPluginFileWorks != 'undefined') {
+        } else if (this.tokenPluginFileWorks !== undefined) {
             // Already checked.
             return Promise.resolve(this.tokenPluginFileWorks);
         } else if (this.tokenPluginFileWorksPromise) {
diff --git a/src/core/classes/sqlitedb.ts b/src/core/classes/sqlitedb.ts
index 9455e4c6a..c84c52ccd 100644
--- a/src/core/classes/sqlitedb.ts
+++ b/src/core/classes/sqlitedb.ts
@@ -221,7 +221,7 @@ export class SQLiteDB {
                 columnSql += ` CHECK (${column.check})`;
             }
 
-            if (typeof column.default != 'undefined') {
+            if (column.default !== undefined) {
                 columnSql += ` DEFAULT ${column.default}`;
             }
 
@@ -388,7 +388,7 @@ export class SQLiteDB {
      * @return Promise resolved with the number of affected rows.
      */
     async deleteRecords(table: string, conditions?: SQLiteDBRecordValues): Promise<number> {
-        if (conditions === null || typeof conditions == 'undefined') {
+        if (conditions === null || conditions === undefined) {
             // No conditions, delete the whole table.
             const result = await this.execute(`DELETE FROM ${table}`);
 
@@ -485,7 +485,7 @@ export class SQLiteDB {
 
         // Remove undefined entries and convert null to "NULL".
         for (const name in data) {
-            if (typeof data[name] == 'undefined') {
+            if (data[name] === undefined) {
                 delete data[name];
             }
         }
@@ -581,13 +581,13 @@ export class SQLiteDB {
         let params: SQLiteDBRecordValue[];
 
         // Default behavior, return empty data on empty array.
-        if (Array.isArray(items) && !items.length && typeof onEmptyItems == 'undefined') {
+        if (Array.isArray(items) && !items.length && onEmptyItems === undefined) {
             return { sql: '', params: [] };
         }
 
         // Handle onEmptyItems on empty array of items.
         if (Array.isArray(items) && !items.length) {
-            if (onEmptyItems === null || typeof onEmptyItems === 'undefined') { // Special case, NULL value.
+            if (onEmptyItems === null || onEmptyItems === undefined) { // Special case, NULL value.
                 sql = equal ? ' IS NULL' : ' IS NOT NULL';
 
                 return { sql, params: [] };
@@ -1091,7 +1091,7 @@ export class SQLiteDB {
         for (const key in conditions) {
             const value = conditions[key];
 
-            if (typeof value == 'undefined' || value === null) {
+            if (value === undefined || value === null) {
                 where.push(key + ' IS NULL');
             } else {
                 where.push(key + ' = ?');
@@ -1124,7 +1124,7 @@ export class SQLiteDB {
         let sql = '';
 
         values.forEach((value) => {
-            if (typeof value == 'undefined' || value === null) {
+            if (value === undefined || value === null) {
                 sql = field + ' IS NULL';
             } else {
                 params.push(value);
diff --git a/src/core/classes/tabs.ts b/src/core/classes/tabs.ts
index b03b8f827..76527de07 100644
--- a/src/core/classes/tabs.ts
+++ b/src/core/classes/tabs.ts
@@ -427,7 +427,7 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
             this.slides!.slideTo(this.maxSlides);
         } else {
             const currentIndex = await this.slides!.getActiveIndex();
-            if (typeof currentIndex !== 'undefined') {
+            if (currentIndex !== undefined) {
                 const nextSlideIndex = currentIndex + this.maxSlides;
                 this.isInTransition = true;
                 if (nextSlideIndex < this.numTabsShown) {
@@ -456,7 +456,7 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
             // Slide to the previous of the latest page.
         } else {
             const currentIndex = await this.slides!.getActiveIndex();
-            if (typeof currentIndex !== 'undefined') {
+            if (currentIndex !== undefined) {
                 const prevSlideIndex = currentIndex - this.maxSlides;
                 this.isInTransition = true;
                 if (prevSlideIndex >= 0) {
diff --git a/src/core/components/chart/chart.ts b/src/core/components/chart/chart.ts
index dbff890ca..cd792d859 100644
--- a/src/core/components/chart/chart.ts
+++ b/src/core/components/chart/chart.ts
@@ -64,7 +64,7 @@ export class CoreChartComponent implements OnDestroy, OnInit, OnChanges {
      */
     async ngOnInit(): Promise<void> {
         let legend: ChartLegendOptions = {};
-        if (typeof this.legend == 'undefined') {
+        if (this.legend === undefined) {
             legend = {
                 display: false,
                 labels: {
diff --git a/src/core/components/chrono/chrono.ts b/src/core/components/chrono/chrono.ts
index 179ad69f8..b111a9b0e 100644
--- a/src/core/components/chrono/chrono.ts
+++ b/src/core/components/chrono/chrono.ts
@@ -102,7 +102,7 @@ export class CoreChronoComponent implements OnInit, OnChanges, OnDestroy {
             this.time += Date.now() - lastExecTime;
             lastExecTime = Date.now();
 
-            if (typeof this.endTime != 'undefined' && this.time > this.endTime) {
+            if (this.endTime !== undefined && this.time > this.endTime) {
                 // End time reached, stop the timer and call the end function.
                 this.stop();
                 this.onEnd.emit();
diff --git a/src/core/components/progress-bar/progress-bar.ts b/src/core/components/progress-bar/progress-bar.ts
index ec65e69bc..ae6f86fcc 100644
--- a/src/core/components/progress-bar/progress-bar.ts
+++ b/src/core/components/progress-bar/progress-bar.ts
@@ -44,7 +44,7 @@ export class CoreProgressBarComponent implements OnChanges {
      * Detect changes on input properties.
      */
     ngOnChanges(changes: { [name: string]: SimpleChange }): void {
-        if (changes.text && typeof changes.text.currentValue != 'undefined') {
+        if (changes.text && changes.text.currentValue !== undefined) {
             // User provided a custom text, don't use default.
             this.textSupplied = true;
         }
diff --git a/src/core/components/tabs-outlet/tabs-outlet.ts b/src/core/components/tabs-outlet/tabs-outlet.ts
index 1783496b4..54da61022 100644
--- a/src/core/components/tabs-outlet/tabs-outlet.ts
+++ b/src/core/components/tabs-outlet/tabs-outlet.ts
@@ -80,7 +80,7 @@ export class CoreTabsOutletComponent extends CoreTabsBaseComponent<CoreTabsOutle
      */
     protected initTab(tab: CoreTabsOutletTab): void {
         tab.id = tab.id || 'core-tab-outlet-' + CoreUtils.getUniqueId('CoreTabsOutletComponent');
-        if (typeof tab.enabled == 'undefined') {
+        if (tab.enabled === undefined) {
             tab.enabled = true;
         }
     }
diff --git a/src/core/directives/format-text.ts b/src/core/directives/format-text.ts
index fdb95c34a..b87e1fbe0 100644
--- a/src/core/directives/format-text.ts
+++ b/src/core/directives/format-text.ts
@@ -460,8 +460,8 @@ export class CoreFormatTextDirective implements OnChanges {
             this.contextInstanceId = site.getSiteHomeId();
         }
 
-        const filter = typeof this.filter == 'undefined' ?
-            !!(this.contextLevel && typeof this.contextInstanceId != 'undefined') : CoreUtils.isTrueOrOne(this.filter);
+        const filter = this.filter === undefined ?
+            !!(this.contextLevel && this.contextInstanceId !== undefined) : CoreUtils.isTrueOrOne(this.filter);
 
         const options: CoreFilterFormatTextOptions = {
             clean: CoreUtils.isTrueOrOne(this.clean),
diff --git a/src/core/directives/link.ts b/src/core/directives/link.ts
index 9687868e2..809934e2b 100644
--- a/src/core/directives/link.ts
+++ b/src/core/directives/link.ts
@@ -58,7 +58,7 @@ export class CoreLinkDirective implements OnInit {
      * Function executed when the component is initialized.
      */
     ngOnInit(): void {
-        this.inApp = typeof this.inApp == 'undefined' ? this.inApp : CoreUtils.isTrueOrOne(this.inApp);
+        this.inApp = this.inApp === undefined ? this.inApp : CoreUtils.isTrueOrOne(this.inApp);
 
         if (this.element.tagName != 'BUTTON' && this.element.tagName != 'A') {
             this.element.setAttribute('tabindex', '0');
@@ -233,7 +233,7 @@ export class CoreLinkDirective implements OnInit {
         } else {
             // Priority order is: core-link inApp attribute > forceOpenLinksIn setting > data-open-in HTML attribute.
             let openInApp = this.inApp;
-            if (typeof this.inApp == 'undefined') {
+            if (this.inApp === undefined) {
                 if (CoreConstants.CONFIG.forceOpenLinksIn == 'browser') {
                     openInApp = false;
                 } else if (CoreConstants.CONFIG.forceOpenLinksIn == 'app' || openIn == 'app') {
diff --git a/src/core/directives/supress-events.ts b/src/core/directives/supress-events.ts
index 0ec7aab2e..559558129 100644
--- a/src/core/directives/supress-events.ts
+++ b/src/core/directives/supress-events.ts
@@ -63,7 +63,7 @@ export class CoreSupressEventsDirective implements OnInit {
 
         let events: string[];
 
-        if (this.suppressEvents == 'all' || typeof this.suppressEvents == 'undefined' || this.suppressEvents === null) {
+        if (this.suppressEvents == 'all' || this.suppressEvents === undefined || this.suppressEvents === null) {
             // Suppress all events.
             events = ['click', 'mousedown', 'touchdown', 'touchmove', 'touchstart'];
 
diff --git a/src/core/features/comments/components/comments/comments.ts b/src/core/features/comments/components/comments/comments.ts
index 8e8683cac..04c45f389 100644
--- a/src/core/features/comments/components/comments/comments.ts
+++ b/src/core/features/comments/components/comments/comments.ts
@@ -211,7 +211,7 @@ export class CoreCommentsCommentsComponent implements OnInit, OnChanges, OnDestr
      * @return Whether it's undefined or equal.
      */
     protected undefinedOrEqual(data: Record<string, unknown>, name: string): boolean {
-        return typeof data[name] == 'undefined' || data[name] == this[name];
+        return data[name] === undefined || data[name] == this[name];
     }
 
 }
diff --git a/src/core/features/comments/pages/viewer/viewer.page.ts b/src/core/features/comments/pages/viewer/viewer.page.ts
index befbfd691..fba333730 100644
--- a/src/core/features/comments/pages/viewer/viewer.page.ts
+++ b/src/core/features/comments/pages/viewer/viewer.page.ts
@@ -163,7 +163,7 @@ export class CoreCommentsViewerPage implements OnInit, OnDestroy {
             this.canAddComments = this.addDeleteCommentsAvailable && !!commentsResponse.canpost;
 
             let comments = commentsResponse.comments.sort((a, b) => a.timecreated - b.timecreated);
-            if (typeof commentsResponse.count != 'undefined') {
+            if (commentsResponse.count !== undefined) {
                 this.canLoadMore = (this.comments.length + comments.length) < commentsResponse.count;
             } else {
                 // Old style.
diff --git a/src/core/features/comments/services/comments-sync.ts b/src/core/features/comments/services/comments-sync.ts
index f402366f8..277c7e651 100644
--- a/src/core/features/comments/services/comments-sync.ts
+++ b/src/core/features/comments/services/comments-sync.ts
@@ -92,7 +92,7 @@ export class CoreCommentsSyncProvider extends CoreSyncBaseProvider<CoreCommentsS
                     siteId,
                 ));
 
-            if (typeof result != 'undefined') {
+            if (result !== undefined) {
                 // Sync successful, send event.
                 CoreEvents.trigger(CoreCommentsSyncProvider.AUTO_SYNCED, {
                     contextLevel: comment.contextlevel,
diff --git a/src/core/features/comments/services/comments.ts b/src/core/features/comments/services/comments.ts
index 094fab2ff..19bbff713 100644
--- a/src/core/features/comments/services/comments.ts
+++ b/src/core/features/comments/services/comments.ts
@@ -395,7 +395,7 @@ export class CoreCommentsProvider {
 
         if (response.comments) {
             // Update pageSize with the greatest count at the moment.
-            if (typeof response.count == 'undefined' && response.comments.length > CoreCommentsProvider.pageSize) {
+            if (response.count === undefined && response.comments.length > CoreCommentsProvider.pageSize) {
                 CoreCommentsProvider.pageSize = response.comments.length;
             }
 
@@ -434,7 +434,7 @@ export class CoreCommentsProvider {
                 const response = await this.getComments(contextLevel, instanceId, component, itemId, area, page, siteId);
                 // Count is only available in 3.8 onwards.
 
-                if (typeof response.count != 'undefined') {
+                if (response.count !== undefined) {
                     trueCount = true;
 
                     return response.count;
diff --git a/src/core/features/contentlinks/classes/module-index-handler.ts b/src/core/features/contentlinks/classes/module-index-handler.ts
index 3cd4da191..5efc4c83a 100644
--- a/src/core/features/contentlinks/classes/module-index-handler.ts
+++ b/src/core/features/contentlinks/classes/module-index-handler.ts
@@ -83,7 +83,7 @@ export class CoreContentLinksModuleIndexHandler extends CoreContentLinksHandlerB
         courseId = Number(courseId || params.courseid || params.cid);
         const pageParams = this.getPageParams(url, params, courseId);
 
-        if (this.instanceIdParam && typeof params[this.instanceIdParam] != 'undefined') {
+        if (this.instanceIdParam && params[this.instanceIdParam] !== undefined) {
             const instanceId = parseInt(params[this.instanceIdParam], 10);
 
             return [{
diff --git a/src/core/features/contentlinks/services/contentlinks-delegate.ts b/src/core/features/contentlinks/services/contentlinks-delegate.ts
index 8c40a4724..eeaab8bbc 100644
--- a/src/core/features/contentlinks/services/contentlinks-delegate.ts
+++ b/src/core/features/contentlinks/services/contentlinks-delegate.ts
@@ -278,7 +278,7 @@ export class CoreContentLinksDelegateService {
      * @return True if registered successfully, false otherwise.
      */
     registerHandler(handler: CoreContentLinksHandler): boolean {
-        if (typeof this.handlers[handler.name] !== 'undefined') {
+        if (this.handlers[handler.name] !== undefined) {
             this.logger.log(`Addon '${handler.name}' already registered`);
 
             return false;
diff --git a/src/core/features/course/classes/module-prefetch-handler.ts b/src/core/features/course/classes/module-prefetch-handler.ts
index e68b13c68..ab9bf9fda 100644
--- a/src/core/features/course/classes/module-prefetch-handler.ts
+++ b/src/core/features/course/classes/module-prefetch-handler.ts
@@ -181,7 +181,7 @@ export class CoreCourseModulePrefetchHandlerBase implements CoreCourseModulePref
      */
     getIntroFilesFromInstance(module: CoreCourseAnyModuleData, instance?: ModuleInstance): CoreWSFile[] {
         if (instance) {
-            if (typeof instance.introfiles != 'undefined') {
+            if (instance.introfiles !== undefined) {
                 return instance.introfiles;
             } else if (instance.intro) {
                 return CoreFilepool.extractDownloadableFilesFromHtmlAsFakeFileObjects(instance.intro);
diff --git a/src/core/features/course/components/format/format.ts b/src/core/features/course/components/format/format.ts
index f351df992..32932b687 100644
--- a/src/core/features/course/components/format/format.ts
+++ b/src/core/features/course/components/format/format.ts
@@ -165,9 +165,9 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
 
             let section: CoreCourseSection | undefined;
 
-            if (typeof data.sectionId != 'undefined' && this.sections) {
+            if (data.sectionId !== undefined && this.sections) {
                 section = this.sections.find((section) => section.id == data.sectionId);
-            } else if (typeof data.sectionNumber != 'undefined' && this.sections) {
+            } else if (data.sectionNumber !== undefined && this.sections) {
                 section = this.sections.find((section) => section.section == data.sectionNumber);
             }
 
@@ -399,7 +399,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
             }
         }
 
-        if (this.moduleId && typeof previousValue == 'undefined') {
+        if (this.moduleId && previousValue === undefined) {
             setTimeout(() => {
                 CoreDomUtils.scrollToElementBySelector(
                     this.elementRef.nativeElement,
diff --git a/src/core/features/course/format/weeks/services/handlers/weeks-format.ts b/src/core/features/course/format/weeks/services/handlers/weeks-format.ts
index 4e7682eee..10de07200 100644
--- a/src/core/features/course/format/weeks/services/handlers/weeks-format.ts
+++ b/src/core/features/course/format/weeks/services/handlers/weeks-format.ts
@@ -57,7 +57,7 @@ export class CoreCourseFormatWeeksHandlerService implements CoreCourseFormatHand
 
         for (let i = 0; i < sections.length; i++) {
             const section = sections[i];
-            if (typeof section.section == 'undefined' || section.section < 1) {
+            if (section.section === undefined || section.section < 1) {
                 continue;
             }
 
diff --git a/src/core/features/course/pages/contents/contents.ts b/src/core/features/course/pages/contents/contents.ts
index 1cad013f4..69bbfe521 100644
--- a/src/core/features/course/pages/contents/contents.ts
+++ b/src/core/features/course/pages/contents/contents.ts
@@ -296,7 +296,7 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
         if (this.course.enablecompletion !== false) {
             const sectionWithModules = sections.find((section) => section.modules.length > 0);
 
-            if (sectionWithModules && typeof sectionWithModules.modules[0].completion != 'undefined') {
+            if (sectionWithModules && sectionWithModules.modules[0].completion !== undefined) {
                 // The module already has completion (3.6 onwards). Load the offline completion.
                 this.modulesHaveCompletion = true;
 
@@ -396,7 +396,7 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
      * @return Promise resolved when done.
      */
     async onCompletionChange(completionData: CoreCourseModuleCompletionData): Promise<void> {
-        const shouldReload = typeof completionData.valueused == 'undefined' || completionData.valueused;
+        const shouldReload = completionData.valueused === undefined || completionData.valueused;
 
         if (!shouldReload) {
             // Invalidate the completion.
diff --git a/src/core/features/course/pages/list-mod-type/list-mod-type.page.ts b/src/core/features/course/pages/list-mod-type/list-mod-type.page.ts
index f24a70c92..735cfc346 100644
--- a/src/core/features/course/pages/list-mod-type/list-mod-type.page.ts
+++ b/src/core/features/course/pages/list-mod-type/list-mod-type.page.ts
@@ -85,7 +85,7 @@ export class CoreCourseListModTypePage implements OnInit {
 
                     if (this.modName === 'resources') {
                         // Check that the module is a resource.
-                        if (typeof this.archetypes[mod.modname] == 'undefined') {
+                        if (this.archetypes[mod.modname] === undefined) {
                             this.archetypes[mod.modname] = CoreCourseModuleDelegate.supportsFeature<number>(
                                 mod.modname,
                                 CoreConstants.FEATURE_MOD_ARCHETYPE,
diff --git a/src/core/features/course/pages/preview/preview.page.ts b/src/core/features/course/pages/preview/preview.page.ts
index b7a6aa5e2..65fd8e105 100644
--- a/src/core/features/course/pages/preview/preview.page.ts
+++ b/src/core/features/course/pages/preview/preview.page.ts
@@ -356,7 +356,7 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
                     },
                 );
 
-                if (typeof modalData != 'undefined') {
+                if (modalData !== undefined) {
                     this.selfEnrolInCourse(modalData, instanceId);
 
                     return;
diff --git a/src/core/features/course/services/course-helper.ts b/src/core/features/course/services/course-helper.ts
index 8d246dcd2..e254f5b2f 100644
--- a/src/core/features/course/services/course-helper.ts
+++ b/src/core/features/course/services/course-helper.ts
@@ -1253,7 +1253,7 @@ export class CoreCourseHelperProvider {
                 const module = section.modules[j];
                 const offlineCompletion = offlineCompletionsMap[module.id];
 
-                if (offlineCompletion && typeof module.completiondata != 'undefined' &&
+                if (offlineCompletion && module.completiondata !== undefined &&
                     offlineCompletion.timecompleted >= module.completiondata.timecompleted * 1000) {
                     // The module has offline completion. Load it.
                     module.completiondata.state = offlineCompletion.completed;
@@ -1771,7 +1771,7 @@ export class CoreCourseHelperProvider {
             promises.push(CoreCourses.getCoursesByField('id', course.id));
 
             const sectionWithModules = sections.find((section) => section.modules && section.modules.length > 0);
-            if (!sectionWithModules || typeof sectionWithModules.modules[0].completion == 'undefined') {
+            if (!sectionWithModules || sectionWithModules.modules[0].completion === undefined) {
                 promises.push(CoreCourse.getActivitiesCompletionStatus(course.id));
             }
 
@@ -1988,7 +1988,7 @@ export class CoreCourseHelperProvider {
             return false;
         }
 
-        return (typeof section.availabilityinfo != 'undefined' && section.availabilityinfo != '') ||
+        return (section.availabilityinfo !== undefined && section.availabilityinfo != '') ||
             section.summary != '' || (section.modules && section.modules.length > 0);
     }
 
diff --git a/src/core/features/course/services/course-options-delegate.ts b/src/core/features/course/services/course-options-delegate.ts
index 87765a546..038b5d51a 100644
--- a/src/core/features/course/services/course-options-delegate.ts
+++ b/src/core/features/course/services/course-options-delegate.ts
@@ -585,7 +585,7 @@ export class CoreCourseOptionsDelegateService extends CoreDelegate<CoreCourseOpt
      * @return Promise resolved when done.
      */
     protected async loadCourseOptions(course: CoreCourseAnyCourseDataWithOptions, refresh = false): Promise<void> {
-        if (typeof course.navOptions == 'undefined' || typeof course.admOptions == 'undefined' || refresh) {
+        if (course.navOptions === undefined || course.admOptions === undefined || refresh) {
 
             const options = await CoreCourses.getCoursesAdminAndNavOptions([course.id]);
             course.navOptions = options.navOptions[course.id];
diff --git a/src/core/features/course/services/course.ts b/src/core/features/course/services/course.ts
index 3d440e2a8..c8da4ec5f 100644
--- a/src/core/features/course/services/course.ts
+++ b/src/core/features/course/services/course.ts
@@ -293,7 +293,7 @@ export class CoreCourseProvider {
 
             offlineCompletions.forEach((offlineCompletion) => {
 
-                if (offlineCompletion && typeof completionStatus[offlineCompletion.cmid] != 'undefined') {
+                if (offlineCompletion && completionStatus[offlineCompletion.cmid] !== undefined) {
                     const onlineCompletion = completionStatus[offlineCompletion.cmid];
 
                     // If the activity uses manual completion, override the value with the offline one.
@@ -992,7 +992,7 @@ export class CoreCourseProvider {
         };
         const wsName = 'core_course_view_course';
 
-        if (typeof sectionNumber != 'undefined') {
+        if (sectionNumber !== undefined) {
             params.sectionnumber = sectionNumber;
         }
 
@@ -1135,7 +1135,7 @@ export class CoreCourseProvider {
         // Wait for site plugins to be fetched.
         await CoreUtils.ignoreErrors(CoreSitePlugins.waitFetchPlugins());
 
-        if (!('format' in course) || typeof course.format == 'undefined') {
+        if (!('format' in course) || course.format === undefined) {
             const result = await CoreCourseHelper.getCourse(course.id);
 
             course = result.course;
@@ -1255,7 +1255,7 @@ export class CoreCourseProvider {
 
         try {
             const entry = await this.getCourseStatusData(courseId, siteId);
-            if (typeof downloadTime == 'undefined') {
+            if (downloadTime === undefined) {
                 // Keep previous download time.
                 downloadTime = entry.downloadTime;
                 previousDownloadTime = entry.previousDownloadTime;
diff --git a/src/core/features/course/services/module-prefetch-delegate.ts b/src/core/features/course/services/module-prefetch-delegate.ts
index f835799eb..e1166739b 100644
--- a/src/core/features/course/services/module-prefetch-delegate.ts
+++ b/src/core/features/course/services/module-prefetch-delegate.ts
@@ -392,7 +392,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
 
         const packageId = CoreFilepool.getPackageId(handler.component, module.id);
         const downloadSize = this.statusCache.getValue<CoreFileSizeSum>(packageId, 'downloadSize');
-        if (typeof downloadSize != 'undefined') {
+        if (downloadSize !== undefined) {
             return downloadSize;
         }
 
@@ -430,7 +430,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
 
         const packageId = CoreFilepool.getPackageId(handler.component, module.id);
         const downloadedSize = this.statusCache.getValue<number>(packageId, 'downloadedSize');
-        if (typeof downloadedSize != 'undefined') {
+        if (downloadedSize !== undefined) {
             return downloadedSize;
         }
 
@@ -558,7 +558,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
         const packageId = CoreFilepool.getPackageId(handler.component, module.id);
         const status = this.statusCache.getValue<string>(packageId, 'status');
 
-        if (!refresh && typeof status != 'undefined') {
+        if (!refresh && status !== undefined) {
             this.storeCourseAndSection(packageId, courseId, sectionId);
 
             return this.determineModuleStatus(module, status);
@@ -612,7 +612,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
         }
 
         // Module is downloaded. Determine if there are updated in the module to show them outdated.
-        if (typeof updates == 'undefined') {
+        if (updates === undefined) {
             try {
                 // We don't have course updates, calculate them.
                 updates = await this.getCourseUpdatesByCourseId(courseId);
@@ -729,7 +729,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
             } catch (error) {
                 const packageId = CoreFilepool.getPackageId(handler.component, module.id);
                 const cacheStatus = this.statusCache.getValue<string>(packageId, 'status', true);
-                if (typeof cacheStatus == 'undefined') {
+                if (cacheStatus === undefined) {
                     throw error;
                 }
 
@@ -769,7 +769,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
         const packageId = CoreFilepool.getPackageId(handler.component, module.id);
         const status = this.statusCache.getValue<string>(packageId, 'status');
 
-        if (typeof status != 'undefined' && !CoreFileHelper.isStateDownloaded(status)) {
+        if (status !== undefined && !CoreFileHelper.isStateDownloaded(status)) {
             // Module isn't downloaded, just return the status.
             return { status };
         }
@@ -976,7 +976,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
         const packageId = CoreFilepool.getPackageId(handler.component, module.id);
         let downloadable = this.statusCache.getValue<boolean>(packageId, 'downloadable');
 
-        if (typeof downloadable != 'undefined') {
+        if (downloadable !== undefined) {
             return downloadable;
         }
 
diff --git a/src/core/features/courses/components/course-progress/course-progress.ts b/src/core/features/courses/components/course-progress/course-progress.ts
index 7b1e37c7b..9d295b906 100644
--- a/src/core/features/courses/components/course-progress/course-progress.ts
+++ b/src/core/features/courses/components/course-progress/course-progress.ts
@@ -82,7 +82,7 @@ export class CoreCoursesCourseProgressComponent implements OnInit, OnDestroy, On
 
         // This field is only available from 3.6 onwards.
         this.courseOptionMenuEnabled = this.showAll && 'isfavourite' in this.course &&
-            typeof this.course.isfavourite != 'undefined';
+            this.course.isfavourite !== undefined;
 
         // Refresh the enabled flag if site is updated.
         this.siteUpdatedObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, () => {
diff --git a/src/core/features/courses/services/courses-helper.ts b/src/core/features/courses/services/courses-helper.ts
index 62f98ed70..aa794077b 100644
--- a/src/core/features/courses/services/courses-helper.ts
+++ b/src/core/features/courses/services/courses-helper.ts
@@ -270,12 +270,12 @@ export class CoreCoursesHelperProvider {
         courses = slice > 0 ? courses.slice(0, slice) : courses;
 
         return Promise.all(courses.map(async (course) => {
-            if (typeof course.completed != 'undefined') {
+            if (course.completed !== undefined) {
                 // The WebService already returns the completed status, no need to fetch it.
                 return course;
             }
 
-            if (typeof course.enablecompletion != 'undefined' && !course.enablecompletion) {
+            if (course.enablecompletion !== undefined && !course.enablecompletion) {
                 // Completion is disabled for this course, there is no need to fetch the completion status.
                 return course;
             }
diff --git a/src/core/features/courses/services/courses.ts b/src/core/features/courses/services/courses.ts
index 002d3fc28..a724803f0 100644
--- a/src/core/features/courses/services/courses.ts
+++ b/src/core/features/courses/services/courses.ts
@@ -524,15 +524,15 @@ export class CoreCoursesProvider {
 
         // Courses will be sorted using sortorder if available.
         return response.courses.sort((a, b) => {
-            if (typeof a.sortorder == 'undefined' && typeof b.sortorder == 'undefined') {
+            if (a.sortorder === undefined && b.sortorder === undefined) {
                 return b.id - a.id;
             }
 
-            if (typeof a.sortorder == 'undefined') {
+            if (a.sortorder === undefined) {
                 return 1;
             }
 
-            if (typeof b.sortorder == 'undefined') {
+            if (b.sortorder === undefined) {
                 return -1;
             }
 
diff --git a/src/core/features/courses/services/handlers/course-link.ts b/src/core/features/courses/services/handlers/course-link.ts
index dfe5426a7..5e1800ddb 100644
--- a/src/core/features/courses/services/handlers/course-link.ts
+++ b/src/core/features/courses/services/handlers/course-link.ts
@@ -65,7 +65,7 @@ export class CoreCoursesCourseLinkHandlerService extends CoreContentLinksHandler
         const pageParams: Params = {
             sectionId: sectionId || null,
         };
-        let sectionNumber = typeof params.section != 'undefined' ? parseInt(params.section, 10) : NaN;
+        let sectionNumber = params.section !== undefined ? parseInt(params.section, 10) : NaN;
 
         if (!sectionId && !sectionNumber) {
             // Check if the URL has a hash to navigate to the section.
@@ -294,7 +294,7 @@ export class CoreCoursesCourseLinkHandlerService extends CoreContentLinksHandler
                 let body = ' '; // Empty message.
                 const placeholder = Translate.instant('core.courses.password');
 
-                if (typeof password != 'undefined') {
+                if (password !== undefined) {
                     // The user attempted a password. Show an error message.
                     body = CoreTextUtils.getErrorMessageFromError(error) || body;
                 }
diff --git a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
index 84c2931ef..2b82866d7 100644
--- a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
+++ b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
@@ -484,7 +484,7 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
         };
 
         let range = document.createRange();
-        if (typeof chars === 'undefined') {
+        if (chars === undefined) {
             // Select all so it will go to the end.
             range.selectNode(parent);
             range.selectNodeContents(parent);
@@ -601,7 +601,7 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
      * @param value text
      */
     protected isNullOrWhiteSpace(value: string | null): boolean {
-        if (value == null || typeof value == 'undefined') {
+        if (value == null || value === undefined) {
             return true;
         }
 
@@ -926,10 +926,10 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
      */
     protected shouldAutoSaveDrafts(): boolean {
         return !!CoreSites.getCurrentSite() &&
-                (typeof this.autoSave == 'undefined' || CoreUtils.isTrueOrOne(this.autoSave)) &&
-                typeof this.contextLevel != 'undefined' &&
-                typeof this.contextInstanceId != 'undefined' &&
-                typeof this.elementId != 'undefined';
+                (this.autoSave === undefined || CoreUtils.isTrueOrOne(this.autoSave)) &&
+                this.contextLevel !== undefined &&
+                this.contextInstanceId !== undefined &&
+                this.elementId !== undefined;
     }
 
     /**
@@ -948,7 +948,7 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
                 this.originalContent,
             );
 
-            if (typeof entry == 'undefined') {
+            if (entry === undefined) {
                 // No draft found.
                 return;
             }
diff --git a/src/core/features/emulator/services/capture-helper.ts b/src/core/features/emulator/services/capture-helper.ts
index daee4b3d7..a65ebca93 100644
--- a/src/core/features/emulator/services/capture-helper.ts
+++ b/src/core/features/emulator/services/capture-helper.ts
@@ -192,7 +192,7 @@ export class CoreEmulatorCaptureHelperProvider {
      * @return Promise resolved when loaded.
      */
     load(): Promise<void> {
-        if (typeof window.MediaRecorder != 'undefined' && this.initGetUserMedia()) {
+        if (window.MediaRecorder !== undefined && this.initGetUserMedia()) {
             this.initMimeTypes();
         }
 
diff --git a/src/core/features/emulator/services/file.ts b/src/core/features/emulator/services/file.ts
index bde3461bd..71eae6136 100644
--- a/src/core/features/emulator/services/file.ts
+++ b/src/core/features/emulator/services/file.ts
@@ -344,10 +344,10 @@ export class FileMock extends File {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const win = <any> window; // Convert to <any> to be able to use non-standard properties.
 
-            if (typeof win.requestFileSystem == 'undefined') {
+            if (win.requestFileSystem === undefined) {
                 win.requestFileSystem = win.webkitRequestFileSystem;
             }
-            if (typeof win.resolveLocalFileSystemURL == 'undefined') {
+            if (win.resolveLocalFileSystemURL === undefined) {
                 win.resolveLocalFileSystemURL = win.webkitResolveLocalFileSystemURL;
             }
             win.LocalFileSystem = {
diff --git a/src/core/features/fileuploader/services/fileuploader-helper.ts b/src/core/features/fileuploader/services/fileuploader-helper.ts
index b00769de3..33b70931d 100644
--- a/src/core/features/fileuploader/services/fileuploader-helper.ts
+++ b/src/core/features/fileuploader/services/fileuploader-helper.ts
@@ -123,8 +123,8 @@ export class CoreFileUploaderHelperProvider {
             throw new CoreError(Translate.instant('core.fileuploader.errormustbeonlinetoupload'));
         }
 
-        wifiThreshold = typeof wifiThreshold == 'undefined' ? CoreFileUploaderProvider.WIFI_SIZE_WARNING : wifiThreshold;
-        limitedThreshold = typeof limitedThreshold == 'undefined' ?
+        wifiThreshold = wifiThreshold === undefined ? CoreFileUploaderProvider.WIFI_SIZE_WARNING : wifiThreshold;
+        limitedThreshold = limitedThreshold === undefined ?
             CoreFileUploaderProvider.LIMITED_SIZE_WARNING : limitedThreshold;
 
         if (size < 0) {
@@ -203,7 +203,7 @@ export class CoreFileUploaderHelperProvider {
         const fileName = options?.fileName || CoreFile.getFileAndDirectoryFromPath(path).name;
 
         // Check that size isn't too large.
-        if (typeof maxSize != 'undefined' && maxSize != -1) {
+        if (maxSize !== undefined && maxSize != -1) {
             try {
                 const fileEntry = await CoreFile.getExternalFile(path);
 
diff --git a/src/core/features/filter/services/filter.ts b/src/core/features/filter/services/filter.ts
index 4b7dd89ca..e413084d5 100644
--- a/src/core/features/filter/services/filter.ts
+++ b/src/core/features/filter/services/filter.ts
@@ -205,11 +205,11 @@ export class CoreFilterProvider {
         // Clone object if needed so we can modify it.
         options = options ? Object.assign({}, options) : {};
 
-        if (typeof options.clean == 'undefined') {
+        if (options.clean === undefined) {
             options.clean = false;
         }
 
-        if (typeof options.filter == 'undefined') {
+        if (options.filter === undefined) {
             options.filter = true;
         }
 
diff --git a/src/core/features/grades/services/grades-helper.ts b/src/core/features/grades/services/grades-helper.ts
index 319dc9313..b602a8df5 100644
--- a/src/core/features/grades/services/grades-helper.ts
+++ b/src/core/features/grades/services/grades-helper.ts
@@ -184,13 +184,13 @@ export class CoreGradesHelperProvider {
         let normalRow = formatted.rows.find(
             row =>
                 row.itemtype != 'leader' &&
-                (typeof row.grade != 'undefined' || typeof row.percentage != 'undefined'),
+                (row.grade !== undefined || row.percentage !== undefined),
         );
 
         // Decide if grades or percentage is being shown on phones.
-        if (normalRow && typeof normalRow.grade != 'undefined') {
+        if (normalRow && normalRow.grade !== undefined) {
             columns.grade = true;
-        } else if (normalRow && typeof normalRow.percentage != 'undefined') {
+        } else if (normalRow && normalRow.percentage !== undefined) {
             columns.percentage = true;
         } else {
             normalRow = formatted.rows.find((e) => e.itemtype != 'leader');
@@ -198,7 +198,7 @@ export class CoreGradesHelperProvider {
         }
 
         for (const colName in columns) {
-            if (normalRow && typeof normalRow[colName] != 'undefined') {
+            if (normalRow && normalRow[colName] !== undefined) {
                 formatted.columns.push({
                     name: colName,
                     colspan: colName == 'gradeitem' ? maxDepth : 1,
@@ -562,7 +562,7 @@ export class CoreGradesHelperProvider {
             row.iconAlt = Translate.instant('core.grades.calculatedgrade');
         } else if (text.indexOf('/mod/') > -1) {
             const module = text.match(/mod\/([^/]*)\//);
-            if (typeof module?.[1] != 'undefined') {
+            if (module?.[1] !== undefined) {
                 row.itemtype = 'mod';
                 row.itemmodule = module[1];
                 row.iconAlt = CoreCourse.translateModuleName(row.itemmodule) || '';
@@ -613,7 +613,7 @@ export class CoreGradesHelperProvider {
         defaultValue: string | number = '',
         scale?: string,
     ): Promise<CoreGradesMenuItem[]> {
-        if (typeof gradingType == 'undefined') {
+        if (gradingType === undefined) {
             return [];
         }
 
diff --git a/src/core/features/grades/services/grades.ts b/src/core/features/grades/services/grades.ts
index 00280957d..80b588e8a 100644
--- a/src/core/features/grades/services/grades.ts
+++ b/src/core/features/grades/services/grades.ts
@@ -318,7 +318,7 @@ export class CoreGradesProvider {
 
         const course = await CoreCourses.getUserCourse(courseId, true, siteId);
 
-        return !(course && typeof course.showgrades != 'undefined' && !course.showgrades);
+        return !(course && course.showgrades !== undefined && !course.showgrades);
     }
 
     /**
diff --git a/src/core/features/grades/services/handlers/course-option.ts b/src/core/features/grades/services/handlers/course-option.ts
index d3954b748..21fb0053b 100644
--- a/src/core/features/grades/services/handlers/course-option.ts
+++ b/src/core/features/grades/services/handlers/course-option.ts
@@ -41,7 +41,7 @@ export class CoreGradesCourseOptionHandlerService implements CoreCourseOptionsHa
      * @return Promise resolved when done.
      */
     invalidateEnabledForCourse(courseId: number, navOptions?: CoreCourseUserAdminOrNavOptionIndexed): Promise<void> {
-        if (navOptions && typeof navOptions.grades != 'undefined') {
+        if (navOptions && navOptions.grades !== undefined) {
             // No need to invalidate anything.
             return Promise.resolve();
         }
@@ -75,7 +75,7 @@ export class CoreGradesCourseOptionHandlerService implements CoreCourseOptionsHa
             return false; // Not enabled for guests.
         }
 
-        if (navOptions && typeof navOptions.grades != 'undefined') {
+        if (navOptions && navOptions.grades !== undefined) {
             return navOptions.grades;
         }
 
diff --git a/src/core/features/h5p/classes/content-validator.ts b/src/core/features/h5p/classes/content-validator.ts
index fb3468d5c..e3e916ba6 100644
--- a/src/core/features/h5p/classes/content-validator.ts
+++ b/src/core/features/h5p/classes/content-validator.ts
@@ -91,7 +91,7 @@ export class CoreH5PContentValidator {
         const group = CoreUtils.clone(metadata || {});
 
         // Stop complaining about "invalid selected option in select" for old content without license chosen.
-        if (typeof group.license == 'undefined') {
+        if (group.license === undefined) {
             group.license = 'U';
         }
 
@@ -168,7 +168,7 @@ export class CoreH5PContentValidator {
         }
 
         // Check if string is within allowed length.
-        if (typeof semantics.maxLength != 'undefined') {
+        if (semantics.maxLength !== undefined) {
             text = text.substr(0, semantics.maxLength);
         }
 
@@ -202,22 +202,22 @@ export class CoreH5PContentValidator {
             num = 0;
         }
         // Check if number is within valid bounds. Move within bounds if not.
-        if (typeof semantics.min != 'undefined' && num < semantics.min) {
+        if (semantics.min !== undefined && num < semantics.min) {
             num = semantics.min;
         }
-        if (typeof semantics.max != 'undefined' && num > semantics.max) {
+        if (semantics.max !== undefined && num > semantics.max) {
             num = semantics.max;
         }
         // Check if number is within allowed bounds even if step value is set.
-        if (typeof semantics.step != 'undefined') {
-            const testNumber = num - (typeof semantics.min != 'undefined' ? semantics.min : 0);
+        if (semantics.step !== undefined) {
+            const testNumber = num - (semantics.min !== undefined ? semantics.min : 0);
             const rest = testNumber % semantics.step;
             if (rest !== 0) {
                 num -= rest;
             }
         }
         // Check if number has proper number of decimals.
-        if (typeof semantics.decimals != 'undefined') {
+        if (semantics.decimals !== undefined) {
             num = Number(num.toFixed(semantics.decimals));
         }
 
@@ -303,7 +303,7 @@ export class CoreH5PContentValidator {
         let keys = Object.keys(list);
 
         // Check that list is not longer than allowed length.
-        if (typeof semantics.max != 'undefined') {
+        if (semantics.max !== undefined) {
             keys = keys.slice(0, semantics.max);
         }
 
@@ -392,8 +392,8 @@ export class CoreH5PContentValidator {
             file.bitrate = parseInt(file.bitrate, 10);
         }
 
-        if (typeof file.quality != 'undefined') {
-            if (file.quality === null || typeof file.quality.level == 'undefined' || typeof file.quality.label == 'undefined') {
+        if (file.quality !== undefined) {
+            if (file.quality === null || file.quality.level === undefined || file.quality.label === undefined) {
                 delete file.quality;
             } else {
                 this.filterParams(file.quality, ['level', 'label']);
@@ -402,7 +402,7 @@ export class CoreH5PContentValidator {
             }
         }
 
-        if (typeof file.copyright != 'undefined') {
+        if (file.copyright !== undefined) {
             await this.validateGroup(file.copyright, this.getCopyrightSemantics());
         }
 
diff --git a/src/core/features/h5p/classes/core.ts b/src/core/features/h5p/classes/core.ts
index 6ba4aeec8..ac6dddb45 100644
--- a/src/core/features/h5p/classes/core.ts
+++ b/src/core/features/h5p/classes/core.ts
@@ -241,7 +241,7 @@ export class CoreH5PCore {
             return content.filtered;
         }
 
-        if (typeof content.library == 'undefined' || typeof content.params == 'undefined') {
+        if (content.library === undefined || content.params === undefined) {
             return null;
         }
 
diff --git a/src/core/features/h5p/classes/framework.ts b/src/core/features/h5p/classes/framework.ts
index cfb77cac5..6386d853e 100644
--- a/src/core/features/h5p/classes/framework.ts
+++ b/src/core/features/h5p/classes/framework.ts
@@ -388,7 +388,7 @@ export class CoreH5PFramework {
      * @return Library parameter values separated by ', '
      */
     libraryParameterValuesToCsv(libraryData: CoreH5PLibraryBeingSaved, key: string, searchParam: string = 'path'): string {
-        if (typeof libraryData[key] != 'undefined') {
+        if (libraryData[key] !== undefined) {
             const parameterValues: string[] = [];
 
             libraryData[key].forEach((file) => {
@@ -489,7 +489,7 @@ export class CoreH5PFramework {
             params.metadata.title = params.title;
         }
         content.metadata = params.metadata;
-        content.params = JSON.stringify(typeof params.params != 'undefined' && params.params != null ? params.params : params);
+        content.params = JSON.stringify(params.params !== undefined && params.params != null ? params.params : params);
 
         return content;
     }
@@ -690,15 +690,15 @@ export class CoreH5PFramework {
         const preloadedCSS = this.libraryParameterValuesToCsv(libraryData, 'preloadedCss', 'path');
         const dropLibraryCSS = this.libraryParameterValuesToCsv(libraryData, 'dropLibraryCss', 'machineName');
 
-        if (typeof libraryData.semantics == 'undefined') {
+        if (libraryData.semantics === undefined) {
             libraryData.semantics = [];
         }
-        if (typeof libraryData.fullscreen == 'undefined') {
+        if (libraryData.fullscreen === undefined) {
             libraryData.fullscreen = 0;
         }
 
         let embedTypes = '';
-        if (typeof libraryData.embedTypes != 'undefined') {
+        if (libraryData.embedTypes !== undefined) {
             embedTypes = libraryData.embedTypes.join(', ');
         }
 
@@ -717,9 +717,9 @@ export class CoreH5PFramework {
             preloadedjs: preloadedJS,
             preloadedcss: preloadedCSS,
             droplibrarycss: dropLibraryCSS,
-            semantics: typeof libraryData.semantics != 'undefined' ? JSON.stringify(libraryData.semantics) : null,
-            addto: typeof libraryData.addTo != 'undefined' ? JSON.stringify(libraryData.addTo) : null,
-            metadatasettings: typeof libraryData.metadataSettings != 'undefined' ?
+            semantics: libraryData.semantics !== undefined ? JSON.stringify(libraryData.semantics) : null,
+            addto: libraryData.addTo !== undefined ? JSON.stringify(libraryData.addTo) : null,
+            metadatasettings: libraryData.metadataSettings !== undefined ?
                 CoreH5PMetadata.boolifyAndEncodeSettings(libraryData.metadataSettings) : null,
         };
 
@@ -841,7 +841,7 @@ export class CoreH5PFramework {
         const db = await CoreSites.getSiteDb(siteId);
 
         // If the libraryid declared in the package is empty, get the latest version.
-        if (content.library && typeof content.library.libraryId == 'undefined') {
+        if (content.library && content.library.libraryId === undefined) {
             const mainLibrary = await this.getLatestLibraryVersion(content.library.machineName, siteId);
 
             content.library.libraryId = mainLibrary.id;
@@ -867,7 +867,7 @@ export class CoreH5PFramework {
         };
         let contentId: number | undefined;
 
-        if (typeof content.id != 'undefined') {
+        if (content.id !== undefined) {
             data.id = content.id;
             contentId = content.id;
         } else {
diff --git a/src/core/features/h5p/classes/metadata.ts b/src/core/features/h5p/classes/metadata.ts
index 359b0af26..b0639e57d 100644
--- a/src/core/features/h5p/classes/metadata.ts
+++ b/src/core/features/h5p/classes/metadata.ts
@@ -32,10 +32,10 @@ export class CoreH5PMetadata {
         }
 
         // Convert metadataSettings values to boolean.
-        if (typeof metadataSettings.disable != 'undefined') {
+        if (metadataSettings.disable !== undefined) {
             metadataSettings.disable = metadataSettings.disable === 1;
         }
-        if (typeof metadataSettings.disableExtraTitleField != 'undefined') {
+        if (metadataSettings.disableExtraTitleField !== undefined) {
             metadataSettings.disableExtraTitleField = metadataSettings.disableExtraTitleField === 1;
         }
 
diff --git a/src/core/features/h5p/classes/storage.ts b/src/core/features/h5p/classes/storage.ts
index c79bdd305..984dd022d 100644
--- a/src/core/features/h5p/classes/storage.ts
+++ b/src/core/features/h5p/classes/storage.ts
@@ -94,7 +94,7 @@ export class CoreH5PStorage {
                 throw error;
             }
 
-            if (typeof libraryData.libraryId != 'undefined') {
+            if (libraryData.libraryId !== undefined) {
                 const promises: Promise<void>[] = [];
 
                 // Remove all indexes of contents that use this library.
@@ -127,17 +127,17 @@ export class CoreH5PStorage {
             // Insert the different new ones.
             const promises: Promise<void>[] = [];
 
-            if (typeof libraryData.preloadedDependencies != 'undefined') {
+            if (libraryData.preloadedDependencies !== undefined) {
                 promises.push(this.h5pFramework.saveLibraryDependencies(
                     libraryData,
                     libraryData.preloadedDependencies,
                     'preloaded',
                 ));
             }
-            if (typeof libraryData.dynamicDependencies != 'undefined') {
+            if (libraryData.dynamicDependencies !== undefined) {
                 promises.push(this.h5pFramework.saveLibraryDependencies(libraryData, libraryData.dynamicDependencies, 'dynamic'));
             }
-            if (typeof libraryData.editorDependencies != 'undefined') {
+            if (libraryData.editorDependencies !== undefined) {
                 promises.push(this.h5pFramework.saveLibraryDependencies(libraryData, libraryData.editorDependencies, 'editor'));
             }
 
diff --git a/src/core/features/h5p/classes/validator.ts b/src/core/features/h5p/classes/validator.ts
index ac300f409..b95399f4b 100644
--- a/src/core/features/h5p/classes/validator.ts
+++ b/src/core/features/h5p/classes/validator.ts
@@ -65,13 +65,13 @@ export class CoreH5PValidator {
         const missing: Record<string, CoreH5PMissingLibrary> = {};
 
         Object.values(libraries).forEach((library) => {
-            if (typeof library.preloadedDependencies !== 'undefined') {
+            if (library.preloadedDependencies !== undefined) {
                 Object.assign(missing, this.getMissingDependencies(library.preloadedDependencies, library, libraries));
             }
-            if (typeof library.dynamicDependencies !== 'undefined') {
+            if (library.dynamicDependencies !== undefined) {
                 Object.assign(missing, this.getMissingDependencies(library.dynamicDependencies, library, libraries));
             }
-            if (typeof library.editorDependencies !== 'undefined') {
+            if (library.editorDependencies !== undefined) {
                 Object.assign(missing, this.getMissingDependencies(library.editorDependencies, library, libraries));
             }
         });
diff --git a/src/core/features/login/pages/email-signup/email-signup.ts b/src/core/features/login/pages/email-signup/email-signup.ts
index 02812cc92..794e81e1d 100644
--- a/src/core/features/login/pages/email-signup/email-signup.ts
+++ b/src/core/features/login/pages/email-signup/email-signup.ts
@@ -165,7 +165,7 @@ export class CoreLoginEmailSignupPage implements OnInit {
 
             if (this.treatSiteConfig()) {
                 // Check content verification.
-                if (typeof this.ageDigitalConsentVerification == 'undefined') {
+                if (this.ageDigitalConsentVerification === undefined) {
 
                     const result = await CoreUtils.ignoreErrors(
                         CoreWS.callAjax<IsAgeVerificationEnabledWSResponse>(
diff --git a/src/core/features/login/services/login-helper.ts b/src/core/features/login/services/login-helper.ts
index 627547671..ec3052968 100644
--- a/src/core/features/login/services/login-helper.ts
+++ b/src/core/features/login/services/login-helper.ts
@@ -323,7 +323,7 @@ export class CoreLoginHelperProvider {
      * @return OAuth ID.
      */
     getOAuthIdFromParams(params?: CoreUrlParams): number | undefined {
-        return params && typeof params.oauthsso != 'undefined' ? Number(params.oauthsso) : undefined;
+        return params && params.oauthsso !== undefined ? Number(params.oauthsso) : undefined;
     }
 
     /**
@@ -530,7 +530,7 @@ export class CoreLoginHelperProvider {
      * @return Whether email signup is disabled.
      */
     isFeatureDisabled(feature: string, config?: CoreSitePublicConfigResponse, disabledFeatures?: string): boolean {
-        if (typeof disabledFeatures == 'undefined') {
+        if (disabledFeatures === undefined) {
             disabledFeatures = this.getDisabledFeatures(config);
         }
 
@@ -978,7 +978,7 @@ export class CoreLoginHelperProvider {
                 }
 
                 const info = currentSite.getInfo();
-                if (typeof info != 'undefined' && typeof info.username != 'undefined') {
+                if (info !== undefined && info.username !== undefined) {
                     // If current page is already reconnect, stop.
                     if (CoreNavigator.isCurrent('/login/reconnect')) {
                         return;
@@ -1249,7 +1249,7 @@ export class CoreLoginHelperProvider {
      * @return Whether the QR reader should be displayed in site screen.
      */
     displayQRInSiteScreen(): boolean {
-        return CoreUtils.canScanQR() && (typeof CoreConstants.CONFIG.displayqronsitescreen == 'undefined' ||
+        return CoreUtils.canScanQR() && (CoreConstants.CONFIG.displayqronsitescreen === undefined ||
             !!CoreConstants.CONFIG.displayqronsitescreen);
     }
 
diff --git a/src/core/features/mainmenu/pages/home/home.ts b/src/core/features/mainmenu/pages/home/home.ts
index c7dfce575..a4d89d00e 100644
--- a/src/core/features/mainmenu/pages/home/home.ts
+++ b/src/core/features/mainmenu/pages/home/home.ts
@@ -109,7 +109,7 @@ export class CoreMainMenuHomePage implements OnInit {
         // Sort them by priority so new handlers are in the right position.
         newTabs.sort((a, b) => (handlersMap[b.title].priority || 0) - (handlersMap[a.title].priority || 0));
 
-        if (typeof this.selectedTab == 'undefined' && newTabs.length > 0) {
+        if (this.selectedTab === undefined && newTabs.length > 0) {
             let maxPriority = 0;
 
             this.selectedTab = Object.entries(newTabs).reduce((maxIndex, [index, tab]) => {
diff --git a/src/core/features/mainmenu/services/mainmenu.ts b/src/core/features/mainmenu/services/mainmenu.ts
index d34ecde37..f1c09fef0 100644
--- a/src/core/features/mainmenu/services/mainmenu.ts
+++ b/src/core/features/mainmenu/services/mainmenu.ts
@@ -176,7 +176,7 @@ export class CoreMainMenuProvider {
         }
 
         // Remove undefined values.
-        return result.filter((entry) => typeof entry != 'undefined');
+        return result.filter((entry) => entry !== undefined);
     }
 
     /**
diff --git a/src/core/features/pushnotifications/services/push-delegate.ts b/src/core/features/pushnotifications/services/push-delegate.ts
index 548301644..b897d0324 100644
--- a/src/core/features/pushnotifications/services/push-delegate.ts
+++ b/src/core/features/pushnotifications/services/push-delegate.ts
@@ -150,7 +150,7 @@ export class CorePushNotificationsDelegateService {
      * @return Observer to subscribe.
      */
     on<T = CorePushNotificationsNotificationBasicData>(eventName: string): Subject<T> {
-        if (typeof this.observables[eventName] == 'undefined') {
+        if (this.observables[eventName] === undefined) {
             const eventNames = Object.keys(this.observables).join(', ');
             this.logger.warn(`'${eventName}' event name is not allowed. Use one of the following: '${eventNames}'.`);
 
@@ -167,7 +167,7 @@ export class CorePushNotificationsDelegateService {
      * @return True if registered successfully, false otherwise.
      */
     registerClickHandler(handler: CorePushNotificationsClickHandler): boolean {
-        if (typeof this.clickHandlers[handler.name] !== 'undefined') {
+        if (this.clickHandlers[handler.name] !== undefined) {
             this.logger.log(`Addon '${handler.name}' already registered`);
 
             return false;
@@ -186,7 +186,7 @@ export class CorePushNotificationsDelegateService {
      * @param name Handler's name.
      */
     registerCounterHandler(name: string): void {
-        if (typeof this.counterHandlers[name] == 'undefined') {
+        if (this.counterHandlers[name] === undefined) {
             this.logger.debug(`Registered handler '${name}' as badge counter handler.`);
             this.counterHandlers[name] = name;
         } else {
@@ -201,7 +201,7 @@ export class CorePushNotificationsDelegateService {
      * @return If handler name is present.
      */
     isCounterHandlerRegistered(name: string): boolean {
-        return typeof this.counterHandlers[name] != 'undefined';
+        return this.counterHandlers[name] !== undefined;
     }
 
     /**
diff --git a/src/core/features/question/classes/base-question-component.ts b/src/core/features/question/classes/base-question-component.ts
index 630142130..7753c9d86 100644
--- a/src/core/features/question/classes/base-question-component.ts
+++ b/src/core/features/question/classes/base-question-component.ts
@@ -164,7 +164,7 @@ export class CoreQuestionBaseComponent {
         for (const i in options) {
             const optionEl = options[i];
 
-            if (typeof optionEl.value == 'undefined') {
+            if (optionEl.value === undefined) {
                 this.logger.warn('Aborting because couldn\'t find input.', this.question?.slot);
                 CoreQuestionHelper.showComponentError(this.onAbort);
 
@@ -225,7 +225,7 @@ export class CoreQuestionBaseComponent {
 
         // Extract question text.
         this.question.text = CoreDomUtils.getContentsOfElement(element, '.qtext');
-        if (typeof this.question.text == 'undefined') {
+        if (this.question.text === undefined) {
             this.logger.warn('Aborting because of an error parsing question.', this.question.slot);
 
             return CoreQuestionHelper.showComponentError(this.onAbort);
@@ -554,7 +554,7 @@ export class CoreQuestionBaseComponent {
             for (const j in options) {
                 const optionEl = options[j];
 
-                if (typeof optionEl.value == 'undefined') {
+                if (optionEl.value === undefined) {
                     this.logger.warn('Aborting because couldn\'t find the value of an option.', question.slot);
 
                     return CoreQuestionHelper.showComponentError(this.onAbort);
diff --git a/src/core/features/question/services/question-helper.ts b/src/core/features/question/services/question-helper.ts
index 6aacaca8a..b8ab02ad4 100644
--- a/src/core/features/question/services/question-helper.ts
+++ b/src/core/features/question/services/question-helper.ts
@@ -153,7 +153,7 @@ export class CoreQuestionHelperProvider {
         });
 
         // If we have a certainty value stored in local we'll use that one.
-        if (question.localAnswers && typeof question.localAnswers['-certainty'] != 'undefined') {
+        if (question.localAnswers && question.localAnswers['-certainty'] !== undefined) {
             question.behaviourCertaintySelected = question.localAnswers['-certainty'];
         }
 
diff --git a/src/core/features/rating/components/rate/rate.ts b/src/core/features/rating/components/rate/rate.ts
index 55f489c7f..cf2c43639 100644
--- a/src/core/features/rating/components/rate/rate.ts
+++ b/src/core/features/rating/components/rate/rate.ts
@@ -142,7 +142,7 @@ export class CoreRatingRateComponent implements OnChanges, OnDestroy {
                 this.aggregateMethod,
             );
 
-            if (typeof response == 'undefined') {
+            if (response === undefined) {
                 CoreDomUtils.showToast('core.datastoredoffline', true, 3000);
             } else {
                 this.onUpdate.emit();
diff --git a/src/core/features/settings/services/settings-helper.ts b/src/core/features/settings/services/settings-helper.ts
index 51e7a9c1f..3ca96984a 100644
--- a/src/core/features/settings/services/settings-helper.ts
+++ b/src/core/features/settings/services/settings-helper.ts
@@ -290,7 +290,7 @@ export class CoreSettingsHelperProvider {
         // Check old setting and update the new.
         try {
             const fontSize = await CoreConfig.get<number>('CoreSettingsFontSize');
-            if (typeof fontSize == 'undefined') {
+            if (fontSize === undefined) {
                 // Already upgraded.
                 return;
             }
diff --git a/src/core/features/siteplugins/classes/call-ws-click-directive.ts b/src/core/features/siteplugins/classes/call-ws-click-directive.ts
index 4e822ba1c..94c8b28f6 100644
--- a/src/core/features/siteplugins/classes/call-ws-click-directive.ts
+++ b/src/core/features/siteplugins/classes/call-ws-click-directive.ts
@@ -48,7 +48,7 @@ export class CoreSitePluginsCallWSOnClickBaseDirective extends CoreSitePluginsCa
             ev.preventDefault();
             ev.stopPropagation();
 
-            if (typeof this.confirmMessage != 'undefined') {
+            if (this.confirmMessage !== undefined) {
                 // Ask for confirm.
                 try {
                     await CoreDomUtils.showConfirm(this.confirmMessage || Translate.instant('core.areyousure'));
@@ -71,7 +71,7 @@ export class CoreSitePluginsCallWSOnClickBaseDirective extends CoreSitePluginsCa
         try {
             await super.callWS();
         } catch (error) {
-            if (typeof this.showError == 'undefined' || CoreUtils.isTrueOrOne(this.showError)) {
+            if (this.showError === undefined || CoreUtils.isTrueOrOne(this.showError)) {
                 CoreDomUtils.showErrorModalDefault(error, 'core.serverconnection', true);
             }
         } finally {
diff --git a/src/core/features/siteplugins/classes/handlers/module-handler.ts b/src/core/features/siteplugins/classes/handlers/module-handler.ts
index 847d2894b..9a945b48a 100644
--- a/src/core/features/siteplugins/classes/handlers/module-handler.ts
+++ b/src/core/features/siteplugins/classes/handlers/module-handler.ts
@@ -87,7 +87,7 @@ export class CoreSitePluginsModuleHandler extends CoreSitePluginsBaseHandler imp
             title: module.name,
             icon: this.getIconSrc(),
             class: this.handlerSchema.displaydata?.class,
-            showDownloadButton: typeof showDowloadButton != 'undefined' ? showDowloadButton : hasOffline,
+            showDownloadButton: showDowloadButton !== undefined ? showDowloadButton : hasOffline,
         };
 
         if (this.handlerSchema.method) {
diff --git a/src/core/features/siteplugins/directives/call-ws.ts b/src/core/features/siteplugins/directives/call-ws.ts
index e2b2226a4..6c232973e 100644
--- a/src/core/features/siteplugins/directives/call-ws.ts
+++ b/src/core/features/siteplugins/directives/call-ws.ts
@@ -72,7 +72,7 @@ export class CoreSitePluginsCallWSDirective extends CoreSitePluginsCallWSOnClick
             this.parentContent.refreshContent(true);
         }
 
-        if (typeof this.successMessage != 'undefined') {
+        if (this.successMessage !== undefined) {
             // Display the success message.
             CoreDomUtils.showToast(this.successMessage || Translate.instant('core.success'));
         }
diff --git a/src/core/features/siteplugins/services/siteplugins.ts b/src/core/features/siteplugins/services/siteplugins.ts
index c03ffbe91..70e85ea13 100644
--- a/src/core/features/siteplugins/services/siteplugins.ts
+++ b/src/core/features/siteplugins/services/siteplugins.ts
@@ -403,7 +403,7 @@ export class CoreSitePluginsProvider {
             return false;
         }
 
-        if (restrictEnrolled || typeof restrictEnrolled == 'undefined') {
+        if (restrictEnrolled || restrictEnrolled === undefined) {
             // Only enabled for courses the user is enrolled to. Check if the user is enrolled in the course.
             try {
                 await CoreCourses.getUserCourse(courseId, true);
@@ -485,7 +485,7 @@ export class CoreSitePluginsProvider {
 
         otherData = otherData || {};
 
-        if (typeof useOtherData == 'undefined') {
+        if (useOtherData === undefined) {
             // No need to add other data, return args as they are.
             return args;
         } else if (Array.isArray(useOtherData)) {
@@ -560,12 +560,12 @@ export class CoreSitePluginsProvider {
                     for (const i in paramsList) {
                         const paramName = paramsList[i];
 
-                        if (typeof args[paramName] != 'undefined') {
+                        if (args[paramName] !== undefined) {
                             params[paramName] = args[paramName];
                         } else {
                             // The param is not one of the default ones. Try to calculate the param to use.
                             const value = this.getDownloadParam(component, paramName, courseId, module);
-                            if (typeof value != 'undefined') {
+                            if (value !== undefined) {
                                 params[paramName] = value;
                             }
                         }
diff --git a/src/core/features/user/services/handlers/course-option.ts b/src/core/features/user/services/handlers/course-option.ts
index 8d0484c9e..37de80356 100644
--- a/src/core/features/user/services/handlers/course-option.ts
+++ b/src/core/features/user/services/handlers/course-option.ts
@@ -42,7 +42,7 @@ export class CoreUserCourseOptionHandlerService implements CoreCourseOptionsHand
      * @return Promise resolved when done.
      */
     invalidateEnabledForCourse(courseId: number, navOptions?: CoreCourseUserAdminOrNavOptionIndexed): Promise<void> {
-        if (navOptions && typeof navOptions.participants != 'undefined') {
+        if (navOptions && navOptions.participants !== undefined) {
             // No need to invalidate anything.
             return Promise.resolve();
         }
@@ -76,7 +76,7 @@ export class CoreUserCourseOptionHandlerService implements CoreCourseOptionsHand
             return false; // Not enabled for guests.
         }
 
-        if (navOptions && typeof navOptions.participants != 'undefined') {
+        if (navOptions && navOptions.participants !== undefined) {
             return navOptions.participants;
         }
 
diff --git a/src/core/features/user/services/user-delegate.ts b/src/core/features/user/services/user-delegate.ts
index df503bc7d..6adebcf06 100644
--- a/src/core/features/user/services/user-delegate.ts
+++ b/src/core/features/user/services/user-delegate.ts
@@ -367,14 +367,14 @@ export class CoreUserDelegateService extends CoreDelegate<CoreUserProfileHandler
             return handler.isEnabledForUser(user, courseId);
         }
 
-        if (typeof this.enabledForUserCache[handler.name] == 'undefined') {
+        if (this.enabledForUserCache[handler.name] === undefined) {
             this.enabledForUserCache[handler.name] = {};
         }
 
         const cacheKey = this.getCacheKey(courseId, user.id);
         const cache = this.enabledForUserCache[handler.name][cacheKey];
 
-        if (typeof cache != 'undefined') {
+        if (cache !== undefined) {
             return cache;
         }
 
diff --git a/src/core/features/user/services/user-offline.ts b/src/core/features/user/services/user-offline.ts
index 4fd5f1c6a..1eafad1c1 100644
--- a/src/core/features/user/services/user-offline.ts
+++ b/src/core/features/user/services/user-offline.ts
@@ -61,7 +61,7 @@ export class CoreUserOfflineProvider {
     async setPreference(name: string, value: string, onlineValue?: string, siteId?: string): Promise<void> {
         const site = await CoreSites.getSite(siteId);
 
-        if (typeof onlineValue == 'undefined') {
+        if (onlineValue === undefined) {
             const preference = await this.getPreference(name, site.id);
 
             onlineValue = preference.onlinevalue;
diff --git a/src/core/features/user/services/user-profile-field-delegate.ts b/src/core/features/user/services/user-profile-field-delegate.ts
index 93f893b5b..0432a8ea0 100644
--- a/src/core/features/user/services/user-profile-field-delegate.ts
+++ b/src/core/features/user/services/user-profile-field-delegate.ts
@@ -140,7 +140,7 @@ export class CoreUserProfileFieldDelegateService extends CoreDelegate<CoreUserPr
 
             if (handler.getData) {
                 return await handler.getData(field, signup, registerAuth, formValues);
-            } else if (field.shortname && typeof formValues[name] != 'undefined') {
+            } else if (field.shortname && formValues[name] !== undefined) {
                 // Handler doesn't implement the function, but the form has data for the field.
                 return {
                     type: type,
diff --git a/src/core/features/user/services/user.ts b/src/core/features/user/services/user.ts
index 23cf37c5b..15e2236ad 100644
--- a/src/core/features/user/services/user.ts
+++ b/src/core/features/user/services/user.ts
@@ -820,7 +820,7 @@ export class CoreUserProvider {
             responseExpected: false,
         };
 
-        if (typeof disableNotifications != 'undefined') {
+        if (disableNotifications !== undefined) {
             params.emailstop = disableNotifications ? 1 : 0;
         }
 
diff --git a/src/core/initializers/index.ts b/src/core/initializers/index.ts
index f9f60ea14..56c30b171 100644
--- a/src/core/initializers/index.ts
+++ b/src/core/initializers/index.ts
@@ -20,7 +20,7 @@ export function getInitializerProviders(): Provider[] {
     return context.keys().reduce((providers, fileName) => {
         const name = (fileName.match(/^(?:\.\/)?(.+)\.ts$/) || [])[1];
 
-        if (typeof name !== 'undefined' && name !== 'index') {
+        if (name !== undefined && name !== 'index') {
             providers.push({
                 provide: APP_INITIALIZER,
                 useValue: context(fileName).default,
diff --git a/src/core/pipes/format-date.ts b/src/core/pipes/format-date.ts
index 960ec19c0..2e49d275a 100644
--- a/src/core/pipes/format-date.ts
+++ b/src/core/pipes/format-date.ts
@@ -59,7 +59,7 @@ export class CoreFormatDatePipe implements PipeTransform {
             format = 'core.' + format;
         }
 
-        if (typeof convert == 'undefined') {
+        if (convert === undefined) {
             // Initialize convert param. Set it to false if it's a core.df format, set it to true otherwise.
             convert = format.indexOf('core.df') != 0;
         }
diff --git a/src/core/services/config.ts b/src/core/services/config.ts
index 37c65708e..70d6982ef 100644
--- a/src/core/services/config.ts
+++ b/src/core/services/config.ts
@@ -73,7 +73,7 @@ export class CoreConfigProvider {
 
             return entry.value;
         } catch (error) {
-            if (typeof defaultValue != 'undefined') {
+            if (defaultValue !== undefined) {
                 return defaultValue;
             }
 
diff --git a/src/core/services/cron.ts b/src/core/services/cron.ts
index 76a043947..a5b82dfa3 100644
--- a/src/core/services/cron.ts
+++ b/src/core/services/cron.ts
@@ -337,7 +337,7 @@ export class CoreCronDelegateService {
             // Invalid handler.
             return;
         }
-        if (typeof this.handlers[handler.name] != 'undefined') {
+        if (this.handlers[handler.name] !== undefined) {
             this.logger.debug(`The cron handler '${handler.name}' is already registered.`);
 
             return;
diff --git a/src/core/services/db.ts b/src/core/services/db.ts
index 1d1b2efea..a715625c8 100644
--- a/src/core/services/db.ts
+++ b/src/core/services/db.ts
@@ -36,7 +36,7 @@ export class CoreDbProvider {
      * @return DB.
      */
     getDB(name: string, forceNew?: boolean): SQLiteDB {
-        if (typeof this.dbInstances[name] === 'undefined' || forceNew) {
+        if (this.dbInstances[name] === undefined || forceNew) {
             if (Platform.is('cordova')) {
                 this.dbInstances[name] = new SQLiteDB(name);
             } else {
@@ -54,7 +54,7 @@ export class CoreDbProvider {
      * @return Promise resolved when the DB is deleted.
      */
     async deleteDB(name: string): Promise<void> {
-        if (typeof this.dbInstances[name] != 'undefined') {
+        if (this.dbInstances[name] !== undefined) {
             // Close the database first.
             await this.dbInstances[name].close();
 
diff --git a/src/core/services/file-helper.ts b/src/core/services/file-helper.ts
index 17b5f0d21..136d1291e 100644
--- a/src/core/services/file-helper.ts
+++ b/src/core/services/file-helper.ts
@@ -449,7 +449,7 @@ export class CoreFileHelperProvider {
     getFilenameFromPath(file: CoreFileEntry): string | undefined {
         const path = CoreUtils.isFileEntry(file) ? file.fullPath : file.filepath;
 
-        if (typeof path == 'undefined' || path.length == 0) {
+        if (path === undefined || path.length == 0) {
             return;
         }
 
diff --git a/src/core/services/file.ts b/src/core/services/file.ts
index 2316855b8..698cdac02 100644
--- a/src/core/services/file.ts
+++ b/src/core/services/file.ts
@@ -157,7 +157,7 @@ export class CoreFileProvider {
      * @return Whether the plugin is available.
      */
     isAvailable(): boolean {
-        return typeof window.resolveLocalFileSystemURL !== 'undefined';
+        return window.resolveLocalFileSystemURL !== undefined;
     }
 
     /**
@@ -982,7 +982,7 @@ export class CoreFileProvider {
     async replaceInFile(path: string, search: string | RegExp, newValue: string): Promise<void> {
         let content = <string> await this.readFile(path);
 
-        if (typeof content == 'undefined' || content === null || !content.replace) {
+        if (content === undefined || content === null || !content.replace) {
             throw new CoreError(`Error reading file ${path}`);
         }
 
@@ -1139,7 +1139,7 @@ export class CoreFileProvider {
      * @return Unique name.
      */
     calculateUniqueName(usedNames: Record<string, unknown>, name: string): string {
-        if (typeof usedNames[name.toLowerCase()] == 'undefined') {
+        if (usedNames[name.toLowerCase()] === undefined) {
             // No file with the same name.
             return name;
         }
@@ -1153,7 +1153,7 @@ export class CoreFileProvider {
         do {
             name = nameWithoutExtension + '(' + num + ')' + extension;
             num++;
-        } while (typeof usedNames[name.toLowerCase()] != 'undefined');
+        } while (usedNames[name.toLowerCase()] !== undefined);
 
         return name;
     }
diff --git a/src/core/services/filepool.ts b/src/core/services/filepool.ts
index 98efbef5f..d0c00aece 100644
--- a/src/core/services/filepool.ts
+++ b/src/core/services/filepool.ts
@@ -466,7 +466,7 @@ export class CoreFilepoolProvider {
 
         let size: number;
 
-        if (typeof this.sizeCache[fileUrl] != 'undefined') {
+        if (this.sizeCache[fileUrl] !== undefined) {
             size = this.sizeCache[fileUrl];
         } else {
             if (!CoreApp.isOnline()) {
@@ -594,7 +594,7 @@ export class CoreFilepoolProvider {
      * @return Link, null if nothing to link.
      */
     protected createComponentLink(component?: string, componentId?: string | number): CoreFilepoolComponentLink | undefined {
-        if (typeof component != 'undefined' && component != null) {
+        if (component !== undefined && component != null) {
             return { component, componentId: this.fixComponentId(componentId) };
         }
     }
@@ -681,7 +681,7 @@ export class CoreFilepoolProvider {
         }
 
         const extension = CoreMimetypeUtils.guessExtensionFromUrl(fileUrl);
-        const addExtension = typeof filePath == 'undefined';
+        const addExtension = filePath === undefined;
         const path = filePath || (await this.getFilePath(siteId, fileId, extension));
 
         if (poolFileObject && poolFileObject.fileId !== fileId) {
@@ -994,7 +994,7 @@ export class CoreFilepoolProvider {
         const links = this.createComponentLinks(component, componentId);
 
         const finishSuccessfulDownload = (url: string): string => {
-            if (typeof component != 'undefined') {
+            if (component !== undefined) {
                 CoreUtils.ignoreErrors(this.addFileLink(siteId, fileId, component, componentId));
             }
 
@@ -1104,7 +1104,7 @@ export class CoreFilepoolProvider {
      * @return Promise resolved when done.
      */
     protected async fillExtensionInFile(entry: CoreFilepoolFileEntry, siteId: string): Promise<void> {
-        if (typeof entry.extension != 'undefined') {
+        if (entry.extension !== undefined) {
             // Already filled.
             return;
         }
@@ -1149,7 +1149,7 @@ export class CoreFilepoolProvider {
             return componentId;
         }
 
-        if (typeof componentId == 'undefined' || componentId === null) {
+        if (componentId === undefined || componentId === null) {
             return -1;
         }
 
@@ -1335,7 +1335,7 @@ export class CoreFilepoolProvider {
     protected async getFilePath(siteId: string, fileId: string, extension?: string): Promise<string> {
         let path = this.getFilepoolFolderPath(siteId) + '/' + fileId;
 
-        if (typeof extension == 'undefined') {
+        if (extension === undefined) {
             // We need the extension to be able to open files properly.
             try {
                 const entry = await this.hasFileInPool(siteId, fileId);
@@ -1555,7 +1555,7 @@ export class CoreFilepoolProvider {
         try {
             const entry = await this.hasFileInPool(siteId, fileId);
 
-            if (typeof entry === 'undefined') {
+            if (entry === undefined) {
                 throw new CoreError('File not downloaded.');
             }
 
@@ -1949,7 +1949,7 @@ export class CoreFilepoolProvider {
         }
 
         const matches = url.match(revisionRegex);
-        if (matches && typeof matches[1] != 'undefined') {
+        if (matches && matches[1] !== undefined) {
             return parseInt(matches[1], 10);
         }
 
@@ -2131,7 +2131,7 @@ export class CoreFilepoolProvider {
         const db = await CoreSites.getSiteDb(siteId);
         const entry = await db.getRecord<CoreFilepoolFileEntry>(FILES_TABLE_NAME, { fileId });
 
-        if (typeof entry === 'undefined') {
+        if (entry === undefined) {
             throw new CoreError('File not found in filepool.');
         }
 
@@ -2149,7 +2149,7 @@ export class CoreFilepoolProvider {
         const db = await this.appDB;
         const entry = await db.getRecord<CoreFilepoolQueueEntry>(QUEUE_TABLE_NAME, { siteId, fileId });
 
-        if (typeof entry === 'undefined') {
+        if (entry === undefined) {
             throw new CoreError('File not found in queue.');
         }
         // Convert the links to an object.
@@ -2872,7 +2872,7 @@ export class CoreFilepoolProvider {
             const entry = await site.getDb().getRecord<CoreFilepoolPackageEntry>(PACKAGES_TABLE_NAME, { id: packageId });
 
             extra = extra ?? entry.extra;
-            if (typeof downloadTime == 'undefined') {
+            if (downloadTime === undefined) {
                 // Keep previous download time.
                 downloadTime = entry.downloadTime;
                 previousDownloadTime = entry.previousDownloadTime;
diff --git a/src/core/services/groups.ts b/src/core/services/groups.ts
index b0d63b803..39320f09a 100644
--- a/src/core/services/groups.ts
+++ b/src/core/services/groups.ts
@@ -214,7 +214,7 @@ export class CoreGroupsProvider {
         const response: CoreGroupGetActivityGroupModeWSResponse =
             await site.read('core_group_get_activity_groupmode', params, preSets);
 
-        if (!response || typeof response.groupmode == 'undefined') {
+        if (!response || response.groupmode === undefined) {
             throw new CoreError('Activity group mode not found.');
         }
 
diff --git a/src/core/services/lang.ts b/src/core/services/lang.ts
index f0430b64f..e8c09518c 100644
--- a/src/core/services/lang.ts
+++ b/src/core/services/lang.ts
@@ -223,7 +223,7 @@ export class CoreLangProvider {
      * @return Promise resolved with the current language.
      */
     async getCurrentLanguage(): Promise<string> {
-        if (typeof this.currentLanguage != 'undefined') {
+        if (this.currentLanguage !== undefined) {
             return this.currentLanguage;
         }
 
@@ -254,13 +254,13 @@ export class CoreLangProvider {
         let preferredLanguage = navigator.language.toLowerCase();
         if (preferredLanguage.indexOf('-') > -1) {
             // Language code defined by locale has a dash, like en-US or es-ES. Check if it's supported.
-            if (CoreConstants.CONFIG.languages && typeof CoreConstants.CONFIG.languages[preferredLanguage] == 'undefined') {
+            if (CoreConstants.CONFIG.languages && CoreConstants.CONFIG.languages[preferredLanguage] === undefined) {
                 // Code is NOT supported. Fallback to language without dash. E.g. 'en-US' would fallback to 'en'.
                 preferredLanguage = preferredLanguage.substr(0, preferredLanguage.indexOf('-'));
             }
         }
 
-        if (typeof CoreConstants.CONFIG.languages[preferredLanguage] == 'undefined') {
+        if (CoreConstants.CONFIG.languages[preferredLanguage] === undefined) {
             // Language not supported, use default language.
             return this.defaultLanguage;
         }
@@ -349,7 +349,7 @@ export class CoreLangProvider {
     loadCustomStringsFromSite(currentSite: CoreSite): void {
         const customStrings = currentSite.getStoredConfig('tool_mobile_customlangstrings');
 
-        if (typeof customStrings != 'undefined') {
+        if (customStrings !== undefined) {
             this.loadCustomStrings(customStrings);
         }
     }
diff --git a/src/core/services/local-notifications.ts b/src/core/services/local-notifications.ts
index 9b69435e0..f486e79e9 100644
--- a/src/core/services/local-notifications.ts
+++ b/src/core/services/local-notifications.ts
@@ -227,7 +227,7 @@ export class CoreLocalNotificationsProvider {
         const key = table + '#' + id;
 
         // Check if the code is already in memory.
-        if (typeof this.codes[key] != 'undefined') {
+        if (this.codes[key] !== undefined) {
             return this.codes[key];
         }
 
@@ -413,7 +413,7 @@ export class CoreLocalNotificationsProvider {
     protected async processNextRequest(): Promise<void> {
         const nextKey = Object.keys(this.codeRequestsQueue)[0];
 
-        if (typeof nextKey == 'undefined') {
+        if (nextKey === undefined) {
             // No more requests in queue, stop.
             return;
         }
@@ -469,11 +469,11 @@ export class CoreLocalNotificationsProvider {
     ): CoreEventObserver {
         this.logger.debug(`Register observer '${component}' for event '${eventName}'.`);
 
-        if (typeof this.observables[eventName] == 'undefined') {
+        if (this.observables[eventName] === undefined) {
             this.observables[eventName] = {};
         }
 
-        if (typeof this.observables[eventName][component] == 'undefined') {
+        if (this.observables[eventName][component] === undefined) {
             // No observable for this component, create a new one.
             this.observables[eventName][component] = new Subject<T>();
         }
@@ -511,7 +511,7 @@ export class CoreLocalNotificationsProvider {
         const key = table + '#' + id;
         const isQueueEmpty = Object.keys(this.codeRequestsQueue).length == 0;
 
-        if (typeof this.codeRequestsQueue[key] != 'undefined') {
+        if (this.codeRequestsQueue[key] !== undefined) {
             // There's already a pending request for this store and ID, add the promise to it.
             this.codeRequestsQueue[key].deferreds.push(deferred);
         } else {
diff --git a/src/core/services/plugin-file-delegate.ts b/src/core/services/plugin-file-delegate.ts
index 9c566fec0..ef78e78ae 100644
--- a/src/core/services/plugin-file-delegate.ts
+++ b/src/core/services/plugin-file-delegate.ts
@@ -167,7 +167,7 @@ export class CorePluginFileDelegateService extends CoreDelegate<CorePluginFileHa
         await Promise.all(files.map(async (file) => {
             const size = await this.getFileSize(file, siteId);
 
-            if (typeof size == 'undefined') {
+            if (size === undefined) {
                 // We don't have the file size, cannot calculate its total size.
                 result.total = false;
             } else {
diff --git a/src/core/services/sites.ts b/src/core/services/sites.ts
index 116f125dd..f90b14ace 100644
--- a/src/core/services/sites.ts
+++ b/src/core/services/sites.ts
@@ -121,7 +121,7 @@ export class CoreSitesProvider {
         const demoSites = CoreConstants.CONFIG.demo_sites;
         name = name.toLowerCase();
 
-        if (typeof demoSites != 'undefined' && typeof demoSites[name] != 'undefined') {
+        if (demoSites !== undefined && demoSites[name] !== undefined) {
             return demoSites[name];
         }
     }
@@ -364,13 +364,13 @@ export class CoreSitesProvider {
             throw new CoreError(Translate.instant('core.cannotconnecttrouble'));
         }
 
-        if (typeof data == 'undefined') {
+        if (data === undefined) {
             throw new CoreError(Translate.instant('core.cannotconnecttrouble'));
         } else {
-            if (typeof data.token != 'undefined') {
+            if (data.token !== undefined) {
                 return { token: data.token, siteUrl, privateToken: data.privatetoken };
             } else {
-                if (typeof data.error != 'undefined') {
+                if (data.error !== undefined) {
                     // We only allow one retry (to avoid loops).
                     if (!retry && data.errorcode == 'requirecorrectaccess') {
                         siteUrl = CoreUrlUtils.addOrRemoveWWW(siteUrl);
@@ -468,7 +468,7 @@ export class CoreSitesProvider {
                 }
             }
 
-            if (typeof config != 'undefined') {
+            if (config !== undefined) {
                 candidateSite.setConfig(config);
             }
 
@@ -891,7 +891,7 @@ export class CoreSitesProvider {
      * @return Whether the user is logged in a site.
      */
     isLoggedIn(): boolean {
-        return typeof this.currentSite != 'undefined' && typeof this.currentSite.token != 'undefined' &&
+        return this.currentSite !== undefined && this.currentSite.token !== undefined &&
             this.currentSite.token != '';
     }
 
@@ -904,7 +904,7 @@ export class CoreSitesProvider {
     async deleteSite(siteId: string): Promise<void> {
         this.logger.debug(`Delete site ${siteId}`);
 
-        if (typeof this.currentSite != 'undefined' && this.currentSite.id == siteId) {
+        if (this.currentSite !== undefined && this.currentSite.id == siteId) {
             this.logout();
         }
 
@@ -956,7 +956,7 @@ export class CoreSitesProvider {
             throw new CoreError('No current site found.');
         } else if (this.currentSite && this.currentSite.getId() == siteId) {
             return this.currentSite;
-        } else if (typeof this.sites[siteId] != 'undefined') {
+        } else if (this.sites[siteId] !== undefined) {
             return this.sites[siteId];
         } else {
             // Retrieve and create the site.
@@ -981,7 +981,7 @@ export class CoreSitesProvider {
         const db = await this.appDB;
         const data = await db.getRecord<SiteDBEntry>(SITES_TABLE_NAME, { siteUrl });
 
-        if (typeof this.sites[data.id] != 'undefined') {
+        if (this.sites[data.id] !== undefined) {
             return this.sites[data.id];
         }
 
@@ -1326,7 +1326,7 @@ export class CoreSitesProvider {
                 loggedOut: site.isLoggedOut() ? 1 : 0,
             };
 
-            if (typeof config != 'undefined') {
+            if (config !== undefined) {
                 site.setConfig(config);
                 newValues.config = JSON.stringify(config);
             }
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index 9b22c544e..945871287 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -200,8 +200,8 @@ export class CoreDomUtilsProvider {
 
         const availableSpace = getAvailableSpace(availableBytes);
 
-        wifiThreshold = typeof wifiThreshold == 'undefined' ? CoreConstants.WIFI_DOWNLOAD_THRESHOLD : wifiThreshold;
-        limitedThreshold = typeof limitedThreshold == 'undefined' ? CoreConstants.DOWNLOAD_THRESHOLD : limitedThreshold;
+        wifiThreshold = wifiThreshold === undefined ? CoreConstants.WIFI_DOWNLOAD_THRESHOLD : wifiThreshold;
+        limitedThreshold = limitedThreshold === undefined ? CoreConstants.DOWNLOAD_THRESHOLD : limitedThreshold;
 
         let wifiPrefix = '';
         if (CoreApp.isNetworkAccessLimited()) {
@@ -948,7 +948,7 @@ export class CoreDomUtilsProvider {
                 paths[CoreUrlUtils.removeUrlParams(CoreTextUtils.decodeURIComponent(currentSrc))] :
                 undefined;
 
-            if (typeof newSrc != 'undefined') {
+            if (newSrc !== undefined) {
                 media.setAttribute('src', newSrc);
             }
 
@@ -956,7 +956,7 @@ export class CoreDomUtilsProvider {
             if (media.tagName == 'VIDEO' && media.getAttribute('poster')) {
                 const currentPoster = media.getAttribute('poster');
                 const newPoster = paths[CoreTextUtils.decodeURIComponent(currentPoster!)];
-                if (typeof newPoster !== 'undefined') {
+                if (newPoster !== undefined) {
                     media.setAttribute('poster', newPoster);
                 }
             }
@@ -970,7 +970,7 @@ export class CoreDomUtilsProvider {
                 paths[CoreUrlUtils.removeUrlParams(CoreTextUtils.decodeURIComponent(currentHref))] :
                 undefined;
 
-            if (typeof newHref != 'undefined') {
+            if (newHref !== undefined) {
                 anchor.setAttribute('href', newHref);
 
                 if (typeof anchorFn == 'function') {
@@ -1226,7 +1226,7 @@ export class CoreDomUtilsProvider {
                 if (options.buttons) {
                     // Execute dismiss function if any.
                     const cancelButton = <AlertButton> options.buttons.find(
-                        (button) => typeof button != 'string' && typeof button.handler != 'undefined' && button.role == 'cancel',
+                        (button) => typeof button != 'string' && button.handler !== undefined && button.role == 'cancel',
                     );
                     cancelButton.handler?.(null);
                 }
diff --git a/src/core/services/utils/mimetype.ts b/src/core/services/utils/mimetype.ts
index ddf65901d..98ab537a6 100644
--- a/src/core/services/utils/mimetype.ts
+++ b/src/core/services/utils/mimetype.ts
@@ -325,7 +325,7 @@ export class CoreMimetypeUtilsProvider {
         }
 
         // Check extension corresponds to a mimetype to know if it's valid.
-        if (extension && typeof this.getMimeType(extension) == 'undefined') {
+        if (extension && this.getMimeType(extension) === undefined) {
             this.logger.warn('Guess file extension: Not valid extension ' + extension);
 
             return;
@@ -350,7 +350,7 @@ export class CoreMimetypeUtilsProvider {
             ext = this.cleanExtension(ext);
 
             // Check extension corresponds to a mimetype to know if it's valid.
-            if (typeof this.getMimeType(ext) == 'undefined') {
+            if (this.getMimeType(ext) === undefined) {
                 this.logger.warn('Get file extension: Not valid extension ' + ext);
 
                 return;
@@ -370,7 +370,7 @@ export class CoreMimetypeUtilsProvider {
     getGroupMimeInfo(group: string): MimeTypeGroupInfo;
     getGroupMimeInfo(group: string, field: string): string[] | undefined;
     getGroupMimeInfo(group: string, field?: string): MimeTypeGroupInfo | string[] | undefined {
-        if (typeof this.groupsMimeInfo[group] == 'undefined') {
+        if (this.groupsMimeInfo[group] === undefined) {
             this.fillGroupMimeInfo(group);
         }
 
@@ -590,7 +590,7 @@ export class CoreMimetypeUtilsProvider {
         if (position > -1) {
             // Check extension corresponds to a mimetype to know if it's valid.
             extension = path.substr(position + 1).toLowerCase();
-            if (typeof this.getMimeType(extension) != 'undefined') {
+            if (this.getMimeType(extension) !== undefined) {
                 return path.substr(0, position); // Remove extension.
             }
         }
diff --git a/src/core/services/utils/text.ts b/src/core/services/utils/text.ts
index 362298e18..c37c3f8a9 100644
--- a/src/core/services/utils/text.ts
+++ b/src/core/services/utils/text.ts
@@ -215,7 +215,7 @@ export class CoreTextUtilsProvider {
      * @return Size in human readable format.
      */
     bytesToSize(bytes: number, precision: number = 2): string {
-        if (typeof bytes == 'undefined' || bytes === null || bytes < 0) {
+        if (bytes === undefined || bytes === null || bytes < 0) {
             return Translate.instant('core.notapplicable');
         }
 
@@ -347,7 +347,7 @@ export class CoreTextUtilsProvider {
      * @return Decoded text.
      */
     decodeHTML(text: string | number): string {
-        if (typeof text == 'undefined' || text === null || (typeof text == 'number' && isNaN(text))) {
+        if (text === undefined || text === null || (typeof text == 'number' && isNaN(text))) {
             return '';
         } else if (typeof text != 'string') {
             return '' + text;
@@ -430,7 +430,7 @@ export class CoreTextUtilsProvider {
      * @return Escaped text.
      */
     escapeHTML(text?: string | number | null, doubleEncode: boolean = true): string {
-        if (typeof text == 'undefined' || text === null || (typeof text == 'number' && isNaN(text))) {
+        if (text === undefined || text === null || (typeof text == 'number' && isNaN(text))) {
             return '';
         } else if (typeof text != 'string') {
             return '' + text;
@@ -673,7 +673,7 @@ export class CoreTextUtilsProvider {
         }
 
         // Error parsing, return the default value or the original value.
-        if (typeof defaultValue != 'undefined') {
+        if (defaultValue !== undefined) {
             return defaultValue;
         }
 
diff --git a/src/core/services/utils/time.ts b/src/core/services/utils/time.ts
index 684c741b0..60457d388 100644
--- a/src/core/services/utils/time.ts
+++ b/src/core/services/utils/time.ts
@@ -97,7 +97,7 @@ export class CoreTimeUtilsProvider {
                     converted += ']';
                 }
 
-                converted += typeof CoreTimeUtilsProvider.FORMAT_REPLACEMENTS[char] != 'undefined' ?
+                converted += CoreTimeUtilsProvider.FORMAT_REPLACEMENTS[char] !== undefined ?
                     CoreTimeUtilsProvider.FORMAT_REPLACEMENTS[char] : char;
             } else {
                 // Not a PHP format. We need to escape them, otherwise the letters could be confused with Moment formats.
@@ -338,7 +338,7 @@ export class CoreTimeUtilsProvider {
     convertToTimestamp(date: string, applyOffset?: boolean): number {
         const timestamp = moment(date).unix();
 
-        if (typeof applyOffset !== 'undefined') {
+        if (applyOffset !== undefined) {
             return applyOffset ? timestamp - moment().utcOffset() * 60 : timestamp;
         }
 
diff --git a/src/core/services/utils/url.ts b/src/core/services/utils/url.ts
index 1fbf79211..15ed16dfc 100644
--- a/src/core/services/utils/url.ts
+++ b/src/core/services/utils/url.ts
@@ -146,7 +146,7 @@ export class CoreUrlUtilsProvider {
         }
 
         urlAndHash[0].replace(regex, (match: string, key: string, value: string): string => {
-            params[key] = typeof value != 'undefined' ? CoreTextUtils.decodeURIComponent(value) : '';
+            params[key] = value !== undefined ? CoreTextUtils.decodeURIComponent(value) : '';
 
             if (subParams) {
                 params[key] = params[key].replace(subParamsPlaceholder, subParams);
@@ -246,7 +246,7 @@ export class CoreUrlUtilsProvider {
     async getDocsUrl(release?: string, page: string = 'Mobile_app'): Promise<string> {
         let docsUrl = 'https://docs.moodle.org/en/' + page;
 
-        if (typeof release != 'undefined') {
+        if (release !== undefined) {
             const version = CoreSites.getMajorReleaseNumber(release).replace('.', '');
 
             // Check is a valid number.
diff --git a/src/core/services/utils/utils.ts b/src/core/services/utils/utils.ts
index 1ffe37ddf..e66e673fd 100644
--- a/src/core/services/utils/utils.ts
+++ b/src/core/services/utils/utils.ts
@@ -150,7 +150,7 @@ export class CoreUtilsProvider {
     ): Record<string, T[]> {
         for (const entry of array) {
             const key = propertyName ? entry[propertyName] : entry;
-            if (typeof result[key] == 'undefined') {
+            if (result[key] === undefined) {
                 result[key] = [];
             }
 
@@ -202,7 +202,7 @@ export class CoreUtilsProvider {
             return equal;
         } else {
             if (undefinedIsNull && (
-                (typeof itemA == 'undefined' && itemB === null) || (itemA === null && typeof itemB == 'undefined'))) {
+                (itemA === undefined && itemB === null) || (itemA === null && itemB === undefined))) {
                 return true;
             }
 
@@ -524,7 +524,7 @@ export class CoreUtilsProvider {
      * @return Locale float.
      */
     formatFloat(float: unknown): string {
-        if (typeof float == 'undefined' || float === null || typeof float == 'boolean') {
+        if (float === undefined || float === null || typeof float == 'boolean') {
             return '';
         }
 
@@ -836,7 +836,7 @@ export class CoreUtilsProvider {
      */
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     isFalseOrZero(value: any): boolean {
-        return typeof value != 'undefined' && (value === false || value === 'false' || parseInt(value, 10) === 0);
+        return value !== undefined && (value === false || value === 'false' || parseInt(value, 10) === 0);
     }
 
     /**
@@ -847,7 +847,7 @@ export class CoreUtilsProvider {
      */
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     isTrueOrOne(value: any): boolean {
-        return typeof value != 'undefined' && (value === true || value === 'true' || parseInt(value, 10) === 1);
+        return value !== undefined && (value === true || value === 'true' || parseInt(value, 10) === 1);
     }
 
     /**
@@ -858,7 +858,7 @@ export class CoreUtilsProvider {
      */
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     isWebServiceError(error: any): boolean {
-        return error && (typeof error.warningcode != 'undefined' || (typeof error.errorcode != 'undefined' &&
+        return error && (error.warningcode !== undefined || (error.errorcode !== undefined &&
                 error.errorcode != 'userdeleted' && error.errorcode != 'upgraderunning' &&
                 error.errorcode != 'forcepasswordchangenotice' && error.errorcode != 'usernotfullysetup' &&
                 error.errorcode != 'sitepolicynotagreed' && error.errorcode != 'sitemaintenance' &&
@@ -929,7 +929,7 @@ export class CoreUtilsProvider {
      */
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     notNullOrUndefined(value: any): boolean {
-        return typeof value != 'undefined' && value !== null;
+        return value !== undefined && value !== null;
     }
 
     /**
@@ -1183,7 +1183,7 @@ export class CoreUtilsProvider {
     ): A[] {
         // Get the entries from an object or primitive value.
         const getEntries = (elKey: string, value: unknown): Record<string, unknown>[] | unknown => {
-            if (typeof value == 'undefined' || value == null) {
+            if (value === undefined || value == null) {
                 // Filter undefined and null values.
                 return;
             } else if (this.isObject(value)) {
@@ -1277,7 +1277,7 @@ export class CoreUtilsProvider {
         for (const name in flattened) {
             let value = flattened[name];
 
-            if (removeEmpty && (value === null || typeof value == 'undefined')) {
+            if (removeEmpty && (value === null || value === undefined)) {
                 continue;
             }
 
@@ -1379,8 +1379,8 @@ export class CoreUtilsProvider {
         obj2: Record<string, unknown> | unknown[],
         key: string,
     ): boolean {
-        let value1 = typeof obj1[key] != 'undefined' ? obj1[key] : '';
-        let value2 = typeof obj2[key] != 'undefined' ? obj2[key] : '';
+        let value1 = obj1[key] !== undefined ? obj1[key] : '';
+        let value2 = obj2[key] !== undefined ? obj2[key] : '';
 
         if (typeof value1 == 'number' || typeof value1 == 'boolean') {
             value1 = '' + value1;
@@ -1484,7 +1484,7 @@ export class CoreUtilsProvider {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     unformatFloat(localeFloat: any, strict?: boolean): false | '' | number {
         // Bad format on input type number.
-        if (typeof localeFloat == 'undefined') {
+        if (localeFloat === undefined) {
             return false;
         }
 
@@ -1656,7 +1656,7 @@ export class CoreUtilsProvider {
 
         if (error) {
             this.qrScanData.deferred.reject(data);
-        } else if (typeof data != 'undefined') {
+        } else if (data !== undefined) {
             this.qrScanData.deferred.resolve(data as string);
         } else {
             this.qrScanData.deferred.reject(new CoreCanceledError());
diff --git a/src/core/services/ws.ts b/src/core/services/ws.ts
index ff2d7e869..d1ab15a5e 100644
--- a/src/core/services/ws.ts
+++ b/src/core/services/ws.ts
@@ -100,7 +100,7 @@ export class CoreWSProvider {
         }
 
         preSets.typeExpected = preSets.typeExpected || 'object';
-        if (typeof preSets.responseExpected == 'undefined') {
+        if (preSets.responseExpected === undefined) {
             preSets.responseExpected = true;
         }
 
@@ -323,7 +323,7 @@ export class CoreWSProvider {
      */
     protected getPromiseHttp<T = unknown>(method: string, url: string, params?: Record<string, unknown>): Promise<T> | undefined {
         const queueItemId = this.getQueueItemId(method, url, params);
-        if (typeof this.ongoingCalls[queueItemId] != 'undefined') {
+        if (this.ongoingCalls[queueItemId] !== undefined) {
             return this.ongoingCalls[queueItemId];
         }
     }
@@ -414,13 +414,13 @@ export class CoreWSProvider {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         let promise: Promise<HttpResponse<any>>;
 
-        if (typeof preSets.siteUrl == 'undefined') {
+        if (preSets.siteUrl === undefined) {
             throw new CoreAjaxError(Translate.instant('core.unexpectederror'));
         } else if (!CoreApp.isOnline()) {
             throw new CoreAjaxError(Translate.instant('core.networkerrormsg'));
         }
 
-        if (typeof preSets.responseExpected == 'undefined') {
+        if (preSets.responseExpected === undefined) {
             preSets.responseExpected = true;
         }
 
@@ -655,7 +655,7 @@ export class CoreWSProvider {
                 }
             }
 
-            if (typeof data.exception !== 'undefined') {
+            if (data.exception !== undefined) {
                 // Special debugging for site plugins, otherwise it's hard to debug errors if the data is cached.
                 if (method == 'tool_mobile_get_content') {
                     this.logger.error('Error calling WS', method, data);
@@ -664,7 +664,7 @@ export class CoreWSProvider {
                 throw new CoreWSError(data);
             }
 
-            if (typeof data.debuginfo != 'undefined') {
+            if (data.debuginfo !== undefined) {
                 throw new CoreError('Error. ' + data.message);
             }
 
@@ -787,7 +787,7 @@ export class CoreWSProvider {
         }
 
         preSets.typeExpected = preSets.typeExpected || 'object';
-        if (typeof preSets.responseExpected == 'undefined') {
+        if (preSets.responseExpected === undefined) {
             preSets.responseExpected = true;
         }
 
@@ -838,7 +838,7 @@ export class CoreWSProvider {
             throw new CoreError(Translate.instant('core.errorinvalidresponse'));
         }
 
-        if (typeof data.exception != 'undefined' || typeof data.debuginfo != 'undefined') {
+        if (data.exception !== undefined || data.debuginfo !== undefined) {
             throw new CoreWSError(data);
         }
 
@@ -907,14 +907,14 @@ export class CoreWSProvider {
                 throw new CoreError(Translate.instant('core.errorinvalidresponse'));
             }
 
-            if (typeof data.exception !== 'undefined') {
+            if (data.exception !== undefined) {
                 throw new CoreWSError(data);
-            } else if (typeof data.error !== 'undefined') {
+            } else if (data.error !== undefined) {
                 throw new CoreWSError({
                     errorcode: data.errortype,
                     message: data.error,
                 });
-            } else if (data[0] && typeof data[0].error !== 'undefined') {
+            } else if (data[0] && data[0].error !== undefined) {
                 throw new CoreWSError({
                     errorcode: data[0].errortype,
                     message: data[0].error,
@@ -966,7 +966,7 @@ export class CoreWSProvider {
     async sendHTTPRequest<T = unknown>(url: string, options: HttpRequestOptions): Promise<HttpResponse<T>> {
         // Set default values.
         options.responseType = options.responseType || 'json';
-        options.timeout = typeof options.timeout == 'undefined' ? this.getRequestTimeout() : options.timeout;
+        options.timeout = options.timeout === undefined ? this.getRequestTimeout() : options.timeout;
 
         if (CoreApp.isMobile()) {
             // Use the cordova plugin.
diff --git a/src/core/singletons/events.ts b/src/core/singletons/events.ts
index a88ea0722..ecc3a9ad8 100644
--- a/src/core/singletons/events.ts
+++ b/src/core/singletons/events.ts
@@ -137,7 +137,7 @@ export class CoreEvents {
 
         this.logger.debug(`New observer listening to event '${eventName}'`);
 
-        if (typeof this.observables[eventName] == 'undefined') {
+        if (this.observables[eventName] === undefined) {
             // No observable for this event, create a new one.
             this.observables[eventName] = new Subject();
         }

From 49a1d1d80624423a6bcd8744c72ddff5e1f93463 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 16 Dec 2021 13:29:50 +0100
Subject: [PATCH 0297/1008] MOBILE-3833 course: Merge Course Module with
 calculated data types

---
 .../services/handlers/module.ts               |  4 +-
 .../mod/book/services/handlers/prefetch.ts    |  5 +-
 .../mod/data/components/action/action.ts      |  4 +-
 src/addons/mod/data/components/index/index.ts |  4 +-
 src/addons/mod/data/pages/edit/edit.ts        |  6 +-
 src/addons/mod/data/pages/entry/entry.ts      |  8 +-
 src/addons/mod/feedback/pages/form/form.ts    |  6 +-
 .../mod/folder/services/handlers/prefetch.ts  |  5 +-
 .../mod/forum/services/handlers/module.ts     |  4 +-
 .../mod/imscp/services/handlers/prefetch.ts   |  4 +-
 src/addons/mod/imscp/services/imscp.ts        |  4 +-
 .../mod/label/services/handlers/module.ts     |  4 +-
 .../mod/lti/services/handlers/module.ts       |  6 +-
 src/addons/mod/lti/services/lti-helper.ts     |  8 +-
 .../mod/page/services/handlers/prefetch.ts    |  5 +-
 .../mod/resource/services/handlers/module.ts  | 14 +--
 .../resource/services/handlers/prefetch.ts    |  5 +-
 .../mod/resource/services/resource-helper.ts  | 14 +--
 .../mod/url/services/handlers/module.ts       | 16 ++--
 .../components/assessment/assessment.ts       |  4 +-
 .../components/submission/submission.ts       |  4 +-
 .../pages/edit-submission/edit-submission.ts  |  6 +-
 .../workshop/pages/submission/submission.ts   |  6 +-
 .../pages/course-storage/course-storage.ts    |  8 +-
 .../course/classes/main-resource-component.ts |  7 +-
 .../course/classes/module-base-handler.ts     |  8 +-
 .../classes/resource-prefetch-handler.ts      | 13 +--
 .../course/components/format/format.ts        |  4 +-
 .../components/module-info/module-info.ts     |  4 +-
 .../module-navigation/module-navigation.ts    | 14 +--
 .../course/components/module/module.ts        |  4 +-
 .../unsupported-module/unsupported-module.ts  |  5 +-
 .../directives/download-module-main-file.ts   |  6 +-
 .../features/course/pages/index/index.page.ts |  8 +-
 .../module-preview/module-preview.page.ts     |  8 +-
 .../features/course/services/course-helper.ts | 86 ++++++++++---------
 src/core/features/course/services/course.ts   | 59 +++++++++----
 .../services/handlers/default-module.ts       |  8 +-
 .../course/services/module-delegate.ts        | 28 +++---
 .../services/module-prefetch-delegate.ts      | 29 ++++---
 .../features/sitehome/pages/index/index.ts    | 14 ++-
 .../classes/handlers/module-handler.ts        | 12 +--
 .../components/module-index/module-index.ts   |  4 +-
 .../pages/module-index/module-index.ts        |  4 +-
 44 files changed, 255 insertions(+), 224 deletions(-)

diff --git a/src/addons/mod/bigbluebuttonbn/services/handlers/module.ts b/src/addons/mod/bigbluebuttonbn/services/handlers/module.ts
index 85956b4ed..3cab8b60f 100644
--- a/src/addons/mod/bigbluebuttonbn/services/handlers/module.ts
+++ b/src/addons/mod/bigbluebuttonbn/services/handlers/module.ts
@@ -15,7 +15,7 @@
 import { CoreConstants } from '@/core/constants';
 import { Injectable, Type } from '@angular/core';
 import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
-import { CoreCourseModule } from '@features/course/services/course-helper';
+import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
 import { CoreSitePluginsModuleHandler } from '@features/siteplugins/classes/handlers/module-handler';
 import { CoreSitePlugins } from '@features/siteplugins/services/siteplugins';
@@ -72,7 +72,7 @@ export class AddonModBBBModuleHandlerService extends CoreModuleHandlerBase imple
      * @inheritdoc
      */
     async getData(
-        module: CoreCourseModule,
+        module: CoreCourseModuleData,
         courseId: number,
         sectionId?: number,
         forCoursePage?: boolean,
diff --git a/src/addons/mod/book/services/handlers/prefetch.ts b/src/addons/mod/book/services/handlers/prefetch.ts
index 75dff4a32..c4c127821 100644
--- a/src/addons/mod/book/services/handlers/prefetch.ts
+++ b/src/addons/mod/book/services/handlers/prefetch.ts
@@ -14,7 +14,8 @@
 
 import { Injectable } from '@angular/core';
 import { CoreCourseResourcePrefetchHandlerBase } from '@features/course/classes/resource-prefetch-handler';
-import { CoreCourseAnyModuleData, CoreCourseWSModule } from '@features/course/services/course';
+import { CoreCourseAnyModuleData } from '@features/course/services/course';
+import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreWSFile } from '@services/ws';
 import { makeSingleton } from '@singletons';
@@ -39,7 +40,7 @@ export class AddonModBookPrefetchHandlerService extends CoreCourseResourcePrefet
      * @param prefetch True to prefetch, false to download right away.
      * @return Promise resolved when all content is downloaded. Data returned is not reliable.
      */
-    async downloadOrPrefetch(module: CoreCourseWSModule, courseId: number, prefetch?: boolean): Promise<void> {
+    async downloadOrPrefetch(module: CoreCourseModuleData, courseId: number, prefetch?: boolean): Promise<void> {
         const promises: Promise<unknown>[] = [];
 
         promises.push(super.downloadOrPrefetch(module, courseId, prefetch));
diff --git a/src/addons/mod/data/components/action/action.ts b/src/addons/mod/data/components/action/action.ts
index b10d9fe6a..e5b2ca7ab 100644
--- a/src/addons/mod/data/components/action/action.ts
+++ b/src/addons/mod/data/components/action/action.ts
@@ -14,7 +14,7 @@
 
 import { Component, OnInit, Input } from '@angular/core';
 import { Params } from '@angular/router';
-import { CoreCourseModule } from '@features/course/services/course-helper';
+import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreTag } from '@features/tag/services/tag';
 import { CoreUser } from '@features/user/services/user';
 import { CoreNavigator } from '@services/navigator';
@@ -44,7 +44,7 @@ export class AddonModDataActionComponent implements OnInit {
     @Input() action!: AddonModDataAction; // The field to render.
     @Input() entry!: AddonModDataEntry; // The value of the field.
     @Input() database!: AddonModDataData; // Database object.
-    @Input() module!: CoreCourseModule; // Module object.
+    @Input() module!: CoreCourseModuleData; // Module object.
     @Input() group = 0; // Module object.
     @Input() offset?: number; // Offset of the entry.
 
diff --git a/src/addons/mod/data/components/index/index.ts b/src/addons/mod/data/components/index/index.ts
index df7ca92aa..111571bdb 100644
--- a/src/addons/mod/data/components/index/index.ts
+++ b/src/addons/mod/data/components/index/index.ts
@@ -17,9 +17,9 @@ import { Component, OnDestroy, OnInit, Optional, Type } from '@angular/core';
 import { Params } from '@angular/router';
 import { CoreCommentsProvider } from '@features/comments/services/comments';
 import { CoreCourseModuleMainActivityComponent } from '@features/course/classes/main-activity-component';
-import { CoreCourseModule } from '@features/course/course.module';
 import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
 import { CoreCourse } from '@features/course/services/course';
+import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreRatingProvider } from '@features/rating/services/rating';
 import { CoreRatingSyncProvider } from '@features/rating/services/rating-sync';
 import { IonContent } from '@ionic/angular';
@@ -95,7 +95,7 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
         fields: Record<number, AddonModDataField>;
         entries: Record<number, AddonModDataEntry>;
         database: AddonModDataData;
-        module: CoreCourseModule;
+        module: CoreCourseModuleData;
         group: number;
         gotoEntry: (a: number) => void;
     };
diff --git a/src/addons/mod/data/pages/edit/edit.ts b/src/addons/mod/data/pages/edit/edit.ts
index 74f60c73f..3be6b6dbc 100644
--- a/src/addons/mod/data/pages/edit/edit.ts
+++ b/src/addons/mod/data/pages/edit/edit.ts
@@ -15,7 +15,7 @@
 import { Component, OnInit, ViewChild, ElementRef, Type } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 import { CoreError } from '@classes/errors/error';
-import { CoreCourseModule } from '@features/course/services/course-helper';
+import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreFileUploader } from '@features/fileuploader/services/fileuploader';
 import { CoreTag } from '@features/tag/services/tag';
 import { IonContent } from '@ionic/angular';
@@ -66,7 +66,7 @@ export class AddonModDataEditPage implements OnInit {
     entry?: AddonModDataEntry;
     fields: Record<number, AddonModDataField> = {};
     courseId!: number;
-    module!: CoreCourseModule;
+    module!: CoreCourseModuleData;
     database?: AddonModDataData;
     title = '';
     component = AddonModDataProvider.COMPONENT;
@@ -97,7 +97,7 @@ export class AddonModDataEditPage implements OnInit {
      */
     ngOnInit(): void {
         try {
-            this.module = CoreNavigator.getRequiredRouteParam<CoreCourseModule>('module');
+            this.module = CoreNavigator.getRequiredRouteParam<CoreCourseModuleData>('module');
             this.entryId = CoreNavigator.getRouteNumberParam('entryId') || undefined;
             this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
             this.selectedGroup = CoreNavigator.getRouteNumberParam('group') || 0;
diff --git a/src/addons/mod/data/pages/entry/entry.ts b/src/addons/mod/data/pages/entry/entry.ts
index df8ebb5be..fb707ad10 100644
--- a/src/addons/mod/data/pages/entry/entry.ts
+++ b/src/addons/mod/data/pages/entry/entry.ts
@@ -16,7 +16,7 @@ import { Component, OnDestroy, ViewChild, ChangeDetectorRef, OnInit, Type } from
 import { CoreCommentsCommentsComponent } from '@features/comments/components/comments/comments';
 import { CoreComments } from '@features/comments/services/comments';
 import { CoreCourse } from '@features/course/services/course';
-import { CoreCourseModule } from '@features/course/services/course-helper';
+import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreRatingInfo } from '@features/rating/services/rating';
 import { IonContent, IonRefresher } from '@ionic/angular';
 import { CoreGroups, CoreGroupInfo } from '@services/groups';
@@ -57,7 +57,7 @@ export class AddonModDataEntryPage implements OnInit, OnDestroy {
     protected fields: Record<number, AddonModDataField> = {};
     protected fieldsArray: AddonModDataField[] = [];
 
-    module!: CoreCourseModule;
+    module!: CoreCourseModuleData;
     courseId!: number;
     offset?: number;
     title = '';
@@ -82,7 +82,7 @@ export class AddonModDataEntryPage implements OnInit, OnDestroy {
         fields: Record<number, AddonModDataField>;
         entries: Record<number, AddonModDataEntry>;
         database: AddonModDataData;
-        module: CoreCourseModule;
+        module: CoreCourseModuleData;
         group: number;
     };
 
@@ -133,7 +133,7 @@ export class AddonModDataEntryPage implements OnInit, OnDestroy {
      */
     async ngOnInit(): Promise<void> {
         try {
-            this.module = CoreNavigator.getRequiredRouteParam<CoreCourseModule>('module');
+            this.module = CoreNavigator.getRequiredRouteParam<CoreCourseModuleData>('module');
             this.entryId = CoreNavigator.getRouteNumberParam('entryId') || undefined;
             this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
             this.selectedGroup = CoreNavigator.getRouteNumberParam('group') || 0;
diff --git a/src/addons/mod/feedback/pages/form/form.ts b/src/addons/mod/feedback/pages/form/form.ts
index 1a11ebb21..5807d7e3e 100644
--- a/src/addons/mod/feedback/pages/form/form.ts
+++ b/src/addons/mod/feedback/pages/form/form.ts
@@ -15,8 +15,8 @@
 import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { CoreSite } from '@classes/site';
 import { CoreContentLinksHelper } from '@features/contentlinks/services/contentlinks-helper';
-import { CoreCourse, CoreCourseCommonModWSOptions, CoreCourseWSModule } from '@features/course/services/course';
-import { CoreCourseHelper } from '@features/course/services/course-helper';
+import { CoreCourse, CoreCourseCommonModWSOptions } from '@features/course/services/course';
+import { CoreCourseHelper, CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CanLeave } from '@guards/can-leave';
 import { IonContent } from '@ionic/angular';
 import { CoreApp } from '@services/app';
@@ -51,7 +51,7 @@ export class AddonModFeedbackFormPage implements OnInit, OnDestroy, CanLeave {
 
     @ViewChild(IonContent) content?: IonContent;
 
-    protected module?: CoreCourseWSModule;
+    protected module?: CoreCourseModuleData;
     protected currentPage?: number;
     protected siteAfterSubmit?: string;
     protected onlineObserver: Subscription;
diff --git a/src/addons/mod/folder/services/handlers/prefetch.ts b/src/addons/mod/folder/services/handlers/prefetch.ts
index 5081cd5d5..33535bfb3 100644
--- a/src/addons/mod/folder/services/handlers/prefetch.ts
+++ b/src/addons/mod/folder/services/handlers/prefetch.ts
@@ -14,7 +14,8 @@
 
 import { Injectable } from '@angular/core';
 import { CoreCourseResourcePrefetchHandlerBase } from '@features/course/classes/resource-prefetch-handler';
-import { CoreCourse, CoreCourseAnyModuleData, CoreCourseWSModule } from '@features/course/services/course';
+import { CoreCourse, CoreCourseAnyModuleData } from '@features/course/services/course';
+import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { makeSingleton } from '@singletons';
 import { AddonModFolder, AddonModFolderProvider } from '../folder';
 
@@ -31,7 +32,7 @@ export class AddonModFolderPrefetchHandlerService extends CoreCourseResourcePref
     /**
      * @inheritdoc
      */
-    async downloadOrPrefetch(module: CoreCourseWSModule, courseId: number, prefetch?: boolean): Promise<void> {
+    async downloadOrPrefetch(module: CoreCourseModuleData, courseId: number, prefetch?: boolean): Promise<void> {
         const promises: Promise<unknown>[] = [];
 
         promises.push(super.downloadOrPrefetch(module, courseId, prefetch));
diff --git a/src/addons/mod/forum/services/handlers/module.ts b/src/addons/mod/forum/services/handlers/module.ts
index 98b81258b..f4ad76e60 100644
--- a/src/addons/mod/forum/services/handlers/module.ts
+++ b/src/addons/mod/forum/services/handlers/module.ts
@@ -22,7 +22,7 @@ import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/
 import { CoreConstants } from '@/core/constants';
 import { AddonModForumIndexComponent } from '../../components/index';
 import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
-import { CoreCourseModule } from '@features/course/services/course-helper';
+import { CoreCourseModuleData } from '@features/course/services/course-helper';
 
 /**
  * Handler to support forum modules.
@@ -53,7 +53,7 @@ export class AddonModForumModuleHandlerService extends CoreModuleHandlerBase imp
     /**
      * @inheritdoc
      */
-    async getData(module: CoreCourseModule, courseId: number): Promise<CoreCourseModuleHandlerData> {
+    async getData(module: CoreCourseModuleData, courseId: number): Promise<CoreCourseModuleHandlerData> {
         const data = await super.getData(module, courseId);
 
         if ('afterlink' in module && !!module.afterlink) {
diff --git a/src/addons/mod/imscp/services/handlers/prefetch.ts b/src/addons/mod/imscp/services/handlers/prefetch.ts
index 4f8aca282..667603fed 100644
--- a/src/addons/mod/imscp/services/handlers/prefetch.ts
+++ b/src/addons/mod/imscp/services/handlers/prefetch.ts
@@ -18,8 +18,8 @@ import {
     CoreCourse,
     CoreCourseAnyModuleData,
     CoreCourseModuleContentFile,
-    CoreCourseWSModule,
 } from '@features/course/services/course';
+import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreFilepool } from '@services/filepool';
 import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
@@ -40,7 +40,7 @@ export class AddonModImscpPrefetchHandlerService extends CoreCourseResourcePrefe
     /**
      * @inheritdoc
      */
-    async downloadOrPrefetch(module: CoreCourseWSModule, courseId: number, prefetch?: boolean): Promise<void> {
+    async downloadOrPrefetch(module: CoreCourseModuleData, courseId: number, prefetch?: boolean): Promise<void> {
         const siteId = CoreSites.getCurrentSiteId();
 
         const dirPath = await CoreFilepool.getPackageDirPathByUrl(siteId, module.url!);
diff --git a/src/addons/mod/imscp/services/imscp.ts b/src/addons/mod/imscp/services/imscp.ts
index 3783cf37d..88cae637e 100644
--- a/src/addons/mod/imscp/services/imscp.ts
+++ b/src/addons/mod/imscp/services/imscp.ts
@@ -16,7 +16,7 @@ import { Injectable } from '@angular/core';
 import { CoreError } from '@classes/errors/error';
 import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
 import { CoreCourse, CoreCourseModuleContentFile } from '@features/course/services/course';
-import { CoreCourseModule } from '@features/course/services/course-helper';
+import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreCourseLogHelper } from '@features/course/services/log-helper';
 import { CoreApp } from '@services/app';
 import { CoreFilepool } from '@services/filepool';
@@ -171,7 +171,7 @@ export class AddonModImscpProvider {
      * @param itemHref Href of item to get. If not defined, gets src of main item.
      * @return Promise resolved with the item src.
      */
-    async getIframeSrc(module: CoreCourseModule, itemHref?: string): Promise<string> {
+    async getIframeSrc(module: CoreCourseModuleData, itemHref?: string): Promise<string> {
         const contents = await CoreCourse.getModuleContents(module);
 
         if (!itemHref) {
diff --git a/src/addons/mod/label/services/handlers/module.ts b/src/addons/mod/label/services/handlers/module.ts
index 495e9cd51..f7cc33d6a 100644
--- a/src/addons/mod/label/services/handlers/module.ts
+++ b/src/addons/mod/label/services/handlers/module.ts
@@ -15,7 +15,7 @@
 import { CoreConstants } from '@/core/constants';
 import { Injectable } from '@angular/core';
 import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
-import { CoreCourseModule } from '@features/course/services/course-helper';
+import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
 import { makeSingleton } from '@singletons';
 
@@ -45,7 +45,7 @@ export class AddonModLabelModuleHandlerService extends CoreModuleHandlerBase imp
     /**
      * @inheritdoc
      */
-    async getData(module: CoreCourseModule): Promise<CoreCourseModuleHandlerData> {
+    async getData(module: CoreCourseModuleData): Promise<CoreCourseModuleHandlerData> {
         // Remove the description from the module so it isn't rendered twice.
         const title = module.description || '';
         module.description = '';
diff --git a/src/addons/mod/lti/services/handlers/module.ts b/src/addons/mod/lti/services/handlers/module.ts
index 1692ec173..7dcf9b6ee 100644
--- a/src/addons/mod/lti/services/handlers/module.ts
+++ b/src/addons/mod/lti/services/handlers/module.ts
@@ -16,7 +16,7 @@ import { Injectable, Type } from '@angular/core';
 
 import { CoreConstants } from '@/core/constants';
 import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
-import { CoreCourseModule } from '@features/course/services/course-helper';
+import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { makeSingleton } from '@singletons';
 import { AddonModLtiHelper } from '../lti-helper';
 import { AddonModLtiIndexComponent } from '../../components/index';
@@ -49,7 +49,7 @@ export class AddonModLtiModuleHandlerService extends CoreModuleHandlerBase imple
      * @inheritdoc
      */
     async getData(
-        module: CoreCourseModule,
+        module: CoreCourseModuleData,
         courseId: number,
         sectionId?: number,
         forCoursePage?: boolean,
@@ -63,7 +63,7 @@ export class AddonModLtiModuleHandlerService extends CoreModuleHandlerBase imple
         data.buttons = [{
             icon: 'fas-external-link-alt',
             label: 'addon.mod_lti.launchactivity',
-            action: (event: Event, module: CoreCourseModule, courseId: number): void => {
+            action: (event: Event, module: CoreCourseModuleData, courseId: number): void => {
                 // Launch the LTI.
                 AddonModLtiHelper.getDataAndLaunch(courseId, module);
             },
diff --git a/src/addons/mod/lti/services/lti-helper.ts b/src/addons/mod/lti/services/lti-helper.ts
index 1dbf19578..74d28a689 100644
--- a/src/addons/mod/lti/services/lti-helper.ts
+++ b/src/addons/mod/lti/services/lti-helper.ts
@@ -15,7 +15,7 @@
 import { Injectable } from '@angular/core';
 
 import { CoreCourse } from '@features/course/services/course';
-import { CoreCourseModule } from '@features/course/services/course-helper';
+import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { makeSingleton, Platform } from '@singletons';
@@ -28,7 +28,7 @@ import { AddonModLti, AddonModLtiLti } from './lti';
 @Injectable({ providedIn: 'root' })
 export class AddonModLtiHelperProvider {
 
-    protected pendingCheckCompletion: {[moduleId: string]: {courseId: number; module: CoreCourseModule}} = {};
+    protected pendingCheckCompletion: {[moduleId: string]: {courseId: number; module: CoreCourseModuleData}} = {};
 
     constructor() {
         // Clear pending completion on logout.
@@ -57,7 +57,7 @@ export class AddonModLtiHelperProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when done.
      */
-    async getDataAndLaunch(courseId: number, module: CoreCourseModule, lti?: AddonModLtiLti, siteId?: string): Promise<void> {
+    async getDataAndLaunch(courseId: number, module: CoreCourseModuleData, lti?: AddonModLtiLti, siteId?: string): Promise<void> {
         siteId = siteId || CoreSites.getCurrentSiteId();
 
         const modal = await CoreDomUtils.showModalLoading();
@@ -108,7 +108,7 @@ export class AddonModLtiHelperProvider {
      */
     async logViewAndCheckCompletion(
         courseId: number,
-        module: CoreCourseModule,
+        module: CoreCourseModuleData,
         ltiId: number,
         name?: string,
         siteId?: string,
diff --git a/src/addons/mod/page/services/handlers/prefetch.ts b/src/addons/mod/page/services/handlers/prefetch.ts
index fdbb6f721..c7b6f3958 100644
--- a/src/addons/mod/page/services/handlers/prefetch.ts
+++ b/src/addons/mod/page/services/handlers/prefetch.ts
@@ -14,7 +14,8 @@
 
 import { Injectable } from '@angular/core';
 import { CoreCourseResourcePrefetchHandlerBase } from '@features/course/classes/resource-prefetch-handler';
-import { CoreCourse, CoreCourseAnyModuleData, CoreCourseWSModule } from '@features/course/services/course';
+import { CoreCourse, CoreCourseAnyModuleData } from '@features/course/services/course';
+import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreUtils } from '@services/utils/utils';
 import { makeSingleton } from '@singletons';
 import { AddonModPage, AddonModPageProvider } from '../page';
@@ -38,7 +39,7 @@ export class AddonModPagePrefetchHandlerService extends CoreCourseResourcePrefet
      * @param prefetch True to prefetch, false to download right away.
      * @return Promise resolved when all content is downloaded. Data returned is not reliable.
      */
-    async downloadOrPrefetch(module: CoreCourseWSModule, courseId: number, prefetch?: boolean): Promise<void> {
+    async downloadOrPrefetch(module: CoreCourseModuleData, courseId: number, prefetch?: boolean): Promise<void> {
         const promises: Promise<unknown>[] = [];
 
         promises.push(super.downloadOrPrefetch(module, courseId, prefetch));
diff --git a/src/addons/mod/resource/services/handlers/module.ts b/src/addons/mod/resource/services/handlers/module.ts
index 275ea61f7..965b062dc 100644
--- a/src/addons/mod/resource/services/handlers/module.ts
+++ b/src/addons/mod/resource/services/handlers/module.ts
@@ -15,8 +15,8 @@
 import { CoreConstants } from '@/core/constants';
 import { Injectable, Type } from '@angular/core';
 import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
-import { CoreCourse, CoreCourseWSModule } from '@features/course/services/course';
-import { CoreCourseModule } from '@features/course/services/course-helper';
+import { CoreCourse } from '@features/course/services/course';
+import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
 import { CoreCourseModulePrefetchDelegate } from '@features/course/services/module-prefetch-delegate';
 import { CoreFileHelper } from '@services/file-helper';
@@ -63,7 +63,7 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase
      * @inheritdoc
      */
     async getData(
-        module: CoreCourseModule,
+        module: CoreCourseModuleData,
         courseId: number,
         sectionId?: number,
         forCoursePage?: boolean,
@@ -84,7 +84,7 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase
             hidden: true,
             icon: openWithPicker ? 'fas-share-square' : 'fas-file',
             label: module.name + ': ' + Translate.instant(openWithPicker ? 'core.openwith' : 'addon.mod_resource.openthefile'),
-            action: async (event: Event, module: CoreCourseModule, courseId: number): Promise<void> => {
+            action: async (event: Event, module: CoreCourseModuleData, courseId: number): Promise<void> => {
                 const hide = await this.hideOpenButton(module, courseId);
                 if (!hide) {
                     AddonModResourceHelper.openModuleFile(module, courseId);
@@ -112,7 +112,7 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase
      * @param courseId The course ID.
      * @return Resolved when done.
      */
-    protected async hideOpenButton(module: CoreCourseModule, courseId: number): Promise<boolean> {
+    protected async hideOpenButton(module: CoreCourseModuleData, courseId: number): Promise<boolean> {
         if (!('contentsinfo' in module) || !module.contentsinfo) {
             await CoreCourse.loadModuleContents(module, courseId, undefined, false, false, undefined, this.modName);
         }
@@ -130,7 +130,7 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase
      * @return Resource data.
      */
     protected async getResourceData(
-        module: CoreCourseModule,
+        module: CoreCourseModuleData,
         courseId: number,
         handlerData: CoreCourseModuleHandlerData,
     ): Promise<AddonResourceHandlerData> {
@@ -229,7 +229,7 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase
     /**
      * @inheritdoc
      */
-    async getIconSrc(module?: CoreCourseWSModule): Promise<string | undefined> {
+    async getIconSrc(module?: CoreCourseModuleData): Promise<string | undefined> {
         if (!module) {
             return;
         }
diff --git a/src/addons/mod/resource/services/handlers/prefetch.ts b/src/addons/mod/resource/services/handlers/prefetch.ts
index 696922b78..3342cc474 100644
--- a/src/addons/mod/resource/services/handlers/prefetch.ts
+++ b/src/addons/mod/resource/services/handlers/prefetch.ts
@@ -15,7 +15,8 @@
 import { CoreConstants } from '@/core/constants';
 import { Injectable } from '@angular/core';
 import { CoreCourseResourcePrefetchHandlerBase } from '@features/course/classes/resource-prefetch-handler';
-import { CoreCourse, CoreCourseAnyModuleData, CoreCourseWSModule } from '@features/course/services/course';
+import { CoreCourse, CoreCourseAnyModuleData } from '@features/course/services/course';
+import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreFilepool } from '@services/filepool';
 import { CoreSites } from '@services/sites';
 import { makeSingleton } from '@singletons';
@@ -57,7 +58,7 @@ export class AddonModResourcePrefetchHandlerService extends CoreCourseResourcePr
     /**
      * @inheritdoc
      */
-    async downloadOrPrefetch(module: CoreCourseWSModule, courseId: number, prefetch?: boolean): Promise<void> {
+    async downloadOrPrefetch(module: CoreCourseModuleData, courseId: number, prefetch?: boolean): Promise<void> {
         let dirPath: string | undefined;
 
         if (AddonModResourceHelper.isDisplayedInIframe(module)) {
diff --git a/src/addons/mod/resource/services/resource-helper.ts b/src/addons/mod/resource/services/resource-helper.ts
index 4cb2ccad1..c3f577847 100644
--- a/src/addons/mod/resource/services/resource-helper.ts
+++ b/src/addons/mod/resource/services/resource-helper.ts
@@ -15,8 +15,8 @@
 import { CoreConstants } from '@/core/constants';
 import { Injectable } from '@angular/core';
 import { CoreError } from '@classes/errors/error';
-import { CoreCourse, CoreCourseAnyModuleData, CoreCourseWSModule } from '@features/course/services/course';
-import { CoreCourseHelper } from '@features/course/services/course-helper';
+import { CoreCourse, CoreCourseAnyModuleData } from '@features/course/services/course';
+import { CoreCourseHelper, CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreApp } from '@services/app';
 import { CoreFile } from '@services/file';
 import { CoreFileHelper } from '@services/file-helper';
@@ -42,7 +42,7 @@ export class AddonModResourceHelperProvider {
      * @param courseId The course ID.
      * @return Promise resolved with the HTML.
      */
-    async getEmbeddedHtml(module: CoreCourseWSModule, courseId: number): Promise<string> {
+    async getEmbeddedHtml(module: CoreCourseModuleData, courseId: number): Promise<string> {
         const contents = await CoreCourse.getModuleContents(module, courseId);
 
         const result = await CoreCourseHelper.downloadModuleWithMainFileIfNeeded(
@@ -62,7 +62,7 @@ export class AddonModResourceHelperProvider {
      * @param module The module object.
      * @return Promise resolved with the iframe src.
      */
-    async getIframeSrc(module: CoreCourseWSModule): Promise<string> {
+    async getIframeSrc(module: CoreCourseModuleData): Promise<string> {
         if (!module.contents?.length) {
             throw new CoreError('No contents available in module');
         }
@@ -97,7 +97,7 @@ export class AddonModResourceHelperProvider {
      * @param display The display mode (if available).
      * @return Whether the resource should be displayed embeded.
      */
-    isDisplayedEmbedded(module: CoreCourseWSModule, display: number): boolean {
+    isDisplayedEmbedded(module: CoreCourseModuleData, display: number): boolean {
         const currentSite = CoreSites.getCurrentSite();
 
         if (!CoreFile.isAvailable() ||
@@ -150,7 +150,7 @@ export class AddonModResourceHelperProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with boolean: whether main file is downloadable.
      */
-    async isMainFileDownloadable(module: CoreCourseWSModule, siteId?: string): Promise<boolean> {
+    async isMainFileDownloadable(module: CoreCourseModuleData, siteId?: string): Promise<boolean> {
         const contents = await CoreCourse.getModuleContents(module);
         if (!contents.length) {
             throw new CoreError(Translate.instant('core.filenotfound'));
@@ -186,7 +186,7 @@ export class AddonModResourceHelperProvider {
      * @param options Options to open the file.
      * @return Resolved when done.
      */
-    async openModuleFile(module: CoreCourseWSModule, courseId: number, options: CoreUtilsOpenFileOptions = {}): Promise<void> {
+    async openModuleFile(module: CoreCourseModuleData, courseId: number, options: CoreUtilsOpenFileOptions = {}): Promise<void> {
         const modal = await CoreDomUtils.showModalLoading();
 
         try {
diff --git a/src/addons/mod/url/services/handlers/module.ts b/src/addons/mod/url/services/handlers/module.ts
index 69c7d2c4b..eeea17039 100644
--- a/src/addons/mod/url/services/handlers/module.ts
+++ b/src/addons/mod/url/services/handlers/module.ts
@@ -17,7 +17,7 @@ import { Injectable, Type } from '@angular/core';
 import { CoreContentLinksHelper } from '@features/contentlinks/services/contentlinks-helper';
 import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
 import { CoreCourse } from '@features/course/services/course';
-import { CoreCourseModule } from '@features/course/services/course-helper';
+import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
 import { CoreNavigationOptions } from '@services/navigator';
 import { CoreDomUtils } from '@services/utils/dom';
@@ -54,7 +54,7 @@ export class AddonModUrlModuleHandlerService extends CoreModuleHandlerBase imple
     /**
      * @inheritdoc
      */
-    async getData(module: CoreCourseModule, courseId: number): Promise<CoreCourseModuleHandlerData> {
+    async getData(module: CoreCourseModuleData, courseId: number): Promise<CoreCourseModuleHandlerData> {
 
         /**
          * Open the URL.
@@ -62,7 +62,7 @@ export class AddonModUrlModuleHandlerService extends CoreModuleHandlerBase imple
          * @param module The module object.
          * @param courseId The course ID.
          */
-        const openUrl = async (module: CoreCourseModule, courseId: number): Promise<void> => {
+        const openUrl = async (module: CoreCourseModuleData, courseId: number): Promise<void> => {
             try {
                 if (module.instance) {
                     await AddonModUrl.logView(module.instance, module.name);
@@ -81,7 +81,7 @@ export class AddonModUrlModuleHandlerService extends CoreModuleHandlerBase imple
             title: module.name,
             class: 'addon-mod_url-handler',
             showDownloadButton: false,
-            action: async (event: Event, module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions) => {
+            action: async (event: Event, module: CoreCourseModuleData, courseId: number, options?: CoreNavigationOptions) => {
                 const modal = await CoreDomUtils.showModalLoading();
 
                 try {
@@ -100,7 +100,7 @@ export class AddonModUrlModuleHandlerService extends CoreModuleHandlerBase imple
                 hidden: true, // Hide it until we calculate if it should be displayed or not.
                 icon: 'fas-link',
                 label: 'core.openmodinbrowser',
-                action: (event: Event, module: CoreCourseModule, courseId: number): void => {
+                action: (event: Event, module: CoreCourseModuleData, courseId: number): void => {
                     openUrl(module, courseId);
                 },
             }],
@@ -135,7 +135,7 @@ export class AddonModUrlModuleHandlerService extends CoreModuleHandlerBase imple
      * @param courseId The course ID.
      * @return Resolved when done.
      */
-    protected async hideLinkButton(module: CoreCourseModule, courseId: number): Promise<boolean> {
+    protected async hideLinkButton(module: CoreCourseModuleData, courseId: number): Promise<boolean> {
         try {
             const contents = await CoreCourse.getModuleContents(module, courseId, undefined, false, false, undefined, this.modName);
 
@@ -160,7 +160,7 @@ export class AddonModUrlModuleHandlerService extends CoreModuleHandlerBase imple
      * @param courseId Course ID.
      * @return Promise resolved with boolean.
      */
-    protected async shouldOpenLink(module: CoreCourseModule, courseId?: number): Promise<boolean> {
+    protected async shouldOpenLink(module: CoreCourseModuleData, courseId?: number): Promise<boolean> {
         try {
             const contents = await CoreCourse.getModuleContents(module, courseId, undefined, false, false, undefined, this.modName);
 
@@ -186,7 +186,7 @@ export class AddonModUrlModuleHandlerService extends CoreModuleHandlerBase imple
     /**
      * @inheritdoc
      */
-    manualCompletionAlwaysShown(module: CoreCourseModule): Promise<boolean> {
+    manualCompletionAlwaysShown(module: CoreCourseModuleData): Promise<boolean> {
         return this.shouldOpenLink(module, module.course);
     }
 
diff --git a/src/addons/mod/workshop/components/assessment/assessment.ts b/src/addons/mod/workshop/components/assessment/assessment.ts
index f165e0105..5ca172f55 100644
--- a/src/addons/mod/workshop/components/assessment/assessment.ts
+++ b/src/addons/mod/workshop/components/assessment/assessment.ts
@@ -14,7 +14,7 @@
 
 import { Component, Input, OnInit } from '@angular/core';
 import { Params } from '@angular/router';
-import { CoreCourseModule } from '@features/course/services/course-helper';
+import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreUser, CoreUserProfile } from '@features/user/services/user';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
@@ -41,7 +41,7 @@ export class AddonModWorkshopAssessmentComponent implements OnInit {
     @Input() workshop!: AddonModWorkshopData;
     @Input() access!: AddonModWorkshopGetWorkshopAccessInformationWSResponse;
     @Input() submission!: AddonModWorkshopSubmissionDataWithOfflineData;
-    @Input() module!: CoreCourseModule;
+    @Input() module!: CoreCourseModuleData;
 
     canViewAssessment = false;
     canSelfAssess = false;
diff --git a/src/addons/mod/workshop/components/submission/submission.ts b/src/addons/mod/workshop/components/submission/submission.ts
index ef3a0cf4d..fc05e97b3 100644
--- a/src/addons/mod/workshop/components/submission/submission.ts
+++ b/src/addons/mod/workshop/components/submission/submission.ts
@@ -14,7 +14,7 @@
 
 import { Component, Input, OnInit } from '@angular/core';
 import { Params } from '@angular/router';
-import { CoreCourseModule } from '@features/course/services/course-helper';
+import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreUser, CoreUserProfile } from '@features/user/services/user';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
@@ -44,7 +44,7 @@ import { AddonModWorkshopOffline } from '../../services/workshop-offline';
 export class AddonModWorkshopSubmissionComponent implements OnInit {
 
     @Input() submission!: AddonModWorkshopSubmissionDataWithOfflineData;
-    @Input() module!: CoreCourseModule;
+    @Input() module!: CoreCourseModuleData;
     @Input() workshop!: AddonModWorkshopData;
     @Input() access!: AddonModWorkshopGetWorkshopAccessInformationWSResponse;
     @Input() courseId!: number;
diff --git a/src/addons/mod/workshop/pages/edit-submission/edit-submission.ts b/src/addons/mod/workshop/pages/edit-submission/edit-submission.ts
index c91033454..9fdb9af26 100644
--- a/src/addons/mod/workshop/pages/edit-submission/edit-submission.ts
+++ b/src/addons/mod/workshop/pages/edit-submission/edit-submission.ts
@@ -15,7 +15,7 @@
 import { Component, OnInit, OnDestroy, ViewChild, ElementRef } from '@angular/core';
 import { FormGroup, FormBuilder, Validators } from '@angular/forms';
 import { CoreError } from '@classes/errors/error';
-import { CoreCourseModule } from '@features/course/services/course-helper';
+import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreFileUploader, CoreFileUploaderStoreFilesResult } from '@features/fileuploader/services/fileuploader';
 import { CanLeave } from '@guards/can-leave';
 import { CoreFile } from '@services/file';
@@ -51,7 +51,7 @@ export class AddonModWorkshopEditSubmissionPage implements OnInit, OnDestroy, Ca
 
     @ViewChild('editFormEl') formElement!: ElementRef;
 
-    module!: CoreCourseModule;
+    module!: CoreCourseModuleData;
     courseId!: number;
     access!: AddonModWorkshopGetWorkshopAccessInformationWSResponse;
     submission?: AddonModWorkshopSubmissionDataWithOfflineData;
@@ -100,7 +100,7 @@ export class AddonModWorkshopEditSubmissionPage implements OnInit, OnDestroy, Ca
      */
     ngOnInit(): void {
         try {
-            this.module = CoreNavigator.getRequiredRouteParam<CoreCourseModule>('module');
+            this.module = CoreNavigator.getRequiredRouteParam<CoreCourseModuleData>('module');
             this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
             this.access = CoreNavigator.getRequiredRouteParam<AddonModWorkshopGetWorkshopAccessInformationWSResponse>('access');
             this.submissionId = CoreNavigator.getRouteNumberParam('submissionId') || 0;
diff --git a/src/addons/mod/workshop/pages/submission/submission.ts b/src/addons/mod/workshop/pages/submission/submission.ts
index dee18605e..a131065af 100644
--- a/src/addons/mod/workshop/pages/submission/submission.ts
+++ b/src/addons/mod/workshop/pages/submission/submission.ts
@@ -16,7 +16,7 @@ import { Component, OnInit, OnDestroy, Optional, ViewChild, ElementRef } from '@
 import { FormGroup, FormBuilder } from '@angular/forms';
 import { Params } from '@angular/router';
 import { CoreCourse } from '@features/course/services/course';
-import { CoreCourseModule } from '@features/course/services/course-helper';
+import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreGradesHelper, CoreGradesMenuItem } from '@features/grades/services/grades-helper';
 import { CoreUser, CoreUserProfile } from '@features/user/services/user';
 import { CanLeave } from '@guards/can-leave';
@@ -61,7 +61,7 @@ export class AddonModWorkshopSubmissionPage implements OnInit, OnDestroy, CanLea
 
     @ViewChild('feedbackFormEl') formElement?: ElementRef;
 
-    module!: CoreCourseModule;
+    module!: CoreCourseModuleData;
     workshop!: AddonModWorkshopData;
     access!: AddonModWorkshopGetWorkshopAccessInformationWSResponse;
     assessment?: AddonModWorkshopSubmissionAssessmentWithFormData;
@@ -132,7 +132,7 @@ export class AddonModWorkshopSubmissionPage implements OnInit, OnDestroy, CanLea
     async ngOnInit(): Promise<void> {
         try {
             this.submissionId = CoreNavigator.getRequiredRouteNumberParam('submissionId');
-            this.module = CoreNavigator.getRequiredRouteParam<CoreCourseModule>('module');
+            this.module = CoreNavigator.getRequiredRouteParam<CoreCourseModuleData>('module');
             this.workshop = CoreNavigator.getRequiredRouteParam<AddonModWorkshopData>('workshop');
             this.access = CoreNavigator.getRequiredRouteParam<AddonModWorkshopGetWorkshopAccessInformationWSResponse>('access');
             this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.ts b/src/addons/storagemanager/pages/course-storage/course-storage.ts
index e52ddb0e0..80e28b258 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.ts
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.ts
@@ -15,7 +15,7 @@
 import { CoreConstants } from '@/core/constants';
 import { Component, OnInit } from '@angular/core';
 import { CoreCourse } from '@features/course/services/course';
-import { CoreCourseHelper, CoreCourseModule, CoreCourseSection } from '@features/course/services/course-helper';
+import { CoreCourseHelper, CoreCourseModuleData, CoreCourseSection } from '@features/course/services/course-helper';
 import { CoreCourseModulePrefetchDelegate } from '@features/course/services/module-prefetch-delegate';
 import { CoreEnrolledCourseData } from '@features/courses/services/courses';
 import { CoreNavigator } from '@services/navigator';
@@ -52,8 +52,8 @@ export class AddonStorageManagerCourseStoragePage implements OnInit {
             return;
         }
 
-        this.sections = await CoreCourse.getSections(this.course.id, false, true);
-        CoreCourseHelper.addHandlerDataForModules(this.sections, this.course.id);
+        const sections = await CoreCourse.getSections(this.course.id, false, true);
+        this.sections = CoreCourseHelper.addHandlerDataForModules(sections, this.course.id).sections;
 
         this.totalSize = 0;
 
@@ -231,7 +231,7 @@ type AddonStorageManagerCourseSection = Omit<CoreCourseSection, 'modules'> & {
     modules: AddonStorageManagerModule[];
 };
 
-type AddonStorageManagerModule = CoreCourseModule & {
+type AddonStorageManagerModule = CoreCourseModuleData & {
     parentSection?: AddonStorageManagerCourseSection;
     totalSize?: number;
 };
diff --git a/src/core/features/course/classes/main-resource-component.ts b/src/core/features/course/classes/main-resource-component.ts
index 24572a903..a6ea91223 100644
--- a/src/core/features/course/classes/main-resource-component.ts
+++ b/src/core/features/course/classes/main-resource-component.ts
@@ -30,7 +30,7 @@ import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreLogger } from '@singletons/logger';
 import { CoreCourseContentsPage } from '../pages/contents/contents';
 import { CoreCourse } from '../services/course';
-import { CoreCourseHelper, CoreCourseModule } from '../services/course-helper';
+import { CoreCourseHelper, CoreCourseModuleData } from '../services/course-helper';
 import { CoreCourseModuleDelegate, CoreCourseModuleMainComponent } from '../services/module-delegate';
 import { CoreCourseModulePrefetchDelegate } from '../services/module-prefetch-delegate';
 
@@ -50,7 +50,7 @@ export type CoreCourseResourceDownloadResult = {
 })
 export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy, CoreCourseModuleMainComponent {
 
-    @Input() module!: CoreCourseModule; // The module of the component.
+    @Input() module!: CoreCourseModuleData; // The module of the component.
     @Input() courseId!: number; // Course ID the component belongs to.
     @Output() dataRetrieved = new EventEmitter<unknown>(); // Called to notify changes the index page from the main component.
 
@@ -100,7 +100,6 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
         this.showCompletion = !!CoreSites.getRequiredCurrentSite().isVersionGreaterEqualThan('3.11');
 
         if (this.showCompletion) {
-            CoreCourseHelper.calculateModuleCompletionData(this.module);
             CoreCourseHelper.loadModuleOfflineCompletion(this.courseId, this.module);
 
             this.completionObserver = CoreEvents.on(CoreEvents.COMPLETION_MODULE_VIEWED, async (data) => {
@@ -428,8 +427,6 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
     protected async fetchModule(): Promise<void> {
         const module = await CoreCourse.getModule(this.module.id, this.courseId);
 
-        CoreCourseHelper.calculateModuleCompletionData(module);
-
         await CoreCourseHelper.loadModuleOfflineCompletion(this.courseId, module);
 
         this.module = module;
diff --git a/src/core/features/course/classes/module-base-handler.ts b/src/core/features/course/classes/module-base-handler.ts
index 3d59a9d00..0950a8d2a 100644
--- a/src/core/features/course/classes/module-base-handler.ts
+++ b/src/core/features/course/classes/module-base-handler.ts
@@ -14,7 +14,7 @@
 
 import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
 import { CoreCourse } from '../services/course';
-import { CoreCourseModule } from '../services/course-helper';
+import { CoreCourseModuleData } from '../services/course-helper';
 import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '../services/module-delegate';
 
 /**
@@ -35,7 +35,7 @@ export class CoreModuleHandlerBase implements Partial<CoreCourseModuleHandler> {
      * @inheritdoc
      */
     async getData(
-        module: CoreCourseModule,
+        module: CoreCourseModuleData,
         courseId: number, // eslint-disable-line @typescript-eslint/no-unused-vars
         sectionId?: number, // eslint-disable-line @typescript-eslint/no-unused-vars
         forCoursePage?: boolean, // eslint-disable-line @typescript-eslint/no-unused-vars
@@ -47,7 +47,7 @@ export class CoreModuleHandlerBase implements Partial<CoreCourseModuleHandler> {
             showDownloadButton: true,
             action: async (
                 event: Event,
-                module: CoreCourseModule,
+                module: CoreCourseModuleData,
                 courseId: number,
                 options?: CoreNavigationOptions,
             ): Promise<void> => {
@@ -64,7 +64,7 @@ export class CoreModuleHandlerBase implements Partial<CoreCourseModuleHandler> {
      * @param options Options for the navigation.
      * @return Promise resolved when done.
      */
-    async openActivityPage(module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions): Promise<void> {
+    async openActivityPage(module: CoreCourseModuleData, courseId: number, options?: CoreNavigationOptions): Promise<void> {
         if (!CoreCourse.moduleHasView(module)) {
             return;
         }
diff --git a/src/core/features/course/classes/resource-prefetch-handler.ts b/src/core/features/course/classes/resource-prefetch-handler.ts
index a11108d27..7eb2119df 100644
--- a/src/core/features/course/classes/resource-prefetch-handler.ts
+++ b/src/core/features/course/classes/resource-prefetch-handler.ts
@@ -18,7 +18,8 @@ import { CoreApp } from '@services/app';
 import { CoreFilepool } from '@services/filepool';
 import { CoreSites } from '@services/sites';
 import { CoreWSFile } from '@services/ws';
-import { CoreCourse, CoreCourseAnyModuleData, CoreCourseWSModule } from '../services/course';
+import { CoreCourse, CoreCourseAnyModuleData } from '../services/course';
+import { CoreCourseModuleData } from '../services/course-helper';
 import { CoreCourseModulePrefetchHandlerBase } from './module-prefetch-handler';
 
 /**
@@ -40,7 +41,7 @@ export class CoreCourseResourcePrefetchHandlerBase extends CoreCourseModulePrefe
      * @param dirPath Path of the directory where to store all the content files.
      * @return Promise resolved when all content is downloaded.
      */
-    download(module: CoreCourseWSModule, courseId: number, dirPath?: string): Promise<void> {
+    download(module: CoreCourseModuleData, courseId: number, dirPath?: string): Promise<void> {
         return this.downloadOrPrefetch(module, courseId, false, dirPath);
     }
 
@@ -55,7 +56,7 @@ export class CoreCourseResourcePrefetchHandlerBase extends CoreCourseModulePrefe
      *                in the filepool root folder.
      * @return Promise resolved when all content is downloaded.
      */
-    async downloadOrPrefetch(module: CoreCourseWSModule, courseId: number, prefetch?: boolean, dirPath?: string): Promise<void> {
+    async downloadOrPrefetch(module: CoreCourseModuleData, courseId: number, prefetch?: boolean, dirPath?: string): Promise<void> {
         if (!CoreApp.isOnline()) {
             // Cannot download in offline.
             throw new CoreNetworkError();
@@ -85,7 +86,7 @@ export class CoreCourseResourcePrefetchHandlerBase extends CoreCourseModulePrefe
      */
     protected async performDownloadOrPrefetch(
         siteId: string,
-        module: CoreCourseWSModule,
+        module: CoreCourseModuleData,
         courseId: number,
         prefetch: boolean,
         dirPath?: string,
@@ -143,7 +144,7 @@ export class CoreCourseResourcePrefetchHandlerBase extends CoreCourseModulePrefe
      * @return Promise resolved with the list of files.
      */
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async getFiles(module: CoreCourseWSModule, courseId: number, single?: boolean): Promise<CoreWSFile[]> {
+    async getFiles(module: CoreCourseModuleData, courseId: number, single?: boolean): Promise<CoreWSFile[]> {
         // Load module contents if needed.
         await this.loadContents(module, courseId);
 
@@ -190,7 +191,7 @@ export class CoreCourseResourcePrefetchHandlerBase extends CoreCourseModulePrefe
      * @param dirPath Path of the directory where to store all the content files.
      * @return Promise resolved when done.
      */
-    prefetch(module: CoreCourseWSModule, courseId: number, single?: boolean, dirPath?: string): Promise<void> {
+    prefetch(module: CoreCourseModuleData, courseId: number, single?: boolean, dirPath?: string): Promise<void> {
         return this.downloadOrPrefetch(module, courseId, true, dirPath);
     }
 
diff --git a/src/core/features/course/components/format/format.ts b/src/core/features/course/components/format/format.ts
index 32932b687..683eb061e 100644
--- a/src/core/features/course/components/format/format.ts
+++ b/src/core/features/course/components/format/format.ts
@@ -38,7 +38,7 @@ import {
 } from '@features/course/services/course';
 import {
     CoreCourseHelper,
-    CoreCourseModule,
+    CoreCourseModuleData,
     CoreCourseModuleCompletionData,
     CoreCourseSection,
     CoreCourseSectionWithStatus,
@@ -637,7 +637,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
         }
 
         // If the completion value is not used, the page won't be reloaded, so update the progress bar.
-        const completionModules = (<CoreCourseModule[]> [])
+        const completionModules = (<CoreCourseModuleData[]> [])
             .concat(...this.sections!.map((section) => section.modules))
             .map((module) => module.completion && module.completion > 0 ? 1 : module.completion)
             .reduce((accumulator, currentValue) => (accumulator || 0) + (currentValue || 0), 0);
diff --git a/src/core/features/course/components/module-info/module-info.ts b/src/core/features/course/components/module-info/module-info.ts
index 2c958c99f..43fbe8ec4 100644
--- a/src/core/features/course/components/module-info/module-info.ts
+++ b/src/core/features/course/components/module-info/module-info.ts
@@ -14,7 +14,7 @@
 
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { CoreCourse } from '@features/course/services/course';
-import { CoreCourseModule, CoreCourseModuleCompletionData } from '@features/course/services/course-helper';
+import { CoreCourseModuleData, CoreCourseModuleCompletionData } from '@features/course/services/course-helper';
 import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate';
 import { CoreSites } from '@services/sites';
 
@@ -35,7 +35,7 @@ import { CoreSites } from '@services/sites';
 })
 export class CoreCourseModuleInfoComponent implements OnInit {
 
-    @Input() module!: CoreCourseModule; // The module to render.
+    @Input() module!: CoreCourseModuleData; // The module to render.
     @Input() showManualCompletion = true; // Whether to show manual completion, true by default.
     @Input() courseId!: number; // The courseId the module belongs to.
 
diff --git a/src/core/features/course/components/module-navigation/module-navigation.ts b/src/core/features/course/components/module-navigation/module-navigation.ts
index c6cc18ae9..fa326b1c7 100644
--- a/src/core/features/course/components/module-navigation/module-navigation.ts
+++ b/src/core/features/course/components/module-navigation/module-navigation.ts
@@ -14,7 +14,7 @@
 
 import { Component, ElementRef, Input, OnDestroy, OnInit } from '@angular/core';
 import { CoreCourse, CoreCourseProvider, CoreCourseWSSection } from '@features/course/services/course';
-import { CoreCourseModule, CoreCourseSection } from '@features/course/services/course-helper';
+import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate';
 import { IonContent } from '@ionic/angular';
 import { ScrollDetail } from '@ionic/core';
@@ -41,10 +41,10 @@ export class CoreCourseModuleNavigationComponent implements OnInit, OnDestroy {
     @Input() courseId!: number; // Course ID.
     @Input() currentModuleId!: number; // Current module ID.
 
-    nextModule?: CoreCourseModule;
-    previousModule?: CoreCourseModule;
-    nextModuleSection?: CoreCourseSection;
-    previousModuleSection?: CoreCourseSection;
+    nextModule?: CoreCourseModuleData;
+    previousModule?: CoreCourseModuleData;
+    nextModuleSection?: CoreCourseWSSection;
+    previousModuleSection?: CoreCourseWSSection;
     loaded = false;
 
     protected element: HTMLElement;
@@ -184,7 +184,7 @@ export class CoreCourseModuleNavigationComponent implements OnInit, OnDestroy {
                 return false;
             }
 
-            currentModuleIndex = section.modules.findIndex((module: CoreCourseModule) => module.id == this.currentModuleId);
+            currentModuleIndex = section.modules.findIndex((module: CoreCourseModuleData) => module.id == this.currentModuleId);
 
             return currentModuleIndex >= 0;
         });
@@ -250,7 +250,7 @@ export class CoreCourseModuleNavigationComponent implements OnInit, OnDestroy {
      * @param module Module to check.
      * @return Wether the module is available to the user or not.
      */
-    protected async isModuleAvailable(module: CoreCourseModule): Promise<boolean> {
+    protected async isModuleAvailable(module: CoreCourseModuleData): Promise<boolean> {
         return CoreCourse.instance.moduleHasView(module);
     }
 
diff --git a/src/core/features/course/components/module/module.ts b/src/core/features/course/components/module/module.ts
index b077bd66f..fc2265acb 100644
--- a/src/core/features/course/components/module/module.ts
+++ b/src/core/features/course/components/module/module.ts
@@ -19,7 +19,7 @@ import { CoreDomUtils } from '@services/utils/dom';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import {
     CoreCourseHelper,
-    CoreCourseModule,
+    CoreCourseModuleData,
     CoreCourseModuleCompletionData,
     CoreCourseSection,
 } from '@features/course/services/course-helper';
@@ -44,7 +44,7 @@ import {
 })
 export class CoreCourseModuleComponent implements OnInit, OnDestroy {
 
-    @Input() module!: CoreCourseModule; // The module to render.
+    @Input() module!: CoreCourseModuleData; // The module to render.
     @Input() courseId?: number; // The course the module belongs to.
     @Input() section?: CoreCourseSection; // The section the module belongs to.
     @Input() showActivityDates = false; // Whether to show activity dates.
diff --git a/src/core/features/course/components/unsupported-module/unsupported-module.ts b/src/core/features/course/components/unsupported-module/unsupported-module.ts
index b8be27123..5df40ab8f 100644
--- a/src/core/features/course/components/unsupported-module/unsupported-module.ts
+++ b/src/core/features/course/components/unsupported-module/unsupported-module.ts
@@ -14,7 +14,8 @@
 
 import { Component, Input, OnInit } from '@angular/core';
 
-import { CoreCourse, CoreCourseWSModule } from '@features/course/services/course';
+import { CoreCourse } from '@features/course/services/course';
+import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate';
 
 /**
@@ -27,7 +28,7 @@ import { CoreCourseModuleDelegate } from '@features/course/services/module-deleg
 export class CoreCourseUnsupportedModuleComponent implements OnInit {
 
     @Input() courseId?: number; // The course to module belongs to.
-    @Input() module?: CoreCourseWSModule; // The module to render.
+    @Input() module?: CoreCourseModuleData; // The module to render.
 
     isDisabledInSite?: boolean;
     isSupportedByTheApp?: boolean;
diff --git a/src/core/features/course/directives/download-module-main-file.ts b/src/core/features/course/directives/download-module-main-file.ts
index 2756f916f..e004e3eb5 100644
--- a/src/core/features/course/directives/download-module-main-file.ts
+++ b/src/core/features/course/directives/download-module-main-file.ts
@@ -15,8 +15,8 @@
 import { Directive, Input, OnInit, ElementRef } from '@angular/core';
 
 import { CoreDomUtils } from '@services/utils/dom';
-import { CoreCourse, CoreCourseModuleContentFile, CoreCourseWSModule } from '@features/course/services/course';
-import { CoreCourseHelper } from '@features/course/services/course-helper';
+import { CoreCourse, CoreCourseModuleContentFile } from '@features/course/services/course';
+import { CoreCourseHelper, CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreUtilsOpenFileOptions } from '@services/utils/utils';
 
 /**
@@ -31,7 +31,7 @@ import { CoreUtilsOpenFileOptions } from '@services/utils/utils';
 })
 export class CoreCourseDownloadModuleMainFileDirective implements OnInit {
 
-    @Input() module?: CoreCourseWSModule; // The module.
+    @Input() module?: CoreCourseModuleData; // The module.
     @Input() moduleId?: string | number; // The module ID. Required if module is not supplied.
     @Input() courseId?: string | number; // The course ID.
     @Input() component?: string; // Component to link the file to.
diff --git a/src/core/features/course/pages/index/index.page.ts b/src/core/features/course/pages/index/index.page.ts
index 98dd85dd1..68ae06832 100644
--- a/src/core/features/course/pages/index/index.page.ts
+++ b/src/core/features/course/pages/index/index.page.ts
@@ -20,8 +20,8 @@ import { CoreCourseFormatDelegate } from '../../services/format-delegate';
 import { CoreCourseOptionsDelegate } from '../../services/course-options-delegate';
 import { CoreCourseAnyCourseData } from '@features/courses/services/courses';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
-import { CoreCourse, CoreCourseWSModule } from '@features/course/services/course';
-import { CoreCourseHelper } from '@features/course/services/course-helper';
+import { CoreCourse } from '@features/course/services/course';
+import { CoreCourseHelper, CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreNavigator } from '@services/navigator';
@@ -46,7 +46,7 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
     protected currentPagePath = '';
     protected selectTabObserver: CoreEventObserver;
     protected firstTabName?: string;
-    protected module?: CoreCourseWSModule;
+    protected module?: CoreCourseModuleData;
     protected modParams?: Params;
     protected isGuest?: boolean;
     protected contentsTab: CoreTabsOutletTab = {
@@ -90,7 +90,7 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
         // Get params.
         this.course = CoreNavigator.getRouteParam('course');
         this.firstTabName = CoreNavigator.getRouteParam('selectedTab');
-        this.module = CoreNavigator.getRouteParam<CoreCourseWSModule>('module');
+        this.module = CoreNavigator.getRouteParam<CoreCourseModuleData>('module');
         this.modParams = CoreNavigator.getRouteParam<Params>('modParams');
         this.isGuest = CoreNavigator.getRouteBooleanParam('isGuest');
 
diff --git a/src/core/features/course/pages/module-preview/module-preview.page.ts b/src/core/features/course/pages/module-preview/module-preview.page.ts
index 01b58cbe6..620b1f981 100644
--- a/src/core/features/course/pages/module-preview/module-preview.page.ts
+++ b/src/core/features/course/pages/module-preview/module-preview.page.ts
@@ -14,7 +14,7 @@
 
 import { Component, OnInit } from '@angular/core';
 import { CoreCourse } from '@features/course/services/course';
-import { CoreCourseHelper, CoreCourseModule, CoreCourseSection } from '@features/course/services/course-helper';
+import { CoreCourseHelper, CoreCourseModuleData, CoreCourseSection } from '@features/course/services/course-helper';
 import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate';
 import { IonRefresher } from '@ionic/angular';
 import { CoreNavigator } from '@services/navigator';
@@ -31,7 +31,7 @@ import { CoreUtils } from '@services/utils/utils';
 export class CoreCourseModulePreviewPage implements OnInit {
 
     title!: string;
-    module!: CoreCourseModule;
+    module!: CoreCourseModuleData;
     section?: CoreCourseSection; // The section the module belongs to.
     courseId!: number;
     loaded = false;
@@ -45,7 +45,7 @@ export class CoreCourseModulePreviewPage implements OnInit {
      */
     async ngOnInit(): Promise<void> {
         try {
-            this.module = CoreNavigator.getRequiredRouteParam<CoreCourseModule>('module');
+            this.module = CoreNavigator.getRequiredRouteParam<CoreCourseModuleData>('module');
             this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
             this.section = CoreNavigator.getRouteParam<CoreCourseSection>('section');
         } catch (error) {
@@ -73,8 +73,6 @@ export class CoreCourseModulePreviewPage implements OnInit {
             this.module = await CoreCourse.getModule(this.module.id, this.courseId);
         }
 
-        CoreCourseHelper.calculateModuleCompletionData(this.module);
-
         await CoreCourseHelper.loadModuleOfflineCompletion(this.courseId, this.module);
 
         this.unsupported = !CoreCourseModuleDelegate.getHandlerName(this.module.modname);
diff --git a/src/core/features/course/services/course-helper.ts b/src/core/features/course/services/course-helper.ts
index e254f5b2f..733d4a843 100644
--- a/src/core/features/course/services/course-helper.ts
+++ b/src/core/features/course/services/course-helper.ts
@@ -22,11 +22,11 @@ import {
     CoreCourseCompletionActivityStatus,
     CoreCourseModuleWSCompletionData,
     CoreCourseModuleContentFile,
-    CoreCourseWSModule,
     CoreCourseProvider,
     CoreCourseWSSection,
     CoreCourseModuleCompletionTracking,
     CoreCourseModuleCompletionStatus,
+    CoreCourseGetContentsWSModule,
 } from './course';
 import { CoreConstants } from '@/core/constants';
 import { CoreLogger } from '@singletons/logger';
@@ -176,18 +176,16 @@ export class CoreCourseHelperProvider {
         forCoursePage = false,
     ): { hasContent: boolean; sections: CoreCourseSection[] } {
 
-        const formattedSections: CoreCourseSection[] = sections;
         let hasContent = false;
 
-        formattedSections.forEach((section) => {
-            if (!section || !section.modules) {
-                return;
-            }
-
-            section.hasContent = this.sectionHasContent(section);
+        const formattedSections = sections.map<CoreCourseSection>((courseSection) => {
+            const section = {
+                ...courseSection,
+                hasContent: this.sectionHasContent(courseSection),
+            };
 
             if (!section.hasContent) {
-                return;
+                return section;
             }
 
             hasContent = true;
@@ -201,9 +199,7 @@ export class CoreCourseHelperProvider {
                     forCoursePage,
                 );
 
-                if (module.completiondata) {
-                    this.calculateModuleCompletionData(module, undefined, courseName);
-                } else if (completionStatus && completionStatus[module.id] !== undefined) {
+                if (!module.completiondata && completionStatus && completionStatus[module.id] !== undefined) {
                     // Should not happen on > 3.6. Check if activity has completions and if it's marked.
                     const activityStatus = completionStatus[module.id];
 
@@ -222,6 +218,8 @@ export class CoreCourseHelperProvider {
                 // Check if the module is stealth.
                 module.isStealth = module.visibleoncoursepage === 0 || (!!module.visible && !section.visible);
             });
+
+            return section;
         });
 
         return { hasContent, sections: formattedSections };
@@ -230,11 +228,10 @@ export class CoreCourseHelperProvider {
     /**
      * Calculate completion data of a module.
      *
+     * @deprecated since 4.0.
      * @param module Module.
-     * @param courseId Not used since 4.0
-     * @param courseName Course name.
      */
-    calculateModuleCompletionData(module: CoreCourseModule, courseId?: number, courseName?: string): void {
+    calculateModuleCompletionData(module: CoreCourseModuleData): void {
         if (!module.completiondata || !module.completion) {
             return;
         }
@@ -242,7 +239,6 @@ export class CoreCourseHelperProvider {
         module.completiondata.courseId = module.course;
         module.completiondata.tracking = module.completion;
         module.completiondata.cmid = module.id;
-        module.completiondata.courseName = courseName;
     }
 
     /**
@@ -497,7 +493,7 @@ export class CoreCourseHelperProvider {
      * @param done Function to call when done. It will close the context menu.
      * @return Promise resolved when done.
      */
-    async confirmAndRemoveFiles(module: CoreCourseWSModule, courseId: number, done?: () => void): Promise<void> {
+    async confirmAndRemoveFiles(module: CoreCourseModuleData, courseId: number, done?: () => void): Promise<void> {
         let modal: CoreIonLoadingElement | undefined;
 
         try {
@@ -586,7 +582,7 @@ export class CoreCourseHelperProvider {
      */
     async contextMenuPrefetch(
         instance: ComponentWithContextMenu,
-        module: CoreCourseWSModule,
+        module: CoreCourseModuleData,
         courseId: number,
         done?: () => void,
     ): Promise<void> {
@@ -718,7 +714,7 @@ export class CoreCourseHelperProvider {
      * @return Resolved on success.
      */
     async downloadModuleAndOpenFile(
-        module: CoreCourseWSModule,
+        module: CoreCourseModuleData,
         courseId: number,
         component?: string,
         componentId?: string | number,
@@ -810,7 +806,7 @@ export class CoreCourseHelperProvider {
     protected async openModuleFileInBrowser(
         fileUrl: string,
         site: CoreSite,
-        module: CoreCourseWSModule,
+        module: CoreCourseModuleData,
         courseId: number,
         component?: string,
         componentId?: string | number,
@@ -861,7 +857,7 @@ export class CoreCourseHelperProvider {
      * @return Promise resolved when done.
      */
     async downloadModuleWithMainFileIfNeeded(
-        module: CoreCourseWSModule,
+        module: CoreCourseModuleData,
         courseId: number,
         component: string,
         componentId?: string | number,
@@ -944,7 +940,7 @@ export class CoreCourseHelperProvider {
      * @return Promise resolved when done.
      */
     protected async downloadModuleWithMainFile(
-        module: CoreCourseWSModule,
+        module: CoreCourseModuleData,
         courseId: number,
         fixedUrl: string,
         files: CoreCourseModuleContentFile[],
@@ -1009,7 +1005,7 @@ export class CoreCourseHelperProvider {
      * @return Promise resolved when done.
      */
     async downloadModule(
-        module: CoreCourseWSModule,
+        module: CoreCourseModuleData,
         courseId: number,
         component?: string,
         componentId?: string | number,
@@ -1047,7 +1043,7 @@ export class CoreCourseHelperProvider {
      */
     async fillContextMenu(
         instance: ComponentWithContextMenu,
-        module: CoreCourseWSModule,
+        module: CoreCourseModuleData,
         courseId: number,
         invalidateCache?: boolean,
         component?: string,
@@ -1230,7 +1226,7 @@ export class CoreCourseHelperProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when done.
      */
-    async loadOfflineCompletion(courseId: number, sections: CoreCourseSection[], siteId?: string): Promise<void> {
+    async loadOfflineCompletion(courseId: number, sections: CoreCourseWSSection[], siteId?: string): Promise<void> {
         const offlineCompletions = await CoreCourseOffline.getCourseManualCompletions(courseId, siteId);
 
         if (!offlineCompletions || !offlineCompletions.length) {
@@ -1278,7 +1274,7 @@ export class CoreCourseHelperProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when done.
      */
-    async loadModuleOfflineCompletion(courseId: number, module: CoreCourseModule, siteId?: string): Promise<void> {
+    async loadModuleOfflineCompletion(courseId: number, module: CoreCourseModuleData, siteId?: string): Promise<void> {
         if (!module.completiondata) {
             return;
         }
@@ -1464,7 +1460,7 @@ export class CoreCourseHelperProvider {
      * @return Promise resolved with the info.
      */
     async getModulePrefetchInfo(
-        module: CoreCourseWSModule,
+        module: CoreCourseModuleData,
         courseId: number,
         invalidateCache?: boolean,
         component?: string,
@@ -1634,7 +1630,7 @@ export class CoreCourseHelperProvider {
             const site = await CoreSites.getSite(siteId);
 
             // Get the module.
-            const module = <CoreCourseModule>
+            const module = <CoreCourseModuleData>
                 await CoreCourse.getModule(moduleId, courseId, sectionId, false, false, siteId, modName);
 
             if (CoreSites.getCurrentSiteId() == site.getId()) {
@@ -1693,7 +1689,7 @@ export class CoreCourseHelperProvider {
      * @param modParams Params to pass to the module
      * @param True if module can be opened, false otherwise.
      */
-    async openModule(module: CoreCourseModule, courseId: number, sectionId?: number, modParams?: Params): Promise<boolean> {
+    async openModule(module: CoreCourseModuleData, courseId: number, sectionId?: number, modParams?: Params): Promise<boolean> {
         if (!module.handlerData) {
             module.handlerData = await CoreCourseModuleDelegate.getModuleDataFor(
                 module.modname,
@@ -1749,7 +1745,7 @@ export class CoreCourseHelperProvider {
             const promises: Promise<unknown>[] = [];
 
             // Prefetch all the sections. If the first section is "All sections", use it. Otherwise, use a fake "All sections".
-            let allSectionsSection: CoreCourseSection = sections[0];
+            let allSectionsSection: CoreCourseWSSection = sections[0];
             if (sections[0].id != CoreCourseProvider.ALL_SECTIONS_ID) {
                 allSectionsSection = this.createAllSectionsSection();
             }
@@ -1806,7 +1802,7 @@ export class CoreCourseHelperProvider {
      */
     async prefetchModule(
         handler: CoreCourseModulePrefetchHandler,
-        module: CoreCourseWSModule,
+        module: CoreCourseModuleData,
         size: CoreFileSizeSum,
         courseId: number,
         refresh?: boolean,
@@ -1984,6 +1980,10 @@ export class CoreCourseHelperProvider {
      * @return Whether the section has content.
      */
     sectionHasContent(section: CoreCourseWSSection): boolean {
+        if (!section.modules) {
+            return false;
+        }
+
         if (section.hiddenbynumsections) {
             return false;
         }
@@ -2042,7 +2042,7 @@ export class CoreCourseHelperProvider {
      * @param courseId Course ID the module belongs to.
      * @return Promise resolved when done.
      */
-    async removeModuleStoredData(module: CoreCourseWSModule, courseId: number): Promise<void> {
+    async removeModuleStoredData(module: CoreCourseModuleData, courseId: number): Promise<void> {
         const promises: Promise<void>[] = [];
 
         promises.push(CoreCourseModulePrefetchDelegate.removeModuleFiles(module, courseId));
@@ -2088,7 +2088,7 @@ export class CoreCourseHelperProvider {
             const response = await CoreCourse.markCompletedManually(
                 completion.cmid,
                 completion.state === CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE,
-                completion.courseId!,
+                completion.courseId,
             );
 
             if (response.offline) {
@@ -2115,9 +2115,8 @@ export const CoreCourseHelper = makeSingleton(CoreCourseHelperProvider);
 /**
  * Section with calculated data.
  */
-export type CoreCourseSection = Omit<CoreCourseWSSection, 'modules'> & {
+export type CoreCourseSection = CoreCourseWSSection & {
     hasContent?: boolean;
-    modules: CoreCourseModule[];
 };
 
 /**
@@ -2135,20 +2134,27 @@ export type CoreCourseSectionWithStatus = CoreCourseSection & {
 /**
  * Module with calculated data.
  */
-export type CoreCourseModule = Omit<CoreCourseWSModule, 'completiondata'> & {
+export type CoreCourseModuleData = Omit<CoreCourseGetContentsWSModule, 'completiondata'> & {
+    course: number; // The course id.
     isStealth?: boolean;
     handlerData?: CoreCourseModuleHandlerData;
     completiondata?: CoreCourseModuleCompletionData;
 };
 
+/**
+ * Module with calculated data.
+ *
+ * @deprecated since 4.0. Use CoreCourseModuleData instead.
+ */
+export type CoreCourseModule = CoreCourseModuleData;
+
 /**
  * Module completion with calculated data.
  */
 export type CoreCourseModuleCompletionData = CoreCourseModuleWSCompletionData & {
-    courseId?: number;
-    courseName?: string;
-    tracking?: CoreCourseModuleCompletionTracking;
-    cmid?: number;
+    courseId: number;
+    tracking: CoreCourseModuleCompletionTracking;
+    cmid: number;
     offline?: boolean;
 };
 
diff --git a/src/core/features/course/services/course.ts b/src/core/features/course/services/course.ts
index c8da4ec5f..55e848c58 100644
--- a/src/core/features/course/services/course.ts
+++ b/src/core/features/course/services/course.ts
@@ -36,7 +36,7 @@ import {
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreWSError } from '@classes/errors/wserror';
 import { CorePushNotifications } from '@features/pushnotifications/services/pushnotifications';
-import { CoreCourseHelper, CoreCourseModuleCompletionData } from './course-helper';
+import { CoreCourseHelper, CoreCourseModuleData, CoreCourseModuleCompletionData } from './course-helper';
 import { CoreCourseFormatDelegate } from './format-delegate';
 import { CoreCronDelegate } from '@services/cron';
 import { CoreCourseLogCronHandler } from './handlers/log-cron';
@@ -431,7 +431,7 @@ export class CoreCourseProvider {
         ignoreCache: boolean = false,
         siteId?: string,
         modName?: string,
-    ): Promise<CoreCourseWSModule> {
+    ): Promise<CoreCourseModuleData> {
         siteId = siteId || CoreSites.getCurrentSiteId();
 
         // Helper function to do the WS request without processing the result.
@@ -544,15 +544,43 @@ export class CoreCourseProvider {
         });
 
         if (foundSection && foundModule) {
-            return {
-                ...foundModule,
-                course: courseId,
-            };
+            return this.addAdditionalModuleData(foundModule, courseId);
         }
 
         throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
+    /**
+     * Add some additional info to course module.
+     *
+     * @param module Module.
+     * @param courseId Course ID of the module.
+     * @return Module with additional info.
+     */
+    protected  addAdditionalModuleData(
+        module: CoreCourseGetContentsWSModule,
+        courseId: number,
+    ): CoreCourseModuleData {
+        let completionData: CoreCourseModuleCompletionData | undefined = undefined;
+
+        if (module.completiondata && module.completion) {
+            completionData = {
+                ...module.completiondata,
+                tracking: module.completion,
+                cmid: module.id,
+                courseId,
+            };
+        }
+
+        const moduleWithCourse: CoreCourseModuleData = {
+            ...module,
+            course: courseId,
+            completiondata: completionData,
+        };
+
+        return moduleWithCourse;
+    }
+
     /**
      * Gets a module basic info by module ID.
      *
@@ -808,10 +836,7 @@ export class CoreCourseProvider {
         // Add course to all modules.
         return sections.map((section) => ({
             ...section,
-            modules: section.modules.map((module) => ({
-                ...module,
-                course: courseId,
-            })),
+            modules: section.modules.map((module) => this.addAdditionalModuleData(module, courseId)),
         }));
     }
 
@@ -831,12 +856,12 @@ export class CoreCourseProvider {
      * @param sections Sections.
      * @return Modules.
      */
-    getSectionsModules(sections: CoreCourseWSSection[]): CoreCourseWSModule[] {
+    getSectionsModules(sections: CoreCourseWSSection[]): CoreCourseModuleData[] {
         if (!sections || !sections.length) {
             return [];
         }
 
-        return sections.reduce((previous: CoreCourseWSModule[], section) => previous.concat(section.modules || []), []);
+        return sections.reduce((previous: CoreCourseModuleData[], section) => previous.concat(section.modules || []), []);
     }
 
     /**
@@ -1103,7 +1128,7 @@ export class CoreCourseProvider {
      * @param module The module object.
      * @return Whether the module has a view page.
      */
-    moduleHasView(module: CoreCourseModuleSummary | CoreCourseWSModule): boolean {
+    moduleHasView(module: CoreCourseModuleSummary | CoreCourseModuleData): boolean {
         if ('modname' in module) {
             // noviewlink was introduced in 3.8.5, use supports feature as a fallback.
             if (module.noviewlink ||
@@ -1503,7 +1528,7 @@ type CoreCourseGetContentsWSSection = {
 /**
  * Module data returned by core_course_get_contents WS.
  */
-type CoreCourseGetContentsWSModule = {
+export type CoreCourseGetContentsWSModule = {
     id: number; // Activity id.
     url?: string; // Activity url.
     name: string; // Activity module name.
@@ -1544,7 +1569,7 @@ type CoreCourseGetContentsWSModule = {
  * Data returned by core_course_get_contents WS.
  */
 export type CoreCourseWSSection = Omit<CoreCourseGetContentsWSSection, 'modules'> & {
-    modules: CoreCourseWSModule[]; // List of module.
+    modules: CoreCourseModuleData[]; // List of module.
 };
 
 /**
@@ -1572,6 +1597,8 @@ type CoreCourseGetCourseModuleWSResponse = {
 
 /**
  * Course module data returned by the WS with course added.
+ *
+ * @deprecated since 4.0. Use CoreCourseModuleData instead.
  */
 export type CoreCourseWSModule = CoreCourseGetContentsWSModule & {
     course: number; // The course id.
@@ -1703,6 +1730,6 @@ type CoreCompletionUpdateActivityCompletionStatusManuallyWSParams = {
 /**
  * Any of the possible module WS data.
  */
-export type CoreCourseAnyModuleData = CoreCourseWSModule | CoreCourseModuleBasicInfo & {
+export type CoreCourseAnyModuleData = CoreCourseModuleData | CoreCourseModuleBasicInfo & {
     contents?: CoreCourseModuleContentFile[]; // If needed, calculated in the app in loadModuleContents.
 };
diff --git a/src/core/features/course/services/handlers/default-module.ts b/src/core/features/course/services/handlers/default-module.ts
index 6e8cb25d6..13f40a844 100644
--- a/src/core/features/course/services/handlers/default-module.ts
+++ b/src/core/features/course/services/handlers/default-module.ts
@@ -17,7 +17,7 @@ import { Injectable, Type } from '@angular/core';
 import { CoreSites } from '@services/sites';
 import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '../module-delegate';
 import { CoreCourse } from '../course';
-import { CoreCourseModule } from '../course-helper';
+import { CoreCourseModuleData } from '../course-helper';
 import { CoreCourseUnsupportedModuleComponent } from '@features/course/components/unsupported-module/unsupported-module';
 import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
 
@@ -42,14 +42,14 @@ export class CoreCourseModuleDefaultHandler implements CoreCourseModuleHandler {
      * @inheritdoc
      */
     async getData(
-        module: CoreCourseModule,
+        module: CoreCourseModuleData,
     ): Promise<CoreCourseModuleHandlerData> {
         // Return the default data.
         const defaultData: CoreCourseModuleHandlerData = {
             icon: await CoreCourse.getModuleIconSrc(module.modname, module.modicon),
             title: module.name,
             class: 'core-course-default-handler core-course-module-' + module.modname + '-handler',
-            action: async (event: Event, module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions) => {
+            action: async (event: Event, module: CoreCourseModuleData, courseId: number, options?: CoreNavigationOptions) => {
                 event.preventDefault();
                 event.stopPropagation();
 
@@ -92,7 +92,7 @@ export class CoreCourseModuleDefaultHandler implements CoreCourseModuleHandler {
     /**
      * @inheritdoc
      */
-    async openActivityPage(module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions): Promise<void> {
+    async openActivityPage(module: CoreCourseModuleData, courseId: number, options?: CoreNavigationOptions): Promise<void> {
         options = options || {};
         options.params = options.params || {};
         Object.assign(options.params, { module });
diff --git a/src/core/features/course/services/module-delegate.ts b/src/core/features/course/services/module-delegate.ts
index 2776043ff..d32c1be3e 100644
--- a/src/core/features/course/services/module-delegate.ts
+++ b/src/core/features/course/services/module-delegate.ts
@@ -20,10 +20,10 @@ import { CoreSite } from '@classes/site';
 import { CoreCourseModuleDefaultHandler } from './handlers/default-module';
 import { CoreDelegate, CoreDelegateHandler } from '@classes/delegate';
 import { CoreCourseAnyCourseData } from '@features/courses/services/courses';
-import { CoreCourse, CoreCourseWSModule } from './course';
+import { CoreCourse } from './course';
 import { CoreSites } from '@services/sites';
 import { makeSingleton } from '@singletons';
-import { CoreCourseModule } from './course-helper';
+import { CoreCourseModuleData } from './course-helper';
 import { CoreNavigationOptions } from '@services/navigator';
 
 /**
@@ -52,7 +52,7 @@ export interface CoreCourseModuleHandler extends CoreDelegateHandler {
      * @return Data to render the module.
      */
     getData(
-        module: CoreCourseModule,
+        module: CoreCourseModuleData,
         courseId: number,
         sectionId?: number,
         forCoursePage?: boolean,
@@ -67,7 +67,7 @@ export interface CoreCourseModuleHandler extends CoreDelegateHandler {
      * @param module The module object.
      * @return Promise resolved with component to use, undefined if not found.
      */
-    getMainComponent(course: CoreCourseAnyCourseData, module: CoreCourseWSModule): Promise<Type<unknown> | undefined>;
+    getMainComponent(course: CoreCourseAnyCourseData, module: CoreCourseModuleData): Promise<Type<unknown> | undefined>;
 
     /**
      * Whether to display the course refresher in single activity course format. If it returns false, a refresher must be
@@ -83,7 +83,7 @@ export interface CoreCourseModuleHandler extends CoreDelegateHandler {
      * @param module: Module to get the icon from.
      * @return The icon src.
      */
-    getIconSrc?(module?: CoreCourseWSModule): Promise<string | undefined> | string | undefined;
+    getIconSrc?(module?: CoreCourseModuleData): Promise<string | undefined> | string | undefined;
 
     /**
      * Check if this type of module supports a certain feature.
@@ -101,7 +101,7 @@ export interface CoreCourseModuleHandler extends CoreDelegateHandler {
      * @param module Module.
      * @return Promise resolved with boolean: whether the manual completion should always be displayed.
      */
-    manualCompletionAlwaysShown?(module: CoreCourseModule): Promise<boolean>;
+    manualCompletionAlwaysShown?(module: CoreCourseModuleData): Promise<boolean>;
 
     /**
      * Opens the activity page.
@@ -111,7 +111,7 @@ export interface CoreCourseModuleHandler extends CoreDelegateHandler {
      * @param options Options for the navigation.
      * @return Promise resolved when done.
      */
-    openActivityPage(module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions): Promise<void>;
+    openActivityPage(module: CoreCourseModuleData, courseId: number, options?: CoreNavigationOptions): Promise<void>;
 }
 
 /**
@@ -179,7 +179,7 @@ export interface CoreCourseModuleHandlerData {
      * @param options Options for the navigation.
      * @return Promise resolved when done.
      */
-    action?(event: Event, module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions): Promise<void> | void;
+    action?(event: Event, module: CoreCourseModuleData, courseId: number, options?: CoreNavigationOptions): Promise<void> | void;
 
     /**
      * Updates the status of the module.
@@ -250,7 +250,7 @@ export interface CoreCourseModuleHandlerButton {
      * @param options Options for the navigation.
      * @return Promise resolved when done.
      */
-    action(event: Event, module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions): Promise<void> | void;
+    action(event: Event, module: CoreCourseModuleData, courseId: number, options?: CoreNavigationOptions): Promise<void> | void;
 }
 
 /**
@@ -273,7 +273,7 @@ export class CoreCourseModuleDelegateService extends CoreDelegate<CoreCourseModu
      * @param module The module object.
      * @return Promise resolved with component to use, undefined if not found.
      */
-    async getMainComponent(course: CoreCourseAnyCourseData, module: CoreCourseWSModule): Promise<Type<unknown> | undefined> {
+    async getMainComponent(course: CoreCourseAnyCourseData, module: CoreCourseModuleData): Promise<Type<unknown> | undefined> {
         try {
             return await this.executeFunctionOnEnabled<Type<unknown>>(module.modname, 'getMainComponent', [course, module]);
         } catch (error) {
@@ -293,7 +293,7 @@ export class CoreCourseModuleDelegateService extends CoreDelegate<CoreCourseModu
      */
     async getModuleDataFor(
         modname: string,
-        module: CoreCourseModule,
+        module: CoreCourseModuleData,
         courseId: number,
         sectionId?: number,
         forCoursePage?: boolean,
@@ -315,7 +315,7 @@ export class CoreCourseModuleDelegateService extends CoreDelegate<CoreCourseModu
      */
     async openActivityPage(
         modname: string,
-        module: CoreCourseModule,
+        module: CoreCourseModuleData,
         courseId: number,
         options?: CoreNavigationOptions,
     ): Promise<void> {
@@ -381,7 +381,7 @@ export class CoreCourseModuleDelegateService extends CoreDelegate<CoreCourseModu
      * @param module The module to use.
      * @return Promise resolved with the icon src.
      */
-    async getModuleIconSrc(modname: string, modicon?: string, module?: CoreCourseWSModule): Promise<string> {
+    async getModuleIconSrc(modname: string, modicon?: string, module?: CoreCourseModuleData): Promise<string> {
         const icon = await this.executeFunctionOnEnabled<Promise<string>>(modname, 'getIconSrc', [module]);
 
         return icon || await CoreCourse.getModuleIconSrc(modname, modicon) || '';
@@ -419,7 +419,7 @@ export class CoreCourseModuleDelegateService extends CoreDelegate<CoreCourseModu
      * @param module Module.
      * @return Promise resolved with boolean: whether the manual completion should always be displayed.
      */
-    async manualCompletionAlwaysShown(module: CoreCourseModule): Promise<boolean> {
+    async manualCompletionAlwaysShown(module: CoreCourseModuleData): Promise<boolean> {
         const result = await this.executeFunctionOnEnabled<boolean>(module.modname, 'manualCompletionAlwaysShown', [module]);
 
         return !!result;
diff --git a/src/core/features/course/services/module-prefetch-delegate.ts b/src/core/features/course/services/module-prefetch-delegate.ts
index e1166739b..d1250decb 100644
--- a/src/core/features/course/services/module-prefetch-delegate.ts
+++ b/src/core/features/course/services/module-prefetch-delegate.ts
@@ -22,7 +22,7 @@ import { CoreFilepool } from '@services/filepool';
 import { CoreSites } from '@services/sites';
 import { CoreTimeUtils } from '@services/utils/time';
 import { CoreUtils } from '@services/utils/utils';
-import { CoreCourse, CoreCourseAnyModuleData, CoreCourseModuleContentFile, CoreCourseWSModule } from './course';
+import { CoreCourse, CoreCourseAnyModuleData, CoreCourseModuleContentFile } from './course';
 import { CoreCache } from '@classes/cache';
 import { CoreSiteWSPreSets } from '@classes/site';
 import { CoreConstants } from '@/core/constants';
@@ -33,6 +33,7 @@ import { CoreError } from '@classes/errors/error';
 import { CoreWSFile, CoreWSExternalWarning } from '@services/ws';
 import { CHECK_UPDATES_TIMES_TABLE, CoreCourseCheckUpdatesDBRecord } from './database/module-prefetch';
 import { CoreFileSizeSum } from '@services/plugin-file-delegate';
+import { CoreCourseModuleData } from './course-helper';
 
 const ROOT_CACHE_KEY = 'mmCourse:';
 
@@ -123,7 +124,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
      * @param courseId Course ID the modules belong to.
      * @return Promise resolved with the lists.
      */
-    protected async createToCheckList(modules: CoreCourseWSModule[], courseId: number): Promise<ToCheckList> {
+    protected async createToCheckList(modules: CoreCourseModuleData[], courseId: number): Promise<ToCheckList> {
         const result: ToCheckList = {
             toCheck: [],
             cannotUse: [],
@@ -221,7 +222,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
      * @return Promise resolved with the updates. If a module is set to false, it means updates cannot be
      *         checked for that module in the current site.
      */
-    async getCourseUpdates(modules: CoreCourseWSModule[], courseId: number): Promise<CourseUpdates> {
+    async getCourseUpdates(modules: CoreCourseModuleData[], courseId: number): Promise<CourseUpdates> {
         // Check if there's already a getCourseUpdates in progress.
         const id = <string> Md5.hashAsciiStr(courseId + '#' + JSON.stringify(modules));
         const siteId = CoreSites.getCurrentSiteId();
@@ -253,7 +254,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
      *         checked for that module in the site.
      */
     protected async fetchCourseUpdates(
-        modules: CoreCourseWSModule[],
+        modules: CoreCourseModuleData[],
         courseId: number,
         siteId: string,
     ): Promise<CourseUpdates> {
@@ -351,7 +352,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
      * @param courseId Course ID the modules belong to.
      * @return Promise resolved with the size.
      */
-    async getDownloadSize(modules: CoreCourseWSModule[], courseId: number): Promise<CoreFileSizeSum> {
+    async getDownloadSize(modules: CoreCourseModuleData[], courseId: number): Promise<CoreFileSizeSum> {
         // Get the status of each module.
         const data = await this.getModulesStatus(modules, courseId);
 
@@ -683,7 +684,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
      * @return Promise resolved with the data.
      */
     async getModulesStatus(
-        modules: CoreCourseWSModule[],
+        modules: CoreCourseModuleData[],
         courseId: number,
         sectionId?: number,
         refresh?: boolean,
@@ -891,7 +892,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
      * @param courseId Course ID.
      * @return Promise resolved when modules are invalidated.
      */
-    async invalidateModules(modules: CoreCourseWSModule[], courseId: number): Promise<void> {
+    async invalidateModules(modules: CoreCourseModuleData[], courseId: number): Promise<void> {
 
         const promises = modules.map(async (module) => {
             const handler = this.getPrefetchHandlerFor(module);
@@ -1049,7 +1050,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
      * @param courseId Course ID the module belongs to.
      * @return Promise resolved when finished.
      */
-    syncModules(modules: CoreCourseWSModule[], courseId: number): Promise<unknown> {
+    syncModules(modules: CoreCourseModuleData[], courseId: number): Promise<unknown> {
         return Promise.all(modules.map(async (module) => {
             await this.syncModule(module, courseId);
 
@@ -1091,7 +1092,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
      */
     async prefetchModules(
         id: string,
-        modules: CoreCourseWSModule[],
+        modules: CoreCourseModuleData[],
         courseId: number,
         onProgress?: CoreCourseModulesProgressFunction,
     ): Promise<void> {
@@ -1512,7 +1513,7 @@ export interface CoreCourseModulePrefetchHandler extends CoreDelegateHandler {
 
 type ToCheckList = {
     toCheck: CheckUpdatesToCheckWSParam[];
-    cannotUse: CoreCourseWSModule[];
+    cannotUse: CoreCourseModuleData[];
 };
 
 /**
@@ -1526,10 +1527,10 @@ type CourseUpdates = Record<number, false | CheckUpdatesWSInstance>;
 export type CoreCourseModulesStatus = {
     total: number; // Number of modules.
     status: string; // Status of the list of modules.
-    [CoreConstants.NOT_DOWNLOADED]: CoreCourseWSModule[]; // Modules with state NOT_DOWNLOADED.
-    [CoreConstants.DOWNLOADED]: CoreCourseWSModule[]; // Modules with state DOWNLOADED.
-    [CoreConstants.DOWNLOADING]: CoreCourseWSModule[]; // Modules with state DOWNLOADING.
-    [CoreConstants.OUTDATED]: CoreCourseWSModule[]; // Modules with state OUTDATED.
+    [CoreConstants.NOT_DOWNLOADED]: CoreCourseModuleData[]; // Modules with state NOT_DOWNLOADED.
+    [CoreConstants.DOWNLOADED]: CoreCourseModuleData[]; // Modules with state DOWNLOADED.
+    [CoreConstants.DOWNLOADING]: CoreCourseModuleData[]; // Modules with state DOWNLOADING.
+    [CoreConstants.OUTDATED]: CoreCourseModuleData[]; // Modules with state OUTDATED.
 };
 
 /**
diff --git a/src/core/features/sitehome/pages/index/index.ts b/src/core/features/sitehome/pages/index/index.ts
index eae6406f8..8e9a4d6e7 100644
--- a/src/core/features/sitehome/pages/index/index.ts
+++ b/src/core/features/sitehome/pages/index/index.ts
@@ -17,14 +17,14 @@ import { IonRefresher } from '@ionic/angular';
 import { Params } from '@angular/router';
 
 import { CoreSite, CoreSiteConfig } from '@classes/site';
-import { CoreCourse, CoreCourseWSModule, CoreCourseWSSection } from '@features/course/services/course';
+import { CoreCourse, CoreCourseWSSection } from '@features/course/services/course';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreSites } from '@services/sites';
 import { CoreSiteHome } from '@features/sitehome/services/sitehome';
 import { CoreCourses, CoreCoursesProvider } from '@features//courses/services/courses';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
-import { CoreCourseHelper, CoreCourseModule } from '@features/course/services/course-helper';
-import { CoreCourseModuleDelegate, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
+import { CoreCourseHelper, CoreCourseModuleData } from '@features/course/services/course-helper';
+import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate';
 import { CoreCourseModulePrefetchDelegate } from '@features/course/services/module-prefetch-delegate';
 import { CoreNavigator } from '@services/navigator';
 import { CoreBlockHelper } from '@features/block/services/block-helper';
@@ -52,7 +52,7 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
     searchEnabled = false;
     displayEnableDownload = false;
     downloadEnabled = false;
-    newsForumModule?: NewsForum;
+    newsForumModule?: CoreCourseModuleData;
 
     protected updateSiteObserver: CoreEventObserver;
     protected downloadEnabledObserver: CoreEventObserver;
@@ -79,7 +79,7 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
         this.currentSite = CoreSites.getRequiredCurrentSite();
         this.siteHomeId = CoreSites.getCurrentSiteHomeId();
 
-        const module = CoreNavigator.getRouteParam<CoreCourseModule>('module');
+        const module = CoreNavigator.getRouteParam<CoreCourseModuleData>('module');
         if (module) {
             const modParams = CoreNavigator.getRouteParam<Params>('modParams');
             CoreCourseHelper.openModule(module, this.siteHomeId, undefined, modParams);
@@ -235,7 +235,3 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
     }
 
 }
-
-type NewsForum = CoreCourseWSModule & {
-    handlerData?: CoreCourseModuleHandlerData;
-};
diff --git a/src/core/features/siteplugins/classes/handlers/module-handler.ts b/src/core/features/siteplugins/classes/handlers/module-handler.ts
index 9a945b48a..8e0e95d9b 100644
--- a/src/core/features/siteplugins/classes/handlers/module-handler.ts
+++ b/src/core/features/siteplugins/classes/handlers/module-handler.ts
@@ -15,8 +15,8 @@
 import { Type } from '@angular/core';
 
 import { CoreConstants } from '@/core/constants';
-import { CoreCourse, CoreCourseAnyModuleData, CoreCourseWSModule } from '@features/course/services/course';
-import { CoreCourseModule } from '@features/course/services/course-helper';
+import { CoreCourse, CoreCourseAnyModuleData } from '@features/course/services/course';
+import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
 import { CoreSitePluginsModuleIndexComponent } from '@features/siteplugins/components/module-index/module-index';
 import {
@@ -94,7 +94,7 @@ export class CoreSitePluginsModuleHandler extends CoreSitePluginsBaseHandler imp
             // There is a method, add an action.
             handlerData.action = async (
                 event: Event,
-                module: CoreCourseModule,
+                module: CoreCourseModuleData,
                 courseId: number,
                 options?: CoreNavigationOptions,
             ) => {
@@ -190,7 +190,7 @@ export class CoreSitePluginsModuleHandler extends CoreSitePluginsBaseHandler imp
 
             // Use the html returned.
             handlerData.title = result.templates[0]?.html ?? '';
-            (<CoreCourseWSModule> module).description = '';
+            (<CoreCourseModuleData> module).description = '';
         } catch (error) {
             this.logger.error('Error calling course page method:', error);
         } finally {
@@ -215,7 +215,7 @@ export class CoreSitePluginsModuleHandler extends CoreSitePluginsBaseHandler imp
     /**
      * @inheritdoc
      */
-    async manualCompletionAlwaysShown(module: CoreCourseModule): Promise<boolean> {
+    async manualCompletionAlwaysShown(module: CoreCourseModuleData): Promise<boolean> {
         if (this.handlerSchema.manualcompletionalwaysshown !== undefined) {
             return this.handlerSchema.manualcompletionalwaysshown;
         }
@@ -231,7 +231,7 @@ export class CoreSitePluginsModuleHandler extends CoreSitePluginsBaseHandler imp
     /**
      * @inheritdoc
      */
-    async openActivityPage(module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions): Promise<void> {
+    async openActivityPage(module: CoreCourseModuleData, courseId: number, options?: CoreNavigationOptions): Promise<void> {
         if (!CoreCourse.moduleHasView(module)) {
             return;
         }
diff --git a/src/core/features/siteplugins/components/module-index/module-index.ts b/src/core/features/siteplugins/components/module-index/module-index.ts
index 499458d36..7858a0db1 100644
--- a/src/core/features/siteplugins/components/module-index/module-index.ts
+++ b/src/core/features/siteplugins/components/module-index/module-index.ts
@@ -16,7 +16,7 @@ import { CoreConstants } from '@/core/constants';
 import { Component, OnInit, OnDestroy, Input, ViewChild } from '@angular/core';
 
 import { CoreSiteWSPreSets } from '@classes/site';
-import { CoreCourseHelper, CoreCourseModule } from '@features/course/services/course-helper';
+import { CoreCourseHelper, CoreCourseModuleData } from '@features/course/services/course-helper';
 import {
     CoreCourseModuleDelegate,
     CoreCourseModuleMainComponent,
@@ -44,7 +44,7 @@ import { CoreSitePluginsPluginContentComponent } from '../plugin-content/plugin-
 })
 export class CoreSitePluginsModuleIndexComponent implements OnInit, OnDestroy, CoreCourseModuleMainComponent {
 
-    @Input() module!: CoreCourseModule; // The module.
+    @Input() module!: CoreCourseModuleData; // The module.
     @Input() courseId!: number; // Course ID the module belongs to.
     @Input() pageTitle?: string; // Current page title. It can be used by the "new-content" directives.
 
diff --git a/src/core/features/siteplugins/pages/module-index/module-index.ts b/src/core/features/siteplugins/pages/module-index/module-index.ts
index 5a8c07f4d..653d88a1e 100644
--- a/src/core/features/siteplugins/pages/module-index/module-index.ts
+++ b/src/core/features/siteplugins/pages/module-index/module-index.ts
@@ -15,7 +15,7 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { IonRefresher } from '@ionic/angular';
 
-import { CoreCourseModule } from '@features/course/services/course-helper';
+import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CanLeave } from '@guards/can-leave';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSitePluginsModuleIndexComponent } from '../../components/module-index/module-index';
@@ -32,7 +32,7 @@ export class CoreSitePluginsModuleIndexPage implements OnInit, CanLeave {
     @ViewChild(CoreSitePluginsModuleIndexComponent) content?: CoreSitePluginsModuleIndexComponent;
 
     title?: string; // Page title.
-    module?: CoreCourseModule;
+    module?: CoreCourseModuleData;
     courseId?: number;
 
     /**

From 5794b66cd95a503f932b473af20e3b3e9078a1f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 16 Dec 2021 13:30:33 +0100
Subject: [PATCH 0298/1008] MOBILE-3833 completion: Remove course name from
 completion objects

---
 .../course/pages/contents/contents.ts         |  5 +++-
 .../features/course/services/course-helper.ts |  3 +-
 .../course/services/course-offline.ts         |  3 +-
 src/core/features/course/services/course.ts   |  4 +--
 .../course/services/database/course.ts        |  3 +-
 src/core/features/course/services/sync.ts     | 30 +++++++++++++------
 6 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/src/core/features/course/pages/contents/contents.ts b/src/core/features/course/pages/contents/contents.ts
index 69bbfe521..768cfc65f 100644
--- a/src/core/features/course/pages/contents/contents.ts
+++ b/src/core/features/course/pages/contents/contents.ts
@@ -256,7 +256,10 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
         if (sync) {
             // Try to synchronize the course data.
             // For now we don't allow manual syncing, so ignore errors.
-            const result = await CoreUtils.ignoreErrors(CoreCourseSync.syncCourse(this.course.id));
+            const result = await CoreUtils.ignoreErrors(CoreCourseSync.syncCourse(
+                this.course.id,
+                this.course.displayname || this.course.fullname,
+            ));
             if (result?.warnings?.length) {
                 CoreDomUtils.showErrorModal(result.warnings[0]);
             }
diff --git a/src/core/features/course/services/course-helper.ts b/src/core/features/course/services/course-helper.ts
index 733d4a843..53ff749db 100644
--- a/src/core/features/course/services/course-helper.ts
+++ b/src/core/features/course/services/course-helper.ts
@@ -164,7 +164,7 @@ export class CoreCourseHelperProvider {
      * @param sections List of sections to treat modules.
      * @param courseId Course ID of the modules.
      * @param completionStatus List of completion status.
-     * @param courseName Course name. Recommended if completionStatus is supplied.
+     * @param courseName Not used since 4.0
      * @param forCoursePage Whether the data will be used to render the course page.
      * @return Whether the sections have content.
      */
@@ -210,7 +210,6 @@ export class CoreCourseHelperProvider {
                         valueused: activityStatus.valueused,
                         tracking: activityStatus.tracking,
                         courseId,
-                        courseName,
                         cmid: module.id,
                     };
                 }
diff --git a/src/core/features/course/services/course-offline.ts b/src/core/features/course/services/course-offline.ts
index d6ae57611..033c9f551 100644
--- a/src/core/features/course/services/course-offline.ts
+++ b/src/core/features/course/services/course-offline.ts
@@ -81,7 +81,7 @@ export class CoreCourseOfflineProvider {
      * @param cmId The module ID to store the completion.
      * @param completed Whether the module is completed or not.
      * @param courseId Course ID the module belongs to.
-     * @param courseName Course name. Recommended, it is used to display a better warning message.
+     * @param courseName Not used since 4.0.
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when completion is successfully stored.
      */
@@ -99,7 +99,6 @@ export class CoreCourseOfflineProvider {
             cmid: cmId,
             completed: completed ? 1 : 0,
             courseid: courseId,
-            coursename: courseName || '',
             timecompleted: Date.now(),
         };
         await site.getDb().insertRecord(MANUAL_COMPLETION_TABLE, entry);
diff --git a/src/core/features/course/services/course.ts b/src/core/features/course/services/course.ts
index 55e848c58..279750440 100644
--- a/src/core/features/course/services/course.ts
+++ b/src/core/features/course/services/course.ts
@@ -1041,7 +1041,7 @@ export class CoreCourseProvider {
      * @param cmId The module ID.
      * @param completed Whether the module is completed or not.
      * @param courseId Course ID the module belongs to.
-     * @param courseName Course name. Recommended, it is used to display a better warning message.
+     * @param courseName Not used since 4.0.
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when completion is successfully sent or stored.
      */
@@ -1057,7 +1057,7 @@ export class CoreCourseProvider {
 
         // Convenience function to store a completion to be synchronized later.
         const storeOffline = (): Promise<CoreStatusWithWarningsWSResponse> =>
-            CoreCourseOffline.markCompletedManually(cmId, completed, courseId, courseName, siteId);
+            CoreCourseOffline.markCompletedManually(cmId, completed, courseId, undefined, siteId);
 
         // The offline function requires a courseId and it could be missing because it's a calculated field.
         if (!CoreApp.isOnline()) {
diff --git a/src/core/features/course/services/database/course.ts b/src/core/features/course/services/database/course.ts
index db0305c68..7869b8a55 100644
--- a/src/core/features/course/services/database/course.ts
+++ b/src/core/features/course/services/database/course.ts
@@ -81,7 +81,7 @@ export const OFFLINE_SITE_SCHEMA: CoreSiteSchema = {
                     type: 'INTEGER',
                 },
                 {
-                    name: 'coursename',
+                    name: 'coursename', // Not used  since 4.0 it can be safely removed.
                     type: 'TEXT',
                 },
                 {
@@ -106,6 +106,5 @@ export type CoreCourseManualCompletionDBRecord = {
     cmid: number;
     completed: number;
     courseid: number;
-    coursename: string;
     timecompleted: number;
 };
diff --git a/src/core/features/course/services/sync.ts b/src/core/features/course/services/sync.ts
index 3b29dc151..9d3899dba 100644
--- a/src/core/features/course/services/sync.ts
+++ b/src/core/features/course/services/sync.ts
@@ -28,6 +28,7 @@ import { CoreCourseManualCompletionDBRecord } from './database/course';
 import { CoreNetworkError } from '@classes/errors/network-error';
 import { makeSingleton, Translate } from '@singletons';
 import { CoreEvents } from '@singletons/events';
+import { CoreCourses } from '@features/courses/services/courses';
 
 /**
  * Service to sync course offline data. This only syncs the offline data of the course itself, not the offline data of
@@ -77,10 +78,18 @@ export class CoreCourseSyncProvider extends CoreSyncBaseProvider<CoreCourseSyncR
     protected async syncCoursesCompletion(siteId: string, force: boolean): Promise<void> {
         const completions = await CoreCourseOffline.getAllManualCompletions(siteId);
 
+        const courseNames: Record<number, string | undefined> = {};
+
         // Sync all courses.
         await Promise.all(completions.map(async (completion) => {
-            const result = await (force ? this.syncCourse(completion.courseid, siteId) :
-                this.syncCourseIfNeeded(completion.courseid, siteId));
+            if (courseNames[completion.courseid] === undefined) {
+                const course = await CoreUtils.ignoreErrors(CoreCourses.getUserCourse(completion.courseid, true, siteId));
+
+                courseNames[completion.courseid] = course?.displayname || course?.fullname;
+            }
+
+            const result = await (force ? this.syncCourse(completion.courseid, courseNames[completion.courseid], siteId) :
+                this.syncCourseIfNeeded(completion.courseid, courseNames[completion.courseid], siteId));
 
             if (!result || !result.updated) {
                 return;
@@ -98,23 +107,25 @@ export class CoreCourseSyncProvider extends CoreSyncBaseProvider<CoreCourseSyncR
      * Sync a course if it's needed.
      *
      * @param courseId Course ID to be synced.
+     * @param courseName Course Name to be synced.
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when the course is synced or it doesn't need to be synced.
      */
-    syncCourseIfNeeded(courseId: number, siteId?: string): Promise<CoreCourseSyncResult> {
+    syncCourseIfNeeded(courseId: number, courseName?: string, siteId?: string): Promise<CoreCourseSyncResult> {
         // Usually we call isSyncNeeded to check if a certain time has passed.
         // However, since we barely send data for now just sync the course.
-        return this.syncCourse(courseId, siteId);
+        return this.syncCourse(courseId, courseName, siteId);
     }
 
     /**
      * Synchronize a course.
      *
      * @param courseId Course ID to be synced.
+     * @param courseName Course Name to be synced.
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved if sync is successful, rejected otherwise.
      */
-    async syncCourse(courseId: number, siteId?: string): Promise<CoreCourseSyncResult> {
+    async syncCourse(courseId: number, courseName?: string, siteId?: string): Promise<CoreCourseSyncResult> {
         siteId = siteId || CoreSites.getCurrentSiteId();
 
         const currentSyncPromise = this.getOngoingSync(courseId, siteId);
@@ -125,17 +136,18 @@ export class CoreCourseSyncProvider extends CoreSyncBaseProvider<CoreCourseSyncR
 
         this.logger.debug(`Try to sync course '${courseId}'`);
 
-        return this.addOngoingSync(courseId, this.syncCourseCompletion(courseId, siteId), siteId);
+        return this.addOngoingSync(courseId, this.syncCourseCompletion(courseId, courseName, siteId), siteId);
     }
 
     /**
      * Sync course offline completion.
      *
      * @param courseId Course ID to be synced.
+     * @param courseName Course Name to be synced.
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved if sync is successful, rejected otherwise.
      */
-    protected async syncCourseCompletion(courseId: number, siteId?: string): Promise<CoreCourseSyncResult> {
+    protected async syncCourseCompletion(courseId: number, courseName?: string, siteId?: string): Promise<CoreCourseSyncResult> {
         const result: CoreCourseSyncResult = {
             warnings: [],
             updated: false,
@@ -182,7 +194,7 @@ export class CoreCourseSyncProvider extends CoreSyncBaseProvider<CoreCourseSyncR
                 // Completion deleted, add a warning if the completion status doesn't match.
                 if (onlineComp.state != entry.completed) {
                     result.warnings.push(Translate.instant('core.course.warningofflinemanualcompletiondeleted', {
-                        name: entry.coursename || courseId,
+                        name: courseName || courseId,
                         error: Translate.instant('core.course.warningmanualcompletionmodified'),
                     }));
                 }
@@ -209,7 +221,7 @@ export class CoreCourseSyncProvider extends CoreSyncBaseProvider<CoreCourseSyncR
 
                 // Completion deleted, add a warning.
                 result.warnings.push(Translate.instant('core.course.warningofflinemanualcompletiondeleted', {
-                    name: entry.coursename || courseId,
+                    name: courseName || courseId,
                     error: CoreTextUtils.getErrorMessageFromError(error),
                 }));
             }

From 27c7a7a9524815293c08bb432330584b290d3b48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 16 Dec 2021 22:52:36 +0100
Subject: [PATCH 0299/1008] MOBILE-3833 course: Review course module optional
 property

---
 .../mod/assign/services/handlers/prefetch.ts  |  5 ++--
 .../mod/choice/services/handlers/prefetch.ts  |  2 +-
 .../mod/data/services/handlers/prefetch.ts    |  4 +--
 .../feedback/services/handlers/prefetch.ts    |  2 +-
 .../mod/folder/components/index/index.ts      |  2 +-
 .../mod/forum/services/handlers/prefetch.ts   |  4 +--
 .../glossary/services/handlers/prefetch.ts    |  2 +-
 .../mod/imscp/components/index/index.ts       |  2 +-
 .../mod/lesson/services/handlers/prefetch.ts  |  2 +-
 src/addons/mod/page/components/index/index.ts |  2 +-
 .../mod/quiz/services/handlers/prefetch.ts    |  2 +-
 .../mod/resource/components/index/index.ts    |  2 +-
 .../mod/resource/services/resource-helper.ts  |  2 +-
 .../mod/survey/services/handlers/prefetch.ts  |  2 +-
 src/addons/mod/url/components/index/index.ts  |  2 +-
 .../mod/wiki/services/handlers/prefetch.ts    |  7 ++---
 .../pages/edit-submission/edit-submission.ts  |  2 +-
 .../workshop/services/handlers/prefetch.ts    |  2 +-
 .../course/classes/main-activity-page.ts      |  6 ++--
 .../features/course/services/course-helper.ts | 30 +++----------------
 src/core/features/course/services/course.ts   | 14 ++++-----
 21 files changed, 37 insertions(+), 61 deletions(-)

diff --git a/src/addons/mod/assign/services/handlers/prefetch.ts b/src/addons/mod/assign/services/handlers/prefetch.ts
index 1f7d6e533..e9223ddf4 100644
--- a/src/addons/mod/assign/services/handlers/prefetch.ts
+++ b/src/addons/mod/assign/services/handlers/prefetch.ts
@@ -28,7 +28,6 @@ import { CoreCourseActivityPrefetchHandlerBase } from '@features/course/classes/
 import { CoreCourse, CoreCourseAnyModuleData, CoreCourseCommonModWSOptions } from '@features/course/services/course';
 import { CoreWSFile } from '@services/ws';
 import { AddonModAssignHelper, AddonModAssignSubmissionFormatted } from '../assign-helper';
-import { CoreCourseHelper } from '@features/course/services/course-helper';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreFilepool } from '@services/filepool';
 import { CoreGroups } from '@services/groups';
@@ -243,7 +242,7 @@ export class AddonModAssignPrefetchHandlerService extends CoreCourseActivityPref
 
         promises.push(this.prefetchSubmissions(assign, courseId, module.id, userId, siteId));
 
-        promises.push(CoreCourseHelper.getModuleCourseIdByInstance(assign.id, 'assign', siteId));
+        promises.push(CoreCourse.getModuleBasicInfoByInstance(assign.id, 'assign', siteId));
         // Get course data, needed to determine upload max size if it's configured to be course limit.
         promises.push(CoreUtils.ignoreErrors(CoreCourses.getCourseByField('id', courseId, siteId)));
 
@@ -515,7 +514,7 @@ export class AddonModAssignPrefetchHandlerService extends CoreCourseActivityPref
      * @return Promise resolved when done.
      */
     sync(module: CoreCourseAnyModuleData, courseId: number, siteId?: string): Promise<AddonModAssignSyncResult> {
-        return AddonModAssignSync.syncAssign(module.instance!, siteId);
+        return AddonModAssignSync.syncAssign(module.instance, siteId);
     }
 
 }
diff --git a/src/addons/mod/choice/services/handlers/prefetch.ts b/src/addons/mod/choice/services/handlers/prefetch.ts
index 0aa454612..5ae104e28 100644
--- a/src/addons/mod/choice/services/handlers/prefetch.ts
+++ b/src/addons/mod/choice/services/handlers/prefetch.ts
@@ -147,7 +147,7 @@ export class AddonModChoicePrefetchHandlerService extends CoreCourseActivityPref
      * @return Promise resolved when done.
      */
     sync(module: CoreCourseAnyModuleData, courseId: number, siteId?: string): Promise<AddonModChoiceSyncResult> {
-        return AddonModChoiceSync.syncChoice(module.instance!, undefined, siteId);
+        return AddonModChoiceSync.syncChoice(module.instance, undefined, siteId);
     }
 
 }
diff --git a/src/addons/mod/data/services/handlers/prefetch.ts b/src/addons/mod/data/services/handlers/prefetch.ts
index 4a7bf6b38..86c79ee94 100644
--- a/src/addons/mod/data/services/handlers/prefetch.ts
+++ b/src/addons/mod/data/services/handlers/prefetch.ts
@@ -173,7 +173,7 @@ export class AddonModDataPrefetchHandlerService extends CoreCourseActivityPrefet
     async invalidateModule(module: CoreCourseAnyModuleData, courseId: number): Promise<void> {
         const promises: Promise<void>[] = [];
         promises.push(AddonModData.invalidateDatabaseData(courseId));
-        promises.push(AddonModData.invalidateDatabaseAccessInformationData(module.instance!));
+        promises.push(AddonModData.invalidateDatabaseAccessInformationData(module.instance));
 
         await Promise.all(promises);
     }
@@ -279,7 +279,7 @@ export class AddonModDataPrefetchHandlerService extends CoreCourseActivityPrefet
      */
     async sync(module: CoreCourseAnyModuleData, courseId: number, siteId?: string): Promise<AddonModDataSyncResult> {
         const promises = [
-            AddonModDataSync.syncDatabase(module.instance!, siteId),
+            AddonModDataSync.syncDatabase(module.instance, siteId),
             AddonModDataSync.syncRatings(module.id, true, siteId),
         ];
 
diff --git a/src/addons/mod/feedback/services/handlers/prefetch.ts b/src/addons/mod/feedback/services/handlers/prefetch.ts
index 3180321d9..b7f78b3b3 100644
--- a/src/addons/mod/feedback/services/handlers/prefetch.ts
+++ b/src/addons/mod/feedback/services/handlers/prefetch.ts
@@ -211,7 +211,7 @@ export class AddonModFeedbackPrefetchHandlerService extends CoreCourseActivityPr
      * @inheritdoc
      */
     sync(module: CoreCourseAnyModuleData, courseId: number, siteId?: string): Promise<AddonModFeedbackSyncResult> {
-        return AddonModFeedbackSync.syncFeedback(module.instance!, siteId);
+        return AddonModFeedbackSync.syncFeedback(module.instance, siteId);
     }
 
 }
diff --git a/src/addons/mod/folder/components/index/index.ts b/src/addons/mod/folder/components/index/index.ts
index 18f99216c..90e3f7ed4 100644
--- a/src/addons/mod/folder/components/index/index.ts
+++ b/src/addons/mod/folder/components/index/index.ts
@@ -66,7 +66,7 @@ export class AddonModFolderIndexComponent extends CoreCourseModuleMainResourceCo
             await this.loadContent();
 
             try {
-                await AddonModFolder.logView(this.module.instance!, this.module.name);
+                await AddonModFolder.logView(this.module.instance, this.module.name);
                 CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
             } catch {
                 // Ignore errors.
diff --git a/src/addons/mod/forum/services/handlers/prefetch.ts b/src/addons/mod/forum/services/handlers/prefetch.ts
index 41357fcf6..a460bc6e7 100644
--- a/src/addons/mod/forum/services/handlers/prefetch.ts
+++ b/src/addons/mod/forum/services/handlers/prefetch.ts
@@ -320,8 +320,8 @@ export class AddonModForumPrefetchHandlerService extends CoreCourseActivityPrefe
     ): Promise<AddonModForumSyncResult> {
         const promises: Promise<AddonModForumSyncResult>[] = [];
 
-        promises.push(AddonModForumSync.syncForumDiscussions(module.instance!, undefined, siteId));
-        promises.push(AddonModForumSync.syncForumReplies(module.instance!, undefined, siteId));
+        promises.push(AddonModForumSync.syncForumDiscussions(module.instance, undefined, siteId));
+        promises.push(AddonModForumSync.syncForumReplies(module.instance, undefined, siteId));
         promises.push(AddonModForumSync.syncRatings(module.id, undefined, true, siteId));
 
         const results = await Promise.all(promises);
diff --git a/src/addons/mod/glossary/services/handlers/prefetch.ts b/src/addons/mod/glossary/services/handlers/prefetch.ts
index 58420e244..4ef05bccc 100644
--- a/src/addons/mod/glossary/services/handlers/prefetch.ts
+++ b/src/addons/mod/glossary/services/handlers/prefetch.ts
@@ -219,7 +219,7 @@ export class AddonModGlossaryPrefetchHandlerService extends CoreCourseActivityPr
      */
     async sync(module: CoreCourseAnyModuleData, courseId: number, siteId?: string): Promise<AddonModGlossarySyncResult> {
         const results = await Promise.all([
-            AddonModGlossarySync.syncGlossaryEntries(module.instance!, undefined, siteId),
+            AddonModGlossarySync.syncGlossaryEntries(module.instance, undefined, siteId),
             AddonModGlossarySync.syncRatings(module.id, undefined, siteId),
         ]);
 
diff --git a/src/addons/mod/imscp/components/index/index.ts b/src/addons/mod/imscp/components/index/index.ts
index 502478fab..6ed251203 100644
--- a/src/addons/mod/imscp/components/index/index.ts
+++ b/src/addons/mod/imscp/components/index/index.ts
@@ -53,7 +53,7 @@ export class AddonModImscpIndexComponent extends CoreCourseModuleMainResourceCom
         await this.loadContent();
 
         try {
-            await AddonModImscp.logView(this.module.instance!, this.module.name);
+            await AddonModImscp.logView(this.module.instance, this.module.name);
             CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
         } catch {
             // Ignore errors.
diff --git a/src/addons/mod/lesson/services/handlers/prefetch.ts b/src/addons/mod/lesson/services/handlers/prefetch.ts
index 2b550bf94..4d87bf1ce 100644
--- a/src/addons/mod/lesson/services/handlers/prefetch.ts
+++ b/src/addons/mod/lesson/services/handlers/prefetch.ts
@@ -537,7 +537,7 @@ export class AddonModLessonPrefetchHandlerService extends CoreCourseActivityPref
      * @return Promise resolved when done.
      */
     sync(module: CoreCourseAnyModuleData, courseId: number, siteId?: string): Promise<AddonModLessonSyncResult> {
-        return AddonModLessonSync.syncLesson(module.instance!, false, false, siteId);
+        return AddonModLessonSync.syncLesson(module.instance, false, false, siteId);
     }
 
 }
diff --git a/src/addons/mod/page/components/index/index.ts b/src/addons/mod/page/components/index/index.ts
index a58d49a3a..e416a9244 100644
--- a/src/addons/mod/page/components/index/index.ts
+++ b/src/addons/mod/page/components/index/index.ts
@@ -54,7 +54,7 @@ export class AddonModPageIndexComponent extends CoreCourseModuleMainResourceComp
         await this.loadContent();
 
         try {
-            await AddonModPage.logView(this.module.instance!, this.module.name);
+            await AddonModPage.logView(this.module.instance, this.module.name);
             CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
         } catch {
             // Ignore errors.
diff --git a/src/addons/mod/quiz/services/handlers/prefetch.ts b/src/addons/mod/quiz/services/handlers/prefetch.ts
index e1d035e83..dedc71db5 100644
--- a/src/addons/mod/quiz/services/handlers/prefetch.ts
+++ b/src/addons/mod/quiz/services/handlers/prefetch.ts
@@ -208,7 +208,7 @@ export class AddonModQuizPrefetchHandlerService extends CoreCourseActivityPrefet
         // Invalidate the calls required to check if a quiz is downloadable.
         await Promise.all([
             AddonModQuiz.invalidateQuizData(courseId),
-            AddonModQuiz.invalidateUserAttemptsForUser(module.instance!),
+            AddonModQuiz.invalidateUserAttemptsForUser(module.instance),
         ]);
     }
 
diff --git a/src/addons/mod/resource/components/index/index.ts b/src/addons/mod/resource/components/index/index.ts
index 8b95a597a..8064bfd14 100644
--- a/src/addons/mod/resource/components/index/index.ts
+++ b/src/addons/mod/resource/components/index/index.ts
@@ -82,7 +82,7 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
 
         await this.loadContent();
         try {
-            await AddonModResource.logView(this.module.instance!, this.module.name);
+            await AddonModResource.logView(this.module.instance, this.module.name);
             CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
         } catch {
             // Ignore errors.
diff --git a/src/addons/mod/resource/services/resource-helper.ts b/src/addons/mod/resource/services/resource-helper.ts
index c3f577847..59c695869 100644
--- a/src/addons/mod/resource/services/resource-helper.ts
+++ b/src/addons/mod/resource/services/resource-helper.ts
@@ -202,7 +202,7 @@ export class AddonModResourceHelperProvider {
             );
 
             try {
-                await AddonModResource.logView(module.instance!, module.name);
+                await AddonModResource.logView(module.instance, module.name);
                 CoreCourse.checkModuleCompletion(courseId, module.completiondata);
             } catch {
                 // Ignore errors.
diff --git a/src/addons/mod/survey/services/handlers/prefetch.ts b/src/addons/mod/survey/services/handlers/prefetch.ts
index fca2d7852..31ffcff48 100644
--- a/src/addons/mod/survey/services/handlers/prefetch.ts
+++ b/src/addons/mod/survey/services/handlers/prefetch.ts
@@ -107,7 +107,7 @@ export class AddonModSurveyPrefetchHandlerService extends CoreCourseActivityPref
      * @inheritdoc
      */
     sync(module: CoreCourseAnyModuleData, courseId: number, siteId?: string): Promise<AddonModSurveySyncResult> {
-        return AddonModSurveySync.syncSurvey(module.instance!, undefined, siteId);
+        return AddonModSurveySync.syncSurvey(module.instance, undefined, siteId);
     }
 
 }
diff --git a/src/addons/mod/url/components/index/index.ts b/src/addons/mod/url/components/index/index.ts
index db01da3b2..0c1c8c16a 100644
--- a/src/addons/mod/url/components/index/index.ts
+++ b/src/addons/mod/url/components/index/index.ts
@@ -169,7 +169,7 @@ export class AddonModUrlIndexComponent extends CoreCourseModuleMainResourceCompo
      */
     protected async logView(): Promise<void> {
         try {
-            await AddonModUrl.logView(this.module.instance!, this.module.name);
+            await AddonModUrl.logView(this.module.instance, this.module.name);
             CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
         } catch {
             // Ignore errors.
diff --git a/src/addons/mod/wiki/services/handlers/prefetch.ts b/src/addons/mod/wiki/services/handlers/prefetch.ts
index d6b3b4179..25f26727f 100644
--- a/src/addons/mod/wiki/services/handlers/prefetch.ts
+++ b/src/addons/mod/wiki/services/handlers/prefetch.ts
@@ -14,8 +14,7 @@
 
 import { Injectable } from '@angular/core';
 import { CoreCourseActivityPrefetchHandlerBase } from '@features/course/classes/activity-prefetch-handler';
-import { CoreCourseAnyModuleData } from '@features/course/services/course';
-import { CoreCourseHelper } from '@features/course/services/course-helper';
+import { CoreCourse, CoreCourseAnyModuleData } from '@features/course/services/course';
 import { CoreFilepool } from '@services/filepool';
 import { CoreGroups } from '@services/groups';
 import { CoreFileSizeSum, CorePluginFileDelegate } from '@services/plugin-file-delegate';
@@ -190,7 +189,7 @@ export class AddonModWikiPrefetchHandlerService extends CoreCourseActivityPrefet
 
         // Fetch info to provide wiki links.
         promises.push(AddonModWiki.getWiki(courseId, module.id, { siteId }).then((wiki) =>
-            CoreCourseHelper.getModuleCourseIdByInstance(wiki.id, 'wiki', siteId)));
+            CoreCourse.getModuleBasicInfoByInstance(wiki.id, 'wiki', siteId)));
 
         // Get related page files and fetch them.
         promises.push(this.getFiles(module, courseId, single, siteId).then((files) =>
@@ -203,7 +202,7 @@ export class AddonModWikiPrefetchHandlerService extends CoreCourseActivityPrefet
      * @inheritdoc
      */
     sync(module: CoreCourseAnyModuleData, courseId: number, siteId?: string): Promise<AddonModWikiSyncWikiResult> {
-        return AddonModWikiSync.syncWiki(module.instance!, module.course, module.id, siteId);
+        return AddonModWikiSync.syncWiki(module.instance, module.course, module.id, siteId);
     }
 
 }
diff --git a/src/addons/mod/workshop/pages/edit-submission/edit-submission.ts b/src/addons/mod/workshop/pages/edit-submission/edit-submission.ts
index 9fdb9af26..aa215a1ce 100644
--- a/src/addons/mod/workshop/pages/edit-submission/edit-submission.ts
+++ b/src/addons/mod/workshop/pages/edit-submission/edit-submission.ts
@@ -116,7 +116,7 @@ export class AddonModWorkshopEditSubmissionPage implements OnInit, OnDestroy, Ca
             this.editorExtraParams.id = this.submissionId;
         }
 
-        this.workshopId = this.module.instance!;
+        this.workshopId = this.module.instance;
         this.componentId = this.module.id;
 
         if (!this.isDestroyed) {
diff --git a/src/addons/mod/workshop/services/handlers/prefetch.ts b/src/addons/mod/workshop/services/handlers/prefetch.ts
index 7700b19cf..b89f83af9 100644
--- a/src/addons/mod/workshop/services/handlers/prefetch.ts
+++ b/src/addons/mod/workshop/services/handlers/prefetch.ts
@@ -379,7 +379,7 @@ export class AddonModWorkshopPrefetchHandlerService extends CoreCourseActivityPr
      * @inheritdoc
      */
     async sync(module: CoreCourseAnyModuleData, courseId: number, siteId?: string): Promise<AddonModDataSyncResult> {
-        return AddonModWorkshopSync.syncWorkshop(module.instance!, siteId);
+        return AddonModWorkshopSync.syncWorkshop(module.instance, siteId);
     }
 
 }
diff --git a/src/core/features/course/classes/main-activity-page.ts b/src/core/features/course/classes/main-activity-page.ts
index de7604457..f82ad56de 100644
--- a/src/core/features/course/classes/main-activity-page.ts
+++ b/src/core/features/course/classes/main-activity-page.ts
@@ -15,7 +15,7 @@
 import { Component, OnInit } from '@angular/core';
 import { CoreNavigator } from '@services/navigator';
 import { CoreDomUtils } from '@services/utils/dom';
-import { CoreCourseAnyModuleData } from '../services/course';
+import { CoreCourseModuleData } from '../services/course-helper';
 import { CoreCourseModuleMainResourceComponent } from './main-resource-component';
 
 /**
@@ -29,7 +29,7 @@ export class CoreCourseModuleMainActivityPage<ActivityType extends CoreCourseMod
     activityComponent?: ActivityType;
 
     title!: string;
-    module!: CoreCourseAnyModuleData;
+    module!: CoreCourseModuleData;
     courseId!: number;
 
     /**
@@ -37,7 +37,7 @@ export class CoreCourseModuleMainActivityPage<ActivityType extends CoreCourseMod
      */
     ngOnInit(): void {
         try {
-            this.module = CoreNavigator.getRequiredRouteParam<CoreCourseAnyModuleData>('module');
+            this.module = CoreNavigator.getRequiredRouteParam<CoreCourseModuleData>('module');
             this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
         } catch (error) {
             CoreDomUtils.showErrorModal(error);
diff --git a/src/core/features/course/services/course-helper.ts b/src/core/features/course/services/course-helper.ts
index 53ff749db..590d7aea1 100644
--- a/src/core/features/course/services/course-helper.ts
+++ b/src/core/features/course/services/course-helper.ts
@@ -1429,26 +1429,6 @@ export class CoreCourseHelperProvider {
         return CoreConstants.ICON_DOWNLOADING;
     }
 
-    /**
-     * Get the course ID from a module instance ID, showing an error message if it can't be retrieved.
-     *
-     * @param id Instance ID.
-     * @param module Name of the module. E.g. 'glossary'.
-     * @param siteId Site ID. If not defined, current site.
-     * @return Promise resolved with the module's course ID.
-     */
-    async getModuleCourseIdByInstance(id: number, module: string, siteId?: string): Promise<number> {
-        try {
-            const cm = await CoreCourse.getModuleBasicInfoByInstance(id, module, siteId);
-
-            return cm.course;
-        } catch (error) {
-            CoreDomUtils.showErrorModalDefault(error, 'core.course.errorgetmodule', true);
-
-            throw error;
-        }
-    }
-
     /**
      * Get prefetch info for a module.
      *
@@ -1629,7 +1609,7 @@ export class CoreCourseHelperProvider {
             const site = await CoreSites.getSite(siteId);
 
             // Get the module.
-            const module = <CoreCourseModuleData>
+            const module =
                 await CoreCourse.getModule(moduleId, courseId, sectionId, false, false, siteId, modName);
 
             if (CoreSites.getCurrentSiteId() == site.getId()) {
@@ -1649,13 +1629,11 @@ export class CoreCourseHelperProvider {
                 }
             }
 
-            this.logger.warn('navCtrl was not passed to navigateToModule by the link handler for ' + module.modname);
-
             const params: Params = {
                 course: { id: courseId },
-                module: module,
-                sectionId: sectionId,
-                modParams: modParams,
+                module,
+                sectionId,
+                modParams,
             };
 
             if (courseId == site.getSiteHomeId()) {
diff --git a/src/core/features/course/services/course.ts b/src/core/features/course/services/course.ts
index 279750440..592b7ca84 100644
--- a/src/core/features/course/services/course.ts
+++ b/src/core/features/course/services/course.ts
@@ -936,7 +936,7 @@ export class CoreCourseProvider {
      * Load module contents into module.contents if they aren't loaded already.
      *
      * @param module Module to load the contents.
-     * @param courseId The course ID. Recommended to speed up the process and minimize data usage.
+     * @param courseId Not used since 4.0.
      * @param sectionId The section ID.
      * @param preferCache True if shouldn't call WS if data is cached, false otherwise.
      * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
@@ -960,7 +960,7 @@ export class CoreCourseProvider {
             return;
         }
 
-        const mod = await this.getModule(module.id, courseId, sectionId, preferCache, ignoreCache, siteId, modName);
+        const mod = await this.getModule(module.id, module.course, sectionId, preferCache, ignoreCache, siteId, modName);
 
         if (!mod.contents) {
             throw new CoreError(Translate.instant('core.course.modulenotfound'));
@@ -1532,13 +1532,13 @@ export type CoreCourseGetContentsWSModule = {
     id: number; // Activity id.
     url?: string; // Activity url.
     name: string; // Activity module name.
-    instance?: number; // Instance id.
-    contextid?: number; // Activity context id.
+    instance: number; // Instance id. Cannot be undefined.
+    contextid?: number; // @since 3.10. Activity context id.
     description?: string; // Activity description.
-    visible?: number; // Is the module visible.
-    uservisible?: boolean; // Is the module visible for the user?.
+    visible: number; // Is the module visible. Cannot be undefined.
+    uservisible: boolean; // Is the module visible for the user?. Cannot be undefined.
     availabilityinfo?: string; // Availability information.
-    visibleoncoursepage?: number; // Is the module visible on course page.
+    visibleoncoursepage: number; // Is the module visible on course page. Cannot be undefined.
     modicon: string; // Activity icon url.
     modname: string; // Activity module type.
     modplural: string; // Activity module plural name.

From ed05adffbf76429622ff3ebc812fac9600fb2be1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 17 Dec 2021 00:27:04 +0100
Subject: [PATCH 0300/1008] MOBILE-3833 course: Reduce usage of
 CoreCourseAnyModuleData

---
 .../mod/assign/services/handlers/prefetch.ts  |  3 +-
 .../mod/book/services/handlers/tag-area.ts    | 14 ++--
 src/addons/mod/choice/services/choice-sync.ts |  2 +-
 .../mod/data/components/action/action.ts      | 20 +++---
 src/addons/mod/data/components/index/index.ts | 11 ++-
 src/addons/mod/data/pages/edit/edit.html      |  2 +-
 src/addons/mod/data/pages/edit/edit.ts        | 20 +++---
 src/addons/mod/data/pages/entry/entry.html    |  2 +-
 src/addons/mod/data/pages/entry/entry.ts      | 22 +++---
 src/addons/mod/data/services/data-helper.ts   | 10 ++-
 .../mod/data/services/handlers/edit-link.ts   | 10 ++-
 .../mod/data/services/handlers/prefetch.ts    |  2 +-
 .../mod/data/services/handlers/show-link.ts   | 10 ++-
 .../mod/feedback/services/feedback-helper.ts  |  5 +-
 .../mod/feedback/services/feedback-sync.ts    |  2 +-
 .../services/handlers/analysis-link.ts        |  6 +-
 .../services/handlers/complete-link.ts        |  6 +-
 .../feedback/services/handlers/print-link.ts  |  6 +-
 .../handlers/show-non-respondents-link.ts     |  6 +-
 .../mod/folder/components/index/index.ts      |  2 +-
 .../mod/forum/services/handlers/post-link.ts  |  7 +-
 .../glossary/services/handlers/edit-link.ts   |  6 +-
 .../glossary/services/handlers/entry-link.ts  |  8 ++-
 .../glossary/services/handlers/prefetch.ts    |  4 +-
 .../services/handlers/report-link.ts          | 42 ++++--------
 .../mod/imscp/components/index/index.ts       |  2 +-
 .../lesson/services/handlers/grade-link.ts    | 11 +--
 .../lesson/services/handlers/index-link.ts    | 10 +--
 .../lesson/services/handlers/report-link.ts   | 44 ++++++------
 src/addons/mod/lesson/services/lesson-sync.ts |  2 +-
 src/addons/mod/page/components/index/index.ts |  2 +-
 .../mod/quiz/services/handlers/push-click.ts  |  1 -
 .../mod/quiz/services/handlers/review-link.ts |  8 +--
 src/addons/mod/quiz/services/quiz-helper.ts   | 13 ++--
 src/addons/mod/quiz/services/quiz-sync.ts     | 18 +++--
 .../mod/resource/components/index/index.ts    |  4 +-
 .../mod/resource/services/handlers/module.ts  | 19 +++---
 .../mod/resource/services/resource-helper.ts  | 11 ++-
 src/addons/mod/scorm/services/scorm-sync.ts   |  2 +-
 src/addons/mod/survey/services/survey-sync.ts |  2 +-
 src/addons/mod/url/components/index/index.ts  |  2 +-
 .../mod/url/services/handlers/module.ts       | 37 +++++-----
 src/addons/mod/wiki/pages/edit/edit.ts        |  8 ++-
 .../mod/wiki/services/handlers/create-link.ts |  6 +-
 .../mod/wiki/services/handlers/edit-link.ts   | 12 ++--
 .../services/handlers/page-or-map-link.ts     | 13 ++--
 .../mod/wiki/services/handlers/prefetch.ts    |  2 +-
 .../workshop/services/handlers/prefetch.ts    |  2 +-
 .../classes/activity-prefetch-handler.ts      |  2 +-
 .../course/classes/main-activity-page.ts      |  2 +-
 .../course/classes/main-resource-component.ts |  4 +-
 .../classes/resource-prefetch-handler.ts      |  2 +-
 .../course/components/module/module.ts        |  8 +--
 .../features/course/services/course-helper.ts | 46 ++++++++++---
 src/core/features/course/services/course.ts   | 68 ++++++++++++-------
 .../services/module-prefetch-delegate.ts      | 44 ++++++------
 .../classes/handlers/module-handler.ts        | 10 +--
 .../components/module-index/module-index.ts   |  2 +-
 upgrade.txt                                   |  4 +-
 59 files changed, 355 insertions(+), 296 deletions(-)

diff --git a/src/addons/mod/assign/services/handlers/prefetch.ts b/src/addons/mod/assign/services/handlers/prefetch.ts
index e9223ddf4..bd504ca3b 100644
--- a/src/addons/mod/assign/services/handlers/prefetch.ts
+++ b/src/addons/mod/assign/services/handlers/prefetch.ts
@@ -242,7 +242,7 @@ export class AddonModAssignPrefetchHandlerService extends CoreCourseActivityPref
 
         promises.push(this.prefetchSubmissions(assign, courseId, module.id, userId, siteId));
 
-        promises.push(CoreCourse.getModuleBasicInfoByInstance(assign.id, 'assign', siteId));
+        promises.push(CoreCourse.getModuleBasicInfoByInstance(assign.id, 'assign', { siteId }));
         // Get course data, needed to determine upload max size if it's configured to be course limit.
         promises.push(CoreUtils.ignoreErrors(CoreCourses.getCourseByField('id', courseId, siteId)));
 
@@ -253,7 +253,6 @@ export class AddonModAssignPrefetchHandlerService extends CoreCourseActivityPref
         promises.push(CoreFilepool.addFilesToQueue(siteId, files, this.component, module.id));
 
         await Promise.all(promises);
-
     }
 
     /**
diff --git a/src/addons/mod/book/services/handlers/tag-area.ts b/src/addons/mod/book/services/handlers/tag-area.ts
index dea35c442..4430bc4d5 100644
--- a/src/addons/mod/book/services/handlers/tag-area.ts
+++ b/src/addons/mod/book/services/handlers/tag-area.ts
@@ -17,6 +17,7 @@ import { CoreCourse } from '@features/course/services/course';
 import { CoreTagFeedComponent } from '@features/tag/components/feed/feed';
 import { CoreTagAreaHandler } from '@features/tag/services/tag-area-delegate';
 import { CoreTagFeedElement, CoreTagHelper } from '@features/tag/services/tag-helper';
+import { CoreSitesReadingStrategy } from '@services/sites';
 import { CoreUrlUtils } from '@services/utils/url';
 import { makeSingleton } from '@singletons';
 import { AddonModBook } from '../book';
@@ -49,16 +50,17 @@ export class AddonModBookTagAreaHandlerService implements CoreTagAreaHandler {
         const items = CoreTagHelper.parseFeedContent(content);
 
         // Find module ids of the returned books, they are needed by the link delegate.
-        await Promise.all(items.map((item) => {
+        await Promise.all(items.map(async (item) => {
             const params = item.url ? CoreUrlUtils.extractUrlParams(item.url) : {};
             if (params.b && !params.id) {
                 const bookId = parseInt(params.b, 10);
 
-                return CoreCourse.getModuleBasicInfoByInstance(bookId, 'book').then((module) => {
-                    item.url += '&id=' + module.id;
-
-                    return;
-                });
+                const module = await CoreCourse.getModuleBasicInfoByInstance(
+                    bookId,
+                    'book',
+                    { readingStrategy: CoreSitesReadingStrategy.PREFER_CACHE },
+                );
+                item.url += '&id=' + module.id;
             }
         }));
 
diff --git a/src/addons/mod/choice/services/choice-sync.ts b/src/addons/mod/choice/services/choice-sync.ts
index ed2537467..44f78056a 100644
--- a/src/addons/mod/choice/services/choice-sync.ts
+++ b/src/addons/mod/choice/services/choice-sync.ts
@@ -197,7 +197,7 @@ export class AddonModChoiceSyncProvider extends CoreCourseActivitySyncBaseProvid
 
         // Data has been sent to server, prefetch choice if needed.
         try {
-            const module = await CoreCourse.getModuleBasicInfoByInstance(choiceId, 'choice', siteId);
+            const module = await CoreCourse.getModuleBasicInfoByInstance(choiceId, 'choice', { siteId });
 
             await this.prefetchAfterUpdate(AddonModChoicePrefetchHandler.instance, module, courseId, undefined, siteId);
         } catch {
diff --git a/src/addons/mod/data/components/action/action.ts b/src/addons/mod/data/components/action/action.ts
index e5b2ca7ab..e77896781 100644
--- a/src/addons/mod/data/components/action/action.ts
+++ b/src/addons/mod/data/components/action/action.ts
@@ -14,7 +14,6 @@
 
 import { Component, OnInit, Input } from '@angular/core';
 import { Params } from '@angular/router';
-import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreTag } from '@features/tag/services/tag';
 import { CoreUser } from '@features/user/services/user';
 import { CoreNavigator } from '@services/navigator';
@@ -44,8 +43,8 @@ export class AddonModDataActionComponent implements OnInit {
     @Input() action!: AddonModDataAction; // The field to render.
     @Input() entry!: AddonModDataEntry; // The value of the field.
     @Input() database!: AddonModDataData; // Database object.
-    @Input() module!: CoreCourseModuleData; // Module object.
-    @Input() group = 0; // Module object.
+    @Input() title = ''; // Name of the module.
+    @Input() group = 0; // Module group.
     @Input() offset?: number; // Offset of the entry.
 
     siteId: string;
@@ -92,13 +91,13 @@ export class AddonModDataActionComponent implements OnInit {
      * Go to the edit page of the entry.
      */
     editEntry(): void {
-        const params = {
-            courseId: this.database.course,
-            module: this.module,
+        const params: Params = {
+            title: this.title,
         };
 
+        const basePath = AddonModDataModuleHandlerService.PAGE_NAME;
         CoreNavigator.navigateToSitePath(
-            `${AddonModDataModuleHandlerService.PAGE_NAME}/${this.module.course}/${this.module.id}/edit/${this.entry.id}`,
+            `${basePath}/${this.database.course}/${this.database.coursemodule}/edit/${this.entry.id}`,
             { params },
         );
     }
@@ -108,15 +107,14 @@ export class AddonModDataActionComponent implements OnInit {
      */
     viewEntry(): void {
         const params: Params = {
-            courseId: this.database.course,
-            module: this.module,
-            entryId: this.entry.id,
+            title: this.title,
             group: this.group,
             offset: this.offset,
         };
 
+        const basePath = AddonModDataModuleHandlerService.PAGE_NAME;
         CoreNavigator.navigateToSitePath(
-            `${AddonModDataModuleHandlerService.PAGE_NAME}/${this.module.course}/${this.module.id}/${this.entry.id}`,
+            `${basePath}/${this.database.course}/${this.database.coursemodule}/${this.entry.id}`,
             { params },
         );
     }
diff --git a/src/addons/mod/data/components/index/index.ts b/src/addons/mod/data/components/index/index.ts
index 111571bdb..3386cbd82 100644
--- a/src/addons/mod/data/components/index/index.ts
+++ b/src/addons/mod/data/components/index/index.ts
@@ -19,7 +19,6 @@ import { CoreCommentsProvider } from '@features/comments/services/comments';
 import { CoreCourseModuleMainActivityComponent } from '@features/course/classes/main-activity-component';
 import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
 import { CoreCourse } from '@features/course/services/course';
-import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreRatingProvider } from '@features/rating/services/rating';
 import { CoreRatingSyncProvider } from '@features/rating/services/rating-sync';
 import { IonContent } from '@ionic/angular';
@@ -95,7 +94,7 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
         fields: Record<number, AddonModDataField>;
         entries: Record<number, AddonModDataEntry>;
         database: AddonModDataData;
-        module: CoreCourseModuleData;
+        title: string;
         group: number;
         gotoEntry: (a: number) => void;
     };
@@ -371,7 +370,7 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
                 fields: this.fields,
                 entries: entriesById,
                 database: this.database!,
-                module: this.module,
+                title: this.module.name,
                 group: this.selectedGroup,
                 gotoEntry: this.gotoEntry.bind(this),
             };
@@ -474,8 +473,7 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
      */
     gotoAddEntries(): void {
         const params: Params = {
-            module: this.module,
-            courseId: this.courseId,
+            title: this.module.name,
             group: this.selectedGroup,
         };
 
@@ -492,8 +490,7 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
      */
     gotoEntry(entryId: number): void {
         const params: Params = {
-            module: this.module,
-            courseId: this.courseId,
+            title: this.module.name,
             group: this.selectedGroup,
         };
 
diff --git a/src/addons/mod/data/pages/edit/edit.html b/src/addons/mod/data/pages/edit/edit.html
index 6ace095f7..0ee3b6e22 100644
--- a/src/addons/mod/data/pages/edit/edit.html
+++ b/src/addons/mod/data/pages/edit/edit.html
@@ -5,7 +5,7 @@
         </ion-buttons>
         <ion-title>
             <h1>
-                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="moduleId" [courseId]="courseId">
                 </core-format-text>
             </h1>
         </ion-title>
diff --git a/src/addons/mod/data/pages/edit/edit.ts b/src/addons/mod/data/pages/edit/edit.ts
index 3be6b6dbc..dc307eaa2 100644
--- a/src/addons/mod/data/pages/edit/edit.ts
+++ b/src/addons/mod/data/pages/edit/edit.ts
@@ -15,7 +15,6 @@
 import { Component, OnInit, ViewChild, ElementRef, Type } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 import { CoreError } from '@classes/errors/error';
-import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreFileUploader } from '@features/fileuploader/services/fileuploader';
 import { CoreTag } from '@features/tag/services/tag';
 import { IonContent } from '@ionic/angular';
@@ -66,7 +65,7 @@ export class AddonModDataEditPage implements OnInit {
     entry?: AddonModDataEntry;
     fields: Record<number, AddonModDataField> = {};
     courseId!: number;
-    module!: CoreCourseModuleData;
+    moduleId = 0;
     database?: AddonModDataData;
     title = '';
     component = AddonModDataProvider.COMPONENT;
@@ -97,9 +96,10 @@ export class AddonModDataEditPage implements OnInit {
      */
     ngOnInit(): void {
         try {
-            this.module = CoreNavigator.getRequiredRouteParam<CoreCourseModuleData>('module');
-            this.entryId = CoreNavigator.getRouteNumberParam('entryId') || undefined;
+            this.moduleId = CoreNavigator.getRequiredRouteNumberParam('cmId');
             this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            this.title = CoreNavigator.getRouteParam<string>('title') || '';
+            this.entryId = CoreNavigator.getRouteNumberParam('entryId') || undefined;
             this.selectedGroup = CoreNavigator.getRouteNumberParam('group') || 0;
         } catch (error) {
             CoreDomUtils.showErrorModal(error);
@@ -112,8 +112,6 @@ export class AddonModDataEditPage implements OnInit {
         // If entryId is lower than 0 or null, it is a new entry or an offline entry.
         this.isEditing = this.entryId !== undefined && this.entryId > 0;
 
-        this.title = this.module.name;
-
         this.fetchEntryData(true);
     }
 
@@ -134,7 +132,7 @@ export class AddonModDataEditPage implements OnInit {
 
         if (changed) {
             // Show confirmation if some data has been modified.
-            await CoreDomUtils.showConfirm(Translate.instant('coentryre.confirmcanceledit'));
+            await CoreDomUtils.showConfirm(Translate.instant('core.confirmcanceledit'));
         }
 
         // Delete the local files from the tmp folder.
@@ -154,11 +152,11 @@ export class AddonModDataEditPage implements OnInit {
      */
     protected async fetchEntryData(refresh = false): Promise<void> {
         try {
-            this.database = await AddonModData.getDatabase(this.courseId, this.module.id);
+            this.database = await AddonModData.getDatabase(this.courseId, this.moduleId);
             this.title = this.database.name || this.title;
             this.cssClass = 'addon-data-entries-' + this.database.id;
 
-            this.fieldsArray = await AddonModData.getFields(this.database.id, { cmId: this.module.id });
+            this.fieldsArray = await AddonModData.getFields(this.database.id, { cmId: this.moduleId });
             this.fields = CoreUtils.arrayToObject(this.fieldsArray, 'id');
 
             const entry = await AddonModDataHelper.fetchEntry(this.database, this.fieldsArray, this.entryId || 0);
@@ -183,7 +181,7 @@ export class AddonModDataEditPage implements OnInit {
 
                         await Promise.all(this.groupInfo.groups.map(async (group) => {
                             const accessData = await AddonModData.getDatabaseAccessInformation(this.database!.id, {
-                                cmId: this.module.id, groupId: group.id });
+                                cmId: this.moduleId, groupId: group.id });
 
                             canAddGroup[group.id] = accessData.canaddentry;
                         }));
@@ -196,7 +194,7 @@ export class AddonModDataEditPage implements OnInit {
                         haveAccess = true;
                     }
                 } else {
-                    const accessData = await AddonModData.getDatabaseAccessInformation(this.database.id, { cmId: this.module.id });
+                    const accessData = await AddonModData.getDatabaseAccessInformation(this.database.id, { cmId: this.moduleId });
                     haveAccess = accessData.canaddentry;
                 }
 
diff --git a/src/addons/mod/data/pages/entry/entry.html b/src/addons/mod/data/pages/entry/entry.html
index 015b40c88..0bf31d990 100644
--- a/src/addons/mod/data/pages/entry/entry.html
+++ b/src/addons/mod/data/pages/entry/entry.html
@@ -5,7 +5,7 @@
         </ion-buttons>
         <ion-title>
             <h1>
-                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="moduleId" [courseId]="courseId">
                 </core-format-text>
             </h1>
         </ion-title>
diff --git a/src/addons/mod/data/pages/entry/entry.ts b/src/addons/mod/data/pages/entry/entry.ts
index fb707ad10..173242ed4 100644
--- a/src/addons/mod/data/pages/entry/entry.ts
+++ b/src/addons/mod/data/pages/entry/entry.ts
@@ -16,7 +16,6 @@ import { Component, OnDestroy, ViewChild, ChangeDetectorRef, OnInit, Type } from
 import { CoreCommentsCommentsComponent } from '@features/comments/components/comments/comments';
 import { CoreComments } from '@features/comments/services/comments';
 import { CoreCourse } from '@features/course/services/course';
-import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreRatingInfo } from '@features/rating/services/rating';
 import { IonContent, IonRefresher } from '@ionic/angular';
 import { CoreGroups, CoreGroupInfo } from '@services/groups';
@@ -57,7 +56,7 @@ export class AddonModDataEntryPage implements OnInit, OnDestroy {
     protected fields: Record<number, AddonModDataField> = {};
     protected fieldsArray: AddonModDataField[] = [];
 
-    module!: CoreCourseModuleData;
+    moduleId = 0;
     courseId!: number;
     offset?: number;
     title = '';
@@ -82,7 +81,7 @@ export class AddonModDataEntryPage implements OnInit, OnDestroy {
         fields: Record<number, AddonModDataField>;
         entries: Record<number, AddonModDataEntry>;
         database: AddonModDataData;
-        module: CoreCourseModuleData;
+        title: string;
         group: number;
     };
 
@@ -133,9 +132,10 @@ export class AddonModDataEntryPage implements OnInit, OnDestroy {
      */
     async ngOnInit(): Promise<void> {
         try {
-            this.module = CoreNavigator.getRequiredRouteParam<CoreCourseModuleData>('module');
-            this.entryId = CoreNavigator.getRouteNumberParam('entryId') || undefined;
+            this.moduleId = CoreNavigator.getRequiredRouteNumberParam('cmId');
             this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            this.entryId = CoreNavigator.getRouteNumberParam('entryId') || undefined;
+            this.title = CoreNavigator.getRouteParam<string>('title') || '';
             this.selectedGroup = CoreNavigator.getRouteNumberParam('group') || 0;
             this.offset = CoreNavigator.getRouteNumberParam('offset');
         } catch (error) {
@@ -146,8 +146,6 @@ export class AddonModDataEntryPage implements OnInit, OnDestroy {
             return;
         }
 
-        this.title = this.module.name;
-
         this.commentsEnabled = !CoreComments.areCommentsDisabledInSite();
 
         await this.fetchEntryData();
@@ -165,15 +163,15 @@ export class AddonModDataEntryPage implements OnInit, OnDestroy {
         this.isPullingToRefresh = isPtr;
 
         try {
-            this.database = await AddonModData.getDatabase(this.courseId, this.module.id);
+            this.database = await AddonModData.getDatabase(this.courseId, this.moduleId);
             this.title = this.database.name || this.title;
 
-            this.fieldsArray = await AddonModData.getFields(this.database.id, { cmId: this.module.id });
+            this.fieldsArray = await AddonModData.getFields(this.database.id, { cmId: this.moduleId });
             this.fields = CoreUtils.arrayToObject(this.fieldsArray, 'id');
 
             await this.setEntryFromOffset();
 
-            this.access = await AddonModData.getDatabaseAccessInformation(this.database.id, { cmId: this.module.id });
+            this.access = await AddonModData.getDatabaseAccessInformation(this.database.id, { cmId: this.moduleId });
 
             this.groupInfo = await CoreGroups.getActivityGroupInfo(this.database.coursemodule);
             this.selectedGroup = CoreGroups.validateGroupId(this.selectedGroup, this.groupInfo);
@@ -200,7 +198,7 @@ export class AddonModDataEntryPage implements OnInit, OnDestroy {
                 fields: this.fields,
                 entries: entries,
                 database: this.database,
-                module: this.module,
+                title: this.title,
                 group: this.selectedGroup,
             };
         } catch (error) {
@@ -363,7 +361,7 @@ export class AddonModDataEntryPage implements OnInit, OnDestroy {
 
         if (this.entryId > 0) {
             // Online entry, we need to fetch the the rating info.
-            const entry = await AddonModData.getEntry(this.database!.id, this.entryId, { cmId: this.module.id });
+            const entry = await AddonModData.getEntry(this.database!.id, this.entryId, { cmId: this.moduleId });
             this.ratingInfo = entry.ratinginfo;
         }
     }
diff --git a/src/addons/mod/data/services/data-helper.ts b/src/addons/mod/data/services/data-helper.ts
index 18fa06b70..64703aedb 100644
--- a/src/addons/mod/data/services/data-helper.ts
+++ b/src/addons/mod/data/services/data-helper.ts
@@ -18,7 +18,7 @@ import { CoreCourse } from '@features/course/services/course';
 import { CoreFileUploader, CoreFileUploaderStoreFilesResult } from '@features/fileuploader/services/fileuploader';
 import { CoreRatingOffline } from '@features/rating/services/rating-offline';
 import { FileEntry } from '@ionic-native/file/ngx';
-import { CoreSites } from '@services/sites';
+import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreFormFields } from '@singletons/form';
 import { CoreTextUtils } from '@services/utils/text';
@@ -230,7 +230,7 @@ export class AddonModDataHelperProvider {
                     render = Translate.instant('addon.mod_data.' + (entry.approved ? 'approved' : 'notapproved'));
                 } else {
                     render = '<addon-mod-data-action action="' + action + '" [entry]="entries[' + entry.id + ']" mode="' + mode +
-                    '" [database]="database" [module]="module" [offset]="' + offset + '" [group]="group" ></addon-mod-data-action>';
+                    '" [database]="database" [title]="title" [offset]="' + offset + '" [group]="group" ></addon-mod-data-action>';
                 }
                 template = template.replace(replaceRegex, render);
             } else {
@@ -437,7 +437,11 @@ export class AddonModDataHelperProvider {
             return courseId;
         }
 
-        const module = await CoreCourse.getModuleBasicInfoByInstance(dataId, 'data', siteId);
+        const module = await CoreCourse.getModuleBasicInfoByInstance(
+            dataId,
+            'data',
+            { siteId, readingStrategy: CoreSitesReadingStrategy.PREFER_CACHE },
+        );
 
         return module.course;
     }
diff --git a/src/addons/mod/data/services/handlers/edit-link.ts b/src/addons/mod/data/services/handlers/edit-link.ts
index de515049c..bcabe86bd 100644
--- a/src/addons/mod/data/services/handlers/edit-link.ts
+++ b/src/addons/mod/data/services/handlers/edit-link.ts
@@ -18,6 +18,7 @@ import { CoreContentLinksHandlerBase } from '@features/contentlinks/classes/base
 import { CoreContentLinksAction } from '@features/contentlinks/services/contentlinks-delegate';
 import { CoreCourse } from '@features/course/services/course';
 import { CoreNavigator } from '@services/navigator';
+import { CoreSitesReadingStrategy } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { makeSingleton } from '@singletons';
 import { AddonModDataModuleHandlerService } from './module';
@@ -44,10 +45,13 @@ export class AddonModDataEditLinkHandlerService extends CoreContentLinksHandlerB
                 const rId = params.rid || '';
 
                 try {
-                    const module = await CoreCourse.getModuleBasicInfoByInstance(dataId, 'data', siteId);
+                    const module = await CoreCourse.getModuleBasicInfoByInstance(
+                        dataId,
+                        'data',
+                        { siteId, readingStrategy: CoreSitesReadingStrategy.PREFER_CACHE },
+                    );
                     const pageParams: Params = {
-                        module,
-                        courseId: module.course,
+                        title: module.name,
                     };
 
                     CoreNavigator.navigateToSitePath(
diff --git a/src/addons/mod/data/services/handlers/prefetch.ts b/src/addons/mod/data/services/handlers/prefetch.ts
index 86c79ee94..717b69b07 100644
--- a/src/addons/mod/data/services/handlers/prefetch.ts
+++ b/src/addons/mod/data/services/handlers/prefetch.ts
@@ -261,7 +261,7 @@ export class AddonModDataPrefetchHandlerService extends CoreCourseActivityPrefet
         });
 
         // Add Basic Info to manage links.
-        promises.push(CoreCourse.getModuleBasicInfoByInstance(database.id, 'data', siteId));
+        promises.push(CoreCourse.getModuleBasicInfoByInstance(database.id, 'data', { siteId }));
 
         // Get course data, needed to determine upload max size if it's configured to be course limit.
         promises.push(CoreUtils.ignoreErrors(CoreCourses.getCourseByField('id', courseId, siteId)));
diff --git a/src/addons/mod/data/services/handlers/show-link.ts b/src/addons/mod/data/services/handlers/show-link.ts
index 1804755af..f30535768 100644
--- a/src/addons/mod/data/services/handlers/show-link.ts
+++ b/src/addons/mod/data/services/handlers/show-link.ts
@@ -18,6 +18,7 @@ import { CoreContentLinksHandlerBase } from '@features/contentlinks/classes/base
 import { CoreContentLinksAction } from '@features/contentlinks/services/contentlinks-delegate';
 import { CoreCourse } from '@features/course/services/course';
 import { CoreNavigator } from '@services/navigator';
+import { CoreSitesReadingStrategy } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { makeSingleton } from '@singletons';
 import { AddonModDataModuleHandlerService } from './module';
@@ -47,10 +48,13 @@ export class AddonModDataShowLinkHandlerService extends CoreContentLinksHandlerB
                 const page = parseInt(params.page, 10) || false;
 
                 try {
-                    const module = await CoreCourse.getModuleBasicInfoByInstance(dataId, 'data', siteId);
+                    const module = await CoreCourse.getModuleBasicInfoByInstance(
+                        dataId,
+                        'data',
+                        { siteId, readingStrategy: CoreSitesReadingStrategy.PREFER_CACHE },
+                    );
                     const pageParams: Params = {
-                        module: module,
-                        courseId: module.course,
+                        title: module.name,
                     };
 
                     if (group) {
diff --git a/src/addons/mod/feedback/services/feedback-helper.ts b/src/addons/mod/feedback/services/feedback-helper.ts
index bb0e6d6af..3c1a89ce9 100644
--- a/src/addons/mod/feedback/services/feedback-helper.ts
+++ b/src/addons/mod/feedback/services/feedback-helper.ts
@@ -176,7 +176,10 @@ export class AddonModFeedbackHelperProvider {
         const modal = await CoreDomUtils.showModalLoading();
 
         try {
-            const module = await CoreCourse.getModuleBasicInfo(Number(params.id), siteId);
+            const module = await CoreCourse.getModuleBasicInfo(
+                Number(params.id),
+                { siteId, readingStrategy: CoreSitesReadingStrategy.PREFER_CACHE },
+            );
 
             if (params.showcompleted === undefined) {
                 // Param showcompleted not defined. Show entry list.
diff --git a/src/addons/mod/feedback/services/feedback-sync.ts b/src/addons/mod/feedback/services/feedback-sync.ts
index 8b6702b8a..c7042e15f 100644
--- a/src/addons/mod/feedback/services/feedback-sync.ts
+++ b/src/addons/mod/feedback/services/feedback-sync.ts
@@ -223,7 +223,7 @@ export class AddonModFeedbackSyncProvider extends CoreCourseActivitySyncBaseProv
         if (result.updated) {
             // Data has been sent to server, update data.
             try {
-                const module = await CoreCourse.getModuleBasicInfoByInstance(feedbackId, 'feedback', siteId);
+                const module = await CoreCourse.getModuleBasicInfoByInstance(feedbackId, 'feedback', { siteId });
 
                 await this.prefetchAfterUpdate(AddonModFeedbackPrefetchHandler.instance, module, courseId, undefined, siteId);
             } catch {
diff --git a/src/addons/mod/feedback/services/handlers/analysis-link.ts b/src/addons/mod/feedback/services/handlers/analysis-link.ts
index 58a015234..f1b38c0dc 100644
--- a/src/addons/mod/feedback/services/handlers/analysis-link.ts
+++ b/src/addons/mod/feedback/services/handlers/analysis-link.ts
@@ -43,13 +43,11 @@ export class AddonModFeedbackAnalysisLinkHandlerService extends CoreContentLinks
                 const moduleId = Number(params.id);
 
                 try {
-                    const moduleBasicInfo = await CoreCourse.getModuleBasicInfo(moduleId, siteId);
-
                     // Get the module.
                     const module = await CoreCourse.getModule(
                         moduleId,
-                        moduleBasicInfo.course,
-                        moduleBasicInfo.section,
+                        undefined,
+                        undefined,
                         false,
                         false,
                         siteId,
diff --git a/src/addons/mod/feedback/services/handlers/complete-link.ts b/src/addons/mod/feedback/services/handlers/complete-link.ts
index 1415653fd..7ae34e1a5 100644
--- a/src/addons/mod/feedback/services/handlers/complete-link.ts
+++ b/src/addons/mod/feedback/services/handlers/complete-link.ts
@@ -17,6 +17,7 @@ import { CoreContentLinksHandlerBase } from '@features/contentlinks/classes/base
 import { CoreContentLinksAction } from '@features/contentlinks/services/contentlinks-delegate';
 import { CoreCourse } from '@features/course/services/course';
 import { CoreNavigator } from '@services/navigator';
+import { CoreSitesReadingStrategy } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { makeSingleton } from '@singletons';
 import { AddonModFeedbackModuleHandlerService } from './module';
@@ -43,7 +44,10 @@ export class AddonModFeedbackCompleteLinkHandlerService extends CoreContentLinks
                 const moduleId = Number(params.id);
 
                 try {
-                    const module = await CoreCourse.getModuleBasicInfo(moduleId, siteId);
+                    const module = await CoreCourse.getModuleBasicInfo(
+                        moduleId,
+                        { siteId, readingStrategy: CoreSitesReadingStrategy.PREFER_CACHE },
+                    );
 
                     CoreNavigator.navigateToSitePath(
                         AddonModFeedbackModuleHandlerService.PAGE_NAME + `/${module.course}/${module.id}/form`,
diff --git a/src/addons/mod/feedback/services/handlers/print-link.ts b/src/addons/mod/feedback/services/handlers/print-link.ts
index 20205347c..bb6d4d099 100644
--- a/src/addons/mod/feedback/services/handlers/print-link.ts
+++ b/src/addons/mod/feedback/services/handlers/print-link.ts
@@ -17,6 +17,7 @@ import { CoreContentLinksHandlerBase } from '@features/contentlinks/classes/base
 import { CoreContentLinksAction } from '@features/contentlinks/services/contentlinks-delegate';
 import { CoreCourse } from '@features/course/services/course';
 import { CoreNavigator } from '@services/navigator';
+import { CoreSitesReadingStrategy } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { makeSingleton } from '@singletons';
 import { AddonModFeedbackModuleHandlerService } from './module';
@@ -43,7 +44,10 @@ export class AddonModFeedbackPrintLinkHandlerService extends CoreContentLinksHan
                 const moduleId = Number(params.id);
 
                 try {
-                    const module = await CoreCourse.getModuleBasicInfo(moduleId, siteId);
+                    const module = await CoreCourse.getModuleBasicInfo(
+                        moduleId,
+                        { siteId, readingStrategy: CoreSitesReadingStrategy.PREFER_CACHE },
+                    );
 
                     CoreNavigator.navigateToSitePath(
                         AddonModFeedbackModuleHandlerService.PAGE_NAME + `/${module.course}/${module.id}/form`,
diff --git a/src/addons/mod/feedback/services/handlers/show-non-respondents-link.ts b/src/addons/mod/feedback/services/handlers/show-non-respondents-link.ts
index 992b9be0d..ea6e054ef 100644
--- a/src/addons/mod/feedback/services/handlers/show-non-respondents-link.ts
+++ b/src/addons/mod/feedback/services/handlers/show-non-respondents-link.ts
@@ -17,6 +17,7 @@ import { CoreContentLinksHandlerBase } from '@features/contentlinks/classes/base
 import { CoreContentLinksAction } from '@features/contentlinks/services/contentlinks-delegate';
 import { CoreCourse } from '@features/course/services/course';
 import { CoreNavigator } from '@services/navigator';
+import { CoreSitesReadingStrategy } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { makeSingleton } from '@singletons';
 import { AddonModFeedbackModuleHandlerService } from './module';
@@ -42,7 +43,10 @@ export class AddonModFeedbackShowNonRespondentsLinkHandlerService extends CoreCo
                 const moduleId = Number(params.id);
 
                 try {
-                    const module = await CoreCourse.getModuleBasicInfo(moduleId, siteId);
+                    const module = await CoreCourse.getModuleBasicInfo(
+                        moduleId,
+                        { siteId, readingStrategy: CoreSitesReadingStrategy.PREFER_CACHE },
+                    );
 
                     await CoreNavigator.navigateToSitePath(
                         AddonModFeedbackModuleHandlerService.PAGE_NAME + `/${module.course}/${module.id}/nonrespondents`,
diff --git a/src/addons/mod/folder/components/index/index.ts b/src/addons/mod/folder/components/index/index.ts
index 90e3f7ed4..73cdb6271 100644
--- a/src/addons/mod/folder/components/index/index.ts
+++ b/src/addons/mod/folder/components/index/index.ts
@@ -96,7 +96,7 @@ export class AddonModFolderIndexComponent extends CoreCourseModuleMainResourceCo
         try {
             this.folderInstance = await AddonModFolder.getFolder(this.courseId, this.module.id);
 
-            const contents = await CoreCourse.getModuleContents(this.module, this.courseId, undefined, false, refresh);
+            const contents = await CoreCourse.getModuleContents(this.module, undefined, undefined, false, refresh);
 
             this.dataRetrieved.emit(this.folderInstance || this.module);
 
diff --git a/src/addons/mod/forum/services/handlers/post-link.ts b/src/addons/mod/forum/services/handlers/post-link.ts
index 79002b558..4349b2aa9 100644
--- a/src/addons/mod/forum/services/handlers/post-link.ts
+++ b/src/addons/mod/forum/services/handlers/post-link.ts
@@ -18,6 +18,7 @@ import { CoreContentLinksHandlerBase } from '@features/contentlinks/classes/base
 import { CoreContentLinksAction } from '@features/contentlinks/services/contentlinks-delegate';
 import { CoreCourse } from '@features/course/services/course';
 import { CoreNavigator } from '@services/navigator';
+import { CoreSitesReadingStrategy } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { makeSingleton } from '@singletons';
 import { AddonModForumModuleHandlerService } from './module';
@@ -53,7 +54,11 @@ export class AddonModForumPostLinkHandlerService extends CoreContentLinksHandler
                 const forumId = parseInt(params.forum, 10);
 
                 try {
-                    const module = await CoreCourse.getModuleBasicInfoByInstance(forumId, 'forum', siteId);
+                    const module = await CoreCourse.getModuleBasicInfoByInstance(
+                        forumId,
+                        'forum',
+                        { siteId, readingStrategy: CoreSitesReadingStrategy.PREFER_CACHE },
+                    );
 
                     await CoreNavigator.navigateToSitePath(
                         `${AddonModForumModuleHandlerService.PAGE_NAME}/${module.course}/${module.id}/new/0`,
diff --git a/src/addons/mod/glossary/services/handlers/edit-link.ts b/src/addons/mod/glossary/services/handlers/edit-link.ts
index ffc4b3203..8859a6d72 100644
--- a/src/addons/mod/glossary/services/handlers/edit-link.ts
+++ b/src/addons/mod/glossary/services/handlers/edit-link.ts
@@ -17,6 +17,7 @@ import { CoreContentLinksHandlerBase } from '@features/contentlinks/classes/base
 import { CoreContentLinksAction } from '@features/contentlinks/services/contentlinks-delegate';
 import { CoreCourse } from '@features/course/services/course';
 import { CoreNavigator } from '@services/navigator';
+import { CoreSitesReadingStrategy } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { makeSingleton } from '@singletons';
 import { AddonModGlossaryModuleHandlerService } from './module';
@@ -44,7 +45,10 @@ export class AddonModGlossaryEditLinkHandlerService extends CoreContentLinksHand
                 const cmId = Number(params.cmid);
 
                 try {
-                    const module = await CoreCourse.getModuleBasicInfo(cmId, siteId);
+                    const module = await CoreCourse.getModuleBasicInfo(
+                        cmId,
+                        { siteId, readingStrategy: CoreSitesReadingStrategy.PREFER_CACHE },
+                    );
 
                     await CoreNavigator.navigateToSitePath(
                         AddonModGlossaryModuleHandlerService.PAGE_NAME + '/edit/0',
diff --git a/src/addons/mod/glossary/services/handlers/entry-link.ts b/src/addons/mod/glossary/services/handlers/entry-link.ts
index 9bf86e895..d58a0bac3 100644
--- a/src/addons/mod/glossary/services/handlers/entry-link.ts
+++ b/src/addons/mod/glossary/services/handlers/entry-link.ts
@@ -17,6 +17,7 @@ import { CoreContentLinksHandlerBase } from '@features/contentlinks/classes/base
 import { CoreContentLinksAction } from '@features/contentlinks/services/contentlinks-delegate';
 import { CoreCourse } from '@features/course/services/course';
 import { CoreNavigator } from '@services/navigator';
+import { CoreSitesReadingStrategy } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { makeSingleton } from '@singletons';
 import { AddonModGlossary } from '../glossary';
@@ -43,12 +44,15 @@ export class AddonModGlossaryEntryLinkHandlerService extends CoreContentLinksHan
                 try {
                     const entryId = params.mode == 'entry' ? Number(params.hook) : Number(params.eid);
 
-                    const response = await AddonModGlossary.getEntry(entryId, { siteId });
+                    const response = await AddonModGlossary.getEntry(
+                        entryId,
+                        { siteId, readingStrategy: CoreSitesReadingStrategy.PREFER_CACHE },
+                    );
 
                     const module = await CoreCourse.getModuleBasicInfoByInstance(
                         response.entry.glossaryid,
                         'glossary',
-                        siteId,
+                        { siteId, readingStrategy: CoreSitesReadingStrategy.PREFER_CACHE },
                     );
 
                     await CoreNavigator.navigateToSitePath(
diff --git a/src/addons/mod/glossary/services/handlers/prefetch.ts b/src/addons/mod/glossary/services/handlers/prefetch.ts
index 4ef05bccc..9945e4872 100644
--- a/src/addons/mod/glossary/services/handlers/prefetch.ts
+++ b/src/addons/mod/glossary/services/handlers/prefetch.ts
@@ -205,8 +205,8 @@ export class AddonModGlossaryPrefetchHandlerService extends CoreCourseActivityPr
         promises.push(AddonModGlossary.getAllCategories(glossary.id, options));
 
         // Prefetch data for link handlers.
-        promises.push(CoreCourse.getModuleBasicInfo(module.id, siteId));
-        promises.push(CoreCourse.getModuleBasicInfoByInstance(glossary.id, 'glossary', siteId));
+        promises.push(CoreCourse.getModuleBasicInfo(module.id, { siteId }));
+        promises.push(CoreCourse.getModuleBasicInfoByInstance(glossary.id, 'glossary', { siteId }));
 
         // Get course data, needed to determine upload max size if it's configured to be course limit.
         promises.push(CoreUtils.ignoreErrors(CoreCourses.getCourseByField('id', courseId, siteId)));
diff --git a/src/addons/mod/h5pactivity/services/handlers/report-link.ts b/src/addons/mod/h5pactivity/services/handlers/report-link.ts
index 760d0b72e..f2f37c19c 100644
--- a/src/addons/mod/h5pactivity/services/handlers/report-link.ts
+++ b/src/addons/mod/h5pactivity/services/handlers/report-link.ts
@@ -18,7 +18,7 @@ import { CoreContentLinksHandlerBase } from '@features/contentlinks/classes/base
 import { CoreContentLinksAction } from '@features/contentlinks/services/contentlinks-delegate';
 import { CoreCourse } from '@features/course/services/course';
 import { CoreNavigator } from '@services/navigator';
-import { CoreSites } from '@services/sites';
+import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { makeSingleton } from '@singletons';
 import { AddonModH5PActivity } from '../h5pactivity';
@@ -41,54 +41,36 @@ export class AddonModH5PActivityReportLinkHandlerService extends CoreContentLink
         siteIds: string[],
         url: string,
         params: Record<string, string>,
-        courseId?: number,
     ): CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
-        courseId = courseId || Number(params.courseid) || Number(params.cid);
-
         return [{
             action: async (siteId) => {
+                const modal = await CoreDomUtils.showModalLoading();
+
                 try {
                     const instanceId = Number(params.a);
 
-                    if (!courseId) {
-                        courseId = await this.getCourseId(instanceId, siteId);
-                    }
-
-                    const module = await CoreCourse.getModuleBasicInfoByInstance(instanceId, 'h5pactivity', siteId);
+                    const module = await CoreCourse.getModuleBasicInfoByInstance(
+                        instanceId,
+                        'h5pactivity',
+                        { siteId, readingStrategy: CoreSitesReadingStrategy.PREFER_CACHE },
+                    );
 
                     if (params.attemptid !== undefined) {
-                        this.openAttemptResults(module.id, Number(params.attemptid), courseId, siteId);
+                        this.openAttemptResults(module.id, Number(params.attemptid), module.course, siteId);
                     } else {
                         const userId = params.userid ? Number(params.userid) : undefined;
 
-                        this.openUserAttempts(module.id, courseId, siteId, userId);
+                        this.openUserAttempts(module.id, module.course, siteId, userId);
                     }
                 } catch (error) {
                     CoreDomUtils.showErrorModalDefault(error, 'Error processing link.');
+                } finally {
+                    modal.dismiss();
                 }
             },
         }];
     }
 
-    /**
-     * Get course Id for an activity.
-     *
-     * @param id Activity ID.
-     * @param siteId Site ID.
-     * @return Promise resolved with course ID.
-     */
-    protected async getCourseId(id: number, siteId: string): Promise<number> {
-        const modal = await CoreDomUtils.showModalLoading();
-
-        try {
-            const module = await CoreCourse.getModuleBasicInfoByInstance(id, 'h5pactivity', siteId);
-
-            return module.course;
-        } finally {
-            modal.dismiss();
-        }
-    }
-
     /**
      * @inheritdoc
      */
diff --git a/src/addons/mod/imscp/components/index/index.ts b/src/addons/mod/imscp/components/index/index.ts
index 6ed251203..0b6ae75a5 100644
--- a/src/addons/mod/imscp/components/index/index.ts
+++ b/src/addons/mod/imscp/components/index/index.ts
@@ -84,7 +84,7 @@ export class AddonModImscpIndexComponent extends CoreCourseModuleMainResourceCom
             this.dataRetrieved.emit(imscp);
 
             // Get contents. No need to refresh, it has been done in downloadResourceIfNeeded.
-            const contents = await CoreCourse.getModuleContents(this.module, this.courseId);
+            const contents = await CoreCourse.getModuleContents(this.module);
 
             this.items = AddonModImscp.createItemList(contents);
 
diff --git a/src/addons/mod/lesson/services/handlers/grade-link.ts b/src/addons/mod/lesson/services/handlers/grade-link.ts
index 3bc46f80b..bc16a1ef5 100644
--- a/src/addons/mod/lesson/services/handlers/grade-link.ts
+++ b/src/addons/mod/lesson/services/handlers/grade-link.ts
@@ -18,6 +18,7 @@ import { CoreContentLinksModuleGradeHandler } from '@features/contentlinks/class
 import { CoreCourse } from '@features/course/services/course';
 import { CoreCourseHelper } from '@features/course/services/course-helper';
 import { CoreNavigator } from '@services/navigator';
+import { CoreSitesReadingStrategy } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { makeSingleton } from '@singletons';
 import { AddonModLesson } from '../lesson';
@@ -57,8 +58,10 @@ export class AddonModLessonGradeLinkHandlerService extends CoreContentLinksModul
         const modal = await CoreDomUtils.showModalLoading();
 
         try {
-            const module = await CoreCourse.getModuleBasicInfo(moduleId, siteId);
-            courseId = Number(module.course || courseId || params.courseid || params.cid);
+            const module = await CoreCourse.getModuleBasicInfo(
+                moduleId,
+                { siteId, readingStrategy: CoreSitesReadingStrategy.PREFER_CACHE },
+            );
 
             // Check if the user can see the user reports in the lesson.
             const accessInfo = await AddonModLesson.getAccessInformation(module.instance, { cmId: module.id, siteId });
@@ -66,14 +69,14 @@ export class AddonModLessonGradeLinkHandlerService extends CoreContentLinksModul
             if (accessInfo.canviewreports) {
                 // User can view reports, go to view the report.
                 CoreNavigator.navigateToSitePath(
-                    AddonModLessonModuleHandlerService.PAGE_NAME + `/${courseId}/${module.id}/user-retake/${userId}`,
+                    AddonModLessonModuleHandlerService.PAGE_NAME + `/${module.course}/${module.id}/user-retake/${userId}`,
                     {
                         siteId,
                     },
                 );
             } else {
                 // User cannot view the report, go to lesson index.
-                CoreCourseHelper.navigateToModule(moduleId, siteId, courseId, module.section);
+                CoreCourseHelper.navigateToModule(moduleId, siteId, module.course, module.section);
             }
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'core.course.errorgetmodule', true);
diff --git a/src/addons/mod/lesson/services/handlers/index-link.ts b/src/addons/mod/lesson/services/handlers/index-link.ts
index 98b647e8e..21be65658 100644
--- a/src/addons/mod/lesson/services/handlers/index-link.ts
+++ b/src/addons/mod/lesson/services/handlers/index-link.ts
@@ -18,6 +18,7 @@ import { CoreContentLinksModuleIndexHandler } from '@features/contentlinks/class
 import { CoreContentLinksAction } from '@features/contentlinks/services/contentlinks-delegate';
 import { CoreCourse } from '@features/course/services/course';
 import { CoreCourseHelper } from '@features/course/services/course-helper';
+import { CoreSitesReadingStrategy } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
 import { makeSingleton } from '@singletons';
@@ -85,14 +86,15 @@ export class AddonModLessonIndexLinkHandlerService extends CoreContentLinksModul
 
         try {
             // Get the module.
-            const module = await CoreCourse.getModuleBasicInfo(moduleId, siteId);
-
-            courseId = courseId || module.course;
+            const module = await CoreCourse.getModuleBasicInfo(
+                moduleId,
+                { siteId, readingStrategy: CoreSitesReadingStrategy.PREFER_CACHE },
+            );
 
             // Store the password so it's automatically used.
             await CoreUtils.ignoreErrors(AddonModLesson.storePassword(module.instance, password, siteId));
 
-            await CoreCourseHelper.navigateToModule(moduleId, siteId, courseId, module.section);
+            await CoreCourseHelper.navigateToModule(moduleId, siteId, module.course, module.section);
         } catch {
             // Error, go to index page.
             await CoreCourseHelper.navigateToModule(moduleId, siteId, courseId);
diff --git a/src/addons/mod/lesson/services/handlers/report-link.ts b/src/addons/mod/lesson/services/handlers/report-link.ts
index 7a068134a..355476434 100644
--- a/src/addons/mod/lesson/services/handlers/report-link.ts
+++ b/src/addons/mod/lesson/services/handlers/report-link.ts
@@ -18,6 +18,7 @@ import { CoreContentLinksHandlerBase } from '@features/contentlinks/classes/base
 import { CoreContentLinksAction } from '@features/contentlinks/services/contentlinks-delegate';
 import { CoreCourse } from '@features/course/services/course';
 import { CoreNavigator } from '@services/navigator';
+import { CoreSitesReadingStrategy } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { makeSingleton } from '@singletons';
 import { AddonModLessonModuleHandlerService } from './module';
@@ -38,26 +39,20 @@ export class AddonModLessonReportLinkHandlerService extends CoreContentLinksHand
      * @param siteIds List of sites the URL belongs to.
      * @param url The URL to treat.
      * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param courseId Course ID related to the URL. Optional but recommended.
-     * @param data Extra data to handle the URL.
      * @return List of (or promise resolved with list of) actions.
      */
     getActions(
         siteIds: string[],
         url: string,
         params: Record<string, string>,
-        courseId?: number,
-        data?: unknown, // eslint-disable-line @typescript-eslint/no-unused-vars
     ): CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
-        courseId = Number(courseId || params.courseid || params.cid);
-
         return [{
             action: (siteId) => {
                 if (!params.action || params.action == 'reportoverview') {
                     // Go to overview.
-                    this.openReportOverview(Number(params.id), courseId, Number(params.group), siteId);
+                    this.openReportOverview(Number(params.id), Number(params.group), siteId);
                 } else if (params.action == 'reportdetail') {
-                    this.openUserRetake(Number(params.id), Number(params.userid), Number(params.try), siteId, courseId);
+                    this.openUserRetake(Number(params.id), Number(params.userid), Number(params.try), siteId);
                 }
             },
         }];
@@ -70,11 +65,9 @@ export class AddonModLessonReportLinkHandlerService extends CoreContentLinksHand
      * @param siteId The site ID.
      * @param url The URL to treat.
      * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param courseId Course ID related to the URL. Optional but recommended.
      * @return Whether the handler is enabled for the URL and site.
      */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async isEnabled(siteId: string, url: string, params: Record<string, string>, courseId?: number): Promise<boolean> {
+    async isEnabled(siteId: string, url: string, params: Record<string, string>): Promise<boolean> {
         if (params.action == 'reportdetail' && !params.userid) {
             // Individual details are only available if the teacher is seeing a certain user.
             return false;
@@ -87,29 +80,33 @@ export class AddonModLessonReportLinkHandlerService extends CoreContentLinksHand
      * Open report overview.
      *
      * @param moduleId Module ID.
-     * @param courseId Course ID.
      * @param groupId Group ID.
      * @param siteId Site ID.
-     * @param navCtrl The NavController to use to navigate.
      * @return Promise resolved when done.
      */
-    protected async openReportOverview(moduleId: number, courseId?: number, groupId?: number, siteId?: string): Promise<void> {
+    protected async openReportOverview(moduleId: number, groupId?: number, siteId?: string): Promise<void> {
 
         const modal = await CoreDomUtils.showModalLoading();
 
         try {
             // Get the module object.
-            const module = await CoreCourse.getModuleBasicInfo(moduleId, siteId);
+            const module = await CoreCourse.getModule(
+                moduleId,
+                undefined,
+                undefined,
+                false,
+                false,
+                siteId,
+            );
 
-            courseId = courseId || module.course;
             const params = {
-                module: module,
+                module,
                 action: 'report',
                 group: groupId === undefined || isNaN(groupId) ? null : groupId,
             };
 
             CoreNavigator.navigateToSitePath(
-                `${AddonModLessonModuleHandlerService.PAGE_NAME}/${courseId}/${module.id}`,
+                `${AddonModLessonModuleHandlerService.PAGE_NAME}/${module.course}/${module.id}`,
                 { params, siteId },
             );
         } catch (error) {
@@ -126,7 +123,6 @@ export class AddonModLessonReportLinkHandlerService extends CoreContentLinksHand
      * @param userId User ID.
      * @param retake Retake to open.
      * @param siteId Site ID.
-     * @param courseId Course ID.
      * @return Promise resolved when done.
      */
     protected async openUserRetake(
@@ -134,22 +130,22 @@ export class AddonModLessonReportLinkHandlerService extends CoreContentLinksHand
         userId: number,
         retake: number,
         siteId: string,
-        courseId?: number,
     ): Promise<void> {
 
         const modal = await CoreDomUtils.showModalLoading();
 
         try {
             // Get the module object.
-            const module = await CoreCourse.getModuleBasicInfo(moduleId, siteId);
-
-            courseId = courseId || module.course;
+            const module = await CoreCourse.getModuleBasicInfo(
+                moduleId,
+                { siteId, readingStrategy: CoreSitesReadingStrategy.PREFER_CACHE },
+            );
             const params = {
                 retake: retake || 0,
             };
 
             CoreNavigator.navigateToSitePath(
-                AddonModLessonModuleHandlerService.PAGE_NAME + `/${courseId}/${module.id}/user-retake/${userId}`,
+                AddonModLessonModuleHandlerService.PAGE_NAME + `/${module.course}/${module.id}/user-retake/${userId}`,
                 { params, siteId },
             );
         } catch (error) {
diff --git a/src/addons/mod/lesson/services/lesson-sync.ts b/src/addons/mod/lesson/services/lesson-sync.ts
index 55d5fa55f..9ad52a558 100644
--- a/src/addons/mod/lesson/services/lesson-sync.ts
+++ b/src/addons/mod/lesson/services/lesson-sync.ts
@@ -243,7 +243,7 @@ export class AddonModLessonSyncProvider extends CoreCourseActivitySyncBaseProvid
         if (result.updated && result.courseId) {
             try {
                 // Data has been sent to server, update data.
-                const module = await CoreCourse.getModuleBasicInfoByInstance(lessonId, 'lesson', siteId);
+                const module = await CoreCourse.getModuleBasicInfoByInstance(lessonId, 'lesson', { siteId });
                 await this.prefetchAfterUpdate(AddonModLessonPrefetchHandler.instance, module, result.courseId, undefined, siteId);
             } catch {
                 // Ignore errors.
diff --git a/src/addons/mod/page/components/index/index.ts b/src/addons/mod/page/components/index/index.ts
index e416a9244..dfba12b29 100644
--- a/src/addons/mod/page/components/index/index.ts
+++ b/src/addons/mod/page/components/index/index.ts
@@ -82,7 +82,7 @@ export class AddonModPageIndexComponent extends CoreCourseModuleMainResourceComp
             const downloadResult = await this.downloadResourceIfNeeded(refresh);
 
             // Get contents. No need to refresh, it has been done in downloadResourceIfNeeded.
-            const contents = await CoreCourse.getModuleContents(this.module, this.courseId);
+            const contents = await CoreCourse.getModuleContents(this.module);
 
             const results = await Promise.all([
                 this.loadPageData(),
diff --git a/src/addons/mod/quiz/services/handlers/push-click.ts b/src/addons/mod/quiz/services/handlers/push-click.ts
index b326cc699..7144d7a03 100644
--- a/src/addons/mod/quiz/services/handlers/push-click.ts
+++ b/src/addons/mod/quiz/services/handlers/push-click.ts
@@ -62,7 +62,6 @@ export class AddonModQuizPushClickHandlerService implements CorePushNotification
             return AddonModQuizHelper.handleReviewLink(
                 Number(contextUrlParams.attempt),
                 Number(contextUrlParams.page),
-                courseId,
                 Number(data.instance),
                 notification.site,
             );
diff --git a/src/addons/mod/quiz/services/handlers/review-link.ts b/src/addons/mod/quiz/services/handlers/review-link.ts
index 413aea88b..d2c7cdd3b 100644
--- a/src/addons/mod/quiz/services/handlers/review-link.ts
+++ b/src/addons/mod/quiz/services/handlers/review-link.ts
@@ -46,17 +46,13 @@ export class AddonModQuizReviewLinkHandlerService extends CoreContentLinksHandle
         courseId?: number,
         data?: Record<string, unknown>,
     ): CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
-
-        courseId = Number(courseId || params.courseid || params.cid);
-        data = data || {};
+        const quizId = data?.instance ? Number(data.instance) : undefined;
 
         return [{
             action: (siteId): void => {
                 const attemptId = parseInt(params.attempt, 10);
                 const page = parseInt(params.page, 10);
-                const quizId = data!.instance ? Number(data!.instance) : undefined;
-
-                AddonModQuizHelper.handleReviewLink(attemptId, page, courseId, quizId, siteId);
+                AddonModQuizHelper.handleReviewLink(attemptId, page, quizId, siteId);
             },
         }];
     }
diff --git a/src/addons/mod/quiz/services/quiz-helper.ts b/src/addons/mod/quiz/services/quiz-helper.ts
index d94ccba31..4eeb1755a 100644
--- a/src/addons/mod/quiz/services/quiz-helper.ts
+++ b/src/addons/mod/quiz/services/quiz-helper.ts
@@ -215,12 +215,11 @@ export class AddonModQuizHelperProvider {
      *
      * @param attemptId Attempt ID.
      * @param page Page to load, -1 to all questions in same page.
-     * @param courseId Course ID.
      * @param quizId Quiz ID.
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when done.
      */
-    async handleReviewLink(attemptId: number, page?: number, courseId?: number, quizId?: number, siteId?: string): Promise<void> {
+    async handleReviewLink(attemptId: number, page?: number, quizId?: number, siteId?: string): Promise<void> {
         siteId = siteId || CoreSites.getCurrentSiteId();
 
         const modal = await CoreDomUtils.showModalLoading();
@@ -230,13 +229,15 @@ export class AddonModQuizHelperProvider {
                 quizId = await this.getQuizIdByAttemptId(attemptId, { siteId });
             }
 
-            const module = await CoreCourse.getModuleBasicInfoByInstance(quizId, 'quiz', siteId);
-
-            courseId = courseId || module.course;
+            const module = await CoreCourse.getModuleBasicInfoByInstance(
+                quizId,
+                'quiz',
+                { siteId, readingStrategy: CoreSitesReadingStrategy.PREFER_CACHE },
+            );
 
             // Go to the review page.
             await CoreNavigator.navigateToSitePath(
-                `${AddonModQuizModuleHandlerService.PAGE_NAME}/${courseId}/${module.id}/review/${attemptId}`,
+                `${AddonModQuizModuleHandlerService.PAGE_NAME}/${module.course}/${module.id}/review/${attemptId}`,
                 {
                     params: {
                         page: page == undefined || isNaN(page) ? -1 : page,
diff --git a/src/addons/mod/quiz/services/quiz-sync.ts b/src/addons/mod/quiz/services/quiz-sync.ts
index 6990384f1..4f4aed5d0 100644
--- a/src/addons/mod/quiz/services/quiz-sync.ts
+++ b/src/addons/mod/quiz/services/quiz-sync.ts
@@ -16,7 +16,7 @@ import { Injectable } from '@angular/core';
 
 import { CoreError } from '@classes/errors/error';
 import { CoreCourseActivitySyncBaseProvider } from '@features/course/classes/activity-sync';
-import { CoreCourse, CoreCourseAnyModuleData } from '@features/course/services/course';
+import { CoreCourse, CoreCourseModuleBasicInfo } from '@features/course/services/course';
 import { CoreCourseLogHelper } from '@features/course/services/log-helper';
 import { CoreCourseModulePrefetchDelegate } from '@features/course/services/module-prefetch-delegate';
 import { CoreQuestion, CoreQuestionQuestionParsed } from '@features/question/services/question';
@@ -92,9 +92,9 @@ export class AddonModQuizSyncProvider extends CoreCourseActivitySyncBaseProvider
         if (options.updated) {
             try {
                 // Data has been sent. Update prefetched data.
-                const module = await CoreCourse.getModuleBasicInfoByInstance(quiz.id, 'quiz', siteId);
+                const module = await CoreCourse.getModuleBasicInfoByInstance(quiz.id, 'quiz', { siteId });
 
-                await this.prefetchAfterUpdateQuiz(module, quiz, courseId, undefined, siteId);
+                await this.prefetchAfterUpdateQuiz(module, quiz, courseId, siteId);
             } catch {
                 // Ignore errors.
             }
@@ -139,27 +139,25 @@ export class AddonModQuizSyncProvider extends CoreCourseActivitySyncBaseProvider
      * @param module Module.
      * @param quiz Quiz.
      * @param courseId Course ID.
-     * @param regex If regex matches, don't download the data. Defaults to check files.
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when done.
      */
-    async prefetchAfterUpdateQuiz(
-        module: CoreCourseAnyModuleData,
+    protected async prefetchAfterUpdateQuiz(
+        module: CoreCourseModuleBasicInfo,
         quiz: AddonModQuizQuizWSData,
         courseId: number,
-        regex?: RegExp,
         siteId?: string,
     ): Promise<void> {
-        regex = regex || /^.*files$/;
-
         let shouldDownload = false;
 
         // Get the module updates to check if the data was updated or not.
         const result = await CoreCourseModulePrefetchDelegate.getModuleUpdates(module, courseId, true, siteId);
 
         if (result?.updates?.length) {
+            const regex = /^.*files$/;
+
             // Only prefetch if files haven't changed.
-            shouldDownload = !result.updates.find((entry) => entry.name.match(regex!));
+            shouldDownload = !result.updates.find((entry) => entry.name.match(regex));
 
             if (shouldDownload) {
                 await AddonModQuizPrefetchHandler.download(module, courseId, undefined, false, false);
diff --git a/src/addons/mod/resource/components/index/index.ts b/src/addons/mod/resource/components/index/index.ts
index 8064bfd14..3987378fc 100644
--- a/src/addons/mod/resource/components/index/index.ts
+++ b/src/addons/mod/resource/components/index/index.ts
@@ -101,7 +101,7 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
      */
     protected async fetchContent(refresh?: boolean): Promise<void> {
         // Load module contents if needed. Passing refresh is needed to force reloading contents.
-        const contents = await CoreCourse.getModuleContents(this.module, this.courseId, undefined, false, refresh);
+        const contents = await CoreCourse.getModuleContents(this.module, undefined, undefined, false, refresh);
 
         if (!contents.length) {
             throw new CoreError(Translate.instant('core.filenotfound'));
@@ -148,7 +148,7 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
                 this.mode = 'embedded';
                 this.warning = '';
 
-                this.contentText = await AddonModResourceHelper.getEmbeddedHtml(this.module, this.courseId);
+                this.contentText = await AddonModResourceHelper.getEmbeddedHtml(this.module);
                 this.mode = this.contentText.length > 0 ? 'embedded' : 'external';
             } else {
                 this.mode = 'external';
diff --git a/src/addons/mod/resource/services/handlers/module.ts b/src/addons/mod/resource/services/handlers/module.ts
index 965b062dc..205173fe6 100644
--- a/src/addons/mod/resource/services/handlers/module.ts
+++ b/src/addons/mod/resource/services/handlers/module.ts
@@ -85,7 +85,7 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase
             icon: openWithPicker ? 'fas-share-square' : 'fas-file',
             label: module.name + ': ' + Translate.instant(openWithPicker ? 'core.openwith' : 'addon.mod_resource.openthefile'),
             action: async (event: Event, module: CoreCourseModuleData, courseId: number): Promise<void> => {
-                const hide = await this.hideOpenButton(module, courseId);
+                const hide = await this.hideOpenButton(module);
                 if (!hide) {
                     AddonModResourceHelper.openModuleFile(module, courseId);
                 }
@@ -109,15 +109,14 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase
      * Returns if contents are loaded to show open button.
      *
      * @param module The module object.
-     * @param courseId The course ID.
      * @return Resolved when done.
      */
-    protected async hideOpenButton(module: CoreCourseModuleData, courseId: number): Promise<boolean> {
-        if (!('contentsinfo' in module) || !module.contentsinfo) {
-            await CoreCourse.loadModuleContents(module, courseId, undefined, false, false, undefined, this.modName);
+    protected async hideOpenButton(module: CoreCourseModuleData): Promise<boolean> {
+        if (!module.contentsinfo) { // Not informed before 3.7.6.
+            await CoreCourse.loadModuleContents(module, undefined, undefined, false, false, undefined, this.modName);
         }
 
-        const status = await CoreCourseModulePrefetchDelegate.getModuleStatus(module, courseId);
+        const status = await CoreCourseModulePrefetchDelegate.getModuleStatus(module, module.course);
 
         return status !== CoreConstants.DOWNLOADED || AddonModResourceHelper.isDisplayedInIframe(module);
     }
@@ -138,7 +137,7 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase
         let options: AddonModResourceCustomData = {};
 
         // Check if the button needs to be shown or not.
-        promises.push(this.hideOpenButton(module, courseId).then((hideOpenButton) => {
+        promises.push(this.hideOpenButton(module).then((hideOpenButton) => {
             if (!handlerData.buttons) {
                 return;
             }
@@ -148,7 +147,7 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase
             return;
         }));
 
-        if ('customdata' in module && module.customdata !== undefined) {
+        if (module.customdata !== undefined) {
             options = CoreTextUtils.unserialize(CoreTextUtils.parseJSON(module.customdata));
         } else {
             // Get the resource data.
@@ -164,7 +163,7 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase
         let mimetypeIcon = '';
         const extra: string[] = [];
 
-        if ('contentsinfo' in module && module.contentsinfo) {
+        if (module.contentsinfo) {
             // No need to use the list of files.
             const mimetype = module.contentsinfo.mimetypes[0];
             if (mimetype) {
@@ -235,7 +234,7 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase
         }
         let mimetypeIcon = '';
 
-        if ('contentsinfo' in module && module.contentsinfo) {
+        if (module.contentsinfo) {
             // No need to use the list of files.
             const mimetype = module.contentsinfo.mimetypes[0];
             if (mimetype) {
diff --git a/src/addons/mod/resource/services/resource-helper.ts b/src/addons/mod/resource/services/resource-helper.ts
index 59c695869..f0975eacf 100644
--- a/src/addons/mod/resource/services/resource-helper.ts
+++ b/src/addons/mod/resource/services/resource-helper.ts
@@ -39,15 +39,14 @@ export class AddonModResourceHelperProvider {
      * Get the HTML to display an embedded resource.
      *
      * @param module The module object.
-     * @param courseId The course ID.
      * @return Promise resolved with the HTML.
      */
-    async getEmbeddedHtml(module: CoreCourseModuleData, courseId: number): Promise<string> {
-        const contents = await CoreCourse.getModuleContents(module, courseId);
+    async getEmbeddedHtml(module: CoreCourseModuleData): Promise<string> {
+        const contents = await CoreCourse.getModuleContents(module);
 
         const result = await CoreCourseHelper.downloadModuleWithMainFileIfNeeded(
             module,
-            courseId,
+            module.course,
             AddonModResourceProvider.COMPONENT,
             module.id,
             contents,
@@ -124,14 +123,14 @@ export class AddonModResourceHelperProvider {
      * @param module The module object.
      * @return Whether the resource should be displayed in an iframe.
      */
-    isDisplayedInIframe(module: CoreCourseAnyModuleData): boolean {
+    isDisplayedInIframe(module: CoreCourseModuleData): boolean {
         if (!CoreFile.isAvailable()) {
             return false;
         }
 
         let mimetype: string | undefined;
 
-        if ('contentsinfo' in module && module.contentsinfo) {
+        if (module.contentsinfo) {
             mimetype = module.contentsinfo.mimetypes[0];
         } else if (module.contents) {
             const ext = CoreMimetypeUtils.getFileExtension(module.contents[0].filename);
diff --git a/src/addons/mod/scorm/services/scorm-sync.ts b/src/addons/mod/scorm/services/scorm-sync.ts
index 520864d6e..19d073614 100644
--- a/src/addons/mod/scorm/services/scorm-sync.ts
+++ b/src/addons/mod/scorm/services/scorm-sync.ts
@@ -198,7 +198,7 @@ export class AddonModScormSyncProvider extends CoreCourseActivitySyncBaseProvide
         if (updated) {
             try {
                 // Update downloaded data.
-                const module = await CoreCourse.getModule(scorm.coursemodule, scorm.course, undefined, false, false, siteId);
+                const module = await CoreCourse.getModuleBasicInfoByInstance(scorm.id, 'scorm', { siteId });
 
                 await this.prefetchAfterUpdate(AddonModScormPrefetchHandler.instance, module, scorm.course, undefined, siteId);
             } catch {
diff --git a/src/addons/mod/survey/services/survey-sync.ts b/src/addons/mod/survey/services/survey-sync.ts
index e128b0b1e..4ed43f0dd 100644
--- a/src/addons/mod/survey/services/survey-sync.ts
+++ b/src/addons/mod/survey/services/survey-sync.ts
@@ -202,7 +202,7 @@ export class AddonModSurveySyncProvider extends CoreCourseActivitySyncBaseProvid
                 await AddonModSurvey.invalidateSurveyData(result.courseId, siteId);
 
                 // Data has been sent to server, update survey data.
-                const module = await CoreCourse.getModuleBasicInfoByInstance(surveyId, 'survey', siteId);
+                const module = await CoreCourse.getModuleBasicInfoByInstance(surveyId, 'survey', { siteId });
 
                 CoreUtils.ignoreErrors(
                     this.prefetchAfterUpdate(AddonModSurveyPrefetchHandler.instance, module, result.courseId, undefined, siteId),
diff --git a/src/addons/mod/url/components/index/index.ts b/src/addons/mod/url/components/index/index.ts
index 0c1c8c16a..b79ee6610 100644
--- a/src/addons/mod/url/components/index/index.ts
+++ b/src/addons/mod/url/components/index/index.ts
@@ -98,7 +98,7 @@ export class AddonModUrlIndexComponent extends CoreCourseModuleMainResourceCompo
             // Try to get module contents, it's needed to get the URL with parameters.
             const contents = await CoreCourse.getModuleContents(
                 this.module,
-                this.courseId,
+                undefined,
                 undefined,
                 false,
                 refresh,
diff --git a/src/addons/mod/url/services/handlers/module.ts b/src/addons/mod/url/services/handlers/module.ts
index eeea17039..ed9e30713 100644
--- a/src/addons/mod/url/services/handlers/module.ts
+++ b/src/addons/mod/url/services/handlers/module.ts
@@ -54,7 +54,7 @@ export class AddonModUrlModuleHandlerService extends CoreModuleHandlerBase imple
     /**
      * @inheritdoc
      */
-    async getData(module: CoreCourseModuleData, courseId: number): Promise<CoreCourseModuleHandlerData> {
+    async getData(module: CoreCourseModuleData): Promise<CoreCourseModuleHandlerData> {
 
         /**
          * Open the URL.
@@ -62,17 +62,17 @@ export class AddonModUrlModuleHandlerService extends CoreModuleHandlerBase imple
          * @param module The module object.
          * @param courseId The course ID.
          */
-        const openUrl = async (module: CoreCourseModuleData, courseId: number): Promise<void> => {
+        const openUrl = async (module: CoreCourseModuleData): Promise<void> => {
             try {
                 if (module.instance) {
                     await AddonModUrl.logView(module.instance, module.name);
-                    CoreCourse.checkModuleCompletion(courseId, module.completiondata);
+                    CoreCourse.checkModuleCompletion(module.course, module.completiondata);
                 }
             } catch {
                 // Ignore errors.
             }
 
-            const contents = await CoreCourse.getModuleContents(module, courseId);
+            const contents = await CoreCourse.getModuleContents(module);
             AddonModUrlHelper.open(contents[0].fileurl);
         };
 
@@ -85,12 +85,12 @@ export class AddonModUrlModuleHandlerService extends CoreModuleHandlerBase imple
                 const modal = await CoreDomUtils.showModalLoading();
 
                 try {
-                    const shouldOpen = await this.shouldOpenLink(module, courseId);
+                    const shouldOpen = await this.shouldOpenLink(module);
 
                     if (shouldOpen) {
-                        openUrl(module, courseId);
+                        openUrl(module);
                     } else {
-                        this.openActivityPage(module, courseId, options);
+                        this.openActivityPage(module, module.course, options);
                     }
                 } finally {
                     modal.dismiss();
@@ -100,13 +100,13 @@ export class AddonModUrlModuleHandlerService extends CoreModuleHandlerBase imple
                 hidden: true, // Hide it until we calculate if it should be displayed or not.
                 icon: 'fas-link',
                 label: 'core.openmodinbrowser',
-                action: (event: Event, module: CoreCourseModuleData, courseId: number): void => {
-                    openUrl(module, courseId);
+                action: (event: Event, module: CoreCourseModuleData): void => {
+                    openUrl(module);
                 },
             }],
         };
 
-        this.hideLinkButton(module, courseId).then(async (hideButton) => {
+        this.hideLinkButton(module).then(async (hideButton) => {
             if (!handlerData.buttons) {
                 return;
             }
@@ -135,9 +135,10 @@ export class AddonModUrlModuleHandlerService extends CoreModuleHandlerBase imple
      * @param courseId The course ID.
      * @return Resolved when done.
      */
-    protected async hideLinkButton(module: CoreCourseModuleData, courseId: number): Promise<boolean> {
+    protected async hideLinkButton(module: CoreCourseModuleData): Promise<boolean> {
         try {
-            const contents = await CoreCourse.getModuleContents(module, courseId, undefined, false, false, undefined, this.modName);
+            const contents =
+                await CoreCourse.getModuleContents(module, undefined, undefined, false, false, undefined, this.modName);
 
             return !(contents[0] && contents[0].fileurl);
         } catch {
@@ -157,22 +158,22 @@ export class AddonModUrlModuleHandlerService extends CoreModuleHandlerBase imple
      * Check whether the link should be opened directly.
      *
      * @param module Module.
-     * @param courseId Course ID.
      * @return Promise resolved with boolean.
      */
-    protected async shouldOpenLink(module: CoreCourseModuleData, courseId?: number): Promise<boolean> {
+    protected async shouldOpenLink(module: CoreCourseModuleData): Promise<boolean> {
         try {
-            const contents = await CoreCourse.getModuleContents(module, courseId, undefined, false, false, undefined, this.modName);
+            const contents =
+                await CoreCourse.getModuleContents(module, undefined, undefined, false, false, undefined, this.modName);
 
             // Check if the URL can be handled by the app. If so, always open it directly.
-            const canHandle = await CoreContentLinksHelper.canHandleLink(contents[0].fileurl, courseId, undefined, true);
+            const canHandle = await CoreContentLinksHelper.canHandleLink(contents[0].fileurl, module.course, undefined, true);
 
             if (canHandle) {
                 // URL handled by the app, open it directly.
                 return true;
             } else {
                 // Not handled by the app, check the display type.
-                const url = courseId ? await CoreUtils.ignoreErrors(AddonModUrl.getUrl(courseId, module.id)) : undefined;
+                const url = await CoreUtils.ignoreErrors(AddonModUrl.getUrl(module.course, module.id));
                 const displayType = AddonModUrl.getFinalDisplayType(url);
 
                 return displayType == CoreConstants.RESOURCELIB_DISPLAY_OPEN ||
@@ -187,7 +188,7 @@ export class AddonModUrlModuleHandlerService extends CoreModuleHandlerBase imple
      * @inheritdoc
      */
     manualCompletionAlwaysShown(module: CoreCourseModuleData): Promise<boolean> {
-        return this.shouldOpenLink(module, module.course);
+        return this.shouldOpenLink(module);
     }
 
 }
diff --git a/src/addons/mod/wiki/pages/edit/edit.ts b/src/addons/mod/wiki/pages/edit/edit.ts
index 3777fbb3b..48f2c2adf 100644
--- a/src/addons/mod/wiki/pages/edit/edit.ts
+++ b/src/addons/mod/wiki/pages/edit/edit.ts
@@ -18,7 +18,7 @@ import { CoreError } from '@classes/errors/error';
 import { CoreCourse } from '@features/course/services/course';
 import { CanLeave } from '@guards/can-leave';
 import { CoreNavigator } from '@services/navigator';
-import { CoreSites } from '@services/sites';
+import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
 import { CoreSync } from '@services/sync';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTextUtils } from '@services/utils/text';
@@ -262,7 +262,11 @@ export class AddonModWikiEditPage implements OnInit, OnDestroy, CanLeave {
             return;
         }
 
-        const module = await CoreCourse.getModuleBasicInfoByInstance(this.wikiId, 'wiki');
+        const module = await CoreCourse.getModuleBasicInfoByInstance(
+            this.wikiId,
+            'wiki',
+            { readingStrategy: CoreSitesReadingStrategy.PREFER_CACHE },
+        );
 
         this.cmId = module.id;
         this.courseId = module.course;
diff --git a/src/addons/mod/wiki/services/handlers/create-link.ts b/src/addons/mod/wiki/services/handlers/create-link.ts
index 90a3c5aaa..b78a3f632 100644
--- a/src/addons/mod/wiki/services/handlers/create-link.ts
+++ b/src/addons/mod/wiki/services/handlers/create-link.ts
@@ -115,7 +115,11 @@ export class AddonModWikiCreateLinkHandlerService extends CoreContentLinksHandle
                         path = path + `/${route!.snapshot.params.courseId}/${route!.snapshot.params.cmId}/edit`;
                     } else if (wikiId) {
                         // The URL specifies which wiki it belongs to. Get the module.
-                        const module = await CoreCourse.getModuleBasicInfoByInstance(wikiId, 'wiki', siteId);
+                        const module = await CoreCourse.getModuleBasicInfoByInstance(
+                            wikiId,
+                            'wiki',
+                            { siteId, readingStrategy: CoreSitesReadingStrategy.PREFER_CACHE },
+                        );
 
                         path = path + `/${module.course}/${module.id}/edit`;
                     } else {
diff --git a/src/addons/mod/wiki/services/handlers/edit-link.ts b/src/addons/mod/wiki/services/handlers/edit-link.ts
index ea0fd3a82..68e3a5140 100644
--- a/src/addons/mod/wiki/services/handlers/edit-link.ts
+++ b/src/addons/mod/wiki/services/handlers/edit-link.ts
@@ -17,6 +17,7 @@ import { CoreContentLinksHandlerBase } from '@features/contentlinks/classes/base
 import { CoreContentLinksAction } from '@features/contentlinks/services/contentlinks-delegate';
 import { CoreCourse } from '@features/course/services/course';
 import { CoreNavigator } from '@services/navigator';
+import { CoreSitesReadingStrategy } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { makeSingleton } from '@singletons';
 import { AddonModWiki } from '../wiki';
@@ -39,7 +40,6 @@ export class AddonModWikiEditLinkHandlerService extends CoreContentLinksHandlerB
         siteIds: string[],
         url: string,
         params: Record<string, string>,
-        courseId?: number,
     ): CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
 
         return [{
@@ -51,17 +51,19 @@ export class AddonModWikiEditLinkHandlerService extends CoreContentLinksHandlerB
 
                     const pageContents = await AddonModWiki.getPageContents(pageId, { siteId });
 
-                    const module = await CoreCourse.getModuleBasicInfoByInstance(pageContents.wikiid, 'wiki', siteId);
+                    const module = await CoreCourse.getModuleBasicInfoByInstance(
+                        pageContents.wikiid,
+                        'wiki',
+                        { siteId, readingStrategy: CoreSitesReadingStrategy.PREFER_CACHE },
+                    );
 
                     let section = '';
                     if (params.section !== undefined) {
                         section = params.section.replace(/\+/g, ' ');
                     }
 
-                    courseId = module.course || courseId || Number(params.courseid || params.cid);
-
                     CoreNavigator.navigateToSitePath(
-                        AddonModWikiModuleHandlerService.PAGE_NAME + `/${courseId}/${module.id}/edit`,
+                        AddonModWikiModuleHandlerService.PAGE_NAME + `/${module.course}/${module.id}/edit`,
                         {
                             params: {
                                 section: section,
diff --git a/src/addons/mod/wiki/services/handlers/page-or-map-link.ts b/src/addons/mod/wiki/services/handlers/page-or-map-link.ts
index cc9043db3..9b995e3bd 100644
--- a/src/addons/mod/wiki/services/handlers/page-or-map-link.ts
+++ b/src/addons/mod/wiki/services/handlers/page-or-map-link.ts
@@ -17,6 +17,7 @@ import { CoreContentLinksHandlerBase } from '@features/contentlinks/classes/base
 import { CoreContentLinksAction } from '@features/contentlinks/services/contentlinks-delegate';
 import { CoreCourse } from '@features/course/services/course';
 import { CoreNavigator } from '@services/navigator';
+import { CoreSitesReadingStrategy } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { makeSingleton } from '@singletons';
 import { Md5 } from 'ts-md5';
@@ -40,11 +41,8 @@ export class AddonModWikiPageOrMapLinkHandlerService extends CoreContentLinksHan
         siteIds: string[],
         url: string,
         params: Record<string, string>,
-        courseId?: number,
     ): CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
 
-        courseId = Number(courseId || params.courseid || params.cid);
-
         return [{
             action: async (siteId: string) => {
                 const modal = await CoreDomUtils.showModalLoading();
@@ -55,7 +53,11 @@ export class AddonModWikiPageOrMapLinkHandlerService extends CoreContentLinksHan
                     // Get the page data to obtain wikiId, subwikiId, etc.
                     const page = await AddonModWiki.getPageContents(pageId, { siteId });
 
-                    const module = await CoreCourse.getModuleBasicInfoByInstance(page.wikiid, 'wiki', siteId);
+                    const module = await CoreCourse.getModuleBasicInfoByInstance(
+                        page.wikiid,
+                        'wiki',
+                        { siteId, readingStrategy: CoreSitesReadingStrategy.PREFER_CACHE },
+                    );
 
                     const hash = <string> Md5.hashAsciiStr(JSON.stringify({
                         pageId: page.id,
@@ -64,10 +66,9 @@ export class AddonModWikiPageOrMapLinkHandlerService extends CoreContentLinksHan
                         action: action,
                         timestamp: Date.now(),
                     }));
-                    courseId = courseId || module.course;
 
                     CoreNavigator.navigateToSitePath(
-                        AddonModWikiModuleHandlerService.PAGE_NAME + `/${courseId}/${module.id}/page/${hash}`,
+                        AddonModWikiModuleHandlerService.PAGE_NAME + `/${module.course}/${module.id}/page/${hash}`,
                         {
                             params: {
                                 module,
diff --git a/src/addons/mod/wiki/services/handlers/prefetch.ts b/src/addons/mod/wiki/services/handlers/prefetch.ts
index 25f26727f..c804afecd 100644
--- a/src/addons/mod/wiki/services/handlers/prefetch.ts
+++ b/src/addons/mod/wiki/services/handlers/prefetch.ts
@@ -189,7 +189,7 @@ export class AddonModWikiPrefetchHandlerService extends CoreCourseActivityPrefet
 
         // Fetch info to provide wiki links.
         promises.push(AddonModWiki.getWiki(courseId, module.id, { siteId }).then((wiki) =>
-            CoreCourse.getModuleBasicInfoByInstance(wiki.id, 'wiki', siteId)));
+            CoreCourse.getModuleBasicInfoByInstance(wiki.id, 'wiki', { siteId })));
 
         // Get related page files and fetch them.
         promises.push(this.getFiles(module, courseId, single, siteId).then((files) =>
diff --git a/src/addons/mod/workshop/services/handlers/prefetch.ts b/src/addons/mod/workshop/services/handlers/prefetch.ts
index b89f83af9..789b57f9f 100644
--- a/src/addons/mod/workshop/services/handlers/prefetch.ts
+++ b/src/addons/mod/workshop/services/handlers/prefetch.ts
@@ -363,7 +363,7 @@ export class AddonModWorkshopPrefetchHandlerService extends CoreCourseActivityPr
         }));
 
         // Add Basic Info to manage links.
-        promises.push(CoreCourse.getModuleBasicInfoByInstance(workshop.id, 'workshop', siteId));
+        promises.push(CoreCourse.getModuleBasicInfoByInstance(workshop.id, 'workshop', { siteId }));
         promises.push(CoreCourse.getModuleBasicGradeInfo(module.id, siteId));
 
         // Get course data, needed to determine upload max size if it's configured to be course limit.
diff --git a/src/core/features/course/classes/activity-prefetch-handler.ts b/src/core/features/course/classes/activity-prefetch-handler.ts
index 1b8617b01..f25c46294 100644
--- a/src/core/features/course/classes/activity-prefetch-handler.ts
+++ b/src/core/features/course/classes/activity-prefetch-handler.ts
@@ -119,7 +119,7 @@ export class CoreCourseActivityPrefetchHandlerBase extends CoreCourseModulePrefe
 
             // Package marked as downloading, get module info to be able to handle links. Get module filters too.
             await Promise.all([
-                CoreCourse.getModuleBasicInfo(module.id, siteId),
+                CoreCourse.getModuleBasicInfo(module.id, { siteId }),
                 CoreCourse.getModule(module.id, courseId, undefined, false, true, siteId),
                 CoreFilterHelper.getFilters('module', module.id, { courseId }),
             ]);
diff --git a/src/core/features/course/classes/main-activity-page.ts b/src/core/features/course/classes/main-activity-page.ts
index f82ad56de..6d0785f4a 100644
--- a/src/core/features/course/classes/main-activity-page.ts
+++ b/src/core/features/course/classes/main-activity-page.ts
@@ -47,7 +47,7 @@ export class CoreCourseModuleMainActivityPage<ActivityType extends CoreCourseMod
             return;
         }
 
-        this.title = this.module?.name;
+        this.title = this.module.name;
     }
 
     /**
diff --git a/src/core/features/course/classes/main-resource-component.ts b/src/core/features/course/classes/main-resource-component.ts
index a6ea91223..d8ae2c48d 100644
--- a/src/core/features/course/classes/main-resource-component.ts
+++ b/src/core/features/course/classes/main-resource-component.ts
@@ -394,11 +394,11 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
             const ignoreCache = refresh && CoreApp.isOnline();
 
             try {
-                await CoreCourse.loadModuleContents(this.module, this.courseId, undefined, false, ignoreCache);
+                await CoreCourse.loadModuleContents(this.module, undefined, undefined, false, ignoreCache);
             } catch (error) {
                 // Error loading contents. If we ignored cache, try to get the cached value.
                 if (ignoreCache && !this.module.contents) {
-                    await CoreCourse.loadModuleContents(this.module, this.courseId);
+                    await CoreCourse.loadModuleContents(this.module);
                 } else if (!this.module.contents) {
                     // Not able to load contents, throw the error.
                     throw error;
diff --git a/src/core/features/course/classes/resource-prefetch-handler.ts b/src/core/features/course/classes/resource-prefetch-handler.ts
index 7eb2119df..c7549df91 100644
--- a/src/core/features/course/classes/resource-prefetch-handler.ts
+++ b/src/core/features/course/classes/resource-prefetch-handler.ts
@@ -92,7 +92,7 @@ export class CoreCourseResourcePrefetchHandlerBase extends CoreCourseModulePrefe
         dirPath?: string,
     ): Promise<void> {
         // Get module info to be able to handle links.
-        await CoreCourse.getModuleBasicInfo(module.id, siteId);
+        await CoreCourse.getModuleBasicInfo(module.id, { siteId });
 
         // Load module contents (ignore cache so we always have the latest data).
         await this.loadContents(module, courseId, true);
diff --git a/src/core/features/course/components/module/module.ts b/src/core/features/course/components/module/module.ts
index fc2265acb..944eed73a 100644
--- a/src/core/features/course/components/module/module.ts
+++ b/src/core/features/course/components/module/module.ts
@@ -106,7 +106,7 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy {
 
         if (this.module.handlerData.showDownloadButton) {
             // Listen for changes on this module status, even if download isn't enabled.
-            this.prefetchHandler = CoreCourseModulePrefetchDelegate.getPrefetchHandlerFor(this.module);
+            this.prefetchHandler = CoreCourseModulePrefetchDelegate.getPrefetchHandlerFor(this.module.name);
 
             this.statusObserver = CoreEvents.on(CoreEvents.PACKAGE_STATUS_CHANGED, (data) => {
                 if (!this.module || data.componentId != this.module.id || !this.prefetchHandler ||
@@ -180,14 +180,14 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy {
 
         try {
             // Get download size to ask for confirm if it's high.
-            const size = await this.prefetchHandler.getDownloadSize(this.module, this.courseId!, true);
+            const size = await this.prefetchHandler.getDownloadSize(this.module, this.module.course, true);
 
-            await CoreCourseHelper.prefetchModule(this.prefetchHandler, this.module, size, this.courseId!, refresh);
+            await CoreCourseHelper.prefetchModule(this.prefetchHandler, this.module, size, this.module.course, refresh);
 
             const eventData = {
                 sectionId: this.section?.id,
                 moduleId: this.module.id,
-                courseId: this.courseId!,
+                courseId: this.module.course,
             };
             this.statusChanged.emit(eventData);
         } catch (error) {
diff --git a/src/core/features/course/services/course-helper.ts b/src/core/features/course/services/course-helper.ts
index 590d7aea1..4162eb2b4 100644
--- a/src/core/features/course/services/course-helper.ts
+++ b/src/core/features/course/services/course-helper.ts
@@ -16,7 +16,7 @@ import { Injectable } from '@angular/core';
 import { Params } from '@angular/router';
 import moment from 'moment';
 
-import { CoreSites } from '@services/sites';
+import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
 import {
     CoreCourse,
     CoreCourseCompletionActivityStatus,
@@ -725,7 +725,7 @@ export class CoreCourseHelperProvider {
 
         if (!files || !files.length) {
             // Try to use module contents.
-            files = await CoreCourse.getModuleContents(module, courseId);
+            files = await CoreCourse.getModuleContents(module);
         }
 
         if (!files.length) {
@@ -1013,7 +1013,7 @@ export class CoreCourseHelperProvider {
     ): Promise<void> {
         siteId = siteId || CoreSites.getCurrentSiteId();
 
-        const prefetchHandler = CoreCourseModulePrefetchDelegate.getPrefetchHandlerFor(module);
+        const prefetchHandler = CoreCourseModulePrefetchDelegate.getPrefetchHandlerFor(module.name);
 
         if (prefetchHandler) {
             // Use the prefetch handler to download the module.
@@ -1429,6 +1429,31 @@ export class CoreCourseHelperProvider {
         return CoreConstants.ICON_DOWNLOADING;
     }
 
+    /**
+     * Get the course ID from a module instance ID, showing an error message if it can't be retrieved.
+     *
+     * @deprecated since 4.0.
+     * @param instanceId Instance ID.
+     * @param moduleName Name of the module. E.g. 'glossary'.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the module's course ID.
+     */
+    async getModuleCourseIdByInstance(instanceId: number, moduleName: string, siteId?: string): Promise<number> {
+        try {
+            const cm = await CoreCourse.getModuleBasicInfoByInstance(
+                instanceId,
+                moduleName,
+                { siteId, readingStrategy: CoreSitesReadingStrategy.PREFER_CACHE },
+            );
+
+            return cm.course;
+        } catch (error) {
+            CoreDomUtils.showErrorModalDefault(error, 'core.course.errorgetmodule', true);
+
+            throw error;
+        }
+    }
+
     /**
      * Get prefetch info for a module.
      *
@@ -1551,7 +1576,7 @@ export class CoreCourseHelperProvider {
         const modal = await CoreDomUtils.showModalLoading();
 
         try {
-            const module = await CoreCourse.getModuleBasicInfoByInstance(instanceId, modName, siteId);
+            const module = await CoreCourse.getModuleBasicInfoByInstance(instanceId, modName, { siteId });
 
             this.navigateToModule(
                 module.id,
@@ -1594,15 +1619,14 @@ export class CoreCourseHelperProvider {
         const modal = await CoreDomUtils.showModalLoading();
 
         try {
-            if (!courseId) {
-                // We don't have courseId.
-                const module = await CoreCourse.getModuleBasicInfo(moduleId, siteId);
+            if (!courseId || !sectionId) {
+                const module = await CoreCourse.getModuleBasicInfo(
+                    moduleId,
+                    { siteId, readingStrategy: CoreSitesReadingStrategy.PREFER_CACHE },
+                );
 
                 courseId = module.course;
                 sectionId = module.section;
-            } else if (!sectionId) {
-                // We don't have sectionId but we have courseId.
-                sectionId = await CoreCourse.getModuleSectionId(moduleId, siteId);
             }
 
             // Get the site.
@@ -2024,7 +2048,7 @@ export class CoreCourseHelperProvider {
 
         promises.push(CoreCourseModulePrefetchDelegate.removeModuleFiles(module, courseId));
 
-        const handler = CoreCourseModulePrefetchDelegate.getPrefetchHandlerFor(module);
+        const handler = CoreCourseModulePrefetchDelegate.getPrefetchHandlerFor(module.name);
         const site = CoreSites.getCurrentSite();
         if (handler && site) {
             promises.push(site.deleteComponentFromCache(handler.component, module.id));
diff --git a/src/core/features/course/services/course.ts b/src/core/features/course/services/course.ts
index 592b7ca84..cd482f5ca 100644
--- a/src/core/features/course/services/course.ts
+++ b/src/core/features/course/services/course.ts
@@ -18,7 +18,7 @@ import { Params } from '@angular/router';
 import { CoreApp } from '@services/app';
 import { CoreEvents } from '@singletons/events';
 import { CoreLogger } from '@singletons/logger';
-import { CoreSitesCommonWSOptions, CoreSites } from '@services/sites';
+import { CoreSitesCommonWSOptions, CoreSites, CoreSitesReadingStrategy } from '@services/sites';
 import { CoreTimeUtils } from '@services/utils/time';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreSiteWSPreSets, CoreSite } from '@classes/site';
@@ -502,8 +502,12 @@ export class CoreCourseProvider {
 
         if (!courseId) {
             // No courseId passed, try to retrieve it.
-            const module = await this.getModuleBasicInfo(moduleId, siteId);
+            const module = await this.getModuleBasicInfo(
+                moduleId,
+                { siteId, readingStrategy: CoreSitesReadingStrategy.PREFER_CACHE },
+            );
             courseId = module.course;
+            sectionId = module.section;
         }
 
         let sections: CoreCourseGetContentsWSSection[];
@@ -530,9 +534,8 @@ export class CoreCourseProvider {
         let foundModule: CoreCourseGetContentsWSModule | undefined;
 
         const foundSection = sections.some((section) => {
-            if (sectionId != null &&
-                !isNaN(sectionId) &&
-                section.id != CoreCourseProvider.STEALTH_MODULES_SECTION_ID &&
+            if (section.id != CoreCourseProvider.STEALTH_MODULES_SECTION_ID &&
+                sectionId !== undefined &&
                 sectionId != section.id
             ) {
                 return false;
@@ -585,17 +588,18 @@ export class CoreCourseProvider {
      * Gets a module basic info by module ID.
      *
      * @param moduleId Module ID.
-     * @param siteId Site ID. If not defined, current site.
+     * @param options Comon site WS options.
      * @return Promise resolved with the module's info.
      */
-    async getModuleBasicInfo(moduleId: number, siteId?: string): Promise<CoreCourseModuleBasicInfo> {
-        const site = await CoreSites.getSite(siteId);
+    async getModuleBasicInfo(moduleId: number, options: CoreSitesCommonWSOptions = {}): Promise<CoreCourseModuleBasicInfo> {
+        const site = await CoreSites.getSite(options.siteId);
         const params: CoreCourseGetCourseModuleWSParams = {
             cmid: moduleId,
         };
         const preSets: CoreSiteWSPreSets = {
             cacheKey: this.getModuleCacheKey(moduleId),
             updateFrequency: CoreSite.FREQUENCY_RARELY,
+            ...CoreSites.getReadingStrategyPreSets(options.readingStrategy), // Include reading strategy preSets.
         };
         const response = await site.read<CoreCourseGetCourseModuleWSResponse>('core_course_get_course_module', params, preSets);
 
@@ -614,7 +618,7 @@ export class CoreCourseProvider {
      * @return Promise resolved with the module's grade info.
      */
     async getModuleBasicGradeInfo(moduleId: number, siteId?: string): Promise<CoreCourseModuleGradeInfo | undefined> {
-        const info = await this.getModuleBasicInfo(moduleId, siteId);
+        const info = await this.getModuleBasicInfo(moduleId, { siteId });
 
         if (
             info.grade !== undefined ||
@@ -636,21 +640,29 @@ export class CoreCourseProvider {
     /**
      * Gets a module basic info by instance.
      *
-     * @param id Instance ID.
-     * @param module Name of the module. E.g. 'glossary'.
-     * @param siteId Site ID. If not defined, current site.
+     * @param instanceId Instance ID.
+     * @param moduleName Name of the module. E.g. 'glossary'.
+     * @param options Comon site WS options.
      * @return Promise resolved with the module's info.
      */
-    async getModuleBasicInfoByInstance(id: number, module: string, siteId?: string): Promise<CoreCourseModuleBasicInfo> {
-        const site = await CoreSites.getSite(siteId);
+    async getModuleBasicInfoByInstance(
+        instanceId: number,
+        moduleName: string,
+        options: CoreSitesCommonWSOptions = {},
+    ): Promise<CoreCourseModuleBasicInfo> {
+        const site = await CoreSites.getSite(options.siteId);
+
         const params: CoreCourseGetCourseModuleByInstanceWSParams = {
-            instance: id,
-            module: module,
+            instance: instanceId,
+            module: moduleName,
         };
-        const preSets = {
-            cacheKey: this.getModuleBasicInfoByInstanceCacheKey(id, module),
+
+        const preSets: CoreSiteWSPreSets = {
+            cacheKey: this.getModuleBasicInfoByInstanceCacheKey(instanceId, moduleName),
             updateFrequency: CoreSite.FREQUENCY_RARELY,
+            ...CoreSites.getReadingStrategyPreSets(options.readingStrategy), // Include reading strategy preSets.
         };
+
         const response: CoreCourseGetCourseModuleWSResponse =
             await site.read('core_course_get_course_module_by_instance', params, preSets);
 
@@ -666,12 +678,12 @@ export class CoreCourseProvider {
     /**
      * Get cache key for get module by instance WS calls.
      *
-     * @param id Instance ID.
-     * @param module Name of the module. E.g. 'glossary'.
+     * @param instanceId Instance ID.
+     * @param moduleName Name of the module. E.g. 'glossary'.
      * @return Cache key.
      */
-    protected getModuleBasicInfoByInstanceCacheKey(id: number, module: string): string {
-        return ROOT_CACHE_KEY + 'moduleByInstance:' + module + ':' + id;
+    protected getModuleBasicInfoByInstanceCacheKey(instanceId: number, moduleName: string): string {
+        return ROOT_CACHE_KEY + 'moduleByInstance:' + moduleName + ':' + instanceId;
     }
 
     /**
@@ -721,13 +733,17 @@ export class CoreCourseProvider {
     /**
      * Get the section ID a module belongs to.
      *
+     * @deprecated since 4.0.
      * @param moduleId The module ID.
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with the section ID.
      */
     async getModuleSectionId(moduleId: number, siteId?: string): Promise<number> {
         // Try to get the section using getModuleBasicInfo.
-        const module = await this.getModuleBasicInfo(moduleId, siteId);
+        const module = await CoreCourse.getModuleBasicInfo(
+            moduleId,
+            { siteId, readingStrategy: CoreSitesReadingStrategy.PREFER_CACHE },
+        );
 
         return module.section;
     }
@@ -974,7 +990,7 @@ export class CoreCourseProvider {
      * It will throw an error if contents cannot be loaded.
      *
      * @param module Module to get its contents.
-     * @param courseId The course ID. Recommended to speed up the process and minimize data usage.
+     * @param courseId Not used since 4.0.
      * @param sectionId The section ID.
      * @param preferCache True if shouldn't call WS if data is cached, false otherwise.
      * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
@@ -984,7 +1000,7 @@ export class CoreCourseProvider {
      * @return Promise resolved when loaded.
      */
     async getModuleContents(
-        module: CoreCourseAnyModuleData,
+        module: CoreCourseModuleData,
         courseId?: number,
         sectionId?: number,
         preferCache?: boolean,
@@ -993,7 +1009,7 @@ export class CoreCourseProvider {
         modName?: string,
     ): Promise<CoreCourseModuleContentFile[]> {
         // Make sure contents are loaded.
-        await this.loadModuleContents(module, courseId, sectionId, preferCache, ignoreCache, siteId, modName);
+        await this.loadModuleContents(module, undefined, sectionId, preferCache, ignoreCache, siteId, modName);
 
         if (!module.contents) {
             throw new CoreError(Translate.instant('core.course.modulenotfound'));
diff --git a/src/core/features/course/services/module-prefetch-delegate.ts b/src/core/features/course/services/module-prefetch-delegate.ts
index d1250decb..a2998f6d7 100644
--- a/src/core/features/course/services/module-prefetch-delegate.ts
+++ b/src/core/features/course/services/module-prefetch-delegate.ts
@@ -95,7 +95,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
      * @return Promise resolved with boolean: whether the module can use check updates WS.
      */
     async canModuleUseCheckUpdates(module: CoreCourseAnyModuleData, courseId: number): Promise<boolean> {
-        const handler = this.getPrefetchHandlerFor(module);
+        const handler = this.getPrefetchHandlerFor(module.name);
 
         if (!handler) {
             // Module not supported, cannot use check updates.
@@ -171,7 +171,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
      * @return Module status.
      */
     determineModuleStatus(module: CoreCourseAnyModuleData, status: string): string {
-        const handler = this.getPrefetchHandlerFor(module);
+        const handler = this.getPrefetchHandlerFor(module.name);
         const siteId = CoreSites.getCurrentSiteId();
 
         if (!handler) {
@@ -203,7 +203,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
      */
     async downloadModule(module: CoreCourseAnyModuleData, courseId: number, dirPath?: string): Promise<void> {
         // Check if the module has a prefetch handler.
-        const handler = this.getPrefetchHandlerFor(module);
+        const handler = this.getPrefetchHandlerFor(module.name);
 
         if (!handler) {
             return;
@@ -227,7 +227,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
         const id = <string> Md5.hashAsciiStr(courseId + '#' + JSON.stringify(modules));
         const siteId = CoreSites.getCurrentSiteId();
 
-        if (this.courseUpdatesPromises[siteId] && this.courseUpdatesPromises[siteId][id]) {
+        if (this.courseUpdatesPromises[siteId] && this.courseUpdatesPromises[siteId][id] !== undefined) {
             // There's already a get updates ongoing, return the promise.
             return this.courseUpdatesPromises[siteId][id];
         } else if (!this.courseUpdatesPromises[siteId]) {
@@ -381,7 +381,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
      * @return Promise resolved with the size.
      */
     async getModuleDownloadSize(module: CoreCourseAnyModuleData, courseId: number, single?: boolean): Promise<CoreFileSizeSum> {
-        const handler = this.getPrefetchHandlerFor(module);
+        const handler = this.getPrefetchHandlerFor(module.name);
 
         if (!handler) {
             return { size: 0, total: false };
@@ -419,7 +419,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
      * @return Promise resolved with the size.
      */
     async getModuleDownloadedSize(module: CoreCourseAnyModuleData, courseId: number): Promise<number> {
-        const handler = this.getPrefetchHandlerFor(module);
+        const handler = this.getPrefetchHandlerFor(module.name);
         if (!handler) {
             return 0;
         }
@@ -492,7 +492,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
         }
 
         const site = CoreSites.getCurrentSite();
-        const handler = this.getPrefetchHandlerFor(module);
+        const handler = this.getPrefetchHandlerFor(module.name);
         if (!handler || !site) {
             // If there is no handler then we can't find out the component name.
             // We can't work out the cached size, so just return downloaded size.
@@ -515,7 +515,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
         module: CoreCourseAnyModuleData,
         courseId: number,
     ): Promise<(CoreWSFile | CoreCourseModuleContentFile)[]> {
-        const handler = this.getPrefetchHandlerFor(module);
+        const handler = this.getPrefetchHandlerFor(module.name);
 
         if (handler?.getFiles) {
             // The handler defines a function to get files, use it.
@@ -548,7 +548,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
         refresh?: boolean,
         sectionId?: number,
     ): Promise<string> {
-        const handler = this.getPrefetchHandlerFor(module);
+        const handler = this.getPrefetchHandlerFor(module.name);
 
         if (!handler) {
             // No handler found, module not downloadable.
@@ -712,7 +712,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
         }
 
         await Promise.all(modules.map(async (module) => {
-            const handler = this.getPrefetchHandlerFor(module);
+            const handler = this.getPrefetchHandlerFor(module.name);
             if (!handler || (onlyToDisplay && handler.skipListStatus)) {
                 return;
             }
@@ -758,7 +758,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
         module: CoreCourseAnyModuleData,
         courseId: number,
     ): Promise<{ status: string; downloadTime?: number }> {
-        const handler = this.getPrefetchHandlerFor(module);
+        const handler = this.getPrefetchHandlerFor(module.name);
         const siteId = CoreSites.getCurrentSiteId();
 
         if (!handler) {
@@ -863,11 +863,11 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
     /**
      * Get a prefetch handler.
      *
-     * @param module The module to work on.
+     * @param moduleName The module name to work on.
      * @return Prefetch handler.
      */
-    getPrefetchHandlerFor(module: CoreCourseAnyModuleData): CoreCourseModulePrefetchHandler | undefined {
-        return this.getHandler(module.modname, true);
+    getPrefetchHandlerFor(moduleName: string): CoreCourseModulePrefetchHandler | undefined {
+        return this.getHandler(moduleName, true);
     }
 
     /**
@@ -895,7 +895,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
     async invalidateModules(modules: CoreCourseModuleData[], courseId: number): Promise<void> {
 
         const promises = modules.map(async (module) => {
-            const handler = this.getPrefetchHandlerFor(module);
+            const handler = this.getPrefetchHandlerFor(module.name);
             if (!handler) {
                 return;
             }
@@ -919,7 +919,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
      * @param module Module to be invalidated.
      */
     invalidateModuleStatusCache(module: CoreCourseAnyModuleData): void {
-        const handler = this.getPrefetchHandlerFor(module);
+        const handler = this.getPrefetchHandlerFor(module.name);
         if (handler) {
             this.statusCache.invalidate(CoreFilepool.getPackageId(handler.component, module.id));
         }
@@ -964,7 +964,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
             return false;
         }
 
-        const handler = this.getPrefetchHandlerFor(module);
+        const handler = this.getPrefetchHandlerFor(module.name);
         if (!handler) {
             return false;
         }
@@ -1000,7 +1000,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
      * @return Promise resolved with boolean: whether the module has updates.
      */
     async moduleHasUpdates(module: CoreCourseAnyModuleData, courseId: number, updates: CourseUpdates): Promise<boolean> {
-        const handler = this.getPrefetchHandlerFor(module);
+        const handler = this.getPrefetchHandlerFor(module.name);
         const moduleUpdates = updates[module.id];
 
         if (handler?.hasUpdates) {
@@ -1033,7 +1033,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
      * @return Promise resolved when finished.
      */
     async prefetchModule(module: CoreCourseAnyModuleData, courseId: number, single?: boolean): Promise<void> {
-        const handler = this.getPrefetchHandlerFor(module);
+        const handler = this.getPrefetchHandlerFor(module.name);
         if (!handler) {
             return;
         }
@@ -1067,7 +1067,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
      * @return Promise resolved when finished.
      */
     async syncModule<T = unknown>(module: CoreCourseAnyModuleData, courseId: number): Promise<T | undefined> {
-        const handler = this.getPrefetchHandlerFor(module);
+        const handler = this.getPrefetchHandlerFor(module.name);
         if (!handler?.sync) {
             return;
         }
@@ -1124,7 +1124,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
 
         const promises = modules.map(async (module) => {
             // Check if the module has a prefetch handler.
-            const handler = this.getPrefetchHandlerFor(module);
+            const handler = this.getPrefetchHandlerFor(module.name);
             if (!handler) {
                 return;
             }
@@ -1170,7 +1170,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
      * @return Promise resolved when done.
      */
     async removeModuleFiles(module: CoreCourseAnyModuleData, courseId: number): Promise<void> {
-        const handler = this.getPrefetchHandlerFor(module);
+        const handler = this.getPrefetchHandlerFor(module.name);
         const siteId = CoreSites.getCurrentSiteId();
 
         if (handler?.removeFiles) {
diff --git a/src/core/features/siteplugins/classes/handlers/module-handler.ts b/src/core/features/siteplugins/classes/handlers/module-handler.ts
index 8e0e95d9b..846fd28f9 100644
--- a/src/core/features/siteplugins/classes/handlers/module-handler.ts
+++ b/src/core/features/siteplugins/classes/handlers/module-handler.ts
@@ -15,7 +15,7 @@
 import { Type } from '@angular/core';
 
 import { CoreConstants } from '@/core/constants';
-import { CoreCourse, CoreCourseAnyModuleData } from '@features/course/services/course';
+import { CoreCourse } from '@features/course/services/course';
 import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
 import { CoreSitePluginsModuleIndexComponent } from '@features/siteplugins/components/module-index/module-index';
@@ -64,12 +64,12 @@ export class CoreSitePluginsModuleHandler extends CoreSitePluginsBaseHandler imp
      * @inheritdoc
      */
     getData(
-        module: CoreCourseAnyModuleData,
+        module: CoreCourseModuleData,
         courseId: number,
         sectionId?: number,
         forCoursePage?: boolean,
     ): CoreCourseModuleHandlerData {
-        if ('description' in module && this.shouldOnlyDisplayDescription(module, forCoursePage)) {
+        if (this.shouldOnlyDisplayDescription(module, forCoursePage)) {
             const title = module.description;
             module.description = '';
 
@@ -128,7 +128,7 @@ export class CoreSitePluginsModuleHandler extends CoreSitePluginsBaseHandler imp
      * @param forCoursePage Whether the data will be used to render the course page.
      * @return Bool.
      */
-    protected shouldOnlyDisplayDescription(module: CoreCourseAnyModuleData, forCoursePage?: boolean): boolean {
+    protected shouldOnlyDisplayDescription(module: CoreCourseModuleData, forCoursePage?: boolean): boolean {
         if (forCoursePage && this.handlerSchema.coursepagemethod) {
             // The plugin defines a method for course page, don't display just the description.
             return false;
@@ -167,7 +167,7 @@ export class CoreSitePluginsModuleHandler extends CoreSitePluginsBaseHandler imp
      * @return Promise resolved when done.
      */
     protected async loadCoursePageTemplate(
-        module: CoreCourseAnyModuleData,
+        module: CoreCourseModuleData,
         courseId: number,
         handlerData: CoreCourseModuleHandlerData,
         method: string,
diff --git a/src/core/features/siteplugins/components/module-index/module-index.ts b/src/core/features/siteplugins/components/module-index/module-index.ts
index 7858a0db1..a4cab3943 100644
--- a/src/core/features/siteplugins/components/module-index/module-index.ts
+++ b/src/core/features/siteplugins/components/module-index/module-index.ts
@@ -145,7 +145,7 @@ export class CoreSitePluginsModuleIndexComponent implements OnInit, OnDestroy, C
         this.refreshIcon = CoreConstants.ICON_REFRESH;
 
         // Check if there is a prefetch handler for this type of module.
-        if (CoreCourseModulePrefetchDelegate.getPrefetchHandlerFor(this.module)) {
+        if (CoreCourseModulePrefetchDelegate.getPrefetchHandlerFor(this.module.name)) {
             CoreCourseHelper.fillContextMenu(this, this.module, this.courseId, refresh, this.component);
         }
     }
diff --git a/upgrade.txt b/upgrade.txt
index 4f36e38bc..75a4f115f 100644
--- a/upgrade.txt
+++ b/upgrade.txt
@@ -1,11 +1,13 @@
 This files describes API changes in the Moodle Mobile app,
 information provided here is intended especially for developers.
 
-=== 3.9.6 ===
+=== 4.0.0 ===
 
 - The parameters of the functions confirmAndPrefetchCourse and confirmAndPrefetchCourses have changed, they now accept an object with options.
 - Component core-navigation-bar changed to add an slider inside. previous, previousTitle, next, nextTitle, info and title have been removed.
   Now you have to pass all items and 3 optional params have been added.
+- CoreCourseModulePrefetchDelegate.getPrefetchHandlerFor now admits module name instead of full module object.
+- CoreCourse.getModuleBasicInfoByInstance and CoreCourse.getModuleBasicInfo have been modified to accept an "options" parameter instead of only siteId.
 
 === 3.9.5 ===
 

From b1d65f60c55b01c74c05510b7558e99cdb2529d4 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Mon, 20 Dec 2021 17:19:07 +0100
Subject: [PATCH 0301/1008] MOBILE-3833 forum: Fix offline status

---
 src/addons/mod/forum/components/index/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/addons/mod/forum/components/index/index.ts b/src/addons/mod/forum/components/index/index.ts
index 9afeb028e..3871096c8 100644
--- a/src/addons/mod/forum/components/index/index.ts
+++ b/src/addons/mod/forum/components/index/index.ts
@@ -157,6 +157,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
         this.sourceUnsubscribe = source.addListener({
             onItemsUpdated: async discussions => {
                 this.discussionsItems = discussions.filter(discussion => !source.isNewDiscussionForm(discussion));
+                this.hasOffline = discussions.some(discussion => source.isOfflineDiscussion(discussion));
 
                 if (!this.forum) {
                     return;

From 00a12df79b4fb94b50d0f7a316a4dfbd5384b871 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 2 Dec 2021 13:23:49 +0100
Subject: [PATCH 0302/1008] MOBILE-3939 feedback: rename respondents

---
 .../index/addon-mod-feedback-index.html       |  2 +-
 .../mod/feedback/components/index/index.ts    |  6 +-
 .../mod/feedback/feedback-lazy.module.ts      | 16 ++--
 .../attempts.html}                            | 25 ++++---
 .../respondents.ts => attempts/attempts.ts}   | 74 +++++++++----------
 .../mod/feedback/services/feedback-helper.ts  |  2 +-
 6 files changed, 63 insertions(+), 62 deletions(-)
 rename src/addons/mod/feedback/pages/{respondents/respondents.html => attempts/attempts.html} (74%)
 rename src/addons/mod/feedback/pages/{respondents/respondents.ts => attempts/attempts.ts} (73%)

diff --git a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
index c9cb04c87..685a98db0 100644
--- a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
+++ b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
@@ -72,7 +72,7 @@
                 </ion-select-option>
             </ion-select>
         </ion-item>
-        <ion-item class="ion-text-wrap" (click)="openRespondents()" [class.hide-detail]="!(access.canviewreports && completedCount > 0)"
+        <ion-item class="ion-text-wrap" (click)="openAttempts()" [class.hide-detail]="!(access.canviewreports && completedCount > 0)"
             detail="true" [button]="access.canviewreports && completedCount > 0">
             <ion-label>
                 <h2>{{ 'addon.mod_feedback.completed_feedbacks' | translate }}</h2>
diff --git a/src/addons/mod/feedback/components/index/index.ts b/src/addons/mod/feedback/components/index/index.ts
index bfa04b763..3f3f94027 100644
--- a/src/addons/mod/feedback/components/index/index.ts
+++ b/src/addons/mod/feedback/components/index/index.ts
@@ -400,15 +400,15 @@ export class AddonModFeedbackIndexComponent extends CoreCourseModuleMainActivity
     }
 
     /**
-     * Open respondents page.
+     * Open attempts page.
      */
-    openRespondents(): void {
+    openAttempts(): void {
         if (!this.access!.canviewreports || this.completedCount <= 0) {
             return;
         }
 
         CoreNavigator.navigateToSitePath(
-            AddonModFeedbackModuleHandlerService.PAGE_NAME + `/${this.courseId}/${this.module.id}/respondents`,
+            AddonModFeedbackModuleHandlerService.PAGE_NAME + `/${this.courseId}/${this.module.id}/attempts`,
             {
                 params: {
                     group: this.group,
diff --git a/src/addons/mod/feedback/feedback-lazy.module.ts b/src/addons/mod/feedback/feedback-lazy.module.ts
index 15bf99ecd..b055ceedd 100644
--- a/src/addons/mod/feedback/feedback-lazy.module.ts
+++ b/src/addons/mod/feedback/feedback-lazy.module.ts
@@ -17,7 +17,7 @@ import { RouterModule, Routes } from '@angular/router';
 import { CoreSharedModule } from '@/core/shared.module';
 import { AddonModFeedbackComponentsModule } from './components/components.module';
 import { AddonModFeedbackIndexPage } from './pages/index/index';
-import { AddonModFeedbackRespondentsPage } from './pages/respondents/respondents';
+import { AddonModFeedbackAttemptsPage } from './pages/attempts/attempts';
 import { conditionalRoutes } from '@/app/app-routing.module';
 import { CoreScreen } from '@services/screen';
 
@@ -40,11 +40,11 @@ const commonRoutes: Routes = [
 const mobileRoutes: Routes = [
     ...commonRoutes,
     {
-        path: ':courseId/:cmId/respondents',
-        component: AddonModFeedbackRespondentsPage,
+        path: ':courseId/:cmId/attempts',
+        component: AddonModFeedbackAttemptsPage,
     },
     {
-        path: ':courseId/:cmId/respondents/attempt/:attemptId',
+        path: ':courseId/:cmId/attempts/:attemptId',
         loadChildren: () => import('./pages/attempt/attempt.module').then(m => m.AddonModFeedbackAttemptPageModule),
     },
 ];
@@ -52,11 +52,11 @@ const mobileRoutes: Routes = [
 const tabletRoutes: Routes = [
     ...commonRoutes,
     {
-        path: ':courseId/:cmId/respondents',
-        component: AddonModFeedbackRespondentsPage,
+        path: ':courseId/:cmId/attempts',
+        component: AddonModFeedbackAttemptsPage,
         children: [
             {
-                path: 'attempt/:attemptId',
+                path: ':attemptId',
                 loadChildren: () => import('./pages/attempt/attempt.module').then(m => m.AddonModFeedbackAttemptPageModule),
             },
         ],
@@ -76,7 +76,7 @@ const routes: Routes = [
     ],
     declarations: [
         AddonModFeedbackIndexPage,
-        AddonModFeedbackRespondentsPage,
+        AddonModFeedbackAttemptsPage,
     ],
 })
 export class AddonModFeedbackLazyModule {}
diff --git a/src/addons/mod/feedback/pages/respondents/respondents.html b/src/addons/mod/feedback/pages/attempts/attempts.html
similarity index 74%
rename from src/addons/mod/feedback/pages/respondents/respondents.html
rename to src/addons/mod/feedback/pages/attempts/attempts.html
index 51c2184d0..795bde959 100644
--- a/src/addons/mod/feedback/pages/respondents/respondents.html
+++ b/src/addons/mod/feedback/pages/attempts/attempts.html
@@ -29,14 +29,15 @@
                     </ion-select>
                 </ion-item>
 
-                <ng-container *ngIf="responses.responses.total > 0">
+                <ng-container *ngIf="attempts.identifiable.total > 0">
                     <ion-item-divider>
                         <ion-label>
-                            <h2>{{ 'addon.mod_feedback.non_anonymous_entries' | translate : {$a: responses.responses.total } }}</h2>
+                            <h2>{{ 'addon.mod_feedback.non_anonymous_entries' | translate : {$a: attempts.identifiable.total } }}
+                            </h2>
                         </ion-label>
                     </ion-item-divider>
-                    <ion-item *ngFor="let attempt of responses.responses.attempts" class="ion-text-wrap" button detail="true"
-                        (click)="responses.select(attempt)" [attr.aria-current]="responses.getItemAriaCurrent(attempt)">
+                    <ion-item *ngFor="let attempt of attempts.identifiable.items" class="ion-text-wrap" button detail="true"
+                        (click)="attempts.select(attempt)" [attr.aria-current]="attempts.getItemAriaCurrent(attempt)">
                         <core-user-avatar [user]="attempt" slot="start"></core-user-avatar>
                         <ion-label>
                             <p class="item-heading">{{ attempt.fullname }}</p>
@@ -45,36 +46,36 @@
                     </ion-item>
 
                     <!-- Button and spinner to show more attempts. -->
-                    <ion-button *ngIf="responses.responses.canLoadMore && !loadingMore" class="ion-margin" expand="block"
+                    <ion-button *ngIf="attempts.identifiable.canLoadMore && !loadingMore" class="ion-margin" expand="block"
                         (click)="loadAttempts()">
                         {{ 'core.loadmore' | translate }}
                     </ion-button>
-                    <ion-item *ngIf="responses.responses.canLoadMore && loadingMore" class="ion-text-center">
+                    <ion-item *ngIf="attempts.identifiable.canLoadMore && loadingMore" class="ion-text-center">
                         <ion-label>
                             <ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner>
                         </ion-label>
                     </ion-item>
                 </ng-container>
 
-                <ng-container *ngIf="responses.anonResponses.total > 0">
+                <ng-container *ngIf="attempts.anonymous.total > 0">
                     <ion-item-divider>
                         <ion-label>
-                            <h2>{{ 'addon.mod_feedback.anonymous_entries' |translate : {$a: responses.anonResponses.total } }}</h2>
+                            <h2>{{ 'addon.mod_feedback.anonymous_entries' |translate : {$a: attempts.anonymous.total } }}</h2>
                         </ion-label>
                     </ion-item-divider>
-                    <ion-item *ngFor="let attempt of responses.anonResponses.attempts" class="ion-text-wrap" button detail="true"
-                        (click)="responses.select(attempt)" [attr.aria-current]="responses.getItemAriaCurrent(attempt)">
+                    <ion-item *ngFor="let attempt of attempts.anonymous.items" class="ion-text-wrap" button detail="true"
+                        (click)="attempts.select(attempt)" [attr.aria-current]="attempts.getItemAriaCurrent(attempt)">
                         <ion-label>
                             <h2>{{ 'addon.mod_feedback.response_nr' |translate }}: {{attempt.number}}</h2>
                         </ion-label>
                     </ion-item>
 
                     <!-- Button and spinner to show more attempts. -->
-                    <ion-button *ngIf="responses.anonResponses.canLoadMore && !loadingMore" class="ion-margin" expand="block"
+                    <ion-button *ngIf="attempts.anonymous.canLoadMore && !loadingMore" class="ion-margin" expand="block"
                         (click)="loadAttempts()">
                         {{ 'core.loadmore' | translate }}
                     </ion-button>
-                    <ion-item *ngIf="responses.anonResponses.canLoadMore && loadingMore" class="ion-text-center">
+                    <ion-item *ngIf="attempts.anonymous.canLoadMore && loadingMore" class="ion-text-center">
                         <ion-label>
                             <ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner>
                         </ion-label>
diff --git a/src/addons/mod/feedback/pages/respondents/respondents.ts b/src/addons/mod/feedback/pages/attempts/attempts.ts
similarity index 73%
rename from src/addons/mod/feedback/pages/respondents/respondents.ts
rename to src/addons/mod/feedback/pages/attempts/attempts.ts
index 73a95a75f..dc5915976 100644
--- a/src/addons/mod/feedback/pages/respondents/respondents.ts
+++ b/src/addons/mod/feedback/pages/attempts/attempts.ts
@@ -30,13 +30,13 @@ import {
 import { AddonModFeedbackHelper, AddonModFeedbackResponsesAnalysis } from '../../services/feedback-helper';
 
 /**
- * Page that displays feedback respondents.
+ * Page that displays feedback attempts.
  */
 @Component({
-    selector: 'page-addon-mod-feedback-respondents',
-    templateUrl: 'respondents.html',
+    selector: 'page-addon-mod-feedback-attempts',
+    templateUrl: 'attempts.html',
 })
-export class AddonModFeedbackRespondentsPage implements AfterViewInit {
+export class AddonModFeedbackAttemptsPage implements AfterViewInit {
 
     @ViewChild(CoreSplitViewComponent) splitView!: CoreSplitViewComponent;
 
@@ -45,7 +45,7 @@ export class AddonModFeedbackRespondentsPage implements AfterViewInit {
     protected page = 0;
     protected feedback?: AddonModFeedbackWSFeedback;
 
-    responses: AddonModFeedbackResponsesManager;
+    attempts: AddonModFeedbackAttemptsManager;
     selectedGroup!: number;
     groupInfo?: CoreGroupInfo;
     loaded = false;
@@ -54,7 +54,7 @@ export class AddonModFeedbackRespondentsPage implements AfterViewInit {
     constructor(
         route: ActivatedRoute,
     ) {
-        this.responses = new AddonModFeedbackResponsesManager(
+        this.attempts = new AddonModFeedbackAttemptsManager(
             route.component,
         );
     }
@@ -77,7 +77,7 @@ export class AddonModFeedbackRespondentsPage implements AfterViewInit {
 
         await this.fetchData();
 
-        this.responses.start(this.splitView);
+        this.attempts.start(this.splitView);
     }
 
     /**
@@ -88,7 +88,7 @@ export class AddonModFeedbackRespondentsPage implements AfterViewInit {
      */
     async fetchData(refresh: boolean = false): Promise<void> {
         this.page = 0;
-        this.responses.resetItems();
+        this.attempts.resetItems();
 
         try {
             this.feedback = await AddonModFeedback.getFeedback(this.courseId, this.cmId);
@@ -121,17 +121,17 @@ export class AddonModFeedbackRespondentsPage implements AfterViewInit {
         } else {
             this.selectedGroup = groupId;
             this.page = 0;
-            this.responses.resetItems();
+            this.attempts.resetItems();
         }
 
         try {
-            const responses = await AddonModFeedbackHelper.getResponsesAnalysis(this.feedback!.id, {
+            const attempts = await AddonModFeedbackHelper.getResponsesAnalysis(this.feedback!.id, {
                 groupId: this.selectedGroup,
                 page: this.page,
                 cmId: this.cmId,
             });
 
-            this.responses.setResponses(responses);
+            this.attempts.setAttempts(attempts);
         } finally {
             this.loadingMore = false;
             this.loaded = true;
@@ -183,16 +183,16 @@ type EntryItem = AddonModFeedbackWSAttempt | AddonModFeedbackWSAnonAttempt;
 /**
  * Entries manager.
  */
-class AddonModFeedbackResponsesManager extends CorePageItemsListManager<EntryItem> {
+class AddonModFeedbackAttemptsManager extends CorePageItemsListManager<EntryItem> {
 
-    responses: AddonModFeedbackResponses = {
-        attempts: [],
+    identifiable: AddonModFeedbackIdentifiableAttempts = {
+        items: [],
         total: 0,
         canLoadMore: false,
     };
 
-    anonResponses: AddonModFeedbackAnonResponses = {
-        attempts: [],
+    anonymous: AddonModFeedbackAnonymousAttempts = {
+        items: [],
         total: 0,
         canLoadMore: false,
     };
@@ -202,25 +202,25 @@ class AddonModFeedbackResponsesManager extends CorePageItemsListManager<EntryIte
     }
 
     /**
-     * Update responses.
+     * Update attempts.
      *
-     * @param responses Responses.
+     * @param attempts Attempts.
      */
-    setResponses(responses: AddonModFeedbackResponsesAnalysis): void {
-        this.responses.total = responses.totalattempts;
-        this.anonResponses.total = responses.totalanonattempts;
+    setAttempts(attempts: AddonModFeedbackResponsesAnalysis): void {
+        this.identifiable.total = attempts.totalattempts;
+        this.anonymous.total = attempts.totalanonattempts;
 
-        if (this.anonResponses.attempts.length < responses.totalanonattempts) {
-            this.anonResponses.attempts = this.anonResponses.attempts.concat(responses.anonattempts);
+        if (this.anonymous.items.length < attempts.totalanonattempts) {
+            this.anonymous.items = this.anonymous.items.concat(attempts.anonattempts);
         }
-        if (this.responses.attempts.length < responses.totalattempts) {
-            this.responses.attempts = this.responses.attempts.concat(responses.attempts);
+        if (this.identifiable.items.length < attempts.totalattempts) {
+            this.identifiable.items = this.identifiable.items.concat(attempts.attempts);
         }
 
-        this.anonResponses.canLoadMore = this.anonResponses.attempts.length < responses.totalanonattempts;
-        this.responses.canLoadMore = this.responses.attempts.length < responses.totalattempts;
+        this.anonymous.canLoadMore = this.anonymous.items.length < attempts.totalanonattempts;
+        this.identifiable.canLoadMore = this.identifiable.items.length < attempts.totalattempts;
 
-        this.setItems((<EntryItem[]> this.responses.attempts).concat(this.anonResponses.attempts));
+        this.setItems((<EntryItem[]> this.identifiable.items).concat(this.anonymous.items));
     }
 
     /**
@@ -228,29 +228,29 @@ class AddonModFeedbackResponsesManager extends CorePageItemsListManager<EntryIte
      */
     resetItems(): void {
         super.resetItems();
-        this.responses.total = 0;
-        this.responses.attempts = [];
-        this.anonResponses.total = 0;
-        this.anonResponses.attempts = [];
+        this.identifiable.total = 0;
+        this.identifiable.items = [];
+        this.anonymous.total = 0;
+        this.anonymous.items = [];
     }
 
     /**
      * @inheritdoc
      */
     protected getItemPath(entry: EntryItem): string {
-        return `attempt/${entry.id}`;
+        return entry.id.toString();
     }
 
 }
 
-type AddonModFeedbackResponses = {
-    attempts: AddonModFeedbackWSAttempt[];
+type AddonModFeedbackIdentifiableAttempts = {
+    items: AddonModFeedbackWSAttempt[];
     total: number;
     canLoadMore: boolean;
 };
 
-type AddonModFeedbackAnonResponses = {
-    attempts: AddonModFeedbackWSAnonAttempt[];
+type AddonModFeedbackAnonymousAttempts = {
+    items: AddonModFeedbackWSAnonAttempt[];
     total: number;
     canLoadMore: boolean;
 };
diff --git a/src/addons/mod/feedback/services/feedback-helper.ts b/src/addons/mod/feedback/services/feedback-helper.ts
index 3c1a89ce9..18a9a50f3 100644
--- a/src/addons/mod/feedback/services/feedback-helper.ts
+++ b/src/addons/mod/feedback/services/feedback-helper.ts
@@ -184,7 +184,7 @@ export class AddonModFeedbackHelperProvider {
             if (params.showcompleted === undefined) {
                 // Param showcompleted not defined. Show entry list.
                 await CoreNavigator.navigateToSitePath(
-                    AddonModFeedbackModuleHandlerService.PAGE_NAME + `/${module.course}/${module.id}/respondents`,
+                    AddonModFeedbackModuleHandlerService.PAGE_NAME + `/${module.course}/${module.id}/attempts`,
                     { siteId },
                 );
 

From 12e30f1c862f711b61ddc1c4bbc4a3f456a32f01 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 9 Dec 2021 13:47:36 +0100
Subject: [PATCH 0303/1008] MOBILE-3939 feedback: Attempts swipe navigation

---
 .../classes/feedback-attempts-source.ts       | 163 +++++++++++
 .../mod/feedback/pages/attempt/attempt.html   |  80 +++---
 .../mod/feedback/pages/attempt/attempt.ts     |  39 ++-
 .../mod/feedback/pages/attempts/attempts.html |  58 ++--
 .../mod/feedback/pages/attempts/attempts.ts   | 269 +++++++-----------
 src/core/classes/promised-value.ts            | 147 ++++++++++
 src/core/classes/tests/promised-value.test.ts |  44 +++
 7 files changed, 549 insertions(+), 251 deletions(-)
 create mode 100644 src/addons/mod/feedback/classes/feedback-attempts-source.ts
 create mode 100644 src/core/classes/promised-value.ts
 create mode 100644 src/core/classes/tests/promised-value.test.ts

diff --git a/src/addons/mod/feedback/classes/feedback-attempts-source.ts b/src/addons/mod/feedback/classes/feedback-attempts-source.ts
new file mode 100644
index 000000000..4ef92a857
--- /dev/null
+++ b/src/addons/mod/feedback/classes/feedback-attempts-source.ts
@@ -0,0 +1,163 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreRoutedItemsManagerSource } from '@classes/items-management/routed-items-manager-source';
+import { CoreGroupInfo, CoreGroups } from '@services/groups';
+import {
+    AddonModFeedback,
+    AddonModFeedbackProvider,
+    AddonModFeedbackWSAnonAttempt,
+    AddonModFeedbackWSAttempt,
+    AddonModFeedbackWSFeedback,
+} from '../services/feedback';
+import { AddonModFeedbackHelper } from '../services/feedback-helper';
+
+/**
+ * Feedback attempts.
+ */
+export class AddonModFeedbackAttemptsSource extends CoreRoutedItemsManagerSource<AddonModFeedbackAttemptItem> {
+
+    readonly COURSE_ID: number;
+    readonly CM_ID: number;
+
+    selectedGroup?: number;
+    identifiable?: AddonModFeedbackWSAttempt[];
+    identifiableTotal?: number;
+    anonymous?: AddonModFeedbackWSAnonAttempt[];
+    anonymousTotal?: number;
+    groupInfo?: CoreGroupInfo;
+
+    protected feedback?: AddonModFeedbackWSFeedback;
+
+    constructor(courseId: number, cmId: number) {
+        super();
+
+        this.COURSE_ID = courseId;
+        this.CM_ID = cmId;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    getItemPath(attempt: AddonModFeedbackAttemptItem): string {
+        return attempt.id.toString();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    getPagesLoaded(): number {
+        if (!this.identifiable || !this.anonymous) {
+            return 0;
+        }
+
+        const pageLength = this.getPageLength();
+
+        return Math.ceil(Math.max(this.anonymous.length, this.identifiable.length) / pageLength);
+    }
+
+    /**
+     * Type guard to infer AddonModFeedbackWSAttempt objects.
+     *
+     * @param discussion Item to check.
+     * @return Whether the item is an identifieable attempt.
+     */
+    isIdentifiableAttempt(attempt: AddonModFeedbackAttemptItem): attempt is AddonModFeedbackWSAttempt {
+        return 'fullname' in attempt;
+    }
+
+    /**
+     * Type guard to infer AddonModFeedbackWSAnonAttempt objects.
+     *
+     * @param discussion Item to check.
+     * @return Whether the item is an anonymous attempt.
+     */
+    isAnonymousAttempt(attempt: AddonModFeedbackAttemptItem): attempt is AddonModFeedbackWSAnonAttempt {
+        return 'number' in attempt;
+    }
+
+    /**
+     * Invalidate feedback cache.
+     */
+    async invalidateCache(): Promise<void> {
+        await Promise.all([
+            CoreGroups.invalidateActivityGroupInfo(this.CM_ID),
+            this.feedback && AddonModFeedback.invalidateResponsesAnalysisData(this.feedback.id),
+        ]);
+    }
+
+    /**
+     * Load feedback.
+     */
+    async loadFeedback(): Promise<void> {
+        this.feedback = await AddonModFeedback.getFeedback(this.COURSE_ID, this.CM_ID);
+        this.groupInfo = await CoreGroups.getActivityGroupInfo(this.CM_ID);
+
+        this.selectedGroup = CoreGroups.validateGroupId(this.selectedGroup, this.groupInfo);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected getPageLength(): number {
+        return AddonModFeedbackProvider.PER_PAGE;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected async loadPageItems(page: number): Promise<{ items: AddonModFeedbackAttemptItem[]; hasMoreItems: boolean }> {
+        if (!this.feedback) {
+            throw new Error('Can\'t load attempts without feeback');
+        }
+
+        const result = await AddonModFeedbackHelper.getResponsesAnalysis(this.feedback.id, {
+            page,
+            groupId: this.selectedGroup,
+            cmId: this.CM_ID,
+        });
+
+        if (page === 0) {
+            this.identifiableTotal = result.totalattempts;
+            this.anonymousTotal = result.totalanonattempts;
+        }
+
+        const totalItemsLoaded = this.getPageLength() * (page + 1);
+        const pageAttempts: AddonModFeedbackAttemptItem[] = [
+            ...result.attempts,
+            ...result.anonattempts,
+        ];
+
+        return {
+            items: pageAttempts,
+            hasMoreItems: result.totalattempts > totalItemsLoaded || result.totalanonattempts > totalItemsLoaded,
+        };
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected setItems(attempts: AddonModFeedbackAttemptItem[], hasMoreItems: boolean): void {
+        this.identifiable = attempts.filter(this.isIdentifiableAttempt);
+        this.anonymous = attempts.filter(this.isAnonymousAttempt);
+
+        super.setItems((this.identifiable as AddonModFeedbackAttemptItem[]).concat(this.anonymous), hasMoreItems);
+    }
+
+}
+
+/**
+ * Type of items that can be held in the source.
+ */
+export type AddonModFeedbackAttemptItem = AddonModFeedbackWSAttempt | AddonModFeedbackWSAnonAttempt;
diff --git a/src/addons/mod/feedback/pages/attempt/attempt.html b/src/addons/mod/feedback/pages/attempt/attempt.html
index 909f8e6a0..14d03f7fc 100644
--- a/src/addons/mod/feedback/pages/attempt/attempt.html
+++ b/src/addons/mod/feedback/pages/attempt/attempt.html
@@ -12,45 +12,47 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <core-loading [hideUntil]="loaded">
-        <ion-list class="ion-no-margin" *ngIf="attempt || anonAttempt">
-            <ion-item *ngIf="attempt" class="ion-text-wrap" core-user-link [userId]="attempt.userid"
-                [attr.aria-label]=" 'core.user.viewprofile' | translate" [courseId]="attempt.courseid">
-                <core-user-avatar [user]="attempt" slot="start"></core-user-avatar>
-                <ion-label>
-                    <h2>{{attempt.fullname}}</h2>
-                    <p *ngIf="attempt.timemodified">{{attempt.timemodified * 1000 | coreFormatDate }}</p>
-                </ion-label>
-            </ion-item>
+    <core-swipe-navigation [manager]="attempts">
+        <core-loading [hideUntil]="loaded">
+            <ion-list class="ion-no-margin" *ngIf="attempt || anonAttempt">
+                <ion-item *ngIf="attempt" class="ion-text-wrap" core-user-link [userId]="attempt.userid"
+                    [attr.aria-label]=" 'core.user.viewprofile' | translate" [courseId]="attempt.courseid">
+                    <core-user-avatar [user]="attempt" slot="start"></core-user-avatar>
+                    <ion-label>
+                        <h2>{{attempt.fullname}}</h2>
+                        <p *ngIf="attempt.timemodified">{{attempt.timemodified * 1000 | coreFormatDate }}</p>
+                    </ion-label>
+                </ion-item>
 
-            <ion-item class="ion-text-wrap" *ngIf="anonAttempt">
-                <ion-label>
-                    <h2>
-                        {{ 'addon.mod_feedback.response_nr' |translate }}: {{anonAttempt.number}}
-                        ({{ 'addon.mod_feedback.anonymous' |translate }})
-                    </h2>
-                </ion-label>
-            </ion-item>
-            <ng-container *ngIf="items && items.length">
-                <ng-container *ngFor="let item of items">
-                    <core-spacer *ngIf="item.typ == 'pagebreak'"></core-spacer>
-                    <ion-item class="ion-text-wrap" *ngIf="item.typ != 'pagebreak'" [color]="item.dependitem > 0 ? 'light' : ''">
-                        <ion-label>
-                            <h2 *ngIf="item.name" [core-mark-required]="item.required">
-                                <span *ngIf="feedback!.autonumbering && item.itemnumber">{{item.itemnumber}}. </span>
-                                <core-format-text [component]="component" [componentId]="cmId" [text]="item.name" contextLevel="module"
-                                    [contextInstanceId]="cmId" [courseId]="courseId">
-                                </core-format-text>
-                            </h2>
-                            <p *ngIf="item.submittedValue">
-                                <core-format-text [component]="component" [componentId]="cmId" [text]="item.submittedValue"
-                                    contextLevel="module" [contextInstanceId]="cmId" [courseId]="courseId">
-                                </core-format-text>
-                            </p>
-                        </ion-label>
-                    </ion-item>
+                <ion-item class="ion-text-wrap" *ngIf="anonAttempt">
+                    <ion-label>
+                        <h2>
+                            {{ 'addon.mod_feedback.response_nr' |translate }}: {{anonAttempt.number}}
+                            ({{ 'addon.mod_feedback.anonymous' |translate }})
+                        </h2>
+                    </ion-label>
+                </ion-item>
+                <ng-container *ngIf="items && items.length">
+                    <ng-container *ngFor="let item of items">
+                        <core-spacer *ngIf="item.typ == 'pagebreak'"></core-spacer>
+                        <ion-item class="ion-text-wrap" *ngIf="item.typ != 'pagebreak'" [color]="item.dependitem > 0 ? 'light' : ''">
+                            <ion-label>
+                                <h2 *ngIf="item.name" [core-mark-required]="item.required">
+                                    <span *ngIf="feedback!.autonumbering && item.itemnumber">{{item.itemnumber}}. </span>
+                                    <core-format-text [component]="component" [componentId]="cmId" [text]="item.name" contextLevel="module"
+                                        [contextInstanceId]="cmId" [courseId]="courseId">
+                                    </core-format-text>
+                                </h2>
+                                <p *ngIf="item.submittedValue">
+                                    <core-format-text [component]="component" [componentId]="cmId" [text]="item.submittedValue"
+                                        contextLevel="module" [contextInstanceId]="cmId" [courseId]="courseId">
+                                    </core-format-text>
+                                </p>
+                            </ion-label>
+                        </ion-item>
+                    </ng-container>
                 </ng-container>
-            </ng-container>
-        </ion-list>
-    </core-loading>
+            </ion-list>
+        </core-loading>
+    </core-swipe-navigation>
 </ion-content>
diff --git a/src/addons/mod/feedback/pages/attempt/attempt.ts b/src/addons/mod/feedback/pages/attempt/attempt.ts
index 194f22f06..f406be269 100644
--- a/src/addons/mod/feedback/pages/attempt/attempt.ts
+++ b/src/addons/mod/feedback/pages/attempt/attempt.ts
@@ -12,10 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, OnInit } from '@angular/core';
+import { Component, OnDestroy, OnInit } from '@angular/core';
+import { ActivatedRouteSnapshot } from '@angular/router';
+import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
+import { CoreSwipeNavigationItemsManager } from '@classes/items-management/swipe-navigation-items-manager';
 import { CoreNavigator } from '@services/navigator';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTextUtils } from '@services/utils/text';
+import { AddonModFeedbackAttemptsSource } from '../../classes/feedback-attempts-source';
 import {
     AddonModFeedback,
     AddonModFeedbackProvider,
@@ -32,7 +36,7 @@ import { AddonModFeedbackFormItem, AddonModFeedbackHelper } from '../../services
     selector: 'page-addon-mod-feedback-attempt',
     templateUrl: 'attempt.html',
 })
-export class AddonModFeedbackAttemptPage implements OnInit {
+export class AddonModFeedbackAttemptPage implements OnInit, OnDestroy {
 
     protected attemptId!: number;
 
@@ -40,6 +44,7 @@ export class AddonModFeedbackAttemptPage implements OnInit {
     courseId!: number;
     feedback?: AddonModFeedbackWSFeedback;
     attempt?: AddonModFeedbackWSAttempt;
+    attempts?: AddonModFeedbackAttemptsSwipeManager;
     anonAttempt?: AddonModFeedbackWSAnonAttempt;
     items: AddonModFeedbackAttemptItem[] = [];
     component = AddonModFeedbackProvider.COMPONENT;
@@ -53,6 +58,15 @@ export class AddonModFeedbackAttemptPage implements OnInit {
             this.cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
             this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
             this.attemptId = CoreNavigator.getRequiredRouteNumberParam('attemptId');
+
+            const source = CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(
+                AddonModFeedbackAttemptsSource,
+                [this.courseId, this.cmId],
+            );
+
+            this.attempts = new AddonModFeedbackAttemptsSwipeManager(source);
+
+            this.attempts.start();
         } catch (error) {
             CoreDomUtils.showErrorModal(error);
 
@@ -64,6 +78,13 @@ export class AddonModFeedbackAttemptPage implements OnInit {
         this.fetchData();
     }
 
+    /**
+     * @inheritdoc
+     */
+    ngOnDestroy(): void {
+        this.attempts?.destroy();
+    }
+
     /**
      * Fetch all the data required for the view.
      *
@@ -131,3 +152,17 @@ export class AddonModFeedbackAttemptPage implements OnInit {
 type AddonModFeedbackAttemptItem = AddonModFeedbackFormItem & {
     submittedValue?: string;
 };
+
+/**
+ * Helper to manage swiping within a collection of discussions.
+ */
+class AddonModFeedbackAttemptsSwipeManager extends CoreSwipeNavigationItemsManager {
+
+    /**
+     * @inheritdoc
+     */
+    protected getSelectedItemPathFromRoute(route: ActivatedRouteSnapshot): string | null {
+        return route.params.attemptId;
+    }
+
+}
diff --git a/src/addons/mod/feedback/pages/attempts/attempts.html b/src/addons/mod/feedback/pages/attempts/attempts.html
index 795bde959..69e914b21 100644
--- a/src/addons/mod/feedback/pages/attempts/attempts.html
+++ b/src/addons/mod/feedback/pages/attempts/attempts.html
@@ -10,77 +10,57 @@
 </ion-header>
 <ion-content>
     <core-split-view>
-        <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="refreshFeedback($event.target)">
+        <ion-refresher slot="fixed" [disabled]="!attempts || !attempts.loaded" (ionRefresh)="refreshFeedback($event.target)">
             <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
         </ion-refresher>
-        <core-loading [hideUntil]="loaded">
+        <core-loading [hideUntil]="attempts && attempts.loaded">
             <ion-list class="ion-no-margin">
                 <ion-item class="ion-text-wrap" *ngIf="groupInfo && (groupInfo.separateGroups || groupInfo.visibleGroups)">
                     <ion-label id="addon-feedback-groupslabel">
                         <ng-container *ngIf="groupInfo.separateGroups">{{'core.groupsseparate' | translate }}</ng-container>
                         <ng-container *ngIf="groupInfo.visibleGroups">{{'core.groupsvisible' | translate }}</ng-container>
                     </ion-label>
-                    <ion-select [(ngModel)]="selectedGroup" (ionChange)="loadAttempts(selectedGroup)"
-                        aria-labelledby="addon-feedback-groupslabel" interface="action-sheet"
-                        [interfaceOptions]="{header: 'core.group' | translate}">
+                    <ion-select [(ngModel)]="selectedGroup" (ionChange)="reloadAttempts()" aria-labelledby="addon-feedback-groupslabel"
+                        interface="action-sheet" [interfaceOptions]="{header: 'core.group' | translate}">
                         <ion-select-option *ngFor="let groupOpt of groupInfo.groups" [value]="groupOpt.id">
                             {{groupOpt.name}}
                         </ion-select-option>
                     </ion-select>
                 </ion-item>
 
-                <ng-container *ngIf="attempts.identifiable.total > 0">
+                <ng-container *ngIf="identifiableAttemptsTotal > 0">
                     <ion-item-divider>
                         <ion-label>
-                            <h2>{{ 'addon.mod_feedback.non_anonymous_entries' | translate : {$a: attempts.identifiable.total } }}
-                            </h2>
+                            <h2>{{ 'addon.mod_feedback.non_anonymous_entries' | translate : {$a: identifiableAttemptsTotal } }}</h2>
                         </ion-label>
                     </ion-item-divider>
-                    <ion-item *ngFor="let attempt of attempts.identifiable.items" class="ion-text-wrap" button detail="true"
-                        (click)="attempts.select(attempt)" [attr.aria-current]="attempts.getItemAriaCurrent(attempt)">
-                        <core-user-avatar [user]="attempt" slot="start"></core-user-avatar>
+                    <ion-item *ngFor="let attempt of identifiableAttempts" class="ion-text-wrap" button detail="true"
+                        (click)="attempts?.select(attempt)" [attr.aria-current]="attempts?.getItemAriaCurrent(attempt)">
+                        <core-user-avatar [user]="attempt" [linkProfile]="false" slot="start"></core-user-avatar>
                         <ion-label>
                             <p class="item-heading">{{ attempt.fullname }}</p>
-                            <p *ngIf="attempt.timemodified">{{attempt.timemodified * 1000 | coreFormatDate }}</p>
-                        </ion-label>
-                    </ion-item>
-
-                    <!-- Button and spinner to show more attempts. -->
-                    <ion-button *ngIf="attempts.identifiable.canLoadMore && !loadingMore" class="ion-margin" expand="block"
-                        (click)="loadAttempts()">
-                        {{ 'core.loadmore' | translate }}
-                    </ion-button>
-                    <ion-item *ngIf="attempts.identifiable.canLoadMore && loadingMore" class="ion-text-center">
-                        <ion-label>
-                            <ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner>
+                            <p *ngIf="attempt.timemodified">{{ attempt.timemodified * 1000 | coreFormatDate }}</p>
                         </ion-label>
                     </ion-item>
                 </ng-container>
 
-                <ng-container *ngIf="attempts.anonymous.total > 0">
+                <ng-container *ngIf="identifiableAttemptsTotal === identifiableAttempts.length && anonymousAttemptsTotal > 0">
                     <ion-item-divider>
                         <ion-label>
-                            <h2>{{ 'addon.mod_feedback.anonymous_entries' |translate : {$a: attempts.anonymous.total } }}</h2>
+                            <h2>{{ 'addon.mod_feedback.anonymous_entries' | translate : {$a: anonymousAttemptsTotal } }}</h2>
                         </ion-label>
                     </ion-item-divider>
-                    <ion-item *ngFor="let attempt of attempts.anonymous.items" class="ion-text-wrap" button detail="true"
-                        (click)="attempts.select(attempt)" [attr.aria-current]="attempts.getItemAriaCurrent(attempt)">
+                    <ion-item *ngFor="let attempt of anonymousAttempts" class="ion-text-wrap" button detail="true"
+                        (click)="attempts?.select(attempt)" [attr.aria-current]="attempts?.getItemAriaCurrent(attempt)">
                         <ion-label>
-                            <h2>{{ 'addon.mod_feedback.response_nr' |translate }}: {{attempt.number}}</h2>
-                        </ion-label>
-                    </ion-item>
-
-                    <!-- Button and spinner to show more attempts. -->
-                    <ion-button *ngIf="attempts.anonymous.canLoadMore && !loadingMore" class="ion-margin" expand="block"
-                        (click)="loadAttempts()">
-                        {{ 'core.loadmore' | translate }}
-                    </ion-button>
-                    <ion-item *ngIf="attempts.anonymous.canLoadMore && loadingMore" class="ion-text-center">
-                        <ion-label>
-                            <ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner>
+                            <h2>{{ 'addon.mod_feedback.response_nr' | translate }}: {{attempt.number}}</h2>
                         </ion-label>
                     </ion-item>
                 </ng-container>
+
+                <core-infinite-loading [enabled]="attempts && attempts.loaded && !attempts.completed" [error]="fetchFailed"
+                    (action)="fetchMoreAttempts($event)">
+                </core-infinite-loading>
             </ion-list>
         </core-loading>
     </core-split-view>
diff --git a/src/addons/mod/feedback/pages/attempts/attempts.ts b/src/addons/mod/feedback/pages/attempts/attempts.ts
index dc5915976..40fe0a21f 100644
--- a/src/addons/mod/feedback/pages/attempts/attempts.ts
+++ b/src/addons/mod/feedback/pages/attempts/attempts.ts
@@ -12,22 +12,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { AfterViewInit, Component, ViewChild } from '@angular/core';
+import { AfterViewInit, Component, OnDestroy, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { CorePageItemsListManager } from '@classes/page-items-list-manager';
+import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
+import { CoreListItemsManager } from '@classes/items-management/list-items-manager';
+import { CorePromisedValue } from '@classes/promised-value';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import { IonRefresher } from '@ionic/angular';
-import { CoreGroupInfo, CoreGroups } from '@services/groups';
+import { CoreGroupInfo } from '@services/groups';
 import { CoreNavigator } from '@services/navigator';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
-import {
-    AddonModFeedback,
-    AddonModFeedbackWSAnonAttempt,
-    AddonModFeedbackWSAttempt,
-    AddonModFeedbackWSFeedback,
-} from '../../services/feedback';
-import { AddonModFeedbackHelper, AddonModFeedbackResponsesAnalysis } from '../../services/feedback-helper';
+import { AddonModFeedbackAttemptItem, AddonModFeedbackAttemptsSource } from '../../classes/feedback-attempts-source';
+import { AddonModFeedbackWSAnonAttempt, AddonModFeedbackWSAttempt } from '../../services/feedback';
 
 /**
  * Page that displays feedback attempts.
@@ -36,27 +33,52 @@ import { AddonModFeedbackHelper, AddonModFeedbackResponsesAnalysis } from '../..
     selector: 'page-addon-mod-feedback-attempts',
     templateUrl: 'attempts.html',
 })
-export class AddonModFeedbackAttemptsPage implements AfterViewInit {
+export class AddonModFeedbackAttemptsPage implements AfterViewInit, OnDestroy {
 
     @ViewChild(CoreSplitViewComponent) splitView!: CoreSplitViewComponent;
 
-    protected cmId!: number;
-    protected courseId!: number;
-    protected page = 0;
-    protected feedback?: AddonModFeedbackWSFeedback;
+    promisedAttempts: CorePromisedValue<CoreListItemsManager<AddonModFeedbackAttemptItem, AddonModFeedbackAttemptsSource>>;
+    fetchFailed = false;
 
-    attempts: AddonModFeedbackAttemptsManager;
-    selectedGroup!: number;
-    groupInfo?: CoreGroupInfo;
-    loaded = false;
-    loadingMore = false;
+    constructor(protected route: ActivatedRoute) {
+        this.promisedAttempts = new CorePromisedValue();
+    }
 
-    constructor(
-        route: ActivatedRoute,
-    ) {
-        this.attempts = new AddonModFeedbackAttemptsManager(
-            route.component,
-        );
+    get attempts(): CoreListItemsManager<AddonModFeedbackAttemptItem, AddonModFeedbackAttemptsSource> | null {
+        return this.promisedAttempts.value;
+    }
+
+    get groupInfo(): CoreGroupInfo | undefined {
+        return this.attempts?.getSource().groupInfo;
+    }
+
+    get selectedGroup(): number | undefined {
+        return this.attempts?.getSource().selectedGroup;
+    }
+
+    set selectedGroup(group: number | undefined) {
+        if (!this.attempts) {
+            return;
+        }
+
+        this.attempts.getSource().selectedGroup = group;
+        this.attempts.getSource().setDirty(true);
+    }
+
+    get identifiableAttempts(): AddonModFeedbackWSAttempt[] {
+        return this.attempts?.getSource().identifiable ?? [];
+    }
+
+    get identifiableAttemptsTotal(): number {
+        return this.attempts?.getSource().identifiableTotal ?? 0;
+    }
+
+    get anonymousAttempts(): AddonModFeedbackWSAnonAttempt[] {
+        return this.attempts?.getSource().anonymous ?? [];
+    }
+
+    get anonymousAttemptsTotal(): number {
+        return this.attempts?.getSource().anonymousTotal ?? 0;
     }
 
     /**
@@ -64,9 +86,16 @@ export class AddonModFeedbackAttemptsPage implements AfterViewInit {
      */
     async ngAfterViewInit(): Promise<void> {
         try {
-            this.cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
-            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
-            this.selectedGroup = CoreNavigator.getRouteNumberParam('group') || 0;
+            const cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
+            const courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            const source = CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(
+                AddonModFeedbackAttemptsSource,
+                [courseId, cmId],
+            );
+
+            source.selectedGroup = CoreNavigator.getRouteNumberParam('group') || 0;
+
+            this.promisedAttempts.resolve(new CoreListItemsManager(source, this.route.component));
         } catch (error) {
             CoreDomUtils.showErrorModal(error);
 
@@ -75,79 +104,47 @@ export class AddonModFeedbackAttemptsPage implements AfterViewInit {
             return;
         }
 
-        await this.fetchData();
-
-        this.attempts.start(this.splitView);
-    }
-
-    /**
-     * Fetch all the data required for the view.
-     *
-     * @param refresh Empty events array first.
-     * @return Promise resolved when done.
-     */
-    async fetchData(refresh: boolean = false): Promise<void> {
-        this.page = 0;
-        this.attempts.resetItems();
+        const attempts = await this.promisedAttempts;
 
         try {
-            this.feedback = await AddonModFeedback.getFeedback(this.courseId, this.cmId);
+            this.fetchFailed = false;
 
-            this.groupInfo = await CoreGroups.getActivityGroupInfo(this.cmId);
-
-            this.selectedGroup = CoreGroups.validateGroupId(this.selectedGroup, this.groupInfo);
-
-            await this.loadGroupAttempts(this.selectedGroup);
+            await attempts.getSource().loadFeedback();
+            await attempts.load();
         } catch (error) {
-            CoreDomUtils.showErrorModalDefault(error, 'core.course.errorgetmodule', true);
+            this.fetchFailed = true;
 
-            if (!refresh) {
-                // Some call failed on first fetch, go back.
-                CoreNavigator.back();
-            }
+            CoreDomUtils.showErrorModalDefault(error, 'core.course.errorgetmodule', true);
         }
+
+        await attempts.start(this.splitView);
     }
 
     /**
-     * Load Group attempts.
-     *
-     * @param groupId If defined it will change group if not, it will load more attempts for the same group.
-     * @return Resolved with the attempts loaded.
+     * @inheritdoc
      */
-    protected async loadGroupAttempts(groupId?: number): Promise<void> {
-        if (groupId === undefined) {
-            this.page++;
-            this.loadingMore = true;
-        } else {
-            this.selectedGroup = groupId;
-            this.page = 0;
-            this.attempts.resetItems();
-        }
+    ngOnDestroy(): void {
+        this.attempts?.destroy();
+    }
+
+    /**
+     * Fetch more attempts, if any.
+     *
+     * @param infiniteComplete Complete callback for infinite loader.
+     */
+    async fetchMoreAttempts(infiniteComplete?: () => void): Promise<void> {
+        const attempts = await this.promisedAttempts;
 
         try {
-            const attempts = await AddonModFeedbackHelper.getResponsesAnalysis(this.feedback!.id, {
-                groupId: this.selectedGroup,
-                page: this.page,
-                cmId: this.cmId,
-            });
+            this.fetchFailed = false;
 
-            this.attempts.setAttempts(attempts);
+            await attempts.load();
+        } catch (error) {
+            this.fetchFailed = true;
+
+            CoreDomUtils.showErrorModalDefault(error, 'core.course.errorgetmodule', true);
         } finally {
-            this.loadingMore = false;
-            this.loaded = true;
-        }
-    }
-
-    /**
-     * Change selected group or load more attempts.
-     *
-     * @param groupId Group ID selected. If not defined, it will load more attempts.
-     */
-    async loadAttempts(groupId?: number): Promise<void> {
-        try {
-            await this.loadGroupAttempts(groupId);
-        } catch (error) {
-            CoreDomUtils.showErrorModalDefault(error, 'core.course.errorgetmodule', true);
+            infiniteComplete && infiniteComplete();
         }
     }
 
@@ -157,100 +154,30 @@ export class AddonModFeedbackAttemptsPage implements AfterViewInit {
      * @param refresher Refresher.
      */
     async refreshFeedback(refresher: IonRefresher): Promise<void> {
-        const promises: Promise<void>[] = [];
-
-        promises.push(CoreGroups.invalidateActivityGroupInfo(this.cmId));
-        if (this.feedback) {
-            promises.push(AddonModFeedback.invalidateResponsesAnalysisData(this.feedback.id));
-        }
+        const attempts = await this.promisedAttempts;
 
         try {
-            await CoreUtils.ignoreErrors(Promise.all(promises));
+            this.fetchFailed = false;
 
-            await this.fetchData(true);
+            await CoreUtils.ignoreErrors(attempts.getSource().invalidateCache());
+            await attempts.getSource().loadFeedback();
+            await attempts.reload();
+        } catch (error) {
+            this.fetchFailed = true;
+
+            CoreDomUtils.showErrorModalDefault(error, 'core.course.errorgetmodule', true);
         } finally {
             refresher.complete();
         }
     }
 
-}
-
-/**
- * Type of items that can be held by the entries manager.
- */
-type EntryItem = AddonModFeedbackWSAttempt | AddonModFeedbackWSAnonAttempt;
-
-/**
- * Entries manager.
- */
-class AddonModFeedbackAttemptsManager extends CorePageItemsListManager<EntryItem> {
-
-    identifiable: AddonModFeedbackIdentifiableAttempts = {
-        items: [],
-        total: 0,
-        canLoadMore: false,
-    };
-
-    anonymous: AddonModFeedbackAnonymousAttempts = {
-        items: [],
-        total: 0,
-        canLoadMore: false,
-    };
-
-    constructor(pageComponent: unknown) {
-        super(pageComponent);
-    }
-
     /**
-     * Update attempts.
-     *
-     * @param attempts Attempts.
+     * Reload attempts list.
      */
-    setAttempts(attempts: AddonModFeedbackResponsesAnalysis): void {
-        this.identifiable.total = attempts.totalattempts;
-        this.anonymous.total = attempts.totalanonattempts;
+    async reloadAttempts(): Promise<void> {
+        const attempts = await this.promisedAttempts;
 
-        if (this.anonymous.items.length < attempts.totalanonattempts) {
-            this.anonymous.items = this.anonymous.items.concat(attempts.anonattempts);
-        }
-        if (this.identifiable.items.length < attempts.totalattempts) {
-            this.identifiable.items = this.identifiable.items.concat(attempts.attempts);
-        }
-
-        this.anonymous.canLoadMore = this.anonymous.items.length < attempts.totalanonattempts;
-        this.identifiable.canLoadMore = this.identifiable.items.length < attempts.totalattempts;
-
-        this.setItems((<EntryItem[]> this.identifiable.items).concat(this.anonymous.items));
-    }
-
-    /**
-     * @inheritdoc
-     */
-    resetItems(): void {
-        super.resetItems();
-        this.identifiable.total = 0;
-        this.identifiable.items = [];
-        this.anonymous.total = 0;
-        this.anonymous.items = [];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected getItemPath(entry: EntryItem): string {
-        return entry.id.toString();
+        await attempts.reload();
     }
 
 }
-
-type AddonModFeedbackIdentifiableAttempts = {
-    items: AddonModFeedbackWSAttempt[];
-    total: number;
-    canLoadMore: boolean;
-};
-
-type AddonModFeedbackAnonymousAttempts = {
-    items: AddonModFeedbackWSAnonAttempt[];
-    total: number;
-    canLoadMore: boolean;
-};
diff --git a/src/core/classes/promised-value.ts b/src/core/classes/promised-value.ts
new file mode 100644
index 000000000..ae7bbbdec
--- /dev/null
+++ b/src/core/classes/promised-value.ts
@@ -0,0 +1,147 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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.
+
+/**
+ * Promise wrapper to expose result synchronously.
+ */
+export class CorePromisedValue<T = unknown> implements Promise<T> {
+
+    /**
+     * Wrap an existing promise.
+     *
+     * @param promise Promise.
+     * @returns Promised value.
+     */
+    static from<T>(promise: Promise<T>): CorePromisedValue<T> {
+        const promisedValue = new CorePromisedValue<T>();
+
+        promise
+            .then(promisedValue.resolve.bind(promisedValue))
+            .catch(promisedValue.reject.bind(promisedValue));
+
+        return promisedValue;
+    }
+
+    private _resolvedValue?: T;
+    private _rejectedReason?: Error;
+    declare private promise: Promise<T>;
+    declare private _resolve: (result: T) => void;
+    declare private _reject: (error?: Error) => void;
+
+    constructor() {
+        this.initPromise();
+    }
+
+    [Symbol.toStringTag]: string;
+
+    get value(): T | null {
+        return this._resolvedValue ?? null;
+    }
+
+    /**
+     * Check whether the promise resolved successfully.
+     *
+     * @return Whether the promise resolved successfuly.
+     */
+    isResolved(): this is { value: T } {
+        return '_resolvedValue' in this;
+    }
+
+    /**
+     * Check whether the promise was rejected.
+     *
+     * @return Whether the promise was rejected.
+     */
+    isRejected(): boolean {
+        return '_rejectedReason' in this;
+    }
+
+    /**
+     * Check whether the promise is settled.
+     *
+     * @returns Whether the promise is settled.
+     */
+    isSettled(): boolean {
+        return this.isResolved() || this.isRejected();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    then<TResult1 = T, TResult2 = never>(
+        onFulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | undefined | null,
+        onRejected?: ((reason: Error) => TResult2 | PromiseLike<TResult2>) | undefined | null,
+    ): Promise<TResult1 | TResult2> {
+        return this.promise.then(onFulfilled, onRejected);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    catch<TResult = never>(
+        onRejected?: ((reason: Error) => TResult | PromiseLike<TResult>) | undefined | null,
+    ): Promise<T | TResult> {
+        return this.promise.catch(onRejected);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    finally(onFinally?: (() => void) | null): Promise<T> {
+        return this.promise.finally(onFinally);
+    }
+
+    /**
+     * Resolve the promise.
+     *
+     * @param value Promise result.
+     */
+    resolve(value: T): void {
+        if (this.isSettled()) {
+            delete this._rejectedReason;
+
+            this.initPromise();
+        }
+
+        this._resolvedValue = value;
+        this._resolve(value);
+    }
+
+    /**
+     * Reject the promise.
+     *
+     * @param value Rejection reason.
+     */
+    reject(reason?: Error): void {
+        if (this.isSettled()) {
+            delete this._resolvedValue;
+
+            this.initPromise();
+        }
+
+        this._rejectedReason = reason;
+        this._reject(reason);
+    }
+
+    /**
+     * Initialize the promise and the callbacks.
+     */
+    private initPromise(): void {
+        this.promise = new Promise((resolve, reject) => {
+            this._resolve = resolve;
+            this._reject = reject;
+        });
+    }
+
+}
diff --git a/src/core/classes/tests/promised-value.test.ts b/src/core/classes/tests/promised-value.test.ts
new file mode 100644
index 000000000..71b5a2821
--- /dev/null
+++ b/src/core/classes/tests/promised-value.test.ts
@@ -0,0 +1,44 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CorePromisedValue } from '../promised-value';
+
+describe('PromisedValue', () => {
+
+    it('works like a promise', async () => {
+        const promisedString = new CorePromisedValue<string>();
+        expect(promisedString.value).toBe(null);
+        expect(promisedString.isResolved()).toBe(false);
+
+        promisedString.resolve('foo');
+        expect(promisedString.isResolved()).toBe(true);
+        expect(promisedString.value).toBe('foo');
+
+        const resolvedValue = await promisedString;
+        expect(resolvedValue).toBe('foo');
+    });
+
+    it('can update values', async () => {
+        const promisedString = new CorePromisedValue<string>();
+        promisedString.resolve('foo');
+        promisedString.resolve('bar');
+
+        expect(promisedString.isResolved()).toBe(true);
+        expect(promisedString.value).toBe('bar');
+
+        const resolvedValue = await promisedString;
+        expect(resolvedValue).toBe('bar');
+    });
+
+});

From e628e039fc6765152fd8adbc7e6d7cbe17973813 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 9 Dec 2021 14:10:50 +0100
Subject: [PATCH 0304/1008] MOBILE-3939 feedback: Consolidate user profiles

---
 scripts/langindex.json                              |  1 +
 src/addons/mod/feedback/lang.json                   |  1 +
 src/addons/mod/feedback/pages/attempt/attempt.html  | 13 +++++--------
 .../mod/feedback/pages/attempts/attempts.html       |  4 +++-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 26f2815f3..3ab3ca3a4 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -559,6 +559,7 @@
   "addon.mod_feedback.analysis": "feedback",
   "addon.mod_feedback.anonymous": "feedback",
   "addon.mod_feedback.anonymous_entries": "feedback",
+  "addon.mod_feedback.anonymous_user": "feedback",
   "addon.mod_feedback.average": "feedback",
   "addon.mod_feedback.captchaofflinewarning": "local_moodlemobileapp",
   "addon.mod_feedback.complete_the_form": "feedback",
diff --git a/src/addons/mod/feedback/lang.json b/src/addons/mod/feedback/lang.json
index 8d575a97b..903a127e3 100644
--- a/src/addons/mod/feedback/lang.json
+++ b/src/addons/mod/feedback/lang.json
@@ -2,6 +2,7 @@
     "analysis": "Analysis",
     "anonymous": "Anonymous",
     "anonymous_entries": "Anonymous entries ({{$a}})",
+    "anonymous_user": "Anonymous user",
     "average": "Average",
     "captchaofflinewarning": "Feedback with CAPTCHA cannot be completed offline, or if not configured, or if the server is down.",
     "complete_the_form": "Answer the questions",
diff --git a/src/addons/mod/feedback/pages/attempt/attempt.html b/src/addons/mod/feedback/pages/attempt/attempt.html
index 14d03f7fc..3fee6027f 100644
--- a/src/addons/mod/feedback/pages/attempt/attempt.html
+++ b/src/addons/mod/feedback/pages/attempt/attempt.html
@@ -5,9 +5,7 @@
         </ion-buttons>
         <ion-title>
             <h1 *ngIf="attempt">{{ attempt.fullname }}</h1>
-            <h1 *ngIf="anonAttempt">
-                {{ 'addon.mod_feedback.response_nr' |translate }}: {{anonAttempt.number}}
-            </h1>
+            <h1 *ngIf="anonAttempt">{{ 'addon.mod_feedback.anonymous_user' | translate }}</h1>
         </ion-title>
     </ion-toolbar>
 </ion-header>
@@ -16,7 +14,7 @@
         <core-loading [hideUntil]="loaded">
             <ion-list class="ion-no-margin" *ngIf="attempt || anonAttempt">
                 <ion-item *ngIf="attempt" class="ion-text-wrap" core-user-link [userId]="attempt.userid"
-                    [attr.aria-label]=" 'core.user.viewprofile' | translate" [courseId]="attempt.courseid">
+                    [attr.aria-label]="'core.user.viewprofile' | translate" [courseId]="attempt.courseid">
                     <core-user-avatar [user]="attempt" slot="start"></core-user-avatar>
                     <ion-label>
                         <h2>{{attempt.fullname}}</h2>
@@ -25,11 +23,10 @@
                 </ion-item>
 
                 <ion-item class="ion-text-wrap" *ngIf="anonAttempt">
+                    <core-user-avatar [linkProfile]="false" slot="start"></core-user-avatar>
                     <ion-label>
-                        <h2>
-                            {{ 'addon.mod_feedback.response_nr' |translate }}: {{anonAttempt.number}}
-                            ({{ 'addon.mod_feedback.anonymous' |translate }})
-                        </h2>
+                        <h2>{{ 'addon.mod_feedback.anonymous_user' |translate }}</h2>
+                        <p>{{ 'addon.mod_feedback.response_nr' | translate }}: {{anonAttempt.number}}</p>
                     </ion-label>
                 </ion-item>
                 <ng-container *ngIf="items && items.length">
diff --git a/src/addons/mod/feedback/pages/attempts/attempts.html b/src/addons/mod/feedback/pages/attempts/attempts.html
index 69e914b21..123818d86 100644
--- a/src/addons/mod/feedback/pages/attempts/attempts.html
+++ b/src/addons/mod/feedback/pages/attempts/attempts.html
@@ -52,8 +52,10 @@
                     </ion-item-divider>
                     <ion-item *ngFor="let attempt of anonymousAttempts" class="ion-text-wrap" button detail="true"
                         (click)="attempts?.select(attempt)" [attr.aria-current]="attempts?.getItemAriaCurrent(attempt)">
+                        <core-user-avatar [linkProfile]="false" slot="start"></core-user-avatar>
                         <ion-label>
-                            <h2>{{ 'addon.mod_feedback.response_nr' | translate }}: {{attempt.number}}</h2>
+                            <p class="item-heading">{{ 'addon.mod_feedback.anonymous_user' | translate }}</p>
+                            <p>{{ 'addon.mod_feedback.response_nr' | translate }}: {{attempt.number}}</p>
                         </ion-label>
                     </ion-item>
                 </ng-container>

From 3cf8c1df7416b28b2cb64b21ced2449e2d59eb94 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 9 Dec 2021 14:25:36 +0100
Subject: [PATCH 0305/1008] MOBILE-3833 glossary: Fix index page

---
 .../mod/glossary/components/index/index.ts    | 56 +++++++++++--------
 1 file changed, 34 insertions(+), 22 deletions(-)

diff --git a/src/addons/mod/glossary/components/index/index.ts b/src/addons/mod/glossary/components/index/index.ts
index 7599c7afc..beb7aad9c 100644
--- a/src/addons/mod/glossary/components/index/index.ts
+++ b/src/addons/mod/glossary/components/index/index.ts
@@ -17,6 +17,7 @@ import { AfterViewInit, Component, OnDestroy, OnInit, Optional, ViewChild } from
 import { ActivatedRoute } from '@angular/router';
 import { CoreListItemsManager } from '@classes/items-management/list-items-manager';
 import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
+import { CorePromisedValue } from '@classes/promised-value';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import { CoreCourseModuleMainActivityComponent } from '@features/course/classes/main-activity-component';
 import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
@@ -70,7 +71,7 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
     canAdd = false;
     loadMoreError = false;
     loadingMessage: string;
-    entries!: AddonModGlossaryEntriesManager;
+    promisedEntries: CorePromisedValue<AddonModGlossaryEntriesManager>;
     hasOfflineRatings = false;
 
     protected syncEventName = AddonModGlossarySyncProvider.AUTO_SYNCED;
@@ -92,18 +93,23 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
         super('AddonModGlossaryIndexComponent', content, courseContentsPage);
 
         this.loadingMessage = Translate.instant('core.loading');
+        this.promisedEntries = new CorePromisedValue();
+    }
+
+    get entries(): AddonModGlossaryEntriesManager | null {
+        return this.promisedEntries.value;
     }
 
     get glossary(): AddonModGlossaryGlossary | undefined {
-        return this.entries.getSource().glossary;
+        return this.entries?.getSource().glossary;
     }
 
     get isSearch(): boolean {
-        return this.entries.getSource().isSearch;
+        return this.entries?.getSource().isSearch ?? false;
     }
 
     get hasSearched(): boolean {
-        return this.entries.getSource().hasSearched;
+        return this.entries?.getSource().hasSearched ?? false;
     }
 
     /**
@@ -118,10 +124,10 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
             [this.courseId, this.module.id, this.courseContentsPage ? `${AddonModGlossaryModuleHandlerService.PAGE_NAME}/` : ''],
         );
 
-        this.entries = new AddonModGlossaryEntriesManager(
+        this.promisedEntries.resolve(new AddonModGlossaryEntriesManager(
             source,
             this.route.component,
-        );
+        ));
 
         this.sourceUnsubscribe = source.addListener({
             onItemsUpdated: items => this.hasOffline = !!items.find(item => source.isOfflineEntry(item)),
@@ -156,13 +162,10 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
      * @inheritdoc
      */
     async ngAfterViewInit(): Promise<void> {
+        const entries = await this.promisedEntries;
+
         await this.loadContent(false, true);
-
-        if (!this.glossary) {
-            return;
-        }
-
-        await this.entries.start(this.splitView);
+        await entries.start(this.splitView);
 
         try {
             CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
@@ -175,8 +178,10 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
      * @inheritdoc
      */
     protected async fetchContent(refresh: boolean = false, sync: boolean = false, showErrors: boolean = false): Promise<void> {
+        const entries = await this.promisedEntries;
+
         try {
-            await this.entries.getSource().loadGlossary();
+            await entries.getSource().loadGlossary();
 
             if (!this.glossary) {
                 return;
@@ -187,7 +192,7 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
 
             this.dataRetrieved.emit(this.glossary);
 
-            if (!this.entries.getSource().fetchMode) {
+            if (!entries.getSource().fetchMode) {
                 this.switchMode('letter_all');
             }
 
@@ -198,7 +203,7 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
 
             const [hasOfflineRatings] = await Promise.all([
                 CoreRatingOffline.hasRatings('mod_glossary', 'entry', ContextLevel.MODULE, this.glossary.coursemodule),
-                refresh ? this.entries.reload() : this.entries.load(),
+                refresh ? entries.reload() : entries.load(),
             ]);
 
             this.hasOfflineRatings = hasOfflineRatings;
@@ -211,7 +216,7 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
      * @inheritdoc
      */
     protected async invalidateContent(): Promise<void> {
-        await this.entries.getSource().invalidateCache();
+        await this.entries?.getSource().invalidateCache();
     }
 
     /**
@@ -250,7 +255,7 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
      * @param mode New mode.
      */
     protected switchMode(mode: AddonModGlossaryFetchMode): void {
-        this.entries.getSource().switchMode(mode);
+        this.entries?.getSource().switchMode(mode);
 
         switch (mode) {
             case 'author_all':
@@ -304,10 +309,12 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
      * @return Promise resolved when done.
      */
     async loadMoreEntries(infiniteComplete?: () => void): Promise<void> {
+        const entries = await this.promisedEntries;
+
         try {
             this.loadMoreError = false;
 
-            await this.entries.load();
+            await entries.load();
         } catch (error) {
             this.loadMoreError = true;
             CoreDomUtils.showErrorModalDefault(error, 'addon.mod_glossary.errorloadingentries', true);
@@ -326,7 +333,8 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
             return;
         }
 
-        const previousMode = this.entries.getSource().fetchMode;
+        const entries = await this.promisedEntries;
+        const previousMode = entries.getSource().fetchMode;
         const newMode = await CoreDomUtils.openPopover<AddonModGlossaryFetchMode>({
             component: AddonModGlossaryModePickerPopoverComponent,
             componentProps: {
@@ -357,6 +365,10 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
      * Toggles between search and fetch mode.
      */
     toggleSearch(): void {
+        if (!this.entries) {
+            return;
+        }
+
         if (this.isSearch) {
             const fetchMode = this.entries.getSource().fetchMode;
 
@@ -393,7 +405,7 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
      * Opens new entry editor.
      */
     openNewEntry(): void {
-        this.entries.select(AddonModGlossaryEntriesSource.NEW_ENTRY);
+        this.entries?.select(AddonModGlossaryEntriesSource.NEW_ENTRY);
     }
 
     /**
@@ -405,7 +417,7 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
         this.loadingMessage = Translate.instant('core.searching');
         this.loaded = false;
 
-        this.entries.getSource().search(query);
+        this.entries?.getSource().search(query);
         this.loadContent();
     }
 
@@ -419,7 +431,7 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
         this.ratingOfflineObserver?.off();
         this.ratingSyncObserver?.off();
         this.sourceUnsubscribe?.call(null);
-        this.entries.destroy();
+        this.entries?.destroy();
     }
 
 }

From 848b5e79b5538631c30dd29be9f9845ecc4c298d Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 9 Dec 2021 15:18:10 +0100
Subject: [PATCH 0306/1008] MOBILE-3833 forum: Avoid assert declarations

---
 .../mod/forum/components/index/index.html     |  4 +-
 .../mod/forum/components/index/index.ts       | 58 ++++++++++++-------
 2 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/src/addons/mod/forum/components/index/index.html b/src/addons/mod/forum/components/index/index.html
index 63cd1b7b6..5000be62a 100644
--- a/src/addons/mod/forum/components/index/index.html
+++ b/src/addons/mod/forum/components/index/index.html
@@ -69,8 +69,8 @@
             </div>
 
             <ion-item *ngFor="let discussion of discussionsItems" class="addon-mod-forum-discussion" detail="true"
-                [lines]="discussion.groupname && 'none'" [attr.aria-current]="discussions.getItemAriaCurrent(discussion)"
-                (click)="discussions.select(discussion)" button>
+                [lines]="discussion.groupname && 'none'" [attr.aria-current]="discussions?.getItemAriaCurrent(discussion)"
+                (click)="discussions?.select(discussion)" button>
                 <ion-label>
                     <div class="addon-mod-forum-discussion-title">
                         <p class="ion-text-wrap item-heading">
diff --git a/src/addons/mod/forum/components/index/index.ts b/src/addons/mod/forum/components/index/index.ts
index 9afeb028e..b2ac0282c 100644
--- a/src/addons/mod/forum/components/index/index.ts
+++ b/src/addons/mod/forum/components/index/index.ts
@@ -58,6 +58,7 @@ import { ContextLevel } from '@/core/constants';
 import { AddonModForumDiscussionItem, AddonModForumDiscussionsSource } from '../../classes/forum-discussions-source';
 import { CoreListItemsManager } from '@classes/items-management/list-items-manager';
 import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
+import { CorePromisedValue } from '@classes/promised-value';
 
 /**
  * Component that displays a forum entry page.
@@ -74,7 +75,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
     component = AddonModForumProvider.COMPONENT;
     moduleName = 'forum';
     descriptionNote?: string;
-    discussions!: AddonModForumDiscussionsManager;
+    promisedDiscussions: CorePromisedValue<AddonModForumDiscussionsManager>;
     discussionsItems: AddonModForumDiscussionItem[] = [];
     fetchFailed = false;
     canAddDiscussion = false;
@@ -104,6 +105,12 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
         @Optional() courseContentsPage?: CoreCourseContentsPage,
     ) {
         super('AddonModForumIndexComponent', content, courseContentsPage);
+
+        this.promisedDiscussions = new CorePromisedValue();
+    }
+
+    get discussions(): AddonModForumDiscussionsManager | null {
+        return this.promisedDiscussions.value;
     }
 
     get forum(): AddonModForumData | undefined {
@@ -121,7 +128,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
      * @return Whether the discussion is online.
      */
     isOnlineDiscussion(discussion: AddonModForumDiscussionItem): boolean {
-        return this.discussions && this.discussions.getSource().isOnlineDiscussion(discussion);
+        return !!this.discussions?.getSource().isOnlineDiscussion(discussion);
     }
 
     /**
@@ -131,7 +138,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
      * @return Whether the discussion is offline.
      */
     isOfflineDiscussion(discussion: AddonModForumDiscussionItem): boolean {
-        return this.discussions && this.discussions.getSource().isOfflineDiscussion(discussion);
+        return !!this.discussions?.getSource().isOfflineDiscussion(discussion);
     }
 
     /**
@@ -170,7 +177,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
                 if (hasOffline) {
                     // Only update new fetched discussions.
                     const promises = discussions.map(async (discussion) => {
-                        if (!this.discussions.getSource().isOnlineDiscussion(discussion)) {
+                        if (!this.discussions?.getSource().isOnlineDiscussion(discussion)) {
                             return;
                         }
 
@@ -188,7 +195,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
             },
         });
 
-        this.discussions = new AddonModForumDiscussionsManager(source, this);
+        this.promisedDiscussions.resolve(new AddonModForumDiscussionsManager(source, this));
 
         // Refresh data if this forum discussion is synchronized from discussions list.
         this.syncManualObserver = CoreEvents.on(AddonModForumSyncProvider.MANUAL_SYNCED, (data) => {
@@ -213,8 +220,8 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
                 AddonModForum.invalidateDiscussionsList(this.forum.id).finally(() => {
                     if (data.discussionId) {
                         // Discussion changed, search it in the list of discussions.
-                        const discussion = this.discussions.items.find(
-                            (disc) => this.discussions.getSource().isOnlineDiscussion(disc) && data.discussionId == disc.discussion,
+                        const discussion = this.discussions?.items.find(
+                            disc => this.discussions?.getSource().isOnlineDiscussion(disc) && data.discussionId == disc.discussion,
                         ) as AddonModForumDiscussion;
 
                         if (discussion) {
@@ -233,7 +240,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
                     }
 
                     if (data.deleted !== undefined && data.deleted) {
-                        if (data.post?.parentid == 0 && CoreScreen.isTablet && !this.discussions.empty) {
+                        if (data.post?.parentid == 0 && CoreScreen.isTablet && this.discussions && !this.discussions.empty) {
                             // Discussion deleted, clear details page.
                             this.discussions.select(this.discussions[0]);
                         }
@@ -264,7 +271,9 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
     async ngAfterViewInit(): Promise<void> {
         await this.loadContent(false, true);
 
-        this.discussions.start(this.splitView);
+        const discussions = await this.promisedDiscussions;
+
+        discussions.start(this.splitView);
     }
 
     /**
@@ -281,7 +290,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
         this.ratingOfflineObserver && this.ratingOfflineObserver.off();
         this.ratingSyncObserver && this.ratingSyncObserver.off();
         this.sourceUnsubscribe && this.sourceUnsubscribe();
-        this.discussions.destroy();
+        this.discussions?.destroy();
     }
 
     /**
@@ -304,8 +313,10 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
                 return;
             }
 
+            const discussions = await this.promisedDiscussions;
+
             await Promise.all([
-                refresh ? this.discussions.reload() : this.discussions.load(),
+                refresh ? discussions.reload() : discussions.load(),
                 CoreRatingOffline.hasRatings('mod_forum', 'post', ContextLevel.MODULE, this.forum.cmid).then((hasRatings) => {
                     this.hasOfflineRatings = hasRatings;
 
@@ -331,7 +342,9 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
             return;
         }
 
-        await this.discussions.getSource().loadForum();
+        const discussions = await this.promisedDiscussions;
+
+        await discussions.getSource().loadForum();
 
         if (!this.forum) {
             return;
@@ -379,7 +392,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
             CoreGroups.instance
                 .getActivityGroupMode(forum.cmid)
                 .then(async mode => {
-                    this.discussions.getSource().usesGroups =
+                    discussions.getSource().usesGroups =
                         mode === CoreGroupsProvider.SEPARATEGROUPS || mode === CoreGroupsProvider.VISIBLEGROUPS;
 
                     return;
@@ -431,10 +444,12 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
      * @return Promise resolved when done.
      */
     async fetchMoreDiscussions(complete: () => void): Promise<void> {
+        const discussions = await this.promisedDiscussions;
+
         try {
             this.fetchFailed = false;
 
-            await this.discussions.load();
+            await discussions.load();
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'addon.mod_forum.errorgetforum', true);
 
@@ -462,10 +477,11 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
             return value ? parseInt(value, 10) : null;
         };
 
+        const discussions = await this.promisedDiscussions;
         const value = await getSortOrder();
         const selectedOrder = this.sortOrders.find(sortOrder => sortOrder.value === value) || this.sortOrders[0];
 
-        this.discussions.getSource().selectedSortOrder = selectedOrder;
+        discussions.getSource().selectedSortOrder = selectedOrder;
 
         if (this.sortOrderSelectorModalOptions.componentProps) {
             this.sortOrderSelectorModalOptions.componentProps.selected = selectedOrder.value;
@@ -542,19 +558,19 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
                 // If it's a new discussion in tablet mode, try to open it.
                 if (isNewDiscussion && CoreScreen.isTablet) {
                     const newDiscussionData = data as AddonModForumNewDiscussionData;
-                    const discussion = this.discussions.items.find(disc => {
-                        if (this.discussions.getSource().isOfflineDiscussion(disc)) {
+                    const discussion = this.discussions?.items.find(disc => {
+                        if (this.discussions?.getSource().isOfflineDiscussion(disc)) {
                             return disc.timecreated === newDiscussionData.discTimecreated;
                         }
 
-                        if (this.discussions.getSource().isOnlineDiscussion(disc)) {
+                        if (this.discussions?.getSource().isOnlineDiscussion(disc)) {
                             return CoreArray.contains(newDiscussionData.discussionIds ?? [], disc.discussion);
                         }
 
                         return false;
                     });
 
-                    if (discussion || !this.discussions.empty) {
+                    if (this.discussions && (discussion || !this.discussions.empty)) {
                         this.discussions.select(discussion ?? this.discussions.items[0]);
                     }
                 }
@@ -571,7 +587,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
      * @param timeCreated Creation time of the offline discussion.
      */
     openNewDiscussion(): void {
-        this.discussions.select(AddonModForumDiscussionsSource.NEW_DISCUSSION);
+        this.discussions?.select(AddonModForumDiscussionsSource.NEW_DISCUSSION);
     }
 
     /**
@@ -580,7 +596,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
      * @param sortOrder Sort order new data.
      */
     async setSortOrder(sortOrder: AddonModForumSortOrder): Promise<void> {
-        if (sortOrder.value != this.discussions.getSource().selectedSortOrder?.value) {
+        if (this.discussions && sortOrder.value != this.discussions.getSource().selectedSortOrder?.value) {
             this.discussions.getSource().selectedSortOrder = sortOrder;
             this.discussions.getSource().setDirty(true);
 

From ec9ca06654228e566e094ced69b81981cbc7c5bd Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 9 Dec 2021 15:19:37 +0100
Subject: [PATCH 0307/1008] MOBILE-3833 addons: Improve manager initialization

---
 .../pages/issued-badge/issued-badge.page.ts   | 23 ++++++------
 .../mod/feedback/pages/attempt/attempt.ts     | 36 ++++++++++---------
 2 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/src/addons/badges/pages/issued-badge/issued-badge.page.ts b/src/addons/badges/pages/issued-badge/issued-badge.page.ts
index 4a9285995..1fc7a21be 100644
--- a/src/addons/badges/pages/issued-badge/issued-badge.page.ts
+++ b/src/addons/badges/pages/issued-badge/issued-badge.page.ts
@@ -43,29 +43,30 @@ export class AddonBadgesIssuedBadgePage implements OnInit {
     user?: CoreUserProfile;
     course?: CoreEnrolledCourseData;
     badge?: AddonBadgesUserBadge;
-    badges?: CoreSwipeNavigationItemsManager;
+    badges: CoreSwipeNavigationItemsManager;
     badgeLoaded = false;
     currentTime = 0;
 
-    constructor(protected route: ActivatedRoute) { }
-
-    /**
-     * View loaded.
-     */
-    ngOnInit(): void {
+    constructor(protected route: ActivatedRoute) {
         this.courseId = CoreNavigator.getRouteNumberParam('courseId') || this.courseId; // Use 0 for site badges.
         this.userId = CoreNavigator.getRouteNumberParam('userId') || CoreSites.getRequiredCurrentSite().getUserId();
         this.badgeHash = CoreNavigator.getRouteParam('badgeHash') || '';
 
-        this.fetchIssuedBadge().finally(() => {
-            this.badgeLoaded = true;
-        });
-
         const source = CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(
             AddonBadgesUserBadgesSource,
             [this.courseId, this.userId],
         );
+
         this.badges = new CoreSwipeNavigationItemsManager(source);
+    }
+
+    /**
+     * View loaded.
+     */
+    ngOnInit(): void {
+        this.fetchIssuedBadge().finally(() => {
+            this.badgeLoaded = true;
+        });
 
         this.badges.start();
     }
diff --git a/src/addons/mod/feedback/pages/attempt/attempt.ts b/src/addons/mod/feedback/pages/attempt/attempt.ts
index f406be269..35733c4ed 100644
--- a/src/addons/mod/feedback/pages/attempt/attempt.ts
+++ b/src/addons/mod/feedback/pages/attempt/attempt.ts
@@ -38,34 +38,36 @@ import { AddonModFeedbackFormItem, AddonModFeedbackHelper } from '../../services
 })
 export class AddonModFeedbackAttemptPage implements OnInit, OnDestroy {
 
-    protected attemptId!: number;
-
-    cmId!: number;
-    courseId!: number;
+    cmId: number;
+    courseId: number;
     feedback?: AddonModFeedbackWSFeedback;
     attempt?: AddonModFeedbackWSAttempt;
-    attempts?: AddonModFeedbackAttemptsSwipeManager;
+    attempts: AddonModFeedbackAttemptsSwipeManager;
     anonAttempt?: AddonModFeedbackWSAnonAttempt;
     items: AddonModFeedbackAttemptItem[] = [];
     component = AddonModFeedbackProvider.COMPONENT;
     loaded = false;
 
+    protected attemptId: number;
+
+    constructor() {
+        this.cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
+        this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+        this.attemptId = CoreNavigator.getRequiredRouteNumberParam('attemptId');
+
+        const source = CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(
+            AddonModFeedbackAttemptsSource,
+            [this.courseId, this.cmId],
+        );
+
+        this.attempts = new AddonModFeedbackAttemptsSwipeManager(source);
+    }
+
     /**
      * @inheritdoc
      */
     ngOnInit(): void {
         try {
-            this.cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
-            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
-            this.attemptId = CoreNavigator.getRequiredRouteNumberParam('attemptId');
-
-            const source = CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(
-                AddonModFeedbackAttemptsSource,
-                [this.courseId, this.cmId],
-            );
-
-            this.attempts = new AddonModFeedbackAttemptsSwipeManager(source);
-
             this.attempts.start();
         } catch (error) {
             CoreDomUtils.showErrorModal(error);
@@ -82,7 +84,7 @@ export class AddonModFeedbackAttemptPage implements OnInit, OnDestroy {
      * @inheritdoc
      */
     ngOnDestroy(): void {
-        this.attempts?.destroy();
+        this.attempts.destroy();
     }
 
     /**

From b7464f4beef337f15c9f205795f99cf6f2982c8c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 21 Dec 2021 11:11:59 +0100
Subject: [PATCH 0308/1008] MOBILE-3944 user: Link interests with tags page

---
 .../tag/components/list/core-tag-list.html       |  2 +-
 src/core/features/tag/components/list/list.scss  |  3 +++
 src/core/features/user/pages/about/about.html    |  6 ++++--
 src/core/features/user/pages/about/about.page.ts | 16 ++++++++++++++++
 src/core/features/user/pages/about/about.scss    |  9 +++++++++
 .../features/user/services/handlers/tag-area.ts  |  1 +
 6 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/src/core/features/tag/components/list/core-tag-list.html b/src/core/features/tag/components/list/core-tag-list.html
index 7e6372e20..3ac3c33f2 100644
--- a/src/core/features/tag/components/list/core-tag-list.html
+++ b/src/core/features/tag/components/list/core-tag-list.html
@@ -1,3 +1,3 @@
 <ng-container *ngFor="let tag of tags">
-    <ion-badge (click)="openTag(tag)" class="core-tag-list-tag">{{ tag.rawname }}</ion-badge>
+    <ion-badge (click)="openTag(tag)" class="core-tag-list-tag" role="link">{{ tag.rawname }}</ion-badge>
 </ng-container>
diff --git a/src/core/features/tag/components/list/list.scss b/src/core/features/tag/components/list/list.scss
index e73e7e8fc..27ddaad8b 100644
--- a/src/core/features/tag/components/list/list.scss
+++ b/src/core/features/tag/components/list/list.scss
@@ -1,7 +1,10 @@
+@import "~theme/globals";
+
 :host {
     line-height: 1.6;
 
     ion-badge {
         cursor: pointer;
+        @include margin-horizontal(4px, 4px);
     }
 }
diff --git a/src/core/features/user/pages/about/about.html b/src/core/features/user/pages/about/about.html
index e4858a324..952764eb3 100644
--- a/src/core/features/user/pages/about/about.html
+++ b/src/core/features/user/pages/about/about.html
@@ -94,10 +94,12 @@
                             </a></p>
                     </ion-label>
                 </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="user.interests">
+                <ion-item class="ion-text-wrap" *ngIf="interests" class="core-user-profile-interests">
                     <ion-label>
                         <h2>{{ 'core.user.interests' | translate}}</h2>
-                        <p>{{ user.interests }}</p>
+                        <ion-badge *ngFor="let interest of interests" role="link" (click)="openInterest(interest)">
+                            {{ interest }}
+                        </ion-badge>
                     </ion-label>
                 </ion-item>
                 <core-user-profile-field *ngFor="let field of user.customfields" [field]="field" contextLevel="course"
diff --git a/src/core/features/user/pages/about/about.page.ts b/src/core/features/user/pages/about/about.page.ts
index 33bbdb8f9..9fb9ae255 100644
--- a/src/core/features/user/pages/about/about.page.ts
+++ b/src/core/features/user/pages/about/about.page.ts
@@ -49,6 +49,7 @@ export class CoreUserAboutPage implements OnInit, OnDestroy {
     formattedAddress?: string;
     encodedAddress?: SafeUrl;
     canChangeProfilePicture = false;
+    interests?: string[];
 
     protected userId!: number;
     protected site!: CoreSite;
@@ -107,6 +108,10 @@ export class CoreUserAboutPage implements OnInit, OnDestroy {
                 this.encodedAddress = CoreTextUtils.buildAddressURL(this.formattedAddress);
             }
 
+            this.interests = user.interests ?
+                user.interests.split(',').map(interest => interest.trim()) :
+                undefined;
+
             this.hasContact = !!(user.email || user.phone1 || user.phone2 || user.city || user.country || user.address);
             this.hasDetails = !!(user.url || user.interests || (user.customfields && user.customfields.length > 0));
 
@@ -250,6 +255,17 @@ export class CoreUserAboutPage implements OnInit, OnDestroy {
         return avatarUrl;
     }
 
+    /**
+     * Open a user interest.
+     *
+     * @param interest Interest name.
+     */
+    openInterest(interest: string): void {
+        CoreNavigator.navigateToSitePath('/tag/index', { params: {
+            tagName: interest,
+        } });
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/src/core/features/user/pages/about/about.scss b/src/core/features/user/pages/about/about.scss
index c5c1284cb..b3e2bb2ec 100644
--- a/src/core/features/user/pages/about/about.scss
+++ b/src/core/features/user/pages/about/about.scss
@@ -1,3 +1,5 @@
+@import "~theme/globals";
+
 :host {
 
     .core-user-profile-maininfo::part(native) {
@@ -36,6 +38,13 @@
         }
     }
 
+    .core-user-profile-interests {
+        ion-badge {
+            cursor: pointer;
+            @include margin-horizontal(3px, 3px);
+        }
+    }
+
 }
 
 :host-context([dir="rtl"]) ::ng-deep core-user-avatar .edit-avatar {
diff --git a/src/core/features/user/services/handlers/tag-area.ts b/src/core/features/user/services/handlers/tag-area.ts
index d4334817f..4aedb6814 100644
--- a/src/core/features/user/services/handlers/tag-area.ts
+++ b/src/core/features/user/services/handlers/tag-area.ts
@@ -68,6 +68,7 @@ export class CoreUserTagAreaHandlerService implements CoreTagAreaHandler {
                 avatarUrl,
                 heading: userbox.innerText,
                 details: [],
+                url: profileUrl,
                 user: {
                     id: Number(match[1]),
                     profileimageurl: avatarUrl || '',

From bb97b0e48a396add34e9c72414c4b03a171ef641 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 21 Dec 2021 15:00:19 +0100
Subject: [PATCH 0309/1008] MOBILE-3952 context-menu: Fix menu displayed when
 no items

---
 src/core/components/context-menu/context-menu.ts | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/core/components/context-menu/context-menu.ts b/src/core/components/context-menu/context-menu.ts
index 95b084efa..c2108a54a 100644
--- a/src/core/components/context-menu/context-menu.ts
+++ b/src/core/components/context-menu/context-menu.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, Input, OnInit, OnDestroy, ElementRef } from '@angular/core';
+import { Component, Input, OnInit, OnDestroy, ElementRef, ChangeDetectorRef } from '@angular/core';
 import { Subject } from 'rxjs';
 import { auditTime } from 'rxjs/operators';
 import { CoreDomUtils } from '@services/utils/dom';
@@ -43,16 +43,17 @@ export class CoreContextMenuComponent implements OnInit, OnDestroy {
     protected parentContextMenu?: CoreContextMenuComponent;
     protected expanded = false;
 
-    constructor(elementRef: ElementRef) {
+    constructor(elementRef: ElementRef, changeDetector: ChangeDetectorRef) {
         // Create the stream and subscribe to it. We ignore successive changes during 250ms.
         this.itemsChangedStream = new Subject<void>();
-        this.itemsChangedStream.pipe(auditTime(250));
-        this.itemsChangedStream.subscribe(() => {
+        this.itemsChangedStream.pipe(auditTime(250)).subscribe(() => {
             // Hide the menu if all items are hidden.
             this.hideMenu = !this.items.some((item) => !item.hidden);
 
             // Sort the items by priority.
             this.items.sort((a, b) => (a.priority || 0) <= (b.priority || 0) ? 1 : -1);
+
+            changeDetector.detectChanges();
         });
 
         // Calculate the unique ID.
@@ -118,7 +119,7 @@ export class CoreContextMenuComponent implements OnInit, OnDestroy {
 
         // Remove all items from the current menu.
         this.items = [];
-        this.itemsChanged();
+        this.itemsChangedStream.next();
     }
 
     /**

From 7c33680159964d4ed6125f8b8622f844d1915768 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 21 Dec 2021 16:22:31 +0100
Subject: [PATCH 0310/1008] MOBILE-3833 glossary: Fix item parameters mutation

---
 src/addons/mod/glossary/classes/glossary-entries-source.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/addons/mod/glossary/classes/glossary-entries-source.ts b/src/addons/mod/glossary/classes/glossary-entries-source.ts
index d1dd67b5c..1bf6fdef7 100644
--- a/src/addons/mod/glossary/classes/glossary-entries-source.ts
+++ b/src/addons/mod/glossary/classes/glossary-entries-source.ts
@@ -131,6 +131,7 @@ export class AddonModGlossaryEntriesSource extends CoreRoutedItemsManagerSource<
      */
     startSearch(): void {
         this.isSearch = true;
+        this.setDirty(true);
     }
 
     /**
@@ -148,6 +149,7 @@ export class AddonModGlossaryEntriesSource extends CoreRoutedItemsManagerSource<
         this.hasSearched = false;
         this.onlineEntries = cachedOnlineEntries;
         this.hasMoreItems = hasMoreOnlineEntries;
+        this.setDirty(true);
     }
 
     /**
@@ -177,6 +179,7 @@ export class AddonModGlossaryEntriesSource extends CoreRoutedItemsManagerSource<
             'ASC',
         );
         this.hasSearched = true;
+        this.setDirty(true);
     }
 
     /**
@@ -209,6 +212,7 @@ export class AddonModGlossaryEntriesSource extends CoreRoutedItemsManagerSource<
 
         this.fetchMode = mode;
         this.isSearch = false;
+        this.setDirty(true);
 
         switch (mode) {
             case 'author_all':

From 008453d5ab3d13bd2701b3a16756b025991b0647 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 21 Dec 2021 16:23:09 +0100
Subject: [PATCH 0311/1008] MOBILE-3833 core: Fix swipe race conditions

---
 .../forum-discussions-swipe-manager.ts        | 25 ++----------------
 .../classes/glossary-entries-swipe-manager.ts | 25 ++----------------
 .../swipe-navigation-items-manager.ts         | 26 ++++++++++++++++---
 3 files changed, 26 insertions(+), 50 deletions(-)

diff --git a/src/addons/mod/forum/classes/forum-discussions-swipe-manager.ts b/src/addons/mod/forum/classes/forum-discussions-swipe-manager.ts
index 2b1ca1e99..0586a718f 100644
--- a/src/addons/mod/forum/classes/forum-discussions-swipe-manager.ts
+++ b/src/addons/mod/forum/classes/forum-discussions-swipe-manager.ts
@@ -24,29 +24,8 @@ export class AddonModForumDiscussionsSwipeManager
     /**
      * @inheritdoc
      */
-    async navigateToNextItem(): Promise<void> {
-        let delta = -1;
-        const item = await this.getItemBy(-1);
-
-        if (item && this.getSource().isNewDiscussionForm(item)) {
-            delta--;
-        }
-
-        await this.navigateToItemBy(delta, 'back');
-    }
-
-    /**
-     * @inheritdoc
-     */
-    async navigateToPreviousItem(): Promise<void> {
-        let delta = 1;
-        const item = await this.getItemBy(1);
-
-        if (item && this.getSource().isNewDiscussionForm(item)) {
-            delta++;
-        }
-
-        await this.navigateToItemBy(delta, 'forward');
+    protected skipItemInSwipe(item: AddonModForumDiscussionItem): boolean {
+        return this.getSource().isNewDiscussionForm(item);
     }
 
 }
diff --git a/src/addons/mod/glossary/classes/glossary-entries-swipe-manager.ts b/src/addons/mod/glossary/classes/glossary-entries-swipe-manager.ts
index c6fc2bb57..b1136068b 100644
--- a/src/addons/mod/glossary/classes/glossary-entries-swipe-manager.ts
+++ b/src/addons/mod/glossary/classes/glossary-entries-swipe-manager.ts
@@ -24,29 +24,8 @@ export abstract class AddonModGlossaryEntriesSwipeManager
     /**
      * @inheritdoc
      */
-    async navigateToNextItem(): Promise<void> {
-        let delta = -1;
-        const item = await this.getItemBy(-1);
-
-        if (item && this.getSource().isNewEntryForm(item)) {
-            delta--;
-        }
-
-        await this.navigateToItemBy(delta, 'back');
-    }
-
-    /**
-     * @inheritdoc
-     */
-    async navigateToPreviousItem(): Promise<void> {
-        let delta = 1;
-        const item = await this.getItemBy(1);
-
-        if (item && this.getSource().isNewEntryForm(item)) {
-            delta++;
-        }
-
-        await this.navigateToItemBy(delta, 'forward');
+    protected skipItemInSwipe(item: AddonModGlossaryEntryItem): boolean {
+        return this.getSource().isNewEntryForm(item);
     }
 
 }
diff --git a/src/core/classes/items-management/swipe-navigation-items-manager.ts b/src/core/classes/items-management/swipe-navigation-items-manager.ts
index a156cedc9..57b1dd2c7 100644
--- a/src/core/classes/items-management/swipe-navigation-items-manager.ts
+++ b/src/core/classes/items-management/swipe-navigation-items-manager.ts
@@ -82,7 +82,13 @@ export class CoreSwipeNavigationItemsManager<
      * @param animationDirection Animation direction.
      */
     protected async navigateToItemBy(delta: number, animationDirection: 'forward' | 'back'): Promise<void> {
-        const item = await this.getItemBy(delta);
+        let item: Item | null;
+
+        do {
+            item = await this.getItemBy(delta);
+
+            delta += delta > 0 ? 1 : -1;
+        } while (item && this.skipItemInSwipe(item));
 
         if (!item) {
             return;
@@ -100,14 +106,15 @@ export class CoreSwipeNavigationItemsManager<
         const items = this.getSource().getItems();
 
         // Get selected item.
-        const index = (this.selectedItem && items?.indexOf(this.selectedItem)) ?? -1;
+        const selectedIndex = (this.selectedItem && items?.indexOf(this.selectedItem)) ?? -1;
+        const nextIndex = selectedIndex + delta;
 
-        if (index === -1) {
+        if (selectedIndex === -1 || nextIndex < 0) {
             return null;
         }
 
         // Get item by delta.
-        const item = items?.[index + delta] ?? null;
+        const item = items?.[nextIndex] ?? null;
 
         if (!item && !this.getSource().isCompleted()) {
             await this.getSource().load();
@@ -118,4 +125,15 @@ export class CoreSwipeNavigationItemsManager<
         return item;
     }
 
+    /**
+     * Check if an item should be skipped during swipe navigation.
+     *
+     * @param item Item.
+     * @returns Whether to skip this item during swipe navigation.
+     */
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    protected skipItemInSwipe(item: Item): boolean {
+        return false;
+    }
+
 }

From 03f573b63f3a76642983459ee32947bd363a0ed7 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 21 Dec 2021 16:23:57 +0100
Subject: [PATCH 0312/1008] MOBILE-3833 core: Fix resolving prefetch handlers

---
 .../course/components/module/module.ts        |  2 +-
 .../features/course/services/course-helper.ts |  4 +--
 .../services/module-prefetch-delegate.ts      | 36 +++++++++----------
 .../components/module-index/module-index.ts   |  2 +-
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/core/features/course/components/module/module.ts b/src/core/features/course/components/module/module.ts
index 944eed73a..82df87061 100644
--- a/src/core/features/course/components/module/module.ts
+++ b/src/core/features/course/components/module/module.ts
@@ -106,7 +106,7 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy {
 
         if (this.module.handlerData.showDownloadButton) {
             // Listen for changes on this module status, even if download isn't enabled.
-            this.prefetchHandler = CoreCourseModulePrefetchDelegate.getPrefetchHandlerFor(this.module.name);
+            this.prefetchHandler = CoreCourseModulePrefetchDelegate.getPrefetchHandlerFor(this.module.modname);
 
             this.statusObserver = CoreEvents.on(CoreEvents.PACKAGE_STATUS_CHANGED, (data) => {
                 if (!this.module || data.componentId != this.module.id || !this.prefetchHandler ||
diff --git a/src/core/features/course/services/course-helper.ts b/src/core/features/course/services/course-helper.ts
index 4162eb2b4..071faa626 100644
--- a/src/core/features/course/services/course-helper.ts
+++ b/src/core/features/course/services/course-helper.ts
@@ -1013,7 +1013,7 @@ export class CoreCourseHelperProvider {
     ): Promise<void> {
         siteId = siteId || CoreSites.getCurrentSiteId();
 
-        const prefetchHandler = CoreCourseModulePrefetchDelegate.getPrefetchHandlerFor(module.name);
+        const prefetchHandler = CoreCourseModulePrefetchDelegate.getPrefetchHandlerFor(module.modname);
 
         if (prefetchHandler) {
             // Use the prefetch handler to download the module.
@@ -2048,7 +2048,7 @@ export class CoreCourseHelperProvider {
 
         promises.push(CoreCourseModulePrefetchDelegate.removeModuleFiles(module, courseId));
 
-        const handler = CoreCourseModulePrefetchDelegate.getPrefetchHandlerFor(module.name);
+        const handler = CoreCourseModulePrefetchDelegate.getPrefetchHandlerFor(module.modname);
         const site = CoreSites.getCurrentSite();
         if (handler && site) {
             promises.push(site.deleteComponentFromCache(handler.component, module.id));
diff --git a/src/core/features/course/services/module-prefetch-delegate.ts b/src/core/features/course/services/module-prefetch-delegate.ts
index a2998f6d7..31984758f 100644
--- a/src/core/features/course/services/module-prefetch-delegate.ts
+++ b/src/core/features/course/services/module-prefetch-delegate.ts
@@ -95,7 +95,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
      * @return Promise resolved with boolean: whether the module can use check updates WS.
      */
     async canModuleUseCheckUpdates(module: CoreCourseAnyModuleData, courseId: number): Promise<boolean> {
-        const handler = this.getPrefetchHandlerFor(module.name);
+        const handler = this.getPrefetchHandlerFor(module.modname);
 
         if (!handler) {
             // Module not supported, cannot use check updates.
@@ -171,7 +171,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
      * @return Module status.
      */
     determineModuleStatus(module: CoreCourseAnyModuleData, status: string): string {
-        const handler = this.getPrefetchHandlerFor(module.name);
+        const handler = this.getPrefetchHandlerFor(module.modname);
         const siteId = CoreSites.getCurrentSiteId();
 
         if (!handler) {
@@ -203,7 +203,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
      */
     async downloadModule(module: CoreCourseAnyModuleData, courseId: number, dirPath?: string): Promise<void> {
         // Check if the module has a prefetch handler.
-        const handler = this.getPrefetchHandlerFor(module.name);
+        const handler = this.getPrefetchHandlerFor(module.modname);
 
         if (!handler) {
             return;
@@ -381,7 +381,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
      * @return Promise resolved with the size.
      */
     async getModuleDownloadSize(module: CoreCourseAnyModuleData, courseId: number, single?: boolean): Promise<CoreFileSizeSum> {
-        const handler = this.getPrefetchHandlerFor(module.name);
+        const handler = this.getPrefetchHandlerFor(module.modname);
 
         if (!handler) {
             return { size: 0, total: false };
@@ -419,7 +419,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
      * @return Promise resolved with the size.
      */
     async getModuleDownloadedSize(module: CoreCourseAnyModuleData, courseId: number): Promise<number> {
-        const handler = this.getPrefetchHandlerFor(module.name);
+        const handler = this.getPrefetchHandlerFor(module.modname);
         if (!handler) {
             return 0;
         }
@@ -492,7 +492,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
         }
 
         const site = CoreSites.getCurrentSite();
-        const handler = this.getPrefetchHandlerFor(module.name);
+        const handler = this.getPrefetchHandlerFor(module.modname);
         if (!handler || !site) {
             // If there is no handler then we can't find out the component name.
             // We can't work out the cached size, so just return downloaded size.
@@ -515,7 +515,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
         module: CoreCourseAnyModuleData,
         courseId: number,
     ): Promise<(CoreWSFile | CoreCourseModuleContentFile)[]> {
-        const handler = this.getPrefetchHandlerFor(module.name);
+        const handler = this.getPrefetchHandlerFor(module.modname);
 
         if (handler?.getFiles) {
             // The handler defines a function to get files, use it.
@@ -548,7 +548,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
         refresh?: boolean,
         sectionId?: number,
     ): Promise<string> {
-        const handler = this.getPrefetchHandlerFor(module.name);
+        const handler = this.getPrefetchHandlerFor(module.modname);
 
         if (!handler) {
             // No handler found, module not downloadable.
@@ -712,7 +712,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
         }
 
         await Promise.all(modules.map(async (module) => {
-            const handler = this.getPrefetchHandlerFor(module.name);
+            const handler = this.getPrefetchHandlerFor(module.modname);
             if (!handler || (onlyToDisplay && handler.skipListStatus)) {
                 return;
             }
@@ -758,7 +758,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
         module: CoreCourseAnyModuleData,
         courseId: number,
     ): Promise<{ status: string; downloadTime?: number }> {
-        const handler = this.getPrefetchHandlerFor(module.name);
+        const handler = this.getPrefetchHandlerFor(module.modname);
         const siteId = CoreSites.getCurrentSiteId();
 
         if (!handler) {
@@ -895,7 +895,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
     async invalidateModules(modules: CoreCourseModuleData[], courseId: number): Promise<void> {
 
         const promises = modules.map(async (module) => {
-            const handler = this.getPrefetchHandlerFor(module.name);
+            const handler = this.getPrefetchHandlerFor(module.modname);
             if (!handler) {
                 return;
             }
@@ -919,7 +919,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
      * @param module Module to be invalidated.
      */
     invalidateModuleStatusCache(module: CoreCourseAnyModuleData): void {
-        const handler = this.getPrefetchHandlerFor(module.name);
+        const handler = this.getPrefetchHandlerFor(module.modname);
         if (handler) {
             this.statusCache.invalidate(CoreFilepool.getPackageId(handler.component, module.id));
         }
@@ -964,7 +964,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
             return false;
         }
 
-        const handler = this.getPrefetchHandlerFor(module.name);
+        const handler = this.getPrefetchHandlerFor(module.modname);
         if (!handler) {
             return false;
         }
@@ -1000,7 +1000,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
      * @return Promise resolved with boolean: whether the module has updates.
      */
     async moduleHasUpdates(module: CoreCourseAnyModuleData, courseId: number, updates: CourseUpdates): Promise<boolean> {
-        const handler = this.getPrefetchHandlerFor(module.name);
+        const handler = this.getPrefetchHandlerFor(module.modname);
         const moduleUpdates = updates[module.id];
 
         if (handler?.hasUpdates) {
@@ -1033,7 +1033,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
      * @return Promise resolved when finished.
      */
     async prefetchModule(module: CoreCourseAnyModuleData, courseId: number, single?: boolean): Promise<void> {
-        const handler = this.getPrefetchHandlerFor(module.name);
+        const handler = this.getPrefetchHandlerFor(module.modname);
         if (!handler) {
             return;
         }
@@ -1067,7 +1067,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
      * @return Promise resolved when finished.
      */
     async syncModule<T = unknown>(module: CoreCourseAnyModuleData, courseId: number): Promise<T | undefined> {
-        const handler = this.getPrefetchHandlerFor(module.name);
+        const handler = this.getPrefetchHandlerFor(module.modname);
         if (!handler?.sync) {
             return;
         }
@@ -1124,7 +1124,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
 
         const promises = modules.map(async (module) => {
             // Check if the module has a prefetch handler.
-            const handler = this.getPrefetchHandlerFor(module.name);
+            const handler = this.getPrefetchHandlerFor(module.modname);
             if (!handler) {
                 return;
             }
@@ -1170,7 +1170,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
      * @return Promise resolved when done.
      */
     async removeModuleFiles(module: CoreCourseAnyModuleData, courseId: number): Promise<void> {
-        const handler = this.getPrefetchHandlerFor(module.name);
+        const handler = this.getPrefetchHandlerFor(module.modname);
         const siteId = CoreSites.getCurrentSiteId();
 
         if (handler?.removeFiles) {
diff --git a/src/core/features/siteplugins/components/module-index/module-index.ts b/src/core/features/siteplugins/components/module-index/module-index.ts
index a4cab3943..7b8d9311e 100644
--- a/src/core/features/siteplugins/components/module-index/module-index.ts
+++ b/src/core/features/siteplugins/components/module-index/module-index.ts
@@ -145,7 +145,7 @@ export class CoreSitePluginsModuleIndexComponent implements OnInit, OnDestroy, C
         this.refreshIcon = CoreConstants.ICON_REFRESH;
 
         // Check if there is a prefetch handler for this type of module.
-        if (CoreCourseModulePrefetchDelegate.getPrefetchHandlerFor(this.module.name)) {
+        if (CoreCourseModulePrefetchDelegate.getPrefetchHandlerFor(this.module.modname)) {
             CoreCourseHelper.fillContextMenu(this, this.module, this.courseId, refresh, this.component);
         }
     }

From 916b4a6036235a30a587fef17b14e1ec0b030763 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 22 Dec 2021 09:13:55 +0100
Subject: [PATCH 0313/1008] MOBILE-3833 myoverview: Fix empty courses

---
 .../block/myoverview/components/myoverview/myoverview.ts      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/addons/block/myoverview/components/myoverview/myoverview.ts b/src/addons/block/myoverview/components/myoverview/myoverview.ts
index 4d3a0bc78..9095dc2f1 100644
--- a/src/addons/block/myoverview/components/myoverview/myoverview.ts
+++ b/src/addons/block/myoverview/components/myoverview/myoverview.ts
@@ -303,6 +303,10 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
     protected loadFilters(
         config?: Record<string, { name: string; value: string; type: string }>,
     ): void {
+        if (!this.hasCourses) {
+            return;
+        }
+
         this.textFilter = '';
 
         const sampleCourse = this.allCourses[0];

From db67faaa5075893fc54504d72bddbc95b7843278 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 22 Dec 2021 09:25:47 +0100
Subject: [PATCH 0314/1008] MOBILE-3953 siteplugins: Fix override handler
 properties

---
 .../services/siteplugins-helper.ts            |  9 ++++++---
 src/core/singletons/object.ts                 | 19 +++++++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/core/features/siteplugins/services/siteplugins-helper.ts b/src/core/features/siteplugins/services/siteplugins-helper.ts
index 2d674dac2..1c715bb6d 100644
--- a/src/core/features/siteplugins/services/siteplugins-helper.ts
+++ b/src/core/features/siteplugins/services/siteplugins-helper.ts
@@ -84,6 +84,7 @@ import { CoreSitePluginsWorkshopAssessmentStrategyHandler } from '../classes/han
 import { CoreContentLinksModuleIndexHandler } from '@features/contentlinks/classes/module-index-handler';
 import { CoreContentLinksDelegate } from '@features/contentlinks/services/contentlinks-delegate';
 import { CoreContentLinksModuleListHandler } from '@features/contentlinks/classes/module-list-handler';
+import { CoreObject } from '@singletons/object';
 
 const HANDLER_DISABLED = 'core_site_plugins_helper_handler_disabled';
 
@@ -615,9 +616,11 @@ export class CoreSitePluginsHelperProvider {
             if (result.jsResult) {
                 // Override default handler functions with the result of the method JS.
                 const jsResult = <Record<string, unknown>> result.jsResult;
-                for (const property in handler) {
-                    if (property != 'constructor' && typeof handler[property] == 'function' &&
-                            typeof jsResult[property] == 'function') {
+                const handlerProperties = CoreObject.getAllPropertyNames(handler);
+
+                for (const property of handlerProperties) {
+                    if (property !== 'constructor' && typeof handler[property] === 'function' &&
+                            typeof jsResult[property] === 'function') {
                         // eslint-disable-next-line @typescript-eslint/ban-types
                         handler[property] = (<Function> jsResult[property]).bind(handler);
                     }
diff --git a/src/core/singletons/object.ts b/src/core/singletons/object.ts
index b0dd856c3..9bc8fe760 100644
--- a/src/core/singletons/object.ts
+++ b/src/core/singletons/object.ts
@@ -36,6 +36,25 @@ export class CoreObject {
         return JSON.stringify(a) === JSON.stringify(b);
     }
 
+    /**
+     * Get all the properties names of an object, including the inherited ones except the ones from Object.prototype.
+     *
+     * @param object Object to get its properties.
+     * @return Set of property names.
+     */
+    static getAllPropertyNames(object: unknown): Set<string> {
+        if (typeof object !== 'object' || object === null || object === Object.prototype) {
+            // Not an object or we already reached root level.
+            return new Set<string>([]);
+        }
+
+        const properties = CoreObject.getAllPropertyNames(Object.getPrototypeOf(object));
+
+        Object.getOwnPropertyNames(object).forEach(property => properties.add(property));
+
+        return properties;
+    }
+
     /**
      * Check whether the given object is empty.
      *

From 25927afc0d55757cff88aa5540aa54ee3e46bdee Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 22 Dec 2021 12:38:24 +0100
Subject: [PATCH 0315/1008] MOBILE-3895 mathjax: Add overflow to block
 equations

---
 src/theme/components/format-text.scss | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/theme/components/format-text.scss b/src/theme/components/format-text.scss
index 7ac616332..02ba8bf71 100644
--- a/src/theme/components/format-text.scss
+++ b/src/theme/components/format-text.scss
@@ -103,7 +103,7 @@ core-format-text {
                 color: var(--text-color);
                 margin: 0;
 
-                
+
                 .core-format-text-arrow {
                     width: var(--a11y-min-target-size);
                     height: var(--a11y-min-target-size);
@@ -211,6 +211,12 @@ core-format-text {
     .core-format-text-content .filter_mathjaxloader_equation .MathJax_Preview a {
         pointer-events: none;
     }
+
+    .MathJax_SVG_Display {
+        overflow-x: auto;
+        margin: 0;
+        padding: 10px 0;
+    }
 }
 
 @keyframes loading {

From 0037a663493f6178b15947a367e749b215ad3670 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 21 Dec 2021 15:12:17 +0100
Subject: [PATCH 0316/1008] MOBILE-3833 ux: Show lateral modal is opened from
 the edge using margin

---
 .../components/filteroptions/filteroptions.html           | 4 +++-
 src/theme/theme.base.scss                                 | 8 ++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/addons/block/myoverview/components/filteroptions/filteroptions.html b/src/addons/block/myoverview/components/filteroptions/filteroptions.html
index 414d1fbd4..448844d23 100644
--- a/src/addons/block/myoverview/components/filteroptions/filteroptions.html
+++ b/src/addons/block/myoverview/components/filteroptions/filteroptions.html
@@ -1,6 +1,8 @@
 <ion-header>
     <ion-toolbar>
-        <h1>{{ 'core.courses.filtermycourses' | translate }}</h1>
+        <ion-title>
+            <h1>{{ 'core.courses.filtermycourses' | translate }}</h1>
+        </ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
                 <ion-icon name="fas-times" slot="icon-only" aria-hidden=true></ion-icon>
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 0500be86e..ff09724da 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -535,6 +535,10 @@ body.core-iframe-fullscreen ion-router-outlet {
     z-index: 100000 !important;
 }
 
+.core-modal-lateral .modal-wrapper {
+    @include margin-horizontal(16px, null);
+}
+
 @media only screen and (min-height: 400px) and (min-width: #{$modal-lateral-width}) {
     .core-modal-lateral {
         --ion-safe-area-left: 0px;
@@ -556,6 +560,10 @@ body.core-iframe-fullscreen ion-router-outlet {
 }
 
 @each $breakpoint, $width in $screen-breakpoints {
+    .core-modal-lateral-#{$breakpoint} .modal-wrapper {
+        @include margin-horizontal(16px, null);
+    }
+
     @media only screen and (min-height: 400px) and (min-width: #{$width}) {
         .core-modal-lateral-#{$breakpoint} {
             --ion-safe-area-left: 0px;

From fbf7b38bea559129e20ce49a3cdded389d97f965 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 21 Dec 2021 15:28:22 +0100
Subject: [PATCH 0317/1008] MOBILE-3833 user: Quick fixes on user profile

---
 src/core/features/user/pages/about/about.html        | 2 +-
 src/core/features/user/pages/profile/profile.html    | 6 +++---
 src/core/features/user/pages/profile/profile.page.ts | 2 --
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/core/features/user/pages/about/about.html b/src/core/features/user/pages/about/about.html
index 952764eb3..c539e7b3c 100644
--- a/src/core/features/user/pages/about/about.html
+++ b/src/core/features/user/pages/about/about.html
@@ -14,7 +14,7 @@
     </ion-refresher>
     <core-loading [hideUntil]="userLoaded">
         <ion-list *ngIf="user">
-            <ion-item class="ion-text-center core-user-profile-maininfo" lines="full">
+            <ion-item class="ion-text-center core-user-profile-maininfo ion-text-wrap" lines="full">
                 <core-user-avatar [user]="user" [userId]="user.id" [linkProfile]="false" [checkOnline]="true">
                     <ion-button class="edit-avatar" *ngIf="canChangeProfilePicture" (click)="changeProfilePicture()"
                         [attr.aria-label]="'core.user.newpicture' | translate" fill="clear" color="dark">
diff --git a/src/core/features/user/pages/profile/profile.html b/src/core/features/user/pages/profile/profile.html
index cad242abd..ab29e5819 100644
--- a/src/core/features/user/pages/profile/profile.html
+++ b/src/core/features/user/pages/profile/profile.html
@@ -4,7 +4,7 @@
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
         <ion-title>
-            <h1 *ngIf="title">{{ title }}</h1>
+            <h1>{{ user?.fullname }}</h1>
         </ion-title>
     </ion-toolbar>
 </ion-header>
@@ -15,7 +15,7 @@
         </ion-refresher>
         <core-loading [hideUntil]="userLoaded">
             <ion-list *ngIf="user && !isDeleted && isEnrolled">
-                <ion-item class="ion-text-center core-user-profile-maininfo">
+                <ion-item class="ion-text-center core-user-profile-maininfo ion-text-wrap">
                     <core-user-avatar [user]="user" [userId]="user.id" [linkProfile]="false" [checkOnline]="true">
                     </core-user-avatar>
                     <ion-label>
@@ -23,7 +23,7 @@
                         <p *ngIf="user.address">
                             <ion-icon name="fas-map-marker-alt" [attr.aria-hidden]="true"></ion-icon> {{ user.address }}
                         </p>
-                        <p *ngIf="rolesFormatted" class="ion-text-wrap">
+                        <p *ngIf="rolesFormatted">
                             <strong>{{ 'core.user.roles' | translate}}</strong>{{'core.labelsep' | translate}}
                             {{ rolesFormatted }}
                         </p>
diff --git a/src/core/features/user/pages/profile/profile.page.ts b/src/core/features/user/pages/profile/profile.page.ts
index 69a8fcd26..88604bde6 100644
--- a/src/core/features/user/pages/profile/profile.page.ts
+++ b/src/core/features/user/pages/profile/profile.page.ts
@@ -47,7 +47,6 @@ export class CoreUserProfilePage implements OnInit, OnDestroy {
     userLoaded = false;
     isLoadingHandlers = false;
     user?: CoreUserProfile;
-    title?: string;
     isDeleted = false;
     isEnrolled = true;
     rolesFormatted?: string;
@@ -128,7 +127,6 @@ export class CoreUserProfilePage implements OnInit, OnDestroy {
             this.rolesFormatted = 'roles' in user ? CoreUserHelper.formatRoleList(user.roles) : '';
 
             this.user = user;
-            this.title = user.fullname;
 
             // If there's already a subscription, unsubscribe because we'll get a new one.
             this.subscription?.unsubscribe();

From 64a0167fdb55a8519819042861c86adf548f7964 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 21 Dec 2021 15:28:42 +0100
Subject: [PATCH 0318/1008] MOBILE-3833 swipe: Fixes on loading css on swipe
 navigation

---
 src/core/components/swipe-navigation/swipe-navigation.scss | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/core/components/swipe-navigation/swipe-navigation.scss b/src/core/components/swipe-navigation/swipe-navigation.scss
index d0dbcaffd..e1bd0f739 100644
--- a/src/core/components/swipe-navigation/swipe-navigation.scss
+++ b/src/core/components/swipe-navigation/swipe-navigation.scss
@@ -6,7 +6,11 @@ ion-slide {
     align-items: start;
 }
 
-::ng-deep {
+:host ::ng-deep {
+
+    .swiper-wrapper {
+        position: absolute;
+    }
 
     core-loading .core-loading-content {
         display: block !important;

From 43ce384da81bd56fa9a5e4fd313a50c73db66122 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 23 Dec 2021 10:30:34 +0100
Subject: [PATCH 0319/1008] MOBILE-3897 external-content: Update URL when state
 changes

---
 src/core/directives/external-content.ts       | 265 ++++++++++++------
 .../settings/services/settings-helper.ts      |   4 +-
 src/core/services/filepool.ts                 |   9 +
 3 files changed, 184 insertions(+), 94 deletions(-)

diff --git a/src/core/directives/external-content.ts b/src/core/directives/external-content.ts
index efe74f020..50bd68e34 100644
--- a/src/core/directives/external-content.ts
+++ b/src/core/directives/external-content.ts
@@ -12,8 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Directive, Input, AfterViewInit, ElementRef, OnChanges, SimpleChange, Output, EventEmitter } from '@angular/core';
-
+import {
+    Directive,
+    Input,
+    AfterViewInit,
+    ElementRef,
+    OnChanges,
+    SimpleChange,
+    Output,
+    EventEmitter,
+    OnDestroy,
+} from '@angular/core';
 import { CoreApp } from '@services/app';
 import { CoreFile } from '@services/file';
 import { CoreFilepool } from '@services/filepool';
@@ -24,6 +33,9 @@ import { CoreUtils } from '@services/utils/utils';
 import { Platform } from '@singletons';
 import { CoreLogger } from '@singletons/logger';
 import { CoreError } from '@classes/errors/error';
+import { CoreSite } from '@classes/site';
+import { CoreEventObserver, CoreEvents } from '@singletons/events';
+import { CoreConstants } from '../constants';
 
 /**
  * Directive to handle external content.
@@ -38,7 +50,7 @@ import { CoreError } from '@classes/errors/error';
 @Directive({
     selector: '[core-external-content]',
 })
-export class CoreExternalContentDirective implements AfterViewInit, OnChanges {
+export class CoreExternalContentDirective implements AfterViewInit, OnChanges, OnDestroy {
 
     @Input() siteId?: string; // Site ID to use.
     @Input() component?: string; // Component to link the file to.
@@ -54,6 +66,7 @@ export class CoreExternalContentDirective implements AfterViewInit, OnChanges {
     protected element: Element;
     protected logger: CoreLogger;
     protected initialized = false;
+    protected fileEventObserver?: CoreEventObserver;
 
     constructor(element: ElementRef) {
 
@@ -183,34 +196,8 @@ export class CoreExternalContentDirective implements AfterViewInit, OnChanges {
     protected async handleExternalContent(targetAttr: string, url: string, siteId?: string): Promise<void> {
 
         const tagName = this.element.tagName;
-
         if (tagName == 'VIDEO' && targetAttr != 'poster') {
-            const video = <HTMLVideoElement> this.element;
-            if (video.textTracks) {
-                // It's a video with subtitles. Fix some issues with subtitles.
-                video.textTracks.onaddtrack = (event): void => {
-                    const track = <TextTrack> event.track;
-                    if (track) {
-                        track.oncuechange = (): void => {
-                            if (!track.cues) {
-                                return;
-                            }
-
-                            const line = Platform.is('tablet') || CoreApp.isAndroid() ? 90 : 80;
-                            // Position all subtitles to a percentage of video height.
-                            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                            Array.from(track.cues).forEach((cue: any) => {
-                                cue.snapToLines = false;
-                                cue.line = line;
-                                cue.size = 100; // This solves some Android issue.
-                            });
-                            // Delete listener.
-                            track.oncuechange = null;
-                        };
-                    }
-                };
-            }
-
+            this.handleVideoSubtitles(<HTMLVideoElement> this.element);
         }
 
         const site = await CoreSites.getSite(siteId);
@@ -234,46 +221,7 @@ export class CoreExternalContentDirective implements AfterViewInit, OnChanges {
             throw new CoreError('Site doesn\'t allow downloading files.');
         }
 
-        // Download images, tracks and posters if size is unknown.
-        const downloadUnknown = tagName == 'IMG' || tagName == 'TRACK' || targetAttr == 'poster';
-        let finalUrl: string;
-
-        if (targetAttr === 'src' && tagName !== 'SOURCE' && tagName !== 'TRACK' && tagName !== 'VIDEO' && tagName !== 'AUDIO') {
-            finalUrl = await CoreFilepool.getSrcByUrl(
-                site.getId(),
-                url,
-                this.component,
-                this.componentId,
-                0,
-                true,
-                downloadUnknown,
-            );
-        } else if (tagName === 'TRACK') {
-            // Download tracks right away. Using an online URL for tracks can give a CORS error in Android.
-            finalUrl = await CoreFilepool.downloadUrl(site.getId(), url, false, this.component, this.componentId);
-
-            finalUrl = CoreFile.convertFileSrc(finalUrl);
-        } else {
-            finalUrl = await CoreFilepool.getUrlByUrl(
-                site.getId(),
-                url,
-                this.component,
-                this.componentId,
-                0,
-                true,
-                downloadUnknown,
-            );
-
-            finalUrl = CoreFile.convertFileSrc(finalUrl);
-        }
-
-        if (!CoreUrlUtils.isLocalFileUrl(finalUrl) && !finalUrl.includes('#')) {
-            /* In iOS, if we use the same URL in embedded file and background download then the download only
-               downloads a few bytes (cached ones). Add an anchor to the URL so both URLs are different.
-               Don't add this anchor if the URL already has an anchor, otherwise other anchors might not work.
-               The downloaded URL won't have anchors so the URLs will already be different. */
-            finalUrl = finalUrl + '#moodlemobile-embedded';
-        }
+        const finalUrl = await this.getUrlToUse(targetAttr, url, site);
 
         this.logger.debug('Using URL ' + finalUrl + ' for ' + url);
         if (tagName === 'SOURCE') {
@@ -295,28 +243,7 @@ export class CoreExternalContentDirective implements AfterViewInit, OnChanges {
             this.element.setAttribute('data-original-' + targetAttr, url);
         }
 
-        // Set events to download big files (not downloaded automatically).
-        if (!CoreUrlUtils.isLocalFileUrl(finalUrl) && targetAttr != 'poster' &&
-            (tagName == 'VIDEO' || tagName == 'AUDIO' || tagName == 'A' || tagName == 'SOURCE')) {
-            const eventName = tagName == 'A' ? 'click' : 'play';
-            let clickableEl = this.element;
-
-            if (tagName == 'SOURCE') {
-                clickableEl = <HTMLElement> CoreDomUtils.closest(this.element, 'video,audio');
-                if (!clickableEl) {
-                    return;
-                }
-            }
-
-            clickableEl.addEventListener(eventName, () => {
-                // User played media or opened a downloadable link.
-                // Download the file if in wifi and it hasn't been downloaded already (for big files).
-                if (CoreApp.isWifi()) {
-                    // We aren't using the result, so it doesn't matter which of the 2 functions we call.
-                    CoreFilepool.getUrlByUrl(site.getId(), url, this.component, this.componentId, 0, false);
-                }
-            });
-        }
+        this.setListeners(targetAttr, url, site);
     }
 
     /**
@@ -359,6 +286,153 @@ export class CoreExternalContentDirective implements AfterViewInit, OnChanges {
         }
     }
 
+    /**
+     * Handle video subtitles if any.
+     *
+     * @param video Video element.
+     */
+    protected handleVideoSubtitles(video: HTMLVideoElement): void {
+        if (!video.textTracks) {
+            return;
+        }
+
+        // It's a video with subtitles. Fix some issues with subtitles.
+        video.textTracks.onaddtrack = (event): void => {
+            const track = <TextTrack> event.track;
+            if (track) {
+                track.oncuechange = (): void => {
+                    if (!track.cues) {
+                        return;
+                    }
+
+                    const line = Platform.is('tablet') || CoreApp.isAndroid() ? 90 : 80;
+                    // Position all subtitles to a percentage of video height.
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    Array.from(track.cues).forEach((cue: any) => {
+                        cue.snapToLines = false;
+                        cue.line = line;
+                        cue.size = 100; // This solves some Android issue.
+                    });
+                    // Delete listener.
+                    track.oncuechange = null;
+                };
+            }
+        };
+    }
+
+    /**
+     * Get the URL to use in the element. E.g. if the file is already downloaded it will return the local URL.
+     *
+     * @param targetAttr Attribute to modify.
+     * @param url Original URL to treat.
+     * @param site Site.
+     * @return Promise resolved with the URL.
+     */
+    protected async getUrlToUse(targetAttr: string, url: string, site: CoreSite): Promise<string> {
+        const tagName = this.element.tagName;
+        let finalUrl: string;
+
+        // Download images, tracks and posters if size is unknown.
+        const downloadUnknown = tagName == 'IMG' || tagName == 'TRACK' || targetAttr == 'poster';
+
+        if (targetAttr === 'src' && tagName !== 'SOURCE' && tagName !== 'TRACK' && tagName !== 'VIDEO' && tagName !== 'AUDIO') {
+            finalUrl = await CoreFilepool.getSrcByUrl(
+                site.getId(),
+                url,
+                this.component,
+                this.componentId,
+                0,
+                true,
+                downloadUnknown,
+            );
+        } else if (tagName === 'TRACK') {
+            // Download tracks right away. Using an online URL for tracks can give a CORS error in Android.
+            finalUrl = await CoreFilepool.downloadUrl(site.getId(), url, false, this.component, this.componentId);
+
+            finalUrl = CoreFile.convertFileSrc(finalUrl);
+        } else {
+            finalUrl = await CoreFilepool.getUrlByUrl(
+                site.getId(),
+                url,
+                this.component,
+                this.componentId,
+                0,
+                true,
+                downloadUnknown,
+            );
+
+            finalUrl = CoreFile.convertFileSrc(finalUrl);
+        }
+
+        if (!CoreUrlUtils.isLocalFileUrl(finalUrl) && !finalUrl.includes('#')) {
+            /* In iOS, if we use the same URL in embedded file and background download then the download only
+               downloads a few bytes (cached ones). Add an anchor to the URL so both URLs are different.
+               Don't add this anchor if the URL already has an anchor, otherwise other anchors might not work.
+               The downloaded URL won't have anchors so the URLs will already be different. */
+            finalUrl = finalUrl + '#moodlemobile-embedded';
+        }
+
+        return finalUrl;
+    }
+
+    /**
+     * Set listeners if needed.
+     *
+     * @param targetAttr Attribute to modify.
+     * @param url Original URL to treat.
+     * @param site Site.
+     * @return Promise resolved when done.
+     */
+    protected async setListeners(targetAttr: string, url: string, site: CoreSite): Promise<void> {
+        if (this.fileEventObserver) {
+            // Already listening to events.
+            return;
+        }
+
+        const tagName = this.element.tagName;
+        let state = await CoreFilepool.getFileStateByUrl(site.getId(), url);
+
+        // Listen for download changes in the file.
+        const eventName = await CoreFilepool.getFileEventNameByUrl(site.getId(), url);
+
+        this.fileEventObserver = CoreEvents.on(eventName, async () => {
+            const newState = await CoreFilepool.getFileStateByUrl(site.getId(), url);
+            if (newState === state) {
+                return;
+            }
+
+            state = newState;
+            if (state === CoreConstants.DOWNLOADING) {
+                return;
+            }
+
+            // The file state has changed. Handle the file again, maybe it's downloaded now or the file has been deleted.
+            this.checkAndHandleExternalContent();
+        });
+
+        // Set events to download big files (not downloaded automatically).
+        if (targetAttr !== 'poster' && (tagName === 'VIDEO' || tagName === 'AUDIO' || tagName === 'A' || tagName === 'SOURCE')) {
+            const eventName = tagName == 'A' ? 'click' : 'play';
+            let clickableEl = this.element;
+
+            if (tagName == 'SOURCE') {
+                clickableEl = <HTMLElement> CoreDomUtils.closest(this.element, 'video,audio');
+                if (!clickableEl) {
+                    return;
+                }
+            }
+
+            clickableEl.addEventListener(eventName, () => {
+                // User played media or opened a downloadable link.
+                // Download the file if in wifi and it hasn't been downloaded already (for big files).
+                if (state !== CoreConstants.DOWNLOADED && state !== CoreConstants.DOWNLOADING && CoreApp.isWifi()) {
+                    // We aren't using the result, so it doesn't matter which of the 2 functions we call.
+                    CoreFilepool.getUrlByUrl(site.getId(), url, this.component, this.componentId, 0, false);
+                }
+            });
+        }
+    }
+
     /**
      * Wait for the image to be loaded or error, and emit an event when it happens.
      */
@@ -374,4 +448,11 @@ export class CoreExternalContentDirective implements AfterViewInit, OnChanges {
         this.element.addEventListener('error', listener);
     }
 
+    /**
+     * @inheritdoc
+     */
+    ngOnDestroy(): void {
+        this.fileEventObserver?.off();
+    }
+
 }
diff --git a/src/core/features/settings/services/settings-helper.ts b/src/core/features/settings/services/settings-helper.ts
index 3ca96984a..5ae1d8ed8 100644
--- a/src/core/features/settings/services/settings-helper.ts
+++ b/src/core/features/settings/services/settings-helper.ts
@@ -231,7 +231,7 @@ export class CoreSettingsHelperProvider {
      * @return Sync promise or null if site is not being syncrhonized.
      */
     getSiteSyncPromise(siteId: string): Promise<void> | void {
-        if (this.syncPromises[siteId]) {
+        if (this.syncPromises[siteId] !== undefined) {
             return this.syncPromises[siteId];
         }
     }
@@ -244,7 +244,7 @@ export class CoreSettingsHelperProvider {
      * @return Promise resolved when synchronized, rejected if failure.
      */
     async synchronizeSite(syncOnlyOnWifi: boolean, siteId: string): Promise<void> {
-        if (this.syncPromises[siteId]) {
+        if (this.syncPromises[siteId] !== undefined) {
             // There's already a sync ongoing for this site, return the promise.
             return this.syncPromises[siteId];
         }
diff --git a/src/core/services/filepool.ts b/src/core/services/filepool.ts
index d0c00aece..86278c88a 100644
--- a/src/core/services/filepool.ts
+++ b/src/core/services/filepool.ts
@@ -559,10 +559,19 @@ export class CoreFilepoolProvider {
     async clearFilepool(siteId: string): Promise<void> {
         const db = await CoreSites.getSiteDb(siteId);
 
+        // Read the data first to be able to notify the deletions.
+        const filesEntries = await db.getAllRecords<CoreFilepoolFileEntry>(FILES_TABLE_NAME);
+        const filesLinks = await db.getAllRecords<CoreFilepoolLinksRecord>(LINKS_TABLE_NAME);
+
         await Promise.all([
             db.deleteRecords(FILES_TABLE_NAME),
             db.deleteRecords(LINKS_TABLE_NAME),
         ]);
+
+        // Notify now.
+        const filesLinksMap = CoreUtils.arrayToObjectMultiple(filesLinks, 'fileId');
+
+        filesEntries.forEach(entry => this.notifyFileDeleted(siteId, entry.fileId, filesLinksMap[entry.fileId] || []));
     }
 
     /**

From e91e5d1cceb6dd3d6236c510148019037c432a87 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 23 Dec 2021 12:27:57 +0100
Subject: [PATCH 0320/1008] MOBILE-3897 link: Wait for download to finish
 before open file

---
 src/core/directives/external-content.ts       |  2 +-
 src/core/directives/link.ts                   | 21 +++++++++++++++++++
 .../services/module-prefetch-delegate.ts      |  7 ++-----
 src/core/services/filepool.ts                 | 12 ++++++++---
 upgrade.txt                                   |  1 +
 5 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/src/core/directives/external-content.ts b/src/core/directives/external-content.ts
index 50bd68e34..6bbf6d9f4 100644
--- a/src/core/directives/external-content.ts
+++ b/src/core/directives/external-content.ts
@@ -364,7 +364,7 @@ export class CoreExternalContentDirective implements AfterViewInit, OnChanges, O
             finalUrl = CoreFile.convertFileSrc(finalUrl);
         }
 
-        if (!CoreUrlUtils.isLocalFileUrl(finalUrl) && !finalUrl.includes('#')) {
+        if (!CoreUrlUtils.isLocalFileUrl(finalUrl) && !finalUrl.includes('#') && tagName !== 'A') {
             /* In iOS, if we use the same URL in embedded file and background download then the download only
                downloads a few bytes (cached ones). Add an anchor to the URL so both URLs are different.
                Don't add this anchor if the URL already has an anchor, otherwise other anchors might not work.
diff --git a/src/core/directives/link.ts b/src/core/directives/link.ts
index 809934e2b..81670c941 100644
--- a/src/core/directives/link.ts
+++ b/src/core/directives/link.ts
@@ -26,6 +26,7 @@ import { CoreConstants } from '@/core/constants';
 import { CoreContentLinksHelper } from '@features/contentlinks/services/contentlinks-helper';
 import { CoreCustomURLSchemes } from '@services/urlschemes';
 import { DomSanitizer } from '@singletons';
+import { CoreFilepool } from '@services/filepool';
 
 /**
  * Directive to open a link in external browser or in the app.
@@ -218,6 +219,26 @@ export class CoreLinkDirective implements OnInit {
             }
         }
 
+        if (currentSite.isSitePluginFileUrl(href)) {
+            // It's a site file. Check if it's being downloaded right now.
+            const isDownloading = await CoreFilepool.isFileDownloadingByUrl(currentSite.getId(), href);
+
+            if (isDownloading) {
+                // Wait for the download to finish before opening the file to prevent downloading it twice.
+                const modal = await CoreDomUtils.showModalLoading();
+
+                try {
+                    const path = await CoreFilepool.downloadUrl(currentSite.getId(), href);
+
+                    return this.openLocalFile(path);
+                } catch {
+                    // Error downloading, just open the original URL.
+                } finally {
+                    modal.dismiss();
+                }
+            }
+        }
+
         if (this.autoLogin == 'yes') {
             if (this.inApp) {
                 await currentSite.openInAppWithAutoLogin(href);
diff --git a/src/core/features/course/services/module-prefetch-delegate.ts b/src/core/features/course/services/module-prefetch-delegate.ts
index 31984758f..a787928db 100644
--- a/src/core/features/course/services/module-prefetch-delegate.ts
+++ b/src/core/features/course/services/module-prefetch-delegate.ts
@@ -457,13 +457,10 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
                         size += fileSize;
                     } catch {
                         // Error getting size. Check if the file is being downloaded.
-                        try {
-                            await CoreFilepool.isFileDownloadingByUrl(siteId, CoreFileHelper.getFileUrl(file));
-
+                        const isDownloading = await CoreFilepool.isFileDownloadingByUrl(siteId, CoreFileHelper.getFileUrl(file));
+                        if (isDownloading) {
                             // If downloading, count as downloaded.
                             size += file.filesize || 0;
-                        } catch {
-                            // Not downloading and not found in disk, don't add any size
                         }
                     }
                 }));
diff --git a/src/core/services/filepool.ts b/src/core/services/filepool.ts
index 86278c88a..3674b9fc7 100644
--- a/src/core/services/filepool.ts
+++ b/src/core/services/filepool.ts
@@ -2280,13 +2280,19 @@ export class CoreFilepoolProvider {
      *
      * @param siteId The site ID.
      * @param fileUrl File URL.
-     * @param Promise resolved if file is downloading, rejected otherwise.
+     * @param Promise resolved with boolean: whether the file is downloading.
      */
-    async isFileDownloadingByUrl(siteId: string, fileUrl: string): Promise<void> {
+    async isFileDownloadingByUrl(siteId: string, fileUrl: string): Promise<boolean> {
         const file = await this.fixPluginfileURL(siteId, fileUrl);
         const fileId = this.getFileIdByUrl(CoreFileHelper.getFileUrl(file));
 
-        await this.hasFileInQueue(siteId, fileId);
+        try {
+            await this.hasFileInQueue(siteId, fileId);
+
+            return true;
+        } catch {
+            return false;
+        }
     }
 
     /**
diff --git a/upgrade.txt b/upgrade.txt
index 75a4f115f..b373c0db4 100644
--- a/upgrade.txt
+++ b/upgrade.txt
@@ -8,6 +8,7 @@ information provided here is intended especially for developers.
   Now you have to pass all items and 3 optional params have been added.
 - CoreCourseModulePrefetchDelegate.getPrefetchHandlerFor now admits module name instead of full module object.
 - CoreCourse.getModuleBasicInfoByInstance and CoreCourse.getModuleBasicInfo have been modified to accept an "options" parameter instead of only siteId.
+- The function CoreFilepool.isFileDownloadingByUrl now returns Promise<boolean> instead of relying on resolve/reject.
 
 === 3.9.5 ===
 

From 9d645fe2545fa8fe87a67cfa28f0d9071ed82aaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 21 Dec 2021 16:46:31 +0100
Subject: [PATCH 0321/1008] MOBILE-3833 swipe: Change swipe navigation
 component to directive

---
 .../swipe-navigation-items-manager.ts         |  18 ++
 src/core/classes/page-transition.ts           |  26 ++-
 src/core/components/components.module.ts      |   3 -
 .../swipe-navigation/swipe-navigation.html    |   5 -
 .../swipe-navigation/swipe-navigation.scss    |  24 ---
 .../swipe-navigation/swipe-navigation.ts      |  54 ------
 src/core/directives/directives.module.ts      |   3 +
 src/core/directives/swipe-navigation.ts       | 158 ++++++++++++++++++
 8 files changed, 199 insertions(+), 92 deletions(-)
 delete mode 100644 src/core/components/swipe-navigation/swipe-navigation.html
 delete mode 100644 src/core/components/swipe-navigation/swipe-navigation.scss
 delete mode 100644 src/core/components/swipe-navigation/swipe-navigation.ts
 create mode 100644 src/core/directives/swipe-navigation.ts

diff --git a/src/core/classes/items-management/swipe-navigation-items-manager.ts b/src/core/classes/items-management/swipe-navigation-items-manager.ts
index 57b1dd2c7..2548b7b7d 100644
--- a/src/core/classes/items-management/swipe-navigation-items-manager.ts
+++ b/src/core/classes/items-management/swipe-navigation-items-manager.ts
@@ -49,6 +49,24 @@ export class CoreSwipeNavigationItemsManager<
         await this.navigateToItemBy(1, 'forward');
     }
 
+    /**
+     * Has a next item.
+     */
+    async hasNextItem(): Promise<boolean> {
+        const item = await this.getItemBy(-1);
+
+        return !!item;
+    }
+
+    /**
+     * Has a previous item.
+     */
+    async hasPreviousItem(): Promise<boolean> {
+        const item = await this.getItemBy(1);
+
+        return !!item;
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/src/core/classes/page-transition.ts b/src/core/classes/page-transition.ts
index 7443f6c55..4ae2d83c9 100644
--- a/src/core/classes/page-transition.ts
+++ b/src/core/classes/page-transition.ts
@@ -229,11 +229,19 @@ export const moodleTransitionAnimation = (navEl: HTMLElement, opts: TransitionOp
 
         rootAnimation.addAnimation(leavingContent);
 
+        // Check if leaving content is being translated using transform styles and decide to use fromTo or only To animation.
+        const hasTransformStyle = !!leavingContentEl && (leavingContentEl as HTMLElement).style.transform !== '';
         if (backDirection) {
             // leaving content, back direction
-            leavingContent
-                .beforeClearStyles([OPACITY])
-                .fromTo('transform', `translateX(${CENTER})`, (isRTL ? 'translateX(-100%)' : 'translateX(100%)'));
+            if (hasTransformStyle) {
+                leavingContent
+                    .to('transform', (isRTL ? 'translateX(-100%)' : 'translateX(100%)'))
+                    .fromTo(OPACITY, 1, OFF_OPACITY);
+            } else {
+                leavingContent
+                    .beforeClearStyles([OPACITY])
+                    .fromTo('transform', `translateX(${CENTER})`, (isRTL ? 'translateX(-100%)' : 'translateX(100%)'));
+            }
 
             const leavingPage = getIonPageElement(leavingEl) as HTMLElement;
             rootAnimation.afterAddWrite(() => {
@@ -244,9 +252,15 @@ export const moodleTransitionAnimation = (navEl: HTMLElement, opts: TransitionOp
 
         } else {
             // leaving content, forward direction
-            leavingContent
-                .fromTo('transform', `translateX(${CENTER})`, `translateX(${OFF_LEFT})`)
-                .fromTo(OPACITY, 1, OFF_OPACITY);
+            if (hasTransformStyle) {
+                leavingContent
+                    .to('transform', (isRTL ? 'translateX(100%)' : 'translateX(-100%)'))
+                    .fromTo(OPACITY, 1, OFF_OPACITY);
+            } else {
+                leavingContent
+                    .fromTo('transform', `translateX(${CENTER})`, `translateX(${OFF_LEFT})`)
+                    .fromTo(OPACITY, 1, OFF_OPACITY);
+            }
         }
 
         if (leavingContentEl) {
diff --git a/src/core/components/components.module.ts b/src/core/components/components.module.ts
index ae31faa41..0bfb96dc3 100644
--- a/src/core/components/components.module.ts
+++ b/src/core/components/components.module.ts
@@ -50,7 +50,6 @@ import { CoreShowPasswordComponent } from './show-password/show-password';
 import { CoreSitePickerComponent } from './site-picker/site-picker';
 import { CoreSplitViewComponent } from './split-view/split-view';
 import { CoreStyleComponent } from './style/style';
-import { CoreSwipeNavigationComponent } from './swipe-navigation/swipe-navigation';
 import { CoreTabComponent } from './tabs/tab';
 import { CoreTabsComponent } from './tabs/tabs';
 import { CoreTabsOutletComponent } from './tabs-outlet/tabs-outlet';
@@ -94,7 +93,6 @@ import { CoreSwipeSlidesComponent } from './swipe-slides/swipe-slides';
         CoreSitePickerComponent,
         CoreSplitViewComponent,
         CoreStyleComponent,
-        CoreSwipeNavigationComponent,
         CoreSwipeSlidesComponent,
         CoreTabComponent,
         CoreTabsComponent,
@@ -144,7 +142,6 @@ import { CoreSwipeSlidesComponent } from './swipe-slides/swipe-slides';
         CoreSitePickerComponent,
         CoreSplitViewComponent,
         CoreStyleComponent,
-        CoreSwipeNavigationComponent,
         CoreSwipeSlidesComponent,
         CoreTabComponent,
         CoreTabsComponent,
diff --git a/src/core/components/swipe-navigation/swipe-navigation.html b/src/core/components/swipe-navigation/swipe-navigation.html
deleted file mode 100644
index 1a47ecb89..000000000
--- a/src/core/components/swipe-navigation/swipe-navigation.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<ion-slides [options]="{ allowTouchMove: enabled }" (swipeleft)="swipeLeft()" (swiperight)="swipeRight()">
-    <ion-slide>
-        <ng-content></ng-content>
-    </ion-slide>
-</ion-slides>
diff --git a/src/core/components/swipe-navigation/swipe-navigation.scss b/src/core/components/swipe-navigation/swipe-navigation.scss
deleted file mode 100644
index e1bd0f739..000000000
--- a/src/core/components/swipe-navigation/swipe-navigation.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-ion-slides {
-    min-height: 100%;
-}
-
-ion-slide {
-    align-items: start;
-}
-
-:host ::ng-deep {
-
-    .swiper-wrapper {
-        position: absolute;
-    }
-
-    core-loading .core-loading-content {
-        display: block !important;
-        width: 100%;
-    }
-
-    ion-refresher.refresher-native {
-        z-index: 2;
-    }
-
-}
diff --git a/src/core/components/swipe-navigation/swipe-navigation.ts b/src/core/components/swipe-navigation/swipe-navigation.ts
deleted file mode 100644
index c26e0ab67..000000000
--- a/src/core/components/swipe-navigation/swipe-navigation.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-// (C) Copyright 2015 Moodle Pty Ltd.
-//
-// 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, Input } from '@angular/core';
-import { CoreSwipeNavigationItemsManager } from '@classes/items-management/swipe-navigation-items-manager';
-import { CoreScreen } from '@services/screen';
-
-@Component({
-    selector: 'core-swipe-navigation',
-    templateUrl: 'swipe-navigation.html',
-    styleUrls: ['swipe-navigation.scss'],
-})
-export class CoreSwipeNavigationComponent {
-
-    @Input() manager?: CoreSwipeNavigationItemsManager;
-
-    get enabled(): boolean {
-        return CoreScreen.isMobile && !!this.manager;
-    }
-
-    /**
-     * Swipe to previous item.
-     */
-    swipeLeft(): void {
-        if (!this.enabled) {
-            return;
-        }
-
-        this.manager?.navigateToPreviousItem();
-    }
-
-    /**
-     * Swipe to next item.
-     */
-    swipeRight(): void {
-        if (!this.enabled) {
-            return;
-        }
-
-        this.manager?.navigateToNextItem();
-    }
-
-}
diff --git a/src/core/directives/directives.module.ts b/src/core/directives/directives.module.ts
index e1d6dc959..018ddafad 100644
--- a/src/core/directives/directives.module.ts
+++ b/src/core/directives/directives.module.ts
@@ -28,6 +28,7 @@ import { CoreAriaButtonClickDirective } from './aria-button';
 import { CoreOnResizeDirective } from './on-resize';
 import { CoreDownloadFileDirective } from './download-file';
 import { CoreCollapsibleHeaderDirective } from './collapsible-header';
+import { CoreSwipeNavigationDirective } from './swipe-navigation';
 
 @NgModule({
     declarations: [
@@ -45,6 +46,7 @@ import { CoreCollapsibleHeaderDirective } from './collapsible-header';
         CoreOnResizeDirective,
         CoreDownloadFileDirective,
         CoreCollapsibleHeaderDirective,
+        CoreSwipeNavigationDirective,
     ],
     exports: [
         CoreAutoFocusDirective,
@@ -61,6 +63,7 @@ import { CoreCollapsibleHeaderDirective } from './collapsible-header';
         CoreOnResizeDirective,
         CoreDownloadFileDirective,
         CoreCollapsibleHeaderDirective,
+        CoreSwipeNavigationDirective,
     ],
 })
 export class CoreDirectivesModule {}
diff --git a/src/core/directives/swipe-navigation.ts b/src/core/directives/swipe-navigation.ts
new file mode 100644
index 000000000..31caacaef
--- /dev/null
+++ b/src/core/directives/swipe-navigation.ts
@@ -0,0 +1,158 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 {  AfterViewInit, Directive, ElementRef, Input, OnDestroy } from '@angular/core';
+import { CoreSwipeNavigationItemsManager } from '@classes/items-management/swipe-navigation-items-manager';
+import { Gesture } from '@ionic/angular';
+import { CoreScreen } from '@services/screen';
+import { GestureController } from '@singletons';
+
+const ACTIVATION_THRESHOLD = 150;
+const SWIPE_FRICTION = 0.6;
+
+/**
+ * Directive to enable content navigation with swipe.
+ *
+ * Example usage:
+ *
+ * <ion-content [core-swipe-navigation]="manager">
+ */
+@Directive({
+    selector: 'ion-content[core-swipe-navigation]',
+})
+export class CoreSwipeNavigationDirective implements AfterViewInit, OnDestroy {
+
+    // eslint-disable-next-line @angular-eslint/no-input-rename
+    @Input('core-swipe-navigation') manager?: CoreSwipeNavigationItemsManager;
+
+    protected element: HTMLElement;
+    protected swipeGesture?: Gesture;
+
+    constructor(el: ElementRef) {
+        this.element = el.nativeElement;
+    }
+
+    get enabled(): boolean {
+        return CoreScreen.isMobile && !!this.manager;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    ngAfterViewInit(): void {
+        const style = this.element.style;
+        this.swipeGesture = GestureController.create({
+            el: this.element,
+            gestureName: 'swipe',
+            threshold: 10,
+            gesturePriority: 10,
+            canStart: () => this.enabled,
+            onStart: () => {
+                style.transition = '';
+            },
+            onMove: (ev) => {
+                style.transform = `translateX(${ev.deltaX * SWIPE_FRICTION }px)`;
+            },
+            onEnd: (ev) => {
+                style.transition = '.5s ease-out';
+
+                if (ev.deltaX > ACTIVATION_THRESHOLD) {
+                    this.manager?.hasNextItem().then((hasNext) => {
+                        if (hasNext) {
+                            this.preventClickOnElement();
+
+                            style.transform = 'translateX(100%) !important';
+                            this.swipeRight();
+                        } else {
+                            style.transform = '';
+                        }
+
+                        return;
+                    });
+
+                    return;
+                }
+
+                if (ev.deltaX < -ACTIVATION_THRESHOLD) {
+                    this.manager?.hasPreviousItem().then((hasPrevious) => {
+                        if (hasPrevious) {
+
+                            this.preventClickOnElement();
+
+                            style.transform = 'translateX(-100%) !important';
+                            this.swipeLeft();
+                        } else {
+                            style.transform = '';
+                        }
+
+                        return;
+                    });
+
+                    return;
+                }
+
+                style.transform = '';
+
+            },
+        });
+        this.swipeGesture.enable();
+    }
+
+    /**
+     * Swipe to previous item.
+     */
+    swipeLeft(): void {
+        if (!this.enabled) {
+            return;
+        }
+
+        this.manager?.navigateToPreviousItem();
+    }
+
+    /**
+     * Swipe to next item.
+     */
+    swipeRight(): void {
+        if (!this.enabled) {
+            return;
+        }
+
+        this.manager?.navigateToNextItem();
+    }
+
+    /**
+     * Prevent click event by capturing the click before happening.
+     */
+    protected preventClickOnElement(): void {
+        this.element.addEventListener(
+            'click',
+            (ev: Event) => {
+                ev.preventDefault();
+                ev.stopPropagation();
+
+                return false;
+            },
+            true, // Register event on the capture phase.
+        );
+
+    }
+
+    /**
+     * @inheritdoc
+     */
+    ngOnDestroy(): void {
+        this.swipeGesture?.destroy();
+    }
+
+}

From dc0b1d95870527920465b156f1d5037d38d29a79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 10 Jan 2022 11:58:20 +0100
Subject: [PATCH 0322/1008] MOBILE-3833 swipe: Use swipe navigation directive

---
 .../pages/issued-badge/issued-badge.html      | 446 +++++++++---------
 .../submission-review/submission-review.html  |  19 +-
 .../mod/feedback/pages/attempt/attempt.html   |  80 ++--
 .../forum/pages/discussion/discussion.html    | 126 +++--
 .../pages/new-discussion/new-discussion.html  | 138 +++---
 src/addons/mod/glossary/pages/edit/edit.html  | 133 +++---
 .../mod/glossary/pages/entry/entry.html       | 136 +++---
 .../features/user/pages/profile/profile.html  | 149 +++---
 8 files changed, 604 insertions(+), 623 deletions(-)

diff --git a/src/addons/badges/pages/issued-badge/issued-badge.html b/src/addons/badges/pages/issued-badge/issued-badge.html
index 4e7ac334e..834845a06 100644
--- a/src/addons/badges/pages/issued-badge/issued-badge.html
+++ b/src/addons/badges/pages/issued-badge/issued-badge.html
@@ -9,242 +9,240 @@
         </ion-title>
     </ion-toolbar>
 </ion-header>
-<ion-content>
-    <core-swipe-navigation [manager]="badges">
-        <ion-refresher slot="fixed" [disabled]="!badgeLoaded" (ionRefresh)="refreshBadges($event.target)">
-            <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
-        </ion-refresher>
-        <core-loading [hideUntil]="badgeLoaded">
-            <ion-item-group *ngIf="badge">
-                <ion-item class="ion-text-wrap ion-text-center">
-                    <ion-label>
-                        <img *ngIf="badge.badgeurl" class="large-avatar" [src]="badge.badgeurl" core-external-content [alt]="badge.name" />
-                        <ion-badge color="danger" *ngIf="badge.dateexpire && currentTime >= badge.dateexpire">
-                            {{ 'addon.badges.expired' | translate }}
-                        </ion-badge>
-                    </ion-label>
-                </ion-item>
-            </ion-item-group>
+<ion-content [core-swipe-navigation]="badges">
+    <ion-refresher slot="fixed" [disabled]="!badgeLoaded" (ionRefresh)="refreshBadges($event.target)">
+        <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
+    </ion-refresher>
+    <core-loading [hideUntil]="badgeLoaded">
+        <ion-item-group *ngIf="badge">
+            <ion-item class="ion-text-wrap ion-text-center">
+                <ion-label>
+                    <img *ngIf="badge.badgeurl" class="large-avatar" [src]="badge.badgeurl" core-external-content [alt]="badge.name" />
+                    <ion-badge color="danger" *ngIf="badge.dateexpire && currentTime >= badge.dateexpire">
+                        {{ 'addon.badges.expired' | translate }}
+                    </ion-badge>
+                </ion-label>
+            </ion-item>
+        </ion-item-group>
 
-            <ion-item-group *ngIf="user">
+        <ion-item-group *ngIf="user">
+            <ion-item-divider>
+                <ion-label>
+                    <h2>{{ 'addon.badges.recipientdetails' | translate}}</h2>
+                </ion-label>
+            </ion-item-divider>
+            <ion-item class="ion-text-wrap">
+                <ion-label>
+                    <h2>{{ 'core.name' | translate}}</h2>
+                    <p>{{ user.fullname }}</p>
+                </ion-label>
+            </ion-item>
+        </ion-item-group>
+
+        <ng-container *ngIf="badge">
+            <ion-item-group>
                 <ion-item-divider>
                     <ion-label>
-                        <h2>{{ 'addon.badges.recipientdetails' | translate}}</h2>
+                        <h2>{{ 'addon.badges.issuerdetails' | translate}}</h2>
                     </ion-label>
                 </ion-item-divider>
-                <ion-item class="ion-text-wrap">
+                <ion-item class="ion-text-wrap" *ngIf="badge.issuername">
                     <ion-label>
-                        <h2>{{ 'core.name' | translate}}</h2>
-                        <p>{{ user.fullname }}</p>
+                        <h2>{{ 'addon.badges.issuername' | translate}}</h2>
+                        <p>{{ badge.issuername }}</p>
+                    </ion-label>
+                </ion-item>
+                <ion-item class="ion-text-wrap" *ngIf="badge.issuercontact">
+                    <ion-label>
+                        <h2>{{ 'addon.badges.contact' | translate}}</h2>
+                        <p><a href="mailto:{{badge.issuercontact}}" core-link auto-login="no" [showBrowserWarning]="false">
+                                {{ badge.issuercontact }}
+                            </a></p>
                     </ion-label>
                 </ion-item>
             </ion-item-group>
 
-            <ng-container *ngIf="badge">
-                <ion-item-group>
-                    <ion-item-divider>
-                        <ion-label>
-                            <h2>{{ 'addon.badges.issuerdetails' | translate}}</h2>
-                        </ion-label>
-                    </ion-item-divider>
-                    <ion-item class="ion-text-wrap" *ngIf="badge.issuername">
-                        <ion-label>
-                            <h2>{{ 'addon.badges.issuername' | translate}}</h2>
-                            <p>{{ badge.issuername }}</p>
-                        </ion-label>
-                    </ion-item>
-                    <ion-item class="ion-text-wrap" *ngIf="badge.issuercontact">
-                        <ion-label>
-                            <h2>{{ 'addon.badges.contact' | translate}}</h2>
-                            <p><a href="mailto:{{badge.issuercontact}}" core-link auto-login="no" [showBrowserWarning]="false">
-                                    {{ badge.issuercontact }}
-                                </a></p>
-                        </ion-label>
-                    </ion-item>
-                </ion-item-group>
+            <ion-item-group>
+                <ion-item-divider>
+                    <ion-label>
+                        <h2>{{ 'addon.badges.badgedetails' | translate}}</h2>
+                    </ion-label>
+                </ion-item-divider>
+                <ion-item class="ion-text-wrap" *ngIf="badge.name">
+                    <ion-label>
+                        <h2>{{ 'core.name' | translate}}</h2>
+                        <p>{{ badge.name }}</p>
+                    </ion-label>
+                </ion-item>
+                <ion-item class="ion-text-wrap" *ngIf="badge.version">
+                    <ion-label>
+                        <h2>{{ 'addon.badges.version' | translate}}</h2>
+                        <p>{{ badge.version }}</p>
+                    </ion-label>
+                </ion-item>
+                <ion-item class="ion-text-wrap" *ngIf="badge.language">
+                    <ion-label>
+                        <h2>{{ 'addon.badges.language' | translate}}</h2>
+                        <p>{{ badge.language }}</p>
+                    </ion-label>
+                </ion-item>
+                <ion-item class="ion-text-wrap" *ngIf="badge.description">
+                    <ion-label>
+                        <h2>{{ 'core.description' | translate}}</h2>
+                        <p>{{ badge.description }}</p>
+                    </ion-label>
+                </ion-item>
+                <ion-item class="ion-text-wrap" *ngIf="badge.imageauthorname">
+                    <ion-label>
+                        <h2>{{ 'addon.badges.imageauthorname' | translate}}</h2>
+                        <p>{{ badge.imageauthorname }}</p>
+                    </ion-label>
+                </ion-item>
+                <ion-item class="ion-text-wrap" *ngIf="badge.imageauthoremail">
+                    <ion-label>
+                        <h2>{{ 'addon.badges.imageauthoremail' | translate}}</h2>
+                        <p><a href="mailto:{{badge.imageauthoremail}}" core-link auto-login="no" [showBrowserWarning]="false">
+                                {{ badge.imageauthoremail }}
+                            </a></p>
+                    </ion-label>
+                </ion-item>
+                <ion-item class="ion-text-wrap" *ngIf="badge.imageauthorurl">
+                    <ion-label>
+                        <h2>{{ 'addon.badges.imageauthorurl' | translate}}</h2>
+                        <p><a [href]="badge.imageauthorurl" core-link auto-login="no"> {{ badge.imageauthorurl }} </a></p>
+                    </ion-label>
+                </ion-item>
+                <ion-item class="ion-text-wrap" *ngIf="badge.imagecaption">
+                    <ion-label>
+                        <h2>{{ 'addon.badges.imagecaption' | translate}}</h2>
+                        <p>{{ badge.imagecaption }}</p>
+                    </ion-label>
+                </ion-item>
+                <ion-item class="ion-text-wrap" *ngIf="course">
+                    <ion-label>
+                        <h2>{{ 'core.course' | translate}}</h2>
+                        <p>
+                            <core-format-text [text]="course.fullname" contextLevel="course" [contextInstanceId]="courseId">
+                            </core-format-text>
+                        </p>
+                    </ion-label>
+                </ion-item>
+                <!-- Criteria (not yet available) -->
+            </ion-item-group>
 
-                <ion-item-group>
-                    <ion-item-divider>
-                        <ion-label>
-                            <h2>{{ 'addon.badges.badgedetails' | translate}}</h2>
-                        </ion-label>
-                    </ion-item-divider>
-                    <ion-item class="ion-text-wrap" *ngIf="badge.name">
-                        <ion-label>
-                            <h2>{{ 'core.name' | translate}}</h2>
-                            <p>{{ badge.name }}</p>
-                        </ion-label>
-                    </ion-item>
-                    <ion-item class="ion-text-wrap" *ngIf="badge.version">
-                        <ion-label>
-                            <h2>{{ 'addon.badges.version' | translate}}</h2>
-                            <p>{{ badge.version }}</p>
-                        </ion-label>
-                    </ion-item>
-                    <ion-item class="ion-text-wrap" *ngIf="badge.language">
-                        <ion-label>
-                            <h2>{{ 'addon.badges.language' | translate}}</h2>
-                            <p>{{ badge.language }}</p>
-                        </ion-label>
-                    </ion-item>
-                    <ion-item class="ion-text-wrap" *ngIf="badge.description">
-                        <ion-label>
-                            <h2>{{ 'core.description' | translate}}</h2>
-                            <p>{{ badge.description }}</p>
-                        </ion-label>
-                    </ion-item>
-                    <ion-item class="ion-text-wrap" *ngIf="badge.imageauthorname">
-                        <ion-label>
-                            <h2>{{ 'addon.badges.imageauthorname' | translate}}</h2>
-                            <p>{{ badge.imageauthorname }}</p>
-                        </ion-label>
-                    </ion-item>
-                    <ion-item class="ion-text-wrap" *ngIf="badge.imageauthoremail">
-                        <ion-label>
-                            <h2>{{ 'addon.badges.imageauthoremail' | translate}}</h2>
-                            <p><a href="mailto:{{badge.imageauthoremail}}" core-link auto-login="no" [showBrowserWarning]="false">
-                                    {{ badge.imageauthoremail }}
-                                </a></p>
-                        </ion-label>
-                    </ion-item>
-                    <ion-item class="ion-text-wrap" *ngIf="badge.imageauthorurl">
-                        <ion-label>
-                            <h2>{{ 'addon.badges.imageauthorurl' | translate}}</h2>
-                            <p><a [href]="badge.imageauthorurl" core-link auto-login="no"> {{ badge.imageauthorurl }} </a></p>
-                        </ion-label>
-                    </ion-item>
-                    <ion-item class="ion-text-wrap" *ngIf="badge.imagecaption">
-                        <ion-label>
-                            <h2>{{ 'addon.badges.imagecaption' | translate}}</h2>
-                            <p>{{ badge.imagecaption }}</p>
-                        </ion-label>
-                    </ion-item>
-                    <ion-item class="ion-text-wrap" *ngIf="course">
-                        <ion-label>
-                            <h2>{{ 'core.course' | translate}}</h2>
-                            <p>
-                                <core-format-text [text]="course.fullname" contextLevel="course" [contextInstanceId]="courseId">
-                                </core-format-text>
-                            </p>
-                        </ion-label>
-                    </ion-item>
-                    <!-- Criteria (not yet available) -->
-                </ion-item-group>
+            <ion-item-group>
+                <ion-item-divider>
+                    <ion-label>
+                        <h2>{{ 'addon.badges.issuancedetails' | translate}}</h2>
+                    </ion-label>
+                </ion-item-divider>
+                <ion-item class="ion-text-wrap" *ngIf="badge.dateissued">
+                    <ion-label>
+                        <h2>{{ 'addon.badges.dateawarded' | translate}}</h2>
+                        <p>{{badge.dateissued * 1000 | coreFormatDate }}</p>
+                    </ion-label>
+                </ion-item>
+                <ion-item class="ion-text-wrap" *ngIf="badge.dateexpire">
+                    <ion-label>
+                        <h2>{{ 'addon.badges.expirydate' | translate}}</h2>
+                        <p>
+                            {{ badge.dateexpire * 1000 | coreFormatDate }}
+                            <span class="text-danger" *ngIf="currentTime >= badge.dateexpire">
+                                {{ 'addon.badges.warnexpired' | translate }}
+                            </span>
+                        </p>
+                    </ion-label>
+                </ion-item>
+                <!-- Evidence (not yet available) -->
+            </ion-item-group>
 
-                <ion-item-group>
-                    <ion-item-divider>
-                        <ion-label>
-                            <h2>{{ 'addon.badges.issuancedetails' | translate}}</h2>
-                        </ion-label>
-                    </ion-item-divider>
-                    <ion-item class="ion-text-wrap" *ngIf="badge.dateissued">
-                        <ion-label>
-                            <h2>{{ 'addon.badges.dateawarded' | translate}}</h2>
-                            <p>{{badge.dateissued * 1000 | coreFormatDate }}</p>
-                        </ion-label>
-                    </ion-item>
-                    <ion-item class="ion-text-wrap" *ngIf="badge.dateexpire">
-                        <ion-label>
-                            <h2>{{ 'addon.badges.expirydate' | translate}}</h2>
-                            <p>
-                                {{ badge.dateexpire * 1000 | coreFormatDate }}
-                                <span class="text-danger" *ngIf="currentTime >= badge.dateexpire">
-                                    {{ 'addon.badges.warnexpired' | translate }}
-                                </span>
-                            </p>
-                        </ion-label>
-                    </ion-item>
-                    <!-- Evidence (not yet available) -->
-                </ion-item-group>
+            <!-- Endorsement -->
+            <ion-item-group *ngIf="badge.endorsement">
+                <ion-item-divider>
+                    <ion-label>
+                        <h2>{{ 'addon.badges.bendorsement' | translate}}</h2>
+                    </ion-label>
+                </ion-item-divider>
+                <ion-item class="ion-text-wrap" *ngIf="badge.endorsement.issuername">
+                    <ion-label>
+                        <h2>{{ 'addon.badges.issuername' | translate}}</h2>
+                        <p>{{ badge.endorsement.issuername }}</p>
+                    </ion-label>
+                </ion-item>
+                <ion-item class="ion-text-wrap" *ngIf="badge.endorsement.issueremail">
+                    <ion-label>
+                        <h2>{{ 'addon.badges.issueremail' | translate}}</h2>
+                        <p>
+                            <a href="mailto:{{badge.endorsement.issueremail}}" core-link auto-login="no" [showBrowserWarning]="false">
+                                {{ badge.endorsement.issueremail }}
+                            </a>
+                        </p>
+                    </ion-label>
+                </ion-item>
+                <ion-item class="ion-text-wrap" *ngIf="badge.endorsement.issuerurl">
+                    <ion-label>
+                        <h2>{{ 'addon.badges.issuerurl' | translate}}</h2>
+                        <p><a [href]="badge.endorsement.issuerurl" core-link auto-login="no"> {{ badge.endorsement.issuerurl }} </a></p>
+                    </ion-label>
+                </ion-item>
+                <ion-item class="ion-text-wrap" *ngIf="badge.endorsement.dateissued">
+                    <ion-label>
+                        <h2>{{ 'addon.badges.dateawarded' | translate}}</h2>
+                        <p>{{ badge.endorsement.dateissued * 1000 | coreFormatDate }}</p>
+                    </ion-label>
+                </ion-item>
+                <ion-item class="ion-text-wrap" *ngIf="badge.endorsement.claimid">
+                    <ion-label>
+                        <h2>{{ 'addon.badges.claimid' | translate}}</h2>
+                        <p><a [href]="badge.endorsement.claimid" core-link auto-login="no"> {{ badge.endorsement.claimid }} </a></p>
+                    </ion-label>
+                </ion-item>
+                <ion-item class="ion-text-wrap" *ngIf="badge.endorsement.claimcomment">
+                    <ion-label>
+                        <h2>{{ 'addon.badges.claimcomment' | translate}}</h2>
+                        <p>{{ badge.endorsement.claimcomment }}</p>
+                    </ion-label>
+                </ion-item>
+            </ion-item-group>
 
-                <!-- Endorsement -->
-                <ion-item-group *ngIf="badge.endorsement">
-                    <ion-item-divider>
-                        <ion-label>
-                            <h2>{{ 'addon.badges.bendorsement' | translate}}</h2>
-                        </ion-label>
-                    </ion-item-divider>
-                    <ion-item class="ion-text-wrap" *ngIf="badge.endorsement.issuername">
-                        <ion-label>
-                            <h2>{{ 'addon.badges.issuername' | translate}}</h2>
-                            <p>{{ badge.endorsement.issuername }}</p>
-                        </ion-label>
-                    </ion-item>
-                    <ion-item class="ion-text-wrap" *ngIf="badge.endorsement.issueremail">
-                        <ion-label>
-                            <h2>{{ 'addon.badges.issueremail' | translate}}</h2>
-                            <p>
-                                <a href="mailto:{{badge.endorsement.issueremail}}" core-link auto-login="no" [showBrowserWarning]="false">
-                                    {{ badge.endorsement.issueremail }}
-                                </a>
-                            </p>
-                        </ion-label>
-                    </ion-item>
-                    <ion-item class="ion-text-wrap" *ngIf="badge.endorsement.issuerurl">
-                        <ion-label>
-                            <h2>{{ 'addon.badges.issuerurl' | translate}}</h2>
-                            <p><a [href]="badge.endorsement.issuerurl" core-link auto-login="no"> {{ badge.endorsement.issuerurl }} </a></p>
-                        </ion-label>
-                    </ion-item>
-                    <ion-item class="ion-text-wrap" *ngIf="badge.endorsement.dateissued">
-                        <ion-label>
-                            <h2>{{ 'addon.badges.dateawarded' | translate}}</h2>
-                            <p>{{ badge.endorsement.dateissued * 1000 | coreFormatDate }}</p>
-                        </ion-label>
-                    </ion-item>
-                    <ion-item class="ion-text-wrap" *ngIf="badge.endorsement.claimid">
-                        <ion-label>
-                            <h2>{{ 'addon.badges.claimid' | translate}}</h2>
-                            <p><a [href]="badge.endorsement.claimid" core-link auto-login="no"> {{ badge.endorsement.claimid }} </a></p>
-                        </ion-label>
-                    </ion-item>
-                    <ion-item class="ion-text-wrap" *ngIf="badge.endorsement.claimcomment">
-                        <ion-label>
-                            <h2>{{ 'addon.badges.claimcomment' | translate}}</h2>
-                            <p>{{ badge.endorsement.claimcomment }}</p>
-                        </ion-label>
-                    </ion-item>
-                </ion-item-group>
+            <!-- Related badges -->
+            <ion-item-group *ngIf="badge.relatedbadges">
+                <ion-item-divider>
+                    <ion-label>
+                        <h2>{{ 'addon.badges.relatedbages' | translate}}</h2>
+                    </ion-label>
+                </ion-item-divider>
+                <ion-item class="ion-text-wrap" *ngFor="let relatedBadge of badge.relatedbadges">
+                    <ion-label>
+                        <h2>{{ relatedBadge.name }}</h2>
+                    </ion-label>
+                </ion-item>
+                <ion-item class="ion-text-wrap" *ngIf="badge.relatedbadges.length == 0">
+                    <ion-label>
+                        <h2>{{ 'addon.badges.norelated' | translate}}</h2>
+                    </ion-label>
+                </ion-item>
+            </ion-item-group>
 
-                <!-- Related badges -->
-                <ion-item-group *ngIf="badge.relatedbadges">
-                    <ion-item-divider>
-                        <ion-label>
-                            <h2>{{ 'addon.badges.relatedbages' | translate}}</h2>
-                        </ion-label>
-                    </ion-item-divider>
-                    <ion-item class="ion-text-wrap" *ngFor="let relatedBadge of badge.relatedbadges">
-                        <ion-label>
-                            <h2>{{ relatedBadge.name }}</h2>
-                        </ion-label>
-                    </ion-item>
-                    <ion-item class="ion-text-wrap" *ngIf="badge.relatedbadges.length == 0">
-                        <ion-label>
-                            <h2>{{ 'addon.badges.norelated' | translate}}</h2>
-                        </ion-label>
-                    </ion-item>
-                </ion-item-group>
-
-                <!-- Competencies alignment -->
-                <ion-item-group *ngIf="badge.alignment">
-                    <ion-item-divider>
-                        <ion-label>
-                            <h2>{{ 'addon.badges.alignment' | translate}}</h2>
-                        </ion-label>
-                    </ion-item-divider>
-                    <ion-item class="ion-text-wrap" *ngFor="let alignment of badge.alignment" [href]="alignment.targeturl" core-link
-                        auto-login="no">
-                        <ion-label>
-                            <h2>{{ alignment.targetname }}</h2>
-                        </ion-label>
-                    </ion-item>
-                    <ion-item class="ion-text-wrap" *ngIf="badge.alignment.length == 0">
-                        <ion-label>
-                            <h2>{{ 'addon.badges.noalignment' | translate}}</h2>
-                        </ion-label>
-                    </ion-item>
-                </ion-item-group>
-            </ng-container>
-        </core-loading>
-    </core-swipe-navigation>
+            <!-- Competencies alignment -->
+            <ion-item-group *ngIf="badge.alignment">
+                <ion-item-divider>
+                    <ion-label>
+                        <h2>{{ 'addon.badges.alignment' | translate}}</h2>
+                    </ion-label>
+                </ion-item-divider>
+                <ion-item class="ion-text-wrap" *ngFor="let alignment of badge.alignment" [href]="alignment.targeturl" core-link
+                    auto-login="no">
+                    <ion-label>
+                        <h2>{{ alignment.targetname }}</h2>
+                    </ion-label>
+                </ion-item>
+                <ion-item class="ion-text-wrap" *ngIf="badge.alignment.length == 0">
+                    <ion-label>
+                        <h2>{{ 'addon.badges.noalignment' | translate}}</h2>
+                    </ion-label>
+                </ion-item>
+            </ion-item-group>
+        </ng-container>
+    </core-loading>
 </ion-content>
diff --git a/src/addons/mod/assign/pages/submission-review/submission-review.html b/src/addons/mod/assign/pages/submission-review/submission-review.html
index 3655e0816..370086cb0 100644
--- a/src/addons/mod/assign/pages/submission-review/submission-review.html
+++ b/src/addons/mod/assign/pages/submission-review/submission-review.html
@@ -19,15 +19,12 @@
         </ion-button>
     </core-navbar-buttons>
 </ion-header>
-<ion-content>
-    <core-swipe-navigation [manager]="submissions">
-        <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="refreshSubmission($event.target)">
-            <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
-        </ion-refresher>
-        <core-loading [hideUntil]="loaded">
-            <addon-mod-assign-submission *ngIf="loaded"
-                [courseId]="courseId" [moduleId]="moduleId" [submitId]="submitId" [blindId]="blindId">
-            </addon-mod-assign-submission>
-        </core-loading>
-    </core-swipe-navigation>
+<ion-content [core-swipe-navigation]="submissions">
+    <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="refreshSubmission($event.target)">
+        <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
+    </ion-refresher>
+    <core-loading [hideUntil]="loaded">
+        <addon-mod-assign-submission *ngIf="loaded" [courseId]="courseId" [moduleId]="moduleId" [submitId]="submitId" [blindId]="blindId">
+        </addon-mod-assign-submission>
+    </core-loading>
 </ion-content>
diff --git a/src/addons/mod/feedback/pages/attempt/attempt.html b/src/addons/mod/feedback/pages/attempt/attempt.html
index 3fee6027f..cb30f110e 100644
--- a/src/addons/mod/feedback/pages/attempt/attempt.html
+++ b/src/addons/mod/feedback/pages/attempt/attempt.html
@@ -9,47 +9,45 @@
         </ion-title>
     </ion-toolbar>
 </ion-header>
-<ion-content>
-    <core-swipe-navigation [manager]="attempts">
-        <core-loading [hideUntil]="loaded">
-            <ion-list class="ion-no-margin" *ngIf="attempt || anonAttempt">
-                <ion-item *ngIf="attempt" class="ion-text-wrap" core-user-link [userId]="attempt.userid"
-                    [attr.aria-label]="'core.user.viewprofile' | translate" [courseId]="attempt.courseid">
-                    <core-user-avatar [user]="attempt" slot="start"></core-user-avatar>
-                    <ion-label>
-                        <h2>{{attempt.fullname}}</h2>
-                        <p *ngIf="attempt.timemodified">{{attempt.timemodified * 1000 | coreFormatDate }}</p>
-                    </ion-label>
-                </ion-item>
+<ion-content [core-swipe-navigation]="attempts">
+    <core-loading [hideUntil]="loaded">
+        <ion-list class="ion-no-margin" *ngIf="attempt || anonAttempt">
+            <ion-item *ngIf="attempt" class="ion-text-wrap" core-user-link [userId]="attempt.userid"
+                [attr.aria-label]="'core.user.viewprofile' | translate" [courseId]="attempt.courseid">
+                <core-user-avatar [user]="attempt" slot="start"></core-user-avatar>
+                <ion-label>
+                    <h2>{{attempt.fullname}}</h2>
+                    <p *ngIf="attempt.timemodified">{{attempt.timemodified * 1000 | coreFormatDate }}</p>
+                </ion-label>
+            </ion-item>
 
-                <ion-item class="ion-text-wrap" *ngIf="anonAttempt">
-                    <core-user-avatar [linkProfile]="false" slot="start"></core-user-avatar>
-                    <ion-label>
-                        <h2>{{ 'addon.mod_feedback.anonymous_user' |translate }}</h2>
-                        <p>{{ 'addon.mod_feedback.response_nr' | translate }}: {{anonAttempt.number}}</p>
-                    </ion-label>
-                </ion-item>
-                <ng-container *ngIf="items && items.length">
-                    <ng-container *ngFor="let item of items">
-                        <core-spacer *ngIf="item.typ == 'pagebreak'"></core-spacer>
-                        <ion-item class="ion-text-wrap" *ngIf="item.typ != 'pagebreak'" [color]="item.dependitem > 0 ? 'light' : ''">
-                            <ion-label>
-                                <h2 *ngIf="item.name" [core-mark-required]="item.required">
-                                    <span *ngIf="feedback!.autonumbering && item.itemnumber">{{item.itemnumber}}. </span>
-                                    <core-format-text [component]="component" [componentId]="cmId" [text]="item.name" contextLevel="module"
-                                        [contextInstanceId]="cmId" [courseId]="courseId">
-                                    </core-format-text>
-                                </h2>
-                                <p *ngIf="item.submittedValue">
-                                    <core-format-text [component]="component" [componentId]="cmId" [text]="item.submittedValue"
-                                        contextLevel="module" [contextInstanceId]="cmId" [courseId]="courseId">
-                                    </core-format-text>
-                                </p>
-                            </ion-label>
-                        </ion-item>
-                    </ng-container>
+            <ion-item class="ion-text-wrap" *ngIf="anonAttempt">
+                <core-user-avatar [linkProfile]="false" slot="start"></core-user-avatar>
+                <ion-label>
+                    <h2>{{ 'addon.mod_feedback.anonymous_user' |translate }}</h2>
+                    <p>{{ 'addon.mod_feedback.response_nr' | translate }}: {{anonAttempt.number}}</p>
+                </ion-label>
+            </ion-item>
+            <ng-container *ngIf="items && items.length">
+                <ng-container *ngFor="let item of items">
+                    <core-spacer *ngIf="item.typ == 'pagebreak'"></core-spacer>
+                    <ion-item class="ion-text-wrap" *ngIf="item.typ != 'pagebreak'" [color]="item.dependitem > 0 ? 'light' : ''">
+                        <ion-label>
+                            <h2 *ngIf="item.name" [core-mark-required]="item.required">
+                                <span *ngIf="feedback!.autonumbering && item.itemnumber">{{item.itemnumber}}. </span>
+                                <core-format-text [component]="component" [componentId]="cmId" [text]="item.name" contextLevel="module"
+                                    [contextInstanceId]="cmId" [courseId]="courseId">
+                                </core-format-text>
+                            </h2>
+                            <p *ngIf="item.submittedValue">
+                                <core-format-text [component]="component" [componentId]="cmId" [text]="item.submittedValue"
+                                    contextLevel="module" [contextInstanceId]="cmId" [courseId]="courseId">
+                                </core-format-text>
+                            </p>
+                        </ion-label>
+                    </ion-item>
                 </ng-container>
-            </ion-list>
-        </core-loading>
-    </core-swipe-navigation>
+            </ng-container>
+        </ion-list>
+    </core-loading>
 </ion-content>
diff --git a/src/addons/mod/forum/pages/discussion/discussion.html b/src/addons/mod/forum/pages/discussion/discussion.html
index e022d7c11..fa0eb810a 100644
--- a/src/addons/mod/forum/pages/discussion/discussion.html
+++ b/src/addons/mod/forum/pages/discussion/discussion.html
@@ -55,75 +55,73 @@
         </core-context-menu-item>
     </core-context-menu>
 </core-navbar-buttons>
-<ion-content>
-    <core-swipe-navigation [manager]="discussions">
-        <ion-refresher slot="fixed" [disabled]="!discussionLoaded" (ionRefresh)="doRefresh($event.target)">
-            <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
-        </ion-refresher>
+<ion-content [core-swipe-navigation]="discussions">
+    <ion-refresher slot="fixed" [disabled]="!discussionLoaded" (ionRefresh)="doRefresh($event.target)">
+        <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
+    </ion-refresher>
 
-        <core-loading [hideUntil]="discussionLoaded">
-            <!-- Discussion replies found to be synchronized -->
-            <ion-card class="core-warning-card" *ngIf="postHasOffline || hasOfflineRatings">
-                <ion-item>
-                    <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
-                    <ion-label>{{ 'core.hasdatatosync' | translate:{$a: discussionStr} }}</ion-label>
-                </ion-item>
-            </ion-card>
+    <core-loading [hideUntil]="discussionLoaded">
+        <!-- Discussion replies found to be synchronized -->
+        <ion-card class="core-warning-card" *ngIf="postHasOffline || hasOfflineRatings">
+            <ion-item>
+                <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
+                <ion-label>{{ 'core.hasdatatosync' | translate:{$a: discussionStr} }}</ion-label>
+            </ion-item>
+        </ion-card>
 
-            <!-- Cut-off date or due date message -->
-            <ion-card class="core-info-card" *ngIf="availabilityMessage">
-                <ion-item>
-                    <ion-icon name="fas-info-circle" slot="start" aria-hidden="true"></ion-icon>
-                    <ion-label>{{ availabilityMessage }}</ion-label>
-                </ion-item>
-            </ion-card>
+        <!-- Cut-off date or due date message -->
+        <ion-card class="core-info-card" *ngIf="availabilityMessage">
+            <ion-item>
+                <ion-icon name="fas-info-circle" slot="start" aria-hidden="true"></ion-icon>
+                <ion-label>{{ availabilityMessage }}</ion-label>
+            </ion-item>
+        </ion-card>
 
-            <ion-card class="core-info-card" *ngIf="discussion && discussion.locked">
-                <ion-item>
-                    <ion-icon name="fas-lock" slot="start" aria-hidden="true"></ion-icon>
-                    <ion-label>{{ 'addon.mod_forum.discussionlocked' | translate }}</ion-label>
-                </ion-item>
-            </ion-card>
+        <ion-card class="core-info-card" *ngIf="discussion && discussion.locked">
+            <ion-item>
+                <ion-icon name="fas-lock" slot="start" aria-hidden="true"></ion-icon>
+                <ion-label>{{ 'addon.mod_forum.discussionlocked' | translate }}</ion-label>
+            </ion-item>
+        </ion-card>
 
-            <div *ngIf="startingPost" class="ion-margin-bottom">
-                <addon-mod-forum-post [post]="startingPost" [discussion]="discussion" [courseId]="courseId" [highlight]="true"
-                    [discussionId]="discussionId" [component]="component" [componentId]="cmId" [formData]="formData"
-                    [originalData]="originalData" [forum]="forum" [accessInfo]="accessInfo" [trackPosts]="trackPosts"
-                    [ratingInfo]="ratingInfo" [leavingPage]="leavingPage" (onPostChange)="postListChanged()">
+        <div *ngIf="startingPost" class="ion-margin-bottom">
+            <addon-mod-forum-post [post]="startingPost" [discussion]="discussion" [courseId]="courseId" [highlight]="true"
+                [discussionId]="discussionId" [component]="component" [componentId]="cmId" [formData]="formData"
+                [originalData]="originalData" [forum]="forum" [accessInfo]="accessInfo" [trackPosts]="trackPosts" [ratingInfo]="ratingInfo"
+                [leavingPage]="leavingPage" (onPostChange)="postListChanged()">
+            </addon-mod-forum-post>
+        </div>
+
+        <ion-card *ngIf="sort != 'nested'">
+            <ng-container *ngFor="let post of posts; first as first">
+                <core-spacer *ngIf="!first"></core-spacer>
+                <addon-mod-forum-post [post]="post" [courseId]="courseId" [discussionId]="discussionId" [component]="component"
+                    [componentId]="cmId" [formData]="formData" [originalData]="originalData" [parentSubject]="postSubjects[post.parentid]"
+                    [forum]="forum" [accessInfo]="accessInfo" [trackPosts]="trackPosts" [ratingInfo]="ratingInfo"
+                    [leavingPage]="leavingPage" (onPostChange)="postListChanged()">
                 </addon-mod-forum-post>
-            </div>
-
-            <ion-card *ngIf="sort != 'nested'">
-                <ng-container *ngFor="let post of posts; first as first">
-                    <core-spacer *ngIf="!first"></core-spacer>
-                    <addon-mod-forum-post [post]="post" [courseId]="courseId" [discussionId]="discussionId" [component]="component"
-                        [componentId]="cmId" [formData]="formData" [originalData]="originalData"
-                        [parentSubject]="postSubjects[post.parentid]" [forum]="forum" [accessInfo]="accessInfo" [trackPosts]="trackPosts"
-                        [ratingInfo]="ratingInfo" [leavingPage]="leavingPage" (onPostChange)="postListChanged()">
-                    </addon-mod-forum-post>
-                </ng-container>
-            </ion-card>
-
-            <ng-container *ngIf="sort == 'nested'">
-                <ng-container *ngFor="let post of posts">
-                    <ng-container *ngTemplateOutlet="nestedPosts; context: {post: post}"></ng-container>
-                </ng-container>
             </ng-container>
+        </ion-card>
 
-            <ng-template #nestedPosts let-post="post">
-                <ion-card>
-                    <addon-mod-forum-post [post]="post" [courseId]="courseId" [discussionId]="discussionId" [component]="component"
-                        [componentId]="cmId" [formData]="formData" [originalData]="originalData"
-                        [parentSubject]="postSubjects[post.parentid]" [forum]="forum" [accessInfo]="accessInfo" [trackPosts]="trackPosts"
-                        [ratingInfo]="ratingInfo" [leavingPage]="leavingPage" (onPostChange)="postListChanged()">
-                    </addon-mod-forum-post>
-                </ion-card>
-                <div class="ion-padding-start" *ngIf="post.children && post.children.length && post.children[0].subject">
-                    <ng-container *ngFor="let child of post.children">
-                        <ng-container *ngTemplateOutlet="nestedPosts; context: {post: child}"></ng-container>
-                    </ng-container>
-                </div>
-            </ng-template>
-        </core-loading>
-    </core-swipe-navigation>
+        <ng-container *ngIf="sort == 'nested'">
+            <ng-container *ngFor="let post of posts">
+                <ng-container *ngTemplateOutlet="nestedPosts; context: {post: post}"></ng-container>
+            </ng-container>
+        </ng-container>
+
+        <ng-template #nestedPosts let-post="post">
+            <ion-card>
+                <addon-mod-forum-post [post]="post" [courseId]="courseId" [discussionId]="discussionId" [component]="component"
+                    [componentId]="cmId" [formData]="formData" [originalData]="originalData" [parentSubject]="postSubjects[post.parentid]"
+                    [forum]="forum" [accessInfo]="accessInfo" [trackPosts]="trackPosts" [ratingInfo]="ratingInfo"
+                    [leavingPage]="leavingPage" (onPostChange)="postListChanged()">
+                </addon-mod-forum-post>
+            </ion-card>
+            <div class="ion-padding-start" *ngIf="post.children && post.children.length && post.children[0].subject">
+                <ng-container *ngFor="let child of post.children">
+                    <ng-container *ngTemplateOutlet="nestedPosts; context: {post: child}"></ng-container>
+                </ng-container>
+            </div>
+        </ng-template>
+    </core-loading>
 </ion-content>
diff --git a/src/addons/mod/forum/pages/new-discussion/new-discussion.html b/src/addons/mod/forum/pages/new-discussion/new-discussion.html
index e84f01638..daebbcd75 100644
--- a/src/addons/mod/forum/pages/new-discussion/new-discussion.html
+++ b/src/addons/mod/forum/pages/new-discussion/new-discussion.html
@@ -11,78 +11,76 @@
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
-<ion-content>
-    <core-swipe-navigation [manager]="discussions">
-        <ion-refresher slot="fixed" [disabled]="!groupsLoaded" (ionRefresh)="refreshGroups($event.target)">
-            <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
-        </ion-refresher>
-        <core-loading [hideUntil]="groupsLoaded">
-            <form *ngIf="showForm" #newDiscFormEl>
-                <ion-item>
-                    <ion-label position="stacked">{{ 'addon.mod_forum.subject' | translate }}</ion-label>
-                    <ion-input [(ngModel)]="newDiscussion.subject" type="text" [placeholder]="'addon.mod_forum.subject' | translate"
-                        name="subject">
-                    </ion-input>
+<ion-content [core-swipe-navigation]="discussions">
+    <ion-refresher slot="fixed" [disabled]="!groupsLoaded" (ionRefresh)="refreshGroups($event.target)">
+        <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
+    </ion-refresher>
+    <core-loading [hideUntil]="groupsLoaded">
+        <form *ngIf="showForm" #newDiscFormEl>
+            <ion-item>
+                <ion-label position="stacked">{{ 'addon.mod_forum.subject' | translate }}</ion-label>
+                <ion-input [(ngModel)]="newDiscussion.subject" type="text" [placeholder]="'addon.mod_forum.subject' | translate"
+                    name="subject">
+                </ion-input>
+            </ion-item>
+            <ion-item>
+                <ion-label position="stacked">{{ 'addon.mod_forum.message' | translate }}</ion-label>
+                <core-rich-text-editor name="addon_mod_forum_new_discussion" contextLevel="module" elementId="message"
+                    [control]="messageControl" [placeholder]="'addon.mod_forum.message' | translate" [component]="component"
+                    [componentId]="forum.cmid" [autoSave]="true" [contextInstanceId]="forum.cmid"
+                    (contentChanged)="onMessageChange($event)">
+                </core-rich-text-editor>
+            </ion-item>
+            <ion-item button class="divider ion-text-wrap" (click)="toggleAdvanced()" detail="false" [attr.aria-expanded]="advanced"
+                [attr.aria-label]="(advanced ? 'core.hideadvanced' : 'core.showadvanced') | translate" role="heading"
+                aria-controls="addon-mod-forum-new-discussion-advanced">
+                <ion-icon *ngIf="!advanced" name="fas-caret-right" flip-rtl slot="start" aria-hidden="true"></ion-icon>
+                <ion-icon *ngIf="advanced" name="fas-caret-down" slot="start" aria-hidden="true"></ion-icon>
+                <ion-label>
+                    <h2>{{ 'addon.mod_forum.advanced' | translate }}</h2>
+                </ion-label>
+            </ion-item>
+            <div *ngIf="advanced" id="addon-mod-forum-new-discussion-advanced">
+                <ion-item *ngIf="showGroups && groupIds.length > 1 && accessInfo.cancanposttomygroups">
+                    <ion-label>{{ 'addon.mod_forum.posttomygroups' | translate }}</ion-label>
+                    <ion-toggle [(ngModel)]="newDiscussion.postToAllGroups" name="postallgroups"></ion-toggle>
+                </ion-item>
+                <ion-item *ngIf="showGroups">
+                    <ion-label id="addon-mod-forum-groupslabel">{{ 'addon.mod_forum.group' | translate }}</ion-label>
+                    <ion-select [(ngModel)]="newDiscussion.groupId" [disabled]="newDiscussion.postToAllGroups"
+                        aria-labelledby="addon-mod-forum-groupslabel" interface="action-sheet" name="groupid"
+                        [interfaceOptions]="{header: 'addon.mod_forum.group' | translate}">
+                        <ion-select-option *ngFor="let group of groups" [value]="group.id">{{ group.name }}</ion-select-option>
+                    </ion-select>
                 </ion-item>
                 <ion-item>
-                    <ion-label position="stacked">{{ 'addon.mod_forum.message' | translate }}</ion-label>
-                    <core-rich-text-editor name="addon_mod_forum_new_discussion" contextLevel="module" elementId="message"
-                        [control]="messageControl" [placeholder]="'addon.mod_forum.message' | translate" [component]="component"
-                        [componentId]="forum.cmid" [autoSave]="true" [contextInstanceId]="forum.cmid"
-                        (contentChanged)="onMessageChange($event)">
-                    </core-rich-text-editor>
+                    <ion-label>{{ 'addon.mod_forum.discussionsubscription' | translate }}</ion-label>
+                    <ion-toggle [(ngModel)]="newDiscussion.subscribe" name="subscribe"></ion-toggle>
                 </ion-item>
-                <ion-item button class="divider ion-text-wrap" (click)="toggleAdvanced()" detail="false" [attr.aria-expanded]="advanced"
-                    [attr.aria-label]="(advanced ? 'core.hideadvanced' : 'core.showadvanced') | translate" role="heading"
-                    aria-controls="addon-mod-forum-new-discussion-advanced">
-                    <ion-icon *ngIf="!advanced" name="fas-caret-right" flip-rtl slot="start" aria-hidden="true"></ion-icon>
-                    <ion-icon *ngIf="advanced" name="fas-caret-down" slot="start" aria-hidden="true"></ion-icon>
-                    <ion-label>
-                        <h2>{{ 'addon.mod_forum.advanced' | translate }}</h2>
-                    </ion-label>
+                <ion-item *ngIf="canPin">
+                    <ion-label>{{ 'addon.mod_forum.discussionpinned' | translate }}</ion-label>
+                    <ion-toggle [(ngModel)]="newDiscussion.pin" name="pin"></ion-toggle>
                 </ion-item>
-                <div *ngIf="advanced" id="addon-mod-forum-new-discussion-advanced">
-                    <ion-item *ngIf="showGroups && groupIds.length > 1 && accessInfo.cancanposttomygroups">
-                        <ion-label>{{ 'addon.mod_forum.posttomygroups' | translate }}</ion-label>
-                        <ion-toggle [(ngModel)]="newDiscussion.postToAllGroups" name="postallgroups"></ion-toggle>
-                    </ion-item>
-                    <ion-item *ngIf="showGroups">
-                        <ion-label id="addon-mod-forum-groupslabel">{{ 'addon.mod_forum.group' | translate }}</ion-label>
-                        <ion-select [(ngModel)]="newDiscussion.groupId" [disabled]="newDiscussion.postToAllGroups"
-                            aria-labelledby="addon-mod-forum-groupslabel" interface="action-sheet" name="groupid"
-                            [interfaceOptions]="{header: 'addon.mod_forum.group' | translate}">
-                            <ion-select-option *ngFor="let group of groups" [value]="group.id">{{ group.name }}</ion-select-option>
-                        </ion-select>
-                    </ion-item>
-                    <ion-item>
-                        <ion-label>{{ 'addon.mod_forum.discussionsubscription' | translate }}</ion-label>
-                        <ion-toggle [(ngModel)]="newDiscussion.subscribe" name="subscribe"></ion-toggle>
-                    </ion-item>
-                    <ion-item *ngIf="canPin">
-                        <ion-label>{{ 'addon.mod_forum.discussionpinned' | translate }}</ion-label>
-                        <ion-toggle [(ngModel)]="newDiscussion.pin" name="pin"></ion-toggle>
-                    </ion-item>
-                    <core-attachments *ngIf="canCreateAttachments && forum && forum.maxattachments > 0" [files]="newDiscussion.files"
-                        [maxSize]="forum.maxbytes" [maxSubmissions]="forum.maxattachments" [component]="component"
-                        [componentId]="forum.cmid" [allowOffline]="true" [courseId]="courseId">
-                    </core-attachments>
-                </div>
-                <ion-item>
-                    <ion-label>
-                        <ion-row>
-                            <ion-col>
-                                <ion-button expand="block" [disabled]="newDiscussion.subject == '' || newDiscussion.message == null"
-                                    (click)="add()">
-                                    {{ 'addon.mod_forum.posttoforum' | translate }}
-                                </ion-button>
-                            </ion-col>
-                            <ion-col *ngIf="hasOffline">
-                                <ion-button expand="block" color="light" (click)="discard()">{{ 'core.discard' | translate }}</ion-button>
-                            </ion-col>
-                        </ion-row>
-                    </ion-label>
-                </ion-item>
-            </form>
-        </core-loading>
-    </core-swipe-navigation>
+                <core-attachments *ngIf="canCreateAttachments && forum && forum.maxattachments > 0" [files]="newDiscussion.files"
+                    [maxSize]="forum.maxbytes" [maxSubmissions]="forum.maxattachments" [component]="component" [componentId]="forum.cmid"
+                    [allowOffline]="true" [courseId]="courseId">
+                </core-attachments>
+            </div>
+            <ion-item>
+                <ion-label>
+                    <ion-row>
+                        <ion-col>
+                            <ion-button expand="block" [disabled]="newDiscussion.subject == '' || newDiscussion.message == null"
+                                (click)="add()">
+                                {{ 'addon.mod_forum.posttoforum' | translate }}
+                            </ion-button>
+                        </ion-col>
+                        <ion-col *ngIf="hasOffline">
+                            <ion-button expand="block" color="light" (click)="discard()">{{ 'core.discard' | translate }}</ion-button>
+                        </ion-col>
+                    </ion-row>
+                </ion-label>
+            </ion-item>
+        </form>
+    </core-loading>
 </ion-content>
diff --git a/src/addons/mod/glossary/pages/edit/edit.html b/src/addons/mod/glossary/pages/edit/edit.html
index 4b195ebab..f943c19e3 100644
--- a/src/addons/mod/glossary/pages/edit/edit.html
+++ b/src/addons/mod/glossary/pages/edit/edit.html
@@ -11,76 +11,73 @@
         </ion-title>
     </ion-toolbar>
 </ion-header>
-<ion-content>
-    <core-swipe-navigation [manager]="entries">
-        <core-loading [hideUntil]="loaded">
-            <form #editFormEl *ngIf="glossary">
-                <ion-item>
-                    <ion-label position="stacked">{{ 'addon.mod_glossary.concept' | translate }}</ion-label>
-                    <ion-input type="text" [placeholder]="'addon.mod_glossary.concept' | translate" [(ngModel)]="entry.concept"
-                        name="concept">
-                    </ion-input>
-                </ion-item>
-                <ion-item>
-                    <ion-label position="stacked">{{ 'addon.mod_glossary.definition' | translate }}</ion-label>
-                    <core-rich-text-editor [control]="definitionControl" (contentChanged)="onDefinitionChange($event)"
-                        [placeholder]="'addon.mod_glossary.definition' | translate" name="addon_mod_glossary_edit" [component]="component"
-                        [componentId]="cmId" [autoSave]="true" contextLevel="module" [contextInstanceId]="cmId"
-                        elementId="definition_editor" [draftExtraParams]="editorExtraParams">
-                    </core-rich-text-editor>
-                </ion-item>
-                <ion-item *ngIf="categories.length > 0">
-                    <ion-label position="stacked" id="addon-mod-glossary-categories-label">
-                        {{ 'addon.mod_glossary.categories' | translate }}
-                    </ion-label>
-                    <ion-select [(ngModel)]="options.categories" multiple="true" aria-labelledby="addon-mod-glossary-categories-label"
-                        interface="action-sheet" [placeholder]="'addon.mod_glossary.categories' | translate" name="categories"
-                        [interfaceOptions]="{header: 'addon.mod_glossary.categories' | translate}">
-                        <ion-select-option *ngFor="let category of categories" [value]="category.id">
-                            {{ category.name }}
-                        </ion-select-option>
-                    </ion-select>
-                </ion-item>
-                <ion-item>
-                    <ion-label position="stacked" id="addon-mod-glossary-aliases-label">
-                        {{ 'addon.mod_glossary.aliases' | translate }}
-                    </ion-label>
-                    <ion-textarea [(ngModel)]="options.aliases" rows="1" [core-auto-rows]="options.aliases"
-                        aria-labelledby="addon-mod-glossary-aliases-label" name="aliases">
-                    </ion-textarea>
-                </ion-item>
+<ion-content [core-swipe-navigation]="entries">
+    <core-loading [hideUntil]="loaded">
+        <form #editFormEl *ngIf="glossary">
+            <ion-item>
+                <ion-label position="stacked">{{ 'addon.mod_glossary.concept' | translate }}</ion-label>
+                <ion-input type="text" [placeholder]="'addon.mod_glossary.concept' | translate" [(ngModel)]="entry.concept" name="concept">
+                </ion-input>
+            </ion-item>
+            <ion-item>
+                <ion-label position="stacked">{{ 'addon.mod_glossary.definition' | translate }}</ion-label>
+                <core-rich-text-editor [control]="definitionControl" (contentChanged)="onDefinitionChange($event)"
+                    [placeholder]="'addon.mod_glossary.definition' | translate" name="addon_mod_glossary_edit" [component]="component"
+                    [componentId]="cmId" [autoSave]="true" contextLevel="module" [contextInstanceId]="cmId" elementId="definition_editor"
+                    [draftExtraParams]="editorExtraParams">
+                </core-rich-text-editor>
+            </ion-item>
+            <ion-item *ngIf="categories.length > 0">
+                <ion-label position="stacked" id="addon-mod-glossary-categories-label">
+                    {{ 'addon.mod_glossary.categories' | translate }}
+                </ion-label>
+                <ion-select [(ngModel)]="options.categories" multiple="true" aria-labelledby="addon-mod-glossary-categories-label"
+                    interface="action-sheet" [placeholder]="'addon.mod_glossary.categories' | translate" name="categories"
+                    [interfaceOptions]="{header: 'addon.mod_glossary.categories' | translate}">
+                    <ion-select-option *ngFor="let category of categories" [value]="category.id">
+                        {{ category.name }}
+                    </ion-select-option>
+                </ion-select>
+            </ion-item>
+            <ion-item>
+                <ion-label position="stacked" id="addon-mod-glossary-aliases-label">
+                    {{ 'addon.mod_glossary.aliases' | translate }}
+                </ion-label>
+                <ion-textarea [(ngModel)]="options.aliases" rows="1" [core-auto-rows]="options.aliases"
+                    aria-labelledby="addon-mod-glossary-aliases-label" name="aliases">
+                </ion-textarea>
+            </ion-item>
+            <ion-item-divider>
+                <ion-label>
+                    <h2>{{ 'addon.mod_glossary.attachment' | translate }}</h2>
+                </ion-label>
+            </ion-item-divider>
+            <core-attachments [files]="attachments" [component]="component" [componentId]="glossary.coursemodule" [allowOffline]="true"
+                [courseId]="courseId">
+            </core-attachments>
+            <ng-container *ngIf="glossary.usedynalink">
                 <ion-item-divider>
                     <ion-label>
-                        <h2>{{ 'addon.mod_glossary.attachment' | translate }}</h2>
+                        <h2>{{ 'addon.mod_glossary.linking' | translate }}</h2>
                     </ion-label>
                 </ion-item-divider>
-                <core-attachments [files]="attachments" [component]="component" [componentId]="glossary.coursemodule" [allowOffline]="true"
-                    [courseId]="courseId">
-                </core-attachments>
-                <ng-container *ngIf="glossary.usedynalink">
-                    <ion-item-divider>
-                        <ion-label>
-                            <h2>{{ 'addon.mod_glossary.linking' | translate }}</h2>
-                        </ion-label>
-                    </ion-item-divider>
-                    <ion-item class="ion-text-wrap">
-                        <ion-label>{{ 'addon.mod_glossary.entryusedynalink' | translate }}</ion-label>
-                        <ion-toggle [(ngModel)]="options.usedynalink" name="usedynalink"></ion-toggle>
-                    </ion-item>
-                    <ion-item class="ion-text-wrap">
-                        <ion-label>{{ 'addon.mod_glossary.casesensitive' | translate }}</ion-label>
-                        <ion-toggle [disabled]="!options.usedynalink" [(ngModel)]="options.casesensitive" name="casesensitive">
-                        </ion-toggle>
-                    </ion-item>
-                    <ion-item class="ion-text-wrap">
-                        <ion-label>{{ 'addon.mod_glossary.fullmatch' | translate }}</ion-label>
-                        <ion-toggle [disabled]="!options.usedynalink" [(ngModel)]="options.fullmatch" name="fullmatch"></ion-toggle>
-                    </ion-item>
-                </ng-container>
-                <ion-button class="ion-margin" expand="block" [disabled]="!entry.concept || !entry.definition" (click)="save()">
-                    {{ 'core.save' | translate }}
-                </ion-button>
-            </form>
-        </core-loading>
-    </core-swipe-navigation>
+                <ion-item class="ion-text-wrap">
+                    <ion-label>{{ 'addon.mod_glossary.entryusedynalink' | translate }}</ion-label>
+                    <ion-toggle [(ngModel)]="options.usedynalink" name="usedynalink"></ion-toggle>
+                </ion-item>
+                <ion-item class="ion-text-wrap">
+                    <ion-label>{{ 'addon.mod_glossary.casesensitive' | translate }}</ion-label>
+                    <ion-toggle [disabled]="!options.usedynalink" [(ngModel)]="options.casesensitive" name="casesensitive">
+                    </ion-toggle>
+                </ion-item>
+                <ion-item class="ion-text-wrap">
+                    <ion-label>{{ 'addon.mod_glossary.fullmatch' | translate }}</ion-label>
+                    <ion-toggle [disabled]="!options.usedynalink" [(ngModel)]="options.fullmatch" name="fullmatch"></ion-toggle>
+                </ion-item>
+            </ng-container>
+            <ion-button class="ion-margin" expand="block" [disabled]="!entry.concept || !entry.definition" (click)="save()">
+                {{ 'core.save' | translate }}
+            </ion-button>
+        </form>
+    </core-loading>
 </ion-content>
diff --git a/src/addons/mod/glossary/pages/entry/entry.html b/src/addons/mod/glossary/pages/entry/entry.html
index e5d870d40..ebe54a345 100644
--- a/src/addons/mod/glossary/pages/entry/entry.html
+++ b/src/addons/mod/glossary/pages/entry/entry.html
@@ -11,76 +11,74 @@
         </ion-title>
     </ion-toolbar>
 </ion-header>
-<ion-content>
-    <core-swipe-navigation [manager]="entries">
-        <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="doRefresh($event.target)">
-            <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
-        </ion-refresher>
+<ion-content [core-swipe-navigation]="entries">
+    <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="doRefresh($event.target)">
+        <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
+    </ion-refresher>
 
-        <core-loading [hideUntil]="loaded">
-            <ng-container *ngIf="entry && loaded">
-                <ion-item class="ion-text-wrap" *ngIf="showAuthor">
-                    <core-user-avatar [user]="entry" slot="start"></core-user-avatar>
-                    <ion-label>
-                        <h2>
-                            <core-format-text [text]="entry.concept" contextLevel="module" [contextInstanceId]="componentId"
-                                [courseId]="courseId">
-                            </core-format-text>
-                        </h2>
-                        <p>{{ entry.userfullname }}</p>
-                    </ion-label>
-                    <ion-note slot="end" *ngIf="showDate">{{ entry.timemodified | coreDateDayOrTime }}</ion-note>
-                </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="!showAuthor">
-                    <ion-label>
-                        <p class="item-heading">
-                            <core-format-text [text]="entry.concept" contextLevel="module" [contextInstanceId]="componentId">
-                            </core-format-text>
-                        </p>
-                    </ion-label>
-                    <ion-note slot="end" *ngIf="showDate">{{ entry.timemodified | coreDateDayOrTime }}</ion-note>
-                </ion-item>
-                <ion-item class="ion-text-wrap">
-                    <ion-label>
-                        <core-format-text [component]="component" [componentId]="componentId" [text]="entry.definition"
-                            contextLevel="module" [contextInstanceId]="componentId" [courseId]="courseId">
+    <core-loading [hideUntil]="loaded">
+        <ng-container *ngIf="entry && loaded">
+            <ion-item class="ion-text-wrap" *ngIf="showAuthor">
+                <core-user-avatar [user]="entry" slot="start"></core-user-avatar>
+                <ion-label>
+                    <h2>
+                        <core-format-text [text]="entry.concept" contextLevel="module" [contextInstanceId]="componentId"
+                            [courseId]="courseId">
                         </core-format-text>
-                    </ion-label>
-                </ion-item>
-                <div *ngIf="entry.attachment" lines="none">
-                    <core-file *ngFor="let file of entry.attachments" [file]="file" [component]="component" [componentId]="componentId">
-                    </core-file>
-                </div>
-                <ion-item class="ion-text-wrap" *ngIf="tagsEnabled && entry && entry.tags && entry.tags.length > 0">
-                    <ion-label>
-                        <div slot="start">{{ 'core.tag.tags' | translate }}:</div>
-                        <core-tag-list [tags]="entry.tags"></core-tag-list>
-                    </ion-label>
-                </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="!entry.approved">
-                    <ion-label>
-                        <p><em>{{ 'addon.mod_glossary.entrypendingapproval' | translate }}</em></p>
-                    </ion-label>
-                </ion-item>
-                <core-comments *ngIf="glossary && glossary.allowcomments && entry && entry.id > 0 && commentsEnabled" contextLevel="module"
-                    [instanceId]="glossary.coursemodule" component="mod_glossary" [itemId]="entry.id" area="glossary_entry"
-                    [courseId]="glossary.course" [showItem]="true">
-                </core-comments>
-                <core-rating-rate *ngIf="glossary && ratingInfo" [ratingInfo]="ratingInfo" contextLevel="module"
-                    [instanceId]="glossary.coursemodule" [itemId]="entry.id" [itemSetId]="0" [courseId]="glossary.course"
-                    [aggregateMethod]="glossary.assessed" [scaleId]="glossary.scale" [userId]="entry.userid" (onUpdate)="ratingUpdated()">
-                </core-rating-rate>
-                <core-rating-aggregate *ngIf="glossary && ratingInfo" [ratingInfo]="ratingInfo" contextLevel="module"
-                    [instanceId]="glossary.coursemodule" [itemId]="entry.id" [courseId]="glossary.course"
-                    [aggregateMethod]="glossary.assessed" [scaleId]="glossary.scale">
-                </core-rating-aggregate>
-            </ng-container>
+                    </h2>
+                    <p>{{ entry.userfullname }}</p>
+                </ion-label>
+                <ion-note slot="end" *ngIf="showDate">{{ entry.timemodified | coreDateDayOrTime }}</ion-note>
+            </ion-item>
+            <ion-item class="ion-text-wrap" *ngIf="!showAuthor">
+                <ion-label>
+                    <p class="item-heading">
+                        <core-format-text [text]="entry.concept" contextLevel="module" [contextInstanceId]="componentId">
+                        </core-format-text>
+                    </p>
+                </ion-label>
+                <ion-note slot="end" *ngIf="showDate">{{ entry.timemodified | coreDateDayOrTime }}</ion-note>
+            </ion-item>
+            <ion-item class="ion-text-wrap">
+                <ion-label>
+                    <core-format-text [component]="component" [componentId]="componentId" [text]="entry.definition" contextLevel="module"
+                        [contextInstanceId]="componentId" [courseId]="courseId">
+                    </core-format-text>
+                </ion-label>
+            </ion-item>
+            <div *ngIf="entry.attachment" lines="none">
+                <core-file *ngFor="let file of entry.attachments" [file]="file" [component]="component" [componentId]="componentId">
+                </core-file>
+            </div>
+            <ion-item class="ion-text-wrap" *ngIf="tagsEnabled && entry && entry.tags && entry.tags.length > 0">
+                <ion-label>
+                    <div slot="start">{{ 'core.tag.tags' | translate }}:</div>
+                    <core-tag-list [tags]="entry.tags"></core-tag-list>
+                </ion-label>
+            </ion-item>
+            <ion-item class="ion-text-wrap" *ngIf="!entry.approved">
+                <ion-label>
+                    <p><em>{{ 'addon.mod_glossary.entrypendingapproval' | translate }}</em></p>
+                </ion-label>
+            </ion-item>
+            <core-comments *ngIf="glossary && glossary.allowcomments && entry && entry.id > 0 && commentsEnabled" contextLevel="module"
+                [instanceId]="glossary.coursemodule" component="mod_glossary" [itemId]="entry.id" area="glossary_entry"
+                [courseId]="glossary.course" [showItem]="true">
+            </core-comments>
+            <core-rating-rate *ngIf="glossary && ratingInfo" [ratingInfo]="ratingInfo" contextLevel="module"
+                [instanceId]="glossary.coursemodule" [itemId]="entry.id" [itemSetId]="0" [courseId]="glossary.course"
+                [aggregateMethod]="glossary.assessed" [scaleId]="glossary.scale" [userId]="entry.userid" (onUpdate)="ratingUpdated()">
+            </core-rating-rate>
+            <core-rating-aggregate *ngIf="glossary && ratingInfo" [ratingInfo]="ratingInfo" contextLevel="module"
+                [instanceId]="glossary.coursemodule" [itemId]="entry.id" [courseId]="glossary.course" [aggregateMethod]="glossary.assessed"
+                [scaleId]="glossary.scale">
+            </core-rating-aggregate>
+        </ng-container>
 
-            <ion-card *ngIf="!entry" class="core-warning-card">
-                <ion-item>
-                    <ion-label>{{ 'addon.mod_glossary.errorloadingentry' | translate }}</ion-label>
-                </ion-item>
-            </ion-card>
-        </core-loading>
-    </core-swipe-navigation>
+        <ion-card *ngIf="!entry" class="core-warning-card">
+            <ion-item>
+                <ion-label>{{ 'addon.mod_glossary.errorloadingentry' | translate }}</ion-label>
+            </ion-item>
+        </ion-card>
+    </core-loading>
 </ion-content>
diff --git a/src/core/features/user/pages/profile/profile.html b/src/core/features/user/pages/profile/profile.html
index ab29e5819..1d12c3003 100644
--- a/src/core/features/user/pages/profile/profile.html
+++ b/src/core/features/user/pages/profile/profile.html
@@ -8,89 +8,86 @@
         </ion-title>
     </ion-toolbar>
 </ion-header>
-<ion-content>
-    <core-swipe-navigation [manager]="users">
-        <ion-refresher slot="fixed" [disabled]="!userLoaded" (ionRefresh)="refreshUser($event.target)">
-            <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
-        </ion-refresher>
-        <core-loading [hideUntil]="userLoaded">
-            <ion-list *ngIf="user && !isDeleted && isEnrolled">
-                <ion-item class="ion-text-center core-user-profile-maininfo ion-text-wrap">
-                    <core-user-avatar [user]="user" [userId]="user.id" [linkProfile]="false" [checkOnline]="true">
-                    </core-user-avatar>
-                    <ion-label>
-                        <h2>{{ user.fullname }}</h2>
-                        <p *ngIf="user.address">
-                            <ion-icon name="fas-map-marker-alt" [attr.aria-hidden]="true"></ion-icon> {{ user.address }}
-                        </p>
-                        <p *ngIf="rolesFormatted">
-                            <strong>{{ 'core.user.roles' | translate}}</strong>{{'core.labelsep' | translate}}
-                            {{ rolesFormatted }}
-                        </p>
-                    </ion-label>
-                </ion-item>
+<ion-content [core-swipe-navigation]="users">
+    <ion-refresher slot="fixed" [disabled]="!userLoaded" (ionRefresh)="refreshUser($event.target)">
+        <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
+    </ion-refresher>
+    <core-loading [hideUntil]="userLoaded">
+        <ion-list *ngIf="user && !isDeleted && isEnrolled">
+            <ion-item class="ion-text-center core-user-profile-maininfo ion-text-wrap">
+                <core-user-avatar [user]="user" [userId]="user.id" [linkProfile]="false" [checkOnline]="true">
+                </core-user-avatar>
+                <ion-label>
+                    <h2>{{ user.fullname }}</h2>
+                    <p *ngIf="user.address">
+                        <ion-icon name="fas-map-marker-alt" [attr.aria-hidden]="true"></ion-icon> {{ user.address }}
+                    </p>
+                    <p *ngIf="rolesFormatted">
+                        <strong>{{ 'core.user.roles' | translate}}</strong>{{'core.labelsep' | translate}}
+                        {{ rolesFormatted }}
+                    </p>
+                </ion-label>
+            </ion-item>
 
-                <div class="core-user-communication-handlers"
-                    *ngIf="(communicationHandlers && communicationHandlers.length) || isLoadingHandlers">
-                    <ion-item *ngIf="communicationHandlers && communicationHandlers.length">
-                        <ion-label>
-                            <ion-button *ngFor="let handler of communicationHandlers" expand="block" size="default"
-                                [ngClass]="['core-user-profile-handler', handler.class || '']" (click)="handlerClicked($event, handler)"
-                                [hidden]="handler.hidden" [attr.aria-label]="handler.title | translate" [disabled]="handler.spinner">
-                                <ion-icon *ngIf="handler.icon" [name]="handler.icon" slot="start" aria-hidden="true"></ion-icon>
-                                {{ handler.title | translate }}
-                            </ion-button>
-                        </ion-label>
-                    </ion-item>
-                    <div *ngIf="isLoadingHandlers" class="ion-text-center core-loading-handlers">
-                        <ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner>
-                    </div>
-                </div>
-                <ion-item button class="ion-text-wrap core-user-profile-handler" (click)="openUserDetails()"
-                    [attr.aria-label]="'core.user.details' | translate" detail="true">
-                    <ion-icon name="fas-user" slot="start" aria-hidden="true"></ion-icon>
+            <div class="core-user-communication-handlers"
+                *ngIf="(communicationHandlers && communicationHandlers.length) || isLoadingHandlers">
+                <ion-item *ngIf="communicationHandlers && communicationHandlers.length">
                     <ion-label>
-                        <p class="item-heading">{{ 'core.user.details' | translate }}</p>
-                    </ion-label>
-                </ion-item>
-                <ion-item class="ion-text-center core-loading-handlers" *ngIf="isLoadingHandlers">
-                    <ion-label>
-                        <ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner>
-                    </ion-label>
-                </ion-item>
-                <ion-item button *ngFor="let handler of newPageHandlers" class="ion-text-wrap" (click)="handlerClicked($event, handler)"
-                    [ngClass]="['core-user-profile-handler', handler.class || '']" [hidden]="handler.hidden"
-                    [attr.aria-label]="handler.title | translate" detail="true">
-                    <ion-icon *ngIf="handler.icon" [name]="handler.icon" slot="start" aria-hidden="true"></ion-icon>
-                    <ion-label>
-                        <p class="item-heading">{{ handler.title | translate }}</p>
-                    </ion-label>
-                    <ion-badge slot="end" *ngIf="handler.showBadge" [hidden]="handler.loading || !handler.badge" aria-hidden="true">
-                        {{handler.badge}}
-                    </ion-badge>
-                    <span *ngIf="handler.showBadge && handler.badge && handler.badgeA11yText" class="sr-only">
-                        {{ handler.badgeA11yText | translate: {$a : handler.badge } }}
-                    </span>
-                    <ion-spinner slot="end" *ngIf="handler.showBadge && handler.loading" [attr.aria-label]="'core.loading' | translate">
-                    </ion-spinner>
-                </ion-item>
-                <ion-item *ngIf="actionHandlers && actionHandlers.length">
-                    <ion-label>
-                        <ion-button *ngFor="let handler of actionHandlers" expand="block" fill="outline" size="default"
+                        <ion-button *ngFor="let handler of communicationHandlers" expand="block" size="default"
                             [ngClass]="['core-user-profile-handler', handler.class || '']" (click)="handlerClicked($event, handler)"
                             [hidden]="handler.hidden" [attr.aria-label]="handler.title | translate" [disabled]="handler.spinner">
                             <ion-icon *ngIf="handler.icon" [name]="handler.icon" slot="start" aria-hidden="true"></ion-icon>
                             {{ handler.title | translate }}
-                            <ion-spinner *ngIf="handler.spinner" slot="end" [attr.aria-label]="'core.loading' | translate"></ion-spinner>
                         </ion-button>
                     </ion-label>
                 </ion-item>
-            </ion-list>
-            <core-empty-box *ngIf="!user && !isDeleted && isEnrolled" icon="far-user"
-                [message]=" 'core.user.detailsnotavailable' | translate">
-            </core-empty-box>
-            <core-empty-box *ngIf="isDeleted" icon="far-user" [message]="'core.userdeleted' | translate"></core-empty-box>
-            <core-empty-box *ngIf="!isEnrolled" icon="far-user" [message]="'core.notenrolledprofile' | translate"></core-empty-box>
-        </core-loading>
-    </core-swipe-navigation>
+                <div *ngIf="isLoadingHandlers" class="ion-text-center core-loading-handlers">
+                    <ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner>
+                </div>
+            </div>
+            <ion-item button class="ion-text-wrap core-user-profile-handler" (click)="openUserDetails()"
+                [attr.aria-label]="'core.user.details' | translate" detail="true">
+                <ion-icon name="fas-user" slot="start" aria-hidden="true"></ion-icon>
+                <ion-label>
+                    <p class="item-heading">{{ 'core.user.details' | translate }}</p>
+                </ion-label>
+            </ion-item>
+            <ion-item class="ion-text-center core-loading-handlers" *ngIf="isLoadingHandlers">
+                <ion-label>
+                    <ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner>
+                </ion-label>
+            </ion-item>
+            <ion-item button *ngFor="let handler of newPageHandlers" class="ion-text-wrap" (click)="handlerClicked($event, handler)"
+                [ngClass]="['core-user-profile-handler', handler.class || '']" [hidden]="handler.hidden"
+                [attr.aria-label]="handler.title | translate" detail="true">
+                <ion-icon *ngIf="handler.icon" [name]="handler.icon" slot="start" aria-hidden="true"></ion-icon>
+                <ion-label>
+                    <p class="item-heading">{{ handler.title | translate }}</p>
+                </ion-label>
+                <ion-badge slot="end" *ngIf="handler.showBadge" [hidden]="handler.loading || !handler.badge" aria-hidden="true">
+                    {{handler.badge}}
+                </ion-badge>
+                <span *ngIf="handler.showBadge && handler.badge && handler.badgeA11yText" class="sr-only">
+                    {{ handler.badgeA11yText | translate: {$a : handler.badge } }}
+                </span>
+                <ion-spinner slot="end" *ngIf="handler.showBadge && handler.loading" [attr.aria-label]="'core.loading' | translate">
+                </ion-spinner>
+            </ion-item>
+            <ion-item *ngIf="actionHandlers && actionHandlers.length">
+                <ion-label>
+                    <ion-button *ngFor="let handler of actionHandlers" expand="block" fill="outline" size="default"
+                        [ngClass]="['core-user-profile-handler', handler.class || '']" (click)="handlerClicked($event, handler)"
+                        [hidden]="handler.hidden" [attr.aria-label]="handler.title | translate" [disabled]="handler.spinner">
+                        <ion-icon *ngIf="handler.icon" [name]="handler.icon" slot="start" aria-hidden="true"></ion-icon>
+                        {{ handler.title | translate }}
+                        <ion-spinner *ngIf="handler.spinner" slot="end" [attr.aria-label]="'core.loading' | translate"></ion-spinner>
+                    </ion-button>
+                </ion-label>
+            </ion-item>
+        </ion-list>
+        <core-empty-box *ngIf="!user && !isDeleted && isEnrolled" icon="far-user" [message]=" 'core.user.detailsnotavailable' | translate">
+        </core-empty-box>
+        <core-empty-box *ngIf="isDeleted" icon="far-user" [message]="'core.userdeleted' | translate"></core-empty-box>
+        <core-empty-box *ngIf="!isEnrolled" icon="far-user" [message]="'core.notenrolledprofile' | translate"></core-empty-box>
+    </core-loading>
 </ion-content>

From 1466c543cab88aa340a820e3ce72af427bb82a3b Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 11 Jan 2022 08:25:06 +0100
Subject: [PATCH 0323/1008] MOBILE-3951 calendar: Schedule notifications from
 service

---
 .../calendar/components/calendar/calendar.ts  | 56 +++++--------------
 .../upcoming-events/upcoming-events.ts        | 11 ----
 src/addons/calendar/pages/day/day.page.ts     | 15 -----
 src/addons/calendar/pages/event/event.page.ts |  7 +--
 src/addons/calendar/services/calendar.ts      | 33 ++++++++++-
 5 files changed, 46 insertions(+), 76 deletions(-)

diff --git a/src/addons/calendar/components/calendar/calendar.ts b/src/addons/calendar/components/calendar/calendar.ts
index ed3e500c7..64cd0807d 100644
--- a/src/addons/calendar/components/calendar/calendar.ts
+++ b/src/addons/calendar/components/calendar/calendar.ts
@@ -41,7 +41,6 @@ import { AddonCalendarFilter, AddonCalendarHelper } from '../../services/calenda
 import { AddonCalendarOffline } from '../../services/calendar-offline';
 import { CoreCategoryData, CoreCourses } from '@features/courses/services/courses';
 import { CoreApp } from '@services/app';
-import { CoreLocalNotifications } from '@services/local-notifications';
 import { CoreSwipeSlidesComponent } from '@components/swipe-slides/swipe-slides';
 import {
     CoreSwipeSlidesDynamicItem,
@@ -78,7 +77,6 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
     protected differ: KeyValueDiffer<unknown, unknown>; // To detect changes in the data input.
     // Observers and listeners.
     protected undeleteEventObserver: CoreEventObserver;
-    protected obsDefaultTimeChange?: CoreEventObserver;
     protected managerUnsubscribe?: () => void;
 
     constructor(
@@ -86,23 +84,6 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
     ) {
         this.currentSiteId = CoreSites.getCurrentSiteId();
 
-        if (CoreLocalNotifications.isAvailable()) {
-            // Re-schedule events if default time changes.
-            this.obsDefaultTimeChange = CoreEvents.on(AddonCalendarProvider.DEFAULT_NOTIFICATION_TIME_CHANGED, () => {
-                this.manager?.getSource().getItems()?.forEach((month) => {
-                    if (!month.loaded) {
-                        return;
-                    }
-
-                    month.weeks?.forEach((week) => {
-                        week.days.forEach((day) => {
-                            AddonCalendar.scheduleEventsNotifications(day.eventsFormated || []);
-                        });
-                    });
-                });
-            }, this.currentSiteId);
-        }
-
         // Listen for events "undeleted" (offline).
         this.undeleteEventObserver = CoreEvents.on(
             AddonCalendarProvider.UNDELETED_EVENT_EVENT,
@@ -329,7 +310,6 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
      */
     ngOnDestroy(): void {
         this.undeleteEventObserver?.off();
-        this.obsDefaultTimeChange?.off();
         this.managerUnsubscribe && this.managerUnsubscribe();
     }
 
@@ -577,30 +557,22 @@ class AddonCalendarMonthSlidesItemsManagerSource extends CoreSwipeSlidesDynamicI
 
         weeks.forEach((week) => {
             week.days.forEach((day) => {
+                if (this.deletedEvents.length) {
+                    // Mark as deleted the events that were deleted in offline.
+                    day.eventsFormated?.forEach((event) => {
+                        event.deleted = this.deletedEvents.indexOf(event.id) != -1;
+                    });
+                }
 
-                // Schedule notifications for the events retrieved (only future events will be scheduled).
-                AddonCalendar.scheduleEventsNotifications(day.eventsFormated || []);
+                if (this.offlineEditedEventsIds.length) {
+                    // Remove the online events that were modified in offline.
+                    day.events = day.events.filter((event) => this.offlineEditedEventsIds.indexOf(event.id) == -1);
+                }
 
-                if (monthOfflineEvents || this.deletedEvents.length) {
-                    // There is offline data, merge it.
-
-                    if (this.deletedEvents.length) {
-                        // Mark as deleted the events that were deleted in offline.
-                        day.eventsFormated?.forEach((event) => {
-                            event.deleted = this.deletedEvents.indexOf(event.id) != -1;
-                        });
-                    }
-
-                    if (this.offlineEditedEventsIds.length) {
-                        // Remove the online events that were modified in offline.
-                        day.events = day.events.filter((event) => this.offlineEditedEventsIds.indexOf(event.id) == -1);
-                    }
-
-                    if (monthOfflineEvents && monthOfflineEvents[day.mday] && day.eventsFormated) {
-                        // Add the offline events (either new or edited).
-                        day.eventsFormated =
-                            AddonCalendarHelper.sortEvents(day.eventsFormated.concat(monthOfflineEvents[day.mday]));
-                    }
+                if (monthOfflineEvents && monthOfflineEvents[day.mday] && day.eventsFormated) {
+                    // Add the offline events (either new or edited).
+                    day.eventsFormated =
+                        AddonCalendarHelper.sortEvents(day.eventsFormated.concat(monthOfflineEvents[day.mday]));
                 }
             });
         });
diff --git a/src/addons/calendar/components/upcoming-events/upcoming-events.ts b/src/addons/calendar/components/upcoming-events/upcoming-events.ts
index a11c5f81b..8740e28fa 100644
--- a/src/addons/calendar/components/upcoming-events/upcoming-events.ts
+++ b/src/addons/calendar/components/upcoming-events/upcoming-events.ts
@@ -25,7 +25,6 @@ import { AddonCalendarHelper, AddonCalendarFilter } from '../../services/calenda
 import { AddonCalendarOffline } from '../../services/calendar-offline';
 import { CoreCategoryData, CoreCourses } from '@features/courses/services/courses';
 import { CoreConstants } from '@/core/constants';
-import { CoreLocalNotifications } from '@services/local-notifications';
 
 /**
  * Component that displays upcoming events.
@@ -58,19 +57,12 @@ export class AddonCalendarUpcomingEventsComponent implements OnInit, DoCheck, On
 
     // Observers.
     protected undeleteEventObserver: CoreEventObserver;
-    protected obsDefaultTimeChange?: CoreEventObserver;
 
     constructor(
         differs: KeyValueDiffers,
     ) {
         this.currentSiteId = CoreSites.getCurrentSiteId();
 
-        if (CoreLocalNotifications.isAvailable()) {            // Re-schedule events if default time changes.
-            this.obsDefaultTimeChange = CoreEvents.on(AddonCalendarProvider.DEFAULT_NOTIFICATION_TIME_CHANGED, () => {
-                AddonCalendar.scheduleEventsNotifications(this.onlineEvents);
-            }, this.currentSiteId);
-        }
-
         // Listen for events "undeleted" (offline).
         this.undeleteEventObserver = CoreEvents.on(
             AddonCalendarProvider.UNDELETED_EVENT_EVENT,
@@ -174,8 +166,6 @@ export class AddonCalendarUpcomingEventsComponent implements OnInit, DoCheck, On
         // Don't pass courseId and categoryId, we'll filter them locally.
         const result = await AddonCalendar.getUpcomingEvents();
         this.onlineEvents = await Promise.all(result.events.map((event) => AddonCalendarHelper.formatEventData(event)));
-        // Schedule notifications for the events retrieved.
-        AddonCalendar.scheduleEventsNotifications(this.onlineEvents);
         // Merge the online events with offline data.
         this.events = this.mergeEvents();
         // Filter events by course.
@@ -313,7 +303,6 @@ export class AddonCalendarUpcomingEventsComponent implements OnInit, DoCheck, On
      */
     ngOnDestroy(): void {
         this.undeleteEventObserver?.off();
-        this.obsDefaultTimeChange?.off();
     }
 
 }
diff --git a/src/addons/calendar/pages/day/day.page.ts b/src/addons/calendar/pages/day/day.page.ts
index b806ed84c..03b10b0b2 100644
--- a/src/addons/calendar/pages/day/day.page.ts
+++ b/src/addons/calendar/pages/day/day.page.ts
@@ -16,7 +16,6 @@ import { Component, OnInit, OnDestroy, ViewChild } from '@angular/core';
 import { IonRefresher } from '@ionic/angular';
 import { CoreApp } from '@services/app';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
-import { CoreLocalNotifications } from '@services/local-notifications';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTimeUtils } from '@services/utils/time';
@@ -70,7 +69,6 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
     protected syncObserver: CoreEventObserver;
     protected manualSyncObserver: CoreEventObserver;
     protected onlineObserver: Subscription;
-    protected obsDefaultTimeChange?: CoreEventObserver;
     protected filterChangedObserver: CoreEventObserver;
     protected managerUnsubscribe?: () => void;
 
@@ -93,15 +91,6 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
     constructor() {
         this.currentSiteId = CoreSites.getCurrentSiteId();
 
-        if (CoreLocalNotifications.isAvailable()) {
-            // Re-schedule events if default time changes.
-            this.obsDefaultTimeChange = CoreEvents.on(AddonCalendarProvider.DEFAULT_NOTIFICATION_TIME_CHANGED, () => {
-                this.manager?.getSource().getItems()?.forEach(day => {
-                    AddonCalendar.scheduleEventsNotifications(day.onlineEvents || []);
-                });
-            }, this.currentSiteId);
-        }
-
         // Listen for events added. When an event is added, reload the data.
         this.newEventObserver = CoreEvents.on(
             AddonCalendarProvider.NEW_EVENT_EVENT,
@@ -464,7 +453,6 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
         this.manualSyncObserver?.off();
         this.onlineObserver?.unsubscribe();
         this.filterChangedObserver?.off();
-        this.obsDefaultTimeChange?.off();
         this.managerUnsubscribe && this.managerUnsubscribe();
     }
 
@@ -684,9 +672,6 @@ class AddonCalendarDaySlidesItemsManagerSource extends CoreSwipeSlidesDynamicIte
             }
         }
 
-        // Schedule notifications for the events retrieved (only future events will be scheduled).
-        AddonCalendar.scheduleEventsNotifications(preloadedDay.onlineEvents || []);
-
         // Merge the online events with offline data.
         preloadedDay.events = this.mergeEvents(preloadedDay);
 
diff --git a/src/addons/calendar/pages/event/event.page.ts b/src/addons/calendar/pages/event/event.page.ts
index ac44adc68..e335e6b78 100644
--- a/src/addons/calendar/pages/event/event.page.ts
+++ b/src/addons/calendar/pages/event/event.page.ts
@@ -129,10 +129,6 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
         // Reload reminders if default notification time changes.
         this.defaultTimeChangedObserver = CoreEvents.on(AddonCalendarProvider.DEFAULT_NOTIFICATION_TIME_CHANGED, () => {
             this.loadReminders();
-
-            if (this.event) {
-                AddonCalendar.scheduleEventsNotifications([this.event]);
-            }
         }, this.currentSiteId);
 
         // Set and update current time. Use a 5 seconds error margin.
@@ -225,9 +221,8 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
                 return; // At this point we should always have the event, adding this check to avoid TS errors.
             }
 
-            // Load reminders, and re-schedule them if needed (maybe the event time has changed).
+            // Load reminders.
             this.loadReminders();
-            AddonCalendar.scheduleEventsNotifications([this.event]);
 
             // Reset some of the calculated data.
             this.categoryPath = '';
diff --git a/src/addons/calendar/services/calendar.ts b/src/addons/calendar/services/calendar.ts
index 69473fb05..6ec1cbc0e 100644
--- a/src/addons/calendar/services/calendar.ts
+++ b/src/addons/calendar/services/calendar.ts
@@ -39,6 +39,7 @@ import { SafeUrl } from '@angular/platform-browser';
 import { CoreNavigator } from '@services/navigator';
 import { AddonCalendarFilter } from './calendar-helper';
 import { AddonCalendarSyncEvents, AddonCalendarSyncProvider } from './calendar-sync';
+import { CoreEvents } from '@singletons/events';
 
 const ROOT_CACHE_KEY = 'mmaCalendar:';
 
@@ -351,6 +352,28 @@ export class AddonCalendarProvider {
             },
         );
 
+        if (CoreLocalNotifications.isAvailable()) {
+            CoreEvents.on(AddonCalendarProvider.DEFAULT_NOTIFICATION_TIME_CHANGED, async (data) => {
+                const site = await CoreSites.getSite(data.siteId);
+
+                // Get all the events that have a default reminder.
+                const query = 'SELECT events.*, reminders.id AS reminderid ' +
+                    'FROM ' + EVENTS_TABLE + ' events ' +
+                    'INNER JOIN ' + REMINDERS_TABLE + ' reminders ON events.id = reminders.eventid ' +
+                    'WHERE reminders.time IS NULL';
+
+                const result = await site.getDb().execute(query);
+
+                // Reschedule all the default reminders.
+                for (let i = 0; i < result.rows.length; i++) {
+                    const event = result.rows.item(i) as AddonCalendarEventDBRecord & {
+                        reminderid: number;
+                    };
+
+                    this.scheduleEventNotification(event, event.reminderid, null, site.getId());
+                }
+            });
+        }
     }
 
     /**
@@ -674,6 +697,9 @@ export class AddonCalendarProvider {
             const response: AddonCalendarGetCalendarEventByIdWSResponse =
                 await site.read('core_calendar_get_calendar_event_by_id', params, preSets);
 
+            this.storeEventInLocalDb(response.event, { siteId });
+            this.scheduleEventsNotifications([response.event], siteId);
+
             return response.event;
         } catch (error) {
             try {
@@ -837,6 +863,7 @@ export class AddonCalendarProvider {
         }
         const response: AddonCalendarCalendarDay = await site.read('core_calendar_get_calendar_day_view', params, preSets);
         this.storeEventsInLocalDB(response.events, { siteId });
+        this.scheduleEventsNotifications(response.events, siteId);
 
         return response;
     }
@@ -1040,7 +1067,8 @@ export class AddonCalendarProvider {
         const response = await site.read<AddonCalendarMonth>('core_calendar_get_calendar_monthly_view', params, preSets);
         response.weeks.forEach((week) => {
             week.days.forEach((day) => {
-                this.storeEventsInLocalDB(day.events as AddonCalendarCalendarEvent[], { siteId });
+                this.storeEventsInLocalDB(day.events, { siteId });
+                this.scheduleEventsNotifications(day.events, siteId);
             });
         });
 
@@ -1154,6 +1182,7 @@ export class AddonCalendarProvider {
 
         const response = await site.read<AddonCalendarUpcoming>('core_calendar_get_calendar_upcoming_view', params, preSets);
         this.storeEventsInLocalDB(response.events, { siteId });
+        this.scheduleEventsNotifications(response.events, siteId);
 
         return response;
     }
@@ -1512,7 +1541,7 @@ export class AddonCalendarProvider {
         const promises = events.map(async (event) => {
             if (event.timestart * 1000 <= Date.now()) {
                 // The event has already started, don't schedule it.
-                return this.deleteLocalEvent(event.id, siteId);
+                return;
             }
 
             const reminders = await this.getEventReminders(event.id, siteId);

From cca049eff2139538c3e0dc65dbd73bb99b0fdc46 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 11 Jan 2022 10:35:14 +0100
Subject: [PATCH 0324/1008] MOBILE-3951 ci: Use https in github URLs

---
 .github/workflows/performance.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml
index 0f886e523..923c2d09f 100644
--- a/.github/workflows/performance.yml
+++ b/.github/workflows/performance.yml
@@ -18,9 +18,9 @@ jobs:
         node-version: '${{ steps.nvmrc.outputs.node_version }}'
     - name: Additional checkouts
       run: |
-        git clone --branch master --depth 1 git://github.com/moodle/moodle $GITHUB_WORKSPACE/moodle
-        git clone --branch integration --depth 1 git://github.com/moodlehq/moodle-local_moodlemobileapp $GITHUB_WORKSPACE/moodle/local/moodlemobileapp
-        git clone --branch master --depth 1 git://github.com/moodlehq/moodle-docker $GITHUB_WORKSPACE/moodle-docker
+        git clone --branch master --depth 1 https://github.com/moodle/moodle $GITHUB_WORKSPACE/moodle
+        git clone --branch integration --depth 1 https://github.com/moodlehq/moodle-local_moodlemobileapp $GITHUB_WORKSPACE/moodle/local/moodlemobileapp
+        git clone --branch master --depth 1 https://github.com/moodlehq/moodle-docker $GITHUB_WORKSPACE/moodle-docker
     - name: Install npm packages
       run: npm ci
     - name: Generate Behat tests plugin

From e673ffe2dfaaaa99c2e6a123b0ab7759a6cd6bc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 23 Dec 2021 15:07:46 +0100
Subject: [PATCH 0325/1008] MOBILE-3954 sitehome: Fix show course section on
 sitehome

---
 src/core/features/sitehome/pages/index/index.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/core/features/sitehome/pages/index/index.ts b/src/core/features/sitehome/pages/index/index.ts
index 8e9a4d6e7..39b5d5156 100644
--- a/src/core/features/sitehome/pages/index/index.ts
+++ b/src/core/features/sitehome/pages/index/index.ts
@@ -136,6 +136,8 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
                     undefined,
                     true,
                 );
+
+                this.section.hasContent = result.hasContent;
                 this.hasContent = result.hasContent || this.hasContent;
             }
 

From 255e98741253c2731b3d0d908a6bf7c1d49a7491 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 23 Dec 2021 16:02:42 +0100
Subject: [PATCH 0326/1008] MOBILE-3954 storage: Add prefetch features on
 course storage page

---
 scripts/langindex.json                        |   1 +
 .../components/sitemainmenu/sitemainmenu.ts   |   2 +-
 src/addons/storagemanager/lang.json           |   1 +
 .../pages/course-storage/course-storage.html  |  74 ++-
 .../pages/course-storage/course-storage.scss  |   9 +
 .../pages/course-storage/course-storage.ts    | 436 ++++++++++++++++--
 .../services/handlers/course-menu.ts          |   2 +-
 .../progress-bar/core-progress-bar.html       |   2 +
 .../components/progress-bar/progress-bar.scss |   7 +
 .../components/progress-bar/progress-bar.ts   |   2 +-
 .../course/pages/contents/contents.ts         |   2 +-
 .../pages/list-mod-type/list-mod-type.page.ts |   2 +-
 .../features/course/services/course-helper.ts |  82 ++--
 .../features/sitehome/pages/index/index.html  |   2 +
 .../features/sitehome/pages/index/index.ts    |   9 +-
 src/theme/theme.base.scss                     |   4 +
 16 files changed, 538 insertions(+), 99 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 3ab3ca3a4..feedd73b5 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1106,6 +1106,7 @@
   "addon.storagemanager.deletecourses": "local_moodlemobileapp",
   "addon.storagemanager.deletedatafrom": "local_moodlemobileapp",
   "addon.storagemanager.info": "local_moodlemobileapp",
+  "addon.storagemanager.managecoursestorage": "local_moodlemobileapp",
   "addon.storagemanager.managestorage": "local_moodlemobileapp",
   "addon.storagemanager.storageused": "local_moodlemobileapp",
   "assets.countries.AD": "countries",
diff --git a/src/addons/block/sitemainmenu/components/sitemainmenu/sitemainmenu.ts b/src/addons/block/sitemainmenu/components/sitemainmenu/sitemainmenu.ts
index c0aad05ef..d550062d7 100644
--- a/src/addons/block/sitemainmenu/components/sitemainmenu/sitemainmenu.ts
+++ b/src/addons/block/sitemainmenu/components/sitemainmenu/sitemainmenu.ts
@@ -91,7 +91,7 @@ export class AddonBlockSiteMainMenuComponent extends CoreBlockBaseComponent impl
         const items = config.frontpageloggedin.split(',');
         const hasNewsItem = items.find((item) => parseInt(item, 10) == FrontPageItemNames['NEWS_ITEMS']);
 
-        const result = CoreCourseHelper.addHandlerDataForModules(
+        const result = await CoreCourseHelper.addHandlerDataForModules(
             [mainMenuBlock],
             this.siteHomeId,
             undefined,
diff --git a/src/addons/storagemanager/lang.json b/src/addons/storagemanager/lang.json
index 8efc60a30..389a65e62 100644
--- a/src/addons/storagemanager/lang.json
+++ b/src/addons/storagemanager/lang.json
@@ -4,5 +4,6 @@
     "deletedatafrom": "Offload data from {{name}}",
     "info": "Files stored on your device make the app work faster and enable the app to be used offline. You can safely offload files if you need to free up storage space.",
     "managestorage": "Manage storage",
+    "managecoursestorage": "Manage course storage",
     "storageused": "File storage used:"
 }
diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.html b/src/addons/storagemanager/pages/course-storage/course-storage.html
index 42371c995..4f1b55179 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.html
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.html
@@ -4,7 +4,7 @@
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
         <ion-title>
-            <h1>{{ 'addon.storagemanager.managestorage' | translate }}</h1>
+            <h1>{{ 'addon.storagemanager.managecoursestorage' | translate }}</h1>
         </ion-title>
     </ion-toolbar>
 </ion-header>
@@ -12,54 +12,90 @@
     <core-loading [hideUntil]="loaded">
         <ion-card class="wholecourse">
             <ion-card-header>
-                <ion-card-title *ngIf="course.displayname">{{ course.displayname }}</ion-card-title>
-                <ion-card-title *ngIf="!course.displayname">{{ course.fullname }}</ion-card-title>
+                <ion-card-title>{{ title }}</ion-card-title>
                 <p class="ion-text-wrap">{{ 'addon.storagemanager.info' | translate }}</p>
                 <ion-item class="size ion-text-wrap ion-no-padding" lines="none">
                     <ion-icon name="fas-archive" slot="start" aria-hidden="true"></ion-icon>
                     <ion-label>
                         <p class="item-heading ion-text-wrap">{{ 'addon.storagemanager.storageused' | translate }}</p>
+                        <ion-badge color="light">{{ totalSize | coreBytesToSize }}</ion-badge>
                     </ion-label>
-                    <p slot="end" class="ion-text-end">{{ totalSize | coreBytesToSize }}</p>
                     <ion-button slot="end" (click)="deleteForCourse()" [disabled]="totalSize == 0">
                         <ion-icon name="fas-trash" slot="icon-only" [attr.aria-label]="'addon.storagemanager.deletecourse' | translate">
                         </ion-icon>
                     </ion-button>
                 </ion-item>
+                <ion-button *ngIf="downloadCourseEnabled" (click)="prefetchCourse()" expand="block">
+                    <ion-icon *ngIf="!prefetchCourseData.loading" [name]="prefetchCourseData.icon" slot="start"></ion-icon>
+                    <ion-spinner *ngIf="prefetchCourseData.loading" slot="start"></ion-spinner>
+                    {{ prefetchCourseData.statusTranslatable | translate }}
+                </ion-button>
             </ion-card-header>
         </ion-card>
         <ng-container *ngFor="let section of sections">
-            <ion-card *ngIf="section.totalSize! > 0" class="section">
+            <ion-card class="section" *ngIf="section.modules.length > 0">
                 <ion-card-header>
                     <ion-item class="ion-no-padding">
                         <ion-label>
                             <p class="item-heading ion-text-wrap">{{ section.name }}</p>
+                            <ion-badge color="light" *ngIf="section.totalSize > 0">
+                                {{ section.totalSize | coreBytesToSize }}
+                            </ion-badge>
+                            <!-- Download progress. -->
+                            <p *ngIf="downloadEnabled && section.isDownloading">
+                                <core-progress-bar [progress]="section.total == 0 ? -1 : section.count / section.total">
+                                </core-progress-bar>
+                            </p>
                         </ion-label>
-                        <p slot="end" class="ion-text-end">{{ section.totalSize | coreBytesToSize }}</p>
-                        <ion-button slot="end" (click)="deleteForSection(section)">
-                            <ion-icon name="fas-trash" slot="icon-only"
-                                [attr.aria-label]="'addon.storagemanager.deletedatafrom' | translate: { name: section.name }">
-                            </ion-icon>
-                        </ion-button>
+                        <div class="storage-buttons" slot="end" *ngIf="section.totalSize > 0 || downloadEnabled">
+                            <ion-button (click)="deleteForSection(section)" *ngIf="section.totalSize > 0">
+                                <ion-icon name="fas-trash" slot="icon-only"
+                                    [attr.aria-label]="'addon.storagemanager.deletedatafrom' | translate: { name: section.name }">
+                                </ion-icon>
+                            </ion-button>
+                            <div *ngIf="downloadEnabled" slot="end" class="core-button-spinner">
+                                <core-download-refresh *ngIf="!section.isDownloading" [status]="section.downloadStatus" [enabled]="true"
+                                    (action)="prefecthSection(section)" [loading]="section.isDownloading || section.isCalculating"
+                                    [canTrustDownload]="true" size="small">
+                                </core-download-refresh>
+
+                                <ion-badge class="core-course-download-section-progress"
+                                    *ngIf="section.isDownloading && section.count < section.total" role="progressbar"
+                                    [attr.aria-valuemax]="section.total" [attr.aria-valuenow]="section.count"
+                                    [attr.aria-valuetext]="'core.course.downloadsectionprogressdescription' | translate:section">
+                                    {{section.count}} / {{section.total}}
+                                </ion-badge>
+                            </div>
+                        </div>
                     </ion-item>
                 </ion-card-header>
                 <ion-card-content>
                     <ng-container *ngFor="let module of section.modules">
-                        <ion-item class="ion-no-padding" *ngIf="module.totalSize! > 0">
-                            <core-mod-icon slot="start" *ngIf="module.handlerData!.icon" [modicon]="module.handlerData!.icon"
+                        <ion-item class="ion-no-padding"
+                            *ngIf="(downloadEnabled && module.handlerData?.showDownloadButton) || module.totalSize > 0">
+                            <core-mod-icon slot="start" *ngIf="module.handlerData.icon" [modicon]="module.handlerData.icon"
                                 [modname]="module.modname" [componentId]="module.instance">
                             </core-mod-icon>
                             <ion-label class="ion-text-wrap">
                                 <h3 class="{{module.handlerData!.class}} addon-storagemanager-module-size">
                                     {{ module.name }}
                                 </h3>
+                                <ion-badge color="light" *ngIf="module.totalSize > 0">
+                                    {{ module.totalSize | coreBytesToSize }}
+                                </ion-badge>
                             </ion-label>
-                            <p slot="end" class="ion-text-end">{{ module.totalSize | coreBytesToSize }}</p>
-                            <ion-button fill="clear" slot="end" (click)="deleteForModule(module)">
-                                <ion-icon name="fas-trash" slot="icon-only"
-                                    [attr.aria-label]="'addon.storagemanager.deletedatafrom' | translate: { name: module.name }">
-                                </ion-icon>
-                            </ion-button>
+
+                            <div class="storage-buttons" slot="end">
+                                <ion-button fill="clear" (click)="deleteForModule(module, section)" *ngIf="module.totalSize > 0">
+                                    <ion-icon name="fas-trash" slot="icon-only"
+                                        [attr.aria-label]="'addon.storagemanager.deletedatafrom' | translate: { name: module.name }">
+                                    </ion-icon>
+                                </ion-button>
+                                <core-download-refresh *ngIf="downloadEnabled && module.handlerData?.showDownloadButton"
+                                    [status]="module.downloadStatus" [enabled]="true" [canTrustDownload]="true" size="small"
+                                    [loading]="module.spinner || module.handlerData.spinner" (action)="prefetchModule(module, section)">
+                                </core-download-refresh>
+                            </div>
                         </ion-item>
                     </ng-container>
                 </ion-card-content>
diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.scss b/src/addons/storagemanager/pages/course-storage/course-storage.scss
index 4e413a248..5e459df34 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.scss
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.scss
@@ -9,3 +9,12 @@
         font-size: 1.2rem;
     }
 }
+
+.storage-buttons {
+    display: flex;
+    align-items: center;
+}
+
+ion-item {
+    --inner-padding-end: 0px;
+}
diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.ts b/src/addons/storagemanager/pages/course-storage/course-storage.ts
index 80e28b258..3abf047de 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.ts
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.ts
@@ -13,37 +13,77 @@
 // limitations under the License.
 
 import { CoreConstants } from '@/core/constants';
-import { Component, OnInit } from '@angular/core';
-import { CoreCourse } from '@features/course/services/course';
-import { CoreCourseHelper, CoreCourseModuleData, CoreCourseSection } from '@features/course/services/course-helper';
-import { CoreCourseModulePrefetchDelegate } from '@features/course/services/module-prefetch-delegate';
-import { CoreEnrolledCourseData } from '@features/courses/services/courses';
+import { Component, OnDestroy, OnInit } from '@angular/core';
+import { CoreCourse, CoreCourseProvider } from '@features/course/services/course';
+import {
+    CoreCourseHelper,
+    CoreCourseModuleData,
+    CoreCourseSectionWithStatus,
+    CorePrefetchStatusInfo,
+} from '@features/course/services/course-helper';
+import {
+    CoreCourseModulePrefetchDelegate,
+    CoreCourseModulePrefetchHandler } from '@features/course/services/module-prefetch-delegate';
+import { CoreCourses, CoreEnrolledCourseData } from '@features/courses/services/courses';
 import { CoreNavigator } from '@services/navigator';
+import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
+import { CoreUtils } from '@services/utils/utils';
 import { Translate } from '@singletons';
+import { CoreEventObserver, CoreEvents } from '@singletons/events';
 
 /**
  * Page that displays the amount of file storage used by each activity on the course, and allows
- * the user to delete these files.
+ * the user to prefecth and delete this data.
  */
 @Component({
     selector: 'page-addon-storagemanager-course-storage',
     templateUrl: 'course-storage.html',
     styleUrls: ['course-storage.scss'],
 })
-export class AddonStorageManagerCourseStoragePage implements OnInit {
+export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
 
-    course!: CoreEnrolledCourseData;
+    course?: CoreEnrolledCourseData;
+    courseId!: number;
+    title = '';
     loaded = false;
     sections: AddonStorageManagerCourseSection[] = [];
     totalSize = 0;
 
+    downloadEnabled = false;
+    downloadCourseEnabled = false;
+
+    prefetchCourseData: CorePrefetchStatusInfo = {
+        icon: CoreConstants.ICON_LOADING,
+        statusTranslatable: 'core.course.downloadcourse',
+        status: '',
+        loading: true,
+    };
+
+    protected siteUpdatedObserver?: CoreEventObserver;
+    protected courseStatusObserver?: CoreEventObserver;
+    protected sectionStatusObserver?: CoreEventObserver;
+    protected moduleStatusObserver?: CoreEventObserver;
+    protected isDestroyed = false;
+    protected isGuest = false;
+
+    constructor() {
+        // Refresh the enabled flags if site is updated.
+        this.siteUpdatedObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, () => {
+            this.downloadCourseEnabled = !!this.course && !CoreCourses.isDownloadCourseDisabledInSite();
+            this.downloadEnabled = !CoreSites.getRequiredCurrentSite().isOfflineDisabled();
+
+            this.initCoursePrefetch();
+            this.initModulePrefetch();
+        }, CoreSites.getCurrentSiteId());
+    }
+
     /**
-     * View loaded.
+     * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
         try {
-            this.course = CoreNavigator.getRequiredRouteParam<CoreEnrolledCourseData>('course');
+            this.courseId = CoreNavigator.getRequiredRouteParam('courseId');
         } catch (error) {
             CoreDomUtils.showErrorModal(error);
 
@@ -52,16 +92,160 @@ export class AddonStorageManagerCourseStoragePage implements OnInit {
             return;
         }
 
-        const sections = await CoreCourse.getSections(this.course.id, false, true);
-        this.sections = CoreCourseHelper.addHandlerDataForModules(sections, this.course.id).sections;
+        this.course = CoreNavigator.getRouteParam<CoreEnrolledCourseData>('course');
+        this.title = this.course?.displayname ?? this.course?.fullname ?? '';
+        if (!this.title && this.courseId == CoreSites.getCurrentSiteHomeId()) {
+            this.title = Translate.instant('core.sitehome.sitehome');
+        }
 
+        this.isGuest = !!CoreNavigator.getRouteBooleanParam('isGuest');
+
+        this.downloadCourseEnabled = !!this.course && !CoreCourses.isDownloadCourseDisabledInSite();
+        this.downloadEnabled = !CoreSites.getRequiredCurrentSite().isOfflineDisabled();
+
+        const sections = await CoreCourse.getSections(this.courseId, false, true);
+        this.sections = (await CoreCourseHelper.addHandlerDataForModules(sections, this.courseId)).sections
+            .map((section) => ({ ...section, totalSize: 0 }));
+
+        await Promise.all([
+            this.loadSizes(),
+            this.initCoursePrefetch(),
+            this.initModulePrefetch(),
+        ]);
+
+        this.loaded = true;
+    }
+
+    /**
+     * Init course prefetch information.
+     *
+     * @return Promise resolved when done.
+     */
+    protected async initCoursePrefetch(): Promise<void> {
+        if (!this.downloadCourseEnabled || this.courseStatusObserver) {
+            return;
+        }
+
+        // Listen for changes in course status.
+        this.courseStatusObserver = CoreEvents.on(CoreEvents.COURSE_STATUS_CHANGED, (data) => {
+            if (data.courseId == this.courseId || data.courseId == CoreCourseProvider.ALL_COURSES_CLEARED) {
+                this.updateCourseStatus(data.status);
+            }
+        }, CoreSites.getCurrentSiteId());
+
+        // Determine the course prefetch status.
+        await this.determineCoursePrefetchIcon();
+
+        if (this.prefetchCourseData.icon != CoreConstants.ICON_LOADING) {
+            return;
+        }
+
+        // Course is being downloaded. Get the download promise.
+        const promise = CoreCourseHelper.getCourseDownloadPromise(this.courseId);
+        if (promise) {
+            // There is a download promise. Show an error if it fails.
+            promise.catch((error) => {
+                if (!this.isDestroyed) {
+                    CoreDomUtils.showErrorModalDefault(error, 'core.course.errordownloadingcourse', true);
+                }
+            });
+        } else {
+            // No download, this probably means that the app was closed while downloading. Set previous status.
+            const status = await CoreCourse.setCoursePreviousStatus(this.courseId);
+
+            this.updateCourseStatus(status);
+        }
+    }
+
+    /**
+     * Init module prefetch information.
+     *
+     * @return Promise resolved when done.
+     */
+    protected async initModulePrefetch(): Promise<void> {
+        if (!this.downloadEnabled || this.sectionStatusObserver) {
+            return;
+        }
+
+        // Listen for section status changes.
+        this.sectionStatusObserver = CoreEvents.on(
+            CoreEvents.SECTION_STATUS_CHANGED,
+            async (data) => {
+                if (!this.downloadEnabled || !this.sections.length || !data.sectionId || data.courseId != this.courseId) {
+                    return;
+                }
+
+                // Check if the affected section is being downloaded.
+                // If so, we don't update section status because it'll already be updated when the download finishes.
+                const downloadId = CoreCourseHelper.getSectionDownloadId({ id: data.sectionId });
+                if (CoreCourseModulePrefetchDelegate.isBeingDownloaded(downloadId)) {
+                    return;
+                }
+
+                // Get the affected section.
+                const section = this.sections.find(section => section.id == data.sectionId);
+                if (!section) {
+                    return;
+                }
+
+                // Recalculate the status.
+                await CoreCourseHelper.calculateSectionStatus(section, this.courseId, false);
+
+                if (section.isDownloading && !CoreCourseModulePrefetchDelegate.isBeingDownloaded(downloadId)) {
+                    // All the modules are now downloading, set a download all promise.
+                    this.prefecthSection(section);
+                }
+            },
+            CoreSites.getCurrentSiteId(),
+        );
+
+        // The download status of a section might have been changed from within a module page.
+        CoreCourseHelper.calculateSectionsStatus(this.sections, this.courseId, false, false);
+
+        this.sections.forEach((section) => {
+            section.modules.forEach((module) => {
+                if (module.handlerData?.showDownloadButton) {
+
+                    module.spinner = true;
+                    // Listen for changes on this module status, even if download isn't enabled.
+                    module.prefetchHandler = CoreCourseModulePrefetchDelegate.getPrefetchHandlerFor(module.modname);
+                    this.calculateModuleStatus(module);
+                }
+            });
+        });
+
+        this.moduleStatusObserver = CoreEvents.on(CoreEvents.PACKAGE_STATUS_CHANGED, (data) => {
+            let module: AddonStorageManagerModule | undefined;
+
+            this.sections.some((section) => {
+                module = section.modules.find((module) =>
+                    module.id == data.componentId && module.prefetchHandler && data.component == module.prefetchHandler?.component);
+
+                return !!module;
+            });
+
+            if (!module) {
+                return;
+            }
+
+            // Call determineModuleStatus to get the right status to display.
+            const status = CoreCourseModulePrefetchDelegate.determineModuleStatus(module, data.status);
+
+            // Update the status.
+            this.updateModuleStatus(module, status);
+        }, CoreSites.getCurrentSiteId());
+    }
+
+    /**
+     * Init section, course and modules sizes.
+     */
+    protected async loadSizes(): Promise<void> {
         this.totalSize = 0;
 
         const promises: Promise<void>[] = [];
         this.sections.forEach((section) => {
             section.totalSize = 0;
             section.modules.forEach((module) => {
-                module.parentSection = section;
                 module.totalSize = 0;
 
                 // Note: This function only gets the size for modules which are downloadable.
@@ -71,11 +255,11 @@ export class AddonStorageManagerCourseStoragePage implements OnInit {
                 // But these aren't necessarily consistent, for example mod_frog vs mmaModFrog.
                 // There is nothing enforcing correct values.
                 // Most modules which have large files are downloadable, so I think this is sufficient.
-                const promise = CoreCourseModulePrefetchDelegate.getModuleStoredSize(module, this.course.id).then((size) => {
+                const promise = CoreCourseModulePrefetchDelegate.getModuleStoredSize(module, this.courseId).then((size) => {
                     // There are some cases where the return from this is not a valid number.
                     if (!isNaN(size)) {
                         module.totalSize = Number(size);
-                        section.totalSize! += size;
+                        section.totalSize += size;
                         this.totalSize += size;
                     }
 
@@ -86,8 +270,8 @@ export class AddonStorageManagerCourseStoragePage implements OnInit {
         });
 
         await Promise.all(promises);
-        this.loaded = true;
 
+        // Mark course as not downloaded if course size is 0.
         if (this.totalSize == 0) {
             this.markCourseAsNotDownloaded();
         }
@@ -146,15 +330,16 @@ export class AddonStorageManagerCourseStoragePage implements OnInit {
             }
         });
 
-        this.deleteModules(modules);
+        this.deleteModules(modules, section);
     }
 
     /**
      * The user has requested a delete for a module's data
      *
      * @param module Module details
+     * @param section Section the module belongs to.
      */
-    async deleteForModule(module: AddonStorageManagerModule): Promise<void> {
+    async deleteForModule(module: AddonStorageManagerModule, section: AddonStorageManagerCourseSection): Promise<void> {
         if (module.totalSize === 0) {
             return;
         }
@@ -169,25 +354,29 @@ export class AddonStorageManagerCourseStoragePage implements OnInit {
             return;
         }
 
-        this.deleteModules([module]);
+        this.deleteModules([module], section);
     }
 
     /**
      * Deletes the specified modules, showing the loading overlay while it happens.
      *
      * @param modules Modules to delete
+     * @param section Section the modules belong to.
      * @return Promise<void> Once deleting has finished
      */
-    protected async deleteModules(modules: AddonStorageManagerModule[]): Promise<void> {
+    protected async deleteModules(modules: AddonStorageManagerModule[], section?: AddonStorageManagerCourseSection): Promise<void> {
         const modal = await CoreDomUtils.showModalLoading();
 
         const promises: Promise<void>[] = [];
         modules.forEach((module) => {
             // Remove the files.
-            const promise = CoreCourseHelper.removeModuleStoredData(module, this.course.id).then(() => {
+            const promise = CoreCourseHelper.removeModuleStoredData(module, this.courseId).then(() => {
+                const moduleSize = module.totalSize || 0;
                 // When the files and cache are removed, update the size.
-                module.parentSection!.totalSize! -= module.totalSize!;
-                this.totalSize -= module.totalSize!;
+                if (section) {
+                    section.totalSize -= moduleSize;
+                }
+                this.totalSize -= moduleSize;
                 module.totalSize = 0;
 
                 return;
@@ -203,13 +392,8 @@ export class AddonStorageManagerCourseStoragePage implements OnInit {
         } finally {
             modal.dismiss();
 
-            // @TODO This is a workaround that should be more specific solving MOBILE-3305.
-            // Also should take into account all modules are not downloaded.
-
-            // Mark course as not downloaded if course size is 0.
-            if (this.totalSize == 0) {
-                this.markCourseAsNotDownloaded();
-            }
+            await this.loadSizes();
+            CoreCourseHelper.calculateSectionsStatus(this.sections, this.courseId, false, false);
         }
     }
 
@@ -221,17 +405,201 @@ export class AddonStorageManagerCourseStoragePage implements OnInit {
         // Also should take into account all modules are not downloaded.
         // Check after MOBILE-3188 is integrated.
 
-        CoreCourse.setCourseStatus(this.course.id, CoreConstants.NOT_DOWNLOADED);
+        CoreCourse.setCourseStatus(this.courseId, CoreConstants.NOT_DOWNLOADED);
+    }
+
+    /**
+     * Calculate the status of sections.
+     *
+     * @param refresh If refresh or not.
+     */
+    protected calculateSectionsStatus(refresh?: boolean): void {
+        if (!this.sections) {
+            return;
+        }
+
+        CoreUtils.ignoreErrors(CoreCourseHelper.calculateSectionsStatus(this.sections, this.courseId, refresh));
+    }
+
+    /**
+     * Confirm and prefetch a section. If the section is "all sections", prefetch all the sections.
+     *
+     * @param section Section to download.
+     * @param refresh Refresh clicked (not used).
+     */
+    async prefecthSection(section: AddonStorageManagerCourseSection): Promise<void> {
+        section.isCalculating = true;
+
+        try {
+            await CoreCourseHelper.confirmDownloadSizeSection(this.courseId, section, this.sections);
+
+            try {
+                await CoreCourseHelper.prefetchSection(section, this.courseId, this.sections);
+
+            } catch (error) {
+                if (!this.isDestroyed) {
+                    CoreDomUtils.showErrorModalDefault(error, 'core.course.errordownloadingsection', true);
+                }
+            } finally {
+                await this.loadSizes();
+            }
+        } catch (error) {
+            // User cancelled or there was an error calculating the size.
+            if (!this.isDestroyed && error) {
+                CoreDomUtils.showErrorModal(error);
+
+                return;
+            }
+        } finally {
+            section.isCalculating = false;
+        }
+    }
+
+    /**
+     * Download the module.
+     *
+     * @param module Module to prefetch.
+     * @param refresh Whether it's refreshing.
+     * @return Promise resolved when done.
+     */
+    async prefetchModule(
+        module: AddonStorageManagerModule,
+        refresh = false,
+    ): Promise<void> {
+        if (!module.prefetchHandler) {
+            return;
+        }
+
+        // Show spinner since this operation might take a while.
+        module.spinner = true;
+
+        try {
+            // Get download size to ask for confirm if it's high.
+            const size = await module.prefetchHandler.getDownloadSize(module, module.course, true);
+
+            await CoreCourseHelper.prefetchModule(module.prefetchHandler, module, size, module.course, refresh);
+
+            CoreCourseHelper.calculateSectionsStatus(this.sections, this.courseId, false, false);
+        } catch (error) {
+            if (!this.isDestroyed) {
+                CoreDomUtils.showErrorModalDefault(error, 'core.errordownloading', true);
+            }
+        } finally {
+            module.spinner = false;
+
+            await this.loadSizes();
+        }
+    }
+
+    /**
+     * Show download buttons according to module status.
+     *
+     * @param module Module to update.
+     * @param status Module status.
+     */
+    protected updateModuleStatus(module: AddonStorageManagerModule, status: string): void {
+        if (!status) {
+            return;
+        }
+
+        module.spinner = false;
+        module.downloadStatus = status;
+
+        module.handlerData?.updateStatus?.(status);
+    }
+
+    /**
+     * Calculate and show module status.
+     *
+     * @param module Module to update.
+     * @return Promise resolved when done.
+     */
+    protected async calculateModuleStatus(module: AddonStorageManagerModule): Promise<void> {
+        if (!module) {
+            return;
+        }
+
+        const status = await CoreCourseModulePrefetchDelegate.getModuleStatus(module, this.courseId);
+
+        this.updateModuleStatus(module, status);
+    }
+
+    /**
+     * Determines the prefetch icon of the course.
+     *
+     * @return Promise resolved when done.
+     */
+    protected async determineCoursePrefetchIcon(): Promise<void> {
+        this.prefetchCourseData = await CoreCourseHelper.getCourseStatusIconAndTitle(this.courseId);
+    }
+
+    /**
+     * Update the course status icon and title.
+     *
+     * @param status Status to show.
+     */
+    protected updateCourseStatus(status: string): void {
+        const statusData = CoreCourseHelper.getCoursePrefetchStatusInfo(status);
+
+        this.prefetchCourseData.status = statusData.status;
+        this.prefetchCourseData.icon = statusData.icon;
+        this.prefetchCourseData.statusTranslatable = statusData.statusTranslatable;
+        this.prefetchCourseData.loading = statusData.loading;
+    }
+
+    /**
+     * Prefetch the whole course.
+     */
+    async prefetchCourse(): Promise<void> {
+        if (!this.course) {
+            return;
+        }
+
+        try {
+            await CoreCourseHelper.confirmAndPrefetchCourse(
+                this.prefetchCourseData,
+                this.course,
+                {
+                    sections: this.sections,
+                    isGuest: this.isGuest,
+                },
+            );
+        } catch (error) {
+            if (this.isDestroyed) {
+                return;
+            }
+
+            CoreDomUtils.showErrorModalDefault(error, 'core.course.errordownloadingcourse', true);
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    ngOnDestroy(): void {
+        this.courseStatusObserver?.off();
+        this.sectionStatusObserver?.off();
+        this.moduleStatusObserver?.off();
+        this.siteUpdatedObserver?.off();
+
+        this.sections.forEach((section) => {
+            section.modules.forEach((module) => {
+                module.handlerData?.onDestroy?.();
+            });
+        });
+        this.isDestroyed = true;
     }
 
 }
 
-type AddonStorageManagerCourseSection = Omit<CoreCourseSection, 'modules'> & {
-    totalSize?: number;
+type AddonStorageManagerCourseSection = Omit<CoreCourseSectionWithStatus, 'modules'> & {
+    totalSize: number;
     modules: AddonStorageManagerModule[];
 };
 
 type AddonStorageManagerModule = CoreCourseModuleData & {
-    parentSection?: AddonStorageManagerCourseSection;
     totalSize?: number;
+    prefetchHandler?: CoreCourseModulePrefetchHandler;
+    spinner?: boolean;
+    downloadStatus?: string;
 };
diff --git a/src/addons/storagemanager/services/handlers/course-menu.ts b/src/addons/storagemanager/services/handlers/course-menu.ts
index 3d9cc77d1..14111d513 100644
--- a/src/addons/storagemanager/services/handlers/course-menu.ts
+++ b/src/addons/storagemanager/services/handlers/course-menu.ts
@@ -49,7 +49,7 @@ export class AddonStorageManagerCourseMenuHandlerService implements CoreCourseOp
     ): CoreCourseOptionsMenuHandlerData {
         return {
             icon: 'fas-archive',
-            title: 'addon.storagemanager.managestorage',
+            title: 'addon.storagemanager.managecoursestorage',
             page: 'storage/' + course.id,
             class: 'addon-storagemanager-coursemenu-handler',
         };
diff --git a/src/core/components/progress-bar/core-progress-bar.html b/src/core/components/progress-bar/core-progress-bar.html
index 6d62b02e0..7178621c7 100644
--- a/src/core/components/progress-bar/core-progress-bar.html
+++ b/src/core/components/progress-bar/core-progress-bar.html
@@ -7,3 +7,5 @@
         {{ 'core.percentagenumber' | translate: {$a: text} }}
     </div>
 </ng-container>
+
+<ion-progress-bar *ngIf="progress < 0" type="indeterminate"></ion-progress-bar>
diff --git a/src/core/components/progress-bar/progress-bar.scss b/src/core/components/progress-bar/progress-bar.scss
index d50a1f078..41584f3f8 100644
--- a/src/core/components/progress-bar/progress-bar.scss
+++ b/src/core/components/progress-bar/progress-bar.scss
@@ -35,4 +35,11 @@
             border-radius: 0;
         }
     }
+
+    ion-progress-bar {
+        --progress-background: var(--color);
+        height: var(--height);
+        margin-top: calc((var(--line-height) - var(--height)) /2);
+        margin-bottom: calc((var(--line-height) - var(--height)) /2);
+    }
 }
diff --git a/src/core/components/progress-bar/progress-bar.ts b/src/core/components/progress-bar/progress-bar.ts
index ae6f86fcc..1b2e1fd56 100644
--- a/src/core/components/progress-bar/progress-bar.ts
+++ b/src/core/components/progress-bar/progress-bar.ts
@@ -30,7 +30,7 @@ import { DomSanitizer, Translate } from '@singletons';
 })
 export class CoreProgressBarComponent implements OnChanges {
 
-    @Input() progress!: number | string; // Percentage from 0 to 100.
+    @Input() progress!: number | string; // Percentage from 0 to 100. Negative number will show an indeterminate progress bar.
     @Input() text?: string; // Percentage in text to be shown at the right. If not defined, progress will be used.
     @Input() a11yText?: string; // Accessibility text to read before the percentage.
     @Input() ariaDescribedBy?: string; // ID of the element that described the progress, if any.
diff --git a/src/core/features/course/pages/contents/contents.ts b/src/core/features/course/pages/contents/contents.ts
index 768cfc65f..03662c5b4 100644
--- a/src/core/features/course/pages/contents/contents.ts
+++ b/src/core/features/course/pages/contents/contents.ts
@@ -314,7 +314,7 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
         }
 
         // Add handlers
-        const result = CoreCourseHelper.addHandlerDataForModules(
+        const result = await CoreCourseHelper.addHandlerDataForModules(
             sections,
             this.course.id,
             completionStatus,
diff --git a/src/core/features/course/pages/list-mod-type/list-mod-type.page.ts b/src/core/features/course/pages/list-mod-type/list-mod-type.page.ts
index 735cfc346..38e6cccf2 100644
--- a/src/core/features/course/pages/list-mod-type/list-mod-type.page.ts
+++ b/src/core/features/course/pages/list-mod-type/list-mod-type.page.ts
@@ -105,7 +105,7 @@ export class CoreCourseListModTypePage implements OnInit {
                 return section.modules.length > 0;
             });
 
-            const result = CoreCourseHelper.addHandlerDataForModules(sections, this.courseId);
+            const result = await CoreCourseHelper.addHandlerDataForModules(sections, this.courseId);
 
             this.sections = result.sections;
         } catch (error) {
diff --git a/src/core/features/course/services/course-helper.ts b/src/core/features/course/services/course-helper.ts
index 071faa626..cfde46f6f 100644
--- a/src/core/features/course/services/course-helper.ts
+++ b/src/core/features/course/services/course-helper.ts
@@ -168,58 +168,60 @@ export class CoreCourseHelperProvider {
      * @param forCoursePage Whether the data will be used to render the course page.
      * @return Whether the sections have content.
      */
-    addHandlerDataForModules(
+    async addHandlerDataForModules(
         sections: CoreCourseWSSection[],
         courseId: number,
         completionStatus?: Record<string, CoreCourseCompletionActivityStatus>,
         courseName?: string,
         forCoursePage = false,
-    ): { hasContent: boolean; sections: CoreCourseSection[] } {
+    ): Promise<{ hasContent: boolean; sections: CoreCourseSection[] }> {
 
         let hasContent = false;
 
-        const formattedSections = sections.map<CoreCourseSection>((courseSection) => {
-            const section = {
-                ...courseSection,
-                hasContent: this.sectionHasContent(courseSection),
-            };
+        const formattedSections = await Promise.all(
+            sections.map<Promise<CoreCourseSection>>(async (courseSection) => {
+                const section = {
+                    ...courseSection,
+                    hasContent: this.sectionHasContent(courseSection),
+                };
 
-            if (!section.hasContent) {
-                return section;
-            }
-
-            hasContent = true;
-
-            section.modules.forEach(async (module) => {
-                module.handlerData = await CoreCourseModuleDelegate.getModuleDataFor(
-                    module.modname,
-                    module,
-                    courseId,
-                    section.id,
-                    forCoursePage,
-                );
-
-                if (!module.completiondata && completionStatus && completionStatus[module.id] !== undefined) {
-                    // Should not happen on > 3.6. Check if activity has completions and if it's marked.
-                    const activityStatus = completionStatus[module.id];
-
-                    module.completiondata = {
-                        state: activityStatus.state,
-                        timecompleted: activityStatus.timecompleted,
-                        overrideby: activityStatus.overrideby || 0,
-                        valueused: activityStatus.valueused,
-                        tracking: activityStatus.tracking,
-                        courseId,
-                        cmid: module.id,
-                    };
+                if (!section.hasContent) {
+                    return section;
                 }
 
-                // Check if the module is stealth.
-                module.isStealth = module.visibleoncoursepage === 0 || (!!module.visible && !section.visible);
-            });
+                hasContent = true;
 
-            return section;
-        });
+                await Promise.all(section.modules.map(async (module) => {
+                    module.handlerData = await CoreCourseModuleDelegate.getModuleDataFor(
+                        module.modname,
+                        module,
+                        courseId,
+                        section.id,
+                        forCoursePage,
+                    );
+
+                    if (!module.completiondata && completionStatus && completionStatus[module.id] !== undefined) {
+                        // Should not happen on > 3.6. Check if activity has completions and if it's marked.
+                        const activityStatus = completionStatus[module.id];
+
+                        module.completiondata = {
+                            state: activityStatus.state,
+                            timecompleted: activityStatus.timecompleted,
+                            overrideby: activityStatus.overrideby || 0,
+                            valueused: activityStatus.valueused,
+                            tracking: activityStatus.tracking,
+                            courseId,
+                            cmid: module.id,
+                        };
+                    }
+
+                    // Check if the module is stealth.
+                    module.isStealth = module.visibleoncoursepage === 0 || (!!module.visible && !section.visible);
+                }));
+
+                return section;
+            }),
+        );
 
         return { hasContent, sections: formattedSections };
     }
diff --git a/src/core/features/sitehome/pages/index/index.html b/src/core/features/sitehome/pages/index/index.html
index 9220391ae..e7437c3c7 100644
--- a/src/core/features/sitehome/pages/index/index.html
+++ b/src/core/features/sitehome/pages/index/index.html
@@ -7,6 +7,8 @@
             (action)="switchDownload()" iconAction="toggle" [(toggle)]="downloadEnabled"></core-context-menu-item>
         <core-context-menu-item [priority]="500" [content]="'addon.storagemanager.managestorage' | translate"
             (action)="manageCoursesStorage()" iconAction="fas-archive"></core-context-menu-item>
+        <core-context-menu-item [priority]="400" [content]="'addon.storagemanager.managecoursestorage' | translate"
+            (action)="manageCourseStorage()" iconAction="fas-archive"></core-context-menu-item>
     </core-context-menu>
 </core-navbar-buttons>
 <ion-content>
diff --git a/src/core/features/sitehome/pages/index/index.ts b/src/core/features/sitehome/pages/index/index.ts
index 39b5d5156..4d6cc23a4 100644
--- a/src/core/features/sitehome/pages/index/index.ts
+++ b/src/core/features/sitehome/pages/index/index.ts
@@ -129,7 +129,7 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
             // Check "Include a topic section" setting from numsections.
             this.section = config.numsections ? sections.find((section) => section.section == 1) : undefined;
             if (this.section) {
-                const result = CoreCourseHelper.addHandlerDataForModules(
+                const result = await CoreCourseHelper.addHandlerDataForModules(
                     [this.section],
                     this.siteHomeId,
                     undefined,
@@ -200,6 +200,13 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
         CoreNavigator.navigateToSitePath('/storage');
     }
 
+    /**
+     * Open page to manage course storage.
+     */
+    manageCourseStorage(): void {
+        CoreNavigator.navigateToSitePath('/storage/' + this.siteHomeId);
+    }
+
     /**
      * Go to search courses.
      */
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index ff09724da..c045c2469 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -213,6 +213,10 @@ ion-button.button-outline {
     --background: var(--contrast-background);
 }
 
+ion-button ion-spinner {
+    --color: inherit !important;
+}
+
 @each $color-name, $value in $colors {
     .text-#{$color-name},
     p.text-#{$color-name} {

From 018ebd6bb2e7fb55cf423b596f86f79defbb84a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 23 Dec 2021 15:11:21 +0100
Subject: [PATCH 0327/1008] MOBILE-3954 course: Remove prefetch module from
 course and blocks

---
 .../addon-block-sitemainmenu.html             |   3 +-
 .../side-blocks-button/side-blocks-button.ts  |   2 -
 .../components/side-blocks/side-blocks.html   |   3 +-
 .../components/side-blocks/side-blocks.ts     |   1 -
 .../components/format/core-course-format.html |  39 +----
 .../course/components/format/format.scss      |  15 --
 .../course/components/format/format.ts        | 127 +--------------
 .../components/module/core-course-module.html |  12 +-
 .../course/components/module/module.ts        | 138 +----------------
 .../core-course-format-single-activity.html   |   2 +-
 .../components/singleactivity.ts              |   1 -
 .../handlers/singleactivity-format.ts         |   7 -
 .../course/pages/contents/contents.html       |  10 +-
 .../course/pages/contents/contents.ts         | 146 +-----------------
 .../pages/list-mod-type/list-mod-type.html    |   3 +-
 .../pages/list-mod-type/list-mod-type.page.ts |   3 -
 .../course/services/format-delegate.ts        |  13 +-
 .../services/handlers/default-format.ts       |  11 --
 .../courses/pages/dashboard/dashboard.html    |   2 +-
 .../features/sitehome/pages/index/index.html  |  10 +-
 .../features/sitehome/pages/index/index.ts    |  22 +--
 .../classes/handlers/course-format-handler.ts |   7 -
 upgrade.txt                                   |   1 +
 23 files changed, 30 insertions(+), 548 deletions(-)

diff --git a/src/addons/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html b/src/addons/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html
index c650ba61e..de45bf3af 100644
--- a/src/addons/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html
+++ b/src/addons/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html
@@ -12,7 +12,6 @@
             </ion-label>
         </ion-item>
 
-        <core-course-module *ngFor="let module of mainMenuBlock.modules" [module]="module" [courseId]="siteHomeId"
-            [downloadEnabled]="downloadEnabled" [section]="mainMenuBlock"></core-course-module>
+        <core-course-module *ngFor="let module of mainMenuBlock.modules" [module]="module" [section]="mainMenuBlock"></core-course-module>
     </ng-container>
 </core-loading>
diff --git a/src/core/features/block/components/side-blocks-button/side-blocks-button.ts b/src/core/features/block/components/side-blocks-button/side-blocks-button.ts
index 71f3e4898..bd59a030a 100644
--- a/src/core/features/block/components/side-blocks-button/side-blocks-button.ts
+++ b/src/core/features/block/components/side-blocks-button/side-blocks-button.ts
@@ -27,7 +27,6 @@ import { CoreBlockSideBlocksComponent } from '../side-blocks/side-blocks';
 export class CoreBlockSideBlocksButtonComponent {
 
     @Input() courseId!: number;
-    @Input() downloadEnabled = false;
 
     /**
      * Open side blocks.
@@ -37,7 +36,6 @@ export class CoreBlockSideBlocksButtonComponent {
             component: CoreBlockSideBlocksComponent,
             componentProps: {
                 courseId: this.courseId,
-                downloadEnabled: this.downloadEnabled,
             },
         });
     }
diff --git a/src/core/features/block/components/side-blocks/side-blocks.html b/src/core/features/block/components/side-blocks/side-blocks.html
index 4b08c5b01..198cb21d2 100644
--- a/src/core/features/block/components/side-blocks/side-blocks.html
+++ b/src/core/features/block/components/side-blocks/side-blocks.html
@@ -17,8 +17,7 @@
     <core-loading [hideUntil]="loaded">
         <ion-list *ngIf="blocks.length > 0">
             <ng-container *ngFor="let block of blocks">
-                <core-block *ngIf="block.visible" [block]="block" contextLevel="course" [instanceId]="courseId"
-                    [extraData]="{'downloadEnabled': downloadEnabled}"></core-block>
+                <core-block *ngIf="block.visible" [block]="block" contextLevel="course" [instanceId]="courseId"></core-block>
             </ng-container>
         </ion-list>
 
diff --git a/src/core/features/block/components/side-blocks/side-blocks.ts b/src/core/features/block/components/side-blocks/side-blocks.ts
index 0f817a4a0..b44b32557 100644
--- a/src/core/features/block/components/side-blocks/side-blocks.ts
+++ b/src/core/features/block/components/side-blocks/side-blocks.ts
@@ -33,7 +33,6 @@ import { CoreCoursesDashboard } from '@features/courses/services/dashboard';
 export class CoreBlockSideBlocksComponent implements OnInit {
 
     @Input() courseId?: number;
-    @Input() downloadEnabled = false;
 
     @ViewChildren(CoreBlockComponent) blocksComponents?: QueryList<CoreBlockComponent>;
 
diff --git a/src/core/features/course/components/format/core-course-format.html b/src/core/features/course/components/format/core-course-format.html
index e4b211c67..7e549a3c2 100644
--- a/src/core/features/course/components/format/core-course-format.html
+++ b/src/core/features/course/components/format/core-course-format.html
@@ -11,10 +11,8 @@
     <core-loading [hideUntil]="loaded">
         <!-- Section selector. -->
         <core-dynamic-component [component]="sectionSelectorComponent" [data]="data">
-
             <div *ngIf="displaySectionSelector && sections && hasSeveralSections"
-                class="ion-text-wrap ion-justify-content-between ion-align-items-center core-button-selector-row"
-                [class.core-section-download]="downloadEnabled">
+                class="ion-text-wrap ion-justify-content-between ion-align-items-center core-button-selector-row">
                 <core-combobox [modalOptions]="sectionSelectorModalOptions" interface="modal" listboxId="core-course-section-button"
                     icon="fas-folder" [label]="'core.course.section' | translate"
                     [selection]="selectedSection ? selectedSection.name : 'core.course.sections' | translate"
@@ -26,16 +24,14 @@
                         <ng-container *ngIf="!selectedSection">{{ 'core.course.sections' | translate }}</ng-container>
                     </span>
                 </core-combobox>
-                <!-- Section download. -->
-                <ng-container *ngTemplateOutlet="sectionDownloadTemplate; context: {section: selectedSection}"></ng-container>
             </div>
         </core-dynamic-component>
 
         <!-- Course summary. By default we only display the course progress. -->
         <core-dynamic-component [component]="courseSummaryComponent" [data]="data">
-            <ion-list lines="none" class="core-format-progress-list" *ngIf="imageThumb || (selectedSection?.id == allSectionsId && progress !== undefined) ||
+            <ion-list *ngIf="imageThumb || (selectedSection?.id == allSectionsId && progress !== undefined) ||
                     (selectedSection && selectedSection.id != allSectionsId &&
-                    (selectedSection.availabilityinfo || selectedSection.visible === 0))">
+                    (selectedSection.availabilityinfo || selectedSection.visible === 0))" lines="none" class="core-format-progress-list">
                 <div *ngIf="imageThumb" class="core-course-thumb">
                     <img [src]="imageThumb" core-external-content alt="" />
                 </div>
@@ -103,8 +99,7 @@
             </ion-button>
         </ion-buttons>
 
-        <core-block-side-blocks-button *ngIf="course && displayBlocks && hasBlocks" [courseId]="course.id"
-            [downloadEnabled]="downloadEnabled">
+        <core-block-side-blocks-button *ngIf="course && displayBlocks && hasBlocks" [courseId]="course.id">
         </core-block-side-blocks-button>
     </core-loading>
 </core-dynamic-component>
@@ -114,7 +109,7 @@
     <section *ngIf="!section.hiddenbynumsections && section.id != allSectionsId && section.id != stealthModulesSectionId">
         <!-- Title is only displayed when viewing all sections. -->
         <ion-item-divider *ngIf="selectedSection?.id == allSectionsId && section.name" class="ion-text-wrap" color="light"
-            [class.core-section-download]="downloadEnabled" [class.item-dimmed]="section.visible === 0 || section.uservisible === false">
+            [class.item-dimmed]="section.visible === 0 || section.uservisible === false">
             <ion-label>
                 <h2>
                     <core-format-text [text]="section.name" contextLevel="course" [contextInstanceId]="course?.id">
@@ -133,8 +128,6 @@
                     </ion-badge>
                 </p>
             </ion-label>
-            <!-- Section download. -->
-            <ng-container *ngTemplateOutlet="sectionDownloadTemplate; context: {section: section}"></ng-container>
         </ion-item-divider>
 
         <ion-item class="ion-text-wrap" *ngIf="section.summary">
@@ -145,28 +138,10 @@
         </ion-item>
 
         <ng-container *ngFor="let module of section.modules">
-            <core-course-module *ngIf="module.visibleoncoursepage !== 0" [module]="module" [courseId]="course?.id"
-                [downloadEnabled]="downloadEnabled" [section]="section" (completionChanged)="onCompletionChange($event)"
-                (statusChanged)="onModuleStatusChange()" [showActivityDates]="course?.showactivitydates"
+            <core-course-module *ngIf="module.visibleoncoursepage !== 0" [module]="module" [section]="section"
+                (completionChanged)="onCompletionChange($event)" [showActivityDates]="course?.showactivitydates"
                 [showCompletionConditions]="course?.showcompletionconditions">
             </core-course-module>
         </ng-container>
     </section>
 </ng-template>
-
-<!-- Template to render a section download button/progress. -->
-<ng-template #sectionDownloadTemplate let-section="section">
-    <div *ngIf="section && downloadEnabled" slot="end" class="core-button-spinner">
-        <!-- Download progress. -->
-        <ion-badge class="core-course-download-section-progress"
-            *ngIf="section.isDownloading && section.total > 0 && section.count < section.total" role="progressbar"
-            [attr.aria-valuemax]="section.total" [attr.aria-valuenow]="section.count"
-            [attr.aria-valuetext]="'core.course.downloadsectionprogressdescription' | translate:section">
-            {{section.count}} / {{section.total}}
-        </ion-badge>
-
-        <core-download-refresh [status]="section.downloadStatus" [enabled]="downloadEnabled" (action)="prefetch(section)"
-            [loading]="section.isDownloading || section.isCalculating" [canTrustDownload]="true" size="small">
-        </core-download-refresh>
-    </div>
-</ng-template>
diff --git a/src/core/features/course/components/format/format.scss b/src/core/features/course/components/format/format.scss
index 46ca0f415..76335d842 100644
--- a/src/core/features/course/components/format/format.scss
+++ b/src/core/features/course/components/format/format.scss
@@ -55,21 +55,6 @@
         }
     }
 
-    .core-section-download {
-        core-combobox {
-            max-width: calc(100% - 64px);
-        }
-        .core-button-spinner {
-            display: flex;
-            align-items: center;
-            @include margin-horizontal(10px);
-
-            ion-badge.core-course-download-courses-progress {
-                @include margin(null, 12px, null, null);
-            }
-        }
-    }
-
     .core-course-section-nav-buttons {
         display: flex;
         justify-content: flex-end;
diff --git a/src/core/features/course/components/format/format.ts b/src/core/features/course/components/format/format.ts
index 683eb061e..7d93a2084 100644
--- a/src/core/features/course/components/format/format.ts
+++ b/src/core/features/course/components/format/format.ts
@@ -27,7 +27,6 @@ import {
     ElementRef,
 } from '@angular/core';
 import { ModalOptions } from '@ionic/core';
-import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreDynamicComponent } from '@components/dynamic-component/dynamic-component';
 import { CoreCourseAnyCourseData } from '@features/courses/services/courses';
@@ -37,17 +36,14 @@ import {
     CoreCourseProvider,
 } from '@features/course/services/course';
 import {
-    CoreCourseHelper,
     CoreCourseModuleData,
     CoreCourseModuleCompletionData,
     CoreCourseSection,
-    CoreCourseSectionWithStatus,
 } from '@features/course/services/course-helper';
 import { CoreCourseFormatDelegate } from '@features/course/services/format-delegate';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { IonContent, IonRefresher } from '@ionic/angular';
 import { CoreUtils } from '@services/utils/utils';
-import { CoreCourseModulePrefetchDelegate } from '@features/course/services/module-prefetch-delegate';
 import { CoreCourseSectionSelectorComponent } from '../section-selector/section-selector';
 import { CoreBlockHelper } from '@features/block/services/block-helper';
 
@@ -71,8 +67,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
     static readonly LOAD_MORE_ACTIVITIES = 20; // How many activities should load each time showMoreActivities is called.
 
     @Input() course?: CoreCourseAnyCourseData; // The course to render.
-    @Input() sections?: CoreCourseSectionWithStatus[]; // List of course sections. The status will be calculated in this component.
-    @Input() downloadEnabled?: boolean; // Whether the download of sections and modules is enabled.
+    @Input() sections?: CoreCourseSection[]; // List of course sections.
     @Input() initialSectionId?: number; // The section to load first (by ID).
     @Input() initialSectionNumber?: number; // The section to load first (by number).
     @Input() moduleId?: number; // The module ID to scroll to. Must be inside the initial selected section.
@@ -108,7 +103,6 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
         componentProps: {},
     };
 
-    protected sectionStatusObserver?: CoreEventObserver;
     protected selectTabObserver?: CoreEventObserver;
     protected lastCourseFormat?: string;
     protected sectionSelectorExpanded = false;
@@ -125,38 +119,6 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
      * Component being initialized.
      */
     ngOnInit(): void {
-        // Listen for section status changes.
-        this.sectionStatusObserver = CoreEvents.on(
-            CoreEvents.SECTION_STATUS_CHANGED,
-            async (data) => {
-                if (!this.downloadEnabled || !this.sections?.length || !data.sectionId || data.courseId != this.course?.id) {
-                    return;
-                }
-
-                // Check if the affected section is being downloaded.
-                // If so, we don't update section status because it'll already be updated when the download finishes.
-                const downloadId = CoreCourseHelper.getSectionDownloadId({ id: data.sectionId });
-                if (CoreCourseModulePrefetchDelegate.isBeingDownloaded(downloadId)) {
-                    return;
-                }
-
-                // Get the affected section.
-                const section = this.sections.find(section => section.id == data.sectionId);
-                if (!section) {
-                    return;
-                }
-
-                // Recalculate the status.
-                await CoreCourseHelper.calculateSectionStatus(section, this.course.id, false);
-
-                if (section.isDownloading && !CoreCourseModulePrefetchDelegate.isBeingDownloaded(downloadId)) {
-                    // All the modules are now downloading, set a download all promise.
-                    this.prefetch(section);
-                }
-            },
-            CoreSites.getCurrentSiteId(),
-        );
-
         // Listen for select course tab events to select the right section if needed.
         this.selectTabObserver = CoreEvents.on(CoreEvents.SELECT_COURSE_TAB, (data) => {
             if (data.name) {
@@ -205,10 +167,6 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
             this.sectionSelectorModalOptions.componentProps!.sections = this.sections;
             this.treatSections(this.sections);
         }
-
-        if (this.downloadEnabled && (changes.downloadEnabled || changes.sections)) {
-            this.calculateSectionsStatus(false);
-        }
     }
 
     /**
@@ -219,7 +177,6 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
         this.data.sections = this.sections;
         this.data.initialSectionId = this.initialSectionId;
         this.data.initialSectionNumber = this.initialSectionNumber;
-        this.data.downloadEnabled = this.downloadEnabled;
         this.data.moduleId = this.moduleId;
         this.data.completionChanged = this.completionChanged;
     }
@@ -394,9 +351,6 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
             this.canLoadMore = false;
             this.showSectionId = 0;
             this.showMoreActivities();
-            if (this.downloadEnabled) {
-                this.calculateSectionsStatus(false);
-            }
         }
 
         if (this.moduleId && previousValue === undefined) {
@@ -432,62 +386,6 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
         return section1 && section2 ? section1.id === section2.id : section1 === section2;
     }
 
-    /**
-     * Calculate the status of sections.
-     *
-     * @param refresh If refresh or not.
-     */
-    protected calculateSectionsStatus(refresh?: boolean): void {
-        if (!this.sections || !this.course) {
-            return;
-        }
-
-        CoreUtils.ignoreErrors(CoreCourseHelper.calculateSectionsStatus(this.sections, this.course.id, refresh));
-    }
-
-    /**
-     * Confirm and prefetch a section. If the section is "all sections", prefetch all the sections.
-     *
-     * @param section Section to download.
-     * @param refresh Refresh clicked (not used).
-     */
-    async prefetch(section: CoreCourseSectionWithStatus): Promise<void> {
-        section.isCalculating = true;
-
-        try {
-            await CoreCourseHelper.confirmDownloadSizeSection(this.course!.id, section, this.sections);
-
-            await this.prefetchSection(section, true);
-        } catch (error) {
-            // User cancelled or there was an error calculating the size.
-            if (error) {
-                CoreDomUtils.showErrorModal(error);
-            }
-        } finally {
-            section.isCalculating = false;
-        }
-    }
-
-    /**
-     * Prefetch a section.
-     *
-     * @param section The section to download.
-     * @param manual Whether the prefetch was started manually or it was automatically started because all modules
-     *               are being downloaded.
-     */
-    protected async prefetchSection(section: CoreCourseSectionWithStatus, manual?: boolean): Promise<void> {
-        try {
-            await CoreCourseHelper.prefetchSection(section, this.course!.id, this.sections);
-        } catch (error) {
-            // Don't show error message if it's an automatic download.
-            if (!manual) {
-                return;
-            }
-
-            CoreDomUtils.showErrorModalDefault(error, 'core.course.errordownloadingsection', true);
-        }
-    }
-
     /**
      * Refresh the data.
      *
@@ -580,7 +478,6 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
      * Component destroyed.
      */
     ngOnDestroy(): void {
-        this.sectionStatusObserver && this.sectionStatusObserver.off();
         this.selectTabObserver && this.selectTabObserver.off();
     }
 
@@ -591,17 +488,6 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
         this.dynamicComponents?.forEach((component) => {
             component.callComponentFunction('ionViewDidEnter');
         });
-
-        if (!this.downloadEnabled || !this.course || !this.sections) {
-            return;
-        }
-
-        // The download status of a section might have been changed from within a module page.
-        if (this.selectedSection && this.selectedSection.id !== CoreCourseProvider.ALL_SECTIONS_ID) {
-            CoreCourseHelper.calculateSectionStatus(this.selectedSection, this.course.id, false, false);
-        } else {
-            CoreCourseHelper.calculateSectionsStatus(this.sections, this.course.id, false, false);
-        }
     }
 
     /**
@@ -653,17 +539,6 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
         this.updateProgress();
     }
 
-    /**
-     * Recalculate the download status of each section, in response to a module being downloaded.
-     */
-    onModuleStatusChange(): void {
-        if (!this.downloadEnabled || !this.sections || !this.course) {
-            return;
-        }
-
-        CoreCourseHelper.calculateSectionsStatus(this.sections, this.course.id, false, false);
-    }
-
     /**
      * Update course progress.
      */
diff --git a/src/core/features/course/components/module/core-course-module.html b/src/core/features/course/components/module/core-course-module.html
index 65637562c..fc9db736c 100644
--- a/src/core/features/course/components/module/core-course-module.html
+++ b/src/core/features/course/components/module/core-course-module.html
@@ -15,7 +15,7 @@
             <ion-label class="core-module-title">
                 <p class="item-heading">
                     <core-format-text [text]="module.handlerData.title" contextLevel="module" [contextInstanceId]="module.id"
-                        [courseId]="courseId" [attr.aria-label]="module.handlerData.a11yTitle + ', ' + modNameTranslated">
+                        [courseId]="module.course" [attr.aria-label]="module.handlerData.a11yTitle + ', ' + modNameTranslated">
                     </core-format-text>
                 </p>
                 <ion-badge *ngIf="module.handlerData.extraBadge" [color]="module.handlerData.extraBadgeColor"
@@ -31,7 +31,7 @@
                 <div class="core-module-availabilityinfo" *ngIf="module.availabilityinfo">
                     <ion-badge class="ion-text-wrap">{{ 'core.restricted' | translate }}</ion-badge>
                     <core-format-text [text]="module.availabilityinfo" contextLevel="module" [contextInstanceId]="module.id"
-                        [courseId]="courseId" class="ion-text-wrap">
+                        [courseId]="module.course" class="ion-text-wrap">
                     </core-format-text>
                 </div>
                 <ion-badge *ngIf="module.completiondata?.offline" color="warning" class="ion-text-wrap">
@@ -48,13 +48,9 @@
                 </core-course-module-completion-legacy>
 
                 <div class="core-module-buttons-more">
-                    <core-download-refresh [status]="downloadStatus" [enabled]="downloadEnabled" [canTrustDownload]="true"
-                        [loading]="spinner || module.handlerData.spinner" (action)="download($event)" size="small">
-                    </core-download-refresh>
-
                     <!-- Buttons defined by the module handler. -->
                     <ion-button fill="clear" *ngFor="let button of module.handlerData.buttons" color="dark" size="small"
-                        [hidden]="button.hidden || spinner || module.handlerData.spinner" class="core-animate-show-hide"
+                        [hidden]="button.hidden || module.handlerData.spinner" class="core-animate-show-hide"
                         (click)="buttonClicked($event, button)" [attr.aria-label]="button.label | translate:{$a: module.handlerData.title}">
                         <ion-icon [name]="button.icon" slot="icon-only" aria-hidden="true"></ion-icon>
                     </ion-button>
@@ -81,7 +77,7 @@
                 </core-course-module-completion>
 
                 <core-format-text class="core-module-description" *ngIf="module.description" [maxHeight]="80" [text]="module.description"
-                    contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
+                    contextLevel="module" [contextInstanceId]="module.id" [courseId]="module.course">
                 </core-format-text>
             </ion-label>
         </ion-item>
diff --git a/src/core/features/course/components/module/module.ts b/src/core/features/course/components/module/module.ts
index 82df87061..936901f5f 100644
--- a/src/core/features/course/components/module/module.ts
+++ b/src/core/features/course/components/module/module.ts
@@ -15,20 +15,13 @@
 import { Component, Input, Output, EventEmitter, OnInit, OnDestroy } from '@angular/core';
 
 import { CoreSites } from '@services/sites';
-import { CoreDomUtils } from '@services/utils/dom';
-import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import {
-    CoreCourseHelper,
     CoreCourseModuleData,
     CoreCourseModuleCompletionData,
     CoreCourseSection,
 } from '@features/course/services/course-helper';
 import { CoreCourse } from '@features/course/services/course';
 import { CoreCourseModuleDelegate, CoreCourseModuleHandlerButton } from '@features/course/services/module-delegate';
-import {
-    CoreCourseModulePrefetchDelegate,
-    CoreCourseModulePrefetchHandler,
-} from '@features/course/services/module-prefetch-delegate';
 
 /**
  * Component to display a module entry in a list of modules.
@@ -45,47 +38,20 @@ import {
 export class CoreCourseModuleComponent implements OnInit, OnDestroy {
 
     @Input() module!: CoreCourseModuleData; // The module to render.
-    @Input() courseId?: number; // The course the module belongs to.
     @Input() section?: CoreCourseSection; // The section the module belongs to.
     @Input() showActivityDates = false; // Whether to show activity dates.
     @Input() showCompletionConditions = false; // Whether to show activity completion conditions.
-    // eslint-disable-next-line @angular-eslint/no-input-rename
-    @Input('downloadEnabled') set enabled(value: boolean) {
-        this.downloadEnabled = value;
-
-        if (!this.module.handlerData?.showDownloadButton || !this.downloadEnabled || this.statusCalculated) {
-            return;
-        }
-
-        // First time that the download is enabled. Initialize the data.
-        this.statusCalculated = true;
-        this.spinner = true; // Show spinner while calculating the status.
-
-        // Get current status to decide which icon should be shown.
-        this.calculateAndShowStatus();
-    }
-
     @Output() completionChanged = new EventEmitter<CoreCourseModuleCompletionData>(); // Notify when module completion changes.
-    @Output() statusChanged = new EventEmitter<CoreCourseModuleStatusChangedData>(); // Notify when the download status changes.
 
-    downloadStatus?: string;
-    spinner?: boolean; // Whether to display a loading spinner.
-    downloadEnabled?: boolean; // Whether the download of sections and modules is enabled.
     modNameTranslated = '';
     hasInfo = false;
     showLegacyCompletion = false; // Whether to show module completion in the old format.
     showManualCompletion = false; // Whether to show manual completion when completion conditions are disabled.
 
-    protected prefetchHandler?: CoreCourseModulePrefetchHandler;
-    protected statusObserver?: CoreEventObserver;
-    protected statusCalculated = false;
-    protected isDestroyed = false;
-
     /**
      * Component being initialized.
      */
     ngOnInit(): void {
-        this.courseId = this.courseId || this.module.course;
         this.modNameTranslated = CoreCourse.translateModuleName(this.module.modname) || '';
         this.showLegacyCompletion = !CoreSites.getCurrentSite()?.isVersionGreaterEqualThan('3.11');
         this.checkShowManualCompletion();
@@ -103,29 +69,6 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy {
                     (this.showCompletionConditions && this.module.completiondata.isautomatic))
             )
         );
-
-        if (this.module.handlerData.showDownloadButton) {
-            // Listen for changes on this module status, even if download isn't enabled.
-            this.prefetchHandler = CoreCourseModulePrefetchDelegate.getPrefetchHandlerFor(this.module.modname);
-
-            this.statusObserver = CoreEvents.on(CoreEvents.PACKAGE_STATUS_CHANGED, (data) => {
-                if (!this.module || data.componentId != this.module.id || !this.prefetchHandler ||
-                        data.component != this.prefetchHandler.component) {
-                    return;
-                }
-
-                // Call determineModuleStatus to get the right status to display.
-                const status = CoreCourseModulePrefetchDelegate.determineModuleStatus(this.module, data.status);
-
-                if (this.downloadEnabled) {
-                    // Download is enabled, show the status.
-                    this.showStatus(status);
-                } else if (this.module.handlerData?.updateStatus) {
-                    // Download isn't enabled but the handler defines a updateStatus function, call it anyway.
-                    this.module.handlerData.updateStatus(status);
-                }
-            }, CoreSites.getCurrentSiteId());
-        }
     }
 
     /**
@@ -143,7 +86,7 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy {
      */
     moduleClicked(event: Event): void {
         if (this.module.uservisible !== false && this.module.handlerData?.action) {
-            this.module.handlerData.action(event, this.module, this.courseId!);
+            this.module.handlerData.action(event, this.module, this.module.course);
         }
     }
 
@@ -161,91 +104,14 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy {
         event.preventDefault();
         event.stopPropagation();
 
-        button.action(event, this.module, this.courseId!);
-    }
-
-    /**
-     * Download the module.
-     *
-     * @param refresh Whether it's refreshing.
-     * @return Promise resolved when done.
-     */
-    async download(refresh: boolean): Promise<void> {
-        if (!this.prefetchHandler || !this.module) {
-            return;
-        }
-
-        // Show spinner since this operation might take a while.
-        this.spinner = true;
-
-        try {
-            // Get download size to ask for confirm if it's high.
-            const size = await this.prefetchHandler.getDownloadSize(this.module, this.module.course, true);
-
-            await CoreCourseHelper.prefetchModule(this.prefetchHandler, this.module, size, this.module.course, refresh);
-
-            const eventData = {
-                sectionId: this.section?.id,
-                moduleId: this.module.id,
-                courseId: this.module.course,
-            };
-            this.statusChanged.emit(eventData);
-        } catch (error) {
-            // Error, hide spinner.
-            this.spinner = false;
-            if (!this.isDestroyed) {
-                CoreDomUtils.showErrorModalDefault(error, 'core.errordownloading', true);
-            }
-        }
-    }
-
-    /**
-     * Show download buttons according to module status.
-     *
-     * @param status Module status.
-     */
-    protected showStatus(status: string): void {
-        if (!status) {
-            return;
-        }
-
-        this.spinner = false;
-        this.downloadStatus = status;
-
-        this.module.handlerData?.updateStatus?.(status);
-    }
-
-    /**
-     * Calculate and show module status.
-     *
-     * @return Promise resolved when done.
-     */
-    protected async calculateAndShowStatus(): Promise<void> {
-        if (!this.module || !this.courseId) {
-            return;
-        }
-
-        const status = await CoreCourseModulePrefetchDelegate.getModuleStatus(this.module, this.courseId);
-
-        this.showStatus(status);
+        button.action(event, this.module, this.module.course);
     }
 
     /**
      * Component destroyed.
      */
     ngOnDestroy(): void {
-        // this.statusObserver?.off();
         this.module.handlerData?.onDestroy?.();
-        this.isDestroyed = true;
     }
 
 }
-
-/**
- * Data sent to the status changed output.
- */
-export type CoreCourseModuleStatusChangedData = {
-    moduleId: number;
-    courseId: number;
-    sectionId?: number;
-};
diff --git a/src/core/features/course/format/singleactivity/components/core-course-format-single-activity.html b/src/core/features/course/format/singleactivity/components/core-course-format-single-activity.html
index 17cf0dd0f..68eedcebf 100644
--- a/src/core/features/course/format/singleactivity/components/core-course-format-single-activity.html
+++ b/src/core/features/course/format/singleactivity/components/core-course-format-single-activity.html
@@ -1,4 +1,4 @@
 <core-dynamic-component [component]="componentClass" [data]="data"></core-dynamic-component>
 
-<core-block-side-blocks-button *ngIf="course && hasBlocks" [courseId]="course.id" [downloadEnabled]="downloadEnabled">
+<core-block-side-blocks-button *ngIf="course && hasBlocks" [courseId]="course.id">
 </core-block-side-blocks-button>
diff --git a/src/core/features/course/format/singleactivity/components/singleactivity.ts b/src/core/features/course/format/singleactivity/components/singleactivity.ts
index 3fd7cf5c0..01da69058 100644
--- a/src/core/features/course/format/singleactivity/components/singleactivity.ts
+++ b/src/core/features/course/format/singleactivity/components/singleactivity.ts
@@ -36,7 +36,6 @@ export class CoreCourseFormatSingleActivityComponent implements OnChanges {
 
     @Input() course?: CoreCourseAnyCourseData; // The course to render.
     @Input() sections?: CoreCourseSectionWithStatus[]; // List of course sections.
-    @Input() downloadEnabled?: boolean; // Whether the download of sections and modules is enabled.
     @Input() initialSectionId?: number; // The section to load first (by ID).
     @Input() initialSectionNumber?: number; // The section to load first (by number).
     @Input() moduleId?: number; // The module ID to scroll to. Must be inside the initial selected section.
diff --git a/src/core/features/course/format/singleactivity/services/handlers/singleactivity-format.ts b/src/core/features/course/format/singleactivity/services/handlers/singleactivity-format.ts
index 3ce49d231..945b99e4c 100644
--- a/src/core/features/course/format/singleactivity/services/handlers/singleactivity-format.ts
+++ b/src/core/features/course/format/singleactivity/services/handlers/singleactivity-format.ts
@@ -68,13 +68,6 @@ export class CoreCourseFormatSingleActivityHandlerService implements CoreCourseF
         return '';
     }
 
-    /**
-     * @inheritdoc
-     */
-    displayEnableDownload(): boolean {
-        return false;
-    }
-
     /**
      * @inheritdoc
      */
diff --git a/src/core/features/course/pages/contents/contents.html b/src/core/features/course/pages/contents/contents.html
index 9c1633cad..1f6b46f1c 100644
--- a/src/core/features/course/pages/contents/contents.html
+++ b/src/core/features/course/pages/contents/contents.html
@@ -1,12 +1,5 @@
 <core-navbar-buttons slot="end">
     <core-context-menu>
-        <core-context-menu-item [hidden]="!displayEnableDownload" [priority]="2000" iconAction="toggle" [(toggle)]="downloadEnabled"
-            [content]="'core.settings.showdownloadoptions' | translate" (action)="toggleDownload()">
-        </core-context-menu-item>
-        <core-context-menu-item [hidden]="!downloadCourseEnabled" [priority]="1900"
-            [content]="prefetchCourseData.statusTranslatable | translate" (action)="prefetchCourse()" [iconAction]="prefetchCourseData.icon"
-            [closeOnClick]="false">
-        </core-context-menu-item>
         <core-context-menu-item [priority]="1800" [content]="'core.course.coursesummary' | translate" (action)="openCourseSummary()"
             iconAction="fas-graduation-cap">
         </core-context-menu-item>
@@ -22,8 +15,7 @@
 
     <core-loading [hideUntil]="dataLoaded">
         <core-course-format [course]="course" [sections]="sections" [initialSectionId]="sectionId" [initialSectionNumber]="sectionNumber"
-            [downloadEnabled]="downloadEnabled" [moduleId]="moduleId" (completionChanged)="onCompletionChange($event)"
-            class="core-course-format-{{course.format}}">
+            [moduleId]="moduleId" (completionChanged)="onCompletionChange($event)" class="core-course-format-{{course.format}}">
         </core-course-format>
     </core-loading>
 </ion-content>
diff --git a/src/core/features/course/pages/contents/contents.ts b/src/core/features/course/pages/contents/contents.ts
index 03662c5b4..43bbcfb2d 100644
--- a/src/core/features/course/pages/contents/contents.ts
+++ b/src/core/features/course/pages/contents/contents.ts
@@ -15,20 +15,17 @@
 import { Component, ViewChild, OnInit, OnDestroy } from '@angular/core';
 import { IonContent, IonRefresher } from '@ionic/angular';
 
-import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
-import { CoreCourses, CoreCourseAnyCourseData, CoreCoursesProvider } from '@features/courses/services/courses';
+import { CoreCourses, CoreCourseAnyCourseData } from '@features/courses/services/courses';
 import {
     CoreCourse,
     CoreCourseCompletionActivityStatus,
-    CoreCourseProvider,
 } from '@features/course/services/course';
 import {
     CoreCourseHelper,
     CoreCourseModuleCompletionData,
     CoreCourseSection,
-    CorePrefetchStatusInfo,
 } from '@features/course/services/course-helper';
 import { CoreCourseFormatDelegate } from '@features/course/services/format-delegate';
 import { CoreCourseModulePrefetchDelegate } from '@features/course/services/module-prefetch-delegate';
@@ -43,7 +40,6 @@ import {
     CoreEventObserver,
 } from '@singletons/events';
 import { CoreNavigator } from '@services/navigator';
-import { CoreConstants } from '@/core/constants';
 
 /**
  * Page that displays the contents of a course.
@@ -63,47 +59,19 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
     sectionNumber?: number;
     courseMenuHandlers: CoreCourseOptionsMenuHandlerToDisplay[] = [];
     dataLoaded = false;
-    downloadEnabled = false;
     downloadCourseEnabled = false;
     moduleId?: number;
     displayEnableDownload = false;
     displayRefresher = false;
-    prefetchCourseData: CorePrefetchStatusInfo = {
-        icon: CoreConstants.ICON_LOADING,
-        statusTranslatable: 'core.course.downloadcourse',
-        status: '',
-        loading: true,
-    };
 
     protected formatOptions?: Record<string, unknown>;
     protected completionObserver?: CoreEventObserver;
-    protected courseStatusObserver?: CoreEventObserver;
-    protected siteUpdatedObserver?: CoreEventObserver;
-    protected downloadEnabledObserver?: CoreEventObserver;
     protected syncObserver?: CoreEventObserver;
     protected isDestroyed = false;
     protected modulesHaveCompletion = false;
-    protected isGuest?: boolean;
+    protected isGuest = false;
     protected debouncedUpdateCachedCompletion?: () => void; // Update the cached completion after a certain time.
 
-    constructor() {
-        // Refresh the enabled flags if site is updated.
-        this.siteUpdatedObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, () => {
-            this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
-
-            this.displayEnableDownload = !CoreSites.getRequiredCurrentSite().isOfflineDisabled() &&
-                CoreCourseFormatDelegate.displayEnableDownload(this.course);
-
-            this.downloadEnabled = this.displayEnableDownload && this.downloadEnabled;
-
-            this.initListeners();
-        }, CoreSites.getCurrentSiteId());
-
-        this.downloadEnabledObserver = CoreEvents.on(CoreCoursesProvider.EVENT_DASHBOARD_DOWNLOAD_ENABLED_CHANGED, (data) => {
-            this.downloadEnabled = this.displayEnableDownload && data.enabled;
-        });
-    }
-
     /**
      * @inheritdoc
      */
@@ -121,13 +89,7 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
         this.sectionId = CoreNavigator.getRouteNumberParam('sectionId');
         this.sectionNumber = CoreNavigator.getRouteNumberParam('sectionNumber');
         this.moduleId = CoreNavigator.getRouteNumberParam('moduleId');
-        this.isGuest = CoreNavigator.getRouteBooleanParam('isGuest');
-
-        this.displayEnableDownload = !CoreSites.getRequiredCurrentSite().isOfflineDisabled() &&
-            CoreCourseFormatDelegate.displayEnableDownload(this.course);
-        this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
-
-        this.downloadEnabled = this.displayEnableDownload && CoreCourses.getCourseDownloadOptionsEnabled();
+        this.isGuest = !!CoreNavigator.getRouteBooleanParam('isGuest');
 
         this.debouncedUpdateCachedCompletion = CoreUtils.debounce(() => {
             if (this.modulesHaveCompletion) {
@@ -149,8 +111,6 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
         await this.loadData(false, true);
 
         this.dataLoaded = true;
-
-        this.initPrefetch();
     }
 
     /**
@@ -159,15 +119,6 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
      * @return Promise resolved when done.
      */
     protected async initListeners(): Promise<void> {
-        if (this.downloadCourseEnabled && !this.courseStatusObserver) {
-            // Listen for changes in course status.
-            this.courseStatusObserver = CoreEvents.on(CoreEvents.COURSE_STATUS_CHANGED, (data) => {
-                if (data.courseId == this.course.id || data.courseId == CoreCourseProvider.ALL_COURSES_CLEARED) {
-                    this.updateCourseStatus(data.status);
-                }
-            }, CoreSites.getCurrentSiteId());
-        }
-
         // Check if the course format requires the view to be refreshed when completion changes.
         const shouldRefresh = await CoreCourseFormatDelegate.shouldRefreshWhenCompletionChanges(this.course);
         if (!shouldRefresh) {
@@ -200,41 +151,6 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
         }
     }
 
-    /**
-     * Init prefetch data if needed.
-     *
-     * @return Promise resolved when done.
-     */
-    protected async initPrefetch(): Promise<void> {
-        if (!this.downloadCourseEnabled) {
-            // Cannot download the whole course, stop.
-            return;
-        }
-
-        // Determine the course prefetch status.
-        await this.determineCoursePrefetchIcon();
-
-        if (this.prefetchCourseData.icon != CoreConstants.ICON_LOADING) {
-            return;
-        }
-
-        // Course is being downloaded. Get the download promise.
-        const promise = CoreCourseHelper.getCourseDownloadPromise(this.course.id);
-        if (promise) {
-            // There is a download promise. Show an error if it fails.
-            promise.catch((error) => {
-                if (!this.isDestroyed) {
-                    CoreDomUtils.showErrorModalDefault(error, 'core.course.errordownloadingcourse', true);
-                }
-            });
-        } else {
-            // No download, this probably means that the app was closed while downloading. Set previous status.
-            const status = await CoreCourse.setCoursePreviousStatus(this.course.id);
-
-            this.updateCourseStatus(status);
-        }
-    }
-
     /**
      * Fetch and load all the data required for the view.
      *
@@ -463,59 +379,6 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
         }
     }
 
-    /**
-     * Determines the prefetch icon of the course.
-     *
-     * @return Promise resolved when done.
-     */
-    protected async determineCoursePrefetchIcon(): Promise<void> {
-        this.prefetchCourseData = await CoreCourseHelper.getCourseStatusIconAndTitle(this.course.id);
-    }
-
-    /**
-     * Prefetch the whole course.
-     */
-    async prefetchCourse(): Promise<void> {
-        try {
-            await CoreCourseHelper.confirmAndPrefetchCourse(
-                this.prefetchCourseData,
-                this.course,
-                {
-                    sections: this.sections,
-                    menuHandlers: this.courseMenuHandlers,
-                    isGuest: this.isGuest,
-                },
-            );
-        } catch (error) {
-            if (this.isDestroyed) {
-                return;
-            }
-
-            CoreDomUtils.showErrorModalDefault(error, 'core.course.errordownloadingcourse', true);
-        }
-    }
-
-    /**
-     * Toggle download enabled.
-     */
-    toggleDownload(): void {
-        CoreCourses.setCourseDownloadOptionsEnabled(this.downloadEnabled);
-    }
-
-    /**
-     * Update the course status icon and title.
-     *
-     * @param status Status to show.
-     */
-    protected updateCourseStatus(status: string): void {
-        const statusData = CoreCourseHelper.getCoursePrefetchStatusInfo(status);
-
-        this.prefetchCourseData.status = statusData.status;
-        this.prefetchCourseData.icon = statusData.icon;
-        this.prefetchCourseData.statusTranslatable = statusData.statusTranslatable;
-        this.prefetchCourseData.loading = statusData.loading;
-    }
-
     /**
      * Open the course summary
      */
@@ -542,10 +405,7 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
     ngOnDestroy(): void {
         this.isDestroyed = true;
         this.completionObserver?.off();
-        this.courseStatusObserver?.off();
         this.syncObserver?.off();
-        this.siteUpdatedObserver?.off();
-        this.downloadEnabledObserver?.off();
     }
 
     /**
diff --git a/src/core/features/course/pages/list-mod-type/list-mod-type.html b/src/core/features/course/pages/list-mod-type/list-mod-type.html
index 1d6d7d2aa..d0cf3b7d1 100644
--- a/src/core/features/course/pages/list-mod-type/list-mod-type.html
+++ b/src/core/features/course/pages/list-mod-type/list-mod-type.html
@@ -19,8 +19,7 @@
         <ion-list>
             <ng-container *ngFor="let section of sections">
                 <ng-container *ngFor="let module of section.modules">
-                    <core-course-module *ngIf="module.visibleoncoursepage !== 0" [module]="module" [section]="section" [courseId]="courseId"
-                        [downloadEnabled]="downloadEnabled">
+                    <core-course-module *ngIf="module.visibleoncoursepage !== 0" [module]="module" [section]="section">
                     </core-course-module>
                 </ng-container>
             </ng-container>
diff --git a/src/core/features/course/pages/list-mod-type/list-mod-type.page.ts b/src/core/features/course/pages/list-mod-type/list-mod-type.page.ts
index 38e6cccf2..fde5d1830 100644
--- a/src/core/features/course/pages/list-mod-type/list-mod-type.page.ts
+++ b/src/core/features/course/pages/list-mod-type/list-mod-type.page.ts
@@ -14,7 +14,6 @@
 
 import { Component, OnInit } from '@angular/core';
 
-import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreCourse } from '@features/course/services/course';
 import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate';
@@ -36,7 +35,6 @@ export class CoreCourseListModTypePage implements OnInit {
     sections: CoreCourseSection[] = [];
     title = '';
     loaded = false;
-    downloadEnabled = false;
     courseId?: number;
 
     protected modName?: string;
@@ -49,7 +47,6 @@ export class CoreCourseListModTypePage implements OnInit {
         this.title = CoreNavigator.getRouteParam('title') || '';
         this.courseId = CoreNavigator.getRouteNumberParam('courseId');
         this.modName = CoreNavigator.getRouteParam('modName');
-        this.downloadEnabled = !CoreSites.getCurrentSite()?.isOfflineDisabled();
 
         try {
             await this.fetchData();
diff --git a/src/core/features/course/services/format-delegate.ts b/src/core/features/course/services/format-delegate.ts
index b2ecc2f13..295691a0e 100644
--- a/src/core/features/course/services/format-delegate.ts
+++ b/src/core/features/course/services/format-delegate.ts
@@ -58,8 +58,9 @@ export interface CoreCourseFormatHandler extends CoreDelegateHandler {
     displayBlocks?(course: CoreCourseAnyCourseData): boolean;
 
     /**
-     * Whether the option to enable section/module download should be displayed. Defaults to true.
+     * Whether the option to enable section/module download should be displayed.
      *
+     * @deprecated on 4.0 Not used anymore because prefetch has been moved to storage manager.
      * @param course The course to check.
      * @return Whether the option to enable section/module download should be displayed.
      */
@@ -204,16 +205,6 @@ export class CoreCourseFormatDelegateService extends CoreDelegate<CoreCourseForm
         return !!this.executeFunctionOnEnabled<boolean>(course.format || '', 'displayBlocks', [course]);
     }
 
-    /**
-     * Whether the option to enable section/module download should be displayed. Defaults to true.
-     *
-     * @param course The course to check.
-     * @return Whether the option to enable section/module download should be displayed
-     */
-    displayEnableDownload(course: CoreCourseAnyCourseData): boolean {
-        return !!this.executeFunctionOnEnabled<boolean>(course.format || '', 'displayEnableDownload', [course]);
-    }
-
     /**
      * Whether the course refresher should be displayed. If it returns false, a refresher must be included in the course format,
      * and the doRefresh method of CoreCourseSectionPage must be called on refresh. Defaults to true.
diff --git a/src/core/features/course/services/handlers/default-format.ts b/src/core/features/course/services/handlers/default-format.ts
index c84073a96..4ef53ca4b 100644
--- a/src/core/features/course/services/handlers/default-format.ts
+++ b/src/core/features/course/services/handlers/default-format.ts
@@ -78,17 +78,6 @@ export class CoreCourseFormatDefaultHandler implements CoreCourseFormatHandler {
         return true;
     }
 
-    /**
-     * Whether the option to enable section/module download should be displayed. Defaults to true.
-     *
-     * @param course The course to check.
-     * @return Whether the option to enable section/module download should be displayed
-     */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    displayEnableDownload(course: CoreCourseAnyCourseData): boolean {
-        return true;
-    }
-
     /**
      * Whether the default section selector should be displayed. Defaults to true.
      *
diff --git a/src/core/features/courses/pages/dashboard/dashboard.html b/src/core/features/courses/pages/dashboard/dashboard.html
index ee5fb7421..4e704d5e8 100644
--- a/src/core/features/courses/pages/dashboard/dashboard.html
+++ b/src/core/features/courses/pages/dashboard/dashboard.html
@@ -23,7 +23,7 @@
             </ng-container>
         </ion-list>
 
-        <core-block-side-blocks-button *ngIf="hasSideBlocks" [downloadEnabled]="downloadEnabled"></core-block-side-blocks-button>
+        <core-block-side-blocks-button *ngIf="hasSideBlocks"></core-block-side-blocks-button>
 
         <core-empty-box *ngIf="blocks.length == 0" icon="fas-cubes" [message]="'core.course.nocontentavailable' | translate">
         </core-empty-box>
diff --git a/src/core/features/sitehome/pages/index/index.html b/src/core/features/sitehome/pages/index/index.html
index e7437c3c7..62b96b90c 100644
--- a/src/core/features/sitehome/pages/index/index.html
+++ b/src/core/features/sitehome/pages/index/index.html
@@ -3,8 +3,6 @@
         <ion-icon name="fas-search" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
     <core-context-menu>
-        <core-context-menu-item [priority]="1000" *ngIf="displayEnableDownload" [content]="'core.settings.showdownloadoptions' | translate"
-            (action)="switchDownload()" iconAction="toggle" [(toggle)]="downloadEnabled"></core-context-menu-item>
         <core-context-menu-item [priority]="500" [content]="'addon.storagemanager.managestorage' | translate"
             (action)="manageCoursesStorage()" iconAction="fas-archive"></core-context-menu-item>
         <core-context-menu-item [priority]="400" [content]="'addon.storagemanager.managecoursestorage' | translate"
@@ -26,8 +24,7 @@
                     </ion-label>
                 </ion-item>
 
-                <core-course-module *ngFor="let module of section.modules" [module]="module" [courseId]="siteHomeId"
-                    [downloadEnabled]="downloadEnabled" [section]="section"></core-course-module>
+                <core-course-module *ngFor="let module of section.modules" [module]="module" [section]="section"></core-course-module>
             </ng-container>
 
             <!-- Site home items: news, categories, courses, etc. -->
@@ -54,7 +51,7 @@
                 </ng-container>
             </ng-container>
         </ion-list>
-        <core-block-side-blocks-button *ngIf="hasBlocks" [courseId]="siteHomeId" [downloadEnabled]="downloadEnabled">
+        <core-block-side-blocks-button *ngIf="hasBlocks" [courseId]="siteHomeId">
         </core-block-side-blocks-button>
 
         <core-empty-box *ngIf="!hasContent" icon="fas-box-open" [message]="'core.course.nocontentavailable' | translate">
@@ -73,8 +70,7 @@
 </ng-template>
 
 <ng-template #news>
-    <core-course-module class="core-sitehome-news" *ngIf="newsForumModule" [module]="newsForumModule" [courseId]="siteHomeId"
-        [downloadEnabled]="downloadEnabled">
+    <core-course-module class="core-sitehome-news" *ngIf="newsForumModule" [module]="newsForumModule">
     </core-course-module>
 </ng-template>
 
diff --git a/src/core/features/sitehome/pages/index/index.ts b/src/core/features/sitehome/pages/index/index.ts
index 4d6cc23a4..b28c7d648 100644
--- a/src/core/features/sitehome/pages/index/index.ts
+++ b/src/core/features/sitehome/pages/index/index.ts
@@ -21,7 +21,7 @@ import { CoreCourse, CoreCourseWSSection } from '@features/course/services/cours
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreSites } from '@services/sites';
 import { CoreSiteHome } from '@features/sitehome/services/sitehome';
-import { CoreCourses, CoreCoursesProvider } from '@features//courses/services/courses';
+import { CoreCourses } from '@features//courses/services/courses';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreCourseHelper, CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate';
@@ -50,24 +50,15 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
     siteHomeId = 1;
     currentSite!: CoreSite;
     searchEnabled = false;
-    displayEnableDownload = false;
-    downloadEnabled = false;
     newsForumModule?: CoreCourseModuleData;
 
     protected updateSiteObserver: CoreEventObserver;
-    protected downloadEnabledObserver: CoreEventObserver;
 
     constructor() {
         // Refresh the enabled flags if site is updated.
         this.updateSiteObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, () => {
             this.searchEnabled = !CoreCourses.isSearchCoursesDisabledInSite();
-
-            this.displayEnableDownload = !CoreSites.getRequiredCurrentSite().isOfflineDisabled();
         }, CoreSites.getCurrentSiteId());
-
-        this.downloadEnabledObserver = CoreEvents.on(CoreCoursesProvider.EVENT_DASHBOARD_DOWNLOAD_ENABLED_CHANGED, (data) => {
-            this.downloadEnabled = data.enabled;
-        });
     }
 
     /**
@@ -85,9 +76,6 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
             CoreCourseHelper.openModule(module, this.siteHomeId, undefined, modParams);
         }
 
-        this.displayEnableDownload = !CoreSites.getRequiredCurrentSite().isOfflineDisabled();
-        this.downloadEnabled = CoreCourses.getCourseDownloadOptionsEnabled();
-
         this.loadContent().finally(() => {
             this.dataLoaded = true;
         });
@@ -186,13 +174,6 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
         });
     }
 
-    /**
-     * Switch download enabled.
-     */
-    switchDownload(): void {
-        CoreCourses.setCourseDownloadOptionsEnabled(this.downloadEnabled);
-    }
-
     /**
      * Open page to manage courses storage.
      */
@@ -240,7 +221,6 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
      */
     ngOnDestroy(): void {
         this.updateSiteObserver.off();
-        this.downloadEnabledObserver.off();
     }
 
 }
diff --git a/src/core/features/siteplugins/classes/handlers/course-format-handler.ts b/src/core/features/siteplugins/classes/handlers/course-format-handler.ts
index 1878f6186..89cfaff07 100644
--- a/src/core/features/siteplugins/classes/handlers/course-format-handler.ts
+++ b/src/core/features/siteplugins/classes/handlers/course-format-handler.ts
@@ -35,13 +35,6 @@ export class CoreSitePluginsCourseFormatHandler extends CoreSitePluginsBaseHandl
         return this.handlerSchema.canviewallsections ?? true;
     }
 
-    /**
-     * @inheritdoc
-     */
-    displayEnableDownload(): boolean {
-        return this.handlerSchema.displayenabledownload ?? true;
-    }
-
     /**
      * @inheritdoc
      */
diff --git a/upgrade.txt b/upgrade.txt
index b373c0db4..ddb9fc2c5 100644
--- a/upgrade.txt
+++ b/upgrade.txt
@@ -9,6 +9,7 @@ information provided here is intended especially for developers.
 - CoreCourseModulePrefetchDelegate.getPrefetchHandlerFor now admits module name instead of full module object.
 - CoreCourse.getModuleBasicInfoByInstance and CoreCourse.getModuleBasicInfo have been modified to accept an "options" parameter instead of only siteId.
 - The function CoreFilepool.isFileDownloadingByUrl now returns Promise<boolean> instead of relying on resolve/reject.
+- downloadEnabled input has been removed from CoreBlockSideBlocksComponent, CoreCourseFormatComponent, CoreCourseFormatSingleActivityComponent and CoreCourseModuleComponent.
 
 === 3.9.5 ===
 

From c549e733fbbf5cd45839f92e0cf553207be78133 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 22 Dec 2021 16:47:52 +0100
Subject: [PATCH 0328/1008] MOBILE-3934 competency: Refactor routes

---
 .../learningplans/services/block-handler.ts   |  4 +-
 ...competency-course-contents-lazy.module.ts} |  4 +-
 .../competency-course-details-lazy.module.ts  | 72 ++++++++++++++++++
 ... competency-learning-plans-lazy.module.ts} | 74 ++++++++-----------
 src/addons/competency/competency.module.ts    | 22 ++++--
 .../pages/competencies/competencies.module.ts | 28 +++++++
 .../{competencies.ts => competencies.page.ts} | 22 +++---
 .../pages/competency/competency.module.ts     | 28 +++++++
 .../{competency.ts => competency.page.ts}     |  6 +-
 .../competencysummary.module.ts               | 28 +++++++
 ...cysummary.ts => competencysummary.page.ts} |  6 +-
 .../coursecompetencies.page.ts                | 23 +++---
 src/addons/competency/pages/plan/plan.ts      |  8 +-
 .../competency/pages/planlist/planlist.ts     | 34 ++++++---
 .../services/handlers/competency-link.ts      | 33 ++++++---
 .../services/handlers/course-option.ts        |  4 +-
 .../competency/services/handlers/plan-link.ts |  4 +-
 .../services/handlers/plans-link.ts           |  4 +-
 .../services/handlers/push-click.ts           | 38 +++++++---
 .../services/handlers/user-competency-link.ts |  6 +-
 .../competency/services/handlers/user.ts      | 12 ++-
 21 files changed, 321 insertions(+), 139 deletions(-)
 rename src/addons/competency/{competency-course-lazy.module.ts => competency-course-contents-lazy.module.ts} (95%)
 create mode 100644 src/addons/competency/competency-course-details-lazy.module.ts
 rename src/addons/competency/{competency-lazy.module.ts => competency-learning-plans-lazy.module.ts} (67%)
 create mode 100644 src/addons/competency/pages/competencies/competencies.module.ts
 rename src/addons/competency/pages/competencies/{competencies.ts => competencies.page.ts} (89%)
 create mode 100644 src/addons/competency/pages/competency/competency.module.ts
 rename src/addons/competency/pages/competency/{competency.ts => competency.page.ts} (97%)
 create mode 100644 src/addons/competency/pages/competencysummary/competencysummary.module.ts
 rename src/addons/competency/pages/competencysummary/{competencysummary.ts => competencysummary.page.ts} (94%)

diff --git a/src/addons/block/learningplans/services/block-handler.ts b/src/addons/block/learningplans/services/block-handler.ts
index 316884f45..ca4caa9e3 100644
--- a/src/addons/block/learningplans/services/block-handler.ts
+++ b/src/addons/block/learningplans/services/block-handler.ts
@@ -17,7 +17,7 @@ import { CoreBlockHandlerData } from '@features/block/services/block-delegate';
 import { CoreBlockOnlyTitleComponent } from '@features/block/components/only-title-block/only-title-block';
 import { CoreBlockBaseHandler } from '@features/block/classes/base-block-handler';
 import { makeSingleton } from '@singletons';
-import { ADDON_COMPETENCY_MAIN_PAGE_NAME } from '@addons/competency/competency.module';
+import { ADDON_COMPETENCY_LEARNING_PLANS_PAGE } from '@addons/competency/competency.module';
 
 /**
  * Block handler.
@@ -38,7 +38,7 @@ export class AddonBlockLearningPlansHandlerService extends CoreBlockBaseHandler
             title: 'addon.block_learningplans.pluginname',
             class: 'addon-block-learning-plans',
             component: CoreBlockOnlyTitleComponent,
-            link: ADDON_COMPETENCY_MAIN_PAGE_NAME,
+            link: ADDON_COMPETENCY_LEARNING_PLANS_PAGE,
             navOptions: {
                 preferCurrentTab: false,
             },
diff --git a/src/addons/competency/competency-course-lazy.module.ts b/src/addons/competency/competency-course-contents-lazy.module.ts
similarity index 95%
rename from src/addons/competency/competency-course-lazy.module.ts
rename to src/addons/competency/competency-course-contents-lazy.module.ts
index 860401684..f132f614b 100644
--- a/src/addons/competency/competency-course-lazy.module.ts
+++ b/src/addons/competency/competency-course-contents-lazy.module.ts
@@ -15,8 +15,8 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
-import { AddonCompetencyCourseCompetenciesPageModule } from './pages/coursecompetencies/coursecompetencies.module';
 import { AddonCompetencyCourseCompetenciesPage } from './pages/coursecompetencies/coursecompetencies.page';
+import { AddonCompetencyCourseCompetenciesPageModule } from './pages/coursecompetencies/coursecompetencies.module';
 
 const routes: Routes = [
     {
@@ -31,4 +31,4 @@ const routes: Routes = [
         AddonCompetencyCourseCompetenciesPageModule,
     ],
 })
-export class AddonCompetencyCourseLazyModule {}
+export class AddonCompetencyCourseContentsLazyModule {}
diff --git a/src/addons/competency/competency-course-details-lazy.module.ts b/src/addons/competency/competency-course-details-lazy.module.ts
new file mode 100644
index 000000000..4d9bf9ea7
--- /dev/null
+++ b/src/addons/competency/competency-course-details-lazy.module.ts
@@ -0,0 +1,72 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { RouterModule, Routes } from '@angular/router';
+
+import { AddonCompetencyCompetencyPage } from './pages/competency/competency.page';
+import { AddonCompetencyCompetencySummaryPage } from './pages/competencysummary/competencysummary.page';
+import { ADDON_COMPETENCY_SUMMARY_PAGE } from './competency.module';
+import { AddonCompetencyCompetencyPageModule } from './pages/competency/competency.module';
+import { AddonCompetencyCompetencySummaryPageModule } from './pages/competencysummary/competencysummary.module';
+import { AddonCompetencyCourseCompetenciesPage } from './pages/coursecompetencies/coursecompetencies.page';
+import { AddonCompetencyCourseCompetenciesPageModule } from './pages/coursecompetencies/coursecompetencies.module';
+import { AddonCompetencyCompetenciesPage } from './pages/competencies/competencies.page';
+import { conditionalRoutes } from '@/app/app-routing.module';
+import { CoreScreen } from '@services/screen';
+import { AddonCompetencyCompetenciesPageModule } from './pages/competencies/competencies.module';
+
+const mobileRoutes: Routes = [
+    {
+        path: '',
+        component: AddonCompetencyCourseCompetenciesPage,
+    },
+    {
+        path: ':competencyId',
+        component: AddonCompetencyCompetencyPage,
+    },
+];
+
+const tabletRoutes: Routes = [
+    {
+        path: '',
+        component: AddonCompetencyCompetenciesPage,
+        children: [
+            {
+                path: ':competencyId',
+                component: AddonCompetencyCompetencyPage,
+            },
+        ],
+    },
+];
+
+const routes: Routes = [
+    ...conditionalRoutes(mobileRoutes, () => CoreScreen.isMobile),
+    ...conditionalRoutes(tabletRoutes, () => CoreScreen.isTablet),
+    {
+        path: `:competencyId/${ADDON_COMPETENCY_SUMMARY_PAGE}`,
+        component: AddonCompetencyCompetencySummaryPage,
+    },
+];
+
+@NgModule({
+    imports: [
+        RouterModule.forChild(routes),
+        AddonCompetencyCourseCompetenciesPageModule,
+        AddonCompetencyCompetenciesPageModule,
+        AddonCompetencyCompetencyPageModule,
+        AddonCompetencyCompetencySummaryPageModule,
+    ],
+})
+export class AddonCompetencyCourseDetailsLazyModule {}
diff --git a/src/addons/competency/competency-lazy.module.ts b/src/addons/competency/competency-learning-plans-lazy.module.ts
similarity index 67%
rename from src/addons/competency/competency-lazy.module.ts
rename to src/addons/competency/competency-learning-plans-lazy.module.ts
index 09dce93a7..79dcab799 100644
--- a/src/addons/competency/competency-lazy.module.ts
+++ b/src/addons/competency/competency-learning-plans-lazy.module.ts
@@ -20,11 +20,13 @@ import { CoreScreen } from '@services/screen';
 import { CoreSharedModule } from '@/core/shared.module';
 import { AddonCompetencyPlanPage } from './pages/plan/plan';
 import { AddonCompetencyPlanListPage } from './pages/planlist/planlist';
-import { AddonCompetencyCompetenciesPage } from './pages/competencies/competencies';
-import { AddonCompetencyCompetencyPage } from './pages/competency/competency';
-import { AddonCompetencyCompetencySummaryPage } from './pages/competencysummary/competencysummary';
-import { AddonCompetencyCourseCompetenciesPage } from './pages/coursecompetencies/coursecompetencies.page';
-import { AddonCompetencyCourseCompetenciesPageModule } from './pages/coursecompetencies/coursecompetencies.module';
+import { AddonCompetencyCompetencyPage } from './pages/competency/competency.page';
+import { AddonCompetencyCompetencySummaryPage } from './pages/competencysummary/competencysummary.page';
+import { ADDON_COMPETENCY_COMPETENCIES_PAGE, ADDON_COMPETENCY_SUMMARY_PAGE } from './competency.module';
+import { AddonCompetencyCompetencyPageModule } from './pages/competency/competency.module';
+import { AddonCompetencyCompetencySummaryPageModule } from './pages/competencysummary/competencysummary.module';
+import { AddonCompetencyCompetenciesPage } from './pages/competencies/competencies.page';
+import { AddonCompetencyCompetenciesPageModule } from './pages/competencies/competencies.module';
 
 const mobileRoutes: Routes = [
     {
@@ -33,34 +35,28 @@ const mobileRoutes: Routes = [
         component: AddonCompetencyPlanListPage,
     },
     {
-        path: 'competencies',
-        component: AddonCompetencyCompetenciesPage,
-    },
-    {
-        path: 'competencies/:competencyId',
-        component: AddonCompetencyCompetencyPage,
-    },
-    {
-        path: 'course/:courseId',
-        component: AddonCompetencyCourseCompetenciesPage,
-    },
-    {
-        path: 'summary/:competencyId',
-        component: AddonCompetencyCompetencySummaryPage,
-    },
-    {
-        path: ':planId',
+        path: `:planId/${ADDON_COMPETENCY_COMPETENCIES_PAGE}`,
         component: AddonCompetencyPlanPage,
     },
+    {
+        path: `:planId/${ADDON_COMPETENCY_COMPETENCIES_PAGE}/:competencyId`,
+        component: AddonCompetencyCompetencyPage,
+    },
 ];
 
 const tabletRoutes: Routes = [
     {
-        path: 'summary/:competencyId',
-        component: AddonCompetencyCompetencySummaryPage,
+        path: '',
+        component: AddonCompetencyPlanListPage,
+        children: [
+            {
+                path: `:planId/${ADDON_COMPETENCY_COMPETENCIES_PAGE}`,
+                component: AddonCompetencyPlanPage,
+            },
+        ],
     },
     {
-        path: 'competencies',
+        path: `:planId/${ADDON_COMPETENCY_COMPETENCIES_PAGE}`,
         component: AddonCompetencyCompetenciesPage,
         children: [
             {
@@ -69,40 +65,28 @@ const tabletRoutes: Routes = [
             },
         ],
     },
-    {
-        path: 'course/:courseId',
-        component: AddonCompetencyCourseCompetenciesPage,
-    },
-    {
-        path: '',
-        component: AddonCompetencyPlanListPage,
-        children: [
-            {
-                path: ':planId',
-                component: AddonCompetencyPlanPage,
-            },
-
-        ],
-    },
 ];
 
 const routes: Routes = [
     ...conditionalRoutes(mobileRoutes, () => CoreScreen.isMobile),
     ...conditionalRoutes(tabletRoutes, () => CoreScreen.isTablet),
+    {
+        path: `:planId/${ADDON_COMPETENCY_COMPETENCIES_PAGE}/:competencyId/${ADDON_COMPETENCY_SUMMARY_PAGE}`,
+        component: AddonCompetencyCompetencySummaryPage,
+    },
 ];
 
 @NgModule({
     imports: [
         RouterModule.forChild(routes),
         CoreSharedModule,
-        AddonCompetencyCourseCompetenciesPageModule,
+        AddonCompetencyCompetenciesPageModule,
+        AddonCompetencyCompetencyPageModule,
+        AddonCompetencyCompetencySummaryPageModule,
     ],
     declarations: [
         AddonCompetencyPlanPage,
         AddonCompetencyPlanListPage,
-        AddonCompetencyCompetenciesPage,
-        AddonCompetencyCompetencyPage,
-        AddonCompetencyCompetencySummaryPage,
     ],
 })
-export class AddonCompetencyLazyModule {}
+export class AddonCompetencyLearningPlansLazyModule {}
diff --git a/src/addons/competency/competency.module.ts b/src/addons/competency/competency.module.ts
index a20438615..b55e996c8 100644
--- a/src/addons/competency/competency.module.ts
+++ b/src/addons/competency/competency.module.ts
@@ -30,6 +30,8 @@ import { Routes } from '@angular/router';
 import { CoreMainMenuRoutingModule } from '@features/mainmenu/mainmenu-routing.module';
 import { CoreMainMenuTabRoutingModule } from '@features/mainmenu/mainmenu-tab-routing.module';
 import { CoreCourseIndexRoutingModule } from '@features/course/pages/index/index-routing.module';
+import { COURSE_PAGE_NAME } from '@features/course/course.module';
+import { PARTICIPANTS_PAGE_NAME } from '@features/user/user.module';
 
 // List of providers (without handlers).
 export const ADDON_COMPETENCY_SERVICES: Type<unknown>[] = [
@@ -37,19 +39,29 @@ export const ADDON_COMPETENCY_SERVICES: Type<unknown>[] = [
     AddonCompetencyHelperProvider,
 ];
 
-export const ADDON_COMPETENCY_MAIN_PAGE_NAME = 'competency';
+export const ADDON_COMPETENCY_LEARNING_PLANS_PAGE = 'learning-plans';
+export const ADDON_COMPETENCY_COMPETENCIES_PAGE = 'competencies';
+export const ADDON_COMPETENCY_SUMMARY_PAGE = 'summary';
 
 const mainMenuChildrenRoutes: Routes = [
     {
-        path: ADDON_COMPETENCY_MAIN_PAGE_NAME,
-        loadChildren: () => import('./competency-lazy.module').then(m => m.AddonCompetencyLazyModule),
+        path: ADDON_COMPETENCY_LEARNING_PLANS_PAGE,
+        loadChildren: () => import('./competency-learning-plans-lazy.module').then(m => m.AddonCompetencyLearningPlansLazyModule),
+    },
+    {
+        path: `${COURSE_PAGE_NAME}/:courseId/${ADDON_COMPETENCY_COMPETENCIES_PAGE}`,
+        loadChildren: () => import('./competency-course-details-lazy.module').then(m => m.AddonCompetencyCourseDetailsLazyModule),
+    },
+    {
+        path: `${COURSE_PAGE_NAME}/:courseId/${PARTICIPANTS_PAGE_NAME}/:userId/${ADDON_COMPETENCY_COMPETENCIES_PAGE}`,
+        loadChildren: () => import('./competency-course-details-lazy.module').then(m => m.AddonCompetencyCourseDetailsLazyModule),
     },
 ];
 
 const courseIndexRoutes: Routes = [
     {
-        path: ADDON_COMPETENCY_MAIN_PAGE_NAME,
-        loadChildren: () => import('@addons/competency/competency-course-lazy.module').then(m => m.AddonCompetencyCourseLazyModule),
+        path: ADDON_COMPETENCY_COMPETENCIES_PAGE,
+        loadChildren: () => import('./competency-course-contents-lazy.module').then(m => m.AddonCompetencyCourseContentsLazyModule),
     },
 ];
 
diff --git a/src/addons/competency/pages/competencies/competencies.module.ts b/src/addons/competency/pages/competencies/competencies.module.ts
new file mode 100644
index 000000000..107a73c21
--- /dev/null
+++ b/src/addons/competency/pages/competencies/competencies.module.ts
@@ -0,0 +1,28 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreSharedModule } from '@/core/shared.module';
+import { AddonCompetencyCompetenciesPage } from './competencies.page';
+
+@NgModule({
+    imports: [
+        CoreSharedModule,
+    ],
+    declarations: [
+        AddonCompetencyCompetenciesPage,
+    ],
+})
+export class AddonCompetencyCompetenciesPageModule {}
diff --git a/src/addons/competency/pages/competencies/competencies.ts b/src/addons/competency/pages/competencies/competencies.page.ts
similarity index 89%
rename from src/addons/competency/pages/competencies/competencies.ts
rename to src/addons/competency/pages/competencies/competencies.page.ts
index 821e9db57..82ab1474b 100644
--- a/src/addons/competency/pages/competencies/competencies.ts
+++ b/src/addons/competency/pages/competencies/competencies.page.ts
@@ -19,7 +19,7 @@ import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import {
     AddonCompetencyDataForPlanPageCompetency, AddonCompetencyDataForCourseCompetenciesPageCompetency, AddonCompetency,
 } from '../../services/competency';
-import { Params, ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Params } from '@angular/router';
 import { CorePageItemsListManager } from '@classes/page-items-list-manager';
 import { Translate } from '@singletons';
 import { CoreNavigator } from '@services/navigator';
@@ -51,8 +51,7 @@ export class AddonCompetencyCompetenciesPage implements AfterViewInit, OnDestroy
             this.userId = CoreNavigator.getRouteNumberParam('userId', { route });
         }
 
-        this.competencies =
-            new AddonCompetencyListManager(AddonCompetencyCompetenciesPage, this.planId, this.courseId, this.userId);
+        this.competencies = new AddonCompetencyListManager(AddonCompetencyCompetenciesPage, this.userId);
     }
 
     /**
@@ -133,14 +132,11 @@ type AddonCompetencyDataForPlanPageCompetencyFormatted =
  */
 class AddonCompetencyListManager extends CorePageItemsListManager<AddonCompetencyDataForPlanPageCompetencyFormatted> {
 
-    planId?: number;
-    courseId?: number;
-    userId?: number;
+    private userId?: number;
 
-    constructor(pageComponent: unknown, planId?: number, courseId?: number, userId?: number) {
+    constructor(pageComponent: unknown, userId?: number) {
         super(pageComponent);
-        this.planId = planId;
-        this.courseId = courseId;
+
         this.userId = userId;
     }
 
@@ -155,11 +151,11 @@ class AddonCompetencyListManager extends CorePageItemsListManager<AddonCompetenc
      * @inheritdoc
      */
     protected getItemQueryParams(): Params {
-        if (this.planId) {
-            return { planId: this.planId };
-        } else {
-            return { courseId: this.courseId, userId: this.userId };
+        if (this.userId) {
+            return { userId: this.userId };
         }
+
+        return {};
     }
 
 }
diff --git a/src/addons/competency/pages/competency/competency.module.ts b/src/addons/competency/pages/competency/competency.module.ts
new file mode 100644
index 000000000..3b09be305
--- /dev/null
+++ b/src/addons/competency/pages/competency/competency.module.ts
@@ -0,0 +1,28 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreSharedModule } from '@/core/shared.module';
+import { AddonCompetencyCompetencyPage } from './competency.page';
+
+@NgModule({
+    imports: [
+        CoreSharedModule,
+    ],
+    declarations: [
+        AddonCompetencyCompetencyPage,
+    ],
+})
+export class AddonCompetencyCompetencyPageModule {}
diff --git a/src/addons/competency/pages/competency/competency.ts b/src/addons/competency/pages/competency/competency.page.ts
similarity index 97%
rename from src/addons/competency/pages/competency/competency.ts
rename to src/addons/competency/pages/competency/competency.page.ts
index dba3905e4..94c08b897 100644
--- a/src/addons/competency/pages/competency/competency.ts
+++ b/src/addons/competency/pages/competency/competency.page.ts
@@ -32,7 +32,7 @@ import { CoreNavigator } from '@services/navigator';
 import { IonRefresher } from '@ionic/angular';
 import { ContextLevel } from '@/core/constants';
 import { CoreUtils } from '@services/utils/utils';
-import { ADDON_COMPETENCY_MAIN_PAGE_NAME } from '@addons/competency/competency.module';
+import { ADDON_COMPETENCY_SUMMARY_PAGE } from '@addons/competency/competency.module';
 
 /**
  * Page that displays the competency information.
@@ -183,8 +183,8 @@ export class AddonCompetencyCompetencyPage implements OnInit {
      * @param competencyId
      */
     openCompetencySummary(competencyId: number): void {
-        CoreNavigator.navigateToSitePath(
-            ADDON_COMPETENCY_MAIN_PAGE_NAME + '/summary/' + competencyId,
+        CoreNavigator.navigate(
+            `../${competencyId}/${ADDON_COMPETENCY_SUMMARY_PAGE}`,
             {
                 params: { contextLevel: this.contextLevel, contextInstanceId: this.contextInstanceId },
             },
diff --git a/src/addons/competency/pages/competencysummary/competencysummary.module.ts b/src/addons/competency/pages/competencysummary/competencysummary.module.ts
new file mode 100644
index 000000000..d09a75ec0
--- /dev/null
+++ b/src/addons/competency/pages/competencysummary/competencysummary.module.ts
@@ -0,0 +1,28 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreSharedModule } from '@/core/shared.module';
+import { AddonCompetencyCompetencySummaryPage } from './competencysummary.page';
+
+@NgModule({
+    imports: [
+        CoreSharedModule,
+    ],
+    declarations: [
+        AddonCompetencyCompetencySummaryPage,
+    ],
+})
+export class AddonCompetencyCompetencySummaryPageModule {}
diff --git a/src/addons/competency/pages/competencysummary/competencysummary.ts b/src/addons/competency/pages/competencysummary/competencysummary.page.ts
similarity index 94%
rename from src/addons/competency/pages/competencysummary/competencysummary.ts
rename to src/addons/competency/pages/competencysummary/competencysummary.page.ts
index 5119dd2c8..b490c4ed4 100644
--- a/src/addons/competency/pages/competencysummary/competencysummary.ts
+++ b/src/addons/competency/pages/competencysummary/competencysummary.page.ts
@@ -19,7 +19,7 @@ import { IonRefresher } from '@ionic/angular';
 import { CoreNavigator } from '@services/navigator';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
-import { ADDON_COMPETENCY_MAIN_PAGE_NAME } from '@addons/competency/competency.module';
+import { ADDON_COMPETENCY_SUMMARY_PAGE } from '@addons/competency/competency.module';
 
 /**
  * Page that displays the competency summary.
@@ -101,8 +101,8 @@ export class AddonCompetencyCompetencySummaryPage implements OnInit {
      * @param competencyId
      */
     openCompetencySummary(competencyId: number): void {
-        CoreNavigator.navigateToSitePath(
-            ADDON_COMPETENCY_MAIN_PAGE_NAME + '/summary/' + competencyId,
+        CoreNavigator.navigate(
+            `../../${competencyId}/${ADDON_COMPETENCY_SUMMARY_PAGE}`,
             {
                 params: { contextLevel: this.contextLevel, contextInstanceId: this.contextInstanceId },
             },
diff --git a/src/addons/competency/pages/coursecompetencies/coursecompetencies.page.ts b/src/addons/competency/pages/coursecompetencies/coursecompetencies.page.ts
index 9302289c4..4ad29a386 100644
--- a/src/addons/competency/pages/coursecompetencies/coursecompetencies.page.ts
+++ b/src/addons/competency/pages/coursecompetencies/coursecompetencies.page.ts
@@ -20,7 +20,7 @@ import { IonRefresher } from '@ionic/angular';
 import { CoreNavigator } from '@services/navigator';
 import { CoreDomUtils } from '@services/utils/dom';
 import { ContextLevel } from '@/core/constants';
-import { ADDON_COMPETENCY_MAIN_PAGE_NAME } from '@addons/competency/competency.module';
+import { ADDON_COMPETENCY_SUMMARY_PAGE } from '@addons/competency/competency.module';
 
 /**
  * Page that displays the list of competencies of a course.
@@ -80,12 +80,7 @@ export class AddonCompetencyCourseCompetenciesPage implements OnInit {
      * @param competencyId
      */
     openCompetency(competencyId: number): void {
-        CoreNavigator.navigateToSitePath(
-            ADDON_COMPETENCY_MAIN_PAGE_NAME + '/competencies/' + competencyId,
-            {
-                params: { courseId: this.courseId, userId: this.userId },
-            },
-        );
+        CoreNavigator.navigate('./' + competencyId);
     }
 
     /**
@@ -94,11 +89,15 @@ export class AddonCompetencyCourseCompetenciesPage implements OnInit {
      * @param competencyId
      */
     openCompetencySummary(competencyId: number): void {
-        CoreNavigator.navigateToSitePath(ADDON_COMPETENCY_MAIN_PAGE_NAME + '/summary/' + competencyId, {
-            params: {
-                contextLevel: ContextLevel.COURSE,
-                contextInstanceId: this.courseId,
-            } });
+        CoreNavigator.navigateToSitePath(
+            `./${competencyId}/${ADDON_COMPETENCY_SUMMARY_PAGE}`,
+            {
+                params: {
+                    contextLevel: ContextLevel.COURSE,
+                    contextInstanceId: this.courseId,
+                },
+            },
+        );
     }
 
     /**
diff --git a/src/addons/competency/pages/plan/plan.ts b/src/addons/competency/pages/plan/plan.ts
index aafe9c4d8..e154da006 100644
--- a/src/addons/competency/pages/plan/plan.ts
+++ b/src/addons/competency/pages/plan/plan.ts
@@ -19,7 +19,6 @@ import { AddonCompetencyHelper } from '../../services/competency-helper';
 import { CoreNavigator } from '@services/navigator';
 import { CoreUserProfile } from '@features/user/services/user';
 import { IonRefresher } from '@ionic/angular';
-import { ADDON_COMPETENCY_MAIN_PAGE_NAME } from '@addons/competency/competency.module';
 
 /**
  * Page that displays a learning plan.
@@ -79,10 +78,9 @@ export class AddonCompetencyPlanPage implements OnInit {
      * @param competencyId
      */
     openCompetency(competencyId: number): void {
-        CoreNavigator.navigateToSitePath(
-            ADDON_COMPETENCY_MAIN_PAGE_NAME + '/competencies/' + competencyId,
-            { params: { planId: this.planId } },
-        );
+        CoreNavigator.navigate('./' + competencyId, {
+            params: { userId: this.user?.id },
+        });
     }
 
     /**
diff --git a/src/addons/competency/pages/planlist/planlist.ts b/src/addons/competency/pages/planlist/planlist.ts
index 4e414fde7..59f878ca7 100644
--- a/src/addons/competency/pages/planlist/planlist.ts
+++ b/src/addons/competency/pages/planlist/planlist.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { AfterViewInit, Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { AfterViewInit, Component, OnDestroy, ViewChild } from '@angular/core';
 import { IonRefresher } from '@ionic/angular';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
@@ -20,6 +20,8 @@ import { AddonCompetencyProvider, AddonCompetencyPlan, AddonCompetency } from '.
 import { AddonCompetencyHelper } from '../../services/competency-helper';
 import { CoreNavigator } from '@services/navigator';
 import { CorePageItemsListManager } from '@classes/page-items-list-manager';
+import { ADDON_COMPETENCY_COMPETENCIES_PAGE } from '@addons/competency/competency.module';
+import { Params } from '@angular/router';
 
 /**
  * Page that displays the list of learning plans.
@@ -28,7 +30,7 @@ import { CorePageItemsListManager } from '@classes/page-items-list-manager';
     selector: 'page-addon-competency-planlist',
     templateUrl: 'planlist.html',
 })
-export class AddonCompetencyPlanListPage implements OnInit, AfterViewInit, OnDestroy {
+export class AddonCompetencyPlanListPage implements AfterViewInit, OnDestroy {
 
     @ViewChild(CoreSplitViewComponent) splitView!: CoreSplitViewComponent;
 
@@ -36,14 +38,9 @@ export class AddonCompetencyPlanListPage implements OnInit, AfterViewInit, OnDes
     plans: AddonCompetencyPlanListManager;
 
     constructor() {
-        this.plans = new AddonCompetencyPlanListManager(AddonCompetencyPlanListPage);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    ngOnInit(): void {
         this.userId = CoreNavigator.getRouteNumberParam('userId');
+
+        this.plans = new AddonCompetencyPlanListManager(AddonCompetencyPlanListPage, this.userId);
     }
 
     /**
@@ -118,15 +115,30 @@ type AddonCompetencyPlanFormatted = AddonCompetencyPlan & {
  */
 class AddonCompetencyPlanListManager extends CorePageItemsListManager<AddonCompetencyPlanFormatted> {
 
-    constructor(pageComponent: unknown) {
+    private userId?: number;
+
+    constructor(pageComponent: unknown, userId?: number) {
         super(pageComponent);
+
+        this.userId = userId;
     }
 
     /**
      * @inheritdoc
      */
     protected getItemPath(plan: AddonCompetencyPlanFormatted): string {
-        return String(plan.id);
+        return `${plan.id}/${ADDON_COMPETENCY_COMPETENCIES_PAGE}`;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected getItemQueryParams(): Params {
+        if (this.userId) {
+            return { userId: this.userId };
+        }
+
+        return {};
     }
 
 }
diff --git a/src/addons/competency/services/handlers/competency-link.ts b/src/addons/competency/services/handlers/competency-link.ts
index 2ae81e974..15bc6cc1a 100644
--- a/src/addons/competency/services/handlers/competency-link.ts
+++ b/src/addons/competency/services/handlers/competency-link.ts
@@ -12,10 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { ADDON_COMPETENCY_MAIN_PAGE_NAME } from '@addons/competency/competency.module';
+import { ADDON_COMPETENCY_COMPETENCIES_PAGE, ADDON_COMPETENCY_LEARNING_PLANS_PAGE } from '@addons/competency/competency.module';
 import { Injectable } from '@angular/core';
 import { CoreContentLinksHandlerBase } from '@features/contentlinks/classes/base-handler';
 import { CoreContentLinksAction } from '@features/contentlinks/services/contentlinks-delegate';
+import { COURSE_PAGE_NAME } from '@features/course/course.module';
 import { CoreNavigator } from '@services/navigator';
 import { makeSingleton } from '@singletons';
 import { AddonCompetency } from '../competency';
@@ -37,17 +38,29 @@ export class AddonCompetencyCompetencyLinkHandlerService extends CoreContentLink
 
         return [{
             action: (siteId: string): void => {
-                const pageParams = {
-                    planId: params.planid,
-                    courseId: courseId,
-                    userId: params.userid,
-                };
+                if (courseId) {
+                    CoreNavigator.navigateToSitePath(
+                        `${COURSE_PAGE_NAME}/${courseId}/${ADDON_COMPETENCY_COMPETENCIES_PAGE}`,
+                        {
+                            params: { userId: params.userid },
+                            siteId,
+                        },
+                    );
 
-                CoreNavigator.navigateToSitePath(
-                    ADDON_COMPETENCY_MAIN_PAGE_NAME + '/competencies/' + params.competencyid,
-                    { params: pageParams, siteId },
-                );
+                    return;
+                }
 
+                if (params.planid) {
+                    CoreNavigator.navigateToSitePath(
+                        `${ADDON_COMPETENCY_LEARNING_PLANS_PAGE}/competencies/${params.planid}`,
+                        {
+                            params: { userId: params.userid },
+                            siteId,
+                        },
+                    );
+
+                    return;
+                }
             },
         }];
     }
diff --git a/src/addons/competency/services/handlers/course-option.ts b/src/addons/competency/services/handlers/course-option.ts
index d46c2d6fa..1020fcf09 100644
--- a/src/addons/competency/services/handlers/course-option.ts
+++ b/src/addons/competency/services/handlers/course-option.ts
@@ -25,7 +25,7 @@ import { CoreCourseUserAdminOrNavOptionIndexed } from '@features/courses/service
 import { CoreEnrolledCourseDataWithExtraInfoAndOptions } from '@features/courses/services/courses-helper';
 import { CoreFilterHelper } from '@features/filter/services/filter-helper';
 import { ContextLevel } from '@/core/constants';
-import { ADDON_COMPETENCY_MAIN_PAGE_NAME } from '@addons/competency/competency.module';
+import { ADDON_COMPETENCY_COMPETENCIES_PAGE } from '@addons/competency/competency.module';
 
 /**
  * Course nav handler.
@@ -75,7 +75,7 @@ export class AddonCompetencyCourseOptionHandlerService implements CoreCourseOpti
         return {
             title: 'addon.competency.competencies',
             class: 'addon-competency-course-handler',
-            page: ADDON_COMPETENCY_MAIN_PAGE_NAME,
+            page: ADDON_COMPETENCY_COMPETENCIES_PAGE,
         };
     }
 
diff --git a/src/addons/competency/services/handlers/plan-link.ts b/src/addons/competency/services/handlers/plan-link.ts
index 7ac937d62..e38bb136a 100644
--- a/src/addons/competency/services/handlers/plan-link.ts
+++ b/src/addons/competency/services/handlers/plan-link.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { ADDON_COMPETENCY_MAIN_PAGE_NAME } from '@addons/competency/competency.module';
+import { ADDON_COMPETENCY_LEARNING_PLANS_PAGE } from '@addons/competency/competency.module';
 import { Injectable } from '@angular/core';
 import { CoreContentLinksHandlerBase } from '@features/contentlinks/classes/base-handler';
 import { CoreContentLinksAction } from '@features/contentlinks/services/contentlinks-delegate';
@@ -36,7 +36,7 @@ export class AddonCompetencyPlanLinkHandlerService extends CoreContentLinksHandl
         return [{
             action: (siteId: string): void => {
                 CoreNavigator.navigateToSitePath(
-                    ADDON_COMPETENCY_MAIN_PAGE_NAME + '/' + params.id,
+                    `${ADDON_COMPETENCY_LEARNING_PLANS_PAGE}/${params.id}`,
                     { siteId },
                 );
             },
diff --git a/src/addons/competency/services/handlers/plans-link.ts b/src/addons/competency/services/handlers/plans-link.ts
index bfa9e8fd5..2f5bddeb4 100644
--- a/src/addons/competency/services/handlers/plans-link.ts
+++ b/src/addons/competency/services/handlers/plans-link.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { ADDON_COMPETENCY_MAIN_PAGE_NAME } from '@addons/competency/competency.module';
+import { ADDON_COMPETENCY_LEARNING_PLANS_PAGE } from '@addons/competency/competency.module';
 import { Injectable } from '@angular/core';
 import { CoreContentLinksHandlerBase } from '@features/contentlinks/classes/base-handler';
 import { CoreContentLinksAction } from '@features/contentlinks/services/contentlinks-delegate';
@@ -36,7 +36,7 @@ export class AddonCompetencyPlansLinkHandlerService extends CoreContentLinksHand
         return [{
             action: (siteId: string): void => {
                 CoreNavigator.navigateToSitePath(
-                    ADDON_COMPETENCY_MAIN_PAGE_NAME,
+                    ADDON_COMPETENCY_LEARNING_PLANS_PAGE,
                     { params: { userId: params.userid }, siteId },
                 );
 
diff --git a/src/addons/competency/services/handlers/push-click.ts b/src/addons/competency/services/handlers/push-click.ts
index 12f2f7a4c..8172821e2 100644
--- a/src/addons/competency/services/handlers/push-click.ts
+++ b/src/addons/competency/services/handlers/push-click.ts
@@ -12,8 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { ADDON_COMPETENCY_MAIN_PAGE_NAME } from '@addons/competency/competency.module';
+import { ADDON_COMPETENCY_COMPETENCIES_PAGE, ADDON_COMPETENCY_LEARNING_PLANS_PAGE } from '@addons/competency/competency.module';
 import { Injectable } from '@angular/core';
+import { COURSE_PAGE_NAME } from '@features/course/course.module';
 import { CorePushNotificationsClickHandler } from '@features/pushnotifications/services/push-delegate';
 import { CorePushNotificationsNotificationBasicData } from '@features/pushnotifications/services/pushnotifications';
 import { CoreNavigator } from '@services/navigator';
@@ -56,7 +57,7 @@ export class AddonCompetencyPushClickHandlerService implements CorePushNotificat
 
             await CoreUtils.ignoreErrors(AddonCompetency.invalidateLearningPlan(planId, notification.site));
 
-            await CoreNavigator.navigateToSitePath(ADDON_COMPETENCY_MAIN_PAGE_NAME + '/' + planId, {
+            await CoreNavigator.navigateToSitePath(`${ADDON_COMPETENCY_LEARNING_PLANS_PAGE}/${planId}`, {
                 siteId: notification.site,
             });
 
@@ -71,15 +72,30 @@ export class AddonCompetencyPushClickHandlerService implements CorePushNotificat
             const userId = Number(contextUrlParams.userid);
 
             await CoreUtils.ignoreErrors(AddonCompetency.invalidateCompetencyInPlan(planId, competencyId, notification.site));
-            await CoreNavigator.navigateToSitePath(
-                ADDON_COMPETENCY_MAIN_PAGE_NAME + '/competencies/' + competencyId,
-                {
-                    params: { planId, courseId, userId },
-                    siteId: notification.site,
-                },
-            );
 
-            return;
+            if (courseId) {
+                await CoreNavigator.navigateToSitePath(
+                    `${COURSE_PAGE_NAME}/${courseId}/${ADDON_COMPETENCY_COMPETENCIES_PAGE}/${competencyId}`,
+                    {
+                        params: { userId },
+                        siteId: notification.site,
+                    },
+                );
+
+                return;
+            }
+
+            if (planId) {
+                await CoreNavigator.navigateToSitePath(
+                    `${ADDON_COMPETENCY_LEARNING_PLANS_PAGE}/competencies/${planId}/${competencyId}`,
+                    {
+                        params: { userId },
+                        siteId: notification.site,
+                    },
+                );
+
+                return;
+            }
         }
 
         // Open the list of plans.
@@ -87,7 +103,7 @@ export class AddonCompetencyPushClickHandlerService implements CorePushNotificat
 
         await CoreUtils.ignoreErrors(AddonCompetency.invalidateLearningPlans(userId, notification.site));
 
-        await CoreNavigator.navigateToSitePath(ADDON_COMPETENCY_MAIN_PAGE_NAME, {
+        await CoreNavigator.navigateToSitePath(ADDON_COMPETENCY_LEARNING_PLANS_PAGE, {
             params: { userId },
             siteId: notification.site,
         });
diff --git a/src/addons/competency/services/handlers/user-competency-link.ts b/src/addons/competency/services/handlers/user-competency-link.ts
index 537984f28..adbab8a92 100644
--- a/src/addons/competency/services/handlers/user-competency-link.ts
+++ b/src/addons/competency/services/handlers/user-competency-link.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { ADDON_COMPETENCY_MAIN_PAGE_NAME } from '@addons/competency/competency.module';
+import { ADDON_COMPETENCY_COMPETENCIES_PAGE, ADDON_COMPETENCY_SUMMARY_PAGE } from '@addons/competency/competency.module';
 import { Injectable } from '@angular/core';
 import { CoreContentLinksHandlerBase } from '@features/contentlinks/classes/base-handler';
 import { CoreContentLinksAction } from '@features/contentlinks/services/contentlinks-delegate';
@@ -33,14 +33,12 @@ export class AddonCompetencyUserCompetencyLinkHandlerService extends CoreContent
      * @inheritdoc
      */
     getActions(siteIds: string[], url: string, params: Record<string, string>): CoreContentLinksAction[] {
-
         return [{
             action: (siteId: string): void => {
                 CoreNavigator.navigateToSitePath(
-                    ADDON_COMPETENCY_MAIN_PAGE_NAME + '/summary/' + params.id,
+                    `${ADDON_COMPETENCY_COMPETENCIES_PAGE}/${params.id}/${ADDON_COMPETENCY_SUMMARY_PAGE}`,
                     { siteId },
                 );
-
             },
         }];
     }
diff --git a/src/addons/competency/services/handlers/user.ts b/src/addons/competency/services/handlers/user.ts
index 356fbf94d..2bd346028 100644
--- a/src/addons/competency/services/handlers/user.ts
+++ b/src/addons/competency/services/handlers/user.ts
@@ -12,10 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { ADDON_COMPETENCY_MAIN_PAGE_NAME } from '@addons/competency/competency.module';
+import { ADDON_COMPETENCY_COMPETENCIES_PAGE, ADDON_COMPETENCY_LEARNING_PLANS_PAGE } from '@addons/competency/competency.module';
 import { Injectable } from '@angular/core';
+import { COURSE_PAGE_NAME } from '@features/course/course.module';
 import { CoreUserProfile } from '@features/user/services/user';
 import { CoreUserProfileHandler, CoreUserDelegateService, CoreUserProfileHandlerData } from '@features/user/services/user-delegate';
+import { PARTICIPANTS_PAGE_NAME } from '@features/user/user.module';
 import { CoreNavigator } from '@services/navigator';
 import { makeSingleton } from '@singletons';
 import { AddonCompetency } from '../competency';
@@ -69,12 +71,8 @@ export class AddonCompetencyUserHandlerService implements CoreUserProfileHandler
                     event.preventDefault();
                     event.stopPropagation();
                     CoreNavigator.navigateToSitePath(
-                        ADDON_COMPETENCY_MAIN_PAGE_NAME + '/course/' + courseId,
-                        {
-                            params: { userId: user.id },
-                        },
+                        [COURSE_PAGE_NAME, courseId, PARTICIPANTS_PAGE_NAME, user.id, ADDON_COMPETENCY_COMPETENCIES_PAGE].join('/'),
                     );
-
                 },
             };
         } else {
@@ -85,7 +83,7 @@ export class AddonCompetencyUserHandlerService implements CoreUserProfileHandler
                 action: (event, user): void => {
                     event.preventDefault();
                     event.stopPropagation();
-                    CoreNavigator.navigateToSitePath(ADDON_COMPETENCY_MAIN_PAGE_NAME, {
+                    CoreNavigator.navigateToSitePath(ADDON_COMPETENCY_LEARNING_PLANS_PAGE, {
                         params: { userId: user.id },
                     });
                 },

From 2dea93a60f5166c6c1fa2d13a86b7013be56ae40 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 12 Jan 2022 10:57:29 +0100
Subject: [PATCH 0329/1008] MOBILE-3922 core: Display tab to select in first
 position

---
 src/core/classes/delegate-sorted.ts           |  4 ++--
 .../services/handlers/dashboard-home.ts       |  3 +--
 .../services/handlers/my-courses-mainmenu.ts  |  6 +++++
 .../features/mainmenu/pages/home/home.html    |  2 +-
 src/core/features/mainmenu/pages/home/home.ts | 24 ++++---------------
 .../mainmenu/services/home-delegate.ts        |  7 +-----
 .../mainmenu/services/mainmenu-delegate.ts    |  5 ++++
 .../services/handlers/sitehome-home.ts        |  4 ++--
 8 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/src/core/classes/delegate-sorted.ts b/src/core/classes/delegate-sorted.ts
index ea4e99cce..d9e6069d7 100644
--- a/src/core/classes/delegate-sorted.ts
+++ b/src/core/classes/delegate-sorted.ts
@@ -118,14 +118,14 @@ export class CoreSortedDelegate<
             const handler = this.enabledHandlers[name];
             const data = <DisplayType> handler.getDisplayData();
 
-            data.priority = handler.priority || 0;
+            data.priority = data.priority ?? handler.priority ?? 0;
             data.name = handler.name;
 
             displayData.push(data);
         }
 
         // Sort them by priority.
-        displayData.sort((a, b) => b.priority! - a.priority!);
+        displayData.sort((a, b) => (b.priority ?? 0) - (a.priority ?? 0));
 
         this.loaded = true;
         this.sortedHandlersRxJs.next(displayData);
diff --git a/src/core/features/courses/services/handlers/dashboard-home.ts b/src/core/features/courses/services/handlers/dashboard-home.ts
index c06582993..521038dea 100644
--- a/src/core/features/courses/services/handlers/dashboard-home.ts
+++ b/src/core/features/courses/services/handlers/dashboard-home.ts
@@ -27,7 +27,7 @@ export class CoreDashboardHomeHandlerService implements CoreMainMenuHomeHandler
     static readonly PAGE_NAME = 'dashboard';
 
     name = 'CoreCoursesDashboard';
-    priority = 1100;
+    priority = 1200;
 
     /**
      * Check if the handler is enabled on a site level.
@@ -92,7 +92,6 @@ export class CoreDashboardHomeHandlerService implements CoreMainMenuHomeHandler
             page: CoreDashboardHomeHandlerService.PAGE_NAME,
             class: 'core-courses-dashboard-handler',
             icon: 'fas-tachometer-alt',
-            selectPriority: 1000,
         };
     }
 
diff --git a/src/core/features/courses/services/handlers/my-courses-mainmenu.ts b/src/core/features/courses/services/handlers/my-courses-mainmenu.ts
index 4d27add17..b800900f8 100644
--- a/src/core/features/courses/services/handlers/my-courses-mainmenu.ts
+++ b/src/core/features/courses/services/handlers/my-courses-mainmenu.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import { Injectable } from '@angular/core';
+import { CoreSiteInfoUserHomepage } from '@classes/site';
 import { CoreMainMenuHandler, CoreMainMenuHandlerData } from '@features/mainmenu/services/mainmenu-delegate';
 import { CoreSiteHomeHomeHandler } from '@features/sitehome/services/handlers/sitehome-home';
 import { CoreSites } from '@services/sites';
@@ -59,11 +60,16 @@ export class CoreCoursesMyCoursesMainMenuHandlerService implements CoreMainMenuH
      * @inheritdoc
      */
     getDisplayData(): CoreMainMenuHandlerData {
+        const site = CoreSites.getCurrentSite();
+
+        const displayMyCourses = site?.getInfo() && site?.getInfo()?.userhomepage === CoreSiteInfoUserHomepage.HOMEPAGE_MYCOURSES;
+
         return {
             title: 'core.courses.mycourses',
             page: CoreCoursesMyCoursesMainMenuHandlerService.PAGE_NAME,
             class: 'core-courses-my-courses-handler',
             icon: 'fas-graduation-cap',
+            priority: displayMyCourses ? this.priority + 200 : this.priority,
         };
     }
 
diff --git a/src/core/features/mainmenu/pages/home/home.html b/src/core/features/mainmenu/pages/home/home.html
index 7f670c80a..bb7bd1179 100644
--- a/src/core/features/mainmenu/pages/home/home.html
+++ b/src/core/features/mainmenu/pages/home/home.html
@@ -17,5 +17,5 @@
 <core-loading [hideUntil]="loaded">
     <core-empty-box *ngIf="tabs.length == 0" icon="fas-home" [message]="'core.courses.nocourses' | translate"></core-empty-box>
 </core-loading>
-<core-tabs-outlet *ngIf="tabs.length > 0" [selectedIndex]="selectedTab" [hideUntil]="loaded" [tabs]="tabs" (ionChange)="tabSelected()">
+<core-tabs-outlet *ngIf="tabs.length > 0" [hideUntil]="loaded" [tabs]="tabs" (ionChange)="tabSelected()">
 </core-tabs-outlet>
diff --git a/src/core/features/mainmenu/pages/home/home.ts b/src/core/features/mainmenu/pages/home/home.ts
index a4d89d00e..373305766 100644
--- a/src/core/features/mainmenu/pages/home/home.ts
+++ b/src/core/features/mainmenu/pages/home/home.ts
@@ -39,10 +39,9 @@ export class CoreMainMenuHomePage implements OnInit {
 
     @ViewChild(CoreTabsOutletComponent) tabsComponent?: CoreTabsOutletComponent;
 
-    siteName!: string;
+    siteName = '';
     tabs: CoreTabsOutletTab[] = [];
     loaded = false;
-    selectedTab?: number;
 
     protected subscription?: Subscription;
     protected updateSiteObserver?: CoreEventObserver;
@@ -109,21 +108,6 @@ export class CoreMainMenuHomePage implements OnInit {
         // Sort them by priority so new handlers are in the right position.
         newTabs.sort((a, b) => (handlersMap[b.title].priority || 0) - (handlersMap[a.title].priority || 0));
 
-        if (this.selectedTab === undefined && newTabs.length > 0) {
-            let maxPriority = 0;
-
-            this.selectedTab = Object.entries(newTabs).reduce((maxIndex, [index, tab]) => {
-                const selectPriority = handlersMap[tab.title].selectPriority ?? 0;
-
-                if (selectPriority > maxPriority) {
-                    maxPriority = selectPriority;
-                    maxIndex = Number(index);
-                }
-
-                return maxIndex;
-            }, 0);
-        }
-
         this.tabs = newTabs;
 
         // Try to prevent empty box displayed for an instant when it shouldn't.
@@ -136,7 +120,7 @@ export class CoreMainMenuHomePage implements OnInit {
      * Load the site name.
      */
     protected loadSiteName(): void {
-        this.siteName = CoreSites.getCurrentSite()!.getSiteName();
+        this.siteName = CoreSites.getCurrentSite()?.getSiteName() || '';
     }
 
     /**
@@ -171,8 +155,8 @@ export class CoreMainMenuHomePage implements OnInit {
         const actions = await CoreContentLinksDelegate.getActionsFor(url, undefined);
 
         const action = CoreContentLinksHelper.getFirstValidAction(actions);
-        if (action) {
-            action.action(action.sites![0]);
+        if (action?.sites?.[0]) {
+            action.action(action.sites[0]);
         }
     }
 
diff --git a/src/core/features/mainmenu/services/home-delegate.ts b/src/core/features/mainmenu/services/home-delegate.ts
index 588549137..636c9e486 100644
--- a/src/core/features/mainmenu/services/home-delegate.ts
+++ b/src/core/features/mainmenu/services/home-delegate.ts
@@ -72,12 +72,7 @@ export interface CoreMainMenuHomeHandlerData {
 /**
  * Data returned by the delegate for each handler.
  */
-export interface CoreMainMenuHomeHandlerToDisplay extends CoreDelegateToDisplay, CoreMainMenuHomeHandlerData {
-    /**
-     * Priority to select handler.
-     */
-    selectPriority?: number;
-}
+export interface CoreMainMenuHomeHandlerToDisplay extends CoreDelegateToDisplay, CoreMainMenuHomeHandlerData {}
 
 /**
  * Service to interact with plugins to be shown in the main menu. Provides functions to register a plugin
diff --git a/src/core/features/mainmenu/services/mainmenu-delegate.ts b/src/core/features/mainmenu/services/mainmenu-delegate.ts
index 2ecbb542d..97a7fa9ab 100644
--- a/src/core/features/mainmenu/services/mainmenu-delegate.ts
+++ b/src/core/features/mainmenu/services/mainmenu-delegate.ts
@@ -77,6 +77,11 @@ export interface CoreMainMenuHandlerData {
      * Whether the handler should only appear in More menu.
      */
     onlyInMore?: boolean;
+
+    /**
+     * Priority of the handler. If set, overrides the priority defined in CoreMainMenuHandler.
+     */
+    priority?: number;
 }
 
 /**
diff --git a/src/core/features/sitehome/services/handlers/sitehome-home.ts b/src/core/features/sitehome/services/handlers/sitehome-home.ts
index dfae92fd4..61e86b46b 100644
--- a/src/core/features/sitehome/services/handlers/sitehome-home.ts
+++ b/src/core/features/sitehome/services/handlers/sitehome-home.ts
@@ -28,7 +28,7 @@ export class CoreSiteHomeHomeHandlerService implements CoreMainMenuHomeHandler {
     static readonly PAGE_NAME = 'site';
 
     name = 'CoreSiteHomeDashboard';
-    priority = 1200;
+    priority = 1100;
 
     /**
      * Check if the handler is enabled on a site level.
@@ -64,7 +64,7 @@ export class CoreSiteHomeHomeHandlerService implements CoreMainMenuHomeHandler {
             page: CoreSiteHomeHomeHandlerService.PAGE_NAME,
             class: 'core-sitehome-dashboard-handler',
             icon: 'fas-home',
-            selectPriority: displaySiteHome ? 1100 : 900,
+            priority: displaySiteHome ? this.priority + 200 : this.priority,
         };
     }
 

From f53b783fc95de74d0849951d445275d5fe9f69a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 8 Nov 2021 16:19:08 +0100
Subject: [PATCH 0330/1008] MOBILE-3922 menu: Fix select initial main menu page

---
 .../features/mainmenu/mainmenu-lazy.module.ts |  1 -
 src/core/features/mainmenu/pages/home/home.ts |  3 +-
 src/core/features/mainmenu/pages/menu/menu.ts |  4 ++
 src/core/guards/redirect.ts                   |  3 +-
 src/core/services/navigator.ts                | 39 +++++++++++++++----
 src/core/services/tests/navigator.test.ts     | 19 +++++++--
 6 files changed, 55 insertions(+), 14 deletions(-)

diff --git a/src/core/features/mainmenu/mainmenu-lazy.module.ts b/src/core/features/mainmenu/mainmenu-lazy.module.ts
index 22f30d18b..579510de6 100644
--- a/src/core/features/mainmenu/mainmenu-lazy.module.ts
+++ b/src/core/features/mainmenu/mainmenu-lazy.module.ts
@@ -35,7 +35,6 @@ function buildRoutes(injector: Injector): Routes {
                 {
                     path: '',
                     pathMatch: 'full',
-                    redirectTo: CoreMainMenuHomeHandlerService.PAGE_NAME,
                 },
                 {
                     path: CoreMainMenuHomeHandlerService.PAGE_NAME,
diff --git a/src/core/features/mainmenu/pages/home/home.ts b/src/core/features/mainmenu/pages/home/home.ts
index 373305766..b5d9499a9 100644
--- a/src/core/features/mainmenu/pages/home/home.ts
+++ b/src/core/features/mainmenu/pages/home/home.ts
@@ -26,6 +26,7 @@ import { CoreCourseHelper } from '@features/course/services/course-helper';
 import { CoreCourse } from '@features/course/services/course';
 import { CoreContentLinksDelegate } from '@features/contentlinks/services/contentlinks-delegate';
 import { CoreContentLinksHelper } from '@features/contentlinks/services/contentlinks-helper';
+import { CoreMainMenuHomeHandlerService } from '@features/mainmenu/services/handlers/mainmenu';
 
 /**
  * Page that displays the Home.
@@ -96,7 +97,7 @@ export class CoreMainMenuHomePage implements OnInit {
             }
 
             return {
-                page: `/main/home/${handler.page}`,
+                page: `/main/${CoreMainMenuHomeHandlerService.PAGE_NAME}/${handler.page}`,
                 pageParams: handler.pageParams,
                 title: handler.title,
                 class: handler.class,
diff --git a/src/core/features/mainmenu/pages/menu/menu.ts b/src/core/features/mainmenu/pages/menu/menu.ts
index 465352809..d2b74958b 100644
--- a/src/core/features/mainmenu/pages/menu/menu.ts
+++ b/src/core/features/mainmenu/pages/menu/menu.ts
@@ -173,6 +173,10 @@ export class CoreMainMenuPage implements OnInit, OnDestroy {
 
         this.loaded = CoreMainMenuDelegate.areHandlersLoaded();
 
+        if (this.loaded && this.tabs[0] && !CoreNavigator.getCurrentMainMenuTab()) {
+            // No tab selected, select the first one.
+            this.mainTabs?.select(this.tabs[0].page);
+        }
     }
 
     /**
diff --git a/src/core/guards/redirect.ts b/src/core/guards/redirect.ts
index 5217a123a..dcb7c2950 100644
--- a/src/core/guards/redirect.ts
+++ b/src/core/guards/redirect.ts
@@ -14,6 +14,7 @@
 
 import { Injectable } from '@angular/core';
 import { CanActivate, CanLoad, UrlTree } from '@angular/router';
+import { CoreMainMenuHomeHandlerService } from '@features/mainmenu/services/handlers/mainmenu';
 import { CoreApp } from '@services/app';
 import { CoreRedirectPayload } from '@services/navigator';
 import { CoreSites } from '@services/sites';
@@ -59,7 +60,7 @@ export class CoreRedirectGuard implements CanLoad, CanActivate {
                 redirect.page,
                 redirect.options,
             );
-            const route = Router.parseUrl('/main/home');
+            const route = Router.parseUrl(`/main/${CoreMainMenuHomeHandlerService.PAGE_NAME}`);
 
             route.queryParams = {
                 redirectPath: redirect.page,
diff --git a/src/core/services/navigator.ts b/src/core/services/navigator.ts
index 8d7d02c81..a807a74ee 100644
--- a/src/core/services/navigator.ts
+++ b/src/core/services/navigator.ts
@@ -20,7 +20,6 @@ import { NavigationOptions } from '@ionic/angular/providers/nav-controller';
 import { CoreConstants } from '@/core/constants';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreMainMenu } from '@features/mainmenu/services/mainmenu';
-import { CoreMainMenuHomeHandlerService } from '@features/mainmenu/services/handlers/mainmenu';
 import { CoreObject } from '@singletons/object';
 import { CoreSites } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
@@ -31,8 +30,8 @@ import { CoreScreen } from './screen';
 import { CoreApp } from './app';
 import { CoreSitePlugins } from '@features/siteplugins/services/siteplugins';
 import { CoreError } from '@classes/errors/error';
-
-const DEFAULT_MAIN_MENU_TAB = CoreMainMenuHomeHandlerService.PAGE_NAME;
+import { CoreMainMenuDelegate } from '@features/mainmenu/services/mainmenu-delegate';
+import { CoreMainMenuHomeHandlerService } from '@features/mainmenu/services/handlers/mainmenu';
 
 /**
  * Redirect payload.
@@ -184,9 +183,12 @@ export class CoreNavigatorService {
      * @return Whether navigation suceeded.
      */
     async navigateToSiteHome(options: Omit<CoreNavigationOptions, 'reset'> & { siteId?: string } = {}): Promise<boolean> {
-        return this.navigateToSitePath(DEFAULT_MAIN_MENU_TAB, {
+        const landingPagePath = this.getLandingTabPage();
+
+        return this.navigateToSitePath(landingPagePath, {
             ...options,
             reset: true,
+            preferCurrentTab: false,
         });
     }
 
@@ -535,8 +537,13 @@ export class CoreNavigatorService {
         path = path.replace(/^(\.|\/main)?\//, '');
 
         const pathRoot = /^[^/]+/.exec(path)?.[0] ?? '';
+        if (!pathRoot) {
+            // No path root, going to the site home.
+            return this.navigate('/main', options);
+        }
+
         const currentMainMenuTab = this.getCurrentMainMenuTab();
-        const isMainMenuTab = pathRoot === currentMainMenuTab || (!currentMainMenuTab && path === DEFAULT_MAIN_MENU_TAB) ||
+        const isMainMenuTab = pathRoot === currentMainMenuTab || (!currentMainMenuTab && path === this.getLandingTabPage()) ||
             await CoreUtils.ignoreErrors(CoreMainMenu.isMainMenuTab(pathRoot), false);
 
         if (!options.preferCurrentTab && isMainMenuTab) {
@@ -553,16 +560,32 @@ export class CoreNavigatorService {
             return this.navigate(`/main/${path}`, options);
         }
 
-        // Open the path within the default main tab.
-        return this.navigate(`/main/${DEFAULT_MAIN_MENU_TAB}`, {
+        // Open the path within the home tab.
+        return this.navigate(`/main/${CoreMainMenuHomeHandlerService.PAGE_NAME}`, {
             ...options,
             params: {
-                redirectPath: `/main/${DEFAULT_MAIN_MENU_TAB}/${path}`,
+                redirectPath: `/main/${CoreMainMenuHomeHandlerService.PAGE_NAME}/${path}`,
                 redirectOptions: options.params || options.nextNavigation ? options : undefined,
             } as CoreRedirectPayload,
         });
     }
 
+    /**
+     * Get the first page path using priority.
+     *
+     * @return Landing page path.
+     */
+    protected getLandingTabPage(): string {
+        if (!CoreMainMenuDelegate.areHandlersLoaded()) {
+            // Handlers not loaded yet, landing page is the root page.
+            return '';
+        }
+
+        const handlers = CoreMainMenuDelegate.getHandlers();
+
+        return handlers[0]?.page || '';
+    }
+
     /**
      * Replace all objects in query params with an ID that can be used to retrieve the object later.
      *
diff --git a/src/core/services/tests/navigator.test.ts b/src/core/services/tests/navigator.test.ts
index a0000b07e..694ba3f78 100644
--- a/src/core/services/tests/navigator.test.ts
+++ b/src/core/services/tests/navigator.test.ts
@@ -21,6 +21,7 @@ import { NavController, Router } from '@singletons';
 import { ActivatedRoute, RouterState } from '@angular/router';
 import { CoreSites } from '@services/sites';
 import { CoreMainMenu } from '@features/mainmenu/services/mainmenu';
+import { CoreMainMenuDelegate } from '@features/mainmenu/services/mainmenu-delegate';
 
 describe('CoreNavigator', () => {
 
@@ -118,7 +119,7 @@ describe('CoreNavigator', () => {
         });
     });
 
-    it('navigates to site paths ussing different path formats', async () => {
+    it('navigates to site paths using different path formats', async () => {
         currentMainMenuHandlers.push('users');
 
         const assertNavigation = async (currentPath, sitePath, expectedPath) => {
@@ -136,11 +137,23 @@ describe('CoreNavigator', () => {
         await assertNavigation('/main/home', '/users/user/42', '/main/users/user/42');
     });
 
-    it('navigates to site home', async () => {
+    it('navigates to site home: no handlers loaded', async () => {
         const success = await navigator.navigateToSiteHome();
 
         expect(success).toBe(true);
-        expect(navControllerMock.navigateRoot).toHaveBeenCalledWith(['/main/home'], {});
+        expect(navControllerMock.navigateRoot).toHaveBeenCalledWith(['/main'], {});
+    });
+
+    it('navigates to site home: handlers loaded', async () => {
+        mockSingleton(CoreMainMenuDelegate, {
+            areHandlersLoaded: () => true,
+            getHandlers: () => [{ title: 'Test', page: 'initialpage', icon: '' }],
+        });
+
+        const success = await navigator.navigateToSiteHome();
+
+        expect(success).toBe(true);
+        expect(navControllerMock.navigateRoot).toHaveBeenCalledWith(['/main/initialpage'], {});
     });
 
     it.todo('navigates to a different site');

From fa9fd03febf3e7d675e3c3405aa33972ee9eeca5 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 13 Jan 2022 08:44:56 +0100
Subject: [PATCH 0331/1008] MOBILE-3859 login: Fallback to http if certificate
 isn't trusted

---
 src/core/services/sites.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/services/sites.ts b/src/core/services/sites.ts
index f90b14ace..e6538fd4e 100644
--- a/src/core/services/sites.ts
+++ b/src/core/services/sites.ts
@@ -257,7 +257,7 @@ export class CoreSitesProvider {
             // The WS didn't return data, probably cannot connect.
             return new CoreSiteError({
                 message: error.message || '',
-                critical: 'status' in error && error.status === -2, // Certificate error.
+                critical: false, // Allow fallback to http if siteUrl uses https.
             });
         }
 

From 9b93a0450cbcd0f1133deffcf33add22c8b852d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 7 Jan 2022 13:34:19 +0100
Subject: [PATCH 0332/1008] MOBILE-3787 assign: Fix non-null checks

---
 .../mod/assign/components/index/index.ts      | 54 +++++++++++--------
 .../components/submission/submission.ts       |  8 +--
 2 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/src/addons/mod/assign/components/index/index.ts b/src/addons/mod/assign/components/index/index.ts
index 0aa2a9a8e..84e64cb19 100644
--- a/src/addons/mod/assign/components/index/index.ts
+++ b/src/addons/mod/assign/components/index/index.ts
@@ -79,8 +79,8 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
     submissionStatusDraft = AddonModAssignProvider.SUBMISSION_STATUS_DRAFT;
     needGrading = AddonModAssignProvider.NEED_GRADING;
 
-    protected currentUserId?: number; // Current user ID.
-    protected currentSite?: CoreSite; // Current user ID.
+    protected currentUserId!: number; // Current user ID.
+    protected currentSite!: CoreSite; // Current site.
     protected syncEventName = AddonModAssignSyncProvider.AUTO_SYNCED;
 
     // Observers.
@@ -93,6 +93,9 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
         @Optional() courseContentsPage?: CoreCourseContentsPage,
     ) {
         super('AddonModLessonIndexComponent', content, courseContentsPage);
+
+        this.currentSite = CoreSites.getRequiredCurrentSite();
+        this.currentUserId = this.currentSite.getUserId();
     }
 
     /**
@@ -101,9 +104,6 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
     async ngOnInit(): Promise<void> {
         super.ngOnInit();
 
-        this.currentUserId = CoreSites.getCurrentSiteUserId();
-        this.currentSite = CoreSites.getCurrentSite();
-
         // Listen to events.
         this.savedObserver = CoreEvents.on(
             AddonModAssignProvider.SUBMISSION_SAVED_EVENT,
@@ -139,8 +139,12 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
 
         await this.loadContent(false, true);
 
+        if (!this.assign) {
+            return;
+        }
+
         try {
-            await AddonModAssign.logView(this.assign!.id, this.assign!.name);
+            await AddonModAssign.logView(this.assign.id, this.assign.name);
             CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
         } catch {
             // Ignore errors. Just don't check Module completion.
@@ -148,10 +152,10 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
 
         if (this.canViewAllSubmissions) {
             // User can see all submissions, log grading view.
-            CoreUtils.ignoreErrors(AddonModAssign.logGradingView(this.assign!.id, this.assign!.name));
+            CoreUtils.ignoreErrors(AddonModAssign.logGradingView(this.assign.id, this.assign.name));
         } else if (this.canViewOwnSubmission) {
             // User can only see their own submission, log view the user submission.
-            CoreUtils.ignoreErrors(AddonModAssign.logSubmissionView(this.assign!.id, this.assign!.name));
+            CoreUtils.ignoreErrors(AddonModAssign.logSubmissionView(this.assign.id, this.assign.name));
         }
     }
 
@@ -266,7 +270,11 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
     async setGroup(groupId = 0): Promise<void> {
         this.group = groupId;
 
-        const submissionStatus = await AddonModAssign.getSubmissionStatus(this.assign!.id, {
+        if (!this.assign) {
+            return;
+        }
+
+        const submissionStatus = await AddonModAssign.getSubmissionStatus(this.assign.id, {
             groupId: this.group,
             cmId: this.module.id,
         });
@@ -278,10 +286,10 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
             return;
         }
 
-        if (this.summary?.warnofungroupedusers === true) {
+        if (this.summary.warnofungroupedusers === true) {
             this.summary.warnofungroupedusers = 'ungroupedusers';
         } else {
-            switch (this.summary?.warnofungroupedusers) {
+            switch (this.summary.warnofungroupedusers) {
                 case AddonModAssignProvider.WARN_GROUPS_REQUIRED:
                     this.summary.warnofungroupedusers = 'ungroupedusers';
                     break;
@@ -386,16 +394,16 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
      * @return True if refresh is needed, false otherwise.
      */
     protected isRefreshSyncNeeded(syncEventData: AddonModAssignAutoSyncData): boolean {
-        if (this.assign && syncEventData.assignId == this.assign.id) {
-            if (syncEventData.warnings && syncEventData.warnings.length) {
-                // Show warnings.
-                CoreDomUtils.showErrorModal(syncEventData.warnings[0]);
-            }
-
-            return true;
+        if (!this.assign || syncEventData.assignId != this.assign.id) {
+            return false;
         }
 
-        return false;
+        if (syncEventData.warnings && syncEventData.warnings.length) {
+            // Show warnings.
+            CoreDomUtils.showErrorModal(syncEventData.warnings[0]);
+        }
+
+        return true;
     }
 
     /**
@@ -403,8 +411,12 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
      *
      * @return Promise resolved when done.
      */
-    protected sync(): Promise<AddonModAssignSyncResult> {
-        return AddonModAssignSync.syncAssign(this.assign!.id);
+    protected async sync(): Promise<AddonModAssignSyncResult | void> {
+        if (!this.assign) {
+            return;
+        }
+
+        await AddonModAssignSync.syncAssign(this.assign.id);
     }
 
     /**
diff --git a/src/addons/mod/assign/components/submission/submission.ts b/src/addons/mod/assign/components/submission/submission.ts
index 5b7b69785..290feb84e 100644
--- a/src/addons/mod/assign/components/submission/submission.ts
+++ b/src/addons/mod/assign/components/submission/submission.ts
@@ -612,11 +612,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
 
             // If we have data about the grader, get its profile.
             if (feedback.grade && feedback.grade.grader > 0) {
-                try {
-                    this.grader = await CoreUser.getProfile(feedback.grade.grader, this.courseId);
-                } catch {
-                    // Ignore errors.
-                }
+                this.grader = await CoreUtils.ignoreErrors(CoreUser.getProfile(feedback.grade.grader, this.courseId));
             } else {
                 delete this.grader;
             }
@@ -633,7 +629,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
             if (feedback.grade && feedback.grade.grade && !this.grade.grade) {
                 const parsedGrade = parseFloat(feedback.grade.grade);
 
-                this.grade!.grade = parsedGrade >= 0 ? parsedGrade : undefined;
+                this.grade.grade = parsedGrade >= 0 ? parsedGrade : undefined;
                 this.grade.gradebookGrade = CoreUtils.formatFloat(this.grade.grade);
                 this.originalGrades.grade = this.grade.grade;
             }

From 59e1a4fcf549adfa425ab17b09594c947a1e454d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 7 Jan 2022 16:49:04 +0100
Subject: [PATCH 0333/1008] MOBILE-3787 assign: Always show submission status

---
 .../mod/assign/classes/submissions-source.ts   | 11 +++--------
 .../mod/assign/components/index/index.ts       |  2 +-
 .../pages/submission-list/submission-list.html | 18 ++++++++++--------
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/addons/mod/assign/classes/submissions-source.ts b/src/addons/mod/assign/classes/submissions-source.ts
index a1c36e70c..4faec578d 100644
--- a/src/addons/mod/assign/classes/submissions-source.ts
+++ b/src/addons/mod/assign/classes/submissions-source.ts
@@ -211,14 +211,9 @@ export class AddonModAssignSubmissionsSource extends CoreRoutedItemsManagerSourc
                             submission.gradingstatus,
                         );
 
-                        // Show submission status if not submitted for grading.
-                        if (submission.statusColor != 'success' || !submission.gradingstatus) {
-                            submission.statusTranslated = Translate.instant(
-                                'addon.mod_assign.submissionstatus_' + submission.status,
-                            );
-                        } else {
-                            submission.statusTranslated = '';
-                        }
+                        submission.statusTranslated = Translate.instant(
+                            'addon.mod_assign.submissionstatus_' + submission.status,
+                        );
 
                         if (notSynced) {
                             submission.gradingStatusTranslationId = 'addon.mod_assign.gradenotsynced';
diff --git a/src/addons/mod/assign/components/index/index.ts b/src/addons/mod/assign/components/index/index.ts
index 84e64cb19..72b161007 100644
--- a/src/addons/mod/assign/components/index/index.ts
+++ b/src/addons/mod/assign/components/index/index.ts
@@ -302,7 +302,7 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
             }
         }
 
-        this.needsGradingAvailable = (submissionStatus.gradingsummary?.submissionsneedgradingcount || 0) > 0;
+        this.needsGradingAvailable = this.summary.submissionsneedgradingcount > 0;
     }
 
     /**
diff --git a/src/addons/mod/assign/pages/submission-list/submission-list.html b/src/addons/mod/assign/pages/submission-list/submission-list.html
index 0a6635371..40ad93441 100644
--- a/src/addons/mod/assign/pages/submission-list/submission-list.html
+++ b/src/addons/mod/assign/pages/submission-list/submission-list.html
@@ -63,14 +63,16 @@
                                     {{ 'addon.mod_assign.defaultteam' | translate }}
                                 </span>
                             </p>
-                            <ion-badge class="ion-text-center ion-text-wrap" [color]="submission.statusColor"
-                                *ngIf="submission.statusTranslated">
-                                {{ submission.statusTranslated }}
-                            </ion-badge>
-                            <ion-badge class="ion-text-center ion-text-wrap" [color]="submission.gradingColor"
-                                *ngIf="submission.gradingStatusTranslationId">
-                                {{ submission.gradingStatusTranslationId | translate }}
-                            </ion-badge>
+                            <p *ngIf="submission.statusTranslated">
+                                <ion-badge class="ion-text-center ion-text-wrap" [color]="submission.statusColor">
+                                    {{ submission.statusTranslated }}
+                                </ion-badge>
+                            </p>
+                            <p *ngIf="submission.gradingStatusTranslationId">
+                                <ion-badge class="ion-text-center ion-text-wrap" [color]="submission.gradingColor">
+                                    {{ submission.gradingStatusTranslationId | translate }}
+                                </ion-badge>
+                            </p>
                         </ion-label>
                     </ion-item>
                 </ng-container>

From 03ccd026361315293d0ce2adbee2a760c4967f14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 13 Jan 2022 08:54:33 +0100
Subject: [PATCH 0334/1008] MOBILE-3787 assign: Fix submission and grading
 status on groups

---
 .../mod/assign/classes/submissions-source.ts  | 108 +++++++++---------
 .../mod/assign/services/assign-helper.ts      |  77 ++++++-------
 2 files changed, 83 insertions(+), 102 deletions(-)

diff --git a/src/addons/mod/assign/classes/submissions-source.ts b/src/addons/mod/assign/classes/submissions-source.ts
index 4faec578d..fba320993 100644
--- a/src/addons/mod/assign/classes/submissions-source.ts
+++ b/src/addons/mod/assign/classes/submissions-source.ts
@@ -157,7 +157,7 @@ export class AddonModAssignSubmissionsSource extends CoreRoutedItemsManagerSourc
         }
 
         // Fetch submissions and grades.
-        const submissions =
+        let submissions =
             await AddonModAssignHelper.getSubmissionsUserData(
                 assign,
                 this.submissionsData.submissions,
@@ -172,67 +172,61 @@ export class AddonModAssignSubmissionsSource extends CoreRoutedItemsManagerSourc
         const getNeedGrading = this.SELECTED_STATUS == AddonModAssignProvider.NEED_GRADING;
         const searchStatus = getNeedGrading ? AddonModAssignProvider.SUBMISSION_STATUS_SUBMITTED : this.SELECTED_STATUS;
 
-        const promises: Promise<void>[] = [];
         const showSubmissions: AddonModAssignSubmissionForList[] = [];
 
-        submissions.forEach((submission: AddonModAssignSubmissionForList) => {
-            if (!searchStatus || searchStatus == submission.status) {
-                promises.push(
-                    CoreUtils.ignoreErrors(
-                        AddonModAssignOffline.getSubmissionGrade(assign.id, submission.userid),
-                    ).then(async (data) => {
-                        if (getNeedGrading) {
-                            // Only show the submissions that need to be graded.
-                            const add = await AddonModAssign.needsSubmissionToBeGraded(submission, assign.id);
+        if (searchStatus) {
+            submissions = submissions.filter((submission: AddonModAssignSubmissionForList) => searchStatus == submission.status);
+        }
 
-                            if (!add) {
-                                return;
-                            }
-                        }
+        const promises: Promise<void>[] = submissions.map(async (submission: AddonModAssignSubmissionForList) => {
+            const gradeData = await CoreUtils.ignoreErrors(AddonModAssignOffline.getSubmissionGrade(assign.id, submission.userid));
+            if (getNeedGrading) {
+                // Only show the submissions that need to be graded.
+                const add = await AddonModAssign.needsSubmissionToBeGraded(submission, assign.id);
 
-                        // Load offline grades.
-                        const notSynced = !!data && submission.timemodified < data.timemodified;
-
-                        if (submission.gradingstatus == 'graded' && !assign.markingworkflow) {
-                            // Get the last grade of the submission.
-                            const grade = grades
-                                .filter((grade) => grade.userid == submission.userid)
-                                .reduce(
-                                    (a, b) => (a && a.timemodified > b.timemodified ? a : b),
-                                    <AddonModAssignGrade | undefined> undefined,
-                                );
-
-                            if (grade && grade.timemodified < submission.timemodified) {
-                                submission.gradingstatus = AddonModAssignProvider.GRADED_FOLLOWUP_SUBMIT;
-                            }
-                        }
-                        submission.statusColor = AddonModAssign.getSubmissionStatusColor(submission.status);
-                        submission.gradingColor = AddonModAssign.getSubmissionGradingStatusColor(
-                            submission.gradingstatus,
-                        );
-
-                        submission.statusTranslated = Translate.instant(
-                            'addon.mod_assign.submissionstatus_' + submission.status,
-                        );
-
-                        if (notSynced) {
-                            submission.gradingStatusTranslationId = 'addon.mod_assign.gradenotsynced';
-                            submission.gradingColor = '';
-                        } else if (submission.statusColor != 'danger' || submission.gradingColor != 'danger') {
-                            // Show grading status if one of the statuses is not done.
-                            submission.gradingStatusTranslationId = AddonModAssign.getSubmissionGradingStatusTranslationId(
-                                submission.gradingstatus,
-                            );
-                        } else {
-                            submission.gradingStatusTranslationId = '';
-                        }
-
-                        showSubmissions.push(submission);
-
-                        return;
-                    }),
-                );
+                if (!add) {
+                    return;
+                }
             }
+
+            // Load offline grades.
+            const notSynced = !!gradeData && submission.timemodified < gradeData.timemodified;
+
+            if (submission.gradingstatus == 'graded' && !assign.markingworkflow) {
+                // Get the last grade of the submission.
+                const grade = grades
+                    .filter((grade) => grade.userid == submission.userid)
+                    .reduce(
+                        (a, b) => (a && a.timemodified > b.timemodified ? a : b),
+                                <AddonModAssignGrade | undefined> undefined,
+                    );
+
+                if (grade && grade.timemodified < submission.timemodified) {
+                    submission.gradingstatus = AddonModAssignProvider.GRADED_FOLLOWUP_SUBMIT;
+                }
+            }
+            submission.statusColor = AddonModAssign.getSubmissionStatusColor(submission.status);
+            submission.gradingColor = AddonModAssign.getSubmissionGradingStatusColor(
+                submission.gradingstatus,
+            );
+
+            submission.statusTranslated = Translate.instant(
+                'addon.mod_assign.submissionstatus_' + submission.status,
+            );
+
+            if (notSynced) {
+                submission.gradingStatusTranslationId = 'addon.mod_assign.gradenotsynced';
+                submission.gradingColor = '';
+            } else if (submission.statusColor != 'danger' || submission.gradingColor != 'danger') {
+                // Show grading status if one of the statuses is not done.
+                submission.gradingStatusTranslationId = AddonModAssign.getSubmissionGradingStatusTranslationId(
+                    submission.gradingstatus,
+                );
+            } else {
+                submission.gradingStatusTranslationId = '';
+            }
+
+            showSubmissions.push(submission);
         });
 
         await Promise.all(promises);
diff --git a/src/addons/mod/assign/services/assign-helper.ts b/src/addons/mod/assign/services/assign-helper.ts
index 680bfbdaa..017e9a389 100644
--- a/src/addons/mod/assign/services/assign-helper.ts
+++ b/src/addons/mod/assign/services/assign-helper.ts
@@ -398,48 +398,34 @@ export class AddonModAssignHelperProvider {
         groupId?: number,
         options: CoreSitesCommonWSOptions = {},
     ): Promise<AddonModAssignSubmissionFormatted[]> {
-        const parts = await this.getParticipants(assign, groupId, options);
+        const participants = await this.getParticipants(assign, groupId, options);
 
-        const blind = assign.blindmarking && !assign.revealidentities;
-        const result: AddonModAssignSubmissionFormatted[] = [];
-        const participants: {[id: number]: AddonModAssignParticipant} = CoreUtils.arrayToObject(parts, 'id');
+        const blind = !!assign.blindmarking && !assign.revealidentities;
+        const teamsubmission = !!assign.teamsubmission;
 
-        submissions.forEach((submission) => {
-            submission.submitid = submission.userid && submission.userid > 0 ? submission.userid : submission.blindid;
-            if (submission.submitid === undefined || submission.submitid <= 0) {
-                return;
+        return participants.map((participant) => {
+            const groupId = participant.groupid ??
+                (participant.groups && participant.groups[0] ? participant.groups[0].id : 0);
+
+            const foundSubmission = submissions.find((submission) => {
+                if (teamsubmission) {
+                    return submission.userid == 0 && submission.groupid == groupId;
+                }
+
+                const submitId = submission.userid && submission.userid > 0 ? submission.userid : submission.blindid;
+
+                return participant.id == submitId;
+            });
+
+            let submission: AddonModAssignSubmissionFormatted | undefined;
+            if (!foundSubmission) {
+                // Create submission if none.
+                submission = this.createEmptySubmission();
+                submission.groupid = groupId;
+            } else {
+                submission = Object.assign({}, foundSubmission);
             }
 
-            const participant = participants[submission.submitid];
-            if (!participant) {
-                // Avoid permission denied error. Participant not found on list.
-                return;
-            }
-
-            delete participants[submission.submitid];
-
-            if (!blind) {
-                submission.userfullname = participant.fullname;
-                submission.userprofileimageurl = participant.profileimageurl;
-            }
-
-            submission.manyGroups = !!participant.groups && participant.groups.length > 1;
-            submission.noGroups = !!participant.groups && participant.groups.length == 0;
-            if (participant.groupname) {
-                submission.groupid = participant.groupid!;
-                submission.groupname = participant.groupname;
-            }
-
-            // Add to the list.
-            if (submission.userfullname || submission.blindid) {
-                result.push(submission);
-            }
-        });
-
-        // Create a submission for each participant left in the list (the participants already treated were removed).
-        CoreUtils.objectToArray(participants).forEach((participant: AddonModAssignParticipant) => {
-            const submission = this.createEmptySubmission();
-
             submission.submitid = participant.id;
 
             if (!blind) {
@@ -453,16 +439,16 @@ export class AddonModAssignHelperProvider {
             submission.manyGroups = !!participant.groups && participant.groups.length > 1;
             submission.noGroups = !!participant.groups && participant.groups.length == 0;
             if (participant.groupname) {
-                submission.groupid = participant.groupid!;
+                submission.groupid = participant.groupid;
                 submission.groupname = participant.groupname;
             }
-            submission.status = participant.submitted ? AddonModAssignProvider.SUBMISSION_STATUS_SUBMITTED :
-                AddonModAssignProvider.SUBMISSION_STATUS_NEW;
 
-            result.push(submission);
+            submission.status = submission.status ?? (participant.submitted ? AddonModAssignProvider.SUBMISSION_STATUS_SUBMITTED :
+                AddonModAssignProvider.SUBMISSION_STATUS_NEW);
+
+            return submission;
+
         });
-
-        return result;
     }
 
     /**
@@ -714,8 +700,9 @@ export const AddonModAssignHelper = makeSingleton(AddonModAssignHelperProvider);
  * Assign submission with some calculated data.
  */
 export type AddonModAssignSubmissionFormatted =
-    Omit<AddonModAssignSubmission, 'userid'> & {
+    Omit<AddonModAssignSubmission, 'userid'|'groupid'> & {
         userid?: number; // Student id.
+        groupid?: number; // Group id.
         blindid?: number; // Calculated in the app. Blindid of the user that did the submission.
         submitid?: number; // Calculated in the app. Userid or blindid of the user that did the submission.
         userfullname?: string; // Calculated in the app. Full name of the user that did the submission.

From 7cdafca794eb8bf1741bf1d9989ad9a13adba647 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 13 Jan 2022 10:44:47 +0100
Subject: [PATCH 0335/1008] MOBILE-3787 assign: Add enums to different states

---
 .../mod/assign/classes/submissions-source.ts  |  36 ++++--
 .../mod/assign/components/index/index.ts      |   9 +-
 .../components/submission/submission.ts       |  47 +++----
 .../submission-list/submission-list.page.ts   |  10 +-
 .../submission-review/submission-review.ts    |   6 +-
 .../mod/assign/services/assign-helper.ts      |   9 +-
 src/addons/mod/assign/services/assign.ts      | 119 +++++++++++-------
 src/core/singletons/colors.ts                 |  12 ++
 8 files changed, 152 insertions(+), 96 deletions(-)

diff --git a/src/addons/mod/assign/classes/submissions-source.ts b/src/addons/mod/assign/classes/submissions-source.ts
index fba320993..4e3ee9953 100644
--- a/src/addons/mod/assign/classes/submissions-source.ts
+++ b/src/addons/mod/assign/classes/submissions-source.ts
@@ -18,13 +18,14 @@ import { CoreGroupInfo, CoreGroups } from '@services/groups';
 import { CoreSites } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
 import { Translate } from '@singletons';
+import { CoreIonicColorNames } from '@singletons/colors';
 import { CoreEvents } from '@singletons/events';
 import {
     AddonModAssign,
     AddonModAssignAssign,
-    AddonModAssignGrade,
-    AddonModAssignProvider,
+    AddonModAssignGradingStates,
     AddonModAssignSubmission,
+    AddonModAssignSubmissionStatusValues,
 } from '../services/assign';
 import { AddonModAssignHelper, AddonModAssignSubmissionFormatted } from '../services/assign-helper';
 import { AddonModAssignOffline } from '../services/assign-offline';
@@ -38,15 +39,15 @@ export class AddonModAssignSubmissionsSource extends CoreRoutedItemsManagerSourc
     /**
      * @inheritdoc
      */
-    static getSourceId(courseId: number, moduleId: number, selectedStatus?: string): string {
-        selectedStatus = selectedStatus ?? '__empty__';
+    static getSourceId(courseId: number, moduleId: number, selectedStatus?: AddonModAssignListFilterName): string {
+        const statusId = selectedStatus ?? '__empty__';
 
-        return `submissions-${courseId}-${moduleId}-${selectedStatus}`;
+        return `submissions-${courseId}-${moduleId}-${statusId}`;
     }
 
     readonly COURSE_ID: number;
     readonly MODULE_ID: number;
-    readonly SELECTED_STATUS: string | undefined;
+    readonly SELECTED_STATUS: AddonModAssignListFilterName | undefined;
 
     assign?: AddonModAssignAssign;
     groupId = 0;
@@ -62,7 +63,7 @@ export class AddonModAssignSubmissionsSource extends CoreRoutedItemsManagerSourc
         canviewsubmissions: false,
     };
 
-    constructor(courseId: number, moduleId: number, selectedStatus?: string) {
+    constructor(courseId: number, moduleId: number, selectedStatus?: AddonModAssignListFilterName) {
         super();
 
         this.COURSE_ID = courseId;
@@ -169,8 +170,8 @@ export class AddonModAssignSubmissionsSource extends CoreRoutedItemsManagerSourc
             : [];
 
         // Filter the submissions to get only the ones with the right status and add some extra data.
-        const getNeedGrading = this.SELECTED_STATUS == AddonModAssignProvider.NEED_GRADING;
-        const searchStatus = getNeedGrading ? AddonModAssignProvider.SUBMISSION_STATUS_SUBMITTED : this.SELECTED_STATUS;
+        const getNeedGrading = this.SELECTED_STATUS == AddonModAssignListFilterName.NEED_GRADING;
+        const searchStatus = getNeedGrading ? AddonModAssignSubmissionStatusValues.SUBMITTED : this.SELECTED_STATUS;
 
         const showSubmissions: AddonModAssignSubmissionForList[] = [];
 
@@ -192,7 +193,7 @@ export class AddonModAssignSubmissionsSource extends CoreRoutedItemsManagerSourc
             // Load offline grades.
             const notSynced = !!gradeData && submission.timemodified < gradeData.timemodified;
 
-            if (submission.gradingstatus == 'graded' && !assign.markingworkflow) {
+            if (submission.gradingstatus == AddonModAssignGradingStates.GRADED && !assign.markingworkflow) {
                 // Get the last grade of the submission.
                 const grade = grades
                     .filter((grade) => grade.userid == submission.userid)
@@ -202,7 +203,7 @@ export class AddonModAssignSubmissionsSource extends CoreRoutedItemsManagerSourc
                     );
 
                 if (grade && grade.timemodified < submission.timemodified) {
-                    submission.gradingstatus = AddonModAssignProvider.GRADED_FOLLOWUP_SUBMIT;
+                    submission.gradingstatus = AddonModAssignGradingStates.GRADED_FOLLOWUP_SUBMIT;
                 }
             }
             submission.statusColor = AddonModAssign.getSubmissionStatusColor(submission.status);
@@ -217,7 +218,8 @@ export class AddonModAssignSubmissionsSource extends CoreRoutedItemsManagerSourc
             if (notSynced) {
                 submission.gradingStatusTranslationId = 'addon.mod_assign.gradenotsynced';
                 submission.gradingColor = '';
-            } else if (submission.statusColor != 'danger' || submission.gradingColor != 'danger') {
+            } else if (submission.statusColor != CoreIonicColorNames.DANGER ||
+                    submission.gradingColor != CoreIonicColorNames.DANGER) {
                 // Show grading status if one of the statuses is not done.
                 submission.gradingStatusTranslationId = AddonModAssign.getSubmissionGradingStatusTranslationId(
                     submission.gradingstatus,
@@ -245,3 +247,13 @@ export type AddonModAssignSubmissionForList = AddonModAssignSubmissionFormatted
     statusTranslated?: string; // Calculated in the app. Translated text of the submission status.
     gradingStatusTranslationId?: string; // Calculated in the app. Key of the text of the submission grading status.
 };
+
+/**
+ * List filter by status name.
+ */
+export enum AddonModAssignListFilterName {
+    ALL = '',
+    NEED_GRADING = 'needgrading',
+    DRAFT = 'draft',
+    SUBMITTED = 'submitted',
+};
diff --git a/src/addons/mod/assign/components/index/index.ts b/src/addons/mod/assign/components/index/index.ts
index 72b161007..28827e331 100644
--- a/src/addons/mod/assign/components/index/index.ts
+++ b/src/addons/mod/assign/components/index/index.ts
@@ -28,6 +28,7 @@ import { CoreTimeUtils } from '@services/utils/time';
 import { CoreUtils } from '@services/utils/utils';
 import { Translate } from '@singletons';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
+import { AddonModAssignListFilterName } from '../../classes/submissions-source';
 import {
     AddonModAssign,
     AddonModAssignAssign,
@@ -75,9 +76,9 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
     };
 
     // Status.
-    submissionStatusSubmitted = AddonModAssignProvider.SUBMISSION_STATUS_SUBMITTED;
-    submissionStatusDraft = AddonModAssignProvider.SUBMISSION_STATUS_DRAFT;
-    needGrading = AddonModAssignProvider.NEED_GRADING;
+    submissionStatusSubmitted = AddonModAssignListFilterName.SUBMITTED;
+    submissionStatusDraft = AddonModAssignListFilterName.DRAFT;
+    needGrading = AddonModAssignListFilterName.NEED_GRADING;
 
     protected currentUserId!: number; // Current user ID.
     protected currentSite!: CoreSite; // Current site.
@@ -311,7 +312,7 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
      * @param status Status to see.
      * @param hasSubmissions If the status has any submission.
      */
-    goToSubmissionList(status?: string, hasSubmissions = false): void {
+    goToSubmissionList(status?: AddonModAssignListFilterName, hasSubmissions = false): void {
         if (status !== undefined && !hasSubmissions) {
             return;
         }
diff --git a/src/addons/mod/assign/components/submission/submission.ts b/src/addons/mod/assign/components/submission/submission.ts
index 290feb84e..da2154f88 100644
--- a/src/addons/mod/assign/components/submission/submission.ts
+++ b/src/addons/mod/assign/components/submission/submission.ts
@@ -25,6 +25,9 @@ import {
     AddonModAssign,
     AddonModAssignGetSubmissionStatusWSResponse,
     AddonModAssignSavePluginData,
+    AddonModAssignGradingStates,
+    AddonModAssignSubmissionStatusValues,
+    AddonModAssignAttemptReopenMethodValues,
 } from '../../services/assign';
 import {
     AddonModAssignAutoSyncData,
@@ -125,9 +128,9 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
     showDates = false; // Whether to show some dates.
 
     // Some constants.
-    statusNew = AddonModAssignProvider.SUBMISSION_STATUS_NEW;
-    statusReopened = AddonModAssignProvider.SUBMISSION_STATUS_REOPENED;
-    attemptReopenMethodNone = AddonModAssignProvider.ATTEMPT_REOPEN_METHOD_NONE;
+    statusNew = AddonModAssignSubmissionStatusValues.NEW;
+    statusReopened = AddonModAssignSubmissionStatusValues.REOPENED;
+    attemptReopenMethodNone = AddonModAssignAttemptReopenMethodValues.NONE;
     unlimitedAttempts = AddonModAssignProvider.UNLIMITED_ATTEMPTS;
 
     protected siteId: string; // Current site ID.
@@ -214,7 +217,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
         }
 
         // Not submitted.
-        if (!this.userSubmission || this.userSubmission.status != AddonModAssignProvider.SUBMISSION_STATUS_SUBMITTED) {
+        if (!this.userSubmission || this.userSubmission.status != AddonModAssignSubmissionStatusValues.SUBMITTED) {
 
             if (response.lastattempt?.submissionsenabled || response.gradingsummary?.submissionsenabled) {
                 this.timeRemaining = Translate.instant(
@@ -651,7 +654,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
         // Treat the grade info.
         await this.treatGradeInfo();
 
-        const isManual = this.assign!.attemptreopenmethod == AddonModAssignProvider.ATTEMPT_REOPEN_METHOD_MANUAL;
+        const isManual = this.assign!.attemptreopenmethod == AddonModAssignAttemptReopenMethodValues.MANUAL;
         const isUnlimited = this.assign!.maxattempts == AddonModAssignProvider.UNLIMITED_ATTEMPTS;
         const isLessThanMaxAttempts = !!this.userSubmission && (this.userSubmission.attemptnumber < (this.assign!.maxattempts - 1));
 
@@ -668,7 +671,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
 
         if (this.lastAttempt?.gradingstatus == 'graded' && !this.assign!.markingworkflow && this.userSubmission && feedback) {
             if (feedback.gradeddate < this.userSubmission.timemodified) {
-                this.lastAttempt.gradingstatus = AddonModAssignProvider.GRADED_FOLLOWUP_SUBMIT;
+                this.lastAttempt.gradingstatus = AddonModAssignGradingStates.GRADED_FOLLOWUP_SUBMIT;
 
                 // Get grading text and color.
                 this.gradingStatusTranslationId = AddonModAssign.getSubmissionGradingStatusTranslationId(
@@ -749,43 +752,43 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
      * @param status Submission status.
      */
     protected setStatusNameAndClass(status: AddonModAssignGetSubmissionStatusWSResponse): void {
-        const translateService = Translate.instance;
-
         if (this.hasOffline || this.submittedOffline) {
             // Offline data.
-            this.statusTranslated = translateService.instant('core.notsent');
+            this.statusTranslated = Translate.instant('core.notsent');
             this.statusColor = 'warning';
         } else if (!this.assign!.teamsubmission) {
 
             // Single submission.
             if (this.userSubmission && this.userSubmission.status != this.statusNew) {
-                this.statusTranslated = translateService.instant('addon.mod_assign.submissionstatus_' + this.userSubmission.status);
+                this.statusTranslated = Translate.instant('addon.mod_assign.submissionstatus_' + this.userSubmission.status);
                 this.statusColor = AddonModAssign.getSubmissionStatusColor(this.userSubmission.status);
             } else {
                 if (!status.lastattempt?.submissionsenabled) {
-                    this.statusTranslated = translateService.instant('addon.mod_assign.noonlinesubmissions');
-                    this.statusColor = AddonModAssign.getSubmissionStatusColor('noonlinesubmissions');
+                    this.statusTranslated = Translate.instant('addon.mod_assign.noonlinesubmissions');
+                    this.statusColor =
+                        AddonModAssign.getSubmissionStatusColor(AddonModAssignSubmissionStatusValues.NO_ONLINE_SUBMISSIONS);
                 } else {
-                    this.statusTranslated = translateService.instant('addon.mod_assign.noattempt');
-                    this.statusColor = AddonModAssign.getSubmissionStatusColor('noattempt');
+                    this.statusTranslated = Translate.instant('addon.mod_assign.noattempt');
+                    this.statusColor = AddonModAssign.getSubmissionStatusColor(AddonModAssignSubmissionStatusValues.NO_ATTEMPT);
                 }
             }
         } else {
 
             // Team submission.
             if (!status.lastattempt?.submissiongroup && this.assign!.preventsubmissionnotingroup) {
-                this.statusTranslated = translateService.instant('addon.mod_assign.nosubmission');
-                this.statusColor = AddonModAssign.getSubmissionStatusColor('nosubmission');
+                this.statusTranslated = Translate.instant('addon.mod_assign.nosubmission');
+                this.statusColor = AddonModAssign.getSubmissionStatusColor(AddonModAssignSubmissionStatusValues.NO_SUBMISSION);
             } else if (this.userSubmission && this.userSubmission.status != this.statusNew) {
-                this.statusTranslated = translateService.instant('addon.mod_assign.submissionstatus_' + this.userSubmission.status);
+                this.statusTranslated = Translate.instant('addon.mod_assign.submissionstatus_' + this.userSubmission.status);
                 this.statusColor = AddonModAssign.getSubmissionStatusColor(this.userSubmission.status);
             } else {
                 if (!status.lastattempt?.submissionsenabled) {
-                    this.statusTranslated = translateService.instant('addon.mod_assign.noonlinesubmissions');
-                    this.statusColor = AddonModAssign.getSubmissionStatusColor('noonlinesubmissions');
+                    this.statusTranslated = Translate.instant('addon.mod_assign.noonlinesubmissions');
+                    this.statusColor =
+                        AddonModAssign.getSubmissionStatusColor(AddonModAssignSubmissionStatusValues.NO_ONLINE_SUBMISSIONS);
                 } else {
-                    this.statusTranslated = translateService.instant('addon.mod_assign.nosubmission');
-                    this.statusColor = AddonModAssign.getSubmissionStatusColor('nosubmission');
+                    this.statusTranslated = Translate.instant('addon.mod_assign.nosubmission');
+                    this.statusColor = AddonModAssign.getSubmissionStatusColor(AddonModAssignSubmissionStatusValues.NO_SUBMISSION);
                 }
             }
         }
@@ -1180,7 +1183,7 @@ type AddonModAssignSubmissionGrade = {
     grade?: number | string;
     gradebookGrade?: string;
     modified?: number;
-    gradingStatus?: string;
+    gradingStatus?: AddonModAssignGradingStates;
     addAttempt: boolean;
     applyToAll: boolean;
     scale?: CoreMenuItem<number>[];
diff --git a/src/addons/mod/assign/pages/submission-list/submission-list.page.ts b/src/addons/mod/assign/pages/submission-list/submission-list.page.ts
index e0b09e3b2..9ac31e50e 100644
--- a/src/addons/mod/assign/pages/submission-list/submission-list.page.ts
+++ b/src/addons/mod/assign/pages/submission-list/submission-list.page.ts
@@ -23,7 +23,11 @@ import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { Translate } from '@singletons';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
-import { AddonModAssignSubmissionForList, AddonModAssignSubmissionsSource } from '../../classes/submissions-source';
+import {
+    AddonModAssignListFilterName,
+    AddonModAssignSubmissionForList,
+    AddonModAssignSubmissionsSource,
+} from '../../classes/submissions-source';
 import { AddonModAssignAssign, AddonModAssignProvider } from '../../services/assign';
 import {
     AddonModAssignSyncProvider,
@@ -85,7 +89,7 @@ export class AddonModAssignSubmissionListPage implements AfterViewInit, OnDestro
             const moduleId = CoreNavigator.getRequiredRouteNumberParam('cmId');
             const courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
             const groupId = CoreNavigator.getRouteNumberParam('groupId') || 0;
-            const selectedStatus = CoreNavigator.getRouteParam('status');
+            const selectedStatus = CoreNavigator.getRouteParam<AddonModAssignListFilterName>('status');
             const submissionsSource = CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(
                 AddonModAssignSubmissionsSource,
                 [courseId, moduleId, selectedStatus],
@@ -143,7 +147,7 @@ export class AddonModAssignSubmissionListPage implements AfterViewInit, OnDestro
         this.title = Translate.instant(
             selectedStatus
                 ? (
-                    selectedStatus === AddonModAssignProvider.NEED_GRADING
+                    selectedStatus === AddonModAssignListFilterName.NEED_GRADING
                         ? 'addon.mod_assign.numberofsubmissionsneedgrading'
                         : `addon.mod_assign.submissionstatus_${selectedStatus}`
                 )
diff --git a/src/addons/mod/assign/pages/submission-review/submission-review.ts b/src/addons/mod/assign/pages/submission-review/submission-review.ts
index a51cf4bc4..f722bdef6 100644
--- a/src/addons/mod/assign/pages/submission-review/submission-review.ts
+++ b/src/addons/mod/assign/pages/submission-review/submission-review.ts
@@ -22,7 +22,7 @@ import { IonRefresher } from '@ionic/angular';
 import { CoreNavigator } from '@services/navigator';
 import { CoreScreen } from '@services/screen';
 import { CoreDomUtils } from '@services/utils/dom';
-import { AddonModAssignSubmissionsSource } from '../../classes/submissions-source';
+import { AddonModAssignListFilterName, AddonModAssignSubmissionsSource } from '../../classes/submissions-source';
 import { AddonModAssignSubmissionComponent } from '../../components/submission/submission';
 import { AddonModAssign, AddonModAssignAssign } from '../../services/assign';
 
@@ -53,7 +53,7 @@ export class AddonModAssignSubmissionReviewPage implements OnInit, OnDestroy, Ca
     constructor(protected route: ActivatedRoute) { }
 
     /**
-     * Component being initialized.
+     * @inheritdoc
      */
     ngOnInit(): void {
         this.route.queryParams.subscribe((params) => {
@@ -63,7 +63,7 @@ export class AddonModAssignSubmissionReviewPage implements OnInit, OnDestroy, Ca
                 this.submitId = CoreNavigator.getRouteNumberParam('submitId') || 0;
                 this.blindId = CoreNavigator.getRouteNumberParam('blindId', { params });
                 const groupId = CoreNavigator.getRequiredRouteNumberParam('groupId');
-                const selectedStatus = CoreNavigator.getRouteParam('selectedStatus');
+                const selectedStatus = CoreNavigator.getRouteParam<AddonModAssignListFilterName>('selectedStatus');
                 const submissionsSource = CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(
                     AddonModAssignSubmissionsSource,
                     [this.courseId, this.moduleId, selectedStatus],
diff --git a/src/addons/mod/assign/services/assign-helper.ts b/src/addons/mod/assign/services/assign-helper.ts
index 017e9a389..25653194c 100644
--- a/src/addons/mod/assign/services/assign-helper.ts
+++ b/src/addons/mod/assign/services/assign-helper.ts
@@ -25,6 +25,7 @@ import {
     AddonModAssign,
     AddonModAssignPlugin,
     AddonModAssignSavePluginData,
+    AddonModAssignSubmissionStatusValues,
 } from './assign';
 import { AddonModAssignOffline } from './assign-offline';
 import { CoreUtils } from '@services/utils/utils';
@@ -55,8 +56,8 @@ export class AddonModAssignHelperProvider {
             return false;
         }
 
-        if (submission.status == AddonModAssignProvider.SUBMISSION_STATUS_NEW ||
-                submission.status == AddonModAssignProvider.SUBMISSION_STATUS_REOPENED) {
+        if (submission.status == AddonModAssignSubmissionStatusValues.NEW ||
+                submission.status == AddonModAssignSubmissionStatusValues.REOPENED) {
             // It's a new submission, allow creating it in offline.
             return true;
         }
@@ -443,8 +444,8 @@ export class AddonModAssignHelperProvider {
                 submission.groupname = participant.groupname;
             }
 
-            submission.status = submission.status ?? (participant.submitted ? AddonModAssignProvider.SUBMISSION_STATUS_SUBMITTED :
-                AddonModAssignProvider.SUBMISSION_STATUS_NEW);
+            submission.status = submission.status ?? (participant.submitted ? AddonModAssignSubmissionStatusValues.SUBMITTED :
+                AddonModAssignSubmissionStatusValues.NEW);
 
             return submission;
 
diff --git a/src/addons/mod/assign/services/assign.ts b/src/addons/mod/assign/services/assign.ts
index b0b198c8b..4a9623ddd 100644
--- a/src/addons/mod/assign/services/assign.ts
+++ b/src/addons/mod/assign/services/assign.ts
@@ -34,6 +34,7 @@ import { CoreWSError } from '@classes/errors/wserror';
 import { AddonModAssignAutoSyncData, AddonModAssignManualSyncData, AddonModAssignSyncProvider } from './assign-sync';
 import { CoreFormFields } from '@singletons/form';
 import { CoreFileHelper } from '@services/file-helper';
+import { CoreIonicColorNames } from '@singletons/colors';
 
 const ROOT_CACHE_KEY = 'mmaModAssign:';
 
@@ -64,23 +65,6 @@ export class AddonModAssignProvider {
     static readonly SUBMISSION_COMPONENT = 'mmaModAssignSubmission';
     static readonly UNLIMITED_ATTEMPTS = -1;
 
-    // Submission status.
-    static readonly SUBMISSION_STATUS_NEW = 'new';
-    static readonly SUBMISSION_STATUS_REOPENED = 'reopened';
-    static readonly SUBMISSION_STATUS_DRAFT = 'draft';
-    static readonly SUBMISSION_STATUS_SUBMITTED = 'submitted';
-
-    // "Re-open" methods (to retry the assign).
-    static readonly ATTEMPT_REOPEN_METHOD_NONE = 'none';
-    static readonly ATTEMPT_REOPEN_METHOD_MANUAL = 'manual';
-
-    // Grading status.
-    static readonly GRADING_STATUS_GRADED = 'graded';
-    static readonly GRADING_STATUS_NOT_GRADED = 'notgraded';
-    static readonly MARKING_WORKFLOW_STATE_RELEASED = 'released';
-    static readonly NEED_GRADING = 'needgrading';
-    static readonly GRADED_FOLLOWUP_SUBMIT = 'gradedfollowupsubmit';
-
     // Group submissions warnings.
     static readonly WARN_GROUPS_REQUIRED = 'warnrequired';
     static readonly WARN_GROUPS_OPTIONAL = 'warnoptional';
@@ -108,17 +92,17 @@ export class AddonModAssignProvider {
         const teamSubmission = submissionStatus.lastattempt?.teamsubmission;
 
         if (teamSubmission) {
-            if (teamSubmission.status === AddonModAssignProvider.SUBMISSION_STATUS_SUBMITTED) {
+            if (teamSubmission.status === AddonModAssignSubmissionStatusValues.SUBMITTED) {
                 // The assignment submission has been completed.
                 return false;
-            } else if (userSubmission && userSubmission.status === AddonModAssignProvider.SUBMISSION_STATUS_SUBMITTED) {
+            } else if (userSubmission && userSubmission.status === AddonModAssignSubmissionStatusValues.SUBMITTED) {
                 // The user has already clicked the submit button on the team submission.
                 return false;
             } else if (assign.preventsubmissionnotingroup && !submissionStatus.lastattempt?.submissiongroup) {
                 return false;
             }
         } else if (userSubmission) {
-            if (userSubmission.status === AddonModAssignProvider.SUBMISSION_STATUS_SUBMITTED) {
+            if (userSubmission.status === AddonModAssignSubmissionStatusValues.SUBMITTED) {
                 // The assignment submission has been completed.
                 return false;
             }
@@ -347,17 +331,17 @@ export class AddonModAssignProvider {
      * @param status Grading status name
      * @return The color name.
      */
-    getSubmissionGradingStatusColor(status?: string): string {
+    getSubmissionGradingStatusColor(status?: AddonModAssignGradingStates): CoreIonicColorNames {
         if (!status) {
-            return '';
+            return CoreIonicColorNames.NONE;
         }
 
-        if (status == AddonModAssignProvider.GRADING_STATUS_GRADED ||
-                status == AddonModAssignProvider.MARKING_WORKFLOW_STATE_RELEASED) {
-            return 'success';
+        if (status == AddonModAssignGradingStates.GRADED
+                || status == AddonModAssignGradingStates.MARKING_WORKFLOW_STATE_RELEASED) {
+            return CoreIonicColorNames.SUCCESS;
         }
 
-        return 'danger';
+        return CoreIonicColorNames.DANGER;
     }
 
     /**
@@ -366,13 +350,14 @@ export class AddonModAssignProvider {
      * @param status Grading Status name
      * @return The status translation identifier.
      */
-    getSubmissionGradingStatusTranslationId(status?: string): string | undefined {
+    getSubmissionGradingStatusTranslationId(status?: AddonModAssignGradingStates): string | undefined {
         if (!status) {
             return;
         }
 
-        if (status == AddonModAssignProvider.GRADING_STATUS_GRADED || status == AddonModAssignProvider.GRADING_STATUS_NOT_GRADED
-               || status == AddonModAssignProvider.GRADED_FOLLOWUP_SUBMIT) {
+        if (status == AddonModAssignGradingStates.GRADED
+                || status == AddonModAssignGradingStates.NOT_GRADED
+                || status == AddonModAssignGradingStates.GRADED_FOLLOWUP_SUBMIT) {
             return 'addon.mod_assign.' + status;
         }
 
@@ -604,20 +589,20 @@ export class AddonModAssignProvider {
      * @param status Status name
      * @return The color name.
      */
-    getSubmissionStatusColor(status: string): string {
+    getSubmissionStatusColor(status: AddonModAssignSubmissionStatusValues): CoreIonicColorNames {
         switch (status) {
-            case 'submitted':
-                return 'success';
-            case 'draft':
-                return 'info';
-            case 'new':
-            case 'noattempt':
-            case 'noonlinesubmissions':
-            case 'nosubmission':
-            case 'gradedfollowupsubmit':
-                return 'danger';
+            case AddonModAssignSubmissionStatusValues.SUBMITTED:
+                return CoreIonicColorNames.SUCCESS;
+            case AddonModAssignSubmissionStatusValues.DRAFT:
+                return CoreIonicColorNames.INFO;
+            case AddonModAssignSubmissionStatusValues.NEW:
+            case AddonModAssignSubmissionStatusValues.NO_ATTEMPT:
+            case AddonModAssignSubmissionStatusValues.NO_ONLINE_SUBMISSIONS:
+            case AddonModAssignSubmissionStatusValues.NO_SUBMISSION:
+            case AddonModAssignSubmissionStatusValues.GRADED_FOLLOWUP_SUBMIT:
+                return CoreIonicColorNames.DANGER;
             default:
-                return 'light';
+                return CoreIonicColorNames.LIGHT;
         }
     }
 
@@ -878,7 +863,7 @@ export class AddonModAssignProvider {
         }
 
         if (submission) {
-            if (assign.submissiondrafts && submission.status == AddonModAssignProvider.SUBMISSION_STATUS_SUBMITTED) {
+            if (assign.submissiondrafts && submission.status == AddonModAssignSubmissionStatusValues.SUBMITTED) {
                 // Drafts are tracked and the student has submitted the assignment.
                 return false;
             }
@@ -975,8 +960,8 @@ export class AddonModAssignProvider {
             return true;
         }
 
-        if (submission.gradingstatus != AddonModAssignProvider.GRADING_STATUS_GRADED &&
-                submission.gradingstatus != AddonModAssignProvider.MARKING_WORKFLOW_STATE_RELEASED) {
+        if (submission.gradingstatus != AddonModAssignGradingStates.GRADED &&
+                submission.gradingstatus != AddonModAssignGradingStates.MARKING_WORKFLOW_STATE_RELEASED) {
             // Not graded.
             return true;
         }
@@ -1349,7 +1334,7 @@ export type AddonModAssignAssign = {
     blindmarking: number; // If enabled, hide identities until reveal identities actioned.
     hidegrader?: number; // @since 3.7. If enabled, hide grader to student.
     revealidentities: number; // Show identities for a blind marking assignment.
-    attemptreopenmethod: string; // Method used to control opening new attempts.
+    attemptreopenmethod: AddonModAssignAttemptReopenMethodValues; // Method used to control opening new attempts.
     maxattempts: number; // Maximum number of attempts allowed.
     markingworkflow: number; // Enable marking workflow.
     markingallocation: number; // Enable marking allocation.
@@ -1400,12 +1385,12 @@ export type AddonModAssignSubmission = {
     attemptnumber: number; // Attempt number.
     timecreated: number; // Submission creation time.
     timemodified: number; // Submission last modified time.
-    status: string; // Submission status.
+    status: AddonModAssignSubmissionStatusValues; // Submission status.
     groupid: number; // Group id.
     assignment?: number; // Assignment id.
     latest?: number; // Latest attempt.
     plugins?: AddonModAssignPlugin[]; // Plugins.
-    gradingstatus?: string; // Grading status.
+    gradingstatus?: AddonModAssignGradingStates; // Grading status.
 };
 
 /**
@@ -1454,7 +1439,7 @@ export type AddonModAssignSubmissionAttempt = {
     cansubmit: boolean; // Whether the user can submit.
     extensionduedate: number; // Extension due date.
     blindmarking: boolean; // Whether blind marking is enabled.
-    gradingstatus: string; // Grading status.
+    gradingstatus: AddonModAssignGradingStates; // Grading status.
     usergroups: number[]; // User groups in the course.
 };
 
@@ -1749,3 +1734,41 @@ export type AddonModAssignSubmissionSavedEventData = AddonModAssignSubmittedForG
  * Data sent by GRADED_EVENT event.
  */
 export type AddonModAssignGradedEventData = AddonModAssignSubmittedForGradingEventData;
+
+/**
+ * Submission status.
+ * Constants on LMS starting with ASSIGN_SUBMISSION_STATUS_
+ */
+export enum AddonModAssignSubmissionStatusValues {
+    SUBMITTED = 'submitted',
+    DRAFT = 'draft',
+    NEW = 'new',
+    REOPENED = 'reopened',
+    // Added by App Statuses.
+    NO_ATTEMPT = 'noattempt',
+    NO_ONLINE_SUBMISSIONS = 'noonlinesubmissions',
+    NO_SUBMISSION = 'nosubmission',
+    GRADED_FOLLOWUP_SUBMIT = 'gradedfollowupsubmit',
+};
+
+/**
+ * Grading status.
+ * Constants on LMS starting with ASSIGN_GRADING_STATUS_
+ */
+export enum AddonModAssignGradingStates {
+    GRADED = 'graded',
+    NOT_GRADED = 'notgraded',
+    // Added by App Statuses.
+    MARKING_WORKFLOW_STATE_RELEASED = 'released', // with ASSIGN_MARKING_WORKFLOW_STATE_RELEASED
+    GRADED_FOLLOWUP_SUBMIT = 'gradedfollowupsubmit',
+};
+
+/**
+ * Reopen attempt methods.
+ * Constants on LMS starting with ASSIGN_ATTEMPT_REOPEN_METHOD_
+ */
+export enum AddonModAssignAttemptReopenMethodValues {
+    NONE = 'none',
+    MANUAL = 'manual',
+    UNTILPASS = 'untilpass',
+};
diff --git a/src/core/singletons/colors.ts b/src/core/singletons/colors.ts
index 97a2eac81..5a5eeb0c9 100644
--- a/src/core/singletons/colors.ts
+++ b/src/core/singletons/colors.ts
@@ -21,6 +21,18 @@ interface ColorComponents {
     blue: number; // Blue component of an RGB color [0-255].
 }
 
+/**
+ * Ionic color names.
+ */
+export enum CoreIonicColorNames {
+    SUCCESS = 'success',
+    INFO = 'info',
+    DANGER = 'danger',
+    DARK = 'dark',
+    LIGHT = 'light',
+    NONE = '',
+};
+
 /**
  * Singleton with helper functions for colors.
  */

From c5ef18183b7cfd894b1921339ac279bbaf1b5660 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 13 Jan 2022 10:57:36 +0100
Subject: [PATCH 0336/1008] MOBILE-3787 assign: Improve submission list
 filtering

---
 .../mod/assign/classes/submissions-source.ts  | 100 +++++++++---------
 src/addons/mod/assign/services/assign.ts      |   4 +
 2 files changed, 55 insertions(+), 49 deletions(-)

diff --git a/src/addons/mod/assign/classes/submissions-source.ts b/src/addons/mod/assign/classes/submissions-source.ts
index 4e3ee9953..9fd25f21d 100644
--- a/src/addons/mod/assign/classes/submissions-source.ts
+++ b/src/addons/mod/assign/classes/submissions-source.ts
@@ -170,68 +170,69 @@ export class AddonModAssignSubmissionsSource extends CoreRoutedItemsManagerSourc
             : [];
 
         // Filter the submissions to get only the ones with the right status and add some extra data.
-        const getNeedGrading = this.SELECTED_STATUS == AddonModAssignListFilterName.NEED_GRADING;
-        const searchStatus = getNeedGrading ? AddonModAssignSubmissionStatusValues.SUBMITTED : this.SELECTED_STATUS;
+        if (this.SELECTED_STATUS == AddonModAssignListFilterName.NEED_GRADING) {
+            const promises: Promise<void>[] = submissions.map(async (submission: AddonModAssignSubmissionForList) => {
+                // Only show the submissions that need to be graded.
+                submission.needsGrading = await AddonModAssign.needsSubmissionToBeGraded(submission, assign.id);
+            });
 
-        const showSubmissions: AddonModAssignSubmissionForList[] = [];
+            await Promise.all(promises);
 
-        if (searchStatus) {
-            submissions = submissions.filter((submission: AddonModAssignSubmissionForList) => searchStatus == submission.status);
+            submissions = submissions.filter((submission: AddonModAssignSubmissionForList) => submission.needsGrading);
+        } else if (this.SELECTED_STATUS) {
+            const searchStatus = this.SELECTED_STATUS == AddonModAssignListFilterName.DRAFT
+                ? AddonModAssignSubmissionStatusValues.DRAFT
+                : AddonModAssignSubmissionStatusValues.SUBMITTED;
+
+            submissions = submissions.filter((submission: AddonModAssignSubmissionForList) => submission.status  == searchStatus);
         }
 
-        const promises: Promise<void>[] = submissions.map(async (submission: AddonModAssignSubmissionForList) => {
-            const gradeData = await CoreUtils.ignoreErrors(AddonModAssignOffline.getSubmissionGrade(assign.id, submission.userid));
-            if (getNeedGrading) {
-                // Only show the submissions that need to be graded.
-                const add = await AddonModAssign.needsSubmissionToBeGraded(submission, assign.id);
+        const showSubmissions: AddonModAssignSubmissionForList[] = await Promise.all(
+            submissions.map(async (submission: AddonModAssignSubmissionForList) => {
+                const gradeData =
+                    await CoreUtils.ignoreErrors(AddonModAssignOffline.getSubmissionGrade(assign.id, submission.userid));
 
-                if (!add) {
-                    return;
-                }
-            }
+                // Load offline grades.
+                const notSynced = !!gradeData && submission.timemodified < gradeData.timemodified;
 
-            // Load offline grades.
-            const notSynced = !!gradeData && submission.timemodified < gradeData.timemodified;
-
-            if (submission.gradingstatus == AddonModAssignGradingStates.GRADED && !assign.markingworkflow) {
-                // Get the last grade of the submission.
-                const grade = grades
-                    .filter((grade) => grade.userid == submission.userid)
-                    .reduce(
-                        (a, b) => (a && a.timemodified > b.timemodified ? a : b),
+                if (submission.gradingstatus == AddonModAssignGradingStates.GRADED && !assign.markingworkflow) {
+                    // Get the last grade of the submission.
+                    const grade = grades
+                        .filter((grade) => grade.userid == submission.userid)
+                        .reduce(
+                            (a, b) => (a && a.timemodified > b.timemodified ? a : b),
                                 <AddonModAssignGrade | undefined> undefined,
-                    );
+                        );
 
-                if (grade && grade.timemodified < submission.timemodified) {
-                    submission.gradingstatus = AddonModAssignGradingStates.GRADED_FOLLOWUP_SUBMIT;
+                    if (grade && grade.timemodified < submission.timemodified) {
+                        submission.gradingstatus = AddonModAssignGradingStates.GRADED_FOLLOWUP_SUBMIT;
+                    }
                 }
-            }
-            submission.statusColor = AddonModAssign.getSubmissionStatusColor(submission.status);
-            submission.gradingColor = AddonModAssign.getSubmissionGradingStatusColor(
-                submission.gradingstatus,
-            );
-
-            submission.statusTranslated = Translate.instant(
-                'addon.mod_assign.submissionstatus_' + submission.status,
-            );
-
-            if (notSynced) {
-                submission.gradingStatusTranslationId = 'addon.mod_assign.gradenotsynced';
-                submission.gradingColor = '';
-            } else if (submission.statusColor != CoreIonicColorNames.DANGER ||
-                    submission.gradingColor != CoreIonicColorNames.DANGER) {
-                // Show grading status if one of the statuses is not done.
-                submission.gradingStatusTranslationId = AddonModAssign.getSubmissionGradingStatusTranslationId(
+                submission.statusColor = AddonModAssign.getSubmissionStatusColor(submission.status);
+                submission.gradingColor = AddonModAssign.getSubmissionGradingStatusColor(
                     submission.gradingstatus,
                 );
-            } else {
-                submission.gradingStatusTranslationId = '';
-            }
 
-            showSubmissions.push(submission);
-        });
+                submission.statusTranslated = Translate.instant(
+                    'addon.mod_assign.submissionstatus_' + submission.status,
+                );
 
-        await Promise.all(promises);
+                if (notSynced) {
+                    submission.gradingStatusTranslationId = 'addon.mod_assign.gradenotsynced';
+                    submission.gradingColor = '';
+                } else if (submission.statusColor != CoreIonicColorNames.DANGER ||
+                    submission.gradingColor != CoreIonicColorNames.DANGER) {
+                // Show grading status if one of the statuses is not done.
+                    submission.gradingStatusTranslationId = AddonModAssign.getSubmissionGradingStatusTranslationId(
+                        submission.gradingstatus,
+                    );
+                } else {
+                    submission.gradingStatusTranslationId = '';
+                }
+
+                return submission;
+            }),
+        );
 
         return { items: showSubmissions };
     }
@@ -246,6 +247,7 @@ export type AddonModAssignSubmissionForList = AddonModAssignSubmissionFormatted
     gradingColor?: string; // Calculated in the app. Color of the submission grading status.
     statusTranslated?: string; // Calculated in the app. Translated text of the submission status.
     gradingStatusTranslationId?: string; // Calculated in the app. Key of the text of the submission grading status.
+    needsGrading?: boolean; // Calculated in the app. If submission and grading status means that it needs grading.
 };
 
 /**
diff --git a/src/addons/mod/assign/services/assign.ts b/src/addons/mod/assign/services/assign.ts
index 4a9623ddd..643e4647c 100644
--- a/src/addons/mod/assign/services/assign.ts
+++ b/src/addons/mod/assign/services/assign.ts
@@ -955,6 +955,10 @@ export class AddonModAssignProvider {
      * @return Promise resolved with boolean: whether it needs to be graded or not.
      */
     async needsSubmissionToBeGraded(submission: AddonModAssignSubmissionFormatted, assignId: number): Promise<boolean> {
+        if (submission.status != AddonModAssignSubmissionStatusValues.SUBMITTED) {
+            return false;
+        }
+
         if (!submission.gradingstatus) {
             // This should not happen, but it's better to show rather than not showing any of the submissions.
             return true;

From 4fc3c8b0d0e6471e09da0bcf97172ae8a2acc96a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 13 Jan 2022 12:23:03 +0100
Subject: [PATCH 0337/1008] MOBILE-3787 assign: Apply grading status when
 grades are found

---
 .../mod/assign/classes/submissions-source.ts  | 23 ++++++++++---------
 .../mod/assign/services/assign-helper.ts      | 15 ++++++++----
 src/core/components/loading/loading.scss      |  1 -
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/addons/mod/assign/classes/submissions-source.ts b/src/addons/mod/assign/classes/submissions-source.ts
index 9fd25f21d..8a5ef3441 100644
--- a/src/addons/mod/assign/classes/submissions-source.ts
+++ b/src/addons/mod/assign/classes/submissions-source.ts
@@ -164,11 +164,14 @@ export class AddonModAssignSubmissionsSource extends CoreRoutedItemsManagerSourc
                 this.submissionsData.submissions,
                 this.groupId,
             );
+
         // Get assignment grades only if workflow is not enabled to check grading date.
-        const grades = !assign.markingworkflow
+        let grades = !assign.markingworkflow
             ? await AddonModAssign.getAssignmentGrades(assign.id, { cmId: assign.cmid })
             : [];
 
+        // Remove grades (not graded) and sort by timemodified DESC to allow finding quicker.
+        grades = grades.filter((grade) => parseInt(grade.grade, 10) >= 0).sort((a, b) => b.timemodified - a.timemodified);
         // Filter the submissions to get only the ones with the right status and add some extra data.
         if (this.SELECTED_STATUS == AddonModAssignListFilterName.NEED_GRADING) {
             const promises: Promise<void>[] = submissions.map(async (submission: AddonModAssignSubmissionForList) => {
@@ -195,17 +198,15 @@ export class AddonModAssignSubmissionsSource extends CoreRoutedItemsManagerSourc
                 // Load offline grades.
                 const notSynced = !!gradeData && submission.timemodified < gradeData.timemodified;
 
-                if (submission.gradingstatus == AddonModAssignGradingStates.GRADED && !assign.markingworkflow) {
+                if (!assign.markingworkflow) {
                     // Get the last grade of the submission.
-                    const grade = grades
-                        .filter((grade) => grade.userid == submission.userid)
-                        .reduce(
-                            (a, b) => (a && a.timemodified > b.timemodified ? a : b),
-                                <AddonModAssignGrade | undefined> undefined,
-                        );
+                    const grade = grades.find((grade) => grade.userid == submission.userid);
 
-                    if (grade && grade.timemodified < submission.timemodified) {
-                        submission.gradingstatus = AddonModAssignGradingStates.GRADED_FOLLOWUP_SUBMIT;
+                    if (grade) {
+                        // Override status if grade is found.
+                        submission.gradingstatus = grade.timemodified < submission.timemodified
+                            ? AddonModAssignGradingStates.GRADED_FOLLOWUP_SUBMIT
+                            : AddonModAssignGradingStates.GRADED;
                     }
                 }
                 submission.statusColor = AddonModAssign.getSubmissionStatusColor(submission.status);
@@ -222,7 +223,7 @@ export class AddonModAssignSubmissionsSource extends CoreRoutedItemsManagerSourc
                     submission.gradingColor = '';
                 } else if (submission.statusColor != CoreIonicColorNames.DANGER ||
                     submission.gradingColor != CoreIonicColorNames.DANGER) {
-                // Show grading status if one of the statuses is not done.
+                    // Show grading status if one of the statuses is not done.
                     submission.gradingStatusTranslationId = AddonModAssign.getSubmissionGradingStatusTranslationId(
                         submission.gradingstatus,
                     );
diff --git a/src/addons/mod/assign/services/assign-helper.ts b/src/addons/mod/assign/services/assign-helper.ts
index 25653194c..cb062c240 100644
--- a/src/addons/mod/assign/services/assign-helper.ts
+++ b/src/addons/mod/assign/services/assign-helper.ts
@@ -150,7 +150,7 @@ export class AddonModAssignHelperProvider {
             attemptnumber: 0,
             timecreated: 0,
             timemodified: 0,
-            status: '',
+            status: AddonModAssignSubmissionStatusValues.NEW,
             groupid: 0,
         };
     }
@@ -404,13 +404,18 @@ export class AddonModAssignHelperProvider {
         const blind = !!assign.blindmarking && !assign.revealidentities;
         const teamsubmission = !!assign.teamsubmission;
 
+        if (teamsubmission) {
+            // On team submission discard user submissions.
+            submissions = submissions.filter((submission) => submission.userid == 0);
+        }
+
         return participants.map((participant) => {
             const groupId = participant.groupid ??
                 (participant.groups && participant.groups[0] ? participant.groups[0].id : 0);
 
             const foundSubmission = submissions.find((submission) => {
                 if (teamsubmission) {
-                    return submission.userid == 0 && submission.groupid == groupId;
+                    return submission.groupid == groupId;
                 }
 
                 const submitId = submission.userid && submission.userid > 0 ? submission.userid : submission.blindid;
@@ -423,6 +428,9 @@ export class AddonModAssignHelperProvider {
                 // Create submission if none.
                 submission = this.createEmptySubmission();
                 submission.groupid = groupId;
+                submission.status = participant.submitted
+                    ? AddonModAssignSubmissionStatusValues.SUBMITTED
+                    : AddonModAssignSubmissionStatusValues.NEW;
             } else {
                 submission = Object.assign({}, foundSubmission);
             }
@@ -444,9 +452,6 @@ export class AddonModAssignHelperProvider {
                 submission.groupname = participant.groupname;
             }
 
-            submission.status = submission.status ?? (participant.submitted ? AddonModAssignSubmissionStatusValues.SUBMITTED :
-                AddonModAssignSubmissionStatusValues.NEW);
-
             return submission;
 
         });
diff --git a/src/core/components/loading/loading.scss b/src/core/components/loading/loading.scss
index 3861b04e2..ef26afe30 100644
--- a/src/core/components/loading/loading.scss
+++ b/src/core/components/loading/loading.scss
@@ -44,7 +44,6 @@
     }
 
     .core-loading-content {
-        display: contents;
         @include core-transition(opacity, 200ms);
     }
 

From 347d08f806a47c3b73c70e7ab5ebc0c46c94a207 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 17 Jan 2022 11:56:50 +0100
Subject: [PATCH 0338/1008] MOBILE-3833 lang: Improve language scripts

---
 scripts/lang_functions.php | 13 ++++++++++---
 scripts/lang_functions.sh  |  3 +++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/scripts/lang_functions.php b/scripts/lang_functions.php
index cd363ee48..38bd83b72 100644
--- a/scripts/lang_functions.php
+++ b/scripts/lang_functions.php
@@ -113,10 +113,17 @@ function add_langs_to_config($langs, $config) {
         $config['languages'] = json_decode( json_encode( $config['languages'] ), true );
         ksort($config['languages']);
         $config['languages'] = json_decode( json_encode( $config['languages'] ), false );
-        file_put_contents(CONFIG, json_encode($config, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT));
+        save_json(CONFIG, $config);
     }
 }
 
+/**
+ * Save json data.
+ */
+function save_json($path, $content) {
+    file_put_contents($path, str_replace('\/', '/', json_encode($content, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT))."\n");
+}
+
 function get_langfolder($lang) {
     $folder = LANGPACKSFOLDER.'/'.str_replace('-', '_', $lang);
     if (!is_dir($folder) || !is_file($folder.'/langconfig.php')) {
@@ -271,7 +278,7 @@ function build_lang($lang, $keys) {
 
     // Sort and save.
     ksort($translations);
-    file_put_contents(ASSETSPATH.$lang.'.json', str_replace('\/', '/', json_encode($translations, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT)));
+    save_json(ASSETSPATH.$lang.'.json', $translations);
 
     $success = count($translations);
     $percentage = floor($success/$total * 100);
@@ -366,7 +373,7 @@ function save_key($key, $value, $filePath) {
     if (!isset($file[$key]) || $file[$key] != $value) {
         $file[$key] = $value;
         ksort($file);
-        file_put_contents($filePath, str_replace('\/', '/', json_encode($file, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT)));
+        save_json($filePath, $file);
     }
 }
 
diff --git a/scripts/lang_functions.sh b/scripts/lang_functions.sh
index 6b5b4ece3..2dc18ad05 100755
--- a/scripts/lang_functions.sh
+++ b/scripts/lang_functions.sh
@@ -124,6 +124,9 @@ function get_language {
 # Entry function to get all language files.
 function get_languages {
     suffix=$1
+    if [ -z $suffix ]; then
+        suffix=''
+    fi
 
     get_last_version
 

From 3a9b779d389bd8b48c8b03fd22f38efda54d2011 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 17 Jan 2022 11:57:07 +0100
Subject: [PATCH 0339/1008] MOBILE-3833 lang: Update languages

---
 moodle.config.json                                 |  8 +++++---
 .../components/filteroptions/filteroptions.html    |  2 +-
 src/addons/block/myoverview/lang.json              |  6 +++---
 src/addons/block/timeline/lang.json                |  2 +-
 src/addons/mod/assign/lang.json                    |  4 ++--
 src/addons/mod/chat/lang.json                      |  4 ++--
 src/addons/mod/forum/lang.json                     |  4 ++--
 src/addons/mod/quiz/lang.json                      |  2 +-
 src/addons/report/insights/lang.json               |  2 +-
 src/core/features/courses/lang.json                |  6 +++---
 src/core/features/login/lang.json                  |  6 +++---
 src/core/lang.json                                 | 14 +++++++-------
 12 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/moodle.config.json b/moodle.config.json
index feafc94b6..ecca950ae 100644
--- a/moodle.config.json
+++ b/moodle.config.json
@@ -30,6 +30,7 @@
         "he": "עברית",
         "hi": "हिंदी",
         "hr": "Hrvatski",
+        "hsb": "Hornjoserbsski",
         "hu": "magyar",
         "hy": "Հայերեն",
         "id": "Indonesian",
@@ -38,6 +39,7 @@
         "km": "ខ្មែរ",
         "kn": "ಕನ್ನಡ",
         "ko": "한국어",
+        "lo": "ລາວ",
         "lt": "Lietuvių",
         "lv": "Latviešu",
         "mn": "Монгол",
@@ -64,12 +66,12 @@
     "wsservice": "moodle_mobile_app",
     "demo_sites": {
         "student": {
-            "url": "https:\/\/school.moodledemo.net",
+            "url": "https://school.moodledemo.net",
             "username": "student",
             "password": "moodle"
         },
         "teacher": {
-            "url": "https:\/\/school.moodledemo.net",
+            "url": "https://school.moodledemo.net",
             "username": "teacher",
             "password": "moodle"
         }
@@ -87,7 +89,7 @@
     "onlyallowlistedsites": false,
     "skipssoconfirmation": false,
     "forcedefaultlanguage": false,
-    "privacypolicy": "https:\/\/moodle.net\/moodle-app-privacy\/",
+    "privacypolicy": "https://moodle.net/moodle-app-privacy/",
     "notificoncolor": "#f98012",
     "enableanalytics": false,
     "enableonboarding": true,
diff --git a/src/addons/block/myoverview/components/filteroptions/filteroptions.html b/src/addons/block/myoverview/components/filteroptions/filteroptions.html
index 448844d23..dc8db1c6d 100644
--- a/src/addons/block/myoverview/components/filteroptions/filteroptions.html
+++ b/src/addons/block/myoverview/components/filteroptions/filteroptions.html
@@ -14,7 +14,7 @@
     <ion-list>
         <ion-radio-group [(ngModel)]="options.timeFilterSelected">
             <ion-item class="ion-text-wrap" *ngIf="options.show.all">
-                <ion-label>{{'addon.block_myoverview.allincludinghidden' | translate}}</ion-label>
+                <ion-label>{{'addon.block_myoverview.all' | translate}}</ion-label>
                 <ion-radio slot="end" value="all"></ion-radio>
             </ion-item>
             <ion-item class="ion-text-wrap" *ngIf="options.show.inprogress">
diff --git a/src/addons/block/myoverview/lang.json b/src/addons/block/myoverview/lang.json
index 9b0831599..02a3c43fa 100644
--- a/src/addons/block/myoverview/lang.json
+++ b/src/addons/block/myoverview/lang.json
@@ -1,7 +1,7 @@
 {
-    "all": "All (except removed from view)",
-    "allincludinghidden": "All",
-    "aria:hiddencourses": "Show courses removed from view",
+    "all": "All",
+    "allincludinghidden": "All (including archived)",
+    "aria:hiddencourses": "Show archived courses",
     "card": "Card",
     "favouritesonly": "Show starred courses only",
     "future": "Future",
diff --git a/src/addons/block/timeline/lang.json b/src/addons/block/timeline/lang.json
index 10c8b2859..b4cb56414 100644
--- a/src/addons/block/timeline/lang.json
+++ b/src/addons/block/timeline/lang.json
@@ -5,7 +5,7 @@
     "next6months": "Next 6 months",
     "next7days": "Next 7 days",
     "nocoursesinprogress": "No in-progress courses",
-    "noevents": "No upcoming activities due",
+    "noevents": "No activities require action",
     "overdue": "Overdue",
     "pluginname": "Timeline",
     "searchevents": "Search by activity type or name",
diff --git a/src/addons/mod/assign/lang.json b/src/addons/mod/assign/lang.json
index 8eb6b6708..d79de9089 100644
--- a/src/addons/mod/assign/lang.json
+++ b/src/addons/mod/assign/lang.json
@@ -75,7 +75,7 @@
     "numberofteamscountdescription": "There are {{count}} teams.",
     "numwords": "{{$a}} words",
     "outof": "{{$a.current}} out of {{$a.total}}",
-    "overdue": "<font color=\"red\">Assignment is overdue by: {{$a}}</font>",
+    "overdue": "Assignment is overdue by: {{$a}}",
     "submission": "Submission",
     "submissioneditable": "Student can edit this submission",
     "submissionnoteditable": "Student cannot edit this submission",
@@ -105,4 +105,4 @@
     "warningsubmissiongrademodified": "The submission grade was modified on the site.",
     "warningsubmissionmodified": "The user submission was modified on the site.",
     "wordlimit": "Word limit"
-}
\ No newline at end of file
+}
diff --git a/src/addons/mod/chat/lang.json b/src/addons/mod/chat/lang.json
index 7d5b644a0..5826b5126 100644
--- a/src/addons/mod/chat/lang.json
+++ b/src/addons/mod/chat/lang.json
@@ -3,7 +3,7 @@
     "chatreport": "Chat sessions",
     "confirmloss": "Are you sure? Chat history can be lost.",
     "currentusers": "Current users",
-    "enterchat": "Click here to enter the chat now",
+    "enterchat": "Enter the chat",
     "entermessage": "Enter your message",
     "errorwhileconnecting": "Error while connecting to the chat.",
     "errorwhilegettingchatdata": "Error while getting chat data.",
@@ -25,5 +25,5 @@
     "sessionstart": "The next chat session will start on {{$a.date}}, ({{$a.fromnow}} from now)",
     "showincompletesessions": "Show incomplete sessions",
     "talk": "Talk",
-    "viewreport": "View past chat sessions"
+    "viewreport": "Past sessions"
 }
diff --git a/src/addons/mod/forum/lang.json b/src/addons/mod/forum/lang.json
index 9e5595213..11f77ca53 100644
--- a/src/addons/mod/forum/lang.json
+++ b/src/addons/mod/forum/lang.json
@@ -1,5 +1,5 @@
 {
-    "addanewdiscussion": "Add a new discussion topic",
+    "addanewdiscussion": "Add discussion topic",
     "addanewquestion": "Add a new question",
     "addanewtopic": "Add a new topic",
     "addtofavourites": "Star this discussion",
@@ -45,7 +45,7 @@
     "numreplies": "{{numreplies}} replies",
     "pindiscussion": "Pin this discussion",
     "pinupdated": "The pin option has been updated.",
-    "postisprivatereply": "This is a private reply. It is not visible to other participants.",
+    "postisprivatereply": "This is a private reply. It is only visible to you and anyone with the capability to view private replies, such as teachers or managers.",
     "posttoforum": "Post to forum",
     "posttomygroups": "Post a copy to all groups",
     "privatereply": "Reply privately",
diff --git a/src/addons/mod/quiz/lang.json b/src/addons/mod/quiz/lang.json
index ae212f6f7..8f59f8656 100644
--- a/src/addons/mod/quiz/lang.json
+++ b/src/addons/mod/quiz/lang.json
@@ -16,7 +16,7 @@
     "confirmstart": "Your attempt will have a time limit of {{$a}}. When you start, the timer will begin to count down and cannot be paused. You must finish your attempt before it expires. Are you sure you wish to start now?",
     "confirmstartheader": "Time limit",
     "connectionerror": "Network connection lost. (Autosave failed).\n\nMake a note of any responses entered on this page in the last few minutes, then try to re-connect.\n\nOnce connection has been re-established, your responses should be saved and this message will disappear.",
-    "continueattemptquiz": "Continue the last attempt",
+    "continueattemptquiz": "Continue your attempt",
     "continuepreview": "Continue the last preview",
     "errorbehaviournotsupported": "This quiz can't be attempted in the app because the question behaviour is not supported by the app:",
     "errordownloading": "Error downloading required data.",
diff --git a/src/addons/report/insights/lang.json b/src/addons/report/insights/lang.json
index 9f2b8b7b4..2c543567b 100644
--- a/src/addons/report/insights/lang.json
+++ b/src/addons/report/insights/lang.json
@@ -1,5 +1,5 @@
 {
-    "actionsaved": "Your feedback of '{{$a}}' has been saved",
+    "actionsaved": "Your feedback of '{{$a}}' has been saved.",
     "fixedack": "Accept",
     "incorrectlyflagged": "Incorrectly flagged",
     "notapplicable": "Not applicable",
diff --git a/src/core/features/courses/lang.json b/src/core/features/courses/lang.json
index 70b5a0b79..9887f8853 100644
--- a/src/core/features/courses/lang.json
+++ b/src/core/features/courses/lang.json
@@ -19,8 +19,8 @@
     "errorselfenrol": "An error occurred while self enrolling.",
     "favourite": "Starred course",
     "filtermycourses": "Filter my courses",
-    "frontpage": "Front page",
-    "hidecourse": "Remove from view",
+    "frontpage": "Site home",
+    "hidecourse": "Archive",
     "ignore": "Ignore",
     "mycourses": "My courses",
     "mymoodle": "Dashboard",
@@ -40,7 +40,7 @@
     "searchcoursesadvice": "You can use the search courses button to find courses to access as a  guest or enrol yourself in courses that allow it.",
     "selfenrolment": "Self enrolment",
     "sendpaymentbutton": "Send payment via PayPal",
-    "show": "Restore to view",
+    "show": "Unarchive",
     "showonlyenrolled": "Show only my courses",
     "therearecourses": "There are {{$a}} courses",
     "totalcoursesearchresults": "Total courses: {{$a}}"
diff --git a/src/core/features/login/lang.json b/src/core/features/login/lang.json
index 53a7bf0ed..240b6a6e5 100644
--- a/src/core/features/login/lang.json
+++ b/src/core/features/login/lang.json
@@ -1,6 +1,6 @@
 {
     "accounts": "Accounts",
-    "add": "Add a new account",
+    "add": "Add",
     "auth_email": "Email-based self-registration",
     "authenticating": "Authenticating",
     "cancel": "Cancel",
@@ -13,13 +13,13 @@
     "confirmdeletesite": "Are you sure you want to remove the account on {{sitename}}?",
     "connect": "Connect!",
     "connecttomoodle": "Connect to Moodle",
+    "connecttomoodleapp": "You are trying to connect to a regular Moodle site. Please download the official Moodle app to access this site.",
+    "connecttoworkplaceapp": "You are trying to connect to a Moodle Workplace site. Please download the Moodle Workplace app to access this site.",
     "contactyouradministrator": "Contact your site administrator for further help.",
     "contactyouradministratorissue": "Please ask your site administrator to check the following issue: {{$a}}",
     "createaccount": "Create my new account",
     "createuserandpass": "Choose your username and password",
     "credentialsdescription": "Please provide your username and password to log in.",
-    "connecttomoodleapp": "You are trying to connect to a regular Moodle site. Please download the official Moodle app to access this site.",
-    "connecttoworkplaceapp": "You are trying to connect to a Moodle Workplace site. Please download the Moodle Workplace app to access this site.",
     "emailconfirmsent": "<p>An email should have been sent to your address at <b>{{$a}}</b></p>\n   <p>It contains easy instructions to complete your registration.</p>\n   <p>If you continue to have difficulty, contact the site administrator.</p>",
     "emailconfirmsentnoemail": "<p>An email should have been sent to your address.</p><p>It contains easy instructions to complete your registration.</p><p>If you continue to have difficulty, contact the site administrator.</p>",
     "emailconfirmsentsuccess": "Confirmation email sent successfully",
diff --git a/src/core/lang.json b/src/core/lang.json
index ce0aebea4..68fa3736d 100644
--- a/src/core/lang.json
+++ b/src/core/lang.json
@@ -7,9 +7,9 @@
     "all": "All",
     "allgroups": "All groups",
     "allparticipants": "All participants",
-    "applyfilters": "Apply filters",
     "answer": "Answer",
     "answered": "Answered",
+    "applyfilters": "Apply filters",
     "areyousure": "Are you sure?",
     "back": "Back",
     "browser": "Browser",
@@ -120,6 +120,7 @@
     "filename": "Filename",
     "filenameexist": "File name already exists: {{$a}}",
     "filenotfound": "File not found, sorry.",
+    "filter": "Filter",
     "folder": "Folder",
     "forcepasswordchangenotice": "You must change your password to proceed.",
     "fulllistofcourses": "All courses",
@@ -143,7 +144,6 @@
     "invalidformdata": "Incorrect form data",
     "ioscookieshelp": "Embedded content might require cookies to work. Please go to the app's iOS settings, enable 'Allow Cross-Website Tracking' and try again.",
     "labelsep": ":",
-    "filter": "Filter",
     "lastaccess": "Last access",
     "lastdownloaded": "Last downloaded",
     "lastmodified": "Last modified",
@@ -202,6 +202,7 @@
     "nocomments": "No comments",
     "nograde": "No grade",
     "none": "None",
+    "nooptionavailable": "No option available",
     "nopasswordchangeforced": "You cannot proceed without changing your password.",
     "nopermissionerror": "Sorry, but you do not currently have permissions to do that",
     "nopermissions": "Sorry, but you do not currently have permissions to do that ({{$a}}).",
@@ -211,7 +212,6 @@
     "notavailable": "Not available",
     "notenrolledprofile": "This profile is not available because this user is not enrolled in this course.",
     "notice": "Notice",
-    "nooptionavailable": "No option available",
     "notingroup": "Sorry, but you need to be part of a group to see this page.",
     "notsent": "Not sent",
     "now": "now",
@@ -254,6 +254,8 @@
     "save": "Save",
     "savechanges": "Save changes",
     "scanqr": "Scan QR code",
+    "scrollbackward": "Scroll backward",
+    "scrollforward": "Scroll forward",
     "search": "Search",
     "searching": "Searching",
     "searchresults": "Search results",
@@ -281,8 +283,6 @@
     "sorry": "Sorry...",
     "sort": "Sort",
     "sortby": "Sort by",
-    "scrollbackward": "Scroll backward",
-    "scrollforward": "Scroll forward",
     "start": "Start",
     "storingfiles": "Storing files",
     "strftimedate": "%d %B %Y",
@@ -319,9 +319,9 @@
     "unknown": "Unknown",
     "unlimited": "Unlimited",
     "unzipping": "Unzipping",
-    "upgraderunning": "Site is being upgraded, please retry later.",
     "updaterequired": "App update required",
     "updaterequireddesc": "Please update your app to version {{$a}}",
+    "upgraderunning": "Site is being upgraded, please retry later.",
     "user": "User",
     "userdeleted": "This user account has been deleted",
     "userdetails": "User details",
@@ -334,7 +334,7 @@
     "viewprofile": "View profile",
     "warningofflinedatadeleted": "Offline data from {{component}} '{{name}}' has been deleted. {{error}}",
     "warnopeninbrowser": "<p>You are about to leave the app to open the following URL in your device's browser. Do you want to continue?</p>\n<p><b>{{url}}</b></p>",
-    "week": "week",
+    "week": "Week",
     "weeks": "weeks",
     "whatisyourage": "What is your age?",
     "wheredoyoulive": "In which country do you live?",

From d2b716da8d8730af79f5a9f2dbab02098b1d3ac6 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 23 Dec 2021 17:10:17 +0100
Subject: [PATCH 0340/1008] MOBILE-3934 competency: Add swipe navigation

---
 .../competency-course-competencies-source.ts  |  97 +++++++
 .../competency-plan-competencies-source.ts    |  88 ++++++
 .../classes/competency-plans-source.ts        |  97 +++++++
 .../pages/competency/competency.html          |   9 +-
 .../pages/competency/competency.page.ts       | 260 +++++++++++++-----
 .../coursecompetencies.html                   |  37 ++-
 .../coursecompetencies.page.ts                | 108 +++++---
 src/addons/competency/pages/plan/plan.html    |  11 +-
 src/addons/competency/pages/plan/plan.ts      |  93 ++++---
 .../competency/pages/planlist/planlist.ts     |  84 +-----
 .../items-management/list-items-manager.ts    |   8 +-
 11 files changed, 639 insertions(+), 253 deletions(-)
 create mode 100644 src/addons/competency/classes/competency-course-competencies-source.ts
 create mode 100644 src/addons/competency/classes/competency-plan-competencies-source.ts
 create mode 100644 src/addons/competency/classes/competency-plans-source.ts

diff --git a/src/addons/competency/classes/competency-course-competencies-source.ts b/src/addons/competency/classes/competency-course-competencies-source.ts
new file mode 100644
index 000000000..363514900
--- /dev/null
+++ b/src/addons/competency/classes/competency-course-competencies-source.ts
@@ -0,0 +1,97 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreRoutedItemsManagerSource } from '@classes/items-management/routed-items-manager-source';
+import { CoreUserProfile } from '@features/user/services/user';
+import { CoreUtils } from '@services/utils/utils';
+import {
+    AddonCompetency,
+    AddonCompetencyDataForCourseCompetenciesPageCompetency,
+    AddonCompetencyDataForCourseCompetenciesPageWSResponse,
+} from '../services/competency';
+import { AddonCompetencyHelper } from '../services/competency-helper';
+
+/**
+ * Provides a collection of course competencies.
+ */
+export class AddonCompetencyCourseCompetenciesSource
+    extends CoreRoutedItemsManagerSource<AddonCompetencyDataForCourseCompetenciesPageCompetency> {
+
+    /**
+     * @inheritdoc
+     */
+    static getSourceId(courseId: number, userId?: number): string {
+        return `${courseId}-${userId || 'current-user'}`;
+    }
+
+    readonly COURSE_ID: number;
+    readonly USER_ID?: number;
+
+    courseCompetencies?: AddonCompetencyDataForCourseCompetenciesPageWSResponse;
+    user?: CoreUserProfile;
+
+    constructor(courseId: number, userId?: number) {
+        super();
+
+        this.COURSE_ID = courseId;
+        this.USER_ID = userId;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    getItemPath(competency: AddonCompetencyDataForCourseCompetenciesPageCompetency): string {
+        return String(competency.competency.id);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async load(): Promise<void> {
+        if (this.dirty || !this.courseCompetencies) {
+            await this.loadCourseCompetencies();
+        }
+
+        await super.load();
+    }
+
+    /**
+     * Invalidate course cache.
+     */
+    async invalidateCache(): Promise<void> {
+        await CoreUtils.ignoreErrors(AddonCompetency.invalidateCourseCompetencies(this.COURSE_ID, this.USER_ID));
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected async loadPageItems(): Promise<{ items: AddonCompetencyDataForCourseCompetenciesPageCompetency[] }> {
+        if (!this.courseCompetencies) {
+            throw new Error('Can\'t load competencies without course data');
+        }
+
+        return { items: this.courseCompetencies.competencies };
+    }
+
+    /**
+     * Load competencies.
+     */
+    private async loadCourseCompetencies(): Promise<void> {
+        [this.courseCompetencies, this.user] = await Promise.all([
+            AddonCompetency.getCourseCompetencies(this.COURSE_ID, this.USER_ID),
+            AddonCompetencyHelper.getProfile(this.USER_ID),
+        ]);
+    }
+
+}
diff --git a/src/addons/competency/classes/competency-plan-competencies-source.ts b/src/addons/competency/classes/competency-plan-competencies-source.ts
new file mode 100644
index 000000000..a674f4c1e
--- /dev/null
+++ b/src/addons/competency/classes/competency-plan-competencies-source.ts
@@ -0,0 +1,88 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreRoutedItemsManagerSource } from '@classes/items-management/routed-items-manager-source';
+import { CoreUserProfile } from '@features/user/services/user';
+import { CoreUtils } from '@services/utils/utils';
+import {
+    AddonCompetency,
+    AddonCompetencyDataForPlanPageCompetency,
+    AddonCompetencyDataForPlanPageWSResponse,
+} from '../services/competency';
+import { AddonCompetencyHelper } from '../services/competency-helper';
+
+/**
+ * Provides a collection of plan competencies.
+ */
+export class AddonCompetencyPlanCompetenciesSource extends CoreRoutedItemsManagerSource<AddonCompetencyDataForPlanPageCompetency> {
+
+    readonly PLAN_ID: number;
+
+    plan?: AddonCompetencyDataForPlanPageWSResponse;
+    user?: CoreUserProfile;
+
+    constructor(planId: number) {
+        super();
+
+        this.PLAN_ID = planId;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    getItemPath(competency: AddonCompetencyDataForPlanPageCompetency): string {
+        return String(competency.competency.id);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async load(): Promise<void> {
+        if (this.dirty || !this.plan) {
+            await this.loadLearningPlan();
+        }
+
+        await super.load();
+    }
+
+    /**
+     * Invalidate plan cache.
+     */
+    async invalidateCache(): Promise<void> {
+        await CoreUtils.ignoreErrors(AddonCompetency.invalidateLearningPlan(this.PLAN_ID));
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected async loadPageItems(): Promise<{ items: AddonCompetencyDataForPlanPageCompetency[] }> {
+        if (!this.plan) {
+            throw new Error('Can\'t load competencies without plan!');
+        }
+
+        return { items: this.plan.competencies };
+    }
+
+    /**
+     * Load learning plan.
+     */
+    private async loadLearningPlan(): Promise<void> {
+        this.plan = await AddonCompetency.getLearningPlan(this.PLAN_ID);
+        this.plan.plan.statusname = AddonCompetencyHelper.getPlanStatusName(this.plan.plan.status);
+
+        // Get the user profile image.
+        this.user = await AddonCompetencyHelper.getProfile(this.plan.plan.userid);
+    }
+
+}
diff --git a/src/addons/competency/classes/competency-plans-source.ts b/src/addons/competency/classes/competency-plans-source.ts
new file mode 100644
index 000000000..471db5ba5
--- /dev/null
+++ b/src/addons/competency/classes/competency-plans-source.ts
@@ -0,0 +1,97 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { Params } from '@angular/router';
+import { CoreRoutedItemsManagerSource } from '@classes/items-management/routed-items-manager-source';
+import { ADDON_COMPETENCY_COMPETENCIES_PAGE } from '../competency.module';
+import { AddonCompetency, AddonCompetencyPlan, AddonCompetencyProvider } from '../services/competency';
+import { AddonCompetencyHelper } from '../services/competency-helper';
+
+/**
+ * Provides a collection of learning plans.
+ */
+export class AddonCompetencyPlansSource extends CoreRoutedItemsManagerSource<AddonCompetencyPlanFormatted> {
+
+    /**
+     * @inheritdoc
+     */
+    static getSourceId(userId?: number): string {
+        return userId ? String(userId) : 'current-user';
+    }
+
+    readonly USER_ID?: number;
+
+    constructor(userId?: number) {
+        super();
+
+        this.USER_ID = userId;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    getItemPath(plan: AddonCompetencyPlanFormatted): string {
+        return `${plan.id}/${ADDON_COMPETENCY_COMPETENCIES_PAGE}`;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    getItemQueryParams(): Params {
+        if (this.USER_ID) {
+            return { userId: this.USER_ID };
+        }
+
+        return {};
+    }
+
+    /**
+     * Invalidate learning plans cache.
+     */
+    async invalidateCache(): Promise<void> {
+        await AddonCompetency.invalidateLearningPlans(this.USER_ID);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected async loadPageItems(): Promise<{ items: AddonCompetencyPlanFormatted[] }> {
+        const plans = await AddonCompetency.getLearningPlans(this.USER_ID);
+
+        plans.forEach((plan: AddonCompetencyPlanFormatted) => {
+            plan.statusname = AddonCompetencyHelper.getPlanStatusName(plan.status);
+            switch (plan.status) {
+                case AddonCompetencyProvider.STATUS_ACTIVE:
+                    plan.statuscolor = 'success';
+                    break;
+                case AddonCompetencyProvider.STATUS_COMPLETE:
+                    plan.statuscolor = 'danger';
+                    break;
+                default:
+                    plan.statuscolor = 'warning';
+                    break;
+            }
+        });
+
+        return { items: plans };
+    }
+
+}
+
+/**
+ * Competency plan with some calculated data.
+ */
+export type AddonCompetencyPlanFormatted = AddonCompetencyPlan & {
+    statuscolor?: string; // Calculated in the app. Color of the plan's status.
+};
diff --git a/src/addons/competency/pages/competency/competency.html b/src/addons/competency/pages/competency/competency.html
index d70e9e806..a73a97e2c 100644
--- a/src/addons/competency/pages/competency/competency.html
+++ b/src/addons/competency/pages/competency/competency.html
@@ -10,7 +10,7 @@
         </ion-title>
     </ion-toolbar>
 </ion-header>
-<ion-content>
+<ion-content [core-swipe-navigation]="competencies">
     <ion-refresher slot="fixed" [disabled]="!competencyLoaded" (ionRefresh)="refreshCompetency($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
@@ -36,9 +36,7 @@
                 <ion-label>
                     <p class="item-heading">{{ 'addon.competency.path' | translate }}</p>
                     <p>
-                        <a *ngIf="competency.competency.comppath.showlinks" [href]="competency.competency.comppath.pluginbaseurl + '/competencies.php?competencyframeworkid=' +
-                            competency.competency.comppath.framework.id + '&pagecontextid=' +
-                            competency.competency.comppath.pagecontextid" core-link>
+                        <a *ngIf="competency.competency.comppath.showlinks" [href]="competencyFrameworkUrl" core-link>
                             {{ competency.competency.comppath.framework.name }}
                         </a>
                         <ng-container *ngIf="!competency.competency.comppath.showlinks">
@@ -79,7 +77,8 @@
                     </p>
                     <ion-item class="ion-text-wrap" *ngFor="let activity of coursemodules" [href]="activity.url"
                         [attr.aria-label]="activity.name" core-link capture="true">
-                        <core-mod-icon slot="start" [modicon]="activity.iconurl" [showAlt]="false" *ngIf="activity.iconurl"></core-mod-icon>
+                        <core-mod-icon slot="start" [modicon]="activity.iconurl" [showAlt]="false" *ngIf="activity.iconurl">
+                        </core-mod-icon>
                         <ion-label>
                             <core-format-text [text]="activity.name" contextLevel="module" [contextInstanceId]="activity.id"
                                 [courseId]="courseId">
diff --git a/src/addons/competency/pages/competency/competency.page.ts b/src/addons/competency/pages/competency/competency.page.ts
index 94c08b897..e2c2a41a1 100644
--- a/src/addons/competency/pages/competency/competency.page.ts
+++ b/src/addons/competency/pages/competency/competency.page.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { AddonCompetencyHelper } from '@addons/competency/services/competency-helper';
-import { Component, OnInit } from '@angular/core';
+import { Component, OnDestroy, OnInit } from '@angular/core';
 import { CoreCourseModuleSummary } from '@features/course/services/course';
 import { CoreUserSummary } from '@features/user/services/user';
 import { CoreSites } from '@services/sites';
@@ -25,14 +25,19 @@ import {
     AddonCompetencyUserCompetency,
     AddonCompetencyUserCompetencyCourse,
     AddonCompetency,
-    AddonCompetencyDataForUserCompetencySummaryInPlanWSResponse,
-    AddonCompetencyDataForUserCompetencySummaryInCourseWSResponse,
+    AddonCompetencyDataForPlanPageCompetency,
+    AddonCompetencyDataForCourseCompetenciesPageCompetency,
 } from '@addons/competency/services/competency';
 import { CoreNavigator } from '@services/navigator';
 import { IonRefresher } from '@ionic/angular';
 import { ContextLevel } from '@/core/constants';
 import { CoreUtils } from '@services/utils/utils';
 import { ADDON_COMPETENCY_SUMMARY_PAGE } from '@addons/competency/competency.module';
+import { CoreSwipeNavigationItemsManager } from '@classes/items-management/swipe-navigation-items-manager';
+import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
+import { AddonCompetencyPlanCompetenciesSource } from '@addons/competency/classes/competency-plan-competencies-source';
+import { ActivatedRouteSnapshot } from '@angular/router';
+import { AddonCompetencyCourseCompetenciesSource } from '@addons/competency/classes/competency-course-competencies-source';
 
 /**
  * Page that displays the competency information.
@@ -41,13 +46,10 @@ import { ADDON_COMPETENCY_SUMMARY_PAGE } from '@addons/competency/competency.mod
     selector: 'page-addon-competency-competency',
     templateUrl: 'competency.html',
 })
-export class AddonCompetencyCompetencyPage implements OnInit {
+export class AddonCompetencyCompetencyPage implements OnInit, OnDestroy {
 
     competencyLoaded = false;
-    competencyId!: number;
-    planId?: number;
-    courseId?: number;
-    userId?: number;
+    competencies!: AddonCompetencyCompetenciesSwipeManager;
     planStatus?: number;
     coursemodules?: CoreCourseModuleSummary[];
     user?: CoreUserSummary;
@@ -56,17 +58,26 @@ export class AddonCompetencyCompetencyPage implements OnInit {
     contextLevel?: string;
     contextInstanceId?: number;
 
-    /**
-     * @inheritdoc
-     */
-    async ngOnInit(): Promise<void> {
+    constructor() {
         try {
-            this.competencyId = CoreNavigator.getRequiredRouteNumberParam('competencyId');
-            this.planId = CoreNavigator.getRouteNumberParam('planId');
-            if (!this.planId) {
-                this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
-                this.userId = CoreNavigator.getRouteNumberParam('userId');
+            const planId = CoreNavigator.getRouteNumberParam('planId');
+
+            if (!planId) {
+                const courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+                const userId = CoreNavigator.getRouteNumberParam('userId');
+                const source = CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(
+                    AddonCompetencyCourseCompetenciesSource,
+                    [courseId, userId],
+                );
+
+                this.competencies = new AddonCompetencyCompetenciesSwipeManager(source);
+
+                return;
             }
+
+            const source = CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(AddonCompetencyPlanCompetenciesSource, [planId]);
+
+            this.competencies = new AddonCompetencyCompetenciesSwipeManager(source);
         } catch (error) {
             CoreDomUtils.showErrorModal(error);
 
@@ -74,24 +85,63 @@ export class AddonCompetencyCompetencyPage implements OnInit {
 
             return;
         }
+    }
 
+    get competencyFrameworkUrl(): string | undefined {
+        if (!this.competency) {
+            return;
+        }
+
+        const { pluginbaseurl, framework, pagecontextid } = this.competency.competency.comppath;
+
+        return `${pluginbaseurl}/competencies.php?competencyframeworkid=${framework.id}&pagecontextid=${pagecontextid}`;
+    }
+
+    get courseId(): number | undefined {
+        const source = this.competencies.getSource();
+
+        if (!(source instanceof AddonCompetencyCourseCompetenciesSource)) {
+            return;
+        }
+
+        return source.COURSE_ID;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async ngOnInit(): Promise<void> {
         try {
+            const source = this.competencies.getSource();
+
+            await source.reload();
+            await this.competencies.start();
             await this.fetchCompetency();
 
-            const name = this.competency && this.competency.competency && this.competency.competency.competency &&
-                    this.competency.competency.competency.shortname;
+            if (!this.competency) {
+                return;
+            }
 
-            if (this.planId) {
-                CoreUtils.ignoreErrors(AddonCompetency.logCompetencyInPlanView(
-                    this.planId,
-                    this.competencyId,
-                    this.planStatus!,
-                    name,
-                    this.userId,
-                ));
+            const name = this.competency.competency.competency.shortname;
+
+            if (source instanceof AddonCompetencyPlanCompetenciesSource) {
+                this.planStatus && await CoreUtils.ignoreErrors(
+                    AddonCompetency.logCompetencyInPlanView(
+                        source.PLAN_ID,
+                        this.requireCompetencyId(),
+                        this.planStatus,
+                        name,
+                        source.user?.id,
+                    ),
+                );
             } else {
-                CoreUtils.ignoreErrors(
-                    AddonCompetency.logCompetencyInCourseView(this.courseId!, this.competencyId, name, this.userId),
+                await CoreUtils.ignoreErrors(
+                    AddonCompetency.logCompetencyInCourseView(
+                        source.COURSE_ID,
+                        this.requireCompetencyId(),
+                        name,
+                        source.USER_ID,
+                    ),
                 );
             }
         } finally {
@@ -99,47 +149,25 @@ export class AddonCompetencyCompetencyPage implements OnInit {
         }
     }
 
+    /**
+     * @inheritdoc
+     */
+    ngOnDestroy(): void {
+        this.competencies.destroy();
+    }
+
     /**
      * Fetches the competency and updates the view.
      *
      * @return Promise resolved when done.
      */
     protected async fetchCompetency(): Promise<void> {
-
         try {
-            let competency: AddonCompetencyDataForUserCompetencySummaryInPlanWSResponse |
-            AddonCompetencyDataForUserCompetencySummaryInCourseWSResponse;
+            const source = this.competencies.getSource();
 
-            if (this.planId) {
-                this.planStatus = undefined;
-
-                competency = await AddonCompetency.getCompetencyInPlan(this.planId, this.competencyId);
-            } else if (this.courseId) {
-                competency = await AddonCompetency.getCompetencyInCourse(this.courseId, this.competencyId, this.userId);
-            } else {
-                throw null;
-            }
-
-            // Calculate the context.
-            if (this.courseId) {
-                this.contextLevel = ContextLevel.COURSE;
-                this.contextInstanceId = this.courseId;
-            } else {
-                this.contextLevel = ContextLevel.USER;
-                this.contextInstanceId = this.userId || competency.usercompetencysummary.user.id;
-            }
-
-            this.competency = competency.usercompetencysummary;
-            this.userCompetency = this.competency.usercompetencyplan || this.competency.usercompetency;
-
-            if ('plan' in competency) {
-                this.planStatus = competency.plan.status;
-                this.competency.usercompetency!.statusname =
-                    AddonCompetencyHelper.getCompetencyStatusName(this.competency.usercompetency!.status);
-            } else {
-                this.userCompetency = this.competency.usercompetencycourse;
-                this.coursemodules = competency.coursemodules;
-            }
+            this.competency = source instanceof AddonCompetencyPlanCompetenciesSource
+                ? await this.fetchCompetencySummaryFromPlan(source)
+                : await this.fetchCompetencySummaryFromCourse(source);
 
             if (this.competency.user.id != CoreSites.getCurrentSiteUserId()) {
                 // Get the user profile from the returned object.
@@ -163,18 +191,17 @@ export class AddonCompetencyCompetencyPage implements OnInit {
      * @param refresher Refresher.
      */
     async refreshCompetency(refresher: IonRefresher): Promise<void> {
-        try {
-            if (this.planId) {
-                await AddonCompetency.invalidateCompetencyInPlan(this.planId, this.competencyId);
-            } else {
-                await AddonCompetency.invalidateCompetencyInCourse(this.courseId!, this.competencyId);
-            }
+        const source = this.competencies.getSource();
 
-        } finally {
-            this.fetchCompetency().finally(() => {
-                refresher?.complete();
-            });
-        }
+        await CoreUtils.ignoreErrors(
+            source instanceof AddonCompetencyPlanCompetenciesSource
+                ? AddonCompetency.invalidateCompetencyInPlan(source.PLAN_ID, this.requireCompetencyId())
+                : AddonCompetency.invalidateCompetencyInCourse(source.COURSE_ID, this.requireCompetencyId(), source.USER_ID),
+        );
+
+        this.fetchCompetency().finally(() => {
+            refresher?.complete();
+        });
     }
 
     /**
@@ -191,4 +218,91 @@ export class AddonCompetencyCompetencyPage implements OnInit {
         );
     }
 
+    /**
+     * Get competency id or fail.
+     *
+     * @returns Competency id.
+     */
+    private requireCompetencyId(): number {
+        const selectedItem = this.competencies.getSelectedItem();
+
+        if (!selectedItem) {
+            throw new Error('Failed to get competency id from selected item');
+        }
+
+        return selectedItem.competency.id;
+    }
+
+    /**
+     * Fetch competency summary from a plan source.
+     *
+     * @param source Plan competencies source.
+     * @returns Competency summary.
+     */
+    private async fetchCompetencySummaryFromPlan(
+        source: AddonCompetencyPlanCompetenciesSource,
+    ): Promise<AddonCompetencyDataForUserCompetencySummaryWSResponse> {
+        const competency = await AddonCompetency.getCompetencyInPlan(
+            source.PLAN_ID,
+            this.requireCompetencyId(),
+        );
+
+        this.planStatus = competency.plan.status;
+
+        if (competency.usercompetencysummary.usercompetency) {
+            competency.usercompetencysummary.usercompetency.statusname =
+                AddonCompetencyHelper.getCompetencyStatusName(competency.usercompetencysummary.usercompetency.status);
+        }
+
+        this.contextLevel = ContextLevel.USER;
+        this.contextInstanceId = source.user?.id || competency.usercompetencysummary.user.id;
+        this.userCompetency = competency.usercompetencysummary.usercompetencyplan
+            || competency.usercompetencysummary.usercompetency;
+
+        return competency.usercompetencysummary;
+    }
+
+    /**
+     * Fetch competency summary from a course source.
+     *
+     * @param source Course competencies source.
+     * @returns Competency summary.
+     */
+    private async fetchCompetencySummaryFromCourse(
+        source: AddonCompetencyCourseCompetenciesSource,
+    ): Promise<AddonCompetencyDataForUserCompetencySummaryWSResponse> {
+        const competency = await AddonCompetency.getCompetencyInCourse(
+            source.COURSE_ID,
+            this.requireCompetencyId(),
+            source.USER_ID,
+        );
+
+        this.coursemodules = competency.coursemodules;
+
+        this.contextLevel = ContextLevel.COURSE;
+        this.contextInstanceId = source.COURSE_ID;
+        this.userCompetency = competency.usercompetencysummary.usercompetencycourse
+            || competency.usercompetencysummary.usercompetency;
+
+        return competency.usercompetencysummary;
+    }
+
+}
+
+/**
+ * Helper to manage swiping within a collection of competencies.
+ */
+class AddonCompetencyCompetenciesSwipeManager
+    extends CoreSwipeNavigationItemsManager<
+    AddonCompetencyDataForPlanPageCompetency | AddonCompetencyDataForCourseCompetenciesPageCompetency,
+    AddonCompetencyPlanCompetenciesSource | AddonCompetencyCourseCompetenciesSource
+    > {
+
+    /**
+     * @inheritdoc
+     */
+    protected getSelectedItemPathFromRoute(route: ActivatedRouteSnapshot): string | null {
+        return route.params.competencyId;
+    }
+
 }
diff --git a/src/addons/competency/pages/coursecompetencies/coursecompetencies.html b/src/addons/competency/pages/coursecompetencies/coursecompetencies.html
index fa1cf08bc..d8f6cb615 100644
--- a/src/addons/competency/pages/coursecompetencies/coursecompetencies.html
+++ b/src/addons/competency/pages/coursecompetencies/coursecompetencies.html
@@ -9,35 +9,35 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-refresher slot="fixed" [disabled]="!competenciesLoaded" (ionRefresh)="refreshCourseCompetencies($event.target)">
+    <ion-refresher slot="fixed" [disabled]="!competencies.loaded" (ionRefresh)="refreshCourseCompetencies($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <core-loading [hideUntil]="competenciesLoaded">
-        <ion-card *ngIf="!user && competencies && competencies.statistics.competencycount > 0">
-            <ng-container *ngIf="competencies.cangradecompetencies">
-                <ion-item class="ion-text-wrap" *ngIf="competencies.settings.pushratingstouserplans">
+    <core-loading [hideUntil]="competencies.loaded">
+        <ion-card *ngIf="!user && courseCompetencies && courseCompetencies.statistics.competencycount > 0">
+            <ng-container *ngIf="courseCompetencies.cangradecompetencies">
+                <ion-item class="ion-text-wrap" *ngIf="courseCompetencies.settings.pushratingstouserplans">
                     <ion-label>{{ 'addon.competency.coursecompetencyratingsarepushedtouserplans' | translate }}</ion-label>
                 </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="!competencies.settings.pushratingstouserplans" color="danger">
+                <ion-item class="ion-text-wrap" *ngIf="!courseCompetencies.settings.pushratingstouserplans" color="danger">
                     <ion-label>{{ 'addon.competency.coursecompetencyratingsarenotpushedtouserplans' | translate }}</ion-label>
                 </ion-item>
             </ng-container>
-            <ion-item class="ion-text-wrap" *ngIf="competencies.statistics.canbegradedincourse">
+            <ion-item class="ion-text-wrap" *ngIf="courseCompetencies.statistics.canbegradedincourse">
                 <ion-label>
                     <span id="addon-competency-course-{{courseId}}-progress">
                         {{ 'addon.competency.xcompetenciesproficientoutofyincourse' | translate: {$a:
-                        {x: competencies.statistics.proficientcompetencycount, y: competencies.statistics.competencycount} } }}
+                        {x: courseCompetencies.statistics.proficientcompetencycount, y: courseCompetencies.statistics.competencycount} } }}
                     </span>
-                    <core-progress-bar [progress]="competencies.statistics.proficientcompetencypercentage"
+                    <core-progress-bar [progress]="courseCompetencies.statistics.proficientcompetencypercentage"
                         ariaDescribedBy="addon-competency-course-{{courseId}}-progress">
                     </core-progress-bar>
                 </ion-label>
             </ion-item>
             <ion-item class="ion-text-wrap"
-                *ngIf="competencies.statistics.canmanagecoursecompetencies && competencies.statistics.leastproficientcount > 0">
+                *ngIf="courseCompetencies.statistics.canmanagecoursecompetencies && courseCompetencies.statistics.leastproficientcount > 0">
                 <ion-label>
                     <p class="item-heading">{{ 'addon.competency.competenciesmostoftennotproficientincourse' | translate }}</p>
-                    <p *ngFor="let comp of competencies.statistics.leastproficient">
+                    <p *ngFor="let comp of courseCompetencies.statistics.leastproficient">
                         <button class="as-link" (click)="openCompetencySummary(comp.id)">
                             {{ comp.shortname }} - {{ comp.idnumber }}
                         </button>
@@ -46,7 +46,7 @@
             </ion-item>
         </ion-card>
 
-        <h2 class="ion-margin-horizontal" *ngIf="competencies && competencies.statistics.competencycount > 0">
+        <h2 class="ion-margin-horizontal" *ngIf="courseCompetencies && courseCompetencies.statistics.competencycount > 0">
             {{ 'addon.competency.coursecompetencies' | translate }}
         </h2>
         <ion-card *ngIf="user">
@@ -57,13 +57,13 @@
                 </ion-label>
             </ion-item>
         </ion-card>
-        <core-empty-box *ngIf="competencies && competencies.statistics.competencycount == 0" icon="fas-award"
+        <core-empty-box *ngIf="courseCompetencies && courseCompetencies.statistics.competencycount == 0" icon="fas-award"
             message="{{ 'addon.competency.nocompetenciesincourse' | translate }}">
         </core-empty-box>
 
-        <div *ngIf="competencies">
-            <ion-card *ngFor="let competency of competencies.competencies">
-                <ion-item class="ion-text-wrap" (click)="openCompetency(competency.competency.id)"
+        <div *ngIf="competencies.loaded">
+            <ion-card *ngFor="let competency of competencies.items">
+                <ion-item class="ion-text-wrap" (click)="competencies.select(competency)"
                     [attr.aria-label]="competency.competency.shortname" detail="true" button>
                     <ion-label>
                         <p class="item-heading">
@@ -85,8 +85,7 @@
                         <div>
                             <p class="item-heading">{{ 'addon.competency.path' | translate }}</p>
                             <p>
-                                <a *ngIf="competency.comppath.showlinks" [href]="competency.comppath.pluginbaseurl + '/competencies.php?competencyframeworkid=' +
-                                    competency.comppath.framework.id + '&pagecontextid=' + competency.comppath.pagecontextid" core-link
+                                <a *ngIf="competency.comppath.showlinks" [href]="getCompetencyFrameworkUrl(competency)" core-link
                                     [title]="competency.comppath.framework.name">
                                     {{ competency.comppath.framework.name }}
                                 </a>
@@ -104,7 +103,7 @@
                                 </ng-container>
                             </p>
                         </div>
-                        <div *ngIf="competencies.statistics.canmanagecoursecompetencies">
+                        <div *ngIf="courseCompetencies?.statistics.canmanagecoursecompetencies">
                             <p class="item-heading">{{ 'addon.competency.uponcoursecompletion' | translate }}</p>
                             <ng-container *ngFor="let ruleoutcome of competency.ruleoutcomeoptions">
                                 <span *ngIf="ruleoutcome.selected">{{ ruleoutcome.text }}</span>
diff --git a/src/addons/competency/pages/coursecompetencies/coursecompetencies.page.ts b/src/addons/competency/pages/coursecompetencies/coursecompetencies.page.ts
index 4ad29a386..79924d2a1 100644
--- a/src/addons/competency/pages/coursecompetencies/coursecompetencies.page.ts
+++ b/src/addons/competency/pages/coursecompetencies/coursecompetencies.page.ts
@@ -12,15 +12,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, OnInit } from '@angular/core';
-import { AddonCompetencyDataForCourseCompetenciesPageWSResponse, AddonCompetency } from '@addons/competency/services/competency';
-import { AddonCompetencyHelper } from '@addons/competency/services/competency-helper';
+import { Component, OnDestroy, OnInit } from '@angular/core';
+import {
+    AddonCompetencyDataForCourseCompetenciesPageWSResponse,
+    AddonCompetencyDataForCourseCompetenciesPageCompetency,
+} from '@addons/competency/services/competency';
 import { CoreUserProfile } from '@features/user/services/user';
 import { IonRefresher } from '@ionic/angular';
 import { CoreNavigator } from '@services/navigator';
 import { CoreDomUtils } from '@services/utils/dom';
 import { ContextLevel } from '@/core/constants';
 import { ADDON_COMPETENCY_SUMMARY_PAGE } from '@addons/competency/competency.module';
+import { CoreListItemsManager } from '@classes/items-management/list-items-manager';
+import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
+import { AddonCompetencyCourseCompetenciesSource } from '@addons/competency/classes/competency-course-competencies-source';
 
 /**
  * Page that displays the list of competencies of a course.
@@ -29,22 +34,23 @@ import { ADDON_COMPETENCY_SUMMARY_PAGE } from '@addons/competency/competency.mod
     selector: 'page-addon-competency-coursecompetencies',
     templateUrl: 'coursecompetencies.html',
 })
-export class AddonCompetencyCourseCompetenciesPage implements OnInit {
+export class AddonCompetencyCourseCompetenciesPage implements OnInit, OnDestroy {
 
-    competenciesLoaded = false;
-    competencies?: AddonCompetencyDataForCourseCompetenciesPageWSResponse;
-    user?: CoreUserProfile;
-    courseId!: number;
+    competencies!: CoreListItemsManager<
+        AddonCompetencyDataForCourseCompetenciesPageCompetency,
+        AddonCompetencyCourseCompetenciesSource
+    >;
 
-    protected userId?: number;
-
-    /**
-     * View loaded.
-     */
-    ngOnInit(): void {
+    constructor() {
         try {
-            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
-            this.userId = CoreNavigator.getRouteNumberParam('userId');
+            const courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            const userId = CoreNavigator.getRouteNumberParam('userId');
+            const source = CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(
+                AddonCompetencyCourseCompetenciesSource,
+                [courseId, userId],
+            );
+
+            this.competencies = new CoreListItemsManager(source, AddonCompetencyCourseCompetenciesPage);
         } catch (error) {
             CoreDomUtils.showErrorModal(error);
 
@@ -52,10 +58,50 @@ export class AddonCompetencyCourseCompetenciesPage implements OnInit {
 
             return;
         }
+    }
 
-        this.fetchCourseCompetencies().finally(() => {
-            this.competenciesLoaded = true;
-        });
+    get courseCompetencies(): AddonCompetencyDataForCourseCompetenciesPageWSResponse | undefined {
+        return this.competencies.getSource().courseCompetencies;
+    }
+
+    get courseId(): number {
+        return this.competencies.getSource().COURSE_ID;
+    }
+
+    get user(): CoreUserProfile | undefined {
+        return this.competencies.getSource().user;
+    }
+
+    get showLeastProficientCompetencies(): boolean {
+        return !!this.courseCompetencies?.statistics.canmanagecoursecompetencies
+            && this.courseCompetencies?.statistics.leastproficientcount > 0;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async ngOnInit(): Promise<void> {
+        await this.fetchCourseCompetencies();
+        await this.competencies.start();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    ngOnDestroy(): void {
+        this.competencies.destroy();
+    }
+
+    /**
+     * Get competency framework url.
+     *
+     * @param competency Competency.
+     * @returns Competency framework url.
+     */
+    getCompetencyFrameworkUrl(competency: AddonCompetencyDataForCourseCompetenciesPageCompetency): string {
+        const { pluginbaseurl, framework, pagecontextid } = competency.comppath;
+
+        return `${pluginbaseurl}/competencies.php?competencyframeworkid=${framework.id}&pagecontextid=${pagecontextid}`;
     }
 
     /**
@@ -65,24 +111,12 @@ export class AddonCompetencyCourseCompetenciesPage implements OnInit {
      */
     protected async fetchCourseCompetencies(): Promise<void> {
         try {
-            this.competencies = await AddonCompetency.getCourseCompetencies(this.courseId, this.userId);
-
-            // Get the user profile image.
-            this.user = await AddonCompetencyHelper.getProfile(this.userId);
+            await this.competencies.getSource().reload();
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'Error getting course competencies data.');
         }
     }
 
-    /**
-     * Opens a competency.
-     *
-     * @param competencyId
-     */
-    openCompetency(competencyId: number): void {
-        CoreNavigator.navigate('./' + competencyId);
-    }
-
     /**
      * Opens the summary of a competency.
      *
@@ -105,11 +139,11 @@ export class AddonCompetencyCourseCompetenciesPage implements OnInit {
      *
      * @param refresher Refresher.
      */
-    refreshCourseCompetencies(refresher?: IonRefresher): void {
-        AddonCompetency.invalidateCourseCompetencies(this.courseId, this.userId).finally(() => {
-            this.fetchCourseCompetencies().finally(() => {
-                refresher?.complete();
-            });
+    async refreshCourseCompetencies(refresher?: IonRefresher): Promise<void> {
+        await this.competencies.getSource().invalidateCache();
+
+        this.fetchCourseCompetencies().finally(() => {
+            refresher?.complete();
         });
     }
 
diff --git a/src/addons/competency/pages/plan/plan.html b/src/addons/competency/pages/plan/plan.html
index ff5035a62..4c55d843d 100644
--- a/src/addons/competency/pages/plan/plan.html
+++ b/src/addons/competency/pages/plan/plan.html
@@ -8,11 +8,11 @@
         </ion-title>
     </ion-toolbar>
 </ion-header>
-<ion-content>
-    <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="refreshLearningPlan($event.target)">
+<ion-content [core-swipe-navigation]="plans">
+    <ion-refresher slot="fixed" [disabled]="!competencies.loaded" (ionRefresh)="refreshLearningPlan($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <core-loading [hideUntil]="loaded">
+    <core-loading [hideUntil]="competencies.loaded">
         <ion-card *ngIf="user">
             <ion-item class="ion-text-wrap">
                 <ion-label>
@@ -74,9 +74,8 @@
                         <p>{{ 'addon.competency.nocompetencies' | translate }}</p>
                     </ion-label>
                 </ion-item>
-                <ion-item class="ion-text-wrap" *ngFor="let competency of plan.competencies"
-                    (click)="openCompetency(competency.competency.id)" [attr.aria-label]="competency.competency.shortname" detail="true"
-                    button>
+                <ion-item class="ion-text-wrap" *ngFor="let competency of competencies.items" (click)="competencies.select(competency)"
+                    [attr.aria-label]="competency.competency.shortname" detail="true" button>
                     <ion-label>
                         <p class="item-heading">{{competency.competency.shortname}} <em>{{competency.competency.idnumber}}</em></p>
                     </ion-label>
diff --git a/src/addons/competency/pages/plan/plan.ts b/src/addons/competency/pages/plan/plan.ts
index e154da006..ee1c9a11f 100644
--- a/src/addons/competency/pages/plan/plan.ts
+++ b/src/addons/competency/pages/plan/plan.ts
@@ -12,13 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, OnInit } from '@angular/core';
+import { Component, OnDestroy, OnInit } from '@angular/core';
 import { CoreDomUtils } from '@services/utils/dom';
-import { AddonCompetencyDataForPlanPageWSResponse, AddonCompetency } from '../../services/competency';
-import { AddonCompetencyHelper } from '../../services/competency-helper';
+import { AddonCompetencyDataForPlanPageCompetency, AddonCompetencyDataForPlanPageWSResponse } from '../../services/competency';
 import { CoreNavigator } from '@services/navigator';
 import { CoreUserProfile } from '@features/user/services/user';
 import { IonRefresher } from '@ionic/angular';
+import { CoreSwipeNavigationItemsManager } from '@classes/items-management/swipe-navigation-items-manager';
+import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
+import { AddonCompetencyPlansSource } from '@addons/competency/classes/competency-plans-source';
+import { CoreListItemsManager } from '@classes/items-management/list-items-manager';
+import { AddonCompetencyPlanCompetenciesSource } from '@addons/competency/classes/competency-plan-competencies-source';
 
 /**
  * Page that displays a learning plan.
@@ -27,19 +31,26 @@ import { IonRefresher } from '@ionic/angular';
     selector: 'page-addon-competency-plan',
     templateUrl: 'plan.html',
 })
-export class AddonCompetencyPlanPage implements OnInit {
+export class AddonCompetencyPlanPage implements OnInit, OnDestroy {
 
-    protected planId!: number;
-    loaded = false;
-    plan?: AddonCompetencyDataForPlanPageWSResponse;
-    user?: CoreUserProfile;
+    plans!: CoreSwipeNavigationItemsManager;
+    competencies!: CoreListItemsManager<AddonCompetencyDataForPlanPageCompetency, AddonCompetencyPlanCompetenciesSource>;
 
-    /**
-     * @inheritdoc
-     */
-    ngOnInit(): void {
+    constructor() {
         try {
-            this.planId = CoreNavigator.getRequiredRouteNumberParam('planId');
+            const planId = CoreNavigator.getRequiredRouteNumberParam('planId');
+            const userId = CoreNavigator.getRouteNumberParam('userId');
+            const plansSource = CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(
+                AddonCompetencyPlansSource,
+                [userId],
+            );
+            const competenciesSource = CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(
+                AddonCompetencyPlanCompetenciesSource,
+                [planId],
+            );
+
+            this.competencies = new CoreListItemsManager(competenciesSource, AddonCompetencyPlanPage);
+            this.plans = new CoreSwipeNavigationItemsManager(plansSource);
         } catch (error) {
             CoreDomUtils.showErrorModal(error);
 
@@ -47,10 +58,31 @@ export class AddonCompetencyPlanPage implements OnInit {
 
             return;
         }
+    }
 
-        this.fetchLearningPlan().finally(() => {
-            this.loaded = true;
-        });
+    get plan(): AddonCompetencyDataForPlanPageWSResponse | undefined {
+        return this.competencies.getSource().plan;
+    }
+
+    get user(): CoreUserProfile | undefined {
+        return this.competencies.getSource().user;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async ngOnInit(): Promise<void> {
+        await this.fetchLearningPlan();
+        await this.plans.start();
+        await this.competencies.start();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    ngOnDestroy(): void {
+        this.plans.destroy();
+        this.competencies.destroy();
     }
 
     /**
@@ -60,39 +92,22 @@ export class AddonCompetencyPlanPage implements OnInit {
      */
     protected async fetchLearningPlan(): Promise<void> {
         try {
-            const plan = await AddonCompetency.getLearningPlan(this.planId);
-            plan.plan.statusname = AddonCompetencyHelper.getPlanStatusName(plan.plan.status);
-
-            // Get the user profile image.
-            this.user = await AddonCompetencyHelper.getProfile(plan.plan.userid);
-
-            this.plan = plan;
+            await this.competencies.getSource().reload();
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'Error getting learning plan data.');
         }
     }
 
-    /**
-     * Navigates to a particular competency.
-     *
-     * @param competencyId
-     */
-    openCompetency(competencyId: number): void {
-        CoreNavigator.navigate('./' + competencyId, {
-            params: { userId: this.user?.id },
-        });
-    }
-
     /**
      * Refreshes the learning plan.
      *
      * @param refresher Refresher.
      */
-    refreshLearningPlan(refresher: IonRefresher): void {
-        AddonCompetency.invalidateLearningPlan(this.planId).finally(() => {
-            this.fetchLearningPlan().finally(() => {
-                refresher?.complete();
-            });
+    async refreshLearningPlan(refresher: IonRefresher): Promise<void> {
+        await this.competencies.getSource().invalidateCache();
+
+        this.fetchLearningPlan().finally(() => {
+            refresher?.complete();
         });
     }
 
diff --git a/src/addons/competency/pages/planlist/planlist.ts b/src/addons/competency/pages/planlist/planlist.ts
index 59f878ca7..f5603431a 100644
--- a/src/addons/competency/pages/planlist/planlist.ts
+++ b/src/addons/competency/pages/planlist/planlist.ts
@@ -16,12 +16,10 @@ import { AfterViewInit, Component, OnDestroy, ViewChild } from '@angular/core';
 import { IonRefresher } from '@ionic/angular';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
-import { AddonCompetencyProvider, AddonCompetencyPlan, AddonCompetency } from '../../services/competency';
-import { AddonCompetencyHelper } from '../../services/competency-helper';
 import { CoreNavigator } from '@services/navigator';
-import { CorePageItemsListManager } from '@classes/page-items-list-manager';
-import { ADDON_COMPETENCY_COMPETENCIES_PAGE } from '@addons/competency/competency.module';
-import { Params } from '@angular/router';
+import { AddonCompetencyPlanFormatted, AddonCompetencyPlansSource } from '@addons/competency/classes/competency-plans-source';
+import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
+import { CoreListItemsManager } from '@classes/items-management/list-items-manager';
 
 /**
  * Page that displays the list of learning plans.
@@ -34,13 +32,13 @@ export class AddonCompetencyPlanListPage implements AfterViewInit, OnDestroy {
 
     @ViewChild(CoreSplitViewComponent) splitView!: CoreSplitViewComponent;
 
-    protected userId?: number;
-    plans: AddonCompetencyPlanListManager;
+    plans: CoreListItemsManager<AddonCompetencyPlanFormatted, AddonCompetencyPlansSource>;
 
     constructor() {
-        this.userId = CoreNavigator.getRouteNumberParam('userId');
+        const userId = CoreNavigator.getRouteNumberParam('userId');
+        const source = CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(AddonCompetencyPlansSource, [userId]);
 
-        this.plans = new AddonCompetencyPlanListManager(AddonCompetencyPlanListPage, this.userId);
+        this.plans = new CoreListItemsManager(source, AddonCompetencyPlanListPage);
     }
 
     /**
@@ -59,23 +57,7 @@ export class AddonCompetencyPlanListPage implements AfterViewInit, OnDestroy {
      */
     protected async fetchLearningPlans(): Promise<void> {
         try {
-            const plans = await AddonCompetency.getLearningPlans(this.userId);
-            plans.forEach((plan: AddonCompetencyPlanFormatted) => {
-                plan.statusname = AddonCompetencyHelper.getPlanStatusName(plan.status);
-                switch (plan.status) {
-                    case AddonCompetencyProvider.STATUS_ACTIVE:
-                        plan.statuscolor = 'success';
-                        break;
-                    case AddonCompetencyProvider.STATUS_COMPLETE:
-                        plan.statuscolor = 'danger';
-                        break;
-                    default:
-                        plan.statuscolor = 'warning';
-                        break;
-                }
-            });
-            this.plans.setItems(plans);
-
+            await this.plans.load();
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'Error getting learning plans data.');
         }
@@ -86,11 +68,11 @@ export class AddonCompetencyPlanListPage implements AfterViewInit, OnDestroy {
      *
      * @param refresher Refresher.
      */
-    refreshLearningPlans(refresher: IonRefresher): void {
-        AddonCompetency.invalidateLearningPlans(this.userId).finally(() => {
-            this.fetchLearningPlans().finally(() => {
-                refresher?.complete();
-            });
+    async refreshLearningPlans(refresher: IonRefresher): Promise<void> {
+        await this.plans.getSource().invalidateCache();
+
+        this.fetchLearningPlans().finally(() => {
+            refresher?.complete();
         });
     }
 
@@ -102,43 +84,3 @@ export class AddonCompetencyPlanListPage implements AfterViewInit, OnDestroy {
     }
 
 }
-
-/**
- * Competency plan with some calculated data.
- */
-type AddonCompetencyPlanFormatted = AddonCompetencyPlan & {
-    statuscolor?: string; // Calculated in the app. Color of the plan's status.
-};
-
-/**
- * Helper class to manage plan list.
- */
-class AddonCompetencyPlanListManager extends CorePageItemsListManager<AddonCompetencyPlanFormatted> {
-
-    private userId?: number;
-
-    constructor(pageComponent: unknown, userId?: number) {
-        super(pageComponent);
-
-        this.userId = userId;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected getItemPath(plan: AddonCompetencyPlanFormatted): string {
-        return `${plan.id}/${ADDON_COMPETENCY_COMPETENCIES_PAGE}`;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected getItemQueryParams(): Params {
-        if (this.userId) {
-            return { userId: this.userId };
-        }
-
-        return {};
-    }
-
-}
diff --git a/src/core/classes/items-management/list-items-manager.ts b/src/core/classes/items-management/list-items-manager.ts
index 9229b1de4..174a93efe 100644
--- a/src/core/classes/items-management/list-items-manager.ts
+++ b/src/core/classes/items-management/list-items-manager.ts
@@ -64,8 +64,10 @@ export class CoreListItemsManager<
      *
      * @param splitView Split view component.
      */
-    async start(splitView: CoreSplitViewComponent): Promise<void> {
-        this.watchSplitViewOutlet(splitView);
+    async start(splitView?: CoreSplitViewComponent): Promise<void> {
+        if (splitView) {
+            this.watchSplitViewOutlet(splitView);
+        }
 
         // Calculate current selected item.
         this.updateSelectedItem();
@@ -172,7 +174,7 @@ export class CoreListItemsManager<
     protected updateSelectedItem(route: ActivatedRouteSnapshot | null = null): void {
         super.updateSelectedItem(route);
 
-        if (CoreScreen.isMobile || this.selectedItem !== null || this.splitView?.isNested) {
+        if (CoreScreen.isMobile || this.selectedItem !== null || !this.splitView || this.splitView.isNested) {
             return;
         }
 

From 7265611dda7ab7b3e8993c5f71f3e3d23ea9eda8 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Mon, 10 Jan 2022 10:23:18 +0100
Subject: [PATCH 0341/1008] MOBILE-3934 competency: Remove deprecated managers

---
 .../pages/competencies/competencies.page.ts   | 112 ++++++------------
 .../competency/pages/planlist/planlist.ts     |   1 +
 2 files changed, 39 insertions(+), 74 deletions(-)

diff --git a/src/addons/competency/pages/competencies/competencies.page.ts b/src/addons/competency/pages/competencies/competencies.page.ts
index 82ab1474b..0841df662 100644
--- a/src/addons/competency/pages/competencies/competencies.page.ts
+++ b/src/addons/competency/pages/competencies/competencies.page.ts
@@ -17,13 +17,16 @@ import { IonRefresher } from '@ionic/angular';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import {
-    AddonCompetencyDataForPlanPageCompetency, AddonCompetencyDataForCourseCompetenciesPageCompetency, AddonCompetency,
+    AddonCompetencyDataForPlanPageCompetency,
+    AddonCompetencyDataForCourseCompetenciesPageCompetency,
 } from '../../services/competency';
-import { ActivatedRoute, Params } from '@angular/router';
-import { CorePageItemsListManager } from '@classes/page-items-list-manager';
 import { Translate } from '@singletons';
 import { CoreNavigator } from '@services/navigator';
 import { CoreError } from '@classes/errors/error';
+import { AddonCompetencyPlanCompetenciesSource } from '@addons/competency/classes/competency-plan-competencies-source';
+import { AddonCompetencyCourseCompetenciesSource } from '@addons/competency/classes/competency-course-competencies-source';
+import { CoreListItemsManager } from '@classes/items-management/list-items-manager';
+import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
 
 /**
  * Page that displays the list of competencies of a learning plan.
@@ -36,22 +39,32 @@ export class AddonCompetencyCompetenciesPage implements AfterViewInit, OnDestroy
 
     @ViewChild(CoreSplitViewComponent) splitView!: CoreSplitViewComponent;
 
-    protected planId?: number;
-    protected courseId?: number;
-    protected userId?: number;
+    competencies: CoreListItemsManager<
+        AddonCompetencyDataForPlanPageCompetency | AddonCompetencyDataForCourseCompetenciesPageCompetency,
+        AddonCompetencyPlanCompetenciesSource | AddonCompetencyCourseCompetenciesSource
+    >;
 
-    competenciesLoaded = false;
-    competencies: AddonCompetencyListManager;
     title = '';
 
-    constructor(protected route: ActivatedRoute) {
-        this.planId = CoreNavigator.getRouteNumberParam('planId', { route });
-        if (!this.planId) {
-            this.courseId = CoreNavigator.getRouteNumberParam('courseId', { route });
-            this.userId = CoreNavigator.getRouteNumberParam('userId', { route });
+    constructor() {
+        const planId = CoreNavigator.getRouteNumberParam('planId');
+
+        if (!planId) {
+            const courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            const userId = CoreNavigator.getRouteNumberParam('userId');
+            const source = CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(
+                AddonCompetencyCourseCompetenciesSource,
+                [courseId, userId],
+            );
+
+            this.competencies = new CoreListItemsManager(source, AddonCompetencyCompetenciesPage);
+
+            return;
         }
 
-        this.competencies = new AddonCompetencyListManager(AddonCompetencyCompetenciesPage, this.userId);
+        const source = CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(AddonCompetencyPlanCompetenciesSource, [planId]);
+
+        this.competencies = new CoreListItemsManager(source, AddonCompetencyCompetenciesPage);
     }
 
     /**
@@ -70,25 +83,18 @@ export class AddonCompetencyCompetenciesPage implements AfterViewInit, OnDestroy
      */
     protected async fetchCompetencies(): Promise<void> {
         try {
-            if (this.planId) {
+            const source = this.competencies.getSource();
 
-                const response = await AddonCompetency.getLearningPlan(this.planId);
+            await this.competencies.load();
 
-                if (response.competencycount <= 0) {
+            if (source instanceof AddonCompetencyPlanCompetenciesSource) {
+                if (!source.plan || source.plan && source.plan.competencycount <= 0) {
                     throw new CoreError(Translate.instant('addon.competency.errornocompetenciesfound'));
                 }
 
-                this.title = response.plan.name;
-                this.userId = response.plan.userid;
-
-                this.competencies.setItems(response.competencies);
-            } else if (this.courseId) {
-                const response = await AddonCompetency.getCourseCompetencies(this.courseId, this.userId);
-                this.title = Translate.instant('addon.competency.coursecompetencies');
-
-                this.competencies.setItems(response.competencies);
+                this.title = source.plan.plan.name;
             } else {
-                throw null;
+                this.title = Translate.instant('addon.competency.coursecompetencies');
             }
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'Error getting competencies data.');
@@ -101,18 +107,12 @@ export class AddonCompetencyCompetenciesPage implements AfterViewInit, OnDestroy
      * @param refresher Refresher.
      */
     async refreshCompetencies(refresher?: IonRefresher): Promise<void> {
-        try {
-            if (this.planId) {
-                await AddonCompetency.invalidateLearningPlan(this.planId);
-            } else {
-                await AddonCompetency.invalidateCourseCompetencies(this.courseId!, this.userId);
-            }
+        await this.competencies.getSource().invalidateCache();
 
-        } finally {
-            this.fetchCompetencies().finally(() => {
-                refresher?.complete();
-            });
-        }
+        this.competencies.getSource().setDirty(true);
+        this.fetchCompetencies().finally(() => {
+            refresher?.complete();
+        });
     }
 
     /**
@@ -123,39 +123,3 @@ export class AddonCompetencyCompetenciesPage implements AfterViewInit, OnDestroy
     }
 
 }
-
-type AddonCompetencyDataForPlanPageCompetencyFormatted =
-    AddonCompetencyDataForPlanPageCompetency | AddonCompetencyDataForCourseCompetenciesPageCompetency;
-
-/**
- * Helper class to manage competencies list.
- */
-class AddonCompetencyListManager extends CorePageItemsListManager<AddonCompetencyDataForPlanPageCompetencyFormatted> {
-
-    private userId?: number;
-
-    constructor(pageComponent: unknown, userId?: number) {
-        super(pageComponent);
-
-        this.userId = userId;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected getItemPath(competency: AddonCompetencyDataForPlanPageCompetencyFormatted): string {
-        return String(competency.competency.id);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected getItemQueryParams(): Params {
-        if (this.userId) {
-            return { userId: this.userId };
-        }
-
-        return {};
-    }
-
-}
diff --git a/src/addons/competency/pages/planlist/planlist.ts b/src/addons/competency/pages/planlist/planlist.ts
index f5603431a..1cec25f8c 100644
--- a/src/addons/competency/pages/planlist/planlist.ts
+++ b/src/addons/competency/pages/planlist/planlist.ts
@@ -71,6 +71,7 @@ export class AddonCompetencyPlanListPage implements AfterViewInit, OnDestroy {
     async refreshLearningPlans(refresher: IonRefresher): Promise<void> {
         await this.plans.getSource().invalidateCache();
 
+        this.plans.getSource().setDirty(true);
         this.fetchLearningPlans().finally(() => {
             refresher?.complete();
         });

From 803ad32ec85eabb65943f901f6dc673ccc4e480b Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 11 Jan 2022 09:33:02 +0100
Subject: [PATCH 0342/1008] MOBILE-3934 grades: Refactor routes

---
 ...odule.ts => grades-courses-lazy.module.ts} |  9 +------
 src/core/features/grades/grades.module.ts     | 24 ++++++++++---------
 .../grades/pages/course/course.page.ts        |  6 ++++-
 .../features/grades/services/grades-helper.ts | 13 ++++------
 .../grades/services/handlers/overview-link.ts |  6 ++---
 .../features/grades/services/handlers/user.ts | 13 +++++-----
 6 files changed, 32 insertions(+), 39 deletions(-)
 rename src/core/features/grades/{grades-lazy.module.ts => grades-courses-lazy.module.ts} (88%)

diff --git a/src/core/features/grades/grades-lazy.module.ts b/src/core/features/grades/grades-courses-lazy.module.ts
similarity index 88%
rename from src/core/features/grades/grades-lazy.module.ts
rename to src/core/features/grades/grades-courses-lazy.module.ts
index d825a2621..94dee326b 100644
--- a/src/core/features/grades/grades-lazy.module.ts
+++ b/src/core/features/grades/grades-courses-lazy.module.ts
@@ -23,14 +23,10 @@ import { CoreGradesCoursePage } from './pages/course/course.page';
 import { CoreGradesCoursePageModule } from './pages/course/course.module';
 import { CoreGradesCoursesPage } from './pages/courses/courses.page';
 import { CoreGradesGradePage } from './pages/grade/grade.page';
-import { CoreGradesUserHandlerService } from './services/handlers/user';
 
 const mobileRoutes: Routes = [
     {
         path: '',
-        data: {
-            mainMenuTabRoot: CoreGradesUserHandlerService.PAGE_NAME,
-        },
         component: CoreGradesCoursesPage,
     },
     {
@@ -46,9 +42,6 @@ const mobileRoutes: Routes = [
 const tabletRoutes: Routes = [
     {
         path: '',
-        data: {
-            mainMenuTabRoot: CoreGradesUserHandlerService.PAGE_NAME,
-        },
         component: CoreGradesCoursesPage,
         children: [
             {
@@ -85,4 +78,4 @@ const routes: Routes = [
         CoreGradesGradePage,
     ],
 })
-export class CoreGradesLazyModule {}
+export class CoreGradesCoursesLazyModule {}
diff --git a/src/core/features/grades/grades.module.ts b/src/core/features/grades/grades.module.ts
index d7ca58cf3..6669a9161 100644
--- a/src/core/features/grades/grades.module.ts
+++ b/src/core/features/grades/grades.module.ts
@@ -15,16 +15,17 @@
 import { APP_INITIALIZER, NgModule, Type } from '@angular/core';
 import { Routes } from '@angular/router';
 import { CoreContentLinksDelegate } from '@features/contentlinks/services/contentlinks-delegate';
+import { COURSE_PAGE_NAME } from '@features/course/course.module';
 import { CoreCourseIndexRoutingModule } from '@features/course/pages/index/index-routing.module';
 import { CoreCourseOptionsDelegate } from '@features/course/services/course-options-delegate';
-import { CoreMainMenuRoutingModule } from '@features/mainmenu/mainmenu-routing.module';
 import { CoreMainMenuTabRoutingModule } from '@features/mainmenu/mainmenu-tab-routing.module';
 import { CoreUserDelegate } from '@features/user/services/user-delegate';
+import { PARTICIPANTS_PAGE_NAME } from '@features/user/user.module';
 import { CoreGradesProvider } from './services/grades';
 import { CoreGradesHelperProvider } from './services/grades-helper';
 import { CoreGradesCourseOptionHandler } from './services/handlers/course-option';
 import { CoreGradesOverviewLinkHandler } from './services/handlers/overview-link';
-import { CoreGradesUserHandler, CoreGradesUserHandlerService } from './services/handlers/user';
+import { CoreGradesUserHandler } from './services/handlers/user';
 import { CoreGradesUserLinkHandler } from './services/handlers/user-link';
 
 export const CORE_GRADES_SERVICES: Type<unknown>[] = [
@@ -32,28 +33,29 @@ export const CORE_GRADES_SERVICES: Type<unknown>[] = [
     CoreGradesHelperProvider,
 ];
 
-const routes: Routes = [
+export const GRADES_PAGE_NAME = 'grades';
+
+const mainMenuChildrenRoutes: Routes = [
     {
-        path: CoreGradesUserHandlerService.PAGE_NAME,
-        loadChildren: () => import('@features/grades/grades-lazy.module').then(m => m.CoreGradesLazyModule),
+        path: GRADES_PAGE_NAME,
+        loadChildren: () => import('./grades-courses-lazy.module').then(m => m.CoreGradesCoursesLazyModule),
     },
     {
-        path: 'user-grades/:courseId',
-        loadChildren: () => import('@features/grades/grades-course-lazy.module').then(m => m.CoreGradesCourseLazyModule),
+        path: `${COURSE_PAGE_NAME}/:courseId/${PARTICIPANTS_PAGE_NAME}/:userId/${GRADES_PAGE_NAME}`,
+        loadChildren: () => import('./grades-course-lazy.module').then(m => m.CoreGradesCourseLazyModule),
     },
 ];
 
 const courseIndexRoutes: Routes = [
     {
-        path: 'grades',
-        loadChildren: () => import('@features/grades/grades-course-lazy.module').then(m => m.CoreGradesCourseLazyModule),
+        path: GRADES_PAGE_NAME,
+        loadChildren: () => import('./grades-course-lazy.module').then(m => m.CoreGradesCourseLazyModule),
     },
 ];
 
 @NgModule({
     imports: [
-        CoreMainMenuTabRoutingModule.forChild(routes),
-        CoreMainMenuRoutingModule.forChild({ children: routes }),
+        CoreMainMenuTabRoutingModule.forChild(mainMenuChildrenRoutes),
         CoreCourseIndexRoutingModule.forChild({ children: courseIndexRoutes }),
     ],
     providers: [
diff --git a/src/core/features/grades/pages/course/course.page.ts b/src/core/features/grades/pages/course/course.page.ts
index 224d9369b..51ef0fe4f 100644
--- a/src/core/features/grades/pages/course/course.page.ts
+++ b/src/core/features/grades/pages/course/course.page.ts
@@ -159,7 +159,11 @@ class CoreGradesCourseManager extends CorePageItemsListManager<CoreGradesFormatt
      */
     async select(row: CoreGradesFormattedTableRowFilled): Promise<void> {
         if (this.outsideGradesTab) {
-            await CoreNavigator.navigateToSitePath(`/grades/${this.courseId}/${row.id}`);
+            await CoreNavigator.navigateToSitePath(`/grades/${this.courseId}/${row.id}`, {
+                params: {
+                    userId: this.userId,
+                },
+            });
 
             return;
         }
diff --git a/src/core/features/grades/services/grades-helper.ts b/src/core/features/grades/services/grades-helper.ts
index b602a8df5..add464673 100644
--- a/src/core/features/grades/services/grades-helper.ts
+++ b/src/core/features/grades/services/grades-helper.ts
@@ -35,6 +35,7 @@ import { CoreNavigator } from '@services/navigator';
 import { makeSingleton, Translate } from '@singletons';
 import { CoreError } from '@classes/errors/error';
 import { CoreCourseHelper } from '@features/course/services/course-helper';
+import { GRADES_PAGE_NAME } from '../grades.module';
 
 /**
  * Service that provides some features regarding grades information.
@@ -472,10 +473,7 @@ export class CoreGradesHelperProvider {
             const gradeId = item.id;
 
             await CoreUtils.ignoreErrors(
-                CoreNavigator.navigateToSitePath(`/grades/${courseId}/${gradeId}`, {
-                    siteId,
-                    params: { userId },
-                }),
+                CoreNavigator.navigateToSitePath(`/${GRADES_PAGE_NAME}/${courseId}/${gradeId}`, { siteId }),
             );
         } catch (error) {
             try {
@@ -483,10 +481,7 @@ export class CoreGradesHelperProvider {
                 if (userId && userId != currentUserId) {
                     // View another user grades. Open the grades page directly.
                     await CoreUtils.ignoreErrors(
-                        CoreNavigator.navigateToSitePath(`/grades/${courseId}`, {
-                            siteId,
-                            params: { userId },
-                        }),
+                        CoreNavigator.navigateToSitePath(`/${GRADES_PAGE_NAME}/${courseId}`, { siteId }),
                     );
                 }
 
@@ -502,7 +497,7 @@ export class CoreGradesHelperProvider {
                 await CoreCourseHelper.getAndOpenCourse(courseId, { selectedTab: 'CoreGrades' }, siteId);
             } catch (error) {
                 // Cannot get course for some reason, just open the grades page.
-                await CoreNavigator.navigateToSitePath(`/grades/${courseId}`, { siteId });
+                await CoreNavigator.navigateToSitePath(`/${GRADES_PAGE_NAME}/${courseId}`, { siteId });
             }
         } finally {
             modal.dismiss();
diff --git a/src/core/features/grades/services/handlers/overview-link.ts b/src/core/features/grades/services/handlers/overview-link.ts
index 307124802..241e2fc19 100644
--- a/src/core/features/grades/services/handlers/overview-link.ts
+++ b/src/core/features/grades/services/handlers/overview-link.ts
@@ -15,6 +15,7 @@
 import { Injectable } from '@angular/core';
 import { CoreContentLinksHandlerBase } from '@features/contentlinks/classes/base-handler';
 import { CoreContentLinksAction } from '@features/contentlinks/services/contentlinks-delegate';
+import { GRADES_PAGE_NAME } from '@features/grades/grades.module';
 import { CoreNavigator } from '@services/navigator';
 import { makeSingleton } from '@singletons';
 import { CoreGrades } from '../grades';
@@ -36,10 +37,7 @@ export class CoreGradesOverviewLinkHandlerService extends CoreContentLinksHandle
     getActions(): CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
         return [{
             action: siteId => {
-                CoreNavigator.navigateToSitePath('/grades', {
-                    siteId,
-                    preferCurrentTab: false,
-                });
+                CoreNavigator.navigateToSitePath(GRADES_PAGE_NAME, { siteId });
             },
         }];
     }
diff --git a/src/core/features/grades/services/handlers/user.ts b/src/core/features/grades/services/handlers/user.ts
index fab0752f6..6c4a655a0 100644
--- a/src/core/features/grades/services/handlers/user.ts
+++ b/src/core/features/grades/services/handlers/user.ts
@@ -13,6 +13,8 @@
 // limitations under the License.
 
 import { Injectable } from '@angular/core';
+import { COURSE_PAGE_NAME } from '@features/course/course.module';
+import { GRADES_PAGE_NAME } from '@features/grades/grades.module';
 
 import { CoreGrades } from '@features/grades/services/grades';
 import { CoreUserProfile } from '@features/user/services/user';
@@ -21,6 +23,7 @@ import {
     CoreUserProfileHandler,
     CoreUserProfileHandlerData,
 } from '@features/user/services/user-delegate';
+import { PARTICIPANTS_PAGE_NAME } from '@features/user/user.module';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
@@ -32,8 +35,6 @@ import { makeSingleton } from '@singletons';
 @Injectable({ providedIn: 'root' })
 export class CoreGradesUserHandlerService implements CoreUserProfileHandler {
 
-    static readonly PAGE_NAME = 'grades';
-
     name = 'CoreGrades:viewGrades';
     priority = 400;
     type = CoreUserDelegateService.TYPE_NEW_PAGE;
@@ -81,9 +82,9 @@ export class CoreGradesUserHandlerService implements CoreUserProfileHandler {
                 action: (event, user, courseId): void => {
                     event.preventDefault();
                     event.stopPropagation();
-                    CoreNavigator.navigateToSitePath(`/user-grades/${courseId}`, {
-                        params: { userId: user.id },
-                    });
+                    CoreNavigator.navigateToSitePath(
+                        [COURSE_PAGE_NAME, courseId, PARTICIPANTS_PAGE_NAME, user.id, GRADES_PAGE_NAME].join('/'),
+                    );
                 },
             };
         } else {
@@ -94,7 +95,7 @@ export class CoreGradesUserHandlerService implements CoreUserProfileHandler {
                 action: (event): void => {
                     event.preventDefault();
                     event.stopPropagation();
-                    CoreNavigator.navigateToSitePath(CoreGradesUserHandlerService.PAGE_NAME);
+                    CoreNavigator.navigateToSitePath(GRADES_PAGE_NAME);
                 },
             };
         }

From 275991d9efc7e87c72fc27723d51b585c30ba0e3 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 12 Jan 2022 11:09:00 +0100
Subject: [PATCH 0343/1008] MOBILE-3934 grades: Move details into accordion

---
 .../grades/grades-course-lazy.module.ts       |   4 -
 .../grades/grades-courses-lazy.module.ts      |  16 --
 .../features/grades/pages/course/course.html  | 171 +++++++++++++---
 .../grades/pages/course/course.page.ts        | 193 ++++++------------
 .../features/grades/pages/course/course.scss  |  19 +-
 .../features/grades/pages/grade/grade.html    | 112 ----------
 .../features/grades/pages/grade/grade.page.ts |  85 --------
 .../features/grades/services/grades-helper.ts |  14 ++
 8 files changed, 236 insertions(+), 378 deletions(-)
 delete mode 100644 src/core/features/grades/pages/grade/grade.html
 delete mode 100644 src/core/features/grades/pages/grade/grade.page.ts

diff --git a/src/core/features/grades/grades-course-lazy.module.ts b/src/core/features/grades/grades-course-lazy.module.ts
index e6164e920..877a0fec9 100644
--- a/src/core/features/grades/grades-course-lazy.module.ts
+++ b/src/core/features/grades/grades-course-lazy.module.ts
@@ -22,10 +22,6 @@ const routes: Routes = [
     {
         path: '',
         component: CoreGradesCoursePage,
-        data: {
-            useSplitView: false,
-            outsideGradesTab: true,
-        },
     },
 ];
 
diff --git a/src/core/features/grades/grades-courses-lazy.module.ts b/src/core/features/grades/grades-courses-lazy.module.ts
index 94dee326b..8dbc73cf5 100644
--- a/src/core/features/grades/grades-courses-lazy.module.ts
+++ b/src/core/features/grades/grades-courses-lazy.module.ts
@@ -22,7 +22,6 @@ import { CoreSharedModule } from '@/core/shared.module';
 import { CoreGradesCoursePage } from './pages/course/course.page';
 import { CoreGradesCoursePageModule } from './pages/course/course.module';
 import { CoreGradesCoursesPage } from './pages/courses/courses.page';
-import { CoreGradesGradePage } from './pages/grade/grade.page';
 
 const mobileRoutes: Routes = [
     {
@@ -33,10 +32,6 @@ const mobileRoutes: Routes = [
         path: ':courseId',
         component: CoreGradesCoursePage,
     },
-    {
-        path: ':courseId/:gradeId',
-        component: CoreGradesGradePage,
-    },
 ];
 
 const tabletRoutes: Routes = [
@@ -50,16 +45,6 @@ const tabletRoutes: Routes = [
             },
         ],
     },
-    {
-        path: ':courseId',
-        component: CoreGradesCoursePage,
-        children: [
-            {
-                path: ':gradeId',
-                component: CoreGradesGradePage,
-            },
-        ],
-    },
 ];
 
 const routes: Routes = [
@@ -75,7 +60,6 @@ const routes: Routes = [
     ],
     declarations: [
         CoreGradesCoursesPage,
-        CoreGradesGradePage,
     ],
 })
 export class CoreGradesCoursesLazyModule {}
diff --git a/src/core/features/grades/pages/course/course.html b/src/core/features/grades/pages/course/course.html
index b4e94d4d0..c0e19a660 100644
--- a/src/core/features/grades/pages/course/course.html
+++ b/src/core/features/grades/pages/course/course.html
@@ -9,31 +9,36 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <core-split-view [mode]="splitViewMode">
-        <ion-refresher slot="fixed" [disabled]="!grades.loaded" (ionRefresh)="refreshGrades($event.target)">
-            <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
-        </ion-refresher>
-        <core-loading [hideUntil]="grades.loaded" class="safe-area-padding">
-            <core-empty-box *ngIf="grades.empty" icon="fas-chart-bar" [message]="'core.grades.nogradesreturned' | translate">
-            </core-empty-box>
-            <div *ngIf="!grades.empty" class="core-grades-container">
-                <table cellspacing="0" cellpadding="0" class="core-grades-table">
-                    <thead>
-                        <tr>
-                            <th *ngFor="let column of grades.columns" id="{{column.name}}" class="ion-text-start"
-                                [class.ion-hide-md-down]="column.hiddenPhone" [attr.colspan]="column.colspan">
-                                {{ 'core.grades.' + column.name | translate }}
-                            </th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <tr *ngFor="let row of grades.rows" role="button row" [attr.tabindex]="row.itemtype != 'category' ? 0 : null"
-                            (ariaButtonClick)="row.itemtype != 'category' && grades.select(row)" [class]="row.rowclass"
-                            [ngClass]='{"core-grades-grade-clickable": row.itemtype != "category"}'>
+    <ion-refresher slot="fixed" [disabled]="!columns || !rows" (ionRefresh)="refreshGrades($event.target)">
+        <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
+    </ion-refresher>
+    <core-loading [hideUntil]="columns && rows" class="safe-area-padding">
+        <core-empty-box *ngIf="rows && rows.length === 0" icon="fas-chart-bar" [message]="'core.grades.nogradesreturned' | translate">
+        </core-empty-box>
+        <div *ngIf="rows && rows.length > 0" class="core-grades-container">
+            <table cellspacing="0" cellpadding="0" class="core-grades-table" [class.summary]="showSummary">
+                <thead>
+                    <tr>
+                        <th *ngFor="let column of columns" id="{{column.name}}" class="ion-text-start"
+                            [class.ion-hide-md-down]="column.hiddenPhone" [attr.colspan]="column.colspan">
+                            {{ 'core.grades.' + column.name | translate }}
+                        </th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <ng-container *ngFor="let row of rows">
+                        <tr [attr.role]="row.expandable && showSummary ? 'button row' : 'row'"
+                            [attr.tabindex]="row.expandable && showSummary && 0" [attr.aria-expanded]="row.expanded"
+                            [attr.aria-label]="rowAriaLabel(row)" [attr.aria-controls]="row.detailsid"
+                            (ariaButtonClick)="row.expandable && showSummary && toggleRow(row)" [class]="row.rowclass"
+                            [class.core-grades-grade-clickable]="row.expandable && showSummary">
                             <ng-container *ngIf="row.itemtype">
-                                <td *ngIf="row.itemtype == 'category'" class="core-grades-table-category" [attr.rowspan]="row.rowspan"></td>
-                                <th class="core-grades-table-gradeitem ion-text-start" [class.column-itemname]="row.itemtype == 'category'"
-                                    [attr.aria-current]="grades.getItemAriaCurrent(row)" [attr.colspan]="row.colspan">
+                                <td *ngIf="row.itemtype == 'category'" class="core-grades-table-category" [attr.rowspan]="row.rowspan">
+                                </td>
+                                <th class="core-grades-table-gradeitem ion-text-start" [attr.colspan]="row.colspan">
+                                    <ion-icon *ngIf="row.expandable && showSummary" aria-hidden="true" slot="start"
+                                        [name]="row.expanded ? 'fas-caret-down' : 'fas-caret-right'">
+                                    </ion-icon>
                                     <ion-icon *ngIf="row.icon" name="{{row.icon}}" slot="start" [attr.aria-label]="row.iconAlt">
                                     </ion-icon>
                                     <img *ngIf="row.image && !row.itemmodule" [src]="row.image" slot="start" class="core-module-icon"
@@ -43,16 +48,122 @@
                                     </core-mod-icon>
                                     <span [innerHTML]="row.gradeitem"></span>
                                 </th>
-                                <ng-container *ngFor="let column of grades.columns">
+                                <ng-container *ngFor="let column of columns">
                                     <td *ngIf="column.name != 'gradeitem' && row[column.name] != undefined"
                                         [class]="'ion-text-start core-grades-table-' + column.name"
                                         [class.ion-hide-md-down]="column.hiddenPhone" [innerHTML]="row[column.name]"></td>
                                 </ng-container>
                             </ng-container>
                         </tr>
-                    </tbody>
-                </table>
-            </div>
-        </core-loading>
-    </core-split-view>
+                        <tr *ngIf="row.expandable" [id]="row.detailsid" [class]="row.rowclass" [hidden]="!row.expanded">
+                            <td [attr.colspan]="totalColumnsSpan">
+                                <ion-list>
+                                    <ion-item *ngIf="row.itemname && row.link" class="ion-text-wrap" detail="true" [href]="row.link"
+                                        core-link capture="true">
+                                        <ion-icon *ngIf="row.icon" name="{{row.icon}}" slot="start" [attr.aria-label]="row.iconAlt">
+                                        </ion-icon>
+                                        <img *ngIf="row.image && !row.itemmodule" [src]="row.image && row.itemmodule" slot="start"
+                                            [alt]="row.iconAlt" />
+                                        <core-mod-icon *ngIf="row.image && row.itemmodule" [modicon]="row.image" slot="start"
+                                            [modname]="row.itemmodule">
+                                        </core-mod-icon>
+                                        <ion-label>
+                                            <h2>
+                                                <core-format-text [text]="row.itemname" contextLevel="course"
+                                                    [contextInstanceId]="courseId">
+                                                </core-format-text>
+                                            </h2>
+                                        </ion-label>
+                                    </ion-item>
+
+                                    <ion-item *ngIf="row.itemname && !row.link" class="ion-text-wrap">
+                                        <ion-icon *ngIf="row.icon" name="{{row.icon}}" slot="start" [attr.aria-label]="row.iconAlt">
+                                        </ion-icon>
+                                        <img *ngIf="row.image && !row.itemmodule" [src]="row.image" slot="start" [alt]="row.iconAlt" />
+                                        <core-mod-icon *ngIf="row.image && row.itemmodule" [modicon]="row.image" slot="start"
+                                            [modname]="row.itemmodule">
+                                        </core-mod-icon>
+                                        <ion-label>
+                                            <h2>
+                                                <core-format-text [text]="row.itemname" contextLevel="course"
+                                                    [contextInstanceId]="courseId">
+                                                </core-format-text>
+                                            </h2>
+                                        </ion-label>
+                                    </ion-item>
+
+                                    <ion-item class="ion-text-wrap" *ngIf="row.weight">
+                                        <ion-label>
+                                            <h2>{{ 'core.grades.weight' | translate}}</h2>
+                                            <p [innerHTML]="row.weight"></p>
+                                        </ion-label>
+                                    </ion-item>
+
+                                    <ion-item class="ion-text-wrap" *ngIf="row.grade">
+                                        <ion-label>
+                                            <h2>{{ 'core.grades.grade' | translate}}</h2>
+                                            <p [innerHTML]="row.grade"></p>
+                                        </ion-label>
+                                    </ion-item>
+
+                                    <ion-item class="ion-text-wrap" *ngIf="row.range">
+                                        <ion-label>
+                                            <h2>{{ 'core.grades.range' | translate}}</h2>
+                                            <p [innerHTML]="row.range"></p>
+                                        </ion-label>
+                                    </ion-item>
+
+                                    <ion-item class="ion-text-wrap" *ngIf="row.percentage">
+                                        <ion-label>
+                                            <h2>{{ 'core.grades.percentage' | translate}}</h2>
+                                            <p [innerHTML]="row.percentage"></p>
+                                        </ion-label>
+                                    </ion-item>
+
+                                    <ion-item class="ion-text-wrap" *ngIf="row.lettergrade">
+                                        <ion-label>
+                                            <h2>{{ 'core.grades.lettergrade' | translate}}</h2>
+                                            <p [innerHTML]="row.lettergrade"></p>
+                                        </ion-label>
+                                    </ion-item>
+
+                                    <ion-item class="ion-text-wrap" *ngIf="row.rank">
+                                        <ion-label>
+                                            <h2>{{ 'core.grades.rank' | translate}}</h2>
+                                            <p [innerHTML]="row.rank"></p>
+                                        </ion-label>
+                                    </ion-item>
+
+                                    <ion-item class="ion-text-wrap" *ngIf="row.average">
+                                        <ion-label>
+                                            <h2>{{ 'core.grades.average' | translate}}</h2>
+                                            <p [innerHTML]="row.average"></p>
+                                        </ion-label>
+                                    </ion-item>
+
+                                    <ion-item class="ion-text-wrap" *ngIf="row.feedback">
+                                        <ion-label>
+                                            <h2>{{ 'core.grades.feedback' | translate}}</h2>
+                                            <p>
+                                                <core-format-text [maxHeight]="120" [text]="row.feedback" contextLevel="course"
+                                                    [contextInstanceId]="courseId">
+                                                </core-format-text>
+                                            </p>
+                                        </ion-label>
+                                    </ion-item>
+
+                                    <ion-item class="ion-text-wrap" *ngIf="row.contributiontocoursetotal">
+                                        <ion-label>
+                                            <h2>{{ 'core.grades.contributiontocoursetotal' | translate}}</h2>
+                                            <p [innerHTML]="row.contributiontocoursetotal"></p>
+                                        </ion-label>
+                                    </ion-item>
+                                </ion-list>
+                            </td>
+                        </tr>
+                    </ng-container>
+                </tbody>
+            </table>
+        </div>
+    </core-loading>
 </ion-content>
diff --git a/src/core/features/grades/pages/course/course.page.ts b/src/core/features/grades/pages/course/course.page.ts
index 51ef0fe4f..3073c5aa3 100644
--- a/src/core/features/grades/pages/course/course.page.ts
+++ b/src/core/features/grades/pages/course/course.page.ts
@@ -12,23 +12,22 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { ActivatedRoute, Params } from '@angular/router';
-import { AfterViewInit, Component, OnDestroy, ViewChild } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { AfterViewInit, Component, ElementRef } from '@angular/core';
 import { IonRefresher } from '@ionic/angular';
 
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreGrades } from '@features/grades/services/grades';
 import {
-    CoreGradesFormattedTable,
     CoreGradesFormattedTableColumn,
     CoreGradesFormattedTableRow,
     CoreGradesHelper,
 } from '@features/grades/services/grades-helper';
 import { CoreSites } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
-import { CoreSplitViewComponent, CoreSplitViewMode } from '@components/split-view/split-view';
-import { CorePageItemsListManager } from '@classes/page-items-list-manager';
 import { CoreNavigator } from '@services/navigator';
+import { CoreScreen } from '@services/screen';
+import { Translate } from '@singletons';
 
 /**
  * Page that displays a course grades.
@@ -38,20 +37,23 @@ import { CoreNavigator } from '@services/navigator';
     templateUrl: 'course.html',
     styleUrls: ['course.scss'],
 })
-export class CoreGradesCoursePage implements AfterViewInit, OnDestroy {
+export class CoreGradesCoursePage implements AfterViewInit {
 
-    grades!: CoreGradesCourseManager;
-    splitViewMode?: CoreSplitViewMode;
-
-    @ViewChild(CoreSplitViewComponent) splitView!: CoreSplitViewComponent;
-
-    constructor(protected route: ActivatedRoute) {
-        let courseId: number;
-        let userId: number;
+    courseId!: number;
+    userId!: number;
+    expandLabel!: string;
+    collapseLabel!: string;
+    columns?: CoreGradesFormattedTableColumn[];
+    rows?: CoreGradesFormattedTableRow[];
+    totalColumnsSpan?: number;
+    withinSplitView?: boolean;
 
+    constructor(protected route: ActivatedRoute, protected element: ElementRef<HTMLElement>) {
         try {
-            courseId = CoreNavigator.getRequiredRouteNumberParam('courseId', { route });
-            userId = CoreNavigator.getRouteNumberParam('userId', { route }) ?? CoreSites.getCurrentSiteUserId();
+            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId', { route });
+            this.userId = CoreNavigator.getRouteNumberParam('userId', { route }) ?? CoreSites.getCurrentSiteUserId();
+            this.expandLabel = Translate.instant('core.expand');
+            this.collapseLabel = Translate.instant('core.collapse');
         } catch (error) {
             CoreDomUtils.showErrorModal(error);
 
@@ -59,28 +61,61 @@ export class CoreGradesCoursePage implements AfterViewInit, OnDestroy {
 
             return;
         }
+    }
 
-        const useSplitView = route.snapshot.data.useSplitView ?? true;
-        const outsideGradesTab = route.snapshot.data.outsideGradesTab ?? false;
-
-        this.splitViewMode = useSplitView ? undefined : CoreSplitViewMode.MENU_ONLY;
-        this.grades = new CoreGradesCourseManager(CoreGradesCoursePage, courseId, userId, outsideGradesTab);
+    get showSummary(): boolean {
+        return CoreScreen.isMobile || !!this.withinSplitView;
     }
 
     /**
      * @inheritdoc
      */
     async ngAfterViewInit(): Promise<void> {
-        await this.fetchInitialGrades();
+        this.withinSplitView = !!this.element.nativeElement.parentElement?.closest('core-split-view');
 
-        this.grades.start(this.splitView);
+        await this.fetchInitialGrades();
+        await CoreGrades.logCourseGradesView(this.courseId, this.userId);
     }
 
     /**
-     * @inheritdoc
+     * Get aria label for row.
+     *
+     * @param row Row.
+     * @returns Aria label, if applicable.
      */
-    ngOnDestroy(): void {
-        this.grades.destroy();
+    rowAriaLabel(row: CoreGradesFormattedTableRow): string | undefined {
+        if (!row.expandable || !this.showSummary) {
+            return;
+        }
+
+        const actionLabel = row.expanded ? this.collapseLabel : this.expandLabel;
+
+        return `${actionLabel} ${row.ariaLabel}`;
+    }
+
+    /**
+     * Toggle whether a row is expanded or collapsed.
+     *
+     * @param row Row.
+     */
+    toggleRow(row: CoreGradesFormattedTableRow): void {
+        if (!this.rows || !this.columns) {
+            return;
+        }
+
+        row.expanded = !row.expanded;
+
+        let colspan: number = this.columns.length + (row.colspan ?? 0) - 1;
+        for (let i = this.rows.indexOf(row) - 1; i >= 0; i--) {
+            const previousRow = this.rows[i];
+
+            if (previousRow.expandable || !previousRow.colspan || !previousRow.rowspan || previousRow.colspan !== colspan) {
+                continue;
+            }
+
+            colspan++;
+            previousRow.rowspan += row.expanded ? 1 : -1;
+        }
     }
 
     /**
@@ -89,9 +124,7 @@ export class CoreGradesCoursePage implements AfterViewInit, OnDestroy {
      * @param refresher Refresher.
      */
     async refreshGrades(refresher: IonRefresher): Promise<void> {
-        const { courseId, userId } = this.grades;
-
-        await CoreUtils.ignoreErrors(CoreGrades.invalidateCourseGradesData(courseId, userId));
+        await CoreUtils.ignoreErrors(CoreGrades.invalidateCourseGradesData(this.courseId, this.userId));
         await CoreUtils.ignoreErrors(this.fetchGrades());
 
         refresher?.complete();
@@ -106,7 +139,8 @@ export class CoreGradesCoursePage implements AfterViewInit, OnDestroy {
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'Error loading course');
 
-            this.grades.setTable({ columns: [], rows: [] });
+            this.columns = [];
+            this.rows = [];
         }
     }
 
@@ -114,103 +148,12 @@ export class CoreGradesCoursePage implements AfterViewInit, OnDestroy {
      * Update the table of grades.
      */
     private async fetchGrades(): Promise<void> {
-        const table = await CoreGrades.getCourseGradesTable(this.grades.courseId, this.grades.userId);
+        const table = await CoreGrades.getCourseGradesTable(this.courseId, this.userId);
         const formattedTable = await CoreGradesHelper.formatGradesTable(table);
 
-        this.grades.setTable(formattedTable);
+        this.columns = formattedTable.columns;
+        this.rows = formattedTable.rows;
+        this.totalColumnsSpan = formattedTable.columns.reduce((total, column) => total + column.colspan, 0);
     }
 
 }
-
-/**
- * Helper to manage the table of grades.
- */
-class CoreGradesCourseManager extends CorePageItemsListManager<CoreGradesFormattedTableRowFilled> {
-
-    courseId: number;
-    userId: number;
-    columns?: CoreGradesFormattedTableColumn[];
-    rows?: CoreGradesFormattedTableRow[];
-
-    private outsideGradesTab: boolean;
-
-    constructor(pageComponent: unknown, courseId: number, userId: number, outsideGradesTab: boolean) {
-        super(pageComponent);
-
-        this.courseId = courseId;
-        this.userId = userId;
-        this.outsideGradesTab = outsideGradesTab;
-    }
-
-    /**
-     * Set grades table.
-     *
-     * @param table Grades table.
-     */
-    setTable(table: CoreGradesFormattedTable): void {
-        this.columns = table.columns;
-        this.rows = table.rows;
-
-        this.setItems(table.rows.filter(this.isFilledRow));
-    }
-
-    /**
-     * @inheritdoc
-     */
-    async select(row: CoreGradesFormattedTableRowFilled): Promise<void> {
-        if (this.outsideGradesTab) {
-            await CoreNavigator.navigateToSitePath(`/grades/${this.courseId}/${row.id}`, {
-                params: {
-                    userId: this.userId,
-                },
-            });
-
-            return;
-        }
-
-        return super.select(row);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected getDefaultItem(): CoreGradesFormattedTableRowFilled | null {
-        return null;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected getItemPath(row: CoreGradesFormattedTableRowFilled): string {
-        return row.id.toString();
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected getItemQueryParams(): Params {
-        return { userId: this.userId };
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected async logActivity(): Promise<void> {
-        await CoreGrades.logCourseGradesView(this.courseId, this.userId);
-    }
-
-    /**
-     * Check whether the given row is filled or not.
-     *
-     * @param row Grades table row.
-     * @return Whether the given row is filled or not.
-     */
-    private isFilledRow(row: CoreGradesFormattedTableRow): row is CoreGradesFormattedTableRowFilled {
-        return 'id' in row;
-    }
-
-}
-
-export type CoreGradesFormattedTableRowFilled = Omit<CoreGradesFormattedTableRow, 'id'> & {
-    id: number;
-};
diff --git a/src/core/features/grades/pages/course/course.scss b/src/core/features/grades/pages/course/course.scss
index 2f0239c09..3a004d4a6 100644
--- a/src/core/features/grades/pages/course/course.scss
+++ b/src/core/features/grades/pages/course/course.scss
@@ -61,11 +61,15 @@
         background-color: var(--header-background);
     }
 
+    thead #gradeitem {
+        @include padding(null, null, null, 23px);
+    }
+
     tbody th {
       font-weight: normal;
     }
 
-    #gradeitem {
+    tbody #gradeitem {
         @include padding(null, null, null, 5px);
     }
 
@@ -131,12 +135,15 @@
         }
     }
 
-}
+    ion-list, ion-item::part(native) {
+        background-color: transparent;
+    }
+
+    &.summary .ion-hide-md-down {
+        display: none;
+        opacity: 0;
+    }
 
-core-split-view.nested .core-grades-table .ion-hide-md-down,
-core-split-view.menu-and-content .core-grades-table .ion-hide-md-down {
-    display: none;
-    opacity: 0;
 }
 
 @include media-breakpoint-down(md) {
diff --git a/src/core/features/grades/pages/grade/grade.html b/src/core/features/grades/pages/grade/grade.html
deleted file mode 100644
index ddb6bf6d2..000000000
--- a/src/core/features/grades/pages/grade/grade.html
+++ /dev/null
@@ -1,112 +0,0 @@
-<ion-header>
-    <ion-toolbar>
-        <ion-buttons slot="start">
-            <ion-back-button [text]="'core.back' | translate"></ion-back-button>
-        </ion-buttons>
-        <ion-title>
-            <h1>{{ 'core.grades.grade' | translate }}</h1>
-        </ion-title>
-    </ion-toolbar>
-</ion-header>
-<ion-content>
-    <ion-refresher slot="fixed" [disabled]="!gradeLoaded" (ionRefresh)="refreshGrade($event.target)">
-        <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
-    </ion-refresher>
-    <core-loading [hideUntil]="gradeLoaded">
-        <core-empty-box *ngIf="!grade" icon="fas-chart-bar" [message]="'core.grades.nogradesreturned' | translate"></core-empty-box>
-
-        <ion-list *ngIf="grade">
-            <ion-item *ngIf="grade.itemname && grade.link" class="ion-text-wrap" detail="true" [href]="grade.link" core-link capture="true">
-                <ion-icon *ngIf="grade.icon" name="{{grade.icon}}" slot="start" [attr.aria-label]="grade.iconAlt"></ion-icon>
-                <img *ngIf="grade.image && !grade.itemmodule" [src]="grade.image && grade.itemmodule" slot="start" [alt]="grade.iconAlt" />
-                <core-mod-icon *ngIf="grade.image && grade.itemmodule" [modicon]="grade.image" slot="start" [modname]="grade.itemmodule">
-                </core-mod-icon>
-                <ion-label>
-                    <h2>
-                        <core-format-text [text]="grade.itemname" contextLevel="course" [contextInstanceId]="courseId">
-                        </core-format-text>
-                    </h2>
-                </ion-label>
-            </ion-item>
-
-            <ion-item *ngIf="grade.itemname && !grade.link" class="ion-text-wrap">
-                <ion-icon *ngIf="grade.icon" name="{{grade.icon}}" slot="start" [attr.aria-label]="grade.iconAlt"></ion-icon>
-                <img *ngIf="grade.image && !grade.itemmodule" [src]="grade.image" slot="start" [alt]="grade.iconAlt" />
-                <core-mod-icon *ngIf="grade.image && grade.itemmodule" [modicon]="grade.image" slot="start" [modname]="grade.itemmodule">
-                </core-mod-icon>
-                <ion-label>
-                    <h2>
-                        <core-format-text [text]="grade.itemname" contextLevel="course" [contextInstanceId]="courseId">
-                        </core-format-text>
-                    </h2>
-                </ion-label>
-            </ion-item>
-
-            <ion-item class="ion-text-wrap" *ngIf="grade.weight">
-                <ion-label>
-                    <h2>{{ 'core.grades.weight' | translate}}</h2>
-                    <p [innerHTML]="grade.weight"></p>
-                </ion-label>
-            </ion-item>
-
-            <ion-item class="ion-text-wrap" *ngIf="grade.grade">
-                <ion-label>
-                    <h2>{{ 'core.grades.grade' | translate}}</h2>
-                    <p [innerHTML]="grade.grade"></p>
-                </ion-label>
-            </ion-item>
-
-            <ion-item class="ion-text-wrap" *ngIf="grade.range">
-                <ion-label>
-                    <h2>{{ 'core.grades.range' | translate}}</h2>
-                    <p [innerHTML]="grade.range"></p>
-                </ion-label>
-            </ion-item>
-
-            <ion-item class="ion-text-wrap" *ngIf="grade.percentage">
-                <ion-label>
-                    <h2>{{ 'core.grades.percentage' | translate}}</h2>
-                    <p [innerHTML]="grade.percentage"></p>
-                </ion-label>
-            </ion-item>
-
-            <ion-item class="ion-text-wrap" *ngIf="grade.lettergrade">
-                <ion-label>
-                    <h2>{{ 'core.grades.lettergrade' | translate}}</h2>
-                    <p [innerHTML]="grade.lettergrade"></p>
-                </ion-label>
-            </ion-item>
-
-            <ion-item class="ion-text-wrap" *ngIf="grade.rank">
-                <ion-label>
-                    <h2>{{ 'core.grades.rank' | translate}}</h2>
-                    <p [innerHTML]="grade.rank"></p>
-                </ion-label>
-            </ion-item>
-
-            <ion-item class="ion-text-wrap" *ngIf="grade.average">
-                <ion-label>
-                    <h2>{{ 'core.grades.average' | translate}}</h2>
-                    <p [innerHTML]="grade.average"></p>
-                </ion-label>
-            </ion-item>
-
-            <ion-item class="ion-text-wrap" *ngIf="grade.feedback">
-                <ion-label>
-                    <h2>{{ 'core.grades.feedback' | translate}}</h2>
-                    <p>
-                        <core-format-text [maxHeight]="120" [text]="grade.feedback" contextLevel="course" [contextInstanceId]="courseId">
-                        </core-format-text>
-                    </p>
-                </ion-label>
-            </ion-item>
-
-            <ion-item class="ion-text-wrap" *ngIf="grade.contributiontocoursetotal">
-                <ion-label>
-                    <h2>{{ 'core.grades.contributiontocoursetotal' | translate}}</h2>
-                    <p [innerHTML]="grade.contributiontocoursetotal"></p>
-                </ion-label>
-            </ion-item>
-        </ion-list>
-    </core-loading>
-</ion-content>
diff --git a/src/core/features/grades/pages/grade/grade.page.ts b/src/core/features/grades/pages/grade/grade.page.ts
deleted file mode 100644
index b77e08ce6..000000000
--- a/src/core/features/grades/pages/grade/grade.page.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-// (C) Copyright 2015 Moodle Pty Ltd.
-//
-// 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, OnInit } from '@angular/core';
-import { IonRefresher } from '@ionic/angular';
-
-import { CoreDomUtils } from '@services/utils/dom';
-import { CoreGrades } from '@features/grades/services/grades';
-import { CoreGradesFormattedRow, CoreGradesHelper } from '@features/grades/services/grades-helper';
-import { CoreSites } from '@services/sites';
-import { CoreUtils } from '@services/utils/utils';
-import { CoreNavigator } from '@services/navigator';
-
-/**
- * Page that displays activity grade.
- */
-@Component({
-    selector: 'page-core-grades-grade',
-    templateUrl: 'grade.html',
-})
-export class CoreGradesGradePage implements OnInit {
-
-    courseId!: number;
-    userId!: number;
-    gradeId!: number;
-    grade?: CoreGradesFormattedRow | null;
-    gradeLoaded = false;
-
-    constructor() {
-        try {
-            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
-            this.gradeId = CoreNavigator.getRequiredRouteNumberParam('gradeId');
-            this.userId = CoreNavigator.getRouteNumberParam('userId') ?? CoreSites.getCurrentSiteUserId();
-        } catch (error) {
-            CoreDomUtils.showErrorModal(error);
-
-            CoreNavigator.back();
-
-            return;
-        }
-    }
-
-    /**
-     * @inheritdoc
-     */
-    ngOnInit(): void {
-        this.fetchGrade();
-    }
-
-    /**
-     * Fetch all the data required for the view.
-     */
-    async fetchGrade(): Promise<void> {
-        try {
-            this.grade = await CoreGradesHelper.getGradeItem(this.courseId, this.gradeId, this.userId);
-            this.gradeLoaded = true;
-        } catch (error) {
-            CoreDomUtils.showErrorModalDefault(error, 'Error loading grade item');
-        }
-    }
-
-    /**
-     * Refresh data.
-     *
-     * @param refresher Refresher.
-     */
-    async refreshGrade(refresher: IonRefresher): Promise<void> {
-        await CoreUtils.ignoreErrors(CoreGrades.invalidateCourseGradesData(this.courseId, this.userId));
-        await CoreUtils.ignoreErrors(this.fetchGrade());
-
-        refresher.complete();
-    }
-
-}
diff --git a/src/core/features/grades/services/grades-helper.ts b/src/core/features/grades/services/grades-helper.ts
index add464673..91af997c6 100644
--- a/src/core/features/grades/services/grades-helper.ts
+++ b/src/core/features/grades/services/grades-helper.ts
@@ -54,6 +54,7 @@ export class CoreGradesHelperProvider {
      *
      * @param tableRow JSON object representing row of grades table data.
      * @return Formatted row object.
+     * @deprecated since app 4.0
      */
     protected async formatGradeRow(tableRow: CoreGradesTableRow): Promise<CoreGradesFormattedRow> {
         const row: CoreGradesFormattedRow = {
@@ -126,6 +127,13 @@ export class CoreGradesHelperProvider {
                 content = CoreTextUtils.replaceNewLines(content, '<br>');
             }
 
+            if (row.itemtype !== 'category') {
+                row.expandable = true;
+                row.expanded = false;
+                row.detailsid = `grade-item-${row.id}-details`;
+                row.ariaLabel = `${row.gradeitem} (${row.grade})`;
+            }
+
             if (content == '&nbsp;') {
                 content = '';
             }
@@ -280,6 +288,7 @@ export class CoreGradesHelperProvider {
      * @param siteId Site ID. If not defined, current site.
      * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
      * @return Promise to be resolved when the grades are retrieved.
+     * @deprecated since app 4.0
      */
     async getGradeItem(
         courseId: number,
@@ -382,6 +391,7 @@ export class CoreGradesHelperProvider {
      * @param table JSON object representing a table with data.
      * @param gradeId Grade Object identifier.
      * @return Formatted HTML table.
+     * @deprecated since app 4.0
      */
     async getGradesTableRow(table: CoreGradesTable, gradeId: number): Promise<CoreGradesFormattedRow | null> {
         if (table.tabledata) {
@@ -705,8 +715,12 @@ export type CoreGradesFormattedTable = {
 
 export type CoreGradesFormattedTableRow = CoreGradesFormattedRowCommonData & {
     id?: number;
+    detailsid?: string;
     colspan?: number;
     gradeitem?: string; // The item returned data.
+    ariaLabel?: string;
+    expandable?: boolean;
+    expanded?: boolean;
 };
 
 export type CoreGradesFormattedTableColumn = {

From 11c2468d585761a1d7972393d3373235045ea6c0 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 12 Jan 2022 11:53:11 +0100
Subject: [PATCH 0344/1008] MOBILE-3934 grades: Add swipe navigation

---
 .../grades/classes/grades-courses-source.ts   | 41 +++++++++++++++++++
 .../grades/grades-course-lazy.module.ts       |  1 +
 .../features/grades/pages/course/course.html  |  4 +-
 .../grades/pages/course/course.page.ts        | 24 ++++++++++-
 .../grades/pages/courses/courses.page.ts      | 38 ++++++-----------
 5 files changed, 79 insertions(+), 29 deletions(-)
 create mode 100644 src/core/features/grades/classes/grades-courses-source.ts

diff --git a/src/core/features/grades/classes/grades-courses-source.ts b/src/core/features/grades/classes/grades-courses-source.ts
new file mode 100644
index 000000000..6d2b74608
--- /dev/null
+++ b/src/core/features/grades/classes/grades-courses-source.ts
@@ -0,0 +1,41 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreRoutedItemsManagerSource } from '@classes/items-management/routed-items-manager-source';
+import { CoreGrades } from '../services/grades';
+import { CoreGradesGradeOverviewWithCourseData, CoreGradesHelper } from '../services/grades-helper';
+
+/**
+ * Provides a collection of courses.
+ */
+export class CoreGradesCoursesSource extends CoreRoutedItemsManagerSource<CoreGradesGradeOverviewWithCourseData> {
+
+    /**
+     * @inheritdoc
+     */
+    protected async loadPageItems(): Promise<{ items: CoreGradesGradeOverviewWithCourseData[] }> {
+        const grades = await CoreGrades.getCoursesGrades();
+        const courses = await CoreGradesHelper.getGradesCourseData(grades);
+
+        return { items: courses };
+    }
+
+    /**
+     * @inheritdoc
+     */
+    getItemPath(course: CoreGradesGradeOverviewWithCourseData): string {
+        return course.courseid.toString();
+    }
+
+}
diff --git a/src/core/features/grades/grades-course-lazy.module.ts b/src/core/features/grades/grades-course-lazy.module.ts
index 877a0fec9..974a15c9d 100644
--- a/src/core/features/grades/grades-course-lazy.module.ts
+++ b/src/core/features/grades/grades-course-lazy.module.ts
@@ -22,6 +22,7 @@ const routes: Routes = [
     {
         path: '',
         component: CoreGradesCoursePage,
+        data: { swipeEnabled: false },
     },
 ];
 
diff --git a/src/core/features/grades/pages/course/course.html b/src/core/features/grades/pages/course/course.html
index c0e19a660..a34967aa7 100644
--- a/src/core/features/grades/pages/course/course.html
+++ b/src/core/features/grades/pages/course/course.html
@@ -4,11 +4,11 @@
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
         <ion-title>
-            <h1>{{ 'core.grades.grades' | translate }}</h1>
+            <h1>{{ title }}</h1>
         </ion-title>
     </ion-toolbar>
 </ion-header>
-<ion-content>
+<ion-content [core-swipe-navigation]="courses">
     <ion-refresher slot="fixed" [disabled]="!columns || !rows" (ionRefresh)="refreshGrades($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
diff --git a/src/core/features/grades/pages/course/course.page.ts b/src/core/features/grades/pages/course/course.page.ts
index 3073c5aa3..fe22fc527 100644
--- a/src/core/features/grades/pages/course/course.page.ts
+++ b/src/core/features/grades/pages/course/course.page.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { ActivatedRoute } from '@angular/router';
-import { AfterViewInit, Component, ElementRef } from '@angular/core';
+import { AfterViewInit, Component, ElementRef, OnDestroy } from '@angular/core';
 import { IonRefresher } from '@ionic/angular';
 
 import { CoreDomUtils } from '@services/utils/dom';
@@ -28,6 +28,9 @@ import { CoreUtils } from '@services/utils/utils';
 import { CoreNavigator } from '@services/navigator';
 import { CoreScreen } from '@services/screen';
 import { Translate } from '@singletons';
+import { CoreSwipeNavigationItemsManager } from '@classes/items-management/swipe-navigation-items-manager';
+import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
+import { CoreGradesCoursesSource } from '@features/grades/classes/grades-courses-source';
 
 /**
  * Page that displays a course grades.
@@ -37,12 +40,14 @@ import { Translate } from '@singletons';
     templateUrl: 'course.html',
     styleUrls: ['course.scss'],
 })
-export class CoreGradesCoursePage implements AfterViewInit {
+export class CoreGradesCoursePage implements AfterViewInit, OnDestroy {
 
     courseId!: number;
     userId!: number;
     expandLabel!: string;
     collapseLabel!: string;
+    title?: string;
+    courses?: CoreSwipeNavigationItemsManager;
     columns?: CoreGradesFormattedTableColumn[];
     rows?: CoreGradesFormattedTableRow[];
     totalColumnsSpan?: number;
@@ -54,6 +59,12 @@ export class CoreGradesCoursePage implements AfterViewInit {
             this.userId = CoreNavigator.getRouteNumberParam('userId', { route }) ?? CoreSites.getCurrentSiteUserId();
             this.expandLabel = Translate.instant('core.expand');
             this.collapseLabel = Translate.instant('core.collapse');
+
+            if (route.snapshot.data.swipeEnabled ?? true) {
+                const source = CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(CoreGradesCoursesSource, []);
+
+                this.courses = new CoreSwipeNavigationItemsManager(source);
+            }
         } catch (error) {
             CoreDomUtils.showErrorModal(error);
 
@@ -73,10 +84,18 @@ export class CoreGradesCoursePage implements AfterViewInit {
     async ngAfterViewInit(): Promise<void> {
         this.withinSplitView = !!this.element.nativeElement.parentElement?.closest('core-split-view');
 
+        await this.courses?.start();
         await this.fetchInitialGrades();
         await CoreGrades.logCourseGradesView(this.courseId, this.userId);
     }
 
+    /**
+     * @inheritdoc
+     */
+    ngOnDestroy(): void {
+        this.courses?.destroy();
+    }
+
     /**
      * Get aria label for row.
      *
@@ -151,6 +170,7 @@ export class CoreGradesCoursePage implements AfterViewInit {
         const table = await CoreGrades.getCourseGradesTable(this.courseId, this.userId);
         const formattedTable = await CoreGradesHelper.formatGradesTable(table);
 
+        this.title = formattedTable.rows[0]?.gradeitem ?? Translate.instant('core.grades.grades');
         this.columns = formattedTable.columns;
         this.rows = formattedTable.rows;
         this.totalColumnsSpan = formattedTable.columns.reduce((total, column) => total + column.colspan, 0);
diff --git a/src/core/features/grades/pages/courses/courses.page.ts b/src/core/features/grades/pages/courses/courses.page.ts
index bd6a4c51d..dd47d084c 100644
--- a/src/core/features/grades/pages/courses/courses.page.ts
+++ b/src/core/features/grades/pages/courses/courses.page.ts
@@ -13,11 +13,12 @@
 // limitations under the License.
 
 import { AfterViewInit, Component, OnDestroy, ViewChild } from '@angular/core';
-import { CorePageItemsListManager } from '@classes/page-items-list-manager';
+import { CoreListItemsManager } from '@classes/items-management/list-items-manager';
+import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
 
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
+import { CoreGradesCoursesSource } from '@features/grades/classes/grades-courses-source';
 import { CoreGrades } from '@features/grades/services/grades';
-import { CoreGradesGradeOverviewWithCourseData, CoreGradesHelper } from '@features/grades/services/grades-helper';
 import { IonRefresher } from '@ionic/angular';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
@@ -31,10 +32,16 @@ import { CoreUtils } from '@services/utils/utils';
 })
 export class CoreGradesCoursesPage implements OnDestroy, AfterViewInit {
 
-    courses: CoreGradesCoursesManager = new CoreGradesCoursesManager(CoreGradesCoursesPage);
+    courses: CoreGradesCoursesManager;
 
     @ViewChild(CoreSplitViewComponent) splitView!: CoreSplitViewComponent;
 
+    constructor() {
+        const source = CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(CoreGradesCoursesSource, []);
+
+        this.courses = new CoreGradesCoursesManager(source, CoreGradesCoursesPage);
+    }
+
     /**
      * @inheritdoc
      */
@@ -58,7 +65,7 @@ export class CoreGradesCoursesPage implements OnDestroy, AfterViewInit {
      */
     async refreshCourses(refresher: IonRefresher): Promise<void> {
         await CoreUtils.ignoreErrors(CoreGrades.invalidateCoursesGradesData());
-        await CoreUtils.ignoreErrors(this.fetchCourses());
+        await CoreUtils.ignoreErrors(this.courses.reload());
 
         refresher?.complete();
     }
@@ -68,37 +75,18 @@ export class CoreGradesCoursesPage implements OnDestroy, AfterViewInit {
      */
     private async fetchInitialCourses(): Promise<void> {
         try {
-            await this.fetchCourses();
+            await this.courses.load();
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'Error loading courses');
-
-            this.courses.setItems([]);
         }
     }
 
-    /**
-     * Update the list of courses.
-     */
-    private async fetchCourses(): Promise<void> {
-        const grades = await CoreGrades.getCoursesGrades();
-        const courses = await CoreGradesHelper.getGradesCourseData(grades);
-
-        this.courses.setItems(courses);
-    }
-
 }
 
 /**
  * Helper class to manage courses.
  */
-class CoreGradesCoursesManager extends CorePageItemsListManager<CoreGradesGradeOverviewWithCourseData> {
-
-    /**
-     * @inheritdoc
-     */
-    protected getItemPath(courseGrade: CoreGradesGradeOverviewWithCourseData): string {
-        return courseGrade.courseid.toString();
-    }
+class CoreGradesCoursesManager extends CoreListItemsManager {
 
     /**
      * @inheritdoc

From ce7880afc3bb121d5f76b627127fca95d789c542 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 12 Jan 2022 12:14:30 +0100
Subject: [PATCH 0345/1008] MOBILE-3934 grades: Fix feedback column in table

---
 src/core/features/grades/pages/course/course.html | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/core/features/grades/pages/course/course.html b/src/core/features/grades/pages/course/course.html
index a34967aa7..e5e717bbe 100644
--- a/src/core/features/grades/pages/course/course.html
+++ b/src/core/features/grades/pages/course/course.html
@@ -49,9 +49,16 @@
                                     <span [innerHTML]="row.gradeitem"></span>
                                 </th>
                                 <ng-container *ngFor="let column of columns">
-                                    <td *ngIf="column.name != 'gradeitem' && row[column.name] != undefined"
+                                    <td *ngIf="column.name !== 'gradeitem' && column.name !== 'feedback' && row[column.name] != undefined"
                                         [class]="'ion-text-start core-grades-table-' + column.name"
-                                        [class.ion-hide-md-down]="column.hiddenPhone" [innerHTML]="row[column.name]"></td>
+                                        [class.ion-hide-md-down]="column.hiddenPhone" [innerHTML]="row[column.name]">
+                                    </td>
+                                    <td *ngIf="column.name === 'feedback' && row.feedback !== undefined"
+                                        class="ion-text-start core-grades-table-feedback" [class.ion-hide-md-down]="column.hiddenPhone">
+                                        <core-format-text [maxHeight]="120" [text]="row.feedback" contextLevel="course"
+                                            [contextInstanceId]="courseId">
+                                        </core-format-text>
+                                    </td>
                                 </ng-container>
                             </ng-container>
                         </tr>

From 4cdcb23d97e0b6989d70ce40d46e8208e9cb050e Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 12 Jan 2022 14:02:37 +0100
Subject: [PATCH 0346/1008] MOBILE-3833 core: Fix empty split views updates

---
 .../items-management/list-items-manager.ts    | 20 ++++++-------
 .../items-management/routed-items-manager.ts  | 28 +++++++++++++++++++
 2 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/src/core/classes/items-management/list-items-manager.ts b/src/core/classes/items-management/list-items-manager.ts
index 174a93efe..4fae782f3 100644
--- a/src/core/classes/items-management/list-items-manager.ts
+++ b/src/core/classes/items-management/list-items-manager.ts
@@ -123,7 +123,13 @@ export class CoreListItemsManager<
      *
      * @param item Item.
      */
-    async select(item: Item): Promise<void> {
+    async select(item: Item | null): Promise<void> {
+        if (!item) {
+            await this.navigateToIndex({ reset: this.resetNavigation() });
+
+            return;
+        }
+
         await this.navigateToItem(item, { reset: this.resetNavigation() });
     }
 
@@ -174,17 +180,9 @@ export class CoreListItemsManager<
     protected updateSelectedItem(route: ActivatedRouteSnapshot | null = null): void {
         super.updateSelectedItem(route);
 
-        if (CoreScreen.isMobile || this.selectedItem !== null || !this.splitView || this.splitView.isNested) {
-            return;
-        }
+        const selectDefault = CoreScreen.isTablet && this.selectedItem === null && this.splitView && !this.splitView.isNested;
 
-        const defaultItem = this.getDefaultItem();
-
-        if (!defaultItem) {
-            return;
-        }
-
-        this.select(defaultItem);
+        this.select(selectDefault ? this.getDefaultItem() : this.selectedItem);
     }
 
     /**
diff --git a/src/core/classes/items-management/routed-items-manager.ts b/src/core/classes/items-management/routed-items-manager.ts
index 6feb244cc..ac1b608ac 100644
--- a/src/core/classes/items-management/routed-items-manager.ts
+++ b/src/core/classes/items-management/routed-items-manager.ts
@@ -119,6 +119,34 @@ export abstract class CoreRoutedItemsManager<
         await CoreNavigator.navigate(pathPrefix + itemPath, { params, ...options });
     }
 
+    /**
+     * Navigate to the index page.
+     *
+     * @param options Navigation options.
+     */
+    protected async navigateToIndex(
+        options: Pick<CoreNavigationOptions, 'reset' | 'replace' | 'animationDirection'> = {},
+    ): Promise<void> {
+        // Get current route in the page.
+        const route = this.getCurrentPageRoute();
+
+        if (route === null) {
+            return;
+        }
+
+        // If the current page is already the index, do nothing.
+        const selectedItemPath = this.getSelectedItemPath(route.snapshot);
+
+        if (selectedItemPath === null) {
+            return;
+        }
+
+        // Navigate to index.
+        const indexPath = selectedItemPath ? selectedItemPath.split('/').fill('../').join('') : '';
+
+        await CoreNavigator.navigate(indexPath, options);
+    }
+
     /**
      * @inheritdoc
      */

From a02bb045db561bc201f18ca10e2e0bc8d38cfac1 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 12 Jan 2022 14:04:18 +0100
Subject: [PATCH 0347/1008] MOBILE-3833 chat: Remove deprecated list manager

---
 .../mod/chat/classes/chat-sessions-source.ts  | 142 +++++++++++++
 .../mod/chat/pages/sessions/sessions.html     |   4 +-
 .../mod/chat/pages/sessions/sessions.ts       | 200 +++++-------------
 3 files changed, 199 insertions(+), 147 deletions(-)
 create mode 100644 src/addons/mod/chat/classes/chat-sessions-source.ts

diff --git a/src/addons/mod/chat/classes/chat-sessions-source.ts b/src/addons/mod/chat/classes/chat-sessions-source.ts
new file mode 100644
index 000000000..e53b4be01
--- /dev/null
+++ b/src/addons/mod/chat/classes/chat-sessions-source.ts
@@ -0,0 +1,142 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { Params } from '@angular/router';
+import { CoreRoutedItemsManagerSource } from '@classes/items-management/routed-items-manager-source';
+import { CoreUser } from '@features/user/services/user';
+import { CoreGroupInfo, CoreGroups } from '@services/groups';
+import { CoreUtils } from '@services/utils/utils';
+import { Translate } from '@singletons';
+import { AddonModChat, AddonModChatSession, AddonModChatSessionUser } from '../services/chat';
+
+/**
+ * Provides a collection of sessions.
+ */
+export class AddonModChatSessionsSource extends CoreRoutedItemsManagerSource<AddonModChatSessionFormatted> {
+
+    readonly COURSE_ID: number;
+    readonly CHAT_ID: number;
+    readonly CM_ID: number;
+
+    showAll = false;
+    groupId = 0;
+    groupInfo?: CoreGroupInfo;
+
+    constructor(courseId: number, chatId: number, cmId: number) {
+        super();
+
+        this.COURSE_ID = courseId;
+        this.CHAT_ID = chatId;
+        this.CM_ID = cmId;
+    }
+
+    /**
+     * Invalidate chat cache.
+     */
+    async invalidateCache(): Promise<void> {
+        await CoreUtils.ignoreErrors(CoreUtils.allPromises([
+            CoreGroups.invalidateActivityGroupInfo(this.CM_ID),
+            AddonModChat.invalidateSessions(this.CHAT_ID, this.groupId, this.showAll),
+        ]));
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected async loadPageItems(): Promise<{ items: AddonModChatSessionFormatted[] }> {
+        this.groupInfo = await CoreGroups.getActivityGroupInfo(this.CM_ID, false);
+
+        this.groupId = CoreGroups.validateGroupId(this.groupId, this.groupInfo);
+
+        const sessions = await AddonModChat.getSessions(this.CHAT_ID, this.groupId, this.showAll, { cmId: this.CM_ID });
+
+        // Fetch user profiles.
+        const promises: Promise<unknown>[] = [];
+
+        const formattedSessions = sessions.map((session: AddonModChatSessionFormatted) => {
+            session.duration = session.sessionend - session.sessionstart;
+            session.sessionusers.forEach((sessionUser) => {
+                // The WS does not return the user name, fetch user profile.
+                promises.push(this.loadUserFullname(sessionUser));
+            });
+
+            // If session has more than 4 users we display a "Show more" link.
+            session.allsessionusers = session.sessionusers;
+            if (session.sessionusers.length > 4) {
+                session.sessionusers = session.allsessionusers.slice(0, 3);
+            }
+
+            return session;
+        });
+
+        await Promise.all(promises);
+
+        return { items: formattedSessions };
+    }
+
+    /**
+     * @inheritdoc
+     */
+    getItemPath(session: AddonModChatSessionFormatted): string {
+        return `${session.sessionstart}/${session.sessionend}`;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    getItemQueryParams(): Params {
+        return {
+            chatId: this.CHAT_ID,
+            groupId: this.groupId,
+        };
+    }
+
+    /**
+     * Load the fullname of a user.
+     *
+     * @param id User ID.
+     * @return Promise resolved when done.
+     */
+    protected async loadUserFullname(sessionUser: AddonModChatUserSessionFormatted): Promise<void> {
+        if (sessionUser.userfullname) {
+            return;
+        }
+
+        try {
+            const user = await CoreUser.getProfile(sessionUser.userid, this.COURSE_ID, true);
+
+            sessionUser.userfullname = user.fullname;
+        } catch {
+            // Error getting profile, most probably the user is deleted.
+            sessionUser.userfullname = Translate.instant('core.deleteduser') + ' ' + sessionUser.userid;
+        }
+    }
+
+}
+
+/**
+ * Fields added to chat session in this view.
+ */
+export type AddonModChatSessionFormatted = Omit<AddonModChatSession, 'sessionusers'> & {
+    duration?: number; // Session duration.
+    sessionusers: AddonModChatUserSessionFormatted[];
+    allsessionusers?: AddonModChatUserSessionFormatted[]; // All session users.
+};
+
+/**
+ * Fields added to user session in this view.
+ */
+export type AddonModChatUserSessionFormatted = AddonModChatSessionUser & {
+    userfullname?: string; // User full name.
+};
diff --git a/src/addons/mod/chat/pages/sessions/sessions.html b/src/addons/mod/chat/pages/sessions/sessions.html
index d4f7bf45e..53115aac3 100644
--- a/src/addons/mod/chat/pages/sessions/sessions.html
+++ b/src/addons/mod/chat/pages/sessions/sessions.html
@@ -19,7 +19,7 @@
                     <ng-container *ngIf="groupInfo.separateGroups">{{'core.groupsseparate' | translate }}</ng-container>
                     <ng-container *ngIf="groupInfo.visibleGroups">{{'core.groupsvisible' | translate }}</ng-container>
                 </ion-label>
-                <ion-select [(ngModel)]="groupId" (ionChange)="fetchSessions(true)" aria-labelledby="addon-chat-groupslabel"
+                <ion-select [(ngModel)]="groupId" (ionChange)="reloadSessions()" aria-labelledby="addon-chat-groupslabel"
                     interface="action-sheet" [interfaceOptions]="{header: 'core.group' | translate}">
                     <ion-select-option *ngFor="let groupOpt of groupInfo.groups" [value]="groupOpt.id">
                         {{groupOpt.name}}
@@ -29,7 +29,7 @@
 
             <ion-item>
                 <ion-label>{{ 'addon.mod_chat.showincompletesessions' | translate }}</ion-label>
-                <ion-toggle [(ngModel)]="showAll" (ionChange)="fetchSessions(true)"></ion-toggle>
+                <ion-toggle [(ngModel)]="showAll" (ionChange)="reloadSessions()"></ion-toggle>
             </ion-item>
 
             <ion-card *ngFor="let session of sessions.items" (click)="sessions.select(session)" button
diff --git a/src/addons/mod/chat/pages/sessions/sessions.ts b/src/addons/mod/chat/pages/sessions/sessions.ts
index c262d4d74..082e9506f 100644
--- a/src/addons/mod/chat/pages/sessions/sessions.ts
+++ b/src/addons/mod/chat/pages/sessions/sessions.ts
@@ -13,17 +13,14 @@
 // limitations under the License.
 
 import { AfterViewInit, Component, OnDestroy, ViewChild } from '@angular/core';
-import { Params } from '@angular/router';
-import { CorePageItemsListManager } from '@classes/page-items-list-manager';
+import { CoreListItemsManager } from '@classes/items-management/list-items-manager';
+import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
-import { CoreUser } from '@features/user/services/user';
 import { IonRefresher } from '@ionic/angular';
-import { CoreGroupInfo, CoreGroups } from '@services/groups';
+import { CoreGroupInfo } from '@services/groups';
 import { CoreNavigator } from '@services/navigator';
 import { CoreDomUtils } from '@services/utils/dom';
-import { CoreUtils } from '@services/utils/utils';
-import { Translate } from '@singletons';
-import { AddonModChat, AddonModChatSession, AddonModChatSessionUser } from '../../services/chat';
+import { AddonModChatSessionFormatted, AddonModChatSessionsSource } from '../../classes/chat-sessions-source';
 
 /**
  * Page that displays list of chat sessions.
@@ -36,28 +33,19 @@ export class AddonModChatSessionsPage implements AfterViewInit, OnDestroy {
 
     @ViewChild(CoreSplitViewComponent) splitView!: CoreSplitViewComponent;
 
-    sessions!: AddonChatSessionsManager;
-    showAll = false;
-    groupId = 0;
-    groupInfo?: CoreGroupInfo;
-
-    protected courseId!: number;
-    protected cmId!: number;
-    protected chatId!: number;
+    sessions!: CoreListItemsManager<AddonModChatSessionFormatted, AddonModChatSessionsSource>;
 
     constructor() {
-        this.sessions = new AddonChatSessionsManager(AddonModChatSessionsPage);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    async ngAfterViewInit(): Promise<void> {
         try {
-            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
-            this.cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
-            this.chatId = CoreNavigator.getRequiredRouteNumberParam('chatId');
-            this.sessions.setChatId(this.chatId);
+            const courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            const chatId = CoreNavigator.getRequiredRouteNumberParam('chatId');
+            const cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
+            const source = CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(
+                AddonModChatSessionsSource,
+                [courseId, chatId, cmId],
+            );
+
+            this.sessions = new CoreListItemsManager(source, AddonModChatSessionsPage);
         } catch (error) {
             CoreDomUtils.showErrorModal(error);
 
@@ -65,7 +53,32 @@ export class AddonModChatSessionsPage implements AfterViewInit, OnDestroy {
 
             return;
         }
+    }
 
+    get groupId(): number {
+        return this.sessions.getSource().groupId;
+    }
+
+    set groupId(value: number) {
+        this.sessions.getSource().groupId = value;
+    }
+
+    get showAll(): boolean {
+        return this.sessions.getSource().showAll;
+    }
+
+    set showAll(value: boolean) {
+        this.sessions.getSource().showAll = value;
+    }
+
+    get groupInfo(): CoreGroupInfo | undefined {
+        return this.sessions.getSource().groupInfo;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async ngAfterViewInit(): Promise<void> {
         await this.fetchSessions();
 
         this.sessions.start(this.splitView);
@@ -75,66 +88,27 @@ export class AddonModChatSessionsPage implements AfterViewInit, OnDestroy {
      * Fetch chat sessions.
      *
      * @param showLoading Display a loading modal.
-     * @return Promise resolved when done.
      */
-    async fetchSessions(showLoading?: boolean): Promise<void> {
-        const modal = showLoading ? await CoreDomUtils.showModalLoading() : null;
-
+    async fetchSessions(): Promise<void> {
         try {
-            this.groupInfo = await CoreGroups.getActivityGroupInfo(this.cmId, false);
-
-            this.groupId = CoreGroups.validateGroupId(this.groupId, this.groupInfo);
-            this.sessions.setGroupId(this.groupId);
-
-            const sessions = await AddonModChat.getSessions(this.chatId, this.groupId, this.showAll, { cmId: this.cmId });
-
-            // Fetch user profiles.
-            const promises: Promise<unknown>[] = [];
-
-            const formattedSessions = sessions.map((session: AddonModChatSessionFormatted) => {
-                session.duration = session.sessionend - session.sessionstart;
-                session.sessionusers.forEach((sessionUser) => {
-                    // The WS does not return the user name, fetch user profile.
-                    promises.push(this.loadUserFullname(sessionUser));
-                });
-
-                // If session has more than 4 users we display a "Show more" link.
-                session.allsessionusers = session.sessionusers;
-                if (session.sessionusers.length > 4) {
-                    session.sessionusers = session.allsessionusers.slice(0, 3);
-                }
-
-                return session;
-            });
-
-            await Promise.all(promises);
-
-            this.sessions.setItems(formattedSessions);
+            await this.sessions.load();
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'core.errorloadingcontent', true);
-        } finally {
-            modal?.dismiss();
         }
     }
 
     /**
-     * Load the fullname of a user.
-     *
-     * @param id User ID.
-     * @return Promise resolved when done.
+     * Reload chat sessions.
      */
-    protected async loadUserFullname(sessionUser: AddonModChatUserSessionFormatted): Promise<void> {
-        if (sessionUser.userfullname) {
-            return;
-        }
+    async reloadSessions(): Promise<void> {
+        const modal = await CoreDomUtils.showModalLoading();
 
         try {
-            const user = await CoreUser.getProfile(sessionUser.userid, this.courseId, true);
-
-            sessionUser.userfullname = user.fullname;
-        } catch {
-            // Error getting profile, most probably the user is deleted.
-            sessionUser.userfullname = Translate.instant('core.deleteduser') + ' ' + sessionUser.userid;
+            await this.sessions.reload();
+        } catch (error) {
+            CoreDomUtils.showErrorModalDefault(error, 'core.errorloadingcontent', true);
+        } finally {
+            modal.dismiss();
         }
     }
 
@@ -145,11 +119,9 @@ export class AddonModChatSessionsPage implements AfterViewInit, OnDestroy {
      */
     async refreshSessions(refresher: IonRefresher): Promise<void> {
         try {
-            await CoreUtils.ignoreErrors(CoreUtils.allPromises([
-                CoreGroups.invalidateActivityGroupInfo(this.cmId),
-                AddonModChat.invalidateSessions(this.chatId, this.groupId, this.showAll),
-            ]));
+            this.sessions.getSource().setDirty(true);
 
+            await this.sessions.getSource().invalidateCache();
             await this.fetchSessions();
         } finally {
             refresher.complete();
@@ -163,7 +135,10 @@ export class AddonModChatSessionsPage implements AfterViewInit, OnDestroy {
      * @param event The event.
      */
     showMoreUsers(session: AddonModChatSessionFormatted, event: Event): void {
-        session.sessionusers = session.allsessionusers!;
+        if (session.allsessionusers) {
+            session.sessionusers = session.allsessionusers;
+        }
+
         event.stopPropagation();
     }
 
@@ -175,68 +150,3 @@ export class AddonModChatSessionsPage implements AfterViewInit, OnDestroy {
     }
 
 }
-
-/**
- * Helper class to manage sessions.
- */
-class AddonChatSessionsManager extends CorePageItemsListManager<AddonModChatSessionFormatted> {
-
-    chatId = -1;
-    groupId = 0;
-
-    constructor(pageComponent: unknown) {
-        super(pageComponent);
-    }
-
-    /**
-     * Set chat ID.
-     *
-     * @param chatId Chat ID.
-     */
-    setChatId(chatId: number): void {
-        this.chatId = chatId;
-    }
-
-    /**
-     * Set group ID.
-     *
-     * @param groupId Group ID.
-     */
-    setGroupId(groupId: number): void {
-        this.groupId = groupId;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected getItemPath(session: AddonModChatSessionFormatted): string {
-        return `${session.sessionstart}/${session.sessionend}`;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected getItemQueryParams(): Params {
-        return {
-            chatId: this.chatId,
-            groupId: this.groupId,
-        };
-    }
-
-}
-
-/**
- * Fields added to chat session in this view.
- */
-type AddonModChatSessionFormatted = Omit<AddonModChatSession, 'sessionusers'> & {
-    duration?: number; // Session duration.
-    sessionusers: AddonModChatUserSessionFormatted[];
-    allsessionusers?: AddonModChatUserSessionFormatted[]; // All session users.
-};
-
-/**
- * Fields added to user session in this view.
- */
-type AddonModChatUserSessionFormatted = AddonModChatSessionUser & {
-    userfullname?: string; // User full name.
-};

From b15a9efaba4beadf066d52cbf72523d3e176dd74 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 12 Jan 2022 14:45:47 +0100
Subject: [PATCH 0348/1008] MOBILE-3833 settings: Update list manager

---
 .../classes/settings-handlers-source.ts       | 45 +++++++++
 .../classes/settings-sections-source.ts       | 90 ++++++++++++++++++
 .../features/settings/pages/index/index.ts    | 95 +++----------------
 src/core/features/settings/pages/site/site.ts | 45 +++------
 4 files changed, 162 insertions(+), 113 deletions(-)
 create mode 100644 src/core/features/settings/classes/settings-handlers-source.ts
 create mode 100644 src/core/features/settings/classes/settings-sections-source.ts

diff --git a/src/core/features/settings/classes/settings-handlers-source.ts b/src/core/features/settings/classes/settings-handlers-source.ts
new file mode 100644
index 000000000..30db670ce
--- /dev/null
+++ b/src/core/features/settings/classes/settings-handlers-source.ts
@@ -0,0 +1,45 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { Params } from '@angular/router';
+import { CoreRoutedItemsManagerSource } from '@classes/items-management/routed-items-manager-source';
+import { CoreSettingsDelegate, CoreSettingsHandlerToDisplay } from '../services/settings-delegate';
+
+/**
+ * Provides a collection of site settings.
+ */
+export class CoreSettingsHandlersSource extends CoreRoutedItemsManagerSource<CoreSettingsHandlerToDisplay> {
+
+    /**
+     * @inheritdoc
+     */
+    protected async loadPageItems(): Promise<{ items: CoreSettingsHandlerToDisplay[] }> {
+        return { items: CoreSettingsDelegate.getHandlers() };
+    }
+
+    /**
+     * @inheritdoc
+     */
+    getItemPath(handler: CoreSettingsHandlerToDisplay): string {
+        return handler.page;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    getItemQueryParams(handler: CoreSettingsHandlerToDisplay): Params {
+        return handler.params || {};
+    }
+
+}
diff --git a/src/core/features/settings/classes/settings-sections-source.ts b/src/core/features/settings/classes/settings-sections-source.ts
new file mode 100644
index 000000000..d3bcd02c9
--- /dev/null
+++ b/src/core/features/settings/classes/settings-sections-source.ts
@@ -0,0 +1,90 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreConstants } from '@/core/constants';
+import { Params } from '@angular/router';
+import { CoreRoutedItemsManagerSource } from '@classes/items-management/routed-items-manager-source';
+import { SHAREDFILES_PAGE_NAME } from '@features/sharedfiles/sharedfiles.module';
+import { CoreApp } from '@services/app';
+
+/**
+ * Provides a collection of setting sections.
+ */
+export class CoreSettingsSectionsSource extends CoreRoutedItemsManagerSource<CoreSettingsSection> {
+
+    /**
+     * @inheritdoc
+     */
+    protected async loadPageItems(): Promise<{ items: CoreSettingsSection[] }> {
+        const sections: CoreSettingsSection[] = [
+            {
+                name: 'core.settings.general',
+                path: 'general',
+                icon: 'fas-wrench',
+            },
+            {
+                name: 'core.settings.spaceusage',
+                path: 'spaceusage',
+                icon: 'fas-tasks',
+            },
+            {
+                name: 'core.settings.synchronization',
+                path: 'sync',
+                icon: CoreConstants.ICON_SYNC,
+            },
+        ];
+
+        if (CoreApp.isIOS()) {
+            sections.push({
+                name: 'core.sharedfiles.sharedfiles',
+                path: SHAREDFILES_PAGE_NAME + '/list/root',
+                icon: 'fas-folder',
+                params: { manage: true },
+            });
+        }
+
+        sections.push({
+            name: 'core.settings.about',
+            path: 'about',
+            icon: 'fas-id-card',
+        });
+
+        return { items: sections };
+    }
+
+    /**
+     * @inheritdoc
+     */
+    getItemPath(section: CoreSettingsSection): string {
+        return section.path;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    getItemQueryParams(section: CoreSettingsSection): Params {
+        return section.params || {};
+    }
+
+}
+
+/**
+ * Settings section.
+ */
+export type CoreSettingsSection = {
+    name: string;
+    path: string;
+    icon: string;
+    params?: Params;
+};
diff --git a/src/core/features/settings/pages/index/index.ts b/src/core/features/settings/pages/index/index.ts
index 6e1653977..9e044dfe3 100644
--- a/src/core/features/settings/pages/index/index.ts
+++ b/src/core/features/settings/pages/index/index.ts
@@ -13,13 +13,11 @@
 // limitations under the License.
 
 import { AfterViewInit, Component, OnDestroy, ViewChild } from '@angular/core';
-import { Params } from '@angular/router';
 
-import { CorePageItemsListManager } from '@classes/page-items-list-manager';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
-import { CoreConstants } from '@/core/constants';
-import { SHAREDFILES_PAGE_NAME } from '@features/sharedfiles/sharedfiles.module';
-import { CoreApp } from '@services/app';
+import { CoreListItemsManager } from '@classes/items-management/list-items-manager';
+import { CoreSettingsSection, CoreSettingsSectionsSource } from '@features/settings/classes/settings-sections-source';
+import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
 
 @Component({
     selector: 'page-core-settings-index',
@@ -27,16 +25,22 @@ import { CoreApp } from '@services/app';
 })
 export class CoreSettingsIndexPage implements AfterViewInit, OnDestroy {
 
-    sections: CoreSettingsSectionsManager = new CoreSettingsSectionsManager(CoreSettingsIndexPage);
+    sections: CoreListItemsManager<CoreSettingsSection>;
 
     @ViewChild(CoreSplitViewComponent) splitView!: CoreSplitViewComponent;
 
+    constructor() {
+        const source = CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(CoreSettingsSectionsSource, []);
+
+        this.sections = new CoreListItemsManager(source, CoreSettingsIndexPage);
+    }
+
     /**
      * @inheritdoc
      */
-    ngAfterViewInit(): void {
-        this.sections.setItems(this.getSections());
-        this.sections.start(this.splitView);
+    async ngAfterViewInit(): Promise<void> {
+        await this.sections.load();
+        await this.sections.start(this.splitView);
     }
 
     /**
@@ -46,77 +50,4 @@ export class CoreSettingsIndexPage implements AfterViewInit, OnDestroy {
         this.sections.destroy();
     }
 
-    /**
-     * Get the sections.
-     *
-     * @returns Sections.
-     */
-    protected getSections(): CoreSettingsSection[] {
-        const sections: CoreSettingsSection[] = [
-            {
-                name: 'core.settings.general',
-                path: 'general',
-                icon: 'fas-wrench',
-            },
-            {
-                name: 'core.settings.spaceusage',
-                path: 'spaceusage',
-                icon: 'fas-tasks',
-            },
-            {
-                name: 'core.settings.synchronization',
-                path: 'sync',
-                icon: CoreConstants.ICON_SYNC,
-            },
-        ];
-
-        if (CoreApp.isIOS()) {
-            sections.push({
-                name: 'core.sharedfiles.sharedfiles',
-                path: SHAREDFILES_PAGE_NAME + '/list/root',
-                icon: 'fas-folder',
-                params: { manage: true },
-            });
-        }
-
-        sections.push({
-            name: 'core.settings.about',
-            path: 'about',
-            icon: 'fas-id-card',
-        });
-
-        return sections;
-    }
-
 }
-
-/**
- * Helper class to manage sections.
- */
-class CoreSettingsSectionsManager extends CorePageItemsListManager<CoreSettingsSection> {
-
-    /**
-     * @inheritdoc
-     */
-    protected getItemPath(section: CoreSettingsSection): string {
-        return section.path;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected getItemQueryParams(section: CoreSettingsSection): Params {
-        return section.params || {};
-    }
-
-}
-
-/**
- * Settings section.
- */
-export type CoreSettingsSection = {
-    name: string;
-    path: string;
-    icon: string;
-    params?: Params;
-};
diff --git a/src/core/features/settings/pages/site/site.ts b/src/core/features/settings/pages/site/site.ts
index 77a366b73..4fc275b2e 100644
--- a/src/core/features/settings/pages/site/site.ts
+++ b/src/core/features/settings/pages/site/site.ts
@@ -13,10 +13,9 @@
 // limitations under the License.
 
 import { AfterViewInit, Component, OnDestroy, ViewChild } from '@angular/core';
-import { Params } from '@angular/router';
 import { IonRefresher } from '@ionic/angular';
 
-import { CoreSettingsDelegate, CoreSettingsHandlerToDisplay } from '../../services/settings-delegate';
+import { CoreSettingsHandlerToDisplay } from '../../services/settings-delegate';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
@@ -24,8 +23,10 @@ import { CoreSettingsHelper, CoreSiteSpaceUsage } from '../../services/settings-
 import { CoreApp } from '@services/app';
 import { Translate } from '@singletons';
 import { CoreNavigator } from '@services/navigator';
-import { CorePageItemsListManager } from '@classes/page-items-list-manager';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
+import { CoreListItemsManager } from '@classes/items-management/list-items-manager';
+import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
+import { CoreSettingsHandlersSource } from '@features/settings/classes/settings-handlers-source';
 
 /**
  * Page that displays the list of site settings pages.
@@ -38,7 +39,7 @@ export class CoreSitePreferencesPage implements AfterViewInit, OnDestroy {
 
     @ViewChild(CoreSplitViewComponent) splitView!: CoreSplitViewComponent;
 
-    handlers: CoreSettingsSitePreferencesManager;
+    handlers: CoreListItemsManager<CoreSettingsHandlerToDisplay>;
 
     isIOS: boolean;
     siteId: string;
@@ -51,10 +52,12 @@ export class CoreSitePreferencesPage implements AfterViewInit, OnDestroy {
     protected isDestroyed = false;
 
     constructor() {
-
         this.isIOS = CoreApp.isIOS();
         this.siteId = CoreSites.getCurrentSiteId();
-        this.handlers = new CoreSettingsSitePreferencesManager(CoreSitePreferencesPage);
+
+        const source = CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(CoreSettingsHandlersSource, []);
+
+        this.handlers = new CoreListItemsManager(source, CoreSitePreferencesPage);
 
         this.sitesObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, () => {
             this.refreshData();
@@ -70,14 +73,14 @@ export class CoreSitePreferencesPage implements AfterViewInit, OnDestroy {
         try {
             await this.fetchData();
         } finally {
-
             const handler = pageToOpen ? this.handlers.items.find(handler => handler.page == pageToOpen) : undefined;
 
             if (handler) {
-                this.handlers.select(handler);
                 this.handlers.watchSplitViewOutlet(this.splitView);
+
+                await this.handlers.select(handler);
             } else {
-                this.handlers.start(this.splitView);
+                await this.handlers.start(this.splitView);
             }
         }
     }
@@ -86,7 +89,7 @@ export class CoreSitePreferencesPage implements AfterViewInit, OnDestroy {
      * Fetch Data.
      */
     protected async fetchData(): Promise<void> {
-        this.handlers.setItems(CoreSettingsDelegate.getHandlers());
+        await this.handlers.load();
 
         this.spaceUsage = await CoreSettingsHelper.getSiteSpaceUsage(this.siteId);
     }
@@ -122,6 +125,7 @@ export class CoreSitePreferencesPage implements AfterViewInit, OnDestroy {
      * @param refresher Refresher.
      */
     refreshData(refresher?: IonRefresher): void {
+        this.handlers.getSource().setDirty(true);
         this.fetchData().finally(() => {
             refresher?.complete();
         });
@@ -171,24 +175,3 @@ export class CoreSitePreferencesPage implements AfterViewInit, OnDestroy {
     }
 
 }
-
-/**
- * Helper class to manage sections.
- */
-class CoreSettingsSitePreferencesManager extends CorePageItemsListManager<CoreSettingsHandlerToDisplay> {
-
-    /**
-     * @inheritdoc
-     */
-    protected getItemPath(handler: CoreSettingsHandlerToDisplay): string {
-        return handler.page;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected getItemQueryParams(handler: CoreSettingsHandlerToDisplay): Params {
-        return handler.params || {};
-    }
-
-}

From 1715c8cae5f700c9da556082bf158f12a06795a5 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 12 Jan 2022 14:46:44 +0100
Subject: [PATCH 0349/1008] MOBILE-3833 core: Remove deprecated list manager

---
 src/core/classes/page-items-list-manager.ts | 300 --------------------
 1 file changed, 300 deletions(-)
 delete mode 100644 src/core/classes/page-items-list-manager.ts

diff --git a/src/core/classes/page-items-list-manager.ts b/src/core/classes/page-items-list-manager.ts
deleted file mode 100644
index 920e7db66..000000000
--- a/src/core/classes/page-items-list-manager.ts
+++ /dev/null
@@ -1,300 +0,0 @@
-// (C) Copyright 2015 Moodle Pty Ltd.
-//
-// 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 { ActivatedRoute, ActivatedRouteSnapshot, Params, UrlSegment } from '@angular/router';
-import { Subscription } from 'rxjs';
-
-import { CoreSplitViewComponent } from '@components/split-view/split-view';
-import { CoreNavigator } from '@services/navigator';
-import { CoreScreen } from '@services/screen';
-import { CoreUtils } from '@services/utils/utils';
-
-/**
- * Helper class to manage the state and routing of a list of items in a page, for example on pages using a split view.
- *
- * @deprecated use CoreListItemsManager instead.
- */
-export abstract class CorePageItemsListManager<Item> {
-
-    protected itemsList: Item[] | null = null;
-    protected itemsMap: Record<string, Item> | null = null;
-    protected hasMoreItems = true;
-    protected selectedItem: Item | null = null;
-    protected pageRouteLocator?: unknown | ActivatedRoute;
-    protected splitView?: CoreSplitViewComponent;
-    protected splitViewOutletSubscription?: Subscription;
-
-    constructor(pageRouteLocator: unknown | ActivatedRoute) {
-        this.pageRouteLocator = pageRouteLocator;
-    }
-
-    get items(): Item[] {
-        return this.itemsList || [];
-    }
-
-    get loaded(): boolean {
-        return this.itemsMap !== null;
-    }
-
-    get completed(): boolean {
-        return !this.hasMoreItems;
-    }
-
-    get empty(): boolean {
-        return this.itemsList === null || this.itemsList.length === 0;
-    }
-
-    /**
-     * Process page started operations.
-     *
-     * @param splitView Split view component.
-     */
-    async start(splitView: CoreSplitViewComponent): Promise<void> {
-        this.watchSplitViewOutlet(splitView);
-
-        // Calculate current selected item.
-        const route = this.getCurrentPageRoute();
-        this.updateSelectedItem(route?.snapshot ?? null);
-
-        // Select default item if none is selected on a non-mobile layout.
-        if (!CoreScreen.isMobile && this.selectedItem === null && !splitView.isNested) {
-            const defaultItem = this.getDefaultItem();
-
-            if (defaultItem) {
-                this.select(defaultItem);
-            }
-        }
-
-        // Log activity.
-        await CoreUtils.ignoreErrors(this.logActivity());
-    }
-
-    /**
-     * Process page destroyed operations.
-     */
-    destroy(): void {
-        this.splitViewOutletSubscription?.unsubscribe();
-    }
-
-    /**
-     * Watch a split view outlet to keep track of the selected item.
-     *
-     * @param splitView Split view component.
-     */
-    watchSplitViewOutlet(splitView: CoreSplitViewComponent): void {
-        this.splitView = splitView;
-        this.splitViewOutletSubscription = splitView.outletRouteObservable.subscribe(
-            route => this.updateSelectedItem(this.getPageRouteFromSplitViewOutlet(route)),
-        );
-
-        this.updateSelectedItem(this.getPageRouteFromSplitViewOutlet(splitView.outletRoute) ?? null);
-    }
-
-    /**
-     * Reset items data.
-     */
-    resetItems(): void {
-        this.itemsList = null;
-        this.itemsMap = null;
-        this.hasMoreItems = true;
-        this.selectedItem = null;
-    }
-
-    /**
-     * Check whether the given item is selected or not.
-     *
-     * @param item Item.
-     * @return Whether the given item is selected.
-     */
-    isSelected(item: Item): boolean {
-        return this.selectedItem === item;
-    }
-
-    /**
-     * Return the current aria value.
-     *
-     * @param item Item.
-     * @return Will return the current value of the item if selected, false otherwise.
-     */
-    getItemAriaCurrent(item: Item): string {
-        return this.isSelected(item) ? 'page' : 'false';
-    }
-
-    /**
-     * Select an item.
-     *
-     * @param item Item.
-     */
-    async select(item: Item): Promise<void> {
-        // Get current route in the page.
-        const route = this.getCurrentPageRoute();
-
-        if (route === null) {
-            return;
-        }
-
-        // If this item is already selected, do nothing.
-        const itemPath = this.getItemPath(item);
-        const selectedItemPath = this.getSelectedItemPath(route.snapshot);
-
-        if (selectedItemPath === itemPath) {
-            return;
-        }
-
-        // Navigate to item.
-        const params = this.getItemQueryParams(item);
-        const reset = this.resetNavigation();
-        const pathPrefix = selectedItemPath ? selectedItemPath.split('/').fill('../').join('') : '';
-
-        await CoreNavigator.navigate(pathPrefix + itemPath, { params, reset });
-    }
-
-    /**
-     * Set the list of items.
-     *
-     * @param items Items.
-     * @param hasMoreItems Whether the list has more items that haven't been loaded.
-     */
-    setItems(items: Item[], hasMoreItems: boolean = false): void {
-        this.hasMoreItems = hasMoreItems;
-        this.itemsList = items.slice(0);
-        this.itemsMap = items.reduce((map, item) => {
-            map[this.getItemPath(item)] = item;
-
-            return map;
-        }, {});
-
-        this.updateSelectedItem(this.getPageRouteFromSplitViewOutlet(this.splitView?.outletRoute ?? null));
-    }
-
-    /**
-     * Log activity when the page starts.
-     */
-    protected async logActivity(): Promise<void> {
-        //
-    }
-
-    /**
-     * Update the selected item given the current route.
-     *
-     * @param route Current route.
-     */
-    protected updateSelectedItem(route: ActivatedRouteSnapshot | null): void {
-        const selectedItemPath = this.getSelectedItemPath(route);
-
-        this.selectedItem = selectedItemPath
-            ? this.itemsMap?.[selectedItemPath] ?? null
-            : null;
-    }
-
-    /**
-     * Check whether to reset navigation when selecting an item.
-     *
-     * @returns boolean Whether navigation should be reset.
-     */
-    protected resetNavigation(): boolean {
-        if (!CoreScreen.isTablet) {
-            return false;
-        }
-
-        return !!this.splitView && !this.splitView?.isNested;
-    }
-
-    /**
-     * Get the item that should be selected by default.
-     */
-    protected getDefaultItem(): Item | null {
-        return this.itemsList?.[0] || null;
-    }
-
-    /**
-     * Get the query parameters to use when navigating to an item page.
-     *
-     * @param item Item.
-     * @return Query parameters to use when navigating to the item page.
-     */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    protected getItemQueryParams(item: Item): Params {
-        return {};
-    }
-
-    /**
-     * Get the path to use when navigating to an item page.
-     *
-     * @param item Item.
-     * @return Path to use when navigating to the item page.
-     */
-    protected abstract getItemPath(item: Item): string;
-
-    /**
-     * Get the path of the selected item given the current route.
-     *
-     * @param route Page route.
-     * @return Path of the selected item in the given route.
-     */
-    protected getSelectedItemPath(route?: ActivatedRouteSnapshot | null): string | null {
-        const segments: UrlSegment[] = [];
-
-        while ((route = route?.firstChild)) {
-            segments.push(...route.url);
-        }
-
-        return segments.map(segment => segment.path).join('/').replace(/\/+/, '/').trim() || null;
-    }
-
-    /**
-     * Get page route.
-     *
-     * @returns Current page route, if any.
-     */
-    private getCurrentPageRoute(): ActivatedRoute | null {
-        if (this.pageRouteLocator instanceof ActivatedRoute) {
-            return CoreNavigator.isRouteActive(this.pageRouteLocator) ? this.pageRouteLocator : null;
-        }
-
-        return CoreNavigator.getCurrentRoute({ pageComponent: this.pageRouteLocator });
-    }
-
-    /**
-     * Get the page route given a child route on the splitview outlet.
-     *
-     * @param route Child route.
-     * @return Page route.
-     */
-    private getPageRouteFromSplitViewOutlet(route: ActivatedRouteSnapshot | null): ActivatedRouteSnapshot | null {
-        const isPageRoute = this.buildRouteMatcher();
-
-        while (route && !isPageRoute(route)) {
-            route = route.parent;
-        }
-
-        return route;
-    }
-
-    /**
-     * Build a function to check whether the given snapshot belongs to the page.
-     *
-     * @returns Route matcher.
-     */
-    private buildRouteMatcher(): (route: ActivatedRouteSnapshot) => boolean {
-        if (this.pageRouteLocator instanceof ActivatedRoute) {
-            const pageRoutePath = CoreNavigator.getRouteFullPath(this.pageRouteLocator.snapshot);
-
-            return route => CoreNavigator.getRouteFullPath(route) === pageRoutePath;
-        }
-
-        return route => route.component === this.pageRouteLocator;
-    }
-
-}

From 091cfd1a591eb35b852419dacb6cb8d6696f6dfd Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 14 Jan 2022 12:11:20 +0100
Subject: [PATCH 0350/1008] MOBILE-3959 android: Update Cordova Android to
 10.1.1

---
 .github/workflows/performance.yml |   4 +-
 .travis.yml                       |   1 +
 Dockerfile                        |   3 +-
 config.xml                        |   8 +-
 package-lock.json                 | 818 +++++++-----------------------
 package.json                      |   8 +-
 6 files changed, 207 insertions(+), 635 deletions(-)

diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml
index 923c2d09f..d15a45abb 100644
--- a/.github/workflows/performance.yml
+++ b/.github/workflows/performance.yml
@@ -22,7 +22,9 @@ jobs:
         git clone --branch integration --depth 1 https://github.com/moodlehq/moodle-local_moodlemobileapp $GITHUB_WORKSPACE/moodle/local/moodlemobileapp
         git clone --branch master --depth 1 https://github.com/moodlehq/moodle-docker $GITHUB_WORKSPACE/moodle-docker
     - name: Install npm packages
-      run: npm ci
+      run: |
+        npm install -g npm@7
+        npm ci --no-audit
     - name: Generate Behat tests plugin
       run: |
         export MOODLE_DOCKER_WWWROOT=$GITHUB_WORKSPACE/moodle
diff --git a/.travis.yml b/.travis.yml
index 67d72aed6..c2f2fe03c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,6 +24,7 @@ before_install:
   - npm --version
   - nvm --version
   - npm ci
+  - yes | sdkmanager "build-tools;30.0.3"
 
 before_script:
   - npx gulp
diff --git a/Dockerfile b/Dockerfile
index 82f4e6ec9..f0b8c56b0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,8 @@ WORKDIR /app
 # Prepare node dependencies
 RUN apt-get update && apt-get install libsecret-1-0 -y
 COPY package*.json ./
-RUN npm ci
+RUN npm install -g npm@7
+RUN npm ci --no-audit
 
 # Build source
 ARG build_command="npm run build:prod"
diff --git a/config.xml b/config.xml
index af78de0e8..93851de9e 100644
--- a/config.xml
+++ b/config.xml
@@ -49,6 +49,8 @@
     <preference name="WKWebViewOnly" value="true" />
     <preference name="WKFullScreenEnabled" value="true" />
     <preference name="AndroidXEnabled" value="true" />
+    <preference name="GradlePluginGoogleServicesEnabled" value="true" />
+    <preference name="GradlePluginGoogleServicesVersion" value="4.3.10" />
     <feature name="StatusBar">
         <param name="ios-package" onload="true" value="CDVStatusBar" />
     </feature>
@@ -188,12 +190,6 @@
                 <param name="onload" value="true" />
             </feature>
         </config-file>
-        <config-file parent="/*" target="res/xml/config.xml">
-            <feature name="Whitelist">
-                <param name="android-package" value="org.apache.cordova.whitelist.WhitelistPlugin" />
-                <param name="onload" value="true" />
-            </feature>
-        </config-file>
         <config-file parent="/*" target="res/xml/config.xml">
             <feature name="SQLitePlugin">
                 <param name="android-package" value="io.sqlc.SQLitePlugin" />
diff --git a/package-lock.json b/package-lock.json
index 7871f8a11..90c0ebb27 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -43,7 +43,7 @@
         "@ionic-native/web-intent": "^5.33.0",
         "@ionic-native/zip": "^5.33.0",
         "@ionic/angular": "^5.9.2",
-        "@moodlehq/cordova-plugin-file-transfer": "1.7.1-moodle.2",
+        "@moodlehq/cordova-plugin-file-transfer": "1.7.1-moodle.5",
         "@moodlehq/cordova-plugin-inappbrowser": "5.0.0-moodle.3",
         "@moodlehq/cordova-plugin-ionic-webview": "5.0.0-moodle.1",
         "@moodlehq/cordova-plugin-local-notification": "0.9.0-moodle.3",
@@ -58,7 +58,7 @@
         "chart.js": "^2.9.4",
         "com-darryncampbell-cordova-plugin-intent": "^1.3.0",
         "cordova": "^10.0.0",
-        "cordova-android": "^9.1.0",
+        "cordova-android": "^10.1.1",
         "cordova-android-support-gradle-release": "^3.0.1",
         "cordova-clipboard": "^1.3.0",
         "cordova-ios": "^6.2.0",
@@ -80,7 +80,6 @@
         "cordova-plugin-prevent-override": "^1.0.0",
         "cordova-plugin-splashscreen": "^6.0.0",
         "cordova-plugin-statusbar": "^2.4.3",
-        "cordova-plugin-whitelist": "^1.3.4",
         "cordova-plugin-wkuserscript": "^1.0.0",
         "cordova-plugin-wkwebview-cookies": "^1.0.0",
         "cordova-sqlite-storage": "^6.0.0",
@@ -5109,9 +5108,9 @@
       }
     },
     "node_modules/@moodlehq/cordova-plugin-file-transfer": {
-      "version": "1.7.1-moodle.2",
-      "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-file-transfer/-/cordova-plugin-file-transfer-1.7.1-moodle.2.tgz",
-      "integrity": "sha512-nvddQelAwPXmvjv0YJJwuf2xFNi78ZmTa47BgtHGebOvdKpmcbphkOQAVN7KMheL4J3KNE9DbMBHwEHkGGkH4g==",
+      "version": "1.7.1-moodle.5",
+      "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-file-transfer/-/cordova-plugin-file-transfer-1.7.1-moodle.5.tgz",
+      "integrity": "sha512-1JzvVTLw2V7Pjo+uOXXaMneNR1UpEc9CLD/lsZi8njMe393THr/nfmgOkfmrrtMhIdfDCY1i+ygg1N5Z/D//Kg==",
       "engines": {
         "cordovaDependencies": {
           "3.0.0": {
@@ -6857,9 +6856,9 @@
       "dev": true
     },
     "node_modules/android-versions": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-1.6.0.tgz",
-      "integrity": "sha512-ojC2Ig7b/KJ6iNtR8e4bacmOsJyEkoERk3CKMIsnH7kJz5z6551NMbrVaRb7KXYavu1d74Uhml/bfcmqT3nAcg==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-1.7.0.tgz",
+      "integrity": "sha512-TCy4b8Dk8YS6A23ZPfhSKqK66JHFq0D8avGYiwvYpjno6HrrcI0DRgHx9+jtkvWYmrsE2vQWgbHJhvGGhhOb0g==",
       "dependencies": {
         "semver": "^5.7.1"
       }
@@ -10506,26 +10505,24 @@
       }
     },
     "node_modules/cordova-android": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-9.1.0.tgz",
-      "integrity": "sha512-bzOX9E4eQsOSpa06oZZ7XAGq3DwB73juhhj0oPqHH/khWk0mkCD4aiVYMFoc0fmIaSQvzbY1ww7L6UBW5pyGfg==",
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-10.1.1.tgz",
+      "integrity": "sha512-eoJp5AcDMHniqmxj0CbUF/rVQfbbp108TWKU6oyJW9rl/ZTJqZxm5ybznl+1/1MBksklxhMeipMn0Iwd0kEzEQ==",
       "dependencies": {
-        "android-versions": "^1.5.0",
-        "cordova-common": "^4.0.1",
-        "execa": "^4.0.2",
-        "fast-glob": "^3.2.4",
-        "fs-extra": "^9.0.1",
-        "is-path-inside": "^3.0.2",
-        "nopt": "^4.0.3",
+        "android-versions": "^1.7.0",
+        "cordova-common": "^4.0.2",
+        "execa": "^5.1.1",
+        "fast-glob": "^3.2.7",
+        "fs-extra": "^10.0.0",
+        "is-path-inside": "^3.0.3",
+        "nopt": "^5.0.0",
         "properties-parser": "^0.3.1",
-        "semver": "^7.3.4",
+        "semver": "^7.3.5",
+        "untildify": "^4.0.0",
         "which": "^2.0.2"
       },
-      "bin": {
-        "create": "bin/create"
-      },
       "engines": {
-        "node": ">=10.10.0"
+        "node": ">=12.0.0"
       }
     },
     "node_modules/cordova-android-support-gradle-release": {
@@ -10545,6 +10542,74 @@
         "semver": "bin/semver"
       }
     },
+    "node_modules/cordova-android/node_modules/execa": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/cordova-android/node_modules/fs-extra": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
+      "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/cordova-android/node_modules/get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cordova-android/node_modules/human-signals": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+      "engines": {
+        "node": ">=10.17.0"
+      }
+    },
+    "node_modules/cordova-android/node_modules/nopt": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
+      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
+      "dependencies": {
+        "abbrev": "1"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/cordova-android/node_modules/semver": {
       "version": "7.3.5",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
@@ -11241,21 +11306,6 @@
         }
       }
     },
-    "node_modules/cordova-plugin-whitelist": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.4.tgz",
-      "integrity": "sha512-EYC5eQFVkoYXq39l7tYKE6lEjHJ04mvTmKXxGL7quHLdFPfJMNzru/UYpn92AOfpl3PQaZmou78C7EgmFOwFQQ==",
-      "engines": {
-        "cordovaDependencies": {
-          "0.0.0": {
-            "cordova-android": ">=4.0.0"
-          },
-          "2.0.0": {
-            "cordova": ">100"
-          }
-        }
-      }
-    },
     "node_modules/cordova-plugin-wkuserscript": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/cordova-plugin-wkuserscript/-/cordova-plugin-wkuserscript-1.0.0.tgz",
@@ -14102,19 +14152,18 @@
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
     "node_modules/fast-glob": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz",
-      "integrity": "sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==",
+      "version": "3.2.10",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.10.tgz",
+      "integrity": "sha512-s9nFhFnvR63wls6/kM88kQqDhMu0AfdjqouE2l5GVQPbqLgyFjjU5ry/r2yKsJxpb9Py1EYNqieFrmMaX4v++A==",
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.0",
+        "glob-parent": "^5.1.2",
         "merge2": "^1.3.0",
-        "micromatch": "^4.0.2",
-        "picomatch": "^2.2.1"
+        "micromatch": "^4.0.4"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=8.6.0"
       }
     },
     "node_modules/fast-json-parse": {
@@ -14622,6 +14671,7 @@
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.2.tgz",
       "integrity": "sha512-V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q==",
+      "deprecated": "Please upgrade to latest, formidable@v2 or formidable@v3! Check these notes: https://bit.ly/2ZEqIau",
       "dev": true,
       "funding": {
         "url": "https://ko-fi.com/tunnckoCore/commissions"
@@ -15033,9 +15083,9 @@
       }
     },
     "node_modules/glob-parent": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
-      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dependencies": {
         "is-glob": "^4.0.1"
       },
@@ -17531,9 +17581,9 @@
       }
     },
     "node_modules/is-path-inside": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz",
-      "integrity": "sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
       "engines": {
         "node": ">=8"
       }
@@ -20562,15 +20612,15 @@
       }
     },
     "node_modules/micromatch": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-      "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
       "dependencies": {
         "braces": "^3.0.1",
-        "picomatch": "^2.0.5"
+        "picomatch": "^2.2.3"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=8.6"
       }
     },
     "node_modules/miller-rabin": {
@@ -22817,9 +22867,9 @@
       "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
     "node_modules/picomatch": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
-      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "engines": {
         "node": ">=8.6"
       },
@@ -24554,6 +24604,7 @@
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.3.1.tgz",
       "integrity": "sha512-mLUDsD5JVtlZxjSlPPx1RETkNjjvQYuweKwNVt1Sn8kP5Jh44pvYuUHCp6xSVDZWbNxVxG5lyZJ921aJH61sTw==",
+      "deprecated": "The functionality that this package provided is now in @npmcli/arborist",
       "dev": true,
       "dependencies": {
         "read-package-json": "^2.0.0",
@@ -26682,6 +26733,7 @@
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
       "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+      "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
       "dev": true,
       "dependencies": {
         "atob": "^2.1.2",
@@ -26714,6 +26766,7 @@
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
       "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
+      "deprecated": "See https://github.com/lydell/source-map-url#deprecated",
       "dev": true
     },
     "node_modules/sourcemap-codec": {
@@ -27500,6 +27553,7 @@
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/superagent/-/superagent-5.3.1.tgz",
       "integrity": "sha512-wjJ/MoTid2/RuGCOFtlacyGNxN9QLMgcpYLDQlWFIhhdJ93kNscFonGvrpAHSCVjRVj++DGCglocF7Aej1KHvQ==",
+      "deprecated": "Please upgrade to v7.0.2+ of superagent.  We have fixed numerous issues with streams, form-data, attach(), filesystem errors not bubbling up (ENOENT on attach()), and all tests are now passing.  See the releases tab for more information at <https://github.com/visionmedia/superagent/releases>. Thanks to @shadowgate15, @spence-s, and @niftylettuce. Superagent is sponsored by Forward Email at <https://forwardemail.net>.",
       "dev": true,
       "dependencies": {
         "component-emitter": "^1.3.0",
@@ -27665,6 +27719,7 @@
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
       "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
+      "deprecated": "This SVGO version is no longer supported. Upgrade to v2.x.x.",
       "dev": true,
       "dependencies": {
         "chalk": "^2.4.1",
@@ -29049,7 +29104,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
       "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -29462,287 +29516,6 @@
         "watchpack-chokidar2": "^2.0.0"
       }
     },
-    "node_modules/watchpack-chokidar2": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz",
-      "integrity": "sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "chokidar": "^2.1.8"
-      },
-      "engines": {
-        "node": "<8.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/anymatch": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "micromatch": "^3.1.4",
-        "normalize-path": "^2.1.1"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/anymatch/node_modules/normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/binary-extensions": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/chokidar": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-      "deprecated": "Chokidar 2 will break on node v14+. Upgrade to chokidar 3 with 15x less dependencies.",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "anymatch": "^2.0.0",
-        "async-each": "^1.0.1",
-        "braces": "^2.3.2",
-        "glob-parent": "^3.1.0",
-        "inherits": "^2.0.3",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "normalize-path": "^3.0.0",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.2.1",
-        "upath": "^1.1.1"
-      },
-      "optionalDependencies": {
-        "fsevents": "^1.2.7"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/fsevents": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-      "deprecated": "fsevents 1 will break on node v14+ and could be using insecure binaries. Upgrade to fsevents 2.",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "dependencies": {
-        "bindings": "^1.5.0",
-        "nan": "^2.12.1"
-      },
-      "engines": {
-        "node": ">= 4.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/glob-parent": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/glob-parent/node_modules/is-glob": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "is-extglob": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/is-binary-path": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "binary-extensions": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/readdirp": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.11",
-        "micromatch": "^3.1.10",
-        "readable-stream": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/wbuf": {
       "version": "1.7.3",
       "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
@@ -35191,9 +34964,9 @@
       }
     },
     "@moodlehq/cordova-plugin-file-transfer": {
-      "version": "1.7.1-moodle.2",
-      "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-file-transfer/-/cordova-plugin-file-transfer-1.7.1-moodle.2.tgz",
-      "integrity": "sha512-nvddQelAwPXmvjv0YJJwuf2xFNi78ZmTa47BgtHGebOvdKpmcbphkOQAVN7KMheL4J3KNE9DbMBHwEHkGGkH4g=="
+      "version": "1.7.1-moodle.5",
+      "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-file-transfer/-/cordova-plugin-file-transfer-1.7.1-moodle.5.tgz",
+      "integrity": "sha512-1JzvVTLw2V7Pjo+uOXXaMneNR1UpEc9CLD/lsZi8njMe393THr/nfmgOkfmrrtMhIdfDCY1i+ygg1N5Z/D//Kg=="
     },
     "@moodlehq/cordova-plugin-inappbrowser": {
       "version": "5.0.0-moodle.3",
@@ -36503,9 +36276,9 @@
       "dev": true
     },
     "android-versions": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-1.6.0.tgz",
-      "integrity": "sha512-ojC2Ig7b/KJ6iNtR8e4bacmOsJyEkoERk3CKMIsnH7kJz5z6551NMbrVaRb7KXYavu1d74Uhml/bfcmqT3nAcg==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-1.7.0.tgz",
+      "integrity": "sha512-TCy4b8Dk8YS6A23ZPfhSKqK66JHFq0D8avGYiwvYpjno6HrrcI0DRgHx9+jtkvWYmrsE2vQWgbHJhvGGhhOb0g==",
       "requires": {
         "semver": "^5.7.1"
       },
@@ -39421,22 +39194,67 @@
       }
     },
     "cordova-android": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-9.1.0.tgz",
-      "integrity": "sha512-bzOX9E4eQsOSpa06oZZ7XAGq3DwB73juhhj0oPqHH/khWk0mkCD4aiVYMFoc0fmIaSQvzbY1ww7L6UBW5pyGfg==",
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-10.1.1.tgz",
+      "integrity": "sha512-eoJp5AcDMHniqmxj0CbUF/rVQfbbp108TWKU6oyJW9rl/ZTJqZxm5ybznl+1/1MBksklxhMeipMn0Iwd0kEzEQ==",
       "requires": {
-        "android-versions": "^1.5.0",
-        "cordova-common": "^4.0.1",
-        "execa": "^4.0.2",
-        "fast-glob": "^3.2.4",
-        "fs-extra": "^9.0.1",
-        "is-path-inside": "^3.0.2",
-        "nopt": "^4.0.3",
+        "android-versions": "^1.7.0",
+        "cordova-common": "^4.0.2",
+        "execa": "^5.1.1",
+        "fast-glob": "^3.2.7",
+        "fs-extra": "^10.0.0",
+        "is-path-inside": "^3.0.3",
+        "nopt": "^5.0.0",
         "properties-parser": "^0.3.1",
-        "semver": "^7.3.4",
+        "semver": "^7.3.5",
+        "untildify": "^4.0.0",
         "which": "^2.0.2"
       },
       "dependencies": {
+        "execa": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+          "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+          "requires": {
+            "cross-spawn": "^7.0.3",
+            "get-stream": "^6.0.0",
+            "human-signals": "^2.1.0",
+            "is-stream": "^2.0.0",
+            "merge-stream": "^2.0.0",
+            "npm-run-path": "^4.0.1",
+            "onetime": "^5.1.2",
+            "signal-exit": "^3.0.3",
+            "strip-final-newline": "^2.0.0"
+          }
+        },
+        "fs-extra": {
+          "version": "10.0.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
+          "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
+          "requires": {
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^6.0.1",
+            "universalify": "^2.0.0"
+          }
+        },
+        "get-stream": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+          "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="
+        },
+        "human-signals": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+          "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="
+        },
+        "nopt": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
+          "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
+          "requires": {
+            "abbrev": "1"
+          }
+        },
         "semver": {
           "version": "7.3.5",
           "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
@@ -39901,11 +39719,6 @@
       "resolved": "https://registry.npmjs.org/cordova-plugin-statusbar/-/cordova-plugin-statusbar-2.4.3.tgz",
       "integrity": "sha512-ThmXzl6QIKWFXf4wWw7Q/zpB+VKkz3VM958+5A0sXD4jmR++u7KnGttLksXshVwWr6lvGwUebLYtIyXwS4Ovcg=="
     },
-    "cordova-plugin-whitelist": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.4.tgz",
-      "integrity": "sha512-EYC5eQFVkoYXq39l7tYKE6lEjHJ04mvTmKXxGL7quHLdFPfJMNzru/UYpn92AOfpl3PQaZmou78C7EgmFOwFQQ=="
-    },
     "cordova-plugin-wkuserscript": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/cordova-plugin-wkuserscript/-/cordova-plugin-wkuserscript-1.0.0.tgz",
@@ -42172,16 +41985,15 @@
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
     "fast-glob": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz",
-      "integrity": "sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==",
+      "version": "3.2.10",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.10.tgz",
+      "integrity": "sha512-s9nFhFnvR63wls6/kM88kQqDhMu0AfdjqouE2l5GVQPbqLgyFjjU5ry/r2yKsJxpb9Py1EYNqieFrmMaX4v++A==",
       "requires": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.0",
+        "glob-parent": "^5.1.2",
         "merge2": "^1.3.0",
-        "micromatch": "^4.0.2",
-        "picomatch": "^2.2.1"
+        "micromatch": "^4.0.4"
       }
     },
     "fast-json-parse": {
@@ -42910,9 +42722,9 @@
       }
     },
     "glob-parent": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
-      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "requires": {
         "is-glob": "^4.0.1"
       }
@@ -44919,9 +44731,9 @@
       }
     },
     "is-path-inside": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz",
-      "integrity": "sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg=="
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="
     },
     "is-plain-obj": {
       "version": "1.1.0",
@@ -47307,12 +47119,12 @@
       "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
     },
     "micromatch": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-      "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
       "requires": {
         "braces": "^3.0.1",
-        "picomatch": "^2.0.5"
+        "picomatch": "^2.2.3"
       }
     },
     "miller-rabin": {
@@ -49143,9 +48955,9 @@
       "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
     "picomatch": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
-      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
     },
     "pify": {
       "version": "4.0.1",
@@ -54153,8 +53965,7 @@
     "untildify": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
-      "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
-      "dev": true
+      "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw=="
     },
     "upath": {
       "version": "1.2.0",
@@ -54503,243 +54314,6 @@
         "watchpack-chokidar2": "^2.0.0"
       }
     },
-    "watchpack-chokidar2": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz",
-      "integrity": "sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "chokidar": "^2.1.8"
-      },
-      "dependencies": {
-        "anymatch": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "micromatch": "^3.1.4",
-            "normalize-path": "^2.1.1"
-          },
-          "dependencies": {
-            "normalize-path": {
-              "version": "2.1.1",
-              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-              "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "remove-trailing-separator": "^1.0.1"
-              }
-            }
-          }
-        },
-        "binary-extensions": {
-          "version": "1.13.1",
-          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-          "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-          "dev": true,
-          "optional": true
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "chokidar": {
-          "version": "2.1.8",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "anymatch": "^2.0.0",
-            "async-each": "^1.0.1",
-            "braces": "^2.3.2",
-            "fsevents": "^1.2.7",
-            "glob-parent": "^3.1.0",
-            "inherits": "^2.0.3",
-            "is-binary-path": "^1.0.0",
-            "is-glob": "^4.0.0",
-            "normalize-path": "^3.0.0",
-            "path-is-absolute": "^1.0.0",
-            "readdirp": "^2.2.1",
-            "upath": "^1.1.1"
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fsevents": {
-          "version": "1.2.13",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "bindings": "^1.5.0",
-            "nan": "^2.12.1"
-          }
-        },
-        "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
-          },
-          "dependencies": {
-            "is-glob": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "is-extglob": "^2.1.0"
-              }
-            }
-          }
-        },
-        "is-binary-path": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-          "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "binary-extensions": "^1.0.0"
-          }
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true,
-          "optional": true
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
-        },
-        "readdirp": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-          "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "graceful-fs": "^4.1.11",
-            "micromatch": "^3.1.10",
-            "readable-stream": "^2.0.2"
-          }
-        },
-        "to-regex-range": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
-        }
-      }
-    },
     "wbuf": {
       "version": "1.7.3",
       "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
diff --git a/package.json b/package.json
index a0b638549..9b916d962 100644
--- a/package.json
+++ b/package.json
@@ -72,11 +72,12 @@
     "@ionic-native/web-intent": "^5.33.0",
     "@ionic-native/zip": "^5.33.0",
     "@ionic/angular": "^5.9.2",
-    "@moodlehq/cordova-plugin-file-transfer": "1.7.1-moodle.2",
+    "@moodlehq/cordova-plugin-file-transfer": "1.7.1-moodle.5",
     "@moodlehq/cordova-plugin-inappbrowser": "5.0.0-moodle.3",
     "@moodlehq/cordova-plugin-ionic-webview": "5.0.0-moodle.1",
     "@moodlehq/cordova-plugin-local-notification": "0.9.0-moodle.3",
     "@moodlehq/cordova-plugin-qrscanner": "3.0.1-moodle.2",
+    "@moodlehq/cordova-plugin-zip": "3.1.0-moodle.1",
     "@moodlehq/phonegap-plugin-push": "2.0.0-moodle.2",
     "@ngx-translate/core": "^13.0.0",
     "@ngx-translate/http-loader": "^6.0.0",
@@ -86,7 +87,7 @@
     "chart.js": "^2.9.4",
     "com-darryncampbell-cordova-plugin-intent": "^1.3.0",
     "cordova": "^10.0.0",
-    "cordova-android": "^9.1.0",
+    "cordova-android": "^10.1.1",
     "cordova-android-support-gradle-release": "^3.0.1",
     "cordova-clipboard": "^1.3.0",
     "cordova-ios": "^6.2.0",
@@ -108,10 +109,8 @@
     "cordova-plugin-prevent-override": "^1.0.0",
     "cordova-plugin-splashscreen": "^6.0.0",
     "cordova-plugin-statusbar": "^2.4.3",
-    "cordova-plugin-whitelist": "^1.3.4",
     "cordova-plugin-wkuserscript": "^1.0.0",
     "cordova-plugin-wkwebview-cookies": "^1.0.0",
-    "@moodlehq/cordova-plugin-zip": "3.1.0-moodle.1",
     "cordova-sqlite-storage": "^6.0.0",
     "cordova-support-google-services": "^1.2.1",
     "cordova.plugins.diagnostic": "^5.0.2",
@@ -219,7 +218,6 @@
       "@moodlehq/cordova-plugin-qrscanner": {},
       "cordova-plugin-splashscreen": {},
       "cordova-plugin-statusbar": {},
-      "cordova-plugin-whitelist": {},
       "cordova-plugin-wkuserscript": {},
       "cordova-plugin-wkwebview-cookies": {},
       "@moodlehq/cordova-plugin-zip": {},

From d3dd4ceb0f74c067c9963dc187bc3f86aa2338bc Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 14 Jan 2022 12:11:45 +0100
Subject: [PATCH 0351/1008] MOBILE-3959 config: Bump CFBundleShortVersionString

---
 config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.xml b/config.xml
index 93851de9e..0b35bc461 100644
--- a/config.xml
+++ b/config.xml
@@ -255,7 +255,7 @@
             <true />
         </edit-config>
         <edit-config file="*-Info.plist" mode="merge" target="CFBundleShortVersionString">
-            <string>3.9.5</string>
+            <string>4.0.0</string>
         </edit-config>
         <edit-config file="*-Info.plist" mode="overwrite" target="CFBundleLocalizations">
             <array>

From 3ab38b9b9764fad5b1b4d65f808c63dab150a35f Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 14 Jan 2022 14:50:56 +0100
Subject: [PATCH 0352/1008] MOBILE-3959 android: Remove
 cordova-android-support-gradle-release

---
 package-lock.json | 34 ----------------------------------
 package.json      |  4 ----
 2 files changed, 38 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 90c0ebb27..25864fadb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -59,7 +59,6 @@
         "com-darryncampbell-cordova-plugin-intent": "^1.3.0",
         "cordova": "^10.0.0",
         "cordova-android": "^10.1.1",
-        "cordova-android-support-gradle-release": "^3.0.1",
         "cordova-clipboard": "^1.3.0",
         "cordova-ios": "^6.2.0",
         "cordova-plugin-add-swift-support": "^2.0.2",
@@ -10525,23 +10524,6 @@
         "node": ">=12.0.0"
       }
     },
-    "node_modules/cordova-android-support-gradle-release": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/cordova-android-support-gradle-release/-/cordova-android-support-gradle-release-3.0.1.tgz",
-      "integrity": "sha512-RSW55DkSckmqhX/kjj+a1YeVdy7s/AtlZn6Qa5XMQmmA4Iogq+IF2jvInZqzCF19DbI5YE95AP7VDbRk+DdDRw==",
-      "dependencies": {
-        "q": "^1.4.1",
-        "semver": "5.6.0"
-      }
-    },
-    "node_modules/cordova-android-support-gradle-release/node_modules/semver": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
-      "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
     "node_modules/cordova-android/node_modules/execa": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
@@ -39265,22 +39247,6 @@
         }
       }
     },
-    "cordova-android-support-gradle-release": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/cordova-android-support-gradle-release/-/cordova-android-support-gradle-release-3.0.1.tgz",
-      "integrity": "sha512-RSW55DkSckmqhX/kjj+a1YeVdy7s/AtlZn6Qa5XMQmmA4Iogq+IF2jvInZqzCF19DbI5YE95AP7VDbRk+DdDRw==",
-      "requires": {
-        "q": "^1.4.1",
-        "semver": "5.6.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "5.6.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
-          "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="
-        }
-      }
-    },
     "cordova-app-hello-world": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-5.0.0.tgz",
diff --git a/package.json b/package.json
index 9b916d962..caee985fb 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,6 @@
     "com-darryncampbell-cordova-plugin-intent": "^1.3.0",
     "cordova": "^10.0.0",
     "cordova-android": "^10.1.1",
-    "cordova-android-support-gradle-release": "^3.0.1",
     "cordova-clipboard": "^1.3.0",
     "cordova-ios": "^6.2.0",
     "cordova-plugin-add-swift-support": "^2.0.2",
@@ -229,9 +228,6 @@
       },
       "com-darryncampbell-cordova-plugin-intent": {},
       "nl.kingsquare.cordova.background-audio": {},
-      "cordova-android-support-gradle-release": {
-        "ANDROID_SUPPORT_VERSION": "27.+"
-      },
       "cordova.plugins.diagnostic": {
         "ANDROID_SUPPORT_VERSION": "28.+"
       },

From 1bd7aa9b97a47f81baa2dbc0c05446e1ef9e713f Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Mon, 17 Jan 2022 18:08:26 +0100
Subject: [PATCH 0353/1008] MOBILE-3833 core: Add helpers to patch config

---
 src/core/constants.ts | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/core/constants.ts b/src/core/constants.ts
index 6df64e291..a4f6a7c32 100644
--- a/src/core/constants.ts
+++ b/src/core/constants.ts
@@ -131,9 +131,26 @@ export class CoreConstants {
     static readonly MOD_ARCHETYPE_SYSTEM = 3; // System (not user-addable) module archetype.
 
     // Config & environment constants.
-    static readonly CONFIG = envJson.config as unknown as EnvironmentConfig; // Data parsed from config.json files.
+    static readonly CONFIG = { ...envJson.config } as unknown as EnvironmentConfig; // Data parsed from config.json files.
     static readonly BUILD = envJson.build as unknown as EnvironmentBuild; // Build info.
 
+    /**
+     * Update config with the given values.
+     *
+     * @param config Config updates.
+     */
+    static patchConfig(config: Partial<EnvironmentConfig>): void {
+        Object.assign(this.CONFIG, config);
+    }
+
+    /**
+     * Reset config values to its original state.
+     */
+    static resetConfig(): void {
+        Object.keys(this.CONFIG).forEach(key => delete this.CONFIG[key]);
+        Object.assign(this.CONFIG, envJson.config);
+    }
+
 }
 
 interface EnvironmentBuild {

From c1a83f5df0c1d7d1d1b5614bc6e7e98ffec6b57c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 18 Jan 2022 08:31:21 +0100
Subject: [PATCH 0354/1008] MOBILE-3833 mainmenu: Fix no tab selected on start

---
 src/core/features/mainmenu/pages/menu/menu.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/core/features/mainmenu/pages/menu/menu.ts b/src/core/features/mainmenu/pages/menu/menu.ts
index d2b74958b..409bc3c9d 100644
--- a/src/core/features/mainmenu/pages/menu/menu.ts
+++ b/src/core/features/mainmenu/pages/menu/menu.ts
@@ -138,7 +138,7 @@ export class CoreMainMenuPage implements OnInit, OnDestroy {
     /**
      * Init handlers on change (size or handlers).
      */
-    initHandlers(): void {
+    async initHandlers(): Promise<void> {
         if (!this.allHandlers) {
             return;
         }
@@ -175,6 +175,7 @@ export class CoreMainMenuPage implements OnInit, OnDestroy {
 
         if (this.loaded && this.tabs[0] && !CoreNavigator.getCurrentMainMenuTab()) {
             // No tab selected, select the first one.
+            await CoreUtils.nextTick();
             this.mainTabs?.select(this.tabs[0].page);
         }
     }

From 9c1553c46b60588b6519566e09c17565915df3b8 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 18 Jan 2022 08:42:25 +0100
Subject: [PATCH 0355/1008] MOBILE-3833 mycourses: Fix close app using back
 button

---
 src/addons/privatefiles/privatefiles-lazy.module.ts | 4 ----
 src/core/features/courses/pages/my/my.module.ts     | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/addons/privatefiles/privatefiles-lazy.module.ts b/src/addons/privatefiles/privatefiles-lazy.module.ts
index 5791c5dc0..a5a507655 100644
--- a/src/addons/privatefiles/privatefiles-lazy.module.ts
+++ b/src/addons/privatefiles/privatefiles-lazy.module.ts
@@ -16,15 +16,11 @@ import { Injector, NgModule } from '@angular/core';
 import { RouterModule, ROUTES, Routes } from '@angular/router';
 
 import { buildTabMainRoutes } from '@features/mainmenu/mainmenu-tab-routing.module';
-import { AddonPrivateFilesUserHandlerService } from './services/handlers/user';
 
 function buildRoutes(injector: Injector): Routes {
     return [
         {
             path: 'root',
-            data: {
-                mainMenuTabRoot: AddonPrivateFilesUserHandlerService.PAGE_NAME,
-            },
             loadChildren: () => import('./pages/index/index.module').then(m => m.AddonPrivateFilesIndexPageModule),
         },
         {
diff --git a/src/core/features/courses/pages/my/my.module.ts b/src/core/features/courses/pages/my/my.module.ts
index a86c67dff..c6ed5b0b3 100644
--- a/src/core/features/courses/pages/my/my.module.ts
+++ b/src/core/features/courses/pages/my/my.module.ts
@@ -21,12 +21,16 @@ import { CoreBlockComponentsModule } from '@features/block/components/components
 import { CoreCoursesMyCoursesPage } from './my';
 import { CoreMainMenuComponentsModule } from '@features/mainmenu/components/components.module';
 import { buildTabMainRoutes } from '@features/mainmenu/mainmenu-tab-routing.module';
+import { CoreCoursesMyCoursesMainMenuHandlerService } from '@features/courses/services/handlers/my-courses-mainmenu';
 
 function buildRoutes(injector: Injector): Routes {
     return [
         {
             path: '',
             component: CoreCoursesMyCoursesPage,
+            data: {
+                mainMenuTabRoot: CoreCoursesMyCoursesMainMenuHandlerService.PAGE_NAME,
+            },
         },
         {
             path: 'list',

From 396d221961cce17e13f0042cf628b1545ee4ffd4 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 18 Jan 2022 10:33:46 +0100
Subject: [PATCH 0356/1008] MOBILE-3833 core: Fix unable to reconnect
 (main/subscription path)

---
 src/core/classes/delegate-sorted.ts | 2 ++
 src/core/services/navigator.ts      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/core/classes/delegate-sorted.ts b/src/core/classes/delegate-sorted.ts
index d9e6069d7..194a9ff2e 100644
--- a/src/core/classes/delegate-sorted.ts
+++ b/src/core/classes/delegate-sorted.ts
@@ -46,6 +46,8 @@ export class CoreSortedDelegate<
                 this.clearSortedHandlers();
             }
         });
+        // Clear loaded handlers on login, there could be an invalid list loaded when user reconnects after token expired.
+        CoreEvents.on(CoreEvents.LOGIN, this.clearSortedHandlers.bind(this));
     }
 
     /**
diff --git a/src/core/services/navigator.ts b/src/core/services/navigator.ts
index a807a74ee..344ad2822 100644
--- a/src/core/services/navigator.ts
+++ b/src/core/services/navigator.ts
@@ -581,7 +581,7 @@ export class CoreNavigatorService {
             return '';
         }
 
-        const handlers = CoreMainMenuDelegate.getHandlers();
+        const handlers = CoreMainMenuDelegate.getHandlers().filter((handler) => !handler.onlyInMore);
 
         return handlers[0]?.page || '';
     }

From fbf9d6c7fa00427fa80cd232abac5096b33fd37f Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 18 Jan 2022 12:51:28 +0100
Subject: [PATCH 0357/1008] MOBILE-3715 login: Show error if SSO login with
 external app

---
 scripts/langindex.json   |  1 +
 src/app/app.component.ts | 15 ++++++++++++---
 src/core/lang.json       |  1 +
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index feedd73b5..a868e07eb 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1658,6 +1658,7 @@
   "core.errorsync": "local_moodlemobileapp",
   "core.errorsyncblocked": "local_moodlemobileapp",
   "core.errorurlschemeinvalidscheme": "local_moodlemobileapp",
+  "core.errorurlschemeinvalidschemessologin": "local_moodlemobileapp",
   "core.errorurlschemeinvalidsite": "local_moodlemobileapp",
   "core.expand": "moodle",
   "core.explanationdigitalminor": "moodle",
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 5f2359678..d5aad5141 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -19,7 +19,7 @@ import { BackButtonEvent } from '@ionic/core';
 import { CoreLang } from '@services/lang';
 import { CoreLoginHelper } from '@features/login/services/login-helper';
 import { CoreEvents } from '@singletons/events';
-import { Network, NgZone, Platform, SplashScreen } from '@singletons';
+import { Network, NgZone, Platform, SplashScreen, Translate } from '@singletons';
 import { CoreApp, CoreAppProvider } from '@services/app';
 import { CoreSites } from '@services/sites';
 import { CoreNavigator } from '@services/navigator';
@@ -30,6 +30,7 @@ import { CoreUtils } from '@services/utils/utils';
 import { CoreUrlUtils } from '@services/utils/url';
 import { CoreConstants } from '@/core/constants';
 import { CoreSitePlugins } from '@features/siteplugins/services/siteplugins';
+import { CoreDomUtils } from '@services/utils/dom';
 
 const MOODLE_VERSION_PREFIX = 'version-';
 const MOODLEAPP_VERSION_PREFIX = 'moodleapp-';
@@ -111,6 +112,8 @@ export class AppComponent implements OnInit, AfterViewInit {
             // URLs with a custom scheme can be prefixed with "http://" or "https://", we need to remove this.
             const protocol = CoreUrlUtils.getUrlProtocol(event.url);
             const url = event.url.replace(/^https?:\/\//, '');
+            const urlScheme = CoreUrlUtils.getUrlProtocol(url);
+            const isExternalApp = urlScheme && urlScheme !== 'file' && urlScheme !== 'cdvfile';
 
             if (CoreCustomURLSchemes.isCustomURL(url)) {
                 // Close the browser if it's a valid SSO URL.
@@ -119,10 +122,16 @@ export class AppComponent implements OnInit, AfterViewInit {
                 });
                 CoreUtils.closeInAppBrowser();
 
+            } else if (isExternalApp && url.includes('://token=')) {
+                // It's an SSO token for another app. Close the IAB and show an error.
+                CoreUtils.closeInAppBrowser();
+                CoreDomUtils.showErrorModal(Translate.instant('core.errorurlschemeinvalidschemessologin', {
+                    $a: urlScheme,
+                }));
+
             } else if (CoreApp.isAndroid()) {
                 // Check if the URL has a custom URL scheme. In Android they need to be opened manually.
-                const urlScheme = CoreUrlUtils.getUrlProtocol(url);
-                if (urlScheme && urlScheme !== 'file' && urlScheme !== 'cdvfile') {
+                if (isExternalApp) {
                     // Open in browser should launch the right app if found and do nothing if not found.
                     CoreUtils.openInBrowser(url, { showBrowserWarning: false });
 
diff --git a/src/core/lang.json b/src/core/lang.json
index 68fa3736d..64fcba1f9 100644
--- a/src/core/lang.json
+++ b/src/core/lang.json
@@ -113,6 +113,7 @@
     "errorsync": "An error occurred while synchronising. Please try again.",
     "errorsyncblocked": "This {{$a}} cannot be synchronised right now because of an ongoing process. Please try again later. If the problem persists, try restarting the app.",
     "errorurlschemeinvalidscheme": "This URL is meant to be used in another app: {{$a}}.",
+    "errorurlschemeinvalidschemessologin": "This site is configured to be used in another app: {{$a}}.",
     "errorurlschemeinvalidsite": "This site URL cannot be opened in this app.",
     "expand": "Expand",
     "explanationdigitalminor": "This information is required to determine if your age is over the digital age of consent. This is the age when an individual can consent to terms and conditions and their data being legally stored and processed.",

From 60fa415ee215568ce63a04b7d22fbc148c205787 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 18 Jan 2022 14:23:37 +0100
Subject: [PATCH 0358/1008] MOBILE-3833 lang: Update removed strings in
 langindex

---
 scripts/langindex.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index a868e07eb..2d2e2f376 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -47,7 +47,7 @@
   "addon.block_myoverview.inprogress": "block_myoverview",
   "addon.block_myoverview.lastaccessed": "block_myoverview",
   "addon.block_myoverview.list": "block_myoverview",
-  "addon.block_myoverview.nocourses": "block_myoverview",
+  "addon.block_myoverview.nocourses": "moodle",
   "addon.block_myoverview.past": "block_myoverview",
   "addon.block_myoverview.pluginname": "block_myoverview",
   "addon.block_myoverview.shortname": "block_myoverview",
@@ -345,7 +345,7 @@
   "addon.mod_assign.cutoffdate": "assign",
   "addon.mod_assign.defaultteam": "assign",
   "addon.mod_assign.duedate": "assign",
-  "addon.mod_assign.duedateno": "assign",
+  "addon.mod_assign.duedateno": "local_moodlemobileapp",
   "addon.mod_assign.duedatereached": "assign",
   "addon.mod_assign.editingstatus": "assign",
   "addon.mod_assign.editsubmission": "assign",
@@ -881,8 +881,8 @@
   "addon.mod_quiz.requirepasswordmessage": "quizaccess_password",
   "addon.mod_quiz.returnattempt": "quiz",
   "addon.mod_quiz.review": "quiz",
-  "addon.mod_quiz.reviewofattempt": "quiz",
-  "addon.mod_quiz.reviewofpreview": "quiz",
+  "addon.mod_quiz.reviewofattempt": "local_moodlemobileapp",
+  "addon.mod_quiz.reviewofpreview": "local_moodlemobileapp",
   "addon.mod_quiz.showall": "quiz",
   "addon.mod_quiz.showeachpage": "quiz",
   "addon.mod_quiz.startattempt": "quiz",

From 28ceb60693c105e222a45e9de386b4b3d60dcda8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 18 Jan 2022 17:07:26 +0100
Subject: [PATCH 0359/1008] MOBILE-3962 blocks: Add course list block

---
 src/addons/block/block.module.ts              |  2 +
 .../block/courselist/courselist.module.ts     | 36 ++++++++++++++
 .../courselist/services/block-handler.ts      | 49 +++++++++++++++++++
 3 files changed, 87 insertions(+)
 create mode 100644 src/addons/block/courselist/courselist.module.ts
 create mode 100644 src/addons/block/courselist/services/block-handler.ts

diff --git a/src/addons/block/block.module.ts b/src/addons/block/block.module.ts
index fb0db615c..98738faf6 100644
--- a/src/addons/block/block.module.ts
+++ b/src/addons/block/block.module.ts
@@ -24,6 +24,7 @@ import { AddonBlockCalendarMonthModule } from './calendarmonth/calendarmonth.mod
 import { AddonBlockCalendarUpcomingModule } from './calendarupcoming/calendarupcoming.module';
 import { AddonBlockCommentsModule } from './comments/comments.module';
 import { AddonBlockCompletionStatusModule } from './completionstatus/completionstatus.module';
+import { AddonBlockCourseListModule } from './courselist/courselist.module';
 import { AddonBlockGlossaryRandomModule } from './glossaryrandom/glossaryrandom.module';
 import { AddonBlockHtmlModule } from './html/html.module';
 import { AddonBlockLearningPlansModule } from './learningplans/learningplans.module';
@@ -53,6 +54,7 @@ import { AddonBlockTimelineModule } from './timeline/timeline.module';
         AddonBlockCalendarUpcomingModule,
         AddonBlockCommentsModule,
         AddonBlockCompletionStatusModule,
+        AddonBlockCourseListModule,
         AddonBlockGlossaryRandomModule,
         AddonBlockHtmlModule,
         AddonBlockLearningPlansModule,
diff --git a/src/addons/block/courselist/courselist.module.ts b/src/addons/block/courselist/courselist.module.ts
new file mode 100644
index 000000000..e8ae2b06e
--- /dev/null
+++ b/src/addons/block/courselist/courselist.module.ts
@@ -0,0 +1,36 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { APP_INITIALIZER, NgModule } from '@angular/core';
+import { IonicModule } from '@ionic/angular';
+import { TranslateModule } from '@ngx-translate/core';
+import { CoreBlockDelegate } from '@features/block/services/block-delegate';
+import { AddonBlockCourseListHandler } from './services/block-handler';
+
+@NgModule({
+    imports: [
+        IonicModule,
+        TranslateModule.forChild(),
+    ],
+    providers: [
+        {
+            provide: APP_INITIALIZER,
+            multi: true,
+            useValue: () => {
+                CoreBlockDelegate.registerHandler(AddonBlockCourseListHandler.instance);
+            },
+        },
+    ],
+})
+export class AddonBlockCourseListModule {}
diff --git a/src/addons/block/courselist/services/block-handler.ts b/src/addons/block/courselist/services/block-handler.ts
new file mode 100644
index 000000000..fc4841f8f
--- /dev/null
+++ b/src/addons/block/courselist/services/block-handler.ts
@@ -0,0 +1,49 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { Injectable } from '@angular/core';
+import { CoreBlockHandlerData } from '@features/block/services/block-delegate';
+import { CoreBlockOnlyTitleComponent } from '@features/block/components/only-title-block/only-title-block';
+import { CoreBlockBaseHandler } from '@features/block/classes/base-block-handler';
+import { makeSingleton } from '@singletons';
+
+/**
+ * Block handler.
+ */
+@Injectable({ providedIn: 'root' })
+export class AddonBlockCourseListHandlerService extends CoreBlockBaseHandler {
+
+    name = 'AddonBlockCourseList';
+    blockName = 'course_list';
+
+    /**
+     * @inheritdoc
+     */
+    getDisplayData(): CoreBlockHandlerData {
+
+        return {
+            title: 'core.courses.mycourses',
+            class: 'addon-block-course-list',
+            component: CoreBlockOnlyTitleComponent,
+            link: 'courses/list',
+            linkParams: { mode: 'my' },
+            navOptions: {
+                preferCurrentTab: false,
+            },
+        };
+    }
+
+}
+
+export const AddonBlockCourseListHandler = makeSingleton(AddonBlockCourseListHandlerService);

From 2763677aa11dfd0f81b9351ae1c6be559174e371 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 18 Jan 2022 10:01:20 +0100
Subject: [PATCH 0360/1008] MOBILE-3811 user-menu: Add border when on main tab
 bar

---
 .../components/user-menu-button/user-menu-button.scss        | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.scss b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.scss
index 8695620af..85bb76e70 100644
--- a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.scss
+++ b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.scss
@@ -10,3 +10,8 @@ core-user-avatar {
     padding: 2px !important;
     border: 1px solid var(--color);
 }
+
+:host-context(ion-tab-bar) core-user-avatar ::ng-deep img {
+    padding: 2px !important;
+    border: 1px solid var(--color);
+}

From 187400dab8279b61f3650c9599814fa2633bd05c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 18 Jan 2022 09:57:50 +0100
Subject: [PATCH 0361/1008] MOBILE-3811 mod: Add new module icons and remove
 unused ones

---
 scripts/langindex.json                        |   3 -
 src/assets/img/mod/assign.svg                 |  99 +---
 src/assets/img/mod/book.svg                   |  91 +---
 src/assets/img/mod/chat.svg                   |  89 +---
 src/assets/img/mod/choice.svg                 |  60 +--
 src/assets/img/mod/data.svg                   | 105 +---
 src/assets/img/mod/external-tool.svg          |  69 +--
 src/assets/img/mod/feedback.svg               | 149 +-----
 src/assets/img/mod/folder.svg                 |  73 +--
 src/assets/img/mod/forum.svg                  |  88 +--
 src/assets/img/mod/glossary.svg               | 155 +-----
 src/assets/img/mod/h5pactivity.svg            |  17 +-
 src/assets/img/mod/imscp.svg                  | 174 +-----
 src/assets/img/mod/label.svg                  | 108 +---
 src/assets/img/mod/lesson.svg                 | 141 +----
 src/assets/img/mod/lti.svg                    |  69 +--
 src/assets/img/mod/page.svg                   | 125 +----
 src/assets/img/mod/quiz.svg                   | 101 +---
 src/assets/img/mod/resource.svg               |  70 +--
 src/assets/img/mod/scorm.svg                  |  92 +---
 src/assets/img/mod/survey.svg                 | 102 +---
 src/assets/img/mod/url.svg                    | 502 +-----------------
 src/assets/img/mod/wiki.svg                   | 253 +--------
 src/assets/img/mod/workshop.svg               | 117 +---
 .../assignment.svg => mod_legacy/assign.svg}  |   0
 src/assets/img/mod_legacy/bigbluebuttonbn.svg |  55 ++
 src/assets/img/mod_legacy/book.svg            |  80 +++
 src/assets/img/mod_legacy/chat.svg            |  77 +++
 src/assets/img/mod_legacy/choice.svg          |  46 ++
 .../{mod/database.svg => mod_legacy/data.svg} |   0
 src/assets/img/mod_legacy/external-tool.svg   |  55 ++
 src/assets/img/mod_legacy/feedback.svg        | 133 +++++
 src/assets/img/mod_legacy/folder.svg          |  65 +++
 src/assets/img/mod_legacy/forum.svg           |  71 +++
 src/assets/img/mod_legacy/glossary.svg        | 146 +++++
 src/assets/img/mod_legacy/h5pactivity.svg     |   1 +
 .../img/{mod/ims.svg => mod_legacy/imscp.svg} |   0
 src/assets/img/mod_legacy/label.svg           |  94 ++++
 src/assets/img/mod_legacy/lesson.svg          | 126 +++++
 src/assets/img/mod_legacy/lti.svg             |  55 ++
 src/assets/img/mod_legacy/page.svg            | 112 ++++
 src/assets/img/mod_legacy/quiz.svg            |  90 ++++
 .../{mod/file.svg => mod_legacy/resource.svg} |   0
 src/assets/img/mod_legacy/scorm.svg           |  84 +++
 src/assets/img/mod_legacy/survey.svg          |  89 ++++
 src/assets/img/mod_legacy/url.svg             | 485 +++++++++++++++++
 src/assets/img/mod_legacy/wiki.svg            | 228 ++++++++
 src/assets/img/mod_legacy/workshop.svg        |  98 ++++
 48 files changed, 2512 insertions(+), 2530 deletions(-)
 rename src/assets/img/{mod/assignment.svg => mod_legacy/assign.svg} (100%)
 create mode 100644 src/assets/img/mod_legacy/bigbluebuttonbn.svg
 create mode 100644 src/assets/img/mod_legacy/book.svg
 create mode 100644 src/assets/img/mod_legacy/chat.svg
 create mode 100644 src/assets/img/mod_legacy/choice.svg
 rename src/assets/img/{mod/database.svg => mod_legacy/data.svg} (100%)
 create mode 100644 src/assets/img/mod_legacy/external-tool.svg
 create mode 100644 src/assets/img/mod_legacy/feedback.svg
 create mode 100644 src/assets/img/mod_legacy/folder.svg
 create mode 100644 src/assets/img/mod_legacy/forum.svg
 create mode 100644 src/assets/img/mod_legacy/glossary.svg
 create mode 100644 src/assets/img/mod_legacy/h5pactivity.svg
 rename src/assets/img/{mod/ims.svg => mod_legacy/imscp.svg} (100%)
 create mode 100644 src/assets/img/mod_legacy/label.svg
 create mode 100644 src/assets/img/mod_legacy/lesson.svg
 create mode 100644 src/assets/img/mod_legacy/lti.svg
 create mode 100644 src/assets/img/mod_legacy/page.svg
 create mode 100644 src/assets/img/mod_legacy/quiz.svg
 rename src/assets/img/{mod/file.svg => mod_legacy/resource.svg} (100%)
 create mode 100644 src/assets/img/mod_legacy/scorm.svg
 create mode 100644 src/assets/img/mod_legacy/survey.svg
 create mode 100644 src/assets/img/mod_legacy/url.svg
 create mode 100644 src/assets/img/mod_legacy/wiki.svg
 create mode 100644 src/assets/img/mod_legacy/workshop.svg

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 2d2e2f376..4553ed0ac 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1979,12 +1979,10 @@
   "core.minutes": "moodle",
   "core.misc": "admin",
   "core.mod_assign": "assign/pluginname",
-  "core.mod_assignment": "assignment/pluginname",
   "core.mod_book": "book/pluginname",
   "core.mod_chat": "chat/pluginname",
   "core.mod_choice": "choice/pluginname",
   "core.mod_data": "data/pluginname",
-  "core.mod_database": "data/pluginname",
   "core.mod_external-tool": "lti/pluginname",
   "core.mod_feedback": "feedback/pluginname",
   "core.mod_file": "moodle/file",
@@ -1992,7 +1990,6 @@
   "core.mod_forum": "forum/pluginname",
   "core.mod_glossary": "glossary/pluginname",
   "core.mod_h5pactivity": "h5pactivity/pluginname",
-  "core.mod_ims": "imscp/pluginname",
   "core.mod_imscp": "imscp/pluginname",
   "core.mod_label": "label/pluginname",
   "core.mod_lesson": "lesson/pluginname",
diff --git a/src/assets/img/mod/assign.svg b/src/assets/img/mod/assign.svg
index 41a788985..18fea36dd 100644
--- a/src/assets/img/mod/assign.svg
+++ b/src/assets/img/mod/assign.svg
@@ -1,89 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" style="overflow:visible;enable-background:new 0 0 24 24;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="14.0054" y1="0" x2="14.0054" y2="20.0005">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_1_);" points="16.3,0 15.4,0 6.7,0 6,0 6,20 6.7,20 21.7,20 22,20 22,6.6 "/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="14.0054" y1="1" x2="14.0054" y2="19.0005">
-	<stop  offset="0" style="stop-color:#E7F4FC"/>
-	<stop  offset="1" style="stop-color:#DEEFFC"/>
-	<a:midPointStop  offset="0" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="1" style="stop-color:#DEEFFC"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_2_);" points="7,19 7,1 15.8,1 21,6.9 21,19 "/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="14.0054" y1="2" x2="14.0054" y2="18.0005">
-	<stop  offset="0" style="stop-color:#CEE9F9"/>
-	<stop  offset="1" style="stop-color:#BBDFF8"/>
-	<a:midPointStop  offset="0" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="1" style="stop-color:#BBDFF8"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_3_);" points="8,18 8,2 15.4,2 20,7.3 20,18 "/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="18.3101" y1="0" x2="18.3101" y2="7.7852">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<path style="fill:url(#SVGID_4_);" d="M14.8,7.5c0,0,5.2-1.3,7.2,0.3c0-0.1,0-1.2,0-1.2L16.2,0c0,0-1.5,0-1.6,0
-	C16.8,3,14.8,7.5,14.8,7.5z"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="16.3003" y1="6.1616" x2="18.5911" y2="3.8708">
-	<stop  offset="0" style="stop-color:#E7F4FC"/>
-	<stop  offset="0.5181" style="stop-color:#E5F3FC"/>
-	<stop  offset="0.7045" style="stop-color:#DEF0FB"/>
-	<stop  offset="0.8371" style="stop-color:#D3EBFA"/>
-	<stop  offset="0.872" style="stop-color:#CEE9F9"/>
-	<stop  offset="1" style="stop-color:#BDD8F0"/>
-	<a:midPointStop  offset="0" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="0.87" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="0.872" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="1" style="stop-color:#BDD8F0"/>
-</linearGradient>
-<path style="fill:url(#SVGID_5_);" d="M16.3,6.2c0.3-1.2,0.5-2.9,0.1-4.4l4,4.4C20,6.1,19.4,6,18.8,6C17.9,6,17,6.1,16.3,6.2z"/>
-<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="11.9673" y1="12.167" x2="11.9673" y2="23.8853">
-	<stop  offset="0" style="stop-color:#DDA976"/>
-	<stop  offset="1" style="stop-color:#9F6B37"/>
-	<a:midPointStop  offset="0" style="stop-color:#DDA976"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#DDA976"/>
-	<a:midPointStop  offset="1" style="stop-color:#9F6B37"/>
-</linearGradient>
-<path style="fill:url(#SVGID_6_);" d="M10,18.9c-0.3-2.2,9.4,0.5,9.3-1.4c0-0.8-8.4-3.4-11.4-4.1c-0.9-0.2-6.5-1.2-6.5-1.2
-	c-0.2,0.1-1.3,3.3-1.4,5.2c0.5,0.3,7.3,6.7,10,6.5c2.7-0.2,14.2-3.6,13.9-4.7C23.3,17.1,10.3,21.3,10,18.9z"/>
-<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="11.4893" y1="13.2803" x2="11.4893" y2="22.9336">
-	<stop  offset="0" style="stop-color:#FFDDAA"/>
-	<stop  offset="1" style="stop-color:#E3B17E"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFDDAA"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFDDAA"/>
-	<a:midPointStop  offset="1" style="stop-color:#E3B17E"/>
-</linearGradient>
-<path style="fill:url(#SVGID_7_);" d="M1.7,17.4C1.4,17.2,1.2,17,1,16.9c0.1-1.2,0.6-2.8,0.9-3.6c1.8,0.3,5.1,0.9,5.7,1
-	c2.6,0.6,9.4,2.3,9.7,3c0.5,1.1-8.3-1.9-8.1,1.7c0.2,3.5,12.4-0.6,12.7,0.5c0.2,0.7-10.1,3.6-12,3.5C7.9,22.8,3.3,18.8,1.7,17.4z"/>
-<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="7.5928" y1="14.4141" x2="7.5928" y2="21.9336">
-	<stop  offset="0" style="stop-color:#F1C592"/>
-	<stop  offset="1" style="stop-color:#E1AF7C"/>
-	<a:midPointStop  offset="0" style="stop-color:#F1C592"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#F1C592"/>
-	<a:midPointStop  offset="1" style="stop-color:#E1AF7C"/>
-</linearGradient>
-<path style="fill:url(#SVGID_8_);" d="M10.1,21.9c-0.8-0.1-2.8-1-7.6-5.2l-0.3-0.3c0.1-0.7,0.3-1.4,0.5-2.1c2.1,0.4,4.3,0.8,4.7,0.9
-	c1.5,0.4,2.7,0.7,3.8,0.9c-1,0.1-1.8,0.4-2.3,1c-0.3,0.3-0.7,0.9-0.6,1.9c0.1,1.1,0.8,2.4,4,2.4c0.3,0,0.6,0,0.9,0
-	C11.8,21.7,10.7,21.9,10.1,21.9L10.1,21.9z"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<path id="Path_963-6_1_" d="M37.9,74.4c-1,0-1.9-0.8-1.9-1.8v-0.1V64H15.6c-1.8,0-3.2-1.4-3.2-3.2l0,0V3.2c0-1.8,1.4-3.2,3.2-3.2h34
+	c0.8,0,1.7,0.3,2.2,0.9L63.9,13c0.6,0.6,0.9,1.4,0.9,2.2v45.5c0,1.8-1.4,3.2-3.2,3.2l0,0H41.1v8.5c0,1.1-0.9,2-1.9,2H37.9z
+	 M59.6,58.6V21.5h-13c-1.8,0-3.2-1.4-3.2-3.1l0,0v-13H17.7v53.3H36v-7.8h-5.1c-1.1,0-2-0.9-2-2c0-0.4,0.2-0.8,0.4-1.2l7.9-10.5
+	c0.7-0.8,1.8-0.9,2.7-0.3c0.1,0.1,8,10.8,8,10.8c0.7,0.9,0.5,2.1-0.4,2.8c-0.3,0.2-0.7,0.4-1.1,0.4h-5.2v7.8L59.6,58.6z M49.3,15.6
+	h9.1l-9.1-9.1C49.3,6.5,49.3,15.6,49.3,15.6z"/>
+</svg>
diff --git a/src/assets/img/mod/book.svg b/src/assets/img/mod/book.svg
index 740a35160..994edc734 100644
--- a/src/assets/img/mod/book.svg
+++ b/src/assets/img/mod/book.svg
@@ -1,80 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="-2 0 24 24" style="overflow:visible;enable-background:new -2 0 24 24;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="12.0005" y1="0" x2="12.0005" y2="24.0005">
-	<stop  offset="0" style="stop-color:#90C50E"/>
-	<stop  offset="1" style="stop-color:#70A034"/>
-	<a:midPointStop  offset="0" style="stop-color:#90C50E"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#90C50E"/>
-	<a:midPointStop  offset="1" style="stop-color:#70A034"/>
-</linearGradient>
-<rect x="4" style="fill:url(#SVGID_1_);" width="16" height="24"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="12.0005" y1="1" x2="12.0005" y2="23.0005">
-	<stop  offset="0" style="stop-color:#D9F991"/>
-	<stop  offset="0.2388" style="stop-color:#D7F88D"/>
-	<stop  offset="0.4501" style="stop-color:#D1F383"/>
-	<stop  offset="0.6509" style="stop-color:#C6EC71"/>
-	<stop  offset="0.844" style="stop-color:#B7E257"/>
-	<stop  offset="1" style="stop-color:#A8D73D"/>
-	<a:midPointStop  offset="0" style="stop-color:#D9F991"/>
-	<a:midPointStop  offset="0.7317" style="stop-color:#D9F991"/>
-	<a:midPointStop  offset="1" style="stop-color:#A8D73D"/>
-</linearGradient>
-<rect x="5" y="1" style="fill:url(#SVGID_2_);" width="14" height="22"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="12.0005" y1="2" x2="12.0005" y2="22.0005">
-	<stop  offset="0" style="stop-color:#B3E810"/>
-	<stop  offset="1" style="stop-color:#90C60D"/>
-	<a:midPointStop  offset="0" style="stop-color:#B3E810"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#B3E810"/>
-	<a:midPointStop  offset="1" style="stop-color:#90C60D"/>
-</linearGradient>
-<rect x="6" y="2" style="fill:url(#SVGID_3_);" width="12" height="20"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="12.0005" y1="4" x2="12.0005" y2="9">
-	<stop  offset="0" style="stop-color:#90C50E"/>
-	<stop  offset="1" style="stop-color:#70A034"/>
-	<a:midPointStop  offset="0" style="stop-color:#90C50E"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#90C50E"/>
-	<a:midPointStop  offset="1" style="stop-color:#70A034"/>
-</linearGradient>
-<path style="fill:url(#SVGID_4_);" d="M7,4v5h10V4H7z M16,8H8V5h8V8z"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="2.5" y1="0" x2="2.5" y2="24.0005">
-	<stop  offset="0" style="stop-color:#656565"/>
-	<stop  offset="1.342887e-02" style="stop-color:#646464"/>
-	<stop  offset="0.4453" style="stop-color:#3C3C3C"/>
-	<stop  offset="0.7891" style="stop-color:#242424"/>
-	<stop  offset="1" style="stop-color:#1B1B1B"/>
-	<a:midPointStop  offset="0" style="stop-color:#656565"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#656565"/>
-	<a:midPointStop  offset="1" style="stop-color:#1B1B1B"/>
-</linearGradient>
-<path style="fill:url(#SVGID_5_);" d="M4,0H2.6H1C0.5,0,0,0.5,0,1v22c0,0.5,0.5,1,1,1h1.6H4h1v-1V1V0H4z"/>
-<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="2.5" y1="1" x2="2.5" y2="23.0005">
-	<stop  offset="0" style="stop-color:#8E8E8E"/>
-	<stop  offset="4.191053e-02" style="stop-color:#8A8A8A"/>
-	<stop  offset="0.4613" style="stop-color:#626262"/>
-	<stop  offset="0.7952" style="stop-color:#4A4A4A"/>
-	<stop  offset="1" style="stop-color:#414141"/>
-	<a:midPointStop  offset="0" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="1" style="stop-color:#414141"/>
-</linearGradient>
-<rect x="1" y="1" style="fill:url(#SVGID_6_);" width="3" height="22"/>
-<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="2.5" y1="2" x2="2.5" y2="22.0005">
-	<stop  offset="0" style="stop-color:#7C7C7C"/>
-	<stop  offset="0.3898" style="stop-color:#5C5C5C"/>
-	<stop  offset="0.768" style="stop-color:#444444"/>
-	<stop  offset="1" style="stop-color:#3B3B3B"/>
-	<a:midPointStop  offset="0" style="stop-color:#7C7C7C"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#7C7C7C"/>
-	<a:midPointStop  offset="1" style="stop-color:#3B3B3B"/>
-</linearGradient>
-<rect x="2" y="2" style="fill:url(#SVGID_7_);" width="1" height="20"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<path id="book-2-6_1_" d="M74.4,5.6c0-1.3-1.1-2.5-2.5-2.5c-0.4,0-0.7,0.1-1,0.3l-6.6,3.3V2.5c0-1.3-1.1-2.5-2.6-2.5
+	c-0.4,0-0.7,0.1-1,0.2L37.1,12L13.5,0.3c-1.2-0.6-2.7-0.1-3.3,1.1C10,1.6,10,2,9.9,2.3v4.2L3.5,3.3C2.3,2.7,0.7,3.2,0.2,4.4
+	C0,4.7,0,5.1,0,5.4v49.1c0,0.9,0.5,1.7,1.3,2.2L36,73.8c0.7,0.3,1.5,0.3,2.3,0L73,56.7c0.8-0.4,1.3-1.2,1.3-2.2L74.4,5.6L74.4,5.6z
+	 M36.3,62.4c0.4,0.1,0.9,0.1,1.3,0c0.1,0,0.2-0.1,0.3-0.1l0,0c0,0,24.7-12.2,24.8-12.2c0.8-0.4,1.3-1.2,1.3-2.2V12.3l5.2-2.6v42.9
+	L36.9,68.6L5.3,51.8V10.2l5,2.1v35.6c0,0.9,0.5,1.7,1.3,2.2c0.1,0,24.1,12.2,24.2,12.2l0,0C36.1,62.3,36.2,62.3,36.3,62.4L36.3,62.4
+	L36.3,62.4z M39.8,55.7V16.8l19-9.4v39L39.8,55.7z M15.5,46.2V7.3l19,9.4v38.8L15.5,46.2z"/>
+</svg>
diff --git a/src/assets/img/mod/chat.svg b/src/assets/img/mod/chat.svg
index 9dd304b78..52efce452 100644
--- a/src/assets/img/mod/chat.svg
+++ b/src/assets/img/mod/chat.svg
@@ -1,77 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="-0.1 -0.1 24 24"
-	 style="overflow:visible;enable-background:new -0.1 -0.1 24 24;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="10.9429" y1="0" x2="10.9429" y2="19.7881">
-	<stop  offset="0" style="stop-color:#76A1F0"/>
-	<stop  offset="1" style="stop-color:#6B90D5"/>
-	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
-</linearGradient>
-<path style="fill:url(#SVGID_1_);" d="M10.8,0C4.7,0.1-0.1,4.3,0,9.3c0,2.6,1.5,5,3.7,6.6c0,0.1,0,0.2,0.1,0.3
-	c0.3,2-0.9,3.6-0.9,3.6s2.2-0.5,3.5-1.5c0.2-0.2,0.5-0.4,0.7-0.7c1.3,0.4,2.6,0.6,4.1,0.6c6-0.1,10.9-4.3,10.8-9.3
-	C21.8,3.9,16.8-0.1,10.8,0z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="10.9434" y1="1" x2="10.9434" y2="18.1289">
-	<stop  offset="0" style="stop-color:#BBE0F7"/>
-	<stop  offset="1" style="stop-color:#82B4FB"/>
-	<a:midPointStop  offset="0" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="1" style="stop-color:#82B4FB"/>
-</linearGradient>
-<path style="fill:url(#SVGID_2_);" d="M4.6,18.1c0.1-0.6,0.2-1.3,0.1-2.1c0-0.1,0-0.2-0.1-0.3l-0.1-0.4l-0.3-0.3
-	C2.2,13.6,1,11.5,1,9.3C0.9,4.8,5.3,1.1,10.8,1L11,1c5.4,0,9.8,3.5,9.9,7.9c0.1,4.5-4.3,8.2-9.8,8.3l-0.2,0c-1.2,0-2.4-0.2-3.5-0.5
-	l-0.6-0.2l-0.4,0.5c-0.2,0.2-0.4,0.4-0.5,0.6C5.4,17.7,5,17.9,4.6,18.1z"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="10.9434" y1="2" x2="10.9434" y2="16.1631">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<path style="fill:url(#SVGID_3_);" d="M10.8,16.2c-1.1,0-2.2-0.2-3.2-0.5l-1.3-0.4L5.7,16c0,0,0-0.1,0-0.1c0-0.1,0-0.3-0.1-0.4
-	l-0.1-0.7l-0.6-0.6l0,0C3,13,2,11.2,2,9.3C1.9,5.3,5.9,2.1,10.8,2L11,2c4.8,0,8.8,3.1,8.8,6.9c0.1,3.9-3.9,7.2-8.8,7.2L10.8,16.2z"
-	/>
-<path style="fill:#FFFFFF;" d="M16.6,9.6c0,0.7-0.6,1.3-1.2,1.3c-0.7,0-1.3-0.6-1.3-1.3c0-0.7,0.6-1.2,1.3-1.2
-	C16,8.4,16.6,8.9,16.6,9.6z M11.5,8.4c-0.7,0-1.2,0.6-1.2,1.2c0,0.7,0.6,1.3,1.2,1.3c0.7,0,1.3-0.6,1.3-1.3
-	C12.7,8.9,12.2,8.4,11.5,8.4z M7.5,8.4c-0.7,0-1.3,0.6-1.3,1.2c0,0.7,0.6,1.3,1.3,1.3s1.3-0.6,1.3-1.3C8.8,8.9,8.2,8.4,7.5,8.4z"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="14.0254" y1="6.667" x2="14.0254" y2="23.8398">
-	<stop  offset="0" style="stop-color:#F0A829"/>
-	<stop  offset="1" style="stop-color:#C7671A"/>
-	<a:midPointStop  offset="0" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="1" style="stop-color:#C7671A"/>
-</linearGradient>
-<path style="fill:url(#SVGID_4_);" d="M20.7,20.5c1.9-1.4,3.2-3.4,3.2-5.7c0.1-4.4-4.3-8-9.8-8.1C8.7,6.6,4.2,10,4.1,14.4
-	c-0.1,4.4,4.3,8,9.8,8.1c1.4,0,2.7-0.2,3.9-0.5c1,1.3,3.7,1.9,3.7,1.9S20.3,22.2,20.7,20.5z"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="14.1436" y1="7.667" x2="14.1436" y2="22.1943">
-	<stop  offset="0" style="stop-color:#FFEBA8"/>
-	<stop  offset="1" style="stop-color:#F8BE27"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFEBA8"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFEBA8"/>
-	<a:midPointStop  offset="1" style="stop-color:#F8BE27"/>
-</linearGradient>
-<path style="fill:url(#SVGID_5_);" d="M19.9,22.2c-0.5-0.2-1-0.5-1.7-1.4c-0.4,0.1-1.7,0.7-4.2,0.7c-5,0-8.9-3.3-8.8-7.1
-	c0.1-3.7,4-6.8,9-6.8c2.3,0,4.7,0.8,6.3,2.2c1.6,1.3,2.5,3.1,2.4,4.9c0,1.9-1,3.7-3.1,5.1C19.7,20.7,19.7,21.6,19.9,22.2z"/>
-<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="14.0234" y1="8.6689" x2="14.0234" y2="20.5176">
-	<stop  offset="0" style="stop-color:#FFC30F"/>
-	<stop  offset="1" style="stop-color:#F5AE0D"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="1" style="stop-color:#F5AE0D"/>
-</linearGradient>
-<path style="fill:url(#SVGID_6_);" d="M13.9,20.5c-6.1-0.2-7.9-4.2-7.8-6.1c0.2-3.2,3.3-5.8,8-5.8c2.1,0,4.3,0.8,5.7,2
-	c1.4,1.1,2.1,2.6,2.1,4.1c-0.1,2.9-2.9,4.5-2.9,4.5s-0.2,0.7-0.2,0.9l-0.4-0.5C18.4,19.6,16.5,20.6,13.9,20.5z"/>
-<path style="fill:#FFFFFF;" d="M19.4,14.9c0,0.7-0.6,1.3-1.2,1.3c-0.7,0-1.3-0.6-1.3-1.3c0-0.7,0.6-1.2,1.3-1.2
-	C18.8,13.7,19.4,14.2,19.4,14.9z M14.3,13.7c-0.7,0-1.2,0.6-1.2,1.2c0,0.7,0.6,1.3,1.2,1.3c0.7,0,1.3-0.6,1.3-1.3
-	C15.5,14.2,15,13.7,14.3,13.7z M10.3,13.7c-0.7,0-1.3,0.6-1.3,1.2c0,0.7,0.6,1.3,1.3,1.3s1.3-0.6,1.3-1.3
-	C11.6,14.2,11,13.7,10.3,13.7z"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<path d="M72.4,32.9C67.8,24.3,57.9,20.4,49,20.6c-1.3-4.3-3.9-7.9-7.4-10.4c-11.9-8.8-31.7-7-39.6,7c-5.1,9.5,0.2,20.1,8.7,24.6v9.5
+	c0,1.3,1.1,2.4,2.2,2.4c0.6,0,1.1-0.2,1.4-0.6l7.5-7.8c1.2,0.1,2.4,0.2,3.6,0.1C29,57,41.9,62.1,52.6,61l7.5,7.8
+	c0.9,0.9,2.2,0.9,3.1-0.1c0.3-0.4,0.6-1,0.6-1.5v-9.6C72.3,53.1,77.5,42.4,72.4,32.9z M14.1,37.9C6.4,34.2,2.8,26.6,6.5,19.5
+	c3.8-6.6,11.3-9.3,18.1-9.4c4.8-0.1,9.5,1.3,13.5,4.2c2.5,1.8,4.3,4,5.4,7c-9,1.3-18.9,8.4-18.9,19c-1.1,0-2.2-0.1-3.4-0.2
+	c-0.6-0.1-1.2,0.2-1.7,0.5l-4.4,4.5v-5.3C15.3,39.2,14.8,38.4,14.1,37.9z M31.3,35.2c6.5-11,23.1-12,32.4-4.8
+	c3.1,2.4,5.8,6.3,5.7,10.7c0,5.2-3.4,9.9-9.1,12.8c-0.7,0.3-1.2,1.1-1.2,2v5.4l-4.4-4.5c-0.5-0.6-1.2-0.7-1.8-0.6
+	c-1.2,0.2-2.2,0.2-3.4,0.2c-2.6,0-5.2-0.4-7.8-1.2C33.9,52.6,26.5,44.1,31.3,35.2L31.3,35.2z"/>
+</svg>
diff --git a/src/assets/img/mod/choice.svg b/src/assets/img/mod/choice.svg
index 4d455910c..02905029c 100644
--- a/src/assets/img/mod/choice.svg
+++ b/src/assets/img/mod/choice.svg
@@ -1,46 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="-4.2 -0.3 24 24"
-	 style="overflow:visible;enable-background:new -4.2 -0.3 24 24;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="7.8237" y1="0" x2="7.8237" y2="23.3262">
-	<stop  offset="0" style="stop-color:#76A1F0"/>
-	<stop  offset="1" style="stop-color:#6B90D5"/>
-	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
-</linearGradient>
-<path style="fill:url(#SVGID_1_);" d="M2.4,8.4C1.1,8.4,0,7.5,0,6.1C0,3.3,2.8,0,7.7,0c3.3,0,7.9,2.2,7.9,6c0,2-1.2,3.5-3.6,4.4
-	c-3.3,1.2-1.4,3.7-4.5,3.7c-1.3,0-2.1-0.8-2.1-2.1c0-2.7,2.8-4.2,2.8-6.9c0-0.7-0.3-1.6-1.1-1.6c-0.9,0-1,0.9-1,1.5
-	C5.8,7.1,4.5,8.4,2.4,8.4z M7.3,23.3c-2,0-3.6-1.6-3.6-3.6c0-2,1.6-3.6,3.6-3.6c2,0,3.6,1.6,3.6,3.6C10.8,21.7,9.2,23.3,7.3,23.3z"
-	/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="7.8237" y1="1" x2="7.8237" y2="22.3262">
-	<stop  offset="0" style="stop-color:#BBE0F7"/>
-	<stop  offset="1" style="stop-color:#82B4FB"/>
-	<a:midPointStop  offset="0" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="1" style="stop-color:#82B4FB"/>
-</linearGradient>
-<path style="fill:url(#SVGID_2_);" d="M7.3,22.3c-1.4,0-2.6-1.1-2.6-2.6c0-1.4,1.1-2.6,2.6-2.6s2.6,1.1,2.6,2.6
-	C9.8,21.2,8.7,22.3,7.3,22.3z M7.6,13.1c-0.8,0-1.1-0.4-1.1-1.1c0-1.1,0.6-1.9,1.2-2.9c0.7-1.1,1.5-2.3,1.5-4c0-1.3-0.7-2.6-2.1-2.6
-	c-1.8,0-2,1.7-2,2.4C4.9,6,4.3,7.4,2.4,7.4C1.6,7.4,1,6.9,1,6.1C1,4,3.1,1,7.7,1c2.9,0,6.9,1.9,6.9,5c0,1.6-1,2.7-2.9,3.4
-	c-2,0.8-2.5,2-2.9,2.8C8.5,13,8.5,13.1,7.6,13.1z"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="7.8237" y1="2.0986" x2="7.8237" y2="21.3262">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<path style="fill:url(#SVGID_3_);" d="M7.3,21.3c-0.9,0-1.6-0.7-1.6-1.6s0.7-1.6,1.6-1.6c0.9,0,1.6,0.7,1.6,1.6S8.2,21.3,7.3,21.3z
-	 M7.6,12.1c-0.1,0-0.1,0-0.1,0c0,0,0-0.1,0-0.1c0-0.8,0.5-1.5,1-2.3c0.8-1.2,1.7-2.6,1.7-4.6c0-1.3-0.5-2.3-1.3-3
-	c2.2,0.4,4.8,1.8,4.8,3.9c0,0.4,0,1.6-2.3,2.5C9,9.4,8.3,11,7.9,11.9c0,0.1-0.1,0.2-0.1,0.2C7.8,12.1,7.7,12.1,7.6,12.1z M2.4,6.4
-	C2,6.4,2,6.2,2,6.1c0-1.1,0.9-2.7,2.7-3.5C4.4,3.1,4.1,3.8,4,4.8C3.9,6.2,3.1,6.4,2.4,6.4z"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<path d="M71.6,6.9L57,0.5c-3.8-1.8-7.7,2.3-6.1,6.1l1.4,3.4c-6.4,2.3-11.5,4.4-15.1,7.6c-3.7-3.2-8.8-5.1-15.1-7.3l1.4-3.7
+	c1.6-3.8-2.3-7.9-6.1-6.1L2.8,6.9C0.5,8-0.6,10.7,0.4,13.1l6.2,15.1c0.9,2.3,3.6,3.6,5.9,2.7c1.3-0.5,2.2-1.4,2.7-2.7l1.4-3.6
+	l8.6,3.8c2.7,1,4.4,3.6,4.2,6.4c0,4.1,0,34.3,0,36.3c0,1.9,1.5,3.4,3.4,3.5h0.9h7.9c1.9,0,3.5-1.6,3.5-3.4v-0.5c0-1.8,0-31.5,0-35.7
+	c-0.2-2.8,0.5-5.4,3.2-6.4l9.5-3.8l1.4,3.6c0.9,2.3,3.6,3.6,5.9,2.7c1.2-0.4,2.2-1.4,2.6-2.6l6.2-15.1C75.1,10.6,74,7.9,71.6,6.9z
+	 M39.9,69.2h-5.3c0-2.1,0-36,0-36c-0.2-2.3-1-4.5-2.4-6.4c-1-1.3-2.7-2.4-3.8-2.9l-14.5-6.3L12,22.3c-0.2,0.5-1.1,0.9-1.6,0.7l0,0
+	c0,0-0.4-0.3-0.5-0.6L5.6,12.3c-0.3-0.5,0-1.2,0.5-1.4c0.8-0.2,11.1-5,11.1-3.6c0.3,0.3,0.4,0.8,0.3,1.2l-1.9,4.7
+	c7,3,16.9,5.8,19.7,9c0.8,0.8,1.7,1.6,2.3,2.5c2,2.8,2.6,5.4,2.6,8.7L39.9,69.2z M68.8,13.2l-3.9,9.2c-0.1,0.3-0.3,0.4-0.5,0.6
+	c-0.5,0.2-1-0.1-1.2-0.6l0,0l-2.4-5l-13.6,5.9c-1.5,0.7-2.3,1.2-3.3,2.5c-0.7-2.7-1.2-2.5-2.9-4.7c4.4-3.7,11.1-5,18.2-8l-2-4.9
+	C57,7.8,57.1,7.4,57.5,7c0-1.3,10.5,4.5,10.9,4.4c0.3,0.3,0.5,0.8,0.4,1.4V13.2z"/>
+</svg>
diff --git a/src/assets/img/mod/data.svg b/src/assets/img/mod/data.svg
index 954777f09..3bf47aa86 100644
--- a/src/assets/img/mod/data.svg
+++ b/src/assets/img/mod/data.svg
@@ -1,87 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="-2 -1 24 24" style="overflow:visible;enable-background:new -2 -1 24 24;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<radialGradient id="SVGID_1_" cx="10" cy="19.5" r="7.4917" gradientUnits="userSpaceOnUse">
-	<stop  offset="0" style="stop-color:#76A1F0"/>
-	<stop  offset="1" style="stop-color:#6B90D5"/>
-	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
-</radialGradient>
-<path style="fill:url(#SVGID_1_);" d="M20,21c0,1.1-0.9,2-2,2H2c-1.1,0-2-0.9-2-2v-3c0-1.1,0.9-2,2-2h16c1.1,0,2,0.9,2,2V21z"/>
-<radialGradient id="SVGID_2_" cx="10" cy="19.5" r="6.6049" gradientUnits="userSpaceOnUse">
-	<stop  offset="0" style="stop-color:#BBE0F7"/>
-	<stop  offset="1" style="stop-color:#82B4FB"/>
-	<a:midPointStop  offset="0" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="1" style="stop-color:#82B4FB"/>
-</radialGradient>
-<path style="fill:url(#SVGID_2_);" d="M2,22c-0.6,0-1-0.4-1-1v-3c0-0.6,0.4-1,1-1h16c0.6,0,1,0.4,1,1v3c0,0.6-0.4,1-1,1H2z"/>
-<radialGradient id="SVGID_3_" cx="10" cy="19.5" r="5.7554" gradientUnits="userSpaceOnUse">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</radialGradient>
-<rect x="2" y="18" style="fill:url(#SVGID_3_);" width="16" height="3"/>
-<radialGradient id="SVGID_4_" cx="10" cy="11.5" r="7.4917" gradientUnits="userSpaceOnUse">
-	<stop  offset="0" style="stop-color:#76A1F0"/>
-	<stop  offset="1" style="stop-color:#6B90D5"/>
-	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
-</radialGradient>
-<path style="fill:url(#SVGID_4_);" d="M20,13c0,1.1-0.9,2-2,2H2c-1.1,0-2-0.9-2-2v-3c0-1.1,0.9-2,2-2h16c1.1,0,2,0.9,2,2V13z"/>
-<radialGradient id="SVGID_5_" cx="10" cy="11.5" r="6.6049" gradientUnits="userSpaceOnUse">
-	<stop  offset="0" style="stop-color:#BBE0F7"/>
-	<stop  offset="1" style="stop-color:#82B4FB"/>
-	<a:midPointStop  offset="0" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="1" style="stop-color:#82B4FB"/>
-</radialGradient>
-<path style="fill:url(#SVGID_5_);" d="M2,14c-0.6,0-1-0.4-1-1v-3c0-0.6,0.4-1,1-1h16c0.6,0,1,0.4,1,1v3c0,0.6-0.4,1-1,1H2z"/>
-<radialGradient id="SVGID_6_" cx="10" cy="11.5" r="5.7554" gradientUnits="userSpaceOnUse">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</radialGradient>
-<rect x="2" y="10" style="fill:url(#SVGID_6_);" width="16" height="3"/>
-<radialGradient id="SVGID_7_" cx="10" cy="3.5" r="7.4917" gradientUnits="userSpaceOnUse">
-	<stop  offset="0" style="stop-color:#76A1F0"/>
-	<stop  offset="1" style="stop-color:#6B90D5"/>
-	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
-</radialGradient>
-<path style="fill:url(#SVGID_7_);" d="M20,5c0,1.1-0.9,2-2,2H2C0.9,7,0,6.1,0,5V2c0-1.1,0.9-2,2-2h16c1.1,0,2,0.9,2,2V5z"/>
-<radialGradient id="SVGID_8_" cx="10" cy="3.5" r="6.6049" gradientUnits="userSpaceOnUse">
-	<stop  offset="0" style="stop-color:#BBE0F7"/>
-	<stop  offset="1" style="stop-color:#82B4FB"/>
-	<a:midPointStop  offset="0" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="1" style="stop-color:#82B4FB"/>
-</radialGradient>
-<path style="fill:url(#SVGID_8_);" d="M2,6C1.4,6,1,5.6,1,5V2c0-0.6,0.4-1,1-1h16c0.6,0,1,0.4,1,1v3c0,0.6-0.4,1-1,1H2z"/>
-<radialGradient id="SVGID_9_" cx="10" cy="3.5" r="5.7554" gradientUnits="userSpaceOnUse">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</radialGradient>
-<rect x="2" y="2" style="fill:url(#SVGID_9_);" width="16" height="3"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<path d="M64.9,8.1c-2.1-1.5-4.5-2.6-6.9-3.2c-13.7-3.4-28-3.4-41.5,0C14,5.5,11.6,6.6,9.6,8.1C8,9.2,6.9,10.9,6.8,12.9v48.6
+	c0.1,1.9,1.2,3.7,2.8,4.8c2.1,1.5,4.5,2.6,6.9,3.2c13.7,3.4,28,3.4,41.5,0c2.5-0.6,4.9-1.7,6.9-3.2c1.6-1.1,2.7-2.8,2.8-4.8V12.9
+	C67.6,11,66.6,9.2,64.9,8.1z M11.7,19.2c3.4,1.6,6.9,2.7,10.7,3.2c4.8,0.9,9.7,1.2,14.6,1.2s9.8-0.4,14.6-1.2
+	c3.7-0.5,7.3-1.6,10.7-3.2v9.9c0,0.1,0,0.2-0.3,0.5c-0.2,0.3-0.6,0.6-1.1,0.9c-1.6,0.9-3.3,1.5-5,1.9c-12.4,3-25.2,3-37.6,0
+	c-1.7-0.4-3.4-1.1-5-1.9c-0.4-0.2-0.9-0.5-1.3-0.9c-0.3-0.3-0.3-0.5-0.3-0.5L11.7,19.2L11.7,19.2z M62.5,61.4c0,0.1,0,0.2-0.3,0.5
+	s-0.7,0.6-1.2,0.9c-1.6,0.9-3.3,1.5-5,1.9c-12.4,3-25.2,3-37.6,0c-1.7-0.4-3.4-1.1-5-1.9c-0.4-0.2-0.9-0.5-1.3-0.9
+	c-0.3-0.3-0.3-0.5-0.3-0.5l0.1-9.9c3.4,1.6,6.9,2.7,10.7,3.2c4.8,0.9,9.7,1.2,14.6,1.2s9.8-0.3,14.6-1.2c3.7-0.5,7.3-1.6,10.7-3.2
+	L62.5,61.4L62.5,61.4z M62.5,45.4c0,0.1,0,0.2-0.3,0.5s-0.7,0.5-1.2,0.9c-1.6,0.9-3.3,1.5-5,1.9c-12.4,3-25.2,3-37.6,0
+	c-1.7-0.4-3.4-1.1-5-1.9c-0.4-0.2-0.9-0.5-1.3-0.9c-0.3-0.3-0.3-0.5-0.3-0.5v-9.9c3.4,1.6,6.9,2.7,10.7,3.2c9.7,1.6,19.7,1.6,29.4,0
+	c3.7-0.5,7.3-1.6,10.7-3.2L62.5,45.4L62.5,45.4z M62.2,13.4c-0.4,0.3-0.9,0.6-1.3,0.9c-1.6,0.9-3.3,1.5-5,1.9
+	c-6.1,1.6-12.5,2.2-18.8,2.2c-6.3,0.1-12.6-0.6-18.8-2.2c-1.7-0.4-3.4-1.1-5-1.9c-0.4-0.2-0.9-0.5-1.3-0.9c-0.3-0.3-0.3-0.5-0.3-0.5
+	s0-0.2,0.3-0.5s0.7-0.6,1.3-0.9c1.6-0.9,3.3-1.5,5-1.9c12.4-3,25.2-3,37.6,0c1.7,0.4,3.4,1.1,5,1.9c0.4,0.2,0.9,0.5,1.3,0.9
+	c0.3,0.3,0.3,0.5,0.3,0.5S62.6,13.1,62.2,13.4z"/>
+</svg>
diff --git a/src/assets/img/mod/external-tool.svg b/src/assets/img/mod/external-tool.svg
index ebbbe3084..cc70c5de9 100644
--- a/src/assets/img/mod/external-tool.svg
+++ b/src/assets/img/mod/external-tool.svg
@@ -1,55 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" style="overflow:visible;enable-background:new 0 0 24 24;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="0" x2="11.9995" y2="24.001">
-	<stop  offset="0" style="stop-color:#90C50E"/>
-	<stop  offset="1" style="stop-color:#70A034"/>
-	<a:midPointStop  offset="0" style="stop-color:#90C50E"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#90C50E"/>
-	<a:midPointStop  offset="1" style="stop-color:#70A034"/>
-</linearGradient>
-<path style="fill:url(#SVGID_1_);" d="M21.1,12.3c1,0,1.7,0.9,1.7,0.9c0.3,0.4,0.7,0.8,0.9,0.8s0.3-0.5,0.3-1V8c0-0.5-0.5-1-1-1h-3
-	c-0.5,0-1-0.1-1-0.3c0-0.2,0.3-0.7,0.7-1.1c0,0,0.8-0.9,0.8-2.1C20.5,1.6,18.9,0,17,0s-3.5,1.6-3.5,3.5c0,1.2,0.8,2.1,0.8,2.1
-	C14.7,6,15,6.5,15,6.7C15,6.9,14.5,7,14,7H8C7.5,7,7,7.5,7,8v6c0,0.5-0.1,1-0.3,1S6,14.7,5.6,14.3c0,0-0.9-0.8-2.1-0.8
-	C1.6,13.5,0,15.1,0,17s1.6,3.5,3.5,3.5c1.2,0,2.1-0.8,2.1-0.8C6,19.3,6.5,19,6.7,19S7,19.5,7,20v3c0,0.5,0.5,1,1,1h4
-	c0.5,0,1-0.1,1-0.3s-0.3-0.6-0.7-1c0,0-0.6-0.6-0.6-1.6c0-1.4,1.3-2.5,2.7-2.5c1.4,0,2.4,1.1,2.4,2.5c0,1-0.9,1.7-0.9,1.7
-	c-0.4,0.3-0.8,0.7-0.8,0.9s0.5,0.3,1,0.3h7c0.5,0,1-0.5,1-1v-6c0-0.5-0.1-1-0.3-1s-0.6,0.3-1,0.7c0,0-0.6,0.6-1.6,0.6
-	c-1.4,0-2.5-1.3-2.5-2.7S19.7,12.3,21.1,12.3z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="1" x2="11.9995" y2="23.001">
-	<stop  offset="0" style="stop-color:#D9F991"/>
-	<stop  offset="0.2388" style="stop-color:#D7F88D"/>
-	<stop  offset="0.4501" style="stop-color:#D1F383"/>
-	<stop  offset="0.6509" style="stop-color:#C6EC71"/>
-	<stop  offset="0.844" style="stop-color:#B7E257"/>
-	<stop  offset="1" style="stop-color:#A8D73D"/>
-	<a:midPointStop  offset="0" style="stop-color:#D9F991"/>
-	<a:midPointStop  offset="0.7317" style="stop-color:#D9F991"/>
-	<a:midPointStop  offset="1" style="stop-color:#A8D73D"/>
-</linearGradient>
-<path style="fill:url(#SVGID_2_);" d="M17,23c0.4-0.4,0.7-1.1,0.7-1.9c0-2-1.5-3.5-3.4-3.5c-2,0-3.7,1.6-3.7,3.5
-	c0,0.9,0.3,1.5,0.6,1.9H8v-3c0-1.5-0.7-2-1.3-2c-0.6,0-1.3,0.6-1.7,0.9c0,0-0.7,0.6-1.5,0.6C2.1,19.5,1,18.4,1,17s1.1-2.5,2.5-2.5
-	c0.8,0,1.4,0.6,1.5,0.6C5.3,15.4,6.1,16,6.7,16C7.3,16,8,15.5,8,14V8h6c1.5,0,2-0.7,2-1.3c0-0.6-0.5-1.3-0.9-1.7
-	c0,0-0.6-0.7-0.6-1.5C14.5,2.1,15.6,1,17,1s2.5,1.1,2.5,2.5c0,0.8-0.6,1.5-0.6,1.5C18.5,5.4,18,6.1,18,6.7C18,7.3,18.5,8,20,8h3v4
-	c-0.4-0.4-1.1-0.7-1.9-0.7c-2,0-3.5,1.5-3.5,3.4c0,2,1.6,3.7,3.5,3.7c0.9,0,1.5-0.3,1.9-0.6V23H17z"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="2" x2="11.9995" y2="22.001">
-	<stop  offset="0" style="stop-color:#B3E810"/>
-	<stop  offset="1" style="stop-color:#90C60D"/>
-	<a:midPointStop  offset="0" style="stop-color:#B3E810"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#B3E810"/>
-	<a:midPointStop  offset="1" style="stop-color:#90C60D"/>
-</linearGradient>
-<path style="fill:url(#SVGID_3_);" d="M18.6,22c0.1-0.3,0.1-0.6,0.1-0.9c0-2.5-1.9-4.5-4.4-4.5c-2.5,0-4.7,2.1-4.7,4.5
-	c0,0.3,0,0.6,0.1,0.9H9v-2c0-2.1-1.2-3-2.3-3C7.8,17,9,16.1,9,14V9h5c2.1,0,3-1.2,3-2.3c0-0.7-0.4-1.5-1.2-2.4
-	c-0.1-0.1-0.3-0.5-0.3-0.8C15.5,2.7,16.2,2,17,2s1.5,0.7,1.5,1.5c0,0.3-0.3,0.7-0.3,0.8C17.4,5.2,17,6,17,6.7C17,7.8,17.9,9,20,9h2
-	v1.4c-0.3-0.1-0.6-0.1-0.9-0.1c-2.5,0-4.5,1.9-4.5,4.4c0,2.5,2.1,4.7,4.5,4.7c0.3,0,0.6,0,0.9-0.1V22H18.6z M3.5,18.5
-	C2.7,18.5,2,17.8,2,17s0.7-1.5,1.5-1.5c0.3,0,0.7,0.3,0.8,0.3C5.2,16.6,6,17,6.7,17c-0.7,0-1.5,0.4-2.4,1.2
-	C4.2,18.3,3.8,18.5,3.5,18.5z"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<path d="M69.9,38.6c1.1,1,2.9,0.8,3.7-0.3c0.4-0.4,0.7-1.1,0.7-1.7V13.2c0-1.4-1.2-2.6-2.6-2.6l0,0H53.1c-0.6-14.1-20.7-14.1-21.3,0
+	H13.2c-1.4,0-2.6,1.2-2.6,2.6l0,0v18.6c-14.1,0.6-14.1,20.7,0,21.3v18.6c0,1.4,1.2,2.6,2.6,2.6l0,0h23.4c1.4,0,2.6-1.3,2.6-2.8
+	c0-0.7-0.2-1.2-0.7-1.7c-4.6-5.4,3-12.2,7.8-7.2c1.9,2,1.9,5.1,0,7.2c-1,1.1-0.9,2.8,0.2,3.7c0.4,0.4,1.1,0.7,1.8,0.7h23.4
+	c1.4,0,2.6-1.2,2.6-2.6l0,0V48.2c0-1.4-1.3-2.6-2.8-2.6c-0.7,0-1.2,0.2-1.7,0.7c-2.2,2-5.5,1.8-7.5-0.3l0,0
+	C58,41,64.9,34.2,69.9,38.6z M66.4,53.1c0.9,0,1.8-0.1,2.6-0.3v16.3H52.7c1.4-5.7-2-11.5-7.6-13c-5.7-1.4-11.5,2-13,7.6
+	c-0.4,1.8-0.4,3.6,0,5.4H15.8v-19c0-1.4-1.2-2.6-2.6-2.6l0,0c-0.9,0.2-1.8,0.3-2.6,0.4c-7.1-0.2-7.1-10.5,0-10.6
+	c0.7,0,1.2,0.1,1.8,0.3c1.4,0.4,2.9-0.2,3.4-1.7c0.1-0.2,0.1-0.6,0.1-0.9V15.9H35c1.4,0,2.6-1.2,2.6-2.6c0-0.3,0-0.6-0.1-0.9
+	c-1-2.8,0.4-5.8,3.3-6.7c2.8-1,5.8,0.4,6.7,3.3c0.2,0.6,0.3,1.1,0.3,1.8l0,0c0,0.6-0.1,1.2-0.3,1.8c-0.4,1.4,0.2,2.9,1.7,3.4
+	c0.3,0.1,0.6,0.1,0.9,0.1h19.1v16.3c-5.7-1.4-11.5,2-12.9,7.7c-1.4,5.7,2,11.5,7.7,12.9C64.7,53,65.5,53.3,66.4,53.1L66.4,53.1z"/>
+</svg>
diff --git a/src/assets/img/mod/feedback.svg b/src/assets/img/mod/feedback.svg
index 58d0f080b..e4f8916f6 100644
--- a/src/assets/img/mod/feedback.svg
+++ b/src/assets/img/mod/feedback.svg
@@ -1,133 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" style="overflow:visible;enable-background:new 0 0 24 24;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="7.7681" y1="10.2231" x2="7.7681" y2="23.9805">
-	<stop  offset="0" style="stop-color:#DB6D17"/>
-	<stop  offset="1" style="stop-color:#BF3B08"/>
-	<a:midPointStop  offset="0" style="stop-color:#DB6D17"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#DB6D17"/>
-	<a:midPointStop  offset="1" style="stop-color:#BF3B08"/>
-</linearGradient>
-<path style="fill:url(#SVGID_1_);" d="M10.9,19.1c-1.1-0.8-1.7-1.1-2-2.4c-0.2-1.1-1.3-6.4-1.3-6.4l-4.9,1c0,0,0.9,4.6,1.8,9
-	c0.9,4.4,1,4.3,6.8,3.1C13.7,22.8,12.8,20.5,10.9,19.1z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="7.8569" y1="11.3994" x2="7.8569" y2="22.9805">
-	<stop  offset="0" style="stop-color:#F6A55E"/>
-	<stop  offset="1" style="stop-color:#EA5B03"/>
-	<a:midPointStop  offset="0" style="stop-color:#F6A55E"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#F6A55E"/>
-	<a:midPointStop  offset="1" style="stop-color:#EA5B03"/>
-</linearGradient>
-<path style="fill:url(#SVGID_2_);" d="M7,23c-0.8,0-0.9,0-1.5-3l-1.6-8l2.9-0.6L8,16.9c0.3,1.6,1,2.1,1.9,2.7l0.4,0.3
-	c1.1,0.8,1.5,1.7,1.4,2.1c0,0.2-0.5,0.3-0.6,0.3l-0.5,0.1C9,22.7,7.8,23,7,23L7,23z"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="7.7373" y1="12.5757" x2="7.7373" y2="21.8926">
-	<stop  offset="0" style="stop-color:#F17219"/>
-	<stop  offset="1" style="stop-color:#EA5B03"/>
-	<a:midPointStop  offset="0" style="stop-color:#F17219"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#F17219"/>
-	<a:midPointStop  offset="1" style="stop-color:#EA5B03"/>
-</linearGradient>
-<path style="fill:url(#SVGID_3_);" d="M7.7,21.9c-0.7,0-0.7,0-1.2-2.1l-1.4-7l1-0.2L7,17.1c0.4,1.9,1.4,2.7,2.3,3.3l0.4,0.3
-	C10.8,21.6,10.6,21.4,7.7,21.9z"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="11.0005" y1="0" x2="11.0005" y2="19.0039">
-	<stop  offset="0" style="stop-color:#C3C3C3"/>
-	<stop  offset="1" style="stop-color:#ACACAC"/>
-	<a:midPointStop  offset="0" style="stop-color:#C3C3C3"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#C3C3C3"/>
-	<a:midPointStop  offset="1" style="stop-color:#ACACAC"/>
-</linearGradient>
-<path style="fill:url(#SVGID_4_);" d="M12.5,5H4.6C2.1,5,0,7.2,0,9.5C0,11.8,2.1,14,4.6,14h7.6c0,0,5.7,0,9.8,5c0-4.9,0-9.5,0-9.5
-	s0-4.3,0-9.5C18.7,4.8,12.5,5,12.5,5z"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="11.0005" y1="2.6079" x2="11.0005" y2="16.5342">
-	<stop  offset="0" style="stop-color:#E9E9E9"/>
-	<stop  offset="1" style="stop-color:#C4C4C4"/>
-	<a:midPointStop  offset="0" style="stop-color:#E9E9E9"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#E9E9E9"/>
-	<a:midPointStop  offset="1" style="stop-color:#C4C4C4"/>
-</linearGradient>
-<path style="fill:url(#SVGID_5_);" d="M21,16.5C17,13,12.5,13,12.2,13H4.6C2.7,13,1,11.4,1,9.5S2.7,6,4.6,6h7.8
-	c0.3,0,4.9-0.2,8.5-3.4V16.5z"/>
-<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="11.0005" y1="4.5991" x2="11.0005" y2="14.5273">
-	<stop  offset="0" style="stop-color:#F7F7F7"/>
-	<stop  offset="0.1044" style="stop-color:#FCFCFC"/>
-	<stop  offset="0.3293" style="stop-color:#FFFFFF"/>
-	<stop  offset="0.5692" style="stop-color:#E8E8E8"/>
-	<stop  offset="0.8153" style="stop-color:#D7D7D7"/>
-	<stop  offset="1" style="stop-color:#D1D1D1"/>
-	<a:midPointStop  offset="0" style="stop-color:#F7F7F7"/>
-	<a:midPointStop  offset="0.2222" style="stop-color:#F7F7F7"/>
-	<a:midPointStop  offset="0.3293" style="stop-color:#FFFFFF"/>
-	<a:midPointStop  offset="0.3545" style="stop-color:#FFFFFF"/>
-	<a:midPointStop  offset="1" style="stop-color:#D1D1D1"/>
-</linearGradient>
-<path style="fill:url(#SVGID_6_);" d="M20,14.5C16.2,12,12.4,12,12.2,12H4.6C3.3,12,2,10.8,2,9.5S3.3,7,4.6,7h7.8
-	c0.2,0,4-0.2,7.5-2.4V14.5z"/>
-<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="5.501" y1="5.0015" x2="5.501" y2="14.002">
-	<stop  offset="0" style="stop-color:#DB6D17"/>
-	<stop  offset="1" style="stop-color:#BF3B08"/>
-	<a:midPointStop  offset="0" style="stop-color:#DB6D17"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#DB6D17"/>
-	<a:midPointStop  offset="1" style="stop-color:#BF3B08"/>
-</linearGradient>
-<path style="fill:url(#SVGID_7_);" d="M11,5H4.6C2.1,5,0,7.2,0,9.5C0,11.8,2.1,14,4.6,14H11V5z"/>
-<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="6.001" y1="6.0015" x2="6.001" y2="13.0015">
-	<stop  offset="0" style="stop-color:#F6A55E"/>
-	<stop  offset="1" style="stop-color:#EA5B03"/>
-	<a:midPointStop  offset="0" style="stop-color:#F6A55E"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#F6A55E"/>
-	<a:midPointStop  offset="1" style="stop-color:#EA5B03"/>
-</linearGradient>
-<path style="fill:url(#SVGID_8_);" d="M11,6H4.6C2.7,6,1,7.6,1,9.5S2.7,13,4.6,13H11V6z"/>
-<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="6.501" y1="7.0015" x2="6.501" y2="12.0015">
-	<stop  offset="0.2195" style="stop-color:#F6A55E"/>
-	<stop  offset="0.5076" style="stop-color:#F28C3F"/>
-	<stop  offset="1" style="stop-color:#EA5B03"/>
-	<a:midPointStop  offset="0.2195" style="stop-color:#F6A55E"/>
-	<a:midPointStop  offset="0.5304" style="stop-color:#F6A55E"/>
-	<a:midPointStop  offset="1" style="stop-color:#EA5B03"/>
-</linearGradient>
-<path style="fill:url(#SVGID_9_);" d="M11,7H4.6C3.3,7,2,8.2,2,9.5S3.3,12,4.6,12H11V7z"/>
-<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="22.002" y1="1.464844e-03" x2="22.002" y2="19.002">
-	<stop  offset="0" style="stop-color:#DB6D17"/>
-	<stop  offset="1" style="stop-color:#BF3B08"/>
-	<a:midPointStop  offset="0" style="stop-color:#DB6D17"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#DB6D17"/>
-	<a:midPointStop  offset="1" style="stop-color:#BF3B08"/>
-</linearGradient>
-<path style="fill:url(#SVGID_10_);" d="M20,17c0,1.1,0.9,2,2,2l0,0c1.1,0,2-0.9,2-2V2c0-1.1-0.9-2-2-2l0,0c-1.1,0-2,0.9-2,2V17z"/>
-<linearGradient id="SVGID_11_" gradientUnits="userSpaceOnUse" x1="22.002" y1="1.0015" x2="22.002" y2="18.002">
-	<stop  offset="0" style="stop-color:#F6A55E"/>
-	<stop  offset="1" style="stop-color:#EA5B03"/>
-	<a:midPointStop  offset="0" style="stop-color:#F6A55E"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#F6A55E"/>
-	<a:midPointStop  offset="1" style="stop-color:#EA5B03"/>
-</linearGradient>
-<path style="fill:url(#SVGID_11_);" d="M22,18c-0.6,0-1-0.4-1-1V2c0-0.6,0.4-1,1-1s1,0.4,1,1v15C23,17.6,22.6,18,22,18z"/>
-<linearGradient id="SVGID_12_" gradientUnits="userSpaceOnUse" x1="22.002" y1="1.0015" x2="22.002" y2="18.002">
-	<stop  offset="0" style="stop-color:#F17219"/>
-	<stop  offset="9.009037e-02" style="stop-color:#F38A39"/>
-	<stop  offset="0.183" style="stop-color:#F59E54"/>
-	<stop  offset="0.2378" style="stop-color:#F6A55E"/>
-	<stop  offset="0.2464" style="stop-color:#F5A35C"/>
-	<stop  offset="0.3809" style="stop-color:#EC8740"/>
-	<stop  offset="0.5155" style="stop-color:#E5722C"/>
-	<stop  offset="0.649" style="stop-color:#E06620"/>
-	<stop  offset="0.7805" style="stop-color:#DF621C"/>
-	<stop  offset="1" style="stop-color:#D64701"/>
-	<a:midPointStop  offset="0" style="stop-color:#F17219"/>
-	<a:midPointStop  offset="0.4103" style="stop-color:#F17219"/>
-	<a:midPointStop  offset="0.2378" style="stop-color:#F6A55E"/>
-	<a:midPointStop  offset="0.296" style="stop-color:#F6A55E"/>
-	<a:midPointStop  offset="0.7805" style="stop-color:#DF621C"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#DF621C"/>
-	<a:midPointStop  offset="1" style="stop-color:#D64701"/>
-</linearGradient>
-<path style="fill:url(#SVGID_12_);" d="M22,18c-0.6,0-1-0.4-1-1V2c0-0.6,0.4-1,1-1s1,0.4,1,1v15C23,17.6,22.6,18,22,18z"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<g>
+	<path d="M62.8,0.2C62-0.2,61.1,0,60.5,0.7C60.3,0.9,45.7,15.9,31,17.3v26.2c14.7,1.3,29.3,16.4,29.5,16.6c0.8,0.8,2.1,0.8,2.9,0
+		c0.3-0.4,0.6-0.9,0.6-1.5V2.4C64,1.3,63.5,0.5,62.8,0.2z M58.9,52.3c-6.6-5.9-14.2-11.1-22.6-13.1V21.6c8.5-2,16-7.2,22.6-13.1
+		V52.3z"/>
+	<path d="M72.8,25.4c-0.8-1.5-2.1-2.6-3.4-3.4v16.7C74,36,75.6,30,72.8,25.4z"/>
+	<path d="M25.8,43.2V17.3H12.9C5.7,17.3,0,23.1,0,30.2c0,7.2,5.8,12.9,12.9,12.9h12.9V43.2z M5.1,30.3c0-4.3,3.5-7.6,7.6-7.6h7.6V38
+		h-7.6C8.6,37.9,5.1,34.6,5.1,30.3z"/>
+	<path d="M24.4,48.4h-14c-0.6,0-1.1-0.1-1.7-0.3c2,8.4,4.7,16.4,8,24.1c0.6,1.3,2.3,2.2,3.2,2.2h12.4c1.2,0,1.9-1.6,1.6-3.5
+		c-0.1-0.6-0.3-1.2-0.6-1.8C31.8,67.1,25.1,50.6,24.4,48.4z M20.9,69.2c-1.3-3.1-4.6-12.3-5.5-15.5h5.4c0,0,5.6,14.8,6,15.5H20.9
+		L20.9,69.2z"/>
+</g>
+</svg>
diff --git a/src/assets/img/mod/folder.svg b/src/assets/img/mod/folder.svg
index 6c2a9fe19..e8dd12e1a 100644
--- a/src/assets/img/mod/folder.svg
+++ b/src/assets/img/mod/folder.svg
@@ -1,65 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="-0.1 -2 24 24"
-	 style="overflow:visible;enable-background:new -0.1 -2 24 24;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="11.9351" y1="0" x2="11.9351" y2="20.0005">
-	<stop  offset="0" style="stop-color:#76A1F0"/>
-	<stop  offset="1" style="stop-color:#6B90D5"/>
-	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
-</linearGradient>
-<path style="fill:url(#SVGID_1_);" d="M21.9,19c0,0.5-0.5,1-1,1h-18c-0.5,0-1-0.5-1-1V1.1c0-0.5,0.5-1.1,1-1.1h4
-	c0.5,0,1.4,0.3,1.8,0.6l0.9,0.7C10.1,1.7,10.9,2,11.4,2l9.5,0c0.5,0,1,0.5,1,1V19z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="11.9351" y1="0.9888" x2="11.9351" y2="19.0005">
-	<stop  offset="0" style="stop-color:#BBE0F7"/>
-	<stop  offset="1" style="stop-color:#82B4FB"/>
-	<a:midPointStop  offset="0" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="1" style="stop-color:#82B4FB"/>
-</linearGradient>
-<path style="fill:url(#SVGID_2_);" d="M2.9,19V1.1C2.9,1.1,3,1,3,1l3.9,0c0.3,0,0.9,0.2,1.2,0.4L9,2.2C9.7,2.6,10.7,3,11.4,3l9.5,0
-	v16H2.9z"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="11.9351" y1="1.9917" x2="11.9351" y2="18.0005">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<path style="fill:url(#SVGID_3_);" d="M3.9,18V2l3,0C7,2,7.4,2.1,7.5,2.2L8.4,3c0.8,0.6,2.1,1,3,1l8.5,0v14H3.9z"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="11.936" y1="5" x2="11.936" y2="20.0005">
-	<stop  offset="0" style="stop-color:#76A1F0"/>
-	<stop  offset="1" style="stop-color:#6B90D5"/>
-	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
-</linearGradient>
-<path style="fill:url(#SVGID_4_);" d="M23,19c0,0.5-0.5,1-1.1,1h-20c-0.5,0-1-0.5-1.1-1L0,6c0-0.5,0.4-1,0.9-1h22c0.5,0,1,0.5,0.9,1
-	L23,19z"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="11.9673" y1="5.9541" x2="11.9673" y2="19.0005">
-	<stop  offset="0" style="stop-color:#BBE0F7"/>
-	<stop  offset="1" style="stop-color:#82B4FB"/>
-	<a:midPointStop  offset="0" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="1" style="stop-color:#82B4FB"/>
-</linearGradient>
-<path style="fill:url(#SVGID_5_);" d="M1.9,19c0,0-0.1-0.1-0.1-0.1L1,6l21.9,0L22,18.9c0,0,0,0.1-0.1,0.1H1.9z"/>
-<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="11.9663" y1="6.9565" x2="11.9663" y2="18.0005">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_6_);" points="2.8,18 2.1,7 21.9,7 21.1,18 "/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<path d="M74.3,21c0-2.2-1.4-3.9-3.2-3.9H38l-7.4-11C30,5.4,29.1,5,28.3,5H3.4C1.6,5,0.1,6.8,0.1,9.1V65c0,2.2,1.5,3.9,3.3,4.1h67.7
+	c1.5,0,2.9-1.3,3.2-3.1c0-44.1,0.1-18.7,0.1-39.8L74.3,21L74.3,21z M69.1,22.6v41.2L5.2,63.6V10.2l22.3,0.3l7.7,11.4
+	c0.4,0.5,1,0.8,1.5,0.8H69.1z"/>
+</svg>
diff --git a/src/assets/img/mod/forum.svg b/src/assets/img/mod/forum.svg
index aab9a8f44..defe1015d 100644
--- a/src/assets/img/mod/forum.svg
+++ b/src/assets/img/mod/forum.svg
@@ -1,71 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" style="overflow:visible;enable-background:new 0 0 24 24;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="10.4995" y1="0" x2="10.4995" y2="19.4312">
-	<stop  offset="0" style="stop-color:#76A1F0"/>
-	<stop  offset="1" style="stop-color:#6B90D5"/>
-	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
-</linearGradient>
-<path style="fill:url(#SVGID_1_);" d="M19,0H2C0.9,0,0,0.9,0,2v11.3C0,14.4,0.9,15,2,15h0v4.4L6.1,15H19c1.1,0,2-0.5,2-1.6V2
-	C21,0.9,20,0,19,0z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="10.4995" y1="0.9531" x2="10.4995" y2="16.8384">
-	<stop  offset="0" style="stop-color:#BBE0F7"/>
-	<stop  offset="1" style="stop-color:#82B4FB"/>
-	<a:midPointStop  offset="0" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="1" style="stop-color:#82B4FB"/>
-</linearGradient>
-<path style="fill:url(#SVGID_2_);" d="M3,14H2c-0.4,0-1-0.1-1-0.6V2c0-0.6,0.5-1,1-1H19c0.5,0,1,0.5,1,1v11.3c0,0.6-0.8,0.6-1,0.6
-	H5.7L3,16.8V14z"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="10.4985" y1="1.9775" x2="10.4985" y2="14.314">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<path style="fill:url(#SVGID_3_);" d="M4,13c0,0-2,0-2,0V2l17,0l0,11c0,0-13.8,0-13.8,0L4,14.3V13z"/>
-<path style="fill:#FFFFFF;" d="M17,11H4v-1h13V11z M17,8H4v1h13V8z M17,6H4v1h13V6z M17,4H4v1h13V4z"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="15" y1="7.8955" x2="15" y2="23.897">
-	<stop  offset="0" style="stop-color:#90C50E"/>
-	<stop  offset="1" style="stop-color:#70A034"/>
-	<a:midPointStop  offset="0" style="stop-color:#90C50E"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#90C50E"/>
-	<a:midPointStop  offset="1" style="stop-color:#70A034"/>
-</linearGradient>
-<path style="fill:url(#SVGID_4_);" d="M22,7.9H8c-1.1,0-2,0.7-2,1.8v9c0,1.1,0.9,2,2,2v3.2l3.1-3H22c1.1,0,2-1.1,2-2.2v-9
-	C24,8.6,23.1,7.9,22,7.9z"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="15" y1="8.8955" x2="15" y2="21.3911">
-	<stop  offset="0" style="stop-color:#D9F991"/>
-	<stop  offset="0.2388" style="stop-color:#D7F88D"/>
-	<stop  offset="0.4501" style="stop-color:#D1F383"/>
-	<stop  offset="0.6509" style="stop-color:#C6EC71"/>
-	<stop  offset="0.844" style="stop-color:#B7E257"/>
-	<stop  offset="1" style="stop-color:#A8D73D"/>
-	<a:midPointStop  offset="0" style="stop-color:#D9F991"/>
-	<a:midPointStop  offset="0.7317" style="stop-color:#D9F991"/>
-	<a:midPointStop  offset="1" style="stop-color:#A8D73D"/>
-</linearGradient>
-<path style="fill:url(#SVGID_5_);" d="M9,19.9H8c-0.6,0-1-0.7-1-1.2v-9c0-0.6,0.4-0.8,1-0.8h14c0.6,0,1,0.2,1,0.8v9
-	c0,0.6-0.4,1.2-1,1.2H10.6L9,21.4V19.9z"/>
-<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="15" y1="9.8955" x2="15" y2="18.896">
-	<stop  offset="0" style="stop-color:#B3E810"/>
-	<stop  offset="1" style="stop-color:#90C60D"/>
-	<a:midPointStop  offset="0" style="stop-color:#B3E810"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#B3E810"/>
-	<a:midPointStop  offset="1" style="stop-color:#90C60D"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_6_);" points="10,18.9 8,18.9 8,9.9 22,9.9 22,18.9 10.2,18.9 10,18.9 "/>
-<path style="fill:#FFFFFF;" d="M20,16.9H10v-1h10V16.9z M20,13.9H10v1h10V13.9z M20,11.9H10v1h10V11.9z"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<g>
+	<path d="M62,3.8L62,3.8H12.4C5.5,3.8,0,9.4,0,16.2l0,0v33.6c0,6.9,5.6,12.3,12.4,12.3h9l13.7,11.6c1.2,0.9,2.8,0.9,4,0l13.8-11.6h9
+		c6.9,0,12.4-5.6,12.4-12.4V16.2C74.3,9.3,68.9,3.8,62,3.8z M69.1,15.5v34.6c0,3.5-2.8,6.3-6.3,6.3l0,0h-9.2c-1.5,0-2.9,0.5-4.1,1.5
+		L37.3,68.1L25,57.9c-1.1-1-2.6-1.5-4.1-1.5h-9.1c-3.5,0-6.3-2.8-6.3-6.3l0,0V15.5c0-3.5,2.8-6.3,6.3-6.3l0,0h50.8
+		C66.1,9.2,69.1,12,69.1,15.5L69.1,15.5z"/>
+	<path d="M14.9,35.4c0.1,0,32.4,0,32.4,0c1.4,0,2.6-1.2,2.6-2.6c0-1.4-1.2-2.6-2.6-2.6H15.2c-1.4-0.1-2.7,1-2.8,2.4
+		C12.4,34.1,13.5,35.3,14.9,35.4z"/>
+	<path d="M15.1,24.9h16.1c1.4-0.1,2.5-1.3,2.4-2.8c-0.1-1.3-1.1-2.4-2.4-2.4h-16c-1.4,0-2.6,1.2-2.5,2.7
+		C12.8,23.7,13.8,24.8,15.1,24.9z"/>
+	<path d="M47.2,40.6H15.1c-1.4-0.1-2.7,1-2.8,2.4c-0.1,1.4,1,2.7,2.4,2.8c0.1,0,32.4,0,32.4,0c1.5,0,2.6-1.1,2.6-2.6
+		S48.7,40.6,47.2,40.6z"/>
+</g>
+</svg>
diff --git a/src/assets/img/mod/glossary.svg b/src/assets/img/mod/glossary.svg
index f330727e3..465bc2dcd 100644
--- a/src/assets/img/mod/glossary.svg
+++ b/src/assets/img/mod/glossary.svg
@@ -1,146 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="-2 0 24 24" style="overflow:visible;enable-background:new -2 0 24 24;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="17.5" y1="16" x2="17.5" y2="22">
-	<stop  offset="0" style="stop-color:#DB6D17"/>
-	<stop  offset="1" style="stop-color:#BF3B08"/>
-	<a:midPointStop  offset="0" style="stop-color:#DB6D17"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#DB6D17"/>
-	<a:midPointStop  offset="1" style="stop-color:#BF3B08"/>
-</linearGradient>
-<rect x="15" y="16" style="fill:url(#SVGID_1_);" width="5" height="6"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="17.5" y1="17" x2="17.5" y2="21">
-	<stop  offset="0" style="stop-color:#F6A55E"/>
-	<stop  offset="1" style="stop-color:#EA5B03"/>
-	<a:midPointStop  offset="0" style="stop-color:#F6A55E"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#F6A55E"/>
-	<a:midPointStop  offset="1" style="stop-color:#EA5B03"/>
-</linearGradient>
-<rect x="16" y="17" style="fill:url(#SVGID_2_);" width="3" height="4"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="17.5" y1="18" x2="17.5" y2="20">
-	<stop  offset="0" style="stop-color:#F17219"/>
-	<stop  offset="1" style="stop-color:#EA5B03"/>
-	<a:midPointStop  offset="0" style="stop-color:#F17219"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#F17219"/>
-	<a:midPointStop  offset="1" style="stop-color:#EA5B03"/>
-</linearGradient>
-<rect x="17" y="18" style="fill:url(#SVGID_3_);" width="1" height="2"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="17.5" y1="9" x2="17.5" y2="15.0005">
-	<stop  offset="0" style="stop-color:#90C50E"/>
-	<stop  offset="1" style="stop-color:#70A034"/>
-	<a:midPointStop  offset="0" style="stop-color:#90C50E"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#90C50E"/>
-	<a:midPointStop  offset="1" style="stop-color:#70A034"/>
-</linearGradient>
-<rect x="15" y="9" style="fill:url(#SVGID_4_);" width="5" height="6"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="17.5" y1="10" x2="17.5" y2="14.0005">
-	<stop  offset="0" style="stop-color:#D9F991"/>
-	<stop  offset="0.2388" style="stop-color:#D7F88D"/>
-	<stop  offset="0.4501" style="stop-color:#D1F383"/>
-	<stop  offset="0.6509" style="stop-color:#C6EC71"/>
-	<stop  offset="0.844" style="stop-color:#B7E257"/>
-	<stop  offset="1" style="stop-color:#A8D73D"/>
-	<a:midPointStop  offset="0" style="stop-color:#D9F991"/>
-	<a:midPointStop  offset="0.7317" style="stop-color:#D9F991"/>
-	<a:midPointStop  offset="1" style="stop-color:#A8D73D"/>
-</linearGradient>
-<rect x="16" y="10" style="fill:url(#SVGID_5_);" width="3" height="4"/>
-<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="17.5" y1="11" x2="17.5" y2="13">
-	<stop  offset="0" style="stop-color:#B3E810"/>
-	<stop  offset="1" style="stop-color:#90C60D"/>
-	<a:midPointStop  offset="0" style="stop-color:#B3E810"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#B3E810"/>
-	<a:midPointStop  offset="1" style="stop-color:#90C60D"/>
-</linearGradient>
-<rect x="17" y="11" style="fill:url(#SVGID_6_);" width="1" height="2"/>
-<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="8.4995" y1="0" x2="8.4995" y2="24.0005">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<rect style="fill:url(#SVGID_7_);" width="17" height="24"/>
-<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="8.4995" y1="1" x2="8.4995" y2="23.0005">
-	<stop  offset="0" style="stop-color:#E7F4FC"/>
-	<stop  offset="1" style="stop-color:#DEEFFC"/>
-	<a:midPointStop  offset="0" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="1" style="stop-color:#DEEFFC"/>
-</linearGradient>
-<rect x="1" y="1" style="fill:url(#SVGID_8_);" width="15" height="22"/>
-<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="8.4995" y1="2" x2="8.4995" y2="22.0005">
-	<stop  offset="0" style="stop-color:#CEE9F9"/>
-	<stop  offset="1" style="stop-color:#BBDFF8"/>
-	<a:midPointStop  offset="0" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="1" style="stop-color:#BBDFF8"/>
-</linearGradient>
-<rect x="2" y="2" style="fill:url(#SVGID_9_);" width="13" height="20"/>
-<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="17.5" y1="2" x2="17.5" y2="8">
-	<stop  offset="0" style="stop-color:#76A1F0"/>
-	<stop  offset="1" style="stop-color:#6B90D5"/>
-	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
-</linearGradient>
-<rect x="15" y="2" style="fill:url(#SVGID_10_);" width="5" height="6"/>
-<linearGradient id="SVGID_11_" gradientUnits="userSpaceOnUse" x1="17.5" y1="3" x2="17.5" y2="7">
-	<stop  offset="0" style="stop-color:#BBE0F7"/>
-	<stop  offset="1" style="stop-color:#82B4FB"/>
-	<a:midPointStop  offset="0" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="1" style="stop-color:#82B4FB"/>
-</linearGradient>
-<rect x="16" y="3" style="fill:url(#SVGID_11_);" width="3" height="4"/>
-<linearGradient id="SVGID_12_" gradientUnits="userSpaceOnUse" x1="17.5" y1="4" x2="17.5" y2="6">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<rect x="17" y="4" style="fill:url(#SVGID_12_);" width="1" height="2"/>
-<linearGradient id="SVGID_13_" gradientUnits="userSpaceOnUse" x1="12.4248" y1="10.7285" x2="12.4248" y2="15.9702">
-	<stop  offset="0" style="stop-color:#76A1F0"/>
-	<stop  offset="5.472010e-02" style="stop-color:#739DE9"/>
-	<stop  offset="0.2045" style="stop-color:#6F95DE"/>
-	<stop  offset="0.4149" style="stop-color:#6C91D7"/>
-	<stop  offset="1" style="stop-color:#6B90D5"/>
-	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="0.13" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
-</linearGradient>
-<path style="fill:url(#SVGID_13_);" d="M12.7,15.2C12,15.7,11.5,16,11,16c-0.3,0-0.5-0.1-0.7-0.3C10.1,15.5,10,15.3,10,15
-	c0-0.4,0.2-0.7,0.5-1c0.3-0.3,1-0.7,2.2-1.2v-0.5c0-0.4,0-0.6-0.1-0.7c0-0.1-0.1-0.2-0.2-0.3c-0.1-0.1-0.2-0.1-0.4-0.1
-	c-0.2,0-0.4,0.1-0.6,0.2c-0.1,0.1-0.1,0.1-0.1,0.2c0,0.1,0,0.2,0.2,0.3c0.1,0.2,0.2,0.3,0.2,0.4c0,0.2-0.1,0.3-0.2,0.4
-	c-0.1,0.1-0.3,0.2-0.5,0.2c-0.2,0-0.4-0.1-0.6-0.2s-0.2-0.3-0.2-0.5c0-0.3,0.1-0.5,0.3-0.7c0.2-0.2,0.5-0.4,0.9-0.5s0.7-0.2,1.1-0.2
-	c0.5,0,0.9,0.1,1.1,0.3c0.3,0.2,0.5,0.4,0.5,0.7c0.1,0.2,0.1,0.5,0.1,1v1.9c0,0.2,0,0.4,0,0.4c0,0.1,0,0.1,0.1,0.1c0,0,0.1,0,0.1,0
-	c0.1,0,0.2-0.1,0.3-0.2l0.2,0.1c-0.2,0.3-0.4,0.5-0.6,0.6c-0.2,0.1-0.4,0.2-0.7,0.2c-0.3,0-0.5-0.1-0.7-0.2
-	C12.8,15.6,12.7,15.4,12.7,15.2z M12.7,14.8v-1.7c-0.4,0.3-0.8,0.5-1,0.8c-0.1,0.2-0.2,0.4-0.2,0.6c0,0.2,0.1,0.3,0.2,0.4
-	c0.1,0.1,0.2,0.1,0.4,0.1C12.2,15.1,12.4,15,12.7,14.8z"/>
-<linearGradient id="SVGID_14_" gradientUnits="userSpaceOnUse" x1="6.3535" y1="8.2671" x2="6.3535" y2="15.7007">
-	<stop  offset="0" style="stop-color:#76A1F0"/>
-	<stop  offset="5.472010e-02" style="stop-color:#739DE9"/>
-	<stop  offset="0.2045" style="stop-color:#6F95DE"/>
-	<stop  offset="0.4149" style="stop-color:#6C91D7"/>
-	<stop  offset="1" style="stop-color:#6B90D5"/>
-	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="0.13" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
-</linearGradient>
-<path style="fill:url(#SVGID_14_);" d="M7,13.6H4.4l-0.3,0.7c-0.1,0.2-0.2,0.4-0.2,0.6c0,0.2,0.1,0.4,0.2,0.5
-	c0.1,0.1,0.3,0.1,0.7,0.1v0.2H2.5v-0.2c0.3,0,0.5-0.1,0.6-0.3c0.2-0.2,0.4-0.5,0.6-1.1l2.6-5.8h0.1l2.6,6c0.2,0.6,0.5,0.9,0.6,1.1
-	c0.1,0.1,0.3,0.2,0.5,0.2v0.2H6.7v-0.2h0.1c0.3,0,0.5,0,0.6-0.1c0.1-0.1,0.1-0.1,0.1-0.2c0-0.1,0-0.1,0-0.2c0,0-0.1-0.2-0.2-0.4
-	L7,13.6z M6.8,13.2l-1.1-2.5l-1.1,2.5H6.8z"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<path d="M67.7,67.9V6.6c0-0.8-0.4-1.5-1.3-2l-8.7-4.4C57.4,0.1,57,0,56.7,0H8.8C7.5,0.1,6.6,1,6.6,2.2v70c-0.1,1,0.8,2.1,2.2,2.2
+	h47.9c0.3,0,0.7-0.1,1-0.2l8.7-4.4C67.3,69.4,67.7,68.7,67.7,67.9z M62.5,66l-4.4,2.2V57.7l4.4-2.2V66z M62.5,49.6l-4.4,2.2V41.3
+	l4.4-2.2V49.6z M62.5,33.5l-4.4,2.2V25.2l4.4-2.2V33.5z M61.4,17.7l-7.2,3c-0.7,0.5-1.3,1.2-1.3,2v46.4h-41V5.2h43.5L61.3,8
+	L61.4,17.7z"/>
+</svg>
diff --git a/src/assets/img/mod/h5pactivity.svg b/src/assets/img/mod/h5pactivity.svg
index 97fef5728..d76a924d5 100644
--- a/src/assets/img/mod/h5pactivity.svg
+++ b/src/assets/img/mod/h5pactivity.svg
@@ -1 +1,16 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" preserveAspectRatio="xMinYMid meet"><title>h5p finalArtboard 1</title><rect width="24" height="24" rx="3" ry="3" fill="#0882c8"/><path d="M22.1,8a3.37,3.37,0,0,0-2.42-.77H16.05v2H11.71l-.36,1.46a6.32,6.32,0,0,1,1-.35,3.49,3.49,0,0,1,.86-.06,3.24,3.24,0,0,1,2.35.88,2.93,2.93,0,0,1,.9,2.2A3.72,3.72,0,0,1,16,15.19a3.16,3.16,0,0,1-1.31,1.32,3.41,3.41,0,0,1-.67.27H17.7V13.28h1.65A3.8,3.8,0,0,0,22,12.46a3,3,0,0,0,.88-2.28A2.9,2.9,0,0,0,22.1,8Zm-2.44,3a1.88,1.88,0,0,1-1.21.29H17.7V9.2h.87a1.56,1.56,0,0,1,1.13.31,1,1,0,0,1,.3.76A.94.94,0,0,1,19.66,11Z" fill="#fff"/><path d="M12.27,12.05a1.33,1.33,0,0,0-1.19.74l-2.6-.37,1.17-5.2H7.29v4.08H4V7.23H1.1v9.55H4V13.28H7.29v3.49h3.57a3.61,3.61,0,0,1-1.13-.53A3.2,3.2,0,0,1,9,15.43a4,4,0,0,1-.48-1.09L11.09,14a1.32,1.32,0,1,0,1.18-1.92Z" fill="#fff"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<g>
+	<path d="M40.9,38.3c-1.9-1.5-4.7-1.2-6.2,0.7l0,0L34,39.8l-4.3-0.6c-2.4-0.3-4.3-0.7-4.4-0.7c0-0.6,0.1-1.2,0.3-1.8
+		c0.3-1.6,3.3-14.7,3.5-15.4l0.1-0.3h-8v13.9H10.2V21h-10v32.3h10V41.3H21v11.9H27c3.2,0,5.9,0,5.8-0.1c-0.3-0.2-0.8-0.3-1.1-0.5
+		c-2.1-0.8-3.9-2.4-5.1-4.3c-0.7-1.1-1.5-3.2-1.4-3.4c0.2-0.2,2-0.3,4.4-0.7l4.3-0.6l0.8,0.8c1.5,1.9,4.3,2.1,6.2,0.6
+		c1.9-1.5,2.1-4.3,0.6-6.2C41.3,38.8,41.1,38.5,40.9,38.3z"/>
+	<path d="M74.2,30.8c0.1-1.2-0.1-2.5-0.4-3.6c-1-3.1-3-4.9-6.4-5.8c-1.2-0.3-1.8-0.3-8.8-0.4L51,21v6.7H36.4l-0.5,2.2
+		c-0.3,1.2-0.5,2.3-0.6,2.5c0,0.1,0,0.2,0.2,0.1c0.2-0.1,0.8-0.3,1.7-0.5c1.4-0.4,1.6-0.4,4.2-0.4c2.5,0,2.9,0.1,4.1,0.4
+		c1.7,0.5,3.2,1.5,4.4,2.8c1.9,1.9,2.9,4.4,2.7,7.1c0,5-3,9.7-6.9,11c-0.3,0.1-0.7,0.3-0.9,0.4c1.9,0.2,3.8,0.2,5.7,0.2h5.8V41.5H59
+		c2.7,0.1,5.4-0.1,8-0.6c3.4-0.8,6-3.4,6.9-6.7C74.2,33,74.3,31.9,74.2,30.8z M64.4,32.2c-0.4,1.1-1.3,1.9-2.5,2.3
+		c-1.1,0.3-2.2,0.3-3.4,0.3l-2.5,0.1v-7.5l2.6,0.1c1.1,0,2.1,0.1,3.2,0.3C63.8,28.3,64.9,30.3,64.4,32.2L64.4,32.2z"/>
+</g>
+</svg>
diff --git a/src/assets/img/mod/imscp.svg b/src/assets/img/mod/imscp.svg
index 5589cd0c5..30705d0a2 100644
--- a/src/assets/img/mod/imscp.svg
+++ b/src/assets/img/mod/imscp.svg
@@ -1,156 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="0 -2 24 24" style="overflow:visible;enable-background:new 0 -2 24 24;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="18" y1="10" x2="18" y2="20.0005">
-	<stop  offset="0" style="stop-color:#F0A829"/>
-	<stop  offset="1" style="stop-color:#C7671A"/>
-	<a:midPointStop  offset="0" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="1" style="stop-color:#C7671A"/>
-</linearGradient>
-<rect x="13" y="10" style="fill:url(#SVGID_1_);" width="10" height="10"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="18" y1="11" x2="18" y2="19.0005">
-	<stop  offset="0" style="stop-color:#FFEBA8"/>
-	<stop  offset="1" style="stop-color:#F8BE27"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFEBA8"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFEBA8"/>
-	<a:midPointStop  offset="1" style="stop-color:#F8BE27"/>
-</linearGradient>
-<rect x="14" y="11" style="fill:url(#SVGID_2_);" width="8" height="8"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="18" y1="12" x2="18" y2="18">
-	<stop  offset="0" style="stop-color:#FFC30F"/>
-	<stop  offset="1" style="stop-color:#F5AE0D"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="1" style="stop-color:#F5AE0D"/>
-</linearGradient>
-<rect x="15" y="12" style="fill:url(#SVGID_3_);" width="6" height="6"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="18" y1="10" x2="18" y2="14.0005">
-	<stop  offset="0" style="stop-color:#F0A829"/>
-	<stop  offset="1" style="stop-color:#C7671A"/>
-	<a:midPointStop  offset="0" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="1" style="stop-color:#C7671A"/>
-</linearGradient>
-<rect x="12" y="10" style="fill:url(#SVGID_4_);" width="12" height="4"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="18" y1="11" x2="18" y2="13.0005">
-	<stop  offset="0" style="stop-color:#FFC30F"/>
-	<stop  offset="1" style="stop-color:#F5AE0D"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="1" style="stop-color:#F5AE0D"/>
-</linearGradient>
-<rect x="13" y="11" style="fill:url(#SVGID_5_);" width="10" height="2"/>
-<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="18" y1="10" x2="18" y2="16.4233">
-	<stop  offset="0" style="stop-color:#8D470D"/>
-	<stop  offset="1" style="stop-color:#7C3D09"/>
-	<a:midPointStop  offset="0" style="stop-color:#8D470D"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#8D470D"/>
-	<a:midPointStop  offset="1" style="stop-color:#7C3D09"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_6_);" points="17,10 17,11.7 17,15 17,16.4 18,15.5 19,16.4 19,15 19,11.7 19,10 "/>
-<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="6" y1="10" x2="6" y2="20.0005">
-	<stop  offset="0" style="stop-color:#F0A829"/>
-	<stop  offset="1" style="stop-color:#C7671A"/>
-	<a:midPointStop  offset="0" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="1" style="stop-color:#C7671A"/>
-</linearGradient>
-<rect x="1" y="10" style="fill:url(#SVGID_7_);" width="10" height="10"/>
-<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="6" y1="11" x2="6" y2="19.0005">
-	<stop  offset="0" style="stop-color:#FFEBA8"/>
-	<stop  offset="1" style="stop-color:#F8BE27"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFEBA8"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFEBA8"/>
-	<a:midPointStop  offset="1" style="stop-color:#F8BE27"/>
-</linearGradient>
-<rect x="2" y="11" style="fill:url(#SVGID_8_);" width="8" height="8"/>
-<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="6" y1="12" x2="6" y2="18">
-	<stop  offset="0" style="stop-color:#FFC30F"/>
-	<stop  offset="1" style="stop-color:#F5AE0D"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="1" style="stop-color:#F5AE0D"/>
-</linearGradient>
-<rect x="3" y="12" style="fill:url(#SVGID_9_);" width="6" height="6"/>
-<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="6" y1="10" x2="6" y2="14.0005">
-	<stop  offset="0" style="stop-color:#F0A829"/>
-	<stop  offset="1" style="stop-color:#C7671A"/>
-	<a:midPointStop  offset="0" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="1" style="stop-color:#C7671A"/>
-</linearGradient>
-<rect y="10" style="fill:url(#SVGID_10_);" width="12" height="4"/>
-<linearGradient id="SVGID_11_" gradientUnits="userSpaceOnUse" x1="6" y1="11" x2="6" y2="13.0005">
-	<stop  offset="0" style="stop-color:#FFC30F"/>
-	<stop  offset="1" style="stop-color:#F5AE0D"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="1" style="stop-color:#F5AE0D"/>
-</linearGradient>
-<rect x="1" y="11" style="fill:url(#SVGID_11_);" width="10" height="2"/>
-<linearGradient id="SVGID_12_" gradientUnits="userSpaceOnUse" x1="6" y1="10" x2="6" y2="16.4233">
-	<stop  offset="0" style="stop-color:#8D470D"/>
-	<stop  offset="1" style="stop-color:#7C3D09"/>
-	<a:midPointStop  offset="0" style="stop-color:#8D470D"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#8D470D"/>
-	<a:midPointStop  offset="1" style="stop-color:#7C3D09"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_12_);" points="5,10 5,11.7 5,15 5,16.4 6,15.5 7,16.4 7,15 7,11.7 7,10 "/>
-<linearGradient id="SVGID_13_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="0" x2="11.9995" y2="10">
-	<stop  offset="0" style="stop-color:#F0A829"/>
-	<stop  offset="1" style="stop-color:#C7671A"/>
-	<a:midPointStop  offset="0" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="1" style="stop-color:#C7671A"/>
-</linearGradient>
-<rect x="7" style="fill:url(#SVGID_13_);" width="10" height="10"/>
-<linearGradient id="SVGID_14_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="1" x2="11.9995" y2="9">
-	<stop  offset="0" style="stop-color:#FFEBA8"/>
-	<stop  offset="1" style="stop-color:#F8BE27"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFEBA8"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFEBA8"/>
-	<a:midPointStop  offset="1" style="stop-color:#F8BE27"/>
-</linearGradient>
-<rect x="8" y="1" style="fill:url(#SVGID_14_);" width="8" height="8"/>
-<linearGradient id="SVGID_15_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="2" x2="11.9995" y2="8">
-	<stop  offset="0" style="stop-color:#FFC30F"/>
-	<stop  offset="1" style="stop-color:#F5AE0D"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="1" style="stop-color:#F5AE0D"/>
-</linearGradient>
-<rect x="9" y="2" style="fill:url(#SVGID_15_);" width="6" height="6"/>
-<linearGradient id="SVGID_16_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="0" x2="11.9995" y2="4">
-	<stop  offset="0" style="stop-color:#F0A829"/>
-	<stop  offset="1" style="stop-color:#C7671A"/>
-	<a:midPointStop  offset="0" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="1" style="stop-color:#C7671A"/>
-</linearGradient>
-<rect x="6" style="fill:url(#SVGID_16_);" width="12" height="4"/>
-<linearGradient id="SVGID_17_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="1" x2="11.9995" y2="3">
-	<stop  offset="0" style="stop-color:#FFC30F"/>
-	<stop  offset="1" style="stop-color:#F5AE0D"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="1" style="stop-color:#F5AE0D"/>
-</linearGradient>
-<rect x="7" y="1" style="fill:url(#SVGID_17_);" width="10" height="2"/>
-<linearGradient id="SVGID_18_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="0" x2="11.9995" y2="6.4229">
-	<stop  offset="0" style="stop-color:#8D470D"/>
-	<stop  offset="1" style="stop-color:#7C3D09"/>
-	<a:midPointStop  offset="0" style="stop-color:#8D470D"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#8D470D"/>
-	<a:midPointStop  offset="1" style="stop-color:#7C3D09"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_18_);" points="11,0 11,1.7 11,5 11,6.4 12,5.5 13,6.4 13,5 13,1.7 13,0 "/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<style type="text/css">
+	.st0{fill:none;}
+</style>
+<g>
+	<path d="M34.4,43.9H15.6V32.5l-8.2-0.1c-0.6,0-1.1,0.4-1.4,1L0.2,46.1c-0.1,0.2-0.2,0.6-0.2,1v25.2c0,1.1,0.7,2.1,1.6,2.1h31.6
+		c0.8,0,1.6-1,1.6-2.1V46c0,0,0-0.1,0-0.2C34.8,44.6,35,44.1,34.4,43.9z M29.6,68.9H5.4V46.5l4.5-8.8h0.6v11.4h19.1V68.9z"/>
+	<path d="M39.6,45.8c0,0.1,0,0.2,0,0.2v26.3c0,1.1,0.8,2.1,1.6,2.1h31.6c0.9,0,1.6-1,1.6-2.1V47.1c0-0.4-0.1-0.8-0.2-1l-5.8-12.7
+		c-0.3-0.6-0.8-1-1.4-1l-8.2,0.1v11.4H40C39.4,44.1,39.6,44.6,39.6,45.8z M44.8,49.1h19.1V37.7h0.6l4.5,8.8v22.4H44.8V49.1z"/>
+	<path d="M53.6,12.7L47.9,0.9C47.6,0.3,47.1,0,46.6,0H27.8c-0.5,0-1,0.3-1.3,0.9l-5.6,11.7c-0.2,0.3-0.2,0.7-0.2,1v23.5
+		c0,0.9,0.7,1.8,1.6,1.8h30c0.8,0,1.5-0.9,1.5-1.9V13.5C53.8,13.2,53.7,12.9,53.6,12.7z M30.4,5.3h13.7l2.5,4.9H28L30.4,5.3z
+		 M48.6,33.6H26.2V15.4h22.4V33.6z"/>
+</g>
+<rect class="st0" width="74.4" height="74.4"/>
+</svg>
diff --git a/src/assets/img/mod/label.svg b/src/assets/img/mod/label.svg
index ac232fc58..b2494df89 100644
--- a/src/assets/img/mod/label.svg
+++ b/src/assets/img/mod/label.svg
@@ -1,94 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" style="overflow:visible;enable-background:new 0 0 24 24;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="11.9854" y1="0" x2="11.9854" y2="24.0161">
-	<stop  offset="0" style="stop-color:#F0A829"/>
-	<stop  offset="1" style="stop-color:#C7671A"/>
-	<a:midPointStop  offset="0" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="1" style="stop-color:#C7671A"/>
-</linearGradient>
-<path style="fill:url(#SVGID_1_);" d="M14.4,0L0.6,13.9c-0.8,0.8-0.8,2.1,0,2.8l6.7,6.7c0.8,0.8,2,0.8,2.8,0L24,9.6V0H14.4z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="11.9854" y1="1" x2="11.9854" y2="23.0161">
-	<stop  offset="0" style="stop-color:#FFEBA8"/>
-	<stop  offset="1" style="stop-color:#F8BE27"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFEBA8"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFEBA8"/>
-	<a:midPointStop  offset="1" style="stop-color:#F8BE27"/>
-</linearGradient>
-<path style="fill:url(#SVGID_2_);" d="M8.7,23c-0.3,0-0.5-0.1-0.7-0.3L1.3,16C1.1,15.8,1,15.6,1,15.3c0-0.3,0.1-0.5,0.3-0.7L14.9,1
-	H23v8.2L9.4,22.7C9.2,22.9,9,23,8.7,23C8.7,23,8.7,23,8.7,23z"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="11.9844" y1="2" x2="11.9844" y2="22.0142">
-	<stop  offset="0" style="stop-color:#FFC30F"/>
-	<stop  offset="1" style="stop-color:#F5AE0D"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="1" style="stop-color:#F5AE0D"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_3_);" points="2,15.3 15.3,2 22,2 22,8.8 8.7,22 "/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="8.7197" y1="9.9688" x2="8.7197" y2="20.6313">
-	<stop  offset="0" style="stop-color:#76A1F0"/>
-	<stop  offset="1" style="stop-color:#6B90D5"/>
-	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_4_);" points="3.4,15.3 8.7,10 14.1,15.3 8.7,20.6 "/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="11.1465" y1="22.0312" x2="11.1465" y2="23.8711" gradientTransform="matrix(0.7071 -0.7071 0.7071 0.7071 -14.0909 8.2514)">
-	<stop  offset="0" style="stop-color:#57C3F6"/>
-	<stop  offset="0.1648" style="stop-color:#83D3F8"/>
-	<stop  offset="0.3554" style="stop-color:#AFE3FB"/>
-	<stop  offset="0.5396" style="stop-color:#D2EFFD"/>
-	<stop  offset="0.7128" style="stop-color:#EBF8FE"/>
-	<stop  offset="0.8709" style="stop-color:#FAFDFF"/>
-	<stop  offset="1" style="stop-color:#FFFFFF"/>
-	<a:midPointStop  offset="0" style="stop-color:#57C3F6"/>
-	<a:midPointStop  offset="0.3354" style="stop-color:#57C3F6"/>
-	<a:midPointStop  offset="1" style="stop-color:#FFFFFF"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_5_);" points="7.4,17.9 8.7,19.2 12.6,15.3 11.3,14 "/>
-<path style="fill:#F2EFD5;" d="M12.6,15.3L12.3,15c-0.3,0.2-0.8,0.5-1.4,1.1c-1.1,0.9-1,0.5-2,0.9c-0.4,0.2-0.9,0.6-1.4,1l1.2,1.2
-	L12.6,15.3z"/>
-<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="8.3882" y1="23.1035" x2="13.9038" y2="23.1035" gradientTransform="matrix(0.7071 -0.7071 0.7071 0.7071 -14.0909 8.2514)">
-	<stop  offset="0" style="stop-color:#F8E5B5"/>
-	<stop  offset="1" style="stop-color:#F9E5B6"/>
-	<a:midPointStop  offset="0" style="stop-color:#F8E5B5"/>
-	<a:midPointStop  offset="0.4451" style="stop-color:#F8E5B5"/>
-	<a:midPointStop  offset="1" style="stop-color:#F9E5B6"/>
-</linearGradient>
-<path style="fill:url(#SVGID_6_);" d="M12.6,15.3l-0.2-0.2c-0.4,0.2-0.6,0.6-1.3,1.2C10,17.2,10,16.6,9,17c-0.4,0.2-0.9,0.6-1.3,1.1
-	l1.1,1.1L12.6,15.3z"/>
-<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="12.1709" y1="17.6572" x2="10.1204" y2="22.7323" gradientTransform="matrix(0.7071 -0.7071 0.7071 0.7071 -14.0909 8.2514)">
-	<stop  offset="0" style="stop-color:#57C3F6"/>
-	<stop  offset="4.801393e-03" style="stop-color:#59C4F6"/>
-	<stop  offset="0.1237" style="stop-color:#85D3F8"/>
-	<stop  offset="0.2474" style="stop-color:#AAE1FA"/>
-	<stop  offset="0.376" style="stop-color:#C9ECFC"/>
-	<stop  offset="0.51" style="stop-color:#E1F4FD"/>
-	<stop  offset="0.6519" style="stop-color:#F2FAFE"/>
-	<stop  offset="0.807" style="stop-color:#FCFEFF"/>
-	<stop  offset="1" style="stop-color:#FFFFFF"/>
-	<a:midPointStop  offset="0" style="stop-color:#57C3F6"/>
-	<a:midPointStop  offset="0.25" style="stop-color:#57C3F6"/>
-	<a:midPointStop  offset="1" style="stop-color:#FFFFFF"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_7_);" points="4.8,15.3 7.4,17.9 11.3,14 8.7,11.4 "/>
-<path style="fill:#FFFFFF;" d="M9,11.6C8.7,11.8,8.7,12,8.7,12s-0.4-0.1-0.6,0.4c-0.1,0.4,0.3,0.5,0.3,0.5s0,0-0.1,0.1
-	c0,0.1,0.1,0.1,0.1,0.1s-0.2,0.1-0.1,0.4c0.1,0.3,0.3,0.3,0.3,0.3s-0.1,0.5,0.4,0.6c0.4,0.1,0.5-0.3,0.5-0.3s0.3,0,0.6-0.2
-	c0.3-0.2,0.4-0.5,0.4-0.5s0.1,0,0.2,0L9,11.6z"/>
-<path style="fill:#FFFFFF;" d="M7.9,14.5c0,0-0.1,0-0.2,0.1c0,0.1,0.1,0.2,0.1,0.2s0,0,0,0c0,0,0,0,0,0s-0.1,0,0,0.1
-	C7.8,15,7.9,15,7.9,15s0,0.1,0.1,0.2c0.1,0,0.1-0.1,0.1-0.1s0.1,0,0.2,0c0.1-0.1,0.1-0.1,0.1-0.1s0.1,0,0.1-0.1c0-0.1,0-0.2,0-0.2
-	s0.2,0,0.1-0.2c-0.1-0.1-0.2,0-0.2,0s-0.1-0.1-0.1-0.1c-0.1,0-0.1,0.1-0.1,0.1s0,0,0,0c0,0-0.1,0-0.1,0S8,14.3,7.9,14.3
-	C7.8,14.4,7.9,14.5,7.9,14.5z"/>
-<path style="fill:#FFFFFF;" d="M19.6,8.4l-5.5,5.5l-0.7-0.7l5.5-5.5L19.6,8.4z M17.5,6.3L12,11.8l0.7,0.7L18.2,7L17.5,6.3z
-	 M16.1,4.9l-5.5,5.5l0.7,0.7l5.5-5.5L16.1,4.9z"/>
-<ellipse style="fill:#FFFFFF;" cx="19.7" cy="4.3" rx="1.3" ry="1.3"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<g id="label-2-6_1_">
+	<path id="Subtraction_10-6_1_" d="M71.9,49.9L52.6,71.3c-1.7,1.9-4,3-6.4,3.1s-4.8-0.8-6.6-2.6l-34.2-33c-1.8-1.7-2.9-4-3-6.5
+		L0,9.9V9.8C-0.2,4.6,3.8,0.1,8.9,0l0,0h0.2l21.6,0.9c2.4-0.1,4.7,0.8,6.5,2.5l34.2,33c3.8,3.5,4,9.5,0.6,13.4
+		C72,49.8,71.9,49.8,71.9,49.9L71.9,49.9z M5.2,9.4l2.4,22.2v0.1c0,1.1,0.5,2.1,1.3,3l34.3,33.1c0.8,0.7,1.8,1.2,2.9,1.1
+		c1,0,2.1-0.5,2.9-1.3l19.3-21.4c1.5-1.7,1.5-4.4-0.2-5.9l0,0l-34.2-33c-0.8-0.8-1.8-1.2-3-1.2h-0.2L9.2,5.2
+		C6.8,5.3,5.2,7.2,5.2,9.4L5.2,9.4z M28.6,28.1c-3.3,3.7-8.9,3.9-12.6,0.5c-3.5-3.4-3.8-9.2-0.5-13s8.9-3.9,12.6-0.5
+		c1.8,1.8,2.9,4.1,2.9,6.7C31,24.2,30.1,26.5,28.6,28.1z M19.5,19.2c-1.4,1.5-1.4,4,0.1,5.4s3.9,1.4,5.3-0.1s1.4-4-0.1-5.4
+		c-0.7-0.7-1.6-1.1-2.5-1.1C21.2,18.1,20.2,18.5,19.5,19.2z"/>
+</g>
+</svg>
diff --git a/src/assets/img/mod/lesson.svg b/src/assets/img/mod/lesson.svg
index 0a0e5dfd5..80ddee00b 100644
--- a/src/assets/img/mod/lesson.svg
+++ b/src/assets/img/mod/lesson.svg
@@ -1,126 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" style="overflow:visible;enable-background:new 0 0 24 24;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5.5" y1="10" x2="5.5" y2="14.0005">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<rect x="5" y="10" style="fill:url(#SVGID_1_);" width="1" height="4"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="15" y1="5" x2="15" y2="9">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_2_);" points="18,5 11,5 11,6 18,6 18,9 19,9 19,6 19,5 "/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="5.5" y1="14" x2="5.5" y2="24">
-	<stop  offset="0" style="stop-color:#76A1F0"/>
-	<stop  offset="1" style="stop-color:#6B90D5"/>
-	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
-</linearGradient>
-<path style="fill:url(#SVGID_3_);" d="M10,14H1c-0.6,0-1,0.4-1,1v1v7v1h1h9h1v-1v-7v-1C11,14.4,10.6,14,10,14z"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="5.5" y1="17" x2="5.5" y2="23">
-	<stop  offset="0" style="stop-color:#E7F4FC"/>
-	<stop  offset="1" style="stop-color:#DEEFFC"/>
-	<a:midPointStop  offset="0" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="1" style="stop-color:#DEEFFC"/>
-</linearGradient>
-<rect x="1" y="17" style="fill:url(#SVGID_4_);" width="9" height="6"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="5.5" y1="18" x2="5.5" y2="22">
-	<stop  offset="0" style="stop-color:#CEE9F9"/>
-	<stop  offset="1" style="stop-color:#BBDFF8"/>
-	<a:midPointStop  offset="0" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="1" style="stop-color:#BBDFF8"/>
-</linearGradient>
-<rect x="2" y="18" style="fill:url(#SVGID_5_);" width="7" height="4"/>
-<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="5.5" y1="15" x2="5.5" y2="16">
-	<stop  offset="0" style="stop-color:#BBE0F7"/>
-	<stop  offset="1" style="stop-color:#82B4FB"/>
-	<a:midPointStop  offset="0" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="1" style="stop-color:#82B4FB"/>
-</linearGradient>
-<rect x="1" y="15" style="fill:url(#SVGID_6_);" width="9" height="1"/>
-<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="18.5" y1="9" x2="18.5" y2="19.0005">
-	<stop  offset="0" style="stop-color:#76A1F0"/>
-	<stop  offset="1" style="stop-color:#6B90D5"/>
-	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
-</linearGradient>
-<path style="fill:url(#SVGID_7_);" d="M23,9h-9c-0.6,0-1,0.4-1,1v1v7v1h1h9h1v-1v-7v-1C24,9.4,23.6,9,23,9z"/>
-<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="18.5" y1="12" x2="18.5" y2="18.0005">
-	<stop  offset="0" style="stop-color:#E7F4FC"/>
-	<stop  offset="1" style="stop-color:#DEEFFC"/>
-	<a:midPointStop  offset="0" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="1" style="stop-color:#DEEFFC"/>
-</linearGradient>
-<rect x="14" y="12" style="fill:url(#SVGID_8_);" width="9" height="6"/>
-<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="18.5" y1="13" x2="18.5" y2="17.0005">
-	<stop  offset="0" style="stop-color:#CEE9F9"/>
-	<stop  offset="1" style="stop-color:#BBDFF8"/>
-	<a:midPointStop  offset="0" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="1" style="stop-color:#BBDFF8"/>
-</linearGradient>
-<rect x="15" y="13" style="fill:url(#SVGID_9_);" width="7" height="4"/>
-<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="18.5" y1="10" x2="18.5" y2="11">
-	<stop  offset="0" style="stop-color:#BBE0F7"/>
-	<stop  offset="1" style="stop-color:#82B4FB"/>
-	<a:midPointStop  offset="0" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="1" style="stop-color:#82B4FB"/>
-</linearGradient>
-<rect x="14" y="10" style="fill:url(#SVGID_10_);" width="9" height="1"/>
-<linearGradient id="SVGID_11_" gradientUnits="userSpaceOnUse" x1="5.5" y1="0" x2="5.5" y2="10">
-	<stop  offset="0" style="stop-color:#76A1F0"/>
-	<stop  offset="1" style="stop-color:#6B90D5"/>
-	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
-</linearGradient>
-<path style="fill:url(#SVGID_11_);" d="M10,0H1C0.4,0,0,0.4,0,1v1v7v1h1h9h1V9V2V1C11,0.4,10.6,0,10,0z"/>
-<linearGradient id="SVGID_12_" gradientUnits="userSpaceOnUse" x1="5.5" y1="3" x2="5.5" y2="9">
-	<stop  offset="0" style="stop-color:#E7F4FC"/>
-	<stop  offset="1" style="stop-color:#DEEFFC"/>
-	<a:midPointStop  offset="0" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="1" style="stop-color:#DEEFFC"/>
-</linearGradient>
-<rect x="1" y="3" style="fill:url(#SVGID_12_);" width="9" height="6"/>
-<linearGradient id="SVGID_13_" gradientUnits="userSpaceOnUse" x1="5.5" y1="4" x2="5.5" y2="8">
-	<stop  offset="0" style="stop-color:#CEE9F9"/>
-	<stop  offset="1" style="stop-color:#BBDFF8"/>
-	<a:midPointStop  offset="0" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="1" style="stop-color:#BBDFF8"/>
-</linearGradient>
-<rect x="2" y="4" style="fill:url(#SVGID_13_);" width="7" height="4"/>
-<linearGradient id="SVGID_14_" gradientUnits="userSpaceOnUse" x1="5.5" y1="1" x2="5.5" y2="2">
-	<stop  offset="0" style="stop-color:#BBE0F7"/>
-	<stop  offset="1" style="stop-color:#82B4FB"/>
-	<a:midPointStop  offset="0" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="1" style="stop-color:#82B4FB"/>
-</linearGradient>
-<rect x="1" y="1" style="fill:url(#SVGID_14_);" width="9" height="1"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<path d="M68.2,26.6v-5.1l0,0c3.4,0,6.2-2.8,6.2-6.2V7.6c0-3.4-2.8-6.2-6.2-6.2h-7.7c-3.4,0-6.2,2.8-6.2,6.2v1.9H22.9
+	C22.1,3.2,16.3-0.7,10,0.1C4.2,0.8,0,5.6,0,11.4l0,0c0,6.4,5.2,11.4,11.6,11.4l0,0l0,0c5.3,0,9.8-3.1,11.1-8.1h31.8v0.5
+	c0,3.4,2.8,6.2,6.2,6.2H63v4.2c0,4.9-5.1,8.9-10.4,8.9H23.3c-8.6,0-15.7,6.4-15.7,14.3v4.4H7c-3.4,0-6.2,2.8-6.2,6.2v7.7
+	c0,3.4,2.8,6.2,6.2,6.2h7.8c3.4,0,6.2-2.8,6.2-6.2v-1.2h30.7c1.2,6.1,7.1,9.5,13.2,8.3c5.2-1,8.6-5.7,8.6-10.9l0,0
+	c0-6.2-4.6-11.2-10.8-11.2l0,0c-5.4,0-9.9,3.3-11,8.6H20.9v-1.2c0-3.4-2.8-6.2-6.2-6.2h-1.8v-3.9c0-4.9,5.1-9.6,10.3-9.6h29.3
+	C61,39.9,68.2,34.5,68.2,26.6z M11.4,17.5c-3.4,0-6.2-2.8-6.2-6.1C5.2,8,8,5.2,11.3,5.2c3.4,0,6.2,2.8,6.2,6.1l0,0
+	C17.6,14.9,14.8,17.5,11.4,17.5z M60.4,16.2c-0.6,0-0.9-0.4-0.9-0.9V7.6c0-0.6,0.4-0.9,0.9-0.9h7.8c0.6,0,0.9,0.4,0.9,0.9v7.7
+	c0,0.6-0.4,0.9-0.9,0.9H60.4z M62.4,57.5L62.4,57.5c3.2,0,5.9,2.6,5.9,5.9c0,3.2-2.6,5.9-5.9,5.9s-5.9-2.6-5.9-5.9l0,0
+	C56.5,60,59.1,57.5,62.4,57.5L62.4,57.5z M14.6,58.4c0.6,0,1,0.4,1,0.9v7.8c0,0.6-0.4,0.9-1,0.9H6.8c-0.6,0-1-0.4-1-0.9v-7.8
+	c0-0.6,0.4-0.9,1-0.9H14.6z"/>
+</svg>
diff --git a/src/assets/img/mod/lti.svg b/src/assets/img/mod/lti.svg
index ebbbe3084..cc70c5de9 100644
--- a/src/assets/img/mod/lti.svg
+++ b/src/assets/img/mod/lti.svg
@@ -1,55 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" style="overflow:visible;enable-background:new 0 0 24 24;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="0" x2="11.9995" y2="24.001">
-	<stop  offset="0" style="stop-color:#90C50E"/>
-	<stop  offset="1" style="stop-color:#70A034"/>
-	<a:midPointStop  offset="0" style="stop-color:#90C50E"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#90C50E"/>
-	<a:midPointStop  offset="1" style="stop-color:#70A034"/>
-</linearGradient>
-<path style="fill:url(#SVGID_1_);" d="M21.1,12.3c1,0,1.7,0.9,1.7,0.9c0.3,0.4,0.7,0.8,0.9,0.8s0.3-0.5,0.3-1V8c0-0.5-0.5-1-1-1h-3
-	c-0.5,0-1-0.1-1-0.3c0-0.2,0.3-0.7,0.7-1.1c0,0,0.8-0.9,0.8-2.1C20.5,1.6,18.9,0,17,0s-3.5,1.6-3.5,3.5c0,1.2,0.8,2.1,0.8,2.1
-	C14.7,6,15,6.5,15,6.7C15,6.9,14.5,7,14,7H8C7.5,7,7,7.5,7,8v6c0,0.5-0.1,1-0.3,1S6,14.7,5.6,14.3c0,0-0.9-0.8-2.1-0.8
-	C1.6,13.5,0,15.1,0,17s1.6,3.5,3.5,3.5c1.2,0,2.1-0.8,2.1-0.8C6,19.3,6.5,19,6.7,19S7,19.5,7,20v3c0,0.5,0.5,1,1,1h4
-	c0.5,0,1-0.1,1-0.3s-0.3-0.6-0.7-1c0,0-0.6-0.6-0.6-1.6c0-1.4,1.3-2.5,2.7-2.5c1.4,0,2.4,1.1,2.4,2.5c0,1-0.9,1.7-0.9,1.7
-	c-0.4,0.3-0.8,0.7-0.8,0.9s0.5,0.3,1,0.3h7c0.5,0,1-0.5,1-1v-6c0-0.5-0.1-1-0.3-1s-0.6,0.3-1,0.7c0,0-0.6,0.6-1.6,0.6
-	c-1.4,0-2.5-1.3-2.5-2.7S19.7,12.3,21.1,12.3z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="1" x2="11.9995" y2="23.001">
-	<stop  offset="0" style="stop-color:#D9F991"/>
-	<stop  offset="0.2388" style="stop-color:#D7F88D"/>
-	<stop  offset="0.4501" style="stop-color:#D1F383"/>
-	<stop  offset="0.6509" style="stop-color:#C6EC71"/>
-	<stop  offset="0.844" style="stop-color:#B7E257"/>
-	<stop  offset="1" style="stop-color:#A8D73D"/>
-	<a:midPointStop  offset="0" style="stop-color:#D9F991"/>
-	<a:midPointStop  offset="0.7317" style="stop-color:#D9F991"/>
-	<a:midPointStop  offset="1" style="stop-color:#A8D73D"/>
-</linearGradient>
-<path style="fill:url(#SVGID_2_);" d="M17,23c0.4-0.4,0.7-1.1,0.7-1.9c0-2-1.5-3.5-3.4-3.5c-2,0-3.7,1.6-3.7,3.5
-	c0,0.9,0.3,1.5,0.6,1.9H8v-3c0-1.5-0.7-2-1.3-2c-0.6,0-1.3,0.6-1.7,0.9c0,0-0.7,0.6-1.5,0.6C2.1,19.5,1,18.4,1,17s1.1-2.5,2.5-2.5
-	c0.8,0,1.4,0.6,1.5,0.6C5.3,15.4,6.1,16,6.7,16C7.3,16,8,15.5,8,14V8h6c1.5,0,2-0.7,2-1.3c0-0.6-0.5-1.3-0.9-1.7
-	c0,0-0.6-0.7-0.6-1.5C14.5,2.1,15.6,1,17,1s2.5,1.1,2.5,2.5c0,0.8-0.6,1.5-0.6,1.5C18.5,5.4,18,6.1,18,6.7C18,7.3,18.5,8,20,8h3v4
-	c-0.4-0.4-1.1-0.7-1.9-0.7c-2,0-3.5,1.5-3.5,3.4c0,2,1.6,3.7,3.5,3.7c0.9,0,1.5-0.3,1.9-0.6V23H17z"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="2" x2="11.9995" y2="22.001">
-	<stop  offset="0" style="stop-color:#B3E810"/>
-	<stop  offset="1" style="stop-color:#90C60D"/>
-	<a:midPointStop  offset="0" style="stop-color:#B3E810"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#B3E810"/>
-	<a:midPointStop  offset="1" style="stop-color:#90C60D"/>
-</linearGradient>
-<path style="fill:url(#SVGID_3_);" d="M18.6,22c0.1-0.3,0.1-0.6,0.1-0.9c0-2.5-1.9-4.5-4.4-4.5c-2.5,0-4.7,2.1-4.7,4.5
-	c0,0.3,0,0.6,0.1,0.9H9v-2c0-2.1-1.2-3-2.3-3C7.8,17,9,16.1,9,14V9h5c2.1,0,3-1.2,3-2.3c0-0.7-0.4-1.5-1.2-2.4
-	c-0.1-0.1-0.3-0.5-0.3-0.8C15.5,2.7,16.2,2,17,2s1.5,0.7,1.5,1.5c0,0.3-0.3,0.7-0.3,0.8C17.4,5.2,17,6,17,6.7C17,7.8,17.9,9,20,9h2
-	v1.4c-0.3-0.1-0.6-0.1-0.9-0.1c-2.5,0-4.5,1.9-4.5,4.4c0,2.5,2.1,4.7,4.5,4.7c0.3,0,0.6,0,0.9-0.1V22H18.6z M3.5,18.5
-	C2.7,18.5,2,17.8,2,17s0.7-1.5,1.5-1.5c0.3,0,0.7,0.3,0.8,0.3C5.2,16.6,6,17,6.7,17c-0.7,0-1.5,0.4-2.4,1.2
-	C4.2,18.3,3.8,18.5,3.5,18.5z"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<path d="M69.9,38.6c1.1,1,2.9,0.8,3.7-0.3c0.4-0.4,0.7-1.1,0.7-1.7V13.2c0-1.4-1.2-2.6-2.6-2.6l0,0H53.1c-0.6-14.1-20.7-14.1-21.3,0
+	H13.2c-1.4,0-2.6,1.2-2.6,2.6l0,0v18.6c-14.1,0.6-14.1,20.7,0,21.3v18.6c0,1.4,1.2,2.6,2.6,2.6l0,0h23.4c1.4,0,2.6-1.3,2.6-2.8
+	c0-0.7-0.2-1.2-0.7-1.7c-4.6-5.4,3-12.2,7.8-7.2c1.9,2,1.9,5.1,0,7.2c-1,1.1-0.9,2.8,0.2,3.7c0.4,0.4,1.1,0.7,1.8,0.7h23.4
+	c1.4,0,2.6-1.2,2.6-2.6l0,0V48.2c0-1.4-1.3-2.6-2.8-2.6c-0.7,0-1.2,0.2-1.7,0.7c-2.2,2-5.5,1.8-7.5-0.3l0,0
+	C58,41,64.9,34.2,69.9,38.6z M66.4,53.1c0.9,0,1.8-0.1,2.6-0.3v16.3H52.7c1.4-5.7-2-11.5-7.6-13c-5.7-1.4-11.5,2-13,7.6
+	c-0.4,1.8-0.4,3.6,0,5.4H15.8v-19c0-1.4-1.2-2.6-2.6-2.6l0,0c-0.9,0.2-1.8,0.3-2.6,0.4c-7.1-0.2-7.1-10.5,0-10.6
+	c0.7,0,1.2,0.1,1.8,0.3c1.4,0.4,2.9-0.2,3.4-1.7c0.1-0.2,0.1-0.6,0.1-0.9V15.9H35c1.4,0,2.6-1.2,2.6-2.6c0-0.3,0-0.6-0.1-0.9
+	c-1-2.8,0.4-5.8,3.3-6.7c2.8-1,5.8,0.4,6.7,3.3c0.2,0.6,0.3,1.1,0.3,1.8l0,0c0,0.6-0.1,1.2-0.3,1.8c-0.4,1.4,0.2,2.9,1.7,3.4
+	c0.3,0.1,0.6,0.1,0.9,0.1h19.1v16.3c-5.7-1.4-11.5,2-12.9,7.7c-1.4,5.7,2,11.5,7.7,12.9C64.7,53,65.5,53.3,66.4,53.1L66.4,53.1z"/>
+</svg>
diff --git a/src/assets/img/mod/page.svg b/src/assets/img/mod/page.svg
index eb7cae6c8..83751046f 100644
--- a/src/assets/img/mod/page.svg
+++ b/src/assets/img/mod/page.svg
@@ -1,112 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="-2 0 24 24" style="overflow:visible;enable-background:new -2 0 24 24;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="9.9995" y1="0" x2="9.9995" y2="24.0005">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_1_);" points="12.5,0 11.5,0 1,0 0,0 0,24 1,24 19,24 20,24 20,7.9 "/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="9.9995" y1="1" x2="9.9995" y2="23.0005">
-	<stop  offset="0" style="stop-color:#E7F4FC"/>
-	<stop  offset="1" style="stop-color:#DEEFFC"/>
-	<a:midPointStop  offset="0" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="1" style="stop-color:#DEEFFC"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_2_);" points="12.1,1 11.1,1 2,1 1,1 1,23 2,23 18,23 19,23 19,8.3 "/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="9.9995" y1="2" x2="9.9995" y2="22.0005">
-	<stop  offset="0" style="stop-color:#CEE9F9"/>
-	<stop  offset="1" style="stop-color:#BBDFF8"/>
-	<a:midPointStop  offset="0" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="1" style="stop-color:#BBDFF8"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_3_);" points="11.6,2 10.6,2 3,2 2,2 2,22 3,22 17,22 18,22 18,8.7 "/>
-<path style="fill:#FFFFFF;" d="M16,21H4v-1h12V21z M16,18H4v1h12V18z M16,16H4v1h12V16z M16,14H4v1h12V14z"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="9.9995" y1="4" x2="9.9995" y2="12">
-	<stop  offset="0" style="stop-color:#76A1F0"/>
-	<stop  offset="1" style="stop-color:#6B90D5"/>
-	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_4_);" points="15.3,4 14.3,4 4,4 3,4 3,12 4,12 16,12 17,12 17,5.8 "/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="9.9995" y1="9" x2="9.9995" y2="11">
-	<stop  offset="0" style="stop-color:#57C3F6"/>
-	<stop  offset="0.1648" style="stop-color:#83D3F8"/>
-	<stop  offset="0.3554" style="stop-color:#AFE3FB"/>
-	<stop  offset="0.5396" style="stop-color:#D2EFFD"/>
-	<stop  offset="0.7128" style="stop-color:#EBF8FE"/>
-	<stop  offset="0.8709" style="stop-color:#FAFDFF"/>
-	<stop  offset="1" style="stop-color:#FFFFFF"/>
-	<a:midPointStop  offset="0" style="stop-color:#57C3F6"/>
-	<a:midPointStop  offset="0.3354" style="stop-color:#57C3F6"/>
-	<a:midPointStop  offset="1" style="stop-color:#FFFFFF"/>
-</linearGradient>
-<rect x="4" y="9" style="fill:url(#SVGID_5_);" width="12" height="2"/>
-<path style="fill:#F2EFD5;" d="M12.4,10.9c-0.5-0.2-1.1-0.3-2.7-0.4c-1.5-0.1-0.9-0.4-2-0.8C6.7,9.2,4,9.4,4,9.4V11h8.6
-	C12.6,11,12.5,10.9,12.4,10.9z"/>
-<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="4" y1="10.2476" x2="12.2959" y2="10.2476">
-	<stop  offset="0" style="stop-color:#F8E5B5"/>
-	<stop  offset="1" style="stop-color:#F9E5B6"/>
-	<a:midPointStop  offset="0" style="stop-color:#F8E5B5"/>
-	<a:midPointStop  offset="0.4451" style="stop-color:#F8E5B5"/>
-	<a:midPointStop  offset="1" style="stop-color:#F9E5B6"/>
-</linearGradient>
-<path style="fill:url(#SVGID_6_);" d="M9.7,10.7c-1.5-0.1-0.9-0.6-2-1c-1-0.4-3.7,0-3.7,0V11h8.3C11.5,11,11.2,10.8,9.7,10.7z"/>
-<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="12.5342" y1="1.5674" x2="8.163" y2="10.9413">
-	<stop  offset="0" style="stop-color:#57C3F6"/>
-	<stop  offset="0.2292" style="stop-color:#8AD5F9"/>
-	<stop  offset="0.4827" style="stop-color:#BCE7FB"/>
-	<stop  offset="0.705" style="stop-color:#E1F4FD"/>
-	<stop  offset="0.885" style="stop-color:#F7FCFF"/>
-	<stop  offset="1" style="stop-color:#FFFFFF"/>
-	<a:midPointStop  offset="0" style="stop-color:#57C3F6"/>
-	<a:midPointStop  offset="0.3902" style="stop-color:#57C3F6"/>
-	<a:midPointStop  offset="1" style="stop-color:#FFFFFF"/>
-</linearGradient>
-<rect x="4" y="5" style="fill:url(#SVGID_7_);" width="12" height="4"/>
-<path style="fill:#FFFFFF;" d="M11.2,5.6c0,0-0.2-0.4-0.7-0.2c-0.4,0.3-0.1,0.7-0.1,0.7s-0.1,0-0.1,0c-0.1,0,0,0.2,0,0.2
-	s-0.3,0-0.4,0.2C9.6,6.9,9.8,7,9.8,7S9.3,7.4,9.6,7.8c0.3,0.4,0.6,0.1,0.6,0.1s0.2,0.3,0.6,0.3c0.4,0.1,0.6-0.1,0.6-0.1
-	s0.3,0.2,0.5,0.1C12.4,8.2,12.5,8,12.5,8s0.6,0.3,0.8-0.3C13.4,7.3,13,7.1,13,7.1s0.1-0.4-0.2-0.6s-0.6,0-0.6,0s0.1,0,0-0.1
-	c0-0.1-0.3-0.1-0.3-0.1s0.1-0.6-0.2-0.8C11.4,5.3,11.2,5.6,11.2,5.6z"/>
-<path style="fill:#FFFFFF;" d="M8.6,6.9c0,0-0.1-0.1-0.2,0C8.3,6.9,8.4,7,8.4,7s0,0,0,0c0,0,0,0,0,0s-0.1,0-0.1,0.1
-	c0,0.1,0,0.1,0,0.1s-0.1,0.1,0,0.2c0.1,0.1,0.2,0,0.2,0s0.1,0.1,0.2,0.1c0.1,0,0.2,0,0.2,0s0.1,0.1,0.2,0C9,7.6,9,7.6,9,7.6
-	s0.2,0.1,0.2-0.1c0-0.1-0.1-0.2-0.1-0.2s0-0.1-0.1-0.2c-0.1,0-0.2,0-0.2,0s0,0,0,0s-0.1,0-0.1,0s0-0.2-0.1-0.2
-	C8.7,6.8,8.6,6.9,8.6,6.9z"/>
-<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="15.2451" y1="0" x2="15.2451" y2="9.3594">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<path style="fill:url(#SVGID_8_);" d="M11,9c0,0,5.2-1.5,9,0.4c0-0.1,0-1.5,0-1.5L12.5,0c0,0-1.8,0-2,0C13.1,3.7,11,9,11,9z"/>
-<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="12.3223" y1="7.5449" x2="15.4504" y2="4.4168">
-	<stop  offset="0" style="stop-color:#E7F4FC"/>
-	<stop  offset="0.5181" style="stop-color:#E5F3FC"/>
-	<stop  offset="0.7045" style="stop-color:#DEF0FB"/>
-	<stop  offset="0.8371" style="stop-color:#D3EBFA"/>
-	<stop  offset="0.872" style="stop-color:#CEE9F9"/>
-	<stop  offset="1" style="stop-color:#BDD8F0"/>
-	<a:midPointStop  offset="0" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="0.87" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="0.872" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="1" style="stop-color:#BDD8F0"/>
-</linearGradient>
-<path style="fill:url(#SVGID_9_);" d="M18.5,7.8c-0.9-0.2-2-0.3-3.1-0.3c-1.1,0-2.1,0.1-3,0.3c0.4-1.6,0.7-4.1-0.2-6.4L18.5,7.8z"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<g>
+	<path d="M66.5,15.1L52.4,1c-0.7-0.7-1.6-1-2.6-1H10.3C8.2,0,6.6,1.6,6.6,3.7l0,0v67c0,2.1,1.6,3.7,3.7,3.7l0,0H64
+		c2.1,0,3.7-1.6,3.7-3.7l0,0V17.8C67.5,16.8,67.2,15.8,66.5,15.1z M48.4,6.7l12.5,12.5H48.4V6.7z M11.9,69.2V5h30.9v15.6
+		c0,2.2,1.7,3.8,3.8,3.8h15.6v44.7L11.9,69.2L11.9,69.2z"/>
+	<path d="M54.3,43H19.7c-1.4,0-2.6,1.2-2.6,2.6s1.2,2.6,2.6,2.6h34.6c1.4,0,2.6-1.2,2.6-2.6C57,44.2,55.8,43,54.3,43z"/>
+	<path d="M54.3,53.5H19.7c-1.4,0-2.6,1.2-2.6,2.6s1.2,2.6,2.6,2.6h34.6c1.4,0,2.6-1.2,2.6-2.6S55.8,53.5,54.3,53.5z"/>
+	<path d="M19.8,37.8h20.9c1.4,0,2.6-1.2,2.6-2.6c0-1.4-1.2-2.6-2.6-2.6H19.8c-1.4,0-2.6,1.2-2.6,2.6S18.4,37.8,19.8,37.8z"/>
+</g>
+</svg>
diff --git a/src/assets/img/mod/quiz.svg b/src/assets/img/mod/quiz.svg
index 90473416f..26cb7dda7 100644
--- a/src/assets/img/mod/quiz.svg
+++ b/src/assets/img/mod/quiz.svg
@@ -1,90 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" style="overflow:visible;enable-background:new 0 0 24 24;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="11.9565" y1="0" x2="11.9565" y2="24.0005">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_1_);" points="14.4,0 13.4,0 3,0 2,0 2,24 3,24 21,24 22,24 22,7.9 "/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="11.9565" y1="1" x2="11.9565" y2="23.0005">
-	<stop  offset="0" style="stop-color:#E7F4FC"/>
-	<stop  offset="1" style="stop-color:#DEEFFC"/>
-	<a:midPointStop  offset="0" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="1" style="stop-color:#DEEFFC"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_2_);" points="14,1 13,1 4,1 3,1 3,23 4,23 20,23 21,23 21,8.3 "/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="11.9565" y1="2" x2="11.9565" y2="22.0005">
-	<stop  offset="0" style="stop-color:#CEE9F9"/>
-	<stop  offset="1" style="stop-color:#BBDFF8"/>
-	<a:midPointStop  offset="0" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="1" style="stop-color:#BBDFF8"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_3_);" points="13.6,2 12.6,2 5,2 4,2 4,22 5,22 19,22 20,22 20,8.7 "/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="17.2021" y1="0" x2="17.2021" y2="9.3594">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<path style="fill:url(#SVGID_4_);" d="M13,9c0,0,5.2-1.5,9,0.4c0-0.1,0-1.5,0-1.5L14.4,0c0,0-1.8,0-2,0C15.1,3.7,13,9,13,9z"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="14.2793" y1="7.5449" x2="17.4074" y2="4.4168">
-	<stop  offset="0" style="stop-color:#E7F4FC"/>
-	<stop  offset="0.5181" style="stop-color:#E5F3FC"/>
-	<stop  offset="0.7045" style="stop-color:#DEF0FB"/>
-	<stop  offset="0.8371" style="stop-color:#D3EBFA"/>
-	<stop  offset="0.872" style="stop-color:#CEE9F9"/>
-	<stop  offset="1" style="stop-color:#BDD8F0"/>
-	<a:midPointStop  offset="0" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="0.87" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="0.872" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="1" style="stop-color:#BDD8F0"/>
-</linearGradient>
-<path style="fill:url(#SVGID_5_);" d="M20.4,7.8c-0.9-0.2-2-0.3-3.1-0.3c-1.1,0-2.1,0.1-3,0.3c0.4-1.6,0.7-4.1-0.2-6.4L20.4,7.8z"/>
-<g>
-	<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="11.8569" y1="1.8521" x2="11.8569" y2="23.9487">
-		<stop  offset="0" style="stop-color:#DB6D17"/>
-		<stop  offset="1" style="stop-color:#BF3B08"/>
-		<a:midPointStop  offset="0" style="stop-color:#DB6D17"/>
-		<a:midPointStop  offset="0.5" style="stop-color:#DB6D17"/>
-		<a:midPointStop  offset="1" style="stop-color:#BF3B08"/>
-	</linearGradient>
-	<polygon style="fill:url(#SVGID_6_);" points="8,16.9 3.2,11.9 0,15.1 8.8,23.9 23.7,1.9 	"/>
-</g>
-<g>
-	<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="9.5522" y1="9.0078" x2="9.5522" y2="22.3833">
-		<stop  offset="0" style="stop-color:#F6A55E"/>
-		<stop  offset="1" style="stop-color:#EA5B03"/>
-		<a:midPointStop  offset="0" style="stop-color:#F6A55E"/>
-		<a:midPointStop  offset="0.5" style="stop-color:#F6A55E"/>
-		<a:midPointStop  offset="1" style="stop-color:#EA5B03"/>
-	</linearGradient>
-	<polygon style="fill:url(#SVGID_7_);" points="1.4,15.1 3.2,13.4 7.9,18.4 17.7,9 8.7,22.4 	"/>
-</g>
-<g>
-	<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="7.2485" y1="14.7998" x2="7.2485" y2="20.8174">
-		<stop  offset="0" style="stop-color:#F17219"/>
-		<stop  offset="1" style="stop-color:#EA5B03"/>
-		<a:midPointStop  offset="0" style="stop-color:#F17219"/>
-		<a:midPointStop  offset="0.5" style="stop-color:#F17219"/>
-		<a:midPointStop  offset="1" style="stop-color:#EA5B03"/>
-	</linearGradient>
-	<polygon style="fill:url(#SVGID_8_);" points="2.8,15.1 3.1,14.8 7.9,19.8 11.7,16.2 8.5,20.8 	"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<g>
+	<path d="M62.1,32.3c-1.7,0-2.6,1.4-2.6,3.1v22.8h-45V13.3h27.8c4.1,0.1,4.1-5.2,0-5.1H12.6c-1.7,0-3.1,1.4-3.1,3.1l0,0
+		v49.1c0,1.7,1.3,3.1,3,3.1l0,0h49c1.7,0,3.1-1.4,3.1-3.1V35.5C64.7,33.7,63.8,32.3,62.1,32.3z"/>
+	<path d="M28.4,30.9c-1.4-1-3.3-0.7-4.4,0.6c-1,1.4-0.7,3.4,0.6,4.5l9.5,7c1.1,0.8,2.2,1.1,3.4,0
+		c4.4-4.7,22.1-24.8,26.4-29.4c0.9-1,1.1-2.4,0.6-3.6s-1.7-1.9-3-1.9c-0.8,0-1.6,0.4-2.1,1C55,13.8,39.7,31.5,35.6,36L28.4,30.9z"/>
+</g>
+</svg>
diff --git a/src/assets/img/mod/resource.svg b/src/assets/img/mod/resource.svg
index 2039a2ea2..fde303973 100644
--- a/src/assets/img/mod/resource.svg
+++ b/src/assets/img/mod/resource.svg
@@ -1,60 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="-3 0 24 24" style="overflow:visible;enable-background:new -3 0 24 24;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="9.4995" y1="0" x2="9.4995" y2="24.0005">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_1_);" points="11.5,0 0,0 0,24 19,24 19,7.9 "/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="9.4995" y1="1" x2="9.4995" y2="23.0005">
-	<stop  offset="0" style="stop-color:#E7F4FC"/>
-	<stop  offset="1" style="stop-color:#DEEFFC"/>
-	<a:midPointStop  offset="0" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="1" style="stop-color:#DEEFFC"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_2_);" points="1,23 1,1 11.1,1 18,8.3 18,23 "/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="9.4995" y1="2" x2="9.4995" y2="22.0005">
-	<stop  offset="0" style="stop-color:#CEE9F9"/>
-	<stop  offset="1" style="stop-color:#BBDFF8"/>
-	<a:midPointStop  offset="0" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="1" style="stop-color:#BBDFF8"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_3_);" points="2,22 2,2 10.6,2 17,8.7 17,22 "/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="14.2451" y1="0" x2="14.2451" y2="9.3594">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<path style="fill:url(#SVGID_4_);" d="M10,9c0,0,5.2-1.5,9,0.4c0-0.1,0-1.5,0-1.5L11.5,0c0,0-1.8,0-2,0C12.1,3.7,10,9,10,9z"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="11.3223" y1="7.5449" x2="14.4504" y2="4.4168">
-	<stop  offset="0" style="stop-color:#E7F4FC"/>
-	<stop  offset="0.5181" style="stop-color:#E5F3FC"/>
-	<stop  offset="0.7045" style="stop-color:#DEF0FB"/>
-	<stop  offset="0.8371" style="stop-color:#D3EBFA"/>
-	<stop  offset="0.872" style="stop-color:#CEE9F9"/>
-	<stop  offset="1" style="stop-color:#BDD8F0"/>
-	<a:midPointStop  offset="0" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="0.87" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="0.872" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="1" style="stop-color:#BDD8F0"/>
-</linearGradient>
-<path style="fill:url(#SVGID_5_);" d="M17.5,7.8c-0.9-0.2-2-0.3-3.1-0.3c-1.1,0-2.1,0.1-3,0.3c0.4-1.6,0.7-4.1-0.2-6.4L17.5,7.8z"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<g>
+	<path d="M66.5,15.1L52.4,1c-0.7-0.7-1.6-1-2.6-1H10.3C8.2,0,6.6,1.6,6.6,3.7l0,0v67c0,2.1,1.6,3.7,3.7,3.7l0,0H64
+		c2.1,0,3.7-1.6,3.7-3.7l0,0V17.8C67.5,16.8,67.2,15.8,66.5,15.1z M48.4,6.7l12.5,12.5H48.4V6.7z M11.9,69.2V5h30.9v15.6
+		c0,2.2,1.7,3.8,3.8,3.8h15.6v44.7L11.9,69.2L11.9,69.2z"/>
+</g>
+</svg>
diff --git a/src/assets/img/mod/scorm.svg b/src/assets/img/mod/scorm.svg
index 77891eca4..76ec9c64f 100644
--- a/src/assets/img/mod/scorm.svg
+++ b/src/assets/img/mod/scorm.svg
@@ -1,84 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="0 -2 24 24" style="overflow:visible;enable-background:new 0 -2 24 24;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="0" x2="11.9995" y2="20.0005">
-	<stop  offset="0" style="stop-color:#F0A829"/>
-	<stop  offset="1" style="stop-color:#C7671A"/>
-	<a:midPointStop  offset="0" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="1" style="stop-color:#C7671A"/>
-</linearGradient>
-<rect x="1" style="fill:url(#SVGID_1_);" width="22" height="20"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="1" x2="11.9995" y2="19.0005">
-	<stop  offset="0" style="stop-color:#FFEBA8"/>
-	<stop  offset="1" style="stop-color:#F8BE27"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFEBA8"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFEBA8"/>
-	<a:midPointStop  offset="1" style="stop-color:#F8BE27"/>
-</linearGradient>
-<rect x="2" y="1" style="fill:url(#SVGID_2_);" width="20" height="18"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="2" x2="11.9995" y2="18.0005">
-	<stop  offset="0" style="stop-color:#FFC30F"/>
-	<stop  offset="1" style="stop-color:#F5AE0D"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="1" style="stop-color:#F5AE0D"/>
-</linearGradient>
-<rect x="3" y="2" style="fill:url(#SVGID_3_);" width="18" height="16"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="0" x2="11.9995" y2="7">
-	<stop  offset="0" style="stop-color:#F0A829"/>
-	<stop  offset="1" style="stop-color:#C7671A"/>
-	<a:midPointStop  offset="0" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="1" style="stop-color:#C7671A"/>
-</linearGradient>
-<rect style="fill:url(#SVGID_4_);" width="24" height="7"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="1" x2="11.9995" y2="6">
-	<stop  offset="0" style="stop-color:#FFEBA8"/>
-	<stop  offset="1" style="stop-color:#F8BE27"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFEBA8"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFEBA8"/>
-	<a:midPointStop  offset="1" style="stop-color:#F8BE27"/>
-</linearGradient>
-<rect x="1" y="1" style="fill:url(#SVGID_5_);" width="22" height="5"/>
-<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="2" x2="11.9995" y2="5">
-	<stop  offset="0" style="stop-color:#FFC30F"/>
-	<stop  offset="1" style="stop-color:#F5AE0D"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="1" style="stop-color:#F5AE0D"/>
-</linearGradient>
-<rect x="2" y="2" style="fill:url(#SVGID_6_);" width="20" height="3"/>
-<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="11.4995" y1="0" x2="11.4995" y2="13.0005">
-	<stop  offset="0" style="stop-color:#8D470D"/>
-	<stop  offset="1" style="stop-color:#7C3D09"/>
-	<a:midPointStop  offset="0" style="stop-color:#8D470D"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#8D470D"/>
-	<a:midPointStop  offset="1" style="stop-color:#7C3D09"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_7_);" points="9,0 9,3 9,10 9,13 11.5,11 14,13 14,10 14,3 14,0 "/>
-<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="11.4995" y1="1" x2="11.4995" y2="10.9355">
-	<stop  offset="0" style="stop-color:#D58738"/>
-	<stop  offset="1" style="stop-color:#AB551F"/>
-	<a:midPointStop  offset="0" style="stop-color:#D58738"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#D58738"/>
-	<a:midPointStop  offset="1" style="stop-color:#AB551F"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_8_);" points="10,1 10,4 10,7.9 10,10.9 11.5,9.7 13,10.9 13,7.9 13,4 13,1 "/>
-<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="11.5" y1="2" x2="11.5" y2="8.8711">
-	<stop  offset="0" style="stop-color:#D0813A"/>
-	<stop  offset="1" style="stop-color:#AF551D"/>
-	<a:midPointStop  offset="0" style="stop-color:#D0813A"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#D0813A"/>
-	<a:midPointStop  offset="1" style="stop-color:#AF551D"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_9_);" points="11,2 11,5 11,5.8 11,8.8 11.5,8.4 12,8.9 12,5.9 12,5 12,2 "/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<path d="M74.1,29.6l-13-22.9c-0.5-0.8-1.4-1.5-2.4-1.5h-43c-1,0-1.8,0.5-2.4,1.5L0.4,29.6l0,0c-0.2,0.5-0.3,1-0.3,1.5v35.2
+	c0,1.6,1.3,2.9,2.7,2.9l0,0h68.9c1.5,0,2.7-1.3,2.7-2.9V31.1C74.4,30.5,74.3,30,74.1,29.6z M6.9,28.5l10.2-18.3l17.4,0.2v18.3
+	L6.9,28.5z M40,28.7V10.5h17.5l9.6,18.3H40V28.7z M69.2,34v30H5.3V34H69.2z"/>
+</svg>
diff --git a/src/assets/img/mod/survey.svg b/src/assets/img/mod/survey.svg
index a97fe77ef..61e63e52b 100644
--- a/src/assets/img/mod/survey.svg
+++ b/src/assets/img/mod/survey.svg
@@ -1,89 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" style="overflow:visible;enable-background:new 0 0 24 24;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="20" y1="8" x2="20" y2="24.0005">
-	<stop  offset="0" style="stop-color:#76A1F0"/>
-	<stop  offset="1" style="stop-color:#6B90D5"/>
-	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
-</linearGradient>
-<rect x="16" y="8" style="fill:url(#SVGID_1_);" width="8" height="16"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="20" y1="9" x2="20" y2="23.0005">
-	<stop  offset="0" style="stop-color:#BBE0F7"/>
-	<stop  offset="1" style="stop-color:#82B4FB"/>
-	<a:midPointStop  offset="0" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="1" style="stop-color:#82B4FB"/>
-</linearGradient>
-<rect x="17" y="9" style="fill:url(#SVGID_2_);" width="6" height="14"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="20" y1="10" x2="20" y2="22.0005">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<rect x="18" y="10" style="fill:url(#SVGID_3_);" width="4" height="12"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="0" x2="11.9995" y2="24.0005">
-	<stop  offset="0" style="stop-color:#90C50E"/>
-	<stop  offset="1" style="stop-color:#70A034"/>
-	<a:midPointStop  offset="0" style="stop-color:#90C50E"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#90C50E"/>
-	<a:midPointStop  offset="1" style="stop-color:#70A034"/>
-</linearGradient>
-<rect x="8" style="fill:url(#SVGID_4_);" width="8" height="24"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="1" x2="11.9995" y2="23.0005">
-	<stop  offset="0" style="stop-color:#D9F991"/>
-	<stop  offset="0.2388" style="stop-color:#D7F88D"/>
-	<stop  offset="0.4501" style="stop-color:#D1F383"/>
-	<stop  offset="0.6509" style="stop-color:#C6EC71"/>
-	<stop  offset="0.844" style="stop-color:#B7E257"/>
-	<stop  offset="1" style="stop-color:#A8D73D"/>
-	<a:midPointStop  offset="0" style="stop-color:#D9F991"/>
-	<a:midPointStop  offset="0.7317" style="stop-color:#D9F991"/>
-	<a:midPointStop  offset="1" style="stop-color:#A8D73D"/>
-</linearGradient>
-<rect x="9" y="1" style="fill:url(#SVGID_5_);" width="6" height="22"/>
-<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="2" x2="11.9995" y2="22.0005">
-	<stop  offset="0" style="stop-color:#B3E810"/>
-	<stop  offset="1" style="stop-color:#90C60D"/>
-	<a:midPointStop  offset="0" style="stop-color:#B3E810"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#B3E810"/>
-	<a:midPointStop  offset="1" style="stop-color:#90C60D"/>
-</linearGradient>
-<rect x="10" y="2" style="fill:url(#SVGID_6_);" width="4" height="20"/>
-<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="4" y1="12" x2="4" y2="24.0005">
-	<stop  offset="0" style="stop-color:#F0A829"/>
-	<stop  offset="1" style="stop-color:#C7671A"/>
-	<a:midPointStop  offset="0" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="1" style="stop-color:#C7671A"/>
-</linearGradient>
-<rect y="12" style="fill:url(#SVGID_7_);" width="8" height="12"/>
-<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="4" y1="13" x2="4" y2="23.0005">
-	<stop  offset="0" style="stop-color:#FFEBA8"/>
-	<stop  offset="1" style="stop-color:#F8BE27"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFEBA8"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFEBA8"/>
-	<a:midPointStop  offset="1" style="stop-color:#F8BE27"/>
-</linearGradient>
-<rect x="1" y="13" style="fill:url(#SVGID_8_);" width="6" height="10"/>
-<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="4" y1="14" x2="4" y2="22">
-	<stop  offset="0" style="stop-color:#FFC30F"/>
-	<stop  offset="1" style="stop-color:#F5AE0D"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="1" style="stop-color:#F5AE0D"/>
-</linearGradient>
-<rect x="2" y="14" style="fill:url(#SVGID_9_);" width="4" height="8"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<g>
+	<path d="M18.6,45.9H3.1C1.3,45.9,0,47.2,0,49v22.4c0,1.7,1.3,3.1,3.1,3.1h15.5c1.8,0,3.1-1.3,3.1-3.1V48.9
+		C21.7,47.2,20.3,45.9,18.6,45.9z M16.5,69.2H5.3V51.1h11.2V69.2z"/>
+	<path d="M44.4,0H29.9c-1.8,0-3.1,1.3-3.1,3.1v68.3c0,1.7,1.3,3.1,3.1,3.1h14.5c1.8,0,3.1-1.3,3.1-3.1V3.1C47.5,1.3,46.1,0,44.4,0z
+		 M42.3,69.2H32.1V5.3h10.2V69.2z"/>
+	<path d="M71.3,19.4H55.8c-1.8,0-3.1,1.3-3.1,3.1v48.9c0,1.7,1.3,3.1,3.1,3.1h15.5c1.8,0,3.1-1.3,3.1-3.1V22.5
+		C74.4,20.7,73,19.4,71.3,19.4z M69.2,69.2H58V24.6h11.2V69.2z"/>
+</g>
+</svg>
diff --git a/src/assets/img/mod/url.svg b/src/assets/img/mod/url.svg
index 56bdb5541..eb00b261c 100644
--- a/src/assets/img/mod/url.svg
+++ b/src/assets/img/mod/url.svg
@@ -1,485 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" style="overflow:visible;enable-background:new 0 0 24 24;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="11.9653" y1="0" x2="11.9653" y2="24.0005">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_1_);" points="14.4,0 13.4,0 3,0 2,0 2,24 3,24 21,24 22,24 22,7.9 "/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="11.9653" y1="1" x2="11.9653" y2="23.0005">
-	<stop  offset="0" style="stop-color:#E7F4FC"/>
-	<stop  offset="1" style="stop-color:#DEEFFC"/>
-	<a:midPointStop  offset="0" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="1" style="stop-color:#DEEFFC"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_2_);" points="14,1 13,1 4,1 3,1 3,23 4,23 20,23 21,23 21,8.3 "/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="11.9653" y1="2" x2="11.9653" y2="22.0005">
-	<stop  offset="0" style="stop-color:#CEE9F9"/>
-	<stop  offset="1" style="stop-color:#BBDFF8"/>
-	<a:midPointStop  offset="0" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="1" style="stop-color:#BBDFF8"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_3_);" points="13.6,2 12.6,2 5,2 4,2 4,22 5,22 19,22 20,22 20,8.7 "/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="17.2109" y1="0" x2="17.2109" y2="9.3594">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<path style="fill:url(#SVGID_4_);" d="M13,9c0,0,5.2-1.5,9,0.4c0-0.1,0-1.5,0-1.5L14.4,0c0,0-1.8,0-2,0C15.1,3.7,13,9,13,9z"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="14.2881" y1="7.5449" x2="17.4162" y2="4.4168">
-	<stop  offset="0" style="stop-color:#E7F4FC"/>
-	<stop  offset="0.5181" style="stop-color:#E5F3FC"/>
-	<stop  offset="0.7045" style="stop-color:#DEF0FB"/>
-	<stop  offset="0.8371" style="stop-color:#D3EBFA"/>
-	<stop  offset="0.872" style="stop-color:#CEE9F9"/>
-	<stop  offset="1" style="stop-color:#BDD8F0"/>
-	<a:midPointStop  offset="0" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="0.87" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="0.872" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="1" style="stop-color:#BDD8F0"/>
-</linearGradient>
-<path style="fill:url(#SVGID_5_);" d="M20.5,7.8c-0.9-0.2-2-0.3-3.1-0.3c-1.1,0-2.1,0.1-3,0.3c0.4-1.6,0.7-4.1-0.2-6.4L20.5,7.8z"/>
-<radialGradient id="SVGID_6_" cx="7.5312" cy="16.5" r="7.0005" gradientUnits="userSpaceOnUse">
-	<stop  offset="0" style="stop-color:#8BB4F0"/>
-	<stop  offset="7.721406e-02" style="stop-color:#88B1EF"/>
-	<stop  offset="0.488" style="stop-color:#7FA7EC"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#8BB4F0"/>
-	<a:midPointStop  offset="0.25" style="stop-color:#8BB4F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</radialGradient>
-<path style="fill:url(#SVGID_6_);" d="M7.5,23.5C0.4,23.2-1.6,15.1,3,11.2c1.8-1.6,3.8-1.7,4.6-1.7c0.4,0,0.8,0,1.1,0.1
-	C9,9.6,9.4,9.7,9.7,9.8c0.3,0.1,0.7,0.3,1,0.4c0.3,0.2,0.6,0.4,0.9,0.6c0.3,0.2,0.6,0.4,0.8,0.7c0.3,0.3,0.5,0.5,0.7,0.8
-	c0.2,0.3,0.4,0.6,0.6,0.9c0.2,0.3,0.3,0.7,0.4,1c0.1,0.3,0.2,0.7,0.3,1.1c0.1,0.4,0.1,0.8,0.1,1.1s0,0.8-0.1,1.1
-	c-0.1,0.4-0.1,0.7-0.3,1.1c-0.1,0.3-0.3,0.7-0.4,1c-0.2,0.3-0.4,0.6-0.6,0.9c-0.2,0.3-0.4,0.6-0.7,0.8c-0.3,0.3-0.5,0.5-0.8,0.7
-	c-0.3,0.2-0.6,0.4-0.9,0.6c-0.3,0.2-0.7,0.3-1,0.4c-0.3,0.1-0.7,0.2-1.1,0.3C8.3,23.5,7.9,23.5,7.5,23.5"/>
-<radialGradient id="SVGID_7_" cx="7.5308" cy="16.5" r="6.4856" gradientUnits="userSpaceOnUse">
-	<stop  offset="0" style="stop-color:#8BB4F0"/>
-	<stop  offset="7.721406e-02" style="stop-color:#88B1EF"/>
-	<stop  offset="0.488" style="stop-color:#7FA7EC"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#8BB4F0"/>
-	<a:midPointStop  offset="0.25" style="stop-color:#8BB4F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</radialGradient>
-<path style="fill:url(#SVGID_7_);" d="M7.5,23C1,22.7-0.9,15.2,3.3,11.6C5,10.1,6.8,10,7.5,10c0.4,0,0.7,0,1.1,0.1
-	c0.3,0.1,0.7,0.1,1,0.2s0.6,0.2,0.9,0.4c0.3,0.2,0.6,0.3,0.9,0.5c0.3,0.2,0.5,0.4,0.8,0.6c0.2,0.2,0.5,0.5,0.6,0.8
-	c0.2,0.3,0.4,0.6,0.5,0.9s0.3,0.6,0.4,0.9s0.2,0.7,0.2,1c0.1,0.3,0.1,0.7,0.1,1.1c0,0.4,0,0.7-0.1,1.1c-0.1,0.3-0.1,0.7-0.2,1
-	s-0.2,0.6-0.4,0.9s-0.3,0.6-0.5,0.9s-0.4,0.5-0.6,0.8s-0.5,0.5-0.8,0.6c-0.3,0.2-0.6,0.4-0.9,0.5c-0.3,0.2-0.6,0.3-0.9,0.4
-	s-0.7,0.2-1,0.2C8.2,23,7.9,23,7.5,23"/>
-<path style="fill:#B3E710;" d="M6.1,10.8L6.1,10.8c0-0.1,0-0.1,0-0.1c0,0,0,0,0,0c0,0,0,0,0,0C6.1,10.7,6,10.7,6.1,10.8
-	c-0.1-0.1-0.1,0-0.2,0C5.9,10.7,6,10.8,6.1,10.8C6,10.8,6.1,10.8,6.1,10.8 M3,13c0,0,2,0,3.6,0c0,0,0.4-0.1,0.4-0.1l0,0v0l0,0v0v0
-	l0,0v0l0,0c0-0.1-0.3-0.1-0.4-0.1c0-0.1-0.2-0.2-0.1-0.4c0,0-0.1,0-0.1,0c-0.1-0.1-0.3-0.1-0.4-0.1c-0.1,0-0.2-0.1-0.3-0.2
-	c-0.1,0-0.1,0-0.2,0c0,0,0,0,0,0C5.6,12,5.6,12,5.4,11.9c0-0.2,0.2-0.3,0.4-0.5c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0.1,0,0.1,0
-	c0,0,0,0,0,0c0,0,0,0-0.1-0.1c0,0,0,0,0,0v0c0,0,0.1,0.1,0.2,0c0,0,0,0,0-0.1c0.1,0,0.1,0,0.2-0.1c0,0,0,0,0,0
-	c-0.1,0-0.1-0.1-0.2-0.1c0.1,0,0.1,0,0.2,0.1c0,0,0.1,0,0.2-0.1c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0
-	c0,0,0.1,0,0.1,0c0,0,0,0,0-0.1l0,0c0,0,0,0.1,0.1,0.1c0.1-0.1,0.1-0.1,0.2-0.1c0-0.1,0-0.1,0-0.1c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0-0.1c-0.1,0-0.1-0.1-0.2,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.2,0.2-0.2,0.2c-0.1,0,0-0.1,0-0.1c0.1,0,0.1,0,0-0.1
-	c-0.1,0-0.1,0.1-0.1,0.1c0,0,0-0.1,0-0.1c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0.1-0.1c0,0,0-0.1,0-0.1c0,0,0,0,0,0
-	c-0.1,0-0.2,0.1-0.2,0.1c0,0,0,0,0,0c-0.1,0-0.1,0-0.1,0.1c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0l-0.3,0.2c0,0,0,0,0,0c0,0,0,0,0.1-0.1c0,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0h0l0,0l0,0h0l0,0l0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c-0.1,0-0.1,0-0.3,0h0l0,0c0,0,0,0,0,0h0l0,0c0,0,0,0,0,0h0l0,0c-0.2,0.1-0.2,0.1-0.3,0.2
-	c0-0.1,0-0.1,0.1-0.1c0,0,0,0,0,0c0,0,0,0,0,0c-0.1,0-0.2,0-0.2,0c0.1,0,0.1,0,0.2-0.1c-0.1,0-0.1,0-0.1-0.1c-0.1,0-0.1,0-0.1,0
-	c0,0,0,0,0.1,0c0,0-0.1,0-0.1,0c0,0,0,0,0.1-0.1c0,0-0.3,0.1-0.5,0.2c0,0,0,0,0.1,0c0.1,0,0.2,0.1,0.3,0c0,0-0.1,0.2-0.1,0.2
-	c0,0,0,0,0,0c-0.1,0-0.1,0-0.1,0c-0.1,0-0.1,0-0.1,0c0,0,0.4,0,0.4,0v-0.1c0-0.1-0.1-0.2,0-0.2c0,0-0.1,0-0.1,0c0,0,0,0,0-0.1
-	c-0.1,0-0.2,0.1-0.3,0.1c-0.3,0.1-0.6,0.4-0.9,0.5c-0.1,0.1-0.3,0.2-0.4,0.3c0,0,0,0-0.1,0l0,0L3,11.8l0,0c0.1-0.1,0.1-0.1,0.2-0.2
-	c0,0,0,0,0,0c0,0-0.1,0.1-0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0.1-0.1,0.1-0.1,0.2c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0,0,0,0c0,0,0.1,0,0.1,0
-	c0,0,0,0.1,0,0.1c0,0,0,0,0,0c-0.1,0-0.1,0-0.1,0.1l0,0C3,12.2,3,12.2,2.9,12.3c0,0,0,0,0,0v0c0,0.1-0.1,0.1-0.1,0.1c0,0,0,0,0.1,0
-	l0,0c0,0.1-0.1,0.1-0.1,0.2c0,0,0,0.2,0,0.2c0,0,0,0.3-0.1,0.3c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0h0c0,0,0-0.1,0-0.1c0,0,0-0.1,0-0.1c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0-0.1,0.1c0,0,0,0,0,0
-	c0,0,0,0,0,0 M8.3,10.4C8.3,10.4,8.3,10.4,8.3,10.4L8.3,10.4C8.3,10.4,8.3,10.4,8.3,10.4C8.3,10.4,8.3,10.4,8.3,10.4 M8.3,10.4
-	c0,0-0.1-0.1-0.1-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0C8.2,10.4,8.2,10.4,8.3,10.4
-	C8.2,10.4,8.2,10.4,8.3,10.4L8.3,10.4L8.3,10.4L8.3,10.4C8.2,10.5,8.2,10.5,8.3,10.4C8.2,10.5,8.2,10.5,8.3,10.4
-	C8.2,10.5,8.3,10.5,8.3,10.4C8.3,10.4,8.3,10.4,8.3,10.4 M5.9,10.7L5.9,10.7C6,10.6,6,10.6,5.9,10.7c0-0.1,0-0.1,0-0.1
-	c0,0,0,0,0.1-0.1c0,0,0.1-0.1,0.1-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c-0.1,0-0.1,0.1-0.2,0.1c0,0,0,0,0.1-0.1c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c-0.1,0.1-0.1,0.1-0.1,0.1c0.1,0,0.1,0,0.1,0c0,0-0.1,0-0.1,0c0,0,0.1,0,0.1-0.1c0,0-0.3,0.1-0.4,0.1
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0c0,0,0,0,0.1,0c0.1,0,0.1,0,0.1,0
-	c-0.1,0-0.1,0-0.2,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0.1c0,0,0.1,0,0.2,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0.1,0
-	c0,0,0,0,0,0c0,0.1,0.1,0.1,0.1,0.1C5.8,10.7,5.8,10.7,5.9,10.7c-0.1,0-0.1,0-0.1,0c0,0,0,0,0,0C5.8,10.7,5.9,10.7,5.9,10.7
-	C5.9,10.7,5.9,10.7,5.9,10.7 M8.2,11L8.2,11C8.2,11,8.2,11,8.2,11c-0.1,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.1-0.1-0.1-0.1
-	c0,0-0.1,0-0.1,0c0-0.1-0.1,0-0.1-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0v0l0,0c0,0,0.1,0,0.1,0c0,0-0.1,0-0.1-0.1c0,0,0,0,0.1,0
-	c0,0,0,0-0.1,0c0,0,0,0-0.1,0c0,0,0,0,0,0l0,0c0,0,0,0,0.1,0c0,0-0.1,0-0.1,0c0,0,0,0-0.1,0c0,0,0,0,0,0v0c0,0,0,0-0.1,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0-0.1,0l0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c-0.1-0.1-0.1-0.1-0.1-0.1c0,0,0,0.1-0.1,0.1c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0-0.1-0.2,0c0,0,0,0,0,0c-0.1,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0-0.1,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0-0.1,0-0.1,0-0.1c0,0,0,0,0,0c0,0,0.1-0.1,0.1-0.1c0,0,0,0-0.1,0c-0.1,0-0.2,0.1-0.2,0.1c0,0,0,0,0,0
-	c0,0-0.1,0-0.1,0.1c0.1,0,0.1,0,0.1,0c0,0-0.1,0-0.1,0c0,0.1,0.1,0.1,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0
-	c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0.1,0,0.1,0,0.1,0c0,0-0.1,0-0.1,0l0,0c0,0,0,0,0.1,0c0,0,0.1,0,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0.1,0.1
-	c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0s0,0,0,0s0,0,0,0s0,0,0,0
-	s0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0.1,0,0.1c0,0-0.1,0.1-0.1,0.1c0,0,0,0-0.1,0
-	c0,0,0.1,0,0.1,0.1c0,0,0,0,0,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0h0c-0.1-0.1-0.1,0-0.1,0c0,0,0,0,0,0c-0.1,0-0.1,0-0.1,0.1
-	c0.1,0,0.2,0,0.2,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0h0c0,0,0,0,0,0l0,0h0h0h0l0,0
-	c0,0,0,0,0.1,0.1c0,0,0,0,0,0c0,0.1,0.1,0,0.1,0.1c0,0,0.1,0,0.1,0.1c0.1,0,0.1,0,0.2,0c0,0,0,0,0,0c0-0.1-0.1-0.1-0.2-0.1
-	c-0.1,0-0.1,0-0.1-0.1c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0.1,0.1,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0.1,0,0.1,0.1c0,0,0,0,0-0.1
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.1-0.1-0.1-0.1c0,0,0,0.1,0.1,0.1c0,0,0,0-0.1-0.1c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0-0.1,0-0.1-0.1
-	c0,0,0,0,0,0l0,0c0,0,0-0.1-0.1-0.1c0,0,0,0,0,0c0,0,0,0,0-0.1c0.1,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0C7.9,11,7.9,11,8,11.1
-	c0,0,0,0.1,0.1,0c0,0.1,0,0.1,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0-0.1c0,0,0,0,0,0c0,0,0,0,0,0C8.2,11.1,8.2,11.1,8.2,11
-	C8.2,11,8.2,11,8.2,11C8.2,11,8.2,11,8.2,11C8.2,11,8.2,11,8.2,11 M6.4,10.4L6.4,10.4C6.5,10.4,6.4,10.4,6.4,10.4
-	C6.4,10.4,6.4,10.4,6.4,10.4c0-0.1,0.1-0.1,0.1-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0
-	l0,0L6.4,10.4C6.4,10.4,6.4,10.4,6.4,10.4c-0.1-0.1-0.1,0-0.1,0c0,0,0,0,0,0c-0.1,0-0.1,0.1-0.1,0.1c0,0,0,0,0,0.1c0,0,0,0,0.1,0
-	c0,0,0,0,0,0c0,0,0,0,0,0C6.3,10.5,6.3,10.5,6.4,10.4C6.3,10.5,6.4,10.5,6.4,10.4 M8.1,10.3C8.1,10.3,8.1,10.3,8.1,10.3
-	C8.1,10.3,8.1,10.3,8.1,10.3C8.1,10.3,8.1,10.3,8.1,10.3C8.1,10.3,8.1,10.3,8.1,10.3 M6.8,10.3C6.8,10.3,6.8,10.3,6.8,10.3
-	C6.8,10.3,6.8,10.3,6.8,10.3C6.8,10.3,6.8,10.3,6.8,10.3C6.8,10.3,6.7,10.3,6.8,10.3C6.7,10.3,6.7,10.3,6.8,10.3c-0.1,0-0.1,0-0.2,0
-	c0,0,0,0-0.1,0c0,0,0,0.1-0.1,0.1c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0C6.6,10.4,6.8,10.3,6.8,10.3 M8.1,10.3
-	C8.1,10.3,8.1,10.3,8.1,10.3L8.1,10.3C8.1,10.3,8.1,10.3,8.1,10.3L8.1,10.3 M5.9,10.3L5.9,10.3C6,10.3,6,10.3,5.9,10.3
-	C6,10.3,6,10.3,5.9,10.3C6,10.3,6,10.3,5.9,10.3C6,10.3,6,10.3,5.9,10.3C6,10.3,6,10.3,5.9,10.3C6,10.3,5.9,10.3,5.9,10.3
-	c-0.1,0-0.1,0-0.2,0c-0.1,0-0.1,0-0.2,0.1l0,0l0,0l0,0h0l0,0l0,0l0,0l0,0c0,0-0.1,0-0.1,0.1c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0-0.1,0-0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0.1,0,0.1-0.1,0.2-0.1c0,0,0.1,0,0.1,0
-	C5.8,10.4,5.9,10.4,5.9,10.3 M7.9,10.2C7.9,10.2,7.9,10.2,7.9,10.2C7.9,10.2,7.9,10.2,7.9,10.2C7.9,10.2,7.9,10.2,7.9,10.2
-	C7.9,10.2,7.9,10.2,7.9,10.2 M7.2,10.2L7.2,10.2C7.2,10.2,7.2,10.2,7.2,10.2C7.2,10.2,7.2,10.2,7.2,10.2C7.2,10.2,7.2,10.2,7.2,10.2
-	c-0.1,0-0.1,0-0.2,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.1,0.1-0.1,0.1c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0.1,0,0.1,0,0.1,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0C7.1,10.3,7.1,10.3,7.2,10.2C7.2,10.2,7.2,10.2,7.2,10.2 M6.8,10.2C6.8,10.1,6.8,10.1,6.8,10.2
-	C6.8,10.1,6.8,10.1,6.8,10.2C6.8,10.1,6.8,10.1,6.8,10.2C6.8,10.2,6.8,10.2,6.8,10.2C6.8,10.1,6.8,10.1,6.8,10.2
-	C6.8,10.1,6.8,10.1,6.8,10.2C6.8,10.1,6.8,10.1,6.8,10.2C6.8,10.2,6.7,10.2,6.8,10.2L6.8,10.2C6.7,10.2,6.7,10.2,6.8,10.2
-	C6.7,10.1,6.7,10.2,6.8,10.2C6.7,10.2,6.7,10.2,6.8,10.2c-0.1,0-0.1,0-0.1,0c0,0,0,0,0,0s0,0,0,0s0,0,0,0c0,0,0,0,0,0s0,0,0,0
-	s0,0,0,0s0,0,0,0s0,0,0,0c0,0,0,0,0,0C6.6,10.2,6.7,10.2,6.8,10.2C6.7,10.2,6.7,10.2,6.8,10.2c-0.1,0-0.1,0-0.1,0c0,0-0.1,0-0.1,0
-	c0,0,0,0,0.1,0C6.7,10.2,6.7,10.2,6.8,10.2 M6.5,10.2C6.6,10.2,6.6,10.2,6.5,10.2C6.6,10.2,6.6,10.2,6.5,10.2
-	C6.6,10.2,6.5,10.2,6.5,10.2C6.5,10.2,6.5,10.2,6.5,10.2c0,0,0.1,0,0.1-0.1c0,0,0,0,0,0C6.6,10.1,6.6,10.1,6.5,10.2
-	c-0.1,0-0.1,0-0.1,0C6.4,10.2,6.4,10.2,6.5,10.2c-0.1,0-0.1,0-0.1,0C6.5,10.2,6.5,10.2,6.5,10.2c-0.1,0-0.1,0-0.1,0c0,0,0,0-0.1,0
-	c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0.1,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0.1,0,0.1,0,0.1,0c0,0,0,0,0,0
-	c0,0,0,0,0,0C6.5,10.2,6.5,10.2,6.5,10.2 M6.9,10.1C7,10.1,7,10.1,6.9,10.1C7,10.1,7,10.1,6.9,10.1C6.9,10.1,6.9,10.1,6.9,10.1
-	C6.9,10.1,6.9,10.1,6.9,10.1L6.9,10.1L6.9,10.1L6.9,10.1C6.9,10.1,6.9,10.1,6.9,10.1L6.9,10.1L6.9,10.1L6.9,10.1L6.9,10.1
-	C6.9,10.1,6.9,10.1,6.9,10.1C6.9,10.1,6.9,10.1,6.9,10.1L6.9,10.1L6.9,10.1L6.9,10.1L6.9,10.1L6.9,10.1L6.9,10.1L6.9,10.1
-	C6.9,10.1,6.9,10.1,6.9,10.1L6.9,10.1C6.9,10.1,6.9,10.1,6.9,10.1 M6.6,10.1C6.7,10.1,6.7,10.1,6.6,10.1C6.7,10.1,6.7,10.1,6.6,10.1
-	C6.7,10.1,6.6,10.1,6.6,10.1L6.6,10.1C6.6,10.1,6.6,10.1,6.6,10.1L6.6,10.1C6.6,10.1,6.6,10.1,6.6,10.1L6.6,10.1
-	C6.6,10.1,6.6,10.1,6.6,10.1L6.6,10.1C6.6,10.1,6.6,10.1,6.6,10.1c-0.1,0-0.3,0.1-0.3,0.1c0,0,0,0,0,0c0,0,0,0-0.1,0
-	c0,0,0.1,0,0.1,0c0,0,0.1,0,0.1,0c0,0-0.1,0-0.1,0c0,0,0.1,0,0.1,0C6.6,10.1,6.6,10.1,6.6,10.1 M6.8,10.1L6.8,10.1
-	C6.8,10.1,6.8,10.1,6.8,10.1C6.8,10.1,6.8,10.1,6.8,10.1L6.8,10.1L6.8,10.1L6.8,10.1L6.8,10.1L6.8,10.1L6.8,10.1
-	C6.8,10.1,6.8,10.1,6.8,10.1L6.8,10.1C6.8,10.1,6.8,10.1,6.8,10.1c-0.1,0-0.1,0-0.1,0c0,0,0,0,0,0C6.8,10.1,6.8,10.1,6.8,10.1
-	 M7.1,10.1C7.1,10.1,7.1,10.1,7.1,10.1C7.1,10,7.1,10,7.1,10.1C7.1,10,7.1,10,7.1,10.1L7.1,10.1L7.1,10.1L7.1,10.1L7.1,10.1
-	L7.1,10.1L7.1,10.1L7.1,10.1L7.1,10.1C7.1,10,7.1,10,7.1,10.1C7.1,10.1,7.1,10.1,7.1,10.1C7,10.1,7,10.1,7.1,10.1
-	C7.1,10.1,7.1,10.1,7.1,10.1 M7,10.1c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	C7.1,10,7,10.1,7,10.1C7,10.1,7,10.1,7,10.1C7,10,7,10.1,7,10.1C7,10.1,7,10.1,7,10.1C7,10.1,7,10.1,7,10.1C7,10.1,7,10.1,7,10.1
-	C7,10.1,7,10.1,7,10.1C7,10.1,7,10.1,7,10.1 M7.3,10C7.3,10,7.4,10,7.3,10C7.4,10,7.3,10,7.3,10C7.3,10,7.4,10,7.3,10
-	C7.4,10,7.4,10,7.3,10C7.4,10,7.4,10,7.3,10C7.4,10,7.4,10,7.3,10C7.4,10,7.4,10,7.3,10C7.4,10,7.4,10,7.3,10C7.4,10,7.4,10,7.3,10
-	C7.4,10,7.4,10,7.3,10C7.4,10,7.4,10,7.3,10C7.4,10,7.4,10,7.3,10C7.4,10,7.4,10,7.3,10C7.4,10,7.4,10,7.3,10c0.1,0,0.1,0,0.1,0
-	C7.4,10,7.4,10,7.3,10c0.1,0,0.1,0,0.2,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0C7.5,10,7.4,10,7.3,10C7.4,10,7.4,10,7.3,10
-	C7.3,10,7.3,10,7.3,10L7.3,10C7.3,10,7.3,10,7.3,10C7.3,10,7.3,10,7.3,10C7.3,10,7.3,10,7.3,10c-0.1,0-0.1,0-0.2,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0C7.2,10.1,7.2,10.1,7.3,10C7.3,10,7.3,10,7.3,10C7.3,10.1,7.3,10,7.3,10
-	C7.3,10,7.3,10,7.3,10C7.3,10,7.3,10,7.3,10 M7.5,10C7.5,10,7.5,10,7.5,10C7.5,10,7.5,10,7.5,10C7.5,10,7.5,10,7.5,10
-	C7.5,10,7.5,10,7.5,10C7.5,10,7.5,10,7.5,10 M7.5,10L7.5,10L7.5,10C7.5,10,7.5,10,7.5,10C7.5,10,7.5,10,7.5,10C7.5,10,7.5,10,7.5,10
-	C7.5,10,7.5,10,7.5,10C7.5,10,7.5,10,7.5,10C7.5,10,7.5,10,7.5,10C7.5,10,7.5,10,7.5,10L7.5,10C7.5,10,7.5,10,7.5,10L7.5,10
-	C7.5,10,7.5,10,7.5,10L7.5,10C7.5,10,7.5,10,7.5,10L7.5,10C7.5,10,7.5,10,7.5,10c-0.1,0-0.1,0-0.1,0C7.4,10,7.4,10,7.5,10
-	C7.4,10,7.4,10,7.5,10L7.5,10L7.5,10L7.5,10L7.5,10L7.5,10L7.5,10L7.5,10c-0.1,0-0.1,0-0.1,0l0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0h0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0
-	c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0
-	C7.4,10.1,7.4,10.1,7.5,10C7.4,10.1,7.4,10.1,7.5,10C7.4,10.1,7.4,10.1,7.5,10C7.4,10.1,7.5,10,7.5,10C7.5,10,7.5,10,7.5,10
-	C7.5,10,7.5,10,7.5,10L7.5,10C7.5,10,7.5,10,7.5,10C7.5,10,7.5,10,7.5,10C7.5,10,7.5,10,7.5,10C7.5,10,7.5,10,7.5,10
-	C7.5,10,7.5,10,7.5,10C7.5,10,7.5,10,7.5,10 M9,11.2C8.6,10.5,8.1,10,7.5,10h0h0h0c0,0,0,0,0,0l0,0h0l0,0l0,0l0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0l0,0l0,0l0,0l0,0l0,0c0,0,0,0,0,0v0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0h0c0,0,0,0,0.1,0c0,0,0,0,0.1,0
-	c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0c0,0,0,0,0,0l0,0l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0
-	l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0h0c0,0,0,0,0,0h0c0,0,0,0,0,0h0h0c0,0,0,0,0,0h0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0h0h0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0h0l0,0l0,0h0l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0h0c0,0,0,0,0.1,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0c-0.1,0-0.1,0-0.2,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0l0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0l0,0l0,0l0,0l0,0l0,0l0,0l0,0l0,0l0,0l0,0h0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0v0
-	l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0-0.1,0-0.1,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0v0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c-0.1,0-0.1,0-0.1,0l0,0c0,0,0.1,0,0.1,0l0,0l0,0
-	c0,0,0,0,0,0c-0.1,0-0.1,0-0.1,0c0,0,0,0,0,0l0,0l0,0c0,0,0,0,0,0c0,0,0,0-0.1,0h0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	l0,0c0,0,0.1,0,0.1,0c0,0,0,0,0.1-0.1l0,0l0,0c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0-0.1,0.1l0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0
-	c0,0,0,0,0.1,0c0,0,0,0,0,0.1l0,0c0,0,0,0,0-0.1l0,0l0,0c0,0,0,0,0,0h0l0,0c0,0,0,0,0-0.1l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0.1,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.1-0.1-0.1,0l0,0l0,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0l0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0.1,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0l0,0c0,0,0,0,0,0C8.9,11.1,8.9,11.1,9,11.2C8.9,11.1,8.9,11.1,9,11.2L9,11.2C8.9,11.2,8.9,11.2,9,11.2
-	C8.9,11.2,8.9,11.2,9,11.2C8.9,11.2,8.9,11.2,9,11.2C8.9,11.2,8.9,11.2,9,11.2C8.9,11.2,8.9,11.2,9,11.2C8.9,11.2,8.9,11.2,9,11.2
-	C8.9,11.2,8.9,11.2,9,11.2C8.9,11.2,8.9,11.2,9,11.2C8.9,11.2,8.9,11.2,9,11.2C8.9,11.2,9,11.2,9,11.2C9,11.2,9,11.2,9,11.2"/>
-<path style="fill:#B3E710;" d="M7.4,22.9L7.4,22.9C7.4,22.9,7.4,22.9,7.4,22.9L7.4,22.9C7.4,22.9,7.4,22.9,7.4,22.9L7.4,22.9
-	C7.4,22.9,7.4,22.9,7.4,22.9C7.4,22.9,7.4,22.9,7.4,22.9 M9.4,20.1C9.4,20.1,9.4,20.1,9.4,20.1c-0.1,0-0.1,0-0.2,0c0,0,0,0.1,0,0.1
-	C9.2,20.2,9.3,20.2,9.4,20.1 M8.8,22.1c0.3-0.5,0.6-1.2,0.8-2c0,0,0,0,0,0c0,0,0,0-0.1,0c-0.1,0-0.1,0.1-0.2,0.2c0,0,0,0,0,0
-	c0,0-0.1,0-0.1,0c0,0,0-0.1,0-0.1c-0.1,0-0.1,0-0.1,0c0,0,0-0.1,0.1-0.1c-0.5,0-1.1,0-1.7,0c-0.5,0-1,0-1.4,0c0,0,0,0.1,0,0.1
-	c0,0,0,0.1,0,0.2l0,0c0.1,0.1,0.1,0,0.1,0c0.1,0.1-0.1,0.1-0.1,0.2c0,0,0.1,0.1,0.1,0.1c0,0,0,0,0,0c0.1,0.1,0.2,0.1,0.6,0.7
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0.1,0.2,0.4,0.2,0.5,0.3
-	c0.1,0.1-0.1,0.3-0.1,0.4c0,0-0.1,0-0.1,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0s0,0,0,0s0,0,0,0s0,0,0,0c0,0,0,0,0,0s0,0,0,0l0.1,0
-	c0,0.1,0.1,0.7,0.1,0.7c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0.1,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0l0,0l0,0l0,0c0,0,0,0,0,0l0,0
-	c0,0,0,0,0,0h0c0,0,0,0,0,0h0h0c0,0,0,0,0,0c0,0,0,0,0,0l0,0h0l0,0l0,0l0,0h0c0,0,0-0.1,0-0.1c0,0,0,0,0.1-0.1c0,0,0.1,0,0.2-0.1
-	c0,0,0,0,0-0.1c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0.1,0,0.2,0,0.4-0.2c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0-0.1,0.1-0.1,0.1c0.2-0.1,0.2-0.1,0.4-0.3c0,0,0,0,0,0C8.7,22.1,8.8,22.1,8.8,22.1 M13.7,18.3C13.7,18.3,13.7,18.3,13.7,18.3
-	C13.7,18.3,13.7,18.3,13.7,18.3C13.7,18.3,13.7,18.3,13.7,18.3C13.7,18.3,13.7,18.4,13.7,18.3L13.7,18.3
-	C13.7,18.4,13.7,18.3,13.7,18.3 M14,15.4c0-0.2-0.1-0.5-0.1-0.7v0c0-0.1-0.1-0.1-0.2-0.2c0,0-0.1,0-0.3-0.6c0,0,0,0,0,0
-	c0-0.1,0-0.1-0.1-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0,0-0.1,0c0,0,0,0-0.1,0.1c0,0,0,0,0,0.1c0,0,0,0.1-0.1,0.1
-	c0,0,0,0-0.1,0c-0.1,0-0.1,0-0.1-0.1c0,0-0.1,0.5,0,0.7c0.1,0.3-0.2,0.4-0.2,0.7c0,0.2-0.1,0.4-0.1,0.7c0,0,0,0,0,0
-	c0.1,0.1,0.1,0.7,0,0.8c0,0,0,0.1,0.1,0.1c0,0,0,0,0,0c0,0,0,0.1,0,0.1c0,0,0,0,0,0l0,0l0,0l0,0l0,0h0l0,0l0,0l0-0.1
-	c0,0,0-0.1,0-0.1c0,0,0,0,0,0c0,0,0,0.2,0,0.2c0,0,0.1,0.1,0.1,0.1c0,0,0.1,0.1,0.1,0.1v0c0,0-0.1,0-0.1,0c0,0,0,0,0.1,0.2
-	c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0s0,0,0,0s0,0,0,0s0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0v0v0L12.8,18c0,0,0,0,0,0c0,0,0.2,0.3,0.3,0.3
-	c0.1,0,0.1-0.2,0.2-0.2c0,0,0,0,0-0.1c0,0,0,0,0,0c0.1,0,0.3-0.2,0.3-0.2c0,0,0.2,0,0.2,0.1l0.2,0v0c0,0.1-0.2,0.1-0.2,0.1
-	c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0.1,0.1,0.1,0.1v0l-0.1,0c0,0.1-0.1,0.2-0.2,0.3l0,0c0,0,0,0.1,0,0.1c0,0,0,0,0,0
-	c0,0,0,0.1-0.1,0.2l0,0l0,0c0,0,0,0,0,0.1c-0.1,0.4-0.5,1-0.5,1c0,0,0,0,0,0s0,0,0,0c0.1,0,0.2-0.3,0.3-0.6c0.2-0.3,0.3-0.6,0.4-0.9
-	s0.2-0.6,0.2-1c0.1-0.3,0.1-0.7,0.1-1C14.1,16.1,14.1,15.8,14,15.4 M13.4,13.8C13.4,13.8,13.4,13.8,13.4,13.8
-	C13.4,13.8,13.4,13.8,13.4,13.8C13.4,13.8,13.4,13.8,13.4,13.8C13.4,13.8,13.4,13.8,13.4,13.8C13.4,13.8,13.4,13.8,13.4,13.8
-	c0,0.1,0,0.1,0.1,0.2C13.5,13.9,13.5,13.9,13.4,13.8 M13.2,13.5C13.2,13.5,13.2,13.5,13.2,13.5C13.2,13.4,13.2,13.4,13.2,13.5
-	C13.2,13.5,13.2,13.5,13.2,13.5C13.2,13.5,13.2,13.5,13.2,13.5C13.2,13.5,13.2,13.5,13.2,13.5c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0C13.3,13.6,13.3,13.6,13.2,13.5 M13.1,13.3C13.1,13.3,13.1,13.2,13.1,13.3
-	L13.1,13.3L13.1,13.3C13.1,13.3,13.1,13.3,13.1,13.3L13.1,13.3C13.1,13.3,13.1,13.3,13.1,13.3C13.1,13.3,13.1,13.3,13.1,13.3
-	C13.1,13.3,13.1,13.3,13.1,13.3C13.1,13.3,13.1,13.3,13.1,13.3L13.1,13.3L13.1,13.3L13.1,13.3L13.1,13.3L13.1,13.3L13.1,13.3
-	c0,0.1,0.1,0.1,0.1,0.1l0,0C13.2,13.4,13.1,13.3,13.1,13.3 M13.3,13.5C13.3,13.5,13.2,13.5,13.3,13.5l-0.1-0.1c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0-0.2-0.4-0.3-0.4l0,0c0,0-0.1,0-0.3,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0,0,0,0l0,0l0,0
-	c0,0,0.1,0.1,0.1,0.2c0,0,0,0-0.1,0c0,0.1-0.1,0-0.1,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0.1,0,0.1,0.1
-	c0.1,0.1,0.1,0.3,0.1,0.4c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0.1
-	c0,0,0,0.1,0,0.1c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0.1,0.1,0.1c0,0.1,0.1,0.1,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0l0,0h0
-	c0,0,0-0.1,0-0.1c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0-0.1,0-0.1c0,0,0,0,0,0c0,0,0-0.1,0-0.1c0,0,0,0,0,0
-	c0,0,0,0-0.1-0.1c0-0.1,0-0.1,0-0.2l0,0c0,0,0-0.1,0-0.1c0-0.1,0-0.1,0-0.1c-0.1-0.1-0.1-0.1-0.1-0.1c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0-0.1,0-0.1c0,0,0,0,0,0C13,13,13.3,13.5,13.3,13.5C13.3,13.5,13.3,13.5,13.3,13.5L13.3,13.5
-	L13.3,13.5L13.3,13.5L13.3,13.5C13.3,13.5,13.3,13.5,13.3,13.5C13.3,13.5,13.3,13.5,13.3,13.5C13.3,13.5,13.3,13.6,13.3,13.5
-	C13.3,13.6,13.3,13.6,13.3,13.5c0.1,0.1,0.1,0.2,0.1,0.2c0,0,0,0,0,0l0,0l0,0c0,0,0,0,0,0.1c0,0,0,0,0,0l0,0l0,0c0,0,0,0,0-0.1
-	C13.4,13.7,13.3,13.6,13.3,13.5 M12.9,12.9C12.9,12.9,12.9,12.9,12.9,12.9C12.9,12.9,12.9,12.9,12.9,12.9C12.9,12.9,13,13,12.9,12.9
-	C13,13,12.9,12.9,12.9,12.9 M13.1,13.1c0-0.1-0.1-0.1-0.1-0.2c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0C13,13,13,13,13.1,13.1
-	C13,13,13,13,13.1,13.1C13,13.1,13.1,13.1,13.1,13.1C13.1,13.1,13.1,13.1,13.1,13.1 M9.2,12.9L9.2,12.9L9.2,12.9L9.2,12.9L9.2,12.9
-	c-0.1,0-0.1,0-0.1,0.1C9.1,12.9,9.1,12.9,9.2,12.9C9.2,12.9,9.2,12.9,9.2,12.9C9.2,12.9,9.2,12.9,9.2,12.9 M2.7,12.5
-	C2.8,12.5,2.7,12.5,2.7,12.5C2.7,12.5,2.7,12.5,2.7,12.5C2.7,12.6,2.7,12.6,2.7,12.5C2.7,12.6,2.7,12.6,2.7,12.5 M2.9,12.4
-	C2.9,12.4,2.9,12.4,2.9,12.4C2.9,12.3,2.9,12.3,2.9,12.4c0.1-0.1,0.1-0.1,0.1-0.1c0,0,0,0,0,0C2.8,12.3,2.8,12.4,2.9,12.4
-	C2.8,12.4,2.8,12.4,2.9,12.4C2.8,12.4,2.8,12.4,2.9,12.4C2.8,12.4,2.8,12.4,2.9,12.4C2.8,12.4,2.8,12.4,2.9,12.4
-	C2.8,12.4,2.8,12.4,2.9,12.4C2.8,12.4,2.8,12.4,2.9,12.4C2.9,12.4,2.9,12.4,2.9,12.4 M2.9,12.2C3,12.1,3,12.1,2.9,12.2
-	C3,12.1,3,12.1,2.9,12.2C3,12.1,3,12.1,2.9,12.2C2.9,12.1,2.9,12.2,2.9,12.2C2.9,12.2,2.9,12.2,2.9,12.2L2.9,12.2
-	C2.9,12.2,2.9,12.2,2.9,12.2 M3,12.1C3,12,3,12,3,12.1C3.1,12,3.1,12,3,12.1C3.1,12,3.1,12,3,12.1C3,12,3,12,3,12.1
-	C3,12.1,3,12.1,3,12.1C3,12,3,12.1,3,12.1 M9,13c0,0,0-0.2,0-0.2c0,0,0.1,0,0-0.1c0-0.2,0-0.1,0-0.1c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0-0.1,0-0.1,0c-0.1,0-0.1,0.1-0.2,0.1c0,0,0-0.1,0-0.1c0.1,0,0.2-0.1,0.2-0.1c-0.3-0.1-0.3-0.2-0.3-0.2
-	c0-0.1,0-0.3-0.1-0.3c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0
-	c0,0,0,0.1-0.1,0c0,0,0,0.1,0,0.1c0,0,0.1,0,0.1,0c0-0.1-0.1,0-0.1-0.1c0,0,0,0,0,0C8.4,12,8.4,12,8.3,12c0,0,0,0,0,0c0,0,0,0,0,0
-	c-0.1-0.1-0.1-0.1-0.2-0.2c0,0,0,0-0.1,0.1c0,0,0,0,0,0.1C8,11.9,8,12,8,12c0,0,0,0,0,0c0,0,0-0.1-0.1-0.1C7.9,12,7.9,12,7.8,12
-	c0,0,0,0,0,0c0-0.1-0.1,0-0.2,0c0,0,0,0,0,0c0,0,0-0.1,0-0.1c0,0,0,0.2,0,0.2c0,0,0-0.1,0-0.1c0,0,0,0,0,0c-0.1,0-0.2-0.2-0.2-0.2
-	c0,0,0-0.1,0-0.1c0,0-0.1-0.1-0.1-0.1c-0.1,0-0.1,0-0.1,0c-0.1,0-0.1,0-0.2-0.1c0,0,0,0,0,0c0,0-0.1,0,0,0.1c0,0,0,0.1,0,0.1v0
-	c0,0,0,0,0,0c0,0,0,0.1,0,0.1l-0.1,0.1C6.9,12,7.1,12,7,12.2c0,0.1-0.1,0.4-0.3,0.5c0,0,0.1,0.3,0.1,0.3c0,0,0,0,0,0
-	c0,0,0.3-0.4,0.3-0.4c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0.1-0.1,0.1-0.1,0.2c0,0-0.1,0.1-0.1,0.1c0,0-0.1,0-0.1-0.1c0,0,0,0-0.1,0c0,0,0,0.1,0,0.1c0.3,0,0.5,0,0.8,0c0.5,0,1,0,1.5,0
-	c0,0-0.1-0.1-0.1-0.1C9,12.9,9,12.9,9,12.8 M9,11.3C9,11.2,9,11.2,9,11.3L9,11.3L9,11.3 M6.8,11.3L6.8,11.3c0,0,0,0-0.1,0
-	c0,0,0-0.1,0-0.1c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0-0.1-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c-0.1,0.1-0.1,0.1-0.1,0.2c-0.1,0-0.1,0-0.1,0.1c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0.1c0,0,0,0,0,0c0,0,0,0,0.1,0
-	c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0C6.7,11.3,6.7,11.3,6.8,11.3C6.8,11.3,6.8,11.3,6.8,11.3 M7.3,10.8
-	C7.3,10.8,7.3,10.8,7.3,10.8C7.3,10.8,7.2,10.8,7.3,10.8c-0.2,0-0.2,0.1-0.1,0.1C7.1,10.9,7.2,11,7.3,10.8"/>
-<path style="fill:#B3E710;" d="M9.6,13.4C9.6,13.4,9.6,13.4,9.6,13.4C9.6,13.4,9.6,13.4,9.6,13.4C9.6,13.4,9.6,13.3,9.6,13.4
-	L9.6,13.4C9.5,13.3,9.5,13.3,9.6,13.4C9.5,13.4,9.5,13.4,9.6,13.4c-0.1-0.1-0.1-0.1-0.1-0.1c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0
-	l0,0c0,0,0,0-0.1,0c0,0,0,0,0.1-0.1c0,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0-0.1,0c0,0,0,0-0.1,0.1c0-0.1,0-0.1,0.1-0.2c0,0-0.1,0-0.1,0C9,13,9,13,9,13.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0-0.1,0
-	c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0-0.1,0-0.1,0.1c0,0,0,0,0,0.1c0.1,0,0.1,0,0.2,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0c0,0,0,0,0,0
-	c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0-0.1,0.1-0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1-0.1,0.1-0.1c0,0,0,0,0,0l0,0c0,0,0,0,0,0.1
-	c0,0,0,0,0,0l0,0L9.6,13.4C9.5,13.4,9.5,13.5,9.6,13.4C9.6,13.5,9.6,13.5,9.6,13.4C9.6,13.5,9.6,13.4,9.6,13.4 M12.6,12.9
-	C12.6,12.9,12.6,12.9,12.6,12.9C12.6,12.9,12.6,12.9,12.6,12.9L12.6,12.9C12.6,12.9,12.6,12.9,12.6,12.9 M11.6,11.8
-	c0,0-0.1-0.2-0.2-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0s0,0,0,0s0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0C11.7,11.9,11.7,11.9,11.6,11.8C11.6,11.9,11.6,11.9,11.6,11.8
-	 M11.5,11.7L11.5,11.7C11.5,11.7,11.4,11.7,11.5,11.7C11.4,11.7,11.4,11.7,11.5,11.7C11.4,11.7,11.5,11.7,11.5,11.7 M11.8,11.7
-	C11.8,11.6,11.8,11.6,11.8,11.7L11.8,11.7C11.8,11.7,11.8,11.7,11.8,11.7C11.8,11.7,11.8,11.7,11.8,11.7
-	C11.8,11.7,11.8,11.7,11.8,11.7C11.9,11.7,11.9,11.7,11.8,11.7C11.9,11.7,11.9,11.7,11.8,11.7C11.9,11.7,11.9,11.7,11.8,11.7
-	C11.9,11.7,11.9,11.7,11.8,11.7L11.8,11.7L11.8,11.7C11.9,11.7,11.8,11.7,11.8,11.7 M11.6,11.4C11.6,11.4,11.6,11.4,11.6,11.4
-	L11.6,11.4C11.6,11.5,11.6,11.5,11.6,11.4C11.6,11.5,11.6,11.5,11.6,11.4c0.1,0.1,0.1,0.1,0.1,0.1C11.7,11.5,11.7,11.5,11.6,11.4
-	C11.6,11.5,11.6,11.5,11.6,11.4C11.6,11.5,11.6,11.5,11.6,11.4 M9.4,11.4C9.4,11.4,9.4,11.4,9.4,11.4C9.4,11.4,9.4,11.4,9.4,11.4
-	C9.4,11.4,9.4,11.4,9.4,11.4C9.4,11.4,9.3,11.4,9.4,11.4C9.3,11.4,9.4,11.4,9.4,11.4C9.4,11.4,9.4,11.4,9.4,11.4 M12.1,12.1
-	c0,0-0.1-0.1-0.1-0.1C12,12,12,12,12.1,12.1C11.9,12,11.9,12,11.9,12c0,0-0.1-0.1-0.2-0.2c-0.2-0.1-0.2-0.2-0.2-0.2c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.1-0.1-0.1-0.1c0,0-0.1,0-0.1,0c0,0,0-0.1-0.1-0.1c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0.1c0,0,0.1,0.1,0.1,0.1l0,0
-	c0,0,0,0,0,0l0,0c0,0,0,0.1,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0.1,0.1,0.1,0.1,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0.1,0.1,0.1c0,0,0,0,0,0
-	c0,0,0,0,0,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0.1l0,0C11.9,12.1,11.9,12.1,12.1,12.1C12,12.2,12,12.2,12.1,12.1C12,12.2,12,12.2,12.1,12.1
-	C12,12.2,12,12.1,12.1,12.1C12,12.2,12,12.2,12,12.2c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0.1,0,0.1,0,0.1
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0C12.1,12.2,12.1,12.2,12.1,12.1
-	C12.1,12.2,12.1,12.2,12.1,12.1C12.1,12.2,12.1,12.2,12.1,12.1C12.1,12.2,12.1,12.2,12.1,12.1C12.1,12.1,12.1,12.1,12.1,12.1
-	 M9.9,10.7c0,0-0.1,0-0.1,0c0,0,0,0-0.1,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0
-	c0,0-0.1,0-0.1,0c0,0,0,0,0,0l0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c-0.1,0-0.1-0.1-0.2-0.1c0,0,0,0,0,0l0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0.1,0l0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0.1,0,0.1,0,0.1,0.1c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0
-	c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0C10,10.8,10,10.8,9.9,10.7C10,10.8,10,10.8,9.9,10.7C10,10.8,10,10.7,9.9,10.7
-	C10,10.7,10,10.7,9.9,10.7C10,10.7,9.9,10.7,9.9,10.7 M8.6,10.2C8.6,10.2,8.6,10.2,8.6,10.2C8.5,10.2,8.5,10.2,8.6,10.2
-	C8.6,10.2,8.6,10.2,8.6,10.2L8.6,10.2C8.7,10.2,8.6,10.2,8.6,10.2L8.6,10.2L8.6,10.2L8.6,10.2L8.6,10.2C8.6,10.2,8.6,10.2,8.6,10.2
-	 M12.1,11.9C12.1,11.9,12,11.8,12.1,11.9L12.1,11.9C12,11.9,12.1,11.9,12.1,11.9c0,0-0.1-0.1-0.1-0.1l0,0l0,0h0
-	C12,11.8,12,11.9,12.1,11.9C12.1,11.9,12.1,11.9,12.1,11.9L12.1,11.9L12.1,11.9L12.1,11.9C12,11.8,12,11.8,12,11.8c0,0,0,0,0,0
-	c0,0-0.1-0.1-0.1-0.1l0,0c0,0,0,0-0.1-0.1l0,0l0,0l0,0c0,0,0,0-0.1,0c0,0,0,0,0.1,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0.1,0.1,0.1,0.1l0,0c0.1,0,0.1,0.1,0.2,0.2l0,0L12.1,11.9L12.1,11.9L12.1,11.9C12,11.9,12,11.9,12.1,11.9
-	C12,11.9,12,11.9,12.1,11.9C12.1,11.9,12,11.9,12.1,11.9C12.1,11.9,12.1,11.9,12.1,11.9L12.1,11.9L12.1,11.9L12.1,11.9
-	C12.1,11.9,12,11.9,12.1,11.9C12,11.9,12,11.9,12.1,11.9C12,11.9,12,11.9,12.1,11.9C12.1,11.9,12.1,11.9,12.1,11.9
-	C12.1,12,12.1,12,12.1,11.9L12.1,11.9C12,11.9,12,11.9,12.1,11.9C12,11.9,12,11.9,12.1,11.9C12,12,12.1,12,12.1,11.9
-	c0,0.1,0,0.1,0,0.2c0,0,0,0,0,0c0,0,0,0,0,0l0,0C12.1,12,12.1,12,12.1,11.9c0,0.1,0,0.1,0.1,0.3c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0.1,0.1,0.1c0,0,0,0,0,0.1l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0.1,0.1,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0l0,0l0,0
-	c0,0,0,0,0.1,0.1c0.1,0.1,0.1,0.1,0.2,0.2c0.2,0,0.3,0,0.3,0l0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c-0.1-0.1-0.1-0.2-0.2-0.3C12.6,12.4,12.3,12.1,12.1,11.9 M10.5,10.7c-0.2-0.1-0.4-0.2-0.6-0.3l0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0.1C10.4,10.7,10.5,10.7,10.5,10.7C10.5,10.8,10.5,10.8,10.5,10.7
-	c0.1,0.1,0.2,0.1,0.2,0.1l0,0c0,0,0.1,0,0.1,0.1c0,0,0,0,0,0l0,0h0l0,0h0c0,0,0,0,0,0l0,0h0l0,0l0,0c0,0,0,0,0.1,0c0,0,0,0,0,0
-	c0,0,0,0,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0.1,0.1,0.1c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0.1l0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0l0,0l0,0l0,0l0,0l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0c0,0,0.1,0.1,0.1,0.1l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c-0.1-0.1-0.1-0.1-0.2-0.2c0,0,0,0,0.1,0c0,0,0.1,0.1,0.1,0.1c0,0,0,0,0,0l0,0c0,0,0.1,0.1,0.1,0.1c0,0,0.1,0.1,0.1,0.1l0,0l0,0l0,0
-	c0,0,0.1,0.1,0.1,0.1c0,0,0,0,0,0c0,0,0,0-0.1-0.1l0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0-0.1-0.1-0.1-0.1c-0.1-0.1-0.2-0.2-0.3-0.3
-	C11.1,11.1,10.8,10.9,10.5,10.7 M8.3,10.1L8.3,10.1C8.3,10.1,8.3,10.1,8.3,10.1L8.3,10.1L8.3,10.1C8.3,10.1,8.2,10.1,8.3,10.1
-	L8.3,10.1C8.2,10.1,8.3,10.1,8.3,10.1L8.3,10.1L8.3,10.1C8.3,10.1,8.3,10.1,8.3,10.1L8.3,10.1L8.3,10.1L8.3,10.1L8.3,10.1
-	C8.3,10.1,8.3,10.1,8.3,10.1C8.3,10.1,8.3,10.1,8.3,10.1L8.3,10.1C8.3,10.1,8.3,10.1,8.3,10.1 M8.2,10.1L8.2,10.1L8.2,10.1
-	C8.2,10.1,8.2,10.1,8.2,10.1C8.2,10.1,8.2,10.1,8.2,10.1C8.2,10.1,8.2,10.1,8.2,10.1C8.2,10.1,8.2,10.1,8.2,10.1L8.2,10.1
-	C8.2,10.1,8.2,10.1,8.2,10.1C8.2,10.1,8.2,10.1,8.2,10.1 M8.2,10.1C8.2,10.1,8.2,10.1,8.2,10.1L8.2,10.1L8.2,10.1L8.2,10.1
-	C8.1,10.1,8.1,10.1,8.2,10.1L8.2,10.1L8.2,10.1L8.2,10.1L8.2,10.1C8.2,10.1,8.2,10.1,8.2,10.1C8.2,10.1,8.2,10.1,8.2,10.1 M8,10
-	L8,10C7.9,10,7.9,10,8,10C7.9,10,8,10,8,10C8,10,8,10,8,10 M7.9,10C7.8,10,7.8,10,7.9,10C7.8,10,7.8,10,7.9,10L7.9,10
-	C7.8,10,7.9,10,7.9,10C7.9,10,7.9,10,7.9,10 M7.8,10L7.8,10C7.8,10,7.7,10,7.8,10C7.8,10,7.8,10,7.8,10C7.7,10,7.7,10,7.8,10
-	C7.7,10,7.7,10,7.8,10C7.8,10,7.8,10,7.8,10L7.8,10C7.8,10,7.8,10,7.8,10 M7.7,10L7.7,10L7.7,10C7.6,10,7.6,10,7.7,10
-	C7.6,10,7.6,10,7.7,10C7.6,10,7.6,10,7.7,10C7.6,10,7.7,10,7.7,10L7.7,10 M7.9,10c-0.1,0-0.2,0-0.2,0h0c0,0,0.1,0,0.1,0
-	C7.8,10,7.8,10,7.9,10 M7.6,10C7.6,10,7.5,10,7.6,10L7.6,10C7.6,10,7.6,10,7.6,10C7.6,10,7.6,10,7.6,10 M8,10L8,10L8,10L8,10L8,10
-	 M9,10H8.7c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0.2,0,0.2,0.1C9,10.2,9,10,9,10H8.7l0,0.1c0,0,0,0,0,0
-	l0-0.1c0,0,0-0.1,0-0.1c0,0,0,0,0,0c0,0,0.2,0.1,0.2,0.1c0,0,0.2,0.1,0.2,0.1v0c0,0-0.2-0.1-0.2-0.1c0,0-0.2-0.1-0.2-0.1h0
-	c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0C8.5,10,9,10.1,9,10v0.1c-1,0-0.3,0-0.3,0c0,0-0.1-0.1-0.1-0.1c0,0-0.1-0.1-0.1-0.1c0,0,0,0,0,0
-	c0,0,0.1,0,0.1,0l0,0h0l0,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0.1,0l0,0c0,0,0-0.1,0-0.1l0-0.1h0.2
-	C8.8,10,9,10.1,9,10L9,10H8.3c0,0-0.3,0.1-0.3,0.1v-0.1c0,0,0.5-0.1,0.5-0.1h0l0,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0-0.4,0-0.4,0v0.1l0,0l0,0v0l0,0l0,0l0,0l0.4,0h0l0,0h0c0,0-0.4,0-0.4,0l0,0v0.1v0l0,0v0v0l0,0c0,0,0.2-0.1,0.2-0.1
-	c0,0,0.2,0,0.2,0h0c0,0,0,0.1,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0-0.1,0h0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0c0,0-0.1,0-0.1,0V10h0.1l0,0l0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0-0.2,0-0.2,0v0v0l0,0v0l0,0v0v0c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0v0v0v0h0h0c0,0,0,0,0,0h0
-	c0,0,0,0,0,0h0v0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0h0c0,0,0,0,0,0h0c0,0,0,0,0,0h0c0,0,0,0,0,0c0,0-0.1,0-0.1,0h0c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0h0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0h0h0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0.5,0,1,0.5,1.4,1.2c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0-0.2,0-0.1c0,0,0-0.2,0-0.2c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0.2,0,0.2
-	c0,0,0,0.1,0,0.1c0,0,0.1,0,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0
-	c0,0,0,0,0,0l0,0l0,0h0c0,0,0,0,0,0h0c0,0,0,0,0,0c0,0-0.2,0-0.2,0c0,0-0.2,0-0.2,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0.2,0,0.2,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0l0,0c0,0-0.2,0-0.2,0c0,0-0.2,0-0.2,0c0,0,0-0.2,0-0.2
-	c0,0,0.5-0.2,0.5-0.2h0c0,0,0,0.2,0,0.2c0,0,0,0.1,0,0.1c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0.1,0,0.1,0c0,0,0.2,0,0.2,0c0,0,0,0,0,0c0,0-0.1,0-0.2,0c0,0,0.1,0,0,0
-	c0,0,0.1,0,0.1,0c0,0,0-0.4,0-0.4s-0.3,0-0.3,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0.2,0,0.2c0,0,0-0.1,0-0.1c0,0,0-0.1,0-0.1h0l0,0.2
-	c0,0,0,0.1,0,0.1c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0-0.1-0.1
-	c0,0,0,0,0.1,0l0,0c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0.2,0,0.2,0c0,0-0.7,0,0.3,0v0c-1,0-0.3,0-0.3,0H9.6c0,0,0,0,0,0
-	c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0-0.5,0-0.5,0v0l0,0v0l0,0v0h0.2H9v0l0.3,0c0,0,0.1,0,0.1,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0L9,11v0
-	c0,0,0.4,0,0.4,0c0,0,0,0,0,0s0,0,0,0s0,0,0,0s0,0,0,0s0,0,0,0s0,0,0,0s0,0,0,0s0,0,0,0l0,0c0,0,0,0-0.1,0l0,0l0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0c0,0,0,0-0.1,0c0,0,0,0,0.1,0c0,0,0,0.1,0,0.1c0,0,0,0.1-0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.3-0.1-0.3-0.1v-0.1c0,0,0.1,0,0.1-0.1c0,0,0.1,0,0.1,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0-0.1,0-0.1,0c0,0-0.2,0-0.2,0c0,0,0,0,0,0c0,0,0.2,0.3,0.2,0.3h0c0,0,0-0.2,0-0.2c0,0,0.1,0.1,0.1,0.1c0,0,0,0.1,0,0.1
-	c0,0,0,0,0,0c0,0,0-0.2,0-0.2c0,0,0-0.1,0-0.1c0,0-0.1,0-0.1,0c0,0-0.2,0-0.2,0V11c0,0,0.2,0,0.2,0c0,0,0.1-0.2,0-0.2
-	c0,0,0-0.1,0-0.1c0,0,0-0.1,0.1,0c0,0,0,0.2,0,0.2l0,0.2c0,0,0,0,0,0c0,0,0-0.3,0-0.3l0-0.1l0-0.1c0,0,0-0.3,0-0.3C9,10.2,9,10,9,10
-	C9,10,9,10,9,10L9,10.2c0,0,0,0.1-0.1,0.1l0,0c0,0,0.1,0.1,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0l0,0l0,0c0,0-0.1,0-0.1,0c0,0,0.1,0,0.1,0c0,0,0-0.1,0-0.1V10H8.8H9v0.1
-	l0,0V10c0,0-0.1,0-0.1,0l0,0H9L9,10v0.2l-0.1,0c0,0-0.1-0.1-0.1-0.1c0,0-0.1-0.1-0.1-0.1"/>
-<path style="fill:#B3E710;" d="M10.4,20.8c0,0,0.1-0.2,0.1-0.2c0,0-0.1,0-0.1,0c-0.1-0.2-0.1-0.2-0.1-0.2c0,0-0.1,0-0.1,0
-	c0,0-0.1-0.1-0.1-0.1c0,0-0.1,0-0.2,0.1c0,0,0.1-0.1,0-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0-0.1-0.1c-0.2,0.8-0.5,1.5-0.8,2
-	c0.1,0,0.1,0,0.1,0c0,0,0.1,0,0.1-0.1c0,0,0.1,0,0.1,0c0,0,0.1-0.1,0.1-0.1c0-0.1,0.2-0.1,0.2-0.2c0.1-0.1,0.1-0.1,0.2-0.2
-	c0-0.1,0.1-0.1,0.2-0.3c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0,0.1-0.1c0,0,0.1-0.1,0.1-0.1c0.1-0.1,0.1-0.1,0.2-0.1
-	C10.3,20.8,10.4,20.8,10.4,20.8 M12.8,20.3c0.1-0.1,0.1-0.2,0.2-0.3c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0c-0.6,0.9-1.1,1.3-1.3,1.5
-	c0.2-0.2,0.4-0.3,0.6-0.5C12.3,20.9,12.6,20.6,12.8,20.3 M9.5,20.1C9.5,20.1,9.5,20.1,9.5,20.1C9.5,20.1,9.5,20.1,9.5,20.1
-	C9.5,20.1,9.5,20.1,9.5,20.1 M9.4,20C9.4,20,9.4,20,9.4,20c0,0-0.1,0-0.2,0c0,0,0,0,0,0s0,0,0,0s0,0,0,0s0,0,0,0s0,0,0,0s0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0.1C9.3,20.1,9.3,20.1,9.4,20C9.4,20.1,9.4,20.1,9.4,20 M8.1,18.8C8.1,18.8,8.1,18.8,8.1,18.8
-	C8.1,18.8,8.1,18.8,8.1,18.8C8.1,18.8,8.1,18.8,8.1,18.8C8.1,18.8,8.1,18.8,8.1,18.8C8.1,18.8,8.1,18.9,8.1,18.8
-	C8.1,18.9,8.1,18.9,8.1,18.8C8.1,18.9,8,18.9,8,18.9c0,0,0,0,0,0C8.1,18.9,8.1,18.9,8.1,18.8C8.1,18.9,8.1,18.9,8.1,18.8 M6.8,17.4
-	L6.8,17.4c0-0.1-0.2-0.1-0.2-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0h0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0h0l0,0
-	c0,0,0.1,0.1,0.1,0.1C6.7,17.5,6.7,17.4,6.8,17.4C6.8,17.4,6.8,17.4,6.8,17.4C6.8,17.4,6.8,17.4,6.8,17.4
-	C6.8,17.4,6.8,17.4,6.8,17.4L6.8,17.4 M8.2,17.4C8.2,17.4,8.2,17.4,8.2,17.4c0,0-0.1-0.1-0.2,0c0,0,0,0,0,0.1
-	C8.1,17.4,8.2,17.4,8.2,17.4C8.2,17.4,8.2,17.4,8.2,17.4 M7.9,17.4C7.9,17.4,7.9,17.4,7.9,17.4c-0.1-0.1-0.2-0.1-0.2-0.1
-	c-0.1,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0s0,0-0.1,0c0,0,0,0-0.1,0c-0.1,0-0.1,0-0.2,0l0,0c0,0,0,0,0,0
-	c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0,0,0,0c-0.1,0-0.2,0-0.3,0c0,0,0,0,0,0l0,0c0,0,0,0,0.1,0.1c0,0,0,0,0,0
-	c0,0,0,0,0.1,0c0.1,0,0.1,0,0.2,0c0,0,0,0.1,0.1,0.1c0-0.1,0-0.1,0.1-0.1c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0
-	C7.8,17.4,7.8,17.4,7.9,17.4C7.8,17.4,7.8,17.4,7.9,17.4C7.9,17.4,7.9,17.4,7.9,17.4 M7.1,17.1L7.1,17.1C7,17.1,7,17.1,6.9,17.1
-	c0,0,0,0,0,0c0,0,0,0,0,0h0h0h0h0h0h0l0,0l0,0c-0.1,0-0.2,0-0.2-0.1c0,0,0-0.1-0.1-0.1c0,0-0.1,0-0.1,0c-0.1,0-0.1,0-0.2-0.1
-	c0,0,0,0,0,0c-0.1,0-0.1,0-0.2,0c0,0,0,0,0,0h0c0,0,0,0,0,0c0,0,0,0,0,0h0c0,0,0,0,0,0h0c0,0,0,0,0,0c-0.1,0-0.3,0-0.3,0.1
-	c0,0,0,0,0,0l0,0c0,0,0.1,0,0.1,0c0.2-0.1,0.2-0.1,0.3-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0.1,0,0.1,0,0.2,0c0.1,0,0.1,0,0.1,0.1c0,0,0,0,0,0c0.1,0,0.1,0,0.1,0.1c0.1,0,0.1,0,0.2,0.1c0,0,0,0.1-0.1,0.1
-	c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0.1,0,0.1,0,0.2,0C7,17.2,7.1,17.2,7.1,17.1 M7,15L7,15C7,15,6.9,14.9,7,15C6.9,14.9,6.9,14.9,7,15
-	C6.9,15,7,15,7,15 M6.9,14.9C6.9,14.9,6.9,14.9,6.9,14.9L6.9,14.9L6.9,14.9 M6.9,14.9C6.9,14.9,6.9,14.9,6.9,14.9L6.9,14.9
-	C6.9,14.9,6.9,14.9,6.9,14.9 M6.9,14.9C6.9,14.9,6.9,14.9,6.9,14.9L6.9,14.9C6.9,14.9,6.9,14.9,6.9,14.9 M6.9,14.9
-	C6.9,14.9,6.9,14.9,6.9,14.9L6.9,14.9C6.9,14.9,6.9,14.9,6.9,14.9 M8.9,13.6C8.9,13.6,8.9,13.6,8.9,13.6C8.9,13.6,8.8,13.5,8.9,13.6
-	c-0.1,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0-0.1,0-0.1c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0.1-0.1,0.1c0,0,0,0,0,0.1
-	C8.7,13.6,8.8,13.6,8.9,13.6C8.8,13.6,8.9,13.6,8.9,13.6 M2.7,13.3L2.7,13.3C2.7,13.2,2.7,13.2,2.7,13.3C2.7,13.2,2.7,13.2,2.7,13.3
-	c0-0.1,0-0.1,0-0.1c0,0,0-0.1,0-0.1c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0,0l0,0c0,0,0,0.1,0,0.1c0,0,0,0,0,0c0,0,0,0,0,0.1l0,0
-	c0,0,0,0,0,0C2.6,13.2,2.6,13.2,2.7,13.3C2.6,13.2,2.6,13.2,2.7,13.3C2.7,13.2,2.6,13.2,2.7,13.3C2.6,13.2,2.6,13.2,2.7,13.3
-	C2.6,13.2,2.7,13.3,2.7,13.3C2.7,13.3,2.7,13.3,2.7,13.3C2.7,13.3,2.7,13.3,2.7,13.3 M9.3,19.8C9.3,19.8,9.3,19.8,9.3,19.8
-	c-0.1-0.1-0.1-0.1-0.1-0.3c0,0-0.4-0.3-0.5-0.2c0,0-0.1,0-0.1,0c0,0,0,0,0,0l0,0c-0.1-0.1-0.3-0.1-0.4-0.1c0,0-0.3,0-0.3,0
-	c0,0,0,0,0,0c0-0.2,0.1-0.2-0.1-0.2c0,0,0.1,0,0.1,0C8,19,8.1,19,8.1,19c-0.1,0,0,0-0.1-0.1c0,0,0,0-0.1,0c0,0,0,0,0,0
-	c0,0,0,0,0-0.1c0,0,0,0,0,0c0,0,0.1,0,0.1,0l0,0l0,0c-0.2,0-0.3,0-0.5,0c-0.1,0-0.3-0.1-0.4-0.1c0,0,0-0.1,0-0.1c0,0,0,0,0,0
-	c0,0,0,0,0,0l0,0l0,0c0,0,0,0-0.2,0.1c0,0,0,0,0,0c0,0.1,0.1,0.1,0.1,0.2c0,0,0,0-0.1,0c-0.1-0.1-0.1-0.1,0-0.2c0-0.1,0-0.1,0-0.1
-	c0,0,0.1,0,0.1,0c0,0,0.1,0,0.1,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0-0.3,0.3-0.3,0.3c0,0,0,0,0,0c0,0,0-0.3-0.2-0.4
-	c-0.1,0-0.2,0-0.3,0C6,18.5,5.8,18.2,5.9,18c0,0,0-0.1,0-0.2c0,0-0.1,0-0.1,0c0-0.1-0.2,0-0.2-0.1c-0.1,0-0.3,0-0.3,0c0,0,0,0,0,0
-	l0,0l0,0c0.1-0.1,0.1-0.1,0.1-0.3c0,0,0,0,0-0.1l0,0c0,0,0,0,0-0.1l0,0c0,0,0,0,0,0.1c0-0.1,0-0.1,0-0.2c0,0,0,0,0,0l0,0l0-0.1
-	C5.5,17,5.5,17,5.5,17c-0.2-0.1-0.3,0-0.4,0c-0.1,0,0,0-0.1,0c0,0.1,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0.2,0,0.2c0,0,0,0.1,0,0.1
-	c0,0,0,0,0,0c0,0,0,0,0,0c-0.1,0-0.3,0-0.4,0C4.2,17,4.2,17,4.2,16.9c0-0.3,0.1-0.8,0.1-0.8l0-0.1c0,0,0,0,0,0c0,0,0.1,0,0.1,0
-	c0,0,0,0,0,0c0.1,0,0.1,0,0.2-0.1c0,0,0,0,0-0.1l0,0.1c0.1,0,0.2,0.1,0.3,0.1c0,0,0,0,0,0l0-0.1l0,0l0,0c0,0,0.1,0.1,0.1,0.1
-	C5,16,5.1,16,5.1,16c0,0,0,0,0,0L5,15.9c0,0,0,0,0,0l0.1,0l0,0l0,0c0,0,0.1,0.1,0.1,0.1c0,0,0,0-0.1-0.1c0,0,0,0,0,0c0,0,0,0-0.1,0
-	c0,0,0,0,0,0c0,0,0,0,0.1,0c0.1,0,0.1,0,0.2,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0.1,0.1c0,0,0,0,0,0c0.1,0,0.1,0,0.1,0
-	c0.2,0.1,0.2,0.1,0.2,0.1c0,0,0,0,0.2,0.1C6,16,6,16,6,16.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0.1,0,0.1
-	c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0.1,0.1,0.1,0.1,0.2c0,0,0.1-0.3,0.1-0.3c0,0,0-0.2,0-0.2c0,0,0,0,0,0c0.1,0-0.2-0.3-0.1-0.6
-	c0.1-0.2,0.4-0.2,0.6-0.4l0,0.1l0,0l0,0l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0c0,0,0.1,0,0.1,0
-	c0,0,0.1,0,0.1,0v0l-0.1,0l0,0l0,0l0.1,0l0,0v0l0,0c0,0,0,0.1,0,0.1c0,0,0,0,0,0c0,0,0-0.1,0-0.1c0,0,0,0,0,0l0,0l0,0l0,0.1
-	c0,0,0,0,0,0c0,0,0-0.1,0-0.1c0,0-0.1-0.1-0.1-0.1l0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1c0,0,0,0,0,0l0,0
-	l0,0c0,0,0,0,0,0l0-0.1c0,0,0-0.1-0.1-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.1,0-0.1-0.1c0,0,0.1,0,0.1,0l0.1,0c0,0,0,0.4,0,0.4
-	s-0.2,0-0.2,0c0,0,0-0.2,0-0.2c0,0,0-0.1,0-0.1c0,0,0,0.2,0.1,0.2c0,0,0,0.1,0,0.1c0,0,0,0,0,0h0c0,0,0,0,0,0c0,0,0-0.3,0-0.3
-	c0,0,0-0.1,0-0.1l0,0.2l0,0.2c0,0,0,0,0,0l0-0.3l0-0.1l0-0.1l0,0.2l0,0.3h0l0-0.2l0-0.2c0,0,0,0.5,0,0.5s-0.1,0-0.1,0l0-0.2l0.1-0.1
-	l0-0.1c0,0,0,0,0,0l0,0l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0l0,0l0,0l0,0l0,0l0,0c0,0,0,0.3,0,0.3s0,0,0,0
-	c0,0,0,0,0,0c0,0,0-0.1,0,0l0-0.1c0,0,0-0.1,0-0.1C7,14.7,7,14.4,7,14.3c0,0,0-0.3,0-0.3h0l0,0.5C7,14.5,7,15,7,15c0,0-0.1,0-0.1,0
-	s0-0.4,0-0.4l0,0c0,0,0.1-0.1,0.1-0.1c0-0.1,0.1-0.1,0-0.2l0,0c0,0,0,0,0,0c0.1,0,0.2-0.1,0.3-0.1c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.2,0,0.2,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0L7.7,14
-	c0,0,0.3,0,0.3,0s0,0.2,0,0.2l-0.2,0l-0.1,0c0,0-0.1-0.1-0.1-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0-0.1,0.2-0.1,0.2-0.1
-	c0,0,0,0,0,0l-0.1,0l-0.1,0.1L7.7,14c0,0,0,0,0,0l0-0.1l0,0l0,0l0,0l0,0c0,0,0,0.1,0,0c0,0,0,0.1,0,0.1h0l0-0.1l0,0l0,0l0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0.1,0.1,0.1c0,0,0,0.1,0,0.1c0,0,0,0,0,0l0-0.1l0-0.1l0,0c0,0,0.1,0,0.1,0
-	c0,0,0,0,0,0l0,0c0,0,0.1,0,0.1-0.1l0,0.2l0,0.2c0,0,0,0,0,0c0,0,0-0.2-0.1-0.1c0,0,0-0.1,0-0.1c0.1,0,0.2-0.1,0.2-0.1
-	c0,0-0.1,0-0.1,0c0,0-0.2,0-0.2,0l-0.2,0V14h0.2l0,0l0,0c0,0,0.1,0,0.1,0l0,0l0,0l0,0l0,0c0,0,0,0-0.1,0c0,0,0,0,0,0L8,13.8
-	c0,0,0,0,0,0l0.1,0c0,0,0,0,0,0l0,0l0,0c0,0,0,0,0,0.1c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0
-	c0,0,0.1-0.1,0.1-0.1c0,0,0,0.1,0,0.1l0,0.1c0,0,0,0,0,0l-0.2-0.1L8,13.8v0c0,0,0.3,0,0.3,0l0.1,0l0.1,0l0,0c0.1,0,0.1,0,0.2-0.1
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0l0,0c0,0,0,0-0.1,0l0,0l0,0l0,0c0,0-0.1,0-0.1,0c0,0,0,0.2-0.1,0.2c0,0,0,0.2,0,0.2
-	c0,0,0,0,0,0l0-0.2c0,0-0.1-0.1-0.1-0.1l0,0.2c0,0,0,0.1,0,0.1c0,0,0,0,0,0S8,14,8,14s0-0.4,0-0.4l0.2,0l-0.1,0
-	c-0.1,0-0.2,0-0.2-0.1c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0.1-0.1,0.1-0.1l-0.1,0l-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0-0.1,0.3-0.1,0.3-0.1c-0.2-0.2-0.6,0.1-0.7,0.3C7.8,13,8.2,13,8.6,13c0.1,0,0.2,0,0.3,0c-0.5,0-1,0-1.5,0c-0.3,0-0.5,0-0.8,0
-	c-1.7,0-3.1,0-3.9,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0.3-0.1,0.4c0,0,0,0,0,0c0,0,0,0,0-0.1c0,0,0,0,0,0
-	c0,0-0.1,0-0.1,0c0,0,0,0.1,0,0.1c0,0,0,0,0,0l0,0l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0.1-0.1,0.2-0.2,0.4c0,0.1,0,0.1-0.2,0.6c0,0,0,0,0,0c0,0,0,0,0,0l0,0.1l0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0.1,0,0.1c0,0,0,0,0,0l0,0c0,0.1,0.1,0.3,0,0.4c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0
-	c0,0,0.3,0,0.3,0c0,0.1-0.7,0.1,0.3,0.2c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c-1,0-1,0-1,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c1,0,0.4,0.6,0.4,0.6c0,0,0.1,0,0.1,0c0,0,0.3,0.5,0.5,0.7c0,0,0.1-0.1,0.1-0.1c0,0,0,0,0-0.1c0,0,0,0,0,0
-	c0-0.1-0.1-0.4-0.1-0.4c0,0,0,0,0,0c0,0,0-0.1,0-0.1c0,0,0,0,0,0c0-0.2-0.1-0.3-0.2-0.5c0,0,0-0.1,0-0.1c0,0,0.1,0,0.1,0l0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0C2.8,16,2.8,16,3.1,16.3c0,0.1,0,0.1,0,0.1l0,0c0.1,0.2,0.2,0.3,0.3,0.5c0,0,0,0,0,0c0,0.1,0,0.1,0,0.2
-	c0,0,0,0,0,0c0,0,0,0,0,0C3.5,17.3,4,17.6,4,17.6c0.1,0,0.2,0.1,0.3,0.1c0.1,0,0.2-0.1,0.4,0c0.2,0.1,0.2,0.2,0.4,0.3L5.4,18
-	c0,0,0,0,0-0.1c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0.1,0.1,0.2,0.2,0.3,0.2l0,0l0,0l0,0c0,0,0,0,0,0c0,0,0,0.1,0.1,0.1l0.1,0
-	c0,0,0.1,0,0.1-0.1c0,0,0,0,0,0c0,0,0.1,0.1,0.1,0.1c0,0-0.1,0-0.1,0c0,0,0,0,0,0l-0.1,0v0.2C6,18.8,6,19,6,19c0,0,0,0,0,0
-	c0.1,0,0.1,0,0.2,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0-0.1,0-0.1c0,0,0.1-0.1,0.1-0.1c0,0-0.2-0.1-0.2-0.1c0,0-0.2-0.1-0.2-0.1
-	c0,0,0,0,0,0c0,0,0.2,0,0.3,0c0,0,0.1,0,0.1,0c0.1,0,0.2,0,0.2,0.1c0,0,0.1,0.2,0.1,0.2c0,0,0,0.2,0.1,0.2c0,0,0,0,0,0
-	c0,0,0-0.1,0-0.1c0,0-0.1-0.1-0.2-0.1c0,0,0,0,0,0c0,0,0,0,0-0.1c-0.2,0-0.1,0.2-0.2,0.3c0,0,0,0,0,0c0,0,0,0,0,0l0,0
-	c0,0,0,0-0.1-0.1c0,0,0,0,0,0c0,0,0,0.1,0,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0.1,0,0.1c0.1,0.1,0.1,0.3,0.1,0.3c0,0,0,0,0,0
-	c0,0,0,0,0,0.1c0,0-0.1,0-0.1,0c0,0,0,0,0,0.1c0,0,0,0,0,0c0,0-0.1,0-0.1,0.1c0,0,0,0,0,0.1c0.4,0,0.9,0,1.4,0c0.6,0,1.2,0,1.7,0
-	C9.1,20,9.3,19.9,9.3,19.8"/>
-<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="7.4653" y1="9.0342" x2="7.4653" y2="23.9663">
-	<stop  offset="0" style="stop-color:#76A1F0"/>
-	<stop  offset="1" style="stop-color:#6B90D5"/>
-	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
-</linearGradient>
-<path style="fill:url(#SVGID_8_);" d="M7.5,9C3.3,9,0,12.4,0,16.5C0,20.6,3.3,24,7.5,24c4.1,0,7.5-3.3,7.5-7.5
-	C14.9,12.4,11.6,9,7.5,9z M13.7,18.6c-0.1,0.3-0.2,0.6-0.4,0.9s-0.3,0.6-0.5,0.9s-0.4,0.5-0.6,0.8s-0.5,0.5-0.8,0.6
-	c-0.3,0.2-0.6,0.4-0.9,0.5c-0.3,0.2-0.6,0.3-0.9,0.4s-0.7,0.2-1,0.2C8.2,23,7.9,23,7.5,23C1,22.7-0.9,15.2,3.3,11.6
-	C5,10.1,6.8,10,7.5,10c0.4,0,0.7,0,1.1,0.1c0.3,0.1,0.7,0.1,1,0.2s0.6,0.2,0.9,0.4c0.3,0.2,0.6,0.3,0.9,0.5c0.3,0.2,0.5,0.4,0.8,0.6
-	c0.2,0.2,0.5,0.5,0.6,0.8c0.2,0.3,0.4,0.6,0.5,0.9s0.3,0.6,0.4,0.9s0.2,0.7,0.2,1c0.1,0.3,0.1,0.7,0.1,1.1c0,0.4,0,0.7-0.1,1.1
-	C13.9,17.9,13.8,18.2,13.7,18.6z"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<path d="M37.2,0.2C8.6,0.2-14.7,35.9,11,63.6c7.6,7.6,17,11,26.2,10.9c9.2,0.1,18.6-3.2,26.2-10.9
+	C89.1,35.9,65.8,0.2,37.2,0.2z M69,34.7H55.2c-0.2-4.2-1-8.1-1.9-12.3c3-1.4,5.7-3.3,8-5.6C65.6,22,68.5,28,69,34.7z M58,13.7
+	c-1.8,1.6-3.8,3-5.9,4.2c-1-3.8-2.7-7.3-4.9-10.6C51.2,8.7,55,10.8,58,13.7z M37.2,34.8H23.7c0.1-3.6,0.8-6.9,1.5-10.5
+	c3.9,1.4,7.9,2.1,12,2.1c4.1,0,8.1-0.7,12-2.1c0.7,3.6,1.4,6.9,1.5,10.5H37.2z M50.4,40c-0.1,3.6-0.5,7-1.2,10.5
+	c-3.9-1.4-7.9-2.1-12-2.1c-4.1,0-8.1,0.7-12,2.1C24.5,47,24.1,43.6,24,40h13.2H50.4z M37.2,5.7c3.9,0,7.8,4.4,10.7,13.3
+	c0,0.2,0.2,0.5,0.2,0.8c-3.5,1.4-7.2,2-10.9,2s-7.4-0.7-10.9-2c0-0.3,0.2-0.6,0.2-0.8C29.4,10.1,33.3,5.8,37.2,5.7z M27.2,7.3
+	c-2.2,3.3-3.9,6.8-4.9,10.6c-2.1-1.2-4.1-2.6-5.9-4.2C19.4,10.8,23.2,8.7,27.2,7.3z M13.1,16.8c2.3,2.3,5,4.2,8,5.6
+	c-0.9,4.2-1.7,8.1-1.9,12.3H5.4C5.9,28,8.8,22,13.1,16.8z M12.5,57.1c-4.1-5-6.5-10.8-6.9-17.3h13.8c0.1,4.2,0.6,8.3,1.5,12.4
+	c-2.8,1.5-5.5,3.4-7.9,5.6L12.5,57.1z M16.2,61c1.8-1.6,3.8-3.1,5.9-4.3l0.1,0.2c1.1,3.8,2.8,7.3,4.9,10.4
+	C23.1,65.9,19.4,63.8,16.2,61z M37.2,69c-4.1,0.1-8.2-4.6-11-14.1c3.6-1.4,7.3-2,11-2c3.7,0,7.4,0.7,11,2
+	C45.4,64.4,41.3,69.1,37.2,69z M47.3,67.3c2.1-3.1,3.8-6.6,4.9-10.4l0.1-0.2c2.1,1.2,4.1,2.7,5.9,4.3C55,63.8,51.3,65.9,47.3,67.3z
+	 M61.9,57.1l-0.5,0.7c-2.4-2.2-5.1-4.1-7.9-5.6c0.9-4.1,1.4-8.2,1.5-12.4h13.8C68.4,46.3,66,52.1,61.9,57.1z"/>
+</svg>
diff --git a/src/assets/img/mod/wiki.svg b/src/assets/img/mod/wiki.svg
index f3101ce19..ff8eddd32 100644
--- a/src/assets/img/mod/wiki.svg
+++ b/src/assets/img/mod/wiki.svg
@@ -1,228 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" style="overflow:visible;enable-background:new 0 0 24 24;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="18" y1="13" x2="18" y2="20.0005">
-	<stop  offset="0" style="stop-color:#8E8E8E"/>
-	<stop  offset="4.191053e-02" style="stop-color:#8A8A8A"/>
-	<stop  offset="0.4613" style="stop-color:#626262"/>
-	<stop  offset="0.7952" style="stop-color:#4A4A4A"/>
-	<stop  offset="1" style="stop-color:#414141"/>
-	<a:midPointStop  offset="0" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="1" style="stop-color:#414141"/>
-</linearGradient>
-<rect x="12" y="13" style="fill:url(#SVGID_1_);" width="12" height="7"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="17.5" y1="14" x2="17.5" y2="19">
-	<stop  offset="0" style="stop-color:#F7F7F7"/>
-	<stop  offset="0.1044" style="stop-color:#FCFCFC"/>
-	<stop  offset="0.3293" style="stop-color:#FFFFFF"/>
-	<stop  offset="0.5692" style="stop-color:#E8E8E8"/>
-	<stop  offset="0.8153" style="stop-color:#D7D7D7"/>
-	<stop  offset="1" style="stop-color:#D1D1D1"/>
-	<a:midPointStop  offset="0" style="stop-color:#F7F7F7"/>
-	<a:midPointStop  offset="0.2222" style="stop-color:#F7F7F7"/>
-	<a:midPointStop  offset="0.3293" style="stop-color:#FFFFFF"/>
-	<a:midPointStop  offset="0.3545" style="stop-color:#FFFFFF"/>
-	<a:midPointStop  offset="1" style="stop-color:#D1D1D1"/>
-</linearGradient>
-<rect x="12" y="14" style="fill:url(#SVGID_2_);" width="11" height="5"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="17" y1="15" x2="17" y2="18">
-	<stop  offset="0" style="stop-color:#8E8E8E"/>
-	<stop  offset="4.191053e-02" style="stop-color:#8A8A8A"/>
-	<stop  offset="0.4613" style="stop-color:#626262"/>
-	<stop  offset="0.7952" style="stop-color:#4A4A4A"/>
-	<stop  offset="1" style="stop-color:#414141"/>
-	<a:midPointStop  offset="0" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="1" style="stop-color:#414141"/>
-</linearGradient>
-<rect x="12" y="15" style="fill:url(#SVGID_3_);" width="10" height="3"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="16.5" y1="0" x2="16.5" y2="24.0005">
-	<stop  offset="0" style="stop-color:#8E8E8E"/>
-	<stop  offset="4.191053e-02" style="stop-color:#8A8A8A"/>
-	<stop  offset="0.4613" style="stop-color:#626262"/>
-	<stop  offset="0.7952" style="stop-color:#4A4A4A"/>
-	<stop  offset="1" style="stop-color:#414141"/>
-	<a:midPointStop  offset="0" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="1" style="stop-color:#414141"/>
-</linearGradient>
-<rect x="13" style="fill:url(#SVGID_4_);" width="7" height="24"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="16.5" y1="1" x2="16.5" y2="23.0005">
-	<stop  offset="0" style="stop-color:#F7F7F7"/>
-	<stop  offset="0.1044" style="stop-color:#FCFCFC"/>
-	<stop  offset="0.3293" style="stop-color:#FFFFFF"/>
-	<stop  offset="0.5692" style="stop-color:#E8E8E8"/>
-	<stop  offset="0.8153" style="stop-color:#D7D7D7"/>
-	<stop  offset="1" style="stop-color:#D1D1D1"/>
-	<a:midPointStop  offset="0" style="stop-color:#F7F7F7"/>
-	<a:midPointStop  offset="0.2222" style="stop-color:#F7F7F7"/>
-	<a:midPointStop  offset="0.3293" style="stop-color:#FFFFFF"/>
-	<a:midPointStop  offset="0.3545" style="stop-color:#FFFFFF"/>
-	<a:midPointStop  offset="1" style="stop-color:#D1D1D1"/>
-</linearGradient>
-<rect x="14" y="1" style="fill:url(#SVGID_5_);" width="5" height="22"/>
-<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="16.5" y1="2" x2="16.5" y2="22.0005">
-	<stop  offset="0" style="stop-color:#8E8E8E"/>
-	<stop  offset="4.191053e-02" style="stop-color:#8A8A8A"/>
-	<stop  offset="0.4613" style="stop-color:#626262"/>
-	<stop  offset="0.7952" style="stop-color:#4A4A4A"/>
-	<stop  offset="1" style="stop-color:#414141"/>
-	<a:midPointStop  offset="0" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="1" style="stop-color:#414141"/>
-</linearGradient>
-<rect x="15" y="2" style="fill:url(#SVGID_6_);" width="3" height="20"/>
-<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="18" y1="4" x2="18" y2="11">
-	<stop  offset="0" style="stop-color:#8E8E8E"/>
-	<stop  offset="4.191053e-02" style="stop-color:#8A8A8A"/>
-	<stop  offset="0.4613" style="stop-color:#626262"/>
-	<stop  offset="0.7952" style="stop-color:#4A4A4A"/>
-	<stop  offset="1" style="stop-color:#414141"/>
-	<a:midPointStop  offset="0" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="1" style="stop-color:#414141"/>
-</linearGradient>
-<rect x="12" y="4" style="fill:url(#SVGID_7_);" width="12" height="7"/>
-<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="17.5" y1="5" x2="17.5" y2="10">
-	<stop  offset="0" style="stop-color:#F7F7F7"/>
-	<stop  offset="0.1044" style="stop-color:#FCFCFC"/>
-	<stop  offset="0.3293" style="stop-color:#FFFFFF"/>
-	<stop  offset="0.5692" style="stop-color:#E8E8E8"/>
-	<stop  offset="0.8153" style="stop-color:#D7D7D7"/>
-	<stop  offset="1" style="stop-color:#D1D1D1"/>
-	<a:midPointStop  offset="0" style="stop-color:#F7F7F7"/>
-	<a:midPointStop  offset="0.2222" style="stop-color:#F7F7F7"/>
-	<a:midPointStop  offset="0.3293" style="stop-color:#FFFFFF"/>
-	<a:midPointStop  offset="0.3545" style="stop-color:#FFFFFF"/>
-	<a:midPointStop  offset="1" style="stop-color:#D1D1D1"/>
-</linearGradient>
-<rect x="12" y="5" style="fill:url(#SVGID_8_);" width="11" height="5"/>
-<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="17" y1="6" x2="17" y2="9">
-	<stop  offset="0" style="stop-color:#8E8E8E"/>
-	<stop  offset="4.191053e-02" style="stop-color:#8A8A8A"/>
-	<stop  offset="0.4613" style="stop-color:#626262"/>
-	<stop  offset="0.7952" style="stop-color:#4A4A4A"/>
-	<stop  offset="1" style="stop-color:#414141"/>
-	<a:midPointStop  offset="0" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="1" style="stop-color:#414141"/>
-</linearGradient>
-<rect x="12" y="6" style="fill:url(#SVGID_9_);" width="10" height="3"/>
-<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="6" y1="4" x2="6" y2="11">
-	<stop  offset="0" style="stop-color:#8E8E8E"/>
-	<stop  offset="4.191053e-02" style="stop-color:#8A8A8A"/>
-	<stop  offset="0.4613" style="stop-color:#626262"/>
-	<stop  offset="0.7952" style="stop-color:#4A4A4A"/>
-	<stop  offset="1" style="stop-color:#414141"/>
-	<a:midPointStop  offset="0" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="1" style="stop-color:#414141"/>
-</linearGradient>
-<rect y="4" style="fill:url(#SVGID_10_);" width="12" height="7"/>
-<linearGradient id="SVGID_11_" gradientUnits="userSpaceOnUse" x1="6.5" y1="5" x2="6.5" y2="10">
-	<stop  offset="0" style="stop-color:#F7F7F7"/>
-	<stop  offset="0.1044" style="stop-color:#FCFCFC"/>
-	<stop  offset="0.3293" style="stop-color:#FFFFFF"/>
-	<stop  offset="0.5692" style="stop-color:#E8E8E8"/>
-	<stop  offset="0.8153" style="stop-color:#D7D7D7"/>
-	<stop  offset="1" style="stop-color:#D1D1D1"/>
-	<a:midPointStop  offset="0" style="stop-color:#F7F7F7"/>
-	<a:midPointStop  offset="0.2222" style="stop-color:#F7F7F7"/>
-	<a:midPointStop  offset="0.3293" style="stop-color:#FFFFFF"/>
-	<a:midPointStop  offset="0.3545" style="stop-color:#FFFFFF"/>
-	<a:midPointStop  offset="1" style="stop-color:#D1D1D1"/>
-</linearGradient>
-<rect x="1" y="5" style="fill:url(#SVGID_11_);" width="11" height="5"/>
-<linearGradient id="SVGID_12_" gradientUnits="userSpaceOnUse" x1="7" y1="6" x2="7" y2="9">
-	<stop  offset="0" style="stop-color:#8E8E8E"/>
-	<stop  offset="4.191053e-02" style="stop-color:#8A8A8A"/>
-	<stop  offset="0.4613" style="stop-color:#626262"/>
-	<stop  offset="0.7952" style="stop-color:#4A4A4A"/>
-	<stop  offset="1" style="stop-color:#414141"/>
-	<a:midPointStop  offset="0" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="1" style="stop-color:#414141"/>
-</linearGradient>
-<rect x="2" y="6" style="fill:url(#SVGID_12_);" width="10" height="3"/>
-<linearGradient id="SVGID_13_" gradientUnits="userSpaceOnUse" x1="7.5" y1="0" x2="7.5" y2="24.0005">
-	<stop  offset="0" style="stop-color:#8E8E8E"/>
-	<stop  offset="4.191053e-02" style="stop-color:#8A8A8A"/>
-	<stop  offset="0.4613" style="stop-color:#626262"/>
-	<stop  offset="0.7952" style="stop-color:#4A4A4A"/>
-	<stop  offset="1" style="stop-color:#414141"/>
-	<a:midPointStop  offset="0" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="1" style="stop-color:#414141"/>
-</linearGradient>
-<rect x="4" style="fill:url(#SVGID_13_);" width="7" height="24"/>
-<linearGradient id="SVGID_14_" gradientUnits="userSpaceOnUse" x1="7.5" y1="1" x2="7.5" y2="23.0005">
-	<stop  offset="0" style="stop-color:#F7F7F7"/>
-	<stop  offset="0.1044" style="stop-color:#FCFCFC"/>
-	<stop  offset="0.3293" style="stop-color:#FFFFFF"/>
-	<stop  offset="0.5692" style="stop-color:#E8E8E8"/>
-	<stop  offset="0.8153" style="stop-color:#D7D7D7"/>
-	<stop  offset="1" style="stop-color:#D1D1D1"/>
-	<a:midPointStop  offset="0" style="stop-color:#F7F7F7"/>
-	<a:midPointStop  offset="0.2222" style="stop-color:#F7F7F7"/>
-	<a:midPointStop  offset="0.3293" style="stop-color:#FFFFFF"/>
-	<a:midPointStop  offset="0.3545" style="stop-color:#FFFFFF"/>
-	<a:midPointStop  offset="1" style="stop-color:#D1D1D1"/>
-</linearGradient>
-<rect x="5" y="1" style="fill:url(#SVGID_14_);" width="5" height="22"/>
-<linearGradient id="SVGID_15_" gradientUnits="userSpaceOnUse" x1="7.5" y1="2" x2="7.5" y2="22.0005">
-	<stop  offset="0" style="stop-color:#8E8E8E"/>
-	<stop  offset="4.191053e-02" style="stop-color:#8A8A8A"/>
-	<stop  offset="0.4613" style="stop-color:#626262"/>
-	<stop  offset="0.7952" style="stop-color:#4A4A4A"/>
-	<stop  offset="1" style="stop-color:#414141"/>
-	<a:midPointStop  offset="0" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="1" style="stop-color:#414141"/>
-</linearGradient>
-<rect x="6" y="2" style="fill:url(#SVGID_15_);" width="3" height="20"/>
-<linearGradient id="SVGID_16_" gradientUnits="userSpaceOnUse" x1="6" y1="13" x2="6" y2="20.0005">
-	<stop  offset="0" style="stop-color:#8E8E8E"/>
-	<stop  offset="4.191053e-02" style="stop-color:#8A8A8A"/>
-	<stop  offset="0.4613" style="stop-color:#626262"/>
-	<stop  offset="0.7952" style="stop-color:#4A4A4A"/>
-	<stop  offset="1" style="stop-color:#414141"/>
-	<a:midPointStop  offset="0" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="1" style="stop-color:#414141"/>
-</linearGradient>
-<rect y="13" style="fill:url(#SVGID_16_);" width="12" height="7"/>
-<linearGradient id="SVGID_17_" gradientUnits="userSpaceOnUse" x1="6.5" y1="14" x2="6.5" y2="19">
-	<stop  offset="0" style="stop-color:#F7F7F7"/>
-	<stop  offset="0.1044" style="stop-color:#FCFCFC"/>
-	<stop  offset="0.3293" style="stop-color:#FFFFFF"/>
-	<stop  offset="0.5692" style="stop-color:#E8E8E8"/>
-	<stop  offset="0.8153" style="stop-color:#D7D7D7"/>
-	<stop  offset="1" style="stop-color:#D1D1D1"/>
-	<a:midPointStop  offset="0" style="stop-color:#F7F7F7"/>
-	<a:midPointStop  offset="0.2222" style="stop-color:#F7F7F7"/>
-	<a:midPointStop  offset="0.3293" style="stop-color:#FFFFFF"/>
-	<a:midPointStop  offset="0.3545" style="stop-color:#FFFFFF"/>
-	<a:midPointStop  offset="1" style="stop-color:#D1D1D1"/>
-</linearGradient>
-<rect x="1" y="14" style="fill:url(#SVGID_17_);" width="11" height="5"/>
-<linearGradient id="SVGID_18_" gradientUnits="userSpaceOnUse" x1="7" y1="15" x2="7" y2="18">
-	<stop  offset="0" style="stop-color:#8E8E8E"/>
-	<stop  offset="4.191053e-02" style="stop-color:#8A8A8A"/>
-	<stop  offset="0.4613" style="stop-color:#626262"/>
-	<stop  offset="0.7952" style="stop-color:#4A4A4A"/>
-	<stop  offset="1" style="stop-color:#414141"/>
-	<a:midPointStop  offset="0" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="1" style="stop-color:#414141"/>
-</linearGradient>
-<rect x="2" y="15" style="fill:url(#SVGID_18_);" width="10" height="3"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<path d="M74.5,35.8c-0.4-1.8-1.4-3.4-2.8-4.5l0,0L71.3,31c-1-0.5-2-0.9-3.2-0.9c-0.5,0-1.1,0.1-1.5,0.2c-1.8,0.4-3.4,1.4-4.5,2.9
+	c-0.4,0.5-0.7,0.9-0.9,1.5l-10.7,0.1c-0.2-1.1-0.5-1.9-1.1-2.9c-0.7-1.5-1.4-2.5-2.6-3.6l2.8-5c0.4,0.1,0.7,0.1,1.1,0.1
+	c3.9,0,6.7-3.5,6.7-7.4s-3.2-7.1-7.1-7.1s-7.1,3.2-7.1,7.1c0,1.9,0.4,3.6,1.8,5l-2.7,4.7c-1.2-0.4-2.3-0.6-3.6-0.6
+	c-1.4,0-2.6,0.3-3.9,0.7l-8.2-14.3c0.4-0.4,0.5-0.9,0.8-1.3l0,0l0.1-0.2c0.8-1.6,0.9-3.4,0.4-5.1S26.3,1.8,24.8,1l-0.4-0.2l0,0
+	l-0.2-0.1c-0.9-0.4-2-0.7-2.9-0.7c-1.3,0-2.6,0.4-3.7,1.1c-1.2,0.7-2,1.7-2.7,2.9c-0.8,1.7-1,3.6-0.4,5.3s1.9,3.2,3.5,4
+	c0.9,0.4,1.9,0.7,2.8,0.7c0.5,0,1,0.2,1.4,0.1l8.2,14.3c-1.7,1.4-2.9,3-3.6,5C26.3,35,26,36.3,26.1,38l-9.8,2.7
+	c-2.2-4.2-7.4-5.5-11.6-3.3S-1.2,44.8,1,49c2.2,4.2,7.4,5.9,11.6,3.7c2.7-1.4,4.8-3.9,4.9-6.9L27.7,43l0.1,0.1
+	c0.7,1.5,1.1,2.3,2.3,3.3l-5.6,9.8c-0.6-0.2-1.3-0.3-2-0.3c-4.6,0-7.9,3.9-7.9,8.6c0,0.7,0.1,1.3,0.3,2c1.1,4.3,5.4,6.9,9.7,5.8
+	c0.7-0.2,1.4-0.4,2-0.9c1.2-0.7,2.3-1.8,3-3.1c0.9-1.6,1.2-3.4,1.1-5.2c-0.3-1.7-0.6-3.1-1.7-4.4l5.6-9.7c1.2,0.4,2.2,0.5,3.4,0.5
+	c0.4,0,0.7,0,1.1,0l3.2,11.9c-1.2,0.9-2.2,2.1-2.7,3.6c-0.6,1.8-0.5,3.7,0.3,5.3c0.8,1.7,2.2,2.9,3.9,3.6l0,0
+	c0.7,0.3,1.4,0.4,2.2,0.4c1.1,0,2.1-0.3,3-0.7c1.7-0.8,2.9-2.3,3.6-4l0,0c0.2-0.5,0.3-1,0.4-1.5c0.2-1.3-0.1-2.6-0.6-3.7
+	c-0.8-1.7-2.1-2.9-3.8-3.6l0,0l0,0c-0.6-0.2-1.3-0.3-1.9-0.4l-3.2-11.9l0.2-0.1c1.4-0.7,2.7-1.7,3.7-2.8c1.1-1.2,1.9-2.5,2.4-4v-0.1
+	c0.1-0.4,0.2-0.8,0.4-1.2v-0.2l0.1-0.1l10.8-0.1c0.4,1.4,1.3,2.3,2.6,3.2l0,0c1.2,0.8,2.6,1.2,3.9,1.2c2.3,0,4.5-1.2,5.8-3.1l0,0
+	C74.4,39.5,74.9,37.5,74.5,35.8z M47.2,64.7c0.6,0.2,1.3,0.9,1.5,1.4c0.3,0.6,0.4,1.3,0.1,2l0,0c-0.3,0.6-0.7,1.2-1.3,1.4l0,0l0,0
+	c-0.4,0.2-0.6,0.2-1,0.3c-0.3,0-0.6-0.1-0.9-0.2l0,0c-0.6-0.2-1.1-0.7-1.4-1.2c-0.3-0.6-0.4-1.3-0.1-2c0.4-1.1,1.2-1.8,2.4-1.8
+	C46.8,64.6,46.9,64.6,47.2,64.7L47.2,64.7L47.2,64.7z M45,39.5L45,39.5c-0.5,1.8-1.8,3.2-3.4,4l0,0c-2.1,1.1-4.6,1-6.6-0.2
+	c-1.2-0.7-2.2-1.8-2.7-3c-0.8-1.7-0.9-3.6-0.4-5.3c0.5-1.8,1.8-3.2,3.5-4l0,0c1-0.4,2-0.6,3.1-0.6c0.7,0,1.5,0.1,2.2,0.4
+	c1.7,0.5,3.1,1.8,3.9,3.4l0,0C45.5,35.8,45.7,37.7,45,39.5z M12.4,45.2c0,2-1.6,3.6-3.6,3.6s-3.6-1.6-3.6-3.6s1.6-3.6,3.6-3.6l0,0
+	l0,0C10.8,41.6,12.4,43.2,12.4,45.2L12.4,45.2L12.4,45.2z M50.3,14.1L50.3,14.1c1.1,0,1.9,0.9,1.9,1.9s-0.9,1.9-1.9,1.9
+	S48.4,17,48.4,16S49.2,14.1,50.3,14.1L50.3,14.1L50.3,14.1z"/>
+</svg>
diff --git a/src/assets/img/mod/workshop.svg b/src/assets/img/mod/workshop.svg
index f466455a6..594cfa205 100644
--- a/src/assets/img/mod/workshop.svg
+++ b/src/assets/img/mod/workshop.svg
@@ -1,98 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" style="overflow:visible;enable-background:new 0 0 24 24;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="7.9995" y1="7.9868" x2="7.9995" y2="24.001">
-	<stop  offset="0" style="stop-color:#F0A829"/>
-	<stop  offset="1" style="stop-color:#C7671A"/>
-	<a:midPointStop  offset="0" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="1" style="stop-color:#C7671A"/>
-</linearGradient>
-<path style="fill:url(#SVGID_1_);" d="M3,19.2l-3,1.6V24h16v-0.4c0-0.5-0.5-1.2-1-1.5l-6-3.1c-0.5-0.3-0.6-0.8-0.3-1.2
-	c0,0,1.6-2,1.6-4.2C10.4,10.5,8.4,8,6,8c-2.4,0-4.4,2.6-4.4,5.7c0,2.1,1.6,4.2,1.6,4.2C3.6,18.3,3.5,18.9,3,19.2z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="7.7212" y1="8.9868" x2="7.7212" y2="23.001">
-	<stop  offset="0" style="stop-color:#FFEBA8"/>
-	<stop  offset="1" style="stop-color:#F8BE27"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFEBA8"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFEBA8"/>
-	<a:midPointStop  offset="1" style="stop-color:#F8BE27"/>
-</linearGradient>
-<path style="fill:url(#SVGID_2_);" d="M1,23v-1.7L3.5,20c0.5-0.3,0.8-0.7,1-1.2c0.1-0.5,0-1.1-0.4-1.5c0,0-1.4-1.8-1.4-3.6
-	C2.6,11.1,4.2,9,6,9s3.4,2.1,3.4,4.7c0,1.7-1.4,3.5-1.4,3.6c-0.3,0.4-0.5,1-0.4,1.5c0.1,0.5,0.5,1,1,1.2l5.9,3H1z"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="6.1343" y1="9.9868" x2="6.1343" y2="22.001">
-	<stop  offset="0" style="stop-color:#FFC30F"/>
-	<stop  offset="1" style="stop-color:#F5AE0D"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="1" style="stop-color:#F5AE0D"/>
-</linearGradient>
-<path style="fill:url(#SVGID_3_);" d="M2,22L2,22l1.9-1.1c0.8-0.4,1.3-1.1,1.5-1.9c0.2-0.8,0-1.7-0.6-2.3c-0.3-0.4-1.2-1.8-1.2-3
-	c0-2,1.1-3.7,2.4-3.7s2.4,1.7,2.4,3.7c0,1.1-0.9,2.5-1.2,3c-0.5,0.7-0.7,1.5-0.5,2.3c0.2,0.8,0.7,1.5,1.5,1.9l2.2,1.1H2z"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="16" y1="7.9868" x2="16" y2="24.001">
-	<stop  offset="0" style="stop-color:#8D470D"/>
-	<stop  offset="1" style="stop-color:#7C3D09"/>
-	<a:midPointStop  offset="0" style="stop-color:#8D470D"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#8D470D"/>
-	<a:midPointStop  offset="1" style="stop-color:#7C3D09"/>
-</linearGradient>
-<path style="fill:url(#SVGID_4_);" d="M24,24v-3.4l-3-1.5c-0.5-0.3-0.6-0.8-0.3-1.2c0,0,1.6-2,1.6-4.2c0-3.2-1.9-5.7-4.4-5.7
-	c-2.4,0-4.4,2.6-4.4,5.7c0,2.1,1.6,4.2,1.6,4.2c0.3,0.4,0.2,1-0.3,1.3l-6,3.2c-0.5,0.3-1,0.9-1,1.5V24H24z"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="16.4121" y1="8.9868" x2="16.4121" y2="23.001">
-	<stop  offset="0" style="stop-color:#D58738"/>
-	<stop  offset="1" style="stop-color:#AB551F"/>
-	<a:midPointStop  offset="0" style="stop-color:#D58738"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#D58738"/>
-	<a:midPointStop  offset="1" style="stop-color:#AB551F"/>
-</linearGradient>
-<path style="fill:url(#SVGID_5_);" d="M9.8,23l5.7-3c0.5-0.3,0.8-0.7,1-1.2c0.1-0.5,0-1.1-0.4-1.5c0,0-1.4-1.8-1.4-3.6
-	c0-2.6,1.5-4.7,3.4-4.7s3.4,2.1,3.4,4.7c0,1.8-1.4,3.6-1.4,3.6c-0.3,0.4-0.5,1-0.4,1.5s0.5,1,1,1.2l2.4,1.2V23H9.8z"/>
-<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="17.9424" y1="9.9868" x2="17.9424" y2="22.001">
-	<stop  offset="0" style="stop-color:#D0813A"/>
-	<stop  offset="1" style="stop-color:#AF551D"/>
-	<a:midPointStop  offset="0" style="stop-color:#D0813A"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#D0813A"/>
-	<a:midPointStop  offset="1" style="stop-color:#AF551D"/>
-</linearGradient>
-<path style="fill:url(#SVGID_6_);" d="M13.9,22l2.1-1.1c0.8-0.4,1.3-1.1,1.5-1.9c0.2-0.8,0-1.7-0.6-2.3c-0.3-0.4-1.2-1.8-1.2-3
-	c0-2,1.1-3.7,2.4-3.7s2.4,1.7,2.4,3.7c0,1.2-0.9,2.5-1.2,3c-0.5,0.7-0.7,1.5-0.6,2.3c0.2,0.8,0.7,1.5,1.5,1.9l1.9,1V22H13.9z"/>
-<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="7.4507" y1="0" x2="7.4507" y2="12.9043">
-	<stop  offset="0" style="stop-color:#76A1F0"/>
-	<stop  offset="1" style="stop-color:#6B90D5"/>
-	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
-</linearGradient>
-<path style="fill:url(#SVGID_7_);" d="M12.5,10.4c1.4-1.1,2.4-2.6,2.4-4.3c0.1-3.3-3.2-6-7.3-6.1C3.4-0.1,0.1,2.5,0,5.8
-	c-0.1,3.3,3.2,6,7.3,6.1c1,0,2-0.1,2.9-0.4c0.8,1,2.8,1.4,2.8,1.4S12.2,11.7,12.5,10.4z"/>
-<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="7.4507" y1="1" x2="7.4507" y2="11.2168">
-	<stop  offset="0" style="stop-color:#BBE0F7"/>
-	<stop  offset="1" style="stop-color:#82B4FB"/>
-	<a:midPointStop  offset="0" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="1" style="stop-color:#82B4FB"/>
-</linearGradient>
-<path style="fill:url(#SVGID_8_);" d="M11.4,11.2c-0.2-0.1-0.3-0.2-0.4-0.3l-0.4-0.6l-0.7,0.2c-0.8,0.2-1.6,0.4-2.4,0.4l-0.1,0
-	C3.8,10.8,1,8.6,1,5.8C1,3.2,3.9,1,7.4,1l0.2,0c1.8,0,3.4,0.6,4.6,1.6c1.1,1,1.8,2.2,1.7,3.5c0,1.3-0.7,2.6-2,3.5l-0.3,0.2l-0.1,0.4
-	C11.4,10.5,11.4,10.9,11.4,11.2z"/>
-<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="7.4507" y1="2" x2="7.4507" y2="9.9097">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<path style="fill:url(#SVGID_9_);" d="M7.4,9.9C4.4,9.9,2,8,2,5.9C2,3.8,4.5,2,7.4,2l0.1,0c1.5,0,2.9,0.5,4,1.4
-	c0.9,0.8,1.4,1.7,1.4,2.7c0,1-0.6,2-1.6,2.7l-0.6,0.4l0,0.1L9.6,9.6C9,9.8,8.2,9.9,7.5,9.9L7.4,9.9z"/>
-<path style="fill:#FFFFFF;" d="M5.5,4.5h1.9V6c0,0.5-0.1,1-0.3,1.3C6.9,7.6,6.5,7.9,5.9,8.1L5.5,7.3C5.9,7.2,6.1,7,6.2,6.9
-	c0.1-0.2,0.2-0.3,0.2-0.6H5.5V4.5z M7.7,4.5h1.9V6c0,0.5-0.1,1-0.3,1.3C9.1,7.6,8.7,7.9,8.2,8.1L7.7,7.3C8.1,7.2,8.3,7,8.4,6.9
-	c0.1-0.2,0.2-0.3,0.2-0.6H7.7V4.5z"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<g id="Group_12483_1_">
+	<path d="M67.6,56.1c-4.8-3.1-10.5-4.6-16.2-4.5c-4.9-0.1-9.8,1.1-14.2,3.3c-4.4-2.2-9.3-3.4-14.2-3.3c-5.7-0.1-11.4,1.4-16.2,4.5
+		C2.4,59,0.1,63,0.1,67.3v4.2c0,1.5,1.1,2.7,2.7,2.8h69c1.6-0.1,2.7-1.3,2.7-2.8v-4.2C74.4,63,72,59,67.6,56.1z M40.7,69.2H5.5v-1.5
+		c0.3-5.6,6.2-8.5,10.7-9.9c6.5-1.9,13.4-0.9,19.5,2.4c2.6,1.5,5,4.2,5,7.4V69.2z M69.1,69.2h-23c0.3-4-1-7.8-3.6-10.7
+		c7-2.7,15-2,21.6,1.7c2.6,1.5,5,4.2,5,7.4V69.2L69.1,69.2z"/>
+	<path d="M22.9,48.5c6.5,0,11.7-5.1,11.7-11.6C34,21.6,11.7,21.6,11,36.9C11,43.2,16.3,48.5,22.9,48.5L22.9,48.5z M16.3,36.9
+		c0.1-3.5,3.2-6.2,6.8-6.1c3.4,0.1,6.1,2.8,6.3,6.1C29,45.3,16.6,45.3,16.3,36.9L16.3,36.9z"/>
+	<path d="M50.8,48.5c6.5,0,11.7-5.1,11.7-11.6c-0.6-15.3-22.9-15.3-23.6,0C39,43.2,44.2,48.5,50.8,48.5L50.8,48.5z M50.8,30.6
+		c3.6,0,6.5,2.8,6.5,6.3c-0.3,8.4-12.7,8.4-12.9,0C44.4,33.4,47.2,30.6,50.8,30.6L50.8,30.6z"/>
+	<path id="Path_565_1_" d="M20.5,0.2c1.5,0.5,2.2,2.2,1.7,3.7l-1.6,3.8c10.7-4.2,22.8-4.2,33.5,0.2L52.4,4
+		c-0.6-1.4,0.1-3.1,1.6-3.7c1.5-0.7,3.1,0.1,3.8,1.5l4.1,10c0.6,1.4-0.1,3.1-1.6,3.7l0,0l-10.3,4c-1.5,0.5-3.1-0.2-3.7-1.6
+		s0.1-3.1,1.6-3.6l3.5-1.7C42.3,9,32.2,8.9,23,12.5l3.7,1.7c1.5,0.7,2,2.4,1.3,3.8c-0.7,1.3-2.1,2-3.5,1.4l-10.3-4
+		c-1.5-0.5-2.2-2.2-1.7-3.6l0,0l4.1-10C17.3,0.3,19-0.4,20.5,0.2z"/>
+</g>
+</svg>
diff --git a/src/assets/img/mod/assignment.svg b/src/assets/img/mod_legacy/assign.svg
similarity index 100%
rename from src/assets/img/mod/assignment.svg
rename to src/assets/img/mod_legacy/assign.svg
diff --git a/src/assets/img/mod_legacy/bigbluebuttonbn.svg b/src/assets/img/mod_legacy/bigbluebuttonbn.svg
new file mode 100644
index 000000000..7b92ab21b
--- /dev/null
+++ b/src/assets/img/mod_legacy/bigbluebuttonbn.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="24px" height="24px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-58.9473" y1="84.1865" x2="58.9479" y2="-84.1852">
+			<stop  offset="0" style="stop-color:#283274"/>
+			<stop  offset="0.7088" style="stop-color:#293275"/>
+			<stop  offset="0.967" style="stop-color:#273F87"/>
+		</linearGradient>
+<symbol  id="New_Symbol" viewBox="-107.423 -107.423 214.847 214.846">
+	<g>
+		<path fill="url(#SVGID_1_)" stroke="#5D6AA4" stroke-width="9.3191" d="M102.765,0c0-56.755-46.009-102.764-102.765-102.764
+			c-56.754,0-102.764,46.009-102.764,102.764S-56.754,102.764,0,102.764C56.756,102.764,102.765,56.755,102.765,0z"/>
+		
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="-75.0186" y1="112.8037" x2="-15.8528" y2="28.3063" gradientTransform="matrix(1 0 0 1 18.4946 -31.9512)">
+			<stop  offset="0" style="stop-color:#BEC7E5"/>
+			<stop  offset="0.0956" style="stop-color:#B5BEDE"/>
+			<stop  offset="0.2524" style="stop-color:#9CA5CC"/>
+			<stop  offset="0.4508" style="stop-color:#747DAE"/>
+			<stop  offset="0.6809" style="stop-color:#3D4684"/>
+			<stop  offset="0.7582" style="stop-color:#293275"/>
+		</linearGradient>
+		<path fill="url(#SVGID_2_)" d="M0.282,98.502C26.323,98.31,54.293,87.893,74.49,63.84C73.631,43.207,36.703,22.057,5.886-1.229
+			c-25.857-19.538-65.427-37.86-92.487-45.059c-25.73,49.263-7.016,96.619,25.25,123.238C-46.256,90.16-23.508,98.679,0.282,98.502z
+			"/>
+	</g>
+	<g>
+		<g>
+			<path d="M55.602-25.561c0-8.678-3.055-16.072-9.16-22.179c-6.11-6.109-13.501-9.16-22.179-9.16h-37.367
+				c-8.679,0-16.073,3.051-22.179,9.16c-6.11,6.106-9.162,13.501-9.162,22.179v93.779c6.656,0,12.336-3.254,17.046-9.764
+				c4.708-6.509,7.062-14.344,7.062-23.505v-60.511c0-4.821,2.411-7.231,7.232-7.231h37.367c4.821,0,7.231,2.41,7.231,7.231V3.128
+				c0,4.66-2.41,7.07-7.231,7.232H17.03c-9.323,0.324-17.2,2.757-23.626,7.304c-6.43,4.543-9.643,10.145-9.643,16.805h40.501
+				c8.678,0,16.068-3.056,22.179-9.161c6.105-6.11,9.16-13.5,9.16-22.18V-25.561z"/>
+		</g>
+	</g>
+	<g opacity="0.46">
+		<g>
+			<path fill="#FFFFFF" d="M55.602-25.561c0-8.678-3.055-16.072-9.16-22.179c-6.11-6.109-13.501-9.16-22.179-9.16h-37.367
+				c-8.679,0-16.073,3.051-22.179,9.16c-6.11,6.106-9.162,13.501-9.162,22.179v93.779c6.656,0,12.336-3.254,17.046-9.764
+				c4.708-6.509,7.062-14.344,7.062-23.505v-60.511c0-4.821,2.411-7.231,7.232-7.231h37.367c4.821,0,7.231,2.41,7.231,7.231V3.128
+				c0,4.66-2.41,7.07-7.231,7.232H17.03c-9.323,0.324-17.2,2.757-23.626,7.304c-6.43,4.543-9.643,10.145-9.643,16.805h40.501
+				c8.678,0,16.068-3.056,22.179-9.161c6.105-6.11,9.16-13.5,9.16-22.18V-25.561z"/>
+		</g>
+	</g>
+	<g>
+		<path fill="#FFFFFF" d="M53.829-26.788c0-8.678-3.055-16.072-9.16-22.179c-6.11-6.109-13.501-9.16-22.18-9.16h-37.367
+			c-8.679,0-16.073,3.051-22.179,9.16c-6.109,6.106-9.16,13.501-9.16,22.179v93.779c6.655,0,12.336-3.255,17.045-9.764
+			c4.708-6.509,7.062-14.345,7.062-23.505v-60.511c0-4.821,2.41-7.231,7.232-7.231h37.367c4.821,0,7.232,2.41,7.232,7.231V1.901
+			c0,4.66-2.411,7.07-7.232,7.232h-7.232C5.935,9.457-1.942,11.89-8.368,16.438c-6.43,4.542-9.644,10.144-9.644,16.803h40.501
+			c8.679,0,16.069-3.055,22.18-9.16c6.105-6.109,9.16-13.5,9.16-22.179V-26.788z"/>
+	</g>
+</symbol>
+<use xlink:href="#New_Symbol"  width="214.847" height="214.846" x="-107.423" y="-107.423" transform="matrix(0.1376 0 0 -0.1376 14.9995 15)" overflow="visible"/>
+</svg>
diff --git a/src/assets/img/mod_legacy/book.svg b/src/assets/img/mod_legacy/book.svg
new file mode 100644
index 000000000..740a35160
--- /dev/null
+++ b/src/assets/img/mod_legacy/book.svg
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="24px" height="24px" viewBox="-2 0 24 24" style="overflow:visible;enable-background:new -2 0 24 24;"
+	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<defs>
+</defs>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="12.0005" y1="0" x2="12.0005" y2="24.0005">
+	<stop  offset="0" style="stop-color:#90C50E"/>
+	<stop  offset="1" style="stop-color:#70A034"/>
+	<a:midPointStop  offset="0" style="stop-color:#90C50E"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#90C50E"/>
+	<a:midPointStop  offset="1" style="stop-color:#70A034"/>
+</linearGradient>
+<rect x="4" style="fill:url(#SVGID_1_);" width="16" height="24"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="12.0005" y1="1" x2="12.0005" y2="23.0005">
+	<stop  offset="0" style="stop-color:#D9F991"/>
+	<stop  offset="0.2388" style="stop-color:#D7F88D"/>
+	<stop  offset="0.4501" style="stop-color:#D1F383"/>
+	<stop  offset="0.6509" style="stop-color:#C6EC71"/>
+	<stop  offset="0.844" style="stop-color:#B7E257"/>
+	<stop  offset="1" style="stop-color:#A8D73D"/>
+	<a:midPointStop  offset="0" style="stop-color:#D9F991"/>
+	<a:midPointStop  offset="0.7317" style="stop-color:#D9F991"/>
+	<a:midPointStop  offset="1" style="stop-color:#A8D73D"/>
+</linearGradient>
+<rect x="5" y="1" style="fill:url(#SVGID_2_);" width="14" height="22"/>
+<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="12.0005" y1="2" x2="12.0005" y2="22.0005">
+	<stop  offset="0" style="stop-color:#B3E810"/>
+	<stop  offset="1" style="stop-color:#90C60D"/>
+	<a:midPointStop  offset="0" style="stop-color:#B3E810"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#B3E810"/>
+	<a:midPointStop  offset="1" style="stop-color:#90C60D"/>
+</linearGradient>
+<rect x="6" y="2" style="fill:url(#SVGID_3_);" width="12" height="20"/>
+<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="12.0005" y1="4" x2="12.0005" y2="9">
+	<stop  offset="0" style="stop-color:#90C50E"/>
+	<stop  offset="1" style="stop-color:#70A034"/>
+	<a:midPointStop  offset="0" style="stop-color:#90C50E"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#90C50E"/>
+	<a:midPointStop  offset="1" style="stop-color:#70A034"/>
+</linearGradient>
+<path style="fill:url(#SVGID_4_);" d="M7,4v5h10V4H7z M16,8H8V5h8V8z"/>
+<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="2.5" y1="0" x2="2.5" y2="24.0005">
+	<stop  offset="0" style="stop-color:#656565"/>
+	<stop  offset="1.342887e-02" style="stop-color:#646464"/>
+	<stop  offset="0.4453" style="stop-color:#3C3C3C"/>
+	<stop  offset="0.7891" style="stop-color:#242424"/>
+	<stop  offset="1" style="stop-color:#1B1B1B"/>
+	<a:midPointStop  offset="0" style="stop-color:#656565"/>
+	<a:midPointStop  offset="0.4" style="stop-color:#656565"/>
+	<a:midPointStop  offset="1" style="stop-color:#1B1B1B"/>
+</linearGradient>
+<path style="fill:url(#SVGID_5_);" d="M4,0H2.6H1C0.5,0,0,0.5,0,1v22c0,0.5,0.5,1,1,1h1.6H4h1v-1V1V0H4z"/>
+<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="2.5" y1="1" x2="2.5" y2="23.0005">
+	<stop  offset="0" style="stop-color:#8E8E8E"/>
+	<stop  offset="4.191053e-02" style="stop-color:#8A8A8A"/>
+	<stop  offset="0.4613" style="stop-color:#626262"/>
+	<stop  offset="0.7952" style="stop-color:#4A4A4A"/>
+	<stop  offset="1" style="stop-color:#414141"/>
+	<a:midPointStop  offset="0" style="stop-color:#8E8E8E"/>
+	<a:midPointStop  offset="0.4" style="stop-color:#8E8E8E"/>
+	<a:midPointStop  offset="1" style="stop-color:#414141"/>
+</linearGradient>
+<rect x="1" y="1" style="fill:url(#SVGID_6_);" width="3" height="22"/>
+<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="2.5" y1="2" x2="2.5" y2="22.0005">
+	<stop  offset="0" style="stop-color:#7C7C7C"/>
+	<stop  offset="0.3898" style="stop-color:#5C5C5C"/>
+	<stop  offset="0.768" style="stop-color:#444444"/>
+	<stop  offset="1" style="stop-color:#3B3B3B"/>
+	<a:midPointStop  offset="0" style="stop-color:#7C7C7C"/>
+	<a:midPointStop  offset="0.4" style="stop-color:#7C7C7C"/>
+	<a:midPointStop  offset="1" style="stop-color:#3B3B3B"/>
+</linearGradient>
+<rect x="2" y="2" style="fill:url(#SVGID_7_);" width="1" height="20"/>
+</svg>
diff --git a/src/assets/img/mod_legacy/chat.svg b/src/assets/img/mod_legacy/chat.svg
new file mode 100644
index 000000000..9dd304b78
--- /dev/null
+++ b/src/assets/img/mod_legacy/chat.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="24px" height="24px" viewBox="-0.1 -0.1 24 24"
+	 style="overflow:visible;enable-background:new -0.1 -0.1 24 24;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<defs>
+</defs>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="10.9429" y1="0" x2="10.9429" y2="19.7881">
+	<stop  offset="0" style="stop-color:#76A1F0"/>
+	<stop  offset="1" style="stop-color:#6B90D5"/>
+	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
+	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
+</linearGradient>
+<path style="fill:url(#SVGID_1_);" d="M10.8,0C4.7,0.1-0.1,4.3,0,9.3c0,2.6,1.5,5,3.7,6.6c0,0.1,0,0.2,0.1,0.3
+	c0.3,2-0.9,3.6-0.9,3.6s2.2-0.5,3.5-1.5c0.2-0.2,0.5-0.4,0.7-0.7c1.3,0.4,2.6,0.6,4.1,0.6c6-0.1,10.9-4.3,10.8-9.3
+	C21.8,3.9,16.8-0.1,10.8,0z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="10.9434" y1="1" x2="10.9434" y2="18.1289">
+	<stop  offset="0" style="stop-color:#BBE0F7"/>
+	<stop  offset="1" style="stop-color:#82B4FB"/>
+	<a:midPointStop  offset="0" style="stop-color:#BBE0F7"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#BBE0F7"/>
+	<a:midPointStop  offset="1" style="stop-color:#82B4FB"/>
+</linearGradient>
+<path style="fill:url(#SVGID_2_);" d="M4.6,18.1c0.1-0.6,0.2-1.3,0.1-2.1c0-0.1,0-0.2-0.1-0.3l-0.1-0.4l-0.3-0.3
+	C2.2,13.6,1,11.5,1,9.3C0.9,4.8,5.3,1.1,10.8,1L11,1c5.4,0,9.8,3.5,9.9,7.9c0.1,4.5-4.3,8.2-9.8,8.3l-0.2,0c-1.2,0-2.4-0.2-3.5-0.5
+	l-0.6-0.2l-0.4,0.5c-0.2,0.2-0.4,0.4-0.5,0.6C5.4,17.7,5,17.9,4.6,18.1z"/>
+<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="10.9434" y1="2" x2="10.9434" y2="16.1631">
+	<stop  offset="0" style="stop-color:#95BFF8"/>
+	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
+	<stop  offset="1" style="stop-color:#7CA4EB"/>
+	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
+	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
+	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
+</linearGradient>
+<path style="fill:url(#SVGID_3_);" d="M10.8,16.2c-1.1,0-2.2-0.2-3.2-0.5l-1.3-0.4L5.7,16c0,0,0-0.1,0-0.1c0-0.1,0-0.3-0.1-0.4
+	l-0.1-0.7l-0.6-0.6l0,0C3,13,2,11.2,2,9.3C1.9,5.3,5.9,2.1,10.8,2L11,2c4.8,0,8.8,3.1,8.8,6.9c0.1,3.9-3.9,7.2-8.8,7.2L10.8,16.2z"
+	/>
+<path style="fill:#FFFFFF;" d="M16.6,9.6c0,0.7-0.6,1.3-1.2,1.3c-0.7,0-1.3-0.6-1.3-1.3c0-0.7,0.6-1.2,1.3-1.2
+	C16,8.4,16.6,8.9,16.6,9.6z M11.5,8.4c-0.7,0-1.2,0.6-1.2,1.2c0,0.7,0.6,1.3,1.2,1.3c0.7,0,1.3-0.6,1.3-1.3
+	C12.7,8.9,12.2,8.4,11.5,8.4z M7.5,8.4c-0.7,0-1.3,0.6-1.3,1.2c0,0.7,0.6,1.3,1.3,1.3s1.3-0.6,1.3-1.3C8.8,8.9,8.2,8.4,7.5,8.4z"/>
+<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="14.0254" y1="6.667" x2="14.0254" y2="23.8398">
+	<stop  offset="0" style="stop-color:#F0A829"/>
+	<stop  offset="1" style="stop-color:#C7671A"/>
+	<a:midPointStop  offset="0" style="stop-color:#F0A829"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#F0A829"/>
+	<a:midPointStop  offset="1" style="stop-color:#C7671A"/>
+</linearGradient>
+<path style="fill:url(#SVGID_4_);" d="M20.7,20.5c1.9-1.4,3.2-3.4,3.2-5.7c0.1-4.4-4.3-8-9.8-8.1C8.7,6.6,4.2,10,4.1,14.4
+	c-0.1,4.4,4.3,8,9.8,8.1c1.4,0,2.7-0.2,3.9-0.5c1,1.3,3.7,1.9,3.7,1.9S20.3,22.2,20.7,20.5z"/>
+<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="14.1436" y1="7.667" x2="14.1436" y2="22.1943">
+	<stop  offset="0" style="stop-color:#FFEBA8"/>
+	<stop  offset="1" style="stop-color:#F8BE27"/>
+	<a:midPointStop  offset="0" style="stop-color:#FFEBA8"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#FFEBA8"/>
+	<a:midPointStop  offset="1" style="stop-color:#F8BE27"/>
+</linearGradient>
+<path style="fill:url(#SVGID_5_);" d="M19.9,22.2c-0.5-0.2-1-0.5-1.7-1.4c-0.4,0.1-1.7,0.7-4.2,0.7c-5,0-8.9-3.3-8.8-7.1
+	c0.1-3.7,4-6.8,9-6.8c2.3,0,4.7,0.8,6.3,2.2c1.6,1.3,2.5,3.1,2.4,4.9c0,1.9-1,3.7-3.1,5.1C19.7,20.7,19.7,21.6,19.9,22.2z"/>
+<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="14.0234" y1="8.6689" x2="14.0234" y2="20.5176">
+	<stop  offset="0" style="stop-color:#FFC30F"/>
+	<stop  offset="1" style="stop-color:#F5AE0D"/>
+	<a:midPointStop  offset="0" style="stop-color:#FFC30F"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#FFC30F"/>
+	<a:midPointStop  offset="1" style="stop-color:#F5AE0D"/>
+</linearGradient>
+<path style="fill:url(#SVGID_6_);" d="M13.9,20.5c-6.1-0.2-7.9-4.2-7.8-6.1c0.2-3.2,3.3-5.8,8-5.8c2.1,0,4.3,0.8,5.7,2
+	c1.4,1.1,2.1,2.6,2.1,4.1c-0.1,2.9-2.9,4.5-2.9,4.5s-0.2,0.7-0.2,0.9l-0.4-0.5C18.4,19.6,16.5,20.6,13.9,20.5z"/>
+<path style="fill:#FFFFFF;" d="M19.4,14.9c0,0.7-0.6,1.3-1.2,1.3c-0.7,0-1.3-0.6-1.3-1.3c0-0.7,0.6-1.2,1.3-1.2
+	C18.8,13.7,19.4,14.2,19.4,14.9z M14.3,13.7c-0.7,0-1.2,0.6-1.2,1.2c0,0.7,0.6,1.3,1.2,1.3c0.7,0,1.3-0.6,1.3-1.3
+	C15.5,14.2,15,13.7,14.3,13.7z M10.3,13.7c-0.7,0-1.3,0.6-1.3,1.2c0,0.7,0.6,1.3,1.3,1.3s1.3-0.6,1.3-1.3
+	C11.6,14.2,11,13.7,10.3,13.7z"/>
+</svg>
diff --git a/src/assets/img/mod_legacy/choice.svg b/src/assets/img/mod_legacy/choice.svg
new file mode 100644
index 000000000..4d455910c
--- /dev/null
+++ b/src/assets/img/mod_legacy/choice.svg
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="24px" height="24px" viewBox="-4.2 -0.3 24 24"
+	 style="overflow:visible;enable-background:new -4.2 -0.3 24 24;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<defs>
+</defs>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="7.8237" y1="0" x2="7.8237" y2="23.3262">
+	<stop  offset="0" style="stop-color:#76A1F0"/>
+	<stop  offset="1" style="stop-color:#6B90D5"/>
+	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
+	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
+</linearGradient>
+<path style="fill:url(#SVGID_1_);" d="M2.4,8.4C1.1,8.4,0,7.5,0,6.1C0,3.3,2.8,0,7.7,0c3.3,0,7.9,2.2,7.9,6c0,2-1.2,3.5-3.6,4.4
+	c-3.3,1.2-1.4,3.7-4.5,3.7c-1.3,0-2.1-0.8-2.1-2.1c0-2.7,2.8-4.2,2.8-6.9c0-0.7-0.3-1.6-1.1-1.6c-0.9,0-1,0.9-1,1.5
+	C5.8,7.1,4.5,8.4,2.4,8.4z M7.3,23.3c-2,0-3.6-1.6-3.6-3.6c0-2,1.6-3.6,3.6-3.6c2,0,3.6,1.6,3.6,3.6C10.8,21.7,9.2,23.3,7.3,23.3z"
+	/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="7.8237" y1="1" x2="7.8237" y2="22.3262">
+	<stop  offset="0" style="stop-color:#BBE0F7"/>
+	<stop  offset="1" style="stop-color:#82B4FB"/>
+	<a:midPointStop  offset="0" style="stop-color:#BBE0F7"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#BBE0F7"/>
+	<a:midPointStop  offset="1" style="stop-color:#82B4FB"/>
+</linearGradient>
+<path style="fill:url(#SVGID_2_);" d="M7.3,22.3c-1.4,0-2.6-1.1-2.6-2.6c0-1.4,1.1-2.6,2.6-2.6s2.6,1.1,2.6,2.6
+	C9.8,21.2,8.7,22.3,7.3,22.3z M7.6,13.1c-0.8,0-1.1-0.4-1.1-1.1c0-1.1,0.6-1.9,1.2-2.9c0.7-1.1,1.5-2.3,1.5-4c0-1.3-0.7-2.6-2.1-2.6
+	c-1.8,0-2,1.7-2,2.4C4.9,6,4.3,7.4,2.4,7.4C1.6,7.4,1,6.9,1,6.1C1,4,3.1,1,7.7,1c2.9,0,6.9,1.9,6.9,5c0,1.6-1,2.7-2.9,3.4
+	c-2,0.8-2.5,2-2.9,2.8C8.5,13,8.5,13.1,7.6,13.1z"/>
+<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="7.8237" y1="2.0986" x2="7.8237" y2="21.3262">
+	<stop  offset="0" style="stop-color:#95BFF8"/>
+	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
+	<stop  offset="1" style="stop-color:#7CA4EB"/>
+	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
+	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
+	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
+</linearGradient>
+<path style="fill:url(#SVGID_3_);" d="M7.3,21.3c-0.9,0-1.6-0.7-1.6-1.6s0.7-1.6,1.6-1.6c0.9,0,1.6,0.7,1.6,1.6S8.2,21.3,7.3,21.3z
+	 M7.6,12.1c-0.1,0-0.1,0-0.1,0c0,0,0-0.1,0-0.1c0-0.8,0.5-1.5,1-2.3c0.8-1.2,1.7-2.6,1.7-4.6c0-1.3-0.5-2.3-1.3-3
+	c2.2,0.4,4.8,1.8,4.8,3.9c0,0.4,0,1.6-2.3,2.5C9,9.4,8.3,11,7.9,11.9c0,0.1-0.1,0.2-0.1,0.2C7.8,12.1,7.7,12.1,7.6,12.1z M2.4,6.4
+	C2,6.4,2,6.2,2,6.1c0-1.1,0.9-2.7,2.7-3.5C4.4,3.1,4.1,3.8,4,4.8C3.9,6.2,3.1,6.4,2.4,6.4z"/>
+</svg>
diff --git a/src/assets/img/mod/database.svg b/src/assets/img/mod_legacy/data.svg
similarity index 100%
rename from src/assets/img/mod/database.svg
rename to src/assets/img/mod_legacy/data.svg
diff --git a/src/assets/img/mod_legacy/external-tool.svg b/src/assets/img/mod_legacy/external-tool.svg
new file mode 100644
index 000000000..ebbbe3084
--- /dev/null
+++ b/src/assets/img/mod_legacy/external-tool.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" style="overflow:visible;enable-background:new 0 0 24 24;"
+	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<defs>
+</defs>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="0" x2="11.9995" y2="24.001">
+	<stop  offset="0" style="stop-color:#90C50E"/>
+	<stop  offset="1" style="stop-color:#70A034"/>
+	<a:midPointStop  offset="0" style="stop-color:#90C50E"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#90C50E"/>
+	<a:midPointStop  offset="1" style="stop-color:#70A034"/>
+</linearGradient>
+<path style="fill:url(#SVGID_1_);" d="M21.1,12.3c1,0,1.7,0.9,1.7,0.9c0.3,0.4,0.7,0.8,0.9,0.8s0.3-0.5,0.3-1V8c0-0.5-0.5-1-1-1h-3
+	c-0.5,0-1-0.1-1-0.3c0-0.2,0.3-0.7,0.7-1.1c0,0,0.8-0.9,0.8-2.1C20.5,1.6,18.9,0,17,0s-3.5,1.6-3.5,3.5c0,1.2,0.8,2.1,0.8,2.1
+	C14.7,6,15,6.5,15,6.7C15,6.9,14.5,7,14,7H8C7.5,7,7,7.5,7,8v6c0,0.5-0.1,1-0.3,1S6,14.7,5.6,14.3c0,0-0.9-0.8-2.1-0.8
+	C1.6,13.5,0,15.1,0,17s1.6,3.5,3.5,3.5c1.2,0,2.1-0.8,2.1-0.8C6,19.3,6.5,19,6.7,19S7,19.5,7,20v3c0,0.5,0.5,1,1,1h4
+	c0.5,0,1-0.1,1-0.3s-0.3-0.6-0.7-1c0,0-0.6-0.6-0.6-1.6c0-1.4,1.3-2.5,2.7-2.5c1.4,0,2.4,1.1,2.4,2.5c0,1-0.9,1.7-0.9,1.7
+	c-0.4,0.3-0.8,0.7-0.8,0.9s0.5,0.3,1,0.3h7c0.5,0,1-0.5,1-1v-6c0-0.5-0.1-1-0.3-1s-0.6,0.3-1,0.7c0,0-0.6,0.6-1.6,0.6
+	c-1.4,0-2.5-1.3-2.5-2.7S19.7,12.3,21.1,12.3z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="1" x2="11.9995" y2="23.001">
+	<stop  offset="0" style="stop-color:#D9F991"/>
+	<stop  offset="0.2388" style="stop-color:#D7F88D"/>
+	<stop  offset="0.4501" style="stop-color:#D1F383"/>
+	<stop  offset="0.6509" style="stop-color:#C6EC71"/>
+	<stop  offset="0.844" style="stop-color:#B7E257"/>
+	<stop  offset="1" style="stop-color:#A8D73D"/>
+	<a:midPointStop  offset="0" style="stop-color:#D9F991"/>
+	<a:midPointStop  offset="0.7317" style="stop-color:#D9F991"/>
+	<a:midPointStop  offset="1" style="stop-color:#A8D73D"/>
+</linearGradient>
+<path style="fill:url(#SVGID_2_);" d="M17,23c0.4-0.4,0.7-1.1,0.7-1.9c0-2-1.5-3.5-3.4-3.5c-2,0-3.7,1.6-3.7,3.5
+	c0,0.9,0.3,1.5,0.6,1.9H8v-3c0-1.5-0.7-2-1.3-2c-0.6,0-1.3,0.6-1.7,0.9c0,0-0.7,0.6-1.5,0.6C2.1,19.5,1,18.4,1,17s1.1-2.5,2.5-2.5
+	c0.8,0,1.4,0.6,1.5,0.6C5.3,15.4,6.1,16,6.7,16C7.3,16,8,15.5,8,14V8h6c1.5,0,2-0.7,2-1.3c0-0.6-0.5-1.3-0.9-1.7
+	c0,0-0.6-0.7-0.6-1.5C14.5,2.1,15.6,1,17,1s2.5,1.1,2.5,2.5c0,0.8-0.6,1.5-0.6,1.5C18.5,5.4,18,6.1,18,6.7C18,7.3,18.5,8,20,8h3v4
+	c-0.4-0.4-1.1-0.7-1.9-0.7c-2,0-3.5,1.5-3.5,3.4c0,2,1.6,3.7,3.5,3.7c0.9,0,1.5-0.3,1.9-0.6V23H17z"/>
+<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="2" x2="11.9995" y2="22.001">
+	<stop  offset="0" style="stop-color:#B3E810"/>
+	<stop  offset="1" style="stop-color:#90C60D"/>
+	<a:midPointStop  offset="0" style="stop-color:#B3E810"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#B3E810"/>
+	<a:midPointStop  offset="1" style="stop-color:#90C60D"/>
+</linearGradient>
+<path style="fill:url(#SVGID_3_);" d="M18.6,22c0.1-0.3,0.1-0.6,0.1-0.9c0-2.5-1.9-4.5-4.4-4.5c-2.5,0-4.7,2.1-4.7,4.5
+	c0,0.3,0,0.6,0.1,0.9H9v-2c0-2.1-1.2-3-2.3-3C7.8,17,9,16.1,9,14V9h5c2.1,0,3-1.2,3-2.3c0-0.7-0.4-1.5-1.2-2.4
+	c-0.1-0.1-0.3-0.5-0.3-0.8C15.5,2.7,16.2,2,17,2s1.5,0.7,1.5,1.5c0,0.3-0.3,0.7-0.3,0.8C17.4,5.2,17,6,17,6.7C17,7.8,17.9,9,20,9h2
+	v1.4c-0.3-0.1-0.6-0.1-0.9-0.1c-2.5,0-4.5,1.9-4.5,4.4c0,2.5,2.1,4.7,4.5,4.7c0.3,0,0.6,0,0.9-0.1V22H18.6z M3.5,18.5
+	C2.7,18.5,2,17.8,2,17s0.7-1.5,1.5-1.5c0.3,0,0.7,0.3,0.8,0.3C5.2,16.6,6,17,6.7,17c-0.7,0-1.5,0.4-2.4,1.2
+	C4.2,18.3,3.8,18.5,3.5,18.5z"/>
+</svg>
diff --git a/src/assets/img/mod_legacy/feedback.svg b/src/assets/img/mod_legacy/feedback.svg
new file mode 100644
index 000000000..58d0f080b
--- /dev/null
+++ b/src/assets/img/mod_legacy/feedback.svg
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" style="overflow:visible;enable-background:new 0 0 24 24;"
+	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<defs>
+</defs>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="7.7681" y1="10.2231" x2="7.7681" y2="23.9805">
+	<stop  offset="0" style="stop-color:#DB6D17"/>
+	<stop  offset="1" style="stop-color:#BF3B08"/>
+	<a:midPointStop  offset="0" style="stop-color:#DB6D17"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#DB6D17"/>
+	<a:midPointStop  offset="1" style="stop-color:#BF3B08"/>
+</linearGradient>
+<path style="fill:url(#SVGID_1_);" d="M10.9,19.1c-1.1-0.8-1.7-1.1-2-2.4c-0.2-1.1-1.3-6.4-1.3-6.4l-4.9,1c0,0,0.9,4.6,1.8,9
+	c0.9,4.4,1,4.3,6.8,3.1C13.7,22.8,12.8,20.5,10.9,19.1z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="7.8569" y1="11.3994" x2="7.8569" y2="22.9805">
+	<stop  offset="0" style="stop-color:#F6A55E"/>
+	<stop  offset="1" style="stop-color:#EA5B03"/>
+	<a:midPointStop  offset="0" style="stop-color:#F6A55E"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#F6A55E"/>
+	<a:midPointStop  offset="1" style="stop-color:#EA5B03"/>
+</linearGradient>
+<path style="fill:url(#SVGID_2_);" d="M7,23c-0.8,0-0.9,0-1.5-3l-1.6-8l2.9-0.6L8,16.9c0.3,1.6,1,2.1,1.9,2.7l0.4,0.3
+	c1.1,0.8,1.5,1.7,1.4,2.1c0,0.2-0.5,0.3-0.6,0.3l-0.5,0.1C9,22.7,7.8,23,7,23L7,23z"/>
+<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="7.7373" y1="12.5757" x2="7.7373" y2="21.8926">
+	<stop  offset="0" style="stop-color:#F17219"/>
+	<stop  offset="1" style="stop-color:#EA5B03"/>
+	<a:midPointStop  offset="0" style="stop-color:#F17219"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#F17219"/>
+	<a:midPointStop  offset="1" style="stop-color:#EA5B03"/>
+</linearGradient>
+<path style="fill:url(#SVGID_3_);" d="M7.7,21.9c-0.7,0-0.7,0-1.2-2.1l-1.4-7l1-0.2L7,17.1c0.4,1.9,1.4,2.7,2.3,3.3l0.4,0.3
+	C10.8,21.6,10.6,21.4,7.7,21.9z"/>
+<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="11.0005" y1="0" x2="11.0005" y2="19.0039">
+	<stop  offset="0" style="stop-color:#C3C3C3"/>
+	<stop  offset="1" style="stop-color:#ACACAC"/>
+	<a:midPointStop  offset="0" style="stop-color:#C3C3C3"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#C3C3C3"/>
+	<a:midPointStop  offset="1" style="stop-color:#ACACAC"/>
+</linearGradient>
+<path style="fill:url(#SVGID_4_);" d="M12.5,5H4.6C2.1,5,0,7.2,0,9.5C0,11.8,2.1,14,4.6,14h7.6c0,0,5.7,0,9.8,5c0-4.9,0-9.5,0-9.5
+	s0-4.3,0-9.5C18.7,4.8,12.5,5,12.5,5z"/>
+<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="11.0005" y1="2.6079" x2="11.0005" y2="16.5342">
+	<stop  offset="0" style="stop-color:#E9E9E9"/>
+	<stop  offset="1" style="stop-color:#C4C4C4"/>
+	<a:midPointStop  offset="0" style="stop-color:#E9E9E9"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#E9E9E9"/>
+	<a:midPointStop  offset="1" style="stop-color:#C4C4C4"/>
+</linearGradient>
+<path style="fill:url(#SVGID_5_);" d="M21,16.5C17,13,12.5,13,12.2,13H4.6C2.7,13,1,11.4,1,9.5S2.7,6,4.6,6h7.8
+	c0.3,0,4.9-0.2,8.5-3.4V16.5z"/>
+<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="11.0005" y1="4.5991" x2="11.0005" y2="14.5273">
+	<stop  offset="0" style="stop-color:#F7F7F7"/>
+	<stop  offset="0.1044" style="stop-color:#FCFCFC"/>
+	<stop  offset="0.3293" style="stop-color:#FFFFFF"/>
+	<stop  offset="0.5692" style="stop-color:#E8E8E8"/>
+	<stop  offset="0.8153" style="stop-color:#D7D7D7"/>
+	<stop  offset="1" style="stop-color:#D1D1D1"/>
+	<a:midPointStop  offset="0" style="stop-color:#F7F7F7"/>
+	<a:midPointStop  offset="0.2222" style="stop-color:#F7F7F7"/>
+	<a:midPointStop  offset="0.3293" style="stop-color:#FFFFFF"/>
+	<a:midPointStop  offset="0.3545" style="stop-color:#FFFFFF"/>
+	<a:midPointStop  offset="1" style="stop-color:#D1D1D1"/>
+</linearGradient>
+<path style="fill:url(#SVGID_6_);" d="M20,14.5C16.2,12,12.4,12,12.2,12H4.6C3.3,12,2,10.8,2,9.5S3.3,7,4.6,7h7.8
+	c0.2,0,4-0.2,7.5-2.4V14.5z"/>
+<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="5.501" y1="5.0015" x2="5.501" y2="14.002">
+	<stop  offset="0" style="stop-color:#DB6D17"/>
+	<stop  offset="1" style="stop-color:#BF3B08"/>
+	<a:midPointStop  offset="0" style="stop-color:#DB6D17"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#DB6D17"/>
+	<a:midPointStop  offset="1" style="stop-color:#BF3B08"/>
+</linearGradient>
+<path style="fill:url(#SVGID_7_);" d="M11,5H4.6C2.1,5,0,7.2,0,9.5C0,11.8,2.1,14,4.6,14H11V5z"/>
+<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="6.001" y1="6.0015" x2="6.001" y2="13.0015">
+	<stop  offset="0" style="stop-color:#F6A55E"/>
+	<stop  offset="1" style="stop-color:#EA5B03"/>
+	<a:midPointStop  offset="0" style="stop-color:#F6A55E"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#F6A55E"/>
+	<a:midPointStop  offset="1" style="stop-color:#EA5B03"/>
+</linearGradient>
+<path style="fill:url(#SVGID_8_);" d="M11,6H4.6C2.7,6,1,7.6,1,9.5S2.7,13,4.6,13H11V6z"/>
+<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="6.501" y1="7.0015" x2="6.501" y2="12.0015">
+	<stop  offset="0.2195" style="stop-color:#F6A55E"/>
+	<stop  offset="0.5076" style="stop-color:#F28C3F"/>
+	<stop  offset="1" style="stop-color:#EA5B03"/>
+	<a:midPointStop  offset="0.2195" style="stop-color:#F6A55E"/>
+	<a:midPointStop  offset="0.5304" style="stop-color:#F6A55E"/>
+	<a:midPointStop  offset="1" style="stop-color:#EA5B03"/>
+</linearGradient>
+<path style="fill:url(#SVGID_9_);" d="M11,7H4.6C3.3,7,2,8.2,2,9.5S3.3,12,4.6,12H11V7z"/>
+<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="22.002" y1="1.464844e-03" x2="22.002" y2="19.002">
+	<stop  offset="0" style="stop-color:#DB6D17"/>
+	<stop  offset="1" style="stop-color:#BF3B08"/>
+	<a:midPointStop  offset="0" style="stop-color:#DB6D17"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#DB6D17"/>
+	<a:midPointStop  offset="1" style="stop-color:#BF3B08"/>
+</linearGradient>
+<path style="fill:url(#SVGID_10_);" d="M20,17c0,1.1,0.9,2,2,2l0,0c1.1,0,2-0.9,2-2V2c0-1.1-0.9-2-2-2l0,0c-1.1,0-2,0.9-2,2V17z"/>
+<linearGradient id="SVGID_11_" gradientUnits="userSpaceOnUse" x1="22.002" y1="1.0015" x2="22.002" y2="18.002">
+	<stop  offset="0" style="stop-color:#F6A55E"/>
+	<stop  offset="1" style="stop-color:#EA5B03"/>
+	<a:midPointStop  offset="0" style="stop-color:#F6A55E"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#F6A55E"/>
+	<a:midPointStop  offset="1" style="stop-color:#EA5B03"/>
+</linearGradient>
+<path style="fill:url(#SVGID_11_);" d="M22,18c-0.6,0-1-0.4-1-1V2c0-0.6,0.4-1,1-1s1,0.4,1,1v15C23,17.6,22.6,18,22,18z"/>
+<linearGradient id="SVGID_12_" gradientUnits="userSpaceOnUse" x1="22.002" y1="1.0015" x2="22.002" y2="18.002">
+	<stop  offset="0" style="stop-color:#F17219"/>
+	<stop  offset="9.009037e-02" style="stop-color:#F38A39"/>
+	<stop  offset="0.183" style="stop-color:#F59E54"/>
+	<stop  offset="0.2378" style="stop-color:#F6A55E"/>
+	<stop  offset="0.2464" style="stop-color:#F5A35C"/>
+	<stop  offset="0.3809" style="stop-color:#EC8740"/>
+	<stop  offset="0.5155" style="stop-color:#E5722C"/>
+	<stop  offset="0.649" style="stop-color:#E06620"/>
+	<stop  offset="0.7805" style="stop-color:#DF621C"/>
+	<stop  offset="1" style="stop-color:#D64701"/>
+	<a:midPointStop  offset="0" style="stop-color:#F17219"/>
+	<a:midPointStop  offset="0.4103" style="stop-color:#F17219"/>
+	<a:midPointStop  offset="0.2378" style="stop-color:#F6A55E"/>
+	<a:midPointStop  offset="0.296" style="stop-color:#F6A55E"/>
+	<a:midPointStop  offset="0.7805" style="stop-color:#DF621C"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#DF621C"/>
+	<a:midPointStop  offset="1" style="stop-color:#D64701"/>
+</linearGradient>
+<path style="fill:url(#SVGID_12_);" d="M22,18c-0.6,0-1-0.4-1-1V2c0-0.6,0.4-1,1-1s1,0.4,1,1v15C23,17.6,22.6,18,22,18z"/>
+</svg>
diff --git a/src/assets/img/mod_legacy/folder.svg b/src/assets/img/mod_legacy/folder.svg
new file mode 100644
index 000000000..6c2a9fe19
--- /dev/null
+++ b/src/assets/img/mod_legacy/folder.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="24px" height="24px" viewBox="-0.1 -2 24 24"
+	 style="overflow:visible;enable-background:new -0.1 -2 24 24;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<defs>
+</defs>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="11.9351" y1="0" x2="11.9351" y2="20.0005">
+	<stop  offset="0" style="stop-color:#76A1F0"/>
+	<stop  offset="1" style="stop-color:#6B90D5"/>
+	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
+	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
+</linearGradient>
+<path style="fill:url(#SVGID_1_);" d="M21.9,19c0,0.5-0.5,1-1,1h-18c-0.5,0-1-0.5-1-1V1.1c0-0.5,0.5-1.1,1-1.1h4
+	c0.5,0,1.4,0.3,1.8,0.6l0.9,0.7C10.1,1.7,10.9,2,11.4,2l9.5,0c0.5,0,1,0.5,1,1V19z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="11.9351" y1="0.9888" x2="11.9351" y2="19.0005">
+	<stop  offset="0" style="stop-color:#BBE0F7"/>
+	<stop  offset="1" style="stop-color:#82B4FB"/>
+	<a:midPointStop  offset="0" style="stop-color:#BBE0F7"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#BBE0F7"/>
+	<a:midPointStop  offset="1" style="stop-color:#82B4FB"/>
+</linearGradient>
+<path style="fill:url(#SVGID_2_);" d="M2.9,19V1.1C2.9,1.1,3,1,3,1l3.9,0c0.3,0,0.9,0.2,1.2,0.4L9,2.2C9.7,2.6,10.7,3,11.4,3l9.5,0
+	v16H2.9z"/>
+<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="11.9351" y1="1.9917" x2="11.9351" y2="18.0005">
+	<stop  offset="0" style="stop-color:#95BFF8"/>
+	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
+	<stop  offset="1" style="stop-color:#7CA4EB"/>
+	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
+	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
+	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
+</linearGradient>
+<path style="fill:url(#SVGID_3_);" d="M3.9,18V2l3,0C7,2,7.4,2.1,7.5,2.2L8.4,3c0.8,0.6,2.1,1,3,1l8.5,0v14H3.9z"/>
+<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="11.936" y1="5" x2="11.936" y2="20.0005">
+	<stop  offset="0" style="stop-color:#76A1F0"/>
+	<stop  offset="1" style="stop-color:#6B90D5"/>
+	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
+	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
+</linearGradient>
+<path style="fill:url(#SVGID_4_);" d="M23,19c0,0.5-0.5,1-1.1,1h-20c-0.5,0-1-0.5-1.1-1L0,6c0-0.5,0.4-1,0.9-1h22c0.5,0,1,0.5,0.9,1
+	L23,19z"/>
+<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="11.9673" y1="5.9541" x2="11.9673" y2="19.0005">
+	<stop  offset="0" style="stop-color:#BBE0F7"/>
+	<stop  offset="1" style="stop-color:#82B4FB"/>
+	<a:midPointStop  offset="0" style="stop-color:#BBE0F7"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#BBE0F7"/>
+	<a:midPointStop  offset="1" style="stop-color:#82B4FB"/>
+</linearGradient>
+<path style="fill:url(#SVGID_5_);" d="M1.9,19c0,0-0.1-0.1-0.1-0.1L1,6l21.9,0L22,18.9c0,0,0,0.1-0.1,0.1H1.9z"/>
+<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="11.9663" y1="6.9565" x2="11.9663" y2="18.0005">
+	<stop  offset="0" style="stop-color:#95BFF8"/>
+	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
+	<stop  offset="1" style="stop-color:#7CA4EB"/>
+	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
+	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
+	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
+</linearGradient>
+<polygon style="fill:url(#SVGID_6_);" points="2.8,18 2.1,7 21.9,7 21.1,18 "/>
+</svg>
diff --git a/src/assets/img/mod_legacy/forum.svg b/src/assets/img/mod_legacy/forum.svg
new file mode 100644
index 000000000..aab9a8f44
--- /dev/null
+++ b/src/assets/img/mod_legacy/forum.svg
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" style="overflow:visible;enable-background:new 0 0 24 24;"
+	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<defs>
+</defs>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="10.4995" y1="0" x2="10.4995" y2="19.4312">
+	<stop  offset="0" style="stop-color:#76A1F0"/>
+	<stop  offset="1" style="stop-color:#6B90D5"/>
+	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
+	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
+</linearGradient>
+<path style="fill:url(#SVGID_1_);" d="M19,0H2C0.9,0,0,0.9,0,2v11.3C0,14.4,0.9,15,2,15h0v4.4L6.1,15H19c1.1,0,2-0.5,2-1.6V2
+	C21,0.9,20,0,19,0z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="10.4995" y1="0.9531" x2="10.4995" y2="16.8384">
+	<stop  offset="0" style="stop-color:#BBE0F7"/>
+	<stop  offset="1" style="stop-color:#82B4FB"/>
+	<a:midPointStop  offset="0" style="stop-color:#BBE0F7"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#BBE0F7"/>
+	<a:midPointStop  offset="1" style="stop-color:#82B4FB"/>
+</linearGradient>
+<path style="fill:url(#SVGID_2_);" d="M3,14H2c-0.4,0-1-0.1-1-0.6V2c0-0.6,0.5-1,1-1H19c0.5,0,1,0.5,1,1v11.3c0,0.6-0.8,0.6-1,0.6
+	H5.7L3,16.8V14z"/>
+<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="10.4985" y1="1.9775" x2="10.4985" y2="14.314">
+	<stop  offset="0" style="stop-color:#95BFF8"/>
+	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
+	<stop  offset="1" style="stop-color:#7CA4EB"/>
+	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
+	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
+	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
+</linearGradient>
+<path style="fill:url(#SVGID_3_);" d="M4,13c0,0-2,0-2,0V2l17,0l0,11c0,0-13.8,0-13.8,0L4,14.3V13z"/>
+<path style="fill:#FFFFFF;" d="M17,11H4v-1h13V11z M17,8H4v1h13V8z M17,6H4v1h13V6z M17,4H4v1h13V4z"/>
+<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="15" y1="7.8955" x2="15" y2="23.897">
+	<stop  offset="0" style="stop-color:#90C50E"/>
+	<stop  offset="1" style="stop-color:#70A034"/>
+	<a:midPointStop  offset="0" style="stop-color:#90C50E"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#90C50E"/>
+	<a:midPointStop  offset="1" style="stop-color:#70A034"/>
+</linearGradient>
+<path style="fill:url(#SVGID_4_);" d="M22,7.9H8c-1.1,0-2,0.7-2,1.8v9c0,1.1,0.9,2,2,2v3.2l3.1-3H22c1.1,0,2-1.1,2-2.2v-9
+	C24,8.6,23.1,7.9,22,7.9z"/>
+<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="15" y1="8.8955" x2="15" y2="21.3911">
+	<stop  offset="0" style="stop-color:#D9F991"/>
+	<stop  offset="0.2388" style="stop-color:#D7F88D"/>
+	<stop  offset="0.4501" style="stop-color:#D1F383"/>
+	<stop  offset="0.6509" style="stop-color:#C6EC71"/>
+	<stop  offset="0.844" style="stop-color:#B7E257"/>
+	<stop  offset="1" style="stop-color:#A8D73D"/>
+	<a:midPointStop  offset="0" style="stop-color:#D9F991"/>
+	<a:midPointStop  offset="0.7317" style="stop-color:#D9F991"/>
+	<a:midPointStop  offset="1" style="stop-color:#A8D73D"/>
+</linearGradient>
+<path style="fill:url(#SVGID_5_);" d="M9,19.9H8c-0.6,0-1-0.7-1-1.2v-9c0-0.6,0.4-0.8,1-0.8h14c0.6,0,1,0.2,1,0.8v9
+	c0,0.6-0.4,1.2-1,1.2H10.6L9,21.4V19.9z"/>
+<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="15" y1="9.8955" x2="15" y2="18.896">
+	<stop  offset="0" style="stop-color:#B3E810"/>
+	<stop  offset="1" style="stop-color:#90C60D"/>
+	<a:midPointStop  offset="0" style="stop-color:#B3E810"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#B3E810"/>
+	<a:midPointStop  offset="1" style="stop-color:#90C60D"/>
+</linearGradient>
+<polygon style="fill:url(#SVGID_6_);" points="10,18.9 8,18.9 8,9.9 22,9.9 22,18.9 10.2,18.9 10,18.9 "/>
+<path style="fill:#FFFFFF;" d="M20,16.9H10v-1h10V16.9z M20,13.9H10v1h10V13.9z M20,11.9H10v1h10V11.9z"/>
+</svg>
diff --git a/src/assets/img/mod_legacy/glossary.svg b/src/assets/img/mod_legacy/glossary.svg
new file mode 100644
index 000000000..f330727e3
--- /dev/null
+++ b/src/assets/img/mod_legacy/glossary.svg
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="24px" height="24px" viewBox="-2 0 24 24" style="overflow:visible;enable-background:new -2 0 24 24;"
+	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<defs>
+</defs>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="17.5" y1="16" x2="17.5" y2="22">
+	<stop  offset="0" style="stop-color:#DB6D17"/>
+	<stop  offset="1" style="stop-color:#BF3B08"/>
+	<a:midPointStop  offset="0" style="stop-color:#DB6D17"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#DB6D17"/>
+	<a:midPointStop  offset="1" style="stop-color:#BF3B08"/>
+</linearGradient>
+<rect x="15" y="16" style="fill:url(#SVGID_1_);" width="5" height="6"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="17.5" y1="17" x2="17.5" y2="21">
+	<stop  offset="0" style="stop-color:#F6A55E"/>
+	<stop  offset="1" style="stop-color:#EA5B03"/>
+	<a:midPointStop  offset="0" style="stop-color:#F6A55E"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#F6A55E"/>
+	<a:midPointStop  offset="1" style="stop-color:#EA5B03"/>
+</linearGradient>
+<rect x="16" y="17" style="fill:url(#SVGID_2_);" width="3" height="4"/>
+<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="17.5" y1="18" x2="17.5" y2="20">
+	<stop  offset="0" style="stop-color:#F17219"/>
+	<stop  offset="1" style="stop-color:#EA5B03"/>
+	<a:midPointStop  offset="0" style="stop-color:#F17219"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#F17219"/>
+	<a:midPointStop  offset="1" style="stop-color:#EA5B03"/>
+</linearGradient>
+<rect x="17" y="18" style="fill:url(#SVGID_3_);" width="1" height="2"/>
+<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="17.5" y1="9" x2="17.5" y2="15.0005">
+	<stop  offset="0" style="stop-color:#90C50E"/>
+	<stop  offset="1" style="stop-color:#70A034"/>
+	<a:midPointStop  offset="0" style="stop-color:#90C50E"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#90C50E"/>
+	<a:midPointStop  offset="1" style="stop-color:#70A034"/>
+</linearGradient>
+<rect x="15" y="9" style="fill:url(#SVGID_4_);" width="5" height="6"/>
+<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="17.5" y1="10" x2="17.5" y2="14.0005">
+	<stop  offset="0" style="stop-color:#D9F991"/>
+	<stop  offset="0.2388" style="stop-color:#D7F88D"/>
+	<stop  offset="0.4501" style="stop-color:#D1F383"/>
+	<stop  offset="0.6509" style="stop-color:#C6EC71"/>
+	<stop  offset="0.844" style="stop-color:#B7E257"/>
+	<stop  offset="1" style="stop-color:#A8D73D"/>
+	<a:midPointStop  offset="0" style="stop-color:#D9F991"/>
+	<a:midPointStop  offset="0.7317" style="stop-color:#D9F991"/>
+	<a:midPointStop  offset="1" style="stop-color:#A8D73D"/>
+</linearGradient>
+<rect x="16" y="10" style="fill:url(#SVGID_5_);" width="3" height="4"/>
+<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="17.5" y1="11" x2="17.5" y2="13">
+	<stop  offset="0" style="stop-color:#B3E810"/>
+	<stop  offset="1" style="stop-color:#90C60D"/>
+	<a:midPointStop  offset="0" style="stop-color:#B3E810"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#B3E810"/>
+	<a:midPointStop  offset="1" style="stop-color:#90C60D"/>
+</linearGradient>
+<rect x="17" y="11" style="fill:url(#SVGID_6_);" width="1" height="2"/>
+<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="8.4995" y1="0" x2="8.4995" y2="24.0005">
+	<stop  offset="0" style="stop-color:#95BFF8"/>
+	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
+	<stop  offset="1" style="stop-color:#7CA4EB"/>
+	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
+	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
+	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
+</linearGradient>
+<rect style="fill:url(#SVGID_7_);" width="17" height="24"/>
+<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="8.4995" y1="1" x2="8.4995" y2="23.0005">
+	<stop  offset="0" style="stop-color:#E7F4FC"/>
+	<stop  offset="1" style="stop-color:#DEEFFC"/>
+	<a:midPointStop  offset="0" style="stop-color:#E7F4FC"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#E7F4FC"/>
+	<a:midPointStop  offset="1" style="stop-color:#DEEFFC"/>
+</linearGradient>
+<rect x="1" y="1" style="fill:url(#SVGID_8_);" width="15" height="22"/>
+<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="8.4995" y1="2" x2="8.4995" y2="22.0005">
+	<stop  offset="0" style="stop-color:#CEE9F9"/>
+	<stop  offset="1" style="stop-color:#BBDFF8"/>
+	<a:midPointStop  offset="0" style="stop-color:#CEE9F9"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#CEE9F9"/>
+	<a:midPointStop  offset="1" style="stop-color:#BBDFF8"/>
+</linearGradient>
+<rect x="2" y="2" style="fill:url(#SVGID_9_);" width="13" height="20"/>
+<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="17.5" y1="2" x2="17.5" y2="8">
+	<stop  offset="0" style="stop-color:#76A1F0"/>
+	<stop  offset="1" style="stop-color:#6B90D5"/>
+	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
+	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
+</linearGradient>
+<rect x="15" y="2" style="fill:url(#SVGID_10_);" width="5" height="6"/>
+<linearGradient id="SVGID_11_" gradientUnits="userSpaceOnUse" x1="17.5" y1="3" x2="17.5" y2="7">
+	<stop  offset="0" style="stop-color:#BBE0F7"/>
+	<stop  offset="1" style="stop-color:#82B4FB"/>
+	<a:midPointStop  offset="0" style="stop-color:#BBE0F7"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#BBE0F7"/>
+	<a:midPointStop  offset="1" style="stop-color:#82B4FB"/>
+</linearGradient>
+<rect x="16" y="3" style="fill:url(#SVGID_11_);" width="3" height="4"/>
+<linearGradient id="SVGID_12_" gradientUnits="userSpaceOnUse" x1="17.5" y1="4" x2="17.5" y2="6">
+	<stop  offset="0" style="stop-color:#95BFF8"/>
+	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
+	<stop  offset="1" style="stop-color:#7CA4EB"/>
+	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
+	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
+	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
+</linearGradient>
+<rect x="17" y="4" style="fill:url(#SVGID_12_);" width="1" height="2"/>
+<linearGradient id="SVGID_13_" gradientUnits="userSpaceOnUse" x1="12.4248" y1="10.7285" x2="12.4248" y2="15.9702">
+	<stop  offset="0" style="stop-color:#76A1F0"/>
+	<stop  offset="5.472010e-02" style="stop-color:#739DE9"/>
+	<stop  offset="0.2045" style="stop-color:#6F95DE"/>
+	<stop  offset="0.4149" style="stop-color:#6C91D7"/>
+	<stop  offset="1" style="stop-color:#6B90D5"/>
+	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
+	<a:midPointStop  offset="0.13" style="stop-color:#76A1F0"/>
+	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
+</linearGradient>
+<path style="fill:url(#SVGID_13_);" d="M12.7,15.2C12,15.7,11.5,16,11,16c-0.3,0-0.5-0.1-0.7-0.3C10.1,15.5,10,15.3,10,15
+	c0-0.4,0.2-0.7,0.5-1c0.3-0.3,1-0.7,2.2-1.2v-0.5c0-0.4,0-0.6-0.1-0.7c0-0.1-0.1-0.2-0.2-0.3c-0.1-0.1-0.2-0.1-0.4-0.1
+	c-0.2,0-0.4,0.1-0.6,0.2c-0.1,0.1-0.1,0.1-0.1,0.2c0,0.1,0,0.2,0.2,0.3c0.1,0.2,0.2,0.3,0.2,0.4c0,0.2-0.1,0.3-0.2,0.4
+	c-0.1,0.1-0.3,0.2-0.5,0.2c-0.2,0-0.4-0.1-0.6-0.2s-0.2-0.3-0.2-0.5c0-0.3,0.1-0.5,0.3-0.7c0.2-0.2,0.5-0.4,0.9-0.5s0.7-0.2,1.1-0.2
+	c0.5,0,0.9,0.1,1.1,0.3c0.3,0.2,0.5,0.4,0.5,0.7c0.1,0.2,0.1,0.5,0.1,1v1.9c0,0.2,0,0.4,0,0.4c0,0.1,0,0.1,0.1,0.1c0,0,0.1,0,0.1,0
+	c0.1,0,0.2-0.1,0.3-0.2l0.2,0.1c-0.2,0.3-0.4,0.5-0.6,0.6c-0.2,0.1-0.4,0.2-0.7,0.2c-0.3,0-0.5-0.1-0.7-0.2
+	C12.8,15.6,12.7,15.4,12.7,15.2z M12.7,14.8v-1.7c-0.4,0.3-0.8,0.5-1,0.8c-0.1,0.2-0.2,0.4-0.2,0.6c0,0.2,0.1,0.3,0.2,0.4
+	c0.1,0.1,0.2,0.1,0.4,0.1C12.2,15.1,12.4,15,12.7,14.8z"/>
+<linearGradient id="SVGID_14_" gradientUnits="userSpaceOnUse" x1="6.3535" y1="8.2671" x2="6.3535" y2="15.7007">
+	<stop  offset="0" style="stop-color:#76A1F0"/>
+	<stop  offset="5.472010e-02" style="stop-color:#739DE9"/>
+	<stop  offset="0.2045" style="stop-color:#6F95DE"/>
+	<stop  offset="0.4149" style="stop-color:#6C91D7"/>
+	<stop  offset="1" style="stop-color:#6B90D5"/>
+	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
+	<a:midPointStop  offset="0.13" style="stop-color:#76A1F0"/>
+	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
+</linearGradient>
+<path style="fill:url(#SVGID_14_);" d="M7,13.6H4.4l-0.3,0.7c-0.1,0.2-0.2,0.4-0.2,0.6c0,0.2,0.1,0.4,0.2,0.5
+	c0.1,0.1,0.3,0.1,0.7,0.1v0.2H2.5v-0.2c0.3,0,0.5-0.1,0.6-0.3c0.2-0.2,0.4-0.5,0.6-1.1l2.6-5.8h0.1l2.6,6c0.2,0.6,0.5,0.9,0.6,1.1
+	c0.1,0.1,0.3,0.2,0.5,0.2v0.2H6.7v-0.2h0.1c0.3,0,0.5,0,0.6-0.1c0.1-0.1,0.1-0.1,0.1-0.2c0-0.1,0-0.1,0-0.2c0,0-0.1-0.2-0.2-0.4
+	L7,13.6z M6.8,13.2l-1.1-2.5l-1.1,2.5H6.8z"/>
+</svg>
diff --git a/src/assets/img/mod_legacy/h5pactivity.svg b/src/assets/img/mod_legacy/h5pactivity.svg
new file mode 100644
index 000000000..97fef5728
--- /dev/null
+++ b/src/assets/img/mod_legacy/h5pactivity.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" preserveAspectRatio="xMinYMid meet"><title>h5p finalArtboard 1</title><rect width="24" height="24" rx="3" ry="3" fill="#0882c8"/><path d="M22.1,8a3.37,3.37,0,0,0-2.42-.77H16.05v2H11.71l-.36,1.46a6.32,6.32,0,0,1,1-.35,3.49,3.49,0,0,1,.86-.06,3.24,3.24,0,0,1,2.35.88,2.93,2.93,0,0,1,.9,2.2A3.72,3.72,0,0,1,16,15.19a3.16,3.16,0,0,1-1.31,1.32,3.41,3.41,0,0,1-.67.27H17.7V13.28h1.65A3.8,3.8,0,0,0,22,12.46a3,3,0,0,0,.88-2.28A2.9,2.9,0,0,0,22.1,8Zm-2.44,3a1.88,1.88,0,0,1-1.21.29H17.7V9.2h.87a1.56,1.56,0,0,1,1.13.31,1,1,0,0,1,.3.76A.94.94,0,0,1,19.66,11Z" fill="#fff"/><path d="M12.27,12.05a1.33,1.33,0,0,0-1.19.74l-2.6-.37,1.17-5.2H7.29v4.08H4V7.23H1.1v9.55H4V13.28H7.29v3.49h3.57a3.61,3.61,0,0,1-1.13-.53A3.2,3.2,0,0,1,9,15.43a4,4,0,0,1-.48-1.09L11.09,14a1.32,1.32,0,1,0,1.18-1.92Z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/src/assets/img/mod/ims.svg b/src/assets/img/mod_legacy/imscp.svg
similarity index 100%
rename from src/assets/img/mod/ims.svg
rename to src/assets/img/mod_legacy/imscp.svg
diff --git a/src/assets/img/mod_legacy/label.svg b/src/assets/img/mod_legacy/label.svg
new file mode 100644
index 000000000..ac232fc58
--- /dev/null
+++ b/src/assets/img/mod_legacy/label.svg
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" style="overflow:visible;enable-background:new 0 0 24 24;"
+	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<defs>
+</defs>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="11.9854" y1="0" x2="11.9854" y2="24.0161">
+	<stop  offset="0" style="stop-color:#F0A829"/>
+	<stop  offset="1" style="stop-color:#C7671A"/>
+	<a:midPointStop  offset="0" style="stop-color:#F0A829"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#F0A829"/>
+	<a:midPointStop  offset="1" style="stop-color:#C7671A"/>
+</linearGradient>
+<path style="fill:url(#SVGID_1_);" d="M14.4,0L0.6,13.9c-0.8,0.8-0.8,2.1,0,2.8l6.7,6.7c0.8,0.8,2,0.8,2.8,0L24,9.6V0H14.4z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="11.9854" y1="1" x2="11.9854" y2="23.0161">
+	<stop  offset="0" style="stop-color:#FFEBA8"/>
+	<stop  offset="1" style="stop-color:#F8BE27"/>
+	<a:midPointStop  offset="0" style="stop-color:#FFEBA8"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#FFEBA8"/>
+	<a:midPointStop  offset="1" style="stop-color:#F8BE27"/>
+</linearGradient>
+<path style="fill:url(#SVGID_2_);" d="M8.7,23c-0.3,0-0.5-0.1-0.7-0.3L1.3,16C1.1,15.8,1,15.6,1,15.3c0-0.3,0.1-0.5,0.3-0.7L14.9,1
+	H23v8.2L9.4,22.7C9.2,22.9,9,23,8.7,23C8.7,23,8.7,23,8.7,23z"/>
+<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="11.9844" y1="2" x2="11.9844" y2="22.0142">
+	<stop  offset="0" style="stop-color:#FFC30F"/>
+	<stop  offset="1" style="stop-color:#F5AE0D"/>
+	<a:midPointStop  offset="0" style="stop-color:#FFC30F"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#FFC30F"/>
+	<a:midPointStop  offset="1" style="stop-color:#F5AE0D"/>
+</linearGradient>
+<polygon style="fill:url(#SVGID_3_);" points="2,15.3 15.3,2 22,2 22,8.8 8.7,22 "/>
+<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="8.7197" y1="9.9688" x2="8.7197" y2="20.6313">
+	<stop  offset="0" style="stop-color:#76A1F0"/>
+	<stop  offset="1" style="stop-color:#6B90D5"/>
+	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
+	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
+</linearGradient>
+<polygon style="fill:url(#SVGID_4_);" points="3.4,15.3 8.7,10 14.1,15.3 8.7,20.6 "/>
+<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="11.1465" y1="22.0312" x2="11.1465" y2="23.8711" gradientTransform="matrix(0.7071 -0.7071 0.7071 0.7071 -14.0909 8.2514)">
+	<stop  offset="0" style="stop-color:#57C3F6"/>
+	<stop  offset="0.1648" style="stop-color:#83D3F8"/>
+	<stop  offset="0.3554" style="stop-color:#AFE3FB"/>
+	<stop  offset="0.5396" style="stop-color:#D2EFFD"/>
+	<stop  offset="0.7128" style="stop-color:#EBF8FE"/>
+	<stop  offset="0.8709" style="stop-color:#FAFDFF"/>
+	<stop  offset="1" style="stop-color:#FFFFFF"/>
+	<a:midPointStop  offset="0" style="stop-color:#57C3F6"/>
+	<a:midPointStop  offset="0.3354" style="stop-color:#57C3F6"/>
+	<a:midPointStop  offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+<polygon style="fill:url(#SVGID_5_);" points="7.4,17.9 8.7,19.2 12.6,15.3 11.3,14 "/>
+<path style="fill:#F2EFD5;" d="M12.6,15.3L12.3,15c-0.3,0.2-0.8,0.5-1.4,1.1c-1.1,0.9-1,0.5-2,0.9c-0.4,0.2-0.9,0.6-1.4,1l1.2,1.2
+	L12.6,15.3z"/>
+<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="8.3882" y1="23.1035" x2="13.9038" y2="23.1035" gradientTransform="matrix(0.7071 -0.7071 0.7071 0.7071 -14.0909 8.2514)">
+	<stop  offset="0" style="stop-color:#F8E5B5"/>
+	<stop  offset="1" style="stop-color:#F9E5B6"/>
+	<a:midPointStop  offset="0" style="stop-color:#F8E5B5"/>
+	<a:midPointStop  offset="0.4451" style="stop-color:#F8E5B5"/>
+	<a:midPointStop  offset="1" style="stop-color:#F9E5B6"/>
+</linearGradient>
+<path style="fill:url(#SVGID_6_);" d="M12.6,15.3l-0.2-0.2c-0.4,0.2-0.6,0.6-1.3,1.2C10,17.2,10,16.6,9,17c-0.4,0.2-0.9,0.6-1.3,1.1
+	l1.1,1.1L12.6,15.3z"/>
+<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="12.1709" y1="17.6572" x2="10.1204" y2="22.7323" gradientTransform="matrix(0.7071 -0.7071 0.7071 0.7071 -14.0909 8.2514)">
+	<stop  offset="0" style="stop-color:#57C3F6"/>
+	<stop  offset="4.801393e-03" style="stop-color:#59C4F6"/>
+	<stop  offset="0.1237" style="stop-color:#85D3F8"/>
+	<stop  offset="0.2474" style="stop-color:#AAE1FA"/>
+	<stop  offset="0.376" style="stop-color:#C9ECFC"/>
+	<stop  offset="0.51" style="stop-color:#E1F4FD"/>
+	<stop  offset="0.6519" style="stop-color:#F2FAFE"/>
+	<stop  offset="0.807" style="stop-color:#FCFEFF"/>
+	<stop  offset="1" style="stop-color:#FFFFFF"/>
+	<a:midPointStop  offset="0" style="stop-color:#57C3F6"/>
+	<a:midPointStop  offset="0.25" style="stop-color:#57C3F6"/>
+	<a:midPointStop  offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+<polygon style="fill:url(#SVGID_7_);" points="4.8,15.3 7.4,17.9 11.3,14 8.7,11.4 "/>
+<path style="fill:#FFFFFF;" d="M9,11.6C8.7,11.8,8.7,12,8.7,12s-0.4-0.1-0.6,0.4c-0.1,0.4,0.3,0.5,0.3,0.5s0,0-0.1,0.1
+	c0,0.1,0.1,0.1,0.1,0.1s-0.2,0.1-0.1,0.4c0.1,0.3,0.3,0.3,0.3,0.3s-0.1,0.5,0.4,0.6c0.4,0.1,0.5-0.3,0.5-0.3s0.3,0,0.6-0.2
+	c0.3-0.2,0.4-0.5,0.4-0.5s0.1,0,0.2,0L9,11.6z"/>
+<path style="fill:#FFFFFF;" d="M7.9,14.5c0,0-0.1,0-0.2,0.1c0,0.1,0.1,0.2,0.1,0.2s0,0,0,0c0,0,0,0,0,0s-0.1,0,0,0.1
+	C7.8,15,7.9,15,7.9,15s0,0.1,0.1,0.2c0.1,0,0.1-0.1,0.1-0.1s0.1,0,0.2,0c0.1-0.1,0.1-0.1,0.1-0.1s0.1,0,0.1-0.1c0-0.1,0-0.2,0-0.2
+	s0.2,0,0.1-0.2c-0.1-0.1-0.2,0-0.2,0s-0.1-0.1-0.1-0.1c-0.1,0-0.1,0.1-0.1,0.1s0,0,0,0c0,0-0.1,0-0.1,0S8,14.3,7.9,14.3
+	C7.8,14.4,7.9,14.5,7.9,14.5z"/>
+<path style="fill:#FFFFFF;" d="M19.6,8.4l-5.5,5.5l-0.7-0.7l5.5-5.5L19.6,8.4z M17.5,6.3L12,11.8l0.7,0.7L18.2,7L17.5,6.3z
+	 M16.1,4.9l-5.5,5.5l0.7,0.7l5.5-5.5L16.1,4.9z"/>
+<ellipse style="fill:#FFFFFF;" cx="19.7" cy="4.3" rx="1.3" ry="1.3"/>
+</svg>
diff --git a/src/assets/img/mod_legacy/lesson.svg b/src/assets/img/mod_legacy/lesson.svg
new file mode 100644
index 000000000..0a0e5dfd5
--- /dev/null
+++ b/src/assets/img/mod_legacy/lesson.svg
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" style="overflow:visible;enable-background:new 0 0 24 24;"
+	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<defs>
+</defs>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5.5" y1="10" x2="5.5" y2="14.0005">
+	<stop  offset="0" style="stop-color:#95BFF8"/>
+	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
+	<stop  offset="1" style="stop-color:#7CA4EB"/>
+	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
+	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
+	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
+</linearGradient>
+<rect x="5" y="10" style="fill:url(#SVGID_1_);" width="1" height="4"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="15" y1="5" x2="15" y2="9">
+	<stop  offset="0" style="stop-color:#95BFF8"/>
+	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
+	<stop  offset="1" style="stop-color:#7CA4EB"/>
+	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
+	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
+	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
+</linearGradient>
+<polygon style="fill:url(#SVGID_2_);" points="18,5 11,5 11,6 18,6 18,9 19,9 19,6 19,5 "/>
+<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="5.5" y1="14" x2="5.5" y2="24">
+	<stop  offset="0" style="stop-color:#76A1F0"/>
+	<stop  offset="1" style="stop-color:#6B90D5"/>
+	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
+	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
+</linearGradient>
+<path style="fill:url(#SVGID_3_);" d="M10,14H1c-0.6,0-1,0.4-1,1v1v7v1h1h9h1v-1v-7v-1C11,14.4,10.6,14,10,14z"/>
+<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="5.5" y1="17" x2="5.5" y2="23">
+	<stop  offset="0" style="stop-color:#E7F4FC"/>
+	<stop  offset="1" style="stop-color:#DEEFFC"/>
+	<a:midPointStop  offset="0" style="stop-color:#E7F4FC"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#E7F4FC"/>
+	<a:midPointStop  offset="1" style="stop-color:#DEEFFC"/>
+</linearGradient>
+<rect x="1" y="17" style="fill:url(#SVGID_4_);" width="9" height="6"/>
+<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="5.5" y1="18" x2="5.5" y2="22">
+	<stop  offset="0" style="stop-color:#CEE9F9"/>
+	<stop  offset="1" style="stop-color:#BBDFF8"/>
+	<a:midPointStop  offset="0" style="stop-color:#CEE9F9"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#CEE9F9"/>
+	<a:midPointStop  offset="1" style="stop-color:#BBDFF8"/>
+</linearGradient>
+<rect x="2" y="18" style="fill:url(#SVGID_5_);" width="7" height="4"/>
+<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="5.5" y1="15" x2="5.5" y2="16">
+	<stop  offset="0" style="stop-color:#BBE0F7"/>
+	<stop  offset="1" style="stop-color:#82B4FB"/>
+	<a:midPointStop  offset="0" style="stop-color:#BBE0F7"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#BBE0F7"/>
+	<a:midPointStop  offset="1" style="stop-color:#82B4FB"/>
+</linearGradient>
+<rect x="1" y="15" style="fill:url(#SVGID_6_);" width="9" height="1"/>
+<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="18.5" y1="9" x2="18.5" y2="19.0005">
+	<stop  offset="0" style="stop-color:#76A1F0"/>
+	<stop  offset="1" style="stop-color:#6B90D5"/>
+	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
+	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
+</linearGradient>
+<path style="fill:url(#SVGID_7_);" d="M23,9h-9c-0.6,0-1,0.4-1,1v1v7v1h1h9h1v-1v-7v-1C24,9.4,23.6,9,23,9z"/>
+<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="18.5" y1="12" x2="18.5" y2="18.0005">
+	<stop  offset="0" style="stop-color:#E7F4FC"/>
+	<stop  offset="1" style="stop-color:#DEEFFC"/>
+	<a:midPointStop  offset="0" style="stop-color:#E7F4FC"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#E7F4FC"/>
+	<a:midPointStop  offset="1" style="stop-color:#DEEFFC"/>
+</linearGradient>
+<rect x="14" y="12" style="fill:url(#SVGID_8_);" width="9" height="6"/>
+<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="18.5" y1="13" x2="18.5" y2="17.0005">
+	<stop  offset="0" style="stop-color:#CEE9F9"/>
+	<stop  offset="1" style="stop-color:#BBDFF8"/>
+	<a:midPointStop  offset="0" style="stop-color:#CEE9F9"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#CEE9F9"/>
+	<a:midPointStop  offset="1" style="stop-color:#BBDFF8"/>
+</linearGradient>
+<rect x="15" y="13" style="fill:url(#SVGID_9_);" width="7" height="4"/>
+<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="18.5" y1="10" x2="18.5" y2="11">
+	<stop  offset="0" style="stop-color:#BBE0F7"/>
+	<stop  offset="1" style="stop-color:#82B4FB"/>
+	<a:midPointStop  offset="0" style="stop-color:#BBE0F7"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#BBE0F7"/>
+	<a:midPointStop  offset="1" style="stop-color:#82B4FB"/>
+</linearGradient>
+<rect x="14" y="10" style="fill:url(#SVGID_10_);" width="9" height="1"/>
+<linearGradient id="SVGID_11_" gradientUnits="userSpaceOnUse" x1="5.5" y1="0" x2="5.5" y2="10">
+	<stop  offset="0" style="stop-color:#76A1F0"/>
+	<stop  offset="1" style="stop-color:#6B90D5"/>
+	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
+	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
+</linearGradient>
+<path style="fill:url(#SVGID_11_);" d="M10,0H1C0.4,0,0,0.4,0,1v1v7v1h1h9h1V9V2V1C11,0.4,10.6,0,10,0z"/>
+<linearGradient id="SVGID_12_" gradientUnits="userSpaceOnUse" x1="5.5" y1="3" x2="5.5" y2="9">
+	<stop  offset="0" style="stop-color:#E7F4FC"/>
+	<stop  offset="1" style="stop-color:#DEEFFC"/>
+	<a:midPointStop  offset="0" style="stop-color:#E7F4FC"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#E7F4FC"/>
+	<a:midPointStop  offset="1" style="stop-color:#DEEFFC"/>
+</linearGradient>
+<rect x="1" y="3" style="fill:url(#SVGID_12_);" width="9" height="6"/>
+<linearGradient id="SVGID_13_" gradientUnits="userSpaceOnUse" x1="5.5" y1="4" x2="5.5" y2="8">
+	<stop  offset="0" style="stop-color:#CEE9F9"/>
+	<stop  offset="1" style="stop-color:#BBDFF8"/>
+	<a:midPointStop  offset="0" style="stop-color:#CEE9F9"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#CEE9F9"/>
+	<a:midPointStop  offset="1" style="stop-color:#BBDFF8"/>
+</linearGradient>
+<rect x="2" y="4" style="fill:url(#SVGID_13_);" width="7" height="4"/>
+<linearGradient id="SVGID_14_" gradientUnits="userSpaceOnUse" x1="5.5" y1="1" x2="5.5" y2="2">
+	<stop  offset="0" style="stop-color:#BBE0F7"/>
+	<stop  offset="1" style="stop-color:#82B4FB"/>
+	<a:midPointStop  offset="0" style="stop-color:#BBE0F7"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#BBE0F7"/>
+	<a:midPointStop  offset="1" style="stop-color:#82B4FB"/>
+</linearGradient>
+<rect x="1" y="1" style="fill:url(#SVGID_14_);" width="9" height="1"/>
+</svg>
diff --git a/src/assets/img/mod_legacy/lti.svg b/src/assets/img/mod_legacy/lti.svg
new file mode 100644
index 000000000..ebbbe3084
--- /dev/null
+++ b/src/assets/img/mod_legacy/lti.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" style="overflow:visible;enable-background:new 0 0 24 24;"
+	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<defs>
+</defs>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="0" x2="11.9995" y2="24.001">
+	<stop  offset="0" style="stop-color:#90C50E"/>
+	<stop  offset="1" style="stop-color:#70A034"/>
+	<a:midPointStop  offset="0" style="stop-color:#90C50E"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#90C50E"/>
+	<a:midPointStop  offset="1" style="stop-color:#70A034"/>
+</linearGradient>
+<path style="fill:url(#SVGID_1_);" d="M21.1,12.3c1,0,1.7,0.9,1.7,0.9c0.3,0.4,0.7,0.8,0.9,0.8s0.3-0.5,0.3-1V8c0-0.5-0.5-1-1-1h-3
+	c-0.5,0-1-0.1-1-0.3c0-0.2,0.3-0.7,0.7-1.1c0,0,0.8-0.9,0.8-2.1C20.5,1.6,18.9,0,17,0s-3.5,1.6-3.5,3.5c0,1.2,0.8,2.1,0.8,2.1
+	C14.7,6,15,6.5,15,6.7C15,6.9,14.5,7,14,7H8C7.5,7,7,7.5,7,8v6c0,0.5-0.1,1-0.3,1S6,14.7,5.6,14.3c0,0-0.9-0.8-2.1-0.8
+	C1.6,13.5,0,15.1,0,17s1.6,3.5,3.5,3.5c1.2,0,2.1-0.8,2.1-0.8C6,19.3,6.5,19,6.7,19S7,19.5,7,20v3c0,0.5,0.5,1,1,1h4
+	c0.5,0,1-0.1,1-0.3s-0.3-0.6-0.7-1c0,0-0.6-0.6-0.6-1.6c0-1.4,1.3-2.5,2.7-2.5c1.4,0,2.4,1.1,2.4,2.5c0,1-0.9,1.7-0.9,1.7
+	c-0.4,0.3-0.8,0.7-0.8,0.9s0.5,0.3,1,0.3h7c0.5,0,1-0.5,1-1v-6c0-0.5-0.1-1-0.3-1s-0.6,0.3-1,0.7c0,0-0.6,0.6-1.6,0.6
+	c-1.4,0-2.5-1.3-2.5-2.7S19.7,12.3,21.1,12.3z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="1" x2="11.9995" y2="23.001">
+	<stop  offset="0" style="stop-color:#D9F991"/>
+	<stop  offset="0.2388" style="stop-color:#D7F88D"/>
+	<stop  offset="0.4501" style="stop-color:#D1F383"/>
+	<stop  offset="0.6509" style="stop-color:#C6EC71"/>
+	<stop  offset="0.844" style="stop-color:#B7E257"/>
+	<stop  offset="1" style="stop-color:#A8D73D"/>
+	<a:midPointStop  offset="0" style="stop-color:#D9F991"/>
+	<a:midPointStop  offset="0.7317" style="stop-color:#D9F991"/>
+	<a:midPointStop  offset="1" style="stop-color:#A8D73D"/>
+</linearGradient>
+<path style="fill:url(#SVGID_2_);" d="M17,23c0.4-0.4,0.7-1.1,0.7-1.9c0-2-1.5-3.5-3.4-3.5c-2,0-3.7,1.6-3.7,3.5
+	c0,0.9,0.3,1.5,0.6,1.9H8v-3c0-1.5-0.7-2-1.3-2c-0.6,0-1.3,0.6-1.7,0.9c0,0-0.7,0.6-1.5,0.6C2.1,19.5,1,18.4,1,17s1.1-2.5,2.5-2.5
+	c0.8,0,1.4,0.6,1.5,0.6C5.3,15.4,6.1,16,6.7,16C7.3,16,8,15.5,8,14V8h6c1.5,0,2-0.7,2-1.3c0-0.6-0.5-1.3-0.9-1.7
+	c0,0-0.6-0.7-0.6-1.5C14.5,2.1,15.6,1,17,1s2.5,1.1,2.5,2.5c0,0.8-0.6,1.5-0.6,1.5C18.5,5.4,18,6.1,18,6.7C18,7.3,18.5,8,20,8h3v4
+	c-0.4-0.4-1.1-0.7-1.9-0.7c-2,0-3.5,1.5-3.5,3.4c0,2,1.6,3.7,3.5,3.7c0.9,0,1.5-0.3,1.9-0.6V23H17z"/>
+<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="2" x2="11.9995" y2="22.001">
+	<stop  offset="0" style="stop-color:#B3E810"/>
+	<stop  offset="1" style="stop-color:#90C60D"/>
+	<a:midPointStop  offset="0" style="stop-color:#B3E810"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#B3E810"/>
+	<a:midPointStop  offset="1" style="stop-color:#90C60D"/>
+</linearGradient>
+<path style="fill:url(#SVGID_3_);" d="M18.6,22c0.1-0.3,0.1-0.6,0.1-0.9c0-2.5-1.9-4.5-4.4-4.5c-2.5,0-4.7,2.1-4.7,4.5
+	c0,0.3,0,0.6,0.1,0.9H9v-2c0-2.1-1.2-3-2.3-3C7.8,17,9,16.1,9,14V9h5c2.1,0,3-1.2,3-2.3c0-0.7-0.4-1.5-1.2-2.4
+	c-0.1-0.1-0.3-0.5-0.3-0.8C15.5,2.7,16.2,2,17,2s1.5,0.7,1.5,1.5c0,0.3-0.3,0.7-0.3,0.8C17.4,5.2,17,6,17,6.7C17,7.8,17.9,9,20,9h2
+	v1.4c-0.3-0.1-0.6-0.1-0.9-0.1c-2.5,0-4.5,1.9-4.5,4.4c0,2.5,2.1,4.7,4.5,4.7c0.3,0,0.6,0,0.9-0.1V22H18.6z M3.5,18.5
+	C2.7,18.5,2,17.8,2,17s0.7-1.5,1.5-1.5c0.3,0,0.7,0.3,0.8,0.3C5.2,16.6,6,17,6.7,17c-0.7,0-1.5,0.4-2.4,1.2
+	C4.2,18.3,3.8,18.5,3.5,18.5z"/>
+</svg>
diff --git a/src/assets/img/mod_legacy/page.svg b/src/assets/img/mod_legacy/page.svg
new file mode 100644
index 000000000..eb7cae6c8
--- /dev/null
+++ b/src/assets/img/mod_legacy/page.svg
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="24px" height="24px" viewBox="-2 0 24 24" style="overflow:visible;enable-background:new -2 0 24 24;"
+	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<defs>
+</defs>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="9.9995" y1="0" x2="9.9995" y2="24.0005">
+	<stop  offset="0" style="stop-color:#95BFF8"/>
+	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
+	<stop  offset="1" style="stop-color:#7CA4EB"/>
+	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
+	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
+	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
+</linearGradient>
+<polygon style="fill:url(#SVGID_1_);" points="12.5,0 11.5,0 1,0 0,0 0,24 1,24 19,24 20,24 20,7.9 "/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="9.9995" y1="1" x2="9.9995" y2="23.0005">
+	<stop  offset="0" style="stop-color:#E7F4FC"/>
+	<stop  offset="1" style="stop-color:#DEEFFC"/>
+	<a:midPointStop  offset="0" style="stop-color:#E7F4FC"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#E7F4FC"/>
+	<a:midPointStop  offset="1" style="stop-color:#DEEFFC"/>
+</linearGradient>
+<polygon style="fill:url(#SVGID_2_);" points="12.1,1 11.1,1 2,1 1,1 1,23 2,23 18,23 19,23 19,8.3 "/>
+<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="9.9995" y1="2" x2="9.9995" y2="22.0005">
+	<stop  offset="0" style="stop-color:#CEE9F9"/>
+	<stop  offset="1" style="stop-color:#BBDFF8"/>
+	<a:midPointStop  offset="0" style="stop-color:#CEE9F9"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#CEE9F9"/>
+	<a:midPointStop  offset="1" style="stop-color:#BBDFF8"/>
+</linearGradient>
+<polygon style="fill:url(#SVGID_3_);" points="11.6,2 10.6,2 3,2 2,2 2,22 3,22 17,22 18,22 18,8.7 "/>
+<path style="fill:#FFFFFF;" d="M16,21H4v-1h12V21z M16,18H4v1h12V18z M16,16H4v1h12V16z M16,14H4v1h12V14z"/>
+<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="9.9995" y1="4" x2="9.9995" y2="12">
+	<stop  offset="0" style="stop-color:#76A1F0"/>
+	<stop  offset="1" style="stop-color:#6B90D5"/>
+	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
+	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
+</linearGradient>
+<polygon style="fill:url(#SVGID_4_);" points="15.3,4 14.3,4 4,4 3,4 3,12 4,12 16,12 17,12 17,5.8 "/>
+<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="9.9995" y1="9" x2="9.9995" y2="11">
+	<stop  offset="0" style="stop-color:#57C3F6"/>
+	<stop  offset="0.1648" style="stop-color:#83D3F8"/>
+	<stop  offset="0.3554" style="stop-color:#AFE3FB"/>
+	<stop  offset="0.5396" style="stop-color:#D2EFFD"/>
+	<stop  offset="0.7128" style="stop-color:#EBF8FE"/>
+	<stop  offset="0.8709" style="stop-color:#FAFDFF"/>
+	<stop  offset="1" style="stop-color:#FFFFFF"/>
+	<a:midPointStop  offset="0" style="stop-color:#57C3F6"/>
+	<a:midPointStop  offset="0.3354" style="stop-color:#57C3F6"/>
+	<a:midPointStop  offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+<rect x="4" y="9" style="fill:url(#SVGID_5_);" width="12" height="2"/>
+<path style="fill:#F2EFD5;" d="M12.4,10.9c-0.5-0.2-1.1-0.3-2.7-0.4c-1.5-0.1-0.9-0.4-2-0.8C6.7,9.2,4,9.4,4,9.4V11h8.6
+	C12.6,11,12.5,10.9,12.4,10.9z"/>
+<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="4" y1="10.2476" x2="12.2959" y2="10.2476">
+	<stop  offset="0" style="stop-color:#F8E5B5"/>
+	<stop  offset="1" style="stop-color:#F9E5B6"/>
+	<a:midPointStop  offset="0" style="stop-color:#F8E5B5"/>
+	<a:midPointStop  offset="0.4451" style="stop-color:#F8E5B5"/>
+	<a:midPointStop  offset="1" style="stop-color:#F9E5B6"/>
+</linearGradient>
+<path style="fill:url(#SVGID_6_);" d="M9.7,10.7c-1.5-0.1-0.9-0.6-2-1c-1-0.4-3.7,0-3.7,0V11h8.3C11.5,11,11.2,10.8,9.7,10.7z"/>
+<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="12.5342" y1="1.5674" x2="8.163" y2="10.9413">
+	<stop  offset="0" style="stop-color:#57C3F6"/>
+	<stop  offset="0.2292" style="stop-color:#8AD5F9"/>
+	<stop  offset="0.4827" style="stop-color:#BCE7FB"/>
+	<stop  offset="0.705" style="stop-color:#E1F4FD"/>
+	<stop  offset="0.885" style="stop-color:#F7FCFF"/>
+	<stop  offset="1" style="stop-color:#FFFFFF"/>
+	<a:midPointStop  offset="0" style="stop-color:#57C3F6"/>
+	<a:midPointStop  offset="0.3902" style="stop-color:#57C3F6"/>
+	<a:midPointStop  offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+<rect x="4" y="5" style="fill:url(#SVGID_7_);" width="12" height="4"/>
+<path style="fill:#FFFFFF;" d="M11.2,5.6c0,0-0.2-0.4-0.7-0.2c-0.4,0.3-0.1,0.7-0.1,0.7s-0.1,0-0.1,0c-0.1,0,0,0.2,0,0.2
+	s-0.3,0-0.4,0.2C9.6,6.9,9.8,7,9.8,7S9.3,7.4,9.6,7.8c0.3,0.4,0.6,0.1,0.6,0.1s0.2,0.3,0.6,0.3c0.4,0.1,0.6-0.1,0.6-0.1
+	s0.3,0.2,0.5,0.1C12.4,8.2,12.5,8,12.5,8s0.6,0.3,0.8-0.3C13.4,7.3,13,7.1,13,7.1s0.1-0.4-0.2-0.6s-0.6,0-0.6,0s0.1,0,0-0.1
+	c0-0.1-0.3-0.1-0.3-0.1s0.1-0.6-0.2-0.8C11.4,5.3,11.2,5.6,11.2,5.6z"/>
+<path style="fill:#FFFFFF;" d="M8.6,6.9c0,0-0.1-0.1-0.2,0C8.3,6.9,8.4,7,8.4,7s0,0,0,0c0,0,0,0,0,0s-0.1,0-0.1,0.1
+	c0,0.1,0,0.1,0,0.1s-0.1,0.1,0,0.2c0.1,0.1,0.2,0,0.2,0s0.1,0.1,0.2,0.1c0.1,0,0.2,0,0.2,0s0.1,0.1,0.2,0C9,7.6,9,7.6,9,7.6
+	s0.2,0.1,0.2-0.1c0-0.1-0.1-0.2-0.1-0.2s0-0.1-0.1-0.2c-0.1,0-0.2,0-0.2,0s0,0,0,0s-0.1,0-0.1,0s0-0.2-0.1-0.2
+	C8.7,6.8,8.6,6.9,8.6,6.9z"/>
+<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="15.2451" y1="0" x2="15.2451" y2="9.3594">
+	<stop  offset="0" style="stop-color:#95BFF8"/>
+	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
+	<stop  offset="1" style="stop-color:#7CA4EB"/>
+	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
+	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
+	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
+</linearGradient>
+<path style="fill:url(#SVGID_8_);" d="M11,9c0,0,5.2-1.5,9,0.4c0-0.1,0-1.5,0-1.5L12.5,0c0,0-1.8,0-2,0C13.1,3.7,11,9,11,9z"/>
+<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="12.3223" y1="7.5449" x2="15.4504" y2="4.4168">
+	<stop  offset="0" style="stop-color:#E7F4FC"/>
+	<stop  offset="0.5181" style="stop-color:#E5F3FC"/>
+	<stop  offset="0.7045" style="stop-color:#DEF0FB"/>
+	<stop  offset="0.8371" style="stop-color:#D3EBFA"/>
+	<stop  offset="0.872" style="stop-color:#CEE9F9"/>
+	<stop  offset="1" style="stop-color:#BDD8F0"/>
+	<a:midPointStop  offset="0" style="stop-color:#E7F4FC"/>
+	<a:midPointStop  offset="0.87" style="stop-color:#E7F4FC"/>
+	<a:midPointStop  offset="0.872" style="stop-color:#CEE9F9"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#CEE9F9"/>
+	<a:midPointStop  offset="1" style="stop-color:#BDD8F0"/>
+</linearGradient>
+<path style="fill:url(#SVGID_9_);" d="M18.5,7.8c-0.9-0.2-2-0.3-3.1-0.3c-1.1,0-2.1,0.1-3,0.3c0.4-1.6,0.7-4.1-0.2-6.4L18.5,7.8z"/>
+</svg>
diff --git a/src/assets/img/mod_legacy/quiz.svg b/src/assets/img/mod_legacy/quiz.svg
new file mode 100644
index 000000000..90473416f
--- /dev/null
+++ b/src/assets/img/mod_legacy/quiz.svg
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" style="overflow:visible;enable-background:new 0 0 24 24;"
+	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<defs>
+</defs>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="11.9565" y1="0" x2="11.9565" y2="24.0005">
+	<stop  offset="0" style="stop-color:#95BFF8"/>
+	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
+	<stop  offset="1" style="stop-color:#7CA4EB"/>
+	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
+	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
+	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
+</linearGradient>
+<polygon style="fill:url(#SVGID_1_);" points="14.4,0 13.4,0 3,0 2,0 2,24 3,24 21,24 22,24 22,7.9 "/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="11.9565" y1="1" x2="11.9565" y2="23.0005">
+	<stop  offset="0" style="stop-color:#E7F4FC"/>
+	<stop  offset="1" style="stop-color:#DEEFFC"/>
+	<a:midPointStop  offset="0" style="stop-color:#E7F4FC"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#E7F4FC"/>
+	<a:midPointStop  offset="1" style="stop-color:#DEEFFC"/>
+</linearGradient>
+<polygon style="fill:url(#SVGID_2_);" points="14,1 13,1 4,1 3,1 3,23 4,23 20,23 21,23 21,8.3 "/>
+<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="11.9565" y1="2" x2="11.9565" y2="22.0005">
+	<stop  offset="0" style="stop-color:#CEE9F9"/>
+	<stop  offset="1" style="stop-color:#BBDFF8"/>
+	<a:midPointStop  offset="0" style="stop-color:#CEE9F9"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#CEE9F9"/>
+	<a:midPointStop  offset="1" style="stop-color:#BBDFF8"/>
+</linearGradient>
+<polygon style="fill:url(#SVGID_3_);" points="13.6,2 12.6,2 5,2 4,2 4,22 5,22 19,22 20,22 20,8.7 "/>
+<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="17.2021" y1="0" x2="17.2021" y2="9.3594">
+	<stop  offset="0" style="stop-color:#95BFF8"/>
+	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
+	<stop  offset="1" style="stop-color:#7CA4EB"/>
+	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
+	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
+	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
+</linearGradient>
+<path style="fill:url(#SVGID_4_);" d="M13,9c0,0,5.2-1.5,9,0.4c0-0.1,0-1.5,0-1.5L14.4,0c0,0-1.8,0-2,0C15.1,3.7,13,9,13,9z"/>
+<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="14.2793" y1="7.5449" x2="17.4074" y2="4.4168">
+	<stop  offset="0" style="stop-color:#E7F4FC"/>
+	<stop  offset="0.5181" style="stop-color:#E5F3FC"/>
+	<stop  offset="0.7045" style="stop-color:#DEF0FB"/>
+	<stop  offset="0.8371" style="stop-color:#D3EBFA"/>
+	<stop  offset="0.872" style="stop-color:#CEE9F9"/>
+	<stop  offset="1" style="stop-color:#BDD8F0"/>
+	<a:midPointStop  offset="0" style="stop-color:#E7F4FC"/>
+	<a:midPointStop  offset="0.87" style="stop-color:#E7F4FC"/>
+	<a:midPointStop  offset="0.872" style="stop-color:#CEE9F9"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#CEE9F9"/>
+	<a:midPointStop  offset="1" style="stop-color:#BDD8F0"/>
+</linearGradient>
+<path style="fill:url(#SVGID_5_);" d="M20.4,7.8c-0.9-0.2-2-0.3-3.1-0.3c-1.1,0-2.1,0.1-3,0.3c0.4-1.6,0.7-4.1-0.2-6.4L20.4,7.8z"/>
+<g>
+	<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="11.8569" y1="1.8521" x2="11.8569" y2="23.9487">
+		<stop  offset="0" style="stop-color:#DB6D17"/>
+		<stop  offset="1" style="stop-color:#BF3B08"/>
+		<a:midPointStop  offset="0" style="stop-color:#DB6D17"/>
+		<a:midPointStop  offset="0.5" style="stop-color:#DB6D17"/>
+		<a:midPointStop  offset="1" style="stop-color:#BF3B08"/>
+	</linearGradient>
+	<polygon style="fill:url(#SVGID_6_);" points="8,16.9 3.2,11.9 0,15.1 8.8,23.9 23.7,1.9 	"/>
+</g>
+<g>
+	<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="9.5522" y1="9.0078" x2="9.5522" y2="22.3833">
+		<stop  offset="0" style="stop-color:#F6A55E"/>
+		<stop  offset="1" style="stop-color:#EA5B03"/>
+		<a:midPointStop  offset="0" style="stop-color:#F6A55E"/>
+		<a:midPointStop  offset="0.5" style="stop-color:#F6A55E"/>
+		<a:midPointStop  offset="1" style="stop-color:#EA5B03"/>
+	</linearGradient>
+	<polygon style="fill:url(#SVGID_7_);" points="1.4,15.1 3.2,13.4 7.9,18.4 17.7,9 8.7,22.4 	"/>
+</g>
+<g>
+	<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="7.2485" y1="14.7998" x2="7.2485" y2="20.8174">
+		<stop  offset="0" style="stop-color:#F17219"/>
+		<stop  offset="1" style="stop-color:#EA5B03"/>
+		<a:midPointStop  offset="0" style="stop-color:#F17219"/>
+		<a:midPointStop  offset="0.5" style="stop-color:#F17219"/>
+		<a:midPointStop  offset="1" style="stop-color:#EA5B03"/>
+	</linearGradient>
+	<polygon style="fill:url(#SVGID_8_);" points="2.8,15.1 3.1,14.8 7.9,19.8 11.7,16.2 8.5,20.8 	"/>
+</g>
+</svg>
diff --git a/src/assets/img/mod/file.svg b/src/assets/img/mod_legacy/resource.svg
similarity index 100%
rename from src/assets/img/mod/file.svg
rename to src/assets/img/mod_legacy/resource.svg
diff --git a/src/assets/img/mod_legacy/scorm.svg b/src/assets/img/mod_legacy/scorm.svg
new file mode 100644
index 000000000..77891eca4
--- /dev/null
+++ b/src/assets/img/mod_legacy/scorm.svg
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="24px" height="24px" viewBox="0 -2 24 24" style="overflow:visible;enable-background:new 0 -2 24 24;"
+	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<defs>
+</defs>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="0" x2="11.9995" y2="20.0005">
+	<stop  offset="0" style="stop-color:#F0A829"/>
+	<stop  offset="1" style="stop-color:#C7671A"/>
+	<a:midPointStop  offset="0" style="stop-color:#F0A829"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#F0A829"/>
+	<a:midPointStop  offset="1" style="stop-color:#C7671A"/>
+</linearGradient>
+<rect x="1" style="fill:url(#SVGID_1_);" width="22" height="20"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="1" x2="11.9995" y2="19.0005">
+	<stop  offset="0" style="stop-color:#FFEBA8"/>
+	<stop  offset="1" style="stop-color:#F8BE27"/>
+	<a:midPointStop  offset="0" style="stop-color:#FFEBA8"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#FFEBA8"/>
+	<a:midPointStop  offset="1" style="stop-color:#F8BE27"/>
+</linearGradient>
+<rect x="2" y="1" style="fill:url(#SVGID_2_);" width="20" height="18"/>
+<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="2" x2="11.9995" y2="18.0005">
+	<stop  offset="0" style="stop-color:#FFC30F"/>
+	<stop  offset="1" style="stop-color:#F5AE0D"/>
+	<a:midPointStop  offset="0" style="stop-color:#FFC30F"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#FFC30F"/>
+	<a:midPointStop  offset="1" style="stop-color:#F5AE0D"/>
+</linearGradient>
+<rect x="3" y="2" style="fill:url(#SVGID_3_);" width="18" height="16"/>
+<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="0" x2="11.9995" y2="7">
+	<stop  offset="0" style="stop-color:#F0A829"/>
+	<stop  offset="1" style="stop-color:#C7671A"/>
+	<a:midPointStop  offset="0" style="stop-color:#F0A829"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#F0A829"/>
+	<a:midPointStop  offset="1" style="stop-color:#C7671A"/>
+</linearGradient>
+<rect style="fill:url(#SVGID_4_);" width="24" height="7"/>
+<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="1" x2="11.9995" y2="6">
+	<stop  offset="0" style="stop-color:#FFEBA8"/>
+	<stop  offset="1" style="stop-color:#F8BE27"/>
+	<a:midPointStop  offset="0" style="stop-color:#FFEBA8"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#FFEBA8"/>
+	<a:midPointStop  offset="1" style="stop-color:#F8BE27"/>
+</linearGradient>
+<rect x="1" y="1" style="fill:url(#SVGID_5_);" width="22" height="5"/>
+<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="2" x2="11.9995" y2="5">
+	<stop  offset="0" style="stop-color:#FFC30F"/>
+	<stop  offset="1" style="stop-color:#F5AE0D"/>
+	<a:midPointStop  offset="0" style="stop-color:#FFC30F"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#FFC30F"/>
+	<a:midPointStop  offset="1" style="stop-color:#F5AE0D"/>
+</linearGradient>
+<rect x="2" y="2" style="fill:url(#SVGID_6_);" width="20" height="3"/>
+<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="11.4995" y1="0" x2="11.4995" y2="13.0005">
+	<stop  offset="0" style="stop-color:#8D470D"/>
+	<stop  offset="1" style="stop-color:#7C3D09"/>
+	<a:midPointStop  offset="0" style="stop-color:#8D470D"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#8D470D"/>
+	<a:midPointStop  offset="1" style="stop-color:#7C3D09"/>
+</linearGradient>
+<polygon style="fill:url(#SVGID_7_);" points="9,0 9,3 9,10 9,13 11.5,11 14,13 14,10 14,3 14,0 "/>
+<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="11.4995" y1="1" x2="11.4995" y2="10.9355">
+	<stop  offset="0" style="stop-color:#D58738"/>
+	<stop  offset="1" style="stop-color:#AB551F"/>
+	<a:midPointStop  offset="0" style="stop-color:#D58738"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#D58738"/>
+	<a:midPointStop  offset="1" style="stop-color:#AB551F"/>
+</linearGradient>
+<polygon style="fill:url(#SVGID_8_);" points="10,1 10,4 10,7.9 10,10.9 11.5,9.7 13,10.9 13,7.9 13,4 13,1 "/>
+<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="11.5" y1="2" x2="11.5" y2="8.8711">
+	<stop  offset="0" style="stop-color:#D0813A"/>
+	<stop  offset="1" style="stop-color:#AF551D"/>
+	<a:midPointStop  offset="0" style="stop-color:#D0813A"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#D0813A"/>
+	<a:midPointStop  offset="1" style="stop-color:#AF551D"/>
+</linearGradient>
+<polygon style="fill:url(#SVGID_9_);" points="11,2 11,5 11,5.8 11,8.8 11.5,8.4 12,8.9 12,5.9 12,5 12,2 "/>
+</svg>
diff --git a/src/assets/img/mod_legacy/survey.svg b/src/assets/img/mod_legacy/survey.svg
new file mode 100644
index 000000000..a97fe77ef
--- /dev/null
+++ b/src/assets/img/mod_legacy/survey.svg
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" style="overflow:visible;enable-background:new 0 0 24 24;"
+	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<defs>
+</defs>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="20" y1="8" x2="20" y2="24.0005">
+	<stop  offset="0" style="stop-color:#76A1F0"/>
+	<stop  offset="1" style="stop-color:#6B90D5"/>
+	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
+	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
+</linearGradient>
+<rect x="16" y="8" style="fill:url(#SVGID_1_);" width="8" height="16"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="20" y1="9" x2="20" y2="23.0005">
+	<stop  offset="0" style="stop-color:#BBE0F7"/>
+	<stop  offset="1" style="stop-color:#82B4FB"/>
+	<a:midPointStop  offset="0" style="stop-color:#BBE0F7"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#BBE0F7"/>
+	<a:midPointStop  offset="1" style="stop-color:#82B4FB"/>
+</linearGradient>
+<rect x="17" y="9" style="fill:url(#SVGID_2_);" width="6" height="14"/>
+<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="20" y1="10" x2="20" y2="22.0005">
+	<stop  offset="0" style="stop-color:#95BFF8"/>
+	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
+	<stop  offset="1" style="stop-color:#7CA4EB"/>
+	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
+	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
+	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
+</linearGradient>
+<rect x="18" y="10" style="fill:url(#SVGID_3_);" width="4" height="12"/>
+<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="0" x2="11.9995" y2="24.0005">
+	<stop  offset="0" style="stop-color:#90C50E"/>
+	<stop  offset="1" style="stop-color:#70A034"/>
+	<a:midPointStop  offset="0" style="stop-color:#90C50E"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#90C50E"/>
+	<a:midPointStop  offset="1" style="stop-color:#70A034"/>
+</linearGradient>
+<rect x="8" style="fill:url(#SVGID_4_);" width="8" height="24"/>
+<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="1" x2="11.9995" y2="23.0005">
+	<stop  offset="0" style="stop-color:#D9F991"/>
+	<stop  offset="0.2388" style="stop-color:#D7F88D"/>
+	<stop  offset="0.4501" style="stop-color:#D1F383"/>
+	<stop  offset="0.6509" style="stop-color:#C6EC71"/>
+	<stop  offset="0.844" style="stop-color:#B7E257"/>
+	<stop  offset="1" style="stop-color:#A8D73D"/>
+	<a:midPointStop  offset="0" style="stop-color:#D9F991"/>
+	<a:midPointStop  offset="0.7317" style="stop-color:#D9F991"/>
+	<a:midPointStop  offset="1" style="stop-color:#A8D73D"/>
+</linearGradient>
+<rect x="9" y="1" style="fill:url(#SVGID_5_);" width="6" height="22"/>
+<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="2" x2="11.9995" y2="22.0005">
+	<stop  offset="0" style="stop-color:#B3E810"/>
+	<stop  offset="1" style="stop-color:#90C60D"/>
+	<a:midPointStop  offset="0" style="stop-color:#B3E810"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#B3E810"/>
+	<a:midPointStop  offset="1" style="stop-color:#90C60D"/>
+</linearGradient>
+<rect x="10" y="2" style="fill:url(#SVGID_6_);" width="4" height="20"/>
+<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="4" y1="12" x2="4" y2="24.0005">
+	<stop  offset="0" style="stop-color:#F0A829"/>
+	<stop  offset="1" style="stop-color:#C7671A"/>
+	<a:midPointStop  offset="0" style="stop-color:#F0A829"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#F0A829"/>
+	<a:midPointStop  offset="1" style="stop-color:#C7671A"/>
+</linearGradient>
+<rect y="12" style="fill:url(#SVGID_7_);" width="8" height="12"/>
+<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="4" y1="13" x2="4" y2="23.0005">
+	<stop  offset="0" style="stop-color:#FFEBA8"/>
+	<stop  offset="1" style="stop-color:#F8BE27"/>
+	<a:midPointStop  offset="0" style="stop-color:#FFEBA8"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#FFEBA8"/>
+	<a:midPointStop  offset="1" style="stop-color:#F8BE27"/>
+</linearGradient>
+<rect x="1" y="13" style="fill:url(#SVGID_8_);" width="6" height="10"/>
+<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="4" y1="14" x2="4" y2="22">
+	<stop  offset="0" style="stop-color:#FFC30F"/>
+	<stop  offset="1" style="stop-color:#F5AE0D"/>
+	<a:midPointStop  offset="0" style="stop-color:#FFC30F"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#FFC30F"/>
+	<a:midPointStop  offset="1" style="stop-color:#F5AE0D"/>
+</linearGradient>
+<rect x="2" y="14" style="fill:url(#SVGID_9_);" width="4" height="8"/>
+</svg>
diff --git a/src/assets/img/mod_legacy/url.svg b/src/assets/img/mod_legacy/url.svg
new file mode 100644
index 000000000..56bdb5541
--- /dev/null
+++ b/src/assets/img/mod_legacy/url.svg
@@ -0,0 +1,485 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" style="overflow:visible;enable-background:new 0 0 24 24;"
+	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<defs>
+</defs>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="11.9653" y1="0" x2="11.9653" y2="24.0005">
+	<stop  offset="0" style="stop-color:#95BFF8"/>
+	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
+	<stop  offset="1" style="stop-color:#7CA4EB"/>
+	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
+	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
+	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
+</linearGradient>
+<polygon style="fill:url(#SVGID_1_);" points="14.4,0 13.4,0 3,0 2,0 2,24 3,24 21,24 22,24 22,7.9 "/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="11.9653" y1="1" x2="11.9653" y2="23.0005">
+	<stop  offset="0" style="stop-color:#E7F4FC"/>
+	<stop  offset="1" style="stop-color:#DEEFFC"/>
+	<a:midPointStop  offset="0" style="stop-color:#E7F4FC"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#E7F4FC"/>
+	<a:midPointStop  offset="1" style="stop-color:#DEEFFC"/>
+</linearGradient>
+<polygon style="fill:url(#SVGID_2_);" points="14,1 13,1 4,1 3,1 3,23 4,23 20,23 21,23 21,8.3 "/>
+<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="11.9653" y1="2" x2="11.9653" y2="22.0005">
+	<stop  offset="0" style="stop-color:#CEE9F9"/>
+	<stop  offset="1" style="stop-color:#BBDFF8"/>
+	<a:midPointStop  offset="0" style="stop-color:#CEE9F9"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#CEE9F9"/>
+	<a:midPointStop  offset="1" style="stop-color:#BBDFF8"/>
+</linearGradient>
+<polygon style="fill:url(#SVGID_3_);" points="13.6,2 12.6,2 5,2 4,2 4,22 5,22 19,22 20,22 20,8.7 "/>
+<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="17.2109" y1="0" x2="17.2109" y2="9.3594">
+	<stop  offset="0" style="stop-color:#95BFF8"/>
+	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
+	<stop  offset="1" style="stop-color:#7CA4EB"/>
+	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
+	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
+	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
+</linearGradient>
+<path style="fill:url(#SVGID_4_);" d="M13,9c0,0,5.2-1.5,9,0.4c0-0.1,0-1.5,0-1.5L14.4,0c0,0-1.8,0-2,0C15.1,3.7,13,9,13,9z"/>
+<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="14.2881" y1="7.5449" x2="17.4162" y2="4.4168">
+	<stop  offset="0" style="stop-color:#E7F4FC"/>
+	<stop  offset="0.5181" style="stop-color:#E5F3FC"/>
+	<stop  offset="0.7045" style="stop-color:#DEF0FB"/>
+	<stop  offset="0.8371" style="stop-color:#D3EBFA"/>
+	<stop  offset="0.872" style="stop-color:#CEE9F9"/>
+	<stop  offset="1" style="stop-color:#BDD8F0"/>
+	<a:midPointStop  offset="0" style="stop-color:#E7F4FC"/>
+	<a:midPointStop  offset="0.87" style="stop-color:#E7F4FC"/>
+	<a:midPointStop  offset="0.872" style="stop-color:#CEE9F9"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#CEE9F9"/>
+	<a:midPointStop  offset="1" style="stop-color:#BDD8F0"/>
+</linearGradient>
+<path style="fill:url(#SVGID_5_);" d="M20.5,7.8c-0.9-0.2-2-0.3-3.1-0.3c-1.1,0-2.1,0.1-3,0.3c0.4-1.6,0.7-4.1-0.2-6.4L20.5,7.8z"/>
+<radialGradient id="SVGID_6_" cx="7.5312" cy="16.5" r="7.0005" gradientUnits="userSpaceOnUse">
+	<stop  offset="0" style="stop-color:#8BB4F0"/>
+	<stop  offset="7.721406e-02" style="stop-color:#88B1EF"/>
+	<stop  offset="0.488" style="stop-color:#7FA7EC"/>
+	<stop  offset="1" style="stop-color:#7CA4EB"/>
+	<a:midPointStop  offset="0" style="stop-color:#8BB4F0"/>
+	<a:midPointStop  offset="0.25" style="stop-color:#8BB4F0"/>
+	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
+</radialGradient>
+<path style="fill:url(#SVGID_6_);" d="M7.5,23.5C0.4,23.2-1.6,15.1,3,11.2c1.8-1.6,3.8-1.7,4.6-1.7c0.4,0,0.8,0,1.1,0.1
+	C9,9.6,9.4,9.7,9.7,9.8c0.3,0.1,0.7,0.3,1,0.4c0.3,0.2,0.6,0.4,0.9,0.6c0.3,0.2,0.6,0.4,0.8,0.7c0.3,0.3,0.5,0.5,0.7,0.8
+	c0.2,0.3,0.4,0.6,0.6,0.9c0.2,0.3,0.3,0.7,0.4,1c0.1,0.3,0.2,0.7,0.3,1.1c0.1,0.4,0.1,0.8,0.1,1.1s0,0.8-0.1,1.1
+	c-0.1,0.4-0.1,0.7-0.3,1.1c-0.1,0.3-0.3,0.7-0.4,1c-0.2,0.3-0.4,0.6-0.6,0.9c-0.2,0.3-0.4,0.6-0.7,0.8c-0.3,0.3-0.5,0.5-0.8,0.7
+	c-0.3,0.2-0.6,0.4-0.9,0.6c-0.3,0.2-0.7,0.3-1,0.4c-0.3,0.1-0.7,0.2-1.1,0.3C8.3,23.5,7.9,23.5,7.5,23.5"/>
+<radialGradient id="SVGID_7_" cx="7.5308" cy="16.5" r="6.4856" gradientUnits="userSpaceOnUse">
+	<stop  offset="0" style="stop-color:#8BB4F0"/>
+	<stop  offset="7.721406e-02" style="stop-color:#88B1EF"/>
+	<stop  offset="0.488" style="stop-color:#7FA7EC"/>
+	<stop  offset="1" style="stop-color:#7CA4EB"/>
+	<a:midPointStop  offset="0" style="stop-color:#8BB4F0"/>
+	<a:midPointStop  offset="0.25" style="stop-color:#8BB4F0"/>
+	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
+</radialGradient>
+<path style="fill:url(#SVGID_7_);" d="M7.5,23C1,22.7-0.9,15.2,3.3,11.6C5,10.1,6.8,10,7.5,10c0.4,0,0.7,0,1.1,0.1
+	c0.3,0.1,0.7,0.1,1,0.2s0.6,0.2,0.9,0.4c0.3,0.2,0.6,0.3,0.9,0.5c0.3,0.2,0.5,0.4,0.8,0.6c0.2,0.2,0.5,0.5,0.6,0.8
+	c0.2,0.3,0.4,0.6,0.5,0.9s0.3,0.6,0.4,0.9s0.2,0.7,0.2,1c0.1,0.3,0.1,0.7,0.1,1.1c0,0.4,0,0.7-0.1,1.1c-0.1,0.3-0.1,0.7-0.2,1
+	s-0.2,0.6-0.4,0.9s-0.3,0.6-0.5,0.9s-0.4,0.5-0.6,0.8s-0.5,0.5-0.8,0.6c-0.3,0.2-0.6,0.4-0.9,0.5c-0.3,0.2-0.6,0.3-0.9,0.4
+	s-0.7,0.2-1,0.2C8.2,23,7.9,23,7.5,23"/>
+<path style="fill:#B3E710;" d="M6.1,10.8L6.1,10.8c0-0.1,0-0.1,0-0.1c0,0,0,0,0,0c0,0,0,0,0,0C6.1,10.7,6,10.7,6.1,10.8
+	c-0.1-0.1-0.1,0-0.2,0C5.9,10.7,6,10.8,6.1,10.8C6,10.8,6.1,10.8,6.1,10.8 M3,13c0,0,2,0,3.6,0c0,0,0.4-0.1,0.4-0.1l0,0v0l0,0v0v0
+	l0,0v0l0,0c0-0.1-0.3-0.1-0.4-0.1c0-0.1-0.2-0.2-0.1-0.4c0,0-0.1,0-0.1,0c-0.1-0.1-0.3-0.1-0.4-0.1c-0.1,0-0.2-0.1-0.3-0.2
+	c-0.1,0-0.1,0-0.2,0c0,0,0,0,0,0C5.6,12,5.6,12,5.4,11.9c0-0.2,0.2-0.3,0.4-0.5c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0.1,0,0.1,0
+	c0,0,0,0,0,0c0,0,0,0-0.1-0.1c0,0,0,0,0,0v0c0,0,0.1,0.1,0.2,0c0,0,0,0,0-0.1c0.1,0,0.1,0,0.2-0.1c0,0,0,0,0,0
+	c-0.1,0-0.1-0.1-0.2-0.1c0.1,0,0.1,0,0.2,0.1c0,0,0.1,0,0.2-0.1c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0
+	c0,0,0.1,0,0.1,0c0,0,0,0,0-0.1l0,0c0,0,0,0.1,0.1,0.1c0.1-0.1,0.1-0.1,0.2-0.1c0-0.1,0-0.1,0-0.1c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0-0.1c-0.1,0-0.1-0.1-0.2,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.2,0.2-0.2,0.2c-0.1,0,0-0.1,0-0.1c0.1,0,0.1,0,0-0.1
+	c-0.1,0-0.1,0.1-0.1,0.1c0,0,0-0.1,0-0.1c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0.1-0.1c0,0,0-0.1,0-0.1c0,0,0,0,0,0
+	c-0.1,0-0.2,0.1-0.2,0.1c0,0,0,0,0,0c-0.1,0-0.1,0-0.1,0.1c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0l-0.3,0.2c0,0,0,0,0,0c0,0,0,0,0.1-0.1c0,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0h0l0,0l0,0h0l0,0l0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c-0.1,0-0.1,0-0.3,0h0l0,0c0,0,0,0,0,0h0l0,0c0,0,0,0,0,0h0l0,0c-0.2,0.1-0.2,0.1-0.3,0.2
+	c0-0.1,0-0.1,0.1-0.1c0,0,0,0,0,0c0,0,0,0,0,0c-0.1,0-0.2,0-0.2,0c0.1,0,0.1,0,0.2-0.1c-0.1,0-0.1,0-0.1-0.1c-0.1,0-0.1,0-0.1,0
+	c0,0,0,0,0.1,0c0,0-0.1,0-0.1,0c0,0,0,0,0.1-0.1c0,0-0.3,0.1-0.5,0.2c0,0,0,0,0.1,0c0.1,0,0.2,0.1,0.3,0c0,0-0.1,0.2-0.1,0.2
+	c0,0,0,0,0,0c-0.1,0-0.1,0-0.1,0c-0.1,0-0.1,0-0.1,0c0,0,0.4,0,0.4,0v-0.1c0-0.1-0.1-0.2,0-0.2c0,0-0.1,0-0.1,0c0,0,0,0,0-0.1
+	c-0.1,0-0.2,0.1-0.3,0.1c-0.3,0.1-0.6,0.4-0.9,0.5c-0.1,0.1-0.3,0.2-0.4,0.3c0,0,0,0-0.1,0l0,0L3,11.8l0,0c0.1-0.1,0.1-0.1,0.2-0.2
+	c0,0,0,0,0,0c0,0-0.1,0.1-0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0.1-0.1,0.1-0.1,0.2c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0,0,0,0c0,0,0.1,0,0.1,0
+	c0,0,0,0.1,0,0.1c0,0,0,0,0,0c-0.1,0-0.1,0-0.1,0.1l0,0C3,12.2,3,12.2,2.9,12.3c0,0,0,0,0,0v0c0,0.1-0.1,0.1-0.1,0.1c0,0,0,0,0.1,0
+	l0,0c0,0.1-0.1,0.1-0.1,0.2c0,0,0,0.2,0,0.2c0,0,0,0.3-0.1,0.3c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0h0c0,0,0-0.1,0-0.1c0,0,0-0.1,0-0.1c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0-0.1,0.1c0,0,0,0,0,0
+	c0,0,0,0,0,0 M8.3,10.4C8.3,10.4,8.3,10.4,8.3,10.4L8.3,10.4C8.3,10.4,8.3,10.4,8.3,10.4C8.3,10.4,8.3,10.4,8.3,10.4 M8.3,10.4
+	c0,0-0.1-0.1-0.1-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0C8.2,10.4,8.2,10.4,8.3,10.4
+	C8.2,10.4,8.2,10.4,8.3,10.4L8.3,10.4L8.3,10.4L8.3,10.4C8.2,10.5,8.2,10.5,8.3,10.4C8.2,10.5,8.2,10.5,8.3,10.4
+	C8.2,10.5,8.3,10.5,8.3,10.4C8.3,10.4,8.3,10.4,8.3,10.4 M5.9,10.7L5.9,10.7C6,10.6,6,10.6,5.9,10.7c0-0.1,0-0.1,0-0.1
+	c0,0,0,0,0.1-0.1c0,0,0.1-0.1,0.1-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c-0.1,0-0.1,0.1-0.2,0.1c0,0,0,0,0.1-0.1c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c-0.1,0.1-0.1,0.1-0.1,0.1c0.1,0,0.1,0,0.1,0c0,0-0.1,0-0.1,0c0,0,0.1,0,0.1-0.1c0,0-0.3,0.1-0.4,0.1
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0c0,0,0,0,0.1,0c0.1,0,0.1,0,0.1,0
+	c-0.1,0-0.1,0-0.2,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0.1c0,0,0.1,0,0.2,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0.1,0
+	c0,0,0,0,0,0c0,0.1,0.1,0.1,0.1,0.1C5.8,10.7,5.8,10.7,5.9,10.7c-0.1,0-0.1,0-0.1,0c0,0,0,0,0,0C5.8,10.7,5.9,10.7,5.9,10.7
+	C5.9,10.7,5.9,10.7,5.9,10.7 M8.2,11L8.2,11C8.2,11,8.2,11,8.2,11c-0.1,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.1-0.1-0.1-0.1
+	c0,0-0.1,0-0.1,0c0-0.1-0.1,0-0.1-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0v0l0,0c0,0,0.1,0,0.1,0c0,0-0.1,0-0.1-0.1c0,0,0,0,0.1,0
+	c0,0,0,0-0.1,0c0,0,0,0-0.1,0c0,0,0,0,0,0l0,0c0,0,0,0,0.1,0c0,0-0.1,0-0.1,0c0,0,0,0-0.1,0c0,0,0,0,0,0v0c0,0,0,0-0.1,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0-0.1,0l0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c-0.1-0.1-0.1-0.1-0.1-0.1c0,0,0,0.1-0.1,0.1c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0-0.1-0.2,0c0,0,0,0,0,0c-0.1,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0-0.1,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0-0.1,0-0.1,0-0.1c0,0,0,0,0,0c0,0,0.1-0.1,0.1-0.1c0,0,0,0-0.1,0c-0.1,0-0.2,0.1-0.2,0.1c0,0,0,0,0,0
+	c0,0-0.1,0-0.1,0.1c0.1,0,0.1,0,0.1,0c0,0-0.1,0-0.1,0c0,0.1,0.1,0.1,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0
+	c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0.1,0,0.1,0,0.1,0c0,0-0.1,0-0.1,0l0,0c0,0,0,0,0.1,0c0,0,0.1,0,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0.1,0.1
+	c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0s0,0,0,0s0,0,0,0s0,0,0,0
+	s0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0.1,0,0.1c0,0-0.1,0.1-0.1,0.1c0,0,0,0-0.1,0
+	c0,0,0.1,0,0.1,0.1c0,0,0,0,0,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0h0c-0.1-0.1-0.1,0-0.1,0c0,0,0,0,0,0c-0.1,0-0.1,0-0.1,0.1
+	c0.1,0,0.2,0,0.2,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0h0c0,0,0,0,0,0l0,0h0h0h0l0,0
+	c0,0,0,0,0.1,0.1c0,0,0,0,0,0c0,0.1,0.1,0,0.1,0.1c0,0,0.1,0,0.1,0.1c0.1,0,0.1,0,0.2,0c0,0,0,0,0,0c0-0.1-0.1-0.1-0.2-0.1
+	c-0.1,0-0.1,0-0.1-0.1c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0.1,0.1,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0.1,0,0.1,0.1c0,0,0,0,0-0.1
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.1-0.1-0.1-0.1c0,0,0,0.1,0.1,0.1c0,0,0,0-0.1-0.1c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0-0.1,0-0.1-0.1
+	c0,0,0,0,0,0l0,0c0,0,0-0.1-0.1-0.1c0,0,0,0,0,0c0,0,0,0,0-0.1c0.1,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0C7.9,11,7.9,11,8,11.1
+	c0,0,0,0.1,0.1,0c0,0.1,0,0.1,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0-0.1c0,0,0,0,0,0c0,0,0,0,0,0C8.2,11.1,8.2,11.1,8.2,11
+	C8.2,11,8.2,11,8.2,11C8.2,11,8.2,11,8.2,11C8.2,11,8.2,11,8.2,11 M6.4,10.4L6.4,10.4C6.5,10.4,6.4,10.4,6.4,10.4
+	C6.4,10.4,6.4,10.4,6.4,10.4c0-0.1,0.1-0.1,0.1-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0
+	l0,0L6.4,10.4C6.4,10.4,6.4,10.4,6.4,10.4c-0.1-0.1-0.1,0-0.1,0c0,0,0,0,0,0c-0.1,0-0.1,0.1-0.1,0.1c0,0,0,0,0,0.1c0,0,0,0,0.1,0
+	c0,0,0,0,0,0c0,0,0,0,0,0C6.3,10.5,6.3,10.5,6.4,10.4C6.3,10.5,6.4,10.5,6.4,10.4 M8.1,10.3C8.1,10.3,8.1,10.3,8.1,10.3
+	C8.1,10.3,8.1,10.3,8.1,10.3C8.1,10.3,8.1,10.3,8.1,10.3C8.1,10.3,8.1,10.3,8.1,10.3 M6.8,10.3C6.8,10.3,6.8,10.3,6.8,10.3
+	C6.8,10.3,6.8,10.3,6.8,10.3C6.8,10.3,6.8,10.3,6.8,10.3C6.8,10.3,6.7,10.3,6.8,10.3C6.7,10.3,6.7,10.3,6.8,10.3c-0.1,0-0.1,0-0.2,0
+	c0,0,0,0-0.1,0c0,0,0,0.1-0.1,0.1c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0C6.6,10.4,6.8,10.3,6.8,10.3 M8.1,10.3
+	C8.1,10.3,8.1,10.3,8.1,10.3L8.1,10.3C8.1,10.3,8.1,10.3,8.1,10.3L8.1,10.3 M5.9,10.3L5.9,10.3C6,10.3,6,10.3,5.9,10.3
+	C6,10.3,6,10.3,5.9,10.3C6,10.3,6,10.3,5.9,10.3C6,10.3,6,10.3,5.9,10.3C6,10.3,6,10.3,5.9,10.3C6,10.3,5.9,10.3,5.9,10.3
+	c-0.1,0-0.1,0-0.2,0c-0.1,0-0.1,0-0.2,0.1l0,0l0,0l0,0h0l0,0l0,0l0,0l0,0c0,0-0.1,0-0.1,0.1c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0-0.1,0-0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0.1,0,0.1-0.1,0.2-0.1c0,0,0.1,0,0.1,0
+	C5.8,10.4,5.9,10.4,5.9,10.3 M7.9,10.2C7.9,10.2,7.9,10.2,7.9,10.2C7.9,10.2,7.9,10.2,7.9,10.2C7.9,10.2,7.9,10.2,7.9,10.2
+	C7.9,10.2,7.9,10.2,7.9,10.2 M7.2,10.2L7.2,10.2C7.2,10.2,7.2,10.2,7.2,10.2C7.2,10.2,7.2,10.2,7.2,10.2C7.2,10.2,7.2,10.2,7.2,10.2
+	c-0.1,0-0.1,0-0.2,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.1,0.1-0.1,0.1c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0.1,0,0.1,0,0.1,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0C7.1,10.3,7.1,10.3,7.2,10.2C7.2,10.2,7.2,10.2,7.2,10.2 M6.8,10.2C6.8,10.1,6.8,10.1,6.8,10.2
+	C6.8,10.1,6.8,10.1,6.8,10.2C6.8,10.1,6.8,10.1,6.8,10.2C6.8,10.2,6.8,10.2,6.8,10.2C6.8,10.1,6.8,10.1,6.8,10.2
+	C6.8,10.1,6.8,10.1,6.8,10.2C6.8,10.1,6.8,10.1,6.8,10.2C6.8,10.2,6.7,10.2,6.8,10.2L6.8,10.2C6.7,10.2,6.7,10.2,6.8,10.2
+	C6.7,10.1,6.7,10.2,6.8,10.2C6.7,10.2,6.7,10.2,6.8,10.2c-0.1,0-0.1,0-0.1,0c0,0,0,0,0,0s0,0,0,0s0,0,0,0c0,0,0,0,0,0s0,0,0,0
+	s0,0,0,0s0,0,0,0s0,0,0,0c0,0,0,0,0,0C6.6,10.2,6.7,10.2,6.8,10.2C6.7,10.2,6.7,10.2,6.8,10.2c-0.1,0-0.1,0-0.1,0c0,0-0.1,0-0.1,0
+	c0,0,0,0,0.1,0C6.7,10.2,6.7,10.2,6.8,10.2 M6.5,10.2C6.6,10.2,6.6,10.2,6.5,10.2C6.6,10.2,6.6,10.2,6.5,10.2
+	C6.6,10.2,6.5,10.2,6.5,10.2C6.5,10.2,6.5,10.2,6.5,10.2c0,0,0.1,0,0.1-0.1c0,0,0,0,0,0C6.6,10.1,6.6,10.1,6.5,10.2
+	c-0.1,0-0.1,0-0.1,0C6.4,10.2,6.4,10.2,6.5,10.2c-0.1,0-0.1,0-0.1,0C6.5,10.2,6.5,10.2,6.5,10.2c-0.1,0-0.1,0-0.1,0c0,0,0,0-0.1,0
+	c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0.1,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0.1,0,0.1,0,0.1,0c0,0,0,0,0,0
+	c0,0,0,0,0,0C6.5,10.2,6.5,10.2,6.5,10.2 M6.9,10.1C7,10.1,7,10.1,6.9,10.1C7,10.1,7,10.1,6.9,10.1C6.9,10.1,6.9,10.1,6.9,10.1
+	C6.9,10.1,6.9,10.1,6.9,10.1L6.9,10.1L6.9,10.1L6.9,10.1C6.9,10.1,6.9,10.1,6.9,10.1L6.9,10.1L6.9,10.1L6.9,10.1L6.9,10.1
+	C6.9,10.1,6.9,10.1,6.9,10.1C6.9,10.1,6.9,10.1,6.9,10.1L6.9,10.1L6.9,10.1L6.9,10.1L6.9,10.1L6.9,10.1L6.9,10.1L6.9,10.1
+	C6.9,10.1,6.9,10.1,6.9,10.1L6.9,10.1C6.9,10.1,6.9,10.1,6.9,10.1 M6.6,10.1C6.7,10.1,6.7,10.1,6.6,10.1C6.7,10.1,6.7,10.1,6.6,10.1
+	C6.7,10.1,6.6,10.1,6.6,10.1L6.6,10.1C6.6,10.1,6.6,10.1,6.6,10.1L6.6,10.1C6.6,10.1,6.6,10.1,6.6,10.1L6.6,10.1
+	C6.6,10.1,6.6,10.1,6.6,10.1L6.6,10.1C6.6,10.1,6.6,10.1,6.6,10.1c-0.1,0-0.3,0.1-0.3,0.1c0,0,0,0,0,0c0,0,0,0-0.1,0
+	c0,0,0.1,0,0.1,0c0,0,0.1,0,0.1,0c0,0-0.1,0-0.1,0c0,0,0.1,0,0.1,0C6.6,10.1,6.6,10.1,6.6,10.1 M6.8,10.1L6.8,10.1
+	C6.8,10.1,6.8,10.1,6.8,10.1C6.8,10.1,6.8,10.1,6.8,10.1L6.8,10.1L6.8,10.1L6.8,10.1L6.8,10.1L6.8,10.1L6.8,10.1
+	C6.8,10.1,6.8,10.1,6.8,10.1L6.8,10.1C6.8,10.1,6.8,10.1,6.8,10.1c-0.1,0-0.1,0-0.1,0c0,0,0,0,0,0C6.8,10.1,6.8,10.1,6.8,10.1
+	 M7.1,10.1C7.1,10.1,7.1,10.1,7.1,10.1C7.1,10,7.1,10,7.1,10.1C7.1,10,7.1,10,7.1,10.1L7.1,10.1L7.1,10.1L7.1,10.1L7.1,10.1
+	L7.1,10.1L7.1,10.1L7.1,10.1L7.1,10.1C7.1,10,7.1,10,7.1,10.1C7.1,10.1,7.1,10.1,7.1,10.1C7,10.1,7,10.1,7.1,10.1
+	C7.1,10.1,7.1,10.1,7.1,10.1 M7,10.1c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	C7.1,10,7,10.1,7,10.1C7,10.1,7,10.1,7,10.1C7,10,7,10.1,7,10.1C7,10.1,7,10.1,7,10.1C7,10.1,7,10.1,7,10.1C7,10.1,7,10.1,7,10.1
+	C7,10.1,7,10.1,7,10.1C7,10.1,7,10.1,7,10.1 M7.3,10C7.3,10,7.4,10,7.3,10C7.4,10,7.3,10,7.3,10C7.3,10,7.4,10,7.3,10
+	C7.4,10,7.4,10,7.3,10C7.4,10,7.4,10,7.3,10C7.4,10,7.4,10,7.3,10C7.4,10,7.4,10,7.3,10C7.4,10,7.4,10,7.3,10C7.4,10,7.4,10,7.3,10
+	C7.4,10,7.4,10,7.3,10C7.4,10,7.4,10,7.3,10C7.4,10,7.4,10,7.3,10C7.4,10,7.4,10,7.3,10C7.4,10,7.4,10,7.3,10c0.1,0,0.1,0,0.1,0
+	C7.4,10,7.4,10,7.3,10c0.1,0,0.1,0,0.2,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0C7.5,10,7.4,10,7.3,10C7.4,10,7.4,10,7.3,10
+	C7.3,10,7.3,10,7.3,10L7.3,10C7.3,10,7.3,10,7.3,10C7.3,10,7.3,10,7.3,10C7.3,10,7.3,10,7.3,10c-0.1,0-0.1,0-0.2,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0C7.2,10.1,7.2,10.1,7.3,10C7.3,10,7.3,10,7.3,10C7.3,10.1,7.3,10,7.3,10
+	C7.3,10,7.3,10,7.3,10C7.3,10,7.3,10,7.3,10 M7.5,10C7.5,10,7.5,10,7.5,10C7.5,10,7.5,10,7.5,10C7.5,10,7.5,10,7.5,10
+	C7.5,10,7.5,10,7.5,10C7.5,10,7.5,10,7.5,10 M7.5,10L7.5,10L7.5,10C7.5,10,7.5,10,7.5,10C7.5,10,7.5,10,7.5,10C7.5,10,7.5,10,7.5,10
+	C7.5,10,7.5,10,7.5,10C7.5,10,7.5,10,7.5,10C7.5,10,7.5,10,7.5,10C7.5,10,7.5,10,7.5,10L7.5,10C7.5,10,7.5,10,7.5,10L7.5,10
+	C7.5,10,7.5,10,7.5,10L7.5,10C7.5,10,7.5,10,7.5,10L7.5,10C7.5,10,7.5,10,7.5,10c-0.1,0-0.1,0-0.1,0C7.4,10,7.4,10,7.5,10
+	C7.4,10,7.4,10,7.5,10L7.5,10L7.5,10L7.5,10L7.5,10L7.5,10L7.5,10L7.5,10c-0.1,0-0.1,0-0.1,0l0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0h0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0
+	c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0
+	C7.4,10.1,7.4,10.1,7.5,10C7.4,10.1,7.4,10.1,7.5,10C7.4,10.1,7.4,10.1,7.5,10C7.4,10.1,7.5,10,7.5,10C7.5,10,7.5,10,7.5,10
+	C7.5,10,7.5,10,7.5,10L7.5,10C7.5,10,7.5,10,7.5,10C7.5,10,7.5,10,7.5,10C7.5,10,7.5,10,7.5,10C7.5,10,7.5,10,7.5,10
+	C7.5,10,7.5,10,7.5,10C7.5,10,7.5,10,7.5,10 M9,11.2C8.6,10.5,8.1,10,7.5,10h0h0h0c0,0,0,0,0,0l0,0h0l0,0l0,0l0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0l0,0l0,0l0,0l0,0l0,0c0,0,0,0,0,0v0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0h0c0,0,0,0,0.1,0c0,0,0,0,0.1,0
+	c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0c0,0,0,0,0,0l0,0l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0
+	l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0h0c0,0,0,0,0,0h0c0,0,0,0,0,0h0h0c0,0,0,0,0,0h0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0h0h0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0h0l0,0l0,0h0l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0h0c0,0,0,0,0.1,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0c-0.1,0-0.1,0-0.2,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0l0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0l0,0l0,0l0,0l0,0l0,0l0,0l0,0l0,0l0,0l0,0h0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0v0
+	l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0-0.1,0-0.1,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0v0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c-0.1,0-0.1,0-0.1,0l0,0c0,0,0.1,0,0.1,0l0,0l0,0
+	c0,0,0,0,0,0c-0.1,0-0.1,0-0.1,0c0,0,0,0,0,0l0,0l0,0c0,0,0,0,0,0c0,0,0,0-0.1,0h0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	l0,0c0,0,0.1,0,0.1,0c0,0,0,0,0.1-0.1l0,0l0,0c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0-0.1,0.1l0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0
+	c0,0,0,0,0.1,0c0,0,0,0,0,0.1l0,0c0,0,0,0,0-0.1l0,0l0,0c0,0,0,0,0,0h0l0,0c0,0,0,0,0-0.1l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0.1,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.1-0.1-0.1,0l0,0l0,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0l0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0.1,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0l0,0c0,0,0,0,0,0C8.9,11.1,8.9,11.1,9,11.2C8.9,11.1,8.9,11.1,9,11.2L9,11.2C8.9,11.2,8.9,11.2,9,11.2
+	C8.9,11.2,8.9,11.2,9,11.2C8.9,11.2,8.9,11.2,9,11.2C8.9,11.2,8.9,11.2,9,11.2C8.9,11.2,8.9,11.2,9,11.2C8.9,11.2,8.9,11.2,9,11.2
+	C8.9,11.2,8.9,11.2,9,11.2C8.9,11.2,8.9,11.2,9,11.2C8.9,11.2,8.9,11.2,9,11.2C8.9,11.2,9,11.2,9,11.2C9,11.2,9,11.2,9,11.2"/>
+<path style="fill:#B3E710;" d="M7.4,22.9L7.4,22.9C7.4,22.9,7.4,22.9,7.4,22.9L7.4,22.9C7.4,22.9,7.4,22.9,7.4,22.9L7.4,22.9
+	C7.4,22.9,7.4,22.9,7.4,22.9C7.4,22.9,7.4,22.9,7.4,22.9 M9.4,20.1C9.4,20.1,9.4,20.1,9.4,20.1c-0.1,0-0.1,0-0.2,0c0,0,0,0.1,0,0.1
+	C9.2,20.2,9.3,20.2,9.4,20.1 M8.8,22.1c0.3-0.5,0.6-1.2,0.8-2c0,0,0,0,0,0c0,0,0,0-0.1,0c-0.1,0-0.1,0.1-0.2,0.2c0,0,0,0,0,0
+	c0,0-0.1,0-0.1,0c0,0,0-0.1,0-0.1c-0.1,0-0.1,0-0.1,0c0,0,0-0.1,0.1-0.1c-0.5,0-1.1,0-1.7,0c-0.5,0-1,0-1.4,0c0,0,0,0.1,0,0.1
+	c0,0,0,0.1,0,0.2l0,0c0.1,0.1,0.1,0,0.1,0c0.1,0.1-0.1,0.1-0.1,0.2c0,0,0.1,0.1,0.1,0.1c0,0,0,0,0,0c0.1,0.1,0.2,0.1,0.6,0.7
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0.1,0.2,0.4,0.2,0.5,0.3
+	c0.1,0.1-0.1,0.3-0.1,0.4c0,0-0.1,0-0.1,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0s0,0,0,0s0,0,0,0s0,0,0,0c0,0,0,0,0,0s0,0,0,0l0.1,0
+	c0,0.1,0.1,0.7,0.1,0.7c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0.1,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0l0,0l0,0l0,0c0,0,0,0,0,0l0,0
+	c0,0,0,0,0,0h0c0,0,0,0,0,0h0h0c0,0,0,0,0,0c0,0,0,0,0,0l0,0h0l0,0l0,0l0,0h0c0,0,0-0.1,0-0.1c0,0,0,0,0.1-0.1c0,0,0.1,0,0.2-0.1
+	c0,0,0,0,0-0.1c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0.1,0,0.2,0,0.4-0.2c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0-0.1,0.1-0.1,0.1c0.2-0.1,0.2-0.1,0.4-0.3c0,0,0,0,0,0C8.7,22.1,8.8,22.1,8.8,22.1 M13.7,18.3C13.7,18.3,13.7,18.3,13.7,18.3
+	C13.7,18.3,13.7,18.3,13.7,18.3C13.7,18.3,13.7,18.3,13.7,18.3C13.7,18.3,13.7,18.4,13.7,18.3L13.7,18.3
+	C13.7,18.4,13.7,18.3,13.7,18.3 M14,15.4c0-0.2-0.1-0.5-0.1-0.7v0c0-0.1-0.1-0.1-0.2-0.2c0,0-0.1,0-0.3-0.6c0,0,0,0,0,0
+	c0-0.1,0-0.1-0.1-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0,0-0.1,0c0,0,0,0-0.1,0.1c0,0,0,0,0,0.1c0,0,0,0.1-0.1,0.1
+	c0,0,0,0-0.1,0c-0.1,0-0.1,0-0.1-0.1c0,0-0.1,0.5,0,0.7c0.1,0.3-0.2,0.4-0.2,0.7c0,0.2-0.1,0.4-0.1,0.7c0,0,0,0,0,0
+	c0.1,0.1,0.1,0.7,0,0.8c0,0,0,0.1,0.1,0.1c0,0,0,0,0,0c0,0,0,0.1,0,0.1c0,0,0,0,0,0l0,0l0,0l0,0l0,0h0l0,0l0,0l0-0.1
+	c0,0,0-0.1,0-0.1c0,0,0,0,0,0c0,0,0,0.2,0,0.2c0,0,0.1,0.1,0.1,0.1c0,0,0.1,0.1,0.1,0.1v0c0,0-0.1,0-0.1,0c0,0,0,0,0.1,0.2
+	c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0s0,0,0,0s0,0,0,0s0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0v0v0L12.8,18c0,0,0,0,0,0c0,0,0.2,0.3,0.3,0.3
+	c0.1,0,0.1-0.2,0.2-0.2c0,0,0,0,0-0.1c0,0,0,0,0,0c0.1,0,0.3-0.2,0.3-0.2c0,0,0.2,0,0.2,0.1l0.2,0v0c0,0.1-0.2,0.1-0.2,0.1
+	c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0.1,0.1,0.1,0.1v0l-0.1,0c0,0.1-0.1,0.2-0.2,0.3l0,0c0,0,0,0.1,0,0.1c0,0,0,0,0,0
+	c0,0,0,0.1-0.1,0.2l0,0l0,0c0,0,0,0,0,0.1c-0.1,0.4-0.5,1-0.5,1c0,0,0,0,0,0s0,0,0,0c0.1,0,0.2-0.3,0.3-0.6c0.2-0.3,0.3-0.6,0.4-0.9
+	s0.2-0.6,0.2-1c0.1-0.3,0.1-0.7,0.1-1C14.1,16.1,14.1,15.8,14,15.4 M13.4,13.8C13.4,13.8,13.4,13.8,13.4,13.8
+	C13.4,13.8,13.4,13.8,13.4,13.8C13.4,13.8,13.4,13.8,13.4,13.8C13.4,13.8,13.4,13.8,13.4,13.8C13.4,13.8,13.4,13.8,13.4,13.8
+	c0,0.1,0,0.1,0.1,0.2C13.5,13.9,13.5,13.9,13.4,13.8 M13.2,13.5C13.2,13.5,13.2,13.5,13.2,13.5C13.2,13.4,13.2,13.4,13.2,13.5
+	C13.2,13.5,13.2,13.5,13.2,13.5C13.2,13.5,13.2,13.5,13.2,13.5C13.2,13.5,13.2,13.5,13.2,13.5c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0C13.3,13.6,13.3,13.6,13.2,13.5 M13.1,13.3C13.1,13.3,13.1,13.2,13.1,13.3
+	L13.1,13.3L13.1,13.3C13.1,13.3,13.1,13.3,13.1,13.3L13.1,13.3C13.1,13.3,13.1,13.3,13.1,13.3C13.1,13.3,13.1,13.3,13.1,13.3
+	C13.1,13.3,13.1,13.3,13.1,13.3C13.1,13.3,13.1,13.3,13.1,13.3L13.1,13.3L13.1,13.3L13.1,13.3L13.1,13.3L13.1,13.3L13.1,13.3
+	c0,0.1,0.1,0.1,0.1,0.1l0,0C13.2,13.4,13.1,13.3,13.1,13.3 M13.3,13.5C13.3,13.5,13.2,13.5,13.3,13.5l-0.1-0.1c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0-0.2-0.4-0.3-0.4l0,0c0,0-0.1,0-0.3,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0,0,0,0l0,0l0,0
+	c0,0,0.1,0.1,0.1,0.2c0,0,0,0-0.1,0c0,0.1-0.1,0-0.1,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0.1,0,0.1,0.1
+	c0.1,0.1,0.1,0.3,0.1,0.4c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0.1
+	c0,0,0,0.1,0,0.1c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0.1,0.1,0.1c0,0.1,0.1,0.1,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0l0,0h0
+	c0,0,0-0.1,0-0.1c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0-0.1,0-0.1c0,0,0,0,0,0c0,0,0-0.1,0-0.1c0,0,0,0,0,0
+	c0,0,0,0-0.1-0.1c0-0.1,0-0.1,0-0.2l0,0c0,0,0-0.1,0-0.1c0-0.1,0-0.1,0-0.1c-0.1-0.1-0.1-0.1-0.1-0.1c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0-0.1,0-0.1c0,0,0,0,0,0C13,13,13.3,13.5,13.3,13.5C13.3,13.5,13.3,13.5,13.3,13.5L13.3,13.5
+	L13.3,13.5L13.3,13.5L13.3,13.5C13.3,13.5,13.3,13.5,13.3,13.5C13.3,13.5,13.3,13.5,13.3,13.5C13.3,13.5,13.3,13.6,13.3,13.5
+	C13.3,13.6,13.3,13.6,13.3,13.5c0.1,0.1,0.1,0.2,0.1,0.2c0,0,0,0,0,0l0,0l0,0c0,0,0,0,0,0.1c0,0,0,0,0,0l0,0l0,0c0,0,0,0,0-0.1
+	C13.4,13.7,13.3,13.6,13.3,13.5 M12.9,12.9C12.9,12.9,12.9,12.9,12.9,12.9C12.9,12.9,12.9,12.9,12.9,12.9C12.9,12.9,13,13,12.9,12.9
+	C13,13,12.9,12.9,12.9,12.9 M13.1,13.1c0-0.1-0.1-0.1-0.1-0.2c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0C13,13,13,13,13.1,13.1
+	C13,13,13,13,13.1,13.1C13,13.1,13.1,13.1,13.1,13.1C13.1,13.1,13.1,13.1,13.1,13.1 M9.2,12.9L9.2,12.9L9.2,12.9L9.2,12.9L9.2,12.9
+	c-0.1,0-0.1,0-0.1,0.1C9.1,12.9,9.1,12.9,9.2,12.9C9.2,12.9,9.2,12.9,9.2,12.9C9.2,12.9,9.2,12.9,9.2,12.9 M2.7,12.5
+	C2.8,12.5,2.7,12.5,2.7,12.5C2.7,12.5,2.7,12.5,2.7,12.5C2.7,12.6,2.7,12.6,2.7,12.5C2.7,12.6,2.7,12.6,2.7,12.5 M2.9,12.4
+	C2.9,12.4,2.9,12.4,2.9,12.4C2.9,12.3,2.9,12.3,2.9,12.4c0.1-0.1,0.1-0.1,0.1-0.1c0,0,0,0,0,0C2.8,12.3,2.8,12.4,2.9,12.4
+	C2.8,12.4,2.8,12.4,2.9,12.4C2.8,12.4,2.8,12.4,2.9,12.4C2.8,12.4,2.8,12.4,2.9,12.4C2.8,12.4,2.8,12.4,2.9,12.4
+	C2.8,12.4,2.8,12.4,2.9,12.4C2.8,12.4,2.8,12.4,2.9,12.4C2.9,12.4,2.9,12.4,2.9,12.4 M2.9,12.2C3,12.1,3,12.1,2.9,12.2
+	C3,12.1,3,12.1,2.9,12.2C3,12.1,3,12.1,2.9,12.2C2.9,12.1,2.9,12.2,2.9,12.2C2.9,12.2,2.9,12.2,2.9,12.2L2.9,12.2
+	C2.9,12.2,2.9,12.2,2.9,12.2 M3,12.1C3,12,3,12,3,12.1C3.1,12,3.1,12,3,12.1C3.1,12,3.1,12,3,12.1C3,12,3,12,3,12.1
+	C3,12.1,3,12.1,3,12.1C3,12,3,12.1,3,12.1 M9,13c0,0,0-0.2,0-0.2c0,0,0.1,0,0-0.1c0-0.2,0-0.1,0-0.1c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0-0.1,0-0.1,0c-0.1,0-0.1,0.1-0.2,0.1c0,0,0-0.1,0-0.1c0.1,0,0.2-0.1,0.2-0.1c-0.3-0.1-0.3-0.2-0.3-0.2
+	c0-0.1,0-0.3-0.1-0.3c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0
+	c0,0,0,0.1-0.1,0c0,0,0,0.1,0,0.1c0,0,0.1,0,0.1,0c0-0.1-0.1,0-0.1-0.1c0,0,0,0,0,0C8.4,12,8.4,12,8.3,12c0,0,0,0,0,0c0,0,0,0,0,0
+	c-0.1-0.1-0.1-0.1-0.2-0.2c0,0,0,0-0.1,0.1c0,0,0,0,0,0.1C8,11.9,8,12,8,12c0,0,0,0,0,0c0,0,0-0.1-0.1-0.1C7.9,12,7.9,12,7.8,12
+	c0,0,0,0,0,0c0-0.1-0.1,0-0.2,0c0,0,0,0,0,0c0,0,0-0.1,0-0.1c0,0,0,0.2,0,0.2c0,0,0-0.1,0-0.1c0,0,0,0,0,0c-0.1,0-0.2-0.2-0.2-0.2
+	c0,0,0-0.1,0-0.1c0,0-0.1-0.1-0.1-0.1c-0.1,0-0.1,0-0.1,0c-0.1,0-0.1,0-0.2-0.1c0,0,0,0,0,0c0,0-0.1,0,0,0.1c0,0,0,0.1,0,0.1v0
+	c0,0,0,0,0,0c0,0,0,0.1,0,0.1l-0.1,0.1C6.9,12,7.1,12,7,12.2c0,0.1-0.1,0.4-0.3,0.5c0,0,0.1,0.3,0.1,0.3c0,0,0,0,0,0
+	c0,0,0.3-0.4,0.3-0.4c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0.1-0.1,0.1-0.1,0.2c0,0-0.1,0.1-0.1,0.1c0,0-0.1,0-0.1-0.1c0,0,0,0-0.1,0c0,0,0,0.1,0,0.1c0.3,0,0.5,0,0.8,0c0.5,0,1,0,1.5,0
+	c0,0-0.1-0.1-0.1-0.1C9,12.9,9,12.9,9,12.8 M9,11.3C9,11.2,9,11.2,9,11.3L9,11.3L9,11.3 M6.8,11.3L6.8,11.3c0,0,0,0-0.1,0
+	c0,0,0-0.1,0-0.1c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0-0.1-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c-0.1,0.1-0.1,0.1-0.1,0.2c-0.1,0-0.1,0-0.1,0.1c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0.1c0,0,0,0,0,0c0,0,0,0,0.1,0
+	c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0C6.7,11.3,6.7,11.3,6.8,11.3C6.8,11.3,6.8,11.3,6.8,11.3 M7.3,10.8
+	C7.3,10.8,7.3,10.8,7.3,10.8C7.3,10.8,7.2,10.8,7.3,10.8c-0.2,0-0.2,0.1-0.1,0.1C7.1,10.9,7.2,11,7.3,10.8"/>
+<path style="fill:#B3E710;" d="M9.6,13.4C9.6,13.4,9.6,13.4,9.6,13.4C9.6,13.4,9.6,13.4,9.6,13.4C9.6,13.4,9.6,13.3,9.6,13.4
+	L9.6,13.4C9.5,13.3,9.5,13.3,9.6,13.4C9.5,13.4,9.5,13.4,9.6,13.4c-0.1-0.1-0.1-0.1-0.1-0.1c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0
+	l0,0c0,0,0,0-0.1,0c0,0,0,0,0.1-0.1c0,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0-0.1,0c0,0,0,0-0.1,0.1c0-0.1,0-0.1,0.1-0.2c0,0-0.1,0-0.1,0C9,13,9,13,9,13.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0-0.1,0
+	c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0-0.1,0-0.1,0.1c0,0,0,0,0,0.1c0.1,0,0.1,0,0.2,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0c0,0,0,0,0,0
+	c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0-0.1,0.1-0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1-0.1,0.1-0.1c0,0,0,0,0,0l0,0c0,0,0,0,0,0.1
+	c0,0,0,0,0,0l0,0L9.6,13.4C9.5,13.4,9.5,13.5,9.6,13.4C9.6,13.5,9.6,13.5,9.6,13.4C9.6,13.5,9.6,13.4,9.6,13.4 M12.6,12.9
+	C12.6,12.9,12.6,12.9,12.6,12.9C12.6,12.9,12.6,12.9,12.6,12.9L12.6,12.9C12.6,12.9,12.6,12.9,12.6,12.9 M11.6,11.8
+	c0,0-0.1-0.2-0.2-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0s0,0,0,0s0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0C11.7,11.9,11.7,11.9,11.6,11.8C11.6,11.9,11.6,11.9,11.6,11.8
+	 M11.5,11.7L11.5,11.7C11.5,11.7,11.4,11.7,11.5,11.7C11.4,11.7,11.4,11.7,11.5,11.7C11.4,11.7,11.5,11.7,11.5,11.7 M11.8,11.7
+	C11.8,11.6,11.8,11.6,11.8,11.7L11.8,11.7C11.8,11.7,11.8,11.7,11.8,11.7C11.8,11.7,11.8,11.7,11.8,11.7
+	C11.8,11.7,11.8,11.7,11.8,11.7C11.9,11.7,11.9,11.7,11.8,11.7C11.9,11.7,11.9,11.7,11.8,11.7C11.9,11.7,11.9,11.7,11.8,11.7
+	C11.9,11.7,11.9,11.7,11.8,11.7L11.8,11.7L11.8,11.7C11.9,11.7,11.8,11.7,11.8,11.7 M11.6,11.4C11.6,11.4,11.6,11.4,11.6,11.4
+	L11.6,11.4C11.6,11.5,11.6,11.5,11.6,11.4C11.6,11.5,11.6,11.5,11.6,11.4c0.1,0.1,0.1,0.1,0.1,0.1C11.7,11.5,11.7,11.5,11.6,11.4
+	C11.6,11.5,11.6,11.5,11.6,11.4C11.6,11.5,11.6,11.5,11.6,11.4 M9.4,11.4C9.4,11.4,9.4,11.4,9.4,11.4C9.4,11.4,9.4,11.4,9.4,11.4
+	C9.4,11.4,9.4,11.4,9.4,11.4C9.4,11.4,9.3,11.4,9.4,11.4C9.3,11.4,9.4,11.4,9.4,11.4C9.4,11.4,9.4,11.4,9.4,11.4 M12.1,12.1
+	c0,0-0.1-0.1-0.1-0.1C12,12,12,12,12.1,12.1C11.9,12,11.9,12,11.9,12c0,0-0.1-0.1-0.2-0.2c-0.2-0.1-0.2-0.2-0.2-0.2c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.1-0.1-0.1-0.1c0,0-0.1,0-0.1,0c0,0,0-0.1-0.1-0.1c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0.1c0,0,0.1,0.1,0.1,0.1l0,0
+	c0,0,0,0,0,0l0,0c0,0,0,0.1,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0.1,0.1,0.1,0.1,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0.1,0.1,0.1c0,0,0,0,0,0
+	c0,0,0,0,0,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0.1l0,0C11.9,12.1,11.9,12.1,12.1,12.1C12,12.2,12,12.2,12.1,12.1C12,12.2,12,12.2,12.1,12.1
+	C12,12.2,12,12.1,12.1,12.1C12,12.2,12,12.2,12,12.2c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0.1,0,0.1,0,0.1
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0C12.1,12.2,12.1,12.2,12.1,12.1
+	C12.1,12.2,12.1,12.2,12.1,12.1C12.1,12.2,12.1,12.2,12.1,12.1C12.1,12.2,12.1,12.2,12.1,12.1C12.1,12.1,12.1,12.1,12.1,12.1
+	 M9.9,10.7c0,0-0.1,0-0.1,0c0,0,0,0-0.1,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0
+	c0,0-0.1,0-0.1,0c0,0,0,0,0,0l0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c-0.1,0-0.1-0.1-0.2-0.1c0,0,0,0,0,0l0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0.1,0l0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0.1,0,0.1,0,0.1,0.1c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0
+	c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0C10,10.8,10,10.8,9.9,10.7C10,10.8,10,10.8,9.9,10.7C10,10.8,10,10.7,9.9,10.7
+	C10,10.7,10,10.7,9.9,10.7C10,10.7,9.9,10.7,9.9,10.7 M8.6,10.2C8.6,10.2,8.6,10.2,8.6,10.2C8.5,10.2,8.5,10.2,8.6,10.2
+	C8.6,10.2,8.6,10.2,8.6,10.2L8.6,10.2C8.7,10.2,8.6,10.2,8.6,10.2L8.6,10.2L8.6,10.2L8.6,10.2L8.6,10.2C8.6,10.2,8.6,10.2,8.6,10.2
+	 M12.1,11.9C12.1,11.9,12,11.8,12.1,11.9L12.1,11.9C12,11.9,12.1,11.9,12.1,11.9c0,0-0.1-0.1-0.1-0.1l0,0l0,0h0
+	C12,11.8,12,11.9,12.1,11.9C12.1,11.9,12.1,11.9,12.1,11.9L12.1,11.9L12.1,11.9L12.1,11.9C12,11.8,12,11.8,12,11.8c0,0,0,0,0,0
+	c0,0-0.1-0.1-0.1-0.1l0,0c0,0,0,0-0.1-0.1l0,0l0,0l0,0c0,0,0,0-0.1,0c0,0,0,0,0.1,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0.1,0.1,0.1,0.1l0,0c0.1,0,0.1,0.1,0.2,0.2l0,0L12.1,11.9L12.1,11.9L12.1,11.9C12,11.9,12,11.9,12.1,11.9
+	C12,11.9,12,11.9,12.1,11.9C12.1,11.9,12,11.9,12.1,11.9C12.1,11.9,12.1,11.9,12.1,11.9L12.1,11.9L12.1,11.9L12.1,11.9
+	C12.1,11.9,12,11.9,12.1,11.9C12,11.9,12,11.9,12.1,11.9C12,11.9,12,11.9,12.1,11.9C12.1,11.9,12.1,11.9,12.1,11.9
+	C12.1,12,12.1,12,12.1,11.9L12.1,11.9C12,11.9,12,11.9,12.1,11.9C12,11.9,12,11.9,12.1,11.9C12,12,12.1,12,12.1,11.9
+	c0,0.1,0,0.1,0,0.2c0,0,0,0,0,0c0,0,0,0,0,0l0,0C12.1,12,12.1,12,12.1,11.9c0,0.1,0,0.1,0.1,0.3c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0.1,0.1,0.1c0,0,0,0,0,0.1l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0.1,0.1,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0l0,0l0,0
+	c0,0,0,0,0.1,0.1c0.1,0.1,0.1,0.1,0.2,0.2c0.2,0,0.3,0,0.3,0l0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c-0.1-0.1-0.1-0.2-0.2-0.3C12.6,12.4,12.3,12.1,12.1,11.9 M10.5,10.7c-0.2-0.1-0.4-0.2-0.6-0.3l0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0.1C10.4,10.7,10.5,10.7,10.5,10.7C10.5,10.8,10.5,10.8,10.5,10.7
+	c0.1,0.1,0.2,0.1,0.2,0.1l0,0c0,0,0.1,0,0.1,0.1c0,0,0,0,0,0l0,0h0l0,0h0c0,0,0,0,0,0l0,0h0l0,0l0,0c0,0,0,0,0.1,0c0,0,0,0,0,0
+	c0,0,0,0,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0.1,0.1,0.1c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0.1l0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0l0,0l0,0l0,0l0,0l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0c0,0,0.1,0.1,0.1,0.1l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c-0.1-0.1-0.1-0.1-0.2-0.2c0,0,0,0,0.1,0c0,0,0.1,0.1,0.1,0.1c0,0,0,0,0,0l0,0c0,0,0.1,0.1,0.1,0.1c0,0,0.1,0.1,0.1,0.1l0,0l0,0l0,0
+	c0,0,0.1,0.1,0.1,0.1c0,0,0,0,0,0c0,0,0,0-0.1-0.1l0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0-0.1-0.1-0.1-0.1c-0.1-0.1-0.2-0.2-0.3-0.3
+	C11.1,11.1,10.8,10.9,10.5,10.7 M8.3,10.1L8.3,10.1C8.3,10.1,8.3,10.1,8.3,10.1L8.3,10.1L8.3,10.1C8.3,10.1,8.2,10.1,8.3,10.1
+	L8.3,10.1C8.2,10.1,8.3,10.1,8.3,10.1L8.3,10.1L8.3,10.1C8.3,10.1,8.3,10.1,8.3,10.1L8.3,10.1L8.3,10.1L8.3,10.1L8.3,10.1
+	C8.3,10.1,8.3,10.1,8.3,10.1C8.3,10.1,8.3,10.1,8.3,10.1L8.3,10.1C8.3,10.1,8.3,10.1,8.3,10.1 M8.2,10.1L8.2,10.1L8.2,10.1
+	C8.2,10.1,8.2,10.1,8.2,10.1C8.2,10.1,8.2,10.1,8.2,10.1C8.2,10.1,8.2,10.1,8.2,10.1C8.2,10.1,8.2,10.1,8.2,10.1L8.2,10.1
+	C8.2,10.1,8.2,10.1,8.2,10.1C8.2,10.1,8.2,10.1,8.2,10.1 M8.2,10.1C8.2,10.1,8.2,10.1,8.2,10.1L8.2,10.1L8.2,10.1L8.2,10.1
+	C8.1,10.1,8.1,10.1,8.2,10.1L8.2,10.1L8.2,10.1L8.2,10.1L8.2,10.1C8.2,10.1,8.2,10.1,8.2,10.1C8.2,10.1,8.2,10.1,8.2,10.1 M8,10
+	L8,10C7.9,10,7.9,10,8,10C7.9,10,8,10,8,10C8,10,8,10,8,10 M7.9,10C7.8,10,7.8,10,7.9,10C7.8,10,7.8,10,7.9,10L7.9,10
+	C7.8,10,7.9,10,7.9,10C7.9,10,7.9,10,7.9,10 M7.8,10L7.8,10C7.8,10,7.7,10,7.8,10C7.8,10,7.8,10,7.8,10C7.7,10,7.7,10,7.8,10
+	C7.7,10,7.7,10,7.8,10C7.8,10,7.8,10,7.8,10L7.8,10C7.8,10,7.8,10,7.8,10 M7.7,10L7.7,10L7.7,10C7.6,10,7.6,10,7.7,10
+	C7.6,10,7.6,10,7.7,10C7.6,10,7.6,10,7.7,10C7.6,10,7.7,10,7.7,10L7.7,10 M7.9,10c-0.1,0-0.2,0-0.2,0h0c0,0,0.1,0,0.1,0
+	C7.8,10,7.8,10,7.9,10 M7.6,10C7.6,10,7.5,10,7.6,10L7.6,10C7.6,10,7.6,10,7.6,10C7.6,10,7.6,10,7.6,10 M8,10L8,10L8,10L8,10L8,10
+	 M9,10H8.7c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0.2,0,0.2,0.1C9,10.2,9,10,9,10H8.7l0,0.1c0,0,0,0,0,0
+	l0-0.1c0,0,0-0.1,0-0.1c0,0,0,0,0,0c0,0,0.2,0.1,0.2,0.1c0,0,0.2,0.1,0.2,0.1v0c0,0-0.2-0.1-0.2-0.1c0,0-0.2-0.1-0.2-0.1h0
+	c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0C8.5,10,9,10.1,9,10v0.1c-1,0-0.3,0-0.3,0c0,0-0.1-0.1-0.1-0.1c0,0-0.1-0.1-0.1-0.1c0,0,0,0,0,0
+	c0,0,0.1,0,0.1,0l0,0h0l0,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0.1,0l0,0c0,0,0-0.1,0-0.1l0-0.1h0.2
+	C8.8,10,9,10.1,9,10L9,10H8.3c0,0-0.3,0.1-0.3,0.1v-0.1c0,0,0.5-0.1,0.5-0.1h0l0,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0-0.4,0-0.4,0v0.1l0,0l0,0v0l0,0l0,0l0,0l0.4,0h0l0,0h0c0,0-0.4,0-0.4,0l0,0v0.1v0l0,0v0v0l0,0c0,0,0.2-0.1,0.2-0.1
+	c0,0,0.2,0,0.2,0h0c0,0,0,0.1,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0-0.1,0h0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0c0,0-0.1,0-0.1,0V10h0.1l0,0l0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0-0.2,0-0.2,0v0v0l0,0v0l0,0v0v0c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0v0v0v0h0h0c0,0,0,0,0,0h0
+	c0,0,0,0,0,0h0v0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0h0c0,0,0,0,0,0h0c0,0,0,0,0,0h0c0,0,0,0,0,0c0,0-0.1,0-0.1,0h0c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0h0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0h0h0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0.5,0,1,0.5,1.4,1.2c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0-0.2,0-0.1c0,0,0-0.2,0-0.2c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0.2,0,0.2
+	c0,0,0,0.1,0,0.1c0,0,0.1,0,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0
+	c0,0,0,0,0,0l0,0l0,0h0c0,0,0,0,0,0h0c0,0,0,0,0,0c0,0-0.2,0-0.2,0c0,0-0.2,0-0.2,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0.2,0,0.2,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0l0,0c0,0-0.2,0-0.2,0c0,0-0.2,0-0.2,0c0,0,0-0.2,0-0.2
+	c0,0,0.5-0.2,0.5-0.2h0c0,0,0,0.2,0,0.2c0,0,0,0.1,0,0.1c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0.1,0,0.1,0c0,0,0.2,0,0.2,0c0,0,0,0,0,0c0,0-0.1,0-0.2,0c0,0,0.1,0,0,0
+	c0,0,0.1,0,0.1,0c0,0,0-0.4,0-0.4s-0.3,0-0.3,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0.2,0,0.2c0,0,0-0.1,0-0.1c0,0,0-0.1,0-0.1h0l0,0.2
+	c0,0,0,0.1,0,0.1c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0-0.1-0.1
+	c0,0,0,0,0.1,0l0,0c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0.2,0,0.2,0c0,0-0.7,0,0.3,0v0c-1,0-0.3,0-0.3,0H9.6c0,0,0,0,0,0
+	c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0-0.5,0-0.5,0v0l0,0v0l0,0v0h0.2H9v0l0.3,0c0,0,0.1,0,0.1,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0L9,11v0
+	c0,0,0.4,0,0.4,0c0,0,0,0,0,0s0,0,0,0s0,0,0,0s0,0,0,0s0,0,0,0s0,0,0,0s0,0,0,0s0,0,0,0l0,0c0,0,0,0-0.1,0l0,0l0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0c0,0,0,0-0.1,0c0,0,0,0,0.1,0c0,0,0,0.1,0,0.1c0,0,0,0.1-0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.3-0.1-0.3-0.1v-0.1c0,0,0.1,0,0.1-0.1c0,0,0.1,0,0.1,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0-0.1,0-0.1,0c0,0-0.2,0-0.2,0c0,0,0,0,0,0c0,0,0.2,0.3,0.2,0.3h0c0,0,0-0.2,0-0.2c0,0,0.1,0.1,0.1,0.1c0,0,0,0.1,0,0.1
+	c0,0,0,0,0,0c0,0,0-0.2,0-0.2c0,0,0-0.1,0-0.1c0,0-0.1,0-0.1,0c0,0-0.2,0-0.2,0V11c0,0,0.2,0,0.2,0c0,0,0.1-0.2,0-0.2
+	c0,0,0-0.1,0-0.1c0,0,0-0.1,0.1,0c0,0,0,0.2,0,0.2l0,0.2c0,0,0,0,0,0c0,0,0-0.3,0-0.3l0-0.1l0-0.1c0,0,0-0.3,0-0.3C9,10.2,9,10,9,10
+	C9,10,9,10,9,10L9,10.2c0,0,0,0.1-0.1,0.1l0,0c0,0,0.1,0.1,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0l0,0l0,0c0,0-0.1,0-0.1,0c0,0,0.1,0,0.1,0c0,0,0-0.1,0-0.1V10H8.8H9v0.1
+	l0,0V10c0,0-0.1,0-0.1,0l0,0H9L9,10v0.2l-0.1,0c0,0-0.1-0.1-0.1-0.1c0,0-0.1-0.1-0.1-0.1"/>
+<path style="fill:#B3E710;" d="M10.4,20.8c0,0,0.1-0.2,0.1-0.2c0,0-0.1,0-0.1,0c-0.1-0.2-0.1-0.2-0.1-0.2c0,0-0.1,0-0.1,0
+	c0,0-0.1-0.1-0.1-0.1c0,0-0.1,0-0.2,0.1c0,0,0.1-0.1,0-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0-0.1-0.1c-0.2,0.8-0.5,1.5-0.8,2
+	c0.1,0,0.1,0,0.1,0c0,0,0.1,0,0.1-0.1c0,0,0.1,0,0.1,0c0,0,0.1-0.1,0.1-0.1c0-0.1,0.2-0.1,0.2-0.2c0.1-0.1,0.1-0.1,0.2-0.2
+	c0-0.1,0.1-0.1,0.2-0.3c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0,0.1-0.1c0,0,0.1-0.1,0.1-0.1c0.1-0.1,0.1-0.1,0.2-0.1
+	C10.3,20.8,10.4,20.8,10.4,20.8 M12.8,20.3c0.1-0.1,0.1-0.2,0.2-0.3c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0c-0.6,0.9-1.1,1.3-1.3,1.5
+	c0.2-0.2,0.4-0.3,0.6-0.5C12.3,20.9,12.6,20.6,12.8,20.3 M9.5,20.1C9.5,20.1,9.5,20.1,9.5,20.1C9.5,20.1,9.5,20.1,9.5,20.1
+	C9.5,20.1,9.5,20.1,9.5,20.1 M9.4,20C9.4,20,9.4,20,9.4,20c0,0-0.1,0-0.2,0c0,0,0,0,0,0s0,0,0,0s0,0,0,0s0,0,0,0s0,0,0,0s0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0.1C9.3,20.1,9.3,20.1,9.4,20C9.4,20.1,9.4,20.1,9.4,20 M8.1,18.8C8.1,18.8,8.1,18.8,8.1,18.8
+	C8.1,18.8,8.1,18.8,8.1,18.8C8.1,18.8,8.1,18.8,8.1,18.8C8.1,18.8,8.1,18.8,8.1,18.8C8.1,18.8,8.1,18.9,8.1,18.8
+	C8.1,18.9,8.1,18.9,8.1,18.8C8.1,18.9,8,18.9,8,18.9c0,0,0,0,0,0C8.1,18.9,8.1,18.9,8.1,18.8C8.1,18.9,8.1,18.9,8.1,18.8 M6.8,17.4
+	L6.8,17.4c0-0.1-0.2-0.1-0.2-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0h0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0h0l0,0
+	c0,0,0.1,0.1,0.1,0.1C6.7,17.5,6.7,17.4,6.8,17.4C6.8,17.4,6.8,17.4,6.8,17.4C6.8,17.4,6.8,17.4,6.8,17.4
+	C6.8,17.4,6.8,17.4,6.8,17.4L6.8,17.4 M8.2,17.4C8.2,17.4,8.2,17.4,8.2,17.4c0,0-0.1-0.1-0.2,0c0,0,0,0,0,0.1
+	C8.1,17.4,8.2,17.4,8.2,17.4C8.2,17.4,8.2,17.4,8.2,17.4 M7.9,17.4C7.9,17.4,7.9,17.4,7.9,17.4c-0.1-0.1-0.2-0.1-0.2-0.1
+	c-0.1,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0s0,0-0.1,0c0,0,0,0-0.1,0c-0.1,0-0.1,0-0.2,0l0,0c0,0,0,0,0,0
+	c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0,0,0,0c-0.1,0-0.2,0-0.3,0c0,0,0,0,0,0l0,0c0,0,0,0,0.1,0.1c0,0,0,0,0,0
+	c0,0,0,0,0.1,0c0.1,0,0.1,0,0.2,0c0,0,0,0.1,0.1,0.1c0-0.1,0-0.1,0.1-0.1c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0
+	C7.8,17.4,7.8,17.4,7.9,17.4C7.8,17.4,7.8,17.4,7.9,17.4C7.9,17.4,7.9,17.4,7.9,17.4 M7.1,17.1L7.1,17.1C7,17.1,7,17.1,6.9,17.1
+	c0,0,0,0,0,0c0,0,0,0,0,0h0h0h0h0h0h0l0,0l0,0c-0.1,0-0.2,0-0.2-0.1c0,0,0-0.1-0.1-0.1c0,0-0.1,0-0.1,0c-0.1,0-0.1,0-0.2-0.1
+	c0,0,0,0,0,0c-0.1,0-0.1,0-0.2,0c0,0,0,0,0,0h0c0,0,0,0,0,0c0,0,0,0,0,0h0c0,0,0,0,0,0h0c0,0,0,0,0,0c-0.1,0-0.3,0-0.3,0.1
+	c0,0,0,0,0,0l0,0c0,0,0.1,0,0.1,0c0.2-0.1,0.2-0.1,0.3-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0.1,0,0.1,0,0.2,0c0.1,0,0.1,0,0.1,0.1c0,0,0,0,0,0c0.1,0,0.1,0,0.1,0.1c0.1,0,0.1,0,0.2,0.1c0,0,0,0.1-0.1,0.1
+	c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0.1,0,0.1,0,0.2,0C7,17.2,7.1,17.2,7.1,17.1 M7,15L7,15C7,15,6.9,14.9,7,15C6.9,14.9,6.9,14.9,7,15
+	C6.9,15,7,15,7,15 M6.9,14.9C6.9,14.9,6.9,14.9,6.9,14.9L6.9,14.9L6.9,14.9 M6.9,14.9C6.9,14.9,6.9,14.9,6.9,14.9L6.9,14.9
+	C6.9,14.9,6.9,14.9,6.9,14.9 M6.9,14.9C6.9,14.9,6.9,14.9,6.9,14.9L6.9,14.9C6.9,14.9,6.9,14.9,6.9,14.9 M6.9,14.9
+	C6.9,14.9,6.9,14.9,6.9,14.9L6.9,14.9C6.9,14.9,6.9,14.9,6.9,14.9 M8.9,13.6C8.9,13.6,8.9,13.6,8.9,13.6C8.9,13.6,8.8,13.5,8.9,13.6
+	c-0.1,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0-0.1,0-0.1c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0.1-0.1,0.1c0,0,0,0,0,0.1
+	C8.7,13.6,8.8,13.6,8.9,13.6C8.8,13.6,8.9,13.6,8.9,13.6 M2.7,13.3L2.7,13.3C2.7,13.2,2.7,13.2,2.7,13.3C2.7,13.2,2.7,13.2,2.7,13.3
+	c0-0.1,0-0.1,0-0.1c0,0,0-0.1,0-0.1c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0,0l0,0c0,0,0,0.1,0,0.1c0,0,0,0,0,0c0,0,0,0,0,0.1l0,0
+	c0,0,0,0,0,0C2.6,13.2,2.6,13.2,2.7,13.3C2.6,13.2,2.6,13.2,2.7,13.3C2.7,13.2,2.6,13.2,2.7,13.3C2.6,13.2,2.6,13.2,2.7,13.3
+	C2.6,13.2,2.7,13.3,2.7,13.3C2.7,13.3,2.7,13.3,2.7,13.3C2.7,13.3,2.7,13.3,2.7,13.3 M9.3,19.8C9.3,19.8,9.3,19.8,9.3,19.8
+	c-0.1-0.1-0.1-0.1-0.1-0.3c0,0-0.4-0.3-0.5-0.2c0,0-0.1,0-0.1,0c0,0,0,0,0,0l0,0c-0.1-0.1-0.3-0.1-0.4-0.1c0,0-0.3,0-0.3,0
+	c0,0,0,0,0,0c0-0.2,0.1-0.2-0.1-0.2c0,0,0.1,0,0.1,0C8,19,8.1,19,8.1,19c-0.1,0,0,0-0.1-0.1c0,0,0,0-0.1,0c0,0,0,0,0,0
+	c0,0,0,0,0-0.1c0,0,0,0,0,0c0,0,0.1,0,0.1,0l0,0l0,0c-0.2,0-0.3,0-0.5,0c-0.1,0-0.3-0.1-0.4-0.1c0,0,0-0.1,0-0.1c0,0,0,0,0,0
+	c0,0,0,0,0,0l0,0l0,0c0,0,0,0-0.2,0.1c0,0,0,0,0,0c0,0.1,0.1,0.1,0.1,0.2c0,0,0,0-0.1,0c-0.1-0.1-0.1-0.1,0-0.2c0-0.1,0-0.1,0-0.1
+	c0,0,0.1,0,0.1,0c0,0,0.1,0,0.1,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0-0.3,0.3-0.3,0.3c0,0,0,0,0,0c0,0,0-0.3-0.2-0.4
+	c-0.1,0-0.2,0-0.3,0C6,18.5,5.8,18.2,5.9,18c0,0,0-0.1,0-0.2c0,0-0.1,0-0.1,0c0-0.1-0.2,0-0.2-0.1c-0.1,0-0.3,0-0.3,0c0,0,0,0,0,0
+	l0,0l0,0c0.1-0.1,0.1-0.1,0.1-0.3c0,0,0,0,0-0.1l0,0c0,0,0,0,0-0.1l0,0c0,0,0,0,0,0.1c0-0.1,0-0.1,0-0.2c0,0,0,0,0,0l0,0l0-0.1
+	C5.5,17,5.5,17,5.5,17c-0.2-0.1-0.3,0-0.4,0c-0.1,0,0,0-0.1,0c0,0.1,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0.2,0,0.2c0,0,0,0.1,0,0.1
+	c0,0,0,0,0,0c0,0,0,0,0,0c-0.1,0-0.3,0-0.4,0C4.2,17,4.2,17,4.2,16.9c0-0.3,0.1-0.8,0.1-0.8l0-0.1c0,0,0,0,0,0c0,0,0.1,0,0.1,0
+	c0,0,0,0,0,0c0.1,0,0.1,0,0.2-0.1c0,0,0,0,0-0.1l0,0.1c0.1,0,0.2,0.1,0.3,0.1c0,0,0,0,0,0l0-0.1l0,0l0,0c0,0,0.1,0.1,0.1,0.1
+	C5,16,5.1,16,5.1,16c0,0,0,0,0,0L5,15.9c0,0,0,0,0,0l0.1,0l0,0l0,0c0,0,0.1,0.1,0.1,0.1c0,0,0,0-0.1-0.1c0,0,0,0,0,0c0,0,0,0-0.1,0
+	c0,0,0,0,0,0c0,0,0,0,0.1,0c0.1,0,0.1,0,0.2,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0.1,0.1c0,0,0,0,0,0c0.1,0,0.1,0,0.1,0
+	c0.2,0.1,0.2,0.1,0.2,0.1c0,0,0,0,0.2,0.1C6,16,6,16,6,16.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0.1,0,0.1
+	c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0.1,0.1,0.1,0.1,0.2c0,0,0.1-0.3,0.1-0.3c0,0,0-0.2,0-0.2c0,0,0,0,0,0c0.1,0-0.2-0.3-0.1-0.6
+	c0.1-0.2,0.4-0.2,0.6-0.4l0,0.1l0,0l0,0l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0c0,0,0.1,0,0.1,0
+	c0,0,0.1,0,0.1,0v0l-0.1,0l0,0l0,0l0.1,0l0,0v0l0,0c0,0,0,0.1,0,0.1c0,0,0,0,0,0c0,0,0-0.1,0-0.1c0,0,0,0,0,0l0,0l0,0l0,0.1
+	c0,0,0,0,0,0c0,0,0-0.1,0-0.1c0,0-0.1-0.1-0.1-0.1l0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1c0,0,0,0,0,0l0,0
+	l0,0c0,0,0,0,0,0l0-0.1c0,0,0-0.1-0.1-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.1,0-0.1-0.1c0,0,0.1,0,0.1,0l0.1,0c0,0,0,0.4,0,0.4
+	s-0.2,0-0.2,0c0,0,0-0.2,0-0.2c0,0,0-0.1,0-0.1c0,0,0,0.2,0.1,0.2c0,0,0,0.1,0,0.1c0,0,0,0,0,0h0c0,0,0,0,0,0c0,0,0-0.3,0-0.3
+	c0,0,0-0.1,0-0.1l0,0.2l0,0.2c0,0,0,0,0,0l0-0.3l0-0.1l0-0.1l0,0.2l0,0.3h0l0-0.2l0-0.2c0,0,0,0.5,0,0.5s-0.1,0-0.1,0l0-0.2l0.1-0.1
+	l0-0.1c0,0,0,0,0,0l0,0l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0l0,0l0,0l0,0l0,0l0,0c0,0,0,0.3,0,0.3s0,0,0,0
+	c0,0,0,0,0,0c0,0,0-0.1,0,0l0-0.1c0,0,0-0.1,0-0.1C7,14.7,7,14.4,7,14.3c0,0,0-0.3,0-0.3h0l0,0.5C7,14.5,7,15,7,15c0,0-0.1,0-0.1,0
+	s0-0.4,0-0.4l0,0c0,0,0.1-0.1,0.1-0.1c0-0.1,0.1-0.1,0-0.2l0,0c0,0,0,0,0,0c0.1,0,0.2-0.1,0.3-0.1c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.2,0,0.2,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0L7.7,14
+	c0,0,0.3,0,0.3,0s0,0.2,0,0.2l-0.2,0l-0.1,0c0,0-0.1-0.1-0.1-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0-0.1,0.2-0.1,0.2-0.1
+	c0,0,0,0,0,0l-0.1,0l-0.1,0.1L7.7,14c0,0,0,0,0,0l0-0.1l0,0l0,0l0,0l0,0c0,0,0,0.1,0,0c0,0,0,0.1,0,0.1h0l0-0.1l0,0l0,0l0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0.1,0.1,0.1c0,0,0,0.1,0,0.1c0,0,0,0,0,0l0-0.1l0-0.1l0,0c0,0,0.1,0,0.1,0
+	c0,0,0,0,0,0l0,0c0,0,0.1,0,0.1-0.1l0,0.2l0,0.2c0,0,0,0,0,0c0,0,0-0.2-0.1-0.1c0,0,0-0.1,0-0.1c0.1,0,0.2-0.1,0.2-0.1
+	c0,0-0.1,0-0.1,0c0,0-0.2,0-0.2,0l-0.2,0V14h0.2l0,0l0,0c0,0,0.1,0,0.1,0l0,0l0,0l0,0l0,0c0,0,0,0-0.1,0c0,0,0,0,0,0L8,13.8
+	c0,0,0,0,0,0l0.1,0c0,0,0,0,0,0l0,0l0,0c0,0,0,0,0,0.1c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0
+	c0,0,0.1-0.1,0.1-0.1c0,0,0,0.1,0,0.1l0,0.1c0,0,0,0,0,0l-0.2-0.1L8,13.8v0c0,0,0.3,0,0.3,0l0.1,0l0.1,0l0,0c0.1,0,0.1,0,0.2-0.1
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0l0,0c0,0,0,0-0.1,0l0,0l0,0l0,0c0,0-0.1,0-0.1,0c0,0,0,0.2-0.1,0.2c0,0,0,0.2,0,0.2
+	c0,0,0,0,0,0l0-0.2c0,0-0.1-0.1-0.1-0.1l0,0.2c0,0,0,0.1,0,0.1c0,0,0,0,0,0S8,14,8,14s0-0.4,0-0.4l0.2,0l-0.1,0
+	c-0.1,0-0.2,0-0.2-0.1c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0.1-0.1,0.1-0.1l-0.1,0l-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0-0.1,0.3-0.1,0.3-0.1c-0.2-0.2-0.6,0.1-0.7,0.3C7.8,13,8.2,13,8.6,13c0.1,0,0.2,0,0.3,0c-0.5,0-1,0-1.5,0c-0.3,0-0.5,0-0.8,0
+	c-1.7,0-3.1,0-3.9,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0.3-0.1,0.4c0,0,0,0,0,0c0,0,0,0,0-0.1c0,0,0,0,0,0
+	c0,0-0.1,0-0.1,0c0,0,0,0.1,0,0.1c0,0,0,0,0,0l0,0l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0.1-0.1,0.2-0.2,0.4c0,0.1,0,0.1-0.2,0.6c0,0,0,0,0,0c0,0,0,0,0,0l0,0.1l0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0.1,0,0.1c0,0,0,0,0,0l0,0c0,0.1,0.1,0.3,0,0.4c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0
+	c0,0,0.3,0,0.3,0c0,0.1-0.7,0.1,0.3,0.2c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c-1,0-1,0-1,0c0,0,0,0,0,0
+	c0,0,0,0,0,0c1,0,0.4,0.6,0.4,0.6c0,0,0.1,0,0.1,0c0,0,0.3,0.5,0.5,0.7c0,0,0.1-0.1,0.1-0.1c0,0,0,0,0-0.1c0,0,0,0,0,0
+	c0-0.1-0.1-0.4-0.1-0.4c0,0,0,0,0,0c0,0,0-0.1,0-0.1c0,0,0,0,0,0c0-0.2-0.1-0.3-0.2-0.5c0,0,0-0.1,0-0.1c0,0,0.1,0,0.1,0l0,0
+	c0,0,0,0,0,0c0,0,0,0,0,0C2.8,16,2.8,16,3.1,16.3c0,0.1,0,0.1,0,0.1l0,0c0.1,0.2,0.2,0.3,0.3,0.5c0,0,0,0,0,0c0,0.1,0,0.1,0,0.2
+	c0,0,0,0,0,0c0,0,0,0,0,0C3.5,17.3,4,17.6,4,17.6c0.1,0,0.2,0.1,0.3,0.1c0.1,0,0.2-0.1,0.4,0c0.2,0.1,0.2,0.2,0.4,0.3L5.4,18
+	c0,0,0,0,0-0.1c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0.1,0.1,0.2,0.2,0.3,0.2l0,0l0,0l0,0c0,0,0,0,0,0c0,0,0,0.1,0.1,0.1l0.1,0
+	c0,0,0.1,0,0.1-0.1c0,0,0,0,0,0c0,0,0.1,0.1,0.1,0.1c0,0-0.1,0-0.1,0c0,0,0,0,0,0l-0.1,0v0.2C6,18.8,6,19,6,19c0,0,0,0,0,0
+	c0.1,0,0.1,0,0.2,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0-0.1,0-0.1c0,0,0.1-0.1,0.1-0.1c0,0-0.2-0.1-0.2-0.1c0,0-0.2-0.1-0.2-0.1
+	c0,0,0,0,0,0c0,0,0.2,0,0.3,0c0,0,0.1,0,0.1,0c0.1,0,0.2,0,0.2,0.1c0,0,0.1,0.2,0.1,0.2c0,0,0,0.2,0.1,0.2c0,0,0,0,0,0
+	c0,0,0-0.1,0-0.1c0,0-0.1-0.1-0.2-0.1c0,0,0,0,0,0c0,0,0,0,0-0.1c-0.2,0-0.1,0.2-0.2,0.3c0,0,0,0,0,0c0,0,0,0,0,0l0,0
+	c0,0,0,0-0.1-0.1c0,0,0,0,0,0c0,0,0,0.1,0,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0.1,0,0.1c0.1,0.1,0.1,0.3,0.1,0.3c0,0,0,0,0,0
+	c0,0,0,0,0,0.1c0,0-0.1,0-0.1,0c0,0,0,0,0,0.1c0,0,0,0,0,0c0,0-0.1,0-0.1,0.1c0,0,0,0,0,0.1c0.4,0,0.9,0,1.4,0c0.6,0,1.2,0,1.7,0
+	C9.1,20,9.3,19.9,9.3,19.8"/>
+<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="7.4653" y1="9.0342" x2="7.4653" y2="23.9663">
+	<stop  offset="0" style="stop-color:#76A1F0"/>
+	<stop  offset="1" style="stop-color:#6B90D5"/>
+	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
+	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
+</linearGradient>
+<path style="fill:url(#SVGID_8_);" d="M7.5,9C3.3,9,0,12.4,0,16.5C0,20.6,3.3,24,7.5,24c4.1,0,7.5-3.3,7.5-7.5
+	C14.9,12.4,11.6,9,7.5,9z M13.7,18.6c-0.1,0.3-0.2,0.6-0.4,0.9s-0.3,0.6-0.5,0.9s-0.4,0.5-0.6,0.8s-0.5,0.5-0.8,0.6
+	c-0.3,0.2-0.6,0.4-0.9,0.5c-0.3,0.2-0.6,0.3-0.9,0.4s-0.7,0.2-1,0.2C8.2,23,7.9,23,7.5,23C1,22.7-0.9,15.2,3.3,11.6
+	C5,10.1,6.8,10,7.5,10c0.4,0,0.7,0,1.1,0.1c0.3,0.1,0.7,0.1,1,0.2s0.6,0.2,0.9,0.4c0.3,0.2,0.6,0.3,0.9,0.5c0.3,0.2,0.5,0.4,0.8,0.6
+	c0.2,0.2,0.5,0.5,0.6,0.8c0.2,0.3,0.4,0.6,0.5,0.9s0.3,0.6,0.4,0.9s0.2,0.7,0.2,1c0.1,0.3,0.1,0.7,0.1,1.1c0,0.4,0,0.7-0.1,1.1
+	C13.9,17.9,13.8,18.2,13.7,18.6z"/>
+</svg>
diff --git a/src/assets/img/mod_legacy/wiki.svg b/src/assets/img/mod_legacy/wiki.svg
new file mode 100644
index 000000000..f3101ce19
--- /dev/null
+++ b/src/assets/img/mod_legacy/wiki.svg
@@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" style="overflow:visible;enable-background:new 0 0 24 24;"
+	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<defs>
+</defs>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="18" y1="13" x2="18" y2="20.0005">
+	<stop  offset="0" style="stop-color:#8E8E8E"/>
+	<stop  offset="4.191053e-02" style="stop-color:#8A8A8A"/>
+	<stop  offset="0.4613" style="stop-color:#626262"/>
+	<stop  offset="0.7952" style="stop-color:#4A4A4A"/>
+	<stop  offset="1" style="stop-color:#414141"/>
+	<a:midPointStop  offset="0" style="stop-color:#8E8E8E"/>
+	<a:midPointStop  offset="0.4" style="stop-color:#8E8E8E"/>
+	<a:midPointStop  offset="1" style="stop-color:#414141"/>
+</linearGradient>
+<rect x="12" y="13" style="fill:url(#SVGID_1_);" width="12" height="7"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="17.5" y1="14" x2="17.5" y2="19">
+	<stop  offset="0" style="stop-color:#F7F7F7"/>
+	<stop  offset="0.1044" style="stop-color:#FCFCFC"/>
+	<stop  offset="0.3293" style="stop-color:#FFFFFF"/>
+	<stop  offset="0.5692" style="stop-color:#E8E8E8"/>
+	<stop  offset="0.8153" style="stop-color:#D7D7D7"/>
+	<stop  offset="1" style="stop-color:#D1D1D1"/>
+	<a:midPointStop  offset="0" style="stop-color:#F7F7F7"/>
+	<a:midPointStop  offset="0.2222" style="stop-color:#F7F7F7"/>
+	<a:midPointStop  offset="0.3293" style="stop-color:#FFFFFF"/>
+	<a:midPointStop  offset="0.3545" style="stop-color:#FFFFFF"/>
+	<a:midPointStop  offset="1" style="stop-color:#D1D1D1"/>
+</linearGradient>
+<rect x="12" y="14" style="fill:url(#SVGID_2_);" width="11" height="5"/>
+<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="17" y1="15" x2="17" y2="18">
+	<stop  offset="0" style="stop-color:#8E8E8E"/>
+	<stop  offset="4.191053e-02" style="stop-color:#8A8A8A"/>
+	<stop  offset="0.4613" style="stop-color:#626262"/>
+	<stop  offset="0.7952" style="stop-color:#4A4A4A"/>
+	<stop  offset="1" style="stop-color:#414141"/>
+	<a:midPointStop  offset="0" style="stop-color:#8E8E8E"/>
+	<a:midPointStop  offset="0.4" style="stop-color:#8E8E8E"/>
+	<a:midPointStop  offset="1" style="stop-color:#414141"/>
+</linearGradient>
+<rect x="12" y="15" style="fill:url(#SVGID_3_);" width="10" height="3"/>
+<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="16.5" y1="0" x2="16.5" y2="24.0005">
+	<stop  offset="0" style="stop-color:#8E8E8E"/>
+	<stop  offset="4.191053e-02" style="stop-color:#8A8A8A"/>
+	<stop  offset="0.4613" style="stop-color:#626262"/>
+	<stop  offset="0.7952" style="stop-color:#4A4A4A"/>
+	<stop  offset="1" style="stop-color:#414141"/>
+	<a:midPointStop  offset="0" style="stop-color:#8E8E8E"/>
+	<a:midPointStop  offset="0.4" style="stop-color:#8E8E8E"/>
+	<a:midPointStop  offset="1" style="stop-color:#414141"/>
+</linearGradient>
+<rect x="13" style="fill:url(#SVGID_4_);" width="7" height="24"/>
+<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="16.5" y1="1" x2="16.5" y2="23.0005">
+	<stop  offset="0" style="stop-color:#F7F7F7"/>
+	<stop  offset="0.1044" style="stop-color:#FCFCFC"/>
+	<stop  offset="0.3293" style="stop-color:#FFFFFF"/>
+	<stop  offset="0.5692" style="stop-color:#E8E8E8"/>
+	<stop  offset="0.8153" style="stop-color:#D7D7D7"/>
+	<stop  offset="1" style="stop-color:#D1D1D1"/>
+	<a:midPointStop  offset="0" style="stop-color:#F7F7F7"/>
+	<a:midPointStop  offset="0.2222" style="stop-color:#F7F7F7"/>
+	<a:midPointStop  offset="0.3293" style="stop-color:#FFFFFF"/>
+	<a:midPointStop  offset="0.3545" style="stop-color:#FFFFFF"/>
+	<a:midPointStop  offset="1" style="stop-color:#D1D1D1"/>
+</linearGradient>
+<rect x="14" y="1" style="fill:url(#SVGID_5_);" width="5" height="22"/>
+<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="16.5" y1="2" x2="16.5" y2="22.0005">
+	<stop  offset="0" style="stop-color:#8E8E8E"/>
+	<stop  offset="4.191053e-02" style="stop-color:#8A8A8A"/>
+	<stop  offset="0.4613" style="stop-color:#626262"/>
+	<stop  offset="0.7952" style="stop-color:#4A4A4A"/>
+	<stop  offset="1" style="stop-color:#414141"/>
+	<a:midPointStop  offset="0" style="stop-color:#8E8E8E"/>
+	<a:midPointStop  offset="0.4" style="stop-color:#8E8E8E"/>
+	<a:midPointStop  offset="1" style="stop-color:#414141"/>
+</linearGradient>
+<rect x="15" y="2" style="fill:url(#SVGID_6_);" width="3" height="20"/>
+<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="18" y1="4" x2="18" y2="11">
+	<stop  offset="0" style="stop-color:#8E8E8E"/>
+	<stop  offset="4.191053e-02" style="stop-color:#8A8A8A"/>
+	<stop  offset="0.4613" style="stop-color:#626262"/>
+	<stop  offset="0.7952" style="stop-color:#4A4A4A"/>
+	<stop  offset="1" style="stop-color:#414141"/>
+	<a:midPointStop  offset="0" style="stop-color:#8E8E8E"/>
+	<a:midPointStop  offset="0.4" style="stop-color:#8E8E8E"/>
+	<a:midPointStop  offset="1" style="stop-color:#414141"/>
+</linearGradient>
+<rect x="12" y="4" style="fill:url(#SVGID_7_);" width="12" height="7"/>
+<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="17.5" y1="5" x2="17.5" y2="10">
+	<stop  offset="0" style="stop-color:#F7F7F7"/>
+	<stop  offset="0.1044" style="stop-color:#FCFCFC"/>
+	<stop  offset="0.3293" style="stop-color:#FFFFFF"/>
+	<stop  offset="0.5692" style="stop-color:#E8E8E8"/>
+	<stop  offset="0.8153" style="stop-color:#D7D7D7"/>
+	<stop  offset="1" style="stop-color:#D1D1D1"/>
+	<a:midPointStop  offset="0" style="stop-color:#F7F7F7"/>
+	<a:midPointStop  offset="0.2222" style="stop-color:#F7F7F7"/>
+	<a:midPointStop  offset="0.3293" style="stop-color:#FFFFFF"/>
+	<a:midPointStop  offset="0.3545" style="stop-color:#FFFFFF"/>
+	<a:midPointStop  offset="1" style="stop-color:#D1D1D1"/>
+</linearGradient>
+<rect x="12" y="5" style="fill:url(#SVGID_8_);" width="11" height="5"/>
+<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="17" y1="6" x2="17" y2="9">
+	<stop  offset="0" style="stop-color:#8E8E8E"/>
+	<stop  offset="4.191053e-02" style="stop-color:#8A8A8A"/>
+	<stop  offset="0.4613" style="stop-color:#626262"/>
+	<stop  offset="0.7952" style="stop-color:#4A4A4A"/>
+	<stop  offset="1" style="stop-color:#414141"/>
+	<a:midPointStop  offset="0" style="stop-color:#8E8E8E"/>
+	<a:midPointStop  offset="0.4" style="stop-color:#8E8E8E"/>
+	<a:midPointStop  offset="1" style="stop-color:#414141"/>
+</linearGradient>
+<rect x="12" y="6" style="fill:url(#SVGID_9_);" width="10" height="3"/>
+<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="6" y1="4" x2="6" y2="11">
+	<stop  offset="0" style="stop-color:#8E8E8E"/>
+	<stop  offset="4.191053e-02" style="stop-color:#8A8A8A"/>
+	<stop  offset="0.4613" style="stop-color:#626262"/>
+	<stop  offset="0.7952" style="stop-color:#4A4A4A"/>
+	<stop  offset="1" style="stop-color:#414141"/>
+	<a:midPointStop  offset="0" style="stop-color:#8E8E8E"/>
+	<a:midPointStop  offset="0.4" style="stop-color:#8E8E8E"/>
+	<a:midPointStop  offset="1" style="stop-color:#414141"/>
+</linearGradient>
+<rect y="4" style="fill:url(#SVGID_10_);" width="12" height="7"/>
+<linearGradient id="SVGID_11_" gradientUnits="userSpaceOnUse" x1="6.5" y1="5" x2="6.5" y2="10">
+	<stop  offset="0" style="stop-color:#F7F7F7"/>
+	<stop  offset="0.1044" style="stop-color:#FCFCFC"/>
+	<stop  offset="0.3293" style="stop-color:#FFFFFF"/>
+	<stop  offset="0.5692" style="stop-color:#E8E8E8"/>
+	<stop  offset="0.8153" style="stop-color:#D7D7D7"/>
+	<stop  offset="1" style="stop-color:#D1D1D1"/>
+	<a:midPointStop  offset="0" style="stop-color:#F7F7F7"/>
+	<a:midPointStop  offset="0.2222" style="stop-color:#F7F7F7"/>
+	<a:midPointStop  offset="0.3293" style="stop-color:#FFFFFF"/>
+	<a:midPointStop  offset="0.3545" style="stop-color:#FFFFFF"/>
+	<a:midPointStop  offset="1" style="stop-color:#D1D1D1"/>
+</linearGradient>
+<rect x="1" y="5" style="fill:url(#SVGID_11_);" width="11" height="5"/>
+<linearGradient id="SVGID_12_" gradientUnits="userSpaceOnUse" x1="7" y1="6" x2="7" y2="9">
+	<stop  offset="0" style="stop-color:#8E8E8E"/>
+	<stop  offset="4.191053e-02" style="stop-color:#8A8A8A"/>
+	<stop  offset="0.4613" style="stop-color:#626262"/>
+	<stop  offset="0.7952" style="stop-color:#4A4A4A"/>
+	<stop  offset="1" style="stop-color:#414141"/>
+	<a:midPointStop  offset="0" style="stop-color:#8E8E8E"/>
+	<a:midPointStop  offset="0.4" style="stop-color:#8E8E8E"/>
+	<a:midPointStop  offset="1" style="stop-color:#414141"/>
+</linearGradient>
+<rect x="2" y="6" style="fill:url(#SVGID_12_);" width="10" height="3"/>
+<linearGradient id="SVGID_13_" gradientUnits="userSpaceOnUse" x1="7.5" y1="0" x2="7.5" y2="24.0005">
+	<stop  offset="0" style="stop-color:#8E8E8E"/>
+	<stop  offset="4.191053e-02" style="stop-color:#8A8A8A"/>
+	<stop  offset="0.4613" style="stop-color:#626262"/>
+	<stop  offset="0.7952" style="stop-color:#4A4A4A"/>
+	<stop  offset="1" style="stop-color:#414141"/>
+	<a:midPointStop  offset="0" style="stop-color:#8E8E8E"/>
+	<a:midPointStop  offset="0.4" style="stop-color:#8E8E8E"/>
+	<a:midPointStop  offset="1" style="stop-color:#414141"/>
+</linearGradient>
+<rect x="4" style="fill:url(#SVGID_13_);" width="7" height="24"/>
+<linearGradient id="SVGID_14_" gradientUnits="userSpaceOnUse" x1="7.5" y1="1" x2="7.5" y2="23.0005">
+	<stop  offset="0" style="stop-color:#F7F7F7"/>
+	<stop  offset="0.1044" style="stop-color:#FCFCFC"/>
+	<stop  offset="0.3293" style="stop-color:#FFFFFF"/>
+	<stop  offset="0.5692" style="stop-color:#E8E8E8"/>
+	<stop  offset="0.8153" style="stop-color:#D7D7D7"/>
+	<stop  offset="1" style="stop-color:#D1D1D1"/>
+	<a:midPointStop  offset="0" style="stop-color:#F7F7F7"/>
+	<a:midPointStop  offset="0.2222" style="stop-color:#F7F7F7"/>
+	<a:midPointStop  offset="0.3293" style="stop-color:#FFFFFF"/>
+	<a:midPointStop  offset="0.3545" style="stop-color:#FFFFFF"/>
+	<a:midPointStop  offset="1" style="stop-color:#D1D1D1"/>
+</linearGradient>
+<rect x="5" y="1" style="fill:url(#SVGID_14_);" width="5" height="22"/>
+<linearGradient id="SVGID_15_" gradientUnits="userSpaceOnUse" x1="7.5" y1="2" x2="7.5" y2="22.0005">
+	<stop  offset="0" style="stop-color:#8E8E8E"/>
+	<stop  offset="4.191053e-02" style="stop-color:#8A8A8A"/>
+	<stop  offset="0.4613" style="stop-color:#626262"/>
+	<stop  offset="0.7952" style="stop-color:#4A4A4A"/>
+	<stop  offset="1" style="stop-color:#414141"/>
+	<a:midPointStop  offset="0" style="stop-color:#8E8E8E"/>
+	<a:midPointStop  offset="0.4" style="stop-color:#8E8E8E"/>
+	<a:midPointStop  offset="1" style="stop-color:#414141"/>
+</linearGradient>
+<rect x="6" y="2" style="fill:url(#SVGID_15_);" width="3" height="20"/>
+<linearGradient id="SVGID_16_" gradientUnits="userSpaceOnUse" x1="6" y1="13" x2="6" y2="20.0005">
+	<stop  offset="0" style="stop-color:#8E8E8E"/>
+	<stop  offset="4.191053e-02" style="stop-color:#8A8A8A"/>
+	<stop  offset="0.4613" style="stop-color:#626262"/>
+	<stop  offset="0.7952" style="stop-color:#4A4A4A"/>
+	<stop  offset="1" style="stop-color:#414141"/>
+	<a:midPointStop  offset="0" style="stop-color:#8E8E8E"/>
+	<a:midPointStop  offset="0.4" style="stop-color:#8E8E8E"/>
+	<a:midPointStop  offset="1" style="stop-color:#414141"/>
+</linearGradient>
+<rect y="13" style="fill:url(#SVGID_16_);" width="12" height="7"/>
+<linearGradient id="SVGID_17_" gradientUnits="userSpaceOnUse" x1="6.5" y1="14" x2="6.5" y2="19">
+	<stop  offset="0" style="stop-color:#F7F7F7"/>
+	<stop  offset="0.1044" style="stop-color:#FCFCFC"/>
+	<stop  offset="0.3293" style="stop-color:#FFFFFF"/>
+	<stop  offset="0.5692" style="stop-color:#E8E8E8"/>
+	<stop  offset="0.8153" style="stop-color:#D7D7D7"/>
+	<stop  offset="1" style="stop-color:#D1D1D1"/>
+	<a:midPointStop  offset="0" style="stop-color:#F7F7F7"/>
+	<a:midPointStop  offset="0.2222" style="stop-color:#F7F7F7"/>
+	<a:midPointStop  offset="0.3293" style="stop-color:#FFFFFF"/>
+	<a:midPointStop  offset="0.3545" style="stop-color:#FFFFFF"/>
+	<a:midPointStop  offset="1" style="stop-color:#D1D1D1"/>
+</linearGradient>
+<rect x="1" y="14" style="fill:url(#SVGID_17_);" width="11" height="5"/>
+<linearGradient id="SVGID_18_" gradientUnits="userSpaceOnUse" x1="7" y1="15" x2="7" y2="18">
+	<stop  offset="0" style="stop-color:#8E8E8E"/>
+	<stop  offset="4.191053e-02" style="stop-color:#8A8A8A"/>
+	<stop  offset="0.4613" style="stop-color:#626262"/>
+	<stop  offset="0.7952" style="stop-color:#4A4A4A"/>
+	<stop  offset="1" style="stop-color:#414141"/>
+	<a:midPointStop  offset="0" style="stop-color:#8E8E8E"/>
+	<a:midPointStop  offset="0.4" style="stop-color:#8E8E8E"/>
+	<a:midPointStop  offset="1" style="stop-color:#414141"/>
+</linearGradient>
+<rect x="2" y="15" style="fill:url(#SVGID_18_);" width="10" height="3"/>
+</svg>
diff --git a/src/assets/img/mod_legacy/workshop.svg b/src/assets/img/mod_legacy/workshop.svg
new file mode 100644
index 000000000..f466455a6
--- /dev/null
+++ b/src/assets/img/mod_legacy/workshop.svg
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" style="overflow:visible;enable-background:new 0 0 24 24;"
+	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<defs>
+</defs>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="7.9995" y1="7.9868" x2="7.9995" y2="24.001">
+	<stop  offset="0" style="stop-color:#F0A829"/>
+	<stop  offset="1" style="stop-color:#C7671A"/>
+	<a:midPointStop  offset="0" style="stop-color:#F0A829"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#F0A829"/>
+	<a:midPointStop  offset="1" style="stop-color:#C7671A"/>
+</linearGradient>
+<path style="fill:url(#SVGID_1_);" d="M3,19.2l-3,1.6V24h16v-0.4c0-0.5-0.5-1.2-1-1.5l-6-3.1c-0.5-0.3-0.6-0.8-0.3-1.2
+	c0,0,1.6-2,1.6-4.2C10.4,10.5,8.4,8,6,8c-2.4,0-4.4,2.6-4.4,5.7c0,2.1,1.6,4.2,1.6,4.2C3.6,18.3,3.5,18.9,3,19.2z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="7.7212" y1="8.9868" x2="7.7212" y2="23.001">
+	<stop  offset="0" style="stop-color:#FFEBA8"/>
+	<stop  offset="1" style="stop-color:#F8BE27"/>
+	<a:midPointStop  offset="0" style="stop-color:#FFEBA8"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#FFEBA8"/>
+	<a:midPointStop  offset="1" style="stop-color:#F8BE27"/>
+</linearGradient>
+<path style="fill:url(#SVGID_2_);" d="M1,23v-1.7L3.5,20c0.5-0.3,0.8-0.7,1-1.2c0.1-0.5,0-1.1-0.4-1.5c0,0-1.4-1.8-1.4-3.6
+	C2.6,11.1,4.2,9,6,9s3.4,2.1,3.4,4.7c0,1.7-1.4,3.5-1.4,3.6c-0.3,0.4-0.5,1-0.4,1.5c0.1,0.5,0.5,1,1,1.2l5.9,3H1z"/>
+<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="6.1343" y1="9.9868" x2="6.1343" y2="22.001">
+	<stop  offset="0" style="stop-color:#FFC30F"/>
+	<stop  offset="1" style="stop-color:#F5AE0D"/>
+	<a:midPointStop  offset="0" style="stop-color:#FFC30F"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#FFC30F"/>
+	<a:midPointStop  offset="1" style="stop-color:#F5AE0D"/>
+</linearGradient>
+<path style="fill:url(#SVGID_3_);" d="M2,22L2,22l1.9-1.1c0.8-0.4,1.3-1.1,1.5-1.9c0.2-0.8,0-1.7-0.6-2.3c-0.3-0.4-1.2-1.8-1.2-3
+	c0-2,1.1-3.7,2.4-3.7s2.4,1.7,2.4,3.7c0,1.1-0.9,2.5-1.2,3c-0.5,0.7-0.7,1.5-0.5,2.3c0.2,0.8,0.7,1.5,1.5,1.9l2.2,1.1H2z"/>
+<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="16" y1="7.9868" x2="16" y2="24.001">
+	<stop  offset="0" style="stop-color:#8D470D"/>
+	<stop  offset="1" style="stop-color:#7C3D09"/>
+	<a:midPointStop  offset="0" style="stop-color:#8D470D"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#8D470D"/>
+	<a:midPointStop  offset="1" style="stop-color:#7C3D09"/>
+</linearGradient>
+<path style="fill:url(#SVGID_4_);" d="M24,24v-3.4l-3-1.5c-0.5-0.3-0.6-0.8-0.3-1.2c0,0,1.6-2,1.6-4.2c0-3.2-1.9-5.7-4.4-5.7
+	c-2.4,0-4.4,2.6-4.4,5.7c0,2.1,1.6,4.2,1.6,4.2c0.3,0.4,0.2,1-0.3,1.3l-6,3.2c-0.5,0.3-1,0.9-1,1.5V24H24z"/>
+<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="16.4121" y1="8.9868" x2="16.4121" y2="23.001">
+	<stop  offset="0" style="stop-color:#D58738"/>
+	<stop  offset="1" style="stop-color:#AB551F"/>
+	<a:midPointStop  offset="0" style="stop-color:#D58738"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#D58738"/>
+	<a:midPointStop  offset="1" style="stop-color:#AB551F"/>
+</linearGradient>
+<path style="fill:url(#SVGID_5_);" d="M9.8,23l5.7-3c0.5-0.3,0.8-0.7,1-1.2c0.1-0.5,0-1.1-0.4-1.5c0,0-1.4-1.8-1.4-3.6
+	c0-2.6,1.5-4.7,3.4-4.7s3.4,2.1,3.4,4.7c0,1.8-1.4,3.6-1.4,3.6c-0.3,0.4-0.5,1-0.4,1.5s0.5,1,1,1.2l2.4,1.2V23H9.8z"/>
+<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="17.9424" y1="9.9868" x2="17.9424" y2="22.001">
+	<stop  offset="0" style="stop-color:#D0813A"/>
+	<stop  offset="1" style="stop-color:#AF551D"/>
+	<a:midPointStop  offset="0" style="stop-color:#D0813A"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#D0813A"/>
+	<a:midPointStop  offset="1" style="stop-color:#AF551D"/>
+</linearGradient>
+<path style="fill:url(#SVGID_6_);" d="M13.9,22l2.1-1.1c0.8-0.4,1.3-1.1,1.5-1.9c0.2-0.8,0-1.7-0.6-2.3c-0.3-0.4-1.2-1.8-1.2-3
+	c0-2,1.1-3.7,2.4-3.7s2.4,1.7,2.4,3.7c0,1.2-0.9,2.5-1.2,3c-0.5,0.7-0.7,1.5-0.6,2.3c0.2,0.8,0.7,1.5,1.5,1.9l1.9,1V22H13.9z"/>
+<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="7.4507" y1="0" x2="7.4507" y2="12.9043">
+	<stop  offset="0" style="stop-color:#76A1F0"/>
+	<stop  offset="1" style="stop-color:#6B90D5"/>
+	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
+	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
+</linearGradient>
+<path style="fill:url(#SVGID_7_);" d="M12.5,10.4c1.4-1.1,2.4-2.6,2.4-4.3c0.1-3.3-3.2-6-7.3-6.1C3.4-0.1,0.1,2.5,0,5.8
+	c-0.1,3.3,3.2,6,7.3,6.1c1,0,2-0.1,2.9-0.4c0.8,1,2.8,1.4,2.8,1.4S12.2,11.7,12.5,10.4z"/>
+<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="7.4507" y1="1" x2="7.4507" y2="11.2168">
+	<stop  offset="0" style="stop-color:#BBE0F7"/>
+	<stop  offset="1" style="stop-color:#82B4FB"/>
+	<a:midPointStop  offset="0" style="stop-color:#BBE0F7"/>
+	<a:midPointStop  offset="0.5" style="stop-color:#BBE0F7"/>
+	<a:midPointStop  offset="1" style="stop-color:#82B4FB"/>
+</linearGradient>
+<path style="fill:url(#SVGID_8_);" d="M11.4,11.2c-0.2-0.1-0.3-0.2-0.4-0.3l-0.4-0.6l-0.7,0.2c-0.8,0.2-1.6,0.4-2.4,0.4l-0.1,0
+	C3.8,10.8,1,8.6,1,5.8C1,3.2,3.9,1,7.4,1l0.2,0c1.8,0,3.4,0.6,4.6,1.6c1.1,1,1.8,2.2,1.7,3.5c0,1.3-0.7,2.6-2,3.5l-0.3,0.2l-0.1,0.4
+	C11.4,10.5,11.4,10.9,11.4,11.2z"/>
+<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="7.4507" y1="2" x2="7.4507" y2="9.9097">
+	<stop  offset="0" style="stop-color:#95BFF8"/>
+	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
+	<stop  offset="1" style="stop-color:#7CA4EB"/>
+	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
+	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
+	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
+</linearGradient>
+<path style="fill:url(#SVGID_9_);" d="M7.4,9.9C4.4,9.9,2,8,2,5.9C2,3.8,4.5,2,7.4,2l0.1,0c1.5,0,2.9,0.5,4,1.4
+	c0.9,0.8,1.4,1.7,1.4,2.7c0,1-0.6,2-1.6,2.7l-0.6,0.4l0,0.1L9.6,9.6C9,9.8,8.2,9.9,7.5,9.9L7.4,9.9z"/>
+<path style="fill:#FFFFFF;" d="M5.5,4.5h1.9V6c0,0.5-0.1,1-0.3,1.3C6.9,7.6,6.5,7.9,5.9,8.1L5.5,7.3C5.9,7.2,6.1,7,6.2,6.9
+	c0.1-0.2,0.2-0.3,0.2-0.6H5.5V4.5z M7.7,4.5h1.9V6c0,0.5-0.1,1-0.3,1.3C9.1,7.6,8.7,7.9,8.2,8.1L7.7,7.3C8.1,7.2,8.3,7,8.4,6.9
+	c0.1-0.2,0.2-0.3,0.2-0.6H7.7V4.5z"/>
+</svg>

From 851d33d3803536fbd4307d6d6eeaa8272f557b19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 18 Jan 2022 09:58:37 +0100
Subject: [PATCH 0362/1008] MOBILE-3811 mod: Use new module icons on 4.0+ sites

---
 src/core/components/mod-icon/mod-icon.scss    | 19 +++++++++--
 src/core/components/mod-icon/mod-icon.ts      | 33 +++++++++++++++++--
 .../components/module/core-course-module.html |  2 +-
 .../course/components/module/module.scss      |  8 ++---
 src/core/features/course/services/course.ts   | 13 +++++---
 src/core/lang.json                            |  3 --
 src/theme/globals.variables.scss              | 10 ++++--
 src/theme/theme.light.scss                    |  5 +++
 8 files changed, 73 insertions(+), 20 deletions(-)

diff --git a/src/core/components/mod-icon/mod-icon.scss b/src/core/components/mod-icon/mod-icon.scss
index e8cbb5754..a5b781a26 100644
--- a/src/core/components/mod-icon/mod-icon.scss
+++ b/src/core/components/mod-icon/mod-icon.scss
@@ -1,3 +1,5 @@
+@import "~theme/globals";
+
 :host {
     --size: var(--module-icon-size);
     --margin-end: 0px;
@@ -6,6 +8,19 @@
     margin-top: var(--margin-vertical);
     margin-bottom: var(--margin-vertical);
     margin-right: var(--margin-end);
+    border-radius: 4px;
+    padding: 0.7rem;
+    background-color: $gray-lighter;
+
+    @each $type, $value in $activity-icon-colors {
+        &.#{$type} {
+            background-color: var(--activity#{$type});
+            img {
+                filter: brightness(0) invert(1);
+            }
+        }
+    }
+
 }
 
 img {
@@ -23,7 +38,7 @@ img {
 
 :host-context(ion-item) {
     --margin-vertical: 12px;
-    --margin-end: 32px;
+    --margin-end: 1rem;
 }
 
 :host-context(ion-card ion-item) {
@@ -34,4 +49,4 @@ img {
 :host-context([dir=rtl]) {
     margin-right: unset;
     margin-left: var(--margin-end);
-}
\ No newline at end of file
+}
diff --git a/src/core/components/mod-icon/mod-icon.ts b/src/core/components/mod-icon/mod-icon.ts
index c9c6b70ac..7f0262038 100644
--- a/src/core/components/mod-icon/mod-icon.ts
+++ b/src/core/components/mod-icon/mod-icon.ts
@@ -12,8 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, Input, OnChanges, OnInit, SimpleChange } from '@angular/core';
+import { CoreConstants } from '@/core/constants';
+import { Component, ElementRef, Input, OnChanges, OnInit, SimpleChange } from '@angular/core';
 import { CoreCourse } from '@features/course/services/course';
+import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate';
+import { CoreSites } from '@services/sites';
 
 const assetsPath = 'assets/img/';
 const fallbackModName = 'external-tool';
@@ -38,11 +41,31 @@ export class CoreModIconComponent implements OnInit, OnChanges {
     isLocalUrl = true;
     linkIconWithComponent = false;
 
+    protected legacyIcon = true; // @deprecatedonmoodle since Moodle 3.11.
+
+    constructor(protected el: ElementRef) { }
+
     /**
      * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
+        if (!this.modname && this.modicon) {
+            // Guess module from the icon url.
+            const matches = this.modicon.match('/theme/image.php/[^/]+/([^/]+)/[-0-9]*/');
+            this.modname = (matches && matches[1]) || '';
+        }
+
         this.modNameTranslated = this.modname ? CoreCourse.translateModuleName(this.modname) || '' : '';
+        if (CoreSites.getCurrentSite()?.isVersionGreaterEqualThan('4.0')) {
+            this.legacyIcon = false;
+            const purposeClass =
+                CoreCourseModuleDelegate.supportsFeature<string>(this.modname, CoreConstants.FEATURE_MOD_PURPOSE, '');
+
+            if (purposeClass != '') {
+                const element: HTMLElement = this.el.nativeElement;
+                element.classList.add(purposeClass);
+            }
+        }
 
         this.setIcon();
     }
@@ -82,7 +105,13 @@ export class CoreModIconComponent implements OnInit, OnChanges {
             ? fallbackModName
             : this.modname;
 
-        this.icon = assetsPath + moduleName + '.svg';
+        let path = assetsPath + 'mod/';
+        if (this.legacyIcon) {
+            // @deprecatedonmoodle since Moodle 3.11.
+            path = assetsPath + 'mod_legacy/';
+        }
+
+        this.icon = path + moduleName + '.svg';
     }
 
 }
diff --git a/src/core/features/course/components/module/core-course-module.html b/src/core/features/course/components/module/core-course-module.html
index fc9db736c..8a50cf3b3 100644
--- a/src/core/features/course/components/module/core-course-module.html
+++ b/src/core/features/course/components/module/core-course-module.html
@@ -58,7 +58,7 @@
             </div>
         </ion-item>
         <ion-item *ngIf="hasInfo" id="core-course-module-{{module.id}}-info"
-            class="ion-text-wrap core-course-module-handler core-module-module-info {{module.handlerData.class}}" [ngClass]="{
+            class="ion-text-wrap core-course-module-handler core-course-module-info {{module.handlerData.class}}" [ngClass]="{
                 'item-media': module.handlerData.icon,
                 'item-dimmed': module.visible === 0 || module.uservisible === false
             }" detail="false">
diff --git a/src/core/features/course/components/module/module.scss b/src/core/features/course/components/module/module.scss
index aaeaa86a3..2253562e5 100644
--- a/src/core/features/course/components/module/module.scss
+++ b/src/core/features/course/components/module/module.scss
@@ -31,7 +31,7 @@
         }
     }
 
-    .core-module-module-info {
+    .core-course-module-info {
         ion-badge {
             text-align: start;
         }
@@ -51,7 +51,7 @@
         clear: both;
     }
 
-    .core-module-main-item + .core-module-module-info ion-label {
+    .core-module-main-item + .core-course-module-info ion-label {
         margin-top: 0px;
     }
 
@@ -59,8 +59,4 @@
         --inner-border-width: 0px;
     }
 
-    .core-module-module-info ion-label {
-        margin-inline-start: 50px;
-    }
-
 }
diff --git a/src/core/features/course/services/course.ts b/src/core/features/course/services/course.ts
index cd482f5ca..24984dfc3 100644
--- a/src/core/features/course/services/course.ts
+++ b/src/core/features/course/services/course.ts
@@ -125,9 +125,8 @@ export class CoreCourseProvider {
     static readonly COMPONENT = 'CoreCourse';
 
     readonly CORE_MODULES = [
-        'assign', 'assignment', 'book', 'chat', 'choice', 'data', 'database', 'date', 'external-tool',
-        'feedback', 'file', 'folder', 'forum', 'glossary', 'ims', 'imscp', 'label', 'lesson', 'lti', 'page', 'quiz',
-        'resource', 'scorm', 'survey', 'url', 'wiki', 'workshop', 'h5pactivity', 'bigbluebuttonbn',
+        'assign', 'bigbluebuttonbn', 'book', 'chat', 'choice', 'data', 'feedback', 'folder', 'forum', 'glossary', 'h5pactivity',
+        'imscp', 'label', 'lesson', 'lti', 'page', 'quiz', 'resource', 'scorm', 'survey', 'url', 'wiki', 'workshop',
     ];
 
     protected logger: CoreLogger;
@@ -726,8 +725,14 @@ export class CoreCourseProvider {
             moduleName = 'external-tool';
         }
 
+        let path = 'assets/img/mod/';
+        if (!CoreSites.getCurrentSite()?.isVersionGreaterEqualThan('4.0')) {
+            // @deprecatedonmoodle since Moodle 3.11.
+            path = 'assets/img/mod_legacy/';
+        }
+
         // Use default icon on core modules.
-        return 'assets/img/mod/' + moduleName + '.svg';
+        return path + moduleName + '.svg';
     }
 
     /**
diff --git a/src/core/lang.json b/src/core/lang.json
index 64fcba1f9..584f0d5a6 100644
--- a/src/core/lang.json
+++ b/src/core/lang.json
@@ -164,12 +164,10 @@
     "minutes": "minutes",
     "misc": "Miscellaneous",
     "mod_assign": "Assignment",
-    "mod_assignment": "Assignment 2.2 (Disabled)",
     "mod_book": "Book",
     "mod_chat": "Chat",
     "mod_choice": "Choice",
     "mod_data": "Database",
-    "mod_database": "Database",
     "mod_external-tool": "External tool",
     "mod_feedback": "Feedback",
     "mod_file": "File",
@@ -177,7 +175,6 @@
     "mod_forum": "Forum",
     "mod_glossary": "Glossary",
     "mod_h5pactivity": "H5P",
-    "mod_ims": "IMS content package",
     "mod_imscp": "IMS content package",
     "mod_label": "Label",
     "mod_lesson": "Lesson",
diff --git a/src/theme/globals.variables.scss b/src/theme/globals.variables.scss
index 3a1dbff38..4e1d7e57a 100644
--- a/src/theme/globals.variables.scss
+++ b/src/theme/globals.variables.scss
@@ -139,5 +139,11 @@ $core-user-hide-siteinfo: $core-more-hide-siteinfo !default;
 $core-user-hide-sitename: $core-more-hide-sitename !default;
 $core-user-hide-siteurl: $core-more-hide-siteurl !default;
 
-
-
+$activity-icon-colors: (
+    administration: #5d63f6,
+    assessment: #eb66a2,
+    collaboration: #f7634d,
+    communication: #11a676,
+    content: #399be2,
+    interface: #a378ff
+) !default;
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index a4b0b935e..f4d379c0e 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -316,4 +316,9 @@
         --core-dd-question-color-#{$i + 1}: #{nth($core-dd-question-colors, $i + 1)};
         --core-dd-question-color-#{$i + 1}-contrast: #{get_contrast_color(nth($core-dd-question-colors, $i + 1))};
     }
+
+    // Make activtity colours available for custom modules.
+    @each $type, $value in $activity-icon-colors {
+        --activity#{$type}: #{$value};
+    }
 }

From 8c82446027e422cc5533d8af5768f0b00dbb7ce9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 18 Jan 2022 09:58:44 +0100
Subject: [PATCH 0363/1008] MOBILE-3811 mod: Add purpose of all modules

---
 src/addons/mod/assign/services/handlers/module.ts     |  3 ++-
 src/addons/mod/book/services/handlers/module.ts       |  3 ++-
 src/addons/mod/chat/services/handlers/module.ts       |  3 ++-
 src/addons/mod/choice/services/handlers/module.ts     |  3 ++-
 src/addons/mod/data/services/handlers/module.ts       |  3 ++-
 src/addons/mod/feedback/services/handlers/module.ts   |  3 ++-
 src/addons/mod/folder/services/handlers/module.ts     |  3 ++-
 src/addons/mod/forum/services/handlers/module.ts      |  3 ++-
 src/addons/mod/glossary/services/handlers/module.ts   |  3 ++-
 .../mod/h5pactivity/services/handlers/module.ts       |  3 ++-
 src/addons/mod/imscp/services/handlers/module.ts      |  3 ++-
 src/addons/mod/label/services/handlers/module.ts      |  3 ++-
 src/addons/mod/lesson/services/handlers/module.ts     |  3 ++-
 src/addons/mod/lti/services/handlers/module.ts        |  3 ++-
 src/addons/mod/page/services/handlers/module.ts       |  3 ++-
 src/addons/mod/quiz/services/handlers/module.ts       |  3 ++-
 src/addons/mod/resource/services/handlers/module.ts   |  3 ++-
 src/addons/mod/scorm/services/handlers/module.ts      |  3 ++-
 src/addons/mod/survey/services/handlers/module.ts     |  3 ++-
 src/addons/mod/url/services/handlers/module.ts        |  3 ++-
 src/addons/mod/wiki/services/handlers/module.ts       |  3 ++-
 src/addons/mod/workshop/services/handlers/module.ts   |  3 ++-
 src/core/constants.ts                                 | 11 +++++++++++
 23 files changed, 55 insertions(+), 22 deletions(-)

diff --git a/src/addons/mod/assign/services/handlers/module.ts b/src/addons/mod/assign/services/handlers/module.ts
index 7b1395e0f..bb8f569fd 100644
--- a/src/addons/mod/assign/services/handlers/module.ts
+++ b/src/addons/mod/assign/services/handlers/module.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { CoreConstants } from '@/core/constants';
+import { CoreConstants, ModPurpose } from '@/core/constants';
 import { Injectable, Type } from '@angular/core';
 import { CoreCourseModuleHandler } from '@features/course/services/module-delegate';
 import { AddonModAssignIndexComponent } from '../../components/index';
@@ -44,6 +44,7 @@ export class AddonModAssignModuleHandlerService extends CoreModuleHandlerBase im
         [CoreConstants.FEATURE_ADVANCED_GRADING]: true,
         [CoreConstants.FEATURE_PLAGIARISM]: true,
         [CoreConstants.FEATURE_COMMENT]: true,
+        [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_ASSESSMENT,
     };
 
     /**
diff --git a/src/addons/mod/book/services/handlers/module.ts b/src/addons/mod/book/services/handlers/module.ts
index ca5fcdd4d..322737a81 100644
--- a/src/addons/mod/book/services/handlers/module.ts
+++ b/src/addons/mod/book/services/handlers/module.ts
@@ -15,7 +15,7 @@
 import { Injectable, Type } from '@angular/core';
 import { AddonModBookIndexComponent } from '../../components/index';
 import { AddonModBook } from '../book';
-import { CoreConstants } from '@/core/constants';
+import { CoreConstants, ModPurpose } from '@/core/constants';
 import { CoreCourseModuleHandler } from '@features/course/services/module-delegate';
 import { makeSingleton } from '@singletons';
 import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
@@ -42,6 +42,7 @@ export class AddonModBookModuleHandlerService extends CoreModuleHandlerBase impl
         [CoreConstants.FEATURE_GRADE_OUTCOMES]: false,
         [CoreConstants.FEATURE_BACKUP_MOODLE2]: true,
         [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true,
+        [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_CONTENT,
     };
 
     /**
diff --git a/src/addons/mod/chat/services/handlers/module.ts b/src/addons/mod/chat/services/handlers/module.ts
index 16cfa87aa..c8f32227e 100644
--- a/src/addons/mod/chat/services/handlers/module.ts
+++ b/src/addons/mod/chat/services/handlers/module.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { CoreConstants } from '@/core/constants';
+import { CoreConstants, ModPurpose } from '@/core/constants';
 import { Injectable, Type } from '@angular/core';
 import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
 import { CoreCourseModuleHandler } from '@features/course/services/module-delegate';
@@ -40,6 +40,7 @@ export class AddonModChatModuleHandlerService extends CoreModuleHandlerBase impl
         [CoreConstants.FEATURE_GRADE_OUTCOMES]: true,
         [CoreConstants.FEATURE_BACKUP_MOODLE2]: true,
         [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true,
+        [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_COMMUNICATION,
     };
 
     /**
diff --git a/src/addons/mod/choice/services/handlers/module.ts b/src/addons/mod/choice/services/handlers/module.ts
index 532204f81..70e3a3834 100644
--- a/src/addons/mod/choice/services/handlers/module.ts
+++ b/src/addons/mod/choice/services/handlers/module.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { CoreConstants } from '@/core/constants';
+import { CoreConstants, ModPurpose } from '@/core/constants';
 import { Injectable, Type } from '@angular/core';
 import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
 import { CoreCourseModuleHandler } from '@features/course/services/module-delegate';
@@ -41,6 +41,7 @@ export class AddonModChoiceModuleHandlerService extends CoreModuleHandlerBase im
         [CoreConstants.FEATURE_GRADE_OUTCOMES]: false,
         [CoreConstants.FEATURE_BACKUP_MOODLE2]: true,
         [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true,
+        [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_COMMUNICATION,
     };
 
     /**
diff --git a/src/addons/mod/data/services/handlers/module.ts b/src/addons/mod/data/services/handlers/module.ts
index dc930ee0f..c170d8779 100644
--- a/src/addons/mod/data/services/handlers/module.ts
+++ b/src/addons/mod/data/services/handlers/module.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { CoreConstants } from '@/core/constants';
+import { CoreConstants, ModPurpose } from '@/core/constants';
 import { Injectable, Type } from '@angular/core';
 import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
 import { CoreCourseModuleHandler } from '@features/course/services/module-delegate';
@@ -43,6 +43,7 @@ export class AddonModDataModuleHandlerService extends CoreModuleHandlerBase impl
         [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true,
         [CoreConstants.FEATURE_RATE]: true,
         [CoreConstants.FEATURE_COMMENT]: true,
+        [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_COLLABORATION,
     };
 
     /**
diff --git a/src/addons/mod/feedback/services/handlers/module.ts b/src/addons/mod/feedback/services/handlers/module.ts
index da1fedf27..68e0164fe 100644
--- a/src/addons/mod/feedback/services/handlers/module.ts
+++ b/src/addons/mod/feedback/services/handlers/module.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { CoreConstants } from '@/core/constants';
+import { CoreConstants, ModPurpose } from '@/core/constants';
 import { Injectable, Type } from '@angular/core';
 import { CoreCourseModuleHandler } from '@features/course/services/module-delegate';
 import { makeSingleton } from '@singletons';
@@ -41,6 +41,7 @@ export class AddonModFeedbackModuleHandlerService extends CoreModuleHandlerBase
         [CoreConstants.FEATURE_GRADE_OUTCOMES]: false,
         [CoreConstants.FEATURE_BACKUP_MOODLE2]: true,
         [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true,
+        [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_COMMUNICATION,
     };
 
     /**
diff --git a/src/addons/mod/folder/services/handlers/module.ts b/src/addons/mod/folder/services/handlers/module.ts
index b127b468c..63dbc0df4 100644
--- a/src/addons/mod/folder/services/handlers/module.ts
+++ b/src/addons/mod/folder/services/handlers/module.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { CoreConstants } from '@/core/constants';
+import { CoreConstants, ModPurpose } from '@/core/constants';
 import { Injectable, Type } from '@angular/core';
 import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
 import { CoreCourseModuleHandler } from '@features/course/services/module-delegate';
@@ -41,6 +41,7 @@ export class AddonModFolderModuleHandlerService extends CoreModuleHandlerBase im
         [CoreConstants.FEATURE_GRADE_OUTCOMES]: false,
         [CoreConstants.FEATURE_BACKUP_MOODLE2]: true,
         [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true,
+        [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_CONTENT,
     };
 
     /**
diff --git a/src/addons/mod/forum/services/handlers/module.ts b/src/addons/mod/forum/services/handlers/module.ts
index f4ad76e60..a750b83b6 100644
--- a/src/addons/mod/forum/services/handlers/module.ts
+++ b/src/addons/mod/forum/services/handlers/module.ts
@@ -19,7 +19,7 @@ import { CoreEvents } from '@singletons/events';
 import { CoreSites } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
-import { CoreConstants } from '@/core/constants';
+import { CoreConstants, ModPurpose } from '@/core/constants';
 import { AddonModForumIndexComponent } from '../../components/index';
 import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
 import { CoreCourseModuleData } from '@features/course/services/course-helper';
@@ -48,6 +48,7 @@ export class AddonModForumModuleHandlerService extends CoreModuleHandlerBase imp
         [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true,
         [CoreConstants.FEATURE_RATE]: true,
         [CoreConstants.FEATURE_PLAGIARISM]: true,
+        [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_COLLABORATION,
     };
 
     /**
diff --git a/src/addons/mod/glossary/services/handlers/module.ts b/src/addons/mod/glossary/services/handlers/module.ts
index b7eb1a0f6..a5240ab82 100644
--- a/src/addons/mod/glossary/services/handlers/module.ts
+++ b/src/addons/mod/glossary/services/handlers/module.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { CoreConstants } from '@/core/constants';
+import { CoreConstants, ModPurpose } from '@/core/constants';
 import { Injectable, Type } from '@angular/core';
 import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
 import { CoreCourseModuleHandler } from '@features/course/services/module-delegate';
@@ -43,6 +43,7 @@ export class AddonModGlossaryModuleHandlerService extends CoreModuleHandlerBase
         [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true,
         [CoreConstants.FEATURE_RATE]: true,
         [CoreConstants.FEATURE_PLAGIARISM]: true,
+        [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_COLLABORATION,
     };
 
     /**
diff --git a/src/addons/mod/h5pactivity/services/handlers/module.ts b/src/addons/mod/h5pactivity/services/handlers/module.ts
index dfa1c7900..c6473702b 100644
--- a/src/addons/mod/h5pactivity/services/handlers/module.ts
+++ b/src/addons/mod/h5pactivity/services/handlers/module.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { CoreConstants } from '@/core/constants';
+import { CoreConstants, ModPurpose } from '@/core/constants';
 import { Injectable, Type } from '@angular/core';
 import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
 import { CoreCourseModuleHandler } from '@features/course/services/module-delegate';
@@ -42,6 +42,7 @@ export class AddonModH5PActivityModuleHandlerService extends CoreModuleHandlerBa
         [CoreConstants.FEATURE_GRADE_HAS_GRADE]: true,
         [CoreConstants.FEATURE_GRADE_OUTCOMES]: true,
         [CoreConstants.FEATURE_BACKUP_MOODLE2]: true,
+        [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_CONTENT,
     };
 
     /**
diff --git a/src/addons/mod/imscp/services/handlers/module.ts b/src/addons/mod/imscp/services/handlers/module.ts
index d1dea4491..369c111cc 100644
--- a/src/addons/mod/imscp/services/handlers/module.ts
+++ b/src/addons/mod/imscp/services/handlers/module.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { CoreConstants } from '@/core/constants';
+import { CoreConstants, ModPurpose } from '@/core/constants';
 import { Injectable, Type } from '@angular/core';
 import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
 import { CoreCourseModuleHandler } from '@features/course/services/module-delegate';
@@ -42,6 +42,7 @@ export class AddonModImscpModuleHandlerService extends CoreModuleHandlerBase imp
         [CoreConstants.FEATURE_GRADE_OUTCOMES]: false,
         [CoreConstants.FEATURE_BACKUP_MOODLE2]: true,
         [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true,
+        [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_CONTENT,
     };
 
     /**
diff --git a/src/addons/mod/label/services/handlers/module.ts b/src/addons/mod/label/services/handlers/module.ts
index f7cc33d6a..ec9ce00a2 100644
--- a/src/addons/mod/label/services/handlers/module.ts
+++ b/src/addons/mod/label/services/handlers/module.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { CoreConstants } from '@/core/constants';
+import { CoreConstants, ModPurpose } from '@/core/constants';
 import { Injectable } from '@angular/core';
 import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
 import { CoreCourseModuleData } from '@features/course/services/course-helper';
@@ -40,6 +40,7 @@ export class AddonModLabelModuleHandlerService extends CoreModuleHandlerBase imp
         [CoreConstants.FEATURE_BACKUP_MOODLE2]: true,
         [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true,
         [CoreConstants.FEATURE_NO_VIEW_LINK]: true,
+        [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_CONTENT,
     };
 
     /**
diff --git a/src/addons/mod/lesson/services/handlers/module.ts b/src/addons/mod/lesson/services/handlers/module.ts
index 7563848e7..897b65381 100644
--- a/src/addons/mod/lesson/services/handlers/module.ts
+++ b/src/addons/mod/lesson/services/handlers/module.ts
@@ -14,7 +14,7 @@
 
 import { Injectable, Type } from '@angular/core';
 
-import { CoreConstants } from '@/core/constants';
+import { CoreConstants, ModPurpose } from '@/core/constants';
 import { CoreCourseModuleHandler } from '@features/course/services/module-delegate';
 import { AddonModLessonIndexComponent } from '../../components/index';
 import { makeSingleton } from '@singletons';
@@ -42,6 +42,7 @@ export class AddonModLessonModuleHandlerService extends CoreModuleHandlerBase im
         [CoreConstants.FEATURE_GRADE_OUTCOMES]: true,
         [CoreConstants.FEATURE_BACKUP_MOODLE2]: true,
         [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true,
+        [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_CONTENT,
     };
 
     /**
diff --git a/src/addons/mod/lti/services/handlers/module.ts b/src/addons/mod/lti/services/handlers/module.ts
index 7dcf9b6ee..7e80a8f53 100644
--- a/src/addons/mod/lti/services/handlers/module.ts
+++ b/src/addons/mod/lti/services/handlers/module.ts
@@ -14,7 +14,7 @@
 
 import { Injectable, Type } from '@angular/core';
 
-import { CoreConstants } from '@/core/constants';
+import { CoreConstants, ModPurpose } from '@/core/constants';
 import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
 import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { makeSingleton } from '@singletons';
@@ -43,6 +43,7 @@ export class AddonModLtiModuleHandlerService extends CoreModuleHandlerBase imple
         [CoreConstants.FEATURE_GRADE_OUTCOMES]: true,
         [CoreConstants.FEATURE_BACKUP_MOODLE2]: true,
         [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true,
+        [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_CONTENT,
     };
 
     /**
diff --git a/src/addons/mod/page/services/handlers/module.ts b/src/addons/mod/page/services/handlers/module.ts
index 688d9eabc..9870c74cf 100644
--- a/src/addons/mod/page/services/handlers/module.ts
+++ b/src/addons/mod/page/services/handlers/module.ts
@@ -15,7 +15,7 @@
 import { Injectable, Type } from '@angular/core';
 import { AddonModPage } from '../page';
 import { CoreCourseModuleHandler } from '@features/course/services/module-delegate';
-import { CoreConstants } from '@/core/constants';
+import { CoreConstants, ModPurpose } from '@/core/constants';
 import { AddonModPageIndexComponent } from '../../components/index';
 import { makeSingleton } from '@singletons';
 import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
@@ -42,6 +42,7 @@ export class AddonModPageModuleHandlerService extends CoreModuleHandlerBase impl
         [CoreConstants.FEATURE_GRADE_OUTCOMES]: false,
         [CoreConstants.FEATURE_BACKUP_MOODLE2]: true,
         [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true,
+        [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_CONTENT,
     };
 
     /**
diff --git a/src/addons/mod/quiz/services/handlers/module.ts b/src/addons/mod/quiz/services/handlers/module.ts
index 70cad4de5..7ca4c9022 100644
--- a/src/addons/mod/quiz/services/handlers/module.ts
+++ b/src/addons/mod/quiz/services/handlers/module.ts
@@ -14,7 +14,7 @@
 
 import { Injectable, Type } from '@angular/core';
 
-import { CoreConstants } from '@/core/constants';
+import { CoreConstants, ModPurpose } from '@/core/constants';
 import { CoreCourseModuleHandler } from '@features/course/services/module-delegate';
 import { AddonModQuizIndexComponent } from '../../components/index';
 import { makeSingleton } from '@singletons';
@@ -44,6 +44,7 @@ export class AddonModQuizModuleHandlerService extends CoreModuleHandlerBase impl
         [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true,
         [CoreConstants.FEATURE_CONTROLS_GRADE_VISIBILITY]: true,
         [CoreConstants.FEATURE_USES_QUESTIONS]: true,
+        [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_ASSESSMENT,
     };
 
     /**
diff --git a/src/addons/mod/resource/services/handlers/module.ts b/src/addons/mod/resource/services/handlers/module.ts
index 205173fe6..85cc81e0b 100644
--- a/src/addons/mod/resource/services/handlers/module.ts
+++ b/src/addons/mod/resource/services/handlers/module.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { CoreConstants } from '@/core/constants';
+import { CoreConstants, ModPurpose } from '@/core/constants';
 import { Injectable, Type } from '@angular/core';
 import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
 import { CoreCourse } from '@features/course/services/course';
@@ -50,6 +50,7 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase
         [CoreConstants.FEATURE_GRADE_OUTCOMES]: false,
         [CoreConstants.FEATURE_BACKUP_MOODLE2]: true,
         [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true,
+        [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_CONTENT,
     };
 
     /**
diff --git a/src/addons/mod/scorm/services/handlers/module.ts b/src/addons/mod/scorm/services/handlers/module.ts
index 7996d4921..aacc38544 100644
--- a/src/addons/mod/scorm/services/handlers/module.ts
+++ b/src/addons/mod/scorm/services/handlers/module.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { CoreConstants } from '@/core/constants';
+import { CoreConstants, ModPurpose } from '@/core/constants';
 import { Injectable, Type } from '@angular/core';
 import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
 import { CoreCourseModuleHandler } from '@features/course/services/module-delegate';
@@ -41,6 +41,7 @@ export class AddonModScormModuleHandlerService extends CoreModuleHandlerBase imp
         [CoreConstants.FEATURE_GRADE_OUTCOMES]: true,
         [CoreConstants.FEATURE_BACKUP_MOODLE2]: true,
         [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true,
+        [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_CONTENT,
     };
 
     /**
diff --git a/src/addons/mod/survey/services/handlers/module.ts b/src/addons/mod/survey/services/handlers/module.ts
index 8ec3f3969..1faa1a25a 100644
--- a/src/addons/mod/survey/services/handlers/module.ts
+++ b/src/addons/mod/survey/services/handlers/module.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { CoreConstants } from '@/core/constants';
+import { CoreConstants, ModPurpose } from '@/core/constants';
 import { Injectable, Type } from '@angular/core';
 import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
 import { CoreCourseModuleHandler } from '@features/course/services/module-delegate';
@@ -41,6 +41,7 @@ export class AddonModSurveyModuleHandlerService extends CoreModuleHandlerBase im
         [CoreConstants.FEATURE_GRADE_OUTCOMES]: false,
         [CoreConstants.FEATURE_BACKUP_MOODLE2]: true,
         [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true,
+        [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_COMMUNICATION,
     };
 
     /**
diff --git a/src/addons/mod/url/services/handlers/module.ts b/src/addons/mod/url/services/handlers/module.ts
index ed9e30713..8d7adc10e 100644
--- a/src/addons/mod/url/services/handlers/module.ts
+++ b/src/addons/mod/url/services/handlers/module.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { CoreConstants } from '@/core/constants';
+import { CoreConstants, ModPurpose } from '@/core/constants';
 import { Injectable, Type } from '@angular/core';
 import { CoreContentLinksHelper } from '@features/contentlinks/services/contentlinks-helper';
 import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
@@ -49,6 +49,7 @@ export class AddonModUrlModuleHandlerService extends CoreModuleHandlerBase imple
         [CoreConstants.FEATURE_GRADE_OUTCOMES]: false,
         [CoreConstants.FEATURE_BACKUP_MOODLE2]: true,
         [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true,
+        [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_CONTENT,
     };
 
     /**
diff --git a/src/addons/mod/wiki/services/handlers/module.ts b/src/addons/mod/wiki/services/handlers/module.ts
index 33b5af3aa..3bd58ebd1 100644
--- a/src/addons/mod/wiki/services/handlers/module.ts
+++ b/src/addons/mod/wiki/services/handlers/module.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { CoreConstants } from '@/core/constants';
+import { CoreConstants, ModPurpose } from '@/core/constants';
 import { Injectable, Type } from '@angular/core';
 import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
 import { CoreCourseModuleHandler } from '@features/course/services/module-delegate';
@@ -42,6 +42,7 @@ export class AddonModWikiModuleHandlerService extends CoreModuleHandlerBase impl
         [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true,
         [CoreConstants.FEATURE_RATE]: false,
         [CoreConstants.FEATURE_COMMENT]: true,
+        [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_COLLABORATION,
     };
 
     /**
diff --git a/src/addons/mod/workshop/services/handlers/module.ts b/src/addons/mod/workshop/services/handlers/module.ts
index 4364cc552..869c347cb 100644
--- a/src/addons/mod/workshop/services/handlers/module.ts
+++ b/src/addons/mod/workshop/services/handlers/module.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { CoreConstants } from '@/core/constants';
+import { CoreConstants, ModPurpose } from '@/core/constants';
 import { Injectable, Type } from '@angular/core';
 import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
 import { CoreCourseModuleHandler } from '@features/course/services/module-delegate';
@@ -40,6 +40,7 @@ export class AddonModWorkshopModuleHandlerService extends CoreModuleHandlerBase
         [CoreConstants.FEATURE_BACKUP_MOODLE2]: true,
         [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true,
         [CoreConstants.FEATURE_PLAGIARISM]: true,
+        [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_ASSESSMENT,
     };
 
     /**
diff --git a/src/core/constants.ts b/src/core/constants.ts
index a4f6a7c32..2c238261b 100644
--- a/src/core/constants.ts
+++ b/src/core/constants.ts
@@ -27,6 +27,16 @@ export const enum ContextLevel {
     BLOCK = 'block',
 }
 
+export const enum ModPurpose {
+    MOD_PURPOSE_COMMUNICATION = 'communication',
+    MOD_PURPOSE_ASSESSMENT = 'assessment',
+    MOD_PURPOSE_COLLABORATION = 'collaboration',
+    MOD_PURPOSE_CONTENT = 'content',
+    MOD_PURPOSE_ADMINISTRATION = 'administration',
+    MOD_PURPOSE_INTERFACE = 'interface',
+    MOD_PURPOSE_OTHER = 'other',
+};
+
 /**
  * Static class to contain all the core constants.
  */
@@ -119,6 +129,7 @@ export class CoreConstants {
     static readonly FEATURE_MOD_INTRO = 'mod_intro'; // True if module supports intro editor.
     static readonly FEATURE_MODEDIT_DEFAULT_COMPLETION = 'modedit_default_completion'; // True if module has default completion.
     static readonly FEATURE_COMMENT = 'comment';
+    static readonly FEATURE_MOD_PURPOSE = 'mod_purpose'; // Type of module.
     static readonly FEATURE_RATE = 'rate';
     static readonly FEATURE_BACKUP_MOODLE2 = 'backup_moodle2'; // True if module supports backup/restore of moodle2 format.
     static readonly FEATURE_SHOW_DESCRIPTION = 'showdescription'; // True if module can show description on course main page.

From 96b172c42ca216aacc986502eb628e5a911d0671 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 18 Jan 2022 12:10:21 +0100
Subject: [PATCH 0364/1008] MOBILE-3811 resource: Remove mimetype icons from
 resource

---
 .../mod/resource/services/handlers/module.ts  | 52 ++-----------------
 1 file changed, 4 insertions(+), 48 deletions(-)

diff --git a/src/addons/mod/resource/services/handlers/module.ts b/src/addons/mod/resource/services/handlers/module.ts
index 85cc81e0b..a889ac9ed 100644
--- a/src/addons/mod/resource/services/handlers/module.ts
+++ b/src/addons/mod/resource/services/handlers/module.ts
@@ -93,9 +93,8 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase
             },
         }];
 
-        this.getResourceData(module, courseId, handlerData).then((data) => {
-            handlerData.icon = data.icon;
-            handlerData.extraBadge = data.extra;
+        this.getResourceData(module, courseId, handlerData).then((extra) => {
+            handlerData.extraBadge = extra;
             handlerData.extraBadgeColor = 'light';
 
             return;
@@ -133,7 +132,7 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase
         module: CoreCourseModuleData,
         courseId: number,
         handlerData: CoreCourseModuleHandlerData,
-    ): Promise<AddonResourceHandlerData> {
+    ): Promise<string> {
         const promises: Promise<void>[] = [];
         let options: AddonModResourceCustomData = {};
 
@@ -161,23 +160,15 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase
 
         await Promise.all(promises);
 
-        let mimetypeIcon = '';
         const extra: string[] = [];
 
         if (module.contentsinfo) {
             // No need to use the list of files.
-            const mimetype = module.contentsinfo.mimetypes[0];
-            if (mimetype) {
-                mimetypeIcon = CoreMimetypeUtils.getMimetypeIcon(mimetype);
-            }
             extra.push(CoreTextUtils.cleanTags(module.afterlink));
-
         } else if (module.contents && module.contents[0]) {
             const files = module.contents;
             const file = files[0];
 
-            mimetypeIcon = CoreMimetypeUtils.getFileIcon(file.filename || '');
-
             if (options.showsize) {
                 const size = options.filedetails
                     ? options.filedetails.size
@@ -220,36 +211,7 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase
             }
         }
 
-        return {
-            icon: await CoreCourse.getModuleIconSrc(module.modname, module.modicon, mimetypeIcon),
-            extra: extra.join(' '),
-        };
-    }
-
-    /**
-     * @inheritdoc
-     */
-    async getIconSrc(module?: CoreCourseModuleData): Promise<string | undefined> {
-        if (!module) {
-            return;
-        }
-        let mimetypeIcon = '';
-
-        if (module.contentsinfo) {
-            // No need to use the list of files.
-            const mimetype = module.contentsinfo.mimetypes[0];
-            if (mimetype) {
-                mimetypeIcon = CoreMimetypeUtils.getMimetypeIcon(mimetype);
-            }
-
-        } else if (module.contents && module.contents[0]) {
-            const files = module.contents;
-            const file = files[0];
-
-            mimetypeIcon = CoreMimetypeUtils.getFileIcon(file.filename || '');
-        }
-
-        return await CoreCourse.getModuleIconSrc(module.modname, module.modicon, mimetypeIcon);
+        return extra.join(' ');
     }
 
     /**
@@ -261,9 +223,3 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase
 
 }
 export const AddonModResourceModuleHandler = makeSingleton(AddonModResourceModuleHandlerService);
-
-type AddonResourceHandlerData = {
-    icon: string;
-    extra: string;
-}
-;

From c7e3e68a945e53af0c622cbfafdb248dbdb0304f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 18 Jan 2022 14:36:40 +0100
Subject: [PATCH 0365/1008] MOBILE-3811 bbb: Add purpose and icon on BBB, not
 definitive

---
 .../services/handlers/module.ts               |  3 +-
 src/assets/img/mod/bigbluebuttonbn.svg        | 70 ++++---------------
 2 files changed, 17 insertions(+), 56 deletions(-)

diff --git a/src/addons/mod/bigbluebuttonbn/services/handlers/module.ts b/src/addons/mod/bigbluebuttonbn/services/handlers/module.ts
index 3cab8b60f..ee71b6308 100644
--- a/src/addons/mod/bigbluebuttonbn/services/handlers/module.ts
+++ b/src/addons/mod/bigbluebuttonbn/services/handlers/module.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { CoreConstants } from '@/core/constants';
+import { CoreConstants, ModPurpose } from '@/core/constants';
 import { Injectable, Type } from '@angular/core';
 import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
 import { CoreCourseModuleData } from '@features/course/services/course-helper';
@@ -45,6 +45,7 @@ export class AddonModBBBModuleHandlerService extends CoreModuleHandlerBase imple
         [CoreConstants.FEATURE_GRADE_OUTCOMES]: true,
         [CoreConstants.FEATURE_BACKUP_MOODLE2]: true,
         [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true,
+        [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_COMMUNICATION,
     };
 
     /**
diff --git a/src/assets/img/mod/bigbluebuttonbn.svg b/src/assets/img/mod/bigbluebuttonbn.svg
index 7b92ab21b..94874adeb 100644
--- a/src/assets/img/mod/bigbluebuttonbn.svg
+++ b/src/assets/img/mod/bigbluebuttonbn.svg
@@ -1,55 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="24px" height="24px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-58.9473" y1="84.1865" x2="58.9479" y2="-84.1852">
-			<stop  offset="0" style="stop-color:#283274"/>
-			<stop  offset="0.7088" style="stop-color:#293275"/>
-			<stop  offset="0.967" style="stop-color:#273F87"/>
-		</linearGradient>
-<symbol  id="New_Symbol" viewBox="-107.423 -107.423 214.847 214.846">
-	<g>
-		<path fill="url(#SVGID_1_)" stroke="#5D6AA4" stroke-width="9.3191" d="M102.765,0c0-56.755-46.009-102.764-102.765-102.764
-			c-56.754,0-102.764,46.009-102.764,102.764S-56.754,102.764,0,102.764C56.756,102.764,102.765,56.755,102.765,0z"/>
-		
-			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="-75.0186" y1="112.8037" x2="-15.8528" y2="28.3063" gradientTransform="matrix(1 0 0 1 18.4946 -31.9512)">
-			<stop  offset="0" style="stop-color:#BEC7E5"/>
-			<stop  offset="0.0956" style="stop-color:#B5BEDE"/>
-			<stop  offset="0.2524" style="stop-color:#9CA5CC"/>
-			<stop  offset="0.4508" style="stop-color:#747DAE"/>
-			<stop  offset="0.6809" style="stop-color:#3D4684"/>
-			<stop  offset="0.7582" style="stop-color:#293275"/>
-		</linearGradient>
-		<path fill="url(#SVGID_2_)" d="M0.282,98.502C26.323,98.31,54.293,87.893,74.49,63.84C73.631,43.207,36.703,22.057,5.886-1.229
-			c-25.857-19.538-65.427-37.86-92.487-45.059c-25.73,49.263-7.016,96.619,25.25,123.238C-46.256,90.16-23.508,98.679,0.282,98.502z
-			"/>
-	</g>
-	<g>
-		<g>
-			<path d="M55.602-25.561c0-8.678-3.055-16.072-9.16-22.179c-6.11-6.109-13.501-9.16-22.179-9.16h-37.367
-				c-8.679,0-16.073,3.051-22.179,9.16c-6.11,6.106-9.162,13.501-9.162,22.179v93.779c6.656,0,12.336-3.254,17.046-9.764
-				c4.708-6.509,7.062-14.344,7.062-23.505v-60.511c0-4.821,2.411-7.231,7.232-7.231h37.367c4.821,0,7.231,2.41,7.231,7.231V3.128
-				c0,4.66-2.41,7.07-7.231,7.232H17.03c-9.323,0.324-17.2,2.757-23.626,7.304c-6.43,4.543-9.643,10.145-9.643,16.805h40.501
-				c8.678,0,16.068-3.056,22.179-9.161c6.105-6.11,9.16-13.5,9.16-22.18V-25.561z"/>
-		</g>
-	</g>
-	<g opacity="0.46">
-		<g>
-			<path fill="#FFFFFF" d="M55.602-25.561c0-8.678-3.055-16.072-9.16-22.179c-6.11-6.109-13.501-9.16-22.179-9.16h-37.367
-				c-8.679,0-16.073,3.051-22.179,9.16c-6.11,6.106-9.162,13.501-9.162,22.179v93.779c6.656,0,12.336-3.254,17.046-9.764
-				c4.708-6.509,7.062-14.344,7.062-23.505v-60.511c0-4.821,2.411-7.231,7.232-7.231h37.367c4.821,0,7.231,2.41,7.231,7.231V3.128
-				c0,4.66-2.41,7.07-7.231,7.232H17.03c-9.323,0.324-17.2,2.757-23.626,7.304c-6.43,4.543-9.643,10.145-9.643,16.805h40.501
-				c8.678,0,16.068-3.056,22.179-9.161c6.105-6.11,9.16-13.5,9.16-22.18V-25.561z"/>
-		</g>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M53.829-26.788c0-8.678-3.055-16.072-9.16-22.179c-6.11-6.109-13.501-9.16-22.18-9.16h-37.367
-			c-8.679,0-16.073,3.051-22.179,9.16c-6.109,6.106-9.16,13.501-9.16,22.179v93.779c6.655,0,12.336-3.255,17.045-9.764
-			c4.708-6.509,7.062-14.345,7.062-23.505v-60.511c0-4.821,2.41-7.231,7.232-7.231h37.367c4.821,0,7.232,2.41,7.232,7.231V1.901
-			c0,4.66-2.411,7.07-7.232,7.232h-7.232C5.935,9.457-1.942,11.89-8.368,16.438c-6.43,4.542-9.644,10.144-9.644,16.803h40.501
-			c8.679,0,16.069-3.055,22.18-9.16c6.105-6.109,9.16-13.5,9.16-22.179V-26.788z"/>
-	</g>
-</symbol>
-<use xlink:href="#New_Symbol"  width="214.847" height="214.846" x="-107.423" y="-107.423" transform="matrix(0.1376 0 0 -0.1376 14.9995 15)" overflow="visible"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" style="fill:none" id="svg4" version="1.1" viewBox="0 0 74 74" height="74" width="74" sodipodi:docname="icon.svg" inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="3768" inkscape:window-height="2096" id="namedview6" showgrid="false" inkscape:zoom="6.9532167" inkscape:cx="33.858158" inkscape:cy="40.191094" inkscape:window-x="72" inkscape:window-y="27" inkscape:window-maximized="1" inkscape:current-layer="svg4"/>
+  <metadata id="metadata10">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs id="defs8"/>
+  <path style="clip-rule:evenodd;fill:#000000;fill-rule:evenodd;stroke-width:4.9333334" id="path2" d="m 69.066667,37.000002 c 0,17.710171 -14.356493,32.066664 -32.066668,32.066664 -17.709926,0 -32.0666657,-14.356493 -32.0666657,-32.066664 0,-17.709928 14.3567397,-32.0666678 32.0666657,-32.0666678 17.710175,0 32.066668,14.3567398 32.066668,32.0666678 z m 4.933333,0 C 74,57.434359 57.43436,74 36.999999,74 16.565443,74 0,57.434359 0,37.000002 0,16.565443 16.565443,0 36.999999,0 57.43436,0 74,16.565443 74,37.000002 Z m -49.333333,8.616952 v -25.88362 c 1.836828,0 3.404888,0.89841 4.704624,2.69493 1.29944,1.796524 1.949308,3.959199 1.949308,6.487385 v 16.701305 c 0,1.330619 0.66526,1.995831 1.995877,1.995831 h 10.313579 c 1.33062,0 1.996322,-0.665212 1.996322,-1.995831 v -7.918345 c 0,-1.286416 -0.665702,-1.951528 -1.996322,-1.996272 h -1.99588 c -2.573174,-0.0894 -4.747052,-0.76067 -6.520634,-2.01566 -1.774717,-1.253908 -2.661728,-2.800014 -2.661728,-4.638173 h 11.178242 c 2.395477,0 4.435066,0.843154 6.121625,2.52843 1.685227,1.686412 2.528826,3.726 2.528826,6.121675 v 7.918345 c 0,2.395135 -0.843599,4.43566 -2.528826,6.121378 -1.686559,1.686216 -3.726148,2.528334 -6.121625,2.528334 H 33.316476 c -2.395181,0 -4.436002,-0.842118 -6.121327,-2.528334 -1.686412,-1.685718 -2.528482,-3.726243 -2.528482,-6.121378 z" inkscape:connector-curvature="0"/>
+</svg>
\ No newline at end of file

From e3daf3738cba779cb0760899b79483903a7ccf3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 18 Jan 2022 14:44:43 +0100
Subject: [PATCH 0366/1008] MOBILE-3811 core: Improve collapsible header
 animation

---
 src/core/components/split-view/split-view.ts |  6 ++----
 src/core/directives/collapsible-header.ts    | 13 +++++++++++--
 src/theme/theme.base.scss                    | 11 ++++++++---
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/core/components/split-view/split-view.ts b/src/core/components/split-view/split-view.ts
index a69cc700c..e535f731d 100644
--- a/src/core/components/split-view/split-view.ts
+++ b/src/core/components/split-view/split-view.ts
@@ -141,14 +141,12 @@ export class CoreSplitViewComponent implements AfterViewInit, OnDestroy {
      * Another manual solution is to add scroll-y=false on the ion-contents outside the split view.
      */
     protected disableScrollOnParent(): void {
-        let outerContent = this.element.nativeElement.parentElement?.closest('ion-content');
-        while (outerContent) {
+        const outerContent = this.element.nativeElement.parentElement?.closest('ion-content');
+        if (outerContent) {
             if (outerContent?.getAttribute('scroll-y') != 'false' && !outerContent?.classList.contains(disabledScrollClass)) {
                 outerContent.classList.add(disabledScrollClass);
                 this.disabledScrollOuterContents.push(outerContent);
             }
-
-            outerContent = outerContent.parentElement?.closest('ion-content');
         }
     }
 
diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts
index 0249849c3..24ba81a03 100644
--- a/src/core/directives/collapsible-header.ts
+++ b/src/core/directives/collapsible-header.ts
@@ -44,7 +44,7 @@ export class CoreCollapsibleHeaderDirective implements OnDestroy {
     protected contentSubHeadingFontSize = 0;
     protected subHeadingStartDifference = 0;
 
-    constructor(el: ElementRef) {
+    constructor(el: ElementRef<HTMLIonHeaderElement>) {
         this.header = el.nativeElement;
 
         this.loadingObserver = CoreEvents.on(CoreEvents.CORE_LOADING_CHANGED, async (data) => {
@@ -122,6 +122,11 @@ export class CoreCollapsibleHeaderDirective implements OnDestroy {
         }
 
         this.titleTopDifference = contentH1.getBoundingClientRect().top - headerH1.getBoundingClientRect().top;
+        if (this.titleTopDifference <= 0) {
+            this.cannotCollapse();
+
+            return;
+        }
 
         // Split view part.
         const contentAux = this.header.parentElement?.querySelector<HTMLElement>('ion-content.disable-scroll-y');
@@ -210,7 +215,9 @@ export class CoreCollapsibleHeaderDirective implements OnDestroy {
 
         this.content.scrollEvents = true;
         this.content.addEventListener('ionScroll', (e: CustomEvent<ScrollDetail>): void => {
-            this.onScroll(title, contentH1, contentSubHeading, e.detail);
+            if (e.target == this.content) {
+                this.onScroll(title, contentH1, contentSubHeading, e.detail);
+            }
         });
     }
 
@@ -234,6 +241,8 @@ export class CoreCollapsibleHeaderDirective implements OnDestroy {
         this.header.classList.toggle('core-header-collapsed', collapsed);
         title.classList.toggle('collapsible-title-collapsed', collapsed);
         title.classList.toggle('collapsible-title-collapse-started', scrollDetail.scrollTop > 0);
+        title.classList.toggle('collapsible-title-collapse-nowrap', progress > 0.5);
+        title.style.setProperty('--collapse-opacity', (1 - progress) +'');
 
         if (collapsed) {
             contentH1.style.transform = 'translateX(-' + this.h1StartDifference + 'px)';
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index c045c2469..fa122a16c 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -1257,21 +1257,26 @@ ion-app.md .collapsible-title h1 {
 }
 
 .collapsible-title.collapsible-title-collapsed {
-    ion-label, h1, h2, .subheading {
+    ion-label, h1, h2, ion-row, ion-col, .subheading {
         opacity: 0;
     }
 }
 
 .collapsible-title.collapsible-title-collapse-started {
     * {
-        opacity: 0;
+        opacity: var(--collapse-opacity, 0);
     }
-    ion-label, h1, h2, .subheading {
+
+    ion-label, h1, h2, ion-row, ion-col, .subheading {
         opacity: 1;
     }
+}
+
+.collapsible-title.collapsible-title-collapse-nowrap {
     h1, h2, .subheading {
         max-width: var(--max-width);
         white-space: nowrap;
         overflow: hidden;
+        text-overflow: ellipsis;
     }
 }

From 18db3c58b6466698ebc49fb61b4e6d65daa08863 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 18 Jan 2022 14:49:44 +0100
Subject: [PATCH 0367/1008] MOBILE-3811 calendar: Improve calendar
 visualization

---
 src/addons/calendar/calendar-common.scss      |   8 +-
 .../calendar/addon-calendar-calendar.html     |   5 +-
 .../components/calendar/calendar.scss         |  11 --
 src/addons/calendar/pages/day/day.html        |   2 +-
 src/addons/calendar/pages/event/event.html    | 167 +++++++++---------
 src/addons/calendar/pages/event/event.page.ts |   2 +-
 src/addons/calendar/pages/event/event.scss    |   5 -
 7 files changed, 93 insertions(+), 107 deletions(-)

diff --git a/src/addons/calendar/calendar-common.scss b/src/addons/calendar/calendar-common.scss
index 8fdaaeefe..c12303e90 100644
--- a/src/addons/calendar/calendar-common.scss
+++ b/src/addons/calendar/calendar-common.scss
@@ -6,11 +6,7 @@
         > ion-icon {
             color: white;
             border-radius: 50%;
-            padding: 6px;
-        }
-
-        > core-mod-icon {
-            padding: 6px;
+            padding: 0.7rem;
         }
 
         &.addon-calendar-eventtype-category > ion-icon {
@@ -30,4 +26,4 @@
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/addons/calendar/components/calendar/addon-calendar-calendar.html b/src/addons/calendar/components/calendar/addon-calendar-calendar.html
index ca1e7dc08..9d072a910 100644
--- a/src/addons/calendar/components/calendar/addon-calendar-calendar.html
+++ b/src/addons/calendar/components/calendar/addon-calendar-calendar.html
@@ -81,13 +81,10 @@
                                         <span class="addon-calendar-event-time">
                                             {{ event.timestart * 1000 | coreFormatDate: timeFormat }}
                                         </span>
-                                        <core-mod-icon *ngIf="event.moduleIcon" [modicon]="event.moduleIcon" [showAlt]="false"
-                                            [modname]="event.modulename" [componentId]="event.instance">
-                                        </core-mod-icon>
                                         <!-- Add the icon title so accessibility tools read it. -->
                                         <span class="sr-only">
                                             {{ 'addon.calendar.type' + event.formattedType | translate }}
-                                            <span class="sr-only" *ngIf="event.moduleIcon && event.iconTitle">
+                                            <span class="sr-only" *ngIf="event.iconTitle">
                                                 {{ event.iconTitle }}
                                             </span>
                                         </span>
diff --git a/src/addons/calendar/components/calendar/calendar.scss b/src/addons/calendar/components/calendar/calendar.scss
index 24e0c2e99..f293233fc 100644
--- a/src/addons/calendar/components/calendar/calendar.scss
+++ b/src/addons/calendar/components/calendar/calendar.scss
@@ -148,17 +148,6 @@
         }
     }
 
-    core-mod-icon {
-        margin-right: 1px;
-        margin-left: 1px;
-        --size: 16px;
-        display: inline-block;
-        vertical-align: bottom;
-        ::ng-deep img {
-            display: block;
-        }
-    }
-
     ion-slide {
         display: block;
         font-size: inherit;
diff --git a/src/addons/calendar/pages/day/day.html b/src/addons/calendar/pages/day/day.html
index 01a7daceb..62939f984 100644
--- a/src/addons/calendar/pages/day/day.html
+++ b/src/addons/calendar/pages/day/day.html
@@ -68,7 +68,7 @@
                                 (click)="gotoEvent(event.id)" [class.item-dimmed]="event.ispast"
                                 [ngClass]="['addon-calendar-eventtype-'+event.eventtype]" button detail="true">
                                 <core-mod-icon *ngIf="event.moduleIcon" [modicon]="event.moduleIcon" slot="start" [showAlt]="false"
-                                    [modname]="event.modname" [componentId]="event.instance">
+                                    [modname]="event.modulename" [componentId]="event.instance">
                                 </core-mod-icon>
                                 <ion-icon *ngIf="event.eventIcon && !event.moduleIcon" [name]="event.eventIcon" slot="start"
                                     aria-hidden="true">
diff --git a/src/addons/calendar/pages/event/event.html b/src/addons/calendar/pages/event/event.html
index 8744742c3..bcdd07a0e 100644
--- a/src/addons/calendar/pages/event/event.html
+++ b/src/addons/calendar/pages/event/event.html
@@ -1,18 +1,10 @@
-<ion-header>
+<ion-header collapsible>
     <ion-toolbar>
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
         <ion-title>
             <h1 *ngIf="event">
-                <core-mod-icon *ngIf="event.moduleIcon" [modicon]="event.moduleIcon" [showAlt]="false" [modname]="event.modulename"
-                    [componentId]="event.instance"></core-mod-icon>
-                <ion-icon *ngIf="event.eventIcon && !event.moduleIcon" [name]="event.eventIcon" aria-hidden="true"></ion-icon>
-                <!-- Add the icon title so accessibility tools read it. -->
-                <span class="sr-only">
-                    {{ 'addon.calendar.type' + event.formattedType | translate }}
-                    <span class="sr-only" *ngIf="event.moduleIcon && event.iconTitle">{{ event.iconTitle }}</span>
-                </span>
                 <core-format-text [text]="event.name" [contextLevel]="event.contextLevel" [contextInstanceId]="event.contextInstanceId">
                 </core-format-text>
             </h1>
@@ -47,79 +39,96 @@
             </ion-item>
         </ion-card>
 
-        <ion-card>
-            <ion-card-content *ngIf="event">
-                <ion-item>
-                    <ion-label>
-                        <h2>{{ 'addon.calendar.when' | translate }}</h2>
-                        <core-format-text [text]="event.formattedtime" [contextLevel]="event.contextLevel"
+        <ion-list *ngIf="event">
+            <ion-item class="collapsible-title ion-text-wrap addon-calendar-event"
+                [ngClass]="['addon-calendar-eventtype-'+event.eventtype]">
+                <core-mod-icon *ngIf="event.moduleIcon" [modicon]="event.moduleIcon" [showAlt]="false" [modname]="event.modulename"
+                    [componentId]="event.instance" slot="start"></core-mod-icon>
+                <ion-icon *ngIf=" event.eventIcon && !event.moduleIcon" [name]="event.eventIcon" aria-hidden="true" slot="start">
+                </ion-icon>
+                <ion-label>
+                    <!-- Add the icon title so accessibility tools read it. -->
+                    <span class="sr-only">
+                        {{ 'addon.calendar.type' + event.formattedType | translate }}
+                        <span class="sr-only" *ngIf="event.moduleIcon && event.iconTitle">{{ event.iconTitle }}</span>
+                    </span>
+                    <h1>
+                        <core-format-text [text]="event.name" [contextLevel]="event.contextLevel"
+                            [contextInstanceId]="event.contextInstanceId">
+                        </core-format-text>
+                    </h1>
+                </ion-label>
+            </ion-item>
+            <ion-item>
+                <ion-label>
+                    <h2>{{ 'addon.calendar.when' | translate }}</h2>
+                    <core-format-text [text]="event.formattedtime" [contextLevel]="event.contextLevel"
+                        [contextInstanceId]="event.contextInstanceId"></core-format-text>
+                </ion-label>
+                <ion-note slot="end" *ngIf="event.deleted">
+                    <ion-icon name="fas-trash" aria-hidden="true"></ion-icon> {{ 'core.deletedoffline' | translate }}
+                </ion-note>
+            </ion-item>
+            <ion-item>
+                <ion-label>
+                    <h2>{{ 'addon.calendar.eventtype' | translate }}</h2>
+                    <p>{{ 'addon.calendar.type' + event.formattedType | translate }}</p>
+                </ion-label>
+            </ion-item>
+            <ion-item class="ion-text-wrap" *ngIf="courseName" [href]="courseUrl" core-link capture="true">
+                <ion-label>
+                    <h2>{{ 'core.course' | translate}}</h2>
+                    <p>
+                        <core-format-text [text]="courseName" contextLevel="course" [contextInstanceId]="courseId">
+                        </core-format-text>
+                    </p>
+                </ion-label>
+            </ion-item>
+            <ion-item class="ion-text-wrap" *ngIf="groupName">
+                <ion-label>
+                    <h2>{{ 'core.group' | translate}}</h2>
+                    <p>{{ groupName }}</p>
+                </ion-label>
+            </ion-item>
+            <ion-item class="ion-text-wrap" *ngIf="categoryPath">
+                <ion-label>
+                    <h2>{{ 'core.category' | translate}}</h2>
+                    <p>
+                        <core-format-text [text]="categoryPath" contextLevel="coursecat" [contextInstanceId]="event.categoryid">
+                        </core-format-text>
+                    </p>
+                </ion-label>
+            </ion-item>
+            <ion-item class="ion-text-wrap" *ngIf="event.description">
+                <ion-label>
+                    <h2>{{ 'core.description' | translate}}</h2>
+                    <p>
+                        <core-format-text [text]="event.description" [contextLevel]="event.contextLevel"
                             [contextInstanceId]="event.contextInstanceId"></core-format-text>
-                    </ion-label>
-                    <ion-note slot="end" *ngIf="event.deleted">
-                        <ion-icon name="fas-trash" aria-hidden="true"></ion-icon> {{ 'core.deletedoffline' | translate }}
-                    </ion-note>
-                </ion-item>
-                <ion-item>
-                    <ion-label>
-                        <h2>{{ 'addon.calendar.eventtype' | translate }}</h2>
-                        <p>{{ 'addon.calendar.type' + event.formattedType | translate }}</p>
-                    </ion-label>
-                </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="courseName" [href]="courseUrl" core-link capture="true">
-                    <ion-label>
-                        <h2>{{ 'core.course' | translate}}</h2>
-                        <p>
-                            <core-format-text [text]="courseName" contextLevel="course" [contextInstanceId]="courseId">
-                            </core-format-text>
-                        </p>
-                    </ion-label>
-                </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="groupName">
-                    <ion-label>
-                        <h2>{{ 'core.group' | translate}}</h2>
-                        <p>{{ groupName }}</p>
-                    </ion-label>
-                </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="categoryPath">
-                    <ion-label>
-                        <h2>{{ 'core.category' | translate}}</h2>
-                        <p>
-                            <core-format-text [text]="categoryPath" contextLevel="coursecat" [contextInstanceId]="event.categoryid">
-                            </core-format-text>
-                        </p>
-                    </ion-label>
-                </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="event.description">
-                    <ion-label>
-                        <h2>{{ 'core.description' | translate}}</h2>
-                        <p>
-                            <core-format-text [text]="event.description" [contextLevel]="event.contextLevel"
+                    </p>
+                </ion-label>
+            </ion-item>
+            <ion-item class="ion-text-wrap" *ngIf="event.location">
+                <ion-label>
+                    <h2>{{ 'core.location' | translate}}</h2>
+                    <p>
+                        <a [href]="event.encodedLocation" core-link auto-login="no">
+                            <core-format-text [text]="event.location" [contextLevel]="event.contextLevel"
                                 [contextInstanceId]="event.contextInstanceId"></core-format-text>
-                        </p>
-                    </ion-label>
-                </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="event.location">
-                    <ion-label>
-                        <h2>{{ 'core.location' | translate}}</h2>
-                        <p>
-                            <a [href]="event.encodedLocation" core-link auto-login="no">
-                                <core-format-text [text]="event.location" [contextLevel]="event.contextLevel"
-                                    [contextInstanceId]="event.contextInstanceId"></core-format-text>
-                            </a>
-                        </p>
-                    </ion-label>
-                </ion-item>
-                <ion-item *ngIf="moduleUrl">
-                    <ion-label>
-                        <ion-button expand="block" color="primary" [href]="moduleUrl" core-link capture="true">
-                            {{ 'addon.calendar.gotoactivity' | translate }}
-                        </ion-button>
-                    </ion-label>
-                </ion-item>
-            </ion-card-content>
-        </ion-card>
+                        </a>
+                    </p>
+                </ion-label>
+            </ion-item>
+            <ion-item *ngIf="moduleUrl">
+                <ion-label>
+                    <ion-button expand="block" color="primary" [href]="moduleUrl" core-link capture="true">
+                        {{ 'addon.calendar.gotoactivity' | translate }}
+                    </ion-button>
+                </ion-label>
+            </ion-item>
+        </ion-list>
 
-        <ion-card list *ngIf="notificationsEnabled && event">
+        <ion-card *ngIf="notificationsEnabled && event">
             <ion-item>
                 <ion-label>
                     <h2>{{ 'addon.calendar.reminders' | translate }}</h2>
diff --git a/src/addons/calendar/pages/event/event.page.ts b/src/addons/calendar/pages/event/event.page.ts
index e335e6b78..28c5de7e9 100644
--- a/src/addons/calendar/pages/event/event.page.ts
+++ b/src/addons/calendar/pages/event/event.page.ts
@@ -46,7 +46,7 @@ import { AddonCalendarReminderTimeModalComponent } from '@addons/calendar/compon
 @Component({
     selector: 'page-addon-calendar-event',
     templateUrl: 'event.html',
-    styleUrls: ['event.scss'],
+    styleUrls: ['../../calendar-common.scss', 'event.scss'],
 })
 export class AddonCalendarEventPage implements OnInit, OnDestroy {
 
diff --git a/src/addons/calendar/pages/event/event.scss b/src/addons/calendar/pages/event/event.scss
index 5403de162..24e862cd4 100644
--- a/src/addons/calendar/pages/event/event.scss
+++ b/src/addons/calendar/pages/event/event.scss
@@ -2,9 +2,4 @@
     ion-card ion-note {
         font-size: 1.6rem;
     }
-    h1 ion-icon, h1 img, h1 core-mod-icon {
-        margin-left: 10px;
-        margin-right: 10px;
-        display: inline-block;
-    }
 }

From f7010db09146000bf1b890cbb72eeff470a2fad6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 18 Jan 2022 16:26:30 +0100
Subject: [PATCH 0368/1008] MOBILE-3811 icon: Adapt new icons on all views

---
 .../block/timeline/components/events/events.scss      |  1 +
 src/core/components/mod-icon/mod-icon.scss            | 11 +++++------
 src/core/features/grades/pages/course/course.scss     |  1 +
 src/core/features/sitehome/pages/index/index.scss     | 11 +++++++++++
 src/core/features/sitehome/pages/index/index.ts       |  1 +
 5 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 src/core/features/sitehome/pages/index/index.scss

diff --git a/src/addons/block/timeline/components/events/events.scss b/src/addons/block/timeline/components/events/events.scss
index 8ea49fcb1..8be5516b3 100644
--- a/src/addons/block/timeline/components/events/events.scss
+++ b/src/addons/block/timeline/components/events/events.scss
@@ -19,6 +19,7 @@ h4.core-bold {
 
 .addon-block-timeline-activity core-mod-icon {
     --margin-end: 0.5rem;
+    --margin-vertical: 0;
 }
 
 .addon-block-timeline-activity-time,
diff --git a/src/core/components/mod-icon/mod-icon.scss b/src/core/components/mod-icon/mod-icon.scss
index a5b781a26..7cac89699 100644
--- a/src/core/components/mod-icon/mod-icon.scss
+++ b/src/core/components/mod-icon/mod-icon.scss
@@ -1,16 +1,19 @@
 @import "~theme/globals";
 
 :host {
+    display: inline-block;
     --size: var(--module-icon-size);
     --margin-end: 0px;
     --margin-vertical: 0px;
 
     margin-top: var(--margin-vertical);
     margin-bottom: var(--margin-vertical);
-    margin-right: var(--margin-end);
+    @include margin-horizontal(null, var(--margin-end));
+
     border-radius: 4px;
     padding: 0.7rem;
     background-color: $gray-lighter;
+    line-height: var(--size);
 
     @each $type, $value in $activity-icon-colors {
         &.#{$type} {
@@ -28,6 +31,7 @@ img {
     height: var(--size);
     max-width: var(--size);
     max-height: var(--size);
+    vertical-align: top;
 
     &[alt] {
         text-indent: -999999px;
@@ -45,8 +49,3 @@ img {
     --margin-vertical: 12px;
     --margin-end: 12px;
 }
-
-:host-context([dir=rtl]) {
-    margin-right: unset;
-    margin-left: var(--margin-end);
-}
diff --git a/src/core/features/grades/pages/course/course.scss b/src/core/features/grades/pages/course/course.scss
index 3a004d4a6..8f3299ff6 100644
--- a/src/core/features/grades/pages/course/course.scss
+++ b/src/core/features/grades/pages/course/course.scss
@@ -87,6 +87,7 @@
         }
 
         core-mod-icon {
+            padding: 0.1rem;
             --size: 16px;
         }
 
diff --git a/src/core/features/sitehome/pages/index/index.scss b/src/core/features/sitehome/pages/index/index.scss
new file mode 100644
index 000000000..90dc443cc
--- /dev/null
+++ b/src/core/features/sitehome/pages/index/index.scss
@@ -0,0 +1,11 @@
+@import "~theme/globals";
+
+ion-item ion-icon {
+    display: inline-block;
+    border-radius: 4px;
+    padding: 0.7rem;
+    background-color: $gray-lighter;
+    line-height: var(--size);
+    --margin-end: 1rem;
+    @include margin-horizontal(null, var(--margin-end));
+}
diff --git a/src/core/features/sitehome/pages/index/index.ts b/src/core/features/sitehome/pages/index/index.ts
index b28c7d648..b880324d4 100644
--- a/src/core/features/sitehome/pages/index/index.ts
+++ b/src/core/features/sitehome/pages/index/index.ts
@@ -36,6 +36,7 @@ import { CoreUtils } from '@services/utils/utils';
 @Component({
     selector: 'page-core-sitehome-index',
     templateUrl: 'index.html',
+    styleUrls: ['index.scss'],
 })
 export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
 

From ed1d8ef2d41c1f3ccc84ee37e9a47623791b4547 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 19 Jan 2022 10:23:27 +0100
Subject: [PATCH 0369/1008] MOBILE-3811 assets: Minimize svg with svgo vscode
 extension

---
 .../img/completion/completion-auto-fail.svg   |  19 +-
 .../completion/completion-auto-n-override.svg |   4 +-
 .../img/completion/completion-auto-n.svg      |  16 +-
 .../img/completion/completion-auto-pass.svg   |  18 +-
 .../completion/completion-auto-y-override.svg |   4 +-
 .../img/completion/completion-auto-y.svg      |  18 +-
 .../completion-manual-n-override.svg          |   4 +-
 .../img/completion/completion-manual-n.svg    |  15 +-
 .../completion-manual-y-override.svg          |   4 +-
 .../img/completion/completion-manual-y.svg    |  18 +-
 src/assets/img/icons/activities.svg           | 179 +------
 src/assets/img/icons/courses.svg              | 258 +---------
 src/assets/img/icons/empty.svg                |   4 +-
 src/assets/img/icons/h5p.svg                  |  15 +-
 src/assets/img/mod/assign.svg                 |  11 +-
 src/assets/img/mod/bigbluebuttonbn.svg        |  16 +-
 src/assets/img/mod/book.svg                   |  12 +-
 src/assets/img/mod/chat.svg                   |  13 +-
 src/assets/img/mod/choice.svg                 |  15 +-
 src/assets/img/mod/data.svg                   |  19 +-
 src/assets/img/mod/external-tool.svg          |  15 +-
 src/assets/img/mod/feedback.svg               |  17 +-
 src/assets/img/mod/folder.svg                 |   9 +-
 src/assets/img/mod/forum.svg                  |  18 +-
 src/assets/img/mod/glossary.svg               |  10 +-
 src/assets/img/mod/h5pactivity.svg            |  17 +-
 src/assets/img/mod/imscp.svg                  |  19 +-
 src/assets/img/mod/label.svg                  |  15 +-
 src/assets/img/mod/lesson.svg                 |  16 +-
 src/assets/img/mod/lti.svg                    |  15 +-
 src/assets/img/mod/page.svg                   |  14 +-
 src/assets/img/mod/quiz.svg                   |  12 +-
 src/assets/img/mod/resource.svg               |  11 +-
 src/assets/img/mod/scorm.svg                  |   9 +-
 src/assets/img/mod/survey.svg                 |  14 +-
 src/assets/img/mod/url.svg                    |  18 +-
 src/assets/img/mod/wiki.svg                   |  26 +-
 src/assets/img/mod/workshop.svg               |  20 +-
 src/assets/img/mod_legacy/assign.svg          |  90 +---
 src/assets/img/mod_legacy/bigbluebuttonbn.svg |  56 +-
 src/assets/img/mod_legacy/book.svg            |  81 +--
 src/assets/img/mod_legacy/chat.svg            |  78 +--
 src/assets/img/mod_legacy/choice.svg          |  47 +-
 src/assets/img/mod_legacy/data.svg            |  88 +---
 src/assets/img/mod_legacy/external-tool.svg   |  56 +-
 src/assets/img/mod_legacy/feedback.svg        | 134 +----
 src/assets/img/mod_legacy/folder.svg          |  66 +--
 src/assets/img/mod_legacy/forum.svg           |  72 +--
 src/assets/img/mod_legacy/glossary.svg        | 147 +-----
 src/assets/img/mod_legacy/imscp.svg           | 157 +-----
 src/assets/img/mod_legacy/label.svg           |  95 +---
 src/assets/img/mod_legacy/lesson.svg          | 127 +----
 src/assets/img/mod_legacy/lti.svg             |  56 +-
 src/assets/img/mod_legacy/page.svg            | 113 +---
 src/assets/img/mod_legacy/quiz.svg            |  91 +---
 src/assets/img/mod_legacy/resource.svg        |  61 +--
 src/assets/img/mod_legacy/scorm.svg           |  85 +--
 src/assets/img/mod_legacy/survey.svg          |  90 +---
 src/assets/img/mod_legacy/url.svg             | 486 +-----------------
 src/assets/img/mod_legacy/wiki.svg            | 229 +--------
 src/assets/img/mod_legacy/workshop.svg        |  99 +---
 61 files changed, 61 insertions(+), 3480 deletions(-)

diff --git a/src/assets/img/completion/completion-auto-fail.svg b/src/assets/img/completion/completion-auto-fail.svg
index 771adf36f..68a8e5c37 100644
--- a/src/assets/img/completion/completion-auto-fail.svg
+++ b/src/assets/img/completion/completion-auto-fail.svg
@@ -1,18 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<path style="fill:#999999;" d="M10,0v2H6V0H10z M11,2h1c1.1,0,2,0.9,2,2v1h2V2c0-1.1-0.9-2-2-2h-3V2z M16,6h-2v4h2V6z M14,11v1
-	c0,1.1-0.9,2-2,2h-1v2h3c1.1,0,2-0.9,2-2v-3H14z M10,16v-2H6v2H10z M5,14H4c-1.1,0-2-0.9-2-2v-1H0v3c0,1.1,0.9,2,2,2h3V14z M0,10h2
-	V6H0V10z M2,5V4c0-1.1,0.9-2,2-2h1V0H2C0.9,0,0,0.9,0,2v3H2z"/>
-<path style="fill:#FF403C;" d="M10.2,8l2.6-2.6c0.4-0.4,0.4-1,0-1.4L12,3.3c-0.4-0.4-1-0.4-1.4,0L8,5.9L5.4,3.3
-	c-0.4-0.4-1-0.4-1.4,0L3.3,4c-0.4,0.4-0.4,1,0,1.4L5.9,8l-2.6,2.6C3,11,3,11.6,3.3,12l0.7,0.7c0.4,0.4,1,0.4,1.4,0L8,10.2l2.5,2.5
-	c0.4,0.4,1,0.4,1.4,0l0.7-0.7c0.4-0.4,0.4-1,0-1.4L10.2,8z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" style="overflow:visible;enable-background:new 0 0 16 16" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><path style="fill:#999" d="M10 0v2H6V0h4zm1 2h1c1.1 0 2 .9 2 2v1h2V2c0-1.1-.9-2-2-2h-3v2zm5 4h-2v4h2V6zm-2 5v1c0 1.1-.9 2-2 2h-1v2h3c1.1 0 2-.9 2-2v-3h-2zm-4 5v-2H6v2h4zm-5-2H4c-1.1 0-2-.9-2-2v-1H0v3c0 1.1.9 2 2 2h3v-2zm-5-4h2V6H0v4zm2-5V4c0-1.1.9-2 2-2h1V0H2C.9 0 0 .9 0 2v3h2z"/><path style="fill:#ff403c" d="m10.2 8 2.6-2.6c.4-.4.4-1 0-1.4l-.8-.7c-.4-.4-1-.4-1.4 0L8 5.9 5.4 3.3c-.4-.4-1-.4-1.4 0l-.7.7c-.4.4-.4 1 0 1.4L5.9 8l-2.6 2.6c-.3.4-.3 1 0 1.4l.7.7c.4.4 1 .4 1.4 0L8 10.2l2.5 2.5c.4.4 1 .4 1.4 0l.7-.7c.4-.4.4-1 0-1.4L10.2 8z"/></svg>
diff --git a/src/assets/img/completion/completion-auto-n-override.svg b/src/assets/img/completion/completion-auto-n-override.svg
index 6100638d0..bffccb8b8 100644
--- a/src/assets/img/completion/completion-auto-n-override.svg
+++ b/src/assets/img/completion/completion-auto-n-override.svg
@@ -1,3 +1 @@
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" preserveAspectRatio="xMinYMid meet" overflow="visible"><path d="M10 0v2H6V0h4zm1 2h1c1.1 0 2 .9 2 2v1h2V2c0-1.1-.9-2-2-2h-3v2zm5 4h-2v4h2V6zm-2 5v1c0 1.1-.9 2-2 2h-1v2h3c1.1 0 2-.9 2-2v-3h-2zm-4 5v-2H6v2h4zm-5-2H4c-1.1 0-2-.9-2-2v-1H0v3c0 1.1.9 2 2 2h3v-2zm-5-4h2V6H0v4zm2-5V4c0-1.1.9-2 2-2h1V0H2C.9 0 0 .9 0 2v3h2z" fill="#FF2727"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" preserveAspectRatio="xMinYMid meet" overflow="visible"><path d="M10 0v2H6V0h4zm1 2h1c1.1 0 2 .9 2 2v1h2V2c0-1.1-.9-2-2-2h-3v2zm5 4h-2v4h2V6zm-2 5v1c0 1.1-.9 2-2 2h-1v2h3c1.1 0 2-.9 2-2v-3h-2zm-4 5v-2H6v2h4zm-5-2H4c-1.1 0-2-.9-2-2v-1H0v3c0 1.1.9 2 2 2h3v-2zm-5-4h2V6H0v4zm2-5V4c0-1.1.9-2 2-2h1V0H2C.9 0 0 .9 0 2v3h2z" fill="#FF2727"/></svg> height="16" viewBox="0 0 16 16" preserveAspectRatio="xMinYMid meet" overflow="visible"><path d="M10 0v2H6V0h4zm1 2h1c1.1 0 2 .9 2 2v1h2V2c0-1.1-.9-2-2-2h-3v2zm5 4h-2v4h2V6zm-2 5v1c0 1.1-.9 2-2 2h-1v2h3c1.1 0 2-.9 2-2v-3h-2zm-4 5v-2H6v2h4zm-5-2H4c-1.1 0-2-.9-2-2v-1H0v3c0 1.1.9 2 2 2h3v-2zm-5-4h2V6H0v4zm2-5V4c0-1.1.9-2 2-2h1V0H2C.9 0 0 .9 0 2v3h2z" fill="#FF2727"/></svg>
diff --git a/src/assets/img/completion/completion-auto-n.svg b/src/assets/img/completion/completion-auto-n.svg
index 6a8bc6222..fa977d2f8 100644
--- a/src/assets/img/completion/completion-auto-n.svg
+++ b/src/assets/img/completion/completion-auto-n.svg
@@ -1,15 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<path style="fill:#999999;" d="M10,0v2H6V0H10z M11,2h1c1.1,0,2,0.9,2,2v1h2V2c0-1.1-0.9-2-2-2h-3V2z M16,6h-2v4h2V6z M14,11v1
-	c0,1.1-0.9,2-2,2h-1v2h3c1.1,0,2-0.9,2-2v-3H14z M10,16v-2H6v2H10z M5,14H4c-1.1,0-2-0.9-2-2v-1H0v3c0,1.1,0.9,2,2,2h3V14z M0,10h2
-	V6H0V10z M2,5V4c0-1.1,0.9-2,2-2h1V0H2C0.9,0,0,0.9,0,2v3H2z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" style="overflow:visible;enable-background:new 0 0 16 16" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><path style="fill:#999" d="M10 0v2H6V0h4zm1 2h1c1.1 0 2 .9 2 2v1h2V2c0-1.1-.9-2-2-2h-3v2zm5 4h-2v4h2V6zm-2 5v1c0 1.1-.9 2-2 2h-1v2h3c1.1 0 2-.9 2-2v-3h-2zm-4 5v-2H6v2h4zm-5-2H4c-1.1 0-2-.9-2-2v-1H0v3c0 1.1.9 2 2 2h3v-2zm-5-4h2V6H0v4zm2-5V4c0-1.1.9-2 2-2h1V0H2C.9 0 0 .9 0 2v3h2z"/></svg>
diff --git a/src/assets/img/completion/completion-auto-pass.svg b/src/assets/img/completion/completion-auto-pass.svg
index 44df83f15..323f4fe0e 100644
--- a/src/assets/img/completion/completion-auto-pass.svg
+++ b/src/assets/img/completion/completion-auto-pass.svg
@@ -1,17 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<path style="fill:#999999;" d="M10,0v2H6V0H10z M11,2h1c0.4,0,0.8,0.1,1.1,0.3c0.3-0.3,0.8-0.4,1.2-0.4c0.5,0,1,0.2,1.4,0.6L16,2.8
-	V2c0-1.1-0.9-2-2-2h-3V2z M14,10h2V6.4l-2,2V10z M14,11v1c0,1.1-0.9,2-2,2h-1v2h3c1.1,0,2-0.9,2-2v-3H14z M10,16v-2H6v2H10z M5,14H4
-	c-1.1,0-2-0.9-2-2v-1H0v3c0,1.1,0.9,2,2,2h3V14z M0,10h2V6H0V10z M2,5V4c0-1.1,0.9-2,2-2h1V0H2C0.9,0,0,0.9,0,2v3H2z"/>
-<path style="fill:#99CC33;" d="M15.7,3.9L15,3.2c-0.4-0.4-1-0.4-1.4,0l-6,6L5.4,7C5,6.7,4.4,6.7,4,7L3.3,7.7c-0.4,0.4-0.4,1,0,1.4
-	l3.6,3.6c0.4,0.4,1,0.4,1.4,0l7.4-7.4C16.1,4.9,16.1,4.3,15.7,3.9z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" style="overflow:visible;enable-background:new 0 0 16 16" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><path style="fill:#999" d="M10 0v2H6V0h4zm1 2h1c.4 0 .8.1 1.1.3.3-.3.8-.4 1.2-.4.5 0 1 .2 1.4.6l.3.3V2c0-1.1-.9-2-2-2h-3v2zm3 8h2V6.4l-2 2V10zm0 1v1c0 1.1-.9 2-2 2h-1v2h3c1.1 0 2-.9 2-2v-3h-2zm-4 5v-2H6v2h4zm-5-2H4c-1.1 0-2-.9-2-2v-1H0v3c0 1.1.9 2 2 2h3v-2zm-5-4h2V6H0v4zm2-5V4c0-1.1.9-2 2-2h1V0H2C.9 0 0 .9 0 2v3h2z"/><path style="fill:#9c3" d="m15.7 3.9-.7-.7c-.4-.4-1-.4-1.4 0l-6 6L5.4 7c-.4-.3-1-.3-1.4 0l-.7.7c-.4.4-.4 1 0 1.4l3.6 3.6c.4.4 1 .4 1.4 0l7.4-7.4c.4-.4.4-1 0-1.4z"/></svg>
diff --git a/src/assets/img/completion/completion-auto-y-override.svg b/src/assets/img/completion/completion-auto-y-override.svg
index 13cf5d700..375e13266 100644
--- a/src/assets/img/completion/completion-auto-y-override.svg
+++ b/src/assets/img/completion/completion-auto-y-override.svg
@@ -1,3 +1 @@
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" preserveAspectRatio="xMinYMid meet" overflow="visible"><path d="M10 0v2H6V0h4zm1 2h1c.4 0 .8.1 1.1.3.3-.3.8-.4 1.2-.4.5 0 1 .2 1.4.6l.3.3V2c0-1.1-.9-2-2-2h-3v2zm3 8h2V6.4l-2 2V10zm0 1v1c0 1.1-.9 2-2 2h-1v2h3c1.1 0 2-.9 2-2v-3h-2zm-4 5v-2H6v2h4zm-5-2H4c-1.1 0-2-.9-2-2v-1H0v3c0 1.1.9 2 2 2h3v-2zm-5-4h2V6H0v4zm2-5V4c0-1.1.9-2 2-2h1V0H2C.9 0 0 .9 0 2v3h2z" fill="#FF2727"/><path d="M15.7 3.9l-.7-.7c-.4-.4-1-.4-1.4 0l-6 6L5.4 7c-.4-.3-1-.3-1.4 0l-.7.7c-.4.4-.4 1 0 1.4l3.6 3.6c.4.4 1 .4 1.4 0l7.4-7.4c.4-.4.4-1 0-1.4z" fill="#76A1F0"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" preserveAspectRatio="xMinYMid meet" overflow="visible"><path d="M10 0v2H6V0h4zm1 2h1c.4 0 .8.1 1.1.3.3-.3.8-.4 1.2-.4.5 0 1 .2 1.4.6l.3.3V2c0-1.1-.9-2-2-2h-3v2zm3 8h2V6.4l-2 2V10zm0 1v1c0 1.1-.9 2-2 2h-1v2h3c1.1 0 2-.9 2-2v-3h-2zm-4 5v-2H6v2h4zm-5-2H4c-1.1 0-2-.9-2-2v-1H0v3c0 1.1.9 2 2 2h3v-2zm-5-4h2V6H0v4zm2-5V4c0-1.1.9-2 2-2h1V0H2C.9 0 0 .9 0 2v3h2z" fill="#FF2727"/><path d="m15.7 3.9-.7-.7c-.4-.4-1-.4-1.4 0l-6 6L5.4 7c-.4-.3-1-.3-1.4 0l-.7.7c-.4.4-.4 1 0 1.4l3.6 3.6c.4.4 1 .4 1.4 0l7.4-7.4c.4-.4.4-1 0-1.4z" fill="#76A1F0"/></svg> height="16" viewBox="0 0 16 16" preserveAspectRatio="xMinYMid meet" overflow="visible"><path d="M10 0v2H6V0h4zm1 2h1c.4 0 .8.1 1.1.3.3-.3.8-.4 1.2-.4.5 0 1 .2 1.4.6l.3.3V2c0-1.1-.9-2-2-2h-3v2zm3 8h2V6.4l-2 2V10zm0 1v1c0 1.1-.9 2-2 2h-1v2h3c1.1 0 2-.9 2-2v-3h-2zm-4 5v-2H6v2h4zm-5-2H4c-1.1 0-2-.9-2-2v-1H0v3c0 1.1.9 2 2 2h3v-2zm-5-4h2V6H0v4zm2-5V4c0-1.1.9-2 2-2h1V0H2C.9 0 0 .9 0 2v3h2z" fill="#FF2727"/><path d="M15.7 3.9l-.7-.7c-.4-.4-1-.4-1.4 0l-6 6L5.4 7c-.4-.3-1-.3-1.4 0l-.7.7c-.4.4-.4 1 0 1.4l3.6 3.6c.4.4 1 .4 1.4 0l7.4-7.4c.4-.4.4-1 0-1.4z" fill="#76A1F0"/></svg>
diff --git a/src/assets/img/completion/completion-auto-y.svg b/src/assets/img/completion/completion-auto-y.svg
index 14822e173..a565c8061 100644
--- a/src/assets/img/completion/completion-auto-y.svg
+++ b/src/assets/img/completion/completion-auto-y.svg
@@ -1,17 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<path style="fill:#999999;" d="M10,0v2H6V0H10z M11,2h1c0.4,0,0.8,0.1,1.1,0.3c0.3-0.3,0.8-0.4,1.2-0.4c0.5,0,1,0.2,1.4,0.6L16,2.8
-	V2c0-1.1-0.9-2-2-2h-3V2z M14,10h2V6.4l-2,2V10z M14,11v1c0,1.1-0.9,2-2,2h-1v2h3c1.1,0,2-0.9,2-2v-3H14z M10,16v-2H6v2H10z M5,14H4
-	c-1.1,0-2-0.9-2-2v-1H0v3c0,1.1,0.9,2,2,2h3V14z M0,10h2V6H0V10z M2,5V4c0-1.1,0.9-2,2-2h1V0H2C0.9,0,0,0.9,0,2v3H2z"/>
-<path style="fill:#76A1F0;" d="M15.7,3.9L15,3.2c-0.4-0.4-1-0.4-1.4,0l-6,6L5.4,7C5,6.7,4.4,6.7,4,7L3.3,7.7c-0.4,0.4-0.4,1,0,1.4
-	l3.6,3.6c0.4,0.4,1,0.4,1.4,0l7.4-7.4C16.1,4.9,16.1,4.3,15.7,3.9z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" style="overflow:visible;enable-background:new 0 0 16 16" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><path style="fill:#999" d="M10 0v2H6V0h4zm1 2h1c.4 0 .8.1 1.1.3.3-.3.8-.4 1.2-.4.5 0 1 .2 1.4.6l.3.3V2c0-1.1-.9-2-2-2h-3v2zm3 8h2V6.4l-2 2V10zm0 1v1c0 1.1-.9 2-2 2h-1v2h3c1.1 0 2-.9 2-2v-3h-2zm-4 5v-2H6v2h4zm-5-2H4c-1.1 0-2-.9-2-2v-1H0v3c0 1.1.9 2 2 2h3v-2zm-5-4h2V6H0v4zm2-5V4c0-1.1.9-2 2-2h1V0H2C.9 0 0 .9 0 2v3h2z"/><path style="fill:#76a1f0" d="m15.7 3.9-.7-.7c-.4-.4-1-.4-1.4 0l-6 6L5.4 7c-.4-.3-1-.3-1.4 0l-.7.7c-.4.4-.4 1 0 1.4l3.6 3.6c.4.4 1 .4 1.4 0l7.4-7.4c.4-.4.4-1 0-1.4z"/></svg>
diff --git a/src/assets/img/completion/completion-manual-n-override.svg b/src/assets/img/completion/completion-manual-n-override.svg
index cccfb99cd..9b929eafd 100644
--- a/src/assets/img/completion/completion-manual-n-override.svg
+++ b/src/assets/img/completion/completion-manual-n-override.svg
@@ -1,3 +1 @@
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" preserveAspectRatio="xMinYMid meet" overflow="visible"><path d="M14 0H2C.9 0 0 .9 0 2v12c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V2c0-1.1-.9-2-2-2zm0 12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V4c0-1.1.9-2 2-2h8c1.1 0 2 .9 2 2v8z" fill="#FF2727"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" preserveAspectRatio="xMinYMid meet" overflow="visible"><path d="M14 0H2C.9 0 0 .9 0 2v12c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V2c0-1.1-.9-2-2-2zm0 12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V4c0-1.1.9-2 2-2h8c1.1 0 2 .9 2 2v8z" fill="#FF2727"/></svg> height="16" viewBox="0 0 16 16" preserveAspectRatio="xMinYMid meet" overflow="visible"><path d="M14 0H2C.9 0 0 .9 0 2v12c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V2c0-1.1-.9-2-2-2zm0 12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V4c0-1.1.9-2 2-2h8c1.1 0 2 .9 2 2v8z" fill="#FF2727"/></svg>
diff --git a/src/assets/img/completion/completion-manual-n.svg b/src/assets/img/completion/completion-manual-n.svg
index f7750e25a..1503bed2e 100644
--- a/src/assets/img/completion/completion-manual-n.svg
+++ b/src/assets/img/completion/completion-manual-n.svg
@@ -1,14 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<path style="fill:#999999;" d="M14,0H2C0.9,0,0,0.9,0,2v12c0,1.1,0.9,2,2,2h12c1.1,0,2-0.9,2-2V2C16,0.9,15.1,0,14,0z M14,12
-	c0,1.1-0.9,2-2,2H4c-1.1,0-2-0.9-2-2V4c0-1.1,0.9-2,2-2h8c1.1,0,2,0.9,2,2V12z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" style="overflow:visible;enable-background:new 0 0 16 16" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><path style="fill:#999" d="M14 0H2C.9 0 0 .9 0 2v12c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V2c0-1.1-.9-2-2-2zm0 12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V4c0-1.1.9-2 2-2h8c1.1 0 2 .9 2 2v8z"/></svg>
diff --git a/src/assets/img/completion/completion-manual-y-override.svg b/src/assets/img/completion/completion-manual-y-override.svg
index 69270ba3e..849e3efc9 100644
--- a/src/assets/img/completion/completion-manual-y-override.svg
+++ b/src/assets/img/completion/completion-manual-y-override.svg
@@ -1,3 +1 @@
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" preserveAspectRatio="xMinYMid meet" overflow="visible"><path d="M14 8.4V12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V4c0-1.1.9-2 2-2h8c.4 0 .8.1 1.1.3.3-.3.8-.4 1.2-.4.5 0 1 .2 1.4.6l.3.3V2c0-1.1-.9-2-2-2H2C.9 0 0 .9 0 2v12c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V6.4l-2 2z" fill="#FF2727"/><path d="M15.7 3.9l-.7-.7c-.4-.4-1-.4-1.4 0l-6 6L5.4 7c-.4-.3-1-.3-1.4 0l-.7.7c-.4.4-.4 1 0 1.4l3.6 3.6c.4.4 1 .4 1.4 0l7.4-7.4c.4-.4.4-1 0-1.4z" fill="#76A1F0"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" preserveAspectRatio="xMinYMid meet" overflow="visible"><path d="M14 8.4V12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V4c0-1.1.9-2 2-2h8c.4 0 .8.1 1.1.3.3-.3.8-.4 1.2-.4.5 0 1 .2 1.4.6l.3.3V2c0-1.1-.9-2-2-2H2C.9 0 0 .9 0 2v12c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V6.4l-2 2z" fill="#FF2727"/><path d="m15.7 3.9-.7-.7c-.4-.4-1-.4-1.4 0l-6 6L5.4 7c-.4-.3-1-.3-1.4 0l-.7.7c-.4.4-.4 1 0 1.4l3.6 3.6c.4.4 1 .4 1.4 0l7.4-7.4c.4-.4.4-1 0-1.4z" fill="#76A1F0"/></svg> height="16" viewBox="0 0 16 16" preserveAspectRatio="xMinYMid meet" overflow="visible"><path d="M14 8.4V12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V4c0-1.1.9-2 2-2h8c.4 0 .8.1 1.1.3.3-.3.8-.4 1.2-.4.5 0 1 .2 1.4.6l.3.3V2c0-1.1-.9-2-2-2H2C.9 0 0 .9 0 2v12c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V6.4l-2 2z" fill="#FF2727"/><path d="M15.7 3.9l-.7-.7c-.4-.4-1-.4-1.4 0l-6 6L5.4 7c-.4-.3-1-.3-1.4 0l-.7.7c-.4.4-.4 1 0 1.4l3.6 3.6c.4.4 1 .4 1.4 0l7.4-7.4c.4-.4.4-1 0-1.4z" fill="#76A1F0"/></svg>
diff --git a/src/assets/img/completion/completion-manual-y.svg b/src/assets/img/completion/completion-manual-y.svg
index 3b91bdbc7..771006579 100644
--- a/src/assets/img/completion/completion-manual-y.svg
+++ b/src/assets/img/completion/completion-manual-y.svg
@@ -1,17 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<path style="fill:#999999;" d="M14,8.4V12c0,1.1-0.9,2-2,2H4c-1.1,0-2-0.9-2-2V4c0-1.1,0.9-2,2-2h8c0.4,0,0.8,0.1,1.1,0.3
-	c0.3-0.3,0.8-0.4,1.2-0.4c0.5,0,1,0.2,1.4,0.6L16,2.8V2c0-1.1-0.9-2-2-2H2C0.9,0,0,0.9,0,2v12c0,1.1,0.9,2,2,2h12c1.1,0,2-0.9,2-2
-	V6.4L14,8.4z"/>
-<path style="fill:#76A1F0;" d="M15.7,3.9L15,3.2c-0.4-0.4-1-0.4-1.4,0l-6,6L5.4,7C5,6.7,4.4,6.7,4,7L3.3,7.7c-0.4,0.4-0.4,1,0,1.4
-	l3.6,3.6c0.4,0.4,1,0.4,1.4,0l7.4-7.4C16.1,4.9,16.1,4.3,15.7,3.9z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" style="overflow:visible;enable-background:new 0 0 16 16" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><path style="fill:#999" d="M14 8.4V12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V4c0-1.1.9-2 2-2h8c.4 0 .8.1 1.1.3.3-.3.8-.4 1.2-.4.5 0 1 .2 1.4.6l.3.3V2c0-1.1-.9-2-2-2H2C.9 0 0 .9 0 2v12c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V6.4l-2 2z"/><path style="fill:#76a1f0" d="m15.7 3.9-.7-.7c-.4-.4-1-.4-1.4 0l-6 6L5.4 7c-.4-.3-1-.3-1.4 0l-.7.7c-.4.4-.4 1 0 1.4l3.6 3.6c.4.4 1 .4 1.4 0l7.4-7.4c.4-.4.4-1 0-1.4z"/></svg>
diff --git a/src/assets/img/icons/activities.svg b/src/assets/img/icons/activities.svg
index 56243a53c..73ae35859 100644
--- a/src/assets/img/icons/activities.svg
+++ b/src/assets/img/icons/activities.svg
@@ -1,178 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="157 -1509 148 125"
-   preserveAspectRatio="xMinYMid meet"
-   version="1.1"
-   id="svg23"
-   sodipodi:docname="activities.svg"
-   inkscape:version="0.92.1 r15371">
-  <metadata
-     id="metadata27">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     id="namedview25"
-     showgrid="false"
-     inkscape:zoom="5.981125"
-     inkscape:cx="38.889548"
-     inkscape:cy="62.5"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="Group_42" />
-  <defs
-     id="defs7">
-    <style
-       id="style2">
-      .cls-1 {
-        clip-path: url(#clip-Activities);
-      }
-
-      .cls-2 {
-        fill: #eee;
-      }
-
-      .cls-3 {
-        fill: #c4c8cc;
-      }
-
-      .cls-4 {
-        fill: #fff;
-      }
-    </style>
-    <clipPath
-       id="clip-Activities">
-      <rect
-         x="157"
-         y="-1509"
-         width="148"
-         height="125"
-         id="rect4" />
-    </clipPath>
-  </defs>
-  <g
-     id="Activities"
-     class="cls-1"
-     clip-path="url(#clip-Activities)">
-    <g
-       id="Group_42"
-       data-name="Group 42"
-       transform="translate(-268 -1985)">
-      <ellipse
-         id="Ellipse_37"
-         data-name="Ellipse 37"
-         class="cls-2"
-         cx="74"
-         cy="14.785"
-         rx="74"
-         ry="14.785"
-         transform="translate(425 571.43)"
-         style="fill:#000000;fill-opacity:0.06666667" />
-      <rect
-         id="Rectangle_80"
-         data-name="Rectangle 80"
-         class="cls-3"
-         width="94.182"
-         height="110.215"
-         transform="translate(451.909 476)" />
-      <g
-         id="Group_41"
-         data-name="Group 41"
-         transform="translate(467.043 493)">
-        <rect
-           id="Rectangle_81"
-           data-name="Rectangle 81"
-           class="cls-4"
-           width="44.456"
-           height="5.625"
-           transform="translate(21.16 0.549)" />
-        <rect
-           id="Rectangle_82"
-           data-name="Rectangle 82"
-           class="cls-4"
-           width="33.342"
-           height="5.625"
-           transform="translate(21.16 11.652)" />
-        <rect
-           id="Rectangle_83"
-           data-name="Rectangle 83"
-           class="cls-4"
-           width="44.456"
-           height="5.625"
-           transform="translate(21.16 30.772)" />
-        <rect
-           id="Rectangle_84"
-           data-name="Rectangle 84"
-           class="cls-4"
-           width="33.342"
-           height="5.625"
-           transform="translate(21.16 41.875)" />
-        <rect
-           id="Rectangle_85"
-           data-name="Rectangle 85"
-           class="cls-4"
-           width="44.456"
-           height="5.625"
-           transform="translate(21.16 61.291)" />
-        <rect
-           id="Rectangle_86"
-           data-name="Rectangle 86"
-           class="cls-4"
-           width="33.342"
-           height="5.625"
-           transform="translate(21.16 72.393)" />
-        <ellipse
-           id="Ellipse_38"
-           data-name="Ellipse 38"
-           class="cls-4"
-           cx="7.007"
-           cy="7"
-           rx="7.007"
-           ry="7"
-           transform="translate(0 0)" />
-        <ellipse
-           id="Ellipse_39"
-           data-name="Ellipse 39"
-           class="cls-4"
-           cx="7.007"
-           cy="7"
-           rx="7.007"
-           ry="7"
-           transform="translate(0 31)" />
-        <ellipse
-           id="Ellipse_40"
-           data-name="Ellipse 40"
-           class="cls-4"
-           cx="7.007"
-           cy="7"
-           rx="7.007"
-           ry="7"
-           transform="translate(0 61)" />
-      </g>
-    </g>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="157 -1509 148 125" preserveAspectRatio="xMinYMid meet" version="1.1" id="svg23"><defs id="defs7"><clipPath id="clip-Activities"><path id="rect4" d="M157-1509h148v125H157z"/></clipPath><style id="style2">.cls-4{fill:#fff}</style></defs><g id="Activities" clip-path="url(#clip-Activities)" style="clip-path:url(#clip-Activities)"><g id="Group_42" data-name="Group 42" transform="translate(-268 -1985)"><ellipse id="Ellipse_37" data-name="Ellipse 37" cx="74" cy="14.785" rx="74" ry="14.785" transform="translate(425 571.43)" style="fill:#000;fill-opacity:.06666667"/><path id="Rectangle_80" data-name="Rectangle 80" transform="translate(451.909 476)" style="fill:#c4c8cc" d="M0 0h94.182v110.215H0z"/><g id="Group_41" data-name="Group 41" transform="translate(467.043 493)"><path id="Rectangle_81" data-name="Rectangle 81" class="cls-4" transform="translate(21.16 .549)" d="M0 0h44.456v5.625H0z"/><path id="Rectangle_82" data-name="Rectangle 82" class="cls-4" transform="translate(21.16 11.652)" d="M0 0h33.342v5.625H0z"/><path id="Rectangle_83" data-name="Rectangle 83" class="cls-4" transform="translate(21.16 30.772)" d="M0 0h44.456v5.625H0z"/><path id="Rectangle_84" data-name="Rectangle 84" class="cls-4" transform="translate(21.16 41.875)" d="M0 0h33.342v5.625H0z"/><path id="Rectangle_85" data-name="Rectangle 85" class="cls-4" transform="translate(21.16 61.291)" d="M0 0h44.456v5.625H0z"/><path id="Rectangle_86" data-name="Rectangle 86" class="cls-4" transform="translate(21.16 72.393)" d="M0 0h33.342v5.625H0z"/><ellipse id="Ellipse_38" data-name="Ellipse 38" class="cls-4" cx="7.007" cy="7" rx="7.007" ry="7"/><ellipse id="Ellipse_39" data-name="Ellipse 39" class="cls-4" cx="7.007" cy="7" rx="7.007" ry="7" transform="translate(0 31)"/><ellipse id="Ellipse_40" data-name="Ellipse 40" class="cls-4" cx="7.007" cy="7" rx="7.007" ry="7" transform="translate(0 61)"/></g></g></g></svg>
diff --git a/src/assets/img/icons/courses.svg b/src/assets/img/icons/courses.svg
index 7bd9cb672..3f8e18b48 100644
--- a/src/assets/img/icons/courses.svg
+++ b/src/assets/img/icons/courses.svg
@@ -1,257 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="157 -1305 148 125"
-   preserveAspectRatio="xMinYMid meet"
-   version="1.1"
-   id="svg34"
-   sodipodi:docname="courses.svg"
-   inkscape:version="0.92.1 r15371">
-  <metadata
-     id="metadata38">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="744"
-     inkscape:window-height="480"
-     id="namedview36"
-     showgrid="false"
-     inkscape:zoom="1.888"
-     inkscape:cx="74"
-     inkscape:cy="62.5"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="Group_44" />
-  <defs
-     id="defs7">
-    <style
-       id="style2">
-      .cls-1 {
-        clip-path: url(#clip-Courses);
-      }
-
-      .cls-2 {
-        fill: #eee;
-      }
-
-      .cls-3 {
-        fill: #c4c8cc;
-      }
-
-      .cls-4 {
-        fill: #fff;
-      }
-    </style>
-    <clipPath
-       id="clip-Courses">
-      <rect
-         x="157"
-         y="-1305"
-         width="148"
-         height="125"
-         id="rect4" />
-    </clipPath>
-  </defs>
-  <g
-     id="Courses"
-     class="cls-1"
-     clip-path="url(#clip-Courses)">
-    <g
-       id="Group_44"
-       data-name="Group 44"
-       transform="translate(-268 -1781)">
-      <ellipse
-         id="Ellipse_41"
-         data-name="Ellipse 41"
-         class="cls-2"
-         cx="74"
-         cy="14.785"
-         rx="74"
-         ry="14.785"
-         transform="translate(425 571.43)"
-         style="fill:#000000;fill-opacity:0.06666667" />
-      <rect
-         id="Rectangle_87"
-         data-name="Rectangle 87"
-         class="cls-3"
-         width="95.097"
-         height="110.215"
-         transform="translate(451.909 476)" />
-      <g
-         id="Group_43"
-         data-name="Group 43"
-         transform="translate(464.04 494)">
-        <rect
-           id="Rectangle_88"
-           data-name="Rectangle 88"
-           class="cls-4"
-           width="31.043"
-           height="34"
-           transform="translate(0)" />
-        <rect
-           id="Rectangle_89"
-           data-name="Rectangle 89"
-           class="cls-4"
-           width="31.043"
-           height="34"
-           transform="translate(0 42)" />
-        <rect
-           id="Rectangle_90"
-           data-name="Rectangle 90"
-           class="cls-4"
-           width="31.067"
-           height="34"
-           transform="translate(39.005)" />
-        <rect
-           id="Rectangle_91"
-           data-name="Rectangle 91"
-           class="cls-4"
-           width="31.067"
-           height="34"
-           transform="translate(39.005 42)" />
-        <rect
-           id="Rectangle_92"
-           data-name="Rectangle 92"
-           class="cls-3"
-           width="23.023"
-           height="3.18"
-           transform="translate(3.081 16.549)" />
-        <rect
-           id="Rectangle_93"
-           data-name="Rectangle 93"
-           class="cls-3"
-           width="23.023"
-           height="3.18"
-           transform="translate(3.081 58.549)" />
-        <rect
-           id="Rectangle_94"
-           data-name="Rectangle 94"
-           class="cls-3"
-           width="23.023"
-           height="3.18"
-           transform="translate(43.122 16.549)" />
-        <rect
-           id="Rectangle_95"
-           data-name="Rectangle 95"
-           class="cls-3"
-           width="23.023"
-           height="3.18"
-           transform="translate(43.122 58.549)" />
-        <rect
-           id="Rectangle_96"
-           data-name="Rectangle 96"
-           class="cls-3"
-           width="14.014"
-           height="3.18"
-           transform="translate(3.081 21.825)" />
-        <rect
-           id="Rectangle_97"
-           data-name="Rectangle 97"
-           class="cls-3"
-           width="18.845"
-           height="3.18"
-           transform="translate(3.081 26.825)" />
-        <rect
-           id="Rectangle_98"
-           data-name="Rectangle 98"
-           class="cls-3"
-           width="14.014"
-           height="3.18"
-           transform="translate(3.081 63.825)" />
-        <rect
-           id="Rectangle_99"
-           data-name="Rectangle 99"
-           class="cls-3"
-           width="18.845"
-           height="3.18"
-           transform="translate(3.081 68.825)" />
-        <rect
-           id="Rectangle_100"
-           data-name="Rectangle 100"
-           class="cls-3"
-           width="14.014"
-           height="3.18"
-           transform="translate(43.122 21.825)" />
-        <rect
-           id="Rectangle_101"
-           data-name="Rectangle 101"
-           class="cls-3"
-           width="18.845"
-           height="3.18"
-           transform="translate(43.122 26.825)" />
-        <rect
-           id="Rectangle_102"
-           data-name="Rectangle 102"
-           class="cls-3"
-           width="14.014"
-           height="3.18"
-           transform="translate(43.122 63.825)" />
-        <rect
-           id="Rectangle_103"
-           data-name="Rectangle 103"
-           class="cls-3"
-           width="18.845"
-           height="3.18"
-           transform="translate(43.122 68.825)" />
-        <ellipse
-           id="Ellipse_42"
-           data-name="Ellipse 42"
-           class="cls-3"
-           cx="5.658"
-           cy="5.652"
-           rx="5.658"
-           ry="5.652"
-           transform="translate(3.003 3.55)" />
-        <ellipse
-           id="Ellipse_43"
-           data-name="Ellipse 43"
-           class="cls-3"
-           cx="5.658"
-           cy="5.652"
-           rx="5.658"
-           ry="5.652"
-           transform="translate(3.003 45.55)" />
-        <ellipse
-           id="Ellipse_44"
-           data-name="Ellipse 44"
-           class="cls-3"
-           cx="5.658"
-           cy="5.652"
-           rx="5.658"
-           ry="5.652"
-           transform="translate(43.044 3.55)" />
-        <ellipse
-           id="Ellipse_45"
-           data-name="Ellipse 45"
-           class="cls-3"
-           cx="5.658"
-           cy="5.652"
-           rx="5.658"
-           ry="5.652"
-           transform="translate(43.044 45.55)" />
-      </g>
-    </g>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="157 -1305 148 125" preserveAspectRatio="xMinYMid meet" version="1.1" id="svg34"><defs id="defs7"><clipPath id="clip-Courses"><path id="rect4" d="M157-1305h148v125H157z"/></clipPath><style id="style2">.cls-3{fill:#c4c8cc}.cls-4{fill:#fff}</style></defs><g id="Courses" clip-path="url(#clip-Courses)" style="clip-path:url(#clip-Courses)"><g id="Group_44" data-name="Group 44" transform="translate(-268 -1781)"><ellipse id="Ellipse_41" data-name="Ellipse 41" cx="74" cy="14.785" rx="74" ry="14.785" transform="translate(425 571.43)" style="fill:#000;fill-opacity:.06666667"/><path id="Rectangle_87" data-name="Rectangle 87" class="cls-3" transform="translate(451.909 476)" d="M0 0h95.097v110.215H0z"/><g id="Group_43" data-name="Group 43" transform="translate(464.04 494)"><path id="Rectangle_88" data-name="Rectangle 88" class="cls-4" d="M0 0h31.043v34H0z"/><path id="Rectangle_89" data-name="Rectangle 89" class="cls-4" transform="translate(0 42)" d="M0 0h31.043v34H0z"/><path id="Rectangle_90" data-name="Rectangle 90" class="cls-4" transform="translate(39.005)" d="M0 0h31.067v34H0z"/><path id="Rectangle_91" data-name="Rectangle 91" class="cls-4" transform="translate(39.005 42)" d="M0 0h31.067v34H0z"/><path id="Rectangle_92" data-name="Rectangle 92" class="cls-3" transform="translate(3.081 16.549)" d="M0 0h23.023v3.18H0z"/><path id="Rectangle_93" data-name="Rectangle 93" class="cls-3" transform="translate(3.081 58.549)" d="M0 0h23.023v3.18H0z"/><path id="Rectangle_94" data-name="Rectangle 94" class="cls-3" transform="translate(43.122 16.549)" d="M0 0h23.023v3.18H0z"/><path id="Rectangle_95" data-name="Rectangle 95" class="cls-3" transform="translate(43.122 58.549)" d="M0 0h23.023v3.18H0z"/><path id="Rectangle_96" data-name="Rectangle 96" class="cls-3" transform="translate(3.081 21.825)" d="M0 0h14.014v3.18H0z"/><path id="Rectangle_97" data-name="Rectangle 97" class="cls-3" transform="translate(3.081 26.825)" d="M0 0h18.845v3.18H0z"/><path id="Rectangle_98" data-name="Rectangle 98" class="cls-3" transform="translate(3.081 63.825)" d="M0 0h14.014v3.18H0z"/><path id="Rectangle_99" data-name="Rectangle 99" class="cls-3" transform="translate(3.081 68.825)" d="M0 0h18.845v3.18H0z"/><path id="Rectangle_100" data-name="Rectangle 100" class="cls-3" transform="translate(43.122 21.825)" d="M0 0h14.014v3.18H0z"/><path id="Rectangle_101" data-name="Rectangle 101" class="cls-3" transform="translate(43.122 26.825)" d="M0 0h18.845v3.18H0z"/><path id="Rectangle_102" data-name="Rectangle 102" class="cls-3" transform="translate(43.122 63.825)" d="M0 0h14.014v3.18H0z"/><path id="Rectangle_103" data-name="Rectangle 103" class="cls-3" transform="translate(43.122 68.825)" d="M0 0h18.845v3.18H0z"/><ellipse id="Ellipse_42" data-name="Ellipse 42" class="cls-3" cx="5.658" cy="5.652" rx="5.658" ry="5.652" transform="translate(3.003 3.55)"/><ellipse id="Ellipse_43" data-name="Ellipse 43" class="cls-3" cx="5.658" cy="5.652" rx="5.658" ry="5.652" transform="translate(3.003 45.55)"/><ellipse id="Ellipse_44" data-name="Ellipse 44" class="cls-3" cx="5.658" cy="5.652" rx="5.658" ry="5.652" transform="translate(43.044 3.55)"/><ellipse id="Ellipse_45" data-name="Ellipse 45" class="cls-3" cx="5.658" cy="5.652" rx="5.658" ry="5.652" transform="translate(43.044 45.55)"/></g></g></g></svg>
diff --git a/src/assets/img/icons/empty.svg b/src/assets/img/icons/empty.svg
index a16fb7460..d13e2fd95 100644
--- a/src/assets/img/icons/empty.svg
+++ b/src/assets/img/icons/empty.svg
@@ -1,3 +1 @@
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" preserveAspectRatio="xMinYMid meet" overflow="visible"></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" preserveAspectRatio="xMinYMid meet" overflow="visible"/> height="16" viewBox="0 0 16 16" preserveAspectRatio="xMinYMid meet" overflow="visible"></svg>
diff --git a/src/assets/img/icons/h5p.svg b/src/assets/img/icons/h5p.svg
index 7856f9efb..1cb7a0ccc 100644
--- a/src/assets/img/icons/h5p.svg
+++ b/src/assets/img/icons/h5p.svg
@@ -1,14 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 345 150" style="enable-background:new 0 0 345 150;" xml:space="preserve">
-<g>
-	<path d="M325.7,14.7C317.6,6.9,305.3,3,289,3h-43.5H234v31h-66l-5.4,22.2c4.5-2.1,10.9-4.2,15.3-5.3c4.4-1.1,8.8-0.9,13.1-0.9
-		c14.6,0,26.5,4.5,35.6,13.3c9.1,8.8,13.6,20,13.6,33.4c0,9.4-2.3,18.5-7,27.2s-11.3,15.4-19.9,20c-3.1,1.6-6.5,3.1-10.2,4.1h42.4
-		H259V95h25c18.2,0,31.7-4.2,40.6-12.5s13.3-19.9,13.3-34.6C337.9,33.6,333.8,22.5,325.7,14.7z M288.7,60.6c-3.5,3-9.6,4.4-18.3,4.4
-		H259V33h13.2c8.4,0,14.2,1.5,17.2,4.7c3.1,3.2,4.6,6.9,4.6,11.5C294,53.9,292.2,57.6,288.7,60.6z"/>
-	<path d="M176.5,76.3c-7.9,0-14.7,4.6-18,11.2L119,81.9L136.8,3h-23.6H101v62H51V3H7v145h44V95h50v53h12.2h42
-		c-6.7-2-12.5-4.6-17.2-8.1c-4.8-3.6-8.7-7.7-11.7-12.3c-3-4.6-5.3-9.7-7.3-16.5l39.6-5.7c3.3,6.6,10.1,11.1,17.9,11.1
-		c11.1,0,20.1-9,20.1-20.1S187.5,76.3,176.5,76.3z"/>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 345 150" style="enable-background:new 0 0 345 150" xml:space="preserve"><path d="M325.7 14.7C317.6 6.9 305.3 3 289 3h-55v31h-66l-5.4 22.2c4.5-2.1 10.9-4.2 15.3-5.3 4.4-1.1 8.8-.9 13.1-.9 14.6 0 26.5 4.5 35.6 13.3 9.1 8.8 13.6 20 13.6 33.4 0 9.4-2.3 18.5-7 27.2s-11.3 15.4-19.9 20c-3.1 1.6-6.5 3.1-10.2 4.1H259V95h25c18.2 0 31.7-4.2 40.6-12.5s13.3-19.9 13.3-34.6c0-14.3-4.1-25.4-12.2-33.2zm-37 45.9c-3.5 3-9.6 4.4-18.3 4.4H259V33h13.2c8.4 0 14.2 1.5 17.2 4.7 3.1 3.2 4.6 6.9 4.6 11.5 0 4.7-1.8 8.4-5.3 11.4z"/><path d="M176.5 76.3c-7.9 0-14.7 4.6-18 11.2L119 81.9 136.8 3H101v62H51V3H7v145h44V95h50v53h54.2c-6.7-2-12.5-4.6-17.2-8.1-4.8-3.6-8.7-7.7-11.7-12.3-3-4.6-5.3-9.7-7.3-16.5l39.6-5.7c3.3 6.6 10.1 11.1 17.9 11.1 11.1 0 20.1-9 20.1-20.1s-9.1-20.1-20.1-20.1z"/></svg>
diff --git a/src/assets/img/mod/assign.svg b/src/assets/img/mod/assign.svg
index 18fea36dd..6721bd13a 100644
--- a/src/assets/img/mod/assign.svg
+++ b/src/assets/img/mod/assign.svg
@@ -1,10 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<path id="Path_963-6_1_" d="M37.9,74.4c-1,0-1.9-0.8-1.9-1.8v-0.1V64H15.6c-1.8,0-3.2-1.4-3.2-3.2l0,0V3.2c0-1.8,1.4-3.2,3.2-3.2h34
-	c0.8,0,1.7,0.3,2.2,0.9L63.9,13c0.6,0.6,0.9,1.4,0.9,2.2v45.5c0,1.8-1.4,3.2-3.2,3.2l0,0H41.1v8.5c0,1.1-0.9,2-1.9,2H37.9z
-	 M59.6,58.6V21.5h-13c-1.8,0-3.2-1.4-3.2-3.1l0,0v-13H17.7v53.3H36v-7.8h-5.1c-1.1,0-2-0.9-2-2c0-0.4,0.2-0.8,0.4-1.2l7.9-10.5
-	c0.7-0.8,1.8-0.9,2.7-0.3c0.1,0.1,8,10.8,8,10.8c0.7,0.9,0.5,2.1-0.4,2.8c-0.3,0.2-0.7,0.4-1.1,0.4h-5.2v7.8L59.6,58.6z M49.3,15.6
-	h9.1l-9.1-9.1C49.3,6.5,49.3,15.6,49.3,15.6z"/>
-</svg>
+<svg width="74.4" height="74.4" xmlns="http://www.w3.org/2000/svg" style="enable-background:new 0 0 74.4 74.4" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><path d="M37.9 74.4c-1 0-1.9-.8-1.9-1.8V64H15.6c-1.8 0-3.2-1.4-3.2-3.2V3.2c0-1.8 1.4-3.2 3.2-3.2h34c.8 0 1.7.3 2.2.9L63.9 13c.6.6.9 1.4.9 2.2v45.5c0 1.8-1.4 3.2-3.2 3.2H41.1v8.5c0 1.1-.9 2-1.9 2h-1.3zm21.7-15.8V21.5h-13c-1.8 0-3.2-1.4-3.2-3.1v-13H17.7v53.3H36v-7.8h-5.1c-1.1 0-2-.9-2-2 0-.4.2-.8.4-1.2l7.9-10.5c.7-.8 1.8-.9 2.7-.3.1.1 8 10.8 8 10.8.7.9.5 2.1-.4 2.8-.3.2-.7.4-1.1.4h-5.2v7.8l18.4-.1zm-10.3-43h9.1l-9.1-9.1v9.1z"/></svg>
diff --git a/src/assets/img/mod/bigbluebuttonbn.svg b/src/assets/img/mod/bigbluebuttonbn.svg
index 94874adeb..57fcc9ecf 100644
--- a/src/assets/img/mod/bigbluebuttonbn.svg
+++ b/src/assets/img/mod/bigbluebuttonbn.svg
@@ -1,15 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" style="fill:none" id="svg4" version="1.1" viewBox="0 0 74 74" height="74" width="74" sodipodi:docname="icon.svg" inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
-  <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="3768" inkscape:window-height="2096" id="namedview6" showgrid="false" inkscape:zoom="6.9532167" inkscape:cx="33.858158" inkscape:cy="40.191094" inkscape:window-x="72" inkscape:window-y="27" inkscape:window-maximized="1" inkscape:current-layer="svg4"/>
-  <metadata id="metadata10">
-    <rdf:RDF>
-      <cc:Work rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs id="defs8"/>
-  <path style="clip-rule:evenodd;fill:#000000;fill-rule:evenodd;stroke-width:4.9333334" id="path2" d="m 69.066667,37.000002 c 0,17.710171 -14.356493,32.066664 -32.066668,32.066664 -17.709926,0 -32.0666657,-14.356493 -32.0666657,-32.066664 0,-17.709928 14.3567397,-32.0666678 32.0666657,-32.0666678 17.710175,0 32.066668,14.3567398 32.066668,32.0666678 z m 4.933333,0 C 74,57.434359 57.43436,74 36.999999,74 16.565443,74 0,57.434359 0,37.000002 0,16.565443 16.565443,0 36.999999,0 57.43436,0 74,16.565443 74,37.000002 Z m -49.333333,8.616952 v -25.88362 c 1.836828,0 3.404888,0.89841 4.704624,2.69493 1.29944,1.796524 1.949308,3.959199 1.949308,6.487385 v 16.701305 c 0,1.330619 0.66526,1.995831 1.995877,1.995831 h 10.313579 c 1.33062,0 1.996322,-0.665212 1.996322,-1.995831 v -7.918345 c 0,-1.286416 -0.665702,-1.951528 -1.996322,-1.996272 h -1.99588 c -2.573174,-0.0894 -4.747052,-0.76067 -6.520634,-2.01566 -1.774717,-1.253908 -2.661728,-2.800014 -2.661728,-4.638173 h 11.178242 c 2.395477,0 4.435066,0.843154 6.121625,2.52843 1.685227,1.686412 2.528826,3.726 2.528826,6.121675 v 7.918345 c 0,2.395135 -0.843599,4.43566 -2.528826,6.121378 -1.686559,1.686216 -3.726148,2.528334 -6.121625,2.528334 H 33.316476 c -2.395181,0 -4.436002,-0.842118 -6.121327,-2.528334 -1.686412,-1.685718 -2.528482,-3.726243 -2.528482,-6.121378 z" inkscape:connector-curvature="0"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" style="fill:none" height="74" width="74"><path style="clip-rule:evenodd;fill:#000;fill-rule:evenodd;stroke-width:4.9333334" d="M69.067 37c0 17.71-14.357 32.067-32.067 32.067S4.933 54.71 4.933 37 19.29 4.933 37 4.933 69.067 19.29 69.067 37zM74 37c0 20.434-16.566 37-37 37C16.565 74 0 57.434 0 37 0 16.565 16.565 0 37 0c20.434 0 37 16.565 37 37Zm-49.333 8.617V19.733c1.836 0 3.405.899 4.704 2.695 1.3 1.797 1.95 3.96 1.95 6.488v16.701c0 1.33.665 1.996 1.995 1.996H43.63c1.33 0 1.996-.665 1.996-1.996v-7.918c0-1.287-.665-1.952-1.996-1.997h-1.996c-2.573-.09-4.747-.76-6.52-2.015-1.775-1.254-2.662-2.8-2.662-4.638H43.63c2.396 0 4.435.843 6.122 2.528 1.685 1.686 2.529 3.726 2.529 6.122v7.918c0 2.395-.844 4.436-2.53 6.121-1.686 1.687-3.725 2.529-6.12 2.529H33.315c-2.395 0-4.436-.842-6.12-2.529-1.687-1.685-2.53-3.726-2.53-6.121z"/></svg>
diff --git a/src/assets/img/mod/book.svg b/src/assets/img/mod/book.svg
index 994edc734..3c43cad61 100644
--- a/src/assets/img/mod/book.svg
+++ b/src/assets/img/mod/book.svg
@@ -1,11 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<path id="book-2-6_1_" d="M74.4,5.6c0-1.3-1.1-2.5-2.5-2.5c-0.4,0-0.7,0.1-1,0.3l-6.6,3.3V2.5c0-1.3-1.1-2.5-2.6-2.5
-	c-0.4,0-0.7,0.1-1,0.2L37.1,12L13.5,0.3c-1.2-0.6-2.7-0.1-3.3,1.1C10,1.6,10,2,9.9,2.3v4.2L3.5,3.3C2.3,2.7,0.7,3.2,0.2,4.4
-	C0,4.7,0,5.1,0,5.4v49.1c0,0.9,0.5,1.7,1.3,2.2L36,73.8c0.7,0.3,1.5,0.3,2.3,0L73,56.7c0.8-0.4,1.3-1.2,1.3-2.2L74.4,5.6L74.4,5.6z
-	 M36.3,62.4c0.4,0.1,0.9,0.1,1.3,0c0.1,0,0.2-0.1,0.3-0.1l0,0c0,0,24.7-12.2,24.8-12.2c0.8-0.4,1.3-1.2,1.3-2.2V12.3l5.2-2.6v42.9
-	L36.9,68.6L5.3,51.8V10.2l5,2.1v35.6c0,0.9,0.5,1.7,1.3,2.2c0.1,0,24.1,12.2,24.2,12.2l0,0C36.1,62.3,36.2,62.3,36.3,62.4L36.3,62.4
-	L36.3,62.4z M39.8,55.7V16.8l19-9.4v39L39.8,55.7z M15.5,46.2V7.3l19,9.4v38.8L15.5,46.2z"/>
-</svg>
+<svg width="74.4" height="74.4" xmlns="http://www.w3.org/2000/svg" style="enable-background:new 0 0 74.4 74.4" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><path d="M74.4 5.6c0-1.3-1.1-2.5-2.5-2.5-.4 0-.7.1-1 .3l-6.6 3.3V2.5c0-1.3-1.1-2.5-2.6-2.5-.4 0-.7.1-1 .2L37.1 12 13.5.3c-1.2-.6-2.7-.1-3.3 1.1-.2.2-.2.6-.3.9v4.2L3.5 3.3C2.3 2.7.7 3.2.2 4.4c-.2.3-.2.7-.2 1v49.1c0 .9.5 1.7 1.3 2.2L36 73.8c.7.3 1.5.3 2.3 0L73 56.7c.8-.4 1.3-1.2 1.3-2.2l.1-48.9zM36.3 62.4c.4.1.9.1 1.3 0 .1 0 .2-.1.3-.1 0 0 24.7-12.2 24.8-12.2.8-.4 1.3-1.2 1.3-2.2V12.3l5.2-2.6v42.9l-32.3 16L5.3 51.8V10.2l5 2.1v35.6c0 .9.5 1.7 1.3 2.2.1 0 24.1 12.2 24.2 12.2.3 0 .4 0 .5.1zm3.5-6.7V16.8l19-9.4v39l-19 9.3zm-24.3-9.5V7.3l19 9.4v38.8l-19-9.3z"/></svg>
diff --git a/src/assets/img/mod/chat.svg b/src/assets/img/mod/chat.svg
index 52efce452..f6ec94d25 100644
--- a/src/assets/img/mod/chat.svg
+++ b/src/assets/img/mod/chat.svg
@@ -1,12 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<path d="M72.4,32.9C67.8,24.3,57.9,20.4,49,20.6c-1.3-4.3-3.9-7.9-7.4-10.4c-11.9-8.8-31.7-7-39.6,7c-5.1,9.5,0.2,20.1,8.7,24.6v9.5
-	c0,1.3,1.1,2.4,2.2,2.4c0.6,0,1.1-0.2,1.4-0.6l7.5-7.8c1.2,0.1,2.4,0.2,3.6,0.1C29,57,41.9,62.1,52.6,61l7.5,7.8
-	c0.9,0.9,2.2,0.9,3.1-0.1c0.3-0.4,0.6-1,0.6-1.5v-9.6C72.3,53.1,77.5,42.4,72.4,32.9z M14.1,37.9C6.4,34.2,2.8,26.6,6.5,19.5
-	c3.8-6.6,11.3-9.3,18.1-9.4c4.8-0.1,9.5,1.3,13.5,4.2c2.5,1.8,4.3,4,5.4,7c-9,1.3-18.9,8.4-18.9,19c-1.1,0-2.2-0.1-3.4-0.2
-	c-0.6-0.1-1.2,0.2-1.7,0.5l-4.4,4.5v-5.3C15.3,39.2,14.8,38.4,14.1,37.9z M31.3,35.2c6.5-11,23.1-12,32.4-4.8
-	c3.1,2.4,5.8,6.3,5.7,10.7c0,5.2-3.4,9.9-9.1,12.8c-0.7,0.3-1.2,1.1-1.2,2v5.4l-4.4-4.5c-0.5-0.6-1.2-0.7-1.8-0.6
-	c-1.2,0.2-2.2,0.2-3.4,0.2c-2.6,0-5.2-0.4-7.8-1.2C33.9,52.6,26.5,44.1,31.3,35.2L31.3,35.2z"/>
-</svg>
+<svg width="74.4" height="74.4" xmlns="http://www.w3.org/2000/svg" style="enable-background:new 0 0 74.4 74.4" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><path d="M72.4 32.9C67.8 24.3 57.9 20.4 49 20.6c-1.3-4.3-3.9-7.9-7.4-10.4-11.9-8.8-31.7-7-39.6 7-5.1 9.5.2 20.1 8.7 24.6v9.5c0 1.3 1.1 2.4 2.2 2.4.6 0 1.1-.2 1.4-.6l7.5-7.8c1.2.1 2.4.2 3.6.1C29 57 41.9 62.1 52.6 61l7.5 7.8c.9.9 2.2.9 3.1-.1.3-.4.6-1 .6-1.5v-9.6c8.5-4.5 13.7-15.2 8.6-24.7zm-58.3 5C6.4 34.2 2.8 26.6 6.5 19.5c3.8-6.6 11.3-9.3 18.1-9.4 4.8-.1 9.5 1.3 13.5 4.2 2.5 1.8 4.3 4 5.4 7-9 1.3-18.9 8.4-18.9 19-1.1 0-2.2-.1-3.4-.2-.6-.1-1.2.2-1.7.5l-4.4 4.5v-5.3c.2-.6-.3-1.4-1-1.9zm17.2-2.7c6.5-11 23.1-12 32.4-4.8 3.1 2.4 5.8 6.3 5.7 10.7 0 5.2-3.4 9.9-9.1 12.8-.7.3-1.2 1.1-1.2 2v5.4l-4.4-4.5c-.5-.6-1.2-.7-1.8-.6-1.2.2-2.2.2-3.4.2-2.6 0-5.2-.4-7.8-1.2-7.8-2.6-15.2-11.1-10.4-20z"/></svg>
diff --git a/src/assets/img/mod/choice.svg b/src/assets/img/mod/choice.svg
index 02905029c..e81b8f5c5 100644
--- a/src/assets/img/mod/choice.svg
+++ b/src/assets/img/mod/choice.svg
@@ -1,14 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<path d="M71.6,6.9L57,0.5c-3.8-1.8-7.7,2.3-6.1,6.1l1.4,3.4c-6.4,2.3-11.5,4.4-15.1,7.6c-3.7-3.2-8.8-5.1-15.1-7.3l1.4-3.7
-	c1.6-3.8-2.3-7.9-6.1-6.1L2.8,6.9C0.5,8-0.6,10.7,0.4,13.1l6.2,15.1c0.9,2.3,3.6,3.6,5.9,2.7c1.3-0.5,2.2-1.4,2.7-2.7l1.4-3.6
-	l8.6,3.8c2.7,1,4.4,3.6,4.2,6.4c0,4.1,0,34.3,0,36.3c0,1.9,1.5,3.4,3.4,3.5h0.9h7.9c1.9,0,3.5-1.6,3.5-3.4v-0.5c0-1.8,0-31.5,0-35.7
-	c-0.2-2.8,0.5-5.4,3.2-6.4l9.5-3.8l1.4,3.6c0.9,2.3,3.6,3.6,5.9,2.7c1.2-0.4,2.2-1.4,2.6-2.6l6.2-15.1C75.1,10.6,74,7.9,71.6,6.9z
-	 M39.9,69.2h-5.3c0-2.1,0-36,0-36c-0.2-2.3-1-4.5-2.4-6.4c-1-1.3-2.7-2.4-3.8-2.9l-14.5-6.3L12,22.3c-0.2,0.5-1.1,0.9-1.6,0.7l0,0
-	c0,0-0.4-0.3-0.5-0.6L5.6,12.3c-0.3-0.5,0-1.2,0.5-1.4c0.8-0.2,11.1-5,11.1-3.6c0.3,0.3,0.4,0.8,0.3,1.2l-1.9,4.7
-	c7,3,16.9,5.8,19.7,9c0.8,0.8,1.7,1.6,2.3,2.5c2,2.8,2.6,5.4,2.6,8.7L39.9,69.2z M68.8,13.2l-3.9,9.2c-0.1,0.3-0.3,0.4-0.5,0.6
-	c-0.5,0.2-1-0.1-1.2-0.6l0,0l-2.4-5l-13.6,5.9c-1.5,0.7-2.3,1.2-3.3,2.5c-0.7-2.7-1.2-2.5-2.9-4.7c4.4-3.7,11.1-5,18.2-8l-2-4.9
-	C57,7.8,57.1,7.4,57.5,7c0-1.3,10.5,4.5,10.9,4.4c0.3,0.3,0.5,0.8,0.4,1.4V13.2z"/>
-</svg>
+<svg width="74.4" height="74.4" xmlns="http://www.w3.org/2000/svg" style="enable-background:new 0 0 74.4 74.4" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><path d="M71.6 6.9 57 .5c-3.8-1.8-7.7 2.3-6.1 6.1l1.4 3.4c-6.4 2.3-11.5 4.4-15.1 7.6-3.7-3.2-8.8-5.1-15.1-7.3l1.4-3.7c1.6-3.8-2.3-7.9-6.1-6.1L2.8 6.9C.5 8-.6 10.7.4 13.1l6.2 15.1c.9 2.3 3.6 3.6 5.9 2.7 1.3-.5 2.2-1.4 2.7-2.7l1.4-3.6 8.6 3.8c2.7 1 4.4 3.6 4.2 6.4v36.3c0 1.9 1.5 3.4 3.4 3.5h8.8c1.9 0 3.5-1.6 3.5-3.4V35c-.2-2.8.5-5.4 3.2-6.4l9.5-3.8 1.4 3.6c.9 2.3 3.6 3.6 5.9 2.7 1.2-.4 2.2-1.4 2.6-2.6l6.2-15.1c1.2-2.8.1-5.5-2.3-6.5zM39.9 69.2h-5.3v-36c-.2-2.3-1-4.5-2.4-6.4-1-1.3-2.7-2.4-3.8-2.9l-14.5-6.3-1.9 4.7c-.2.5-1.1.9-1.6.7 0 0-.4-.3-.5-.6L5.6 12.3c-.3-.5 0-1.2.5-1.4.8-.2 11.1-5 11.1-3.6.3.3.4.8.3 1.2l-1.9 4.7c7 3 16.9 5.8 19.7 9 .8.8 1.7 1.6 2.3 2.5 2 2.8 2.6 5.4 2.6 8.7l-.3 35.8zm28.9-56-3.9 9.2c-.1.3-.3.4-.5.6-.5.2-1-.1-1.2-.6l-2.4-5-13.6 5.9c-1.5.7-2.3 1.2-3.3 2.5-.7-2.7-1.2-2.5-2.9-4.7 4.4-3.7 11.1-5 18.2-8l-2-4.9c-.2-.4-.1-.8.3-1.2 0-1.3 10.5 4.5 10.9 4.4.3.3.5.8.4 1.4v.4z"/></svg>
diff --git a/src/assets/img/mod/data.svg b/src/assets/img/mod/data.svg
index 3bf47aa86..66f3a996b 100644
--- a/src/assets/img/mod/data.svg
+++ b/src/assets/img/mod/data.svg
@@ -1,18 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<path d="M64.9,8.1c-2.1-1.5-4.5-2.6-6.9-3.2c-13.7-3.4-28-3.4-41.5,0C14,5.5,11.6,6.6,9.6,8.1C8,9.2,6.9,10.9,6.8,12.9v48.6
-	c0.1,1.9,1.2,3.7,2.8,4.8c2.1,1.5,4.5,2.6,6.9,3.2c13.7,3.4,28,3.4,41.5,0c2.5-0.6,4.9-1.7,6.9-3.2c1.6-1.1,2.7-2.8,2.8-4.8V12.9
-	C67.6,11,66.6,9.2,64.9,8.1z M11.7,19.2c3.4,1.6,6.9,2.7,10.7,3.2c4.8,0.9,9.7,1.2,14.6,1.2s9.8-0.4,14.6-1.2
-	c3.7-0.5,7.3-1.6,10.7-3.2v9.9c0,0.1,0,0.2-0.3,0.5c-0.2,0.3-0.6,0.6-1.1,0.9c-1.6,0.9-3.3,1.5-5,1.9c-12.4,3-25.2,3-37.6,0
-	c-1.7-0.4-3.4-1.1-5-1.9c-0.4-0.2-0.9-0.5-1.3-0.9c-0.3-0.3-0.3-0.5-0.3-0.5L11.7,19.2L11.7,19.2z M62.5,61.4c0,0.1,0,0.2-0.3,0.5
-	s-0.7,0.6-1.2,0.9c-1.6,0.9-3.3,1.5-5,1.9c-12.4,3-25.2,3-37.6,0c-1.7-0.4-3.4-1.1-5-1.9c-0.4-0.2-0.9-0.5-1.3-0.9
-	c-0.3-0.3-0.3-0.5-0.3-0.5l0.1-9.9c3.4,1.6,6.9,2.7,10.7,3.2c4.8,0.9,9.7,1.2,14.6,1.2s9.8-0.3,14.6-1.2c3.7-0.5,7.3-1.6,10.7-3.2
-	L62.5,61.4L62.5,61.4z M62.5,45.4c0,0.1,0,0.2-0.3,0.5s-0.7,0.5-1.2,0.9c-1.6,0.9-3.3,1.5-5,1.9c-12.4,3-25.2,3-37.6,0
-	c-1.7-0.4-3.4-1.1-5-1.9c-0.4-0.2-0.9-0.5-1.3-0.9c-0.3-0.3-0.3-0.5-0.3-0.5v-9.9c3.4,1.6,6.9,2.7,10.7,3.2c9.7,1.6,19.7,1.6,29.4,0
-	c3.7-0.5,7.3-1.6,10.7-3.2L62.5,45.4L62.5,45.4z M62.2,13.4c-0.4,0.3-0.9,0.6-1.3,0.9c-1.6,0.9-3.3,1.5-5,1.9
-	c-6.1,1.6-12.5,2.2-18.8,2.2c-6.3,0.1-12.6-0.6-18.8-2.2c-1.7-0.4-3.4-1.1-5-1.9c-0.4-0.2-0.9-0.5-1.3-0.9c-0.3-0.3-0.3-0.5-0.3-0.5
-	s0-0.2,0.3-0.5s0.7-0.6,1.3-0.9c1.6-0.9,3.3-1.5,5-1.9c12.4-3,25.2-3,37.6,0c1.7,0.4,3.4,1.1,5,1.9c0.4,0.2,0.9,0.5,1.3,0.9
-	c0.3,0.3,0.3,0.5,0.3,0.5S62.6,13.1,62.2,13.4z"/>
-</svg>
+<svg width="74.4" height="74.4" xmlns="http://www.w3.org/2000/svg" style="enable-background:new 0 0 74.4 74.4" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><path d="M64.9 8.1c-2.1-1.5-4.5-2.6-6.9-3.2-13.7-3.4-28-3.4-41.5 0-2.5.6-4.9 1.7-6.9 3.2-1.6 1.1-2.7 2.8-2.8 4.8v48.6c.1 1.9 1.2 3.7 2.8 4.8 2.1 1.5 4.5 2.6 6.9 3.2 13.7 3.4 28 3.4 41.5 0 2.5-.6 4.9-1.7 6.9-3.2 1.6-1.1 2.7-2.8 2.8-4.8V12.9a6.1 6.1 0 0 0-2.8-4.8zM11.7 19.2c3.4 1.6 6.9 2.7 10.7 3.2 4.8.9 9.7 1.2 14.6 1.2s9.8-.4 14.6-1.2c3.7-.5 7.3-1.6 10.7-3.2v9.9c0 .1 0 .2-.3.5-.2.3-.6.6-1.1.9-1.6.9-3.3 1.5-5 1.9-12.4 3-25.2 3-37.6 0-1.7-.4-3.4-1.1-5-1.9-.4-.2-.9-.5-1.3-.9-.3-.3-.3-.5-.3-.5v-9.9zm50.8 42.2c0 .1 0 .2-.3.5s-.7.6-1.2.9c-1.6.9-3.3 1.5-5 1.9-12.4 3-25.2 3-37.6 0-1.7-.4-3.4-1.1-5-1.9-.4-.2-.9-.5-1.3-.9-.3-.3-.3-.5-.3-.5l.1-9.9c3.4 1.6 6.9 2.7 10.7 3.2 4.8.9 9.7 1.2 14.6 1.2s9.8-.3 14.6-1.2c3.7-.5 7.3-1.6 10.7-3.2v9.9zm0-16c0 .1 0 .2-.3.5s-.7.5-1.2.9c-1.6.9-3.3 1.5-5 1.9-12.4 3-25.2 3-37.6 0-1.7-.4-3.4-1.1-5-1.9-.4-.2-.9-.5-1.3-.9-.3-.3-.3-.5-.3-.5v-9.9c3.4 1.6 6.9 2.7 10.7 3.2 9.7 1.6 19.7 1.6 29.4 0 3.7-.5 7.3-1.6 10.7-3.2l-.1 9.9zm-.3-32c-.4.3-.9.6-1.3.9-1.6.9-3.3 1.5-5 1.9-6.1 1.6-12.5 2.2-18.8 2.2-6.3.1-12.6-.6-18.8-2.2-1.7-.4-3.4-1.1-5-1.9-.4-.2-.9-.5-1.3-.9-.3-.3-.3-.5-.3-.5s0-.2.3-.5.7-.6 1.3-.9c1.6-.9 3.3-1.5 5-1.9 12.4-3 25.2-3 37.6 0 1.7.4 3.4 1.1 5 1.9.4.2.9.5 1.3.9.3.3.3.5.3.5s.1.2-.3.5z"/></svg>
diff --git a/src/assets/img/mod/external-tool.svg b/src/assets/img/mod/external-tool.svg
index cc70c5de9..ff362e431 100644
--- a/src/assets/img/mod/external-tool.svg
+++ b/src/assets/img/mod/external-tool.svg
@@ -1,14 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<path d="M69.9,38.6c1.1,1,2.9,0.8,3.7-0.3c0.4-0.4,0.7-1.1,0.7-1.7V13.2c0-1.4-1.2-2.6-2.6-2.6l0,0H53.1c-0.6-14.1-20.7-14.1-21.3,0
-	H13.2c-1.4,0-2.6,1.2-2.6,2.6l0,0v18.6c-14.1,0.6-14.1,20.7,0,21.3v18.6c0,1.4,1.2,2.6,2.6,2.6l0,0h23.4c1.4,0,2.6-1.3,2.6-2.8
-	c0-0.7-0.2-1.2-0.7-1.7c-4.6-5.4,3-12.2,7.8-7.2c1.9,2,1.9,5.1,0,7.2c-1,1.1-0.9,2.8,0.2,3.7c0.4,0.4,1.1,0.7,1.8,0.7h23.4
-	c1.4,0,2.6-1.2,2.6-2.6l0,0V48.2c0-1.4-1.3-2.6-2.8-2.6c-0.7,0-1.2,0.2-1.7,0.7c-2.2,2-5.5,1.8-7.5-0.3l0,0
-	C58,41,64.9,34.2,69.9,38.6z M66.4,53.1c0.9,0,1.8-0.1,2.6-0.3v16.3H52.7c1.4-5.7-2-11.5-7.6-13c-5.7-1.4-11.5,2-13,7.6
-	c-0.4,1.8-0.4,3.6,0,5.4H15.8v-19c0-1.4-1.2-2.6-2.6-2.6l0,0c-0.9,0.2-1.8,0.3-2.6,0.4c-7.1-0.2-7.1-10.5,0-10.6
-	c0.7,0,1.2,0.1,1.8,0.3c1.4,0.4,2.9-0.2,3.4-1.7c0.1-0.2,0.1-0.6,0.1-0.9V15.9H35c1.4,0,2.6-1.2,2.6-2.6c0-0.3,0-0.6-0.1-0.9
-	c-1-2.8,0.4-5.8,3.3-6.7c2.8-1,5.8,0.4,6.7,3.3c0.2,0.6,0.3,1.1,0.3,1.8l0,0c0,0.6-0.1,1.2-0.3,1.8c-0.4,1.4,0.2,2.9,1.7,3.4
-	c0.3,0.1,0.6,0.1,0.9,0.1h19.1v16.3c-5.7-1.4-11.5,2-12.9,7.7c-1.4,5.7,2,11.5,7.7,12.9C64.7,53,65.5,53.3,66.4,53.1L66.4,53.1z"/>
-</svg>
+<svg width="74.4" height="74.4" xmlns="http://www.w3.org/2000/svg" style="enable-background:new 0 0 74.4 74.4" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><path d="M69.9 38.6c1.1 1 2.9.8 3.7-.3.4-.4.7-1.1.7-1.7V13.2c0-1.4-1.2-2.6-2.6-2.6H53.1c-.6-14.1-20.7-14.1-21.3 0H13.2c-1.4 0-2.6 1.2-2.6 2.6v18.6c-14.1.6-14.1 20.7 0 21.3v18.6c0 1.4 1.2 2.6 2.6 2.6h23.4c1.4 0 2.6-1.3 2.6-2.8 0-.7-.2-1.2-.7-1.7-4.6-5.4 3-12.2 7.8-7.2 1.9 2 1.9 5.1 0 7.2-1 1.1-.9 2.8.2 3.7.4.4 1.1.7 1.8.7h23.4c1.4 0 2.6-1.2 2.6-2.6V48.2c0-1.4-1.3-2.6-2.8-2.6-.7 0-1.2.2-1.7.7-2.2 2-5.5 1.8-7.5-.3-4.3-5 2.6-11.8 7.6-7.4zm-3.5 14.5c.9 0 1.8-.1 2.6-.3v16.3H52.7c1.4-5.7-2-11.5-7.6-13-5.7-1.4-11.5 2-13 7.6-.4 1.8-.4 3.6 0 5.4H15.8v-19c0-1.4-1.2-2.6-2.6-2.6-.9.2-1.8.3-2.6.4-7.1-.2-7.1-10.5 0-10.6.7 0 1.2.1 1.8.3 1.4.4 2.9-.2 3.4-1.7.1-.2.1-.6.1-.9V15.9H35c1.4 0 2.6-1.2 2.6-2.6 0-.3 0-.6-.1-.9-1-2.8.4-5.8 3.3-6.7 2.8-1 5.8.4 6.7 3.3.2.6.3 1.1.3 1.8 0 .6-.1 1.2-.3 1.8-.4 1.4.2 2.9 1.7 3.4.3.1.6.1.9.1h19.1v16.3c-5.7-1.4-11.5 2-12.9 7.7-1.4 5.7 2 11.5 7.7 12.9.7 0 1.5.3 2.4.1z"/></svg>
diff --git a/src/assets/img/mod/feedback.svg b/src/assets/img/mod/feedback.svg
index e4f8916f6..7fa5f02c5 100644
--- a/src/assets/img/mod/feedback.svg
+++ b/src/assets/img/mod/feedback.svg
@@ -1,16 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<g>
-	<path d="M62.8,0.2C62-0.2,61.1,0,60.5,0.7C60.3,0.9,45.7,15.9,31,17.3v26.2c14.7,1.3,29.3,16.4,29.5,16.6c0.8,0.8,2.1,0.8,2.9,0
-		c0.3-0.4,0.6-0.9,0.6-1.5V2.4C64,1.3,63.5,0.5,62.8,0.2z M58.9,52.3c-6.6-5.9-14.2-11.1-22.6-13.1V21.6c8.5-2,16-7.2,22.6-13.1
-		V52.3z"/>
-	<path d="M72.8,25.4c-0.8-1.5-2.1-2.6-3.4-3.4v16.7C74,36,75.6,30,72.8,25.4z"/>
-	<path d="M25.8,43.2V17.3H12.9C5.7,17.3,0,23.1,0,30.2c0,7.2,5.8,12.9,12.9,12.9h12.9V43.2z M5.1,30.3c0-4.3,3.5-7.6,7.6-7.6h7.6V38
-		h-7.6C8.6,37.9,5.1,34.6,5.1,30.3z"/>
-	<path d="M24.4,48.4h-14c-0.6,0-1.1-0.1-1.7-0.3c2,8.4,4.7,16.4,8,24.1c0.6,1.3,2.3,2.2,3.2,2.2h12.4c1.2,0,1.9-1.6,1.6-3.5
-		c-0.1-0.6-0.3-1.2-0.6-1.8C31.8,67.1,25.1,50.6,24.4,48.4z M20.9,69.2c-1.3-3.1-4.6-12.3-5.5-15.5h5.4c0,0,5.6,14.8,6,15.5H20.9
-		L20.9,69.2z"/>
-</g>
-</svg>
+<svg width="74.4" height="74.4" xmlns="http://www.w3.org/2000/svg" style="enable-background:new 0 0 74.4 74.4" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><path d="M62.8.2c-.8-.4-1.7-.2-2.3.5-.2.2-14.8 15.2-29.5 16.6v26.2c14.7 1.3 29.3 16.4 29.5 16.6.8.8 2.1.8 2.9 0 .3-.4.6-.9.6-1.5V2.4c0-1.1-.5-1.9-1.2-2.2zm-3.9 52.1c-6.6-5.9-14.2-11.1-22.6-13.1V21.6c8.5-2 16-7.2 22.6-13.1v43.8zM72.8 25.4c-.8-1.5-2.1-2.6-3.4-3.4v16.7C74 36 75.6 30 72.8 25.4zM25.8 43.2V17.3H12.9C5.7 17.3 0 23.1 0 30.2c0 7.2 5.8 12.9 12.9 12.9h12.9v.1zM5.1 30.3c0-4.3 3.5-7.6 7.6-7.6h7.6V38h-7.6c-4.1-.1-7.6-3.4-7.6-7.7zM24.4 48.4h-14c-.6 0-1.1-.1-1.7-.3 2 8.4 4.7 16.4 8 24.1.6 1.3 2.3 2.2 3.2 2.2h12.4c1.2 0 1.9-1.6 1.6-3.5-.1-.6-.3-1.2-.6-1.8-1.5-2-8.2-18.5-8.9-20.7zm-3.5 20.8c-1.3-3.1-4.6-12.3-5.5-15.5h5.4s5.6 14.8 6 15.5h-5.9z"/></svg>
diff --git a/src/assets/img/mod/folder.svg b/src/assets/img/mod/folder.svg
index e8dd12e1a..9ad8f814f 100644
--- a/src/assets/img/mod/folder.svg
+++ b/src/assets/img/mod/folder.svg
@@ -1,8 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<path d="M74.3,21c0-2.2-1.4-3.9-3.2-3.9H38l-7.4-11C30,5.4,29.1,5,28.3,5H3.4C1.6,5,0.1,6.8,0.1,9.1V65c0,2.2,1.5,3.9,3.3,4.1h67.7
-	c1.5,0,2.9-1.3,3.2-3.1c0-44.1,0.1-18.7,0.1-39.8L74.3,21L74.3,21z M69.1,22.6v41.2L5.2,63.6V10.2l22.3,0.3l7.7,11.4
-	c0.4,0.5,1,0.8,1.5,0.8H69.1z"/>
-</svg>
+<svg width="74.4" height="74.4" xmlns="http://www.w3.org/2000/svg" style="enable-background:new 0 0 74.4 74.4" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><path d="M74.3 21c0-2.2-1.4-3.9-3.2-3.9H38l-7.4-11C30 5.4 29.1 5 28.3 5H3.4C1.6 5 .1 6.8.1 9.1V65c0 2.2 1.5 3.9 3.3 4.1h67.7c1.5 0 2.9-1.3 3.2-3.1 0-44.1.1-18.7.1-39.8l-.1-5.2zm-5.2 1.6v41.2l-63.9-.2V10.2l22.3.3 7.7 11.4c.4.5 1 .8 1.5.8h32.4z"/></svg>
diff --git a/src/assets/img/mod/forum.svg b/src/assets/img/mod/forum.svg
index defe1015d..c1dbbb7ee 100644
--- a/src/assets/img/mod/forum.svg
+++ b/src/assets/img/mod/forum.svg
@@ -1,17 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<g>
-	<path d="M62,3.8L62,3.8H12.4C5.5,3.8,0,9.4,0,16.2l0,0v33.6c0,6.9,5.6,12.3,12.4,12.3h9l13.7,11.6c1.2,0.9,2.8,0.9,4,0l13.8-11.6h9
-		c6.9,0,12.4-5.6,12.4-12.4V16.2C74.3,9.3,68.9,3.8,62,3.8z M69.1,15.5v34.6c0,3.5-2.8,6.3-6.3,6.3l0,0h-9.2c-1.5,0-2.9,0.5-4.1,1.5
-		L37.3,68.1L25,57.9c-1.1-1-2.6-1.5-4.1-1.5h-9.1c-3.5,0-6.3-2.8-6.3-6.3l0,0V15.5c0-3.5,2.8-6.3,6.3-6.3l0,0h50.8
-		C66.1,9.2,69.1,12,69.1,15.5L69.1,15.5z"/>
-	<path d="M14.9,35.4c0.1,0,32.4,0,32.4,0c1.4,0,2.6-1.2,2.6-2.6c0-1.4-1.2-2.6-2.6-2.6H15.2c-1.4-0.1-2.7,1-2.8,2.4
-		C12.4,34.1,13.5,35.3,14.9,35.4z"/>
-	<path d="M15.1,24.9h16.1c1.4-0.1,2.5-1.3,2.4-2.8c-0.1-1.3-1.1-2.4-2.4-2.4h-16c-1.4,0-2.6,1.2-2.5,2.7
-		C12.8,23.7,13.8,24.8,15.1,24.9z"/>
-	<path d="M47.2,40.6H15.1c-1.4-0.1-2.7,1-2.8,2.4c-0.1,1.4,1,2.7,2.4,2.8c0.1,0,32.4,0,32.4,0c1.5,0,2.6-1.1,2.6-2.6
-		S48.7,40.6,47.2,40.6z"/>
-</g>
-</svg>
+<svg width="74.4" height="74.4" xmlns="http://www.w3.org/2000/svg" style="enable-background:new 0 0 74.4 74.4" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><path d="M62 3.8H12.4C5.5 3.8 0 9.4 0 16.2v33.6c0 6.9 5.6 12.3 12.4 12.3h9l13.7 11.6c1.2.9 2.8.9 4 0l13.8-11.6h9c6.9 0 12.4-5.6 12.4-12.4V16.2c0-6.9-5.4-12.4-12.3-12.4zm7.1 11.7v34.6c0 3.5-2.8 6.3-6.3 6.3h-9.2c-1.5 0-2.9.5-4.1 1.5L37.3 68.1 25 57.9c-1.1-1-2.6-1.5-4.1-1.5h-9.1c-3.5 0-6.3-2.8-6.3-6.3V15.5c0-3.5 2.8-6.3 6.3-6.3h50.8c3.5 0 6.5 2.8 6.5 6.3z"/><path d="M14.9 35.4h32.4c1.4 0 2.6-1.2 2.6-2.6 0-1.4-1.2-2.6-2.6-2.6H15.2c-1.4-.1-2.7 1-2.8 2.4 0 1.5 1.1 2.7 2.5 2.8zM15.1 24.9h16.1c1.4-.1 2.5-1.3 2.4-2.8-.1-1.3-1.1-2.4-2.4-2.4h-16c-1.4 0-2.6 1.2-2.5 2.7.1 1.3 1.1 2.4 2.4 2.5zM47.2 40.6H15.1c-1.4-.1-2.7 1-2.8 2.4-.1 1.4 1 2.7 2.4 2.8h32.4c1.5 0 2.6-1.1 2.6-2.6s-1-2.6-2.5-2.6z"/></svg>
diff --git a/src/assets/img/mod/glossary.svg b/src/assets/img/mod/glossary.svg
index 465bc2dcd..e77fa85ad 100644
--- a/src/assets/img/mod/glossary.svg
+++ b/src/assets/img/mod/glossary.svg
@@ -1,9 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<path d="M67.7,67.9V6.6c0-0.8-0.4-1.5-1.3-2l-8.7-4.4C57.4,0.1,57,0,56.7,0H8.8C7.5,0.1,6.6,1,6.6,2.2v70c-0.1,1,0.8,2.1,2.2,2.2
-	h47.9c0.3,0,0.7-0.1,1-0.2l8.7-4.4C67.3,69.4,67.7,68.7,67.7,67.9z M62.5,66l-4.4,2.2V57.7l4.4-2.2V66z M62.5,49.6l-4.4,2.2V41.3
-	l4.4-2.2V49.6z M62.5,33.5l-4.4,2.2V25.2l4.4-2.2V33.5z M61.4,17.7l-7.2,3c-0.7,0.5-1.3,1.2-1.3,2v46.4h-41V5.2h43.5L61.3,8
-	L61.4,17.7z"/>
-</svg>
+<svg width="74.4" height="74.4" xmlns="http://www.w3.org/2000/svg" style="enable-background:new 0 0 74.4 74.4" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><path d="M67.7 67.9V6.6c0-.8-.4-1.5-1.3-2L57.7.2c-.3-.1-.7-.2-1-.2H8.8C7.5.1 6.6 1 6.6 2.2v70c-.1 1 .8 2.1 2.2 2.2h47.9c.3 0 .7-.1 1-.2l8.7-4.4c.9-.4 1.3-1.1 1.3-1.9zM62.5 66l-4.4 2.2V57.7l4.4-2.2V66zm0-16.4-4.4 2.2V41.3l4.4-2.2v10.5zm0-16.1-4.4 2.2V25.2l4.4-2.2v10.5zm-1.1-15.8-7.2 3c-.7.5-1.3 1.2-1.3 2v46.4h-41V5.2h43.5L61.3 8l.1 9.7z"/></svg>
diff --git a/src/assets/img/mod/h5pactivity.svg b/src/assets/img/mod/h5pactivity.svg
index d76a924d5..0dddac960 100644
--- a/src/assets/img/mod/h5pactivity.svg
+++ b/src/assets/img/mod/h5pactivity.svg
@@ -1,16 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<g>
-	<path d="M40.9,38.3c-1.9-1.5-4.7-1.2-6.2,0.7l0,0L34,39.8l-4.3-0.6c-2.4-0.3-4.3-0.7-4.4-0.7c0-0.6,0.1-1.2,0.3-1.8
-		c0.3-1.6,3.3-14.7,3.5-15.4l0.1-0.3h-8v13.9H10.2V21h-10v32.3h10V41.3H21v11.9H27c3.2,0,5.9,0,5.8-0.1c-0.3-0.2-0.8-0.3-1.1-0.5
-		c-2.1-0.8-3.9-2.4-5.1-4.3c-0.7-1.1-1.5-3.2-1.4-3.4c0.2-0.2,2-0.3,4.4-0.7l4.3-0.6l0.8,0.8c1.5,1.9,4.3,2.1,6.2,0.6
-		c1.9-1.5,2.1-4.3,0.6-6.2C41.3,38.8,41.1,38.5,40.9,38.3z"/>
-	<path d="M74.2,30.8c0.1-1.2-0.1-2.5-0.4-3.6c-1-3.1-3-4.9-6.4-5.8c-1.2-0.3-1.8-0.3-8.8-0.4L51,21v6.7H36.4l-0.5,2.2
-		c-0.3,1.2-0.5,2.3-0.6,2.5c0,0.1,0,0.2,0.2,0.1c0.2-0.1,0.8-0.3,1.7-0.5c1.4-0.4,1.6-0.4,4.2-0.4c2.5,0,2.9,0.1,4.1,0.4
-		c1.7,0.5,3.2,1.5,4.4,2.8c1.9,1.9,2.9,4.4,2.7,7.1c0,5-3,9.7-6.9,11c-0.3,0.1-0.7,0.3-0.9,0.4c1.9,0.2,3.8,0.2,5.7,0.2h5.8V41.5H59
-		c2.7,0.1,5.4-0.1,8-0.6c3.4-0.8,6-3.4,6.9-6.7C74.2,33,74.3,31.9,74.2,30.8z M64.4,32.2c-0.4,1.1-1.3,1.9-2.5,2.3
-		c-1.1,0.3-2.2,0.3-3.4,0.3l-2.5,0.1v-7.5l2.6,0.1c1.1,0,2.1,0.1,3.2,0.3C63.8,28.3,64.9,30.3,64.4,32.2L64.4,32.2z"/>
-</g>
-</svg>
+<svg width="74.4" height="74.4" xmlns="http://www.w3.org/2000/svg" style="enable-background:new 0 0 74.4 74.4" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><path d="M40.9 38.3c-1.9-1.5-4.7-1.2-6.2.7l-.7.8-4.3-.6c-2.4-.3-4.3-.7-4.4-.7 0-.6.1-1.2.3-1.8.3-1.6 3.3-14.7 3.5-15.4l.1-.3h-8v13.9h-11V21H.2v32.3h10v-12H21v11.9h6c3.2 0 5.9 0 5.8-.1-.3-.2-.8-.3-1.1-.5-2.1-.8-3.9-2.4-5.1-4.3-.7-1.1-1.5-3.2-1.4-3.4.2-.2 2-.3 4.4-.7l4.3-.6.8.8c1.5 1.9 4.3 2.1 6.2.6 1.9-1.5 2.1-4.3.6-6.2-.2 0-.4-.3-.6-.5z"/><path d="M74.2 30.8c.1-1.2-.1-2.5-.4-3.6-1-3.1-3-4.9-6.4-5.8-1.2-.3-1.8-.3-8.8-.4H51v6.7H36.4l-.5 2.2c-.3 1.2-.5 2.3-.6 2.5 0 .1 0 .2.2.1s.8-.3 1.7-.5c1.4-.4 1.6-.4 4.2-.4 2.5 0 2.9.1 4.1.4 1.7.5 3.2 1.5 4.4 2.8 1.9 1.9 2.9 4.4 2.7 7.1 0 5-3 9.7-6.9 11-.3.1-.7.3-.9.4 1.9.2 3.8.2 5.7.2h5.8v-12H59c2.7.1 5.4-.1 8-.6 3.4-.8 6-3.4 6.9-6.7.3-1.2.4-2.3.3-3.4zm-9.8 1.4c-.4 1.1-1.3 1.9-2.5 2.3-1.1.3-2.2.3-3.4.3l-2.5.1v-7.5l2.6.1c1.1 0 2.1.1 3.2.3 2 .5 3.1 2.5 2.6 4.4z"/></svg>
diff --git a/src/assets/img/mod/imscp.svg b/src/assets/img/mod/imscp.svg
index 30705d0a2..87f31fd32 100644
--- a/src/assets/img/mod/imscp.svg
+++ b/src/assets/img/mod/imscp.svg
@@ -1,18 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<style type="text/css">
-	.st0{fill:none;}
-</style>
-<g>
-	<path d="M34.4,43.9H15.6V32.5l-8.2-0.1c-0.6,0-1.1,0.4-1.4,1L0.2,46.1c-0.1,0.2-0.2,0.6-0.2,1v25.2c0,1.1,0.7,2.1,1.6,2.1h31.6
-		c0.8,0,1.6-1,1.6-2.1V46c0,0,0-0.1,0-0.2C34.8,44.6,35,44.1,34.4,43.9z M29.6,68.9H5.4V46.5l4.5-8.8h0.6v11.4h19.1V68.9z"/>
-	<path d="M39.6,45.8c0,0.1,0,0.2,0,0.2v26.3c0,1.1,0.8,2.1,1.6,2.1h31.6c0.9,0,1.6-1,1.6-2.1V47.1c0-0.4-0.1-0.8-0.2-1l-5.8-12.7
-		c-0.3-0.6-0.8-1-1.4-1l-8.2,0.1v11.4H40C39.4,44.1,39.6,44.6,39.6,45.8z M44.8,49.1h19.1V37.7h0.6l4.5,8.8v22.4H44.8V49.1z"/>
-	<path d="M53.6,12.7L47.9,0.9C47.6,0.3,47.1,0,46.6,0H27.8c-0.5,0-1,0.3-1.3,0.9l-5.6,11.7c-0.2,0.3-0.2,0.7-0.2,1v23.5
-		c0,0.9,0.7,1.8,1.6,1.8h30c0.8,0,1.5-0.9,1.5-1.9V13.5C53.8,13.2,53.7,12.9,53.6,12.7z M30.4,5.3h13.7l2.5,4.9H28L30.4,5.3z
-		 M48.6,33.6H26.2V15.4h22.4V33.6z"/>
-</g>
-<rect class="st0" width="74.4" height="74.4"/>
-</svg>
+<svg width="74.4" height="74.4" xmlns="http://www.w3.org/2000/svg" style="enable-background:new 0 0 74.4 74.4" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><path d="M34.4 43.9H15.6V32.5l-8.2-.1c-.6 0-1.1.4-1.4 1L.2 46.1c-.1.2-.2.6-.2 1v25.2c0 1.1.7 2.1 1.6 2.1h31.6c.8 0 1.6-1 1.6-2.1V45.8c0-1.2.2-1.7-.4-1.9zm-4.8 25H5.4V46.5l4.5-8.8h.6v11.4h19.1v19.8zM39.6 45.8v26.5c0 1.1.8 2.1 1.6 2.1h31.6c.9 0 1.6-1 1.6-2.1V47.1c0-.4-.1-.8-.2-1l-5.8-12.7c-.3-.6-.8-1-1.4-1l-8.2.1v11.4H40c-.6.2-.4.7-.4 1.9zm5.2 3.3h19.1V37.7h.6l4.5 8.8v22.4H44.8V49.1z"/><path d="M53.6 12.7 47.9.9c-.3-.6-.8-.9-1.3-.9H27.8c-.5 0-1 .3-1.3.9l-5.6 11.7c-.2.3-.2.7-.2 1v23.5c0 .9.7 1.8 1.6 1.8h30c.8 0 1.5-.9 1.5-1.9V13.5c0-.3-.1-.6-.2-.8zM30.4 5.3h13.7l2.5 4.9H28l2.4-4.9zm18.2 28.3H26.2V15.4h22.4v18.2z"/><path style="fill:none" d="M0 0h74.4v74.4H0z"/></svg>
diff --git a/src/assets/img/mod/label.svg b/src/assets/img/mod/label.svg
index b2494df89..49db2f821 100644
--- a/src/assets/img/mod/label.svg
+++ b/src/assets/img/mod/label.svg
@@ -1,14 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<g id="label-2-6_1_">
-	<path id="Subtraction_10-6_1_" d="M71.9,49.9L52.6,71.3c-1.7,1.9-4,3-6.4,3.1s-4.8-0.8-6.6-2.6l-34.2-33c-1.8-1.7-2.9-4-3-6.5
-		L0,9.9V9.8C-0.2,4.6,3.8,0.1,8.9,0l0,0h0.2l21.6,0.9c2.4-0.1,4.7,0.8,6.5,2.5l34.2,33c3.8,3.5,4,9.5,0.6,13.4
-		C72,49.8,71.9,49.8,71.9,49.9L71.9,49.9z M5.2,9.4l2.4,22.2v0.1c0,1.1,0.5,2.1,1.3,3l34.3,33.1c0.8,0.7,1.8,1.2,2.9,1.1
-		c1,0,2.1-0.5,2.9-1.3l19.3-21.4c1.5-1.7,1.5-4.4-0.2-5.9l0,0l-34.2-33c-0.8-0.8-1.8-1.2-3-1.2h-0.2L9.2,5.2
-		C6.8,5.3,5.2,7.2,5.2,9.4L5.2,9.4z M28.6,28.1c-3.3,3.7-8.9,3.9-12.6,0.5c-3.5-3.4-3.8-9.2-0.5-13s8.9-3.9,12.6-0.5
-		c1.8,1.8,2.9,4.1,2.9,6.7C31,24.2,30.1,26.5,28.6,28.1z M19.5,19.2c-1.4,1.5-1.4,4,0.1,5.4s3.9,1.4,5.3-0.1s1.4-4-0.1-5.4
-		c-0.7-0.7-1.6-1.1-2.5-1.1C21.2,18.1,20.2,18.5,19.5,19.2z"/>
-</g>
-</svg>
+<svg width="74.4" height="74.4" xmlns="http://www.w3.org/2000/svg" style="enable-background:new 0 0 74.4 74.4" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><path d="M71.9 49.9 52.6 71.3c-1.7 1.9-4 3-6.4 3.1s-4.8-.8-6.6-2.6l-34.2-33c-1.8-1.7-2.9-4-3-6.5L0 9.9v-.1C-.2 4.6 3.8.1 8.9 0h.2l21.6.9c2.4-.1 4.7.8 6.5 2.5l34.2 33c3.8 3.5 4 9.5.6 13.4 0 0-.1 0-.1.1zM5.2 9.4l2.4 22.2v.1c0 1.1.5 2.1 1.3 3l34.3 33.1c.8.7 1.8 1.2 2.9 1.1 1 0 2.1-.5 2.9-1.3l19.3-21.4c1.5-1.7 1.5-4.4-.2-5.9l-34.2-33c-.8-.8-1.8-1.2-3-1.2h-.2L9.2 5.2c-2.4.1-4 2-4 4.2zm23.4 18.7c-3.3 3.7-8.9 3.9-12.6.5-3.5-3.4-3.8-9.2-.5-13s8.9-3.9 12.6-.5c1.8 1.8 2.9 4.1 2.9 6.7 0 2.4-.9 4.7-2.4 6.3zm-9.1-8.9c-1.4 1.5-1.4 4 .1 5.4s3.9 1.4 5.3-.1 1.4-4-.1-5.4c-.7-.7-1.6-1.1-2.5-1.1-1.1.1-2.1.5-2.8 1.2z"/></svg>
diff --git a/src/assets/img/mod/lesson.svg b/src/assets/img/mod/lesson.svg
index 80ddee00b..12d1824e7 100644
--- a/src/assets/img/mod/lesson.svg
+++ b/src/assets/img/mod/lesson.svg
@@ -1,15 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<path d="M68.2,26.6v-5.1l0,0c3.4,0,6.2-2.8,6.2-6.2V7.6c0-3.4-2.8-6.2-6.2-6.2h-7.7c-3.4,0-6.2,2.8-6.2,6.2v1.9H22.9
-	C22.1,3.2,16.3-0.7,10,0.1C4.2,0.8,0,5.6,0,11.4l0,0c0,6.4,5.2,11.4,11.6,11.4l0,0l0,0c5.3,0,9.8-3.1,11.1-8.1h31.8v0.5
-	c0,3.4,2.8,6.2,6.2,6.2H63v4.2c0,4.9-5.1,8.9-10.4,8.9H23.3c-8.6,0-15.7,6.4-15.7,14.3v4.4H7c-3.4,0-6.2,2.8-6.2,6.2v7.7
-	c0,3.4,2.8,6.2,6.2,6.2h7.8c3.4,0,6.2-2.8,6.2-6.2v-1.2h30.7c1.2,6.1,7.1,9.5,13.2,8.3c5.2-1,8.6-5.7,8.6-10.9l0,0
-	c0-6.2-4.6-11.2-10.8-11.2l0,0c-5.4,0-9.9,3.3-11,8.6H20.9v-1.2c0-3.4-2.8-6.2-6.2-6.2h-1.8v-3.9c0-4.9,5.1-9.6,10.3-9.6h29.3
-	C61,39.9,68.2,34.5,68.2,26.6z M11.4,17.5c-3.4,0-6.2-2.8-6.2-6.1C5.2,8,8,5.2,11.3,5.2c3.4,0,6.2,2.8,6.2,6.1l0,0
-	C17.6,14.9,14.8,17.5,11.4,17.5z M60.4,16.2c-0.6,0-0.9-0.4-0.9-0.9V7.6c0-0.6,0.4-0.9,0.9-0.9h7.8c0.6,0,0.9,0.4,0.9,0.9v7.7
-	c0,0.6-0.4,0.9-0.9,0.9H60.4z M62.4,57.5L62.4,57.5c3.2,0,5.9,2.6,5.9,5.9c0,3.2-2.6,5.9-5.9,5.9s-5.9-2.6-5.9-5.9l0,0
-	C56.5,60,59.1,57.5,62.4,57.5L62.4,57.5z M14.6,58.4c0.6,0,1,0.4,1,0.9v7.8c0,0.6-0.4,0.9-1,0.9H6.8c-0.6,0-1-0.4-1-0.9v-7.8
-	c0-0.6,0.4-0.9,1-0.9H14.6z"/>
-</svg>
+<svg width="74.4" height="74.4" xmlns="http://www.w3.org/2000/svg" style="enable-background:new 0 0 74.4 74.4" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><path d="M68.2 26.6v-5.1c3.4 0 6.2-2.8 6.2-6.2V7.6c0-3.4-2.8-6.2-6.2-6.2h-7.7c-3.4 0-6.2 2.8-6.2 6.2v1.9H22.9C22.1 3.2 16.3-.7 10 .1 4.2.8 0 5.6 0 11.4c0 6.4 5.2 11.4 11.6 11.4 5.3 0 9.8-3.1 11.1-8.1h31.8v.5c0 3.4 2.8 6.2 6.2 6.2H63v4.2c0 4.9-5.1 8.9-10.4 8.9H23.3c-8.6 0-15.7 6.4-15.7 14.3v4.4H7C3.6 53.2.8 56 .8 59.4v7.7c0 3.4 2.8 6.2 6.2 6.2h7.8c3.4 0 6.2-2.8 6.2-6.2v-1.2h30.7c1.2 6.1 7.1 9.5 13.2 8.3 5.2-1 8.6-5.7 8.6-10.9 0-6.2-4.6-11.2-10.8-11.2-5.4 0-9.9 3.3-11 8.6H20.9v-1.2c0-3.4-2.8-6.2-6.2-6.2h-1.8v-3.9c0-4.9 5.1-9.6 10.3-9.6h29.3c8.5.1 15.7-5.3 15.7-13.2zm-56.8-9.1c-3.4 0-6.2-2.8-6.2-6.1C5.2 8 8 5.2 11.3 5.2c3.4 0 6.2 2.8 6.2 6.1.1 3.6-2.7 6.2-6.1 6.2zm49-1.3c-.6 0-.9-.4-.9-.9V7.6c0-.6.4-.9.9-.9h7.8c.6 0 .9.4.9.9v7.7c0 .6-.4.9-.9.9h-7.8zm2 41.3c3.2 0 5.9 2.6 5.9 5.9 0 3.2-2.6 5.9-5.9 5.9s-5.9-2.6-5.9-5.9c0-3.4 2.6-5.9 5.9-5.9zm-47.8.9c.6 0 1 .4 1 .9v7.8c0 .6-.4.9-1 .9H6.8c-.6 0-1-.4-1-.9v-7.8c0-.6.4-.9 1-.9h7.8z"/></svg>
diff --git a/src/assets/img/mod/lti.svg b/src/assets/img/mod/lti.svg
index cc70c5de9..ff362e431 100644
--- a/src/assets/img/mod/lti.svg
+++ b/src/assets/img/mod/lti.svg
@@ -1,14 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<path d="M69.9,38.6c1.1,1,2.9,0.8,3.7-0.3c0.4-0.4,0.7-1.1,0.7-1.7V13.2c0-1.4-1.2-2.6-2.6-2.6l0,0H53.1c-0.6-14.1-20.7-14.1-21.3,0
-	H13.2c-1.4,0-2.6,1.2-2.6,2.6l0,0v18.6c-14.1,0.6-14.1,20.7,0,21.3v18.6c0,1.4,1.2,2.6,2.6,2.6l0,0h23.4c1.4,0,2.6-1.3,2.6-2.8
-	c0-0.7-0.2-1.2-0.7-1.7c-4.6-5.4,3-12.2,7.8-7.2c1.9,2,1.9,5.1,0,7.2c-1,1.1-0.9,2.8,0.2,3.7c0.4,0.4,1.1,0.7,1.8,0.7h23.4
-	c1.4,0,2.6-1.2,2.6-2.6l0,0V48.2c0-1.4-1.3-2.6-2.8-2.6c-0.7,0-1.2,0.2-1.7,0.7c-2.2,2-5.5,1.8-7.5-0.3l0,0
-	C58,41,64.9,34.2,69.9,38.6z M66.4,53.1c0.9,0,1.8-0.1,2.6-0.3v16.3H52.7c1.4-5.7-2-11.5-7.6-13c-5.7-1.4-11.5,2-13,7.6
-	c-0.4,1.8-0.4,3.6,0,5.4H15.8v-19c0-1.4-1.2-2.6-2.6-2.6l0,0c-0.9,0.2-1.8,0.3-2.6,0.4c-7.1-0.2-7.1-10.5,0-10.6
-	c0.7,0,1.2,0.1,1.8,0.3c1.4,0.4,2.9-0.2,3.4-1.7c0.1-0.2,0.1-0.6,0.1-0.9V15.9H35c1.4,0,2.6-1.2,2.6-2.6c0-0.3,0-0.6-0.1-0.9
-	c-1-2.8,0.4-5.8,3.3-6.7c2.8-1,5.8,0.4,6.7,3.3c0.2,0.6,0.3,1.1,0.3,1.8l0,0c0,0.6-0.1,1.2-0.3,1.8c-0.4,1.4,0.2,2.9,1.7,3.4
-	c0.3,0.1,0.6,0.1,0.9,0.1h19.1v16.3c-5.7-1.4-11.5,2-12.9,7.7c-1.4,5.7,2,11.5,7.7,12.9C64.7,53,65.5,53.3,66.4,53.1L66.4,53.1z"/>
-</svg>
+<svg width="74.4" height="74.4" xmlns="http://www.w3.org/2000/svg" style="enable-background:new 0 0 74.4 74.4" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><path d="M69.9 38.6c1.1 1 2.9.8 3.7-.3.4-.4.7-1.1.7-1.7V13.2c0-1.4-1.2-2.6-2.6-2.6H53.1c-.6-14.1-20.7-14.1-21.3 0H13.2c-1.4 0-2.6 1.2-2.6 2.6v18.6c-14.1.6-14.1 20.7 0 21.3v18.6c0 1.4 1.2 2.6 2.6 2.6h23.4c1.4 0 2.6-1.3 2.6-2.8 0-.7-.2-1.2-.7-1.7-4.6-5.4 3-12.2 7.8-7.2 1.9 2 1.9 5.1 0 7.2-1 1.1-.9 2.8.2 3.7.4.4 1.1.7 1.8.7h23.4c1.4 0 2.6-1.2 2.6-2.6V48.2c0-1.4-1.3-2.6-2.8-2.6-.7 0-1.2.2-1.7.7-2.2 2-5.5 1.8-7.5-.3-4.3-5 2.6-11.8 7.6-7.4zm-3.5 14.5c.9 0 1.8-.1 2.6-.3v16.3H52.7c1.4-5.7-2-11.5-7.6-13-5.7-1.4-11.5 2-13 7.6-.4 1.8-.4 3.6 0 5.4H15.8v-19c0-1.4-1.2-2.6-2.6-2.6-.9.2-1.8.3-2.6.4-7.1-.2-7.1-10.5 0-10.6.7 0 1.2.1 1.8.3 1.4.4 2.9-.2 3.4-1.7.1-.2.1-.6.1-.9V15.9H35c1.4 0 2.6-1.2 2.6-2.6 0-.3 0-.6-.1-.9-1-2.8.4-5.8 3.3-6.7 2.8-1 5.8.4 6.7 3.3.2.6.3 1.1.3 1.8 0 .6-.1 1.2-.3 1.8-.4 1.4.2 2.9 1.7 3.4.3.1.6.1.9.1h19.1v16.3c-5.7-1.4-11.5 2-12.9 7.7-1.4 5.7 2 11.5 7.7 12.9.7 0 1.5.3 2.4.1z"/></svg>
diff --git a/src/assets/img/mod/page.svg b/src/assets/img/mod/page.svg
index 83751046f..0a202805e 100644
--- a/src/assets/img/mod/page.svg
+++ b/src/assets/img/mod/page.svg
@@ -1,13 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<g>
-	<path d="M66.5,15.1L52.4,1c-0.7-0.7-1.6-1-2.6-1H10.3C8.2,0,6.6,1.6,6.6,3.7l0,0v67c0,2.1,1.6,3.7,3.7,3.7l0,0H64
-		c2.1,0,3.7-1.6,3.7-3.7l0,0V17.8C67.5,16.8,67.2,15.8,66.5,15.1z M48.4,6.7l12.5,12.5H48.4V6.7z M11.9,69.2V5h30.9v15.6
-		c0,2.2,1.7,3.8,3.8,3.8h15.6v44.7L11.9,69.2L11.9,69.2z"/>
-	<path d="M54.3,43H19.7c-1.4,0-2.6,1.2-2.6,2.6s1.2,2.6,2.6,2.6h34.6c1.4,0,2.6-1.2,2.6-2.6C57,44.2,55.8,43,54.3,43z"/>
-	<path d="M54.3,53.5H19.7c-1.4,0-2.6,1.2-2.6,2.6s1.2,2.6,2.6,2.6h34.6c1.4,0,2.6-1.2,2.6-2.6S55.8,53.5,54.3,53.5z"/>
-	<path d="M19.8,37.8h20.9c1.4,0,2.6-1.2,2.6-2.6c0-1.4-1.2-2.6-2.6-2.6H19.8c-1.4,0-2.6,1.2-2.6,2.6S18.4,37.8,19.8,37.8z"/>
-</g>
-</svg>
+<svg width="74.4" height="74.4" xmlns="http://www.w3.org/2000/svg" style="enable-background:new 0 0 74.4 74.4" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><path d="M66.5 15.1 52.4 1c-.7-.7-1.6-1-2.6-1H10.3C8.2 0 6.6 1.6 6.6 3.7v67c0 2.1 1.6 3.7 3.7 3.7H64c2.1 0 3.7-1.6 3.7-3.7V17.8c-.2-1-.5-2-1.2-2.7zM48.4 6.7l12.5 12.5H48.4V6.7zM11.9 69.2V5h30.9v15.6c0 2.2 1.7 3.8 3.8 3.8h15.6v44.7l-50.3.1z"/><path d="M54.3 43H19.7c-1.4 0-2.6 1.2-2.6 2.6s1.2 2.6 2.6 2.6h34.6c1.4 0 2.6-1.2 2.6-2.6.1-1.4-1.1-2.6-2.6-2.6zM54.3 53.5H19.7c-1.4 0-2.6 1.2-2.6 2.6s1.2 2.6 2.6 2.6h34.6c1.4 0 2.6-1.2 2.6-2.6s-1.1-2.6-2.6-2.6zM19.8 37.8h20.9c1.4 0 2.6-1.2 2.6-2.6 0-1.4-1.2-2.6-2.6-2.6H19.8c-1.4 0-2.6 1.2-2.6 2.6s1.2 2.6 2.6 2.6z"/></svg>
diff --git a/src/assets/img/mod/quiz.svg b/src/assets/img/mod/quiz.svg
index 26cb7dda7..04aaadfc8 100644
--- a/src/assets/img/mod/quiz.svg
+++ b/src/assets/img/mod/quiz.svg
@@ -1,11 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<g>
-	<path d="M62.1,32.3c-1.7,0-2.6,1.4-2.6,3.1v22.8h-45V13.3h27.8c4.1,0.1,4.1-5.2,0-5.1H12.6c-1.7,0-3.1,1.4-3.1,3.1l0,0
-		v49.1c0,1.7,1.3,3.1,3,3.1l0,0h49c1.7,0,3.1-1.4,3.1-3.1V35.5C64.7,33.7,63.8,32.3,62.1,32.3z"/>
-	<path d="M28.4,30.9c-1.4-1-3.3-0.7-4.4,0.6c-1,1.4-0.7,3.4,0.6,4.5l9.5,7c1.1,0.8,2.2,1.1,3.4,0
-		c4.4-4.7,22.1-24.8,26.4-29.4c0.9-1,1.1-2.4,0.6-3.6s-1.7-1.9-3-1.9c-0.8,0-1.6,0.4-2.1,1C55,13.8,39.7,31.5,35.6,36L28.4,30.9z"/>
-</g>
-</svg>
+<svg width="74.4" height="74.4" xmlns="http://www.w3.org/2000/svg" style="enable-background:new 0 0 74.4 74.4" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><path d="M62.1 32.3c-1.7 0-2.6 1.4-2.6 3.1v22.8h-45V13.3h27.8c4.1.1 4.1-5.2 0-5.1H12.6c-1.7 0-3.1 1.4-3.1 3.1v49.1c0 1.7 1.3 3.1 3 3.1h49c1.7 0 3.1-1.4 3.1-3.1V35.5c.1-1.8-.8-3.2-2.5-3.2z"/><path d="M28.4 30.9c-1.4-1-3.3-.7-4.4.6-1 1.4-.7 3.4.6 4.5l9.5 7c1.1.8 2.2 1.1 3.4 0 4.4-4.7 22.1-24.8 26.4-29.4.9-1 1.1-2.4.6-3.6s-1.7-1.9-3-1.9c-.8 0-1.6.4-2.1 1C55 13.8 39.7 31.5 35.6 36l-7.2-5.1z"/></svg>
diff --git a/src/assets/img/mod/resource.svg b/src/assets/img/mod/resource.svg
index fde303973..e123e7470 100644
--- a/src/assets/img/mod/resource.svg
+++ b/src/assets/img/mod/resource.svg
@@ -1,10 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<g>
-	<path d="M66.5,15.1L52.4,1c-0.7-0.7-1.6-1-2.6-1H10.3C8.2,0,6.6,1.6,6.6,3.7l0,0v67c0,2.1,1.6,3.7,3.7,3.7l0,0H64
-		c2.1,0,3.7-1.6,3.7-3.7l0,0V17.8C67.5,16.8,67.2,15.8,66.5,15.1z M48.4,6.7l12.5,12.5H48.4V6.7z M11.9,69.2V5h30.9v15.6
-		c0,2.2,1.7,3.8,3.8,3.8h15.6v44.7L11.9,69.2L11.9,69.2z"/>
-</g>
-</svg>
+<svg width="74.4" height="74.4" xmlns="http://www.w3.org/2000/svg" style="enable-background:new 0 0 74.4 74.4" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><path d="M66.5 15.1 52.4 1c-.7-.7-1.6-1-2.6-1H10.3C8.2 0 6.6 1.6 6.6 3.7v67c0 2.1 1.6 3.7 3.7 3.7H64c2.1 0 3.7-1.6 3.7-3.7V17.8c-.2-1-.5-2-1.2-2.7zM48.4 6.7l12.5 12.5H48.4V6.7zM11.9 69.2V5h30.9v15.6c0 2.2 1.7 3.8 3.8 3.8h15.6v44.7l-50.3.1z"/></svg>
diff --git a/src/assets/img/mod/scorm.svg b/src/assets/img/mod/scorm.svg
index 76ec9c64f..95d97e0dd 100644
--- a/src/assets/img/mod/scorm.svg
+++ b/src/assets/img/mod/scorm.svg
@@ -1,8 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<path d="M74.1,29.6l-13-22.9c-0.5-0.8-1.4-1.5-2.4-1.5h-43c-1,0-1.8,0.5-2.4,1.5L0.4,29.6l0,0c-0.2,0.5-0.3,1-0.3,1.5v35.2
-	c0,1.6,1.3,2.9,2.7,2.9l0,0h68.9c1.5,0,2.7-1.3,2.7-2.9V31.1C74.4,30.5,74.3,30,74.1,29.6z M6.9,28.5l10.2-18.3l17.4,0.2v18.3
-	L6.9,28.5z M40,28.7V10.5h17.5l9.6,18.3H40V28.7z M69.2,34v30H5.3V34H69.2z"/>
-</svg>
+<svg width="74.4" height="74.4" xmlns="http://www.w3.org/2000/svg" style="enable-background:new 0 0 74.4 74.4" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><path d="m74.1 29.6-13-22.9c-.5-.8-1.4-1.5-2.4-1.5h-43c-1 0-1.8.5-2.4 1.5L.4 29.6c-.2.5-.3 1-.3 1.5v35.2c0 1.6 1.3 2.9 2.7 2.9h68.9c1.5 0 2.7-1.3 2.7-2.9V31.1c0-.6-.1-1.1-.3-1.5zM6.9 28.5l10.2-18.3 17.4.2v18.3l-27.6-.2zm33.1.2V10.5h17.5l9.6 18.3H40v-.1zM69.2 34v30H5.3V34h63.9z"/></svg>
diff --git a/src/assets/img/mod/survey.svg b/src/assets/img/mod/survey.svg
index 61e63e52b..a99aa548f 100644
--- a/src/assets/img/mod/survey.svg
+++ b/src/assets/img/mod/survey.svg
@@ -1,13 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<g>
-	<path d="M18.6,45.9H3.1C1.3,45.9,0,47.2,0,49v22.4c0,1.7,1.3,3.1,3.1,3.1h15.5c1.8,0,3.1-1.3,3.1-3.1V48.9
-		C21.7,47.2,20.3,45.9,18.6,45.9z M16.5,69.2H5.3V51.1h11.2V69.2z"/>
-	<path d="M44.4,0H29.9c-1.8,0-3.1,1.3-3.1,3.1v68.3c0,1.7,1.3,3.1,3.1,3.1h14.5c1.8,0,3.1-1.3,3.1-3.1V3.1C47.5,1.3,46.1,0,44.4,0z
-		 M42.3,69.2H32.1V5.3h10.2V69.2z"/>
-	<path d="M71.3,19.4H55.8c-1.8,0-3.1,1.3-3.1,3.1v48.9c0,1.7,1.3,3.1,3.1,3.1h15.5c1.8,0,3.1-1.3,3.1-3.1V22.5
-		C74.4,20.7,73,19.4,71.3,19.4z M69.2,69.2H58V24.6h11.2V69.2z"/>
-</g>
-</svg>
+<svg width="74.4" height="74.4" xmlns="http://www.w3.org/2000/svg" style="enable-background:new 0 0 74.4 74.4" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><path d="M18.6 45.9H3.1C1.3 45.9 0 47.2 0 49v22.4c0 1.7 1.3 3.1 3.1 3.1h15.5c1.8 0 3.1-1.3 3.1-3.1V48.9c0-1.7-1.4-3-3.1-3zm-2.1 23.3H5.3V51.1h11.2v18.1zM44.4 0H29.9c-1.8 0-3.1 1.3-3.1 3.1v68.3c0 1.7 1.3 3.1 3.1 3.1h14.5c1.8 0 3.1-1.3 3.1-3.1V3.1c0-1.8-1.4-3.1-3.1-3.1zm-2.1 69.2H32.1V5.3h10.2v63.9zM71.3 19.4H55.8c-1.8 0-3.1 1.3-3.1 3.1v48.9c0 1.7 1.3 3.1 3.1 3.1h15.5c1.8 0 3.1-1.3 3.1-3.1V22.5c0-1.8-1.4-3.1-3.1-3.1zm-2.1 49.8H58V24.6h11.2v44.6z"/></svg>
diff --git a/src/assets/img/mod/url.svg b/src/assets/img/mod/url.svg
index eb00b261c..fe096966e 100644
--- a/src/assets/img/mod/url.svg
+++ b/src/assets/img/mod/url.svg
@@ -1,17 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<path d="M37.2,0.2C8.6,0.2-14.7,35.9,11,63.6c7.6,7.6,17,11,26.2,10.9c9.2,0.1,18.6-3.2,26.2-10.9
-	C89.1,35.9,65.8,0.2,37.2,0.2z M69,34.7H55.2c-0.2-4.2-1-8.1-1.9-12.3c3-1.4,5.7-3.3,8-5.6C65.6,22,68.5,28,69,34.7z M58,13.7
-	c-1.8,1.6-3.8,3-5.9,4.2c-1-3.8-2.7-7.3-4.9-10.6C51.2,8.7,55,10.8,58,13.7z M37.2,34.8H23.7c0.1-3.6,0.8-6.9,1.5-10.5
-	c3.9,1.4,7.9,2.1,12,2.1c4.1,0,8.1-0.7,12-2.1c0.7,3.6,1.4,6.9,1.5,10.5H37.2z M50.4,40c-0.1,3.6-0.5,7-1.2,10.5
-	c-3.9-1.4-7.9-2.1-12-2.1c-4.1,0-8.1,0.7-12,2.1C24.5,47,24.1,43.6,24,40h13.2H50.4z M37.2,5.7c3.9,0,7.8,4.4,10.7,13.3
-	c0,0.2,0.2,0.5,0.2,0.8c-3.5,1.4-7.2,2-10.9,2s-7.4-0.7-10.9-2c0-0.3,0.2-0.6,0.2-0.8C29.4,10.1,33.3,5.8,37.2,5.7z M27.2,7.3
-	c-2.2,3.3-3.9,6.8-4.9,10.6c-2.1-1.2-4.1-2.6-5.9-4.2C19.4,10.8,23.2,8.7,27.2,7.3z M13.1,16.8c2.3,2.3,5,4.2,8,5.6
-	c-0.9,4.2-1.7,8.1-1.9,12.3H5.4C5.9,28,8.8,22,13.1,16.8z M12.5,57.1c-4.1-5-6.5-10.8-6.9-17.3h13.8c0.1,4.2,0.6,8.3,1.5,12.4
-	c-2.8,1.5-5.5,3.4-7.9,5.6L12.5,57.1z M16.2,61c1.8-1.6,3.8-3.1,5.9-4.3l0.1,0.2c1.1,3.8,2.8,7.3,4.9,10.4
-	C23.1,65.9,19.4,63.8,16.2,61z M37.2,69c-4.1,0.1-8.2-4.6-11-14.1c3.6-1.4,7.3-2,11-2c3.7,0,7.4,0.7,11,2
-	C45.4,64.4,41.3,69.1,37.2,69z M47.3,67.3c2.1-3.1,3.8-6.6,4.9-10.4l0.1-0.2c2.1,1.2,4.1,2.7,5.9,4.3C55,63.8,51.3,65.9,47.3,67.3z
-	 M61.9,57.1l-0.5,0.7c-2.4-2.2-5.1-4.1-7.9-5.6c0.9-4.1,1.4-8.2,1.5-12.4h13.8C68.4,46.3,66,52.1,61.9,57.1z"/>
-</svg>
+<svg width="74.4" height="74.4" xmlns="http://www.w3.org/2000/svg" style="enable-background:new 0 0 74.4 74.4" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><path d="M37.2.2C8.6.2-14.7 35.9 11 63.6c7.6 7.6 17 11 26.2 10.9 9.2.1 18.6-3.2 26.2-10.9C89.1 35.9 65.8.2 37.2.2zM69 34.7H55.2c-.2-4.2-1-8.1-1.9-12.3 3-1.4 5.7-3.3 8-5.6C65.6 22 68.5 28 69 34.7zm-11-21c-1.8 1.6-3.8 3-5.9 4.2-1-3.8-2.7-7.3-4.9-10.6 4 1.4 7.8 3.5 10.8 6.4zM37.2 34.8H23.7c.1-3.6.8-6.9 1.5-10.5 3.9 1.4 7.9 2.1 12 2.1s8.1-.7 12-2.1c.7 3.6 1.4 6.9 1.5 10.5H37.2zM50.4 40c-.1 3.6-.5 7-1.2 10.5-3.9-1.4-7.9-2.1-12-2.1s-8.1.7-12 2.1C24.5 47 24.1 43.6 24 40h26.4zM37.2 5.7c3.9 0 7.8 4.4 10.7 13.3 0 .2.2.5.2.8-3.5 1.4-7.2 2-10.9 2s-7.4-.7-10.9-2c0-.3.2-.6.2-.8 2.9-8.9 6.8-13.2 10.7-13.3zm-10 1.6c-2.2 3.3-3.9 6.8-4.9 10.6-2.1-1.2-4.1-2.6-5.9-4.2 3-2.9 6.8-5 10.8-6.4zm-14.1 9.5c2.3 2.3 5 4.2 8 5.6-.9 4.2-1.7 8.1-1.9 12.3H5.4C5.9 28 8.8 22 13.1 16.8zm-.6 40.3c-4.1-5-6.5-10.8-6.9-17.3h13.8c.1 4.2.6 8.3 1.5 12.4-2.8 1.5-5.5 3.4-7.9 5.6l-.5-.7zm3.7 3.9c1.8-1.6 3.8-3.1 5.9-4.3l.1.2c1.1 3.8 2.8 7.3 4.9 10.4-4-1.4-7.7-3.5-10.9-6.3zm21 8c-4.1.1-8.2-4.6-11-14.1 3.6-1.4 7.3-2 11-2s7.4.7 11 2c-2.8 9.5-6.9 14.2-11 14.1zm10.1-1.7c2.1-3.1 3.8-6.6 4.9-10.4l.1-.2c2.1 1.2 4.1 2.7 5.9 4.3-3.2 2.8-6.9 4.9-10.9 6.3zm14.6-10.2-.5.7c-2.4-2.2-5.1-4.1-7.9-5.6.9-4.1 1.4-8.2 1.5-12.4h13.8c-.4 6.5-2.8 12.3-6.9 17.3z"/></svg>
diff --git a/src/assets/img/mod/wiki.svg b/src/assets/img/mod/wiki.svg
index ff8eddd32..9c4ff6281 100644
--- a/src/assets/img/mod/wiki.svg
+++ b/src/assets/img/mod/wiki.svg
@@ -1,25 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<path d="M74.5,35.8c-0.4-1.8-1.4-3.4-2.8-4.5l0,0L71.3,31c-1-0.5-2-0.9-3.2-0.9c-0.5,0-1.1,0.1-1.5,0.2c-1.8,0.4-3.4,1.4-4.5,2.9
-	c-0.4,0.5-0.7,0.9-0.9,1.5l-10.7,0.1c-0.2-1.1-0.5-1.9-1.1-2.9c-0.7-1.5-1.4-2.5-2.6-3.6l2.8-5c0.4,0.1,0.7,0.1,1.1,0.1
-	c3.9,0,6.7-3.5,6.7-7.4s-3.2-7.1-7.1-7.1s-7.1,3.2-7.1,7.1c0,1.9,0.4,3.6,1.8,5l-2.7,4.7c-1.2-0.4-2.3-0.6-3.6-0.6
-	c-1.4,0-2.6,0.3-3.9,0.7l-8.2-14.3c0.4-0.4,0.5-0.9,0.8-1.3l0,0l0.1-0.2c0.8-1.6,0.9-3.4,0.4-5.1S26.3,1.8,24.8,1l-0.4-0.2l0,0
-	l-0.2-0.1c-0.9-0.4-2-0.7-2.9-0.7c-1.3,0-2.6,0.4-3.7,1.1c-1.2,0.7-2,1.7-2.7,2.9c-0.8,1.7-1,3.6-0.4,5.3s1.9,3.2,3.5,4
-	c0.9,0.4,1.9,0.7,2.8,0.7c0.5,0,1,0.2,1.4,0.1l8.2,14.3c-1.7,1.4-2.9,3-3.6,5C26.3,35,26,36.3,26.1,38l-9.8,2.7
-	c-2.2-4.2-7.4-5.5-11.6-3.3S-1.2,44.8,1,49c2.2,4.2,7.4,5.9,11.6,3.7c2.7-1.4,4.8-3.9,4.9-6.9L27.7,43l0.1,0.1
-	c0.7,1.5,1.1,2.3,2.3,3.3l-5.6,9.8c-0.6-0.2-1.3-0.3-2-0.3c-4.6,0-7.9,3.9-7.9,8.6c0,0.7,0.1,1.3,0.3,2c1.1,4.3,5.4,6.9,9.7,5.8
-	c0.7-0.2,1.4-0.4,2-0.9c1.2-0.7,2.3-1.8,3-3.1c0.9-1.6,1.2-3.4,1.1-5.2c-0.3-1.7-0.6-3.1-1.7-4.4l5.6-9.7c1.2,0.4,2.2,0.5,3.4,0.5
-	c0.4,0,0.7,0,1.1,0l3.2,11.9c-1.2,0.9-2.2,2.1-2.7,3.6c-0.6,1.8-0.5,3.7,0.3,5.3c0.8,1.7,2.2,2.9,3.9,3.6l0,0
-	c0.7,0.3,1.4,0.4,2.2,0.4c1.1,0,2.1-0.3,3-0.7c1.7-0.8,2.9-2.3,3.6-4l0,0c0.2-0.5,0.3-1,0.4-1.5c0.2-1.3-0.1-2.6-0.6-3.7
-	c-0.8-1.7-2.1-2.9-3.8-3.6l0,0l0,0c-0.6-0.2-1.3-0.3-1.9-0.4l-3.2-11.9l0.2-0.1c1.4-0.7,2.7-1.7,3.7-2.8c1.1-1.2,1.9-2.5,2.4-4v-0.1
-	c0.1-0.4,0.2-0.8,0.4-1.2v-0.2l0.1-0.1l10.8-0.1c0.4,1.4,1.3,2.3,2.6,3.2l0,0c1.2,0.8,2.6,1.2,3.9,1.2c2.3,0,4.5-1.2,5.8-3.1l0,0
-	C74.4,39.5,74.9,37.5,74.5,35.8z M47.2,64.7c0.6,0.2,1.3,0.9,1.5,1.4c0.3,0.6,0.4,1.3,0.1,2l0,0c-0.3,0.6-0.7,1.2-1.3,1.4l0,0l0,0
-	c-0.4,0.2-0.6,0.2-1,0.3c-0.3,0-0.6-0.1-0.9-0.2l0,0c-0.6-0.2-1.1-0.7-1.4-1.2c-0.3-0.6-0.4-1.3-0.1-2c0.4-1.1,1.2-1.8,2.4-1.8
-	C46.8,64.6,46.9,64.6,47.2,64.7L47.2,64.7L47.2,64.7z M45,39.5L45,39.5c-0.5,1.8-1.8,3.2-3.4,4l0,0c-2.1,1.1-4.6,1-6.6-0.2
-	c-1.2-0.7-2.2-1.8-2.7-3c-0.8-1.7-0.9-3.6-0.4-5.3c0.5-1.8,1.8-3.2,3.5-4l0,0c1-0.4,2-0.6,3.1-0.6c0.7,0,1.5,0.1,2.2,0.4
-	c1.7,0.5,3.1,1.8,3.9,3.4l0,0C45.5,35.8,45.7,37.7,45,39.5z M12.4,45.2c0,2-1.6,3.6-3.6,3.6s-3.6-1.6-3.6-3.6s1.6-3.6,3.6-3.6l0,0
-	l0,0C10.8,41.6,12.4,43.2,12.4,45.2L12.4,45.2L12.4,45.2z M50.3,14.1L50.3,14.1c1.1,0,1.9,0.9,1.9,1.9s-0.9,1.9-1.9,1.9
-	S48.4,17,48.4,16S49.2,14.1,50.3,14.1L50.3,14.1L50.3,14.1z"/>
-</svg>
+<svg width="74.4" height="74.4" xmlns="http://www.w3.org/2000/svg" style="enable-background:new 0 0 74.4 74.4" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><path d="M74.5 35.8c-.4-1.8-1.4-3.4-2.8-4.5l-.4-.3c-1-.5-2-.9-3.2-.9-.5 0-1.1.1-1.5.2-1.8.4-3.4 1.4-4.5 2.9-.4.5-.7.9-.9 1.5l-10.7.1c-.2-1.1-.5-1.9-1.1-2.9-.7-1.5-1.4-2.5-2.6-3.6l2.8-5c.4.1.7.1 1.1.1 3.9 0 6.7-3.5 6.7-7.4s-3.2-7.1-7.1-7.1-7.1 3.2-7.1 7.1c0 1.9.4 3.6 1.8 5l-2.7 4.7c-1.2-.4-2.3-.6-3.6-.6-1.4 0-2.6.3-3.9.7l-8.2-14.3c.4-.4.5-.9.8-1.3l.1-.2c.8-1.6.9-3.4.4-5.1S26.3 1.8 24.8 1l-.4-.2-.2-.1c-.9-.4-2-.7-2.9-.7-1.3 0-2.6.4-3.7 1.1-1.2.7-2 1.7-2.7 2.9-.8 1.7-1 3.6-.4 5.3s1.9 3.2 3.5 4c.9.4 1.9.7 2.8.7.5 0 1 .2 1.4.1l8.2 14.3c-1.7 1.4-2.9 3-3.6 5-.5 1.6-.8 2.9-.7 4.6l-9.8 2.7c-2.2-4.2-7.4-5.5-11.6-3.3S-1.2 44.8 1 49c2.2 4.2 7.4 5.9 11.6 3.7 2.7-1.4 4.8-3.9 4.9-6.9L27.7 43l.1.1c.7 1.5 1.1 2.3 2.3 3.3l-5.6 9.8c-.6-.2-1.3-.3-2-.3-4.6 0-7.9 3.9-7.9 8.6 0 .7.1 1.3.3 2 1.1 4.3 5.4 6.9 9.7 5.8.7-.2 1.4-.4 2-.9 1.2-.7 2.3-1.8 3-3.1.9-1.6 1.2-3.4 1.1-5.2-.3-1.7-.6-3.1-1.7-4.4l5.6-9.7c1.2.4 2.2.5 3.4.5h1.1l3.2 11.9c-1.2.9-2.2 2.1-2.7 3.6-.6 1.8-.5 3.7.3 5.3.8 1.7 2.2 2.9 3.9 3.6.7.3 1.4.4 2.2.4 1.1 0 2.1-.3 3-.7 1.7-.8 2.9-2.3 3.6-4 .2-.5.3-1 .4-1.5.2-1.3-.1-2.6-.6-3.7-.8-1.7-2.1-2.9-3.8-3.6-.6-.2-1.3-.3-1.9-.4l-3.2-11.9.2-.1c1.4-.7 2.7-1.7 3.7-2.8 1.1-1.2 1.9-2.5 2.4-4v-.1c.1-.4.2-.8.4-1.2v-.2l.1-.1 10.8-.1c.4 1.4 1.3 2.3 2.6 3.2 1.2.8 2.6 1.2 3.9 1.2 2.3 0 4.5-1.2 5.8-3.1 1-1.7 1.5-3.7 1.1-5.4zM47.2 64.7c.6.2 1.3.9 1.5 1.4.3.6.4 1.3.1 2-.3.6-.7 1.2-1.3 1.4-.4.2-.6.2-1 .3-.3 0-.6-.1-.9-.2-.6-.2-1.1-.7-1.4-1.2-.3-.6-.4-1.3-.1-2 .4-1.1 1.2-1.8 2.4-1.8.3 0 .4 0 .7.1zM45 39.5c-.5 1.8-1.8 3.2-3.4 4-2.1 1.1-4.6 1-6.6-.2-1.2-.7-2.2-1.8-2.7-3-.8-1.7-.9-3.6-.4-5.3.5-1.8 1.8-3.2 3.5-4 1-.4 2-.6 3.1-.6.7 0 1.5.1 2.2.4 1.7.5 3.1 1.8 3.9 3.4.9 1.6 1.1 3.5.4 5.3zm-32.6 5.7c0 2-1.6 3.6-3.6 3.6s-3.6-1.6-3.6-3.6 1.6-3.6 3.6-3.6 3.6 1.6 3.6 3.6zm37.9-31.1c1.1 0 1.9.9 1.9 1.9s-.9 1.9-1.9 1.9-1.9-.9-1.9-1.9.8-1.9 1.9-1.9z"/></svg>
diff --git a/src/assets/img/mod/workshop.svg b/src/assets/img/mod/workshop.svg
index 594cfa205..ed7652eb3 100644
--- a/src/assets/img/mod/workshop.svg
+++ b/src/assets/img/mod/workshop.svg
@@ -1,19 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg width="74.4px" height="74.4px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 74.4 74.4" style="enable-background:new 0 0 74.4 74.4;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<g id="Group_12483_1_">
-	<path d="M67.6,56.1c-4.8-3.1-10.5-4.6-16.2-4.5c-4.9-0.1-9.8,1.1-14.2,3.3c-4.4-2.2-9.3-3.4-14.2-3.3c-5.7-0.1-11.4,1.4-16.2,4.5
-		C2.4,59,0.1,63,0.1,67.3v4.2c0,1.5,1.1,2.7,2.7,2.8h69c1.6-0.1,2.7-1.3,2.7-2.8v-4.2C74.4,63,72,59,67.6,56.1z M40.7,69.2H5.5v-1.5
-		c0.3-5.6,6.2-8.5,10.7-9.9c6.5-1.9,13.4-0.9,19.5,2.4c2.6,1.5,5,4.2,5,7.4V69.2z M69.1,69.2h-23c0.3-4-1-7.8-3.6-10.7
-		c7-2.7,15-2,21.6,1.7c2.6,1.5,5,4.2,5,7.4V69.2L69.1,69.2z"/>
-	<path d="M22.9,48.5c6.5,0,11.7-5.1,11.7-11.6C34,21.6,11.7,21.6,11,36.9C11,43.2,16.3,48.5,22.9,48.5L22.9,48.5z M16.3,36.9
-		c0.1-3.5,3.2-6.2,6.8-6.1c3.4,0.1,6.1,2.8,6.3,6.1C29,45.3,16.6,45.3,16.3,36.9L16.3,36.9z"/>
-	<path d="M50.8,48.5c6.5,0,11.7-5.1,11.7-11.6c-0.6-15.3-22.9-15.3-23.6,0C39,43.2,44.2,48.5,50.8,48.5L50.8,48.5z M50.8,30.6
-		c3.6,0,6.5,2.8,6.5,6.3c-0.3,8.4-12.7,8.4-12.9,0C44.4,33.4,47.2,30.6,50.8,30.6L50.8,30.6z"/>
-	<path id="Path_565_1_" d="M20.5,0.2c1.5,0.5,2.2,2.2,1.7,3.7l-1.6,3.8c10.7-4.2,22.8-4.2,33.5,0.2L52.4,4
-		c-0.6-1.4,0.1-3.1,1.6-3.7c1.5-0.7,3.1,0.1,3.8,1.5l4.1,10c0.6,1.4-0.1,3.1-1.6,3.7l0,0l-10.3,4c-1.5,0.5-3.1-0.2-3.7-1.6
-		s0.1-3.1,1.6-3.6l3.5-1.7C42.3,9,32.2,8.9,23,12.5l3.7,1.7c1.5,0.7,2,2.4,1.3,3.8c-0.7,1.3-2.1,2-3.5,1.4l-10.3-4
-		c-1.5-0.5-2.2-2.2-1.7-3.6l0,0l4.1-10C17.3,0.3,19-0.4,20.5,0.2z"/>
-</g>
-</svg>
+<svg width="74.4" height="74.4" xmlns="http://www.w3.org/2000/svg" style="enable-background:new 0 0 74.4 74.4" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><path d="M67.6 56.1c-4.8-3.1-10.5-4.6-16.2-4.5-4.9-.1-9.8 1.1-14.2 3.3-4.4-2.2-9.3-3.4-14.2-3.3-5.7-.1-11.4 1.4-16.2 4.5C2.4 59 .1 63 .1 67.3v4.2c0 1.5 1.1 2.7 2.7 2.8h69c1.6-.1 2.7-1.3 2.7-2.8v-4.2C74.4 63 72 59 67.6 56.1zM40.7 69.2H5.5v-1.5c.3-5.6 6.2-8.5 10.7-9.9 6.5-1.9 13.4-.9 19.5 2.4 2.6 1.5 5 4.2 5 7.4v1.6zm28.4 0h-23c.3-4-1-7.8-3.6-10.7 7-2.7 15-2 21.6 1.7 2.6 1.5 5 4.2 5 7.4v1.6zM22.9 48.5c6.5 0 11.7-5.1 11.7-11.6-.6-15.3-22.9-15.3-23.6 0 0 6.3 5.3 11.6 11.9 11.6zm-6.6-11.6c.1-3.5 3.2-6.2 6.8-6.1 3.4.1 6.1 2.8 6.3 6.1-.4 8.4-12.8 8.4-13.1 0zM50.8 48.5c6.5 0 11.7-5.1 11.7-11.6-.6-15.3-22.9-15.3-23.6 0 .1 6.3 5.3 11.6 11.9 11.6zm0-17.9c3.6 0 6.5 2.8 6.5 6.3-.3 8.4-12.7 8.4-12.9 0 0-3.5 2.8-6.3 6.4-6.3zM20.5.2c1.5.5 2.2 2.2 1.7 3.7l-1.6 3.8c10.7-4.2 22.8-4.2 33.5.2L52.4 4c-.6-1.4.1-3.1 1.6-3.7 1.5-.7 3.1.1 3.8 1.5l4.1 10c.6 1.4-.1 3.1-1.6 3.7l-10.3 4c-1.5.5-3.1-.2-3.7-1.6s.1-3.1 1.6-3.6l3.5-1.7C42.3 9 32.2 8.9 23 12.5l3.7 1.7c1.5.7 2 2.4 1.3 3.8-.7 1.3-2.1 2-3.5 1.4l-10.3-4c-1.5-.5-2.2-2.2-1.7-3.6l4.1-10C17.3.3 19-.4 20.5.2z"/></svg>
diff --git a/src/assets/img/mod_legacy/assign.svg b/src/assets/img/mod_legacy/assign.svg
index 41a788985..9cfeda3d0 100644
--- a/src/assets/img/mod_legacy/assign.svg
+++ b/src/assets/img/mod_legacy/assign.svg
@@ -1,89 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" style="overflow:visible;enable-background:new 0 0 24 24;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="14.0054" y1="0" x2="14.0054" y2="20.0005">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_1_);" points="16.3,0 15.4,0 6.7,0 6,0 6,20 6.7,20 21.7,20 22,20 22,6.6 "/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="14.0054" y1="1" x2="14.0054" y2="19.0005">
-	<stop  offset="0" style="stop-color:#E7F4FC"/>
-	<stop  offset="1" style="stop-color:#DEEFFC"/>
-	<a:midPointStop  offset="0" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="1" style="stop-color:#DEEFFC"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_2_);" points="7,19 7,1 15.8,1 21,6.9 21,19 "/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="14.0054" y1="2" x2="14.0054" y2="18.0005">
-	<stop  offset="0" style="stop-color:#CEE9F9"/>
-	<stop  offset="1" style="stop-color:#BBDFF8"/>
-	<a:midPointStop  offset="0" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="1" style="stop-color:#BBDFF8"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_3_);" points="8,18 8,2 15.4,2 20,7.3 20,18 "/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="18.3101" y1="0" x2="18.3101" y2="7.7852">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<path style="fill:url(#SVGID_4_);" d="M14.8,7.5c0,0,5.2-1.3,7.2,0.3c0-0.1,0-1.2,0-1.2L16.2,0c0,0-1.5,0-1.6,0
-	C16.8,3,14.8,7.5,14.8,7.5z"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="16.3003" y1="6.1616" x2="18.5911" y2="3.8708">
-	<stop  offset="0" style="stop-color:#E7F4FC"/>
-	<stop  offset="0.5181" style="stop-color:#E5F3FC"/>
-	<stop  offset="0.7045" style="stop-color:#DEF0FB"/>
-	<stop  offset="0.8371" style="stop-color:#D3EBFA"/>
-	<stop  offset="0.872" style="stop-color:#CEE9F9"/>
-	<stop  offset="1" style="stop-color:#BDD8F0"/>
-	<a:midPointStop  offset="0" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="0.87" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="0.872" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="1" style="stop-color:#BDD8F0"/>
-</linearGradient>
-<path style="fill:url(#SVGID_5_);" d="M16.3,6.2c0.3-1.2,0.5-2.9,0.1-4.4l4,4.4C20,6.1,19.4,6,18.8,6C17.9,6,17,6.1,16.3,6.2z"/>
-<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="11.9673" y1="12.167" x2="11.9673" y2="23.8853">
-	<stop  offset="0" style="stop-color:#DDA976"/>
-	<stop  offset="1" style="stop-color:#9F6B37"/>
-	<a:midPointStop  offset="0" style="stop-color:#DDA976"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#DDA976"/>
-	<a:midPointStop  offset="1" style="stop-color:#9F6B37"/>
-</linearGradient>
-<path style="fill:url(#SVGID_6_);" d="M10,18.9c-0.3-2.2,9.4,0.5,9.3-1.4c0-0.8-8.4-3.4-11.4-4.1c-0.9-0.2-6.5-1.2-6.5-1.2
-	c-0.2,0.1-1.3,3.3-1.4,5.2c0.5,0.3,7.3,6.7,10,6.5c2.7-0.2,14.2-3.6,13.9-4.7C23.3,17.1,10.3,21.3,10,18.9z"/>
-<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="11.4893" y1="13.2803" x2="11.4893" y2="22.9336">
-	<stop  offset="0" style="stop-color:#FFDDAA"/>
-	<stop  offset="1" style="stop-color:#E3B17E"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFDDAA"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFDDAA"/>
-	<a:midPointStop  offset="1" style="stop-color:#E3B17E"/>
-</linearGradient>
-<path style="fill:url(#SVGID_7_);" d="M1.7,17.4C1.4,17.2,1.2,17,1,16.9c0.1-1.2,0.6-2.8,0.9-3.6c1.8,0.3,5.1,0.9,5.7,1
-	c2.6,0.6,9.4,2.3,9.7,3c0.5,1.1-8.3-1.9-8.1,1.7c0.2,3.5,12.4-0.6,12.7,0.5c0.2,0.7-10.1,3.6-12,3.5C7.9,22.8,3.3,18.8,1.7,17.4z"/>
-<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="7.5928" y1="14.4141" x2="7.5928" y2="21.9336">
-	<stop  offset="0" style="stop-color:#F1C592"/>
-	<stop  offset="1" style="stop-color:#E1AF7C"/>
-	<a:midPointStop  offset="0" style="stop-color:#F1C592"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#F1C592"/>
-	<a:midPointStop  offset="1" style="stop-color:#E1AF7C"/>
-</linearGradient>
-<path style="fill:url(#SVGID_8_);" d="M10.1,21.9c-0.8-0.1-2.8-1-7.6-5.2l-0.3-0.3c0.1-0.7,0.3-1.4,0.5-2.1c2.1,0.4,4.3,0.8,4.7,0.9
-	c1.5,0.4,2.7,0.7,3.8,0.9c-1,0.1-1.8,0.4-2.3,1c-0.3,0.3-0.7,0.9-0.6,1.9c0.1,1.1,0.8,2.4,4,2.4c0.3,0,0.6,0,0.9,0
-	C11.8,21.7,10.7,21.9,10.1,21.9L10.1,21.9z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" style="overflow:visible;enable-background:new 0 0 24 24" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="14.005" y1="0" x2="14.005" y2="20"><stop offset="0" style="stop-color:#95bff8"/><stop offset=".557" style="stop-color:#84adef"/><stop offset="1" style="stop-color:#7ca4eb"/></linearGradient><path style="fill:url(#a)" d="M16.3 0H6v20h16V6.6z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="14.005" y1="1" x2="14.005" y2="19"><stop offset="0" style="stop-color:#e7f4fc"/><stop offset="1" style="stop-color:#deeffc"/></linearGradient><path style="fill:url(#b)" d="M7 19V1h8.8L21 6.9V19z"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="14.005" y1="2" x2="14.005" y2="18"><stop offset="0" style="stop-color:#cee9f9"/><stop offset="1" style="stop-color:#bbdff8"/></linearGradient><path style="fill:url(#c)" d="M8 18V2h7.4L20 7.3V18z"/><linearGradient id="d" gradientUnits="userSpaceOnUse" x1="18.31" y1="0" x2="18.31" y2="7.785"><stop offset="0" style="stop-color:#95bff8"/><stop offset=".557" style="stop-color:#84adef"/><stop offset="1" style="stop-color:#7ca4eb"/></linearGradient><path style="fill:url(#d)" d="M14.8 7.5s5.2-1.3 7.2.3V6.6L16.2 0h-1.6c2.2 3 .2 7.5.2 7.5z"/><linearGradient id="e" gradientUnits="userSpaceOnUse" x1="16.3" y1="6.162" x2="18.591" y2="3.871"><stop offset="0" style="stop-color:#e7f4fc"/><stop offset=".518" style="stop-color:#e5f3fc"/><stop offset=".705" style="stop-color:#def0fb"/><stop offset=".837" style="stop-color:#d3ebfa"/><stop offset=".872" style="stop-color:#cee9f9"/><stop offset="1" style="stop-color:#bdd8f0"/></linearGradient><path style="fill:url(#e)" d="M16.3 6.2c.3-1.2.5-2.9.1-4.4l4 4.4c-.4-.1-1-.2-1.6-.2-.9 0-1.8.1-2.5.2z"/><linearGradient id="f" gradientUnits="userSpaceOnUse" x1="11.967" y1="12.167" x2="11.967" y2="23.885"><stop offset="0" style="stop-color:#dda976"/><stop offset="1" style="stop-color:#9f6b37"/></linearGradient><path style="fill:url(#f)" d="M10 18.9c-.3-2.2 9.4.5 9.3-1.4 0-.8-8.4-3.4-11.4-4.1-.9-.2-6.5-1.2-6.5-1.2-.2.1-1.3 3.3-1.4 5.2.5.3 7.3 6.7 10 6.5 2.7-.2 14.2-3.6 13.9-4.7-.6-2.1-13.6 2.1-13.9-.3z"/><linearGradient id="g" gradientUnits="userSpaceOnUse" x1="11.489" y1="13.28" x2="11.489" y2="22.934"><stop offset="0" style="stop-color:#fda"/><stop offset="1" style="stop-color:#e3b17e"/></linearGradient><path style="fill:url(#g)" d="M1.7 17.4c-.3-.2-.5-.4-.7-.5.1-1.2.6-2.8.9-3.6 1.8.3 5.1.9 5.7 1 2.6.6 9.4 2.3 9.7 3 .5 1.1-8.3-1.9-8.1 1.7.2 3.5 12.4-.6 12.7.5.2.7-10.1 3.6-12 3.5-2-.2-6.6-4.2-8.2-5.6z"/><linearGradient id="h" gradientUnits="userSpaceOnUse" x1="7.593" y1="14.414" x2="7.593" y2="21.934"><stop offset="0" style="stop-color:#f1c592"/><stop offset="1" style="stop-color:#e1af7c"/></linearGradient><path style="fill:url(#h)" d="M10.1 21.9c-.8-.1-2.8-1-7.6-5.2l-.3-.3c.1-.7.3-1.4.5-2.1 2.1.4 4.3.8 4.7.9 1.5.4 2.7.7 3.8.9-1 .1-1.8.4-2.3 1-.3.3-.7.9-.6 1.9.1 1.1.8 2.4 4 2.4h.9c-1.4.3-2.5.5-3.1.5z"/></svg>
diff --git a/src/assets/img/mod_legacy/bigbluebuttonbn.svg b/src/assets/img/mod_legacy/bigbluebuttonbn.svg
index 7b92ab21b..91214c8d0 100644
--- a/src/assets/img/mod_legacy/bigbluebuttonbn.svg
+++ b/src/assets/img/mod_legacy/bigbluebuttonbn.svg
@@ -1,55 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="24px" height="24px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-58.9473" y1="84.1865" x2="58.9479" y2="-84.1852">
-			<stop  offset="0" style="stop-color:#283274"/>
-			<stop  offset="0.7088" style="stop-color:#293275"/>
-			<stop  offset="0.967" style="stop-color:#273F87"/>
-		</linearGradient>
-<symbol  id="New_Symbol" viewBox="-107.423 -107.423 214.847 214.846">
-	<g>
-		<path fill="url(#SVGID_1_)" stroke="#5D6AA4" stroke-width="9.3191" d="M102.765,0c0-56.755-46.009-102.764-102.765-102.764
-			c-56.754,0-102.764,46.009-102.764,102.764S-56.754,102.764,0,102.764C56.756,102.764,102.765,56.755,102.765,0z"/>
-		
-			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="-75.0186" y1="112.8037" x2="-15.8528" y2="28.3063" gradientTransform="matrix(1 0 0 1 18.4946 -31.9512)">
-			<stop  offset="0" style="stop-color:#BEC7E5"/>
-			<stop  offset="0.0956" style="stop-color:#B5BEDE"/>
-			<stop  offset="0.2524" style="stop-color:#9CA5CC"/>
-			<stop  offset="0.4508" style="stop-color:#747DAE"/>
-			<stop  offset="0.6809" style="stop-color:#3D4684"/>
-			<stop  offset="0.7582" style="stop-color:#293275"/>
-		</linearGradient>
-		<path fill="url(#SVGID_2_)" d="M0.282,98.502C26.323,98.31,54.293,87.893,74.49,63.84C73.631,43.207,36.703,22.057,5.886-1.229
-			c-25.857-19.538-65.427-37.86-92.487-45.059c-25.73,49.263-7.016,96.619,25.25,123.238C-46.256,90.16-23.508,98.679,0.282,98.502z
-			"/>
-	</g>
-	<g>
-		<g>
-			<path d="M55.602-25.561c0-8.678-3.055-16.072-9.16-22.179c-6.11-6.109-13.501-9.16-22.179-9.16h-37.367
-				c-8.679,0-16.073,3.051-22.179,9.16c-6.11,6.106-9.162,13.501-9.162,22.179v93.779c6.656,0,12.336-3.254,17.046-9.764
-				c4.708-6.509,7.062-14.344,7.062-23.505v-60.511c0-4.821,2.411-7.231,7.232-7.231h37.367c4.821,0,7.231,2.41,7.231,7.231V3.128
-				c0,4.66-2.41,7.07-7.231,7.232H17.03c-9.323,0.324-17.2,2.757-23.626,7.304c-6.43,4.543-9.643,10.145-9.643,16.805h40.501
-				c8.678,0,16.068-3.056,22.179-9.161c6.105-6.11,9.16-13.5,9.16-22.18V-25.561z"/>
-		</g>
-	</g>
-	<g opacity="0.46">
-		<g>
-			<path fill="#FFFFFF" d="M55.602-25.561c0-8.678-3.055-16.072-9.16-22.179c-6.11-6.109-13.501-9.16-22.179-9.16h-37.367
-				c-8.679,0-16.073,3.051-22.179,9.16c-6.11,6.106-9.162,13.501-9.162,22.179v93.779c6.656,0,12.336-3.254,17.046-9.764
-				c4.708-6.509,7.062-14.344,7.062-23.505v-60.511c0-4.821,2.411-7.231,7.232-7.231h37.367c4.821,0,7.231,2.41,7.231,7.231V3.128
-				c0,4.66-2.41,7.07-7.231,7.232H17.03c-9.323,0.324-17.2,2.757-23.626,7.304c-6.43,4.543-9.643,10.145-9.643,16.805h40.501
-				c8.678,0,16.068-3.056,22.179-9.161c6.105-6.11,9.16-13.5,9.16-22.18V-25.561z"/>
-		</g>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M53.829-26.788c0-8.678-3.055-16.072-9.16-22.179c-6.11-6.109-13.501-9.16-22.18-9.16h-37.367
-			c-8.679,0-16.073,3.051-22.179,9.16c-6.109,6.106-9.16,13.501-9.16,22.179v93.779c6.655,0,12.336-3.255,17.045-9.764
-			c4.708-6.509,7.062-14.345,7.062-23.505v-60.511c0-4.821,2.41-7.231,7.232-7.231h37.367c4.821,0,7.232,2.41,7.232,7.231V1.901
-			c0,4.66-2.411,7.07-7.232,7.232h-7.232C5.935,9.457-1.942,11.89-8.368,16.438c-6.43,4.542-9.644,10.144-9.644,16.803h40.501
-			c8.679,0,16.069-3.055,22.18-9.16c6.105-6.109,9.16-13.5,9.16-22.179V-26.788z"/>
-	</g>
-</symbol>
-<use xlink:href="#New_Symbol"  width="214.847" height="214.846" x="-107.423" y="-107.423" transform="matrix(0.1376 0 0 -0.1376 14.9995 15)" overflow="visible"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="24" viewBox="0 0 30 30" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="-58.947" y1="84.186" x2="58.948" y2="-84.185"><stop offset="0" style="stop-color:#283274"/><stop offset=".709" style="stop-color:#293275"/><stop offset=".967" style="stop-color:#273f87"/></linearGradient><symbol id="c" viewBox="-107.423 -107.423 214.847 214.846"><path fill="url(#a)" stroke="#5D6AA4" stroke-width="9.319" d="M102.765 0c0-56.755-46.009-102.764-102.765-102.764-56.754 0-102.764 46.009-102.764 102.764S-56.754 102.764 0 102.764c56.756 0 102.765-46.009 102.765-102.764z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="-75.019" y1="112.804" x2="-15.853" y2="28.306" gradientTransform="translate(18.495 -31.951)"><stop offset="0" style="stop-color:#bec7e5"/><stop offset=".096" style="stop-color:#b5bede"/><stop offset=".252" style="stop-color:#9ca5cc"/><stop offset=".451" style="stop-color:#747dae"/><stop offset=".681" style="stop-color:#3d4684"/><stop offset=".758" style="stop-color:#293275"/></linearGradient><path fill="url(#b)" d="M.282 98.502C26.323 98.31 54.293 87.893 74.49 63.84 73.631 43.207 36.703 22.057 5.886-1.229c-25.857-19.538-65.427-37.86-92.487-45.059-25.73 49.263-7.016 96.619 25.25 123.238C-46.256 90.16-23.508 98.679.282 98.502z"/><path d="M55.602-25.561c0-8.678-3.055-16.072-9.16-22.179-6.11-6.109-13.501-9.16-22.179-9.16h-37.367c-8.679 0-16.073 3.051-22.179 9.16-6.11 6.106-9.162 13.501-9.162 22.179v93.779c6.656 0 12.336-3.254 17.046-9.764 4.708-6.509 7.062-14.344 7.062-23.505v-60.511c0-4.821 2.411-7.231 7.232-7.231h37.367c4.821 0 7.231 2.41 7.231 7.231v28.69c0 4.66-2.41 7.07-7.231 7.232H17.03c-9.323.324-17.2 2.757-23.626 7.304-6.43 4.543-9.643 10.145-9.643 16.805h40.501c8.678 0 16.068-3.056 22.179-9.161 6.105-6.11 9.16-13.5 9.16-22.18v-28.689z"/><path fill="#FFF" d="M55.602-25.561c0-8.678-3.055-16.072-9.16-22.179-6.11-6.109-13.501-9.16-22.179-9.16h-37.367c-8.679 0-16.073 3.051-22.179 9.16-6.11 6.106-9.162 13.501-9.162 22.179v93.779c6.656 0 12.336-3.254 17.046-9.764 4.708-6.509 7.062-14.344 7.062-23.505v-60.511c0-4.821 2.411-7.231 7.232-7.231h37.367c4.821 0 7.231 2.41 7.231 7.231v28.69c0 4.66-2.41 7.07-7.231 7.232H17.03c-9.323.324-17.2 2.757-23.626 7.304-6.43 4.543-9.643 10.145-9.643 16.805h40.501c8.678 0 16.068-3.056 22.179-9.161 6.105-6.11 9.16-13.5 9.16-22.18v-28.689z" opacity=".46"/><path fill="#FFF" d="M53.829-26.788c0-8.678-3.055-16.072-9.16-22.179-6.11-6.109-13.501-9.16-22.18-9.16h-37.367c-8.679 0-16.073 3.051-22.179 9.16-6.109 6.106-9.16 13.501-9.16 22.179v93.779c6.655 0 12.336-3.255 17.045-9.764 4.708-6.509 7.062-14.345 7.062-23.505v-60.511c0-4.821 2.41-7.231 7.232-7.231h37.367c4.821 0 7.232 2.41 7.232 7.231v28.69c0 4.66-2.411 7.07-7.232 7.232h-7.232c-9.322.324-17.199 2.757-23.625 7.305-6.43 4.542-9.644 10.144-9.644 16.803h40.501c8.679 0 16.069-3.055 22.18-9.16 6.105-6.109 9.16-13.5 9.16-22.179v-28.69z"/></symbol><use xlink:href="#c" width="214.847" height="214.846" x="-107.423" y="-107.423" transform="matrix(.1376 0 0 -.1376 15 15)" overflow="visible"/></svg>
diff --git a/src/assets/img/mod_legacy/book.svg b/src/assets/img/mod_legacy/book.svg
index 740a35160..282ceffe2 100644
--- a/src/assets/img/mod_legacy/book.svg
+++ b/src/assets/img/mod_legacy/book.svg
@@ -1,80 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="-2 0 24 24" style="overflow:visible;enable-background:new -2 0 24 24;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="12.0005" y1="0" x2="12.0005" y2="24.0005">
-	<stop  offset="0" style="stop-color:#90C50E"/>
-	<stop  offset="1" style="stop-color:#70A034"/>
-	<a:midPointStop  offset="0" style="stop-color:#90C50E"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#90C50E"/>
-	<a:midPointStop  offset="1" style="stop-color:#70A034"/>
-</linearGradient>
-<rect x="4" style="fill:url(#SVGID_1_);" width="16" height="24"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="12.0005" y1="1" x2="12.0005" y2="23.0005">
-	<stop  offset="0" style="stop-color:#D9F991"/>
-	<stop  offset="0.2388" style="stop-color:#D7F88D"/>
-	<stop  offset="0.4501" style="stop-color:#D1F383"/>
-	<stop  offset="0.6509" style="stop-color:#C6EC71"/>
-	<stop  offset="0.844" style="stop-color:#B7E257"/>
-	<stop  offset="1" style="stop-color:#A8D73D"/>
-	<a:midPointStop  offset="0" style="stop-color:#D9F991"/>
-	<a:midPointStop  offset="0.7317" style="stop-color:#D9F991"/>
-	<a:midPointStop  offset="1" style="stop-color:#A8D73D"/>
-</linearGradient>
-<rect x="5" y="1" style="fill:url(#SVGID_2_);" width="14" height="22"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="12.0005" y1="2" x2="12.0005" y2="22.0005">
-	<stop  offset="0" style="stop-color:#B3E810"/>
-	<stop  offset="1" style="stop-color:#90C60D"/>
-	<a:midPointStop  offset="0" style="stop-color:#B3E810"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#B3E810"/>
-	<a:midPointStop  offset="1" style="stop-color:#90C60D"/>
-</linearGradient>
-<rect x="6" y="2" style="fill:url(#SVGID_3_);" width="12" height="20"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="12.0005" y1="4" x2="12.0005" y2="9">
-	<stop  offset="0" style="stop-color:#90C50E"/>
-	<stop  offset="1" style="stop-color:#70A034"/>
-	<a:midPointStop  offset="0" style="stop-color:#90C50E"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#90C50E"/>
-	<a:midPointStop  offset="1" style="stop-color:#70A034"/>
-</linearGradient>
-<path style="fill:url(#SVGID_4_);" d="M7,4v5h10V4H7z M16,8H8V5h8V8z"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="2.5" y1="0" x2="2.5" y2="24.0005">
-	<stop  offset="0" style="stop-color:#656565"/>
-	<stop  offset="1.342887e-02" style="stop-color:#646464"/>
-	<stop  offset="0.4453" style="stop-color:#3C3C3C"/>
-	<stop  offset="0.7891" style="stop-color:#242424"/>
-	<stop  offset="1" style="stop-color:#1B1B1B"/>
-	<a:midPointStop  offset="0" style="stop-color:#656565"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#656565"/>
-	<a:midPointStop  offset="1" style="stop-color:#1B1B1B"/>
-</linearGradient>
-<path style="fill:url(#SVGID_5_);" d="M4,0H2.6H1C0.5,0,0,0.5,0,1v22c0,0.5,0.5,1,1,1h1.6H4h1v-1V1V0H4z"/>
-<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="2.5" y1="1" x2="2.5" y2="23.0005">
-	<stop  offset="0" style="stop-color:#8E8E8E"/>
-	<stop  offset="4.191053e-02" style="stop-color:#8A8A8A"/>
-	<stop  offset="0.4613" style="stop-color:#626262"/>
-	<stop  offset="0.7952" style="stop-color:#4A4A4A"/>
-	<stop  offset="1" style="stop-color:#414141"/>
-	<a:midPointStop  offset="0" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="1" style="stop-color:#414141"/>
-</linearGradient>
-<rect x="1" y="1" style="fill:url(#SVGID_6_);" width="3" height="22"/>
-<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="2.5" y1="2" x2="2.5" y2="22.0005">
-	<stop  offset="0" style="stop-color:#7C7C7C"/>
-	<stop  offset="0.3898" style="stop-color:#5C5C5C"/>
-	<stop  offset="0.768" style="stop-color:#444444"/>
-	<stop  offset="1" style="stop-color:#3B3B3B"/>
-	<a:midPointStop  offset="0" style="stop-color:#7C7C7C"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#7C7C7C"/>
-	<a:midPointStop  offset="1" style="stop-color:#3B3B3B"/>
-</linearGradient>
-<rect x="2" y="2" style="fill:url(#SVGID_7_);" width="1" height="20"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="-2 0 24 24" style="overflow:visible;enable-background:new -2 0 24 24" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="12.001" y1="0" x2="12.001" y2="24"><stop offset="0" style="stop-color:#90c50e"/><stop offset="1" style="stop-color:#70a034"/></linearGradient><path style="fill:url(#a)" d="M4 0h16v24H4z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="12.001" y1="1" x2="12.001" y2="23"><stop offset="0" style="stop-color:#d9f991"/><stop offset=".239" style="stop-color:#d7f88d"/><stop offset=".45" style="stop-color:#d1f383"/><stop offset=".651" style="stop-color:#c6ec71"/><stop offset=".844" style="stop-color:#b7e257"/><stop offset="1" style="stop-color:#a8d73d"/></linearGradient><path style="fill:url(#b)" d="M5 1h14v22H5z"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="12.001" y1="2" x2="12.001" y2="22"><stop offset="0" style="stop-color:#b3e810"/><stop offset="1" style="stop-color:#90c60d"/></linearGradient><path style="fill:url(#c)" d="M6 2h12v20H6z"/><linearGradient id="d" gradientUnits="userSpaceOnUse" x1="12.001" y1="4" x2="12.001" y2="9"><stop offset="0" style="stop-color:#90c50e"/><stop offset="1" style="stop-color:#70a034"/></linearGradient><path style="fill:url(#d)" d="M7 4v5h10V4H7zm9 4H8V5h8v3z"/><linearGradient id="e" gradientUnits="userSpaceOnUse" x1="2.5" y1="0" x2="2.5" y2="24"><stop offset="0" style="stop-color:#656565"/><stop offset=".013" style="stop-color:#646464"/><stop offset=".445" style="stop-color:#3c3c3c"/><stop offset=".789" style="stop-color:#242424"/><stop offset="1" style="stop-color:#1b1b1b"/></linearGradient><path style="fill:url(#e)" d="M4 0H1C.5 0 0 .5 0 1v22c0 .5.5 1 1 1h4V0H4z"/><linearGradient id="f" gradientUnits="userSpaceOnUse" x1="2.5" y1="1" x2="2.5" y2="23"><stop offset="0" style="stop-color:#8e8e8e"/><stop offset=".042" style="stop-color:#8a8a8a"/><stop offset=".461" style="stop-color:#626262"/><stop offset=".795" style="stop-color:#4a4a4a"/><stop offset="1" style="stop-color:#414141"/></linearGradient><path style="fill:url(#f)" d="M1 1h3v22H1z"/><linearGradient id="g" gradientUnits="userSpaceOnUse" x1="2.5" y1="2" x2="2.5" y2="22"><stop offset="0" style="stop-color:#7c7c7c"/><stop offset=".39" style="stop-color:#5c5c5c"/><stop offset=".768" style="stop-color:#444"/><stop offset="1" style="stop-color:#3b3b3b"/></linearGradient><path style="fill:url(#g)" d="M2 2h1v20H2z"/></svg>
diff --git a/src/assets/img/mod_legacy/chat.svg b/src/assets/img/mod_legacy/chat.svg
index 9dd304b78..08f9062fc 100644
--- a/src/assets/img/mod_legacy/chat.svg
+++ b/src/assets/img/mod_legacy/chat.svg
@@ -1,77 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="-0.1 -0.1 24 24"
-	 style="overflow:visible;enable-background:new -0.1 -0.1 24 24;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="10.9429" y1="0" x2="10.9429" y2="19.7881">
-	<stop  offset="0" style="stop-color:#76A1F0"/>
-	<stop  offset="1" style="stop-color:#6B90D5"/>
-	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
-</linearGradient>
-<path style="fill:url(#SVGID_1_);" d="M10.8,0C4.7,0.1-0.1,4.3,0,9.3c0,2.6,1.5,5,3.7,6.6c0,0.1,0,0.2,0.1,0.3
-	c0.3,2-0.9,3.6-0.9,3.6s2.2-0.5,3.5-1.5c0.2-0.2,0.5-0.4,0.7-0.7c1.3,0.4,2.6,0.6,4.1,0.6c6-0.1,10.9-4.3,10.8-9.3
-	C21.8,3.9,16.8-0.1,10.8,0z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="10.9434" y1="1" x2="10.9434" y2="18.1289">
-	<stop  offset="0" style="stop-color:#BBE0F7"/>
-	<stop  offset="1" style="stop-color:#82B4FB"/>
-	<a:midPointStop  offset="0" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="1" style="stop-color:#82B4FB"/>
-</linearGradient>
-<path style="fill:url(#SVGID_2_);" d="M4.6,18.1c0.1-0.6,0.2-1.3,0.1-2.1c0-0.1,0-0.2-0.1-0.3l-0.1-0.4l-0.3-0.3
-	C2.2,13.6,1,11.5,1,9.3C0.9,4.8,5.3,1.1,10.8,1L11,1c5.4,0,9.8,3.5,9.9,7.9c0.1,4.5-4.3,8.2-9.8,8.3l-0.2,0c-1.2,0-2.4-0.2-3.5-0.5
-	l-0.6-0.2l-0.4,0.5c-0.2,0.2-0.4,0.4-0.5,0.6C5.4,17.7,5,17.9,4.6,18.1z"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="10.9434" y1="2" x2="10.9434" y2="16.1631">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<path style="fill:url(#SVGID_3_);" d="M10.8,16.2c-1.1,0-2.2-0.2-3.2-0.5l-1.3-0.4L5.7,16c0,0,0-0.1,0-0.1c0-0.1,0-0.3-0.1-0.4
-	l-0.1-0.7l-0.6-0.6l0,0C3,13,2,11.2,2,9.3C1.9,5.3,5.9,2.1,10.8,2L11,2c4.8,0,8.8,3.1,8.8,6.9c0.1,3.9-3.9,7.2-8.8,7.2L10.8,16.2z"
-	/>
-<path style="fill:#FFFFFF;" d="M16.6,9.6c0,0.7-0.6,1.3-1.2,1.3c-0.7,0-1.3-0.6-1.3-1.3c0-0.7,0.6-1.2,1.3-1.2
-	C16,8.4,16.6,8.9,16.6,9.6z M11.5,8.4c-0.7,0-1.2,0.6-1.2,1.2c0,0.7,0.6,1.3,1.2,1.3c0.7,0,1.3-0.6,1.3-1.3
-	C12.7,8.9,12.2,8.4,11.5,8.4z M7.5,8.4c-0.7,0-1.3,0.6-1.3,1.2c0,0.7,0.6,1.3,1.3,1.3s1.3-0.6,1.3-1.3C8.8,8.9,8.2,8.4,7.5,8.4z"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="14.0254" y1="6.667" x2="14.0254" y2="23.8398">
-	<stop  offset="0" style="stop-color:#F0A829"/>
-	<stop  offset="1" style="stop-color:#C7671A"/>
-	<a:midPointStop  offset="0" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="1" style="stop-color:#C7671A"/>
-</linearGradient>
-<path style="fill:url(#SVGID_4_);" d="M20.7,20.5c1.9-1.4,3.2-3.4,3.2-5.7c0.1-4.4-4.3-8-9.8-8.1C8.7,6.6,4.2,10,4.1,14.4
-	c-0.1,4.4,4.3,8,9.8,8.1c1.4,0,2.7-0.2,3.9-0.5c1,1.3,3.7,1.9,3.7,1.9S20.3,22.2,20.7,20.5z"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="14.1436" y1="7.667" x2="14.1436" y2="22.1943">
-	<stop  offset="0" style="stop-color:#FFEBA8"/>
-	<stop  offset="1" style="stop-color:#F8BE27"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFEBA8"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFEBA8"/>
-	<a:midPointStop  offset="1" style="stop-color:#F8BE27"/>
-</linearGradient>
-<path style="fill:url(#SVGID_5_);" d="M19.9,22.2c-0.5-0.2-1-0.5-1.7-1.4c-0.4,0.1-1.7,0.7-4.2,0.7c-5,0-8.9-3.3-8.8-7.1
-	c0.1-3.7,4-6.8,9-6.8c2.3,0,4.7,0.8,6.3,2.2c1.6,1.3,2.5,3.1,2.4,4.9c0,1.9-1,3.7-3.1,5.1C19.7,20.7,19.7,21.6,19.9,22.2z"/>
-<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="14.0234" y1="8.6689" x2="14.0234" y2="20.5176">
-	<stop  offset="0" style="stop-color:#FFC30F"/>
-	<stop  offset="1" style="stop-color:#F5AE0D"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="1" style="stop-color:#F5AE0D"/>
-</linearGradient>
-<path style="fill:url(#SVGID_6_);" d="M13.9,20.5c-6.1-0.2-7.9-4.2-7.8-6.1c0.2-3.2,3.3-5.8,8-5.8c2.1,0,4.3,0.8,5.7,2
-	c1.4,1.1,2.1,2.6,2.1,4.1c-0.1,2.9-2.9,4.5-2.9,4.5s-0.2,0.7-0.2,0.9l-0.4-0.5C18.4,19.6,16.5,20.6,13.9,20.5z"/>
-<path style="fill:#FFFFFF;" d="M19.4,14.9c0,0.7-0.6,1.3-1.2,1.3c-0.7,0-1.3-0.6-1.3-1.3c0-0.7,0.6-1.2,1.3-1.2
-	C18.8,13.7,19.4,14.2,19.4,14.9z M14.3,13.7c-0.7,0-1.2,0.6-1.2,1.2c0,0.7,0.6,1.3,1.2,1.3c0.7,0,1.3-0.6,1.3-1.3
-	C15.5,14.2,15,13.7,14.3,13.7z M10.3,13.7c-0.7,0-1.3,0.6-1.3,1.2c0,0.7,0.6,1.3,1.3,1.3s1.3-0.6,1.3-1.3
-	C11.6,14.2,11,13.7,10.3,13.7z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="-0.1 -0.1 24 24" style="overflow:visible;enable-background:new -.1 -.1 24 24" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="10.943" y1="0" x2="10.943" y2="19.788"><stop offset="0" style="stop-color:#76a1f0"/><stop offset="1" style="stop-color:#6b90d5"/></linearGradient><path style="fill:url(#a)" d="M10.8 0C4.7.1-.1 4.3 0 9.3c0 2.6 1.5 5 3.7 6.6 0 .1 0 .2.1.3.3 2-.9 3.6-.9 3.6s2.2-.5 3.5-1.5c.2-.2.5-.4.7-.7 1.3.4 2.6.6 4.1.6 6-.1 10.9-4.3 10.8-9.3-.2-5-5.2-9-11.2-8.9z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="10.943" y1="1" x2="10.943" y2="18.129"><stop offset="0" style="stop-color:#bbe0f7"/><stop offset="1" style="stop-color:#82b4fb"/></linearGradient><path style="fill:url(#b)" d="M4.6 18.1c.1-.6.2-1.3.1-2.1 0-.1 0-.2-.1-.3l-.1-.4-.3-.3C2.2 13.6 1 11.5 1 9.3.9 4.8 5.3 1.1 10.8 1h.2c5.4 0 9.8 3.5 9.9 7.9.1 4.5-4.3 8.2-9.8 8.3h-.2c-1.2 0-2.4-.2-3.5-.5l-.6-.2-.4.5c-.2.2-.4.4-.5.6-.5.1-.9.3-1.3.5z"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="10.943" y1="2" x2="10.943" y2="16.163"><stop offset="0" style="stop-color:#95bff8"/><stop offset=".557" style="stop-color:#84adef"/><stop offset="1" style="stop-color:#7ca4eb"/></linearGradient><path style="fill:url(#c)" d="M10.8 16.2c-1.1 0-2.2-.2-3.2-.5l-1.3-.4-.6.7v-.1c0-.1 0-.3-.1-.4l-.1-.7-.6-.6C3 13 2 11.2 2 9.3c-.1-4 3.9-7.2 8.8-7.3h.2c4.8 0 8.8 3.1 8.8 6.9.1 3.9-3.9 7.2-8.8 7.2l-.2.1z"/><path style="fill:#fff" d="M16.6 9.6c0 .7-.6 1.3-1.2 1.3-.7 0-1.3-.6-1.3-1.3 0-.7.6-1.2 1.3-1.2.6 0 1.2.5 1.2 1.2zm-5.1-1.2c-.7 0-1.2.6-1.2 1.2 0 .7.6 1.3 1.2 1.3.7 0 1.3-.6 1.3-1.3-.1-.7-.6-1.2-1.3-1.2zm-4 0c-.7 0-1.3.6-1.3 1.2 0 .7.6 1.3 1.3 1.3s1.3-.6 1.3-1.3c0-.7-.6-1.2-1.3-1.2z"/><linearGradient id="d" gradientUnits="userSpaceOnUse" x1="14.025" y1="6.667" x2="14.025" y2="23.84"><stop offset="0" style="stop-color:#f0a829"/><stop offset="1" style="stop-color:#c7671a"/></linearGradient><path style="fill:url(#d)" d="M20.7 20.5c1.9-1.4 3.2-3.4 3.2-5.7.1-4.4-4.3-8-9.8-8.1-5.4-.1-9.9 3.3-10 7.7-.1 4.4 4.3 8 9.8 8.1a16 16 0 0 0 3.9-.5c1 1.3 3.7 1.9 3.7 1.9s-1.2-1.7-.8-3.4z"/><linearGradient id="e" gradientUnits="userSpaceOnUse" x1="14.144" y1="7.667" x2="14.144" y2="22.194"><stop offset="0" style="stop-color:#ffeba8"/><stop offset="1" style="stop-color:#f8be27"/></linearGradient><path style="fill:url(#e)" d="M19.9 22.2c-.5-.2-1-.5-1.7-1.4-.4.1-1.7.7-4.2.7-5 0-8.9-3.3-8.8-7.1.1-3.7 4-6.8 9-6.8 2.3 0 4.7.8 6.3 2.2 1.6 1.3 2.5 3.1 2.4 4.9 0 1.9-1 3.7-3.1 5.1-.1.9-.1 1.8.1 2.4z"/><linearGradient id="f" gradientUnits="userSpaceOnUse" x1="14.023" y1="8.669" x2="14.023" y2="20.518"><stop offset="0" style="stop-color:#ffc30f"/><stop offset="1" style="stop-color:#f5ae0d"/></linearGradient><path style="fill:url(#f)" d="M13.9 20.5c-6.1-.2-7.9-4.2-7.8-6.1.2-3.2 3.3-5.8 8-5.8 2.1 0 4.3.8 5.7 2 1.4 1.1 2.1 2.6 2.1 4.1-.1 2.9-2.9 4.5-2.9 4.5s-.2.7-.2.9l-.4-.5s-1.9 1-4.5.9z"/><path style="fill:#fff" d="M19.4 14.9c0 .7-.6 1.3-1.2 1.3-.7 0-1.3-.6-1.3-1.3 0-.7.6-1.2 1.3-1.2.6 0 1.2.5 1.2 1.2zm-5.1-1.2c-.7 0-1.2.6-1.2 1.2 0 .7.6 1.3 1.2 1.3.7 0 1.3-.6 1.3-1.3-.1-.7-.6-1.2-1.3-1.2zm-4 0c-.7 0-1.3.6-1.3 1.2 0 .7.6 1.3 1.3 1.3s1.3-.6 1.3-1.3c0-.7-.6-1.2-1.3-1.2z"/></svg>
diff --git a/src/assets/img/mod_legacy/choice.svg b/src/assets/img/mod_legacy/choice.svg
index 4d455910c..a7a500299 100644
--- a/src/assets/img/mod_legacy/choice.svg
+++ b/src/assets/img/mod_legacy/choice.svg
@@ -1,46 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="-4.2 -0.3 24 24"
-	 style="overflow:visible;enable-background:new -4.2 -0.3 24 24;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="7.8237" y1="0" x2="7.8237" y2="23.3262">
-	<stop  offset="0" style="stop-color:#76A1F0"/>
-	<stop  offset="1" style="stop-color:#6B90D5"/>
-	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
-</linearGradient>
-<path style="fill:url(#SVGID_1_);" d="M2.4,8.4C1.1,8.4,0,7.5,0,6.1C0,3.3,2.8,0,7.7,0c3.3,0,7.9,2.2,7.9,6c0,2-1.2,3.5-3.6,4.4
-	c-3.3,1.2-1.4,3.7-4.5,3.7c-1.3,0-2.1-0.8-2.1-2.1c0-2.7,2.8-4.2,2.8-6.9c0-0.7-0.3-1.6-1.1-1.6c-0.9,0-1,0.9-1,1.5
-	C5.8,7.1,4.5,8.4,2.4,8.4z M7.3,23.3c-2,0-3.6-1.6-3.6-3.6c0-2,1.6-3.6,3.6-3.6c2,0,3.6,1.6,3.6,3.6C10.8,21.7,9.2,23.3,7.3,23.3z"
-	/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="7.8237" y1="1" x2="7.8237" y2="22.3262">
-	<stop  offset="0" style="stop-color:#BBE0F7"/>
-	<stop  offset="1" style="stop-color:#82B4FB"/>
-	<a:midPointStop  offset="0" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="1" style="stop-color:#82B4FB"/>
-</linearGradient>
-<path style="fill:url(#SVGID_2_);" d="M7.3,22.3c-1.4,0-2.6-1.1-2.6-2.6c0-1.4,1.1-2.6,2.6-2.6s2.6,1.1,2.6,2.6
-	C9.8,21.2,8.7,22.3,7.3,22.3z M7.6,13.1c-0.8,0-1.1-0.4-1.1-1.1c0-1.1,0.6-1.9,1.2-2.9c0.7-1.1,1.5-2.3,1.5-4c0-1.3-0.7-2.6-2.1-2.6
-	c-1.8,0-2,1.7-2,2.4C4.9,6,4.3,7.4,2.4,7.4C1.6,7.4,1,6.9,1,6.1C1,4,3.1,1,7.7,1c2.9,0,6.9,1.9,6.9,5c0,1.6-1,2.7-2.9,3.4
-	c-2,0.8-2.5,2-2.9,2.8C8.5,13,8.5,13.1,7.6,13.1z"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="7.8237" y1="2.0986" x2="7.8237" y2="21.3262">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<path style="fill:url(#SVGID_3_);" d="M7.3,21.3c-0.9,0-1.6-0.7-1.6-1.6s0.7-1.6,1.6-1.6c0.9,0,1.6,0.7,1.6,1.6S8.2,21.3,7.3,21.3z
-	 M7.6,12.1c-0.1,0-0.1,0-0.1,0c0,0,0-0.1,0-0.1c0-0.8,0.5-1.5,1-2.3c0.8-1.2,1.7-2.6,1.7-4.6c0-1.3-0.5-2.3-1.3-3
-	c2.2,0.4,4.8,1.8,4.8,3.9c0,0.4,0,1.6-2.3,2.5C9,9.4,8.3,11,7.9,11.9c0,0.1-0.1,0.2-0.1,0.2C7.8,12.1,7.7,12.1,7.6,12.1z M2.4,6.4
-	C2,6.4,2,6.2,2,6.1c0-1.1,0.9-2.7,2.7-3.5C4.4,3.1,4.1,3.8,4,4.8C3.9,6.2,3.1,6.4,2.4,6.4z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="-4.2 -0.3 24 24" style="overflow:visible;enable-background:new -4.2 -.3 24 24" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="7.824" y1="0" x2="7.824" y2="23.326"><stop offset="0" style="stop-color:#76a1f0"/><stop offset="1" style="stop-color:#6b90d5"/></linearGradient><path style="fill:url(#a)" d="M2.4 8.4C1.1 8.4 0 7.5 0 6.1 0 3.3 2.8 0 7.7 0c3.3 0 7.9 2.2 7.9 6 0 2-1.2 3.5-3.6 4.4-3.3 1.2-1.4 3.7-4.5 3.7-1.3 0-2.1-.8-2.1-2.1 0-2.7 2.8-4.2 2.8-6.9 0-.7-.3-1.6-1.1-1.6-.9 0-1 .9-1 1.5-.3 2.1-1.6 3.4-3.7 3.4zm4.9 14.9c-2 0-3.6-1.6-3.6-3.6s1.6-3.6 3.6-3.6 3.6 1.6 3.6 3.6c-.1 2-1.7 3.6-3.6 3.6z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="7.824" y1="1" x2="7.824" y2="22.326"><stop offset="0" style="stop-color:#bbe0f7"/><stop offset="1" style="stop-color:#82b4fb"/></linearGradient><path style="fill:url(#b)" d="M7.3 22.3c-1.4 0-2.6-1.1-2.6-2.6 0-1.4 1.1-2.6 2.6-2.6s2.6 1.1 2.6 2.6c-.1 1.5-1.2 2.6-2.6 2.6zm.3-9.2c-.8 0-1.1-.4-1.1-1.1 0-1.1.6-1.9 1.2-2.9.7-1.1 1.5-2.3 1.5-4 0-1.3-.7-2.6-2.1-2.6-1.8 0-2 1.7-2 2.4-.2 1.1-.8 2.5-2.7 2.5-.8 0-1.4-.5-1.4-1.3C1 4 3.1 1 7.7 1c2.9 0 6.9 1.9 6.9 5 0 1.6-1 2.7-2.9 3.4-2 .8-2.5 2-2.9 2.8-.3.8-.3.9-1.2.9z"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="7.824" y1="2.099" x2="7.824" y2="21.326"><stop offset="0" style="stop-color:#95bff8"/><stop offset=".557" style="stop-color:#84adef"/><stop offset="1" style="stop-color:#7ca4eb"/></linearGradient><path style="fill:url(#c)" d="M7.3 21.3c-.9 0-1.6-.7-1.6-1.6s.7-1.6 1.6-1.6c.9 0 1.6.7 1.6 1.6s-.7 1.6-1.6 1.6zm.3-9.2h-.1V12c0-.8.5-1.5 1-2.3.8-1.2 1.7-2.6 1.7-4.6 0-1.3-.5-2.3-1.3-3 2.2.4 4.8 1.8 4.8 3.9 0 .4 0 1.6-2.3 2.5-2.4.9-3.1 2.5-3.5 3.4 0 .1-.1.2-.1.2h-.2zM2.4 6.4c-.4 0-.4-.2-.4-.3 0-1.1.9-2.7 2.7-3.5-.3.5-.6 1.2-.7 2.2-.1 1.4-.9 1.6-1.6 1.6z"/></svg>
diff --git a/src/assets/img/mod_legacy/data.svg b/src/assets/img/mod_legacy/data.svg
index 954777f09..43063536f 100644
--- a/src/assets/img/mod_legacy/data.svg
+++ b/src/assets/img/mod_legacy/data.svg
@@ -1,87 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="-2 -1 24 24" style="overflow:visible;enable-background:new -2 -1 24 24;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<radialGradient id="SVGID_1_" cx="10" cy="19.5" r="7.4917" gradientUnits="userSpaceOnUse">
-	<stop  offset="0" style="stop-color:#76A1F0"/>
-	<stop  offset="1" style="stop-color:#6B90D5"/>
-	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
-</radialGradient>
-<path style="fill:url(#SVGID_1_);" d="M20,21c0,1.1-0.9,2-2,2H2c-1.1,0-2-0.9-2-2v-3c0-1.1,0.9-2,2-2h16c1.1,0,2,0.9,2,2V21z"/>
-<radialGradient id="SVGID_2_" cx="10" cy="19.5" r="6.6049" gradientUnits="userSpaceOnUse">
-	<stop  offset="0" style="stop-color:#BBE0F7"/>
-	<stop  offset="1" style="stop-color:#82B4FB"/>
-	<a:midPointStop  offset="0" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="1" style="stop-color:#82B4FB"/>
-</radialGradient>
-<path style="fill:url(#SVGID_2_);" d="M2,22c-0.6,0-1-0.4-1-1v-3c0-0.6,0.4-1,1-1h16c0.6,0,1,0.4,1,1v3c0,0.6-0.4,1-1,1H2z"/>
-<radialGradient id="SVGID_3_" cx="10" cy="19.5" r="5.7554" gradientUnits="userSpaceOnUse">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</radialGradient>
-<rect x="2" y="18" style="fill:url(#SVGID_3_);" width="16" height="3"/>
-<radialGradient id="SVGID_4_" cx="10" cy="11.5" r="7.4917" gradientUnits="userSpaceOnUse">
-	<stop  offset="0" style="stop-color:#76A1F0"/>
-	<stop  offset="1" style="stop-color:#6B90D5"/>
-	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
-</radialGradient>
-<path style="fill:url(#SVGID_4_);" d="M20,13c0,1.1-0.9,2-2,2H2c-1.1,0-2-0.9-2-2v-3c0-1.1,0.9-2,2-2h16c1.1,0,2,0.9,2,2V13z"/>
-<radialGradient id="SVGID_5_" cx="10" cy="11.5" r="6.6049" gradientUnits="userSpaceOnUse">
-	<stop  offset="0" style="stop-color:#BBE0F7"/>
-	<stop  offset="1" style="stop-color:#82B4FB"/>
-	<a:midPointStop  offset="0" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="1" style="stop-color:#82B4FB"/>
-</radialGradient>
-<path style="fill:url(#SVGID_5_);" d="M2,14c-0.6,0-1-0.4-1-1v-3c0-0.6,0.4-1,1-1h16c0.6,0,1,0.4,1,1v3c0,0.6-0.4,1-1,1H2z"/>
-<radialGradient id="SVGID_6_" cx="10" cy="11.5" r="5.7554" gradientUnits="userSpaceOnUse">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</radialGradient>
-<rect x="2" y="10" style="fill:url(#SVGID_6_);" width="16" height="3"/>
-<radialGradient id="SVGID_7_" cx="10" cy="3.5" r="7.4917" gradientUnits="userSpaceOnUse">
-	<stop  offset="0" style="stop-color:#76A1F0"/>
-	<stop  offset="1" style="stop-color:#6B90D5"/>
-	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
-</radialGradient>
-<path style="fill:url(#SVGID_7_);" d="M20,5c0,1.1-0.9,2-2,2H2C0.9,7,0,6.1,0,5V2c0-1.1,0.9-2,2-2h16c1.1,0,2,0.9,2,2V5z"/>
-<radialGradient id="SVGID_8_" cx="10" cy="3.5" r="6.6049" gradientUnits="userSpaceOnUse">
-	<stop  offset="0" style="stop-color:#BBE0F7"/>
-	<stop  offset="1" style="stop-color:#82B4FB"/>
-	<a:midPointStop  offset="0" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="1" style="stop-color:#82B4FB"/>
-</radialGradient>
-<path style="fill:url(#SVGID_8_);" d="M2,6C1.4,6,1,5.6,1,5V2c0-0.6,0.4-1,1-1h16c0.6,0,1,0.4,1,1v3c0,0.6-0.4,1-1,1H2z"/>
-<radialGradient id="SVGID_9_" cx="10" cy="3.5" r="5.7554" gradientUnits="userSpaceOnUse">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</radialGradient>
-<rect x="2" y="2" style="fill:url(#SVGID_9_);" width="16" height="3"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="-2 -1 24 24" style="overflow:visible;enable-background:new -2 -1 24 24" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><radialGradient id="a" cx="10" cy="19.5" r="7.492" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#76a1f0"/><stop offset="1" style="stop-color:#6b90d5"/></radialGradient><path style="fill:url(#a)" d="M20 21c0 1.1-.9 2-2 2H2c-1.1 0-2-.9-2-2v-3c0-1.1.9-2 2-2h16c1.1 0 2 .9 2 2v3z"/><radialGradient id="b" cx="10" cy="19.5" r="6.605" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#bbe0f7"/><stop offset="1" style="stop-color:#82b4fb"/></radialGradient><path style="fill:url(#b)" d="M2 22c-.6 0-1-.4-1-1v-3c0-.6.4-1 1-1h16c.6 0 1 .4 1 1v3c0 .6-.4 1-1 1H2z"/><radialGradient id="c" cx="10" cy="19.5" r="5.755" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#95bff8"/><stop offset=".557" style="stop-color:#84adef"/><stop offset="1" style="stop-color:#7ca4eb"/></radialGradient><path style="fill:url(#c)" d="M2 18h16v3H2z"/><radialGradient id="d" cx="10" cy="11.5" r="7.492" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#76a1f0"/><stop offset="1" style="stop-color:#6b90d5"/></radialGradient><path style="fill:url(#d)" d="M20 13c0 1.1-.9 2-2 2H2c-1.1 0-2-.9-2-2v-3c0-1.1.9-2 2-2h16c1.1 0 2 .9 2 2v3z"/><radialGradient id="e" cx="10" cy="11.5" r="6.605" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#bbe0f7"/><stop offset="1" style="stop-color:#82b4fb"/></radialGradient><path style="fill:url(#e)" d="M2 14c-.6 0-1-.4-1-1v-3c0-.6.4-1 1-1h16c.6 0 1 .4 1 1v3c0 .6-.4 1-1 1H2z"/><radialGradient id="f" cx="10" cy="11.5" r="5.755" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#95bff8"/><stop offset=".557" style="stop-color:#84adef"/><stop offset="1" style="stop-color:#7ca4eb"/></radialGradient><path style="fill:url(#f)" d="M2 10h16v3H2z"/><radialGradient id="g" cx="10" cy="3.5" r="7.492" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#76a1f0"/><stop offset="1" style="stop-color:#6b90d5"/></radialGradient><path style="fill:url(#g)" d="M20 5c0 1.1-.9 2-2 2H2C.9 7 0 6.1 0 5V2C0 .9.9 0 2 0h16c1.1 0 2 .9 2 2v3z"/><radialGradient id="h" cx="10" cy="3.5" r="6.605" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#bbe0f7"/><stop offset="1" style="stop-color:#82b4fb"/></radialGradient><path style="fill:url(#h)" d="M2 6c-.6 0-1-.4-1-1V2c0-.6.4-1 1-1h16c.6 0 1 .4 1 1v3c0 .6-.4 1-1 1H2z"/><radialGradient id="i" cx="10" cy="3.5" r="5.755" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#95bff8"/><stop offset=".557" style="stop-color:#84adef"/><stop offset="1" style="stop-color:#7ca4eb"/></radialGradient><path style="fill:url(#i)" d="M2 2h16v3H2z"/></svg>
diff --git a/src/assets/img/mod_legacy/external-tool.svg b/src/assets/img/mod_legacy/external-tool.svg
index ebbbe3084..286a99aee 100644
--- a/src/assets/img/mod_legacy/external-tool.svg
+++ b/src/assets/img/mod_legacy/external-tool.svg
@@ -1,55 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" style="overflow:visible;enable-background:new 0 0 24 24;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="0" x2="11.9995" y2="24.001">
-	<stop  offset="0" style="stop-color:#90C50E"/>
-	<stop  offset="1" style="stop-color:#70A034"/>
-	<a:midPointStop  offset="0" style="stop-color:#90C50E"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#90C50E"/>
-	<a:midPointStop  offset="1" style="stop-color:#70A034"/>
-</linearGradient>
-<path style="fill:url(#SVGID_1_);" d="M21.1,12.3c1,0,1.7,0.9,1.7,0.9c0.3,0.4,0.7,0.8,0.9,0.8s0.3-0.5,0.3-1V8c0-0.5-0.5-1-1-1h-3
-	c-0.5,0-1-0.1-1-0.3c0-0.2,0.3-0.7,0.7-1.1c0,0,0.8-0.9,0.8-2.1C20.5,1.6,18.9,0,17,0s-3.5,1.6-3.5,3.5c0,1.2,0.8,2.1,0.8,2.1
-	C14.7,6,15,6.5,15,6.7C15,6.9,14.5,7,14,7H8C7.5,7,7,7.5,7,8v6c0,0.5-0.1,1-0.3,1S6,14.7,5.6,14.3c0,0-0.9-0.8-2.1-0.8
-	C1.6,13.5,0,15.1,0,17s1.6,3.5,3.5,3.5c1.2,0,2.1-0.8,2.1-0.8C6,19.3,6.5,19,6.7,19S7,19.5,7,20v3c0,0.5,0.5,1,1,1h4
-	c0.5,0,1-0.1,1-0.3s-0.3-0.6-0.7-1c0,0-0.6-0.6-0.6-1.6c0-1.4,1.3-2.5,2.7-2.5c1.4,0,2.4,1.1,2.4,2.5c0,1-0.9,1.7-0.9,1.7
-	c-0.4,0.3-0.8,0.7-0.8,0.9s0.5,0.3,1,0.3h7c0.5,0,1-0.5,1-1v-6c0-0.5-0.1-1-0.3-1s-0.6,0.3-1,0.7c0,0-0.6,0.6-1.6,0.6
-	c-1.4,0-2.5-1.3-2.5-2.7S19.7,12.3,21.1,12.3z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="1" x2="11.9995" y2="23.001">
-	<stop  offset="0" style="stop-color:#D9F991"/>
-	<stop  offset="0.2388" style="stop-color:#D7F88D"/>
-	<stop  offset="0.4501" style="stop-color:#D1F383"/>
-	<stop  offset="0.6509" style="stop-color:#C6EC71"/>
-	<stop  offset="0.844" style="stop-color:#B7E257"/>
-	<stop  offset="1" style="stop-color:#A8D73D"/>
-	<a:midPointStop  offset="0" style="stop-color:#D9F991"/>
-	<a:midPointStop  offset="0.7317" style="stop-color:#D9F991"/>
-	<a:midPointStop  offset="1" style="stop-color:#A8D73D"/>
-</linearGradient>
-<path style="fill:url(#SVGID_2_);" d="M17,23c0.4-0.4,0.7-1.1,0.7-1.9c0-2-1.5-3.5-3.4-3.5c-2,0-3.7,1.6-3.7,3.5
-	c0,0.9,0.3,1.5,0.6,1.9H8v-3c0-1.5-0.7-2-1.3-2c-0.6,0-1.3,0.6-1.7,0.9c0,0-0.7,0.6-1.5,0.6C2.1,19.5,1,18.4,1,17s1.1-2.5,2.5-2.5
-	c0.8,0,1.4,0.6,1.5,0.6C5.3,15.4,6.1,16,6.7,16C7.3,16,8,15.5,8,14V8h6c1.5,0,2-0.7,2-1.3c0-0.6-0.5-1.3-0.9-1.7
-	c0,0-0.6-0.7-0.6-1.5C14.5,2.1,15.6,1,17,1s2.5,1.1,2.5,2.5c0,0.8-0.6,1.5-0.6,1.5C18.5,5.4,18,6.1,18,6.7C18,7.3,18.5,8,20,8h3v4
-	c-0.4-0.4-1.1-0.7-1.9-0.7c-2,0-3.5,1.5-3.5,3.4c0,2,1.6,3.7,3.5,3.7c0.9,0,1.5-0.3,1.9-0.6V23H17z"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="2" x2="11.9995" y2="22.001">
-	<stop  offset="0" style="stop-color:#B3E810"/>
-	<stop  offset="1" style="stop-color:#90C60D"/>
-	<a:midPointStop  offset="0" style="stop-color:#B3E810"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#B3E810"/>
-	<a:midPointStop  offset="1" style="stop-color:#90C60D"/>
-</linearGradient>
-<path style="fill:url(#SVGID_3_);" d="M18.6,22c0.1-0.3,0.1-0.6,0.1-0.9c0-2.5-1.9-4.5-4.4-4.5c-2.5,0-4.7,2.1-4.7,4.5
-	c0,0.3,0,0.6,0.1,0.9H9v-2c0-2.1-1.2-3-2.3-3C7.8,17,9,16.1,9,14V9h5c2.1,0,3-1.2,3-2.3c0-0.7-0.4-1.5-1.2-2.4
-	c-0.1-0.1-0.3-0.5-0.3-0.8C15.5,2.7,16.2,2,17,2s1.5,0.7,1.5,1.5c0,0.3-0.3,0.7-0.3,0.8C17.4,5.2,17,6,17,6.7C17,7.8,17.9,9,20,9h2
-	v1.4c-0.3-0.1-0.6-0.1-0.9-0.1c-2.5,0-4.5,1.9-4.5,4.4c0,2.5,2.1,4.7,4.5,4.7c0.3,0,0.6,0,0.9-0.1V22H18.6z M3.5,18.5
-	C2.7,18.5,2,17.8,2,17s0.7-1.5,1.5-1.5c0.3,0,0.7,0.3,0.8,0.3C5.2,16.6,6,17,6.7,17c-0.7,0-1.5,0.4-2.4,1.2
-	C4.2,18.3,3.8,18.5,3.5,18.5z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" style="overflow:visible;enable-background:new 0 0 24 24" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="11.999" y1="0" x2="11.999" y2="24.001"><stop offset="0" style="stop-color:#90c50e"/><stop offset="1" style="stop-color:#70a034"/></linearGradient><path style="fill:url(#a)" d="M21.1 12.3c1 0 1.7.9 1.7.9.3.4.7.8.9.8s.3-.5.3-1V8c0-.5-.5-1-1-1h-3c-.5 0-1-.1-1-.3 0-.2.3-.7.7-1.1 0 0 .8-.9.8-2.1C20.5 1.6 18.9 0 17 0s-3.5 1.6-3.5 3.5c0 1.2.8 2.1.8 2.1.4.4.7.9.7 1.1 0 .2-.5.3-1 .3H8c-.5 0-1 .5-1 1v6c0 .5-.1 1-.3 1s-.7-.3-1.1-.7c0 0-.9-.8-2.1-.8C1.6 13.5 0 15.1 0 17s1.6 3.5 3.5 3.5c1.2 0 2.1-.8 2.1-.8.4-.4.9-.7 1.1-.7s.3.5.3 1v3c0 .5.5 1 1 1h4c.5 0 1-.1 1-.3s-.3-.6-.7-1c0 0-.6-.6-.6-1.6 0-1.4 1.3-2.5 2.7-2.5 1.4 0 2.4 1.1 2.4 2.5 0 1-.9 1.7-.9 1.7-.4.3-.8.7-.8.9s.5.3 1 .3h7c.5 0 1-.5 1-1v-6c0-.5-.1-1-.3-1s-.6.3-1 .7c0 0-.6.6-1.6.6-1.4 0-2.5-1.3-2.5-2.7s1-2.3 2.4-2.3z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="11.999" y1="1" x2="11.999" y2="23.001"><stop offset="0" style="stop-color:#d9f991"/><stop offset=".239" style="stop-color:#d7f88d"/><stop offset=".45" style="stop-color:#d1f383"/><stop offset=".651" style="stop-color:#c6ec71"/><stop offset=".844" style="stop-color:#b7e257"/><stop offset="1" style="stop-color:#a8d73d"/></linearGradient><path style="fill:url(#b)" d="M17 23c.4-.4.7-1.1.7-1.9 0-2-1.5-3.5-3.4-3.5-2 0-3.7 1.6-3.7 3.5 0 .9.3 1.5.6 1.9H8v-3c0-1.5-.7-2-1.3-2-.6 0-1.3.6-1.7.9 0 0-.7.6-1.5.6C2.1 19.5 1 18.4 1 17s1.1-2.5 2.5-2.5c.8 0 1.4.6 1.5.6.3.3 1.1.9 1.7.9.6 0 1.3-.5 1.3-2V8h6c1.5 0 2-.7 2-1.3 0-.6-.5-1.3-.9-1.7 0 0-.6-.7-.6-1.5C14.5 2.1 15.6 1 17 1s2.5 1.1 2.5 2.5c0 .8-.6 1.5-.6 1.5-.4.4-.9 1.1-.9 1.7 0 .6.5 1.3 2 1.3h3v4c-.4-.4-1.1-.7-1.9-.7-2 0-3.5 1.5-3.5 3.4 0 2 1.6 3.7 3.5 3.7.9 0 1.5-.3 1.9-.6V23h-6z"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="11.999" y1="2" x2="11.999" y2="22.001"><stop offset="0" style="stop-color:#b3e810"/><stop offset="1" style="stop-color:#90c60d"/></linearGradient><path style="fill:url(#c)" d="M18.6 22c.1-.3.1-.6.1-.9 0-2.5-1.9-4.5-4.4-4.5-2.5 0-4.7 2.1-4.7 4.5 0 .3 0 .6.1.9H9v-2c0-2.1-1.2-3-2.3-3 1.1 0 2.3-.9 2.3-3V9h5c2.1 0 3-1.2 3-2.3 0-.7-.4-1.5-1.2-2.4-.1-.1-.3-.5-.3-.8 0-.8.7-1.5 1.5-1.5s1.5.7 1.5 1.5c0 .3-.3.7-.3.8-.8.9-1.2 1.7-1.2 2.4 0 1.1.9 2.3 3 2.3h2v1.4c-.3-.1-.6-.1-.9-.1-2.5 0-4.5 1.9-4.5 4.4 0 2.5 2.1 4.7 4.5 4.7.3 0 .6 0 .9-.1V22h-3.4zM3.5 18.5c-.8 0-1.5-.7-1.5-1.5s.7-1.5 1.5-1.5c.3 0 .7.3.8.3.9.8 1.7 1.2 2.4 1.2-.7 0-1.5.4-2.4 1.2-.1.1-.5.3-.8.3z"/></svg>
diff --git a/src/assets/img/mod_legacy/feedback.svg b/src/assets/img/mod_legacy/feedback.svg
index 58d0f080b..79736bb7e 100644
--- a/src/assets/img/mod_legacy/feedback.svg
+++ b/src/assets/img/mod_legacy/feedback.svg
@@ -1,133 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" style="overflow:visible;enable-background:new 0 0 24 24;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="7.7681" y1="10.2231" x2="7.7681" y2="23.9805">
-	<stop  offset="0" style="stop-color:#DB6D17"/>
-	<stop  offset="1" style="stop-color:#BF3B08"/>
-	<a:midPointStop  offset="0" style="stop-color:#DB6D17"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#DB6D17"/>
-	<a:midPointStop  offset="1" style="stop-color:#BF3B08"/>
-</linearGradient>
-<path style="fill:url(#SVGID_1_);" d="M10.9,19.1c-1.1-0.8-1.7-1.1-2-2.4c-0.2-1.1-1.3-6.4-1.3-6.4l-4.9,1c0,0,0.9,4.6,1.8,9
-	c0.9,4.4,1,4.3,6.8,3.1C13.7,22.8,12.8,20.5,10.9,19.1z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="7.8569" y1="11.3994" x2="7.8569" y2="22.9805">
-	<stop  offset="0" style="stop-color:#F6A55E"/>
-	<stop  offset="1" style="stop-color:#EA5B03"/>
-	<a:midPointStop  offset="0" style="stop-color:#F6A55E"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#F6A55E"/>
-	<a:midPointStop  offset="1" style="stop-color:#EA5B03"/>
-</linearGradient>
-<path style="fill:url(#SVGID_2_);" d="M7,23c-0.8,0-0.9,0-1.5-3l-1.6-8l2.9-0.6L8,16.9c0.3,1.6,1,2.1,1.9,2.7l0.4,0.3
-	c1.1,0.8,1.5,1.7,1.4,2.1c0,0.2-0.5,0.3-0.6,0.3l-0.5,0.1C9,22.7,7.8,23,7,23L7,23z"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="7.7373" y1="12.5757" x2="7.7373" y2="21.8926">
-	<stop  offset="0" style="stop-color:#F17219"/>
-	<stop  offset="1" style="stop-color:#EA5B03"/>
-	<a:midPointStop  offset="0" style="stop-color:#F17219"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#F17219"/>
-	<a:midPointStop  offset="1" style="stop-color:#EA5B03"/>
-</linearGradient>
-<path style="fill:url(#SVGID_3_);" d="M7.7,21.9c-0.7,0-0.7,0-1.2-2.1l-1.4-7l1-0.2L7,17.1c0.4,1.9,1.4,2.7,2.3,3.3l0.4,0.3
-	C10.8,21.6,10.6,21.4,7.7,21.9z"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="11.0005" y1="0" x2="11.0005" y2="19.0039">
-	<stop  offset="0" style="stop-color:#C3C3C3"/>
-	<stop  offset="1" style="stop-color:#ACACAC"/>
-	<a:midPointStop  offset="0" style="stop-color:#C3C3C3"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#C3C3C3"/>
-	<a:midPointStop  offset="1" style="stop-color:#ACACAC"/>
-</linearGradient>
-<path style="fill:url(#SVGID_4_);" d="M12.5,5H4.6C2.1,5,0,7.2,0,9.5C0,11.8,2.1,14,4.6,14h7.6c0,0,5.7,0,9.8,5c0-4.9,0-9.5,0-9.5
-	s0-4.3,0-9.5C18.7,4.8,12.5,5,12.5,5z"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="11.0005" y1="2.6079" x2="11.0005" y2="16.5342">
-	<stop  offset="0" style="stop-color:#E9E9E9"/>
-	<stop  offset="1" style="stop-color:#C4C4C4"/>
-	<a:midPointStop  offset="0" style="stop-color:#E9E9E9"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#E9E9E9"/>
-	<a:midPointStop  offset="1" style="stop-color:#C4C4C4"/>
-</linearGradient>
-<path style="fill:url(#SVGID_5_);" d="M21,16.5C17,13,12.5,13,12.2,13H4.6C2.7,13,1,11.4,1,9.5S2.7,6,4.6,6h7.8
-	c0.3,0,4.9-0.2,8.5-3.4V16.5z"/>
-<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="11.0005" y1="4.5991" x2="11.0005" y2="14.5273">
-	<stop  offset="0" style="stop-color:#F7F7F7"/>
-	<stop  offset="0.1044" style="stop-color:#FCFCFC"/>
-	<stop  offset="0.3293" style="stop-color:#FFFFFF"/>
-	<stop  offset="0.5692" style="stop-color:#E8E8E8"/>
-	<stop  offset="0.8153" style="stop-color:#D7D7D7"/>
-	<stop  offset="1" style="stop-color:#D1D1D1"/>
-	<a:midPointStop  offset="0" style="stop-color:#F7F7F7"/>
-	<a:midPointStop  offset="0.2222" style="stop-color:#F7F7F7"/>
-	<a:midPointStop  offset="0.3293" style="stop-color:#FFFFFF"/>
-	<a:midPointStop  offset="0.3545" style="stop-color:#FFFFFF"/>
-	<a:midPointStop  offset="1" style="stop-color:#D1D1D1"/>
-</linearGradient>
-<path style="fill:url(#SVGID_6_);" d="M20,14.5C16.2,12,12.4,12,12.2,12H4.6C3.3,12,2,10.8,2,9.5S3.3,7,4.6,7h7.8
-	c0.2,0,4-0.2,7.5-2.4V14.5z"/>
-<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="5.501" y1="5.0015" x2="5.501" y2="14.002">
-	<stop  offset="0" style="stop-color:#DB6D17"/>
-	<stop  offset="1" style="stop-color:#BF3B08"/>
-	<a:midPointStop  offset="0" style="stop-color:#DB6D17"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#DB6D17"/>
-	<a:midPointStop  offset="1" style="stop-color:#BF3B08"/>
-</linearGradient>
-<path style="fill:url(#SVGID_7_);" d="M11,5H4.6C2.1,5,0,7.2,0,9.5C0,11.8,2.1,14,4.6,14H11V5z"/>
-<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="6.001" y1="6.0015" x2="6.001" y2="13.0015">
-	<stop  offset="0" style="stop-color:#F6A55E"/>
-	<stop  offset="1" style="stop-color:#EA5B03"/>
-	<a:midPointStop  offset="0" style="stop-color:#F6A55E"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#F6A55E"/>
-	<a:midPointStop  offset="1" style="stop-color:#EA5B03"/>
-</linearGradient>
-<path style="fill:url(#SVGID_8_);" d="M11,6H4.6C2.7,6,1,7.6,1,9.5S2.7,13,4.6,13H11V6z"/>
-<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="6.501" y1="7.0015" x2="6.501" y2="12.0015">
-	<stop  offset="0.2195" style="stop-color:#F6A55E"/>
-	<stop  offset="0.5076" style="stop-color:#F28C3F"/>
-	<stop  offset="1" style="stop-color:#EA5B03"/>
-	<a:midPointStop  offset="0.2195" style="stop-color:#F6A55E"/>
-	<a:midPointStop  offset="0.5304" style="stop-color:#F6A55E"/>
-	<a:midPointStop  offset="1" style="stop-color:#EA5B03"/>
-</linearGradient>
-<path style="fill:url(#SVGID_9_);" d="M11,7H4.6C3.3,7,2,8.2,2,9.5S3.3,12,4.6,12H11V7z"/>
-<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="22.002" y1="1.464844e-03" x2="22.002" y2="19.002">
-	<stop  offset="0" style="stop-color:#DB6D17"/>
-	<stop  offset="1" style="stop-color:#BF3B08"/>
-	<a:midPointStop  offset="0" style="stop-color:#DB6D17"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#DB6D17"/>
-	<a:midPointStop  offset="1" style="stop-color:#BF3B08"/>
-</linearGradient>
-<path style="fill:url(#SVGID_10_);" d="M20,17c0,1.1,0.9,2,2,2l0,0c1.1,0,2-0.9,2-2V2c0-1.1-0.9-2-2-2l0,0c-1.1,0-2,0.9-2,2V17z"/>
-<linearGradient id="SVGID_11_" gradientUnits="userSpaceOnUse" x1="22.002" y1="1.0015" x2="22.002" y2="18.002">
-	<stop  offset="0" style="stop-color:#F6A55E"/>
-	<stop  offset="1" style="stop-color:#EA5B03"/>
-	<a:midPointStop  offset="0" style="stop-color:#F6A55E"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#F6A55E"/>
-	<a:midPointStop  offset="1" style="stop-color:#EA5B03"/>
-</linearGradient>
-<path style="fill:url(#SVGID_11_);" d="M22,18c-0.6,0-1-0.4-1-1V2c0-0.6,0.4-1,1-1s1,0.4,1,1v15C23,17.6,22.6,18,22,18z"/>
-<linearGradient id="SVGID_12_" gradientUnits="userSpaceOnUse" x1="22.002" y1="1.0015" x2="22.002" y2="18.002">
-	<stop  offset="0" style="stop-color:#F17219"/>
-	<stop  offset="9.009037e-02" style="stop-color:#F38A39"/>
-	<stop  offset="0.183" style="stop-color:#F59E54"/>
-	<stop  offset="0.2378" style="stop-color:#F6A55E"/>
-	<stop  offset="0.2464" style="stop-color:#F5A35C"/>
-	<stop  offset="0.3809" style="stop-color:#EC8740"/>
-	<stop  offset="0.5155" style="stop-color:#E5722C"/>
-	<stop  offset="0.649" style="stop-color:#E06620"/>
-	<stop  offset="0.7805" style="stop-color:#DF621C"/>
-	<stop  offset="1" style="stop-color:#D64701"/>
-	<a:midPointStop  offset="0" style="stop-color:#F17219"/>
-	<a:midPointStop  offset="0.4103" style="stop-color:#F17219"/>
-	<a:midPointStop  offset="0.2378" style="stop-color:#F6A55E"/>
-	<a:midPointStop  offset="0.296" style="stop-color:#F6A55E"/>
-	<a:midPointStop  offset="0.7805" style="stop-color:#DF621C"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#DF621C"/>
-	<a:midPointStop  offset="1" style="stop-color:#D64701"/>
-</linearGradient>
-<path style="fill:url(#SVGID_12_);" d="M22,18c-0.6,0-1-0.4-1-1V2c0-0.6,0.4-1,1-1s1,0.4,1,1v15C23,17.6,22.6,18,22,18z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" style="overflow:visible;enable-background:new 0 0 24 24" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="7.768" y1="10.223" x2="7.768" y2="23.98"><stop offset="0" style="stop-color:#db6d17"/><stop offset="1" style="stop-color:#bf3b08"/></linearGradient><path style="fill:url(#a)" d="M10.9 19.1c-1.1-.8-1.7-1.1-2-2.4-.2-1.1-1.3-6.4-1.3-6.4l-4.9 1s.9 4.6 1.8 9 1 4.3 6.8 3.1c2.4-.6 1.5-2.9-.4-4.3z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="7.857" y1="11.399" x2="7.857" y2="22.98"><stop offset="0" style="stop-color:#f6a55e"/><stop offset="1" style="stop-color:#ea5b03"/></linearGradient><path style="fill:url(#b)" d="M7 23c-.8 0-.9 0-1.5-3l-1.6-8 2.9-.6L8 16.9c.3 1.6 1 2.1 1.9 2.7l.4.3c1.1.8 1.5 1.7 1.4 2.1 0 .2-.5.3-.6.3l-.5.1c-1.6.3-2.8.6-3.6.6z"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="7.737" y1="12.576" x2="7.737" y2="21.893"><stop offset="0" style="stop-color:#f17219"/><stop offset="1" style="stop-color:#ea5b03"/></linearGradient><path style="fill:url(#c)" d="M7.7 21.9c-.7 0-.7 0-1.2-2.1l-1.4-7 1-.2.9 4.5c.4 1.9 1.4 2.7 2.3 3.3l.4.3c1.1.9.9.7-2 1.2z"/><linearGradient id="d" gradientUnits="userSpaceOnUse" x1="11.001" y1="0" x2="11.001" y2="19.004"><stop offset="0" style="stop-color:#c3c3c3"/><stop offset="1" style="stop-color:#acacac"/></linearGradient><path style="fill:url(#d)" d="M12.5 5H4.6C2.1 5 0 7.2 0 9.5S2.1 14 4.6 14h7.6s5.7 0 9.8 5V0c-3.3 4.8-9.5 5-9.5 5z"/><linearGradient id="e" gradientUnits="userSpaceOnUse" x1="11.001" y1="2.608" x2="11.001" y2="16.534"><stop offset="0" style="stop-color:#e9e9e9"/><stop offset="1" style="stop-color:#c4c4c4"/></linearGradient><path style="fill:url(#e)" d="M21 16.5C17 13 12.5 13 12.2 13H4.6C2.7 13 1 11.4 1 9.5S2.7 6 4.6 6h7.8c.3 0 4.9-.2 8.5-3.4v13.9z"/><linearGradient id="f" gradientUnits="userSpaceOnUse" x1="11.001" y1="4.599" x2="11.001" y2="14.527"><stop offset="0" style="stop-color:#f7f7f7"/><stop offset=".104" style="stop-color:#fcfcfc"/><stop offset=".329" style="stop-color:#fff"/><stop offset=".569" style="stop-color:#e8e8e8"/><stop offset=".815" style="stop-color:#d7d7d7"/><stop offset="1" style="stop-color:#d1d1d1"/></linearGradient><path style="fill:url(#f)" d="M20 14.5C16.2 12 12.4 12 12.2 12H4.6C3.3 12 2 10.8 2 9.5S3.3 7 4.6 7h7.8c.2 0 4-.2 7.5-2.4v9.9z"/><linearGradient id="g" gradientUnits="userSpaceOnUse" x1="5.501" y1="5.002" x2="5.501" y2="14.002"><stop offset="0" style="stop-color:#db6d17"/><stop offset="1" style="stop-color:#bf3b08"/></linearGradient><path style="fill:url(#g)" d="M11 5H4.6C2.1 5 0 7.2 0 9.5S2.1 14 4.6 14H11V5z"/><linearGradient id="h" gradientUnits="userSpaceOnUse" x1="6.001" y1="6.002" x2="6.001" y2="13.002"><stop offset="0" style="stop-color:#f6a55e"/><stop offset="1" style="stop-color:#ea5b03"/></linearGradient><path style="fill:url(#h)" d="M11 6H4.6C2.7 6 1 7.6 1 9.5S2.7 13 4.6 13H11V6z"/><linearGradient id="i" gradientUnits="userSpaceOnUse" x1="6.501" y1="7.002" x2="6.501" y2="12.002"><stop offset=".22" style="stop-color:#f6a55e"/><stop offset=".508" style="stop-color:#f28c3f"/><stop offset="1" style="stop-color:#ea5b03"/></linearGradient><path style="fill:url(#i)" d="M11 7H4.6C3.3 7 2 8.2 2 9.5S3.3 12 4.6 12H11V7z"/><linearGradient id="j" gradientUnits="userSpaceOnUse" x1="22.002" y1=".001" x2="22.002" y2="19.002"><stop offset="0" style="stop-color:#db6d17"/><stop offset="1" style="stop-color:#bf3b08"/></linearGradient><path style="fill:url(#j)" d="M20 17c0 1.1.9 2 2 2s2-.9 2-2V2c0-1.1-.9-2-2-2s-2 .9-2 2v15z"/><linearGradient id="k" gradientUnits="userSpaceOnUse" x1="22.002" y1="1.002" x2="22.002" y2="18.002"><stop offset="0" style="stop-color:#f6a55e"/><stop offset="1" style="stop-color:#ea5b03"/></linearGradient><path style="fill:url(#k)" d="M22 18c-.6 0-1-.4-1-1V2c0-.6.4-1 1-1s1 .4 1 1v15c0 .6-.4 1-1 1z"/><linearGradient id="l" gradientUnits="userSpaceOnUse" x1="22.002" y1="1.002" x2="22.002" y2="18.002"><stop offset="0" style="stop-color:#f17219"/><stop offset=".09" style="stop-color:#f38a39"/><stop offset=".183" style="stop-color:#f59e54"/><stop offset=".238" style="stop-color:#f6a55e"/><stop offset=".246" style="stop-color:#f5a35c"/><stop offset=".381" style="stop-color:#ec8740"/><stop offset=".515" style="stop-color:#e5722c"/><stop offset=".649" style="stop-color:#e06620"/><stop offset=".78" style="stop-color:#df621c"/><stop offset="1" style="stop-color:#d64701"/></linearGradient><path style="fill:url(#l)" d="M22 18c-.6 0-1-.4-1-1V2c0-.6.4-1 1-1s1 .4 1 1v15c0 .6-.4 1-1 1z"/></svg>
diff --git a/src/assets/img/mod_legacy/folder.svg b/src/assets/img/mod_legacy/folder.svg
index 6c2a9fe19..e6ddbc4c4 100644
--- a/src/assets/img/mod_legacy/folder.svg
+++ b/src/assets/img/mod_legacy/folder.svg
@@ -1,65 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="-0.1 -2 24 24"
-	 style="overflow:visible;enable-background:new -0.1 -2 24 24;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="11.9351" y1="0" x2="11.9351" y2="20.0005">
-	<stop  offset="0" style="stop-color:#76A1F0"/>
-	<stop  offset="1" style="stop-color:#6B90D5"/>
-	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
-</linearGradient>
-<path style="fill:url(#SVGID_1_);" d="M21.9,19c0,0.5-0.5,1-1,1h-18c-0.5,0-1-0.5-1-1V1.1c0-0.5,0.5-1.1,1-1.1h4
-	c0.5,0,1.4,0.3,1.8,0.6l0.9,0.7C10.1,1.7,10.9,2,11.4,2l9.5,0c0.5,0,1,0.5,1,1V19z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="11.9351" y1="0.9888" x2="11.9351" y2="19.0005">
-	<stop  offset="0" style="stop-color:#BBE0F7"/>
-	<stop  offset="1" style="stop-color:#82B4FB"/>
-	<a:midPointStop  offset="0" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="1" style="stop-color:#82B4FB"/>
-</linearGradient>
-<path style="fill:url(#SVGID_2_);" d="M2.9,19V1.1C2.9,1.1,3,1,3,1l3.9,0c0.3,0,0.9,0.2,1.2,0.4L9,2.2C9.7,2.6,10.7,3,11.4,3l9.5,0
-	v16H2.9z"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="11.9351" y1="1.9917" x2="11.9351" y2="18.0005">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<path style="fill:url(#SVGID_3_);" d="M3.9,18V2l3,0C7,2,7.4,2.1,7.5,2.2L8.4,3c0.8,0.6,2.1,1,3,1l8.5,0v14H3.9z"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="11.936" y1="5" x2="11.936" y2="20.0005">
-	<stop  offset="0" style="stop-color:#76A1F0"/>
-	<stop  offset="1" style="stop-color:#6B90D5"/>
-	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
-</linearGradient>
-<path style="fill:url(#SVGID_4_);" d="M23,19c0,0.5-0.5,1-1.1,1h-20c-0.5,0-1-0.5-1.1-1L0,6c0-0.5,0.4-1,0.9-1h22c0.5,0,1,0.5,0.9,1
-	L23,19z"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="11.9673" y1="5.9541" x2="11.9673" y2="19.0005">
-	<stop  offset="0" style="stop-color:#BBE0F7"/>
-	<stop  offset="1" style="stop-color:#82B4FB"/>
-	<a:midPointStop  offset="0" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="1" style="stop-color:#82B4FB"/>
-</linearGradient>
-<path style="fill:url(#SVGID_5_);" d="M1.9,19c0,0-0.1-0.1-0.1-0.1L1,6l21.9,0L22,18.9c0,0,0,0.1-0.1,0.1H1.9z"/>
-<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="11.9663" y1="6.9565" x2="11.9663" y2="18.0005">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_6_);" points="2.8,18 2.1,7 21.9,7 21.1,18 "/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="-0.1 -2 24 24" style="overflow:visible;enable-background:new -.1 -2 24 24" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="11.935" y1="0" x2="11.935" y2="20"><stop offset="0" style="stop-color:#76a1f0"/><stop offset="1" style="stop-color:#6b90d5"/></linearGradient><path style="fill:url(#a)" d="M21.9 19c0 .5-.5 1-1 1h-18c-.5 0-1-.5-1-1V1.1c0-.5.5-1.1 1-1.1h4c.5 0 1.4.3 1.8.6l.9.7c.5.4 1.3.7 1.8.7h9.5c.5 0 1 .5 1 1v16z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="11.935" y1=".989" x2="11.935" y2="19"><stop offset="0" style="stop-color:#bbe0f7"/><stop offset="1" style="stop-color:#82b4fb"/></linearGradient><path style="fill:url(#b)" d="M2.9 19V1.1L3 1h3.9c.3 0 .9.2 1.2.4l.9.8c.7.4 1.7.8 2.4.8h9.5v16h-18z"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="11.935" y1="1.992" x2="11.935" y2="18"><stop offset="0" style="stop-color:#95bff8"/><stop offset=".557" style="stop-color:#84adef"/><stop offset="1" style="stop-color:#7ca4eb"/></linearGradient><path style="fill:url(#c)" d="M3.9 18V2h3c.1 0 .5.1.6.2l.9.8c.8.6 2.1 1 3 1h8.5v14h-16z"/><linearGradient id="d" gradientUnits="userSpaceOnUse" x1="11.936" y1="5" x2="11.936" y2="20"><stop offset="0" style="stop-color:#76a1f0"/><stop offset="1" style="stop-color:#6b90d5"/></linearGradient><path style="fill:url(#d)" d="M23 19c0 .5-.5 1-1.1 1h-20c-.5 0-1-.5-1.1-1L0 6c0-.5.4-1 .9-1h22c.5 0 1 .5.9 1L23 19z"/><linearGradient id="e" gradientUnits="userSpaceOnUse" x1="11.967" y1="5.954" x2="11.967" y2="19"><stop offset="0" style="stop-color:#bbe0f7"/><stop offset="1" style="stop-color:#82b4fb"/></linearGradient><path style="fill:url(#e)" d="m1.9 19-.1-.1L1 6h21.9L22 18.9s0 .1-.1.1h-20z"/><linearGradient id="f" gradientUnits="userSpaceOnUse" x1="11.966" y1="6.957" x2="11.966" y2="18"><stop offset="0" style="stop-color:#95bff8"/><stop offset=".557" style="stop-color:#84adef"/><stop offset="1" style="stop-color:#7ca4eb"/></linearGradient><path style="fill:url(#f)" d="M2.8 18 2.1 7h19.8l-.8 11z"/></svg>
diff --git a/src/assets/img/mod_legacy/forum.svg b/src/assets/img/mod_legacy/forum.svg
index aab9a8f44..392a8ba9d 100644
--- a/src/assets/img/mod_legacy/forum.svg
+++ b/src/assets/img/mod_legacy/forum.svg
@@ -1,71 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" style="overflow:visible;enable-background:new 0 0 24 24;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="10.4995" y1="0" x2="10.4995" y2="19.4312">
-	<stop  offset="0" style="stop-color:#76A1F0"/>
-	<stop  offset="1" style="stop-color:#6B90D5"/>
-	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
-</linearGradient>
-<path style="fill:url(#SVGID_1_);" d="M19,0H2C0.9,0,0,0.9,0,2v11.3C0,14.4,0.9,15,2,15h0v4.4L6.1,15H19c1.1,0,2-0.5,2-1.6V2
-	C21,0.9,20,0,19,0z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="10.4995" y1="0.9531" x2="10.4995" y2="16.8384">
-	<stop  offset="0" style="stop-color:#BBE0F7"/>
-	<stop  offset="1" style="stop-color:#82B4FB"/>
-	<a:midPointStop  offset="0" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="1" style="stop-color:#82B4FB"/>
-</linearGradient>
-<path style="fill:url(#SVGID_2_);" d="M3,14H2c-0.4,0-1-0.1-1-0.6V2c0-0.6,0.5-1,1-1H19c0.5,0,1,0.5,1,1v11.3c0,0.6-0.8,0.6-1,0.6
-	H5.7L3,16.8V14z"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="10.4985" y1="1.9775" x2="10.4985" y2="14.314">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<path style="fill:url(#SVGID_3_);" d="M4,13c0,0-2,0-2,0V2l17,0l0,11c0,0-13.8,0-13.8,0L4,14.3V13z"/>
-<path style="fill:#FFFFFF;" d="M17,11H4v-1h13V11z M17,8H4v1h13V8z M17,6H4v1h13V6z M17,4H4v1h13V4z"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="15" y1="7.8955" x2="15" y2="23.897">
-	<stop  offset="0" style="stop-color:#90C50E"/>
-	<stop  offset="1" style="stop-color:#70A034"/>
-	<a:midPointStop  offset="0" style="stop-color:#90C50E"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#90C50E"/>
-	<a:midPointStop  offset="1" style="stop-color:#70A034"/>
-</linearGradient>
-<path style="fill:url(#SVGID_4_);" d="M22,7.9H8c-1.1,0-2,0.7-2,1.8v9c0,1.1,0.9,2,2,2v3.2l3.1-3H22c1.1,0,2-1.1,2-2.2v-9
-	C24,8.6,23.1,7.9,22,7.9z"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="15" y1="8.8955" x2="15" y2="21.3911">
-	<stop  offset="0" style="stop-color:#D9F991"/>
-	<stop  offset="0.2388" style="stop-color:#D7F88D"/>
-	<stop  offset="0.4501" style="stop-color:#D1F383"/>
-	<stop  offset="0.6509" style="stop-color:#C6EC71"/>
-	<stop  offset="0.844" style="stop-color:#B7E257"/>
-	<stop  offset="1" style="stop-color:#A8D73D"/>
-	<a:midPointStop  offset="0" style="stop-color:#D9F991"/>
-	<a:midPointStop  offset="0.7317" style="stop-color:#D9F991"/>
-	<a:midPointStop  offset="1" style="stop-color:#A8D73D"/>
-</linearGradient>
-<path style="fill:url(#SVGID_5_);" d="M9,19.9H8c-0.6,0-1-0.7-1-1.2v-9c0-0.6,0.4-0.8,1-0.8h14c0.6,0,1,0.2,1,0.8v9
-	c0,0.6-0.4,1.2-1,1.2H10.6L9,21.4V19.9z"/>
-<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="15" y1="9.8955" x2="15" y2="18.896">
-	<stop  offset="0" style="stop-color:#B3E810"/>
-	<stop  offset="1" style="stop-color:#90C60D"/>
-	<a:midPointStop  offset="0" style="stop-color:#B3E810"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#B3E810"/>
-	<a:midPointStop  offset="1" style="stop-color:#90C60D"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_6_);" points="10,18.9 8,18.9 8,9.9 22,9.9 22,18.9 10.2,18.9 10,18.9 "/>
-<path style="fill:#FFFFFF;" d="M20,16.9H10v-1h10V16.9z M20,13.9H10v1h10V13.9z M20,11.9H10v1h10V11.9z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" style="overflow:visible;enable-background:new 0 0 24 24" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="10.499" y1="0" x2="10.499" y2="19.431"><stop offset="0" style="stop-color:#76a1f0"/><stop offset="1" style="stop-color:#6b90d5"/></linearGradient><path style="fill:url(#a)" d="M19 0H2C.9 0 0 .9 0 2v11.3C0 14.4.9 15 2 15v4.4L6.1 15H19c1.1 0 2-.5 2-1.6V2c0-1.1-1-2-2-2z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="10.499" y1=".953" x2="10.499" y2="16.838"><stop offset="0" style="stop-color:#bbe0f7"/><stop offset="1" style="stop-color:#82b4fb"/></linearGradient><path style="fill:url(#b)" d="M3 14H2c-.4 0-1-.1-1-.6V2c0-.6.5-1 1-1h17c.5 0 1 .5 1 1v11.3c0 .6-.8.6-1 .6H5.7L3 16.8V14z"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="10.498" y1="1.978" x2="10.498" y2="14.314"><stop offset="0" style="stop-color:#95bff8"/><stop offset=".557" style="stop-color:#84adef"/><stop offset="1" style="stop-color:#7ca4eb"/></linearGradient><path style="fill:url(#c)" d="M4 13H2V2h17v11H5.2L4 14.3V13z"/><path style="fill:#fff" d="M17 11H4v-1h13v1zm0-3H4v1h13V8zm0-2H4v1h13V6zm0-2H4v1h13V4z"/><linearGradient id="d" gradientUnits="userSpaceOnUse" x1="15" y1="7.896" x2="15" y2="23.897"><stop offset="0" style="stop-color:#90c50e"/><stop offset="1" style="stop-color:#70a034"/></linearGradient><path style="fill:url(#d)" d="M22 7.9H8c-1.1 0-2 .7-2 1.8v9c0 1.1.9 2 2 2v3.2l3.1-3H22c1.1 0 2-1.1 2-2.2v-9c0-1.1-.9-1.8-2-1.8z"/><linearGradient id="e" gradientUnits="userSpaceOnUse" x1="15" y1="8.896" x2="15" y2="21.391"><stop offset="0" style="stop-color:#d9f991"/><stop offset=".239" style="stop-color:#d7f88d"/><stop offset=".45" style="stop-color:#d1f383"/><stop offset=".651" style="stop-color:#c6ec71"/><stop offset=".844" style="stop-color:#b7e257"/><stop offset="1" style="stop-color:#a8d73d"/></linearGradient><path style="fill:url(#e)" d="M9 19.9H8c-.6 0-1-.7-1-1.2v-9c0-.6.4-.8 1-.8h14c.6 0 1 .2 1 .8v9c0 .6-.4 1.2-1 1.2H10.6L9 21.4v-1.5z"/><linearGradient id="f" gradientUnits="userSpaceOnUse" x1="15" y1="9.896" x2="15" y2="18.896"><stop offset="0" style="stop-color:#b3e810"/><stop offset="1" style="stop-color:#90c60d"/></linearGradient><path style="fill:url(#f)" d="M10 18.9H8v-9h14v9H10z"/><path style="fill:#fff" d="M20 16.9H10v-1h10v1zm0-3H10v1h10v-1zm0-2H10v1h10v-1z"/></svg>
diff --git a/src/assets/img/mod_legacy/glossary.svg b/src/assets/img/mod_legacy/glossary.svg
index f330727e3..f56f9fa31 100644
--- a/src/assets/img/mod_legacy/glossary.svg
+++ b/src/assets/img/mod_legacy/glossary.svg
@@ -1,146 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="-2 0 24 24" style="overflow:visible;enable-background:new -2 0 24 24;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="17.5" y1="16" x2="17.5" y2="22">
-	<stop  offset="0" style="stop-color:#DB6D17"/>
-	<stop  offset="1" style="stop-color:#BF3B08"/>
-	<a:midPointStop  offset="0" style="stop-color:#DB6D17"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#DB6D17"/>
-	<a:midPointStop  offset="1" style="stop-color:#BF3B08"/>
-</linearGradient>
-<rect x="15" y="16" style="fill:url(#SVGID_1_);" width="5" height="6"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="17.5" y1="17" x2="17.5" y2="21">
-	<stop  offset="0" style="stop-color:#F6A55E"/>
-	<stop  offset="1" style="stop-color:#EA5B03"/>
-	<a:midPointStop  offset="0" style="stop-color:#F6A55E"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#F6A55E"/>
-	<a:midPointStop  offset="1" style="stop-color:#EA5B03"/>
-</linearGradient>
-<rect x="16" y="17" style="fill:url(#SVGID_2_);" width="3" height="4"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="17.5" y1="18" x2="17.5" y2="20">
-	<stop  offset="0" style="stop-color:#F17219"/>
-	<stop  offset="1" style="stop-color:#EA5B03"/>
-	<a:midPointStop  offset="0" style="stop-color:#F17219"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#F17219"/>
-	<a:midPointStop  offset="1" style="stop-color:#EA5B03"/>
-</linearGradient>
-<rect x="17" y="18" style="fill:url(#SVGID_3_);" width="1" height="2"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="17.5" y1="9" x2="17.5" y2="15.0005">
-	<stop  offset="0" style="stop-color:#90C50E"/>
-	<stop  offset="1" style="stop-color:#70A034"/>
-	<a:midPointStop  offset="0" style="stop-color:#90C50E"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#90C50E"/>
-	<a:midPointStop  offset="1" style="stop-color:#70A034"/>
-</linearGradient>
-<rect x="15" y="9" style="fill:url(#SVGID_4_);" width="5" height="6"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="17.5" y1="10" x2="17.5" y2="14.0005">
-	<stop  offset="0" style="stop-color:#D9F991"/>
-	<stop  offset="0.2388" style="stop-color:#D7F88D"/>
-	<stop  offset="0.4501" style="stop-color:#D1F383"/>
-	<stop  offset="0.6509" style="stop-color:#C6EC71"/>
-	<stop  offset="0.844" style="stop-color:#B7E257"/>
-	<stop  offset="1" style="stop-color:#A8D73D"/>
-	<a:midPointStop  offset="0" style="stop-color:#D9F991"/>
-	<a:midPointStop  offset="0.7317" style="stop-color:#D9F991"/>
-	<a:midPointStop  offset="1" style="stop-color:#A8D73D"/>
-</linearGradient>
-<rect x="16" y="10" style="fill:url(#SVGID_5_);" width="3" height="4"/>
-<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="17.5" y1="11" x2="17.5" y2="13">
-	<stop  offset="0" style="stop-color:#B3E810"/>
-	<stop  offset="1" style="stop-color:#90C60D"/>
-	<a:midPointStop  offset="0" style="stop-color:#B3E810"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#B3E810"/>
-	<a:midPointStop  offset="1" style="stop-color:#90C60D"/>
-</linearGradient>
-<rect x="17" y="11" style="fill:url(#SVGID_6_);" width="1" height="2"/>
-<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="8.4995" y1="0" x2="8.4995" y2="24.0005">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<rect style="fill:url(#SVGID_7_);" width="17" height="24"/>
-<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="8.4995" y1="1" x2="8.4995" y2="23.0005">
-	<stop  offset="0" style="stop-color:#E7F4FC"/>
-	<stop  offset="1" style="stop-color:#DEEFFC"/>
-	<a:midPointStop  offset="0" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="1" style="stop-color:#DEEFFC"/>
-</linearGradient>
-<rect x="1" y="1" style="fill:url(#SVGID_8_);" width="15" height="22"/>
-<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="8.4995" y1="2" x2="8.4995" y2="22.0005">
-	<stop  offset="0" style="stop-color:#CEE9F9"/>
-	<stop  offset="1" style="stop-color:#BBDFF8"/>
-	<a:midPointStop  offset="0" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="1" style="stop-color:#BBDFF8"/>
-</linearGradient>
-<rect x="2" y="2" style="fill:url(#SVGID_9_);" width="13" height="20"/>
-<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="17.5" y1="2" x2="17.5" y2="8">
-	<stop  offset="0" style="stop-color:#76A1F0"/>
-	<stop  offset="1" style="stop-color:#6B90D5"/>
-	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
-</linearGradient>
-<rect x="15" y="2" style="fill:url(#SVGID_10_);" width="5" height="6"/>
-<linearGradient id="SVGID_11_" gradientUnits="userSpaceOnUse" x1="17.5" y1="3" x2="17.5" y2="7">
-	<stop  offset="0" style="stop-color:#BBE0F7"/>
-	<stop  offset="1" style="stop-color:#82B4FB"/>
-	<a:midPointStop  offset="0" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="1" style="stop-color:#82B4FB"/>
-</linearGradient>
-<rect x="16" y="3" style="fill:url(#SVGID_11_);" width="3" height="4"/>
-<linearGradient id="SVGID_12_" gradientUnits="userSpaceOnUse" x1="17.5" y1="4" x2="17.5" y2="6">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<rect x="17" y="4" style="fill:url(#SVGID_12_);" width="1" height="2"/>
-<linearGradient id="SVGID_13_" gradientUnits="userSpaceOnUse" x1="12.4248" y1="10.7285" x2="12.4248" y2="15.9702">
-	<stop  offset="0" style="stop-color:#76A1F0"/>
-	<stop  offset="5.472010e-02" style="stop-color:#739DE9"/>
-	<stop  offset="0.2045" style="stop-color:#6F95DE"/>
-	<stop  offset="0.4149" style="stop-color:#6C91D7"/>
-	<stop  offset="1" style="stop-color:#6B90D5"/>
-	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="0.13" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
-</linearGradient>
-<path style="fill:url(#SVGID_13_);" d="M12.7,15.2C12,15.7,11.5,16,11,16c-0.3,0-0.5-0.1-0.7-0.3C10.1,15.5,10,15.3,10,15
-	c0-0.4,0.2-0.7,0.5-1c0.3-0.3,1-0.7,2.2-1.2v-0.5c0-0.4,0-0.6-0.1-0.7c0-0.1-0.1-0.2-0.2-0.3c-0.1-0.1-0.2-0.1-0.4-0.1
-	c-0.2,0-0.4,0.1-0.6,0.2c-0.1,0.1-0.1,0.1-0.1,0.2c0,0.1,0,0.2,0.2,0.3c0.1,0.2,0.2,0.3,0.2,0.4c0,0.2-0.1,0.3-0.2,0.4
-	c-0.1,0.1-0.3,0.2-0.5,0.2c-0.2,0-0.4-0.1-0.6-0.2s-0.2-0.3-0.2-0.5c0-0.3,0.1-0.5,0.3-0.7c0.2-0.2,0.5-0.4,0.9-0.5s0.7-0.2,1.1-0.2
-	c0.5,0,0.9,0.1,1.1,0.3c0.3,0.2,0.5,0.4,0.5,0.7c0.1,0.2,0.1,0.5,0.1,1v1.9c0,0.2,0,0.4,0,0.4c0,0.1,0,0.1,0.1,0.1c0,0,0.1,0,0.1,0
-	c0.1,0,0.2-0.1,0.3-0.2l0.2,0.1c-0.2,0.3-0.4,0.5-0.6,0.6c-0.2,0.1-0.4,0.2-0.7,0.2c-0.3,0-0.5-0.1-0.7-0.2
-	C12.8,15.6,12.7,15.4,12.7,15.2z M12.7,14.8v-1.7c-0.4,0.3-0.8,0.5-1,0.8c-0.1,0.2-0.2,0.4-0.2,0.6c0,0.2,0.1,0.3,0.2,0.4
-	c0.1,0.1,0.2,0.1,0.4,0.1C12.2,15.1,12.4,15,12.7,14.8z"/>
-<linearGradient id="SVGID_14_" gradientUnits="userSpaceOnUse" x1="6.3535" y1="8.2671" x2="6.3535" y2="15.7007">
-	<stop  offset="0" style="stop-color:#76A1F0"/>
-	<stop  offset="5.472010e-02" style="stop-color:#739DE9"/>
-	<stop  offset="0.2045" style="stop-color:#6F95DE"/>
-	<stop  offset="0.4149" style="stop-color:#6C91D7"/>
-	<stop  offset="1" style="stop-color:#6B90D5"/>
-	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="0.13" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
-</linearGradient>
-<path style="fill:url(#SVGID_14_);" d="M7,13.6H4.4l-0.3,0.7c-0.1,0.2-0.2,0.4-0.2,0.6c0,0.2,0.1,0.4,0.2,0.5
-	c0.1,0.1,0.3,0.1,0.7,0.1v0.2H2.5v-0.2c0.3,0,0.5-0.1,0.6-0.3c0.2-0.2,0.4-0.5,0.6-1.1l2.6-5.8h0.1l2.6,6c0.2,0.6,0.5,0.9,0.6,1.1
-	c0.1,0.1,0.3,0.2,0.5,0.2v0.2H6.7v-0.2h0.1c0.3,0,0.5,0,0.6-0.1c0.1-0.1,0.1-0.1,0.1-0.2c0-0.1,0-0.1,0-0.2c0,0-0.1-0.2-0.2-0.4
-	L7,13.6z M6.8,13.2l-1.1-2.5l-1.1,2.5H6.8z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="-2 0 24 24" style="overflow:visible;enable-background:new -2 0 24 24" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="17.5" y1="16" x2="17.5" y2="22"><stop offset="0" style="stop-color:#db6d17"/><stop offset="1" style="stop-color:#bf3b08"/></linearGradient><path style="fill:url(#a)" d="M15 16h5v6h-5z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="17.5" y1="17" x2="17.5" y2="21"><stop offset="0" style="stop-color:#f6a55e"/><stop offset="1" style="stop-color:#ea5b03"/></linearGradient><path style="fill:url(#b)" d="M16 17h3v4h-3z"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="17.5" y1="18" x2="17.5" y2="20"><stop offset="0" style="stop-color:#f17219"/><stop offset="1" style="stop-color:#ea5b03"/></linearGradient><path style="fill:url(#c)" d="M17 18h1v2h-1z"/><linearGradient id="d" gradientUnits="userSpaceOnUse" x1="17.5" y1="9" x2="17.5" y2="15.001"><stop offset="0" style="stop-color:#90c50e"/><stop offset="1" style="stop-color:#70a034"/></linearGradient><path style="fill:url(#d)" d="M15 9h5v6h-5z"/><linearGradient id="e" gradientUnits="userSpaceOnUse" x1="17.5" y1="10" x2="17.5" y2="14.001"><stop offset="0" style="stop-color:#d9f991"/><stop offset=".239" style="stop-color:#d7f88d"/><stop offset=".45" style="stop-color:#d1f383"/><stop offset=".651" style="stop-color:#c6ec71"/><stop offset=".844" style="stop-color:#b7e257"/><stop offset="1" style="stop-color:#a8d73d"/></linearGradient><path style="fill:url(#e)" d="M16 10h3v4h-3z"/><linearGradient id="f" gradientUnits="userSpaceOnUse" x1="17.5" y1="11" x2="17.5" y2="13"><stop offset="0" style="stop-color:#b3e810"/><stop offset="1" style="stop-color:#90c60d"/></linearGradient><path style="fill:url(#f)" d="M17 11h1v2h-1z"/><linearGradient id="g" gradientUnits="userSpaceOnUse" x1="8.499" y1="0" x2="8.499" y2="24"><stop offset="0" style="stop-color:#95bff8"/><stop offset=".557" style="stop-color:#84adef"/><stop offset="1" style="stop-color:#7ca4eb"/></linearGradient><path style="fill:url(#g)" d="M0 0h17v24H0z"/><linearGradient id="h" gradientUnits="userSpaceOnUse" x1="8.499" y1="1" x2="8.499" y2="23"><stop offset="0" style="stop-color:#e7f4fc"/><stop offset="1" style="stop-color:#deeffc"/></linearGradient><path style="fill:url(#h)" d="M1 1h15v22H1z"/><linearGradient id="i" gradientUnits="userSpaceOnUse" x1="8.499" y1="2" x2="8.499" y2="22"><stop offset="0" style="stop-color:#cee9f9"/><stop offset="1" style="stop-color:#bbdff8"/></linearGradient><path style="fill:url(#i)" d="M2 2h13v20H2z"/><linearGradient id="j" gradientUnits="userSpaceOnUse" x1="17.5" y1="2" x2="17.5" y2="8"><stop offset="0" style="stop-color:#76a1f0"/><stop offset="1" style="stop-color:#6b90d5"/></linearGradient><path style="fill:url(#j)" d="M15 2h5v6h-5z"/><linearGradient id="k" gradientUnits="userSpaceOnUse" x1="17.5" y1="3" x2="17.5" y2="7"><stop offset="0" style="stop-color:#bbe0f7"/><stop offset="1" style="stop-color:#82b4fb"/></linearGradient><path style="fill:url(#k)" d="M16 3h3v4h-3z"/><linearGradient id="l" gradientUnits="userSpaceOnUse" x1="17.5" y1="4" x2="17.5" y2="6"><stop offset="0" style="stop-color:#95bff8"/><stop offset=".557" style="stop-color:#84adef"/><stop offset="1" style="stop-color:#7ca4eb"/></linearGradient><path style="fill:url(#l)" d="M17 4h1v2h-1z"/><linearGradient id="m" gradientUnits="userSpaceOnUse" x1="12.425" y1="10.729" x2="12.425" y2="15.97"><stop offset="0" style="stop-color:#76a1f0"/><stop offset=".055" style="stop-color:#739de9"/><stop offset=".204" style="stop-color:#6f95de"/><stop offset=".415" style="stop-color:#6c91d7"/><stop offset="1" style="stop-color:#6b90d5"/></linearGradient><path style="fill:url(#m)" d="M12.7 15.2c-.7.5-1.2.8-1.7.8-.3 0-.5-.1-.7-.3-.2-.2-.3-.4-.3-.7 0-.4.2-.7.5-1 .3-.3 1-.7 2.2-1.2v-.5c0-.4 0-.6-.1-.7 0-.1-.1-.2-.2-.3-.1-.1-.2-.1-.4-.1s-.4.1-.6.2c-.1.1-.1.1-.1.2s0 .2.2.3c.1.2.2.3.2.4 0 .2-.1.3-.2.4-.1.1-.3.2-.5.2s-.4-.1-.6-.2-.2-.3-.2-.5c0-.3.1-.5.3-.7.2-.2.5-.4.9-.5s.7-.2 1.1-.2c.5 0 .9.1 1.1.3.3.2.5.4.5.7.1.2.1.5.1 1v2.3c0 .1 0 .1.1.1h.1c.1 0 .2-.1.3-.2l.2.1c-.2.3-.4.5-.6.6-.2.1-.4.2-.7.2-.3 0-.5-.1-.7-.2-.1-.1-.2-.3-.2-.5zm0-.4v-1.7c-.4.3-.8.5-1 .8-.1.2-.2.4-.2.6 0 .2.1.3.2.4.1.1.2.1.4.1.1.1.3 0 .6-.2z"/><linearGradient id="n" gradientUnits="userSpaceOnUse" x1="6.354" y1="8.267" x2="6.354" y2="15.701"><stop offset="0" style="stop-color:#76a1f0"/><stop offset=".055" style="stop-color:#739de9"/><stop offset=".204" style="stop-color:#6f95de"/><stop offset=".415" style="stop-color:#6c91d7"/><stop offset="1" style="stop-color:#6b90d5"/></linearGradient><path style="fill:url(#n)" d="M7 13.6H4.4l-.3.7c-.1.2-.2.4-.2.6 0 .2.1.4.2.5.1.1.3.1.7.1v.2H2.5v-.2c.3 0 .5-.1.6-.3.2-.2.4-.5.6-1.1l2.6-5.8h.1l2.6 6c.2.6.5.9.6 1.1.1.1.3.2.5.2v.2H6.7v-.2h.1c.3 0 .5 0 .6-.1.1-.1.1-.1.1-.2v-.2l-.2-.4-.3-1.1zm-.2-.4-1.1-2.5-1.1 2.5h2.2z"/></svg>
diff --git a/src/assets/img/mod_legacy/imscp.svg b/src/assets/img/mod_legacy/imscp.svg
index 5589cd0c5..f5ccbebaf 100644
--- a/src/assets/img/mod_legacy/imscp.svg
+++ b/src/assets/img/mod_legacy/imscp.svg
@@ -1,156 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="0 -2 24 24" style="overflow:visible;enable-background:new 0 -2 24 24;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="18" y1="10" x2="18" y2="20.0005">
-	<stop  offset="0" style="stop-color:#F0A829"/>
-	<stop  offset="1" style="stop-color:#C7671A"/>
-	<a:midPointStop  offset="0" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="1" style="stop-color:#C7671A"/>
-</linearGradient>
-<rect x="13" y="10" style="fill:url(#SVGID_1_);" width="10" height="10"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="18" y1="11" x2="18" y2="19.0005">
-	<stop  offset="0" style="stop-color:#FFEBA8"/>
-	<stop  offset="1" style="stop-color:#F8BE27"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFEBA8"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFEBA8"/>
-	<a:midPointStop  offset="1" style="stop-color:#F8BE27"/>
-</linearGradient>
-<rect x="14" y="11" style="fill:url(#SVGID_2_);" width="8" height="8"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="18" y1="12" x2="18" y2="18">
-	<stop  offset="0" style="stop-color:#FFC30F"/>
-	<stop  offset="1" style="stop-color:#F5AE0D"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="1" style="stop-color:#F5AE0D"/>
-</linearGradient>
-<rect x="15" y="12" style="fill:url(#SVGID_3_);" width="6" height="6"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="18" y1="10" x2="18" y2="14.0005">
-	<stop  offset="0" style="stop-color:#F0A829"/>
-	<stop  offset="1" style="stop-color:#C7671A"/>
-	<a:midPointStop  offset="0" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="1" style="stop-color:#C7671A"/>
-</linearGradient>
-<rect x="12" y="10" style="fill:url(#SVGID_4_);" width="12" height="4"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="18" y1="11" x2="18" y2="13.0005">
-	<stop  offset="0" style="stop-color:#FFC30F"/>
-	<stop  offset="1" style="stop-color:#F5AE0D"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="1" style="stop-color:#F5AE0D"/>
-</linearGradient>
-<rect x="13" y="11" style="fill:url(#SVGID_5_);" width="10" height="2"/>
-<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="18" y1="10" x2="18" y2="16.4233">
-	<stop  offset="0" style="stop-color:#8D470D"/>
-	<stop  offset="1" style="stop-color:#7C3D09"/>
-	<a:midPointStop  offset="0" style="stop-color:#8D470D"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#8D470D"/>
-	<a:midPointStop  offset="1" style="stop-color:#7C3D09"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_6_);" points="17,10 17,11.7 17,15 17,16.4 18,15.5 19,16.4 19,15 19,11.7 19,10 "/>
-<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="6" y1="10" x2="6" y2="20.0005">
-	<stop  offset="0" style="stop-color:#F0A829"/>
-	<stop  offset="1" style="stop-color:#C7671A"/>
-	<a:midPointStop  offset="0" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="1" style="stop-color:#C7671A"/>
-</linearGradient>
-<rect x="1" y="10" style="fill:url(#SVGID_7_);" width="10" height="10"/>
-<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="6" y1="11" x2="6" y2="19.0005">
-	<stop  offset="0" style="stop-color:#FFEBA8"/>
-	<stop  offset="1" style="stop-color:#F8BE27"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFEBA8"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFEBA8"/>
-	<a:midPointStop  offset="1" style="stop-color:#F8BE27"/>
-</linearGradient>
-<rect x="2" y="11" style="fill:url(#SVGID_8_);" width="8" height="8"/>
-<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="6" y1="12" x2="6" y2="18">
-	<stop  offset="0" style="stop-color:#FFC30F"/>
-	<stop  offset="1" style="stop-color:#F5AE0D"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="1" style="stop-color:#F5AE0D"/>
-</linearGradient>
-<rect x="3" y="12" style="fill:url(#SVGID_9_);" width="6" height="6"/>
-<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="6" y1="10" x2="6" y2="14.0005">
-	<stop  offset="0" style="stop-color:#F0A829"/>
-	<stop  offset="1" style="stop-color:#C7671A"/>
-	<a:midPointStop  offset="0" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="1" style="stop-color:#C7671A"/>
-</linearGradient>
-<rect y="10" style="fill:url(#SVGID_10_);" width="12" height="4"/>
-<linearGradient id="SVGID_11_" gradientUnits="userSpaceOnUse" x1="6" y1="11" x2="6" y2="13.0005">
-	<stop  offset="0" style="stop-color:#FFC30F"/>
-	<stop  offset="1" style="stop-color:#F5AE0D"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="1" style="stop-color:#F5AE0D"/>
-</linearGradient>
-<rect x="1" y="11" style="fill:url(#SVGID_11_);" width="10" height="2"/>
-<linearGradient id="SVGID_12_" gradientUnits="userSpaceOnUse" x1="6" y1="10" x2="6" y2="16.4233">
-	<stop  offset="0" style="stop-color:#8D470D"/>
-	<stop  offset="1" style="stop-color:#7C3D09"/>
-	<a:midPointStop  offset="0" style="stop-color:#8D470D"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#8D470D"/>
-	<a:midPointStop  offset="1" style="stop-color:#7C3D09"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_12_);" points="5,10 5,11.7 5,15 5,16.4 6,15.5 7,16.4 7,15 7,11.7 7,10 "/>
-<linearGradient id="SVGID_13_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="0" x2="11.9995" y2="10">
-	<stop  offset="0" style="stop-color:#F0A829"/>
-	<stop  offset="1" style="stop-color:#C7671A"/>
-	<a:midPointStop  offset="0" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="1" style="stop-color:#C7671A"/>
-</linearGradient>
-<rect x="7" style="fill:url(#SVGID_13_);" width="10" height="10"/>
-<linearGradient id="SVGID_14_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="1" x2="11.9995" y2="9">
-	<stop  offset="0" style="stop-color:#FFEBA8"/>
-	<stop  offset="1" style="stop-color:#F8BE27"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFEBA8"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFEBA8"/>
-	<a:midPointStop  offset="1" style="stop-color:#F8BE27"/>
-</linearGradient>
-<rect x="8" y="1" style="fill:url(#SVGID_14_);" width="8" height="8"/>
-<linearGradient id="SVGID_15_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="2" x2="11.9995" y2="8">
-	<stop  offset="0" style="stop-color:#FFC30F"/>
-	<stop  offset="1" style="stop-color:#F5AE0D"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="1" style="stop-color:#F5AE0D"/>
-</linearGradient>
-<rect x="9" y="2" style="fill:url(#SVGID_15_);" width="6" height="6"/>
-<linearGradient id="SVGID_16_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="0" x2="11.9995" y2="4">
-	<stop  offset="0" style="stop-color:#F0A829"/>
-	<stop  offset="1" style="stop-color:#C7671A"/>
-	<a:midPointStop  offset="0" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="1" style="stop-color:#C7671A"/>
-</linearGradient>
-<rect x="6" style="fill:url(#SVGID_16_);" width="12" height="4"/>
-<linearGradient id="SVGID_17_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="1" x2="11.9995" y2="3">
-	<stop  offset="0" style="stop-color:#FFC30F"/>
-	<stop  offset="1" style="stop-color:#F5AE0D"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="1" style="stop-color:#F5AE0D"/>
-</linearGradient>
-<rect x="7" y="1" style="fill:url(#SVGID_17_);" width="10" height="2"/>
-<linearGradient id="SVGID_18_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="0" x2="11.9995" y2="6.4229">
-	<stop  offset="0" style="stop-color:#8D470D"/>
-	<stop  offset="1" style="stop-color:#7C3D09"/>
-	<a:midPointStop  offset="0" style="stop-color:#8D470D"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#8D470D"/>
-	<a:midPointStop  offset="1" style="stop-color:#7C3D09"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_18_);" points="11,0 11,1.7 11,5 11,6.4 12,5.5 13,6.4 13,5 13,1.7 13,0 "/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 -2 24 24" style="overflow:visible;enable-background:new 0 -2 24 24" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="18" y1="10" x2="18" y2="20"><stop offset="0" style="stop-color:#f0a829"/><stop offset="1" style="stop-color:#c7671a"/></linearGradient><path style="fill:url(#a)" d="M13 10h10v10H13z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="18" y1="11" x2="18" y2="19"><stop offset="0" style="stop-color:#ffeba8"/><stop offset="1" style="stop-color:#f8be27"/></linearGradient><path style="fill:url(#b)" d="M14 11h8v8h-8z"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="18" y1="12" x2="18" y2="18"><stop offset="0" style="stop-color:#ffc30f"/><stop offset="1" style="stop-color:#f5ae0d"/></linearGradient><path style="fill:url(#c)" d="M15 12h6v6h-6z"/><linearGradient id="d" gradientUnits="userSpaceOnUse" x1="18" y1="10" x2="18" y2="14.001"><stop offset="0" style="stop-color:#f0a829"/><stop offset="1" style="stop-color:#c7671a"/></linearGradient><path style="fill:url(#d)" d="M12 10h12v4H12z"/><linearGradient id="e" gradientUnits="userSpaceOnUse" x1="18" y1="11" x2="18" y2="13.001"><stop offset="0" style="stop-color:#ffc30f"/><stop offset="1" style="stop-color:#f5ae0d"/></linearGradient><path style="fill:url(#e)" d="M13 11h10v2H13z"/><linearGradient id="f" gradientUnits="userSpaceOnUse" x1="18" y1="10" x2="18" y2="16.423"><stop offset="0" style="stop-color:#8d470d"/><stop offset="1" style="stop-color:#7c3d09"/></linearGradient><path style="fill:url(#f)" d="M17 10v6.4l1-.9 1 .9V10z"/><linearGradient id="g" gradientUnits="userSpaceOnUse" x1="6" y1="10" x2="6" y2="20"><stop offset="0" style="stop-color:#f0a829"/><stop offset="1" style="stop-color:#c7671a"/></linearGradient><path style="fill:url(#g)" d="M1 10h10v10H1z"/><linearGradient id="h" gradientUnits="userSpaceOnUse" x1="6" y1="11" x2="6" y2="19"><stop offset="0" style="stop-color:#ffeba8"/><stop offset="1" style="stop-color:#f8be27"/></linearGradient><path style="fill:url(#h)" d="M2 11h8v8H2z"/><linearGradient id="i" gradientUnits="userSpaceOnUse" x1="6" y1="12" x2="6" y2="18"><stop offset="0" style="stop-color:#ffc30f"/><stop offset="1" style="stop-color:#f5ae0d"/></linearGradient><path style="fill:url(#i)" d="M3 12h6v6H3z"/><linearGradient id="j" gradientUnits="userSpaceOnUse" x1="6" y1="10" x2="6" y2="14.001"><stop offset="0" style="stop-color:#f0a829"/><stop offset="1" style="stop-color:#c7671a"/></linearGradient><path style="fill:url(#j)" d="M0 10h12v4H0z"/><linearGradient id="k" gradientUnits="userSpaceOnUse" x1="6" y1="11" x2="6" y2="13.001"><stop offset="0" style="stop-color:#ffc30f"/><stop offset="1" style="stop-color:#f5ae0d"/></linearGradient><path style="fill:url(#k)" d="M1 11h10v2H1z"/><linearGradient id="l" gradientUnits="userSpaceOnUse" x1="6" y1="10" x2="6" y2="16.423"><stop offset="0" style="stop-color:#8d470d"/><stop offset="1" style="stop-color:#7c3d09"/></linearGradient><path style="fill:url(#l)" d="M5 10v6.4l1-.9 1 .9V10z"/><linearGradient id="m" gradientUnits="userSpaceOnUse" x1="11.999" y1="0" x2="11.999" y2="10"><stop offset="0" style="stop-color:#f0a829"/><stop offset="1" style="stop-color:#c7671a"/></linearGradient><path style="fill:url(#m)" d="M7 0h10v10H7z"/><linearGradient id="n" gradientUnits="userSpaceOnUse" x1="11.999" y1="1" x2="11.999" y2="9"><stop offset="0" style="stop-color:#ffeba8"/><stop offset="1" style="stop-color:#f8be27"/></linearGradient><path style="fill:url(#n)" d="M8 1h8v8H8z"/><linearGradient id="o" gradientUnits="userSpaceOnUse" x1="11.999" y1="2" x2="11.999" y2="8"><stop offset="0" style="stop-color:#ffc30f"/><stop offset="1" style="stop-color:#f5ae0d"/></linearGradient><path style="fill:url(#o)" d="M9 2h6v6H9z"/><linearGradient id="p" gradientUnits="userSpaceOnUse" x1="11.999" y1="0" x2="11.999" y2="4"><stop offset="0" style="stop-color:#f0a829"/><stop offset="1" style="stop-color:#c7671a"/></linearGradient><path style="fill:url(#p)" d="M6 0h12v4H6z"/><linearGradient id="q" gradientUnits="userSpaceOnUse" x1="11.999" y1="1" x2="11.999" y2="3"><stop offset="0" style="stop-color:#ffc30f"/><stop offset="1" style="stop-color:#f5ae0d"/></linearGradient><path style="fill:url(#q)" d="M7 1h10v2H7z"/><linearGradient id="r" gradientUnits="userSpaceOnUse" x1="11.999" y1="0" x2="11.999" y2="6.423"><stop offset="0" style="stop-color:#8d470d"/><stop offset="1" style="stop-color:#7c3d09"/></linearGradient><path style="fill:url(#r)" d="M11 0v6.4l1-.9 1 .9V0z"/></svg>
diff --git a/src/assets/img/mod_legacy/label.svg b/src/assets/img/mod_legacy/label.svg
index ac232fc58..c42c26477 100644
--- a/src/assets/img/mod_legacy/label.svg
+++ b/src/assets/img/mod_legacy/label.svg
@@ -1,94 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" style="overflow:visible;enable-background:new 0 0 24 24;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="11.9854" y1="0" x2="11.9854" y2="24.0161">
-	<stop  offset="0" style="stop-color:#F0A829"/>
-	<stop  offset="1" style="stop-color:#C7671A"/>
-	<a:midPointStop  offset="0" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="1" style="stop-color:#C7671A"/>
-</linearGradient>
-<path style="fill:url(#SVGID_1_);" d="M14.4,0L0.6,13.9c-0.8,0.8-0.8,2.1,0,2.8l6.7,6.7c0.8,0.8,2,0.8,2.8,0L24,9.6V0H14.4z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="11.9854" y1="1" x2="11.9854" y2="23.0161">
-	<stop  offset="0" style="stop-color:#FFEBA8"/>
-	<stop  offset="1" style="stop-color:#F8BE27"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFEBA8"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFEBA8"/>
-	<a:midPointStop  offset="1" style="stop-color:#F8BE27"/>
-</linearGradient>
-<path style="fill:url(#SVGID_2_);" d="M8.7,23c-0.3,0-0.5-0.1-0.7-0.3L1.3,16C1.1,15.8,1,15.6,1,15.3c0-0.3,0.1-0.5,0.3-0.7L14.9,1
-	H23v8.2L9.4,22.7C9.2,22.9,9,23,8.7,23C8.7,23,8.7,23,8.7,23z"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="11.9844" y1="2" x2="11.9844" y2="22.0142">
-	<stop  offset="0" style="stop-color:#FFC30F"/>
-	<stop  offset="1" style="stop-color:#F5AE0D"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="1" style="stop-color:#F5AE0D"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_3_);" points="2,15.3 15.3,2 22,2 22,8.8 8.7,22 "/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="8.7197" y1="9.9688" x2="8.7197" y2="20.6313">
-	<stop  offset="0" style="stop-color:#76A1F0"/>
-	<stop  offset="1" style="stop-color:#6B90D5"/>
-	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_4_);" points="3.4,15.3 8.7,10 14.1,15.3 8.7,20.6 "/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="11.1465" y1="22.0312" x2="11.1465" y2="23.8711" gradientTransform="matrix(0.7071 -0.7071 0.7071 0.7071 -14.0909 8.2514)">
-	<stop  offset="0" style="stop-color:#57C3F6"/>
-	<stop  offset="0.1648" style="stop-color:#83D3F8"/>
-	<stop  offset="0.3554" style="stop-color:#AFE3FB"/>
-	<stop  offset="0.5396" style="stop-color:#D2EFFD"/>
-	<stop  offset="0.7128" style="stop-color:#EBF8FE"/>
-	<stop  offset="0.8709" style="stop-color:#FAFDFF"/>
-	<stop  offset="1" style="stop-color:#FFFFFF"/>
-	<a:midPointStop  offset="0" style="stop-color:#57C3F6"/>
-	<a:midPointStop  offset="0.3354" style="stop-color:#57C3F6"/>
-	<a:midPointStop  offset="1" style="stop-color:#FFFFFF"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_5_);" points="7.4,17.9 8.7,19.2 12.6,15.3 11.3,14 "/>
-<path style="fill:#F2EFD5;" d="M12.6,15.3L12.3,15c-0.3,0.2-0.8,0.5-1.4,1.1c-1.1,0.9-1,0.5-2,0.9c-0.4,0.2-0.9,0.6-1.4,1l1.2,1.2
-	L12.6,15.3z"/>
-<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="8.3882" y1="23.1035" x2="13.9038" y2="23.1035" gradientTransform="matrix(0.7071 -0.7071 0.7071 0.7071 -14.0909 8.2514)">
-	<stop  offset="0" style="stop-color:#F8E5B5"/>
-	<stop  offset="1" style="stop-color:#F9E5B6"/>
-	<a:midPointStop  offset="0" style="stop-color:#F8E5B5"/>
-	<a:midPointStop  offset="0.4451" style="stop-color:#F8E5B5"/>
-	<a:midPointStop  offset="1" style="stop-color:#F9E5B6"/>
-</linearGradient>
-<path style="fill:url(#SVGID_6_);" d="M12.6,15.3l-0.2-0.2c-0.4,0.2-0.6,0.6-1.3,1.2C10,17.2,10,16.6,9,17c-0.4,0.2-0.9,0.6-1.3,1.1
-	l1.1,1.1L12.6,15.3z"/>
-<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="12.1709" y1="17.6572" x2="10.1204" y2="22.7323" gradientTransform="matrix(0.7071 -0.7071 0.7071 0.7071 -14.0909 8.2514)">
-	<stop  offset="0" style="stop-color:#57C3F6"/>
-	<stop  offset="4.801393e-03" style="stop-color:#59C4F6"/>
-	<stop  offset="0.1237" style="stop-color:#85D3F8"/>
-	<stop  offset="0.2474" style="stop-color:#AAE1FA"/>
-	<stop  offset="0.376" style="stop-color:#C9ECFC"/>
-	<stop  offset="0.51" style="stop-color:#E1F4FD"/>
-	<stop  offset="0.6519" style="stop-color:#F2FAFE"/>
-	<stop  offset="0.807" style="stop-color:#FCFEFF"/>
-	<stop  offset="1" style="stop-color:#FFFFFF"/>
-	<a:midPointStop  offset="0" style="stop-color:#57C3F6"/>
-	<a:midPointStop  offset="0.25" style="stop-color:#57C3F6"/>
-	<a:midPointStop  offset="1" style="stop-color:#FFFFFF"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_7_);" points="4.8,15.3 7.4,17.9 11.3,14 8.7,11.4 "/>
-<path style="fill:#FFFFFF;" d="M9,11.6C8.7,11.8,8.7,12,8.7,12s-0.4-0.1-0.6,0.4c-0.1,0.4,0.3,0.5,0.3,0.5s0,0-0.1,0.1
-	c0,0.1,0.1,0.1,0.1,0.1s-0.2,0.1-0.1,0.4c0.1,0.3,0.3,0.3,0.3,0.3s-0.1,0.5,0.4,0.6c0.4,0.1,0.5-0.3,0.5-0.3s0.3,0,0.6-0.2
-	c0.3-0.2,0.4-0.5,0.4-0.5s0.1,0,0.2,0L9,11.6z"/>
-<path style="fill:#FFFFFF;" d="M7.9,14.5c0,0-0.1,0-0.2,0.1c0,0.1,0.1,0.2,0.1,0.2s0,0,0,0c0,0,0,0,0,0s-0.1,0,0,0.1
-	C7.8,15,7.9,15,7.9,15s0,0.1,0.1,0.2c0.1,0,0.1-0.1,0.1-0.1s0.1,0,0.2,0c0.1-0.1,0.1-0.1,0.1-0.1s0.1,0,0.1-0.1c0-0.1,0-0.2,0-0.2
-	s0.2,0,0.1-0.2c-0.1-0.1-0.2,0-0.2,0s-0.1-0.1-0.1-0.1c-0.1,0-0.1,0.1-0.1,0.1s0,0,0,0c0,0-0.1,0-0.1,0S8,14.3,7.9,14.3
-	C7.8,14.4,7.9,14.5,7.9,14.5z"/>
-<path style="fill:#FFFFFF;" d="M19.6,8.4l-5.5,5.5l-0.7-0.7l5.5-5.5L19.6,8.4z M17.5,6.3L12,11.8l0.7,0.7L18.2,7L17.5,6.3z
-	 M16.1,4.9l-5.5,5.5l0.7,0.7l5.5-5.5L16.1,4.9z"/>
-<ellipse style="fill:#FFFFFF;" cx="19.7" cy="4.3" rx="1.3" ry="1.3"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" style="overflow:visible;enable-background:new 0 0 24 24" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="11.985" y1="0" x2="11.985" y2="24.016"><stop offset="0" style="stop-color:#f0a829"/><stop offset="1" style="stop-color:#c7671a"/></linearGradient><path style="fill:url(#a)" d="M14.4 0 .6 13.9c-.8.8-.8 2.1 0 2.8l6.7 6.7c.8.8 2 .8 2.8 0L24 9.6V0h-9.6z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="11.985" y1="1" x2="11.985" y2="23.016"><stop offset="0" style="stop-color:#ffeba8"/><stop offset="1" style="stop-color:#f8be27"/></linearGradient><path style="fill:url(#b)" d="M8.7 23c-.3 0-.5-.1-.7-.3L1.3 16c-.2-.2-.3-.4-.3-.7 0-.3.1-.5.3-.7L14.9 1H23v8.2L9.4 22.7c-.2.2-.4.3-.7.3z"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="11.984" y1="2" x2="11.984" y2="22.014"><stop offset="0" style="stop-color:#ffc30f"/><stop offset="1" style="stop-color:#f5ae0d"/></linearGradient><path style="fill:url(#c)" d="M2 15.3 15.3 2H22v6.8L8.7 22z"/><linearGradient id="d" gradientUnits="userSpaceOnUse" x1="8.72" y1="9.969" x2="8.72" y2="20.631"><stop offset="0" style="stop-color:#76a1f0"/><stop offset="1" style="stop-color:#6b90d5"/></linearGradient><path style="fill:url(#d)" d="M3.4 15.3 8.7 10l5.4 5.3-5.4 5.3z"/><linearGradient id="e" gradientUnits="userSpaceOnUse" x1="11.146" y1="22.031" x2="11.146" y2="23.871" gradientTransform="rotate(-45.001 2.915 21.135)"><stop offset="0" style="stop-color:#57c3f6"/><stop offset=".165" style="stop-color:#83d3f8"/><stop offset=".355" style="stop-color:#afe3fb"/><stop offset=".54" style="stop-color:#d2effd"/><stop offset=".713" style="stop-color:#ebf8fe"/><stop offset=".871" style="stop-color:#fafdff"/><stop offset="1" style="stop-color:#fff"/></linearGradient><path style="fill:url(#e)" d="m7.4 17.9 1.3 1.3 3.9-3.9-1.3-1.3z"/><path style="fill:#f2efd5" d="m12.6 15.3-.3-.3c-.3.2-.8.5-1.4 1.1-1.1.9-1 .5-2 .9-.4.2-.9.6-1.4 1l1.2 1.2 3.9-3.9z"/><linearGradient id="f" gradientUnits="userSpaceOnUse" x1="8.388" y1="23.104" x2="13.904" y2="23.104" gradientTransform="rotate(-45.001 2.915 21.135)"><stop offset="0" style="stop-color:#f8e5b5"/><stop offset="1" style="stop-color:#f9e5b6"/></linearGradient><path style="fill:url(#f)" d="m12.6 15.3-.2-.2c-.4.2-.6.6-1.3 1.2-1.1.9-1.1.3-2.1.7-.4.2-.9.6-1.3 1.1l1.1 1.1 3.8-3.9z"/><linearGradient id="g" gradientUnits="userSpaceOnUse" x1="12.171" y1="17.657" x2="10.12" y2="22.732" gradientTransform="rotate(-45.001 2.915 21.135)"><stop offset="0" style="stop-color:#57c3f6"/><stop offset=".005" style="stop-color:#59c4f6"/><stop offset=".124" style="stop-color:#85d3f8"/><stop offset=".247" style="stop-color:#aae1fa"/><stop offset=".376" style="stop-color:#c9ecfc"/><stop offset=".51" style="stop-color:#e1f4fd"/><stop offset=".652" style="stop-color:#f2fafe"/><stop offset=".807" style="stop-color:#fcfeff"/><stop offset="1" style="stop-color:#fff"/></linearGradient><path style="fill:url(#g)" d="m4.8 15.3 2.6 2.6 3.9-3.9-2.6-2.6z"/><path style="fill:#fff" d="M9 11.6c-.3.2-.3.4-.3.4s-.4-.1-.6.4c-.1.4.3.5.3.5l-.1.1c0 .1.1.1.1.1s-.2.1-.1.4c.1.3.3.3.3.3s-.1.5.4.6c.4.1.5-.3.5-.3s.3 0 .6-.2.4-.5.4-.5h.2L9 11.6zM7.9 14.5s-.1 0-.2.1c0 .1.1.2.1.2s-.1 0 0 .1c0 .1.1.1.1.1s0 .1.1.2c.1 0 .1-.1.1-.1h.2l.1-.1s.1 0 .1-.1v-.2s.2 0 .1-.2c-.1-.1-.2 0-.2 0l-.1-.1c-.1 0-.1.1-.1.1h-.1s-.1-.2-.2-.2c-.1.1 0 .2 0 .2zM19.6 8.4l-5.5 5.5-.7-.7 5.5-5.5.7.7zm-2.1-2.1L12 11.8l.7.7L18.2 7l-.7-.7zm-1.4-1.4-5.5 5.5.7.7 5.5-5.5-.7-.7z"/><circle style="fill:#fff" cx="19.7" cy="4.3" r="1.3"/></svg>
diff --git a/src/assets/img/mod_legacy/lesson.svg b/src/assets/img/mod_legacy/lesson.svg
index 0a0e5dfd5..f32d1630f 100644
--- a/src/assets/img/mod_legacy/lesson.svg
+++ b/src/assets/img/mod_legacy/lesson.svg
@@ -1,126 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" style="overflow:visible;enable-background:new 0 0 24 24;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5.5" y1="10" x2="5.5" y2="14.0005">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<rect x="5" y="10" style="fill:url(#SVGID_1_);" width="1" height="4"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="15" y1="5" x2="15" y2="9">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_2_);" points="18,5 11,5 11,6 18,6 18,9 19,9 19,6 19,5 "/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="5.5" y1="14" x2="5.5" y2="24">
-	<stop  offset="0" style="stop-color:#76A1F0"/>
-	<stop  offset="1" style="stop-color:#6B90D5"/>
-	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
-</linearGradient>
-<path style="fill:url(#SVGID_3_);" d="M10,14H1c-0.6,0-1,0.4-1,1v1v7v1h1h9h1v-1v-7v-1C11,14.4,10.6,14,10,14z"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="5.5" y1="17" x2="5.5" y2="23">
-	<stop  offset="0" style="stop-color:#E7F4FC"/>
-	<stop  offset="1" style="stop-color:#DEEFFC"/>
-	<a:midPointStop  offset="0" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="1" style="stop-color:#DEEFFC"/>
-</linearGradient>
-<rect x="1" y="17" style="fill:url(#SVGID_4_);" width="9" height="6"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="5.5" y1="18" x2="5.5" y2="22">
-	<stop  offset="0" style="stop-color:#CEE9F9"/>
-	<stop  offset="1" style="stop-color:#BBDFF8"/>
-	<a:midPointStop  offset="0" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="1" style="stop-color:#BBDFF8"/>
-</linearGradient>
-<rect x="2" y="18" style="fill:url(#SVGID_5_);" width="7" height="4"/>
-<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="5.5" y1="15" x2="5.5" y2="16">
-	<stop  offset="0" style="stop-color:#BBE0F7"/>
-	<stop  offset="1" style="stop-color:#82B4FB"/>
-	<a:midPointStop  offset="0" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="1" style="stop-color:#82B4FB"/>
-</linearGradient>
-<rect x="1" y="15" style="fill:url(#SVGID_6_);" width="9" height="1"/>
-<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="18.5" y1="9" x2="18.5" y2="19.0005">
-	<stop  offset="0" style="stop-color:#76A1F0"/>
-	<stop  offset="1" style="stop-color:#6B90D5"/>
-	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
-</linearGradient>
-<path style="fill:url(#SVGID_7_);" d="M23,9h-9c-0.6,0-1,0.4-1,1v1v7v1h1h9h1v-1v-7v-1C24,9.4,23.6,9,23,9z"/>
-<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="18.5" y1="12" x2="18.5" y2="18.0005">
-	<stop  offset="0" style="stop-color:#E7F4FC"/>
-	<stop  offset="1" style="stop-color:#DEEFFC"/>
-	<a:midPointStop  offset="0" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="1" style="stop-color:#DEEFFC"/>
-</linearGradient>
-<rect x="14" y="12" style="fill:url(#SVGID_8_);" width="9" height="6"/>
-<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="18.5" y1="13" x2="18.5" y2="17.0005">
-	<stop  offset="0" style="stop-color:#CEE9F9"/>
-	<stop  offset="1" style="stop-color:#BBDFF8"/>
-	<a:midPointStop  offset="0" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="1" style="stop-color:#BBDFF8"/>
-</linearGradient>
-<rect x="15" y="13" style="fill:url(#SVGID_9_);" width="7" height="4"/>
-<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="18.5" y1="10" x2="18.5" y2="11">
-	<stop  offset="0" style="stop-color:#BBE0F7"/>
-	<stop  offset="1" style="stop-color:#82B4FB"/>
-	<a:midPointStop  offset="0" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="1" style="stop-color:#82B4FB"/>
-</linearGradient>
-<rect x="14" y="10" style="fill:url(#SVGID_10_);" width="9" height="1"/>
-<linearGradient id="SVGID_11_" gradientUnits="userSpaceOnUse" x1="5.5" y1="0" x2="5.5" y2="10">
-	<stop  offset="0" style="stop-color:#76A1F0"/>
-	<stop  offset="1" style="stop-color:#6B90D5"/>
-	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
-</linearGradient>
-<path style="fill:url(#SVGID_11_);" d="M10,0H1C0.4,0,0,0.4,0,1v1v7v1h1h9h1V9V2V1C11,0.4,10.6,0,10,0z"/>
-<linearGradient id="SVGID_12_" gradientUnits="userSpaceOnUse" x1="5.5" y1="3" x2="5.5" y2="9">
-	<stop  offset="0" style="stop-color:#E7F4FC"/>
-	<stop  offset="1" style="stop-color:#DEEFFC"/>
-	<a:midPointStop  offset="0" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="1" style="stop-color:#DEEFFC"/>
-</linearGradient>
-<rect x="1" y="3" style="fill:url(#SVGID_12_);" width="9" height="6"/>
-<linearGradient id="SVGID_13_" gradientUnits="userSpaceOnUse" x1="5.5" y1="4" x2="5.5" y2="8">
-	<stop  offset="0" style="stop-color:#CEE9F9"/>
-	<stop  offset="1" style="stop-color:#BBDFF8"/>
-	<a:midPointStop  offset="0" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="1" style="stop-color:#BBDFF8"/>
-</linearGradient>
-<rect x="2" y="4" style="fill:url(#SVGID_13_);" width="7" height="4"/>
-<linearGradient id="SVGID_14_" gradientUnits="userSpaceOnUse" x1="5.5" y1="1" x2="5.5" y2="2">
-	<stop  offset="0" style="stop-color:#BBE0F7"/>
-	<stop  offset="1" style="stop-color:#82B4FB"/>
-	<a:midPointStop  offset="0" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="1" style="stop-color:#82B4FB"/>
-</linearGradient>
-<rect x="1" y="1" style="fill:url(#SVGID_14_);" width="9" height="1"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" style="overflow:visible;enable-background:new 0 0 24 24" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="5.5" y1="10" x2="5.5" y2="14.001"><stop offset="0" style="stop-color:#95bff8"/><stop offset=".557" style="stop-color:#84adef"/><stop offset="1" style="stop-color:#7ca4eb"/></linearGradient><path style="fill:url(#a)" d="M5 10h1v4H5z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="15" y1="5" x2="15" y2="9"><stop offset="0" style="stop-color:#95bff8"/><stop offset=".557" style="stop-color:#84adef"/><stop offset="1" style="stop-color:#7ca4eb"/></linearGradient><path style="fill:url(#b)" d="M18 5h-7v1h7v3h1V5z"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="5.5" y1="14" x2="5.5" y2="24"><stop offset="0" style="stop-color:#76a1f0"/><stop offset="1" style="stop-color:#6b90d5"/></linearGradient><path style="fill:url(#c)" d="M10 14H1c-.6 0-1 .4-1 1v9h11v-9c0-.6-.4-1-1-1z"/><linearGradient id="d" gradientUnits="userSpaceOnUse" x1="5.5" y1="17" x2="5.5" y2="23"><stop offset="0" style="stop-color:#e7f4fc"/><stop offset="1" style="stop-color:#deeffc"/></linearGradient><path style="fill:url(#d)" d="M1 17h9v6H1z"/><linearGradient id="e" gradientUnits="userSpaceOnUse" x1="5.5" y1="18" x2="5.5" y2="22"><stop offset="0" style="stop-color:#cee9f9"/><stop offset="1" style="stop-color:#bbdff8"/></linearGradient><path style="fill:url(#e)" d="M2 18h7v4H2z"/><linearGradient id="f" gradientUnits="userSpaceOnUse" x1="5.5" y1="15" x2="5.5" y2="16"><stop offset="0" style="stop-color:#bbe0f7"/><stop offset="1" style="stop-color:#82b4fb"/></linearGradient><path style="fill:url(#f)" d="M1 15h9v1H1z"/><linearGradient id="g" gradientUnits="userSpaceOnUse" x1="18.5" y1="9" x2="18.5" y2="19"><stop offset="0" style="stop-color:#76a1f0"/><stop offset="1" style="stop-color:#6b90d5"/></linearGradient><path style="fill:url(#g)" d="M23 9h-9c-.6 0-1 .4-1 1v9h11v-9c0-.6-.4-1-1-1z"/><linearGradient id="h" gradientUnits="userSpaceOnUse" x1="18.5" y1="12" x2="18.5" y2="18"><stop offset="0" style="stop-color:#e7f4fc"/><stop offset="1" style="stop-color:#deeffc"/></linearGradient><path style="fill:url(#h)" d="M14 12h9v6h-9z"/><linearGradient id="i" gradientUnits="userSpaceOnUse" x1="18.5" y1="13" x2="18.5" y2="17"><stop offset="0" style="stop-color:#cee9f9"/><stop offset="1" style="stop-color:#bbdff8"/></linearGradient><path style="fill:url(#i)" d="M15 13h7v4h-7z"/><linearGradient id="j" gradientUnits="userSpaceOnUse" x1="18.5" y1="10" x2="18.5" y2="11"><stop offset="0" style="stop-color:#bbe0f7"/><stop offset="1" style="stop-color:#82b4fb"/></linearGradient><path style="fill:url(#j)" d="M14 10h9v1h-9z"/><linearGradient id="k" gradientUnits="userSpaceOnUse" x1="5.5" y1="0" x2="5.5" y2="10"><stop offset="0" style="stop-color:#76a1f0"/><stop offset="1" style="stop-color:#6b90d5"/></linearGradient><path style="fill:url(#k)" d="M10 0H1C.4 0 0 .4 0 1v9h11V1c0-.6-.4-1-1-1z"/><linearGradient id="l" gradientUnits="userSpaceOnUse" x1="5.5" y1="3" x2="5.5" y2="9"><stop offset="0" style="stop-color:#e7f4fc"/><stop offset="1" style="stop-color:#deeffc"/></linearGradient><path style="fill:url(#l)" d="M1 3h9v6H1z"/><linearGradient id="m" gradientUnits="userSpaceOnUse" x1="5.5" y1="4" x2="5.5" y2="8"><stop offset="0" style="stop-color:#cee9f9"/><stop offset="1" style="stop-color:#bbdff8"/></linearGradient><path style="fill:url(#m)" d="M2 4h7v4H2z"/><linearGradient id="n" gradientUnits="userSpaceOnUse" x1="5.5" y1="1" x2="5.5" y2="2"><stop offset="0" style="stop-color:#bbe0f7"/><stop offset="1" style="stop-color:#82b4fb"/></linearGradient><path style="fill:url(#n)" d="M1 1h9v1H1z"/></svg>
diff --git a/src/assets/img/mod_legacy/lti.svg b/src/assets/img/mod_legacy/lti.svg
index ebbbe3084..286a99aee 100644
--- a/src/assets/img/mod_legacy/lti.svg
+++ b/src/assets/img/mod_legacy/lti.svg
@@ -1,55 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" style="overflow:visible;enable-background:new 0 0 24 24;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="0" x2="11.9995" y2="24.001">
-	<stop  offset="0" style="stop-color:#90C50E"/>
-	<stop  offset="1" style="stop-color:#70A034"/>
-	<a:midPointStop  offset="0" style="stop-color:#90C50E"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#90C50E"/>
-	<a:midPointStop  offset="1" style="stop-color:#70A034"/>
-</linearGradient>
-<path style="fill:url(#SVGID_1_);" d="M21.1,12.3c1,0,1.7,0.9,1.7,0.9c0.3,0.4,0.7,0.8,0.9,0.8s0.3-0.5,0.3-1V8c0-0.5-0.5-1-1-1h-3
-	c-0.5,0-1-0.1-1-0.3c0-0.2,0.3-0.7,0.7-1.1c0,0,0.8-0.9,0.8-2.1C20.5,1.6,18.9,0,17,0s-3.5,1.6-3.5,3.5c0,1.2,0.8,2.1,0.8,2.1
-	C14.7,6,15,6.5,15,6.7C15,6.9,14.5,7,14,7H8C7.5,7,7,7.5,7,8v6c0,0.5-0.1,1-0.3,1S6,14.7,5.6,14.3c0,0-0.9-0.8-2.1-0.8
-	C1.6,13.5,0,15.1,0,17s1.6,3.5,3.5,3.5c1.2,0,2.1-0.8,2.1-0.8C6,19.3,6.5,19,6.7,19S7,19.5,7,20v3c0,0.5,0.5,1,1,1h4
-	c0.5,0,1-0.1,1-0.3s-0.3-0.6-0.7-1c0,0-0.6-0.6-0.6-1.6c0-1.4,1.3-2.5,2.7-2.5c1.4,0,2.4,1.1,2.4,2.5c0,1-0.9,1.7-0.9,1.7
-	c-0.4,0.3-0.8,0.7-0.8,0.9s0.5,0.3,1,0.3h7c0.5,0,1-0.5,1-1v-6c0-0.5-0.1-1-0.3-1s-0.6,0.3-1,0.7c0,0-0.6,0.6-1.6,0.6
-	c-1.4,0-2.5-1.3-2.5-2.7S19.7,12.3,21.1,12.3z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="1" x2="11.9995" y2="23.001">
-	<stop  offset="0" style="stop-color:#D9F991"/>
-	<stop  offset="0.2388" style="stop-color:#D7F88D"/>
-	<stop  offset="0.4501" style="stop-color:#D1F383"/>
-	<stop  offset="0.6509" style="stop-color:#C6EC71"/>
-	<stop  offset="0.844" style="stop-color:#B7E257"/>
-	<stop  offset="1" style="stop-color:#A8D73D"/>
-	<a:midPointStop  offset="0" style="stop-color:#D9F991"/>
-	<a:midPointStop  offset="0.7317" style="stop-color:#D9F991"/>
-	<a:midPointStop  offset="1" style="stop-color:#A8D73D"/>
-</linearGradient>
-<path style="fill:url(#SVGID_2_);" d="M17,23c0.4-0.4,0.7-1.1,0.7-1.9c0-2-1.5-3.5-3.4-3.5c-2,0-3.7,1.6-3.7,3.5
-	c0,0.9,0.3,1.5,0.6,1.9H8v-3c0-1.5-0.7-2-1.3-2c-0.6,0-1.3,0.6-1.7,0.9c0,0-0.7,0.6-1.5,0.6C2.1,19.5,1,18.4,1,17s1.1-2.5,2.5-2.5
-	c0.8,0,1.4,0.6,1.5,0.6C5.3,15.4,6.1,16,6.7,16C7.3,16,8,15.5,8,14V8h6c1.5,0,2-0.7,2-1.3c0-0.6-0.5-1.3-0.9-1.7
-	c0,0-0.6-0.7-0.6-1.5C14.5,2.1,15.6,1,17,1s2.5,1.1,2.5,2.5c0,0.8-0.6,1.5-0.6,1.5C18.5,5.4,18,6.1,18,6.7C18,7.3,18.5,8,20,8h3v4
-	c-0.4-0.4-1.1-0.7-1.9-0.7c-2,0-3.5,1.5-3.5,3.4c0,2,1.6,3.7,3.5,3.7c0.9,0,1.5-0.3,1.9-0.6V23H17z"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="2" x2="11.9995" y2="22.001">
-	<stop  offset="0" style="stop-color:#B3E810"/>
-	<stop  offset="1" style="stop-color:#90C60D"/>
-	<a:midPointStop  offset="0" style="stop-color:#B3E810"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#B3E810"/>
-	<a:midPointStop  offset="1" style="stop-color:#90C60D"/>
-</linearGradient>
-<path style="fill:url(#SVGID_3_);" d="M18.6,22c0.1-0.3,0.1-0.6,0.1-0.9c0-2.5-1.9-4.5-4.4-4.5c-2.5,0-4.7,2.1-4.7,4.5
-	c0,0.3,0,0.6,0.1,0.9H9v-2c0-2.1-1.2-3-2.3-3C7.8,17,9,16.1,9,14V9h5c2.1,0,3-1.2,3-2.3c0-0.7-0.4-1.5-1.2-2.4
-	c-0.1-0.1-0.3-0.5-0.3-0.8C15.5,2.7,16.2,2,17,2s1.5,0.7,1.5,1.5c0,0.3-0.3,0.7-0.3,0.8C17.4,5.2,17,6,17,6.7C17,7.8,17.9,9,20,9h2
-	v1.4c-0.3-0.1-0.6-0.1-0.9-0.1c-2.5,0-4.5,1.9-4.5,4.4c0,2.5,2.1,4.7,4.5,4.7c0.3,0,0.6,0,0.9-0.1V22H18.6z M3.5,18.5
-	C2.7,18.5,2,17.8,2,17s0.7-1.5,1.5-1.5c0.3,0,0.7,0.3,0.8,0.3C5.2,16.6,6,17,6.7,17c-0.7,0-1.5,0.4-2.4,1.2
-	C4.2,18.3,3.8,18.5,3.5,18.5z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" style="overflow:visible;enable-background:new 0 0 24 24" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="11.999" y1="0" x2="11.999" y2="24.001"><stop offset="0" style="stop-color:#90c50e"/><stop offset="1" style="stop-color:#70a034"/></linearGradient><path style="fill:url(#a)" d="M21.1 12.3c1 0 1.7.9 1.7.9.3.4.7.8.9.8s.3-.5.3-1V8c0-.5-.5-1-1-1h-3c-.5 0-1-.1-1-.3 0-.2.3-.7.7-1.1 0 0 .8-.9.8-2.1C20.5 1.6 18.9 0 17 0s-3.5 1.6-3.5 3.5c0 1.2.8 2.1.8 2.1.4.4.7.9.7 1.1 0 .2-.5.3-1 .3H8c-.5 0-1 .5-1 1v6c0 .5-.1 1-.3 1s-.7-.3-1.1-.7c0 0-.9-.8-2.1-.8C1.6 13.5 0 15.1 0 17s1.6 3.5 3.5 3.5c1.2 0 2.1-.8 2.1-.8.4-.4.9-.7 1.1-.7s.3.5.3 1v3c0 .5.5 1 1 1h4c.5 0 1-.1 1-.3s-.3-.6-.7-1c0 0-.6-.6-.6-1.6 0-1.4 1.3-2.5 2.7-2.5 1.4 0 2.4 1.1 2.4 2.5 0 1-.9 1.7-.9 1.7-.4.3-.8.7-.8.9s.5.3 1 .3h7c.5 0 1-.5 1-1v-6c0-.5-.1-1-.3-1s-.6.3-1 .7c0 0-.6.6-1.6.6-1.4 0-2.5-1.3-2.5-2.7s1-2.3 2.4-2.3z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="11.999" y1="1" x2="11.999" y2="23.001"><stop offset="0" style="stop-color:#d9f991"/><stop offset=".239" style="stop-color:#d7f88d"/><stop offset=".45" style="stop-color:#d1f383"/><stop offset=".651" style="stop-color:#c6ec71"/><stop offset=".844" style="stop-color:#b7e257"/><stop offset="1" style="stop-color:#a8d73d"/></linearGradient><path style="fill:url(#b)" d="M17 23c.4-.4.7-1.1.7-1.9 0-2-1.5-3.5-3.4-3.5-2 0-3.7 1.6-3.7 3.5 0 .9.3 1.5.6 1.9H8v-3c0-1.5-.7-2-1.3-2-.6 0-1.3.6-1.7.9 0 0-.7.6-1.5.6C2.1 19.5 1 18.4 1 17s1.1-2.5 2.5-2.5c.8 0 1.4.6 1.5.6.3.3 1.1.9 1.7.9.6 0 1.3-.5 1.3-2V8h6c1.5 0 2-.7 2-1.3 0-.6-.5-1.3-.9-1.7 0 0-.6-.7-.6-1.5C14.5 2.1 15.6 1 17 1s2.5 1.1 2.5 2.5c0 .8-.6 1.5-.6 1.5-.4.4-.9 1.1-.9 1.7 0 .6.5 1.3 2 1.3h3v4c-.4-.4-1.1-.7-1.9-.7-2 0-3.5 1.5-3.5 3.4 0 2 1.6 3.7 3.5 3.7.9 0 1.5-.3 1.9-.6V23h-6z"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="11.999" y1="2" x2="11.999" y2="22.001"><stop offset="0" style="stop-color:#b3e810"/><stop offset="1" style="stop-color:#90c60d"/></linearGradient><path style="fill:url(#c)" d="M18.6 22c.1-.3.1-.6.1-.9 0-2.5-1.9-4.5-4.4-4.5-2.5 0-4.7 2.1-4.7 4.5 0 .3 0 .6.1.9H9v-2c0-2.1-1.2-3-2.3-3 1.1 0 2.3-.9 2.3-3V9h5c2.1 0 3-1.2 3-2.3 0-.7-.4-1.5-1.2-2.4-.1-.1-.3-.5-.3-.8 0-.8.7-1.5 1.5-1.5s1.5.7 1.5 1.5c0 .3-.3.7-.3.8-.8.9-1.2 1.7-1.2 2.4 0 1.1.9 2.3 3 2.3h2v1.4c-.3-.1-.6-.1-.9-.1-2.5 0-4.5 1.9-4.5 4.4 0 2.5 2.1 4.7 4.5 4.7.3 0 .6 0 .9-.1V22h-3.4zM3.5 18.5c-.8 0-1.5-.7-1.5-1.5s.7-1.5 1.5-1.5c.3 0 .7.3.8.3.9.8 1.7 1.2 2.4 1.2-.7 0-1.5.4-2.4 1.2-.1.1-.5.3-.8.3z"/></svg>
diff --git a/src/assets/img/mod_legacy/page.svg b/src/assets/img/mod_legacy/page.svg
index eb7cae6c8..2126b6897 100644
--- a/src/assets/img/mod_legacy/page.svg
+++ b/src/assets/img/mod_legacy/page.svg
@@ -1,112 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="-2 0 24 24" style="overflow:visible;enable-background:new -2 0 24 24;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="9.9995" y1="0" x2="9.9995" y2="24.0005">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_1_);" points="12.5,0 11.5,0 1,0 0,0 0,24 1,24 19,24 20,24 20,7.9 "/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="9.9995" y1="1" x2="9.9995" y2="23.0005">
-	<stop  offset="0" style="stop-color:#E7F4FC"/>
-	<stop  offset="1" style="stop-color:#DEEFFC"/>
-	<a:midPointStop  offset="0" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="1" style="stop-color:#DEEFFC"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_2_);" points="12.1,1 11.1,1 2,1 1,1 1,23 2,23 18,23 19,23 19,8.3 "/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="9.9995" y1="2" x2="9.9995" y2="22.0005">
-	<stop  offset="0" style="stop-color:#CEE9F9"/>
-	<stop  offset="1" style="stop-color:#BBDFF8"/>
-	<a:midPointStop  offset="0" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="1" style="stop-color:#BBDFF8"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_3_);" points="11.6,2 10.6,2 3,2 2,2 2,22 3,22 17,22 18,22 18,8.7 "/>
-<path style="fill:#FFFFFF;" d="M16,21H4v-1h12V21z M16,18H4v1h12V18z M16,16H4v1h12V16z M16,14H4v1h12V14z"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="9.9995" y1="4" x2="9.9995" y2="12">
-	<stop  offset="0" style="stop-color:#76A1F0"/>
-	<stop  offset="1" style="stop-color:#6B90D5"/>
-	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_4_);" points="15.3,4 14.3,4 4,4 3,4 3,12 4,12 16,12 17,12 17,5.8 "/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="9.9995" y1="9" x2="9.9995" y2="11">
-	<stop  offset="0" style="stop-color:#57C3F6"/>
-	<stop  offset="0.1648" style="stop-color:#83D3F8"/>
-	<stop  offset="0.3554" style="stop-color:#AFE3FB"/>
-	<stop  offset="0.5396" style="stop-color:#D2EFFD"/>
-	<stop  offset="0.7128" style="stop-color:#EBF8FE"/>
-	<stop  offset="0.8709" style="stop-color:#FAFDFF"/>
-	<stop  offset="1" style="stop-color:#FFFFFF"/>
-	<a:midPointStop  offset="0" style="stop-color:#57C3F6"/>
-	<a:midPointStop  offset="0.3354" style="stop-color:#57C3F6"/>
-	<a:midPointStop  offset="1" style="stop-color:#FFFFFF"/>
-</linearGradient>
-<rect x="4" y="9" style="fill:url(#SVGID_5_);" width="12" height="2"/>
-<path style="fill:#F2EFD5;" d="M12.4,10.9c-0.5-0.2-1.1-0.3-2.7-0.4c-1.5-0.1-0.9-0.4-2-0.8C6.7,9.2,4,9.4,4,9.4V11h8.6
-	C12.6,11,12.5,10.9,12.4,10.9z"/>
-<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="4" y1="10.2476" x2="12.2959" y2="10.2476">
-	<stop  offset="0" style="stop-color:#F8E5B5"/>
-	<stop  offset="1" style="stop-color:#F9E5B6"/>
-	<a:midPointStop  offset="0" style="stop-color:#F8E5B5"/>
-	<a:midPointStop  offset="0.4451" style="stop-color:#F8E5B5"/>
-	<a:midPointStop  offset="1" style="stop-color:#F9E5B6"/>
-</linearGradient>
-<path style="fill:url(#SVGID_6_);" d="M9.7,10.7c-1.5-0.1-0.9-0.6-2-1c-1-0.4-3.7,0-3.7,0V11h8.3C11.5,11,11.2,10.8,9.7,10.7z"/>
-<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="12.5342" y1="1.5674" x2="8.163" y2="10.9413">
-	<stop  offset="0" style="stop-color:#57C3F6"/>
-	<stop  offset="0.2292" style="stop-color:#8AD5F9"/>
-	<stop  offset="0.4827" style="stop-color:#BCE7FB"/>
-	<stop  offset="0.705" style="stop-color:#E1F4FD"/>
-	<stop  offset="0.885" style="stop-color:#F7FCFF"/>
-	<stop  offset="1" style="stop-color:#FFFFFF"/>
-	<a:midPointStop  offset="0" style="stop-color:#57C3F6"/>
-	<a:midPointStop  offset="0.3902" style="stop-color:#57C3F6"/>
-	<a:midPointStop  offset="1" style="stop-color:#FFFFFF"/>
-</linearGradient>
-<rect x="4" y="5" style="fill:url(#SVGID_7_);" width="12" height="4"/>
-<path style="fill:#FFFFFF;" d="M11.2,5.6c0,0-0.2-0.4-0.7-0.2c-0.4,0.3-0.1,0.7-0.1,0.7s-0.1,0-0.1,0c-0.1,0,0,0.2,0,0.2
-	s-0.3,0-0.4,0.2C9.6,6.9,9.8,7,9.8,7S9.3,7.4,9.6,7.8c0.3,0.4,0.6,0.1,0.6,0.1s0.2,0.3,0.6,0.3c0.4,0.1,0.6-0.1,0.6-0.1
-	s0.3,0.2,0.5,0.1C12.4,8.2,12.5,8,12.5,8s0.6,0.3,0.8-0.3C13.4,7.3,13,7.1,13,7.1s0.1-0.4-0.2-0.6s-0.6,0-0.6,0s0.1,0,0-0.1
-	c0-0.1-0.3-0.1-0.3-0.1s0.1-0.6-0.2-0.8C11.4,5.3,11.2,5.6,11.2,5.6z"/>
-<path style="fill:#FFFFFF;" d="M8.6,6.9c0,0-0.1-0.1-0.2,0C8.3,6.9,8.4,7,8.4,7s0,0,0,0c0,0,0,0,0,0s-0.1,0-0.1,0.1
-	c0,0.1,0,0.1,0,0.1s-0.1,0.1,0,0.2c0.1,0.1,0.2,0,0.2,0s0.1,0.1,0.2,0.1c0.1,0,0.2,0,0.2,0s0.1,0.1,0.2,0C9,7.6,9,7.6,9,7.6
-	s0.2,0.1,0.2-0.1c0-0.1-0.1-0.2-0.1-0.2s0-0.1-0.1-0.2c-0.1,0-0.2,0-0.2,0s0,0,0,0s-0.1,0-0.1,0s0-0.2-0.1-0.2
-	C8.7,6.8,8.6,6.9,8.6,6.9z"/>
-<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="15.2451" y1="0" x2="15.2451" y2="9.3594">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<path style="fill:url(#SVGID_8_);" d="M11,9c0,0,5.2-1.5,9,0.4c0-0.1,0-1.5,0-1.5L12.5,0c0,0-1.8,0-2,0C13.1,3.7,11,9,11,9z"/>
-<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="12.3223" y1="7.5449" x2="15.4504" y2="4.4168">
-	<stop  offset="0" style="stop-color:#E7F4FC"/>
-	<stop  offset="0.5181" style="stop-color:#E5F3FC"/>
-	<stop  offset="0.7045" style="stop-color:#DEF0FB"/>
-	<stop  offset="0.8371" style="stop-color:#D3EBFA"/>
-	<stop  offset="0.872" style="stop-color:#CEE9F9"/>
-	<stop  offset="1" style="stop-color:#BDD8F0"/>
-	<a:midPointStop  offset="0" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="0.87" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="0.872" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="1" style="stop-color:#BDD8F0"/>
-</linearGradient>
-<path style="fill:url(#SVGID_9_);" d="M18.5,7.8c-0.9-0.2-2-0.3-3.1-0.3c-1.1,0-2.1,0.1-3,0.3c0.4-1.6,0.7-4.1-0.2-6.4L18.5,7.8z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="-2 0 24 24" style="overflow:visible;enable-background:new -2 0 24 24" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="9.999" y1="0" x2="9.999" y2="24"><stop offset="0" style="stop-color:#95bff8"/><stop offset=".557" style="stop-color:#84adef"/><stop offset="1" style="stop-color:#7ca4eb"/></linearGradient><path style="fill:url(#a)" d="M12.5 0H0v24h20V7.9z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="9.999" y1="1" x2="9.999" y2="23"><stop offset="0" style="stop-color:#e7f4fc"/><stop offset="1" style="stop-color:#deeffc"/></linearGradient><path style="fill:url(#b)" d="M12.1 1H1v22h18V8.3z"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="9.999" y1="2" x2="9.999" y2="22"><stop offset="0" style="stop-color:#cee9f9"/><stop offset="1" style="stop-color:#bbdff8"/></linearGradient><path style="fill:url(#c)" d="M11.6 2H2v20h16V8.7z"/><path style="fill:#fff" d="M16 21H4v-1h12v1zm0-3H4v1h12v-1zm0-2H4v1h12v-1zm0-2H4v1h12v-1z"/><linearGradient id="d" gradientUnits="userSpaceOnUse" x1="9.999" y1="4" x2="9.999" y2="12"><stop offset="0" style="stop-color:#76a1f0"/><stop offset="1" style="stop-color:#6b90d5"/></linearGradient><path style="fill:url(#d)" d="M15.3 4H3v8h14V5.8z"/><linearGradient id="e" gradientUnits="userSpaceOnUse" x1="9.999" y1="9" x2="9.999" y2="11"><stop offset="0" style="stop-color:#57c3f6"/><stop offset=".165" style="stop-color:#83d3f8"/><stop offset=".355" style="stop-color:#afe3fb"/><stop offset=".54" style="stop-color:#d2effd"/><stop offset=".713" style="stop-color:#ebf8fe"/><stop offset=".871" style="stop-color:#fafdff"/><stop offset="1" style="stop-color:#fff"/></linearGradient><path style="fill:url(#e)" d="M4 9h12v2H4z"/><path style="fill:#f2efd5" d="M12.4 10.9c-.5-.2-1.1-.3-2.7-.4-1.5-.1-.9-.4-2-.8-1-.5-3.7-.3-3.7-.3V11h8.6s-.1-.1-.2-.1z"/><linearGradient id="f" gradientUnits="userSpaceOnUse" x1="4" y1="10.248" x2="12.296" y2="10.248"><stop offset="0" style="stop-color:#f8e5b5"/><stop offset="1" style="stop-color:#f9e5b6"/></linearGradient><path style="fill:url(#f)" d="M9.7 10.7c-1.5-.1-.9-.6-2-1-1-.4-3.7 0-3.7 0V11h8.3c-.8 0-1.1-.2-2.6-.3z"/><linearGradient id="g" gradientUnits="userSpaceOnUse" x1="12.534" y1="1.567" x2="8.163" y2="10.941"><stop offset="0" style="stop-color:#57c3f6"/><stop offset=".229" style="stop-color:#8ad5f9"/><stop offset=".483" style="stop-color:#bce7fb"/><stop offset=".705" style="stop-color:#e1f4fd"/><stop offset=".885" style="stop-color:#f7fcff"/><stop offset="1" style="stop-color:#fff"/></linearGradient><path style="fill:url(#g)" d="M4 5h12v4H4z"/><path style="fill:#fff" d="M11.2 5.6s-.2-.4-.7-.2c-.4.3-.1.7-.1.7h-.1c-.1 0 0 .2 0 .2s-.3 0-.4.2c-.3.4-.1.5-.1.5s-.5.4-.2.8.6.1.6.1.2.3.6.3c.4.1.6-.1.6-.1s.3.2.5.1c.5 0 .6-.2.6-.2s.6.3.8-.3c.1-.4-.3-.6-.3-.6s.1-.4-.2-.6-.6 0-.6 0 .1 0 0-.1c0-.1-.3-.1-.3-.1s.1-.6-.2-.8c-.3-.2-.5.1-.5.1zM8.6 6.9s-.1-.1-.2 0c-.1 0 0 .1 0 .1s-.1 0-.1.1v.1s-.1.1 0 .2.2 0 .2 0 .1.1.2.1h.2s.1.1.2 0l-.1.1s.2.1.2-.1c0-.1-.1-.2-.1-.2s0-.1-.1-.2H8.7s0-.2-.1-.2c.1-.1 0 0 0 0z"/><linearGradient id="h" gradientUnits="userSpaceOnUse" x1="15.245" y1="0" x2="15.245" y2="9.359"><stop offset="0" style="stop-color:#95bff8"/><stop offset=".557" style="stop-color:#84adef"/><stop offset="1" style="stop-color:#7ca4eb"/></linearGradient><path style="fill:url(#h)" d="M11 9s5.2-1.5 9 .4V7.9L12.5 0h-2c2.6 3.7.5 9 .5 9z"/><linearGradient id="i" gradientUnits="userSpaceOnUse" x1="12.322" y1="7.545" x2="15.45" y2="4.417"><stop offset="0" style="stop-color:#e7f4fc"/><stop offset=".518" style="stop-color:#e5f3fc"/><stop offset=".705" style="stop-color:#def0fb"/><stop offset=".837" style="stop-color:#d3ebfa"/><stop offset=".872" style="stop-color:#cee9f9"/><stop offset="1" style="stop-color:#bdd8f0"/></linearGradient><path style="fill:url(#i)" d="M18.5 7.8c-.9-.2-2-.3-3.1-.3s-2.1.1-3 .3c.4-1.6.7-4.1-.2-6.4l6.3 6.4z"/></svg>
diff --git a/src/assets/img/mod_legacy/quiz.svg b/src/assets/img/mod_legacy/quiz.svg
index 90473416f..d4de83074 100644
--- a/src/assets/img/mod_legacy/quiz.svg
+++ b/src/assets/img/mod_legacy/quiz.svg
@@ -1,90 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" style="overflow:visible;enable-background:new 0 0 24 24;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="11.9565" y1="0" x2="11.9565" y2="24.0005">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_1_);" points="14.4,0 13.4,0 3,0 2,0 2,24 3,24 21,24 22,24 22,7.9 "/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="11.9565" y1="1" x2="11.9565" y2="23.0005">
-	<stop  offset="0" style="stop-color:#E7F4FC"/>
-	<stop  offset="1" style="stop-color:#DEEFFC"/>
-	<a:midPointStop  offset="0" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="1" style="stop-color:#DEEFFC"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_2_);" points="14,1 13,1 4,1 3,1 3,23 4,23 20,23 21,23 21,8.3 "/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="11.9565" y1="2" x2="11.9565" y2="22.0005">
-	<stop  offset="0" style="stop-color:#CEE9F9"/>
-	<stop  offset="1" style="stop-color:#BBDFF8"/>
-	<a:midPointStop  offset="0" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="1" style="stop-color:#BBDFF8"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_3_);" points="13.6,2 12.6,2 5,2 4,2 4,22 5,22 19,22 20,22 20,8.7 "/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="17.2021" y1="0" x2="17.2021" y2="9.3594">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<path style="fill:url(#SVGID_4_);" d="M13,9c0,0,5.2-1.5,9,0.4c0-0.1,0-1.5,0-1.5L14.4,0c0,0-1.8,0-2,0C15.1,3.7,13,9,13,9z"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="14.2793" y1="7.5449" x2="17.4074" y2="4.4168">
-	<stop  offset="0" style="stop-color:#E7F4FC"/>
-	<stop  offset="0.5181" style="stop-color:#E5F3FC"/>
-	<stop  offset="0.7045" style="stop-color:#DEF0FB"/>
-	<stop  offset="0.8371" style="stop-color:#D3EBFA"/>
-	<stop  offset="0.872" style="stop-color:#CEE9F9"/>
-	<stop  offset="1" style="stop-color:#BDD8F0"/>
-	<a:midPointStop  offset="0" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="0.87" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="0.872" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="1" style="stop-color:#BDD8F0"/>
-</linearGradient>
-<path style="fill:url(#SVGID_5_);" d="M20.4,7.8c-0.9-0.2-2-0.3-3.1-0.3c-1.1,0-2.1,0.1-3,0.3c0.4-1.6,0.7-4.1-0.2-6.4L20.4,7.8z"/>
-<g>
-	<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="11.8569" y1="1.8521" x2="11.8569" y2="23.9487">
-		<stop  offset="0" style="stop-color:#DB6D17"/>
-		<stop  offset="1" style="stop-color:#BF3B08"/>
-		<a:midPointStop  offset="0" style="stop-color:#DB6D17"/>
-		<a:midPointStop  offset="0.5" style="stop-color:#DB6D17"/>
-		<a:midPointStop  offset="1" style="stop-color:#BF3B08"/>
-	</linearGradient>
-	<polygon style="fill:url(#SVGID_6_);" points="8,16.9 3.2,11.9 0,15.1 8.8,23.9 23.7,1.9 	"/>
-</g>
-<g>
-	<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="9.5522" y1="9.0078" x2="9.5522" y2="22.3833">
-		<stop  offset="0" style="stop-color:#F6A55E"/>
-		<stop  offset="1" style="stop-color:#EA5B03"/>
-		<a:midPointStop  offset="0" style="stop-color:#F6A55E"/>
-		<a:midPointStop  offset="0.5" style="stop-color:#F6A55E"/>
-		<a:midPointStop  offset="1" style="stop-color:#EA5B03"/>
-	</linearGradient>
-	<polygon style="fill:url(#SVGID_7_);" points="1.4,15.1 3.2,13.4 7.9,18.4 17.7,9 8.7,22.4 	"/>
-</g>
-<g>
-	<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="7.2485" y1="14.7998" x2="7.2485" y2="20.8174">
-		<stop  offset="0" style="stop-color:#F17219"/>
-		<stop  offset="1" style="stop-color:#EA5B03"/>
-		<a:midPointStop  offset="0" style="stop-color:#F17219"/>
-		<a:midPointStop  offset="0.5" style="stop-color:#F17219"/>
-		<a:midPointStop  offset="1" style="stop-color:#EA5B03"/>
-	</linearGradient>
-	<polygon style="fill:url(#SVGID_8_);" points="2.8,15.1 3.1,14.8 7.9,19.8 11.7,16.2 8.5,20.8 	"/>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" style="overflow:visible;enable-background:new 0 0 24 24" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="11.957" y1="0" x2="11.957" y2="24"><stop offset="0" style="stop-color:#95bff8"/><stop offset=".557" style="stop-color:#84adef"/><stop offset="1" style="stop-color:#7ca4eb"/></linearGradient><path style="fill:url(#a)" d="M14.4 0H2v24h20V7.9z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="11.957" y1="1" x2="11.957" y2="23"><stop offset="0" style="stop-color:#e7f4fc"/><stop offset="1" style="stop-color:#deeffc"/></linearGradient><path style="fill:url(#b)" d="M14 1H3v22h18V8.3z"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="11.957" y1="2" x2="11.957" y2="22"><stop offset="0" style="stop-color:#cee9f9"/><stop offset="1" style="stop-color:#bbdff8"/></linearGradient><path style="fill:url(#c)" d="M13.6 2H4v20h16V8.7z"/><linearGradient id="d" gradientUnits="userSpaceOnUse" x1="17.202" y1="0" x2="17.202" y2="9.359"><stop offset="0" style="stop-color:#95bff8"/><stop offset=".557" style="stop-color:#84adef"/><stop offset="1" style="stop-color:#7ca4eb"/></linearGradient><path style="fill:url(#d)" d="M13 9s5.2-1.5 9 .4V7.9L14.4 0h-2c2.7 3.7.6 9 .6 9z"/><linearGradient id="e" gradientUnits="userSpaceOnUse" x1="14.279" y1="7.545" x2="17.407" y2="4.417"><stop offset="0" style="stop-color:#e7f4fc"/><stop offset=".518" style="stop-color:#e5f3fc"/><stop offset=".705" style="stop-color:#def0fb"/><stop offset=".837" style="stop-color:#d3ebfa"/><stop offset=".872" style="stop-color:#cee9f9"/><stop offset="1" style="stop-color:#bdd8f0"/></linearGradient><path style="fill:url(#e)" d="M20.4 7.8c-.9-.2-2-.3-3.1-.3s-2.1.1-3 .3c.4-1.6.7-4.1-.2-6.4l6.3 6.4z"/><linearGradient id="f" gradientUnits="userSpaceOnUse" x1="11.857" y1="1.852" x2="11.857" y2="23.949"><stop offset="0" style="stop-color:#db6d17"/><stop offset="1" style="stop-color:#bf3b08"/></linearGradient><path style="fill:url(#f)" d="m8 16.9-4.8-5L0 15.1l8.8 8.8 14.9-22z"/><linearGradient id="g" gradientUnits="userSpaceOnUse" x1="9.552" y1="9.008" x2="9.552" y2="22.383"><stop offset="0" style="stop-color:#f6a55e"/><stop offset="1" style="stop-color:#ea5b03"/></linearGradient><path style="fill:url(#g)" d="m1.4 15.1 1.8-1.7 4.7 5L17.7 9l-9 13.4z"/><linearGradient id="h" gradientUnits="userSpaceOnUse" x1="7.248" y1="14.8" x2="7.248" y2="20.817"><stop offset="0" style="stop-color:#f17219"/><stop offset="1" style="stop-color:#ea5b03"/></linearGradient><path style="fill:url(#h)" d="m2.8 15.1.3-.3 4.8 5 3.8-3.6-3.2 4.6z"/></svg>
diff --git a/src/assets/img/mod_legacy/resource.svg b/src/assets/img/mod_legacy/resource.svg
index 2039a2ea2..3ee9bbe05 100644
--- a/src/assets/img/mod_legacy/resource.svg
+++ b/src/assets/img/mod_legacy/resource.svg
@@ -1,60 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="-3 0 24 24" style="overflow:visible;enable-background:new -3 0 24 24;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="9.4995" y1="0" x2="9.4995" y2="24.0005">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_1_);" points="11.5,0 0,0 0,24 19,24 19,7.9 "/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="9.4995" y1="1" x2="9.4995" y2="23.0005">
-	<stop  offset="0" style="stop-color:#E7F4FC"/>
-	<stop  offset="1" style="stop-color:#DEEFFC"/>
-	<a:midPointStop  offset="0" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="1" style="stop-color:#DEEFFC"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_2_);" points="1,23 1,1 11.1,1 18,8.3 18,23 "/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="9.4995" y1="2" x2="9.4995" y2="22.0005">
-	<stop  offset="0" style="stop-color:#CEE9F9"/>
-	<stop  offset="1" style="stop-color:#BBDFF8"/>
-	<a:midPointStop  offset="0" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="1" style="stop-color:#BBDFF8"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_3_);" points="2,22 2,2 10.6,2 17,8.7 17,22 "/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="14.2451" y1="0" x2="14.2451" y2="9.3594">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<path style="fill:url(#SVGID_4_);" d="M10,9c0,0,5.2-1.5,9,0.4c0-0.1,0-1.5,0-1.5L11.5,0c0,0-1.8,0-2,0C12.1,3.7,10,9,10,9z"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="11.3223" y1="7.5449" x2="14.4504" y2="4.4168">
-	<stop  offset="0" style="stop-color:#E7F4FC"/>
-	<stop  offset="0.5181" style="stop-color:#E5F3FC"/>
-	<stop  offset="0.7045" style="stop-color:#DEF0FB"/>
-	<stop  offset="0.8371" style="stop-color:#D3EBFA"/>
-	<stop  offset="0.872" style="stop-color:#CEE9F9"/>
-	<stop  offset="1" style="stop-color:#BDD8F0"/>
-	<a:midPointStop  offset="0" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="0.87" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="0.872" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="1" style="stop-color:#BDD8F0"/>
-</linearGradient>
-<path style="fill:url(#SVGID_5_);" d="M17.5,7.8c-0.9-0.2-2-0.3-3.1-0.3c-1.1,0-2.1,0.1-3,0.3c0.4-1.6,0.7-4.1-0.2-6.4L17.5,7.8z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="-3 0 24 24" style="overflow:visible;enable-background:new -3 0 24 24" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="9.499" y1="0" x2="9.499" y2="24"><stop offset="0" style="stop-color:#95bff8"/><stop offset=".557" style="stop-color:#84adef"/><stop offset="1" style="stop-color:#7ca4eb"/></linearGradient><path style="fill:url(#a)" d="M11.5 0H0v24h19V7.9z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="9.499" y1="1" x2="9.499" y2="23"><stop offset="0" style="stop-color:#e7f4fc"/><stop offset="1" style="stop-color:#deeffc"/></linearGradient><path style="fill:url(#b)" d="M1 23V1h10.1L18 8.3V23z"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="9.499" y1="2" x2="9.499" y2="22"><stop offset="0" style="stop-color:#cee9f9"/><stop offset="1" style="stop-color:#bbdff8"/></linearGradient><path style="fill:url(#c)" d="M2 22V2h8.6L17 8.7V22z"/><linearGradient id="d" gradientUnits="userSpaceOnUse" x1="14.245" y1="0" x2="14.245" y2="9.359"><stop offset="0" style="stop-color:#95bff8"/><stop offset=".557" style="stop-color:#84adef"/><stop offset="1" style="stop-color:#7ca4eb"/></linearGradient><path style="fill:url(#d)" d="M10 9s5.2-1.5 9 .4V7.9L11.5 0h-2c2.6 3.7.5 9 .5 9z"/><linearGradient id="e" gradientUnits="userSpaceOnUse" x1="11.322" y1="7.545" x2="14.45" y2="4.417"><stop offset="0" style="stop-color:#e7f4fc"/><stop offset=".518" style="stop-color:#e5f3fc"/><stop offset=".705" style="stop-color:#def0fb"/><stop offset=".837" style="stop-color:#d3ebfa"/><stop offset=".872" style="stop-color:#cee9f9"/><stop offset="1" style="stop-color:#bdd8f0"/></linearGradient><path style="fill:url(#e)" d="M17.5 7.8c-.9-.2-2-.3-3.1-.3s-2.1.1-3 .3c.4-1.6.7-4.1-.2-6.4l6.3 6.4z"/></svg>
diff --git a/src/assets/img/mod_legacy/scorm.svg b/src/assets/img/mod_legacy/scorm.svg
index 77891eca4..4d5617e2b 100644
--- a/src/assets/img/mod_legacy/scorm.svg
+++ b/src/assets/img/mod_legacy/scorm.svg
@@ -1,84 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="0 -2 24 24" style="overflow:visible;enable-background:new 0 -2 24 24;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="0" x2="11.9995" y2="20.0005">
-	<stop  offset="0" style="stop-color:#F0A829"/>
-	<stop  offset="1" style="stop-color:#C7671A"/>
-	<a:midPointStop  offset="0" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="1" style="stop-color:#C7671A"/>
-</linearGradient>
-<rect x="1" style="fill:url(#SVGID_1_);" width="22" height="20"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="1" x2="11.9995" y2="19.0005">
-	<stop  offset="0" style="stop-color:#FFEBA8"/>
-	<stop  offset="1" style="stop-color:#F8BE27"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFEBA8"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFEBA8"/>
-	<a:midPointStop  offset="1" style="stop-color:#F8BE27"/>
-</linearGradient>
-<rect x="2" y="1" style="fill:url(#SVGID_2_);" width="20" height="18"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="2" x2="11.9995" y2="18.0005">
-	<stop  offset="0" style="stop-color:#FFC30F"/>
-	<stop  offset="1" style="stop-color:#F5AE0D"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="1" style="stop-color:#F5AE0D"/>
-</linearGradient>
-<rect x="3" y="2" style="fill:url(#SVGID_3_);" width="18" height="16"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="0" x2="11.9995" y2="7">
-	<stop  offset="0" style="stop-color:#F0A829"/>
-	<stop  offset="1" style="stop-color:#C7671A"/>
-	<a:midPointStop  offset="0" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="1" style="stop-color:#C7671A"/>
-</linearGradient>
-<rect style="fill:url(#SVGID_4_);" width="24" height="7"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="1" x2="11.9995" y2="6">
-	<stop  offset="0" style="stop-color:#FFEBA8"/>
-	<stop  offset="1" style="stop-color:#F8BE27"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFEBA8"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFEBA8"/>
-	<a:midPointStop  offset="1" style="stop-color:#F8BE27"/>
-</linearGradient>
-<rect x="1" y="1" style="fill:url(#SVGID_5_);" width="22" height="5"/>
-<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="2" x2="11.9995" y2="5">
-	<stop  offset="0" style="stop-color:#FFC30F"/>
-	<stop  offset="1" style="stop-color:#F5AE0D"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="1" style="stop-color:#F5AE0D"/>
-</linearGradient>
-<rect x="2" y="2" style="fill:url(#SVGID_6_);" width="20" height="3"/>
-<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="11.4995" y1="0" x2="11.4995" y2="13.0005">
-	<stop  offset="0" style="stop-color:#8D470D"/>
-	<stop  offset="1" style="stop-color:#7C3D09"/>
-	<a:midPointStop  offset="0" style="stop-color:#8D470D"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#8D470D"/>
-	<a:midPointStop  offset="1" style="stop-color:#7C3D09"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_7_);" points="9,0 9,3 9,10 9,13 11.5,11 14,13 14,10 14,3 14,0 "/>
-<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="11.4995" y1="1" x2="11.4995" y2="10.9355">
-	<stop  offset="0" style="stop-color:#D58738"/>
-	<stop  offset="1" style="stop-color:#AB551F"/>
-	<a:midPointStop  offset="0" style="stop-color:#D58738"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#D58738"/>
-	<a:midPointStop  offset="1" style="stop-color:#AB551F"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_8_);" points="10,1 10,4 10,7.9 10,10.9 11.5,9.7 13,10.9 13,7.9 13,4 13,1 "/>
-<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="11.5" y1="2" x2="11.5" y2="8.8711">
-	<stop  offset="0" style="stop-color:#D0813A"/>
-	<stop  offset="1" style="stop-color:#AF551D"/>
-	<a:midPointStop  offset="0" style="stop-color:#D0813A"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#D0813A"/>
-	<a:midPointStop  offset="1" style="stop-color:#AF551D"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_9_);" points="11,2 11,5 11,5.8 11,8.8 11.5,8.4 12,8.9 12,5.9 12,5 12,2 "/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 -2 24 24" style="overflow:visible;enable-background:new 0 -2 24 24" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="11.999" y1="0" x2="11.999" y2="20"><stop offset="0" style="stop-color:#f0a829"/><stop offset="1" style="stop-color:#c7671a"/></linearGradient><path style="fill:url(#a)" d="M1 0h22v20H1z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="11.999" y1="1" x2="11.999" y2="19"><stop offset="0" style="stop-color:#ffeba8"/><stop offset="1" style="stop-color:#f8be27"/></linearGradient><path style="fill:url(#b)" d="M2 1h20v18H2z"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="11.999" y1="2" x2="11.999" y2="18"><stop offset="0" style="stop-color:#ffc30f"/><stop offset="1" style="stop-color:#f5ae0d"/></linearGradient><path style="fill:url(#c)" d="M3 2h18v16H3z"/><linearGradient id="d" gradientUnits="userSpaceOnUse" x1="11.999" y1="0" x2="11.999" y2="7"><stop offset="0" style="stop-color:#f0a829"/><stop offset="1" style="stop-color:#c7671a"/></linearGradient><path style="fill:url(#d)" d="M0 0h24v7H0z"/><linearGradient id="e" gradientUnits="userSpaceOnUse" x1="11.999" y1="1" x2="11.999" y2="6"><stop offset="0" style="stop-color:#ffeba8"/><stop offset="1" style="stop-color:#f8be27"/></linearGradient><path style="fill:url(#e)" d="M1 1h22v5H1z"/><linearGradient id="f" gradientUnits="userSpaceOnUse" x1="11.999" y1="2" x2="11.999" y2="5"><stop offset="0" style="stop-color:#ffc30f"/><stop offset="1" style="stop-color:#f5ae0d"/></linearGradient><path style="fill:url(#f)" d="M2 2h20v3H2z"/><linearGradient id="g" gradientUnits="userSpaceOnUse" x1="11.499" y1="0" x2="11.499" y2="13.001"><stop offset="0" style="stop-color:#8d470d"/><stop offset="1" style="stop-color:#7c3d09"/></linearGradient><path style="fill:url(#g)" d="M9 0v13l2.5-2 2.5 2V0z"/><linearGradient id="h" gradientUnits="userSpaceOnUse" x1="11.499" y1="1" x2="11.499" y2="10.935"><stop offset="0" style="stop-color:#d58738"/><stop offset="1" style="stop-color:#ab551f"/></linearGradient><path style="fill:url(#h)" d="M10 1v9.9l1.5-1.2 1.5 1.2V1z"/><linearGradient id="i" gradientUnits="userSpaceOnUse" x1="11.5" y1="2" x2="11.5" y2="8.871"><stop offset="0" style="stop-color:#d0813a"/><stop offset="1" style="stop-color:#af551d"/></linearGradient><path style="fill:url(#i)" d="M11 2v6.8l.5-.4.5.5V2z"/></svg>
diff --git a/src/assets/img/mod_legacy/survey.svg b/src/assets/img/mod_legacy/survey.svg
index a97fe77ef..2bbc36f81 100644
--- a/src/assets/img/mod_legacy/survey.svg
+++ b/src/assets/img/mod_legacy/survey.svg
@@ -1,89 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" style="overflow:visible;enable-background:new 0 0 24 24;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="20" y1="8" x2="20" y2="24.0005">
-	<stop  offset="0" style="stop-color:#76A1F0"/>
-	<stop  offset="1" style="stop-color:#6B90D5"/>
-	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
-</linearGradient>
-<rect x="16" y="8" style="fill:url(#SVGID_1_);" width="8" height="16"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="20" y1="9" x2="20" y2="23.0005">
-	<stop  offset="0" style="stop-color:#BBE0F7"/>
-	<stop  offset="1" style="stop-color:#82B4FB"/>
-	<a:midPointStop  offset="0" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="1" style="stop-color:#82B4FB"/>
-</linearGradient>
-<rect x="17" y="9" style="fill:url(#SVGID_2_);" width="6" height="14"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="20" y1="10" x2="20" y2="22.0005">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<rect x="18" y="10" style="fill:url(#SVGID_3_);" width="4" height="12"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="0" x2="11.9995" y2="24.0005">
-	<stop  offset="0" style="stop-color:#90C50E"/>
-	<stop  offset="1" style="stop-color:#70A034"/>
-	<a:midPointStop  offset="0" style="stop-color:#90C50E"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#90C50E"/>
-	<a:midPointStop  offset="1" style="stop-color:#70A034"/>
-</linearGradient>
-<rect x="8" style="fill:url(#SVGID_4_);" width="8" height="24"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="1" x2="11.9995" y2="23.0005">
-	<stop  offset="0" style="stop-color:#D9F991"/>
-	<stop  offset="0.2388" style="stop-color:#D7F88D"/>
-	<stop  offset="0.4501" style="stop-color:#D1F383"/>
-	<stop  offset="0.6509" style="stop-color:#C6EC71"/>
-	<stop  offset="0.844" style="stop-color:#B7E257"/>
-	<stop  offset="1" style="stop-color:#A8D73D"/>
-	<a:midPointStop  offset="0" style="stop-color:#D9F991"/>
-	<a:midPointStop  offset="0.7317" style="stop-color:#D9F991"/>
-	<a:midPointStop  offset="1" style="stop-color:#A8D73D"/>
-</linearGradient>
-<rect x="9" y="1" style="fill:url(#SVGID_5_);" width="6" height="22"/>
-<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="11.9995" y1="2" x2="11.9995" y2="22.0005">
-	<stop  offset="0" style="stop-color:#B3E810"/>
-	<stop  offset="1" style="stop-color:#90C60D"/>
-	<a:midPointStop  offset="0" style="stop-color:#B3E810"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#B3E810"/>
-	<a:midPointStop  offset="1" style="stop-color:#90C60D"/>
-</linearGradient>
-<rect x="10" y="2" style="fill:url(#SVGID_6_);" width="4" height="20"/>
-<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="4" y1="12" x2="4" y2="24.0005">
-	<stop  offset="0" style="stop-color:#F0A829"/>
-	<stop  offset="1" style="stop-color:#C7671A"/>
-	<a:midPointStop  offset="0" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="1" style="stop-color:#C7671A"/>
-</linearGradient>
-<rect y="12" style="fill:url(#SVGID_7_);" width="8" height="12"/>
-<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="4" y1="13" x2="4" y2="23.0005">
-	<stop  offset="0" style="stop-color:#FFEBA8"/>
-	<stop  offset="1" style="stop-color:#F8BE27"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFEBA8"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFEBA8"/>
-	<a:midPointStop  offset="1" style="stop-color:#F8BE27"/>
-</linearGradient>
-<rect x="1" y="13" style="fill:url(#SVGID_8_);" width="6" height="10"/>
-<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="4" y1="14" x2="4" y2="22">
-	<stop  offset="0" style="stop-color:#FFC30F"/>
-	<stop  offset="1" style="stop-color:#F5AE0D"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="1" style="stop-color:#F5AE0D"/>
-</linearGradient>
-<rect x="2" y="14" style="fill:url(#SVGID_9_);" width="4" height="8"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" style="overflow:visible;enable-background:new 0 0 24 24" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="20" y1="8" x2="20" y2="24"><stop offset="0" style="stop-color:#76a1f0"/><stop offset="1" style="stop-color:#6b90d5"/></linearGradient><path style="fill:url(#a)" d="M16 8h8v16h-8z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="20" y1="9" x2="20" y2="23"><stop offset="0" style="stop-color:#bbe0f7"/><stop offset="1" style="stop-color:#82b4fb"/></linearGradient><path style="fill:url(#b)" d="M17 9h6v14h-6z"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="20" y1="10" x2="20" y2="22"><stop offset="0" style="stop-color:#95bff8"/><stop offset=".557" style="stop-color:#84adef"/><stop offset="1" style="stop-color:#7ca4eb"/></linearGradient><path style="fill:url(#c)" d="M18 10h4v12h-4z"/><linearGradient id="d" gradientUnits="userSpaceOnUse" x1="11.999" y1="0" x2="11.999" y2="24"><stop offset="0" style="stop-color:#90c50e"/><stop offset="1" style="stop-color:#70a034"/></linearGradient><path style="fill:url(#d)" d="M8 0h8v24H8z"/><linearGradient id="e" gradientUnits="userSpaceOnUse" x1="11.999" y1="1" x2="11.999" y2="23"><stop offset="0" style="stop-color:#d9f991"/><stop offset=".239" style="stop-color:#d7f88d"/><stop offset=".45" style="stop-color:#d1f383"/><stop offset=".651" style="stop-color:#c6ec71"/><stop offset=".844" style="stop-color:#b7e257"/><stop offset="1" style="stop-color:#a8d73d"/></linearGradient><path style="fill:url(#e)" d="M9 1h6v22H9z"/><linearGradient id="f" gradientUnits="userSpaceOnUse" x1="11.999" y1="2" x2="11.999" y2="22"><stop offset="0" style="stop-color:#b3e810"/><stop offset="1" style="stop-color:#90c60d"/></linearGradient><path style="fill:url(#f)" d="M10 2h4v20h-4z"/><linearGradient id="g" gradientUnits="userSpaceOnUse" x1="4" y1="12" x2="4" y2="24"><stop offset="0" style="stop-color:#f0a829"/><stop offset="1" style="stop-color:#c7671a"/></linearGradient><path style="fill:url(#g)" d="M0 12h8v12H0z"/><linearGradient id="h" gradientUnits="userSpaceOnUse" x1="4" y1="13" x2="4" y2="23"><stop offset="0" style="stop-color:#ffeba8"/><stop offset="1" style="stop-color:#f8be27"/></linearGradient><path style="fill:url(#h)" d="M1 13h6v10H1z"/><linearGradient id="i" gradientUnits="userSpaceOnUse" x1="4" y1="14" x2="4" y2="22"><stop offset="0" style="stop-color:#ffc30f"/><stop offset="1" style="stop-color:#f5ae0d"/></linearGradient><path style="fill:url(#i)" d="M2 14h4v8H2z"/></svg>
diff --git a/src/assets/img/mod_legacy/url.svg b/src/assets/img/mod_legacy/url.svg
index 56bdb5541..94c07d48b 100644
--- a/src/assets/img/mod_legacy/url.svg
+++ b/src/assets/img/mod_legacy/url.svg
@@ -1,485 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" style="overflow:visible;enable-background:new 0 0 24 24;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="11.9653" y1="0" x2="11.9653" y2="24.0005">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_1_);" points="14.4,0 13.4,0 3,0 2,0 2,24 3,24 21,24 22,24 22,7.9 "/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="11.9653" y1="1" x2="11.9653" y2="23.0005">
-	<stop  offset="0" style="stop-color:#E7F4FC"/>
-	<stop  offset="1" style="stop-color:#DEEFFC"/>
-	<a:midPointStop  offset="0" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="1" style="stop-color:#DEEFFC"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_2_);" points="14,1 13,1 4,1 3,1 3,23 4,23 20,23 21,23 21,8.3 "/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="11.9653" y1="2" x2="11.9653" y2="22.0005">
-	<stop  offset="0" style="stop-color:#CEE9F9"/>
-	<stop  offset="1" style="stop-color:#BBDFF8"/>
-	<a:midPointStop  offset="0" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="1" style="stop-color:#BBDFF8"/>
-</linearGradient>
-<polygon style="fill:url(#SVGID_3_);" points="13.6,2 12.6,2 5,2 4,2 4,22 5,22 19,22 20,22 20,8.7 "/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="17.2109" y1="0" x2="17.2109" y2="9.3594">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<path style="fill:url(#SVGID_4_);" d="M13,9c0,0,5.2-1.5,9,0.4c0-0.1,0-1.5,0-1.5L14.4,0c0,0-1.8,0-2,0C15.1,3.7,13,9,13,9z"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="14.2881" y1="7.5449" x2="17.4162" y2="4.4168">
-	<stop  offset="0" style="stop-color:#E7F4FC"/>
-	<stop  offset="0.5181" style="stop-color:#E5F3FC"/>
-	<stop  offset="0.7045" style="stop-color:#DEF0FB"/>
-	<stop  offset="0.8371" style="stop-color:#D3EBFA"/>
-	<stop  offset="0.872" style="stop-color:#CEE9F9"/>
-	<stop  offset="1" style="stop-color:#BDD8F0"/>
-	<a:midPointStop  offset="0" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="0.87" style="stop-color:#E7F4FC"/>
-	<a:midPointStop  offset="0.872" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#CEE9F9"/>
-	<a:midPointStop  offset="1" style="stop-color:#BDD8F0"/>
-</linearGradient>
-<path style="fill:url(#SVGID_5_);" d="M20.5,7.8c-0.9-0.2-2-0.3-3.1-0.3c-1.1,0-2.1,0.1-3,0.3c0.4-1.6,0.7-4.1-0.2-6.4L20.5,7.8z"/>
-<radialGradient id="SVGID_6_" cx="7.5312" cy="16.5" r="7.0005" gradientUnits="userSpaceOnUse">
-	<stop  offset="0" style="stop-color:#8BB4F0"/>
-	<stop  offset="7.721406e-02" style="stop-color:#88B1EF"/>
-	<stop  offset="0.488" style="stop-color:#7FA7EC"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#8BB4F0"/>
-	<a:midPointStop  offset="0.25" style="stop-color:#8BB4F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</radialGradient>
-<path style="fill:url(#SVGID_6_);" d="M7.5,23.5C0.4,23.2-1.6,15.1,3,11.2c1.8-1.6,3.8-1.7,4.6-1.7c0.4,0,0.8,0,1.1,0.1
-	C9,9.6,9.4,9.7,9.7,9.8c0.3,0.1,0.7,0.3,1,0.4c0.3,0.2,0.6,0.4,0.9,0.6c0.3,0.2,0.6,0.4,0.8,0.7c0.3,0.3,0.5,0.5,0.7,0.8
-	c0.2,0.3,0.4,0.6,0.6,0.9c0.2,0.3,0.3,0.7,0.4,1c0.1,0.3,0.2,0.7,0.3,1.1c0.1,0.4,0.1,0.8,0.1,1.1s0,0.8-0.1,1.1
-	c-0.1,0.4-0.1,0.7-0.3,1.1c-0.1,0.3-0.3,0.7-0.4,1c-0.2,0.3-0.4,0.6-0.6,0.9c-0.2,0.3-0.4,0.6-0.7,0.8c-0.3,0.3-0.5,0.5-0.8,0.7
-	c-0.3,0.2-0.6,0.4-0.9,0.6c-0.3,0.2-0.7,0.3-1,0.4c-0.3,0.1-0.7,0.2-1.1,0.3C8.3,23.5,7.9,23.5,7.5,23.5"/>
-<radialGradient id="SVGID_7_" cx="7.5308" cy="16.5" r="6.4856" gradientUnits="userSpaceOnUse">
-	<stop  offset="0" style="stop-color:#8BB4F0"/>
-	<stop  offset="7.721406e-02" style="stop-color:#88B1EF"/>
-	<stop  offset="0.488" style="stop-color:#7FA7EC"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#8BB4F0"/>
-	<a:midPointStop  offset="0.25" style="stop-color:#8BB4F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</radialGradient>
-<path style="fill:url(#SVGID_7_);" d="M7.5,23C1,22.7-0.9,15.2,3.3,11.6C5,10.1,6.8,10,7.5,10c0.4,0,0.7,0,1.1,0.1
-	c0.3,0.1,0.7,0.1,1,0.2s0.6,0.2,0.9,0.4c0.3,0.2,0.6,0.3,0.9,0.5c0.3,0.2,0.5,0.4,0.8,0.6c0.2,0.2,0.5,0.5,0.6,0.8
-	c0.2,0.3,0.4,0.6,0.5,0.9s0.3,0.6,0.4,0.9s0.2,0.7,0.2,1c0.1,0.3,0.1,0.7,0.1,1.1c0,0.4,0,0.7-0.1,1.1c-0.1,0.3-0.1,0.7-0.2,1
-	s-0.2,0.6-0.4,0.9s-0.3,0.6-0.5,0.9s-0.4,0.5-0.6,0.8s-0.5,0.5-0.8,0.6c-0.3,0.2-0.6,0.4-0.9,0.5c-0.3,0.2-0.6,0.3-0.9,0.4
-	s-0.7,0.2-1,0.2C8.2,23,7.9,23,7.5,23"/>
-<path style="fill:#B3E710;" d="M6.1,10.8L6.1,10.8c0-0.1,0-0.1,0-0.1c0,0,0,0,0,0c0,0,0,0,0,0C6.1,10.7,6,10.7,6.1,10.8
-	c-0.1-0.1-0.1,0-0.2,0C5.9,10.7,6,10.8,6.1,10.8C6,10.8,6.1,10.8,6.1,10.8 M3,13c0,0,2,0,3.6,0c0,0,0.4-0.1,0.4-0.1l0,0v0l0,0v0v0
-	l0,0v0l0,0c0-0.1-0.3-0.1-0.4-0.1c0-0.1-0.2-0.2-0.1-0.4c0,0-0.1,0-0.1,0c-0.1-0.1-0.3-0.1-0.4-0.1c-0.1,0-0.2-0.1-0.3-0.2
-	c-0.1,0-0.1,0-0.2,0c0,0,0,0,0,0C5.6,12,5.6,12,5.4,11.9c0-0.2,0.2-0.3,0.4-0.5c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0.1,0,0.1,0
-	c0,0,0,0,0,0c0,0,0,0-0.1-0.1c0,0,0,0,0,0v0c0,0,0.1,0.1,0.2,0c0,0,0,0,0-0.1c0.1,0,0.1,0,0.2-0.1c0,0,0,0,0,0
-	c-0.1,0-0.1-0.1-0.2-0.1c0.1,0,0.1,0,0.2,0.1c0,0,0.1,0,0.2-0.1c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0
-	c0,0,0.1,0,0.1,0c0,0,0,0,0-0.1l0,0c0,0,0,0.1,0.1,0.1c0.1-0.1,0.1-0.1,0.2-0.1c0-0.1,0-0.1,0-0.1c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0-0.1c-0.1,0-0.1-0.1-0.2,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.2,0.2-0.2,0.2c-0.1,0,0-0.1,0-0.1c0.1,0,0.1,0,0-0.1
-	c-0.1,0-0.1,0.1-0.1,0.1c0,0,0-0.1,0-0.1c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0.1-0.1c0,0,0-0.1,0-0.1c0,0,0,0,0,0
-	c-0.1,0-0.2,0.1-0.2,0.1c0,0,0,0,0,0c-0.1,0-0.1,0-0.1,0.1c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0l-0.3,0.2c0,0,0,0,0,0c0,0,0,0,0.1-0.1c0,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0h0l0,0l0,0h0l0,0l0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c-0.1,0-0.1,0-0.3,0h0l0,0c0,0,0,0,0,0h0l0,0c0,0,0,0,0,0h0l0,0c-0.2,0.1-0.2,0.1-0.3,0.2
-	c0-0.1,0-0.1,0.1-0.1c0,0,0,0,0,0c0,0,0,0,0,0c-0.1,0-0.2,0-0.2,0c0.1,0,0.1,0,0.2-0.1c-0.1,0-0.1,0-0.1-0.1c-0.1,0-0.1,0-0.1,0
-	c0,0,0,0,0.1,0c0,0-0.1,0-0.1,0c0,0,0,0,0.1-0.1c0,0-0.3,0.1-0.5,0.2c0,0,0,0,0.1,0c0.1,0,0.2,0.1,0.3,0c0,0-0.1,0.2-0.1,0.2
-	c0,0,0,0,0,0c-0.1,0-0.1,0-0.1,0c-0.1,0-0.1,0-0.1,0c0,0,0.4,0,0.4,0v-0.1c0-0.1-0.1-0.2,0-0.2c0,0-0.1,0-0.1,0c0,0,0,0,0-0.1
-	c-0.1,0-0.2,0.1-0.3,0.1c-0.3,0.1-0.6,0.4-0.9,0.5c-0.1,0.1-0.3,0.2-0.4,0.3c0,0,0,0-0.1,0l0,0L3,11.8l0,0c0.1-0.1,0.1-0.1,0.2-0.2
-	c0,0,0,0,0,0c0,0-0.1,0.1-0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0.1-0.1,0.1-0.1,0.2c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0,0,0,0c0,0,0.1,0,0.1,0
-	c0,0,0,0.1,0,0.1c0,0,0,0,0,0c-0.1,0-0.1,0-0.1,0.1l0,0C3,12.2,3,12.2,2.9,12.3c0,0,0,0,0,0v0c0,0.1-0.1,0.1-0.1,0.1c0,0,0,0,0.1,0
-	l0,0c0,0.1-0.1,0.1-0.1,0.2c0,0,0,0.2,0,0.2c0,0,0,0.3-0.1,0.3c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0h0c0,0,0-0.1,0-0.1c0,0,0-0.1,0-0.1c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0-0.1,0.1c0,0,0,0,0,0
-	c0,0,0,0,0,0 M8.3,10.4C8.3,10.4,8.3,10.4,8.3,10.4L8.3,10.4C8.3,10.4,8.3,10.4,8.3,10.4C8.3,10.4,8.3,10.4,8.3,10.4 M8.3,10.4
-	c0,0-0.1-0.1-0.1-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0C8.2,10.4,8.2,10.4,8.3,10.4
-	C8.2,10.4,8.2,10.4,8.3,10.4L8.3,10.4L8.3,10.4L8.3,10.4C8.2,10.5,8.2,10.5,8.3,10.4C8.2,10.5,8.2,10.5,8.3,10.4
-	C8.2,10.5,8.3,10.5,8.3,10.4C8.3,10.4,8.3,10.4,8.3,10.4 M5.9,10.7L5.9,10.7C6,10.6,6,10.6,5.9,10.7c0-0.1,0-0.1,0-0.1
-	c0,0,0,0,0.1-0.1c0,0,0.1-0.1,0.1-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c-0.1,0-0.1,0.1-0.2,0.1c0,0,0,0,0.1-0.1c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c-0.1,0.1-0.1,0.1-0.1,0.1c0.1,0,0.1,0,0.1,0c0,0-0.1,0-0.1,0c0,0,0.1,0,0.1-0.1c0,0-0.3,0.1-0.4,0.1
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0c0,0,0,0,0.1,0c0.1,0,0.1,0,0.1,0
-	c-0.1,0-0.1,0-0.2,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0.1c0,0,0.1,0,0.2,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0.1,0
-	c0,0,0,0,0,0c0,0.1,0.1,0.1,0.1,0.1C5.8,10.7,5.8,10.7,5.9,10.7c-0.1,0-0.1,0-0.1,0c0,0,0,0,0,0C5.8,10.7,5.9,10.7,5.9,10.7
-	C5.9,10.7,5.9,10.7,5.9,10.7 M8.2,11L8.2,11C8.2,11,8.2,11,8.2,11c-0.1,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.1-0.1-0.1-0.1
-	c0,0-0.1,0-0.1,0c0-0.1-0.1,0-0.1-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0v0l0,0c0,0,0.1,0,0.1,0c0,0-0.1,0-0.1-0.1c0,0,0,0,0.1,0
-	c0,0,0,0-0.1,0c0,0,0,0-0.1,0c0,0,0,0,0,0l0,0c0,0,0,0,0.1,0c0,0-0.1,0-0.1,0c0,0,0,0-0.1,0c0,0,0,0,0,0v0c0,0,0,0-0.1,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0-0.1,0l0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c-0.1-0.1-0.1-0.1-0.1-0.1c0,0,0,0.1-0.1,0.1c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0-0.1-0.2,0c0,0,0,0,0,0c-0.1,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0-0.1,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0-0.1,0-0.1,0-0.1c0,0,0,0,0,0c0,0,0.1-0.1,0.1-0.1c0,0,0,0-0.1,0c-0.1,0-0.2,0.1-0.2,0.1c0,0,0,0,0,0
-	c0,0-0.1,0-0.1,0.1c0.1,0,0.1,0,0.1,0c0,0-0.1,0-0.1,0c0,0.1,0.1,0.1,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0
-	c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0.1,0,0.1,0,0.1,0c0,0-0.1,0-0.1,0l0,0c0,0,0,0,0.1,0c0,0,0.1,0,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0.1,0.1
-	c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0s0,0,0,0s0,0,0,0s0,0,0,0
-	s0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0.1,0,0.1c0,0-0.1,0.1-0.1,0.1c0,0,0,0-0.1,0
-	c0,0,0.1,0,0.1,0.1c0,0,0,0,0,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0h0c-0.1-0.1-0.1,0-0.1,0c0,0,0,0,0,0c-0.1,0-0.1,0-0.1,0.1
-	c0.1,0,0.2,0,0.2,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0h0c0,0,0,0,0,0l0,0h0h0h0l0,0
-	c0,0,0,0,0.1,0.1c0,0,0,0,0,0c0,0.1,0.1,0,0.1,0.1c0,0,0.1,0,0.1,0.1c0.1,0,0.1,0,0.2,0c0,0,0,0,0,0c0-0.1-0.1-0.1-0.2-0.1
-	c-0.1,0-0.1,0-0.1-0.1c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0.1,0.1,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0.1,0,0.1,0.1c0,0,0,0,0-0.1
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.1-0.1-0.1-0.1c0,0,0,0.1,0.1,0.1c0,0,0,0-0.1-0.1c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0-0.1,0-0.1-0.1
-	c0,0,0,0,0,0l0,0c0,0,0-0.1-0.1-0.1c0,0,0,0,0,0c0,0,0,0,0-0.1c0.1,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0C7.9,11,7.9,11,8,11.1
-	c0,0,0,0.1,0.1,0c0,0.1,0,0.1,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0-0.1c0,0,0,0,0,0c0,0,0,0,0,0C8.2,11.1,8.2,11.1,8.2,11
-	C8.2,11,8.2,11,8.2,11C8.2,11,8.2,11,8.2,11C8.2,11,8.2,11,8.2,11 M6.4,10.4L6.4,10.4C6.5,10.4,6.4,10.4,6.4,10.4
-	C6.4,10.4,6.4,10.4,6.4,10.4c0-0.1,0.1-0.1,0.1-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0
-	l0,0L6.4,10.4C6.4,10.4,6.4,10.4,6.4,10.4c-0.1-0.1-0.1,0-0.1,0c0,0,0,0,0,0c-0.1,0-0.1,0.1-0.1,0.1c0,0,0,0,0,0.1c0,0,0,0,0.1,0
-	c0,0,0,0,0,0c0,0,0,0,0,0C6.3,10.5,6.3,10.5,6.4,10.4C6.3,10.5,6.4,10.5,6.4,10.4 M8.1,10.3C8.1,10.3,8.1,10.3,8.1,10.3
-	C8.1,10.3,8.1,10.3,8.1,10.3C8.1,10.3,8.1,10.3,8.1,10.3C8.1,10.3,8.1,10.3,8.1,10.3 M6.8,10.3C6.8,10.3,6.8,10.3,6.8,10.3
-	C6.8,10.3,6.8,10.3,6.8,10.3C6.8,10.3,6.8,10.3,6.8,10.3C6.8,10.3,6.7,10.3,6.8,10.3C6.7,10.3,6.7,10.3,6.8,10.3c-0.1,0-0.1,0-0.2,0
-	c0,0,0,0-0.1,0c0,0,0,0.1-0.1,0.1c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0C6.6,10.4,6.8,10.3,6.8,10.3 M8.1,10.3
-	C8.1,10.3,8.1,10.3,8.1,10.3L8.1,10.3C8.1,10.3,8.1,10.3,8.1,10.3L8.1,10.3 M5.9,10.3L5.9,10.3C6,10.3,6,10.3,5.9,10.3
-	C6,10.3,6,10.3,5.9,10.3C6,10.3,6,10.3,5.9,10.3C6,10.3,6,10.3,5.9,10.3C6,10.3,6,10.3,5.9,10.3C6,10.3,5.9,10.3,5.9,10.3
-	c-0.1,0-0.1,0-0.2,0c-0.1,0-0.1,0-0.2,0.1l0,0l0,0l0,0h0l0,0l0,0l0,0l0,0c0,0-0.1,0-0.1,0.1c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0-0.1,0-0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0.1,0,0.1-0.1,0.2-0.1c0,0,0.1,0,0.1,0
-	C5.8,10.4,5.9,10.4,5.9,10.3 M7.9,10.2C7.9,10.2,7.9,10.2,7.9,10.2C7.9,10.2,7.9,10.2,7.9,10.2C7.9,10.2,7.9,10.2,7.9,10.2
-	C7.9,10.2,7.9,10.2,7.9,10.2 M7.2,10.2L7.2,10.2C7.2,10.2,7.2,10.2,7.2,10.2C7.2,10.2,7.2,10.2,7.2,10.2C7.2,10.2,7.2,10.2,7.2,10.2
-	c-0.1,0-0.1,0-0.2,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.1,0.1-0.1,0.1c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0.1,0,0.1,0,0.1,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0C7.1,10.3,7.1,10.3,7.2,10.2C7.2,10.2,7.2,10.2,7.2,10.2 M6.8,10.2C6.8,10.1,6.8,10.1,6.8,10.2
-	C6.8,10.1,6.8,10.1,6.8,10.2C6.8,10.1,6.8,10.1,6.8,10.2C6.8,10.2,6.8,10.2,6.8,10.2C6.8,10.1,6.8,10.1,6.8,10.2
-	C6.8,10.1,6.8,10.1,6.8,10.2C6.8,10.1,6.8,10.1,6.8,10.2C6.8,10.2,6.7,10.2,6.8,10.2L6.8,10.2C6.7,10.2,6.7,10.2,6.8,10.2
-	C6.7,10.1,6.7,10.2,6.8,10.2C6.7,10.2,6.7,10.2,6.8,10.2c-0.1,0-0.1,0-0.1,0c0,0,0,0,0,0s0,0,0,0s0,0,0,0c0,0,0,0,0,0s0,0,0,0
-	s0,0,0,0s0,0,0,0s0,0,0,0c0,0,0,0,0,0C6.6,10.2,6.7,10.2,6.8,10.2C6.7,10.2,6.7,10.2,6.8,10.2c-0.1,0-0.1,0-0.1,0c0,0-0.1,0-0.1,0
-	c0,0,0,0,0.1,0C6.7,10.2,6.7,10.2,6.8,10.2 M6.5,10.2C6.6,10.2,6.6,10.2,6.5,10.2C6.6,10.2,6.6,10.2,6.5,10.2
-	C6.6,10.2,6.5,10.2,6.5,10.2C6.5,10.2,6.5,10.2,6.5,10.2c0,0,0.1,0,0.1-0.1c0,0,0,0,0,0C6.6,10.1,6.6,10.1,6.5,10.2
-	c-0.1,0-0.1,0-0.1,0C6.4,10.2,6.4,10.2,6.5,10.2c-0.1,0-0.1,0-0.1,0C6.5,10.2,6.5,10.2,6.5,10.2c-0.1,0-0.1,0-0.1,0c0,0,0,0-0.1,0
-	c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0.1,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0.1,0,0.1,0,0.1,0c0,0,0,0,0,0
-	c0,0,0,0,0,0C6.5,10.2,6.5,10.2,6.5,10.2 M6.9,10.1C7,10.1,7,10.1,6.9,10.1C7,10.1,7,10.1,6.9,10.1C6.9,10.1,6.9,10.1,6.9,10.1
-	C6.9,10.1,6.9,10.1,6.9,10.1L6.9,10.1L6.9,10.1L6.9,10.1C6.9,10.1,6.9,10.1,6.9,10.1L6.9,10.1L6.9,10.1L6.9,10.1L6.9,10.1
-	C6.9,10.1,6.9,10.1,6.9,10.1C6.9,10.1,6.9,10.1,6.9,10.1L6.9,10.1L6.9,10.1L6.9,10.1L6.9,10.1L6.9,10.1L6.9,10.1L6.9,10.1
-	C6.9,10.1,6.9,10.1,6.9,10.1L6.9,10.1C6.9,10.1,6.9,10.1,6.9,10.1 M6.6,10.1C6.7,10.1,6.7,10.1,6.6,10.1C6.7,10.1,6.7,10.1,6.6,10.1
-	C6.7,10.1,6.6,10.1,6.6,10.1L6.6,10.1C6.6,10.1,6.6,10.1,6.6,10.1L6.6,10.1C6.6,10.1,6.6,10.1,6.6,10.1L6.6,10.1
-	C6.6,10.1,6.6,10.1,6.6,10.1L6.6,10.1C6.6,10.1,6.6,10.1,6.6,10.1c-0.1,0-0.3,0.1-0.3,0.1c0,0,0,0,0,0c0,0,0,0-0.1,0
-	c0,0,0.1,0,0.1,0c0,0,0.1,0,0.1,0c0,0-0.1,0-0.1,0c0,0,0.1,0,0.1,0C6.6,10.1,6.6,10.1,6.6,10.1 M6.8,10.1L6.8,10.1
-	C6.8,10.1,6.8,10.1,6.8,10.1C6.8,10.1,6.8,10.1,6.8,10.1L6.8,10.1L6.8,10.1L6.8,10.1L6.8,10.1L6.8,10.1L6.8,10.1
-	C6.8,10.1,6.8,10.1,6.8,10.1L6.8,10.1C6.8,10.1,6.8,10.1,6.8,10.1c-0.1,0-0.1,0-0.1,0c0,0,0,0,0,0C6.8,10.1,6.8,10.1,6.8,10.1
-	 M7.1,10.1C7.1,10.1,7.1,10.1,7.1,10.1C7.1,10,7.1,10,7.1,10.1C7.1,10,7.1,10,7.1,10.1L7.1,10.1L7.1,10.1L7.1,10.1L7.1,10.1
-	L7.1,10.1L7.1,10.1L7.1,10.1L7.1,10.1C7.1,10,7.1,10,7.1,10.1C7.1,10.1,7.1,10.1,7.1,10.1C7,10.1,7,10.1,7.1,10.1
-	C7.1,10.1,7.1,10.1,7.1,10.1 M7,10.1c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	C7.1,10,7,10.1,7,10.1C7,10.1,7,10.1,7,10.1C7,10,7,10.1,7,10.1C7,10.1,7,10.1,7,10.1C7,10.1,7,10.1,7,10.1C7,10.1,7,10.1,7,10.1
-	C7,10.1,7,10.1,7,10.1C7,10.1,7,10.1,7,10.1 M7.3,10C7.3,10,7.4,10,7.3,10C7.4,10,7.3,10,7.3,10C7.3,10,7.4,10,7.3,10
-	C7.4,10,7.4,10,7.3,10C7.4,10,7.4,10,7.3,10C7.4,10,7.4,10,7.3,10C7.4,10,7.4,10,7.3,10C7.4,10,7.4,10,7.3,10C7.4,10,7.4,10,7.3,10
-	C7.4,10,7.4,10,7.3,10C7.4,10,7.4,10,7.3,10C7.4,10,7.4,10,7.3,10C7.4,10,7.4,10,7.3,10C7.4,10,7.4,10,7.3,10c0.1,0,0.1,0,0.1,0
-	C7.4,10,7.4,10,7.3,10c0.1,0,0.1,0,0.2,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0C7.5,10,7.4,10,7.3,10C7.4,10,7.4,10,7.3,10
-	C7.3,10,7.3,10,7.3,10L7.3,10C7.3,10,7.3,10,7.3,10C7.3,10,7.3,10,7.3,10C7.3,10,7.3,10,7.3,10c-0.1,0-0.1,0-0.2,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0C7.2,10.1,7.2,10.1,7.3,10C7.3,10,7.3,10,7.3,10C7.3,10.1,7.3,10,7.3,10
-	C7.3,10,7.3,10,7.3,10C7.3,10,7.3,10,7.3,10 M7.5,10C7.5,10,7.5,10,7.5,10C7.5,10,7.5,10,7.5,10C7.5,10,7.5,10,7.5,10
-	C7.5,10,7.5,10,7.5,10C7.5,10,7.5,10,7.5,10 M7.5,10L7.5,10L7.5,10C7.5,10,7.5,10,7.5,10C7.5,10,7.5,10,7.5,10C7.5,10,7.5,10,7.5,10
-	C7.5,10,7.5,10,7.5,10C7.5,10,7.5,10,7.5,10C7.5,10,7.5,10,7.5,10C7.5,10,7.5,10,7.5,10L7.5,10C7.5,10,7.5,10,7.5,10L7.5,10
-	C7.5,10,7.5,10,7.5,10L7.5,10C7.5,10,7.5,10,7.5,10L7.5,10C7.5,10,7.5,10,7.5,10c-0.1,0-0.1,0-0.1,0C7.4,10,7.4,10,7.5,10
-	C7.4,10,7.4,10,7.5,10L7.5,10L7.5,10L7.5,10L7.5,10L7.5,10L7.5,10L7.5,10c-0.1,0-0.1,0-0.1,0l0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0h0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0
-	c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0
-	C7.4,10.1,7.4,10.1,7.5,10C7.4,10.1,7.4,10.1,7.5,10C7.4,10.1,7.4,10.1,7.5,10C7.4,10.1,7.5,10,7.5,10C7.5,10,7.5,10,7.5,10
-	C7.5,10,7.5,10,7.5,10L7.5,10C7.5,10,7.5,10,7.5,10C7.5,10,7.5,10,7.5,10C7.5,10,7.5,10,7.5,10C7.5,10,7.5,10,7.5,10
-	C7.5,10,7.5,10,7.5,10C7.5,10,7.5,10,7.5,10 M9,11.2C8.6,10.5,8.1,10,7.5,10h0h0h0c0,0,0,0,0,0l0,0h0l0,0l0,0l0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0l0,0l0,0l0,0l0,0l0,0c0,0,0,0,0,0v0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0h0c0,0,0,0,0.1,0c0,0,0,0,0.1,0
-	c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0c0,0,0,0,0,0l0,0l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0
-	l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0h0c0,0,0,0,0,0h0c0,0,0,0,0,0h0h0c0,0,0,0,0,0h0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0h0h0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0h0l0,0l0,0h0l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0h0c0,0,0,0,0.1,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0c-0.1,0-0.1,0-0.2,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0l0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0l0,0l0,0l0,0l0,0l0,0l0,0l0,0l0,0l0,0l0,0h0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0v0
-	l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0-0.1,0-0.1,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0v0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c-0.1,0-0.1,0-0.1,0l0,0c0,0,0.1,0,0.1,0l0,0l0,0
-	c0,0,0,0,0,0c-0.1,0-0.1,0-0.1,0c0,0,0,0,0,0l0,0l0,0c0,0,0,0,0,0c0,0,0,0-0.1,0h0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	l0,0c0,0,0.1,0,0.1,0c0,0,0,0,0.1-0.1l0,0l0,0c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0-0.1,0.1l0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0
-	c0,0,0,0,0.1,0c0,0,0,0,0,0.1l0,0c0,0,0,0,0-0.1l0,0l0,0c0,0,0,0,0,0h0l0,0c0,0,0,0,0-0.1l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0.1,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.1-0.1-0.1,0l0,0l0,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0l0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0.1,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0l0,0c0,0,0,0,0,0C8.9,11.1,8.9,11.1,9,11.2C8.9,11.1,8.9,11.1,9,11.2L9,11.2C8.9,11.2,8.9,11.2,9,11.2
-	C8.9,11.2,8.9,11.2,9,11.2C8.9,11.2,8.9,11.2,9,11.2C8.9,11.2,8.9,11.2,9,11.2C8.9,11.2,8.9,11.2,9,11.2C8.9,11.2,8.9,11.2,9,11.2
-	C8.9,11.2,8.9,11.2,9,11.2C8.9,11.2,8.9,11.2,9,11.2C8.9,11.2,8.9,11.2,9,11.2C8.9,11.2,9,11.2,9,11.2C9,11.2,9,11.2,9,11.2"/>
-<path style="fill:#B3E710;" d="M7.4,22.9L7.4,22.9C7.4,22.9,7.4,22.9,7.4,22.9L7.4,22.9C7.4,22.9,7.4,22.9,7.4,22.9L7.4,22.9
-	C7.4,22.9,7.4,22.9,7.4,22.9C7.4,22.9,7.4,22.9,7.4,22.9 M9.4,20.1C9.4,20.1,9.4,20.1,9.4,20.1c-0.1,0-0.1,0-0.2,0c0,0,0,0.1,0,0.1
-	C9.2,20.2,9.3,20.2,9.4,20.1 M8.8,22.1c0.3-0.5,0.6-1.2,0.8-2c0,0,0,0,0,0c0,0,0,0-0.1,0c-0.1,0-0.1,0.1-0.2,0.2c0,0,0,0,0,0
-	c0,0-0.1,0-0.1,0c0,0,0-0.1,0-0.1c-0.1,0-0.1,0-0.1,0c0,0,0-0.1,0.1-0.1c-0.5,0-1.1,0-1.7,0c-0.5,0-1,0-1.4,0c0,0,0,0.1,0,0.1
-	c0,0,0,0.1,0,0.2l0,0c0.1,0.1,0.1,0,0.1,0c0.1,0.1-0.1,0.1-0.1,0.2c0,0,0.1,0.1,0.1,0.1c0,0,0,0,0,0c0.1,0.1,0.2,0.1,0.6,0.7
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0.1,0.2,0.4,0.2,0.5,0.3
-	c0.1,0.1-0.1,0.3-0.1,0.4c0,0-0.1,0-0.1,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0s0,0,0,0s0,0,0,0s0,0,0,0c0,0,0,0,0,0s0,0,0,0l0.1,0
-	c0,0.1,0.1,0.7,0.1,0.7c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0.1,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0l0,0l0,0l0,0c0,0,0,0,0,0l0,0
-	c0,0,0,0,0,0h0c0,0,0,0,0,0h0h0c0,0,0,0,0,0c0,0,0,0,0,0l0,0h0l0,0l0,0l0,0h0c0,0,0-0.1,0-0.1c0,0,0,0,0.1-0.1c0,0,0.1,0,0.2-0.1
-	c0,0,0,0,0-0.1c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0.1,0,0.2,0,0.4-0.2c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0-0.1,0.1-0.1,0.1c0.2-0.1,0.2-0.1,0.4-0.3c0,0,0,0,0,0C8.7,22.1,8.8,22.1,8.8,22.1 M13.7,18.3C13.7,18.3,13.7,18.3,13.7,18.3
-	C13.7,18.3,13.7,18.3,13.7,18.3C13.7,18.3,13.7,18.3,13.7,18.3C13.7,18.3,13.7,18.4,13.7,18.3L13.7,18.3
-	C13.7,18.4,13.7,18.3,13.7,18.3 M14,15.4c0-0.2-0.1-0.5-0.1-0.7v0c0-0.1-0.1-0.1-0.2-0.2c0,0-0.1,0-0.3-0.6c0,0,0,0,0,0
-	c0-0.1,0-0.1-0.1-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0,0-0.1,0c0,0,0,0-0.1,0.1c0,0,0,0,0,0.1c0,0,0,0.1-0.1,0.1
-	c0,0,0,0-0.1,0c-0.1,0-0.1,0-0.1-0.1c0,0-0.1,0.5,0,0.7c0.1,0.3-0.2,0.4-0.2,0.7c0,0.2-0.1,0.4-0.1,0.7c0,0,0,0,0,0
-	c0.1,0.1,0.1,0.7,0,0.8c0,0,0,0.1,0.1,0.1c0,0,0,0,0,0c0,0,0,0.1,0,0.1c0,0,0,0,0,0l0,0l0,0l0,0l0,0h0l0,0l0,0l0-0.1
-	c0,0,0-0.1,0-0.1c0,0,0,0,0,0c0,0,0,0.2,0,0.2c0,0,0.1,0.1,0.1,0.1c0,0,0.1,0.1,0.1,0.1v0c0,0-0.1,0-0.1,0c0,0,0,0,0.1,0.2
-	c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0s0,0,0,0s0,0,0,0s0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0v0v0L12.8,18c0,0,0,0,0,0c0,0,0.2,0.3,0.3,0.3
-	c0.1,0,0.1-0.2,0.2-0.2c0,0,0,0,0-0.1c0,0,0,0,0,0c0.1,0,0.3-0.2,0.3-0.2c0,0,0.2,0,0.2,0.1l0.2,0v0c0,0.1-0.2,0.1-0.2,0.1
-	c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0.1,0.1,0.1,0.1v0l-0.1,0c0,0.1-0.1,0.2-0.2,0.3l0,0c0,0,0,0.1,0,0.1c0,0,0,0,0,0
-	c0,0,0,0.1-0.1,0.2l0,0l0,0c0,0,0,0,0,0.1c-0.1,0.4-0.5,1-0.5,1c0,0,0,0,0,0s0,0,0,0c0.1,0,0.2-0.3,0.3-0.6c0.2-0.3,0.3-0.6,0.4-0.9
-	s0.2-0.6,0.2-1c0.1-0.3,0.1-0.7,0.1-1C14.1,16.1,14.1,15.8,14,15.4 M13.4,13.8C13.4,13.8,13.4,13.8,13.4,13.8
-	C13.4,13.8,13.4,13.8,13.4,13.8C13.4,13.8,13.4,13.8,13.4,13.8C13.4,13.8,13.4,13.8,13.4,13.8C13.4,13.8,13.4,13.8,13.4,13.8
-	c0,0.1,0,0.1,0.1,0.2C13.5,13.9,13.5,13.9,13.4,13.8 M13.2,13.5C13.2,13.5,13.2,13.5,13.2,13.5C13.2,13.4,13.2,13.4,13.2,13.5
-	C13.2,13.5,13.2,13.5,13.2,13.5C13.2,13.5,13.2,13.5,13.2,13.5C13.2,13.5,13.2,13.5,13.2,13.5c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0C13.3,13.6,13.3,13.6,13.2,13.5 M13.1,13.3C13.1,13.3,13.1,13.2,13.1,13.3
-	L13.1,13.3L13.1,13.3C13.1,13.3,13.1,13.3,13.1,13.3L13.1,13.3C13.1,13.3,13.1,13.3,13.1,13.3C13.1,13.3,13.1,13.3,13.1,13.3
-	C13.1,13.3,13.1,13.3,13.1,13.3C13.1,13.3,13.1,13.3,13.1,13.3L13.1,13.3L13.1,13.3L13.1,13.3L13.1,13.3L13.1,13.3L13.1,13.3
-	c0,0.1,0.1,0.1,0.1,0.1l0,0C13.2,13.4,13.1,13.3,13.1,13.3 M13.3,13.5C13.3,13.5,13.2,13.5,13.3,13.5l-0.1-0.1c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0-0.2-0.4-0.3-0.4l0,0c0,0-0.1,0-0.3,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0,0,0,0l0,0l0,0
-	c0,0,0.1,0.1,0.1,0.2c0,0,0,0-0.1,0c0,0.1-0.1,0-0.1,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0.1,0,0.1,0.1
-	c0.1,0.1,0.1,0.3,0.1,0.4c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0.1
-	c0,0,0,0.1,0,0.1c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0.1,0.1,0.1c0,0.1,0.1,0.1,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0l0,0h0
-	c0,0,0-0.1,0-0.1c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0-0.1,0-0.1c0,0,0,0,0,0c0,0,0-0.1,0-0.1c0,0,0,0,0,0
-	c0,0,0,0-0.1-0.1c0-0.1,0-0.1,0-0.2l0,0c0,0,0-0.1,0-0.1c0-0.1,0-0.1,0-0.1c-0.1-0.1-0.1-0.1-0.1-0.1c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0-0.1,0-0.1c0,0,0,0,0,0C13,13,13.3,13.5,13.3,13.5C13.3,13.5,13.3,13.5,13.3,13.5L13.3,13.5
-	L13.3,13.5L13.3,13.5L13.3,13.5C13.3,13.5,13.3,13.5,13.3,13.5C13.3,13.5,13.3,13.5,13.3,13.5C13.3,13.5,13.3,13.6,13.3,13.5
-	C13.3,13.6,13.3,13.6,13.3,13.5c0.1,0.1,0.1,0.2,0.1,0.2c0,0,0,0,0,0l0,0l0,0c0,0,0,0,0,0.1c0,0,0,0,0,0l0,0l0,0c0,0,0,0,0-0.1
-	C13.4,13.7,13.3,13.6,13.3,13.5 M12.9,12.9C12.9,12.9,12.9,12.9,12.9,12.9C12.9,12.9,12.9,12.9,12.9,12.9C12.9,12.9,13,13,12.9,12.9
-	C13,13,12.9,12.9,12.9,12.9 M13.1,13.1c0-0.1-0.1-0.1-0.1-0.2c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0C13,13,13,13,13.1,13.1
-	C13,13,13,13,13.1,13.1C13,13.1,13.1,13.1,13.1,13.1C13.1,13.1,13.1,13.1,13.1,13.1 M9.2,12.9L9.2,12.9L9.2,12.9L9.2,12.9L9.2,12.9
-	c-0.1,0-0.1,0-0.1,0.1C9.1,12.9,9.1,12.9,9.2,12.9C9.2,12.9,9.2,12.9,9.2,12.9C9.2,12.9,9.2,12.9,9.2,12.9 M2.7,12.5
-	C2.8,12.5,2.7,12.5,2.7,12.5C2.7,12.5,2.7,12.5,2.7,12.5C2.7,12.6,2.7,12.6,2.7,12.5C2.7,12.6,2.7,12.6,2.7,12.5 M2.9,12.4
-	C2.9,12.4,2.9,12.4,2.9,12.4C2.9,12.3,2.9,12.3,2.9,12.4c0.1-0.1,0.1-0.1,0.1-0.1c0,0,0,0,0,0C2.8,12.3,2.8,12.4,2.9,12.4
-	C2.8,12.4,2.8,12.4,2.9,12.4C2.8,12.4,2.8,12.4,2.9,12.4C2.8,12.4,2.8,12.4,2.9,12.4C2.8,12.4,2.8,12.4,2.9,12.4
-	C2.8,12.4,2.8,12.4,2.9,12.4C2.8,12.4,2.8,12.4,2.9,12.4C2.9,12.4,2.9,12.4,2.9,12.4 M2.9,12.2C3,12.1,3,12.1,2.9,12.2
-	C3,12.1,3,12.1,2.9,12.2C3,12.1,3,12.1,2.9,12.2C2.9,12.1,2.9,12.2,2.9,12.2C2.9,12.2,2.9,12.2,2.9,12.2L2.9,12.2
-	C2.9,12.2,2.9,12.2,2.9,12.2 M3,12.1C3,12,3,12,3,12.1C3.1,12,3.1,12,3,12.1C3.1,12,3.1,12,3,12.1C3,12,3,12,3,12.1
-	C3,12.1,3,12.1,3,12.1C3,12,3,12.1,3,12.1 M9,13c0,0,0-0.2,0-0.2c0,0,0.1,0,0-0.1c0-0.2,0-0.1,0-0.1c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0-0.1,0-0.1,0c-0.1,0-0.1,0.1-0.2,0.1c0,0,0-0.1,0-0.1c0.1,0,0.2-0.1,0.2-0.1c-0.3-0.1-0.3-0.2-0.3-0.2
-	c0-0.1,0-0.3-0.1-0.3c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0
-	c0,0,0,0.1-0.1,0c0,0,0,0.1,0,0.1c0,0,0.1,0,0.1,0c0-0.1-0.1,0-0.1-0.1c0,0,0,0,0,0C8.4,12,8.4,12,8.3,12c0,0,0,0,0,0c0,0,0,0,0,0
-	c-0.1-0.1-0.1-0.1-0.2-0.2c0,0,0,0-0.1,0.1c0,0,0,0,0,0.1C8,11.9,8,12,8,12c0,0,0,0,0,0c0,0,0-0.1-0.1-0.1C7.9,12,7.9,12,7.8,12
-	c0,0,0,0,0,0c0-0.1-0.1,0-0.2,0c0,0,0,0,0,0c0,0,0-0.1,0-0.1c0,0,0,0.2,0,0.2c0,0,0-0.1,0-0.1c0,0,0,0,0,0c-0.1,0-0.2-0.2-0.2-0.2
-	c0,0,0-0.1,0-0.1c0,0-0.1-0.1-0.1-0.1c-0.1,0-0.1,0-0.1,0c-0.1,0-0.1,0-0.2-0.1c0,0,0,0,0,0c0,0-0.1,0,0,0.1c0,0,0,0.1,0,0.1v0
-	c0,0,0,0,0,0c0,0,0,0.1,0,0.1l-0.1,0.1C6.9,12,7.1,12,7,12.2c0,0.1-0.1,0.4-0.3,0.5c0,0,0.1,0.3,0.1,0.3c0,0,0,0,0,0
-	c0,0,0.3-0.4,0.3-0.4c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0.1-0.1,0.1-0.1,0.2c0,0-0.1,0.1-0.1,0.1c0,0-0.1,0-0.1-0.1c0,0,0,0-0.1,0c0,0,0,0.1,0,0.1c0.3,0,0.5,0,0.8,0c0.5,0,1,0,1.5,0
-	c0,0-0.1-0.1-0.1-0.1C9,12.9,9,12.9,9,12.8 M9,11.3C9,11.2,9,11.2,9,11.3L9,11.3L9,11.3 M6.8,11.3L6.8,11.3c0,0,0,0-0.1,0
-	c0,0,0-0.1,0-0.1c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0-0.1-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c-0.1,0.1-0.1,0.1-0.1,0.2c-0.1,0-0.1,0-0.1,0.1c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0.1c0,0,0,0,0,0c0,0,0,0,0.1,0
-	c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0C6.7,11.3,6.7,11.3,6.8,11.3C6.8,11.3,6.8,11.3,6.8,11.3 M7.3,10.8
-	C7.3,10.8,7.3,10.8,7.3,10.8C7.3,10.8,7.2,10.8,7.3,10.8c-0.2,0-0.2,0.1-0.1,0.1C7.1,10.9,7.2,11,7.3,10.8"/>
-<path style="fill:#B3E710;" d="M9.6,13.4C9.6,13.4,9.6,13.4,9.6,13.4C9.6,13.4,9.6,13.4,9.6,13.4C9.6,13.4,9.6,13.3,9.6,13.4
-	L9.6,13.4C9.5,13.3,9.5,13.3,9.6,13.4C9.5,13.4,9.5,13.4,9.6,13.4c-0.1-0.1-0.1-0.1-0.1-0.1c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0
-	l0,0c0,0,0,0-0.1,0c0,0,0,0,0.1-0.1c0,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0-0.1,0c0,0,0,0-0.1,0.1c0-0.1,0-0.1,0.1-0.2c0,0-0.1,0-0.1,0C9,13,9,13,9,13.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0-0.1,0
-	c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0-0.1,0-0.1,0.1c0,0,0,0,0,0.1c0.1,0,0.1,0,0.2,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0c0,0,0,0,0,0
-	c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0-0.1,0.1-0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1-0.1,0.1-0.1c0,0,0,0,0,0l0,0c0,0,0,0,0,0.1
-	c0,0,0,0,0,0l0,0L9.6,13.4C9.5,13.4,9.5,13.5,9.6,13.4C9.6,13.5,9.6,13.5,9.6,13.4C9.6,13.5,9.6,13.4,9.6,13.4 M12.6,12.9
-	C12.6,12.9,12.6,12.9,12.6,12.9C12.6,12.9,12.6,12.9,12.6,12.9L12.6,12.9C12.6,12.9,12.6,12.9,12.6,12.9 M11.6,11.8
-	c0,0-0.1-0.2-0.2-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0s0,0,0,0s0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0C11.7,11.9,11.7,11.9,11.6,11.8C11.6,11.9,11.6,11.9,11.6,11.8
-	 M11.5,11.7L11.5,11.7C11.5,11.7,11.4,11.7,11.5,11.7C11.4,11.7,11.4,11.7,11.5,11.7C11.4,11.7,11.5,11.7,11.5,11.7 M11.8,11.7
-	C11.8,11.6,11.8,11.6,11.8,11.7L11.8,11.7C11.8,11.7,11.8,11.7,11.8,11.7C11.8,11.7,11.8,11.7,11.8,11.7
-	C11.8,11.7,11.8,11.7,11.8,11.7C11.9,11.7,11.9,11.7,11.8,11.7C11.9,11.7,11.9,11.7,11.8,11.7C11.9,11.7,11.9,11.7,11.8,11.7
-	C11.9,11.7,11.9,11.7,11.8,11.7L11.8,11.7L11.8,11.7C11.9,11.7,11.8,11.7,11.8,11.7 M11.6,11.4C11.6,11.4,11.6,11.4,11.6,11.4
-	L11.6,11.4C11.6,11.5,11.6,11.5,11.6,11.4C11.6,11.5,11.6,11.5,11.6,11.4c0.1,0.1,0.1,0.1,0.1,0.1C11.7,11.5,11.7,11.5,11.6,11.4
-	C11.6,11.5,11.6,11.5,11.6,11.4C11.6,11.5,11.6,11.5,11.6,11.4 M9.4,11.4C9.4,11.4,9.4,11.4,9.4,11.4C9.4,11.4,9.4,11.4,9.4,11.4
-	C9.4,11.4,9.4,11.4,9.4,11.4C9.4,11.4,9.3,11.4,9.4,11.4C9.3,11.4,9.4,11.4,9.4,11.4C9.4,11.4,9.4,11.4,9.4,11.4 M12.1,12.1
-	c0,0-0.1-0.1-0.1-0.1C12,12,12,12,12.1,12.1C11.9,12,11.9,12,11.9,12c0,0-0.1-0.1-0.2-0.2c-0.2-0.1-0.2-0.2-0.2-0.2c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.1-0.1-0.1-0.1c0,0-0.1,0-0.1,0c0,0,0-0.1-0.1-0.1c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0.1c0,0,0.1,0.1,0.1,0.1l0,0
-	c0,0,0,0,0,0l0,0c0,0,0,0.1,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0.1,0.1,0.1,0.1,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0.1,0.1,0.1c0,0,0,0,0,0
-	c0,0,0,0,0,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0.1l0,0C11.9,12.1,11.9,12.1,12.1,12.1C12,12.2,12,12.2,12.1,12.1C12,12.2,12,12.2,12.1,12.1
-	C12,12.2,12,12.1,12.1,12.1C12,12.2,12,12.2,12,12.2c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0.1,0,0.1,0,0.1
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0C12.1,12.2,12.1,12.2,12.1,12.1
-	C12.1,12.2,12.1,12.2,12.1,12.1C12.1,12.2,12.1,12.2,12.1,12.1C12.1,12.2,12.1,12.2,12.1,12.1C12.1,12.1,12.1,12.1,12.1,12.1
-	 M9.9,10.7c0,0-0.1,0-0.1,0c0,0,0,0-0.1,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0
-	c0,0-0.1,0-0.1,0c0,0,0,0,0,0l0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c-0.1,0-0.1-0.1-0.2-0.1c0,0,0,0,0,0l0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0.1,0l0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0.1,0,0.1,0,0.1,0.1c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0
-	c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0C10,10.8,10,10.8,9.9,10.7C10,10.8,10,10.8,9.9,10.7C10,10.8,10,10.7,9.9,10.7
-	C10,10.7,10,10.7,9.9,10.7C10,10.7,9.9,10.7,9.9,10.7 M8.6,10.2C8.6,10.2,8.6,10.2,8.6,10.2C8.5,10.2,8.5,10.2,8.6,10.2
-	C8.6,10.2,8.6,10.2,8.6,10.2L8.6,10.2C8.7,10.2,8.6,10.2,8.6,10.2L8.6,10.2L8.6,10.2L8.6,10.2L8.6,10.2C8.6,10.2,8.6,10.2,8.6,10.2
-	 M12.1,11.9C12.1,11.9,12,11.8,12.1,11.9L12.1,11.9C12,11.9,12.1,11.9,12.1,11.9c0,0-0.1-0.1-0.1-0.1l0,0l0,0h0
-	C12,11.8,12,11.9,12.1,11.9C12.1,11.9,12.1,11.9,12.1,11.9L12.1,11.9L12.1,11.9L12.1,11.9C12,11.8,12,11.8,12,11.8c0,0,0,0,0,0
-	c0,0-0.1-0.1-0.1-0.1l0,0c0,0,0,0-0.1-0.1l0,0l0,0l0,0c0,0,0,0-0.1,0c0,0,0,0,0.1,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0.1,0.1,0.1,0.1l0,0c0.1,0,0.1,0.1,0.2,0.2l0,0L12.1,11.9L12.1,11.9L12.1,11.9C12,11.9,12,11.9,12.1,11.9
-	C12,11.9,12,11.9,12.1,11.9C12.1,11.9,12,11.9,12.1,11.9C12.1,11.9,12.1,11.9,12.1,11.9L12.1,11.9L12.1,11.9L12.1,11.9
-	C12.1,11.9,12,11.9,12.1,11.9C12,11.9,12,11.9,12.1,11.9C12,11.9,12,11.9,12.1,11.9C12.1,11.9,12.1,11.9,12.1,11.9
-	C12.1,12,12.1,12,12.1,11.9L12.1,11.9C12,11.9,12,11.9,12.1,11.9C12,11.9,12,11.9,12.1,11.9C12,12,12.1,12,12.1,11.9
-	c0,0.1,0,0.1,0,0.2c0,0,0,0,0,0c0,0,0,0,0,0l0,0C12.1,12,12.1,12,12.1,11.9c0,0.1,0,0.1,0.1,0.3c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0.1,0.1,0.1c0,0,0,0,0,0.1l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0.1,0.1,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0l0,0l0,0
-	c0,0,0,0,0.1,0.1c0.1,0.1,0.1,0.1,0.2,0.2c0.2,0,0.3,0,0.3,0l0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c-0.1-0.1-0.1-0.2-0.2-0.3C12.6,12.4,12.3,12.1,12.1,11.9 M10.5,10.7c-0.2-0.1-0.4-0.2-0.6-0.3l0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0.1C10.4,10.7,10.5,10.7,10.5,10.7C10.5,10.8,10.5,10.8,10.5,10.7
-	c0.1,0.1,0.2,0.1,0.2,0.1l0,0c0,0,0.1,0,0.1,0.1c0,0,0,0,0,0l0,0h0l0,0h0c0,0,0,0,0,0l0,0h0l0,0l0,0c0,0,0,0,0.1,0c0,0,0,0,0,0
-	c0,0,0,0,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0.1,0.1,0.1c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0.1l0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0l0,0l0,0l0,0l0,0l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0c0,0,0.1,0.1,0.1,0.1l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c-0.1-0.1-0.1-0.1-0.2-0.2c0,0,0,0,0.1,0c0,0,0.1,0.1,0.1,0.1c0,0,0,0,0,0l0,0c0,0,0.1,0.1,0.1,0.1c0,0,0.1,0.1,0.1,0.1l0,0l0,0l0,0
-	c0,0,0.1,0.1,0.1,0.1c0,0,0,0,0,0c0,0,0,0-0.1-0.1l0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0-0.1-0.1-0.1-0.1c-0.1-0.1-0.2-0.2-0.3-0.3
-	C11.1,11.1,10.8,10.9,10.5,10.7 M8.3,10.1L8.3,10.1C8.3,10.1,8.3,10.1,8.3,10.1L8.3,10.1L8.3,10.1C8.3,10.1,8.2,10.1,8.3,10.1
-	L8.3,10.1C8.2,10.1,8.3,10.1,8.3,10.1L8.3,10.1L8.3,10.1C8.3,10.1,8.3,10.1,8.3,10.1L8.3,10.1L8.3,10.1L8.3,10.1L8.3,10.1
-	C8.3,10.1,8.3,10.1,8.3,10.1C8.3,10.1,8.3,10.1,8.3,10.1L8.3,10.1C8.3,10.1,8.3,10.1,8.3,10.1 M8.2,10.1L8.2,10.1L8.2,10.1
-	C8.2,10.1,8.2,10.1,8.2,10.1C8.2,10.1,8.2,10.1,8.2,10.1C8.2,10.1,8.2,10.1,8.2,10.1C8.2,10.1,8.2,10.1,8.2,10.1L8.2,10.1
-	C8.2,10.1,8.2,10.1,8.2,10.1C8.2,10.1,8.2,10.1,8.2,10.1 M8.2,10.1C8.2,10.1,8.2,10.1,8.2,10.1L8.2,10.1L8.2,10.1L8.2,10.1
-	C8.1,10.1,8.1,10.1,8.2,10.1L8.2,10.1L8.2,10.1L8.2,10.1L8.2,10.1C8.2,10.1,8.2,10.1,8.2,10.1C8.2,10.1,8.2,10.1,8.2,10.1 M8,10
-	L8,10C7.9,10,7.9,10,8,10C7.9,10,8,10,8,10C8,10,8,10,8,10 M7.9,10C7.8,10,7.8,10,7.9,10C7.8,10,7.8,10,7.9,10L7.9,10
-	C7.8,10,7.9,10,7.9,10C7.9,10,7.9,10,7.9,10 M7.8,10L7.8,10C7.8,10,7.7,10,7.8,10C7.8,10,7.8,10,7.8,10C7.7,10,7.7,10,7.8,10
-	C7.7,10,7.7,10,7.8,10C7.8,10,7.8,10,7.8,10L7.8,10C7.8,10,7.8,10,7.8,10 M7.7,10L7.7,10L7.7,10C7.6,10,7.6,10,7.7,10
-	C7.6,10,7.6,10,7.7,10C7.6,10,7.6,10,7.7,10C7.6,10,7.7,10,7.7,10L7.7,10 M7.9,10c-0.1,0-0.2,0-0.2,0h0c0,0,0.1,0,0.1,0
-	C7.8,10,7.8,10,7.9,10 M7.6,10C7.6,10,7.5,10,7.6,10L7.6,10C7.6,10,7.6,10,7.6,10C7.6,10,7.6,10,7.6,10 M8,10L8,10L8,10L8,10L8,10
-	 M9,10H8.7c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0.2,0,0.2,0.1C9,10.2,9,10,9,10H8.7l0,0.1c0,0,0,0,0,0
-	l0-0.1c0,0,0-0.1,0-0.1c0,0,0,0,0,0c0,0,0.2,0.1,0.2,0.1c0,0,0.2,0.1,0.2,0.1v0c0,0-0.2-0.1-0.2-0.1c0,0-0.2-0.1-0.2-0.1h0
-	c0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0C8.5,10,9,10.1,9,10v0.1c-1,0-0.3,0-0.3,0c0,0-0.1-0.1-0.1-0.1c0,0-0.1-0.1-0.1-0.1c0,0,0,0,0,0
-	c0,0,0.1,0,0.1,0l0,0h0l0,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0.1,0l0,0c0,0,0-0.1,0-0.1l0-0.1h0.2
-	C8.8,10,9,10.1,9,10L9,10H8.3c0,0-0.3,0.1-0.3,0.1v-0.1c0,0,0.5-0.1,0.5-0.1h0l0,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0-0.4,0-0.4,0v0.1l0,0l0,0v0l0,0l0,0l0,0l0.4,0h0l0,0h0c0,0-0.4,0-0.4,0l0,0v0.1v0l0,0v0v0l0,0c0,0,0.2-0.1,0.2-0.1
-	c0,0,0.2,0,0.2,0h0c0,0,0,0.1,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0-0.1,0h0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0c0,0-0.1,0-0.1,0V10h0.1l0,0l0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0-0.2,0-0.2,0v0v0l0,0v0l0,0v0v0c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0v0v0v0h0h0c0,0,0,0,0,0h0
-	c0,0,0,0,0,0h0v0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0h0c0,0,0,0,0,0h0c0,0,0,0,0,0h0c0,0,0,0,0,0c0,0-0.1,0-0.1,0h0c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0h0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0h0h0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0.5,0,1,0.5,1.4,1.2c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0-0.2,0-0.1c0,0,0-0.2,0-0.2c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0.2,0,0.2
-	c0,0,0,0.1,0,0.1c0,0,0.1,0,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0
-	c0,0,0,0,0,0l0,0l0,0h0c0,0,0,0,0,0h0c0,0,0,0,0,0c0,0-0.2,0-0.2,0c0,0-0.2,0-0.2,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0.2,0,0.2,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0l0,0c0,0-0.2,0-0.2,0c0,0-0.2,0-0.2,0c0,0,0-0.2,0-0.2
-	c0,0,0.5-0.2,0.5-0.2h0c0,0,0,0.2,0,0.2c0,0,0,0.1,0,0.1c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0.1,0,0.1,0c0,0,0.2,0,0.2,0c0,0,0,0,0,0c0,0-0.1,0-0.2,0c0,0,0.1,0,0,0
-	c0,0,0.1,0,0.1,0c0,0,0-0.4,0-0.4s-0.3,0-0.3,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0.2,0,0.2c0,0,0-0.1,0-0.1c0,0,0-0.1,0-0.1h0l0,0.2
-	c0,0,0,0.1,0,0.1c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0-0.1-0.1
-	c0,0,0,0,0.1,0l0,0c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0.2,0,0.2,0c0,0-0.7,0,0.3,0v0c-1,0-0.3,0-0.3,0H9.6c0,0,0,0,0,0
-	c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0-0.5,0-0.5,0v0l0,0v0l0,0v0h0.2H9v0l0.3,0c0,0,0.1,0,0.1,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0L9,11v0
-	c0,0,0.4,0,0.4,0c0,0,0,0,0,0s0,0,0,0s0,0,0,0s0,0,0,0s0,0,0,0s0,0,0,0s0,0,0,0s0,0,0,0l0,0c0,0,0,0-0.1,0l0,0l0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0c0,0,0,0-0.1,0c0,0,0,0,0.1,0c0,0,0,0.1,0,0.1c0,0,0,0.1-0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.3-0.1-0.3-0.1v-0.1c0,0,0.1,0,0.1-0.1c0,0,0.1,0,0.1,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0-0.1,0-0.1,0c0,0-0.2,0-0.2,0c0,0,0,0,0,0c0,0,0.2,0.3,0.2,0.3h0c0,0,0-0.2,0-0.2c0,0,0.1,0.1,0.1,0.1c0,0,0,0.1,0,0.1
-	c0,0,0,0,0,0c0,0,0-0.2,0-0.2c0,0,0-0.1,0-0.1c0,0-0.1,0-0.1,0c0,0-0.2,0-0.2,0V11c0,0,0.2,0,0.2,0c0,0,0.1-0.2,0-0.2
-	c0,0,0-0.1,0-0.1c0,0,0-0.1,0.1,0c0,0,0,0.2,0,0.2l0,0.2c0,0,0,0,0,0c0,0,0-0.3,0-0.3l0-0.1l0-0.1c0,0,0-0.3,0-0.3C9,10.2,9,10,9,10
-	C9,10,9,10,9,10L9,10.2c0,0,0,0.1-0.1,0.1l0,0c0,0,0.1,0.1,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0l0,0l0,0c0,0-0.1,0-0.1,0c0,0,0.1,0,0.1,0c0,0,0-0.1,0-0.1V10H8.8H9v0.1
-	l0,0V10c0,0-0.1,0-0.1,0l0,0H9L9,10v0.2l-0.1,0c0,0-0.1-0.1-0.1-0.1c0,0-0.1-0.1-0.1-0.1"/>
-<path style="fill:#B3E710;" d="M10.4,20.8c0,0,0.1-0.2,0.1-0.2c0,0-0.1,0-0.1,0c-0.1-0.2-0.1-0.2-0.1-0.2c0,0-0.1,0-0.1,0
-	c0,0-0.1-0.1-0.1-0.1c0,0-0.1,0-0.2,0.1c0,0,0.1-0.1,0-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0-0.1-0.1c-0.2,0.8-0.5,1.5-0.8,2
-	c0.1,0,0.1,0,0.1,0c0,0,0.1,0,0.1-0.1c0,0,0.1,0,0.1,0c0,0,0.1-0.1,0.1-0.1c0-0.1,0.2-0.1,0.2-0.2c0.1-0.1,0.1-0.1,0.2-0.2
-	c0-0.1,0.1-0.1,0.2-0.3c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0,0.1-0.1c0,0,0.1-0.1,0.1-0.1c0.1-0.1,0.1-0.1,0.2-0.1
-	C10.3,20.8,10.4,20.8,10.4,20.8 M12.8,20.3c0.1-0.1,0.1-0.2,0.2-0.3c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0c-0.6,0.9-1.1,1.3-1.3,1.5
-	c0.2-0.2,0.4-0.3,0.6-0.5C12.3,20.9,12.6,20.6,12.8,20.3 M9.5,20.1C9.5,20.1,9.5,20.1,9.5,20.1C9.5,20.1,9.5,20.1,9.5,20.1
-	C9.5,20.1,9.5,20.1,9.5,20.1 M9.4,20C9.4,20,9.4,20,9.4,20c0,0-0.1,0-0.2,0c0,0,0,0,0,0s0,0,0,0s0,0,0,0s0,0,0,0s0,0,0,0s0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0.1C9.3,20.1,9.3,20.1,9.4,20C9.4,20.1,9.4,20.1,9.4,20 M8.1,18.8C8.1,18.8,8.1,18.8,8.1,18.8
-	C8.1,18.8,8.1,18.8,8.1,18.8C8.1,18.8,8.1,18.8,8.1,18.8C8.1,18.8,8.1,18.8,8.1,18.8C8.1,18.8,8.1,18.9,8.1,18.8
-	C8.1,18.9,8.1,18.9,8.1,18.8C8.1,18.9,8,18.9,8,18.9c0,0,0,0,0,0C8.1,18.9,8.1,18.9,8.1,18.8C8.1,18.9,8.1,18.9,8.1,18.8 M6.8,17.4
-	L6.8,17.4c0-0.1-0.2-0.1-0.2-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0h0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0h0l0,0
-	c0,0,0.1,0.1,0.1,0.1C6.7,17.5,6.7,17.4,6.8,17.4C6.8,17.4,6.8,17.4,6.8,17.4C6.8,17.4,6.8,17.4,6.8,17.4
-	C6.8,17.4,6.8,17.4,6.8,17.4L6.8,17.4 M8.2,17.4C8.2,17.4,8.2,17.4,8.2,17.4c0,0-0.1-0.1-0.2,0c0,0,0,0,0,0.1
-	C8.1,17.4,8.2,17.4,8.2,17.4C8.2,17.4,8.2,17.4,8.2,17.4 M7.9,17.4C7.9,17.4,7.9,17.4,7.9,17.4c-0.1-0.1-0.2-0.1-0.2-0.1
-	c-0.1,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0s0,0-0.1,0c0,0,0,0-0.1,0c-0.1,0-0.1,0-0.2,0l0,0c0,0,0,0,0,0
-	c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0,0,0,0c-0.1,0-0.2,0-0.3,0c0,0,0,0,0,0l0,0c0,0,0,0,0.1,0.1c0,0,0,0,0,0
-	c0,0,0,0,0.1,0c0.1,0,0.1,0,0.2,0c0,0,0,0.1,0.1,0.1c0-0.1,0-0.1,0.1-0.1c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0
-	C7.8,17.4,7.8,17.4,7.9,17.4C7.8,17.4,7.8,17.4,7.9,17.4C7.9,17.4,7.9,17.4,7.9,17.4 M7.1,17.1L7.1,17.1C7,17.1,7,17.1,6.9,17.1
-	c0,0,0,0,0,0c0,0,0,0,0,0h0h0h0h0h0h0l0,0l0,0c-0.1,0-0.2,0-0.2-0.1c0,0,0-0.1-0.1-0.1c0,0-0.1,0-0.1,0c-0.1,0-0.1,0-0.2-0.1
-	c0,0,0,0,0,0c-0.1,0-0.1,0-0.2,0c0,0,0,0,0,0h0c0,0,0,0,0,0c0,0,0,0,0,0h0c0,0,0,0,0,0h0c0,0,0,0,0,0c-0.1,0-0.3,0-0.3,0.1
-	c0,0,0,0,0,0l0,0c0,0,0.1,0,0.1,0c0.2-0.1,0.2-0.1,0.3-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0.1,0,0.1,0,0.2,0c0.1,0,0.1,0,0.1,0.1c0,0,0,0,0,0c0.1,0,0.1,0,0.1,0.1c0.1,0,0.1,0,0.2,0.1c0,0,0,0.1-0.1,0.1
-	c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0.1,0,0.1,0,0.2,0C7,17.2,7.1,17.2,7.1,17.1 M7,15L7,15C7,15,6.9,14.9,7,15C6.9,14.9,6.9,14.9,7,15
-	C6.9,15,7,15,7,15 M6.9,14.9C6.9,14.9,6.9,14.9,6.9,14.9L6.9,14.9L6.9,14.9 M6.9,14.9C6.9,14.9,6.9,14.9,6.9,14.9L6.9,14.9
-	C6.9,14.9,6.9,14.9,6.9,14.9 M6.9,14.9C6.9,14.9,6.9,14.9,6.9,14.9L6.9,14.9C6.9,14.9,6.9,14.9,6.9,14.9 M6.9,14.9
-	C6.9,14.9,6.9,14.9,6.9,14.9L6.9,14.9C6.9,14.9,6.9,14.9,6.9,14.9 M8.9,13.6C8.9,13.6,8.9,13.6,8.9,13.6C8.9,13.6,8.8,13.5,8.9,13.6
-	c-0.1,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0-0.1,0-0.1c0,0,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0.1-0.1,0.1c0,0,0,0,0,0.1
-	C8.7,13.6,8.8,13.6,8.9,13.6C8.8,13.6,8.9,13.6,8.9,13.6 M2.7,13.3L2.7,13.3C2.7,13.2,2.7,13.2,2.7,13.3C2.7,13.2,2.7,13.2,2.7,13.3
-	c0-0.1,0-0.1,0-0.1c0,0,0-0.1,0-0.1c0,0,0,0,0,0c0,0,0,0-0.1,0c0,0,0,0,0,0l0,0c0,0,0,0.1,0,0.1c0,0,0,0,0,0c0,0,0,0,0,0.1l0,0
-	c0,0,0,0,0,0C2.6,13.2,2.6,13.2,2.7,13.3C2.6,13.2,2.6,13.2,2.7,13.3C2.7,13.2,2.6,13.2,2.7,13.3C2.6,13.2,2.6,13.2,2.7,13.3
-	C2.6,13.2,2.7,13.3,2.7,13.3C2.7,13.3,2.7,13.3,2.7,13.3C2.7,13.3,2.7,13.3,2.7,13.3 M9.3,19.8C9.3,19.8,9.3,19.8,9.3,19.8
-	c-0.1-0.1-0.1-0.1-0.1-0.3c0,0-0.4-0.3-0.5-0.2c0,0-0.1,0-0.1,0c0,0,0,0,0,0l0,0c-0.1-0.1-0.3-0.1-0.4-0.1c0,0-0.3,0-0.3,0
-	c0,0,0,0,0,0c0-0.2,0.1-0.2-0.1-0.2c0,0,0.1,0,0.1,0C8,19,8.1,19,8.1,19c-0.1,0,0,0-0.1-0.1c0,0,0,0-0.1,0c0,0,0,0,0,0
-	c0,0,0,0,0-0.1c0,0,0,0,0,0c0,0,0.1,0,0.1,0l0,0l0,0c-0.2,0-0.3,0-0.5,0c-0.1,0-0.3-0.1-0.4-0.1c0,0,0-0.1,0-0.1c0,0,0,0,0,0
-	c0,0,0,0,0,0l0,0l0,0c0,0,0,0-0.2,0.1c0,0,0,0,0,0c0,0.1,0.1,0.1,0.1,0.2c0,0,0,0-0.1,0c-0.1-0.1-0.1-0.1,0-0.2c0-0.1,0-0.1,0-0.1
-	c0,0,0.1,0,0.1,0c0,0,0.1,0,0.1,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0c0,0-0.3,0.3-0.3,0.3c0,0,0,0,0,0c0,0,0-0.3-0.2-0.4
-	c-0.1,0-0.2,0-0.3,0C6,18.5,5.8,18.2,5.9,18c0,0,0-0.1,0-0.2c0,0-0.1,0-0.1,0c0-0.1-0.2,0-0.2-0.1c-0.1,0-0.3,0-0.3,0c0,0,0,0,0,0
-	l0,0l0,0c0.1-0.1,0.1-0.1,0.1-0.3c0,0,0,0,0-0.1l0,0c0,0,0,0,0-0.1l0,0c0,0,0,0,0,0.1c0-0.1,0-0.1,0-0.2c0,0,0,0,0,0l0,0l0-0.1
-	C5.5,17,5.5,17,5.5,17c-0.2-0.1-0.3,0-0.4,0c-0.1,0,0,0-0.1,0c0,0.1,0,0-0.1,0c0,0,0,0,0,0c0,0,0,0.2,0,0.2c0,0,0,0.1,0,0.1
-	c0,0,0,0,0,0c0,0,0,0,0,0c-0.1,0-0.3,0-0.4,0C4.2,17,4.2,17,4.2,16.9c0-0.3,0.1-0.8,0.1-0.8l0-0.1c0,0,0,0,0,0c0,0,0.1,0,0.1,0
-	c0,0,0,0,0,0c0.1,0,0.1,0,0.2-0.1c0,0,0,0,0-0.1l0,0.1c0.1,0,0.2,0.1,0.3,0.1c0,0,0,0,0,0l0-0.1l0,0l0,0c0,0,0.1,0.1,0.1,0.1
-	C5,16,5.1,16,5.1,16c0,0,0,0,0,0L5,15.9c0,0,0,0,0,0l0.1,0l0,0l0,0c0,0,0.1,0.1,0.1,0.1c0,0,0,0-0.1-0.1c0,0,0,0,0,0c0,0,0,0-0.1,0
-	c0,0,0,0,0,0c0,0,0,0,0.1,0c0.1,0,0.1,0,0.2,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0.1,0.1c0,0,0,0,0,0c0.1,0,0.1,0,0.1,0
-	c0.2,0.1,0.2,0.1,0.2,0.1c0,0,0,0,0.2,0.1C6,16,6,16,6,16.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0.1,0,0.1
-	c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0.1,0.1,0.1,0.1,0.2c0,0,0.1-0.3,0.1-0.3c0,0,0-0.2,0-0.2c0,0,0,0,0,0c0.1,0-0.2-0.3-0.1-0.6
-	c0.1-0.2,0.4-0.2,0.6-0.4l0,0.1l0,0l0,0l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.1,0-0.1,0c0,0,0.1,0,0.1,0
-	c0,0,0.1,0,0.1,0v0l-0.1,0l0,0l0,0l0.1,0l0,0v0l0,0c0,0,0,0.1,0,0.1c0,0,0,0,0,0c0,0,0-0.1,0-0.1c0,0,0,0,0,0l0,0l0,0l0,0.1
-	c0,0,0,0,0,0c0,0,0-0.1,0-0.1c0,0-0.1-0.1-0.1-0.1l0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1c0,0,0,0,0,0l0,0
-	l0,0c0,0,0,0,0,0l0-0.1c0,0,0-0.1-0.1-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0-0.1,0-0.1-0.1c0,0,0.1,0,0.1,0l0.1,0c0,0,0,0.4,0,0.4
-	s-0.2,0-0.2,0c0,0,0-0.2,0-0.2c0,0,0-0.1,0-0.1c0,0,0,0.2,0.1,0.2c0,0,0,0.1,0,0.1c0,0,0,0,0,0h0c0,0,0,0,0,0c0,0,0-0.3,0-0.3
-	c0,0,0-0.1,0-0.1l0,0.2l0,0.2c0,0,0,0,0,0l0-0.3l0-0.1l0-0.1l0,0.2l0,0.3h0l0-0.2l0-0.2c0,0,0,0.5,0,0.5s-0.1,0-0.1,0l0-0.2l0.1-0.1
-	l0-0.1c0,0,0,0,0,0l0,0l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0l0,0l0,0l0,0l0,0l0,0c0,0,0,0.3,0,0.3s0,0,0,0
-	c0,0,0,0,0,0c0,0,0-0.1,0,0l0-0.1c0,0,0-0.1,0-0.1C7,14.7,7,14.4,7,14.3c0,0,0-0.3,0-0.3h0l0,0.5C7,14.5,7,15,7,15c0,0-0.1,0-0.1,0
-	s0-0.4,0-0.4l0,0c0,0,0.1-0.1,0.1-0.1c0-0.1,0.1-0.1,0-0.2l0,0c0,0,0,0,0,0c0.1,0,0.2-0.1,0.3-0.1c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.2,0,0.2,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0L7.7,14
-	c0,0,0.3,0,0.3,0s0,0.2,0,0.2l-0.2,0l-0.1,0c0,0-0.1-0.1-0.1-0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0-0.1,0.2-0.1,0.2-0.1
-	c0,0,0,0,0,0l-0.1,0l-0.1,0.1L7.7,14c0,0,0,0,0,0l0-0.1l0,0l0,0l0,0l0,0c0,0,0,0.1,0,0c0,0,0,0.1,0,0.1h0l0-0.1l0,0l0,0l0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0.1,0.1,0.1c0,0,0,0.1,0,0.1c0,0,0,0,0,0l0-0.1l0-0.1l0,0c0,0,0.1,0,0.1,0
-	c0,0,0,0,0,0l0,0c0,0,0.1,0,0.1-0.1l0,0.2l0,0.2c0,0,0,0,0,0c0,0,0-0.2-0.1-0.1c0,0,0-0.1,0-0.1c0.1,0,0.2-0.1,0.2-0.1
-	c0,0-0.1,0-0.1,0c0,0-0.2,0-0.2,0l-0.2,0V14h0.2l0,0l0,0c0,0,0.1,0,0.1,0l0,0l0,0l0,0l0,0c0,0,0,0-0.1,0c0,0,0,0,0,0L8,13.8
-	c0,0,0,0,0,0l0.1,0c0,0,0,0,0,0l0,0l0,0c0,0,0,0,0,0.1c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0
-	c0,0,0.1-0.1,0.1-0.1c0,0,0,0.1,0,0.1l0,0.1c0,0,0,0,0,0l-0.2-0.1L8,13.8v0c0,0,0.3,0,0.3,0l0.1,0l0.1,0l0,0c0.1,0,0.1,0,0.2-0.1
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0,0l0,0c0,0,0,0-0.1,0l0,0l0,0l0,0c0,0-0.1,0-0.1,0c0,0,0,0.2-0.1,0.2c0,0,0,0.2,0,0.2
-	c0,0,0,0,0,0l0-0.2c0,0-0.1-0.1-0.1-0.1l0,0.2c0,0,0,0.1,0,0.1c0,0,0,0,0,0S8,14,8,14s0-0.4,0-0.4l0.2,0l-0.1,0
-	c-0.1,0-0.2,0-0.2-0.1c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0.1-0.1,0.1-0.1l-0.1,0l-0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0-0.1,0.3-0.1,0.3-0.1c-0.2-0.2-0.6,0.1-0.7,0.3C7.8,13,8.2,13,8.6,13c0.1,0,0.2,0,0.3,0c-0.5,0-1,0-1.5,0c-0.3,0-0.5,0-0.8,0
-	c-1.7,0-3.1,0-3.9,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0.3-0.1,0.4c0,0,0,0,0,0c0,0,0,0,0-0.1c0,0,0,0,0,0
-	c0,0-0.1,0-0.1,0c0,0,0,0.1,0,0.1c0,0,0,0,0,0l0,0l0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0.1-0.1,0.2-0.2,0.4c0,0.1,0,0.1-0.2,0.6c0,0,0,0,0,0c0,0,0,0,0,0l0,0.1l0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0.1,0,0.1c0,0,0,0,0,0l0,0c0,0.1,0.1,0.3,0,0.4c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0
-	c0,0,0.3,0,0.3,0c0,0.1-0.7,0.1,0.3,0.2c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c-1,0-1,0-1,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c1,0,0.4,0.6,0.4,0.6c0,0,0.1,0,0.1,0c0,0,0.3,0.5,0.5,0.7c0,0,0.1-0.1,0.1-0.1c0,0,0,0,0-0.1c0,0,0,0,0,0
-	c0-0.1-0.1-0.4-0.1-0.4c0,0,0,0,0,0c0,0,0-0.1,0-0.1c0,0,0,0,0,0c0-0.2-0.1-0.3-0.2-0.5c0,0,0-0.1,0-0.1c0,0,0.1,0,0.1,0l0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0C2.8,16,2.8,16,3.1,16.3c0,0.1,0,0.1,0,0.1l0,0c0.1,0.2,0.2,0.3,0.3,0.5c0,0,0,0,0,0c0,0.1,0,0.1,0,0.2
-	c0,0,0,0,0,0c0,0,0,0,0,0C3.5,17.3,4,17.6,4,17.6c0.1,0,0.2,0.1,0.3,0.1c0.1,0,0.2-0.1,0.4,0c0.2,0.1,0.2,0.2,0.4,0.3L5.4,18
-	c0,0,0,0,0-0.1c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0.1,0.1,0.2,0.2,0.3,0.2l0,0l0,0l0,0c0,0,0,0,0,0c0,0,0,0.1,0.1,0.1l0.1,0
-	c0,0,0.1,0,0.1-0.1c0,0,0,0,0,0c0,0,0.1,0.1,0.1,0.1c0,0-0.1,0-0.1,0c0,0,0,0,0,0l-0.1,0v0.2C6,18.8,6,19,6,19c0,0,0,0,0,0
-	c0.1,0,0.1,0,0.2,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0-0.1,0-0.1c0,0,0.1-0.1,0.1-0.1c0,0-0.2-0.1-0.2-0.1c0,0-0.2-0.1-0.2-0.1
-	c0,0,0,0,0,0c0,0,0.2,0,0.3,0c0,0,0.1,0,0.1,0c0.1,0,0.2,0,0.2,0.1c0,0,0.1,0.2,0.1,0.2c0,0,0,0.2,0.1,0.2c0,0,0,0,0,0
-	c0,0,0-0.1,0-0.1c0,0-0.1-0.1-0.2-0.1c0,0,0,0,0,0c0,0,0,0,0-0.1c-0.2,0-0.1,0.2-0.2,0.3c0,0,0,0,0,0c0,0,0,0,0,0l0,0
-	c0,0,0,0-0.1-0.1c0,0,0,0,0,0c0,0,0,0.1,0,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0.1,0,0.1c0.1,0.1,0.1,0.3,0.1,0.3c0,0,0,0,0,0
-	c0,0,0,0,0,0.1c0,0-0.1,0-0.1,0c0,0,0,0,0,0.1c0,0,0,0,0,0c0,0-0.1,0-0.1,0.1c0,0,0,0,0,0.1c0.4,0,0.9,0,1.4,0c0.6,0,1.2,0,1.7,0
-	C9.1,20,9.3,19.9,9.3,19.8"/>
-<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="7.4653" y1="9.0342" x2="7.4653" y2="23.9663">
-	<stop  offset="0" style="stop-color:#76A1F0"/>
-	<stop  offset="1" style="stop-color:#6B90D5"/>
-	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
-</linearGradient>
-<path style="fill:url(#SVGID_8_);" d="M7.5,9C3.3,9,0,12.4,0,16.5C0,20.6,3.3,24,7.5,24c4.1,0,7.5-3.3,7.5-7.5
-	C14.9,12.4,11.6,9,7.5,9z M13.7,18.6c-0.1,0.3-0.2,0.6-0.4,0.9s-0.3,0.6-0.5,0.9s-0.4,0.5-0.6,0.8s-0.5,0.5-0.8,0.6
-	c-0.3,0.2-0.6,0.4-0.9,0.5c-0.3,0.2-0.6,0.3-0.9,0.4s-0.7,0.2-1,0.2C8.2,23,7.9,23,7.5,23C1,22.7-0.9,15.2,3.3,11.6
-	C5,10.1,6.8,10,7.5,10c0.4,0,0.7,0,1.1,0.1c0.3,0.1,0.7,0.1,1,0.2s0.6,0.2,0.9,0.4c0.3,0.2,0.6,0.3,0.9,0.5c0.3,0.2,0.5,0.4,0.8,0.6
-	c0.2,0.2,0.5,0.5,0.6,0.8c0.2,0.3,0.4,0.6,0.5,0.9s0.3,0.6,0.4,0.9s0.2,0.7,0.2,1c0.1,0.3,0.1,0.7,0.1,1.1c0,0.4,0,0.7-0.1,1.1
-	C13.9,17.9,13.8,18.2,13.7,18.6z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" style="overflow:visible;enable-background:new 0 0 24 24" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="11.965" y1="0" x2="11.965" y2="24"><stop offset="0" style="stop-color:#95bff8"/><stop offset=".557" style="stop-color:#84adef"/><stop offset="1" style="stop-color:#7ca4eb"/></linearGradient><path style="fill:url(#a)" d="M14.4 0H2v24h20V7.9z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="11.965" y1="1" x2="11.965" y2="23"><stop offset="0" style="stop-color:#e7f4fc"/><stop offset="1" style="stop-color:#deeffc"/></linearGradient><path style="fill:url(#b)" d="M14 1H3v22h18V8.3z"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="11.965" y1="2" x2="11.965" y2="22"><stop offset="0" style="stop-color:#cee9f9"/><stop offset="1" style="stop-color:#bbdff8"/></linearGradient><path style="fill:url(#c)" d="M13.6 2H4v20h16V8.7z"/><linearGradient id="d" gradientUnits="userSpaceOnUse" x1="17.211" y1="0" x2="17.211" y2="9.359"><stop offset="0" style="stop-color:#95bff8"/><stop offset=".557" style="stop-color:#84adef"/><stop offset="1" style="stop-color:#7ca4eb"/></linearGradient><path style="fill:url(#d)" d="M13 9s5.2-1.5 9 .4V7.9L14.4 0h-2c2.7 3.7.6 9 .6 9z"/><linearGradient id="e" gradientUnits="userSpaceOnUse" x1="14.288" y1="7.545" x2="17.416" y2="4.417"><stop offset="0" style="stop-color:#e7f4fc"/><stop offset=".518" style="stop-color:#e5f3fc"/><stop offset=".705" style="stop-color:#def0fb"/><stop offset=".837" style="stop-color:#d3ebfa"/><stop offset=".872" style="stop-color:#cee9f9"/><stop offset="1" style="stop-color:#bdd8f0"/></linearGradient><path style="fill:url(#e)" d="M20.5 7.8c-.9-.2-2-.3-3.1-.3s-2.1.1-3 .3c.4-1.6.7-4.1-.2-6.4l6.3 6.4z"/><radialGradient id="f" cx="7.531" cy="16.5" r="7" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#8bb4f0"/><stop offset=".077" style="stop-color:#88b1ef"/><stop offset=".488" style="stop-color:#7fa7ec"/><stop offset="1" style="stop-color:#7ca4eb"/></radialGradient><path style="fill:url(#f)" d="M7.5 23.5C.4 23.2-1.6 15.1 3 11.2c1.8-1.6 3.8-1.7 4.6-1.7.4 0 .8 0 1.1.1.3 0 .7.1 1 .2.3.1.7.3 1 .4l.9.6c.3.2.6.4.8.7.3.3.5.5.7.8l.6.9c.2.3.3.7.4 1 .1.3.2.7.3 1.1.1.4.1.8.1 1.1s0 .8-.1 1.1c-.1.4-.1.7-.3 1.1-.1.3-.3.7-.4 1l-.6.9c-.2.3-.4.6-.7.8-.3.3-.5.5-.8.7l-.9.6c-.3.2-.7.3-1 .4-.3.1-.7.2-1.1.3-.3.2-.7.2-1.1.2"/><radialGradient id="g" cx="7.531" cy="16.5" r="6.486" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#8bb4f0"/><stop offset=".077" style="stop-color:#88b1ef"/><stop offset=".488" style="stop-color:#7fa7ec"/><stop offset="1" style="stop-color:#7ca4eb"/></radialGradient><path style="fill:url(#g)" d="M7.5 23C1 22.7-.9 15.2 3.3 11.6 5 10.1 6.8 10 7.5 10c.4 0 .7 0 1.1.1.3.1.7.1 1 .2s.6.2.9.4c.3.2.6.3.9.5.3.2.5.4.8.6.2.2.5.5.6.8.2.3.4.6.5.9s.3.6.4.9.2.7.2 1c.1.3.1.7.1 1.1 0 .4 0 .7-.1 1.1-.1.3-.1.7-.2 1s-.2.6-.4.9-.3.6-.5.9-.4.5-.6.8-.5.5-.8.6c-.3.2-.6.4-.9.5-.3.2-.6.3-.9.4s-.7.2-1 .2c-.4.1-.7.1-1.1.1"/><path style="fill:#b3e710" d="M6.1 10.8v-.1s-.1 0 0 .1c-.1-.1-.1 0-.2 0 0-.1.1 0 .2 0-.1 0 0 0 0 0M3 13h3.6l.4-.1c0-.1-.3-.1-.4-.1 0-.1-.2-.2-.1-.4h-.1c-.1-.1-.3-.1-.4-.1-.1 0-.2-.1-.3-.2h-.2c.1-.1.1-.1-.1-.2 0-.2.2-.3.4-.5h.1l-.1-.1s.1.1.2 0v-.1c.1 0 .1 0 .2-.1-.1 0-.1-.1-.2-.1.1 0 .1 0 .2.1 0 0 .1 0 .2-.1h.2v-.1s0 .1.1.1c.1-.1.1-.1.2-.1v-.2c-.1 0-.1-.1-.2 0l-.2.2c-.1 0 0-.1 0-.1.1 0 .1 0 0-.1-.1 0-.1.1-.1.1v-.1h-.1l.1-.1v-.1c-.1 0-.2.1-.2.1-.1 0-.1 0-.1.1h.1-.1l-.3.2.1-.1h-.4c-.2.1-.2.1-.3.2 0-.1 0-.1.1-.1h-.2c.1 0 .1 0 .2-.1-.1 0-.1 0-.1-.1h-.1.1-.1l.1-.1s-.3.1-.5.2h.1c.1 0 .2.1.3 0L5 11h-.2.4v-.1c0-.1-.1-.2 0-.2h-.1v-.1c-.1 0-.2.1-.3.1-.3.1-.6.4-.9.5-.1.1-.3.2-.4.3h-.1l-.4.3.2-.2-.1.1v.1c0 .1-.1.1-.1.2v.1h.1v.1c-.1 0-.1 0-.1.1 0-.1 0-.1-.1 0 0 .1-.1.1-.1.1h.1c0 .1-.1.1-.1.2v.2s0 .3-.1.3v-.2h-.1l-.1.1m5.8-2.6-.1-.1c0 .1 0 .1.1.1-.1 0-.1 0 0 0-.1.1-.1.1 0 0-.1.1-.1.1 0 0-.1.1 0 .1 0 0m-2.4.3c.1-.1.1-.1 0 0v-.1l.1-.1.1-.1c-.1 0-.1.1-.2.1l.1-.1-.1.1H6h-.1s.1 0 .1-.1c0 0-.3.1-.4.1h.1-.1.2-.2v.1s-.1 0-.1.1h.4c0 .1.1.1.1.1-.2-.1-.2-.1-.1-.1h-.1.1m2.3.3H8l-.1-.1h-.1c0-.1-.1 0-.1-.1h.1s-.1 0-.1-.1h.1-.2.1-.4.1l-.1-.1s0 .1-.1.1h-.1.1s0-.1-.2 0H6.7v-.1l.1-.1h-.1c-.1 0-.2.1-.2.1s-.1 0-.1.1h.1-.1c0 .1.1.1.1.1h.2-.1.1s.1 0 .1.1l.1.1h-.1.2v.1l-.1.1h-.1s.1 0 .1.1h-.1c-.1-.1-.1 0-.1 0-.1 0-.1 0-.1.1H7l.1.1c0 .1.1 0 .1.1 0 0 .1 0 .1.1h.2c0-.1-.1-.1-.2-.1s-.1 0-.1-.1h.1l.1.1h.1s.1 0 .1.1v-.1l-.1-.1s0 .1.1.1l-.1-.1s-.1 0-.1-.1c0 0 0-.1-.1-.1v-.1h.1c.5-.2.5-.2.6-.1 0 0 0 .1.1 0 0 .1 0 .1.1.1V11m-1.8-.6c.1 0 0 0 0 0 0-.1.1-.1.1-.1h-.2l.1.1c-.1-.1-.1 0-.1 0-.1 0-.1.1-.1.1v.1h.1c0-.1 0-.1.1-.2-.1.1 0 .1 0 0M6.8 10.3s-.1 0 0 0c-.1 0-.1 0 0 0H6.5s0 .1-.1.1h.2l.2-.1M5.9 10.3c.1 0 .1 0 0 0 .1 0 .1 0 0 0 .1 0 .1 0 0 0 .1 0 .1 0 0 0 .1 0 .1 0 0 0 .1 0 0 0 0 0h-.2c-.1 0-.1 0-.2.1 0 0-.1 0-.1.1h-.1s-.1 0-.1.1h.1c.1 0 .1-.1.2-.1h.1c.2-.1.3-.1.3-.2m1.3-.1H7h.1l-.1.1h.2c-.1 0-.1 0 0-.1m-.4 0c0-.1 0-.1 0 0 0-.1 0-.1 0 0 0-.1 0-.1 0 0 0-.1 0-.1 0 0 0-.1 0-.1 0 0 0-.1 0-.1 0 0 0 0-.1 0 0 0-.1 0-.1 0 0 0-.1-.1-.1 0 0 0-.1 0-.1 0 0 0h-.1.1c-.1 0-.1 0 0 0h-.2.2m-.3 0c.1 0 .1 0 0 0 .1 0 .1 0 0 0 .1 0 0 0 0 0s.1 0 .1-.1l-.1.1h-.1.1-.1.1H6.2h.1-.1H6.5m.4-.1c.1 0 .1 0 0 0 .1 0 .1 0 0 0m-.3 0c.1 0 .1 0 0 0 .1 0 .1 0 0 0 .1 0 0 0 0 0-.1 0-.3.1-.3.1h-.1.2-.1.1l.2-.1m.2 0h-.1.1m.3 0c0-.1 0-.1 0 0 0-.1 0-.1 0 0 0-.1 0-.1 0 0-.1 0-.1 0 0 0m-.1 0h.2c-.1-.1-.2 0-.2 0 0-.1 0 0 0 0m.3-.1s.1 0 0 0c.1 0 0 0 0 0s.1 0 0 0c.1 0 .1 0 0 0 .1 0 .1 0 0 0 .1 0 .1 0 0 0 .1 0 .1 0 0 0 .1 0 .1 0 0 0 .1 0 .1 0 0 0 .1 0 .1 0 0 0 .1 0 .1 0 0 0 .1 0 .1 0 0 0 .1 0 .1 0 0 0 .1 0 .1 0 0 0h.1-.1.2-.2c.1 0 .1 0 0 0h-.2c.1.1.1.1.2 0 0 .1 0 0 0 0m.2 0h-.1.1c-.1 0-.1 0 0 0H7.2h.2-.1.1c0 .1 0 .1.1 0-.1.1-.1.1 0 0-.1.1-.1.1 0 0-.1.1 0 0 0 0M9 11.2c-.4-.7-.9-1.2-1.5-1.2H7.8h-.2.1H7.4h.1-.2.1l.1-.1h-.1l-.1.1h.1v.1-.2h.1s-.1-.1-.1 0h.1-.1.2c1.3 1.2 1.3 1.2 1.4 1.3-.1-.1-.1-.1 0 0-.1 0-.1 0 0 0-.1 0-.1 0 0 0-.1 0-.1 0 0 0-.1 0-.1 0 0 0-.1 0-.1 0 0 0-.1 0-.1 0 0 0-.1 0-.1 0 0 0-.1 0-.1 0 0 0-.1 0-.1 0 0 0-.1 0 0 0 0 0"/><path style="fill:#b3e710" d="M9.4 20.1h-.2v.1s.1 0 .2-.1m-.6 2c.3-.5.6-1.2.8-2h-.1c-.1 0-.1.1-.2.2h-.1v-.1h-.1s0-.1.1-.1H6.1V20.4c.1.1.1 0 .1 0 .1.1-.1.1-.1.2l.1.1c.1.1.2.1.6.7.1.2.4.2.5.3.1.1-.1.3-.1.4h-.1.1c0 .1.1.7.1.7s0 .1.1.1v-.1l.1-.1s.1 0 .2-.1v-.1c.1 0 .2 0 .4-.2l-.1.1c.2-.1.2-.1.4-.3h.4m4.9-3.8s0 .1 0 0c0 .1 0 0 0 0m.3-2.9c0-.2-.1-.5-.1-.7 0-.1-.1-.1-.2-.2 0 0-.1 0-.3-.6 0-.1 0-.1-.1-.1v.1h-.1l-.1.1v.1s0 .1-.1.1h-.1c-.1 0-.1 0-.1-.1 0 0-.1.5 0 .7.1.3-.2.4-.2.7 0 .2-.1.4-.1.7.1.1.1.7 0 .8 0 0 0 .1.1.1v.1-.2.2l.1.1.1.1h-.1l.1.2v.4s.2.3.3.3c.1 0 .1-.2.2-.2V18c.1 0 .3-.2.3-.2s.2 0 .2.1h.2c0 .1-.2.1-.2.1h.1l.1.1h-.1c0 .1-.1.2-.2.3v.1s0 .1-.1.2v.1c-.1.4-.5 1-.5 1 .1 0 .2-.3.3-.6.2-.3.3-.6.4-.9s.2-.6.2-1c.1-.3.1-.7.1-1 0-.2 0-.5-.1-.9m-.6-1.6c0 .1 0 .1.1.2 0-.1 0-.1-.1-.2m-.2-.3c0-.1 0-.1 0 0v.2c.1-.1.1-.1 0-.2m-.1-.2s0-.1 0 0 .1.1.1.1l-.1-.1m.2.2s-.1 0 0 0l-.1-.1s-.2-.4-.3-.4h-.3v.1s.1.1.1.2h-.1c0 .1-.1 0-.1 0h-.1v.1s.1 0 .1.1c.1.1.1.3.1.4v.2h.1s0 .1.1.1c0 .1.1.1.1.1v-.1h.1V14l-.1-.1v-.4l-.1-.1v-.1c.2-.3.5.2.5.2s0 .1 0 0c0 .1 0 .1 0 0 .1.1.1.2.1.2v.1-.1s-.1-.1-.1-.2m-.4-.6s.1.1 0 0c.1.1 0 0 0 0m.2.2c0-.1-.1-.1-.1-.2 0 .1 0 .1.1.2-.1-.1-.1-.1 0 0-.1 0 0 0 0 0m-3.9-.2c-.1 0-.1 0-.1.1 0-.1 0-.1.1-.1m-6.5-.4c.1 0 0 0 0 0 0 .1 0 .1 0 0 0 .1 0 .1 0 0m.2-.1c0-.1 0-.1 0 0l.1-.1c-.2 0-.2.1-.1.1-.1 0-.1 0 0 0-.1 0-.1 0 0 0-.1 0-.1 0 0 0-.1 0-.1 0 0 0-.1 0-.1 0 0 0-.1 0-.1 0 0 0m0-.2c.1-.1.1-.1 0 0 .1-.1.1-.1 0 0 .1-.1.1-.1 0 0 0-.1 0 0 0 0m.1-.1c0-.1 0-.1 0 0 .1-.1.1-.1 0 0 .1-.1.1-.1 0 0 0-.1 0-.1 0 0 0-.1 0 0 0 0m6 .9v-.2s.1 0 0-.1v-.1h-.1c-.1 0-.1.1-.2.1v-.1c.1 0 .2-.1.2-.1-.3-.1-.3-.2-.3-.2 0-.1 0-.3-.1-.3 0 0 0 .1-.1 0v.1h.1c0-.1-.1 0-.1-.1h-.1l-.2-.2-.1.1v.1c0-.1 0 0 0 0s0-.1-.1-.1c0 .1 0 .1-.1.1 0-.1-.1 0-.2 0v-.1.2-.1c-.1 0-.2-.2-.2-.2v-.1l-.1-.1h-.1c-.1 0-.1 0-.2-.1 0 0-.1 0 0 .1v.2l-.1.1c0 .1.2.1.1.3 0 .1-.1.4-.3.5l.1.3.3-.4c0 .1-.1.1-.1.2l-.1.1s-.1 0-.1-.1h-.1v.1H9l-.1-.1c.1.1.1.1.1 0m0-1.5c0-.1 0-.1 0 0m-2.2 0h-.1v-.1h-.1l-.1-.1c-.1.1-.1.1-.1.2-.1 0-.1 0-.1.1h.1v.1h.2c.1-.2.1-.2.2-.2m.5-.5s-.1 0 0 0c-.2 0-.2.1-.1.1-.1 0 0 .1.1-.1"/><path style="fill:#b3e710" d="M9.6 13.4s0-.1 0 0c-.1-.1-.1-.1 0 0-.1 0-.1 0 0 0l-.1-.1h.1-.1l.1-.1H9.3l-.1.1c0-.1 0-.1.1-.2h-.1C9 13 9 13 9 13.1h-.1.1s-.1 0-.1.1v.1h.4l-.1.1.1-.1v.1h.3c-.1 0-.1.1 0 0 0 .1 0 .1 0 0 0 .1 0 0 0 0m2-1.6s-.1-.2-.2-.1v.1h-.1.1v-.1c.3.2.3.2.2.1 0 .1 0 .1 0 0m-.1-.1s-.1 0 0 0c-.1 0-.1 0 0 0-.1 0 0 0 0 0m.3 0c0-.1 0-.1 0 0 .1 0 .1 0 0 0 .1 0 .1 0 0 0 .1 0 .1 0 0 0 .1 0 .1 0 0 0 .1 0 0 0 0 0m-.2-.3c0 .1 0 .1 0 0 0 .1 0 .1 0 0l.1.1-.1-.1c0 .1 0 .1 0 0 0 .1 0 .1 0 0m-2.2 0s-.1 0 0 0c-.1 0 0 0 0 0m2.7.7L12 12l.1.1-.2-.1-.2-.2c-.2-.1-.2-.2-.2-.2l-.1-.1h-.1s0-.1-.1-.1h.1l.1.1.1.1s0 .1.1.1l.1.1.1.1v.2h.3c-.1.1-.1.1 0 0-.1.1-.1.1 0 0-.1.1-.1 0 0 0l-.1.1v.1h.1v-.2c0 .1 0 .1 0 0 0 .1 0 .1 0 0 0 .1 0 .1 0 0m-2.2-1.4h-.6.1c-.1 0-.1-.1-.2-.1H9.5c.1 0 .1 0 .1.1h.2c.2.1.2.1.1 0 .1.1.1.1 0 0 .1.1.1 0 0 0 .1 0 .1 0 0 0 .1 0 0 0 0 0m-1.3-.5c-.1 0-.1 0 0 0m3.5 1.7s-.1-.1 0 0c-.1 0 0 0 0 0l-.1-.1s0 .1.1.1l-.1-.1-.1-.1-.1-.1h-.1.1l.1.1c.1 0 .1.1.2.2-.1 0-.1 0 0 0-.1 0-.1 0 0 0 0 0-.1 0 0 0 0 0-.1 0 0 0-.1 0-.1 0 0 0-.1 0-.1 0 0 0 0 .1 0 .1 0 0-.1 0-.1 0 0 0-.1 0-.1 0 0 0-.1.1 0 .1 0 0v.2-.2c0 .1 0 .1.1.3l.1.1v.1l.1.1h.1l.1.1.2.2h.3c-.1-.1-.1-.2-.2-.3-.3-.1-.6-.4-.8-.6m-1.6-1.2-.6-.3H10.2s.1 0 .1.1c.1.2.2.2.2.2 0 .1 0 .1 0 0 .1.1.2.1.2.1s.1 0 .1.1h.1l.1.1.1.1h.1s.1 0 .1.1l.1.1-.2-.2h.1l.1.1.1.1.1.1.1.1-.1-.1-.1-.1-.3-.3c-.1.1-.4-.1-.7-.3m-2.2-.6s-.1 0 0 0c-.1 0 0 0 0 0m-.1 0c-.1 0-.1 0 0 0M8 10c-.1 0-.1 0 0 0-.1 0 0 0 0 0m-.1 0c-.1 0-.1 0 0 0-.1 0-.1 0 0 0-.1 0 0 0 0 0m-.1 0s-.1 0 0 0c-.1 0-.1 0 0 0-.1 0-.1 0 0 0m-.1 0c-.1 0-.1 0 0 0-.1 0-.1 0 0 0-.1 0-.1 0 0 0-.1 0 0 0 0 0m.2 0h-.2.2m-.3 0s-.1 0 0 0M9 10h-.3v.2h.1s.2 0 .2.1V10h-.3v.1-.2l.2.1.2.1-.2-.1-.2-.1c-.2.1.3.2.3.1v.1h-.3l-.1-.1-.1-.1h.1v.1h-.1.1v-.2h.2c0 .2.2.3.2.2h-.7l-.3.1V10l.5-.1v.1h-.4v.1h.4-.4v.1l.2-.1h.2s0 .1 0 0h-.4V10h.1H8h.1-.4c.5 0 1 .5 1.4 1.2V10.9 11.2s.1 0 .1.1h.1-.4H9.2h-.4v-.2l.5-.2v.4h.4-.2s.1 0 0 0h.1v-.4h-.3v.2-.2V11.2h-.1l-.1-.1h.1-.1.5-.3.3-.5.2H9h.5L9 11h.4-.2.1v.1s0 .1-.1.1l-.3-.1V11s.1 0 .1-.1h.1H8.8l.2.3V11l.1.1v.1V10.9H8.8v.1H9s.1-.2 0-.2v-.1s0-.1.1 0v.4-.8C9 10.2 9 10 9 10v.2s0 .1-.1.1l.1.1h-.1.1V10h-.2.2v.1-.1h-.1.1v.2h-.1l-.1-.1-.1-.1"/><path style="fill:#b3e710" d="m10.4 20.8.1-.2h-.1l-.1-.2h-.1l-.1-.1s-.1 0-.2.1c0 0 .1-.1 0-.1l-.1-.1c-.2.8-.5 1.5-.8 2h.1s.1 0 .1-.1h.1l.1-.1c0-.1.2-.1.2-.2l.2-.2c0-.1.1-.1.2-.3 0 0 .1 0 .1-.1l.1-.1c.1-.1.1-.1.2-.1-.1-.2 0-.2 0-.2m2.4-.5c.1-.1.1-.2.2-.3-.6.9-1.1 1.3-1.3 1.5.2-.2.4-.3.6-.5 0-.1.3-.4.5-.7M9.4 20h-.2v.1c.1 0 .1 0 .2-.1 0 .1 0 .1 0 0m-1.3-1.2s0 .1 0 0c0 .1 0 .1 0 0 0 .1-.1.1-.1.1.1 0 .1 0 .1-.1 0 .1 0 .1 0 0m-1.3-1.4c0-.1-.2-.1-.2-.1l.1.1c0 .1 0 0 .1 0m1.4 0s-.1-.1-.2 0v.1c.1-.1.2-.1.2-.1m-.3 0c-.1-.1-.2-.1-.2-.1h-.5.1v.1H7l.1.1H7.4s0 .1.1.1c0-.1 0-.1.1-.1h.1c.1-.1.1-.1.2-.1-.1 0-.1 0 0 0m-.8-.3h-.2c-.1 0-.2 0-.2-.1 0 0 0-.1-.1-.1h-.1c-.1 0-.1 0-.2-.1h-.2c-.1 0-.3 0-.3.1h.1c.2-.1.2-.1.3-.1h.2c.1 0 .1 0 .1.1.1 0 .1 0 .1.1.1 0 .1 0 .2.1 0 0 0 .1-.1.1H7s.1 0 .1-.1M7 15s-.1-.1 0 0c-.1-.1-.1-.1 0 0-.1 0 0 0 0 0M8.9 13.6s-.1-.1 0 0h-.1v-.1h-.1s0 .1-.1.1v.1c.1-.1.2-.1.3-.1-.1 0 0 0 0 0m-6.2-.3c0-.1 0-.1 0 0 0-.1 0-.1 0 0v-.2h-.1v.2c0-.1 0-.1.1 0-.1-.1-.1-.1 0 0 0-.1-.1-.1 0 0-.1-.1-.1-.1 0 0-.1-.1 0 0 0 0m6.6 6.5c-.1-.1-.1-.1-.1-.3 0 0-.4-.3-.5-.2h-.1c-.1-.1-.3-.1-.4-.1h-.3c0-.2.1-.2-.1-.2H8.1c-.1 0 0 0-.1-.1h-.1v-.1H8h-.5c-.1 0-.3-.1-.4-.1v-.1l-.2.1c0 .1.1.1.1.2h-.1c-.1-.1-.1-.1 0-.2v-.1h.2H7l-.3.3s0-.3-.2-.4h-.3c-.2 0-.4-.3-.3-.5v-.2h-.1c0-.1-.2 0-.2-.1h-.3c.1-.1.1-.1.1-.3v-.2.1V17h.1c-.2-.1-.3 0-.4 0H5c0 .1 0 0-.1 0V17.3h-.4c-.3-.3-.3-.3-.3-.4 0-.3.1-.8.1-.8V16h.1c.1 0 .1 0 .2-.1v-.1.1c.1 0 .2.1.3.1v-.1l.1.1h.1l-.1-.1h.1l.1.1-.1-.1H5 5.3l.1.1h.1l.2.1.2.1c.1-.2.1-.2.1-.1v.2c0 .1.1.1.1.2l.1-.3V16c.1 0-.2-.3-.1-.6.1-.2.4-.2.6-.4v.1h.1-.1.2-.1.1v.1-.1.1-.1l-.1-.1h.1v.2-.1s0-.1-.1-.1c0 0-.1 0-.1-.1h.2v.4h-.2V15s0 .2.1.2v.1-.4.4-.5.5-.4.5h-.1v-.2l.1-.1V15v.3s0-.1 0 0v-.2c.2-.4.2-.7.2-.8V14v1h-.1v-.4l.1-.1c0-.1.1-.1 0-.2.1 0 .2-.1.3-.1H7.6l.1-.2H8v.2H7.7l-.1-.1h.1c0-.1.2-.1.2-.1h-.1l-.1.1v-.2s0 .1 0 0v.1-.1s0 .1.1.1v.1-.2h.1s.1 0 .1-.1v.4s0-.2-.1-.1V14c.1 0 .2-.1.2-.1h-.5v.1H7.9h-.1l.2-.2h.1v.1h.1l.1-.1v.2l-.2-.1-.1-.1h.5c.1 0 .1 0 .2-.1h-.2s0 .2-.1.2v.2-.2l-.1-.1V14.1L8 14v-.4h.2-.1c-.1 0-.2 0-.2-.1H8l.1-.1h-.2c0-.1.3-.1.3-.1-.2-.2-.6.1-.7.3.3-.6.7-.6 1.1-.6h.3H2.7s0 .3-.1.4v-.1h-.1v.1c0 .1-.1.2-.2.4 0 .1 0 .1-.2.6v.2c0 .1.1.3 0 .4h.4c0 .1-.7.1.3.2h-1c1 0 .4.6.4.6h.1s.3.5.5.7l.1-.1v-.1c0-.1-.1-.4-.1-.4v-.1c0-.2-.1-.3-.2-.5v-.1h.1c.1.8.1.8.4 1.1v.1c.1.2.2.3.3.5v.2c.1.2.6.5.6.5.1 0 .2.1.3.1.1 0 .2-.1.4 0s.2.2.4.3h.3v-.1h.1c.1.1.2.2.3.2 0 0 0 .1.1.1H6s.1 0 .1-.1l.1.1H6v.8h.2v-.1l.1-.1-.2-.1-.2-.1h.4c.1 0 .2 0 .2.1l.1.2s0 .2.1.2V19s-.1-.1-.2-.1v-.1c-.2 0-.1.2-.2.3l-.1-.1v.2c.1.1.1.3.1.3v.1h-.1v.1s-.1 0-.1.1v.1H9.2c-.1.1.1 0 .1-.1"/><linearGradient id="h" gradientUnits="userSpaceOnUse" x1="7.465" y1="9.034" x2="7.465" y2="23.966"><stop offset="0" style="stop-color:#76a1f0"/><stop offset="1" style="stop-color:#6b90d5"/></linearGradient><path style="fill:url(#h)" d="M7.5 9C3.3 9 0 12.4 0 16.5S3.3 24 7.5 24c4.1 0 7.5-3.3 7.5-7.5-.1-4.1-3.4-7.5-7.5-7.5zm6.2 9.6c-.1.3-.2.6-.4.9s-.3.6-.5.9-.4.5-.6.8-.5.5-.8.6c-.3.2-.6.4-.9.5-.3.2-.6.3-.9.4s-.7.2-1 .2c-.4.1-.7.1-1.1.1-6.5-.3-8.4-7.8-4.2-11.4C5 10.1 6.8 10 7.5 10c.4 0 .7 0 1.1.1.3.1.7.1 1 .2s.6.2.9.4c.3.2.6.3.9.5.3.2.5.4.8.6.2.2.5.5.6.8.2.3.4.6.5.9s.3.6.4.9.2.7.2 1c.1.3.1.7.1 1.1 0 .4 0 .7-.1 1.1 0 .3-.1.6-.2 1z"/></svg>
diff --git a/src/assets/img/mod_legacy/wiki.svg b/src/assets/img/mod_legacy/wiki.svg
index f3101ce19..e8c0e9f48 100644
--- a/src/assets/img/mod_legacy/wiki.svg
+++ b/src/assets/img/mod_legacy/wiki.svg
@@ -1,228 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" style="overflow:visible;enable-background:new 0 0 24 24;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="18" y1="13" x2="18" y2="20.0005">
-	<stop  offset="0" style="stop-color:#8E8E8E"/>
-	<stop  offset="4.191053e-02" style="stop-color:#8A8A8A"/>
-	<stop  offset="0.4613" style="stop-color:#626262"/>
-	<stop  offset="0.7952" style="stop-color:#4A4A4A"/>
-	<stop  offset="1" style="stop-color:#414141"/>
-	<a:midPointStop  offset="0" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="1" style="stop-color:#414141"/>
-</linearGradient>
-<rect x="12" y="13" style="fill:url(#SVGID_1_);" width="12" height="7"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="17.5" y1="14" x2="17.5" y2="19">
-	<stop  offset="0" style="stop-color:#F7F7F7"/>
-	<stop  offset="0.1044" style="stop-color:#FCFCFC"/>
-	<stop  offset="0.3293" style="stop-color:#FFFFFF"/>
-	<stop  offset="0.5692" style="stop-color:#E8E8E8"/>
-	<stop  offset="0.8153" style="stop-color:#D7D7D7"/>
-	<stop  offset="1" style="stop-color:#D1D1D1"/>
-	<a:midPointStop  offset="0" style="stop-color:#F7F7F7"/>
-	<a:midPointStop  offset="0.2222" style="stop-color:#F7F7F7"/>
-	<a:midPointStop  offset="0.3293" style="stop-color:#FFFFFF"/>
-	<a:midPointStop  offset="0.3545" style="stop-color:#FFFFFF"/>
-	<a:midPointStop  offset="1" style="stop-color:#D1D1D1"/>
-</linearGradient>
-<rect x="12" y="14" style="fill:url(#SVGID_2_);" width="11" height="5"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="17" y1="15" x2="17" y2="18">
-	<stop  offset="0" style="stop-color:#8E8E8E"/>
-	<stop  offset="4.191053e-02" style="stop-color:#8A8A8A"/>
-	<stop  offset="0.4613" style="stop-color:#626262"/>
-	<stop  offset="0.7952" style="stop-color:#4A4A4A"/>
-	<stop  offset="1" style="stop-color:#414141"/>
-	<a:midPointStop  offset="0" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="1" style="stop-color:#414141"/>
-</linearGradient>
-<rect x="12" y="15" style="fill:url(#SVGID_3_);" width="10" height="3"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="16.5" y1="0" x2="16.5" y2="24.0005">
-	<stop  offset="0" style="stop-color:#8E8E8E"/>
-	<stop  offset="4.191053e-02" style="stop-color:#8A8A8A"/>
-	<stop  offset="0.4613" style="stop-color:#626262"/>
-	<stop  offset="0.7952" style="stop-color:#4A4A4A"/>
-	<stop  offset="1" style="stop-color:#414141"/>
-	<a:midPointStop  offset="0" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="1" style="stop-color:#414141"/>
-</linearGradient>
-<rect x="13" style="fill:url(#SVGID_4_);" width="7" height="24"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="16.5" y1="1" x2="16.5" y2="23.0005">
-	<stop  offset="0" style="stop-color:#F7F7F7"/>
-	<stop  offset="0.1044" style="stop-color:#FCFCFC"/>
-	<stop  offset="0.3293" style="stop-color:#FFFFFF"/>
-	<stop  offset="0.5692" style="stop-color:#E8E8E8"/>
-	<stop  offset="0.8153" style="stop-color:#D7D7D7"/>
-	<stop  offset="1" style="stop-color:#D1D1D1"/>
-	<a:midPointStop  offset="0" style="stop-color:#F7F7F7"/>
-	<a:midPointStop  offset="0.2222" style="stop-color:#F7F7F7"/>
-	<a:midPointStop  offset="0.3293" style="stop-color:#FFFFFF"/>
-	<a:midPointStop  offset="0.3545" style="stop-color:#FFFFFF"/>
-	<a:midPointStop  offset="1" style="stop-color:#D1D1D1"/>
-</linearGradient>
-<rect x="14" y="1" style="fill:url(#SVGID_5_);" width="5" height="22"/>
-<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="16.5" y1="2" x2="16.5" y2="22.0005">
-	<stop  offset="0" style="stop-color:#8E8E8E"/>
-	<stop  offset="4.191053e-02" style="stop-color:#8A8A8A"/>
-	<stop  offset="0.4613" style="stop-color:#626262"/>
-	<stop  offset="0.7952" style="stop-color:#4A4A4A"/>
-	<stop  offset="1" style="stop-color:#414141"/>
-	<a:midPointStop  offset="0" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="1" style="stop-color:#414141"/>
-</linearGradient>
-<rect x="15" y="2" style="fill:url(#SVGID_6_);" width="3" height="20"/>
-<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="18" y1="4" x2="18" y2="11">
-	<stop  offset="0" style="stop-color:#8E8E8E"/>
-	<stop  offset="4.191053e-02" style="stop-color:#8A8A8A"/>
-	<stop  offset="0.4613" style="stop-color:#626262"/>
-	<stop  offset="0.7952" style="stop-color:#4A4A4A"/>
-	<stop  offset="1" style="stop-color:#414141"/>
-	<a:midPointStop  offset="0" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="1" style="stop-color:#414141"/>
-</linearGradient>
-<rect x="12" y="4" style="fill:url(#SVGID_7_);" width="12" height="7"/>
-<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="17.5" y1="5" x2="17.5" y2="10">
-	<stop  offset="0" style="stop-color:#F7F7F7"/>
-	<stop  offset="0.1044" style="stop-color:#FCFCFC"/>
-	<stop  offset="0.3293" style="stop-color:#FFFFFF"/>
-	<stop  offset="0.5692" style="stop-color:#E8E8E8"/>
-	<stop  offset="0.8153" style="stop-color:#D7D7D7"/>
-	<stop  offset="1" style="stop-color:#D1D1D1"/>
-	<a:midPointStop  offset="0" style="stop-color:#F7F7F7"/>
-	<a:midPointStop  offset="0.2222" style="stop-color:#F7F7F7"/>
-	<a:midPointStop  offset="0.3293" style="stop-color:#FFFFFF"/>
-	<a:midPointStop  offset="0.3545" style="stop-color:#FFFFFF"/>
-	<a:midPointStop  offset="1" style="stop-color:#D1D1D1"/>
-</linearGradient>
-<rect x="12" y="5" style="fill:url(#SVGID_8_);" width="11" height="5"/>
-<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="17" y1="6" x2="17" y2="9">
-	<stop  offset="0" style="stop-color:#8E8E8E"/>
-	<stop  offset="4.191053e-02" style="stop-color:#8A8A8A"/>
-	<stop  offset="0.4613" style="stop-color:#626262"/>
-	<stop  offset="0.7952" style="stop-color:#4A4A4A"/>
-	<stop  offset="1" style="stop-color:#414141"/>
-	<a:midPointStop  offset="0" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="1" style="stop-color:#414141"/>
-</linearGradient>
-<rect x="12" y="6" style="fill:url(#SVGID_9_);" width="10" height="3"/>
-<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="6" y1="4" x2="6" y2="11">
-	<stop  offset="0" style="stop-color:#8E8E8E"/>
-	<stop  offset="4.191053e-02" style="stop-color:#8A8A8A"/>
-	<stop  offset="0.4613" style="stop-color:#626262"/>
-	<stop  offset="0.7952" style="stop-color:#4A4A4A"/>
-	<stop  offset="1" style="stop-color:#414141"/>
-	<a:midPointStop  offset="0" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="1" style="stop-color:#414141"/>
-</linearGradient>
-<rect y="4" style="fill:url(#SVGID_10_);" width="12" height="7"/>
-<linearGradient id="SVGID_11_" gradientUnits="userSpaceOnUse" x1="6.5" y1="5" x2="6.5" y2="10">
-	<stop  offset="0" style="stop-color:#F7F7F7"/>
-	<stop  offset="0.1044" style="stop-color:#FCFCFC"/>
-	<stop  offset="0.3293" style="stop-color:#FFFFFF"/>
-	<stop  offset="0.5692" style="stop-color:#E8E8E8"/>
-	<stop  offset="0.8153" style="stop-color:#D7D7D7"/>
-	<stop  offset="1" style="stop-color:#D1D1D1"/>
-	<a:midPointStop  offset="0" style="stop-color:#F7F7F7"/>
-	<a:midPointStop  offset="0.2222" style="stop-color:#F7F7F7"/>
-	<a:midPointStop  offset="0.3293" style="stop-color:#FFFFFF"/>
-	<a:midPointStop  offset="0.3545" style="stop-color:#FFFFFF"/>
-	<a:midPointStop  offset="1" style="stop-color:#D1D1D1"/>
-</linearGradient>
-<rect x="1" y="5" style="fill:url(#SVGID_11_);" width="11" height="5"/>
-<linearGradient id="SVGID_12_" gradientUnits="userSpaceOnUse" x1="7" y1="6" x2="7" y2="9">
-	<stop  offset="0" style="stop-color:#8E8E8E"/>
-	<stop  offset="4.191053e-02" style="stop-color:#8A8A8A"/>
-	<stop  offset="0.4613" style="stop-color:#626262"/>
-	<stop  offset="0.7952" style="stop-color:#4A4A4A"/>
-	<stop  offset="1" style="stop-color:#414141"/>
-	<a:midPointStop  offset="0" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="1" style="stop-color:#414141"/>
-</linearGradient>
-<rect x="2" y="6" style="fill:url(#SVGID_12_);" width="10" height="3"/>
-<linearGradient id="SVGID_13_" gradientUnits="userSpaceOnUse" x1="7.5" y1="0" x2="7.5" y2="24.0005">
-	<stop  offset="0" style="stop-color:#8E8E8E"/>
-	<stop  offset="4.191053e-02" style="stop-color:#8A8A8A"/>
-	<stop  offset="0.4613" style="stop-color:#626262"/>
-	<stop  offset="0.7952" style="stop-color:#4A4A4A"/>
-	<stop  offset="1" style="stop-color:#414141"/>
-	<a:midPointStop  offset="0" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="1" style="stop-color:#414141"/>
-</linearGradient>
-<rect x="4" style="fill:url(#SVGID_13_);" width="7" height="24"/>
-<linearGradient id="SVGID_14_" gradientUnits="userSpaceOnUse" x1="7.5" y1="1" x2="7.5" y2="23.0005">
-	<stop  offset="0" style="stop-color:#F7F7F7"/>
-	<stop  offset="0.1044" style="stop-color:#FCFCFC"/>
-	<stop  offset="0.3293" style="stop-color:#FFFFFF"/>
-	<stop  offset="0.5692" style="stop-color:#E8E8E8"/>
-	<stop  offset="0.8153" style="stop-color:#D7D7D7"/>
-	<stop  offset="1" style="stop-color:#D1D1D1"/>
-	<a:midPointStop  offset="0" style="stop-color:#F7F7F7"/>
-	<a:midPointStop  offset="0.2222" style="stop-color:#F7F7F7"/>
-	<a:midPointStop  offset="0.3293" style="stop-color:#FFFFFF"/>
-	<a:midPointStop  offset="0.3545" style="stop-color:#FFFFFF"/>
-	<a:midPointStop  offset="1" style="stop-color:#D1D1D1"/>
-</linearGradient>
-<rect x="5" y="1" style="fill:url(#SVGID_14_);" width="5" height="22"/>
-<linearGradient id="SVGID_15_" gradientUnits="userSpaceOnUse" x1="7.5" y1="2" x2="7.5" y2="22.0005">
-	<stop  offset="0" style="stop-color:#8E8E8E"/>
-	<stop  offset="4.191053e-02" style="stop-color:#8A8A8A"/>
-	<stop  offset="0.4613" style="stop-color:#626262"/>
-	<stop  offset="0.7952" style="stop-color:#4A4A4A"/>
-	<stop  offset="1" style="stop-color:#414141"/>
-	<a:midPointStop  offset="0" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="1" style="stop-color:#414141"/>
-</linearGradient>
-<rect x="6" y="2" style="fill:url(#SVGID_15_);" width="3" height="20"/>
-<linearGradient id="SVGID_16_" gradientUnits="userSpaceOnUse" x1="6" y1="13" x2="6" y2="20.0005">
-	<stop  offset="0" style="stop-color:#8E8E8E"/>
-	<stop  offset="4.191053e-02" style="stop-color:#8A8A8A"/>
-	<stop  offset="0.4613" style="stop-color:#626262"/>
-	<stop  offset="0.7952" style="stop-color:#4A4A4A"/>
-	<stop  offset="1" style="stop-color:#414141"/>
-	<a:midPointStop  offset="0" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="1" style="stop-color:#414141"/>
-</linearGradient>
-<rect y="13" style="fill:url(#SVGID_16_);" width="12" height="7"/>
-<linearGradient id="SVGID_17_" gradientUnits="userSpaceOnUse" x1="6.5" y1="14" x2="6.5" y2="19">
-	<stop  offset="0" style="stop-color:#F7F7F7"/>
-	<stop  offset="0.1044" style="stop-color:#FCFCFC"/>
-	<stop  offset="0.3293" style="stop-color:#FFFFFF"/>
-	<stop  offset="0.5692" style="stop-color:#E8E8E8"/>
-	<stop  offset="0.8153" style="stop-color:#D7D7D7"/>
-	<stop  offset="1" style="stop-color:#D1D1D1"/>
-	<a:midPointStop  offset="0" style="stop-color:#F7F7F7"/>
-	<a:midPointStop  offset="0.2222" style="stop-color:#F7F7F7"/>
-	<a:midPointStop  offset="0.3293" style="stop-color:#FFFFFF"/>
-	<a:midPointStop  offset="0.3545" style="stop-color:#FFFFFF"/>
-	<a:midPointStop  offset="1" style="stop-color:#D1D1D1"/>
-</linearGradient>
-<rect x="1" y="14" style="fill:url(#SVGID_17_);" width="11" height="5"/>
-<linearGradient id="SVGID_18_" gradientUnits="userSpaceOnUse" x1="7" y1="15" x2="7" y2="18">
-	<stop  offset="0" style="stop-color:#8E8E8E"/>
-	<stop  offset="4.191053e-02" style="stop-color:#8A8A8A"/>
-	<stop  offset="0.4613" style="stop-color:#626262"/>
-	<stop  offset="0.7952" style="stop-color:#4A4A4A"/>
-	<stop  offset="1" style="stop-color:#414141"/>
-	<a:midPointStop  offset="0" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#8E8E8E"/>
-	<a:midPointStop  offset="1" style="stop-color:#414141"/>
-</linearGradient>
-<rect x="2" y="15" style="fill:url(#SVGID_18_);" width="10" height="3"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" style="overflow:visible;enable-background:new 0 0 24 24" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="18" y1="13" x2="18" y2="20"><stop offset="0" style="stop-color:#8e8e8e"/><stop offset=".042" style="stop-color:#8a8a8a"/><stop offset=".461" style="stop-color:#626262"/><stop offset=".795" style="stop-color:#4a4a4a"/><stop offset="1" style="stop-color:#414141"/></linearGradient><path style="fill:url(#a)" d="M12 13h12v7H12z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="17.5" y1="14" x2="17.5" y2="19"><stop offset="0" style="stop-color:#f7f7f7"/><stop offset=".104" style="stop-color:#fcfcfc"/><stop offset=".329" style="stop-color:#fff"/><stop offset=".569" style="stop-color:#e8e8e8"/><stop offset=".815" style="stop-color:#d7d7d7"/><stop offset="1" style="stop-color:#d1d1d1"/></linearGradient><path style="fill:url(#b)" d="M12 14h11v5H12z"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="17" y1="15" x2="17" y2="18"><stop offset="0" style="stop-color:#8e8e8e"/><stop offset=".042" style="stop-color:#8a8a8a"/><stop offset=".461" style="stop-color:#626262"/><stop offset=".795" style="stop-color:#4a4a4a"/><stop offset="1" style="stop-color:#414141"/></linearGradient><path style="fill:url(#c)" d="M12 15h10v3H12z"/><linearGradient id="d" gradientUnits="userSpaceOnUse" x1="16.5" y1="0" x2="16.5" y2="24"><stop offset="0" style="stop-color:#8e8e8e"/><stop offset=".042" style="stop-color:#8a8a8a"/><stop offset=".461" style="stop-color:#626262"/><stop offset=".795" style="stop-color:#4a4a4a"/><stop offset="1" style="stop-color:#414141"/></linearGradient><path style="fill:url(#d)" d="M13 0h7v24h-7z"/><linearGradient id="e" gradientUnits="userSpaceOnUse" x1="16.5" y1="1" x2="16.5" y2="23"><stop offset="0" style="stop-color:#f7f7f7"/><stop offset=".104" style="stop-color:#fcfcfc"/><stop offset=".329" style="stop-color:#fff"/><stop offset=".569" style="stop-color:#e8e8e8"/><stop offset=".815" style="stop-color:#d7d7d7"/><stop offset="1" style="stop-color:#d1d1d1"/></linearGradient><path style="fill:url(#e)" d="M14 1h5v22h-5z"/><linearGradient id="f" gradientUnits="userSpaceOnUse" x1="16.5" y1="2" x2="16.5" y2="22"><stop offset="0" style="stop-color:#8e8e8e"/><stop offset=".042" style="stop-color:#8a8a8a"/><stop offset=".461" style="stop-color:#626262"/><stop offset=".795" style="stop-color:#4a4a4a"/><stop offset="1" style="stop-color:#414141"/></linearGradient><path style="fill:url(#f)" d="M15 2h3v20h-3z"/><linearGradient id="g" gradientUnits="userSpaceOnUse" x1="18" y1="4" x2="18" y2="11"><stop offset="0" style="stop-color:#8e8e8e"/><stop offset=".042" style="stop-color:#8a8a8a"/><stop offset=".461" style="stop-color:#626262"/><stop offset=".795" style="stop-color:#4a4a4a"/><stop offset="1" style="stop-color:#414141"/></linearGradient><path style="fill:url(#g)" d="M12 4h12v7H12z"/><linearGradient id="h" gradientUnits="userSpaceOnUse" x1="17.5" y1="5" x2="17.5" y2="10"><stop offset="0" style="stop-color:#f7f7f7"/><stop offset=".104" style="stop-color:#fcfcfc"/><stop offset=".329" style="stop-color:#fff"/><stop offset=".569" style="stop-color:#e8e8e8"/><stop offset=".815" style="stop-color:#d7d7d7"/><stop offset="1" style="stop-color:#d1d1d1"/></linearGradient><path style="fill:url(#h)" d="M12 5h11v5H12z"/><linearGradient id="i" gradientUnits="userSpaceOnUse" x1="17" y1="6" x2="17" y2="9"><stop offset="0" style="stop-color:#8e8e8e"/><stop offset=".042" style="stop-color:#8a8a8a"/><stop offset=".461" style="stop-color:#626262"/><stop offset=".795" style="stop-color:#4a4a4a"/><stop offset="1" style="stop-color:#414141"/></linearGradient><path style="fill:url(#i)" d="M12 6h10v3H12z"/><linearGradient id="j" gradientUnits="userSpaceOnUse" x1="6" y1="4" x2="6" y2="11"><stop offset="0" style="stop-color:#8e8e8e"/><stop offset=".042" style="stop-color:#8a8a8a"/><stop offset=".461" style="stop-color:#626262"/><stop offset=".795" style="stop-color:#4a4a4a"/><stop offset="1" style="stop-color:#414141"/></linearGradient><path style="fill:url(#j)" d="M0 4h12v7H0z"/><linearGradient id="k" gradientUnits="userSpaceOnUse" x1="6.5" y1="5" x2="6.5" y2="10"><stop offset="0" style="stop-color:#f7f7f7"/><stop offset=".104" style="stop-color:#fcfcfc"/><stop offset=".329" style="stop-color:#fff"/><stop offset=".569" style="stop-color:#e8e8e8"/><stop offset=".815" style="stop-color:#d7d7d7"/><stop offset="1" style="stop-color:#d1d1d1"/></linearGradient><path style="fill:url(#k)" d="M1 5h11v5H1z"/><linearGradient id="l" gradientUnits="userSpaceOnUse" x1="7" y1="6" x2="7" y2="9"><stop offset="0" style="stop-color:#8e8e8e"/><stop offset=".042" style="stop-color:#8a8a8a"/><stop offset=".461" style="stop-color:#626262"/><stop offset=".795" style="stop-color:#4a4a4a"/><stop offset="1" style="stop-color:#414141"/></linearGradient><path style="fill:url(#l)" d="M2 6h10v3H2z"/><linearGradient id="m" gradientUnits="userSpaceOnUse" x1="7.5" y1="0" x2="7.5" y2="24"><stop offset="0" style="stop-color:#8e8e8e"/><stop offset=".042" style="stop-color:#8a8a8a"/><stop offset=".461" style="stop-color:#626262"/><stop offset=".795" style="stop-color:#4a4a4a"/><stop offset="1" style="stop-color:#414141"/></linearGradient><path style="fill:url(#m)" d="M4 0h7v24H4z"/><linearGradient id="n" gradientUnits="userSpaceOnUse" x1="7.5" y1="1" x2="7.5" y2="23"><stop offset="0" style="stop-color:#f7f7f7"/><stop offset=".104" style="stop-color:#fcfcfc"/><stop offset=".329" style="stop-color:#fff"/><stop offset=".569" style="stop-color:#e8e8e8"/><stop offset=".815" style="stop-color:#d7d7d7"/><stop offset="1" style="stop-color:#d1d1d1"/></linearGradient><path style="fill:url(#n)" d="M5 1h5v22H5z"/><linearGradient id="o" gradientUnits="userSpaceOnUse" x1="7.5" y1="2" x2="7.5" y2="22"><stop offset="0" style="stop-color:#8e8e8e"/><stop offset=".042" style="stop-color:#8a8a8a"/><stop offset=".461" style="stop-color:#626262"/><stop offset=".795" style="stop-color:#4a4a4a"/><stop offset="1" style="stop-color:#414141"/></linearGradient><path style="fill:url(#o)" d="M6 2h3v20H6z"/><linearGradient id="p" gradientUnits="userSpaceOnUse" x1="6" y1="13" x2="6" y2="20"><stop offset="0" style="stop-color:#8e8e8e"/><stop offset=".042" style="stop-color:#8a8a8a"/><stop offset=".461" style="stop-color:#626262"/><stop offset=".795" style="stop-color:#4a4a4a"/><stop offset="1" style="stop-color:#414141"/></linearGradient><path style="fill:url(#p)" d="M0 13h12v7H0z"/><linearGradient id="q" gradientUnits="userSpaceOnUse" x1="6.5" y1="14" x2="6.5" y2="19"><stop offset="0" style="stop-color:#f7f7f7"/><stop offset=".104" style="stop-color:#fcfcfc"/><stop offset=".329" style="stop-color:#fff"/><stop offset=".569" style="stop-color:#e8e8e8"/><stop offset=".815" style="stop-color:#d7d7d7"/><stop offset="1" style="stop-color:#d1d1d1"/></linearGradient><path style="fill:url(#q)" d="M1 14h11v5H1z"/><linearGradient id="r" gradientUnits="userSpaceOnUse" x1="7" y1="15" x2="7" y2="18"><stop offset="0" style="stop-color:#8e8e8e"/><stop offset=".042" style="stop-color:#8a8a8a"/><stop offset=".461" style="stop-color:#626262"/><stop offset=".795" style="stop-color:#4a4a4a"/><stop offset="1" style="stop-color:#414141"/></linearGradient><path style="fill:url(#r)" d="M2 15h10v3H2z"/></svg>
diff --git a/src/assets/img/mod_legacy/workshop.svg b/src/assets/img/mod_legacy/workshop.svg
index f466455a6..570537727 100644
--- a/src/assets/img/mod_legacy/workshop.svg
+++ b/src/assets/img/mod_legacy/workshop.svg
@@ -1,98 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" style="overflow:visible;enable-background:new 0 0 24 24;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="7.9995" y1="7.9868" x2="7.9995" y2="24.001">
-	<stop  offset="0" style="stop-color:#F0A829"/>
-	<stop  offset="1" style="stop-color:#C7671A"/>
-	<a:midPointStop  offset="0" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#F0A829"/>
-	<a:midPointStop  offset="1" style="stop-color:#C7671A"/>
-</linearGradient>
-<path style="fill:url(#SVGID_1_);" d="M3,19.2l-3,1.6V24h16v-0.4c0-0.5-0.5-1.2-1-1.5l-6-3.1c-0.5-0.3-0.6-0.8-0.3-1.2
-	c0,0,1.6-2,1.6-4.2C10.4,10.5,8.4,8,6,8c-2.4,0-4.4,2.6-4.4,5.7c0,2.1,1.6,4.2,1.6,4.2C3.6,18.3,3.5,18.9,3,19.2z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="7.7212" y1="8.9868" x2="7.7212" y2="23.001">
-	<stop  offset="0" style="stop-color:#FFEBA8"/>
-	<stop  offset="1" style="stop-color:#F8BE27"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFEBA8"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFEBA8"/>
-	<a:midPointStop  offset="1" style="stop-color:#F8BE27"/>
-</linearGradient>
-<path style="fill:url(#SVGID_2_);" d="M1,23v-1.7L3.5,20c0.5-0.3,0.8-0.7,1-1.2c0.1-0.5,0-1.1-0.4-1.5c0,0-1.4-1.8-1.4-3.6
-	C2.6,11.1,4.2,9,6,9s3.4,2.1,3.4,4.7c0,1.7-1.4,3.5-1.4,3.6c-0.3,0.4-0.5,1-0.4,1.5c0.1,0.5,0.5,1,1,1.2l5.9,3H1z"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="6.1343" y1="9.9868" x2="6.1343" y2="22.001">
-	<stop  offset="0" style="stop-color:#FFC30F"/>
-	<stop  offset="1" style="stop-color:#F5AE0D"/>
-	<a:midPointStop  offset="0" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#FFC30F"/>
-	<a:midPointStop  offset="1" style="stop-color:#F5AE0D"/>
-</linearGradient>
-<path style="fill:url(#SVGID_3_);" d="M2,22L2,22l1.9-1.1c0.8-0.4,1.3-1.1,1.5-1.9c0.2-0.8,0-1.7-0.6-2.3c-0.3-0.4-1.2-1.8-1.2-3
-	c0-2,1.1-3.7,2.4-3.7s2.4,1.7,2.4,3.7c0,1.1-0.9,2.5-1.2,3c-0.5,0.7-0.7,1.5-0.5,2.3c0.2,0.8,0.7,1.5,1.5,1.9l2.2,1.1H2z"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="16" y1="7.9868" x2="16" y2="24.001">
-	<stop  offset="0" style="stop-color:#8D470D"/>
-	<stop  offset="1" style="stop-color:#7C3D09"/>
-	<a:midPointStop  offset="0" style="stop-color:#8D470D"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#8D470D"/>
-	<a:midPointStop  offset="1" style="stop-color:#7C3D09"/>
-</linearGradient>
-<path style="fill:url(#SVGID_4_);" d="M24,24v-3.4l-3-1.5c-0.5-0.3-0.6-0.8-0.3-1.2c0,0,1.6-2,1.6-4.2c0-3.2-1.9-5.7-4.4-5.7
-	c-2.4,0-4.4,2.6-4.4,5.7c0,2.1,1.6,4.2,1.6,4.2c0.3,0.4,0.2,1-0.3,1.3l-6,3.2c-0.5,0.3-1,0.9-1,1.5V24H24z"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="16.4121" y1="8.9868" x2="16.4121" y2="23.001">
-	<stop  offset="0" style="stop-color:#D58738"/>
-	<stop  offset="1" style="stop-color:#AB551F"/>
-	<a:midPointStop  offset="0" style="stop-color:#D58738"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#D58738"/>
-	<a:midPointStop  offset="1" style="stop-color:#AB551F"/>
-</linearGradient>
-<path style="fill:url(#SVGID_5_);" d="M9.8,23l5.7-3c0.5-0.3,0.8-0.7,1-1.2c0.1-0.5,0-1.1-0.4-1.5c0,0-1.4-1.8-1.4-3.6
-	c0-2.6,1.5-4.7,3.4-4.7s3.4,2.1,3.4,4.7c0,1.8-1.4,3.6-1.4,3.6c-0.3,0.4-0.5,1-0.4,1.5s0.5,1,1,1.2l2.4,1.2V23H9.8z"/>
-<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="17.9424" y1="9.9868" x2="17.9424" y2="22.001">
-	<stop  offset="0" style="stop-color:#D0813A"/>
-	<stop  offset="1" style="stop-color:#AF551D"/>
-	<a:midPointStop  offset="0" style="stop-color:#D0813A"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#D0813A"/>
-	<a:midPointStop  offset="1" style="stop-color:#AF551D"/>
-</linearGradient>
-<path style="fill:url(#SVGID_6_);" d="M13.9,22l2.1-1.1c0.8-0.4,1.3-1.1,1.5-1.9c0.2-0.8,0-1.7-0.6-2.3c-0.3-0.4-1.2-1.8-1.2-3
-	c0-2,1.1-3.7,2.4-3.7s2.4,1.7,2.4,3.7c0,1.2-0.9,2.5-1.2,3c-0.5,0.7-0.7,1.5-0.6,2.3c0.2,0.8,0.7,1.5,1.5,1.9l1.9,1V22H13.9z"/>
-<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="7.4507" y1="0" x2="7.4507" y2="12.9043">
-	<stop  offset="0" style="stop-color:#76A1F0"/>
-	<stop  offset="1" style="stop-color:#6B90D5"/>
-	<a:midPointStop  offset="0" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#76A1F0"/>
-	<a:midPointStop  offset="1" style="stop-color:#6B90D5"/>
-</linearGradient>
-<path style="fill:url(#SVGID_7_);" d="M12.5,10.4c1.4-1.1,2.4-2.6,2.4-4.3c0.1-3.3-3.2-6-7.3-6.1C3.4-0.1,0.1,2.5,0,5.8
-	c-0.1,3.3,3.2,6,7.3,6.1c1,0,2-0.1,2.9-0.4c0.8,1,2.8,1.4,2.8,1.4S12.2,11.7,12.5,10.4z"/>
-<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="7.4507" y1="1" x2="7.4507" y2="11.2168">
-	<stop  offset="0" style="stop-color:#BBE0F7"/>
-	<stop  offset="1" style="stop-color:#82B4FB"/>
-	<a:midPointStop  offset="0" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="0.5" style="stop-color:#BBE0F7"/>
-	<a:midPointStop  offset="1" style="stop-color:#82B4FB"/>
-</linearGradient>
-<path style="fill:url(#SVGID_8_);" d="M11.4,11.2c-0.2-0.1-0.3-0.2-0.4-0.3l-0.4-0.6l-0.7,0.2c-0.8,0.2-1.6,0.4-2.4,0.4l-0.1,0
-	C3.8,10.8,1,8.6,1,5.8C1,3.2,3.9,1,7.4,1l0.2,0c1.8,0,3.4,0.6,4.6,1.6c1.1,1,1.8,2.2,1.7,3.5c0,1.3-0.7,2.6-2,3.5l-0.3,0.2l-0.1,0.4
-	C11.4,10.5,11.4,10.9,11.4,11.2z"/>
-<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="7.4507" y1="2" x2="7.4507" y2="9.9097">
-	<stop  offset="0" style="stop-color:#95BFF8"/>
-	<stop  offset="0.5569" style="stop-color:#84ADEF"/>
-	<stop  offset="1" style="stop-color:#7CA4EB"/>
-	<a:midPointStop  offset="0" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="0.4" style="stop-color:#95BFF8"/>
-	<a:midPointStop  offset="1" style="stop-color:#7CA4EB"/>
-</linearGradient>
-<path style="fill:url(#SVGID_9_);" d="M7.4,9.9C4.4,9.9,2,8,2,5.9C2,3.8,4.5,2,7.4,2l0.1,0c1.5,0,2.9,0.5,4,1.4
-	c0.9,0.8,1.4,1.7,1.4,2.7c0,1-0.6,2-1.6,2.7l-0.6,0.4l0,0.1L9.6,9.6C9,9.8,8.2,9.9,7.5,9.9L7.4,9.9z"/>
-<path style="fill:#FFFFFF;" d="M5.5,4.5h1.9V6c0,0.5-0.1,1-0.3,1.3C6.9,7.6,6.5,7.9,5.9,8.1L5.5,7.3C5.9,7.2,6.1,7,6.2,6.9
-	c0.1-0.2,0.2-0.3,0.2-0.6H5.5V4.5z M7.7,4.5h1.9V6c0,0.5-0.1,1-0.3,1.3C9.1,7.6,8.7,7.9,8.2,8.1L7.7,7.3C8.1,7.2,8.3,7,8.4,6.9
-	c0.1-0.2,0.2-0.3,0.2-0.6H7.7V4.5z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" style="overflow:visible;enable-background:new 0 0 24 24" xml:space="preserve" preserveAspectRatio="xMinYMid meet"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="8" y1="7.987" x2="8" y2="24.001"><stop offset="0" style="stop-color:#f0a829"/><stop offset="1" style="stop-color:#c7671a"/></linearGradient><path style="fill:url(#a)" d="m3 19.2-3 1.6V24h16v-.4c0-.5-.5-1.2-1-1.5L9 19c-.5-.3-.6-.8-.3-1.2 0 0 1.6-2 1.6-4.2C10.4 10.5 8.4 8 6 8s-4.4 2.6-4.4 5.7c0 2.1 1.6 4.2 1.6 4.2.4.4.3 1-.2 1.3z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="7.721" y1="8.987" x2="7.721" y2="23.001"><stop offset="0" style="stop-color:#ffeba8"/><stop offset="1" style="stop-color:#f8be27"/></linearGradient><path style="fill:url(#b)" d="M1 23v-1.7L3.5 20c.5-.3.8-.7 1-1.2.1-.5 0-1.1-.4-1.5 0 0-1.4-1.8-1.4-3.6C2.6 11.1 4.2 9 6 9s3.4 2.1 3.4 4.7c0 1.7-1.4 3.5-1.4 3.6-.3.4-.5 1-.4 1.5.1.5.5 1 1 1.2l5.9 3H1z"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="6.134" y1="9.987" x2="6.134" y2="22.001"><stop offset="0" style="stop-color:#ffc30f"/><stop offset="1" style="stop-color:#f5ae0d"/></linearGradient><path style="fill:url(#c)" d="m2 22 1.9-1.1c.8-.4 1.3-1.1 1.5-1.9.2-.8 0-1.7-.6-2.3-.3-.4-1.2-1.8-1.2-3 0-2 1.1-3.7 2.4-3.7s2.4 1.7 2.4 3.7c0 1.1-.9 2.5-1.2 3-.5.7-.7 1.5-.5 2.3.2.8.7 1.5 1.5 1.9l2.2 1.1H2z"/><linearGradient id="d" gradientUnits="userSpaceOnUse" x1="16" y1="7.987" x2="16" y2="24.001"><stop offset="0" style="stop-color:#8d470d"/><stop offset="1" style="stop-color:#7c3d09"/></linearGradient><path style="fill:url(#d)" d="M24 24v-3.4l-3-1.5c-.5-.3-.6-.8-.3-1.2 0 0 1.6-2 1.6-4.2 0-3.2-1.9-5.7-4.4-5.7-2.4 0-4.4 2.6-4.4 5.7 0 2.1 1.6 4.2 1.6 4.2.3.4.2 1-.3 1.3l-6 3.2c-.5.3-1 .9-1 1.5v.1H24z"/><linearGradient id="e" gradientUnits="userSpaceOnUse" x1="16.412" y1="8.987" x2="16.412" y2="23.001"><stop offset="0" style="stop-color:#d58738"/><stop offset="1" style="stop-color:#ab551f"/></linearGradient><path style="fill:url(#e)" d="m9.8 23 5.7-3c.5-.3.8-.7 1-1.2.1-.5 0-1.1-.4-1.5 0 0-1.4-1.8-1.4-3.6 0-2.6 1.5-4.7 3.4-4.7s3.4 2.1 3.4 4.7c0 1.8-1.4 3.6-1.4 3.6-.3.4-.5 1-.4 1.5s.5 1 1 1.2l2.4 1.2V23H9.8z"/><linearGradient id="f" gradientUnits="userSpaceOnUse" x1="17.942" y1="9.987" x2="17.942" y2="22.001"><stop offset="0" style="stop-color:#d0813a"/><stop offset="1" style="stop-color:#af551d"/></linearGradient><path style="fill:url(#f)" d="m13.9 22 2.1-1.1c.8-.4 1.3-1.1 1.5-1.9.2-.8 0-1.7-.6-2.3-.3-.4-1.2-1.8-1.2-3 0-2 1.1-3.7 2.4-3.7s2.4 1.7 2.4 3.7c0 1.2-.9 2.5-1.2 3-.5.7-.7 1.5-.6 2.3.2.8.7 1.5 1.5 1.9l1.9 1v.1h-8.2z"/><linearGradient id="g" gradientUnits="userSpaceOnUse" x1="7.451" y1="0" x2="7.451" y2="12.904"><stop offset="0" style="stop-color:#76a1f0"/><stop offset="1" style="stop-color:#6b90d5"/></linearGradient><path style="fill:url(#g)" d="M12.5 10.4c1.4-1.1 2.4-2.6 2.4-4.3.1-3.3-3.2-6-7.3-6.1C3.4-.1.1 2.5 0 5.8c-.1 3.3 3.2 6 7.3 6.1 1 0 2-.1 2.9-.4.8 1 2.8 1.4 2.8 1.4s-.8-1.2-.5-2.5z"/><linearGradient id="h" gradientUnits="userSpaceOnUse" x1="7.451" y1="1" x2="7.451" y2="11.217"><stop offset="0" style="stop-color:#bbe0f7"/><stop offset="1" style="stop-color:#82b4fb"/></linearGradient><path style="fill:url(#h)" d="M11.4 11.2c-.2-.1-.3-.2-.4-.3l-.4-.6-.7.2c-.8.2-1.6.4-2.4.4h-.1C3.8 10.8 1 8.6 1 5.8 1 3.2 3.9 1 7.4 1h.2c1.8 0 3.4.6 4.6 1.6 1.1 1 1.8 2.2 1.7 3.5 0 1.3-.7 2.6-2 3.5l-.3.2-.1.4c-.1.3-.1.7-.1 1z"/><linearGradient id="i" gradientUnits="userSpaceOnUse" x1="7.451" y1="2" x2="7.451" y2="9.91"><stop offset="0" style="stop-color:#95bff8"/><stop offset=".557" style="stop-color:#84adef"/><stop offset="1" style="stop-color:#7ca4eb"/></linearGradient><path style="fill:url(#i)" d="M7.4 9.9C4.4 9.9 2 8 2 5.9S4.5 2 7.4 2h.1c1.5 0 2.9.5 4 1.4.9.8 1.4 1.7 1.4 2.7 0 1-.6 2-1.6 2.7l-.6.4v.1l-1.1.3c-.6.2-1.4.3-2.1.3h-.1z"/><path style="fill:#fff" d="M5.5 4.5h1.9V6c0 .5-.1 1-.3 1.3-.2.3-.6.6-1.2.8l-.4-.8c.4-.1.6-.3.7-.4.1-.2.2-.3.2-.6h-.9V4.5zm2.2 0h1.9V6c0 .5-.1 1-.3 1.3-.2.3-.6.6-1.1.8l-.5-.8c.4-.1.6-.3.7-.4.1-.2.2-.3.2-.6h-.9V4.5z"/></svg>

From f29558d35b31b9e0d884753981e7f9dfabdc0770 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 19 Jan 2022 10:23:34 +0100
Subject: [PATCH 0370/1008] MOBILE-3811 assets: Add svg versions of some assets

---
 .../conversation-info/conversation-info.html      |   2 +-
 .../messages/pages/discussion/discussion.html     |   2 +-
 .../group-conversations/group-conversations.html  |   2 +-
 src/assets/img/grades/agg_mean.png                | Bin 341 -> 0 bytes
 src/assets/img/grades/agg_mean.svg                |   1 +
 src/assets/img/grades/agg_sum.png                 | Bin 318 -> 0 bytes
 src/assets/img/grades/agg_sum.svg                 |   1 +
 src/assets/img/group-avatar.png                   | Bin 972 -> 0 bytes
 src/assets/img/group-avatar.svg                   |   1 +
 .../features/grades/services/grades-helper.ts     |   6 +++---
 10 files changed, 9 insertions(+), 6 deletions(-)
 delete mode 100644 src/assets/img/grades/agg_mean.png
 create mode 100644 src/assets/img/grades/agg_mean.svg
 delete mode 100644 src/assets/img/grades/agg_sum.png
 create mode 100644 src/assets/img/grades/agg_sum.svg
 delete mode 100644 src/assets/img/group-avatar.png
 create mode 100644 src/assets/img/group-avatar.svg

diff --git a/src/addons/messages/components/conversation-info/conversation-info.html b/src/addons/messages/components/conversation-info/conversation-info.html
index 59f120624..c72e7b344 100644
--- a/src/addons/messages/components/conversation-info/conversation-info.html
+++ b/src/addons/messages/components/conversation-info/conversation-info.html
@@ -20,7 +20,7 @@
             <ion-label>
                 <div class="large-avatar">
                     <img class="avatar" [src]="conversation!.imageurl" core-external-content [alt]="conversation!.name"
-                        onError="this.src='assets/img/group-avatar.png'">
+                        onError="this.src='assets/img/group-avatar.svg'">
                 </div>
                 <h2>
                     <core-format-text [text]="conversation!.name" contextLevel="system" [contextInstanceId]="0"></core-format-text>
diff --git a/src/addons/messages/pages/discussion/discussion.html b/src/addons/messages/pages/discussion/discussion.html
index 06978fd47..2c85e5dbd 100644
--- a/src/addons/messages/pages/discussion/discussion.html
+++ b/src/addons/messages/pages/discussion/discussion.html
@@ -6,7 +6,7 @@
         <ion-title>
             <h1>
                 <img *ngIf="loaded && !otherMember && conversationImage" class="core-bar-button-image" [src]="conversationImage" alt=""
-                    onError="this.src='assets/img/group-avatar.png'" core-external-content role="presentation" [siteId]="siteId || null">
+                    onError="this.src='assets/img/group-avatar.svg'" core-external-content role="presentation" [siteId]="siteId || null">
                 <core-user-avatar *ngIf="loaded && otherMember" class="core-bar-button-image" [user]="otherMember" [linkProfile]="false"
                     [checkOnline]="otherMember.showonlinestatus">
                 </core-user-avatar>
diff --git a/src/addons/messages/pages/group-conversations/group-conversations.html b/src/addons/messages/pages/group-conversations/group-conversations.html
index bfd14752d..5d6e5b57b 100644
--- a/src/addons/messages/pages/group-conversations/group-conversations.html
+++ b/src/addons/messages/pages/group-conversations/group-conversations.html
@@ -151,7 +151,7 @@
         <!-- Group conversation image. -->
         <ion-avatar slot="start" *ngIf="conversation.type == typeGroup">
             <img [src]="conversation.imageurl" [alt]="conversation.name" core-external-content
-                onError="this.src='assets/img/group-avatar.png'">
+                onError="this.src='assets/img/group-avatar.svg'">
         </ion-avatar>
 
         <!-- Avatar for individual conversations. -->
diff --git a/src/assets/img/grades/agg_mean.png b/src/assets/img/grades/agg_mean.png
deleted file mode 100644
index 78c8046dfe8fa156481cf5a070e7d5e5ca2a93b8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 341
zcmV-b0jmCqP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy_en%SRCwByQ^65}KnxUy0w}=_lnR6n
zpaXsJbf`c(aD4L84uA@<1Uirov;?!d=foR0Au}P|?IpQQa^AurWm!JNgd=dB=XvHk
zoMVSGq`@a}99W9p9JmXcE`fFJEi-RuK_L>ZJ#p+^L_rUG(O3;)72rT;{I|pm#r01B
z$#fMxTKrPl%HrNZ$BKAXnL^24DLPMm(3>#>aPI7L{=_!*L(cyKG<qi3fms1o);gUW
zfb)>D(nj`r%-PmY5m{way%t545g_5-Nd+lb8=OxtU>+Y$Yh5A}ux6I~z@vKOhC<J*
n3)(Npo)^jy>z%<NF98MsiN97Y!B!K800000NkvXXu0mjfw&;jC

diff --git a/src/assets/img/grades/agg_mean.svg b/src/assets/img/grades/agg_mean.svg
new file mode 100644
index 000000000..ac4368d15
--- /dev/null
+++ b/src/assets/img/grades/agg_mean.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="-0.9 0 16 16" preserveAspectRatio="xMinYMid meet" overflow="visible"><path d="M2.3 4.8 6.7 4c.8 1.2 1.4 2.6 1.7 4.1.8-1.1 1.4-2 1.9-2.5.6-.7 1-1.1 1.4-1.3.4-.2.8-.3 1.2-.3.5 0 .8.1 1.1.4.2.3.4.6.4 1s-.1.7-.4 1c-.2.3-.6.4-.9.4-.3 0-.6 0-.9-.1-.3-.1-.6-.1-.7-.1-.4 0-.7.1-1 .4-.6.3-1.2 1-1.8 2.1.7 2.5 1.3 4 1.7 4.6.3.3.5.5.8.5.2 0 .4-.1.6-.2.2-.2.6-.6 1.1-1.3l.5.3c-.7 1.2-1.5 2-2.2 2.5-.5.4-1.1.6-1.6.6s-1-.1-1.3-.4c-.4-.2-.7-.6-.9-1.2-.3-.5-.6-1.4-1-2.6-1 1.2-1.7 2.2-2.3 2.7-.6.6-1 .9-1.4 1.1s-.9.3-1.3.3-.8-.1-1-.4-.4-.5-.4-.9.1-.8.4-1.1c.3-.3.6-.4 1.1-.4.2 0 .5.1.8.2.4.2.7.3.9.3.2 0 .5-.1.7-.2.3-.1.6-.4 1-.8.1-.2.5-.7 1.1-1.6-.8-3-1.4-4.8-1.9-5.3-.2-.4-.6-.6-1-.6-.2 0-.5 0-.8.1v-.5zM6.5 0h7.3L13 2.6H5.7L6.5 0z" fill="#999"/></svg>
diff --git a/src/assets/img/grades/agg_sum.png b/src/assets/img/grades/agg_sum.png
deleted file mode 100644
index 7bcc0e43aadddb5c7b3d776b73379bdfca45aa66..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 318
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5X9(cMqhE&{2N^xK^PCr+|5cFHJgPH%*<;$WoB~GxjJFx6x
z6mR&!JWI(@p{(T*r$-UHBa8B`jSl%H3@fWt6kQht%PX7|XINP`!@^A8$Dx>YQzDOp
zukeC@^$k~9kL+NQe8A<hXPrU@!v(Vm&v=ixunP0(t1zr&Su#WONGij&2m^+o=Mzn=
zonl>Xum+snFooliNQbYnhE}7*nm$&~0EShO46AMm+CEvB^^CcY;Y7g>@d+l<4p*B@
z<Q+~c|GQ8i*zlA&MO;E5ldbWugYOTfdc}n$4jeiQjx?~INMsgBVA!-fICro3e_Nnm
O89ZJ6T-G@yGywn#ux#T1

diff --git a/src/assets/img/grades/agg_sum.svg b/src/assets/img/grades/agg_sum.svg
new file mode 100644
index 000000000..9ebd5c23d
--- /dev/null
+++ b/src/assets/img/grades/agg_sum.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="-1.9 0 16 16" preserveAspectRatio="xMinYMid meet" overflow="visible"><path d="M9.2 12.4c-.7.3-1.4.5-2.1.6H2.7l5.2-5.9L5.4 2H7c1.1 0 2 .1 2.6.3.5.2 1 .5 1.3 1 .2.4.3.7.3 1.7h.4l1.3-5H2v2l2.8 5.6L0 13v3h10.4l2.5-6h-.5c-1 1-2 1.8-3.2 2.4z" fill="#999"/></svg>
diff --git a/src/assets/img/group-avatar.png b/src/assets/img/group-avatar.png
deleted file mode 100644
index 2e336c95ca87f61a6fa1309231e138b520c8a771..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 972
zcmV;-12g=IP)<h;3K|Lk000e1NJLTq003kF003kN0{{R3M?7U_00001b5ch_0olnc
ze*gdgKTu3mMF0Q**x1<T=jZV7@cR1t|NsBs;NbZ9`2GF;;^N}l+uQ5w>+J08?(XjO
z_4V`f^X28`-QC^l>gws~>Ez_(i_vXf0000LbW%=J0RR90|NsC0|NsC0|NsC0|NsC0
z|4^{{F8}}l32;bRa{vH2T>t<%T>(QO5DEYQ0|iM$K~#90?U~zxs~`+TM*&4ts-5}&
zZ#~{>B^L;tp3V#Vtu?STge2%!^#OeqNP!ecffPuA{8vb=v@u%M={b^?9HeQ@p|*)5
z1eOe>w&s+LK8(bYhIA%S$1_BhB*fWpsC67eW=TSN1JrX6nI#F)aH!@WGD`~5z>&r<
zaU-;(ARQjcEWOY&6VeQWQp3=sEnkH=buNJ(-7g^y4_&7mf^fA1Zz+LPEgab{^LhB^
z&C!-ZNDYThl|$1l6FSOL3aP+dd*YUl+s2k+hzmBEcGXBRj2W?|91?hE@d~l&b~Vs4
z2U5BIh$Y)Q<dncYp`{cuAE7?=O7+`9&K$#-Ika51&Mbi}0i!|jx$}@a7`!YIu3QMR
zZ({v@y&=|H%VxQ{VA!JoZF&T`ovS$1T~`mDi{Eomyx%Ox)9RLj;6$-Z!!wMbo)ZQD
zgiP;%z-<p9sGhD6i~c-iDG02=5OPB!e01T-t8h^ugqW|Y6c169GhqgU5F(H|oNJ$&
zsKS+k5c7;wZF-2#o%s+;g~Oqqj*5K9k|$uJc=Cy|^&&(wQ*C(E-U%SoE&GXa*y5~-
z3U8Z$z<tu*k4#B~@wi`^@9=3<0ut6hd&%U;W0#bE4;=toRg{IVbFJlc{`T7VHG9v2
zXKw2gcHU^eR)wIMK?MaDtyx_d?(t*m7`yRsj2>628=n`S6opG8S>wB1?s6V9dM`z8
zzpz<7mtr|Bx?>PEU-XC_#;5<eUi%50$MixH2n<iF>dhBTtzf9rU7Y|D$%|OABXR^n
zZ)Q&Hi7yU`G(wq=5`jc|6iVcwAq9!FjkJi?F$u}^7HTF%5ZqEEgnBvwBrCR7@$tn%
zB6Xb;yX#p9(S)SLzD!~vS=)UVyHi*Q+o14b-zEJmggNiN7ZPc*IkD;fZy}LRp3|5O
z`N+b5WS@K_t>iBXY)&PRIdUAOWM3&-xhXR8u07TgH5nyE$G%O(Kho5~W}=OMWl4Pr
udbGGvMSD~M<Si<Y0x6IJDUbqrhyDTEwPLkg?GAtd0000<MNUMnLSTZZXU?kt

diff --git a/src/assets/img/group-avatar.svg b/src/assets/img/group-avatar.svg
new file mode 100644
index 000000000..f20509e01
--- /dev/null
+++ b/src/assets/img/group-avatar.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg" xmlns:bx="https://boxy-svg.com" preserveAspectRatio="xMinYMid meet"><path style="fill:#d8d8d8" d="M0 0h100v100H0z"/><path d="M36.62 49.666c-3.937.122-7.158 1.677-9.662 4.668h-4.885c-1.993 0-3.67-.493-5.031-1.477-1.361-.984-2.042-2.426-2.042-4.32 0-8.58 1.507-12.871 4.52-12.871.147 0 .675.256 1.588.767.91.509 2.095 1.025 3.555 1.549 1.456.522 2.903.783 4.337.783 1.627 0 3.244-.28 4.849-.838a18.11 18.11 0 0 0-.183 2.406c0 3.379.986 6.49 2.954 9.333Zm39.047 23.225c0 2.916-.888 5.219-2.661 6.909-1.775 1.688-4.133 2.533-7.074 2.533H34.068c-2.942 0-5.3-.845-7.073-2.533-1.774-1.69-2.662-3.993-2.662-6.909 0-1.288.043-2.547.128-3.773.085-1.227.255-2.554.511-3.975.255-1.421.576-2.74.965-3.955.39-1.216.912-2.401 1.569-3.556.656-1.155 1.408-2.138 2.26-2.953.851-.813 1.89-1.464 3.116-1.949 1.227-.488 2.584-.731 4.066-.731.243 0 .764.262 1.568.785.801.522 1.689 1.106 2.661 1.75.972.644 2.272 1.227 3.902 1.751 1.628.52 3.268.783 4.92.783 1.654 0 3.294-.263 4.922-.783 1.63-.524 2.93-1.107 3.902-1.751.972-.644 1.86-1.228 2.661-1.75.802-.523 1.325-.785 1.568-.785 1.484 0 2.839.243 4.066.731 1.226.485 2.265 1.136 3.116 1.949.852.815 1.603 1.798 2.26 2.953a18.707 18.707 0 0 1 1.568 3.556c.39 1.215.711 2.534.967 3.955.255 1.421.425 2.748.51 3.975a54.58 54.58 0 0 1 .128 3.773ZM38.333 26.333c0 2.577-.912 4.776-2.735 6.599-1.821 1.824-4.021 2.734-6.598 2.734s-4.777-.91-6.599-2.734c-1.824-1.823-2.734-4.022-2.734-6.599 0-2.575.91-4.776 2.734-6.599C24.223 17.912 26.423 17 29 17s4.777.912 6.598 2.734c1.823 1.823 2.735 4.024 2.735 6.599Zm25.667 14c0 3.865-1.368 7.164-4.101 9.899-2.736 2.734-6.035 4.102-9.9 4.102-3.863 0-7.164-1.368-9.898-4.102-2.733-2.735-4.102-6.034-4.102-9.899 0-3.865 1.369-7.164 4.102-9.897 2.734-2.735 6.035-4.103 9.898-4.103 3.865 0 7.164 1.368 9.9 4.103C62.632 33.169 64 36.468 64 40.333Zm21 8.204c0 1.894-.681 3.336-2.042 4.32-1.362.984-3.038 1.477-5.031 1.477h-4.885c-2.504-2.991-5.725-4.546-9.661-4.668 1.967-2.843 2.953-5.954 2.953-9.333 0-.705-.061-1.506-.183-2.406 1.605.558 3.222.838 4.849.838 1.434 0 2.88-.261 4.337-.783 1.46-.524 2.646-1.04 3.556-1.549.911-.511 1.44-.767 1.586-.767 3.013 0 4.521 4.291 4.521 12.871Zm-4.667-22.204c0 2.577-.911 4.776-2.734 6.599-1.823 1.824-4.023 2.734-6.599 2.734-2.578 0-4.777-.91-6.598-2.734-1.824-1.823-2.735-4.022-2.735-6.599 0-2.575.911-4.776 2.735-6.599C66.223 17.912 68.422 17 71 17c2.576 0 4.776.912 6.599 2.734 1.823 1.823 2.734 4.024 2.734 6.599Z" fill="#fff" bx:origin="-2.38412 -1.795421"/></svg>
diff --git a/src/core/features/grades/services/grades-helper.ts b/src/core/features/grades/services/grades-helper.ts
index 91af997c6..b4d26bfa2 100644
--- a/src/core/features/grades/services/grades-helper.ts
+++ b/src/core/features/grades/services/grades-helper.ts
@@ -543,11 +543,11 @@ export class CoreGradesHelperProvider {
         text = text.replace('%2F', '/').replace('%2f', '/');
         if (text.indexOf('/agg_mean') > -1) {
             row.itemtype = 'agg_mean';
-            row.image = 'assets/img/grades/agg_mean.png';
+            row.image = 'assets/img/grades/agg_mean.svg';
             row.iconAlt = Translate.instant('core.grades.aggregatemean');
         } else if (text.indexOf('/agg_sum') > -1) {
             row.itemtype = 'agg_sum';
-            row.image = 'assets/img/grades/agg_sum.png';
+            row.image = 'assets/img/grades/agg_sum.svg';
             row.iconAlt = Translate.instant('core.grades.aggregatesum');
         } else if (text.indexOf('/outcomes') > -1 || text.indexOf('fa-tasks') > -1) {
             row.itemtype = 'outcome';
@@ -555,7 +555,7 @@ export class CoreGradesHelperProvider {
             row.iconAlt = Translate.instant('core.grades.outcome');
         } else if (text.indexOf('i/folder') > -1 || text.indexOf('fa-folder') > -1) {
             row.itemtype = 'category';
-            row.icon = 'fas-cubes';
+            row.icon = 'fas-folder';
             row.iconAlt = Translate.instant('core.grades.category');
         } else if (text.indexOf('/manual_item') > -1 || text.indexOf('fa-square-o') > -1) {
             row.itemtype = 'manual';

From 997b38011a966f6c0d25554df02c7e46e1ab2996 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 18 Jan 2022 15:40:47 +0100
Subject: [PATCH 0371/1008] MOBILE-3961 config: Include version name and number
 in user agent

---
 config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.xml b/config.xml
index 0b35bc461..0fb53b7b8 100644
--- a/config.xml
+++ b/config.xml
@@ -27,7 +27,7 @@
     <preference name="UIWebViewBounce" value="false" />
     <preference name="DisallowOverscroll" value="true" />
     <preference name="prerendered-icon" value="true" />
-    <preference name="AppendUserAgent" value="MoodleMobile" />
+    <preference name="AppendUserAgent" value="MoodleMobile 4.0.0-dev (40000)" />
     <preference name="BackupWebStorage" value="none" />
     <preference name="ScrollEnabled" value="false" />
     <preference name="KeyboardDisplayRequiresUserAction" value="false" />

From d7d90cda58d7d0f917107ea7bbdaa2e0fff20839 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 19 Jan 2022 11:20:39 +0100
Subject: [PATCH 0372/1008] MOBILE-3833 calendar: Fix missing calendar icon

---
 src/assets/img/icons/calendar.png | Bin 0 -> 514 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/assets/img/icons/calendar.png

diff --git a/src/assets/img/icons/calendar.png b/src/assets/img/icons/calendar.png
new file mode 100644
index 0000000000000000000000000000000000000000..e825eeee4c685d011779c5f824609f7e112c5b70
GIT binary patch
literal 514
zcmV+d0{#7oP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy000McNliru;{^{04KXI<b7cSk0gp*U
zK~!ko?U~I=!$1^;ziXyH2rk>LpwFUf^${8+>aJob?)m~Ef=DaW2k54KC3o6IHzE`h
z7#F6c4T?=tLSpaP3=@VkbB1&88HkVoy<YDgI0c?O&ufwp>)_c+xc3FH4P25Asd<tL
zD1~D=rGV5t2B6>X@A$rdD<Vfg?WcvF=gA6|uz#&d$ukCq#+a7ty6<xV;o;B7Kk9%N
z1OdSL+(O~a7YQfP8mJXaKrMC=4+aBgVfq;v>2x|KOP<&QCX>nD!t@dN5Rr$uIqUWP
zEP0l?&?*p-25=L0k|wYeJdWcuvgApU16SQ{_u!YdcNjfL20Y&vvTFaHc~wO2famFS
z`ckb{cdfN<xM?ZIzNvX;d17K#f7x2w2HKTM1#4~6F0wA3#7~LbKn19PO&4I2Jbf42
zZkB7*LMlK7{6hh8A9K0EtZS)-G{`i_RDcT5Ak!dI3u%z4g;anF&>+(w+w>Y37wp`x
zQ30bu6|Tr==_z51xekKB0>^y+&d)2}L}cjuerxvO3m<H}dXDk1(*OVf07*qoM6N<$
Ef-jQWvH$=8

literal 0
HcmV?d00001


From 7c4acd712b10bc7441a3e20c4673ba6cdf0f4658 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 19 Jan 2022 08:51:34 +0100
Subject: [PATCH 0373/1008] MOBILE-3833 calendar: Fix no records found error

---
 src/addons/calendar/services/calendar-helper.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/addons/calendar/services/calendar-helper.ts b/src/addons/calendar/services/calendar-helper.ts
index 776c2b38d..a4f3a9479 100644
--- a/src/addons/calendar/services/calendar-helper.ts
+++ b/src/addons/calendar/services/calendar-helper.ts
@@ -400,7 +400,7 @@ export class AddonCalendarHelperProvider {
     ): Promise<{ daynames: Partial<AddonCalendarDayName>[]; weeks: AddonCalendarWeek[] }> {
         const site = await CoreSites.getSite(siteId);
         // Get starting week day user preference, fallback to site configuration.
-        let startWeekDayStr = site.getStoredConfig('calendar_startwday');
+        let startWeekDayStr = site.getStoredConfig('calendar_startwday') || '1';
         startWeekDayStr = await CoreConfig.get(AddonCalendarProvider.STARTING_WEEK_DAY, startWeekDayStr);
         const startWeekDay = parseInt(startWeekDayStr, 10);
 

From d60512d4e74c68ca5674cacc1b706a9da64d9f61 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 19 Jan 2022 11:53:22 +0100
Subject: [PATCH 0374/1008] MOBILE-3715 login: Change message when sso with
 another app scheme

---
 scripts/langindex.json   | 1 -
 src/app/app.component.ts | 6 ++++--
 src/core/lang.json       | 1 -
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 4553ed0ac..694fff759 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1658,7 +1658,6 @@
   "core.errorsync": "local_moodlemobileapp",
   "core.errorsyncblocked": "local_moodlemobileapp",
   "core.errorurlschemeinvalidscheme": "local_moodlemobileapp",
-  "core.errorurlschemeinvalidschemessologin": "local_moodlemobileapp",
   "core.errorurlschemeinvalidsite": "local_moodlemobileapp",
   "core.expand": "moodle",
   "core.explanationdigitalminor": "moodle",
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index d5aad5141..5df6a4cb0 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -125,8 +125,10 @@ export class AppComponent implements OnInit, AfterViewInit {
             } else if (isExternalApp && url.includes('://token=')) {
                 // It's an SSO token for another app. Close the IAB and show an error.
                 CoreUtils.closeInAppBrowser();
-                CoreDomUtils.showErrorModal(Translate.instant('core.errorurlschemeinvalidschemessologin', {
-                    $a: urlScheme,
+                CoreDomUtils.showErrorModal(Translate.instant('core.login.contactyouradministratorissue', {
+                    $a: '<br><br>' + Translate.instant('core.errorurlschemeinvalidscheme', {
+                        $a: urlScheme,
+                    }),
                 }));
 
             } else if (CoreApp.isAndroid()) {
diff --git a/src/core/lang.json b/src/core/lang.json
index 584f0d5a6..43fab245f 100644
--- a/src/core/lang.json
+++ b/src/core/lang.json
@@ -113,7 +113,6 @@
     "errorsync": "An error occurred while synchronising. Please try again.",
     "errorsyncblocked": "This {{$a}} cannot be synchronised right now because of an ongoing process. Please try again later. If the problem persists, try restarting the app.",
     "errorurlschemeinvalidscheme": "This URL is meant to be used in another app: {{$a}}.",
-    "errorurlschemeinvalidschemessologin": "This site is configured to be used in another app: {{$a}}.",
     "errorurlschemeinvalidsite": "This site URL cannot be opened in this app.",
     "expand": "Expand",
     "explanationdigitalminor": "This information is required to determine if your age is over the digital age of consent. This is the age when an individual can consent to terms and conditions and their data being legally stored and processed.",

From 272f65a8a50f9da2ba9a2387bcceed54d47d0b06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 19 Jan 2022 10:59:34 +0100
Subject: [PATCH 0375/1008] MOBILE-3811 notifications: Apply new icons to
 notifications

---
 src/addons/notifications/notifications.scss   | 19 +++++++++++++++++++
 src/addons/notifications/pages/list/list.html |  8 +++++++-
 src/addons/notifications/pages/list/list.ts   |  4 ++--
 .../pages/notification/notification.html      |  6 +++++-
 .../pages/notification/notification.ts        |  8 ++++++++
 .../services/notifications-helper.ts          | 12 +++++++++++-
 src/core/components/mod-icon/mod-icon.ts      |  4 ++++
 .../user-avatar/core-user-avatar.html         |  2 --
 .../components/user-avatar/user-avatar.scss   | 15 ++-------------
 .../components/user-avatar/user-avatar.ts     |  1 -
 10 files changed, 58 insertions(+), 21 deletions(-)

diff --git a/src/addons/notifications/notifications.scss b/src/addons/notifications/notifications.scss
index 98b92c030..360723b32 100644
--- a/src/addons/notifications/notifications.scss
+++ b/src/addons/notifications/notifications.scss
@@ -1,6 +1,25 @@
 @import "~theme/globals";
 
 :host {
+    ::ng-deep {
+        core-user-avatar .core-avatar-extra {
+            margin: 0 !important;
+            position: absolute;
+            right: -4px;
+            bottom: -4px;
+        }
+        core-user-avatar img.core-avatar-extra {
+            background: none;
+            width: 24px;
+            height: 24px;
+            border-radius: 0 !important;
+        }
+        core-user-avatar core-mod-icon.core-avatar-extra {
+            --size: 16px;
+            padding: 0.2rem;
+        }
+    }
+
     .core-notification-icon {
         width: 34px;
         height: 34px;
diff --git a/src/addons/notifications/pages/list/list.html b/src/addons/notifications/pages/list/list.html
index 18af2d97b..0a4462816 100644
--- a/src/addons/notifications/pages/list/list.html
+++ b/src/addons/notifications/pages/list/list.html
@@ -32,7 +32,13 @@
                     : 'addon.notifications.unreadnotification' | translate: {$a: notification.subject}">
                 <core-user-avatar *ngIf="notification.useridfrom > 0" [user]="notification" slot="start"
                     [profileUrl]="notification.profileimageurlfrom" [fullname]="notification.userfromfullname"
-                    [userId]="notification.useridfrom" [extraIcon]="notification.iconurl"></core-user-avatar>
+                    [userId]="notification.useridfrom">
+                    <img *ngIf="notification.iconurl && !notification.modname" [src]="notification.iconurl" alt="" role="presentation"
+                        class="core-avatar-extra">
+                    <core-mod-icon *ngIf="notification.modname" [modicon]="notification.iconurl" [modname]="notification.modname"
+                        [showAlt]="false" class="core-avatar-extra">
+                    </core-mod-icon>
+                </core-user-avatar>
 
                 <img *ngIf="notification.useridfrom <= 0 && notification.iconurl" [src]="notification.iconurl" alt="" role="presentation"
                     class="core-notification-icon" slot="start">
diff --git a/src/addons/notifications/pages/list/list.ts b/src/addons/notifications/pages/list/list.ts
index 5968a852e..acff71cb5 100644
--- a/src/addons/notifications/pages/list/list.ts
+++ b/src/addons/notifications/pages/list/list.ts
@@ -53,7 +53,7 @@ export class AddonNotificationsListPage implements OnInit, OnDestroy {
     protected pendingRefresh = false;
 
     /**
-     * Component being initialized.
+     * @inheritdoc
      */
     ngOnInit(): void {
         this.fetchNotifications();
@@ -221,7 +221,7 @@ export class AddonNotificationsListPage implements OnInit, OnDestroy {
     }
 
     /**
-     * Page destroyed.
+     * @inheritdoc
      */
     ngOnDestroy(): void {
         this.cronObserver?.off();
diff --git a/src/addons/notifications/pages/notification/notification.html b/src/addons/notifications/pages/notification/notification.html
index b227ffc7f..520e6dc3b 100644
--- a/src/addons/notifications/pages/notification/notification.html
+++ b/src/addons/notifications/pages/notification/notification.html
@@ -12,7 +12,11 @@
     <core-loading [hideUntil]="loaded">
         <ion-item class="ion-text-wrap" lines="none" [attr.aria-label]="subject">
             <core-user-avatar *ngIf="userIdFrom > 0" slot="start" [userId]="userIdFrom" [profileUrl]="profileImageUrlFrom"
-                [fullname]="userFromFullName" [extraIcon]="iconUrl"></core-user-avatar>
+                [fullname]="userFromFullName">
+                <img *ngIf="iconUrl && !modname" [src]="iconUrl" alt="" role="presentation" class="core-avatar-extra">
+                <core-mod-icon *ngIf="modname" [modicon]="iconUrl" [modname]="modname" [showAlt]="false" class="core-avatar-extra">
+                </core-mod-icon>
+            </core-user-avatar>
 
             <img *ngIf="userIdFrom <= 0 && iconUrl" [src]="iconUrl" alt="" role="presentation" class="core-notification-icon" slot="start">
 
diff --git a/src/addons/notifications/pages/notification/notification.ts b/src/addons/notifications/pages/notification/notification.ts
index f2594a9e4..9fb04f294 100644
--- a/src/addons/notifications/pages/notification/notification.ts
+++ b/src/addons/notifications/pages/notification/notification.ts
@@ -39,6 +39,7 @@ export class AddonNotificationsNotificationPage implements OnInit {
     profileImageUrlFrom?: string; // Avatar of the user who sent the notification.
     userFromFullName?: string; // Name of the user who sent the notification.
     iconUrl?: string; // Icon URL.
+    modname?: string; // Module name.
     loaded = false;
 
     /**
@@ -77,6 +78,13 @@ export class AddonNotificationsNotificationPage implements OnInit {
             this.profileImageUrlFrom = notification.profileimageurlfrom;
             this.userFromFullName = notification.userfromfullname;
             this.iconUrl = notification.iconurl;
+            if (notification.moodlecomponent?.startsWith('mod_') && notification.iconurl) {
+                const modname = notification.moodlecomponent.substring(4);
+                if (notification.iconurl.match('/theme/image.php/[^/]+/' + modname + '/[-0-9]*/') ||
+                        notification.iconurl.match('/theme/image.php/[^/]+/' + notification.moodlecomponent + '/[-0-9]*/')) {
+                    this.modname = modname;
+                }
+            }
         } else {
             this.subject = notification.title || '';
             this.content = notification.message || '';
diff --git a/src/addons/notifications/services/notifications-helper.ts b/src/addons/notifications/services/notifications-helper.ts
index ec2758f5b..8ccd98f55 100644
--- a/src/addons/notifications/services/notifications-helper.ts
+++ b/src/addons/notifications/services/notifications-helper.ts
@@ -41,7 +41,16 @@ export class AddonNotificationsHelperProvider {
         notification: AddonNotificationsNotificationMessageFormatted,
     ): AddonNotificationsNotificationToRender {
         const formattedNotification: AddonNotificationsNotificationToRender = notification;
-        formattedNotification.iconurl = formattedNotification.iconurl || undefined; // Make sure the property exists.
+
+        if (notification.moodlecomponent?.startsWith('mod_') && notification.iconurl) {
+            const modname = notification.moodlecomponent.substring(4);
+            if (notification.iconurl.match('/theme/image.php/[^/]+/' + modname + '/[-0-9]*/') ||
+                    notification.iconurl.match('/theme/image.php/[^/]+/' + notification.moodlecomponent + '/[-0-9]*/')) {
+                formattedNotification.modname = modname;
+            }
+        } else {
+            formattedNotification.iconurl = formattedNotification.iconurl || undefined; // Make sure the property exists.
+        }
 
         return formattedNotification;
     }
@@ -172,4 +181,5 @@ export type AddonNotificationsPreferencesProcessorFormatted = AddonNotifications
  */
 export type AddonNotificationsNotificationToRender = AddonNotificationsNotificationMessageFormatted & {
     iconurl?: string;
+    modname?: string;
 };
diff --git a/src/core/components/mod-icon/mod-icon.ts b/src/core/components/mod-icon/mod-icon.ts
index 7f0262038..f0362138b 100644
--- a/src/core/components/mod-icon/mod-icon.ts
+++ b/src/core/components/mod-icon/mod-icon.ts
@@ -53,6 +53,10 @@ export class CoreModIconComponent implements OnInit, OnChanges {
             // Guess module from the icon url.
             const matches = this.modicon.match('/theme/image.php/[^/]+/([^/]+)/[-0-9]*/');
             this.modname = (matches && matches[1]) || '';
+
+            if (this.modname.startsWith('mod_')) {
+                this.modname = this.modname.substring(4);
+            }
         }
 
         this.modNameTranslated = this.modname ? CoreCourse.translateModuleName(this.modname) || '' : '';
diff --git a/src/core/components/user-avatar/core-user-avatar.html b/src/core/components/user-avatar/core-user-avatar.html
index 9007a6d40..1e90d6bf3 100644
--- a/src/core/components/user-avatar/core-user-avatar.html
+++ b/src/core/components/user-avatar/core-user-avatar.html
@@ -9,6 +9,4 @@
 <span *ngIf="checkOnline && isOnline()" class="contact-status online" role="status" [attr.aria-label]="'core.online' | translate">
 </span>
 
-<img *ngIf="extraIcon" [src]="extraIcon" alt="" role="presentation" class="core-avatar-extra-icon">
-
 <ng-content></ng-content>
diff --git a/src/core/components/user-avatar/user-avatar.scss b/src/core/components/user-avatar/user-avatar.scss
index f0e1ff20d..d7c33997c 100644
--- a/src/core/components/user-avatar/user-avatar.scss
+++ b/src/core/components/user-avatar/user-avatar.scss
@@ -44,7 +44,7 @@
         max-height: var(--core-header-toolbar-button-image-size);
         border-radius: 50%;
         display: block;
-        
+
         img {
             padding: 4px;
             border-radius: 50%;
@@ -63,17 +63,6 @@
             background-color: var(--core-online-color);
         }
     }
-
-    .core-avatar-extra-icon {
-        margin: 0 !important;
-        border-radius: 0 !important;
-        background: none;
-        position: absolute;
-        right: -4px;
-        bottom: -4px;
-        width: 24px;
-        height: 24px;
-    }
 }
 
 :host-context(.toolbar) .contact-status {
@@ -89,4 +78,4 @@
 :host-context(ion-item) {
     margin-top: 12px;
     margin-bottom: 12px;
-}
\ No newline at end of file
+}
diff --git a/src/core/components/user-avatar/user-avatar.ts b/src/core/components/user-avatar/user-avatar.ts
index e450fe45c..e192d15af 100644
--- a/src/core/components/user-avatar/user-avatar.ts
+++ b/src/core/components/user-avatar/user-avatar.ts
@@ -41,7 +41,6 @@ export class CoreUserAvatarComponent implements OnInit, OnChanges, OnDestroy {
     @Input() userId?: number; // If provided or found it will be used to link the image to the profile.
     @Input() courseId?: number;
     @Input() checkOnline = false; // If want to check and show online status.
-    @Input() extraIcon?: string; // Extra icon to show near the avatar.
 
     avatarUrl?: string;
 

From 1a0bd92efc0a16f67036e2292c2e5b9385c851f7 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 19 Jan 2022 13:37:35 +0100
Subject: [PATCH 0376/1008] MOBILE-3961 config: Update versioncode to match
 native value

---
 moodle.config.json | 2 +-
 upgrade.txt        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/moodle.config.json b/moodle.config.json
index ecca950ae..84a52ba65 100644
--- a/moodle.config.json
+++ b/moodle.config.json
@@ -1,7 +1,7 @@
 {
     "app_id": "com.moodle.moodlemobile",
     "appname": "Moodle Mobile",
-    "versioncode": 4000,
+    "versioncode": 40000,
     "versionname": "4.0.0-dev",
     "cache_update_frequency_usually": 420000,
     "cache_update_frequency_often": 1200000,
diff --git a/upgrade.txt b/upgrade.txt
index ddb9fc2c5..11db21eef 100644
--- a/upgrade.txt
+++ b/upgrade.txt
@@ -3,6 +3,7 @@ information provided here is intended especially for developers.
 
 === 4.0.0 ===
 
+- The versioncode in moodle.config.json has changed from 4 digits to 5 digits to match the actual value for the stores: the 4.0.0 version's versioncode is now 40000 instead of 4000. If you maintain a Moodle plugin with mobile support and you use the versioncode that is sent in every request, you might need to check if this change will affect your code.
 - The parameters of the functions confirmAndPrefetchCourse and confirmAndPrefetchCourses have changed, they now accept an object with options.
 - Component core-navigation-bar changed to add an slider inside. previous, previousTitle, next, nextTitle, info and title have been removed.
   Now you have to pass all items and 3 optional params have been added.

From edb1dc71ac0d94024c2a4d86cd0efd6f9ae24abd Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 19 Jan 2022 14:25:17 +0100
Subject: [PATCH 0377/1008] MOBILE-3794 sitepolicy: Make iframe bigger

---
 .../login/pages/site-policy/site-policy.html  |  6 ++---
 .../login/pages/site-policy/site-policy.scss  | 26 +++++++++++++++++++
 .../login/pages/site-policy/site-policy.ts    |  1 +
 3 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 src/core/features/login/pages/site-policy/site-policy.scss

diff --git a/src/core/features/login/pages/site-policy/site-policy.html b/src/core/features/login/pages/site-policy/site-policy.html
index 0218d615b..d061ab406 100644
--- a/src/core/features/login/pages/site-policy/site-policy.html
+++ b/src/core/features/login/pages/site-policy/site-policy.html
@@ -24,13 +24,13 @@
                     </p>
                 </ion-label>
             </ion-item>
-            <ion-card *ngIf="showInline">
+            <ion-card *ngIf="showInline" class="core-site-policy-iframe-container">
                 <core-iframe [src]="sitePolicy"></core-iframe>
             </ion-card>
-            <ion-button class="ion-text-wrap ion-margin" expand="block" (click)="accept()">
+            <ion-button class="ion-text-wrap ion-margin-horizontal" expand="block" (click)="accept()">
                 {{ 'core.login.policyaccept' | translate }}
             </ion-button>
-            <ion-button class="ion-text-wrap ion-margin" expand="block" color="light" (click)="cancel()">
+            <ion-button class="ion-text-wrap ion-margin-horizontal ion-margin-bottom" expand="block" color="light" (click)="cancel()">
                 {{ 'core.login.cancel' | translate }}
             </ion-button>
         </ion-list>
diff --git a/src/core/features/login/pages/site-policy/site-policy.scss b/src/core/features/login/pages/site-policy/site-policy.scss
new file mode 100644
index 000000000..f54f35631
--- /dev/null
+++ b/src/core/features/login/pages/site-policy/site-policy.scss
@@ -0,0 +1,26 @@
+:host {
+    ion-list {
+        display: flex;
+        flex-direction: column;
+        height: 100%;
+
+        ion-item {
+            flex-shrink: 0;
+        }
+
+        .core-site-policy-iframe-container {
+            height: 100%;
+
+            core-iframe {
+                height: 100%;
+                width: 100%;
+            }
+        }
+    }
+}
+
+:host core-loading ::ng-deep {
+    .core-loading-content {
+        height: 100%;
+    }
+}
diff --git a/src/core/features/login/pages/site-policy/site-policy.ts b/src/core/features/login/pages/site-policy/site-policy.ts
index 17aba15e3..180905155 100644
--- a/src/core/features/login/pages/site-policy/site-policy.ts
+++ b/src/core/features/login/pages/site-policy/site-policy.ts
@@ -29,6 +29,7 @@ import { CoreEvents } from '@singletons/events';
 @Component({
     selector: 'page-core-login-site-policy',
     templateUrl: 'site-policy.html',
+    styleUrls: ['site-policy.scss'],
 })
 export class CoreLoginSitePolicyPage implements OnInit {
 

From 6622ecf733a16ea9fb2c4bcd30c12f024666605c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 19 Jan 2022 14:23:33 +0100
Subject: [PATCH 0378/1008] MOBILE-3814 my: Fix loading spinner position

---
 src/core/features/courses/pages/my/my.scss | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/core/features/courses/pages/my/my.scss b/src/core/features/courses/pages/my/my.scss
index 05e886016..4d244fdc8 100644
--- a/src/core/features/courses/pages/my/my.scss
+++ b/src/core/features/courses/pages/my/my.scss
@@ -1,3 +1,10 @@
 :host ::ng-deep ion-item-divider {
     display: none !important;
 }
+:host ::ng-deep core-loading {
+    --internal-loading-inline-min-height: calc(100vh - var(--core-header-toolbar-height));
+}
+
+:host-context(ion-tabs.placement-bottom) ::ng-deep core-loading {
+    --internal-loading-inline-min-height: calc(100vh - var(--core-header-toolbar-height) - var(--bottom-tabs-size) - 2px);
+}

From d8a1799b9f3f229199f73317fd1e0a3a3c6f90ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 19 Jan 2022 14:25:57 +0100
Subject: [PATCH 0379/1008] MOBILE-3814 UI: Change caret to chevrons

---
 .../recentlyaccesseditems.scss                |  3 +++
 .../group-conversations.html                  | 18 ++++++++-----
 .../mod/forum/components/post/post.html       |  6 +++--
 .../pages/new-discussion/new-discussion.html  |  6 +++--
 .../core-horizontal-scroll-controls.html      | 26 +++++--------------
 .../features/grades/pages/course/course.html  |  2 +-
 .../features/grades/pages/course/course.scss  |  5 ++++
 src/theme/globals.mixins.scss                 |  2 +-
 src/theme/theme.light.scss                    |  4 +++
 9 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.scss b/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.scss
index 62c797d58..1f7d02104 100644
--- a/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.scss
+++ b/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.scss
@@ -3,6 +3,9 @@
 :host {
     .core-horizontal-scroll div.core-horizontal-scroll-item {
         @include horizontal_scroll_item(80%, 250px, 300px);
+        ion-card {
+            height: auto;
+        }
     }
 
     .core-course-module-handler {
diff --git a/src/addons/messages/pages/group-conversations/group-conversations.html b/src/addons/messages/pages/group-conversations/group-conversations.html
index 5d6e5b57b..6b476b60f 100644
--- a/src/addons/messages/pages/group-conversations/group-conversations.html
+++ b/src/addons/messages/pages/group-conversations/group-conversations.html
@@ -40,9 +40,11 @@
                     [attr.aria-label]="(favourites.expanded ? 'core.collapse' : 'core.expand') | translate"
                     [attr.aria-expanded]="favourites.expanded" aria-controls="addon-messages-groupconversations-favourite" role="heading"
                     detail="false">
-                    <ion-icon *ngIf="!favourites.expanded" name="fas-caret-right" flip-rtl slot="start" aria-hidden="true">
+                    <ion-icon *ngIf="!favourites.expanded" name="fas-chevron-right" flip-rtl slot="start" aria-hidden="true"
+                        class="expandable-status-icon">
                     </ion-icon>
-                    <ion-icon *ngIf="favourites.expanded" name="fas-caret-down" slot="start" aria-hidden="true"></ion-icon>
+                    <ion-icon *ngIf="favourites.expanded" name="fas-chevron-down" slot="start" aria-hidden="true"
+                        class="expandable-status-icon"></ion-icon>
                     <ion-label>
                         <h2>{{ 'core.favourites' | translate }} ({{ favourites.count }})</h2>
                     </ion-label>
@@ -74,8 +76,10 @@
                 <ion-item button class="divider ion-text-wrap" (click)="toggle(group)" sticky="true"
                     [attr.aria-label]="(group.expanded ? 'core.collapse' : 'core.expand') | translate" [attr.aria-expanded]="group.expanded"
                     aria-controls="addon-messages-groupconversations-group" role="heading" detail="false">
-                    <ion-icon *ngIf="!group.expanded" name="fas-caret-right" flip-rtl slot="start" aria-hidden="true"></ion-icon>
-                    <ion-icon *ngIf="group.expanded" name="fas-caret-down" slot="start" aria-hidden="true"></ion-icon>
+                    <ion-icon *ngIf="!group.expanded" name="fas-chevron-right" flip-rtl slot="start" aria-hidden="true"
+                        class="expandable-status-icon"></ion-icon>
+                    <ion-icon *ngIf="group.expanded" name="fas-chevron-down" slot="start" aria-hidden="true" class="expandable-status-icon">
+                    </ion-icon>
                     <ion-label>
                         <h2>{{ 'addon.messages.groupconversations' | translate }} ({{ group.count }})</h2>
                     </ion-label>
@@ -107,9 +111,11 @@
                     [attr.aria-label]="(individual.expanded ? 'core.collapse' : 'core.expand') | translate"
                     [attr.aria-expanded]="individual.expanded" aria-controls="addon-messages-groupconversations-individual" role="heading"
                     detail="false">
-                    <ion-icon *ngIf="!individual.expanded" name="fas-caret-right" flip-rtl slot="start" aria-hidden="true">
+                    <ion-icon *ngIf="!individual.expanded" name="fas-chevron-right" flip-rtl slot="start" aria-hidden="true"
+                        class="expandable-status-icon">
                     </ion-icon>
-                    <ion-icon *ngIf="individual.expanded" name="fas-caret-down" slot="start" aria-hidden="true"></ion-icon>
+                    <ion-icon *ngIf="individual.expanded" name="fas-chevron-down" slot="start" aria-hidden="true"
+                        class="expandable-status-icon"></ion-icon>
                     <ion-label>
                         <h2>{{ 'addon.messages.individualconversations' | translate }} ({{ individual.count }})</h2>
                     </ion-label>
diff --git a/src/addons/mod/forum/components/post/post.html b/src/addons/mod/forum/components/post/post.html
index 77feb0f7e..09ea67c71 100644
--- a/src/addons/mod/forum/components/post/post.html
+++ b/src/addons/mod/forum/components/post/post.html
@@ -118,8 +118,10 @@
             <ion-item button class="divider ion-text-wrap" (click)="toggleAdvanced()" detail="false" [attr.aria-expanded]="advanced"
                 [attr.aria-controls]="'addon-forum-reply-edit-form-advanced-' + uniqueId"
                 [attr.aria-label]="(advanced ? 'core.hideadvanced' : 'core.showadvanced') | translate">
-                <ion-icon *ngIf="!advanced" name="fas-caret-right" flip-rtl slot="start" aria-hidden="true"></ion-icon>
-                <ion-icon *ngIf="advanced" name="fas-caret-down" slot="start" aria-hidden="true"></ion-icon>
+                <ion-icon *ngIf="!advanced" name="fas-chevron-right" flip-rtl slot="start" aria-hidden="true"
+                    class="expandable-status-icon"></ion-icon>
+                <ion-icon *ngIf="advanced" name="fas-chevron-down" slot="start" aria-hidden="true" class="expandable-status-icon">
+                </ion-icon>
                 <ion-label>
                     <h2>{{ 'addon.mod_forum.advanced' | translate }}</h2>
                 </ion-label>
diff --git a/src/addons/mod/forum/pages/new-discussion/new-discussion.html b/src/addons/mod/forum/pages/new-discussion/new-discussion.html
index daebbcd75..e8b2c7232 100644
--- a/src/addons/mod/forum/pages/new-discussion/new-discussion.html
+++ b/src/addons/mod/forum/pages/new-discussion/new-discussion.html
@@ -34,8 +34,10 @@
             <ion-item button class="divider ion-text-wrap" (click)="toggleAdvanced()" detail="false" [attr.aria-expanded]="advanced"
                 [attr.aria-label]="(advanced ? 'core.hideadvanced' : 'core.showadvanced') | translate" role="heading"
                 aria-controls="addon-mod-forum-new-discussion-advanced">
-                <ion-icon *ngIf="!advanced" name="fas-caret-right" flip-rtl slot="start" aria-hidden="true"></ion-icon>
-                <ion-icon *ngIf="advanced" name="fas-caret-down" slot="start" aria-hidden="true"></ion-icon>
+                <ion-icon *ngIf="!advanced" name="fas-chevron-right" flip-rtl slot="start" aria-hidden="true"
+                    class="expandable-status-icon"></ion-icon>
+                <ion-icon *ngIf="advanced" name="fas-chevron-down" slot="start" aria-hidden="true" class="expandable-status-icon">
+                </ion-icon>
                 <ion-label>
                     <h2>{{ 'addon.mod_forum.advanced' | translate }}</h2>
                 </ion-label>
diff --git a/src/core/components/horizontal-scroll-controls/core-horizontal-scroll-controls.html b/src/core/components/horizontal-scroll-controls/core-horizontal-scroll-controls.html
index 7f3091787..e7d55fa25 100644
--- a/src/core/components/horizontal-scroll-controls/core-horizontal-scroll-controls.html
+++ b/src/core/components/horizontal-scroll-controls/core-horizontal-scroll-controls.html
@@ -1,23 +1,9 @@
-<ion-button
-    fill="clear"
-    color="dark"
-    (click)="scroll('backward')"
-    [hidden]="scrollPosition === 'hidden'"
-    [disabled]="scrollPosition === 'start'"
-    [attr.aria-label]="'core.scrollbackward' | translate"
-    [attr.aria-controls]="targetId"
->
-    <ion-icon name="fas-caret-left" slot="icon-only" aria-hidden="true"></ion-icon>
+<ion-button fill="clear" color="dark" (click)="scroll('backward')" [hidden]="scrollPosition === 'hidden'"
+    [disabled]="scrollPosition === 'start'" [attr.aria-label]="'core.scrollbackward' | translate" [attr.aria-controls]="targetId">
+    <ion-icon name="fas-chevron-left" slot="icon-only" aria-hidden="true"></ion-icon>
 </ion-button>
 
-<ion-button
-    fill="clear"
-    color="dark"
-    (click)="scroll('forward')"
-    [hidden]="scrollPosition === 'hidden'"
-    [disabled]="scrollPosition === 'end'"
-    [attr.aria-label]="'core.scrollforward' | translate"
-    [attr.aria-controls]="targetId"
->
-    <ion-icon name="fas-caret-right" slot="icon-only" aria-hidden="true"></ion-icon>
+<ion-button fill="clear" color="dark" (click)="scroll('forward')" [hidden]="scrollPosition === 'hidden'"
+    [disabled]="scrollPosition === 'end'" [attr.aria-label]="'core.scrollforward' | translate" [attr.aria-controls]="targetId">
+    <ion-icon name="fas-chevron-right" slot="icon-only" aria-hidden="true"></ion-icon>
 </ion-button>
diff --git a/src/core/features/grades/pages/course/course.html b/src/core/features/grades/pages/course/course.html
index e5e717bbe..497f485a6 100644
--- a/src/core/features/grades/pages/course/course.html
+++ b/src/core/features/grades/pages/course/course.html
@@ -37,7 +37,7 @@
                                 </td>
                                 <th class="core-grades-table-gradeitem ion-text-start" [attr.colspan]="row.colspan">
                                     <ion-icon *ngIf="row.expandable && showSummary" aria-hidden="true" slot="start"
-                                        [name]="row.expanded ? 'fas-caret-down' : 'fas-caret-right'">
+                                        [name]="row.expanded ? 'fas-chevron-down' : 'fas-chevron-right'" class="expandable-status-icon">
                                     </ion-icon>
                                     <ion-icon *ngIf="row.icon" name="{{row.icon}}" slot="start" [attr.aria-label]="row.iconAlt">
                                     </ion-icon>
diff --git a/src/core/features/grades/pages/course/course.scss b/src/core/features/grades/pages/course/course.scss
index 8f3299ff6..e93bebfff 100644
--- a/src/core/features/grades/pages/course/course.scss
+++ b/src/core/features/grades/pages/course/course.scss
@@ -100,6 +100,11 @@
             @include margin(null, null, null, 5px);
         }
 
+        .expandable-status-icon {
+            font-size: 14px;
+            @include margin-horizontal(0, 2px);
+        }
+
     }
 
     .core-grades-table-feedback {
diff --git a/src/theme/globals.mixins.scss b/src/theme/globals.mixins.scss
index 84089a4dd..dc509523f 100644
--- a/src/theme/globals.mixins.scss
+++ b/src/theme/globals.mixins.scss
@@ -209,7 +209,7 @@
         --vertical-margin: 10px;
         --horizontal-margin: 10px;
 
-        width: calc(100% - var(--vertical-margin) - var(--vertical-margin));
+        width: calc(100% - var(--horizontal-margin) - var(--horizontal-margin));
         height: calc(100% - var(--vertical-margin) - var(--vertical-margin));
         margin: var(--vertical-margin) var(--horizontal-margin);
 
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index f4d379c0e..908669935 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -215,6 +215,10 @@
         --color: var(--item-divider-color);
         --min-height: var(--item-divider-min-height);
         min-height: var(--min-height);
+
+        .expandable-status-icon {
+            font-size: 18px;
+        }
     }
 
     --spacer-background: var(--item-divider-background);

From 46dada14cbaed07e86bc34317b0c93c6ffffe315 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 19 Jan 2022 14:52:40 +0100
Subject: [PATCH 0380/1008] MOBILE-3814 chore: Remove deprecated String.substr
 calls

---
 .../services/handlers/mathjaxloader.ts        |  4 ++--
 src/addons/mod/chat/services/chat-helper.ts   |  6 ++---
 .../mod/data/fields/date/services/handler.ts  |  8 +++----
 .../mod/folder/services/folder-helper.ts      |  6 ++---
 .../mod/glossary/components/index/index.ts    |  2 +-
 src/addons/mod/imscp/services/imscp.ts        |  2 +-
 src/addons/mod/lesson/services/lesson.ts      | 10 ++++----
 src/addons/mod/page/services/page-helper.ts   |  2 +-
 src/addons/mod/quiz/services/quiz-offline.ts  |  2 +-
 .../mod/resource/services/resource-helper.ts  |  2 +-
 src/addons/mod/scorm/classes/data-model-12.ts | 10 ++++----
 src/addons/mod/scorm/services/scorm.ts        |  4 ++--
 src/addons/mod/url/services/url.ts            |  4 ++--
 .../services/handlers/calculated.ts           |  2 +-
 src/core/classes/interceptor.ts               |  2 +-
 src/core/classes/sqlitedb.ts                  |  6 ++---
 src/core/directives/fa-icon.ts                |  6 ++---
 src/core/directives/link.ts                   |  4 ++--
 .../contentlinks/classes/base-handler.ts      |  2 +-
 .../emulator/services/file-transfer.ts        |  2 +-
 src/core/features/emulator/services/file.ts   |  2 +-
 src/core/features/emulator/services/zip.ts    |  6 ++---
 .../features/grades/services/grades-helper.ts |  4 ++--
 .../features/h5p/classes/content-validator.ts | 14 +++++------
 src/core/features/h5p/classes/core.ts         |  2 +-
 .../question/services/question-helper.ts      |  2 +-
 .../settings/pages/deviceinfo/deviceinfo.ts   |  2 +-
 src/core/services/file.ts                     | 12 +++++-----
 src/core/services/filepool.ts                 | 10 ++++----
 src/core/services/lang.ts                     |  2 +-
 src/core/services/urlschemes.ts               |  2 +-
 src/core/services/utils/iframe.ts             |  4 ++--
 src/core/services/utils/mimetype.ts           | 16 ++++++-------
 src/core/services/utils/text.ts               | 12 +++++-----
 src/core/services/utils/url.ts                |  4 ++--
 src/core/services/utils/utils.ts              |  2 +-
 src/core/singletons/colors.ts                 |  8 +++----
 src/core/singletons/locutus.ts                | 24 +++++++++----------
 src/core/singletons/text.ts                   |  2 +-
 src/core/singletons/url.ts                    |  2 +-
 src/core/singletons/window.ts                 |  2 +-
 41 files changed, 110 insertions(+), 110 deletions(-)

diff --git a/src/addons/filter/mathjaxloader/services/handlers/mathjaxloader.ts b/src/addons/filter/mathjaxloader/services/handlers/mathjaxloader.ts
index 2f9ae9056..40f83f4ba 100644
--- a/src/addons/filter/mathjaxloader/services/handlers/mathjaxloader.ts
+++ b/src/addons/filter/mathjaxloader/services/handlers/mathjaxloader.ts
@@ -190,7 +190,7 @@ export class AddonFilterMathJaxLoaderHandlerService extends CoreFilterDefaultHan
     protected insertSpan(text: string, start: number, end: number): string {
         return CoreTextUtils.substrReplace(
             text,
-            '<span class="nolink">' + text.substr(start, end - start + 1) + '</span>',
+            '<span class="nolink">' + text.substring(start, end - start + 1) + '</span>',
             start,
             end - start + 1,
         );
@@ -265,7 +265,7 @@ export class AddonFilterMathJaxLoaderHandlerService extends CoreFilterDefaultHan
      */
     protected fixUseUrls(node: Element): void {
         Array.from(node.querySelectorAll('use')).forEach((useElem) => {
-            useElem.setAttribute('href', useElem.href.baseVal.substr(useElem.href.baseVal.indexOf('#')));
+            useElem.setAttribute('href', useElem.href.baseVal.substring(useElem.href.baseVal.indexOf('#')));
         });
     }
 
diff --git a/src/addons/mod/chat/services/chat-helper.ts b/src/addons/mod/chat/services/chat-helper.ts
index fa5764f8a..d6f827fe4 100644
--- a/src/addons/mod/chat/services/chat-helper.ts
+++ b/src/addons/mod/chat/services/chat-helper.ts
@@ -53,14 +53,14 @@ export class AddonModChatHelperProvider {
         formattedMessage.message = formattedMessage.message.trim();
 
         formattedMessage.showDate = this.showDate(message, prevMessage);
-        formattedMessage.beep = (message.message.substr(0, 5) == 'beep ' && message.message.substr(5).trim()) || undefined;
+        formattedMessage.beep = (message.message.substring(0, 5) == 'beep ' && message.message.substring(5).trim()) || undefined;
 
         formattedMessage.special = !!formattedMessage.beep || (<AddonModChatSessionMessage> message).issystem ||
             (<AddonModChatMessage> message).system;
 
-        if (formattedMessage.message.substr(0, 4) == '/me ') {
+        if (formattedMessage.message.substring(0, 4) == '/me ') {
             formattedMessage.special = true;
-            formattedMessage.message = formattedMessage.message.substr(4).trim();
+            formattedMessage.message = formattedMessage.message.substring(4).trim();
         }
 
         if (!formattedMessage.special && formattedMessage.message.match(patternTo)) {
diff --git a/src/addons/mod/data/fields/date/services/handler.ts b/src/addons/mod/data/fields/date/services/handler.ts
index 454b91d25..221611f66 100644
--- a/src/addons/mod/data/fields/date/services/handler.ts
+++ b/src/addons/mod/data/fields/date/services/handler.ts
@@ -52,7 +52,7 @@ export class AddonModDataFieldDateHandlerService implements AddonModDataFieldHan
         const enabledName = 'f_' + field.id + '_z';
 
         if (inputData[enabledName] && typeof inputData[fieldName] == 'string') {
-            const date = inputData[fieldName].substr(0, 10).split('-');
+            const date = inputData[fieldName].substring(0, 10).split('-');
 
             return [
                 {
@@ -87,7 +87,7 @@ export class AddonModDataFieldDateHandlerService implements AddonModDataFieldHan
             return [];
         }
 
-        const date = inputData[fieldName].substr(0, 10).split('-');
+        const date = inputData[fieldName].substring(0, 10).split('-');
 
         return [
             {
@@ -117,10 +117,10 @@ export class AddonModDataFieldDateHandlerService implements AddonModDataFieldHan
         originalFieldData: AddonModDataEntryField,
     ): boolean {
         const fieldName = 'f_' + field.id;
-        const input = inputData[fieldName] && inputData[fieldName].substr(0, 10) || '';
+        const input = inputData[fieldName] && inputData[fieldName].substring(0, 10) || '';
 
         const content = (originalFieldData && originalFieldData?.content &&
-                CoreTimeUtils.toDatetimeFormat(parseInt(originalFieldData.content, 10) * 1000).substr(0, 10)) || '';
+                CoreTimeUtils.toDatetimeFormat(parseInt(originalFieldData.content, 10) * 1000).substring(0, 10)) || '';
 
         return input != content;
     }
diff --git a/src/addons/mod/folder/services/folder-helper.ts b/src/addons/mod/folder/services/folder-helper.ts
index 677d48fb5..295a0d46e 100644
--- a/src/addons/mod/folder/services/folder-helper.ts
+++ b/src/addons/mod/folder/services/folder-helper.ts
@@ -53,10 +53,10 @@ export class AddonModFolderHelperProvider {
             let completePath = '';
 
             // Remove first and last slash if needed.
-            if (path.substr(0, 1) === '/') {
-                path = path.substr(1);
+            if (path.substring(0, 1) === '/') {
+                path = path.substring(1);
             }
-            if (path.substr(path.length - 1) === '/') {
+            if (path.substring(path.length - 1) === '/') {
                 path = path.slice(0, -1);
             }
 
diff --git a/src/addons/mod/glossary/components/index/index.ts b/src/addons/mod/glossary/components/index/index.ts
index beb7aad9c..7cf42ded3 100644
--- a/src/addons/mod/glossary/components/index/index.ts
+++ b/src/addons/mod/glossary/components/index/index.ts
@@ -292,7 +292,7 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
                     // Try to get the first letter without HTML tags.
                     const noTags = CoreTextUtils.cleanTags(entry.concept);
 
-                    return (noTags || entry.concept).substr(0, 1).toUpperCase();
+                    return (noTags || entry.concept).substring(0, 1).toUpperCase();
                 };
 
                 this.getDivider = getDivider;
diff --git a/src/addons/mod/imscp/services/imscp.ts b/src/addons/mod/imscp/services/imscp.ts
index 88cae637e..121577ea3 100644
--- a/src/addons/mod/imscp/services/imscp.ts
+++ b/src/addons/mod/imscp/services/imscp.ts
@@ -155,7 +155,7 @@ export class AddonModImscpProvider {
             }
 
             const filePath = CoreTextUtils.concatenatePaths(item.filepath, item.filename);
-            const filePathAlt = filePath.charAt(0) === '/' ? filePath.substr(1) : '/' + filePath;
+            const filePathAlt = filePath.charAt(0) === '/' ? filePath.substring(1) : '/' + filePath;
 
             // Check if it's main file.
             return filePath === targetFilePath || filePathAlt === targetFilePath;
diff --git a/src/addons/mod/lesson/services/lesson.ts b/src/addons/mod/lesson/services/lesson.ts
index 5f78849ec..7d1418032 100644
--- a/src/addons/mod/lesson/services/lesson.ts
+++ b/src/addons/mod/lesson/services/lesson.ts
@@ -760,8 +760,8 @@ export class AddonModLessonProvider {
             let ignoreCase = '';
 
             if (useRegExp) {
-                if (expectedAnswer.substr(-2) == '/i') {
-                    expectedAnswer = expectedAnswer.substr(0, expectedAnswer.length - 2);
+                if (expectedAnswer.substring(-2) == '/i') {
+                    expectedAnswer = expectedAnswer.substring(0, expectedAnswer.length - 2);
                     ignoreCase = 'i';
                 }
             } else {
@@ -792,12 +792,12 @@ export class AddonModLessonProvider {
                         isMatch = true;
                     }
                 } else { // We are using regular expressions analysis.
-                    const startCode = expectedAnswer.substr(0, 2);
+                    const startCode = expectedAnswer.substring(0, 2);
 
                     switch (startCode){
                         // 1- Check for absence of required string in studentAnswer (coded by initial '--').
                         case '--':
-                            expectedAnswer = expectedAnswer.substr(2);
+                            expectedAnswer = expectedAnswer.substring(2);
                             if (!studentAnswer.match(new RegExp('^' + expectedAnswer + '$', ignoreCase))) {
                                 isMatch = true;
                             }
@@ -805,7 +805,7 @@ export class AddonModLessonProvider {
 
                         // 2- Check for code for marking wrong strings (coded by initial '++').
                         case '++': {
-                            expectedAnswer = expectedAnswer.substr(2);
+                            expectedAnswer = expectedAnswer.substring(2);
 
                             // Check for one or several matches.
                             const matches = studentAnswer.match(new RegExp(expectedAnswer, 'g' + ignoreCase));
diff --git a/src/addons/mod/page/services/page-helper.ts b/src/addons/mod/page/services/page-helper.ts
index a57f37e6e..c993c1bf9 100644
--- a/src/addons/mod/page/services/page-helper.ts
+++ b/src/addons/mod/page/services/page-helper.ts
@@ -52,7 +52,7 @@ export class AddonModPageHelperProvider {
                 let key = content.filename;
                 if (content.filepath !== '/') {
                     // Add the folders without the leading slash.
-                    key = content.filepath.substr(1) + key;
+                    key = content.filepath.substring(1) + key;
                 }
                 paths[CoreTextUtils.decodeURIComponent(key)] = url;
             }
diff --git a/src/addons/mod/quiz/services/quiz-offline.ts b/src/addons/mod/quiz/services/quiz-offline.ts
index 4b96ba247..70c72eab5 100644
--- a/src/addons/mod/quiz/services/quiz-offline.ts
+++ b/src/addons/mod/quiz/services/quiz-offline.ts
@@ -54,7 +54,7 @@ export class AddonModQuizOfflineProvider {
             if (!questionsWithAnswers[slot]) {
                 questionsWithAnswers[slot] = {
                     answers: {},
-                    prefix: name.substr(0, name.indexOf(nameWithoutPrefix)),
+                    prefix: name.substring(0, name.indexOf(nameWithoutPrefix)),
                 };
             }
             questionsWithAnswers[slot].answers[nameWithoutPrefix] = answers[name];
diff --git a/src/addons/mod/resource/services/resource-helper.ts b/src/addons/mod/resource/services/resource-helper.ts
index f0975eacf..943bee509 100644
--- a/src/addons/mod/resource/services/resource-helper.ts
+++ b/src/addons/mod/resource/services/resource-helper.ts
@@ -70,7 +70,7 @@ export class AddonModResourceHelperProvider {
         let mainFilePath = mainFile.filename;
 
         if (mainFile.filepath !== '/') {
-            mainFilePath = mainFile.filepath.substr(1) + mainFilePath;
+            mainFilePath = mainFile.filepath.substring(1) + mainFilePath;
         }
 
         try {
diff --git a/src/addons/mod/scorm/classes/data-model-12.ts b/src/addons/mod/scorm/classes/data-model-12.ts
index 06d29525a..97889bfdb 100644
--- a/src/addons/mod/scorm/classes/data-model-12.ts
+++ b/src/addons/mod/scorm/classes/data-model-12.ts
@@ -201,7 +201,7 @@ export class AddonModScormDataModel12 {
 
         for (const element in this.currentUserData[this.scoId].userdata) {
             // Ommit for example the nav. elements and the session time element.
-            if (element.substr(0, 3) != 'cmi' || element == 'cmi.core.session_time') {
+            if (element.substring(0, 3) != 'cmi' || element == 'cmi.core.session_time') {
                 continue;
             }
 
@@ -748,16 +748,16 @@ export class AddonModScormDataModel12 {
                     const childrenStr = '._children';
                     const countStr = '._count';
 
-                    if (elementModel.substr(elementModel.length - childrenStr.length, elementModel.length) == childrenStr) {
-                        const parentModel = elementModel.substr(0, elementModel.length - childrenStr.length);
+                    if (elementModel.substring(elementModel.length - childrenStr.length, elementModel.length) == childrenStr) {
+                        const parentModel = elementModel.substring(0, elementModel.length - childrenStr.length);
 
                         if (this.dataModel[this.scoId][parentModel] !== undefined) {
                             this.errorCode = '202';
                         } else {
                             this.errorCode = '201';
                         }
-                    } else if (elementModel.substr(elementModel.length - countStr.length, elementModel.length) == countStr) {
-                        const parentModel = elementModel.substr(0, elementModel.length - countStr.length);
+                    } else if (elementModel.substring(elementModel.length - countStr.length, elementModel.length) == countStr) {
+                        const parentModel = elementModel.substring(0, elementModel.length - countStr.length);
 
                         if (this.dataModel[this.scoId][parentModel] !== undefined) {
                             this.errorCode = '203';
diff --git a/src/addons/mod/scorm/services/scorm.ts b/src/addons/mod/scorm/services/scorm.ts
index 528e68c6a..be1ac928c 100644
--- a/src/addons/mod/scorm/services/scorm.ts
+++ b/src/addons/mod/scorm/services/scorm.ts
@@ -947,7 +947,7 @@ export class AddonModScormProvider {
         if (parameters) {
             const connector = launchUrl.indexOf('?') > -1 ? '&' : '?';
             if (parameters.charAt(0) == '?') {
-                parameters = parameters.substr(1);
+                parameters = parameters.substring(1);
             }
 
             launchUrl += connector + parameters;
@@ -1315,7 +1315,7 @@ export class AddonModScormProvider {
 
         if (link.match(/^https?:\/\//i) && !CoreUrlUtils.isLocalFileUrl(link)) {
             return true;
-        } else if (link.substr(0, 4) == 'www.') {
+        } else if (link.substring(0, 4) == 'www.') {
             return true;
         }
 
diff --git a/src/addons/mod/url/services/url.ts b/src/addons/mod/url/services/url.ts
index 0ccff66ed..86a2ad5bb 100644
--- a/src/addons/mod/url/services/url.ts
+++ b/src/addons/mod/url/services/url.ts
@@ -68,7 +68,7 @@ export class AddonModUrlProvider {
         const download = ['application/zip', 'application/x-tar', 'application/g-zip', 'application/pdf', 'text/html'];
         let mimetype = CoreMimetypeUtils.getMimeType(extension);
 
-        if (url.externalurl.indexOf('.php') != -1 || url.externalurl.substr(-1) === '/' ||
+        if (url.externalurl.indexOf('.php') != -1 || url.externalurl.substring(-1) === '/' ||
                 (url.externalurl.indexOf('//') != -1 && url.externalurl.match(/\//g)?.length == 2)) {
             // Seems to be a web, use HTML mimetype.
             mimetype = 'text/html';
@@ -158,7 +158,7 @@ export class AddonModUrlProvider {
         const matches = url.match(/\//g);
         const extension = CoreMimetypeUtils.getFileExtension(url);
 
-        if (!matches || matches.length < 3 || url.substr(-1) === '/' || extension == 'php') {
+        if (!matches || matches.length < 3 || url.substring(-1) === '/' || extension == 'php') {
             // Use default icon.
             return '';
         }
diff --git a/src/addons/qtype/calculated/services/handlers/calculated.ts b/src/addons/qtype/calculated/services/handlers/calculated.ts
index cac9c191d..887a5ff24 100644
--- a/src/addons/qtype/calculated/services/handlers/calculated.ts
+++ b/src/addons/qtype/calculated/services/handlers/calculated.ts
@@ -226,7 +226,7 @@ export class AddonQtypeCalculatedHandlerService implements CoreQuestionHandler {
         }
 
         const numberString = match[0];
-        const unit = unitsLeft ? answer.substr(0, answer.length - match[0].length) : answer.substr(match[0].length);
+        const unit = unitsLeft ? answer.substring(0, answer.length - match[0].length) : answer.substring(match[0].length);
 
         // No need to calculate the multiplier.
         return { answer: Number(numberString), unit };
diff --git a/src/core/classes/interceptor.ts b/src/core/classes/interceptor.ts
index 5ddbe7d11..976b52e3e 100644
--- a/src/core/classes/interceptor.ts
+++ b/src/core/classes/interceptor.ts
@@ -58,7 +58,7 @@ export class CoreInterceptor implements HttpInterceptor {
             }
         }
 
-        return query.length ? query.substr(0, query.length - 1) : query;
+        return query.length ? query.substring(0, query.length - 1) : query;
     }
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/src/core/classes/sqlitedb.ts b/src/core/classes/sqlitedb.ts
index c84c52ccd..0aec0714b 100644
--- a/src/core/classes/sqlitedb.ts
+++ b/src/core/classes/sqlitedb.ts
@@ -600,7 +600,7 @@ export class SQLiteDB {
             sql = equal ? '= ?' : '<> ?';
             params = Array.isArray(items) ? items : [items];
         } else {
-            sql = (equal ? '' : 'NOT ') + 'IN (' + ',?'.repeat(items.length).substr(1) + ')';
+            sql = (equal ? '' : 'NOT ') + 'IN (' + ',?'.repeat(items.length).substring(1) + ')';
             params = items;
         }
 
@@ -801,7 +801,7 @@ export class SQLiteDB {
 
         const keys = Object.keys(data);
         const fields = keys.join(',');
-        const questionMarks = ',?'.repeat(keys.length).substr(1);
+        const questionMarks = ',?'.repeat(keys.length).substring(1);
 
         return {
             sql: `INSERT OR REPLACE INTO ${table} (${fields}) VALUES (${questionMarks})`,
@@ -1139,7 +1139,7 @@ export class SQLiteDB {
             if (params.length == 1) {
                 sql = sql + field + ' = ?';
             } else {
-                const questionMarks = ',?'.repeat(params.length).substr(1);
+                const questionMarks = ',?'.repeat(params.length).substring(1);
                 sql = sql + field + ' IN (' + questionMarks + ')';
             }
         }
diff --git a/src/core/directives/fa-icon.ts b/src/core/directives/fa-icon.ts
index 0cd0a1e63..8a262dd45 100644
--- a/src/core/directives/fa-icon.ts
+++ b/src/core/directives/fa-icon.ts
@@ -52,16 +52,16 @@ export class CoreFaIconDirective implements AfterViewInit, OnChanges {
             switch (parts[0]) {
                 case 'far':
                     library = 'regular';
-                    iconName = iconName.substr(4);
+                    iconName = iconName.substring(4);
                     break;
                 case 'fa':
                 case 'fas':
                     library = 'solid';
-                    iconName = iconName.substr(parts[0].length + 1);
+                    iconName = iconName.substring(parts[0].length + 1);
                     break;
                 case 'fab':
                     library = 'brands';
-                    iconName = iconName.substr(4);
+                    iconName = iconName.substring(4);
                     break;
                 default:
                     break;
diff --git a/src/core/directives/link.ts b/src/core/directives/link.ts
index 81670c941..e177b4a97 100644
--- a/src/core/directives/link.ts
+++ b/src/core/directives/link.ts
@@ -140,7 +140,7 @@ export class CoreLinkDirective implements OnInit {
 
         if (href.charAt(0) == '#') {
             // Look for id or name.
-            href = href.substr(1);
+            href = href.substring(1);
             CoreDomUtils.scrollToElementBySelector(
                 this.element.closest('ion-content'),
                 this.content,
@@ -170,7 +170,7 @@ export class CoreLinkDirective implements OnInit {
      * @return Promise resolved when done.
      */
     protected async openLocalFile(path: string): Promise<void> {
-        const filename = path.substr(path.lastIndexOf('/') + 1);
+        const filename = path.substring(path.lastIndexOf('/') + 1);
 
         if (!CoreFileHelper.isOpenableInApp({ filename })) {
             try {
diff --git a/src/core/features/contentlinks/classes/base-handler.ts b/src/core/features/contentlinks/classes/base-handler.ts
index a2809c552..2ac903131 100644
--- a/src/core/features/contentlinks/classes/base-handler.ts
+++ b/src/core/features/contentlinks/classes/base-handler.ts
@@ -95,7 +95,7 @@ export class CoreContentLinksHandlerBase implements CoreContentLinksHandler {
         if (this.pattern) {
             const position = url.search(this.pattern);
             if (position > -1) {
-                return url.substr(0, position);
+                return url.substring(0, position);
             }
         }
     }
diff --git a/src/core/features/emulator/services/file-transfer.ts b/src/core/features/emulator/services/file-transfer.ts
index 5a6d40e9d..59961318f 100644
--- a/src/core/features/emulator/services/file-transfer.ts
+++ b/src/core/features/emulator/services/file-transfer.ts
@@ -198,7 +198,7 @@ export class FileTransferObjectMock extends FileTransferObject {
                 const headerString = headers[i];
                 const separatorPos = headerString.indexOf(':');
                 if (separatorPos != -1) {
-                    result[headerString.substr(0, separatorPos)] = headerString.substr(separatorPos + 1).trim();
+                    result[headerString.substring(0, separatorPos)] = headerString.substring(separatorPos + 1).trim();
                 }
             }
         }
diff --git a/src/core/features/emulator/services/file.ts b/src/core/features/emulator/services/file.ts
index 71eae6136..4ae67a3d5 100644
--- a/src/core/features/emulator/services/file.ts
+++ b/src/core/features/emulator/services/file.ts
@@ -444,7 +444,7 @@ export class FileMock extends File {
 
         return {
             path: fullPath.substring(0, fullPath.lastIndexOf('/')),
-            name: fullPath.substr(fullPath.lastIndexOf('/') + 1),
+            name: fullPath.substring(fullPath.lastIndexOf('/') + 1),
         };
     }
 
diff --git a/src/core/features/emulator/services/zip.ts b/src/core/features/emulator/services/zip.ts
index 0f2d24195..47fa54b55 100644
--- a/src/core/features/emulator/services/zip.ts
+++ b/src/core/features/emulator/services/zip.ts
@@ -65,7 +65,7 @@ export class ZipMock extends Zip {
         destination = destination.replace(/%20/g, ' ');
 
         const sourceDir = source.substring(0, source.lastIndexOf('/'));
-        const sourceName = source.substr(source.lastIndexOf('/') + 1);
+        const sourceName = source.substring(source.lastIndexOf('/') + 1);
         const zip = new JSZip();
 
         try {
@@ -82,7 +82,7 @@ export class ZipMock extends Zip {
 
             // First of all, create the directory where the files will be unzipped.
             const destParent = destination.substring(0, destination.lastIndexOf('/'));
-            const destFolderName = destination.substr(destination.lastIndexOf('/') + 1);
+            const destFolderName = destination.substring(destination.lastIndexOf('/') + 1);
 
             await this.file.createDir(destParent, destFolderName, true);
 
@@ -95,7 +95,7 @@ export class ZipMock extends Zip {
                 if (!file.dir) {
                     // It's a file.
                     const fileDir = name.substring(0, name.lastIndexOf('/'));
-                    const fileName = name.substr(name.lastIndexOf('/') + 1);
+                    const fileName = name.substring(name.lastIndexOf('/') + 1);
 
                     if (fileDir) {
                         // The file is in a subfolder, create it first.
diff --git a/src/core/features/grades/services/grades-helper.ts b/src/core/features/grades/services/grades-helper.ts
index b4d26bfa2..cf83ea121 100644
--- a/src/core/features/grades/services/grades-helper.ts
+++ b/src/core/features/grades/services/grades-helper.ts
@@ -154,7 +154,7 @@ export class CoreGradesHelperProvider {
         for (const name in item) {
             const index = name.indexOf('formatted');
             if (index > 0) {
-                item[name.substr(0, index)] = item[name];
+                item[name.substring(0, index)] = item[name];
             }
         }
 
@@ -399,7 +399,7 @@ export class CoreGradesHelperProvider {
                 (row) =>
                     row.itemname &&
                     row.itemname.id &&
-                    row.itemname.id.substr(0, 3) == 'row' &&
+                    row.itemname.id.substring(0, 3) == 'row' &&
                     parseInt(row.itemname.id.split('_')[1], 10) == gradeId,
             );
 
diff --git a/src/core/features/h5p/classes/content-validator.ts b/src/core/features/h5p/classes/content-validator.ts
index e3e916ba6..f7fc315ba 100644
--- a/src/core/features/h5p/classes/content-validator.ts
+++ b/src/core/features/h5p/classes/content-validator.ts
@@ -169,7 +169,7 @@ export class CoreH5PContentValidator {
 
         // Check if string is within allowed length.
         if (semantics.maxLength !== undefined) {
-            text = text.substr(0, semantics.maxLength);
+            text = text.substring(0, semantics.maxLength);
         }
 
         return text;
@@ -357,8 +357,8 @@ export class CoreH5PContentValidator {
         }
 
         // Remove temporary files suffix.
-        if (file.path.substr(-4, 4) === '#tmp') {
-            file.path = file.path.substr(0, file.path.length - 4);
+        if (file.path.substring(-4, 4) === '#tmp') {
+            file.path = file.path.substring(0, file.path.length - 4);
         }
 
         // Make sure path and mime does not have any special chars
@@ -670,7 +670,7 @@ export class CoreH5PContentValidator {
 
         const tag = tags[0];
 
-        if (tag.substr(0, 1) != '<') {
+        if (tag.substring(0, 1) != '<') {
             // We matched a lone ">" character.
             return '&gt;';
         } else if (tag.length == 1) {
@@ -746,7 +746,7 @@ export class CoreH5PContentValidator {
                     matches = attr.match(/^([-a-zA-Z]+)/);
                     if (matches && matches.length > 1) {
                         attrName = matches[1].toLowerCase();
-                        skip = attrName == 'style' || attrName.substr(0, 2) == 'on' || attrName.substr(0, 1) == '-' ||
+                        skip = attrName == 'style' || attrName.substring(0, 2) == 'on' || attrName.substring(0, 1) == '-' ||
                                 attrName.length > 96; // Ignore long attributes to avoid unnecessary processing overhead.
                         working = mode = 1;
                         attr = attr.replace(/^[-a-zA-Z]+/, '');
@@ -883,7 +883,7 @@ export class CoreH5PContentValidator {
 
             if (colonPos > 0) {
                 // We found a colon, possibly a protocol. Verify.
-                const protocol = uri.substr(0, colonPos);
+                const protocol = uri.substring(0, colonPos);
                 // If a colon is preceded by a slash, question mark or hash, it cannot possibly be part of the URL scheme.
                 // This must be a relative URL, which inherits the (safe) protocol of the base document.
                 if (protocol.match(/[/?#]/)) {
@@ -891,7 +891,7 @@ export class CoreH5PContentValidator {
                 }
                 // Check if this is a disallowed protocol.
                 if (!allowedProtocols[protocol.toLowerCase()]) {
-                    uri = uri.substr(colonPos + 1);
+                    uri = uri.substring(colonPos + 1);
                 }
             }
         } while (before != uri);
diff --git a/src/core/features/h5p/classes/core.ts b/src/core/features/h5p/classes/core.ts
index ac6dddb45..948dabf40 100644
--- a/src/core/features/h5p/classes/core.ts
+++ b/src/core/features/h5p/classes/core.ts
@@ -216,7 +216,7 @@ export class CoreH5PCore {
 
         // Prevent too long slug.
         if (newInput.length > 91) {
-            newInput = newInput.substr(0, 92);
+            newInput = newInput.substring(0, 92);
         }
 
         // Prevent empty slug
diff --git a/src/core/features/question/services/question-helper.ts b/src/core/features/question/services/question-helper.ts
index b8ab02ad4..27bdfe3d4 100644
--- a/src/core/features/question/services/question-helper.ts
+++ b/src/core/features/question/services/question-helper.ts
@@ -303,7 +303,7 @@ export class CoreQuestionHelperProvider {
 
                 // Remove start and end of the match, we only want the object.
                 initMatch = initMatch.replace('M.qtype_' + question.type + '.init_question(', '');
-                initMatch = initMatch.substr(0, initMatch.length - 2);
+                initMatch = initMatch.substring(0, initMatch.length - 2);
 
                 // Try to convert it to an object and add it to the question.
                 question.initObjects = CoreTextUtils.parseJSON(initMatch, null);
diff --git a/src/core/features/settings/pages/deviceinfo/deviceinfo.ts b/src/core/features/settings/pages/deviceinfo/deviceinfo.ts
index 2911ec1cd..da72645ff 100644
--- a/src/core/features/settings/pages/deviceinfo/deviceinfo.ts
+++ b/src/core/features/settings/pages/deviceinfo/deviceinfo.ts
@@ -100,7 +100,7 @@ export class CoreSettingsDeviceInfoPage implements OnDestroy {
 
         if (window.location && window.location.href) {
             const url = window.location.href;
-            this.deviceInfo.locationHref = url.indexOf('#') > 0 ? url.substr(0, url.indexOf('#')) : url;
+            this.deviceInfo.locationHref = url.indexOf('#') > 0 ? url.substring(0, url.indexOf('#')) : url;
         }
 
         if (window.screen) {
diff --git a/src/core/services/file.ts b/src/core/services/file.ts
index 698cdac02..21fdc08bd 100644
--- a/src/core/services/file.ts
+++ b/src/core/services/file.ts
@@ -232,8 +232,8 @@ export class CoreFileProvider {
         } else {
             // The file plugin doesn't allow creating more than 1 level at a time (e.g. tmp/folder).
             // We need to create them 1 by 1.
-            const firstDir = path.substr(0, path.indexOf('/'));
-            const restOfPath = path.substr(path.indexOf('/') + 1);
+            const firstDir = path.substring(0, path.indexOf('/'));
+            const restOfPath = path.substring(path.indexOf('/') + 1);
 
             this.logger.debug('Create dir ' + firstDir + ' in ' + base);
 
@@ -692,7 +692,7 @@ export class CoreFileProvider {
      */
     async removeExternalFile(fullPath: string): Promise<void> {
         const directory = fullPath.substring(0, fullPath.lastIndexOf('/'));
-        const filename = fullPath.substr(fullPath.lastIndexOf('/') + 1);
+        const filename = fullPath.substring(fullPath.lastIndexOf('/') + 1);
 
         await File.removeFile(directory, filename);
     }
@@ -885,7 +885,7 @@ export class CoreFileProvider {
         };
 
         file.directory = path.substring(0, path.lastIndexOf('/'));
-        file.name = path.substr(path.lastIndexOf('/') + 1);
+        file.name = path.substring(path.lastIndexOf('/') + 1);
 
         return file;
     }
@@ -1035,7 +1035,7 @@ export class CoreFileProvider {
      */
     removeStartingSlash(path: string): string {
         if (path[0] == '/') {
-            return path.substr(1);
+            return path.substring(1);
         }
 
         return path;
@@ -1232,7 +1232,7 @@ export class CoreFileProvider {
         const position = window.location.href.indexOf(window.location.pathname);
 
         if (position != -1) {
-            return window.location.href.substr(0, position);
+            return window.location.href.substring(0, position);
         }
 
         return window.location.href;
diff --git a/src/core/services/filepool.ts b/src/core/services/filepool.ts
index 3674b9fc7..99d5ea855 100644
--- a/src/core/services/filepool.ts
+++ b/src/core/services/filepool.ts
@@ -777,7 +777,7 @@ export class CoreFilepoolProvider {
                 // Calculate the path to the file.
                 path = file.filename || '';
                 if (file.filepath && file.filepath !== '/') {
-                    path = file.filepath.substr(1) + path;
+                    path = file.filepath.substring(1) + path;
                 }
                 path = CoreTextUtils.concatenatePaths(dirPath, path);
             }
@@ -871,7 +871,7 @@ export class CoreFilepoolProvider {
                     // Calculate the path to the file.
                     path = file.filename || '';
                     if (file.filepath && file.filepath !== '/') {
-                        path = file.filepath.substr(1) + path;
+                        path = file.filepath.substring(1) + path;
                     }
                     path = CoreTextUtils.concatenatePaths(dirPath, path);
                 }
@@ -1837,7 +1837,7 @@ export class CoreFilepoolProvider {
             return;
         }
 
-        const relativePath = url.substr(url.indexOf('/pluginfile.php') + 16);
+        const relativePath = url.substring(url.indexOf('/pluginfile.php') + 16);
         const args = relativePath.split('/');
 
         if (args.length < 3) {
@@ -2084,7 +2084,7 @@ export class CoreFilepoolProvider {
             // It's a pluginfile URL. Search for the 'file' param to extract the name.
             const params = CoreUrlUtils.extractUrlParams(fileUrl);
             if (params.file) {
-                filename = params.file.substr(params.file.lastIndexOf('/') + 1);
+                filename = params.file.substring(params.file.lastIndexOf('/') + 1);
             } else {
                 // 'file' param not found. Extract what's after the last '/' without params.
                 filename = CoreUrlUtils.getLastFileWithoutParams(fileUrl);
@@ -2115,7 +2115,7 @@ export class CoreFilepoolProvider {
             // Remove the URL from the array.
             hashes.shift();
 
-            filename = filename.substr(0, index);
+            filename = filename.substring(0, index);
         }
 
         // Remove the extension from the filename.
diff --git a/src/core/services/lang.ts b/src/core/services/lang.ts
index e8c09518c..d76c6153a 100644
--- a/src/core/services/lang.ts
+++ b/src/core/services/lang.ts
@@ -256,7 +256,7 @@ export class CoreLangProvider {
             // Language code defined by locale has a dash, like en-US or es-ES. Check if it's supported.
             if (CoreConstants.CONFIG.languages && CoreConstants.CONFIG.languages[preferredLanguage] === undefined) {
                 // Code is NOT supported. Fallback to language without dash. E.g. 'en-US' would fallback to 'en'.
-                preferredLanguage = preferredLanguage.substr(0, preferredLanguage.indexOf('-'));
+                preferredLanguage = preferredLanguage.substring(0, preferredLanguage.indexOf('-'));
             }
         }
 
diff --git a/src/core/services/urlschemes.ts b/src/core/services/urlschemes.ts
index 7cbe49670..f1b6aaa36 100644
--- a/src/core/services/urlschemes.ts
+++ b/src/core/services/urlschemes.ts
@@ -249,7 +249,7 @@ export class CoreCustomURLSchemesProvider {
 
         // Remove the params to get the site URL.
         if (url.indexOf('?') != -1) {
-            url = url.substr(0, url.indexOf('?'));
+            url = url.substring(0, url.indexOf('?'));
         }
 
         if (!url.match(/https?:\/\//)) {
diff --git a/src/core/services/utils/iframe.ts b/src/core/services/utils/iframe.ts
index 99f6e15bf..2e93414c7 100644
--- a/src/core/services/utils/iframe.ts
+++ b/src/core/services/utils/iframe.ts
@@ -443,7 +443,7 @@ export class CoreIframeUtilsProvider {
             }
         } else if (CoreUrlUtils.isLocalFileUrl(url)) {
             // It's a local file.
-            const filename = url.substr(url.lastIndexOf('/') + 1);
+            const filename = url.substring(url.lastIndexOf('/') + 1);
 
             if (!CoreFileHelper.isOpenableInApp({ filename })) {
                 try {
@@ -522,7 +522,7 @@ export class CoreIframeUtilsProvider {
             // Opening links with _parent, _top or _blank can break the app. We'll open it in InAppBrowser.
             event && event.preventDefault();
 
-            const filename = link.href.substr(link.href.lastIndexOf('/') + 1);
+            const filename = link.href.substring(link.href.lastIndexOf('/') + 1);
 
             if (!CoreFileHelper.isOpenableInApp({ filename })) {
                 try {
diff --git a/src/core/services/utils/mimetype.ts b/src/core/services/utils/mimetype.ts
index 98ab537a6..d1c51fa1c 100644
--- a/src/core/services/utils/mimetype.ts
+++ b/src/core/services/utils/mimetype.ts
@@ -84,13 +84,13 @@ export class CoreMimetypeUtilsProvider {
         // If the extension has parameters, remove them.
         let position = extension.indexOf('?');
         if (position > -1) {
-            extension = extension.substr(0, position);
+            extension = extension.substring(0, position);
         }
 
         // If the extension has an anchor, remove it.
         position = extension.indexOf('#');
         if (position > -1) {
-            extension = extension.substr(0, position);
+            extension = extension.substring(0, position);
         }
 
         // Remove hash in extension if there's any (added by filepool).
@@ -98,7 +98,7 @@ export class CoreMimetypeUtilsProvider {
 
         // Remove dot from the extension if found.
         if (extension && extension[0] == '.') {
-            extension = extension.substr(1);
+            extension = extension.substring(1);
         }
 
         return extension;
@@ -311,12 +311,12 @@ export class CoreMimetypeUtilsProvider {
             // Remove params if any.
             position = candidate.indexOf('?');
             if (position > -1) {
-                candidate = candidate.substr(0, position);
+                candidate = candidate.substring(0, position);
             }
             // Remove anchor if any.
             position = candidate.indexOf('#');
             if (position > -1) {
-                candidate = candidate.substr(0, position);
+                candidate = candidate.substring(0, position);
             }
 
             if (EXTENSION_REGEX.test(candidate)) {
@@ -346,7 +346,7 @@ export class CoreMimetypeUtilsProvider {
         let ext;
 
         if (dot > -1) {
-            ext = filename.substr(dot + 1).toLowerCase();
+            ext = filename.substring(dot + 1).toLowerCase();
             ext = this.cleanExtension(ext);
 
             // Check extension corresponds to a mimetype to know if it's valid.
@@ -589,9 +589,9 @@ export class CoreMimetypeUtilsProvider {
 
         if (position > -1) {
             // Check extension corresponds to a mimetype to know if it's valid.
-            extension = path.substr(position + 1).toLowerCase();
+            extension = path.substring(position + 1).toLowerCase();
             if (this.getMimeType(extension) !== undefined) {
-                return path.substr(0, position); // Remove extension.
+                return path.substring(0, position); // Remove extension.
             }
         }
 
diff --git a/src/core/services/utils/text.ts b/src/core/services/utils/text.ts
index c37c3f8a9..c227c1279 100644
--- a/src/core/services/utils/text.ts
+++ b/src/core/services/utils/text.ts
@@ -279,7 +279,7 @@ export class CoreTextUtilsProvider {
         const firstCharRight = rightPath.charAt(0);
 
         if (lastCharLeft === '/' && firstCharRight === '/') {
-            return leftPath + rightPath.substr(1);
+            return leftPath + rightPath.substring(1);
         } else if (lastCharLeft !== '/' && firstCharRight !== '/') {
             return leftPath + '/' + rightPath;
         } else {
@@ -539,7 +539,7 @@ export class CoreTextUtilsProvider {
             const url = CoreFileHelper.getFileUrl(files[0]);
 
             // Remove text after last slash (encoded or not).
-            return url?.substr(0, Math.max(url.lastIndexOf('/'), url.lastIndexOf('%2F')));
+            return url?.substring(0, Math.max(url.lastIndexOf('/'), url.lastIndexOf('%2F')));
         }
 
         return undefined;
@@ -778,9 +778,9 @@ export class CoreTextUtilsProvider {
             }
 
             // Get the filename from the URL.
-            let filename = url.substr(url.lastIndexOf('/') + 1);
+            let filename = url.substring(url.lastIndexOf('/') + 1);
             if (filename.indexOf('?') != -1) {
-                filename = filename.substr(0, filename.indexOf('?'));
+                filename = filename.substring(0, filename.indexOf('?'));
             }
 
             if (pluginfileMap[filename]) {
@@ -904,12 +904,12 @@ export class CoreTextUtilsProvider {
      */
     shortenText(text: string, length: number): string {
         if (text.length > length) {
-            text = text.substr(0, length);
+            text = text.substring(0, length);
 
             // Now, truncate at the last word boundary (if exists).
             const lastWordPos = text.lastIndexOf(' ');
             if (lastWordPos > 0) {
-                text = text.substr(0, lastWordPos);
+                text = text.substring(0, lastWordPos);
             }
             text += '&hellip;';
         }
diff --git a/src/core/services/utils/url.ts b/src/core/services/utils/url.ts
index 15ed16dfc..06681b696 100644
--- a/src/core/services/utils/url.ts
+++ b/src/core/services/utils/url.ts
@@ -329,9 +329,9 @@ export class CoreUrlUtilsProvider {
      * @return Last file without params.
      */
     getLastFileWithoutParams(url: string): string {
-        let filename = url.substr(url.lastIndexOf('/') + 1);
+        let filename = url.substring(url.lastIndexOf('/') + 1);
         if (filename.indexOf('?') != -1) {
-            filename = filename.substr(0, filename.indexOf('?'));
+            filename = filename.substring(0, filename.indexOf('?'));
         }
 
         return filename;
diff --git a/src/core/services/utils/utils.ts b/src/core/services/utils/utils.ts
index e66e673fd..2b72fb6c3 100644
--- a/src/core/services/utils/utils.ts
+++ b/src/core/services/utils/utils.ts
@@ -1254,7 +1254,7 @@ export class CoreUtilsProvider {
         const mapped = {};
         objects.forEach((item) => {
             const keyValue = item[keyName] as string;
-            const key = prefixSubstr > 0 ? keyValue.substr(prefixSubstr) : keyValue;
+            const key = prefixSubstr > 0 ? keyValue.substring(prefixSubstr) : keyValue;
             mapped[key] = item[valueName];
         });
 
diff --git a/src/core/singletons/colors.ts b/src/core/singletons/colors.ts
index 5a5eeb0c9..368b3e99d 100644
--- a/src/core/singletons/colors.ts
+++ b/src/core/singletons/colors.ts
@@ -112,7 +112,7 @@ export class CoreColors {
      */
     static hexToRGB(color: string): ColorComponents {
         if (color.charAt(0) == '#') {
-            color = color.substr(1);
+            color = color.substring(1);
         }
 
         if (color.length === 3) {
@@ -122,9 +122,9 @@ export class CoreColors {
         }
 
         return {
-            red: parseInt(color.substr(0, 2), 16),
-            green: parseInt(color.substr(2, 2), 16),
-            blue: parseInt(color.substr(4, 2), 16),
+            red: parseInt(color.substring(0, 2), 16),
+            green: parseInt(color.substring(2, 2), 16),
+            blue: parseInt(color.substring(4, 2), 16),
         };
 
     }
diff --git a/src/core/singletons/locutus.ts b/src/core/singletons/locutus.ts
index c39484399..ac9b5bc3e 100644
--- a/src/core/singletons/locutus.ts
+++ b/src/core/singletons/locutus.ts
@@ -123,7 +123,7 @@ function readBytes (str, len, escapedString = false) {
     const isLowSurrogate = code >= 0xdc00 && code <= 0xdfff
 
     if (escapedString && chr === '\\') {
-      chr = String.fromCharCode(parseInt(str.substr(c + 1, 2), 16))
+      chr = String.fromCharCode(parseInt(str.substring(c + 1, 2), 16))
       escapedChars++
 
       // each escaped sequence is 3 characters. Go 2 chars ahead.
@@ -167,7 +167,7 @@ function expectString (str) {
 
   const len = parseInt(byteLenMatch, 10)
 
-  str = str.substr(match.length)
+  str = str.substring(match.length)
 
   let [ strMatch, bytes ] = readBytes(str, len)
 
@@ -175,7 +175,7 @@ function expectString (str) {
     throw SyntaxError(`Expected string of ${len} bytes, but got ${bytes}`)
   }
 
-  str = str.substr((strMatch as string).length)
+  str = str.substring((strMatch as string).length)
 
   // strict parsing, match closing "; chars
   if (!str.startsWith('";')) {
@@ -195,7 +195,7 @@ function expectEscapedString (str) {
 
   const len = parseInt(strLenMatch, 10)
 
-  str = str.substr(match.length)
+  str = str.substring(match.length)
 
   let [ strMatch, bytes, escapedChars ] = readBytes(str, len, true)
 
@@ -203,7 +203,7 @@ function expectEscapedString (str) {
     throw SyntaxError(`Expected escaped string of ${len} bytes, but got ${bytes}`)
   }
 
-  str = str.substr((strMatch as string).length + (escapedChars as number) * 2)
+  str = str.substring((strMatch as string).length + (escapedChars as number) * 2)
 
   // strict parsing, match closing "; chars
   if (!str.startsWith('";')) {
@@ -249,15 +249,15 @@ function expectObject (str, cache) {
   const obj = {}
   cache([obj])
 
-  str = str.substr(totalOffset)
+  str = str.substring(totalOffset)
 
   for (let i = 0; i < propCount; i++) {
     const prop = expectKeyOrIndex(str)
-    str = str.substr(prop[1])
+    str = str.substring(prop[1])
     totalOffset += prop[1] as number
 
     const value = expectType(str, cache)
-    str = str.substr(value[1])
+    str = str.substring(value[1])
     totalOffset += value[1]
 
     obj[prop[0]] = value[0]
@@ -299,7 +299,7 @@ function expectArray (str, cache) {
     throw SyntaxError('Expected array length annotation')
   }
 
-  str = str.substr(arrayLiteralBeginMatch.length)
+  str = str.substring(arrayLiteralBeginMatch.length)
 
   const array = expectArrayItems(str, parseInt(arrayLengthMatch, 10), cache)
 
@@ -327,14 +327,14 @@ function expectArrayItems (str, expectedItems = 0, cache) {
       hasStringKeys = (typeof key[0] === 'string')
     }
 
-    str = str.substr(key[1])
+    str = str.substring(key[1])
     totalOffset += key[1]
 
     // references are resolved immediately, so if duplicate key overwrites previous array index
     // the old value is anyway resolved
     // fixme: but next time the same reference should point to the new value
     item = expectType(str, cache)
-    str = str.substr(item[1])
+    str = str.substring(item[1])
     totalOffset += item[1]
 
     items[key[0]] = item[0]
@@ -428,7 +428,7 @@ function substr_replace (str, replace, start, length) {
 
   return [
     str.slice(0, start),
-    replace.substr(0, length),
+    replace.substring(0, length),
     replace.slice(length),
     str.slice(start + length)
   ].join('')
diff --git a/src/core/singletons/text.ts b/src/core/singletons/text.ts
index c95fa2a5b..9f6c1af11 100644
--- a/src/core/singletons/text.ts
+++ b/src/core/singletons/text.ts
@@ -34,7 +34,7 @@ export class CoreText {
         }
 
         if (text.slice(-1) == '/') {
-            return text.substr(0, text.length - 1);
+            return text.substring(0, text.length - 1);
         }
 
         return text;
diff --git a/src/core/singletons/url.ts b/src/core/singletons/url.ts
index 097f05155..ebb7aa533 100644
--- a/src/core/singletons/url.ts
+++ b/src/core/singletons/url.ts
@@ -216,7 +216,7 @@ export class CoreUrl {
             return;
         }
 
-        return url.substr(firstAnchorIndex);
+        return url.substring(firstAnchorIndex);
     }
 
     /**
diff --git a/src/core/singletons/window.ts b/src/core/singletons/window.ts
index 5463c7521..328fbbda6 100644
--- a/src/core/singletons/window.ts
+++ b/src/core/singletons/window.ts
@@ -82,7 +82,7 @@ export class CoreWindow {
      */
     static async open(url: string, name?: string): Promise<void> {
         if (CoreUrlUtils.isLocalFileUrl(url)) {
-            const filename = url.substr(url.lastIndexOf('/') + 1);
+            const filename = url.substring(url.lastIndexOf('/') + 1);
 
             if (!CoreFileHelper.isOpenableInApp({ filename })) {
                 try {

From 4a83b2b29f6d1c3435ba1d80a45af184b06717a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 19 Jan 2022 14:54:43 +0100
Subject: [PATCH 0381/1008] MOBILE-3814 mod: Add module name to module info box

---
 src/addons/mod/forum/components/index/index.html     |  2 +-
 .../wiki/components/index/addon-mod-wiki-index.html  |  2 +-
 src/addons/mod/wiki/components/index/index.ts        |  1 -
 src/addons/mod/wiki/pages/index/index.html           |  4 ----
 src/addons/mod/wiki/pages/index/index.ts             | 12 ------------
 .../module-info/core-course-module-info.html         |  1 +
 .../components/module-info/course-module-info.scss   | 10 +++++++++-
 7 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/addons/mod/forum/components/index/index.html b/src/addons/mod/forum/components/index/index.html
index 5000be62a..09e94eb1a 100644
--- a/src/addons/mod/forum/components/index/index.html
+++ b/src/addons/mod/forum/components/index/index.html
@@ -41,7 +41,7 @@
         <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()"
             [description]="forum && forum.type != 'single' && description" [component]="component" [componentId]="componentId"
             [courseId]="courseId" [hasDataToSync]="hasOffline || hasOfflineRatings">
-            <ion-item>
+            <ion-item lines="none" class="ion-text-wrap">
                 <ion-label>
                     {{descriptionNote}}
                 </ion-label>
diff --git a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
index ee8fec538..9d9fdf7fb 100644
--- a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
+++ b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
@@ -50,7 +50,6 @@
     <!-- Activity info. -->
     <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
         [component]="component" [componentId]="componentId" [courseId]="courseId">
-        <h2 *ngIf="pageTitle" title>{{pageTitle}}</h2>
     </core-course-module-info>
 
     <div *ngIf="pageIsOffline || hasOffline || pageWarning">
@@ -74,6 +73,7 @@
         </ion-card>
     </div>
     <div class="ion-padding addon-mod_wiki-page-content">
+        <h2 *ngIf="pageTitle">{{pageTitle}}</h2>
         <article [ngClass]="{'addon-mod_wiki-noedit': !canEdit}">
             <core-format-text *ngIf="pageContent" [component]="component" [componentId]="componentId" [text]="pageContent"
                 contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
diff --git a/src/addons/mod/wiki/components/index/index.ts b/src/addons/mod/wiki/components/index/index.ts
index 45ea90277..4f5a4709f 100644
--- a/src/addons/mod/wiki/components/index/index.ts
+++ b/src/addons/mod/wiki/components/index/index.ts
@@ -427,7 +427,6 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
         const pageContents = await this.fetchPageContents(this.currentPage);
 
         if (pageContents) {
-            this.dataRetrieved.emit(pageContents.title);
             this.setSelectedWiki(pageContents.subwikiid, pageContents.userid, pageContents.groupid);
 
             this.pageTitle = pageContents.title;
diff --git a/src/addons/mod/wiki/pages/index/index.html b/src/addons/mod/wiki/pages/index/index.html
index 6c07ead01..a33c7c251 100644
--- a/src/addons/mod/wiki/pages/index/index.html
+++ b/src/addons/mod/wiki/pages/index/index.html
@@ -8,10 +8,6 @@
                 <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
                 </core-format-text>
             </h1>
-            <h2>
-                <core-format-text [text]="pageTitle" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
-                </core-format-text>
-            </h2>
         </ion-title>
 
         <ion-buttons slot="end">
diff --git a/src/addons/mod/wiki/pages/index/index.ts b/src/addons/mod/wiki/pages/index/index.ts
index 0d374feaa..34311f8ad 100644
--- a/src/addons/mod/wiki/pages/index/index.ts
+++ b/src/addons/mod/wiki/pages/index/index.ts
@@ -49,18 +49,6 @@ export class AddonModWikiIndexPage extends CoreCourseModuleMainActivityPage<Addo
         this.groupId = CoreNavigator.getRouteNumberParam('groupId');
     }
 
-    /**
-     * @inheritdoc
-     */
-    updateData(data: { name: string } | string): void {
-        if (typeof data == 'string') {
-            // We received the title to display.
-            this.pageTitle = data;
-        } else {
-            super.updateData(data);
-        }
-    }
-
     /**
      * User entered the page.
      */
diff --git a/src/core/features/course/components/module-info/core-course-module-info.html b/src/core/features/course/components/module-info/core-course-module-info.html
index 702b6ff54..66eb61541 100644
--- a/src/core/features/course/components/module-info/core-course-module-info.html
+++ b/src/core/features/course/components/module-info/core-course-module-info.html
@@ -2,6 +2,7 @@
     <core-mod-icon slot="start" [modicon]="modicon" [modname]="module.modname" [componentId]="module.instance">
     </core-mod-icon>
     <ion-label>
+        <p class="core-modulename" *ngIf="moduleNameTranslated">{{moduleNameTranslated}}</p>
         <h1>
             <core-format-text [text]="module.name" contextLevel="module" [component]="component" [componentId]="componentId"
                 [contextInstanceId]="module.id" [courseId]="courseId">
diff --git a/src/core/features/course/components/module-info/course-module-info.scss b/src/core/features/course/components/module-info/course-module-info.scss
index 0a0b5bce7..514315b48 100644
--- a/src/core/features/course/components/module-info/course-module-info.scss
+++ b/src/core/features/course/components/module-info/course-module-info.scss
@@ -6,6 +6,14 @@
     margin-bottom: 8px;
     padding-bottom: 1px; // To allow margins inside.
     background-color: var(--contrast-background);
-    
+
     @include padding-horizontal(var(--ion-safe-area-left), var(--ion-safe-area-right));
+
+    .core-modulename {
+        text-transform: uppercase;
+    }
+
+    core-mod-icon {
+        align-self: flex-start;
+    }
 }

From 6998c05d5cc861555e6dad066c319c18c33f69a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 19 Jan 2022 15:22:10 +0100
Subject: [PATCH 0382/1008] MOBILE-3814 mod: Move completion to course module
 navigation component

---
 .../index/addon-mod-assign-index.html         |  7 ++++---
 .../components/index/index.html               |  6 +++---
 .../index/addon-mod-book-index.html           |  6 +++---
 .../index/addon-mod-chat-index.html           |  6 +++---
 .../index/addon-mod-choice-index.html         |  6 +++---
 .../index/addon-mod-data-index.html           |  6 +++---
 .../index/addon-mod-feedback-index.html       |  6 +++---
 .../index/addon-mod-folder-index.html         |  6 +++---
 .../mod/forum/components/index/index.html     |  8 ++++----
 .../index/addon-mod-glossary-index.html       |  7 ++++---
 .../index/addon-mod-h5pactivity-index.html    |  6 +++---
 .../index/addon-mod-imscp-index.html          |  4 ++--
 .../index/addon-mod-lesson-index.html         |  6 +++---
 .../components/index/addon-mod-lti-index.html |  7 +++----
 .../index/addon-mod-page-index.html           |  6 +++---
 .../index/addon-mod-quiz-index.html           |  7 +++----
 .../index/addon-mod-resource-index.html       |  4 ++--
 .../index/addon-mod-scorm-index.html          |  6 +++---
 .../index/addon-mod-survey-index.html         |  7 +++----
 .../components/index/addon-mod-url-index.html |  6 +++---
 .../index/addon-mod-wiki-index.html           |  6 +++---
 .../index/addon-mod-workshop-index.html       |  4 ++--
 .../module-info/core-course-module-info.html  | 19 +++++--------------
 .../components/module-info/module-info.ts     |  8 ++------
 .../core-course-module-navigation.html        |  8 ++++++++
 .../module-navigation/module-navigation.ts    | 17 ++++++++++++-----
 .../pages/module-preview/module-preview.html  |  6 +++---
 .../core-siteplugins-module-index.html        |  3 ++-
 28 files changed, 98 insertions(+), 96 deletions(-)

diff --git a/src/addons/mod/assign/components/index/addon-mod-assign-index.html b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
index 2382ff0e7..de9b9a462 100644
--- a/src/addons/mod/assign/components/index/addon-mod-assign-index.html
+++ b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
@@ -30,8 +30,8 @@
 <core-loading [hideUntil]="loaded">
 
     <!-- Activity info. -->
-    <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
-        [component]="component" [componentId]="componentId" [courseId]="courseId" [hasDataToSync]="hasOffline">
+    <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
+        [courseId]="courseId" [hasDataToSync]="hasOffline">
         <ion-list inset="true" description *ngIf="assign && assign.introattachments && assign.introattachments.length">
             <core-file *ngFor="let file of assign.introattachments" [file]="file" [component]="component" [componentId]="componentId">
             </core-file>
@@ -148,4 +148,5 @@
     </addon-mod-assign-submission>
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id"></core-course-module-navigation>
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+</core-course-module-navigation>
diff --git a/src/addons/mod/bigbluebuttonbn/components/index/index.html b/src/addons/mod/bigbluebuttonbn/components/index/index.html
index a5a2baeb8..7b5f0aa7b 100644
--- a/src/addons/mod/bigbluebuttonbn/components/index/index.html
+++ b/src/addons/mod/bigbluebuttonbn/components/index/index.html
@@ -23,8 +23,8 @@
 <core-loading [hideUntil]="loaded" class="safe-area-page">
 
     <!-- Activity info. -->
-    <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
-        [component]="component" [componentId]="componentId" [courseId]="courseId">
+    <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
+        [courseId]="courseId">
     </core-course-module-info>
 
     <ng-container *ngIf="groupInfo && (groupInfo.separateGroups || groupInfo.visibleGroups)">
@@ -126,5 +126,5 @@
     </ng-container>
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/book/components/index/addon-mod-book-index.html b/src/addons/mod/book/components/index/addon-mod-book-index.html
index 247a4b5c7..0789f53c5 100644
--- a/src/addons/mod/book/components/index/addon-mod-book-index.html
+++ b/src/addons/mod/book/components/index/addon-mod-book-index.html
@@ -24,8 +24,8 @@
 <core-loading [hideUntil]="loaded">
 
     <!-- Activity info. -->
-    <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
-        [component]="component" [componentId]="componentId" [courseId]="courseId">
+    <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
+        [courseId]="courseId">
     </core-course-module-info>
 
     <ion-card class="core-warning-card" *ngIf="warning">
@@ -56,5 +56,5 @@
 
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/chat/components/index/addon-mod-chat-index.html b/src/addons/mod/chat/components/index/addon-mod-chat-index.html
index 046853afd..d9106e2bf 100644
--- a/src/addons/mod/chat/components/index/addon-mod-chat-index.html
+++ b/src/addons/mod/chat/components/index/addon-mod-chat-index.html
@@ -27,8 +27,8 @@
 <core-loading [hideUntil]="loaded" class="safe-area-padding">
 
     <!-- Activity info. -->
-    <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
-        [component]="component" [componentId]="componentId" [courseId]="courseId">
+    <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
+        [courseId]="courseId">
     </core-course-module-info>
 
     <ion-card *ngIf="chatInfo" class="core-info-card">
@@ -48,5 +48,5 @@
     </ng-container>
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/choice/components/index/addon-mod-choice-index.html b/src/addons/mod/choice/components/index/addon-mod-choice-index.html
index 4d291227e..730623b79 100644
--- a/src/addons/mod/choice/components/index/addon-mod-choice-index.html
+++ b/src/addons/mod/choice/components/index/addon-mod-choice-index.html
@@ -29,8 +29,8 @@
 <core-loading [hideUntil]="loaded">
 
     <!-- Activity info. -->
-    <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
-        [component]="component" [componentId]="componentId" [courseId]="courseId" [hasDataToSync]="hasOffline">
+    <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
+        [courseId]="courseId" [hasDataToSync]="hasOffline">
     </core-course-module-info>
 
     <!-- Activity availability messages -->
@@ -155,7 +155,7 @@
     </ion-card>
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
 
 <!-- Template to render a choice option label. -->
diff --git a/src/addons/mod/data/components/index/addon-mod-data-index.html b/src/addons/mod/data/components/index/addon-mod-data-index.html
index 1bb70403b..c33a3a94a 100644
--- a/src/addons/mod/data/components/index/addon-mod-data-index.html
+++ b/src/addons/mod/data/components/index/addon-mod-data-index.html
@@ -39,8 +39,8 @@
 <core-loading [hideUntil]="loaded">
 
     <!-- Activity info. -->
-    <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
-        [component]="component" [componentId]="componentId" [courseId]="courseId" [hasDataToSync]="hasOffline || hasOfflineRatings">
+    <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
+        [courseId]="courseId" [hasDataToSync]="hasOffline || hasOfflineRatings">
     </core-course-module-info>
 
     <ion-item class="ion-text-wrap" *ngIf="groupInfo && (groupInfo.separateGroups || groupInfo.visibleGroups)">
@@ -138,7 +138,7 @@
 
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
 
 <ion-fab slot="fixed" core-fab vertical="bottom" horizontal="end" *ngIf="canAdd">
diff --git a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
index 685a98db0..f7bde4f52 100644
--- a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
+++ b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
@@ -29,8 +29,8 @@
 <core-loading [hideUntil]="loaded">
 
     <!-- Activity info. -->
-    <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
-        [component]="component" [componentId]="componentId" [courseId]="courseId" [hasDataToSync]="hasOffline">
+    <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
+        [courseId]="courseId" [hasDataToSync]="hasOffline">
     </core-course-module-info>
 
     <core-tabs [hideUntil]="tabsReady" [selectedIndex]="firstSelectedTab">
@@ -55,7 +55,7 @@
     </core-tabs>
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
 
 <ng-template #basicInfo>
diff --git a/src/addons/mod/folder/components/index/addon-mod-folder-index.html b/src/addons/mod/folder/components/index/addon-mod-folder-index.html
index 6c8d1aaeb..adceb5976 100644
--- a/src/addons/mod/folder/components/index/addon-mod-folder-index.html
+++ b/src/addons/mod/folder/components/index/addon-mod-folder-index.html
@@ -26,8 +26,8 @@
 <core-loading [hideUntil]="loaded">
 
     <!-- Activity info. -->
-    <core-course-module-info *ngIf="!subfolder" [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
-        [component]="component" [componentId]="componentId" [courseId]="courseId">
+    <core-course-module-info *ngIf="!subfolder" [module]="module" [description]="description" [component]="component"
+        [componentId]="componentId" [courseId]="courseId">
     </core-course-module-info>
 
     <ion-list *ngIf="contents && (contents.files.length + contents.folders.length > 0)">
@@ -49,5 +49,5 @@
 
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/forum/components/index/index.html b/src/addons/mod/forum/components/index/index.html
index 09e94eb1a..eebda708e 100644
--- a/src/addons/mod/forum/components/index/index.html
+++ b/src/addons/mod/forum/components/index/index.html
@@ -38,9 +38,8 @@
 
     <core-loading [hideUntil]="discussions && discussions.loaded">
         <!-- Activity info. -->
-        <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()"
-            [description]="forum && forum.type != 'single' && description" [component]="component" [componentId]="componentId"
-            [courseId]="courseId" [hasDataToSync]="hasOffline || hasOfflineRatings">
+        <core-course-module-info [module]="module" [description]="forum && forum.type != 'single' && description" [component]="component"
+            [componentId]="componentId" [courseId]="courseId" [hasDataToSync]="hasOffline || hasOfflineRatings">
             <ion-item lines="none" class="ion-text-wrap">
                 <ion-label>
                     {{descriptionNote}}
@@ -140,7 +139,8 @@
         </ng-container>
     </core-loading>
 
-    <core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+    <core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module"
+        (completionChanged)="onCompletionChange()">
     </core-course-module-navigation>
 
     <ion-fab slot="fixed" core-fab vertical="bottom" horizontal="end" *ngIf="forum && canAddDiscussion">
diff --git a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
index d6f12a61e..a3437f70d 100644
--- a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
+++ b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
@@ -50,8 +50,8 @@
 
     <core-loading [hideUntil]="loaded">
         <!-- Activity info. -->
-        <core-course-module-info *ngIf="!isSearch" [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
-            [component]="component" [componentId]="componentId" [courseId]="courseId" [hasDataToSync]="hasOffline || hasOfflineRatings">
+        <core-course-module-info *ngIf="!isSearch" [module]="module" [description]="description" [component]="component"
+            [componentId]="componentId" [courseId]="courseId" [hasDataToSync]="hasOffline || hasOfflineRatings">
         </core-course-module-info>
 
         <ion-list *ngIf="!isSearch && entries && entries.offlineEntries.length > 0">
@@ -96,7 +96,8 @@
         </core-infinite-loading>
     </core-loading>
 
-    <core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+    <core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module"
+        (completionChanged)="onCompletionChange()">
     </core-course-module-navigation>
 
     <ion-fab slot="fixed" core-fab vertical="bottom" horizontal="end" *ngIf="canAdd">
diff --git a/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html b/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
index 300b5feb7..26790f9c0 100644
--- a/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
+++ b/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
@@ -36,8 +36,8 @@
 <core-loading [hideUntil]="loaded" class="safe-area-padding">
 
     <!-- Activity info. -->
-    <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
-        [component]="component" [componentId]="componentId" [courseId]="courseId" [hasDataToSync]="hasOffline">
+    <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
+        [courseId]="courseId" [hasDataToSync]="hasOffline">
     </core-course-module-info>
 
     <!-- Offline disabled. -->
@@ -85,5 +85,5 @@
     </core-h5p-iframe>
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
index 056553b9f..4a92470fb 100644
--- a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
+++ b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
@@ -29,7 +29,7 @@
 <core-loading [hideUntil]="loaded" class="safe-area-padding">
 
     <!-- Activity info. -->
-    <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()">
+    <core-course-module-info [module]="module">
     </core-course-module-info>
 
     <ion-card class="core-warning-card" *ngIf="warning">
@@ -46,5 +46,5 @@
     </div>
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
index 0219bef8c..0f1de12a2 100644
--- a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
+++ b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
@@ -33,8 +33,8 @@
             <ng-template>
 
                 <!-- Activity info. -->
-                <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
-                    [component]="component" [componentId]="componentId" [courseId]="courseId" [hasDataToSync]="hasOffline">
+                <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
+                    [courseId]="courseId" [hasDataToSync]="hasOffline">
                 </core-course-module-info>
 
                 <!-- Prevent access messages. Only show the first one. -->
@@ -298,5 +298,5 @@
     </core-tabs>
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/lti/components/index/addon-mod-lti-index.html b/src/addons/mod/lti/components/index/addon-mod-lti-index.html
index 20cf1a86e..9430ef52b 100644
--- a/src/addons/mod/lti/components/index/addon-mod-lti-index.html
+++ b/src/addons/mod/lti/components/index/addon-mod-lti-index.html
@@ -20,9 +20,8 @@
 <core-loading [hideUntil]="loaded" class="safe-area-padding">
 
     <!-- Activity info. -->
-    <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()"
-        [description]="lti && lti.showdescriptionlaunch && description" [component]="component" [componentId]="componentId"
-        [courseId]="courseId">
+    <core-course-module-info [module]="module" [description]="lti && lti.showdescriptionlaunch && description" [component]="component"
+        [componentId]="componentId" [courseId]="courseId">
     </core-course-module-info>
 
     <div class="ion-padding">
@@ -33,5 +32,5 @@
     </div>
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/page/components/index/addon-mod-page-index.html b/src/addons/mod/page/components/index/addon-mod-page-index.html
index 078f5c5c9..1c8cab9ed 100644
--- a/src/addons/mod/page/components/index/addon-mod-page-index.html
+++ b/src/addons/mod/page/components/index/addon-mod-page-index.html
@@ -26,8 +26,8 @@
 <core-loading [hideUntil]="loaded" class="safe-area-padding">
 
     <!-- Activity info. -->
-    <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="displayDescription && description"
-        [component]="component" [componentId]="componentId" [courseId]="courseId">
+    <core-course-module-info [module]="module" [description]="displayDescription && description" [component]="component"
+        [componentId]="componentId" [courseId]="courseId">
     </core-course-module-info>
 
     <ion-card class="core-warning-card" *ngIf="warning">
@@ -49,5 +49,5 @@
 
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
index 5d39ece10..dffa76b76 100644
--- a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
+++ b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
@@ -29,9 +29,8 @@
 <core-loading [hideUntil]="loaded">
 
     <!-- Activity info. -->
-    <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
-        [component]="component" [componentId]="componentId" [courseId]="courseId"
-        [hasDataToSync]="buttonText && hasOffline && !showStatusSpinner">
+    <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
+        [courseId]="courseId" [hasDataToSync]="buttonText && hasOffline && !showStatusSpinner">
     </core-course-module-info>
 
     <!-- Access rules description messages. -->
@@ -227,5 +226,5 @@
     </ion-card>
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/resource/components/index/addon-mod-resource-index.html b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
index 9638db04e..e0f1279be 100644
--- a/src/addons/mod/resource/components/index/addon-mod-resource-index.html
+++ b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
@@ -21,7 +21,7 @@
 <core-loading [hideUntil]="loaded" class="safe-area-padding">
 
     <!-- Activity info. -->
-    <core-course-module-info [module]="module" [courseId]="courseId" (completionChanged)="onCompletionChange()"
+    <core-course-module-info [module]="module" [courseId]="courseId"
         [description]="mode != 'iframe' && (mode != 'embedded' || displayDescription) && description" [component]="component"
         [componentId]="componentId">
     </core-course-module-info>
@@ -61,5 +61,5 @@
     </ng-container>
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
index 37ae91bfa..aeb744521 100644
--- a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
+++ b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
@@ -29,8 +29,8 @@
 <core-loading [hideUntil]="loaded" class="safe-area-padding">
 
     <!-- Activity info. -->
-    <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
-        [component]="component" [componentId]="componentId" [courseId]="courseId" [hasDataToSync]="!errorMessage && hasOffline">
+    <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
+        [courseId]="courseId" [hasDataToSync]="!errorMessage && hasOffline">
     </core-course-module-info>
 
     <!-- Warning message. -->
@@ -237,5 +237,5 @@
     </ng-container>
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/survey/components/index/addon-mod-survey-index.html b/src/addons/mod/survey/components/index/addon-mod-survey-index.html
index 345c10b5a..99a46962c 100644
--- a/src/addons/mod/survey/components/index/addon-mod-survey-index.html
+++ b/src/addons/mod/survey/components/index/addon-mod-survey-index.html
@@ -30,9 +30,8 @@
 <core-loading [hideUntil]="loaded" class="safe-area-padding">
 
     <!-- Activity info. -->
-    <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()"
-        [description]="survey && !survey.surveydone && !hasOffline && description" [component]="component" [componentId]="componentId"
-        [courseId]="courseId" [hasDataToSync]="hasOffline">
+    <core-course-module-info [module]="module" [description]="survey && !survey.surveydone && !hasOffline && description"
+        [component]="component" [componentId]="componentId" [courseId]="courseId" [hasDataToSync]="hasOffline">
     </core-course-module-info>
 
     <!-- Survey already done -->
@@ -148,5 +147,5 @@
 
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/url/components/index/addon-mod-url-index.html b/src/addons/mod/url/components/index/addon-mod-url-index.html
index 7026fddf3..24f4579bd 100644
--- a/src/addons/mod/url/components/index/addon-mod-url-index.html
+++ b/src/addons/mod/url/components/index/addon-mod-url-index.html
@@ -16,8 +16,8 @@
 <core-loading [hideUntil]="loaded">
 
     <!-- Activity info. -->
-    <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="displayDescription && description"
-        [component]="component" [componentId]="componentId" [courseId]="courseId">
+    <core-course-module-info [module]="module" [description]="displayDescription && description" [component]="component"
+        [componentId]="componentId" [courseId]="courseId">
     </core-course-module-info>
 
     <div *ngIf="shouldIframe || (shouldEmbed && isOther)" class="addon-mod_url-embedded-url">
@@ -53,5 +53,5 @@
     </ion-list>
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
index 9d9fdf7fb..7db05d66b 100644
--- a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
+++ b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
@@ -48,8 +48,8 @@
 <core-loading [hideUntil]="loaded">
 
     <!-- Activity info. -->
-    <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
-        [component]="component" [componentId]="componentId" [courseId]="courseId">
+    <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
+        [courseId]="courseId">
     </core-course-module-info>
 
     <div *ngIf="pageIsOffline || hasOffline || pageWarning">
@@ -89,7 +89,7 @@
     </div>
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
 
 <ion-fab slot="fixed" core-fab vertical="bottom" horizontal="end" *ngIf="canEdit">
diff --git a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
index 8a5e5543d..a5a979a6f 100644
--- a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
+++ b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
@@ -30,7 +30,7 @@
 <core-loading [hideUntil]="loaded">
 
     <!-- Activity info. -->
-    <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [hasDataToSync]="hasOffline">
+    <core-course-module-info [module]="module" [hasDataToSync]="hasOffline">
     </core-course-module-info>
 
     <ion-card *ngIf="phases">
@@ -254,5 +254,5 @@
     </div>
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/core/features/course/components/module-info/core-course-module-info.html b/src/core/features/course/components/module-info/core-course-module-info.html
index 66eb61541..88060b6ca 100644
--- a/src/core/features/course/components/module-info/core-course-module-info.html
+++ b/src/core/features/course/components/module-info/core-course-module-info.html
@@ -19,21 +19,12 @@
     </ion-label>
 </ion-item>
 <ng-content select="[description]"></ng-content>
-<ion-item class="ion-text-wrap" lines="none" *ngIf="showCompletion && (module.dates?.length ||
-        (module.completiondata && (module.completiondata.isautomatic || showManualCompletion) && module.uservisible))">
+<!-- Activity dates. -->
+<ion-item class="ion-text-wrap core-module-dates" lines="none" *ngIf="showCompletion && module.dates?.length">
     <ion-label>
-        <!-- Activity dates. -->
-        <div *ngIf="module.dates?.length" class="core-module-dates">
-            <p *ngFor="let date of module.dates">
-                <strong>{{ date.label }}</strong> {{ date.timestamp * 1000 | coreFormatDate:'strftimedatetime' }}
-            </p>
-        </div>
-
-        <!-- Module completion. -->
-        <core-course-module-completion *ngIf="module.completiondata && module.uservisible" [completion]="module.completiondata"
-            [moduleName]="module.name" [moduleId]="module.id" [showCompletionConditions]="true"
-            [showManualCompletion]="showManualCompletion" (completionChanged)="completionChanged.emit($event)">
-        </core-course-module-completion>
+        <p *ngFor="let date of module.dates">
+            <strong>{{ date.label }}</strong> {{ date.timestamp * 1000 | coreFormatDate:'strftimedatetime' }}
+        </p>
     </ion-label>
 </ion-item>
 <ng-content></ng-content>
diff --git a/src/core/features/course/components/module-info/module-info.ts b/src/core/features/course/components/module-info/module-info.ts
index 43fbe8ec4..f57b95e7e 100644
--- a/src/core/features/course/components/module-info/module-info.ts
+++ b/src/core/features/course/components/module-info/module-info.ts
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 import { CoreCourse } from '@features/course/services/course';
-import { CoreCourseModuleData, CoreCourseModuleCompletionData } from '@features/course/services/course-helper';
+import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate';
 import { CoreSites } from '@services/sites';
 
@@ -36,7 +36,6 @@ import { CoreSites } from '@services/sites';
 export class CoreCourseModuleInfoComponent implements OnInit {
 
     @Input() module!: CoreCourseModuleData; // The module to render.
-    @Input() showManualCompletion = true; // Whether to show manual completion, true by default.
     @Input() courseId!: number; // The courseId the module belongs to.
 
     @Input() component!: string; // Component for format text directive.
@@ -47,8 +46,6 @@ export class CoreCourseModuleInfoComponent implements OnInit {
 
     @Input() hasDataToSync = false; // If the activity has any data to be synced.
 
-    @Output() completionChanged = new EventEmitter<CoreCourseModuleCompletionData>(); // Notify when completion changes.
-
     modicon = '';
     showCompletion = false; // Whether to show completion.
     moduleNameTranslated = '';
@@ -60,7 +57,6 @@ export class CoreCourseModuleInfoComponent implements OnInit {
         this.modicon = await CoreCourseModuleDelegate.getModuleIconSrc(this.module.modname, this.module.modicon, this.module);
 
         this.moduleNameTranslated = CoreCourse.translateModuleName(this.module.modname || '');
-
         this.showCompletion = CoreSites.getRequiredCurrentSite().isVersionGreaterEqualThan('3.11');
     }
 
diff --git a/src/core/features/course/components/module-navigation/core-course-module-navigation.html b/src/core/features/course/components/module-navigation/core-course-module-navigation.html
index 74fc6f584..7d0fde92d 100644
--- a/src/core/features/course/components/module-navigation/core-course-module-navigation.html
+++ b/src/core/features/course/components/module-navigation/core-course-module-navigation.html
@@ -6,6 +6,14 @@
                 <ion-icon name="fas-arrow-left" slot="icon-only" aria-hidden="true"></ion-icon>
             </ion-button>
         </ion-col>
+        <ion-col *ngIf="showCompletion && (currentModule.completiondata &&
+            (currentModule.completiondata.isautomatic || showManualCompletion) && currentModule.uservisible)">
+            <!-- Module completion. -->
+            <core-course-module-completion [completion]="currentModule.completiondata" [moduleName]="currentModule.name"
+                [moduleId]="currentModule.id" [showCompletionConditions]="true" [showManualCompletion]="showManualCompletion"
+                (completionChanged)="completionChanged.emit($event)">
+            </core-course-module-completion>
+        </ion-col>
         <ion-col size="auto">
             <ion-button fill="clear" class="core-course-next-module" *ngIf="nextModule" (click)="goToActivity(true)"
                 [attr.aria-label]="'core.course.gotonextactivity' | translate">
diff --git a/src/core/features/course/components/module-navigation/module-navigation.ts b/src/core/features/course/components/module-navigation/module-navigation.ts
index fa326b1c7..6da81c2f4 100644
--- a/src/core/features/course/components/module-navigation/module-navigation.ts
+++ b/src/core/features/course/components/module-navigation/module-navigation.ts
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, ElementRef, Input, OnDestroy, OnInit } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
 import { CoreCourse, CoreCourseProvider, CoreCourseWSSection } from '@features/course/services/course';
-import { CoreCourseModuleData } from '@features/course/services/course-helper';
+import { CoreCourseModuleCompletionData, CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate';
 import { IonContent } from '@ionic/angular';
 import { ScrollDetail } from '@ionic/core';
@@ -29,7 +29,7 @@ import { CoreMath } from '@singletons/math';
  * Component to show a button to go to the next resource/activity.
  *
  * Example usage:
- * <core-course-module-navigation [courseId]="courseId" [currentModuleId]="module.id"></core-course-module-navigation>
+ * <core-course-module-navigation [courseId]="courseId" [currentModule]="module"></core-course-module-navigation>
  */
 @Component({
     selector: 'core-course-module-navigation',
@@ -39,13 +39,17 @@ import { CoreMath } from '@singletons/math';
 export class CoreCourseModuleNavigationComponent implements OnInit, OnDestroy {
 
     @Input() courseId!: number; // Course ID.
-    @Input() currentModuleId!: number; // Current module ID.
+    @Input() currentModule!: CoreCourseModuleData; // Current module.
+    @Input() showManualCompletion = true; // Whether to show manual completion, true by default.
+
+    @Output() completionChanged = new EventEmitter<CoreCourseModuleCompletionData>(); // Notify when completion changes.
 
     nextModule?: CoreCourseModuleData;
     previousModule?: CoreCourseModuleData;
     nextModuleSection?: CoreCourseWSSection;
     previousModuleSection?: CoreCourseWSSection;
     loaded = false;
+    showCompletion = false; // Whether to show completion.
 
     protected element: HTMLElement;
     protected initialHeight = 0;
@@ -78,6 +82,8 @@ export class CoreCourseModuleNavigationComponent implements OnInit, OnDestroy {
      * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
+        this.showCompletion = CoreSites.getRequiredCurrentSite().isVersionGreaterEqualThan('3.11');
+
         try {
             await this.setNextAndPreviousModules(CoreSitesReadingStrategy.PREFER_CACHE);
         } finally {
@@ -172,6 +178,7 @@ export class CoreCourseModuleNavigationComponent implements OnInit, OnDestroy {
         }
 
         const preSets = CoreSites.getReadingStrategyPreSets(readingStrategy);
+        const currentModuleId = this.currentModule.id;
 
         const sections = await CoreCourse.getSections(this.courseId, false, true, preSets);
 
@@ -184,7 +191,7 @@ export class CoreCourseModuleNavigationComponent implements OnInit, OnDestroy {
                 return false;
             }
 
-            currentModuleIndex = section.modules.findIndex((module: CoreCourseModuleData) => module.id == this.currentModuleId);
+            currentModuleIndex = section.modules.findIndex((module: CoreCourseModuleData) => module.id == currentModuleId);
 
             return currentModuleIndex >= 0;
         });
diff --git a/src/core/features/course/pages/module-preview/module-preview.html b/src/core/features/course/pages/module-preview/module-preview.html
index 8f352f3b5..711f8c740 100644
--- a/src/core/features/course/pages/module-preview/module-preview.html
+++ b/src/core/features/course/pages/module-preview/module-preview.html
@@ -25,8 +25,7 @@
     </ion-refresher>
     <core-loading [hideUntil]="loaded">
         <core-course-module-info [module]="module" [courseId]="courseId" [description]="module.description" [component]="module.modname"
-            [componentId]="module.id" (completionChanged)="onCompletionChange()" [expandDescription]="true"
-            [showManualCompletion]="showManualCompletion">
+            [componentId]="module.id" [expandDescription]="true">
 
             <div class="safe-area-padding-horizontal ion-padding" *ngIf="module.handlerData?.extraBadge">
                 <ion-badge class="ion-text-wrap ion-text-start" [color]="module.handlerData?.extraBadgeColor">
@@ -61,5 +60,6 @@
         </core-course-module-info>
     </core-loading>
 
-    <core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id"></core-course-module-navigation>
+    <core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module"
+        (completionChanged)="onCompletionChange()" [showManualCompletion]="showManualCompletion"></core-course-module-navigation>
 </ion-content>
diff --git a/src/core/features/siteplugins/components/module-index/core-siteplugins-module-index.html b/src/core/features/siteplugins/components/module-index/core-siteplugins-module-index.html
index ac5c6b837..89dfe24d8 100644
--- a/src/core/features/siteplugins/components/module-index/core-siteplugins-module-index.html
+++ b/src/core/features/siteplugins/components/module-index/core-siteplugins-module-index.html
@@ -30,4 +30,5 @@
     (onLoadingContent)="contentLoading()">
 </core-site-plugins-plugin-content>
 
-<core-course-module-navigation *ngIf="module" [courseId]="courseId" [currentModuleId]="module.id"></core-course-module-navigation>
+<core-course-module-navigation *ngIf="module" [courseId]="courseId" [currentModule]="module">
+</core-course-module-navigation>

From a2a6c5d3f6dc3fca33c4784bd724981543e30db5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 19 Jan 2022 15:57:03 +0100
Subject: [PATCH 0383/1008] MOBILE-3814 user: Apply new UX to user menu

---
 .../components/user-menu/user-menu.html       | 38 +++++++++++--------
 .../components/user-menu/user-menu.scss       | 15 +++++++-
 src/theme/theme.base.scss                     |  2 +-
 3 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.html b/src/core/features/mainmenu/components/user-menu/user-menu.html
index 2f30c77d8..5b9b777b3 100644
--- a/src/core/features/mainmenu/components/user-menu/user-menu.html
+++ b/src/core/features/mainmenu/components/user-menu/user-menu.html
@@ -14,23 +14,21 @@
 </ion-header>
 <ion-content>
     <ion-list>
-        <ion-item button class="core-user-profile-maininfo" *ngIf="siteInfo" lines="full" (click)="switchAccounts($event)" detail="true"
-            [attr.aria-label]="'core.mainmenu.switchaccount' | translate">
-            <core-user-avatar [user]="siteInfo" [userId]="siteInfo.userid" [linkProfile]="false" slot="start"></core-user-avatar>
+        <ion-item button class="core-usermenu-siteinfo ion-text-wrap" *ngIf="siteInfo" lines="full" detail="false" [href]="siteUrl"
+            core-link auto-login="yes">
             <ion-label>
-                <h2>{{ siteInfo.fullname }}</h2>
-                <p class="core-usermenu-siteinfo core-usermenu-sitename">
+                <p class="core-usermenu-sitename">
                     <core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="0" [wsNotFiltered]="true">
                     </core-format-text>
                 </p>
+                <a [href]="siteUrl" core-link auto-login="yes" class="core-usermenu-siteurl">{{ siteUrl }}</a>
             </ion-label>
         </ion-item>
-
-        <ion-item button class="ion-text-wrap core-usermenu-handler" (click)="openUserProfile($event)"
-            [attr.aria-label]="'core.user.details' | translate" detail="true" lines="none">
-            <ion-icon name="fas-user" slot="start" aria-hidden="true"></ion-icon>
+        <ion-item button class="core-usermenu-handler ion-text-wrap" *ngIf="siteInfo" lines="full" (click)="openUserProfile($event)"
+            detail="true" [attr.aria-label]="'core.user.profile' | translate">
+            <core-user-avatar [user]="siteInfo" [userId]="siteInfo.userid" [linkProfile]="false" slot="start"></core-user-avatar>
             <ion-label>
-                <p class="item-heading">{{ 'core.user.profile' | translate }}</p>
+                <h2>{{ siteInfo.fullname }}</h2>
             </ion-label>
         </ion-item>
 
@@ -66,10 +64,18 @@
         </ion-item>
     </ion-list>
 </ion-content>
-<ion-footer class="ion-padding">
-    <ion-button (click)="logout($event)" expand="block" color="danger" [attr.aria-label]="'core.mainmenu.logout' | translate"
-        class="ion-text-wrap">
-        <ion-icon name="fas-sign-out-alt" slot="start" aria-hidden="true"></ion-icon>
-        {{ 'core.mainmenu.logout' | translate }}
-    </ion-button>
+<ion-footer>
+    <ion-item button lines="full" (click)="switchAccounts($event)" detail="true" class="ion-text-wrap">
+        <ion-icon name="fas-exchange-alt" slot="start" aria-hidden="true"></ion-icon>
+        <ion-label>
+            <p class="item-heading">{{ 'core.mainmenu.switchaccount' | translate }}</p>
+        </ion-label>
+    </ion-item>
+    <div class="ion-padding">
+        <ion-button (click)="logout($event)" expand="block" color="danger" [attr.aria-label]="'core.mainmenu.logout' | translate"
+            class="ion-text-wrap">
+            <ion-icon name="fas-sign-out-alt" slot="start" aria-hidden="true"></ion-icon>
+            {{ 'core.mainmenu.logout' | translate }}
+        </ion-button>
+    </div>
 </ion-footer>
diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.scss b/src/core/features/mainmenu/components/user-menu/user-menu.scss
index 74e3b93a4..924139eef 100644
--- a/src/core/features/mainmenu/components/user-menu/user-menu.scss
+++ b/src/core/features/mainmenu/components/user-menu/user-menu.scss
@@ -3,16 +3,25 @@
 :host {
     .core-user-menu-preferences {
         --inner-border-width: 0;
-        --border-width: 1px 0 0 0; 
+        --border-width: 1px 0 0 0;
     }
 }
 
+.core-usermenu-siteinfo {
+    --padding-top: 10px;
+    --padding-bottom: 10px;
+}
+
 @if ($core-user-hide-siteinfo) {
     .core-usermenu-siteinfo {
         display: none;
     }
 }
 
+.core-usermenu-sitename {
+    font-size: 16px;
+}
+
 @if ($core-user-hide-sitename) {
     .core-usermenu-sitename {
         display: none;
@@ -24,3 +33,7 @@
         display: none;
     }
 }
+
+ion-footer {
+    background: var(--contrast-background);
+}
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index fa122a16c..204469c4c 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -554,7 +554,7 @@ body.core-iframe-fullscreen ion-router-outlet {
             display: block;
             height: 100% !important;
             width: auto;
-            min-width: #{$modal-lateral-width};
+            min-width: calc(#{$modal-lateral-width} - 16px);
             box-shadow: 0 28px 48px rgba(0, 0, 0, 0.4);
         }
         ion-backdrop {

From fbc53cf64e9827e5a411263adbc3e964bd703b96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 21 Jan 2022 14:51:00 +0100
Subject: [PATCH 0384/1008] MOBILE-3913 timeline: Fix on timeline search
 sorting by dates

---
 .../timeline/components/events/addon-block-timeline-events.html | 2 +-
 src/addons/block/timeline/services/timeline.ts                  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/addons/block/timeline/components/events/addon-block-timeline-events.html b/src/addons/block/timeline/components/events/addon-block-timeline-events.html
index 7907f508c..1a6031f9c 100644
--- a/src/addons/block/timeline/components/events/addon-block-timeline-events.html
+++ b/src/addons/block/timeline/components/events/addon-block-timeline-events.html
@@ -9,7 +9,7 @@
 <ion-item-group *ngFor="let dayEvents of filteredEvents">
     <ion-item lines="none">
         <ion-label>
-            <h4 [class.core-bold]="!course">{{ dayEvents.dayTimestamp * 1000 | coreFormatDate:"strftimedayshort" }}</h4>
+            <h4 [class.core-bold]="!course">{{ dayEvents.dayTimestamp * 1000 | coreFormatDate:"strftimedaydate" }}</h4>
         </ion-label>
     </ion-item>
     <ng-container *ngFor="let event of dayEvents.events">
diff --git a/src/addons/block/timeline/services/timeline.ts b/src/addons/block/timeline/services/timeline.ts
index fe06a1aa6..831c5c5c5 100644
--- a/src/addons/block/timeline/services/timeline.ts
+++ b/src/addons/block/timeline/services/timeline.ts
@@ -184,6 +184,7 @@ export class AddonBlockTimelineProvider {
         if (searchValue != '') {
             data.searchvalue = searchValue;
             preSets.getFromCache = false;
+            preSets.cacheKey += ':' + searchValue;
         }
 
         const result = await site.read<AddonCalendarEvents>(

From 7cf522815dda502ff3a6798fc2899fa6b5806a00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 21 Jan 2022 15:55:53 +0100
Subject: [PATCH 0385/1008] MOBILE-3881 timeline: Improve multiple lines on
 activity string

---
 .../events/addon-block-timeline-events.html   | 17 +++++++-----
 .../timeline/components/events/events.scss    | 27 +++++++++++++++++--
 2 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/src/addons/block/timeline/components/events/addon-block-timeline-events.html b/src/addons/block/timeline/components/events/addon-block-timeline-events.html
index 1a6031f9c..0823714d6 100644
--- a/src/addons/block/timeline/components/events/addon-block-timeline-events.html
+++ b/src/addons/block/timeline/components/events/addon-block-timeline-events.html
@@ -33,21 +33,24 @@
                                     <ion-badge *ngIf="event.overdue" color="danger">{{ 'addon.block_timeline.overdue' | translate }}
                                     </ion-badge>
                                 </p>
-                                <p *ngIf="(showCourse && event.course) || event.activitystr">
+                                <p *ngIf="(showCourse && event.course) || event.activitystr"
+                                    class="addon-block-timeline-activity-course-activity">
                                     <span *ngIf="showCourse && event.course">
                                         <core-format-text [text]="event.course.fullnamedisplay" contextLevel="course"
                                             [contextInstanceId]="event.course.id">
-                                        </core-format-text> ·
+                                        </core-format-text>
+                                    </span>
+                                    <span *ngIf="event.activitystr">
+                                        <core-format-text *ngIf="event.activitystr" [text]="event.activitystr" contextLevel="module"
+                                            [contextInstanceId]="event.id">
+                                        </core-format-text>
                                     </span>
-                                    <core-format-text [text]="event.activitystr" contextLevel="module" [contextInstanceId]="event.id">
-                                    </core-format-text>
                                 </p>
                             </ion-col>
                         </ion-row>
                     </ion-col>
-                    <ion-col class="addon-block-timeline-activity-action ion-no-padding">
-                        <ion-button fill="clear" (click)="action($event, event.action.url)" [title]="event.action.name"
-                            [disabled]="!event.action.actionable" *ngIf="event.action">
+                    <ion-col class="addon-block-timeline-activity-action ion-no-padding" *ngIf="event.action?.actionable">
+                        <ion-button fill="clear" (click)="action($event, event.action.url)" [title]="event.action.name">
                             {{event.action.name}}
                             <ion-badge slot="end" class="ion-margin-start" *ngIf="event.action.showitemcount">
                                 {{event.action.itemcount}}
diff --git a/src/addons/block/timeline/components/events/events.scss b/src/addons/block/timeline/components/events/events.scss
index 8be5516b3..5c4aad112 100644
--- a/src/addons/block/timeline/components/events/events.scss
+++ b/src/addons/block/timeline/components/events/events.scss
@@ -22,11 +22,34 @@ h4.core-bold {
     --margin-vertical: 0;
 }
 
-.addon-block-timeline-activity-time,
-.addon-block-timeline-activity-action {
+.addon-block-timeline-activity-time {
     flex-grow: 0;
 }
 
+.addon-block-timeline-activity-action {
+    display: flex;
+    justify-content: flex-end;
+}
+
+.addon-block-timeline-activity-course-activity {
+    display: flex;
+    flex-wrap: wrap;
+    span {
+        overflow: hidden;
+        text-overflow: ellipsis;
+    }
+    span::after {
+        content: "·";
+        display: inline;
+        padding-left: .3rem;
+        padding-right: .3rem;
+    }
+
+    span:last-child::after {
+        display: none;
+    }
+}
+
 .addon-block-timeline-activity-main,
 .addon-block-timeline-activity-name {
     flex-grow: 1;

From 22d30e7a0779f006f9ae51e950b4b78d32751bc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Sat, 22 Jan 2022 16:30:51 +0100
Subject: [PATCH 0386/1008] MOBILE-3881 timeline: Wrap overdue status

---
 .../components/events/addon-block-timeline-events.html | 10 ++++++----
 .../block/timeline/components/events/events.scss       |  9 +++++++++
 src/core/components/mod-icon/mod-icon.scss             |  2 ++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/addons/block/timeline/components/events/addon-block-timeline-events.html b/src/addons/block/timeline/components/events/addon-block-timeline-events.html
index 0823714d6..7fffc2bd2 100644
--- a/src/addons/block/timeline/components/events/addon-block-timeline-events.html
+++ b/src/addons/block/timeline/components/events/addon-block-timeline-events.html
@@ -26,10 +26,12 @@
                                 </core-mod-icon>
                             </ion-col>
                             <ion-col class="addon-block-timeline-activity-name ion-no-padding">
-                                <p class="item-heading">
-                                    <core-format-text [text]="event.activityname || event.name" contextLevel="module"
-                                        [contextInstanceId]="event.id" [courseId]="event.course && event.course.id">
-                                    </core-format-text>
+                                <p class="item-heading addon-block-timeline-activity-name-with-status">
+                                    <span>
+                                        <core-format-text [text]="event.activityname || event.name" contextLevel="module"
+                                            [contextInstanceId]="event.id" [courseId]="event.course && event.course.id">
+                                        </core-format-text>
+                                    </span>
                                     <ion-badge *ngIf="event.overdue" color="danger">{{ 'addon.block_timeline.overdue' | translate }}
                                     </ion-badge>
                                 </p>
diff --git a/src/addons/block/timeline/components/events/events.scss b/src/addons/block/timeline/components/events/events.scss
index 5c4aad112..48a4663f7 100644
--- a/src/addons/block/timeline/components/events/events.scss
+++ b/src/addons/block/timeline/components/events/events.scss
@@ -31,6 +31,15 @@ h4.core-bold {
     justify-content: flex-end;
 }
 
+.addon-block-timeline-activity-name-with-status {
+    display: flex;
+    flex-wrap: wrap;
+    span {
+        overflow: hidden;
+        text-overflow: ellipsis;
+    }
+}
+
 .addon-block-timeline-activity-course-activity {
     display: flex;
     flex-wrap: wrap;
diff --git a/src/core/components/mod-icon/mod-icon.scss b/src/core/components/mod-icon/mod-icon.scss
index 7cac89699..23ae48ea3 100644
--- a/src/core/components/mod-icon/mod-icon.scss
+++ b/src/core/components/mod-icon/mod-icon.scss
@@ -31,6 +31,8 @@ img {
     height: var(--size);
     max-width: var(--size);
     max-height: var(--size);
+    min-width: var(--size);
+    min-height: var(--size);
     vertical-align: top;
 
     &[alt] {

From 7f3ecdc21ba809b79baf279552a63961d320bdca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 21 Jan 2022 16:00:54 +0100
Subject: [PATCH 0387/1008] MOBILE-3814 user: Change user account string

---
 scripts/langindex.json                                          | 2 +-
 .../mainmenu/components/user-menu-button/user-menu-button.html  | 2 +-
 src/core/features/mainmenu/components/user-menu/user-menu.html  | 2 +-
 src/core/features/user/lang.json                                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 694fff759..0e36b6e0c 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -2274,7 +2274,6 @@
   "core.updaterequireddesc": "local_moodlemobileapp",
   "core.upgraderunning": "error",
   "core.user": "moodle",
-  "core.user.account": "local_moodlemobileapp",
   "core.user.address": "moodle",
   "core.user.city": "moodle",
   "core.user.contact": "local_moodlemobileapp",
@@ -2300,6 +2299,7 @@
   "core.user.sendemail": "local_moodlemobileapp",
   "core.user.student": "moodle/defaultcoursestudent",
   "core.user.teacher": "moodle/noneditingteacher",
+  "core.user.useraccount": "moodle",
   "core.user.userwithid": "local_moodlemobileapp",
   "core.user.webpage": "moodle",
   "core.userdeleted": "moodle",
diff --git a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.html b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.html
index 998f7e7c0..187ad5ef7 100644
--- a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.html
+++ b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.html
@@ -1,3 +1,3 @@
 <core-user-avatar *ngIf="isMainScreen && siteInfo" [user]="siteInfo" class="core-bar-button-image clickable" [linkProfile]="false"
-    (ariaButtonClick)="openUserMenu($event)" role="button" tabindex="0" [attr.aria-label]="'core.user.account' | translate">
+    (ariaButtonClick)="openUserMenu($event)" role="button" tabindex="0" [attr.aria-label]="'core.user.useraccount' | translate">
 </core-user-avatar>
diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.html b/src/core/features/mainmenu/components/user-menu/user-menu.html
index 5b9b777b3..bb4dab87c 100644
--- a/src/core/features/mainmenu/components/user-menu/user-menu.html
+++ b/src/core/features/mainmenu/components/user-menu/user-menu.html
@@ -2,7 +2,7 @@
     <ion-toolbar>
         <ion-title>
             <h2>
-                {{'core.user.account' | translate}}
+                {{'core.user.useraccount' | translate}}
             </h2>
         </ion-title>
         <ion-buttons slot="end">
diff --git a/src/core/features/user/lang.json b/src/core/features/user/lang.json
index 61d41e287..978102d21 100644
--- a/src/core/features/user/lang.json
+++ b/src/core/features/user/lang.json
@@ -1,6 +1,6 @@
 {
     "address": "Address",
-    "account": "Account",
+    "useraccount": "User account",
     "city": "City/town",
     "contact": "Contact",
     "country": "Country",

From 6041ec01374f45237e70b3c8ce7111cc1fd8555c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 21 Jan 2022 16:07:16 +0100
Subject: [PATCH 0388/1008] MOBILE-3814 course: Change contents tab string

---
 scripts/langindex.json                                 | 1 -
 src/core/features/course/lang.json                     | 1 -
 src/core/features/course/pages/contents/contents.ts    | 2 +-
 src/core/features/course/pages/index/index.page.ts     | 2 +-
 src/core/features/course/pages/preview/preview.html    | 9 ++++-----
 src/core/features/course/pages/preview/preview.page.ts | 5 +----
 6 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 0e36b6e0c..79ac9b310 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1515,7 +1515,6 @@
   "core.course.confirmdownloadzerosize": "local_moodlemobileapp",
   "core.course.confirmlimiteddownload": "local_moodlemobileapp",
   "core.course.confirmpartialdownloadsize": "local_moodlemobileapp",
-  "core.course.contents": "local_moodlemobileapp",
   "core.course.couldnotloadsectioncontent": "local_moodlemobileapp",
   "core.course.couldnotloadsections": "local_moodlemobileapp",
   "core.course.coursesummary": "moodle",
diff --git a/src/core/features/course/lang.json b/src/core/features/course/lang.json
index bba7ba758..f6f144b2d 100644
--- a/src/core/features/course/lang.json
+++ b/src/core/features/course/lang.json
@@ -26,7 +26,6 @@
     "confirmdownloadzerosize": "You are about to start downloading.{{availableSpace}} Are you sure you want to continue?",
     "confirmpartialdownloadsize": "You are about to download <strong>at least</strong> {{size}}.{{availableSpace}} Are you sure you want to continue?",
     "confirmlimiteddownload": "You are not currently connected to Wi-Fi. ",
-    "contents": "Contents",
     "gotonextactivity": "Continue to next activity",
     "gotonextactivitynotfound": "Next activity not found. It's possible that it has been hidden or deleted.",
     "gotopreviousactivity": "Continue to previous activity",
diff --git a/src/core/features/course/pages/contents/contents.ts b/src/core/features/course/pages/contents/contents.ts
index 43bbcfb2d..a4de288f3 100644
--- a/src/core/features/course/pages/contents/contents.ts
+++ b/src/core/features/course/pages/contents/contents.ts
@@ -385,7 +385,7 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
     openCourseSummary(): void {
         CoreNavigator.navigateToSitePath(
             '/course/' + this.course.id + '/preview',
-            { params: { course: this.course, avoidOpenCourse: true } },
+            { params: { course: this.course } },
         );
     }
 
diff --git a/src/core/features/course/pages/index/index.page.ts b/src/core/features/course/pages/index/index.page.ts
index 68ae06832..096de4843 100644
--- a/src/core/features/course/pages/index/index.page.ts
+++ b/src/core/features/course/pages/index/index.page.ts
@@ -51,7 +51,7 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
     protected isGuest?: boolean;
     protected contentsTab: CoreTabsOutletTab = {
         page: CONTENTS_PAGE_NAME,
-        title: 'core.course.contents',
+        title: 'core.course',
         pageParams: {},
     };
 
diff --git a/src/core/features/course/pages/preview/preview.html b/src/core/features/course/pages/preview/preview.html
index 92b3ff1eb..4969b265b 100644
--- a/src/core/features/course/pages/preview/preview.html
+++ b/src/core/features/course/pages/preview/preview.html
@@ -21,8 +21,8 @@
             </div>
         </div>
         <div class="core-course-thumb-parallax-content" *ngIf="course">
-            <ion-item class="ion-text-wrap" (click)="openCourse()" [attr.aria-label]="course.fullname"
-                [detail]="!avoidOpenCourse && canAccessCourse" [button]="!avoidOpenCourse && canAccessCourse">
+            <ion-item class="ion-text-wrap" (click)="openCourse()" [attr.aria-label]="course.fullname" [detail]="canAccessCourse"
+                [button]="canAccessCourse">
                 <ion-icon name="fas-graduation-cap" fixed-width slot="start" aria-hidden="true"></ion-icon>
                 <ion-label>
                     <h2>
@@ -121,11 +121,10 @@
                     <h2 *ngIf="prefetchCourseData.status == statusDownloaded">{{ 'core.course.refreshcourse' | translate }}</h2>
                 </ion-label>
             </ion-item>
-            <ion-item button (click)="openCourse()" [attr.aria-label]="course.fullname" *ngIf="!avoidOpenCourse && canAccessCourse"
-                detail="true">
+            <ion-item button (click)="openCourse()" [attr.aria-label]="course.fullname" *ngIf="canAccessCourse" detail="true">
                 <ion-icon name="fas-briefcase" slot="start" aria-hidden="true"></ion-icon>
                 <ion-label>
-                    <h2>{{ 'core.course.contents' | translate }}</h2>
+                    <h2>{{ 'core.course' | translate }}</h2>
                 </ion-label>
             </ion-item>
             <ion-item [href]="courseUrl" core-link [attr.aria-label]="course.fullname" button detail="false" [showBrowserWarning]="false">
diff --git a/src/core/features/course/pages/preview/preview.page.ts b/src/core/features/course/pages/preview/preview.page.ts
index 65fd8e105..923eb7109 100644
--- a/src/core/features/course/pages/preview/preview.page.ts
+++ b/src/core/features/course/pages/preview/preview.page.ts
@@ -51,7 +51,6 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
     selfEnrolInstances: CoreCourseEnrolmentMethod[] = [];
     paypalEnabled = false;
     dataLoaded = false;
-    avoidOpenCourse = false;
     prefetchCourseData: CorePrefetchStatusInfo = {
         icon: '',
         statusTranslatable: 'core.loading',
@@ -97,7 +96,6 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
      */
     async ngOnInit(): Promise<void> {
         this.course = CoreNavigator.getRouteParam('course');
-        this.avoidOpenCourse = !!CoreNavigator.getRouteBooleanParam('avoidOpenCourse');
 
         if (!this.course) {
             CoreNavigator.back();
@@ -238,8 +236,7 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
      * Open the course.
      */
     openCourse(): void {
-        if (!this.canAccessCourse || this.avoidOpenCourse) {
-            // Course cannot be opened or we are avoiding opening because we accessed from inside a course.
+        if (!this.canAccessCourse) {
             return;
         }
 

From 86d4dd5afc58c6291f6d4af2309338afae03a2d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 21 Jan 2022 16:16:44 +0100
Subject: [PATCH 0389/1008] MOBILE-3814 about: Move device info to the footer

---
 src/core/features/settings/pages/about/about.html | 15 +++++++++------
 src/core/features/settings/pages/about/about.scss |  3 +++
 src/core/features/settings/pages/about/about.ts   |  1 +
 3 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 src/core/features/settings/pages/about/about.scss

diff --git a/src/core/features/settings/pages/about/about.html b/src/core/features/settings/pages/about/about.html
index 061f88ec3..04d5a5971 100644
--- a/src/core/features/settings/pages/about/about.html
+++ b/src/core/features/settings/pages/about/about.html
@@ -13,12 +13,6 @@
 
 <ion-content>
     <ion-list>
-        <ion-item button class="ion-text-wrap" detail="false" (click)="openPage('deviceinfo')">
-            <ion-icon name="fas-mobile" slot="start" aria-hidden="true"></ion-icon>
-            <ion-label>
-                <h2>{{ appName }} {{ versionName }}</h2>
-            </ion-label>
-        </ion-item>
         <ion-item button class="ion-text-wrap" (click)="openPage('licenses')" detail="true">
             <ion-icon name="far-copyright" slot="start" aria-hidden="true"></ion-icon>
             <ion-label>{{ 'core.settings.opensourcelicenses' | translate }}</ion-label>
@@ -40,3 +34,12 @@
         </ion-item>
     </ion-list>
 </ion-content>
+
+<ion-footer class="ion-no-border">
+    <ion-item button class="ion-text-wrap ion-text-center core-about-deviceinfo" detail="false" (click)="openPage('deviceinfo')"
+        lines="none">
+        <ion-label>
+            <h2>{{ appName }} {{ versionName }}</h2>
+        </ion-label>
+    </ion-item>
+</ion-footer>
diff --git a/src/core/features/settings/pages/about/about.scss b/src/core/features/settings/pages/about/about.scss
new file mode 100644
index 000000000..d49c44f45
--- /dev/null
+++ b/src/core/features/settings/pages/about/about.scss
@@ -0,0 +1,3 @@
+.core-about-deviceinfo {
+    --background: transparent;
+}
diff --git a/src/core/features/settings/pages/about/about.ts b/src/core/features/settings/pages/about/about.ts
index 9135a6316..256cf5fe6 100644
--- a/src/core/features/settings/pages/about/about.ts
+++ b/src/core/features/settings/pages/about/about.ts
@@ -24,6 +24,7 @@ import { CoreNavigator } from '@services/navigator';
 @Component({
     selector: 'page-core-app-settings-about',
     templateUrl: 'about.html',
+    styleUrls: ['about.scss'],
 })
 export class CoreSettingsAboutPage {
 

From 07df82153adc9cc9036334f9c7312c8c499daec9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 21 Jan 2022 17:03:12 +0100
Subject: [PATCH 0390/1008] MOBILE-3814 my: Add site name to my courses page

---
 src/core/features/courses/pages/my/my.html    |  8 +++++++-
 src/core/features/courses/pages/my/my.ts      | 13 ++++++++++++-
 src/core/features/mainmenu/pages/home/home.ts |  4 ++--
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/core/features/courses/pages/my/my.html b/src/core/features/courses/pages/my/my.html
index bdd93c60b..5ac663842 100644
--- a/src/core/features/courses/pages/my/my.html
+++ b/src/core/features/courses/pages/my/my.html
@@ -4,7 +4,10 @@
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
         <ion-title>
-            <h1>{{ 'core.courses.mycourses' | translate }}</h1>
+            <h1>
+                <core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="0"></core-format-text>
+                <img src="assets/img/top_logo.png" class="core-header-logo" [alt]="siteName">
+            </h1>
         </ion-title>
         <ion-buttons slot="end">
             <ion-button *ngIf="searchEnabled" (click)="openSearch()" [attr.aria-label]="'core.courses.searchcourses' | translate">
@@ -30,6 +33,9 @@
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
     <core-loading [hideUntil]="loaded">
+        <div class="ion-padding-horizontal">
+            <h2>{{ 'core.courses.mycourses' | translate }}</h2>
+        </div>
         <ion-list>
             <core-block *ngIf="loadedBlock?.visible" [block]="loadedBlock" contextLevel="user" [instanceId]="userId"
                 [extraData]="{'downloadEnabled': true}"></core-block>
diff --git a/src/core/features/courses/pages/my/my.ts b/src/core/features/courses/pages/my/my.ts
index 45365fd23..4e3b5e6f9 100644
--- a/src/core/features/courses/pages/my/my.ts
+++ b/src/core/features/courses/pages/my/my.ts
@@ -36,6 +36,7 @@ export class CoreCoursesMyCoursesPage implements OnInit, OnDestroy {
 
     @ViewChild(CoreBlockComponent) block!: CoreBlockComponent;
 
+    siteName = '';
     searchEnabled = false;
     downloadCoursesEnabled = false;
     userId: number;
@@ -50,6 +51,8 @@ export class CoreCoursesMyCoursesPage implements OnInit, OnDestroy {
         this.updateSiteObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, () => {
             this.searchEnabled = !CoreCourses.isSearchCoursesDisabledInSite();
             this.downloadCoursesEnabled = !CoreCourses.isDownloadCoursesDisabledInSite();
+            this.loadSiteName();
+
         }, CoreSites.getCurrentSiteId());
 
         this.userId = CoreSites.getCurrentSiteUserId();
@@ -62,8 +65,9 @@ export class CoreCoursesMyCoursesPage implements OnInit, OnDestroy {
         this.searchEnabled = !CoreCourses.isSearchCoursesDisabledInSite();
         this.downloadCoursesEnabled = !CoreCourses.isDownloadCoursesDisabledInSite();
 
-        this.loadContent();
+        this.loadSiteName();
 
+        this.loadContent();
     }
 
     /**
@@ -97,6 +101,13 @@ export class CoreCoursesMyCoursesPage implements OnInit, OnDestroy {
         this.loaded = true;
     }
 
+    /**
+     * Load the site name.
+     */
+    protected loadSiteName(): void {
+        this.siteName = CoreSites.getRequiredCurrentSite().getSiteName() || '';
+    }
+
     /**
      * Load fallback blocks.
      */
diff --git a/src/core/features/mainmenu/pages/home/home.ts b/src/core/features/mainmenu/pages/home/home.ts
index b5d9499a9..2db2c4811 100644
--- a/src/core/features/mainmenu/pages/home/home.ts
+++ b/src/core/features/mainmenu/pages/home/home.ts
@@ -55,7 +55,7 @@ export class CoreMainMenuHomePage implements OnInit {
     }
 
     /**
-     * Initialize the component.
+     * @inheritdoc
      */
     ngOnInit(): void {
         this.route.queryParams.subscribe((params: Partial<CoreRedirectPayload> & { urlToOpen?: string }) => {
@@ -121,7 +121,7 @@ export class CoreMainMenuHomePage implements OnInit {
      * Load the site name.
      */
     protected loadSiteName(): void {
-        this.siteName = CoreSites.getCurrentSite()?.getSiteName() || '';
+        this.siteName = CoreSites.getRequiredCurrentSite().getSiteName() || '';
     }
 
     /**

From 55a46f20c675d2c190b7347022a3f1f90c070fbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 21 Jan 2022 17:17:51 +0100
Subject: [PATCH 0391/1008] MOBILE-3814 user: Add site logo to user account
 menu

---
 .../components/user-menu/user-menu.html       |  3 ++
 .../components/user-menu/user-menu.scss       | 18 ++++++++-
 .../components/user-menu/user-menu.ts         | 37 ++++++++++++++++---
 src/theme/theme.light.scss                    |  2 +
 4 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.html b/src/core/features/mainmenu/components/user-menu/user-menu.html
index bb4dab87c..b24ab93c7 100644
--- a/src/core/features/mainmenu/components/user-menu/user-menu.html
+++ b/src/core/features/mainmenu/components/user-menu/user-menu.html
@@ -17,6 +17,9 @@
         <ion-item button class="core-usermenu-siteinfo ion-text-wrap" *ngIf="siteInfo" lines="full" detail="false" [href]="siteUrl"
             core-link auto-login="yes">
             <ion-label>
+                <!-- Show site logo. -->
+                <img class="core-usermenu-site-logo" *ngIf="siteLogo && siteLogoLoaded" [src]="siteLogo" role="presentation" alt=""
+                    onError="this.class='image-not-found'">
                 <p class="core-usermenu-sitename">
                     <core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="0" [wsNotFiltered]="true">
                     </core-format-text>
diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.scss b/src/core/features/mainmenu/components/user-menu/user-menu.scss
index 924139eef..a42d797cd 100644
--- a/src/core/features/mainmenu/components/user-menu/user-menu.scss
+++ b/src/core/features/mainmenu/components/user-menu/user-menu.scss
@@ -8,6 +8,10 @@
 }
 
 .core-usermenu-siteinfo {
+    text-align: center;
+    ion-label {
+        margin: 0;
+    }
     --padding-top: 10px;
     --padding-bottom: 10px;
 }
@@ -19,9 +23,21 @@
 }
 
 .core-usermenu-sitename {
-    font-size: 16px;
+    font-weight: bold;
+    font-size: 20px;
+    line-height: 24px;
 }
 
+img.core-usermenu-site-logo {
+    margin-bottom: 8px;
+    max-height: var(--core-user-menu-site-logo-max-height);
+}
+
+img.image-not-found {
+    display: none;
+}
+
+
 @if ($core-user-hide-sitename) {
     .core-usermenu-sitename {
         display: none;
diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.ts b/src/core/features/mainmenu/components/user-menu/user-menu.ts
index 1ec0e39ad..2ac460e3e 100644
--- a/src/core/features/mainmenu/components/user-menu/user-menu.ts
+++ b/src/core/features/mainmenu/components/user-menu/user-menu.ts
@@ -12,8 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { CoreConstants } from '@/core/constants';
 import { Component, OnDestroy, OnInit } from '@angular/core';
-import { CoreSiteInfo } from '@classes/site';
+import { CoreSite, CoreSiteInfo } from '@classes/site';
 import { CoreLoginSitesComponent } from '@features/login/components/sites/sites';
 import { CoreLoginHelper } from '@features/login/services/login-helper';
 import { CoreUser, CoreUserProfile } from '@features/user/services/user';
@@ -36,12 +37,13 @@ export class CoreMainMenuUserMenuComponent implements OnInit, OnDestroy {
 
     siteInfo?: CoreSiteInfo;
     siteName?: string;
+    siteLogo?: string;
+    siteLogoLoaded = false;
     siteUrl?: string;
     handlers: CoreUserProfileHandlerData[] = [];
     handlersLoaded = false;
     loaded = false;
     user?: CoreUserProfile;
-    moreSites = false;
 
     protected subscription!: Subscription;
 
@@ -49,10 +51,6 @@ export class CoreMainMenuUserMenuComponent implements OnInit, OnDestroy {
      * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
-        // Check if there are more sites to switch.
-        const sites = await CoreSites.getSites();
-        this.moreSites = sites.length > 1;
-
         const currentSite = CoreSites.getRequiredCurrentSite();
         this.siteInfo = currentSite.getInfo();
         this.siteName = currentSite.getSiteName();
@@ -60,6 +58,8 @@ export class CoreMainMenuUserMenuComponent implements OnInit, OnDestroy {
 
         this.loaded = true;
 
+        this.loadSiteLogo(currentSite);
+
         // Load the handlers.
         if (this.siteInfo) {
             this.user = await CoreUser.getProfile(this.siteInfo.userid);
@@ -82,6 +82,31 @@ export class CoreMainMenuUserMenuComponent implements OnInit, OnDestroy {
         }
     }
 
+    /**
+     * Load site logo from current site public config.
+     *
+     * @param currentSite Current site object.
+     * @return Promise resolved when done.
+     */
+    protected async loadSiteLogo(currentSite: CoreSite): Promise<void> {
+        if (CoreConstants.CONFIG.forceLoginLogo) {
+            this.siteLogo = 'assets/img/login_logo.png';
+            this.siteLogoLoaded = true;
+
+            return;
+        }
+
+        try {
+            const siteConfig = await currentSite.getPublicConfig();
+
+            this.siteLogo = CoreLoginHelper.getLogoUrl(siteConfig);
+        } catch {
+            // Ignore errors.
+        } finally {
+            this.siteLogoLoaded = true;
+        }
+    }
+
     /**
      * Opens User profile page.
      *
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 908669935..93f62f078 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -264,6 +264,8 @@
     --core-course-module-navigation-max-height: 56px;
     --core-course-module-navigation-background: var(--contrast-background);
 
+    --core-user-menu-site-logo-max-height: 32px;
+
     --addon-calendar-event-category-color: var(--purple);
     --addon-calendar-event-course-color: var(--red);
     --addon-calendar-event-group-color: var(--yellow);

From a51e722e7467c45512e714f9cfd90f59528f0f34 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 20 Jan 2022 12:02:06 +0100
Subject: [PATCH 0392/1008] MOBILE-3966 notes: Fix disable notes feature in
 user profile

---
 src/core/services/utils/text.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/core/services/utils/text.ts b/src/core/services/utils/text.ts
index c227c1279..62df1a889 100644
--- a/src/core/services/utils/text.ts
+++ b/src/core/services/utils/text.ts
@@ -89,6 +89,7 @@ export class CoreTextUtilsProvider {
         { old: /_mmaModWiki/g, new: '_AddonModWiki' },
         { old: /_mmaModWorkshop/g, new: '_AddonModWorkshop' },
         { old: /remoteAddOn_/g, new: 'sitePlugin_' },
+        { old: /AddonNotes:addNote/g, new: 'AddonNotes:notes' },
     ];
 
     protected template: HTMLTemplateElement = document.createElement('template'); // A template element to convert HTML to element.

From 101faf20aaec071953ac2ae7b186bdaf703276cd Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 21 Jan 2022 12:58:11 +0100
Subject: [PATCH 0393/1008] MOBILE-3966 user: Use context+contextId in user
 delegate

---
 src/addons/badges/services/handlers/user.ts   |  28 +--
 src/addons/blog/services/handlers/user.ts     |   4 +-
 .../competency/services/handlers/user.ts      |  43 ++--
 .../services/handlers/user.ts                 |  21 +-
 .../services/handlers/user-send-message.ts    |  11 +-
 src/addons/notes/services/handlers/user.ts    |  17 +-
 .../privatefiles/services/handlers/user.ts    |  13 +-
 .../features/grades/services/handlers/user.ts |  19 +-
 .../components/user-menu/user-menu.ts         |  34 +--
 .../classes/handlers/user-handler.ts          |  18 +-
 .../user/pages/profile/profile.page.ts        |  16 +-
 .../user/services/handlers/profile-mail.ts    |   2 +-
 .../features/user/services/user-delegate.ts   | 232 ++++++++++++------
 upgrade.txt                                   |   4 +
 14 files changed, 284 insertions(+), 178 deletions(-)

diff --git a/src/addons/badges/services/handlers/user.ts b/src/addons/badges/services/handlers/user.ts
index 5e3a5bc44..a15acfed3 100644
--- a/src/addons/badges/services/handlers/user.ts
+++ b/src/addons/badges/services/handlers/user.ts
@@ -14,7 +14,12 @@
 
 import { Injectable } from '@angular/core';
 import { CoreCourseUserAdminOrNavOptionIndexed } from '@features/courses/services/courses';
-import { CoreUserDelegateService, CoreUserProfileHandler, CoreUserProfileHandlerData } from '@features/user/services/user-delegate';
+import {
+    CoreUserDelegateContext,
+    CoreUserDelegateService,
+    CoreUserProfileHandler,
+    CoreUserProfileHandlerData,
+} from '@features/user/services/user-delegate';
 import { CoreNavigator } from '@services/navigator';
 import { makeSingleton } from '@singletons';
 import { AddonBadges } from '../badges';
@@ -30,22 +35,17 @@ export class AddonBadgesUserHandlerService implements CoreUserProfileHandler {
     type = CoreUserDelegateService.TYPE_NEW_PAGE;
 
     /**
-     * Check if handler is enabled.
-     *
-     * @return Always enabled.
+     * @inheritdoc
      */
     isEnabled(): Promise<boolean> {
         return AddonBadges.isPluginEnabled();
     }
 
     /**
-     * Check if handler is enabled for this user in this context.
-     *
-     * @param courseId Course ID.
-     * @param navOptions Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
-     * @return True if enabled, false otherwise.
+     * @inheritdoc
      */
-    async isEnabledForCourse(
+    async isEnabledForContext(
+        context: CoreUserDelegateContext,
         courseId: number,
         navOptions?: CoreCourseUserAdminOrNavOptionIndexed,
     ): Promise<boolean> {
@@ -58,19 +58,17 @@ export class AddonBadgesUserHandlerService implements CoreUserProfileHandler {
     }
 
     /**
-     * Returns the data needed to render the handler.
-     *
-     * @return Data needed to render the handler.
+     * @inheritdoc
      */
     getDisplayData(): CoreUserProfileHandlerData {
         return {
             icon: 'fas-trophy',
             title: 'addon.badges.badges',
-            action: (event, user, courseId): void => {
+            action: (event, user, context, contextId): void => {
                 event.preventDefault();
                 event.stopPropagation();
                 CoreNavigator.navigateToSitePath('/badges', {
-                    params: { courseId, userId: user.id },
+                    params: { courseId: contextId, userId: user.id },
                 });
             },
         };
diff --git a/src/addons/blog/services/handlers/user.ts b/src/addons/blog/services/handlers/user.ts
index 5c6d08726..566b361bf 100644
--- a/src/addons/blog/services/handlers/user.ts
+++ b/src/addons/blog/services/handlers/user.ts
@@ -43,11 +43,11 @@ export class AddonBlogUserHandlerService implements CoreUserProfileHandler {
             icon: 'far-newspaper',
             title: 'addon.blog.blogentries',
             class: 'addon-blog-handler',
-            action: (event, user, courseId): void => {
+            action: (event, user, context, contextId): void => {
                 event.preventDefault();
                 event.stopPropagation();
                 CoreNavigator.navigateToSitePath('/blog', {
-                    params: { courseId, userId: user.id },
+                    params: { courseId: contextId, userId: user.id },
                 });
             },
         };
diff --git a/src/addons/competency/services/handlers/user.ts b/src/addons/competency/services/handlers/user.ts
index 2bd346028..9f8b28379 100644
--- a/src/addons/competency/services/handlers/user.ts
+++ b/src/addons/competency/services/handlers/user.ts
@@ -16,7 +16,12 @@ import { ADDON_COMPETENCY_COMPETENCIES_PAGE, ADDON_COMPETENCY_LEARNING_PLANS_PAG
 import { Injectable } from '@angular/core';
 import { COURSE_PAGE_NAME } from '@features/course/course.module';
 import { CoreUserProfile } from '@features/user/services/user';
-import { CoreUserProfileHandler, CoreUserDelegateService, CoreUserProfileHandlerData } from '@features/user/services/user-delegate';
+import {
+    CoreUserProfileHandler,
+    CoreUserDelegateService,
+    CoreUserProfileHandlerData,
+    CoreUserDelegateContext,
+} from '@features/user/services/user-delegate';
 import { PARTICIPANTS_PAGE_NAME } from '@features/user/user.module';
 import { CoreNavigator } from '@services/navigator';
 import { makeSingleton } from '@singletons';
@@ -43,10 +48,10 @@ export class AddonCompetencyUserHandlerService implements CoreUserProfileHandler
     /**
      * @inheritdoc
      */
-    async isEnabledForUser(user: CoreUserProfile, courseId?: number): Promise<boolean> {
+    async isEnabledForUser(user: CoreUserProfile, context: CoreUserDelegateContext, contextId: number): Promise<boolean> {
         try {
-            if (courseId) {
-                return AddonCompetency.canViewUserCompetenciesInCourse(courseId, user.id);
+            if (context === CoreUserDelegateContext.COURSE) {
+                return await AddonCompetency.canViewUserCompetenciesInCourse(contextId, user.id);
             } else {
                 const plans = await AddonCompetency.getLearningPlans(user.id);
 
@@ -61,21 +66,8 @@ export class AddonCompetencyUserHandlerService implements CoreUserProfileHandler
     /**
      * @inheritdoc
      */
-    getDisplayData(user: CoreUserProfile, courseId: number): CoreUserProfileHandlerData {
-        if (courseId) {
-            return {
-                icon: 'fas-award',
-                title: 'addon.competency.competencies',
-                class: 'addon-competency-handler',
-                action: (event, user, courseId): void => {
-                    event.preventDefault();
-                    event.stopPropagation();
-                    CoreNavigator.navigateToSitePath(
-                        [COURSE_PAGE_NAME, courseId, PARTICIPANTS_PAGE_NAME, user.id, ADDON_COMPETENCY_COMPETENCIES_PAGE].join('/'),
-                    );
-                },
-            };
-        } else {
+    getDisplayData(user: CoreUserProfile, context: CoreUserDelegateContext): CoreUserProfileHandlerData {
+        if (context !== CoreUserDelegateContext.COURSE) {
             return {
                 icon: 'fas-route',
                 title: 'addon.competency.learningplans',
@@ -89,6 +81,19 @@ export class AddonCompetencyUserHandlerService implements CoreUserProfileHandler
                 },
             };
         }
+
+        return {
+            icon: 'fas-award',
+            title: 'addon.competency.competencies',
+            class: 'addon-competency-handler',
+            action: (event, user, context, contextId): void => {
+                event.preventDefault();
+                event.stopPropagation();
+                CoreNavigator.navigateToSitePath(
+                    [COURSE_PAGE_NAME, contextId, PARTICIPANTS_PAGE_NAME, user.id, ADDON_COMPETENCY_COMPETENCIES_PAGE].join('/'),
+                );
+            },
+        };
     }
 
 }
diff --git a/src/addons/coursecompletion/services/handlers/user.ts b/src/addons/coursecompletion/services/handlers/user.ts
index 172073c60..69f47f71f 100644
--- a/src/addons/coursecompletion/services/handlers/user.ts
+++ b/src/addons/coursecompletion/services/handlers/user.ts
@@ -14,7 +14,12 @@
 
 import { Injectable } from '@angular/core';
 import { CoreUserProfile } from '@features/user/services/user';
-import { CoreUserProfileHandler, CoreUserDelegateService, CoreUserProfileHandlerData } from '@features/user/services/user-delegate';
+import {
+    CoreUserProfileHandler,
+    CoreUserDelegateService,
+    CoreUserProfileHandlerData,
+    CoreUserDelegateContext,
+} from '@features/user/services/user-delegate';
 import { CoreNavigator } from '@services/navigator';
 import { makeSingleton } from '@singletons';
 import { AddonCourseCompletion } from '../coursecompletion';
@@ -40,15 +45,19 @@ export class AddonCourseCompletionUserHandlerService implements CoreUserProfileH
     /**
      * @inheritdoc
      */
-    async isEnabledForCourse(courseId?: number): Promise<boolean> {
+    async isEnabledForContext(context: CoreUserDelegateContext, courseId: number): Promise<boolean> {
+        if (context !== CoreUserDelegateContext.COURSE) {
+            return false;
+        }
+
         return AddonCourseCompletion.isPluginViewEnabledForCourse(courseId);
     }
 
     /**
      * @inheritdoc
      */
-    async isEnabledForUser(user: CoreUserProfile, courseId?: number): Promise<boolean> {
-        return await AddonCourseCompletion.isPluginViewEnabledForUser(courseId!, user.id);
+    async isEnabledForUser(user: CoreUserProfile, context: CoreUserDelegateContext,  contextId: number): Promise<boolean> {
+        return await AddonCourseCompletion.isPluginViewEnabledForUser(contextId, user.id);
     }
 
     /**
@@ -59,11 +68,11 @@ export class AddonCourseCompletionUserHandlerService implements CoreUserProfileH
             icon: 'fas-tasks',
             title: 'addon.coursecompletion.coursecompletion',
             class: 'addon-coursecompletion-handler',
-            action: (event, user, courseId): void => {
+            action: (event, user, context, contextId): void => {
                 event.preventDefault();
                 event.stopPropagation();
                 CoreNavigator.navigateToSitePath('/coursecompletion', {
-                    params: { courseId, userId: user.id },
+                    params: { courseId: contextId, userId: user.id },
                 });
             },
         };
diff --git a/src/addons/messages/services/handlers/user-send-message.ts b/src/addons/messages/services/handlers/user-send-message.ts
index 6afaa6080..0e9d12f8d 100644
--- a/src/addons/messages/services/handlers/user-send-message.ts
+++ b/src/addons/messages/services/handlers/user-send-message.ts
@@ -32,9 +32,7 @@ export class AddonMessagesSendMessageUserHandlerService implements CoreUserProfi
     type = CoreUserDelegateService.TYPE_COMMUNICATION;
 
     /**
-     * Check if handler is enabled.
-     *
-     * @return Promise resolved with true if enabled, rejected or resolved with false otherwise.
+     * @inheritdoc
      */
     isEnabled(): Promise<boolean> {
         return AddonMessages.isPluginEnabled();
@@ -43,15 +41,12 @@ export class AddonMessagesSendMessageUserHandlerService implements CoreUserProfi
     /**
      * @inheritdoc
      */
-    async isEnabledForCourse(): Promise<boolean> {
+    async isEnabledForContext(): Promise<boolean> {
         return !!CoreSites.getCurrentSite();
     }
 
     /**
-     * Check if handler is enabled for this user in this context.
-     *
-     * @param user User to check.
-     * @return Promise resolved with true if enabled, resolved with false otherwise.
+     * @inheritdoc
      */
     async isEnabledForUser(user: CoreUserProfile): Promise<boolean> {
         const currentSite = CoreSites.getRequiredCurrentSite();
diff --git a/src/addons/notes/services/handlers/user.ts b/src/addons/notes/services/handlers/user.ts
index f0dc13001..4bad2ad6e 100644
--- a/src/addons/notes/services/handlers/user.ts
+++ b/src/addons/notes/services/handlers/user.ts
@@ -14,7 +14,12 @@
 
 import { Injectable } from '@angular/core';
 import { CoreUserProfile } from '@features/user/services/user';
-import { CoreUserProfileHandler, CoreUserDelegateService, CoreUserProfileHandlerData } from '@features/user/services/user-delegate';
+import {
+    CoreUserProfileHandler,
+    CoreUserDelegateService,
+    CoreUserProfileHandlerData,
+    CoreUserDelegateContext,
+} from '@features/user/services/user-delegate';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
 import { makeSingleton } from '@singletons';
@@ -41,14 +46,14 @@ export class AddonNotesUserHandlerService implements CoreUserProfileHandler {
     /**
      * @inheritdoc
      */
-    async isEnabledForUser(user: CoreUserProfile, courseId?: number): Promise<boolean> {
+    async isEnabledForUser(user: CoreUserProfile, context: CoreUserDelegateContext, contextId: number): Promise<boolean> {
         // Active course required.
-        if (!courseId || user.id == CoreSites.getCurrentSiteUserId()) {
+        if (context !== CoreUserDelegateContext.COURSE || !contextId || user.id == CoreSites.getCurrentSiteUserId()) {
             return false;
         }
 
         // We are not using isEnabledForCourse because we need to cache the call.
-        return AddonNotes.isPluginViewNotesEnabledForCourse(courseId);
+        return AddonNotes.isPluginViewNotesEnabledForCourse(contextId);
     }
 
     /**
@@ -59,11 +64,11 @@ export class AddonNotesUserHandlerService implements CoreUserProfileHandler {
             icon: 'fas-receipt',
             title: 'addon.notes.notes',
             class: 'addon-notes-handler',
-            action: (event, user, courseId): void => {
+            action: (event, user, context, contextId): void => {
                 event.preventDefault();
                 event.stopPropagation();
                 CoreNavigator.navigateToSitePath('/notes', {
-                    params: { courseId, userId: user.id },
+                    params: { courseId: contextId, userId: user.id },
                 });
             },
         };
diff --git a/src/addons/privatefiles/services/handlers/user.ts b/src/addons/privatefiles/services/handlers/user.ts
index 4672385b3..f35aba520 100644
--- a/src/addons/privatefiles/services/handlers/user.ts
+++ b/src/addons/privatefiles/services/handlers/user.ts
@@ -16,7 +16,12 @@ import { Injectable } from '@angular/core';
 
 import { AddonPrivateFiles } from '@/addons/privatefiles/services/privatefiles';
 import { makeSingleton } from '@singletons';
-import { CoreUserDelegateService, CoreUserProfileHandler, CoreUserProfileHandlerData } from '@features/user/services/user-delegate';
+import {
+    CoreUserDelegateContext,
+    CoreUserDelegateService,
+    CoreUserProfileHandler,
+    CoreUserProfileHandlerData,
+} from '@features/user/services/user-delegate';
 import { CoreUserProfile } from '@features/user/services/user';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
@@ -44,9 +49,9 @@ export class AddonPrivateFilesUserHandlerService implements CoreUserProfileHandl
     /**
      * @inheritdoc
      */
-    async isEnabledForUser(user: CoreUserProfile): Promise<boolean> {
-        // Private files only available for the current user.
-        return user.id == CoreSites.getCurrentSiteUserId();
+    async isEnabledForUser(user: CoreUserProfile, context: CoreUserDelegateContext): Promise<boolean> {
+        // Private files only available for the current user in user menu.
+        return user.id == CoreSites.getCurrentSiteUserId() && context === CoreUserDelegateContext.USER_MENU;
     }
 
     /**
diff --git a/src/core/features/grades/services/handlers/user.ts b/src/core/features/grades/services/handlers/user.ts
index 6c4a655a0..61009832a 100644
--- a/src/core/features/grades/services/handlers/user.ts
+++ b/src/core/features/grades/services/handlers/user.ts
@@ -19,6 +19,7 @@ import { GRADES_PAGE_NAME } from '@features/grades/grades.module';
 import { CoreGrades } from '@features/grades/services/grades';
 import { CoreUserProfile } from '@features/user/services/user';
 import {
+    CoreUserDelegateContext,
     CoreUserDelegateService ,
     CoreUserProfileHandler,
     CoreUserProfileHandlerData,
@@ -50,8 +51,8 @@ export class CoreGradesUserHandlerService implements CoreUserProfileHandler {
     /**
      * @inheritdoc
      */
-    async isEnabledForCourse(courseId?: number): Promise<boolean> {
-        if (courseId) {
+    async isEnabledForContext(context: CoreUserDelegateContext, courseId: number): Promise<boolean> {
+        if (context === CoreUserDelegateContext.COURSE) {
             return CoreUtils.ignoreErrors(CoreGrades.isPluginEnabledForCourse(courseId), false);
         } else {
             return CoreGrades.isCourseGradesEnabled();
@@ -61,9 +62,9 @@ export class CoreGradesUserHandlerService implements CoreUserProfileHandler {
     /**
      * @inheritdoc
      */
-    async isEnabledForUser(user: CoreUserProfile, courseId?: number): Promise<boolean> {
-        if (courseId) {
-            return CoreUtils.promiseWorks(CoreGrades.getCourseGradesTable(courseId, user.id));
+    async isEnabledForUser(user: CoreUserProfile, context: CoreUserDelegateContext, contextId: number): Promise<boolean> {
+        if (context === CoreUserDelegateContext.COURSE) {
+            return CoreUtils.promiseWorks(CoreGrades.getCourseGradesTable(contextId, user.id));
         }
 
         // All course grades only available for the current user.
@@ -73,17 +74,17 @@ export class CoreGradesUserHandlerService implements CoreUserProfileHandler {
     /**
      * @inheritdoc
      */
-    getDisplayData(user: CoreUserProfile, courseId?: number): CoreUserProfileHandlerData {
-        if (courseId) {
+    getDisplayData(user: CoreUserProfile, context: CoreUserDelegateContext): CoreUserProfileHandlerData {
+        if (context === CoreUserDelegateContext.COURSE) {
             return {
                 icon: 'fas-chart-bar',
                 title: 'core.grades.grades',
                 class: 'core-grades-user-handler',
-                action: (event, user, courseId): void => {
+                action: (event, user, context, contextId): void => {
                     event.preventDefault();
                     event.stopPropagation();
                     CoreNavigator.navigateToSitePath(
-                        [COURSE_PAGE_NAME, courseId, PARTICIPANTS_PAGE_NAME, user.id, GRADES_PAGE_NAME].join('/'),
+                        [COURSE_PAGE_NAME, contextId, PARTICIPANTS_PAGE_NAME, user.id, GRADES_PAGE_NAME].join('/'),
                     );
                 },
             };
diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.ts b/src/core/features/mainmenu/components/user-menu/user-menu.ts
index 2ac460e3e..dce64d9ea 100644
--- a/src/core/features/mainmenu/components/user-menu/user-menu.ts
+++ b/src/core/features/mainmenu/components/user-menu/user-menu.ts
@@ -18,7 +18,12 @@ import { CoreSite, CoreSiteInfo } from '@classes/site';
 import { CoreLoginSitesComponent } from '@features/login/components/sites/sites';
 import { CoreLoginHelper } from '@features/login/services/login-helper';
 import { CoreUser, CoreUserProfile } from '@features/user/services/user';
-import { CoreUserProfileHandlerData, CoreUserDelegate, CoreUserDelegateService } from '@features/user/services/user-delegate';
+import {
+    CoreUserProfileHandlerData,
+    CoreUserDelegate,
+    CoreUserDelegateService,
+    CoreUserDelegateContext,
+} from '@features/user/services/user-delegate';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
@@ -64,20 +69,21 @@ export class CoreMainMenuUserMenuComponent implements OnInit, OnDestroy {
         if (this.siteInfo) {
             this.user = await CoreUser.getProfile(this.siteInfo.userid);
 
-            this.subscription = CoreUserDelegate.getProfileHandlersFor(this.user).subscribe((handlers) => {
-                if (!handlers || !this.user) {
-                    return;
-                }
-
-                this.handlers = [];
-                handlers.forEach((handler) => {
-                    if (handler.type == CoreUserDelegateService.TYPE_NEW_PAGE) {
-                        this.handlers.push(handler.data);
+            this.subscription = CoreUserDelegate.getProfileHandlersFor(this.user, CoreUserDelegateContext.USER_MENU)
+                .subscribe((handlers) => {
+                    if (!handlers || !this.user) {
+                        return;
                     }
-                });
 
-                this.handlersLoaded = CoreUserDelegate.areHandlersLoaded(this.user.id);
-            });
+                    this.handlers = [];
+                    handlers.forEach((handler) => {
+                        if (handler.type == CoreUserDelegateService.TYPE_NEW_PAGE) {
+                            this.handlers.push(handler.data);
+                        }
+                    });
+
+                    this.handlersLoaded = CoreUserDelegate.areHandlersLoaded(this.user.id, CoreUserDelegateContext.USER_MENU);
+                });
 
         }
     }
@@ -150,7 +156,7 @@ export class CoreMainMenuUserMenuComponent implements OnInit, OnDestroy {
 
         await this.close(event);
 
-        handler.action(event, this.user);
+        handler.action(event, this.user, CoreUserDelegateContext.USER_MENU);
     }
 
     /**
diff --git a/src/core/features/siteplugins/classes/handlers/user-handler.ts b/src/core/features/siteplugins/classes/handlers/user-handler.ts
index 12e48e214..036cc8152 100644
--- a/src/core/features/siteplugins/classes/handlers/user-handler.ts
+++ b/src/core/features/siteplugins/classes/handlers/user-handler.ts
@@ -19,9 +19,13 @@ import {
     CoreSitePluginsUserHandlerData,
 } from '@features/siteplugins/services/siteplugins';
 import { CoreUserProfile } from '@features/user/services/user';
-import { CoreUserDelegateService, CoreUserProfileHandler, CoreUserProfileHandlerData } from '@features/user/services/user-delegate';
+import {
+    CoreUserDelegateContext,
+    CoreUserDelegateService,
+    CoreUserProfileHandler,
+    CoreUserProfileHandlerData,
+} from '@features/user/services/user-delegate';
 import { CoreNavigator } from '@services/navigator';
-import { CoreSites } from '@services/sites';
 import { CoreUtils, PromiseDefer } from '@services/utils/utils';
 import { Md5 } from 'ts-md5';
 import { CoreSitePluginsBaseHandler } from './base-handler';
@@ -55,11 +59,7 @@ export class CoreSitePluginsUserProfileHandler extends CoreSitePluginsBaseHandle
     /**
      * @inheritdoc
      */
-    async isEnabledForCourse(
-        courseId?: number,
-    ): Promise<boolean> {
-        courseId = courseId || CoreSites.getCurrentSiteHomeId();
-
+    async isEnabledForContext(context: CoreUserDelegateContext, courseId: number): Promise<boolean> {
         // Check if it's enabled for the course.
         return CoreSitePlugins.isHandlerEnabledForCourse(
             courseId,
@@ -89,12 +89,12 @@ export class CoreSitePluginsUserProfileHandler extends CoreSitePluginsBaseHandle
             title: this.title,
             icon: this.handlerSchema.displaydata?.icon,
             class: this.handlerSchema.displaydata?.class,
-            action: (event: Event, user: CoreUserProfile, courseId?: number): void => {
+            action: (event, user, context, contextId): void => {
                 event.preventDefault();
                 event.stopPropagation();
 
                 const args = {
-                    courseid: courseId,
+                    courseid: contextId,
                     userid: user.id,
                 };
                 const hash = <string> Md5.hashAsciiStr(JSON.stringify(args));
diff --git a/src/core/features/user/pages/profile/profile.page.ts b/src/core/features/user/pages/profile/profile.page.ts
index 88604bde6..e23ff8f3c 100644
--- a/src/core/features/user/pages/profile/profile.page.ts
+++ b/src/core/features/user/pages/profile/profile.page.ts
@@ -23,7 +23,12 @@ import { CoreDomUtils } from '@services/utils/dom';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreUser, CoreUserProfile, CoreUserProvider } from '@features/user/services/user';
 import { CoreUserHelper } from '@features/user/services/user-helper';
-import { CoreUserDelegate, CoreUserDelegateService, CoreUserProfileHandlerData } from '@features/user/services/user-delegate';
+import {
+    CoreUserDelegate,
+    CoreUserDelegateContext,
+    CoreUserDelegateService,
+    CoreUserProfileHandlerData,
+} from '@features/user/services/user-delegate';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreNavigator } from '@services/navigator';
 import { CoreCourses } from '@features/courses/services/courses';
@@ -131,7 +136,9 @@ export class CoreUserProfilePage implements OnInit, OnDestroy {
             // If there's already a subscription, unsubscribe because we'll get a new one.
             this.subscription?.unsubscribe();
 
-            this.subscription = CoreUserDelegate.getProfileHandlersFor(user, this.courseId).subscribe((handlers) => {
+            const context = this.courseId ? CoreUserDelegateContext.COURSE : CoreUserDelegateContext.SITE;
+
+            this.subscription = CoreUserDelegate.getProfileHandlersFor(user, context, this.courseId).subscribe((handlers) => {
                 this.actionHandlers = [];
                 this.newPageHandlers = [];
                 this.communicationHandlers = [];
@@ -150,7 +157,7 @@ export class CoreUserProfilePage implements OnInit, OnDestroy {
                     }
                 });
 
-                this.isLoadingHandlers = !CoreUserDelegate.areHandlersLoaded(user.id);
+                this.isLoadingHandlers = !CoreUserDelegate.areHandlersLoaded(user.id, context, this.courseId);
             });
 
         } catch (error) {
@@ -208,7 +215,8 @@ export class CoreUserProfilePage implements OnInit, OnDestroy {
             return;
         }
 
-        handler.action(event, this.user, this.courseId);
+        const context = this.courseId ? CoreUserDelegateContext.COURSE : CoreUserDelegateContext.SITE;
+        handler.action(event, this.user, context, this.courseId);
     }
 
     /**
diff --git a/src/core/features/user/services/handlers/profile-mail.ts b/src/core/features/user/services/handlers/profile-mail.ts
index 0ba0d60e9..d848f6307 100644
--- a/src/core/features/user/services/handlers/profile-mail.ts
+++ b/src/core/features/user/services/handlers/profile-mail.ts
@@ -52,7 +52,7 @@ export class CoreUserProfileMailHandlerService implements CoreUserProfileHandler
             icon: 'mail',
             title: 'core.user.sendemail',
             class: 'core-user-profile-mail',
-            action: (event: Event, user: CoreUserProfile): void => {
+            action: (event, user): void => {
                 event.preventDefault();
                 event.stopPropagation();
 
diff --git a/src/core/features/user/services/user-delegate.ts b/src/core/features/user/services/user-delegate.ts
index 6adebcf06..a4c2bf16c 100644
--- a/src/core/features/user/services/user-delegate.ts
+++ b/src/core/features/user/services/user-delegate.ts
@@ -47,15 +47,17 @@ export interface CoreUserProfileHandler extends CoreDelegateHandler {
     cacheEnabled?: boolean;
 
     /**
-     * Whether or not the handler is enabled for a course.
+     * Whether or not the handler is enabled for a context.
      *
-     * @param courseId Course ID where to show.
+     * @param context Context.
+     * @param contextId Context ID.
      * @param navOptions Navigation options for the course.
      * @param admOptions Admin options for the course.
      * @return Whether or not the handler is enabled for a user.
      */
-    isEnabledForCourse?(
-        courseId?: number,
+    isEnabledForContext?(
+        context: CoreUserDelegateContext,
+        contextId: number,
         navOptions?: CoreCourseUserAdminOrNavOptionIndexed,
         admOptions?: CoreCourseUserAdminOrNavOptionIndexed,
     ): Promise<boolean>;
@@ -64,22 +66,21 @@ export interface CoreUserProfileHandler extends CoreDelegateHandler {
      * Whether or not the handler is enabled for a user.
      *
      * @param user User object.
-     * @param courseId Course ID where to show.
+     * @param context Context.
+     * @param contextId Context ID.
      * @return Whether or not the handler is enabled for a user.
      */
-    isEnabledForUser?(
-        user: CoreUserProfile,
-        courseId?: number,
-    ): Promise<boolean>;
+    isEnabledForUser?(user: CoreUserProfile, context: CoreUserDelegateContext, contextId: number): Promise<boolean>;
 
     /**
      * Returns the data needed to render the handler.
      *
      * @param user User object.
-     * @param courseId Course ID where to show.
+     * @param context Context.
+     * @param contextId Context ID.
      * @return Data to be shown.
      */
-    getDisplayData(user: CoreUserProfile, courseId?: number): CoreUserProfileHandlerData;
+    getDisplayData(user: CoreUserProfile, context: CoreUserDelegateContext, contextId: number): CoreUserProfileHandlerData;
 }
 
 /**
@@ -136,9 +137,10 @@ export interface CoreUserProfileHandlerData {
      *
      * @param event Click event.
      * @param user User object.
-     * @param courseId Course ID being viewed. If not defined, site context.
+     * @param context Context.
+     * @param contextId Context ID.
      */
-    action(event: Event, user: CoreUserProfile, courseId?: number): void;
+    action(event: Event, user: CoreUserProfile, context: CoreUserDelegateContext, contextId?: number): void;
 }
 
 /**
@@ -199,24 +201,16 @@ export class CoreUserDelegateService extends CoreDelegate<CoreUserProfileHandler
     protected featurePrefix = 'CoreUserDelegate_';
 
     // Hold the handlers and the observable to notify them for each user.
-    protected userHandlers: {
-        [userId: number]: {
-            loaded: boolean; // Whether the handlers are loaded.
-            handlers: CoreUserProfileHandlerToDisplay[]; // List of handlers.
-            observable: Subject<CoreUserProfileHandlerToDisplay[]>; // Observale to notify the handlers.
-        };
-    } = {};
+    protected userHandlers: Record<number, Record<string, CoreUserDelegateHandlersData>> = {};
 
     constructor() {
         super('CoreUserDelegate', true);
 
         CoreEvents.on(CoreUserDelegateService.UPDATE_HANDLER_EVENT, (data) => {
-            if (!data || !data.handler || !this.userHandlers[data.userId]) {
-                return;
-            }
+            const handlersData = this.getHandlersData(data.userId, data.context, data.contextId);
 
             // Search the handler.
-            const handler = this.userHandlers[data.userId].handlers.find((userHandler) => userHandler.name == data.handler);
+            const handler = handlersData.handlers.find((userHandler) => userHandler.name == data.handler);
 
             if (!handler) {
                 return;
@@ -224,7 +218,7 @@ export class CoreUserDelegateService extends CoreDelegate<CoreUserProfileHandler
 
             // Update the data and notify.
             Object.assign(handler.data, data.data);
-            this.userHandlers[data.userId].observable.next(this.userHandlers[data.userId].handlers);
+            handlersData.observable.next(handlersData.handlers);
         });
 
         CoreEvents.on(CoreEvents.LOGOUT, () => {
@@ -232,31 +226,41 @@ export class CoreUserDelegateService extends CoreDelegate<CoreUserProfileHandler
         });
 
         CoreEvents.on(CoreUserProvider.PROFILE_REFRESHED, (data) => {
-            this.clearHandlerCache(data.courseId, data.userId);
+            const context = data.courseId ? CoreUserDelegateContext.COURSE : CoreUserDelegateContext.SITE;
+            this.clearHandlerCache(data.userId, context, data.courseId);
         });
     }
 
     /**
-     * Check if handlers are loaded.
+     * Check if handlers are loaded for a certain user and context.
      *
+     * @param userId User ID.
+     * @param context Context.
+     * @param contextId Context ID.
      * @return True if handlers are loaded, false otherwise.
      */
-    areHandlersLoaded(userId: number): boolean {
-        return this.userHandlers[userId]?.loaded;
+    areHandlersLoaded(userId: number, context: CoreUserDelegateContext, contextId?: number): boolean {
+        return this.getHandlersData(userId, context, contextId).loaded;
     }
 
     /**
      * Clear current user handlers.
      *
-     * @param userId The user to clear.
+     * @param userId The user to clear. Undefined for all users.
+     * @param context Context.
+     * @param contextId Context ID.
      */
-    clearUserHandlers(userId: number): void {
-        const userData = this.userHandlers[userId];
+    clearUserHandlers(userId?: number, context?: CoreUserDelegateContext, contextId?: number): void {
+        if (!userId) {
+            this.userHandlers = {};
+        } else if (!context) {
+            delete this.userHandlers[userId];
+        } else {
+            const handlersData = this.getHandlersData(userId, context, contextId);
 
-        if (userData) {
-            userData.handlers = [];
-            userData.observable.next([]);
-            userData.loaded = false;
+            handlersData.handlers = [];
+            handlersData.observable.next([]);
+            handlersData.loaded = false;
         }
     }
 
@@ -264,58 +268,65 @@ export class CoreUserDelegateService extends CoreDelegate<CoreUserProfileHandler
      * Get the profile handlers for a user.
      *
      * @param user The user object.
-     * @param courseId The course ID.
+     * @param context Context.
+     * @param contextId Context ID.
      * @return Resolved with the handlers.
      */
-    getProfileHandlersFor(user: CoreUserProfile, courseId?: number): Subject<CoreUserProfileHandlerToDisplay[]> {
-        // Initialize the user handlers if it isn't initialized already.
-        if (!this.userHandlers[user.id]) {
-            this.userHandlers[user.id] = {
-                loaded: false,
-                handlers: [],
-                observable: new BehaviorSubject<CoreUserProfileHandlerToDisplay[]>([]),
-            };
-        }
+    getProfileHandlersFor(
+        user: CoreUserProfile,
+        context: CoreUserDelegateContext,
+        contextId?: number,
+    ): Subject<CoreUserProfileHandlerToDisplay[]> {
+        this.calculateUserHandlers(user, context, contextId);
 
-        this.calculateUserHandlers(user, courseId);
-
-        return this.userHandlers[user.id].observable;
+        return this.getHandlersData(user.id, context, contextId).observable;
     }
 
     /**
      * Get the profile handlers for a user.
      *
      * @param user The user object.
-     * @param courseId The course ID.
+     * @param context Context.
+     * @param contextId Context ID.
      * @return Promise resolved when done.
      */
-    protected async calculateUserHandlers(user: CoreUserProfile, courseId?: number): Promise<void> {
+    protected async calculateUserHandlers(
+        user: CoreUserProfile,
+        context: CoreUserDelegateContext,
+        contextId?: number,
+    ): Promise<void> {
         // Get course options.
         const courses = await CoreCourses.getUserCourses(true);
         const courseIds = courses.map((course) => course.id);
 
         const options = await CoreCourses.getCoursesAdminAndNavOptions(courseIds);
 
-        // For backwards compatibility we don't modify the courseId.
-        const courseIdForOptions = courseId || CoreSites.getCurrentSiteHomeId();
+        const courseId = context === CoreUserDelegateContext.COURSE && contextId ? contextId : CoreSites.getCurrentSiteHomeId();
 
-        const navOptions = options.navOptions[courseIdForOptions];
-        const admOptions = options.admOptions[courseIdForOptions];
+        const navOptions = options.navOptions[courseId];
+        const admOptions = options.admOptions[courseId];
 
-        const userData = this.userHandlers[user.id];
-        userData.handlers = [];
+        const handlersData = this.getHandlersData(user.id, context, contextId);
+        handlersData.handlers = [];
 
         await CoreUtils.allPromises(Object.keys(this.enabledHandlers).map(async (name) => {
             // Checks if the handler is enabled for the user.
             const handler = this.handlers[name];
 
             try {
-                const enabled = await this.getAndCacheEnabledForUserFromHandler(handler, user, courseId, navOptions, admOptions);
+                const enabled = await this.getAndCacheEnabledForUserFromHandler(
+                    handler,
+                    user,
+                    context,
+                    courseId,
+                    navOptions,
+                    admOptions,
+                );
 
                 if (enabled) {
-                    userData.handlers.push({
+                    handlersData.handlers.push({
                         name: name,
-                        data: handler.getDisplayData(user, courseId),
+                        data: handler.getDisplayData(user, context, courseId),
                         priority: handler.priority || 0,
                         type: handler.type || CoreUserDelegateService.TYPE_NEW_PAGE,
                     });
@@ -326,9 +337,9 @@ export class CoreUserDelegateService extends CoreDelegate<CoreUserProfileHandler
         }));
 
         // Sort them by priority.
-        userData.handlers.sort((a, b) => b.priority! - a.priority!);
-        userData.loaded = true;
-        userData.observable.next(userData.handlers);
+        handlersData.handlers.sort((a, b) => (b.priority ?? 0) - (a.priority ?? 0));
+        handlersData.loaded = true;
+        handlersData.observable.next(handlersData.handlers);
     }
 
     /**
@@ -336,7 +347,8 @@ export class CoreUserDelegateService extends CoreDelegate<CoreUserProfileHandler
      *
      * @param handler Handler object.
      * @param user User object.
-     * @param courseId Course ID where to show.
+     * @param context Context.
+     * @param contextId Context ID.
      * @param navOptions Navigation options for the course.
      * @param admOptions Admin options for the course.
      * @return Whether or not the handler is enabled for a user.
@@ -344,12 +356,13 @@ export class CoreUserDelegateService extends CoreDelegate<CoreUserProfileHandler
     protected async getAndCacheEnabledForUserFromHandler(
         handler: CoreUserProfileHandler,
         user: CoreUserProfile,
-        courseId?: number,
-        navOptions?: CoreCourseUserAdminOrNavOptionIndexed,
-        admOptions?: CoreCourseUserAdminOrNavOptionIndexed,
+        context: CoreUserDelegateContext,
+        contextId: number,
+        navOptions: CoreCourseUserAdminOrNavOptionIndexed = {},
+        admOptions: CoreCourseUserAdminOrNavOptionIndexed = {},
     ): Promise<boolean> {
-        if (handler.isEnabledForCourse) {
-            const enabledOnCourse = await handler.isEnabledForCourse(courseId, navOptions, admOptions);
+        if (handler.isEnabledForContext) {
+            const enabledOnCourse = await handler.isEnabledForContext(context, contextId, navOptions, admOptions);
 
             if (!enabledOnCourse) {
                 // If is not enabled in the course, is not enabled for the user.
@@ -364,14 +377,14 @@ export class CoreUserDelegateService extends CoreDelegate<CoreUserProfileHandler
                 return true;
             }
 
-            return handler.isEnabledForUser(user, courseId);
+            return handler.isEnabledForUser(user, context, contextId);
         }
 
         if (this.enabledForUserCache[handler.name] === undefined) {
             this.enabledForUserCache[handler.name] = {};
         }
 
-        const cacheKey = this.getCacheKey(courseId, user.id);
+        const cacheKey = this.getCacheKey(user.id, context, contextId);
         const cache = this.enabledForUserCache[handler.name][cacheKey];
 
         if (cache !== undefined) {
@@ -380,7 +393,7 @@ export class CoreUserDelegateService extends CoreDelegate<CoreUserProfileHandler
 
         let enabled = true; // Default value.
         if (handler.isEnabledForUser) {
-            enabled = await handler.isEnabledForUser(user, courseId);
+            enabled = await handler.isEnabledForUser(user, context, contextId);
         }
 
         this.enabledForUserCache[handler.name][cacheKey] = enabled;
@@ -390,14 +403,15 @@ export class CoreUserDelegateService extends CoreDelegate<CoreUserProfileHandler
 
     /**
      * Clear handler enabled for user cache.
-     * If a courseId and userId are specified, it will only delete the entry for that user and course.
+     * If a userId and context are specified, it will only delete the entry for that user and context.
      *
-     * @param courseId Course ID.
      * @param userId User ID.
+     * @param context Context.
+     * @param contextId Context ID.
      */
-    protected clearHandlerCache(courseId?: number, userId?: number): void {
-        if (courseId && userId) {
-            const cacheKey = this.getCacheKey(courseId, userId);
+    protected clearHandlerCache(userId?: number, context?: CoreUserDelegateContext, contextId?: number): void {
+        if (userId && context) {
+            const cacheKey = this.getCacheKey(userId, context, contextId);
 
             Object.keys(this.enabledHandlers).forEach((name) => {
                 const cache = this.enabledForUserCache[name];
@@ -412,25 +426,81 @@ export class CoreUserDelegateService extends CoreDelegate<CoreUserProfileHandler
     }
 
     /**
-     * Get a cache key to identify a course and a user.
+     * Get a cache key to identify a user and context.
      *
-     * @param courseId Course ID.
      * @param userId User ID.
+     * @param context Context.
+     * @param contextId Context ID.
      * @return Cache key.
      */
-    protected getCacheKey(courseId = 0, userId = 0): string {
-        return courseId + '#' + userId;
+    protected getCacheKey(userId: number, context: CoreUserDelegateContext, contextId?: number): string {
+        return `${userId}#${this.getContextKey(context, contextId)}`;
+    }
+
+    /**
+     * Get a string to identify a context.
+     *
+     * @param context Context.
+     * @param contextId Context ID.
+     * @return String to identify the context.
+     */
+    protected getContextKey(context: CoreUserDelegateContext, contextId?: number): string {
+        return `${context}#${contextId ?? 0}`;
+    }
+
+    /**
+     * Get handlers data for a user and context.
+     *
+     * @param userId User ID.
+     * @param context Context.
+     * @param contextId Context ID.
+     * @return Handlers data.
+     */
+    protected getHandlersData(userId: number, context: CoreUserDelegateContext, contextId?: number): CoreUserDelegateHandlersData {
+        // Initialize the data if it doesn't exist.
+        const contextKey = this.getContextKey(context, contextId);
+        this.userHandlers[userId] = this.userHandlers[userId] || {};
+
+        if (!this.userHandlers[userId][contextKey]) {
+            this.userHandlers[userId][contextKey] = {
+                loaded: false,
+                handlers: [],
+                observable: new BehaviorSubject<CoreUserProfileHandlerToDisplay[]>([]),
+            };
+        }
+
+        return this.userHandlers[userId][contextKey];
     }
 
 }
 
 export const CoreUserDelegate = makeSingleton(CoreUserDelegateService);
 
+/**
+ * Handlers data for a user and context.
+ */
+type CoreUserDelegateHandlersData = {
+    loaded: boolean; // Whether the handlers are loaded.
+    handlers: CoreUserProfileHandlerToDisplay[]; // List of handlers.
+    observable: Subject<CoreUserProfileHandlerToDisplay[]>; // Observable to notify the handlers.
+};
+
+/**
+ * Context levels enumeration.
+ */
+export enum CoreUserDelegateContext {
+    SITE = 'site',
+    COURSE = 'course',
+    USER_MENU = 'user_menu',
+}
+
 /**
  * Data passed to UPDATE_HANDLER_EVENT event.
  */
 export type CoreUserUpdateHandlerData = {
     handler: string; // Name of the handler.
     userId: number; // User affected.
+    context: CoreUserDelegateContext; // Context affected.
+    contextId?: number; // ID related to the context.
     data: Record<string, unknown>; // Data to set to the handler.
 };
diff --git a/upgrade.txt b/upgrade.txt
index 11db21eef..79ccced1d 100644
--- a/upgrade.txt
+++ b/upgrade.txt
@@ -11,6 +11,10 @@ information provided here is intended especially for developers.
 - CoreCourse.getModuleBasicInfoByInstance and CoreCourse.getModuleBasicInfo have been modified to accept an "options" parameter instead of only siteId.
 - The function CoreFilepool.isFileDownloadingByUrl now returns Promise<boolean> instead of relying on resolve/reject.
 - downloadEnabled input has been removed from CoreBlockSideBlocksComponent, CoreCourseFormatComponent, CoreCourseFormatSingleActivityComponent and CoreCourseModuleComponent.
+- There were several breaking changes done in CoreUserDelegate and its handlers:
+    The function CoreUserDelegate.getProfileHandlersFor must now receive a context + contextId instead of a courseId.
+    The user handler function isEnabledForCourse is now called isEnabledForContext and receives a context + contextId instead of a courseId.
+    Some user handler's functions have also changed to accept context + contextId instead of a courseId: isEnabledForUser, getDisplayData, action.
 
 === 3.9.5 ===
 

From d46bc0601f2b6c4ec13a7d3222483de2c38152ef Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 21 Jan 2022 14:41:39 +0100
Subject: [PATCH 0394/1008] MOBILE-3966 core: Support new disabled features
 values

---
 src/addons/badges/services/handlers/user.ts   | 18 +++++++++--
 src/addons/blog/services/handlers/user.ts     | 31 +++++++++++++++++--
 .../competency/services/handlers/user.ts      | 25 ++++++++++++++-
 .../services/handlers/user.ts                 |  2 +-
 .../privatefiles/services/handlers/user.ts    | 21 ++++++++++++-
 .../features/grades/services/handlers/user.ts | 17 +++++++++-
 .../components/user-menu/user-menu.html       |  2 +-
 .../components/user-menu/user-menu.ts         |  2 ++
 src/core/services/utils/text.ts               |  1 +
 9 files changed, 110 insertions(+), 9 deletions(-)

diff --git a/src/addons/badges/services/handlers/user.ts b/src/addons/badges/services/handlers/user.ts
index a15acfed3..21d4363c8 100644
--- a/src/addons/badges/services/handlers/user.ts
+++ b/src/addons/badges/services/handlers/user.ts
@@ -21,6 +21,7 @@ import {
     CoreUserProfileHandlerData,
 } from '@features/user/services/user-delegate';
 import { CoreNavigator } from '@services/navigator';
+import { CoreSites } from '@services/sites';
 import { makeSingleton } from '@singletons';
 import { AddonBadges } from '../badges';
 
@@ -30,7 +31,7 @@ import { AddonBadges } from '../badges';
 @Injectable({ providedIn: 'root' })
 export class AddonBadgesUserHandlerService implements CoreUserProfileHandler {
 
-    name = 'AddonBadges';
+    name = 'AddonBadges:fakename'; // This name doesn't match any disabled feature, they'll be checked in isEnabledForContext.
     priority = 50;
     type = CoreUserDelegateService.TYPE_NEW_PAGE;
 
@@ -49,11 +50,24 @@ export class AddonBadgesUserHandlerService implements CoreUserProfileHandler {
         courseId: number,
         navOptions?: CoreCourseUserAdminOrNavOptionIndexed,
     ): Promise<boolean> {
+        // Check if feature is disabled.
+        const currentSite = CoreSites.getCurrentSite();
+        if (!currentSite) {
+            return false;
+        }
+
+        if (context === CoreUserDelegateContext.USER_MENU) {
+            if (currentSite.isFeatureDisabled('CoreUserDelegate_AddonBadges:account')) {
+                return false;
+            }
+        } else if (currentSite.isFeatureDisabled('CoreUserDelegate_AddonBadges')) {
+            return false;
+        }
+
         if (navOptions && navOptions.badges !== undefined) {
             return navOptions.badges;
         }
 
-        // If we reach here, it means we are opening the user site profile.
         return true;
     }
 
diff --git a/src/addons/blog/services/handlers/user.ts b/src/addons/blog/services/handlers/user.ts
index 566b361bf..9f221a69b 100644
--- a/src/addons/blog/services/handlers/user.ts
+++ b/src/addons/blog/services/handlers/user.ts
@@ -13,8 +13,14 @@
 // limitations under the License.
 
 import { Injectable } from '@angular/core';
-import { CoreUserProfileHandler, CoreUserProfileHandlerData, CoreUserDelegateService } from '@features/user/services/user-delegate';
+import {
+    CoreUserProfileHandler,
+    CoreUserProfileHandlerData,
+    CoreUserDelegateService,
+    CoreUserDelegateContext,
+} from '@features/user/services/user-delegate';
 import { CoreNavigator } from '@services/navigator';
+import { CoreSites } from '@services/sites';
 import { makeSingleton } from '@singletons';
 import { AddonBlog } from '../blog';
 
@@ -24,7 +30,7 @@ import { AddonBlog } from '../blog';
 @Injectable({ providedIn: 'root' })
 export class AddonBlogUserHandlerService implements CoreUserProfileHandler {
 
-    name = 'AddonBlog:blogs';
+    name = 'AddonBlog'; // This name doesn't match any disabled feature, they'll be checked in isEnabledForContext.
     priority = 300;
     type = CoreUserDelegateService.TYPE_NEW_PAGE;
 
@@ -35,6 +41,27 @@ export class AddonBlogUserHandlerService implements CoreUserProfileHandler {
         return AddonBlog.isPluginEnabled();
     }
 
+    /**
+     * @inheritdoc
+     */
+    async isEnabledForContext(context: CoreUserDelegateContext): Promise<boolean> {
+        // Check if feature is disabled.
+        const currentSite = CoreSites.getCurrentSite();
+        if (!currentSite) {
+            return false;
+        }
+
+        if (context === CoreUserDelegateContext.USER_MENU) {
+            if (currentSite.isFeatureDisabled('CoreUserDelegate_AddonBlog:account')) {
+                return false;
+            }
+        } else if (currentSite.isFeatureDisabled('CoreUserDelegate_AddonBlog:blogs')) {
+            return false;
+        }
+
+        return true;
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/src/addons/competency/services/handlers/user.ts b/src/addons/competency/services/handlers/user.ts
index 9f8b28379..c6659d82d 100644
--- a/src/addons/competency/services/handlers/user.ts
+++ b/src/addons/competency/services/handlers/user.ts
@@ -24,6 +24,7 @@ import {
 } from '@features/user/services/user-delegate';
 import { PARTICIPANTS_PAGE_NAME } from '@features/user/user.module';
 import { CoreNavigator } from '@services/navigator';
+import { CoreSites } from '@services/sites';
 import { makeSingleton } from '@singletons';
 import { AddonCompetency } from '../competency';
 
@@ -33,7 +34,7 @@ import { AddonCompetency } from '../competency';
 @Injectable( { providedIn: 'root' })
 export class AddonCompetencyUserHandlerService implements CoreUserProfileHandler {
 
-    name = 'AddonCompetency:learningPlan';
+    name = 'AddonCompetency'; // This name doesn't match any disabled feature, they'll be checked in isEnabledForContext.
     priority = 900;
     type = CoreUserDelegateService.TYPE_NEW_PAGE;
     cacheEnabled = true;
@@ -45,6 +46,28 @@ export class AddonCompetencyUserHandlerService implements CoreUserProfileHandler
         return true;
     }
 
+    /**
+     * @inheritdoc
+     */
+    async isEnabledForContext(context: CoreUserDelegateContext): Promise<boolean> {
+        // Check if feature is disabled.
+        const currentSite = CoreSites.getCurrentSite();
+        if (!currentSite) {
+            return false;
+        }
+
+        if (context === CoreUserDelegateContext.USER_MENU) {
+            // This option used to belong to main menu, check the original disabled feature value.
+            if (currentSite.isFeatureDisabled('CoreMainMenuDelegate_AddonCompetency')) {
+                return false;
+            }
+        } else if (currentSite.isFeatureDisabled('CoreUserDelegate_AddonCompetency:learningPlan')) {
+            return false;
+        }
+
+        return true;
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/src/addons/coursecompletion/services/handlers/user.ts b/src/addons/coursecompletion/services/handlers/user.ts
index 69f47f71f..b6a08808c 100644
--- a/src/addons/coursecompletion/services/handlers/user.ts
+++ b/src/addons/coursecompletion/services/handlers/user.ts
@@ -30,7 +30,7 @@ import { AddonCourseCompletion } from '../coursecompletion';
 @Injectable({ providedIn: 'root' })
 export class AddonCourseCompletionUserHandlerService implements CoreUserProfileHandler {
 
-    name = 'AddonCourseCompletion';
+    name = 'AddonCourseCompletion:viewCompletion';
     type = CoreUserDelegateService.TYPE_NEW_PAGE;
     priority = 200;
     cacheEnabled = true;
diff --git a/src/addons/privatefiles/services/handlers/user.ts b/src/addons/privatefiles/services/handlers/user.ts
index f35aba520..d969f6e94 100644
--- a/src/addons/privatefiles/services/handlers/user.ts
+++ b/src/addons/privatefiles/services/handlers/user.ts
@@ -46,11 +46,30 @@ export class AddonPrivateFilesUserHandlerService implements CoreUserProfileHandl
         return AddonPrivateFiles.isPluginEnabled();
     }
 
+    /**
+     * @inheritdoc
+     */
+    async isEnabledForContext(context: CoreUserDelegateContext): Promise<boolean> {
+        // Private files only available in user menu.
+        if (context !== CoreUserDelegateContext.USER_MENU) {
+            return false;
+        }
+
+        // Check if feature is disabled.
+        const currentSite = CoreSites.getCurrentSite();
+        if (!currentSite) {
+            return false;
+        }
+
+        // This option used to belong to main menu, check the original disabled feature value.
+        return !currentSite.isFeatureDisabled('CoreMainMenuDelegate_AddonPrivateFiles');
+    }
+
     /**
      * @inheritdoc
      */
     async isEnabledForUser(user: CoreUserProfile, context: CoreUserDelegateContext): Promise<boolean> {
-        // Private files only available for the current user in user menu.
+        // Private files only available for the current user.
         return user.id == CoreSites.getCurrentSiteUserId() && context === CoreUserDelegateContext.USER_MENU;
     }
 
diff --git a/src/core/features/grades/services/handlers/user.ts b/src/core/features/grades/services/handlers/user.ts
index 61009832a..d6c6b5e30 100644
--- a/src/core/features/grades/services/handlers/user.ts
+++ b/src/core/features/grades/services/handlers/user.ts
@@ -36,7 +36,7 @@ import { makeSingleton } from '@singletons';
 @Injectable({ providedIn: 'root' })
 export class CoreGradesUserHandlerService implements CoreUserProfileHandler {
 
-    name = 'CoreGrades:viewGrades';
+    name = 'CoreGrades'; // This name doesn't match any disabled feature, they'll be checked in isEnabledForContext.
     priority = 400;
     type = CoreUserDelegateService.TYPE_NEW_PAGE;
     cacheEnabled = true;
@@ -52,6 +52,21 @@ export class CoreGradesUserHandlerService implements CoreUserProfileHandler {
      * @inheritdoc
      */
     async isEnabledForContext(context: CoreUserDelegateContext, courseId: number): Promise<boolean> {
+        // Check if feature is disabled.
+        const currentSite = CoreSites.getCurrentSite();
+        if (!currentSite) {
+            return false;
+        }
+
+        if (context === CoreUserDelegateContext.USER_MENU) {
+            // This option used to belong to main menu, check the original disabled feature value.
+            if (currentSite.isFeatureDisabled('CoreMainMenuDelegate_CoreGrades')) {
+                return false;
+            }
+        } else if (currentSite.isFeatureDisabled('CoreUserDelegate_CoreGrades:viewGrades')) {
+            return false;
+        }
+
         if (context === CoreUserDelegateContext.COURSE) {
             return CoreUtils.ignoreErrors(CoreGrades.isPluginEnabledForCourse(courseId), false);
         } else {
diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.html b/src/core/features/mainmenu/components/user-menu/user-menu.html
index b24ab93c7..67562de15 100644
--- a/src/core/features/mainmenu/components/user-menu/user-menu.html
+++ b/src/core/features/mainmenu/components/user-menu/user-menu.html
@@ -68,7 +68,7 @@
     </ion-list>
 </ion-content>
 <ion-footer>
-    <ion-item button lines="full" (click)="switchAccounts($event)" detail="true" class="ion-text-wrap">
+    <ion-item *ngIf="displaySwitchAccount" button lines="full" (click)="switchAccounts($event)" detail="true" class="ion-text-wrap">
         <ion-icon name="fas-exchange-alt" slot="start" aria-hidden="true"></ion-icon>
         <ion-label>
             <p class="item-heading">{{ 'core.mainmenu.switchaccount' | translate }}</p>
diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.ts b/src/core/features/mainmenu/components/user-menu/user-menu.ts
index dce64d9ea..d250ae0e7 100644
--- a/src/core/features/mainmenu/components/user-menu/user-menu.ts
+++ b/src/core/features/mainmenu/components/user-menu/user-menu.ts
@@ -49,6 +49,7 @@ export class CoreMainMenuUserMenuComponent implements OnInit, OnDestroy {
     handlersLoaded = false;
     loaded = false;
     user?: CoreUserProfile;
+    displaySwitchAccount = true;
 
     protected subscription!: Subscription;
 
@@ -60,6 +61,7 @@ export class CoreMainMenuUserMenuComponent implements OnInit, OnDestroy {
         this.siteInfo = currentSite.getInfo();
         this.siteName = currentSite.getSiteName();
         this.siteUrl = currentSite.getURL();
+        this.displaySwitchAccount = !currentSite.isFeatureDisabled('NoDelegate_SwitchAccount');
 
         this.loaded = true;
 
diff --git a/src/core/services/utils/text.ts b/src/core/services/utils/text.ts
index 62df1a889..4c6d5f307 100644
--- a/src/core/services/utils/text.ts
+++ b/src/core/services/utils/text.ts
@@ -67,6 +67,7 @@ export class CoreTextUtilsProvider {
         { old: /files_sitefiles/g, new: 'AddonPrivateFilesSiteFiles' },
         { old: /files_upload/g, new: 'AddonPrivateFilesUpload' },
         { old: /_mmaModAssign/g, new: '_AddonModAssign' },
+        { old: /_mmaModBigbluebuttonbn/g, new: '_AddonModBBB' },
         { old: /_mmaModBook/g, new: '_AddonModBook' },
         { old: /_mmaModChat/g, new: '_AddonModChat' },
         { old: /_mmaModChoice/g, new: '_AddonModChoice' },

From 5f757d240f644cb7977bf514dfb69b85043e6a31 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 21 Jan 2022 15:22:19 +0100
Subject: [PATCH 0395/1008] MOBILE-3966 core: Reorder user handlers and
 calendar handler

---
 src/addons/badges/services/handlers/user.ts           | 2 +-
 src/addons/blog/services/handlers/user.ts             | 2 +-
 src/addons/calendar/services/handlers/mainmenu.ts     | 2 +-
 src/addons/competency/services/handlers/user.ts       | 2 +-
 src/addons/coursecompletion/services/handlers/user.ts | 2 +-
 src/addons/notes/services/handlers/user.ts            | 2 +-
 src/addons/privatefiles/services/handlers/user.ts     | 2 +-
 src/core/features/grades/services/handlers/user.ts    | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/addons/badges/services/handlers/user.ts b/src/addons/badges/services/handlers/user.ts
index 21d4363c8..f9f357ce2 100644
--- a/src/addons/badges/services/handlers/user.ts
+++ b/src/addons/badges/services/handlers/user.ts
@@ -32,7 +32,7 @@ import { AddonBadges } from '../badges';
 export class AddonBadgesUserHandlerService implements CoreUserProfileHandler {
 
     name = 'AddonBadges:fakename'; // This name doesn't match any disabled feature, they'll be checked in isEnabledForContext.
-    priority = 50;
+    priority = 300;
     type = CoreUserDelegateService.TYPE_NEW_PAGE;
 
     /**
diff --git a/src/addons/blog/services/handlers/user.ts b/src/addons/blog/services/handlers/user.ts
index 9f221a69b..f2b5e75de 100644
--- a/src/addons/blog/services/handlers/user.ts
+++ b/src/addons/blog/services/handlers/user.ts
@@ -31,7 +31,7 @@ import { AddonBlog } from '../blog';
 export class AddonBlogUserHandlerService implements CoreUserProfileHandler {
 
     name = 'AddonBlog'; // This name doesn't match any disabled feature, they'll be checked in isEnabledForContext.
-    priority = 300;
+    priority = 200;
     type = CoreUserDelegateService.TYPE_NEW_PAGE;
 
     /**
diff --git a/src/addons/calendar/services/handlers/mainmenu.ts b/src/addons/calendar/services/handlers/mainmenu.ts
index 209dc0bb1..74a4cb6e0 100644
--- a/src/addons/calendar/services/handlers/mainmenu.ts
+++ b/src/addons/calendar/services/handlers/mainmenu.ts
@@ -26,7 +26,7 @@ export class AddonCalendarMainMenuHandlerService implements CoreMainMenuHandler
     static readonly PAGE_NAME = 'calendar';
 
     name = 'AddonCalendar';
-    priority = 800;
+    priority = 550;
 
     /**
      * Check if the handler is enabled on a site level.
diff --git a/src/addons/competency/services/handlers/user.ts b/src/addons/competency/services/handlers/user.ts
index c6659d82d..dbae1b0a8 100644
--- a/src/addons/competency/services/handlers/user.ts
+++ b/src/addons/competency/services/handlers/user.ts
@@ -35,7 +35,7 @@ import { AddonCompetency } from '../competency';
 export class AddonCompetencyUserHandlerService implements CoreUserProfileHandler {
 
     name = 'AddonCompetency'; // This name doesn't match any disabled feature, they'll be checked in isEnabledForContext.
-    priority = 900;
+    priority = 100;
     type = CoreUserDelegateService.TYPE_NEW_PAGE;
     cacheEnabled = true;
 
diff --git a/src/addons/coursecompletion/services/handlers/user.ts b/src/addons/coursecompletion/services/handlers/user.ts
index b6a08808c..bfd75dfaa 100644
--- a/src/addons/coursecompletion/services/handlers/user.ts
+++ b/src/addons/coursecompletion/services/handlers/user.ts
@@ -32,7 +32,7 @@ export class AddonCourseCompletionUserHandlerService implements CoreUserProfileH
 
     name = 'AddonCourseCompletion:viewCompletion';
     type = CoreUserDelegateService.TYPE_NEW_PAGE;
-    priority = 200;
+    priority = 350;
     cacheEnabled = true;
 
     /**
diff --git a/src/addons/notes/services/handlers/user.ts b/src/addons/notes/services/handlers/user.ts
index 4bad2ad6e..6626ba29b 100644
--- a/src/addons/notes/services/handlers/user.ts
+++ b/src/addons/notes/services/handlers/user.ts
@@ -32,7 +32,7 @@ import { AddonNotes } from '../notes';
 export class AddonNotesUserHandlerService implements CoreUserProfileHandler {
 
     name = 'AddonNotes:notes';
-    priority = 100;
+    priority = 250;
     type = CoreUserDelegateService.TYPE_NEW_PAGE;
     cacheEnabled = true;
 
diff --git a/src/addons/privatefiles/services/handlers/user.ts b/src/addons/privatefiles/services/handlers/user.ts
index d969f6e94..5b18fcb8d 100644
--- a/src/addons/privatefiles/services/handlers/user.ts
+++ b/src/addons/privatefiles/services/handlers/user.ts
@@ -35,7 +35,7 @@ export class AddonPrivateFilesUserHandlerService implements CoreUserProfileHandl
     static readonly PAGE_NAME = 'private';
 
     name = 'AddonPrivateFiles';
-    priority = 300;
+    priority = 400;
     type = CoreUserDelegateService.TYPE_NEW_PAGE;
     cacheEnabled = true;
 
diff --git a/src/core/features/grades/services/handlers/user.ts b/src/core/features/grades/services/handlers/user.ts
index d6c6b5e30..945972f4e 100644
--- a/src/core/features/grades/services/handlers/user.ts
+++ b/src/core/features/grades/services/handlers/user.ts
@@ -37,7 +37,7 @@ import { makeSingleton } from '@singletons';
 export class CoreGradesUserHandlerService implements CoreUserProfileHandler {
 
     name = 'CoreGrades'; // This name doesn't match any disabled feature, they'll be checked in isEnabledForContext.
-    priority = 400;
+    priority = 500;
     type = CoreUserDelegateService.TYPE_NEW_PAGE;
     cacheEnabled = true;
 

From fe55a8a59f1eef19376e156c94e759df7e0f4c41 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 24 Jan 2022 15:14:16 +0100
Subject: [PATCH 0396/1008] MOBILE-3833 label: Fix error when downloading
 course with label

---
 src/addons/mod/label/services/handlers/prefetch.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/addons/mod/label/services/handlers/prefetch.ts b/src/addons/mod/label/services/handlers/prefetch.ts
index c9f35f8fa..50feb8c62 100644
--- a/src/addons/mod/label/services/handlers/prefetch.ts
+++ b/src/addons/mod/label/services/handlers/prefetch.ts
@@ -63,5 +63,13 @@ export class AddonModLabelPrefetchHandlerService extends CoreCourseResourcePrefe
         await CoreUtils.allPromises(promises);
     }
 
+    /**
+     * @inheritdoc
+     */
+    async loadContents(module: CoreCourseAnyModuleData): Promise<void> {
+        // Labels don't have contents.
+        module.contents = [];
+    }
+
 }
 export const AddonModLabelPrefetchHandler = makeSingleton(AddonModLabelPrefetchHandlerService);

From 1d8f0c5a66b959ec8e2597e699ef2004f7b3299b Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Mon, 24 Jan 2022 18:00:27 +0100
Subject: [PATCH 0397/1008] MOBILE-3971 core: Track database query performance

---
 scripts/print-performance-measures.js         |  6 +-
 src/core/classes/sqlitedb.ts                  | 66 ++++++++++++++++---
 .../features/emulator/classes/sqlitedb.ts     | 48 +++++++++++---
 .../initializers/prepare-automated-tests.ts   |  3 +
 src/core/services/db.ts                       | 31 +++++++++
 tests/behat/classes/performance_measure.php   | 31 +++++++++
 6 files changed, 165 insertions(+), 20 deletions(-)

diff --git a/scripts/print-performance-measures.js b/scripts/print-performance-measures.js
index 064a88181..2b611be01 100755
--- a/scripts/print-performance-measures.js
+++ b/scripts/print-performance-measures.js
@@ -40,6 +40,7 @@ for (const file of files) {
         styling: [],
         blocking: [],
         longTasks: [],
+        database: [],
         networking: [],
     };
     performanceMeasures[performanceMeasure.name].duration.push(performanceMeasure.duration);
@@ -47,17 +48,19 @@ for (const file of files) {
     performanceMeasures[performanceMeasure.name].styling.push(performanceMeasure.styling);
     performanceMeasures[performanceMeasure.name].blocking.push(performanceMeasure.blocking);
     performanceMeasures[performanceMeasure.name].longTasks.push(performanceMeasure.longTasks);
+    performanceMeasures[performanceMeasure.name].database.push(performanceMeasure.database);
     performanceMeasures[performanceMeasure.name].networking.push(performanceMeasure.networking);
 }
 
 // Calculate averages
-for (const [name, { duration, scripting, styling, blocking, longTasks, networking }] of Object.entries(performanceMeasures)) {
+for (const [name, { duration, scripting, styling, blocking, longTasks, database, networking }] of Object.entries(performanceMeasures)) {
     const totalRuns = duration.length;
     const averageDuration = Math.round(duration.reduce((total, duration) => total + duration) / totalRuns);
     const averageScripting = Math.round(scripting.reduce((total, scripting) => total + scripting) / totalRuns);
     const averageStyling = Math.round(styling.reduce((total, styling) => total + styling) / totalRuns);
     const averageBlocking = Math.round(blocking.reduce((total, blocking) => total + blocking) / totalRuns);
     const averageLongTasks = Math.round(longTasks.reduce((total, longTasks) => total + longTasks) / totalRuns);
+    const averageDatabase = Math.round(database.reduce((total, database) => total + database) / totalRuns);
     const averageNetworking = Math.round(networking.reduce((total, networking) => total + networking) / totalRuns);
 
     performanceMeasures[name] = {
@@ -66,6 +69,7 @@ for (const [name, { duration, scripting, styling, blocking, longTasks, networkin
         'Styling': `${averageStyling}ms`,
         'Blocking': `${averageBlocking}ms`,
         '# Network requests': averageNetworking,
+        '# DB Queries': averageDatabase,
         '# Long Tasks': averageLongTasks,
         '# runs': totalRuns,
     };
diff --git a/src/core/classes/sqlitedb.ts b/src/core/classes/sqlitedb.ts
index 0aec0714b..615a3eb7f 100644
--- a/src/core/classes/sqlitedb.ts
+++ b/src/core/classes/sqlitedb.ts
@@ -16,6 +16,7 @@ import { SQLiteObject } from '@ionic-native/sqlite/ngx';
 
 import { SQLite, Platform } from '@singletons';
 import { CoreError } from '@classes/errors/error';
+import { CoreDB } from '@services/db';
 
 type SQLiteDBColumnType = 'INTEGER' | 'REAL' | 'TEXT' | 'BLOB';
 
@@ -813,16 +814,19 @@ export class SQLiteDB {
      * Initialize the database.
      */
     init(): void {
-        this.promise = Platform.ready()
-            .then(() => SQLite.create({
-                name: this.name,
-                location: 'default',
-            }))
-            .then((db: SQLiteObject) => {
-                this.db = db;
+        this.promise = this.createDatabase().then(db => {
+            if (CoreDB.loggingEnabled()) {
+                const spies = this.getDatabaseSpies(db);
 
-                return;
-            });
+                db = new Proxy(db, {
+                    get: (target, property, receiver) => spies[property] ?? Reflect.get(target, property, receiver),
+                });
+            }
+
+            this.db = db;
+
+            return;
+        });
     }
 
     /**
@@ -1147,6 +1151,50 @@ export class SQLiteDB {
         return { sql, params };
     }
 
+    /**
+     * Open a database connection.
+     *
+     * @returns Database.
+     */
+    protected async createDatabase(): Promise<SQLiteObject> {
+        await Platform.ready();
+
+        return SQLite.create({ name: this.name, location: 'default' });
+    }
+
+    /**
+     * Get database spy methods to intercept database calls and track logging information.
+     *
+     * @param db Database to spy.
+     * @returns Spy methods.
+     */
+    protected getDatabaseSpies(db: SQLiteObject): Partial<SQLiteObject> {
+        return {
+            executeSql(statement, params) {
+                const start = performance.now();
+
+                return db.executeSql(statement, params).then(result => {
+                    CoreDB.logQuery(statement, performance.now() - start, params);
+
+                    return result;
+                });
+            },
+            sqlBatch(statements) {
+                const start = performance.now();
+
+                return db.sqlBatch(statements).then(result => {
+                    const sql = Array.isArray(statements)
+                        ? statements.join(' | ')
+                        : String(statements);
+
+                    CoreDB.logQuery(sql, performance.now() - start);
+
+                    return result;
+                });
+            },
+        };
+    }
+
 }
 
 export type SQLiteDBRecordValues = {
diff --git a/src/core/features/emulator/classes/sqlitedb.ts b/src/core/features/emulator/classes/sqlitedb.ts
index 4be4bd69d..18ad526b6 100644
--- a/src/core/features/emulator/classes/sqlitedb.ts
+++ b/src/core/features/emulator/classes/sqlitedb.ts
@@ -15,6 +15,8 @@
 /* tslint:disable:no-console */
 
 import { SQLiteDB } from '@classes/sqlitedb';
+import { DbTransaction, SQLiteObject } from '@ionic-native/sqlite/ngx';
+import { CoreDB } from '@services/db';
 
 /**
  * Class to mock the interaction with the SQLite database.
@@ -158,16 +160,6 @@ export class SQLiteDBMock extends SQLiteDB {
         });
     }
 
-    /**
-     * Initialize the database.
-     */
-    init(): void {
-        // This DB is for desktop apps, so use a big size to be sure it isn't filled.
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        this.db = (<any> window).openDatabase(this.name, '1.0', this.name, 500 * 1024 * 1024);
-        this.promise = Promise.resolve();
-    }
-
     /**
      * Open the database. Only needed if it was closed before, a database is automatically opened when created.
      *
@@ -178,4 +170,40 @@ export class SQLiteDBMock extends SQLiteDB {
         return Promise.resolve();
     }
 
+    /**
+     * @inheritdoc
+     */
+    protected async createDatabase(): Promise<SQLiteObject> {
+        // This DB is for desktop apps, so use a big size to be sure it isn't filled.
+        return (window as unknown as WebSQLWindow).openDatabase(this.name, '1.0', this.name, 500 * 1024 * 1024);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected getDatabaseSpies(db: SQLiteObject): Partial<SQLiteObject> {
+        return {
+            transaction: (callback) => db.transaction((transaction) => {
+                const transactionSpy: DbTransaction = {
+                    executeSql(sql, params, success, error) {
+                        const start = performance.now();
+                        const resolve = callback => (...args) => {
+                            CoreDB.logQuery(sql, performance.now() - start, params);
+
+                            return callback(...args);
+                        };
+
+                        return transaction.executeSql(sql, params, resolve(success), resolve(error));
+                    },
+                };
+
+                return callback(transactionSpy);
+            }),
+        };
+    }
+
+}
+
+interface WebSQLWindow extends Window {
+    openDatabase(name: string, version: string, displayName: string, estimatedSize: number): SQLiteObject;
 }
diff --git a/src/core/initializers/prepare-automated-tests.ts b/src/core/initializers/prepare-automated-tests.ts
index f8e60a42d..0a78c2456 100644
--- a/src/core/initializers/prepare-automated-tests.ts
+++ b/src/core/initializers/prepare-automated-tests.ts
@@ -16,12 +16,14 @@ import { ApplicationRef, NgZone as NgZoneService } from '@angular/core';
 import { CorePushNotifications, CorePushNotificationsProvider } from '@features/pushnotifications/services/pushnotifications';
 import { CoreApp, CoreAppProvider } from '@services/app';
 import { CoreCronDelegate, CoreCronDelegateService } from '@services/cron';
+import { CoreDB, CoreDbProvider } from '@services/db';
 import { CoreCustomURLSchemes, CoreCustomURLSchemesProvider } from '@services/urlschemes';
 import { Application, NgZone } from '@singletons';
 
 type AutomatedTestsWindow = Window & {
     appRef?: ApplicationRef;
     appProvider?: CoreAppProvider;
+    dbProvider?: CoreDbProvider;
     cronProvider?: CoreCronDelegateService;
     ngZone?: NgZoneService;
     pushNotifications?: CorePushNotificationsProvider;
@@ -31,6 +33,7 @@ type AutomatedTestsWindow = Window & {
 function initializeAutomatedTestsWindow(window: AutomatedTestsWindow) {
     window.appRef = Application.instance;
     window.appProvider = CoreApp.instance;
+    window.dbProvider = CoreDB.instance;
     window.cronProvider = CoreCronDelegate.instance;
     window.ngZone = NgZone.instance;
     window.pushNotifications = CorePushNotifications.instance;
diff --git a/src/core/services/db.ts b/src/core/services/db.ts
index a715625c8..727b5424d 100644
--- a/src/core/services/db.ts
+++ b/src/core/services/db.ts
@@ -17,6 +17,7 @@ import { Injectable } from '@angular/core';
 import { SQLiteDB } from '@classes/sqlitedb';
 import { SQLiteDBMock } from '@features/emulator/classes/sqlitedb';
 import { makeSingleton, SQLite, Platform } from '@singletons';
+import { CoreAppProvider } from './app';
 
 /**
  * This service allows interacting with the local database to store and retrieve data.
@@ -24,8 +25,29 @@ import { makeSingleton, SQLite, Platform } from '@singletons';
 @Injectable({ providedIn: 'root' })
 export class CoreDbProvider {
 
+    queryLogs: CoreDbQueryLog[] = [];
+
     protected dbInstances: {[name: string]: SQLiteDB} = {};
 
+    /**
+     * Check whether database queries should be logged.
+     *
+     * @returns Whether queries should be logged.
+     */
+    loggingEnabled(): boolean {
+        return CoreAppProvider.isAutomated();
+    }
+
+    /**
+     * Log a query.
+     *
+     * @param sql Query SQL.
+     * @param params Query parameters.
+     */
+    logQuery(sql: string, duration: number, params?: unknown[]): void {
+        this.queryLogs.push({ sql, duration, params });
+    }
+
     /**
      * Get or create a database object.
      *
@@ -81,3 +103,12 @@ export class CoreDbProvider {
 }
 
 export const CoreDB = makeSingleton(CoreDbProvider);
+
+/**
+ * Database query log entry.
+ */
+export interface CoreDbQueryLog {
+    sql: string;
+    duration: number;
+    params?: unknown[];
+}
diff --git a/tests/behat/classes/performance_measure.php b/tests/behat/classes/performance_measure.php
index 6646f5ce4..3348fba36 100644
--- a/tests/behat/classes/performance_measure.php
+++ b/tests/behat/classes/performance_measure.php
@@ -58,6 +58,16 @@ class performance_measure implements behat_app_listener {
      */
      public $blocking;
 
+    /**
+     * @var int
+     */
+    public $databaseStart;
+
+    /**
+     * @var int
+     */
+    public $database;
+
     /**
      * @var int
      */
@@ -90,6 +100,7 @@ class performance_measure implements behat_app_listener {
         $this->start = $this->now();
 
         $this->observeLongTasks();
+        $this->startDatabaseCount();
 
         $this->behatAppUnsubscribe = behat_app::listen($this);
     }
@@ -107,6 +118,7 @@ class performance_measure implements behat_app_listener {
 
         $this->analyseDuration();
         $this->analyseLongTasks();
+        $this->analyseDatabaseUsage();
         $this->analysePerformanceLogs();
     }
 
@@ -131,6 +143,7 @@ class performance_measure implements behat_app_listener {
             'styling' => $this->styling,
             'blocking' => $this->blocking,
             'longTasks' => count($this->longTasks),
+            'database' => $this->database,
             'networking' => $this->networking,
         ];
 
@@ -181,6 +194,17 @@ class performance_measure implements behat_app_listener {
         ");
     }
 
+    /**
+     * Record how many database queries have been logged so far.
+     */
+    private function startDatabaseCount(): void {
+        try {
+            $this->databaseStart = $this->driver->evaluateScript('dbProvider.queryLogs.length') ?? 0;
+        } catch (Exception $e) {
+            $this->databaseStart = 0;
+        }
+    }
+
     /**
      * Flush Performance observer.
      */
@@ -228,6 +252,13 @@ class performance_measure implements behat_app_listener {
         $this->blocking = $blocking;
     }
 
+    /**
+     * Analyse database usage.
+     */
+    private function analyseDatabaseUsage(): void {
+        $this->database = $this->driver->evaluateScript('dbProvider.queryLogs.length') - $this->databaseStart;
+    }
+
     /**
      * Analyse performance logs.
      */

From 4ecab6d3f17b6f26e6a880efeb0de418b9d45665 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 25 Jan 2022 09:29:06 +0100
Subject: [PATCH 0398/1008] MOBILE-3833 course: Format title and limit height
 in course storage

---
 .../pages/course-storage/course-storage.html  |  7 ++++---
 .../pages/course-storage/course-storage.scss  | 21 +++++++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.html b/src/addons/storagemanager/pages/course-storage/course-storage.html
index 4f1b55179..3b15683d5 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.html
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.html
@@ -71,14 +71,15 @@
                 </ion-card-header>
                 <ion-card-content>
                     <ng-container *ngFor="let module of section.modules">
-                        <ion-item class="ion-no-padding"
-                            *ngIf="(downloadEnabled && module.handlerData?.showDownloadButton) || module.totalSize > 0">
+                        <ion-item class="ion-no-padding core-course-storage-activity" *ngIf="downloadEnabled || module.totalSize > 0">
                             <core-mod-icon slot="start" *ngIf="module.handlerData.icon" [modicon]="module.handlerData.icon"
                                 [modname]="module.modname" [componentId]="module.instance">
                             </core-mod-icon>
                             <ion-label class="ion-text-wrap">
                                 <h3 class="{{module.handlerData!.class}} addon-storagemanager-module-size">
-                                    {{ module.name }}
+                                    <core-format-text [text]="module.handlerData.title" [courseId]="module.course" contextLevel="module"
+                                        [contextInstanceId]="module.id" [adaptImg]="false">
+                                    </core-format-text>
                                 </h3>
                                 <ion-badge color="light" *ngIf="module.totalSize > 0">
                                     {{ module.totalSize | coreBytesToSize }}
diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.scss b/src/addons/storagemanager/pages/course-storage/course-storage.scss
index 5e459df34..29bc1c7d8 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.scss
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.scss
@@ -1,4 +1,9 @@
+@import "~theme/globals";
+
 :host {
+    --core-format-text-background-gradient-rgb: var(--background-rgb, #{$ion-item-background-rgb});
+    --course-storage-max-activity-height: 120px;
+
     ion-card.section ion-card-header {
         margin-bottom: 8px;
         padding-top: 8px;
@@ -8,6 +13,22 @@
         font-weight: bold;
         font-size: 1.2rem;
     }
+
+    .core-course-storage-activity ion-label {
+        max-height: var(--course-storage-max-activity-height);
+
+        &:before {
+            content: '';
+            height: 100%;
+            min-height: var(--course-storage-max-activity-height);
+            position: absolute;
+            @include position(0, 0, null, 0);
+            background: -webkit-linear-gradient(top, rgba(var(--core-format-text-background-gradient-rgb), 0) calc(100% - 30px), rgba(var(--core-format-text-background-gradient-rgb), 1) calc(100% - 20px));
+            background: linear-gradient(to bottom, rgba(var(--core-format-text-background-gradient-rgb), 0) calc(100% - 30px), rgba(var(--core-format-text-background-gradient-rgb), 1) calc(100% - 20px));
+            z-index: 6;
+            pointer-events: none;
+        }
+    }
 }
 
 .storage-buttons {

From 1ba9f4ac8e9268c8bfd40d4ecf90805697d99dd1 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 26 Jan 2022 07:57:42 +0100
Subject: [PATCH 0399/1008] MMOBILE-3833 core: Fix watchOrientation in iOS 12

---
 src/core/services/screen.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/core/services/screen.ts b/src/core/services/screen.ts
index 6228f7700..04a0e6917 100644
--- a/src/core/services/screen.ts
+++ b/src/core/services/screen.ts
@@ -121,11 +121,16 @@ export class CoreScreenService {
      */
     watchOrientation(): void {
         // Listen media orientation CSS queries.
-        window.matchMedia('(orientation: portrait)').addEventListener('change', (m) => {
+        const changeListener = (m: MediaQueryListEvent) => {
             const orientation = m.matches ? CoreScreenOrientation.PORTRAIT : CoreScreenOrientation.LANDSCAPE;
 
             CoreEvents.trigger(CoreEvents.ORIENTATION_CHANGE, { orientation });
-        });
+        };
+
+        const mql = window.matchMedia('(orientation: portrait)');
+        mql.addEventListener ?
+            mql.addEventListener('change', changeListener) :
+            mql.addListener(changeListener);
     }
 
     /**

From cca8c0a53005438544d7d8bd08f3c0cf17d022b2 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 25 Jan 2022 09:33:40 +0100
Subject: [PATCH 0400/1008] MOBILE-3971 core: Improve config db performance

---
 src/core/classes/database-table.ts            | 194 ++++++++++++++++++
 src/core/classes/tests/database-table.test.ts | 124 +++++++++++
 src/core/services/config.ts                   |  52 +++--
 src/testing/utils.ts                          |   6 +-
 4 files changed, 352 insertions(+), 24 deletions(-)
 create mode 100644 src/core/classes/database-table.ts
 create mode 100644 src/core/classes/tests/database-table.test.ts

diff --git a/src/core/classes/database-table.ts b/src/core/classes/database-table.ts
new file mode 100644
index 000000000..5e6ea32ee
--- /dev/null
+++ b/src/core/classes/database-table.ts
@@ -0,0 +1,194 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { SQLiteDB, SQLiteDBRecordValues } from './sqlitedb';
+
+/**
+ * Database table wrapper used to improve performance by caching all data in memory
+ * for faster read operations.
+ */
+export abstract class CoreDatabaseTable<
+    DBRecord extends SQLiteDBRecordValues = SQLiteDBRecordValues,
+    PrimaryKeyColumns extends keyof DBRecord = 'id',
+    PrimaryKey extends GetPrimaryKey<DBRecord, PrimaryKeyColumns> = GetPrimaryKey<DBRecord, PrimaryKeyColumns>
+> {
+
+    /**
+     * Create an instance.
+     *
+     * @param db Database connection.
+     * @returns Instance.
+     */
+    static async create<This extends AnyCoreDatabaseTable>(this: CoreDatabaseTableConstructor<This>, db: SQLiteDB): Promise<This> {
+        const instance = new this(db);
+
+        await instance.initialize();
+
+        return instance;
+    }
+
+    protected db: SQLiteDB;
+    protected data: Record<string, DBRecord>;
+    protected primaryKeys: string[] = ['id'];
+
+    constructor(db: SQLiteDB) {
+        this.db = db;
+        this.data = {};
+    }
+
+    /**
+     * Find a record matching the given conditions.
+     *
+     * @param conditions Matching conditions.
+     * @returns Database record.
+     */
+    find(conditions: Partial<DBRecord>): DBRecord | null  {
+        return Object.values(this.data).find(record => this.recordMatches(record, conditions)) ?? null;
+    }
+
+    /**
+     * Find a record by its primary key.
+     *
+     * @param primaryKey Primary key.
+     * @returns Database record.
+     */
+    findByPrimaryKey(primaryKey: PrimaryKey): DBRecord | null {
+        return this.data[this.serializePrimaryKey(primaryKey)] ?? null;
+    }
+
+    /**
+     * Insert a new record.
+     *
+     * @param record Database record.
+     */
+    async insert(record: DBRecord): Promise<void> {
+        await this.db.insertRecord(this.table, record);
+
+        const primaryKey = this.serializePrimaryKey(this.getPrimaryKeyFromRecord(record));
+
+        this.data[primaryKey] = record;
+    }
+
+    /**
+     * Delete records matching the given conditions.
+     *
+     * @param conditions Matching conditions. If this argument is missing, all records will be deleted.
+     */
+    async delete(conditions?: Partial<DBRecord>): Promise<void> {
+        if (!conditions) {
+            await this.db.deleteRecords(this.table);
+
+            this.data = {};
+
+            return;
+        }
+
+        await this.db.deleteRecords(this.table, conditions);
+
+        Object.entries(this.data).forEach(([id, record]) => {
+            if (!this.recordMatches(record, conditions)) {
+                return;
+            }
+
+            delete this.data[id];
+        });
+    }
+
+    /**
+     * Delete a single record identified by its primary key.
+     *
+     * @param primaryKey Record primary key.
+     */
+    async deleteByPrimaryKey(primaryKey: PrimaryKey): Promise<void> {
+        await this.db.deleteRecords(this.table, primaryKey);
+
+        delete this.data[this.serializePrimaryKey(primaryKey)];
+    }
+
+    /**
+     * Database table name.
+     */
+    protected abstract get table(): string;
+
+    /**
+     * Initialize object by getting the current state of the database table.
+     */
+    protected async initialize(): Promise<void> {
+        const records = await this.db.getRecords<DBRecord>(this.table);
+
+        this.data = records.reduce((data, record) => {
+            const primaryKey = this.serializePrimaryKey(this.getPrimaryKeyFromRecord(record));
+
+            data[primaryKey] = record;
+
+            return data;
+        }, {});
+    }
+
+    /**
+     * Get an object with the columns representing the primary key of a database record.
+     *
+     * @param record Database record.
+     * @returns Primary key column-value pairs.
+     */
+    protected getPrimaryKeyFromRecord(record: DBRecord): PrimaryKey {
+        return this.primaryKeys.reduce((primaryKey, column) => {
+            primaryKey[column] = record[column];
+
+            return primaryKey;
+        }, {} as Record<PrimaryKeyColumns, unknown>) as PrimaryKey;
+    }
+
+    /**
+     * Serialize a primary key with a string representation.
+     *
+     * @param primaryKey Database record primary key.
+     * @returns Serialized primary key.
+     */
+    protected serializePrimaryKey(primaryKey: PrimaryKey): string {
+        return Object.values(primaryKey).map(value => String(value)).join('-');
+    }
+
+    /**
+     * Check whether a given record matches the given conditions.
+     *
+     * @param record Database record.
+     * @param conditions Conditions.
+     * @returns Whether the record matches the conditions.
+     */
+    protected recordMatches(record: DBRecord, conditions: Partial<DBRecord>): boolean {
+        return !Object.entries(conditions).some(([column, value]) => record[column] !== value);
+    }
+
+}
+
+/**
+ * Generic type to match against any concrete database table type.
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+type AnyCoreDatabaseTable = CoreDatabaseTable<SQLiteDBRecordValues, string, Record<string, any>>;
+
+/**
+ * Database table constructor.
+ */
+type CoreDatabaseTableConstructor<T extends AnyCoreDatabaseTable> = {
+    new (db: SQLiteDB): T;
+};
+
+/**
+ * Infer primary key type from database record and columns types.
+ */
+type GetPrimaryKey<DBRecord extends SQLiteDBRecordValues, PrimaryKeyColumns extends keyof DBRecord> = {
+    [column in PrimaryKeyColumns]: DBRecord[column];
+};
diff --git a/src/core/classes/tests/database-table.test.ts b/src/core/classes/tests/database-table.test.ts
new file mode 100644
index 000000000..92e6d7ec2
--- /dev/null
+++ b/src/core/classes/tests/database-table.test.ts
@@ -0,0 +1,124 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { mock } from '@/testing/utils';
+import { CoreDatabaseTable } from '@classes/database-table';
+import { SQLiteDB, SQLiteDBRecordValues } from '@classes/sqlitedb';
+
+interface User extends SQLiteDBRecordValues {
+    id: number;
+    name: string;
+    surname: string;
+}
+
+class UsersTable extends CoreDatabaseTable<User> {
+
+    protected table = 'users';
+
+}
+
+describe('CoreDatabaseTable', () => {
+
+    let records: User[];
+    let db: SQLiteDB;
+
+    beforeEach(() => {
+        records = [];
+        db = mock<SQLiteDB>({
+            getRecords: async <T>() => records as unknown as T[],
+            deleteRecords: async () => 0,
+            insertRecord: async () => 0,
+        });
+    });
+
+    it('reads all records on create', async () => {
+        await UsersTable.create(db);
+
+        expect(db.getRecords).toHaveBeenCalledWith('users');
+    });
+
+    it('finds items', async () => {
+        const john = { id: 1, name: 'John', surname: 'Doe' };
+        const amy = { id: 2, name: 'Amy', surname: 'Doe' };
+
+        records.push(john);
+        records.push(amy);
+
+        const table = await UsersTable.create(db);
+
+        expect(table.findByPrimaryKey({ id: 1 })).toEqual(john);
+        expect(table.findByPrimaryKey({ id: 2 })).toEqual(amy);
+        expect(table.find({ surname: 'Doe', name: 'John' })).toEqual(john);
+        expect(table.find({ surname: 'Doe', name: 'Amy' })).toEqual(amy);
+    });
+
+    it('inserts items', async () => {
+        // Arrange.
+        const john = { id: 1, name: 'John', surname: 'Doe' };
+
+        // Act.
+        const table = await UsersTable.create(db);
+
+        await table.insert(john);
+
+        // Assert.
+        expect(db.insertRecord).toHaveBeenCalledWith('users', john);
+
+        expect(table.findByPrimaryKey({ id: 1 })).toEqual(john);
+    });
+
+    it('deletes items', async () => {
+        // Arrange.
+        const john = { id: 1, name: 'John', surname: 'Doe' };
+        const amy = { id: 2, name: 'Amy', surname: 'Doe' };
+        const jane = { id: 3, name: 'Jane', surname: 'Smith' };
+
+        records.push(john);
+        records.push(amy);
+        records.push(jane);
+
+        // Act.
+        const table = await UsersTable.create(db);
+
+        await table.delete({ surname: 'Doe' });
+
+        // Assert.
+        expect(db.deleteRecords).toHaveBeenCalledWith('users', { surname: 'Doe' });
+
+        expect(table.findByPrimaryKey({ id: 1 })).toBeNull();
+        expect(table.findByPrimaryKey({ id: 2 })).toBeNull();
+        expect(table.findByPrimaryKey({ id: 3 })).toEqual(jane);
+    });
+
+    it('deletes items by primary key', async () => {
+        // Arrange.
+        const john = { id: 1, name: 'John', surname: 'Doe' };
+        const amy = { id: 2, name: 'Amy', surname: 'Doe' };
+
+        records.push(john);
+        records.push(amy);
+
+        // Act.
+        const table = await UsersTable.create(db);
+
+        await table.deleteByPrimaryKey({ id: 1 });
+
+        // Assert.
+        expect(db.deleteRecords).toHaveBeenCalledWith('users', { id: 1 });
+
+        expect(table.findByPrimaryKey({ id: 1 })).toBeNull();
+        expect(table.findByPrimaryKey({ id: 2 })).toEqual(amy);
+    });
+
+});
diff --git a/src/core/services/config.ts b/src/core/services/config.ts
index 70d6982ef..ee49af16d 100644
--- a/src/core/services/config.ts
+++ b/src/core/services/config.ts
@@ -15,9 +15,10 @@
 import { Injectable } from '@angular/core';
 
 import { CoreApp } from '@services/app';
-import { SQLiteDB } from '@classes/sqlitedb';
 import { makeSingleton } from '@singletons';
 import { CONFIG_TABLE_NAME, APP_SCHEMA, ConfigDBEntry } from '@services/database/config';
+import { CoreDatabaseTable } from '@classes/database-table';
+import { CorePromisedValue } from '@classes/promised-value';
 
 /**
  * Factory to provide access to dynamic and permanent config and settings.
@@ -26,11 +27,10 @@ import { CONFIG_TABLE_NAME, APP_SCHEMA, ConfigDBEntry } from '@services/database
 @Injectable({ providedIn: 'root' })
 export class CoreConfigProvider {
 
-    protected appDB: Promise<SQLiteDB>;
-    protected resolveAppDB!: (appDB: SQLiteDB) => void;
+    protected dbTable: CorePromisedValue<CoreConfigTable>;
 
     constructor() {
-        this.appDB = new Promise(resolve => this.resolveAppDB = resolve);
+        this.dbTable = new CorePromisedValue();
     }
 
     /**
@@ -43,7 +43,10 @@ export class CoreConfigProvider {
             // Ignore errors.
         }
 
-        this.resolveAppDB(CoreApp.getDB());
+        const db = CoreApp.getDB();
+        const table = await CoreConfigTable.create(db);
+
+        this.dbTable.resolve(table);
     }
 
     /**
@@ -53,9 +56,9 @@ export class CoreConfigProvider {
      * @return Promise resolved when done.
      */
     async delete(name: string): Promise<void> {
-        const db = await this.appDB;
+        const table = await this.dbTable;
 
-        await db.deleteRecords(CONFIG_TABLE_NAME, { name });
+        await table.deleteByPrimaryKey({ name });
     }
 
     /**
@@ -66,19 +69,18 @@ export class CoreConfigProvider {
      * @return Resolves upon success along with the config data. Reject on failure.
      */
     async get<T>(name: string, defaultValue?: T): Promise<T> {
-        const db = await this.appDB;
+        const table = await this.dbTable;
+        const record = table.findByPrimaryKey({ name });
 
-        try {
-            const entry = await db.getRecord<ConfigDBEntry>(CONFIG_TABLE_NAME, { name });
-
-            return entry.value;
-        } catch (error) {
-            if (defaultValue !== undefined) {
-                return defaultValue;
-            }
-
-            throw error;
+        if (record !== null) {
+            return record.value;
         }
+
+        if (defaultValue !== undefined) {
+            return defaultValue;
+        }
+
+        throw new Error(`Couldn't get config with name '${name}'`);
     }
 
     /**
@@ -89,11 +91,21 @@ export class CoreConfigProvider {
      * @return Promise resolved when done.
      */
     async set(name: string, value: number | string): Promise<void> {
-        const db = await this.appDB;
+        const table = await this.dbTable;
 
-        await db.insertRecord(CONFIG_TABLE_NAME, { name, value });
+        await table.insert({ name, value });
     }
 
 }
 
 export const CoreConfig = makeSingleton(CoreConfigProvider);
+
+/**
+ * Config database table.
+ */
+class CoreConfigTable extends CoreDatabaseTable<ConfigDBEntry, 'name'> {
+
+    protected table = CONFIG_TABLE_NAME;
+    protected primaryKeys = ['name'];
+
+}
diff --git a/src/testing/utils.ts b/src/testing/utils.ts
index 4b8ecadd9..e31f69047 100644
--- a/src/testing/utils.ts
+++ b/src/testing/utils.ts
@@ -133,12 +133,10 @@ export type WrapperComponentFixture<T> = ComponentFixture<WrapperComponent<T>>;
  * @param overrides Object with the properties or methods to override, or a list of methods to override with an empty function.
  * @return Mock instance.
  */
-export function mock<T>(instance?: T, overrides?: string[] | Record<string, unknown>): T;
-export function mock<T>(instance?: Partial<T>, overrides?: string[] | Record<string, unknown>): Partial<T>;
 export function mock<T>(
     instance: T | Partial<T> = {},
     overrides: string[] | Record<string, unknown> = {},
-): T | Partial<T> {
+): T {
     // If overrides is an object, apply them to the instance.
     if (!Array.isArray(overrides)) {
         Object.assign(instance, overrides);
@@ -162,7 +160,7 @@ export function mock<T>(
         }
     }
 
-    return instance;
+    return instance as T;
 }
 
 export function mockSingleton<T>(singletonClass: CoreSingletonProxy<T>, instance: T): T;

From 15f4856f81255a106c721730487614ddc71f6b2c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 26 Jan 2022 14:21:13 +0100
Subject: [PATCH 0401/1008] MOBILE-3833 core: Fix detect 3.4 or older sites

---
 src/core/classes/site.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/core/classes/site.ts b/src/core/classes/site.ts
index b6f17c472..8989abfde 100644
--- a/src/core/classes/site.ts
+++ b/src/core/classes/site.ts
@@ -576,9 +576,13 @@ export class CoreSite {
 
             // Call the WS.
             try {
-                // Send the language to use. Do it after checking cache to prevent losing offline data when changing language.
-                data.moodlewssettinglang = preSets.lang ?? await CoreLang.getCurrentLanguage();
-                data.moodlewssettinglang = data.moodlewssettinglang.replace('-', '_'); // Moodle uses underscore instead of dash.
+                if (method !== 'core_webservice_get_site_info') {
+                    // Send the language to use. Do it after checking cache to prevent losing offline data when changing language.
+                    // Don't send it to core_webservice_get_site_info, that WS is used to check if Moodle version is supported.
+                    data.moodlewssettinglang = preSets.lang ?? await CoreLang.getCurrentLanguage();
+                    // Moodle uses underscore instead of dash.
+                    data.moodlewssettinglang = data.moodlewssettinglang.replace('-', '_');
+                }
 
                 const response = await this.callOrEnqueueRequest<T>(method, data, preSets, wsPreSets);
 

From b6fbb6b4f747ce06c6baa45538033c01e4403811 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 26 Jan 2022 15:05:16 +0100
Subject: [PATCH 0402/1008] MOBILE-3833 login: Display right error in 2.9-3.1
 sites

---
 src/core/services/sites.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/core/services/sites.ts b/src/core/services/sites.ts
index e6538fd4e..032ebcf23 100644
--- a/src/core/services/sites.ts
+++ b/src/core/services/sites.ts
@@ -262,7 +262,7 @@ export class CoreSitesProvider {
         }
 
         // Service supported but an error happened. Return error.
-        if (error.errorcode == 'codingerror') {
+        if (error.errorcode === 'codingerror') {
             // This could be caused by a redirect. Check if it's the case.
             const redirect = await CoreUtils.checkRedirect(siteUrl);
 
@@ -272,6 +272,9 @@ export class CoreSitesProvider {
                 // We can't be sure if there is a redirect or not. Display cannot connect error.
                 error.message = Translate.instant('core.cannotconnecttrouble');
             }
+        } else if (error.errorcode === 'invalidrecord') {
+            // WebService not found, site not supported.
+            error.message = Translate.instant('core.login.invalidmoodleversion', { $a: CoreSite.MINIMUM_MOODLE_VERSION });
         }
 
         return new CoreSiteError({

From 29e21191431a6c55f66d281f9751326a2d53b2ca Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 18 Nov 2021 14:42:12 +0100
Subject: [PATCH 0403/1008] MOBILE-3932 resource: Display file info in resource
 index page

---
 scripts/langindex.json                        | 22 ++++++
 .../index/addon-mod-resource-index.html       | 79 +++++++++++++++----
 .../mod/resource/components/index/index.scss  | 11 +++
 .../mod/resource/components/index/index.ts    | 49 +++++++++---
 src/addons/mod/resource/lang.json             |  2 +
 src/assets/mimetypes.json                     | 19 ++++-
 .../course/classes/main-resource-component.ts |  1 +
 .../features/course/services/course-helper.ts | 39 ++++++---
 src/core/lang.json                            |  3 +
 9 files changed, 189 insertions(+), 36 deletions(-)
 create mode 100644 src/addons/mod/resource/components/index/index.scss

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 79ac9b310..6d97093db 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -909,6 +909,8 @@
   "addon.mod_resource.modifieddate": "resource",
   "addon.mod_resource.modulenameplural": "resource",
   "addon.mod_resource.openthefile": "local_moodlemobileapp",
+  "addon.mod_resource.resourcestatusoutdated": "local_moodlemobileapp",
+  "addon.mod_resource.resourcestatusoutdatedconfirm": "local_moodlemobileapp",
   "addon.mod_resource.uploadeddate": "resource",
   "addon.mod_scorm.asset": "scorm",
   "addon.mod_scorm.assetlaunched": "scorm",
@@ -1358,9 +1360,23 @@
   "assets.countries.ZA": "countries",
   "assets.countries.ZM": "countries",
   "assets.countries.ZW": "countries",
+  "assets.mimetypes.application/dash_xml": "mimetypes",
   "assets.mimetypes.application/epub_zip": "mimetypes",
+  "assets.mimetypes.application/json": "mimetypes",
   "assets.mimetypes.application/msword": "mimetypes",
   "assets.mimetypes.application/pdf": "mimetypes",
+  "assets.mimetypes.application/vnd.google-apps.audio": "local_moodlemobileapp",
+  "assets.mimetypes.application/vnd.google-apps.document": "local_moodlemobileapp",
+  "assets.mimetypes.application/vnd.google-apps.drawing": "local_moodlemobileapp",
+  "assets.mimetypes.application/vnd.google-apps.file": "local_moodlemobileapp",
+  "assets.mimetypes.application/vnd.google-apps.folder": "local_moodlemobileapp",
+  "assets.mimetypes.application/vnd.google-apps.form": "local_moodlemobileapp",
+  "assets.mimetypes.application/vnd.google-apps.fusiontable": "local_moodlemobileapp",
+  "assets.mimetypes.application/vnd.google-apps.presentation": "local_moodlemobileapp",
+  "assets.mimetypes.application/vnd.google-apps.script": "local_moodlemobileapp",
+  "assets.mimetypes.application/vnd.google-apps.site": "local_moodlemobileapp",
+  "assets.mimetypes.application/vnd.google-apps.spreadsheet": "local_moodlemobileapp",
+  "assets.mimetypes.application/vnd.google-apps.video": "local_moodlemobileapp",
   "assets.mimetypes.application/vnd.moodle.backup": "mimetypes",
   "assets.mimetypes.application/vnd.ms-excel": "mimetypes",
   "assets.mimetypes.application/vnd.ms-excel.sheet.macroEnabled.12": "mimetypes",
@@ -1379,6 +1395,7 @@
   "assets.mimetypes.application/x-iwork-numbers-sffnumbers": "mimetypes",
   "assets.mimetypes.application/x-iwork-pages-sffpages": "mimetypes",
   "assets.mimetypes.application/x-javascript": "mimetypes",
+  "assets.mimetypes.application/x-mpegURL": "mimetypes",
   "assets.mimetypes.application/x-mspublisher": "mimetypes",
   "assets.mimetypes.application/x-shockwave-flash": "mimetypes",
   "assets.mimetypes.application/xhtml_xml": "mimetypes",
@@ -1393,6 +1410,8 @@
   "assets.mimetypes.group:html_track": "mimetypes",
   "assets.mimetypes.group:html_video": "mimetypes",
   "assets.mimetypes.group:image": "mimetypes",
+  "assets.mimetypes.group:media_source": "mimetypes",
+  "assets.mimetypes.group:optimised_image": "mimetypes",
   "assets.mimetypes.group:presentation": "mimetypes",
   "assets.mimetypes.group:sourcecode": "mimetypes",
   "assets.mimetypes.group:spreadsheet": "mimetypes",
@@ -1593,6 +1612,7 @@
   "core.custom": "form",
   "core.datastoredoffline": "local_moodlemobileapp",
   "core.date": "moodle",
+  "core.datecreated": "repository",
   "core.day": "moodle",
   "core.days": "moodle",
   "core.decsep": "langconfig",
@@ -2208,6 +2228,7 @@
   "core.sitehome.sitehome": "moodle",
   "core.sitehome.sitenews": "moodle",
   "core.sitemaintenance": "admin",
+  "core.size": "moodle",
   "core.sizeb": "moodle",
   "core.sizegb": "moodle",
   "core.sizekb": "moodle",
@@ -2262,6 +2283,7 @@
   "core.toggledelete": "local_moodlemobileapp",
   "core.tryagain": "local_moodlemobileapp",
   "core.twoparagraphs": "local_moodlemobileapp",
+  "core.type": "repository",
   "core.uhoh": "local_moodlemobileapp",
   "core.unexpectederror": "local_moodlemobileapp",
   "core.unicodenotsupported": "local_moodlemobileapp",
diff --git a/src/addons/mod/resource/components/index/addon-mod-resource-index.html b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
index e0f1279be..bdeaa056d 100644
--- a/src/addons/mod/resource/components/index/addon-mod-resource-index.html
+++ b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
@@ -42,22 +42,71 @@
     </div>
 
     <ng-container *ngIf="mode == 'external'">
-        <ion-button expand="block" class="ion-margin" (click)="open(openFileAction.OPEN)">
-            <ng-container *ngIf="isStreamedFile">
-                <ion-icon name="fas-play" slot="start" aria-hidden="true"></ion-icon>
-                {{ 'core.play' | translate }}
-            </ng-container>
-            <ng-container *ngIf="!isStreamedFile">
-                <ion-icon name="far-file" slot="start" aria-hidden="true"></ion-icon>
-                {{ 'addon.mod_resource.openthefile' | translate }}
-            </ng-container>
-        </ion-button>
+        <ion-list>
+            <ion-item class="ion-text-wrap" *ngIf="type">
+                <ion-label>
+                    <h3>{{ 'core.type' | translate }}</h3>
+                    <p>{{ type }}</p>
+                </ion-label>
+            </ion-item>
 
-        <ion-button *ngIf="isIOS && (!shouldOpenInBrowser || !isOnline)" expand="block" class="ion-margin"
-            (click)="open(openFileAction.OPEN_WITH)">
-            <ion-icon name="far-share-square" slot="start" aria-hidden="true"></ion-icon>
-            {{ 'core.openwith' | translate }}
-        </ion-button>
+            <ng-container *ngIf="!isExternalFile">
+                <ion-item class="ion-text-wrap" *ngIf="readableSize">
+                    <ion-label>
+                        <h3>{{ 'core.size' | translate }}</h3>
+                        <p>{{ readableSize }}</p>
+                    </ion-label>
+                </ion-item>
+
+                <ion-item class="ion-text-wrap" *ngIf="timecreated > 0">
+                    <ion-label>
+                        <h3>{{ 'core.datecreated' | translate }}</h3>
+                        <p>{{ timecreated | coreFormatDate }}</p>
+                    </ion-label>
+                </ion-item>
+
+                <ion-item class="ion-text-wrap" *ngIf="timemodified > 0">
+                    <ion-label>
+                        <h3>{{ 'core.lastmodified' | translate }}</h3>
+                        <p>{{ timemodified | coreFormatDate }}</p>
+                    </ion-label>
+                </ion-item>
+
+                <ion-item class="ion-text-wrap" *ngIf="downloadTimeReadable">
+                    <ion-label>
+                        <h3>{{ 'core.lastdownloaded' | translate }}</h3>
+                        <p>{{ downloadTimeReadable }}</p>
+                        <ion-grid *ngIf="prefetchStatus === outdatedStatus" class="addon-mod_resource-outdated">
+                            <ion-row class="ion-align-items-center">
+                                <ion-col size="auto">
+                                    <ion-icon color="warning" name="fas-exclamation-triangle" aria-hidden="true"></ion-icon>
+                                </ion-col>
+                                <ion-col>
+                                    <p><strong>{{ 'addon.mod_resource.resourcestatusoutdated' | translate }}</strong></p>
+                                </ion-col>
+                            </ion-row>
+                        </ion-grid>
+                    </ion-label>
+                </ion-item>
+            </ng-container>
+
+            <ion-button expand="block" class="ion-margin" (click)="open(openFileAction.OPEN)">
+                <ng-container *ngIf="isStreamedFile">
+                    <ion-icon name="fas-play" slot="start" aria-hidden="true"></ion-icon>
+                    {{ 'core.play' | translate }}
+                </ng-container>
+                <ng-container *ngIf="!isStreamedFile">
+                    <ion-icon name="far-file" slot="start" aria-hidden="true"></ion-icon>
+                    {{ 'addon.mod_resource.openthefile' | translate }}
+                </ng-container>
+            </ion-button>
+
+            <ion-button *ngIf="isIOS && (!shouldOpenInBrowser || !isOnline)" expand="block" class="ion-margin"
+                (click)="open(openFileAction.OPEN_WITH)">
+                <ion-icon name="far-share-square" slot="start" aria-hidden="true"></ion-icon>
+                {{ 'core.openwith' | translate }}
+            </ion-button>
+        </ion-list>
     </ng-container>
 </core-loading>
 
diff --git a/src/addons/mod/resource/components/index/index.scss b/src/addons/mod/resource/components/index/index.scss
new file mode 100644
index 000000000..b14ad8392
--- /dev/null
+++ b/src/addons/mod/resource/components/index/index.scss
@@ -0,0 +1,11 @@
+@import "~theme/globals";
+
+:host {
+    .addon-mod_resource-outdated {
+        @include padding(4px, 0px, 0px, 0px);
+
+        ion-icon {
+            font-size: 24px;
+        }
+    }
+}
diff --git a/src/addons/mod/resource/components/index/index.ts b/src/addons/mod/resource/components/index/index.ts
index 3987378fc..a5d38511a 100644
--- a/src/addons/mod/resource/components/index/index.ts
+++ b/src/addons/mod/resource/components/index/index.ts
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { CoreConstants } from '@/core/constants';
 import { Component, OnDestroy, OnInit, Optional } from '@angular/core';
 import { CoreError } from '@classes/errors/error';
 import { CoreCourseModuleMainResourceComponent } from '@features/course/classes/main-resource-component';
@@ -21,6 +22,7 @@ import { CoreCourseModulePrefetchDelegate } from '@features/course/services/modu
 import { CoreApp } from '@services/app';
 import { CoreFileHelper } from '@services/file-helper';
 import { CoreSites } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreMimetypeUtils } from '@services/utils/mimetype';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreUtils, OpenFileAction } from '@services/utils/utils';
@@ -39,6 +41,7 @@ import { AddonModResourceHelper } from '../../services/resource-helper';
 @Component({
     selector: 'addon-mod-resource-index',
     templateUrl: 'addon-mod-resource-index.html',
+    styleUrls: ['index.scss'],
 })
 export class AddonModResourceIndexComponent extends CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy {
 
@@ -55,6 +58,14 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
     isStreamedFile = false;
     shouldOpenInBrowser = false;
 
+    // Variables for 'external' mode.
+    type = '';
+    readableSize = '';
+    timecreated = -1;
+    timemodified = -1;
+    isExternalFile = false;
+    outdatedStatus = CoreConstants.OUTDATED;
+
     protected onlineObserver?: Subscription;
 
     constructor(@Optional() courseContentsPage?: CoreCourseContentsPage) {
@@ -70,15 +81,13 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
         this.isIOS = CoreApp.isIOS();
         this.isOnline = CoreApp.isOnline();
 
-        if (this.isIOS) {
-            // Refresh online status when changes.
-            this.onlineObserver = Network.onChange().subscribe(() => {
-                // Execute the callback in the Angular zone, so change detection doesn't stop working.
-                NgZone.run(() => {
-                    this.isOnline = CoreApp.isOnline();
-                });
+        // Refresh online status when changes.
+        this.onlineObserver = Network.onChange().subscribe(() => {
+            // Execute the callback in the Angular zone, so change detection doesn't stop working.
+            NgZone.run(() => {
+                this.isOnline = CoreApp.isOnline();
             });
-        }
+        });
 
         await this.loadContent();
         try {
@@ -153,13 +162,25 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
             } else {
                 this.mode = 'external';
                 this.warning = '';
+                let mimetype: string;
 
                 if (this.isIOS) {
                     this.shouldOpenInBrowser = CoreFileHelper.shouldOpenInBrowser(contents[0]);
                 }
 
-                const mimetype = await CoreUtils.getMimeTypeFromUrl(CoreFileHelper.getFileUrl(contents[0]));
+                if ('contentsinfo' in this.module && this.module.contentsinfo) {
+                    mimetype = this.module.contentsinfo.mimetypes[0];
+                    this.readableSize = CoreTextUtils.bytesToSize(this.module.contentsinfo.filessize, 1);
+                    this.timemodified = this.module.contentsinfo.lastmodified * 1000;
+                } else {
+                    mimetype = await CoreUtils.getMimeTypeFromUrl(CoreFileHelper.getFileUrl(contents[0]));
+                    this.readableSize = CoreTextUtils.bytesToSize(contents[0].filesize, 1);
+                    this.timemodified = contents[0].timemodified * 1000;
+                }
 
+                this.timecreated = contents[0].timecreated * 1000;
+                this.isExternalFile = !!contents[0].isexternalfile;
+                this.type = CoreMimetypeUtils.getMimetypeDescription(mimetype);
                 this.isStreamedFile = CoreMimetypeUtils.isStreamedMimetype(mimetype);
             }
         } finally {
@@ -183,6 +204,16 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
             downloadable = await AddonModResourceHelper.isMainFileDownloadable(this.module);
 
             if (downloadable) {
+                if (this.prefetchStatus === CoreConstants.OUTDATED && !this.isOnline) {
+                    // Warn the user that the file isn't updated.
+                    const alert = await CoreDomUtils.showAlert(
+                        undefined,
+                        Translate.instant('addon.mod_resource.resourcestatusoutdated'),
+                    );
+
+                    await alert.onWillDismiss();
+                }
+
                 return AddonModResourceHelper.openModuleFile(this.module, this.courseId, { iOSOpenFileAction });
             }
         }
diff --git a/src/addons/mod/resource/lang.json b/src/addons/mod/resource/lang.json
index 2449d53e3..22626646e 100644
--- a/src/addons/mod/resource/lang.json
+++ b/src/addons/mod/resource/lang.json
@@ -3,5 +3,7 @@
     "modifieddate": "Modified {{$a}}",
     "modulenameplural": "Files",
     "openthefile": "Open",
+    "resourcestatusoutdated": "This file has changed since you last opened it.",
+    "resourcestatusoutdatedconfirm": "There is a newer version of this file. To see it, please connect your device to the internet.",
     "uploadeddate": "Uploaded {{$a}}"
 }
diff --git a/src/assets/mimetypes.json b/src/assets/mimetypes.json
index f94347be4..a1b422dc5 100644
--- a/src/assets/mimetypes.json
+++ b/src/assets/mimetypes.json
@@ -1,7 +1,21 @@
 {
+  "application/dash_xml": "Dynamic Adaptive Streaming over HTTP (MPEG-DASH)",
   "application/epub_zip": "EPUB ebook",
+  "application/json": "{{$a.MIMETYPE2}} text",
   "application/msword": "Word document",
   "application/pdf": "PDF document",
+  "application/vnd.google-apps.audio": "Google Drive audio",
+  "application/vnd.google-apps.document": "Google Docs",
+  "application/vnd.google-apps.drawing": "Google Drawing",
+  "application/vnd.google-apps.file": "Google Drive file",
+  "application/vnd.google-apps.folder": "Google Drive folder",
+  "application/vnd.google-apps.form": "Google Forms",
+  "application/vnd.google-apps.fusiontable": "Google Fusion Tables",
+  "application/vnd.google-apps.presentation": "Google Slides",
+  "application/vnd.google-apps.script": "Google Apps Scripts",
+  "application/vnd.google-apps.site": "Google Sites",
+  "application/vnd.google-apps.spreadsheet": "Google Sheets",
+  "application/vnd.google-apps.video": "Google Drive video",
   "application/vnd.moodle.backup": "Moodle backup",
   "application/vnd.ms-excel": "Excel spreadsheet",
   "application/vnd.ms-excel.sheet.macroEnabled.12": "Excel 2007 macro-enabled workbook",
@@ -20,6 +34,7 @@
   "application/x-iwork-numbers-sffnumbers": "iWork Numbers spreadsheet",
   "application/x-iwork-pages-sffpages": "iWork Pages document",
   "application/x-javascript": "JavaScript source",
+  "application/x-mpegURL": "HTTP Live Streaming (HLS)",
   "application/x-mspublisher": "Publisher document",
   "application/x-shockwave-flash": "Flash animation",
   "application/xhtml_xml": "XHTML document",
@@ -34,6 +49,8 @@
   "group:html_track": "HTML track files",
   "group:html_video": "Video files natively supported by browsers",
   "group:image": "Image files",
+  "group:media_source": "Streaming media",
+  "group:optimised_image": "Image files to be optimised, such as badges",
   "group:presentation": "Presentation files",
   "group:sourcecode": "Source code",
   "group:spreadsheet": "Spreadsheet files",
@@ -51,4 +68,4 @@
   "text/rtf": "RTF document",
   "text/vtt": "Web Video Text Track",
   "video": "Video file ({{$a.EXT}})"
-}
\ No newline at end of file
+}
diff --git a/src/core/features/course/classes/main-resource-component.ts b/src/core/features/course/classes/main-resource-component.ts
index d8ae2c48d..24964fc75 100644
--- a/src/core/features/course/classes/main-resource-component.ts
+++ b/src/core/features/course/classes/main-resource-component.ts
@@ -67,6 +67,7 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
     prefetchStatus?: string; // Used when calling fillContextMenu.
     prefetchText?: string; // Used when calling fillContextMenu.
     size?: string; // Used when calling fillContextMenu.
+    downloadTimeReadable?: string; // Last download time in a readable format. Used when calling fillContextMenu.
     isDestroyed = false; // Whether the component is destroyed, used when calling fillContextMenu.
     contextMenuStatusObserver?: CoreEventObserver; // Observer of package status, used when calling fillContextMenu.
     contextFileStatusObserver?: CoreEventObserver; // Observer of file status, used when calling fillContextMenu.
diff --git a/src/core/features/course/services/course-helper.ts b/src/core/features/course/services/course-helper.ts
index cfde46f6f..737a405ae 100644
--- a/src/core/features/course/services/course-helper.ts
+++ b/src/core/features/course/services/course-helper.ts
@@ -905,17 +905,30 @@ export class CoreCourseHelperProvider {
         }
 
         if (!path) {
-            path = await this.downloadModuleWithMainFile(
-                module,
-                courseId,
-                fixedUrl,
-                files,
-                status,
-                component,
-                componentId,
-                siteId,
-                options,
-            );
+            try {
+                path = await this.downloadModuleWithMainFile(
+                    module,
+                    courseId,
+                    fixedUrl,
+                    files,
+                    status,
+                    component,
+                    componentId,
+                    siteId,
+                    options,
+                );
+            } catch (error) {
+                if (status !== CoreConstants.OUTDATED) {
+                    throw error;
+                }
+
+                // Use the local file even if it's outdated.
+                try {
+                    path = await CoreFilepool.getInternalUrlByUrl(siteId, mainFile.fileurl);
+                } catch {
+                    throw error;
+                }
+            }
         }
 
         return {
@@ -1056,6 +1069,7 @@ export class CoreCourseHelperProvider {
         instance.size = moduleInfo.sizeReadable;
         instance.prefetchStatusIcon = moduleInfo.statusIcon;
         instance.prefetchStatus = moduleInfo.status;
+        instance.downloadTimeReadable = CoreTextUtils.ucFirst(moduleInfo.downloadTimeReadable);
 
         if (moduleInfo.status != CoreConstants.NOT_DOWNLOADABLE) {
             // Module is downloadable, get the text to display to prefetch.
@@ -1478,6 +1492,8 @@ export class CoreCourseHelperProvider {
             // Currently, some modules pass invalidateCache=false because they already invalidate data in downloadResourceIfNeeded.
             // If this function is changed to do more actions if invalidateCache=true, please review those modules.
             CoreCourseModulePrefetchDelegate.invalidateModuleStatusCache(module);
+
+            await CoreUtils.ignoreErrors(CoreCourseModulePrefetchDelegate.invalidateCourseUpdates(courseId));
         }
 
         const results = await Promise.all([
@@ -2191,6 +2207,7 @@ type ComponentWithContextMenu = {
     size?: string;
     prefetchStatus?: string;
     prefetchText?: string;
+    downloadTimeReadable?: string;
     contextMenuStatusObserver?: CoreEventObserver;
     contextFileStatusObserver?: CoreEventObserver;
 };
diff --git a/src/core/lang.json b/src/core/lang.json
index 43fab245f..6690dc4bb 100644
--- a/src/core/lang.json
+++ b/src/core/lang.json
@@ -64,6 +64,7 @@
     "custom": "Custom",
     "datastoredoffline": "Data stored in the device because it couldn't be sent. It will be sent automatically later.",
     "date": "Date",
+    "datecreated": "Created",
     "day": "day",
     "days": "days",
     "decsep": ".",
@@ -271,6 +272,7 @@
     "showmore": "Show more...",
     "site": "Site",
     "sitemaintenance": "The site is undergoing maintenance and is currently not available",
+    "size": "Size",
     "sizeb": "bytes",
     "sizegb": "GB",
     "sizekb": "KB",
@@ -309,6 +311,7 @@
     "toggledelete": "Toggle delete buttons",
     "tryagain": "Try again",
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
+    "type": "Type",
     "uhoh": "Uh oh!",
     "unexpectederror": "Unexpected error. Please close and reopen the application then try again.",
     "unicodenotsupported": "Some emojis are not supported on this site. Such characters will be removed when the message is sent.",

From 080e37013636027b5f853c97acc6f3594667ae6b Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 24 Jan 2022 12:27:12 +0100
Subject: [PATCH 0404/1008] MOBILE-3932 resource: Fix some non-null assertions
 warnings

---
 src/addons/mod/book/components/index/index.ts     |  2 +-
 .../course/services/module-prefetch-delegate.ts   |  6 +++---
 src/core/services/utils/mimetype.ts               | 15 ++++++---------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/addons/mod/book/components/index/index.ts b/src/addons/mod/book/components/index/index.ts
index d7f78d112..a984af095 100644
--- a/src/addons/mod/book/components/index/index.ts
+++ b/src/addons/mod/book/components/index/index.ts
@@ -204,7 +204,7 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
 
         // Chapter loaded, log view.
         await CoreUtils.ignoreErrors(AddonModBook.logView(
-            this.module.instance!,
+            this.module.instance,
             logChapterId ? chapterId : undefined,
             this.module.name,
         ));
diff --git a/src/core/features/course/services/module-prefetch-delegate.ts b/src/core/features/course/services/module-prefetch-delegate.ts
index a787928db..d75e36759 100644
--- a/src/core/features/course/services/module-prefetch-delegate.ts
+++ b/src/core/features/course/services/module-prefetch-delegate.ts
@@ -1252,7 +1252,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
         // Treat warnings, adding the not supported modules.
         response.warnings?.forEach((warning) => {
             if (warning.warningcode == 'missingcallback') {
-                result[warning.itemid!] = false;
+                result[warning.itemid || -1] = false;
             }
         });
 
@@ -1304,10 +1304,10 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
         this.statusCache.invalidate(packageId);
         this.statusCache.setValue(packageId, 'status', status);
 
-        if (sectionId) {
+        if (courseId && sectionId) {
             const data: CoreEventSectionStatusChangedData = {
                 sectionId,
-                courseId: courseId!,
+                courseId: courseId,
             };
             CoreEvents.trigger(CoreEvents.SECTION_STATUS_CHANGED, data, CoreSites.getCurrentSiteId());
         }
diff --git a/src/core/services/utils/mimetype.ts b/src/core/services/utils/mimetype.ts
index d1c51fa1c..d8e4610ed 100644
--- a/src/core/services/utils/mimetype.ts
+++ b/src/core/services/utils/mimetype.ts
@@ -307,7 +307,7 @@ export class CoreMimetypeUtilsProvider {
         let position;
 
         if (split.length > 1) {
-            candidate = split.pop()!.toLowerCase();
+            candidate = split[split.length - 1].toLowerCase();
             // Remove params if any.
             position = candidate.indexOf('?');
             if (position > -1) {
@@ -554,17 +554,14 @@ export class CoreMimetypeUtilsProvider {
         }
 
         extension = this.cleanExtension(extension);
+        const extensionGroups = this.extToMime[extension] && this.extToMime[extension].groups;
+        let found = false;
 
-        if (groups?.length && this.extToMime[extension]?.groups) {
-            for (let i = 0; i < this.extToMime[extension].groups!.length; i++) {
-                const group = this.extToMime[extension].groups![i];
-                if (groups.indexOf(group) != -1) {
-                    return true;
-                }
-            }
+        if (groups.length && extensionGroups) {
+            found = extensionGroups.some((group => groups.includes(group)));
         }
 
-        return false;
+        return found;
     }
 
     /**

From 3ae6eebebf811f2a83b132db30b141d936700735 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 27 Jan 2022 16:28:12 +0100
Subject: [PATCH 0405/1008] MOBILE-3316 core: Handle user suspended error

---
 scripts/langindex.json                        |  1 +
 src/core/classes/site.ts                      |  6 +++
 .../features/user/pages/profile/profile.html  |  1 +
 .../user/pages/profile/profile.page.ts        |  2 +
 src/core/features/user/services/user.ts       | 48 +++++++++++--------
 src/core/lang.json                            |  1 +
 src/core/services/utils/utils.ts              |  1 +
 src/core/singletons/events.ts                 | 10 ++++
 8 files changed, 51 insertions(+), 19 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 6d97093db..2736fd5a9 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -2326,6 +2326,7 @@
   "core.userdeleted": "moodle",
   "core.userdetails": "moodle",
   "core.usernotfullysetup": "error",
+  "core.usersuspended": "moodle",
   "core.users": "moodle",
   "core.view": "moodle",
   "core.viewcode": "local_moodlemobileapp",
diff --git a/src/core/classes/site.ts b/src/core/classes/site.ts
index 8989abfde..50ba03d5c 100644
--- a/src/core/classes/site.ts
+++ b/src/core/classes/site.ts
@@ -615,6 +615,12 @@ export class CoreSite {
                     CoreEvents.trigger(CoreEvents.USER_DELETED, { params: data }, this.id);
                     error.message = Translate.instant('core.userdeleted');
 
+                    throw new CoreWSError(error);
+                } else if (error.errorcode === 'wsaccessusersuspended') {
+                    // User suspended, trigger event.
+                    CoreEvents.trigger(CoreEvents.USER_SUSPENDED, { params: data }, this.id);
+                    error.message = Translate.instant('core.usersuspended');
+
                     throw new CoreWSError(error);
                 } else if (error.errorcode === 'forcepasswordchangenotice') {
                     // Password Change Forced, trigger event. Try to get data from cache, the event will handle the error.
diff --git a/src/core/features/user/pages/profile/profile.html b/src/core/features/user/pages/profile/profile.html
index 1d12c3003..e135eced7 100644
--- a/src/core/features/user/pages/profile/profile.html
+++ b/src/core/features/user/pages/profile/profile.html
@@ -88,6 +88,7 @@
         <core-empty-box *ngIf="!user && !isDeleted && isEnrolled" icon="far-user" [message]=" 'core.user.detailsnotavailable' | translate">
         </core-empty-box>
         <core-empty-box *ngIf="isDeleted" icon="far-user" [message]="'core.userdeleted' | translate"></core-empty-box>
+        <core-empty-box *ngIf="isSuspended" icon="far-user" [message]="'core.usersuspended' | translate"></core-empty-box>
         <core-empty-box *ngIf="!isEnrolled" icon="far-user" [message]="'core.notenrolledprofile' | translate"></core-empty-box>
     </core-loading>
 </ion-content>
diff --git a/src/core/features/user/pages/profile/profile.page.ts b/src/core/features/user/pages/profile/profile.page.ts
index e23ff8f3c..a4cdef678 100644
--- a/src/core/features/user/pages/profile/profile.page.ts
+++ b/src/core/features/user/pages/profile/profile.page.ts
@@ -53,6 +53,7 @@ export class CoreUserProfilePage implements OnInit, OnDestroy {
     isLoadingHandlers = false;
     user?: CoreUserProfile;
     isDeleted = false;
+    isSuspended = false;
     isEnrolled = true;
     rolesFormatted?: string;
     actionHandlers: CoreUserProfileHandlerData[] = [];
@@ -114,6 +115,7 @@ export class CoreUserProfilePage implements OnInit, OnDestroy {
                 await CoreUser.logView(this.userId, this.courseId, this.user.fullname);
             } catch (error) {
                 this.isDeleted = error?.errorcode === 'userdeleted';
+                this.isSuspended = error?.errorcode === 'wsaccessusersuspended';
                 this.isEnrolled = error?.errorcode !== 'notenrolledprofile';
             }
         } finally {
diff --git a/src/core/features/user/services/user.ts b/src/core/features/user/services/user.ts
index 15e2236ad..c74c9642d 100644
--- a/src/core/features/user/services/user.ts
+++ b/src/core/features/user/services/user.ts
@@ -22,7 +22,7 @@ import { CoreUserOffline } from './user-offline';
 import { CoreLogger } from '@singletons/logger';
 import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
 import { makeSingleton, Translate } from '@singletons';
-import { CoreEvents } from '@singletons/events';
+import { CoreEvents, CoreEventSiteData, CoreEventUserDeletedData, CoreEventUserSuspendedData } from '@singletons/events';
 import { CoreStatusWithWarningsWSResponse, CoreWSExternalWarning } from '@services/ws';
 import { CoreError } from '@classes/errors/error';
 import { USERS_TABLE_NAME, CoreUserDBRecord } from './database/user';
@@ -61,24 +61,8 @@ export class CoreUserProvider {
     constructor() {
         this.logger = CoreLogger.getInstance('CoreUserProvider');
 
-        CoreEvents.on(CoreEvents.USER_DELETED, (data) => {
-            // Search for userid in params.
-            let userId = 0;
-
-            if (data.params.userid) {
-                userId = data.params.userid;
-            } else if (data.params.userids) {
-                userId = data.params.userids[0];
-            } else if (data.params.field === 'id' && data.params.values && data.params.values.length) {
-                userId = data.params.values[0];
-            } else if (data.params.userlist && data.params.userlist.length) {
-                userId = data.params.userlist[0].userid;
-            }
-
-            if (userId > 0) {
-                this.deleteStoredUser(userId, data.siteId);
-            }
-        });
+        CoreEvents.on(CoreEvents.USER_DELETED, data => this.handleUserKickedOutEvent(data));
+        CoreEvents.on(CoreEvents.USER_SUSPENDED, data => this.handleUserKickedOutEvent(data));
     }
 
     /**
@@ -153,6 +137,32 @@ export class CoreUserProvider {
         return result.profileimageurl!;
     }
 
+    /**
+     * Handle an event where a user was kicked out of the site.
+     *
+     * @param data Event data.
+     */
+    async handleUserKickedOutEvent(
+        data: CoreEventSiteData & (CoreEventUserDeletedData | CoreEventUserSuspendedData),
+    ): Promise<void> {
+        // Search for userid in params.
+        let userId = 0;
+
+        if (data.params.userid) {
+            userId = data.params.userid;
+        } else if (data.params.userids) {
+            userId = data.params.userids[0];
+        } else if (data.params.field === 'id' && data.params.values && data.params.values.length) {
+            userId = data.params.values[0];
+        } else if (data.params.userlist && data.params.userlist.length) {
+            userId = data.params.userlist[0].userid;
+        }
+
+        if (userId > 0) {
+            await this.deleteStoredUser(userId, data.siteId);
+        }
+    }
+
     /**
      * Store user basic information in local DB to be retrieved if the WS call fails.
      *
diff --git a/src/core/lang.json b/src/core/lang.json
index 6690dc4bb..f31ccea49 100644
--- a/src/core/lang.json
+++ b/src/core/lang.json
@@ -326,6 +326,7 @@
     "userdeleted": "This user account has been deleted",
     "userdetails": "User details",
     "usernotfullysetup": "User not fully set-up",
+    "usersuspended": "This user account has been suspended",
     "users": "Users",
     "view": "View",
     "viewcode": "View code",
diff --git a/src/core/services/utils/utils.ts b/src/core/services/utils/utils.ts
index 2b72fb6c3..9d79f6f63 100644
--- a/src/core/services/utils/utils.ts
+++ b/src/core/services/utils/utils.ts
@@ -862,6 +862,7 @@ export class CoreUtilsProvider {
                 error.errorcode != 'userdeleted' && error.errorcode != 'upgraderunning' &&
                 error.errorcode != 'forcepasswordchangenotice' && error.errorcode != 'usernotfullysetup' &&
                 error.errorcode != 'sitepolicynotagreed' && error.errorcode != 'sitemaintenance' &&
+                error.errorcode != 'wsaccessusersuspended' &&
                 !this.isExpiredTokenError(error)));
     }
 
diff --git a/src/core/singletons/events.ts b/src/core/singletons/events.ts
index ecc3a9ad8..21b0594ef 100644
--- a/src/core/singletons/events.ts
+++ b/src/core/singletons/events.ts
@@ -43,6 +43,7 @@ export interface CoreEventsData {
     [CoreEvents.COURSE_STATUS_CHANGED]: CoreEventCourseStatusChanged;
     [CoreEvents.PACKAGE_STATUS_CHANGED]: CoreEventPackageStatusChanged;
     [CoreEvents.USER_DELETED]: CoreEventUserDeletedData;
+    [CoreEvents.USER_SUSPENDED]: CoreEventUserSuspendedData;
     [CoreEvents.FORM_ACTION]: CoreEventFormActionData;
     [CoreEvents.NOTIFICATION_SOUND_CHANGED]: CoreEventNotificationSoundChangedData;
     [CoreEvents.SELECT_COURSE_TAB]: CoreEventSelectCourseTabData;
@@ -79,6 +80,7 @@ export class CoreEvents {
     static readonly COMPLETION_MODULE_VIEWED = 'completion_module_viewed';
     static readonly MANUAL_COMPLETION_CHANGED = 'manual_completion_changed';
     static readonly USER_DELETED = 'user_deleted';
+    static readonly USER_SUSPENDED = 'user_suspended';
     static readonly PACKAGE_STATUS_CHANGED = 'package_status_changed';
     static readonly COURSE_STATUS_CHANGED = 'course_status_changed';
     static readonly SECTION_STATUS_CHANGED = 'section_status_changed';
@@ -302,6 +304,14 @@ export type CoreEventUserDeletedData = {
     params: any; // Params sent to the WS that failed.
 };
 
+/**
+ * Data passed to USER_SUSPENDED event.
+ */
+export type CoreEventUserSuspendedData = {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    params: any; // Params sent to the WS that failed.
+};
+
 export enum CoreEventFormAction {
     CANCEL = 'cancel',
     SUBMIT = 'submit',

From 94c1430762dd1db5e3637f9b9cc474749909ee93 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 27 Jan 2022 16:28:45 +0100
Subject: [PATCH 0406/1008] MOBILE-3316 core: Handle wsaccessuserdeleted error

---
 src/core/classes/site.ts                             | 2 +-
 src/core/features/user/pages/profile/profile.page.ts | 2 +-
 src/core/services/utils/utils.ts                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/classes/site.ts b/src/core/classes/site.ts
index 50ba03d5c..dc702baf9 100644
--- a/src/core/classes/site.ts
+++ b/src/core/classes/site.ts
@@ -610,7 +610,7 @@ export class CoreSite {
                     CoreEvents.trigger(CoreEvents.SESSION_EXPIRED, {}, this.id);
                     // Change error message. Try to get data from cache, the event will handle the error.
                     error.message = Translate.instant('core.lostconnection');
-                } else if (error.errorcode === 'userdeleted') {
+                } else if (error.errorcode === 'userdeleted' || error.errorcode === 'wsaccessuserdeleted') {
                     // User deleted, trigger event.
                     CoreEvents.trigger(CoreEvents.USER_DELETED, { params: data }, this.id);
                     error.message = Translate.instant('core.userdeleted');
diff --git a/src/core/features/user/pages/profile/profile.page.ts b/src/core/features/user/pages/profile/profile.page.ts
index a4cdef678..ba3061238 100644
--- a/src/core/features/user/pages/profile/profile.page.ts
+++ b/src/core/features/user/pages/profile/profile.page.ts
@@ -114,7 +114,7 @@ export class CoreUserProfilePage implements OnInit, OnDestroy {
             try {
                 await CoreUser.logView(this.userId, this.courseId, this.user.fullname);
             } catch (error) {
-                this.isDeleted = error?.errorcode === 'userdeleted';
+                this.isDeleted = error?.errorcode === 'userdeleted' || error?.errorcode === 'wsaccessuserdeleted';
                 this.isSuspended = error?.errorcode === 'wsaccessusersuspended';
                 this.isEnrolled = error?.errorcode !== 'notenrolledprofile';
             }
diff --git a/src/core/services/utils/utils.ts b/src/core/services/utils/utils.ts
index 9d79f6f63..b928c0e5e 100644
--- a/src/core/services/utils/utils.ts
+++ b/src/core/services/utils/utils.ts
@@ -862,7 +862,7 @@ export class CoreUtilsProvider {
                 error.errorcode != 'userdeleted' && error.errorcode != 'upgraderunning' &&
                 error.errorcode != 'forcepasswordchangenotice' && error.errorcode != 'usernotfullysetup' &&
                 error.errorcode != 'sitepolicynotagreed' && error.errorcode != 'sitemaintenance' &&
-                error.errorcode != 'wsaccessusersuspended' &&
+                error.errorcode != 'wsaccessusersuspended' && error.errorcode != 'wsaccessuserdeleted' &&
                 !this.isExpiredTokenError(error)));
     }
 

From 92f33e9a2e755d9ea4da1141952da364408f7530 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 26 Jan 2022 13:37:04 +0100
Subject: [PATCH 0407/1008] MOBILE-3814 my: Fix broken logo on my courses
 toolbar

---
 .../components/filteroptions/filteroptions.html  |  2 +-
 src/core/features/courses/pages/my/my.scss       | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/addons/block/myoverview/components/filteroptions/filteroptions.html b/src/addons/block/myoverview/components/filteroptions/filteroptions.html
index dc8db1c6d..39dcd2491 100644
--- a/src/addons/block/myoverview/components/filteroptions/filteroptions.html
+++ b/src/addons/block/myoverview/components/filteroptions/filteroptions.html
@@ -5,7 +5,7 @@
         </ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
-                <ion-icon name="fas-times" slot="icon-only" aria-hidden=true></ion-icon>
+                <ion-icon name="fas-times" slot="icon-only" aria-hidden="true"></ion-icon>
             </ion-button>
         </ion-buttons>
     </ion-toolbar>
diff --git a/src/core/features/courses/pages/my/my.scss b/src/core/features/courses/pages/my/my.scss
index 4d244fdc8..7c90901e1 100644
--- a/src/core/features/courses/pages/my/my.scss
+++ b/src/core/features/courses/pages/my/my.scss
@@ -1,3 +1,5 @@
+@import "~theme/globals";
+
 :host ::ng-deep ion-item-divider {
     display: none !important;
 }
@@ -8,3 +10,17 @@
 :host-context(ion-tabs.placement-bottom) ::ng-deep core-loading {
     --internal-loading-inline-min-height: calc(100vh - var(--core-header-toolbar-height) - var(--bottom-tabs-size) - 2px);
 }
+
+@if ($core-dashboard-logo) {
+    .in-toolbar h1 .core-header-logo {
+        max-height: calc(var(--core-header-toolbar-height) - 24px);
+    }
+
+    .in-toolbar h1 core-format-text {
+        display: none;
+    }
+} @else {
+    .in-toolbar h1 .core-header-logo {
+        display: none;
+    }
+}

From 2828f5b77f0226f9062025929db601a3c5fecca3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 27 Jan 2022 18:02:34 +0100
Subject: [PATCH 0408/1008] MOBILE-3814 style: Adapt styles to prototype

---
 .../side-blocks-button/side-blocks-button.html   |  2 +-
 .../side-blocks-button/side-blocks-button.scss   |  3 ++-
 .../course-list-item/course-list-item.scss       |  2 +-
 src/theme/theme.base.scss                        | 16 ++++++++++++----
 src/theme/theme.light.scss                       | 11 +++++++++--
 5 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/core/features/block/components/side-blocks-button/side-blocks-button.html b/src/core/features/block/components/side-blocks-button/side-blocks-button.html
index d38d89e7f..07dcf6632 100644
--- a/src/core/features/block/components/side-blocks-button/side-blocks-button.html
+++ b/src/core/features/block/components/side-blocks-button/side-blocks-button.html
@@ -1,3 +1,3 @@
-<ion-button (click)="openBlocks()" [attr.aria-label]="'core.block.opendrawerblocks' | translate">
+<ion-button (click)="openBlocks()" [attr.aria-label]="'core.block.opendrawerblocks' | translate" color="secondary">
     <ion-icon name="fas-chevron-left" slot="icon-only" aria-hidden="true"></ion-icon>
 </ion-button>
diff --git a/src/core/features/block/components/side-blocks-button/side-blocks-button.scss b/src/core/features/block/components/side-blocks-button/side-blocks-button.scss
index 3e9277bfc..579196d50 100644
--- a/src/core/features/block/components/side-blocks-button/side-blocks-button.scss
+++ b/src/core/features/block/components/side-blocks-button/side-blocks-button.scss
@@ -10,11 +10,12 @@
         --padding-start: 0.5em;
         --padding-end: 0;
         --border-radius: 2em 0 0 2em;
+        height: 56px;
 
         &::part(native) {
             @include core-transition(padding, 200ms);
         }
-        
+
         &:hover {
             --padding-end: 1.2em;
             --padding-start: 1em;
diff --git a/src/core/features/courses/components/course-list-item/course-list-item.scss b/src/core/features/courses/components/course-list-item/course-list-item.scss
index 928f993e2..5fe1a7c95 100644
--- a/src/core/features/courses/components/course-list-item/course-list-item.scss
+++ b/src/core/features/courses/components/course-list-item/course-list-item.scss
@@ -39,7 +39,7 @@
 
 ion-card {
     --vertical-margin: 12px;
-
+    --border-radius: 16px;
     display: flex;
     flex-direction: column;
     align-self: stretch;
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 204469c4c..9cb05b758 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -303,7 +303,7 @@ button,
 
 // Clear buttons will be black.
 ion-button.button-clear {
-    --ion-color-primary: var(--brand-color);
+    --ion-color-primary: var(--primary);
 }
 
 [role="button"],
@@ -392,7 +392,7 @@ ion-alert .alert-message {
 }
 
 ion-alert .alert-wrapper button.alert-button {
-    color: var(--brand-color);
+    color: var(--primary);
 }
 
 // Ionic list.
@@ -707,8 +707,16 @@ img[core-external-content]:not([src]) {
     visibility: hidden;
 }
 
-ion-card ion-item:only-child {
-    --inner-border-width: 0px;
+ion-card {
+    border-width: var(--border-width);
+    border-style: var(--border-style);
+    border-color: var(--border-color);
+    box-shadow: var(--box-shadow);
+    border-radius: var(--border-radius);
+
+    ion-item:only-child {
+        --inner-border-width: 0px;
+    }
 }
 
 .core-course-module-handler:not(.addon-mod-label-handler) .item-heading .filter_mathjaxloader_equation div {
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 93f62f078..de9cebfba 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -75,6 +75,13 @@
     --subdued-text-color: #595959;
 
     --ion-card-color: var(--text-color);
+    ion-card {
+        --border-width: 1px;
+        --border-style: solid;
+        --border-color: var(--gray);
+        --box-shadow: none;
+        --border-radius: 8px;
+    }
 
     --text-hightlight-background-color: #{$core-text-hightlight-background-color};
 
@@ -85,8 +92,8 @@
         --background-alternative: var(--gray-lighter);
     }
 
-    --core-bottom-tabs-background: var(--black);
-    --core-bottom-tabs-color: var(--gray-lighter);
+    --core-bottom-tabs-background: var(--white);
+    --core-bottom-tabs-color: var(--gray-darker);
     --core-bottom-tabs-color-selected: var(--brand-color);
     --core-bottom-tabs-background-selected: transparent;
     --core-bottom-tabs-badge-color: var(--brand-color);

From acb44dd474046c36d5b01869ad772917427a52e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 27 Jan 2022 18:03:02 +0100
Subject: [PATCH 0409/1008] MOBILE-3814 style: Adapt colors

---
 .../activityresults/activityresults.scss      |  2 +-
 .../components/rssclient/rssclient.scss       |  2 +-
 src/addons/calendar/calendar-common.scss      |  2 +-
 .../components/calendar/calendar.scss         |  4 +-
 src/addons/mod/data/data-forms.scss           |  2 +-
 src/addons/mod/data/data.scss                 |  2 +-
 .../attempt-results/attempt-results.scss      |  4 +-
 .../mod/lesson/pages/player/player.scss       |  6 +-
 src/addons/mod/quiz/pages/player/player.scss  |  2 +-
 .../mod/survey/components/index/index.scss    |  8 +-
 .../mod/wiki/components/index/index.scss      |  8 +-
 src/addons/notifications/notifications.scss   |  6 +-
 .../component/ddimageortext.scss              |  2 +-
 .../qtype/ddmarker/component/ddmarker.scss    |  4 +-
 src/core/components/mod-icon/mod-icon.scss    |  2 +-
 .../course/components/format/format.scss      |  2 +-
 .../course-list-item/course-list-item.scss    |  6 +-
 .../rich-text-editor/rich-text-editor.scss    | 12 +--
 .../capture-media/capture-media.scss          |  4 +-
 .../features/grades/pages/course/course.scss  | 16 ++--
 .../h5p/components/h5p-player/h5p-player.scss |  2 +-
 src/core/features/login/pages/site/site.scss  |  2 +-
 src/core/features/question/question.scss      |  2 +-
 .../components/search-box/search-box.scss     |  2 +-
 .../features/sitehome/pages/index/index.scss  |  2 +-
 src/theme/components/format-text.scss         | 14 +--
 src/theme/components/rubrics.scss             | 20 ++--
 src/theme/globals.variables.scss              | 60 +++++++-----
 src/theme/theme.base.scss                     |  6 +-
 src/theme/theme.dark.scss                     | 88 ++++++++---------
 src/theme/theme.light.scss                    | 94 ++++++++++++-------
 31 files changed, 218 insertions(+), 170 deletions(-)

diff --git a/src/addons/block/activityresults/components/activityresults/activityresults.scss b/src/addons/block/activityresults/components/activityresults/activityresults.scss
index 40e29efef..b1442e17c 100644
--- a/src/addons/block/activityresults/components/activityresults/activityresults.scss
+++ b/src/addons/block/activityresults/components/activityresults/activityresults.scss
@@ -21,7 +21,7 @@
             text-align: start;
             padding-top: .75rem;
             padding-bottom: .75rem;
-            color: var(--gray-darker);
+            color: var(--medium);
             font-weight: bold;
             font-size: 18px;
         }
diff --git a/src/addons/block/rssclient/components/rssclient/rssclient.scss b/src/addons/block/rssclient/components/rssclient/rssclient.scss
index bd23c6bc0..2d9e3bc3a 100644
--- a/src/addons/block/rssclient/components/rssclient/rssclient.scss
+++ b/src/addons/block/rssclient/components/rssclient/rssclient.scss
@@ -6,7 +6,7 @@
         -webkit-padding-start: 0;
 
         li {
-            border-top: 1px solid var(--gray);
+            border-top: 1px solid var(--stroke);
             padding: 5px;
             padding-bottom: 8px;
         }
diff --git a/src/addons/calendar/calendar-common.scss b/src/addons/calendar/calendar-common.scss
index c12303e90..ab19d2db4 100644
--- a/src/addons/calendar/calendar-common.scss
+++ b/src/addons/calendar/calendar-common.scss
@@ -1,6 +1,6 @@
 :host {
 
-    --addon-calendar-blank-day-background-color: var(--gray-lighter);
+    --addon-calendar-blank-day-background-color: var(--light);
 
     .item.addon-calendar-event {
         > ion-icon {
diff --git a/src/addons/calendar/components/calendar/calendar.scss b/src/addons/calendar/components/calendar/calendar.scss
index f293233fc..2c63bfa24 100644
--- a/src/addons/calendar/components/calendar/calendar.scss
+++ b/src/addons/calendar/components/calendar/calendar.scss
@@ -1,5 +1,5 @@
 :host {
-    --addon-calendar-blank-day-background-color: var(--gray-lighter);
+    --addon-calendar-blank-day-background-color: var(--light);
 
     .addon-calendar-navigation {
         padding-top: 5px;
@@ -189,5 +189,5 @@
 }
 
 :host-context(body.dark) {
-    --addon-calendar-blank-day-background-color: var(--black);
+    --addon-calendar-blank-day-background-color: var(--gray-900);
 }
diff --git a/src/addons/mod/data/data-forms.scss b/src/addons/mod/data/data-forms.scss
index 17b000650..51184ba44 100644
--- a/src/addons/mod/data/data-forms.scss
+++ b/src/addons/mod/data/data-forms.scss
@@ -2,7 +2,7 @@
 
 // Edit and search modal.
 :host {
-    --input-border-color: var(--gray);
+    --input-border-color: var(--stroke);
     --input-border-width: 1px;
     --select-border-width: 0px;
 
diff --git a/src/addons/mod/data/data.scss b/src/addons/mod/data/data.scss
index 6b7862a8d..0714c8760 100644
--- a/src/addons/mod/data/data.scss
+++ b/src/addons/mod/data/data.scss
@@ -13,7 +13,7 @@ $grid-column-paddings: (
 ) !default;
 
 :host {
-    --border-color: var(--gray);
+    --border-color: var(--stroke);
 }
 
 .addon-data-contents {
diff --git a/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.scss b/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.scss
index 006127a5b..ef4832daf 100644
--- a/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.scss
+++ b/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.scss
@@ -27,7 +27,7 @@
     }
 
     .addon-mod_h5pactivity-result-table-row.item:nth-child(even) {
-        --background: var(--gray-lighter);
+        --background: var(--light);
     }
 
     .addon-mod_h5pactivity-result-score {
@@ -37,6 +37,6 @@
 
 :host-context(body.dark) {
     .addon-mod_h5pactivity-result-table-row.item:nth-child(even) {
-        --background: var(--black);
+        --background: var(--gray-900);
     }
 }
diff --git a/src/addons/mod/lesson/pages/player/player.scss b/src/addons/mod/lesson/pages/player/player.scss
index 8733de161..011192f4c 100644
--- a/src/addons/mod/lesson/pages/player/player.scss
+++ b/src/addons/mod/lesson/pages/player/player.scss
@@ -1,9 +1,9 @@
 :host {
-   --background-odd: var(--gray-lighter);
+   --background-odd: var(--light);
 }
 
 :host-context(body.dark) {
-   --background-odd: var(--gray-darker);
+   --background-odd: var(--medium);
 }
 
 :host ::ng-deep {
@@ -32,7 +32,7 @@
         td {
             padding: 5px;
             line-height: 1.5;
-            border-bottom: 1px solid var(--gray);
+            border-bottom: 1px solid var(--stroke);
         }
     }
 }
diff --git a/src/addons/mod/quiz/pages/player/player.scss b/src/addons/mod/quiz/pages/player/player.scss
index 1005ff202..7d68762c8 100644
--- a/src/addons/mod/quiz/pages/player/player.scss
+++ b/src/addons/mod/quiz/pages/player/player.scss
@@ -5,6 +5,6 @@
     }
 
     ion-content ion-toolbar {
-        border-bottom: 1px solid var(--gray);
+        border-bottom: 1px solid var(--stroke);
     }
 }
diff --git a/src/addons/mod/survey/components/index/index.scss b/src/addons/mod/survey/components/index/index.scss
index 87933f475..6f557a178 100644
--- a/src/addons/mod/survey/components/index/index.scss
+++ b/src/addons/mod/survey/components/index/index.scss
@@ -1,13 +1,13 @@
 :host {
     --grid-background: var(--white);
-    --even-background: var(--gray-light);
+    --even-background: var(--gray-200);
 
     .option-name {
         font-size: 14px;
     }
 
     .addon-mod_survey-question {
-        border-top: 1px solid var(--gray);
+        border-top: 1px solid var(--stroke);
     }
 
     ion-row {
@@ -26,6 +26,6 @@
 }
 
 :host-context(body.dark) {
-    --grid-background: var(--black);
-    --even-background: var(--gray-darker);
+    --grid-background: var(--gray-900);
+    --even-background: var(--medium);
 }
diff --git a/src/addons/mod/wiki/components/index/index.scss b/src/addons/mod/wiki/components/index/index.scss
index 7b98cde4c..5efe4c381 100644
--- a/src/addons/mod/wiki/components/index/index.scss
+++ b/src/addons/mod/wiki/components/index/index.scss
@@ -4,14 +4,14 @@ $addon-mod-wiki-toc-level-padding:    12px !default;
 
 :host {
     --addon-mod-wiki-newentry-link-color: var(--red);
-    --addon-mod-wiki-toc-border-color: var(--gray-dark);
-    --addon-mod-wiki-toc-background-color: var(--gray-light);
+    --addon-mod-wiki-toc-border-color: var(--gray-500);
+    --addon-mod-wiki-toc-background-color: var(--gray-200);
 
     background-color: var(--ion-item-background);
 
     .addon-mod_wiki-page-content {
         background-color: var(--ion-item-background);
-        border-top: 1px solid var(--gray);
+        border-top: 1px solid var(--stroke);
         padding-bottom: 10px;
     }
 
@@ -59,5 +59,5 @@ $addon-mod-wiki-toc-level-padding:    12px !default;
 
 :host-context(body.dark) {
     --addon-mod-wiki-newentry-link-color: var(--red-light);
-    --addon-mod-wiki-toc-background-color: var(--gray-darker);
+    --addon-mod-wiki-toc-background-color: var(--medium);
 }
diff --git a/src/addons/notifications/notifications.scss b/src/addons/notifications/notifications.scss
index 360723b32..23e962567 100644
--- a/src/addons/notifications/notifications.scss
+++ b/src/addons/notifications/notifications.scss
@@ -28,7 +28,7 @@
 
     .item core-format-text ::ng-deep {
         .forumpost {
-            border: 1px solid var(--gray-light);
+            border: 1px solid var(--gray-200);
             width: 100%;
             margin: 0 0 1em 0;
 
@@ -37,7 +37,7 @@
             }
 
             .header {
-                background-color: var(--gray-lighter);
+                background-color: var(--light);
 
                 .picture {
                     width: 48px;
@@ -82,7 +82,7 @@
         hr {
             margin-top: 1.5rem;
             margin-bottom: 1.5rem;
-            background-color: var(--gray-light);
+            background-color: var(--gray-200);
         }
     }
 }
diff --git a/src/addons/qtype/ddimageortext/component/ddimageortext.scss b/src/addons/qtype/ddimageortext/component/ddimageortext.scss
index 0430a5d3e..dfb6f7f01 100644
--- a/src/addons/qtype/ddimageortext/component/ddimageortext.scss
+++ b/src/addons/qtype/ddimageortext/component/ddimageortext.scss
@@ -2,7 +2,7 @@
 
 // Style ddimageortext content a bit. Almost all these styles are copied from Moodle.
 :host {
-    --ddimageortext-border-drop: var(--gray-darker);
+    --ddimageortext-border-drop: var(--medium);
     --ddimageortext-draghome-background: var(--core-dd-question-color-2);
 }
 
diff --git a/src/addons/qtype/ddmarker/component/ddmarker.scss b/src/addons/qtype/ddmarker/component/ddmarker.scss
index b62ffbfcd..ea1272c1f 100644
--- a/src/addons/qtype/ddmarker/component/ddmarker.scss
+++ b/src/addons/qtype/ddmarker/component/ddmarker.scss
@@ -123,7 +123,7 @@ core-format-text ::ng-deep {
         border-width: 2px;
         border-color: var(--yellow);
         position: absolute;
-        color: var(--black);
+        color: var(--gray-900);
     }
     span.wrongpart {
         background-color: var(--yellow-light);
@@ -135,7 +135,7 @@ core-format-text ::ng-deep {
         opacity: 0.6;
         margin: 5px;
         display: inline-block;
-        color: var(--black);
+        color: var(--gray-900);
     }
     div.dragitems img.target,
     div.draghomes img.target {
diff --git a/src/core/components/mod-icon/mod-icon.scss b/src/core/components/mod-icon/mod-icon.scss
index 23ae48ea3..5cd4a8cca 100644
--- a/src/core/components/mod-icon/mod-icon.scss
+++ b/src/core/components/mod-icon/mod-icon.scss
@@ -12,7 +12,7 @@
 
     border-radius: 4px;
     padding: 0.7rem;
-    background-color: $gray-lighter;
+    background-color: $gray-100;
     line-height: var(--size);
 
     @each $type, $value in $activity-icon-colors {
diff --git a/src/core/features/course/components/format/format.scss b/src/core/features/course/components/format/format.scss
index 76335d842..e7d109381 100644
--- a/src/core/features/course/components/format/format.scss
+++ b/src/core/features/course/components/format/format.scss
@@ -24,7 +24,7 @@
         pointer-events: auto;
         position: relative;
         background: var(--ion-item-background);
-        border-bottom: 1px solid var(--gray);
+        border-bottom: 1px solid var(--stroke);
 
         img {
             position: absolute;
diff --git a/src/core/features/courses/components/course-list-item/course-list-item.scss b/src/core/features/courses/components/course-list-item/course-list-item.scss
index 5fe1a7c95..2835c6aa9 100644
--- a/src/core/features/courses/components/course-list-item/course-list-item.scss
+++ b/src/core/features/courses/components/course-list-item/course-list-item.scss
@@ -3,7 +3,7 @@
 .core-course-list-item {
     .course-icon {
         color: white;
-        background: var(--gray-light);
+        background: var(--gray-200);
         padding: 8px;
         font-size: 24px;
         border-radius: 50%;
@@ -161,7 +161,7 @@ button {
 
 :host-context(.core-horizontal-scroll) {
     @include horizontal_scroll_item(80%, 250px, 300px);
-    
+
     ion-card {
         .core-course-thumb {
             padding-top: 30%;
@@ -169,7 +169,7 @@ button {
 
         ion-item.core-course-header {
             --padding-start: 4px;
-            
+
             .core-course-title {
                 margin: 7px 0;
 
diff --git a/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss b/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss
index 454c740d9..1656bbb80 100644
--- a/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss
+++ b/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss
@@ -3,16 +3,16 @@
     --placeholder-color: var(--ion-placeholder-color);
     --toobar-background: var(--white);
     --button-color: var(--ion-text-color);
-    --button-active-color: var(--gray);
+    --button-active-color: var(--gray-300);
     --background: var(--ion-item-background);
 }
 
 :host-context(body.dark) {
-    --background: var(--gray-darker);
+    --background: var(--medium);
     --color: var(--white);
-    --button-color: var(--gray-light);
-    --button-active-color: var(--gray-dark);
-    --toobar-background: var(--black);
+    --button-color: var(--gray-200);
+    --button-active-color: var(--gray-500);
+    --toobar-background: var(--gray-900);
 }
 
 :host {
@@ -107,7 +107,7 @@
         flex-shrink: 0;
         background-color: var(--toobar-background);
         padding-top: 5px;
-        border-top: 1px solid var(--gray);
+        border-top: 1px solid var(--stroke);
 
         ion-slides {
             width: 240px;
diff --git a/src/core/features/emulator/components/capture-media/capture-media.scss b/src/core/features/emulator/components/capture-media/capture-media.scss
index 58abf90e7..57d6b0351 100644
--- a/src/core/features/emulator/components/capture-media/capture-media.scss
+++ b/src/core/features/emulator/components/capture-media/capture-media.scss
@@ -63,7 +63,7 @@
     }
 
     ion-footer {
-        background-color: var(--gray);
-        border-top: 1px solid var(--gray-dark);
+        background-color: var(--gray-300);
+        border-top: 1px solid var(--gray-500);
     }
 }
diff --git a/src/core/features/grades/pages/course/course.scss b/src/core/features/grades/pages/course/course.scss
index e93bebfff..a679d9d55 100644
--- a/src/core/features/grades/pages/course/course.scss
+++ b/src/core/features/grades/pages/course/course.scss
@@ -2,10 +2,10 @@
 
 :host {
     --header-background: var(--white);
-    --odd-cell-background: var(--gray-lighter);
+    --odd-cell-background: var(--light);
     --even-cell-background: var(--white);
-    --odd-cell-hover: var(--gray-light);
-    --even-cell-hover: var(--gray-lighter);
+    --odd-cell-hover: var(--gray-200);
+    --even-cell-hover: var(--light);
     --icon-color: #999999;
 
     .odd {
@@ -21,11 +21,11 @@
 }
 
 :host-context(body.dark) {
-    --header-background: var(--black);
-    --odd-cell-background: var(--gray-darker);
-    --even-cell-background: var(--black);
-    --odd-cell-hover: var(--gray-dark);
-    --even-cell-hover: var(--gray-darker);
+    --header-background: var(--gray-900);
+    --odd-cell-background: var(--medium);
+    --even-cell-background: var(--gray-900);
+    --odd-cell-hover: var(--gray-500);
+    --even-cell-hover: var(--medium);
     --icon-color: #eeeeee;
 }
 
diff --git a/src/core/features/h5p/components/h5p-player/h5p-player.scss b/src/core/features/h5p/components/h5p-player/h5p-player.scss
index 6e1803220..1761f096a 100644
--- a/src/core/features/h5p/components/h5p-player/h5p-player.scss
+++ b/src/core/features/h5p/components/h5p-player/h5p-player.scss
@@ -1,5 +1,5 @@
 :host {
-    --core-h5p-placeholder-bg-color: var(--gray);
+    --core-h5p-placeholder-bg-color: var(--gray-300);
     --core-h5p-placeholder-text-color: var(--ion-text-color);
 
     .core-h5p-placeholder {
diff --git a/src/core/features/login/pages/site/site.scss b/src/core/features/login/pages/site/site.scss
index dcec7cfc7..5320d6600 100644
--- a/src/core/features/login/pages/site/site.scss
+++ b/src/core/features/login/pages/site/site.scss
@@ -116,7 +116,7 @@
 }
 
 .core-login-entered-site {
-    background-color: var(--gray-lighter);
+    background-color: var(--light);
     ion-thumbnail {
         box-shadow: 0 0 4px #ddd;
     }
diff --git a/src/core/features/question/question.scss b/src/core/features/question/question.scss
index 1dce88eb1..b37891d1d 100644
--- a/src/core/features/question/question.scss
+++ b/src/core/features/question/question.scss
@@ -26,7 +26,7 @@
             line-height: 14px;
             color: var(--white);
             text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
-            background-color: var(--gray-dark);
+            background-color: var(--gray-500);
             -webkit-border-radius: 3px;
             border-radius: 3px;
 
diff --git a/src/core/features/search/components/search-box/search-box.scss b/src/core/features/search/components/search-box/search-box.scss
index 4848d54b9..9649ae962 100644
--- a/src/core/features/search/components/search-box/search-box.scss
+++ b/src/core/features/search/components/search-box/search-box.scss
@@ -21,7 +21,7 @@
         overflow-y: auto;
 
         .item:hover {
-            --background: var(--gray-lighter);
+            --background: var(--light);
             cursor: pointer;
         }
     }
diff --git a/src/core/features/sitehome/pages/index/index.scss b/src/core/features/sitehome/pages/index/index.scss
index 90dc443cc..9951ed0ae 100644
--- a/src/core/features/sitehome/pages/index/index.scss
+++ b/src/core/features/sitehome/pages/index/index.scss
@@ -4,7 +4,7 @@ ion-item ion-icon {
     display: inline-block;
     border-radius: 4px;
     padding: 0.7rem;
-    background-color: $gray-lighter;
+    background-color: $gray-100;
     line-height: var(--size);
     --margin-end: 1rem;
     @include margin-horizontal(null, var(--margin-end));
diff --git a/src/theme/components/format-text.scss b/src/theme/components/format-text.scss
index 02ba8bf71..562764e50 100644
--- a/src/theme/components/format-text.scss
+++ b/src/theme/components/format-text.scss
@@ -371,7 +371,7 @@ core-rich-text-editor .core-rte-editor {
     input:not([type=checkbox]):not([type=radio]):not([type=hidden]) {
         height: 30px;
         display: inline-block;
-        border: 1px solid var(--gray-dark);
+        border: 1px solid var(--gray-500);
         background: var(--contrast-background);
         padding: 6px 8px;
         border-radius: 4px;
@@ -582,11 +582,11 @@ core-rich-text-editor .core-rte-editor {
     .align-text-top    { vertical-align: text-top !important; }
 
     // utilities/_border.scss
-    .border         { border: 1px solid var(--gray-dark) !important; }
-    .border-top     { border-top: 1px solid var(--gray-dark) !important; }
-    .border-right   { border-right: 1px solid var(--gray-dark) !important; }
-    .border-bottom  { border-bottom: 1px solid var(--gray-dark) !important; }
-    .border-left    { border-left: 1px solid var(--gray-dark) !important; }
+    .border         { border: 1px solid var(--gray-500) !important; }
+    .border-top     { border-top: 1px solid var(--gray-500) !important; }
+    .border-right   { border-right: 1px solid var(--gray-500) !important; }
+    .border-bottom  { border-bottom: 1px solid var(--gray-500) !important; }
+    .border-left    { border-left: 1px solid var(--gray-500) !important; }
 
     .border-0        { border: 0 !important; }
     .border-top-0    { border-top: 0 !important; }
@@ -706,7 +706,7 @@ core-rich-text-editor .core-rte-editor {
         vertical-align: baseline;
         transition: color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;
         color: var(--white);
-        background-color: var(--gray-darker);
+        background-color: var(--medium);
     }
 
     .label-important {
diff --git a/src/theme/components/rubrics.scss b/src/theme/components/rubrics.scss
index 329ef82d9..1ab4c4b92 100644
--- a/src/theme/components/rubrics.scss
+++ b/src/theme/components/rubrics.scss
@@ -5,7 +5,7 @@ core-format-text {
         text-transform: uppercase;
         font-size: 60%;
         padding: 0.25em;
-        border: 1px solid var(--gray-light);
+        border: 1px solid var(--gray-200);
     }
 
     .gradingform_rubric_editform .status.ready {
@@ -57,12 +57,12 @@ core-format-text {
     }
 
     .gradingform_rubric .criterion {
-        border: 1px solid var(--gray);
+        border: 1px solid var(--stroke);
         overflow: hidden;
     }
 
     .gradingform_rubric .criterion.even {
-        background-color: var(--gray-lighter);
+        background-color: var(--light);
     }
 
     .gradingform_rubric .criterion .description {
@@ -83,7 +83,7 @@ core-format-text {
     }
 
     .gradingform_rubric .criterion .levels .level {
-        border-left: 1px solid var(--gray);
+        border-left: 1px solid var(--stroke);
         max-width: 150px;
     }
 
@@ -92,12 +92,12 @@ core-format-text {
     }
 
     .gradingform_rubric .criterion .levels .level.last {
-        border-right: 1px solid var(--gray);
+        border-right: 1px solid var(--stroke);
     }
 
     .gradingform_rubric .plainvalue.empty {
         font-style: italic;
-        color: var(--gray-dark);
+        color: var(--gray-500);
     }
 
     .gradingform_rubric.editor .criterion .levels .level .delete {
@@ -131,7 +131,7 @@ core-format-text {
 
     .gradingform_rubric .criterion .levels .level.checked {
         background-color: var(--green-light);
-        border: 1px solid var(--gray-darker);
+        border: 1px solid var(--medium);
     }
 
     .gradingform_rubric .options .optionsheading {
@@ -160,12 +160,12 @@ core-format-text {
     .gradingform_rubric .criterion .description.error,
     .gradingform_rubric .criterion .levels .level .definition.error,
     .gradingform_rubric .criterion .levels .level .score.error {
-        background-color: var(--gray-lighter);
+        background-color: var(--light);
     }
 
     .gradingform_rubric-regrade {
         padding: 10px;
-        background-color: var(--gray-lighter);
+        background-color: var(--light);
         border: 1px solid var(--red-light);
         margin-bottom: 10px;
     }
@@ -225,7 +225,7 @@ core-format-text {
     .gradingform_rubric .criterion .levels .level.checked {
         background-color: var(--green-light);
         border: none;
-        border-left: 1px solid var(--gray);
+        border-left: 1px solid var(--stroke);
     }
 
     .gradingform_rubric .criterion .levels .level .score {
diff --git a/src/theme/globals.variables.scss b/src/theme/globals.variables.scss
index 4e1d7e57a..09b789740 100644
--- a/src/theme/globals.variables.scss
+++ b/src/theme/globals.variables.scss
@@ -4,38 +4,46 @@
  * Place here all global variables.
  */
 
-$black:           #282828 !default; // Headings, standard text.
-$gray-darker:     #686566 !default;
-$gray-dark:       #9e9e9e !default;
-$gray:            #dddddd !default;
-$gray-light:      #e9e9e9 !default; // Background.
-$gray-lighter:    #f5f5f5 !default;
-$white:           #ffffff !default; // Background, reversed text.
+$white:    #ffffff !default;
+$gray-100: #f8f9fa !default; // Old gray-lighter
+$gray-200: #e9ecef !default; // Old gray-light
+$gray-300: #dee2e6 !default; // Old gray // Stroke
+$gray-400: #ced4da !default;
+$gray-500: #8f959e !default; // Old gray-dark
+$gray-600: #6a737b !default; // Old gray-darker
+$gray-700: #495057 !default;
+$gray-800: #343a40 !default;
+$gray-900: #1d2125 !default; // Old black // Copy
+$black:    #000000 !default;
 
-$blue:            #0064d2 !default; // Link, background.
-$blue-light:      mix($blue, white, 20%) !default; // Background.
+$blue:            #0f6cbf !default;
+$blue-light:      mix($blue, white, 20%) !default;
 $blue-dark:       darken($blue, 10%) !default;
 
-$green:           #5e8100 !default; // Accent.
+$cyan:            #008196 !default;
+$cyan-light:       mix($cyan, white, 20%) !default;
+$cyan-dark:        darken($cyan, 10%) !default;
+
+$green:           #357a32 !default; // Accent.
 $green-light:     mix($green, white, 20%) !default;
 $green-dark:      darken($green, 10%) !default;
 
-$red:             #cb3d4d !default;
+$red:             #ca3120 !default;
 $red-light:       mix($red, white, 20%) !default;
 $red-dark:        darken($red, 10%) !default;
 
-$yellow:          #fbad1a !default; // Accent (never text).
+$yellow:          #f0ad4e !default;
 $yellow-light:    mix($yellow, white, 20%) !default;
 $yellow-dark:     mix($yellow, black, 40%) !default;
 
-$brand-color:    #f98012 !default;
+$brand-color:    #ff7518 !default;
 
-$text-color:               $black !default;
+$text-color:               $gray-900 !default;
 $text-color-rgb:           color-to-rgb-list($text-color) !default;
 $text-color-dark:          $white !default;
 $text-color-dark-rgb:      color-to-rgb-list($text-color-dark) !default;
 
-$background-color:          $gray-light !default;
+$background-color:          $white !default;
 $background-color-rgb:      color-to-rgb-list($background-color) !default;
 $background-color-dark:     mix(#ffffff, #000000, 10%) !default; // #1a1a1a
 $background-color-dark-rgb: color-to-rgb-list($background-color-dark) !default;
@@ -45,17 +53,21 @@ $ion-item-background-rgb:  color-to-rgb-list($ion-item-background) !default;
 $ion-item-background-dark: mix(#ffffff, #000000, 20%) !default; // #333333
 $ion-item-background-dark-rgb: color-to-rgb-list($ion-item-background-dark) !default;
 
-$primary:    $brand-color !default;
+$primary:    $blue !default;
+$secondary:  $gray-400 !default;
 $danger:     $red !default;
 $warning:    $yellow !default;
 $success:    $green !default;
-$info:       $blue !default;
-$light:      $gray-lighter !default;
-$medium:     $gray-light !default;
-$dark:       $black !default;
+$info:       $cyan !default;
+$light:      $gray-100 !default;
+$medium:     $gray-600 !default;
+$dark:       $gray-800 !default;
+
+$stroke:    $gray-300 !default;
 
 $colors:  (
     primary: $primary,
+    secondary: $secondary,
     success: $success,
     warning: $warning,
     danger:  $danger,
@@ -65,17 +77,19 @@ $colors:  (
     dark: $dark
 ) !default;
 
-$primary-dark:    $brand-color !default;
+$primary-dark:    mix($blue, white, 40%) !default;
+$secondary-dark:  mix($secondary, white, 40%) !default;
 $danger-dark:     mix($red, white, 40%) !default;
 $warning-dark:    mix($yellow, white, 40%) !default;
 $success-dark:    mix($green, white, 40%) !default;
-$info-dark:       mix($blue, white, 40%) !default;
+$info-dark:       mix($cyan, white, 40%) !default;
 $light-dark:      $dark !default;
-$medium-dark:     $gray-light !default;
+$medium-dark:     $gray-200 !default;
 $dark-dark:       $light !default;
 
 $colors-dark:  (
     primary: $primary-dark,
+    secondary: $secondary-dark,
     success: $success-dark,
     warning: $warning-dark,
     danger: $danger-dark,
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 9cb05b758..855294dff 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -634,7 +634,7 @@ body.core-iframe-fullscreen ion-router-outlet {
 
 // Extra text colors.
 .text-gray {
-    color: var(--gray-dark);
+    color: var(--gray-500);
 }
 
 // Card styles
@@ -688,7 +688,7 @@ img.large-avatar,
     margin-bottom: 10px;
     border-radius : 50%;
     padding: 4px;
-    border: 1px solid var(--gray);
+    border: 1px solid var(--stroke);
     background-color: transparent;
 }
 
@@ -699,7 +699,7 @@ ion-avatar.large-avatar {
 
 ion-avatar ion-img, ion-avatar img {
     text-indent: -99999px;
-    background-color: var(--gray-light);
+    background-color: var(--gray-200);
 }
 
 // Wait to load before showing the image.
diff --git a/src/theme/theme.dark.scss b/src/theme/theme.dark.scss
index 8d1529b36..3a547dc07 100644
--- a/src/theme/theme.dark.scss
+++ b/src/theme/theme.dark.scss
@@ -6,28 +6,29 @@
  */
 
 :root body.dark {
-    // Enlighten the ionic shades.
-    --ion-color-step-0:    #000000;
-    --ion-color-step-50:   #1e1e1e;
-    --ion-color-step-100:  #2a2a2a;
-    --ion-color-step-150:  #363636;
-    --ion-color-step-200:  #414141;
-    --ion-color-step-250:  #4d4d4d;
-    --ion-color-step-300:  #595959;
-    --ion-color-step-350:  #656565;
-    --ion-color-step-400:  #717171;
-    --ion-color-step-450:  #7d7d7d;
-    --ion-color-step-500:  #898989;
-    --ion-color-step-550:  #949494;
-    --ion-color-step-600:  #a0a0a0;
-    --ion-color-step-650:  #acacac;
-    --ion-color-step-700:  #b8b8b8;
-    --ion-color-step-750:  #c4c4c4;
-    --ion-color-step-800:  #d0d0d0;
-    --ion-color-step-850:  #dbdbdb;
-    --ion-color-step-900:  #e7e7e7;
-    --ion-color-step-950:  #f3f3f3;
-    --ion-color-step-1000: #ffffff;
+
+    // Ionic shades.
+    --ion-color-step-0:    var(--black);
+    --ion-color-step-50:   var(--gray-900);
+    --ion-color-step-100:  var(--gray-900);
+    --ion-color-step-150:  var(--gray-900);
+    --ion-color-step-200:  var(--gray-800);
+    --ion-color-step-250:  var(--gray-800);
+    --ion-color-step-300:  var(--gray-700);
+    --ion-color-step-350:  var(--gray-700);
+    --ion-color-step-400:  var(--gray-600);
+    --ion-color-step-450:  var(--gray-600);
+    --ion-color-step-500:  var(--gray-500);
+    --ion-color-step-550:  var(--gray-500);
+    --ion-color-step-600:  var(--gray-400);
+    --ion-color-step-650:  var(--gray-400);
+    --ion-color-step-700:  var(--gray-300);
+    --ion-color-step-750:  var(--gray-300);
+    --ion-color-step-800:  var(--gray-200);
+    --ion-color-step-850:  var(--gray-200);
+    --ion-color-step-900:  var(--gray-100);
+    --ion-color-step-950:  var(--gray-100);
+    --ion-color-step-1000: var(--white);
 
     --ion-background-color:     #{$background-color-dark};
     --ion-background-color-rgb: #{$background-color-dark-rgb};
@@ -37,7 +38,8 @@
     --ion-text-color-rgb:       #{$text-color-dark-rgb};
     --subdued-text-color:     #b4b4b4;
 
-    --primary:      var(--brand-color);
+    --primary:      #{$primary-dark};
+    --secondary:    #{$secondary-dark};
     --success:      #{$success-dark};
     --danger:       #{$danger-dark};
     --warning:      #{$warning-dark};
@@ -50,7 +52,7 @@
         @include generate-color($color-name, $colors-dark);
     }
 
-    --ion-border-color: var(--ion-color-step-100);
+    --ion-border-color: var(--gray-900);
 
     --ion-card-color: var(--text-color);
     --ion-card-background: var(--ion-item-background);
@@ -59,10 +61,12 @@
 
     ion-content {
         --background: var(--ion-background-color);
-        --background-alternative: var(--black);
+        --background-alternative: var(--gray-900);
     }
 
     --core-bottom-tabs-badge-text-color: var(--brand-color-contrast);
+    --core-bottom-tabs-background: var(--gray-900);
+    --core-bottom-tabs-color: var(--medium);
 
     ion-action-sheet {
         .action-sheet-cancel {
@@ -72,27 +76,27 @@
 
     --core-link-color: var(--blue-light);
 
-    --core-header-toolbar-background:   var(--black);
+    --core-header-toolbar-background:   var(--gray-900);
     --core-header-toolbar-color:        var(--white);
 
-    --core-tabs-background: var(--ion-color-step-200);
+    --core-tabs-background: var(--gray-800);
     --core-tab-background: var(--core-tabs-background);
     --core-tab-color: var(--subdued-text-color);
-    --core-tab-border-color: var(--gray-light);
+    --core-tab-border-color: var(--gray-200);
     --core-tab-color-active: var(--dark);
 
-    --core-progressbar-text-color: var(--gray-lighter);
+    --core-progressbar-text-color: var(--light);
 
     --ion-item-background: #{$ion-item-background-dark};
     --ion-item-detail-icon-color: var(--white);
-    --item-divider-background: var(--ion-color-step-200);
+    --item-divider-background: var(--gray-800);
     --item-divider-color: var(--text-color);
-    --spacer-background: var(--ion-color-step-0);
+    --spacer-background: var(--gray-100);
 
     --core-combobox-background: var(--ion-item-background);
     --core-combobox-color: var(--white);
 
-    --core-login-background: var(--black);
+    --core-login-background: var(--gray-900);
     --core-login-text-color: var(--white);
     --core-login-input-background: var(--core-login-background);
     --core-login-input-color: var(--core-login-text-color);
@@ -104,7 +108,7 @@
     --core-question-feedback-color: var(--yellow-light);
     --core-question-feedback-color-bg: var(--yellow-dark);
     --core-question-warning-color: var(--red);
-    --core-question-saved-color-bg: var(--gray-dark);
+    --core-question-saved-color-bg: var(--gray-500);
 
     --core-question-state-correct-color: var(--green-dark);
     --core-question-state-partial-color: var(--yellow-dark);
@@ -114,20 +118,20 @@
     --core-question-feedback-color: var(--yellow-light);
     --core-question-feedback-background-color: var(--yellow-dark);
 
-    --core-dd-question-selected-shadow: 2px 2px 4px var(--gray-light);
-    --core-dd-question-border: var(--gray-light);
+    --core-dd-question-selected-shadow: 2px 2px 4px var(--gray-200);
+    --core-dd-question-border: var(--gray-200);
 
-    --core-send-message-input-background: var(--black);
+    --core-send-message-input-background: var(--gray-900);
     --core-send-message-input-color: var(--white);
 
-    --addon-messages-message-bg: var(--ion-color-step-200);
-    --addon-messages-message-activated-bg: var(--ion-color-step-300);
+    --addon-messages-message-bg: var(--gray-800);
+    --addon-messages-message-activated-bg: var(--gray-700);
     --addon-messages-message-note-text: var(--subdued-text-color);
-    --addon-messages-message-mine-bg: var(--ion-color-step-350);
-    --addon-messages-message-mine-activated-bg: var(--ion-color-step-450);
+    --addon-messages-message-mine-bg: var(--gray-700);
+    --addon-messages-message-mine-activated-bg: var(--gray-600);
     --addon-messages-discussion-badge: var(--primary);
     --addon-messages-discussion-badge-text: var(--dark);
 
-    --addon-forum-border-color: var(--gray-dark);
-    --addon-forum-highlight-color: var(--gray-darker);
+    --addon-forum-border-color: var(--gray-500);
+    --addon-forum-highlight-color: var(--medium);
 }
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index de9cebfba..c7840b8cb 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -8,13 +8,40 @@
 :root {
 
     // Color palette
-    --black:           #{$black}; // Headings, standard text.
-    --gray-darker:     #{$gray-darker}; // Text (emphasis-detail), placeholder, background.
-    --gray-dark:       #{$gray-dark}; // Borders (never text).
-    --gray:            #{$gray};
-    --gray-light:      #{$gray-light}; // Background.
-    --gray-lighter:    #{$gray-lighter};
-    --white:           #{$white}; // Background, reversed text.
+    --black: #{$black};
+    --gray-900: #{$gray-900};
+    --gray-800: #{$gray-800};
+    --gray-700: #{$gray-700};
+    --gray-600: #{$gray-600};
+    --gray-500: #{$gray-500};
+    --gray-400: #{$gray-400};
+    --gray-300: #{$gray-300};
+    --gray-200: #{$gray-200};
+    --gray-100: #{$gray-100};
+    --white: #{$white};
+
+    // Ionic shades.
+    --ion-color-step-0:    var(--white);
+    --ion-color-step-50:   var(--gray-100);
+    --ion-color-step-100:  var(--gray-100);
+    --ion-color-step-150:  var(--gray-100);
+    --ion-color-step-200:  var(--gray-200);
+    --ion-color-step-250:  var(--gray-200);
+    --ion-color-step-300:  var(--gray-300);
+    --ion-color-step-350:  var(--gray-300);
+    --ion-color-step-400:  var(--gray-400);
+    --ion-color-step-450:  var(--gray-400);
+    --ion-color-step-500:  var(--gray-500);
+    --ion-color-step-550:  var(--gray-500);
+    --ion-color-step-600:  var(--gray-600);
+    --ion-color-step-650:  var(--gray-600);
+    --ion-color-step-700:  var(--gray-700);
+    --ion-color-step-750:  var(--gray-700);
+    --ion-color-step-800:  var(--gray-800);
+    --ion-color-step-850:  var(--gray-800);
+    --ion-color-step-900:  var(--gray-900);
+    --ion-color-step-950:  var(--gray-900);
+    --ion-color-step-1000: var(--black);
 
     --blue:            #{$blue};
     --blue-light:      #{$blue-light};
@@ -44,7 +71,8 @@
     --core-online-color: #5cb85c;
 
     // Named Color Variables
-    --primary:      var(--brand-color);
+    --primary:      #{$primary};
+    --secondary:    #{$secondary};
     --success:      #{$success};
     --danger:       #{$danger};
     --warning:      #{$warning};
@@ -53,6 +81,8 @@
     --dark:         #{$dark};
     --medium:       #{$medium};
 
+    --stroke:       #{$stroke};
+
     @each $color-name, $value in $colors {
         @include generate-color($color-name, $colors);
     }
@@ -78,7 +108,7 @@
     ion-card {
         --border-width: 1px;
         --border-style: solid;
-        --border-color: var(--gray);
+        --border-color: var(--stroke);
         --box-shadow: none;
         --border-radius: 8px;
     }
@@ -89,11 +119,11 @@
 
     ion-content {
         --background: var(--ion-background-color);
-        --background-alternative: var(--gray-lighter);
+        --background-alternative: var(--light);
     }
 
     --core-bottom-tabs-background: var(--white);
-    --core-bottom-tabs-color: var(--gray-darker);
+    --core-bottom-tabs-color: var(--medium);
     --core-bottom-tabs-color-selected: var(--brand-color);
     --core-bottom-tabs-background-selected: transparent;
     --core-bottom-tabs-badge-color: var(--brand-color);
@@ -115,7 +145,7 @@
     --core-header-toolbar-background: var(--white);
     --core-header-toolbar-border-width: 3px;
     --core-header-toolbar-border-color: var(--brand-color);
-    --core-header-toolbar-color: var(--black);
+    --core-header-toolbar-color: var(--gray-900);
     --core-header-toolbar-height: 56px;
     html.ios {
         --core-header-toolbar-height: 54px;
@@ -172,7 +202,7 @@
     --core-tabs-background: var(--white);
     --core-tab-background: var(--core-tabs-background);
     --core-tab-color: var(--subdued-text-color);
-    --core-tab-border-color: var(--gray);
+    --core-tab-border-color: var(--stroke);
     --core-tab-color-active: var(--dark);
     --core-tab-border-color-active: var(--brand-color);
     --core-tab-font-weight-active: normal;
@@ -195,8 +225,8 @@
 
     --core-progressbar-height: 8px;
     --core-progressbar-color: var(--brand-color);
-    --core-progressbar-text-color: var(--gray-darker);
-    --core-progressbar-background: var(--gray-lighter);
+    --core-progressbar-text-color: var(--medium);
+    --core-progressbar-background: var(--light);
     core-progress-bar {
         --height: var(--core-progressbar-height);
         --color: var(--core-progressbar-color);
@@ -205,7 +235,7 @@
     }
 
     --ion-item-background:        #{$ion-item-background};
-    --ion-item-detail-icon-color: var(--gray-darker);
+    --ion-item-detail-icon-color: var(--medium);
     --ion-item-detail-icon-font-size: 20px;
     --ion-item-detail-icon-opacity: 1;
     ion-item {
@@ -215,7 +245,7 @@
     }
 
     --item-divider-min-height: calc(var(--a11y-min-target-size) + 8px);
-    --item-divider-background: var(--gray-lighter);
+    --item-divider-background: var(--light);
     --item-divider-color: var(--text-color);
     ion-item-divider, ion-item.divider {
         --background: var(--item-divider-background);
@@ -243,7 +273,7 @@
     }
 
     --core-combobox-background: var(--ion-item-background);
-    --core-combobox-color: var(--black);
+    --core-combobox-color: var(--gray-900);
     --core-combobox-border-color: var(--primary);
     --core-combobox-border-width: 3px;
     --core-combobox-border-all-width: 0 0 var(--core-combobox-border-width) 0;
@@ -254,17 +284,17 @@
     --selected-item-border-width: 5px;
 
     --core-login-background: var(--white);
-    --core-login-text-color: var(--black);
+    --core-login-text-color: var(--gray-900);
     --core-login-input-background: var(--white);
-    --core-login-input-color: var(--black);
+    --core-login-input-color: var(--gray-900);
 
     --core-star-color: var(--brand-color);
 
     --core-large-avatar-size: 90px;
     --core-avatar-size: 44px;
 
-    --core-send-message-input-background: var(--gray-light);
-    --core-send-message-input-color: var(--black);
+    --core-send-message-input-background: var(--gray-200);
+    --core-send-message-input-color: var(--gray-900);
 
     --core-courseimage-on-course-height: 150px;
 
@@ -279,21 +309,21 @@
     --addon-calendar-event-user-color: var(--blue);
     --addon-calendar-event-site-color: var(--green);
     --addon-calendar-today-border-color: var(--primary);
-    --addon-calendar-border-color: var(--gray);
+    --addon-calendar-border-color: var(--stroke);
 
     --addon-messages-message-bg: var(--white);
-    --addon-messages-message-activated-bg: var(--gray-light);
-    --addon-messages-message-note-text: var(--gray-dark);
+    --addon-messages-message-activated-bg: var(--gray-200);
+    --addon-messages-message-note-text: var(--gray-500);
     --addon-messages-message-note-font-size: 75%;
-    --addon-messages-message-mine-bg: var(--gray-light);
-    --addon-messages-message-mine-activated-bg: var(--gray);
+    --addon-messages-message-mine-bg: var(--gray-200);
+    --addon-messages-message-mine-activated-bg: var(--gray-300);
     --addon-messages-avatar-size: 30px;
     --addon-messages-discussion-badge: var(--primary);
     --addon-messages-discussion-badge-text: var(--white);
 
     --addon-forum-avatar-size: var(--core-avatar-size);
-    --addon-forum-border-color: var(--gray);
-    --addon-forum-highlight-color: var(--gray-lighter);
+    --addon-forum-border-color: var(--stroke);
+    --addon-forum-highlight-color: var(--light);
 
     --drop-shadow: 0, 0, 0, 0.18;
 
@@ -307,7 +337,7 @@
     --core-question-feedback-color: var(--yellow-dark);
     --core-question-feedback-color-bg: var(--yellow-light);
     --core-question-warning-color: var(--red);
-    --core-question-saved-color-bg: var(--gray-light);
+    --core-question-saved-color-bg: var(--gray-200);
 
     --core-question-state-correct-color: var(--green-light);
     --core-question-state-partial-color: var(--yellow-light);
@@ -317,9 +347,9 @@
     --core-question-feedback-color: var(--yellow-dark);
     --core-question-feedback-background-color: var(--yellow-light);
 
-    --core-dd-question-selected-shadow: 2px 2px 4px var(--gray-dark);
+    --core-dd-question-selected-shadow: 2px 2px 4px var(--gray-500);
     --core-dd-question-radius: 10px;
-    --core-dd-question-border: var(--gray-darker);
+    --core-dd-question-border: var(--medium);
 
     @for $i from 0 to length($core-course-image-background) {
         --core-course-color-#{$i}: #{nth($core-course-image-background, $i + 1)};

From 265698c5b7d35354c13672a3688b6de703eb720d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 27 Jan 2022 22:09:50 +0100
Subject: [PATCH 0410/1008] MOBILE-3814 course: Change course summary icon

---
 .../features/course/pages/contents/contents.html   |  2 +-
 src/theme/globals.variables.scss                   | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/core/features/course/pages/contents/contents.html b/src/core/features/course/pages/contents/contents.html
index 1f6b46f1c..676c330b5 100644
--- a/src/core/features/course/pages/contents/contents.html
+++ b/src/core/features/course/pages/contents/contents.html
@@ -1,7 +1,7 @@
 <core-navbar-buttons slot="end">
     <core-context-menu>
         <core-context-menu-item [priority]="1800" [content]="'core.course.coursesummary' | translate" (action)="openCourseSummary()"
-            iconAction="fas-graduation-cap">
+            iconAction="fas-info-circle">
         </core-context-menu-item>
         <core-context-menu-item *ngFor="let item of courseMenuHandlers" [priority]="item.priority" (action)="openMenuItem(item)"
             [content]="item.data.title | translate" [iconAction]="item.data.icon" [class]="item.data.class">
diff --git a/src/theme/globals.variables.scss b/src/theme/globals.variables.scss
index 09b789740..69580f16f 100644
--- a/src/theme/globals.variables.scss
+++ b/src/theme/globals.variables.scss
@@ -5,16 +5,16 @@
  */
 
 $white:    #ffffff !default;
-$gray-100: #f8f9fa !default; // Old gray-lighter
-$gray-200: #e9ecef !default; // Old gray-light
-$gray-300: #dee2e6 !default; // Old gray // Stroke
+$gray-100: #f8f9fa !default;
+$gray-200: #e9ecef !default;
+$gray-300: #dee2e6 !default; // Stroke
 $gray-400: #ced4da !default;
-$gray-500: #8f959e !default; // Old gray-dark
-$gray-600: #6a737b !default; // Old gray-darker
+$gray-500: #8f959e !default;
+$gray-600: #6a737b !default;
 $gray-700: #495057 !default;
 $gray-800: #343a40 !default;
-$gray-900: #1d2125 !default; // Old black // Copy
-$black:    #000000 !default;
+$gray-900: #1d2125 !default; // Copy text
+$black:    #000000 !default; // Avoid usage
 
 $blue:            #0f6cbf !default;
 $blue-light:      mix($blue, white, 20%) !default;

From 5c29cd3a05fad48c80d4e80e3050b7f644dac65c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 27 Jan 2022 23:13:21 +0100
Subject: [PATCH 0411/1008] MOBILE-3814 style: Use border radius to match
 prototype

---
 .../components/blogtags/blogtags.scss         |  2 +-
 .../block/tags/components/tags/tags.scss      |  2 +-
 .../components/calendar/calendar.scss         |  2 +-
 src/core/components/combobox/combobox.scss    | 12 ++--
 src/core/components/mod-icon/mod-icon.scss    |  2 +-
 .../components/module/core-course-module.html |  4 +-
 .../core-courses-course-list-item.html        | 61 ++++++++++---------
 .../course-list-item/course-list-item.scss    |  7 ++-
 .../rich-text-editor/rich-text-editor.scss    |  2 +-
 .../features/sitehome/pages/index/index.scss  |  8 ++-
 src/theme/components/discussion.scss          |  2 +-
 src/theme/components/format-text.scss         |  2 +-
 src/theme/theme.light.scss                    | 17 ++++--
 13 files changed, 68 insertions(+), 55 deletions(-)

diff --git a/src/addons/block/blogtags/components/blogtags/blogtags.scss b/src/addons/block/blogtags/components/blogtags/blogtags.scss
index 75f3917dd..0f8abbbd2 100644
--- a/src/addons/block/blogtags/components/blogtags/blogtags.scss
+++ b/src/addons/block/blogtags/components/blogtags/blogtags.scss
@@ -24,7 +24,7 @@
                 contain: content;
                 vertical-align: baseline;
                 text-decoration: none;
-                border-radius: 4px;
+                border-radius: var(--small-radius);
             }
             .s20 {
                 font-size: 1.5em;
diff --git a/src/addons/block/tags/components/tags/tags.scss b/src/addons/block/tags/components/tags/tags.scss
index b1144d4e0..7856e76c5 100644
--- a/src/addons/block/tags/components/tags/tags.scss
+++ b/src/addons/block/tags/components/tags/tags.scss
@@ -26,7 +26,7 @@
                     contain: content;
                     vertical-align: baseline;
                     text-decoration: none;
-                    border-radius: 4px;
+                    border-radius: var(--small-radius);
                 }
                 .s20 {
                     font-size: 2.7em;
diff --git a/src/addons/calendar/components/calendar/calendar.scss b/src/addons/calendar/components/calendar/calendar.scss
index 2c63bfa24..ab1d358e8 100644
--- a/src/addons/calendar/components/calendar/calendar.scss
+++ b/src/addons/calendar/components/calendar/calendar.scss
@@ -56,7 +56,7 @@
 
         &.today .addon-calendar-day-number span {
             border: 2px solid var(--addon-calendar-today-border-color);
-            line-height: 20px;;
+            line-height: 20px;
             border-radius: 50%;
         }
         &.dayblank {
diff --git a/src/core/components/combobox/combobox.scss b/src/core/components/combobox/combobox.scss
index 566c1274e..2548e9f1b 100644
--- a/src/core/components/combobox/combobox.scss
+++ b/src/core/components/combobox/combobox.scss
@@ -21,14 +21,14 @@
 
         --border-color: var(--core-combobox-border-color);
         --border-style: solid;
-        --border-width: var(--core-combobox-border-all-width);
+        --border-width: var(--core-combobox-border-width);
 
         --box-shadow: var(--core-combobox-box-shadow);
 
-        --padding-top: 10px;
-        --padding-end: 10px;
-        --padding-bottom: 10px;
-        --padding-start: 16px;
+        --padding-top: 8px;
+        --padding-end: 8px;
+        --padding-bottom: 8px;
+        --padding-start: 8px;
 
         &.md {
             --background-activated-opacity: 0;
@@ -105,7 +105,7 @@ ion-button {
         font-weight: 400;
         font-size: 16px;
         line-height: 20px;
-        border-radius: 0;
+        border-radius: var(--core-combobox-radius);
     }
 
     .select-text {
diff --git a/src/core/components/mod-icon/mod-icon.scss b/src/core/components/mod-icon/mod-icon.scss
index 5cd4a8cca..b0dcb46d0 100644
--- a/src/core/components/mod-icon/mod-icon.scss
+++ b/src/core/components/mod-icon/mod-icon.scss
@@ -10,7 +10,7 @@
     margin-bottom: var(--margin-vertical);
     @include margin-horizontal(null, var(--margin-end));
 
-    border-radius: 4px;
+    border-radius: var(--small-radius);
     padding: 0.7rem;
     background-color: $gray-100;
     line-height: var(--size);
diff --git a/src/core/features/course/components/module/core-course-module.html b/src/core/features/course/components/module/core-course-module.html
index 8a50cf3b3..1f5af1171 100644
--- a/src/core/features/course/components/module/core-course-module.html
+++ b/src/core/features/course/components/module/core-course-module.html
@@ -1,4 +1,4 @@
-<ng-container *ngIf="module.handlerData && module.visibleoncoursepage !== 0">
+<ion-card *ngIf="module.handlerData && module.visibleoncoursepage !== 0">
     <ng-container *ngIf="!module.handlerData.loading">
         <ion-item id="core-course-module-{{module.id}}"
             class="ion-text-wrap core-course-module-handler core-module-main-item {{module.handlerData.class}}"
@@ -91,4 +91,4 @@
             <ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner>
         </ion-label>
     </ion-item>
-</ng-container>
+</ion-card>
diff --git a/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html b/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
index e6255cc27..77d4e330e 100644
--- a/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
+++ b/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
@@ -1,33 +1,34 @@
-<ion-item class="ion-text-wrap core-course-list-item" (click)="openCourse()" [class.item-disabled]="course.visible == 0"
-    [class.item-dimmed]="course.hidden" [attr.aria-label]="course.displayname || course.fullname" detail="true" button
-    *ngIf="layout == 'list' || layout == 'listwithenrol'">
-    <ion-icon *ngIf="!course.courseImage" name="fas-graduation-cap" slot="start" class="course-icon core-course-thumb"
-        [attr.course-color]="course.color ? null : course.colorNumber" [style.color]="course.color">
-    </ion-icon>
-    <ion-avatar *ngIf="course.courseImage" slot="start" class="core-course-thumb">
-        <img [src]="course.courseImage" core-external-content alt="" />
-    </ion-avatar>
-    <ion-label>
-        <ion-row>
-            <ion-col class="ion-align-self-center">
-                <ng-container *ngTemplateOutlet="mainInfo"></ng-container>
-            </ion-col>
-            <ion-col size="auto" class="ion-align-self-center">
-                <ng-container *ngIf="!isEnrolled">
-                    <ion-icon *ngFor="let icon of enrolmentIcons" color="dark" size="small" [name]="icon.icon"
-                        [title]="icon.label | translate" [attr.aria-label]="icon.label | translate">
-                    </ion-icon>
-                </ng-container>
-                <ng-container *ngIf="isEnrolled">
-                    <ng-container *ngTemplateOutlet="download"></ng-container>
-                </ng-container>
-            </ion-col>
-        </ion-row>
-        <p *ngIf="isEnrolled && progress! >= 0 && completionUserTracked !== false">
-            <core-progress-bar [progress]="progress" a11yText="core.courses.aria:courseprogress"></core-progress-bar>
-        </p>
-    </ion-label>
-</ion-item>
+<ion-card class="core-course-list-item" *ngIf="layout == 'list' || layout == 'listwithenrol'" [class.item-dimmed]="course.hidden">
+    <ion-item class="ion-text-wrap" (click)="openCourse()" [class.item-disabled]="course.visible == 0"
+        [attr.aria-label]="course.displayname || course.fullname" button>
+        <ion-icon *ngIf="!course.courseImage" name="fas-graduation-cap" slot="start" class="course-icon core-course-thumb"
+            [attr.course-color]="course.color ? null : course.colorNumber" [style.color]="course.color">
+        </ion-icon>
+        <ion-avatar *ngIf="course.courseImage" slot="start" class="core-course-thumb">
+            <img [src]="course.courseImage" core-external-content alt="" />
+        </ion-avatar>
+        <ion-label>
+            <ion-row>
+                <ion-col class="ion-align-self-center">
+                    <ng-container *ngTemplateOutlet="mainInfo"></ng-container>
+                </ion-col>
+                <ion-col size="auto" class="ion-align-self-center">
+                    <ng-container *ngIf="!isEnrolled">
+                        <ion-icon *ngFor="let icon of enrolmentIcons" color="dark" size="small" [name]="icon.icon"
+                            [title]="icon.label | translate" [attr.aria-label]="icon.label | translate">
+                        </ion-icon>
+                    </ng-container>
+                    <ng-container *ngIf="isEnrolled">
+                        <ng-container *ngTemplateOutlet="download"></ng-container>
+                    </ng-container>
+                </ion-col>
+            </ion-row>
+            <p *ngIf="isEnrolled && progress! >= 0 && completionUserTracked !== false">
+                <core-progress-bar [progress]="progress" a11yText="core.courses.aria:courseprogress"></core-progress-bar>
+            </p>
+        </ion-label>
+    </ion-item>
+</ion-card>
 
 <ion-card [attr.course-color]="course.color ? null : course.colorNumber" *ngIf="layout == 'card' || layout == 'summarycard'"
     class="core-course-list-card" [class.item-dimmed]="course.hidden">
diff --git a/src/core/features/courses/components/course-list-item/course-list-item.scss b/src/core/features/courses/components/course-list-item/course-list-item.scss
index 2835c6aa9..47e14a6f0 100644
--- a/src/core/features/courses/components/course-list-item/course-list-item.scss
+++ b/src/core/features/courses/components/course-list-item/course-list-item.scss
@@ -1,6 +1,7 @@
 @import "~theme/globals";
 
-.core-course-list-item {
+
+ion-card.core-course-list-item {
     .course-icon {
         color: white;
         background: var(--gray-200);
@@ -37,7 +38,7 @@
     color: var(--core-star-color);
 }
 
-ion-card {
+ion-card.core-course-list-card {
     --vertical-margin: 12px;
     --border-radius: 16px;
     display: flex;
@@ -162,7 +163,7 @@ button {
 :host-context(.core-horizontal-scroll) {
     @include horizontal_scroll_item(80%, 250px, 300px);
 
-    ion-card {
+    ion-card.core-course-list-card {
         .core-course-thumb {
             padding-top: 30%;
         }
diff --git a/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss b/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss
index 1656bbb80..42ef760a4 100644
--- a/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss
+++ b/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss
@@ -126,7 +126,7 @@
             margin: 0 auto;
             font-size: 18px;
             background-color: var(--toobar-background);
-            border-radius: 4px;
+            border-radius: var(--small-radius);
             @include core-transition(background-color, 200ms);
             color: var(--button-color);
             cursor: pointer;
diff --git a/src/core/features/sitehome/pages/index/index.scss b/src/core/features/sitehome/pages/index/index.scss
index 9951ed0ae..9aec56ba2 100644
--- a/src/core/features/sitehome/pages/index/index.scss
+++ b/src/core/features/sitehome/pages/index/index.scss
@@ -2,10 +2,16 @@
 
 ion-item ion-icon {
     display: inline-block;
-    border-radius: 4px;
+    border-radius: var(--small-radius);
     padding: 0.7rem;
     background-color: $gray-100;
     line-height: var(--size);
     --margin-end: 1rem;
     @include margin-horizontal(null, var(--margin-end));
 }
+
+core-course-module.core-sitehome-news ::ng-deep  ion-card {
+    --border-width: 0;
+    margin: 0;
+    padding: 0;
+}
diff --git a/src/theme/components/discussion.scss b/src/theme/components/discussion.scss
index bf359a84b..173146469 100644
--- a/src/theme/components/discussion.scss
+++ b/src/theme/components/discussion.scss
@@ -24,7 +24,7 @@
     // Message item.
     ion-item.addon-message {
         border: 0;
-        border-radius: 4px;
+        border-radius: var(--small-radius);
         padding: 0 8px 0 8px;
         margin: 10px 8px 0 8px;
         --background: var(--addon-messages-message-bg);
diff --git a/src/theme/components/format-text.scss b/src/theme/components/format-text.scss
index 562764e50..b6c4216fe 100644
--- a/src/theme/components/format-text.scss
+++ b/src/theme/components/format-text.scss
@@ -374,7 +374,7 @@ core-rich-text-editor .core-rte-editor {
         border: 1px solid var(--gray-500);
         background: var(--contrast-background);
         padding: 6px 8px;
-        border-radius: 4px;
+        border-radius: var(--small-radius);
         margin-left: 2px;
         margin-right: 2px;
         margin-bottom: 10px;
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index c7840b8cb..ff855bb82 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -104,13 +104,16 @@
     --ion-text-color-rgb: #{$text-color-rgb};
     --subdued-text-color: #595959;
 
+    --small-radius: 4px;
+    --big-radius: 8px;
+
     --ion-card-color: var(--text-color);
     ion-card {
         --border-width: 1px;
         --border-style: solid;
         --border-color: var(--stroke);
         --box-shadow: none;
-        --border-radius: 8px;
+        --border-radius: var(--big-radius);
     }
 
     --text-hightlight-background-color: #{$core-text-hightlight-background-color};
@@ -176,6 +179,9 @@
         --background: var(--ion-item-background);
         .searchbar-input {
             height: var(--a11y-min-target-size);
+            border: 1px solid var(--stroke);
+            box-shadow: none;
+            border-radius: var(--big-radius);
         }
     }
 
@@ -274,11 +280,10 @@
 
     --core-combobox-background: var(--ion-item-background);
     --core-combobox-color: var(--gray-900);
-    --core-combobox-border-color: var(--primary);
-    --core-combobox-border-width: 3px;
-    --core-combobox-border-all-width: 0 0 var(--core-combobox-border-width) 0;
-    --core-combobox-radius: 0px;
-    --core-combobox-box-shadow: 0 3px 1px -2px rgba(0, 0, 0, .2), 0 2px 2px 0 rgba(0, 0, 0, .14), 0 1px 5px 0 rgba(0, 0, 0, .12);
+    --core-combobox-border-color: var(--stroke);
+    --core-combobox-border-width: 1px;
+    --core-combobox-radius: var(--big-radius);
+    --core-combobox-box-shadow: none;
 
     --selected-item-color: var(--primary);
     --selected-item-border-width: 5px;

From f7c5f572eb9289901e91ae45e7af7ed5c3e5bb2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 28 Jan 2022 09:16:42 +0100
Subject: [PATCH 0412/1008] MOBILE-3814 style: Use chips on course completion
 statuses

---
 .../core-course-module-completion.html        | 27 ++++++++++---------
 src/theme/theme.base.scss                     |  4 +++
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/core/features/course/components/module-completion/core-course-module-completion.html b/src/core/features/course/components/module-completion/core-course-module-completion.html
index a42b2b831..571e9f15a 100644
--- a/src/core/features/course/components/module-completion/core-course-module-completion.html
+++ b/src/core/features/course/components/module-completion/core-course-module-completion.html
@@ -3,24 +3,27 @@
 
     <ng-container *ngIf="completion.istrackeduser">
         <ng-container *ngFor="let rule of details">
-            <ion-badge *ngIf="rule.statuscomplete" color="success" role="listitem" [attr.aria-label]="rule.accessibleDescription">
-                <strong>{{ 'core.course.completion_automatic:done' | translate }}</strong> {{ rule.rulevalue.description }}
-            </ion-badge>
+            <ion-chip *ngIf="rule.statuscomplete" color="success" role="listitem" [attr.aria-label]="rule.accessibleDescription">
+                <ion-label><strong>{{ 'core.course.completion_automatic:done' | translate }}</strong> {{ rule.rulevalue.description }}
+                </ion-label>
+            </ion-chip>
 
-            <ion-badge *ngIf="rule.statuscompletefail" color="danger" role="listitem" [attr.aria-label]="rule.accessibleDescription">
-                <strong>{{ 'core.course.completion_automatic:failed' | translate }}</strong> {{ rule.rulevalue.description }}
-            </ion-badge>
+            <ion-chip *ngIf="rule.statuscompletefail" color="danger" role="listitem" [attr.aria-label]="rule.accessibleDescription">
+                <ion-label><strong>{{ 'core.course.completion_automatic:failed' | translate }}</strong> {{ rule.rulevalue.description }}
+                </ion-label>
+            </ion-chip>
 
-            <ion-badge *ngIf="rule.statusincomplete" color="medium" role="listitem" [attr.aria-label]="rule.accessibleDescription">
-                <strong>{{ 'core.course.completion_automatic:todo' | translate }}</strong> {{ rule.rulevalue.description }}
-            </ion-badge>
+            <ion-chip *ngIf="rule.statusincomplete" color="medium" role="listitem" [attr.aria-label]="rule.accessibleDescription">
+                <ion-label><strong>{{ 'core.course.completion_automatic:todo' | translate }}</strong> {{ rule.rulevalue.description }}
+                </ion-label>
+            </ion-chip>
         </ng-container>
     </ng-container>
 
     <ng-container *ngIf="!completion.istrackeduser">
-        <ion-badge *ngFor="let rule of details" color="light" role="listitem">
-            {{ rule.rulevalue.description }}
-        </ion-badge>
+        <ion-chip *ngFor="let rule of details" color="light" role="listitem">
+            <ion-label>{{ rule.rulevalue.description }}</ion-label>
+        </ion-chip>
     </ng-container>
 </div>
 
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 855294dff..85eac3689 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -842,6 +842,10 @@ ion-select-popover ion-item.core-select-option-title {
     }
 }
 
+ion-chip {
+    line-height: 1.1;
+}
+
 ion-searchbar {
     .searchbar-search-icon.ios {
         top: 4px;

From 1dd5eba1de1b0416c2758087ffc75eff163aee30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 24 Jan 2022 17:46:31 +0100
Subject: [PATCH 0413/1008] MOBILE-3915 course: Improve course summary info

---
 .../components/format/core-course-format.html | 96 +++++++++++--------
 .../course/components/format/format.scss      | 19 +---
 .../course/components/format/format.ts        | 40 ++++++--
 src/theme/theme.light.scss                    |  2 +-
 4 files changed, 88 insertions(+), 69 deletions(-)

diff --git a/src/core/features/course/components/format/core-course-format.html b/src/core/features/course/components/format/core-course-format.html
index 7e549a3c2..81b7ad122 100644
--- a/src/core/features/course/components/format/core-course-format.html
+++ b/src/core/features/course/components/format/core-course-format.html
@@ -9,6 +9,53 @@
 <core-dynamic-component [component]="courseFormatComponent" [data]="data">
     <!-- Default course format. -->
     <core-loading [hideUntil]="loaded">
+
+        <!-- Course summary. By default we only display the course progress. -->
+        <core-dynamic-component [component]="courseSummaryComponent" [data]="data">
+            <ion-item lines="full" class="core-format-progress-list ion-text-wrap">
+                <ion-avatar slot="start" class="core-course-thumb" *ngIf="imageThumb">
+                    <img [src]="imageThumb" core-external-content alt="" />
+                </ion-avatar>
+                <ion-label>
+                    <p *ngIf="course.categoryname">
+                        <core-format-text [text]="course.categoryname" contextLevel="coursecat" [contextInstanceId]="course.categoryid">
+                        </core-format-text>
+                    </p>
+                    <p class="item-heading">{{ course.displayname || course.fullname }}</p>
+                    <div class="core-course-progress" *ngIf="progress !== undefined">
+                        <core-progress-bar [progress]="progress" a11yText="core.course.aria:sectionprogress">
+                        </core-progress-bar>
+                    </div>
+                </ion-label>
+                <ion-button fill="clear" slot="end" (click)="openCourseSummary()" [attr.aria-label]="'core.course.coursesummary' |translate"
+                    color="dark">
+                    <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
+                </ion-button>
+            </ion-item>
+            <ion-item *ngIf="selectedSection && selectedSection.id != allSectionsId" class="ion-text-wrap">
+                <ion-icon name="fas-folder" aria-label="hidden" slot="start"></ion-icon>
+                <ion-label>
+                    <p class="item-heading">
+                        <core-format-text *ngIf="selectedSection" [text]="selectedSection.name" contextLevel="course"
+                            [contextInstanceId]="course.id" [clean]="true" [singleLine]="true">
+                        </core-format-text>
+                    </p>
+                    <ion-badge color="info" class="ion-text-wrap"
+                        *ngIf="selectedSection.visible === 0 && selectedSection.uservisible !== false">
+                        {{ 'core.course.hiddenfromstudents' | translate }}
+                    </ion-badge>
+                    <ion-badge color="info" class="ion-text-wrap"
+                        *ngIf="selectedSection.visible === 0 && selectedSection.uservisible === false">
+                        {{ 'core.notavailable' | translate }}
+                    </ion-badge>
+                    <ion-badge color="info" class="ion-text-wrap" *ngIf="selectedSection.availabilityinfo">
+                        <core-format-text [text]="selectedSection.availabilityinfo" contextLevel="course" [contextInstanceId]="course.id">
+                        </core-format-text>
+                    </ion-badge>
+                </ion-label>
+            </ion-item>
+        </core-dynamic-component>
+
         <!-- Section selector. -->
         <core-dynamic-component [component]="sectionSelectorComponent" [data]="data">
             <div *ngIf="displaySectionSelector && sections && hasSeveralSections"
@@ -19,7 +66,7 @@
                     (onChange)="sectionChanged($event)">
                     <span slot="text">
                         <core-format-text *ngIf="selectedSection" [text]="selectedSection.name" contextLevel="course"
-                            [contextInstanceId]="course?.id" [clean]="true" [singleLine]="true">
+                            [contextInstanceId]="course.id" [clean]="true" [singleLine]="true">
                         </core-format-text>
                         <ng-container *ngIf="!selectedSection">{{ 'core.course.sections' | translate }}</ng-container>
                     </span>
@@ -27,39 +74,6 @@
             </div>
         </core-dynamic-component>
 
-        <!-- Course summary. By default we only display the course progress. -->
-        <core-dynamic-component [component]="courseSummaryComponent" [data]="data">
-            <ion-list *ngIf="imageThumb || (selectedSection?.id == allSectionsId && progress !== undefined) ||
-                    (selectedSection && selectedSection.id != allSectionsId &&
-                    (selectedSection.availabilityinfo || selectedSection.visible === 0))" lines="none" class="core-format-progress-list">
-                <div *ngIf="imageThumb" class="core-course-thumb">
-                    <img [src]="imageThumb" core-external-content alt="" />
-                </div>
-                <ng-container *ngIf="selectedSection">
-                    <ion-item class="core-course-progress" *ngIf="selectedSection?.id == allSectionsId && progress !== undefined">
-                        <core-progress-bar [progress]="progress" a11yText="core.course.aria:sectionprogress">
-                        </core-progress-bar>
-                    </ion-item>
-                    <ion-item *ngIf="selectedSection && selectedSection.id != allSectionsId &&
-                        (selectedSection.availabilityinfo || selectedSection.visible === 0)">
-                        <ion-badge color="info" class="ion-text-wrap"
-                            *ngIf="selectedSection.visible === 0 && selectedSection.uservisible !== false">
-                            {{ 'core.course.hiddenfromstudents' | translate }}
-                        </ion-badge>
-                        <ion-badge color="info" class="ion-text-wrap"
-                            *ngIf="selectedSection.visible === 0 && selectedSection.uservisible === false">
-                            {{ 'core.notavailable' | translate }}
-                        </ion-badge>
-                        <ion-badge color="info" class="ion-text-wrap" *ngIf="selectedSection.availabilityinfo">
-                            <core-format-text [text]="selectedSection.availabilityinfo" contextLevel="course"
-                                [contextInstanceId]="course?.id">
-                            </core-format-text>
-                        </ion-badge>
-                    </ion-item>
-                </ng-container>
-            </ion-list>
-        </core-dynamic-component>
-
         <!-- Single section. -->
         <div *ngIf="selectedSection && selectedSection.id != allSectionsId">
             <core-dynamic-component [component]="singleSectionComponent" [data]="data">
@@ -88,12 +102,12 @@
             <ion-button *ngIf="previousSection" (click)="sectionChanged(previousSection)" fill="outline" color="primary"
                 [attr.aria-label]="('core.previous' | translate) + ': ' + previousSection.name">
                 <ion-icon name="fas-chevron-left" slot="icon-only" aria-hidden="true"></ion-icon>
-                <core-format-text class="sr-only" [text]="previousSection.name" contextLevel="course" [contextInstanceId]="course?.id">
+                <core-format-text class="sr-only" [text]="previousSection.name" contextLevel="course" [contextInstanceId]="course.id">
                 </core-format-text>
             </ion-button>
             <ion-button *ngIf="nextSection" (click)="sectionChanged(nextSection)" fill="solid" color="primary"
                 [attr.aria-label]="('core.next' | translate) + ': ' + nextSection.name">
-                <core-format-text class="sr-only" [text]="nextSection.name" contextLevel="course" [contextInstanceId]="course?.id">
+                <core-format-text class="sr-only" [text]="nextSection.name" contextLevel="course" [contextInstanceId]="course.id">
                 </core-format-text>
                 <ion-icon name="fas-chevron-right" slot="icon-only" aria-hidden="true"></ion-icon>
             </ion-button>
@@ -112,7 +126,7 @@
             [class.item-dimmed]="section.visible === 0 || section.uservisible === false">
             <ion-label>
                 <h2>
-                    <core-format-text [text]="section.name" contextLevel="course" [contextInstanceId]="course?.id">
+                    <core-format-text [text]="section.name" contextLevel="course" [contextInstanceId]="course.id">
                     </core-format-text>
                 </h2>
                 <p *ngIf="section.visible === 0 || section.availabilityinfo">
@@ -123,7 +137,7 @@
                         {{ 'core.notavailable' | translate }}
                     </ion-badge>
                     <ion-badge color="info" *ngIf="section.availabilityinfo" class="ion-text-wrap">
-                        <core-format-text [text]=" section.availabilityinfo" contextLevel="course" [contextInstanceId]="course?.id">
+                        <core-format-text [text]=" section.availabilityinfo" contextLevel="course" [contextInstanceId]="course.id">
                         </core-format-text>
                     </ion-badge>
                 </p>
@@ -132,15 +146,15 @@
 
         <ion-item class="ion-text-wrap" *ngIf="section.summary">
             <ion-label>
-                <core-format-text [text]="section.summary" contextLevel="course" [contextInstanceId]="course?.id">
+                <core-format-text [text]="section.summary" contextLevel="course" [contextInstanceId]="course.id">
                 </core-format-text>
             </ion-label>
         </ion-item>
 
         <ng-container *ngFor="let module of section.modules">
             <core-course-module *ngIf="module.visibleoncoursepage !== 0" [module]="module" [section]="section"
-                (completionChanged)="onCompletionChange($event)" [showActivityDates]="course?.showactivitydates"
-                [showCompletionConditions]="course?.showcompletionconditions">
+                (completionChanged)="onCompletionChange($event)" [showActivityDates]="course.showactivitydates"
+                [showCompletionConditions]="course.showcompletionconditions">
             </core-course-module>
         </ng-container>
     </section>
diff --git a/src/core/features/course/components/format/format.scss b/src/core/features/course/components/format/format.scss
index e7d109381..25f43001b 100644
--- a/src/core/features/course/components/format/format.scss
+++ b/src/core/features/course/components/format/format.scss
@@ -16,23 +16,8 @@
     }
 
     .core-course-thumb {
-        display: none;
-        height: var(--core-courseimage-on-course-height);
-        width: 100%;
-        overflow: hidden;
-        cursor: pointer;
-        pointer-events: auto;
-        position: relative;
-        background: var(--ion-item-background);
-        border-bottom: 1px solid var(--stroke);
-
-        img {
-            position: absolute;
-            top: 0;
-            bottom: 0;
-            margin: auto;
-            width: 100%;
-        }
+        height: var(--core-courseimage-on-course-size);
+        width: var(--core-courseimage-on-course-size);
     }
 
     @if ($core-show-courseimage-on-course) {
diff --git a/src/core/features/course/components/format/format.ts b/src/core/features/course/components/format/format.ts
index 7d93a2084..c4121074f 100644
--- a/src/core/features/course/components/format/format.ts
+++ b/src/core/features/course/components/format/format.ts
@@ -39,6 +39,7 @@ import {
     CoreCourseModuleData,
     CoreCourseModuleCompletionData,
     CoreCourseSection,
+    CoreCourseSectionWithStatus,
 } from '@features/course/services/course-helper';
 import { CoreCourseFormatDelegate } from '@features/course/services/format-delegate';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
@@ -46,6 +47,7 @@ import { IonContent, IonRefresher } from '@ionic/angular';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreCourseSectionSelectorComponent } from '../section-selector/section-selector';
 import { CoreBlockHelper } from '@features/block/services/block-helper';
+import { CoreNavigator } from '@services/navigator';
 
 /**
  * Component to display course contents using a certain format. If the format isn't found, use default one.
@@ -66,7 +68,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
 
     static readonly LOAD_MORE_ACTIVITIES = 20; // How many activities should load each time showMoreActivities is called.
 
-    @Input() course?: CoreCourseAnyCourseData; // The course to render.
+    @Input() course!: CoreCourseAnyCourseData; // The course to render.
     @Input() sections?: CoreCourseSection[]; // List of course sections.
     @Input() initialSectionId?: number; // The section to load first (by ID).
     @Input() initialSectionNumber?: number; // The section to load first (by number).
@@ -116,9 +118,17 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
     }
 
     /**
-     * Component being initialized.
+     * @inheritdoc
      */
     ngOnInit(): void {
+        if (this.course === undefined) {
+            CoreDomUtils.showErrorModal('Course not set');
+
+            CoreNavigator.back();
+
+            return;
+        }
+
         // Listen for select course tab events to select the right section if needed.
         this.selectTabObserver = CoreEvents.on(CoreEvents.SELECT_COURSE_TAB, (data) => {
             if (data.name) {
@@ -207,7 +217,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
      * @return Promise resolved when done.
      */
     protected async loadCourseFormatComponent(): Promise<void> {
-        this.courseFormatComponent = await CoreCourseFormatDelegate.getCourseFormatComponent(this.course!);
+        this.courseFormatComponent = await CoreCourseFormatDelegate.getCourseFormatComponent(this.course);
     }
 
     /**
@@ -216,7 +226,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
      * @return Promise resolved when done.
      */
     protected async loadCourseSummaryComponent(): Promise<void> {
-        this.courseSummaryComponent = await CoreCourseFormatDelegate.getCourseSummaryComponent(this.course!);
+        this.courseSummaryComponent = await CoreCourseFormatDelegate.getCourseSummaryComponent(this.course);
     }
 
     /**
@@ -225,7 +235,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
      * @return Promise resolved when done.
      */
     protected async loadSectionSelectorComponent(): Promise<void> {
-        this.sectionSelectorComponent = await CoreCourseFormatDelegate.getSectionSelectorComponent(this.course!);
+        this.sectionSelectorComponent = await CoreCourseFormatDelegate.getSectionSelectorComponent(this.course);
     }
 
     /**
@@ -234,7 +244,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
      * @return Promise resolved when done.
      */
     protected async loadSingleSectionComponent(): Promise<void> {
-        this.singleSectionComponent = await CoreCourseFormatDelegate.getSingleSectionComponent(this.course!);
+        this.singleSectionComponent = await CoreCourseFormatDelegate.getSingleSectionComponent(this.course);
     }
 
     /**
@@ -243,7 +253,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
      * @return Promise resolved when done.
      */
     protected async loadAllSectionsComponent(): Promise<void> {
-        this.allSectionsComponent = await CoreCourseFormatDelegate.getAllSectionsComponent(this.course!);
+        this.allSectionsComponent = await CoreCourseFormatDelegate.getAllSectionsComponent(this.course);
     }
 
     /**
@@ -262,7 +272,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
 
             if (!newSection) {
                 // Section not found, calculate which one to use.
-                newSection = await CoreCourseFormatDelegate.getCurrentSection(this.course!, sections);
+                newSection = await CoreCourseFormatDelegate.getCurrentSection(this.course, sections);
             }
 
             this.sectionChanged(newSection);
@@ -289,7 +299,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
 
         if (!this.loaded) {
             // No section specified, not found or not visible, get current section.
-            const section = await CoreCourseFormatDelegate.getCurrentSection(this.course!, sections);
+            const section = await CoreCourseFormatDelegate.getCurrentSection(this.course, sections);
 
             this.loaded = true;
             this.sectionChanged(section);
@@ -368,7 +378,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
         if (!previousValue || previousValue.id != newSection.id) {
             // First load or section changed, add log in Moodle.
             CoreUtils.ignoreErrors(
-                CoreCourse.logView(this.course!.id, newSection.section, undefined, this.course!.fullname),
+                CoreCourse.logView(this.course.id, newSection.section, undefined, this.course.fullname),
             );
         }
 
@@ -558,4 +568,14 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
         this.progress = this.course.progress;
     }
 
+    /**
+     * Open the course summary
+     */
+    openCourseSummary(): void {
+        CoreNavigator.navigateToSitePath(
+            '/course/' + this.course.id + '/preview',
+            { params: { course: this.course, avoidOpenCourse: true } },
+        );
+    }
+
 }
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index ff855bb82..ee6036013 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -301,7 +301,7 @@
     --core-send-message-input-background: var(--gray-200);
     --core-send-message-input-color: var(--gray-900);
 
-    --core-courseimage-on-course-height: 150px;
+    --core-courseimage-on-course-size: 72px;
 
     --core-course-module-navigation-max-height: 56px;
     --core-course-module-navigation-background: var(--contrast-background);

From 86365d260d2c6211a27c6c9e62ae8258fba98a64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 17 Nov 2021 11:46:37 +0100
Subject: [PATCH 0414/1008] MOBILE-3915 course: Implement new course index

---
 .../course/components/components.module.ts    |  6 +-
 .../course-index.html}                        | 25 ++++++--
 .../course-index.scss}                        |  0
 .../course-index.ts}                          | 26 +++++---
 .../components/format/core-course-format.html | 62 +++++--------------
 .../course/components/format/format.ts        | 52 +++++-----------
 .../module-completion-legacy.ts               | 46 +++++++-------
 src/core/features/course/lang.json            |  2 +-
 src/core/features/course/services/course.ts   |  2 +-
 .../course/services/format-delegate.ts        | 23 -------
 10 files changed, 95 insertions(+), 149 deletions(-)
 rename src/core/features/course/components/{section-selector/section-selector.html => course-index/course-index.html} (61%)
 rename src/core/features/course/components/{section-selector/section-selector.scss => course-index/course-index.scss} (100%)
 rename src/core/features/course/components/{section-selector/section-selector.ts => course-index/course-index.ts} (77%)

diff --git a/src/core/features/course/components/components.module.ts b/src/core/features/course/components/components.module.ts
index 516a43111..739dc216e 100644
--- a/src/core/features/course/components/components.module.ts
+++ b/src/core/features/course/components/components.module.ts
@@ -20,7 +20,7 @@ import { CoreCourseFormatComponent } from './format/format';
 import { CoreCourseModuleComponent } from './module/module';
 import { CoreCourseModuleCompletionComponent } from './module-completion/module-completion';
 import { CoreCourseModuleDescriptionComponent } from './module-description/module-description';
-import { CoreCourseSectionSelectorComponent } from './section-selector/section-selector';
+import { CoreCourseCourseIndexComponent } from './course-index/course-index';
 import { CoreCourseTagAreaComponent } from './tag-area/tag-area';
 import { CoreCourseUnsupportedModuleComponent } from './unsupported-module/unsupported-module';
 import { CoreCourseModuleCompletionLegacyComponent } from './module-completion-legacy/module-completion-legacy';
@@ -37,7 +37,7 @@ import { CoreCourseModuleNavigationComponent } from './module-navigation/module-
         CoreCourseModuleDescriptionComponent,
         CoreCourseModuleInfoComponent,
         CoreCourseModuleManualCompletionComponent,
-        CoreCourseSectionSelectorComponent,
+        CoreCourseCourseIndexComponent,
         CoreCourseTagAreaComponent,
         CoreCourseUnsupportedModuleComponent,
         CoreCourseModuleNavigationComponent,
@@ -54,7 +54,7 @@ import { CoreCourseModuleNavigationComponent } from './module-navigation/module-
         CoreCourseModuleDescriptionComponent,
         CoreCourseModuleInfoComponent,
         CoreCourseModuleManualCompletionComponent,
-        CoreCourseSectionSelectorComponent,
+        CoreCourseCourseIndexComponent,
         CoreCourseTagAreaComponent,
         CoreCourseUnsupportedModuleComponent,
         CoreCourseModuleNavigationComponent,
diff --git a/src/core/features/course/components/section-selector/section-selector.html b/src/core/features/course/components/course-index/course-index.html
similarity index 61%
rename from src/core/features/course/components/section-selector/section-selector.html
rename to src/core/features/course/components/course-index/course-index.html
index 82b2bf8b0..242cf97c4 100644
--- a/src/core/features/course/components/section-selector/section-selector.html
+++ b/src/core/features/course/components/course-index/course-index.html
@@ -1,7 +1,7 @@
 <ion-header>
     <ion-toolbar>
         <ion-title>
-            <h2 id="core-course-section-selector-label">{{ 'core.course.sections' | translate }}</h2>
+            <h2 id="core-course-section-selector-label">{{ 'core.course.courseindex' | translate }}</h2>
         </ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
@@ -13,10 +13,10 @@
 <ion-content>
     <ion-list id="core-course-section-selector" role="listbox" aria-labelledby="core-course-section-selector-label">
         <ng-container *ngFor="let section of sections">
-            <ion-item *ngIf="!section.hiddenbynumsections && section.id != stealthModulesSectionId" class="ion-text-wrap"
+            <ion-item-divider *ngIf="!section.hiddenbynumsections && section.id != stealthModulesSectionId" class="ion-text-wrap"
                 (click)="selectSection(section)" [attr.aria-current]="selected?.id == section.id ? 'page' : 'false'"
                 [class.item-dimmed]="section.visible === 0 || section.uservisible === false" detail="false"
-                [attr.aria-hidden]="section.uservisible === false" button>
+                [attr.aria-hidden]="section.uservisible === false" button sticky="true">
 
                 <ion-icon name="fas-folder" slot="start" aria-hidden="true"></ion-icon>
                 <ion-label>
@@ -39,7 +39,24 @@
                         </core-format-text>
                     </ion-badge>
                 </ion-label>
-            </ion-item>
+            </ion-item-divider>
+            <ng-container *ngFor="let module of section.modules">
+                <ion-item *ngIf="module.visibleoncoursepage !== 0" class="ion-text-wrap">
+                    <!-- TODO Add Aria, styles when disabled, etc. -->
+                    <ion-icon name="" *ngIf="module.completionStatus === undefined" slot="start"></ion-icon>
+                    <ion-icon name="far-circle" *ngIf="module.completionStatus === 0" slot="start"></ion-icon>
+                    <ion-icon name="fas-circle" *ngIf="module.completionStatus === 1" color="success" slot="start"></ion-icon>
+                    <ion-icon name="fas-circle" *ngIf="module.completionStatus === 2" color="success" slot="start"></ion-icon>
+                    <ion-icon name="fas-circle" *ngIf="module.completionStatus === 3" color="danger" slot="start"></ion-icon>
+                    <ion-label>
+                        <p class="item-heading">
+                            <core-format-text [text]="module.name" contextLevel="module" [contextInstanceId]="module.id"
+                                [courseId]="module.courseid">
+                            </core-format-text>
+                        </p>
+                    </ion-label>
+                </ion-item>
+            </ng-container>
         </ng-container>
     </ion-list>
 </ion-content>
diff --git a/src/core/features/course/components/section-selector/section-selector.scss b/src/core/features/course/components/course-index/course-index.scss
similarity index 100%
rename from src/core/features/course/components/section-selector/section-selector.scss
rename to src/core/features/course/components/course-index/course-index.scss
diff --git a/src/core/features/course/components/section-selector/section-selector.ts b/src/core/features/course/components/course-index/course-index.ts
similarity index 77%
rename from src/core/features/course/components/section-selector/section-selector.ts
rename to src/core/features/course/components/course-index/course-index.ts
index e71790478..3b51cad30 100644
--- a/src/core/features/course/components/section-selector/section-selector.ts
+++ b/src/core/features/course/components/course-index/course-index.ts
@@ -14,7 +14,7 @@
 
 import { Component, Input, OnInit } from '@angular/core';
 
-import { CoreCourseSection } from '@features/course/services/course-helper';
+import { CoreCourseModuleData, CoreCourseSection, CoreCourseSectionWithStatus } from '@features/course/services/course-helper';
 import {
     CoreCourseModuleCompletionStatus,
     CoreCourseModuleCompletionTracking,
@@ -25,14 +25,14 @@ import { CoreUtils } from '@services/utils/utils';
 import { ModalController } from '@singletons';
 
 /**
- * Component to display course section selector in a modal.
+ * Component to display course index modal.
  */
 @Component({
-    selector: 'core-course-section-selector',
-    templateUrl: 'section-selector.html',
-    styleUrls: ['section-selector.scss'],
+    selector: 'core-course-course-index',
+    templateUrl: 'course-index.html',
+    styleUrls: ['course-index.scss'],
 })
-export class CoreCourseSectionSelectorComponent implements OnInit {
+export class CoreCourseCourseIndexComponent implements OnInit {
 
     @Input() sections?: SectionWithProgress[];
     @Input() selected?: CoreCourseSection;
@@ -41,7 +41,7 @@ export class CoreCourseSectionSelectorComponent implements OnInit {
     stealthModulesSectionId = CoreCourseProvider.STEALTH_MODULES_SECTION_ID;
 
     /**
-     * Component being initialized.
+     * @inheritdoc
      */
     ngOnInit(): void {
 
@@ -52,7 +52,7 @@ export class CoreCourseSectionSelectorComponent implements OnInit {
 
         const formatOptions = CoreUtils.objectToKeyValueMap(this.course.courseformatoptions, 'name', 'value');
 
-        if (!formatOptions || formatOptions.coursedisplay != 1 || formatOptions.completionusertracked === false) {
+        if (!formatOptions || formatOptions.completionusertracked === false) {
             return;
         }
 
@@ -60,11 +60,16 @@ export class CoreCourseSectionSelectorComponent implements OnInit {
             let complete = 0;
             let total = 0;
             section.modules.forEach((module) => {
+                console.error(module);
                 if (!module.uservisible || module.completiondata === undefined ||
                         module.completiondata.tracking == CoreCourseModuleCompletionTracking.COMPLETION_TRACKING_NONE) {
+                    module.completionStatus = undefined;
+
                     return;
                 }
 
+                module.completionStatus = module.completiondata.state;
+
                 total++;
                 if (module.completiondata.state == CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE ||
                         module.completiondata.state == CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE_PASS) {
@@ -98,6 +103,9 @@ export class CoreCourseSectionSelectorComponent implements OnInit {
 
 }
 
-type SectionWithProgress = CoreCourseSection & {
+type SectionWithProgress = Omit<CoreCourseSectionWithStatus, 'modules'> & {
     progress?: number;
+    modules: (CoreCourseModuleData & {
+        completionStatus?: CoreCourseModuleCompletionStatus;
+    })[];
 };
diff --git a/src/core/features/course/components/format/core-course-format.html b/src/core/features/course/components/format/core-course-format.html
index 81b7ad122..9ecb91ece 100644
--- a/src/core/features/course/components/format/core-course-format.html
+++ b/src/core/features/course/components/format/core-course-format.html
@@ -1,8 +1,8 @@
 <!-- Buttons to add to the header. *ngIf is needed, otherwise the component is executed too soon and doesn't find the header. -->
 <core-navbar-buttons slot="end" *ngIf="loaded">
     <core-context-menu>
-        <core-context-menu-item [hidden]="!displaySectionSelector || !sections || !sections.length" [priority]="500"
-            [content]="'core.course.sections' | translate" (action)="showSectionSelector()" iconAction="menu">
+        <core-context-menu-item [hidden]="!displayCourseIndex || !sections || !sections.length" [priority]="500"
+            [content]="'core.course.courseindex' | translate" (action)="openCourseIndex()" iconAction="menu">
         </core-context-menu-item>
     </core-context-menu>
 </core-navbar-buttons>
@@ -32,46 +32,6 @@
                     <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
                 </ion-button>
             </ion-item>
-            <ion-item *ngIf="selectedSection && selectedSection.id != allSectionsId" class="ion-text-wrap">
-                <ion-icon name="fas-folder" aria-label="hidden" slot="start"></ion-icon>
-                <ion-label>
-                    <p class="item-heading">
-                        <core-format-text *ngIf="selectedSection" [text]="selectedSection.name" contextLevel="course"
-                            [contextInstanceId]="course.id" [clean]="true" [singleLine]="true">
-                        </core-format-text>
-                    </p>
-                    <ion-badge color="info" class="ion-text-wrap"
-                        *ngIf="selectedSection.visible === 0 && selectedSection.uservisible !== false">
-                        {{ 'core.course.hiddenfromstudents' | translate }}
-                    </ion-badge>
-                    <ion-badge color="info" class="ion-text-wrap"
-                        *ngIf="selectedSection.visible === 0 && selectedSection.uservisible === false">
-                        {{ 'core.notavailable' | translate }}
-                    </ion-badge>
-                    <ion-badge color="info" class="ion-text-wrap" *ngIf="selectedSection.availabilityinfo">
-                        <core-format-text [text]="selectedSection.availabilityinfo" contextLevel="course" [contextInstanceId]="course.id">
-                        </core-format-text>
-                    </ion-badge>
-                </ion-label>
-            </ion-item>
-        </core-dynamic-component>
-
-        <!-- Section selector. -->
-        <core-dynamic-component [component]="sectionSelectorComponent" [data]="data">
-            <div *ngIf="displaySectionSelector && sections && hasSeveralSections"
-                class="ion-text-wrap ion-justify-content-between ion-align-items-center core-button-selector-row">
-                <core-combobox [modalOptions]="sectionSelectorModalOptions" interface="modal" listboxId="core-course-section-button"
-                    icon="fas-folder" [label]="'core.course.section' | translate"
-                    [selection]="selectedSection ? selectedSection.name : 'core.course.sections' | translate"
-                    (onChange)="sectionChanged($event)">
-                    <span slot="text">
-                        <core-format-text *ngIf="selectedSection" [text]="selectedSection.name" contextLevel="course"
-                            [contextInstanceId]="course.id" [clean]="true" [singleLine]="true">
-                        </core-format-text>
-                        <ng-container *ngIf="!selectedSection">{{ 'core.course.sections' | translate }}</ng-container>
-                    </span>
-                </core-combobox>
-            </div>
         </core-dynamic-component>
 
         <!-- Single section. -->
@@ -98,7 +58,7 @@
         </div>
 
         <ion-buttons class="ion-padding core-course-section-nav-buttons safe-area-padding-horizontal"
-            *ngIf="displaySectionSelector && sections?.length">
+            *ngIf="displayCourseIndex && sections?.length">
             <ion-button *ngIf="previousSection" (click)="sectionChanged(previousSection)" fill="outline" color="primary"
                 [attr.aria-label]="('core.previous' | translate) + ': ' + previousSection.name">
                 <ion-icon name="fas-chevron-left" slot="icon-only" aria-hidden="true"></ion-icon>
@@ -115,17 +75,25 @@
 
         <core-block-side-blocks-button *ngIf="course && displayBlocks && hasBlocks" [courseId]="course.id">
         </core-block-side-blocks-button>
+
     </core-loading>
 </core-dynamic-component>
 
+<!-- Course Index button. -->
+<ion-fab slot="fixed" core-fab vertical="bottom" horizontal="end" *ngIf="displayCourseIndex">
+    <ion-fab-button (click)="openCourseIndex()" [attr.aria-label]="'core.course.courseindex' | translate">
+        <ion-icon name="fas-list-ul" aria-hidden="true"></ion-icon>
+        <span class="sr-only">{{'core.course.courseindex' | translate }}</span>
+    </ion-fab-button>
+</ion-fab>
+
 <!-- Template to render a section. -->
 <ng-template #sectionTemplate let-section="section">
     <section *ngIf="!section.hiddenbynumsections && section.id != allSectionsId && section.id != stealthModulesSectionId">
-        <!-- Title is only displayed when viewing all sections. -->
-        <ion-item-divider *ngIf="selectedSection?.id == allSectionsId && section.name" class="ion-text-wrap" color="light"
-            [class.item-dimmed]="section.visible === 0 || section.uservisible === false">
+        <ion-item-divider class="ion-text-wrap" color="light" [class.item-dimmed]="section.visible === 0 || section.uservisible === false">
+            <ion-icon name="fas-folder" aria-label="hidden" slot="start"></ion-icon>
             <ion-label>
-                <h2>
+                <h2 *ngIf="section.name">
                     <core-format-text [text]="section.name" contextLevel="course" [contextInstanceId]="course.id">
                     </core-format-text>
                 </h2>
diff --git a/src/core/features/course/components/format/format.ts b/src/core/features/course/components/format/format.ts
index c4121074f..e7efb6bc4 100644
--- a/src/core/features/course/components/format/format.ts
+++ b/src/core/features/course/components/format/format.ts
@@ -26,7 +26,6 @@ import {
     Type,
     ElementRef,
 } from '@angular/core';
-import { ModalOptions } from '@ionic/core';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreDynamicComponent } from '@components/dynamic-component/dynamic-component';
 import { CoreCourseAnyCourseData } from '@features/courses/services/courses';
@@ -45,7 +44,7 @@ import { CoreCourseFormatDelegate } from '@features/course/services/format-deleg
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { IonContent, IonRefresher } from '@ionic/angular';
 import { CoreUtils } from '@services/utils/utils';
-import { CoreCourseSectionSelectorComponent } from '../section-selector/section-selector';
+import { CoreCourseCourseIndexComponent } from '../course-index/course-index';
 import { CoreBlockHelper } from '@features/block/services/block-helper';
 import { CoreNavigator } from '@services/navigator';
 
@@ -80,7 +79,6 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
     // All the possible component classes.
     courseFormatComponent?: Type<unknown>;
     courseSummaryComponent?: Type<unknown>;
-    sectionSelectorComponent?: Type<unknown>;
     singleSectionComponent?: Type<unknown>;
     allSectionsComponent?: Type<unknown>;
 
@@ -88,7 +86,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
     showSectionId = 0;
     data: Record<string, unknown> = {}; // Data to pass to the components.
 
-    displaySectionSelector = false;
+    displayCourseIndex = false;
     displayBlocks = false;
     hasBlocks = false;
     selectedSection?: CoreCourseSection;
@@ -97,17 +95,11 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
     allSectionsId: number = CoreCourseProvider.ALL_SECTIONS_ID;
     stealthModulesSectionId: number = CoreCourseProvider.STEALTH_MODULES_SECTION_ID;
     loaded = false;
-    hasSeveralSections?: boolean;
     imageThumb?: string;
     progress?: number;
-    sectionSelectorModalOptions: ModalOptions = {
-        component: CoreCourseSectionSelectorComponent,
-        componentProps: {},
-    };
 
     protected selectTabObserver?: CoreEventObserver;
     protected lastCourseFormat?: string;
-    protected sectionSelectorExpanded = false;
 
     constructor(
         protected content: IonContent,
@@ -154,14 +146,12 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
      */
     async ngOnChanges(changes: { [name: string]: SimpleChange }): Promise<void> {
         this.setInputData();
-        this.sectionSelectorModalOptions.componentProps!.course = this.course;
-        this.sectionSelectorModalOptions.componentProps!.sections = this.sections;
 
         if (changes.course && this.course) {
             // Course has changed, try to get the components.
             this.getComponents();
 
-            this.displaySectionSelector = CoreCourseFormatDelegate.displaySectionSelector(this.course);
+            this.displayCourseIndex = CoreCourseFormatDelegate.displaySectionSelector(this.course);
             this.displayBlocks = CoreCourseFormatDelegate.displayBlocks(this.course);
 
             this.hasBlocks = await CoreBlockHelper.hasCourseBlocks(this.course.id);
@@ -174,7 +164,6 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
         }
 
         if (changes.sections && this.sections) {
-            this.sectionSelectorModalOptions.componentProps!.sections = this.sections;
             this.treatSections(this.sections);
         }
     }
@@ -205,7 +194,6 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
         await Promise.all([
             this.loadCourseFormatComponent(),
             this.loadCourseSummaryComponent(),
-            this.loadSectionSelectorComponent(),
             this.loadSingleSectionComponent(),
             this.loadAllSectionsComponent(),
         ]);
@@ -229,15 +217,6 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
         this.courseSummaryComponent = await CoreCourseFormatDelegate.getCourseSummaryComponent(this.course);
     }
 
-    /**
-     * Load section selector component.
-     *
-     * @return Promise resolved when done.
-     */
-    protected async loadSectionSelectorComponent(): Promise<void> {
-        this.sectionSelectorComponent = await CoreCourseFormatDelegate.getSectionSelectorComponent(this.course);
-    }
-
     /**
      * Load single section component.
      *
@@ -264,7 +243,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
      */
     protected async treatSections(sections: CoreCourseSection[]): Promise<void> {
         const hasAllSections = sections[0].id == CoreCourseProvider.ALL_SECTIONS_ID;
-        this.hasSeveralSections = sections.length > 2 || (sections.length == 2 && !hasAllSections);
+        const hasSeveralSections = sections.length > 2 || (sections.length == 2 && !hasAllSections);
 
         if (this.selectedSection) {
             // We have a selected section, but the list has changed. Search the section in the list.
@@ -281,7 +260,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
         }
 
         // There is no selected section yet, calculate which one to load.
-        if (!this.hasSeveralSections) {
+        if (!hasSeveralSections) {
             // Always load "All sections" to display the section title. If it isn't there just load the section.
             this.loaded = true;
             this.sectionChanged(sections[0]);
@@ -309,18 +288,18 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
     }
 
     /**
-     * Display the section selector modal.
+     * Display the course index modal.
      */
-    async showSectionSelector(): Promise<void> {
-        if (this.sectionSelectorExpanded) {
-            return;
-        }
+    async openCourseIndex(): Promise<void> {
+        const data = await CoreDomUtils.openModal<CoreCourseSection>({
+            component: CoreCourseCourseIndexComponent,
+            componentProps: {
+                course: this.course,
+                sections: this.sections,
+                selected: this.selectedSection,
+            },
+        });
 
-        this.sectionSelectorExpanded = true;
-
-        const data = await CoreDomUtils.openModal<CoreCourseSection>(this.sectionSelectorModalOptions);
-
-        this.sectionSelectorExpanded = false;
         if (data) {
             this.sectionChanged(data);
         }
@@ -334,7 +313,6 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
     sectionChanged(newSection: CoreCourseSection): void {
         const previousValue = this.selectedSection;
         this.selectedSection = newSection;
-        this.sectionSelectorModalOptions.componentProps!.selected = this.selectedSection;
         this.data.section = this.selectedSection;
 
         if (newSection.id != this.allSectionsId) {
diff --git a/src/core/features/course/components/module-completion-legacy/module-completion-legacy.ts b/src/core/features/course/components/module-completion-legacy/module-completion-legacy.ts
index 1b9e0b453..6bf6d2414 100644
--- a/src/core/features/course/components/module-completion-legacy/module-completion-legacy.ts
+++ b/src/core/features/course/components/module-completion-legacy/module-completion-legacy.ts
@@ -52,30 +52,28 @@ export class CoreCourseModuleCompletionLegacyComponent extends CoreCourseModuleC
         let langKey: string | undefined;
         let image: string | undefined;
 
-        if (this.completion.tracking === CoreCourseModuleCompletionTracking.COMPLETION_TRACKING_MANUAL &&
-                this.completion.state === CoreCourseModuleCompletionStatus.COMPLETION_INCOMPLETE) {
-            image = 'completion-manual-n';
-            langKey = 'core.completion-alt-manual-n';
-        } else if (this.completion.tracking === CoreCourseModuleCompletionTracking.COMPLETION_TRACKING_MANUAL &&
-                this.completion.state === CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE) {
-            image = 'completion-manual-y';
-            langKey = 'core.completion-alt-manual-y';
-        } else if (this.completion.tracking === CoreCourseModuleCompletionTracking.COMPLETION_TRACKING_AUTOMATIC &&
-                this.completion.state === CoreCourseModuleCompletionStatus.COMPLETION_INCOMPLETE) {
-            image = 'completion-auto-n';
-            langKey = 'core.completion-alt-auto-n';
-        } else if (this.completion.tracking === CoreCourseModuleCompletionTracking.COMPLETION_TRACKING_AUTOMATIC &&
-                this.completion.state === CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE) {
-            image = 'completion-auto-y';
-            langKey = 'core.completion-alt-auto-y';
-        } else if (this.completion.tracking === CoreCourseModuleCompletionTracking.COMPLETION_TRACKING_AUTOMATIC &&
-                this.completion.state === CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE_PASS) {
-            image = 'completion-auto-pass';
-            langKey = 'core.completion-alt-auto-pass';
-        } else if (this.completion.tracking === CoreCourseModuleCompletionTracking.COMPLETION_TRACKING_AUTOMATIC &&
-                this.completion.state === CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE_FAIL) {
-            image = 'completion-auto-fail';
-            langKey = 'core.completion-alt-auto-fail';
+        if (this.completion.tracking === CoreCourseModuleCompletionTracking.COMPLETION_TRACKING_MANUAL) {
+            if (this.completion.state === CoreCourseModuleCompletionStatus.COMPLETION_INCOMPLETE) {
+                image = 'completion-manual-n';
+                langKey = 'core.completion-alt-manual-n';
+            } else if (this.completion.state === CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE) {
+                image = 'completion-manual-y';
+                langKey = 'core.completion-alt-manual-y';
+            }
+        } else if (this.completion.tracking === CoreCourseModuleCompletionTracking.COMPLETION_TRACKING_AUTOMATIC) {
+            if (this.completion.state === CoreCourseModuleCompletionStatus.COMPLETION_INCOMPLETE) {
+                image = 'completion-auto-n';
+                langKey = 'core.completion-alt-auto-n';
+            } else if (this.completion.state === CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE) {
+                image = 'completion-auto-y';
+                langKey = 'core.completion-alt-auto-y';
+            } else if (this.completion.state === CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE_PASS) {
+                image = 'completion-auto-pass';
+                langKey = 'core.completion-alt-auto-pass';
+            } else if (this.completion.state === CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE_FAIL) {
+                image = 'completion-auto-fail';
+                langKey = 'core.completion-alt-auto-fail';
+            }
         }
 
         if (image) {
diff --git a/src/core/features/course/lang.json b/src/core/features/course/lang.json
index f6f144b2d..d83be79fa 100644
--- a/src/core/features/course/lang.json
+++ b/src/core/features/course/lang.json
@@ -26,6 +26,7 @@
     "confirmdownloadzerosize": "You are about to start downloading.{{availableSpace}} Are you sure you want to continue?",
     "confirmpartialdownloadsize": "You are about to download <strong>at least</strong> {{size}}.{{availableSpace}} Are you sure you want to continue?",
     "confirmlimiteddownload": "You are not currently connected to Wi-Fi. ",
+    "courseindex": "Course index",
     "gotonextactivity": "Continue to next activity",
     "gotonextactivitynotfound": "Next activity not found. It's possible that it has been hidden or deleted.",
     "gotopreviousactivity": "Continue to previous activity",
@@ -49,7 +50,6 @@
     "overriddennotice": "Your final grade from this activity was manually adjusted.",
     "refreshcourse": "Refresh course",
     "section": "Section",
-    "sections": "Sections",
     "useactivityonbrowser": "You can still use it using your device's web browser.",
     "warningmanualcompletionmodified": "The manual completion of an activity was modified on the site.",
     "warningofflinemanualcompletiondeleted": "Some offline manual completion of course '{{name}}' has been deleted. {{error}}"
diff --git a/src/core/features/course/services/course.ts b/src/core/features/course/services/course.ts
index 24984dfc3..170cbbef5 100644
--- a/src/core/features/course/services/course.ts
+++ b/src/core/features/course/services/course.ts
@@ -62,7 +62,7 @@ declare module '@singletons/events' {
 }
 
 /**
- * Completion status valid values.
+ * Course Module completion status enumeration.
  */
 export enum CoreCourseModuleCompletionStatus {
     COMPLETION_INCOMPLETE = 0,
diff --git a/src/core/features/course/services/format-delegate.ts b/src/core/features/course/services/format-delegate.ts
index 295691a0e..dc2efc50b 100644
--- a/src/core/features/course/services/format-delegate.ts
+++ b/src/core/features/course/services/format-delegate.ts
@@ -125,15 +125,6 @@ export interface CoreCourseFormatHandler extends CoreDelegateHandler {
      */
     getCourseSummaryComponent?(course: CoreCourseAnyCourseData): Promise<Type<unknown> | undefined>;
 
-    /**
-     * Return the Component to use to display the section selector inside the default course format.
-     * It's recommended to return the class of the component, but you can also return an instance of the component.
-     *
-     * @param course The course to render.
-     * @return Promise resolved with component to use, undefined if not found.
-     */
-    getSectionSelectorComponent?(course: CoreCourseAnyCourseData): Promise<Type<unknown> | undefined>;
-
     /**
      * Return the Component to use to display a single section. This component will only be used if the user is viewing a
      * single section. If all the sections are displayed at once then it won't be used.
@@ -302,20 +293,6 @@ export class CoreCourseFormatDelegateService extends CoreDelegate<CoreCourseForm
         }
     }
 
-    /**
-     * Get the component to use to display the section selector inside the default course format.
-     *
-     * @param course The course to render.
-     * @return Promise resolved with component to use, undefined if not found.
-     */
-    async getSectionSelectorComponent(course: CoreCourseAnyCourseData): Promise<Type<unknown> | undefined> {
-        try {
-            return await this.executeFunctionOnEnabled<Type<unknown>>(course.format || '', 'getSectionSelectorComponent', [course]);
-        } catch (error) {
-            this.logger.error('Error getting section selector component', error);
-        }
-    }
-
     /**
      * Get the component to use to display a single section. This component will only be used if the user is viewing
      * a single section. If all the sections are displayed at once then it won't be used.

From 901a4454080b46e40a37694571e69b16c61782c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 24 Jan 2022 11:19:34 +0100
Subject: [PATCH 0415/1008] MOBILE-3915 course: Move Course summary info
 outside the tabs

---
 .../components/tabs-outlet/tabs-outlet.ts     |  23 ++-
 src/core/directives/collapsible-header.ts     | 171 +++++++++++-------
 .../side-blocks-button.scss                   |   1 +
 .../components/format/core-course-format.html |  37 +---
 .../course/components/format/format.scss      |  60 +-----
 .../course/components/format/format.ts        |  95 +++++-----
 .../module-completion-legacy.ts               |  40 +++-
 .../module-manual-completion.ts               |  11 +-
 .../course/pages/contents/contents.html       |   3 +-
 .../features/course/pages/index/index.html    |  31 +++-
 .../course/pages/index/index.module.ts        |   2 +-
 .../features/course/pages/index/index.scss    |  26 +++
 .../pages/index/{index.page.ts => index.ts}   | 109 ++++++++---
 src/core/features/course/services/course.ts   |   5 +
 .../course/services/format-delegate.ts        |   4 +-
 src/core/singletons/events.ts                 |  14 ++
 src/theme/theme.base.scss                     |  27 ++-
 17 files changed, 405 insertions(+), 254 deletions(-)
 create mode 100644 src/core/features/course/pages/index/index.scss
 rename src/core/features/course/pages/index/{index.page.ts => index.ts} (69%)

diff --git a/src/core/components/tabs-outlet/tabs-outlet.ts b/src/core/components/tabs-outlet/tabs-outlet.ts
index 54da61022..d7575f2fe 100644
--- a/src/core/components/tabs-outlet/tabs-outlet.ts
+++ b/src/core/components/tabs-outlet/tabs-outlet.ts
@@ -62,7 +62,7 @@ export class CoreTabsOutletComponent extends CoreTabsBaseComponent<CoreTabsOutle
     @Input() layout: 'icon-top' | 'icon-start' | 'icon-end' | 'icon-bottom' | 'icon-hide' | 'label-hide' = 'icon-hide';
     @Input() tabs: CoreTabsOutletTab[] = [];
 
-    @ViewChild(IonTabs) protected ionTabs?: IonTabs;
+    @ViewChild(IonTabs) protected ionTabs!: IonTabs;
 
     protected stackEventsSubscription?: Subscription;
     protected outletActivatedSubscription?: Subscription;
@@ -96,11 +96,17 @@ export class CoreTabsOutletComponent extends CoreTabsBaseComponent<CoreTabsOutle
         }
 
         this.tabsElement = this.element.nativeElement.querySelector('ion-tabs');
-        this.stackEventsSubscription = this.ionTabs?.outlet.stackEvents.subscribe(async (stackEvent: StackEvent) => {
+        this.stackEventsSubscription = this.ionTabs.outlet.stackEvents.subscribe(async (stackEvent: StackEvent) => {
             if (!this.isCurrentView) {
                 return;
             }
 
+            // Add tabid to the tab content element.
+            if (stackEvent.enteringView.element.id == '') {
+                const tab = this.tabs.find((tab) => tab.page == stackEvent.enteringView.url);
+                stackEvent.enteringView.element.id = tab?.id || '';
+            }
+
             this.showHideNavBarButtons(stackEvent.enteringView.element.tagName);
 
             await this.listenContentScroll(stackEvent.enteringView.element, stackEvent.enteringView.id);
@@ -111,8 +117,8 @@ export class CoreTabsOutletComponent extends CoreTabsBaseComponent<CoreTabsOutle
                 this.showHideTabs(scrollElement.scrollTop, scrollElement);
             }
         });
-        this.outletActivatedSubscription = this.ionTabs?.outlet.activateEvents.subscribe(() => {
-            this.lastActiveComponent = this.ionTabs?.outlet.component;
+        this.outletActivatedSubscription = this.ionTabs.outlet.activateEvents.subscribe(() => {
+            this.lastActiveComponent = this.ionTabs.outlet.component;
         });
     }
 
@@ -140,8 +146,8 @@ export class CoreTabsOutletComponent extends CoreTabsBaseComponent<CoreTabsOutle
         // The `ionViewDidEnter` method is not called on nested outlets unless the parent page is leaving the navigation stack,
         // that's why we need to call it manually if the page that is entering already existed in the stack (meaning that it is
         // entering in response to a back navigation from the page on top).
-        if (this.existsInNavigationStack && this.ionTabs?.outlet.isActivated) {
-            (this.ionTabs?.outlet.component as Partial<ViewDidEnter>).ionViewDidEnter?.();
+        if (this.existsInNavigationStack && this.ionTabs.outlet.isActivated) {
+            (this.ionTabs.outlet.component as Partial<ViewDidEnter>).ionViewDidEnter?.();
         }
 
         // After the view has entered for the first time, we can assume that it'll always be in the navigation stack
@@ -180,10 +186,9 @@ export class CoreTabsOutletComponent extends CoreTabsBaseComponent<CoreTabsOutle
      * @param activatedPageName Activated page name.
      */
     protected showHideNavBarButtons(activatedPageName: string): void {
-        const elements = this.ionTabs!.outlet.nativeEl.querySelectorAll('core-navbar-buttons');
-        const domUtils = CoreDomUtils.instance;
+        const elements = this.ionTabs.outlet.nativeEl.querySelectorAll('core-navbar-buttons');
         elements.forEach((element) => {
-            const instance = domUtils.getInstanceByElement<CoreNavBarButtonsComponent>(element);
+            const instance = CoreDomUtils.getInstanceByElement<CoreNavBarButtonsComponent>(element);
 
             if (instance) {
                 const pagetagName = element.closest('.ion-page')?.tagName;
diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts
index 24ba81a03..e0927de10 100644
--- a/src/core/directives/collapsible-header.ts
+++ b/src/core/directives/collapsible-header.ts
@@ -43,6 +43,10 @@ export class CoreCollapsibleHeaderDirective implements OnDestroy {
     protected headerSubHeadingFontSize = 0;
     protected contentSubHeadingFontSize = 0;
     protected subHeadingStartDifference = 0;
+    protected inContent = true;
+    protected title?: HTMLElement | null;
+    protected titleHeight = 0;
+    protected contentH1?: HTMLElement | null;
 
     constructor(el: ElementRef<HTMLIonHeaderElement>) {
         this.header = el.nativeElement;
@@ -67,8 +71,6 @@ export class CoreCollapsibleHeaderDirective implements OnDestroy {
     /**
      * Gets the loading content id to wait for the loading to finish.
      *
-     * @TODO: If no core-loading is present, load directly. Take into account content needs to be initialized.
-     *
      * @return Promise resolved with Loading Id, if any.
      */
     protected async getLoadingId(): Promise<string | undefined> {
@@ -80,6 +82,17 @@ export class CoreCollapsibleHeaderDirective implements OnDestroy {
 
                 return;
             }
+
+            const title = this.header.parentElement?.querySelector('.collapsible-title') || null;
+
+            if (title) {
+                // Title already found, no need to wait for loading.
+                this.loadingObserver.off();
+                this.setupRealTitle();
+
+                return;
+            }
+
         }
 
         return this.content.querySelector('core-loading.core-loading-loaded:not(.core-loading-inline) .core-loading-content')?.id;
@@ -89,6 +102,7 @@ export class CoreCollapsibleHeaderDirective implements OnDestroy {
      * Call this function when header is not collapsible.
      */
     protected cannotCollapse(): void {
+        this.content = undefined;
         this.loadingObserver.off();
         this.header.classList.add('core-header-collapsed');
     }
@@ -112,16 +126,25 @@ export class CoreCollapsibleHeaderDirective implements OnDestroy {
             await animation.finished;
         }));
 
-        const title = this.content.querySelector<HTMLElement>('.collapsible-title, h1');
-        const contentH1 = this.content.querySelector<HTMLElement>('h1');
+        let title = this.content.querySelector<HTMLElement>('.collapsible-title');
+        if (!title) {
+            // Title is outside the ion-content.
+            title = this.header.parentElement?.querySelector('.collapsible-title') || null;
+            this.inContent = false;
+        }
+        this.contentH1 = title?.querySelector<HTMLElement>('h1');
         const headerH1 = this.header.querySelector<HTMLElement>('h1');
-        if (!title || !contentH1 || !headerH1) {
+        if (!title || !this.contentH1 || !headerH1 || !this.contentH1.parentElement) {
             this.cannotCollapse();
 
             return;
         }
 
-        this.titleTopDifference = contentH1.getBoundingClientRect().top - headerH1.getBoundingClientRect().top;
+        this.title = title;
+        this.titleHeight = title.getBoundingClientRect().height;
+
+        this.titleTopDifference = this.contentH1.getBoundingClientRect().top - headerH1.getBoundingClientRect().top;
+
         if (this.titleTopDifference <= 0) {
             this.cannotCollapse();
 
@@ -141,17 +164,17 @@ export class CoreCollapsibleHeaderDirective implements OnDestroy {
         }
 
         const headerH1Styles = getComputedStyle(headerH1);
-        const contentH1Styles = getComputedStyle(contentH1);
+        const contentH1Styles = getComputedStyle(this.contentH1);
 
         if (Platform.isRTL) {
             // Checking position over parent because transition may not be finished.
-            const contentH1Position = contentH1.getBoundingClientRect().right - this.content.getBoundingClientRect().right;
+            const contentH1Position = this.contentH1.getBoundingClientRect().right - this.content.getBoundingClientRect().right;
             const headerH1Position = headerH1.getBoundingClientRect().right - this.header.getBoundingClientRect().right;
 
             this.h1StartDifference = Math.round(contentH1Position - (headerH1Position - parseFloat(headerH1Styles.paddingRight)));
         } else {
             // Checking position over parent because transition may not be finished.
-            const contentH1Position = contentH1.getBoundingClientRect().left - this.content.getBoundingClientRect().left;
+            const contentH1Position = this.contentH1.getBoundingClientRect().left - this.content.getBoundingClientRect().left;
             const headerH1Position = headerH1.getBoundingClientRect().left - this.header.getBoundingClientRect().left;
 
             this.h1StartDifference = Math.round(contentH1Position - (headerH1Position + parseFloat(headerH1Styles.paddingLeft)));
@@ -165,10 +188,10 @@ export class CoreCollapsibleHeaderDirective implements OnDestroy {
             if (styleName != 'font-size' &&
                 styleName != 'font-family' &&
                 (styleName.startsWith('font-') || styleName.startsWith('letter-'))) {
-                contentH1.style.setProperty(styleName, headerH1Styles.getPropertyValue(styleName));
+                this.contentH1?.style.setProperty(styleName, headerH1Styles.getPropertyValue(styleName));
             }
         });
-        contentH1.style.setProperty(
+        this.contentH1.style.setProperty(
             '--max-width',
             (parseFloat(headerH1Styles.width)
                 -parseFloat(headerH1Styles.paddingLeft)
@@ -176,47 +199,70 @@ export class CoreCollapsibleHeaderDirective implements OnDestroy {
                 +'px'),
         );
 
-        contentH1.setAttribute('aria-hidden', 'true');
+        this.contentH1.setAttribute('aria-hidden', 'true');
+
+        // Clone element to let the other elements be static.
+        const contentH1Clone = this.contentH1.cloneNode(true) as HTMLElement;
+        contentH1Clone.classList.add('cloned');
+        this.contentH1.parentElement.insertBefore(contentH1Clone, this.contentH1);
+        this.contentH1.style.setProperty(
+            'top',
+            (contentH1Clone.getBoundingClientRect().top -
+            this.contentH1.parentElement.getBoundingClientRect().top +
+            parseInt(getComputedStyle(this.contentH1.parentElement).marginTop || '0', 10)) + 'px',
+        );
+        this.contentH1.style.setProperty('position', 'absolute');
+
+        this.setupContent();
+    }
+
+    /**
+     * Setup content scroll.
+     *
+     * @param parentId Parent id to recalculate content
+     * @param retries  Retries to find content in case it's loading.
+     */
+    async setupContent(parentId?: string, retries = 5): Promise<void> {
+        if (parentId) {
+            this.content = this.header.parentElement?.querySelector(`#${parentId} ion-content:not(.disable-scroll-y)`);
+            this.inContent = false;
+            if (!this.content && retries > 0) {
+                await CoreUtils.nextTick();
+                await this.setupContent(parentId, --retries);
+
+                return;
+            }
+
+            this.onScroll(this.content?.scrollTop || 0);
+        }
+
+        if (!this.title || !this.content) {
+            return;
+        }
 
         // Add something under the hood to change the page background.
-        let color = getComputedStyle(title).getPropertyValue('backgroundColor').trim();
+        let color = getComputedStyle(this.title).getPropertyValue('backgroundColor').trim();
         if (color == '') {
-            color = getComputedStyle(title).getPropertyValue('--background').trim();
+            color = getComputedStyle(this.title).getPropertyValue('--background').trim();
         }
 
         const underHeader = document.createElement('div');
         underHeader.classList.add('core-underheader');
         underHeader.style.setProperty('height', this.header.clientHeight + 'px');
         underHeader.style.setProperty('background', color);
-        this.content.shadowRoot?.querySelector('#background-content')?.prepend(underHeader);
-
-        this.content.style.setProperty('--offset-top', this.header.clientHeight + 'px');
-
-        // Subheading.
-        const headerSubHeading = this.header.querySelector<HTMLElement>('h2,.subheading');
-        const contentSubHeading = title.querySelector<HTMLElement>('h2,.subheading');
-        if (headerSubHeading && contentSubHeading) {
-            const headerSubHeadingStyles = getComputedStyle(headerSubHeading);
-            this.headerSubHeadingFontSize = parseFloat(headerSubHeadingStyles.fontSize);
-
-            const contentSubHeadingStyles = getComputedStyle(contentSubHeading);
-            this.contentSubHeadingFontSize = parseFloat(contentSubHeadingStyles.fontSize);
-
-            if (Platform.isRTL) {
-                this.subHeadingStartDifference = contentSubHeading.getBoundingClientRect().right -
-                    (headerSubHeading.getBoundingClientRect().right - parseFloat(headerSubHeadingStyles.paddingRight));
-            } else {
-                this.subHeadingStartDifference = contentSubHeading.getBoundingClientRect().left -
-                    (headerSubHeading.getBoundingClientRect().left + parseFloat(headerSubHeadingStyles.paddingLeft));
+        if (this.inContent) {
+            this.content.shadowRoot?.querySelector('#background-content')?.prepend(underHeader);
+            this.content.style.setProperty('--offset-top', this.header.clientHeight + 'px');
+        } else {
+            if (!this.header.closest('.ion-page')?.querySelector('.core-underheader')) {
+                this.header.closest('.ion-page')?.insertBefore(underHeader, this.header);
             }
-
-            contentSubHeading.setAttribute('aria-hidden', 'true');
         }
 
         this.content.scrollEvents = true;
         this.content.addEventListener('ionScroll', (e: CustomEvent<ScrollDetail>): void => {
             if (e.target == this.content) {
-                this.onScroll(title, contentH1, contentSubHeading, e.detail);
+                this.onScroll(e.detail.scrollTop);
             }
         });
     }
@@ -224,54 +270,45 @@ export class CoreCollapsibleHeaderDirective implements OnDestroy {
     /**
      * On scroll function.
      *
-     * @param title Title on ion content.
-     * @param contentH1 Heading 1 of title, if found.
-     * @param scrollDetail Event details.
+     * @param scrollTop Scroll top measure.
      */
     protected onScroll(
-        title: HTMLElement,
-        contentH1: HTMLElement,
-        contentSubheading: HTMLElement | null,
-        scrollDetail: ScrollDetail,
+        scrollTop: number,
     ): void {
-        const progress = CoreMath.clamp(scrollDetail.scrollTop / this.titleTopDifference, 0, 1);
+        if (!this.title || !this.contentH1) {
+            return;
+        }
+
+        const progress = CoreMath.clamp(scrollTop / this.titleTopDifference, 0, 1);
         const collapsed = progress >= 1;
 
+        if (!this.inContent) {
+            this.title.style.transform = 'translateY(-' + scrollTop + 'px)';
+            const height = this.titleHeight - scrollTop;
+            this.title.style.height = (height > 0 ? height : 0) + 'px';
+        }
+
         // Check total collapse.
         this.header.classList.toggle('core-header-collapsed', collapsed);
-        title.classList.toggle('collapsible-title-collapsed', collapsed);
-        title.classList.toggle('collapsible-title-collapse-started', scrollDetail.scrollTop > 0);
-        title.classList.toggle('collapsible-title-collapse-nowrap', progress > 0.5);
-        title.style.setProperty('--collapse-opacity', (1 - progress) +'');
+        this.title.classList.toggle('collapsible-title-collapsed', collapsed);
+        this.title.classList.toggle('collapsible-title-collapse-started', scrollTop > 0);
+        this.title.classList.toggle('collapsible-title-collapse-nowrap', progress > 0.5);
+        this.title.style.setProperty('--collapse-opacity', (1 - progress) +'');
 
         if (collapsed) {
-            contentH1.style.transform = 'translateX(-' + this.h1StartDifference + 'px)';
-            contentH1.style.setProperty('font-size', this.headerH1FontSize + 'px');
-
-            if (contentSubheading) {
-                contentSubheading.style.transform = 'translateX(-' + this.subHeadingStartDifference + 'px)';
-                contentSubheading.style.setProperty('font-size', this.headerSubHeadingFontSize + 'px');
-            }
+            this.contentH1.style.transform = 'translateX(-' + this.h1StartDifference + 'px)';
+            this.contentH1.style.setProperty('font-size', this.headerH1FontSize + 'px');
 
             return;
         }
 
         // Zoom font-size out.
         const newFontSize = this.contentH1FontSize - ((this.contentH1FontSize - this.headerH1FontSize) * progress);
-        contentH1.style.setProperty('font-size', newFontSize + 'px');
+        this.contentH1.style.setProperty('font-size', newFontSize + 'px');
 
         // Move.
         const newStart = - this.h1StartDifference * progress;
-        contentH1.style.transform = 'translateX(' + newStart + 'px)';
-
-        if (contentSubheading) {
-            const newFontSize = this.contentSubHeadingFontSize -
-                ((this.contentSubHeadingFontSize - this.headerSubHeadingFontSize) * progress);
-            contentSubheading.style.setProperty('font-size', newFontSize + 'px');
-
-            const newStart = - this.subHeadingStartDifference * progress;
-            contentSubheading.style.transform = 'translateX(' + newStart + 'px)';
-        }
+        this.contentH1.style.transform = 'translateX(' + newStart + 'px)';
     }
 
     /**
diff --git a/src/core/features/block/components/side-blocks-button/side-blocks-button.scss b/src/core/features/block/components/side-blocks-button/side-blocks-button.scss
index 579196d50..76b104a1a 100644
--- a/src/core/features/block/components/side-blocks-button/side-blocks-button.scss
+++ b/src/core/features/block/components/side-blocks-button/side-blocks-button.scss
@@ -4,6 +4,7 @@
     @include position(50%, 0px, null, null);
     position: fixed;
     z-index: 10;
+    transform: translateY(-50%);
 
     ion-button {
         margin: 0;
diff --git a/src/core/features/course/components/format/core-course-format.html b/src/core/features/course/components/format/core-course-format.html
index 9ecb91ece..3249dad88 100644
--- a/src/core/features/course/components/format/core-course-format.html
+++ b/src/core/features/course/components/format/core-course-format.html
@@ -10,30 +10,6 @@
     <!-- Default course format. -->
     <core-loading [hideUntil]="loaded">
 
-        <!-- Course summary. By default we only display the course progress. -->
-        <core-dynamic-component [component]="courseSummaryComponent" [data]="data">
-            <ion-item lines="full" class="core-format-progress-list ion-text-wrap">
-                <ion-avatar slot="start" class="core-course-thumb" *ngIf="imageThumb">
-                    <img [src]="imageThumb" core-external-content alt="" />
-                </ion-avatar>
-                <ion-label>
-                    <p *ngIf="course.categoryname">
-                        <core-format-text [text]="course.categoryname" contextLevel="coursecat" [contextInstanceId]="course.categoryid">
-                        </core-format-text>
-                    </p>
-                    <p class="item-heading">{{ course.displayname || course.fullname }}</p>
-                    <div class="core-course-progress" *ngIf="progress !== undefined">
-                        <core-progress-bar [progress]="progress" a11yText="core.course.aria:sectionprogress">
-                        </core-progress-bar>
-                    </div>
-                </ion-label>
-                <ion-button fill="clear" slot="end" (click)="openCourseSummary()" [attr.aria-label]="'core.course.coursesummary' |translate"
-                    color="dark">
-                    <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
-                </ion-button>
-            </ion-item>
-        </core-dynamic-component>
-
         <!-- Single section. -->
         <div *ngIf="selectedSection && selectedSection.id != allSectionsId">
             <core-dynamic-component [component]="singleSectionComponent" [data]="data">
@@ -72,15 +48,15 @@
                 <ion-icon name="fas-chevron-right" slot="icon-only" aria-hidden="true"></ion-icon>
             </ion-button>
         </ion-buttons>
-
-        <core-block-side-blocks-button *ngIf="course && displayBlocks && hasBlocks" [courseId]="course.id">
-        </core-block-side-blocks-button>
-
     </core-loading>
 </core-dynamic-component>
 
+
+<core-block-side-blocks-button slot="fixed" *ngIf="loaded && course && displayBlocks && hasBlocks" [courseId]="course.id">
+</core-block-side-blocks-button>
+
 <!-- Course Index button. -->
-<ion-fab slot="fixed" core-fab vertical="bottom" horizontal="end" *ngIf="displayCourseIndex">
+<ion-fab slot="fixed" core-fab vertical="bottom" horizontal="end" *ngIf="loaded && displayCourseIndex">
     <ion-fab-button (click)="openCourseIndex()" [attr.aria-label]="'core.course.courseindex' | translate">
         <ion-icon name="fas-list-ul" aria-hidden="true"></ion-icon>
         <span class="sr-only">{{'core.course.courseindex' | translate }}</span>
@@ -121,8 +97,7 @@
 
         <ng-container *ngFor="let module of section.modules">
             <core-course-module *ngIf="module.visibleoncoursepage !== 0" [module]="module" [section]="section"
-                (completionChanged)="onCompletionChange($event)" [showActivityDates]="course.showactivitydates"
-                [showCompletionConditions]="course.showcompletionconditions">
+                [showActivityDates]="course.showactivitydates" [showCompletionConditions]="course.showcompletionconditions">
             </core-course-module>
         </ng-container>
     </section>
diff --git a/src/core/features/course/components/format/format.scss b/src/core/features/course/components/format/format.scss
index 25f43001b..f6444fb72 100644
--- a/src/core/features/course/components/format/format.scss
+++ b/src/core/features/course/components/format/format.scss
@@ -1,55 +1,11 @@
-@import '~theme/globals.scss';
+.core-course-section-nav-buttons {
+    display: flex;
+    justify-content: flex-end;
 
-:host {
-
-    .core-format-progress-list {
-        margin-bottom: 0;
-
-        .item {
-            background: transparent;
-
-            .label {
-                margin-top: 0;
-                margin-bottom: 0;
-            }
-        }
+    core-format-text {
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        text-transform: none;
     }
-
-    .core-course-thumb {
-        height: var(--core-courseimage-on-course-size);
-        width: var(--core-courseimage-on-course-size);
-    }
-
-    @if ($core-show-courseimage-on-course) {
-        .core-course-thumb {
-            display: block;
-        }
-    }
-
-    @if ($core-hide-progress-on-course) {
-        .core-course-progress {
-            display: none;
-        }
-    }
-
-
-    .core-button-selector-row {
-        display: flex;
-        core-combobox {
-            flex-grow: 1;
-        }
-    }
-
-    .core-course-section-nav-buttons {
-        display: flex;
-        justify-content: flex-end;
-
-        core-format-text {
-            white-space: nowrap;
-            text-overflow: ellipsis;
-            overflow: hidden;
-            text-transform: none;
-        }
-    }
-
 }
diff --git a/src/core/features/course/components/format/format.ts b/src/core/features/course/components/format/format.ts
index e7efb6bc4..1cdc25197 100644
--- a/src/core/features/course/components/format/format.ts
+++ b/src/core/features/course/components/format/format.ts
@@ -68,7 +68,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
     static readonly LOAD_MORE_ACTIVITIES = 20; // How many activities should load each time showMoreActivities is called.
 
     @Input() course!: CoreCourseAnyCourseData; // The course to render.
-    @Input() sections?: CoreCourseSection[]; // List of course sections.
+    @Input() sections: CoreCourseSectionWithStatus[] = []; // List of course sections.
     @Input() initialSectionId?: number; // The section to load first (by ID).
     @Input() initialSectionNumber?: number; // The section to load first (by number).
     @Input() moduleId?: number; // The module ID to scroll to. Must be inside the initial selected section.
@@ -95,10 +95,10 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
     allSectionsId: number = CoreCourseProvider.ALL_SECTIONS_ID;
     stealthModulesSectionId: number = CoreCourseProvider.STEALTH_MODULES_SECTION_ID;
     loaded = false;
-    imageThumb?: string;
     progress?: number;
 
     protected selectTabObserver?: CoreEventObserver;
+    protected completionObserver?: CoreEventObserver;
     protected lastCourseFormat?: string;
 
     constructor(
@@ -139,6 +139,37 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
                 this.sectionChanged(section);
             }
         });
+
+        // The completion of any of the modules have changed.
+        this.completionObserver = CoreEvents.on(CoreEvents.COMPLETION_CHANGED, (data) => {
+            if (data.completion.courseId != this.course.id) {
+                return;
+            }
+
+            // Emit a new event for other components.
+            this.completionChanged.emit(data.completion);
+
+            if (data.completion.valueused !== false || !this.course || !('progress' in this.course) ||
+                    typeof this.course.progress != 'number') {
+                return;
+            }
+
+            // If the completion value is not used, the page won't be reloaded, so update the progress bar.
+            const completionModules = (<CoreCourseModuleData[]> [])
+                .concat(...this.sections.map((section) => section.modules))
+                .map((module) => module.completion && module.completion > 0 ? 1 : module.completion)
+                .reduce((accumulator, currentValue) => (accumulator || 0) + (currentValue || 0), 0);
+
+            const moduleProgressPercent = 100 / (completionModules || 1);
+            // Use min/max here to avoid floating point rounding errors over/under-flowing the progress bar.
+            if (data.completion.state === CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE) {
+                this.course.progress = Math.min(100, this.course.progress + moduleProgressPercent);
+            } else {
+                this.course.progress = Math.max(0, this.course.progress - moduleProgressPercent);
+            }
+
+            this.updateProgress();
+        });
     }
 
     /**
@@ -157,10 +188,6 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
             this.hasBlocks = await CoreBlockHelper.hasCourseBlocks(this.course.id);
 
             this.updateProgress();
-
-            if ('overviewfiles' in this.course) {
-                this.imageThumb = this.course.overviewfiles?.[0]?.fileurl;
-            }
         }
 
         if (changes.sections && this.sections) {
@@ -246,8 +273,9 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
         const hasSeveralSections = sections.length > 2 || (sections.length == 2 && !hasAllSections);
 
         if (this.selectedSection) {
+            const selectedSection = this.selectedSection;
             // We have a selected section, but the list has changed. Search the section in the list.
-            let newSection = sections.find(section => this.compareSections(section, this.selectedSection!));
+            let newSection = sections.find(section => this.compareSections(section, selectedSection));
 
             if (!newSection) {
                 // Section not found, calculate which one to use.
@@ -317,22 +345,22 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
 
         if (newSection.id != this.allSectionsId) {
             // Select next and previous sections to show the arrows.
-            const i = this.sections!.findIndex((value) => this.compareSections(value, this.selectedSection!));
+            const i = this.sections.findIndex((value) => this.compareSections(value, newSection));
 
             let j: number;
             for (j = i - 1; j >= 1; j--) {
-                if (this.canViewSection(this.sections![j])) {
+                if (this.canViewSection(this.sections[j])) {
                     break;
                 }
             }
-            this.previousSection = j >= 1 ? this.sections![j] : undefined;
+            this.previousSection = j >= 1 ? this.sections[j] : undefined;
 
-            for (j = i + 1; j < this.sections!.length; j++) {
-                if (this.canViewSection(this.sections![j])) {
+            for (j = i + 1; j < this.sections.length; j++) {
+                if (this.canViewSection(this.sections[j])) {
                     break;
                 }
             }
-            this.nextSection = j < this.sections!.length ? this.sections![j] : undefined;
+            this.nextSection = j < this.sections.length ? this.sections[j] : undefined;
         } else {
             this.previousSection = undefined;
             this.nextSection = undefined;
@@ -463,7 +491,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
     }
 
     /**
-     * Component destroyed.
+     * @inheritdoc
      */
     ngOnDestroy(): void {
         this.selectTabObserver && this.selectTabObserver.off();
@@ -498,35 +526,6 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
                 section.id != CoreCourseProvider.STEALTH_MODULES_SECTION_ID;
     }
 
-    /**
-     * The completion of any of the modules have changed.
-     */
-    onCompletionChange(completionData: CoreCourseModuleCompletionData): void {
-        // Emit a new event for other components.
-        this.completionChanged.emit(completionData);
-
-        if (completionData.valueused !== false || !this.course || !('progress' in this.course) ||
-                typeof this.course.progress != 'number') {
-            return;
-        }
-
-        // If the completion value is not used, the page won't be reloaded, so update the progress bar.
-        const completionModules = (<CoreCourseModuleData[]> [])
-            .concat(...this.sections!.map((section) => section.modules))
-            .map((module) => module.completion && module.completion > 0 ? 1 : module.completion)
-            .reduce((accumulator, currentValue) => (accumulator || 0) + (currentValue || 0), 0);
-
-        const moduleProgressPercent = 100 / (completionModules || 1);
-        // Use min/max here to avoid floating point rounding errors over/under-flowing the progress bar.
-        if (completionData.state === CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE) {
-            this.course.progress = Math.min(100, this.course.progress + moduleProgressPercent);
-        } else {
-            this.course.progress = Math.max(0, this.course.progress - moduleProgressPercent);
-        }
-
-        this.updateProgress();
-    }
-
     /**
      * Update course progress.
      */
@@ -546,14 +545,4 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
         this.progress = this.course.progress;
     }
 
-    /**
-     * Open the course summary
-     */
-    openCourseSummary(): void {
-        CoreNavigator.navigateToSitePath(
-            '/course/' + this.course.id + '/preview',
-            { params: { course: this.course, avoidOpenCourse: true } },
-        );
-    }
-
 }
diff --git a/src/core/features/course/components/module-completion-legacy/module-completion-legacy.ts b/src/core/features/course/components/module-completion-legacy/module-completion-legacy.ts
index 6bf6d2414..023967422 100644
--- a/src/core/features/course/components/module-completion-legacy/module-completion-legacy.ts
+++ b/src/core/features/course/components/module-completion-legacy/module-completion-legacy.ts
@@ -12,14 +12,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component } from '@angular/core';
+import { Component, OnDestroy, OnInit } from '@angular/core';
 
 import { CoreUser } from '@features/user/services/user';
-import { CoreCourseModuleCompletionStatus, CoreCourseModuleCompletionTracking } from '@features/course/services/course';
+import {
+    CoreCourseCompletionType,
+    CoreCourseModuleCompletionStatus,
+    CoreCourseModuleCompletionTracking,
+} from '@features/course/services/course';
 import { CoreFilterHelper } from '@features/filter/services/filter-helper';
 import { Translate } from '@singletons';
 import { CoreCourseModuleCompletionBaseComponent } from '@features/course/classes/module-completion';
 import { CoreCourseHelper } from '@features/course/services/course-helper';
+import { CoreEventObserver, CoreEvents } from '@singletons/events';
 
 /**
  * Component to handle activity completion in sites previous to 3.11.
@@ -35,11 +40,29 @@ import { CoreCourseHelper } from '@features/course/services/course-helper';
     templateUrl: 'core-course-module-completion-legacy.html',
     styleUrls: ['module-completion-legacy.scss'],
 })
-export class CoreCourseModuleCompletionLegacyComponent extends CoreCourseModuleCompletionBaseComponent {
+export class CoreCourseModuleCompletionLegacyComponent extends CoreCourseModuleCompletionBaseComponent
+    implements OnInit, OnDestroy {
 
     completionImage?: string;
     completionDescription?: string;
 
+    protected completionObserver?: CoreEventObserver;
+
+    /**
+     * @inheritdoc
+     */
+    ngOnInit(): void {
+        this.completionObserver = CoreEvents.on(CoreEvents.COMPLETION_CHANGED, (data) => {
+            if (!this.completion || this.completion.cmid != data.completion.cmid && data.type != CoreCourseCompletionType.MANUAL) {
+                return;
+            }
+
+            this.completion = data.completion;
+            this.calculateData();
+            this.completionChanged.emit(this.completion);
+        });
+    }
+
     /**
      * @inheritdoc
      */
@@ -126,9 +149,16 @@ export class CoreCourseModuleCompletionLegacyComponent extends CoreCourseModuleC
 
         await CoreCourseHelper.changeManualCompletion(this.completion, event);
 
-        this.calculateData();
+        // @deprecated MANUAL_COMPLETION_CHANGED is deprecated since 4.0 use COMPLETION_CHANGED instead.
+        CoreEvents.trigger(CoreEvents.MANUAL_COMPLETION_CHANGED, { completion: this.completion });
+        CoreEvents.trigger(CoreEvents.COMPLETION_CHANGED, { completion: this.completion, type: CoreCourseCompletionType.MANUAL });
+    }
 
-        this.completionChanged.emit(this.completion);
+    /**
+     * @inheritdoc
+     */
+    ngOnDestroy(): void {
+        this.completionObserver?.off();
     }
 
 }
diff --git a/src/core/features/course/components/module-manual-completion/module-manual-completion.ts b/src/core/features/course/components/module-manual-completion/module-manual-completion.ts
index ede613119..926349adf 100644
--- a/src/core/features/course/components/module-manual-completion/module-manual-completion.ts
+++ b/src/core/features/course/components/module-manual-completion/module-manual-completion.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChange } from '@angular/core';
+import { CoreCourseCompletionType } from '@features/course/services/course';
 
 import { CoreCourseHelper, CoreCourseModuleCompletionData } from '@features/course/services/course-helper';
 import { CoreUser } from '@features/user/services/user';
@@ -34,14 +35,14 @@ export class CoreCourseModuleManualCompletionComponent implements OnInit, OnChan
 
     accessibleDescription: string | null = null;
 
-    protected manualChangedObserver?: CoreEventObserver;
+    protected completionObserver?: CoreEventObserver;
 
     /**
      * @inheritdoc
      */
     ngOnInit(): void {
-        this.manualChangedObserver = CoreEvents.on(CoreEvents.MANUAL_COMPLETION_CHANGED, (data) => {
-            if (!this.completion || this.completion.cmid != data.completion.cmid) {
+        this.completionObserver = CoreEvents.on(CoreEvents.COMPLETION_CHANGED, (data) => {
+            if (!this.completion || this.completion.cmid != data.completion.cmid && data.type != CoreCourseCompletionType.MANUAL) {
                 return;
             }
 
@@ -98,14 +99,16 @@ export class CoreCourseModuleManualCompletionComponent implements OnInit, OnChan
 
         await CoreCourseHelper.changeManualCompletion(this.completion, event);
 
+        // @deprecated MANUAL_COMPLETION_CHANGED is deprecated since 4.0 use COMPLETION_CHANGED instead.
         CoreEvents.trigger(CoreEvents.MANUAL_COMPLETION_CHANGED, { completion: this.completion });
+        CoreEvents.trigger(CoreEvents.COMPLETION_CHANGED, { completion: this.completion, type: CoreCourseCompletionType.MANUAL });
     }
 
     /**
      * @inheritdoc
      */
     ngOnDestroy(): void {
-        this.manualChangedObserver?.off();
+        this.completionObserver?.off();
     }
 
 }
diff --git a/src/core/features/course/pages/contents/contents.html b/src/core/features/course/pages/contents/contents.html
index 676c330b5..88716c7ea 100644
--- a/src/core/features/course/pages/contents/contents.html
+++ b/src/core/features/course/pages/contents/contents.html
@@ -15,7 +15,8 @@
 
     <core-loading [hideUntil]="dataLoaded">
         <core-course-format [course]="course" [sections]="sections" [initialSectionId]="sectionId" [initialSectionNumber]="sectionNumber"
-            [moduleId]="moduleId" (completionChanged)="onCompletionChange($event)" class="core-course-format-{{course.format}}">
+            [moduleId]="moduleId" (completionChanged)="onCompletionChange($event)" class="core-course-format-{{course.format}}"
+            *ngIf="dataLoaded">
         </core-course-format>
     </core-loading>
 </ion-content>
diff --git a/src/core/features/course/pages/index/index.html b/src/core/features/course/pages/index/index.html
index b1776e63f..8ca38de7f 100644
--- a/src/core/features/course/pages/index/index.html
+++ b/src/core/features/course/pages/index/index.html
@@ -1,4 +1,4 @@
-<ion-header>
+<ion-header collapsible>
     <ion-toolbar>
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
@@ -12,4 +12,31 @@
         <ion-buttons slot="end"></ion-buttons>
     </ion-toolbar>
 </ion-header>
-<core-tabs-outlet [tabs]="tabs" [hideUntil]="loaded" (ionChange)="tabSelected()"></core-tabs-outlet>
+<ion-item lines="full" class="core-format-progress-list ion-text-wrap collapsible-title">
+    <ion-avatar slot="start" class="core-course-thumb" *ngIf="imageThumb">
+        <img [src]="imageThumb" core-external-content alt="" />
+    </ion-avatar>
+    <ion-label>
+        <ion-row>
+            <ion-col>
+                <p *ngIf="category">
+                    <core-format-text [text]="category" contextLevel="coursecat" [contextInstanceId]="course!.categoryid">
+                    </core-format-text>
+                </p>
+                <h1>{{ title }}</h1>
+            </ion-col>
+            <ion-col size="auto" class="ion-align-self-center">
+                <ion-button fill="clear" (click)="openCourseSummary()" [attr.aria-label]="'core.course.coursesummary' | translate"
+                    color="dark">
+                    <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
+                </ion-button>
+            </ion-col>
+        </ion-row>
+        <div class="core-course-progress" *ngIf="progress !== undefined">
+            <core-progress-bar [progress]="progress" a11yText="core.course.aria:sectionprogress">
+            </core-progress-bar>
+        </div>
+    </ion-label>
+
+</ion-item>
+<core-tabs-outlet [tabs]="tabs" [hideUntil]="loaded" (ionChange)="tabSelected($event)"></core-tabs-outlet>
diff --git a/src/core/features/course/pages/index/index.module.ts b/src/core/features/course/pages/index/index.module.ts
index 1e1d26938..314528baa 100644
--- a/src/core/features/course/pages/index/index.module.ts
+++ b/src/core/features/course/pages/index/index.module.ts
@@ -17,7 +17,7 @@ import { RouterModule, ROUTES, Routes } from '@angular/router';
 
 import { resolveModuleRoutes } from '@/app/app-routing.module';
 import { CoreSharedModule } from '@/core/shared.module';
-import { CoreCourseIndexPage } from './index.page';
+import { CoreCourseIndexPage } from '.';
 import { COURSE_INDEX_ROUTES } from './index-routing.module';
 
 function buildRoutes(injector: Injector): Routes {
diff --git a/src/core/features/course/pages/index/index.scss b/src/core/features/course/pages/index/index.scss
new file mode 100644
index 000000000..da91e59c2
--- /dev/null
+++ b/src/core/features/course/pages/index/index.scss
@@ -0,0 +1,26 @@
+@import '~theme/globals.scss';
+
+:host {
+    .core-course-thumb {
+        height: var(--core-courseimage-on-course-size);
+        min-height: var(--core-courseimage-on-course-size);
+        width: var(--core-courseimage-on-course-size);
+        min-width: var(--core-courseimage-on-course-size);
+    }
+
+    @if ($core-show-courseimage-on-course) {
+        .core-course-thumb {
+            display: block;
+        }
+    }
+
+    @if ($core-hide-progress-on-course) {
+        .core-course-progress {
+            display: none;
+        }
+    }
+
+    h1 {
+        font-size: 20px;
+    }
+}
diff --git a/src/core/features/course/pages/index/index.page.ts b/src/core/features/course/pages/index/index.ts
similarity index 69%
rename from src/core/features/course/pages/index/index.page.ts
rename to src/core/features/course/pages/index/index.ts
index 096de4843..2ecf4abab 100644
--- a/src/core/features/course/pages/index/index.page.ts
+++ b/src/core/features/course/pages/index/index.ts
@@ -26,6 +26,8 @@ import { CoreUtils } from '@services/utils/utils';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreNavigator } from '@services/navigator';
 import { CONTENTS_PAGE_NAME } from '@features/course/course.module';
+import { CoreDomUtils } from '@services/utils/dom';
+import { CoreCollapsibleHeaderDirective } from '@directives/collapsible-header';
 
 /**
  * Page that displays the list of courses the user is enrolled in.
@@ -33,23 +35,28 @@ import { CONTENTS_PAGE_NAME } from '@features/course/course.module';
 @Component({
     selector: 'page-core-course-index',
     templateUrl: 'index.html',
+    styleUrls: ['index.scss'],
 })
 export class CoreCourseIndexPage implements OnInit, OnDestroy {
 
     @ViewChild(CoreTabsOutletComponent) tabsComponent?: CoreTabsOutletComponent;
+    @ViewChild(CoreCollapsibleHeaderDirective) ionCollapsibleHeader?: CoreCollapsibleHeaderDirective;
 
-    title?: string;
+    title = '';
+    category = '';
     course?: CoreCourseAnyCourseData;
     tabs: CourseTab[] = [];
     loaded = false;
+    imageThumb?: string;
+    progress?: number;
 
     protected currentPagePath = '';
     protected selectTabObserver: CoreEventObserver;
     protected firstTabName?: string;
     protected module?: CoreCourseModuleData;
     protected modParams?: Params;
-    protected isGuest?: boolean;
-    protected contentsTab: CoreTabsOutletTab = {
+    protected isGuest = false;
+    protected contentsTab: CoreTabsOutletTab & { pageParams: Params } = {
         page: CONTENTS_PAGE_NAME,
         title: 'core.course',
         pageParams: {},
@@ -60,10 +67,10 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
             if (!data.name) {
                 // If needed, set sectionId and sectionNumber. They'll only be used if the content tabs hasn't been loaded yet.
                 if (data.sectionId) {
-                    this.contentsTab.pageParams!.sectionId = data.sectionId;
+                    this.contentsTab.pageParams.sectionId = data.sectionId;
                 }
                 if (data.sectionNumber) {
-                    this.contentsTab.pageParams!.sectionNumber = data.sectionNumber;
+                    this.contentsTab.pageParams.sectionNumber = data.sectionNumber;
                 }
 
                 // Select course contents.
@@ -79,7 +86,7 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
     }
 
     /**
-     * Component being initialized.
+     * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
         // Increase route depth.
@@ -87,12 +94,19 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
 
         CoreNavigator.increaseRouteDepth(path.replace(/(\/deep)+/, ''));
 
-        // Get params.
-        this.course = CoreNavigator.getRouteParam('course');
+        try {
+            this.course = CoreNavigator.getRequiredRouteParam('course');
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+            CoreNavigator.back();
+
+            return;
+        }
+
         this.firstTabName = CoreNavigator.getRouteParam('selectedTab');
         this.module = CoreNavigator.getRouteParam<CoreCourseModuleData>('module');
         this.modParams = CoreNavigator.getRouteParam<Params>('modParams');
-        this.isGuest = CoreNavigator.getRouteBooleanParam('isGuest');
+        this.isGuest = !!CoreNavigator.getRouteBooleanParam('isGuest');
 
         this.currentPagePath = CoreNavigator.getCurrentPath();
         this.contentsTab.page = CoreTextUtils.concatenatePaths(this.currentPagePath, this.contentsTab.page);
@@ -104,7 +118,7 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
         };
 
         if (this.module) {
-            this.contentsTab.pageParams!.moduleId = this.module.id;
+            this.contentsTab.pageParams.moduleId = this.module.id;
         }
 
         this.tabs.push(this.contentsTab);
@@ -112,20 +126,23 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
 
         await Promise.all([
             this.loadCourseHandlers(),
-            this.loadTitle(),
+            this.loadBasinInfo(),
         ]);
     }
 
     /**
      * A tab was selected.
      */
-    tabSelected(): void {
-        if (this.module) {
-            // Now that the first tab has been selected we can load the module.
-            CoreCourseHelper.openModule(this.module, this.course!.id, this.contentsTab.pageParams!.sectionId, this.modParams);
+    tabSelected(tabToSelect: CoreTabsOutletTab): void {
+        this.ionCollapsibleHeader?.setupContent(tabToSelect.id);
 
-            delete this.module;
+        if (!this.module || !this.course) {
+            return;
         }
+        // Now that the first tab has been selected we can load the module.
+        CoreCourseHelper.openModule(this.module, this.course.id, this.contentsTab.pageParams.sectionId, this.modParams);
+
+        delete this.module;
     }
 
     /**
@@ -134,8 +151,12 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
      * @return Promise resolved when done.
      */
     protected async loadCourseHandlers(): Promise<void> {
+        if (!this.course) {
+            return;
+        }
+
         // Load the course handlers.
-        const handlers = await CoreCourseOptionsDelegate.getHandlersToDisplay(this.course!, false, this.isGuest);
+        const handlers = await CoreCourseOptionsDelegate.getHandlersToDisplay(this.course, false, this.isGuest);
 
         let tabToLoad: number | undefined;
 
@@ -169,23 +190,34 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
      *
      * @return Promise resolved when done.
      */
-    protected async loadTitle(): Promise<void> {
+    protected async loadBasinInfo(): Promise<void> {
+        if (!this.course) {
+            return;
+        }
+
         // Get the title to display initially.
-        this.title = CoreCourseFormatDelegate.getCourseTitle(this.course!);
+        this.title = CoreCourseFormatDelegate.getCourseTitle(this.course);
+        this.category = 'categoryname' in this.course ? this.course.categoryname : '';
+
+        if ('overviewfiles' in this.course) {
+            this.imageThumb = this.course.overviewfiles?.[0]?.fileurl;
+        }
+
+        this.updateProgress();
 
         // Load sections.
-        const sections = await CoreUtils.ignoreErrors(CoreCourse.getSections(this.course!.id, false, true));
+        const sections = await CoreUtils.ignoreErrors(CoreCourse.getSections(this.course.id, false, true));
 
         if (!sections) {
             return;
         }
 
         // Get the title again now that we have sections.
-        this.title = CoreCourseFormatDelegate.getCourseTitle(this.course!, sections);
+        this.title = CoreCourseFormatDelegate.getCourseTitle(this.course, sections);
     }
 
     /**
-     * Page destroyed.
+     * @inheritdoc
      */
     ngOnDestroy(): void {
         const path = CoreNavigator.getRouteFullPath(this.route.snapshot);
@@ -208,6 +240,39 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
         this.tabsComponent?.ionViewDidLeave();
     }
 
+    /**
+     * Open the course summary
+     */
+    openCourseSummary(): void {
+        if (!this.course) {
+            return;
+        }
+
+        CoreNavigator.navigateToSitePath(
+            '/course/' + this.course.id + '/preview',
+            { params: { course: this.course, avoidOpenCourse: true } },
+        );
+    }
+
+    /**
+     * Update course progress.
+     */
+    protected updateProgress(): void {
+        if (
+            !this.course ||
+                !('progress' in this.course) ||
+                typeof this.course.progress !== 'number' ||
+                this.course.progress < 0 ||
+                this.course.completionusertracked === false
+        ) {
+            this.progress = undefined;
+
+            return;
+        }
+
+        this.progress = this.course.progress;
+    }
+
 }
 
 type CourseTab = CoreTabsOutletTab & {
diff --git a/src/core/features/course/services/course.ts b/src/core/features/course/services/course.ts
index 170cbbef5..001452497 100644
--- a/src/core/features/course/services/course.ts
+++ b/src/core/features/course/services/course.ts
@@ -71,6 +71,11 @@ export enum CoreCourseModuleCompletionStatus {
     COMPLETION_COMPLETE_FAIL = 3,
 }
 
+export enum CoreCourseCompletionType {
+    MANUAL = 0,
+    AUTO = 1,
+}
+
 /**
  * Completion tracking valid values.
  */
diff --git a/src/core/features/course/services/format-delegate.ts b/src/core/features/course/services/format-delegate.ts
index dc2efc50b..967903d58 100644
--- a/src/core/features/course/services/format-delegate.ts
+++ b/src/core/features/course/services/format-delegate.ts
@@ -267,8 +267,8 @@ export class CoreCourseFormatDelegateService extends CoreDelegate<CoreCourseForm
      * @param sections List of sections.
      * @return Course title.
      */
-    getCourseTitle(course: CoreCourseAnyCourseData, sections?: CoreCourseWSSection[]): string | undefined {
-        return this.executeFunctionOnEnabled(course.format || '', 'getCourseTitle', [course, sections]);
+    getCourseTitle(course: CoreCourseAnyCourseData, sections?: CoreCourseWSSection[]): string {
+        return this.executeFunctionOnEnabled(course.format || '', 'getCourseTitle', [course, sections]) || '';
     }
 
     /**
diff --git a/src/core/singletons/events.ts b/src/core/singletons/events.ts
index ecc3a9ad8..288897bbd 100644
--- a/src/core/singletons/events.ts
+++ b/src/core/singletons/events.ts
@@ -20,6 +20,7 @@ import { CoreFilepoolComponentFileEventData } from '@services/filepool';
 import { CoreNavigationOptions } from '@services/navigator';
 import { CoreCourseModuleCompletionData } from '@features/course/services/course-helper';
 import { CoreScreenOrientation } from '@services/screen';
+import { CoreCourseCompletionType } from '@features/course/services/course';
 
 /**
  * Observer instance to stop listening to an event.
@@ -48,6 +49,7 @@ export interface CoreEventsData {
     [CoreEvents.SELECT_COURSE_TAB]: CoreEventSelectCourseTabData;
     [CoreEvents.COMPLETION_MODULE_VIEWED]: CoreEventCompletionModuleViewedData;
     [CoreEvents.MANUAL_COMPLETION_CHANGED]: CoreEventManualCompletionChangedData;
+    [CoreEvents.COMPLETION_CHANGED]: CoreEventCompletionChangedData;
     [CoreEvents.SECTION_STATUS_CHANGED]: CoreEventSectionStatusChangedData;
     [CoreEvents.ACTIVITY_DATA_SENT]: CoreEventActivityDataSentData;
     [CoreEvents.IAB_LOAD_START]: InAppBrowserEvent;
@@ -77,7 +79,11 @@ export class CoreEvents {
     static readonly SITE_UPDATED = 'site_updated';
     static readonly SITE_DELETED = 'site_deleted';
     static readonly COMPLETION_MODULE_VIEWED = 'completion_module_viewed';
+    /**
+     * Deprecated on 4.0 use COMPLETION_CHANGED instead.
+     */
     static readonly MANUAL_COMPLETION_CHANGED = 'manual_completion_changed';
+    static readonly COMPLETION_CHANGED = 'completion_changed';
     static readonly USER_DELETED = 'user_deleted';
     static readonly PACKAGE_STATUS_CHANGED = 'package_status_changed';
     static readonly COURSE_STATUS_CHANGED = 'course_status_changed';
@@ -347,6 +353,14 @@ export type CoreEventManualCompletionChangedData = {
     completion: CoreCourseModuleCompletionData;
 };
 
+/**
+ * Data passed to COMPLETION_CHANGED event.
+ */
+export type CoreEventCompletionChangedData = {
+    completion: CoreCourseModuleCompletionData;
+    type: CoreCourseCompletionType;
+};
+
 /**
  * Data passed to SECTION_STATUS_CHANGED event.
  */
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 85eac3689..cd61d7f89 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -1225,6 +1225,13 @@ ion-grid.core-no-grid > ion-row {
     display: block;
 }
 
+.core-underheader {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+}
+
 ion-header[collapsible] {
     @include core-transition(all, 500ms);
 
@@ -1247,7 +1254,14 @@ ion-header[collapsible] {
 
 .collapsible-title {
     overflow: visible;
-    *, h1, h2, .subheading {
+    --inner-padding-top: 0px;
+    --padding-top: 0px;
+
+    ion-label {
+        margin-top: 0px;
+    }
+
+    *, h1 {
         @include core-transition(all, 200ms, linear);
     }
 
@@ -1255,9 +1269,12 @@ ion-header[collapsible] {
         overflow: visible !important;
     }
 
-    h1, h2, .subheading {
+    h1 {
         --max-width: none;
     }
+    h1.cloned {
+        opacity: 0 !important;
+    }
 }
 
 ion-app.ios .collapsible-title h1 {
@@ -1269,7 +1286,7 @@ ion-app.md .collapsible-title h1 {
 }
 
 .collapsible-title.collapsible-title-collapsed {
-    ion-label, h1, h2, ion-row, ion-col, .subheading {
+    ion-label, h1, ion-row, ion-col {
         opacity: 0;
     }
 }
@@ -1279,13 +1296,13 @@ ion-app.md .collapsible-title h1 {
         opacity: var(--collapse-opacity, 0);
     }
 
-    ion-label, h1, h2, ion-row, ion-col, .subheading {
+    ion-label, h1, ion-row, ion-col, .subheading {
         opacity: 1;
     }
 }
 
 .collapsible-title.collapsible-title-collapse-nowrap {
-    h1, h2, .subheading {
+    h1:not(.cloned) {
         max-width: var(--max-width);
         white-space: nowrap;
         overflow: hidden;

From 6b46f48b3ce1ea714b8896ef713278cdaab1fe8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 24 Jan 2022 17:46:36 +0100
Subject: [PATCH 0416/1008] MOBILE-3915 course: Improve course summary page

---
 scripts/langindex.json                        |   1 +
 src/core/classes/page-transition.ts           |   3 +
 .../components/single-activity.scss           |   3 +
 .../components/singleactivity.ts              |   1 +
 .../course/pages/contents/contents.ts         |   4 +-
 src/core/features/course/pages/index/index.ts |   2 +-
 .../course/pages/preview/preview.html         |  92 ++++++------
 .../course/pages/preview/preview.page.ts      | 141 +++++++++++-------
 .../course/pages/preview/preview.scss         |  64 ++++----
 .../features/course/services/course-helper.ts |  23 +--
 src/core/features/course/services/course.ts   |  15 +-
 .../course/services/format-delegate.ts        |  12 +-
 .../services/handlers/default-format.ts       |  91 +++--------
 .../course-list-item/course-list-item.ts      |   2 +-
 .../courses/services/handlers/course-link.ts  |   2 +-
 src/core/lang.json                            |   1 +
 upgrade.txt                                   |   1 +
 17 files changed, 233 insertions(+), 225 deletions(-)
 create mode 100644 src/core/features/course/format/singleactivity/components/single-activity.scss

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 6d97093db..c2d7b6f89 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -2257,6 +2257,7 @@
   "core.strftimetime24": "langconfig",
   "core.submit": "moodle",
   "core.success": "moodle",
+  "core.summary": "moodle",
   "core.tablet": "local_moodlemobileapp",
   "core.tag.defautltagcoll": "tag",
   "core.tag.errorareanotsupported": "local_moodlemobileapp",
diff --git a/src/core/classes/page-transition.ts b/src/core/classes/page-transition.ts
index 4ae2d83c9..4260515e0 100644
--- a/src/core/classes/page-transition.ts
+++ b/src/core/classes/page-transition.ts
@@ -93,6 +93,7 @@ export const moodleTransitionAnimation = (navEl: HTMLElement, opts: TransitionOp
     }
 
     rootAnimation.addAnimation(enteringContentAnimation);
+    enteringContentAnimation.beforeAddClass('animating').afterRemoveClass('animating');
 
     if (backDirection) {
         enteringContentAnimation
@@ -214,6 +215,8 @@ export const moodleTransitionAnimation = (navEl: HTMLElement, opts: TransitionOp
     // setup leaving view
     if (leavingEl) {
         const leavingContent = createAnimation();
+        leavingContent.beforeAddClass('animating').afterRemoveClass('animating');
+
         const leavingContentEl = leavingEl.querySelector(':scope > ion-content');
         const leavingToolBarEls = leavingEl.querySelectorAll(':scope > ion-header > ion-toolbar');
         const leavingHeaderEls = leavingEl.querySelectorAll(':scope > ion-header > *:not(ion-toolbar), :scope > ion-footer > *');
diff --git a/src/core/features/course/format/singleactivity/components/single-activity.scss b/src/core/features/course/format/singleactivity/components/single-activity.scss
new file mode 100644
index 000000000..1352a5254
--- /dev/null
+++ b/src/core/features/course/format/singleactivity/components/single-activity.scss
@@ -0,0 +1,3 @@
+:host ::ng-deep .collapsible-title {
+    display: none;
+}
diff --git a/src/core/features/course/format/singleactivity/components/singleactivity.ts b/src/core/features/course/format/singleactivity/components/singleactivity.ts
index 01da69058..b3d11a9d7 100644
--- a/src/core/features/course/format/singleactivity/components/singleactivity.ts
+++ b/src/core/features/course/format/singleactivity/components/singleactivity.ts
@@ -31,6 +31,7 @@ import { CoreCourse } from '@features/course/services/course';
 @Component({
     selector: 'core-course-format-single-activity',
     templateUrl: 'core-course-format-single-activity.html',
+    styleUrls: ['single-activity.scss'],
 })
 export class CoreCourseFormatSingleActivityComponent implements OnChanges {
 
diff --git a/src/core/features/course/pages/contents/contents.ts b/src/core/features/course/pages/contents/contents.ts
index a4de288f3..199599a4c 100644
--- a/src/core/features/course/pages/contents/contents.ts
+++ b/src/core/features/course/pages/contents/contents.ts
@@ -384,8 +384,8 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
      */
     openCourseSummary(): void {
         CoreNavigator.navigateToSitePath(
-            '/course/' + this.course.id + '/preview',
-            { params: { course: this.course } },
+            `/course/${this.course.id}/preview`,
+            { params: { course: this.course, avoidOpenCourse: true } },
         );
     }
 
diff --git a/src/core/features/course/pages/index/index.ts b/src/core/features/course/pages/index/index.ts
index 2ecf4abab..963df1009 100644
--- a/src/core/features/course/pages/index/index.ts
+++ b/src/core/features/course/pages/index/index.ts
@@ -249,7 +249,7 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
         }
 
         CoreNavigator.navigateToSitePath(
-            '/course/' + this.course.id + '/preview',
+            `/course/${this.course.id}/preview`,
             { params: { course: this.course, avoidOpenCourse: true } },
         );
     }
diff --git a/src/core/features/course/pages/preview/preview.html b/src/core/features/course/pages/preview/preview.html
index 4969b265b..4cb9bad62 100644
--- a/src/core/features/course/pages/preview/preview.html
+++ b/src/core/features/course/pages/preview/preview.html
@@ -5,7 +5,7 @@
         </ion-buttons>
         <ion-title>
             <h1>
-                <core-format-text [text]="course?.fullname" contextLevel="course" [contextInstanceId]="course?.id"></core-format-text>
+                {{'core.course.coursesummary' | translate}}
             </h1>
         </ion-title>
     </ion-toolbar>
@@ -16,44 +16,49 @@
     </ion-refresher>
     <core-loading [hideUntil]="dataLoaded">
         <div *ngIf="courseImageUrl" class="core-course-thumb-parallax">
-            <div (click)="openCourse()" class="core-course-thumb">
+            <div class="core-course-thumb">
                 <img [src]="courseImageUrl" core-external-content alt="" />
             </div>
         </div>
         <div class="core-course-thumb-parallax-content" *ngIf="course">
-            <ion-item class="ion-text-wrap" (click)="openCourse()" [attr.aria-label]="course.fullname" [detail]="canAccessCourse"
-                [button]="canAccessCourse">
-                <ion-icon name="fas-graduation-cap" fixed-width slot="start" aria-hidden="true"></ion-icon>
+            <ion-item class="ion-text-wrap">
                 <ion-label>
-                    <h2>
-                        <core-format-text [text]="course.fullname" contextLevel="course" [contextInstanceId]="course.id">
-                        </core-format-text>
-                    </h2>
                     <p *ngIf="course.categoryname">
                         <core-format-text [text]="course.categoryname" contextLevel="coursecat" [contextInstanceId]="course.categoryid">
                         </core-format-text>
                     </p>
+                    <h2>
+                        <core-format-text [text]="course.fullname" contextLevel="course" [contextInstanceId]="course.id">
+                        </core-format-text>
+                    </h2>
                     <p *ngIf="course.startdate">
                         {{course.startdate * 1000 | coreFormatDate:"strftimedatefullshort" }}
                         <span *ngIf="course.enddate"> - {{course.enddate * 1000 | coreFormatDate:"strftimedatefullshort" }}</span>
                     </p>
+                    <div class="core-course-progress" *ngIf="progress !== undefined">
+                        <core-progress-bar [progress]="progress" a11yText="core.course.aria:sectionprogress">
+                        </core-progress-bar>
+                    </div>
                 </ion-label>
             </ion-item>
 
             <ion-item class="ion-text-wrap" *ngIf="course.summary" detail="false">
                 <ion-label>
+                    <p class="item-heading">
+                        {{'core.summary' | translate}}
+                    </p>
                     <core-format-text [text]="course.summary" [maxHeight]="120" contextLevel="course" [contextInstanceId]="course.id">
                     </core-format-text>
                 </ion-label>
             </ion-item>
 
-            <ng-container class="ion-text-wrap" *ngIf="course.contacts && course.contacts.length">
-                <ion-item-divider>
+            <ion-list *ngIf="course.contacts && course.contacts.length">
+                <ion-item-divider class="ion-text-wrap">
                     <ion-label>
                         <h2>{{ 'core.teachers' | translate }}</h2>
                     </ion-label>
                 </ion-item-divider>
-                <ion-item class="ion-text-wrap" *ngFor="let contact of course.contacts" core-user-link [userId]="contact.id"
+                <ion-item button class="ion-text-wrap" *ngFor="let contact of course.contacts" core-user-link [userId]="contact.id"
                     [courseId]="isEnrolled ? course.id : null" [attr.aria-label]="'core.viewprofile' | translate" detail="true">
                     <core-user-avatar [user]="contact" slot="start" [userId]="contact.id" [courseId]="isEnrolled ? course.id : null">
                     </core-user-avatar>
@@ -62,7 +67,7 @@
                     </ion-label>
                 </ion-item>
                 <core-spacer></core-spacer>
-            </ng-container>
+            </ion-list>
 
             <ion-item class="ion-text-wrap" *ngIf="course.customfields">
                 <ion-label>
@@ -83,7 +88,8 @@
                 </ion-label>
             </ion-item>
 
-            <div *ngIf="!isEnrolled" detail="false">
+            <!-- Enrol -->
+            <ng-container *ngIf="!isEnrolled">
                 <ion-item class="ion-text-wrap" *ngFor="let instance of selfEnrolInstances">
                     <ion-label>
                         <p class="item-heading">{{ instance.name }}</p>
@@ -92,23 +98,24 @@
                         </ion-button>
                     </ion-label>
                 </ion-item>
-            </div>
-            <ion-item class="ion-text-wrap" *ngIf="!isEnrolled && paypalEnabled">
-                <ion-label>
-                    <h2>{{ 'core.courses.paypalaccepted' | translate }}</h2>
-                    <p>{{ 'core.paymentinstant' | translate }}</p>
-                    <ion-button expand="block" class="ion-margin-top" (click)="paypalEnrol()" *ngIf="isMobile">
-                        {{ 'core.courses.sendpaymentbutton' | translate }}
-                    </ion-button>
-                </ion-label>
-            </ion-item>
-            <ion-item *ngIf="!isEnrolled && !selfEnrolInstances.length && !paypalEnabled">
-                <ion-label>
-                    <p>{{ 'core.courses.notenrollable' | translate }}</p>
-                </ion-label>
-            </ion-item>
-            <ion-item *ngIf="canAccessCourse && downloadCourseEnabled" (click)="prefetchCourse()" detail="false"
-                [attr.aria-label]="prefetchCourseData.statusTranslatable | translate" button>
+                <ion-item class="ion-text-wrap" *ngIf="paypalEnabled">
+                    <ion-label>
+                        <p class="item-heading">{{ 'core.courses.paypalaccepted' | translate }}</p>
+                        <p *ngIf="isMobile">{{ 'core.paymentinstant' | translate }}</p>
+                        <ion-button *ngIf="isMobile" expand="block" class="ion-margin-top" (click)="paypalEnrol()">
+                            {{ 'core.courses.sendpaymentbutton' | translate }}
+                        </ion-button>
+                    </ion-label>
+                </ion-item>
+                <ion-item *ngIf="!selfEnrolInstances.length && !paypalEnabled">
+                    <ion-label>
+                        <p class="item-heading">{{ 'core.courses.notenrollable' | translate }}</p>
+                    </ion-label>
+                </ion-item>
+            </ng-container>
+
+            <ion-button class="ion-margin" *ngIf="canAccessCourse && downloadCourseEnabled" (click)="prefetchCourse()" expand="block"
+                [attr.aria-label]="prefetchCourseData.statusTranslatable | translate">
                 <ion-icon *ngIf="(prefetchCourseData.status != statusDownloaded) && !prefetchCourseData.loading"
                     [name]="prefetchCourseData.icon" slot="start" aria-hidden="true">
                 </ion-icon>
@@ -116,23 +123,24 @@
                     [name]="prefetchCourseData.icon" color="success" aria-hidden="true" role="status">
                 </ion-icon>
                 <ion-spinner *ngIf="prefetchCourseData.loading" slot="start" [attr.aria-label]="'core.loading' | translate"></ion-spinner>
-                <ion-label>
-                    <h2 *ngIf="prefetchCourseData.status != statusDownloaded">{{ 'core.course.downloadcourse' | translate }}</h2>
-                    <h2 *ngIf="prefetchCourseData.status == statusDownloaded">{{ 'core.course.refreshcourse' | translate }}</h2>
-                </ion-label>
-            </ion-item>
-            <ion-item button (click)="openCourse()" [attr.aria-label]="course.fullname" *ngIf="canAccessCourse" detail="true">
+                <ion-label *ngIf="prefetchCourseData.status != statusDownloaded">{{ 'core.course.downloadcourse' | translate }}</ion-label>
+                <ion-label *ngIf="prefetchCourseData.status == statusDownloaded">{{ 'core.course.refreshcourse' | translate }}</ion-label>
+            </ion-button>
+
+            <ion-button class="ion-margin" (click)="openCourse()" *ngIf="!avoidOpenCourse && canAccessCourse" expand="block">
                 <ion-icon name="fas-briefcase" slot="start" aria-hidden="true"></ion-icon>
                 <ion-label>
-                    <h2>{{ 'core.course' | translate }}</h2>
+                    {{ 'core.course' | translate }}
                 </ion-label>
-            </ion-item>
-            <ion-item [href]="courseUrl" core-link [attr.aria-label]="course.fullname" button detail="false" [showBrowserWarning]="false">
+            </ion-button>
+
+            <ion-button class="ion-margin" [href]="courseUrl" core-link [showBrowserWarning]="false" expand="block">
                 <ion-icon name="fas-external-link-alt" slot="start" aria-hidden="true"></ion-icon>
                 <ion-label>
-                    <h2>{{ 'core.openinbrowser' | translate }}</h2>
+                    {{ 'core.openinbrowser' | translate }}
                 </ion-label>
-            </ion-item>
+            </ion-button>
+
         </div>
     </core-loading>
 </ion-content>
diff --git a/src/core/features/course/pages/preview/preview.page.ts b/src/core/features/course/pages/preview/preview.page.ts
index 923eb7109..8c1f9b9ce 100644
--- a/src/core/features/course/pages/preview/preview.page.ts
+++ b/src/core/features/course/pages/preview/preview.page.ts
@@ -20,8 +20,8 @@ import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTextUtils } from '@services/utils/text';
 import {
+    CoreCourseCustomField,
     CoreCourseEnrolmentMethod,
-    CoreCourseGetCoursesData,
     CoreCourses,
     CoreCourseSearchedData,
     CoreCoursesProvider,
@@ -34,6 +34,8 @@ import { Translate } from '@singletons';
 import { CoreConstants } from '@/core/constants';
 import { CoreCoursesSelfEnrolPasswordComponent } from '../../../courses/components/self-enrol-password/self-enrol-password';
 import { CoreNavigator } from '@services/navigator';
+import { CoreUtils } from '@services/utils/utils';
+import { CoreCourseWithImageAndColor } from '@features/courses/services/courses-helper';
 
 /**
  * Page that allows "previewing" a course and enrolling in it if enabled and not enrolled.
@@ -45,12 +47,13 @@ import { CoreNavigator } from '@services/navigator';
 })
 export class CoreCoursePreviewPage implements OnInit, OnDestroy {
 
-    course?: CoreCourseSearchedData;
+    course?: CoreCourseSummaryData;
     isEnrolled = false;
     canAccessCourse = true;
     selfEnrolInstances: CoreCourseEnrolmentMethod[] = [];
     paypalEnabled = false;
     dataLoaded = false;
+    avoidOpenCourse = false;
     prefetchCourseData: CorePrefetchStatusInfo = {
         icon: '',
         statusTranslatable: 'core.loading',
@@ -64,6 +67,7 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
     courseUrl = '';
     courseImageUrl?: string;
     isMobile: boolean;
+    progress?: number;
 
     protected isGuestEnabled = false;
     protected useGuestAccess = false;
@@ -74,6 +78,7 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
     protected paypalReturnUrl = '';
     protected pageDestroyed = false;
     protected courseStatusObserver?: CoreEventObserver;
+    protected courseId!: number;
 
     constructor(
         protected zone: NgZone,
@@ -84,7 +89,7 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
         if (this.downloadCourseEnabled) {
             // Listen for status change in course.
             this.courseStatusObserver = CoreEvents.on(CoreEvents.COURSE_STATUS_CHANGED, (data) => {
-                if (data.courseId == this.course!.id || data.courseId == CoreCourseProvider.ALL_COURSES_CLEARED) {
+                if (data.courseId == this.courseId || data.courseId == CoreCourseProvider.ALL_COURSES_CLEARED) {
                     this.updateCourseStatus(data.status);
                 }
             }, CoreSites.getCurrentSiteId());
@@ -92,27 +97,25 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
     }
 
     /**
-     * View loaded.
+     * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
-        this.course = CoreNavigator.getRouteParam('course');
-
-        if (!this.course) {
+        try {
+            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
             CoreNavigator.back();
 
             return;
         }
 
-        const currentSite = CoreSites.getCurrentSite();
-        const currentSiteUrl = currentSite && currentSite.getURL();
+        this.avoidOpenCourse = !!CoreNavigator.getRouteBooleanParam('avoidOpenCourse');
+        this.course = CoreNavigator.getRouteParam('course');
 
-        this.paypalEnabled = this.course!.enrollmentmethods?.indexOf('paypal') > -1;
-        this.enrolUrl = CoreTextUtils.concatenatePaths(currentSiteUrl!, 'enrol/index.php?id=' + this.course!.id);
-        this.courseUrl = CoreTextUtils.concatenatePaths(currentSiteUrl!, 'course/view.php?id=' + this.course!.id);
-        this.paypalReturnUrl = CoreTextUtils.concatenatePaths(currentSiteUrl!, 'enrol/paypal/return.php');
-        if (this.course.overviewfiles.length > 0) {
-            this.courseImageUrl = this.course.overviewfiles[0].fileurl;
-        }
+        const currentSiteUrl = CoreSites.getRequiredCurrentSite().getURL();
+        this.enrolUrl = CoreTextUtils.concatenatePaths(currentSiteUrl, 'enrol/index.php?id=' + this.courseId);
+        this.courseUrl = CoreTextUtils.concatenatePaths(currentSiteUrl, 'course/view.php?id=' + this.courseId);
+        this.paypalReturnUrl = CoreTextUtils.concatenatePaths(currentSiteUrl, 'enrol/paypal/return.php');
 
         try {
             await this.getCourse();
@@ -120,11 +123,11 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
             if (this.downloadCourseEnabled) {
 
                 // Determine course prefetch icon.
-                this.prefetchCourseData = await CoreCourseHelper.getCourseStatusIconAndTitle(this.course!.id);
+                this.prefetchCourseData = await CoreCourseHelper.getCourseStatusIconAndTitle(this.courseId);
 
                 if (this.prefetchCourseData.loading) {
                     // Course is being downloaded. Get the download promise.
-                    const promise = CoreCourseHelper.getCourseDownloadPromise(this.course!.id);
+                    const promise = CoreCourseHelper.getCourseDownloadPromise(this.courseId);
                     if (promise) {
                         // There is a download promise. If it fails, show an error.
                         promise.catch((error) => {
@@ -134,7 +137,7 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
                         });
                     } else {
                         // No download, this probably means that the app was closed while downloading. Set previous status.
-                        CoreCourse.setCoursePreviousStatus(this.course!.id);
+                        CoreCourse.setCoursePreviousStatus(this.courseId);
                     }
                 }
             }
@@ -177,13 +180,15 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
         this.selfEnrolInstances = [];
 
         try {
-            this.enrolmentMethods = await CoreCourses.getCourseEnrolmentMethods(this.course!.id);
+            this.enrolmentMethods = await CoreCourses.getCourseEnrolmentMethods(this.courseId);
 
             this.enrolmentMethods.forEach((method) => {
                 if (method.type === 'self') {
                     this.selfEnrolInstances.push(method);
                 } else if (method.type === 'guest') {
                     this.isGuestEnabled = true;
+                } else if (method.type === 'paypal') {
+                    this.paypalEnabled = true;
                 }
             });
         } catch (error) {
@@ -191,22 +196,17 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
         }
 
         try {
-            let course: CoreEnrolledCourseData | CoreCourseGetCoursesData;
-
             // Check if user is enrolled in the course.
             try {
-                course = await CoreCourses.getUserCourse(this.course!.id);
+                this.course = await CoreCourses.getUserCourse(this.courseId);
                 this.isEnrolled = true;
             } catch {
                 // The user is not enrolled in the course. Use getCourses to see if it's an admin/manager and can see the course.
                 this.isEnrolled = false;
-
-                course = await CoreCourses.getCourse(this.course!.id);
+                this.course = await CoreCourses.getCourse(this.courseId);
             }
 
             // Success retrieving the course, we can assume the user has permissions to view it.
-            this.course!.fullname = course.fullname || this.course!.fullname;
-            this.course!.summary = course.summary || this.course!.summary;
             this.canAccessCourse = true;
             this.useGuestAccess = false;
         } catch {
@@ -219,14 +219,37 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
             }
         }
 
-        if (!CoreSites.getCurrentSite()?.isVersionGreaterEqualThan('3.7')) {
-            try {
-                const course = await CoreCourses.getCourseByField('id', this.course!.id);
+        if (this.course && 'overviewfiles' in this.course && this.course.overviewfiles?.length) {
+            this.courseImageUrl = this.course.overviewfiles[0].fileurl;
+        }
 
-                this.course!.customfields = course.customfields;
-            } catch {
-                // Ignore errors.
+        try {
+            const courseByField = await CoreCourses.getCourseByField('id', this.courseId);
+            if (this.course) {
+                this.course.customfields = courseByField.customfields;
+                this.course.contacts = courseByField.contacts;
+                this.course.displayname = courseByField.displayname;
+                this.course.categoryname = courseByField.categoryname;
+                this.course.overviewfiles = courseByField.overviewfiles;
+            } else  {
+                this.course = courseByField;
             }
+
+            this.paypalEnabled = !this.isEnrolled && courseByField.enrollmentmethods?.indexOf('paypal') > -1;
+
+        } catch {
+            // Ignore errors.
+        }
+
+        if (!this.course ||
+            !('progress' in this.course) ||
+            typeof this.course.progress !== 'number' ||
+            this.course.progress < 0 ||
+            this.course.completionusertracked === false
+        ) {
+            this.progress = undefined;
+        } else {
+            this.progress = this.course.progress;
         }
 
         this.dataLoaded = true;
@@ -234,13 +257,15 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
 
     /**
      * Open the course.
+     *
+     * @param replaceCurrentPage If current place should be replaced in the navigation stack.
      */
-    openCourse(): void {
-        if (!this.canAccessCourse) {
+    openCourse(replaceCurrentPage = false): void {
+        if (!this.canAccessCourse || !this.course || this.avoidOpenCourse) {
             return;
         }
 
-        CoreCourseHelper.openCourse(this.course!, { isGuest: this.useGuestAccess });
+        CoreCourseHelper.openCourse(this.course, { params: { isGuest: this.useGuestAccess }, replace: replaceCurrentPage });
     }
 
     /**
@@ -279,7 +304,7 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
         };
 
         // Open the enrolment page in InAppBrowser.
-        const window = await CoreSites.getCurrentSite()!.openInAppWithAutoLogin(this.enrolUrl);
+        const window = await CoreSites.getRequiredCurrentSite().openInAppWithAutoLogin(this.enrolUrl);
 
         // Observe loaded pages in the InAppBrowser to check if the enrol process has ended.
         const inAppLoadSubscription = window.on('loadstart').subscribe((event) => {
@@ -319,7 +344,7 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
         const modal = await CoreDomUtils.showModalLoading('core.loading', true);
 
         try {
-            await CoreCourses.selfEnrol(this.course!.id, password, instanceId);
+            await CoreCourses.selfEnrol(this.courseId, password, instanceId);
 
             // Close modal and refresh data.
             this.isEnrolled = true;
@@ -331,13 +356,13 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
             await this.refreshData().finally(() => {
                 // My courses have been updated, trigger event.
                 CoreEvents.trigger(CoreCoursesProvider.EVENT_MY_COURSES_UPDATED, {
-                    courseId: this.course!.id,
+                    courseId: this.courseId,
                     course: this.course,
                     action: CoreCoursesProvider.ACTION_ENROL,
                 }, CoreSites.getCurrentSiteId());
             });
 
-            this.openCourse();
+            this.openCourse(true);
 
             modal?.dismiss();
         } catch (error) {
@@ -378,12 +403,10 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
         const promises: Promise<void>[] = [];
 
         promises.push(CoreCourses.invalidateUserCourses());
-        promises.push(CoreCourses.invalidateCourse(this.course!.id));
-        promises.push(CoreCourses.invalidateCourseEnrolmentMethods(this.course!.id));
-        promises.push(CoreCourseOptionsDelegate.clearAndInvalidateCoursesOptions(this.course!.id));
-        if (CoreSites.getCurrentSite() && !CoreSites.getCurrentSite()!.isVersionGreaterEqualThan('3.7')) {
-            promises.push(CoreCourses.invalidateCoursesByField('id', this.course!.id));
-        }
+        promises.push(CoreCourses.invalidateCourse(this.courseId));
+        promises.push(CoreCourses.invalidateCourseEnrolmentMethods(this.courseId));
+        promises.push(CoreCourseOptionsDelegate.clearAndInvalidateCoursesOptions(this.courseId));
+        promises.push(CoreCourses.invalidateCoursesByField('id', this.courseId));
         if (this.guestInstanceId) {
             promises.push(CoreCourses.invalidateCourseGuestEnrolmentInfo(this.guestInstanceId));
         }
@@ -419,14 +442,10 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
         }
 
         // Check if user is enrolled in the course.
-        try {
-            CoreCourses.invalidateUserCourses();
-        } catch {
-            // Ignore errors.
-        }
+        await CoreUtils.ignoreErrors(CoreCourses.invalidateUserCourses());
 
         try {
-            await CoreCourses.getUserCourse(this.course!.id);
+            await CoreCourses.getUserCourse(this.courseId);
         } catch {
             // Not enrolled, wait a bit and try again.
             if (this.pageDestroyed || (Date.now() - this.waitStart > 60000)) {
@@ -451,7 +470,7 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
      */
     async prefetchCourse(): Promise<void> {
         try {
-            await CoreCourseHelper.confirmAndPrefetchCourse(this.prefetchCourseData, this.course!, {
+            await CoreCourseHelper.confirmAndPrefetchCourse(this.prefetchCourseData, this.course as CoreEnrolledCourseData, {
                 isGuest: this.useGuestAccess,
             });
         } catch (error) {
@@ -462,14 +481,20 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
     }
 
     /**
-     * Page destroyed.
+     * @inheritdoc
      */
     ngOnDestroy(): void {
         this.pageDestroyed = true;
-
-        if (this.courseStatusObserver) {
-            this.courseStatusObserver.off();
-        }
+        this.courseStatusObserver?.off();
     }
 
 }
+
+type CoreCourseSummaryData = CoreCourseWithImageAndColor & (CoreEnrolledCourseData | CoreCourseSearchedData) & {
+    contacts?: { // Contact users.
+        id: number; // Contact user id.
+        fullname: string; // Contact user fullname.
+    }[];
+    customfields?: CoreCourseCustomField[]; // Custom fields and associated values.
+    categoryname?: string; // Category name.
+};
diff --git a/src/core/features/course/pages/preview/preview.scss b/src/core/features/course/pages/preview/preview.scss
index 161f3647a..8f159c333 100644
--- a/src/core/features/course/pages/preview/preview.scss
+++ b/src/core/features/course/pages/preview/preview.scss
@@ -1,41 +1,43 @@
 :host {
-    --scroll-factor: 0.5;
-    --translate-z: calc(-2 * var(--scroll-factor))px;
-    --scale: calc(1 + var(--scroll-factor) * 2);
+    ion-content:not(.animating) {
+        &::part(scroll) {
+            perspective: 1px;
+            perspective-origin: center top;
+            transform-style: preserve-3d;
+        }
 
-    perspective: 1px;
-    perspective-origin: center top;
-    transform-style: preserve-3d;
+        .core-course-thumb {
+            transform-origin: center top;
 
-    // @todo This parallax effect caused the image to be scaled during page transitions,
-    // and in some devices it seems like the problem persisted even after the transition.
-    // We should decide whether we want to keep this parallax or not, and if we do fix
-    // the problem or find an alternative implementation. For now, it's disabled.
+            --scroll-factor: 0.5;
+            --translate-z: calc(-2 * var(--scroll-factor))px;
+            --scale: calc(1 + var(--scroll-factor) * 2);
+
+            /**
+            * Calculated with scroll-factor: 0.5;
+            * translate-z: -2 * $scroll-factor px;
+            * scale: 1 + $scroll-factor * 2;
+            */
+            transform: translateZ(-1px) scale(2);
+        }
+    }
+
+    .core-course-thumb-parallax-content {
+        transform: translateZ(0);
+        -webkit-filter: drop-shadow(0px -3px 3px rgba(var(--drop-shadow)));
+        filter: drop-shadow(0px -3px 3px rgba(var(--drop-shadow)));
+    }
+
+    .core-course-thumb-parallax {
+        height: 40vw;
+        max-height: 35vh;
+        z-index: -1;
+        overflow: hidden;
+    }
 
-    // .core-course-thumb-parallax-content {
-    //     transform: translateZ(0);
-    //     -webkit-filter: drop-shadow(0px -3px 3px rgba(var(--drop-shadow)));
-    //     filter: drop-shadow(0px -3px 3px rgba(var(--drop-shadow)));
-    // }
-    // .core-course-thumb-parallax {
-    //     height: 40vw;
-    //     max-height: 35vh;
-    //     z-index: -1;
-    //     overflow: hidden;
-    // }
     .core-course-thumb {
         overflow: hidden;
         text-align: center;
-        cursor: pointer;
-        pointer-events: auto;
-        transform-origin: center top;
-
-        /**
-         * Calculated with scroll-factor: 0.5;
-         * translate-z: -2 * $scroll-factor px;
-         * scale: 1 + $scroll-factor * 2;
-         */
-        // transform: translateZ(-1px) scale(2);
     }
 
 
diff --git a/src/core/features/course/services/course-helper.ts b/src/core/features/course/services/course-helper.ts
index 737a405ae..56dee5790 100644
--- a/src/core/features/course/services/course-helper.ts
+++ b/src/core/features/course/services/course-helper.ts
@@ -68,7 +68,7 @@ import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreFilterHelper } from '@features/filter/services/filter-helper';
 import { CoreNetworkError } from '@classes/errors/network-error';
 import { CoreSiteHome } from '@features/sitehome/services/sitehome';
-import { CoreNavigator } from '@services/navigator';
+import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
 import { CoreSiteHomeHomeHandlerService } from '@features/sitehome/services/handlers/sitehome-home';
 import { CoreStatusWithWarningsWSResponse } from '@services/ws';
 
@@ -1178,7 +1178,7 @@ export class CoreCourseHelperProvider {
 
         modal?.dismiss();
 
-        return this.openCourse(course, params, siteId);
+        return this.openCourse(course, { params , siteId });
     }
 
     /**
@@ -2020,20 +2020,25 @@ export class CoreCourseHelperProvider {
      * they will see the result immediately.
      *
      * @param course Course to open
-     * @param params Params to pass to the course page.
-     * @param siteId Site ID. If not defined, current site.
+     * @param navOptions Navigation options that includes params to pass to the page.
      * @return Promise resolved when done.
      */
-    async openCourse(course: CoreCourseAnyCourseData | { id: number }, params?: Params, siteId?: string): Promise<void> {
+    async openCourse(
+        course: CoreCourseAnyCourseData | { id: number },
+        navOptions?: CoreNavigationOptions & { siteId?: string },
+    ): Promise<void> {
+        const siteId = navOptions?.siteId;
         if (!siteId || siteId == CoreSites.getCurrentSiteId()) {
             // Current site, we can open the course.
-            return CoreCourse.openCourse(course, params);
+            return CoreCourse.openCourse(course, navOptions);
         } else {
             // We need to load the site first.
-            params = params || {};
-            Object.assign(params, { course: course });
+            navOptions = navOptions || {};
 
-            await CoreNavigator.navigateToSitePath(`course/${course.id}`, { siteId, params });
+            navOptions.params = navOptions.params || {};
+            Object.assign(navOptions.params, { course: course });
+
+            await CoreNavigator.navigateToSitePath(`course/${course.id}`, navOptions);
         }
     }
 
diff --git a/src/core/features/course/services/course.ts b/src/core/features/course/services/course.ts
index 001452497..fa30f2991 100644
--- a/src/core/features/course/services/course.ts
+++ b/src/core/features/course/services/course.ts
@@ -43,7 +43,7 @@ import { CoreCourseLogCronHandler } from './handlers/log-cron';
 import { CoreSitePlugins } from '@features/siteplugins/services/siteplugins';
 import { CoreCourseAutoSyncData, CoreCourseSyncProvider } from './sync';
 import { CoreTagItem } from '@features/tag/services/tag';
-import { CoreNavigator } from '@services/navigator';
+import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
 import { CoreCourseModuleDelegate } from './module-delegate';
 
 const ROOT_CACHE_KEY = 'mmCourse:';
@@ -1177,10 +1177,13 @@ export class CoreCourseProvider {
      * This function must be in here instead of course helper to prevent circular dependencies.
      *
      * @param course Course to open
-     * @param params Other params to pass to the course page.
+     * @param navOptions Navigation options that includes params to pass to the page.
      * @return Promise resolved when done.
      */
-    async openCourse(course: CoreCourseAnyCourseData | { id: number }, params?: Params): Promise<void> {
+    async openCourse(
+        course: CoreCourseAnyCourseData | { id: number },
+        navOptions?: CoreNavigationOptions,
+    ): Promise<void> {
         const loading = await CoreDomUtils.showModalLoading();
 
         // Wait for site plugins to be fetched.
@@ -1197,7 +1200,7 @@ export class CoreCourseProvider {
         if (!format || !CoreSitePlugins.sitePluginPromiseExists(`format_${format}`)) {
             // No custom format plugin. We don't need to wait for anything.
             loading.dismiss();
-            await CoreCourseFormatDelegate.openCourse(<CoreCourseAnyCourseData> course, params);
+            await CoreCourseFormatDelegate.openCourse(<CoreCourseAnyCourseData> course, navOptions);
 
             return;
         }
@@ -1208,7 +1211,7 @@ export class CoreCourseProvider {
 
             // The format loaded successfully, but the handlers wont be registered until all site plugins have loaded.
             if (CoreSitePlugins.sitePluginsFinishedLoading) {
-                return CoreCourseFormatDelegate.openCourse(<CoreCourseAnyCourseData> course, params);
+                return CoreCourseFormatDelegate.openCourse(<CoreCourseAnyCourseData> course, navOptions);
             }
 
             // Wait for plugins to be loaded.
@@ -1217,7 +1220,7 @@ export class CoreCourseProvider {
             const observer = CoreEvents.on(CoreEvents.SITE_PLUGINS_LOADED, () => {
                 observer?.off();
 
-                CoreCourseFormatDelegate.openCourse(<CoreCourseAnyCourseData> course, params)
+                CoreCourseFormatDelegate.openCourse(<CoreCourseAnyCourseData> course, navOptions)
                     .then(deferred.resolve).catch(deferred.reject);
             });
 
diff --git a/src/core/features/course/services/format-delegate.ts b/src/core/features/course/services/format-delegate.ts
index 967903d58..4bfb14bc7 100644
--- a/src/core/features/course/services/format-delegate.ts
+++ b/src/core/features/course/services/format-delegate.ts
@@ -13,10 +13,10 @@
 // limitations under the License.
 
 import { Injectable, Type } from '@angular/core';
-import { Params } from '@angular/router';
 
 import { CoreDelegate, CoreDelegateHandler } from '@classes/delegate';
 import { CoreCourseAnyCourseData } from '@features/courses/services/courses';
+import { CoreNavigationOptions } from '@services/navigator';
 import { makeSingleton } from '@singletons';
 import { CoreCourseWSSection } from './course';
 import { CoreCourseSection } from './course-helper';
@@ -100,10 +100,10 @@ export interface CoreCourseFormatHandler extends CoreDelegateHandler {
      * Your page should include the course handlers using CoreCoursesDelegate.
      *
      * @param course The course to open. It should contain a "format" attribute.
-     * @param params Params to pass to the course page.
+     * @param navOptions Navigation options that includes params to pass to the page.
      * @return Promise resolved when done.
      */
-    openCourse?(course: CoreCourseAnyCourseData, params?: Params): Promise<void>;
+    openCourse?(course: CoreCourseAnyCourseData, navOptions?: CoreNavigationOptions): Promise<void>;
 
     /**
      * Return the Component to use to display the course format instead of using the default one.
@@ -323,11 +323,11 @@ export class CoreCourseFormatDelegateService extends CoreDelegate<CoreCourseForm
      * Open a course. Should not be called directly. Call CoreCourseHelper.openCourse instead.
      *
      * @param course The course to open. It should contain a "format" attribute.
-     * @param params Params to pass to the course page.
+     * @param navOptions Navigation options that includes params to pass to the page.
      * @return Promise resolved when done.
      */
-    async openCourse(course: CoreCourseAnyCourseData, params?: Params): Promise<void> {
-        await this.executeFunctionOnEnabled(course.format || '', 'openCourse', [course, params]);
+    async openCourse(course: CoreCourseAnyCourseData, navOptions?: CoreNavigationOptions): Promise<void> {
+        await this.executeFunctionOnEnabled(course.format || '', 'openCourse', [course, navOptions]);
     }
 
     /**
diff --git a/src/core/features/course/services/handlers/default-format.ts b/src/core/features/course/services/handlers/default-format.ts
index 4ef53ca4b..d7254f194 100644
--- a/src/core/features/course/services/handlers/default-format.ts
+++ b/src/core/features/course/services/handlers/default-format.ts
@@ -13,12 +13,9 @@
 // limitations under the License.
 
 import { Injectable } from '@angular/core';
-import { Params } from '@angular/router';
-
 import { CoreCourseAnyCourseData, CoreCourses } from '@features/courses/services/courses';
-import { CoreNavigator } from '@services/navigator';
+import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
 import { CoreUtils } from '@services/utils/utils';
-import { CoreCourseWSSection } from '../course';
 import { CoreCourseSection } from '../course-helper';
 import { CoreCourseFormatHandler } from '../format-delegate';
 
@@ -32,19 +29,14 @@ export class CoreCourseFormatDefaultHandler implements CoreCourseFormatHandler {
     format = 'default';
 
     /**
-     * Whether or not the handler is enabled on a site level.
-     *
-     * @return Promise resolved with true if enabled.
+     * @inheritdoc
      */
     async isEnabled(): Promise<boolean> {
         return true;
     }
 
     /**
-     * Get the title to use in course page.
-     *
-     * @param course The course.
-     * @return Title.
+     * @inheritdoc
      */
     getCourseTitle(course: CoreCourseAnyCourseData): string {
         if (course.displayname) {
@@ -57,57 +49,35 @@ export class CoreCourseFormatDefaultHandler implements CoreCourseFormatHandler {
     }
 
     /**
-     * Whether it allows seeing all sections at the same time. Defaults to true.
-     *
-     * @param course The course to check.
-     * @return Whether it can view all sections.
+     * @inheritdoc
      */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    canViewAllSections(course: CoreCourseAnyCourseData): boolean {
+    canViewAllSections(): boolean {
         return true;
     }
 
     /**
-     * Whether the option blocks should be displayed. Defaults to true.
-     *
-     * @param course The course to check.
-     * @return Whether it can display blocks.
+     * @inheritdoc
      */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    displayBlocks(course: CoreCourseAnyCourseData): boolean {
+    displayBlocks(): boolean {
         return true;
     }
 
     /**
-     * Whether the default section selector should be displayed. Defaults to true.
-     *
-     * @param course The course to check.
-     * @return Whether the default section selector should be displayed.
+     * @inheritdoc
      */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    displaySectionSelector(course: CoreCourseAnyCourseData): boolean {
+    displaySectionSelector(): boolean {
         return true;
     }
 
     /**
-     * Whether the course refresher should be displayed. If it returns false, a refresher must be included in the course format,
-     * and the doRefresh method of CoreCourseSectionPage must be called on refresh. Defaults to true.
-     *
-     * @param course The course to check.
-     * @param sections List of course sections.
-     * @return Whether the refresher should be displayed.
+     * @inheritdoc
      */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    displayRefresher(course: CoreCourseAnyCourseData, sections: CoreCourseWSSection[]): boolean {
+    displayRefresher(): boolean {
         return true;
     }
 
     /**
-     * Given a list of sections, get the "current" section that should be displayed first.
-     *
-     * @param course The course to get the title.
-     * @param sections List of sections.
-     * @return Current section (or promise resolved with current section).
+     * @inheritdoc
      */
     async getCurrentSection(course: CoreCourseAnyCourseData, sections: CoreCourseSection[]): Promise<CoreCourseSection> {
         let marker: number | undefined;
@@ -137,48 +107,33 @@ export class CoreCourseFormatDefaultHandler implements CoreCourseFormatHandler {
     }
 
     /**
-     * Invalidate the data required to load the course format.
-     *
-     * @param course The course to get the title.
-     * @param sections List of sections.
-     * @return Promise resolved when the data is invalidated.
+     * @inheritdoc
      */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async invalidateData(course: CoreCourseAnyCourseData, sections: CoreCourseWSSection[]): Promise<void> {
+    async invalidateData(course: CoreCourseAnyCourseData): Promise<void> {
         await CoreCourses.invalidateCoursesByField('id', course.id);
     }
 
     /**
-     * Open the page to display a course. If not defined, the page CoreCourseSectionPage will be opened.
-     * Implement it only if you want to create your own page to display the course. In general it's better to use the method
-     * getCourseFormatComponent because it will display the course handlers at the top.
-     * Your page should include the course handlers using CoreCoursesDelegate.
-     *
-     * @param course The course to open. It should contain a "format" attribute.
-     * @param params Params to pass to the course page.
-     * @return Promise resolved when done.
+     * @inheritdoc
      */
-    async openCourse(course: CoreCourseAnyCourseData, params?: Params): Promise<void> {
-        params = params || {};
-        Object.assign(params, { course: course });
+    async openCourse(course: CoreCourseAnyCourseData, navOptions?: CoreNavigationOptions): Promise<void> {
+        navOptions = navOptions || {};
+
+        navOptions.params = navOptions.params || {};
+        Object.assign(navOptions.params, { course: course });
 
         // Don't return the .push promise, we don't want to display a loading modal during the page transition.
         const currentTab = CoreNavigator.getCurrentMainMenuTab();
         const routeDepth = CoreNavigator.getRouteDepth(`/main/${currentTab}/course/${course.id}`);
         const deepPath = '/deep'.repeat(routeDepth);
 
-        CoreNavigator.navigateToSitePath(`course${deepPath}/${course.id}`, { params });
+        CoreNavigator.navigateToSitePath(`course${deepPath}/${course.id}`, navOptions);
     }
 
     /**
-     * Whether the view should be refreshed when completion changes. If your course format doesn't display
-     * activity completion then you should return false.
-     *
-     * @param course The course.
-     * @return Whether course view should be refreshed when an activity completion changes.
+     * @inheritdoc
      */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async shouldRefreshWhenCompletionChanges(course: CoreCourseAnyCourseData): Promise<boolean> {
+    async shouldRefreshWhenCompletionChanges(): Promise<boolean> {
         return true;
     }
 
diff --git a/src/core/features/courses/components/course-list-item/course-list-item.ts b/src/core/features/courses/components/course-list-item/course-list-item.ts
index bf9d4419f..5a5f5fa24 100644
--- a/src/core/features/courses/components/course-list-item/course-list-item.ts
+++ b/src/core/features/courses/components/course-list-item/course-list-item.ts
@@ -171,7 +171,7 @@ export class CoreCoursesCourseListItemComponent implements OnInit, OnDestroy, On
             CoreCourseHelper.openCourse(this.course);
         } else {
             CoreNavigator.navigateToSitePath(
-                '/course/' + this.course.id + '/preview',
+                `/course/${this.course.id}/preview`,
                 { params: { course: this.course } },
             );
         }
diff --git a/src/core/features/courses/services/handlers/course-link.ts b/src/core/features/courses/services/handlers/course-link.ts
index 5e1800ddb..5c7347844 100644
--- a/src/core/features/courses/services/handlers/course-link.ts
+++ b/src/core/features/courses/services/handlers/course-link.ts
@@ -156,7 +156,7 @@ export class CoreCoursesCourseLinkHandlerService extends CoreContentLinksHandler
         modal.dismiss();
 
         // Now open the course.
-        CoreCourseHelper.openCourse(course, pageParams);
+        CoreCourseHelper.openCourse(course, { params: pageParams });
     }
 
     /**
diff --git a/src/core/lang.json b/src/core/lang.json
index 6690dc4bb..624038e0b 100644
--- a/src/core/lang.json
+++ b/src/core/lang.json
@@ -301,6 +301,7 @@
     "strftimetime24": "%H:%M",
     "submit": "Submit",
     "success": "Success",
+    "summary": "Summary",
     "tablet": "Tablet",
     "teachers": "Teachers",
     "thereisdatatosync": "There are offline {{$a}} to be synchronised.",
diff --git a/upgrade.txt b/upgrade.txt
index 79ccced1d..e55234e0d 100644
--- a/upgrade.txt
+++ b/upgrade.txt
@@ -15,6 +15,7 @@ information provided here is intended especially for developers.
     The function CoreUserDelegate.getProfileHandlersFor must now receive a context + contextId instead of a courseId.
     The user handler function isEnabledForCourse is now called isEnabledForContext and receives a context + contextId instead of a courseId.
     Some user handler's functions have also changed to accept context + contextId instead of a courseId: isEnabledForUser, getDisplayData, action.
+- CoreCourseHelperProvider.openCourse parameters changed, now it admits CoreNavigationOptions + siteId on the same object that includes Params passed to page.
 
 === 3.9.5 ===
 

From 0af808571cf745e778a9636fc5906e53283349e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 25 Jan 2022 17:33:20 +0100
Subject: [PATCH 0417/1008] MOBILE-3915 course: Improve Course index page

---
 scripts/langindex.json                        |   7 +-
 .../components/course-index/course-index.html |  79 ++++++++-----
 .../components/course-index/course-index.scss |  24 +++-
 .../components/course-index/course-index.ts   | 111 +++++++++++++-----
 .../components/format/core-course-format.html |   3 +-
 .../course/components/format/format.scss      |   6 +
 .../course/components/format/format.ts        |  23 +++-
 .../handlers/singleactivity-format.ts         |   2 +-
 .../weeks/services/handlers/weeks-format.ts   |  21 ++--
 src/core/features/course/lang.json            |  13 +-
 .../course/services/format-delegate.ts        |  48 +++++++-
 .../services/handlers/default-format.ts       |  10 +-
 .../classes/handlers/course-format-handler.ts |   5 +-
 .../siteplugins/services/siteplugins.ts       |   4 +
 src/core/services/utils/dom.ts                |   2 +-
 upgrade.txt                                   |   1 +
 16 files changed, 264 insertions(+), 95 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index c2d7b6f89..70e2ef078 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1536,19 +1536,23 @@
   "core.course.confirmpartialdownloadsize": "local_moodlemobileapp",
   "core.course.couldnotloadsectioncontent": "local_moodlemobileapp",
   "core.course.couldnotloadsections": "local_moodlemobileapp",
+  "core.course.courseindex": "courseformat",
   "core.course.coursesummary": "moodle",
+  "core.course.done": "completion",
   "core.course.downloadcourse": "tool_mobile",
   "core.course.downloadcoursesprogressdescription": "local_moodlemobileapp",
   "core.course.downloadsectionprogressdescription": "local_moodlemobileapp",
   "core.course.errordownloadingcourse": "local_moodlemobileapp",
   "core.course.errordownloadingsection": "local_moodlemobileapp",
   "core.course.errorgetmodule": "local_moodlemobileapp",
+  "core.course.failed": "completion",
   "core.course.gotonextactivity": "local_moodlemobileapp",
   "core.course.gotonextactivitynotfound": "local_moodlemobileapp",
   "core.course.gotopreviousactivity": "local_moodlemobileapp",
   "core.course.gotopreviousactivitynotfound": "local_moodlemobileapp",
   "core.course.hiddenfromstudents": "moodle",
   "core.course.hiddenoncoursepage": "moodle",
+  "core.course.highlighted": "moodle",
   "core.course.insufficientavailablequota": "local_moodlemobileapp",
   "core.course.insufficientavailablespace": "local_moodlemobileapp",
   "core.course.manualcompletionnotsynced": "local_moodlemobileapp",
@@ -1557,7 +1561,8 @@
   "core.course.overriddennotice": "grades",
   "core.course.refreshcourse": "local_moodlemobileapp",
   "core.course.section": "moodle",
-  "core.course.sections": "moodle",
+  "core.course.thisweek": "format_weeks/currentsection",
+  "core.course.todo": "completion",
   "core.course.useactivityonbrowser": "local_moodlemobileapp",
   "core.course.warningmanualcompletionmodified": "local_moodlemobileapp",
   "core.course.warningofflinemanualcompletiondeleted": "local_moodlemobileapp",
diff --git a/src/core/features/course/components/course-index/course-index.html b/src/core/features/course/components/course-index/course-index.html
index 242cf97c4..7a97a6b41 100644
--- a/src/core/features/course/components/course-index/course-index.html
+++ b/src/core/features/course/components/course-index/course-index.html
@@ -13,49 +13,66 @@
 <ion-content>
     <ion-list id="core-course-section-selector" role="listbox" aria-labelledby="core-course-section-selector-label">
         <ng-container *ngFor="let section of sections">
-            <ion-item-divider *ngIf="!section.hiddenbynumsections && section.id != stealthModulesSectionId" class="ion-text-wrap"
-                (click)="selectSection(section)" [attr.aria-current]="selected?.id == section.id ? 'page' : 'false'"
-                [class.item-dimmed]="section.visible === 0 || section.uservisible === false" detail="false"
-                [attr.aria-hidden]="section.uservisible === false" button sticky="true">
-
-                <ion-icon name="fas-folder" slot="start" aria-hidden="true"></ion-icon>
+            <ion-item *ngIf="allSectionId == section.id" class="ion-text-wrap divider" (click)="selectSection($event, section)" button
+                [class.item-current]="selectedId === section.id" detail="false">
                 <ion-label>
                     <p class="item-heading">
                         <core-format-text [text]="section.name" contextLevel="course" [contextInstanceId]="course?.id">
                         </core-format-text>
                     </p>
-                    <core-progress-bar *ngIf="section.progress >= 0" [progress]="section.progress"
-                        a11yText="core.course.aria:sectionprogress">
-                    </core-progress-bar>
-
-                    <ion-badge color="info" *ngIf="section.visible === 0 && section.uservisible !== false" class="ion-text-wrap">
-                        {{ 'core.course.hiddenfromstudents' | translate }}
-                    </ion-badge>
-                    <ion-badge color="info" *ngIf="section.visible === 0 && section.uservisible === false" class="ion-text-wrap">
-                        {{ 'core.notavailable' | translate }}
-                    </ion-badge>
-                    <ion-badge color="info" *ngIf="section.availabilityinfo" class="ion-text-wrap">
-                        <core-format-text [text]=" section.availabilityinfo" contextLevel="course" [contextInstanceId]="course?.id">
-                        </core-format-text>
-                    </ion-badge>
                 </ion-label>
-            </ion-item-divider>
-            <ng-container *ngFor="let module of section.modules">
-                <ion-item *ngIf="module.visibleoncoursepage !== 0" class="ion-text-wrap">
-                    <!-- TODO Add Aria, styles when disabled, etc. -->
-                    <ion-icon name="" *ngIf="module.completionStatus === undefined" slot="start"></ion-icon>
-                    <ion-icon name="far-circle" *ngIf="module.completionStatus === 0" slot="start"></ion-icon>
-                    <ion-icon name="fas-circle" *ngIf="module.completionStatus === 1" color="success" slot="start"></ion-icon>
-                    <ion-icon name="fas-circle" *ngIf="module.completionStatus === 2" color="success" slot="start"></ion-icon>
-                    <ion-icon name="fas-circle" *ngIf="module.completionStatus === 3" color="danger" slot="start"></ion-icon>
+            </ion-item>
+            <ng-container *ngIf="allSectionId != section.id && !section.hiddenbynumsections &&
+                    section.id != stealthModulesSectionId && section.uservisible !== false">
+                <ion-item class="ion-text-wrap divider section" (click)="selectSection($event, section)"
+                    [button]="section.visible !== 0 && section.uservisible !== false" [class.item-current]="selectedId === section.id"
+                    [class.item-dimmed]="section.visible === 0" detail="false" sticky="true">
+                    <ion-icon [name]="section.expanded ? 'fas-chevron-down' : 'fas-chevron-right'" flip-rtl slot="start"
+                        class="expandable-status-icon" (click)="toggleExpand($event, section)"
+                        [attr.aria-label]="(section.expanded ? 'core.collapse' : 'core.expand') | translate"
+                        [attr.aria-expanded]="section.expanded" [attr.aria-controls]="'core-course-index-section-' + section.id">
+                    </ion-icon>
                     <ion-label>
                         <p class="item-heading">
-                            <core-format-text [text]="module.name" contextLevel="module" [contextInstanceId]="module.id"
-                                [courseId]="module.courseid">
+                            <core-format-text [text]="section.name" contextLevel="course" [contextInstanceId]="course?.id">
                             </core-format-text>
                         </p>
                     </ion-label>
+                    <ion-badge *ngIf="section.highlighted && highlighted">{{highlighted}}</ion-badge>
+                    <ion-icon name="fas-lock" *ngIf="section.availabilityinfo" slot="end" class="restricted"
+                        [attr.aria-label]="'core.restricted' | translate"></ion-icon>
                 </ion-item>
+                <div [hidden]="!section.expanded" [id]="'core-course-index-section-' + section.id">
+                    <ng-container *ngIf="section.expanded">
+                        <ng-container *ngFor="let module of section.modules">
+                            <ion-item [class.item-dimmed]="module.visible === 0"
+                                *ngIf="module.visibleoncoursepage !== 0 && !module.noviewlink"
+                                (click)="selectModule($event, section, module)" button>
+                                <ion-icon class="completioninfo completion_none" name="" *ngIf="module.completionStatus === undefined"
+                                    slot="start" aria-hidden="true"></ion-icon>
+                                <ion-icon class="completioninfo completion_incomplete" name="far-circle"
+                                    *ngIf="module.completionStatus === 0" slot="start" [attr.aria-label]="'core.course.todo' | translate">
+                                </ion-icon>
+                                <ion-icon class="completioninfo completion_complete" name="fas-circle"
+                                    *ngIf="module.completionStatus === 1 || module.completionStatus === 2" color="success" slot="start"
+                                    [attr.aria-label]="'core.course.done' | translate">
+                                </ion-icon>
+                                <ion-icon class="completioninfo completion_fail" name="fas-circle" *ngIf="module.completionStatus === 3"
+                                    color="danger" slot="start" [attr.aria-label]="'core.course.failed' | translate">
+                                </ion-icon>
+                                <ion-label>
+                                    <p class="item-heading">
+                                        <core-format-text [text]="module.name" contextLevel="module" [contextInstanceId]="module.id"
+                                            [courseId]="module.courseid">
+                                        </core-format-text>
+                                    </p>
+                                </ion-label>
+                                <ion-icon name="fas-lock" *ngIf="module.uservisible === false" slot="end" class="restricted"
+                                    [attr.aria-label]="'core.restricted' | translate"></ion-icon>
+                            </ion-item>
+                        </ng-container>
+                    </ng-container>
+                </div>
             </ng-container>
         </ng-container>
     </ion-list>
diff --git a/src/core/features/course/components/course-index/course-index.scss b/src/core/features/course/components/course-index/course-index.scss
index 828f42727..8ef120471 100644
--- a/src/core/features/course/components/course-index/course-index.scss
+++ b/src/core/features/course/components/course-index/course-index.scss
@@ -2,6 +2,7 @@
 core-progress-bar {
     --bar-margin: 8px 0 4px 0;
     --line-height: 20px;
+    --background: var(--contrast-background);
 }
 
 @if ($core-hide-progress-on-section-selector) {
@@ -10,6 +11,25 @@ core-progress-bar {
     }
 }
 
-ion-badge {
-    text-align: start;
+ion-icon.completioninfo {
+    font-size: 10px;
+    width: 18px;
+}
+
+ion-item.section::part(native) {
+    --padding-start: 0;
+}
+
+ion-icon.expandable-status-icon {
+    margin: 0;
+    @include padding(12px, 32px, 12px, 16px);
+}
+
+ion-item.item-current ion-icon.expandable-status-icon {
+    @include padding(null, null, null, 11px);
+
+}
+
+ion-icon.restricted {
+    font-size: 14px;
 }
diff --git a/src/core/features/course/components/course-index/course-index.ts b/src/core/features/course/components/course-index/course-index.ts
index 3b51cad30..87c653fb2 100644
--- a/src/core/features/course/components/course-index/course-index.ts
+++ b/src/core/features/course/components/course-index/course-index.ts
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, ElementRef, Input, OnInit, ViewChild } from '@angular/core';
 
-import { CoreCourseModuleData, CoreCourseSection, CoreCourseSectionWithStatus } from '@features/course/services/course-helper';
+import { CoreCourseModuleData, CoreCourseSectionWithStatus } from '@features/course/services/course-helper';
 import {
     CoreCourseModuleCompletionStatus,
     CoreCourseModuleCompletionTracking,
@@ -23,6 +23,9 @@ import {
 import { CoreCourseAnyCourseData } from '@features/courses/services/courses';
 import { CoreUtils } from '@services/utils/utils';
 import { ModalController } from '@singletons';
+import { CoreCourseFormatDelegate } from '@features/course/services/format-delegate';
+import { IonContent } from '@ionic/angular';
+import { CoreDomUtils } from '@services/utils/dom';
 
 /**
  * Component to display course index modal.
@@ -34,19 +37,30 @@ import { ModalController } from '@singletons';
 })
 export class CoreCourseCourseIndexComponent implements OnInit {
 
-    @Input() sections?: SectionWithProgress[];
-    @Input() selected?: CoreCourseSection;
+    @ViewChild(IonContent) content?: IonContent;
+
+    @Input() sections?: CourseIndexSection[];
+    @Input() selectedId?: number;
     @Input() course?: CoreCourseAnyCourseData;
 
     stealthModulesSectionId = CoreCourseProvider.STEALTH_MODULES_SECTION_ID;
+    allSectionId = CoreCourseProvider.ALL_SECTIONS_ID;
+    highlighted?: string;
+
+    constructor(
+        protected elementRef: ElementRef,
+    ) {
+    }
 
     /**
      * @inheritdoc
      */
-    ngOnInit(): void {
+    async ngOnInit(): Promise<void> {
 
         if (!this.course || !this.sections || !this.course.enablecompletion || !('courseformatoptions' in this.course) ||
                 !this.course.courseformatoptions) {
+            this.closeModal();
+
             return;
         }
 
@@ -55,32 +69,48 @@ export class CoreCourseCourseIndexComponent implements OnInit {
         if (!formatOptions || formatOptions.completionusertracked === false) {
             return;
         }
+        const currentSection = await CoreCourseFormatDelegate.getCurrentSection(this.course, this.sections);
+        currentSection.highlighted = true;
+        if (this.selectedId === undefined) {
+            currentSection.expanded = true;
+            this.selectedId = currentSection.id;
+        } else {
+            const selectedSection = this.sections.find((section) => section.id == this.selectedId);
+            if (selectedSection) {
+                selectedSection.expanded = true;
+            }
+        }
 
         this.sections.forEach((section) => {
-            let complete = 0;
-            let total = 0;
             section.modules.forEach((module) => {
-                console.error(module);
-                if (!module.uservisible || module.completiondata === undefined ||
-                        module.completiondata.tracking == CoreCourseModuleCompletionTracking.COMPLETION_TRACKING_NONE) {
-                    module.completionStatus = undefined;
-
-                    return;
-                }
-
-                module.completionStatus = module.completiondata.state;
-
-                total++;
-                if (module.completiondata.state == CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE ||
-                        module.completiondata.state == CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE_PASS) {
-                    complete++;
-                }
+                module.completionStatus = module.completiondata === undefined ||
+                    module.completiondata.tracking == CoreCourseModuleCompletionTracking.COMPLETION_TRACKING_NONE
+                    ? undefined
+                    : module.completiondata.state;
             });
-
-            if (total > 0) {
-                section.progress = complete / total * 100;
-            }
         });
+
+        this.highlighted = CoreCourseFormatDelegate.getSectionHightlightedName(this.course);
+
+        setTimeout(() => {
+            CoreDomUtils.scrollToElementBySelector(
+                this.elementRef.nativeElement,
+                this.content,
+                '.item.item-current',
+            );
+        }, 200);
+    }
+
+    /**
+     * Toggle expand status.
+     *
+     * @param event Event object.
+     * @param section Section to expand / collapse.
+     */
+    toggleExpand(event: Event, section: CourseIndexSection): void {
+        section.expanded = !section.expanded;
+        event.stopPropagation();
+        event.preventDefault();
     }
 
     /**
@@ -93,19 +123,40 @@ export class CoreCourseCourseIndexComponent implements OnInit {
     /**
      * Select a section.
      *
+     * @param event Event.
      * @param section Selected section object.
      */
-    selectSection(section: SectionWithProgress): void {
+    selectSection(event: Event, section: CoreCourseSectionWithStatus): void {
         if (section.uservisible !== false) {
-            ModalController.dismiss(section);
+            ModalController.dismiss({ event, section });
+        }
+    }
+
+    /**
+     * Select a section and open a module
+     *
+     * @param event Event.
+     * @param section Selected section object.
+     * @param module Selected module object.
+     */
+    selectModule(event: Event,section: CoreCourseSectionWithStatus, module: CoreCourseModuleData): void {
+        if (module.uservisible !== false) {
+            ModalController.dismiss({ event, section, module });
         }
     }
 
 }
 
-type SectionWithProgress = Omit<CoreCourseSectionWithStatus, 'modules'> & {
-    progress?: number;
+type CourseIndexSection = Omit<CoreCourseSectionWithStatus, 'modules'> & {
+    highlighted?: boolean;
+    expanded?: boolean;
     modules: (CoreCourseModuleData & {
         completionStatus?: CoreCourseModuleCompletionStatus;
     })[];
 };
+
+export type CoreCourseIndexSectionWithModule = {
+    event: Event;
+    section: CourseIndexSection;
+    module?: CoreCourseModuleData;
+};
diff --git a/src/core/features/course/components/format/core-course-format.html b/src/core/features/course/components/format/core-course-format.html
index 3249dad88..1b34598a3 100644
--- a/src/core/features/course/components/format/core-course-format.html
+++ b/src/core/features/course/components/format/core-course-format.html
@@ -66,7 +66,8 @@
 <!-- Template to render a section. -->
 <ng-template #sectionTemplate let-section="section">
     <section *ngIf="!section.hiddenbynumsections && section.id != allSectionsId && section.id != stealthModulesSectionId">
-        <ion-item-divider class="ion-text-wrap" color="light" [class.item-dimmed]="section.visible === 0 || section.uservisible === false">
+        <ion-item-divider class="course-section ion-text-wrap" color="light"
+            [class.item-dimmed]="section.visible === 0 || section.uservisible === false">
             <ion-icon name="fas-folder" aria-label="hidden" slot="start"></ion-icon>
             <ion-label>
                 <h2 *ngIf="section.name">
diff --git a/src/core/features/course/components/format/format.scss b/src/core/features/course/components/format/format.scss
index f6444fb72..7c33a30cc 100644
--- a/src/core/features/course/components/format/format.scss
+++ b/src/core/features/course/components/format/format.scss
@@ -9,3 +9,9 @@
         text-transform: none;
     }
 }
+
+.course-section {
+    ion-badge {
+        text-align: start;
+    }
+}
diff --git a/src/core/features/course/components/format/format.ts b/src/core/features/course/components/format/format.ts
index 1cdc25197..760637898 100644
--- a/src/core/features/course/components/format/format.ts
+++ b/src/core/features/course/components/format/format.ts
@@ -44,9 +44,11 @@ import { CoreCourseFormatDelegate } from '@features/course/services/format-deleg
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { IonContent, IonRefresher } from '@ionic/angular';
 import { CoreUtils } from '@services/utils/utils';
-import { CoreCourseCourseIndexComponent } from '../course-index/course-index';
+import { CoreCourseCourseIndexComponent, CoreCourseIndexSectionWithModule } from '../course-index/course-index';
 import { CoreBlockHelper } from '@features/block/services/block-helper';
 import { CoreNavigator } from '@services/navigator';
+import { database } from 'faker';
+import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate';
 
 /**
  * Component to display course contents using a certain format. If the format isn't found, use default one.
@@ -182,7 +184,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
             // Course has changed, try to get the components.
             this.getComponents();
 
-            this.displayCourseIndex = CoreCourseFormatDelegate.displaySectionSelector(this.course);
+            this.displayCourseIndex = CoreCourseFormatDelegate.displayCourseIndex(this.course);
             this.displayBlocks = CoreCourseFormatDelegate.displayBlocks(this.course);
 
             this.hasBlocks = await CoreBlockHelper.hasCourseBlocks(this.course.id);
@@ -319,17 +321,28 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
      * Display the course index modal.
      */
     async openCourseIndex(): Promise<void> {
-        const data = await CoreDomUtils.openModal<CoreCourseSection>({
+        const data = await CoreDomUtils.openModal<CoreCourseIndexSectionWithModule>({
             component: CoreCourseCourseIndexComponent,
             componentProps: {
                 course: this.course,
                 sections: this.sections,
-                selected: this.selectedSection,
+                selectedId: this.selectedSection?.id,
             },
         });
 
         if (data) {
-            this.sectionChanged(data);
+            this.sectionChanged(data.section);
+            if (data.module) {
+                if (!data.module.handlerData) {
+                    data.module.handlerData =
+                        await CoreCourseModuleDelegate.getModuleDataFor(data.module.modname, data.module, this.course.id);
+                }
+
+                if (data.module.uservisible !== false && data.module.handlerData?.action) {
+                    data.module.handlerData.action(data.event, data.module, data.module.course);
+                }
+                this.moduleId = data.module.id;
+            }
         }
     }
 
diff --git a/src/core/features/course/format/singleactivity/services/handlers/singleactivity-format.ts b/src/core/features/course/format/singleactivity/services/handlers/singleactivity-format.ts
index 945b99e4c..8e4b1f6d3 100644
--- a/src/core/features/course/format/singleactivity/services/handlers/singleactivity-format.ts
+++ b/src/core/features/course/format/singleactivity/services/handlers/singleactivity-format.ts
@@ -71,7 +71,7 @@ export class CoreCourseFormatSingleActivityHandlerService implements CoreCourseF
     /**
      * @inheritdoc
      */
-    displaySectionSelector(): boolean {
+    displayCourseIndex(): boolean {
         return false;
     }
 
diff --git a/src/core/features/course/format/weeks/services/handlers/weeks-format.ts b/src/core/features/course/format/weeks/services/handlers/weeks-format.ts
index 10de07200..3af676006 100644
--- a/src/core/features/course/format/weeks/services/handlers/weeks-format.ts
+++ b/src/core/features/course/format/weeks/services/handlers/weeks-format.ts
@@ -16,7 +16,7 @@ import { Injectable } from '@angular/core';
 
 import { CoreTimeUtils } from '@services/utils/time';
 import { CoreCourseFormatHandler } from '@features/course/services/format-delegate';
-import { makeSingleton } from '@singletons';
+import { makeSingleton, Translate } from '@singletons';
 import { CoreCourseAnyCourseData } from '@features/courses/services/courses';
 import { CoreCourseWSSection } from '@features/course/services/course';
 import { CoreConstants } from '@/core/constants';
@@ -32,20 +32,14 @@ export class CoreCourseFormatWeeksHandlerService implements CoreCourseFormatHand
     format = 'weeks';
 
     /**
-     * Whether or not the handler is enabled on a site level.
-     *
-     * @return True or promise resolved with true if enabled.
+     * @inheritdoc
      */
     async isEnabled(): Promise<boolean> {
         return true;
     }
 
     /**
-     * Given a list of sections, get the "current" section that should be displayed first.
-     *
-     * @param course The course to get the title.
-     * @param sections List of sections.
-     * @return Current section (or promise resolved with current section).
+     * @inheritdoc
      */
     async getCurrentSection(course: CoreCourseAnyCourseData, sections: CoreCourseSection[]): Promise<CoreCourseSection> {
         const now = CoreTimeUtils.timestamp();
@@ -71,6 +65,13 @@ export class CoreCourseFormatWeeksHandlerService implements CoreCourseFormatHand
         return sections[0];
     }
 
+    /**
+     * @inheritdoc
+     */
+    getSectionHightlightedName(): string {
+        return Translate.instant('core.course.thisweek');
+    }
+
     /**
      * Return the start and end date of a section.
      *
@@ -83,7 +84,7 @@ export class CoreCourseFormatWeeksHandlerService implements CoreCourseFormatHand
         startDate = startDate + 7200;
 
         const dates = {
-            start: startDate + (CoreConstants.SECONDS_WEEK * (section.section! - 1)),
+            start: startDate + (CoreConstants.SECONDS_WEEK * ((section.section || 0) - 1)),
             end: 0,
         };
         dates.end = dates.start + CoreConstants.SECONDS_WEEK;
diff --git a/src/core/features/course/lang.json b/src/core/features/course/lang.json
index d83be79fa..b3b0f24be 100644
--- a/src/core/features/course/lang.json
+++ b/src/core/features/course/lang.json
@@ -27,21 +27,24 @@
     "confirmpartialdownloadsize": "You are about to download <strong>at least</strong> {{size}}.{{availableSpace}} Are you sure you want to continue?",
     "confirmlimiteddownload": "You are not currently connected to Wi-Fi. ",
     "courseindex": "Course index",
-    "gotonextactivity": "Continue to next activity",
-    "gotonextactivitynotfound": "Next activity not found. It's possible that it has been hidden or deleted.",
-    "gotopreviousactivity": "Continue to previous activity",
-    "gotopreviousactivitynotfound": "Previous activity not found. It's possible that it has been hidden or deleted.",
     "couldnotloadsectioncontent": "Could not load the section content. Please try again later.",
     "couldnotloadsections": "Could not load the sections. Please try again later.",
     "coursesummary": "Course summary",
+    "done": "Done",
     "downloadcourse": "Download course",
     "downloadcoursesprogressdescription": "Downloading courses: downloaded {{count}} out of {{total}}.",
     "downloadsectionprogressdescription": "Downloading section: downloaded {{count}} out of {{total}}.",
     "errordownloadingcourse": "Error downloading course.",
     "errordownloadingsection": "Error downloading section.",
     "errorgetmodule": "Error getting activity data.",
+    "failed": "Failed",
+    "gotonextactivity": "Continue to next activity",
+    "gotonextactivitynotfound": "Next activity not found. It's possible that it has been hidden or deleted.",
+    "gotopreviousactivity": "Continue to previous activity",
+    "gotopreviousactivitynotfound": "Previous activity not found. It's possible that it has been hidden or deleted.",
     "hiddenfromstudents": "Hidden from students",
     "hiddenoncoursepage": "Available but not shown on course page",
+    "highlighted": "Highlighted",
     "insufficientavailablespace": "You are trying to download {{size}}. This will leave your device with insufficient space to operate normally. Please clear some storage space first.",
     "insufficientavailablequota": "Your device could not allocate space to save this download. It may be reserving space for app and system updates. Please clear some storage space first.",
     "manualcompletionnotsynced": "Manual completion not synchronised.",
@@ -50,6 +53,8 @@
     "overriddennotice": "Your final grade from this activity was manually adjusted.",
     "refreshcourse": "Refresh course",
     "section": "Section",
+    "thisweek": "This week",
+    "todo": "To do",
     "useactivityonbrowser": "You can still use it using your device's web browser.",
     "warningmanualcompletionmodified": "The manual completion of an activity was modified on the site.",
     "warningofflinemanualcompletiondeleted": "Some offline manual completion of course '{{name}}' has been deleted. {{error}}"
diff --git a/src/core/features/course/services/format-delegate.ts b/src/core/features/course/services/format-delegate.ts
index 4bfb14bc7..94a4bcc4c 100644
--- a/src/core/features/course/services/format-delegate.ts
+++ b/src/core/features/course/services/format-delegate.ts
@@ -66,13 +66,22 @@ export interface CoreCourseFormatHandler extends CoreDelegateHandler {
      */
     displayEnableDownload?(course: CoreCourseAnyCourseData): boolean;
 
+    /**
+     * Whether the default course index should be displayed. Defaults to true.
+     *
+     * @deprecated on 4.0. Please use displayCourseIndex instead.
+     * @param course The course to check.
+     * @return Whether the default course index should be displayed.
+     */
+    displaySectionSelector?(course: CoreCourseAnyCourseData): boolean;
+
     /**
      * Whether the default section selector should be displayed. Defaults to true.
      *
      * @param course The course to check.
      * @return Whether the default section selector should be displayed.
      */
-    displaySectionSelector?(course: CoreCourseAnyCourseData): boolean;
+    displayCourseIndex?(course: CoreCourseAnyCourseData): boolean;
 
     /**
      * Whether the course refresher should be displayed. If it returns false, a refresher must be included in the course format,
@@ -93,6 +102,13 @@ export interface CoreCourseFormatHandler extends CoreDelegateHandler {
      */
     getCurrentSection?(course: CoreCourseAnyCourseData, sections: CoreCourseSection[]): Promise<CoreCourseSection>;
 
+    /**
+     * Returns the name for the highlighted section.
+     *
+     * @return The name for the highlighted section based on the given course format.
+     */
+    getSectionHightlightedName?(): string;
+
     /**
      * Open the page to display a course. If not defined, the page CoreCourseSectionPage will be opened.
      * Implement it only if you want to create your own page to display the course. In general it's better to use the method
@@ -209,12 +225,19 @@ export class CoreCourseFormatDelegateService extends CoreDelegate<CoreCourseForm
     }
 
     /**
-     * Whether the default section selector should be displayed. Defaults to true.
+     * Whether the default course index should be displayed. Defaults to true.
      *
      * @param course The course to check.
-     * @return Whether the section selector should be displayed.
+     * @return Whether the course index should be displayed.
      */
-    displaySectionSelector(course: CoreCourseAnyCourseData): boolean {
+    displayCourseIndex(course: CoreCourseAnyCourseData): boolean {
+        const display = this.executeFunctionOnEnabled<boolean>(course.format || '', 'displayCourseIndex', [course]);
+
+        if (display !== undefined) {
+            return display;
+        }
+
+        // Use displaySectionSelector while is not completely deprecated.
         return !!this.executeFunctionOnEnabled<boolean>(course.format || '', 'displaySectionSelector', [course]);
     }
 
@@ -278,9 +301,9 @@ export class CoreCourseFormatDelegateService extends CoreDelegate<CoreCourseForm
      * @param sections List of sections.
      * @return Promise resolved with current section.
      */
-    async getCurrentSection(course: CoreCourseAnyCourseData, sections: CoreCourseSection[]): Promise<CoreCourseSection> {
+    async getCurrentSection<T = CoreCourseSection>(course: CoreCourseAnyCourseData, sections: T[]): Promise<T> {
         try {
-            const section = await this.executeFunctionOnEnabled<CoreCourseSection>(
+            const section = await this.executeFunctionOnEnabled<T>(
                 course.format || '',
                 'getCurrentSection',
                 [course, sections],
@@ -293,6 +316,19 @@ export class CoreCourseFormatDelegateService extends CoreDelegate<CoreCourseForm
         }
     }
 
+    /**
+     * Returns the name for the highlighted section.
+     *
+     * @param course The course to get the text.
+     * @return The name for the highlighted section based on the given course format.
+     */
+    getSectionHightlightedName(course: CoreCourseAnyCourseData): string | undefined {
+        return this.executeFunctionOnEnabled<string>(
+            course.format || '',
+            'getSectionHightlightedName',
+        );
+    }
+
     /**
      * Get the component to use to display a single section. This component will only be used if the user is viewing
      * a single section. If all the sections are displayed at once then it won't be used.
diff --git a/src/core/features/course/services/handlers/default-format.ts b/src/core/features/course/services/handlers/default-format.ts
index d7254f194..38c68d3df 100644
--- a/src/core/features/course/services/handlers/default-format.ts
+++ b/src/core/features/course/services/handlers/default-format.ts
@@ -16,6 +16,7 @@ import { Injectable } from '@angular/core';
 import { CoreCourseAnyCourseData, CoreCourses } from '@features/courses/services/courses';
 import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
 import { CoreUtils } from '@services/utils/utils';
+import { Translate } from '@singletons';
 import { CoreCourseSection } from '../course-helper';
 import { CoreCourseFormatHandler } from '../format-delegate';
 
@@ -65,7 +66,7 @@ export class CoreCourseFormatDefaultHandler implements CoreCourseFormatHandler {
     /**
      * @inheritdoc
      */
-    displaySectionSelector(): boolean {
+    displayCourseIndex(): boolean {
         return true;
     }
 
@@ -106,6 +107,13 @@ export class CoreCourseFormatDefaultHandler implements CoreCourseFormatHandler {
         return sections[0];
     }
 
+    /**
+     * @inheritdoc
+     */
+    getSectionHightlightedName(): string {
+        return Translate.instant('core.course.highlighted');
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/src/core/features/siteplugins/classes/handlers/course-format-handler.ts b/src/core/features/siteplugins/classes/handlers/course-format-handler.ts
index 89cfaff07..c6b7914d8 100644
--- a/src/core/features/siteplugins/classes/handlers/course-format-handler.ts
+++ b/src/core/features/siteplugins/classes/handlers/course-format-handler.ts
@@ -38,8 +38,9 @@ export class CoreSitePluginsCourseFormatHandler extends CoreSitePluginsBaseHandl
     /**
      * @inheritdoc
      */
-    displaySectionSelector(): boolean {
-        return this.handlerSchema.displaysectionselector ?? true;
+    displayCourseIndex(): boolean {
+        // Use displaysectionselector while is not completely deprecated.
+        return this.handlerSchema.displaycourseindex ?? this.handlerSchema.displaysectionselector ?? true;
     }
 
     /**
diff --git a/src/core/features/siteplugins/services/siteplugins.ts b/src/core/features/siteplugins/services/siteplugins.ts
index 70e85ea13..eded0cd07 100644
--- a/src/core/features/siteplugins/services/siteplugins.ts
+++ b/src/core/features/siteplugins/services/siteplugins.ts
@@ -884,7 +884,11 @@ export type CoreSitePluginsCourseModuleHandlerData = CoreSitePluginsHandlerCommo
 export type CoreSitePluginsCourseFormatHandlerData = CoreSitePluginsHandlerCommonData & {
     canviewallsections?: boolean;
     displayenabledownload?: boolean;
+    /**
+     * @deprecated on 4.0, use displaycourseindex instead.
+     */
     displaysectionselector?: boolean;
+    displaycourseindex?: boolean;
 };
 
 /**
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index 945871287..0dbd3e638 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -1118,7 +1118,7 @@ export class CoreDomUtilsProvider {
             content.scrollToPoint(position[0], position[1], duration || 0);
 
             return true;
-        } catch (error) {
+        } catch {
             return false;
         }
     }
diff --git a/upgrade.txt b/upgrade.txt
index e55234e0d..8b8313511 100644
--- a/upgrade.txt
+++ b/upgrade.txt
@@ -16,6 +16,7 @@ information provided here is intended especially for developers.
     The user handler function isEnabledForCourse is now called isEnabledForContext and receives a context + contextId instead of a courseId.
     Some user handler's functions have also changed to accept context + contextId instead of a courseId: isEnabledForUser, getDisplayData, action.
 - CoreCourseHelperProvider.openCourse parameters changed, now it admits CoreNavigationOptions + siteId on the same object that includes Params passed to page.
+- displaySectionSelector has been deprecated on CoreCourseFormatHandler, use displayCourseIndex instead.
 
 === 3.9.5 ===
 

From 8d59e03b9db9efe6efb910e3c548048ea0259e23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 26 Jan 2022 23:09:22 +0100
Subject: [PATCH 0418/1008] MOBILE-3915 course: Adapt course contents to new
 prototypes

---
 .../mod/resource/services/handlers/module.ts  |  2 +-
 .../components/course-index/course-index.ts   |  8 +-
 .../components/format/core-course-format.html | 12 ++-
 .../course/components/format/format.ts        | 13 +++-
 .../core-course-module-completion.html        |  5 +-
 .../module-info/core-course-module-info.html  | 19 +++--
 .../module-info/course-module-info.scss       |  5 ++
 .../core-course-module-manual-completion.html |  8 +-
 .../core-course-module-navigation.html        |  6 +-
 .../components/module/core-course-module.html | 74 +++++++++++++------
 .../course/components/module/module.scss      |  7 ++
 .../course/components/module/module.ts        | 14 +++-
 .../components/singleactivity.ts              |  4 +-
 .../pages/module-preview/module-preview.html  | 42 ++++++-----
 .../components/course-format/course-format.ts |  4 +-
 src/theme/theme.base.scss                     |  5 +-
 16 files changed, 150 insertions(+), 78 deletions(-)

diff --git a/src/addons/mod/resource/services/handlers/module.ts b/src/addons/mod/resource/services/handlers/module.ts
index a889ac9ed..0eaab6861 100644
--- a/src/addons/mod/resource/services/handlers/module.ts
+++ b/src/addons/mod/resource/services/handlers/module.ts
@@ -95,7 +95,7 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase
 
         this.getResourceData(module, courseId, handlerData).then((extra) => {
             handlerData.extraBadge = extra;
-            handlerData.extraBadgeColor = 'light';
+            handlerData.extraBadgeColor = '';
 
             return;
         }).catch(() => {
diff --git a/src/core/features/course/components/course-index/course-index.ts b/src/core/features/course/components/course-index/course-index.ts
index 87c653fb2..712e87e37 100644
--- a/src/core/features/course/components/course-index/course-index.ts
+++ b/src/core/features/course/components/course-index/course-index.ts
@@ -14,7 +14,7 @@
 
 import { Component, ElementRef, Input, OnInit, ViewChild } from '@angular/core';
 
-import { CoreCourseModuleData, CoreCourseSectionWithStatus } from '@features/course/services/course-helper';
+import { CoreCourseModuleData, CoreCourseSection } from '@features/course/services/course-helper';
 import {
     CoreCourseModuleCompletionStatus,
     CoreCourseModuleCompletionTracking,
@@ -126,7 +126,7 @@ export class CoreCourseCourseIndexComponent implements OnInit {
      * @param event Event.
      * @param section Selected section object.
      */
-    selectSection(event: Event, section: CoreCourseSectionWithStatus): void {
+    selectSection(event: Event, section: CoreCourseSection): void {
         if (section.uservisible !== false) {
             ModalController.dismiss({ event, section });
         }
@@ -139,7 +139,7 @@ export class CoreCourseCourseIndexComponent implements OnInit {
      * @param section Selected section object.
      * @param module Selected module object.
      */
-    selectModule(event: Event,section: CoreCourseSectionWithStatus, module: CoreCourseModuleData): void {
+    selectModule(event: Event,section: CoreCourseSection, module: CoreCourseModuleData): void {
         if (module.uservisible !== false) {
             ModalController.dismiss({ event, section, module });
         }
@@ -147,7 +147,7 @@ export class CoreCourseCourseIndexComponent implements OnInit {
 
 }
 
-type CourseIndexSection = Omit<CoreCourseSectionWithStatus, 'modules'> & {
+type CourseIndexSection = Omit<CoreCourseSection, 'modules'> & {
     highlighted?: boolean;
     expanded?: boolean;
     modules: (CoreCourseModuleData & {
diff --git a/src/core/features/course/components/format/core-course-format.html b/src/core/features/course/components/format/core-course-format.html
index 1b34598a3..3c8036beb 100644
--- a/src/core/features/course/components/format/core-course-format.html
+++ b/src/core/features/course/components/format/core-course-format.html
@@ -74,19 +74,23 @@
                     <core-format-text [text]="section.name" contextLevel="course" [contextInstanceId]="course.id">
                     </core-format-text>
                 </h2>
-                <p *ngIf="section.visible === 0 || section.availabilityinfo">
-                    <ion-badge color="info" *ngIf="section.visible === 0 && section.uservisible !== false" class="ion-text-wrap">
+                <p *ngIf="section.visible === 0 || section.availabilityinfo || (section.highlighted && highlighted)">
+                    <ion-badge color="info" *ngIf="section.visible === 0 && section.uservisible !== false" class="ion-text-wrap block">
+                        <ion-icon name="fas-eye-slash" aria-hidden="true"></ion-icon>
                         {{ 'core.course.hiddenfromstudents' | translate }}
                     </ion-badge>
-                    <ion-badge color="info" *ngIf="section.visible === 0 && section.uservisible === false" class="ion-text-wrap">
+                    <ion-badge color="info" *ngIf="section.visible === 0 && section.uservisible === false" class="ion-text-wrap block">
+                        <ion-icon name="fas-eye-slash" aria-hidden="true"></ion-icon>
                         {{ 'core.notavailable' | translate }}
                     </ion-badge>
-                    <ion-badge color="info" *ngIf="section.availabilityinfo" class="ion-text-wrap">
+                    <ion-badge color="info" *ngIf="section.availabilityinfo" class="ion-text-wrap block">
+                        <ion-icon name="fas-lock" [attr.aria-label]="'core.restricted' | translate"></ion-icon>
                         <core-format-text [text]=" section.availabilityinfo" contextLevel="course" [contextInstanceId]="course.id">
                         </core-format-text>
                     </ion-badge>
                 </p>
             </ion-label>
+            <ion-badge class="ion-text-wrap block" *ngIf="section.highlighted && highlighted" slot="end">{{highlighted}}</ion-badge>
         </ion-item-divider>
 
         <ion-item class="ion-text-wrap" *ngIf="section.summary">
diff --git a/src/core/features/course/components/format/format.ts b/src/core/features/course/components/format/format.ts
index 760637898..25a3cd218 100644
--- a/src/core/features/course/components/format/format.ts
+++ b/src/core/features/course/components/format/format.ts
@@ -38,7 +38,6 @@ import {
     CoreCourseModuleData,
     CoreCourseModuleCompletionData,
     CoreCourseSection,
-    CoreCourseSectionWithStatus,
 } from '@features/course/services/course-helper';
 import { CoreCourseFormatDelegate } from '@features/course/services/format-delegate';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
@@ -47,7 +46,6 @@ import { CoreUtils } from '@services/utils/utils';
 import { CoreCourseCourseIndexComponent, CoreCourseIndexSectionWithModule } from '../course-index/course-index';
 import { CoreBlockHelper } from '@features/block/services/block-helper';
 import { CoreNavigator } from '@services/navigator';
-import { database } from 'faker';
 import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate';
 
 /**
@@ -70,7 +68,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
     static readonly LOAD_MORE_ACTIVITIES = 20; // How many activities should load each time showMoreActivities is called.
 
     @Input() course!: CoreCourseAnyCourseData; // The course to render.
-    @Input() sections: CoreCourseSectionWithStatus[] = []; // List of course sections.
+    @Input() sections: CoreCourseSectionToDisplay[] = []; // List of course sections.
     @Input() initialSectionId?: number; // The section to load first (by ID).
     @Input() initialSectionNumber?: number; // The section to load first (by number).
     @Input() moduleId?: number; // The module ID to scroll to. Must be inside the initial selected section.
@@ -98,6 +96,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
     stealthModulesSectionId: number = CoreCourseProvider.STEALTH_MODULES_SECTION_ID;
     loaded = false;
     progress?: number;
+    highlighted?: string;
 
     protected selectTabObserver?: CoreEventObserver;
     protected completionObserver?: CoreEventObserver;
@@ -220,6 +219,10 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
         // Format has changed or it's the first time, load all the components.
         this.lastCourseFormat = this.course.format;
 
+        this.highlighted = CoreCourseFormatDelegate.getSectionHightlightedName(this.course);
+        const currentSection = await CoreCourseFormatDelegate.getCurrentSection(this.course, this.sections);
+        currentSection.highlighted = true;
+
         await Promise.all([
             this.loadCourseFormatComponent(),
             this.loadCourseSummaryComponent(),
@@ -559,3 +562,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
     }
 
 }
+
+type CoreCourseSectionToDisplay = CoreCourseSection & {
+    highlighted?: boolean;
+};
diff --git a/src/core/features/course/components/module-completion/core-course-module-completion.html b/src/core/features/course/components/module-completion/core-course-module-completion.html
index 571e9f15a..dbdc18616 100644
--- a/src/core/features/course/components/module-completion/core-course-module-completion.html
+++ b/src/core/features/course/components/module-completion/core-course-module-completion.html
@@ -4,16 +4,19 @@
     <ng-container *ngIf="completion.istrackeduser">
         <ng-container *ngFor="let rule of details">
             <ion-chip *ngIf="rule.statuscomplete" color="success" role="listitem" [attr.aria-label]="rule.accessibleDescription">
+                <ion-icon name="fas-check" aria-hidden="true"></ion-icon>
                 <ion-label><strong>{{ 'core.course.completion_automatic:done' | translate }}</strong> {{ rule.rulevalue.description }}
                 </ion-label>
             </ion-chip>
 
             <ion-chip *ngIf="rule.statuscompletefail" color="danger" role="listitem" [attr.aria-label]="rule.accessibleDescription">
+                <ion-icon name="fas-times" aria-hidden="true"></ion-icon>
                 <ion-label><strong>{{ 'core.course.completion_automatic:failed' | translate }}</strong> {{ rule.rulevalue.description }}
                 </ion-label>
             </ion-chip>
 
-            <ion-chip *ngIf="rule.statusincomplete" color="medium" role="listitem" [attr.aria-label]="rule.accessibleDescription">
+            <ion-chip *ngIf="rule.statusincomplete" role="listitem" [attr.aria-label]="rule.accessibleDescription">
+                <ion-icon name="fas-edit" aria-hidden="true"></ion-icon>
                 <ion-label><strong>{{ 'core.course.completion_automatic:todo' | translate }}</strong> {{ rule.rulevalue.description }}
                 </ion-label>
             </ion-chip>
diff --git a/src/core/features/course/components/module-info/core-course-module-info.html b/src/core/features/course/components/module-info/core-course-module-info.html
index 88060b6ca..864dd98a5 100644
--- a/src/core/features/course/components/module-info/core-course-module-info.html
+++ b/src/core/features/course/components/module-info/core-course-module-info.html
@@ -19,12 +19,21 @@
     </ion-label>
 </ion-item>
 <ng-content select="[description]"></ng-content>
-<!-- Activity dates. -->
-<ion-item class="ion-text-wrap core-module-dates" lines="none" *ngIf="showCompletion && module.dates?.length">
+
+<ion-item class="ion-text-wrap core-module-dates" lines="none" *ngIf="showCompletion && (module.dates?.length ||
+(module.completiondata && module.completiondata.isautomatic && module.uservisible))">
     <ion-label>
-        <p *ngFor="let date of module.dates">
-            <strong>{{ date.label }}</strong> {{ date.timestamp * 1000 | coreFormatDate:'strftimedatetime' }}
-        </p>
+        <!-- Activity dates. -->
+        <div *ngIf="module.dates?.length" class="core-module-dates">
+            <p *ngFor="let date of module.dates">
+                <ion-icon name="fas-calendar" aria-hidden="true"></ion-icon><strong>{{ date.label }}</strong> {{ date.timestamp * 1000 |
+                coreFormatDate:'strftimedatetime' }}
+            </p>
+        </div>
+        <!-- Module completion. -->
+        <core-course-module-completion [completion]="module.completiondata" [moduleName]="module.name" [moduleId]="module.id"
+            [showCompletionConditions]="true">
+        </core-course-module-completion>
     </ion-label>
 </ion-item>
 <ng-content></ng-content>
diff --git a/src/core/features/course/components/module-info/course-module-info.scss b/src/core/features/course/components/module-info/course-module-info.scss
index 514315b48..f540001d2 100644
--- a/src/core/features/course/components/module-info/course-module-info.scss
+++ b/src/core/features/course/components/module-info/course-module-info.scss
@@ -16,4 +16,9 @@
     core-mod-icon {
         align-self: flex-start;
     }
+
+    .core-module-dates ion-icon {
+        @include margin-horizontal(null, 8px);
+    }
+
 }
diff --git a/src/core/features/course/components/module-manual-completion/core-course-module-manual-completion.html b/src/core/features/course/components/module-manual-completion/core-course-module-manual-completion.html
index d205a5a65..8f8e5d6e3 100644
--- a/src/core/features/course/components/module-manual-completion/core-course-module-manual-completion.html
+++ b/src/core/features/course/components/module-manual-completion/core-course-module-manual-completion.html
@@ -2,22 +2,20 @@
 
     <ng-container *ngIf="completion.istrackeduser">
         <ng-container *ngIf="completion.state">
-            <ion-button color="success" expand="block" fill="outline" [attr.aria-label]="accessibleDescription"
-                (click)="completionClicked($event)">
+            <ion-button color="success" fill="outline" [attr.aria-label]="accessibleDescription" (click)="completionClicked($event)">
                 <ion-icon name="fas-check" slot="start" aria-hidden="true"></ion-icon>
                 {{ 'core.course.completion_manual:done' | translate }}
             </ion-button>
         </ng-container>
         <ng-container *ngIf="!completion.state">
-            <ion-button color="dark" expand="block" fill="outline" [attr.aria-label]="accessibleDescription"
-                (click)="completionClicked($event)">
+            <ion-button color="dark" fill="outline" [attr.aria-label]="accessibleDescription" (click)="completionClicked($event)">
                 {{ 'core.course.completion_manual:markdone' | translate }}
             </ion-button>
         </ng-container>
     </ng-container>
 
     <ng-container *ngIf="!completion.istrackeduser">
-        <ion-button disabled="true" color="dark" expand="block" fill="outline">
+        <ion-button disabled="true" color="dark" fill="outline">
             {{ 'core.course.completion_manual:markdone' | translate }}
         </ion-button>
     </ng-container>
diff --git a/src/core/features/course/components/module-navigation/core-course-module-navigation.html b/src/core/features/course/components/module-navigation/core-course-module-navigation.html
index 7d0fde92d..497b0e42e 100644
--- a/src/core/features/course/components/module-navigation/core-course-module-navigation.html
+++ b/src/core/features/course/components/module-navigation/core-course-module-navigation.html
@@ -6,12 +6,10 @@
                 <ion-icon name="fas-arrow-left" slot="icon-only" aria-hidden="true"></ion-icon>
             </ion-button>
         </ion-col>
-        <ion-col *ngIf="showCompletion && (currentModule.completiondata &&
-            (currentModule.completiondata.isautomatic || showManualCompletion) && currentModule.uservisible)">
+        <ion-col *ngIf="showCompletion && (currentModule.completiondata && showManualCompletion && currentModule.uservisible)">
             <!-- Module completion. -->
             <core-course-module-completion [completion]="currentModule.completiondata" [moduleName]="currentModule.name"
-                [moduleId]="currentModule.id" [showCompletionConditions]="true" [showManualCompletion]="showManualCompletion"
-                (completionChanged)="completionChanged.emit($event)">
+                [moduleId]="currentModule.id" [showManualCompletion]="true" (completionChanged)="completionChanged.emit($event)">
             </core-course-module-completion>
         </ion-col>
         <ion-col size="auto">
diff --git a/src/core/features/course/components/module/core-course-module.html b/src/core/features/course/components/module/core-course-module.html
index 1f5af1171..adfa73f2a 100644
--- a/src/core/features/course/components/module/core-course-module.html
+++ b/src/core/features/course/components/module/core-course-module.html
@@ -18,25 +18,26 @@
                         [courseId]="module.course" [attr.aria-label]="module.handlerData.a11yTitle + ', ' + modNameTranslated">
                     </core-format-text>
                 </p>
-                <ion-badge *ngIf="module.handlerData.extraBadge" [color]="module.handlerData.extraBadgeColor"
-                    class="ion-text-wrap ion-text-start">
-                    <span [innerHTML]="module.handlerData.extraBadge"></span>
-                </ion-badge>
-                <ion-badge *ngIf="module.visible === 0 && (!section || section.visible)" class="ion-text-wrap">
-                    {{ 'core.course.hiddenfromstudents' | translate }}
-                </ion-badge>
-                <ion-badge *ngIf="module.visible !== 0 && module.isStealth" class="ion-text-wrap">
-                    {{ 'core.course.hiddenoncoursepage' | translate }}
-                </ion-badge>
-                <div class="core-module-availabilityinfo" *ngIf="module.availabilityinfo">
-                    <ion-badge class="ion-text-wrap">{{ 'core.restricted' | translate }}</ion-badge>
-                    <core-format-text [text]="module.availabilityinfo" contextLevel="module" [contextInstanceId]="module.id"
-                        [courseId]="module.course" class="ion-text-wrap">
-                    </core-format-text>
-                </div>
-                <ion-badge *ngIf="module.completiondata?.offline" color="warning" class="ion-text-wrap">
-                    {{ 'core.course.manualcompletionnotsynced' | translate }}
-                </ion-badge>
+                <ion-chip class="completioninfo completion_incomplete" *ngIf="completionStatus === 0">
+                    <ion-label>
+                        <ion-icon name="fas-edit" aria-hidden="true"></ion-icon>
+                        {{ 'core.course.todo' | translate }}
+                    </ion-label>
+                </ion-chip>
+                <ion-chip class="completioninfo completion_complete" *ngIf="completionStatus === 1 || completionStatus === 2"
+                    color="success">
+                    <ion-icon name="fas-check" aria-hidden="true"></ion-icon>
+                    <ion-label>{{'core.course.done' | translate }}</ion-label>
+                </ion-chip>
+                <ion-chip class="completioninfo completion_fail" *ngIf="completionStatus === 3" color="danger">
+                    <ion-icon name="fas-times" aria-hidden="true"></ion-icon>
+                    <ion-label>{{'core.course.failed' | translate }}</ion-label>
+                </ion-chip>
+
+                <ion-chip *ngIf="module.handlerData.extraBadge" [color]="module.handlerData.extraBadgeColor"
+                    class="ion-text-wrap ion-text-start" [outline]="true">
+                    <ion-label><span [innerHTML]="module.handlerData.extraBadge"></span></ion-label>
+                </ion-chip>
             </ion-label>
             <!-- Buttons. -->
             <div slot="end" *ngIf="module.uservisible !== false" class="buttons core-module-buttons"
@@ -63,10 +64,15 @@
                 'item-dimmed': module.visible === 0 || module.uservisible === false
             }" detail="false">
             <ion-label>
+                <core-format-text class="core-module-description" *ngIf="module.description" [maxHeight]="80" [text]="module.description"
+                    contextLevel="module" [contextInstanceId]="module.id" [courseId]="module.course">
+                </core-format-text>
+
                 <!-- Activity dates. -->
                 <div *ngIf="showActivityDates && module.dates && module.dates.length" class="core-module-dates">
                     <p *ngFor="let date of module.dates">
-                        <strong>{{ date.label }}</strong> {{ date.timestamp * 1000 | coreFormatDate:'strftimedatetime' }}
+                        <ion-icon name="fas-calendar" aria-hidden="true"></ion-icon><strong>{{ date.label }}</strong> {{ date.timestamp *
+                        1000 | coreFormatDate:'strftimedatetime' }}
                     </p>
                 </div>
 
@@ -76,9 +82,31 @@
                     [showManualCompletion]="showManualCompletion" (completionChanged)="completionChanged.emit($event)">
                 </core-course-module-completion>
 
-                <core-format-text class="core-module-description" *ngIf="module.description" [maxHeight]="80" [text]="module.description"
-                    contextLevel="module" [contextInstanceId]="module.id" [courseId]="module.course">
-                </core-format-text>
+                <ion-chip *ngIf="module.completiondata?.offline" color="warning" class="ion-text-wrap block">
+                    <ion-icon name="fas-sync" aria-hidden="true"></ion-icon>
+                    <ion-label>{{ 'core.course.manualcompletionnotsynced' | translate }}</ion-label>
+                </ion-chip>
+
+                <!-- Availability -->
+                <ion-chip *ngIf="module.visible === 0 && (!section || section.visible)" class="ion-text-wrap block">
+                    <ion-icon name="fas-eye-slash" aria-hidden="true"></ion-icon>
+                    <ion-label>{{ 'core.course.hiddenfromstudents' | translate }}</ion-label>
+                </ion-chip>
+
+                <ion-chip *ngIf="module.visible !== 0 && module.isStealth" class="ion-text-wrap block">
+                    <ion-icon name="fas-eye-slash" aria-hidden="true"></ion-icon>
+                    <ion-label>{{ 'core.course.hiddenoncoursepage' | translate }}</ion-label>
+                </ion-chip>
+
+                <ion-chip class="core-module-availabilityinfo ion-text-wrap block" *ngIf="module.availabilityinfo">
+                    <ion-icon name="fas-lock" [attr.aria-label]="'core.restricted' | translate"></ion-icon>
+                    <ion-label>
+                        <core-format-text [text]="module.availabilityinfo" contextLevel="module" [contextInstanceId]="module.id"
+                            [courseId]="module.course" class="ion-text-wrap">
+                        </core-format-text>
+                    </ion-label>
+                </ion-chip>
+
             </ion-label>
         </ion-item>
     </ng-container>
diff --git a/src/core/features/course/components/module/module.scss b/src/core/features/course/components/module/module.scss
index 2253562e5..faf96e525 100644
--- a/src/core/features/course/components/module/module.scss
+++ b/src/core/features/course/components/module/module.scss
@@ -1,3 +1,5 @@
+@import "~theme/globals";
+
 :host {
 
     .item.core-module-main-item {
@@ -59,4 +61,9 @@
         --inner-border-width: 0px;
     }
 
+    .core-module-availabilityinfo  ion-icon,
+    .core-module-dates ion-icon {
+        @include margin-horizontal(null, 8px);
+    }
+
 }
diff --git a/src/core/features/course/components/module/module.ts b/src/core/features/course/components/module/module.ts
index 936901f5f..287c2a484 100644
--- a/src/core/features/course/components/module/module.ts
+++ b/src/core/features/course/components/module/module.ts
@@ -20,7 +20,7 @@ import {
     CoreCourseModuleCompletionData,
     CoreCourseSection,
 } from '@features/course/services/course-helper';
-import { CoreCourse } from '@features/course/services/course';
+import { CoreCourse, CoreCourseModuleCompletionStatus, CoreCourseModuleCompletionTracking } from '@features/course/services/course';
 import { CoreCourseModuleDelegate, CoreCourseModuleHandlerButton } from '@features/course/services/module-delegate';
 
 /**
@@ -47,6 +47,7 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy {
     hasInfo = false;
     showLegacyCompletion = false; // Whether to show module completion in the old format.
     showManualCompletion = false; // Whether to show manual completion when completion conditions are disabled.
+    completionStatus?: CoreCourseModuleCompletionStatus;
 
     /**
      * Component being initialized.
@@ -61,13 +62,22 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy {
         }
 
         this.module.handlerData.a11yTitle = this.module.handlerData.a11yTitle ?? this.module.handlerData.title;
+        this.completionStatus = this.module.completiondata === undefined ||
+                    this.module.completiondata.tracking == CoreCourseModuleCompletionTracking.COMPLETION_TRACKING_NONE
+            ? undefined
+            : this.module.completiondata.state;
+
         this.hasInfo = !!(
             this.module.description ||
             (this.showActivityDates && this.module.dates && this.module.dates.length) ||
             (this.module.completiondata &&
                 ((this.showManualCompletion && !this.module.completiondata.isautomatic) ||
                     (this.showCompletionConditions && this.module.completiondata.isautomatic))
-            )
+            ) ||
+            this.module.completiondata?.offline ||
+            (this.module.visible === 0 && (!this.section || this.section.visible)) ||
+            (this.module.visible !== 0 && this.module.isStealth) ||
+            (this.module.availabilityinfo)
         );
     }
 
diff --git a/src/core/features/course/format/singleactivity/components/singleactivity.ts b/src/core/features/course/format/singleactivity/components/singleactivity.ts
index b3d11a9d7..499d7f805 100644
--- a/src/core/features/course/format/singleactivity/components/singleactivity.ts
+++ b/src/core/features/course/format/singleactivity/components/singleactivity.ts
@@ -19,7 +19,7 @@ import { CoreCourseUnsupportedModuleComponent } from '@features/course/component
 import { CoreDynamicComponent } from '@components/dynamic-component/dynamic-component';
 import { CoreCourseAnyCourseData } from '@features/courses/services/courses';
 import { IonRefresher } from '@ionic/angular';
-import { CoreCourseModuleCompletionData, CoreCourseSectionWithStatus } from '@features/course/services/course-helper';
+import { CoreCourseModuleCompletionData, CoreCourseSection } from '@features/course/services/course-helper';
 import { CoreBlockHelper } from '@features/block/services/block-helper';
 import { CoreCourse } from '@features/course/services/course';
 
@@ -36,7 +36,7 @@ import { CoreCourse } from '@features/course/services/course';
 export class CoreCourseFormatSingleActivityComponent implements OnChanges {
 
     @Input() course?: CoreCourseAnyCourseData; // The course to render.
-    @Input() sections?: CoreCourseSectionWithStatus[]; // List of course sections.
+    @Input() sections?: CoreCourseSection[]; // List of course sections.
     @Input() initialSectionId?: number; // The section to load first (by ID).
     @Input() initialSectionNumber?: number; // The section to load first (by number).
     @Input() moduleId?: number; // The module ID to scroll to. Must be inside the initial selected section.
diff --git a/src/core/features/course/pages/module-preview/module-preview.html b/src/core/features/course/pages/module-preview/module-preview.html
index 711f8c740..bd5b02506 100644
--- a/src/core/features/course/pages/module-preview/module-preview.html
+++ b/src/core/features/course/pages/module-preview/module-preview.html
@@ -27,33 +27,35 @@
         <core-course-module-info [module]="module" [courseId]="courseId" [description]="module.description" [component]="module.modname"
             [componentId]="module.id" [expandDescription]="true">
 
-            <div class="safe-area-padding-horizontal ion-padding" *ngIf="module.handlerData?.extraBadge">
-                <ion-badge class="ion-text-wrap ion-text-start" [color]="module.handlerData?.extraBadgeColor">
-                    <span [innerHTML]="module.handlerData?.extraBadge"></span>
-                </ion-badge>
+            <div class="ion-padding" *ngIf="module.handlerData?.extraBadge">
+                <ion-chip class="ion-text-wrap ion-text-start" [color]="module.handlerData?.extraBadgeColor">
+                    <ion-label><span [innerHTML]="module.handlerData?.extraBadge"></span></ion-label>
+                </ion-chip>
             </div>
-            <div class="safe-area-padding-horizontal ion-padding" *ngIf="module.visible === 0 && (!section || section.visible)">
-                <ion-badge class="ion-text-wrap">
-                    {{ 'core.course.hiddenfromstudents' | translate }}
-                </ion-badge>
+            <div class="ion-padding" *ngIf="module.visible === 0 && (!section || section.visible)">
+                <ion-chip class="ion-text-wrap">
+                    <ion-icon name="fas-eye-slash" aria-hidden="true"></ion-icon>
+                    <ion-label>{{ 'core.course.hiddenfromstudents' | translate }}</ion-label>
+                </ion-chip>
             </div>
-            <div class="safe-area-padding-horizontal ion-padding" *ngIf="module.visible !== 0 && module.isStealth">
-                <ion-badge class="ion-text-wrap">
-                    {{ 'core.course.hiddenoncoursepage' | translate }}
-                </ion-badge>
+            <div class="ion-padding" *ngIf="module.visible !== 0 && module.isStealth">
+                <ion-chip class="ion-text-wrap">
+                    <ion-icon name="fas-eye-slash" aria-hidden="true"></ion-icon>
+                    <ion-label>{{ 'core.course.hiddenoncoursepage' | translate }}</ion-label>
+                </ion-chip>
             </div>
-            <div class="safe-area-padding-horizontal ion-padding core-module-availabilityinfo" *ngIf="module.availabilityinfo">
-                <ion-badge class="ion-text-wrap">{{ 'core.restricted' | translate }}</ion-badge>
-                <div>
+            <div class="ion-padding core-module-availabilityinfo" *ngIf="module.availabilityinfo">
+                <ion-icon name="fas-lock" [attr.aria-label]="'core.restricted' | translate"></ion-icon>
+                <ion-label>
                     <core-format-text [text]="module.availabilityinfo" contextLevel="module" [contextInstanceId]="module.id"
                         [courseId]="courseId" class="ion-text-wrap">
                     </core-format-text>
-                </div>
+                </ion-label>
             </div>
-            <div class="safe-area-padding-horizontal ion-padding" *ngIf="module.completiondata?.offline">
-                <ion-badge color="warning" class="ion-text-wrap">
-                    {{ 'core.course.manualcompletionnotsynced' | translate }}
-                </ion-badge>
+            <div class="ion-padding" *ngIf="module.completiondata?.offline">
+                <ion-chip color="warning" class="ion-text-wrap">
+                    <ion-label>{{ 'core.course.manualcompletionnotsynced' | translate }}</ion-label>
+                </ion-chip>
             </div>
 
             <core-course-unsupported-module *ngIf="unsupported" [module]="module" [courseId]="courseId"></core-course-unsupported-module>
diff --git a/src/core/features/siteplugins/components/course-format/course-format.ts b/src/core/features/siteplugins/components/course-format/course-format.ts
index 025c1036e..9fd9e6459 100644
--- a/src/core/features/siteplugins/components/course-format/course-format.ts
+++ b/src/core/features/siteplugins/components/course-format/course-format.ts
@@ -16,7 +16,7 @@ import { Component, OnChanges, Input, ViewChild, Output, EventEmitter } from '@a
 import { IonRefresher } from '@ionic/angular';
 
 import { CoreCourseFormatComponent } from '@features/course/components/format/format';
-import { CoreCourseModuleCompletionData, CoreCourseSectionWithStatus } from '@features/course/services/course-helper';
+import { CoreCourseModuleCompletionData, CoreCourseSection } from '@features/course/services/course-helper';
 import { CoreCourseFormatDelegate } from '@features/course/services/format-delegate';
 import { CoreCourseAnyCourseData } from '@features/courses/services/courses';
 import { CoreSitePlugins, CoreSitePluginsContent } from '@features/siteplugins/services/siteplugins';
@@ -33,7 +33,7 @@ import { CoreSitePluginsPluginContentComponent } from '../plugin-content/plugin-
 export class CoreSitePluginsCourseFormatComponent implements OnChanges {
 
     @Input() course?: CoreCourseAnyCourseData; // The course to render.
-    @Input() sections?: CoreCourseSectionWithStatus[]; // List of course sections. The status will be calculated in this component.
+    @Input() sections?: CoreCourseSection[]; // List of course sections. The status will be calculated in this component.
     @Input() downloadEnabled?: boolean; // Whether the download of sections and modules is enabled.
     @Input() initialSectionId?: number; // The section to load first (by ID).
     @Input() initialSectionNumber?: number; // The section to load first (by number).
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index cd61d7f89..74a6f739d 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -844,6 +844,8 @@ ion-select-popover ion-item.core-select-option-title {
 
 ion-chip {
     line-height: 1.1;
+    border-radius: var(--big-radius);
+    @include padding-horizontal(16px);
 }
 
 ion-searchbar {
@@ -1167,9 +1169,8 @@ ion-item.item-input ion-input.has-focus {
     }
 }
 
-// Ionic set this value to 0 without px that provoked miscalculations.
 ion-item-divider {
-    --inner-padding-end: 0px;
+    --inner-padding-end: 8px;
 }
 
 // Change default outline.

From 27729cbf26d39693e0dffc991d153884d705b718 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 28 Jan 2022 11:34:03 +0100
Subject: [PATCH 0419/1008] MOBILE-3915 style: Improve radius vars

---
 src/theme/theme.base.scss  | 24 ++++++++++++++----------
 src/theme/theme.light.scss | 10 ++++++----
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 74a6f739d..cfd6a58fa 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -382,17 +382,21 @@ ion-alert.core-nohead {
     }
 }
 
-ion-alert .alert-wrapper {
-    overflow: auto;
-}
+ion-alert {
+    --border-radius: var(--huge-radius);
+    .alert-wrapper {
+        overflow: auto;
+        border-radius: var(--border-radius) !important;
 
-ion-alert .alert-message {
-    user-select: text;
-    flex-shrink: 0;
-}
+        button.alert-button {
+            color: var(--primary);
+        }
+    }
 
-ion-alert .alert-wrapper button.alert-button {
-    color: var(--primary);
+    .alert-message {
+        user-select: text;
+        flex-shrink: 0;
+    }
 }
 
 // Ionic list.
@@ -844,7 +848,7 @@ ion-select-popover ion-item.core-select-option-title {
 
 ion-chip {
     line-height: 1.1;
-    border-radius: var(--big-radius);
+    border-radius: var(--medium-radius);
     @include padding-horizontal(16px);
 }
 
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index ee6036013..6d0ff6d15 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -105,7 +105,9 @@
     --subdued-text-color: #595959;
 
     --small-radius: 4px;
-    --big-radius: 8px;
+    --medium-radius: 8px;
+    --big-radius: 16px;
+    --huge-radius: 24px;
 
     --ion-card-color: var(--text-color);
     ion-card {
@@ -113,7 +115,7 @@
         --border-style: solid;
         --border-color: var(--stroke);
         --box-shadow: none;
-        --border-radius: var(--big-radius);
+        --border-radius: var(--medium-radius);
     }
 
     --text-hightlight-background-color: #{$core-text-hightlight-background-color};
@@ -181,7 +183,7 @@
             height: var(--a11y-min-target-size);
             border: 1px solid var(--stroke);
             box-shadow: none;
-            border-radius: var(--big-radius);
+            border-radius: var(--medium-radius);
         }
     }
 
@@ -282,7 +284,7 @@
     --core-combobox-color: var(--gray-900);
     --core-combobox-border-color: var(--stroke);
     --core-combobox-border-width: 1px;
-    --core-combobox-radius: var(--big-radius);
+    --core-combobox-radius: var(--medium-radius);
     --core-combobox-box-shadow: none;
 
     --selected-item-color: var(--primary);

From f83c8f4e1aa1190e2742943a8b4cbe79f5a3bf15 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 27 Jan 2022 14:59:14 +0100
Subject: [PATCH 0420/1008] MOBILE-3833 mainmenu: Support deep links in all
 tabs, not just home

---
 src/addons/blog/pages/entries/entries.ts      |   4 +
 src/addons/calendar/pages/index/index.page.ts |   4 +
 src/addons/messages/guards/index.ts           |  14 ++-
 .../pages/discussions-35/discussions.page.ts  |  12 ++-
 .../group-conversations.page.ts               |  13 ++-
 src/addons/notifications/pages/list/list.ts   |   4 +
 src/core/features/courses/pages/my/my.ts      |   4 +
 .../mainmenu/classes/deep-link-manager.ts     | 102 ++++++++++++++++++
 src/core/features/mainmenu/pages/home/home.ts |  72 +------------
 src/core/features/mainmenu/pages/menu/menu.ts |  24 ++++-
 src/core/features/mainmenu/pages/more/more.ts |   4 +
 .../features/tag/pages/search/search.page.ts  |   4 +
 src/core/guards/redirect.ts                   |   3 +-
 src/core/services/navigator.ts                |   7 +-
 14 files changed, 183 insertions(+), 88 deletions(-)
 create mode 100644 src/core/features/mainmenu/classes/deep-link-manager.ts

diff --git a/src/addons/blog/pages/entries/entries.ts b/src/addons/blog/pages/entries/entries.ts
index 165f1f405..98ae5f66a 100644
--- a/src/addons/blog/pages/entries/entries.ts
+++ b/src/addons/blog/pages/entries/entries.ts
@@ -16,6 +16,7 @@ import { ContextLevel } from '@/core/constants';
 import { AddonBlog, AddonBlogFilter, AddonBlogPost, AddonBlogProvider } from '@addons/blog/services/blog';
 import { Component, OnInit } from '@angular/core';
 import { CoreComments } from '@features/comments/services/comments';
+import { CoreMainMenuDeepLinkManager } from '@features/mainmenu/classes/deep-link-manager';
 import { CoreTag } from '@features/tag/services/tag';
 import { CoreUser, CoreUserProfile } from '@features/user/services/user';
 import { IonRefresher } from '@ionic/angular';
@@ -118,6 +119,9 @@ export class AddonBlogEntriesPage implements OnInit {
         this.commentsEnabled = !CoreComments.areCommentsDisabledInSite();
         this.tagsEnabled = CoreTag.areTagsAvailableInSite();
 
+        const deepLinkManager = new CoreMainMenuDeepLinkManager();
+        deepLinkManager.treatLink();
+
         await this.fetchEntries();
 
         CoreUtils.ignoreErrors(AddonBlog.logView(this.filter));
diff --git a/src/addons/calendar/pages/index/index.page.ts b/src/addons/calendar/pages/index/index.page.ts
index ba5d5366d..0b55de067 100644
--- a/src/addons/calendar/pages/index/index.page.ts
+++ b/src/addons/calendar/pages/index/index.page.ts
@@ -33,6 +33,7 @@ import { AddonCalendarFilterPopoverComponent } from '../../components/filter/fil
 import { CoreNavigator } from '@services/navigator';
 import { CoreLocalNotifications } from '@services/local-notifications';
 import { CoreConstants } from '@/core/constants';
+import { CoreMainMenuDeepLinkManager } from '@features/mainmenu/classes/deep-link-manager';
 
 /**
  * Page that displays the calendar events.
@@ -177,6 +178,9 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy {
 
             this.fetchData(true, false);
         });
+
+        const deepLinkManager = new CoreMainMenuDeepLinkManager();
+        deepLinkManager.treatLink();
     }
 
     /**
diff --git a/src/addons/messages/guards/index.ts b/src/addons/messages/guards/index.ts
index 8d09ab80b..9f2d0385f 100644
--- a/src/addons/messages/guards/index.ts
+++ b/src/addons/messages/guards/index.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { Injectable } from '@angular/core';
-import { CanActivate, UrlTree } from '@angular/router';
+import { ActivatedRouteSnapshot, CanActivate, UrlTree } from '@angular/router';
 import { Router } from '@singletons';
 import { AddonMessagesMainMenuHandlerService } from '../services/handlers/mainmenu';
 import { AddonMessages } from '../services/messages';
@@ -27,18 +27,22 @@ export class AddonMessagesIndexGuard implements CanActivate {
     /**
      * @inheritdoc
      */
-    canActivate(): UrlTree {
-        return this.guard();
+    canActivate(route: ActivatedRouteSnapshot): UrlTree {
+        return this.guard(route);
     }
 
     /**
      * Check if there is a pending redirect and trigger it.
      */
-    private guard(): UrlTree {
+    private guard(route: ActivatedRouteSnapshot): UrlTree {
         const enabled = AddonMessages.isGroupMessagingEnabled();
         const path = `/main/${AddonMessagesMainMenuHandlerService.PAGE_NAME}/` + ( enabled ? 'group-conversations' : 'index');
 
-        return Router.parseUrl(path);
+        const newRoute = Router.parseUrl(path);
+
+        newRoute.queryParams = route.queryParams;
+
+        return newRoute;
     }
 
 }
diff --git a/src/addons/messages/pages/discussions-35/discussions.page.ts b/src/addons/messages/pages/discussions-35/discussions.page.ts
index ad60b73e9..58d52fd6e 100644
--- a/src/addons/messages/pages/discussions-35/discussions.page.ts
+++ b/src/addons/messages/pages/discussions-35/discussions.page.ts
@@ -32,6 +32,7 @@ import { Translate, Platform } from '@singletons';
 import { IonRefresher } from '@ionic/angular';
 import { CoreNavigator } from '@services/navigator';
 import { CoreScreen } from '@services/screen';
+import { CoreMainMenuDeepLinkManager } from '@features/mainmenu/classes/deep-link-manager';
 
 /**
  * Page that displays the list of discussions.
@@ -141,12 +142,17 @@ export class AddonMessagesDiscussions35Page implements OnInit, OnDestroy {
             this.discussionUserId = CoreNavigator.getRouteNumberParam('userId', { params }) ?? this.discussionUserId;
         });
 
+        const deepLinkManager = new CoreMainMenuDeepLinkManager();
+
         await this.fetchData();
 
         if (!this.discussionUserId && this.discussions.length > 0 && CoreScreen.isTablet) {
             // Take first and load it.
-            this.gotoDiscussion(this.discussions[0].message!.user);
+            await this.gotoDiscussion(this.discussions[0].message!.user);
         }
+
+        // Treat deep link now that the conversation route has been loaded if needed.
+        deepLinkManager.treatLink();
     }
 
     /**
@@ -247,7 +253,7 @@ export class AddonMessagesDiscussions35Page implements OnInit, OnDestroy {
      * @param messageId Message to scroll after loading the discussion. Used when searching.
      * @param onlyWithSplitView Only go to Discussion if split view is on.
      */
-    gotoDiscussion(discussionUserId: number, messageId?: number): void {
+    async gotoDiscussion(discussionUserId: number, messageId?: number): Promise<void> {
         this.discussionUserId = discussionUserId;
 
         const params: Params = {
@@ -261,7 +267,7 @@ export class AddonMessagesDiscussions35Page implements OnInit, OnDestroy {
         const splitViewLoaded = CoreNavigator.isCurrentPathInTablet('**/messages/index/discussion');
         const path = (splitViewLoaded ? '../' : '') + 'discussion';
 
-        CoreNavigator.navigate(path, { params });
+        await CoreNavigator.navigate(path, { params });
     }
 
     /**
diff --git a/src/addons/messages/pages/group-conversations/group-conversations.page.ts b/src/addons/messages/pages/group-conversations/group-conversations.page.ts
index 47d6ba354..3e6216af7 100644
--- a/src/addons/messages/pages/group-conversations/group-conversations.page.ts
+++ b/src/addons/messages/pages/group-conversations/group-conversations.page.ts
@@ -36,6 +36,7 @@ import { ActivatedRoute, Params } from '@angular/router';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreNavigator } from '@services/navigator';
 import { CoreScreen } from '@services/screen';
+import { CoreMainMenuDeepLinkManager } from '@features/mainmenu/classes/deep-link-manager';
 
 /**
  * Page that displays the list of conversations, including group conversations.
@@ -279,6 +280,8 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
             }
         });
 
+        const deepLinkManager = new CoreMainMenuDeepLinkManager();
+
         await this.fetchData();
 
         if (!this.selectedConversationId && !this.selectedUserId && CoreScreen.isTablet) {
@@ -290,10 +293,13 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
                 conversation = expandedOption.conversations[0];
 
                 if (conversation) {
-                    this.gotoConversation(conversation.id);
+                    await this.gotoConversation(conversation.id);
                 }
             }
         }
+
+        // Treat deep link now that the conversation route has been loaded if needed.
+        deepLinkManager.treatLink();
     }
 
     /**
@@ -507,7 +513,7 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
      * @param userId User of the conversation. Only if there is no conversationId.
      * @param messageId Message to scroll after loading the discussion. Used when searching.
      */
-    gotoConversation(conversationId?: number, userId?: number, messageId?: number): void {
+    async gotoConversation(conversationId?: number, userId?: number, messageId?: number): Promise<void> {
         this.selectedConversationId = conversationId;
         this.selectedUserId = userId;
 
@@ -524,7 +530,8 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
 
         const splitViewLoaded = CoreNavigator.isCurrentPathInTablet('**/messages/group-conversations/discussion');
         const path = (splitViewLoaded ? '../' : '') + 'discussion';
-        CoreNavigator.navigate(path, { params });
+
+        await CoreNavigator.navigate(path, { params });
     }
 
     /**
diff --git a/src/addons/notifications/pages/list/list.ts b/src/addons/notifications/pages/list/list.ts
index acff71cb5..f508814bf 100644
--- a/src/addons/notifications/pages/list/list.ts
+++ b/src/addons/notifications/pages/list/list.ts
@@ -29,6 +29,7 @@ import {
     AddonNotificationsHelper,
     AddonNotificationsNotificationToRender,
 } from '@addons/notifications/services/notifications-helper';
+import { CoreMainMenuDeepLinkManager } from '@features/mainmenu/classes/deep-link-manager';
 
 /**
  * Page that displays the list of notifications.
@@ -82,6 +83,9 @@ export class AddonNotificationsListPage implements OnInit, OnDestroy {
             this.notificationsLoaded = false;
             this.refreshNotifications();
         });
+
+        const deepLinkManager = new CoreMainMenuDeepLinkManager();
+        deepLinkManager.treatLink();
     }
 
     /**
diff --git a/src/core/features/courses/pages/my/my.ts b/src/core/features/courses/pages/my/my.ts
index 4e3b5e6f9..d9f8d001b 100644
--- a/src/core/features/courses/pages/my/my.ts
+++ b/src/core/features/courses/pages/my/my.ts
@@ -17,6 +17,7 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { CoreBlockComponent } from '@features/block/components/block/block';
 import { CoreCourseBlock } from '@features/course/services/course';
 import { CoreCoursesDashboard, CoreCoursesDashboardProvider } from '@features/courses/services/dashboard';
+import { CoreMainMenuDeepLinkManager } from '@features/mainmenu/classes/deep-link-manager';
 import { IonRefresher } from '@ionic/angular';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
@@ -65,6 +66,9 @@ export class CoreCoursesMyCoursesPage implements OnInit, OnDestroy {
         this.searchEnabled = !CoreCourses.isSearchCoursesDisabledInSite();
         this.downloadCoursesEnabled = !CoreCourses.isDownloadCoursesDisabledInSite();
 
+        const deepLinkManager = new CoreMainMenuDeepLinkManager();
+        deepLinkManager.treatLink();
+
         this.loadSiteName();
 
         this.loadContent();
diff --git a/src/core/features/mainmenu/classes/deep-link-manager.ts b/src/core/features/mainmenu/classes/deep-link-manager.ts
new file mode 100644
index 000000000..6cd480eb6
--- /dev/null
+++ b/src/core/features/mainmenu/classes/deep-link-manager.ts
@@ -0,0 +1,102 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreContentLinksDelegate } from '@features/contentlinks/services/contentlinks-delegate';
+import { CoreContentLinksHelper } from '@features/contentlinks/services/contentlinks-helper';
+import { CoreCourse } from '@features/course/services/course';
+import { CoreCourseHelper } from '@features/course/services/course-helper';
+import { CoreNavigator, CoreRedirectPayload } from '@services/navigator';
+
+/**
+ * A class to handle opening deep links in a main menu page. There are 2 type of deep links:
+ *   -A Moodle URL to treat.
+ *   -A combination of path + options.
+ */
+export class CoreMainMenuDeepLinkManager {
+
+    protected pendingRedirect?: CoreRedirectPayload;
+    protected urlToOpen?: string;
+
+    constructor() {
+        this.urlToOpen = CoreNavigator.getRouteParam('urlToOpen');
+        const redirectPath = CoreNavigator.getRouteParam('redirectPath');
+        if (redirectPath) {
+            this.pendingRedirect = {
+                redirectPath,
+                redirectOptions: CoreNavigator.getRouteParam('redirectOptions'),
+            };
+        }
+    }
+
+    /**
+     * Whether there is a deep link to be treated.
+     *
+     * @return Whether there is a deep link to be treated.
+     */
+    hasDeepLinkToTreat(): boolean {
+        return !!this.urlToOpen || !!this.pendingRedirect;
+    }
+
+    /**
+     * Treat a deep link if there's any to treat.
+     */
+    treatLink(): void {
+        if (this.pendingRedirect) {
+            this.treatRedirect(this.pendingRedirect);
+        } else if (this.urlToOpen) {
+            this.treatUrlToOpen(this.urlToOpen);
+        }
+
+        delete this.pendingRedirect;
+        delete this.urlToOpen;
+    }
+
+    /**
+     * Treat a redirect.
+     *
+     * @param data Data received.
+     */
+    protected treatRedirect(data: CoreRedirectPayload): void {
+        const params = data.redirectOptions?.params;
+        const coursePathMatches = data.redirectPath.match(/^course\/(\d+)\/?$/);
+
+        if (coursePathMatches) {
+            if (!params?.course) {
+                CoreCourseHelper.getAndOpenCourse(Number(coursePathMatches[1]), params);
+            } else {
+                CoreCourse.openCourse(params.course, params);
+            }
+        } else {
+            CoreNavigator.navigateToSitePath(data.redirectPath, {
+                ...data.redirectOptions,
+                preferCurrentTab: false,
+            });
+        }
+    }
+
+    /**
+     * Treat a URL to open.
+     *
+     * @param url URL to open.
+     */
+    protected async treatUrlToOpen(url: string): Promise<void> {
+        const actions = await CoreContentLinksDelegate.getActionsFor(url, undefined);
+
+        const action = CoreContentLinksHelper.getFirstValidAction(actions);
+        if (action?.sites?.[0]) {
+            action.action(action.sites[0]);
+        }
+    }
+
+}
diff --git a/src/core/features/mainmenu/pages/home/home.ts b/src/core/features/mainmenu/pages/home/home.ts
index 2db2c4811..d536a54bd 100644
--- a/src/core/features/mainmenu/pages/home/home.ts
+++ b/src/core/features/mainmenu/pages/home/home.ts
@@ -20,13 +20,8 @@ import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreTabsOutletComponent, CoreTabsOutletTab } from '@components/tabs-outlet/tabs-outlet';
 import { CoreMainMenuHomeDelegate, CoreMainMenuHomeHandlerToDisplay } from '../../services/home-delegate';
 import { CoreUtils } from '@services/utils/utils';
-import { ActivatedRoute } from '@angular/router';
-import { CoreNavigator, CoreRedirectPayload } from '@services/navigator';
-import { CoreCourseHelper } from '@features/course/services/course-helper';
-import { CoreCourse } from '@features/course/services/course';
-import { CoreContentLinksDelegate } from '@features/contentlinks/services/contentlinks-delegate';
-import { CoreContentLinksHelper } from '@features/contentlinks/services/contentlinks-helper';
 import { CoreMainMenuHomeHandlerService } from '@features/mainmenu/services/handlers/mainmenu';
+import { CoreMainMenuDeepLinkManager } from '@features/mainmenu/classes/deep-link-manager';
 
 /**
  * Page that displays the Home.
@@ -46,28 +41,13 @@ export class CoreMainMenuHomePage implements OnInit {
 
     protected subscription?: Subscription;
     protected updateSiteObserver?: CoreEventObserver;
-    protected pendingRedirect?: CoreRedirectPayload;
-    protected urlToOpen?: string;
-
-    constructor(
-        protected route: ActivatedRoute,
-    ) {
-    }
+    protected deepLinkManager?: CoreMainMenuDeepLinkManager;
 
     /**
      * @inheritdoc
      */
     ngOnInit(): void {
-        this.route.queryParams.subscribe((params: Partial<CoreRedirectPayload> & { urlToOpen?: string }) => {
-            this.urlToOpen = params.urlToOpen ?? this.urlToOpen;
-
-            if (params.redirectPath) {
-                this.pendingRedirect = {
-                    redirectPath: params.redirectPath,
-                    redirectOptions: params.redirectOptions,
-                };
-            }
-        });
+        this.deepLinkManager = new CoreMainMenuDeepLinkManager();
 
         this.loadSiteName();
 
@@ -124,55 +104,11 @@ export class CoreMainMenuHomePage implements OnInit {
         this.siteName = CoreSites.getRequiredCurrentSite().getSiteName() || '';
     }
 
-    /**
-     * Handle a redirect.
-     *
-     * @param data Data received.
-     */
-    protected handleRedirect(data: CoreRedirectPayload): void {
-        const params = data.redirectOptions?.params;
-        const coursePathMatches = data.redirectPath.match(/^course\/(\d+)\/?$/);
-
-        if (coursePathMatches) {
-            if (!params?.course) {
-                CoreCourseHelper.getAndOpenCourse(Number(coursePathMatches[1]), params);
-            } else {
-                CoreCourse.openCourse(params.course, params);
-            }
-        } else {
-            CoreNavigator.navigateToSitePath(data.redirectPath, {
-                ...data.redirectOptions,
-                preferCurrentTab: false,
-            });
-        }
-    }
-
-    /**
-     * Handle a URL to open.
-     *
-     * @param url URL to open.
-     */
-    protected async handleUrlToOpen(url: string): Promise<void> {
-        const actions = await CoreContentLinksDelegate.getActionsFor(url, undefined);
-
-        const action = CoreContentLinksHelper.getFirstValidAction(actions);
-        if (action?.sites?.[0]) {
-            action.action(action.sites[0]);
-        }
-    }
-
     /**
      * Tab was selected.
      */
     tabSelected(): void {
-        if (this.pendingRedirect) {
-            this.handleRedirect(this.pendingRedirect);
-        } else if (this.urlToOpen) {
-            this.handleUrlToOpen(this.urlToOpen);
-        }
-
-        delete this.pendingRedirect;
-        delete this.urlToOpen;
+        this.deepLinkManager?.treatLink();
     }
 
     /**
diff --git a/src/core/features/mainmenu/pages/menu/menu.ts b/src/core/features/mainmenu/pages/menu/menu.ts
index 409bc3c9d..bda5d03dc 100644
--- a/src/core/features/mainmenu/pages/menu/menu.ts
+++ b/src/core/features/mainmenu/pages/menu/menu.ts
@@ -24,7 +24,7 @@ import { CoreMainMenuDelegate, CoreMainMenuHandlerToDisplay } from '../../servic
 import { Router } from '@singletons';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreAriaRoleTab, CoreAriaRoleTabFindable } from '@classes/aria-role-tab';
-import { CoreNavigator } from '@services/navigator';
+import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
 import { filter } from 'rxjs/operators';
 import { NavigationEnd } from '@angular/router';
 import { trigger, state, style, transition, animate } from '@angular/animations';
@@ -77,6 +77,9 @@ export class CoreMainMenuPage implements OnInit, OnDestroy {
     protected backButtonFunction: (event: BackButtonEvent) => void;
     protected selectHistory: string[] = [];
     protected firstSelectedTab?: string;
+    protected urlToOpen?: string;
+    protected redirectPath?: string;
+    protected redirectOptions?: CoreNavigationOptions;
 
     @ViewChild('mainTabs') mainTabs?: IonTabs;
 
@@ -100,6 +103,9 @@ export class CoreMainMenuPage implements OnInit, OnDestroy {
      */
     async ngOnInit(): Promise<void> {
         this.showTabs = true;
+        this.urlToOpen = CoreNavigator.getRouteParam('urlToOpen');
+        this.redirectPath = CoreNavigator.getRouteParam('redirectPath');
+        this.redirectOptions = CoreNavigator.getRouteParam('redirectOptions');
 
         this.isMainScreen = !this.mainTabs?.outlet.canGoBack();
 
@@ -173,10 +179,22 @@ export class CoreMainMenuPage implements OnInit, OnDestroy {
 
         this.loaded = CoreMainMenuDelegate.areHandlersLoaded();
 
-        if (this.loaded && this.tabs[0] && !CoreNavigator.getCurrentMainMenuTab()) {
+        if (this.loaded && !CoreNavigator.getCurrentMainMenuTab()) {
             // No tab selected, select the first one.
             await CoreUtils.nextTick();
-            this.mainTabs?.select(this.tabs[0].page);
+
+            const tabPage = this.tabs[0] ? this.tabs[0].page : this.morePageName;
+            const tabPageParams = this.tabs[0] ? this.tabs[0].pageParams : {};
+
+            // Use navigate instead of mainTabs.select to be able to pass page params.
+            CoreNavigator.navigate(tabPage, {
+                params: {
+                    urlToOpen: this.urlToOpen,
+                    redirectPath: this.redirectPath,
+                    redirectOptions: this.redirectOptions,
+                    ...tabPageParams,
+                },
+            });
         }
     }
 
diff --git a/src/core/features/mainmenu/pages/more/more.ts b/src/core/features/mainmenu/pages/more/more.ts
index 626a18d27..5a4f6d7b5 100644
--- a/src/core/features/mainmenu/pages/more/more.ts
+++ b/src/core/features/mainmenu/pages/more/more.ts
@@ -25,6 +25,7 @@ import { CoreCustomURLSchemes } from '@services/urlschemes';
 import { CoreContentLinksHelper } from '@features/contentlinks/services/contentlinks-helper';
 import { CoreTextUtils } from '@services/utils/text';
 import { Translate } from '@singletons';
+import { CoreMainMenuDeepLinkManager } from '@features/mainmenu/classes/deep-link-manager';
 
 /**
  * Page that displays the more page of the app.
@@ -71,6 +72,9 @@ export class CoreMainMenuMorePage implements OnInit, OnDestroy {
         });
 
         window.addEventListener('resize', this.initHandlers.bind(this));
+
+        const deepLinkManager = new CoreMainMenuDeepLinkManager();
+        deepLinkManager.treatLink();
     }
 
     /**
diff --git a/src/core/features/tag/pages/search/search.page.ts b/src/core/features/tag/pages/search/search.page.ts
index c6f2dbd82..c0b6d4724 100644
--- a/src/core/features/tag/pages/search/search.page.ts
+++ b/src/core/features/tag/pages/search/search.page.ts
@@ -23,6 +23,7 @@ import { CoreTagCloud, CoreTagCollection, CoreTagCloudTag, CoreTag } from '@feat
 import { Translate } from '@singletons';
 import { CoreContentLinksHelper } from '@features/contentlinks/services/contentlinks-helper';
 import { CoreNavigator } from '@services/navigator';
+import { CoreMainMenuDeepLinkManager } from '@features/mainmenu/classes/deep-link-manager';
 
 /**
  * Page that displays most used tags and allows searching.
@@ -48,6 +49,9 @@ export class CoreTagSearchPage implements OnInit {
         this.collectionId = CoreNavigator.getRouteNumberParam('collectionId') || 0;
         this.query = CoreNavigator.getRouteParam('query') || '';
 
+        const deepLinkManager = new CoreMainMenuDeepLinkManager();
+        deepLinkManager.treatLink();
+
         this.fetchData().finally(() => {
             this.loaded = true;
         });
diff --git a/src/core/guards/redirect.ts b/src/core/guards/redirect.ts
index dcb7c2950..38a1eb3d1 100644
--- a/src/core/guards/redirect.ts
+++ b/src/core/guards/redirect.ts
@@ -14,7 +14,6 @@
 
 import { Injectable } from '@angular/core';
 import { CanActivate, CanLoad, UrlTree } from '@angular/router';
-import { CoreMainMenuHomeHandlerService } from '@features/mainmenu/services/handlers/mainmenu';
 import { CoreApp } from '@services/app';
 import { CoreRedirectPayload } from '@services/navigator';
 import { CoreSites } from '@services/sites';
@@ -60,7 +59,7 @@ export class CoreRedirectGuard implements CanLoad, CanActivate {
                 redirect.page,
                 redirect.options,
             );
-            const route = Router.parseUrl(`/main/${CoreMainMenuHomeHandlerService.PAGE_NAME}`);
+            const route = Router.parseUrl('/main');
 
             route.queryParams = {
                 redirectPath: redirect.page,
diff --git a/src/core/services/navigator.ts b/src/core/services/navigator.ts
index 344ad2822..5438abeca 100644
--- a/src/core/services/navigator.ts
+++ b/src/core/services/navigator.ts
@@ -31,7 +31,6 @@ import { CoreApp } from './app';
 import { CoreSitePlugins } from '@features/siteplugins/services/siteplugins';
 import { CoreError } from '@classes/errors/error';
 import { CoreMainMenuDelegate } from '@features/mainmenu/services/mainmenu-delegate';
-import { CoreMainMenuHomeHandlerService } from '@features/mainmenu/services/handlers/mainmenu';
 
 /**
  * Redirect payload.
@@ -560,11 +559,11 @@ export class CoreNavigatorService {
             return this.navigate(`/main/${path}`, options);
         }
 
-        // Open the path within the home tab.
-        return this.navigate(`/main/${CoreMainMenuHomeHandlerService.PAGE_NAME}`, {
+        // Open the path within in main menu.
+        return this.navigate('/main', {
             ...options,
             params: {
-                redirectPath: `/main/${CoreMainMenuHomeHandlerService.PAGE_NAME}/${path}`,
+                redirectPath: path,
                 redirectOptions: options.params || options.nextNavigation ? options : undefined,
             } as CoreRedirectPayload,
         });

From 76e682bb538414524c41b1e266b3cb8e430e3c1a Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 28 Jan 2022 15:19:01 +0100
Subject: [PATCH 0421/1008] MOBILE-3833 core: Fix deep links to logged out
 sites

---
 .../services/contentlinks-delegate.ts         | 23 +++++
 .../login/pages/reconnect/reconnect.ts        | 25 +++---
 .../features/login/services/login-helper.ts   | 83 ++++++++-----------
 .../mainmenu/classes/deep-link-manager.ts     | 43 +++++-----
 src/core/guards/redirect.ts                   | 20 +++--
 src/core/services/app.ts                      | 37 +++------
 src/core/services/navigator.ts                | 23 ++---
 src/core/services/sites.ts                    | 35 ++++++--
 src/core/services/tests/navigator.test.ts     |  6 +-
 src/core/services/update-manager.ts           |  9 +-
 src/core/services/urlschemes.ts               | 32 +++----
 src/core/singletons/events.ts                 |  7 +-
 upgrade.txt                                   |  1 +
 13 files changed, 184 insertions(+), 160 deletions(-)

diff --git a/src/core/features/contentlinks/services/contentlinks-delegate.ts b/src/core/features/contentlinks/services/contentlinks-delegate.ts
index eeaab8bbc..e8c36920e 100644
--- a/src/core/features/contentlinks/services/contentlinks-delegate.ts
+++ b/src/core/features/contentlinks/services/contentlinks-delegate.ts
@@ -191,6 +191,29 @@ export class CoreContentLinksDelegateService {
                         action.message = action.message || 'core.view';
                         action.icon = action.icon || 'fas-eye';
                         action.sites = action.sites || siteIds;
+
+                        // Wrap the action function in our own function to treat logged out sites.
+                        const actionFunction = action.action;
+                        action.action = async (siteId) => {
+                            const site = await CoreSites.getSite(siteId);
+
+                            if (!site.isLoggedOut()) {
+                                // Call the action now.
+                                return actionFunction(siteId);
+                            }
+
+                            // Site is logged out, authenticate first before treating the URL.
+                            const willReload = await CoreSites.logoutForRedirect(siteId, {
+                                urlToOpen: url,
+                            });
+
+                            if (!willReload) {
+                                // Load the site with the redirect data.
+                                await CoreSites.loadSite(siteId, {
+                                    urlToOpen: url,
+                                });
+                            }
+                        };
                     });
 
                     // Add them to the list.
diff --git a/src/core/features/login/pages/reconnect/reconnect.ts b/src/core/features/login/pages/reconnect/reconnect.ts
index 4101ed7d7..0a884a552 100644
--- a/src/core/features/login/pages/reconnect/reconnect.ts
+++ b/src/core/features/login/pages/reconnect/reconnect.ts
@@ -23,7 +23,7 @@ import { CoreLoginHelper } from '@features/login/services/login-helper';
 import { CoreSite, CoreSiteIdentityProvider, CoreSitePublicConfigResponse } from '@classes/site';
 import { CoreEvents } from '@singletons/events';
 import { CoreError } from '@classes/errors/error';
-import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
+import { CoreNavigator, CoreRedirectPayload } from '@services/navigator';
 import { CoreForms } from '@singletons/form';
 
 /**
@@ -53,11 +53,10 @@ export class CoreLoginReconnectPage implements OnInit, OnDestroy {
     siteId!: string;
     showScanQR = false;
 
-    protected page?: string;
-    protected pageOptions?: CoreNavigationOptions;
     protected siteConfig?: CoreSitePublicConfigResponse;
     protected viewLeft = false;
     protected eventThrown = false;
+    protected redirectData?: CoreRedirectPayload;
 
     constructor(
         protected fb: FormBuilder,
@@ -77,8 +76,15 @@ export class CoreLoginReconnectPage implements OnInit, OnDestroy {
         try {
             this.siteId = CoreNavigator.getRequiredRouteParam<string>('siteId');
 
-            this.page = CoreNavigator.getRouteParam('pageName');
-            this.pageOptions = CoreNavigator.getRouteParam('pageOptions');
+            const redirectPath = CoreNavigator.getRouteParam('redirectPath');
+            const urlToOpen = CoreNavigator.getRouteParam('urlToOpen');
+            if (redirectPath || urlToOpen) {
+                this.redirectData = {
+                    redirectPath,
+                    redirectOptions: CoreNavigator.getRouteParam('redirectOptions'),
+                    urlToOpen,
+                };
+            }
 
             const site = await CoreSites.getSite(this.siteId);
 
@@ -208,9 +214,9 @@ export class CoreLoginReconnectPage implements OnInit, OnDestroy {
             this.credForm.controls['password'].reset();
 
             // Go to the site initial page.
-            this.page
-                ? await CoreNavigator.navigateToSitePath(this.page, this.pageOptions)
-                : await CoreNavigator.navigateToSiteHome();
+            await CoreNavigator.navigateToSiteHome({
+                params: this.redirectData,
+            });
         } catch (error) {
             CoreLoginHelper.treatUserTokenError(this.siteUrl, error, this.username, password);
 
@@ -242,8 +248,7 @@ export class CoreLoginReconnectPage implements OnInit, OnDestroy {
             this.siteUrl,
             provider,
             this.siteConfig?.launchurl,
-            this.page,
-            this.pageOptions,
+            this.redirectData,
         );
 
         if (!result) {
diff --git a/src/core/features/login/services/login-helper.ts b/src/core/features/login/services/login-helper.ts
index ec3052968..7416cf7c4 100644
--- a/src/core/features/login/services/login-helper.ts
+++ b/src/core/features/login/services/login-helper.ts
@@ -32,10 +32,9 @@ import { CoreWSError } from '@classes/errors/wserror';
 import { makeSingleton, Translate } from '@singletons';
 import { CoreLogger } from '@singletons/logger';
 import { CoreUrl } from '@singletons/url';
-import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
+import { CoreNavigator, CoreRedirectPayload } from '@services/navigator';
 import { CoreCanceledError } from '@classes/errors/cancelederror';
 import { CoreCustomURLSchemes } from '@services/urlschemes';
-import { CoreSitePlugins } from '@features/siteplugins/services/siteplugins';
 import { CorePushNotifications } from '@features/pushnotifications/services/pushnotifications';
 
 /**
@@ -132,6 +131,7 @@ export class CoreLoginHelperProvider {
      * @param typeOfLogin CoreConstants.LOGIN_SSO_CODE or CoreConstants.LOGIN_SSO_INAPP_CODE.
      * @param service The service to use. If not defined, core service will be used.
      * @param launchUrl The URL to open for SSO. If not defined, default tool mobile launch URL will be used.
+     * @param redirectData Data of the path/url to open once authenticated. If not defined, site initial page.
      * @return Promise resolved when done or if user cancelled.
      */
     async confirmAndOpenBrowserForSSOLogin(
@@ -139,6 +139,7 @@ export class CoreLoginHelperProvider {
         typeOfLogin: number,
         service?: string,
         launchUrl?: string,
+        redirectData?: CoreRedirectPayload,
     ): Promise<void> {
         // Show confirm only if it's needed. Treat "false" (string) as false to prevent typing errors.
         const showConfirmation = this.shouldShowSSOConfirm(typeOfLogin);
@@ -152,7 +153,7 @@ export class CoreLoginHelperProvider {
             }
         }
 
-        this.openBrowserForSSOLogin(siteUrl, typeOfLogin, service, launchUrl);
+        this.openBrowserForSSOLogin(siteUrl, typeOfLogin, service, launchUrl, redirectData);
     }
 
     /**
@@ -414,17 +415,14 @@ export class CoreLoginHelperProvider {
         let params: Params = { openAddSite: true , showKeyboard };
 
         if (CoreSites.isLoggedIn()) {
+            const willReload = await CoreSites.logoutForRedirect(CoreConstants.NO_SITE_ID, {
+                redirectPath: path,
+                redirectOptions: { params },
+            });
 
-            if (CoreSitePlugins.hasSitePluginsLoaded) {
-                // The site has site plugins so the app will be restarted. Store the data and logout.
-                CoreApp.storeRedirect(CoreConstants.NO_SITE_ID, path, { params });
-
-                await CoreSites.logout();
-
+            if (willReload) {
                 return;
             }
-
-            await CoreSites.logout();
         } else {
             [path, params] = this.getAddSiteRouteInfo(showKeyboard);
         }
@@ -477,7 +475,7 @@ export class CoreLoginHelperProvider {
     async goToSiteInitialPage(navCtrlUnused?: unknown, page?: string, params?: any, options?: any, url?: string): Promise<void> {
         await CoreNavigator.navigateToSiteHome({
             ...options,
-            params: {
+            params: <CoreRedirectPayload> {
                 redirectPath: page,
                 redirectOptions: { params },
                 urlToOpen: url,
@@ -564,23 +562,19 @@ export class CoreLoginHelperProvider {
     }
 
     /**
-     * Check if current site is logged out, triggering mmCoreEventSessionExpired if it is.
+     * Check if current site is logged out, triggering session expired event if it is.
      *
-     * @param pageName Name of the page to go once authenticated if logged out. If not defined, site initial page.
-     * @param options Options of the page to go once authenticated if logged out.
+     * @param redirectData Data of the path/url to open once authenticated if logged out. If not defined, site initial page.
      * @return True if user is logged out, false otherwise.
      */
-    isSiteLoggedOut(pageName?: string, options?: CoreNavigationOptions): boolean {
+    isSiteLoggedOut(redirectData?: CoreRedirectPayload): boolean {
         const site = CoreSites.getCurrentSite();
         if (!site) {
             return false;
         }
 
         if (site.isLoggedOut()) {
-            CoreEvents.trigger(CoreEvents.SESSION_EXPIRED, {
-                pageName,
-                options,
-            }, site.getId());
+            CoreEvents.trigger(CoreEvents.SESSION_EXPIRED, redirectData || {}, site.getId());
 
             return true;
         }
@@ -652,16 +646,14 @@ export class CoreLoginHelperProvider {
      * @param siteUrl URL of the site where the login will be performed.
      * @param provider The identity provider.
      * @param launchUrl The URL to open for SSO. If not defined, tool/mobile launch URL will be used.
-     * @param pageName Name of the page to go once authenticated. If not defined, site initial page.
-     * @param pageOptions Options of the page to go once authenticated.
+     * @param redirectData Data of the path/url to open once authenticated. If not defined, site initial page.
      * @return True if success, false if error.
      */
     openBrowserForOAuthLogin(
         siteUrl: string,
         provider: CoreSiteIdentityProvider,
         launchUrl?: string,
-        pageName?: string,
-        pageOptions?: CoreNavigationOptions,
+        redirectData?: CoreRedirectPayload,
     ): boolean {
         launchUrl = launchUrl || siteUrl + '/admin/tool/mobile/launch.php';
         if (!provider || !provider.url) {
@@ -674,7 +666,7 @@ export class CoreLoginHelperProvider {
             return false;
         }
 
-        const loginUrl = this.prepareForSSOLogin(siteUrl, undefined, launchUrl, pageName, pageOptions, {
+        const loginUrl = this.prepareForSSOLogin(siteUrl, undefined, launchUrl, redirectData, {
             oauthsso: params.id,
         });
 
@@ -692,18 +684,16 @@ export class CoreLoginHelperProvider {
      * @param typeOfLogin CoreConstants.LOGIN_SSO_CODE or CoreConstants.LOGIN_SSO_INAPP_CODE.
      * @param service The service to use. If not defined, core service will be used.
      * @param launchUrl The URL to open for SSO. If not defined, default tool mobile launch URL will be used.
-     * @param pageName Name of the page to go once authenticated. If not defined, site initial page.
-     * @param pageOptions Options of the state to go once authenticated.
+     * @param redirectData Data of the path/url to open once authenticated. If not defined, site initial page.
      */
     openBrowserForSSOLogin(
         siteUrl: string,
         typeOfLogin: number,
         service?: string,
         launchUrl?: string,
-        pageName?: string,
-        pageOptions?: CoreNavigationOptions,
+        redirectData?: CoreRedirectPayload,
     ): void {
-        const loginUrl = this.prepareForSSOLogin(siteUrl, service, launchUrl, pageName, pageOptions);
+        const loginUrl = this.prepareForSSOLogin(siteUrl, service, launchUrl, redirectData);
 
         if (this.isSSOEmbeddedBrowser(typeOfLogin)) {
             CoreUtils.openInApp(loginUrl, {
@@ -819,8 +809,7 @@ export class CoreLoginHelperProvider {
         siteUrl: string,
         service?: string,
         launchUrl?: string,
-        pageName?: string,
-        pageOptions?: CoreNavigationOptions,
+        redirectData: CoreRedirectPayload = {},
         urlParams?: CoreUrlParams,
     ): string {
 
@@ -842,8 +831,7 @@ export class CoreLoginHelperProvider {
         CoreConfig.set(CoreConstants.LOGIN_LAUNCH_DATA, JSON.stringify(<StoredLoginLaunchData> {
             siteUrl: siteUrl,
             passport: passport,
-            pageName: pageName || '',
-            pageOptions: pageOptions || {},
+            ...redirectData,
             ssoUrlParams: urlParams || {},
         }));
 
@@ -909,6 +897,11 @@ export class CoreLoginHelperProvider {
         }
 
         this.sessionExpiredCheckingSite[siteId || ''] = true;
+        const redirectData: CoreRedirectPayload = {
+            redirectPath: data.redirectPath,
+            redirectOptions: data.redirectOptions,
+            urlToOpen: data.urlToOpen,
+        };
 
         try {
             // Check authentication method.
@@ -930,8 +923,7 @@ export class CoreLoginHelperProvider {
                             result.code,
                             result.service,
                             result.config?.launchurl,
-                            data.pageName,
-                            data.options,
+                            redirectData,
                         );
                     } catch (error) {
                         // User cancelled, logout him.
@@ -964,8 +956,7 @@ export class CoreLoginHelperProvider {
                                     siteUrl,
                                     providerToUse,
                                     result.config?.launchurl,
-                                    data.pageName,
-                                    data.options,
+                                    redirectData,
                                 );
                             } catch (error) {
                                 // User cancelled, logout him.
@@ -987,8 +978,7 @@ export class CoreLoginHelperProvider {
                     await CoreUtils.ignoreErrors(CoreNavigator.navigate('/login/reconnect', {
                         params: {
                             siteId,
-                            pageName: data.pageName,
-                            pageOptions: data.options,
+                            ...redirectData,
                         },
                         reset: true,
                     }));
@@ -1213,8 +1203,9 @@ export class CoreLoginHelperProvider {
                 siteUrl: launchSiteURL,
                 token: params[1],
                 privateToken: params[2],
-                pageName: data.pageName,
-                pageOptions: data.pageOptions,
+                redirectPath: data.redirectPath,
+                redirectOptions: data.redirectOptions,
+                urlToOpen: data.urlToOpen,
                 ssoUrlParams: data.ssoUrlParams,
             };
         } else {
@@ -1443,12 +1434,10 @@ export type CoreAccountsList = {
 /**
  * Data related to a SSO authentication.
  */
-export interface CoreLoginSSOData {
+export type CoreLoginSSOData = CoreRedirectPayload & {
     siteUrl: string; // The site's URL.
     token?: string; // User's token.
     privateToken?: string; // User's private token.
-    pageName?: string; // Name of the page to go after authenticated.
-    pageOptions?: CoreNavigationOptions; // Options of the navigation to the page.
     ssoUrlParams?: CoreUrlParams; // Other params added to the login url.
 };
 
@@ -1531,11 +1520,9 @@ type ResendConfirmationEmailResult = {
     warnings?: CoreWSExternalWarning[];
 };
 
-type StoredLoginLaunchData = {
+type StoredLoginLaunchData = CoreRedirectPayload & {
     siteUrl: string;
     passport: number;
-    pageName: string;
-    pageOptions: CoreNavigationOptions;
     ssoUrlParams: CoreUrlParams;
 };
 
diff --git a/src/core/features/mainmenu/classes/deep-link-manager.ts b/src/core/features/mainmenu/classes/deep-link-manager.ts
index 6cd480eb6..5ba0bfbfa 100644
--- a/src/core/features/mainmenu/classes/deep-link-manager.ts
+++ b/src/core/features/mainmenu/classes/deep-link-manager.ts
@@ -12,11 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { CoreContentLinksDelegate } from '@features/contentlinks/services/contentlinks-delegate';
 import { CoreContentLinksHelper } from '@features/contentlinks/services/contentlinks-helper';
 import { CoreCourse } from '@features/course/services/course';
 import { CoreCourseHelper } from '@features/course/services/course-helper';
-import { CoreNavigator, CoreRedirectPayload } from '@services/navigator';
+import { CoreNavigationOptions, CoreNavigator, CoreRedirectPayload } from '@services/navigator';
 
 /**
  * A class to handle opening deep links in a main menu page. There are 2 type of deep links:
@@ -26,15 +25,15 @@ import { CoreNavigator, CoreRedirectPayload } from '@services/navigator';
 export class CoreMainMenuDeepLinkManager {
 
     protected pendingRedirect?: CoreRedirectPayload;
-    protected urlToOpen?: string;
 
     constructor() {
-        this.urlToOpen = CoreNavigator.getRouteParam('urlToOpen');
+        const urlToOpen = CoreNavigator.getRouteParam('urlToOpen');
         const redirectPath = CoreNavigator.getRouteParam('redirectPath');
-        if (redirectPath) {
+        if (urlToOpen || redirectPath) {
             this.pendingRedirect = {
                 redirectPath,
                 redirectOptions: CoreNavigator.getRouteParam('redirectOptions'),
+                urlToOpen,
             };
         }
     }
@@ -45,31 +44,35 @@ export class CoreMainMenuDeepLinkManager {
      * @return Whether there is a deep link to be treated.
      */
     hasDeepLinkToTreat(): boolean {
-        return !!this.urlToOpen || !!this.pendingRedirect;
+        return !!this.pendingRedirect?.urlToOpen || !!this.pendingRedirect?.redirectPath;
     }
 
     /**
      * Treat a deep link if there's any to treat.
      */
     treatLink(): void {
-        if (this.pendingRedirect) {
-            this.treatRedirect(this.pendingRedirect);
-        } else if (this.urlToOpen) {
-            this.treatUrlToOpen(this.urlToOpen);
+        if (!this.pendingRedirect) {
+            return;
+        }
+
+        if (this.pendingRedirect.redirectPath) {
+            this.treatPath(this.pendingRedirect.redirectPath, this.pendingRedirect.redirectOptions);
+        } else if (this.pendingRedirect.urlToOpen) {
+            this.treatUrlToOpen(this.pendingRedirect.urlToOpen);
         }
 
         delete this.pendingRedirect;
-        delete this.urlToOpen;
     }
 
     /**
-     * Treat a redirect.
+     * Open a path.
      *
-     * @param data Data received.
+     * @param path Path.
+     * @param navOptions Navigation options.
      */
-    protected treatRedirect(data: CoreRedirectPayload): void {
-        const params = data.redirectOptions?.params;
-        const coursePathMatches = data.redirectPath.match(/^course\/(\d+)\/?$/);
+    protected treatPath(path: string, navOptions: CoreNavigationOptions = {}): void {
+        const params = navOptions.params;
+        const coursePathMatches = path.match(/^course\/(\d+)\/?$/);
 
         if (coursePathMatches) {
             if (!params?.course) {
@@ -78,8 +81,8 @@ export class CoreMainMenuDeepLinkManager {
                 CoreCourse.openCourse(params.course, params);
             }
         } else {
-            CoreNavigator.navigateToSitePath(data.redirectPath, {
-                ...data.redirectOptions,
+            CoreNavigator.navigateToSitePath(path, {
+                ...navOptions,
                 preferCurrentTab: false,
             });
         }
@@ -91,9 +94,7 @@ export class CoreMainMenuDeepLinkManager {
      * @param url URL to open.
      */
     protected async treatUrlToOpen(url: string): Promise<void> {
-        const actions = await CoreContentLinksDelegate.getActionsFor(url, undefined);
-
-        const action = CoreContentLinksHelper.getFirstValidAction(actions);
+        const action = await CoreContentLinksHelper.getFirstValidActionFor(url);
         if (action?.sites?.[0]) {
             action.action(action.sites[0]);
         }
diff --git a/src/core/guards/redirect.ts b/src/core/guards/redirect.ts
index 38a1eb3d1..e8dc44e78 100644
--- a/src/core/guards/redirect.ts
+++ b/src/core/guards/redirect.ts
@@ -54,29 +54,31 @@ export class CoreRedirectGuard implements CanLoad, CanActivate {
 
         // Redirect to site path.
         if (redirect.siteId && redirect.siteId !== CoreConstants.NO_SITE_ID) {
+            const redirectData: CoreRedirectPayload = {
+                redirectPath: redirect.redirectPath,
+                redirectOptions: redirect.redirectOptions,
+                urlToOpen: redirect.urlToOpen,
+            };
+
             const loggedIn = await CoreSites.loadSite(
                 redirect.siteId,
-                redirect.page,
-                redirect.options,
+                redirectData,
             );
             const route = Router.parseUrl('/main');
 
-            route.queryParams = {
-                redirectPath: redirect.page,
-                redirectOptions: redirect.options,
-            } as CoreRedirectPayload;
+            route.queryParams = redirectData;
 
             return loggedIn ? route : true;
         }
 
         // Abort redirect.
-        if (!redirect.page) {
+        if (!redirect.redirectPath) {
             return true;
         }
 
         // Redirect to non-site path.
-        const route = Router.parseUrl(redirect.page);
-        route.queryParams = redirect.options?.params || {};
+        const route = Router.parseUrl(redirect.redirectPath);
+        route.queryParams = redirect.redirectOptions?.params || {};
 
         return route;
     }
diff --git a/src/core/services/app.ts b/src/core/services/app.ts
index cbbdeb207..8edb6bd62 100644
--- a/src/core/services/app.ts
+++ b/src/core/services/app.ts
@@ -24,7 +24,7 @@ import { CoreLogger } from '@singletons/logger';
 import { CoreColors } from '@singletons/colors';
 import { DBNAME, SCHEMA_VERSIONS_TABLE_NAME, SCHEMA_VERSIONS_TABLE_SCHEMA, SchemaVersionsDBEntry } from '@services/database/app';
 import { CoreObject } from '@singletons/object';
-import { CoreNavigationOptions } from './navigator';
+import { CoreRedirectPayload } from './navigator';
 
 /**
  * Object responsible of managing schema versions.
@@ -593,16 +593,18 @@ export class CoreAppProvider {
      * Store redirect params.
      *
      * @param siteId Site ID.
-     * @param page Page to go.
-     * @param options Navigation options.
+     * @param redirectData Redirect data.
      */
-    storeRedirect(siteId: string, page: string, options: CoreNavigationOptions): void {
+    storeRedirect(siteId: string, redirectData: CoreRedirectPayload = {}): void {
+        if (!redirectData.redirectPath && !redirectData.urlToOpen) {
+            return;
+        }
+
         try {
             const redirect: CoreRedirectData = {
                 siteId,
-                page,
-                options,
                 timemodified: Date.now(),
+                ...redirectData,
             };
 
             localStorage.setItem('CoreRedirect', JSON.stringify(redirect));
@@ -691,26 +693,9 @@ export const CoreApp = makeSingleton(CoreAppProvider);
 /**
  * Data stored for a redirect to another page/site.
  */
-export type CoreRedirectData = {
-    /**
-     * ID of the site to load.
-     */
-    siteId?: string;
-
-    /**
-     * Path of the page to redirect to.
-     */
-    page?: string;
-
-    /**
-     * Options of the navigation.
-     */
-    options?: CoreNavigationOptions;
-
-    /**
-     * Timestamp when this redirect was last modified.
-     */
-    timemodified?: number;
+export type CoreRedirectData = CoreRedirectPayload & {
+    siteId?: string; // ID of the site to load.
+    timemodified?: number; // Timestamp when this redirect was last modified.
 };
 
 /**
diff --git a/src/core/services/navigator.ts b/src/core/services/navigator.ts
index 5438abeca..88e012094 100644
--- a/src/core/services/navigator.ts
+++ b/src/core/services/navigator.ts
@@ -28,7 +28,6 @@ import { CoreTextUtils } from '@services/utils/text';
 import { makeSingleton, NavController, Router } from '@singletons';
 import { CoreScreen } from './screen';
 import { CoreApp } from './app';
-import { CoreSitePlugins } from '@features/siteplugins/services/siteplugins';
 import { CoreError } from '@classes/errors/error';
 import { CoreMainMenuDelegate } from '@features/mainmenu/services/mainmenu-delegate';
 
@@ -36,8 +35,9 @@ import { CoreMainMenuDelegate } from '@features/mainmenu/services/mainmenu-deleg
  * Redirect payload.
  */
 export type CoreRedirectPayload = {
-    redirectPath: string;
-    redirectOptions?: CoreNavigationOptions;
+    redirectPath?: string; // Path of the page to redirect to.
+    redirectOptions?: CoreNavigationOptions; // Options of the navigation using redirectPath.
+    urlToOpen?: string; // URL to open instead of a page + options.
 };
 
 /**
@@ -207,16 +207,14 @@ export class CoreNavigatorService {
 
         // If we are logged into a different site, log out first.
         if (CoreSites.isLoggedIn() && CoreSites.getCurrentSiteId() !== siteId) {
-            if (CoreSitePlugins.hasSitePluginsLoaded) {
-                // The site has site plugins so the app will be restarted. Store the data and logout.
-                CoreApp.storeRedirect(siteId, path, options || {});
-
-                await CoreSites.logout();
+            const willReload = await CoreSites.logoutForRedirect(siteId, {
+                redirectPath: path,
+                redirectOptions: options || {},
+            });
 
+            if (willReload) {
                 return true;
             }
-
-            await CoreSites.logout();
         }
 
         // If the path doesn't belong to a site, call standard navigation.
@@ -232,7 +230,10 @@ export class CoreNavigatorService {
             const modal = await CoreDomUtils.showModalLoading();
 
             try {
-                const loggedIn = await CoreSites.loadSite(siteId, path, options.params);
+                const loggedIn = await CoreSites.loadSite(siteId, {
+                    redirectPath: path,
+                    redirectOptions: options,
+                });
 
                 if (!loggedIn) {
                     // User has been redirected to the login page and will be redirected to the site path after login.
diff --git a/src/core/services/sites.ts b/src/core/services/sites.ts
index 032ebcf23..6c5c5fca9 100644
--- a/src/core/services/sites.ts
+++ b/src/core/services/sites.ts
@@ -49,13 +49,14 @@ import {
 } from '@services/database/sites';
 import { CoreArray } from '../singletons/array';
 import { CoreNetworkError } from '@classes/errors/network-error';
-import { CoreNavigationOptions } from './navigator';
+import { CoreRedirectPayload } from './navigator';
 import { CoreSitesFactory } from './sites-factory';
 import { CoreText } from '@singletons/text';
 import { CoreLoginHelper } from '@features/login/services/login-helper';
 import { CoreErrorWithTitle } from '@classes/errors/errorwithtitle';
 import { CoreAjaxError } from '@classes/errors/ajaxerror';
 import { CoreAjaxWSError } from '@classes/errors/ajaxwserror';
+import { CoreSitePlugins } from '@features/siteplugins/services/siteplugins';
 
 export const CORE_SITE_SCHEMAS = new InjectionToken<CoreSiteSchema[]>('CORE_SITE_SCHEMAS');
 
@@ -781,11 +782,10 @@ export class CoreSitesProvider {
      * Login a user to a site from the list of sites.
      *
      * @param siteId ID of the site to load.
-     * @param pageName Name of the page to go once authenticated if logged out. If not defined, site initial page.
-     * @param pageOptions Options of the navigation to pageName.
+     * @param redirectData Data of the path/url to open once authenticated if logged out. If not defined, site initial page.
      * @return Promise resolved with true if site is loaded, resolved with false if cannot login.
      */
-    async loadSite(siteId: string, pageName?: string, pageOptions?: CoreNavigationOptions): Promise<boolean> {
+    async loadSite(siteId: string, redirectData?: CoreRedirectPayload): Promise<boolean> {
         this.logger.debug(`Load site ${siteId}`);
 
         const site = await this.getSite(siteId);
@@ -799,10 +799,7 @@ export class CoreSitesProvider {
 
         if (site.isLoggedOut()) {
             // Logged out, trigger session expired event and stop.
-            CoreEvents.trigger(CoreEvents.SESSION_EXPIRED, {
-                pageName,
-                options: pageOptions,
-            }, site.getId());
+            CoreEvents.trigger(CoreEvents.SESSION_EXPIRED, redirectData || {}, site.getId());
 
             return false;
         }
@@ -1208,6 +1205,28 @@ export class CoreSitesProvider {
         CoreEvents.trigger(CoreEvents.LOGOUT, {}, siteId);
     }
 
+    /**
+     * Logout the user if authenticated to open a page/url in another site.
+     *
+     * @param siteId Site that will be opened after logout.
+     * @param redirectData Page/url to open after logout.
+     * @return Promise resolved with boolean: true if app will be reloaded after logout.
+     */
+    async logoutForRedirect(siteId: string, redirectData: CoreRedirectPayload): Promise<boolean> {
+        if (!this.currentSite) {
+            return false;
+        }
+
+        if (CoreSitePlugins.hasSitePluginsLoaded) {
+            // The site has site plugins so the app will be restarted. Store the data and logout.
+            CoreApp.storeRedirect(siteId, redirectData);
+        }
+
+        await CoreSites.logout();
+
+        return CoreSitePlugins.hasSitePluginsLoaded;
+    }
+
     /**
      * Restores the session to the previous one so the user doesn't has to login everytime the app is started.
      *
diff --git a/src/core/services/tests/navigator.test.ts b/src/core/services/tests/navigator.test.ts
index 694ba3f78..7b995a102 100644
--- a/src/core/services/tests/navigator.test.ts
+++ b/src/core/services/tests/navigator.test.ts
@@ -108,13 +108,13 @@ describe('CoreNavigator', () => {
         expect(navControllerMock.navigateForward).toHaveBeenCalledWith(['/main/users/user/42'], {});
     });
 
-    it('navigates to site paths using the default tab', async () => {
+    it('navigates to site paths using the main page', async () => {
         const success = await navigator.navigateToSitePath('/user/42');
 
         expect(success).toBe(true);
-        expect(navControllerMock.navigateForward).toHaveBeenCalledWith(['/main/home'], {
+        expect(navControllerMock.navigateForward).toHaveBeenCalledWith(['/main'], {
             queryParams: {
-                redirectPath: '/main/home/user/42',
+                redirectPath: 'user/42',
             },
         });
     });
diff --git a/src/core/services/update-manager.ts b/src/core/services/update-manager.ts
index 38ad5d2b7..e73e50fd6 100644
--- a/src/core/services/update-manager.ts
+++ b/src/core/services/update-manager.ts
@@ -111,9 +111,12 @@ export class CoreUpdateManagerProvider {
         await CoreSites.removeStoredCurrentSite();
 
         // Tell the app to open add site so the user can add the new site.
-        CoreApp.storeRedirect(CoreConstants.NO_SITE_ID, '/login/sites', {
-            params: {
-                openAddSite: true,
+        CoreApp.storeRedirect(CoreConstants.NO_SITE_ID, {
+            redirectPath: '/login/sites',
+            redirectOptions: {
+                params: {
+                    openAddSite: true,
+                },
             },
         });
     }
diff --git a/src/core/services/urlschemes.ts b/src/core/services/urlschemes.ts
index f1b6aaa36..9ae998d07 100644
--- a/src/core/services/urlschemes.ts
+++ b/src/core/services/urlschemes.ts
@@ -19,12 +19,11 @@ import { CoreWSError } from '@classes/errors/wserror';
 import { CoreContentLinksDelegate } from '@features/contentlinks/services/contentlinks-delegate';
 import { CoreContentLinksHelper } from '@features/contentlinks/services/contentlinks-helper';
 import { CoreLoginHelper, CoreLoginSSOData } from '@features/login/services/login-helper';
-import { CoreSitePlugins } from '@features/siteplugins/services/siteplugins';
 import { ApplicationInit, makeSingleton, Translate } from '@singletons';
 import { CoreLogger } from '@singletons/logger';
 import { CoreConstants } from '../constants';
 import { CoreApp } from './app';
-import { CoreNavigator } from './navigator';
+import { CoreNavigator, CoreRedirectPayload } from './navigator';
 import { CoreSiteCheckResponse, CoreSites } from './sites';
 import { CoreDomUtils } from './utils/dom';
 import { CoreTextErrorObject, CoreTextUtils } from './utils/text';
@@ -151,12 +150,13 @@ export class CoreCustomURLSchemesProvider {
 
             if (data.isSSOToken || (data.isAuthenticationURL && siteId && CoreSites.getCurrentSiteId() == siteId)) {
                 // Site created and authenticated, open the page to go.
-                if (data.pageName) {
-                    // Page defined, go to that page instead of site initial page.
-                    CoreNavigator.navigateToSitePath(data.pageName, data.pageOptions);
-                } else {
-                    CoreNavigator.navigateToSiteHome();
-                }
+                CoreNavigator.navigateToSiteHome({
+                    params: <CoreRedirectPayload> {
+                        redirectPath: data.redirectPath,
+                        redirectOptions: data.redirectOptions,
+                        urlToOpen: data.urlToOpen,
+                    },
+                });
 
                 return;
             }
@@ -396,20 +396,20 @@ export class CoreCustomURLSchemesProvider {
             urlToOpen: data.redirect,
             siteConfig: checkResponse.config,
         };
-        let hasSitePluginsLoaded = false;
 
         if (CoreSites.isLoggedIn()) {
             // Ask the user before changing site.
             await CoreDomUtils.showConfirm(Translate.instant('core.contentlinks.confirmurlothersite'));
 
             if (!ssoNeeded) {
-                hasSitePluginsLoaded = CoreSitePlugins.hasSitePluginsLoaded;
-                if (hasSitePluginsLoaded) {
-                    // Store the redirect since logout will restart the app.
-                    CoreApp.storeRedirect(CoreConstants.NO_SITE_ID, '/login/credentials', { params: pageParams });
-                }
+                const willReload = await CoreSites.logoutForRedirect(CoreConstants.NO_SITE_ID, {
+                    redirectPath: '/login/credentials',
+                    redirectOptions: { params: pageParams },
+                });
 
-                await CoreSites.logout();
+                if (willReload) {
+                    return;
+                }
             }
         }
 
@@ -420,7 +420,7 @@ export class CoreCustomURLSchemesProvider {
                 checkResponse.service,
                 checkResponse.config?.launchurl,
             );
-        } else if (!hasSitePluginsLoaded) {
+        } else {
             await CoreNavigator.navigateToLoginCredentials(pageParams);
         }
     }
diff --git a/src/core/singletons/events.ts b/src/core/singletons/events.ts
index 288897bbd..d66a334e2 100644
--- a/src/core/singletons/events.ts
+++ b/src/core/singletons/events.ts
@@ -17,7 +17,7 @@ import { Subject } from 'rxjs';
 import { CoreLogger } from '@singletons/logger';
 import { CoreSite, CoreSiteInfoResponse, CoreSitePublicConfigResponse } from '@classes/site';
 import { CoreFilepoolComponentFileEventData } from '@services/filepool';
-import { CoreNavigationOptions } from '@services/navigator';
+import { CoreRedirectPayload } from '@services/navigator';
 import { CoreCourseModuleCompletionData } from '@features/course/services/course-helper';
 import { CoreScreenOrientation } from '@services/screen';
 import { CoreCourseCompletionType } from '@features/course/services/course';
@@ -270,10 +270,7 @@ export type CoreEventSiteAddedData = CoreSiteInfoResponse;
 /**
  * Data passed to SESSION_EXPIRED event.
  */
-export type CoreEventSessionExpiredData = {
-    pageName?: string;
-    options?: CoreNavigationOptions;
-};
+export type CoreEventSessionExpiredData = CoreRedirectPayload;
 
 /**
  * Data passed to CORE_LOADING_CHANGED event.
diff --git a/upgrade.txt b/upgrade.txt
index 8b8313511..a7549b1c3 100644
--- a/upgrade.txt
+++ b/upgrade.txt
@@ -17,6 +17,7 @@ information provided here is intended especially for developers.
     Some user handler's functions have also changed to accept context + contextId instead of a courseId: isEnabledForUser, getDisplayData, action.
 - CoreCourseHelperProvider.openCourse parameters changed, now it admits CoreNavigationOptions + siteId on the same object that includes Params passed to page.
 - displaySectionSelector has been deprecated on CoreCourseFormatHandler, use displayCourseIndex instead.
+- Most of the functions or callbacks that handle redirects/deeplinks have been modified to accept an object instead of just path + options. E.g.: CoreLoginHelper.isSiteLoggedOut, CoreLoginHelper.openBrowserForSSOLogin, CoreLoginHelper.openBrowserForOAuthLogin, CoreLoginHelper.prepareForSSOLogin, CoreApp.storeRedirect, CoreSites.loadSite.
 
 === 3.9.5 ===
 

From 45b2cdec47b07b0e7f759df1ed7a351a79bf118d Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 31 Jan 2022 09:41:41 +0100
Subject: [PATCH 0422/1008] MOBILE-3932 resource: Fix message displayed when
 outdated and offline

---
 src/addons/mod/resource/components/index/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/addons/mod/resource/components/index/index.ts b/src/addons/mod/resource/components/index/index.ts
index a5d38511a..897711e19 100644
--- a/src/addons/mod/resource/components/index/index.ts
+++ b/src/addons/mod/resource/components/index/index.ts
@@ -208,7 +208,7 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
                     // Warn the user that the file isn't updated.
                     const alert = await CoreDomUtils.showAlert(
                         undefined,
-                        Translate.instant('addon.mod_resource.resourcestatusoutdated'),
+                        Translate.instant('addon.mod_resource.resourcestatusoutdatedconfirm'),
                     );
 
                     await alert.onWillDismiss();

From 29689896a68f1f92a23b25ba49f8daa4078e6339 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Mon, 31 Jan 2022 10:15:57 +0100
Subject: [PATCH 0423/1008] MOBILE-3833 behat: Fix performance tests

---
 .github/workflows/performance.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml
index d15a45abb..2652fda51 100644
--- a/.github/workflows/performance.yml
+++ b/.github/workflows/performance.yml
@@ -33,13 +33,13 @@ jobs:
       run: |
         export MOODLE_DOCKER_WWWROOT=$GITHUB_WORKSPACE/moodle
         cp $GITHUB_WORKSPACE/moodle-docker/config.docker-template.php $GITHUB_WORKSPACE/moodle/config.php
-        sed -i "58i\        'capabilities' => [" $GITHUB_WORKSPACE/moodle/config.php
-        sed -i "59i\            'extra_capabilities' => [" $GITHUB_WORKSPACE/moodle/config.php
-        sed -i "60i\                'goog:loggingPrefs' => ['performance' => 'ALL']," $GITHUB_WORKSPACE/moodle/config.php
-        sed -i "61i\                'chromeOptions' => ['perfLoggingPrefs' => ['traceCategories' => 'devtools.timeline']]," $GITHUB_WORKSPACE/moodle/config.php
-        sed -i "62i\            ]," $GITHUB_WORKSPACE/moodle/config.php
-        sed -i "63i\        ]," $GITHUB_WORKSPACE/moodle/config.php
-        sed -i "75i\$CFG->behat_ionic_wwwroot = 'http://moodleapp';" $GITHUB_WORKSPACE/moodle/config.php
+        sed -i "59i\        'capabilities' => [" $GITHUB_WORKSPACE/moodle/config.php
+        sed -i "60i\            'extra_capabilities' => [" $GITHUB_WORKSPACE/moodle/config.php
+        sed -i "61i\                'goog:loggingPrefs' => ['performance' => 'ALL']," $GITHUB_WORKSPACE/moodle/config.php
+        sed -i "62i\                'chromeOptions' => ['perfLoggingPrefs' => ['traceCategories' => 'devtools.timeline']]," $GITHUB_WORKSPACE/moodle/config.php
+        sed -i "63i\            ]," $GITHUB_WORKSPACE/moodle/config.php
+        sed -i "64i\        ]," $GITHUB_WORKSPACE/moodle/config.php
+        sed -i "76i\$CFG->behat_ionic_wwwroot = 'http://moodleapp';" $GITHUB_WORKSPACE/moodle/config.php
         $GITHUB_WORKSPACE/moodle-docker/bin/moodle-docker-compose pull
         $GITHUB_WORKSPACE/moodle-docker/bin/moodle-docker-compose up -d
         $GITHUB_WORKSPACE/moodle-docker/bin/moodle-docker-wait-for-db

From bb42e9b94dc5ac71acde7de394091ec3805ab9a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 31 Jan 2022 13:38:13 +0100
Subject: [PATCH 0424/1008] MOBILE-3923 starredcourses: Use block WS when
 obtaining course list

---
 .../components/starredcourses/starredcourses.ts   | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/addons/block/starredcourses/components/starredcourses/starredcourses.ts b/src/addons/block/starredcourses/components/starredcourses/starredcourses.ts
index 8e58120ad..8ec6cfaf9 100644
--- a/src/addons/block/starredcourses/components/starredcourses/starredcourses.ts
+++ b/src/addons/block/starredcourses/components/starredcourses/starredcourses.ts
@@ -18,7 +18,6 @@ import { CoreSites } from '@services/sites';
 import { CoreCoursesProvider, CoreCoursesMyCoursesUpdatedEventData, CoreCourses } from '@features/courses/services/courses';
 import {
     CoreCourseSearchedDataWithExtraInfoAndOptions,
-    CoreCoursesHelper,
     CoreEnrolledCourseDataWithOptions,
 } from '@features/courses/services/courses-helper';
 import { CoreCourseOptionsDelegate } from '@features/course/services/course-options-delegate';
@@ -44,7 +43,7 @@ export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent im
     downloadCourseEnabled = false;
     scrollElementId!: string;
 
-    protected site!: CoreSite;
+    protected site: CoreSite;
     protected isDestroyed = false;
     protected coursesObserver?: CoreEventObserver;
     protected updateSiteObserver?: CoreEventObserver;
@@ -103,12 +102,8 @@ export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent im
     protected async invalidateCourses(courseIds: number[]): Promise<void> {
         const promises: Promise<void>[] = [];
 
-        const invalidateCoursePromise = this.site.isVersionGreaterEqualThan('4.0')
-            ? CoreCourses.invalidateUserCourses()
-            : AddonBlockStarredCourses.invalidateStarredCourses();
-
         // Invalidate course completion data.
-        promises.push(invalidateCoursePromise.finally(() =>
+        promises.push(AddonBlockStarredCourses.invalidateStarredCourses().finally(() =>
             CoreUtils.allPromises(courseIds.map((courseId) =>
                 AddonCourseCompletion.invalidateCourseCompletion(courseId)))));
 
@@ -131,12 +126,6 @@ export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent im
         const showCategories = this.block.configsRecord && this.block.configsRecord.displaycategories &&
             this.block.configsRecord.displaycategories.value == '1';
 
-        if (this.site.isVersionGreaterEqualThan('4.0')) {
-            this.courses = await CoreCoursesHelper.getUserCoursesWithOptions('timemodified', 0, 'isfavourite', showCategories);
-
-            return;
-        }
-
         // Timemodified not present, use the block WS to retrieve the info.
         const starredCourses = await AddonBlockStarredCourses.getStarredCourses();
 

From 5e29e65325d1ff72450564a9adbf58bf24331229 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 31 Jan 2022 14:11:51 +0100
Subject: [PATCH 0425/1008] MOBILE-3915 completion: Fix completion event
 listener conditions

---
 .../module-completion-legacy/module-completion-legacy.ts        | 2 +-
 .../module-manual-completion/module-manual-completion.ts        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/features/course/components/module-completion-legacy/module-completion-legacy.ts b/src/core/features/course/components/module-completion-legacy/module-completion-legacy.ts
index 023967422..3f10eefa4 100644
--- a/src/core/features/course/components/module-completion-legacy/module-completion-legacy.ts
+++ b/src/core/features/course/components/module-completion-legacy/module-completion-legacy.ts
@@ -53,7 +53,7 @@ export class CoreCourseModuleCompletionLegacyComponent extends CoreCourseModuleC
      */
     ngOnInit(): void {
         this.completionObserver = CoreEvents.on(CoreEvents.COMPLETION_CHANGED, (data) => {
-            if (!this.completion || this.completion.cmid != data.completion.cmid && data.type != CoreCourseCompletionType.MANUAL) {
+            if (!this.completion || this.completion.cmid != data.completion.cmid || data.type != CoreCourseCompletionType.MANUAL) {
                 return;
             }
 
diff --git a/src/core/features/course/components/module-manual-completion/module-manual-completion.ts b/src/core/features/course/components/module-manual-completion/module-manual-completion.ts
index 926349adf..6a21680b7 100644
--- a/src/core/features/course/components/module-manual-completion/module-manual-completion.ts
+++ b/src/core/features/course/components/module-manual-completion/module-manual-completion.ts
@@ -42,7 +42,7 @@ export class CoreCourseModuleManualCompletionComponent implements OnInit, OnChan
      */
     ngOnInit(): void {
         this.completionObserver = CoreEvents.on(CoreEvents.COMPLETION_CHANGED, (data) => {
-            if (!this.completion || this.completion.cmid != data.completion.cmid && data.type != CoreCourseCompletionType.MANUAL) {
+            if (!this.completion || this.completion.cmid != data.completion.cmid || data.type != CoreCourseCompletionType.MANUAL) {
                 return;
             }
 

From 7971e71e57a2088dfbdb9b3809baace0a4bdb1f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 31 Jan 2022 14:31:17 +0100
Subject: [PATCH 0426/1008] MOBILE-3915 course: Update course progress when
 completion changes

---
 .../course/components/format/format.ts        | 62 +------------------
 src/core/features/course/pages/index/index.ts | 39 ++++++++++--
 2 files changed, 36 insertions(+), 65 deletions(-)

diff --git a/src/core/features/course/components/format/format.ts b/src/core/features/course/components/format/format.ts
index 25a3cd218..99eb2cc86 100644
--- a/src/core/features/course/components/format/format.ts
+++ b/src/core/features/course/components/format/format.ts
@@ -19,8 +19,6 @@ import {
     OnChanges,
     OnDestroy,
     SimpleChange,
-    Output,
-    EventEmitter,
     ViewChildren,
     QueryList,
     Type,
@@ -31,12 +29,9 @@ import { CoreDynamicComponent } from '@components/dynamic-component/dynamic-comp
 import { CoreCourseAnyCourseData } from '@features/courses/services/courses';
 import {
     CoreCourse,
-    CoreCourseModuleCompletionStatus,
     CoreCourseProvider,
 } from '@features/course/services/course';
 import {
-    CoreCourseModuleData,
-    CoreCourseModuleCompletionData,
     CoreCourseSection,
 } from '@features/course/services/course-helper';
 import { CoreCourseFormatDelegate } from '@features/course/services/format-delegate';
@@ -56,7 +51,7 @@ import { CoreCourseModuleDelegate } from '@features/course/services/module-deleg
  *
  * Example usage:
  *
- * <core-course-format [course]="course" [sections]="sections" (completionChanged)="onCompletionChange()"></core-course-format>
+ * <core-course-format [course]="course" [sections]="sections"></core-course-format>
  */
 @Component({
     selector: 'core-course-format',
@@ -72,7 +67,6 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
     @Input() initialSectionId?: number; // The section to load first (by ID).
     @Input() initialSectionNumber?: number; // The section to load first (by number).
     @Input() moduleId?: number; // The module ID to scroll to. Must be inside the initial selected section.
-    @Output() completionChanged = new EventEmitter<CoreCourseModuleCompletionData>(); // Notify when any module completion changes.
 
     @ViewChildren(CoreDynamicComponent) dynamicComponents?: QueryList<CoreDynamicComponent>;
 
@@ -95,11 +89,9 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
     allSectionsId: number = CoreCourseProvider.ALL_SECTIONS_ID;
     stealthModulesSectionId: number = CoreCourseProvider.STEALTH_MODULES_SECTION_ID;
     loaded = false;
-    progress?: number;
     highlighted?: string;
 
     protected selectTabObserver?: CoreEventObserver;
-    protected completionObserver?: CoreEventObserver;
     protected lastCourseFormat?: string;
 
     constructor(
@@ -141,36 +133,6 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
             }
         });
 
-        // The completion of any of the modules have changed.
-        this.completionObserver = CoreEvents.on(CoreEvents.COMPLETION_CHANGED, (data) => {
-            if (data.completion.courseId != this.course.id) {
-                return;
-            }
-
-            // Emit a new event for other components.
-            this.completionChanged.emit(data.completion);
-
-            if (data.completion.valueused !== false || !this.course || !('progress' in this.course) ||
-                    typeof this.course.progress != 'number') {
-                return;
-            }
-
-            // If the completion value is not used, the page won't be reloaded, so update the progress bar.
-            const completionModules = (<CoreCourseModuleData[]> [])
-                .concat(...this.sections.map((section) => section.modules))
-                .map((module) => module.completion && module.completion > 0 ? 1 : module.completion)
-                .reduce((accumulator, currentValue) => (accumulator || 0) + (currentValue || 0), 0);
-
-            const moduleProgressPercent = 100 / (completionModules || 1);
-            // Use min/max here to avoid floating point rounding errors over/under-flowing the progress bar.
-            if (data.completion.state === CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE) {
-                this.course.progress = Math.min(100, this.course.progress + moduleProgressPercent);
-            } else {
-                this.course.progress = Math.max(0, this.course.progress - moduleProgressPercent);
-            }
-
-            this.updateProgress();
-        });
     }
 
     /**
@@ -187,8 +149,6 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
             this.displayBlocks = CoreCourseFormatDelegate.displayBlocks(this.course);
 
             this.hasBlocks = await CoreBlockHelper.hasCourseBlocks(this.course.id);
-
-            this.updateProgress();
         }
 
         if (changes.sections && this.sections) {
@@ -205,7 +165,6 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
         this.data.initialSectionId = this.initialSectionId;
         this.data.initialSectionNumber = this.initialSectionNumber;
         this.data.moduleId = this.moduleId;
-        this.data.completionChanged = this.completionChanged;
     }
 
     /**
@@ -542,25 +501,6 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
                 section.id != CoreCourseProvider.STEALTH_MODULES_SECTION_ID;
     }
 
-    /**
-     * Update course progress.
-     */
-    protected updateProgress(): void {
-        if (
-            !this.course ||
-            !('progress' in this.course) ||
-            typeof this.course.progress !== 'number' ||
-            this.course.progress < 0 ||
-            this.course.completionusertracked === false
-        ) {
-            this.progress = undefined;
-
-            return;
-        }
-
-        this.progress = this.course.progress;
-    }
-
 }
 
 type CoreCourseSectionToDisplay = CoreCourseSection & {
diff --git a/src/core/features/course/pages/index/index.ts b/src/core/features/course/pages/index/index.ts
index 963df1009..6f0f32b25 100644
--- a/src/core/features/course/pages/index/index.ts
+++ b/src/core/features/course/pages/index/index.ts
@@ -20,7 +20,7 @@ import { CoreCourseFormatDelegate } from '../../services/format-delegate';
 import { CoreCourseOptionsDelegate } from '../../services/course-options-delegate';
 import { CoreCourseAnyCourseData } from '@features/courses/services/courses';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
-import { CoreCourse } from '@features/course/services/course';
+import { CoreCourse, CoreCourseModuleCompletionStatus, CoreCourseWSSection } from '@features/course/services/course';
 import { CoreCourseHelper, CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreTextUtils } from '@services/utils/text';
@@ -52,6 +52,8 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
 
     protected currentPagePath = '';
     protected selectTabObserver: CoreEventObserver;
+    protected completionObserver: CoreEventObserver;
+    protected sections: CoreCourseWSSection[] = []; // List of course sections.
     protected firstTabName?: string;
     protected module?: CoreCourseModuleData;
     protected modParams?: Params;
@@ -83,6 +85,34 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
                 }
             }
         });
+
+        // The completion of any of the modules have changed.
+        this.completionObserver = CoreEvents.on(CoreEvents.COMPLETION_CHANGED, (data) => {
+            if (data.completion.courseId != this.course?.id) {
+                return;
+            }
+
+            if (data.completion.valueused !== false || !this.course || !('progress' in this.course) ||
+                    typeof this.course.progress != 'number') {
+                return;
+            }
+
+            // If the completion value is not used, the page won't be reloaded, so update the progress bar.
+            const completionModules = (<CoreCourseModuleData[]> [])
+                .concat(...this.sections.map((section) => section.modules))
+                .map((module) => module.completion && module.completion > 0 ? 1 : module.completion)
+                .reduce((accumulator, currentValue) => (accumulator || 0) + (currentValue || 0), 0);
+
+            const moduleProgressPercent = 100 / (completionModules || 1);
+            // Use min/max here to avoid floating point rounding errors over/under-flowing the progress bar.
+            if (data.completion.state === CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE) {
+                this.course.progress = Math.min(100, this.course.progress + moduleProgressPercent);
+            } else {
+                this.course.progress = Math.max(0, this.course.progress - moduleProgressPercent);
+            }
+
+            this.updateProgress();
+        });
     }
 
     /**
@@ -206,14 +236,14 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
         this.updateProgress();
 
         // Load sections.
-        const sections = await CoreUtils.ignoreErrors(CoreCourse.getSections(this.course.id, false, true));
+        this.sections = await CoreUtils.ignoreErrors(CoreCourse.getSections(this.course.id, false, true), []);
 
-        if (!sections) {
+        if (!this.sections) {
             return;
         }
 
         // Get the title again now that we have sections.
-        this.title = CoreCourseFormatDelegate.getCourseTitle(this.course, sections);
+        this.title = CoreCourseFormatDelegate.getCourseTitle(this.course, this.sections);
     }
 
     /**
@@ -224,6 +254,7 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
 
         CoreNavigator.decreaseRouteDepth(path.replace(/(\/deep)+/, ''));
         this.selectTabObserver?.off();
+        this.completionObserver?.off();
     }
 
     /**

From 9d40a6d2af83a96a73e54cead7c4921f91a68f35 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 31 Jan 2022 15:55:57 +0100
Subject: [PATCH 0427/1008] MOBILE-3902 airnotifier: Use is_system_configured
 WS

---
 scripts/langindex.json                        |   4 +-
 .../airnotifier/airnotifier.module.ts         |   2 +
 .../messageoutput/airnotifier/lang.json       |   5 +-
 .../airnotifier/services/airnotifier.ts       | 117 +++++++++++++++++-
 src/addons/notifications/lang.json            |   1 -
 .../notifications/notifications.module.ts     |   3 +-
 .../notifications/services/notifications.ts   |  90 +-------------
 7 files changed, 124 insertions(+), 98 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index ad31aebcd..aae5bdd55 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -234,6 +234,7 @@
   "addon.coursecompletion.status": "moodle",
   "addon.coursecompletion.viewcoursereport": "completion",
   "addon.messageoutput_airnotifier.processorsettingsdesc": "local_moodlemobileapp",
+  "addon.messageoutput_airnotifier.pushdisabledwarning": "local_moodlemobileapp",
   "addon.messages.acceptandaddcontact": "message",
   "addon.messages.addcontact": "message",
   "addon.messages.addcontactconfirm": "message",
@@ -1087,7 +1088,6 @@
   "addon.notifications.notificationpreferences": "message",
   "addon.notifications.notifications": "local_moodlemobileapp",
   "addon.notifications.playsound": "local_moodlemobileapp",
-  "addon.notifications.pushdisabledwarning": "local_moodlemobileapp",
   "addon.notifications.therearentnotificationsyet": "local_moodlemobileapp",
   "addon.notifications.unreadnotification": "message",
   "addon.privatefiles.couldnotloadfiles": "local_moodlemobileapp",
@@ -2332,8 +2332,8 @@
   "core.userdeleted": "moodle",
   "core.userdetails": "moodle",
   "core.usernotfullysetup": "error",
-  "core.usersuspended": "moodle",
   "core.users": "moodle",
+  "core.usersuspended": "tool_reportbuilder",
   "core.view": "moodle",
   "core.viewcode": "local_moodlemobileapp",
   "core.vieweditor": "local_moodlemobileapp",
diff --git a/src/addons/messageoutput/airnotifier/airnotifier.module.ts b/src/addons/messageoutput/airnotifier/airnotifier.module.ts
index 3e3d06870..65fc244d6 100644
--- a/src/addons/messageoutput/airnotifier/airnotifier.module.ts
+++ b/src/addons/messageoutput/airnotifier/airnotifier.module.ts
@@ -21,6 +21,7 @@ import {
     AddonMessageOutputAirnotifierHandler,
     AddonMessageOutputAirnotifierHandlerService,
 } from './services/handlers/messageoutput';
+import { AddonMessageOutputAirnotifier } from './services/airnotifier';
 
 const routes: Routes = [
     {
@@ -41,6 +42,7 @@ const routes: Routes = [
             multi: true,
             useValue: () => {
                 AddonMessageOutputDelegate.registerHandler(AddonMessageOutputAirnotifierHandler.instance);
+                AddonMessageOutputAirnotifier.initialize();
             },
         },
     ],
diff --git a/src/addons/messageoutput/airnotifier/lang.json b/src/addons/messageoutput/airnotifier/lang.json
index a6f460bbb..9d542a3c3 100644
--- a/src/addons/messageoutput/airnotifier/lang.json
+++ b/src/addons/messageoutput/airnotifier/lang.json
@@ -1,3 +1,4 @@
 {
-    "processorsettingsdesc": "Configure devices"
-}
\ No newline at end of file
+    "processorsettingsdesc": "Configure devices",
+    "pushdisabledwarning": "Your users are not receiving any notification from this site on their mobile devices. Enable mobile notifications in the Notification settings page."
+}
diff --git a/src/addons/messageoutput/airnotifier/services/airnotifier.ts b/src/addons/messageoutput/airnotifier/services/airnotifier.ts
index e84da309e..211700d76 100644
--- a/src/addons/messageoutput/airnotifier/services/airnotifier.ts
+++ b/src/addons/messageoutput/airnotifier/services/airnotifier.ts
@@ -14,14 +14,17 @@
 
 import { Injectable } from '@angular/core';
 
-import { CoreSites } from '@services/sites';
+import { CoreSites, CoreSitesCommonWSOptions, CoreSitesReadingStrategy } from '@services/sites';
 import { CoreWSExternalWarning } from '@services/ws';
 import { CoreConstants } from '@/core/constants';
 import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
 import { CoreError } from '@classes/errors/error';
 import { CoreWSError } from '@classes/errors/wserror';
-import { makeSingleton } from '@singletons';
+import { makeSingleton, Translate } from '@singletons';
 import { CoreEvents, CoreEventSiteData } from '@singletons/events';
+import { CoreDomUtils } from '@services/utils/dom';
+import { CoreTextUtils } from '@services/utils/text';
+import { CoreUtils } from '@services/utils/utils';
 
 const ROOT_CACHE_KEY = 'mmaMessageOutputAirnotifier:';
 
@@ -31,11 +34,18 @@ const ROOT_CACHE_KEY = 'mmaMessageOutputAirnotifier:';
 @Injectable({ providedIn: 'root' })
 export class AddonMessageOutputAirnotifierProvider {
 
-    constructor() {
+    /**
+     * Initialize.
+     */
+    initialize(): void {
         CoreEvents.on(CoreEvents.DEVICE_REGISTERED_IN_MOODLE, async (data: CoreEventSiteData) => {
             // Get user devices to make Moodle send the devices data to Airnotifier.
             this.getUserDevices(true, data.siteId);
         });
+
+        CoreEvents.on(CoreEvents.LOGIN, (data) => {
+            this.warnPushDisabledForAdmin(data.siteId);
+        });
     }
 
     /**
@@ -71,6 +81,35 @@ export class AddonMessageOutputAirnotifierProvider {
         throw new CoreError('Error enabling device');
     }
 
+    /**
+     * Get the cache key for the is system configured call.
+     *
+     * @return Cache key.
+     */
+    protected getSystemConfiguredCacheKey(): string {
+        return ROOT_CACHE_KEY + 'isAirnotifierConfigured';
+    }
+
+    /**
+     * Check if airnotifier is configured.
+     *
+     * @param options Options.
+     * @return Promise resolved with boolean: whether it's configured.
+     */
+    async isSystemConfigured(options: CoreSitesCommonWSOptions = {}): Promise<boolean> {
+        const site = await CoreSites.getSite(options.siteId);
+
+        const preSets: CoreSiteWSPreSets = {
+            cacheKey: this.getSystemConfiguredCacheKey(),
+            updateFrequency: CoreSite.FREQUENCY_RARELY,
+            ...CoreSites.getReadingStrategyPreSets(options.readingStrategy), // Include reading strategy preSets.
+        };
+
+        const result = await site.read<number>('message_airnotifier_is_system_configured', {}, preSets);
+
+        return result === 1;
+    }
+
     /**
      * Get the cache key for the get user devices call.
      *
@@ -125,6 +164,78 @@ export class AddonMessageOutputAirnotifierProvider {
         return site.invalidateWsCacheForKey(this.getUserDevicesCacheKey());
     }
 
+    /**
+     * Is user is an admin and push are disabled, notify him.
+     *
+     * @param siteId Site ID.
+     * @return Promise resolved when done.
+     */
+    protected async warnPushDisabledForAdmin(siteId?: string): Promise<void> {
+        if (!siteId) {
+            return;
+        }
+
+        try {
+            const site = await CoreSites.getSite(siteId);
+
+            if (!site.getInfo()?.userissiteadmin) {
+                // Not an admin or we don't know, stop.
+                return;
+            }
+
+            // Check if the admin already asked not to be reminded.
+            const dontAsk = await site.getLocalSiteConfig('AddonMessageOutputAirnotifierDontRemindDisabled', 0);
+            if (dontAsk) {
+                return;
+            }
+
+            // Check if airnotifier is configured.
+            const isConfigured = await this.isSystemConfigured({
+                readingStrategy: CoreSitesReadingStrategy.ONLY_NETWORK,
+                siteId,
+            });
+
+            if (isConfigured) {
+                return;
+            }
+
+            // Warn the admin.
+            const dontShowAgain = await CoreDomUtils.showPrompt(
+                Translate.instant('addon.messageoutput_airnotifier.pushdisabledwarning'),
+                undefined,
+                Translate.instant('core.dontshowagain'),
+                'checkbox',
+                [
+                    {
+                        text: Translate.instant('core.ok'),
+                    },
+                    {
+                        text: Translate.instant('core.goto', { $a: Translate.instant('core.settings.settings') }),
+                        handler: (data, resolve) => {
+                            resolve(data[0]);
+
+                            const url = CoreTextUtils.concatenatePaths(
+                                site.getURL(),
+                                site.isVersionGreaterEqualThan('3.11') ?
+                                    'message/output/airnotifier/checkconfiguration.php' :
+                                    'admin/message.php',
+                            );
+
+                            // Don't try auto-login, admins cannot use it.
+                            CoreUtils.openInBrowser(url);
+                        },
+                    },
+                ],
+            );
+
+            if (dontShowAgain) {
+                await site.setLocalSiteConfig('AddonMessageOutputAirnotifierDontRemindDisabled', 1);
+            }
+        } catch {
+            // Ignore errors.
+        }
+    }
+
 }
 
 export const AddonMessageOutputAirnotifier = makeSingleton(AddonMessageOutputAirnotifierProvider);
diff --git a/src/addons/notifications/lang.json b/src/addons/notifications/lang.json
index ef4ffefe4..b3c02b52e 100644
--- a/src/addons/notifications/lang.json
+++ b/src/addons/notifications/lang.json
@@ -4,7 +4,6 @@
     "notificationpreferences": "Notification preferences",
     "notifications": "Notifications",
     "playsound": "Play sound",
-    "pushdisabledwarning": "Your users are not receiving any notification from this site on their mobile devices. Enable mobile notifications in the Notification settings page.",
     "therearentnotificationsyet": "There are no notifications.",
     "unreadnotification": "Unread notification: {{$a}}"
 }
diff --git a/src/addons/notifications/notifications.module.ts b/src/addons/notifications/notifications.module.ts
index 6ea333938..0f2142d22 100644
--- a/src/addons/notifications/notifications.module.ts
+++ b/src/addons/notifications/notifications.module.ts
@@ -26,7 +26,7 @@ import { AddonNotificationsCronHandler } from './services/handlers/cron';
 import { AddonNotificationsPushClickHandler } from './services/handlers/push-click';
 import { AddonNotificationsSettingsHandler, AddonNotificationsSettingsHandlerService } from './services/handlers/settings';
 import { CoreSitePreferencesRoutingModule } from '@features/settings/pages/site/site-routing';
-import { AddonNotifications, AddonNotificationsProvider } from './services/notifications';
+import { AddonNotificationsProvider } from './services/notifications';
 import { AddonNotificationsHelperProvider } from './services/notifications-helper';
 
 export const ADDON_NOTIFICATIONS_SERVICES: Type<unknown>[] = [
@@ -65,7 +65,6 @@ const preferencesRoutes: Routes = [
                 CoreSettingsDelegate.registerHandler(AddonNotificationsSettingsHandler.instance);
 
                 AddonNotificationsMainMenuHandler.initialize();
-                AddonNotifications.initialize();
             },
         },
     ],
diff --git a/src/addons/notifications/services/notifications.ts b/src/addons/notifications/services/notifications.ts
index bd1732ba3..86b5f5f49 100644
--- a/src/addons/notifications/services/notifications.ts
+++ b/src/addons/notifications/services/notifications.ts
@@ -14,18 +14,15 @@
 
 import { Injectable } from '@angular/core';
 
-import { CoreSites, CoreSitesCommonWSOptions, CoreSitesReadingStrategy } from '@services/sites';
+import { CoreSites, CoreSitesCommonWSOptions } from '@services/sites';
 import { CoreWSExternalWarning } from '@services/ws';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreTimeUtils } from '@services/utils/time';
 import { CoreUser } from '@features/user/services/user';
 import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
 import { CoreLogger } from '@singletons/logger';
-import { makeSingleton, Translate } from '@singletons';
+import { makeSingleton } from '@singletons';
 import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate';
-import { CoreEvents } from '@singletons/events';
-import { CoreDomUtils } from '@services/utils/dom';
-import { CoreUtils } from '@services/utils/utils';
 
 const ROOT_CACHE_KEY = 'mmaNotifications:';
 
@@ -46,15 +43,6 @@ export class AddonNotificationsProvider {
         this.logger = CoreLogger.getInstance('AddonNotificationsProvider');
     }
 
-    /**
-     * Initialize the service.
-     */
-    initialize(): void {
-        CoreEvents.on(CoreEvents.LOGIN, (data) => {
-            this.warnPushDisabledForAdmin(data.siteId);
-        });
-    }
-
     /**
      * Function to format notification data.
      *
@@ -395,80 +383,6 @@ export class AddonNotificationsProvider {
         await site.invalidateWsCacheForKey(this.getNotificationsCacheKey());
     }
 
-    /**
-     * Is user is an admin and push are disabled, notify him.
-     *
-     * @param siteId Site ID.
-     * @return Promise resolved when done.
-     */
-    protected async warnPushDisabledForAdmin(siteId?: string): Promise<void> {
-        if (!siteId) {
-            return;
-        }
-
-        try {
-            const site = await CoreSites.getSite(siteId);
-
-            if (!site.getInfo()?.userissiteadmin) {
-                // Not an admin or we don't know, stop.
-                return;
-            }
-
-            // Check if the admin already asked not to be reminded.
-            const dontAsk = await site.getLocalSiteConfig('AddonNotificationsDontRemindPushDisabled', 0);
-            if (dontAsk) {
-                return;
-            }
-
-            // Check if push are disabled.
-            const preferences = await this.getNotificationPreferences({
-                readingStrategy: CoreSitesReadingStrategy.ONLY_NETWORK,
-                siteId,
-            });
-
-            const processor = preferences.processors.find(processor => processor.name === 'airnotifier');
-            if (processor) {
-                // Enabled.
-                return;
-            }
-
-            // Warn the admin.
-            const dontShowAgain = await CoreDomUtils.showPrompt(
-                Translate.instant('addon.notifications.pushdisabledwarning'),
-                undefined,
-                Translate.instant('core.dontshowagain'),
-                'checkbox',
-                [
-                    {
-                        text: Translate.instant('core.ok'),
-                    },
-                    {
-                        text: Translate.instant('core.goto', { $a: Translate.instant('core.settings.settings') }),
-                        handler: (data, resolve) => {
-                            resolve(data[0]);
-
-                            const url = CoreTextUtils.concatenatePaths(
-                                site.getURL(),
-                                site.isVersionGreaterEqualThan('3.11') ?
-                                    'message/output/airnotifier/checkconfiguration.php' :
-                                    'admin/message.php',
-                            );
-
-                            // Don't try auto-login, admins cannot use it.
-                            CoreUtils.openInBrowser(url);
-                        },
-                    },
-                ],
-            );
-
-            if (dontShowAgain) {
-                await site.setLocalSiteConfig('AddonNotificationsDontRemindPushDisabled', 1);
-            }
-        } catch {
-            // Ignore errors.
-        }
-    }
-
 }
 
 export const AddonNotifications = makeSingleton(AddonNotificationsProvider);

From 65de608aeeac324bf77ee8c02f8e1d82ec59e5ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 31 Jan 2022 17:49:27 +0100
Subject: [PATCH 0428/1008] MOBILE-3915 course: Expand selected or scrolled
 section on course index

---
 .../components/course-index/course-index.ts   |  4 ++++
 .../components/format/core-course-format.html |  3 ++-
 .../course/components/format/format.ts        | 22 ++++++++++++++++++-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/core/features/course/components/course-index/course-index.ts b/src/core/features/course/components/course-index/course-index.ts
index 712e87e37..a7b871765 100644
--- a/src/core/features/course/components/course-index/course-index.ts
+++ b/src/core/features/course/components/course-index/course-index.ts
@@ -69,6 +69,10 @@ export class CoreCourseCourseIndexComponent implements OnInit {
         if (!formatOptions || formatOptions.completionusertracked === false) {
             return;
         }
+
+        // Collapse all sections first.
+        this.sections.forEach((section) => section.expanded = false);
+
         const currentSection = await CoreCourseFormatDelegate.getCurrentSection(this.course, this.sections);
         currentSection.highlighted = true;
         if (this.selectedId === undefined) {
diff --git a/src/core/features/course/components/format/core-course-format.html b/src/core/features/course/components/format/core-course-format.html
index 3c8036beb..e1712fea8 100644
--- a/src/core/features/course/components/format/core-course-format.html
+++ b/src/core/features/course/components/format/core-course-format.html
@@ -65,7 +65,8 @@
 
 <!-- Template to render a section. -->
 <ng-template #sectionTemplate let-section="section">
-    <section *ngIf="!section.hiddenbynumsections && section.id != allSectionsId && section.id != stealthModulesSectionId">
+    <section *ngIf="!section.hiddenbynumsections && section.id != allSectionsId && section.id != stealthModulesSectionId"
+        class="section-wrapper" [id]="section.id">
         <ion-item-divider class="course-section ion-text-wrap" color="light"
             [class.item-dimmed]="section.visible === 0 || section.uservisible === false">
             <ion-icon name="fas-folder" aria-label="hidden" slot="start"></ion-icon>
diff --git a/src/core/features/course/components/format/format.ts b/src/core/features/course/components/format/format.ts
index 99eb2cc86..f6030ede6 100644
--- a/src/core/features/course/components/format/format.ts
+++ b/src/core/features/course/components/format/format.ts
@@ -283,12 +283,32 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
      * Display the course index modal.
      */
     async openCourseIndex(): Promise<void> {
+        let selectedId = this.selectedSection?.id;
+
+        if (selectedId == this.allSectionsId) {
+            // Check current scrolled section.
+            const allSectionElements: NodeListOf<HTMLElement> =
+                this.elementRef.nativeElement.querySelectorAll('section.section-wrapper');
+
+            const scroll = await this.content.getScrollElement();
+            const containerTop = scroll.getBoundingClientRect().top;
+
+            const element = Array.from(allSectionElements).find((element) => {
+                const position = element.getBoundingClientRect();
+
+                // The bottom is inside the container or lower.
+                return position.bottom >= containerTop;
+            });
+
+            selectedId = Number(element?.getAttribute('id')) || undefined;
+        }
+
         const data = await CoreDomUtils.openModal<CoreCourseIndexSectionWithModule>({
             component: CoreCourseCourseIndexComponent,
             componentProps: {
                 course: this.course,
                 sections: this.sections,
-                selectedId: this.selectedSection?.id,
+                selectedId: selectedId,
             },
         });
 

From a776e378527113336e2d78c6b007d6a72d6dbad3 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 1 Feb 2022 08:14:08 +0100
Subject: [PATCH 0429/1008] MOBILE-3975 calendar: Move default reminder initial
 value to config

---
 moodle.config.json                                |  3 ++-
 src/addons/calendar/services/calendar.ts          |  3 +--
 src/addons/calendar/services/database/calendar.ts | 11 ++++++++---
 src/types/config.d.ts                             |  1 +
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/moodle.config.json b/moodle.config.json
index 84a52ba65..374012c07 100644
--- a/moodle.config.json
+++ b/moodle.config.json
@@ -101,5 +101,6 @@
         "ios": "id633359593"
     },
     "wsrequestqueuelimit": 10,
-    "wsrequestqueuedelay": 100
+    "wsrequestqueuedelay": 100,
+    "calendarreminderdefaultvalue": 3600
 }
diff --git a/src/addons/calendar/services/calendar.ts b/src/addons/calendar/services/calendar.ts
index 6ec1cbc0e..ec8c8db11 100644
--- a/src/addons/calendar/services/calendar.ts
+++ b/src/addons/calendar/services/calendar.ts
@@ -108,7 +108,6 @@ export class AddonCalendarProvider {
     static readonly COMPONENT = 'AddonCalendarEvents';
     static readonly DEFAULT_NOTIFICATION_TIME_CHANGED = 'AddonCalendarDefaultNotificationTimeChangedEvent';
     static readonly DEFAULT_NOTIFICATION_TIME_SETTING = 'mmaCalendarDefaultNotifTime';
-    static readonly DEFAULT_NOTIFICATION_TIME = 3600;
     static readonly STARTING_WEEK_DAY = 'addon_calendar_starting_week_day';
     static readonly NEW_EVENT_EVENT = 'addon_calendar_new_event';
     static readonly NEW_EVENT_DISCARDED_EVENT = 'addon_calendar_new_event_discarded';
@@ -638,7 +637,7 @@ export class AddonCalendarProvider {
 
         const key = AddonCalendarProvider.DEFAULT_NOTIFICATION_TIME_SETTING + '#' + siteId;
 
-        return CoreConfig.get(key, AddonCalendarProvider.DEFAULT_NOTIFICATION_TIME);
+        return CoreConfig.get(key, CoreConstants.CONFIG.calendarreminderdefaultvalue || 3600);
     }
 
     /**
diff --git a/src/addons/calendar/services/database/calendar.ts b/src/addons/calendar/services/database/calendar.ts
index c7591fa5c..6c6be2fd7 100644
--- a/src/addons/calendar/services/database/calendar.ts
+++ b/src/addons/calendar/services/database/calendar.ts
@@ -13,9 +13,10 @@
 // limitations under the License.
 
 import { SQLiteDB } from '@classes/sqlitedb';
+import { CoreConfig } from '@services/config';
 import { CoreSiteSchema } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
-import { AddonCalendar, AddonCalendarEventType } from '../calendar';
+import { AddonCalendar, AddonCalendarEventType, AddonCalendarProvider } from '../calendar';
 
 /**
  * Database variables for AddonDatabase service.
@@ -216,13 +217,17 @@ export const CALENDAR_SITE_SCHEMA: CoreSiteSchema = {
         }
 
         if (oldVersion < 4) {
-            // Migrate reminders. New format @since 4.0.
-            const defaultTime = await CoreUtils.ignoreErrors(AddonCalendar.getDefaultNotificationTime(siteId));
+            // Migrate default notification time if it was changed.
+            // Don't use getDefaultNotificationTime to be able to detect if the value was changed or not.
+            const key = AddonCalendarProvider.DEFAULT_NOTIFICATION_TIME_SETTING + '#' + siteId;
+            const defaultTime = await CoreUtils.ignoreErrors(CoreConfig.get(key, null));
+
             if (defaultTime) {
                 // Convert from minutes to seconds.
                 AddonCalendar.setDefaultNotificationTime(defaultTime * 60, siteId);
             }
 
+            // Migrate reminders. New format @since 4.0.
             const records = await db.getAllRecords<AddonCalendarReminderDBRecord>(REMINDERS_TABLE);
             const events: Record<number, AddonCalendarEventDBRecord> = {};
 
diff --git a/src/types/config.d.ts b/src/types/config.d.ts
index c5df37dcd..ccbac9336 100644
--- a/src/types/config.d.ts
+++ b/src/types/config.d.ts
@@ -60,4 +60,5 @@ export interface EnvironmentConfig {
     iabToolbarColors?: 'auto' | { background: string; text?: string } | null;
     wsrequestqueuelimit: number; // Maximum number of requests allowed in the queue.
     wsrequestqueuedelay: number; // Maximum number of miliseconds to wait before processing the queue.
+    calendarreminderdefaultvalue: number; // Initial value for default reminders (in seconds). User can change it later.
 }

From 29a688d3f870066a2ba8ac7b65f82e72dc82f93f Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 1 Feb 2022 09:40:42 +0100
Subject: [PATCH 0430/1008] MOBILE-3909 calendar: Remove decimals from migrated
 reminders

---
 src/addons/calendar/services/database/calendar.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/addons/calendar/services/database/calendar.ts b/src/addons/calendar/services/database/calendar.ts
index c7591fa5c..a8cc4db50 100644
--- a/src/addons/calendar/services/database/calendar.ts
+++ b/src/addons/calendar/services/database/calendar.ts
@@ -248,7 +248,8 @@ export const CALENDAR_SITE_SCHEMA: CoreSiteSchema = {
 
                     return;
                 } else {
-                    record.time = events[record.eventid].timestart - record.time;
+                    // Remove seconds from the old reminder, it could include seconds by mistake.
+                    record.time = events[record.eventid].timestart - Math.floor(record.time / 60) * 60;
                 }
 
                 return db.insertRecord(REMINDERS_TABLE, record);

From 97c49cb04235ec6a20586259027fdf50ce47de84 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 1 Feb 2022 09:50:26 +0100
Subject: [PATCH 0431/1008] MOBILE-3909 calendar: Allow deleting past reminders

---
 src/addons/calendar/pages/event/event.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/addons/calendar/pages/event/event.html b/src/addons/calendar/pages/event/event.html
index bcdd07a0e..2719ab3c4 100644
--- a/src/addons/calendar/pages/event/event.html
+++ b/src/addons/calendar/pages/event/event.html
@@ -140,7 +140,7 @@
                         <p>{{ reminder.label }}</p>
                     </ion-label>
                     <ion-button fill="clear" (click)="cancelNotification(reminder.id, $event)" [attr.aria-label]="'core.delete' | translate"
-                        slot="end" *ngIf="reminder.timestamp > currentTime">
+                        slot="end">
                         <ion-icon name="fas-trash" color="danger" slot="icon-only" aria-hidden="true"></ion-icon>
                     </ion-button>
                 </ion-item>

From 5ec817e7f5aa21b7dd0e6aee2aaf92fa3a6cedeb Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 1 Feb 2022 10:43:23 +0100
Subject: [PATCH 0432/1008] MOBILE-3965 login: Always force logout when click
 'Logout' button

---
 .../features/mainmenu/components/user-menu/user-menu.ts    | 2 +-
 src/core/services/sites.ts                                 | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.ts b/src/core/features/mainmenu/components/user-menu/user-menu.ts
index d250ae0e7..31e0c9137 100644
--- a/src/core/features/mainmenu/components/user-menu/user-menu.ts
+++ b/src/core/features/mainmenu/components/user-menu/user-menu.ts
@@ -169,7 +169,7 @@ export class CoreMainMenuUserMenuComponent implements OnInit, OnDestroy {
     async logout(event: Event): Promise<void> {
         await this.close(event);
 
-        CoreSites.logout();
+        CoreSites.logout(true);
     }
 
     /**
diff --git a/src/core/services/sites.ts b/src/core/services/sites.ts
index 6c5c5fca9..cd233fa27 100644
--- a/src/core/services/sites.ts
+++ b/src/core/services/sites.ts
@@ -1181,9 +1181,10 @@ export class CoreSitesProvider {
     /**
      * Logout the user.
      *
+     * @param forceLogout If true, site will be marked as logged out, no matter the value tool_mobile_forcelogout.
      * @return Promise resolved when the user is logged out.
      */
-    async logout(): Promise<void> {
+    async logout(forceLogout = false): Promise<void> {
         if (!this.currentSite) {
             return;
         }
@@ -1194,7 +1195,7 @@ export class CoreSitesProvider {
 
         this.currentSite = undefined;
 
-        if (siteConfig && siteConfig.tool_mobile_forcelogout == '1') {
+        if (forceLogout || (siteConfig && siteConfig.tool_mobile_forcelogout == '1')) {
             promises.push(this.setSiteLoggedOut(siteId));
         }
 
@@ -1222,7 +1223,7 @@ export class CoreSitesProvider {
             CoreApp.storeRedirect(siteId, redirectData);
         }
 
-        await CoreSites.logout();
+        await this.logout();
 
         return CoreSitePlugins.hasSitePluginsLoaded;
     }

From d9a9c785e678bf8f672e0f5ab4971114a2bf789c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 1 Feb 2022 16:00:41 +0100
Subject: [PATCH 0433/1008] MOBILE-3909 airnotifier: Don't show confirm before
 open browser

---
 src/addons/messageoutput/airnotifier/services/airnotifier.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/addons/messageoutput/airnotifier/services/airnotifier.ts b/src/addons/messageoutput/airnotifier/services/airnotifier.ts
index 211700d76..a7783ac6f 100644
--- a/src/addons/messageoutput/airnotifier/services/airnotifier.ts
+++ b/src/addons/messageoutput/airnotifier/services/airnotifier.ts
@@ -222,7 +222,9 @@ export class AddonMessageOutputAirnotifierProvider {
                             );
 
                             // Don't try auto-login, admins cannot use it.
-                            CoreUtils.openInBrowser(url);
+                            CoreUtils.openInBrowser(url, {
+                                showBrowserWarning: false,
+                            });
                         },
                     },
                 ],

From 75ed99065551f2dfc09a10c0bd6d44b4b53abc1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 28 Jan 2022 16:22:56 +0100
Subject: [PATCH 0434/1008] MOBILE-3976 chore: Remove invalid spaces

---
 .../activitymodules/addon-block-activitymodules.html          | 2 +-
 .../myoverview/components/filteroptions/filteroptions.html    | 4 ++--
 .../addon-block-recentlyaccessedcourses.html                  | 2 +-
 .../addon-block-recentlyaccesseditems.html                    | 2 +-
 .../components/sitemainmenu/addon-block-sitemainmenu.html     | 2 +-
 .../components/starredcourses/addon-block-starredcourses.html | 2 +-
 .../timeline/components/timeline/addon-block-timeline.html    | 2 +-
 src/addons/blog/pages/entries/entries.html                    | 2 +-
 src/addons/calendar/pages/edit-event/edit-event.html          | 4 ++--
 src/addons/messages/pages/discussion/discussion.html          | 4 ++--
 .../component/addon-mod-assign-submission-onlinetext.html     | 2 +-
 src/addons/mod/forum/components/post/post.html                | 2 +-
 .../resource/components/index/addon-mod-resource-index.html   | 2 +-
 src/addons/qtype/essay/component/addon-qtype-essay.html       | 2 +-
 .../datetime/component/addon-user-profile-field-datetime.html | 2 +-
 .../menu/component/addon-user-profile-field-menu.html         | 4 ++--
 src/core/components/attachments/core-attachments.html         | 2 +-
 .../unsupported-module/core-course-unsupported-module.html    | 4 ++--
 src/core/features/course/pages/preview/preview.html           | 2 +-
 src/core/features/settings/pages/deviceinfo/deviceinfo.html   | 2 +-
 src/core/features/settings/pages/site/site.html               | 2 +-
 21 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html b/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html
index 1c23cf54f..50e95546f 100644
--- a/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html
+++ b/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html
@@ -1,6 +1,6 @@
 <ion-item-divider sticky="true">
     <ion-label>
-        <h2>{{ 'addon.block_activitymodules.pluginname' | translate }}</h2>
+        <h2>{{ 'addon.block_activitymodules.pluginname' | translate }}</h2>
     </ion-label>
 </ion-item-divider>
 <core-loading [hideUntil]="loaded" [fullscreen]="false">
diff --git a/src/addons/block/myoverview/components/filteroptions/filteroptions.html b/src/addons/block/myoverview/components/filteroptions/filteroptions.html
index 39dcd2491..8d747fcfe 100644
--- a/src/addons/block/myoverview/components/filteroptions/filteroptions.html
+++ b/src/addons/block/myoverview/components/filteroptions/filteroptions.html
@@ -41,12 +41,12 @@
 
         <core-spacer></core-spacer>
         <ion-item *ngIf="options.show.favourite">
-            <ion-label>{{ 'addon.block_myoverview.favouritesonly' | translate }}</ion-label>
+            <ion-label>{{ 'addon.block_myoverview.favouritesonly' | translate }}</ion-label>
             <ion-toggle [(ngModel)]="options.favouriteSelected"></ion-toggle>
         </ion-item>
 
         <ion-item *ngIf="options.show.hidden">
-            <ion-label>{{ 'addon.block_myoverview.aria:hiddencourses' | translate }}</ion-label>
+            <ion-label>{{ 'addon.block_myoverview.aria:hiddencourses' | translate }}</ion-label>
             <ion-toggle [(ngModel)]="options.hiddenSelected"></ion-toggle>
         </ion-item>
     </ion-list>
diff --git a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html
index 6f10e6e92..113048db0 100644
--- a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html
+++ b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html
@@ -1,6 +1,6 @@
 <ion-item-divider sticky="true">
     <ion-label>
-        <h2>{{ 'addon.block_recentlyaccessedcourses.pluginname' | translate }}</h2>
+        <h2>{{ 'addon.block_recentlyaccessedcourses.pluginname' | translate }}</h2>
     </ion-label>
     <div slot="end" class="flex-row">
         <core-horizontal-scroll-controls #scrollControls [aria-controls]="scrollElementId">
diff --git a/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html b/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html
index e93ac8cd1..14298293a 100644
--- a/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html
+++ b/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html
@@ -1,6 +1,6 @@
 <ion-item-divider sticky="true">
     <ion-label>
-        <h2>{{ 'addon.block_recentlyaccesseditems.pluginname' | translate }}</h2>
+        <h2>{{ 'addon.block_recentlyaccesseditems.pluginname' | translate }}</h2>
     </ion-label>
     <div slot="end">
         <core-horizontal-scroll-controls #scrollControls [aria-controls]="scrollElementId">
diff --git a/src/addons/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html b/src/addons/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html
index de45bf3af..3ce510a26 100644
--- a/src/addons/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html
+++ b/src/addons/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html
@@ -1,6 +1,6 @@
 <ion-item-divider sticky="true">
     <ion-label>
-        <h2>{{ 'addon.block_sitemainmenu.pluginname' | translate }}</h2>
+        <h2>{{ 'addon.block_sitemainmenu.pluginname' | translate }}</h2>
     </ion-label>
 </ion-item-divider>
 <core-loading [hideUntil]="loaded" [fullscreen]="false">
diff --git a/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html b/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html
index 3697b8439..fd6a1a860 100644
--- a/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html
+++ b/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html
@@ -1,6 +1,6 @@
 <ion-item-divider sticky="true">
     <ion-label>
-        <h2>{{ 'addon.block_starredcourses.pluginname' | translate }}</h2>
+        <h2>{{ 'addon.block_starredcourses.pluginname' | translate }}</h2>
     </ion-label>
     <div slot="end" class="flex-row">
         <core-horizontal-scroll-controls #scrollControls [aria-controls]="scrollElementId">
diff --git a/src/addons/block/timeline/components/timeline/addon-block-timeline.html b/src/addons/block/timeline/components/timeline/addon-block-timeline.html
index a0774f1d9..a4155a94d 100644
--- a/src/addons/block/timeline/components/timeline/addon-block-timeline.html
+++ b/src/addons/block/timeline/components/timeline/addon-block-timeline.html
@@ -1,6 +1,6 @@
 <ion-item-divider sticky="true">
     <ion-label>
-        <h2>{{ 'addon.block_timeline.pluginname' | translate }}</h2>
+        <h2>{{ 'addon.block_timeline.pluginname' | translate }}</h2>
     </ion-label>
 </ion-item-divider>
 <core-loading [hideUntil]="loaded" [fullscreen]="false">
diff --git a/src/addons/blog/pages/entries/entries.html b/src/addons/blog/pages/entries/entries.html
index 550ee3fd2..41697ecd3 100644
--- a/src/addons/blog/pages/entries/entries.html
+++ b/src/addons/blog/pages/entries/entries.html
@@ -17,7 +17,7 @@
     </ion-refresher>
     <core-loading [hideUntil]="loaded">
         <ion-item *ngIf="showMyEntriesToggle">
-            <ion-label>{{ 'addon.blog.showonlyyourentries' | translate }}</ion-label>
+            <ion-label>{{ 'addon.blog.showonlyyourentries' | translate }}</ion-label>
             <ion-toggle [(ngModel)]="onlyMyEntries" (ionChange)="onlyMyEntriesToggleChanged(onlyMyEntries)"></ion-toggle>
         </ion-item>
         <core-empty-box *ngIf="entries && entries.length == 0" icon="far-newspaper" [message]="'addon.blog.noentriesyet' | translate">
diff --git a/src/addons/calendar/pages/edit-event/edit-event.html b/src/addons/calendar/pages/edit-event/edit-event.html
index 0ba264922..4b536a12d 100644
--- a/src/addons/calendar/pages/edit-event/edit-event.html
+++ b/src/addons/calendar/pages/edit-event/edit-event.html
@@ -30,7 +30,7 @@
                 <ion-label position="stacked">
                     <p class="item-heading" [core-mark-required]="true">{{ 'core.date' | translate }}</p>
                 </ion-label>
-                <ion-datetime formControlName="timestart" [placeholder]="'core.date' | translate" [displayFormat]="dateFormat"
+                <ion-datetime formControlName="timestart" [placeholder]="'core.date' | translate" [displayFormat]="dateFormat"
                     [max]="maxDate" [min]="minDate" display-timezone="utc">
                 </ion-datetime>
                 <core-input-errors [control]="form.controls.timestart" [errorMessages]="errors"></core-input-errors>
@@ -156,7 +156,7 @@
                     <ion-item *ngIf="form.controls.duration.value === 1">
                         <ion-label position="stacked"></ion-label>
                         <ion-datetime formControlName="timedurationuntil" [max]="maxDate" [min]="minDate"
-                            [placeholder]="'addon.calendar.durationuntil' | translate" [displayFormat]="dateFormat" display-timezone="utc">
+                            [placeholder]="'addon.calendar.durationuntil' | translate" [displayFormat]="dateFormat" display-timezone="utc">
                         </ion-datetime>
                     </ion-item>
                     <ion-item lines="none">
diff --git a/src/addons/messages/pages/discussion/discussion.html b/src/addons/messages/pages/discussion/discussion.html
index 2c85e5dbd..fe42e7ac1 100644
--- a/src/addons/messages/pages/discussion/discussion.html
+++ b/src/addons/messages/pages/discussion/discussion.html
@@ -40,10 +40,10 @@
             <core-context-menu-item [hidden]="isSelf || !muteEnabled || !conversation" [priority]="600" [content]="(conversation && conversation.ismuted ? 'addon.messages.unmuteconversation' :
                 'addon.messages.muteconversation') | translate" (action)="changeMute($event)" [closeOnClick]="false"
                 [iconAction]="muteIcon"></core-context-menu-item>
-            <core-context-menu-item [hidden]="!canDelete || !messages || !messages.length" [priority]="400"
+            <core-context-menu-item [hidden]="!canDelete || !messages || !messages.length" [priority]="400"
                 [content]="'addon.messages.showdeletemessages' | translate" iconAction="toggle" [(toggle)]="showDelete">
             </core-context-menu-item>
-            <core-context-menu-item [hidden]="!groupMessagingEnabled || !conversationId || isGroup || !messages || !messages.length"
+            <core-context-menu-item [hidden]="!groupMessagingEnabled || !conversationId || isGroup || !messages || !messages.length"
                 [priority]="200" [content]="'addon.messages.deleteconversation' | translate" (action)="deleteConversation($event)"
                 [closeOnClick]="false" [iconAction]="deleteIcon"></core-context-menu-item>
             <core-context-menu-item
diff --git a/src/addons/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html b/src/addons/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html
index f17a5dca5..639d40c26 100644
--- a/src/addons/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html
+++ b/src/addons/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html
@@ -20,7 +20,7 @@
     </ion-item-divider>
     <ion-item class="ion-text-wrap" *ngIf="wordLimitEnabled && words >= 0">
         <ion-label>
-            <h2>{{ 'addon.mod_assign.wordlimit' | translate }}</h2>
+            <h2>{{ 'addon.mod_assign.wordlimit' | translate }}</h2>
             <p>{{ 'core.numwords' | translate: {'$a': words + ' / ' + wordLimit} }}</p>
         </ion-label>
     </ion-item>
diff --git a/src/addons/mod/forum/components/post/post.html b/src/addons/mod/forum/components/post/post.html
index 09ea67c71..c23057906 100644
--- a/src/addons/mod/forum/components/post/post.html
+++ b/src/addons/mod/forum/components/post/post.html
@@ -1,5 +1,5 @@
 <div class="addon-mod_forum-post">
-    <ng-container *ngIf="!formData.isEditing || !showForm">
+    <ng-container *ngIf="!formData.isEditing || !showForm">
         <ion-card-header class="ion-text-wrap ion-no-padding" id="addon-mod_forum-post-{{post.id}}">
             <ion-item class="ion-text-wrap" [class.highlight]="highlight" lines="none">
                 <ion-label>
diff --git a/src/addons/mod/resource/components/index/addon-mod-resource-index.html b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
index bdeaa056d..bbad8ec56 100644
--- a/src/addons/mod/resource/components/index/addon-mod-resource-index.html
+++ b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
@@ -101,7 +101,7 @@
                 </ng-container>
             </ion-button>
 
-            <ion-button *ngIf="isIOS && (!shouldOpenInBrowser || !isOnline)" expand="block" class="ion-margin"
+            <ion-button *ngIf="isIOS && (!shouldOpenInBrowser || !isOnline)" expand="block" class="ion-margin"
                 (click)="open(openFileAction.OPEN_WITH)">
                 <ion-icon name="far-share-square" slot="start" aria-hidden="true"></ion-icon>
                 {{ 'core.openwith' | translate }}
diff --git a/src/addons/qtype/essay/component/addon-qtype-essay.html b/src/addons/qtype/essay/component/addon-qtype-essay.html
index dffb87858..5fb2e2e29 100644
--- a/src/addons/qtype/essay/component/addon-qtype-essay.html
+++ b/src/addons/qtype/essay/component/addon-qtype-essay.html
@@ -69,7 +69,7 @@
     <!-- Reviewing the question. -->
     <ng-container *ngIf="review">
         <!-- Answer to the question and attachments (reviewing). -->
-        <ion-item class="ion-text-wrap" *ngIf="essayQuestion.answer || essayQuestion.answer == ''">
+        <ion-item class="ion-text-wrap" *ngIf="essayQuestion.answer || essayQuestion.answer == ''">
             <ion-label>
                 <core-format-text [ngClass]='{"core-monospaced": essayQuestion.isMonospaced}' [component]="component"
                     [componentId]="componentId" [text]="essayQuestion.answer" [contextLevel]="contextLevel"
diff --git a/src/addons/userprofilefield/datetime/component/addon-user-profile-field-datetime.html b/src/addons/userprofilefield/datetime/component/addon-user-profile-field-datetime.html
index 98a7e153b..77f12bae2 100644
--- a/src/addons/userprofilefield/datetime/component/addon-user-profile-field-datetime.html
+++ b/src/addons/userprofilefield/datetime/component/addon-user-profile-field-datetime.html
@@ -11,7 +11,7 @@
     <ion-label position="stacked">
         <span [core-mark-required]="required">{{ field.name }}</span>
     </ion-label>
-    <ion-datetime [formControlName]="modelName" [placeholder]="'core.choosedots' | translate" [displayFormat]="format" [max]="max"
+    <ion-datetime [formControlName]="modelName" [placeholder]="'core.choosedots' | translate" [displayFormat]="format" [max]="max"
         [min]="min" [monthNames]="monthNames">
     </ion-datetime>
     <core-input-errors [control]="form.controls[modelName]"></core-input-errors>
diff --git a/src/addons/userprofilefield/menu/component/addon-user-profile-field-menu.html b/src/addons/userprofilefield/menu/component/addon-user-profile-field-menu.html
index b31734b71..3816c2090 100644
--- a/src/addons/userprofilefield/menu/component/addon-user-profile-field-menu.html
+++ b/src/addons/userprofilefield/menu/component/addon-user-profile-field-menu.html
@@ -14,9 +14,9 @@
     <ion-label position="stacked">
         <span [core-mark-required]="required">{{ field.name }}</span>
     </ion-label>
-    <ion-select [formControlName]="modelName" [placeholder]="'core.choosedots' | translate" interface="action-sheet"
+    <ion-select [formControlName]="modelName" [placeholder]="'core.choosedots' | translate" interface="action-sheet"
         [interfaceOptions]="{header: field.name}">
-        <ion-select-option value="">{{ 'core.choosedots' | translate }}</ion-select-option>
+        <ion-select-option value="">{{ 'core.choosedots' | translate }}</ion-select-option>
         <ion-select-option *ngFor="let option of options" [value]="option">{{option}}</ion-select-option>
     </ion-select>
     <core-input-errors [control]="form.controls[modelName]"></core-input-errors>
diff --git a/src/core/components/attachments/core-attachments.html b/src/core/components/attachments/core-attachments.html
index 46fbc7693..f18d06124 100644
--- a/src/core/components/attachments/core-attachments.html
+++ b/src/core/components/attachments/core-attachments.html
@@ -1,7 +1,7 @@
 <ion-item class="ion-text-wrap">
     <ion-label>
         <span *ngIf="maxSubmissionsReadable">
-            {{ 'core.maxsizeandattachments' | translate:{$a: {size: maxSizeReadable, attachments: maxSubmissionsReadable} } }}
+            {{ 'core.maxsizeandattachments' | translate:{$a: {size: maxSizeReadable, attachments: maxSubmissionsReadable} } }}
         </span>
         <span *ngIf="!maxSubmissionsReadable">{{ 'core.maxfilesize' | translate:{$a: maxSizeReadable} }}</span>
         <span [core-mark-required]="required" class="core-mark-required"></span>
diff --git a/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html b/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html
index a55256ca3..4fd22a35d 100644
--- a/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html
+++ b/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html
@@ -1,6 +1,6 @@
 <div class="ion-padding">
     <h2 *ngIf="!isDisabledInSite && isSupportedByTheApp">{{ 'core.whoops' | translate }}</h2>
-    <h2 *ngIf="isDisabledInSite || !isSupportedByTheApp">{{ 'core.uhoh' | translate }}</h2>
+    <h2 *ngIf="isDisabledInSite || !isSupportedByTheApp">{{ 'core.uhoh' | translate }}</h2>
 
     <p class="core-big" *ngIf="isDisabledInSite">{{ 'core.course.activitydisabled' | translate }}</p>
     <p class="core-big" *ngIf="!isDisabledInSite && isSupportedByTheApp">
@@ -9,7 +9,7 @@
     <p class="core-big" *ngIf="!isDisabledInSite && !isSupportedByTheApp">
         {{ 'core.course.activitynotyetviewableremoteaddon' | translate }}
     </p>
-    <p *ngIf="isDisabledInSite || !isSupportedByTheApp"><strong>{{ 'core.course.askadmintosupport' | translate }}</strong></p>
+    <p *ngIf="isDisabledInSite || !isSupportedByTheApp"><strong>{{ 'core.course.askadmintosupport' | translate }}</strong></p>
 
     <div *ngIf="module && module.url">
         <p><strong>{{ 'core.course.useactivityonbrowser' | translate }}</strong></p>
diff --git a/src/core/features/course/pages/preview/preview.html b/src/core/features/course/pages/preview/preview.html
index 4cb9bad62..476c38c92 100644
--- a/src/core/features/course/pages/preview/preview.html
+++ b/src/core/features/course/pages/preview/preview.html
@@ -100,7 +100,7 @@
                 </ion-item>
                 <ion-item class="ion-text-wrap" *ngIf="paypalEnabled">
                     <ion-label>
-                        <p class="item-heading">{{ 'core.courses.paypalaccepted' | translate }}</p>
+                        <p class="item-heading">{{ 'core.courses.paypalaccepted' | translate }}</p>
                         <p *ngIf="isMobile">{{ 'core.paymentinstant' | translate }}</p>
                         <ion-button *ngIf="isMobile" expand="block" class="ion-margin-top" (click)="paypalEnrol()">
                             {{ 'core.courses.sendpaymentbutton' | translate }}
diff --git a/src/core/features/settings/pages/deviceinfo/deviceinfo.html b/src/core/features/settings/pages/deviceinfo/deviceinfo.html
index ed8401cd8..54ffba79a 100644
--- a/src/core/features/settings/pages/deviceinfo/deviceinfo.html
+++ b/src/core/features/settings/pages/deviceinfo/deviceinfo.html
@@ -33,7 +33,7 @@
         <ion-item (longPress)="copyItemInfo($event)" (click)="enableDevOptions()">
             <ion-label class="ion-text-wrap">
                 <h2>{{ 'core.settings.compilationinfo' | translate }}</h2>
-                <p *ngIf="deviceInfo.compilationTime">{{ deviceInfo.compilationTime | coreFormatDate: "LLL Z": false }}</p>
+                <p *ngIf="deviceInfo.compilationTime">{{ deviceInfo.compilationTime | coreFormatDate: "LLL Z": false }}</p>
                 <p *ngIf="deviceInfo.lastCommit">{{ deviceInfo.lastCommit }}</p>
             </ion-label>
         </ion-item>
diff --git a/src/core/features/settings/pages/site/site.html b/src/core/features/settings/pages/site/site.html
index 3361e02ab..24043ef35 100644
--- a/src/core/features/settings/pages/site/site.html
+++ b/src/core/features/settings/pages/site/site.html
@@ -18,7 +18,7 @@
         <core-loading [hideUntil]="handlers.loaded">
             <ion-list>
                 <ion-item *ngFor="let handler of handlers.items" [ngClass]="['core-settings-handler', handler.class]"
-                    [attr.aria-label]="handler.title | translate" detail="true" (click)="handlers.select(handler)" button
+                    [attr.aria-label]="handler.title | translate" detail="true" (click)="handlers.select(handler)" button
                     [attr.aria-current]="handlers.getItemAriaCurrent(handler)">
                     <ion-icon [name]="handler.icon" slot="start" *ngIf="handler.icon" aria-hidden="true">
                     </ion-icon>

From 1f6c5a672b3d455eca04c071a65b95f570bd3642 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 28 Jan 2022 14:36:20 +0100
Subject: [PATCH 0435/1008] MOBILE-3976 messages: Simplify settings UI

---
 .../messages/pages/settings/settings.html     | 157 +++++++++---------
 1 file changed, 75 insertions(+), 82 deletions(-)

diff --git a/src/addons/messages/pages/settings/settings.html b/src/addons/messages/pages/settings/settings.html
index 997cc0277..08bf0c664 100644
--- a/src/addons/messages/pages/settings/settings.html
+++ b/src/addons/messages/pages/settings/settings.html
@@ -46,88 +46,12 @@
 
         <!-- Notifications. -->
         <ng-container *ngIf="preferences">
-            <div *ngFor="let component of preferences.components">
-                <ion-card list *ngFor="let notification of component.notifications">
-                    <ion-item-divider class="ion-text-wrap">
-                        <ion-label>
-                            <ion-row class="ion-no-padding" *ngIf="!groupMessagingEnabled">
-                                <ion-col class="ion-no-padding">
-                                    <h2>{{ notification.displayname }}</h2>
-                                </ion-col>
-                                <ion-col size="2" class="ion-text-center ion-no-padding ion-hide-md-down">
-                                    <h2>{{ 'core.settings.loggedin' | translate }}</h2>
-                                </ion-col>
-                                <ion-col *ngIf="!groupMessagingEnabled" size="2" class="ion-text-center ion-no-padding
-                                    ion-hide-md-down">
-                                    <h2>{{ 'core.settings.loggedoff' | translate }}</h2>
-                                </ion-col>
-                            </ion-row>
-                            <h2 *ngIf="groupMessagingEnabled">{{ 'addon.notifications.notificationpreferences' | translate }}</h2>
-                        </ion-label>
-                    </ion-item-divider>
-                    <ng-container *ngFor="let processor of notification.processors">
-                        <!-- If group messaging is enabled, display a simplified view. -->
-                        <ng-container *ngIf="groupMessagingEnabled">
-                            <ion-item class="ion-text-wrap">
-                                <ion-label>{{ processor.displayname }}</ion-label>
-                                <core-button-with-spinner *ngIf="!preferences.disableall" [loading]="!!notification.updating" slot="end">
-                                    <ion-toggle *ngIf="!processor.locked" [(ngModel)]="processor.checked"
-                                        (ngModelChange)="changePreference(notification, '', processor)">
-                                    </ion-toggle>
-                                    <ion-note *ngIf="processor.locked">
-                                        {{ processor.lockedmessage }}
-                                    </ion-note>
-                                </core-button-with-spinner>
-                                <ion-note slot="end" *ngIf="preferences.disableall">
-                                    {{ 'core.settings.disabled' | translate }}
-                                </ion-note>
-                            </ion-item>
-                        </ng-container>
-
-                        <ng-container *ngIf="!groupMessagingEnabled">
-                            <!-- Tablet view -->
-                            <ion-row class="ion-text-wrap ion-hide-md-down ion-align-items-center">
-                                <ion-col class="ion-margin-horizontal">{{ processor.displayname }}</ion-col>
-                                <ion-col size="2" class="ion-text-center" *ngFor="let state of ['loggedin', 'loggedoff']">
-                                    <core-button-with-spinner *ngIf="!preferences.disableall"
-                                        [loading]="notification.updating && notification.updating[state]">
-                                        <!-- If notifications not disabled, show toggle. -->
-                                        <ion-toggle *ngIf="!processor.locked" [(ngModel)]="processor[state].checked"
-                                            (ngModelChange)="changePreference(notification, state, processor)">
-                                        </ion-toggle>
-                                        <div class="ion-padding text-gray" *ngIf="processor.locked">
-                                            {{'core.settings.locked' | translate }}
-                                        </div>
-                                    </core-button-with-spinner>
-                                    <!-- If notifications are disabled, show "Disabled" instead of toggle. -->
-                                    <span *ngIf="preferences.disableall">{{ 'core.settings.disabled' | translate }}</span>
-                                </ion-col>
-                            </ion-row>
-                            <!-- Phone view -->
-                            <ion-list-header class="ion-text-wrap ion-hide-md-up">
-                                <ion-label>{{ processor.displayname }}</ion-label>
-                            </ion-list-header>
-                            <!-- If notifications not disabled, show toggles.
-                                If notifications are disabled, show "Disabled" instead of toggle. -->
-                            <ion-item *ngFor="let state of ['loggedin', 'loggedoff']" class="ion-text-wrap ion-hide-md-up">
-                                <ion-label>{{ 'core.settings.' + state | translate }}</ion-label>
-                                <core-button-with-spinner slot="end" *ngIf="!preferences.disableall"
-                                    [loading]="notification.updating && notification.updating[state]">
-                                    <ion-toggle *ngIf="!processor.locked" [(ngModel)]="processor[state].checked"
-                                        (ngModelChange)="changePreference(notification, state, processor)">
-                                    </ion-toggle>
-                                    <ion-note *ngIf="processor.locked">
-                                        {{'core.settings.locked' | translate }}
-                                    </ion-note>
-                                </core-button-with-spinner>
-                                <ion-note slot="end" *ngIf="preferences.disableall">
-                                    {{ 'core.settings.disabled' | translate }}
-                                </ion-note>
-                            </ion-item>
-                        </ng-container>
-                    </ng-container>
-                </ion-card>
-            </div>
+            <ng-container *ngIf="!groupMessagingEnabled">
+                <ng-container *ngTemplateOutlet="legacySettings; context: {preferences: preferences}"></ng-container>
+            </ng-container>
+            <ng-container *ngIf="groupMessagingEnabled">
+                <ng-container *ngTemplateOutlet="settings; context: {preferences: preferences}"></ng-container>
+            </ng-container>
         </ng-container>
 
         <!-- General settings. -->
@@ -148,3 +72,72 @@
         </ion-card>
     </core-loading>
 </ion-content>
+
+<!-- Only 3.5 version -->
+<ng-template #legacySettings let-preferences="preferences">
+    <ng-container *ngFor="let component of preferences.components">
+        <ion-card *ngFor="let notification of component.notifications">
+            <ion-card-header class="ion-no-padding">
+                <ion-item class="ion-text-wrap">
+                    <ion-label>
+                        <h2>{{ notification.displayname }}</h2>
+                    </ion-label>
+                </ion-item>
+            </ion-card-header>
+            <ion-card-content class="ion-no-padding">
+                <ng-container *ngFor="let processor of notification.processors">
+                    <ion-item-divider class="ion-text-wrap">
+                        <ion-label>{{ processor.displayname }}</ion-label>
+                    </ion-item-divider>
+                    <!-- If notifications not disabled, show toggles.
+                        If notifications are disabled, show "Disabled" instead of toggle. -->
+                    <ion-item *ngFor="let state of ['loggedin', 'loggedoff']" class="ion-text-wrap">
+                        <ion-label>{{ 'core.settings.' + state | translate }}</ion-label>
+                        <core-button-with-spinner slot="end" *ngIf="!preferences.disableall"
+                            [loading]="notification.updating && notification.updating[state]">
+                            <ion-toggle *ngIf="!processor.locked" [(ngModel)]="processor[state].checked"
+                                (ngModelChange)="changePreference(notification, state, processor)">
+                            </ion-toggle>
+                            <ion-note *ngIf="processor.locked">
+                                {{'core.settings.locked' | translate }}
+                            </ion-note>
+                        </core-button-with-spinner>
+                        <ion-note slot="end" *ngIf="preferences.disableall">
+                            {{ 'core.settings.disabled' | translate }}
+                        </ion-note>
+                    </ion-item>
+                </ng-container>
+            </ion-card-content>
+        </ion-card>
+    </ng-container>
+</ng-template>
+
+
+<ng-template #settings let-preferences="preferences">
+    <ng-container *ngFor="let component of preferences.components">
+        <ion-card *ngFor="let notification of component.notifications">
+            <ion-item-divider class="ion-text-wrap">
+                <ion-label>
+                    <h2>{{ 'addon.notifications.notificationpreferences' | translate }}</h2>
+                </ion-label>
+            </ion-item-divider>
+            <ng-container *ngFor="let processor of notification.processors">
+                <!-- If group messaging is enabled, display a simplified view. -->
+                <ion-item class="ion-text-wrap">
+                    <ion-label>{{ processor.displayname }}</ion-label>
+                    <core-button-with-spinner *ngIf="!preferences.disableall" [loading]="!!notification.updating" slot="end">
+                        <ion-toggle *ngIf="!processor.locked" [(ngModel)]="processor.checked"
+                            (ngModelChange)="changePreference(notification, '', processor)">
+                        </ion-toggle>
+                        <ion-note *ngIf="processor.locked">
+                            {{ processor.lockedmessage }}
+                        </ion-note>
+                    </core-button-with-spinner>
+                    <ion-note slot="end" *ngIf="preferences.disableall">
+                        {{ 'core.settings.disabled' | translate }}
+                    </ion-note>
+                </ion-item>
+            </ng-container>
+        </ion-card>
+    </ng-container>
+</ng-template>

From 0b5061170075634575e5dd38efdc32f91aa2211e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 28 Jan 2022 14:43:02 +0100
Subject: [PATCH 0436/1008] MOBILE-3976 messages: Use new enabled setting on
 4.0 onward

---
 scripts/langindex.json                        |   3 +-
 .../messages/pages/settings/settings.html     |  55 +++----
 .../messages/pages/settings/settings.page.ts  | 135 +++++++++---------
 src/addons/messages/services/messages.ts      |  14 +-
 .../notifications/services/notifications.ts   |   9 +-
 src/core/features/settings/lang.json          |   3 +-
 6 files changed, 110 insertions(+), 109 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index aae5bdd55..40c4b9144 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -2162,6 +2162,7 @@
   "core.settings.disableall": "message",
   "core.settings.disabled": "lesson",
   "core.settings.disabledfeatures": "tool_mobile",
+  "core.settings.disallowed": "message",
   "core.settings.displayformat": "local_moodlemobileapp",
   "core.settings.enabledownloadsection": "local_moodlemobileapp",
   "core.settings.enablefirebaseanalytics": "local_moodlemobileapp",
@@ -2176,6 +2177,7 @@
   "core.settings.filesystemroot": "local_moodlemobileapp",
   "core.settings.fontsize": "local_moodlemobileapp",
   "core.settings.fontsizecharacter": "block_accessibility/char",
+  "core.settings.forced": "message",
   "core.settings.forcedsetting": "local_moodlemobileapp",
   "core.settings.forcesafeareamargins": "local_moodlemobileapp",
   "core.settings.general": "moodle",
@@ -2186,7 +2188,6 @@
   "core.settings.license": "moodle",
   "core.settings.localnotifavailable": "local_moodlemobileapp",
   "core.settings.locationhref": "local_moodlemobileapp",
-  "core.settings.locked": "admin",
   "core.settings.loggedin": "message",
   "core.settings.loggedoff": "message",
   "core.settings.navigatorlanguage": "local_moodlemobileapp",
diff --git a/src/addons/messages/pages/settings/settings.html b/src/addons/messages/pages/settings/settings.html
index 08bf0c664..ef1d86892 100644
--- a/src/addons/messages/pages/settings/settings.html
+++ b/src/addons/messages/pages/settings/settings.html
@@ -16,7 +16,7 @@
         <!-- Contactable privacy. -->
         <ion-card>
             <ion-item *ngIf="!advancedContactable">
-                <ion-label>{{ 'addon.messages.blocknoncontacts' | translate }}</ion-label>
+                <ion-label>{{ 'addon.messages.blocknoncontacts' | translate }}</ion-label>
                 <ion-toggle [(ngModel)]="contactablePrivacy" (ngModelChange)="saveContactablePrivacy(contactablePrivacy)">
                 </ion-toggle>
             </ion-item>
@@ -87,24 +87,29 @@
             <ion-card-content class="ion-no-padding">
                 <ng-container *ngFor="let processor of notification.processors">
                     <ion-item-divider class="ion-text-wrap">
-                        <ion-label>{{ processor.displayname }}</ion-label>
+                        <ion-label>
+                            <p class="item-heading">{{ processor.displayname }}</p>
+                        </ion-label>
                     </ion-item-divider>
                     <!-- If notifications not disabled, show toggles.
                         If notifications are disabled, show "Disabled" instead of toggle. -->
                     <ion-item *ngFor="let state of ['loggedin', 'loggedoff']" class="ion-text-wrap">
-                        <ion-label>{{ 'core.settings.' + state | translate }}</ion-label>
-                        <core-button-with-spinner slot="end" *ngIf="!preferences.disableall"
-                            [loading]="notification.updating && notification.updating[state]">
-                            <ion-toggle *ngIf="!processor.locked" [(ngModel)]="processor[state].checked"
-                                (ngModelChange)="changePreference(notification, state, processor)">
-                            </ion-toggle>
-                            <ion-note *ngIf="processor.locked">
-                                {{'core.settings.locked' | translate }}
-                            </ion-note>
-                        </core-button-with-spinner>
-                        <ion-note slot="end" *ngIf="preferences.disableall">
-                            {{ 'core.settings.disabled' | translate }}
-                        </ion-note>
+                        <ion-label>{{ 'core.settings.' + state | translate }}</ion-label>
+                        <ng-container *ngIf="!preferences.disableall">
+                            <!-- If notifications enabled, show toggle. -->
+                            <core-button-with-spinner *ngIf="!processor.locked" [loading]="notification['updating'+state]">
+                                <ion-toggle [(ngModel)]="processor[state].checked"
+                                    (ngModelChange)="changePreferenceLegacy(notification, processor, state)">
+                                </ion-toggle>
+                            </core-button-with-spinner>
+                            <span *ngIf="processor.locked && processor[state].checked" class="text-gray">
+                                {{'core.settings.forced' | translate }}
+                            </span>
+                            <span *ngIf="processor.locked && !processor[state].checked" class="text-gray">
+                                {{'core.settings.disallowed' | translate }}
+                            </span>
+                        </ng-container>
+                        <span *ngIf="preferences.disableall">{{ 'core.settings.disabled' | translate }}</span>
                     </ion-item>
                 </ng-container>
             </ion-card-content>
@@ -125,17 +130,17 @@
                 <!-- If group messaging is enabled, display a simplified view. -->
                 <ion-item class="ion-text-wrap">
                     <ion-label>{{ processor.displayname }}</ion-label>
-                    <core-button-with-spinner *ngIf="!preferences.disableall" [loading]="!!notification.updating" slot="end">
-                        <ion-toggle *ngIf="!processor.locked" [(ngModel)]="processor.checked"
-                            (ngModelChange)="changePreference(notification, '', processor)">
-                        </ion-toggle>
-                        <ion-note *ngIf="processor.locked">
+                    <ng-container *ngIf="!preferences.disableall">
+                        <!-- If notifications enabled, show toggle. -->
+                        <core-button-with-spinner *ngIf="!processor.locked" [loading]="notification.updating">
+                            <ion-toggle [(ngModel)]="processor.enabled" (ngModelChange)="changePreference(notification, processor)">
+                            </ion-toggle>
+                        </core-button-with-spinner>
+                        <span class="text-gray" *ngIf="processor.locked">
                             {{ processor.lockedmessage }}
-                        </ion-note>
-                    </core-button-with-spinner>
-                    <ion-note slot="end" *ngIf="preferences.disableall">
-                        {{ 'core.settings.disabled' | translate }}
-                    </ion-note>
+                        </span>
+                    </ng-container>
+                    <span *ngIf="preferences.disableall" class="text-gray">{{ 'core.settings.disabled' | translate }}</span>
                 </ion-item>
             </ng-container>
         </ion-card>
diff --git a/src/addons/messages/pages/settings/settings.page.ts b/src/addons/messages/pages/settings/settings.page.ts
index b986e55b3..06b4902b1 100644
--- a/src/addons/messages/pages/settings/settings.page.ts
+++ b/src/addons/messages/pages/settings/settings.page.ts
@@ -27,6 +27,7 @@ import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreConstants } from '@/core/constants';
 import { IonRefresher } from '@ionic/angular';
+import { AddonNotificationsPreferencesNotificationProcessorState } from '@addons/notifications/services/notifications';
 
 /**
  * Page that displays the messages settings page.
@@ -50,14 +51,16 @@ export class AddonMessagesSettingsPage implements OnInit, OnDestroy {
     groupMessagingEnabled = false;
     sendOnEnter = false;
 
+    protected loggedInOffLegacyMode = false;
     protected previousContactableValue?: number | boolean;
 
     constructor() {
 
-        const currentSite = CoreSites.getCurrentSite();
-        this.advancedContactable = !!currentSite?.isVersionGreaterEqualThan('3.6');
-        this.allowSiteMessaging = !!currentSite?.canUseAdvancedFeature('messagingallusers');
+        const currentSite = CoreSites.getRequiredCurrentSite();
+        this.advancedContactable = !!currentSite.isVersionGreaterEqualThan('3.6');
+        this.allowSiteMessaging = !!currentSite.canUseAdvancedFeature('messagingallusers');
         this.groupMessagingEnabled = AddonMessages.isGroupMessagingEnabled();
+        this.loggedInOffLegacyMode = !currentSite.isVersionGreaterEqualThan('4.0');
 
         this.asyncInit();
     }
@@ -90,13 +93,16 @@ export class AddonMessagesSettingsPage implements OnInit, OnDestroy {
                     component.notifications = component.notifications.filter((notification) =>
                         notification.preferencekey == AddonMessagesProvider.NOTIFICATION_PREFERENCES_KEY);
 
-                    component.notifications.forEach((notification) => {
-                        notification.processors.forEach(
-                            (processor: AddonMessagesMessagePreferencesNotificationProcessorFormatted) => {
-                                processor.checked = processor.loggedin.checked || processor.loggedoff.checked;
-                            },
-                        );
-                    });
+                    if (this.loggedInOffLegacyMode) {
+                        // Load enabled from loggedin / loggedoff values.
+                        component.notifications.forEach((notification) => {
+                            notification.processors.forEach(
+                                (processor) => {
+                                    processor.enabled = processor.loggedin.checked || processor.loggedoff.checked;
+                                },
+                            );
+                        });
+                    }
                 }
             }
 
@@ -165,74 +171,70 @@ export class AddonMessagesSettingsPage implements OnInit, OnDestroy {
     }
 
     /**
-     * Change the value of a certain preference.
+     * Change the value of a certain preference. Versions 3.6 onwards.
      *
      * @param notification Notification object.
-     * @param state State name, ['loggedin', 'loggedoff'].
      * @param processor Notification processor.
      */
     async changePreference(
         notification: AddonMessagesMessagePreferencesNotificationFormatted,
-        state: string,
-        processor: AddonMessagesMessagePreferencesNotificationProcessorFormatted,
+        processor: AddonMessagesMessagePreferencesNotificationProcessor,
     ): Promise<void> {
+        // Update both states at the same time.
+        let value = notification.processors
+            .filter((processor) => processor.enabled)
+            .map((processor) => processor.name)
+            .join(',');
 
-        const valueArray: string[] = [];
-        let value = 'none';
+        if (value == '') {
+            value = 'none';
+        }
 
-        if (this.groupMessagingEnabled) {
-            // Update both states at the same time.
-            const promises: Promise<void>[] = [];
-
-            notification.processors.forEach((processor: AddonMessagesMessagePreferencesNotificationProcessorFormatted) => {
-                if (processor.checked) {
-                    valueArray.push(processor.name);
-                }
-            });
-
-            if (value.length > 0) {
-                value = valueArray.join(',');
-            }
-
-            notification.updating = true;
+        notification.updating = true;
 
+        const promises: Promise<void>[] = [];
+        if (this.loggedInOffLegacyMode) {
             promises.push(CoreUser.updateUserPreference(notification.preferencekey + '_loggedin', value));
             promises.push(CoreUser.updateUserPreference(notification.preferencekey + '_loggedoff', value));
-
-            try {
-                await Promise.all(promises);
-                // Update the preferences since they were modified.
-                this.updatePreferencesAfterDelay();
-            } catch (error) {
-                // Show error and revert change.
-                CoreDomUtils.showErrorModal(error);
-                processor.checked = !processor.checked;
-            } finally {
-                notification.updating = false;
-            }
-
-            return;
+        }  else {
+            promises.push(CoreUser.updateUserPreference(notification.preferencekey + '_enabled', value));
         }
 
+        try {
+            await Promise.all(promises);
+            // Update the preferences since they were modified.
+            this.updatePreferencesAfterDelay();
+        } catch (error) {
+            // Show error and revert change.
+            CoreDomUtils.showErrorModal(error);
+            processor.enabled = !processor.enabled;
+        } finally {
+            notification.updating = false;
+        }
+    }
+
+    /**
+     * Change the value of a certain preference. Only on version 3.5.
+     *
+     * @param notification Notification object.
+     * @param processor Notification processor.
+     * @param state State name, ['loggedin', 'loggedoff'].
+     */
+    async changePreferenceLegacy(
+        notification: AddonMessagesMessagePreferencesNotificationFormatted,
+        processor: AddonMessagesMessagePreferencesNotificationProcessor,
+        state: 'loggedin' | 'loggedoff',
+    ): Promise<void> {
         // Update only the specified state.
-        const processorState = processor[state];
+        const processorState: AddonNotificationsPreferencesNotificationProcessorState = processor[state];
         const preferenceName = notification.preferencekey + '_' + processorState.name;
 
-        notification.processors.forEach((processor) => {
-            if (processor[state].checked) {
-                valueArray.push(processor.name);
-            }
-        });
+        const value = notification.processors
+            .filter((processor) => processor[state].checked)
+            .map((processor) => processor.name)
+            .join(',');
 
-        if (value.length > 0) {
-            value = valueArray.join(',');
-        }
-
-        if (!notification.updating) {
-            notification.updating = {};
-        }
-
-        notification.updating[state] = true;
+        notification['updating'+state] = true;
         try {
             await CoreUser.updateUserPreference(preferenceName, value);
             // Update the preferences since they were modified.
@@ -242,7 +244,7 @@ export class AddonMessagesSettingsPage implements OnInit, OnDestroy {
             CoreDomUtils.showErrorModal(error);
             processorState.checked = !processorState.checked;
         } finally {
-            notification.updating[state] = false;
+            notification['updating'+state] = false;
         }
     }
 
@@ -288,12 +290,7 @@ export class AddonMessagesSettingsPage implements OnInit, OnDestroy {
  * Message preferences notification with some caclulated data.
  */
 type AddonMessagesMessagePreferencesNotificationFormatted = AddonMessagesMessagePreferencesNotification & {
-    updating?: boolean | {[state: string]: boolean}; // Calculated in the app. Whether the notification is being updated.
-};
-
-/**
- * Message preferences notification processor with some caclulated data.
- */
-type AddonMessagesMessagePreferencesNotificationProcessorFormatted = AddonMessagesMessagePreferencesNotificationProcessor & {
-    checked?: boolean; // Calculated in the app. Whether the processor is checked either for loggedin or loggedoff.
+    updating?: boolean; // Calculated in the app. Whether the notification is being updated.
+    updatingloggedin?: boolean; // Calculated in the app. Whether the notification is being updated.
+    updatingloggedoff?: boolean; // Calculated in the app. Whether the notification is being updated.
 };
diff --git a/src/addons/messages/services/messages.ts b/src/addons/messages/services/messages.ts
index ba07393c5..c53ddfac3 100644
--- a/src/addons/messages/services/messages.ts
+++ b/src/addons/messages/services/messages.ts
@@ -32,6 +32,7 @@ import { makeSingleton } from '@singletons';
 import { CoreError } from '@classes/errors/error';
 import { AddonMessagesSyncEvents, AddonMessagesSyncProvider } from './messages-sync';
 import { CoreWSError } from '@classes/errors/wserror';
+import { AddonNotificationsPreferencesNotificationProcessorState } from '@addons/notifications/services/notifications';
 
 const ROOT_CACHE_KEY = 'mmaMessages:';
 
@@ -3047,16 +3048,9 @@ export type AddonMessagesMessagePreferencesNotificationProcessor = {
     locked: boolean; // Is locked by admin?.
     lockedmessage?: string; // @since 3.6. Text to display if locked.
     userconfigured: number; // Is configured?.
-    loggedin: {
-        name: string; // Name.
-        displayname: string; // Display name.
-        checked: boolean; // Is checked?.
-    };
-    loggedoff: {
-        name: string; // Name.
-        displayname: string; // Display name.
-        checked: boolean; // Is checked?.
-    };
+    enabled?: boolean; // @since 4.0. Processor enabled.
+    loggedin: AddonNotificationsPreferencesNotificationProcessorState; // @deprecated removed on 4.0.
+    loggedoff: AddonNotificationsPreferencesNotificationProcessorState; // @deprecated removed on 4.0.
 };
 
 /**
diff --git a/src/addons/notifications/services/notifications.ts b/src/addons/notifications/services/notifications.ts
index 86b5f5f49..28c60c1ed 100644
--- a/src/addons/notifications/services/notifications.ts
+++ b/src/addons/notifications/services/notifications.ts
@@ -435,15 +435,18 @@ export type AddonNotificationsPreferencesNotificationProcessor = {
     locked: boolean; // Is locked by admin?.
     lockedmessage?: string; // @since 3.6. Text to display if locked.
     userconfigured: number; // Is configured?.
-    loggedin: AddonNotificationsPreferencesNotificationProcessorState;
-    loggedoff: AddonNotificationsPreferencesNotificationProcessorState;
+    enabled?: boolean; // @since 4.0. Processor enabled.
+    loggedin: AddonNotificationsPreferencesNotificationProcessorState; // @deprecated removed on 4.0.
+    loggedoff: AddonNotificationsPreferencesNotificationProcessorState; // @deprecated removed on 4.0.
 };
 
 /**
  * State in notification processor in notification preferences component.
+ *
+ * @deprecated removed on 4.0.
  */
 export type AddonNotificationsPreferencesNotificationProcessorState = {
-    name: string; // Name.
+    name: 'loggedoff' | 'loggedin'; // Name.
     displayname: string; // Display name.
     checked: boolean; // Is checked?.
 };
diff --git a/src/core/features/settings/lang.json b/src/core/features/settings/lang.json
index edaa16204..a7fe5e31f 100644
--- a/src/core/features/settings/lang.json
+++ b/src/core/features/settings/lang.json
@@ -29,6 +29,7 @@
     "disableall": "Disable notifications",
     "disabled": "Disabled",
     "disabledfeatures": "Disabled features",
+    "disallowed": "Disallowed",
     "displayformat": "Display format",
     "enabledownloadsection": "Enable download sections",
     "enablefirebaseanalytics": "Enable Firebase analytics",
@@ -43,6 +44,7 @@
     "filesystemroot": "File system root",
     "fontsize": "Text size",
     "fontsizecharacter": "A",
+    "forced": "Locked",
     "forcedsetting": "This setting has been forced by your site configuration.",
     "forcesafeareamargins": "Force safe area margins",
     "general": "General",
@@ -53,7 +55,6 @@
     "license": "Licence",
     "localnotifavailable": "Local notifications available",
     "locationhref": "Web view URL",
-    "locked": "Locked",
     "loggedin": "Online",
     "loggedoff": "Offline",
     "navigatorlanguage": "Navigator language",

From 93251a55947aaa2a31bc4820cc1efccca9536ad7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 28 Jan 2022 17:41:10 +0100
Subject: [PATCH 0437/1008] MOBILE-3976 notifications: Use new enabled setting
 on 4.0 onward

---
 .../pages/settings/settings.html              | 197 ++++++++++++------
 .../pages/settings/settings.scss              |   6 +-
 .../notifications/pages/settings/settings.ts  |  82 ++++++--
 .../services/notifications-helper.ts          |  34 +--
 .../notifications/services/notifications.ts   |   2 +
 5 files changed, 202 insertions(+), 119 deletions(-)

diff --git a/src/addons/notifications/pages/settings/settings.html b/src/addons/notifications/pages/settings/settings.html
index cafdb246d..6bd5e89d8 100644
--- a/src/addons/notifications/pages/settings/settings.html
+++ b/src/addons/notifications/pages/settings/settings.html
@@ -35,75 +35,144 @@
         </ion-card>
 
         <!-- Show processor selector. -->
-        <core-combobox *ngIf="preferences && preferences.processors && preferences.processors.length > 0"
-            [selection]="currentProcessor!.name" (onChange)="changeProcessor($event)">
+        <core-combobox *ngIf="preferences && preferences.processors && preferences.processors.length > 0" [selection]="currentProcessorName"
+            (onChange)="changeProcessor($event)">
             <ion-select-option class="ion-text-wrap" *ngFor="let processor of preferences.processors" [value]="processor.name">
                 {{ processor.displayname }}
             </ion-select-option>
         </core-combobox>
 
-        <ion-card list *ngFor="let component of components" class="ion-margin-top">
-            <ion-item-divider class="ion-text-wrap">
-                <ion-grid class="ion-no-padding">
-                    <ion-row class="ion-no-padding">
-                        <ion-col class="ion-no-padding">{{ component.displayname }}</ion-col>
-                        <ion-col size="2" class="ion-text-center ion-no-padding ion-hide-md-down">
-                            {{ 'core.settings.loggedin' | translate }}
-                        </ion-col>
-                        <ion-col size="2" class="ion-text-center ion-no-padding ion-hide-md-down">
-                            {{ 'core.settings.loggedoff' | translate }}
-                        </ion-col>
-                    </ion-row>
-                </ion-grid>
-            </ion-item-divider>
-            <ng-container *ngFor="let notification of component.notifications">
-                <!-- Tablet view -->
-                <ion-grid class="ion-text-wrap ion-hide-md-down addon-notifications-table-content">
-                    <ion-row class="ion-align-items-center">
-                        <ion-col class="ion-margin-horizontal">{{ notification.displayname }}</ion-col>
-                        <ion-col size="2" class="ion-text-center" *ngFor="let state of ['loggedin', 'loggedoff']">
-                            <!-- If notifications enabled, show toggle. -->
-                            <ion-spinner [hidden]="!preferences!.enableall ||
-                                !(notification.processorsByName[currentProcessor!.name][state] &&
-                                notification.processorsByName[currentProcessor!.name][state].updating)">
-                            </ion-spinner>
-                            <ion-toggle *ngIf="preferences!.enableall && !notification.processorsByName[currentProcessor!.name].locked"
-                                [(ngModel)]="notification.processorsByName[currentProcessor!.name][state].checked"
-                                (ngModelChange)="changePreference(notification, state)"
-                                [disabled]="notification.processorsByName[currentProcessor!.name][state].updating">
-                            </ion-toggle>
-                            <span class="text-gray"
-                                *ngIf="preferences!.enableall && notification.processorsByName[currentProcessor!.name].locked">
-                                {{'core.settings.locked' | translate }}
-                            </span>
-                            <!-- If notifications are disabled, show "Disabled" instead of toggle. -->
-                            <span *ngIf="!preferences!.enableall">{{ 'core.settings.disabled' | translate }}</span>
-                        </ion-col>
-                    </ion-row>
-                </ion-grid>
+        <ng-container *ngIf="loggedInOffLegacyMode">
+            <ng-container *ngTemplateOutlet="legacySettings; context: {preferences: preferences}"></ng-container>
+        </ng-container>
 
-                <!-- Phone view -->
-                <ion-list-header class="ion-text-wrap ion-no-margin ion-hide-md-up">
-                    {{ notification.displayname }}
-                </ion-list-header>
-                <!-- If notifications enabled, show toggles. If disabled, show "Disabled" instead of toggle. -->
-                <ion-item *ngFor="let state of ['loggedin', 'loggedoff']" class="ion-text-wrap ion-hide-md-up" lines="none">
-                    <ion-label>{{ 'core.settings.' + state | translate }}</ion-label>
-                    <ion-spinner slot="end" *ngIf="preferences!.enableall && (notification.processorsByName[currentProcessor!.name][state] &&
-                        notification.processorsByName[currentProcessor!.name][state].updating)">
-                    </ion-spinner>
-                    <ion-toggle slot="end" *ngIf="preferences!.enableall && !notification.processorsByName[currentProcessor!.name].locked"
-                        [(ngModel)]="notification.processorsByName[currentProcessor!.name][state].checked"
-                        (ngModelChange)="changePreference(notification, state)"
-                        [disabled]="notification.processorsByName[currentProcessor!.name][state].updating">
-                    </ion-toggle>
-                    <span slot="end" *ngIf="preferences!.enableall && notification.processorsByName[currentProcessor!.name].locked"
-                        class="text-gray">
-                        {{'core.settings.locked' | translate }}
-                    </span>
-                    <ion-note slot="end" *ngIf="!preferences!.enableall">{{ 'core.settings.disabled' | translate }}</ion-note>
-                </ion-item>
-            </ng-container>
-        </ion-card>
+        <ng-container *ngIf="!loggedInOffLegacyMode">
+            <ng-container *ngTemplateOutlet="settings; context: {preferences: preferences}"></ng-container>
+        </ng-container>
     </core-loading>
 </ion-content>
+
+
+<!-- 3.11 or downwards version -->
+<ng-template #legacySettings let-preferences="preferences">
+    <ion-card *ngFor="let component of components" class="ion-margin-top">
+        <ion-card-header class="ion-no-padding">
+            <ion-item class="ion-text-wrap divider">
+                <ion-label class="ion-text-wrap">
+                    <ion-row class="ion-no-padding">
+                        <ion-col class="ion-no-padding">
+                            <p class="item-heading">{{ component.displayname }}</p>
+                        </ion-col>
+                        <ion-col size="2" class="ion-text-center ion-no-padding ion-hide-md-down">
+                            <p>{{ 'core.settings.loggedin' | translate }}</p>
+                        </ion-col>
+                        <ion-col size="2" class="ion-text-center ion-no-padding ion-hide-md-down">
+                            <p>{{ 'core.settings.loggedoff' | translate }}</p>
+                        </ion-col>
+                    </ion-row>
+                </ion-label>
+            </ion-item>
+        </ion-card-header>
+        <ng-container *ngFor="let notification of component.notifications">
+            <!-- Tablet view -->
+            <ion-item class="ion-text-wrap ion-hide-md-down addon-notifications-table-content only-links">
+                <ion-label>
+                    <ion-row class="ion-no-padding ion-align-items-center">
+                        <ion-col class="ion-margin-horizontal ion-no-padding">
+                            <p class="item-heading">{{ notification.displayname }}</p>
+                        </ion-col>
+                        <ion-col size="2" class="ion-text-center ion-no-padding" *ngFor="let state of ['loggedin', 'loggedoff']">
+                            <ng-container *ngIf="preferences!.enableall && notification.processorsByName[currentProcessorName][state]">
+                                <!-- If notifications enabled, show toggle. -->
+                                <core-button-with-spinner *ngIf="!notification.processorsByName[currentProcessorName].locked"
+                                    [loading]="notification.processorsByName[currentProcessorName][state].updating">
+                                    <ion-toggle [(ngModel)]="notification.processorsByName[currentProcessorName][state].checked"
+                                        (ngModelChange)="changePreferenceLegacy(notification, state)">
+                                    </ion-toggle>
+                                </core-button-with-spinner>
+                                <span class="text-gray" *ngIf="notification.processorsByName[currentProcessorName].locked &&
+                                    notification.processorsByName[currentProcessorName][state].checked">
+                                    {{'core.settings.forced' | translate }}
+                                </span>
+                                <span class="text-gray" *ngIf="notification.processorsByName[currentProcessorName].locked &&
+                                    !notification.processorsByName[currentProcessorName][state].checked">
+                                    {{'core.settings.disallowed' | translate }}
+                                </span>
+                            </ng-container>
+                            <!-- If notifications are disabled, show "Disabled" instead of toggle. -->
+                            <span *ngIf="!preferences!.enableall" class="text-gray">{{ 'core.settings.disabled' | translate }}</span>
+                        </ion-col>
+                    </ion-row>
+                </ion-label>
+            </ion-item>
+
+            <!-- Phone view -->
+            <ion-item class="ion-text-wrap ion-no-margin ion-hide-md-up" lines="none">
+                <p class="item-heading">{{ notification.displayname }}</p>
+            </ion-item>
+            <!-- If notifications enabled, show toggles. If disabled, show "Disabled" instead of toggle. -->
+            <ion-item *ngFor="let state of ['loggedin', 'loggedoff']" class="ion-text-wrap ion-hide-md-up" lines="none">
+                <ion-label class="ion-margin-horizontal">
+                    <p>{{ 'core.settings.' + state | translate }}</p>
+                </ion-label>
+                <div slot="end" *ngIf="preferences!.enableall && notification.processorsByName[currentProcessorName][state]">
+                    <core-button-with-spinner *ngIf="!notification.processorsByName[currentProcessorName].locked"
+                        [loading]="notification.processorsByName[currentProcessorName][state].updating">
+                        <ion-toggle *ngIf="!notification.processorsByName[currentProcessorName].locked"
+                            [(ngModel)]="notification.processorsByName[currentProcessorName][state].checked"
+                            (ngModelChange)="changePreferenceLegacy(notification, state)">
+                        </ion-toggle>
+                    </core-button-with-spinner>
+                    <span class="text-gray" *ngIf="notification.processorsByName[currentProcessorName].locked &&
+                        notification.processorsByName[currentProcessorName][state].checked">
+                        {{'core.settings.forced' | translate }}
+                    </span>
+                    <span class="text-gray" *ngIf="notification.processorsByName[currentProcessorName].locked &&
+                        !notification.processorsByName[currentProcessorName][state].checked">
+                        {{'core.settings.disallowed' | translate }}
+                    </span>
+                </div>
+                <span class="text-gray" slot="end" *ngIf="!preferences!.enableall">{{ 'core.settings.disabled' | translate }}</span>
+            </ion-item>
+        </ng-container>
+    </ion-card>
+</ng-template>
+
+<!-- 4.0 or downwards version -->
+<ng-template #settings let-preferences="preferences">
+    <ion-card *ngFor="let component of components" class="ion-margin-top">
+        <ion-item-divider class="ion-text-wrap">
+            <ion-label>
+                <p class="item-heading">{{ component.displayname }}</p>
+            </ion-label>
+        </ion-item-divider>
+        <ng-container *ngFor="let notification of component.notifications">
+            <!-- If notifications enabled, show toggles. If disabled, show "Disabled" instead of toggle. -->
+            <ion-item class="ion-text-wrap" lines="none">
+                <ion-label>
+                    <p>{{ notification.displayname }}</p>
+                </ion-label>
+
+                <div slot="end" *ngIf="preferences!.enableall">
+                    <core-button-with-spinner *ngIf="!notification.processorsByName[currentProcessorName].locked"
+                        [loading]="notification.processorsByName[currentProcessorName].updating">
+                        <ion-toggle *ngIf="!notification.processorsByName[currentProcessorName].locked"
+                            [(ngModel)]="notification.processorsByName[currentProcessorName].enabled"
+                            (ngModelChange)="changePreference(notification)">
+                        </ion-toggle>
+                    </core-button-with-spinner>
+                    <span class="text-gray" *ngIf=" notification.processorsByName[currentProcessorName].locked &&
+                        notification.processorsByName[currentProcessorName].enabled">
+                        {{'core.settings.forced' | translate }}
+                    </span>
+                    <span class="text-gray" *ngIf=" notification.processorsByName[currentProcessorName].locked &&
+                        !notification.processorsByName[currentProcessorName].enabled">
+                        {{'core.settings.disallowed' | translate }}
+                    </span>
+                </div>
+                <span class="text-gray" slot="end" *ngIf="!preferences!.enableall">{{ 'core.settings.disabled' | translate }}</span>
+            </ion-item>
+        </ng-container>
+    </ion-card>
+
+</ng-template>
diff --git a/src/addons/notifications/pages/settings/settings.scss b/src/addons/notifications/pages/settings/settings.scss
index 8fea99c17..d224357cb 100644
--- a/src/addons/notifications/pages/settings/settings.scss
+++ b/src/addons/notifications/pages/settings/settings.scss
@@ -1,5 +1,3 @@
-:host {
-    .addon-notifications-table-content ion-row {
-        min-height: 35px;
-    }
+.addon-notifications-table-content ion-row {
+    min-height: 35px;
 }
diff --git a/src/addons/notifications/pages/settings/settings.ts b/src/addons/notifications/pages/settings/settings.ts
index d8cc886d3..a9fbe1210 100644
--- a/src/addons/notifications/pages/settings/settings.ts
+++ b/src/addons/notifications/pages/settings/settings.ts
@@ -27,7 +27,6 @@ import { CoreError } from '@classes/errors/error';
 import { CoreEvents } from '@singletons/events';
 import {
     AddonNotifications,
-    AddonNotificationsPreferencesProcessor,
     AddonNotificationsPreferencesNotificationProcessorState,
 } from '../../services/notifications';
 import {
@@ -51,16 +50,20 @@ export class AddonNotificationsSettingsPage implements OnInit, OnDestroy {
 
     preferences?: AddonNotificationsPreferencesFormatted;
     components?: AddonNotificationsPreferencesComponentFormatted[];
-    currentProcessor?: AddonNotificationsPreferencesProcessor;
+    currentProcessorName = 'airnotifier';
     preferencesLoaded = false;
     notificationSound = false;
     canChangeSound: boolean;
     processorHandlers: AddonMessageOutputHandlerData[] = [];
+    loggedInOffLegacyMode = false;
 
     protected updateTimeout?: number;
 
     constructor() {
         this.canChangeSound = CoreLocalNotifications.canDisableSound();
+
+        const currentSite = CoreSites.getRequiredCurrentSite();
+        this.loggedInOffLegacyMode = !currentSite.isVersionGreaterEqualThan('4.0');
     }
 
     /**
@@ -83,20 +86,20 @@ export class AddonNotificationsSettingsPage implements OnInit, OnDestroy {
         try {
             const preferences = await AddonNotifications.getNotificationPreferences();
 
-            if (!this.currentProcessor) {
-                // Initialize current processor. Load "Mobile" (airnotifier) if available.
-                this.currentProcessor = AddonNotificationsHelper.getProcessor(preferences.processors, 'airnotifier');
+            // Initialize current processor. Load "Mobile" (airnotifier) if available.
+            let currentProcessor = preferences.processors.find((processor) => processor.name == this.currentProcessorName);
+            if (!currentProcessor) {
+                currentProcessor = preferences.processors[0];
             }
 
-            if (!this.currentProcessor) {
+            if (!currentProcessor) {
                 // Shouldn't happen.
                 throw new CoreError('No processor found');
             }
 
             preferences.enableall = !preferences.disableall;
             this.preferences = AddonNotificationsHelper.formatPreferences(preferences);
-            this.loadProcessor(this.currentProcessor);
-
+            this.loadProcessor(currentProcessor);
         } catch (error) {
             CoreDomUtils.showErrorModal(error);
         } finally {
@@ -114,7 +117,7 @@ export class AddonNotificationsSettingsPage implements OnInit, OnDestroy {
             return;
         }
 
-        this.currentProcessor = processor;
+        this.currentProcessorName = processor.name;
         this.processorHandlers = [];
         this.components = AddonNotificationsHelper.getProcessorComponents(
             processor.name,
@@ -199,27 +202,21 @@ export class AddonNotificationsSettingsPage implements OnInit, OnDestroy {
      * @param state State name, ['loggedin', 'loggedoff'].
      * @return Promise resolved when done.
      */
-    async changePreference(notification: AddonNotificationsPreferencesNotificationFormatted, state: string): Promise<void> {
-        const processor = notification.processorsByName?.[this.currentProcessor?.name || ''];
+    async changePreferenceLegacy(notification: AddonNotificationsPreferencesNotificationFormatted, state: string): Promise<void> {
+        const processor = notification.processorsByName?.[this.currentProcessorName];
         if (!processor) {
             return;
         }
 
         const processorState: ProcessorStateFormatted = processor[state];
         const preferenceName = notification.preferencekey + '_' + processorState.name;
-        let value: string | undefined;
 
-        notification.processors.forEach((processor) => {
-            if (processor[state].checked) {
-                if (!value) {
-                    value = processor.name;
-                } else {
-                    value += ',' + processor.name;
-                }
-            }
-        });
+        let value = notification.processors
+            .filter((processor) => processor[state].checked)
+            .map((processor) => processor.name)
+            .join(',');
 
-        if (!value) {
+        if (value == '') {
             value = 'none';
         }
 
@@ -239,6 +236,45 @@ export class AddonNotificationsSettingsPage implements OnInit, OnDestroy {
         }
     }
 
+    /**
+     * Change the value of a certain preference.
+     *
+     * @param notification Notification object.
+     * @return Promise resolved when done.
+     */
+    async changePreference(notification: AddonNotificationsPreferencesNotificationFormatted): Promise<void> {
+        const processor = notification.processorsByName?.[this.currentProcessorName];
+        if (!processor) {
+            return;
+        }
+
+        const preferenceName = notification.preferencekey + '_enabled';
+
+        let value = notification.processors
+            .filter((processor) => processor.enabled)
+            .map((processor) => processor.name)
+            .join(',');
+
+        if (value == '') {
+            value = 'none';
+        }
+
+        processor.updating = true;
+
+        try {
+            await CoreUser.updateUserPreference(preferenceName, value);
+
+            // Update the preferences since they were modified.
+            this.updatePreferencesAfterDelay();
+        } catch (error) {
+            // Show error and revert change.
+            CoreDomUtils.showErrorModal(error);
+            processor.enabled = !processor.enabled;
+        } finally {
+            processor.updating = false;
+        }
+    }
+
     /**
      * Enable all notifications changed.
      *
@@ -294,6 +330,8 @@ export class AddonNotificationsSettingsPage implements OnInit, OnDestroy {
 
 /**
  * State in notification processor in notification preferences component with some calculated data.
+ *
+ * @deprecated 4.0
  */
 type ProcessorStateFormatted = AddonNotificationsPreferencesNotificationProcessorState & {
     updating?: boolean; // Calculated in the app. Whether the state is being updated.
diff --git a/src/addons/notifications/services/notifications-helper.ts b/src/addons/notifications/services/notifications-helper.ts
index 8ccd98f55..8eb24bfdc 100644
--- a/src/addons/notifications/services/notifications-helper.ts
+++ b/src/addons/notifications/services/notifications-helper.ts
@@ -77,34 +77,6 @@ export class AddonNotificationsHelperProvider {
         return formattedPreferences;
     }
 
-    /**
-     * Get a certain processor from a list of processors.
-     *
-     * @param processors List of processors.
-     * @param name Name of the processor to get.
-     * @param fallback True to return first processor if not found, false to not return any. Defaults to true.
-     * @return Processor.
-     */
-    getProcessor(
-        processors: AddonNotificationsPreferencesProcessor[],
-        name: string,
-        fallback: boolean = true,
-    ): AddonNotificationsPreferencesProcessor | undefined {
-        if (!processors || !processors.length) {
-            return;
-        }
-
-        const processor = processors.find((processor) => processor.name == name);
-        if (processor) {
-            return processor;
-        }
-
-        // Processor not found, return first if requested.
-        if (fallback) {
-            return processors[0];
-        }
-    }
-
     /**
      * Return the components and notifications that have a certain processor.
      *
@@ -166,7 +138,11 @@ export type AddonNotificationsPreferencesComponentFormatted = Omit<AddonNotifica
  * Preferences notification with some calculated data.
  */
 export type AddonNotificationsPreferencesNotificationFormatted = AddonNotificationsPreferencesNotification & {
-    processorsByName?: Record<string, AddonNotificationsPreferencesNotificationProcessor>; // Calculated in the app.
+    processorsByName?: Record<string, AddonNotificationsPreferencesNotificationProcessorFormatted>; // Calculated in the app.
+};
+
+type AddonNotificationsPreferencesNotificationProcessorFormatted = AddonNotificationsPreferencesNotificationProcessor & {
+    updating?: boolean; // Calculated in the app. Whether the state is being updated.
 };
 
 /**
diff --git a/src/addons/notifications/services/notifications.ts b/src/addons/notifications/services/notifications.ts
index 28c60c1ed..1fab101db 100644
--- a/src/addons/notifications/services/notifications.ts
+++ b/src/addons/notifications/services/notifications.ts
@@ -451,6 +451,8 @@ export type AddonNotificationsPreferencesNotificationProcessorState = {
     checked: boolean; // Is checked?.
 };
 
+export type AddonNotificationsPreferencesNotificationProcessorStateSetting = 'loggedoff' | 'loggedin' | 'enabled';
+
 /**
  * Params of core_message_get_messages WS.
  */

From 72f189a93d3647e773a59d1b7262ee4ab4c0b59e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 28 Jan 2022 17:41:33 +0100
Subject: [PATCH 0438/1008] MOBILE-3976 style: Fix combobox styling

---
 src/core/components/combobox/combobox.scss | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/core/components/combobox/combobox.scss b/src/core/components/combobox/combobox.scss
index 2548e9f1b..bef06c30c 100644
--- a/src/core/components/combobox/combobox.scss
+++ b/src/core/components/combobox/combobox.scss
@@ -28,7 +28,6 @@
         --padding-top: 8px;
         --padding-end: 8px;
         --padding-bottom: 8px;
-        --padding-start: 8px;
 
         &.md {
             --background-activated-opacity: 0;
@@ -40,6 +39,14 @@
             --background-focused-opacity: .15;
         }
     }
+
+    ion-button {
+        --padding-start: 8px;
+    }
+
+    ion-select {
+        --padding-start: 16px;
+    }
 }
 
 ion-select,
@@ -48,7 +55,7 @@ ion-button {
     color: var(--color);
     text-overflow: ellipsis;
     white-space: nowrap;
-    min-height: 25px;
+    min-height: 26px;
     overflow: hidden;
     margin: 8px;
     box-shadow: var(--box-shadow);
@@ -109,7 +116,7 @@ ion-button {
     }
 
     .select-text {
-        margin-inline-end: auto;
+        @include margin-horizontal(null, auto);
         overflow: hidden;
         text-overflow: ellipsis;
     }

From 1e2eb7e4fb7de87038b28d9c0ac5820df8b83008 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 1 Feb 2022 11:40:31 +0100
Subject: [PATCH 0439/1008] MOBILE-3915 course: Align icons on course index

---
 .../components/course-index/course-index.html |  78 ++++++------
 .../components/course-index/course-index.scss |   9 +-
 .../components/course-index/course-index.ts   | 111 ++++++++++--------
 .../components/format/core-course-format.html |   1 -
 .../course/components/format/format.ts        |  39 ++++--
 5 files changed, 131 insertions(+), 107 deletions(-)

diff --git a/src/core/features/course/components/course-index/course-index.html b/src/core/features/course/components/course-index/course-index.html
index 7a97a6b41..b0f6d03a3 100644
--- a/src/core/features/course/components/course-index/course-index.html
+++ b/src/core/features/course/components/course-index/course-index.html
@@ -12,9 +12,9 @@
 </ion-header>
 <ion-content>
     <ion-list id="core-course-section-selector" role="listbox" aria-labelledby="core-course-section-selector-label">
-        <ng-container *ngFor="let section of sections">
-            <ion-item *ngIf="allSectionId == section.id" class="ion-text-wrap divider" (click)="selectSection($event, section)" button
-                [class.item-current]="selectedId === section.id" detail="false">
+        <ng-container *ngFor="let section of sectionsToRender">
+            <ion-item *ngIf="allSectionId == section.id" class="ion-text-wrap divider core-course-index-all"
+                (click)="selectSectionOrModule($event, section.id)" button [class.item-current]="selectedId === section.id" detail="false">
                 <ion-label>
                     <p class="item-heading">
                         <core-format-text [text]="section.name" contextLevel="course" [contextInstanceId]="course?.id">
@@ -22,16 +22,17 @@
                     </p>
                 </ion-label>
             </ion-item>
-            <ng-container *ngIf="allSectionId != section.id && !section.hiddenbynumsections &&
-                    section.id != stealthModulesSectionId && section.uservisible !== false">
-                <ion-item class="ion-text-wrap divider section" (click)="selectSection($event, section)"
-                    [button]="section.visible !== 0 && section.uservisible !== false" [class.item-current]="selectedId === section.id"
-                    [class.item-dimmed]="section.visible === 0" detail="false" sticky="true">
-                    <ion-icon [name]="section.expanded ? 'fas-chevron-down' : 'fas-chevron-right'" flip-rtl slot="start"
-                        class="expandable-status-icon" (click)="toggleExpand($event, section)"
+            <ng-container *ngIf="allSectionId != section.id">
+                <ion-item class="ion-text-wrap divider section" (click)="selectSectionOrModule($event, section.id)" button
+                    [class.item-current]="selectedId === section.id" [class.item-dimmed]="section.visible === 0" detail="false"
+                    sticky="true">
+                    <ion-icon *ngIf="section.hasVisibleModules" [name]="section.expanded ? 'fas-chevron-down' : 'fas-chevron-right'"
+                        flip-rtl slot="start" class="expandable-status-icon" (click)="toggleExpand($event, section)"
                         [attr.aria-label]="(section.expanded ? 'core.collapse' : 'core.expand') | translate"
                         [attr.aria-expanded]="section.expanded" [attr.aria-controls]="'core-course-index-section-' + section.id">
                     </ion-icon>
+                    <ion-icon *ngIf="!section.hasVisibleModules" name="" slot="start" aria-hidden="true" class="expandable-status-icon">
+                    </ion-icon>
                     <ion-label>
                         <p class="item-heading">
                             <core-format-text [text]="section.name" contextLevel="course" [contextInstanceId]="course?.id">
@@ -42,37 +43,34 @@
                     <ion-icon name="fas-lock" *ngIf="section.availabilityinfo" slot="end" class="restricted"
                         [attr.aria-label]="'core.restricted' | translate"></ion-icon>
                 </ion-item>
-                <div [hidden]="!section.expanded" [id]="'core-course-index-section-' + section.id">
-                    <ng-container *ngIf="section.expanded">
-                        <ng-container *ngFor="let module of section.modules">
-                            <ion-item [class.item-dimmed]="module.visible === 0"
-                                *ngIf="module.visibleoncoursepage !== 0 && !module.noviewlink"
-                                (click)="selectModule($event, section, module)" button>
-                                <ion-icon class="completioninfo completion_none" name="" *ngIf="module.completionStatus === undefined"
-                                    slot="start" aria-hidden="true"></ion-icon>
-                                <ion-icon class="completioninfo completion_incomplete" name="far-circle"
-                                    *ngIf="module.completionStatus === 0" slot="start" [attr.aria-label]="'core.course.todo' | translate">
-                                </ion-icon>
-                                <ion-icon class="completioninfo completion_complete" name="fas-circle"
-                                    *ngIf="module.completionStatus === 1 || module.completionStatus === 2" color="success" slot="start"
-                                    [attr.aria-label]="'core.course.done' | translate">
-                                </ion-icon>
-                                <ion-icon class="completioninfo completion_fail" name="fas-circle" *ngIf="module.completionStatus === 3"
-                                    color="danger" slot="start" [attr.aria-label]="'core.course.failed' | translate">
-                                </ion-icon>
-                                <ion-label>
-                                    <p class="item-heading">
-                                        <core-format-text [text]="module.name" contextLevel="module" [contextInstanceId]="module.id"
-                                            [courseId]="module.courseid">
-                                        </core-format-text>
-                                    </p>
-                                </ion-label>
-                                <ion-icon name="fas-lock" *ngIf="module.uservisible === false" slot="end" class="restricted"
-                                    [attr.aria-label]="'core.restricted' | translate"></ion-icon>
-                            </ion-item>
-                        </ng-container>
+                <ng-container *ngIf="section.expanded">
+                    <ng-container *ngFor="let module of section.modules">
+                        <ion-item [class.item-dimmed]="!module.visible" (click)="selectSectionOrModule($event, section.id, module.id)"
+                            button>
+                            <ion-icon class="completioninfo completion_none" name="" *ngIf="module.completionStatus === undefined"
+                                slot="start" aria-hidden="true"></ion-icon>
+                            <ion-icon class="completioninfo completion_incomplete" name="far-circle" *ngIf="module.completionStatus === 0"
+                                slot="start" [attr.aria-label]="'core.course.todo' | translate">
+                            </ion-icon>
+                            <ion-icon class="completioninfo completion_complete" name="fas-circle"
+                                *ngIf="module.completionStatus === 1 || module.completionStatus === 2" color="success" slot="start"
+                                [attr.aria-label]="'core.course.done' | translate">
+                            </ion-icon>
+                            <ion-icon class="completioninfo completion_fail" name="fas-circle" *ngIf="module.completionStatus === 3"
+                                color="danger" slot="start" [attr.aria-label]="'core.course.failed' | translate">
+                            </ion-icon>
+                            <ion-label>
+                                <p class="item-heading">
+                                    <core-format-text [text]="module.name" contextLevel="module" [contextInstanceId]="module.id"
+                                        [courseId]="module.course">
+                                    </core-format-text>
+                                </p>
+                            </ion-label>
+                            <ion-icon name="fas-lock" *ngIf="!module.uservisible" slot="end" class="restricted"
+                                [attr.aria-label]="'core.restricted' | translate"></ion-icon>
+                        </ion-item>
                     </ng-container>
-                </div>
+                </ng-container>
             </ng-container>
         </ng-container>
     </ion-list>
diff --git a/src/core/features/course/components/course-index/course-index.scss b/src/core/features/course/components/course-index/course-index.scss
index 8ef120471..f9ee8c8ba 100644
--- a/src/core/features/course/components/course-index/course-index.scss
+++ b/src/core/features/course/components/course-index/course-index.scss
@@ -16,18 +16,21 @@ ion-icon.completioninfo {
     width: 18px;
 }
 
-ion-item.section::part(native) {
+ion-item::part(native) {
     --padding-start: 0;
 }
 
-ion-icon.expandable-status-icon {
+ion-icon {
     margin: 0;
     @include padding(12px, 32px, 12px, 16px);
 }
 
+ion-item.core-course-index-all::part(native) {
+    --padding-start: 16px;
+}
+
 ion-item.item-current ion-icon.expandable-status-icon {
     @include padding(null, null, null, 11px);
-
 }
 
 ion-icon.restricted {
diff --git a/src/core/features/course/components/course-index/course-index.ts b/src/core/features/course/components/course-index/course-index.ts
index a7b871765..b33f61ee3 100644
--- a/src/core/features/course/components/course-index/course-index.ts
+++ b/src/core/features/course/components/course-index/course-index.ts
@@ -13,19 +13,18 @@
 // limitations under the License.
 
 import { Component, ElementRef, Input, OnInit, ViewChild } from '@angular/core';
-
-import { CoreCourseModuleData, CoreCourseSection } from '@features/course/services/course-helper';
 import {
     CoreCourseModuleCompletionStatus,
     CoreCourseModuleCompletionTracking,
     CoreCourseProvider,
 } from '@features/course/services/course';
-import { CoreCourseAnyCourseData } from '@features/courses/services/courses';
-import { CoreUtils } from '@services/utils/utils';
-import { ModalController } from '@singletons';
+import { CoreCourseSection } from '@features/course/services/course-helper';
 import { CoreCourseFormatDelegate } from '@features/course/services/format-delegate';
+import { CoreCourseAnyCourseData } from '@features/courses/services/courses';
 import { IonContent } from '@ionic/angular';
 import { CoreDomUtils } from '@services/utils/dom';
+import { CoreUtils } from '@services/utils/utils';
+import { ModalController } from '@singletons';
 
 /**
  * Component to display course index modal.
@@ -39,13 +38,13 @@ export class CoreCourseCourseIndexComponent implements OnInit {
 
     @ViewChild(IonContent) content?: IonContent;
 
-    @Input() sections?: CourseIndexSection[];
+    @Input() sections: CoreCourseSection[] = [];
     @Input() selectedId?: number;
     @Input() course?: CoreCourseAnyCourseData;
 
-    stealthModulesSectionId = CoreCourseProvider.STEALTH_MODULES_SECTION_ID;
     allSectionId = CoreCourseProvider.ALL_SECTIONS_ID;
     highlighted?: string;
+    sectionsToRender: CourseIndexSection[] = [];
 
     constructor(
         protected elementRef: ElementRef,
@@ -70,29 +69,47 @@ export class CoreCourseCourseIndexComponent implements OnInit {
             return;
         }
 
-        // Collapse all sections first.
-        this.sections.forEach((section) => section.expanded = false);
-
         const currentSection = await CoreCourseFormatDelegate.getCurrentSection(this.course, this.sections);
-        currentSection.highlighted = true;
+
         if (this.selectedId === undefined) {
-            currentSection.expanded = true;
+            // Highlight current section if none is selected.
             this.selectedId = currentSection.id;
-        } else {
-            const selectedSection = this.sections.find((section) => section.id == this.selectedId);
-            if (selectedSection) {
-                selectedSection.expanded = true;
-            }
         }
 
-        this.sections.forEach((section) => {
-            section.modules.forEach((module) => {
-                module.completionStatus = module.completiondata === undefined ||
-                    module.completiondata.tracking == CoreCourseModuleCompletionTracking.COMPLETION_TRACKING_NONE
-                    ? undefined
-                    : module.completiondata.state;
+        // Clone sections to add information.
+        this.sectionsToRender = this.sections
+            .filter((section) => !section.hiddenbynumsections &&
+                section.id != CoreCourseProvider.STEALTH_MODULES_SECTION_ID &&
+                section.uservisible !== false)
+            .map((section) => {
+                const modules = section.modules
+                    .filter((module) => module.visibleoncoursepage !== 0 && !module.noviewlink)
+                    .map((module) => {
+                        const completionStatus = module.completiondata === undefined ||
+                        module.completiondata.tracking == CoreCourseModuleCompletionTracking.COMPLETION_TRACKING_NONE
+                            ? undefined
+                            : module.completiondata.state;
+
+                        return {
+                            id: module.id,
+                            name: module.name,
+                            course: module.course,
+                            visible: !!module.visible,
+                            uservisible: !!module.uservisible,
+                            completionStatus,
+                        };
+                    });
+
+                return {
+                    id: section.id,
+                    name: section.name,
+                    availabilityinfo: !!section.availabilityinfo,
+                    expanded: section.id === this.selectedId,
+                    highlighted: currentSection?.id === section.id,
+                    hasVisibleModules: modules.length > 0,
+                    modules: modules,
+                };
             });
-        });
 
         this.highlighted = CoreCourseFormatDelegate.getSectionHightlightedName(this.course);
 
@@ -102,7 +119,7 @@ export class CoreCourseCourseIndexComponent implements OnInit {
                 this.content,
                 '.item.item-current',
             );
-        }, 200);
+        }, 300);
     }
 
     /**
@@ -128,39 +145,33 @@ export class CoreCourseCourseIndexComponent implements OnInit {
      * Select a section.
      *
      * @param event Event.
-     * @param section Selected section object.
+     * @param sectionId Selected section id.
+     * @param moduleId Selected module id, if any.
      */
-    selectSection(event: Event, section: CoreCourseSection): void {
-        if (section.uservisible !== false) {
-            ModalController.dismiss({ event, section });
-        }
-    }
-
-    /**
-     * Select a section and open a module
-     *
-     * @param event Event.
-     * @param section Selected section object.
-     * @param module Selected module object.
-     */
-    selectModule(event: Event,section: CoreCourseSection, module: CoreCourseModuleData): void {
-        if (module.uservisible !== false) {
-            ModalController.dismiss({ event, section, module });
-        }
+    selectSectionOrModule(event: Event, sectionId: number, moduleId?: number): void {
+        ModalController.dismiss({ event, sectionId, moduleId });
     }
 
 }
 
-type CourseIndexSection = Omit<CoreCourseSection, 'modules'> & {
-    highlighted?: boolean;
-    expanded?: boolean;
-    modules: (CoreCourseModuleData & {
+type CourseIndexSection = {
+    id: number;
+    name: string;
+    highlighted: boolean;
+    expanded: boolean;
+    hasVisibleModules: boolean;
+    availabilityinfo: boolean;
+    modules: {
+        id: number;
+        course: number;
+        visible: boolean;
+        uservisible: boolean;
         completionStatus?: CoreCourseModuleCompletionStatus;
-    })[];
+    }[];
 };
 
 export type CoreCourseIndexSectionWithModule = {
     event: Event;
-    section: CourseIndexSection;
-    module?: CoreCourseModuleData;
+    sectionId: number;
+    moduleId?: number;
 };
diff --git a/src/core/features/course/components/format/core-course-format.html b/src/core/features/course/components/format/core-course-format.html
index e1712fea8..7bacb0dd0 100644
--- a/src/core/features/course/components/format/core-course-format.html
+++ b/src/core/features/course/components/format/core-course-format.html
@@ -69,7 +69,6 @@
         class="section-wrapper" [id]="section.id">
         <ion-item-divider class="course-section ion-text-wrap" color="light"
             [class.item-dimmed]="section.visible === 0 || section.uservisible === false">
-            <ion-icon name="fas-folder" aria-label="hidden" slot="start"></ion-icon>
             <ion-label>
                 <h2 *ngIf="section.name">
                     <core-format-text [text]="section.name" contextLevel="course" [contextInstanceId]="course.id">
diff --git a/src/core/features/course/components/format/format.ts b/src/core/features/course/components/format/format.ts
index f6030ede6..2d5067cdc 100644
--- a/src/core/features/course/components/format/format.ts
+++ b/src/core/features/course/components/format/format.ts
@@ -312,20 +312,33 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
             },
         });
 
-        if (data) {
-            this.sectionChanged(data.section);
-            if (data.module) {
-                if (!data.module.handlerData) {
-                    data.module.handlerData =
-                        await CoreCourseModuleDelegate.getModuleDataFor(data.module.modname, data.module, this.course.id);
-                }
-
-                if (data.module.uservisible !== false && data.module.handlerData?.action) {
-                    data.module.handlerData.action(data.event, data.module, data.module.course);
-                }
-                this.moduleId = data.module.id;
-            }
+        if (!data) {
+            return;
         }
+        const section = this.sections.find((section) => section.id == data.sectionId);
+        if (!section) {
+            return;
+        }
+        this.sectionChanged(section);
+
+        if (!data.moduleId) {
+            return;
+        }
+        const module = section.modules.find((module) => module.id == data.moduleId);
+        if (!module) {
+            return;
+        }
+
+        if (!module.handlerData) {
+            module.handlerData =
+                            await CoreCourseModuleDelegate.getModuleDataFor(module.modname, module, this.course.id);
+        }
+
+        if (module.uservisible !== false && module.handlerData?.action) {
+            module.handlerData.action(data.event, module, module.course);
+        }
+
+        this.moduleId = data.moduleId;
     }
 
     /**

From 2c2be04065460f558ec0e4ab8a099890be66a1bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 1 Feb 2022 16:50:03 +0100
Subject: [PATCH 0440/1008] MOBILE-3915 chore: Fix some imports

---
 .../myoverview/components/myoverview/myoverview.ts     |  2 +-
 .../recentlyaccessedcourses/recentlyaccessedcourses.ts |  2 +-
 .../components/starredcourses/starredcourses.ts        |  2 +-
 src/addons/calendar/calendar-lazy.module.ts            | 10 +++++-----
 src/addons/mod/workshop/services/workshop-helper.ts    |  2 +-
 src/addons/notifications/notifications.module.ts       |  2 +-
 src/addons/privatefiles/pages/index/index.ts           |  4 ++--
 src/addons/privatefiles/privatefiles.module.ts         |  2 +-
 src/addons/privatefiles/services/handlers/user.ts      |  2 +-
 src/app/app.module.ts                                  |  2 +-
 src/core/features/courses/services/courses-helper.ts   |  2 +-
 11 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/addons/block/myoverview/components/myoverview/myoverview.ts b/src/addons/block/myoverview/components/myoverview/myoverview.ts
index 9095dc2f1..97258edd6 100644
--- a/src/addons/block/myoverview/components/myoverview/myoverview.ts
+++ b/src/addons/block/myoverview/components/myoverview/myoverview.ts
@@ -26,7 +26,7 @@ import { CoreSite } from '@classes/site';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTextUtils } from '@services/utils/text';
-import { AddonCourseCompletion } from '@/addons/coursecompletion/services/coursecompletion';
+import { AddonCourseCompletion } from '@addons/coursecompletion/services/coursecompletion';
 import { AddonBlockMyOverviewFilterOptionsComponent } from '../filteroptions/filteroptions';
 import { IonSearchbar } from '@ionic/angular';
 import moment from 'moment';
diff --git a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
index 9eaa906e6..f3b99dcd6 100644
--- a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
+++ b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
@@ -27,7 +27,7 @@ import {
     CoreEnrolledCourseDataWithOptions,
 } from '@features/courses/services/courses-helper';
 import { CoreCourseOptionsDelegate } from '@features/course/services/course-options-delegate';
-import { AddonCourseCompletion } from '@/addons/coursecompletion/services/coursecompletion';
+import { AddonCourseCompletion } from '@addons/coursecompletion/services/coursecompletion';
 import { CoreBlockBaseComponent } from '@features/block/classes/base-block-component';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreSite } from '@classes/site';
diff --git a/src/addons/block/starredcourses/components/starredcourses/starredcourses.ts b/src/addons/block/starredcourses/components/starredcourses/starredcourses.ts
index 8ec6cfaf9..fc1c47de5 100644
--- a/src/addons/block/starredcourses/components/starredcourses/starredcourses.ts
+++ b/src/addons/block/starredcourses/components/starredcourses/starredcourses.ts
@@ -21,7 +21,7 @@ import {
     CoreEnrolledCourseDataWithOptions,
 } from '@features/courses/services/courses-helper';
 import { CoreCourseOptionsDelegate } from '@features/course/services/course-options-delegate';
-import { AddonCourseCompletion } from '@/addons/coursecompletion/services/coursecompletion';
+import { AddonCourseCompletion } from '@addons/coursecompletion/services/coursecompletion';
 import { CoreBlockBaseComponent } from '@features/block/classes/base-block-component';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreSite } from '@classes/site';
diff --git a/src/addons/calendar/calendar-lazy.module.ts b/src/addons/calendar/calendar-lazy.module.ts
index 20af6f9a7..d675bf134 100644
--- a/src/addons/calendar/calendar-lazy.module.ts
+++ b/src/addons/calendar/calendar-lazy.module.ts
@@ -25,26 +25,26 @@ function buildRoutes(injector: Injector): Routes {
             data: {
                 mainMenuTabRoot: AddonCalendarMainMenuHandlerService.PAGE_NAME,
             },
-            loadChildren: () => import('@/addons/calendar/pages/index/index.module').then(m => m.AddonCalendarIndexPageModule),
+            loadChildren: () => import('@addons/calendar/pages/index/index.module').then(m => m.AddonCalendarIndexPageModule),
         },
         {
             path: 'settings',
             loadChildren: () =>
-                import('@/addons/calendar/pages/settings/settings.module').then(m => m.AddonCalendarSettingsPageModule),
+                import('@addons/calendar/pages/settings/settings.module').then(m => m.AddonCalendarSettingsPageModule),
         },
         {
             path: 'day',
             loadChildren: () =>
-                import('@/addons/calendar/pages/day/day.module').then(m => m.AddonCalendarDayPageModule),
+                import('@addons/calendar/pages/day/day.module').then(m => m.AddonCalendarDayPageModule),
         },
         {
             path: 'event/:id',
-            loadChildren: () => import('@/addons/calendar/pages/event/event.module').then(m => m.AddonCalendarEventPageModule),
+            loadChildren: () => import('@addons/calendar/pages/event/event.module').then(m => m.AddonCalendarEventPageModule),
         },
         {
             path: 'edit/:eventId',
             loadChildren: () =>
-                import('@/addons/calendar/pages/edit-event/edit-event.module').then(m => m.AddonCalendarEditEventPageModule),
+                import('@addons/calendar/pages/edit-event/edit-event.module').then(m => m.AddonCalendarEditEventPageModule),
         },
         ...buildTabMainRoutes(injector, {
             redirectTo: 'index',
diff --git a/src/addons/mod/workshop/services/workshop-helper.ts b/src/addons/mod/workshop/services/workshop-helper.ts
index 94eb54851..3588ca192 100644
--- a/src/addons/mod/workshop/services/workshop-helper.ts
+++ b/src/addons/mod/workshop/services/workshop-helper.ts
@@ -15,7 +15,7 @@
 import { Injectable } from '@angular/core';
 import { CoreError } from '@classes/errors/error';
 import { CoreFileUploader, CoreFileUploaderStoreFilesResult } from '@features/fileuploader/services/fileuploader';
-import { FileEntry } from '@ionic-native/file';
+import { FileEntry } from '@ionic-native/file/ngx';
 import { CoreFile } from '@services/file';
 import { CoreFileEntry } from '@services/file-helper';
 import { CoreSites } from '@services/sites';
diff --git a/src/addons/notifications/notifications.module.ts b/src/addons/notifications/notifications.module.ts
index 0f2142d22..7a4cac5df 100644
--- a/src/addons/notifications/notifications.module.ts
+++ b/src/addons/notifications/notifications.module.ts
@@ -37,7 +37,7 @@ export const ADDON_NOTIFICATIONS_SERVICES: Type<unknown>[] = [
 const routes: Routes = [
     {
         path: AddonNotificationsMainMenuHandlerService.PAGE_NAME,
-        loadChildren: () => import('@/addons/notifications/notifications-lazy.module').then(m => m.AddonNotificationsLazyModule),
+        loadChildren: () => import('@addons/notifications/notifications-lazy.module').then(m => m.AddonNotificationsLazyModule),
     },
 ];
 const preferencesRoutes: Routes = [
diff --git a/src/addons/privatefiles/pages/index/index.ts b/src/addons/privatefiles/pages/index/index.ts
index 098214023..b159b0ccc 100644
--- a/src/addons/privatefiles/pages/index/index.ts
+++ b/src/addons/privatefiles/pages/index/index.ts
@@ -28,8 +28,8 @@ import {
     AddonPrivateFilesFile,
     AddonPrivateFilesGetUserInfoWSResult,
     AddonPrivateFilesGetFilesWSParams,
-} from '@/addons/privatefiles/services/privatefiles';
-import { AddonPrivateFilesHelper } from '@/addons/privatefiles/services/privatefiles-helper';
+} from '@addons/privatefiles/services/privatefiles';
+import { AddonPrivateFilesHelper } from '@addons/privatefiles/services/privatefiles-helper';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreNavigator } from '@services/navigator';
 
diff --git a/src/addons/privatefiles/privatefiles.module.ts b/src/addons/privatefiles/privatefiles.module.ts
index 635a80afb..8770ae648 100644
--- a/src/addons/privatefiles/privatefiles.module.ts
+++ b/src/addons/privatefiles/privatefiles.module.ts
@@ -30,7 +30,7 @@ export const ADDON_PRIVATEFILES_SERVICES: Type<unknown>[] = [
 const routes: Routes = [
     {
         path: AddonPrivateFilesUserHandlerService.PAGE_NAME,
-        loadChildren: () => import('@/addons/privatefiles/privatefiles-lazy.module').then(m => m.AddonPrivateFilesLazyModule),
+        loadChildren: () => import('@addons/privatefiles/privatefiles-lazy.module').then(m => m.AddonPrivateFilesLazyModule),
     },
 ];
 
diff --git a/src/addons/privatefiles/services/handlers/user.ts b/src/addons/privatefiles/services/handlers/user.ts
index 5b18fcb8d..5aad0dd54 100644
--- a/src/addons/privatefiles/services/handlers/user.ts
+++ b/src/addons/privatefiles/services/handlers/user.ts
@@ -14,7 +14,7 @@
 
 import { Injectable } from '@angular/core';
 
-import { AddonPrivateFiles } from '@/addons/privatefiles/services/privatefiles';
+import { AddonPrivateFiles } from '@addons/privatefiles/services/privatefiles';
 import { makeSingleton } from '@singletons';
 import {
     CoreUserDelegateContext,
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 6da789ef6..6ae88d2a5 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -24,7 +24,7 @@ import { TranslateHttpLoader } from '@ngx-translate/http-loader';
 import { IonicModule, IonicRouteStrategy } from '@ionic/angular';
 
 import { CoreModule } from '@/core/core.module';
-import { AddonsModule } from '@/addons/addons.module';
+import { AddonsModule } from '@addons/addons.module';
 
 import { AppComponent } from './app.component';
 import { AppRoutingModule } from './app-routing.module';
diff --git a/src/core/features/courses/services/courses-helper.ts b/src/core/features/courses/services/courses-helper.ts
index aa794077b..cb0e7b1f4 100644
--- a/src/core/features/courses/services/courses-helper.ts
+++ b/src/core/features/courses/services/courses-helper.ts
@@ -24,7 +24,7 @@ import {
 } from './courses';
 import { makeSingleton, Translate } from '@singletons';
 import { CoreWSExternalFile } from '@services/ws';
-import { AddonCourseCompletion } from '@/addons/coursecompletion/services/coursecompletion';
+import { AddonCourseCompletion } from '@addons/coursecompletion/services/coursecompletion';
 
 /**
  * Helper to gather some common courses functions.

From e505f1370a2c98f5322e29c2faf5dbaf32ded3c0 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 2 Feb 2022 12:33:04 +0100
Subject: [PATCH 0441/1008] MOBILE-3960 config: Add new removeaccountonlogout
 config

---
 .../components/user-menu/user-menu.html       | 10 ++++++--
 .../components/user-menu/user-menu.ts         | 24 ++++++++++++++++++-
 src/core/services/sites.ts                    | 16 +++++++++++--
 src/types/config.d.ts                         |  1 +
 4 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.html b/src/core/features/mainmenu/components/user-menu/user-menu.html
index 67562de15..572e8aa26 100644
--- a/src/core/features/mainmenu/components/user-menu/user-menu.html
+++ b/src/core/features/mainmenu/components/user-menu/user-menu.html
@@ -77,8 +77,14 @@
     <div class="ion-padding">
         <ion-button (click)="logout($event)" expand="block" color="danger" [attr.aria-label]="'core.mainmenu.logout' | translate"
             class="ion-text-wrap">
-            <ion-icon name="fas-sign-out-alt" slot="start" aria-hidden="true"></ion-icon>
-            {{ 'core.mainmenu.logout' | translate }}
+            <ng-container *ngIf="!removeAccountOnLogout">
+                <ion-icon name="fas-sign-out-alt" slot="start" aria-hidden="true"></ion-icon>
+                {{ 'core.mainmenu.logout' | translate }}
+            </ng-container>
+            <ng-container *ngIf="removeAccountOnLogout">
+                <ion-icon name="fas-trash" slot="start" aria-hidden="true"></ion-icon>
+                {{ 'core.login.removeaccount' | translate }}
+            </ng-container>
         </ion-button>
     </div>
 </ion-footer>
diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.ts b/src/core/features/mainmenu/components/user-menu/user-menu.ts
index 31e0c9137..a43cb3f66 100644
--- a/src/core/features/mainmenu/components/user-menu/user-menu.ts
+++ b/src/core/features/mainmenu/components/user-menu/user-menu.ts
@@ -15,6 +15,7 @@
 import { CoreConstants } from '@/core/constants';
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { CoreSite, CoreSiteInfo } from '@classes/site';
+import { CoreFilter } from '@features/filter/services/filter';
 import { CoreLoginSitesComponent } from '@features/login/components/sites/sites';
 import { CoreLoginHelper } from '@features/login/services/login-helper';
 import { CoreUser, CoreUserProfile } from '@features/user/services/user';
@@ -40,6 +41,7 @@ import { Subscription } from 'rxjs';
 })
 export class CoreMainMenuUserMenuComponent implements OnInit, OnDestroy {
 
+    siteId?: string;
     siteInfo?: CoreSiteInfo;
     siteName?: string;
     siteLogo?: string;
@@ -50,6 +52,7 @@ export class CoreMainMenuUserMenuComponent implements OnInit, OnDestroy {
     loaded = false;
     user?: CoreUserProfile;
     displaySwitchAccount = true;
+    removeAccountOnLogout = false;
 
     protected subscription!: Subscription;
 
@@ -58,10 +61,12 @@ export class CoreMainMenuUserMenuComponent implements OnInit, OnDestroy {
      */
     async ngOnInit(): Promise<void> {
         const currentSite = CoreSites.getRequiredCurrentSite();
+        this.siteId = currentSite.getId();
         this.siteInfo = currentSite.getInfo();
         this.siteName = currentSite.getSiteName();
         this.siteUrl = currentSite.getURL();
         this.displaySwitchAccount = !currentSite.isFeatureDisabled('NoDelegate_SwitchAccount');
+        this.removeAccountOnLogout = !!CoreConstants.CONFIG.removeaccountonlogout;
 
         this.loaded = true;
 
@@ -167,9 +172,26 @@ export class CoreMainMenuUserMenuComponent implements OnInit, OnDestroy {
      * @param event Click event
      */
     async logout(event: Event): Promise<void> {
+        if (this.removeAccountOnLogout) {
+            // Ask confirm.
+            const siteName = this.siteName ?
+                await CoreFilter.formatText(this.siteName, { clean: true, singleLine: true, filter: false }, [], this.siteId) :
+                '';
+
+            try {
+                await CoreDomUtils.showDeleteConfirm('core.login.confirmdeletesite', { sitename: siteName });
+            } catch (error) {
+                // User cancelled, stop.
+                return;
+            }
+        }
+
         await this.close(event);
 
-        CoreSites.logout(true);
+        await CoreSites.logout({
+            forceLogout: true,
+            removeAccount: this.removeAccountOnLogout,
+        });
     }
 
     /**
diff --git a/src/core/services/sites.ts b/src/core/services/sites.ts
index cd233fa27..c20644f22 100644
--- a/src/core/services/sites.ts
+++ b/src/core/services/sites.ts
@@ -1184,7 +1184,7 @@ export class CoreSitesProvider {
      * @param forceLogout If true, site will be marked as logged out, no matter the value tool_mobile_forcelogout.
      * @return Promise resolved when the user is logged out.
      */
-    async logout(forceLogout = false): Promise<void> {
+    async logout(options: CoreSitesLogoutOptions = {}): Promise<void> {
         if (!this.currentSite) {
             return;
         }
@@ -1195,7 +1195,7 @@ export class CoreSitesProvider {
 
         this.currentSite = undefined;
 
-        if (forceLogout || (siteConfig && siteConfig.tool_mobile_forcelogout == '1')) {
+        if (options.forceLogout || (siteConfig && siteConfig.tool_mobile_forcelogout == '1')) {
             promises.push(this.setSiteLoggedOut(siteId));
         }
 
@@ -1203,6 +1203,10 @@ export class CoreSitesProvider {
 
         await CoreUtils.ignoreErrors(Promise.all(promises));
 
+        if (options.removeAccount) {
+            await CoreSites.deleteSite(siteId);
+        }
+
         CoreEvents.trigger(CoreEvents.LOGOUT, {}, siteId);
     }
 
@@ -1913,3 +1917,11 @@ export type CoreSitesLoginTokenResponse = {
     debuginfo?: string;
     reproductionlink?: string;
 };
+
+/**
+ * Options for logout.
+ */
+export type CoreSitesLogoutOptions = {
+    forceLogout?: boolean; // If true, site will be marked as logged out, no matter the value tool_mobile_forcelogout.
+    removeAccount?: boolean; // If true, site will be removed too after logout.
+};
diff --git a/src/types/config.d.ts b/src/types/config.d.ts
index ccbac9336..c5627bc99 100644
--- a/src/types/config.d.ts
+++ b/src/types/config.d.ts
@@ -61,4 +61,5 @@ export interface EnvironmentConfig {
     wsrequestqueuelimit: number; // Maximum number of requests allowed in the queue.
     wsrequestqueuedelay: number; // Maximum number of miliseconds to wait before processing the queue.
     calendarreminderdefaultvalue: number; // Initial value for default reminders (in seconds). User can change it later.
+    removeaccountonlogout?: boolean; // True to remove the account when the user clicks logout. Doesn't affect switch account.
 }

From cf0d9ae4684267f2a16142e8c7367358bd723314 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 27 Jan 2022 22:52:04 +0100
Subject: [PATCH 0442/1008] MOBILE-3954 storage: Improve courses manager
 template

---
 .../pages/course-storage/course-storage.html     | 11 ++++++-----
 .../pages/courses-storage/courses-storage.html   | 16 +++++++++-------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.html b/src/addons/storagemanager/pages/course-storage/course-storage.html
index 3b15683d5..3f05975e6 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.html
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.html
@@ -12,20 +12,20 @@
     <core-loading [hideUntil]="loaded">
         <ion-card class="wholecourse">
             <ion-card-header>
-                <ion-card-title>{{ title }}</ion-card-title>
                 <p class="ion-text-wrap">{{ 'addon.storagemanager.info' | translate }}</p>
+                <ion-card-title>{{ title }}</ion-card-title>
                 <ion-item class="size ion-text-wrap ion-no-padding" lines="none">
                     <ion-icon name="fas-archive" slot="start" aria-hidden="true"></ion-icon>
                     <ion-label>
                         <p class="item-heading ion-text-wrap">{{ 'addon.storagemanager.storageused' | translate }}</p>
                         <ion-badge color="light">{{ totalSize | coreBytesToSize }}</ion-badge>
                     </ion-label>
-                    <ion-button slot="end" (click)="deleteForCourse()" [disabled]="totalSize == 0">
+                    <ion-button slot="end" (click)="deleteForCourse()" [disabled]="totalSize == 0" color="danger">
                         <ion-icon name="fas-trash" slot="icon-only" [attr.aria-label]="'addon.storagemanager.deletecourse' | translate">
                         </ion-icon>
                     </ion-button>
                 </ion-item>
-                <ion-button *ngIf="downloadCourseEnabled" (click)="prefetchCourse()" expand="block">
+                <ion-button *ngIf="downloadCourseEnabled" (click)="prefetchCourse()" expand="block" fill="outline">
                     <ion-icon *ngIf="!prefetchCourseData.loading" [name]="prefetchCourseData.icon" slot="start"></ion-icon>
                     <ion-spinner *ngIf="prefetchCourseData.loading" slot="start"></ion-spinner>
                     {{ prefetchCourseData.statusTranslatable | translate }}
@@ -48,7 +48,7 @@
                             </p>
                         </ion-label>
                         <div class="storage-buttons" slot="end" *ngIf="section.totalSize > 0 || downloadEnabled">
-                            <ion-button (click)="deleteForSection(section)" *ngIf="section.totalSize > 0">
+                            <ion-button (click)="deleteForSection(section)" *ngIf="section.totalSize > 0" color="danger">
                                 <ion-icon name="fas-trash" slot="icon-only"
                                     [attr.aria-label]="'addon.storagemanager.deletedatafrom' | translate: { name: section.name }">
                                 </ion-icon>
@@ -87,7 +87,8 @@
                             </ion-label>
 
                             <div class="storage-buttons" slot="end">
-                                <ion-button fill="clear" (click)="deleteForModule(module, section)" *ngIf="module.totalSize > 0">
+                                <ion-button fill="clear" (click)="deleteForModule(module, section)" *ngIf="module.totalSize > 0"
+                                    color="danger">
                                     <ion-icon name="fas-trash" slot="icon-only"
                                         [attr.aria-label]="'addon.storagemanager.deletedatafrom' | translate: { name: module.name }">
                                     </ion-icon>
diff --git a/src/addons/storagemanager/pages/courses-storage/courses-storage.html b/src/addons/storagemanager/pages/courses-storage/courses-storage.html
index ca9eb3b53..e91ab12bc 100644
--- a/src/addons/storagemanager/pages/courses-storage/courses-storage.html
+++ b/src/addons/storagemanager/pages/courses-storage/courses-storage.html
@@ -12,35 +12,37 @@
     <core-loading [hideUntil]="loaded">
         <ion-card>
             <ion-card-header>
-                <ion-card-title class="ion-text-wrap">{{ 'core.courses.courses' | translate }}</ion-card-title>
                 <p class="ion-text-wrap">{{ 'addon.storagemanager.info' | translate }}</p>
+                <ion-card-title class="ion-text-wrap">{{ 'core.courses.courses' | translate }}</ion-card-title>
                 <ion-item class="size ion-text-wrap ion-no-padding" lines="none">
                     <ion-icon name="fas-archive" slot="start" aria-hidden="true"></ion-icon>
                     <ion-label>
                         <h2 class="ion-text-wrap">{{ 'addon.storagemanager.storageused' | translate }}</h2>
+                        <ion-badge color="light">{{ totalSize | coreBytesToSize }}</ion-badge>
                     </ion-label>
-                    <p slot="end" class="ion-text-end">{{ totalSize | coreBytesToSize }}</p>
                     <ion-button slot="end" (click)="deleteCompletelyDownloadedCourses()"
-                        [disabled]="completelyDownloadedCourses.length === 0">
+                        [disabled]="completelyDownloadedCourses.length === 0" color="danger">
                         <ion-icon name="fas-trash" slot="icon-only" ariaLabel="{{ 'addon.storagemanager.deletecourses' | translate }}">
                         </ion-icon>
                     </ion-button>
                 </ion-item>
             </ion-card-header>
         </ion-card>
-        <ion-card>
+        <ion-card *ngIf="downloadedCourses.length">
             <ion-card-content class="ion-no-padding">
                 <ion-list>
-                    <ion-item *ngFor="let course of downloadedCourses" class="course">
+                    <ion-item *ngFor="let course of downloadedCourses" class="course" (click)="openCourse(course)" button>
                         <ion-label class="ion-text-wrap">
                             <p class="item-heading" *ngIf="course.displayname">{{ course.displayname }}</p>
                             <p class="item-heading" *ngIf="!course.displayname">{{ course.fullname }}</p>
                             <p class="item-heading item-heading-secondary" *ngIf="course.isDownloading">
                                 {{ 'core.downloading' | translate }}
                             </p>
+                            <ion-badge color="light">
+                                {{ course.totalSize | coreBytesToSize }}
+                            </ion-badge>
                         </ion-label>
-                        <p slot="end" class="ion-text-end">{{ course.totalSize | coreBytesToSize }}</p>
-                        <ion-button slot="end" (click)="deleteCourse(course)" [disabled]="course.isDownloading">
+                        <ion-button slot="end" (click)="deleteCourse(course)" [disabled]="course.isDownloading" color="danger">
                             <ion-icon name="fas-trash" slot="icon-only"
                                 [attr.aria-label]="'addon.storagemanager.deletedatafrom' | translate: { name: course.displayname }">
                             </ion-icon>

From c59ca185b6424733f523bedc457e201d858f97fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 27 Jan 2022 22:52:18 +0100
Subject: [PATCH 0443/1008] MOBILE-3954 main: Remove manage courses from main
 pages

---
 .../courses/pages/dashboard/dashboard.html    |  2 -
 .../courses/pages/dashboard/dashboard.ts      |  7 ----
 src/core/features/courses/pages/my/my.html    | 39 ++++++++++++-------
 src/core/features/courses/pages/my/my.ts      |  7 ----
 .../features/sitehome/pages/index/index.html  |  6 ---
 .../features/sitehome/pages/index/index.ts    | 14 -------
 6 files changed, 25 insertions(+), 50 deletions(-)

diff --git a/src/core/features/courses/pages/dashboard/dashboard.html b/src/core/features/courses/pages/dashboard/dashboard.html
index 4e704d5e8..e59e44e43 100644
--- a/src/core/features/courses/pages/dashboard/dashboard.html
+++ b/src/core/features/courses/pages/dashboard/dashboard.html
@@ -6,8 +6,6 @@
         <core-context-menu-item *ngIf="(downloadCourseEnabled || downloadCoursesEnabled)" [priority]="1000"
             [content]="'core.settings.showdownloadoptions' | translate" (action)="switchDownload()" iconAction="toggle"
             [(toggle)]="downloadEnabled"></core-context-menu-item>
-        <core-context-menu-item [priority]="500" [content]="'addon.storagemanager.managestorage' | translate"
-            (action)="manageCoursesStorage()" iconAction="fas-archive"></core-context-menu-item>
     </core-context-menu>
 </core-navbar-buttons>
 <ion-content>
diff --git a/src/core/features/courses/pages/dashboard/dashboard.ts b/src/core/features/courses/pages/dashboard/dashboard.ts
index 739b75755..7f87e6f32 100644
--- a/src/core/features/courses/pages/dashboard/dashboard.ts
+++ b/src/core/features/courses/pages/dashboard/dashboard.ts
@@ -160,13 +160,6 @@ export class CoreCoursesDashboardPage implements OnInit, OnDestroy {
         CoreCourses.setCourseDownloadOptionsEnabled(this.downloadEnabled);
     }
 
-    /**
-     * Open page to manage courses storage.
-     */
-    manageCoursesStorage(): void {
-        CoreNavigator.navigateToSitePath('/storage');
-    }
-
     /**
      * Go to search courses.
      */
diff --git a/src/core/features/courses/pages/my/my.html b/src/core/features/courses/pages/my/my.html
index 5ac663842..b7ef04ec2 100644
--- a/src/core/features/courses/pages/my/my.html
+++ b/src/core/features/courses/pages/my/my.html
@@ -13,17 +13,6 @@
             <ion-button *ngIf="searchEnabled" (click)="openSearch()" [attr.aria-label]="'core.courses.searchcourses' | translate">
                 <ion-icon name="fas-search" slot="icon-only" aria-hidden="true"></ion-icon>
             </ion-button>
-            <core-context-menu>
-                <core-context-menu-item *ngIf="downloadCoursesEnabled && myOverviewBlock && myOverviewBlock.filteredCourses.length > 1"
-                    [priority]="1000" [content]="myOverviewBlock?.prefetchCoursesData.statusTranslatable | translate"
-                    (action)="myOverviewBlock?.prefetchCourses()"
-                    [iconAction]="myOverviewBlock?.prefetchCoursesData.loading ? 'spinner' : myOverviewBlock?.prefetchCoursesData.icon"
-                    [badge]="myOverviewBlock?.prefetchCoursesData.badge"
-                    [badgeA11yText]="myOverviewBlock?.prefetchCoursesData.badgeA11yText">
-                </core-context-menu-item>
-                <core-context-menu-item [priority]="500" [content]="'addon.storagemanager.managestorage' | translate"
-                    (action)="manageCoursesStorage()" iconAction="fas-archive"></core-context-menu-item>
-            </core-context-menu>
             <core-user-menu-button></core-user-menu-button>
         </ion-buttons>
     </ion-toolbar>
@@ -33,9 +22,31 @@
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
     <core-loading [hideUntil]="loaded">
-        <div class="ion-padding-horizontal">
-            <h2>{{ 'core.courses.mycourses' | translate }}</h2>
-        </div>
+        <ion-item class="ion-text-wrap divider" lines="none">
+            <ion-label>
+                <h2>{{ 'core.courses.mycourses' | translate }}</h2>
+            </ion-label>
+            <div slot="end" class="flex-row">
+                <!-- Download all courses. -->
+                <div *ngIf="downloadCoursesEnabled && myOverviewBlock && myOverviewBlock.filteredCourses.length > 1"
+                    class="core-button-spinner">
+                    <ion-button *ngIf="!myOverviewBlock.prefetchCoursesData.loading" fill="clear" color="dark"
+                        (click)="myOverviewBlock.prefetchCourses()"
+                        [attr.aria-label]="myOverviewBlock.prefetchCoursesData.statusTranslatable | translate">
+                        <ion-icon [name]="myOverviewBlock.prefetchCoursesData.icon" slot="icon-only" aria-hidden="true">
+                        </ion-icon>
+                    </ion-button>
+                    <ion-badge class="core-course-download-courses-progress" *ngIf="myOverviewBlock.prefetchCoursesData.badge"
+                        role="progressbar" [attr.aria-valuemax]="myOverviewBlock.prefetchCoursesData.total"
+                        [attr.aria-valuenow]="myOverviewBlock.prefetchCoursesData.count"
+                        [attr.aria-valuetext]="myOverviewBlock.prefetchCoursesData.badgeA11yText">
+                        {{myOverviewBlock.prefetchCoursesData.badge}}
+                    </ion-badge>
+                    <ion-spinner *ngIf="myOverviewBlock.prefetchCoursesData.loading" [attr.aria-label]="'core.loading' | translate">
+                    </ion-spinner>
+                </div>
+            </div>
+        </ion-item>
         <ion-list>
             <core-block *ngIf="loadedBlock?.visible" [block]="loadedBlock" contextLevel="user" [instanceId]="userId"
                 [extraData]="{'downloadEnabled': true}"></core-block>
diff --git a/src/core/features/courses/pages/my/my.ts b/src/core/features/courses/pages/my/my.ts
index d9f8d001b..029225665 100644
--- a/src/core/features/courses/pages/my/my.ts
+++ b/src/core/features/courses/pages/my/my.ts
@@ -122,13 +122,6 @@ export class CoreCoursesMyCoursesPage implements OnInit, OnDestroy {
         };
     }
 
-    /**
-     * Open page to manage courses storage.
-     */
-    manageCoursesStorage(): void {
-        CoreNavigator.navigateToSitePath('/storage');
-    }
-
     /**
      * Go to search courses.
      */
diff --git a/src/core/features/sitehome/pages/index/index.html b/src/core/features/sitehome/pages/index/index.html
index 62b96b90c..4f422475d 100644
--- a/src/core/features/sitehome/pages/index/index.html
+++ b/src/core/features/sitehome/pages/index/index.html
@@ -2,12 +2,6 @@
     <ion-button *ngIf="searchEnabled" (click)="openSearch()" [attr.aria-label]="'core.courses.searchcourses' | translate">
         <ion-icon name="fas-search" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
-    <core-context-menu>
-        <core-context-menu-item [priority]="500" [content]="'addon.storagemanager.managestorage' | translate"
-            (action)="manageCoursesStorage()" iconAction="fas-archive"></core-context-menu-item>
-        <core-context-menu-item [priority]="400" [content]="'addon.storagemanager.managecoursestorage' | translate"
-            (action)="manageCourseStorage()" iconAction="fas-archive"></core-context-menu-item>
-    </core-context-menu>
 </core-navbar-buttons>
 <ion-content>
     <ion-refresher slot="fixed" [disabled]="!dataLoaded" (ionRefresh)="doRefresh($event.target)">
diff --git a/src/core/features/sitehome/pages/index/index.ts b/src/core/features/sitehome/pages/index/index.ts
index b880324d4..b58998e07 100644
--- a/src/core/features/sitehome/pages/index/index.ts
+++ b/src/core/features/sitehome/pages/index/index.ts
@@ -175,20 +175,6 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
         });
     }
 
-    /**
-     * Open page to manage courses storage.
-     */
-    manageCoursesStorage(): void {
-        CoreNavigator.navigateToSitePath('/storage');
-    }
-
-    /**
-     * Open page to manage course storage.
-     */
-    manageCourseStorage(): void {
-        CoreNavigator.navigateToSitePath('/storage/' + this.siteHomeId);
-    }
-
     /**
      * Go to search courses.
      */

From 94fbd9e0e2e05a42d95301fefdfe8363d3835ca6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 2 Feb 2022 12:13:58 +0100
Subject: [PATCH 0444/1008] MOBILE-3954 blocks: Remove download enable switch
 from block pages

---
 .../myoverview/addon-block-myoverview.html    |  6 +++---
 .../components/myoverview/myoverview.ts       | 18 +++--------------
 .../addon-block-recentlyaccessedcourses.html  |  4 ++--
 .../recentlyaccessedcourses.ts                | 16 +--------------
 .../components/sitemainmenu/sitemainmenu.ts   |  4 +---
 .../addon-block-starredcourses.html           |  4 ++--
 .../starredcourses/starredcourses.ts          | 15 +-------------
 .../courses/pages/dashboard/dashboard.html    |  8 +-------
 .../courses/pages/dashboard/dashboard.ts      | 20 +------------------
 src/core/features/courses/pages/my/my.html    |  3 +--
 .../components/course-format/course-format.ts |  3 ---
 11 files changed, 16 insertions(+), 85 deletions(-)

diff --git a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
index 6c3d9ffa6..dbdf6d578 100644
--- a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
+++ b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
@@ -4,7 +4,7 @@
     </ion-label>
     <div slot="end" class="flex-row">
         <!-- Download all courses. -->
-        <div *ngIf="downloadCoursesEnabled && downloadEnabled && filteredCourses.length > 1" class="core-button-spinner">
+        <div *ngIf="downloadCoursesEnabled && filteredCourses.length > 1" class="core-button-spinner">
             <ion-button *ngIf="!prefetchCoursesData.loading" fill="clear" color="dark" (click)="prefetchCourses()"
                 [attr.aria-label]="prefetchCoursesData.statusTranslatable | translate">
                 <ion-icon [name]="prefetchCoursesData.icon" slot="icon-only" aria-hidden="true">
@@ -77,8 +77,8 @@
             <ion-row class="ion-no-padding">
                 <ion-col *ngFor="let course of filteredCourses" class="ion-no-padding" size="12" size-sm="6" size-md="6" size-lg="4"
                     size-xl="3">
-                    <core-courses-course-list-item [course]="course" class="core-courseoverview"
-                        [showDownload]="downloadCourseEnabled && downloadEnabled" [layout]="layouts.selected">
+                    <core-courses-course-list-item [course]="course" class="core-courseoverview" [showDownload]="downloadCourseEnabled"
+                        [layout]="layouts.selected">
                     </core-courses-course-list-item>
                 </ion-col>
             </ion-row>
diff --git a/src/addons/block/myoverview/components/myoverview/myoverview.ts b/src/addons/block/myoverview/components/myoverview/myoverview.ts
index 97258edd6..5b676a067 100644
--- a/src/addons/block/myoverview/components/myoverview/myoverview.ts
+++ b/src/addons/block/myoverview/components/myoverview/myoverview.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, OnInit, Input, OnDestroy, OnChanges, SimpleChange } from '@angular/core';
+import { Component, OnInit, OnDestroy } from '@angular/core';
 import { ModalOptions } from '@ionic/core';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreTimeUtils } from '@services/utils/time';
@@ -40,9 +40,7 @@ const FILTER_PRIORITY: AddonBlockMyOverviewTimeFilters[] = ['all', 'inprogress',
     selector: 'addon-block-myoverview',
     templateUrl: 'addon-block-myoverview.html',
 })
-export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implements OnInit, OnChanges, OnDestroy {
-
-    @Input() downloadEnabled = false;
+export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implements OnInit, OnDestroy {
 
     filteredCourses: CoreEnrolledCourseDataWithOptions[] = [];
 
@@ -197,16 +195,6 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
         });
     }
 
-    /**
-     * @inheritdoc
-     */
-    ngOnChanges(changes: {[name: string]: SimpleChange}): void {
-        if (changes.downloadEnabled && !changes.downloadEnabled.previousValue && this.downloadEnabled && this.loaded) {
-            // Download all courses is enabled now, initialize it.
-            this.initPrefetchCoursesIcons();
-        }
-    }
-
     /**
      * @inheritdoc
      */
@@ -431,7 +419,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
      * @return Promise resolved when done.
      */
     async initPrefetchCoursesIcons(): Promise<void> {
-        if (this.prefetchIconsInitialized || !this.downloadEnabled) {
+        if (this.prefetchIconsInitialized) {
             // Already initialized.
             return;
         }
diff --git a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html
index 113048db0..6ba01b2f2 100644
--- a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html
+++ b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html
@@ -16,8 +16,8 @@
         <div (onResize)="scrollControls.updateScrollPosition()" class="flex-row">
             <div class="safe-area-pseudo-padding-start"></div>
             <ng-container *ngFor="let course of courses">
-                <core-courses-course-list-item [course]="course" class="core-recentlyaccessedcourses" layout="summarycard"
-                    [showDownload]="downloadCourseEnabled && downloadEnabled"></core-courses-course-list-item>
+                <core-courses-course-list-item [course]="course" class="core-recentlyaccessedcourses" layout="summarycard">
+                </core-courses-course-list-item>
             </ng-container>
             <div class="safe-area-pseudo-padding-end"></div>
         </div>
diff --git a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
index f3b99dcd6..eefd70ac4 100644
--- a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
+++ b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, OnInit, OnDestroy, Input } from '@angular/core';
+import { Component, OnInit, OnDestroy } from '@angular/core';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreSites } from '@services/sites';
 import {
@@ -41,17 +41,13 @@ import { CoreSite } from '@classes/site';
 })
 export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseComponent implements OnInit, OnDestroy {
 
-    @Input() downloadEnabled = false;
-
     courses: AddonBlockRecentlyAccessedCourse[] = [];
 
-    downloadCourseEnabled = false;
     scrollElementId!: string;
 
     protected site!: CoreSite;
     protected isDestroyed = false;
     protected coursesObserver?: CoreEventObserver;
-    protected updateSiteObserver?: CoreEventObserver;
     protected fetchContentDefaultError = 'Error getting recent courses data.';
 
     constructor() {
@@ -69,15 +65,6 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
 
         this.scrollElementId = `addon-block-recentlyaccessedcourses-scroll-${scrollId}`;
 
-        // Refresh the enabled flags if enabled.
-        this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
-
-        // Refresh the enabled flags if site is updated.
-        this.updateSiteObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, () => {
-            this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
-
-        }, this.site.getId());
-
         this.coursesObserver = CoreEvents.on(
             CoreCoursesProvider.EVENT_MY_COURSES_UPDATED,
             (data) => {
@@ -208,7 +195,6 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
     ngOnDestroy(): void {
         this.isDestroyed = true;
         this.coursesObserver?.off();
-        this.updateSiteObserver?.off();
     }
 
 }
diff --git a/src/addons/block/sitemainmenu/components/sitemainmenu/sitemainmenu.ts b/src/addons/block/sitemainmenu/components/sitemainmenu/sitemainmenu.ts
index d550062d7..836a5850c 100644
--- a/src/addons/block/sitemainmenu/components/sitemainmenu/sitemainmenu.ts
+++ b/src/addons/block/sitemainmenu/components/sitemainmenu/sitemainmenu.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, OnInit, Input } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { CoreSites } from '@services/sites';
 import { CoreCourse } from '@features/course/services/course';
 import { CoreCourseHelper, CoreCourseSection } from '@features/course/services/course-helper';
@@ -29,8 +29,6 @@ import { CoreBlockBaseComponent } from '@features/block/classes/base-block-compo
 })
 export class AddonBlockSiteMainMenuComponent extends CoreBlockBaseComponent implements OnInit {
 
-    @Input() downloadEnabled = false;
-
     component = 'AddonBlockSiteMainMenu';
     mainMenuBlock?: CoreCourseSection;
     siteHomeId = 1;
diff --git a/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html b/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html
index fd6a1a860..1ff007fce 100644
--- a/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html
+++ b/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html
@@ -16,8 +16,8 @@
         <div (onResize)="scrollControls.updateScrollPosition()" class="flex-row">
             <div class="safe-area-pseudo-padding-start"></div>
             <ng-container *ngFor="let course of courses">
-                <core-courses-course-list-item [course]="course" class="core-block_starredcourses" layout="summarycard"
-                    [showDownload]="downloadCourseEnabled && downloadEnabled"></core-courses-course-list-item>
+                <core-courses-course-list-item [course]="course" class="core-block_starredcourses" layout="summarycard">
+                </core-courses-course-list-item>
             </ng-container>
             <div class="safe-area-pseudo-padding-end"></div>
         </div>
diff --git a/src/addons/block/starredcourses/components/starredcourses/starredcourses.ts b/src/addons/block/starredcourses/components/starredcourses/starredcourses.ts
index fc1c47de5..c6e6fc447 100644
--- a/src/addons/block/starredcourses/components/starredcourses/starredcourses.ts
+++ b/src/addons/block/starredcourses/components/starredcourses/starredcourses.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, OnInit, OnDestroy, Input } from '@angular/core';
+import { Component, OnInit, OnDestroy } from '@angular/core';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreSites } from '@services/sites';
 import { CoreCoursesProvider, CoreCoursesMyCoursesUpdatedEventData, CoreCourses } from '@features/courses/services/courses';
@@ -36,17 +36,13 @@ import { AddonBlockStarredCourse, AddonBlockStarredCourses } from '../../service
 })
 export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent implements OnInit, OnDestroy {
 
-    @Input() downloadEnabled = false;
-
     courses: AddonBlockStarredCoursesCourse[] = [];
 
-    downloadCourseEnabled = false;
     scrollElementId!: string;
 
     protected site: CoreSite;
     protected isDestroyed = false;
     protected coursesObserver?: CoreEventObserver;
-    protected updateSiteObserver?: CoreEventObserver;
     protected fetchContentDefaultError = 'Error getting starred courses data.';
 
     constructor() {
@@ -64,14 +60,6 @@ export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent im
 
         this.scrollElementId = `addon-block-starredcourses-scroll-${scrollId}`;
 
-        // Refresh the enabled flags if enabled.
-        this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
-
-        // Refresh the enabled flags if site is updated.
-        this.updateSiteObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, () => {
-            this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
-        }, CoreSites.getCurrentSiteId());
-
         this.coursesObserver = CoreEvents.on(
             CoreCoursesProvider.EVENT_MY_COURSES_UPDATED,
             (data) => {
@@ -194,7 +182,6 @@ export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent im
     ngOnDestroy(): void {
         this.isDestroyed = true;
         this.coursesObserver?.off();
-        this.updateSiteObserver?.off();
     }
 
 }
diff --git a/src/core/features/courses/pages/dashboard/dashboard.html b/src/core/features/courses/pages/dashboard/dashboard.html
index e59e44e43..e73f8a108 100644
--- a/src/core/features/courses/pages/dashboard/dashboard.html
+++ b/src/core/features/courses/pages/dashboard/dashboard.html
@@ -2,11 +2,6 @@
     <ion-button *ngIf="searchEnabled" (click)="openSearch()" [attr.aria-label]="'core.courses.searchcourses' | translate">
         <ion-icon name="fas-search" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
-    <core-context-menu>
-        <core-context-menu-item *ngIf="(downloadCourseEnabled || downloadCoursesEnabled)" [priority]="1000"
-            [content]="'core.settings.showdownloadoptions' | translate" (action)="switchDownload()" iconAction="toggle"
-            [(toggle)]="downloadEnabled"></core-context-menu-item>
-    </core-context-menu>
 </core-navbar-buttons>
 <ion-content>
     <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="refreshDashboard($event.target)">
@@ -16,8 +11,7 @@
     <core-loading [hideUntil]="loaded">
         <ion-list>
             <ng-container *ngFor="let block of blocks">
-                <core-block *ngIf="block.visible" [block]="block" contextLevel="user" [instanceId]="userId"
-                    [extraData]="{'downloadEnabled': downloadEnabled}"></core-block>
+                <core-block *ngIf="block.visible" [block]="block" contextLevel="user" [instanceId]="userId"></core-block>
             </ng-container>
         </ion-list>
 
diff --git a/src/core/features/courses/pages/dashboard/dashboard.ts b/src/core/features/courses/pages/dashboard/dashboard.ts
index 7f87e6f32..24046259f 100644
--- a/src/core/features/courses/pages/dashboard/dashboard.ts
+++ b/src/core/features/courses/pages/dashboard/dashboard.ts
@@ -15,7 +15,7 @@
 import { Component, OnDestroy, OnInit, QueryList, ViewChildren } from '@angular/core';
 import { IonRefresher } from '@ionic/angular';
 
-import { CoreCourses, CoreCoursesProvider } from '../../services/courses';
+import { CoreCourses } from '../../services/courses';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreSites } from '@services/sites';
 import { CoreCoursesDashboard } from '@features/courses/services/dashboard';
@@ -39,7 +39,6 @@ export class CoreCoursesDashboardPage implements OnInit, OnDestroy {
 
     hasSideBlocks = false;
     searchEnabled = false;
-    downloadEnabled = false;
     downloadCourseEnabled = false;
     downloadCoursesEnabled = false;
     userId?: number;
@@ -47,7 +46,6 @@ export class CoreCoursesDashboardPage implements OnInit, OnDestroy {
     loaded = false;
 
     protected updateSiteObserver: CoreEventObserver;
-    protected downloadEnabledObserver: CoreEventObserver;
 
     constructor() {
         // Refresh the enabled flags if site is updated.
@@ -56,12 +54,7 @@ export class CoreCoursesDashboardPage implements OnInit, OnDestroy {
             this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
             this.downloadCoursesEnabled = !CoreCourses.isDownloadCoursesDisabledInSite();
 
-            this.downloadEnabled = (this.downloadCourseEnabled || this.downloadCoursesEnabled) && this.downloadEnabled;
         }, CoreSites.getCurrentSiteId());
-
-        this.downloadEnabledObserver = CoreEvents.on(CoreCoursesProvider.EVENT_DASHBOARD_DOWNLOAD_ENABLED_CHANGED, (data) => {
-            this.downloadEnabled = (this.downloadCourseEnabled || this.downloadCoursesEnabled) && data.enabled;
-        });
     }
 
     /**
@@ -72,9 +65,6 @@ export class CoreCoursesDashboardPage implements OnInit, OnDestroy {
         this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
         this.downloadCoursesEnabled = !CoreCourses.isDownloadCoursesDisabledInSite();
 
-        this.downloadEnabled =
-            (this.downloadCourseEnabled || this.downloadCoursesEnabled) && CoreCourses.getCourseDownloadOptionsEnabled();
-
         this.loadContent();
     }
 
@@ -153,13 +143,6 @@ export class CoreCoursesDashboardPage implements OnInit, OnDestroy {
         });
     }
 
-    /**
-     * Switch download enabled.
-     */
-    switchDownload(): void {
-        CoreCourses.setCourseDownloadOptionsEnabled(this.downloadEnabled);
-    }
-
     /**
      * Go to search courses.
      */
@@ -172,7 +155,6 @@ export class CoreCoursesDashboardPage implements OnInit, OnDestroy {
      */
     ngOnDestroy(): void {
         this.updateSiteObserver.off();
-        this.downloadEnabledObserver.off();
     }
 
 }
diff --git a/src/core/features/courses/pages/my/my.html b/src/core/features/courses/pages/my/my.html
index b7ef04ec2..f53075af7 100644
--- a/src/core/features/courses/pages/my/my.html
+++ b/src/core/features/courses/pages/my/my.html
@@ -48,8 +48,7 @@
             </div>
         </ion-item>
         <ion-list>
-            <core-block *ngIf="loadedBlock?.visible" [block]="loadedBlock" contextLevel="user" [instanceId]="userId"
-                [extraData]="{'downloadEnabled': true}"></core-block>
+            <core-block *ngIf="loadedBlock?.visible" [block]="loadedBlock" contextLevel="user" [instanceId]="userId"></core-block>
         </ion-list>
 
         <core-empty-box *ngIf="!loadedBlock" icon="fas-cubes" [message]="'core.course.nocontentavailable' | translate">
diff --git a/src/core/features/siteplugins/components/course-format/course-format.ts b/src/core/features/siteplugins/components/course-format/course-format.ts
index 9fd9e6459..3f87875e8 100644
--- a/src/core/features/siteplugins/components/course-format/course-format.ts
+++ b/src/core/features/siteplugins/components/course-format/course-format.ts
@@ -34,7 +34,6 @@ export class CoreSitePluginsCourseFormatComponent implements OnChanges {
 
     @Input() course?: CoreCourseAnyCourseData; // The course to render.
     @Input() sections?: CoreCourseSection[]; // List of course sections. The status will be calculated in this component.
-    @Input() downloadEnabled?: boolean; // Whether the download of sections and modules is enabled.
     @Input() initialSectionId?: number; // The section to load first (by ID).
     @Input() initialSectionNumber?: number; // The section to load first (by number).
     @Input() moduleId?: number; // The module ID to scroll to. Must be inside the initial selected section.
@@ -71,7 +70,6 @@ export class CoreSitePluginsCourseFormatComponent implements OnChanges {
                 this.method = handler.handlerSchema.method;
                 this.args = {
                     courseid: this.course.id,
-                    downloadenabled: this.downloadEnabled,
                 };
                 this.initResult = handler.initResult;
             }
@@ -81,7 +79,6 @@ export class CoreSitePluginsCourseFormatComponent implements OnChanges {
         this.data = {
             course: this.course,
             sections: this.sections,
-            downloadEnabled: this.downloadEnabled,
             initialSectionId: this.initialSectionId,
             initialSectionNumber: this.initialSectionNumber,
             moduleId: this.moduleId,

From 9caa1f06d5ce67158201da215d4f5d9ca5eb4fcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 2 Feb 2022 13:26:27 +0100
Subject: [PATCH 0445/1008] MOBILE-3954 storage: Add site home to manage
 storage page

---
 .../pages/course-storage/course-storage.ts    | 16 +++-----
 .../courses-storage/courses-storage.html      |  5 +--
 .../pages/courses-storage/courses-storage.ts  | 37 +++++++++++++++++--
 .../services/handlers/course-menu.ts          |  3 ++
 4 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.ts b/src/addons/storagemanager/pages/course-storage/course-storage.ts
index 3abf047de..962737dc6 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.ts
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.ts
@@ -24,7 +24,7 @@ import {
 import {
     CoreCourseModulePrefetchDelegate,
     CoreCourseModulePrefetchHandler } from '@features/course/services/module-prefetch-delegate';
-import { CoreCourses, CoreEnrolledCourseData } from '@features/courses/services/courses';
+import { CoreCourses } from '@features/courses/services/courses';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
@@ -43,7 +43,6 @@ import { CoreEventObserver, CoreEvents } from '@singletons/events';
 })
 export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
 
-    course?: CoreEnrolledCourseData;
     courseId!: number;
     title = '';
     loaded = false;
@@ -70,7 +69,7 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
     constructor() {
         // Refresh the enabled flags if site is updated.
         this.siteUpdatedObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, () => {
-            this.downloadCourseEnabled = !!this.course && !CoreCourses.isDownloadCourseDisabledInSite();
+            this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
             this.downloadEnabled = !CoreSites.getRequiredCurrentSite().isOfflineDisabled();
 
             this.initCoursePrefetch();
@@ -92,15 +91,14 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
             return;
         }
 
-        this.course = CoreNavigator.getRouteParam<CoreEnrolledCourseData>('course');
-        this.title = this.course?.displayname ?? this.course?.fullname ?? '';
+        this.title = CoreNavigator.getRouteParam<string>('title') || '';
         if (!this.title && this.courseId == CoreSites.getCurrentSiteHomeId()) {
             this.title = Translate.instant('core.sitehome.sitehome');
         }
 
         this.isGuest = !!CoreNavigator.getRouteBooleanParam('isGuest');
 
-        this.downloadCourseEnabled = !!this.course && !CoreCourses.isDownloadCourseDisabledInSite();
+        this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
         this.downloadEnabled = !CoreSites.getRequiredCurrentSite().isOfflineDisabled();
 
         const sections = await CoreCourse.getSections(this.courseId, false, true);
@@ -551,14 +549,12 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
      * Prefetch the whole course.
      */
     async prefetchCourse(): Promise<void> {
-        if (!this.course) {
-            return;
-        }
+        const course = await CoreCourses.getCourse(this.courseId);
 
         try {
             await CoreCourseHelper.confirmAndPrefetchCourse(
                 this.prefetchCourseData,
-                this.course,
+                course,
                 {
                     sections: this.sections,
                     isGuest: this.isGuest,
diff --git a/src/addons/storagemanager/pages/courses-storage/courses-storage.html b/src/addons/storagemanager/pages/courses-storage/courses-storage.html
index e91ab12bc..0e1371d15 100644
--- a/src/addons/storagemanager/pages/courses-storage/courses-storage.html
+++ b/src/addons/storagemanager/pages/courses-storage/courses-storage.html
@@ -31,10 +31,9 @@
         <ion-card *ngIf="downloadedCourses.length">
             <ion-card-content class="ion-no-padding">
                 <ion-list>
-                    <ion-item *ngFor="let course of downloadedCourses" class="course" (click)="openCourse(course)" button>
+                    <ion-item *ngFor="let course of downloadedCourses" class="course" (click)="openCourse(course.id)" button>
                         <ion-label class="ion-text-wrap">
-                            <p class="item-heading" *ngIf="course.displayname">{{ course.displayname }}</p>
-                            <p class="item-heading" *ngIf="!course.displayname">{{ course.fullname }}</p>
+                            <p class="item-heading">{{ course.title }}</p>
                             <p class="item-heading item-heading-secondary" *ngIf="course.isDownloading">
                                 {{ 'core.downloading' | translate }}
                             </p>
diff --git a/src/addons/storagemanager/pages/courses-storage/courses-storage.ts b/src/addons/storagemanager/pages/courses-storage/courses-storage.ts
index ccae867a4..cd46c3c1e 100644
--- a/src/addons/storagemanager/pages/courses-storage/courses-storage.ts
+++ b/src/addons/storagemanager/pages/courses-storage/courses-storage.ts
@@ -18,6 +18,9 @@ import { CoreCourse, CoreCourseProvider } from '@features/course/services/course
 import { CoreCourseHelper } from '@features/course/services/course-helper';
 import { CoreCourseModulePrefetchDelegate } from '@features/course/services/module-prefetch-delegate';
 import { CoreCourses, CoreEnrolledCourseData } from '@features/courses/services/courses';
+import { CoreSiteHome } from '@features/sitehome/services/sitehome';
+import { CoreNavigator } from '@services/navigator';
+import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { Translate } from '@singletons';
 import { CoreArray } from '@singletons/array';
@@ -42,7 +45,7 @@ export class AddonStorageManagerCoursesStoragePage implements OnInit, OnDestroy
     courseStatusObserver?: CoreEventObserver;
 
     /**
-     * View loaded.
+     * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
         this.userCourses = await CoreCourses.getUserCourses();
@@ -58,6 +61,22 @@ export class AddonStorageManagerCoursesStoragePage implements OnInit, OnDestroy
                 .map((course) => this.getDownloadedCourse(course)),
         );
 
+        const siteHomeEnabled = await CoreSiteHome.isAvailable(this.siteId);
+        if (siteHomeEnabled) {
+            const siteHomeId = CoreSites.getCurrentSiteHomeId();
+            const size = await this.calculateDownloadedCourseSize(siteHomeId);
+            if (size > 0) {
+                const status = await CoreCourse.getCourseStatus(siteHomeId);
+
+                downloadedCourses.push({
+                    id: siteHomeId,
+                    title: Translate.instant('core.sitehome.sitehome'),
+                    totalSize: size,
+                    isDownloading: status === CoreConstants.DOWNLOADING,
+                });
+            }
+        }
+
         this.setDownloadedCourses(downloadedCourses);
 
         this.loaded = true;
@@ -173,7 +192,8 @@ export class AddonStorageManagerCoursesStoragePage implements OnInit, OnDestroy
         const status = await CoreCourse.getCourseStatus(course.id);
 
         return {
-            ...course,
+            id: course.id,
+            title: course.displayname || course.fullname,
             totalSize,
             isDownloading: status === CoreConstants.DOWNLOADING,
         };
@@ -198,12 +218,23 @@ export class AddonStorageManagerCoursesStoragePage implements OnInit, OnDestroy
         return moduleSizes.reduce((totalSize, moduleSize) => totalSize + moduleSize, 0);
     }
 
+    /**
+     * Open course storage.
+     *
+     * @param courseId Course Id.
+     */
+    openCourse(courseId: number, title: string): void {
+        CoreNavigator.navigateToSitePath('/storage/' + courseId, { params: { title } });
+    }
+
 }
 
 /**
  * Downloaded course data.
  */
-interface DownloadedCourse extends CoreEnrolledCourseData {
+interface DownloadedCourse {
+    id: number;
+    title: string;
     totalSize: number;
     isDownloading: boolean;
 }
diff --git a/src/addons/storagemanager/services/handlers/course-menu.ts b/src/addons/storagemanager/services/handlers/course-menu.ts
index 14111d513..a0e5c2653 100644
--- a/src/addons/storagemanager/services/handlers/course-menu.ts
+++ b/src/addons/storagemanager/services/handlers/course-menu.ts
@@ -51,6 +51,9 @@ export class AddonStorageManagerCourseMenuHandlerService implements CoreCourseOp
             icon: 'fas-archive',
             title: 'addon.storagemanager.managecoursestorage',
             page: 'storage/' + course.id,
+            pageParams: {
+                title: course.displayname ?? course.fullname,
+            },
             class: 'addon-storagemanager-coursemenu-handler',
         };
     }

From e97f70d1fbe208975a020e727200901e033a886f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 27 Jan 2022 22:53:00 +0100
Subject: [PATCH 0446/1008] MOBILE-3954 storage: Move space usage from
 preferences

---
 .../courses-storage/courses-storage.html      | 26 ++++++++--
 .../pages/courses-storage/courses-storage.ts  | 27 ++++++++++
 .../features/settings/pages/site/site.html    | 21 ++------
 src/core/features/settings/pages/site/site.ts | 52 ++-----------------
 4 files changed, 57 insertions(+), 69 deletions(-)

diff --git a/src/addons/storagemanager/pages/courses-storage/courses-storage.html b/src/addons/storagemanager/pages/courses-storage/courses-storage.html
index 0e1371d15..0a58d8fee 100644
--- a/src/addons/storagemanager/pages/courses-storage/courses-storage.html
+++ b/src/addons/storagemanager/pages/courses-storage/courses-storage.html
@@ -10,12 +10,31 @@
 </ion-header>
 <ion-content>
     <core-loading [hideUntil]="loaded">
+
+        <ion-card>
+            <ion-item class="ion-text-wrap">
+                <ion-label>{{ 'addon.storagemanager.info' | translate }}</ion-label>
+            </ion-item>
+            <ion-item class="ion-text-wrap" *ngIf="spaceUsage">
+                <ion-label>
+                    <p class="item-heading ion-text-wrap">{{ 'core.settings.spaceusage' | translate }}</p>
+                    <ion-badge color="light" *ngIf="spaceUsage.spaceUsage">{{ spaceUsage.spaceUsage | coreBytesToSize }}</ion-badge>
+                    <p>
+                        {{ 'core.settings.spaceusagehelp' | translate }}
+                    </p>
+                </ion-label>
+                <ion-button fill="clear" color="danger" slot="end" (click)="deleteSiteStorage()"
+                    [hidden]="spaceUsage.spaceUsage! + spaceUsage.cacheEntries! <= 0"
+                    [attr.aria-label]="'core.settings.deletesitefilestitle' | translate">
+                    <ion-icon name="fas-trash" slot="icon-only" aria-hidden="true"></ion-icon>
+                </ion-button>
+            </ion-item>
+        </ion-card>
+
         <ion-card>
             <ion-card-header>
-                <p class="ion-text-wrap">{{ 'addon.storagemanager.info' | translate }}</p>
                 <ion-card-title class="ion-text-wrap">{{ 'core.courses.courses' | translate }}</ion-card-title>
                 <ion-item class="size ion-text-wrap ion-no-padding" lines="none">
-                    <ion-icon name="fas-archive" slot="start" aria-hidden="true"></ion-icon>
                     <ion-label>
                         <h2 class="ion-text-wrap">{{ 'addon.storagemanager.storageused' | translate }}</h2>
                         <ion-badge color="light">{{ totalSize | coreBytesToSize }}</ion-badge>
@@ -28,10 +47,11 @@
                 </ion-item>
             </ion-card-header>
         </ion-card>
+
         <ion-card *ngIf="downloadedCourses.length">
             <ion-card-content class="ion-no-padding">
                 <ion-list>
-                    <ion-item *ngFor="let course of downloadedCourses" class="course" (click)="openCourse(course.id)" button>
+                    <ion-item *ngFor="let course of downloadedCourses" class="course" (click)="openCourse(course.id, course.title)" button>
                         <ion-label class="ion-text-wrap">
                             <p class="item-heading">{{ course.title }}</p>
                             <p class="item-heading item-heading-secondary" *ngIf="course.isDownloading">
diff --git a/src/addons/storagemanager/pages/courses-storage/courses-storage.ts b/src/addons/storagemanager/pages/courses-storage/courses-storage.ts
index cd46c3c1e..300e9f16c 100644
--- a/src/addons/storagemanager/pages/courses-storage/courses-storage.ts
+++ b/src/addons/storagemanager/pages/courses-storage/courses-storage.ts
@@ -18,6 +18,7 @@ import { CoreCourse, CoreCourseProvider } from '@features/course/services/course
 import { CoreCourseHelper } from '@features/course/services/course-helper';
 import { CoreCourseModulePrefetchDelegate } from '@features/course/services/module-prefetch-delegate';
 import { CoreCourses, CoreEnrolledCourseData } from '@features/courses/services/courses';
+import { CoreSettingsHelper, CoreSiteSpaceUsage } from '@features/settings/services/settings-helper';
 import { CoreSiteHome } from '@features/sitehome/services/sitehome';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
@@ -41,8 +42,17 @@ export class AddonStorageManagerCoursesStoragePage implements OnInit, OnDestroy
     completelyDownloadedCourses: DownloadedCourse[] = [];
     totalSize = 0;
     loaded = false;
+    spaceUsage: CoreSiteSpaceUsage = {
+        cacheEntries: 0,
+        spaceUsage: 0,
+    };
 
     courseStatusObserver?: CoreEventObserver;
+    siteId: string;
+
+    constructor() {
+        this.siteId = CoreSites.getCurrentSiteId();
+    }
 
     /**
      * @inheritdoc
@@ -77,6 +87,8 @@ export class AddonStorageManagerCoursesStoragePage implements OnInit, OnDestroy
             }
         }
 
+        this.spaceUsage = await CoreSettingsHelper.getSiteSpaceUsage(this.siteId);
+
         this.setDownloadedCourses(downloadedCourses);
 
         this.loaded = true;
@@ -227,6 +239,21 @@ export class AddonStorageManagerCoursesStoragePage implements OnInit, OnDestroy
         CoreNavigator.navigateToSitePath('/storage/' + courseId, { params: { title } });
     }
 
+    /**
+     * Deletes files of a site and the tables that can be cleared.
+     *
+     * @param siteData Site object with space usage.
+     */
+    async deleteSiteStorage(): Promise<void> {
+        try {
+            const siteName = CoreSites.getRequiredCurrentSite().getSiteName();
+
+            this.spaceUsage = await CoreSettingsHelper.deleteSiteStorage(siteName, this.siteId);
+        } catch {
+            // Ignore cancelled confirmation modal.
+        }
+    }
+
 }
 
 /**
diff --git a/src/core/features/settings/pages/site/site.html b/src/core/features/settings/pages/site/site.html
index 24043ef35..0470d5026 100644
--- a/src/core/features/settings/pages/site/site.html
+++ b/src/core/features/settings/pages/site/site.html
@@ -27,28 +27,15 @@
                     </ion-label>
                 </ion-item>
             </ion-list>
+
             <ion-card>
-                <ion-item class="ion-text-wrap" *ngIf="spaceUsage">
-                    <ion-label>
-                        <p class="item-heading ion-text-wrap">{{ 'core.settings.spaceusage' | translate }}</p>
-                        <p *ngIf="spaceUsage.spaceUsage">{{ spaceUsage.spaceUsage | coreBytesToSize }}</p>
-                    </ion-label>
-                    <ion-button fill="clear" [attr.aria-label]="'core.info' | translate" (click)="showSpaceInfo()" slot="end">
-                        <ion-icon name="fas-info-circle" color="info" slot="icon-only"></ion-icon>
-                    </ion-button>
-                    <ion-button fill="clear" color="danger" slot="end" (click)="deleteSiteStorage()"
-                        [hidden]="spaceUsage.spaceUsage! + spaceUsage.cacheEntries! <= 0"
-                        [attr.aria-label]="'core.settings.deletesitefilestitle' | translate">
-                        <ion-icon name="fas-trash" slot="icon-only" aria-hidden="true"></ion-icon>
-                    </ion-button>
-                </ion-item>
                 <ion-item class="ion-text-wrap">
                     <ion-label>
                         <p class="item-heading">{{ 'core.settings.synchronizenow' | translate }}</p>
+                        <p>
+                            {{ 'core.settings.synchronizenowhelp' | translate }}
+                        </p>
                     </ion-label>
-                    <ion-button fill="clear" [attr.aria-label]="'core.info' | translate" (click)="showSyncInfo()" slot="end">
-                        <ion-icon name="fas-info-circle" color="info" slot="icon-only"></ion-icon>
-                    </ion-button>
                     <core-button-with-spinner [loading]="isSynchronizing()" slot="end">
                         <ion-button fill="clear" (click)="synchronize()" [attr.aria-label]="'core.settings.synchronizenow' | translate">
                             <ion-icon name="fas-sync-alt" slot="icon-only" aria-hidden="true"></ion-icon>
diff --git a/src/core/features/settings/pages/site/site.ts b/src/core/features/settings/pages/site/site.ts
index 4fc275b2e..c2659848f 100644
--- a/src/core/features/settings/pages/site/site.ts
+++ b/src/core/features/settings/pages/site/site.ts
@@ -18,15 +18,13 @@ import { IonRefresher } from '@ionic/angular';
 import { CoreSettingsHandlerToDisplay } from '../../services/settings-delegate';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreSites } from '@services/sites';
-import { CoreDomUtils } from '@services/utils/dom';
-import { CoreSettingsHelper, CoreSiteSpaceUsage } from '../../services/settings-helper';
-import { CoreApp } from '@services/app';
-import { Translate } from '@singletons';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import { CoreListItemsManager } from '@classes/items-management/list-items-manager';
 import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
 import { CoreSettingsHandlersSource } from '@features/settings/classes/settings-handlers-source';
+import { CoreSettingsHelper } from '@features/settings/services/settings-helper';
+import { CoreDomUtils } from '@services/utils/dom';
 
 /**
  * Page that displays the list of site settings pages.
@@ -41,18 +39,11 @@ export class CoreSitePreferencesPage implements AfterViewInit, OnDestroy {
 
     handlers: CoreListItemsManager<CoreSettingsHandlerToDisplay>;
 
-    isIOS: boolean;
-    siteId: string;
-    spaceUsage: CoreSiteSpaceUsage = {
-        cacheEntries: 0,
-        spaceUsage: 0,
-    };
-
+    protected siteId: string;
     protected sitesObserver: CoreEventObserver;
     protected isDestroyed = false;
 
     constructor() {
-        this.isIOS = CoreApp.isIOS();
         this.siteId = CoreSites.getCurrentSiteId();
 
         const source = CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(CoreSettingsHandlersSource, []);
@@ -90,8 +81,6 @@ export class CoreSitePreferencesPage implements AfterViewInit, OnDestroy {
      */
     protected async fetchData(): Promise<void> {
         await this.handlers.load();
-
-        this.spaceUsage = await CoreSettingsHelper.getSiteSpaceUsage(this.siteId);
     }
 
     /**
@@ -131,41 +120,6 @@ export class CoreSitePreferencesPage implements AfterViewInit, OnDestroy {
         });
     }
 
-    /**
-     * Deletes files of a site and the tables that can be cleared.
-     *
-     * @param siteData Site object with space usage.
-     */
-    async deleteSiteStorage(): Promise<void> {
-        try {
-            const siteName = CoreSites.getRequiredCurrentSite().getSiteName();
-
-            this.spaceUsage = await CoreSettingsHelper.deleteSiteStorage(siteName, this.siteId);
-        } catch {
-            // Ignore cancelled confirmation modal.
-        }
-    }
-
-    /**
-     * Show information about space usage actions.
-     */
-    showSpaceInfo(): void {
-        CoreDomUtils.showAlert(
-            Translate.instant('core.help'),
-            Translate.instant('core.settings.spaceusagehelp'),
-        );
-    }
-
-    /**
-     * Show information about sync actions.
-     */
-    showSyncInfo(): void {
-        CoreDomUtils.showAlert(
-            Translate.instant('core.help'),
-            Translate.instant('core.settings.synchronizenowhelp'),
-        );
-    }
-
     /**
      * Page destroyed.
      */

From 514b4150dec92194ec3d9e7e4df7dee03a443c93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 2 Feb 2022 15:20:21 +0100
Subject: [PATCH 0447/1008] MOBILE-3954 storage: Apply UX changes to text

---
 scripts/langindex.json                        | 12 ++++--
 src/addons/storagemanager/lang.json           | 18 ++++----
 .../pages/course-storage/course-storage.html  | 11 +++--
 .../courses-storage/courses-storage.html      | 42 ++++++++-----------
 .../services/handlers/course-menu.ts          |  4 +-
 .../services/handlers/settings.ts             |  2 +-
 .../core-courses-course-options-menu.html     |  2 +-
 7 files changed, 46 insertions(+), 45 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 40c4b9144..af83bf1ca 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1104,13 +1104,17 @@
   "addon.report_insights.notapplicable": "analytics",
   "addon.report_insights.notuseful": "analytics",
   "addon.report_insights.useful": "analytics",
+  "addon.storagemanager.coursedownloads": "local_moodlemobileapp",
+  "addon.storagemanager.courseinfo": "local_moodlemobileapp",
+  "addon.storagemanager.coursesspaceusage": "local_moodlemobileapp",
   "addon.storagemanager.deletecourse": "local_moodlemobileapp",
   "addon.storagemanager.deletecourses": "local_moodlemobileapp",
+  "addon.storagemanager.deletedata": "local_moodlemobileapp",
   "addon.storagemanager.deletedatafrom": "local_moodlemobileapp",
-  "addon.storagemanager.info": "local_moodlemobileapp",
-  "addon.storagemanager.managecoursestorage": "local_moodlemobileapp",
-  "addon.storagemanager.managestorage": "local_moodlemobileapp",
-  "addon.storagemanager.storageused": "local_moodlemobileapp",
+  "addon.storagemanager.downloadedcourses": "local_moodlemobileapp",
+  "addon.storagemanager.managedownloads": "local_moodlemobileapp",
+  "addon.storagemanager.totaldownloads": "local_moodlemobileapp",
+  "addon.storagemanager.totalspaceusage": "local_moodlemobileapp",
   "assets.countries.AD": "countries",
   "assets.countries.AE": "countries",
   "assets.countries.AF": "countries",
diff --git a/src/addons/storagemanager/lang.json b/src/addons/storagemanager/lang.json
index 389a65e62..1641c3b96 100644
--- a/src/addons/storagemanager/lang.json
+++ b/src/addons/storagemanager/lang.json
@@ -1,9 +1,13 @@
 {
-    "deletecourse": "Offload all course data",
-    "deletecourses": "Offload all courses data",
-    "deletedatafrom": "Offload data from {{name}}",
-    "info": "Files stored on your device make the app work faster and enable the app to be used offline. You can safely offload files if you need to free up storage space.",
-    "managestorage": "Manage storage",
-    "managecoursestorage": "Manage course storage",
-    "storageused": "File storage used:"
+    "deletedata": "Delete offline data",
+    "deletecourse": "Delete offline data from this course",
+    "deletecourses": "Delete offline data from all courses",
+    "deletedatafrom": "Delete offline data from {{name}}",
+    "courseinfo": "Download course content to work offline. Your activity will sync automatically when your device is back online.",
+    "managedownloads": "Manage downloads",
+    "coursedownloads": "Course downloads",
+    "totaldownloads": "Total downloads",
+    "totalspaceusage": "Total space usage",
+    "coursesspaceusage": "Courses space usage",
+    "downloadedcourses": "Downloaded courses"
 }
diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.html b/src/addons/storagemanager/pages/course-storage/course-storage.html
index 3f05975e6..4db31b1e0 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.html
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.html
@@ -4,7 +4,7 @@
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
         <ion-title>
-            <h1>{{ 'addon.storagemanager.managecoursestorage' | translate }}</h1>
+            <h1>{{ 'addon.storagemanager.coursedownloads' | translate }}</h1>
         </ion-title>
     </ion-toolbar>
 </ion-header>
@@ -12,15 +12,14 @@
     <core-loading [hideUntil]="loaded">
         <ion-card class="wholecourse">
             <ion-card-header>
-                <p class="ion-text-wrap">{{ 'addon.storagemanager.info' | translate }}</p>
+                <p class="ion-text-wrap ion-no-margin">{{ 'addon.storagemanager.courseinfo' | translate }}</p>
                 <ion-card-title>{{ title }}</ion-card-title>
                 <ion-item class="size ion-text-wrap ion-no-padding" lines="none">
-                    <ion-icon name="fas-archive" slot="start" aria-hidden="true"></ion-icon>
                     <ion-label>
-                        <p class="item-heading ion-text-wrap">{{ 'addon.storagemanager.storageused' | translate }}</p>
+                        <p class="item-heading ion-text-wrap">{{ 'addon.storagemanager.totaldownloads' | translate }}</p>
                         <ion-badge color="light">{{ totalSize | coreBytesToSize }}</ion-badge>
                     </ion-label>
-                    <ion-button slot="end" (click)="deleteForCourse()" [disabled]="totalSize == 0" color="danger">
+                    <ion-button slot="end" (click)="deleteForCourse()" [disabled]="totalSize == 0" color="danger" fill="outline">
                         <ion-icon name="fas-trash" slot="icon-only" [attr.aria-label]="'addon.storagemanager.deletecourse' | translate">
                         </ion-icon>
                     </ion-button>
@@ -48,7 +47,7 @@
                             </p>
                         </ion-label>
                         <div class="storage-buttons" slot="end" *ngIf="section.totalSize > 0 || downloadEnabled">
-                            <ion-button (click)="deleteForSection(section)" *ngIf="section.totalSize > 0" color="danger">
+                            <ion-button (click)="deleteForSection(section)" *ngIf="section.totalSize > 0" color="danger" fill="outline">
                                 <ion-icon name="fas-trash" slot="icon-only"
                                     [attr.aria-label]="'addon.storagemanager.deletedatafrom' | translate: { name: section.name }">
                                 </ion-icon>
diff --git a/src/addons/storagemanager/pages/courses-storage/courses-storage.html b/src/addons/storagemanager/pages/courses-storage/courses-storage.html
index 0a58d8fee..ffffbc9f3 100644
--- a/src/addons/storagemanager/pages/courses-storage/courses-storage.html
+++ b/src/addons/storagemanager/pages/courses-storage/courses-storage.html
@@ -4,7 +4,7 @@
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
         <ion-title>
-            <h1>{{ 'addon.storagemanager.managestorage' | translate }}</h1>
+            <h1>{{ 'addon.storagemanager.managedownloads' | translate }}</h1>
         </ion-title>
     </ion-toolbar>
 </ion-header>
@@ -12,12 +12,9 @@
     <core-loading [hideUntil]="loaded">
 
         <ion-card>
-            <ion-item class="ion-text-wrap">
-                <ion-label>{{ 'addon.storagemanager.info' | translate }}</ion-label>
-            </ion-item>
             <ion-item class="ion-text-wrap" *ngIf="spaceUsage">
                 <ion-label>
-                    <p class="item-heading ion-text-wrap">{{ 'core.settings.spaceusage' | translate }}</p>
+                    <p class="item-heading ion-text-wrap">{{ 'addon.storagemanager.totalspaceusage' | translate }}</p>
                     <ion-badge color="light" *ngIf="spaceUsage.spaceUsage">{{ spaceUsage.spaceUsage | coreBytesToSize }}</ion-badge>
                     <p>
                         {{ 'core.settings.spaceusagehelp' | translate }}
@@ -25,29 +22,26 @@
                 </ion-label>
                 <ion-button fill="clear" color="danger" slot="end" (click)="deleteSiteStorage()"
                     [hidden]="spaceUsage.spaceUsage! + spaceUsage.cacheEntries! <= 0"
-                    [attr.aria-label]="'core.settings.deletesitefilestitle' | translate">
+                    [attr.aria-label]="'core.settings.deletesitefilestitle' | translate" fill="outline">
                     <ion-icon name="fas-trash" slot="icon-only" aria-hidden="true"></ion-icon>
                 </ion-button>
             </ion-item>
+            <ion-item class="size ion-text-wrap" lines="none">
+                <ion-label>
+                    <h2 class="ion-text-wrap">{{ 'addon.storagemanager.coursesspaceusage' | translate }}</h2>
+                    <ion-badge color="light">{{ totalSize | coreBytesToSize }}</ion-badge>
+                </ion-label>
+                <ion-button slot="end" (click)="deleteCompletelyDownloadedCourses()" [disabled]="completelyDownloadedCourses.length === 0"
+                    color="danger" fill="outline">
+                    <ion-icon name="fas-trash" slot="icon-only" ariaLabel="{{ 'addon.storagemanager.deletecourses' | translate }}">
+                    </ion-icon>
+                </ion-button>
+            </ion-item>
         </ion-card>
 
-        <ion-card>
-            <ion-card-header>
-                <ion-card-title class="ion-text-wrap">{{ 'core.courses.courses' | translate }}</ion-card-title>
-                <ion-item class="size ion-text-wrap ion-no-padding" lines="none">
-                    <ion-label>
-                        <h2 class="ion-text-wrap">{{ 'addon.storagemanager.storageused' | translate }}</h2>
-                        <ion-badge color="light">{{ totalSize | coreBytesToSize }}</ion-badge>
-                    </ion-label>
-                    <ion-button slot="end" (click)="deleteCompletelyDownloadedCourses()"
-                        [disabled]="completelyDownloadedCourses.length === 0" color="danger">
-                        <ion-icon name="fas-trash" slot="icon-only" ariaLabel="{{ 'addon.storagemanager.deletecourses' | translate }}">
-                        </ion-icon>
-                    </ion-button>
-                </ion-item>
-            </ion-card-header>
-        </ion-card>
-
+        <div class="ion-padding-horizontal ion-text-wrap" *ngIf="downloadedCourses.length">
+            <h2>{{ 'addon.storagemanager.downloadedcourses' | translate }}</h2>
+        </div>
         <ion-card *ngIf="downloadedCourses.length">
             <ion-card-content class="ion-no-padding">
                 <ion-list>
@@ -61,7 +55,7 @@
                                 {{ course.totalSize | coreBytesToSize }}
                             </ion-badge>
                         </ion-label>
-                        <ion-button slot="end" (click)="deleteCourse(course)" [disabled]="course.isDownloading" color="danger">
+                        <ion-button slot="end" (click)="deleteCourse(course)" [disabled]="course.isDownloading" color="danger" fill="clear">
                             <ion-icon name="fas-trash" slot="icon-only"
                                 [attr.aria-label]="'addon.storagemanager.deletedatafrom' | translate: { name: course.displayname }">
                             </ion-icon>
diff --git a/src/addons/storagemanager/services/handlers/course-menu.ts b/src/addons/storagemanager/services/handlers/course-menu.ts
index a0e5c2653..7aa36c6de 100644
--- a/src/addons/storagemanager/services/handlers/course-menu.ts
+++ b/src/addons/storagemanager/services/handlers/course-menu.ts
@@ -48,8 +48,8 @@ export class AddonStorageManagerCourseMenuHandlerService implements CoreCourseOp
         course: CoreCourseAnyCourseDataWithOptions,
     ): CoreCourseOptionsMenuHandlerData {
         return {
-            icon: 'fas-archive',
-            title: 'addon.storagemanager.managecoursestorage',
+            icon: 'cloud-download',
+            title: 'addon.storagemanager.coursedownloads',
             page: 'storage/' + course.id,
             pageParams: {
                 title: course.displayname ?? course.fullname,
diff --git a/src/addons/storagemanager/services/handlers/settings.ts b/src/addons/storagemanager/services/handlers/settings.ts
index 9bcaf413c..3e3fbfc1a 100644
--- a/src/addons/storagemanager/services/handlers/settings.ts
+++ b/src/addons/storagemanager/services/handlers/settings.ts
@@ -41,7 +41,7 @@ export class AddonStorageManagerSettingsHandlerService implements CoreSettingsHa
     getDisplayData(): CoreSettingsHandlerData {
         return {
             icon: 'fas-archive',
-            title: 'addon.storagemanager.managestorage',
+            title: 'addon.storagemanager.managedownloads',
             page: AddonStorageManagerSettingsHandlerService.PAGE_NAME,
             class: 'addon-storagemanager-settings-handler',
         };
diff --git a/src/core/features/courses/components/course-options-menu/core-courses-course-options-menu.html b/src/core/features/courses/components/course-options-menu/core-courses-course-options-menu.html
index 59db9a4dc..39e1cc94f 100644
--- a/src/core/features/courses/components/course-options-menu/core-courses-course-options-menu.html
+++ b/src/core/features/courses/components/course-options-menu/core-courses-course-options-menu.html
@@ -9,7 +9,7 @@
     *ngIf="prefetch.status == 'downloaded' || prefetch.status == 'outdated'">
     <ion-icon name="fas-trash" slot="start" aria-hidden="true"></ion-icon>
     <ion-label>
-        <h2>{{ 'addon.storagemanager.deletecourse' | translate }}</h2>
+        <h2>{{ 'addon.storagemanager.deletedata' | translate }}</h2>
     </ion-label>
 </ion-item>
 <ion-item button class="ion-text-wrap" (click)="action('hide')" *ngIf="!course.hidden" detail="false">

From 5040f70da8881320b3680cbdd7ba127812f9fe77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 3 Feb 2022 15:28:40 +0100
Subject: [PATCH 0448/1008] MOBILE-3814 styles: Adapt colors to match LMS

---
 .../components/blogtags/blogtags.scss         |   4 +-
 .../block/tags/components/tags/tags.scss      |   4 +-
 src/addons/calendar/calendar-common.scss      |  20 +---
 .../messages/pages/discussion/discussion.scss |   4 +-
 .../components/submission/submission.scss     |   4 +-
 src/addons/mod/data/data-forms.scss           |   2 +-
 .../lesson/pages/user-retake/user-retake.scss |   4 +-
 .../connection-error/connection-error.scss    |   4 +-
 .../mod/quiz/components/index/index.scss      |   8 +-
 .../mod/wiki/components/index/index.scss      |   4 +-
 .../components/submission/submission.scss     |   4 +-
 .../qtype/ddmarker/component/ddmarker.scss    |   8 +-
 src/core/components/combobox/combobox.scss    |   6 +-
 .../components/input-errors/input-errors.scss |   2 +-
 src/core/components/loading/loading.scss      |   2 +-
 .../components/split-view/split-view.scss     |  17 +--
 .../rich-text-editor/rich-text-editor.scss    |   4 +-
 .../features/grades/pages/course/course.scss  |  13 +--
 src/core/features/login/pages/site/site.scss  |   5 +-
 .../features/mainmenu/pages/menu/menu.scss    |   6 +-
 .../features/mainmenu/pages/more/more.scss    |   6 +-
 src/core/features/question/question.scss      |   4 +-
 src/theme/components/discussion.scss          |   2 +-
 src/theme/components/format-text.scss         |  31 +++---
 src/theme/components/rubrics.scss             |  30 ++---
 src/theme/globals.mixins.ionic.scss           |  30 +++--
 src/theme/globals.mixins.scss                 |  57 +++++++++-
 src/theme/globals.variables.scss              | 103 +++++++-----------
 src/theme/theme.base.scss                     |  18 +--
 src/theme/theme.dark.scss                     |  56 ++++------
 src/theme/theme.light.scss                    |  89 +++++----------
 31 files changed, 264 insertions(+), 287 deletions(-)

diff --git a/src/addons/block/blogtags/components/blogtags/blogtags.scss b/src/addons/block/blogtags/components/blogtags/blogtags.scss
index 0f8abbbd2..0dbdc11a1 100644
--- a/src/addons/block/blogtags/components/blogtags/blogtags.scss
+++ b/src/addons/block/blogtags/components/blogtags/blogtags.scss
@@ -11,8 +11,8 @@
             display: inline-block;
 
             a {
-                background: var(--ion-color-primary);
-                color: var(--ion-color-primary-contrast);
+                background: var(--primary);
+                color: var(--primary-contrast);
                 padding: 3px 8px;
                 -webkit-font-smoothing: antialiased;
                 display: inline-block;
diff --git a/src/addons/block/tags/components/tags/tags.scss b/src/addons/block/tags/components/tags/tags.scss
index 7856e76c5..658f42de8 100644
--- a/src/addons/block/tags/components/tags/tags.scss
+++ b/src/addons/block/tags/components/tags/tags.scss
@@ -13,8 +13,8 @@
                 display: inline-block;
 
                 a {
-                    background: var(--ion-color-primary);
-                    color: var(--ion-color-primary-contrast);
+                    background: var(--primary);
+                    color: var(--primary-contrast);
                     padding: 3px 8px;
                     -webkit-font-smoothing: antialiased;
                     display: inline-block;
diff --git a/src/addons/calendar/calendar-common.scss b/src/addons/calendar/calendar-common.scss
index ab19d2db4..3691d26f2 100644
--- a/src/addons/calendar/calendar-common.scss
+++ b/src/addons/calendar/calendar-common.scss
@@ -1,3 +1,5 @@
+@import "~theme/globals";
+
 :host {
 
     --addon-calendar-blank-day-background-color: var(--light);
@@ -9,20 +11,10 @@
             padding: 0.7rem;
         }
 
-        &.addon-calendar-eventtype-category > ion-icon {
-            background-color: var(--addon-calendar-event-category-color);
-        }
-        &.addon-calendar-eventtype-course > ion-icon {
-            background-color: var(--addon-calendar-event-course-color);
-        }
-        &.addon-calendar-eventtype-group > ion-icon {
-            background-color: var(--addon-calendar-event-group-color);
-        }
-        &.addon-calendar-eventtype-user > ion-icon {
-            background-color: var(--addon-calendar-event-user-color);
-        }
-        &.addon-calendar-eventtype-site > ion-icon {
-            background-color: var(--addon-calendar-event-site-color);
+        @each $category, $value in $calendar-event-category-colors {
+            &.addon-calendar-eventtype-#{$category} > ion-icon {
+                background-color: $value;
+            }
         }
     }
 
diff --git a/src/addons/messages/pages/discussion/discussion.scss b/src/addons/messages/pages/discussion/discussion.scss
index 1469d3b7c..2f8f0935d 100644
--- a/src/addons/messages/pages/discussion/discussion.scss
+++ b/src/addons/messages/pages/discussion/discussion.scss
@@ -4,13 +4,13 @@
 :host {
 
     .addon-messages-unreadfrom {
-        color: var(--ion-color-primary);
+        color: var(--primary);
         background-color: transparent;
         margin-top: 6px;
         margin-left: auto;
         margin-right: auto;
         ion-icon {
-            color: var(--ion-color-primary);
+            color: var(--primary);
             background-color: transparent;
         }
     }
diff --git a/src/addons/mod/assign/components/submission/submission.scss b/src/addons/mod/assign/components/submission/submission.scss
index 3c8a199a0..51e8c8838 100644
--- a/src/addons/mod/assign/components/submission/submission.scss
+++ b/src/addons/mod/assign/components/submission/submission.scss
@@ -15,7 +15,7 @@
     }
 
     div.submissioneditable p {
-        color: var(--red);
+        color: var(--danger);
     }
 
     .core-grading-summary .advancedgrade {
@@ -25,6 +25,6 @@
 
 :host-context(body.dark) ::ng-deep {
     div.submissioneditable p {
-        color: var(--red-light);
+        color: var(--danger-tint);
     }
 }
diff --git a/src/addons/mod/data/data-forms.scss b/src/addons/mod/data/data-forms.scss
index 51184ba44..1ee47a8c0 100644
--- a/src/addons/mod/data/data-forms.scss
+++ b/src/addons/mod/data/data-forms.scss
@@ -39,7 +39,7 @@
                 }
 
                 &.has-focus {
-                    --input-border-color: var(--ion-color-primary);
+                    --input-border-color: var(--primary);
                 }
                 &.has-focus.ion-valid {
                     --input-border-color: var(--success);
diff --git a/src/addons/mod/lesson/pages/user-retake/user-retake.scss b/src/addons/mod/lesson/pages/user-retake/user-retake.scss
index 87b03856c..8e5d088c2 100644
--- a/src/addons/mod/lesson/pages/user-retake/user-retake.scss
+++ b/src/addons/mod/lesson/pages/user-retake/user-retake.scss
@@ -4,10 +4,10 @@
     }
 
     .addon-mod_lesson-highlight {
-        --background: var(--blue-light);
+        --background: var(--primary-tint);
 
         ion-label, ion-label p {
-            color: var(--blue-dark);
+            color: var(--primary-shade);
         }
     }
 
diff --git a/src/addons/mod/quiz/components/connection-error/connection-error.scss b/src/addons/mod/quiz/components/connection-error/connection-error.scss
index 7658c1e7e..a2fb05f4d 100644
--- a/src/addons/mod/quiz/components/connection-error/connection-error.scss
+++ b/src/addons/mod/quiz/components/connection-error/connection-error.scss
@@ -1,7 +1,7 @@
 :host {
-    background-color: var(--red-light);
+    background-color: var(--danger-tint);
 
     .item {
-        --background: var(--red-light);
+        --background: var(--danger-tint);
     }
 }
diff --git a/src/addons/mod/quiz/components/index/index.scss b/src/addons/mod/quiz/components/index/index.scss
index abf80309f..b7cdadf28 100644
--- a/src/addons/mod/quiz/components/index/index.scss
+++ b/src/addons/mod/quiz/components/index/index.scss
@@ -14,8 +14,8 @@
         .item.addon-mod_quiz-highlighted,
         .addon-mod_quiz-highlighted p,
         .item.addon-mod_quiz-highlighted p {
-            --background: var(--blue-light);
-            color: var(--blue-dark);
+            --background: var(--primary-tint);
+            color: var(--primary-shade);
         }
     }
 }
@@ -26,8 +26,8 @@
         .item.addon-mod_quiz-highlighted,
         .addon-mod_quiz-highlighted p,
         .item.addon-mod_quiz-highlighted p {
-            --background: var(--blue-dark);
-            color: var(--blue-light);
+            --background: var(--primary-shade);
+            color: var(--primary-tint);
         }
     }
 }
diff --git a/src/addons/mod/wiki/components/index/index.scss b/src/addons/mod/wiki/components/index/index.scss
index 5efe4c381..f0251ad37 100644
--- a/src/addons/mod/wiki/components/index/index.scss
+++ b/src/addons/mod/wiki/components/index/index.scss
@@ -3,7 +3,7 @@
 $addon-mod-wiki-toc-level-padding:    12px !default;
 
 :host {
-    --addon-mod-wiki-newentry-link-color: var(--red);
+    --addon-mod-wiki-newentry-link-color: var(--danger);
     --addon-mod-wiki-toc-border-color: var(--gray-500);
     --addon-mod-wiki-toc-background-color: var(--gray-200);
 
@@ -58,6 +58,6 @@ $addon-mod-wiki-toc-level-padding:    12px !default;
 }
 
 :host-context(body.dark) {
-    --addon-mod-wiki-newentry-link-color: var(--red-light);
+    --addon-mod-wiki-newentry-link-color: var(--danger-tint);
     --addon-mod-wiki-toc-background-color: var(--medium);
 }
diff --git a/src/addons/mod/workshop/components/submission/submission.scss b/src/addons/mod/workshop/components/submission/submission.scss
index 5490cd6b4..2649f9bbf 100644
--- a/src/addons/mod/workshop/components/submission/submission.scss
+++ b/src/addons/mod/workshop/components/submission/submission.scss
@@ -1,10 +1,10 @@
 :host {
   p.addon-overriden-grade {
-    color: var(--ion-color-success);
+    color: var(--success);
   }
 
   p.addon-has-overriden-grade {
-    color: var(--ion-color-danger);
+    color: var(--danger);
     text-decoration: line-through;
   }
 }
diff --git a/src/addons/qtype/ddmarker/component/ddmarker.scss b/src/addons/qtype/ddmarker/component/ddmarker.scss
index ea1272c1f..980cb3b54 100644
--- a/src/addons/qtype/ddmarker/component/ddmarker.scss
+++ b/src/addons/qtype/ddmarker/component/ddmarker.scss
@@ -118,18 +118,18 @@ core-format-text ::ng-deep {
     }
     div.markertexts span.markertext {
         z-index: 3;
-        background-color: var(--yellow-light);
+        background-color: var(--warning-tint);
         border-style: solid;
         border-width: 2px;
-        border-color: var(--yellow);
+        border-color: var(--warning);
         position: absolute;
         color: var(--gray-900);
     }
     span.wrongpart {
-        background-color: var(--yellow-light);
+        background-color: var(--warning-tint);
         border-style: solid;
         border-width: 2px;
-        border-color: var(--yellow);
+        border-color: var(--warning);
         padding: 5px;
         border-radius: 10px;
         opacity: 0.6;
diff --git a/src/core/components/combobox/combobox.scss b/src/core/components/combobox/combobox.scss
index bef06c30c..037d35189 100644
--- a/src/core/components/combobox/combobox.scss
+++ b/src/core/components/combobox/combobox.scss
@@ -9,9 +9,9 @@
     ion-button {
         --icon-margin: 0 8px;
         --background: var(--core-combobox-background);
-        --background-hover: #000000;
-        --background-activated: #000000;
-        --background-focused: #000000;
+        --background-hover: black;
+        --background-activated: black;
+        --background-focused: black;
         --background-hover-opacity: .04;
 
         --color: var(--core-combobox-color);
diff --git a/src/core/components/input-errors/input-errors.scss b/src/core/components/input-errors/input-errors.scss
index de3f96567..32cabaf50 100644
--- a/src/core/components/input-errors/input-errors.scss
+++ b/src/core/components/input-errors/input-errors.scss
@@ -4,7 +4,7 @@
     .core-input-error-container {
         .core-input-error {
             padding: 4px;
-            color: var(--ion-color-danger);
+            color: var(--danger);
             font-size: 12px;
             display: none;
 
diff --git a/src/core/components/loading/loading.scss b/src/core/components/loading/loading.scss
index ef26afe30..6f439e64e 100644
--- a/src/core/components/loading/loading.scss
+++ b/src/core/components/loading/loading.scss
@@ -3,7 +3,7 @@
 :host {
     --loading-background: var(--ion-background-color);
     --loading-background-inline: var(--ion-background-color-rgb);
-    --loading-spinner: var(--ion-color-primary);
+    --loading-spinner: var(--core-loading-spinner);
     --loading-text-color: var(--ion-text-color);
     --loading-inline-margin: 0px;
     --loading-inline-min-height: 28px;
diff --git a/src/core/components/split-view/split-view.scss b/src/core/components/split-view/split-view.scss
index a333f7623..089107563 100644
--- a/src/core/components/split-view/split-view.scss
+++ b/src/core/components/split-view/split-view.scss
@@ -1,9 +1,12 @@
+@import "~theme/globals";
+
 :host {
     --menu-min-width: 270px;
     --menu-max-width: 28%;
     --menu-box-shadow: var(--core-menu-box-shadow-end);
     --menu-z: 2;
-    --menu-border-width: 1;
+    --menu-border-width: 1px;
+    --menu-border-color: var(--stroke);
     --menu-display: flex;
     --content-display: block;
     --content-outlet-display: none;
@@ -38,8 +41,8 @@
         flex-shrink: 0;
         order: -1;
         width: 100%;
-        border-inline-start: 0;
-        border-inline-end: var(--border);
+        @include border-start(0);
+        @include border-end(var(--menu-border-width), solid, var(--menu-border-color));
         min-width: var(--menu-min-width);
         max-width: var(--menu-max-width);
     }
@@ -82,11 +85,3 @@
     --content-placeholder-display: none;
     --content-outlet-display: var(--content-display);
 }
-
-:host-context(ion-app.md) {
-    --border: calc(var(--menu-border-width) * 1px) solid var(--ion-item-border-color, var(--ion-border-color, var(--ion-color-step-150, rgba(0, 0, 0, .13))));
-}
-
-:host-context(ion-app.ios) {
-    --border: calc(var(--menu-border-width) * .55px) solid var(--ion-item-border-color, var(--ion-border-color, var(--ion-color-step-250, #c8c7cc)));
-}
diff --git a/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss b/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss
index 42ef760a4..d869f7aae 100644
--- a/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss
+++ b/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss
@@ -37,13 +37,13 @@
 
         .core-rte-info-message {
             padding: 5px;
-            border-top: 1px solid var(--ion-color-info);
+            border-top: 1px solid var(--info);
             background: var(--background);
             flex-shrink: 1;
             font-size: 1.1rem;
 
             .icon {
-                color: var(--ion-color-info);
+                color: var(--info);
             }
         }
     }
diff --git a/src/core/features/grades/pages/course/course.scss b/src/core/features/grades/pages/course/course.scss
index a679d9d55..9068aaba0 100644
--- a/src/core/features/grades/pages/course/course.scss
+++ b/src/core/features/grades/pages/course/course.scss
@@ -6,7 +6,8 @@
     --even-cell-background: var(--white);
     --odd-cell-hover: var(--gray-200);
     --even-cell-hover: var(--light);
-    --icon-color: #999999;
+    --icon-color: var(--gray-500);
+    --border-color: var(--stroke);
 
     .odd {
         --cell-background: var(--odd-cell-background);
@@ -26,15 +27,7 @@
     --even-cell-background: var(--gray-900);
     --odd-cell-hover: var(--gray-500);
     --even-cell-hover: var(--medium);
-    --icon-color: #eeeeee;
-}
-
-:host-context(ion-app.md) {
-    --border-color: var(--ion-item-border-color, var(--ion-border-color, var(--ion-color-step-150, rgba(0, 0, 0, .13))));
-}
-
-:host-context(ion-app.ios) {
-    --border-color: var(--ion-item-border-color, var(--ion-border-color, var(--ion-color-step-250, #c8c7cc)));
+    --icon-color: var(--gray-200);
 }
 
 .core-grades-table {
diff --git a/src/core/features/login/pages/site/site.scss b/src/core/features/login/pages/site/site.scss
index 5320d6600..b11602d42 100644
--- a/src/core/features/login/pages/site/site.scss
+++ b/src/core/features/login/pages/site/site.scss
@@ -25,7 +25,7 @@
     width: 50px;
     height: 50px;
     border-radius: 20%;
-    box-shadow: 0 0 4px #eee;
+    box-shadow: 0 0 4px var(--gray-200);
     text-align: center;
     overflow: hidden;
 
@@ -117,8 +117,9 @@
 
 .core-login-entered-site {
     background-color: var(--light);
+
     ion-thumbnail {
-        box-shadow: 0 0 4px #ddd;
+        box-shadow: 0 0 4px var(--gray-300);
     }
 }
 
diff --git a/src/core/features/mainmenu/pages/menu/menu.scss b/src/core/features/mainmenu/pages/menu/menu.scss
index 993e0cea6..b0302fbde 100644
--- a/src/core/features/mainmenu/pages/menu/menu.scss
+++ b/src/core/features/mainmenu/pages/menu/menu.scss
@@ -17,7 +17,7 @@
     } @else {
         ion-tabs.tabshidden.placement-bottom ion-tab-bar {
             pointer-events: none;
-    
+
             ion-tab-button {
                 height: auto;
             }
@@ -155,9 +155,9 @@
 }
 
 :host-context(.core-online) .core-network-message {
-    background: var(--green);
+    background: var(--success);
 }
 
 :host-context(.core-offline) .core-network-message {
-    background: var(--red);
+    background: var(--danger);
 }
diff --git a/src/core/features/mainmenu/pages/more/more.scss b/src/core/features/mainmenu/pages/more/more.scss
index 9b1b544d2..edb806fb5 100644
--- a/src/core/features/mainmenu/pages/more/more.scss
+++ b/src/core/features/mainmenu/pages/more/more.scss
@@ -1,11 +1,7 @@
 @import "~theme/globals";
 
 ion-item {
-	--border-color: var(--core-more-item-border,
-        var(--ion-item-border-color,
-        var(--ion-border-color,
-        var(--ion-color-step-150,
-        rgba(0, 0, 0, 0.13)))));
+	--border-color: var(--core-more-item-border, var(--ion-border-color));
 
     ion-icon {
         color: var(--core-more-icon, rgba(var(--ion-text-color-rgb, 0, 0, 0), 0.54));
diff --git a/src/core/features/question/question.scss b/src/core/features/question/question.scss
index b37891d1d..7c94d2f05 100644
--- a/src/core/features/question/question.scss
+++ b/src/core/features/question/question.scss
@@ -31,10 +31,10 @@
             border-radius: 3px;
 
             &.incorrect {
-                background-color: var(--red);
+                background-color: var(--danger);
             }
             &.correct {
-                background-color: var(--green);
+                background-color: var(--success);
             }
         }
     }
diff --git a/src/theme/components/discussion.scss b/src/theme/components/discussion.scss
index 173146469..be9ec19d3 100644
--- a/src/theme/components/discussion.scss
+++ b/src/theme/components/discussion.scss
@@ -158,7 +158,7 @@
             ion-icon {
                 font-size: 1.4em;
                 line-height: initial;
-                color: var(--ion-color-danger);
+                color: var(--danger);
             }
         }
 
diff --git a/src/theme/components/format-text.scss b/src/theme/components/format-text.scss
index b6c4216fe..b0086039e 100644
--- a/src/theme/components/format-text.scss
+++ b/src/theme/components/format-text.scss
@@ -556,16 +556,15 @@ core-rich-text-editor .core-rte-editor {
         font-weight: 400;
     }
 
-    @each $color-name, $base in $colors {
-
+    @each $color-name, $unused in $colors {
         .alert-#{$color-name} {
-            --color-base: var(--ion-color-#{$color-name});
-            color: var(--color-base);
+            --color-base: var(--#{$color-name});
+            color: var(--#{$color-name}-shade);
             border-color: var(--color-base);
-            background-color: var(--ion-color-#{$color-name}-lighter);
+            background-color: var(--#{$color-name}-tint);
 
-            .alert-link {
-                color: var(--ion-color-#{$color-name}-shade);
+            .alert-link, a {
+                color: var(--#{$color-name}-shade);
             }
         }
         .alert-#{$color-name} p {
@@ -594,9 +593,9 @@ core-rich-text-editor .core-rte-editor {
     .border-bottom-0 { border-bottom: 0 !important; }
     .border-left-0   { border-left: 0 !important; }
 
-    @each $color-name, $base in $colors {
+    @each $color-name, $unused in $colors {
         .border-#{$color-name} {
-            border-color: var(--ion-color-#{$color-name}) !important;
+            border-color: var(--#{$color-name}) !important;
         }
     }
 
@@ -678,9 +677,9 @@ core-rich-text-editor .core-rte-editor {
     .font-italic         { font-style: italic !important; }
     .text-white { color: var(--white) !important; }
 
-    @each $color-name, $base in $colors {
+    @each $color-name, $unused in $colors {
         .text-#{$color-name} {
-            color: var(--ion-color-#{$color-name});
+            color: var(--#{$color-name});
         }
     }
 
@@ -710,14 +709,14 @@ core-rich-text-editor .core-rte-editor {
     }
 
     .label-important {
-        color: var(--ion-color-danger-contrast);
-        background-color: var(--ion-color-danger);
+        color: var(--danger-contrast);
+        background-color: var(--danger);
     }
 
-    @each $color-name, $base in $colors {
+    @each $color-name, $unused in $colors {
         .label-#{$color-name} {
-            color: var(--ion-color-#{$color-name}-contrast);
-            background-color: var(--ion-color-#{$color-name});
+            color: var(--#{$color-name}-contrast);
+            background-color: var(--#{$color-name});
         }
     }
 }
diff --git a/src/theme/components/rubrics.scss b/src/theme/components/rubrics.scss
index 1ab4c4b92..3460509ca 100644
--- a/src/theme/components/rubrics.scss
+++ b/src/theme/components/rubrics.scss
@@ -9,13 +9,13 @@ core-format-text {
     }
 
     .gradingform_rubric_editform .status.ready {
-        background-color: var(--green-light);
-        border-color: var(--green);
+        background-color: var(--success-tint);
+        border-color: var(--success);
     }
 
     .gradingform_rubric_editform .status.draft {
-        background-color: var(--yellow-light);
-        border-color: var(--yellow);
+        background-color: var(--warning-tint);
+        border-color: var(--warning);
     }
 
     .gradingform_rubric {
@@ -107,7 +107,7 @@ core-format-text {
 
     .gradingform_rubric .criterion .levels .level .score {
         font-style: italic;
-        color: var(--green);
+        color: var(--success);
         font-weight: bold;
         margin-top: 5px;
         white-space: nowrap;
@@ -126,11 +126,11 @@ core-format-text {
 
     /* evaluation */
     .gradingform_rubric .criterion .levels .level.currentchecked {
-        background-color: #fff0f0;
+        background-color: var(--danger-tint);
     }
 
     .gradingform_rubric .criterion .levels .level.checked {
-        background-color: var(--green-light);
+        background-color: var(--success-tint);
         border: 1px solid var(--medium);
     }
 
@@ -154,7 +154,7 @@ core-format-text {
     }
 
     .gradingform_rubric .criterion .levels.error {
-        border: 1px solid var(--red);
+        border: 1px solid var(--danger);
     }
 
     .gradingform_rubric .criterion .description.error,
@@ -166,19 +166,19 @@ core-format-text {
     .gradingform_rubric-regrade {
         padding: 10px;
         background-color: var(--light);
-        border: 1px solid var(--red-light);
+        border: 1px solid var(--danger-tint);
         margin-bottom: 10px;
     }
 
     .gradingform_rubric-restored {
         padding: 10px;
-        background-color: var(--yellow-light);
-        border: 1px solid var(--yellow);
+        background-color: var(--warning-tint);
+        border: 1px solid var(--warning);
         margin-bottom: 10px;
     }
 
     .gradingform_rubric-error {
-        color: var(--red);
+        color: var(--danger);
         font-weight: bold;
     }
 
@@ -219,17 +219,17 @@ core-format-text {
     }
 
     .gradingform_rubric.evaluate .criterion .levels .level:hover {
-        background-color: var(--green-light);
+        background-color: var(--success-tint);
     }
 
     .gradingform_rubric .criterion .levels .level.checked {
-        background-color: var(--green-light);
+        background-color: var(--success-tint);
         border: none;
         border-left: 1px solid var(--stroke);
     }
 
     .gradingform_rubric .criterion .levels .level .score {
-        color: var(--green);
+        color: var(--success);
         font-weight: 500;
         font-style: normal;
         margin-top: 20px;
diff --git a/src/theme/globals.mixins.ionic.scss b/src/theme/globals.mixins.ionic.scss
index 2406a70f3..a5fb16e60 100644
--- a/src/theme/globals.mixins.ionic.scss
+++ b/src/theme/globals.mixins.ionic.scss
@@ -47,14 +47,16 @@
 }
 
 // Mixes a color with black to create its shade.
+// Default to bootstrap level 6.
 // --------------------------------------------------------------------------------------------
-@function get-color-shade($color) {
-  @return mix(#000, $color, 12%);
+@function get-color-shade($color, $percent: 48%) {
+  @return mix(#000, $color, $percent);
 }
 
 // Mixes a color with white to create its tint.
+// Default to bootstrap level -10.
 // --------------------------------------------------------------------------------------------
-@function get-color-tint($color, $percent: 10%) {
+@function get-color-tint($color, $percent: 80%) {
   @return mix(#fff, $color, $percent);
 }
 
@@ -72,20 +74,35 @@
 
 @mixin generate-color($color-name, $colors) {
     $base: map-get($colors, $color-name);
+    $light: map-get($base, 'light');
 
+    @include generate-color-variants($color-name, $light);
+
+    body.dark {
+        $dark: map-get($base, 'dark');
+        $dark: mix($light, white, 40%) !default;
+        @include generate-color-variants($color-name, $dark);
+    }
+}
+
+@mixin generate-color-variants($color-name, $base) {
     $contrast: get_contrast_color($base);
     $shade: get-color-shade($base);
     $tint: get-color-tint($base);
-    $lighter: get-color-tint($base, 90%);
 
-    --ion-color-#{$color-name}: var(--#{$color-name}, #{$base});
+    --#{$color-name}: #{$base};
+    --#{$color-name}-shade: #{$shade};
+    --#{$color-name}-tint: #{$tint};
+    --#{$color-name}-contrast: #{$contrast};
+
+    // Internal ionic use only.
+    --ion-color-#{$color-name}: var(--#{$color-name});
     --ion-color-#{$color-name}-base: var(--ion-color-#{$color-name});
     --ion-color-#{$color-name}-rgb: #{color-to-rgb-list($base)};
     --ion-color-#{$color-name}-contrast: #{$contrast};
     --ion-color-#{$color-name}-contrast-rgb: #{color-to-rgb-list($contrast)};
     --ion-color-#{$color-name}-shade: #{$shade};
     --ion-color-#{$color-name}-tint: #{$tint};
-    --ion-color-#{$color-name}-lighter: #{$lighter};
 
     .ion-color-#{$color-name} {
         --ion-color: var(--ion-color-#{$color-name});
@@ -95,7 +112,6 @@
         --ion-color-contrast-rgb: var(--ion-color-#{$color-name}-contrast-rgb);
         --ion-color-shade: var(--ion-color-#{$color-name}-shade);
         --ion-color-tint: var(--ion-color-#{$color-name}-tint);
-        --ion-color-lighter: var(--ion-color-#{$color-name}-lighter);
     }
 }
 
diff --git a/src/theme/globals.mixins.scss b/src/theme/globals.mixins.scss
index dc509523f..d62c8d2c8 100644
--- a/src/theme/globals.mixins.scss
+++ b/src/theme/globals.mixins.scss
@@ -1,3 +1,5 @@
+@use "sass:math" as math;
+
 /*
  * App custom mixins for SCSS
  * ----------------------------------------------------------------------------
@@ -233,8 +235,59 @@
     @return (red($color) + green($color) + blue($color)) / 3;
 }
 
+// Get the better color contrast using WCAG algorythm.
 @function get_contrast_color($color) {
-    $brightness: get_brightness($color);
+    $lumiance: luminance($color);
 
-    @return if($brightness < 127, white, black);
+    // White lumiance is 1.
+    $whiteContrast: ($lumiance + 0.05) / (1 + 0.05);
+    // White lumiance is 0.
+    $blackContrast: (0.05) / ($lumiance + 0.05);
+
+    @return if($whiteContrast < $blackContrast, white, black);
+}
+
+// Color contrast using yiq aproximation with 150 threshold.
+@function get_contrast_color_yiq($color, $dark: black, $light: white) {
+    $r: red($color);
+    $g: green($color);
+    $b: blue($color);
+
+    $yiq: (($r * 299) + ($g * 587) + ($b * 114)) / 1000;
+
+    @return if($yiq >= 128, $dark, $light);
+}
+
+// WCAG contrast algorythm
+@function check-contrast($foreground, $background) {
+    $foregroundLumiance: luminance($foreground);
+    $backgroundLuminance: luminance($background);
+
+    @if ($backgroundLuminance < $foregroundLumiance) {
+        @return ($backgroundLuminance + 0.05) / ($foregroundLumiance + 0.05);
+    } @else {
+        @return ($foregroundLumiance + 0.05) / ($backgroundLuminance + 0.05);
+    }
+}
+
+@function luminance($color) {
+    $r: red($color);
+    $g: green($color);
+    $b: blue($color);
+
+    $r: component-luminance($r);
+    $g: component-luminance($g);
+    $b: component-luminance($b);
+
+    @return $r * 0.2126 + $g * 0.7152 + $b * 0.0722;
+}
+
+@function component-luminance($value) {
+    $value: $value / 255;
+
+    @if ($value <= 0.03928) {
+        @return $value / 12.92;
+    } @else {
+        @return math.pow(($value + 0.055) / 1.055, 2.4);
+    }
 }
diff --git a/src/theme/globals.variables.scss b/src/theme/globals.variables.scss
index 69580f16f..6b19a3d73 100644
--- a/src/theme/globals.variables.scss
+++ b/src/theme/globals.variables.scss
@@ -4,39 +4,25 @@
  * Place here all global variables.
  */
 
-$white:    #ffffff !default;
-$gray-100: #f8f9fa !default;
-$gray-200: #e9ecef !default;
-$gray-300: #dee2e6 !default; // Stroke
-$gray-400: #ced4da !default;
-$gray-500: #8f959e !default;
-$gray-600: #6a737b !default;
-$gray-700: #495057 !default;
-$gray-800: #343a40 !default;
-$gray-900: #1d2125 !default; // Copy text
-$black:    #000000 !default; // Avoid usage
+$white:       #ffffff !default;
+$gray-100:    #f8f9fa !default;
+$gray-200:    #e9ecef !default;
+$gray-300:    #dee2e6 !default; // Stroke
+$gray-400:    #ced4da !default;
+$gray-500:    #8f959e !default;
+$gray-600:    #6a737b !default;
+$gray-700:    #495057 !default;
+$gray-800:    #343a40 !default;
+$gray-900:    #1d2125 !default; // Copy text
+$black:       #000000 !default; // Avoid usage
 
-$blue:            #0f6cbf !default;
-$blue-light:      mix($blue, white, 20%) !default;
-$blue-dark:       darken($blue, 10%) !default;
+$blue:        #0f6cbf !default;
+$cyan:        #008196 !default;
+$green:       #357a32 !default;
+$red:         #ca3120 !default;
+$yellow:      #f0ad4e !default;
 
-$cyan:            #008196 !default;
-$cyan-light:       mix($cyan, white, 20%) !default;
-$cyan-dark:        darken($cyan, 10%) !default;
-
-$green:           #357a32 !default; // Accent.
-$green-light:     mix($green, white, 20%) !default;
-$green-dark:      darken($green, 10%) !default;
-
-$red:             #ca3120 !default;
-$red-light:       mix($red, white, 20%) !default;
-$red-dark:        darken($red, 10%) !default;
-
-$yellow:          #f0ad4e !default;
-$yellow-light:    mix($yellow, white, 20%) !default;
-$yellow-dark:     mix($yellow, black, 40%) !default;
-
-$brand-color:    #ff7518 !default;
+$brand-color: #ff7518 !default;
 
 $text-color:               $gray-900 !default;
 $text-color-rgb:           color-to-rgb-list($text-color) !default;
@@ -45,7 +31,7 @@ $text-color-dark-rgb:      color-to-rgb-list($text-color-dark) !default;
 
 $background-color:          $white !default;
 $background-color-rgb:      color-to-rgb-list($background-color) !default;
-$background-color-dark:     mix(#ffffff, #000000, 10%) !default; // #1a1a1a
+$background-color-dark:     $gray-900 !default; // #1a1a1a
 $background-color-dark-rgb: color-to-rgb-list($background-color-dark) !default;
 
 $ion-item-background:      $white !default;
@@ -63,40 +49,17 @@ $light:      $gray-100 !default;
 $medium:     $gray-600 !default;
 $dark:       $gray-800 !default;
 
-$stroke:    $gray-300 !default;
-
 $colors:  (
-    primary: $primary,
-    secondary: $secondary,
-    success: $success,
-    warning: $warning,
-    danger:  $danger,
-    info: $info,
-    light: $light,
-    medium: $medium,
-    dark: $dark
-) !default;
-
-$primary-dark:    mix($blue, white, 40%) !default;
-$secondary-dark:  mix($secondary, white, 40%) !default;
-$danger-dark:     mix($red, white, 40%) !default;
-$warning-dark:    mix($yellow, white, 40%) !default;
-$success-dark:    mix($green, white, 40%) !default;
-$info-dark:       mix($cyan, white, 40%) !default;
-$light-dark:      $dark !default;
-$medium-dark:     $gray-200 !default;
-$dark-dark:       $light !default;
-
-$colors-dark:  (
-    primary: $primary-dark,
-    secondary: $secondary-dark,
-    success: $success-dark,
-    warning: $warning-dark,
-    danger: $danger-dark,
-    info: $info-dark,
-    light: $light-dark,
-    medium: $medium-dark,
-    dark: $dark-dark,
+    primary: (light: $primary),
+    secondary: (light: $secondary),
+    success: (light: $success),
+    warning: (light: $warning),
+    danger:  (light: $danger),
+    info: (light: $info),
+    light: (light: $light, dark: $dark),
+    medium: (light: $medium, dark: $gray-200),
+    dark: (light: $dark, dark: $light),
+    brand: (light: $brand-color, dark: $brand-color),
 ) !default;
 
 /**
@@ -153,6 +116,7 @@ $core-user-hide-siteinfo: $core-more-hide-siteinfo !default;
 $core-user-hide-sitename: $core-more-hide-sitename !default;
 $core-user-hide-siteurl: $core-more-hide-siteurl !default;
 
+// Activity icon background colors.
 $activity-icon-colors: (
     administration: #5d63f6,
     assessment: #eb66a2,
@@ -161,3 +125,12 @@ $activity-icon-colors: (
     content: #399be2,
     interface: #a378ff
 ) !default;
+
+// Calendar event category background colors.
+$calendar-event-category-colors: (
+    category: #8e24aa,
+    course: $red,
+    group: $yellow,
+    user: $blue,
+    site: $green
+) !default;
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index cfd6a58fa..9659d2707 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -217,7 +217,7 @@ ion-button ion-spinner {
     --color: inherit !important;
 }
 
-@each $color-name, $value in $colors {
+@each $color-name, $unused in $colors {
     .text-#{$color-name},
     p.text-#{$color-name} {
         color: var(--ion-color-#{$color-name});
@@ -240,7 +240,7 @@ ion-header ion-toolbar {
     .button.button-solid {
         --background: transparent;
         --color: var(--core-header-toolbar-color);
-        --ion-color-primary: var(--core-header-toolbar-color);
+        --primary: var(--core-header-toolbar-color);
     }
 
     .button.button-clear.button-has-icon-only,
@@ -272,7 +272,7 @@ ion-icon {
         bottom: 0;
         left: 0;
         right: 0;
-        background-color: var(--ion-color-danger);
+        background-color: var(--danger);
         -webkit-mask: url("/assets/fonts/font-awesome/solid/slash.svg") no-repeat 50% 50%;
         mask: url("/assets/fonts/font-awesome/solid/slash.svg") no-repeat 50% 50%;
     }
@@ -303,7 +303,7 @@ button,
 
 // Clear buttons will be black.
 ion-button.button-clear {
-    --ion-color-primary: var(--primary);
+    --primary: var(--primary);
 }
 
 [role="button"],
@@ -364,7 +364,7 @@ div.core-iframe-network-error {
         right: -15%;
         width: 50%;
         height: 50%;
-        background-color: var(--ion-color-danger);
+        background-color: var(--danger);
         -webkit-mask: url("/assets/fonts/font-awesome/solid/exclamation-triangle.svg") no-repeat 50% 50%;
         mask: url("/assets/fonts/font-awesome/solid/exclamation-triangle.svg") no-repeat 50% 50%;
     }
@@ -633,7 +633,7 @@ body.core-iframe-fullscreen ion-router-outlet {
 
 .item-dimmed {
     opacity: 0.7;
-    --background: var(--ion-color-light);
+    --background: var(--light);
 }
 
 // Extra text colors.
@@ -642,7 +642,7 @@ body.core-iframe-fullscreen ion-router-outlet {
 }
 
 // Card styles
-@each $color-name, $base in $colors {
+@each $color-name, $unused in $colors {
 
     // Message cards.
     ion-card.core-#{$color-name}-card {
@@ -723,6 +723,10 @@ ion-card {
     }
 }
 
+ion-chip.ion-color {
+    background: var(--ion-color-tint);
+}
+
 .core-course-module-handler:not(.addon-mod-label-handler) .item-heading .filter_mathjaxloader_equation div {
     display: inline !important;
 }
diff --git a/src/theme/theme.dark.scss b/src/theme/theme.dark.scss
index 3a547dc07..e61f69665 100644
--- a/src/theme/theme.dark.scss
+++ b/src/theme/theme.dark.scss
@@ -7,7 +7,7 @@
 
 :root body.dark {
 
-    // Ionic shades.
+    // Ionic shades, defined for ionic internal use.
     --ion-color-step-0:    var(--black);
     --ion-color-step-50:   var(--gray-900);
     --ion-color-step-100:  var(--gray-900);
@@ -36,45 +36,33 @@
     --text-color:               #{$text-color-dark};
     --ion-text-color:           var(--text-color);
     --ion-text-color-rgb:       #{$text-color-dark-rgb};
-    --subdued-text-color:     #b4b4b4;
-
-    --primary:      #{$primary-dark};
-    --secondary:    #{$secondary-dark};
-    --success:      #{$success-dark};
-    --danger:       #{$danger-dark};
-    --warning:      #{$warning-dark};
-    --info:         #{$info-dark};
-    --light:        #{$light-dark};
-    --dark:         #{$dark-dark};
-    --medium:       #{$medium-dark};
-
-    @each $color-name, $value in $colors-dark {
-        @include generate-color($color-name, $colors-dark);
-    }
-
-    --ion-border-color: var(--gray-900);
+    --subdued-text-color:       var(--gray-400);
 
     --ion-card-color: var(--text-color);
     --ion-card-background: var(--ion-item-background);
 
     --contrast-background: black;
 
+    --stroke:           var(--gray-700);
+    --ion-border-color: var(--stroke);
+    --ion-item-border-color: var(--stroke);
+
     ion-content {
         --background: var(--ion-background-color);
         --background-alternative: var(--gray-900);
     }
 
-    --core-bottom-tabs-badge-text-color: var(--brand-color-contrast);
+    --core-bottom-tabs-badge-text-color: var(--brand-contrast);
     --core-bottom-tabs-background: var(--gray-900);
     --core-bottom-tabs-color: var(--medium);
 
     ion-action-sheet {
         .action-sheet-cancel {
-            --button-color: var(--ion-color-danger-tint);
+            --button-color: var(--danger-tint);
         }
     }
 
-    --core-link-color: var(--blue-light);
+    --core-link-color: var(--primary-tint);
 
     --core-header-toolbar-background:   var(--gray-900);
     --core-header-toolbar-color:        var(--white);
@@ -101,22 +89,22 @@
     --core-login-input-background: var(--core-login-background);
     --core-login-input-color: var(--core-login-text-color);
 
-    --core-question-correct-color: var(--green-light);
-    --core-question-correct-color-bg: var(--green-dark);
-    --core-question-incorrect-color: var(--red);
-    --core-question-incorrect-color-bg: var(--red-dark);
-    --core-question-feedback-color: var(--yellow-light);
-    --core-question-feedback-color-bg: var(--yellow-dark);
-    --core-question-warning-color: var(--red);
+    --core-question-correct-color: var(--success-tint);
+    --core-question-correct-color-bg: var(--success-shade);
+    --core-question-incorrect-color: var(--danger);
+    --core-question-incorrect-color-bg: var(--danger-shade);
+    --core-question-feedback-color: var(--warning-tint);
+    --core-question-feedback-color-bg: var(--warning-shade);
+    --core-question-warning-color: var(--danger);
     --core-question-saved-color-bg: var(--gray-500);
 
-    --core-question-state-correct-color: var(--green-dark);
-    --core-question-state-partial-color: var(--yellow-dark);
-    --core-question-state-partial-text: var(--yellow);
-    --core-question-state-incorrect-color: var(--red-dark);
+    --core-question-state-correct-color: var(--success-shade);
+    --core-question-state-partial-color: var(--warning-shade);
+    --core-question-state-partial-text: var(--warning);
+    --core-question-state-incorrect-color: var(--danger-shade);
 
-    --core-question-feedback-color: var(--yellow-light);
-    --core-question-feedback-background-color: var(--yellow-dark);
+    --core-question-feedback-color: var(--warning-tint);
+    --core-question-feedback-background-color: var(--warning-shade);
 
     --core-dd-question-selected-shadow: 2px 2px 4px var(--gray-200);
     --core-dd-question-border: var(--gray-200);
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 6d0ff6d15..04f2898b1 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -20,7 +20,7 @@
     --gray-100: #{$gray-100};
     --white: #{$white};
 
-    // Ionic shades.
+    // Ionic shades, defined for ionic internal use.
     --ion-color-step-0:    var(--white);
     --ion-color-step-50:   var(--gray-100);
     --ion-color-step-100:  var(--gray-100);
@@ -43,50 +43,21 @@
     --ion-color-step-950:  var(--gray-900);
     --ion-color-step-1000: var(--black);
 
-    --blue:            #{$blue};
-    --blue-light:      #{$blue-light};
-    --blue-dark:       #{$blue-dark};
-
-    --green:           #{$green};
-    --green-light:     #{$green-light};
-    --green-dark:      #{$green-dark};
-
-    --red:             #{$red};
-    --red-light:       #{$red-light};
-    --red-dark:        #{$red-dark};
-
-    --yellow:          #{$yellow};
-    --yellow-light:    #{$yellow-light};
-    --yellow-dark:     #{$yellow-dark};
-
-    --turquoise:       #007982; // Accent.
-    --purple:          #8e24aa;
-
     --text-color:       #{$text-color};
     --background-color: #{$background-color};
 
-    --brand-color:          #{$brand-color};
-    --brand-color-contrast: var(--text-color);
-
     --core-online-color: #5cb85c;
 
-    // Named Color Variables
-    --primary:      #{$primary};
-    --secondary:    #{$secondary};
-    --success:      #{$success};
-    --danger:       #{$danger};
-    --warning:      #{$warning};
-    --info:         #{$info};
-    --light:        #{$light};
-    --dark:         #{$dark};
-    --medium:       #{$medium};
+    --stroke:           var(--gray-300);
+    --ion-border-color: var(--stroke);
+    --ion-item-border-color: var(--stroke);
 
-    --stroke:       #{$stroke};
-
-    @each $color-name, $value in $colors {
+    @each $color-name, $unused in $colors {
         @include generate-color($color-name, $colors);
     }
 
+    --brand-color: var(--brand);
+
     // Accessibility vars.
     --a11y-min-target-size: 44px;
     --a11y-focus-color: var(--primary);
@@ -102,7 +73,7 @@
 
     --ion-text-color: var(--text-color);
     --ion-text-color-rgb: #{$text-color-rgb};
-    --subdued-text-color: #595959;
+    --subdued-text-color: var(--gray-700);
 
     --small-radius: 4px;
     --medium-radius: 8px;
@@ -128,11 +99,11 @@
     }
 
     --core-bottom-tabs-background: var(--white);
-    --core-bottom-tabs-color: var(--medium);
+    --core-bottom-tabs-color: var(--gray-700);
     --core-bottom-tabs-color-selected: var(--brand-color);
     --core-bottom-tabs-background-selected: transparent;
     --core-bottom-tabs-badge-color: var(--brand-color);
-    --core-bottom-tabs-badge-text-color: var(--brand-color-contrast);
+    --core-bottom-tabs-badge-text-color: var(--brand-contrast);
     --bottom-tabs-size: 56px;
     ion-tab-bar.mainmenu-tabs {
         --background: var(--core-bottom-tabs-background);
@@ -141,7 +112,7 @@
         --background-selected: var(--core-bottom-tabs-background-selected);
     }
 
-    --core-link-color: var(--blue);
+    --core-link-color: var(--primary);
     a {
         color: var(--core-link-color);
     }
@@ -203,7 +174,7 @@
         }
 
         .action-sheet-cancel {
-            --button-color: var(--ion-color-danger);
+            --button-color: var(--danger);
         }
     }
 
@@ -226,9 +197,10 @@
         }
     }
 
+    --core-loading-spinner: var(--primary);
     ion-spinner {
-        --ion-color-base: var(--ion-color-primary);
-        --color: var(--ion-color-primary);
+        --ion-color-base: var(--core-loading-spinner);
+        --color: var(--core-loading-spinner);
     }
 
     --core-progressbar-height: 8px;
@@ -310,11 +282,6 @@
 
     --core-user-menu-site-logo-max-height: 32px;
 
-    --addon-calendar-event-category-color: var(--purple);
-    --addon-calendar-event-course-color: var(--red);
-    --addon-calendar-event-group-color: var(--yellow);
-    --addon-calendar-event-user-color: var(--blue);
-    --addon-calendar-event-site-color: var(--green);
     --addon-calendar-today-border-color: var(--primary);
     --addon-calendar-border-color: var(--stroke);
 
@@ -337,22 +304,22 @@
     --core-menu-box-shadow-end: -4px 0px 16px rgba(var(--drop-shadow));
     --core-menu-box-shadow-start: 4px 0px 16px rgba(var(--drop-shadow));
 
-    --core-question-correct-color: var(--green-dark);
-    --core-question-correct-color-bg: var(--green-light);
-    --core-question-incorrect-color: var(--red);
-    --core-question-incorrect-color-bg: var(--red-light);
-    --core-question-feedback-color: var(--yellow-dark);
-    --core-question-feedback-color-bg: var(--yellow-light);
-    --core-question-warning-color: var(--red);
+    --core-question-correct-color: var(--success-shade);
+    --core-question-correct-color-bg: var(--success-tint);
+    --core-question-incorrect-color: var(--danger);
+    --core-question-incorrect-color-bg: var(--danger-tint);
+    --core-question-feedback-color: var(--warning-shade);
+    --core-question-feedback-color-bg: var(--warning-tint);
+    --core-question-warning-color: var(--danger);
     --core-question-saved-color-bg: var(--gray-200);
 
-    --core-question-state-correct-color: var(--green-light);
-    --core-question-state-partial-color: var(--yellow-light);
-    --core-question-state-partial-text: var(--yellow);
-    --core-question-state-incorrect-color: var(--red-light);
+    --core-question-state-correct-color: var(--success-tint);
+    --core-question-state-partial-color: var(--warning-tint);
+    --core-question-state-partial-text: var(--warning);
+    --core-question-state-incorrect-color: var(--danger-tint);
 
-    --core-question-feedback-color: var(--yellow-dark);
-    --core-question-feedback-background-color: var(--yellow-light);
+    --core-question-feedback-color: var(--warning-shade);
+    --core-question-feedback-background-color: var(--warning-tint);
 
     --core-dd-question-selected-shadow: 2px 2px 4px var(--gray-500);
     --core-dd-question-radius: 10px;

From efba119a86f6dd5922f64017b28faf24863d3080 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 3 Feb 2022 17:08:53 +0100
Subject: [PATCH 0449/1008] MOBILE-3814 styles: Style progress bars

---
 .../progress-bar/core-progress-bar.html       |  2 +-
 .../components/progress-bar/progress-bar.scss | 32 +++++++++++++++----
 .../components/progress-bar/progress-bar.ts   | 28 ++++++++++++++--
 src/theme/theme.base.scss                     |  8 ++---
 src/theme/theme.dark.scss                     |  8 ++---
 src/theme/theme.light.scss                    | 22 +++++--------
 6 files changed, 68 insertions(+), 32 deletions(-)

diff --git a/src/core/components/progress-bar/core-progress-bar.html b/src/core/components/progress-bar/core-progress-bar.html
index 7178621c7..dd3335981 100644
--- a/src/core/components/progress-bar/core-progress-bar.html
+++ b/src/core/components/progress-bar/core-progress-bar.html
@@ -8,4 +8,4 @@
     </div>
 </ng-container>
 
-<ion-progress-bar *ngIf="progress < 0" type="indeterminate"></ion-progress-bar>
+<ion-progress-bar *ngIf="progress < 0" [color]="color" type="indeterminate"></ion-progress-bar>
diff --git a/src/core/components/progress-bar/progress-bar.scss b/src/core/components/progress-bar/progress-bar.scss
index 41584f3f8..0246fad88 100644
--- a/src/core/components/progress-bar/progress-bar.scss
+++ b/src/core/components/progress-bar/progress-bar.scss
@@ -1,13 +1,27 @@
+@import "~theme/globals";
+
 :host {
     display: flex;
     width: 100%;
 
     --line-height: 40px;
     --bar-margin: 16px 0;
+    --height: var(--core-progressbar-height);
+
+    --text-color: var(--core-progressbar-text-color);
+    --progressbar-color: var(--core-progressbar-color);
+    --progressbar-background: var(--core-progressbar-background);
+
+    @each $color-name, $unused in $colors {
+        &.ion-color-#{$color-name} {
+            --progressbar-color: var(--#{$color-name});
+            --progressbar-background: var(--#{$color-name}-tint);
+        }
+    }
 
     .core-progress-text {
         line-height: var(--line-height);
-        font-size: 1rem;
+        font-size: 0.9rem;
         color: var(--text-color);
         width: 55px;
         text-align: center;
@@ -24,22 +38,28 @@
         flex: 1;
 
         &[value]::-webkit-progress-bar {
-            background-color: var(--background);
-            border-radius: 0;
+            background-color: var(--progressbar-background);
+            border-radius: var(--height);
             border: 0;
             box-shadow: none;
         }
 
         &[value]::-webkit-progress-value {
-            background-color: var(--color);
-            border-radius: 0;
+            background-color: var(--progressbar-color);
+            border-radius: var(--height);
         }
     }
 
     ion-progress-bar {
-        --progress-background: var(--color);
+        --progress-background: var(--progressbar-color);
+        --buffer-background: var(--progressbar-background);
+        border-radius: var(--height);
         height: var(--height);
         margin-top: calc((var(--line-height) - var(--height)) /2);
         margin-bottom: calc((var(--line-height) - var(--height)) /2);
+
+        &::part(progress) {
+            border-radius: var(--height);
+        }
     }
 }
diff --git a/src/core/components/progress-bar/progress-bar.ts b/src/core/components/progress-bar/progress-bar.ts
index 1b2e1fd56..78d74f287 100644
--- a/src/core/components/progress-bar/progress-bar.ts
+++ b/src/core/components/progress-bar/progress-bar.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, Input, OnChanges, SimpleChange, ChangeDetectionStrategy } from '@angular/core';
+import { Component, Input, OnChanges, SimpleChange, ChangeDetectionStrategy, ElementRef, OnInit } from '@angular/core';
 import { SafeStyle } from '@angular/platform-browser';
 import { DomSanitizer, Translate } from '@singletons';
 
@@ -28,22 +28,44 @@ import { DomSanitizer, Translate } from '@singletons';
     styleUrls: ['progress-bar.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class CoreProgressBarComponent implements OnChanges {
+export class CoreProgressBarComponent implements OnInit, OnChanges {
 
     @Input() progress!: number | string; // Percentage from 0 to 100. Negative number will show an indeterminate progress bar.
     @Input() text?: string; // Percentage in text to be shown at the right. If not defined, progress will be used.
     @Input() a11yText?: string; // Accessibility text to read before the percentage.
     @Input() ariaDescribedBy?: string; // ID of the element that described the progress, if any.
+    @Input() color = '';
 
     width?: SafeStyle;
     progressBarValueText?: string;
 
     protected textSupplied = false;
+    protected element: HTMLElement;
+
+    constructor(elementRef: ElementRef) {
+        this.element = elementRef.nativeElement;
+    }
 
     /**
-     * Detect changes on input properties.
+     * @inheritdoc
+     */
+    ngOnInit(): void {
+        if (this.color) {
+            this.element.classList.add('ion-color', 'ion-color-' + this.color);
+        }
+    }
+
+    /**
+     * @inheritdoc
      */
     ngOnChanges(changes: { [name: string]: SimpleChange }): void {
+        if (changes.color) {
+            this.element.classList.remove('ion-color', 'ion-color-' + changes.color.previousValue);
+            if (changes.color.currentValue) {
+                this.element.classList.add('ion-color', 'ion-color-' + changes.color.currentValue);
+            }
+        }
+
         if (changes.text && changes.text.currentValue !== undefined) {
             // User provided a custom text, don't use default.
             this.textSupplied = true;
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 9659d2707..e32ecf046 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -723,10 +723,6 @@ ion-card {
     }
 }
 
-ion-chip.ion-color {
-    background: var(--ion-color-tint);
-}
-
 .core-course-module-handler:not(.addon-mod-label-handler) .item-heading .filter_mathjaxloader_equation div {
     display: inline !important;
 }
@@ -854,6 +850,10 @@ ion-chip {
     line-height: 1.1;
     border-radius: var(--medium-radius);
     @include padding-horizontal(16px);
+
+    &.ion-color {
+        background: var(--ion-color-tint);
+    }
 }
 
 ion-searchbar {
diff --git a/src/theme/theme.dark.scss b/src/theme/theme.dark.scss
index e61f69665..0f512966d 100644
--- a/src/theme/theme.dark.scss
+++ b/src/theme/theme.dark.scss
@@ -54,7 +54,7 @@
 
     --core-bottom-tabs-badge-text-color: var(--brand-contrast);
     --core-bottom-tabs-background: var(--gray-900);
-    --core-bottom-tabs-color: var(--medium);
+    --core-bottom-tabs-color: var(--gray-200);
 
     ion-action-sheet {
         .action-sheet-cancel {
@@ -73,7 +73,7 @@
     --core-tab-border-color: var(--gray-200);
     --core-tab-color-active: var(--dark);
 
-    --core-progressbar-text-color: var(--light);
+    --core-progressbar-text-color: var(--gray-100);
 
     --ion-item-background: #{$ion-item-background-dark};
     --ion-item-detail-icon-color: var(--white);
@@ -118,8 +118,8 @@
     --addon-messages-message-mine-bg: var(--gray-700);
     --addon-messages-message-mine-activated-bg: var(--gray-600);
     --addon-messages-discussion-badge: var(--primary);
-    --addon-messages-discussion-badge-text: var(--dark);
+    --addon-messages-discussion-badge-text: var(--gray-100);
 
     --addon-forum-border-color: var(--gray-500);
-    --addon-forum-highlight-color: var(--medium);
+    --addon-forum-highlight-color: var(--gray-200);
 }
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 04f2898b1..44bf3af99 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -100,9 +100,9 @@
 
     --core-bottom-tabs-background: var(--white);
     --core-bottom-tabs-color: var(--gray-700);
-    --core-bottom-tabs-color-selected: var(--brand-color);
+    --core-bottom-tabs-color-selected: var(--brand);
     --core-bottom-tabs-background-selected: transparent;
-    --core-bottom-tabs-badge-color: var(--brand-color);
+    --core-bottom-tabs-badge-color: var(--brand);
     --core-bottom-tabs-badge-text-color: var(--brand-contrast);
     --bottom-tabs-size: 56px;
     ion-tab-bar.mainmenu-tabs {
@@ -120,7 +120,7 @@
     --core-header-toolbar-button-image-size: 44px;
     --core-header-toolbar-background: var(--white);
     --core-header-toolbar-border-width: 3px;
-    --core-header-toolbar-border-color: var(--brand-color);
+    --core-header-toolbar-border-color: var(--brand);
     --core-header-toolbar-color: var(--gray-900);
     --core-header-toolbar-height: 56px;
     html.ios {
@@ -161,7 +161,7 @@
     ion-action-sheet {
         --button-color: var(--ion-text-color);
         --button-color-selected: var(--ion-text-color);
-        --title-border-color: var(--brand-color);
+        --title-border-color: var(--brand);
 
         .action-sheet-title {
             --color: var(--ion-text-color);
@@ -183,7 +183,7 @@
     --core-tab-color: var(--subdued-text-color);
     --core-tab-border-color: var(--stroke);
     --core-tab-color-active: var(--dark);
-    --core-tab-border-color-active: var(--brand-color);
+    --core-tab-border-color-active: var(--brand);
     --core-tab-font-weight-active: normal;
     --core-tabs-height: 56px;
     core-tabs, core-tabs-outlet {
@@ -204,15 +204,9 @@
     }
 
     --core-progressbar-height: 8px;
-    --core-progressbar-color: var(--brand-color);
+    --core-progressbar-color: var(--brand);
     --core-progressbar-text-color: var(--medium);
-    --core-progressbar-background: var(--light);
-    core-progress-bar {
-        --height: var(--core-progressbar-height);
-        --color: var(--core-progressbar-color);
-        --text-color: var(--core-progressbar-text-color);
-        --background: var(--core-progressbar-background);
-    }
+    --core-progressbar-background: var(--brand-tint);
 
     --ion-item-background:        #{$ion-item-background};
     --ion-item-detail-icon-color: var(--medium);
@@ -267,7 +261,7 @@
     --core-login-input-background: var(--white);
     --core-login-input-color: var(--gray-900);
 
-    --core-star-color: var(--brand-color);
+    --core-star-color: var(--brand);
 
     --core-large-avatar-size: 90px;
     --core-avatar-size: 44px;

From b4b7ec2faf6259f0e8456af201654189109dda1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 3 Feb 2022 17:36:12 +0100
Subject: [PATCH 0450/1008] MOBILE-3814 styles: Style ion chips

---
 src/theme/theme.base.scss  | 6 +++++-
 src/theme/theme.light.scss | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index e32ecf046..71386568d 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -848,11 +848,15 @@ ion-select-popover ion-item.core-select-option-title {
 
 ion-chip {
     line-height: 1.1;
-    border-radius: var(--medium-radius);
     @include padding-horizontal(16px);
 
     &.ion-color {
         background: var(--ion-color-tint);
+        &.chip-outline {
+            background-color: transparent;
+            border-color: var(--ion-color-base);
+            color: var(--ion-color-base);
+        }
     }
 }
 
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 44bf3af99..77c211e36 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -197,9 +197,10 @@
         }
     }
 
-    --core-loading-spinner: var(--primary);
-    ion-spinner {
+    --core-loading-spinner: var(--brand);
+    ion-spinner, ion-refresher {
         --ion-color-base: var(--core-loading-spinner);
+        --ion-color-primary: var(--core-loading-spinner);
         --color: var(--core-loading-spinner);
     }
 

From 857679a89d17f86c94cb6cbb4eba4c111ce75058 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 4 Feb 2022 10:04:59 +0100
Subject: [PATCH 0451/1008] MOBILE-3814 course: Fix empty course index

---
 .../components/course-index/course-index.ts       | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/core/features/course/components/course-index/course-index.ts b/src/core/features/course/components/course-index/course-index.ts
index b33f61ee3..bbc2601c1 100644
--- a/src/core/features/course/components/course-index/course-index.ts
+++ b/src/core/features/course/components/course-index/course-index.ts
@@ -55,18 +55,19 @@ export class CoreCourseCourseIndexComponent implements OnInit {
      * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
-
-        if (!this.course || !this.sections || !this.course.enablecompletion || !('courseformatoptions' in this.course) ||
-                !this.course.courseformatoptions) {
+        if (!this.course || !this.sections) {
             this.closeModal();
 
             return;
         }
 
-        const formatOptions = CoreUtils.objectToKeyValueMap(this.course.courseformatoptions, 'name', 'value');
+        let completionEnabled = !!this.course.enablecompletion;
+        if (completionEnabled && 'courseformatoptions' in this.course && this.course.courseformatoptions) {
+            const formatOptions = CoreUtils.objectToKeyValueMap(this.course.courseformatoptions, 'name', 'value');
 
-        if (!formatOptions || formatOptions.completionusertracked === false) {
-            return;
+            if (formatOptions) {
+                completionEnabled = !!formatOptions.completionusertracked;
+            }
         }
 
         const currentSection = await CoreCourseFormatDelegate.getCurrentSection(this.course, this.sections);
@@ -85,7 +86,7 @@ export class CoreCourseCourseIndexComponent implements OnInit {
                 const modules = section.modules
                     .filter((module) => module.visibleoncoursepage !== 0 && !module.noviewlink)
                     .map((module) => {
-                        const completionStatus = module.completiondata === undefined ||
+                        const completionStatus = !completionEnabled || module.completiondata === undefined ||
                         module.completiondata.tracking == CoreCourseModuleCompletionTracking.COMPLETION_TRACKING_NONE
                             ? undefined
                             : module.completiondata.state;

From 947534a6b798150ad3d94ed6cf3176542157349d Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 4 Feb 2022 10:51:36 +0100
Subject: [PATCH 0452/1008] MOBILE-3833 core: Fix infinite requests if file
 download failed

---
 src/core/directives/external-content.ts | 9 +++++++--
 src/core/services/filepool.ts           | 6 +++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/core/directives/external-content.ts b/src/core/directives/external-content.ts
index 6bbf6d9f4..17635acd3 100644
--- a/src/core/directives/external-content.ts
+++ b/src/core/directives/external-content.ts
@@ -25,7 +25,7 @@ import {
 } from '@angular/core';
 import { CoreApp } from '@services/app';
 import { CoreFile } from '@services/file';
-import { CoreFilepool } from '@services/filepool';
+import { CoreFilepool, CoreFilepoolFileActions, CoreFilepoolFileEventData } from '@services/filepool';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUrlUtils } from '@services/utils/url';
@@ -395,7 +395,12 @@ export class CoreExternalContentDirective implements AfterViewInit, OnChanges, O
         // Listen for download changes in the file.
         const eventName = await CoreFilepool.getFileEventNameByUrl(site.getId(), url);
 
-        this.fileEventObserver = CoreEvents.on(eventName, async () => {
+        this.fileEventObserver = CoreEvents.on(eventName, async (data: CoreFilepoolFileEventData) => {
+            if (data.action === CoreFilepoolFileActions.DOWNLOAD && !data.success) {
+                // Error downloading the file. Don't try again.
+                return;
+            }
+
             const newState = await CoreFilepool.getFileStateByUrl(site.getId(), url);
             if (newState === state) {
                 return;
diff --git a/src/core/services/filepool.ts b/src/core/services/filepool.ts
index 99d5ea855..40c2368a6 100644
--- a/src/core/services/filepool.ts
+++ b/src/core/services/filepool.ts
@@ -1251,7 +1251,7 @@ export class CoreFilepoolProvider {
     }
 
     /**
-     * Get the name of the event used to notify download events (CoreEventsProvider).
+     * Get the name of the event used to notify download events.
      *
      * @param siteId The site ID.
      * @param fileId The file ID.
@@ -1262,7 +1262,7 @@ export class CoreFilepoolProvider {
     }
 
     /**
-     * Get the name of the event used to notify download events (CoreEventsProvider).
+     * Get the name of the event used to notify download events.
      *
      * @param siteId The site ID.
      * @param fileUrl The absolute URL to the file.
@@ -3008,7 +3008,7 @@ export class CoreFilepoolProvider {
     }
 
     /**
-     * Trigger mmCoreEventPackageStatusChanged with the right data.
+     * Trigger package status changed event with the right data.
      *
      * @param siteId Site ID.
      * @param status New package status.

From a6df4e997b951e7075f6cee845b71e15be58be5c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 4 Feb 2022 12:34:28 +0100
Subject: [PATCH 0453/1008] MOBILE-3833 core: Fix substring errors

---
 .../filter/mathjaxloader/services/handlers/mathjaxloader.ts   | 2 +-
 src/addons/mod/lesson/services/lesson.ts                      | 2 +-
 src/addons/mod/scorm/classes/data-model-12.ts                 | 4 ++--
 src/addons/mod/url/services/url.ts                            | 4 ++--
 src/core/singletons/colors.ts                                 | 4 ++--
 src/core/singletons/locutus.ts                                | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/addons/filter/mathjaxloader/services/handlers/mathjaxloader.ts b/src/addons/filter/mathjaxloader/services/handlers/mathjaxloader.ts
index 40f83f4ba..ad398a11d 100644
--- a/src/addons/filter/mathjaxloader/services/handlers/mathjaxloader.ts
+++ b/src/addons/filter/mathjaxloader/services/handlers/mathjaxloader.ts
@@ -190,7 +190,7 @@ export class AddonFilterMathJaxLoaderHandlerService extends CoreFilterDefaultHan
     protected insertSpan(text: string, start: number, end: number): string {
         return CoreTextUtils.substrReplace(
             text,
-            '<span class="nolink">' + text.substring(start, end - start + 1) + '</span>',
+            '<span class="nolink">' + text.substring(start, end + 1) + '</span>',
             start,
             end - start + 1,
         );
diff --git a/src/addons/mod/lesson/services/lesson.ts b/src/addons/mod/lesson/services/lesson.ts
index 7d1418032..4a33b1617 100644
--- a/src/addons/mod/lesson/services/lesson.ts
+++ b/src/addons/mod/lesson/services/lesson.ts
@@ -760,7 +760,7 @@ export class AddonModLessonProvider {
             let ignoreCase = '';
 
             if (useRegExp) {
-                if (expectedAnswer.substring(-2) == '/i') {
+                if (expectedAnswer.slice(-2) == '/i') {
                     expectedAnswer = expectedAnswer.substring(0, expectedAnswer.length - 2);
                     ignoreCase = 'i';
                 }
diff --git a/src/addons/mod/scorm/classes/data-model-12.ts b/src/addons/mod/scorm/classes/data-model-12.ts
index 97889bfdb..8c82d6876 100644
--- a/src/addons/mod/scorm/classes/data-model-12.ts
+++ b/src/addons/mod/scorm/classes/data-model-12.ts
@@ -748,7 +748,7 @@ export class AddonModScormDataModel12 {
                     const childrenStr = '._children';
                     const countStr = '._count';
 
-                    if (elementModel.substring(elementModel.length - childrenStr.length, elementModel.length) == childrenStr) {
+                    if (elementModel.substring(elementModel.length - childrenStr.length) == childrenStr) {
                         const parentModel = elementModel.substring(0, elementModel.length - childrenStr.length);
 
                         if (this.dataModel[this.scoId][parentModel] !== undefined) {
@@ -756,7 +756,7 @@ export class AddonModScormDataModel12 {
                         } else {
                             this.errorCode = '201';
                         }
-                    } else if (elementModel.substring(elementModel.length - countStr.length, elementModel.length) == countStr) {
+                    } else if (elementModel.substring(elementModel.length - countStr.length) == countStr) {
                         const parentModel = elementModel.substring(0, elementModel.length - countStr.length);
 
                         if (this.dataModel[this.scoId][parentModel] !== undefined) {
diff --git a/src/addons/mod/url/services/url.ts b/src/addons/mod/url/services/url.ts
index 86a2ad5bb..332663f1a 100644
--- a/src/addons/mod/url/services/url.ts
+++ b/src/addons/mod/url/services/url.ts
@@ -68,7 +68,7 @@ export class AddonModUrlProvider {
         const download = ['application/zip', 'application/x-tar', 'application/g-zip', 'application/pdf', 'text/html'];
         let mimetype = CoreMimetypeUtils.getMimeType(extension);
 
-        if (url.externalurl.indexOf('.php') != -1 || url.externalurl.substring(-1) === '/' ||
+        if (url.externalurl.indexOf('.php') != -1 || url.externalurl.slice(-1) === '/' ||
                 (url.externalurl.indexOf('//') != -1 && url.externalurl.match(/\//g)?.length == 2)) {
             // Seems to be a web, use HTML mimetype.
             mimetype = 'text/html';
@@ -158,7 +158,7 @@ export class AddonModUrlProvider {
         const matches = url.match(/\//g);
         const extension = CoreMimetypeUtils.getFileExtension(url);
 
-        if (!matches || matches.length < 3 || url.substring(-1) === '/' || extension == 'php') {
+        if (!matches || matches.length < 3 || url.slice(-1) === '/' || extension == 'php') {
             // Use default icon.
             return '';
         }
diff --git a/src/core/singletons/colors.ts b/src/core/singletons/colors.ts
index 368b3e99d..40c2cdffe 100644
--- a/src/core/singletons/colors.ts
+++ b/src/core/singletons/colors.ts
@@ -123,8 +123,8 @@ export class CoreColors {
 
         return {
             red: parseInt(color.substring(0, 2), 16),
-            green: parseInt(color.substring(2, 2), 16),
-            blue: parseInt(color.substring(4, 2), 16),
+            green: parseInt(color.substring(2, 4), 16),
+            blue: parseInt(color.substring(4, 6), 16),
         };
 
     }
diff --git a/src/core/singletons/locutus.ts b/src/core/singletons/locutus.ts
index ac9b5bc3e..be8b74d97 100644
--- a/src/core/singletons/locutus.ts
+++ b/src/core/singletons/locutus.ts
@@ -123,7 +123,7 @@ function readBytes (str, len, escapedString = false) {
     const isLowSurrogate = code >= 0xdc00 && code <= 0xdfff
 
     if (escapedString && chr === '\\') {
-      chr = String.fromCharCode(parseInt(str.substring(c + 1, 2), 16))
+      chr = String.fromCharCode(parseInt(str.substring(c + 1, c + 3), 16))
       escapedChars++
 
       // each escaped sequence is 3 characters. Go 2 chars ahead.

From 0fd27feec90710cf0aeda11ff139838e4e0b0ca8 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 4 Feb 2022 14:42:16 +0100
Subject: [PATCH 0454/1008] MOBILE-3833 h5p: Fix substring in h5p validator

---
 src/core/features/h5p/classes/content-validator.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/features/h5p/classes/content-validator.ts b/src/core/features/h5p/classes/content-validator.ts
index f7fc315ba..20c2cb69b 100644
--- a/src/core/features/h5p/classes/content-validator.ts
+++ b/src/core/features/h5p/classes/content-validator.ts
@@ -357,7 +357,7 @@ export class CoreH5PContentValidator {
         }
 
         // Remove temporary files suffix.
-        if (file.path.substring(-4, 4) === '#tmp') {
+        if (file.path.slice(-4) === '#tmp') {
             file.path = file.path.substring(0, file.path.length - 4);
         }
 

From 32947cbc4ed570e897b1f1f591ee4ee08c4956d1 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 7 Feb 2022 08:53:04 +0100
Subject: [PATCH 0455/1008] MOBILE-3958 assign: Remove HTML when treating grade

---
 src/addons/mod/assign/components/submission/submission.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/addons/mod/assign/components/submission/submission.ts b/src/addons/mod/assign/components/submission/submission.ts
index da2154f88..e4f8b1ff5 100644
--- a/src/addons/mod/assign/components/submission/submission.ts
+++ b/src/addons/mod/assign/components/submission/submission.ts
@@ -986,7 +986,8 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
         grades.forEach((grade: CoreGradesFormattedItem) => {
             if (!grade.outcomeid && !grade.scaleid) {
 
-                const gradeFormatted = grade.gradeformatted || '';
+                // Clean HTML tags, grade can contain an icon.
+                const gradeFormatted = CoreTextUtils.cleanTags(grade.gradeformatted || '');
                 // Not using outcomes or scale, get the numeric grade.
                 if (this.grade.scale) {
                     this.grade.gradebookGrade = CoreUtils.formatFloat(

From 260ef4d47e4bfc8e7bc4550e32f7946730df07f5 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 7 Feb 2022 09:34:16 +0100
Subject: [PATCH 0456/1008] MOBILE-3958 assign: Remove non-null assertions in
 submission component

---
 .../components/submission/submission.ts       | 197 ++++++++++--------
 1 file changed, 109 insertions(+), 88 deletions(-)

diff --git a/src/addons/mod/assign/components/submission/submission.ts b/src/addons/mod/assign/components/submission/submission.ts
index e4f8b1ff5..9d5735936 100644
--- a/src/addons/mod/assign/components/submission/submission.ts
+++ b/src/addons/mod/assign/components/submission/submission.ts
@@ -196,7 +196,11 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
      * @param response Response of get submission status.
      */
     protected calculateTimeRemaining(response: AddonModAssignGetSubmissionStatusWSResponse): void {
-        if (this.assign!.duedate <= 0) {
+        if (!this.assign) {
+            return;
+        }
+
+        if (this.assign.duedate <= 0) {
             this.timeRemaining = '';
             this.timeRemainingClass = '';
 
@@ -206,7 +210,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
         const time = CoreTimeUtils.timestamp();
         const dueDate = response.lastattempt?.extensionduedate
             ? response.lastattempt.extensionduedate
-            : this.assign!.duedate;
+            : this.assign.duedate;
         const timeRemaining = dueDate - time;
 
         if (timeRemaining > 0) {
@@ -276,6 +280,10 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
      * Copy a previous attempt and then go to edit.
      */
     async copyPrevious(): Promise<void> {
+        if (!this.assign) {
+            return;
+        }
+
         if (!CoreApp.isOnline()) {
             CoreDomUtils.showErrorModal('core.networkerrormsg', true);
 
@@ -291,7 +299,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
         let modal = await CoreDomUtils.showModalLoading();
 
         const size = await CoreUtils.ignoreErrors(
-            AddonModAssignHelper.getSubmissionSizeForCopy(this.assign!, previousSubmission),
+            AddonModAssignHelper.getSubmissionSizeForCopy(this.assign, previousSubmission),
             -1,
         ); // Error calculating size, return -1.
 
@@ -309,15 +317,15 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
         modal = await CoreDomUtils.showModalLoading('core.sending', true);
 
         try {
-            await AddonModAssignHelper.copyPreviousAttempt(this.assign!, previousSubmission);
+            await AddonModAssignHelper.copyPreviousAttempt(this.assign, previousSubmission);
             // Now go to edit.
             this.goToEdit();
 
-            if (!this.assign!.submissiondrafts) {
+            if (!this.assign.submissiondrafts && this.userSubmission) {
                 // No drafts allowed, so it was submitted. Trigger event.
                 CoreEvents.trigger(AddonModAssignProvider.SUBMITTED_FOR_GRADING_EVENT, {
-                    assignmentId: this.assign!.id,
-                    submissionId: this.userSubmission!.id,
+                    assignmentId: this.assign.id,
+                    submissionId: this.userSubmission.id,
                     userId: this.currentUserId,
                 }, this.siteId);
             } else {
@@ -337,8 +345,8 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
      * @return Promise resolved when done.
      */
     protected async discardDrafts(): Promise<void> {
-        if (this.feedback && this.feedback.plugins) {
-            await AddonModAssignHelper.discardFeedbackPluginData(this.assign!.id, this.submitId, this.feedback);
+        if (this.assign && this.feedback && this.feedback.plugins) {
+            await AddonModAssignHelper.discardFeedbackPluginData(this.assign.id, this.submitId, this.feedback);
         }
     }
 
@@ -363,7 +371,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
      * @return Promise resolved with boolean: whether there's data to save.
      */
     protected async hasDataToSave(isSubmit = false): Promise<boolean> {
-        if (!this.canSaveGrades || !this.loaded) {
+        if (!this.canSaveGrades || !this.loaded || !this.assign) {
             return false;
         }
 
@@ -379,7 +387,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
         }
 
         // Check if outcomes changed.
-        if (this.gradeInfo && this.gradeInfo.outcomes) {
+        if (this.gradeInfo?.outcomes) {
             for (const x in this.gradeInfo.outcomes) {
                 const outcome = this.gradeInfo.outcomes[x];
 
@@ -396,7 +404,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
 
         try {
             return AddonModAssignHelper.hasFeedbackDataChanged(
-                this.assign!,
+                this.assign,
                 this.userSubmission,
                 this.feedback,
                 this.submitId,
@@ -435,13 +443,13 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
         promises.push(AddonModAssign.invalidateAssignmentData(this.courseId));
         if (this.assign) {
             promises.push(AddonModAssign.invalidateSubmissionStatusData(
-                this.assign!.id,
+                this.assign.id,
                 this.submitId,
                 undefined,
                 !!this.blindId,
             ));
-            promises.push(AddonModAssign.invalidateAssignmentUserMappingsData(this.assign!.id));
-            promises.push(AddonModAssign.invalidateListParticipantsData(this.assign!.id));
+            promises.push(AddonModAssign.invalidateAssignmentUserMappingsData(this.assign.id));
+            promises.push(AddonModAssign.invalidateListParticipantsData(this.assign.id));
         }
         promises.push(CoreGradesHelper.invalidateGradeModuleItems(this.courseId, this.submitId));
         promises.push(CoreCourse.invalidateModule(this.moduleId));
@@ -534,13 +542,13 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
             }
 
             // Treat last attempt.
-            promises = this.treatLastAttempt(submissionStatus);
+            promises = this.treatLastAttempt(submissionStatus, this.lastAttempt);
 
             // Calculate the time remaining.
             this.calculateTimeRemaining(submissionStatus);
 
             // Load the feedback.
-            promises.push(this.loadFeedback(submissionStatus.feedback));
+            promises.push(this.loadFeedback(this.assign, submissionStatus.feedback));
 
             // Check if there's any unsupported plugin for editing.
             if (!this.userSubmission || !this.userSubmission.plugins) {
@@ -575,8 +583,12 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
      * @return Promise resolved when done.
      */
     protected async loadSubmissionOfflineData(): Promise<void> {
+        if (!this.assign) {
+            return;
+        }
+
         try {
-            const submission = await AddonModAssignOffline.getSubmission(this.assign!.id, this.submitId);
+            const submission = await AddonModAssignOffline.getSubmission(this.assign.id, this.submitId);
 
             this.hasOffline = submission && submission.plugindata && Object.keys(submission.plugindata).length > 0;
 
@@ -591,10 +603,11 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
     /**
      * Load the data to render the feedback and grade.
      *
+     * @param assign Assign data.
      * @param feedback The feedback data from the submission status.
      * @return Promise resolved when done.
      */
-    protected async loadFeedback(feedback?: AddonModAssignSubmissionFeedback): Promise<void> {
+    protected async loadFeedback(assign: AddonModAssignAssign, feedback?: AddonModAssignSubmissionFeedback): Promise<void> {
         this.grade = {
             method: '',
             modified: 0,
@@ -654,22 +667,22 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
         // Treat the grade info.
         await this.treatGradeInfo();
 
-        const isManual = this.assign!.attemptreopenmethod == AddonModAssignAttemptReopenMethodValues.MANUAL;
-        const isUnlimited = this.assign!.maxattempts == AddonModAssignProvider.UNLIMITED_ATTEMPTS;
-        const isLessThanMaxAttempts = !!this.userSubmission && (this.userSubmission.attemptnumber < (this.assign!.maxattempts - 1));
+        const isManual = assign.attemptreopenmethod == AddonModAssignAttemptReopenMethodValues.MANUAL;
+        const isUnlimited = assign.maxattempts == AddonModAssignProvider.UNLIMITED_ATTEMPTS;
+        const isLessThanMaxAttempts = !!this.userSubmission && (this.userSubmission.attemptnumber < (assign.maxattempts - 1));
 
         this.allowAddAttempt = isManual && (!this.userSubmission || isUnlimited || isLessThanMaxAttempts);
 
-        if (this.assign!.teamsubmission) {
+        if (assign.teamsubmission) {
             this.grade.applyToAll = true;
             this.originalGrades.applyToAll = true;
         }
-        if (this.assign!.markingworkflow && this.grade.gradingStatus) {
+        if (assign.markingworkflow && this.grade.gradingStatus) {
             this.workflowStatusTranslationId =
                 AddonModAssign.getSubmissionGradingStatusTranslationId(this.grade.gradingStatus);
         }
 
-        if (this.lastAttempt?.gradingstatus == 'graded' && !this.assign!.markingworkflow && this.userSubmission && feedback) {
+        if (this.lastAttempt?.gradingstatus == 'graded' && !assign.markingworkflow && this.userSubmission && feedback) {
             if (feedback.gradeddate < this.userSubmission.timemodified) {
                 this.lastAttempt.gradingstatus = AddonModAssignGradingStates.GRADED_FOLLOWUP_SUBMIT;
 
@@ -685,7 +698,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
         if (!this.feedback || !this.feedback.plugins) {
             // Feedback plugins not present, we have to use assign configs to detect the plugins used.
             this.feedback = AddonModAssignHelper.createEmptyFeedback();
-            this.feedback.plugins = AddonModAssignHelper.getPluginsEnabled(this.assign!, 'assignfeedback');
+            this.feedback.plugins = AddonModAssignHelper.getPluginsEnabled(assign, 'assignfeedback');
         }
 
         // Check if there's any offline data for this submission.
@@ -700,7 +713,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
         // Submission grades aren't identified by attempt number so it can retrieve the feedback for a previous attempt.
         // The app will not treat that as an special case.
         const submissionGrade = await CoreUtils.ignoreErrors(
-            AddonModAssignOffline.getSubmissionGrade(this.assign!.id, this.submitId),
+            AddonModAssignOffline.getSubmissionGrade(assign.id, this.submitId),
         );
 
         this.hasOfflineGrade = false;
@@ -725,10 +738,10 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
 
             if (submissionGrade.outcomes && Object.keys(submissionGrade.outcomes).length && this.gradeInfo?.outcomes) {
                 this.gradeInfo.outcomes.forEach((outcome) => {
-                    if (submissionGrade.outcomes[outcome.itemNumber!] !== undefined) {
+                    if (outcome.itemNumber !== undefined && submissionGrade.outcomes[outcome.itemNumber] !== undefined) {
                         // If outcome has been modified from gradebook, do not use offline.
-                        if (outcome.modified! < submissionGrade.timemodified) {
-                            outcome.selectedId = submissionGrade.outcomes[outcome.itemNumber!];
+                        if ((outcome.modified || 0) < submissionGrade.timemodified) {
+                            outcome.selectedId = submissionGrade.outcomes[outcome.itemNumber];
                             this.originalGrades.outcomes[outcome.id] = outcome.selectedId;
                         }
                     }
@@ -752,11 +765,15 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
      * @param status Submission status.
      */
     protected setStatusNameAndClass(status: AddonModAssignGetSubmissionStatusWSResponse): void {
+        if (!this.assign) {
+            return;
+        }
+
         if (this.hasOffline || this.submittedOffline) {
             // Offline data.
             this.statusTranslated = Translate.instant('core.notsent');
             this.statusColor = 'warning';
-        } else if (!this.assign!.teamsubmission) {
+        } else if (!this.assign.teamsubmission) {
 
             // Single submission.
             if (this.userSubmission && this.userSubmission.status != this.statusNew) {
@@ -775,7 +792,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
         } else {
 
             // Team submission.
-            if (!status.lastattempt?.submissiongroup && this.assign!.preventsubmissionnotingroup) {
+            if (!status.lastattempt?.submissiongroup && this.assign.preventsubmissionnotingroup) {
                 this.statusTranslated = Translate.instant('addon.mod_assign.nosubmission');
                 this.statusColor = AddonModAssign.getSubmissionStatusColor(AddonModAssignSubmissionStatusValues.NO_SUBMISSION);
             } else if (this.userSubmission && this.userSubmission.status != this.statusNew) {
@@ -816,7 +833,11 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
      * @param acceptStatement Whether the statement has been accepted.
      */
     async submitForGrading(acceptStatement: boolean): Promise<void> {
-        if (this.assign!.requiresubmissionstatement && !acceptStatement) {
+        if (!this.assign || !this.userSubmission) {
+            return;
+        }
+
+        if (this.assign.requiresubmissionstatement && !acceptStatement) {
             CoreDomUtils.showErrorModal('addon.mod_assign.acceptsubmissionstatement', true);
 
             return;
@@ -830,17 +851,17 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
 
             try {
                 await AddonModAssign.submitForGrading(
-                    this.assign!.id,
+                    this.assign.id,
                     this.courseId,
                     acceptStatement,
-                    this.userSubmission!.timemodified,
+                    this.userSubmission.timemodified,
                     this.hasOffline,
                 );
 
                 // Submitted, trigger event.
                 CoreEvents.trigger(AddonModAssignProvider.SUBMITTED_FOR_GRADING_EVENT, {
-                    assignmentId: this.assign!.id,
-                    submissionId: this.userSubmission!.id,
+                    assignmentId: this.assign.id,
+                    submissionId: this.userSubmission.id,
                     userId: this.currentUserId,
                 }, this.siteId);
             } catch (error) {
@@ -861,7 +882,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
     async submitGrade(): Promise<void> {
         // Check if there's something to be saved.
         const modified = await this.hasDataToSave(true);
-        if (!modified) {
+        if (!modified || !this.assign) {
             return;
         }
 
@@ -880,22 +901,21 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
         const modal = await CoreDomUtils.showModalLoading('core.sending', true);
 
         (this.gradeInfo?.outcomes || []).forEach((outcome) => {
-            if (outcome.itemNumber) {
-                outcomes[outcome.itemNumber] = outcome.selectedId!;
+            if (outcome.itemNumber && outcome.selectedId) {
+                outcomes[outcome.itemNumber] = outcome.selectedId;
             }
         });
 
         let pluginData: AddonModAssignSavePluginData = {};
         try {
             if (this.feedback && this.feedback.plugins) {
-                pluginData =
-                    await AddonModAssignHelper.prepareFeedbackPluginData(this.assign!.id, this.submitId, this.feedback);
+                pluginData = await AddonModAssignHelper.prepareFeedbackPluginData(this.assign.id, this.submitId, this.feedback);
             }
 
             try {
                 // We have all the data, now send it.
                 await AddonModAssign.submitGradingForm(
-                    this.assign!.id,
+                    this.assign.id,
                     this.submitId,
                     this.courseId,
                     grade || 0,
@@ -914,7 +934,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
                 this.invalidateAndRefresh(true);
 
                 CoreEvents.trigger(AddonModAssignProvider.GRADED_EVENT, {
-                    assignmentId: this.assign!.id,
+                    assignmentId: this.assign.id,
                     submissionId: this.submitId,
                     userId: this.currentUserId,
                 }, this.siteId);
@@ -939,21 +959,21 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
         this.isGrading = true;
 
         // Make sure outcomes is an array.
-        this.gradeInfo.outcomes = this.gradeInfo.outcomes || [];
+        const gradeInfo = this.gradeInfo;
+        gradeInfo.outcomes = gradeInfo.outcomes || [];
 
         // Check if grading method is simple or not.
-        if (this.gradeInfo.advancedgrading && this.gradeInfo.advancedgrading[0] &&
-                this.gradeInfo.advancedgrading[0].method !== undefined) {
-            this.grade.method = this.gradeInfo.advancedgrading[0].method || 'simple';
+        if (gradeInfo.advancedgrading && gradeInfo.advancedgrading[0] && gradeInfo.advancedgrading[0].method !== undefined) {
+            this.grade.method = gradeInfo.advancedgrading[0].method || 'simple';
         } else {
             this.grade.method = 'simple';
         }
 
         this.canSaveGrades = this.grade.method == 'simple'; // Grades can be saved if simple grading.
 
-        if (this.gradeInfo.scale) {
+        if (gradeInfo.scale) {
             this.grade.scale =
-                CoreUtils.makeMenuFromList(this.gradeInfo.scale, Translate.instant('core.nograde'));
+                CoreUtils.makeMenuFromList(gradeInfo.scale, Translate.instant('core.nograde'));
         } else {
             // Format the grade.
             this.grade.grade = CoreUtils.formatFloat(this.grade.grade);
@@ -964,8 +984,8 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
         }
 
         // Treat outcomes.
-        if (this.gradeInfo.outcomes) {
-            this.gradeInfo.outcomes.forEach((outcome) => {
+        if (gradeInfo.outcomes) {
+            gradeInfo.outcomes.forEach((outcome) => {
                 if (outcome.scale) {
                     outcome.options =
                         CoreUtils.makeMenuFromList<number>(
@@ -1005,7 +1025,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
             } else if (grade.outcomeid) {
 
                 // Only show outcomes with info on it, outcomeid could be null if outcomes are disabled on site.
-                this.gradeInfo!.outcomes && this.gradeInfo!.outcomes.forEach((outcome) => {
+                gradeInfo.outcomes?.forEach((outcome) => {
                     if (outcome.id == String(grade.outcomeid)) {
                         outcome.selected = grade.gradeformatted;
                         outcome.modified = grade.gradedategraded;
@@ -1018,38 +1038,42 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
                         outcomes.push(outcome);
                     }
                 });
-                this.gradeInfo!.disabled = grade.gradeislocked || grade.gradeisoverridden;
+                gradeInfo.disabled = grade.gradeislocked || grade.gradeisoverridden;
             }
         });
 
-        this.gradeInfo.outcomes = outcomes;
+        gradeInfo.outcomes = outcomes;
     }
 
     /**
      * Treat the last attempt.
      *
      * @param submissionStatus Response of get submission status.
+     * @param lastAttempt Last attempt (if any).
      * @param promises List where to add the promises.
      */
-    protected treatLastAttempt(submissionStatus: AddonModAssignGetSubmissionStatusWSResponse): Promise<void>[] {
+    protected treatLastAttempt(
+        submissionStatus: AddonModAssignGetSubmissionStatusWSResponse,
+        lastAttempt?: AddonModAssignSubmissionAttemptFormatted,
+    ): Promise<void>[] {
         const promises: Promise<void>[] =[];
 
-        if (!submissionStatus.lastattempt) {
+        if (!lastAttempt || !this.assign) {
             return [];
         }
 
-        const submissionStatementMissing = !!this.assign!.requiresubmissionstatement &&
-            this.assign!.submissionstatement === undefined;
+        const submissionStatementMissing = !!this.assign.requiresubmissionstatement &&
+            this.assign.submissionstatement === undefined;
 
-        this.canSubmit = !this.isSubmittedForGrading && !this.submittedOffline && (submissionStatus.lastattempt.cansubmit ||
-            (this.hasOffline && AddonModAssign.canSubmitOffline(this.assign!, submissionStatus)));
+        this.canSubmit = !this.isSubmittedForGrading && !this.submittedOffline && (lastAttempt.cansubmit ||
+            (this.hasOffline && AddonModAssign.canSubmitOffline(this.assign, submissionStatus)));
 
-        this.canEdit = !this.isSubmittedForGrading && submissionStatus.lastattempt.canedit &&
-            (!this.submittedOffline || !this.assign!.submissiondrafts);
+        this.canEdit = !this.isSubmittedForGrading && lastAttempt.canedit &&
+            (!this.submittedOffline || !this.assign.submissiondrafts);
 
         // Get submission statement if needed.
-        if (this.assign!.requiresubmissionstatement && this.assign!.submissiondrafts && this.submitId == this.currentUserId) {
-            this.submissionStatement = this.assign!.submissionstatement;
+        if (this.assign.requiresubmissionstatement && this.assign.submissiondrafts && this.submitId == this.currentUserId) {
+            this.submissionStatement = this.assign.submissionstatement;
             this.acceptStatement = false;
         } else {
             this.submissionStatement = undefined;
@@ -1057,26 +1081,26 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
         }
 
         // Show error if submission statement should be shown but it couldn't be retrieved.
-        this.showErrorStatementEdit = submissionStatementMissing && !this.assign!.submissiondrafts &&
+        this.showErrorStatementEdit = submissionStatementMissing && !this.assign.submissiondrafts &&
             this.submitId == this.currentUserId;
 
-        this.showErrorStatementSubmit = submissionStatementMissing && !!this.assign!.submissiondrafts;
+        this.showErrorStatementSubmit = submissionStatementMissing && !!this.assign.submissiondrafts;
 
-        this.userSubmission = AddonModAssign.getSubmissionObjectFromAttempt(this.assign!, submissionStatus.lastattempt);
+        this.userSubmission = AddonModAssign.getSubmissionObjectFromAttempt(this.assign, lastAttempt);
 
-        if (this.assign!.attemptreopenmethod != this.attemptReopenMethodNone && this.userSubmission) {
+        if (this.assign.attemptreopenmethod != this.attemptReopenMethodNone && this.userSubmission) {
             this.currentAttempt = this.userSubmission.attemptnumber + 1;
         }
 
         this.setStatusNameAndClass(submissionStatus);
 
-        if (this.assign!.teamsubmission) {
-            if (submissionStatus.lastattempt.submissiongroup) {
+        if (this.assign.teamsubmission) {
+            if (lastAttempt.submissiongroup) {
                 // Get the name of the group.
-                promises.push(CoreGroups.getActivityAllowedGroups(this.assign!.cmid).then((result) => {
-                    const group = result.groups.find((group) => group.id == submissionStatus.lastattempt!.submissiongroup);
+                promises.push(CoreGroups.getActivityAllowedGroups(this.assign.cmid).then((result) => {
+                    const group = result.groups.find((group) => group.id === lastAttempt.submissiongroup);
                     if (group) {
-                        this.lastAttempt!.submissiongroupname = group.name;
+                        lastAttempt.submissiongroupname = group.name;
                     }
 
                     return;
@@ -1086,9 +1110,9 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
             // Get the members that need to submit.
             if (this.userSubmission &&
                 this.userSubmission.status != this.statusNew &&
-                submissionStatus.lastattempt.submissiongroupmemberswhoneedtosubmit
+                lastAttempt.submissiongroupmemberswhoneedtosubmit
             ) {
-                submissionStatus.lastattempt.submissiongroupmemberswhoneedtosubmit.forEach((member) => {
+                lastAttempt.submissiongroupmemberswhoneedtosubmit.forEach((member) => {
                     if (!this.blindMarking) {
                         promises.push(CoreUser.getProfile(member, this.courseId).then((profile) => {
                             this.membersToSubmit.push(profile);
@@ -1101,23 +1125,20 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
         }
 
         // Get grading text and color.
-        this.gradingStatusTranslationId = AddonModAssign.getSubmissionGradingStatusTranslationId(
-            submissionStatus.lastattempt.gradingstatus,
-        );
-        this.gradingColor = AddonModAssign.getSubmissionGradingStatusColor(submissionStatus.lastattempt.gradingstatus);
+        this.gradingStatusTranslationId = AddonModAssign.getSubmissionGradingStatusTranslationId(lastAttempt.gradingstatus);
+        this.gradingColor = AddonModAssign.getSubmissionGradingStatusColor(lastAttempt.gradingstatus);
 
         // Get the submission plugins.
         if (this.userSubmission) {
-            if (!this.assign!.teamsubmission ||
-                !submissionStatus.lastattempt.submissiongroup ||
-                !this.assign!.preventsubmissionnotingroup
+            if (!this.assign.teamsubmission ||
+                !lastAttempt.submissiongroup ||
+                !this.assign.preventsubmissionnotingroup
             ) {
-                if (this.previousAttempt && this.previousAttempt.submission!.plugins &&
-                        this.userSubmission.status == this.statusReopened) {
+                if (this.previousAttempt?.submission?.plugins && this.userSubmission.status === this.statusReopened) {
                     // Get latest attempt if available.
-                    this.submissionPlugins = this.previousAttempt.submission!.plugins;
+                    this.submissionPlugins = this.previousAttempt.submission.plugins;
                 } else {
-                    this.submissionPlugins = this.userSubmission.plugins!;
+                    this.submissionPlugins = this.userSubmission.plugins || [];
                 }
             }
         }
@@ -1135,7 +1156,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
             return;
         }
 
-        const syncId = AddonModAssignSync.getGradeSyncId(this.assign!.id, this.submitId);
+        const syncId = AddonModAssignSync.getGradeSyncId(this.assign.id, this.submitId);
 
         if (block) {
             CoreSync.blockOperation(AddonModAssignProvider.COMPONENT, syncId);

From 808a242cbcd462b9c275711a145a0426dcd306ce Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 3 Feb 2022 12:35:16 +0100
Subject: [PATCH 0457/1008] MOBILE-3977 core: Refactor database table wrapper

Decouple caching behaviour into subclasses using a configurable proxy
---
 src/core/classes/database-table.ts            | 194 --------------
 .../classes/database/database-table-proxy.ts  | 187 ++++++++++++++
 src/core/classes/database/database-table.ts   | 240 ++++++++++++++++++
 .../classes/database/eager-database-table.ts  | 168 ++++++++++++
 src/core/classes/sqlitedb.ts                  |   2 +-
 src/core/classes/tests/database-table.test.ts | 204 ++++++++++++---
 src/core/services/config.ts                   |  54 ++--
 7 files changed, 785 insertions(+), 264 deletions(-)
 delete mode 100644 src/core/classes/database-table.ts
 create mode 100644 src/core/classes/database/database-table-proxy.ts
 create mode 100644 src/core/classes/database/database-table.ts
 create mode 100644 src/core/classes/database/eager-database-table.ts

diff --git a/src/core/classes/database-table.ts b/src/core/classes/database-table.ts
deleted file mode 100644
index 5e6ea32ee..000000000
--- a/src/core/classes/database-table.ts
+++ /dev/null
@@ -1,194 +0,0 @@
-// (C) Copyright 2015 Moodle Pty Ltd.
-//
-// 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 { SQLiteDB, SQLiteDBRecordValues } from './sqlitedb';
-
-/**
- * Database table wrapper used to improve performance by caching all data in memory
- * for faster read operations.
- */
-export abstract class CoreDatabaseTable<
-    DBRecord extends SQLiteDBRecordValues = SQLiteDBRecordValues,
-    PrimaryKeyColumns extends keyof DBRecord = 'id',
-    PrimaryKey extends GetPrimaryKey<DBRecord, PrimaryKeyColumns> = GetPrimaryKey<DBRecord, PrimaryKeyColumns>
-> {
-
-    /**
-     * Create an instance.
-     *
-     * @param db Database connection.
-     * @returns Instance.
-     */
-    static async create<This extends AnyCoreDatabaseTable>(this: CoreDatabaseTableConstructor<This>, db: SQLiteDB): Promise<This> {
-        const instance = new this(db);
-
-        await instance.initialize();
-
-        return instance;
-    }
-
-    protected db: SQLiteDB;
-    protected data: Record<string, DBRecord>;
-    protected primaryKeys: string[] = ['id'];
-
-    constructor(db: SQLiteDB) {
-        this.db = db;
-        this.data = {};
-    }
-
-    /**
-     * Find a record matching the given conditions.
-     *
-     * @param conditions Matching conditions.
-     * @returns Database record.
-     */
-    find(conditions: Partial<DBRecord>): DBRecord | null  {
-        return Object.values(this.data).find(record => this.recordMatches(record, conditions)) ?? null;
-    }
-
-    /**
-     * Find a record by its primary key.
-     *
-     * @param primaryKey Primary key.
-     * @returns Database record.
-     */
-    findByPrimaryKey(primaryKey: PrimaryKey): DBRecord | null {
-        return this.data[this.serializePrimaryKey(primaryKey)] ?? null;
-    }
-
-    /**
-     * Insert a new record.
-     *
-     * @param record Database record.
-     */
-    async insert(record: DBRecord): Promise<void> {
-        await this.db.insertRecord(this.table, record);
-
-        const primaryKey = this.serializePrimaryKey(this.getPrimaryKeyFromRecord(record));
-
-        this.data[primaryKey] = record;
-    }
-
-    /**
-     * Delete records matching the given conditions.
-     *
-     * @param conditions Matching conditions. If this argument is missing, all records will be deleted.
-     */
-    async delete(conditions?: Partial<DBRecord>): Promise<void> {
-        if (!conditions) {
-            await this.db.deleteRecords(this.table);
-
-            this.data = {};
-
-            return;
-        }
-
-        await this.db.deleteRecords(this.table, conditions);
-
-        Object.entries(this.data).forEach(([id, record]) => {
-            if (!this.recordMatches(record, conditions)) {
-                return;
-            }
-
-            delete this.data[id];
-        });
-    }
-
-    /**
-     * Delete a single record identified by its primary key.
-     *
-     * @param primaryKey Record primary key.
-     */
-    async deleteByPrimaryKey(primaryKey: PrimaryKey): Promise<void> {
-        await this.db.deleteRecords(this.table, primaryKey);
-
-        delete this.data[this.serializePrimaryKey(primaryKey)];
-    }
-
-    /**
-     * Database table name.
-     */
-    protected abstract get table(): string;
-
-    /**
-     * Initialize object by getting the current state of the database table.
-     */
-    protected async initialize(): Promise<void> {
-        const records = await this.db.getRecords<DBRecord>(this.table);
-
-        this.data = records.reduce((data, record) => {
-            const primaryKey = this.serializePrimaryKey(this.getPrimaryKeyFromRecord(record));
-
-            data[primaryKey] = record;
-
-            return data;
-        }, {});
-    }
-
-    /**
-     * Get an object with the columns representing the primary key of a database record.
-     *
-     * @param record Database record.
-     * @returns Primary key column-value pairs.
-     */
-    protected getPrimaryKeyFromRecord(record: DBRecord): PrimaryKey {
-        return this.primaryKeys.reduce((primaryKey, column) => {
-            primaryKey[column] = record[column];
-
-            return primaryKey;
-        }, {} as Record<PrimaryKeyColumns, unknown>) as PrimaryKey;
-    }
-
-    /**
-     * Serialize a primary key with a string representation.
-     *
-     * @param primaryKey Database record primary key.
-     * @returns Serialized primary key.
-     */
-    protected serializePrimaryKey(primaryKey: PrimaryKey): string {
-        return Object.values(primaryKey).map(value => String(value)).join('-');
-    }
-
-    /**
-     * Check whether a given record matches the given conditions.
-     *
-     * @param record Database record.
-     * @param conditions Conditions.
-     * @returns Whether the record matches the conditions.
-     */
-    protected recordMatches(record: DBRecord, conditions: Partial<DBRecord>): boolean {
-        return !Object.entries(conditions).some(([column, value]) => record[column] !== value);
-    }
-
-}
-
-/**
- * Generic type to match against any concrete database table type.
- */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-type AnyCoreDatabaseTable = CoreDatabaseTable<SQLiteDBRecordValues, string, Record<string, any>>;
-
-/**
- * Database table constructor.
- */
-type CoreDatabaseTableConstructor<T extends AnyCoreDatabaseTable> = {
-    new (db: SQLiteDB): T;
-};
-
-/**
- * Infer primary key type from database record and columns types.
- */
-type GetPrimaryKey<DBRecord extends SQLiteDBRecordValues, PrimaryKeyColumns extends keyof DBRecord> = {
-    [column in PrimaryKeyColumns]: DBRecord[column];
-};
diff --git a/src/core/classes/database/database-table-proxy.ts b/src/core/classes/database/database-table-proxy.ts
new file mode 100644
index 000000000..8338df188
--- /dev/null
+++ b/src/core/classes/database/database-table-proxy.ts
@@ -0,0 +1,187 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CorePromisedValue } from '@classes/promised-value';
+import { SQLiteDB, SQLiteDBRecordValues } from '@classes/sqlitedb';
+import { CoreDatabaseReducer, CoreDatabaseTable, CoreDatabaseConditions, GetDBRecordPrimaryKey } from './database-table';
+import { CoreEagerDatabaseTable } from './eager-database-table';
+
+/**
+ * Database table proxy used to route database interactions through different implementations.
+ *
+ * This class allows using a database wrapper with different optimization strategies that can be changed at runtime.
+ */
+export class CoreDatabaseTableProxy<
+    DBRecord extends SQLiteDBRecordValues = SQLiteDBRecordValues,
+    PrimaryKeyColumn extends keyof DBRecord = 'id',
+    PrimaryKey extends GetDBRecordPrimaryKey<DBRecord, PrimaryKeyColumn> = GetDBRecordPrimaryKey<DBRecord, PrimaryKeyColumn>
+> extends CoreDatabaseTable<DBRecord, PrimaryKeyColumn, PrimaryKey> {
+
+    protected config: CoreDatabaseConfiguration;
+    protected target: CorePromisedValue<CoreDatabaseTable<DBRecord, PrimaryKeyColumn>> = new CorePromisedValue();
+
+    constructor(
+        config: Partial<CoreDatabaseConfiguration>,
+        database: SQLiteDB,
+        tableName: string,
+        primaryKeyColumns?: PrimaryKeyColumn[],
+    ) {
+        super(database, tableName, primaryKeyColumns);
+
+        this.config = { ...this.getConfigDefaults(), ...config };
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async initialize(): Promise<void> {
+        const target = this.createTarget();
+
+        await target.initialize();
+
+        this.target.resolve(target);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async all(conditions?: Partial<DBRecord>): Promise<DBRecord[]> {
+        const target = await this.target;
+
+        return target.all(conditions);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async find(conditions: Partial<DBRecord>): Promise<DBRecord> {
+        const target = await this.target;
+
+        return target.find(conditions);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async findByPrimaryKey(primaryKey: PrimaryKey): Promise<DBRecord> {
+        const target = await this.target;
+
+        return target.findByPrimaryKey(primaryKey);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async reduce<T>(reducer: CoreDatabaseReducer<DBRecord, T>, conditions?: CoreDatabaseConditions<DBRecord>): Promise<T> {
+        const target = await this.target;
+
+        return target.reduce<T>(reducer, conditions);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async insert(record: DBRecord): Promise<void> {
+        const target = await this.target;
+
+        return target.insert(record);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async update(updates: Partial<DBRecord>, conditions?: Partial<DBRecord>): Promise<void> {
+        const target = await this.target;
+
+        return target.update(updates, conditions);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async updateWhere(updates: Partial<DBRecord>, conditions: CoreDatabaseConditions<DBRecord>): Promise<void> {
+        const target = await this.target;
+
+        return target.updateWhere(updates, conditions);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async delete(conditions?: Partial<DBRecord>): Promise<void> {
+        const target = await this.target;
+
+        return target.delete(conditions);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async deleteByPrimaryKey(primaryKey: PrimaryKey): Promise<void> {
+        const target = await this.target;
+
+        return target.deleteByPrimaryKey(primaryKey);
+    }
+
+    /**
+     * Get default configuration values.
+     *
+     * @returns Config defaults.
+     */
+    protected getConfigDefaults(): CoreDatabaseConfiguration {
+        return {
+            cachingStrategy: CoreDatabaseCachingStrategy.None,
+        };
+    }
+
+    /**
+     * Create proxy target.
+     *
+     * @returns Target instance.
+     */
+    protected createTarget(): CoreDatabaseTable<DBRecord, PrimaryKeyColumn> {
+        return this.createTable(this.config.cachingStrategy);
+    }
+
+    /**
+     * Create a database table using the given caching strategy.
+     *
+     * @param cachingStrategy Caching strategy.
+     * @returns Database table.
+     */
+    protected createTable(cachingStrategy: CoreDatabaseCachingStrategy): CoreDatabaseTable<DBRecord, PrimaryKeyColumn> {
+        switch (cachingStrategy) {
+            case CoreDatabaseCachingStrategy.Eager:
+                return new CoreEagerDatabaseTable(this.database, this.tableName, this.primaryKeyColumns);
+            case CoreDatabaseCachingStrategy.None:
+                return new CoreDatabaseTable(this.database, this.tableName, this.primaryKeyColumns);
+        }
+    }
+
+}
+
+/**
+ * Database proxy configuration.
+ */
+export interface CoreDatabaseConfiguration {
+    cachingStrategy: CoreDatabaseCachingStrategy;
+}
+
+/**
+ * Database caching strategies.
+ */
+export enum CoreDatabaseCachingStrategy {
+    Eager = 'eager',
+    None = 'none',
+}
diff --git a/src/core/classes/database/database-table.ts b/src/core/classes/database/database-table.ts
new file mode 100644
index 000000000..2bb34ff89
--- /dev/null
+++ b/src/core/classes/database/database-table.ts
@@ -0,0 +1,240 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { SQLiteDB, SQLiteDBRecordValue, SQLiteDBRecordValues } from '@classes/sqlitedb';
+
+/**
+ * Wrapper used to interact with a database table.
+ */
+export class CoreDatabaseTable<
+    DBRecord extends SQLiteDBRecordValues = SQLiteDBRecordValues,
+    PrimaryKeyColumn extends keyof DBRecord = 'id',
+    PrimaryKey extends GetDBRecordPrimaryKey<DBRecord, PrimaryKeyColumn> = GetDBRecordPrimaryKey<DBRecord, PrimaryKeyColumn>
+> {
+
+    protected database: SQLiteDB;
+    protected tableName: string;
+    protected primaryKeyColumns: PrimaryKeyColumn[];
+
+    constructor(database: SQLiteDB, tableName: string, primaryKeyColumns?: PrimaryKeyColumn[]) {
+        this.database = database;
+        this.tableName = tableName;
+        this.primaryKeyColumns = primaryKeyColumns ?? ['id'] as PrimaryKeyColumn[];
+    }
+
+    /**
+     * Get database connection.
+     *
+     * @returns Database connection.
+     */
+    getDatabase(): SQLiteDB {
+        return this.database;
+    }
+
+    /**
+     * Get table name.
+     *
+     * @returns Table name.
+     */
+    getTableName(): string {
+        return this.tableName;
+    }
+
+    /**
+     * Get primary key columns.
+     *
+     * @returns Primary key columns.
+     */
+    getPrimaryKeyColumns(): PrimaryKeyColumn[] {
+        return this.primaryKeyColumns.slice(0);
+    }
+
+    /**
+     * Initialize.
+     */
+    async initialize(): Promise<void> {
+        // Nothing to initialize by default, override this method if necessary.
+    }
+
+    /**
+     * Destroy.
+     */
+    async destroy(): Promise<void> {
+        // Nothing to destroy by default, override this method if necessary.
+    }
+
+    /**
+     * Get records matching the given conditions.
+     *
+     * @param conditions Matching conditions. If this argument is missing, all records in the table will be returned.
+     * @returns Database records.
+     */
+    all(conditions?: Partial<DBRecord>): Promise<DBRecord[]> {
+        return conditions
+            ? this.database.getRecords(this.tableName, conditions)
+            : this.database.getAllRecords(this.tableName);
+    }
+
+    /**
+     * Find one record matching the given conditions.
+     *
+     * @param conditions Matching conditions.
+     * @returns Database record.
+     */
+    find(conditions: Partial<DBRecord>): Promise<DBRecord> {
+        return this.database.getRecord<DBRecord>(this.tableName, conditions);
+    }
+
+    /**
+     * Find one record by its primary key.
+     *
+     * @param primaryKey Primary key.
+     * @returns Database record.
+     */
+    findByPrimaryKey(primaryKey: PrimaryKey): Promise<DBRecord> {
+        return this.database.getRecord<DBRecord>(this.tableName, primaryKey);
+    }
+
+    /**
+     * Reduce some records into a single value.
+     *
+     * @param reducer Reducer functions in SQL and JavaScript.
+     * @param conditions Matching conditions in SQL and JavaScript. If this argument is missing, all records in the table
+     *                   will be used.
+     * @returns Reduced value.
+     */
+    reduce<T>(reducer: CoreDatabaseReducer<DBRecord, T>, conditions?: CoreDatabaseConditions<DBRecord>): Promise<T> {
+        return this.database.getFieldSql(
+            `SELECT ${reducer.sql} FROM ${this.tableName} ${conditions?.sql ?? ''}`,
+            conditions?.sqlParams,
+        ) as unknown as Promise<T>;
+    }
+
+    /**
+     * Insert a new record.
+     *
+     * @param record Database record.
+     */
+    async insert(record: DBRecord): Promise<void> {
+        await this.database.insertRecord(this.tableName, record);
+    }
+
+    /**
+     * Update records matching the given conditions.
+     *
+     * @param updates Record updates.
+     * @param conditions Matching conditions. If this argument is missing, all records will be updated.
+     */
+    async update(updates: Partial<DBRecord>, conditions?: Partial<DBRecord>): Promise<void> {
+        await this.database.updateRecords(this.tableName, updates, conditions);
+    }
+
+    /**
+     * Update records matching the given conditions.
+     *
+     * This method should be used when it's necessary to apply complex conditions; the simple `update`
+     * method should be favored otherwise for better performance.
+     *
+     * @param updates Record updates.
+     * @param conditions Matching conditions in SQL and JavaScript.
+     */
+    async updateWhere(updates: Partial<DBRecord>, conditions: CoreDatabaseConditions<DBRecord>): Promise<void> {
+        await this.database.updateRecordsWhere(this.tableName, updates, conditions.sql, conditions.sqlParams);
+    }
+
+    /**
+     * Delete records matching the given conditions.
+     *
+     * @param conditions Matching conditions. If this argument is missing, all records will be deleted.
+     */
+    async delete(conditions?: Partial<DBRecord>): Promise<void> {
+        conditions
+            ? await this.database.deleteRecords(this.tableName, conditions)
+            : await this.database.deleteRecords(this.tableName);
+    }
+
+    /**
+     * Delete a single record identified by its primary key.
+     *
+     * @param primaryKey Record primary key.
+     */
+    async deleteByPrimaryKey(primaryKey: PrimaryKey): Promise<void> {
+        await this.database.deleteRecords(this.tableName, primaryKey);
+    }
+
+    /**
+     * Get the primary key from a database record.
+     *
+     * @param record Database record.
+     * @returns Primary key.
+     */
+    protected getPrimaryKeyFromRecord(record: DBRecord): PrimaryKey {
+        return this.primaryKeyColumns.reduce((primaryKey, column) => {
+            primaryKey[column] = record[column];
+
+            return primaryKey;
+        }, {} as Record<PrimaryKeyColumn, unknown>) as PrimaryKey;
+    }
+
+    /**
+     * Serialize a primary key with a string representation.
+     *
+     * @param primaryKey Primary key.
+     * @returns Serialized primary key.
+     */
+    protected serializePrimaryKey(primaryKey: PrimaryKey): string {
+        return Object.values(primaryKey).map(value => String(value)).join('-');
+    }
+
+    /**
+     * Check whether a given record matches the given conditions.
+     *
+     * @param record Database record.
+     * @param conditions Matching conditions.
+     * @returns Whether the record matches the conditions.
+     */
+    protected recordMatches(record: DBRecord, conditions: Partial<DBRecord>): boolean {
+        return !Object.entries(conditions).some(([column, value]) => record[column] !== value);
+    }
+
+}
+
+/**
+ * Infer primary key type from database record and primary key column types.
+ */
+export type GetDBRecordPrimaryKey<DBRecord extends SQLiteDBRecordValues, PrimaryKeyColumn extends keyof DBRecord> = {
+    [column in PrimaryKeyColumn]: DBRecord[column];
+};
+
+/**
+ * Reducer used to accumulate a value from multiple records both in SQL and JavaScript.
+ *
+ * Both operations should be equivalent.
+ */
+export type CoreDatabaseReducer<DBRecord, T> = {
+    sql: string;
+    js: (previousValue: T, record: DBRecord) => T;
+    jsInitialValue: T;
+};
+
+/**
+ * Conditions to match database records both in SQL and JavaScript.
+ *
+ * Both conditions should be equivalent.
+ */
+export type CoreDatabaseConditions<DBRecord> = {
+    sql: string;
+    sqlParams?: SQLiteDBRecordValue[];
+    js: (record: DBRecord) => boolean;
+};
diff --git a/src/core/classes/database/eager-database-table.ts b/src/core/classes/database/eager-database-table.ts
new file mode 100644
index 000000000..7cc3cf53c
--- /dev/null
+++ b/src/core/classes/database/eager-database-table.ts
@@ -0,0 +1,168 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreError } from '@classes/errors/error';
+import { SQLiteDBRecordValues } from '@classes/sqlitedb';
+import { CoreDatabaseTable, CoreDatabaseConditions, GetDBRecordPrimaryKey, CoreDatabaseReducer } from './database-table';
+
+/**
+ * Wrapper used to improve performance by caching all the records for faster read operations.
+ *
+ * This implementation works best for tables that don't have a lot of records and are read often; for tables with too many
+ * records use CoreLazyDatabaseTable instead.
+ */
+export class CoreEagerDatabaseTable<
+    DBRecord extends SQLiteDBRecordValues = SQLiteDBRecordValues,
+    PrimaryKeyColumn extends keyof DBRecord = 'id',
+    PrimaryKey extends GetDBRecordPrimaryKey<DBRecord, PrimaryKeyColumn> = GetDBRecordPrimaryKey<DBRecord, PrimaryKeyColumn>
+> extends CoreDatabaseTable<DBRecord, PrimaryKeyColumn, PrimaryKey> {
+
+    protected records: Record<string, DBRecord> = {};
+
+    /**
+     * @inheritdoc
+     */
+    async initialize(): Promise<void> {
+        const records = await super.all();
+
+        this.records = records.reduce((data, record) => {
+            const primaryKey = this.serializePrimaryKey(this.getPrimaryKeyFromRecord(record));
+
+            data[primaryKey] = record;
+
+            return data;
+        }, {});
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async all(conditions?: Partial<DBRecord>): Promise<DBRecord[]> {
+        const records = Object.values(this.records);
+
+        return conditions
+            ? records.filter(record => this.recordMatches(record, conditions))
+            : records;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async find(conditions: Partial<DBRecord>): Promise<DBRecord> {
+        const record = Object.values(this.records).find(record => this.recordMatches(record, conditions)) ?? null;
+
+        if (record === null) {
+            throw new CoreError('No records found.');
+        }
+
+        return record;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async findByPrimaryKey(primaryKey: PrimaryKey): Promise<DBRecord> {
+        const record = this.records[this.serializePrimaryKey(primaryKey)] ?? null;
+
+        if (record === null) {
+            throw new CoreError('No records found.');
+        }
+
+        return record;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async reduce<T>(reducer: CoreDatabaseReducer<DBRecord, T>, conditions?: CoreDatabaseConditions<DBRecord>): Promise<T> {
+        return Object
+            .values(this.records)
+            .reduce(
+                (result, record) => (!conditions || conditions.js(record)) ? reducer.js(result, record) : result,
+                reducer.jsInitialValue,
+            );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async insert(record: DBRecord): Promise<void> {
+        await super.insert(record);
+
+        const primaryKey = this.serializePrimaryKey(this.getPrimaryKeyFromRecord(record));
+
+        this.records[primaryKey] = record;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async update(updates: Partial<DBRecord>, conditions?: Partial<DBRecord>): Promise<void> {
+        await super.update(updates, conditions);
+
+        for (const record of Object.values(this.records)) {
+            if (conditions && !this.recordMatches(record, conditions)) {
+                continue;
+            }
+
+            Object.assign(record, updates);
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async updateWhere(updates: Partial<DBRecord>, conditions: CoreDatabaseConditions<DBRecord>): Promise<void> {
+        await super.updateWhere(updates, conditions);
+
+        for (const record of Object.values(this.records)) {
+            if (!conditions.js(record)) {
+                continue;
+            }
+
+            Object.assign(record, updates);
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async delete(conditions?: Partial<DBRecord>): Promise<void> {
+        await super.delete(conditions);
+
+        if (!conditions) {
+            this.records = {};
+
+            return;
+        }
+
+        Object.entries(this.records).forEach(([id, record]) => {
+            if (!this.recordMatches(record, conditions)) {
+                return;
+            }
+
+            delete this.records[id];
+        });
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async deleteByPrimaryKey(primaryKey: PrimaryKey): Promise<void> {
+        await super.deleteByPrimaryKey(primaryKey);
+
+        delete this.records[this.serializePrimaryKey(primaryKey)];
+    }
+
+}
diff --git a/src/core/classes/sqlitedb.ts b/src/core/classes/sqlitedb.ts
index 615a3eb7f..915ea9ffb 100644
--- a/src/core/classes/sqlitedb.ts
+++ b/src/core/classes/sqlitedb.ts
@@ -1206,4 +1206,4 @@ export type SQLiteDBQueryParams = {
     params: SQLiteDBRecordValue[];
 };
 
-type SQLiteDBRecordValue = number | string;
+export type SQLiteDBRecordValue = number | string;
diff --git a/src/core/classes/tests/database-table.test.ts b/src/core/classes/tests/database-table.test.ts
index 92e6d7ec2..f87589fc7 100644
--- a/src/core/classes/tests/database-table.test.ts
+++ b/src/core/classes/tests/database-table.test.ts
@@ -13,7 +13,11 @@
 // limitations under the License.
 
 import { mock } from '@/testing/utils';
-import { CoreDatabaseTable } from '@classes/database-table';
+import {
+    CoreDatabaseCachingStrategy,
+    CoreDatabaseConfiguration,
+    CoreDatabaseTableProxy,
+} from '@classes/database/database-table-proxy';
 import { SQLiteDB, SQLiteDBRecordValues } from '@classes/sqlitedb';
 
 interface User extends SQLiteDBRecordValues {
@@ -22,30 +26,60 @@ interface User extends SQLiteDBRecordValues {
     surname: string;
 }
 
-class UsersTable extends CoreDatabaseTable<User> {
-
-    protected table = 'users';
-
+function userMatches(user: User, conditions: Partial<User>) {
+    return !Object.entries(conditions).some(([column, value]) => user[column] !== value);
 }
 
-describe('CoreDatabaseTable', () => {
+function prepareStubs(config: Partial<CoreDatabaseConfiguration> = {}): [User[], SQLiteDB, CoreDatabaseTableProxy<User>] {
+    const records: User[] = [];
+    const database = mock<SQLiteDB>({
+        getRecord: async <T>(_, conditions) => {
+            const record = records.find(record => userMatches(record, conditions));
+
+            if (!record) {
+                throw new Error();
+            }
+
+            return record as unknown as T;
+        },
+        getRecords: async <T>(_, conditions) => records.filter(record => userMatches(record, conditions)) as unknown as T[],
+        getAllRecords: async <T>() => records as unknown as T[],
+        deleteRecords: async (_, conditions) => {
+            const usersToDelete: User[] = [];
+
+            for (const user of records) {
+                if (conditions && !userMatches(user, conditions)) {
+                    continue;
+                }
+
+                usersToDelete.push(user);
+            }
+
+            for (const user of usersToDelete) {
+                records.splice(records.indexOf(user), 1);
+            }
+
+            return usersToDelete.length;
+        },
+        insertRecord: async (_, user: User) => records.push(user) && 1,
+    });
+    const table = new CoreDatabaseTableProxy<User>(config, database, 'users');
+
+    return [records, database, table];
+}
+
+describe('CoreDatabaseTable with eager caching', () => {
 
     let records: User[];
-    let db: SQLiteDB;
+    let database: SQLiteDB;
+    let table: CoreDatabaseTableProxy<User>;
 
-    beforeEach(() => {
-        records = [];
-        db = mock<SQLiteDB>({
-            getRecords: async <T>() => records as unknown as T[],
-            deleteRecords: async () => 0,
-            insertRecord: async () => 0,
-        });
-    });
+    beforeEach(() => [records, database, table] = prepareStubs({ cachingStrategy: CoreDatabaseCachingStrategy.Eager }));
 
-    it('reads all records on create', async () => {
-        await UsersTable.create(db);
+    it('reads all records on initialization', async () => {
+        await table.initialize();
 
-        expect(db.getRecords).toHaveBeenCalledWith('users');
+        expect(database.getAllRecords).toHaveBeenCalledWith('users');
     });
 
     it('finds items', async () => {
@@ -55,27 +89,29 @@ describe('CoreDatabaseTable', () => {
         records.push(john);
         records.push(amy);
 
-        const table = await UsersTable.create(db);
+        await table.initialize();
 
-        expect(table.findByPrimaryKey({ id: 1 })).toEqual(john);
-        expect(table.findByPrimaryKey({ id: 2 })).toEqual(amy);
-        expect(table.find({ surname: 'Doe', name: 'John' })).toEqual(john);
-        expect(table.find({ surname: 'Doe', name: 'Amy' })).toEqual(amy);
+        await expect(table.findByPrimaryKey({ id: 1 })).resolves.toEqual(john);
+        await expect(table.findByPrimaryKey({ id: 2 })).resolves.toEqual(amy);
+        await expect(table.find({ surname: 'Doe', name: 'John' })).resolves.toEqual(john);
+        await expect(table.find({ surname: 'Doe', name: 'Amy' })).resolves.toEqual(amy);
+
+        expect(database.getRecord).not.toHaveBeenCalled();
     });
 
     it('inserts items', async () => {
         // Arrange.
         const john = { id: 1, name: 'John', surname: 'Doe' };
 
-        // Act.
-        const table = await UsersTable.create(db);
+        await table.initialize();
 
+        // Act.
         await table.insert(john);
 
         // Assert.
-        expect(db.insertRecord).toHaveBeenCalledWith('users', john);
+        expect(database.insertRecord).toHaveBeenCalledWith('users', john);
 
-        expect(table.findByPrimaryKey({ id: 1 })).toEqual(john);
+        await expect(table.findByPrimaryKey({ id: 1 })).resolves.toEqual(john);
     });
 
     it('deletes items', async () => {
@@ -88,17 +124,17 @@ describe('CoreDatabaseTable', () => {
         records.push(amy);
         records.push(jane);
 
-        // Act.
-        const table = await UsersTable.create(db);
+        await table.initialize();
 
+        // Act.
         await table.delete({ surname: 'Doe' });
 
         // Assert.
-        expect(db.deleteRecords).toHaveBeenCalledWith('users', { surname: 'Doe' });
+        expect(database.deleteRecords).toHaveBeenCalledWith('users', { surname: 'Doe' });
 
-        expect(table.findByPrimaryKey({ id: 1 })).toBeNull();
-        expect(table.findByPrimaryKey({ id: 2 })).toBeNull();
-        expect(table.findByPrimaryKey({ id: 3 })).toEqual(jane);
+        await expect(table.findByPrimaryKey({ id: 1 })).rejects.toThrow();
+        await expect(table.findByPrimaryKey({ id: 2 })).rejects.toThrow();
+        await expect(table.findByPrimaryKey({ id: 3 })).resolves.toEqual(jane);
     });
 
     it('deletes items by primary key', async () => {
@@ -109,16 +145,108 @@ describe('CoreDatabaseTable', () => {
         records.push(john);
         records.push(amy);
 
-        // Act.
-        const table = await UsersTable.create(db);
+        await table.initialize();
 
+        // Act.
         await table.deleteByPrimaryKey({ id: 1 });
 
         // Assert.
-        expect(db.deleteRecords).toHaveBeenCalledWith('users', { id: 1 });
+        expect(database.deleteRecords).toHaveBeenCalledWith('users', { id: 1 });
 
-        expect(table.findByPrimaryKey({ id: 1 })).toBeNull();
-        expect(table.findByPrimaryKey({ id: 2 })).toEqual(amy);
+        await expect(table.findByPrimaryKey({ id: 1 })).rejects.toThrow();
+        await expect(table.findByPrimaryKey({ id: 2 })).resolves.toEqual(amy);
+    });
+
+});
+
+describe('CoreDatabaseTable with no caching', () => {
+
+    let records: User[];
+    let database: SQLiteDB;
+    let table: CoreDatabaseTableProxy<User>;
+
+    beforeEach(() => [records, database, table] = prepareStubs({ cachingStrategy: CoreDatabaseCachingStrategy.None }));
+
+    it('reads no records on initialization', async () => {
+        await table.initialize();
+
+        expect(database.getRecords).not.toHaveBeenCalled();
+        expect(database.getAllRecords).not.toHaveBeenCalled();
+    });
+
+    it('finds items', async () => {
+        const john = { id: 1, name: 'John', surname: 'Doe' };
+        const amy = { id: 2, name: 'Amy', surname: 'Doe' };
+
+        records.push(john);
+        records.push(amy);
+
+        await table.initialize();
+
+        await expect(table.findByPrimaryKey({ id: 1 })).resolves.toEqual(john);
+        await expect(table.findByPrimaryKey({ id: 2 })).resolves.toEqual(amy);
+        await expect(table.find({ surname: 'Doe', name: 'John' })).resolves.toEqual(john);
+        await expect(table.find({ surname: 'Doe', name: 'Amy' })).resolves.toEqual(amy);
+
+        expect(database.getRecord).toHaveBeenCalledTimes(4);
+    });
+
+    it('inserts items', async () => {
+        // Arrange.
+        const john = { id: 1, name: 'John', surname: 'Doe' };
+
+        await table.initialize();
+
+        // Act.
+        await table.insert(john);
+
+        // Assert.
+        expect(database.insertRecord).toHaveBeenCalledWith('users', john);
+
+        await expect(table.findByPrimaryKey({ id: 1 })).resolves.toEqual(john);
+    });
+
+    it('deletes items', async () => {
+        // Arrange.
+        const john = { id: 1, name: 'John', surname: 'Doe' };
+        const amy = { id: 2, name: 'Amy', surname: 'Doe' };
+        const jane = { id: 3, name: 'Jane', surname: 'Smith' };
+
+        records.push(john);
+        records.push(amy);
+        records.push(jane);
+
+        await table.initialize();
+
+        // Act.
+        await table.delete({ surname: 'Doe' });
+
+        // Assert.
+        expect(database.deleteRecords).toHaveBeenCalledWith('users', { surname: 'Doe' });
+
+        await expect(table.findByPrimaryKey({ id: 1 })).rejects.toThrow();
+        await expect(table.findByPrimaryKey({ id: 2 })).rejects.toThrow();
+        await expect(table.findByPrimaryKey({ id: 3 })).resolves.toEqual(jane);
+    });
+
+    it('deletes items by primary key', async () => {
+        // Arrange.
+        const john = { id: 1, name: 'John', surname: 'Doe' };
+        const amy = { id: 2, name: 'Amy', surname: 'Doe' };
+
+        records.push(john);
+        records.push(amy);
+
+        await table.initialize();
+
+        // Act.
+        await table.deleteByPrimaryKey({ id: 1 });
+
+        // Assert.
+        expect(database.deleteRecords).toHaveBeenCalledWith('users', { id: 1 });
+
+        await expect(table.findByPrimaryKey({ id: 1 })).rejects.toThrow();
+        await expect(table.findByPrimaryKey({ id: 2 })).resolves.toEqual(amy);
     });
 
 });
diff --git a/src/core/services/config.ts b/src/core/services/config.ts
index ee49af16d..7b52fcd3e 100644
--- a/src/core/services/config.ts
+++ b/src/core/services/config.ts
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 import { Injectable } from '@angular/core';
-
+import { CoreDatabaseCachingStrategy, CoreDatabaseTableProxy } from '@classes/database/database-table-proxy';
 import { CoreApp } from '@services/app';
+import { APP_SCHEMA, ConfigDBEntry, CONFIG_TABLE_NAME } from '@services/database/config';
 import { makeSingleton } from '@singletons';
-import { CONFIG_TABLE_NAME, APP_SCHEMA, ConfigDBEntry } from '@services/database/config';
-import { CoreDatabaseTable } from '@classes/database-table';
+import { CoreDatabaseTable } from '@classes/database/database-table';
 import { CorePromisedValue } from '@classes/promised-value';
 
 /**
@@ -27,11 +27,7 @@ import { CorePromisedValue } from '@classes/promised-value';
 @Injectable({ providedIn: 'root' })
 export class CoreConfigProvider {
 
-    protected dbTable: CorePromisedValue<CoreConfigTable>;
-
-    constructor() {
-        this.dbTable = new CorePromisedValue();
-    }
+    protected table: CorePromisedValue<CoreDatabaseTable<ConfigDBEntry, 'name'>> = new CorePromisedValue();
 
     /**
      * Initialize database.
@@ -43,10 +39,16 @@ export class CoreConfigProvider {
             // Ignore errors.
         }
 
-        const db = CoreApp.getDB();
-        const table = await CoreConfigTable.create(db);
+        const table = new CoreDatabaseTableProxy<ConfigDBEntry, 'name'>(
+            { cachingStrategy: CoreDatabaseCachingStrategy.Eager },
+            CoreApp.getDB(),
+            CONFIG_TABLE_NAME,
+            ['name'],
+        );
 
-        this.dbTable.resolve(table);
+        await table.initialize();
+
+        this.table.resolve(table);
     }
 
     /**
@@ -56,7 +58,7 @@ export class CoreConfigProvider {
      * @return Promise resolved when done.
      */
     async delete(name: string): Promise<void> {
-        const table = await this.dbTable;
+        const table = await this.table;
 
         await table.deleteByPrimaryKey({ name });
     }
@@ -69,18 +71,18 @@ export class CoreConfigProvider {
      * @return Resolves upon success along with the config data. Reject on failure.
      */
     async get<T>(name: string, defaultValue?: T): Promise<T> {
-        const table = await this.dbTable;
-        const record = table.findByPrimaryKey({ name });
+        try {
+            const table = await this.table;
+            const record = await table.findByPrimaryKey({ name });
 
-        if (record !== null) {
             return record.value;
-        }
+        } catch (error) {
+            if (defaultValue !== undefined) {
+                return defaultValue;
+            }
 
-        if (defaultValue !== undefined) {
-            return defaultValue;
+            throw error;
         }
-
-        throw new Error(`Couldn't get config with name '${name}'`);
     }
 
     /**
@@ -91,7 +93,7 @@ export class CoreConfigProvider {
      * @return Promise resolved when done.
      */
     async set(name: string, value: number | string): Promise<void> {
-        const table = await this.dbTable;
+        const table = await this.table;
 
         await table.insert({ name, value });
     }
@@ -99,13 +101,3 @@ export class CoreConfigProvider {
 }
 
 export const CoreConfig = makeSingleton(CoreConfigProvider);
-
-/**
- * Config database table.
- */
-class CoreConfigTable extends CoreDatabaseTable<ConfigDBEntry, 'name'> {
-
-    protected table = CONFIG_TABLE_NAME;
-    protected primaryKeys = ['name'];
-
-}

From 7c834281ce462484425408f9d165be31376a61fa Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 3 Feb 2022 13:23:08 +0100
Subject: [PATCH 0458/1008] MOBILE-3977 filepool: Optimize files table

---
 .eslintrc.js                                  |   1 +
 .../classes/database/database-table-proxy.ts  |   4 +
 .../classes/database/lazy-database-table.ts   | 141 +++++++++++
 src/core/classes/tests/database-table.test.ts | 237 ++++++++----------
 src/core/services/filepool.ts                 | 115 ++++++---
 5 files changed, 337 insertions(+), 161 deletions(-)
 create mode 100644 src/core/classes/database/lazy-database-table.ts

diff --git a/.eslintrc.js b/.eslintrc.js
index 1b4ee6949..deda33df6 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -271,6 +271,7 @@ testsConfig['rules']['padded-blocks'] = [
         switches: 'never',
     },
 ];
+testsConfig['rules']['jest/expect-expect'] = 'off';
 testsConfig['plugins'].push('jest');
 testsConfig['extends'].push('plugin:jest/recommended');
 
diff --git a/src/core/classes/database/database-table-proxy.ts b/src/core/classes/database/database-table-proxy.ts
index 8338df188..393e07ac4 100644
--- a/src/core/classes/database/database-table-proxy.ts
+++ b/src/core/classes/database/database-table-proxy.ts
@@ -16,6 +16,7 @@ import { CorePromisedValue } from '@classes/promised-value';
 import { SQLiteDB, SQLiteDBRecordValues } from '@classes/sqlitedb';
 import { CoreDatabaseReducer, CoreDatabaseTable, CoreDatabaseConditions, GetDBRecordPrimaryKey } from './database-table';
 import { CoreEagerDatabaseTable } from './eager-database-table';
+import { CoreLazyDatabaseTable } from './lazy-database-table';
 
 /**
  * Database table proxy used to route database interactions through different implementations.
@@ -164,6 +165,8 @@ export class CoreDatabaseTableProxy<
         switch (cachingStrategy) {
             case CoreDatabaseCachingStrategy.Eager:
                 return new CoreEagerDatabaseTable(this.database, this.tableName, this.primaryKeyColumns);
+            case CoreDatabaseCachingStrategy.Lazy:
+                return new CoreLazyDatabaseTable(this.database, this.tableName, this.primaryKeyColumns);
             case CoreDatabaseCachingStrategy.None:
                 return new CoreDatabaseTable(this.database, this.tableName, this.primaryKeyColumns);
         }
@@ -183,5 +186,6 @@ export interface CoreDatabaseConfiguration {
  */
 export enum CoreDatabaseCachingStrategy {
     Eager = 'eager',
+    Lazy = 'lazy',
     None = 'none',
 }
diff --git a/src/core/classes/database/lazy-database-table.ts b/src/core/classes/database/lazy-database-table.ts
new file mode 100644
index 000000000..cf64623a7
--- /dev/null
+++ b/src/core/classes/database/lazy-database-table.ts
@@ -0,0 +1,141 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreError } from '@classes/errors/error';
+import { SQLiteDBRecordValues } from '@classes/sqlitedb';
+import { CoreDatabaseTable, CoreDatabaseConditions, GetDBRecordPrimaryKey } from './database-table';
+
+/**
+ * Wrapper used to improve performance by caching records that are used often for faster read operations.
+ *
+ * This implementation works best for tables that have a lot of records and are read often; for tables with a few records use
+ * CoreEagerDatabaseTable instead.
+ */
+export class CoreLazyDatabaseTable<
+    DBRecord extends SQLiteDBRecordValues = SQLiteDBRecordValues,
+    PrimaryKeyColumn extends keyof DBRecord = 'id',
+    PrimaryKey extends GetDBRecordPrimaryKey<DBRecord, PrimaryKeyColumn> = GetDBRecordPrimaryKey<DBRecord, PrimaryKeyColumn>
+> extends CoreDatabaseTable<DBRecord, PrimaryKeyColumn, PrimaryKey> {
+
+    protected records: Record<string, DBRecord | null> = {};
+
+    /**
+     * @inheritdoc
+     */
+    async find(conditions: Partial<DBRecord>): Promise<DBRecord> {
+        let record: DBRecord | null =
+            Object.values(this.records).find(record => record && this.recordMatches(record, conditions)) ?? null;
+
+        if (!record) {
+            record = await super.find(conditions);
+
+            this.records[this.serializePrimaryKey(this.getPrimaryKeyFromRecord(record))] = record;
+        }
+
+        return record;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async findByPrimaryKey(primaryKey: PrimaryKey): Promise<DBRecord> {
+        const serializePrimaryKey = this.serializePrimaryKey(primaryKey);
+
+        if (!(serializePrimaryKey in this.records)) {
+            try {
+                const record = await super.findByPrimaryKey(primaryKey);
+
+                this.records[serializePrimaryKey] = record;
+
+                return record;
+            } catch (error) {
+                this.records[serializePrimaryKey] = null;
+
+                throw error;
+            }
+        }
+
+        const record = this.records[serializePrimaryKey];
+
+        if (!record) {
+            throw new CoreError('No records found.');
+        }
+
+        return record;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async insert(record: DBRecord): Promise<void> {
+        await super.insert(record);
+
+        this.records[this.serializePrimaryKey(this.getPrimaryKeyFromRecord(record))] = record;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async update(updates: Partial<DBRecord>, conditions?: Partial<DBRecord>): Promise<void> {
+        await super.update(updates, conditions);
+
+        for (const record of Object.values(this.records)) {
+            if (!record || (conditions && !this.recordMatches(record, conditions))) {
+                continue;
+            }
+
+            Object.assign(record, updates);
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async updateWhere(updates: Partial<DBRecord>, conditions: CoreDatabaseConditions<DBRecord>): Promise<void> {
+        await super.updateWhere(updates, conditions);
+
+        for (const record of Object.values(this.records)) {
+            if (!record || !conditions.js(record)) {
+                continue;
+            }
+
+            Object.assign(record, updates);
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async delete(conditions?: Partial<DBRecord>): Promise<void> {
+        await super.delete(conditions);
+
+        for (const [primaryKey, record] of Object.entries(this.records)) {
+            if (!record || (conditions && !this.recordMatches(record, conditions))) {
+                continue;
+            }
+
+            this.records[primaryKey] = null;
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async deleteByPrimaryKey(primaryKey: PrimaryKey): Promise<void> {
+        await super.deleteByPrimaryKey(primaryKey);
+
+        this.records[this.serializePrimaryKey(primaryKey)] = null;
+    }
+
+}
diff --git a/src/core/classes/tests/database-table.test.ts b/src/core/classes/tests/database-table.test.ts
index f87589fc7..4d02603d2 100644
--- a/src/core/classes/tests/database-table.test.ts
+++ b/src/core/classes/tests/database-table.test.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import { mock } from '@/testing/utils';
+import { CoreDatabaseTable } from '@classes/database/database-table';
 import {
     CoreDatabaseCachingStrategy,
     CoreDatabaseConfiguration,
@@ -30,7 +31,7 @@ function userMatches(user: User, conditions: Partial<User>) {
     return !Object.entries(conditions).some(([column, value]) => user[column] !== value);
 }
 
-function prepareStubs(config: Partial<CoreDatabaseConfiguration> = {}): [User[], SQLiteDB, CoreDatabaseTableProxy<User>] {
+function prepareStubs(config: Partial<CoreDatabaseConfiguration> = {}): [User[], SQLiteDB, CoreDatabaseTable<User>] {
     const records: User[] = [];
     const database = mock<SQLiteDB>({
         getRecord: async <T>(_, conditions) => {
@@ -68,11 +69,84 @@ function prepareStubs(config: Partial<CoreDatabaseConfiguration> = {}): [User[],
     return [records, database, table];
 }
 
+async function testFindItems(records: User[], table: CoreDatabaseTable<User>) {
+    const john = { id: 1, name: 'John', surname: 'Doe' };
+    const amy = { id: 2, name: 'Amy', surname: 'Doe' };
+
+    records.push(john);
+    records.push(amy);
+
+    await table.initialize();
+
+    await expect(table.findByPrimaryKey({ id: 1 })).resolves.toEqual(john);
+    await expect(table.findByPrimaryKey({ id: 2 })).resolves.toEqual(amy);
+    await expect(table.find({ surname: 'Doe', name: 'John' })).resolves.toEqual(john);
+    await expect(table.find({ surname: 'Doe', name: 'Amy' })).resolves.toEqual(amy);
+}
+
+async function testInsertItems(records: User[], database: SQLiteDB, table: CoreDatabaseTable<User>) {
+    // Arrange.
+    const john = { id: 1, name: 'John', surname: 'Doe' };
+
+    await table.initialize();
+
+    // Act.
+    await table.insert(john);
+
+    // Assert.
+    expect(database.insertRecord).toHaveBeenCalledWith('users', john);
+
+    await expect(table.findByPrimaryKey({ id: 1 })).resolves.toEqual(john);
+}
+
+async function testDeleteItems(records: User[], database: SQLiteDB, table: CoreDatabaseTable<User>) {
+    // Arrange.
+    const john = { id: 1, name: 'John', surname: 'Doe' };
+    const amy = { id: 2, name: 'Amy', surname: 'Doe' };
+    const jane = { id: 3, name: 'Jane', surname: 'Smith' };
+
+    records.push(john);
+    records.push(amy);
+    records.push(jane);
+
+    await table.initialize();
+
+    // Act.
+    await table.delete({ surname: 'Doe' });
+
+    // Assert.
+    expect(database.deleteRecords).toHaveBeenCalledWith('users', { surname: 'Doe' });
+
+    await expect(table.findByPrimaryKey({ id: 1 })).rejects.toThrow();
+    await expect(table.findByPrimaryKey({ id: 2 })).rejects.toThrow();
+    await expect(table.findByPrimaryKey({ id: 3 })).resolves.toEqual(jane);
+}
+
+async function testDeleteItemsByPrimaryKey(records: User[], database: SQLiteDB, table: CoreDatabaseTable<User>) {
+    // Arrange.
+    const john = { id: 1, name: 'John', surname: 'Doe' };
+    const amy = { id: 2, name: 'Amy', surname: 'Doe' };
+
+    records.push(john);
+    records.push(amy);
+
+    await table.initialize();
+
+    // Act.
+    await table.deleteByPrimaryKey({ id: 1 });
+
+    // Assert.
+    expect(database.deleteRecords).toHaveBeenCalledWith('users', { id: 1 });
+
+    await expect(table.findByPrimaryKey({ id: 1 })).rejects.toThrow();
+    await expect(table.findByPrimaryKey({ id: 2 })).resolves.toEqual(amy);
+}
+
 describe('CoreDatabaseTable with eager caching', () => {
 
     let records: User[];
     let database: SQLiteDB;
-    let table: CoreDatabaseTableProxy<User>;
+    let table: CoreDatabaseTable<User>;
 
     beforeEach(() => [records, database, table] = prepareStubs({ cachingStrategy: CoreDatabaseCachingStrategy.Eager }));
 
@@ -83,79 +157,41 @@ describe('CoreDatabaseTable with eager caching', () => {
     });
 
     it('finds items', async () => {
-        const john = { id: 1, name: 'John', surname: 'Doe' };
-        const amy = { id: 2, name: 'Amy', surname: 'Doe' };
-
-        records.push(john);
-        records.push(amy);
-
-        await table.initialize();
-
-        await expect(table.findByPrimaryKey({ id: 1 })).resolves.toEqual(john);
-        await expect(table.findByPrimaryKey({ id: 2 })).resolves.toEqual(amy);
-        await expect(table.find({ surname: 'Doe', name: 'John' })).resolves.toEqual(john);
-        await expect(table.find({ surname: 'Doe', name: 'Amy' })).resolves.toEqual(amy);
+        await testFindItems(records, table);
 
         expect(database.getRecord).not.toHaveBeenCalled();
     });
 
-    it('inserts items', async () => {
-        // Arrange.
-        const john = { id: 1, name: 'John', surname: 'Doe' };
+    it('inserts items', () => testInsertItems(records, database, table));
+    it('deletes items', () => testDeleteItems(records, database, table));
+    it('deletes items by primary key', () => testDeleteItemsByPrimaryKey(records, database, table));
 
+});
+
+describe('CoreDatabaseTable with lazy caching', () => {
+
+    let records: User[];
+    let database: SQLiteDB;
+    let table: CoreDatabaseTable<User>;
+
+    beforeEach(() => [records, database, table] = prepareStubs({ cachingStrategy: CoreDatabaseCachingStrategy.Lazy }));
+
+    it('reads no records on initialization', async () => {
         await table.initialize();
 
-        // Act.
-        await table.insert(john);
-
-        // Assert.
-        expect(database.insertRecord).toHaveBeenCalledWith('users', john);
-
-        await expect(table.findByPrimaryKey({ id: 1 })).resolves.toEqual(john);
+        expect(database.getRecords).not.toHaveBeenCalled();
+        expect(database.getAllRecords).not.toHaveBeenCalled();
     });
 
-    it('deletes items', async () => {
-        // Arrange.
-        const john = { id: 1, name: 'John', surname: 'Doe' };
-        const amy = { id: 2, name: 'Amy', surname: 'Doe' };
-        const jane = { id: 3, name: 'Jane', surname: 'Smith' };
+    it('finds items', async () => {
+        await testFindItems(records, table);
 
-        records.push(john);
-        records.push(amy);
-        records.push(jane);
-
-        await table.initialize();
-
-        // Act.
-        await table.delete({ surname: 'Doe' });
-
-        // Assert.
-        expect(database.deleteRecords).toHaveBeenCalledWith('users', { surname: 'Doe' });
-
-        await expect(table.findByPrimaryKey({ id: 1 })).rejects.toThrow();
-        await expect(table.findByPrimaryKey({ id: 2 })).rejects.toThrow();
-        await expect(table.findByPrimaryKey({ id: 3 })).resolves.toEqual(jane);
+        expect(database.getRecord).toHaveBeenCalledTimes(2);
     });
 
-    it('deletes items by primary key', async () => {
-        // Arrange.
-        const john = { id: 1, name: 'John', surname: 'Doe' };
-        const amy = { id: 2, name: 'Amy', surname: 'Doe' };
-
-        records.push(john);
-        records.push(amy);
-
-        await table.initialize();
-
-        // Act.
-        await table.deleteByPrimaryKey({ id: 1 });
-
-        // Assert.
-        expect(database.deleteRecords).toHaveBeenCalledWith('users', { id: 1 });
-
-        await expect(table.findByPrimaryKey({ id: 1 })).rejects.toThrow();
-        await expect(table.findByPrimaryKey({ id: 2 })).resolves.toEqual(amy);
-    });
+    it('inserts items', () => testInsertItems(records, database, table));
+    it('deletes items', () => testDeleteItems(records, database, table));
+    it('deletes items by primary key', () => testDeleteItemsByPrimaryKey(records, database, table));
 
 });
 
@@ -163,7 +199,7 @@ describe('CoreDatabaseTable with no caching', () => {
 
     let records: User[];
     let database: SQLiteDB;
-    let table: CoreDatabaseTableProxy<User>;
+    let table: CoreDatabaseTable<User>;
 
     beforeEach(() => [records, database, table] = prepareStubs({ cachingStrategy: CoreDatabaseCachingStrategy.None }));
 
@@ -175,78 +211,13 @@ describe('CoreDatabaseTable with no caching', () => {
     });
 
     it('finds items', async () => {
-        const john = { id: 1, name: 'John', surname: 'Doe' };
-        const amy = { id: 2, name: 'Amy', surname: 'Doe' };
-
-        records.push(john);
-        records.push(amy);
-
-        await table.initialize();
-
-        await expect(table.findByPrimaryKey({ id: 1 })).resolves.toEqual(john);
-        await expect(table.findByPrimaryKey({ id: 2 })).resolves.toEqual(amy);
-        await expect(table.find({ surname: 'Doe', name: 'John' })).resolves.toEqual(john);
-        await expect(table.find({ surname: 'Doe', name: 'Amy' })).resolves.toEqual(amy);
+        await testFindItems(records, table);
 
         expect(database.getRecord).toHaveBeenCalledTimes(4);
     });
 
-    it('inserts items', async () => {
-        // Arrange.
-        const john = { id: 1, name: 'John', surname: 'Doe' };
-
-        await table.initialize();
-
-        // Act.
-        await table.insert(john);
-
-        // Assert.
-        expect(database.insertRecord).toHaveBeenCalledWith('users', john);
-
-        await expect(table.findByPrimaryKey({ id: 1 })).resolves.toEqual(john);
-    });
-
-    it('deletes items', async () => {
-        // Arrange.
-        const john = { id: 1, name: 'John', surname: 'Doe' };
-        const amy = { id: 2, name: 'Amy', surname: 'Doe' };
-        const jane = { id: 3, name: 'Jane', surname: 'Smith' };
-
-        records.push(john);
-        records.push(amy);
-        records.push(jane);
-
-        await table.initialize();
-
-        // Act.
-        await table.delete({ surname: 'Doe' });
-
-        // Assert.
-        expect(database.deleteRecords).toHaveBeenCalledWith('users', { surname: 'Doe' });
-
-        await expect(table.findByPrimaryKey({ id: 1 })).rejects.toThrow();
-        await expect(table.findByPrimaryKey({ id: 2 })).rejects.toThrow();
-        await expect(table.findByPrimaryKey({ id: 3 })).resolves.toEqual(jane);
-    });
-
-    it('deletes items by primary key', async () => {
-        // Arrange.
-        const john = { id: 1, name: 'John', surname: 'Doe' };
-        const amy = { id: 2, name: 'Amy', surname: 'Doe' };
-
-        records.push(john);
-        records.push(amy);
-
-        await table.initialize();
-
-        // Act.
-        await table.deleteByPrimaryKey({ id: 1 });
-
-        // Assert.
-        expect(database.deleteRecords).toHaveBeenCalledWith('users', { id: 1 });
-
-        await expect(table.findByPrimaryKey({ id: 1 })).rejects.toThrow();
-        await expect(table.findByPrimaryKey({ id: 2 })).resolves.toEqual(amy);
-    });
+    it('inserts items', () => testInsertItems(records, database, table));
+    it('deletes items', () => testDeleteItems(records, database, table));
+    it('deletes items by primary key', () => testDeleteItemsByPrimaryKey(records, database, table));
 
 });
diff --git a/src/core/services/filepool.ts b/src/core/services/filepool.ts
index 99d5ea855..e3f5bab52 100644
--- a/src/core/services/filepool.ts
+++ b/src/core/services/filepool.ts
@@ -48,6 +48,9 @@ import {
 } from '@services/database/filepool';
 import { CoreFileHelper } from './file-helper';
 import { CoreUrl } from '@singletons/url';
+import { CorePromisedValue } from '@classes/promised-value';
+import { CoreDatabaseTable } from '@classes/database/database-table';
+import { CoreDatabaseCachingStrategy, CoreDatabaseTableProxy } from '@classes/database/database-table-proxy';
 
 /*
  * Factory for handling downloading files and retrieve downloaded files.
@@ -72,9 +75,13 @@ export class CoreFilepoolProvider {
     protected static readonly ERR_FS_OR_NETWORK_UNAVAILABLE = 'CoreFilepoolError:ERR_FS_OR_NETWORK_UNAVAILABLE';
     protected static readonly ERR_QUEUE_ON_PAUSE = 'CoreFilepoolError:ERR_QUEUE_ON_PAUSE';
 
-    protected static readonly FILE_UPDATE_UNKNOWN_WHERE_CLAUSE =
+    protected static readonly FILE_IS_UNKNOWN_SQL =
         'isexternalfile = 1 OR ((revision IS NULL OR revision = 0) AND (timemodified IS NULL OR timemodified = 0))';
 
+    protected static readonly FILE_IS_UNKNOWN_JS =
+        ({ isexternalfile, revision, timemodified }: CoreFilepoolFileEntry): boolean =>
+            isexternalfile === 1 || ((revision === null || revision === 0) && (timemodified === null || timemodified === 0));
+
     protected logger: CoreLogger;
     protected queueState = CoreFilepoolProvider.QUEUE_PAUSED;
     protected urlAttributes: RegExp[] = [
@@ -94,6 +101,7 @@ export class CoreFilepoolProvider {
     // Variables for DB.
     protected appDB: Promise<SQLiteDB>;
     protected resolveAppDB!: (appDB: SQLiteDB) => void;
+    protected filesTables: Record<string, CorePromisedValue<CoreDatabaseTable<CoreFilepoolFileEntry, 'fileId'>>> = {};
 
     constructor() {
         this.appDB = new Promise(resolve => this.resolveAppDB = resolve);
@@ -114,6 +122,18 @@ export class CoreFilepoolProvider {
                 NgZone.run(() => this.checkQueueProcessing());
             });
         });
+
+        CoreEvents.on(CoreEvents.SITE_DELETED, async ({ siteId }) => {
+            if (!siteId || !(siteId in this.filesTables)) {
+                return;
+            }
+
+            const filesTable = await this.filesTables[siteId];
+
+            delete this.filesTables[siteId];
+
+            await filesTable.destroy();
+        });
     }
 
     /**
@@ -129,6 +149,33 @@ export class CoreFilepoolProvider {
         this.resolveAppDB(CoreApp.getDB());
     }
 
+    /**
+     * Get files table.
+     *
+     * @param siteId Site id.
+     * @returns Files table.
+     */
+    async getFilesTable(siteId?: string): Promise<CoreDatabaseTable<CoreFilepoolFileEntry, 'fileId'>> {
+        siteId = siteId ?? CoreSites.getCurrentSiteId();
+
+        if (!(siteId in this.filesTables)) {
+            const filesTable = this.filesTables[siteId] = new CorePromisedValue();
+            const database = await CoreSites.getSiteDb(siteId);
+            const table = new CoreDatabaseTableProxy<CoreFilepoolFileEntry, 'fileId'>(
+                { cachingStrategy: CoreDatabaseCachingStrategy.Lazy },
+                database,
+                FILES_TABLE_NAME,
+                ['fileId'],
+            );
+
+            await table.initialize();
+
+            filesTable.resolve(table);
+        }
+
+        return this.filesTables[siteId];
+    }
+
     /**
      * Link a file with a component.
      *
@@ -215,9 +262,9 @@ export class CoreFilepoolProvider {
             ...data,
         };
 
-        const db = await CoreSites.getSiteDb(siteId);
+        const filesTable = await this.getFilesTable(siteId);
 
-        await db.insertRecord(FILES_TABLE_NAME, record);
+        await filesTable.insert(record);
     }
 
     /**
@@ -558,13 +605,14 @@ export class CoreFilepoolProvider {
      */
     async clearFilepool(siteId: string): Promise<void> {
         const db = await CoreSites.getSiteDb(siteId);
+        const filesTable = await this.getFilesTable(siteId);
 
         // Read the data first to be able to notify the deletions.
-        const filesEntries = await db.getAllRecords<CoreFilepoolFileEntry>(FILES_TABLE_NAME);
+        const filesEntries = await filesTable.all();
         const filesLinks = await db.getAllRecords<CoreFilepoolLinksRecord>(LINKS_TABLE_NAME);
 
         await Promise.all([
-            db.deleteRecords(FILES_TABLE_NAME),
+            filesTable.delete(),
             db.deleteRecords(LINKS_TABLE_NAME),
         ]);
 
@@ -1119,13 +1167,14 @@ export class CoreFilepoolProvider {
         }
 
         const db = await CoreSites.getSiteDb(siteId);
+        const filesTable = await this.getFilesTable(siteId);
         const extension = CoreMimetypeUtils.getFileExtension(entry.path);
         if (!extension) {
             // Files does not have extension. Invalidate file (stale = true).
             // Minor problem: file will remain in the filesystem once downloaded again.
             this.logger.debug('Staled file with no extension ' + entry.fileId);
 
-            await db.updateRecords(FILES_TABLE_NAME, { stale: 1 }, { fileId: entry.fileId });
+            await filesTable.update({ stale: 1 }, { fileId: entry.fileId });
 
             return;
         }
@@ -1135,7 +1184,7 @@ export class CoreFilepoolProvider {
         entry.fileId = CoreMimetypeUtils.removeExtension(fileId);
         entry.extension = extension;
 
-        await db.updateRecords(FILES_TABLE_NAME, entry, { fileId });
+        await filesTable.update(entry, { fileId });
         if (entry.fileId == fileId) {
             // File ID hasn't changed, we're done.
             this.logger.debug('Removed extesion ' + extension + ' from file ' + entry.fileId);
@@ -1396,15 +1445,13 @@ export class CoreFilepoolProvider {
      */
     async getFilesByComponent(siteId: string, component: string, componentId?: string | number): Promise<CoreFilepoolFileEntry[]> {
         const db = await CoreSites.getSiteDb(siteId);
+        const filesTable = await this.getFilesTable(siteId);
         const items = await this.getComponentFiles(db, component, componentId);
         const files: CoreFilepoolFileEntry[] = [];
 
         await Promise.all(items.map(async (item) => {
             try {
-                const fileEntry = await db.getRecord<CoreFilepoolFileEntry>(
-                    FILES_TABLE_NAME,
-                    { fileId: item.fileId },
-                );
+                const fileEntry = await filesTable.findByPrimaryKey({ fileId: item.fileId });
 
                 if (!fileEntry) {
                     return;
@@ -2137,14 +2184,9 @@ export class CoreFilepoolProvider {
      * @return Resolved with file object from DB on success, rejected otherwise.
      */
     protected async hasFileInPool(siteId: string, fileId: string): Promise<CoreFilepoolFileEntry> {
-        const db = await CoreSites.getSiteDb(siteId);
-        const entry = await db.getRecord<CoreFilepoolFileEntry>(FILES_TABLE_NAME, { fileId });
+        const filesTable = await this.getFilesTable(siteId);
 
-        if (entry === undefined) {
-            throw new CoreError('File not found in filepool.');
-        }
-
-        return entry;
+        return filesTable.findByPrimaryKey({ fileId });
     }
 
     /**
@@ -2176,11 +2218,17 @@ export class CoreFilepoolProvider {
      * @return Resolved on success.
      */
     async invalidateAllFiles(siteId: string, onlyUnknown: boolean = true): Promise<void> {
-        const db = await CoreSites.getSiteDb(siteId);
+        const filesTable = await this.getFilesTable(siteId);
 
-        const where = onlyUnknown ? CoreFilepoolProvider.FILE_UPDATE_UNKNOWN_WHERE_CLAUSE : undefined;
-
-        await db.updateRecordsWhere(FILES_TABLE_NAME, { stale: 1 }, where);
+        onlyUnknown
+            ? await filesTable.updateWhere(
+                { stale: 1 },
+                {
+                    sql: CoreFilepoolProvider.FILE_IS_UNKNOWN_SQL,
+                    js: CoreFilepoolProvider.FILE_IS_UNKNOWN_JS,
+                },
+            )
+            : await filesTable.update({ stale: 1 });
     }
 
     /**
@@ -2199,9 +2247,9 @@ export class CoreFilepoolProvider {
         const file = await this.fixPluginfileURL(siteId, fileUrl);
         const fileId = this.getFileIdByUrl(CoreFileHelper.getFileUrl(file));
 
-        const db = await CoreSites.getSiteDb(siteId);
+        const filesTable = await this.getFilesTable(siteId);
 
-        await db.updateRecords(FILES_TABLE_NAME, { stale: 1 }, { fileId });
+        await filesTable.update({ stale: 1 }, { fileId });
     }
 
     /**
@@ -2221,7 +2269,7 @@ export class CoreFilepoolProvider {
         onlyUnknown: boolean = true,
     ): Promise<void> {
         const db = await CoreSites.getSiteDb(siteId);
-
+        const filesTable = await this.getFilesTable(siteId);
         const items = await this.getComponentFiles(db, component, componentId);
 
         if (!items.length) {
@@ -2236,10 +2284,19 @@ export class CoreFilepoolProvider {
         whereAndParams.sql = 'fileId ' + whereAndParams.sql;
 
         if (onlyUnknown) {
-            whereAndParams.sql += ' AND (' + CoreFilepoolProvider.FILE_UPDATE_UNKNOWN_WHERE_CLAUSE + ')';
+            whereAndParams.sql += ' AND (' + CoreFilepoolProvider.FILE_IS_UNKNOWN_SQL + ')';
         }
 
-        await db.updateRecordsWhere(FILES_TABLE_NAME, { stale: 1 }, whereAndParams.sql, whereAndParams.params);
+        await filesTable.updateWhere(
+            { stale: 1 },
+            {
+                sql: whereAndParams.sql,
+                sqlParams: whereAndParams.params,
+                js: record => fileIds.includes(record.fileId) && (
+                    !onlyUnknown || CoreFilepoolProvider.FILE_IS_UNKNOWN_JS(record)
+                ),
+            },
+        );
     }
 
     /**
@@ -2657,6 +2714,8 @@ export class CoreFilepoolProvider {
      */
     protected async removeFileById(siteId: string, fileId: string): Promise<void> {
         const db = await CoreSites.getSiteDb(siteId);
+        const filesTable = await this.getFilesTable(siteId);
+
         // Get the path to the file first since it relies on the file object stored in the pool.
         // Don't use getFilePath to prevent performing 2 DB requests.
         let path = this.getFilepoolFolderPath(siteId) + '/' + fileId;
@@ -2682,7 +2741,7 @@ export class CoreFilepoolProvider {
         const promises: Promise<unknown>[] = [];
 
         // Remove entry from filepool store.
-        promises.push(db.deleteRecords(FILES_TABLE_NAME, conditions));
+        promises.push(filesTable.delete(conditions));
 
         // Remove links.
         promises.push(db.deleteRecords(LINKS_TABLE_NAME, conditions));

From fdd5d5d8a56c08a72bc9c337535d6dadb97e02c9 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 3 Feb 2022 13:24:48 +0100
Subject: [PATCH 0459/1008] MOBILE-3833 performance: Sort tests in summary

---
 scripts/print-performance-measures.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/scripts/print-performance-measures.js b/scripts/print-performance-measures.js
index 2b611be01..24019b117 100755
--- a/scripts/print-performance-measures.js
+++ b/scripts/print-performance-measures.js
@@ -75,5 +75,13 @@ for (const [name, { duration, scripting, styling, blocking, longTasks, database,
     };
 }
 
+// Sort tests
+const tests = Object.keys(performanceMeasures).sort();
+const sortedPerformanceMeasures = {};
+
+for (const test of tests) {
+    sortedPerformanceMeasures[test] = performanceMeasures[test];
+}
+
 // Display data
-console.table(performanceMeasures);
+console.table(sortedPerformanceMeasures);

From effe53807a95fd70f17b6dfcfdae94c9bd2f8761 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 3 Feb 2022 13:26:42 +0100
Subject: [PATCH 0460/1008] MOBILE-3977 db: Implement method to log history

---
 src/core/services/db.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/core/services/db.ts b/src/core/services/db.ts
index 727b5424d..489d44072 100644
--- a/src/core/services/db.ts
+++ b/src/core/services/db.ts
@@ -38,6 +38,17 @@ export class CoreDbProvider {
         return CoreAppProvider.isAutomated();
     }
 
+    /**
+     * Print query history in console.
+     */
+    printHistory(): void {
+        const substituteParams = ({ sql, params }: CoreDbQueryLog) =>
+            Object.values(params ?? []).reduce((sql: string, param: string) => sql.replace('?', param), sql);
+
+        // eslint-disable-next-line no-console
+        console.log(this.queryLogs.map(substituteParams).join('\n'));
+    }
+
     /**
      * Log a query.
      *

From a65919debce177d989791e012aba8103b0b31f3d Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 3 Feb 2022 13:35:01 +0100
Subject: [PATCH 0461/1008] MOBILE-3977 config: Add database optimizations

---
 .../classes/database/database-table-proxy.ts  | 50 +++++++++++++++++--
 src/core/classes/promised-value.ts            | 10 ++++
 src/core/constants.ts                         | 17 -------
 src/core/services/config.ts                   | 46 +++++++++++++++++
 src/types/config.d.ts                         |  3 ++
 5 files changed, 105 insertions(+), 21 deletions(-)

diff --git a/src/core/classes/database/database-table-proxy.ts b/src/core/classes/database/database-table-proxy.ts
index 393e07ac4..ef7e50b35 100644
--- a/src/core/classes/database/database-table-proxy.ts
+++ b/src/core/classes/database/database-table-proxy.ts
@@ -12,8 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { CoreConstants } from '@/core/constants';
 import { CorePromisedValue } from '@classes/promised-value';
 import { SQLiteDB, SQLiteDBRecordValues } from '@classes/sqlitedb';
+import { CoreConfigProvider } from '@services/config';
+import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreDatabaseReducer, CoreDatabaseTable, CoreDatabaseConditions, GetDBRecordPrimaryKey } from './database-table';
 import { CoreEagerDatabaseTable } from './eager-database-table';
 import { CoreLazyDatabaseTable } from './lazy-database-table';
@@ -31,6 +34,7 @@ export class CoreDatabaseTableProxy<
 
     protected config: CoreDatabaseConfiguration;
     protected target: CorePromisedValue<CoreDatabaseTable<DBRecord, PrimaryKeyColumn>> = new CorePromisedValue();
+    protected environmentObserver?: CoreEventObserver;
 
     constructor(
         config: Partial<CoreDatabaseConfiguration>,
@@ -47,11 +51,16 @@ export class CoreDatabaseTableProxy<
      * @inheritdoc
      */
     async initialize(): Promise<void> {
-        const target = this.createTarget();
+        this.environmentObserver = CoreEvents.on(CoreConfigProvider.ENVIRONMENT_UPDATED, () => this.updateTarget());
 
-        await target.initialize();
+        await this.updateTarget();
+    }
 
-        this.target.resolve(target);
+    /**
+     * @inheritdoc
+     */
+    async destroy(): Promise<void> {
+        this.environmentObserver?.off();
     }
 
     /**
@@ -146,13 +155,46 @@ export class CoreDatabaseTableProxy<
         };
     }
 
+    /**
+     * Get database configuration to use at runtime.
+     *
+     * @returns Database configuration.
+     */
+    protected getRuntimeConfig(): CoreDatabaseConfiguration {
+        return {
+            ...this.config,
+            ...CoreConstants.CONFIG.databaseOptimizations,
+            ...CoreConstants.CONFIG.databaseTableOptimizations?.[this.tableName],
+        };
+    }
+
+    /**
+     * Update underlying target instance.
+     */
+    protected async updateTarget(): Promise<void> {
+        const oldTarget = this.target.value;
+        const newTarget = this.createTarget();
+
+        if (oldTarget) {
+            await oldTarget.destroy();
+
+            this.target.reset();
+        }
+
+        await newTarget.initialize();
+
+        this.target.resolve(newTarget);
+    }
+
     /**
      * Create proxy target.
      *
      * @returns Target instance.
      */
     protected createTarget(): CoreDatabaseTable<DBRecord, PrimaryKeyColumn> {
-        return this.createTable(this.config.cachingStrategy);
+        const config = this.getRuntimeConfig();
+
+        return this.createTable(config.cachingStrategy);
     }
 
     /**
diff --git a/src/core/classes/promised-value.ts b/src/core/classes/promised-value.ts
index ae7bbbdec..16051be37 100644
--- a/src/core/classes/promised-value.ts
+++ b/src/core/classes/promised-value.ts
@@ -134,6 +134,16 @@ export class CorePromisedValue<T = unknown> implements Promise<T> {
         this._reject(reason);
     }
 
+    /**
+     * Reset status and value.
+     */
+    reset(): void {
+        delete this._resolvedValue;
+        delete this._rejectedReason;
+
+        this.initPromise();
+    }
+
     /**
      * Initialize the promise and the callbacks.
      */
diff --git a/src/core/constants.ts b/src/core/constants.ts
index 2c238261b..b83e896a8 100644
--- a/src/core/constants.ts
+++ b/src/core/constants.ts
@@ -145,23 +145,6 @@ export class CoreConstants {
     static readonly CONFIG = { ...envJson.config } as unknown as EnvironmentConfig; // Data parsed from config.json files.
     static readonly BUILD = envJson.build as unknown as EnvironmentBuild; // Build info.
 
-    /**
-     * Update config with the given values.
-     *
-     * @param config Config updates.
-     */
-    static patchConfig(config: Partial<EnvironmentConfig>): void {
-        Object.assign(this.CONFIG, config);
-    }
-
-    /**
-     * Reset config values to its original state.
-     */
-    static resetConfig(): void {
-        Object.keys(this.CONFIG).forEach(key => delete this.CONFIG[key]);
-        Object.assign(this.CONFIG, envJson.config);
-    }
-
 }
 
 interface EnvironmentBuild {
diff --git a/src/core/services/config.ts b/src/core/services/config.ts
index 7b52fcd3e..d804535f1 100644
--- a/src/core/services/config.ts
+++ b/src/core/services/config.ts
@@ -12,14 +12,30 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { EnvironmentConfig } from '@/types/config';
 import { Injectable } from '@angular/core';
 import { CoreDatabaseCachingStrategy, CoreDatabaseTableProxy } from '@classes/database/database-table-proxy';
 import { CoreApp } from '@services/app';
 import { APP_SCHEMA, ConfigDBEntry, CONFIG_TABLE_NAME } from '@services/database/config';
 import { makeSingleton } from '@singletons';
+import { CoreConstants } from '../constants';
+import { CoreEvents } from '@singletons/events';
 import { CoreDatabaseTable } from '@classes/database/database-table';
 import { CorePromisedValue } from '@classes/promised-value';
 
+declare module '@singletons/events' {
+
+    /**
+     * Augment CoreEventsData interface with events specific to this service.
+     *
+     * @see https://www.typescriptlang.org/docs/handbook/declaration-merging.html#module-augmentation
+     */
+    export interface CoreEventsData {
+        [CoreConfigProvider.ENVIRONMENT_UPDATED]: EnvironmentConfig;
+    }
+
+}
+
 /**
  * Factory to provide access to dynamic and permanent config and settings.
  * It should not be abused into a temporary storage.
@@ -27,7 +43,10 @@ import { CorePromisedValue } from '@classes/promised-value';
 @Injectable({ providedIn: 'root' })
 export class CoreConfigProvider {
 
+    static readonly ENVIRONMENT_UPDATED = 'environment_updated';
+
     protected table: CorePromisedValue<CoreDatabaseTable<ConfigDBEntry, 'name'>> = new CorePromisedValue();
+    protected defaultEnvironment?: EnvironmentConfig;
 
     /**
      * Initialize database.
@@ -98,6 +117,33 @@ export class CoreConfigProvider {
         await table.insert({ name, value });
     }
 
+    /**
+     * Update config with the given values.
+     *
+     * @param config Config updates.
+     */
+    patchEnvironment(config: Partial<EnvironmentConfig>): void {
+        this.defaultEnvironment = this.defaultEnvironment ?? CoreConstants.CONFIG;
+
+        Object.assign(CoreConstants.CONFIG, config);
+        CoreEvents.trigger(CoreConfigProvider.ENVIRONMENT_UPDATED, CoreConstants.CONFIG);
+    }
+
+    /**
+     * Reset config values to its original state.
+     */
+    resetEnvironment(): void {
+        if (!this.defaultEnvironment) {
+            // The environment config hasn't been modified; there's not need to reset.
+
+            return;
+        }
+
+        Object.keys(CoreConstants.CONFIG).forEach(key => delete CoreConstants.CONFIG[key]);
+        Object.assign(CoreConstants.CONFIG, this.defaultEnvironment);
+        CoreEvents.trigger(CoreConfigProvider.ENVIRONMENT_UPDATED, CoreConstants.CONFIG);
+    }
+
 }
 
 export const CoreConfig = makeSingleton(CoreConfigProvider);
diff --git a/src/types/config.d.ts b/src/types/config.d.ts
index c5627bc99..c8fa468bc 100644
--- a/src/types/config.d.ts
+++ b/src/types/config.d.ts
@@ -17,6 +17,7 @@ import { CoreMainMenuLocalizedCustomItem } from '@features/mainmenu/services/mai
 import { CoreSitesDemoSiteData } from '@services/sites';
 import { OpenFileAction } from '@services/utils/utils';
 import { CoreLoginSiteSelectorListMethod } from '@features/login/services/login-helper';
+import { CoreDatabaseConfiguration } from '@classes/database/database-table-proxy';
 
 /* eslint-disable @typescript-eslint/naming-convention */
 
@@ -31,6 +32,8 @@ export interface EnvironmentConfig {
     cache_update_frequency_rarely: number;
     default_lang: string;
     languages: Record<string, string>;
+    databaseOptimizations?: Partial<CoreDatabaseConfiguration>;
+    databaseTableOptimizations?: Record<string, Partial<CoreDatabaseConfiguration>>;
     wsservice: string;
     demo_sites: Record<string, CoreSitesDemoSiteData>;
     zoomlevels: Record<CoreZoomLevel, number>;

From 7a1dfa38bd7ac6e2a0475c804f903e87ef554db0 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 3 Feb 2022 13:43:10 +0100
Subject: [PATCH 0462/1008] MOBILE-3977 core: Optimize wscache table

---
 src/core/classes/site.ts                     | 88 ++++++++++----------
 src/core/initializers/initialize-services.ts |  2 +
 src/core/services/sites.ts                   | 49 +++++++++++
 3 files changed, 95 insertions(+), 44 deletions(-)

diff --git a/src/core/classes/site.ts b/src/core/classes/site.ts
index dc702baf9..3182f60ff 100644
--- a/src/core/classes/site.ts
+++ b/src/core/classes/site.ts
@@ -41,6 +41,7 @@ import { CoreLogger } from '@singletons/logger';
 import { Translate } from '@singletons';
 import { CoreIonLoadingElement } from './ion-loading';
 import { CoreLang } from '@services/lang';
+import { CoreSites } from '@services/sites';
 
 /**
  * QR Code type enumeration.
@@ -920,20 +921,20 @@ export class CoreSite {
         preSets: CoreSiteWSPreSets,
         emergency?: boolean,
     ): Promise<T> {
-        const db = this.db;
-        if (!db || !preSets.getFromCache) {
+        if (!this.db || !preSets.getFromCache) {
             throw new CoreError('Get from cache is disabled.');
         }
 
         const id = this.getCacheId(method, data);
+        const cacheTable = await CoreSites.getCacheTable(this);
         let entry: CoreSiteWSCacheRecord | undefined;
 
         if (preSets.getCacheUsingCacheKey || (emergency && preSets.getEmergencyCacheUsingCacheKey)) {
-            const entries = await db.getRecords<CoreSiteWSCacheRecord>(CoreSite.WS_CACHE_TABLE, { key: preSets.cacheKey });
+            const entries = await cacheTable.all({ key: preSets.cacheKey });
 
             if (!entries.length) {
                 // Cache key not found, get by params sent.
-                entry = await db.getRecord(CoreSite.WS_CACHE_TABLE, { id });
+                entry = await cacheTable.findByPrimaryKey({ id });
             } else {
                 if (entries.length > 1) {
                     // More than one entry found. Search the one with same ID as this call.
@@ -945,7 +946,7 @@ export class CoreSite {
                 }
             }
         } else {
-            entry = await db.getRecord(CoreSite.WS_CACHE_TABLE, { id });
+            entry = await cacheTable.findByPrimaryKey({ id });
         }
 
         if (entry === undefined) {
@@ -990,18 +991,25 @@ export class CoreSite {
      */
     async getComponentCacheSize(component: string, componentId?: number): Promise<number> {
         const params: Array<string | number> = [component];
+        const cacheTable = await CoreSites.getCacheTable(this);
         let extraClause = '';
         if (componentId !== undefined && componentId !== null) {
             params.push(componentId);
             extraClause = ' AND componentId = ?';
         }
 
-        const size = <number> await this.getDb().getFieldSql(
-            'SELECT SUM(length(data)) FROM ' + CoreSite.WS_CACHE_TABLE + ' WHERE component = ?' + extraClause,
-            params,
+        return cacheTable.reduce(
+            {
+                sql: 'SUM(length(data))',
+                js: (size, record) => size + record.data.length,
+                jsInitialValue: 0,
+            },
+            {
+                sql: 'WHERE component = ?' + extraClause,
+                sqlParams: params,
+                js: record => record.component === component && (params.length === 1 || record.componentId === componentId),
+            },
         );
-
-        return size;
     }
 
     /**
@@ -1015,10 +1023,6 @@ export class CoreSite {
      */
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     protected async saveToCache(method: string, data: any, response: any, preSets: CoreSiteWSPreSets): Promise<void> {
-        if (!this.db) {
-            throw new CoreError('Site DB not initialized.');
-        }
-
         if (preSets.uniqueCacheKey) {
             // Cache key must be unique, delete all entries with same cache key.
             await CoreUtils.ignoreErrors(this.deleteFromCache(method, data, preSets, true));
@@ -1027,6 +1031,7 @@ export class CoreSite {
         // Since 3.7, the expiration time contains the time the entry is modified instead of the expiration time.
         // We decided to reuse this field to prevent modifying the database table.
         const id = this.getCacheId(method, data);
+        const cacheTable = await CoreSites.getCacheTable(this);
         const entry = {
             id,
             data: JSON.stringify(response),
@@ -1044,7 +1049,7 @@ export class CoreSite {
             }
         }
 
-        await this.db.insertRecord(CoreSite.WS_CACHE_TABLE, entry);
+        await cacheTable.insert(entry);
     }
 
     /**
@@ -1058,16 +1063,13 @@ export class CoreSite {
      */
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     protected async deleteFromCache(method: string, data: any, preSets: CoreSiteWSPreSets, allCacheKey?: boolean): Promise<void> {
-        if (!this.db) {
-            throw new CoreError('Site DB not initialized.');
-        }
-
         const id = this.getCacheId(method, data);
+        const cacheTable = await CoreSites.getCacheTable(this);
 
         if (allCacheKey) {
-            await this.db.deleteRecords(CoreSite.WS_CACHE_TABLE, { key: preSets.cacheKey });
+            await cacheTable.delete({ key: preSets.cacheKey });
         } else {
-            await this.db.deleteRecords(CoreSite.WS_CACHE_TABLE, { id });
+            await cacheTable.deleteByPrimaryKey({ id });
         }
     }
 
@@ -1084,18 +1086,14 @@ export class CoreSite {
             return;
         }
 
-        if (!this.db) {
-            throw new CoreError('Site DB not initialized');
-        }
+        const params = { component };
+        const cacheTable = await CoreSites.getCacheTable(this);
 
-        const params = {
-            component,
-        };
         if (componentId) {
             params['componentId'] = componentId;
         }
 
-        await this.db.deleteRecords(CoreSite.WS_CACHE_TABLE, params);
+        await cacheTable.delete(params);
     }
 
     /*
@@ -1127,14 +1125,12 @@ export class CoreSite {
      * @return Promise resolved when the cache entries are invalidated.
      */
     async invalidateWsCache(): Promise<void> {
-        if (!this.db) {
-            throw new CoreError('Site DB not initialized');
-        }
-
         this.logger.debug('Invalidate all the cache for site: ' + this.id);
 
         try {
-            await this.db.updateRecords(CoreSite.WS_CACHE_TABLE, { expirationTime: 0 });
+            const cacheTable = await CoreSites.getCacheTable(this);
+
+            await cacheTable.update({ expirationTime: 0 });
         } finally {
             CoreEvents.trigger(CoreEvents.WS_CACHE_INVALIDATED, {}, this.getId());
         }
@@ -1147,16 +1143,15 @@ export class CoreSite {
      * @return Promise resolved when the cache entries are invalidated.
      */
     async invalidateWsCacheForKey(key: string): Promise<void> {
-        if (!this.db) {
-            throw new CoreError('Site DB not initialized');
-        }
         if (!key) {
             return;
         }
 
         this.logger.debug('Invalidate cache for key: ' + key);
 
-        await this.db.updateRecords(CoreSite.WS_CACHE_TABLE, { expirationTime: 0 }, { key });
+        const cacheTable = await CoreSites.getCacheTable(this);
+
+        await cacheTable.update({ expirationTime: 0 }, { key });
     }
 
     /**
@@ -1184,18 +1179,19 @@ export class CoreSite {
      * @return Promise resolved when the cache entries are invalidated.
      */
     async invalidateWsCacheForKeyStartingWith(key: string): Promise<void> {
-        if (!this.db) {
-            throw new CoreError('Site DB not initialized');
-        }
         if (!key) {
             return;
         }
 
         this.logger.debug('Invalidate cache for key starting with: ' + key);
 
-        const sql = 'UPDATE ' + CoreSite.WS_CACHE_TABLE + ' SET expirationTime=0 WHERE key LIKE ?';
+        const cacheTable = await CoreSites.getCacheTable(this);
 
-        await this.db.execute(sql, [key + '%']);
+        await cacheTable.updateWhere({ expirationTime: 0 }, {
+            sql: 'key LIKE ?',
+            sqlParams: [key],
+            js: record => !!record.key?.startsWith(key),
+        });
     }
 
     /**
@@ -1270,9 +1266,13 @@ export class CoreSite {
      * @return Promise resolved with the total size of all data in the cache table (bytes)
      */
     async getCacheUsage(): Promise<number> {
-        const size = <number> await this.getDb().getFieldSql('SELECT SUM(length(data)) FROM ' + CoreSite.WS_CACHE_TABLE);
+        const cacheTable = await CoreSites.getCacheTable(this);
 
-        return size;
+        return cacheTable.reduce({
+            sql: 'SUM(length(data))',
+            js: (size, record) => size + record.data.length,
+            jsInitialValue: 0,
+        });
     }
 
     /**
diff --git a/src/core/initializers/initialize-services.ts b/src/core/initializers/initialize-services.ts
index bef39b3a1..6b172b93c 100644
--- a/src/core/initializers/initialize-services.ts
+++ b/src/core/initializers/initialize-services.ts
@@ -15,11 +15,13 @@
 import { CoreFilepool } from '@services/filepool';
 import { CoreLang } from '@services/lang';
 import { CoreLocalNotifications } from '@services/local-notifications';
+import { CoreSites } from '@services/sites';
 import { CoreUpdateManager } from '@services/update-manager';
 
 export default async function(): Promise<void> {
     await Promise.all([
         CoreFilepool.initialize(),
+        CoreSites.initialize(),
         CoreLang.initialize(),
         CoreLocalNotifications.initialize(),
         CoreUpdateManager.initialize(),
diff --git a/src/core/services/sites.ts b/src/core/services/sites.ts
index c20644f22..9de9c1998 100644
--- a/src/core/services/sites.ts
+++ b/src/core/services/sites.ts
@@ -31,6 +31,7 @@ import {
     CoreSiteConfig,
     CoreSitePublicConfigResponse,
     CoreSiteInfoResponse,
+    CoreSiteWSCacheRecord,
 } from '@classes/site';
 import { SQLiteDB, SQLiteDBTableSchema } from '@classes/sqlitedb';
 import { CoreError } from '@classes/errors/error';
@@ -57,6 +58,9 @@ import { CoreErrorWithTitle } from '@classes/errors/errorwithtitle';
 import { CoreAjaxError } from '@classes/errors/ajaxerror';
 import { CoreAjaxWSError } from '@classes/errors/ajaxwserror';
 import { CoreSitePlugins } from '@features/siteplugins/services/siteplugins';
+import { CorePromisedValue } from '@classes/promised-value';
+import { CoreDatabaseTable } from '@classes/database/database-table';
+import { CoreDatabaseCachingStrategy, CoreDatabaseTableProxy } from '@classes/database/database-table-proxy';
 
 export const CORE_SITE_SCHEMAS = new InjectionToken<CoreSiteSchema[]>('CORE_SITE_SCHEMAS');
 
@@ -85,6 +89,7 @@ export class CoreSitesProvider {
     // Variables for DB.
     protected appDB: Promise<SQLiteDB>;
     protected resolveAppDB!: (appDB: SQLiteDB) => void;
+    protected cacheTables: Record<string, CorePromisedValue<CoreDatabaseTable<CoreSiteWSCacheRecord>>> = {};
 
     constructor(@Optional() @Inject(CORE_SITE_SCHEMAS) siteSchemas: CoreSiteSchema[][] = []) {
         this.appDB = new Promise(resolve => this.resolveAppDB = resolve);
@@ -99,6 +104,23 @@ export class CoreSitesProvider {
         );
     }
 
+    /**
+     * Initialize.
+     */
+    initialize(): void {
+        CoreEvents.on(CoreEvents.SITE_DELETED, async ({ siteId }) => {
+            if (!siteId || !(siteId in this.cacheTables)) {
+                return;
+            }
+
+            const cacheTable = await this.cacheTables[siteId];
+
+            delete this.cacheTables[siteId];
+
+            await cacheTable.destroy();
+        });
+    }
+
     /**
      * Initialize database.
      */
@@ -112,6 +134,33 @@ export class CoreSitesProvider {
         this.resolveAppDB(CoreApp.getDB());
     }
 
+    /**
+     * Get cache table.
+     *
+     * @param siteId Site id.
+     * @returns cache table.
+     */
+    async getCacheTable(site: CoreSite): Promise<CoreDatabaseTable<CoreSiteWSCacheRecord>> {
+        if (!site.id) {
+            throw new CoreError('Can\'t get cache table for site without id');
+        }
+
+        if (!(site.id in this.cacheTables)) {
+            const promisedTable = this.cacheTables[site.id] = new CorePromisedValue();
+            const table = new CoreDatabaseTableProxy<CoreSiteWSCacheRecord>(
+                { cachingStrategy: CoreDatabaseCachingStrategy.None },
+                site.getDb(),
+                CoreSite.WS_CACHE_TABLE,
+            );
+
+            await table.initialize();
+
+            promisedTable.resolve(table);
+        }
+
+        return this.cacheTables[site.id];
+    }
+
     /**
      * Get the demo data for a certain "name" if it is a demo site.
      *

From a04147120517a5018ec9e7acd7a7632998dd464a Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 3 Feb 2022 13:45:57 +0100
Subject: [PATCH 0463/1008] MOBILE-3977 core: Implement debug database table

---
 .../classes/database/database-table-proxy.ts  |   6 +-
 .../classes/database/debug-database-table.ts  | 139 ++++++++++++++++++
 2 files changed, 144 insertions(+), 1 deletion(-)
 create mode 100644 src/core/classes/database/debug-database-table.ts

diff --git a/src/core/classes/database/database-table-proxy.ts b/src/core/classes/database/database-table-proxy.ts
index ef7e50b35..330640e9c 100644
--- a/src/core/classes/database/database-table-proxy.ts
+++ b/src/core/classes/database/database-table-proxy.ts
@@ -18,6 +18,7 @@ import { SQLiteDB, SQLiteDBRecordValues } from '@classes/sqlitedb';
 import { CoreConfigProvider } from '@services/config';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreDatabaseReducer, CoreDatabaseTable, CoreDatabaseConditions, GetDBRecordPrimaryKey } from './database-table';
+import { CoreDebugDatabaseTable } from './debug-database-table';
 import { CoreEagerDatabaseTable } from './eager-database-table';
 import { CoreLazyDatabaseTable } from './lazy-database-table';
 
@@ -152,6 +153,7 @@ export class CoreDatabaseTableProxy<
     protected getConfigDefaults(): CoreDatabaseConfiguration {
         return {
             cachingStrategy: CoreDatabaseCachingStrategy.None,
+            debug: false,
         };
     }
 
@@ -193,8 +195,9 @@ export class CoreDatabaseTableProxy<
      */
     protected createTarget(): CoreDatabaseTable<DBRecord, PrimaryKeyColumn> {
         const config = this.getRuntimeConfig();
+        const table = this.createTable(config.cachingStrategy);
 
-        return this.createTable(config.cachingStrategy);
+        return config.debug ? new CoreDebugDatabaseTable(table) : table;
     }
 
     /**
@@ -221,6 +224,7 @@ export class CoreDatabaseTableProxy<
  */
 export interface CoreDatabaseConfiguration {
     cachingStrategy: CoreDatabaseCachingStrategy;
+    debug: boolean;
 }
 
 /**
diff --git a/src/core/classes/database/debug-database-table.ts b/src/core/classes/database/debug-database-table.ts
new file mode 100644
index 000000000..09d80dad0
--- /dev/null
+++ b/src/core/classes/database/debug-database-table.ts
@@ -0,0 +1,139 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { SQLiteDBRecordValues } from '@classes/sqlitedb';
+import { CoreLogger } from '@singletons/logger';
+import { CoreDatabaseTable, CoreDatabaseConditions, GetDBRecordPrimaryKey, CoreDatabaseReducer } from './database-table';
+
+/**
+ * Database table proxy used to debug runtime operations.
+ *
+ * This proxy should only be used for development purposes.
+ */
+export class CoreDebugDatabaseTable<
+    DBRecord extends SQLiteDBRecordValues = SQLiteDBRecordValues,
+    PrimaryKeyColumn extends keyof DBRecord = 'id',
+    PrimaryKey extends GetDBRecordPrimaryKey<DBRecord, PrimaryKeyColumn> = GetDBRecordPrimaryKey<DBRecord, PrimaryKeyColumn>
+> extends CoreDatabaseTable<DBRecord, PrimaryKeyColumn, PrimaryKey> {
+
+    protected target: CoreDatabaseTable<DBRecord, PrimaryKeyColumn, PrimaryKey>;
+    protected logger: CoreLogger;
+
+    constructor(target: CoreDatabaseTable<DBRecord, PrimaryKeyColumn, PrimaryKey>) {
+        super(target.getDatabase(), target.getTableName(), target.getPrimaryKeyColumns());
+
+        this.target = target;
+        this.logger = CoreLogger.getInstance(`CoreDatabase[${this.tableName}]`);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    initialize(): Promise<void> {
+        this.logger.log('initialize');
+
+        return this.target.initialize();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    destroy(): Promise<void> {
+        this.logger.log('destroy');
+
+        return this.target.destroy();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    all(conditions?: Partial<DBRecord>): Promise<DBRecord[]> {
+        this.logger.log('all', conditions);
+
+        return this.target.all(conditions);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    find(conditions: Partial<DBRecord>): Promise<DBRecord> {
+        this.logger.log('find', conditions);
+
+        return this.target.find(conditions);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    findByPrimaryKey(primaryKey: PrimaryKey): Promise<DBRecord> {
+        this.logger.log('findByPrimaryKey', primaryKey);
+
+        return this.target.findByPrimaryKey(primaryKey);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    reduce<T>(reducer: CoreDatabaseReducer<DBRecord, T>, conditions?: CoreDatabaseConditions<DBRecord>): Promise<T> {
+        this.logger.log('reduce', reducer, conditions);
+
+        return this.target.reduce<T>(reducer, conditions);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    insert(record: DBRecord): Promise<void> {
+        this.logger.log('insert', record);
+
+        return this.target.insert(record);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    update(updates: Partial<DBRecord>, conditions?: Partial<DBRecord>): Promise<void> {
+        this.logger.log('update', updates, conditions);
+
+        return this.target.update(updates, conditions);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    updateWhere(updates: Partial<DBRecord>, conditions: CoreDatabaseConditions<DBRecord>): Promise<void> {
+        this.logger.log('updateWhere', updates, conditions);
+
+        return this.target.updateWhere(updates, conditions);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    delete(conditions?: Partial<DBRecord>): Promise<void> {
+        this.logger.log('delete', conditions);
+
+        return this.target.delete(conditions);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    deleteByPrimaryKey(primaryKey: PrimaryKey): Promise<void> {
+        this.logger.log('deleteByPrimaryKey', primaryKey);
+
+        return this.target.deleteByPrimaryKey(primaryKey);
+    }
+
+}

From 7a2a8c3e9867f65d81151f39c01b77ce9281dcd3 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 3 Feb 2022 13:56:36 +0100
Subject: [PATCH 0464/1008] MOBILE-3977 core: Implement async instance pattern

---
 .../classes/database/database-table-proxy.ts  |  46 ++-----
 src/core/classes/site.ts                      |  41 +++---
 src/core/services/config.ts                   |  17 +--
 src/core/utils/async-instance.ts              | 122 ++++++++++++++++++
 4 files changed, 158 insertions(+), 68 deletions(-)
 create mode 100644 src/core/utils/async-instance.ts

diff --git a/src/core/classes/database/database-table-proxy.ts b/src/core/classes/database/database-table-proxy.ts
index 330640e9c..0a9006282 100644
--- a/src/core/classes/database/database-table-proxy.ts
+++ b/src/core/classes/database/database-table-proxy.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { CoreConstants } from '@/core/constants';
-import { CorePromisedValue } from '@classes/promised-value';
+import { asyncInstance } from '@/core/utils/async-instance';
 import { SQLiteDB, SQLiteDBRecordValues } from '@classes/sqlitedb';
 import { CoreConfigProvider } from '@services/config';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
@@ -34,7 +34,7 @@ export class CoreDatabaseTableProxy<
 > extends CoreDatabaseTable<DBRecord, PrimaryKeyColumn, PrimaryKey> {
 
     protected config: CoreDatabaseConfiguration;
-    protected target: CorePromisedValue<CoreDatabaseTable<DBRecord, PrimaryKeyColumn>> = new CorePromisedValue();
+    protected target = asyncInstance<CoreDatabaseTable<DBRecord, PrimaryKeyColumn>>();
     protected environmentObserver?: CoreEventObserver;
 
     constructor(
@@ -68,81 +68,63 @@ export class CoreDatabaseTableProxy<
      * @inheritdoc
      */
     async all(conditions?: Partial<DBRecord>): Promise<DBRecord[]> {
-        const target = await this.target;
-
-        return target.all(conditions);
+        return this.target.all(conditions);
     }
 
     /**
      * @inheritdoc
      */
     async find(conditions: Partial<DBRecord>): Promise<DBRecord> {
-        const target = await this.target;
-
-        return target.find(conditions);
+        return this.target.find(conditions);
     }
 
     /**
      * @inheritdoc
      */
     async findByPrimaryKey(primaryKey: PrimaryKey): Promise<DBRecord> {
-        const target = await this.target;
-
-        return target.findByPrimaryKey(primaryKey);
+        return this.target.findByPrimaryKey(primaryKey);
     }
 
     /**
      * @inheritdoc
      */
     async reduce<T>(reducer: CoreDatabaseReducer<DBRecord, T>, conditions?: CoreDatabaseConditions<DBRecord>): Promise<T> {
-        const target = await this.target;
-
-        return target.reduce<T>(reducer, conditions);
+        return this.target.reduce<T>(reducer, conditions);
     }
 
     /**
      * @inheritdoc
      */
     async insert(record: DBRecord): Promise<void> {
-        const target = await this.target;
-
-        return target.insert(record);
+        return this.target.insert(record);
     }
 
     /**
      * @inheritdoc
      */
     async update(updates: Partial<DBRecord>, conditions?: Partial<DBRecord>): Promise<void> {
-        const target = await this.target;
-
-        return target.update(updates, conditions);
+        return this.target.update(updates, conditions);
     }
 
     /**
      * @inheritdoc
      */
     async updateWhere(updates: Partial<DBRecord>, conditions: CoreDatabaseConditions<DBRecord>): Promise<void> {
-        const target = await this.target;
-
-        return target.updateWhere(updates, conditions);
+        return this.target.updateWhere(updates, conditions);
     }
 
     /**
      * @inheritdoc
      */
     async delete(conditions?: Partial<DBRecord>): Promise<void> {
-        const target = await this.target;
-
-        return target.delete(conditions);
+        return this.target.delete(conditions);
     }
 
     /**
      * @inheritdoc
      */
     async deleteByPrimaryKey(primaryKey: PrimaryKey): Promise<void> {
-        const target = await this.target;
-
-        return target.deleteByPrimaryKey(primaryKey);
+        return this.target.deleteByPrimaryKey(primaryKey);
     }
 
     /**
@@ -174,18 +156,18 @@ export class CoreDatabaseTableProxy<
      * Update underlying target instance.
      */
     protected async updateTarget(): Promise<void> {
-        const oldTarget = this.target.value;
+        const oldTarget = this.target.instance;
         const newTarget = this.createTarget();
 
         if (oldTarget) {
             await oldTarget.destroy();
 
-            this.target.reset();
+            this.target.resetInstance();
         }
 
         await newTarget.initialize();
 
-        this.target.resolve(newTarget);
+        this.target.setInstance(newTarget);
     }
 
     /**
diff --git a/src/core/classes/site.ts b/src/core/classes/site.ts
index 3182f60ff..5ce95a266 100644
--- a/src/core/classes/site.ts
+++ b/src/core/classes/site.ts
@@ -42,6 +42,8 @@ import { Translate } from '@singletons';
 import { CoreIonLoadingElement } from './ion-loading';
 import { CoreLang } from '@services/lang';
 import { CoreSites } from '@services/sites';
+import { asyncInstance, AsyncInstance } from '../utils/async-instance';
+import { CoreDatabaseTable } from './database/database-table';
 
 /**
  * QR Code type enumeration.
@@ -104,6 +106,7 @@ export class CoreSite {
     // Rest of variables.
     protected logger: CoreLogger;
     protected db?: SQLiteDB;
+    protected cacheTable: AsyncInstance<CoreDatabaseTable<CoreSiteWSCacheRecord>>;
     protected cleanUnicode = false;
     protected lastAutoLogin = 0;
     protected offlineDisabled = false;
@@ -137,6 +140,7 @@ export class CoreSite {
     ) {
         this.logger = CoreLogger.getInstance('CoreSite');
         this.siteUrl = CoreUrlUtils.removeUrlParams(this.siteUrl); // Make sure the URL doesn't have params.
+        this.cacheTable = asyncInstance(() => CoreSites.getCacheTable(this));
         this.setInfo(infos);
         this.calculateOfflineDisabled();
 
@@ -926,15 +930,14 @@ export class CoreSite {
         }
 
         const id = this.getCacheId(method, data);
-        const cacheTable = await CoreSites.getCacheTable(this);
         let entry: CoreSiteWSCacheRecord | undefined;
 
         if (preSets.getCacheUsingCacheKey || (emergency && preSets.getEmergencyCacheUsingCacheKey)) {
-            const entries = await cacheTable.all({ key: preSets.cacheKey });
+            const entries = await this.cacheTable.all({ key: preSets.cacheKey });
 
             if (!entries.length) {
                 // Cache key not found, get by params sent.
-                entry = await cacheTable.findByPrimaryKey({ id });
+                entry = await this.cacheTable.findByPrimaryKey({ id });
             } else {
                 if (entries.length > 1) {
                     // More than one entry found. Search the one with same ID as this call.
@@ -946,7 +949,7 @@ export class CoreSite {
                 }
             }
         } else {
-            entry = await cacheTable.findByPrimaryKey({ id });
+            entry = await this.cacheTable.findByPrimaryKey({ id });
         }
 
         if (entry === undefined) {
@@ -991,14 +994,13 @@ export class CoreSite {
      */
     async getComponentCacheSize(component: string, componentId?: number): Promise<number> {
         const params: Array<string | number> = [component];
-        const cacheTable = await CoreSites.getCacheTable(this);
         let extraClause = '';
         if (componentId !== undefined && componentId !== null) {
             params.push(componentId);
             extraClause = ' AND componentId = ?';
         }
 
-        return cacheTable.reduce(
+        return this.cacheTable.reduce(
             {
                 sql: 'SUM(length(data))',
                 js: (size, record) => size + record.data.length,
@@ -1031,7 +1033,6 @@ export class CoreSite {
         // Since 3.7, the expiration time contains the time the entry is modified instead of the expiration time.
         // We decided to reuse this field to prevent modifying the database table.
         const id = this.getCacheId(method, data);
-        const cacheTable = await CoreSites.getCacheTable(this);
         const entry = {
             id,
             data: JSON.stringify(response),
@@ -1049,7 +1050,7 @@ export class CoreSite {
             }
         }
 
-        await cacheTable.insert(entry);
+        await this.cacheTable.insert(entry);
     }
 
     /**
@@ -1064,12 +1065,11 @@ export class CoreSite {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     protected async deleteFromCache(method: string, data: any, preSets: CoreSiteWSPreSets, allCacheKey?: boolean): Promise<void> {
         const id = this.getCacheId(method, data);
-        const cacheTable = await CoreSites.getCacheTable(this);
 
         if (allCacheKey) {
-            await cacheTable.delete({ key: preSets.cacheKey });
+            await this.cacheTable.delete({ key: preSets.cacheKey });
         } else {
-            await cacheTable.deleteByPrimaryKey({ id });
+            await this.cacheTable.deleteByPrimaryKey({ id });
         }
     }
 
@@ -1087,13 +1087,12 @@ export class CoreSite {
         }
 
         const params = { component };
-        const cacheTable = await CoreSites.getCacheTable(this);
 
         if (componentId) {
             params['componentId'] = componentId;
         }
 
-        await cacheTable.delete(params);
+        await this.cacheTable.delete(params);
     }
 
     /*
@@ -1128,9 +1127,7 @@ export class CoreSite {
         this.logger.debug('Invalidate all the cache for site: ' + this.id);
 
         try {
-            const cacheTable = await CoreSites.getCacheTable(this);
-
-            await cacheTable.update({ expirationTime: 0 });
+            await this.cacheTable.update({ expirationTime: 0 });
         } finally {
             CoreEvents.trigger(CoreEvents.WS_CACHE_INVALIDATED, {}, this.getId());
         }
@@ -1149,9 +1146,7 @@ export class CoreSite {
 
         this.logger.debug('Invalidate cache for key: ' + key);
 
-        const cacheTable = await CoreSites.getCacheTable(this);
-
-        await cacheTable.update({ expirationTime: 0 }, { key });
+        await this.cacheTable.update({ expirationTime: 0 }, { key });
     }
 
     /**
@@ -1185,9 +1180,7 @@ export class CoreSite {
 
         this.logger.debug('Invalidate cache for key starting with: ' + key);
 
-        const cacheTable = await CoreSites.getCacheTable(this);
-
-        await cacheTable.updateWhere({ expirationTime: 0 }, {
+        await this.cacheTable.updateWhere({ expirationTime: 0 }, {
             sql: 'key LIKE ?',
             sqlParams: [key],
             js: record => !!record.key?.startsWith(key),
@@ -1266,9 +1259,7 @@ export class CoreSite {
      * @return Promise resolved with the total size of all data in the cache table (bytes)
      */
     async getCacheUsage(): Promise<number> {
-        const cacheTable = await CoreSites.getCacheTable(this);
-
-        return cacheTable.reduce({
+        return this.cacheTable.reduce({
             sql: 'SUM(length(data))',
             js: (size, record) => size + record.data.length,
             jsInitialValue: 0,
diff --git a/src/core/services/config.ts b/src/core/services/config.ts
index d804535f1..0ed248301 100644
--- a/src/core/services/config.ts
+++ b/src/core/services/config.ts
@@ -21,7 +21,7 @@ import { makeSingleton } from '@singletons';
 import { CoreConstants } from '../constants';
 import { CoreEvents } from '@singletons/events';
 import { CoreDatabaseTable } from '@classes/database/database-table';
-import { CorePromisedValue } from '@classes/promised-value';
+import { asyncInstance } from '../utils/async-instance';
 
 declare module '@singletons/events' {
 
@@ -45,7 +45,7 @@ export class CoreConfigProvider {
 
     static readonly ENVIRONMENT_UPDATED = 'environment_updated';
 
-    protected table: CorePromisedValue<CoreDatabaseTable<ConfigDBEntry, 'name'>> = new CorePromisedValue();
+    protected table = asyncInstance<CoreDatabaseTable<ConfigDBEntry, 'name'>>();
     protected defaultEnvironment?: EnvironmentConfig;
 
     /**
@@ -67,7 +67,7 @@ export class CoreConfigProvider {
 
         await table.initialize();
 
-        this.table.resolve(table);
+        this.table.setInstance(table);
     }
 
     /**
@@ -77,9 +77,7 @@ export class CoreConfigProvider {
      * @return Promise resolved when done.
      */
     async delete(name: string): Promise<void> {
-        const table = await this.table;
-
-        await table.deleteByPrimaryKey({ name });
+        await this.table.deleteByPrimaryKey({ name });
     }
 
     /**
@@ -91,8 +89,7 @@ export class CoreConfigProvider {
      */
     async get<T>(name: string, defaultValue?: T): Promise<T> {
         try {
-            const table = await this.table;
-            const record = await table.findByPrimaryKey({ name });
+            const record = await this.table.findByPrimaryKey({ name });
 
             return record.value;
         } catch (error) {
@@ -112,9 +109,7 @@ export class CoreConfigProvider {
      * @return Promise resolved when done.
      */
     async set(name: string, value: number | string): Promise<void> {
-        const table = await this.table;
-
-        await table.insert({ name, value });
+        await this.table.insert({ name, value });
     }
 
     /**
diff --git a/src/core/utils/async-instance.ts b/src/core/utils/async-instance.ts
new file mode 100644
index 000000000..f687e8a70
--- /dev/null
+++ b/src/core/utils/async-instance.ts
@@ -0,0 +1,122 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CorePromisedValue } from '@classes/promised-value';
+
+/**
+ * Create a wrapper to hold an asynchronous instance.
+ *
+ * @param lazyConstructor Constructor to use the first time the instance is needed.
+ * @returns Asynchronous instance wrapper.
+ */
+function createAsyncInstanceWrapper<T>(lazyConstructor?: () => T | Promise<T>): AsyncInstanceWrapper<T> {
+    let promisedInstance: CorePromisedValue<T> | null = null;
+
+    return {
+        get instance() {
+            return promisedInstance?.value ?? undefined;
+        },
+        async getInstance() {
+            if (!promisedInstance) {
+                promisedInstance = new CorePromisedValue();
+
+                if (lazyConstructor) {
+                    const instance = await lazyConstructor();
+
+                    promisedInstance.resolve(instance);
+                }
+            }
+
+            return promisedInstance;
+        },
+        async getProperty(property) {
+            const instance = await this.getInstance();
+
+            return instance[property];
+        },
+        setInstance(instance) {
+            if (!promisedInstance) {
+                promisedInstance = new CorePromisedValue();
+            } else if (promisedInstance.isSettled()) {
+                promisedInstance.reset();
+            }
+
+            promisedInstance.resolve(instance);
+        },
+        resetInstance() {
+            if (!promisedInstance) {
+                return;
+            }
+
+            promisedInstance.reset();
+        },
+    };
+}
+
+/**
+ * Asynchronous instance wrapper.
+ */
+export interface AsyncInstanceWrapper<T> {
+    instance?: T;
+    getInstance(): Promise<T>;
+    getProperty<P extends keyof T>(property: P): Promise<T[P]>;
+    setInstance(instance: T): void;
+    resetInstance(): void;
+}
+
+/**
+ * Asynchronous version of a method.
+ */
+export type AsyncMethod<T> =
+    T extends (...args: infer Params) => infer Return
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        ? T extends (...args: Params) => Promise<any>
+            ? T
+            : (...args: Params) => Promise<Return>
+        : never;
+
+/**
+ * Asynchronous instance.
+ *
+ * All methods are converted to their asynchronous version, and properties are available asynchronously using
+ * the getProperty method.
+ */
+export type AsyncInstance<T> = AsyncInstanceWrapper<T> & {
+    [k in keyof T]: AsyncMethod<T[k]>;
+};
+
+/**
+ * Create an asynchronous instance proxy, where all methods will be callable directly but will become asynchronous. If the
+ * underlying instance hasn't been set, methods will be resolved once it is.
+ *
+ * @param lazyConstructor Constructor to use the first time the instance is needed.
+ * @returns Asynchronous instance.
+ */
+export function asyncInstance<T>(lazyConstructor?: () => T | Promise<T>): AsyncInstance<T> {
+    const wrapper = createAsyncInstanceWrapper<T>(lazyConstructor);
+
+    return new Proxy(wrapper, {
+        get: (target, property, receiver) => {
+            if (property in target) {
+                return Reflect.get(target, property, receiver);
+            }
+
+            return async (...args: unknown[]) => {
+                const instance = await wrapper.getInstance();
+
+                return instance[property](...args);
+            };
+        },
+    }) as AsyncInstance<T>;
+}

From 21a7ec66a2c65e5b599888f78723de6725989349 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 7 Feb 2022 12:52:43 +0100
Subject: [PATCH 0465/1008] MOBILE-3958 grades: Display icon and color in
 grades

---
 scripts/langindex.json                        |  2 ++
 src/core/features/grades/lang.json            |  2 ++
 .../features/grades/pages/course/course.html  | 10 ++++++++--
 .../features/grades/pages/course/course.scss  | 18 ++++++++++++------
 .../features/grades/services/grades-helper.ts | 19 ++++++++++++++++++-
 5 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index af83bf1ca..6899fcdff 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1734,6 +1734,7 @@
   "core.grades.calculatedgrade": "grades",
   "core.grades.category": "grades",
   "core.grades.contributiontocoursetotal": "grades",
+  "core.grades.fail": "grades",
   "core.grades.feedback": "grades",
   "core.grades.grade": "grades",
   "core.grades.gradeitem": "grades",
@@ -1744,6 +1745,7 @@
   "core.grades.nogradesreturned": "grades",
   "core.grades.nooutcome": "grades",
   "core.grades.outcome": "grades",
+  "core.grades.pass": "grades",
   "core.grades.percentage": "grades",
   "core.grades.range": "grades",
   "core.grades.rank": "grades",
diff --git a/src/core/features/grades/lang.json b/src/core/features/grades/lang.json
index 1084e7782..504a4ae34 100644
--- a/src/core/features/grades/lang.json
+++ b/src/core/features/grades/lang.json
@@ -6,6 +6,7 @@
     "calculatedgrade": "Calculated grade",
     "category": "Category",
     "contributiontocoursetotal": "Contribution to course total",
+    "fail": "Fail",
     "feedback": "Feedback",
     "grade": "Grade",
     "gradeitem": "Grade item",
@@ -16,6 +17,7 @@
     "nogradesreturned": "No grades returned",
     "nooutcome": "No outcome",
     "outcome": "Outcome",
+    "pass": "Pass",
     "percentage": "Percentage",
     "range": "Range",
     "rank": "Rank",
diff --git a/src/core/features/grades/pages/course/course.html b/src/core/features/grades/pages/course/course.html
index 497f485a6..053b16cd1 100644
--- a/src/core/features/grades/pages/course/course.html
+++ b/src/core/features/grades/pages/course/course.html
@@ -49,8 +49,8 @@
                                     <span [innerHTML]="row.gradeitem"></span>
                                 </th>
                                 <ng-container *ngFor="let column of columns">
-                                    <td *ngIf="column.name !== 'gradeitem' && column.name !== 'feedback' && row[column.name] != undefined"
-                                        [class]="'ion-text-start core-grades-table-' + column.name"
+                                    <td *ngIf="column.name !== 'gradeitem' && column.name !== 'feedback' && column.name !== 'grade' &&
+                                        row[column.name] != undefined" [class]="'ion-text-start core-grades-table-' + column.name"
                                         [class.ion-hide-md-down]="column.hiddenPhone" [innerHTML]="row[column.name]">
                                     </td>
                                     <td *ngIf="column.name === 'feedback' && row.feedback !== undefined"
@@ -59,6 +59,12 @@
                                             [contextInstanceId]="courseId">
                                         </core-format-text>
                                     </td>
+                                    <td *ngIf="column.name === 'grade'" [class.ion-hide-md-down]="column.hiddenPhone"
+                                        class="ion-text-start core-grades-table-grade {{row.gradeClass}}">
+                                        <ion-icon *ngIf="row.gradeIcon" [name]="row.gradeIcon" [attr.aria-label]="row.gradeIconAlt">
+                                        </ion-icon>
+                                        <span [innerHTML]="row[column.name]"></span>
+                                    </td>
                                 </ng-container>
                             </ng-container>
                         </tr>
diff --git a/src/core/features/grades/pages/course/course.scss b/src/core/features/grades/pages/course/course.scss
index 9068aaba0..dec25329c 100644
--- a/src/core/features/grades/pages/course/course.scss
+++ b/src/core/features/grades/pages/course/course.scss
@@ -42,7 +42,7 @@
     }
 
     th, td {
-        @include padding(10px, 10px, 10px, null);
+        @include padding(8px, 8px, 8px, null);
         vertical-align: top;
         white-space: normal;
         text-align: start;
@@ -55,7 +55,7 @@
     }
 
     thead #gradeitem {
-        @include padding(null, null, null, 23px);
+        @include padding(null, null, null, 24px);
     }
 
     tbody th {
@@ -63,11 +63,11 @@
     }
 
     tbody #gradeitem {
-        @include padding(null, null, null, 5px);
+        @include padding(null, null, null, 4px);
     }
 
     .core-grades-table-gradeitem {
-        @include padding(null, null, null, 5px);
+        @include padding(null, null, null, 4px);
         font-weight: bold;
 
         &.column-itemname {
@@ -90,7 +90,7 @@
         }
 
         span {
-            @include margin(null, null, null, 5px);
+            @include margin(null, null, null, 4px);
         }
 
         .expandable-status-icon {
@@ -101,7 +101,7 @@
     }
 
     .core-grades-table-feedback {
-        @include padding(null, null, null, 5px);
+        @include padding(null, null, null, 4px);
 
         .no-overflow {
             overflow: auto;
@@ -109,6 +109,12 @@
 
     }
 
+    .core-grades-table-grade {
+        ion-icon {
+            @include padding(null, 4px, null, null);
+        }
+    }
+
     .dimmed_text,
     .hidden {
         opacity: .7;
diff --git a/src/core/features/grades/services/grades-helper.ts b/src/core/features/grades/services/grades-helper.ts
index cf83ea121..c343c2c71 100644
--- a/src/core/features/grades/services/grades-helper.ts
+++ b/src/core/features/grades/services/grades-helper.ts
@@ -108,7 +108,7 @@ export class CoreGradesHelperProvider {
 
             let content = String(column.content);
 
-            if (name == 'itemname') {
+            if (name === 'itemname') {
                 const itemNameColumn = <CoreGradesTableItemNameColumn> column;
 
                 row.id = parseInt(itemNameColumn.id.split('_')[1], 10);
@@ -123,6 +123,20 @@ export class CoreGradesHelperProvider {
                 content = content.replace(/<\/span>/gi, '\n');
                 content = CoreTextUtils.cleanTags(content);
                 name = 'gradeitem';
+            } else if (name === 'grade') {
+                // Add the pass/fail class if present.
+                row.gradeClass = column.class.includes('gradepass') ? 'text-success' :
+                    (column.class.includes('gradefail') ? 'text-danger' : '');
+
+                if (content.includes('fa-check')) {
+                    row.gradeIcon = 'fas-check';
+                    row.gradeIconAlt = Translate.instant('core.grades.pass');
+                    content = CoreTextUtils.cleanTags(content);
+                } else if (content.includes('fa-times')) {
+                    row.gradeIcon = 'fas-times';
+                    row.gradeIconAlt = Translate.instant('core.grades.fail');
+                    content = CoreTextUtils.cleanTags(content);
+                }
             } else {
                 content = CoreTextUtils.replaceNewLines(content, '<br>');
             }
@@ -721,6 +735,9 @@ export type CoreGradesFormattedTableRow = CoreGradesFormattedRowCommonData & {
     ariaLabel?: string;
     expandable?: boolean;
     expanded?: boolean;
+    gradeClass?: string;
+    gradeIcon?: string;
+    gradeIconAlt?: string;
 };
 
 export type CoreGradesFormattedTableColumn = {

From 359d7ab5a57010c2331487040369c6c74485b863 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Mon, 7 Feb 2022 13:46:09 +0100
Subject: [PATCH 0466/1008] MOBILE-3977 core: Reuse databases initialization

---
 src/core/classes/site.ts      |  7 ++-
 src/core/services/filepool.ts | 86 ++++++++++++-----------------------
 src/core/services/sites.ts    | 63 +++++++++++++++----------
 src/core/utils/lazy-map.ts    | 40 ++++++++++++++++
 4 files changed, 114 insertions(+), 82 deletions(-)
 create mode 100644 src/core/utils/lazy-map.ts

diff --git a/src/core/classes/site.ts b/src/core/classes/site.ts
index 5ce95a266..4bcdf942e 100644
--- a/src/core/classes/site.ts
+++ b/src/core/classes/site.ts
@@ -44,6 +44,7 @@ import { CoreLang } from '@services/lang';
 import { CoreSites } from '@services/sites';
 import { asyncInstance, AsyncInstance } from '../utils/async-instance';
 import { CoreDatabaseTable } from './database/database-table';
+import { CoreDatabaseCachingStrategy } from './database/database-table-proxy';
 
 /**
  * QR Code type enumeration.
@@ -140,7 +141,11 @@ export class CoreSite {
     ) {
         this.logger = CoreLogger.getInstance('CoreSite');
         this.siteUrl = CoreUrlUtils.removeUrlParams(this.siteUrl); // Make sure the URL doesn't have params.
-        this.cacheTable = asyncInstance(() => CoreSites.getCacheTable(this));
+        this.cacheTable = asyncInstance(() => CoreSites.getSiteTable(CoreSite.WS_CACHE_TABLE, {
+            siteId: this.getId(),
+            database: this.getDb(),
+            config: { cachingStrategy: CoreDatabaseCachingStrategy.None },
+        }));
         this.setInfo(infos);
         this.calculateOfflineDisabled();
 
diff --git a/src/core/services/filepool.ts b/src/core/services/filepool.ts
index e3f5bab52..08bd6f078 100644
--- a/src/core/services/filepool.ts
+++ b/src/core/services/filepool.ts
@@ -48,9 +48,10 @@ import {
 } from '@services/database/filepool';
 import { CoreFileHelper } from './file-helper';
 import { CoreUrl } from '@singletons/url';
-import { CorePromisedValue } from '@classes/promised-value';
 import { CoreDatabaseTable } from '@classes/database/database-table';
-import { CoreDatabaseCachingStrategy, CoreDatabaseTableProxy } from '@classes/database/database-table-proxy';
+import { CoreDatabaseCachingStrategy } from '@classes/database/database-table-proxy';
+import { lazyMap, LazyMap } from '../utils/lazy-map';
+import { asyncInstance, AsyncInstance } from '../utils/async-instance';
 
 /*
  * Factory for handling downloading files and retrieve downloaded files.
@@ -101,11 +102,20 @@ export class CoreFilepoolProvider {
     // Variables for DB.
     protected appDB: Promise<SQLiteDB>;
     protected resolveAppDB!: (appDB: SQLiteDB) => void;
-    protected filesTables: Record<string, CorePromisedValue<CoreDatabaseTable<CoreFilepoolFileEntry, 'fileId'>>> = {};
+    protected filesTables: LazyMap<AsyncInstance<CoreDatabaseTable<CoreFilepoolFileEntry, 'fileId'>>>;
 
     constructor() {
         this.appDB = new Promise(resolve => this.resolveAppDB = resolve);
         this.logger = CoreLogger.getInstance('CoreFilepoolProvider');
+        this.filesTables = lazyMap(
+            siteId => asyncInstance(
+                () => CoreSites.getSiteTable<CoreFilepoolFileEntry, 'fileId'>(FILES_TABLE_NAME, {
+                    siteId,
+                    config: { cachingStrategy: CoreDatabaseCachingStrategy.Lazy },
+                    primaryKeyColumns: ['fileId'],
+                }),
+            ),
+        );
     }
 
     /**
@@ -128,11 +138,9 @@ export class CoreFilepoolProvider {
                 return;
             }
 
-            const filesTable = await this.filesTables[siteId];
+            await this.filesTables[siteId].destroy();
 
             delete this.filesTables[siteId];
-
-            await filesTable.destroy();
         });
     }
 
@@ -149,33 +157,6 @@ export class CoreFilepoolProvider {
         this.resolveAppDB(CoreApp.getDB());
     }
 
-    /**
-     * Get files table.
-     *
-     * @param siteId Site id.
-     * @returns Files table.
-     */
-    async getFilesTable(siteId?: string): Promise<CoreDatabaseTable<CoreFilepoolFileEntry, 'fileId'>> {
-        siteId = siteId ?? CoreSites.getCurrentSiteId();
-
-        if (!(siteId in this.filesTables)) {
-            const filesTable = this.filesTables[siteId] = new CorePromisedValue();
-            const database = await CoreSites.getSiteDb(siteId);
-            const table = new CoreDatabaseTableProxy<CoreFilepoolFileEntry, 'fileId'>(
-                { cachingStrategy: CoreDatabaseCachingStrategy.Lazy },
-                database,
-                FILES_TABLE_NAME,
-                ['fileId'],
-            );
-
-            await table.initialize();
-
-            filesTable.resolve(table);
-        }
-
-        return this.filesTables[siteId];
-    }
-
     /**
      * Link a file with a component.
      *
@@ -262,9 +243,7 @@ export class CoreFilepoolProvider {
             ...data,
         };
 
-        const filesTable = await this.getFilesTable(siteId);
-
-        await filesTable.insert(record);
+        await this.filesTables[siteId].insert(record);
     }
 
     /**
@@ -605,14 +584,13 @@ export class CoreFilepoolProvider {
      */
     async clearFilepool(siteId: string): Promise<void> {
         const db = await CoreSites.getSiteDb(siteId);
-        const filesTable = await this.getFilesTable(siteId);
 
         // Read the data first to be able to notify the deletions.
-        const filesEntries = await filesTable.all();
+        const filesEntries = await this.filesTables[siteId].all();
         const filesLinks = await db.getAllRecords<CoreFilepoolLinksRecord>(LINKS_TABLE_NAME);
 
         await Promise.all([
-            filesTable.delete(),
+            this.filesTables[siteId].delete(),
             db.deleteRecords(LINKS_TABLE_NAME),
         ]);
 
@@ -1167,14 +1145,13 @@ export class CoreFilepoolProvider {
         }
 
         const db = await CoreSites.getSiteDb(siteId);
-        const filesTable = await this.getFilesTable(siteId);
         const extension = CoreMimetypeUtils.getFileExtension(entry.path);
         if (!extension) {
             // Files does not have extension. Invalidate file (stale = true).
             // Minor problem: file will remain in the filesystem once downloaded again.
             this.logger.debug('Staled file with no extension ' + entry.fileId);
 
-            await filesTable.update({ stale: 1 }, { fileId: entry.fileId });
+            await this.filesTables[siteId].update({ stale: 1 }, { fileId: entry.fileId });
 
             return;
         }
@@ -1184,7 +1161,7 @@ export class CoreFilepoolProvider {
         entry.fileId = CoreMimetypeUtils.removeExtension(fileId);
         entry.extension = extension;
 
-        await filesTable.update(entry, { fileId });
+        await this.filesTables[siteId].update(entry, { fileId });
         if (entry.fileId == fileId) {
             // File ID hasn't changed, we're done.
             this.logger.debug('Removed extesion ' + extension + ' from file ' + entry.fileId);
@@ -1445,13 +1422,12 @@ export class CoreFilepoolProvider {
      */
     async getFilesByComponent(siteId: string, component: string, componentId?: string | number): Promise<CoreFilepoolFileEntry[]> {
         const db = await CoreSites.getSiteDb(siteId);
-        const filesTable = await this.getFilesTable(siteId);
         const items = await this.getComponentFiles(db, component, componentId);
         const files: CoreFilepoolFileEntry[] = [];
 
         await Promise.all(items.map(async (item) => {
             try {
-                const fileEntry = await filesTable.findByPrimaryKey({ fileId: item.fileId });
+                const fileEntry = await this.filesTables[siteId].findByPrimaryKey({ fileId: item.fileId });
 
                 if (!fileEntry) {
                     return;
@@ -2184,9 +2160,7 @@ export class CoreFilepoolProvider {
      * @return Resolved with file object from DB on success, rejected otherwise.
      */
     protected async hasFileInPool(siteId: string, fileId: string): Promise<CoreFilepoolFileEntry> {
-        const filesTable = await this.getFilesTable(siteId);
-
-        return filesTable.findByPrimaryKey({ fileId });
+        return this.filesTables[siteId].findByPrimaryKey({ fileId });
     }
 
     /**
@@ -2218,17 +2192,15 @@ export class CoreFilepoolProvider {
      * @return Resolved on success.
      */
     async invalidateAllFiles(siteId: string, onlyUnknown: boolean = true): Promise<void> {
-        const filesTable = await this.getFilesTable(siteId);
-
         onlyUnknown
-            ? await filesTable.updateWhere(
+            ? await this.filesTables[siteId].updateWhere(
                 { stale: 1 },
                 {
                     sql: CoreFilepoolProvider.FILE_IS_UNKNOWN_SQL,
                     js: CoreFilepoolProvider.FILE_IS_UNKNOWN_JS,
                 },
             )
-            : await filesTable.update({ stale: 1 });
+            : await this.filesTables[siteId].update({ stale: 1 });
     }
 
     /**
@@ -2247,9 +2219,7 @@ export class CoreFilepoolProvider {
         const file = await this.fixPluginfileURL(siteId, fileUrl);
         const fileId = this.getFileIdByUrl(CoreFileHelper.getFileUrl(file));
 
-        const filesTable = await this.getFilesTable(siteId);
-
-        await filesTable.update({ stale: 1 }, { fileId });
+        await this.filesTables[siteId].update({ stale: 1 }, { fileId });
     }
 
     /**
@@ -2269,7 +2239,6 @@ export class CoreFilepoolProvider {
         onlyUnknown: boolean = true,
     ): Promise<void> {
         const db = await CoreSites.getSiteDb(siteId);
-        const filesTable = await this.getFilesTable(siteId);
         const items = await this.getComponentFiles(db, component, componentId);
 
         if (!items.length) {
@@ -2277,6 +2246,8 @@ export class CoreFilepoolProvider {
             return;
         }
 
+        siteId = siteId ?? CoreSites.getCurrentSiteId();
+
         const fileIds = items.map((item) => item.fileId);
 
         const whereAndParams = db.getInOrEqual(fileIds);
@@ -2287,7 +2258,7 @@ export class CoreFilepoolProvider {
             whereAndParams.sql += ' AND (' + CoreFilepoolProvider.FILE_IS_UNKNOWN_SQL + ')';
         }
 
-        await filesTable.updateWhere(
+        await this.filesTables[siteId].updateWhere(
             { stale: 1 },
             {
                 sql: whereAndParams.sql,
@@ -2714,7 +2685,6 @@ export class CoreFilepoolProvider {
      */
     protected async removeFileById(siteId: string, fileId: string): Promise<void> {
         const db = await CoreSites.getSiteDb(siteId);
-        const filesTable = await this.getFilesTable(siteId);
 
         // Get the path to the file first since it relies on the file object stored in the pool.
         // Don't use getFilePath to prevent performing 2 DB requests.
@@ -2741,7 +2711,7 @@ export class CoreFilepoolProvider {
         const promises: Promise<unknown>[] = [];
 
         // Remove entry from filepool store.
-        promises.push(filesTable.delete(conditions));
+        promises.push(this.filesTables[siteId].delete(conditions));
 
         // Remove links.
         promises.push(db.deleteRecords(LINKS_TABLE_NAME, conditions));
diff --git a/src/core/services/sites.ts b/src/core/services/sites.ts
index 9de9c1998..ee324ae59 100644
--- a/src/core/services/sites.ts
+++ b/src/core/services/sites.ts
@@ -31,9 +31,8 @@ import {
     CoreSiteConfig,
     CoreSitePublicConfigResponse,
     CoreSiteInfoResponse,
-    CoreSiteWSCacheRecord,
 } from '@classes/site';
-import { SQLiteDB, SQLiteDBTableSchema } from '@classes/sqlitedb';
+import { SQLiteDB, SQLiteDBRecordValues, SQLiteDBTableSchema } from '@classes/sqlitedb';
 import { CoreError } from '@classes/errors/error';
 import { CoreSiteError } from '@classes/errors/siteerror';
 import { makeSingleton, Translate, Http } from '@singletons';
@@ -60,7 +59,7 @@ import { CoreAjaxWSError } from '@classes/errors/ajaxwserror';
 import { CoreSitePlugins } from '@features/siteplugins/services/siteplugins';
 import { CorePromisedValue } from '@classes/promised-value';
 import { CoreDatabaseTable } from '@classes/database/database-table';
-import { CoreDatabaseCachingStrategy, CoreDatabaseTableProxy } from '@classes/database/database-table-proxy';
+import { CoreDatabaseConfiguration, CoreDatabaseTableProxy } from '@classes/database/database-table-proxy';
 
 export const CORE_SITE_SCHEMAS = new InjectionToken<CoreSiteSchema[]>('CORE_SITE_SCHEMAS');
 
@@ -89,7 +88,7 @@ export class CoreSitesProvider {
     // Variables for DB.
     protected appDB: Promise<SQLiteDB>;
     protected resolveAppDB!: (appDB: SQLiteDB) => void;
-    protected cacheTables: Record<string, CorePromisedValue<CoreDatabaseTable<CoreSiteWSCacheRecord>>> = {};
+    protected siteTables: Record<string, Record<string, CorePromisedValue<CoreDatabaseTable>>> = {};
 
     constructor(@Optional() @Inject(CORE_SITE_SCHEMAS) siteSchemas: CoreSiteSchema[][] = []) {
         this.appDB = new Promise(resolve => this.resolveAppDB = resolve);
@@ -109,15 +108,17 @@ export class CoreSitesProvider {
      */
     initialize(): void {
         CoreEvents.on(CoreEvents.SITE_DELETED, async ({ siteId }) => {
-            if (!siteId || !(siteId in this.cacheTables)) {
+            if (!siteId || !(siteId in this.siteTables)) {
                 return;
             }
 
-            const cacheTable = await this.cacheTables[siteId];
+            await Promise.all(
+                Object
+                    .values(this.siteTables[siteId])
+                    .map(promisedTable => promisedTable.then(table => table.destroy())),
+            );
 
-            delete this.cacheTables[siteId];
-
-            await cacheTable.destroy();
+            delete this.siteTables[siteId];
         });
     }
 
@@ -135,30 +136,46 @@ export class CoreSitesProvider {
     }
 
     /**
-     * Get cache table.
+     * Get site table.
      *
-     * @param siteId Site id.
-     * @returns cache table.
+     * @param tableName Site table name.
+     * @param options Options to configure table initialization.
+     * @returns Site table.
      */
-    async getCacheTable(site: CoreSite): Promise<CoreDatabaseTable<CoreSiteWSCacheRecord>> {
-        if (!site.id) {
-            throw new CoreError('Can\'t get cache table for site without id');
+    async getSiteTable<
+        DBRecord extends SQLiteDBRecordValues,
+        PrimaryKeyColumn extends keyof DBRecord
+    >(
+        tableName: string,
+        options: Partial<{
+            siteId: string;
+            config: Partial<CoreDatabaseConfiguration>;
+            database: SQLiteDB;
+            primaryKeyColumns: PrimaryKeyColumn[];
+        }> = {},
+    ): Promise<CoreDatabaseTable<DBRecord, PrimaryKeyColumn>> {
+        const siteId = options.siteId ?? this.getCurrentSiteId();
+
+        if (!(siteId in this.siteTables)) {
+            this.siteTables[siteId] = {};
         }
 
-        if (!(site.id in this.cacheTables)) {
-            const promisedTable = this.cacheTables[site.id] = new CorePromisedValue();
-            const table = new CoreDatabaseTableProxy<CoreSiteWSCacheRecord>(
-                { cachingStrategy: CoreDatabaseCachingStrategy.None },
-                site.getDb(),
-                CoreSite.WS_CACHE_TABLE,
+        if (!(tableName in this.siteTables[siteId])) {
+            const promisedTable = this.siteTables[siteId][tableName] = new CorePromisedValue();
+            const database = options.database ?? await this.getSiteDb(siteId);
+            const table = new CoreDatabaseTableProxy<DBRecord, PrimaryKeyColumn>(
+                options.config ?? {},
+                database,
+                tableName,
+                options.primaryKeyColumns,
             );
 
             await table.initialize();
 
-            promisedTable.resolve(table);
+            promisedTable.resolve(table as unknown as CoreDatabaseTable);
         }
 
-        return this.cacheTables[site.id];
+        return this.siteTables[siteId][tableName] as unknown as Promise<CoreDatabaseTable<DBRecord, PrimaryKeyColumn>>;
     }
 
     /**
diff --git a/src/core/utils/lazy-map.ts b/src/core/utils/lazy-map.ts
new file mode 100644
index 000000000..3570c111c
--- /dev/null
+++ b/src/core/utils/lazy-map.ts
@@ -0,0 +1,40 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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.
+
+/**
+ * Lazy map.
+ *
+ * Lazy maps are empty by default, but entries are generated lazily when accessed.
+ */
+export type LazyMap<T> = Record<string, T>;
+
+/**
+ * Create a map that will initialize entries lazily with the given constructor.
+ *
+ * @param lazyConstructor Constructor to use the first time an entry is accessed.
+ * @returns Lazy map.
+ */
+export function lazyMap<T>(lazyConstructor: (key: string) => T): LazyMap<T> {
+    const instances = {};
+
+    return new Proxy(instances, {
+        get(target, property, receiver) {
+            if (!(property in instances)) {
+                target[property] = lazyConstructor(property.toString());
+            }
+
+            return Reflect.get(target, property, receiver);
+        },
+    });
+}

From b8dbc9aa5b2c87fa0a7e419869969cdf1e456151 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Mon, 7 Feb 2022 14:02:29 +0100
Subject: [PATCH 0467/1008] MOBILE-3977 core: Rename database table getters

---
 .../classes/database/database-table-proxy.ts  | 12 +++++------
 src/core/classes/database/database-table.ts   |  6 +++---
 .../classes/database/debug-database-table.ts  | 16 +++++++--------
 .../classes/database/eager-database-table.ts  |  8 ++++----
 .../classes/database/lazy-database-table.ts   |  8 ++++----
 src/core/classes/site.ts                      |  6 +++---
 src/core/classes/tests/database-table.test.ts | 20 +++++++++----------
 src/core/services/config.ts                   |  2 +-
 src/core/services/filepool.ts                 |  6 +++---
 9 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/src/core/classes/database/database-table-proxy.ts b/src/core/classes/database/database-table-proxy.ts
index 0a9006282..58393f943 100644
--- a/src/core/classes/database/database-table-proxy.ts
+++ b/src/core/classes/database/database-table-proxy.ts
@@ -67,22 +67,22 @@ export class CoreDatabaseTableProxy<
     /**
      * @inheritdoc
      */
-    async all(conditions?: Partial<DBRecord>): Promise<DBRecord[]> {
-        return this.target.all(conditions);
+    async getMany(conditions?: Partial<DBRecord>): Promise<DBRecord[]> {
+        return this.target.getMany(conditions);
     }
 
     /**
      * @inheritdoc
      */
-    async find(conditions: Partial<DBRecord>): Promise<DBRecord> {
-        return this.target.find(conditions);
+    async getOne(conditions: Partial<DBRecord>): Promise<DBRecord> {
+        return this.target.getOne(conditions);
     }
 
     /**
      * @inheritdoc
      */
-    async findByPrimaryKey(primaryKey: PrimaryKey): Promise<DBRecord> {
-        return this.target.findByPrimaryKey(primaryKey);
+    async getOneByPrimaryKey(primaryKey: PrimaryKey): Promise<DBRecord> {
+        return this.target.getOneByPrimaryKey(primaryKey);
     }
 
     /**
diff --git a/src/core/classes/database/database-table.ts b/src/core/classes/database/database-table.ts
index 2bb34ff89..f018b062c 100644
--- a/src/core/classes/database/database-table.ts
+++ b/src/core/classes/database/database-table.ts
@@ -80,7 +80,7 @@ export class CoreDatabaseTable<
      * @param conditions Matching conditions. If this argument is missing, all records in the table will be returned.
      * @returns Database records.
      */
-    all(conditions?: Partial<DBRecord>): Promise<DBRecord[]> {
+    getMany(conditions?: Partial<DBRecord>): Promise<DBRecord[]> {
         return conditions
             ? this.database.getRecords(this.tableName, conditions)
             : this.database.getAllRecords(this.tableName);
@@ -92,7 +92,7 @@ export class CoreDatabaseTable<
      * @param conditions Matching conditions.
      * @returns Database record.
      */
-    find(conditions: Partial<DBRecord>): Promise<DBRecord> {
+    getOne(conditions: Partial<DBRecord>): Promise<DBRecord> {
         return this.database.getRecord<DBRecord>(this.tableName, conditions);
     }
 
@@ -102,7 +102,7 @@ export class CoreDatabaseTable<
      * @param primaryKey Primary key.
      * @returns Database record.
      */
-    findByPrimaryKey(primaryKey: PrimaryKey): Promise<DBRecord> {
+    getOneByPrimaryKey(primaryKey: PrimaryKey): Promise<DBRecord> {
         return this.database.getRecord<DBRecord>(this.tableName, primaryKey);
     }
 
diff --git a/src/core/classes/database/debug-database-table.ts b/src/core/classes/database/debug-database-table.ts
index 09d80dad0..209c9abb1 100644
--- a/src/core/classes/database/debug-database-table.ts
+++ b/src/core/classes/database/debug-database-table.ts
@@ -58,28 +58,28 @@ export class CoreDebugDatabaseTable<
     /**
      * @inheritdoc
      */
-    all(conditions?: Partial<DBRecord>): Promise<DBRecord[]> {
-        this.logger.log('all', conditions);
+    getMany(conditions?: Partial<DBRecord>): Promise<DBRecord[]> {
+        this.logger.log('getMany', conditions);
 
-        return this.target.all(conditions);
+        return this.target.getMany(conditions);
     }
 
     /**
      * @inheritdoc
      */
-    find(conditions: Partial<DBRecord>): Promise<DBRecord> {
-        this.logger.log('find', conditions);
+    getOne(conditions: Partial<DBRecord>): Promise<DBRecord> {
+        this.logger.log('getOne', conditions);
 
-        return this.target.find(conditions);
+        return this.target.getOne(conditions);
     }
 
     /**
      * @inheritdoc
      */
-    findByPrimaryKey(primaryKey: PrimaryKey): Promise<DBRecord> {
+    getOneByPrimaryKey(primaryKey: PrimaryKey): Promise<DBRecord> {
         this.logger.log('findByPrimaryKey', primaryKey);
 
-        return this.target.findByPrimaryKey(primaryKey);
+        return this.target.getOneByPrimaryKey(primaryKey);
     }
 
     /**
diff --git a/src/core/classes/database/eager-database-table.ts b/src/core/classes/database/eager-database-table.ts
index 7cc3cf53c..37b09342c 100644
--- a/src/core/classes/database/eager-database-table.ts
+++ b/src/core/classes/database/eager-database-table.ts
@@ -34,7 +34,7 @@ export class CoreEagerDatabaseTable<
      * @inheritdoc
      */
     async initialize(): Promise<void> {
-        const records = await super.all();
+        const records = await super.getMany();
 
         this.records = records.reduce((data, record) => {
             const primaryKey = this.serializePrimaryKey(this.getPrimaryKeyFromRecord(record));
@@ -48,7 +48,7 @@ export class CoreEagerDatabaseTable<
     /**
      * @inheritdoc
      */
-    async all(conditions?: Partial<DBRecord>): Promise<DBRecord[]> {
+    async getMany(conditions?: Partial<DBRecord>): Promise<DBRecord[]> {
         const records = Object.values(this.records);
 
         return conditions
@@ -59,7 +59,7 @@ export class CoreEagerDatabaseTable<
     /**
      * @inheritdoc
      */
-    async find(conditions: Partial<DBRecord>): Promise<DBRecord> {
+    async getOne(conditions: Partial<DBRecord>): Promise<DBRecord> {
         const record = Object.values(this.records).find(record => this.recordMatches(record, conditions)) ?? null;
 
         if (record === null) {
@@ -72,7 +72,7 @@ export class CoreEagerDatabaseTable<
     /**
      * @inheritdoc
      */
-    async findByPrimaryKey(primaryKey: PrimaryKey): Promise<DBRecord> {
+    async getOneByPrimaryKey(primaryKey: PrimaryKey): Promise<DBRecord> {
         const record = this.records[this.serializePrimaryKey(primaryKey)] ?? null;
 
         if (record === null) {
diff --git a/src/core/classes/database/lazy-database-table.ts b/src/core/classes/database/lazy-database-table.ts
index cf64623a7..9ec890a20 100644
--- a/src/core/classes/database/lazy-database-table.ts
+++ b/src/core/classes/database/lazy-database-table.ts
@@ -33,12 +33,12 @@ export class CoreLazyDatabaseTable<
     /**
      * @inheritdoc
      */
-    async find(conditions: Partial<DBRecord>): Promise<DBRecord> {
+    async getOne(conditions: Partial<DBRecord>): Promise<DBRecord> {
         let record: DBRecord | null =
             Object.values(this.records).find(record => record && this.recordMatches(record, conditions)) ?? null;
 
         if (!record) {
-            record = await super.find(conditions);
+            record = await super.getOne(conditions);
 
             this.records[this.serializePrimaryKey(this.getPrimaryKeyFromRecord(record))] = record;
         }
@@ -49,12 +49,12 @@ export class CoreLazyDatabaseTable<
     /**
      * @inheritdoc
      */
-    async findByPrimaryKey(primaryKey: PrimaryKey): Promise<DBRecord> {
+    async getOneByPrimaryKey(primaryKey: PrimaryKey): Promise<DBRecord> {
         const serializePrimaryKey = this.serializePrimaryKey(primaryKey);
 
         if (!(serializePrimaryKey in this.records)) {
             try {
-                const record = await super.findByPrimaryKey(primaryKey);
+                const record = await super.getOneByPrimaryKey(primaryKey);
 
                 this.records[serializePrimaryKey] = record;
 
diff --git a/src/core/classes/site.ts b/src/core/classes/site.ts
index 4bcdf942e..d95590192 100644
--- a/src/core/classes/site.ts
+++ b/src/core/classes/site.ts
@@ -938,11 +938,11 @@ export class CoreSite {
         let entry: CoreSiteWSCacheRecord | undefined;
 
         if (preSets.getCacheUsingCacheKey || (emergency && preSets.getEmergencyCacheUsingCacheKey)) {
-            const entries = await this.cacheTable.all({ key: preSets.cacheKey });
+            const entries = await this.cacheTable.getMany({ key: preSets.cacheKey });
 
             if (!entries.length) {
                 // Cache key not found, get by params sent.
-                entry = await this.cacheTable.findByPrimaryKey({ id });
+                entry = await this.cacheTable.getOneByPrimaryKey({ id });
             } else {
                 if (entries.length > 1) {
                     // More than one entry found. Search the one with same ID as this call.
@@ -954,7 +954,7 @@ export class CoreSite {
                 }
             }
         } else {
-            entry = await this.cacheTable.findByPrimaryKey({ id });
+            entry = await this.cacheTable.getOneByPrimaryKey({ id });
         }
 
         if (entry === undefined) {
diff --git a/src/core/classes/tests/database-table.test.ts b/src/core/classes/tests/database-table.test.ts
index 4d02603d2..9c7f1757f 100644
--- a/src/core/classes/tests/database-table.test.ts
+++ b/src/core/classes/tests/database-table.test.ts
@@ -78,10 +78,10 @@ async function testFindItems(records: User[], table: CoreDatabaseTable<User>) {
 
     await table.initialize();
 
-    await expect(table.findByPrimaryKey({ id: 1 })).resolves.toEqual(john);
-    await expect(table.findByPrimaryKey({ id: 2 })).resolves.toEqual(amy);
-    await expect(table.find({ surname: 'Doe', name: 'John' })).resolves.toEqual(john);
-    await expect(table.find({ surname: 'Doe', name: 'Amy' })).resolves.toEqual(amy);
+    await expect(table.getOneByPrimaryKey({ id: 1 })).resolves.toEqual(john);
+    await expect(table.getOneByPrimaryKey({ id: 2 })).resolves.toEqual(amy);
+    await expect(table.getOne({ surname: 'Doe', name: 'John' })).resolves.toEqual(john);
+    await expect(table.getOne({ surname: 'Doe', name: 'Amy' })).resolves.toEqual(amy);
 }
 
 async function testInsertItems(records: User[], database: SQLiteDB, table: CoreDatabaseTable<User>) {
@@ -96,7 +96,7 @@ async function testInsertItems(records: User[], database: SQLiteDB, table: CoreD
     // Assert.
     expect(database.insertRecord).toHaveBeenCalledWith('users', john);
 
-    await expect(table.findByPrimaryKey({ id: 1 })).resolves.toEqual(john);
+    await expect(table.getOneByPrimaryKey({ id: 1 })).resolves.toEqual(john);
 }
 
 async function testDeleteItems(records: User[], database: SQLiteDB, table: CoreDatabaseTable<User>) {
@@ -117,9 +117,9 @@ async function testDeleteItems(records: User[], database: SQLiteDB, table: CoreD
     // Assert.
     expect(database.deleteRecords).toHaveBeenCalledWith('users', { surname: 'Doe' });
 
-    await expect(table.findByPrimaryKey({ id: 1 })).rejects.toThrow();
-    await expect(table.findByPrimaryKey({ id: 2 })).rejects.toThrow();
-    await expect(table.findByPrimaryKey({ id: 3 })).resolves.toEqual(jane);
+    await expect(table.getOneByPrimaryKey({ id: 1 })).rejects.toThrow();
+    await expect(table.getOneByPrimaryKey({ id: 2 })).rejects.toThrow();
+    await expect(table.getOneByPrimaryKey({ id: 3 })).resolves.toEqual(jane);
 }
 
 async function testDeleteItemsByPrimaryKey(records: User[], database: SQLiteDB, table: CoreDatabaseTable<User>) {
@@ -138,8 +138,8 @@ async function testDeleteItemsByPrimaryKey(records: User[], database: SQLiteDB,
     // Assert.
     expect(database.deleteRecords).toHaveBeenCalledWith('users', { id: 1 });
 
-    await expect(table.findByPrimaryKey({ id: 1 })).rejects.toThrow();
-    await expect(table.findByPrimaryKey({ id: 2 })).resolves.toEqual(amy);
+    await expect(table.getOneByPrimaryKey({ id: 1 })).rejects.toThrow();
+    await expect(table.getOneByPrimaryKey({ id: 2 })).resolves.toEqual(amy);
 }
 
 describe('CoreDatabaseTable with eager caching', () => {
diff --git a/src/core/services/config.ts b/src/core/services/config.ts
index 0ed248301..ef0f65d5a 100644
--- a/src/core/services/config.ts
+++ b/src/core/services/config.ts
@@ -89,7 +89,7 @@ export class CoreConfigProvider {
      */
     async get<T>(name: string, defaultValue?: T): Promise<T> {
         try {
-            const record = await this.table.findByPrimaryKey({ name });
+            const record = await this.table.getOneByPrimaryKey({ name });
 
             return record.value;
         } catch (error) {
diff --git a/src/core/services/filepool.ts b/src/core/services/filepool.ts
index 08bd6f078..b1d4c2380 100644
--- a/src/core/services/filepool.ts
+++ b/src/core/services/filepool.ts
@@ -586,7 +586,7 @@ export class CoreFilepoolProvider {
         const db = await CoreSites.getSiteDb(siteId);
 
         // Read the data first to be able to notify the deletions.
-        const filesEntries = await this.filesTables[siteId].all();
+        const filesEntries = await this.filesTables[siteId].getMany();
         const filesLinks = await db.getAllRecords<CoreFilepoolLinksRecord>(LINKS_TABLE_NAME);
 
         await Promise.all([
@@ -1427,7 +1427,7 @@ export class CoreFilepoolProvider {
 
         await Promise.all(items.map(async (item) => {
             try {
-                const fileEntry = await this.filesTables[siteId].findByPrimaryKey({ fileId: item.fileId });
+                const fileEntry = await this.filesTables[siteId].getOneByPrimaryKey({ fileId: item.fileId });
 
                 if (!fileEntry) {
                     return;
@@ -2160,7 +2160,7 @@ export class CoreFilepoolProvider {
      * @return Resolved with file object from DB on success, rejected otherwise.
      */
     protected async hasFileInPool(siteId: string, fileId: string): Promise<CoreFilepoolFileEntry> {
-        return this.filesTables[siteId].findByPrimaryKey({ fileId });
+        return this.filesTables[siteId].getOneByPrimaryKey({ fileId });
     }
 
     /**

From 9e028a03366d8c42a61db0795ead68632bdd692d Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 8 Feb 2022 07:56:45 +0100
Subject: [PATCH 0468/1008] MOBILE-3833 cordova: Update cordova plugins

---
 config.xml               |   1 +
 package-lock.json        | 178 ++++++++++++++++++++-------------------
 package.json             |  32 ++++---
 src/core/services/app.ts |  11 +--
 4 files changed, 113 insertions(+), 109 deletions(-)

diff --git a/config.xml b/config.xml
index 0fb53b7b8..bfcacc07b 100644
--- a/config.xml
+++ b/config.xml
@@ -51,6 +51,7 @@
     <preference name="AndroidXEnabled" value="true" />
     <preference name="GradlePluginGoogleServicesEnabled" value="true" />
     <preference name="GradlePluginGoogleServicesVersion" value="4.3.10" />
+    <preference name="StatusBarOverlaysWebView" value="false" />
     <feature name="StatusBar">
         <param name="ios-package" onload="true" value="CDVStatusBar" />
     </feature>
diff --git a/package-lock.json b/package-lock.json
index 25864fadb..e2c75415c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -56,15 +56,15 @@
         "@types/cordova": "0.0.34",
         "@types/dom-mediacapture-record": "^1.0.7",
         "chart.js": "^2.9.4",
-        "com-darryncampbell-cordova-plugin-intent": "^1.3.0",
+        "com-darryncampbell-cordova-plugin-intent": "^2.2.0",
         "cordova": "^10.0.0",
         "cordova-android": "^10.1.1",
         "cordova-clipboard": "^1.3.0",
         "cordova-ios": "^6.2.0",
         "cordova-plugin-add-swift-support": "^2.0.2",
-        "cordova-plugin-advanced-http": "^3.1.0",
+        "cordova-plugin-advanced-http": "^3.2.2",
         "cordova-plugin-badge": "^0.8.8",
-        "cordova-plugin-camera": "^5.0.1",
+        "cordova-plugin-camera": "^6.0.0",
         "cordova-plugin-chooser": "^1.3.2",
         "cordova-plugin-customurlscheme": "^5.0.2",
         "cordova-plugin-device": "^2.0.3",
@@ -73,17 +73,16 @@
         "cordova-plugin-geolocation": "^4.1.0",
         "cordova-plugin-globalization": "^1.11.0",
         "cordova-plugin-ionic-keyboard": "^2.2.0",
-        "cordova-plugin-media": "^5.0.3",
+        "cordova-plugin-media": "^5.0.4",
         "cordova-plugin-media-capture": "^3.0.3",
-        "cordova-plugin-network-information": "^2.0.2",
-        "cordova-plugin-prevent-override": "^1.0.0",
+        "cordova-plugin-network-information": "^3.0.0",
+        "cordova-plugin-prevent-override": "^1.0.1",
         "cordova-plugin-splashscreen": "^6.0.0",
-        "cordova-plugin-statusbar": "^2.4.3",
-        "cordova-plugin-wkuserscript": "^1.0.0",
-        "cordova-plugin-wkwebview-cookies": "^1.0.0",
+        "cordova-plugin-statusbar": "^3.0.0",
+        "cordova-plugin-wkuserscript": "^1.0.1",
+        "cordova-plugin-wkwebview-cookies": "^1.0.1",
         "cordova-sqlite-storage": "^6.0.0",
-        "cordova-support-google-services": "^1.2.1",
-        "cordova.plugins.diagnostic": "^5.0.2",
+        "cordova.plugins.diagnostic": "^6.1.1",
         "core-js": "^3.9.1",
         "es6-promise-plugin": "^4.2.2",
         "hammerjs": "^2.0.8",
@@ -10070,9 +10069,9 @@
       }
     },
     "node_modules/com-darryncampbell-cordova-plugin-intent": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/com-darryncampbell-cordova-plugin-intent/-/com-darryncampbell-cordova-plugin-intent-1.3.0.tgz",
-      "integrity": "sha512-JXslndd4UiRHmirGZrwrHZHczoZ5sxM7zAylm4bPX7ZDwD4FdCHhILgDA8AeaG8wc11e0A7OEAFo0Esgc0M4yA=="
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/com-darryncampbell-cordova-plugin-intent/-/com-darryncampbell-cordova-plugin-intent-2.2.0.tgz",
+      "integrity": "sha512-4ESoeYghE9GGuxKi4pnG+6CUJyYjS2j1tOmvlXXEM/9d5aBU47EpWbKKU1gjcfZFM4KCUbyba1NX6xNcH/L/wA=="
     },
     "node_modules/combined-stream": {
       "version": "1.0.8",
@@ -11044,9 +11043,9 @@
       }
     },
     "node_modules/cordova-plugin-advanced-http": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-advanced-http/-/cordova-plugin-advanced-http-3.1.0.tgz",
-      "integrity": "sha512-zlTlNJyTttE7TV5vW2WGvHqpbKMDVrr1meZU0fy4y3ObrI/hGk2UDcDNwpZdMfaytNZwDKU4sRgsTgQYdFNBew==",
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-advanced-http/-/cordova-plugin-advanced-http-3.2.2.tgz",
+      "integrity": "sha512-9djtQuRwWMqCLTNRrtAIlGyRcs2D0AJXOzkedOQ6udlg3IVE58hhxjrFOdKz6WvoJ6w2MNVeRYafYvoWLHFuMA==",
       "engines": [
         {
           "name": "cordova",
@@ -11088,9 +11087,9 @@
       ]
     },
     "node_modules/cordova-plugin-camera": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-camera/-/cordova-plugin-camera-5.0.1.tgz",
-      "integrity": "sha512-9gXyZvI8u9KzsZuqmB8Yw+uheF+7f+usMAwvOMw7L7pqbykg+bm9US5zjhJbwit3A1cSblgZkpBafe5cFiMcTA==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-camera/-/cordova-plugin-camera-6.0.0.tgz",
+      "integrity": "sha512-FTFKep8HZI/2HkX+Gc/dUACfZGV9+k9waXlgoEOKXOiPPR/1zBw29Mw+adcz4FQUpdWyAgYDxNiaPUnP0P+H2Q==",
       "engines": {
         "cordovaDependencies": {
           "3.0.0": {
@@ -11105,7 +11104,17 @@
             "cordova-android": ">=9.0.0",
             "cordova-ios": ">=5.1.0"
           },
+          "5.0.4-dev": {
+            "cordova": ">=9.0.0",
+            "cordova-android": "<10.0.0",
+            "cordova-ios": ">=5.1.0"
+          },
           "6.0.0": {
+            "cordova": ">=9.0.0",
+            "cordova-android": ">=10.0.0",
+            "cordova-ios": ">=5.1.0"
+          },
+          "7.0.0": {
             "cordova": ">100"
           }
         }
@@ -11195,9 +11204,9 @@
       "integrity": "sha512-yDUG+9ieKVRitq5mGlNxjaZh/MgEhFFIgTIPhqSbUaQ8UuZbawy5mhJAVClqY97q8/rcQtL6dCDa7x2sEtCLcA=="
     },
     "node_modules/cordova-plugin-media": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-media/-/cordova-plugin-media-5.0.3.tgz",
-      "integrity": "sha512-UQPFlpk1zL4BY44zGi8RVmYCvcKBCN4Dyf8ovxqGYCC8zR1yhbTRWYDdO9vJdERwbfgWV7+z7FMWiSUfqWm9bQ==",
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-media/-/cordova-plugin-media-5.0.4.tgz",
+      "integrity": "sha512-mAqincYqOT5gu5LWyfgJu3qmOq+lhLAKhnOZULpG622FvYiHjjfsoJ/fkI55WwI3FIcHeeyhToGvHXBCNJePZg==",
       "engines": {
         "cordovaDependencies": {
           "3.0.0": {
@@ -11231,21 +11240,24 @@
       }
     },
     "node_modules/cordova-plugin-network-information": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-network-information/-/cordova-plugin-network-information-2.0.2.tgz",
-      "integrity": "sha512-NwO3qDBNL/vJxUxBTPNOA1HvkDf9eTeGH8JSZiwy1jq2W2mJKQEDBwqWkaEQS19Yd/MQTiw0cykxg5D7u4J6cQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-network-information/-/cordova-plugin-network-information-3.0.0.tgz",
+      "integrity": "sha512-bBtP3PxIX8vshsfR0+F6co2e2cFLgjt18yKIdigzMwk6ANudWQ72RB3g2qMPyT6fBDWmUyE1Qd+bKQB/fZtQwQ==",
       "engines": {
         "cordovaDependencies": {
           "3.0.0": {
+            "cordova": ">=9"
+          },
+          "4.0.0": {
             "cordova": ">100"
           }
         }
       }
     },
     "node_modules/cordova-plugin-prevent-override": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-prevent-override/-/cordova-plugin-prevent-override-1.0.0.tgz",
-      "integrity": "sha512-/+3q5r4K5RahCpiYVmZQBjq10x4jj+6CMjYtZyx9jdMWeV+yFE+ItFcO1NeUAEWd2iHC5YPD0P2tHiHx5kscsw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-prevent-override/-/cordova-plugin-prevent-override-1.0.1.tgz",
+      "integrity": "sha512-yy1JZ+lXTR33Ai1yloT6wdXJXe0a3LrfgnKORuPZv/QkbiqfIQKjy0R4zRP8qljaJSelF/xv5CgrVt8iS0SkBg==",
       "engines": {
         "cordovaDependencies": {
           "3.0.0": {
@@ -11274,24 +11286,24 @@
       }
     },
     "node_modules/cordova-plugin-statusbar": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-statusbar/-/cordova-plugin-statusbar-2.4.3.tgz",
-      "integrity": "sha512-ThmXzl6QIKWFXf4wWw7Q/zpB+VKkz3VM958+5A0sXD4jmR++u7KnGttLksXshVwWr6lvGwUebLYtIyXwS4Ovcg==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-statusbar/-/cordova-plugin-statusbar-3.0.0.tgz",
+      "integrity": "sha512-nzkeWeyLA6+1FryzO0aeB6NS8MZ45gnBYeq2VZqfdNbddZEgtpI4XPYdBVxvm9NhcVoJ3tdA1OBnQD9JryoV0Q==",
       "engines": {
         "cordovaDependencies": {
           "0.1.0": {
             "cordova": ">=3.0.0"
           },
-          "3.0.0": {
+          "4.0.0": {
             "cordova": ">100"
           }
         }
       }
     },
     "node_modules/cordova-plugin-wkuserscript": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-wkuserscript/-/cordova-plugin-wkuserscript-1.0.0.tgz",
-      "integrity": "sha512-g18TohV1T+iWQJImYUCZc44x2ywHTH3ycgEJyxo4WTL9eYm4T7lNkyl1svzQGI97e8W5hQxUqAcmvpVcnWvjSQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-wkuserscript/-/cordova-plugin-wkuserscript-1.0.1.tgz",
+      "integrity": "sha512-qhb2JOFy+XnLIbPubDuAcZyf6fSsrQ2syM8PqAVvW7JJQVR7i64pZDLHmgYQrGN+2pO1fG8EdR2aUp5O0Kx/HA==",
       "engines": {
         "cordovaDependencies": {
           "3.0.0": {
@@ -11301,9 +11313,9 @@
       }
     },
     "node_modules/cordova-plugin-wkwebview-cookies": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-wkwebview-cookies/-/cordova-plugin-wkwebview-cookies-1.0.0.tgz",
-      "integrity": "sha512-bQRnc/1UNu2XDb6ds+RuAZGA8FM2MuQb4z45J/CaDfjSs60OSvxGVKo3okrM/okYosZqWJFygrPah0MK3lDERQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-wkwebview-cookies/-/cordova-plugin-wkwebview-cookies-1.0.1.tgz",
+      "integrity": "sha512-x984mlj21Newei7UFPTu4N3NJSTBZuuQXkDNJxq8FTGM1RH/YECqYAzk6ekk/regFamj1bCQ3IB8XJeCm5/dhA==",
       "engines": {
         "cordovaDependencies": {
           "3.0.0": {
@@ -11341,27 +11353,22 @@
       "resolved": "https://registry.npmjs.org/cordova-sqlite-storage-dependencies/-/cordova-sqlite-storage-dependencies-4.0.0.tgz",
       "integrity": "sha512-dTBxYaX/RGzH6+pp49o4sb3FuHCvhrssaKn1XMJ4LL3f9dnvz3rhFK2LdcWrdFkhOLOndnW/azUkbzZd+WWhRA=="
     },
-    "node_modules/cordova-support-google-services": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/cordova-support-google-services/-/cordova-support-google-services-1.2.1.tgz",
-      "integrity": "sha512-EnFjKAE9oI2uzyUvEfWpLgTM200nuJVvShaA4yyz9wMKBUN+H/BRG1byd1ibZz3sSihNKi3FxjQPxmmEn6/IfA=="
-    },
     "node_modules/cordova.plugins.diagnostic": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/cordova.plugins.diagnostic/-/cordova.plugins.diagnostic-5.0.2.tgz",
-      "integrity": "sha512-H59o7YxJ2/COzvg+jyTpUqX8QoDcvti9dluJ9a+pHumE8lf3meWemwCl0QFa9GH+xgVd6X1Ikj/6P3+DKWd9eg==",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/cordova.plugins.diagnostic/-/cordova.plugins.diagnostic-6.1.1.tgz",
+      "integrity": "sha512-JEc7MEPNDDrLb4RGmIwxoKIQ1AVRbh7OuDI8MTsdRqKFA/fQgdF3tK54uWbICUYBx9bQ0YY4FqNmkO0zkDyx5g==",
       "hasInstallScript": true,
       "dependencies": {
-        "colors": "^1.1.2",
+        "colors": "1.4.0",
         "elementtree": "^0.1.6",
         "minimist": "1.2.0"
       },
       "engines": {
         "cordovaDependencies": {
-          "4.0.0": {
-            "cordova": ">=7.1.0",
-            "cordova-android": ">=6.3.0",
-            "cordova-ios": ">=4.3.0"
+          "0.0.1": {
+            "cordova": ">=9.0.0",
+            "cordova-android": ">=8.0.0",
+            "cordova-ios": ">=5.0.0"
           }
         }
       }
@@ -38822,9 +38829,9 @@
       "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA=="
     },
     "com-darryncampbell-cordova-plugin-intent": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/com-darryncampbell-cordova-plugin-intent/-/com-darryncampbell-cordova-plugin-intent-1.3.0.tgz",
-      "integrity": "sha512-JXslndd4UiRHmirGZrwrHZHczoZ5sxM7zAylm4bPX7ZDwD4FdCHhILgDA8AeaG8wc11e0A7OEAFo0Esgc0M4yA=="
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/com-darryncampbell-cordova-plugin-intent/-/com-darryncampbell-cordova-plugin-intent-2.2.0.tgz",
+      "integrity": "sha512-4ESoeYghE9GGuxKi4pnG+6CUJyYjS2j1tOmvlXXEM/9d5aBU47EpWbKKU1gjcfZFM4KCUbyba1NX6xNcH/L/wA=="
     },
     "combined-stream": {
       "version": "1.0.8",
@@ -39591,9 +39598,9 @@
       }
     },
     "cordova-plugin-advanced-http": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-advanced-http/-/cordova-plugin-advanced-http-3.1.0.tgz",
-      "integrity": "sha512-zlTlNJyTttE7TV5vW2WGvHqpbKMDVrr1meZU0fy4y3ObrI/hGk2UDcDNwpZdMfaytNZwDKU4sRgsTgQYdFNBew=="
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-advanced-http/-/cordova-plugin-advanced-http-3.2.2.tgz",
+      "integrity": "sha512-9djtQuRwWMqCLTNRrtAIlGyRcs2D0AJXOzkedOQ6udlg3IVE58hhxjrFOdKz6WvoJ6w2MNVeRYafYvoWLHFuMA=="
     },
     "cordova-plugin-androidx-adapter": {
       "version": "1.1.3",
@@ -39611,9 +39618,9 @@
       "integrity": "sha512-RhIBtd5xhD/iLnxjt35jvOae28oNW/wtMZBOmQR3Rf0y4wirvA1bpAZEhBoFqL+rZGhsd6ddOdQXdex1T0DRyQ=="
     },
     "cordova-plugin-camera": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-camera/-/cordova-plugin-camera-5.0.1.tgz",
-      "integrity": "sha512-9gXyZvI8u9KzsZuqmB8Yw+uheF+7f+usMAwvOMw7L7pqbykg+bm9US5zjhJbwit3A1cSblgZkpBafe5cFiMcTA=="
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-camera/-/cordova-plugin-camera-6.0.0.tgz",
+      "integrity": "sha512-FTFKep8HZI/2HkX+Gc/dUACfZGV9+k9waXlgoEOKXOiPPR/1zBw29Mw+adcz4FQUpdWyAgYDxNiaPUnP0P+H2Q=="
     },
     "cordova-plugin-chooser": {
       "version": "1.3.2",
@@ -39656,9 +39663,9 @@
       "integrity": "sha512-yDUG+9ieKVRitq5mGlNxjaZh/MgEhFFIgTIPhqSbUaQ8UuZbawy5mhJAVClqY97q8/rcQtL6dCDa7x2sEtCLcA=="
     },
     "cordova-plugin-media": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-media/-/cordova-plugin-media-5.0.3.tgz",
-      "integrity": "sha512-UQPFlpk1zL4BY44zGi8RVmYCvcKBCN4Dyf8ovxqGYCC8zR1yhbTRWYDdO9vJdERwbfgWV7+z7FMWiSUfqWm9bQ=="
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-media/-/cordova-plugin-media-5.0.4.tgz",
+      "integrity": "sha512-mAqincYqOT5gu5LWyfgJu3qmOq+lhLAKhnOZULpG622FvYiHjjfsoJ/fkI55WwI3FIcHeeyhToGvHXBCNJePZg=="
     },
     "cordova-plugin-media-capture": {
       "version": "3.0.3",
@@ -39666,14 +39673,14 @@
       "integrity": "sha512-pVQOrNM7VAuVUMXibAlMGIArrftHPrRs4dUCoE+e2HEFUp3LmN3Yj539LjdUxcWmz/A/cHC65m9E3DS56YJhcg=="
     },
     "cordova-plugin-network-information": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-network-information/-/cordova-plugin-network-information-2.0.2.tgz",
-      "integrity": "sha512-NwO3qDBNL/vJxUxBTPNOA1HvkDf9eTeGH8JSZiwy1jq2W2mJKQEDBwqWkaEQS19Yd/MQTiw0cykxg5D7u4J6cQ=="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-network-information/-/cordova-plugin-network-information-3.0.0.tgz",
+      "integrity": "sha512-bBtP3PxIX8vshsfR0+F6co2e2cFLgjt18yKIdigzMwk6ANudWQ72RB3g2qMPyT6fBDWmUyE1Qd+bKQB/fZtQwQ=="
     },
     "cordova-plugin-prevent-override": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-prevent-override/-/cordova-plugin-prevent-override-1.0.0.tgz",
-      "integrity": "sha512-/+3q5r4K5RahCpiYVmZQBjq10x4jj+6CMjYtZyx9jdMWeV+yFE+ItFcO1NeUAEWd2iHC5YPD0P2tHiHx5kscsw=="
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-prevent-override/-/cordova-plugin-prevent-override-1.0.1.tgz",
+      "integrity": "sha512-yy1JZ+lXTR33Ai1yloT6wdXJXe0a3LrfgnKORuPZv/QkbiqfIQKjy0R4zRP8qljaJSelF/xv5CgrVt8iS0SkBg=="
     },
     "cordova-plugin-splashscreen": {
       "version": "6.0.0",
@@ -39681,19 +39688,19 @@
       "integrity": "sha512-pm4ZtJKQY4bCGXVeIInbGrXilryTevYSKgfvoQJpW9UClOWKAxSsYf2/4G2u1vcn492svOSL42OSa2MhujBWEQ=="
     },
     "cordova-plugin-statusbar": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-statusbar/-/cordova-plugin-statusbar-2.4.3.tgz",
-      "integrity": "sha512-ThmXzl6QIKWFXf4wWw7Q/zpB+VKkz3VM958+5A0sXD4jmR++u7KnGttLksXshVwWr6lvGwUebLYtIyXwS4Ovcg=="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-statusbar/-/cordova-plugin-statusbar-3.0.0.tgz",
+      "integrity": "sha512-nzkeWeyLA6+1FryzO0aeB6NS8MZ45gnBYeq2VZqfdNbddZEgtpI4XPYdBVxvm9NhcVoJ3tdA1OBnQD9JryoV0Q=="
     },
     "cordova-plugin-wkuserscript": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-wkuserscript/-/cordova-plugin-wkuserscript-1.0.0.tgz",
-      "integrity": "sha512-g18TohV1T+iWQJImYUCZc44x2ywHTH3ycgEJyxo4WTL9eYm4T7lNkyl1svzQGI97e8W5hQxUqAcmvpVcnWvjSQ=="
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-wkuserscript/-/cordova-plugin-wkuserscript-1.0.1.tgz",
+      "integrity": "sha512-qhb2JOFy+XnLIbPubDuAcZyf6fSsrQ2syM8PqAVvW7JJQVR7i64pZDLHmgYQrGN+2pO1fG8EdR2aUp5O0Kx/HA=="
     },
     "cordova-plugin-wkwebview-cookies": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-wkwebview-cookies/-/cordova-plugin-wkwebview-cookies-1.0.0.tgz",
-      "integrity": "sha512-bQRnc/1UNu2XDb6ds+RuAZGA8FM2MuQb4z45J/CaDfjSs60OSvxGVKo3okrM/okYosZqWJFygrPah0MK3lDERQ=="
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-wkwebview-cookies/-/cordova-plugin-wkwebview-cookies-1.0.1.tgz",
+      "integrity": "sha512-x984mlj21Newei7UFPTu4N3NJSTBZuuQXkDNJxq8FTGM1RH/YECqYAzk6ekk/regFamj1bCQ3IB8XJeCm5/dhA=="
     },
     "cordova-serve": {
       "version": "4.0.0",
@@ -39720,17 +39727,12 @@
       "resolved": "https://registry.npmjs.org/cordova-sqlite-storage-dependencies/-/cordova-sqlite-storage-dependencies-4.0.0.tgz",
       "integrity": "sha512-dTBxYaX/RGzH6+pp49o4sb3FuHCvhrssaKn1XMJ4LL3f9dnvz3rhFK2LdcWrdFkhOLOndnW/azUkbzZd+WWhRA=="
     },
-    "cordova-support-google-services": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/cordova-support-google-services/-/cordova-support-google-services-1.2.1.tgz",
-      "integrity": "sha512-EnFjKAE9oI2uzyUvEfWpLgTM200nuJVvShaA4yyz9wMKBUN+H/BRG1byd1ibZz3sSihNKi3FxjQPxmmEn6/IfA=="
-    },
     "cordova.plugins.diagnostic": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/cordova.plugins.diagnostic/-/cordova.plugins.diagnostic-5.0.2.tgz",
-      "integrity": "sha512-H59o7YxJ2/COzvg+jyTpUqX8QoDcvti9dluJ9a+pHumE8lf3meWemwCl0QFa9GH+xgVd6X1Ikj/6P3+DKWd9eg==",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/cordova.plugins.diagnostic/-/cordova.plugins.diagnostic-6.1.1.tgz",
+      "integrity": "sha512-JEc7MEPNDDrLb4RGmIwxoKIQ1AVRbh7OuDI8MTsdRqKFA/fQgdF3tK54uWbICUYBx9bQ0YY4FqNmkO0zkDyx5g==",
       "requires": {
-        "colors": "^1.1.2",
+        "colors": "1.4.0",
         "elementtree": "^0.1.6",
         "minimist": "1.2.0"
       },
diff --git a/package.json b/package.json
index caee985fb..2142826c7 100644
--- a/package.json
+++ b/package.json
@@ -85,15 +85,15 @@
     "@types/cordova": "0.0.34",
     "@types/dom-mediacapture-record": "^1.0.7",
     "chart.js": "^2.9.4",
-    "com-darryncampbell-cordova-plugin-intent": "^1.3.0",
+    "com-darryncampbell-cordova-plugin-intent": "^2.2.0",
     "cordova": "^10.0.0",
     "cordova-android": "^10.1.1",
     "cordova-clipboard": "^1.3.0",
     "cordova-ios": "^6.2.0",
     "cordova-plugin-add-swift-support": "^2.0.2",
-    "cordova-plugin-advanced-http": "^3.1.0",
+    "cordova-plugin-advanced-http": "^3.2.2",
     "cordova-plugin-badge": "^0.8.8",
-    "cordova-plugin-camera": "^5.0.1",
+    "cordova-plugin-camera": "^6.0.0",
     "cordova-plugin-chooser": "^1.3.2",
     "cordova-plugin-customurlscheme": "^5.0.2",
     "cordova-plugin-device": "^2.0.3",
@@ -102,17 +102,16 @@
     "cordova-plugin-geolocation": "^4.1.0",
     "cordova-plugin-globalization": "^1.11.0",
     "cordova-plugin-ionic-keyboard": "^2.2.0",
-    "cordova-plugin-media": "^5.0.3",
+    "cordova-plugin-media": "^5.0.4",
     "cordova-plugin-media-capture": "^3.0.3",
-    "cordova-plugin-network-information": "^2.0.2",
-    "cordova-plugin-prevent-override": "^1.0.0",
+    "cordova-plugin-network-information": "^3.0.0",
+    "cordova-plugin-prevent-override": "^1.0.1",
     "cordova-plugin-splashscreen": "^6.0.0",
-    "cordova-plugin-statusbar": "^2.4.3",
-    "cordova-plugin-wkuserscript": "^1.0.0",
-    "cordova-plugin-wkwebview-cookies": "^1.0.0",
+    "cordova-plugin-statusbar": "^3.0.0",
+    "cordova-plugin-wkuserscript": "^1.0.1",
+    "cordova-plugin-wkwebview-cookies": "^1.0.1",
     "cordova-sqlite-storage": "^6.0.0",
-    "cordova-support-google-services": "^1.2.1",
-    "cordova.plugins.diagnostic": "^5.0.2",
+    "cordova.plugins.diagnostic": "^6.1.1",
     "core-js": "^3.9.1",
     "es6-promise-plugin": "^4.2.2",
     "hammerjs": "^2.0.8",
@@ -183,11 +182,14 @@
       "ios"
     ],
     "plugins": {
-      "cordova-plugin-advanced-http": {},
+      "cordova-plugin-advanced-http": {
+        "ANDROIDBLACKLISTSECURESOCKETPROTOCOLS": "SSLv3,TLSv1"
+      },
       "cordova-clipboard": {},
       "cordova-plugin-badge": {},
       "cordova-plugin-camera": {
-        "ANDROID_SUPPORT_V4_VERSION": "27.+"
+        "ANDROID_SUPPORT_V4_VERSION": "27.+",
+        "ANDROIDX_CORE_VERSION": "1.6.+"
       },
       "cordova-plugin-chooser": {},
       "cordova-plugin-customurlscheme": {
@@ -229,7 +231,9 @@
       "com-darryncampbell-cordova-plugin-intent": {},
       "nl.kingsquare.cordova.background-audio": {},
       "cordova.plugins.diagnostic": {
-        "ANDROID_SUPPORT_VERSION": "28.+"
+        "ANDROID_SUPPORT_VERSION": "28.+",
+        "ANDROIDX_VERSION": "1.0.0",
+        "ANDROIDX_APPCOMPAT_VERSION": "1.3.1"
       },
       "cordova-plugin-globalization": {},
       "@moodlehq/cordova-plugin-file-transfer": {},
diff --git a/src/core/services/app.ts b/src/core/services/app.ts
index 8edb6bd62..dfa85e33c 100644
--- a/src/core/services/app.ts
+++ b/src/core/services/app.ts
@@ -654,17 +654,14 @@ export class CoreAppProvider {
         this.logger.debug(`Set status bar color ${color}`);
 
         const useLightText = CoreColors.isWhiteContrastingBetter(color);
-        const statusBar = StatusBar.instance;
-
-        this.isIOS() && statusBar.overlaysWebView(false);
 
         // styleDefault will use white text on iOS when darkmode is on. Force the background to black.
         if (this.isIOS() && !useLightText && window.matchMedia('(prefers-color-scheme: dark)').matches) {
-            statusBar.backgroundColorByHexString('#000000');
-            statusBar.styleLightContent();
+            StatusBar.backgroundColorByHexString('#000000');
+            StatusBar.styleLightContent();
         } else {
-            statusBar.backgroundColorByHexString(color);
-            useLightText ? statusBar.styleLightContent() : statusBar.styleDefault();
+            StatusBar.backgroundColorByHexString(color);
+            useLightText ? StatusBar.styleLightContent() : StatusBar.styleDefault();
         }
     }
 

From 4dfe1a85c12b0c541c5649b35affee662cc88217 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 8 Feb 2022 08:30:01 +0100
Subject: [PATCH 0469/1008] MOBILE-3910 login: Change text to accept site
 policy

---
 scripts/langindex.json                                       | 1 +
 src/core/features/login/lang.json                            | 1 +
 src/core/features/login/pages/email-signup/email-signup.html | 2 +-
 src/core/features/login/pages/site-policy/site-policy.html   | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 6899fcdff..6507a0414 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1956,6 +1956,7 @@
   "core.login.passwordforgotteninstructions2": "moodle",
   "core.login.passwordrequired": "local_moodlemobileapp",
   "core.login.policyaccept": "moodle",
+  "core.login.policyacceptmandatory": "local_moodlemobileapp",
   "core.login.policyagree": "moodle",
   "core.login.policyagreement": "moodle",
   "core.login.policyagreementclick": "moodle",
diff --git a/src/core/features/login/lang.json b/src/core/features/login/lang.json
index 240b6a6e5..f3716516e 100644
--- a/src/core/features/login/lang.json
+++ b/src/core/features/login/lang.json
@@ -86,6 +86,7 @@
     "passwordforgotteninstructions2": "To reset your password, submit your username or your email address below. If we can find you in the database, an email will be sent to your email address, with instructions how to get access again.",
     "passwordrequired": "Password required",
     "policyaccept": "I understand and agree",
+    "policyacceptmandatory": "I understand and agree to the mandatory site policies",
     "policyagree": "You must agree to this policy to continue using this site.  Do you agree?",
     "policyagreement": "Site policy agreement",
     "policyagreementclick": "Link to site policy agreement",
diff --git a/src/core/features/login/pages/email-signup/email-signup.html b/src/core/features/login/pages/email-signup/email-signup.html
index ddd61f93a..8aeae3721 100644
--- a/src/core/features/login/pages/email-signup/email-signup.html
+++ b/src/core/features/login/pages/email-signup/email-signup.html
@@ -209,7 +209,7 @@
                 </ion-item>
                 <ion-item class="ion-text-wrap">
                     <ion-label>
-                        <span [core-mark-required]="true">{{ 'core.login.policyaccept' | translate }}</span>
+                        <span [core-mark-required]="true">{{ 'core.login.policyacceptmandatory' | translate }}</span>
                         <core-input-errors [control]="signupForm.controls.policyagreed" [errorMessages]="policyErrors">
                         </core-input-errors>
                     </ion-label>
diff --git a/src/core/features/login/pages/site-policy/site-policy.html b/src/core/features/login/pages/site-policy/site-policy.html
index d061ab406..05a67d683 100644
--- a/src/core/features/login/pages/site-policy/site-policy.html
+++ b/src/core/features/login/pages/site-policy/site-policy.html
@@ -28,7 +28,7 @@
                 <core-iframe [src]="sitePolicy"></core-iframe>
             </ion-card>
             <ion-button class="ion-text-wrap ion-margin-horizontal" expand="block" (click)="accept()">
-                {{ 'core.login.policyaccept' | translate }}
+                {{ 'core.login.policyacceptmandatory' | translate }}
             </ion-button>
             <ion-button class="ion-text-wrap ion-margin-horizontal ion-margin-bottom" expand="block" color="light" (click)="cancel()">
                 {{ 'core.login.cancel' | translate }}

From a3bcde2970c187a763fde91c2cbd05ee72b9d8a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 4 Feb 2022 13:33:51 +0100
Subject: [PATCH 0470/1008] MOBILE-3814 course: Style course cards

---
 .../recentlyaccesseditems.scss                |   8 +
 .../download-refresh/download-refresh.ts      |   3 +-
 .../features/course/pages/index/index.scss    |   1 +
 .../core-courses-course-list-item.html        | 152 ++++-----
 .../course-list-item/course-list-item.scss    | 306 +++++++++++-------
 .../course-list-item/course-list-item.ts      |  27 +-
 .../core-courses-course-progress.html         |   4 +-
 src/core/services/app.ts                      |   2 +-
 src/core/singletons/colors.ts                 |  37 ++-
 src/theme/components/format-text.scss         |   4 +-
 src/theme/globals.mixins.scss                 |   7 -
 src/theme/theme.base.scss                     |  17 +-
 src/theme/theme.light.scss                    |   2 +
 13 files changed, 349 insertions(+), 221 deletions(-)

diff --git a/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.scss b/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.scss
index 1f7d02104..77fad00dd 100644
--- a/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.scss
+++ b/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.scss
@@ -6,6 +6,14 @@
         ion-card {
             height: auto;
         }
+
+        .ion-text-wrap ion-label {
+            .item-heading, h2, p {
+                white-space: nowrap;
+                overflow: hidden;
+                text-overflow: ellipsis;
+            }
+        }
     }
 
     .core-course-module-handler {
diff --git a/src/core/components/download-refresh/download-refresh.ts b/src/core/components/download-refresh/download-refresh.ts
index e0ca3cea4..26487f98b 100644
--- a/src/core/components/download-refresh/download-refresh.ts
+++ b/src/core/components/download-refresh/download-refresh.ts
@@ -20,7 +20,8 @@ import { CoreAnimations } from '@components/animations';
  * Component to show a download button with refresh option, the spinner and the status of it.
  *
  * Usage:
- * <core-download-refresh [status]="status" enabled="true" canTrustDownload="true" action="download()"></core-download-refresh>
+ * <core-download-refresh [status]="status" [enabled]="true" [canTrustDownload]="true" (action)="download()">
+ * </core-download-refresh>
  */
 @Component({
     selector: 'core-download-refresh',
diff --git a/src/core/features/course/pages/index/index.scss b/src/core/features/course/pages/index/index.scss
index da91e59c2..bd9456dc2 100644
--- a/src/core/features/course/pages/index/index.scss
+++ b/src/core/features/course/pages/index/index.scss
@@ -6,6 +6,7 @@
         min-height: var(--core-courseimage-on-course-size);
         width: var(--core-courseimage-on-course-size);
         min-width: var(--core-courseimage-on-course-size);
+        --border-radius: var(--core-courseimage-radius);
     }
 
     @if ($core-show-courseimage-on-course) {
diff --git a/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html b/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
index 77d4e330e..625fd2ad1 100644
--- a/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
+++ b/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
@@ -1,106 +1,92 @@
-<ion-card class="core-course-list-item" *ngIf="layout == 'list' || layout == 'listwithenrol'" [class.item-dimmed]="course.hidden">
-    <ion-item class="ion-text-wrap" (click)="openCourse()" [class.item-disabled]="course.visible == 0"
-        [attr.aria-label]="course.displayname || course.fullname" button>
-        <ion-icon *ngIf="!course.courseImage" name="fas-graduation-cap" slot="start" class="course-icon core-course-thumb"
-            [attr.course-color]="course.color ? null : course.colorNumber" [style.color]="course.color">
-        </ion-icon>
-        <ion-avatar *ngIf="course.courseImage" slot="start" class="core-course-thumb">
-            <img [src]="course.courseImage" core-external-content alt="" />
-        </ion-avatar>
-        <ion-label>
-            <ion-row>
-                <ion-col class="ion-align-self-center">
-                    <ng-container *ngTemplateOutlet="mainInfo"></ng-container>
-                </ion-col>
-                <ion-col size="auto" class="ion-align-self-center">
-                    <ng-container *ngIf="!isEnrolled">
-                        <ion-icon *ngFor="let icon of enrolmentIcons" color="dark" size="small" [name]="icon.icon"
-                            [title]="icon.label | translate" [attr.aria-label]="icon.label | translate">
-                        </ion-icon>
-                    </ng-container>
-                    <ng-container *ngIf="isEnrolled">
-                        <ng-container *ngTemplateOutlet="download"></ng-container>
-                    </ng-container>
-                </ion-col>
-            </ion-row>
-            <p *ngIf="isEnrolled && progress! >= 0 && completionUserTracked !== false">
-                <core-progress-bar [progress]="progress" a11yText="core.courses.aria:courseprogress"></core-progress-bar>
-            </p>
-        </ion-label>
-    </ion-item>
-</ion-card>
+<ion-card [class.core-course-list-item]="layout == 'list' || layout == 'listwithenrol'"
+    [class.core-course-list-card]="layout == 'card' || layout == 'summarycard'" [class.item-dimmed]="course.hidden">
 
-<ion-card [attr.course-color]="course.color ? null : course.colorNumber" *ngIf="layout == 'card' || layout == 'summarycard'"
-    class="core-course-list-card" [class.item-dimmed]="course.hidden">
-    <div (click)="openCourse()" class="core-course-thumb" [class.core-course-color-img]="course.courseImage"
-        [style.background-color]="course.color">
+    <div *ngIf="layout == 'card' || layout == 'summarycard'" (click)="openCourse()" class="core-course-thumb"
+        [class.core-course-color-img]="course.courseImage">
         <img *ngIf="course.courseImage" [src]="course.courseImage" core-external-content alt="" />
+        <ion-icon *ngIf="!course.courseImage" name="fas-graduation-cap" class="course-icon">
+        </ion-icon>
+        <ng-container
+            *ngIf="isEnrolled && ((downloadCourseEnabled && !courseOptionMenuEnabled && showDownload) || courseOptionMenuEnabled)">
+            <ng-container *ngTemplateOutlet="download"></ng-container>
+        </ng-container>
     </div>
-    <ion-item button lines="none" (click)="openCourse()" [attr.aria-label]="course.displayname || course.fullname"
-        class="core-course-header" [class.item-disabled]="course.visible == 0"
-        [class.core-course-only-title]="layout == 'summarycard' || progress < 0 && completionUserTracked === false" detail="false">
-        <ion-label class="ion-text-wrap core-course-title">
-            <ion-row>
-                <ion-col>
-                    <ng-container *ngTemplateOutlet="mainInfo"></ng-container>
-                </ion-col>
-                <ion-col size="auto"
-                    *ngIf="isEnrolled && ((downloadCourseEnabled && !courseOptionMenuEnabled && showDownload) || courseOptionMenuEnabled)">
-                    <ng-container *ngTemplateOutlet="download"></ng-container>
-                </ion-col>
-            </ion-row>
-            <div *ngIf="layout == 'card' && progress >= 0 && completionUserTracked !== false" lines="none" class="core-course-progress">
+
+    <ion-item class="ion-text-wrap" button lines="none" detail="false" (click)="openCourse()"
+        [attr.aria-label]="course.displayname || course.fullname" [class.item-disabled]="course.visible == 0">
+
+        <ng-container *ngIf="layout == 'list' || layout == 'listwithenrol'">
+            <ion-icon *ngIf="!course.courseImage" name="fas-graduation-cap" slot="start" class="course-icon core-course-thumb">
+            </ion-icon>
+            <ion-avatar *ngIf="course.courseImage" slot="start" class="core-course-thumb">
+                <img [src]="course.courseImage" core-external-content alt="" />
+            </ion-avatar>
+        </ng-container>
+
+        <ion-label>
+            <div class="core-course-maininfo">
+                <p *ngIf="course.displayname && course.shortname && course.fullname != course.displayname"
+                    class="core-course-shortname core-course-additional-info">
+                    <core-format-text [text]="course.shortname" contextLevel="course" [contextInstanceId]="course.id">
+                    </core-format-text>
+                </p>
+
+                <p class="item-heading">
+                    <ion-icon name="fas-star" *ngIf="course.isfavourite" [attr.aria-label]="'core.courses.favourite' | translate">
+                    </ion-icon>
+                    <span class="sr-only" *ngIf="course.isfavourite">{{ 'core.courses.aria:favourite' | translate }}</span>
+
+                    <span class="sr-only">{{ 'core.courses.aria:coursename' | translate }}</span>
+                    <core-format-text [text]="course.fullname" contextLevel="course" [contextInstanceId]="course.id">
+                    </core-format-text>
+
+                    <span *ngIf="(layout == 'list' || layout == 'listwithenrol') && !isEnrolled" class="core-course-enrol-icons">
+                        <ion-icon *ngFor="let icon of enrolmentIcons" color="medium" [name]="icon.icon" [title]="icon.label | translate"
+                            [attr.aria-label]="icon.label | translate">
+                        </ion-icon>
+                    </span>
+
+                    <ion-icon *ngIf="downloadCourseEnabled && prefetchCourseData.downloadSucceeded" class="core-icon-downloaded"
+                        name="cloud-done" color="success" role="status" [attr.aria-label]="'core.downloaded' | translate"></ion-icon>
+                </p>
+
+                <ion-chip color="brand" *ngIf="course.categoryname"
+                    class="core-course-category core-course-additional-info ion-text-nowrap">
+                    <span class="sr-only">{{ 'core.courses.aria:coursecategory' | translate }}</span>
+                    <ion-label>
+                        <core-format-text [text]="course.categoryname"></core-format-text>
+                    </ion-label>
+                </ion-chip>
+            </div>
+
+            <div *ngIf="layout != 'summarycard' && isEnrolled && progress >= 0 && completionUserTracked !== false"
+                class="core-course-progress">
                 <core-progress-bar [progress]="progress" a11yText="core.courses.aria:courseprogress"></core-progress-bar>
             </div>
+
+            <ng-container *ngIf="layout == 'list' || layout == 'listwithenrol' && isEnrolled">
+                <ng-container *ngTemplateOutlet="download"></ng-container>
+            </ng-container>
         </ion-label>
     </ion-item>
-</ion-card>
 
+</ion-card>
 
 <ng-template #download>
     <div class="core-button-spinner" *ngIf="downloadCourseEnabled && !courseOptionMenuEnabled && showDownload">
         <core-download-refresh [status]="prefetchCourseData.status" [enabled]="downloadCourseEnabled"
-            [statusTranslatable]="prefetchCourseData.statusTranslatable" canTrustDownload="false" [loading]="prefetchCourseData.loading"
+            [statusTranslatable]="prefetchCourseData.statusTranslatable" [canTrustDownload]="false" [loading]="prefetchCourseData.loading"
             (action)="prefetchCourse()"></core-download-refresh>
     </div>
 
     <div class="core-button-spinner" *ngIf="courseOptionMenuEnabled">
-        <!-- Download course spinner. -->
-        <ion-spinner *ngIf="(downloadCourseEnabled && prefetchCourseData.icon == 'spinner') || showSpinner"
-            [attr.aria-label]="'core.loading' | translate"></ion-spinner>
-
-        <!-- Downloaded icon. -->
-        <ion-icon *ngIf="downloadCourseEnabled && prefetchCourseData.downloadSucceeded && !showSpinner" class="core-icon-downloaded"
-            name="cloud-done" color="success" role="status" [attr.aria-label]="'core.downloaded' | translate"></ion-icon>
-
         <!-- Options menu. -->
         <ion-button fill="clear" color="dark" (click)="showCourseOptionsMenu($event)" *ngIf="!showSpinner"
             [attr.aria-label]="('core.displayoptions' | translate)">
             <ion-icon name="ellipsis-vertical" slot="icon-only" aria-hidden="true"></ion-icon>
         </ion-button>
+
+        <!-- Loading options course spinner. -->
+        <ion-spinner *ngIf="showSpinner" [attr.aria-label]="'core.loading' | translate"></ion-spinner>
     </div>
 </ng-template>
-
-<ng-template #mainInfo>
-    <p *ngIf="course.categoryname || (course.displayname && course.shortname && course.fullname != course.displayname)"
-        class="core-course-additional-info">
-        <span *ngIf="course.categoryname" class="core-course-category">
-            <span class="sr-only">{{ 'core.courses.aria:coursecategory' | translate }}</span>
-            <core-format-text [text]="course.categoryname"></core-format-text>
-        </span>
-        <span *ngIf="course.categoryname && course.displayname && course.shortname && course.fullname != course.displayname"
-            class="core-course-category"> | </span>
-        <span *ngIf="course.displayname && course.shortname && course.fullname != course.displayname" class="core-course-shortname">
-            <core-format-text [text]="course.shortname" contextLevel="course" [contextInstanceId]="course.id">
-            </core-format-text>
-        </span>
-    </p>
-    <p class="item-heading">
-        <ion-icon name="fas-star" *ngIf="course.isfavourite" [attr.aria-label]="'core.courses.favourite' | translate">
-        </ion-icon>
-        <span class="sr-only" *ngIf="course.isfavourite">{{ 'core.courses.aria:favourite' | translate }}</span>
-        <span class="sr-only">{{ 'core.courses.aria:coursename' | translate }}</span>
-        <core-format-text [text]="course.fullname" contextLevel="course" [contextInstanceId]="course.id">
-        </core-format-text>
-    </p>
-</ng-template>
diff --git a/src/core/features/courses/components/course-list-item/course-list-item.scss b/src/core/features/courses/components/course-list-item/course-list-item.scss
index 47e14a6f0..cabfd5a53 100644
--- a/src/core/features/courses/components/course-list-item/course-list-item.scss
+++ b/src/core/features/courses/components/course-list-item/course-list-item.scss
@@ -1,67 +1,148 @@
 @import "~theme/globals";
 
-
-ion-card.core-course-list-item {
-    .course-icon {
-        color: white;
-        background: var(--gray-200);
-        padding: 8px;
-        font-size: 24px;
-        border-radius: 50%;
-        -webkit-transition: all 50ms ease-in-out;
-        transition: all 50ms ease-in-out;
-    }
-
+:host {
     @for $i from 0 to length($core-course-image-background) {
-        ion-icon[course-color="#{$i}"] {
-            color: var(--core-course-color-#{$i});
+        &.course-color-#{$i} {
+            --course-color: var(--core-course-color-#{$i});
+            --course-color-tint: var(--core-course-color-#{$i}-tint);
         }
     }
 
-    ion-avatar {
-        -webkit-transition: all 50ms ease-in-out;
-        transition: all 50ms ease-in-out;
-    }
+    --avatar-radius: var(--core-courseimage-radius);
+    --avatar-size: 60px;
+    --avatar-margin: 16px;
 
-    .core-course-thumb {
-        @include margin(12px, 16px, 12px, null);
-        align-self: flex-start;
-    }
+    --card-vertical-margin: 8px;
+    --card-radius: 12px;
 
-    .core-course-summary {
-        margin-top: 12px;
+    --shortname-size: 12px;
+
+    --button-size: 44px;
+    --button-padding: 10px;
+    --button-radius: 50%;
+    --button-background: rgba(255,255,255,0.5);
+
+    @include media-breakpoint-down(md) {
+        --avatar-size: 48px;
+        --avatar-margin: 12px;
     }
 }
 
+
+:host-context(body.dark) {
+    --button-background: rgba(0, 0, 0, 0.3);
+}
+
+// Common styles.
 .item-heading ion-icon {
     margin-right: 4px;
     color: var(--core-star-color);
 }
 
-ion-card.core-course-list-card {
-    --vertical-margin: 12px;
-    --border-radius: 16px;
+button {
+    z-index: 1;
+}
+
+ion-card {
+    --border-radius: var(--card-radius);
+}
+
+.core-button-spinner {
+    margin: 0;
+    position: absolute;
+    @include position(8px, 8px, null, null);
     display: flex;
     flex-direction: column;
-    align-self: stretch;
-    height: calc(100% - var(--vertical-margin) - var(--vertical-margin));
-    margin-top: var(--vertical-margin);
-    margin-bottom: var(--vertical-margin);
+    align-items: center;
 
-    @for $i from 0 to length($core-course-image-background) {
-        &[course-color="#{$i}"] .core-course-thumb {
-            background: var(--core-course-color-#{$i});
+    ion-spinner {
+        margin-top: 4px;
+    }
+
+    ::ng-deep ion-button {
+        --border-radius: var(--button-radius);
+        --background: var(--button-background);
+        --padding-top: var(--button-padding);
+        --padding-end: var(--button-padding);
+        --padding-bottom: var(--button-padding);
+        --padding-start: var(--button-padding);
+        width: var(--button-size);
+        height: var(--button-size);
+        margin: 0;
+        &::part(native) {
+            background: var(--background);
         }
     }
 
-    ion-row {
-        min-height: var(--a11y-min-target-size);
-        ion-col .core-button-spinner {
-            min-width: calc(var(--a11y-min-target-size) + 16px);
+    core-download-refresh ::ng-deep .core-icon-downloaded {
+        display: none;
+    }
+}
+
+.core-course-enrol-icons, .core-icon-downloaded {
+    @include margin-horizontal(4px, 0px);
+}
+
+.core-course-shortname {
+    font-size: var(--shortname-size);
+    color: var(--dark);
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+}
+
+ion-chip {
+    margin-top: 8px;
+    margin-left: 0;
+    margin-right: 0;
+    max-width: 100%;
+}
+
+
+// List layout.
+ion-card.core-course-list-item {
+    ion-icon.course-icon {
+        padding: 12px;
+        font-size: calc(var(--avatar-size) - 24px);
+        border-radius: var(--avatar-radius);
+        color: var(--course-color-tint);
+        background: var(--course-color, transparent);
+    }
+
+    ion-avatar {
+       --border-radius: var(--avatar-radius);
+        width: var(--avatar-size);
+        height: var(--avatar-size);
+        img {
+            background: transparent;
         }
     }
 
+    ion-item::part(native) {
+        --padding-start: var(--avatar-margin);
+    }
+
     .core-course-thumb {
+        @include margin(var(--avatar-margin), var(--avatar-margin), var(--avatar-margin), null);
+    }
+
+    .core-course-maininfo {
+        margin-right: 32px;
+    }
+}
+
+
+// Card layout.
+ion-card.core-course-list-card {
+    display: flex;
+    flex-direction: column;
+
+    height: calc(100% - var(--card-vertical-margin) - var(--card-vertical-margin));
+    margin-top: var(--card-vertical-margin);
+    margin-bottom: var(--card-vertical-margin);
+
+    .core-course-thumb {
+        background: var(--course-color, white);
         padding-top: 40%;
         width: 100%;
         overflow: hidden;
@@ -70,8 +151,20 @@ ion-card.core-course-list-card {
         position: relative;
         background-position: center;
         background-size: cover;
-        -webkit-transition: all 50ms ease-in-out;
-        transition: all 50ms ease-in-out;
+
+        ion-icon.course-icon {
+            color: white;
+            opacity: 50%;
+            position: absolute;
+            left: 0;
+            right: 0;
+            top: 50%;
+            bottom: 0;
+            width: 80px;
+            height: 80px;
+            margin: 0 auto;
+            transform: translateY(-50%);
+        }
 
         &.core-course-color-img {
             background: var(--ion-item-background);
@@ -87,6 +180,57 @@ ion-card.core-course-list-card {
         }
     }
 
+    .core-course-shortname {
+        margin-bottom: 8px;
+    }
+
+    ion-item {
+        flex-grow: 1;
+        display: flex;
+        flex-direction: column;
+
+        &::part(native) {
+            flex-grow: 1;
+            align-items: self-start;
+        }
+
+        > ion-label{
+            margin: 16px 0;
+
+            display: flex;
+            flex-direction: column;
+            align-items: flex-start;
+            align-self: stretch;
+            flex-grow: 1;
+
+            // Clamp one line with ellipsis on tablet view, and 2 in mobile.
+            .item-heading {
+                white-space: nowrap;
+                text-overflow: ellipsis;
+                overflow: hidden;
+            }
+
+            @include media-breakpoint-down(md) {
+                .item-heading {
+                    // Addition lines for 2 line or multiline ellipsis
+                    display: -webkit-box !important;
+                    -webkit-line-clamp: 2;
+                    -webkit-box-orient: vertical;
+                    white-space: normal;
+                }
+            }
+
+            .core-course-maininfo {
+                flex-grow: 1;
+                max-width: 100%;
+            }
+
+            .core-course-progress {
+                align-self: stretch;
+            }
+        }
+    }
+
     @if ($core-course-hide-thumb-on-cards) {
         .core-course-thumb {
             display: none;
@@ -99,56 +243,6 @@ ion-card.core-course-list-card {
         }
     }
 
-    .core-course-additional-info {
-        margin-bottom: 8px;
-    }
-
-    .core-course-header {
-        flex-grow: 1;
-        display: flex;
-        flex-direction: column;
-
-        --inner-padding-end: 0px;
-
-        &::part(native) {
-            flex-grow: 1;
-            align-items: self-start;
-        }
-
-        &.core-course-only-title {
-            &::part(native) {
-                flex-grow: 1;
-            }
-
-        }
-
-        .core-course-title {
-            margin: 12px 0;
-            flex-grow: 1;
-            width: 100%;
-            max-width: 100%;
-        }
-
-        .core-button-spinner {
-            margin: 0;
-        }
-        .core-button-spinner ion-spinner {
-            vertical-align: top; // the better option for most scenarios
-            vertical-align: -webkit-baseline-middle; // the best for those that support it
-        }
-
-        .core-button-spinner .core-icon-downloaded {
-            font-size: 28.8px;
-            margin-top: 8px;
-            vertical-align: top;
-        }
-
-        .item-button[icon-only] {
-            min-width: 50px;
-            width: 50px;
-        }
-    }
-
     @if ($core-course-hide-progress-on-cards) {
         .core-course-progress {
             display: none;
@@ -156,10 +250,6 @@ ion-card.core-course-list-card {
     }
 }
 
-button {
-    z-index: 1;
-}
-
 :host-context(.core-horizontal-scroll) {
     @include horizontal_scroll_item(80%, 250px, 300px);
 
@@ -168,31 +258,21 @@ button {
             padding-top: 30%;
         }
 
-        ion-item.core-course-header {
-            --padding-start: 4px;
+        ion-item {
+            --padding-start: 8px;
+            --inner-padding-end: 8px;
 
-            .core-course-title {
-                margin: 7px 0;
+            > ion-label {
+                margin: 8px 0;
+
+                .item-heading {
+                    display: block;
+                }
 
                 .item-heading ion-icon {
                     margin-right: 2px;
                 }
             }
-            .core-button-spinner {
-                min-height: 40px;
-                min-width: 40px;
-
-                ion-spinner {
-                    width: 20px;
-                    height: 20px;
-                }
-            }
-            .item-button[icon-only] {
-                min-width: 40px;
-                width: 40px;
-                padding: 8px;
-            }
-
         }
     }
 }
diff --git a/src/core/features/courses/components/course-list-item/course-list-item.ts b/src/core/features/courses/components/course-list-item/course-list-item.ts
index 5a5f5fa24..46a7defb0 100644
--- a/src/core/features/courses/components/course-list-item/course-list-item.ts
+++ b/src/core/features/courses/components/course-list-item/course-list-item.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { CoreConstants } from '@/core/constants';
-import { Component, Input, OnChanges, OnDestroy, OnInit } from '@angular/core';
+import { Component, ElementRef, Input, OnChanges, OnDestroy, OnInit } from '@angular/core';
 import { CoreCourseProvider, CoreCourse } from '@features/course/services/course';
 import { CoreCourseHelper, CorePrefetchStatusInfo } from '@features/course/services/course-helper';
 import { CoreUser } from '@features/user/services/user';
@@ -21,6 +21,7 @@ import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { Translate } from '@singletons';
+import { CoreColors } from '@singletons/colors';
 import { CoreEventCourseStatusChanged, CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreCourseListItem, CoreCourses, CoreCoursesProvider } from '../../services/courses';
 import { CoreCoursesHelper, CoreEnrolledCourseDataWithExtraInfoAndOptions } from '../../services/courses-helper';
@@ -64,11 +65,17 @@ export class CoreCoursesCourseListItemComponent implements OnInit, OnDestroy, On
     protected courseStatusObserver?: CoreEventObserver;
     protected siteUpdatedObserver?: CoreEventObserver;
 
+    protected element: HTMLElement;
+
+    constructor(element: ElementRef) {
+        this.element = element.nativeElement;
+    }
+
     /**
      * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
-        CoreCoursesHelper.loadCourseColorAndImage(this.course);
+        this.setCourseColor();
 
         // Assume is enroled if mode is not listwithenrol.
         this.isEnrolled = this.layout != 'listwithenrol' || this.course.progress !== undefined;
@@ -142,6 +149,22 @@ export class CoreCoursesCourseListItemComponent implements OnInit, OnDestroy, On
         }
     }
 
+    /**
+     * Set course color.
+     */
+    protected async setCourseColor(): Promise<void> {
+        await CoreCoursesHelper.loadCourseColorAndImage(this.course);
+
+        if (this.course.color) {
+            this.element.style.setProperty('--course-color', this.course.color);
+
+            const tint = CoreColors.lighter(this.course.color, 50);
+            this.element.style.setProperty('--course-color-tint', tint);
+        } else {
+            this.element.classList.add('course-color-' + this.course.colorNumber);
+        }
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/src/core/features/courses/components/course-progress/core-courses-course-progress.html b/src/core/features/courses/components/course-progress/core-courses-course-progress.html
index 7adb8fcc3..d89c865da 100644
--- a/src/core/features/courses/components/course-progress/core-courses-course-progress.html
+++ b/src/core/features/courses/components/course-progress/core-courses-course-progress.html
@@ -33,8 +33,8 @@
 
         <div class="core-button-spinner" *ngIf="downloadCourseEnabled && !courseOptionMenuEnabled && showDownload" slot="end">
             <core-download-refresh [status]="prefetchCourseData.status" [enabled]="downloadCourseEnabled"
-                [statusTranslatable]="prefetchCourseData.statusTranslatable" canTrustDownload="false" [loading]="prefetchCourseData.loading"
-                (action)="prefetchCourse()"></core-download-refresh>
+                [statusTranslatable]="prefetchCourseData.statusTranslatable" [canTrustDownload]="false"
+                [loading]="prefetchCourseData.loading" (action)="prefetchCourse()"></core-download-refresh>
         </div>
 
         <div class="core-button-spinner" *ngIf="courseOptionMenuEnabled" slot="end">
diff --git a/src/core/services/app.ts b/src/core/services/app.ts
index 8edb6bd62..68d84392d 100644
--- a/src/core/services/app.ts
+++ b/src/core/services/app.ts
@@ -647,7 +647,7 @@ export class CoreAppProvider {
         if (this.isAndroid()) {
             const rgb = CoreColors.hexToRGB(color);
             if (rgb.red != 255 || rgb.green != 255 || rgb.blue != 255) {
-                color = CoreColors.darker(color);
+                color = CoreColors.darker(color, 10);
             }
         }
 
diff --git a/src/core/singletons/colors.ts b/src/core/singletons/colors.ts
index 40c2cdffe..b86c8b500 100644
--- a/src/core/singletons/colors.ts
+++ b/src/core/singletons/colors.ts
@@ -25,10 +25,15 @@ interface ColorComponents {
  * Ionic color names.
  */
 export enum CoreIonicColorNames {
+    BRAND = 'brand',
+    PRIMARY = 'primary',
+    SECONDARY = 'secondary',
     SUCCESS = 'success',
-    INFO = 'info',
+    WARNING = 'warning',
     DANGER = 'danger',
+    INFO = 'info',
     DARK = 'dark',
+    MEDIUM = 'medium',
     LIGHT = 'light',
     NONE = '',
 };
@@ -49,17 +54,35 @@ export class CoreColors {
     }
 
     /**
-     * Returns the same color 10% darker to be used as status bar on Android.
+     * Returns the same color % darker.
      *
      * @param color Color to get darker.
      * @return Darker Hex RGB color.
      */
-    static darker(color: string, percent: number = 10): string {
-        percent = 1 - (percent / 100);
+    static darker(color: string, percent: number = 48): string {
+        const inversePercent = 1 - (percent / 100);
         const components = CoreColors.hexToRGB(color);
-        components.red = Math.floor(components.red * percent);
-        components.green = Math.floor(components.green * percent);
-        components.blue = Math.floor(components.blue * percent);
+        components.red = Math.floor(components.red * inversePercent);
+        components.green = Math.floor(components.green * inversePercent);
+        components.blue = Math.floor(components.blue * inversePercent);
+
+        return CoreColors.RGBToHex(components);
+    }
+
+    /**
+     * Returns the same color % lighter.
+     *
+     * @param color Color to get lighter.
+     * @return Lighter Hex RGB color.
+     */
+    static lighter(color: string, percent: number = 80): string {
+        percent = percent / 100;
+        const inversePercent = 1 - percent;
+
+        const components = CoreColors.hexToRGB(color);
+        components.red = Math.floor(255 * percent + components.red * inversePercent);
+        components.green = Math.floor(255 * percent + components.green * inversePercent);
+        components.blue = Math.floor(255 * percent + components.blue * inversePercent);
 
         return CoreColors.RGBToHex(components);
     }
diff --git a/src/theme/components/format-text.scss b/src/theme/components/format-text.scss
index b0086039e..8ffe17e5d 100644
--- a/src/theme/components/format-text.scss
+++ b/src/theme/components/format-text.scss
@@ -31,8 +31,8 @@ core-format-text {
         opacity: 1;
         background-color: rgba(0,0,0,.1);
         overflow: hidden;
-        border-radius: 5px;
         display: block;
+        border-radius: var(--small-radius);
 
         .core-format-text-loader {
             position: absolute;
@@ -179,7 +179,7 @@ core-format-text {
         position: absolute;
         @include position(null, 10px, 10px, null);
         color: var(--ion-text-color);
-        border-radius: 5px;
+        border-radius: var(--small-radius);
         background-color: var(--core-format-text-viewer-icon-background);
         display: flex;
 
diff --git a/src/theme/globals.mixins.scss b/src/theme/globals.mixins.scss
index d62c8d2c8..0082bb1e5 100644
--- a/src/theme/globals.mixins.scss
+++ b/src/theme/globals.mixins.scss
@@ -220,13 +220,6 @@
         }
     }
 
-    .ion-text-wrap ion-label {
-        .item-heading, h2, p {
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-        }
-    }
 }
 
 
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 71386568d..e6027e705 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -174,13 +174,13 @@ ion-app.ios ion-header ion-title {
     text-overflow: ellipsis;
 }
 
-.item.ion-text-wrap ion-label core-format-text .core-format-text-content > *,
+.item.ion-text-wrap > ion-label core-format-text .core-format-text-content > *,
 .fake-ion-item.ion-text-wrap core-format-text .core-format-text-content > * {
     white-space: normal;
     overflow: inherit;
 }
 
-.item.ion-text-wrap ion-label {
+.item.ion-text-wrap > ion-label {
     white-space: normal !important;
 }
 
@@ -301,6 +301,10 @@ button,
     min-width: var(--a11y-min-target-size);
 }
 
+ion-button.button.button-clear.button-has-icon-only {
+    --border-radius: 50%;
+}
+
 // Clear buttons will be black.
 ion-button.button-clear {
     --primary: var(--primary);
@@ -848,7 +852,14 @@ ion-select-popover ion-item.core-select-option-title {
 
 ion-chip {
     line-height: 1.1;
-    @include padding-horizontal(16px);
+    font-size: 12px;
+    padding: 4px 8px;
+    height: 24px;
+
+    ion-icon {
+        font-size: 16px;
+        @include margin(0, 8px, 0, 0);
+    }
 
     &.ion-color {
         background: var(--ion-color-tint);
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 77c211e36..7eaa2bb89 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -271,6 +271,7 @@
     --core-send-message-input-color: var(--gray-900);
 
     --core-courseimage-on-course-size: 72px;
+    --core-courseimage-radius: var(--medium-radius);
 
     --core-course-module-navigation-max-height: 56px;
     --core-course-module-navigation-background: var(--contrast-background);
@@ -322,6 +323,7 @@
 
     @for $i from 0 to length($core-course-image-background) {
         --core-course-color-#{$i}: #{nth($core-course-image-background, $i + 1)};
+        --core-course-color-#{$i}-tint: #{get-color-tint(nth($core-course-image-background, $i + 1))};
     }
 
     @for $i from 0 to length($core-dd-question-colors) {

From 45d35a0864e1d06e18b38f35942f26b414b847c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 7 Feb 2022 17:31:32 +0100
Subject: [PATCH 0471/1008] MOBILE-3814 completion: Fix text wrap on completion
 buttons

---
 .../core-course-module-manual-completion.html             | 8 +++++---
 .../module-navigation/core-course-module-navigation.html  | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/core/features/course/components/module-manual-completion/core-course-module-manual-completion.html b/src/core/features/course/components/module-manual-completion/core-course-module-manual-completion.html
index 8f8e5d6e3..1720a23d8 100644
--- a/src/core/features/course/components/module-manual-completion/core-course-module-manual-completion.html
+++ b/src/core/features/course/components/module-manual-completion/core-course-module-manual-completion.html
@@ -2,20 +2,22 @@
 
     <ng-container *ngIf="completion.istrackeduser">
         <ng-container *ngIf="completion.state">
-            <ion-button color="success" fill="outline" [attr.aria-label]="accessibleDescription" (click)="completionClicked($event)">
+            <ion-button color="success" fill="outline" [attr.aria-label]="accessibleDescription" (click)="completionClicked($event)"
+                class="ion-text-wrap">
                 <ion-icon name="fas-check" slot="start" aria-hidden="true"></ion-icon>
                 {{ 'core.course.completion_manual:done' | translate }}
             </ion-button>
         </ng-container>
         <ng-container *ngIf="!completion.state">
-            <ion-button color="dark" fill="outline" [attr.aria-label]="accessibleDescription" (click)="completionClicked($event)">
+            <ion-button color="dark" fill="outline" [attr.aria-label]="accessibleDescription" (click)="completionClicked($event)"
+                class="ion-text-wrap">
                 {{ 'core.course.completion_manual:markdone' | translate }}
             </ion-button>
         </ng-container>
     </ng-container>
 
     <ng-container *ngIf="!completion.istrackeduser">
-        <ion-button disabled="true" color="dark" fill="outline">
+        <ion-button disabled="true" color="dark" fill="outline" class="ion-text-wrap">
             {{ 'core.course.completion_manual:markdone' | translate }}
         </ion-button>
     </ng-container>
diff --git a/src/core/features/course/components/module-navigation/core-course-module-navigation.html b/src/core/features/course/components/module-navigation/core-course-module-navigation.html
index 497b0e42e..34b0c5d27 100644
--- a/src/core/features/course/components/module-navigation/core-course-module-navigation.html
+++ b/src/core/features/course/components/module-navigation/core-course-module-navigation.html
@@ -1,5 +1,5 @@
 <core-loading [hideUntil]="loaded" [fullscreen]="false">
-    <ion-row class="ion-justify-content-between ion-align-items-center ion-no-padding" *ngIf="previousModule || nextModule">
+    <ion-row class="ion-justify-content-between ion-align-items-center ion-no-padding ion-wrap" *ngIf="previousModule || nextModule">
         <ion-col size="auto">
             <ion-button fill="clear" class="core-course-previous-module" *ngIf="previousModule" (click)="goToActivity(false)"
                 [attr.aria-label]="'core.course.gotopreviousactivity' | translate">

From a5be9fbc95f97a88d07b8b056adbdb9aa54f4f68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 8 Feb 2022 12:06:48 +0100
Subject: [PATCH 0472/1008] MOBILE-3808 styles: Some style fixes

---
 .../messages/pages/discussion/discussion.html |  2 +-
 .../messages/pages/discussion/discussion.scss |  4 --
 .../pages/course-storage/course-storage.html  |  4 +-
 .../core-download-refresh.html                |  4 +-
 .../download-refresh/download-refresh.ts      |  5 +-
 src/core/components/file/core-file.html       |  4 +-
 src/core/components/mod-icon/mod-icon.scss    |  4 +-
 src/core/components/tabs/tabs.scss            |  1 +
 src/core/directives/collapsible-header.ts     |  1 -
 .../core-course-module-completion.html        |  7 ++-
 .../components/module/core-course-module.html | 62 +++++++++++--------
 .../course/components/module/module.ts        |  5 +-
 src/core/features/login/login.scss            |  2 +-
 .../login/pages/credentials/credentials.html  |  4 +-
 .../login/pages/reconnect/reconnect.html      |  4 +-
 src/core/features/login/pages/site/site.html  |  4 +-
 .../features/sitehome/pages/index/index.html  |  8 +--
 .../features/sitehome/pages/index/index.scss  |  4 +-
 src/theme/components/format-text.scss         |  2 +-
 src/theme/theme.base.scss                     | 19 +++++-
 src/theme/theme.light.scss                    | 11 ++--
 21 files changed, 96 insertions(+), 65 deletions(-)

diff --git a/src/addons/messages/pages/discussion/discussion.html b/src/addons/messages/pages/discussion/discussion.html
index fe42e7ac1..68417d729 100644
--- a/src/addons/messages/pages/discussion/discussion.html
+++ b/src/addons/messages/pages/discussion/discussion.html
@@ -128,7 +128,7 @@
             [attr.aria-label]="'addon.messages.newmessages' | translate">
             <ion-icon name="fas-arrow-down" aria-hidden="true"></ion-icon>
             <span class="sr-only">{{ 'addon.messages.newmessages' | translate }}</span>
-            <span class="core-discussion-messages-badge">{{ newMessages }}</span>
+            <ion-badge class="core-discussion-messages-badge">{{ newMessages }}</ion-badge>
         </ion-fab-button>
     </ion-fab>
 </ion-content>
diff --git a/src/addons/messages/pages/discussion/discussion.scss b/src/addons/messages/pages/discussion/discussion.scss
index 2f8f0935d..57320a0c6 100644
--- a/src/addons/messages/pages/discussion/discussion.scss
+++ b/src/addons/messages/pages/discussion/discussion.scss
@@ -27,13 +27,9 @@
 
         .core-discussion-messages-badge {
             position: absolute;
-            border-radius: 50%;
             color: var(--addon-messages-discussion-badge-text);
             background-color: var(--addon-messages-discussion-badge);
             display: block;
-            line-height: 20px;
-            height: 20px;
-            width: 20px;
             @include position(-6px, -6px, null, null);
         }
     }
diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.html b/src/addons/storagemanager/pages/course-storage/course-storage.html
index 4db31b1e0..dab853fb1 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.html
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.html
@@ -55,7 +55,7 @@
                             <div *ngIf="downloadEnabled" slot="end" class="core-button-spinner">
                                 <core-download-refresh *ngIf="!section.isDownloading" [status]="section.downloadStatus" [enabled]="true"
                                     (action)="prefecthSection(section)" [loading]="section.isDownloading || section.isCalculating"
-                                    [canTrustDownload]="true" size="small">
+                                    [canTrustDownload]="true">
                                 </core-download-refresh>
 
                                 <ion-badge class="core-course-download-section-progress"
@@ -93,7 +93,7 @@
                                     </ion-icon>
                                 </ion-button>
                                 <core-download-refresh *ngIf="downloadEnabled && module.handlerData?.showDownloadButton"
-                                    [status]="module.downloadStatus" [enabled]="true" [canTrustDownload]="true" size="small"
+                                    [status]="module.downloadStatus" [enabled]="true" [canTrustDownload]="true"
                                     [loading]="module.spinner || module.handlerData.spinner" (action)="prefetchModule(module, section)">
                                 </core-download-refresh>
                             </div>
diff --git a/src/core/components/download-refresh/core-download-refresh.html b/src/core/components/download-refresh/core-download-refresh.html
index 9ba3490a9..f9580727f 100644
--- a/src/core/components/download-refresh/core-download-refresh.html
+++ b/src/core/components/download-refresh/core-download-refresh.html
@@ -1,14 +1,14 @@
 <ng-container *ngIf="enabled && !loading">
     <!-- Download button. -->
     <ion-button *ngIf="status == statusNotDownloaded" fill="clear" (click)="download($event, false)" color="dark" @coreShowHideAnimation
-        [attr.aria-label]="(statusTranslatable || 'core.download') | translate" [size]="size">
+        [attr.aria-label]="(statusTranslatable || 'core.download') | translate">
         <ion-icon slot="icon-only" name="cloud-download" aria-hidden="true"></ion-icon>
     </ion-button>
 
     <!-- Refresh button. -->
     <ion-button *ngIf="status == statusOutdated || (status == statusDownloaded && !canTrustDownload)" fill="clear"
         (click)="download($event, true)" color="dark" @coreShowHideAnimation
-        [attr.aria-label]="(statusTranslatable || 'core.refresh') | translate" [size]="size">
+        [attr.aria-label]="(statusTranslatable || 'core.refresh') | translate">
         <ion-icon slot="icon-only" name="fas-redo-alt" aria-hidden="true"></ion-icon>
     </ion-button>
 
diff --git a/src/core/components/download-refresh/download-refresh.ts b/src/core/components/download-refresh/download-refresh.ts
index 26487f98b..7dd013c02 100644
--- a/src/core/components/download-refresh/download-refresh.ts
+++ b/src/core/components/download-refresh/download-refresh.ts
@@ -35,7 +35,10 @@ export class CoreDownloadRefreshComponent {
     @Input() statusTranslatable?: string; // Download status translatable string.
     @Input() enabled = false; // Whether the download is enabled.
     @Input() loading = true; // Force loading status when is not downloading.
-    @Input() size: 'small' | 'default' | 'large' = 'default'; // Size of the buttons.
+    /**
+     * @deprecated since 4.0. It has no effect.
+     */
+    @Input() size = ''; // Size of the buttons.
     @Input() canTrustDownload = false; // If false, refresh will be shown if downloaded.
     @Output() action: EventEmitter<boolean>; // Will emit an event when the item clicked.
 
diff --git a/src/core/components/file/core-file.html b/src/core/components/file/core-file.html
index a5e2fbc7c..ff3e41e9b 100644
--- a/src/core/components/file/core-file.html
+++ b/src/core/components/file/core-file.html
@@ -9,7 +9,7 @@
     </ion-label>
     <div slot="end" class="flex-row">
         <core-download-refresh [status]="state" [enabled]="canDownload" [loading]="isDownloading" [canTrustDownload]="!alwaysDownload"
-            (action)="download()" size="small">
+            (action)="download()">
         </core-download-refresh>
 
         <ion-button fill="clear" *ngIf="isDownloaded && isIOS" (click)="openFile($event, true)" color="dark"
@@ -18,7 +18,7 @@
         </ion-button>
 
         <ion-button fill="clear" *ngIf="!isDownloading && canDelete" (click)="delete($event)" [attr.aria-label]="'core.delete' | translate"
-            color="danger" size="small">
+            color="danger">
             <ion-icon slot="icon-only" name="fas-trash" aria-hidden="true"></ion-icon>
         </ion-button>
     </div>
diff --git a/src/core/components/mod-icon/mod-icon.scss b/src/core/components/mod-icon/mod-icon.scss
index b0dcb46d0..45b236cb6 100644
--- a/src/core/components/mod-icon/mod-icon.scss
+++ b/src/core/components/mod-icon/mod-icon.scss
@@ -5,12 +5,13 @@
     --size: var(--module-icon-size);
     --margin-end: 0px;
     --margin-vertical: 0px;
+    --icon-radius: var(--small-radius);
 
     margin-top: var(--margin-vertical);
     margin-bottom: var(--margin-vertical);
     @include margin-horizontal(null, var(--margin-end));
 
-    border-radius: var(--small-radius);
+    border-radius: var(--icon-radius);
     padding: 0.7rem;
     background-color: $gray-100;
     line-height: var(--size);
@@ -50,4 +51,5 @@ img {
 :host-context(ion-card ion-item) {
     --margin-vertical: 12px;
     --margin-end: 12px;
+    --icon-radius: var(--module-icon-radius);
 }
diff --git a/src/core/components/tabs/tabs.scss b/src/core/components/tabs/tabs.scss
index dbc1f28e7..ff1c17bfe 100644
--- a/src/core/components/tabs/tabs.scss
+++ b/src/core/components/tabs/tabs.scss
@@ -7,6 +7,7 @@
     height: 100%;
     display: flex;
     flex-direction: column;
+    --ion-safe-area-top: 0px;
 
     ion-tabs {
         background: transparent;
diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts
index e0927de10..1981fd416 100644
--- a/src/core/directives/collapsible-header.ts
+++ b/src/core/directives/collapsible-header.ts
@@ -32,7 +32,6 @@ import { CoreMath } from '@singletons/math';
 })
 export class CoreCollapsibleHeaderDirective implements OnDestroy {
 
-    protected scrollElement?: HTMLElement;
     protected loadingObserver: CoreEventObserver;
     protected content?: HTMLIonContentElement | null;
     protected header: HTMLIonHeaderElement;
diff --git a/src/core/features/course/components/module-completion/core-course-module-completion.html b/src/core/features/course/components/module-completion/core-course-module-completion.html
index dbdc18616..a96265860 100644
--- a/src/core/features/course/components/module-completion/core-course-module-completion.html
+++ b/src/core/features/course/components/module-completion/core-course-module-completion.html
@@ -24,8 +24,11 @@
     </ng-container>
 
     <ng-container *ngIf="!completion.istrackeduser">
-        <ion-chip *ngFor="let rule of details" color="light" role="listitem">
-            <ion-label>{{ rule.rulevalue.description }}</ion-label>
+        <ion-chip *ngFor="let rule of details" role="listitem">
+            <ion-icon name="fas-edit" aria-hidden="true"></ion-icon>
+            <ion-label>
+                <strong>{{ 'core.course.completion_automatic:todo' | translate }}</strong> {{ rule.rulevalue.description }}
+            </ion-label>
         </ion-chip>
     </ng-container>
 </div>
diff --git a/src/core/features/course/components/module/core-course-module.html b/src/core/features/course/components/module/core-course-module.html
index adfa73f2a..5a85d4f1d 100644
--- a/src/core/features/course/components/module/core-course-module.html
+++ b/src/core/features/course/components/module/core-course-module.html
@@ -1,12 +1,12 @@
 <ion-card *ngIf="module.handlerData && module.visibleoncoursepage !== 0">
     <ng-container *ngIf="!module.handlerData.loading">
-        <ion-item id="core-course-module-{{module.id}}"
+        <ion-item id="core-course-module-{{module.id}}" detail="false" lines="none"
             class="ion-text-wrap core-course-module-handler core-module-main-item {{module.handlerData.class}}"
             (click)="moduleClicked($event)" [attr.aria-label]="module.handlerData.a11yTitle" [ngClass]="{
                 'has-module-info': hasInfo,
                 'item-media': module.handlerData.icon,
                 'item-dimmed': module.visible === 0 || module.uservisible === false
-            }" [button]="module.handlerData.action && module.uservisible" detail="false">
+            }" [button]="module.handlerData.action && module.uservisible">
 
             <core-mod-icon slot="start" *ngIf="module.handlerData.icon" [modicon]="module.handlerData.icon" [modname]="module.modname"
                 [componentId]="module.instance">
@@ -19,8 +19,8 @@
                     </core-format-text>
                 </p>
                 <ion-chip class="completioninfo completion_incomplete" *ngIf="completionStatus === 0">
+                    <ion-icon name="fas-edit" aria-hidden="true"></ion-icon>
                     <ion-label>
-                        <ion-icon name="fas-edit" aria-hidden="true"></ion-icon>
                         {{ 'core.course.todo' | translate }}
                     </ion-label>
                 </ion-chip>
@@ -50,7 +50,7 @@
 
                 <div class="core-module-buttons-more">
                     <!-- Buttons defined by the module handler. -->
-                    <ion-button fill="clear" *ngFor="let button of module.handlerData.buttons" color="dark" size="small"
+                    <ion-button fill="clear" *ngFor="let button of module.handlerData.buttons" color="dark"
                         [hidden]="button.hidden || module.handlerData.spinner" class="core-animate-show-hide"
                         (click)="buttonClicked($event, button)" [attr.aria-label]="button.label | translate:{$a: module.handlerData.title}">
                         <ion-icon [name]="button.icon" slot="icon-only" aria-hidden="true"></ion-icon>
@@ -58,11 +58,11 @@
                 </div>
             </div>
         </ion-item>
-        <ion-item *ngIf="hasInfo" id="core-course-module-{{module.id}}-info"
+        <ion-item *ngIf="hasInfo" id="core-course-module-{{module.id}}-info" detail="false" lines="none"
             class="ion-text-wrap core-course-module-handler core-course-module-info {{module.handlerData.class}}" [ngClass]="{
                 'item-media': module.handlerData.icon,
                 'item-dimmed': module.visible === 0 || module.uservisible === false
-            }" detail="false">
+            }">
             <ion-label>
                 <core-format-text class="core-module-description" *ngIf="module.description" [maxHeight]="80" [text]="module.description"
                     contextLevel="module" [contextInstanceId]="module.id" [courseId]="module.course">
@@ -82,30 +82,38 @@
                     [showManualCompletion]="showManualCompletion" (completionChanged)="completionChanged.emit($event)">
                 </core-course-module-completion>
 
-                <ion-chip *ngIf="module.completiondata?.offline" color="warning" class="ion-text-wrap block">
-                    <ion-icon name="fas-sync" aria-hidden="true"></ion-icon>
-                    <ion-label>{{ 'core.course.manualcompletionnotsynced' | translate }}</ion-label>
-                </ion-chip>
+                <div *ngIf="module.completiondata?.offline">
+                    <ion-chip color="warning">
+                        <ion-icon name="fas-sync" aria-hidden="true"></ion-icon>
+                        <ion-label>{{ 'core.course.manualcompletionnotsynced' | translate }}</ion-label>
+                    </ion-chip>
+                </div>
 
                 <!-- Availability -->
-                <ion-chip *ngIf="module.visible === 0 && (!section || section.visible)" class="ion-text-wrap block">
-                    <ion-icon name="fas-eye-slash" aria-hidden="true"></ion-icon>
-                    <ion-label>{{ 'core.course.hiddenfromstudents' | translate }}</ion-label>
-                </ion-chip>
+                <div *ngIf="module.visible === 0 && (!section || section.visible)">
+                    <ion-chip>
+                        <ion-icon name="fas-eye-slash" aria-hidden="true"></ion-icon>
+                        <ion-label>{{ 'core.course.hiddenfromstudents' | translate }}</ion-label>
+                    </ion-chip>
+                </div>
 
-                <ion-chip *ngIf="module.visible !== 0 && module.isStealth" class="ion-text-wrap block">
-                    <ion-icon name="fas-eye-slash" aria-hidden="true"></ion-icon>
-                    <ion-label>{{ 'core.course.hiddenoncoursepage' | translate }}</ion-label>
-                </ion-chip>
+                <div *ngIf="module.visible !== 0 && module.isStealth">
+                    <ion-chip>
+                        <ion-icon name="fas-eye-slash" aria-hidden="true"></ion-icon>
+                        <ion-label>{{ 'core.course.hiddenoncoursepage' | translate }}</ion-label>
+                    </ion-chip>
+                </div>
 
-                <ion-chip class="core-module-availabilityinfo ion-text-wrap block" *ngIf="module.availabilityinfo">
-                    <ion-icon name="fas-lock" [attr.aria-label]="'core.restricted' | translate"></ion-icon>
-                    <ion-label>
-                        <core-format-text [text]="module.availabilityinfo" contextLevel="module" [contextInstanceId]="module.id"
-                            [courseId]="module.course" class="ion-text-wrap">
-                        </core-format-text>
-                    </ion-label>
-                </ion-chip>
+                <div *ngIf="module.availabilityinfo">
+                    <ion-chip class="core-module-availabilityinfo">
+                        <ion-icon name="fas-lock" [attr.aria-label]="'core.restricted' | translate"></ion-icon>
+                        <ion-label>
+                            <core-format-text [text]="module.availabilityinfo" contextLevel="module" [contextInstanceId]="module.id"
+                                [courseId]="module.course">
+                            </core-format-text>
+                        </ion-label>
+                    </ion-chip>
+                </div>
 
             </ion-label>
         </ion-item>
@@ -114,7 +122,7 @@
     <!-- Loading. -->
     <ion-item *ngIf="module.handlerData.loading" role="status" class="ion-text-wrap" id="core-course-module-{{module.id}}"
         [attr.aria-label]="module.handlerData.a11yTitle"
-        [ngClass]="['core-course-module-handler', 'core-module-loading', module.handlerData.class]" detail="false">
+        [ngClass]="['core-course-module-handler', 'core-module-loading', module.handlerData.class]" detail="false" lines="none">
         <ion-label>
             <ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner>
         </ion-label>
diff --git a/src/core/features/course/components/module/module.ts b/src/core/features/course/components/module/module.ts
index 287c2a484..fa25f2e50 100644
--- a/src/core/features/course/components/module/module.ts
+++ b/src/core/features/course/components/module/module.ts
@@ -62,8 +62,9 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy {
         }
 
         this.module.handlerData.a11yTitle = this.module.handlerData.a11yTitle ?? this.module.handlerData.title;
-        this.completionStatus = this.module.completiondata === undefined ||
-                    this.module.completiondata.tracking == CoreCourseModuleCompletionTracking.COMPLETION_TRACKING_NONE
+        this.completionStatus = this.module.completiondata === undefined  ||
+                !this.module.completiondata?.istrackeduser ||
+                this.module.completiondata.tracking == CoreCourseModuleCompletionTracking.COMPLETION_TRACKING_NONE
             ? undefined
             : this.module.completiondata.state;
 
diff --git a/src/core/features/login/login.scss b/src/core/features/login/login.scss
index 129a185de..053125e44 100644
--- a/src/core/features/login/login.scss
+++ b/src/core/features/login/login.scss
@@ -106,7 +106,7 @@
 
 :host-context(body.dark) {
     @if ($core-login-button-outline-dark) {
-        form ion-button-dark {
+        form ion-button {
             --background: white;
             --color: var(--core-login-background-dark);
         }
diff --git a/src/core/features/login/pages/credentials/credentials.html b/src/core/features/login/pages/credentials/credentials.html
index bd28dced2..11772f5e6 100644
--- a/src/core/features/login/pages/credentials/credentials.html
+++ b/src/core/features/login/pages/credentials/credentials.html
@@ -56,7 +56,7 @@
                 <div class="ion-text-center ion-padding">{{ 'core.login.or' | translate }}</div>
                 <ion-button expand="block" color="light" class="ion-margin" lines="none" (click)="showInstructionsAndScanQR()">
                     <ion-icon slot="start" name="fas-qrcode" aria-hidden="true"></ion-icon>
-                    <ion-label>{{ 'core.scanqr' | translate }}</ion-label>
+                    {{ 'core.scanqr' | translate }}
                 </ion-button>
             </ng-container>
         </form>
@@ -64,7 +64,7 @@
         <!-- Forgotten password option. -->
         <ion-button *ngIf="showForgottenPassword" expand="block" fill="clear" color="dark"
             class="core-login-forgotten-password core-button-as-link ion-text-wrap" (click)="forgottenPassword()">
-            <ion-label>{{ 'core.login.forgotten' | translate }}</ion-label>
+            {{ 'core.login.forgotten' | translate }}
         </ion-button>
 
         <ion-list *ngIf="identityProviders && identityProviders.length" class="ion-padding-top core-login-identity-providers">
diff --git a/src/core/features/login/pages/reconnect/reconnect.html b/src/core/features/login/pages/reconnect/reconnect.html
index 5d41ab921..d8fa966ff 100644
--- a/src/core/features/login/pages/reconnect/reconnect.html
+++ b/src/core/features/login/pages/reconnect/reconnect.html
@@ -67,7 +67,7 @@
             <div class="ion-text-center ion-padding">{{ 'core.login.or' | translate }}</div>
             <ion-button expand="block" color="light" class="ion-margin" lines="none" (click)="showInstructionsAndScanQR()">
                 <ion-icon slot="start" name="fas-qrcode" aria-hidden="true"></ion-icon>
-                <ion-label>{{ 'core.scanqr' | translate }}</ion-label>
+                {{ 'core.scanqr' | translate }}
             </ion-button>
         </ng-container>
     </form>
@@ -75,7 +75,7 @@
     <!-- Forgotten password option. -->
     <ion-button *ngIf="showForgottenPassword && !isOAuth" expand="block" fill="clear" color="dark"
         class="core-login-forgotten-password core-button-as-link ion-text-wrap" (click)="forgottenPassword()">
-        <ion-label>{{ 'core.login.forgotten' | translate }}</ion-label>
+        {{ 'core.login.forgotten' | translate }}
     </ion-button>
 
     <!-- Identity providers. -->
diff --git a/src/core/features/login/pages/site/site.html b/src/core/features/login/pages/site/site.html
index 6302070b4..c6a3f8071 100644
--- a/src/core/features/login/pages/site/site.html
+++ b/src/core/features/login/pages/site/site.html
@@ -104,14 +104,14 @@
         <ion-button expand="block" color="light" class="ion-margin" lines="none" (click)="showInstructionsAndScanQR()"
             aria-haspopup="dialog">
             <ion-icon slot="start" name="fas-qrcode" aria-hidden="true"></ion-icon>
-            <ion-label>{{ 'core.scanqr' | translate }}</ion-label>
+            {{ 'core.scanqr' | translate }}
         </ion-button>
     </ng-container>
 
     <!-- Help. -->
     <ion-button class="ion-margin-top core-login-need-help core-button-as-link ion-text-wrap" (click)="showHelp()" aria-haspopup="dialog"
         expand="block" fill="clear" color="dark">
-        <ion-label>{{ 'core.needhelp' | translate }}</ion-label>
+        {{ 'core.needhelp' | translate }}
     </ion-button>
 </ion-content>
 
diff --git a/src/core/features/sitehome/pages/index/index.html b/src/core/features/sitehome/pages/index/index.html
index 4f422475d..45bd97c06 100644
--- a/src/core/features/sitehome/pages/index/index.html
+++ b/src/core/features/sitehome/pages/index/index.html
@@ -55,7 +55,7 @@
 </ion-content>
 
 <ng-template #allCourseList>
-    <ion-item button class="ion-text-wrap" (click)="openAvailableCourses()" detail="true">
+    <ion-item button class="ion-text-wrap" (click)="openAvailableCourses()" lines="none">
         <ion-icon name="fas-graduation-cap" fixed-width slot="start" aria-hidden="true"></ion-icon>
         <ion-label>
             <h2>{{ 'core.courses.availablecourses' | translate}}</h2>
@@ -69,7 +69,7 @@
 </ng-template>
 
 <ng-template #categories>
-    <ion-item button class="ion-text-wrap" (click)="openCourseCategories()" detail="true">
+    <ion-item button class="ion-text-wrap" (click)="openCourseCategories()" lines="none">
         <ion-icon name="fas-folder" slot="start" aria-hidden="true"></ion-icon>
         <ion-label>
             <h2>{{ 'core.courses.categories' | translate}}</h2>
@@ -78,7 +78,7 @@
 </ng-template>
 
 <ng-template #enrolledCourseList>
-    <ion-item button class="ion-text-wrap" (click)="openMyCourses()" detail="true">
+    <ion-item button class="ion-text-wrap" (click)="openMyCourses()" lines="none">
         <ion-icon name="fas-graduation-cap" fixed-width slot="start" aria-hidden="true">
         </ion-icon>
         <ion-label>
@@ -88,7 +88,7 @@
 </ng-template>
 
 <ng-template #courseSearch>
-    <ion-item button class="ion-text-wrap" (click)="openSearch()" detail="true">
+    <ion-item button class="ion-text-wrap" (click)="openSearch()" lines="none">
         <ion-icon name="fas-search" slot="start" aria-hidden="true"></ion-icon>
         <ion-label>
             <h2>{{ 'core.courses.searchcourses' | translate}}</h2>
diff --git a/src/core/features/sitehome/pages/index/index.scss b/src/core/features/sitehome/pages/index/index.scss
index 9aec56ba2..7a2bbde1d 100644
--- a/src/core/features/sitehome/pages/index/index.scss
+++ b/src/core/features/sitehome/pages/index/index.scss
@@ -2,7 +2,7 @@
 
 ion-item ion-icon {
     display: inline-block;
-    border-radius: var(--small-radius);
+    border-radius: var(--module-icon-radius);
     padding: 0.7rem;
     background-color: $gray-100;
     line-height: var(--size);
@@ -10,7 +10,7 @@ ion-item ion-icon {
     @include margin-horizontal(null, var(--margin-end));
 }
 
-core-course-module.core-sitehome-news ::ng-deep  ion-card {
+core-course-module.core-sitehome-news ::ng-deep ion-card {
     --border-width: 0;
     margin: 0;
     padding: 0;
diff --git a/src/theme/components/format-text.scss b/src/theme/components/format-text.scss
index 8ffe17e5d..a5fe5391d 100644
--- a/src/theme/components/format-text.scss
+++ b/src/theme/components/format-text.scss
@@ -699,7 +699,7 @@ core-rich-text-editor .core-rte-editor {
         padding: .25em .4em;
         font-size: 75%;
         font-weight: 700;
-        line-height: 1;
+        line-height: 1.1;
         text-align: center;
         white-space: nowrap;
         vertical-align: baseline;
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index e6027e705..31aed6866 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -189,6 +189,7 @@ ion-button core-format-text .core-format-text-content {
     overflow: hidden;
     text-overflow: ellipsis;
     display: block;
+    line-height: 1.2;
 }
 
 ion-button > * {
@@ -217,6 +218,10 @@ ion-button ion-spinner {
     --color: inherit !important;
 }
 
+ion-button:not(.button-has-icon-only) > ion-icon {
+    min-width: 20px;
+}
+
 @each $color-name, $unused in $colors {
     .text-#{$color-name},
     p.text-#{$color-name} {
@@ -850,14 +855,22 @@ ion-select-popover ion-item.core-select-option-title {
     }
 }
 
+ion-badge {
+    line-height: 1.1;
+    padding: 4px 8px;
+    border-radius: var(--big-radius);
+}
+
 ion-chip {
     line-height: 1.1;
     font-size: 12px;
     padding: 4px 8px;
-    height: 24px;
+    min-height: 24px;
+    height: auto;
 
     ion-icon {
         font-size: 16px;
+        min-width: 16px;
         @include margin(0, 8px, 0, 0);
     }
 
@@ -869,6 +882,10 @@ ion-chip {
             color: var(--ion-color-base);
         }
     }
+
+    ion-label {
+        white-space: normal !important;
+    }
 }
 
 ion-searchbar {
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 7eaa2bb89..1ad8d7b27 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -58,6 +58,11 @@
 
     --brand-color: var(--brand);
 
+    --small-radius: 4px;
+    --medium-radius: 8px;
+    --big-radius: 16px;
+    --huge-radius: 24px;
+
     // Accessibility vars.
     --a11y-min-target-size: 44px;
     --a11y-focus-color: var(--primary);
@@ -65,6 +70,7 @@
     --zoom-level: 100%;
 
     --module-icon-size: 24px;
+    --module-icon-radius: var(--medium-radius);
 
     --ion-background-color: var(--background-color);
     --ion-background-color-rgb: #{$background-color-rgb};
@@ -75,11 +81,6 @@
     --ion-text-color-rgb: #{$text-color-rgb};
     --subdued-text-color: var(--gray-700);
 
-    --small-radius: 4px;
-    --medium-radius: 8px;
-    --big-radius: 16px;
-    --huge-radius: 24px;
-
     --ion-card-color: var(--text-color);
     ion-card {
         --border-width: 1px;

From 88e82350bfa036e0db071c989c4f41bdcae5fd7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 8 Feb 2022 16:12:29 +0100
Subject: [PATCH 0473/1008] MOBILE-3808 utils: Add throttle function

---
 src/core/services/utils/utils.ts | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/core/services/utils/utils.ts b/src/core/services/utils/utils.ts
index b928c0e5e..3ddee12d1 100644
--- a/src/core/services/utils/utils.ts
+++ b/src/core/services/utils/utils.ts
@@ -1541,7 +1541,6 @@ export class CoreUtilsProvider {
     /**
      * Debounce a function so consecutive calls are ignored until a certain time has passed since the last call.
      *
-     * @param context The context to apply to the function.
      * @param fn Function to debounce.
      * @param delay Time that must pass until the function is called.
      * @return Debounced function.
@@ -1558,6 +1557,31 @@ export class CoreUtilsProvider {
         return debounced;
     }
 
+    /**
+     * Throttle a function so consecutive calls are ignored until a certain time has passed since the last executed call.
+     *
+     * @param fn Function to throttle.
+     * @param duration Time that must pass until the function is called.
+     * @return Throttled function.
+     */
+    throttle<T extends unknown[]>(fn: (...args: T) => unknown, duration: number): (...args: T) => void {
+        let shouldWait = false;
+
+        const throttled = (...args: T): void => {
+            if (!shouldWait) {
+                fn.apply(null, args);
+
+                shouldWait = true;
+
+                setTimeout(() => {
+                    shouldWait = false;
+                }, duration);
+            }
+        };
+
+        return throttled;
+    }
+
     /**
      * Check whether the app can scan QR codes.
      *

From d24f6cb5f208e6df75c9ed9c2f882fd451f7d889 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 8 Feb 2022 16:13:00 +0100
Subject: [PATCH 0474/1008] MOBILE-3808 course: Improve section navigation
 buttons

---
 .../components/format/core-course-format.html | 48 +++++++++++--------
 .../course/components/format/format.scss      | 11 ++---
 2 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/src/core/features/course/components/format/core-course-format.html b/src/core/features/course/components/format/core-course-format.html
index 7bacb0dd0..0a3185058 100644
--- a/src/core/features/course/components/format/core-course-format.html
+++ b/src/core/features/course/components/format/core-course-format.html
@@ -34,18 +34,18 @@
         </div>
 
         <ion-buttons class="ion-padding core-course-section-nav-buttons safe-area-padding-horizontal"
-            *ngIf="displayCourseIndex && sections?.length">
-            <ion-button *ngIf="previousSection" (click)="sectionChanged(previousSection)" fill="outline" color="primary"
+            *ngIf="displayCourseIndex && (previousSection || nextSection)">
+            <ion-button *ngIf="previousSection" (click)="sectionChanged(previousSection)" color="primary" fill="solid" expand="block"
                 [attr.aria-label]="('core.previous' | translate) + ': ' + previousSection.name">
-                <ion-icon name="fas-chevron-left" slot="icon-only" aria-hidden="true"></ion-icon>
-                <core-format-text class="sr-only" [text]="previousSection.name" contextLevel="course" [contextInstanceId]="course.id">
+                <ion-icon name="fas-arrow-left" slot="start" aria-hidden="true"></ion-icon>
+                <core-format-text [text]="previousSection.name" contextLevel="course" [contextInstanceId]="course.id">
                 </core-format-text>
             </ion-button>
-            <ion-button *ngIf="nextSection" (click)="sectionChanged(nextSection)" fill="solid" color="primary"
+            <ion-button *ngIf="nextSection" (click)="sectionChanged(nextSection)" color="primary" fill="solid" expand="block"
                 [attr.aria-label]="('core.next' | translate) + ': ' + nextSection.name">
-                <core-format-text class="sr-only" [text]="nextSection.name" contextLevel="course" [contextInstanceId]="course.id">
+                <core-format-text [text]="nextSection.name" contextLevel="course" [contextInstanceId]="course.id">
                 </core-format-text>
-                <ion-icon name="fas-chevron-right" slot="icon-only" aria-hidden="true"></ion-icon>
+                <ion-icon name="fas-arrow-right" slot="end" aria-hidden="true"></ion-icon>
             </ion-button>
         </ion-buttons>
     </core-loading>
@@ -74,26 +74,32 @@
                     <core-format-text [text]="section.name" contextLevel="course" [contextInstanceId]="course.id">
                     </core-format-text>
                 </h2>
-                <p *ngIf="section.visible === 0 || section.availabilityinfo || (section.highlighted && highlighted)">
-                    <ion-badge color="info" *ngIf="section.visible === 0 && section.uservisible !== false" class="ion-text-wrap block">
+                <div *ngIf="section.visible === 0 && section.uservisible !== false">
+                    <ion-chip>
                         <ion-icon name="fas-eye-slash" aria-hidden="true"></ion-icon>
-                        {{ 'core.course.hiddenfromstudents' | translate }}
-                    </ion-badge>
-                    <ion-badge color="info" *ngIf="section.visible === 0 && section.uservisible === false" class="ion-text-wrap block">
+                        <ion-label>{{ 'core.course.hiddenfromstudents' | translate }}</ion-label>
+                    </ion-chip>
+                </div>
+                <div *ngIf="section.visible === 0 && section.uservisible === false">
+                    <ion-chip>
                         <ion-icon name="fas-eye-slash" aria-hidden="true"></ion-icon>
-                        {{ 'core.notavailable' | translate }}
-                    </ion-badge>
-                    <ion-badge color="info" *ngIf="section.availabilityinfo" class="ion-text-wrap block">
+                        <ion-label>{{ 'core.notavailable' | translate }}</ion-label>
+                    </ion-chip>
+                </div>
+                <div *ngIf="section.availabilityinfo">
+                    <ion-chip>
                         <ion-icon name="fas-lock" [attr.aria-label]="'core.restricted' | translate"></ion-icon>
-                        <core-format-text [text]=" section.availabilityinfo" contextLevel="course" [contextInstanceId]="course.id">
-                        </core-format-text>
-                    </ion-badge>
-                </p>
+                        <ion-label>
+                            <core-format-text [text]=" section.availabilityinfo" contextLevel="course" [contextInstanceId]="course.id">
+                            </core-format-text>
+                        </ion-label>
+                    </ion-chip>
+                </div>
             </ion-label>
-            <ion-badge class="ion-text-wrap block" *ngIf="section.highlighted && highlighted" slot="end">{{highlighted}}</ion-badge>
+            <ion-badge *ngIf="section.highlighted && highlighted" slot="end">{{highlighted}}</ion-badge>
         </ion-item-divider>
 
-        <ion-item class="ion-text-wrap" *ngIf="section.summary">
+        <ion-item class="ion-text-wrap" *ngIf="section.summary" lines="none">
             <ion-label>
                 <core-format-text [text]="section.summary" contextLevel="course" [contextInstanceId]="course.id">
                 </core-format-text>
diff --git a/src/core/features/course/components/format/format.scss b/src/core/features/course/components/format/format.scss
index 7c33a30cc..8167ba66a 100644
--- a/src/core/features/course/components/format/format.scss
+++ b/src/core/features/course/components/format/format.scss
@@ -1,17 +1,12 @@
 .core-course-section-nav-buttons {
     display: flex;
-    justify-content: flex-end;
+    justify-content: space-between;
 
-    core-format-text {
+    ion-button {
         white-space: nowrap;
         text-overflow: ellipsis;
         overflow: hidden;
         text-transform: none;
-    }
-}
-
-.course-section {
-    ion-badge {
-        text-align: start;
+        flex: 1;
     }
 }

From bf8992ba6695afe9d4c2a80444cda19a7b526fd1 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 9 Feb 2022 11:01:05 +0100
Subject: [PATCH 0475/1008] MOBILE-3316 core: Fix nologin & suspended strings

---
 scripts/langindex.json                  |  1 +
 src/core/classes/site.ts                |  6 ++++++
 src/core/features/user/services/user.ts |  1 +
 src/core/lang.json                      |  3 ++-
 src/core/singletons/events.ts           | 10 ++++++++++
 5 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 6507a0414..c999b7a30 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -2340,6 +2340,7 @@
   "core.userdeleted": "moodle",
   "core.userdetails": "moodle",
   "core.usernotfullysetup": "error",
+  "core.usernologin": "local_moodlemobileapp",
   "core.users": "moodle",
   "core.usersuspended": "tool_reportbuilder",
   "core.view": "moodle",
diff --git a/src/core/classes/site.ts b/src/core/classes/site.ts
index d95590192..0c91b0466 100644
--- a/src/core/classes/site.ts
+++ b/src/core/classes/site.ts
@@ -631,6 +631,12 @@ export class CoreSite {
                     CoreEvents.trigger(CoreEvents.USER_SUSPENDED, { params: data }, this.id);
                     error.message = Translate.instant('core.usersuspended');
 
+                    throw new CoreWSError(error);
+                } else if (error.errorcode === 'wsaccessusernologin') {
+                    // User suspended, trigger event.
+                    CoreEvents.trigger(CoreEvents.USER_NO_LOGIN, { params: data }, this.id);
+                    error.message = Translate.instant('core.usernologin');
+
                     throw new CoreWSError(error);
                 } else if (error.errorcode === 'forcepasswordchangenotice') {
                     // Password Change Forced, trigger event. Try to get data from cache, the event will handle the error.
diff --git a/src/core/features/user/services/user.ts b/src/core/features/user/services/user.ts
index c74c9642d..72dfc469e 100644
--- a/src/core/features/user/services/user.ts
+++ b/src/core/features/user/services/user.ts
@@ -63,6 +63,7 @@ export class CoreUserProvider {
 
         CoreEvents.on(CoreEvents.USER_DELETED, data => this.handleUserKickedOutEvent(data));
         CoreEvents.on(CoreEvents.USER_SUSPENDED, data => this.handleUserKickedOutEvent(data));
+        CoreEvents.on(CoreEvents.USER_NO_LOGIN, data => this.handleUserKickedOutEvent(data));
     }
 
     /**
diff --git a/src/core/lang.json b/src/core/lang.json
index e20334ff9..982c01ba1 100644
--- a/src/core/lang.json
+++ b/src/core/lang.json
@@ -327,7 +327,8 @@
     "userdeleted": "This user account has been deleted",
     "userdetails": "User details",
     "usernotfullysetup": "User not fully set-up",
-    "usersuspended": "This user account has been suspended",
+    "usernologin": "Authentication has been revoked for this account",
+    "usersuspended": "Registration suspended",
     "users": "Users",
     "view": "View",
     "viewcode": "View code",
diff --git a/src/core/singletons/events.ts b/src/core/singletons/events.ts
index 8eb15caba..547acc270 100644
--- a/src/core/singletons/events.ts
+++ b/src/core/singletons/events.ts
@@ -45,6 +45,7 @@ export interface CoreEventsData {
     [CoreEvents.PACKAGE_STATUS_CHANGED]: CoreEventPackageStatusChanged;
     [CoreEvents.USER_DELETED]: CoreEventUserDeletedData;
     [CoreEvents.USER_SUSPENDED]: CoreEventUserSuspendedData;
+    [CoreEvents.USER_NO_LOGIN]: CoreEventUserNoLoginData;
     [CoreEvents.FORM_ACTION]: CoreEventFormActionData;
     [CoreEvents.NOTIFICATION_SOUND_CHANGED]: CoreEventNotificationSoundChangedData;
     [CoreEvents.SELECT_COURSE_TAB]: CoreEventSelectCourseTabData;
@@ -87,6 +88,7 @@ export class CoreEvents {
     static readonly COMPLETION_CHANGED = 'completion_changed';
     static readonly USER_DELETED = 'user_deleted';
     static readonly USER_SUSPENDED = 'user_suspended';
+    static readonly USER_NO_LOGIN = 'user_no_login';
     static readonly PACKAGE_STATUS_CHANGED = 'package_status_changed';
     static readonly COURSE_STATUS_CHANGED = 'course_status_changed';
     static readonly SECTION_STATUS_CHANGED = 'section_status_changed';
@@ -315,6 +317,14 @@ export type CoreEventUserSuspendedData = {
     params: any; // Params sent to the WS that failed.
 };
 
+/**
+ * Data passed to USER_NO_LOGIN event.
+ */
+export type CoreEventUserNoLoginData = {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    params: any; // Params sent to the WS that failed.
+};
+
 export enum CoreEventFormAction {
     CANCEL = 'cancel',
     SUBMIT = 'submit',

From ed9e5f9869b4393c07aad4bba7e3a85108a19ab3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 9 Feb 2022 12:56:21 +0100
Subject: [PATCH 0476/1008] MOBILE-3099 module: Fix module navigation animation

---
 .../module-navigation/module-navigation.ts       | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/core/features/course/components/module-navigation/module-navigation.ts b/src/core/features/course/components/module-navigation/module-navigation.ts
index 6da81c2f4..2b3573738 100644
--- a/src/core/features/course/components/module-navigation/module-navigation.ts
+++ b/src/core/features/course/components/module-navigation/module-navigation.ts
@@ -299,18 +299,20 @@ export class CoreCourseModuleNavigationComponent implements OnInit, OnDestroy {
             return;
         }
 
+        const options: CoreNavigationOptions = {
+            replace: true,
+            animationDirection: next ? 'forward' : 'back',
+        };
+
         if (module.uservisible === false) {
             const section = next ? this.nextModuleSection : this.previousModuleSection;
-            const options: CoreNavigationOptions = {
-                replace: true,
-                params: {
-                    module,
-                    section,
-                },
+            options.params = {
+                module,
+                section,
             };
             CoreNavigator.navigateToSitePath('course/' + this.courseId + '/' + module.id +'/module-preview', options);
         } else {
-            CoreCourseModuleDelegate.openActivityPage(module.modname, module, this.courseId, { replace: true });
+            CoreCourseModuleDelegate.openActivityPage(module.modname, module, this.courseId, options);
         }
     }
 

From be05bfa51b3fef23d5d1d11fae88300f80c7af5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 9 Feb 2022 12:56:36 +0100
Subject: [PATCH 0477/1008] MOBILE-3099 module: Reduce module navigation bar
 height

---
 .../core-course-module-navigation.html          |  7 ++++---
 .../module-navigation/module-navigation.scss    | 17 ++++++-----------
 src/theme/theme.base.scss                       |  4 ++--
 src/theme/theme.light.scss                      |  6 +++---
 4 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/core/features/course/components/module-navigation/core-course-module-navigation.html b/src/core/features/course/components/module-navigation/core-course-module-navigation.html
index 34b0c5d27..6d04ae094 100644
--- a/src/core/features/course/components/module-navigation/core-course-module-navigation.html
+++ b/src/core/features/course/components/module-navigation/core-course-module-navigation.html
@@ -1,18 +1,19 @@
 <core-loading [hideUntil]="loaded" [fullscreen]="false">
     <ion-row class="ion-justify-content-between ion-align-items-center ion-no-padding ion-wrap" *ngIf="previousModule || nextModule">
-        <ion-col size="auto">
+        <ion-col size="auto" class="ion-no-padding">
             <ion-button fill="clear" class="core-course-previous-module" *ngIf="previousModule" (click)="goToActivity(false)"
                 [attr.aria-label]="'core.course.gotopreviousactivity' | translate">
                 <ion-icon name="fas-arrow-left" slot="icon-only" aria-hidden="true"></ion-icon>
             </ion-button>
         </ion-col>
-        <ion-col *ngIf="showCompletion && (currentModule.completiondata && showManualCompletion && currentModule.uservisible)">
+        <ion-col class="ion-no-padding"
+            *ngIf="showCompletion && (currentModule.completiondata && showManualCompletion && currentModule.uservisible)">
             <!-- Module completion. -->
             <core-course-module-completion [completion]="currentModule.completiondata" [moduleName]="currentModule.name"
                 [moduleId]="currentModule.id" [showManualCompletion]="true" (completionChanged)="completionChanged.emit($event)">
             </core-course-module-completion>
         </ion-col>
-        <ion-col size="auto">
+        <ion-col size="auto" class="ion-no-padding">
             <ion-button fill="clear" class="core-course-next-module" *ngIf="nextModule" (click)="goToActivity(true)"
                 [attr.aria-label]="'core.course.gotonextactivity' | translate">
                 <ion-icon name="fas-arrow-right" slot="icon-only" aria-hidden="true"></ion-icon>
diff --git a/src/core/features/course/components/module-navigation/module-navigation.scss b/src/core/features/course/components/module-navigation/module-navigation.scss
index 2a8b74f54..4dfc9e0ea 100644
--- a/src/core/features/course/components/module-navigation/module-navigation.scss
+++ b/src/core/features/course/components/module-navigation/module-navigation.scss
@@ -3,6 +3,7 @@
 :host {
     --height: var(--core-course-module-navigation-height, var(--core-course-module-navigation-max-height));
     --background: var(--core-course-module-navigation-background);
+    --button-vertical-margin: 2px;
 
     height: var(--height);
     width: 100%;
@@ -14,21 +15,15 @@
 
     @include core-transition(all, 200ms);
 
-    ion-col {
-        padding: 2px;
-    }
-
     core-loading {
         text-align: center;
-    }
-    
-    ion-buttom {
-        margin-top: 5px;
-        margin-bottom: 5px;
+        --loading-inline-min-height: var(--height);
     }
 
-    core-loading {
-        --loading-inline-min-height: var(--height);
+    ion-button,
+    ::ng-deep ion-button {
+        margin-top: var(--button-vertical-margin);
+        margin-bottom: var(--button-vertical-margin);
     }
 }
 
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 31aed6866..0143bf8b3 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -250,7 +250,7 @@ ion-header ion-toolbar {
 
     .button.button-clear.button-has-icon-only,
     .button.button-solid.button-has-icon-only {
-        --border-radius: 50%;
+        --border-radius: var(--huge-radius);
         width: 48px;
         height: 48px;
     }
@@ -307,7 +307,7 @@ button,
 }
 
 ion-button.button.button-clear.button-has-icon-only {
-    --border-radius: 50%;
+    --border-radius: var(--huge-radius);
 }
 
 // Clear buttons will be black.
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 1ad8d7b27..71697c5f6 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -118,7 +118,7 @@
         color: var(--core-link-color);
     }
 
-    --core-header-toolbar-button-image-size: 44px;
+    --core-header-toolbar-button-image-size: var(--a11y-min-target-size);
     --core-header-toolbar-background: var(--white);
     --core-header-toolbar-border-width: 3px;
     --core-header-toolbar-border-color: var(--brand);
@@ -266,7 +266,7 @@
     --core-star-color: var(--brand);
 
     --core-large-avatar-size: 90px;
-    --core-avatar-size: 44px;
+    --core-avatar-size: var(--a11y-min-target-size);
 
     --core-send-message-input-background: var(--gray-200);
     --core-send-message-input-color: var(--gray-900);
@@ -274,7 +274,7 @@
     --core-courseimage-on-course-size: 72px;
     --core-courseimage-radius: var(--medium-radius);
 
-    --core-course-module-navigation-max-height: 56px;
+    --core-course-module-navigation-max-height: 48px;
     --core-course-module-navigation-background: var(--contrast-background);
 
     --core-user-menu-site-logo-max-height: 32px;

From 2943d42678377246e001ba505eb9a9368404527a Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 9 Feb 2022 15:05:20 +0100
Subject: [PATCH 0478/1008] MOBILE-3823 fullscreen: Add fullscreen button in
 H5P and IMSCP

---
 .../index/addon-mod-h5pactivity-index.html    |  2 +-
 .../index/addon-mod-imscp-index.html          |  2 +-
 .../module-info/course-module-info.scss       |  5 ++++
 .../h5p-iframe/core-h5p-iframe.html           |  3 ++-
 .../h5p/components/h5p-iframe/h5p-iframe.ts   |  1 +
 src/theme/theme.base.scss                     | 24 ++++++++++++-------
 6 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html b/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
index 26790f9c0..3d51c3406 100644
--- a/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
+++ b/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
@@ -81,7 +81,7 @@
     </ion-list>
 
     <core-h5p-iframe *ngIf="playing" [fileUrl]="fileUrl" [displayOptions]="displayOptions" [onlinePlayerUrl]="onlinePlayerUrl"
-        [trackComponent]="trackComponent" [contextId]="h5pActivity?.context">
+        [trackComponent]="trackComponent" [contextId]="h5pActivity?.context" [enableInAppFullscreen]="true">
     </core-h5p-iframe>
 </core-loading>
 
diff --git a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
index 4a92470fb..7a7a036c2 100644
--- a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
+++ b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
@@ -42,7 +42,7 @@
     <div class="addon-mod-imscp-container">
         <core-navigation-bar [items]="navigationItems" (action)="loadItem($event)">
         </core-navigation-bar>
-        <core-iframe [src]="src"></core-iframe>
+        <core-iframe *ngIf="loaded" [src]="src" [showFullscreenOnToolbar]="true" [autoFullscreenOnRotate]="true"></core-iframe>
     </div>
 </core-loading>
 
diff --git a/src/core/features/course/components/module-info/course-module-info.scss b/src/core/features/course/components/module-info/course-module-info.scss
index f540001d2..82b2a68a3 100644
--- a/src/core/features/course/components/module-info/course-module-info.scss
+++ b/src/core/features/course/components/module-info/course-module-info.scss
@@ -22,3 +22,8 @@
     }
 
 }
+
+:host-context(.core-iframe-fullscreen) {
+    opacity: 0 !important;
+    height: 0 !important;
+}
diff --git a/src/core/features/h5p/components/h5p-iframe/core-h5p-iframe.html b/src/core/features/h5p/components/h5p-iframe/core-h5p-iframe.html
index 52020bec3..c60f30592 100644
--- a/src/core/features/h5p/components/h5p-iframe/core-h5p-iframe.html
+++ b/src/core/features/h5p/components/h5p-iframe/core-h5p-iframe.html
@@ -1,5 +1,6 @@
 <core-loading [hideUntil]="iframeSrc" [fullscreen]="false" class="safe-area-padding">
-    <core-iframe *ngIf="iframeSrc" [src]="iframeSrc" iframeHeight="auto" [allowFullscreen]="true" (loaded)="iframeLoaded()">
+    <core-iframe *ngIf="iframeSrc" [src]="iframeSrc" iframeHeight="auto" [allowFullscreen]="true" (loaded)="iframeLoaded()"
+        [showFullscreenOnToolbar]="enableInAppFullscreen" [autoFullscreenOnRotate]="enableInAppFullscreen">
     </core-iframe>
     <script *ngIf="resizeScript && iframeSrc" type="text/javascript" [src]="resizeScript"></script>
 </core-loading>
diff --git a/src/core/features/h5p/components/h5p-iframe/h5p-iframe.ts b/src/core/features/h5p/components/h5p-iframe/h5p-iframe.ts
index 1af3f74d2..9c5d39396 100644
--- a/src/core/features/h5p/components/h5p-iframe/h5p-iframe.ts
+++ b/src/core/features/h5p/components/h5p-iframe/h5p-iframe.ts
@@ -44,6 +44,7 @@ export class CoreH5PIframeComponent implements OnChanges, OnDestroy {
     @Input() onlinePlayerUrl?: string; // The URL of the online player to display the H5P package.
     @Input() trackComponent?: string; // Component to send xAPI events to.
     @Input() contextId?: number; // Context ID. Required for tracking.
+    @Input() enableInAppFullscreen?: boolean; // Whether to enable our custom in-app fullscreen feature.
     @Output() onIframeUrlSet = new EventEmitter<{src: string; online: boolean}>();
     @Output() onIframeLoaded = new EventEmitter<void>();
 
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 31aed6866..9e2dbeda8 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -1279,17 +1279,18 @@ ion-header[collapsible] {
     ion-title {
         @include core-transition(opacity, 0ms);
     }
+}
 
-    &:not(.core-header-collapsed) {
-        ion-toolbar {
-            --core-header-toolbar-background: rgba(255, 255, 255, 0);
-            --core-header-toolbar-border-width: 0;
-        }
+// Only hide header when not in fullscreen.
+body:not(.core-iframe-fullscreen) ion-header[collapsible]:not(.core-header-collapsed) {
+    ion-toolbar {
+        --core-header-toolbar-background: rgba(255, 255, 255, 0);
+        --core-header-toolbar-border-width: 0;
+    }
 
-        ion-title, &::after {
-            opacity: 0;
-            z-index: 0;
-        }
+    ion-title, &::after {
+        opacity: 0;
+        z-index: 0;
     }
 }
 
@@ -1350,3 +1351,8 @@ ion-app.md .collapsible-title h1 {
         text-overflow: ellipsis;
     }
 }
+
+// In fullscreen, disable the offset-top added by collapsible header.
+body.core-iframe-fullscreen ion-content {
+    --offset-top: 0px !important;
+}

From 59b1d37f8b5c729829295af5ebf988e0df39a0ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 9 Feb 2022 13:41:20 +0100
Subject: [PATCH 0479/1008] MOBILE-3814 module: Add module max-width

---
 .../addon-block-sitemainmenu.html             |  4 +--
 .../components/format/core-course-format.html |  5 ++--
 .../course/components/module/module.scss      | 10 +++++---
 .../pages/list-mod-type/list-mod-type.html    |  2 +-
 .../features/sitehome/pages/index/index.html  |  2 +-
 .../features/sitehome/pages/index/index.scss  |  4 +++
 src/theme/theme.base.scss                     | 25 ++++++++++++++++++-
 src/theme/theme.dark.scss                     |  1 -
 src/theme/theme.light.scss                    |  8 +++---
 9 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/src/addons/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html b/src/addons/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html
index 3ce510a26..fa38b0bc3 100644
--- a/src/addons/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html
+++ b/src/addons/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html
@@ -4,7 +4,7 @@
     </ion-label>
 </ion-item-divider>
 <core-loading [hideUntil]="loaded" [fullscreen]="false">
-    <ng-container *ngIf="mainMenuBlock">
+    <ion-list *ngIf="mainMenuBlock" class="core-course-module-list-wrapper">
         <ion-item class="ion-text-wrap" *ngIf="mainMenuBlock.summary">
             <ion-label>
                 <core-format-text [text]="mainMenuBlock.summary" [component]="component" [componentId]="siteHomeId" contextLevel="course"
@@ -13,5 +13,5 @@
         </ion-item>
 
         <core-course-module *ngFor="let module of mainMenuBlock.modules" [module]="module" [section]="mainMenuBlock"></core-course-module>
-    </ng-container>
+    </ion-list>
 </core-loading>
diff --git a/src/core/features/course/components/format/core-course-format.html b/src/core/features/course/components/format/core-course-format.html
index 0a3185058..e994ed9ec 100644
--- a/src/core/features/course/components/format/core-course-format.html
+++ b/src/core/features/course/components/format/core-course-format.html
@@ -66,9 +66,8 @@
 <!-- Template to render a section. -->
 <ng-template #sectionTemplate let-section="section">
     <section *ngIf="!section.hiddenbynumsections && section.id != allSectionsId && section.id != stealthModulesSectionId"
-        class="section-wrapper" [id]="section.id">
-        <ion-item-divider class="course-section ion-text-wrap" color="light"
-            [class.item-dimmed]="section.visible === 0 || section.uservisible === false">
+        class="core-course-module-list-wrapper" [id]="section.id">
+        <ion-item-divider class="course-section ion-text-wrap" [class.item-dimmed]="section.visible === 0 || section.uservisible === false">
             <ion-label>
                 <h2 *ngIf="section.name">
                     <core-format-text [text]="section.name" contextLevel="course" [contextInstanceId]="course.id">
diff --git a/src/core/features/course/components/module/module.scss b/src/core/features/course/components/module/module.scss
index faf96e525..9048f93d7 100644
--- a/src/core/features/course/components/module/module.scss
+++ b/src/core/features/course/components/module/module.scss
@@ -1,12 +1,16 @@
 @import "~theme/globals";
 
 :host {
+    --horizontal-margin: 12px;
 
-    .item.core-module-main-item {
-        --min-height: 52px;
+    ion-card {
+        margin-left: var(--horizontal-margin);
+        margin-right: var(--horizontal-margin);
     }
 
-    .core-module-main-item {
+    ion-item.core-module-main-item {
+        --min-height: 52px;
+
         .core-module-buttons,
         .buttons.core-module-buttons {
             margin: 0;
diff --git a/src/core/features/course/pages/list-mod-type/list-mod-type.html b/src/core/features/course/pages/list-mod-type/list-mod-type.html
index d0cf3b7d1..edf62be15 100644
--- a/src/core/features/course/pages/list-mod-type/list-mod-type.html
+++ b/src/core/features/course/pages/list-mod-type/list-mod-type.html
@@ -16,7 +16,7 @@
         <core-empty-box *ngIf="!sections || !sections.length" icon="fas-box-open" [message]="'core.course.nocontentavailable' | translate">
         </core-empty-box>
 
-        <ion-list>
+        <ion-list class="core-course-module-list-wrapper">
             <ng-container *ngFor="let section of sections">
                 <ng-container *ngFor="let module of section.modules">
                     <core-course-module *ngIf="module.visibleoncoursepage !== 0" [module]="module" [section]="section">
diff --git a/src/core/features/sitehome/pages/index/index.html b/src/core/features/sitehome/pages/index/index.html
index 45bd97c06..a2f064248 100644
--- a/src/core/features/sitehome/pages/index/index.html
+++ b/src/core/features/sitehome/pages/index/index.html
@@ -8,7 +8,7 @@
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
     <core-loading [hideUntil]="dataLoaded">
-        <ion-list>
+        <ion-list class="core-course-module-list-wrapper">
             <!-- Site home main contents. -->
             <ng-container *ngIf="section && section.hasContent">
                 <ion-item class="ion-text-wrap" *ngIf="section.summary">
diff --git a/src/core/features/sitehome/pages/index/index.scss b/src/core/features/sitehome/pages/index/index.scss
index 7a2bbde1d..6193c059a 100644
--- a/src/core/features/sitehome/pages/index/index.scss
+++ b/src/core/features/sitehome/pages/index/index.scss
@@ -15,3 +15,7 @@ core-course-module.core-sitehome-news ::ng-deep ion-card {
     margin: 0;
     padding: 0;
 }
+
+core-spacer ::ng-deep .item {
+    border-radius: var(--medium-radius);
+}
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 0143bf8b3..1a92c7795 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -736,6 +736,22 @@ ion-card {
     display: inline !important;
 }
 
+ion-list.core-course-module-list-wrapper,
+.core-course-module-list-wrapper {
+    max-width: var(--module-list-width);
+    margin-left: auto;
+    margin-right: auto;
+
+    --padding-start: 12px;
+    --padding-end: 12px;
+    padding-left: var(--padding-start);
+    padding-right: var(--padding-end);
+
+    core-course-module {
+        --horizontal-margin: 0px;
+    }
+}
+
 ion-toolbar h1 img.core-bar-button-image,
 ion-toolbar h1 .core-bar-button-image img {
     padding: 4px;
@@ -1209,8 +1225,15 @@ ion-item.item-input ion-input.has-focus {
     }
 }
 
-ion-item-divider {
+ion-item-divider.item, ion-item.item.divider {
     --inner-padding-end: 8px;
+    background: var(--background);
+    min-height: var(--min-height);
+    border-width: var(--item-divider-border-width);
+    font-size: var(--item-divider-font-size);
+    h2, ion-label h2 {
+        font-size: var(--item-divider-font-size);
+    }
 }
 
 // Change default outline.
diff --git a/src/theme/theme.dark.scss b/src/theme/theme.dark.scss
index 0f512966d..6e88cfc14 100644
--- a/src/theme/theme.dark.scss
+++ b/src/theme/theme.dark.scss
@@ -77,7 +77,6 @@
 
     --ion-item-background: #{$ion-item-background-dark};
     --ion-item-detail-icon-color: var(--white);
-    --item-divider-background: var(--gray-800);
     --item-divider-color: var(--text-color);
     --spacer-background: var(--gray-100);
 
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 71697c5f6..61b52c0f7 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -71,6 +71,7 @@
 
     --module-icon-size: 24px;
     --module-icon-radius: var(--medium-radius);
+    --module-list-width: 768px;
 
     --ion-background-color: var(--background-color);
     --ion-background-color-rgb: #{$background-color-rgb};
@@ -221,20 +222,21 @@
     }
 
     --item-divider-min-height: calc(var(--a11y-min-target-size) + 8px);
-    --item-divider-background: var(--light);
+    --item-divider-background: transparent;
     --item-divider-color: var(--text-color);
+    --item-divider-border-width: 0px;
+    --item-divider-font-size: 20px;
     ion-item-divider, ion-item.divider {
         --background: var(--item-divider-background);
         --color: var(--item-divider-color);
         --min-height: var(--item-divider-min-height);
-        min-height: var(--min-height);
 
         .expandable-status-icon {
             font-size: 18px;
         }
     }
 
-    --spacer-background: var(--item-divider-background);
+    --spacer-background: var(--light);
     core-spacer {
         --item-divider-background: var(--spacer-background);
     }

From 42647aa122fcf915712d054c44252cd4e210657f Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 10 Feb 2022 09:31:18 +0100
Subject: [PATCH 0480/1008] MOBILE-3823 iframe: Leave fullscreen when
 navigating

---
 src/core/components/iframe/iframe.ts | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/core/components/iframe/iframe.ts b/src/core/components/iframe/iframe.ts
index bf57b1443..b80264904 100644
--- a/src/core/components/iframe/iframe.ts
+++ b/src/core/components/iframe/iframe.ts
@@ -22,9 +22,12 @@ import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUrlUtils } from '@services/utils/url';
 import { CoreIframeUtils } from '@services/utils/iframe';
 import { CoreUtils } from '@services/utils/utils';
-import { DomSanitizer, StatusBar } from '@singletons';
+import { DomSanitizer, Router, StatusBar } from '@singletons';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreScreen, CoreScreenOrientation } from '@services/screen';
+import { Subscription } from 'rxjs';
+import { filter } from 'rxjs/operators';
+import { NavigationStart } from '@angular/router';
 
 @Component({
     selector: 'core-iframe',
@@ -53,6 +56,7 @@ export class CoreIframeComponent implements OnChanges, OnDestroy {
 
     protected style?: HTMLStyleElement;
     protected orientationObs?: CoreEventObserver;
+    protected navSubscription?: Subscription;
 
     constructor() {
         this.loaded = new EventEmitter<HTMLIFrameElement>();
@@ -80,6 +84,15 @@ export class CoreIframeComponent implements OnChanges, OnDestroy {
         this.autoFullscreenOnRotate = CoreUtils.isTrueOrOne(this.autoFullscreenOnRotate);
 
         if (this.showFullscreenOnToolbar || this.autoFullscreenOnRotate) {
+            // Leave fullscreen when navigating.
+            this.navSubscription = Router.events
+                .pipe(filter(event => event instanceof NavigationStart))
+                .subscribe(async () => {
+                    if (this.fullscreen) {
+                        this.toggleFullscreen(false);
+                    }
+                });
+
             const shadow =
                 iframe.closest('.ion-page')?.querySelector('ion-header ion-toolbar')?.shadowRoot;
             if (shadow) {
@@ -148,8 +161,8 @@ export class CoreIframeComponent implements OnChanges, OnDestroy {
      * @inheritdoc
      */
     ngOnDestroy(): void {
-        this.toggleFullscreen(false);
         this.orientationObs?.off();
+        this.navSubscription?.unsubscribe();
     }
 
     /**

From 926f2508d127c1cb51c2f569babb5a68ccc11357 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 9 Feb 2022 22:43:09 +0100
Subject: [PATCH 0481/1008] MOBILE-3814 module: Add completion basic mode to
 use it bellow title

---
 .../core-course-module-completion.html        |  81 ++++++++-----
 .../module-completion/module-completion.ts    |  18 ++-
 .../core-course-module-manual-completion.html |  35 +++---
 .../module-manual-completion.ts               |   7 +-
 .../components/module/core-course-module.html |  26 ++--
 .../course/components/module/module.scss      |   4 -
 .../course/components/module/module.ts        |  13 +-
 src/core/features/course/services/course.ts   |   5 +
 src/theme/theme.base.scss                     | 114 ++++++++++--------
 9 files changed, 169 insertions(+), 134 deletions(-)

diff --git a/src/core/features/course/components/module-completion/core-course-module-completion.html b/src/core/features/course/components/module-completion/core-course-module-completion.html
index a96265860..d449ff532 100644
--- a/src/core/features/course/components/module-completion/core-course-module-completion.html
+++ b/src/core/features/course/components/module-completion/core-course-module-completion.html
@@ -1,38 +1,63 @@
-<div *ngIf="showCompletionConditions && completion && completion.isautomatic" class="core-module-automatic-completion-conditions"
-    role="list" [attr.aria-label]="'core.course.completionrequirements' | translate:{ $a: moduleName }">
+<ng-container *ngIf="completion">
+    <ng-container *ngIf="showCompletionConditions && completion.isautomatic">
+        <div *ngIf="mode == 'full'" class="core-module-automatic-completion-conditions" role="list"
+            [attr.aria-label]="'core.course.completionrequirements' | translate:{ $a: moduleName }">
 
-    <ng-container *ngIf="completion.istrackeduser">
-        <ng-container *ngFor="let rule of details">
-            <ion-chip *ngIf="rule.statuscomplete" color="success" role="listitem" [attr.aria-label]="rule.accessibleDescription">
-                <ion-icon name="fas-check" aria-hidden="true"></ion-icon>
-                <ion-label><strong>{{ 'core.course.completion_automatic:done' | translate }}</strong> {{ rule.rulevalue.description }}
-                </ion-label>
-            </ion-chip>
+            <ng-container *ngIf="completion.istrackeduser">
+                <ng-container *ngFor="let rule of details">
+                    <ion-chip *ngIf="rule.statuscomplete" color="success" role="listitem" [attr.aria-label]="rule.accessibleDescription">
+                        <ion-icon name="fas-check" [attr.aria-label]="'core.course.completion_automatic:done' | translate "></ion-icon>
+                        <ion-label>
+                            {{ rule.rulevalue.description }}
+                        </ion-label>
+                    </ion-chip>
 
-            <ion-chip *ngIf="rule.statuscompletefail" color="danger" role="listitem" [attr.aria-label]="rule.accessibleDescription">
-                <ion-icon name="fas-times" aria-hidden="true"></ion-icon>
-                <ion-label><strong>{{ 'core.course.completion_automatic:failed' | translate }}</strong> {{ rule.rulevalue.description }}
-                </ion-label>
-            </ion-chip>
+                    <ion-chip *ngIf="rule.statuscompletefail" color="danger" role="listitem" [attr.aria-label]="rule.accessibleDescription">
+                        <ion-icon name="fas-times" [attr.aria-label]="'core.course.completion_automatic:failed' | translate "></ion-icon>
+                        <ion-label>
+                            {{ rule.rulevalue.description }}
+                        </ion-label>
+                    </ion-chip>
 
-            <ion-chip *ngIf="rule.statusincomplete" role="listitem" [attr.aria-label]="rule.accessibleDescription">
+                    <ion-chip *ngIf="rule.statusincomplete" color="dark" role="listitem" [attr.aria-label]="rule.accessibleDescription">
+                        <ion-icon name="fas-edit" [attr.aria-label]="'core.course.completion_automatic:todo' | translate "></ion-icon>
+                        <ion-label>
+                            {{ rule.rulevalue.description }}
+                        </ion-label>
+                    </ion-chip>
+                </ng-container>
+            </ng-container>
+
+            <ng-container *ngIf="!completion.istrackeduser">
+                <ion-chip *ngFor="let rule of details" role="listitem">
+                    <ion-icon name="fas-edit" [attr.aria-label]="'core.course.completion_automatic:todo' | translate "></ion-icon>
+                    <ion-label>
+                        {{ rule.rulevalue.description }}
+                    </ion-label>
+                </ion-chip>
+            </ng-container>
+        </div>
+
+        <ng-container *ngIf="mode == 'basic' && completion.istrackeduser">
+            <ion-chip class="completioninfo completion_incomplete" *ngIf="completionStatus === 0" color="dark">
                 <ion-icon name="fas-edit" aria-hidden="true"></ion-icon>
-                <ion-label><strong>{{ 'core.course.completion_automatic:todo' | translate }}</strong> {{ rule.rulevalue.description }}
+                <ion-label>
+                    {{ 'core.course.todo' | translate }}
                 </ion-label>
             </ion-chip>
+            <ion-chip class="completioninfo completion_complete" *ngIf="completionStatus === 1 || completionStatus === 2" color="success">
+                <ion-icon name="fas-check" aria-hidden="true"></ion-icon>
+                <ion-label>{{'core.course.done' | translate }}</ion-label>
+            </ion-chip>
+            <ion-chip class="completioninfo completion_fail" *ngIf="completionStatus === 3" color="danger">
+                <ion-icon name="fas-times" aria-hidden="true"></ion-icon>
+                <ion-label>{{'core.course.failed' | translate }}</ion-label>
+            </ion-chip>
         </ng-container>
     </ng-container>
 
-    <ng-container *ngIf="!completion.istrackeduser">
-        <ion-chip *ngFor="let rule of details" role="listitem">
-            <ion-icon name="fas-edit" aria-hidden="true"></ion-icon>
-            <ion-label>
-                <strong>{{ 'core.course.completion_automatic:todo' | translate }}</strong> {{ rule.rulevalue.description }}
-            </ion-label>
-        </ion-chip>
-    </ng-container>
-</div>
 
-<core-course-module-manual-completion *ngIf="showManualCompletion" [completion]="completion" [moduleName]="moduleName"
-    (completionChanged)="completionChanged.emit($event)">
-</core-course-module-manual-completion>
+    <core-course-module-manual-completion *ngIf="showManualCompletion" [completion]="completion" [moduleName]="moduleName"
+        (completionChanged)="completionChanged.emit($event)" [mode]="mode">
+    </core-course-module-manual-completion>
+</ng-container>
diff --git a/src/core/features/course/components/module-completion/module-completion.ts b/src/core/features/course/components/module-completion/module-completion.ts
index 33fab2dd5..060cdd7dd 100644
--- a/src/core/features/course/components/module-completion/module-completion.ts
+++ b/src/core/features/course/components/module-completion/module-completion.ts
@@ -15,7 +15,12 @@
 import { Component, Input } from '@angular/core';
 
 import { CoreCourseModuleCompletionBaseComponent } from '@features/course/classes/module-completion';
-import { CoreCourseModuleCompletionStatus, CoreCourseModuleWSRuleDetails } from '@features/course/services/course';
+import {
+    CoreCourseCompletionMode,
+    CoreCourseModuleCompletionStatus,
+    CoreCourseModuleCompletionTracking,
+    CoreCourseModuleWSRuleDetails,
+} from '@features/course/services/course';
 import { CoreUser } from '@features/user/services/user';
 import { Translate } from '@singletons';
 
@@ -37,9 +42,11 @@ export class CoreCourseModuleCompletionComponent extends CoreCourseModuleComplet
 
     @Input() showCompletionConditions = false; // Whether to show activity completion conditions.
     @Input() showManualCompletion = false; // Whether to show manual completion.
+    @Input() mode: CoreCourseCompletionMode = CoreCourseCompletionMode.FULL; // Show full completion status or a basic mode.
 
     details?: CompletionRule[];
     accessibleDescription: string | null = null;
+    completionStatus?: CoreCourseModuleCompletionStatus;
 
     /**
      * @inheritdoc
@@ -49,6 +56,11 @@ export class CoreCourseModuleCompletionComponent extends CoreCourseModuleComplet
             return;
         }
 
+        this.completionStatus = !this.completion?.istrackeduser ||
+            this.completion.tracking == CoreCourseModuleCompletionTracking.COMPLETION_TRACKING_NONE
+            ? undefined
+            : this.completion.state;
+
         // Format rules.
         this.details = await Promise.all(this.completion.details.map(async (rule: CompletionRule) => {
             rule.statuscomplete = rule.rulevalue.status == CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE ||
@@ -57,8 +69,8 @@ export class CoreCourseModuleCompletionComponent extends CoreCourseModuleComplet
             rule.statusincomplete = rule.rulevalue.status == CoreCourseModuleCompletionStatus.COMPLETION_INCOMPLETE;
             rule.accessibleDescription = null;
 
-            if (this.completion!.overrideby) {
-                const fullName = await CoreUser.getUserFullNameWithDefault(this.completion!.overrideby, this.completion!.courseId);
+            if (this.completion?.overrideby) {
+                const fullName = await CoreUser.getUserFullNameWithDefault(this.completion.overrideby, this.completion.courseId);
 
                 const setByData = {
                     $a: {
diff --git a/src/core/features/course/components/module-manual-completion/core-course-module-manual-completion.html b/src/core/features/course/components/module-manual-completion/core-course-module-manual-completion.html
index 1720a23d8..50910193b 100644
--- a/src/core/features/course/components/module-manual-completion/core-course-module-manual-completion.html
+++ b/src/core/features/course/components/module-manual-completion/core-course-module-manual-completion.html
@@ -1,24 +1,19 @@
-<div *ngIf="completion && !completion.isautomatic" class="core-module-manual-completion">
-
+<ng-container *ngIf="completion && !completion.isautomatic">
     <ng-container *ngIf="completion.istrackeduser">
-        <ng-container *ngIf="completion.state">
-            <ion-button color="success" fill="outline" [attr.aria-label]="accessibleDescription" (click)="completionClicked($event)"
-                class="ion-text-wrap">
-                <ion-icon name="fas-check" slot="start" aria-hidden="true"></ion-icon>
-                {{ 'core.course.completion_manual:done' | translate }}
-            </ion-button>
-        </ng-container>
-        <ng-container *ngIf="!completion.state">
-            <ion-button color="dark" fill="outline" [attr.aria-label]="accessibleDescription" (click)="completionClicked($event)"
-                class="ion-text-wrap">
-                {{ 'core.course.completion_manual:markdone' | translate }}
-            </ion-button>
-        </ng-container>
-    </ng-container>
-
-    <ng-container *ngIf="!completion.istrackeduser">
-        <ion-button disabled="true" color="dark" fill="outline" class="ion-text-wrap">
+        <ion-button *ngIf="completion.state" color="success" [attr.aria-label]="accessibleDescription" (click)="completionClicked($event)"
+            class="ion-text-wrap" [class.chip]="mode == 'basic'">
+            <ion-icon name="fas-check" slot="start" aria-hidden="true"></ion-icon>
+            {{ 'core.course.completion_manual:done' | translate }}
+        </ion-button>
+        <ion-button *ngIf="!completion.state" color="dark" fill="outline" [attr.aria-label]="accessibleDescription"
+            (click)="completionClicked($event)" class="ion-text-wrap" [class.chip]="mode == 'basic'">
             {{ 'core.course.completion_manual:markdone' | translate }}
         </ion-button>
     </ng-container>
-</div>
+
+    <ng-container *ngIf="!completion.istrackeduser">
+        <ion-button disabled="true" color="dark" fill="outline" class="ion-text-wrap" [class.chip]="mode == 'basic'">
+            {{ 'core.course.completion_manual:markdone' | translate }}
+        </ion-button>
+    </ng-container>
+</ng-container>
diff --git a/src/core/features/course/components/module-manual-completion/module-manual-completion.ts b/src/core/features/course/components/module-manual-completion/module-manual-completion.ts
index 6a21680b7..f2468cdab 100644
--- a/src/core/features/course/components/module-manual-completion/module-manual-completion.ts
+++ b/src/core/features/course/components/module-manual-completion/module-manual-completion.ts
@@ -13,8 +13,7 @@
 // limitations under the License.
 
 import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChange } from '@angular/core';
-import { CoreCourseCompletionType } from '@features/course/services/course';
-
+import { CoreCourseCompletionMode, CoreCourseCompletionType } from '@features/course/services/course';
 import { CoreCourseHelper, CoreCourseModuleCompletionData } from '@features/course/services/course-helper';
 import { CoreUser } from '@features/user/services/user';
 import { Translate } from '@singletons';
@@ -31,6 +30,7 @@ export class CoreCourseModuleManualCompletionComponent implements OnInit, OnChan
 
     @Input() completion?: CoreCourseModuleCompletionData; // The completion status.
     @Input() moduleName?: string; // The name of the module this completion affects.
+    @Input() mode: CoreCourseCompletionMode = CoreCourseCompletionMode.FULL; // Show full completion status or a basic mode.
     @Output() completionChanged = new EventEmitter<CoreCourseModuleCompletionData>(); // Notify when completion changes.
 
     accessibleDescription: string | null = null;
@@ -97,6 +97,9 @@ export class CoreCourseModuleManualCompletionComponent implements OnInit, OnChan
             return;
         }
 
+        event.stopPropagation();
+        event.preventDefault();
+
         await CoreCourseHelper.changeManualCompletion(this.completion, event);
 
         // @deprecated MANUAL_COMPLETION_CHANGED is deprecated since 4.0 use COMPLETION_CHANGED instead.
diff --git a/src/core/features/course/components/module/core-course-module.html b/src/core/features/course/components/module/core-course-module.html
index 5a85d4f1d..2b137539d 100644
--- a/src/core/features/course/components/module/core-course-module.html
+++ b/src/core/features/course/components/module/core-course-module.html
@@ -18,21 +18,12 @@
                         [courseId]="module.course" [attr.aria-label]="module.handlerData.a11yTitle + ', ' + modNameTranslated">
                     </core-format-text>
                 </p>
-                <ion-chip class="completioninfo completion_incomplete" *ngIf="completionStatus === 0">
-                    <ion-icon name="fas-edit" aria-hidden="true"></ion-icon>
-                    <ion-label>
-                        {{ 'core.course.todo' | translate }}
-                    </ion-label>
-                </ion-chip>
-                <ion-chip class="completioninfo completion_complete" *ngIf="completionStatus === 1 || completionStatus === 2"
-                    color="success">
-                    <ion-icon name="fas-check" aria-hidden="true"></ion-icon>
-                    <ion-label>{{'core.course.done' | translate }}</ion-label>
-                </ion-chip>
-                <ion-chip class="completioninfo completion_fail" *ngIf="completionStatus === 3" color="danger">
-                    <ion-icon name="fas-times" aria-hidden="true"></ion-icon>
-                    <ion-label>{{'core.course.failed' | translate }}</ion-label>
-                </ion-chip>
+
+                <!-- Basic module completion. -->
+                <core-course-module-completion *ngIf="module.completiondata && module.uservisible" [completion]="module.completiondata"
+                    [moduleName]="module.name" [moduleId]="module.id" [showCompletionConditions]="showCompletionConditions"
+                    [showManualCompletion]="showManualCompletion" (completionChanged)="completionChanged.emit($event)" mode="basic">
+                </core-course-module-completion>
 
                 <ion-chip *ngIf="module.handlerData.extraBadge" [color]="module.handlerData.extraBadgeColor"
                     class="ion-text-wrap ion-text-start" [outline]="true">
@@ -76,10 +67,9 @@
                     </p>
                 </div>
 
-                <!-- Module completion. -->
+                <!-- Module completion. Only auto conditions-->
                 <core-course-module-completion *ngIf="module.completiondata && module.uservisible" [completion]="module.completiondata"
-                    [moduleName]="module.name" [moduleId]="module.id" [showCompletionConditions]="showCompletionConditions"
-                    [showManualCompletion]="showManualCompletion" (completionChanged)="completionChanged.emit($event)">
+                    [moduleName]="module.name" [moduleId]="module.id" [showCompletionConditions]="showCompletionConditions">
                 </core-course-module-completion>
 
                 <div *ngIf="module.completiondata?.offline">
diff --git a/src/core/features/course/components/module/module.scss b/src/core/features/course/components/module/module.scss
index 9048f93d7..cce3cd2aa 100644
--- a/src/core/features/course/components/module/module.scss
+++ b/src/core/features/course/components/module/module.scss
@@ -38,10 +38,6 @@
     }
 
     .core-course-module-info {
-        ion-badge {
-            text-align: start;
-        }
-
         .core-module-availabilityinfo {
             font-size: 90%;
             ul {
diff --git a/src/core/features/course/components/module/module.ts b/src/core/features/course/components/module/module.ts
index fa25f2e50..d3964f732 100644
--- a/src/core/features/course/components/module/module.ts
+++ b/src/core/features/course/components/module/module.ts
@@ -20,7 +20,7 @@ import {
     CoreCourseModuleCompletionData,
     CoreCourseSection,
 } from '@features/course/services/course-helper';
-import { CoreCourse, CoreCourseModuleCompletionStatus, CoreCourseModuleCompletionTracking } from '@features/course/services/course';
+import { CoreCourse } from '@features/course/services/course';
 import { CoreCourseModuleDelegate, CoreCourseModuleHandlerButton } from '@features/course/services/module-delegate';
 
 /**
@@ -47,7 +47,6 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy {
     hasInfo = false;
     showLegacyCompletion = false; // Whether to show module completion in the old format.
     showManualCompletion = false; // Whether to show manual completion when completion conditions are disabled.
-    completionStatus?: CoreCourseModuleCompletionStatus;
 
     /**
      * Component being initialized.
@@ -62,19 +61,11 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy {
         }
 
         this.module.handlerData.a11yTitle = this.module.handlerData.a11yTitle ?? this.module.handlerData.title;
-        this.completionStatus = this.module.completiondata === undefined  ||
-                !this.module.completiondata?.istrackeduser ||
-                this.module.completiondata.tracking == CoreCourseModuleCompletionTracking.COMPLETION_TRACKING_NONE
-            ? undefined
-            : this.module.completiondata.state;
 
         this.hasInfo = !!(
             this.module.description ||
             (this.showActivityDates && this.module.dates && this.module.dates.length) ||
-            (this.module.completiondata &&
-                ((this.showManualCompletion && !this.module.completiondata.isautomatic) ||
-                    (this.showCompletionConditions && this.module.completiondata.isautomatic))
-            ) ||
+            (this.module.completiondata && this.showCompletionConditions && this.module.completiondata.isautomatic) ||
             this.module.completiondata?.offline ||
             (this.module.visible === 0 && (!this.section || this.section.visible)) ||
             (this.module.visible !== 0 && this.module.isStealth) ||
diff --git a/src/core/features/course/services/course.ts b/src/core/features/course/services/course.ts
index fa30f2991..565198a71 100644
--- a/src/core/features/course/services/course.ts
+++ b/src/core/features/course/services/course.ts
@@ -76,6 +76,11 @@ export enum CoreCourseCompletionType {
     AUTO = 1,
 }
 
+export enum CoreCourseCompletionMode {
+    FULL = 'full',
+    BASIC = 'basic',
+}
+
 /**
  * Completion tracking valid values.
  */
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 1a92c7795..0100acc6b 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -184,44 +184,6 @@ ion-app.ios ion-header ion-title {
     white-space: normal !important;
 }
 
-ion-button core-format-text .core-format-text-content {
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    display: block;
-    line-height: 1.2;
-}
-
-ion-button > * {
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
-ion-button.ion-text-wrap {
-    white-space: normal;
-    core-format-text .core-format-text-content {
-        white-space: normal;
-        display: contents;
-    }
-
-    & > * {
-        white-space: normal;
-    }
-}
-
-ion-button.button-outline {
-    --background: var(--contrast-background);
-}
-
-ion-button ion-spinner {
-    --color: inherit !important;
-}
-
-ion-button:not(.button-has-icon-only) > ion-icon {
-    min-width: 20px;
-}
-
 @each $color-name, $unused in $colors {
     .text-#{$color-name},
     p.text-#{$color-name} {
@@ -293,10 +255,6 @@ ion-icon {
     }
 }
 
-ion-button.button-small ion-icon.faicon[slot] {
-    font-size: 1.5em !important;
-}
-
 // Buttons.
 ion-button,
 ion-fab-button,
@@ -306,10 +264,58 @@ button,
     min-width: var(--a11y-min-target-size);
 }
 
+ion-button.button-outline {
+    --border-width: 1px;
+    --background: var(--contrast-background);
+}
+
+ion-button.button-solid {
+    --box-shadow: none;
+}
+
+ion-button core-format-text .core-format-text-content {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: block;
+    line-height: 1.2;
+}
+
+ion-button > * {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+ion-button.ion-text-wrap {
+    white-space: normal;
+    core-format-text .core-format-text-content {
+        white-space: normal;
+        display: contents;
+    }
+
+    & > * {
+        white-space: normal;
+    }
+}
+
+ion-button ion-spinner {
+    --color: inherit !important;
+}
+
+ion-button:not(.button-has-icon-only):not(.button-small) > ion-icon {
+    min-width: 20px;
+}
+
 ion-button.button.button-clear.button-has-icon-only {
     --border-radius: var(--huge-radius);
 }
 
+ion-button.button.button-solid,
+ion-button.button.button-outline {
+    --border-radius: var(--small-radius);
+}
+
 // Clear buttons will be black.
 ion-button.button-clear {
     --primary: var(--primary);
@@ -877,12 +883,14 @@ ion-badge {
     border-radius: var(--big-radius);
 }
 
-ion-chip {
+ion-chip,
+ion-button.chip {
     line-height: 1.1;
     font-size: 12px;
-    padding: 4px 8px;
     min-height: 24px;
-    height: auto;
+    text-transform: none;
+    margin: 4px;
+    font-weight: normal;
 
     ion-icon {
         font-size: 16px;
@@ -890,6 +898,18 @@ ion-chip {
         @include margin(0, 8px, 0, 0);
     }
 
+    ion-label {
+        white-space: normal !important;
+    }
+}
+
+ion-chip {
+    line-height: 1.1;
+    font-size: 12px;
+    padding: 4px 8px;
+    min-height: 24px;
+    height: auto;
+
     &.ion-color {
         background: var(--ion-color-tint);
         &.chip-outline {
@@ -899,9 +919,7 @@ ion-chip {
         }
     }
 
-    ion-label {
-        white-space: normal !important;
-    }
+
 }
 
 ion-searchbar {

From 61a7d5d59f4cfd9a24c5009c8af6328cc2c02c79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 9 Feb 2022 16:53:09 +0100
Subject: [PATCH 0482/1008] MOBILE-3814 module: Re-order course module card
 info

---
 .../components/format/core-course-format.html | 14 +++----
 .../core-course-module-manual-completion.html |  4 ++
 .../components/module/core-course-module.html | 41 +++++++------------
 .../course/components/module/module.ts        |  1 -
 .../pages/module-preview/module-preview.html  | 34 +++++++--------
 5 files changed, 42 insertions(+), 52 deletions(-)

diff --git a/src/core/features/course/components/format/core-course-format.html b/src/core/features/course/components/format/core-course-format.html
index e994ed9ec..a3aab99bf 100644
--- a/src/core/features/course/components/format/core-course-format.html
+++ b/src/core/features/course/components/format/core-course-format.html
@@ -74,16 +74,14 @@
                     </core-format-text>
                 </h2>
                 <div *ngIf="section.visible === 0 && section.uservisible !== false">
-                    <ion-chip>
-                        <ion-icon name="fas-eye-slash" aria-hidden="true"></ion-icon>
-                        <ion-label>{{ 'core.course.hiddenfromstudents' | translate }}</ion-label>
-                    </ion-chip>
+                    <ion-badge color="warning">
+                        {{ 'core.course.hiddenfromstudents' | translate }}
+                    </ion-badge>
                 </div>
                 <div *ngIf="section.visible === 0 && section.uservisible === false">
-                    <ion-chip>
-                        <ion-icon name="fas-eye-slash" aria-hidden="true"></ion-icon>
-                        <ion-label>{{ 'core.notavailable' | translate }}</ion-label>
-                    </ion-chip>
+                    <ion-badge color="warning">
+                        {{ 'core.notavailable' | translate }}
+                    </ion-badge>
                 </div>
                 <div *ngIf="section.availabilityinfo">
                     <ion-chip>
diff --git a/src/core/features/course/components/module-manual-completion/core-course-module-manual-completion.html b/src/core/features/course/components/module-manual-completion/core-course-module-manual-completion.html
index 50910193b..7da05d7ee 100644
--- a/src/core/features/course/components/module-manual-completion/core-course-module-manual-completion.html
+++ b/src/core/features/course/components/module-manual-completion/core-course-module-manual-completion.html
@@ -4,10 +4,14 @@
             class="ion-text-wrap" [class.chip]="mode == 'basic'">
             <ion-icon name="fas-check" slot="start" aria-hidden="true"></ion-icon>
             {{ 'core.course.completion_manual:done' | translate }}
+            <ion-icon *ngIf="completion?.offline" name="fas-sync" [attr.aria-label]="'core.course.manualcompletionnotsynced' | translate"
+                slot="end"></ion-icon>
         </ion-button>
         <ion-button *ngIf="!completion.state" color="dark" fill="outline" [attr.aria-label]="accessibleDescription"
             (click)="completionClicked($event)" class="ion-text-wrap" [class.chip]="mode == 'basic'">
             {{ 'core.course.completion_manual:markdone' | translate }}
+            <ion-icon *ngIf="completion?.offline" name="fas-sync" [attr.aria-label]="'core.course.manualcompletionnotsynced' | translate"
+                slot="end"></ion-icon>
         </ion-button>
     </ng-container>
 
diff --git a/src/core/features/course/components/module/core-course-module.html b/src/core/features/course/components/module/core-course-module.html
index 2b137539d..c057e42c0 100644
--- a/src/core/features/course/components/module/core-course-module.html
+++ b/src/core/features/course/components/module/core-course-module.html
@@ -29,6 +29,14 @@
                     class="ion-text-wrap ion-text-start" [outline]="true">
                     <ion-label><span [innerHTML]="module.handlerData.extraBadge"></span></ion-label>
                 </ion-chip>
+
+                <!-- Hidden badges -->
+                <ion-badge color="warning" *ngIf="module.visible === 0 && (!section || section.visible)">
+                    {{ 'core.course.hiddenfromstudents' | translate }}
+                </ion-badge>
+                <ion-badge color="warning" *ngIf="module.visible !== 0 && module.isStealth">
+                    {{ 'core.course.hiddenoncoursepage' | translate }}
+                </ion-badge>
             </ion-label>
             <!-- Buttons. -->
             <div slot="end" *ngIf="module.uservisible !== false" class="buttons core-module-buttons"
@@ -59,6 +67,11 @@
                     contextLevel="module" [contextInstanceId]="module.id" [courseId]="module.course">
                 </core-format-text>
 
+                <!-- Module completion. Only auto conditions-->
+                <core-course-module-completion *ngIf="module.completiondata && module.uservisible" [completion]="module.completiondata"
+                    [moduleName]="module.name" [moduleId]="module.id" [showCompletionConditions]="showCompletionConditions">
+                </core-course-module-completion>
+
                 <!-- Activity dates. -->
                 <div *ngIf="showActivityDates && module.dates && module.dates.length" class="core-module-dates">
                     <p *ngFor="let date of module.dates">
@@ -67,33 +80,7 @@
                     </p>
                 </div>
 
-                <!-- Module completion. Only auto conditions-->
-                <core-course-module-completion *ngIf="module.completiondata && module.uservisible" [completion]="module.completiondata"
-                    [moduleName]="module.name" [moduleId]="module.id" [showCompletionConditions]="showCompletionConditions">
-                </core-course-module-completion>
-
-                <div *ngIf="module.completiondata?.offline">
-                    <ion-chip color="warning">
-                        <ion-icon name="fas-sync" aria-hidden="true"></ion-icon>
-                        <ion-label>{{ 'core.course.manualcompletionnotsynced' | translate }}</ion-label>
-                    </ion-chip>
-                </div>
-
-                <!-- Availability -->
-                <div *ngIf="module.visible === 0 && (!section || section.visible)">
-                    <ion-chip>
-                        <ion-icon name="fas-eye-slash" aria-hidden="true"></ion-icon>
-                        <ion-label>{{ 'core.course.hiddenfromstudents' | translate }}</ion-label>
-                    </ion-chip>
-                </div>
-
-                <div *ngIf="module.visible !== 0 && module.isStealth">
-                    <ion-chip>
-                        <ion-icon name="fas-eye-slash" aria-hidden="true"></ion-icon>
-                        <ion-label>{{ 'core.course.hiddenoncoursepage' | translate }}</ion-label>
-                    </ion-chip>
-                </div>
-
+                <!-- Availability info -->
                 <div *ngIf="module.availabilityinfo">
                     <ion-chip class="core-module-availabilityinfo">
                         <ion-icon name="fas-lock" [attr.aria-label]="'core.restricted' | translate"></ion-icon>
diff --git a/src/core/features/course/components/module/module.ts b/src/core/features/course/components/module/module.ts
index d3964f732..0761f2ad6 100644
--- a/src/core/features/course/components/module/module.ts
+++ b/src/core/features/course/components/module/module.ts
@@ -66,7 +66,6 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy {
             this.module.description ||
             (this.showActivityDates && this.module.dates && this.module.dates.length) ||
             (this.module.completiondata && this.showCompletionConditions && this.module.completiondata.isautomatic) ||
-            this.module.completiondata?.offline ||
             (this.module.visible === 0 && (!this.section || this.section.visible)) ||
             (this.module.visible !== 0 && this.module.isStealth) ||
             (this.module.availabilityinfo)
diff --git a/src/core/features/course/pages/module-preview/module-preview.html b/src/core/features/course/pages/module-preview/module-preview.html
index bd5b02506..f302e2299 100644
--- a/src/core/features/course/pages/module-preview/module-preview.html
+++ b/src/core/features/course/pages/module-preview/module-preview.html
@@ -28,33 +28,35 @@
             [componentId]="module.id" [expandDescription]="true">
 
             <div class="ion-padding" *ngIf="module.handlerData?.extraBadge">
-                <ion-chip class="ion-text-wrap ion-text-start" [color]="module.handlerData?.extraBadgeColor">
+                <ion-chip *ngIf="module.handlerData?.extraBadge" [color]="module.handlerData?.extraBadgeColor"
+                    class="ion-text-wrap ion-text-start" [outline]="true">
                     <ion-label><span [innerHTML]="module.handlerData?.extraBadge"></span></ion-label>
                 </ion-chip>
             </div>
-            <div class="ion-padding" *ngIf="module.visible === 0 && (!section || section.visible)">
-                <ion-chip class="ion-text-wrap">
+
+            <!-- Hidden badges -->
+            <div *ngIf="module.visible === 0 && (!section || section.visible)">
+                <ion-chip color="warning">
                     <ion-icon name="fas-eye-slash" aria-hidden="true"></ion-icon>
                     <ion-label>{{ 'core.course.hiddenfromstudents' | translate }}</ion-label>
                 </ion-chip>
             </div>
-            <div class="ion-padding" *ngIf="module.visible !== 0 && module.isStealth">
-                <ion-chip class="ion-text-wrap">
+            <div *ngIf="module.visible !== 0 && module.isStealth">
+                <ion-chip color="warning">
                     <ion-icon name="fas-eye-slash" aria-hidden="true"></ion-icon>
                     <ion-label>{{ 'core.course.hiddenoncoursepage' | translate }}</ion-label>
                 </ion-chip>
             </div>
-            <div class="ion-padding core-module-availabilityinfo" *ngIf="module.availabilityinfo">
-                <ion-icon name="fas-lock" [attr.aria-label]="'core.restricted' | translate"></ion-icon>
-                <ion-label>
-                    <core-format-text [text]="module.availabilityinfo" contextLevel="module" [contextInstanceId]="module.id"
-                        [courseId]="courseId" class="ion-text-wrap">
-                    </core-format-text>
-                </ion-label>
-            </div>
-            <div class="ion-padding" *ngIf="module.completiondata?.offline">
-                <ion-chip color="warning" class="ion-text-wrap">
-                    <ion-label>{{ 'core.course.manualcompletionnotsynced' | translate }}</ion-label>
+
+            <!-- Availability info -->
+            <div *ngIf="module.availabilityinfo">
+                <ion-chip class="core-module-availabilityinfo">
+                    <ion-icon name="fas-lock" [attr.aria-label]="'core.restricted' | translate"></ion-icon>
+                    <ion-label>
+                        <core-format-text [text]="module.availabilityinfo" contextLevel="module" [contextInstanceId]="module.id"
+                            [courseId]="module.course">
+                        </core-format-text>
+                    </ion-label>
                 </ion-chip>
             </div>
 

From f24b35de61a9c313e71f30a58504ec364bc32ca6 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 10 Feb 2022 10:43:06 +0100
Subject: [PATCH 0483/1008] MOBILE-3833 core: Improve dev config overrides

---
 .../classes/database/database-table-proxy.ts  | 12 ++++----
 src/core/classes/tests/database-table.test.ts |  5 +++-
 src/core/constants.ts                         | 11 +++++++
 src/core/initializers/initialize-services.ts  |  2 ++
 .../{export-data.ts => prepare-devtools.ts}   | 13 ++++----
 src/core/services/config.ts                   | 30 +++++++++++++++++++
 src/core/services/utils/utils.ts              | 28 +++++++++++++++++
 7 files changed, 88 insertions(+), 13 deletions(-)
 rename src/core/initializers/{export-data.ts => prepare-devtools.ts} (69%)

diff --git a/src/core/classes/database/database-table-proxy.ts b/src/core/classes/database/database-table-proxy.ts
index 58393f943..bda6135bc 100644
--- a/src/core/classes/database/database-table-proxy.ts
+++ b/src/core/classes/database/database-table-proxy.ts
@@ -15,7 +15,7 @@
 import { CoreConstants } from '@/core/constants';
 import { asyncInstance } from '@/core/utils/async-instance';
 import { SQLiteDB, SQLiteDBRecordValues } from '@classes/sqlitedb';
-import { CoreConfigProvider } from '@services/config';
+import { CoreConfig, CoreConfigProvider } from '@services/config';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreDatabaseReducer, CoreDatabaseTable, CoreDatabaseConditions, GetDBRecordPrimaryKey } from './database-table';
 import { CoreDebugDatabaseTable } from './debug-database-table';
@@ -144,7 +144,9 @@ export class CoreDatabaseTableProxy<
      *
      * @returns Database configuration.
      */
-    protected getRuntimeConfig(): CoreDatabaseConfiguration {
+    protected async getRuntimeConfig(): Promise<CoreDatabaseConfiguration> {
+        await CoreConfig.ready();
+
         return {
             ...this.config,
             ...CoreConstants.CONFIG.databaseOptimizations,
@@ -157,7 +159,7 @@ export class CoreDatabaseTableProxy<
      */
     protected async updateTarget(): Promise<void> {
         const oldTarget = this.target.instance;
-        const newTarget = this.createTarget();
+        const newTarget = await this.createTarget();
 
         if (oldTarget) {
             await oldTarget.destroy();
@@ -175,8 +177,8 @@ export class CoreDatabaseTableProxy<
      *
      * @returns Target instance.
      */
-    protected createTarget(): CoreDatabaseTable<DBRecord, PrimaryKeyColumn> {
-        const config = this.getRuntimeConfig();
+    protected async createTarget(): Promise<CoreDatabaseTable<DBRecord, PrimaryKeyColumn>> {
+        const config = await this.getRuntimeConfig();
         const table = this.createTable(config.cachingStrategy);
 
         return config.debug ? new CoreDebugDatabaseTable(table) : table;
diff --git a/src/core/classes/tests/database-table.test.ts b/src/core/classes/tests/database-table.test.ts
index 9c7f1757f..a942959c1 100644
--- a/src/core/classes/tests/database-table.test.ts
+++ b/src/core/classes/tests/database-table.test.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { mock } from '@/testing/utils';
+import { mock, mockSingleton } from '@/testing/utils';
 import { CoreDatabaseTable } from '@classes/database/database-table';
 import {
     CoreDatabaseCachingStrategy,
@@ -20,6 +20,7 @@ import {
     CoreDatabaseTableProxy,
 } from '@classes/database/database-table-proxy';
 import { SQLiteDB, SQLiteDBRecordValues } from '@classes/sqlitedb';
+import { CoreConfig } from '@services/config';
 
 interface User extends SQLiteDBRecordValues {
     id: number;
@@ -66,6 +67,8 @@ function prepareStubs(config: Partial<CoreDatabaseConfiguration> = {}): [User[],
     });
     const table = new CoreDatabaseTableProxy<User>(config, database, 'users');
 
+    mockSingleton(CoreConfig, { isReady: () => Promise.resolve() });
+
     return [records, database, table];
 }
 
diff --git a/src/core/constants.ts b/src/core/constants.ts
index b83e896a8..7113598cc 100644
--- a/src/core/constants.ts
+++ b/src/core/constants.ts
@@ -145,6 +145,17 @@ export class CoreConstants {
     static readonly CONFIG = { ...envJson.config } as unknown as EnvironmentConfig; // Data parsed from config.json files.
     static readonly BUILD = envJson.build as unknown as EnvironmentBuild; // Build info.
 
+    /**
+     * Check whether devtools should be enabled.
+     *
+     * @returns Whether devtools should be enabled.
+     */
+    static enableDevTools(): boolean {
+        // @todo [4.0] This is not the proper way to check for development tools, we should rely only on the BUILD variable.
+        return this.BUILD.isDevelopment
+            || this.CONFIG.versionname.includes('-dev');
+    }
+
 }
 
 interface EnvironmentBuild {
diff --git a/src/core/initializers/initialize-services.ts b/src/core/initializers/initialize-services.ts
index 6b172b93c..0806badd5 100644
--- a/src/core/initializers/initialize-services.ts
+++ b/src/core/initializers/initialize-services.ts
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { CoreConfig } from '@services/config';
 import { CoreFilepool } from '@services/filepool';
 import { CoreLang } from '@services/lang';
 import { CoreLocalNotifications } from '@services/local-notifications';
@@ -20,6 +21,7 @@ import { CoreUpdateManager } from '@services/update-manager';
 
 export default async function(): Promise<void> {
     await Promise.all([
+        CoreConfig.initialize(),
         CoreFilepool.initialize(),
         CoreSites.initialize(),
         CoreLang.initialize(),
diff --git a/src/core/initializers/export-data.ts b/src/core/initializers/prepare-devtools.ts
similarity index 69%
rename from src/core/initializers/export-data.ts
rename to src/core/initializers/prepare-devtools.ts
index 1abdb4239..ffed96e55 100644
--- a/src/core/initializers/export-data.ts
+++ b/src/core/initializers/prepare-devtools.ts
@@ -12,22 +12,21 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { EnvironmentConfig } from '@/types/config';
+import { CoreConfig, CoreConfigProvider } from '@services/config';
 import { CoreConstants } from '../constants';
 
 type DevelopmentWindow = Window & {
-    coreConstantsConfig?: EnvironmentConfig;
+    configProvider?: CoreConfigProvider;
 };
 
-function exportData(window: DevelopmentWindow) {
-    window.coreConstantsConfig = CoreConstants.CONFIG;
+function initializeDevelopmentWindow(window: DevelopmentWindow) {
+    window.configProvider = CoreConfig.instance;
 }
 
 export default function(): void {
-    if (!CoreConstants.CONFIG.versionname.includes('-dev')) {
-        // Only export data in development.
+    if (!CoreConstants.enableDevTools()) {
         return;
     }
 
-    exportData(window);
+    initializeDevelopmentWindow(window);
 }
diff --git a/src/core/services/config.ts b/src/core/services/config.ts
index ef0f65d5a..b203690a3 100644
--- a/src/core/services/config.ts
+++ b/src/core/services/config.ts
@@ -22,6 +22,8 @@ import { CoreConstants } from '../constants';
 import { CoreEvents } from '@singletons/events';
 import { CoreDatabaseTable } from '@classes/database/database-table';
 import { asyncInstance } from '../utils/async-instance';
+import { CorePromisedValue } from '@classes/promised-value';
+import { CoreUtils } from './utils/utils';
 
 declare module '@singletons/events' {
 
@@ -47,6 +49,23 @@ export class CoreConfigProvider {
 
     protected table = asyncInstance<CoreDatabaseTable<ConfigDBEntry, 'name'>>();
     protected defaultEnvironment?: EnvironmentConfig;
+    protected isReady = new CorePromisedValue<void>();
+
+    /**
+     * Wait until configuration is ready for use.
+     */
+    ready(): Promise<void> {
+        return this.isReady;
+    }
+
+    /**
+     * Initialize.
+     */
+    async initialize(): Promise<void> {
+        this.loadDevelopmentConfig();
+
+        this.isReady.resolve();
+    }
 
     /**
      * Initialize database.
@@ -139,6 +158,17 @@ export class CoreConfigProvider {
         CoreEvents.trigger(CoreConfigProvider.ENVIRONMENT_UPDATED, CoreConstants.CONFIG);
     }
 
+    /**
+     * Load development config overrides.
+     */
+    protected loadDevelopmentConfig(): void {
+        if (!CoreConstants.enableDevTools() || !CoreUtils.hasCookie('MoodleAppConfig')) {
+            return;
+        }
+
+        this.patchEnvironment(JSON.parse(CoreUtils.getCookie('MoodleAppConfig') ?? '{}'));
+    }
+
 }
 
 export const CoreConfig = makeSingleton(CoreConfigProvider);
diff --git a/src/core/services/utils/utils.ts b/src/core/services/utils/utils.ts
index 3ddee12d1..4808ccca5 100644
--- a/src/core/services/utils/utils.ts
+++ b/src/core/services/utils/utils.ts
@@ -1748,6 +1748,34 @@ export class CoreUtilsProvider {
         return CoreApp.isIOS() && openFileAction == OpenFileAction.OPEN_WITH;
     }
 
+    /**
+     * Check whether the given cookie is set.
+     *
+     * @param name Cookie name.
+     * @returns Whether the cookie is set.
+     */
+    hasCookie(name: string): boolean {
+        return new RegExp(`(\\s|;|^)${name}=`).test(document.cookie ?? '');
+    }
+
+    /**
+     * Read a cookie.
+     *
+     * @param name Cookie name.
+     * @return Cookie value.
+     */
+    getCookie(name: string): string | null {
+        const cookies = (document.cookie ?? '').split(';').reduce((cookies, cookie) => {
+            const [name, value] = cookie.trim().split('=');
+
+            cookies[name] = value;
+
+            return cookies;
+        }, {});
+
+        return cookies[name] ?? null;
+    }
+
 }
 
 export const CoreUtils = makeSingleton(CoreUtilsProvider);

From e403d2c3ba49effbbf42f7e058b8e3731c42dbc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 9 Feb 2022 17:49:24 +0100
Subject: [PATCH 0484/1008] MOBILE-3814 module: Implement a new collapsible
 item directive

---
 src/core/directives/collapsible-item.ts       | 187 ++++++++++++++++++
 src/core/directives/directives.module.ts      |   3 +
 .../components/course-index/course-index.html |   8 +-
 .../components/module/core-course-module.html |   4 +-
 src/theme/theme.base.scss                     |  88 ++++++++-
 src/theme/theme.light.scss                    |   2 +-
 6 files changed, 280 insertions(+), 12 deletions(-)
 create mode 100644 src/core/directives/collapsible-item.ts

diff --git a/src/core/directives/collapsible-item.ts b/src/core/directives/collapsible-item.ts
new file mode 100644
index 000000000..c7f069354
--- /dev/null
+++ b/src/core/directives/collapsible-item.ts
@@ -0,0 +1,187 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { Directive, ElementRef, Input, OnInit } from '@angular/core';
+import { CoreDomUtils } from '@services/utils/dom';
+import { Translate } from '@singletons';
+import { CoreEventLoadingChangedData, CoreEventObserver, CoreEvents } from '@singletons/events';
+
+const defaultMaxHeight = 56;
+const buttonHeight = 44;
+
+/**
+ * Directive to make an element collapsible.
+ *
+ * Example usage:
+ *
+ * <div collapsible-item>
+ */
+@Directive({
+    selector: '[collapsible-item]',
+})
+export class CoreCollapsibleItemDirective implements OnInit {
+
+    /**
+     * Max height in pixels to render the content box. It should be 56 at least to make sense.
+     * Using this parameter will force display: block to calculate height better.
+     * If you want to avoid this use class="inline" at the same time to use display: inline-block.
+     */
+    @Input('collapsible-item') height: number | string = defaultMaxHeight;
+
+    protected element: HTMLElement;
+    protected toggleExpandEnabled = false;
+    protected expanded = false;
+    protected maxHeight = defaultMaxHeight;
+    protected loadingChangedListener?: CoreEventObserver;
+
+    constructor(el: ElementRef<HTMLElement>) {
+        this.element = el.nativeElement;
+
+        this.element.addEventListener('click', this.elementClicked.bind(this));
+    }
+
+    /**
+     * @inheritdoc
+     */
+    ngOnInit(): void {
+        if (typeof this.height === 'string') {
+            this.maxHeight = this.height === ''
+                ? defaultMaxHeight
+                : parseInt(this.height, 10);
+        } else {
+            this.maxHeight = this.height;
+        }
+        this.maxHeight = this.maxHeight < defaultMaxHeight ? defaultMaxHeight : this.maxHeight;
+
+        if (!this.maxHeight || (window.innerWidth > 576 && window.innerHeight > 576)) {
+            // Do not collapse on big screens.
+            return;
+        }
+
+        // Calculate the height now.
+        this.calculateHeight();
+        setTimeout(() => this.calculateHeight(), 200); // Try again, sometimes the first calculation is wrong.
+
+        this.setExpandButtonEnabled(false);
+
+        // Recalculate the height if a parent core-loading displays the content.
+        this.loadingChangedListener =
+            CoreEvents.on(CoreEvents.CORE_LOADING_CHANGED, (data: CoreEventLoadingChangedData) => {
+                if (data.loaded && CoreDomUtils.closest(this.element.parentElement, '#' + data.uniqueId)) {
+                    // The format-text is inside the loading, re-calculate the height.
+                    this.calculateHeight();
+                    setTimeout(() => this.calculateHeight(), 200);
+                }
+            });
+    }
+
+    /**
+     * Calculate the height and check if we need to display show more or not.
+     */
+    protected calculateHeight(): void {
+        // @todo: Work on calculate this height better.
+        if (!this.maxHeight) {
+            return;
+        }
+
+        // Remove max-height (if any) to calculate the real height.
+        const initialMaxHeight = this.element.style.maxHeight;
+        this.element.style.maxHeight = '';
+
+        const height = CoreDomUtils.getElementHeight(this.element) || 0;
+
+        // Restore the max height now.
+        this.element.style.maxHeight = initialMaxHeight;
+
+        // If cannot calculate height, shorten always.
+        this.setExpandButtonEnabled(!height || height > this.maxHeight);
+    }
+
+    /**
+     * Sets if expand button is enabled or not.
+     *
+     * @param enable Wether enable or disable.
+     */
+    protected setExpandButtonEnabled(enable: boolean): void {
+        this.toggleExpandEnabled = enable;
+        this.element.classList.toggle('collapsible-enabled', enable);
+
+        if (!enable || this.element.querySelector('ion-button.collapsible-toggle'))  {
+            return;
+        }
+
+        // Add expand/collapse buttons
+        const toggleButton = document.createElement('ion-button');
+        toggleButton.classList.add('collapsible-toggle');
+        toggleButton.setAttribute('fill', 'clear');
+
+        const toggleText = document.createElement('span');
+        toggleText.classList.add('collapsible-toggle-text');
+        toggleButton.appendChild(toggleText);
+
+        const expandArrow = document.createElement('span');
+        expandArrow.classList.add('collapsible-toggle-arrow');
+        toggleButton.appendChild(expandArrow);
+
+        this.element.appendChild(toggleButton);
+
+        this.toggleExpand(this.expanded);
+    }
+
+    /**
+     * Expand or collapse text.
+     *
+     * @param expand Wether expand or collapse text. If undefined, will toggle.
+     */
+    protected toggleExpand(expand?: boolean): void {
+        if (expand === undefined) {
+            expand = !this.expanded;
+        }
+        this.expanded = expand;
+        this.element.classList.toggle('collapsible-expanded', expand);
+        this.element.classList.toggle('collapsible-collapsed', !expand);
+        this.element.style.maxHeight = expand ? '' : (this.maxHeight + buttonHeight) + 'px';
+
+        const toggleButton = this.element.querySelector('ion-button.collapsible-toggle');
+        const toggleText = toggleButton?.querySelector('.collapsible-toggle-text');
+        if (!toggleButton || !toggleText) {
+            return;
+        }
+        toggleText.innerHTML = expand ? Translate.instant('core.showless') : Translate.instant('core.showmore');
+        toggleButton.setAttribute('aria-expanded', expand ? 'true' : 'false');
+    }
+
+    /**
+     * Listener to call when the element is clicked.
+     *
+     * @param e Click event.
+     */
+    protected elementClicked(e: MouseEvent): void {
+        if (e.defaultPrevented) {
+            // Ignore it if the event was prevented by some other listener.
+            return;
+        }
+
+        if (!this.toggleExpandEnabled) {
+            // Nothing to do on click, just stop.
+            return;
+        }
+
+        e.preventDefault();
+        e.stopPropagation();
+
+        this.toggleExpand();
+    }
+
+}
diff --git a/src/core/directives/directives.module.ts b/src/core/directives/directives.module.ts
index 018ddafad..42a2b3c79 100644
--- a/src/core/directives/directives.module.ts
+++ b/src/core/directives/directives.module.ts
@@ -29,6 +29,7 @@ import { CoreOnResizeDirective } from './on-resize';
 import { CoreDownloadFileDirective } from './download-file';
 import { CoreCollapsibleHeaderDirective } from './collapsible-header';
 import { CoreSwipeNavigationDirective } from './swipe-navigation';
+import { CoreCollapsibleItemDirective } from './collapsible-item';
 
 @NgModule({
     declarations: [
@@ -47,6 +48,7 @@ import { CoreSwipeNavigationDirective } from './swipe-navigation';
         CoreDownloadFileDirective,
         CoreCollapsibleHeaderDirective,
         CoreSwipeNavigationDirective,
+        CoreCollapsibleItemDirective,
     ],
     exports: [
         CoreAutoFocusDirective,
@@ -64,6 +66,7 @@ import { CoreSwipeNavigationDirective } from './swipe-navigation';
         CoreDownloadFileDirective,
         CoreCollapsibleHeaderDirective,
         CoreSwipeNavigationDirective,
+        CoreCollapsibleItemDirective,
     ],
 })
 export class CoreDirectivesModule {}
diff --git a/src/core/features/course/components/course-index/course-index.html b/src/core/features/course/components/course-index/course-index.html
index b0f6d03a3..a994ca87e 100644
--- a/src/core/features/course/components/course-index/course-index.html
+++ b/src/core/features/course/components/course-index/course-index.html
@@ -16,10 +16,10 @@
             <ion-item *ngIf="allSectionId == section.id" class="ion-text-wrap divider core-course-index-all"
                 (click)="selectSectionOrModule($event, section.id)" button [class.item-current]="selectedId === section.id" detail="false">
                 <ion-label>
-                    <p class="item-heading">
+                    <h2>
                         <core-format-text [text]="section.name" contextLevel="course" [contextInstanceId]="course?.id">
                         </core-format-text>
-                    </p>
+                    </h2>
                 </ion-label>
             </ion-item>
             <ng-container *ngIf="allSectionId != section.id">
@@ -34,10 +34,10 @@
                     <ion-icon *ngIf="!section.hasVisibleModules" name="" slot="start" aria-hidden="true" class="expandable-status-icon">
                     </ion-icon>
                     <ion-label>
-                        <p class="item-heading">
+                        <h2>
                             <core-format-text [text]="section.name" contextLevel="course" [contextInstanceId]="course?.id">
                             </core-format-text>
-                        </p>
+                        </h2>
                     </ion-label>
                     <ion-badge *ngIf="section.highlighted && highlighted">{{highlighted}}</ion-badge>
                     <ion-icon name="fas-lock" *ngIf="section.availabilityinfo" slot="end" class="restricted"
diff --git a/src/core/features/course/components/module/core-course-module.html b/src/core/features/course/components/module/core-course-module.html
index c057e42c0..b16d74692 100644
--- a/src/core/features/course/components/module/core-course-module.html
+++ b/src/core/features/course/components/module/core-course-module.html
@@ -62,8 +62,8 @@
                 'item-media': module.handlerData.icon,
                 'item-dimmed': module.visible === 0 || module.uservisible === false
             }">
-            <ion-label>
-                <core-format-text class="core-module-description" *ngIf="module.description" [maxHeight]="80" [text]="module.description"
+            <ion-label collapsible-item>
+                <core-format-text class="core-module-description" *ngIf="module.description" [text]="module.description"
                     contextLevel="module" [contextInstanceId]="module.id" [courseId]="module.course">
                 </core-format-text>
 
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 0100acc6b..9c15df238 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -918,8 +918,6 @@ ion-chip {
             color: var(--ion-color-base);
         }
     }
-
-
 }
 
 ion-searchbar {
@@ -1243,13 +1241,19 @@ ion-item.item-input ion-input.has-focus {
     }
 }
 
-ion-item-divider.item, ion-item.item.divider {
+ion-item-divider.item,
+ion-item.item.divider {
     --inner-padding-end: 8px;
     background: var(--background);
     min-height: var(--min-height);
-    border-width: var(--item-divider-border-width);
+    border-bottom-width: var(--item-divider-border-width);
+    --border-width: var(--item-divider-border-width);
+    --inner-border-width: 0 0 var(--item-divider-border-width) 0;
     font-size: var(--item-divider-font-size);
-    h2, ion-label h2 {
+    font-weight: medium;
+
+    h2, ion-label h2,
+    p.item-heading, ion-label p.item-heading {
         font-size: var(--item-divider-font-size);
     }
 }
@@ -1314,6 +1318,80 @@ ion-grid.core-no-grid > ion-row {
     right: 0;
 }
 
+[collapsible-item] {
+    --collapsible-display-toggle: none;
+    --collapsible-toggle-background: var(--ion-item-background);
+    --collapsible-min-button-height: 44px;
+
+    .collapsible-toggle {
+        display: var(--collapsible-display-toggle);
+    }
+
+    &.collapsible-enabled {
+        --collapsible-display-toggle: block;
+
+        .collapsible-toggle {
+            display: var(--collapsible-display-toggle);
+            position: absolute;
+            bottom: 0;
+            left: 0;
+            right: 0;
+            text-align: center;
+            z-index: 7;
+            text-transform: none;
+            text-align: end;
+            font-size: 14px;
+            background-color: var(--collapsible-toggle-background);
+            color: var(--text-color);
+            margin: 0;
+
+            .collapsible-toggle-arrow {
+                width: var(--a11y-min-target-size);
+                height: var(--a11y-min-target-size);
+
+                background-position: center;
+                background-repeat: no-repeat;
+                background-size: 14px 14px;
+                @include core-transition(transform, 500ms);
+
+                @include push-arrow-color(626262, true);
+
+                @include darkmode() {
+                    @include push-arrow-color(ffffff, true);
+                }
+            }
+        }
+
+        &.collapsible-collapsed {
+            overflow: hidden;
+            min-height: calc(var(--collapsible-min-button-height) + 12);
+
+            .collapsible-toggle-arrow {
+                transform: rotate(90deg);
+            }
+
+            &:before {
+                content: '';
+                height: 100%;
+                position: absolute;
+                @include position(null, 0, 0, 0);
+                background: -webkit-linear-gradient(top, rgba(var(--core-format-text-background-gradient-rgb), 0) calc(100% - 60px), rgba(var(--core-format-text-background-gradient-rgb), 1) calc(100% - 40px));
+                background: linear-gradient(to bottom, rgba(var(--core-format-text-background-gradient-rgb), 0) calc(100% - 60px), rgba(var(--core-format-text-background-gradient-rgb), 1) calc(100% - 40px));
+                z-index: 6;
+            }
+        }
+
+        &.collapsible-expanded {
+            max-height: none !important;
+            padding-bottom: var(--collapsible-min-button-height); // So the Show less button can fit.
+
+            .collapsible-toggle-arrow {
+                transform: rotate(-90deg);
+            }
+        }
+    }
+}
+
 ion-header[collapsible] {
     @include core-transition(all, 500ms);
 
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 61b52c0f7..2697f08fd 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -222,7 +222,7 @@
     }
 
     --item-divider-min-height: calc(var(--a11y-min-target-size) + 8px);
-    --item-divider-background: transparent;
+    --item-divider-background: var(--ion-item-background);
     --item-divider-color: var(--text-color);
     --item-divider-border-width: 0px;
     --item-divider-font-size: 20px;

From 7690270766d2799004900fb2bcd77af227d8e336 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 9 Feb 2022 22:29:21 +0100
Subject: [PATCH 0485/1008] MOBILE-3814 styles: Ion item without lines by
 default

---
 .../events/addon-block-timeline-events.html   |  6 ++---
 .../reminder-time-modal.html                  |  2 +-
 .../calendar/pages/edit-event/edit-event.html |  6 ++---
 src/addons/competency/pages/plan/plan.html    | 10 +++----
 .../addon-mod-assign-submission-file.html     |  2 +-
 .../component/addon-mod-data-field-file.html  |  2 +-
 .../mod/forum/components/index/index.html     |  2 +-
 .../mod/forum/components/post/post.html       |  6 ++---
 .../mod/glossary/pages/entry/entry.html       |  2 +-
 .../attempt-results/attempt-results.html      | 12 ++++-----
 .../index/addon-mod-lesson-index.html         |  2 +-
 .../mod/lesson/pages/player/player.html       | 26 +++++++++----------
 .../lesson/pages/user-retake/user-retake.html | 20 +++++++-------
 .../mod/quiz/pages/attempt/attempt.html       |  2 +-
 src/addons/mod/quiz/pages/review/review.html  |  2 +-
 ...ddon-mod-workshop-assessment-strategy.html |  2 +-
 src/addons/notifications/pages/list/list.html |  2 +-
 .../pages/notification/notification.html      |  2 +-
 .../pages/settings/settings.html              |  6 ++---
 .../pages/course-storage/course-storage.html  |  2 +-
 .../courses-storage/courses-storage.html      |  2 +-
 src/core/components/timer/core-timer.html     |  2 +-
 .../components/format/core-course-format.html |  2 +-
 .../module-info/core-course-module-info.html  |  6 ++---
 .../components/module/core-course-module.html |  6 ++---
 .../core-courses-course-list-item.html        |  4 +--
 .../core-courses-course-progress.html         |  6 ++---
 src/core/features/courses/pages/my/my.html    |  2 +-
 .../change-password/change-password.html      |  6 ++---
 .../login/pages/credentials/credentials.html  |  8 +++---
 .../pages/email-signup/email-signup.html      |  2 +-
 .../forgotten-password.html                   |  2 +-
 .../login/pages/reconnect/reconnect.html      |  4 +--
 src/core/features/login/pages/site/site.html  |  9 +++----
 .../components/user-menu/user-menu.html       |  4 +--
 .../features/settings/pages/about/about.html  |  3 +--
 .../settings/pages/general/general.html       |  2 +-
 .../features/sitehome/pages/index/index.html  |  8 +++---
 src/theme/theme.base.scss                     | 15 ++++++++++-
 39 files changed, 109 insertions(+), 100 deletions(-)

diff --git a/src/addons/block/timeline/components/events/addon-block-timeline-events.html b/src/addons/block/timeline/components/events/addon-block-timeline-events.html
index 7fffc2bd2..9f6f7b0e2 100644
--- a/src/addons/block/timeline/components/events/addon-block-timeline-events.html
+++ b/src/addons/block/timeline/components/events/addon-block-timeline-events.html
@@ -1,4 +1,4 @@
-<ion-item lines="none" *ngIf="course">
+<ion-item *ngIf="course">
     <ion-label class="ion-text-wrap">
         <h3>
             <span class="sr-only">{{ 'core.courses.aria:coursename' | translate }}</span>
@@ -7,7 +7,7 @@
     </ion-label>
 </ion-item>
 <ion-item-group *ngFor="let dayEvents of filteredEvents">
-    <ion-item lines="none">
+    <ion-item>
         <ion-label>
             <h4 [class.core-bold]="!course">{{ dayEvents.dayTimestamp * 1000 | coreFormatDate:"strftimedaydate" }}</h4>
         </ion-label>
@@ -73,7 +73,7 @@
     <ion-spinner *ngIf="loadingMore" [attr.aria-label]="'core.loading' | translate"></ion-spinner>
 </div>
 
-<ion-item lines="none" *ngIf="empty && course">
+<ion-item *ngIf="empty && course">
     <ion-label class="ion-text-wrap">
         <p>{{'addon.block_timeline.noevents' | translate}}</p>
     </ion-label>
diff --git a/src/addons/calendar/components/reminder-time-modal/reminder-time-modal.html b/src/addons/calendar/components/reminder-time-modal/reminder-time-modal.html
index cdf45cb20..3002fc5fe 100644
--- a/src/addons/calendar/components/reminder-time-modal/reminder-time-modal.html
+++ b/src/addons/calendar/components/reminder-time-modal/reminder-time-modal.html
@@ -27,7 +27,7 @@
         </ion-item>
 
         <!-- Custom value. -->
-        <ion-item lines="none" class="ion-text-wrap">
+        <ion-item class="ion-text-wrap">
             <ion-label>
                 <p>{{ 'core.custom' | translate }}</p>
             </ion-label>
diff --git a/src/addons/calendar/pages/edit-event/edit-event.html b/src/addons/calendar/pages/edit-event/edit-event.html
index 4b536a12d..5e111568f 100644
--- a/src/addons/calendar/pages/edit-event/edit-event.html
+++ b/src/addons/calendar/pages/edit-event/edit-event.html
@@ -147,7 +147,7 @@
                         </ion-label>
                         <ion-radio slot="end" [value]="0"></ion-radio>
                     </ion-item>
-                    <ion-item lines="none">
+                    <ion-item>
                         <ion-label>
                             <p>{{ 'addon.calendar.durationuntil' | translate }}</p>
                         </ion-label>
@@ -159,7 +159,7 @@
                             [placeholder]="'addon.calendar.durationuntil' | translate" [displayFormat]="dateFormat" display-timezone="utc">
                         </ion-datetime>
                     </ion-item>
-                    <ion-item lines="none">
+                    <ion-item>
                         <ion-label>
                             <p>{{ 'addon.calendar.durationminutes' | translate }}</p>
                         </ion-label>
@@ -175,7 +175,7 @@
 
             <!-- Repeat (for new events). -->
             <ng-container *ngIf="!eventId || eventId < 0">
-                <ion-item class="ion-text-wrap divider" lines="none">
+                <ion-item class="ion-text-wrap divider">
                     <ion-label>
                         <p class="item-heading">{{ 'addon.calendar.repeatevent' | translate }}</p>
                     </ion-label>
diff --git a/src/addons/competency/pages/plan/plan.html b/src/addons/competency/pages/plan/plan.html
index 4c55d843d..0f84cbb7f 100644
--- a/src/addons/competency/pages/plan/plan.html
+++ b/src/addons/competency/pages/plan/plan.html
@@ -23,7 +23,7 @@
         </ion-card>
         <ion-card *ngIf="plan">
             <ion-list>
-                <ion-item class="ion-text-wrap" *ngIf="plan.plan.description" lines="none">
+                <ion-item class="ion-text-wrap" *ngIf="plan.plan.description">
                     <ion-label>
                         <p>
                             <core-format-text [text]="plan.plan.description" contextLevel="user" [contextInstanceId]="plan.plan.userid">
@@ -31,25 +31,25 @@
                         </p>
                     </ion-label>
                 </ion-item>
-                <ion-item class="ion-text-wrap" lines="none">
+                <ion-item class="ion-text-wrap">
                     <ion-label>
                         <p class="item-heading">{{ 'addon.competency.status' | translate }}</p>
                         <p>{{ plan.plan.statusname }}</p>
                     </ion-label>
                 </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="plan.plan.duedate > 0" lines="none">
+                <ion-item class="ion-text-wrap" *ngIf="plan.plan.duedate > 0">
                     <ion-label>
                         <p class="item-heading">{{ 'addon.competency.duedate' | translate }}</p>
                         <p>{{ plan.plan.duedate * 1000 | coreFormatDate }}</p>
                     </ion-label>
                 </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="plan.plan.template" lines="none">
+                <ion-item class="ion-text-wrap" *ngIf="plan.plan.template">
                     <ion-label>
                         <p class="item-heading">{{ 'addon.competency.template' | translate }}</p>
                         <p>{{ plan.plan.template.shortname }}</p>
                     </ion-label>
                 </ion-item>
-                <ion-item class="ion-text-wrap" lines="none">
+                <ion-item class="ion-text-wrap">
                     <ion-label id="addon-competency-plan-{{plan.plan.id}}-progress">
                         <p class="item-heading">{{ 'addon.competency.progress' | translate }}</p>
                         <p>
diff --git a/src/addons/mod/assign/submission/file/component/addon-mod-assign-submission-file.html b/src/addons/mod/assign/submission/file/component/addon-mod-assign-submission-file.html
index 65b01b48e..316e4df80 100644
--- a/src/addons/mod/assign/submission/file/component/addon-mod-assign-submission-file.html
+++ b/src/addons/mod/assign/submission/file/component/addon-mod-assign-submission-file.html
@@ -2,7 +2,7 @@
 <ion-item class="ion-text-wrap" *ngIf="files && files.length && !edit">
     <ion-label>
         <h2>{{ plugin.name }}</h2>
-        <div lines="none">
+        <div>
             <core-files [files]="files" [component]="component" [componentId]="assign.cmid" [alwaysDownload]="true"></core-files>
         </div>
     </ion-label>
diff --git a/src/addons/mod/data/fields/file/component/addon-mod-data-field-file.html b/src/addons/mod/data/fields/file/component/addon-mod-data-field-file.html
index 09e90442f..c66729d2b 100644
--- a/src/addons/mod/data/fields/file/component/addon-mod-data-field-file.html
+++ b/src/addons/mod/data/fields/file/component/addon-mod-data-field-file.html
@@ -11,7 +11,7 @@
 </span>
 
 <ng-container *ngIf="displayMode">
-    <div lines="none">
+    <div>
         <core-files [files]="files" [component]="component" [componentId]="componentId" [alwaysDownload]="true"></core-files>
     </div>
 </ng-container>
diff --git a/src/addons/mod/forum/components/index/index.html b/src/addons/mod/forum/components/index/index.html
index eebda708e..11a307a79 100644
--- a/src/addons/mod/forum/components/index/index.html
+++ b/src/addons/mod/forum/components/index/index.html
@@ -40,7 +40,7 @@
         <!-- Activity info. -->
         <core-course-module-info [module]="module" [description]="forum && forum.type != 'single' && description" [component]="component"
             [componentId]="componentId" [courseId]="courseId" [hasDataToSync]="hasOffline || hasOfflineRatings">
-            <ion-item lines="none" class="ion-text-wrap">
+            <ion-item class="ion-text-wrap">
                 <ion-label>
                     {{descriptionNote}}
                 </ion-label>
diff --git a/src/addons/mod/forum/components/post/post.html b/src/addons/mod/forum/components/post/post.html
index c23057906..a077ebe88 100644
--- a/src/addons/mod/forum/components/post/post.html
+++ b/src/addons/mod/forum/components/post/post.html
@@ -1,7 +1,7 @@
 <div class="addon-mod_forum-post">
     <ng-container *ngIf="!formData.isEditing || !showForm">
         <ion-card-header class="ion-text-wrap ion-no-padding" id="addon-mod_forum-post-{{post.id}}">
-            <ion-item class="ion-text-wrap" [class.highlight]="highlight" lines="none">
+            <ion-item class="ion-text-wrap" [class.highlight]="highlight">
                 <ion-label>
                     <div class="addon-mod-forum-post-title" *ngIf="displaySubject">
                         <h2 class="ion-text-wrap">
@@ -63,13 +63,13 @@
             <core-format-text [component]="component" [componentId]="componentId" [text]="post.message" contextLevel="module"
                 [contextInstanceId]="forum && forum.cmid" [courseId]="courseId">
             </core-format-text>
-            <div lines="none" *ngIf="post.attachments && post.attachments.length > 0">
+            <div *ngIf="post.attachments && post.attachments.length > 0">
                 <core-files [files]="post.attachments" [component]="component" [componentId]="componentId" showInline="true">
                 </core-files>
             </div>
         </ion-card-content>
         <div class="addon-mod-forum-post-more-info">
-            <ion-item class="ion-text-wrap" *ngIf="tagsEnabled && post.tags && post.tags.length > 0" lines="none">
+            <ion-item class="ion-text-wrap" *ngIf="tagsEnabled && post.tags && post.tags.length > 0">
                 <div slot="start">{{ 'core.tag.tags' | translate }}:</div>
                 <ion-label>
                     <core-tag-list [tags]="post.tags"></core-tag-list>
diff --git a/src/addons/mod/glossary/pages/entry/entry.html b/src/addons/mod/glossary/pages/entry/entry.html
index ebe54a345..c68402e12 100644
--- a/src/addons/mod/glossary/pages/entry/entry.html
+++ b/src/addons/mod/glossary/pages/entry/entry.html
@@ -46,7 +46,7 @@
                     </core-format-text>
                 </ion-label>
             </ion-item>
-            <div *ngIf="entry.attachment" lines="none">
+            <div *ngIf="entry.attachment">
                 <core-file *ngFor="let file of entry.attachments" [file]="file" [component]="component" [componentId]="componentId">
                 </core-file>
             </div>
diff --git a/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.html b/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.html
index d4022f31c..00a903743 100644
--- a/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.html
+++ b/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.html
@@ -36,13 +36,13 @@
             <!-- Attempt summary. -->
             <ion-card class="addon-mod_h5pactivity-attempt-result-summary">
                 <ion-list>
-                    <ion-item class="ion-text-wrap" lines="none">
+                    <ion-item class="ion-text-wrap">
                         <ion-label>
                             <h2>{{ 'addon.mod_h5pactivity.startdate' | translate }}</h2>
                             <p>{{ attempt.timecreated | coreFormatDate:'strftimedatetime' }}</p>
                         </ion-label>
                     </ion-item>
-                    <ion-item class="ion-text-wrap" lines="none">
+                    <ion-item class="ion-text-wrap">
                         <ion-label>
                             <h2>{{ 'addon.mod_h5pactivity.completion' | translate }}</h2>
                             <p *ngIf="attempt.completion">
@@ -55,13 +55,13 @@
                             </p>
                         </ion-label>
                     </ion-item>
-                    <ion-item class="ion-text-wrap" lines="none">
+                    <ion-item class="ion-text-wrap">
                         <ion-label>
                             <h2>{{ 'addon.mod_h5pactivity.duration' | translate }}</h2>
                             <p>{{ attempt.durationReadable }}</p>
                         </ion-label>
                     </ion-item>
-                    <ion-item class="ion-text-wrap" lines="none">
+                    <ion-item class="ion-text-wrap">
                         <ion-label>
                             <h2>{{ 'addon.mod_h5pactivity.outcome' | translate }}</h2>
                             <p *ngIf="attempt.success !== null && attempt.success">
@@ -77,7 +77,7 @@
                             </p>
                         </ion-label>
                     </ion-item>
-                    <ion-item *ngIf="attempt.maxscore" class="ion-text-wrap" lines="none">
+                    <ion-item *ngIf="attempt.maxscore" class="ion-text-wrap">
                         <ion-label>
                             <h2>{{ 'addon.mod_h5pactivity.totalscore' | translate }}</h2>
                             <p>{{ 'addon.mod_h5pactivity.score_out_of' | translate:{$a: attempt} }}</p>
@@ -151,7 +151,7 @@
                     </ng-container>
 
                     <!-- Result doesn't support tracking. -->
-                    <ion-item class="ion-text-wrap core-warning-item" *ngIf="!result.track" lines="none">
+                    <ion-item class="ion-text-wrap core-warning-item" *ngIf="!result.track">
                         <ion-icon slot="start" name="fas-exclamation-triangle" color="warning" aria-hidden="true"></ion-icon>
                         <ion-label>
                             {{ 'addon.mod_h5pactivity.no_compatible_track' | translate:{$a: result.interactiontype} }}
diff --git a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
index 0f1de12a2..1dd4b2270 100644
--- a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
+++ b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
@@ -69,7 +69,7 @@
                     <ion-list *ngIf="(lesson && !preventReasons.length) || retakeToReview">
                         <ng-container *ngIf="retakeToReview">
                             <!-- A retake was finished in a synchronization, allow reviewing it. -->
-                            <ion-item class="ion-text-wrap" lines="none">
+                            <ion-item class="ion-text-wrap">
                                 <ion-label class="ion-padding-bottom">
                                     {{ 'addon.mod_lesson.retakefinishedinsync' | translate }}
                                 </ion-label>
diff --git a/src/addons/mod/lesson/pages/player/player.html b/src/addons/mod/lesson/pages/player/player.html
index 0a55d7838..69e51bc97 100644
--- a/src/addons/mod/lesson/pages/player/player.html
+++ b/src/addons/mod/lesson/pages/player/player.html
@@ -198,34 +198,34 @@
                 <ion-card-header class="ion-text-wrap" *ngIf="eolData.gradelesson">
                     <ion-card-title>{{ 'addon.mod_lesson.congratulations' | translate }}</ion-card-title>
                 </ion-card-header>
-                <ion-item class="ion-text-wrap" *ngIf="eolData.notenoughtimespent" lines="none">
+                <ion-item class="ion-text-wrap" *ngIf="eolData.notenoughtimespent">
                     <ion-label>{{ eolData.notenoughtimespent.message }}</ion-label>
                 </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="eolData.numberofpagesviewed" lines="none">
+                <ion-item class="ion-text-wrap" *ngIf="eolData.numberofpagesviewed">
                     <ion-label>{{ eolData.numberofpagesviewed.message }}</ion-label>
                 </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="eolData.youshouldview" lines="none">
+                <ion-item class="ion-text-wrap" *ngIf="eolData.youshouldview">
                     <ion-label>{{ eolData.youshouldview.message }}</ion-label>
                 </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="eolData.numberofcorrectanswers" lines="none">
+                <ion-item class="ion-text-wrap" *ngIf="eolData.numberofcorrectanswers">
                     <ion-label>{{ eolData.numberofcorrectanswers.message }}</ion-label>
                 </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="eolData.displayscorewithessays" lines="none">
+                <ion-item class="ion-text-wrap" *ngIf="eolData.displayscorewithessays">
                     <ion-label [innerHTML]="eolData.displayscorewithessays.message"></ion-label>
                 </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="!eolData.displayscorewithessays && eolData.displayscorewithoutessays" lines="none">
+                <ion-item class="ion-text-wrap" *ngIf="!eolData.displayscorewithessays && eolData.displayscorewithoutessays">
                     <ion-label>{{ eolData.displayscorewithoutessays.message }}</ion-label>
                 </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="eolData.yourcurrentgradeisoutof" lines="none">
+                <ion-item class="ion-text-wrap" *ngIf="eolData.yourcurrentgradeisoutof">
                     <ion-label>{{ eolData.yourcurrentgradeisoutof.message }}</ion-label>
                 </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="eolData.eolstudentoutoftimenoanswers" lines="none">
+                <ion-item class="ion-text-wrap" *ngIf="eolData.eolstudentoutoftimenoanswers">
                     <ion-label>{{ eolData.eolstudentoutoftimenoanswers.message }}</ion-label>
                 </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="eolData.welldone" lines="none">
+                <ion-item class="ion-text-wrap" *ngIf="eolData.welldone">
                     <ion-label>{{ eolData.welldone.message }}</ion-label>
                 </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="lesson.progressbar && eolData.progresscompleted" lines="none">
+                <ion-item class="ion-text-wrap" *ngIf="lesson.progressbar && eolData.progresscompleted">
                     <ion-label>
                         <span id="addon-mod_lesson-{{cmId}}-progress-end">
                             {{ 'addon.mod_lesson.progresscompleted' | translate:{$a: eolData.progresscompleted.value} }}
@@ -235,14 +235,14 @@
                         </core-progress-bar>
                     </ion-label>
                 </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="eolData.displayofgrade" lines="none">
+                <ion-item class="ion-text-wrap" *ngIf="eolData.displayofgrade">
                     <ion-label>{{ eolData.displayofgrade.message }}</ion-label>
                 </ion-item>
                 <ion-button *ngIf="eolData.reviewlesson" expand="block" class="ion-text-wrap ion-margin button-no-uppercase"
                     (click)="reviewLesson(reviewPageId!)">
                     {{ 'addon.mod_lesson.reviewlesson' | translate }}
                 </ion-button>
-                <ion-item class="ion-text-wrap" *ngIf="eolData.modattemptsnoteacher" lines="none">
+                <ion-item class="ion-text-wrap" *ngIf="eolData.modattemptsnoteacher">
                     <ion-label>{{ eolData.modattemptsnoteacher.message }}</ion-label>
                 </ion-item>
                 <!-- If activity link was successfully formatted, render the button. -->
@@ -252,7 +252,7 @@
                         [courseId]="courseId">
                     </core-format-text>
                 </ion-button>
-                <ion-item class="ion-text-wrap" *ngIf="activityLink && !activityLink.formatted" lines="none">
+                <ion-item class="ion-text-wrap" *ngIf="activityLink && !activityLink.formatted">
                     <!-- Activity link wasn't formatted, render the original link. -->
                     <ion-label>
                         <core-format-text [text]="activityLink.label" contextLevel="module" [contextInstanceId]="lesson?.coursemodule"
diff --git a/src/addons/mod/lesson/pages/user-retake/user-retake.html b/src/addons/mod/lesson/pages/user-retake/user-retake.html
index 9d0c40651..5c4a27e7a 100644
--- a/src/addons/mod/lesson/pages/user-retake/user-retake.html
+++ b/src/addons/mod/lesson/pages/user-retake/user-retake.html
@@ -83,7 +83,7 @@
                     <ion-card-header class="ion-text-wrap">
                         <ion-card-title>{{page.qtype}}: {{page.title}}</ion-card-title>
                     </ion-card-header>
-                    <ion-item class="ion-text-wrap" lines="none">
+                    <ion-item class="ion-text-wrap">
                         <ion-label>
                             <h3 class="item-heading">{{ 'addon.mod_lesson.question' | translate }}</h3>
                             <p>
@@ -94,13 +94,12 @@
                             </p>
                         </ion-label>
                     </ion-item>
-                    <ion-item class="ion-text-wrap" lines="none">
+                    <ion-item class="ion-text-wrap">
                         <ion-label>
                             <h3 class="item-heading">{{ 'addon.mod_lesson.answer' | translate }}</h3>
                         </ion-label>
                     </ion-item>
-                    <ion-item class="ion-text-wrap" lines="none"
-                        *ngIf="!page.answerdata || !page.answerdata.answers || !page.answerdata.answers.length">
+                    <ion-item class="ion-text-wrap" *ngIf="!page.answerdata || !page.answerdata.answers || !page.answerdata.answers.length">
                         <ion-label>
                             <p>{{ 'addon.mod_lesson.didnotanswerquestion' | translate }}</p>
                         </ion-label>
@@ -108,7 +107,7 @@
                     <div *ngIf="page.answerdata && page.answerdata.answers && page.answerdata.answers.length"
                         class="addon-mod_lesson-answer">
                         <ng-container *ngFor="let answer of page.answerdata.answers">
-                            <ion-item lines="none" *ngIf="page.isContent">
+                            <ion-item *ngIf="page.isContent">
                                 <ion-label class="ion-text-wrap">
                                     <ion-grid class="ion-no-padding">
                                         <!-- Content page, display a button and the content. -->
@@ -151,7 +150,7 @@
                                 </ion-item>
 
                                 <!-- Short answer or numeric. -->
-                                <ion-item class="ion-text-wrap" *ngIf="answer[0].isText" lines="none">
+                                <ion-item class="ion-text-wrap" *ngIf="answer[0].isText">
                                     <ion-label>
                                         <p>{{ answer[0].value }}</p>
                                         <ion-badge *ngIf="answer[1]" color="dark">
@@ -164,7 +163,7 @@
                                 </ion-item>
 
                                 <!-- Matching. -->
-                                <ion-item lines="none" *ngIf="answer[0].isSelect">
+                                <ion-item *ngIf="answer[0].isSelect">
                                     <ion-label class="ion-text-wrap">
                                         <ion-grid class="ion-no-padding">
                                             <ion-row>
@@ -191,8 +190,7 @@
                                 </ion-item>
 
                                 <!-- Essay or couldn't determine. -->
-                                <ion-item class="ion-text-wrap" lines="none"
-                                    *ngIf="!answer[0].isCheckbox && !answer[0].isText && !answer[0].isSelect">
+                                <ion-item class="ion-text-wrap" *ngIf="!answer[0].isCheckbox && !answer[0].isText && !answer[0].isSelect">
                                     <ion-label>
                                         <p>
                                             <core-format-text [component]="component" [componentId]="lesson?.coursemodule"
@@ -210,7 +208,7 @@
                                 </ion-item>
                             </ng-container>
 
-                            <ion-item class="ion-text-wrap" *ngIf="!page.isContent && !page.isQuestion" lines="none">
+                            <ion-item class="ion-text-wrap" *ngIf="!page.isContent && !page.isQuestion">
                                 <!-- Another page (end of branch, ...). -->
                                 <ion-label>
                                     <p>
@@ -227,7 +225,7 @@
                             </ion-item>
                         </ng-container>
 
-                        <ion-item class="ion-text-wrap" *ngIf="page.answerdata.response" lines="none">
+                        <ion-item class="ion-text-wrap" *ngIf="page.answerdata.response">
                             <ion-label>
                                 <h3 class="item-heading">{{ 'addon.mod_lesson.response' | translate }}</h3>
                                 <p>
diff --git a/src/addons/mod/quiz/pages/attempt/attempt.html b/src/addons/mod/quiz/pages/attempt/attempt.html
index adf13e110..9454e17a9 100644
--- a/src/addons/mod/quiz/pages/attempt/attempt.html
+++ b/src/addons/mod/quiz/pages/attempt/attempt.html
@@ -17,7 +17,7 @@
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
     <core-loading [hideUntil]="loaded">
-        <ion-list *ngIf="attempt" lines="none">
+        <ion-list *ngIf="attempt">
             <ion-item class="ion-text-wrap">
                 <ion-label>
                     <h2>{{ 'addon.mod_quiz.attemptnumber' | translate }}</h2>
diff --git a/src/addons/mod/quiz/pages/review/review.html b/src/addons/mod/quiz/pages/review/review.html
index be30538f5..a83b93d8d 100644
--- a/src/addons/mod/quiz/pages/review/review.html
+++ b/src/addons/mod/quiz/pages/review/review.html
@@ -31,7 +31,7 @@
                     </ng-container>
                 </ion-card-title>
             </ion-card-header>
-            <ion-list lines="none">
+            <ion-list>
                 <ion-item class="ion-text-wrap">
                     <ion-label>
                         <h2>{{ 'addon.mod_quiz.startedon' | translate }}</h2>
diff --git a/src/addons/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html b/src/addons/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html
index d3bc0cf0b..1f3111ee3 100644
--- a/src/addons/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html
+++ b/src/addons/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html
@@ -57,7 +57,7 @@
                     </core-format-text>
                 </ion-label>
             </ion-item>
-            <ion-item *ngIf="!edit && workshop.overallfeedbackfiles && data.assessment?.feedbackattachmentfiles?.length" lines="none">
+            <ion-item *ngIf="!edit && workshop.overallfeedbackfiles && data.assessment?.feedbackattachmentfiles?.length">
                 <ion-label>
                     <core-files [files]="data.assessment?.feedbackattachmentfiles" [component]="component" [componentId]="componentId">
                     </core-files>
diff --git a/src/addons/notifications/pages/list/list.html b/src/addons/notifications/pages/list/list.html
index 0a4462816..0acb02682 100644
--- a/src/addons/notifications/pages/list/list.html
+++ b/src/addons/notifications/pages/list/list.html
@@ -26,7 +26,7 @@
         </div>
 
         <ion-card *ngFor="let notification of notifications">
-            <ion-item class="ion-text-wrap" lines="none" [attr.aria-label]="
+            <ion-item class="ion-text-wrap" [attr.aria-label]="
                     notification.timeread
                     ? notification.subject
                     : 'addon.notifications.unreadnotification' | translate: {$a: notification.subject}">
diff --git a/src/addons/notifications/pages/notification/notification.html b/src/addons/notifications/pages/notification/notification.html
index 520e6dc3b..371835ddb 100644
--- a/src/addons/notifications/pages/notification/notification.html
+++ b/src/addons/notifications/pages/notification/notification.html
@@ -10,7 +10,7 @@
 </ion-header>
 <ion-content>
     <core-loading [hideUntil]="loaded">
-        <ion-item class="ion-text-wrap" lines="none" [attr.aria-label]="subject">
+        <ion-item class="ion-text-wrap" [attr.aria-label]="subject">
             <core-user-avatar *ngIf="userIdFrom > 0" slot="start" [userId]="userIdFrom" [profileUrl]="profileImageUrlFrom"
                 [fullname]="userFromFullName">
                 <img *ngIf="iconUrl && !modname" [src]="iconUrl" alt="" role="presentation" class="core-avatar-extra">
diff --git a/src/addons/notifications/pages/settings/settings.html b/src/addons/notifications/pages/settings/settings.html
index 6bd5e89d8..274953f0d 100644
--- a/src/addons/notifications/pages/settings/settings.html
+++ b/src/addons/notifications/pages/settings/settings.html
@@ -107,11 +107,11 @@
             </ion-item>
 
             <!-- Phone view -->
-            <ion-item class="ion-text-wrap ion-no-margin ion-hide-md-up" lines="none">
+            <ion-item class="ion-text-wrap ion-no-margin ion-hide-md-up">
                 <p class="item-heading">{{ notification.displayname }}</p>
             </ion-item>
             <!-- If notifications enabled, show toggles. If disabled, show "Disabled" instead of toggle. -->
-            <ion-item *ngFor="let state of ['loggedin', 'loggedoff']" class="ion-text-wrap ion-hide-md-up" lines="none">
+            <ion-item *ngFor="let state of ['loggedin', 'loggedoff']" class="ion-text-wrap ion-hide-md-up">
                 <ion-label class="ion-margin-horizontal">
                     <p>{{ 'core.settings.' + state | translate }}</p>
                 </ion-label>
@@ -148,7 +148,7 @@
         </ion-item-divider>
         <ng-container *ngFor="let notification of component.notifications">
             <!-- If notifications enabled, show toggles. If disabled, show "Disabled" instead of toggle. -->
-            <ion-item class="ion-text-wrap" lines="none">
+            <ion-item class="ion-text-wrap">
                 <ion-label>
                     <p>{{ notification.displayname }}</p>
                 </ion-label>
diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.html b/src/addons/storagemanager/pages/course-storage/course-storage.html
index dab853fb1..07054abe7 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.html
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.html
@@ -14,7 +14,7 @@
             <ion-card-header>
                 <p class="ion-text-wrap ion-no-margin">{{ 'addon.storagemanager.courseinfo' | translate }}</p>
                 <ion-card-title>{{ title }}</ion-card-title>
-                <ion-item class="size ion-text-wrap ion-no-padding" lines="none">
+                <ion-item class="size ion-text-wrap ion-no-padding">
                     <ion-label>
                         <p class="item-heading ion-text-wrap">{{ 'addon.storagemanager.totaldownloads' | translate }}</p>
                         <ion-badge color="light">{{ totalSize | coreBytesToSize }}</ion-badge>
diff --git a/src/addons/storagemanager/pages/courses-storage/courses-storage.html b/src/addons/storagemanager/pages/courses-storage/courses-storage.html
index ffffbc9f3..9bf0f92a9 100644
--- a/src/addons/storagemanager/pages/courses-storage/courses-storage.html
+++ b/src/addons/storagemanager/pages/courses-storage/courses-storage.html
@@ -26,7 +26,7 @@
                     <ion-icon name="fas-trash" slot="icon-only" aria-hidden="true"></ion-icon>
                 </ion-button>
             </ion-item>
-            <ion-item class="size ion-text-wrap" lines="none">
+            <ion-item class="size ion-text-wrap">
                 <ion-label>
                     <h2 class="ion-text-wrap">{{ 'addon.storagemanager.coursesspaceusage' | translate }}</h2>
                     <ion-badge color="light">{{ totalSize | coreBytesToSize }}</ion-badge>
diff --git a/src/core/components/timer/core-timer.html b/src/core/components/timer/core-timer.html
index 27ecb46df..388a53324 100644
--- a/src/core/components/timer/core-timer.html
+++ b/src/core/components/timer/core-timer.html
@@ -1,4 +1,4 @@
-<ion-item lines="none" class="core-timer" role="timer" [ngClass]="{'ion-text-center': align == 'center', 'ion-text-end': align == 'right'}">
+<ion-item class="core-timer" role="timer" [ngClass]="{'ion-text-center': align == 'center', 'ion-text-end': align == 'right'}">
     <ion-icon name="fas-clock" slot="start" aria-hidden="true"></ion-icon>
     <ion-label>
         <span *ngIf="timeLeft && timeLeft > 0 && timerText" class="core-timer-text">{{ timerText }}</span>
diff --git a/src/core/features/course/components/format/core-course-format.html b/src/core/features/course/components/format/core-course-format.html
index a3aab99bf..1c06ea6c0 100644
--- a/src/core/features/course/components/format/core-course-format.html
+++ b/src/core/features/course/components/format/core-course-format.html
@@ -96,7 +96,7 @@
             <ion-badge *ngIf="section.highlighted && highlighted" slot="end">{{highlighted}}</ion-badge>
         </ion-item-divider>
 
-        <ion-item class="ion-text-wrap" *ngIf="section.summary" lines="none">
+        <ion-item class="ion-text-wrap" *ngIf="section.summary">
             <ion-label>
                 <core-format-text [text]="section.summary" contextLevel="course" [contextInstanceId]="course.id">
                 </core-format-text>
diff --git a/src/core/features/course/components/module-info/core-course-module-info.html b/src/core/features/course/components/module-info/core-course-module-info.html
index 864dd98a5..8ea74f89a 100644
--- a/src/core/features/course/components/module-info/core-course-module-info.html
+++ b/src/core/features/course/components/module-info/core-course-module-info.html
@@ -1,4 +1,4 @@
-<ion-item class="ion-text-wrap collapsible-title" lines="none">
+<ion-item class="ion-text-wrap collapsible-title">
     <core-mod-icon slot="start" [modicon]="modicon" [modname]="module.modname" [componentId]="module.instance">
     </core-mod-icon>
     <ion-label>
@@ -11,7 +11,7 @@
         <ng-content select="[title]"></ng-content>
     </ion-label>
 </ion-item>
-<ion-item class="ion-text-wrap" *ngIf="description" lines="none">
+<ion-item class="ion-text-wrap" *ngIf="description">
     <ion-label>
         <core-format-text [text]="description" [component]="component" [componentId]="componentId" contextLevel="module"
             [contextInstanceId]="module.id" [courseId]="courseId" [maxHeight]="expandDescription ? null : 120">
@@ -20,7 +20,7 @@
 </ion-item>
 <ng-content select="[description]"></ng-content>
 
-<ion-item class="ion-text-wrap core-module-dates" lines="none" *ngIf="showCompletion && (module.dates?.length ||
+<ion-item class="ion-text-wrap core-module-dates" *ngIf="showCompletion && (module.dates?.length ||
 (module.completiondata && module.completiondata.isautomatic && module.uservisible))">
     <ion-label>
         <!-- Activity dates. -->
diff --git a/src/core/features/course/components/module/core-course-module.html b/src/core/features/course/components/module/core-course-module.html
index b16d74692..fff96491f 100644
--- a/src/core/features/course/components/module/core-course-module.html
+++ b/src/core/features/course/components/module/core-course-module.html
@@ -1,6 +1,6 @@
 <ion-card *ngIf="module.handlerData && module.visibleoncoursepage !== 0">
     <ng-container *ngIf="!module.handlerData.loading">
-        <ion-item id="core-course-module-{{module.id}}" detail="false" lines="none"
+        <ion-item id="core-course-module-{{module.id}}" detail="false"
             class="ion-text-wrap core-course-module-handler core-module-main-item {{module.handlerData.class}}"
             (click)="moduleClicked($event)" [attr.aria-label]="module.handlerData.a11yTitle" [ngClass]="{
                 'has-module-info': hasInfo,
@@ -57,7 +57,7 @@
                 </div>
             </div>
         </ion-item>
-        <ion-item *ngIf="hasInfo" id="core-course-module-{{module.id}}-info" detail="false" lines="none"
+        <ion-item *ngIf="hasInfo" id="core-course-module-{{module.id}}-info" detail="false"
             class="ion-text-wrap core-course-module-handler core-course-module-info {{module.handlerData.class}}" [ngClass]="{
                 'item-media': module.handlerData.icon,
                 'item-dimmed': module.visible === 0 || module.uservisible === false
@@ -99,7 +99,7 @@
     <!-- Loading. -->
     <ion-item *ngIf="module.handlerData.loading" role="status" class="ion-text-wrap" id="core-course-module-{{module.id}}"
         [attr.aria-label]="module.handlerData.a11yTitle"
-        [ngClass]="['core-course-module-handler', 'core-module-loading', module.handlerData.class]" detail="false" lines="none">
+        [ngClass]="['core-course-module-handler', 'core-module-loading', module.handlerData.class]" detail="false">
         <ion-label>
             <ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner>
         </ion-label>
diff --git a/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html b/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
index 625fd2ad1..41216f198 100644
--- a/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
+++ b/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
@@ -12,8 +12,8 @@
         </ng-container>
     </div>
 
-    <ion-item class="ion-text-wrap" button lines="none" detail="false" (click)="openCourse()"
-        [attr.aria-label]="course.displayname || course.fullname" [class.item-disabled]="course.visible == 0">
+    <ion-item class="ion-text-wrap" button detail="false" (click)="openCourse()" [attr.aria-label]="course.displayname || course.fullname"
+        [class.item-disabled]="course.visible == 0">
 
         <ng-container *ngIf="layout == 'list' || layout == 'listwithenrol'">
             <ion-icon *ngIf="!course.courseImage" name="fas-graduation-cap" slot="start" class="course-icon core-course-thumb">
diff --git a/src/core/features/courses/components/course-progress/core-courses-course-progress.html b/src/core/features/courses/components/course-progress/core-courses-course-progress.html
index d89c865da..ab0ce2457 100644
--- a/src/core/features/courses/components/course-progress/core-courses-course-progress.html
+++ b/src/core/features/courses/components/course-progress/core-courses-course-progress.html
@@ -3,8 +3,8 @@
         [style.background-color]="course.color">
         <img *ngIf="course.courseImage" [src]="course.courseImage" core-external-content alt="" />
     </div>
-    <ion-item button lines="none" (click)="openCourse()" [attr.aria-label]="course.displayname || course.fullname"
-        class="core-course-header" [class.item-disabled]="course.visible == 0"
+    <ion-item button (click)="openCourse()" [attr.aria-label]="course.displayname || course.fullname" class="core-course-header"
+        [class.item-disabled]="course.visible == 0"
         [class.core-course-only-title]="!showAll || progress < 0 && completionUserTracked === false" detail="false">
         <ion-label class="ion-text-wrap core-course-title"
             [class.core-course-with-buttons]="courseOptionMenuEnabled || (downloadCourseEnabled && showDownload)"
@@ -53,7 +53,7 @@
             </ion-button>
         </div>
     </ion-item>
-    <ion-item *ngIf="showAll && progress >= 0 && completionUserTracked !== false" lines="none" class="core-course-progress">
+    <ion-item *ngIf="showAll && progress >= 0 && completionUserTracked !== false" class="core-course-progress">
         <ion-label>
             <core-progress-bar [progress]="progress" a11yText="core.courses.aria:courseprogress"></core-progress-bar>
         </ion-label>
diff --git a/src/core/features/courses/pages/my/my.html b/src/core/features/courses/pages/my/my.html
index f53075af7..9c2d2f6b2 100644
--- a/src/core/features/courses/pages/my/my.html
+++ b/src/core/features/courses/pages/my/my.html
@@ -22,7 +22,7 @@
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
     <core-loading [hideUntil]="loaded">
-        <ion-item class="ion-text-wrap divider" lines="none">
+        <ion-item class="ion-text-wrap divider">
             <ion-label>
                 <h2>{{ 'core.courses.mycourses' | translate }}</h2>
             </ion-label>
diff --git a/src/core/features/login/pages/change-password/change-password.html b/src/core/features/login/pages/change-password/change-password.html
index d3b0e44e7..9d89d49e4 100644
--- a/src/core/features/login/pages/change-password/change-password.html
+++ b/src/core/features/login/pages/change-password/change-password.html
@@ -18,7 +18,7 @@
 <ion-content>
     <ion-list>
         <ng-container *ngIf="!changingPassword">
-            <ion-item class="ion-text-wrap" lines="none">
+            <ion-item class="ion-text-wrap">
                 <ion-label>
                     <h2>{{ 'core.login.forcepasswordchangenotice' | translate }}</h2>
                     <p class="ion-padding-top">{{ 'core.login.changepasswordinstructions' | translate }}</p>
@@ -29,7 +29,7 @@
             </ion-button>
         </ng-container>
         <ng-container *ngIf="changingPassword">
-            <ion-item class="ion-text-wrap" lines="none">
+            <ion-item class="ion-text-wrap">
                 <ion-label>
                     <p>{{ 'core.login.changepasswordreconnectinstructions' | translate }}</p>
                 </ion-label>
@@ -38,7 +38,7 @@
                 {{ 'core.login.reconnect' | translate }}
             </ion-button>
         </ng-container>
-        <ion-item class="ion-text-wrap" lines="none">
+        <ion-item class="ion-text-wrap">
             <ion-label>
                 <p>{{ 'core.login.changepasswordlogoutinstructions' | translate }}</p>
             </ion-label>
diff --git a/src/core/features/login/pages/credentials/credentials.html b/src/core/features/login/pages/credentials/credentials.html
index 11772f5e6..ce0c56988 100644
--- a/src/core/features/login/pages/credentials/credentials.html
+++ b/src/core/features/login/pages/credentials/credentials.html
@@ -54,7 +54,7 @@
 
             <ng-container *ngIf="showScanQR">
                 <div class="ion-text-center ion-padding">{{ 'core.login.or' | translate }}</div>
-                <ion-button expand="block" color="light" class="ion-margin" lines="none" (click)="showInstructionsAndScanQR()">
+                <ion-button expand="block" color="light" class="ion-margin" (click)="showInstructionsAndScanQR()">
                     <ion-icon slot="start" name="fas-qrcode" aria-hidden="true"></ion-icon>
                     {{ 'core.scanqr' | translate }}
                 </ion-button>
@@ -68,7 +68,7 @@
         </ion-button>
 
         <ion-list *ngIf="identityProviders && identityProviders.length" class="ion-padding-top core-login-identity-providers">
-            <ion-item class="ion-text-wrap" lines="none">
+            <ion-item class="ion-text-wrap">
                 <ion-label>
                     <h3 class="item-heading">{{ 'core.login.potentialidps' | translate }}</h3>
                 </ion-label>
@@ -81,12 +81,12 @@
         </ion-list>
 
         <ion-list *ngIf="canSignup" class="ion-padding-top core-login-sign-up">
-            <ion-item class="ion-text-wrap" lines="none">
+            <ion-item class="ion-text-wrap">
                 <ion-label>
                     <h3 class="item-heading">{{ 'core.login.firsttime' | translate }}</h3>
                 </ion-label>
             </ion-item>
-            <ion-item class="ion-text-wrap" lines="none" *ngIf="authInstructions">
+            <ion-item class="ion-text-wrap" *ngIf="authInstructions">
                 <ion-label>
                     <p>
                         <core-format-text [text]="authInstructions" [filter]="false"></core-format-text>
diff --git a/src/core/features/login/pages/email-signup/email-signup.html b/src/core/features/login/pages/email-signup/email-signup.html
index 8aeae3721..d4ab18e0c 100644
--- a/src/core/features/login/pages/email-signup/email-signup.html
+++ b/src/core/features/login/pages/email-signup/email-signup.html
@@ -232,7 +232,7 @@
                 </h3>
             </ion-label>
         </ion-item-divider>
-        <ion-item class="ion-text-wrap" lines="none">
+        <ion-item class="ion-text-wrap">
             <ion-label>
                 <h3 class="item-heading">{{ 'core.considereddigitalminor' | translate }}</h3>
                 <p>{{ 'core.digitalminor_desc' | translate }}</p>
diff --git a/src/core/features/login/pages/forgotten-password/forgotten-password.html b/src/core/features/login/pages/forgotten-password/forgotten-password.html
index 2798c9b99..d5a307706 100644
--- a/src/core/features/login/pages/forgotten-password/forgotten-password.html
+++ b/src/core/features/login/pages/forgotten-password/forgotten-password.html
@@ -10,7 +10,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-list lines="none">
+    <ion-list>
         <ion-item class="ion-text-wrap">
             <ion-label>{{ 'core.login.passwordforgotteninstructions2' | translate }}</ion-label>
         </ion-item>
diff --git a/src/core/features/login/pages/reconnect/reconnect.html b/src/core/features/login/pages/reconnect/reconnect.html
index d8fa966ff..e365d0e05 100644
--- a/src/core/features/login/pages/reconnect/reconnect.html
+++ b/src/core/features/login/pages/reconnect/reconnect.html
@@ -65,7 +65,7 @@
 
         <ng-container *ngIf="showScanQR">
             <div class="ion-text-center ion-padding">{{ 'core.login.or' | translate }}</div>
-            <ion-button expand="block" color="light" class="ion-margin" lines="none" (click)="showInstructionsAndScanQR()">
+            <ion-button expand="block" color="light" class="ion-margin" (click)="showInstructionsAndScanQR()">
                 <ion-icon slot="start" name="fas-qrcode" aria-hidden="true"></ion-icon>
                 {{ 'core.scanqr' | translate }}
             </ion-button>
@@ -80,7 +80,7 @@
 
     <!-- Identity providers. -->
     <ion-list *ngIf="identityProviders && identityProviders.length" class="ion-padding-top core-login-identity-providers">
-        <ion-item class="ion-text-wrap" lines="none">
+        <ion-item class="ion-text-wrap">
             <ion-label>
                 <h3 class="item-heading">{{ 'core.login.potentialidps' | translate }}</h3>
             </ion-label>
diff --git a/src/core/features/login/pages/site/site.html b/src/core/features/login/pages/site/site.html
index c6a3f8071..5adb6101f 100644
--- a/src/core/features/login/pages/site/site.html
+++ b/src/core/features/login/pages/site/site.html
@@ -42,7 +42,7 @@
             </ion-item>
 
             <ion-list [class.hidden]="!hasSites && !enteredSiteUrl" class="core-login-site-list">
-                <ion-item lines="none" class="core-login-site-list-title">
+                <ion-item class="core-login-site-list-title">
                     <ion-label>
                         <h2 class="item-heading">{{ 'core.login.selectsite' | translate }}</h2>
                     </ion-label>
@@ -73,7 +73,7 @@
             </div>
         </ng-container>
 
-        <ion-item *ngIf="siteSelector == 'url'" lines="none">
+        <ion-item *ngIf="siteSelector == 'url'">
             <ion-label>
                 <ion-button expand="block" [disabled]="!siteForm.valid" class="ion-text-wrap" type="submit">
                     {{ 'core.login.connect' | translate }}
@@ -85,7 +85,7 @@
     <ng-container *ngIf="fixedSites">
         <!-- Pick the site from a list of fixed sites. -->
         <ion-list *ngIf="siteSelector == 'list'">
-            <ion-item lines="none">
+            <ion-item>
                 <ion-label>
                     <h2 class="item-heading">{{ 'core.login.selectsite' | translate }}</h2>
                 </ion-label>
@@ -101,8 +101,7 @@
 
     <ng-container *ngIf="showScanQR && !hasSites && !enteredSiteUrl">
         <div class="ion-text-center ion-padding ion-margin-top">{{ 'core.login.or' | translate }}</div>
-        <ion-button expand="block" color="light" class="ion-margin" lines="none" (click)="showInstructionsAndScanQR()"
-            aria-haspopup="dialog">
+        <ion-button expand="block" color="light" class="ion-margin" (click)="showInstructionsAndScanQR()" aria-haspopup="dialog">
             <ion-icon slot="start" name="fas-qrcode" aria-hidden="true"></ion-icon>
             {{ 'core.scanqr' | translate }}
         </ion-button>
diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.html b/src/core/features/mainmenu/components/user-menu/user-menu.html
index 572e8aa26..3932978ae 100644
--- a/src/core/features/mainmenu/components/user-menu/user-menu.html
+++ b/src/core/features/mainmenu/components/user-menu/user-menu.html
@@ -35,7 +35,7 @@
             </ion-label>
         </ion-item>
 
-        <ion-item class="ion-text-center" *ngIf="(!handlers || !handlers.length) && !handlersLoaded" lines="none">
+        <ion-item class="ion-text-center" *ngIf="(!handlers || !handlers.length) && !handlersLoaded">
             <ion-label>
                 <ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner>
             </ion-label>
@@ -43,7 +43,7 @@
 
         <ion-item button *ngFor="let handler of handlers" class="ion-text-wrap" (click)="handlerClicked($event, handler)"
             [ngClass]="['core-user-menu-handler', handler.class || '']" [hidden]="handler.hidden"
-            [attr.aria-label]="handler.title | translate" detail="true" lines="none">
+            [attr.aria-label]="handler.title | translate" detail="true">
             <ion-icon *ngIf="handler.icon" [name]="handler.icon" slot="start" aria-hidden="true"></ion-icon>
             <ion-label>
                 <p class="item-heading">{{ handler.title | translate }}</p>
diff --git a/src/core/features/settings/pages/about/about.html b/src/core/features/settings/pages/about/about.html
index 04d5a5971..4af2acfda 100644
--- a/src/core/features/settings/pages/about/about.html
+++ b/src/core/features/settings/pages/about/about.html
@@ -36,8 +36,7 @@
 </ion-content>
 
 <ion-footer class="ion-no-border">
-    <ion-item button class="ion-text-wrap ion-text-center core-about-deviceinfo" detail="false" (click)="openPage('deviceinfo')"
-        lines="none">
+    <ion-item button class="ion-text-wrap ion-text-center core-about-deviceinfo" detail="false" (click)="openPage('deviceinfo')">
         <ion-label>
             <h2>{{ appName }} {{ versionName }}</h2>
         </ion-label>
diff --git a/src/core/features/settings/pages/general/general.html b/src/core/features/settings/pages/general/general.html
index 530926a4a..a48de95bc 100644
--- a/src/core/features/settings/pages/general/general.html
+++ b/src/core/features/settings/pages/general/general.html
@@ -36,7 +36,7 @@
             </ion-segment>
         </ion-item>
         <ion-item class="ion-text-wrap core-settings-general-color-scheme" *ngIf="colorSchemes.length > 0"
-            [lines]="selectedScheme=='system' && isAndroid ? 'none' : 'inset'">
+            [lines]="selectedScheme=='system' && isAndroid ? 'none' : ''">
             <ion-label>
                 <h2>{{ 'core.settings.colorscheme' | translate }}</h2>
                 <p *ngIf="colorSchemeDisabled" class="text-danger">{{ 'core.settings.forcedsetting' | translate }}</p>
diff --git a/src/core/features/sitehome/pages/index/index.html b/src/core/features/sitehome/pages/index/index.html
index a2f064248..43e87b631 100644
--- a/src/core/features/sitehome/pages/index/index.html
+++ b/src/core/features/sitehome/pages/index/index.html
@@ -55,7 +55,7 @@
 </ion-content>
 
 <ng-template #allCourseList>
-    <ion-item button class="ion-text-wrap" (click)="openAvailableCourses()" lines="none">
+    <ion-item button class="ion-text-wrap" (click)="openAvailableCourses()">
         <ion-icon name="fas-graduation-cap" fixed-width slot="start" aria-hidden="true"></ion-icon>
         <ion-label>
             <h2>{{ 'core.courses.availablecourses' | translate}}</h2>
@@ -69,7 +69,7 @@
 </ng-template>
 
 <ng-template #categories>
-    <ion-item button class="ion-text-wrap" (click)="openCourseCategories()" lines="none">
+    <ion-item button class="ion-text-wrap" (click)="openCourseCategories()">
         <ion-icon name="fas-folder" slot="start" aria-hidden="true"></ion-icon>
         <ion-label>
             <h2>{{ 'core.courses.categories' | translate}}</h2>
@@ -78,7 +78,7 @@
 </ng-template>
 
 <ng-template #enrolledCourseList>
-    <ion-item button class="ion-text-wrap" (click)="openMyCourses()" lines="none">
+    <ion-item button class="ion-text-wrap" (click)="openMyCourses()">
         <ion-icon name="fas-graduation-cap" fixed-width slot="start" aria-hidden="true">
         </ion-icon>
         <ion-label>
@@ -88,7 +88,7 @@
 </ng-template>
 
 <ng-template #courseSearch>
-    <ion-item button class="ion-text-wrap" (click)="openSearch()" lines="none">
+    <ion-item button class="ion-text-wrap" (click)="openSearch()">
         <ion-icon name="fas-search" slot="start" aria-hidden="true"></ion-icon>
         <ion-label>
             <h2>{{ 'core.courses.searchcourses' | translate}}</h2>
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 9c15df238..1ca9402af 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -1049,6 +1049,20 @@ audio.core-media-adapt-width {
     width: 100%;
 }
 
+ion-item {
+    --inner-border-width: 0px;
+}
+
+ion-item.item-lines-full {
+    --inner-border-width: 0px;
+    --border-width: 0 0 1px 0;
+}
+
+ion-item.item-lines-inset {
+    --inner-border-width: 1px;
+    --border-width: 0px;
+}
+
 // Fake item.
 div.fake-ion-item {
     position: relative;
@@ -1061,7 +1075,6 @@ div.fake-ion-item {
     text-decoration: none;
     overflow: hidden;
     box-sizing: border-box;
-
 }
 
 html.md div.fake-ion-item {

From 13de3b9776bbc8e866a6794e29b1048e5d950181 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 9 Feb 2022 22:29:40 +0100
Subject: [PATCH 0486/1008] MOBILE-3814 blocks: Use cards on blocks

---
 src/core/features/block/components/block/core-block.html | 4 ++--
 src/core/features/course/components/format/format.scss   | 4 ++++
 src/core/features/courses/pages/my/my.scss               | 8 ++++++++
 src/theme/theme.light.scss                               | 3 ++-
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/core/features/block/components/block/core-block.html b/src/core/features/block/components/block/core-block.html
index 1c1e3a215..4761a2dbc 100644
--- a/src/core/features/block/components/block/core-block.html
+++ b/src/core/features/block/components/block/core-block.html
@@ -1,4 +1,4 @@
 <!-- Only render the block if it's supported. -->
-<div *ngIf="loaded && componentClass && block.visible" class="{{class}}">
+<ion-card *ngIf="loaded && componentClass && block.visible" class="{{class}}">
     <core-dynamic-component [component]="componentClass" [data]="data"></core-dynamic-component>
-</div>
+</ion-card>
diff --git a/src/core/features/course/components/format/format.scss b/src/core/features/course/components/format/format.scss
index 8167ba66a..e7701472e 100644
--- a/src/core/features/course/components/format/format.scss
+++ b/src/core/features/course/components/format/format.scss
@@ -1,3 +1,7 @@
+:host {
+    --item-divider-font-size: var(--item-divider-font-size-big);
+}
+
 .core-course-section-nav-buttons {
     display: flex;
     justify-content: space-between;
diff --git a/src/core/features/courses/pages/my/my.scss b/src/core/features/courses/pages/my/my.scss
index 7c90901e1..e7b36a51b 100644
--- a/src/core/features/courses/pages/my/my.scss
+++ b/src/core/features/courses/pages/my/my.scss
@@ -1,5 +1,9 @@
 @import "~theme/globals";
 
+:host {
+    --item-divider-font-size: var(--item-divider-font-size-big);
+}
+
 :host ::ng-deep ion-item-divider {
     display: none !important;
 }
@@ -11,6 +15,10 @@
     --internal-loading-inline-min-height: calc(100vh - var(--core-header-toolbar-height) - var(--bottom-tabs-size) - 2px);
 }
 
+core-block ::ng-deep ion-card.addon-block-myoverview {
+    --border-width: 0;
+}
+
 @if ($core-dashboard-logo) {
     .in-toolbar h1 .core-header-logo {
         max-height: calc(var(--core-header-toolbar-height) - 24px);
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 2697f08fd..88cdbce8f 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -225,7 +225,8 @@
     --item-divider-background: var(--ion-item-background);
     --item-divider-color: var(--text-color);
     --item-divider-border-width: 0px;
-    --item-divider-font-size: 20px;
+    --item-divider-font-size: 16px;
+    --item-divider-font-size-big: 20px;
     ion-item-divider, ion-item.divider {
         --background: var(--item-divider-background);
         --color: var(--item-divider-color);

From 4b075f0e6d5f86d1aabc11ac523174322630e09f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 10 Feb 2022 11:03:54 +0100
Subject: [PATCH 0487/1008] MOBILE-3814 style: Remove drop shadows and add
 borders

---
 src/core/components/tabs/tabs.scss                    |  4 +---
 .../components/module-info/course-module-info.scss    |  1 -
 .../module-navigation/module-navigation.scss          |  2 +-
 .../components/user-menu-button/user-menu-button.scss |  7 +------
 .../components/user-menu-button/user-menu-button.ts   |  2 +-
 src/core/features/mainmenu/pages/menu/menu.scss       |  2 --
 src/theme/theme.light.scss                            | 11 ++++++-----
 7 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/src/core/components/tabs/tabs.scss b/src/core/components/tabs/tabs.scss
index ff1c17bfe..4b1ec3b9b 100644
--- a/src/core/components/tabs/tabs.scss
+++ b/src/core/components/tabs/tabs.scss
@@ -20,9 +20,7 @@
         @include safe-area-padding-end(null, 0px);
         height: var(--height);
         color: var(--tabs-color);
-        -webkit-filter: drop-shadow(0px 3px 3px rgba(var(--drop-shadow)));
-        filter: drop-shadow(0px 3px 3px rgba(var(--drop-shadow)));
-        border: 0;
+        border-bottom: 1px solid var(--stroke);
         display: flex;
         align-items: flex-end;
 
diff --git a/src/core/features/course/components/module-info/course-module-info.scss b/src/core/features/course/components/module-info/course-module-info.scss
index f540001d2..4ded49790 100644
--- a/src/core/features/course/components/module-info/course-module-info.scss
+++ b/src/core/features/course/components/module-info/course-module-info.scss
@@ -2,7 +2,6 @@
 
 :host {
     display: block;
-    box-shadow: 0px 3px 3px rgba(var(--drop-shadow));
     margin-bottom: 8px;
     padding-bottom: 1px; // To allow margins inside.
     background-color: var(--contrast-background);
diff --git a/src/core/features/course/components/module-navigation/module-navigation.scss b/src/core/features/course/components/module-navigation/module-navigation.scss
index 4dfc9e0ea..823c18328 100644
--- a/src/core/features/course/components/module-navigation/module-navigation.scss
+++ b/src/core/features/course/components/module-navigation/module-navigation.scss
@@ -11,7 +11,7 @@
     display: block;
     bottom: 0;
     z-index: 3;
-    box-shadow: 0px -3px 3px rgba(var(--drop-shadow));
+    border-top: 1px solid var(--stroke);
 
     @include core-transition(all, 200ms);
 
diff --git a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.scss b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.scss
index 85bb76e70..d9faceaac 100644
--- a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.scss
+++ b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.scss
@@ -6,12 +6,7 @@ core-user-avatar {
     display: none;
 }
 
-:host-context(ion-toolbar) core-user-avatar ::ng-deep img {
-    padding: 2px !important;
-    border: 1px solid var(--color);
-}
-
+:host-context(ion-toolbar) core-user-avatar ::ng-deep img,
 :host-context(ion-tab-bar) core-user-avatar ::ng-deep img {
     padding: 2px !important;
-    border: 1px solid var(--color);
 }
diff --git a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts
index a27782b73..ce23461e3 100644
--- a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts
+++ b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts
@@ -58,7 +58,7 @@ export class CoreMainMenuUserButtonComponent implements OnInit {
 
         CoreDomUtils.openSideModal<void>({
             component: CoreMainMenuUserMenuComponent,
-            cssClass: 'core-modal-lateral-sm',
+            cssClass: 'core-modal-lateral',
         });
     }
 
diff --git a/src/core/features/mainmenu/pages/menu/menu.scss b/src/core/features/mainmenu/pages/menu/menu.scss
index b0302fbde..e6e0b7fea 100644
--- a/src/core/features/mainmenu/pages/menu/menu.scss
+++ b/src/core/features/mainmenu/pages/menu/menu.scss
@@ -5,7 +5,6 @@
 
     ion-tab-bar {
         height: var(--menutabbar-size);
-        box-shadow: 0px -3px 3px rgba(var(--drop-shadow));
     }
 
     @if ($core-always-show-main-menu) {
@@ -83,7 +82,6 @@
             height: calc(100% - var(--ion-safe-area-top) - var(--ion-safe-area-bottom));
             flex-direction: column;
             @include border-end(var(--border));
-            box-shadow: 3px 0 3px rgba(var(--drop-shadow));
             border-top: 0;
             justify-content: flex-start;
 
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 88cdbce8f..d811e2466 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -121,8 +121,8 @@
 
     --core-header-toolbar-button-image-size: var(--a11y-min-target-size);
     --core-header-toolbar-background: var(--white);
-    --core-header-toolbar-border-width: 3px;
-    --core-header-toolbar-border-color: var(--brand);
+    --core-header-toolbar-border-width: 1px;
+    --core-header-toolbar-border-color: var(--stroke);
     --core-header-toolbar-color: var(--gray-900);
     --core-header-toolbar-height: 56px;
     html.ios {
@@ -146,6 +146,10 @@
         }
     }
 
+    ion-header::after {
+        display: none;
+    }
+
     ion-header.header-ios ion-toolbar:last-of-type {
         --border-width: 0 0 var(--core-header-toolbar-border-width) 0;
     }
@@ -301,9 +305,6 @@
 
     --drop-shadow: 0, 0, 0, 0.18;
 
-    --core-menu-box-shadow-end: -4px 0px 16px rgba(var(--drop-shadow));
-    --core-menu-box-shadow-start: 4px 0px 16px rgba(var(--drop-shadow));
-
     --core-question-correct-color: var(--success-shade);
     --core-question-correct-color-bg: var(--success-tint);
     --core-question-incorrect-color: var(--danger);

From 98fe7224b913c627d29801dfbe40c90eba2911cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 10 Feb 2022 11:42:44 +0100
Subject: [PATCH 0488/1008] MOBILE-3814 styles: Adapt width to home pages

---
 .../myoverview/addon-block-myoverview.html    |  3 +-
 .../components/format/core-course-format.html |  2 +-
 .../course/components/format/format.scss      |  4 -
 .../course/components/module/module.scss      |  2 +-
 .../course-list-item/course-list-item.scss    |  2 +
 .../courses/pages/categories/categories.html  | 87 ++++++++++---------
 .../courses/pages/dashboard/dashboard.html    |  2 +-
 .../courses/pages/dashboard/dashboard.scss    |  0
 .../courses/pages/dashboard/dashboard.ts      |  1 -
 .../features/courses/pages/list/list.html     |  6 +-
 src/core/features/courses/pages/my/my.html    |  2 +-
 src/core/features/courses/pages/my/my.scss    |  4 -
 src/theme/theme.base.scss                     | 23 ++---
 src/theme/theme.light.scss                    |  3 +-
 14 files changed, 68 insertions(+), 73 deletions(-)
 delete mode 100644 src/core/features/courses/pages/dashboard/dashboard.scss

diff --git a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
index dbdf6d578..92eb69a34 100644
--- a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
+++ b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
@@ -73,7 +73,8 @@
 
     <!-- List of courses. -->
     <div class="safe-area-padding" *ngIf="hasCourses">
-        <ion-grid class="ion-no-padding" [class.core-no-grid]="layouts.selected != 'card'">
+        <ion-grid class="ion-no-padding" [class.core-no-grid]="layouts.selected != 'card'"
+            [class.list-item-limited-width]="layouts.selected != 'card'">
             <ion-row class="ion-no-padding">
                 <ion-col *ngFor="let course of filteredCourses" class="ion-no-padding" size="12" size-sm="6" size-md="6" size-lg="4"
                     size-xl="3">
diff --git a/src/core/features/course/components/format/core-course-format.html b/src/core/features/course/components/format/core-course-format.html
index 1c06ea6c0..92471c075 100644
--- a/src/core/features/course/components/format/core-course-format.html
+++ b/src/core/features/course/components/format/core-course-format.html
@@ -69,7 +69,7 @@
         class="core-course-module-list-wrapper" [id]="section.id">
         <ion-item-divider class="course-section ion-text-wrap" [class.item-dimmed]="section.visible === 0 || section.uservisible === false">
             <ion-label>
-                <h2 *ngIf="section.name">
+                <h2 *ngIf="section.name" class="big">
                     <core-format-text [text]="section.name" contextLevel="course" [contextInstanceId]="course.id">
                     </core-format-text>
                 </h2>
diff --git a/src/core/features/course/components/format/format.scss b/src/core/features/course/components/format/format.scss
index e7701472e..8167ba66a 100644
--- a/src/core/features/course/components/format/format.scss
+++ b/src/core/features/course/components/format/format.scss
@@ -1,7 +1,3 @@
-:host {
-    --item-divider-font-size: var(--item-divider-font-size-big);
-}
-
 .core-course-section-nav-buttons {
     display: flex;
     justify-content: space-between;
diff --git a/src/core/features/course/components/module/module.scss b/src/core/features/course/components/module/module.scss
index cce3cd2aa..dc01fae72 100644
--- a/src/core/features/course/components/module/module.scss
+++ b/src/core/features/course/components/module/module.scss
@@ -1,7 +1,7 @@
 @import "~theme/globals";
 
 :host {
-    --horizontal-margin: 12px;
+    --horizontal-margin: 10px;
 
     ion-card {
         margin-left: var(--horizontal-margin);
diff --git a/src/core/features/courses/components/course-list-item/course-list-item.scss b/src/core/features/courses/components/course-list-item/course-list-item.scss
index cabfd5a53..24345e414 100644
--- a/src/core/features/courses/components/course-list-item/course-list-item.scss
+++ b/src/core/features/courses/components/course-list-item/course-list-item.scss
@@ -101,6 +101,8 @@ ion-chip {
 
 // List layout.
 ion-card.core-course-list-item {
+    max-width: var(--list-item--max-width);
+
     ion-icon.course-icon {
         padding: 12px;
         font-size: calc(var(--avatar-size) - 24px);
diff --git a/src/core/features/courses/pages/categories/categories.html b/src/core/features/courses/pages/categories/categories.html
index e087575a3..e7c8280b4 100644
--- a/src/core/features/courses/pages/categories/categories.html
+++ b/src/core/features/courses/pages/categories/categories.html
@@ -25,53 +25,56 @@
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
     <core-loading [hideUntil]="categoriesLoaded">
-        <ion-item *ngIf="currentCategory" class="ion-text-wrap">
-            <ion-icon name="fas-folder" slot="start" [attr.aria-label]="'core.category' | translate"></ion-icon>
-            <ion-label>
-                <p class="item-heading">
-                    <core-format-text [text]="currentCategory.name" contextLevel="coursecat" [contextInstanceId]="currentCategory.id">
-                    </core-format-text>
-                </p>
-                <p *ngIf="currentCategory.description">
-                    <core-format-text [text]="currentCategory.description" [maxHeight]="120" contextLevel="coursecat"
-                        [contextInstanceId]="currentCategory.id"></core-format-text>
-                </p>
-            </ion-label>
-        </ion-item>
-
-        <ng-container *ngIf="categories.length > 0">
-            <ion-item-divider>
+        <ion-list class="list-item-limited-width">
+            <ion-item *ngIf="currentCategory" class="ion-text-wrap">
+                <ion-icon name="fas-folder" slot="start" [attr.aria-label]="'core.category' | translate"></ion-icon>
                 <ion-label>
-                    <h2>{{ 'core.courses.categories' | translate }}</h2>
+                    <p class="item-heading">
+                        <core-format-text [text]="currentCategory.name" contextLevel="coursecat" [contextInstanceId]="currentCategory.id">
+                        </core-format-text>
+                    </p>
+                    <p *ngIf="currentCategory.description">
+                        <core-format-text [text]="currentCategory.description" [maxHeight]="120" contextLevel="coursecat"
+                            [contextInstanceId]="currentCategory.id"></core-format-text>
+                    </p>
                 </ion-label>
-            </ion-item-divider>
-            <section *ngFor="let category of categories">
-                <ion-item button class="ion-text-wrap" (click)="openCategory(category.id)" [attr.aria-label]="category.name" detail="true">
-                    <ion-icon name="fas-folder" slot="start" [attr.aria-label]="'core.category' | translate"></ion-icon>
+            </ion-item>
+
+            <ng-container *ngIf="categories.length > 0">
+                <ion-item-divider>
                     <ion-label>
-                        <h2>
-                            <core-format-text [text]="category.name" contextLevel="coursecat" [contextInstanceId]="category.id">
-                            </core-format-text>
-                        </h2>
+                        <h2 class="big">{{ 'core.courses.categories' | translate }}</h2>
                     </ion-label>
-                    <ion-badge slot="end" *ngIf="!showOnlyEnrolled && category.coursecount > 0" color="light">
-                        <span aria-hidden="true">{{ category.coursecount }}</span>
-                        <span class="sr-only">{{ 'core.courses.therearecourses' | translate:{ $a: category.coursecount } }}</span>
-                    </ion-badge>
-                </ion-item>
-            </section>
-        </ng-container>
+                </ion-item-divider>
+                <ion-card *ngFor="let category of categories">
+                    <ion-item button class="ion-text-wrap" (click)="openCategory(category.id)" [attr.aria-label]="category.name"
+                        detail="true">
+                        <ion-icon name="fas-folder" slot="start" [attr.aria-label]="'core.category' | translate"></ion-icon>
+                        <ion-label>
+                            <h2>
+                                <core-format-text [text]="category.name" contextLevel="coursecat" [contextInstanceId]="category.id">
+                                </core-format-text>
+                            </h2>
+                        </ion-label>
+                        <ion-badge slot="end" *ngIf="!showOnlyEnrolled && category.coursecount > 0" color="light">
+                            <span aria-hidden="true">{{ category.coursecount }}</span>
+                            <span class="sr-only">{{ 'core.courses.therearecourses' | translate:{ $a: category.coursecount } }}</span>
+                        </ion-badge>
+                    </ion-item>
+                </ion-card>
+            </ng-container>
 
-        <ng-container *ngIf="courses.length > 0">
-            <ion-item-divider>
-                <ion-label>
-                    <h2 *ngIf="!showOnlyEnrolled">{{ 'core.courses.courses' | translate }}</h2>
-                    <h2 *ngIf="showOnlyEnrolled">{{ 'core.courses.mycourses' | translate }}</h2>
-                </ion-label>
-            </ion-item-divider>
-            <core-courses-course-list-item *ngFor="let course of courses" [course]="course" [showDownload]="downloadEnabled">
-            </core-courses-course-list-item>
-        </ng-container>
+            <ng-container *ngIf="courses.length > 0">
+                <ion-item-divider>
+                    <ion-label>
+                        <h2 *ngIf="!showOnlyEnrolled" class="big">{{ 'core.courses.courses' | translate }}</h2>
+                        <h2 *ngIf="showOnlyEnrolled" class="big">{{ 'core.courses.mycourses' | translate }}</h2>
+                    </ion-label>
+                </ion-item-divider>
+                <core-courses-course-list-item *ngFor="let course of courses" [course]="course" [showDownload]="downloadEnabled">
+                </core-courses-course-list-item>
+            </ng-container>
+        </ion-list>
         <core-empty-box *ngIf="!categories.length && !courses.length" icon="fas-graduation-cap"
             [message]="'core.courses.nocoursesyet' | translate">
         </core-empty-box>
diff --git a/src/core/features/courses/pages/dashboard/dashboard.html b/src/core/features/courses/pages/dashboard/dashboard.html
index e73f8a108..1e9771413 100644
--- a/src/core/features/courses/pages/dashboard/dashboard.html
+++ b/src/core/features/courses/pages/dashboard/dashboard.html
@@ -9,7 +9,7 @@
     </ion-refresher>
 
     <core-loading [hideUntil]="loaded">
-        <ion-list>
+        <ion-list class="list-item-limited-width">
             <ng-container *ngFor="let block of blocks">
                 <core-block *ngIf="block.visible" [block]="block" contextLevel="user" [instanceId]="userId"></core-block>
             </ng-container>
diff --git a/src/core/features/courses/pages/dashboard/dashboard.scss b/src/core/features/courses/pages/dashboard/dashboard.scss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/core/features/courses/pages/dashboard/dashboard.ts b/src/core/features/courses/pages/dashboard/dashboard.ts
index 24046259f..53234e327 100644
--- a/src/core/features/courses/pages/dashboard/dashboard.ts
+++ b/src/core/features/courses/pages/dashboard/dashboard.ts
@@ -31,7 +31,6 @@ import { CoreBlockDelegate } from '@features/block/services/block-delegate';
 @Component({
     selector: 'page-core-courses-dashboard',
     templateUrl: 'dashboard.html',
-    styleUrls: ['dashboard.scss'],
 })
 export class CoreCoursesDashboardPage implements OnInit, OnDestroy {
 
diff --git a/src/core/features/courses/pages/list/list.html b/src/core/features/courses/pages/list/list.html
index a75e9d3b0..8c138c32e 100644
--- a/src/core/features/courses/pages/list/list.html
+++ b/src/core/features/courses/pages/list/list.html
@@ -37,8 +37,10 @@
             </ion-item-divider>
         </ng-container>
 
-        <core-courses-course-list-item *ngFor="let course of courses" [course]="course" [showDownload]="downloadEnabled">
-        </core-courses-course-list-item>
+        <ion-list class="list-item-limited-width">
+            <core-courses-course-list-item *ngFor="let course of courses" [course]="course" [showDownload]="downloadEnabled">
+            </core-courses-course-list-item>
+        </ion-list>
 
         <core-infinite-loading [enabled]="canLoadMore" (action)="loadMoreCourses($event)" [error]="loadMoreError">
         </core-infinite-loading>
diff --git a/src/core/features/courses/pages/my/my.html b/src/core/features/courses/pages/my/my.html
index 9c2d2f6b2..65f89ff10 100644
--- a/src/core/features/courses/pages/my/my.html
+++ b/src/core/features/courses/pages/my/my.html
@@ -24,7 +24,7 @@
     <core-loading [hideUntil]="loaded">
         <ion-item class="ion-text-wrap divider">
             <ion-label>
-                <h2>{{ 'core.courses.mycourses' | translate }}</h2>
+                <h2 class="big">{{ 'core.courses.mycourses' | translate }}</h2>
             </ion-label>
             <div slot="end" class="flex-row">
                 <!-- Download all courses. -->
diff --git a/src/core/features/courses/pages/my/my.scss b/src/core/features/courses/pages/my/my.scss
index e7b36a51b..5586e1140 100644
--- a/src/core/features/courses/pages/my/my.scss
+++ b/src/core/features/courses/pages/my/my.scss
@@ -1,9 +1,5 @@
 @import "~theme/globals";
 
-:host {
-    --item-divider-font-size: var(--item-divider-font-size-big);
-}
-
 :host ::ng-deep ion-item-divider {
     display: none !important;
 }
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 1ca9402af..17af36413 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -743,19 +743,11 @@ ion-card {
 }
 
 ion-list.core-course-module-list-wrapper,
+.list-item-limited-width,
 .core-course-module-list-wrapper {
-    max-width: var(--module-list-width);
+    max-width: var(--list-item--max-width);
     margin-left: auto;
     margin-right: auto;
-
-    --padding-start: 12px;
-    --padding-end: 12px;
-    padding-left: var(--padding-start);
-    padding-right: var(--padding-end);
-
-    core-course-module {
-        --horizontal-margin: 0px;
-    }
 }
 
 ion-toolbar h1 img.core-bar-button-image,
@@ -1262,12 +1254,15 @@ ion-item.item.divider {
     border-bottom-width: var(--item-divider-border-width);
     --border-width: var(--item-divider-border-width);
     --inner-border-width: 0 0 var(--item-divider-border-width) 0;
-    font-size: var(--item-divider-font-size);
-    font-weight: medium;
 
-    h2, ion-label h2,
-    p.item-heading, ion-label p.item-heading {
+    ion-label h2,
+    ion-label p.item-heading {
         font-size: var(--item-divider-font-size);
+        font-weight: 500;
+        line-height: 1.5;
+    }
+    ion-label h2.big {
+        font-size: var(--item-divider-font-size-big);
     }
 }
 
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index d811e2466..691831088 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -71,7 +71,8 @@
 
     --module-icon-size: 24px;
     --module-icon-radius: var(--medium-radius);
-    --module-list-width: 768px;
+
+    --list-item--max-width: 768px;
 
     --ion-background-color: var(--background-color);
     --ion-background-color-rgb: #{$background-color-rgb};

From 9b4e15efebb4453cc5e2b050b5bfeb6ab52b5cdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 10 Feb 2022 11:43:06 +0100
Subject: [PATCH 0489/1008] MOBILE-3814 home: Add cards to improve site home
 styling

---
 .../features/sitehome/pages/index/index.html  | 58 +++++++++++--------
 .../features/sitehome/pages/index/index.scss  | 12 ++--
 src/theme/components/format-text.scss         |  2 +-
 3 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/src/core/features/sitehome/pages/index/index.html b/src/core/features/sitehome/pages/index/index.html
index 43e87b631..97f7ba85a 100644
--- a/src/core/features/sitehome/pages/index/index.html
+++ b/src/core/features/sitehome/pages/index/index.html
@@ -55,12 +55,14 @@
 </ion-content>
 
 <ng-template #allCourseList>
-    <ion-item button class="ion-text-wrap" (click)="openAvailableCourses()">
-        <ion-icon name="fas-graduation-cap" fixed-width slot="start" aria-hidden="true"></ion-icon>
-        <ion-label>
-            <h2>{{ 'core.courses.availablecourses' | translate}}</h2>
-        </ion-label>
-    </ion-item>
+    <ion-card>
+        <ion-item button class="ion-text-wrap" (click)="openAvailableCourses()">
+            <ion-icon name="fas-graduation-cap" fixed-width slot="start" aria-hidden="true"></ion-icon>
+            <ion-label>
+                <h2>{{ 'core.courses.availablecourses' | translate}}</h2>
+            </ion-label>
+        </ion-item>
+    </ion-card>
 </ng-template>
 
 <ng-template #news>
@@ -69,29 +71,35 @@
 </ng-template>
 
 <ng-template #categories>
-    <ion-item button class="ion-text-wrap" (click)="openCourseCategories()">
-        <ion-icon name="fas-folder" slot="start" aria-hidden="true"></ion-icon>
-        <ion-label>
-            <h2>{{ 'core.courses.categories' | translate}}</h2>
-        </ion-label>
-    </ion-item>
+    <ion-card>
+        <ion-item button class="ion-text-wrap" (click)="openCourseCategories()">
+            <ion-icon name="fas-folder" slot="start" aria-hidden="true"></ion-icon>
+            <ion-label>
+                <h2>{{ 'core.courses.categories' | translate}}</h2>
+            </ion-label>
+        </ion-item>
+    </ion-card>
 </ng-template>
 
 <ng-template #enrolledCourseList>
-    <ion-item button class="ion-text-wrap" (click)="openMyCourses()">
-        <ion-icon name="fas-graduation-cap" fixed-width slot="start" aria-hidden="true">
-        </ion-icon>
-        <ion-label>
-            <h2>{{ 'core.courses.mycourses' | translate}}</h2>
-        </ion-label>
-    </ion-item>
+    <ion-card>
+        <ion-item button class="ion-text-wrap" (click)="openMyCourses()">
+            <ion-icon name="fas-graduation-cap" fixed-width slot="start" aria-hidden="true">
+            </ion-icon>
+            <ion-label>
+                <h2>{{ 'core.courses.mycourses' | translate}}</h2>
+            </ion-label>
+        </ion-item>
+    </ion-card>
 </ng-template>
 
 <ng-template #courseSearch>
-    <ion-item button class="ion-text-wrap" (click)="openSearch()">
-        <ion-icon name="fas-search" slot="start" aria-hidden="true"></ion-icon>
-        <ion-label>
-            <h2>{{ 'core.courses.searchcourses' | translate}}</h2>
-        </ion-label>
-    </ion-item>
+    <ion-card>
+        <ion-item button class="ion-text-wrap" (click)="openSearch()">
+            <ion-icon name="fas-search" slot="start" aria-hidden="true"></ion-icon>
+            <ion-label>
+                <h2>{{ 'core.courses.searchcourses' | translate}}</h2>
+            </ion-label>
+        </ion-item>
+    </ion-card>
 </ng-template>
diff --git a/src/core/features/sitehome/pages/index/index.scss b/src/core/features/sitehome/pages/index/index.scss
index 6193c059a..25fb8be63 100644
--- a/src/core/features/sitehome/pages/index/index.scss
+++ b/src/core/features/sitehome/pages/index/index.scss
@@ -4,18 +4,16 @@ ion-item ion-icon {
     display: inline-block;
     border-radius: var(--module-icon-radius);
     padding: 0.7rem;
-    background-color: $gray-100;
+    background-color: var(--gray-100);
     line-height: var(--size);
     --margin-end: 1rem;
     @include margin-horizontal(null, var(--margin-end));
 }
 
-core-course-module.core-sitehome-news ::ng-deep ion-card {
-    --border-width: 0;
-    margin: 0;
-    padding: 0;
-}
-
 core-spacer ::ng-deep .item {
     border-radius: var(--medium-radius);
+    --horizontal-margin: 10px;
+    margin-left: var(--horizontal-margin);
+    margin-right: var(--horizontal-margin);
+    width: auto;
 }
diff --git a/src/theme/components/format-text.scss b/src/theme/components/format-text.scss
index a5fe5391d..1cfaad8c7 100644
--- a/src/theme/components/format-text.scss
+++ b/src/theme/components/format-text.scss
@@ -179,7 +179,7 @@ core-format-text {
         position: absolute;
         @include position(null, 10px, 10px, null);
         color: var(--ion-text-color);
-        border-radius: var(--small-radius);
+        border-radius: var(--huge-radius);
         background-color: var(--core-format-text-viewer-icon-background);
         display: flex;
 

From 15ef9547bad47ea6645fe81ff3222764cd332e5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 10 Feb 2022 12:21:52 +0100
Subject: [PATCH 0490/1008] MOBILE-3814 timeline: Adapt styles

---
 .../events/addon-block-timeline-events.html   |  7 ++++---
 .../timeline/components/events/events.scss    | 19 +++++++++++++------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/addons/block/timeline/components/events/addon-block-timeline-events.html b/src/addons/block/timeline/components/events/addon-block-timeline-events.html
index 9f6f7b0e2..68a2ac180 100644
--- a/src/addons/block/timeline/components/events/addon-block-timeline-events.html
+++ b/src/addons/block/timeline/components/events/addon-block-timeline-events.html
@@ -2,7 +2,8 @@
     <ion-label class="ion-text-wrap">
         <h3>
             <span class="sr-only">{{ 'core.courses.aria:coursename' | translate }}</span>
-            <core-format-text [text]="course.fullname" contextLevel="course" [contextInstanceId]="course.id"></core-format-text>
+            <core-format-text [text]="course.displayname || course.fullname" contextLevel="course" [contextInstanceId]="course.id">
+            </core-format-text>
         </h3>
     </ion-label>
 </ion-item>
@@ -20,7 +21,7 @@
                     <ion-col class="addon-block-timeline-activity-main ion-no-padding">
                         <ion-row class="ion-justify-content-between ion-align-items-center ion-nowrap ion-no-padding">
                             <ion-col class="addon-block-timeline-activity-time ion-no-padding">
-                                <ion-badge color="light">{{event.timesort * 1000 | coreFormatDate:"strftimetime24" }}</ion-badge>
+                                <small>{{event.timesort * 1000 | coreFormatDate:"strftimetime24" }}</small>
                                 <core-mod-icon *ngIf="event.iconUrl" [modicon]="event.iconUrl" [componentId]="event.instance"
                                     [modname]="event.modulename">
                                 </core-mod-icon>
@@ -52,7 +53,7 @@
                         </ion-row>
                     </ion-col>
                     <ion-col class="addon-block-timeline-activity-action ion-no-padding" *ngIf="event.action?.actionable">
-                        <ion-button fill="clear" (click)="action($event, event.action.url)" [title]="event.action.name">
+                        <ion-button fill="outline" color="medium" (click)="action($event, event.action.url)" [title]="event.action.name">
                             {{event.action.name}}
                             <ion-badge slot="end" class="ion-margin-start" *ngIf="event.action.showitemcount">
                                 {{event.action.itemcount}}
diff --git a/src/addons/block/timeline/components/events/events.scss b/src/addons/block/timeline/components/events/events.scss
index 48a4663f7..4de0930a9 100644
--- a/src/addons/block/timeline/components/events/events.scss
+++ b/src/addons/block/timeline/components/events/events.scss
@@ -13,13 +13,20 @@ h4.core-bold {
     font-weight: bold;
 }
 
-.addon-block-timeline-activity ion-badge {
-    @include margin-horizontal(0.25rem, 0.5rem);
-}
+.addon-block-timeline-activity {
+    ion-badge {
+        @include margin-horizontal(0.25rem, 0.5rem);
+    }
 
-.addon-block-timeline-activity core-mod-icon {
-    --margin-end: 0.5rem;
-    --margin-vertical: 0;
+    small {
+        @include margin-horizontal(null, 0.5rem);
+    }
+
+    core-mod-icon {
+        padding: 8px;
+        --margin-end: 0.5rem;
+        --margin-vertical: 0;
+    }
 }
 
 .addon-block-timeline-activity-time {

From 492278be00d3bae745cbc0a2729ff2f04428a9a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 10 Feb 2022 12:30:41 +0100
Subject: [PATCH 0491/1008] MOBILE-3814 course: Move course summary button to
 toolbar

---
 .../components/format/core-course-format.html |  2 +-
 .../course/components/format/format.scss      |  5 ++++
 .../course/pages/contents/contents.html       |  3 --
 .../course/pages/contents/contents.ts         | 10 -------
 .../features/course/pages/index/index.html    | 28 ++++++++-----------
 5 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/src/core/features/course/components/format/core-course-format.html b/src/core/features/course/components/format/core-course-format.html
index 92471c075..33837629f 100644
--- a/src/core/features/course/components/format/core-course-format.html
+++ b/src/core/features/course/components/format/core-course-format.html
@@ -2,7 +2,7 @@
 <core-navbar-buttons slot="end" *ngIf="loaded">
     <core-context-menu>
         <core-context-menu-item [hidden]="!displayCourseIndex || !sections || !sections.length" [priority]="500"
-            [content]="'core.course.courseindex' | translate" (action)="openCourseIndex()" iconAction="menu">
+            [content]="'core.course.courseindex' | translate" (action)="openCourseIndex()" iconAction="fas-list-ul">
         </core-context-menu-item>
     </core-context-menu>
 </core-navbar-buttons>
diff --git a/src/core/features/course/components/format/format.scss b/src/core/features/course/components/format/format.scss
index 8167ba66a..4567b6b78 100644
--- a/src/core/features/course/components/format/format.scss
+++ b/src/core/features/course/components/format/format.scss
@@ -10,3 +10,8 @@
         flex: 1;
     }
 }
+
+.course-section {
+    --padding-start: 12px;
+    --inner-padding-end: 12px;
+}
diff --git a/src/core/features/course/pages/contents/contents.html b/src/core/features/course/pages/contents/contents.html
index 88716c7ea..2648ff943 100644
--- a/src/core/features/course/pages/contents/contents.html
+++ b/src/core/features/course/pages/contents/contents.html
@@ -1,8 +1,5 @@
 <core-navbar-buttons slot="end">
     <core-context-menu>
-        <core-context-menu-item [priority]="1800" [content]="'core.course.coursesummary' | translate" (action)="openCourseSummary()"
-            iconAction="fas-info-circle">
-        </core-context-menu-item>
         <core-context-menu-item *ngFor="let item of courseMenuHandlers" [priority]="item.priority" (action)="openMenuItem(item)"
             [content]="item.data.title | translate" [iconAction]="item.data.icon" [class]="item.data.class">
         </core-context-menu-item>
diff --git a/src/core/features/course/pages/contents/contents.ts b/src/core/features/course/pages/contents/contents.ts
index 199599a4c..d93a3cb18 100644
--- a/src/core/features/course/pages/contents/contents.ts
+++ b/src/core/features/course/pages/contents/contents.ts
@@ -379,16 +379,6 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
         }
     }
 
-    /**
-     * Open the course summary
-     */
-    openCourseSummary(): void {
-        CoreNavigator.navigateToSitePath(
-            `/course/${this.course.id}/preview`,
-            { params: { course: this.course, avoidOpenCourse: true } },
-        );
-    }
-
     /**
      * Opens a menu item registered to the delegate.
      *
diff --git a/src/core/features/course/pages/index/index.html b/src/core/features/course/pages/index/index.html
index 8ca38de7f..0187dc8e4 100644
--- a/src/core/features/course/pages/index/index.html
+++ b/src/core/features/course/pages/index/index.html
@@ -9,29 +9,23 @@
             </h1>
         </ion-title>
 
-        <ion-buttons slot="end"></ion-buttons>
+        <ion-buttons slot="end">
+            <ion-button fill="clear" (click)="openCourseSummary()" [attr.aria-label]="'core.course.coursesummary' | translate">
+                <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
+            </ion-button>
+        </ion-buttons>
     </ion-toolbar>
 </ion-header>
-<ion-item lines="full" class="core-format-progress-list ion-text-wrap collapsible-title">
+<ion-item class="core-format-progress-list ion-text-wrap collapsible-title list-item-limited-width">
     <ion-avatar slot="start" class="core-course-thumb" *ngIf="imageThumb">
         <img [src]="imageThumb" core-external-content alt="" />
     </ion-avatar>
     <ion-label>
-        <ion-row>
-            <ion-col>
-                <p *ngIf="category">
-                    <core-format-text [text]="category" contextLevel="coursecat" [contextInstanceId]="course!.categoryid">
-                    </core-format-text>
-                </p>
-                <h1>{{ title }}</h1>
-            </ion-col>
-            <ion-col size="auto" class="ion-align-self-center">
-                <ion-button fill="clear" (click)="openCourseSummary()" [attr.aria-label]="'core.course.coursesummary' | translate"
-                    color="dark">
-                    <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
-                </ion-button>
-            </ion-col>
-        </ion-row>
+        <p *ngIf="category">
+            <core-format-text [text]="category" contextLevel="coursecat" [contextInstanceId]="course!.categoryid">
+            </core-format-text>
+        </p>
+        <h1>{{ title }}</h1>
         <div class="core-course-progress" *ngIf="progress !== undefined">
             <core-progress-bar [progress]="progress" a11yText="core.course.aria:sectionprogress">
             </core-progress-bar>

From f61a465c0a7ecbcfe678d2adca30f4716ea5b0fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 10 Feb 2022 10:50:51 +0100
Subject: [PATCH 0492/1008] MOBILE-3814 course: Adapt course styles

---
 .../components/course-index/course-index.html |  4 +-
 .../components/course-index/course-index.scss | 16 ++++-
 .../components/course-index/course-index.ts   | 12 ++--
 .../module-info/core-course-module-info.html  |  2 +-
 .../module-info/course-module-info.scss       | 10 ++-
 .../components/module/core-course-module.html | 67 ++++++++++---------
 .../course/components/module/module.scss      | 24 +++++--
 .../pages/module-preview/module-preview.html  | 55 +++++++--------
 .../module-preview/module-preview.page.ts     |  1 +
 .../pages/module-preview/module-preview.scss  | 15 +++++
 .../course-list-item/course-list-item.ts      |  2 +-
 src/core/features/courses/pages/my/my.scss    |  1 +
 .../features/sitehome/pages/index/index.scss  |  1 +
 src/theme/globals.variables.scss              |  2 +-
 src/theme/theme.base.scss                     |  4 +-
 src/theme/theme.dark.scss                     |  7 +-
 16 files changed, 135 insertions(+), 88 deletions(-)
 create mode 100644 src/core/features/course/pages/module-preview/module-preview.scss

diff --git a/src/core/features/course/components/course-index/course-index.html b/src/core/features/course/components/course-index/course-index.html
index a994ca87e..0d27a9a42 100644
--- a/src/core/features/course/components/course-index/course-index.html
+++ b/src/core/features/course/components/course-index/course-index.html
@@ -13,7 +13,7 @@
 <ion-content>
     <ion-list id="core-course-section-selector" role="listbox" aria-labelledby="core-course-section-selector-label">
         <ng-container *ngFor="let section of sectionsToRender">
-            <ion-item *ngIf="allSectionId == section.id" class="ion-text-wrap divider core-course-index-all"
+            <ion-item *ngIf="allSectionId == section.id" class="divider core-course-index-all"
                 (click)="selectSectionOrModule($event, section.id)" button [class.item-current]="selectedId === section.id" detail="false">
                 <ion-label>
                     <h2>
@@ -23,7 +23,7 @@
                 </ion-label>
             </ion-item>
             <ng-container *ngIf="allSectionId != section.id">
-                <ion-item class="ion-text-wrap divider section" (click)="selectSectionOrModule($event, section.id)" button
+                <ion-item class="divider section" (click)="selectSectionOrModule($event, section.id)" button
                     [class.item-current]="selectedId === section.id" [class.item-dimmed]="section.visible === 0" detail="false"
                     sticky="true">
                     <ion-icon *ngIf="section.hasVisibleModules" [name]="section.expanded ? 'fas-chevron-down' : 'fas-chevron-right'"
diff --git a/src/core/features/course/components/course-index/course-index.scss b/src/core/features/course/components/course-index/course-index.scss
index f9ee8c8ba..d4862dd4c 100644
--- a/src/core/features/course/components/course-index/course-index.scss
+++ b/src/core/features/course/components/course-index/course-index.scss
@@ -22,15 +22,25 @@ ion-item::part(native) {
 
 ion-icon {
     margin: 0;
-    @include padding(12px, 32px, 12px, 16px);
+    @include padding(12px, 16px, 12px, 16px);
 }
 
 ion-item.core-course-index-all::part(native) {
     --padding-start: 16px;
 }
 
-ion-item.item-current ion-icon.expandable-status-icon {
-    @include padding(null, null, null, 11px);
+ion-item.item.item-current {
+    --background: var(--primary);
+    --color: var(--primary-contrast);
+    border: 0;
+
+    ion-badge {
+        border: 1px solid var(--primary-contrast);
+    }
+
+    ::ng-deep ion-icon {
+        color: var(--primary-contrast);
+    }
 }
 
 ion-icon.restricted {
diff --git a/src/core/features/course/components/course-index/course-index.ts b/src/core/features/course/components/course-index/course-index.ts
index bbc2601c1..a36cee588 100644
--- a/src/core/features/course/components/course-index/course-index.ts
+++ b/src/core/features/course/components/course-index/course-index.ts
@@ -23,7 +23,6 @@ import { CoreCourseFormatDelegate } from '@features/course/services/format-deleg
 import { CoreCourseAnyCourseData } from '@features/courses/services/courses';
 import { IonContent } from '@ionic/angular';
 import { CoreDomUtils } from '@services/utils/dom';
-import { CoreUtils } from '@services/utils/utils';
 import { ModalController } from '@singletons';
 
 /**
@@ -62,12 +61,11 @@ export class CoreCourseCourseIndexComponent implements OnInit {
         }
 
         let completionEnabled = !!this.course.enablecompletion;
-        if (completionEnabled && 'courseformatoptions' in this.course && this.course.courseformatoptions) {
-            const formatOptions = CoreUtils.objectToKeyValueMap(this.course.courseformatoptions, 'name', 'value');
-
-            if (formatOptions) {
-                completionEnabled = !!formatOptions.completionusertracked;
-            }
+        if (completionEnabled && 'completionusertracked' in this.course && this.course.completionusertracked !== undefined) {
+            completionEnabled = this.course.completionusertracked;
+        }
+        if (completionEnabled && 'showcompletionconditions' in this.course && this.course.showcompletionconditions !== undefined) {
+            completionEnabled = this.course.showcompletionconditions;
         }
 
         const currentSection = await CoreCourseFormatDelegate.getCurrentSection(this.course, this.sections);
diff --git a/src/core/features/course/components/module-info/core-course-module-info.html b/src/core/features/course/components/module-info/core-course-module-info.html
index 8ea74f89a..256f2c789 100644
--- a/src/core/features/course/components/module-info/core-course-module-info.html
+++ b/src/core/features/course/components/module-info/core-course-module-info.html
@@ -20,7 +20,7 @@
 </ion-item>
 <ng-content select="[description]"></ng-content>
 
-<ion-item class="ion-text-wrap core-module-dates" *ngIf="showCompletion && (module.dates?.length ||
+<ion-item class="ion-text-wrap" *ngIf="showCompletion && (module.dates?.length ||
 (module.completiondata && module.completiondata.isautomatic && module.uservisible))">
     <ion-label>
         <!-- Activity dates. -->
diff --git a/src/core/features/course/components/module-info/course-module-info.scss b/src/core/features/course/components/module-info/course-module-info.scss
index 4ded49790..98f6c87d4 100644
--- a/src/core/features/course/components/module-info/course-module-info.scss
+++ b/src/core/features/course/components/module-info/course-module-info.scss
@@ -16,8 +16,14 @@
         align-self: flex-start;
     }
 
-    .core-module-dates ion-icon {
-        @include margin-horizontal(null, 8px);
+    .core-module-dates {
+        background: var(--light);
+        border-radius: var(--small-radius);
+        padding: 8px;
+
+        ion-icon {
+            @include margin-horizontal(null, 8px);
+        }
     }
 
 }
diff --git a/src/core/features/course/components/module/core-course-module.html b/src/core/features/course/components/module/core-course-module.html
index fff96491f..e20fbae5c 100644
--- a/src/core/features/course/components/module/core-course-module.html
+++ b/src/core/features/course/components/module/core-course-module.html
@@ -3,7 +3,6 @@
         <ion-item id="core-course-module-{{module.id}}" detail="false"
             class="ion-text-wrap core-course-module-handler core-module-main-item {{module.handlerData.class}}"
             (click)="moduleClicked($event)" [attr.aria-label]="module.handlerData.a11yTitle" [ngClass]="{
-                'has-module-info': hasInfo,
                 'item-media': module.handlerData.icon,
                 'item-dimmed': module.visible === 0 || module.uservisible === false
             }" [button]="module.handlerData.action && module.uservisible">
@@ -19,24 +18,26 @@
                     </core-format-text>
                 </p>
 
-                <!-- Basic module completion. -->
-                <core-course-module-completion *ngIf="module.completiondata && module.uservisible" [completion]="module.completiondata"
-                    [moduleName]="module.name" [moduleId]="module.id" [showCompletionConditions]="showCompletionConditions"
-                    [showManualCompletion]="showManualCompletion" (completionChanged)="completionChanged.emit($event)" mode="basic">
-                </core-course-module-completion>
+                <div class="core-module-additional-info">
+                    <!-- Basic module completion. -->
+                    <core-course-module-completion *ngIf="module.completiondata && module.uservisible" [completion]="module.completiondata"
+                        [moduleName]="module.name" [moduleId]="module.id" [showCompletionConditions]="showCompletionConditions"
+                        [showManualCompletion]="showManualCompletion" (completionChanged)="completionChanged.emit($event)" mode="basic">
+                    </core-course-module-completion>
 
-                <ion-chip *ngIf="module.handlerData.extraBadge" [color]="module.handlerData.extraBadgeColor"
-                    class="ion-text-wrap ion-text-start" [outline]="true">
-                    <ion-label><span [innerHTML]="module.handlerData.extraBadge"></span></ion-label>
-                </ion-chip>
+                    <ion-chip *ngIf="module.handlerData.extraBadge" [color]="module.handlerData.extraBadgeColor"
+                        class="ion-text-wrap ion-text-start" [outline]="true">
+                        <ion-label><span [innerHTML]="module.handlerData.extraBadge"></span></ion-label>
+                    </ion-chip>
 
-                <!-- Hidden badges -->
-                <ion-badge color="warning" *ngIf="module.visible === 0 && (!section || section.visible)">
-                    {{ 'core.course.hiddenfromstudents' | translate }}
-                </ion-badge>
-                <ion-badge color="warning" *ngIf="module.visible !== 0 && module.isStealth">
-                    {{ 'core.course.hiddenoncoursepage' | translate }}
-                </ion-badge>
+                    <!-- Hidden badges -->
+                    <ion-badge color="warning" *ngIf="module.visible === 0 && (!section || section.visible)">
+                        {{ 'core.course.hiddenfromstudents' | translate }}
+                    </ion-badge>
+                    <ion-badge color="warning" *ngIf="module.visible !== 0 && module.isStealth">
+                        {{ 'core.course.hiddenoncoursepage' | translate }}
+                    </ion-badge>
+                </div>
             </ion-label>
             <!-- Buttons. -->
             <div slot="end" *ngIf="module.uservisible !== false" class="buttons core-module-buttons"
@@ -72,24 +73,24 @@
                     [moduleName]="module.name" [moduleId]="module.id" [showCompletionConditions]="showCompletionConditions">
                 </core-course-module-completion>
 
-                <!-- Activity dates. -->
-                <div *ngIf="showActivityDates && module.dates && module.dates.length" class="core-module-dates">
-                    <p *ngFor="let date of module.dates">
-                        <ion-icon name="fas-calendar" aria-hidden="true"></ion-icon><strong>{{ date.label }}</strong> {{ date.timestamp *
-                        1000 | coreFormatDate:'strftimedatetime' }}
-                    </p>
-                </div>
+                <div class="core-module-dates-availabilityinfo"
+                    *ngIf="(showActivityDates && module.dates && module.dates.length) || module.availabilityinfo">
+                    <!-- Activity dates. -->
+                    <div *ngIf="showActivityDates && module.dates && module.dates.length" class="core-module-dates">
+                        <p *ngFor="let date of module.dates">
+                            <ion-icon name="fas-calendar" aria-hidden="true"></ion-icon><strong>{{ date.label }}</strong> {{ date.timestamp
+                            *
+                            1000 | coreFormatDate:'strftimedatetime' }}
+                        </p>
+                    </div>
 
-                <!-- Availability info -->
-                <div *ngIf="module.availabilityinfo">
-                    <ion-chip class="core-module-availabilityinfo">
+                    <!-- Availability info -->
+                    <div *ngIf="module.availabilityinfo" class="core-module-availabilityinfo">
                         <ion-icon name="fas-lock" [attr.aria-label]="'core.restricted' | translate"></ion-icon>
-                        <ion-label>
-                            <core-format-text [text]="module.availabilityinfo" contextLevel="module" [contextInstanceId]="module.id"
-                                [courseId]="module.course">
-                            </core-format-text>
-                        </ion-label>
-                    </ion-chip>
+                        <core-format-text [text]="module.availabilityinfo" contextLevel="module" [contextInstanceId]="module.id"
+                            [courseId]="module.course">
+                        </core-format-text>
+                    </div>
                 </div>
 
             </ion-label>
diff --git a/src/core/features/course/components/module/module.scss b/src/core/features/course/components/module/module.scss
index dc01fae72..f398ee1fa 100644
--- a/src/core/features/course/components/module/module.scss
+++ b/src/core/features/course/components/module/module.scss
@@ -35,13 +35,29 @@
         .core-module-buttons core-course-module-completion {
             text-align: center;
         }
+
+        .core-module-additional-info {
+            display: flex;
+            align-items: center;
+        }
     }
 
     .core-course-module-info {
+        .core-module-dates-availabilityinfo {
+            background: var(--light);
+            border-radius: var(--small-radius);
+            padding: 8px;
+        }
+
+        .core-module-dates + .core-module-availabilityinfo {
+            border-top: 1px solid var(--stroke);
+            padding-top: 8px;
+        }
+
         .core-module-availabilityinfo {
             font-size: 90%;
-            ul {
-                margin-block-start: 0.5em;
+            ::ng-deep  ul {
+                margin-top: 0.5em;
             }
         }
     }
@@ -57,10 +73,6 @@
         margin-top: 0px;
     }
 
-    .core-module-main-item.has-module-info {
-        --inner-border-width: 0px;
-    }
-
     .core-module-availabilityinfo  ion-icon,
     .core-module-dates ion-icon {
         @include margin-horizontal(null, 8px);
diff --git a/src/core/features/course/pages/module-preview/module-preview.html b/src/core/features/course/pages/module-preview/module-preview.html
index f302e2299..3fceb9d64 100644
--- a/src/core/features/course/pages/module-preview/module-preview.html
+++ b/src/core/features/course/pages/module-preview/module-preview.html
@@ -27,38 +27,39 @@
         <core-course-module-info [module]="module" [courseId]="courseId" [description]="module.description" [component]="module.modname"
             [componentId]="module.id" [expandDescription]="true">
 
-            <div class="ion-padding" *ngIf="module.handlerData?.extraBadge">
-                <ion-chip *ngIf="module.handlerData?.extraBadge" [color]="module.handlerData?.extraBadgeColor"
-                    class="ion-text-wrap ion-text-start" [outline]="true">
-                    <ion-label><span [innerHTML]="module.handlerData?.extraBadge"></span></ion-label>
-                </ion-chip>
-            </div>
+            <ion-item class="ion-text-wrap" *ngIf="module.handlerData?.extraBadge ||
+                (module.visible === 0 && (!section || section.visible)) ||
+                    (module.visible !== 0 && module.isStealth) ||
+                    module.availabilityinfo">
+                <ion-label>
+                    <div class="ion-padding" *ngIf="module.handlerData?.extraBadge">
+                        <ion-chip *ngIf="module.handlerData?.extraBadge" [color]="module.handlerData?.extraBadgeColor"
+                            class="ion-text-wrap ion-text-start" [outline]="true">
+                            <ion-label><span [innerHTML]="module.handlerData?.extraBadge"></span></ion-label>
+                        </ion-chip>
+                    </div>
 
-            <!-- Hidden badges -->
-            <div *ngIf="module.visible === 0 && (!section || section.visible)">
-                <ion-chip color="warning">
-                    <ion-icon name="fas-eye-slash" aria-hidden="true"></ion-icon>
-                    <ion-label>{{ 'core.course.hiddenfromstudents' | translate }}</ion-label>
-                </ion-chip>
-            </div>
-            <div *ngIf="module.visible !== 0 && module.isStealth">
-                <ion-chip color="warning">
-                    <ion-icon name="fas-eye-slash" aria-hidden="true"></ion-icon>
-                    <ion-label>{{ 'core.course.hiddenoncoursepage' | translate }}</ion-label>
-                </ion-chip>
-            </div>
+                    <!-- Hidden badges -->
+                    <div *ngIf="module.visible === 0 && (!section || section.visible)">
+                        <ion-badge color="warning">
+                            {{ 'core.course.hiddenfromstudents' | translate }}
+                        </ion-badge>
+                    </div>
+                    <div *ngIf="module.visible !== 0 && module.isStealth">
+                        <ion-badge color="warning">
+                            {{ 'core.course.hiddenoncoursepage' | translate }}
+                        </ion-badge>
+                    </div>
 
-            <!-- Availability info -->
-            <div *ngIf="module.availabilityinfo">
-                <ion-chip class="core-module-availabilityinfo">
-                    <ion-icon name="fas-lock" [attr.aria-label]="'core.restricted' | translate"></ion-icon>
-                    <ion-label>
+                    <!-- Availability info -->
+                    <div *ngIf="module.availabilityinfo" class="core-module-availabilityinfo">
+                        <ion-icon name="fas-lock" [attr.aria-label]="'core.restricted' | translate"></ion-icon>
                         <core-format-text [text]="module.availabilityinfo" contextLevel="module" [contextInstanceId]="module.id"
                             [courseId]="module.course">
                         </core-format-text>
-                    </ion-label>
-                </ion-chip>
-            </div>
+                    </div>
+                </ion-label>
+            </ion-item>
 
             <core-course-unsupported-module *ngIf="unsupported" [module]="module" [courseId]="courseId"></core-course-unsupported-module>
         </core-course-module-info>
diff --git a/src/core/features/course/pages/module-preview/module-preview.page.ts b/src/core/features/course/pages/module-preview/module-preview.page.ts
index 620b1f981..258a1fe18 100644
--- a/src/core/features/course/pages/module-preview/module-preview.page.ts
+++ b/src/core/features/course/pages/module-preview/module-preview.page.ts
@@ -27,6 +27,7 @@ import { CoreUtils } from '@services/utils/utils';
 @Component({
     selector: 'page-core-course-module-preview',
     templateUrl: 'module-preview.html',
+    styleUrls: ['module-preview.scss'],
 })
 export class CoreCourseModulePreviewPage implements OnInit {
 
diff --git a/src/core/features/course/pages/module-preview/module-preview.scss b/src/core/features/course/pages/module-preview/module-preview.scss
new file mode 100644
index 000000000..21bd09377
--- /dev/null
+++ b/src/core/features/course/pages/module-preview/module-preview.scss
@@ -0,0 +1,15 @@
+@import "~theme/globals";
+
+.core-module-availabilityinfo {
+    background: var(--light);
+    border-radius: var(--small-radius);
+    padding: 8px;
+    font-size: 90%;
+    ::ng-deep  ul {
+        margin-top: 0.5em;
+    }
+
+    ion-icon {
+        @include margin-horizontal(null, 8px);
+    }
+}
diff --git a/src/core/features/courses/components/course-list-item/course-list-item.ts b/src/core/features/courses/components/course-list-item/course-list-item.ts
index 46a7defb0..73d73d61e 100644
--- a/src/core/features/courses/components/course-list-item/course-list-item.ts
+++ b/src/core/features/courses/components/course-list-item/course-list-item.ts
@@ -160,7 +160,7 @@ export class CoreCoursesCourseListItemComponent implements OnInit, OnDestroy, On
 
             const tint = CoreColors.lighter(this.course.color, 50);
             this.element.style.setProperty('--course-color-tint', tint);
-        } else {
+        } else if(this.course.colorNumber !== undefined) {
             this.element.classList.add('course-color-' + this.course.colorNumber);
         }
     }
diff --git a/src/core/features/courses/pages/my/my.scss b/src/core/features/courses/pages/my/my.scss
index 5586e1140..1f5841edc 100644
--- a/src/core/features/courses/pages/my/my.scss
+++ b/src/core/features/courses/pages/my/my.scss
@@ -13,6 +13,7 @@
 
 core-block ::ng-deep ion-card.addon-block-myoverview {
     --border-width: 0;
+    --background: transparent;
 }
 
 @if ($core-dashboard-logo) {
diff --git a/src/core/features/sitehome/pages/index/index.scss b/src/core/features/sitehome/pages/index/index.scss
index 25fb8be63..f77fee9ef 100644
--- a/src/core/features/sitehome/pages/index/index.scss
+++ b/src/core/features/sitehome/pages/index/index.scss
@@ -5,6 +5,7 @@ ion-item ion-icon {
     border-radius: var(--module-icon-radius);
     padding: 0.7rem;
     background-color: var(--gray-100);
+    color: var(--gray-900);
     line-height: var(--size);
     --margin-end: 1rem;
     @include margin-horizontal(null, var(--margin-end));
diff --git a/src/theme/globals.variables.scss b/src/theme/globals.variables.scss
index 6b19a3d73..21fe2d0dd 100644
--- a/src/theme/globals.variables.scss
+++ b/src/theme/globals.variables.scss
@@ -36,7 +36,7 @@ $background-color-dark-rgb: color-to-rgb-list($background-color-dark) !default;
 
 $ion-item-background:      $white !default;
 $ion-item-background-rgb:  color-to-rgb-list($ion-item-background) !default;
-$ion-item-background-dark: mix(#ffffff, #000000, 20%) !default; // #333333
+$ion-item-background-dark: $gray-900 !default;
 $ion-item-background-dark-rgb: color-to-rgb-list($ion-item-background-dark) !default;
 
 $primary:    $blue !default;
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 17af36413..24d609fcf 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -415,8 +415,9 @@ ion-alert {
 }
 
 // Ionic list.
-ion-list.list-md {
+ion-list {
     padding: 0;
+    --ion-item-background: transparent;
 }
 
 // Safe areas
@@ -1249,7 +1250,6 @@ ion-item.item-input ion-input.has-focus {
 ion-item-divider.item,
 ion-item.item.divider {
     --inner-padding-end: 8px;
-    background: var(--background);
     min-height: var(--min-height);
     border-bottom-width: var(--item-divider-border-width);
     --border-width: var(--item-divider-border-width);
diff --git a/src/theme/theme.dark.scss b/src/theme/theme.dark.scss
index 6e88cfc14..1d55e6631 100644
--- a/src/theme/theme.dark.scss
+++ b/src/theme/theme.dark.scss
@@ -76,12 +76,13 @@
     --core-progressbar-text-color: var(--gray-100);
 
     --ion-item-background: #{$ion-item-background-dark};
-    --ion-item-detail-icon-color: var(--white);
+    --item-divider-background: var(--ion-item-background);
     --item-divider-color: var(--text-color);
-    --spacer-background: var(--gray-100);
+    --spacer-background: var(--gray-700);
 
     --core-combobox-background: var(--ion-item-background);
-    --core-combobox-color: var(--white);
+    --core-combobox-color: var(--gray-100);
+    --core-combobox-border-color: var(--stroke);
 
     --core-login-background: var(--gray-900);
     --core-login-text-color: var(--white);

From abfc4ffb386127ed302f4d33a086307b57734764 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 10 Feb 2022 13:24:18 +0100
Subject: [PATCH 0493/1008] MOBILE-3814 styles: Animate expandable chevrons

---
 .../group-conversations.html                    | 17 ++++++-----------
 .../pages/new-discussion/new-discussion.html    |  6 ++----
 .../components/course-index/course-index.html   | 11 ++++++-----
 .../components/course-index/course-index.scss   |  4 ++--
 .../features/grades/pages/course/course.html    |  4 ++--
 .../features/grades/pages/course/course.scss    |  5 +++++
 src/theme/theme.base.scss                       | 12 +++++++++++-
 src/theme/theme.light.scss                      |  9 +++++----
 8 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/src/addons/messages/pages/group-conversations/group-conversations.html b/src/addons/messages/pages/group-conversations/group-conversations.html
index 6b476b60f..e6165166a 100644
--- a/src/addons/messages/pages/group-conversations/group-conversations.html
+++ b/src/addons/messages/pages/group-conversations/group-conversations.html
@@ -40,11 +40,9 @@
                     [attr.aria-label]="(favourites.expanded ? 'core.collapse' : 'core.expand') | translate"
                     [attr.aria-expanded]="favourites.expanded" aria-controls="addon-messages-groupconversations-favourite" role="heading"
                     detail="false">
-                    <ion-icon *ngIf="!favourites.expanded" name="fas-chevron-right" flip-rtl slot="start" aria-hidden="true"
-                        class="expandable-status-icon">
+                    <ion-icon name="fas-chevron-right" flip-rtl slot="start" aria-hidden="true" class="expandable-status-icon"
+                        [class.expandable-status-icon-expanded]="favourites.expanded">
                     </ion-icon>
-                    <ion-icon *ngIf="favourites.expanded" name="fas-chevron-down" slot="start" aria-hidden="true"
-                        class="expandable-status-icon"></ion-icon>
                     <ion-label>
                         <h2>{{ 'core.favourites' | translate }} ({{ favourites.count }})</h2>
                     </ion-label>
@@ -76,9 +74,8 @@
                 <ion-item button class="divider ion-text-wrap" (click)="toggle(group)" sticky="true"
                     [attr.aria-label]="(group.expanded ? 'core.collapse' : 'core.expand') | translate" [attr.aria-expanded]="group.expanded"
                     aria-controls="addon-messages-groupconversations-group" role="heading" detail="false">
-                    <ion-icon *ngIf="!group.expanded" name="fas-chevron-right" flip-rtl slot="start" aria-hidden="true"
-                        class="expandable-status-icon"></ion-icon>
-                    <ion-icon *ngIf="group.expanded" name="fas-chevron-down" slot="start" aria-hidden="true" class="expandable-status-icon">
+                    <ion-icon name="fas-chevron-right" flip-rtl slot="start" aria-hidden="true" class="expandable-status-icon"
+                        [class.expandable-status-icon-expanded]="group.expanded">
                     </ion-icon>
                     <ion-label>
                         <h2>{{ 'addon.messages.groupconversations' | translate }} ({{ group.count }})</h2>
@@ -111,11 +108,9 @@
                     [attr.aria-label]="(individual.expanded ? 'core.collapse' : 'core.expand') | translate"
                     [attr.aria-expanded]="individual.expanded" aria-controls="addon-messages-groupconversations-individual" role="heading"
                     detail="false">
-                    <ion-icon *ngIf="!individual.expanded" name="fas-chevron-right" flip-rtl slot="start" aria-hidden="true"
-                        class="expandable-status-icon">
+                    <ion-icon name="fas-chevron-right" flip-rtl slot="start" aria-hidden="true" class="expandable-status-icon"
+                        [class.expandable-status-icon-expanded]="individual.expanded">
                     </ion-icon>
-                    <ion-icon *ngIf="individual.expanded" name="fas-chevron-down" slot="start" aria-hidden="true"
-                        class="expandable-status-icon"></ion-icon>
                     <ion-label>
                         <h2>{{ 'addon.messages.individualconversations' | translate }} ({{ individual.count }})</h2>
                     </ion-label>
diff --git a/src/addons/mod/forum/pages/new-discussion/new-discussion.html b/src/addons/mod/forum/pages/new-discussion/new-discussion.html
index e8b2c7232..85ca66dcf 100644
--- a/src/addons/mod/forum/pages/new-discussion/new-discussion.html
+++ b/src/addons/mod/forum/pages/new-discussion/new-discussion.html
@@ -34,10 +34,8 @@
             <ion-item button class="divider ion-text-wrap" (click)="toggleAdvanced()" detail="false" [attr.aria-expanded]="advanced"
                 [attr.aria-label]="(advanced ? 'core.hideadvanced' : 'core.showadvanced') | translate" role="heading"
                 aria-controls="addon-mod-forum-new-discussion-advanced">
-                <ion-icon *ngIf="!advanced" name="fas-chevron-right" flip-rtl slot="start" aria-hidden="true"
-                    class="expandable-status-icon"></ion-icon>
-                <ion-icon *ngIf="advanced" name="fas-chevron-down" slot="start" aria-hidden="true" class="expandable-status-icon">
-                </ion-icon>
+                <ion-icon name="fas-chevron-right" flip-rtl slot="start" aria-hidden="true" class="expandable-status-icon"
+                    [class.expandable-status-icon-expanded]="advanced"></ion-icon>
                 <ion-label>
                     <h2>{{ 'addon.mod_forum.advanced' | translate }}</h2>
                 </ion-label>
diff --git a/src/core/features/course/components/course-index/course-index.html b/src/core/features/course/components/course-index/course-index.html
index 0d27a9a42..e70f1b6fb 100644
--- a/src/core/features/course/components/course-index/course-index.html
+++ b/src/core/features/course/components/course-index/course-index.html
@@ -26,10 +26,11 @@
                 <ion-item class="divider section" (click)="selectSectionOrModule($event, section.id)" button
                     [class.item-current]="selectedId === section.id" [class.item-dimmed]="section.visible === 0" detail="false"
                     sticky="true">
-                    <ion-icon *ngIf="section.hasVisibleModules" [name]="section.expanded ? 'fas-chevron-down' : 'fas-chevron-right'"
-                        flip-rtl slot="start" class="expandable-status-icon" (click)="toggleExpand($event, section)"
+                    <ion-icon *ngIf="section.hasVisibleModules" name="fas-chevron-right" flip-rtl slot="start"
+                        class="expandable-status-icon" (click)="toggleExpand($event, section)"
                         [attr.aria-label]="(section.expanded ? 'core.collapse' : 'core.expand') | translate"
-                        [attr.aria-expanded]="section.expanded" [attr.aria-controls]="'core-course-index-section-' + section.id">
+                        [attr.aria-expanded]="section.expanded" [attr.aria-controls]="'core-course-index-section-' + section.id"
+                        [class.expandable-status-icon-expanded]="section.expanded">
                     </ion-icon>
                     <ion-icon *ngIf="!section.hasVisibleModules" name="" slot="start" aria-hidden="true" class="expandable-status-icon">
                     </ion-icon>
@@ -45,8 +46,8 @@
                 </ion-item>
                 <ng-container *ngIf="section.expanded">
                     <ng-container *ngFor="let module of section.modules">
-                        <ion-item [class.item-dimmed]="!module.visible" (click)="selectSectionOrModule($event, section.id, module.id)"
-                            button>
+                        <ion-item class="module" [class.item-dimmed]="!module.visible"
+                            (click)="selectSectionOrModule($event, section.id, module.id)" button>
                             <ion-icon class="completioninfo completion_none" name="" *ngIf="module.completionStatus === undefined"
                                 slot="start" aria-hidden="true"></ion-icon>
                             <ion-icon class="completioninfo completion_incomplete" name="far-circle" *ngIf="module.completionStatus === 0"
diff --git a/src/core/features/course/components/course-index/course-index.scss b/src/core/features/course/components/course-index/course-index.scss
index d4862dd4c..169950d9d 100644
--- a/src/core/features/course/components/course-index/course-index.scss
+++ b/src/core/features/course/components/course-index/course-index.scss
@@ -16,11 +16,11 @@ ion-icon.completioninfo {
     width: 18px;
 }
 
-ion-item::part(native) {
+ion-item.module::part(native) {
     --padding-start: 0;
 }
 
-ion-icon {
+ion-item.module ion-icon {
     margin: 0;
     @include padding(12px, 16px, 12px, 16px);
 }
diff --git a/src/core/features/grades/pages/course/course.html b/src/core/features/grades/pages/course/course.html
index 053b16cd1..c484de9f0 100644
--- a/src/core/features/grades/pages/course/course.html
+++ b/src/core/features/grades/pages/course/course.html
@@ -36,8 +36,8 @@
                                 <td *ngIf="row.itemtype == 'category'" class="core-grades-table-category" [attr.rowspan]="row.rowspan">
                                 </td>
                                 <th class="core-grades-table-gradeitem ion-text-start" [attr.colspan]="row.colspan">
-                                    <ion-icon *ngIf="row.expandable && showSummary" aria-hidden="true" slot="start"
-                                        [name]="row.expanded ? 'fas-chevron-down' : 'fas-chevron-right'" class="expandable-status-icon">
+                                    <ion-icon *ngIf="row.expandable && showSummary" aria-hidden="true" slot="start" name="fas-chevron-right"
+                                        class="expandable-status-icon" [class.expandable-status-icon-expanded]="row.expanded">
                                     </ion-icon>
                                     <ion-icon *ngIf="row.icon" name="{{row.icon}}" slot="start" [attr.aria-label]="row.iconAlt">
                                     </ion-icon>
diff --git a/src/core/features/grades/pages/course/course.scss b/src/core/features/grades/pages/course/course.scss
index dec25329c..32bb2b00a 100644
--- a/src/core/features/grades/pages/course/course.scss
+++ b/src/core/features/grades/pages/course/course.scss
@@ -96,6 +96,11 @@
         .expandable-status-icon {
             font-size: 14px;
             @include margin-horizontal(0, 2px);
+            @include core-transition(transform, 200ms);
+
+            &.expandable-status-icon-expanded {
+                transform: var(--rotate-expandable);
+            }
         }
 
     }
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 24d609fcf..38dc3ccd9 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -416,7 +416,7 @@ ion-alert {
 
 // Ionic list.
 ion-list {
-    padding: 0;
+    padding: 0 !important;
     --ion-item-background: transparent;
 }
 
@@ -1264,6 +1264,16 @@ ion-item.item.divider {
     ion-label h2.big {
         font-size: var(--item-divider-font-size-big);
     }
+
+    .expandable-status-icon {
+        font-size: 18px;
+        @include core-transition(transform, 200ms);
+        @include margin-horizontal(null, 16px);
+
+        &.expandable-status-icon-expanded {
+            transform: var(--rotate-expandable);
+        }
+    }
 }
 
 // Change default outline.
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 691831088..9a0b55bc0 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -236,10 +236,6 @@
         --background: var(--item-divider-background);
         --color: var(--item-divider-color);
         --min-height: var(--item-divider-min-height);
-
-        .expandable-status-icon {
-            font-size: 18px;
-        }
     }
 
     --spacer-background: var(--light);
@@ -327,6 +323,11 @@
     --core-dd-question-radius: 10px;
     --core-dd-question-border: var(--medium);
 
+    --rotate-expandable: rotate(90deg);
+    &[dir=rtl] {
+        --rotate-expandable: rotate(-90deg);
+    }
+
     @for $i from 0 to length($core-course-image-background) {
         --core-course-color-#{$i}: #{nth($core-course-image-background, $i + 1)};
         --core-course-color-#{$i}-tint: #{get-color-tint(nth($core-course-image-background, $i + 1))};

From b4f67f7d6ee623fd10c415d757de44932d9265d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 10 Feb 2022 17:14:06 +0100
Subject: [PATCH 0494/1008] MOBILE-3814 site: Add cards to site list

---
 .../features/login/components/sites/sites.html   | 16 ++++++++--------
 .../features/login/components/sites/sites.ts     |  1 +
 src/core/features/login/pages/sites/sites.html   |  8 ++++----
 src/core/features/login/pages/sites/sites.ts     |  1 +
 src/core/features/login/sitelist.scss            | 10 ++++++++++
 5 files changed, 24 insertions(+), 12 deletions(-)
 create mode 100644 src/core/features/login/sitelist.scss

diff --git a/src/core/features/login/components/sites/sites.html b/src/core/features/login/components/sites/sites.html
index 66eea2e81..8ddf94c02 100644
--- a/src/core/features/login/components/sites/sites.html
+++ b/src/core/features/login/components/sites/sites.html
@@ -20,9 +20,9 @@
 </ion-header>
 <ion-content>
     <core-loading [hideUntil]="loaded">
-        <ion-list>
-            <ng-container *ngIf="accountsList.currentSite">
-                <ion-item-divider sticky="true">
+        <ion-list class="core-sitelist">
+            <ion-card *ngIf="accountsList.currentSite">
+                <ion-item-divider sticky="true" class="core-sitelist-sitename">
                     <ion-label>
                         <h2>
                             <core-format-text [text]="accountsList.currentSite.siteName" clean="true"
@@ -34,7 +34,7 @@
                     </ion-label>
                 </ion-item-divider>
 
-                <ion-item detail="false" class="item-current">
+                <ion-item detail="false">
                     <ion-avatar slot="start">
                         <img [src]="accountsList.currentSite.avatar" core-external-content [siteId]="accountsList.currentSite.id"
                             alt="{{ 'core.pictureof' | translate:{$a: accountsList.currentSite.fullName} }}"
@@ -47,10 +47,10 @@
                 </ion-item>
 
                 <ng-container *ngTemplateOutlet="siteList; context: {sites: accountsList.sameSite}"></ng-container>
-            </ng-container>
+            </ion-card>
 
-            <ng-container *ngFor="let sites of accountsList.otherSites">
-                <ion-item-divider sticky="true" *ngIf="sites[0]">
+            <ion-card *ngFor="let sites of accountsList.otherSites">
+                <ion-item-divider sticky="true" *ngIf="sites[0]" class="core-sitelist-sitename">
                     <ion-label>
                         <h2>
                             <core-format-text [text]="sites[0].siteName" clean="true" [siteId]="sites[0].id"></core-format-text>
@@ -60,7 +60,7 @@
                 </ion-item-divider>
 
                 <ng-container *ngTemplateOutlet="siteList; context: {sites: sites}"></ng-container>
-            </ng-container>
+            </ion-card>
 
         </ion-list>
     </core-loading>
diff --git a/src/core/features/login/components/sites/sites.ts b/src/core/features/login/components/sites/sites.ts
index 1f14b51a7..899b49741 100644
--- a/src/core/features/login/components/sites/sites.ts
+++ b/src/core/features/login/components/sites/sites.ts
@@ -28,6 +28,7 @@ import { ModalController } from '@singletons';
 @Component({
     selector: 'core-login-sites',
     templateUrl: 'sites.html',
+    styleUrls: ['../../sitelist.scss'],
     animations: [CoreAnimations.SLIDE_IN_OUT, CoreAnimations.SHOW_HIDE],
 })
 export class CoreLoginSitesComponent implements OnInit {
diff --git a/src/core/features/login/pages/sites/sites.html b/src/core/features/login/pages/sites/sites.html
index 994b7e7df..d7a06fa24 100644
--- a/src/core/features/login/pages/sites/sites.html
+++ b/src/core/features/login/pages/sites/sites.html
@@ -21,9 +21,9 @@
 </ion-header>
 <ion-content>
     <core-loading [hideUntil]="loaded">
-        <ion-list>
-            <ng-container *ngFor="let sites of accountsList.otherSites">
-                <ion-item-divider sticky="true" *ngIf="sites[0]">
+        <ion-list class="core-sitelist">
+            <ion-card *ngFor="let sites of accountsList.otherSites">
+                <ion-item-divider sticky="true" *ngIf="sites[0]" class="core-sitelist-sitename">
                     <ion-label>
                         <h2>
                             <core-format-text [text]="sites[0].siteName" clean="true" [siteId]="sites[0].id"></core-format-text>
@@ -50,7 +50,7 @@
                         <ion-icon name="fas-trash" slot="icon-only" aria-hidden="true"></ion-icon>
                     </ion-button>
                 </ion-item>
-            </ng-container>
+            </ion-card>
         </ion-list>
     </core-loading>
     <ion-fab slot="fixed" core-fab vertical="bottom" horizontal="end">
diff --git a/src/core/features/login/pages/sites/sites.ts b/src/core/features/login/pages/sites/sites.ts
index a6d3e1eeb..6184e717e 100644
--- a/src/core/features/login/pages/sites/sites.ts
+++ b/src/core/features/login/pages/sites/sites.ts
@@ -27,6 +27,7 @@ import { CoreAnimations } from '@components/animations';
 @Component({
     selector: 'page-core-login-sites',
     templateUrl: 'sites.html',
+    styleUrls: ['../../sitelist.scss'],
     animations: [CoreAnimations.SLIDE_IN_OUT, CoreAnimations.SHOW_HIDE],
 })
 export class CoreLoginSitesPage implements OnInit {
diff --git a/src/core/features/login/sitelist.scss b/src/core/features/login/sitelist.scss
new file mode 100644
index 000000000..22a83f842
--- /dev/null
+++ b/src/core/features/login/sitelist.scss
@@ -0,0 +1,10 @@
+ion-list.core-sitelist {
+    .core-sitelist-sitename {
+        ion-label {
+            margin-top: 8px;
+            margin-bottom: 8px;
+        }
+
+        border-bottom: 1px solid var(--stroke);
+    }
+}

From ee83bfbf99df6654db70cf800f382b62f3a5eb55 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 2 Feb 2022 08:46:37 +0100
Subject: [PATCH 0495/1008] MOBILE-3974 paypal: Open paypal enrol in browser

---
 scripts/langindex.json                        |  8 +-
 .../course/pages/preview/preview.html         |  7 +-
 .../course/pages/preview/preview.page.ts      | 92 ++++++++-----------
 .../course-list-item/course-list-item.ts      |  2 +-
 src/core/features/courses/lang.json           |  5 +-
 src/core/lang.json                            |  1 -
 src/core/services/utils/dom.ts                |  4 +-
 7 files changed, 53 insertions(+), 66 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index c999b7a30..1edd754aa 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1579,8 +1579,10 @@
   "core.courses.aria:courseprogress": "block_myoverview",
   "core.courses.aria:favourite": "course",
   "core.courses.availablecourses": "moodle",
+  "core.courses.browserenrolinstructions": "local_moodlemobileapp",
   "core.courses.cannotretrievemorecategories": "local_moodlemobileapp",
   "core.courses.categories": "moodle",
+  "core.courses.completeenrolmentbrowser": "local_moodlemobileapp",
   "core.courses.confirmselfenrol": "local_moodlemobileapp",
   "core.courses.courses": "moodle",
   "core.courses.downloadcourses": "local_moodlemobileapp",
@@ -1602,9 +1604,9 @@
   "core.courses.nosearchresults": "wiki",
   "core.courses.notenroled": "completion",
   "core.courses.notenrollable": "local_moodlemobileapp",
+  "core.courses.otherenrolments": "local_moodlemobileapp",
   "core.courses.password": "local_moodlemobileapp",
   "core.courses.paymentrequired": "moodle",
-  "core.courses.paypalaccepted": "enrol_paypal",
   "core.courses.refreshcourses": "local_moodlemobileapp",
   "core.courses.reload": "moodle",
   "core.courses.removefromfavourites": "block_myoverview",
@@ -1612,7 +1614,6 @@
   "core.courses.searchcourses": "moodle",
   "core.courses.searchcoursesadvice": "local_moodlemobileapp",
   "core.courses.selfenrolment": "local_moodlemobileapp",
-  "core.courses.sendpaymentbutton": "enrol_paypal",
   "core.courses.show": "block_myoverview",
   "core.courses.showonlyenrolled": "local_moodlemobileapp",
   "core.courses.therearecourses": "moodle",
@@ -2073,7 +2074,6 @@
   "core.othergroups": "group",
   "core.pagea": "moodle",
   "core.parentlanguage": "langconfig",
-  "core.paymentinstant": "moodle",
   "core.percentagenumber": "local_moodlemobileapp",
   "core.phone": "moodle",
   "core.pictureof": "moodle",
@@ -2339,8 +2339,8 @@
   "core.user.webpage": "moodle",
   "core.userdeleted": "moodle",
   "core.userdetails": "moodle",
-  "core.usernotfullysetup": "error",
   "core.usernologin": "local_moodlemobileapp",
+  "core.usernotfullysetup": "error",
   "core.users": "moodle",
   "core.usersuspended": "tool_reportbuilder",
   "core.view": "moodle",
diff --git a/src/core/features/course/pages/preview/preview.html b/src/core/features/course/pages/preview/preview.html
index 476c38c92..7aeaeda68 100644
--- a/src/core/features/course/pages/preview/preview.html
+++ b/src/core/features/course/pages/preview/preview.html
@@ -100,10 +100,9 @@
                 </ion-item>
                 <ion-item class="ion-text-wrap" *ngIf="paypalEnabled">
                     <ion-label>
-                        <p class="item-heading">{{ 'core.courses.paypalaccepted' | translate }}</p>
-                        <p *ngIf="isMobile">{{ 'core.paymentinstant' | translate }}</p>
-                        <ion-button *ngIf="isMobile" expand="block" class="ion-margin-top" (click)="paypalEnrol()">
-                            {{ 'core.courses.sendpaymentbutton' | translate }}
+                        <p class="item-heading">{{ 'core.courses.otherenrolments' | translate }}</p>
+                        <ion-button expand="block" class="ion-margin-top" (click)="browserEnrol()">
+                            {{ 'core.courses.completeenrolmentbrowser' | translate }}
                         </ion-button>
                     </ion-label>
                 </ion-item>
diff --git a/src/core/features/course/pages/preview/preview.page.ts b/src/core/features/course/pages/preview/preview.page.ts
index 8c1f9b9ce..425bf962b 100644
--- a/src/core/features/course/pages/preview/preview.page.ts
+++ b/src/core/features/course/pages/preview/preview.page.ts
@@ -12,9 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, OnDestroy, NgZone, OnInit } from '@angular/core';
+import { Component, OnDestroy, OnInit } from '@angular/core';
 import { IonRefresher } from '@ionic/angular';
-import { CoreApp } from '@services/app';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
@@ -30,12 +29,13 @@ import {
 import { CoreCourseOptionsDelegate } from '@features/course/services/course-options-delegate';
 import { CoreCourse, CoreCourseProvider } from '@features/course/services/course';
 import { CoreCourseHelper, CorePrefetchStatusInfo } from '@features/course/services/course-helper';
-import { Translate } from '@singletons';
+import { NgZone, Platform, Translate } from '@singletons';
 import { CoreConstants } from '@/core/constants';
 import { CoreCoursesSelfEnrolPasswordComponent } from '../../../courses/components/self-enrol-password/self-enrol-password';
 import { CoreNavigator } from '@services/navigator';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreCourseWithImageAndColor } from '@features/courses/services/courses-helper';
+import { Subscription } from 'rxjs';
 
 /**
  * Page that allows "previewing" a course and enrolling in it if enabled and not enrolled.
@@ -66,7 +66,6 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
     downloadCourseEnabled: boolean;
     courseUrl = '';
     courseImageUrl?: string;
-    isMobile: boolean;
     progress?: number;
 
     protected isGuestEnabled = false;
@@ -75,15 +74,13 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
     protected enrolmentMethods: CoreCourseEnrolmentMethod[] = [];
     protected waitStart = 0;
     protected enrolUrl = '';
-    protected paypalReturnUrl = '';
     protected pageDestroyed = false;
     protected courseStatusObserver?: CoreEventObserver;
     protected courseId!: number;
+    protected appResumeSubscription: Subscription;
+    protected waitingForBrowserEnrol = false;
 
-    constructor(
-        protected zone: NgZone,
-    ) {
-        this.isMobile = CoreApp.isMobile();
+    constructor() {
         this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
 
         if (this.downloadCourseEnabled) {
@@ -94,6 +91,20 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
                 }
             }, CoreSites.getCurrentSiteId());
         }
+
+        // Refresh the view when the app is resumed.
+        this.appResumeSubscription = Platform.resume.subscribe(() => {
+            if (!this.waitingForBrowserEnrol || !this.dataLoaded) {
+                return;
+            }
+
+            NgZone.run(async () => {
+                this.waitingForBrowserEnrol = false;
+                this.dataLoaded = false;
+
+                await this.refreshData();
+            });
+        });
     }
 
     /**
@@ -115,7 +126,6 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
         const currentSiteUrl = CoreSites.getRequiredCurrentSite().getURL();
         this.enrolUrl = CoreTextUtils.concatenatePaths(currentSiteUrl, 'enrol/index.php?id=' + this.courseId);
         this.courseUrl = CoreTextUtils.concatenatePaths(currentSiteUrl, 'course/view.php?id=' + this.courseId);
-        this.paypalReturnUrl = CoreTextUtils.concatenatePaths(currentSiteUrl, 'enrol/paypal/return.php');
 
         try {
             await this.getCourse();
@@ -269,53 +279,30 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
     }
 
     /**
-     * Enrol using PayPal.
+     * Enrol in browser.
      */
-    async paypalEnrol(): Promise<void> {
-        // We cannot control browser in browser.
-        if (!this.isMobile || !CoreSites.getCurrentSite()) {
+    async browserEnrol(): Promise<void> {
+        // Send user to browser to enrol. Warn the user first.
+        try {
+            await CoreDomUtils.showConfirm(
+                Translate.instant('core.courses.browserenrolinstructions'),
+                undefined,
+                Translate.instant('core.openinbrowser'),
+            );
+        } catch {
+            // User canceled.
             return;
         }
 
-        let hasReturnedFromPaypal = false;
+        this.waitingForBrowserEnrol = true;
 
-        const urlLoaded = (event: InAppBrowserEvent): void => {
-            if (event.url.indexOf(this.paypalReturnUrl) != -1) {
-                hasReturnedFromPaypal = true;
-            } else if (event.url.indexOf(this.courseUrl) != -1 && hasReturnedFromPaypal) {
-                // User reached the course index page after returning from PayPal, close the InAppBrowser.
-                inAppClosed();
-                window.close();
-            }
-        };
-        const inAppClosed = (): void => {
-            // InAppBrowser closed, refresh data.
-            unsubscribeAll();
-
-            if (!this.dataLoaded) {
-                return;
-            }
-            this.dataLoaded = false;
-            this.refreshData();
-        };
-        const unsubscribeAll = (): void => {
-            inAppLoadSubscription?.unsubscribe();
-            inAppExitSubscription?.unsubscribe();
-        };
-
-        // Open the enrolment page in InAppBrowser.
-        const window = await CoreSites.getRequiredCurrentSite().openInAppWithAutoLogin(this.enrolUrl);
-
-        // Observe loaded pages in the InAppBrowser to check if the enrol process has ended.
-        const inAppLoadSubscription = window.on('loadstart').subscribe((event) => {
-            // Execute the callback in the Angular zone, so change detection doesn't stop working.
-            this.zone.run(() => urlLoaded(event));
-        });
-        // Observe window closed.
-        const inAppExitSubscription = window.on('exit').subscribe(() => {
-            // Execute the callback in the Angular zone, so change detection doesn't stop working.
-            this.zone.run(inAppClosed);
-        });
+        await CoreSites.getRequiredCurrentSite().openInBrowserWithAutoLogin(
+            this.enrolUrl,
+            undefined,
+            {
+                showBrowserWarning: false,
+            },
+        );
     }
 
     /**
@@ -486,6 +473,7 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
     ngOnDestroy(): void {
         this.pageDestroyed = true;
         this.courseStatusObserver?.off();
+        this.appResumeSubscription.unsubscribe();
     }
 
 }
diff --git a/src/core/features/courses/components/course-list-item/course-list-item.ts b/src/core/features/courses/components/course-list-item/course-list-item.ts
index 46a7defb0..cd64c2bf9 100644
--- a/src/core/features/courses/components/course-list-item/course-list-item.ts
+++ b/src/core/features/courses/components/course-list-item/course-list-item.ts
@@ -134,7 +134,7 @@ export class CoreCoursesCourseListItemComponent implements OnInit, OnDestroy, On
                     });
                 } else if (instance === 'paypal') {
                     this.enrolmentIcons.push({
-                        label: 'core.courses.paypalaccepted',
+                        label: 'core.courses.otherenrolments',
                         icon: 'fab-paypal',
                     });
                 }
diff --git a/src/core/features/courses/lang.json b/src/core/features/courses/lang.json
index 9887f8853..933eb9aff 100644
--- a/src/core/features/courses/lang.json
+++ b/src/core/features/courses/lang.json
@@ -6,8 +6,10 @@
     "aria:courseprogress": "Course progress:",
     "aria:favourite": "Course is starred",
     "availablecourses": "Available courses",
+    "browserenrolinstructions": "We will take you to your device's browser. Once you have completed your enrolment, please come back to this app.",
     "cannotretrievemorecategories": "Categories deeper than level {{$a}} cannot be retrieved.",
     "categories": "Course categories",
+    "completeenrolmentbrowser": "Complete enrolment in browser",
     "confirmselfenrol": "Are you sure you want to enrol yourself in this course?",
     "courses": "Courses",
     "downloadcourses": "Download courses",
@@ -29,9 +31,9 @@
     "nosearchresults": "No results",
     "notenroled": "You are not enrolled in this course",
     "notenrollable": "You cannot enrol yourself in this course.",
+    "otherenrolments": "Other enrolments",
     "password": "Enrolment key",
     "paymentrequired": "This course requires a payment for entry.",
-    "paypalaccepted": "PayPal payments accepted",
     "refreshcourses": "Refresh courses",
     "reload": "Reload",
     "removefromfavourites": "Unstar this course",
@@ -39,7 +41,6 @@
     "searchcourses": "Search courses",
     "searchcoursesadvice": "You can use the search courses button to find courses to access as a  guest or enrol yourself in courses that allow it.",
     "selfenrolment": "Self enrolment",
-    "sendpaymentbutton": "Send payment via PayPal",
     "show": "Unarchive",
     "showonlyenrolled": "Show only my courses",
     "therearecourses": "There are {{$a}} courses",
diff --git a/src/core/lang.json b/src/core/lang.json
index 982c01ba1..651d5fd54 100644
--- a/src/core/lang.json
+++ b/src/core/lang.json
@@ -228,7 +228,6 @@
     "othergroups": "Other groups",
     "pagea": "Page {{$a}}",
     "parentlanguage": "",
-    "paymentinstant": "Use the button below to pay and be enrolled within minutes!",
     "percentagenumber": "{{$a}}%",
     "phone": "Phone",
     "pictureof": "Picture of {{$a}}",
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index 0dbd3e638..8f161774c 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -1225,10 +1225,10 @@ export class CoreDomUtilsProvider {
 
                 if (options.buttons) {
                     // Execute dismiss function if any.
-                    const cancelButton = <AlertButton> options.buttons.find(
+                    const cancelButton = <AlertButton | undefined> options.buttons.find(
                         (button) => typeof button != 'string' && button.handler !== undefined && button.role == 'cancel',
                     );
-                    cancelButton.handler?.(null);
+                    cancelButton?.handler?.(null);
                 }
             }, autocloseTime);
         }

From 54deab86f857265ce779d72fd5ff2857de101d5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 10 Feb 2022 17:32:23 +0100
Subject: [PATCH 0496/1008] MOBILE-3814 storage: Fix course prefetch

---
 .../pages/course-storage/course-storage.ts    |  9 ++++++++-
 .../courses-storage/courses-storage.html      |  9 +++++----
 .../pages/courses-storage/courses-storage.ts  | 20 +++++++++++++++----
 .../settings/services/settings-helper.ts      |  2 +-
 4 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.ts b/src/addons/storagemanager/pages/course-storage/course-storage.ts
index 962737dc6..fdfef8253 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.ts
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.ts
@@ -549,7 +549,14 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
      * Prefetch the whole course.
      */
     async prefetchCourse(): Promise<void> {
-        const course = await CoreCourses.getCourse(this.courseId);
+        const courses = await CoreCourses.getUserCourses(true);
+        let course = courses.find((course) => course.id == this.courseId);
+        if (!course) {
+            course = await CoreCourses.getCourse(this.courseId);
+        }
+        if (!course) {
+            return;
+        }
 
         try {
             await CoreCourseHelper.confirmAndPrefetchCourse(
diff --git a/src/addons/storagemanager/pages/courses-storage/courses-storage.html b/src/addons/storagemanager/pages/courses-storage/courses-storage.html
index 9bf0f92a9..00d3893a6 100644
--- a/src/addons/storagemanager/pages/courses-storage/courses-storage.html
+++ b/src/addons/storagemanager/pages/courses-storage/courses-storage.html
@@ -20,7 +20,7 @@
                         {{ 'core.settings.spaceusagehelp' | translate }}
                     </p>
                 </ion-label>
-                <ion-button fill="clear" color="danger" slot="end" (click)="deleteSiteStorage()"
+                <ion-button fill="clear" color="danger" slot="end" (click)="deleteSiteStorage($event)"
                     [hidden]="spaceUsage.spaceUsage! + spaceUsage.cacheEntries! <= 0"
                     [attr.aria-label]="'core.settings.deletesitefilestitle' | translate" fill="outline">
                     <ion-icon name="fas-trash" slot="icon-only" aria-hidden="true"></ion-icon>
@@ -31,8 +31,8 @@
                     <h2 class="ion-text-wrap">{{ 'addon.storagemanager.coursesspaceusage' | translate }}</h2>
                     <ion-badge color="light">{{ totalSize | coreBytesToSize }}</ion-badge>
                 </ion-label>
-                <ion-button slot="end" (click)="deleteCompletelyDownloadedCourses()" [disabled]="completelyDownloadedCourses.length === 0"
-                    color="danger" fill="outline">
+                <ion-button slot="end" (click)="deleteCompletelyDownloadedCourses($event)"
+                    [disabled]="completelyDownloadedCourses.length === 0" color="danger" fill="outline">
                     <ion-icon name="fas-trash" slot="icon-only" ariaLabel="{{ 'addon.storagemanager.deletecourses' | translate }}">
                     </ion-icon>
                 </ion-button>
@@ -55,7 +55,8 @@
                                 {{ course.totalSize | coreBytesToSize }}
                             </ion-badge>
                         </ion-label>
-                        <ion-button slot="end" (click)="deleteCourse(course)" [disabled]="course.isDownloading" color="danger" fill="clear">
+                        <ion-button slot="end" (click)="deleteCourse($event, course)" [disabled]="course.isDownloading" color="danger"
+                            fill="clear">
                             <ion-icon name="fas-trash" slot="icon-only"
                                 [attr.aria-label]="'addon.storagemanager.deletedatafrom' | translate: { name: course.displayname }">
                             </ion-icon>
diff --git a/src/addons/storagemanager/pages/courses-storage/courses-storage.ts b/src/addons/storagemanager/pages/courses-storage/courses-storage.ts
index 300e9f16c..0697c31aa 100644
--- a/src/addons/storagemanager/pages/courses-storage/courses-storage.ts
+++ b/src/addons/storagemanager/pages/courses-storage/courses-storage.ts
@@ -103,8 +103,13 @@ export class AddonStorageManagerCoursesStoragePage implements OnInit, OnDestroy
 
     /**
      * Delete all courses that have been downloaded.
+     *
+     * @param event: Event Object.
      */
-    async deleteCompletelyDownloadedCourses(): Promise<void> {
+    async deleteCompletelyDownloadedCourses(event: Event): Promise<void> {
+        event.preventDefault();
+        event.stopPropagation();
+
         try {
             await CoreDomUtils.showDeleteConfirm('core.course.confirmdeletestoreddata');
         } catch (error) {
@@ -132,9 +137,13 @@ export class AddonStorageManagerCoursesStoragePage implements OnInit, OnDestroy
     /**
      * Delete course.
      *
+     * @param event: Event Object.
      * @param course Course to delete.
      */
-    async deleteCourse(course: DownloadedCourse): Promise<void> {
+    async deleteCourse(event: Event, course: DownloadedCourse): Promise<void> {
+        event.preventDefault();
+        event.stopPropagation();
+
         try {
             await CoreDomUtils.showDeleteConfirm('core.course.confirmdeletestoreddata');
         } catch (error) {
@@ -242,9 +251,12 @@ export class AddonStorageManagerCoursesStoragePage implements OnInit, OnDestroy
     /**
      * Deletes files of a site and the tables that can be cleared.
      *
-     * @param siteData Site object with space usage.
+     * @param event: Event Object.
      */
-    async deleteSiteStorage(): Promise<void> {
+    async deleteSiteStorage(event: Event): Promise<void> {
+        event.preventDefault();
+        event.stopPropagation();
+
         try {
             const siteName = CoreSites.getRequiredCurrentSite().getSiteName();
 
diff --git a/src/core/features/settings/services/settings-helper.ts b/src/core/features/settings/services/settings-helper.ts
index 5ae1d8ed8..4dfc9eb3e 100644
--- a/src/core/features/settings/services/settings-helper.ts
+++ b/src/core/features/settings/services/settings-helper.ts
@@ -119,7 +119,7 @@ export class CoreSettingsHelperProvider {
         const title = Translate.instant('core.settings.deletesitefilestitle');
         const message = Translate.instant('core.settings.deletesitefiles', { sitename: siteName });
 
-        await CoreDomUtils.showConfirm(message, title);
+        await CoreDomUtils.showConfirm(message, title, Translate.instant('core.delete'));
 
         const site = await CoreSites.getSite(siteId);
 

From 0060de1459b4664e82b3b0e9198e56b68012ccbe Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 11 Feb 2022 10:06:51 +0100
Subject: [PATCH 0497/1008] MOBILE-3833 grades: Ignore notingroup error in
 prefetch

---
 .../grades/services/handlers/course-option.ts         | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/core/features/grades/services/handlers/course-option.ts b/src/core/features/grades/services/handlers/course-option.ts
index 21fb0053b..7c9049339 100644
--- a/src/core/features/grades/services/handlers/course-option.ts
+++ b/src/core/features/grades/services/handlers/course-option.ts
@@ -100,7 +100,16 @@ export class CoreGradesCourseOptionHandlerService implements CoreCourseOptionsHa
      * @return Promise resolved when done.
      */
     async prefetch(course: CoreEnrolledCourseDataWithExtraInfoAndOptions): Promise<void> {
-        await CoreGrades.getCourseGradesTable(course.id, undefined, undefined, true);
+        try {
+            await CoreGrades.getCourseGradesTable(course.id, undefined, undefined, true);
+        } catch (error) {
+            if (error.errorcode === 'notingroup') {
+                // Don't fail the download because of this error.
+                return;
+            }
+
+            throw error;
+        }
     }
 
 }

From a129a6df9f8db01d2a471f9d1c8b20e40cbd2d23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 10 Feb 2022 22:06:32 +0100
Subject: [PATCH 0498/1008] MOBILE-3814 course: Improve course list item
 performance

---
 .../core-courses-course-list-item.html        | 50 ++++++++-----------
 .../course-list-item/course-list-item.scss    |  3 +-
 .../course-list-item/course-list-item.ts      | 37 ++++----------
 src/theme/theme.base.scss                     |  1 +
 4 files changed, 34 insertions(+), 57 deletions(-)

diff --git a/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html b/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
index 41216f198..51cb1e650 100644
--- a/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
+++ b/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
@@ -6,12 +6,27 @@
         <img *ngIf="course.courseImage" [src]="course.courseImage" core-external-content alt="" />
         <ion-icon *ngIf="!course.courseImage" name="fas-graduation-cap" class="course-icon">
         </ion-icon>
-        <ng-container
-            *ngIf="isEnrolled && ((downloadCourseEnabled && !courseOptionMenuEnabled && showDownload) || courseOptionMenuEnabled)">
-            <ng-container *ngTemplateOutlet="download"></ng-container>
-        </ng-container>
     </div>
 
+    <ng-container *ngIf="isEnrolled && layout != 'summarycard'">
+        <div class="core-button-spinner" *ngIf="!courseOptionMenuEnabled && showDownload">
+            <core-download-refresh [status]="prefetchCourseData.status" [enabled]="showDownload"
+                [statusTranslatable]="prefetchCourseData.statusTranslatable" [canTrustDownload]="false"
+                [loading]="prefetchCourseData.loading" (action)="prefetchCourse()"></core-download-refresh>
+        </div>
+
+        <div class="core-button-spinner" *ngIf="courseOptionMenuEnabled">
+            <!-- Options menu. -->
+            <ion-button fill="clear" color="dark" (click)="showCourseOptionsMenu($event)" *ngIf="!showSpinner"
+                [attr.aria-label]="('core.displayoptions' | translate)">
+                <ion-icon name="ellipsis-vertical" slot="icon-only" aria-hidden="true"></ion-icon>
+            </ion-button>
+
+            <!-- Loading options course spinner. -->
+            <ion-spinner *ngIf="showSpinner" [attr.aria-label]="'core.loading' | translate"></ion-spinner>
+        </div>
+    </ng-container>
+
     <ion-item class="ion-text-wrap" button detail="false" (click)="openCourse()" [attr.aria-label]="course.displayname || course.fullname"
         [class.item-disabled]="course.visible == 0">
 
@@ -46,8 +61,8 @@
                         </ion-icon>
                     </span>
 
-                    <ion-icon *ngIf="downloadCourseEnabled && prefetchCourseData.downloadSucceeded" class="core-icon-downloaded"
-                        name="cloud-done" color="success" role="status" [attr.aria-label]="'core.downloaded' | translate"></ion-icon>
+                    <ion-icon *ngIf="prefetchCourseData.downloadSucceeded" class="core-icon-downloaded" name="cloud-done" color="success"
+                        role="status" [attr.aria-label]="'core.downloaded' | translate"></ion-icon>
                 </p>
 
                 <ion-chip color="brand" *ngIf="course.categoryname"
@@ -63,30 +78,7 @@
                 class="core-course-progress">
                 <core-progress-bar [progress]="progress" a11yText="core.courses.aria:courseprogress"></core-progress-bar>
             </div>
-
-            <ng-container *ngIf="layout == 'list' || layout == 'listwithenrol' && isEnrolled">
-                <ng-container *ngTemplateOutlet="download"></ng-container>
-            </ng-container>
         </ion-label>
     </ion-item>
 
 </ion-card>
-
-<ng-template #download>
-    <div class="core-button-spinner" *ngIf="downloadCourseEnabled && !courseOptionMenuEnabled && showDownload">
-        <core-download-refresh [status]="prefetchCourseData.status" [enabled]="downloadCourseEnabled"
-            [statusTranslatable]="prefetchCourseData.statusTranslatable" [canTrustDownload]="false" [loading]="prefetchCourseData.loading"
-            (action)="prefetchCourse()"></core-download-refresh>
-    </div>
-
-    <div class="core-button-spinner" *ngIf="courseOptionMenuEnabled">
-        <!-- Options menu. -->
-        <ion-button fill="clear" color="dark" (click)="showCourseOptionsMenu($event)" *ngIf="!showSpinner"
-            [attr.aria-label]="('core.displayoptions' | translate)">
-            <ion-icon name="ellipsis-vertical" slot="icon-only" aria-hidden="true"></ion-icon>
-        </ion-button>
-
-        <!-- Loading options course spinner. -->
-        <ion-spinner *ngIf="showSpinner" [attr.aria-label]="'core.loading' | translate"></ion-spinner>
-    </div>
-</ng-template>
diff --git a/src/core/features/courses/components/course-list-item/course-list-item.scss b/src/core/features/courses/components/course-list-item/course-list-item.scss
index 24345e414..d6bc0342e 100644
--- a/src/core/features/courses/components/course-list-item/course-list-item.scss
+++ b/src/core/features/courses/components/course-list-item/course-list-item.scss
@@ -54,6 +54,7 @@ ion-card {
     display: flex;
     flex-direction: column;
     align-items: center;
+    z-index: 2;
 
     ion-spinner {
         margin-top: 4px;
@@ -156,7 +157,7 @@ ion-card.core-course-list-card {
 
         ion-icon.course-icon {
             color: white;
-            opacity: 50%;
+            opacity: 0.5;
             position: absolute;
             left: 0;
             right: 0;
diff --git a/src/core/features/courses/components/course-list-item/course-list-item.ts b/src/core/features/courses/components/course-list-item/course-list-item.ts
index 73d73d61e..5f8043b2c 100644
--- a/src/core/features/courses/components/course-list-item/course-list-item.ts
+++ b/src/core/features/courses/components/course-list-item/course-list-item.ts
@@ -55,7 +55,6 @@ export class CoreCoursesCourseListItemComponent implements OnInit, OnDestroy, On
     };
 
     showSpinner = false;
-    downloadCourseEnabled = false;
     courseOptionMenuEnabled = false;
     progress = -1;
     completionUserTracked: boolean | undefined = false;
@@ -63,7 +62,6 @@ export class CoreCoursesCourseListItemComponent implements OnInit, OnDestroy, On
     protected courseStatus = CoreConstants.NOT_DOWNLOADED;
     protected isDestroyed = false;
     protected courseStatusObserver?: CoreEventObserver;
-    protected siteUpdatedObserver?: CoreEventObserver;
 
     protected element: HTMLElement;
 
@@ -93,31 +91,12 @@ export class CoreCoursesCourseListItemComponent implements OnInit, OnDestroy, On
         }
 
         if (this.isEnrolled) {
-            if (this.showDownload) {
-                this.initPrefetchCourse();
-            }
-
-            this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
-
-            if (this.downloadCourseEnabled) {
-                this.initPrefetchCourse();
-            }
-
             // This field is only available from 3.6 onwards.
             this.courseOptionMenuEnabled = (this.layout != 'listwithenrol' && this.layout != 'summarycard') &&
                 this.course.isfavourite !== undefined;
 
-            // Refresh the enabled flag if site is updated.
-            this.siteUpdatedObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, () => {
-                const wasEnabled = this.downloadCourseEnabled;
+            this.initPrefetchCourse();
 
-                this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
-
-                if (!wasEnabled && this.downloadCourseEnabled) {
-                    // Download course is enabled now, initialize it.
-                    this.initPrefetchCourse();
-                }
-            }, CoreSites.getCurrentSiteId());
         } else if ('enrollmentmethods' in this.course) {
             this.enrolmentIcons = [];
 
@@ -169,9 +148,7 @@ export class CoreCoursesCourseListItemComponent implements OnInit, OnDestroy, On
      * @inheritdoc
      */
     ngOnChanges(): void {
-        if (this.showDownload && this.isEnrolled) {
-            this.initPrefetchCourse();
-        }
+        this.initPrefetchCourse();
 
         this.updateCourseFields();
     }
@@ -203,7 +180,12 @@ export class CoreCoursesCourseListItemComponent implements OnInit, OnDestroy, On
     /**
      * Initialize prefetch course.
      */
-    async initPrefetchCourse(): Promise<void> {
+    async initPrefetchCourse(forceInit = false): Promise<void> {
+        if (!this.isEnrolled || !this.showDownload ||
+            (this.courseOptionMenuEnabled && !forceInit)) {
+            return;
+        }
+
         if (this.courseStatusObserver !== undefined) {
             // Already initialized.
             return;
@@ -306,6 +288,8 @@ export class CoreCoursesCourseListItemComponent implements OnInit, OnDestroy, On
         event.preventDefault();
         event.stopPropagation();
 
+        this.initPrefetchCourse(true);
+
         const popoverData = await CoreDomUtils.openPopover<string>({
             component: CoreCoursesCourseOptionsMenuComponent,
             componentProps: {
@@ -414,7 +398,6 @@ export class CoreCoursesCourseListItemComponent implements OnInit, OnDestroy, On
     ngOnDestroy(): void {
         this.isDestroyed = true;
         this.courseStatusObserver?.off();
-        this.siteUpdatedObserver?.off();
     }
 
 }
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 38dc3ccd9..01d92d330 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -201,6 +201,7 @@ ion-header ion-toolbar {
     .in-toolbar.button-clear {
         --color: var(--core-header-toolbar-color);
         --ion-toolbar-color: var(--core-header-toolbar-color);
+        --border-radius: var(--huge-radius);
     }
 
     .button.button-clear,

From e5309e8d51097cdda6cb7945f5f5a340f99a325d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 2 Feb 2022 16:13:10 +0100
Subject: [PATCH 0499/1008] MOBILE-3814 my: Change layout dropdown to button

---
 .../myoverview/addon-block-myoverview.html    | 24 +++---
 .../components/myoverview/myoverview.ts       | 43 +++++------
 src/core/components/combobox/combobox.scss    |  6 +-
 src/core/components/combobox/combobox.ts      |  3 +-
 .../components/combobox/core-combobox.html    |  2 +-
 .../components/search-box/search-box.scss     | 10 ++-
 src/theme/theme.base.scss                     | 17 +++--
 src/theme/theme.dark.scss                     | 24 ++++--
 src/theme/theme.light.scss                    | 75 ++++++++++++-------
 9 files changed, 120 insertions(+), 84 deletions(-)

diff --git a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
index 92eb69a34..e76d98387 100644
--- a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
+++ b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
@@ -22,7 +22,7 @@
 </ion-item-divider>
 <core-loading [hideUntil]="loaded" [fullscreen]="false">
 
-    <ion-row class="ion-no-padding ion-justify-content-between" *ngIf="hasCourses">
+    <ion-row class="ion-no-padding ion-justify-content-between ion-align-items-center" *ngIf="hasCourses">
         <ion-col size="auto" class="ion-no-padding" *ngIf="filters.enabled">
             <core-combobox interface="modal" [label]="'core.courses.filtermycourses' | translate" (onChange)="filterOptionsChanged($event)"
                 icon="fas-filter" [badge]="filters.count" [modalOptions]="filterModalOptions">
@@ -48,14 +48,15 @@
                 </ion-select-option>
             </core-combobox>
         </ion-col>
-        <ion-col size="auto" class="ion-no-padding" *ngIf="layouts.options.length > 1">
-            <!-- "Layouts" selector. -->
-            <core-combobox [label]="'core.show' | translate" [selection]="layouts.selected" (onChange)="saveLayout($event)" icon="fas-th">
-                <ng-container *ngFor="let layout of layouts.options">
-                    <ion-select-option class="ion-text-wrap" [value]="layout">{{ 'addon.block_myoverview.'+layout | translate }}
-                    </ion-select-option>
-                </ng-container>
-            </core-combobox>
+        <ion-col size="auto" class="ion-no-padding" *ngIf="isLayoutSwitcherAvailable">
+            <ion-button *ngIf="layout == 'card'" fill="outline" (click)="toggleLayout('list')"
+                [attr.aria-label]="'addon.block_myoverview.list' | translate">
+                <ion-icon slot="icon-only" name="fas-list"></ion-icon>
+            </ion-button>
+            <ion-button *ngIf="layout == 'list'" fill="outline" (click)="toggleLayout('card')"
+                [attr.aria-label]="'addon.block_myoverview.card' | translate">
+                <ion-icon slot="icon-only" name="fas-th"></ion-icon>
+            </ion-button>
         </ion-col>
     </ion-row>
     <ion-row class="ion-no-padding ion-hide-md-up" *ngIf="hasCourses">
@@ -73,13 +74,12 @@
 
     <!-- List of courses. -->
     <div class="safe-area-padding" *ngIf="hasCourses">
-        <ion-grid class="ion-no-padding" [class.core-no-grid]="layouts.selected != 'card'"
-            [class.list-item-limited-width]="layouts.selected != 'card'">
+        <ion-grid class="ion-no-padding" [class.core-no-grid]="layout != 'card'" [class.list-item-limited-width]="layout != 'card'">
             <ion-row class="ion-no-padding">
                 <ion-col *ngFor="let course of filteredCourses" class="ion-no-padding" size="12" size-sm="6" size-md="6" size-lg="4"
                     size-xl="3">
                     <core-courses-course-list-item [course]="course" class="core-courseoverview" [showDownload]="downloadCourseEnabled"
-                        [layout]="layouts.selected">
+                        [layout]="layout">
                     </core-courses-course-list-item>
                 </ion-col>
             </ion-row>
diff --git a/src/addons/block/myoverview/components/myoverview/myoverview.ts b/src/addons/block/myoverview/components/myoverview/myoverview.ts
index 5b676a067..b7201c44c 100644
--- a/src/addons/block/myoverview/components/myoverview/myoverview.ts
+++ b/src/addons/block/myoverview/components/myoverview/myoverview.ts
@@ -76,10 +76,8 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
         component: AddonBlockMyOverviewFilterOptionsComponent,
     };
 
-    layouts: AddonBlockMyOverviewLayoutOptions = {
-        options: [],
-        selected: 'card',
-    };
+    isLayoutSwitcherAvailable = false;
+    layout: AddonBlockMyOverviewLayouts = 'list';
 
     sort: AddonBlockMyOverviewSortOptions = {
         shortnameEnabled: false,
@@ -142,9 +140,9 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
 
         promises.push(this.currentSite.getLocalSiteConfig(
             'AddonBlockMyOverviewLayout',
-            this.layouts.selected,
+            this.layout,
         ).then((value) => {
-            this.layouts.selected = value;
+            this.layout = value;
 
             return;
         }));
@@ -340,10 +338,10 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
      * @param layouts Config available layouts.
      */
     protected loadLayouts(layouts?: string[]): void {
-        this.layouts.options = [];
+        const layoutsOptions: AddonBlockMyOverviewLayouts[] = [];
 
         if (layouts === undefined) {
-            this.layouts.options = ['card', 'list'];
+            this.isLayoutSwitcherAvailable = true;
 
             return;
         }
@@ -354,19 +352,21 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
             }
 
             const validLayout: AddonBlockMyOverviewLayouts = layout == 'summary' ? 'list' : layout as AddonBlockMyOverviewLayouts;
-            if (!this.layouts.options.includes(validLayout)) {
-                this.layouts.options.push(validLayout);
+            if (!layoutsOptions.includes(validLayout)) {
+                layoutsOptions.push(validLayout);
             }
         });
 
-        // If no layout is available use card.
-        if (this.layouts.options.length == 0) {
-            this.layouts.options = ['card'];
+        // If no layout is available use list.
+        if (layoutsOptions.length == 0) {
+            layoutsOptions.push('list');
         }
 
-        if (!this.layouts.options.includes(this.layouts.selected)) {
-            this.layouts.selected = this.layouts.options[0];
+        if (!layoutsOptions.includes(this.layout)) {
+            this.layout = layoutsOptions[0];
         }
+
+        this.isLayoutSwitcherAvailable = layoutsOptions.length > 1;
     }
 
     /**
@@ -632,15 +632,15 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
     }
 
     /**
-     * Saves layout value.
+     * Toggle layout value.
      *
      * @param layout New layout.
      * @return Promise resolved when done.
      */
-    async saveLayout(layout: AddonBlockMyOverviewLayouts): Promise<void> {
-        this.layouts.selected = layout;
+    async toggleLayout(layout: AddonBlockMyOverviewLayouts): Promise<void> {
+        this.layout = layout;
 
-        await this.currentSite.setLocalSiteConfig('AddonBlockMyOverviewLayout', this.layouts.selected);
+        await this.currentSite.setLocalSiteConfig('AddonBlockMyOverviewLayout', this.layout);
     }
 
     /**
@@ -702,11 +702,6 @@ export type AddonBlockMyOverviewFilterOptions = {
     count: number;
 };
 
-type AddonBlockMyOverviewLayoutOptions = {
-    options: AddonBlockMyOverviewLayouts[];
-    selected: AddonBlockMyOverviewLayouts;
-};
-
 type AddonBlockMyOverviewSortOptions = {
     shortnameEnabled: boolean;
     selected: string;
diff --git a/src/core/components/combobox/combobox.scss b/src/core/components/combobox/combobox.scss
index 037d35189..7bbd14a23 100644
--- a/src/core/components/combobox/combobox.scss
+++ b/src/core/components/combobox/combobox.scss
@@ -55,9 +55,8 @@ ion-button {
     color: var(--color);
     text-overflow: ellipsis;
     white-space: nowrap;
-    min-height: 26px;
+    min-height: var(--a11y-min-target-size);
     overflow: hidden;
-    margin: 8px;
     box-shadow: var(--box-shadow);
 
     &:focus,
@@ -71,6 +70,7 @@ ion-select {
     border-style: var(--border-style);
     border-width: var(--border-width);
     border-radius: var(--core-combobox-radius);
+    margin: 8px;
 
     &::part(icon) {
         margin: var(--icon-margin);
@@ -103,9 +103,9 @@ ion-select {
 
 ion-button {
     border-radius: var(--core-combobox-radius);
+    margin: 4px 8px;
 
     flex: 1;
-    min-height: 45px;
 
     &::part(native) {
         text-transform: none;
diff --git a/src/core/components/combobox/combobox.ts b/src/core/components/combobox/combobox.ts
index c66579939..32e56a904 100644
--- a/src/core/components/combobox/combobox.ts
+++ b/src/core/components/combobox/combobox.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, EventEmitter, Input, Output, ViewChild, ViewEncapsulation } from '@angular/core';
+import { Component, EventEmitter, Input, Output, ViewChild } from '@angular/core';
 import { Translate } from '@singletons';
 import { ModalOptions } from '@ionic/core';
 import { CoreDomUtils } from '@services/utils/dom';
@@ -40,7 +40,6 @@ import { IonSelect } from '@ionic/angular';
     selector: 'core-combobox',
     templateUrl: 'core-combobox.html',
     styleUrls: ['combobox.scss'],
-    encapsulation: ViewEncapsulation.ShadowDom,
 })
 export class CoreComboboxComponent {
 
diff --git a/src/core/components/combobox/core-combobox.html b/src/core/components/combobox/core-combobox.html
index 6b3d2ceb2..baa897fa3 100644
--- a/src/core/components/combobox/core-combobox.html
+++ b/src/core/components/combobox/core-combobox.html
@@ -1,4 +1,4 @@
-<ion-button (click)="openSelect($event)" color="light" *ngIf="interface != 'modal' && icon" [disabled]="disabled">
+<ion-button (click)="openSelect($event)" *ngIf="interface != 'modal' && icon" [disabled]="disabled">
     <ion-icon [name]="icon" [attr.aria-label]="label" slot="start">
     </ion-icon>
     <ion-badge *ngIf="badge && badge > 0" slot="start">{{badge}}</ion-badge>
diff --git a/src/core/features/search/components/search-box/search-box.scss b/src/core/features/search/components/search-box/search-box.scss
index 9649ae962..950c685b5 100644
--- a/src/core/features/search/components/search-box/search-box.scss
+++ b/src/core/features/search/components/search-box/search-box.scss
@@ -1,5 +1,5 @@
 :host {
-    min-height: 61px;
+    min-height: var(--a11y-min-target-size);
     display: block;
     position: relative;
 
@@ -10,6 +10,10 @@
         z-index: 4;
         margin-top: 8px;
         margin-bottom: 8px;
+        --border-color: var(--core-search-box-border-color);
+        --border-radius: var(--core-search-box-border-radius);
+        --background: var(--core-search-box-background);
+        --color: var(--core-search-box-border-color);
     }
 
     ion-button.button {
@@ -19,6 +23,8 @@
     .core-search-history {
         max-height: calc(-120px + 80vh);
         overflow-y: auto;
+        background: var(--core-search-box-background);
+        --ion-item-background: var(--core-search-box-background);
 
         .item:hover {
             --background: var(--light);
@@ -40,5 +46,7 @@
 
     ion-item {
         --min-height: var(--a11y-min-target-size);
+        --border-width: 0px;
+        --background: var(--core-search-box-background);
     }
 }
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 01d92d330..36488a6a7 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -265,9 +265,15 @@ button,
     min-width: var(--a11y-min-target-size);
 }
 
+ion-button {
+    margin: 4px 8px;
+}
+
 ion-button.button-outline {
-    --border-width: 1px;
-    --background: var(--contrast-background);
+    --border-width: var(--core-input-border-width);
+    --border-color: var(--core-input-stroke);
+    --background: var(--core-input-background);
+    --color: var(--text-color);
 }
 
 ion-button.button-solid {
@@ -314,12 +320,7 @@ ion-button.button.button-clear.button-has-icon-only {
 
 ion-button.button.button-solid,
 ion-button.button.button-outline {
-    --border-radius: var(--small-radius);
-}
-
-// Clear buttons will be black.
-ion-button.button-clear {
-    --primary: var(--primary);
+    --border-radius: var(--core-input-radius);
 }
 
 [role="button"],
diff --git a/src/theme/theme.dark.scss b/src/theme/theme.dark.scss
index 1d55e6631..9f06651c1 100644
--- a/src/theme/theme.dark.scss
+++ b/src/theme/theme.dark.scss
@@ -37,16 +37,19 @@
     --ion-text-color:           var(--text-color);
     --ion-text-color-rgb:       #{$text-color-dark-rgb};
     --subdued-text-color:       var(--gray-400);
+    --stroke:                   var(--gray-700);
+
+    --contrast-background: black;
 
     --ion-card-color: var(--text-color);
     --ion-card-background: var(--ion-item-background);
 
-    --contrast-background: black;
-
-    --stroke:           var(--gray-700);
     --ion-border-color: var(--stroke);
     --ion-item-border-color: var(--stroke);
 
+    --core-input-stroke: var(--gray-700);
+    --core-input-background: var(--gray-900);
+
     ion-content {
         --background: var(--ion-background-color);
         --background-alternative: var(--gray-900);
@@ -80,9 +83,18 @@
     --item-divider-color: var(--text-color);
     --spacer-background: var(--gray-700);
 
-    --core-combobox-background: var(--ion-item-background);
-    --core-combobox-color: var(--gray-100);
-    --core-combobox-border-color: var(--stroke);
+    --ion-searchbar-background: var(--ion-background-color);
+    --ion-searchbar-border-color: var(--core-input-stroke);
+    --ion-searchbar-color: var(--text-color);
+    --ion-searchbar-icon-color: var(--core-input-stroke);
+
+    --core-search-box-background: var(--ion-background-color);
+    --core-search-box-border-color: var(--core-input-stroke);
+    --core-search-box-color: var(--text-color);
+
+    --core-combobox-background: var(--core-input-background);
+    --core-combobox-color: var(--text-color);
+    --core-combobox-border-color: var(--core-input-stroke);
 
     --core-login-background: var(--gray-900);
     --core-login-text-color: var(--white);
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 9a0b55bc0..39eb96a05 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -43,40 +43,44 @@
     --ion-color-step-950:  var(--gray-900);
     --ion-color-step-1000: var(--black);
 
-    --text-color:       #{$text-color};
-    --background-color: #{$background-color};
-
-    --core-online-color: #5cb85c;
-
-    --stroke:           var(--gray-300);
-    --ion-border-color: var(--stroke);
-    --ion-item-border-color: var(--stroke);
-
     @each $color-name, $unused in $colors {
         @include generate-color($color-name, $colors);
     }
 
     --brand-color: var(--brand);
 
-    --small-radius: 4px;
-    --medium-radius: 8px;
-    --big-radius: 16px;
-    --huge-radius: 24px;
-
     // Accessibility vars.
     --a11y-min-target-size: 44px;
     --a11y-focus-color: var(--primary);
     --a11y-focus-width: 2px;
     --zoom-level: 100%;
 
+    --small-radius: 4px;
+    --medium-radius: 8px;
+    --big-radius: 16px;
+    --huge-radius: 24px;
+
+    --text-color:       #{$text-color};
+    --background-color: #{$background-color};
+    --stroke:            var(--gray-300);
+
+    --core-online-color: #5cb85c;
+
+    --ion-background-color: var(--background-color);
+    --ion-item-border-color: var(--stroke);
+    --ion-background-color-rgb: #{$background-color-rgb};
+    --ion-border-color: var(--stroke);
+
+    --core-input-stroke: var(--gray-400);
+    --core-input-background: var(--ion-background-color);
+    --core-input-radius: var(--small-radius);
+    --core-input-border-width: 1px;
+
     --module-icon-size: 24px;
     --module-icon-radius: var(--medium-radius);
 
     --list-item--max-width: 768px;
 
-    --ion-background-color: var(--background-color);
-    --ion-background-color-rgb: #{$background-color-rgb};
-
     --contrast-background: white;
 
     --ion-text-color: var(--text-color);
@@ -155,16 +159,40 @@
         --border-width: 0 0 var(--core-header-toolbar-border-width) 0;
     }
 
+    --ion-searchbar-background: var(--ion-background-color);
+    --ion-searchbar-border-color: var(--core-input-stroke);
+    --ion-searchbar-border-radius: var(--core-input-radius);
+    --ion-searchbar-color: var(--text-color);
+    --ion-searchbar-icon-color: var(--core-input-stroke);
     ion-searchbar {
-        --background: var(--ion-item-background);
+        --background: var(--ion-searchbar-background);
+        --border-color: var(--ion-searchbar-border-color);
+        --icon-color: var(--ion-searchbar-icon-color);
+
+        .searchbar-input-container {
+            color: var(--ion-searchbar-color) !important;
+        }
         .searchbar-input {
             height: var(--a11y-min-target-size);
-            border: 1px solid var(--stroke);
+            border: 1px solid var(--ion-searchbar-border-color);
             box-shadow: none;
-            border-radius: var(--medium-radius);
+            border-radius: var(--ion-searchbar-border-radius);
+            background: var(--ion-searchbar-background) !important;
         }
     }
 
+    --core-search-box-background: var(--ion-background-color);
+    --core-search-box-border-color: var(--core-input-stroke);
+    --core-search-box-border-radius: var(--core-input-radius);
+    --core-search-box-color: var(--text-color);
+
+    --core-combobox-background: var(--core-input-background);
+    --core-combobox-color: var(--text-color);
+    --core-combobox-border-color: var(--core-input-stroke);
+    --core-combobox-border-width: var(--core-input-border-width);
+    --core-combobox-radius: var(--core-input-radius);
+    --core-combobox-box-shadow: none;
+
     ion-action-sheet {
         --button-color: var(--ion-text-color);
         --button-color-selected: var(--ion-text-color);
@@ -252,13 +280,6 @@
         --min-width: var(--a11y-min-target-size);
     }
 
-    --core-combobox-background: var(--ion-item-background);
-    --core-combobox-color: var(--gray-900);
-    --core-combobox-border-color: var(--stroke);
-    --core-combobox-border-width: 1px;
-    --core-combobox-radius: var(--medium-radius);
-    --core-combobox-box-shadow: none;
-
     --selected-item-color: var(--primary);
     --selected-item-border-width: 5px;
 

From 7a554bee29f9694c326314e1fb67d2b13c425e20 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 11 Feb 2022 12:23:00 +0100
Subject: [PATCH 0500/1008] MOBILE-3833 alerts: Increase max-width in alert and
 confirms

---
 src/addons/calendar/components/calendar/calendar.scss    | 4 +++-
 .../components/site-onboarding/site-onboarding.scss      | 4 +++-
 src/core/features/login/pages/site/site.scss             | 2 +-
 src/theme/theme.base.scss                                | 9 +++++++++
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/addons/calendar/components/calendar/calendar.scss b/src/addons/calendar/components/calendar/calendar.scss
index ab1d358e8..35cd3ccbd 100644
--- a/src/addons/calendar/components/calendar/calendar.scss
+++ b/src/addons/calendar/components/calendar/calendar.scss
@@ -1,3 +1,5 @@
+@import "~theme/globals";
+
 :host {
     --addon-calendar-blank-day-background-color: var(--light);
 
@@ -48,7 +50,7 @@
             }
         }
 
-        @media (min-width: 768px) {
+        @include media-breakpoint-up(md) {
             .addon-calendar-day-number {
                 text-align: start;
             }
diff --git a/src/core/features/login/components/site-onboarding/site-onboarding.scss b/src/core/features/login/components/site-onboarding/site-onboarding.scss
index 102760920..94fc77e9a 100644
--- a/src/core/features/login/components/site-onboarding/site-onboarding.scss
+++ b/src/core/features/login/components/site-onboarding/site-onboarding.scss
@@ -1,8 +1,10 @@
+@import "~theme/globals";
+
 :host {
     .core-login-onboarding-step {
         padding: 10px 20px;
         text-align: center;
-        @media (min-width: 768px) {
+        @include media-breakpoint-up(md) {
             max-width: 80%;
         }
         margin: 0 auto;
diff --git a/src/core/features/login/pages/site/site.scss b/src/core/features/login/pages/site/site.scss
index b11602d42..8c655c802 100644
--- a/src/core/features/login/pages/site/site.scss
+++ b/src/core/features/login/pages/site/site.scss
@@ -100,7 +100,7 @@
     }
 }
 
-@media (min-width: 768px) {
+@include media-breakpoint-up(md) {
     ion-content > * {
         max-width: 600px;
         margin: 0 auto;
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 0143bf8b3..9d0ebbe08 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -393,6 +393,15 @@ ion-alert.core-nohead {
 
 ion-alert {
     --border-radius: var(--huge-radius);
+
+    &.md, &.ios {
+        --max-width: 80%;
+
+        @include media-breakpoint-up(md) {
+            --max-width: 384px;
+        }
+    }
+
     .alert-wrapper {
         overflow: auto;
         border-radius: var(--border-radius) !important;

From bb28a899bd8d3868bc867fe9d372edb2a61b1ac3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 11 Feb 2022 11:22:58 +0100
Subject: [PATCH 0501/1008] MOBILE-3814 style: Reduce usage of theme globals if
 not needed

---
 .../mod/bigbluebuttonbn/components/index/index.scss       | 8 ++------
 src/core/components/iframe/iframe.scss                    | 7 ++++---
 src/core/features/mainmenu/pages/more/more.scss           | 2 --
 src/core/features/tag/components/list/list.scss           | 3 ++-
 src/core/features/user/pages/about/about.scss             | 5 ++---
 5 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/addons/mod/bigbluebuttonbn/components/index/index.scss b/src/addons/mod/bigbluebuttonbn/components/index/index.scss
index 66566a376..61fe68559 100644
--- a/src/addons/mod/bigbluebuttonbn/components/index/index.scss
+++ b/src/addons/mod/bigbluebuttonbn/components/index/index.scss
@@ -1,7 +1,3 @@
-@import "~theme/globals";
-
-:host {
-    ion-item > p[slot="end"] {
-        font-size: 14px;
-    }
+ion-item > p[slot="end"] {
+    font-size: 14px;
 }
diff --git a/src/core/components/iframe/iframe.scss b/src/core/components/iframe/iframe.scss
index a0707c17e..23c1cfd68 100644
--- a/src/core/components/iframe/iframe.scss
+++ b/src/core/components/iframe/iframe.scss
@@ -1,5 +1,3 @@
-@import "~theme/globals";
-
 :host {
     > div {
         max-width: 100%;
@@ -14,7 +12,10 @@
 
     .core-loading-container {
         position: absolute;
-        @include position(0, 0, 0, 0);
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
         display: table;
         height: 100%;
         width: 100%;
diff --git a/src/core/features/mainmenu/pages/more/more.scss b/src/core/features/mainmenu/pages/more/more.scss
index edb806fb5..32aeaef79 100644
--- a/src/core/features/mainmenu/pages/more/more.scss
+++ b/src/core/features/mainmenu/pages/more/more.scss
@@ -1,5 +1,3 @@
-@import "~theme/globals";
-
 ion-item {
 	--border-color: var(--core-more-item-border, var(--ion-border-color));
 
diff --git a/src/core/features/tag/components/list/list.scss b/src/core/features/tag/components/list/list.scss
index 27ddaad8b..1f8205861 100644
--- a/src/core/features/tag/components/list/list.scss
+++ b/src/core/features/tag/components/list/list.scss
@@ -5,6 +5,7 @@
 
     ion-badge {
         cursor: pointer;
-        @include margin-horizontal(4px, 4px);
+        margin-left: 4px;
+        margin-right: 4px;
     }
 }
diff --git a/src/core/features/user/pages/about/about.scss b/src/core/features/user/pages/about/about.scss
index b3e2bb2ec..1ed9a0b9f 100644
--- a/src/core/features/user/pages/about/about.scss
+++ b/src/core/features/user/pages/about/about.scss
@@ -1,5 +1,3 @@
-@import "~theme/globals";
-
 :host {
 
     .core-user-profile-maininfo::part(native) {
@@ -41,7 +39,8 @@
     .core-user-profile-interests {
         ion-badge {
             cursor: pointer;
-            @include margin-horizontal(3px, 3px);
+            margin-left: 4px;
+            margin-right: 4px;
         }
     }
 

From b5c0275a44061d1100a7979e66827d93577672d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 11 Feb 2022 12:23:21 +0100
Subject: [PATCH 0502/1008] MOBILE-3814 ux: Improve storage manager strings

---
 scripts/langindex.json                        | 17 +++--
 src/addons/storagemanager/lang.json           | 23 ++++---
 .../pages/course-storage/course-storage.html  |  3 +-
 .../pages/course-storage/course-storage.ts    | 17 +++--
 .../courses-storage/courses-storage.html      | 64 +++++++++----------
 .../courses-storage/courses-storage.scss      | 12 ++--
 .../pages/courses-storage/courses-storage.ts  | 11 ++--
 src/core/features/course/lang.json            |  2 -
 .../features/course/services/course-helper.ts |  2 +-
 .../course-list-item/course-list-item.ts      |  5 +-
 .../course-progress/course-progress.ts        |  5 +-
 src/core/features/settings/lang.json          |  4 --
 .../pages/space-usage/space-usage.html        | 14 ++--
 .../settings/pages/space-usage/space-usage.ts | 12 ----
 .../settings/services/settings-helper.ts      | 11 ++--
 src/core/services/utils/dom.ts                | 35 +++++++---
 src/theme/theme.base.scss                     |  5 +-
 src/theme/theme.dark.scss                     |  1 +
 18 files changed, 129 insertions(+), 114 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index c999b7a30..f70a5b11c 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1104,14 +1104,19 @@
   "addon.report_insights.notapplicable": "analytics",
   "addon.report_insights.notuseful": "analytics",
   "addon.report_insights.useful": "analytics",
+  "addon.storagemanager.alldata": "tool_wp",
+  "addon.storagemanager.confirmdeleteallsitedata": "local_moodlemobileapp",
+  "addon.storagemanager.confirmdeletecourses": "local_moodlemobileapp",
+  "addon.storagemanager.confirmdeletedatafrom": "local_moodlemobileapp",
   "addon.storagemanager.coursedownloads": "local_moodlemobileapp",
   "addon.storagemanager.courseinfo": "local_moodlemobileapp",
-  "addon.storagemanager.coursesspaceusage": "local_moodlemobileapp",
-  "addon.storagemanager.deletecourse": "local_moodlemobileapp",
+  "addon.storagemanager.deleteallsitedata": "local_moodlemobileapp",
+  "addon.storagemanager.deleteallsitedatainfo": "local_moodlemobileapp",
   "addon.storagemanager.deletecourses": "local_moodlemobileapp",
   "addon.storagemanager.deletedata": "local_moodlemobileapp",
   "addon.storagemanager.deletedatafrom": "local_moodlemobileapp",
   "addon.storagemanager.downloadedcourses": "local_moodlemobileapp",
+  "addon.storagemanager.errordeletedownloadeddata": "local_moodlemobileapp",
   "addon.storagemanager.managedownloads": "local_moodlemobileapp",
   "addon.storagemanager.totaldownloads": "local_moodlemobileapp",
   "addon.storagemanager.totalspaceusage": "local_moodlemobileapp",
@@ -1531,8 +1536,6 @@
   "core.course.completion_setby:manual:done": "course",
   "core.course.completion_setby:manual:markdone": "course",
   "core.course.completionrequirements": "course",
-  "core.course.confirmdeletemodulefiles": "local_moodlemobileapp",
-  "core.course.confirmdeletestoreddata": "local_moodlemobileapp",
   "core.course.confirmdownload": "local_moodlemobileapp",
   "core.course.confirmdownloadunknownsize": "local_moodlemobileapp",
   "core.course.confirmdownloadzerosize": "local_moodlemobileapp",
@@ -2161,8 +2164,6 @@
   "core.settings.currentlanguage": "moodle",
   "core.settings.debugdisplay": "admin",
   "core.settings.debugdisplaydescription": "local_moodlemobileapp",
-  "core.settings.deletesitefiles": "local_moodlemobileapp",
-  "core.settings.deletesitefilestitle": "local_moodlemobileapp",
   "core.settings.developeroptions": "local_moodlemobileapp",
   "core.settings.deviceinfo": "local_moodlemobileapp",
   "core.settings.deviceos": "local_moodlemobileapp",
@@ -2178,7 +2179,6 @@
   "core.settings.enablerichtexteditordescription": "local_moodlemobileapp",
   "core.settings.enablesyncwifi": "local_moodlemobileapp",
   "core.settings.entriesincache": "local_moodlemobileapp",
-  "core.settings.errordeletesitefiles": "local_moodlemobileapp",
   "core.settings.errorsyncsite": "local_moodlemobileapp",
   "core.settings.estimatedfreespace": "local_moodlemobileapp",
   "core.settings.filesystemroot": "local_moodlemobileapp",
@@ -2215,7 +2215,6 @@
   "core.settings.siteplugins": "local_moodlemobileapp",
   "core.settings.sites": "moodle",
   "core.settings.spaceusage": "local_moodlemobileapp",
-  "core.settings.spaceusagehelp": "local_moodlemobileapp",
   "core.settings.synchronization": "local_moodlemobileapp",
   "core.settings.synchronizenow": "local_moodlemobileapp",
   "core.settings.synchronizenowhelp": "local_moodlemobileapp",
@@ -2339,8 +2338,8 @@
   "core.user.webpage": "moodle",
   "core.userdeleted": "moodle",
   "core.userdetails": "moodle",
-  "core.usernotfullysetup": "error",
   "core.usernologin": "local_moodlemobileapp",
+  "core.usernotfullysetup": "error",
   "core.users": "moodle",
   "core.usersuspended": "tool_reportbuilder",
   "core.view": "moodle",
diff --git a/src/addons/storagemanager/lang.json b/src/addons/storagemanager/lang.json
index 1641c3b96..84988fe0d 100644
--- a/src/addons/storagemanager/lang.json
+++ b/src/addons/storagemanager/lang.json
@@ -1,13 +1,18 @@
 {
-    "deletedata": "Delete offline data",
-    "deletecourse": "Delete offline data from this course",
-    "deletecourses": "Delete offline data from all courses",
-    "deletedatafrom": "Delete offline data from {{name}}",
-    "courseinfo": "Download course content to work offline. Your activity will sync automatically when your device is back online.",
-    "managedownloads": "Manage downloads",
+    "alldata": "All data",
+    "confirmdeleteallsitedata": "Delete all site downloaded data?",
+    "confirmdeletecourses": "Delete downloaded data from all courses?",
+    "confirmdeletedatafrom": "Delete all downloaded data from '{{name}}'?",
     "coursedownloads": "Course downloads",
+    "courseinfo": "Download course content to work offline. Your activity will sync automatically when your device is back online.",
+    "deleteallsitedata": "Delete all site downloaded data",
+    "deleteallsitedatainfo": "This will delete all downloaded data from '{{name}}', including all downloaded courses and data that allows you to work offline.",
+    "deletecourses": "Delete downloaded data from all courses",
+    "deletedata": "Delete downloaded data",
+    "deletedatafrom": "Delete all downloaded data from '{{name}}'",
+    "downloadedcourses": "Downloaded courses",
+    "errordeletedownloadeddata": "Error deleting downloaded data.",
+    "managedownloads": "Manage downloads",
     "totaldownloads": "Total downloads",
-    "totalspaceusage": "Total space usage",
-    "coursesspaceusage": "Courses space usage",
-    "downloadedcourses": "Downloaded courses"
+    "totalspaceusage": "Total space used"
 }
diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.html b/src/addons/storagemanager/pages/course-storage/course-storage.html
index 07054abe7..bd058183d 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.html
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.html
@@ -20,7 +20,8 @@
                         <ion-badge color="light">{{ totalSize | coreBytesToSize }}</ion-badge>
                     </ion-label>
                     <ion-button slot="end" (click)="deleteForCourse()" [disabled]="totalSize == 0" color="danger" fill="outline">
-                        <ion-icon name="fas-trash" slot="icon-only" [attr.aria-label]="'addon.storagemanager.deletecourse' | translate">
+                        <ion-icon name="fas-trash" slot="icon-only" [attr.aria-label]="'addon.storagemanager.deletedatafrom' | translate:
+                        { name: title }">
                         </ion-icon>
                     </ion-button>
                 </ion-item>
diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.ts b/src/addons/storagemanager/pages/course-storage/course-storage.ts
index fdfef8253..3dc5ae558 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.ts
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.ts
@@ -282,7 +282,10 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
      */
     async deleteForCourse(): Promise<void> {
         try {
-            await CoreDomUtils.showDeleteConfirm('core.course.confirmdeletestoreddata');
+            await CoreDomUtils.showDeleteConfirm(
+                'addon.storagemanager.confirmdeletedatafrom',
+                { name: this.title },
+            );
         } catch (error) {
             if (!CoreDomUtils.isCanceledError(error)) {
                 throw error;
@@ -312,7 +315,10 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
      */
     async deleteForSection(section: AddonStorageManagerCourseSection): Promise<void> {
         try {
-            await CoreDomUtils.showDeleteConfirm('core.course.confirmdeletestoreddata');
+            await CoreDomUtils.showDeleteConfirm(
+                'addon.storagemanager.confirmdeletedatafrom',
+                { name: section.name },
+            );
         } catch (error) {
             if (!CoreDomUtils.isCanceledError(error)) {
                 throw error;
@@ -343,7 +349,10 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
         }
 
         try {
-            await CoreDomUtils.showDeleteConfirm('core.course.confirmdeletestoreddata');
+            await CoreDomUtils.showDeleteConfirm(
+                'addon.storagemanager.confirmdeletedatafrom',
+                { name: module.name },
+            );
         } catch (error) {
             if (!CoreDomUtils.isCanceledError(error)) {
                 throw error;
@@ -363,7 +372,7 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
      * @return Promise<void> Once deleting has finished
      */
     protected async deleteModules(modules: AddonStorageManagerModule[], section?: AddonStorageManagerCourseSection): Promise<void> {
-        const modal = await CoreDomUtils.showModalLoading();
+        const modal = await CoreDomUtils.showModalLoading('core.deleting', true);
 
         const promises: Promise<void>[] = [];
         modules.forEach((module) => {
diff --git a/src/addons/storagemanager/pages/courses-storage/courses-storage.html b/src/addons/storagemanager/pages/courses-storage/courses-storage.html
index 00d3893a6..cbd478a0d 100644
--- a/src/addons/storagemanager/pages/courses-storage/courses-storage.html
+++ b/src/addons/storagemanager/pages/courses-storage/courses-storage.html
@@ -10,25 +10,30 @@
 </ion-header>
 <ion-content>
     <core-loading [hideUntil]="loaded">
-
+        <div class="ion-padding-horizontal ion-text-wrap" *ngIf="downloadedCourses.length">
+            <h2>{{ 'addon.storagemanager.alldata' | translate }}</h2>
+        </div>
         <ion-card>
-            <ion-item class="ion-text-wrap" *ngIf="spaceUsage">
+            <ion-item class="ion-text-wrap total" *ngIf="spaceUsage">
                 <ion-label>
                     <p class="item-heading ion-text-wrap">{{ 'addon.storagemanager.totalspaceusage' | translate }}</p>
                     <ion-badge color="light" *ngIf="spaceUsage.spaceUsage">{{ spaceUsage.spaceUsage | coreBytesToSize }}</ion-badge>
-                    <p>
-                        {{ 'core.settings.spaceusagehelp' | translate }}
-                    </p>
                 </ion-label>
                 <ion-button fill="clear" color="danger" slot="end" (click)="deleteSiteStorage($event)"
                     [hidden]="spaceUsage.spaceUsage! + spaceUsage.cacheEntries! <= 0"
-                    [attr.aria-label]="'core.settings.deletesitefilestitle' | translate" fill="outline">
+                    [attr.aria-label]="'addon.storagemanager.deleteallsitedata' | translate" fill="outline">
                     <ion-icon name="fas-trash" slot="icon-only" aria-hidden="true"></ion-icon>
                 </ion-button>
             </ion-item>
-            <ion-item class="size ion-text-wrap">
+        </ion-card>
+
+        <div class="ion-padding-horizontal ion-text-wrap" *ngIf="downloadedCourses.length">
+            <h2>{{ 'addon.storagemanager.downloadedcourses' | translate }}</h2>
+        </div>
+        <ion-card>
+            <ion-item class="size courses ion-text-wrap" lines="full">
                 <ion-label>
-                    <h2 class="ion-text-wrap">{{ 'addon.storagemanager.coursesspaceusage' | translate }}</h2>
+                    <p class="item-heading">{{ 'addon.storagemanager.totalspaceusage' | translate }}</p>
                     <ion-badge color="light">{{ totalSize | coreBytesToSize }}</ion-badge>
                 </ion-label>
                 <ion-button slot="end" (click)="deleteCompletelyDownloadedCourses($event)"
@@ -37,33 +42,22 @@
                     </ion-icon>
                 </ion-button>
             </ion-item>
-        </ion-card>
-
-        <div class="ion-padding-horizontal ion-text-wrap" *ngIf="downloadedCourses.length">
-            <h2>{{ 'addon.storagemanager.downloadedcourses' | translate }}</h2>
-        </div>
-        <ion-card *ngIf="downloadedCourses.length">
-            <ion-card-content class="ion-no-padding">
-                <ion-list>
-                    <ion-item *ngFor="let course of downloadedCourses" class="course" (click)="openCourse(course.id, course.title)" button>
-                        <ion-label class="ion-text-wrap">
-                            <p class="item-heading">{{ course.title }}</p>
-                            <p class="item-heading item-heading-secondary" *ngIf="course.isDownloading">
-                                {{ 'core.downloading' | translate }}
-                            </p>
-                            <ion-badge color="light">
-                                {{ course.totalSize | coreBytesToSize }}
-                            </ion-badge>
-                        </ion-label>
-                        <ion-button slot="end" (click)="deleteCourse($event, course)" [disabled]="course.isDownloading" color="danger"
-                            fill="clear">
-                            <ion-icon name="fas-trash" slot="icon-only"
-                                [attr.aria-label]="'addon.storagemanager.deletedatafrom' | translate: { name: course.displayname }">
-                            </ion-icon>
-                        </ion-button>
-                    </ion-item>
-                </ion-list>
-            </ion-card-content>
+            <ion-item *ngFor="let course of downloadedCourses" class="course" (click)="openCourse(course.id, course.title)" button>
+                <ion-label class="ion-text-wrap">
+                    <p class="item-heading">{{ course.title }}</p>
+                    <p class="item-heading item-heading-secondary" *ngIf="course.isDownloading">
+                        {{ 'core.downloading' | translate }}
+                    </p>
+                    <ion-badge color="light">
+                        {{ course.totalSize | coreBytesToSize }}
+                    </ion-badge>
+                </ion-label>
+                <ion-button slot="end" (click)="deleteCourse($event, course)" [disabled]="course.isDownloading" color="danger" fill="clear">
+                    <ion-icon name="fas-trash" slot="icon-only" [attr.aria-label]="'addon.storagemanager.deletedatafrom' | translate:
+                            { name: course.title }">
+                    </ion-icon>
+                </ion-button>
+            </ion-item>
         </ion-card>
     </core-loading>
 </ion-content>
diff --git a/src/addons/storagemanager/pages/courses-storage/courses-storage.scss b/src/addons/storagemanager/pages/courses-storage/courses-storage.scss
index 18d5a6e54..854bb2af6 100644
--- a/src/addons/storagemanager/pages/courses-storage/courses-storage.scss
+++ b/src/addons/storagemanager/pages/courses-storage/courses-storage.scss
@@ -1,10 +1,6 @@
-@import "~theme/globals";
-
-:host {
-    ion-item.course {
-        .item-heading {
-            font-weight: bold;
-        }
+ion-item.courses,
+ion-item.total {
+    .item-heading {
+        font-weight: bold;
     }
-
 }
diff --git a/src/addons/storagemanager/pages/courses-storage/courses-storage.ts b/src/addons/storagemanager/pages/courses-storage/courses-storage.ts
index 0697c31aa..0f2e8a215 100644
--- a/src/addons/storagemanager/pages/courses-storage/courses-storage.ts
+++ b/src/addons/storagemanager/pages/courses-storage/courses-storage.ts
@@ -111,7 +111,7 @@ export class AddonStorageManagerCoursesStoragePage implements OnInit, OnDestroy
         event.stopPropagation();
 
         try {
-            await CoreDomUtils.showDeleteConfirm('core.course.confirmdeletestoreddata');
+            await CoreDomUtils.showDeleteConfirm('addon.storagemanager.confirmdeletecourses');
         } catch (error) {
             if (!CoreDomUtils.isCanceledError(error)) {
                 throw error;
@@ -120,7 +120,7 @@ export class AddonStorageManagerCoursesStoragePage implements OnInit, OnDestroy
             return;
         }
 
-        const modal = await CoreDomUtils.showModalLoading();
+        const modal = await CoreDomUtils.showModalLoading('core.deleting', true);
         const deletedCourseIds = this.completelyDownloadedCourses.map((course) => course.id);
 
         try {
@@ -145,7 +145,10 @@ export class AddonStorageManagerCoursesStoragePage implements OnInit, OnDestroy
         event.stopPropagation();
 
         try {
-            await CoreDomUtils.showDeleteConfirm('core.course.confirmdeletestoreddata');
+            await CoreDomUtils.showDeleteConfirm(
+                'addon.storagemanager.confirmdeletedatafrom',
+                { name: course.title },
+            );
         } catch (error) {
             if (!CoreDomUtils.isCanceledError(error)) {
                 throw error;
@@ -154,7 +157,7 @@ export class AddonStorageManagerCoursesStoragePage implements OnInit, OnDestroy
             return;
         }
 
-        const modal = await CoreDomUtils.showModalLoading();
+        const modal = await CoreDomUtils.showModalLoading('core.deleting', true);
 
         try {
             await CoreCourseHelper.deleteCourseFiles(course.id);
diff --git a/src/core/features/course/lang.json b/src/core/features/course/lang.json
index b3b0f24be..4fddbfd81 100644
--- a/src/core/features/course/lang.json
+++ b/src/core/features/course/lang.json
@@ -19,8 +19,6 @@
     "completion_setby:manual:done": "{{$a.activityname}} is marked by {{$a.setby}} as done. Press to undo.",
     "completion_setby:manual:markdone": "{{$a.activityname}} is marked by {{$a.setby}} as not done. Press to mark as done.",
     "completionrequirements": "Completion requirements for {{$a}}",
-    "confirmdeletemodulefiles": "Are you sure you want to delete these files?",
-    "confirmdeletestoreddata": "Are you sure you want to delete the stored data?",
     "confirmdownload": "You are about to download {{size}}.{{availableSpace}} Are you sure you want to continue?",
     "confirmdownloadunknownsize": "It was not possible to calculate the size of the download.{{availableSpace}} Are you sure you want to continue?",
     "confirmdownloadzerosize": "You are about to start downloading.{{availableSpace}} Are you sure you want to continue?",
diff --git a/src/core/features/course/services/course-helper.ts b/src/core/features/course/services/course-helper.ts
index 56dee5790..d0e16d0c2 100644
--- a/src/core/features/course/services/course-helper.ts
+++ b/src/core/features/course/services/course-helper.ts
@@ -499,7 +499,7 @@ export class CoreCourseHelperProvider {
 
         try {
 
-            await CoreDomUtils.showDeleteConfirm('core.course.confirmdeletestoreddata');
+            await CoreDomUtils.showDeleteConfirm('addon.storagemanager.confirmdeletedatafrom', { name: module.name });
 
             modal = await CoreDomUtils.showModalLoading();
 
diff --git a/src/core/features/courses/components/course-list-item/course-list-item.ts b/src/core/features/courses/components/course-list-item/course-list-item.ts
index 5f8043b2c..3568f83d4 100644
--- a/src/core/features/courses/components/course-list-item/course-list-item.ts
+++ b/src/core/features/courses/components/course-list-item/course-list-item.ts
@@ -259,7 +259,10 @@ export class CoreCoursesCourseListItemComponent implements OnInit, OnDestroy, On
      */
     async deleteCourseStoredData(): Promise<void> {
         try {
-            await CoreDomUtils.showDeleteConfirm('core.course.confirmdeletestoreddata');
+            await CoreDomUtils.showDeleteConfirm(
+                'addon.storagemanager.confirmdeletedatafrom',
+                { name: this.course.displayname || this.course.fullname },
+            );
         } catch (error) {
             if (!CoreDomUtils.isCanceledError(error)) {
                 throw error;
diff --git a/src/core/features/courses/components/course-progress/course-progress.ts b/src/core/features/courses/components/course-progress/course-progress.ts
index 9d295b906..d719ab2dc 100644
--- a/src/core/features/courses/components/course-progress/course-progress.ts
+++ b/src/core/features/courses/components/course-progress/course-progress.ts
@@ -175,7 +175,10 @@ export class CoreCoursesCourseProgressComponent implements OnInit, OnDestroy, On
      */
     async deleteCourse(): Promise<void> {
         try {
-            await CoreDomUtils.showDeleteConfirm('core.course.confirmdeletestoreddata');
+            await CoreDomUtils.showDeleteConfirm(
+                'addon.storagemanager.confirmdeletedatafrom',
+                { name: this.course.displayname || this.course.fullname },
+            );
         } catch (error) {
             if (!CoreDomUtils.isCanceledError(error)) {
                 throw error;
diff --git a/src/core/features/settings/lang.json b/src/core/features/settings/lang.json
index a7fe5e31f..92dd83bda 100644
--- a/src/core/features/settings/lang.json
+++ b/src/core/features/settings/lang.json
@@ -21,8 +21,6 @@
     "currentlanguage": "Current language",
     "debugdisplay": "Display debug messages",
     "debugdisplaydescription": "If enabled, error modals will display more data about the error if possible.",
-    "deletesitefiles": "Are you sure that you want to delete the downloaded files and cached data from the site '{{sitename}}'? You won't be able to use the app in offline mode.",
-    "deletesitefilestitle": "Delete site files",
     "developeroptions": "Developer options",
     "deviceinfo": "Device info",
     "deviceos": "Device OS",
@@ -38,7 +36,6 @@
     "enablerichtexteditordescription": "If enabled, a text editor will be available when entering content.",
     "enablesyncwifi": "Allow sync only when on Wi-Fi",
     "entriesincache": "{{$a}} entries in cache",
-    "errordeletesitefiles": "Error deleting site files.",
     "errorsyncsite": "Error synchronising site data. Please check your Internet connection and try again.",
     "estimatedfreespace": "Estimated free space",
     "filesystemroot": "File system root",
@@ -75,7 +72,6 @@
     "siteplugins": "Site plugins",
     "sites": "Sites",
     "spaceusage": "Space usage",
-    "spaceusagehelp": "Deleting the stored information of the site will remove all the site offline data. This information allows you to use the app when offline. ",
     "synchronization": "Synchronisation",
     "synchronizenow": "Synchronise now",
     "synchronizenowhelp": "Synchronising a site will send pending changes and all offline activity stored in the device and will synchronise some data like messages and notifications.",
diff --git a/src/core/features/settings/pages/space-usage/space-usage.html b/src/core/features/settings/pages/space-usage/space-usage.html
index 51bd07d89..57586ef86 100644
--- a/src/core/features/settings/pages/space-usage/space-usage.html
+++ b/src/core/features/settings/pages/space-usage/space-usage.html
@@ -8,9 +8,6 @@
         </ion-title>
         <ion-buttons slot="end">
             <core-navbar-buttons>
-                <ion-button (click)="showInfo()" [attr.aria-label]="'core.info' | translate">
-                    <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
-                </ion-button>
             </core-navbar-buttons>
         </ion-buttons>
     </ion-toolbar>
@@ -28,14 +25,13 @@
                     </p>
                     <p class="ion-text-wrap">{{ site.fullName }}</p>
                     <p>{{ site.siteUrlWithoutProtocol }}</p>
+                    <ion-badge color="light" *ngIf="site.spaceUsage !== undefined">{{ site.spaceUsage | coreBytesToSize }}</ion-badge>
                 </ion-label>
-                <p *ngIf="site.spaceUsage !== undefined" slot="end">
-                    {{ site.spaceUsage | coreBytesToSize }}
-                </p>
                 <ion-button fill="clear" color="danger" slot="end" (click)="deleteSiteStorage(site)"
-                    [hidden]="site.spaceUsage! + site.cacheEntries! <= 0"
-                    [attr.aria-label]="'core.settings.deletesitefilestitle' | translate">
-                    <ion-icon name="fas-trash" slot="icon-only" aria-hidden="true"></ion-icon>
+                    [hidden]="site.spaceUsage! + site.cacheEntries! <= 0">
+                    <ion-icon name="fas-trash" slot="icon-only"
+                        [attr.aria-label]="'addon.storagemanager.deletedatafrom' | translate: { name: site.siteName }">
+                    </ion-icon>
                 </ion-button>
             </ion-item>
             <ion-item-divider>
diff --git a/src/core/features/settings/pages/space-usage/space-usage.ts b/src/core/features/settings/pages/space-usage/space-usage.ts
index 5f0657705..e048d0a24 100644
--- a/src/core/features/settings/pages/space-usage/space-usage.ts
+++ b/src/core/features/settings/pages/space-usage/space-usage.ts
@@ -16,8 +16,6 @@ import { Component, OnDestroy, OnInit } from '@angular/core';
 import { IonRefresher } from '@ionic/angular';
 
 import { CoreSiteBasicInfo, CoreSites } from '@services/sites';
-import { CoreDomUtils } from '@services/utils/dom';
-import { Translate } from '@singletons';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 
 import { CoreSettingsHelper, CoreSiteSpaceUsage } from '../../services/settings-helper';
@@ -129,16 +127,6 @@ export class CoreSettingsSpaceUsagePage implements OnInit, OnDestroy {
         }
     }
 
-    /**
-     * Show information about space usage actions.
-     */
-    showInfo(): void {
-        CoreDomUtils.showAlert(
-            Translate.instant('core.help'),
-            Translate.instant('core.settings.spaceusagehelp'),
-        );
-    }
-
     /**
      * Page destroyed.
      */
diff --git a/src/core/features/settings/services/settings-helper.ts b/src/core/features/settings/services/settings-helper.ts
index 4dfc9eb3e..d8b845583 100644
--- a/src/core/features/settings/services/settings-helper.ts
+++ b/src/core/features/settings/services/settings-helper.ts
@@ -116,10 +116,13 @@ export class CoreSettingsHelperProvider {
 
         siteName = await CoreFilter.formatText(siteName, { clean: true, singleLine: true, filter: false }, [], siteId);
 
-        const title = Translate.instant('core.settings.deletesitefilestitle');
-        const message = Translate.instant('core.settings.deletesitefiles', { sitename: siteName });
+        const title = Translate.instant('addon.storagemanager.confirmdeleteallsitedata');
 
-        await CoreDomUtils.showConfirm(message, title, Translate.instant('core.delete'));
+        await CoreDomUtils.showDeleteConfirm(
+            'addon.storagemanager.deleteallsitedatainfo',
+            { name: siteName },
+            { header:  title },
+        );
 
         const site = await CoreSites.getSite(siteId);
 
@@ -143,7 +146,7 @@ export class CoreSettingsHelperProvider {
                 siteInfo.spaceUsage = 0;
             } else {
                 // Error, recalculate the site usage.
-                CoreDomUtils.showErrorModal('core.settings.errordeletesitefiles', true);
+                CoreDomUtils.showErrorModal('addon.storagemanager.errordeletedownloadeddata', true);
 
                 siteInfo.spaceUsage = await site.getSpaceUsage();
             }
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index 0dbd3e638..9d2076256 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -1269,15 +1269,34 @@ export class CoreDomUtilsProvider {
     showDeleteConfirm(
         translateMessage: string = 'core.areyousure',
         translateArgs: Record<string, unknown> = {},
-        options?: AlertOptions,
+        options: AlertOptions = {},
     ): Promise<void> {
-        return this.showConfirm(
-            Translate.instant(translateMessage, translateArgs),
-            undefined,
-            Translate.instant('core.delete'),
-            undefined,
-            options,
-        );
+        return new Promise((resolve, reject): void => {
+            options.message = Translate.instant(translateMessage, translateArgs);
+
+            options.buttons = [
+                {
+                    text: Translate.instant('core.cancel'),
+                    role: 'cancel',
+                    handler: () => {
+                        reject(new CoreCanceledError(''));
+                    },
+                },
+                {
+                    text: Translate.instant('core.delete'),
+                    role: 'destructive',
+                    handler: () => {
+                        resolve();
+                    },
+                },
+            ];
+
+            if (!options.header) {
+                options.cssClass = (options.cssClass || '') + ' core-nohead';
+            }
+
+            this.showAlertWithOptions(options, 0);
+        });
     }
 
     /**
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index eedc3f535..9b279abeb 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -414,9 +414,10 @@ ion-alert {
         overflow: auto;
         border-radius: var(--border-radius) !important;
 
-        button.alert-button {
-            color: var(--primary);
+        button.alert-button.alert-button-role-destructive {
+            color: var(--danger);
         }
+
     }
 
     .alert-message {
diff --git a/src/theme/theme.dark.scss b/src/theme/theme.dark.scss
index 9f06651c1..206f6e2d4 100644
--- a/src/theme/theme.dark.scss
+++ b/src/theme/theme.dark.scss
@@ -69,6 +69,7 @@
 
     --core-header-toolbar-background:   var(--gray-900);
     --core-header-toolbar-color:        var(--white);
+    --core-header-toolbar-border-color: var(--stroke);
 
     --core-tabs-background: var(--gray-800);
     --core-tab-background: var(--core-tabs-background);

From 1c9b19668267bf675a092b66d536e2188d35e8cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 11 Feb 2022 13:28:12 +0100
Subject: [PATCH 0503/1008] MOBILE-3814 module: Improve module card additional
 info

---
 .../activitymodules/addon-block-activitymodules.html      | 2 +-
 .../addon-block-recentlyaccesseditems.html                | 3 +--
 .../pages/coursecompetencies/coursecompetencies.html      | 4 ++--
 src/core/directives/collapsible-header.ts                 | 1 +
 .../course/components/module/core-course-module.html      | 6 +++---
 src/core/features/course/components/module/module.scss    | 5 +++++
 src/core/features/course/pages/index/index.scss           | 8 ++++++--
 src/theme/globals.variables.scss                          | 2 +-
 8 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html b/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html
index 50e95546f..44810d334 100644
--- a/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html
+++ b/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html
@@ -4,7 +4,7 @@
     </ion-label>
 </ion-item-divider>
 <core-loading [hideUntil]="loaded" [fullscreen]="false">
-    <ion-item class="ion-text-wrap item-media" *ngFor="let entry of entries" detail="true" button (click)="gotoCoureListModType(entry)">
+    <ion-item class="ion-text-wrap" *ngFor="let entry of entries" detail="true" button (click)="gotoCoureListModType(entry)">
         <core-mod-icon slot="start" [modicon]="entry.icon" [modname]="entry.modName" [showAlt]="false">
         </core-mod-icon>
         <ion-label>{{ entry.name }}</ion-label>
diff --git a/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html b/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html
index 14298293a..6d9bd7f36 100644
--- a/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html
+++ b/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html
@@ -14,8 +14,7 @@
             <div class="safe-area-pseudo-padding-start"></div>
             <div *ngFor="let item of items" class="core-horizontal-scroll-item">
                 <ion-card>
-                    <ion-item class="core-course-module-handler item-media ion-text-wrap" detail="false" (click)="action($event, item)"
-                        button>
+                    <ion-item class="core-course-module-handler ion-text-wrap" detail="false" (click)="action($event, item)" button>
                         <core-mod-icon slot="start" *ngIf="item.iconUrl" [modicon]="item.iconUrl" [modname]="item.modname"
                             [componentId]="item.cmid" [showAlt]="false">
                         </core-mod-icon>
diff --git a/src/addons/competency/pages/coursecompetencies/coursecompetencies.html b/src/addons/competency/pages/coursecompetencies/coursecompetencies.html
index d8f6cb615..fd6746901 100644
--- a/src/addons/competency/pages/coursecompetencies/coursecompetencies.html
+++ b/src/addons/competency/pages/coursecompetencies/coursecompetencies.html
@@ -114,8 +114,8 @@
                             <p *ngIf="competency.coursemodules.length == 0">
                                 {{ 'addon.competency.noactivities' | translate }}
                             </p>
-                            <ion-item class="ion-text-wrap core-course-module-handler item-media" [attr.aria-label]="activity.name"
-                                core-link *ngFor="let activity of competency.coursemodules" [href]="activity.url" capture="true">
+                            <ion-item class="ion-text-wrap core-course-module-handler" [attr.aria-label]="activity.name" core-link
+                                *ngFor="let activity of competency.coursemodules" [href]="activity.url" capture="true">
                                 <core-mod-icon slot="start" [modicon]="activity.iconurl" [showAlt]="false" *ngIf="activity.iconurl">
                                 </core-mod-icon>
                                 <ion-label>
diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts
index 1981fd416..b80be74e7 100644
--- a/src/core/directives/collapsible-header.ts
+++ b/src/core/directives/collapsible-header.ts
@@ -211,6 +211,7 @@ export class CoreCollapsibleHeaderDirective implements OnDestroy {
             parseInt(getComputedStyle(this.contentH1.parentElement).marginTop || '0', 10)) + 'px',
         );
         this.contentH1.style.setProperty('position', 'absolute');
+        this.contentH1.parentElement.style.setProperty('position', 'relative');
 
         this.setupContent();
     }
diff --git a/src/core/features/course/components/module/core-course-module.html b/src/core/features/course/components/module/core-course-module.html
index e20fbae5c..e1048efe5 100644
--- a/src/core/features/course/components/module/core-course-module.html
+++ b/src/core/features/course/components/module/core-course-module.html
@@ -3,7 +3,6 @@
         <ion-item id="core-course-module-{{module.id}}" detail="false"
             class="ion-text-wrap core-course-module-handler core-module-main-item {{module.handlerData.class}}"
             (click)="moduleClicked($event)" [attr.aria-label]="module.handlerData.a11yTitle" [ngClass]="{
-                'item-media': module.handlerData.icon,
                 'item-dimmed': module.visible === 0 || module.uservisible === false
             }" [button]="module.handlerData.action && module.uservisible">
 
@@ -16,6 +15,8 @@
                     <core-format-text [text]="module.handlerData.title" contextLevel="module" [contextInstanceId]="module.id"
                         [courseId]="module.course" [attr.aria-label]="module.handlerData.a11yTitle + ', ' + modNameTranslated">
                     </core-format-text>
+                    <ion-icon name="fas-lock" *ngIf="module.visible === 0 || module.uservisible === false"
+                        [attr.aria-label]="'core.restricted' | translate"></ion-icon>
                 </p>
 
                 <div class="core-module-additional-info">
@@ -31,7 +32,7 @@
                     </ion-chip>
 
                     <!-- Hidden badges -->
-                    <ion-badge color="warning" *ngIf="module.visible === 0 && (!section || section.visible)">
+                    <ion-badge color="warning" *ngIf="module.visible === 0">
                         {{ 'core.course.hiddenfromstudents' | translate }}
                     </ion-badge>
                     <ion-badge color="warning" *ngIf="module.visible !== 0 && module.isStealth">
@@ -60,7 +61,6 @@
         </ion-item>
         <ion-item *ngIf="hasInfo" id="core-course-module-{{module.id}}-info" detail="false"
             class="ion-text-wrap core-course-module-handler core-course-module-info {{module.handlerData.class}}" [ngClass]="{
-                'item-media': module.handlerData.icon,
                 'item-dimmed': module.visible === 0 || module.uservisible === false
             }">
             <ion-label collapsible-item>
diff --git a/src/core/features/course/components/module/module.scss b/src/core/features/course/components/module/module.scss
index f398ee1fa..da557da41 100644
--- a/src/core/features/course/components/module/module.scss
+++ b/src/core/features/course/components/module/module.scss
@@ -11,6 +11,10 @@
     ion-item.core-module-main-item {
         --min-height: 52px;
 
+        .core-module-title .item-heading ion-icon {
+            @include margin-horizontal(8px, null);
+        }
+
         .core-module-buttons,
         .buttons.core-module-buttons {
             margin: 0;
@@ -39,6 +43,7 @@
         .core-module-additional-info {
             display: flex;
             align-items: center;
+            flex-wrap: wrap;
         }
     }
 
diff --git a/src/core/features/course/pages/index/index.scss b/src/core/features/course/pages/index/index.scss
index bd9456dc2..63efe0c1f 100644
--- a/src/core/features/course/pages/index/index.scss
+++ b/src/core/features/course/pages/index/index.scss
@@ -1,6 +1,10 @@
 @import '~theme/globals.scss';
 
 :host {
+    .core-format-progress-list {
+        width: 100%;
+    }
+
     .core-course-thumb {
         height: var(--core-courseimage-on-course-size);
         min-height: var(--core-courseimage-on-course-size);
@@ -9,9 +13,9 @@
         --border-radius: var(--core-courseimage-radius);
     }
 
-    @if ($core-show-courseimage-on-course) {
+    @if ($core-hide-courseimage-on-course) {
         .core-course-thumb {
-            display: block;
+            display: none;
         }
     }
 
diff --git a/src/theme/globals.variables.scss b/src/theme/globals.variables.scss
index 21fe2d0dd..5ab1d48fb 100644
--- a/src/theme/globals.variables.scss
+++ b/src/theme/globals.variables.scss
@@ -90,7 +90,7 @@ $core-dashboard-logo: false !default;
 $core-always-show-main-menu: false !default;
 $core-format-text-never-shorten: false !default;
 
-$core-show-courseimage-on-course: false !default;
+$core-hide-courseimage-on-course: false !default;
 $core-hide-progress-on-course: false !default;
 $core-hide-progress-on-section-selector: false !default;
 

From bca31380d03f8c0856c4a452dc8481c604681a23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 11 Feb 2022 13:58:22 +0100
Subject: [PATCH 0504/1008] MOBILE-3814 styles: Renew style of warning cards

---
 src/core/features/login/login.scss            |  5 -----
 .../login/pages/reconnect/reconnect.html      |  4 +++-
 src/theme/components/format-text.scss         |  1 +
 src/theme/theme.base.scss                     | 21 +++++++++++++++----
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/core/features/login/login.scss b/src/core/features/login/login.scss
index 053125e44..6aeb84b40 100644
--- a/src/core/features/login/login.scss
+++ b/src/core/features/login/login.scss
@@ -77,11 +77,6 @@
         }
     }
 
-    .core-login-reconnect-warning ion-item {
-        font-size: 0.9em;
-        --background: var(--core-login-input-background);
-    }
-
     @if ($core-fixed-url) {
         .core-sitename, .core-siteurl {
             display: none;
diff --git a/src/core/features/login/pages/reconnect/reconnect.html b/src/core/features/login/pages/reconnect/reconnect.html
index e365d0e05..6d7ae2d7a 100644
--- a/src/core/features/login/pages/reconnect/reconnect.html
+++ b/src/core/features/login/pages/reconnect/reconnect.html
@@ -29,7 +29,9 @@
         <ion-card *ngIf="!isLoggedOut" class="core-danger-card core-login-reconnect-warning">
             <ion-item>
                 <ion-icon name="fas-exclamation-circle" slot="start" aria-hidden="true"></ion-icon>
-                <ion-label color="danger">{{ 'core.login.reconnectdescription' | translate }}</ion-label>
+                <ion-label>
+                    <p>{{ 'core.login.reconnectdescription' | translate }}</p>
+                </ion-label>
             </ion-item>
         </ion-card>
     </div>
diff --git a/src/theme/components/format-text.scss b/src/theme/components/format-text.scss
index 1cfaad8c7..1aa0b8c1e 100644
--- a/src/theme/components/format-text.scss
+++ b/src/theme/components/format-text.scss
@@ -543,6 +543,7 @@ core-rich-text-editor .core-rte-editor {
         padding: .75rem 1.25rem;
         margin-bottom: 1rem;
         border: 0 solid transparent;
+        border-radius: .5rem;
     }
 
     // Headings for larger alerts
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 9b279abeb..4ff77ec71 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -674,23 +674,37 @@ body.core-iframe-fullscreen ion-router-outlet {
 
     // Message cards.
     ion-card.core-#{$color-name}-card {
-        --color-base: var(--ion-color-#{$color-name});
+        --color-tint: var(--ion-color-#{$color-name}-tint);
+        --color-shade: var(--ion-color-#{$color-name}-shade);
+        --border-width: 0;
 
-        border-bottom: 3px solid var(--color-base);
+        --border-color: var(--color-tint);
+        --background: var(--color-tint);
+        --color: var(--color-shade);
 
         ion-item {
+            --background: var(--color-tint);
+            --color: var(--color-shade);
             --inner-border-width: 0px;
+            --border-width: 0px;
+
+            ion-label, ion-label > p {
+                --color: var(--color-shade);
+            }
         }
+
         ion-label {
             white-space: normal !important;
         }
         ion-icon {
-            color: var(--color-base);
+            color: var(--color-shade);
+            @include margin-horizontal(null, 16px);
         }
     }
 
     .item.core-#{$color-name}-item {
         --color-base: var(--ion-color-#{$color-name});
+        --color-shade: var(--ion-color-#{$color-name}-shade);
 
         --border-width: 0 0 3px 0;
         --border-color: var(--color-base);
@@ -1261,7 +1275,6 @@ ion-item.item-input ion-input.has-focus {
 
 ion-item-divider.item,
 ion-item.item.divider {
-    --inner-padding-end: 8px;
     min-height: var(--min-height);
     border-bottom-width: var(--item-divider-border-width);
     --border-width: var(--item-divider-border-width);

From a68430bd1ebca5df02cb485a07291d4d101ec219 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 11 Feb 2022 14:51:28 +0100
Subject: [PATCH 0505/1008] MOBILE-3814 bbb: Use new BBB icon

---
 src/addons/mod/bigbluebuttonbn/services/handlers/module.ts | 2 +-
 src/assets/img/mod/bigbluebuttonbn.svg                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/addons/mod/bigbluebuttonbn/services/handlers/module.ts b/src/addons/mod/bigbluebuttonbn/services/handlers/module.ts
index ee71b6308..2f543185a 100644
--- a/src/addons/mod/bigbluebuttonbn/services/handlers/module.ts
+++ b/src/addons/mod/bigbluebuttonbn/services/handlers/module.ts
@@ -45,7 +45,7 @@ export class AddonModBBBModuleHandlerService extends CoreModuleHandlerBase imple
         [CoreConstants.FEATURE_GRADE_OUTCOMES]: true,
         [CoreConstants.FEATURE_BACKUP_MOODLE2]: true,
         [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true,
-        [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_COMMUNICATION,
+        [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_OTHER,
     };
 
     /**
diff --git a/src/assets/img/mod/bigbluebuttonbn.svg b/src/assets/img/mod/bigbluebuttonbn.svg
index 57fcc9ecf..e5e0e91a6 100644
--- a/src/assets/img/mod/bigbluebuttonbn.svg
+++ b/src/assets/img/mod/bigbluebuttonbn.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" style="fill:none" height="74" width="74"><path style="clip-rule:evenodd;fill:#000;fill-rule:evenodd;stroke-width:4.9333334" d="M69.067 37c0 17.71-14.357 32.067-32.067 32.067S4.933 54.71 4.933 37 19.29 4.933 37 4.933 69.067 19.29 69.067 37zM74 37c0 20.434-16.566 37-37 37C16.565 74 0 57.434 0 37 0 16.565 16.565 0 37 0c20.434 0 37 16.565 37 37Zm-49.333 8.617V19.733c1.836 0 3.405.899 4.704 2.695 1.3 1.797 1.95 3.96 1.95 6.488v16.701c0 1.33.665 1.996 1.995 1.996H43.63c1.33 0 1.996-.665 1.996-1.996v-7.918c0-1.287-.665-1.952-1.996-1.997h-1.996c-2.573-.09-4.747-.76-6.52-2.015-1.775-1.254-2.662-2.8-2.662-4.638H43.63c2.396 0 4.435.843 6.122 2.528 1.685 1.686 2.529 3.726 2.529 6.122v7.918c0 2.395-.844 4.436-2.53 6.121-1.686 1.687-3.725 2.529-6.12 2.529H33.315c-2.395 0-4.436-.842-6.12-2.529-1.687-1.685-2.53-3.726-2.53-6.121z"/></svg>
+<svg width="24" height="24" fill="none" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" r="12" fill="#0F4D9D"/><path d="M8 6.4v8.395c0 .776.273 1.438.82 1.985.547.547 1.208.82 1.985.82h3.345c.777 0 1.439-.273 1.986-.82.546-.547.82-1.209.82-1.985v-2.569c0-.777-.274-1.438-.82-1.985a2.705 2.705 0 0 0-1.986-.82h-3.625c0 .596.288 1.098.863 1.504.575.407 1.28.625 2.115.654h.647c.432.014.648.23.648.647v2.569c0 .431-.216.647-.648.647h-3.345c-.431 0-.647-.216-.647-.647V9.378c0-.82-.21-1.521-.632-2.104C9.104 6.69 8.596 6.4 8 6.4Z" fill="#fff"/></svg>

From de8173c20a741b9535d36bf07e1429309f745bd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 11 Feb 2022 15:07:16 +0100
Subject: [PATCH 0506/1008] MOBILE-3808 course: Fix section navigation button
 padding and width

---
 .../course/components/format/core-course-format.html   | 10 +---------
 src/core/features/course/components/format/format.scss |  2 ++
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/core/features/course/components/format/core-course-format.html b/src/core/features/course/components/format/core-course-format.html
index 33837629f..8c350f930 100644
--- a/src/core/features/course/components/format/core-course-format.html
+++ b/src/core/features/course/components/format/core-course-format.html
@@ -1,11 +1,3 @@
-<!-- Buttons to add to the header. *ngIf is needed, otherwise the component is executed too soon and doesn't find the header. -->
-<core-navbar-buttons slot="end" *ngIf="loaded">
-    <core-context-menu>
-        <core-context-menu-item [hidden]="!displayCourseIndex || !sections || !sections.length" [priority]="500"
-            [content]="'core.course.courseindex' | translate" (action)="openCourseIndex()" iconAction="fas-list-ul">
-        </core-context-menu-item>
-    </core-context-menu>
-</core-navbar-buttons>
 <core-dynamic-component [component]="courseFormatComponent" [data]="data">
     <!-- Default course format. -->
     <core-loading [hideUntil]="loaded">
@@ -33,7 +25,7 @@
             <core-infinite-loading [enabled]="canLoadMore" (action)="showMoreActivities($event)"></core-infinite-loading>
         </div>
 
-        <ion-buttons class="ion-padding core-course-section-nav-buttons safe-area-padding-horizontal"
+        <ion-buttons class="ion-padding core-course-section-nav-buttons safe-area-padding-horizontal list-item-limited-width"
             *ngIf="displayCourseIndex && (previousSection || nextSection)">
             <ion-button *ngIf="previousSection" (click)="sectionChanged(previousSection)" color="primary" fill="solid" expand="block"
                 [attr.aria-label]="('core.previous' | translate) + ': ' + previousSection.name">
diff --git a/src/core/features/course/components/format/format.scss b/src/core/features/course/components/format/format.scss
index 4567b6b78..869e69a96 100644
--- a/src/core/features/course/components/format/format.scss
+++ b/src/core/features/course/components/format/format.scss
@@ -1,6 +1,8 @@
 .core-course-section-nav-buttons {
     display: flex;
     justify-content: space-between;
+    padding-left: 8px;
+    padding-right: 8px;
 
     ion-button {
         white-space: nowrap;

From 19b3a394d25f0a38bed2d2668fdf72a16018cd9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 11 Feb 2022 15:37:26 +0100
Subject: [PATCH 0507/1008] MOBILE-3970 course: Open course summary in a
 lateral modal

---
 .../course/pages/index/index.module.ts        |   2 +
 src/core/features/course/pages/index/index.ts |  12 +-
 .../course/pages/preview/preview.html         | 117 +++++++++---------
 .../course/pages/preview/preview.module.ts    |  11 +-
 .../course/pages/preview/preview.page.ts      |  40 ++++--
 .../course/pages/preview/preview.scss         |  39 +-----
 .../user-menu-button/user-menu-button.ts      |   1 -
 7 files changed, 109 insertions(+), 113 deletions(-)

diff --git a/src/core/features/course/pages/index/index.module.ts b/src/core/features/course/pages/index/index.module.ts
index 314528baa..b3dcd1791 100644
--- a/src/core/features/course/pages/index/index.module.ts
+++ b/src/core/features/course/pages/index/index.module.ts
@@ -19,6 +19,7 @@ import { resolveModuleRoutes } from '@/app/app-routing.module';
 import { CoreSharedModule } from '@/core/shared.module';
 import { CoreCourseIndexPage } from '.';
 import { COURSE_INDEX_ROUTES } from './index-routing.module';
+import { CoreCoursePreviewPageComponentModule } from '../preview/preview.module';
 
 function buildRoutes(injector: Injector): Routes {
     const routes = resolveModuleRoutes(injector, COURSE_INDEX_ROUTES);
@@ -42,6 +43,7 @@ function buildRoutes(injector: Injector): Routes {
     ],
     imports: [
         CoreSharedModule,
+        CoreCoursePreviewPageComponentModule,
     ],
     declarations: [
         CoreCourseIndexPage,
diff --git a/src/core/features/course/pages/index/index.ts b/src/core/features/course/pages/index/index.ts
index 6f0f32b25..cf49aea06 100644
--- a/src/core/features/course/pages/index/index.ts
+++ b/src/core/features/course/pages/index/index.ts
@@ -28,6 +28,7 @@ import { CoreNavigator } from '@services/navigator';
 import { CONTENTS_PAGE_NAME } from '@features/course/course.module';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreCollapsibleHeaderDirective } from '@directives/collapsible-header';
+import { CoreCoursePreviewPage } from '../preview/preview.page';
 
 /**
  * Page that displays the list of courses the user is enrolled in.
@@ -279,10 +280,13 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
             return;
         }
 
-        CoreNavigator.navigateToSitePath(
-            `/course/${this.course.id}/preview`,
-            { params: { course: this.course, avoidOpenCourse: true } },
-        );
+        CoreDomUtils.openSideModal<void>({
+            component: CoreCoursePreviewPage,
+            componentProps: {
+                courseId: this.course.id,
+                course: this.course,
+            },
+        });
     }
 
     /**
diff --git a/src/core/features/course/pages/preview/preview.html b/src/core/features/course/pages/preview/preview.html
index 7aeaeda68..e787a7d42 100644
--- a/src/core/features/course/pages/preview/preview.html
+++ b/src/core/features/course/pages/preview/preview.html
@@ -8,6 +8,11 @@
                 {{'core.course.coursesummary' | translate}}
             </h1>
         </ion-title>
+        <ion-buttons slot="end" *ngIf="avoidOpenCourse">
+            <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
+                <ion-icon slot="icon-only" name="fas-times" aria-hidden="true"></ion-icon>
+            </ion-button>
+        </ion-buttons>
     </ion-toolbar>
 </ion-header>
 <ion-content>
@@ -15,12 +20,10 @@
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
     <core-loading [hideUntil]="dataLoaded">
-        <div *ngIf="courseImageUrl" class="core-course-thumb-parallax">
-            <div class="core-course-thumb">
-                <img [src]="courseImageUrl" core-external-content alt="" />
-            </div>
+        <div *ngIf="courseImageUrl" class="core-course-thumb">
+            <img [src]="courseImageUrl" core-external-content alt="" />
         </div>
-        <div class="core-course-thumb-parallax-content" *ngIf="course">
+        <div *ngIf="course">
             <ion-item class="ion-text-wrap">
                 <ion-label>
                     <p *ngIf="course.categoryname">
@@ -40,6 +43,10 @@
                         </core-progress-bar>
                     </div>
                 </ion-label>
+                <ion-button fill="clear" [href]="courseUrl" core-link [showBrowserWarning]="false" color="dark"
+                    [attr.aria-label]="'core.openinbrowser' | translate" slot="end">
+                    <ion-icon name="fas-external-link-alt" slot="start" aria-hidden="true"></ion-icon>
+                </ion-button>
             </ion-item>
 
             <ion-item class="ion-text-wrap" *ngIf="course.summary" detail="false">
@@ -87,59 +94,53 @@
                     </ng-container>
                 </ion-label>
             </ion-item>
-
-            <!-- Enrol -->
-            <ng-container *ngIf="!isEnrolled">
-                <ion-item class="ion-text-wrap" *ngFor="let instance of selfEnrolInstances">
-                    <ion-label>
-                        <p class="item-heading">{{ instance.name }}</p>
-                        <ion-button expand="block" class="ion-margin-top" (click)="selfEnrolClicked(instance.id)">
-                            {{ 'core.courses.enrolme' | translate }}
-                        </ion-button>
-                    </ion-label>
-                </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="paypalEnabled">
-                    <ion-label>
-                        <p class="item-heading">{{ 'core.courses.otherenrolments' | translate }}</p>
-                        <ion-button expand="block" class="ion-margin-top" (click)="browserEnrol()">
-                            {{ 'core.courses.completeenrolmentbrowser' | translate }}
-                        </ion-button>
-                    </ion-label>
-                </ion-item>
-                <ion-item *ngIf="!selfEnrolInstances.length && !paypalEnabled">
-                    <ion-label>
-                        <p class="item-heading">{{ 'core.courses.notenrollable' | translate }}</p>
-                    </ion-label>
-                </ion-item>
-            </ng-container>
-
-            <ion-button class="ion-margin" *ngIf="canAccessCourse && downloadCourseEnabled" (click)="prefetchCourse()" expand="block"
-                [attr.aria-label]="prefetchCourseData.statusTranslatable | translate">
-                <ion-icon *ngIf="(prefetchCourseData.status != statusDownloaded) && !prefetchCourseData.loading"
-                    [name]="prefetchCourseData.icon" slot="start" aria-hidden="true">
-                </ion-icon>
-                <ion-icon *ngIf="(prefetchCourseData.status == statusDownloaded) && !prefetchCourseData.loading" slot="start"
-                    [name]="prefetchCourseData.icon" color="success" aria-hidden="true" role="status">
-                </ion-icon>
-                <ion-spinner *ngIf="prefetchCourseData.loading" slot="start" [attr.aria-label]="'core.loading' | translate"></ion-spinner>
-                <ion-label *ngIf="prefetchCourseData.status != statusDownloaded">{{ 'core.course.downloadcourse' | translate }}</ion-label>
-                <ion-label *ngIf="prefetchCourseData.status == statusDownloaded">{{ 'core.course.refreshcourse' | translate }}</ion-label>
-            </ion-button>
-
-            <ion-button class="ion-margin" (click)="openCourse()" *ngIf="!avoidOpenCourse && canAccessCourse" expand="block">
-                <ion-icon name="fas-briefcase" slot="start" aria-hidden="true"></ion-icon>
-                <ion-label>
-                    {{ 'core.course' | translate }}
-                </ion-label>
-            </ion-button>
-
-            <ion-button class="ion-margin" [href]="courseUrl" core-link [showBrowserWarning]="false" expand="block">
-                <ion-icon name="fas-external-link-alt" slot="start" aria-hidden="true"></ion-icon>
-                <ion-label>
-                    {{ 'core.openinbrowser' | translate }}
-                </ion-label>
-            </ion-button>
-
         </div>
     </core-loading>
 </ion-content>
+
+<ion-footer>
+    <!-- Enrol -->
+    <ng-container *ngIf="!isEnrolled">
+        <ion-item class="ion-text-wrap" *ngFor="let instance of selfEnrolInstances">
+            <ion-label>
+                <p class="item-heading">{{ instance.name }}</p>
+                <ion-button expand="block" class="ion-margin-top" (click)="selfEnrolClicked(instance.id)">
+                    {{ 'core.courses.enrolme' | translate }}
+                </ion-button>
+            </ion-label>
+        </ion-item>
+       <ion-item class="ion-text-wrap" *ngIf="paypalEnabled">
+            <ion-label>
+                <p class="item-heading">{{ 'core.courses.otherenrolments' | translate }}</p>
+                <ion-button expand="block" class="ion-margin-top" (click)="browserEnrol()">
+                    {{ 'core.courses.completeenrolmentbrowser' | translate }}
+                </ion-button>
+            </ion-label>
+        </ion-item>
+        <ion-item *ngIf="!selfEnrolInstances.length && !paypalEnabled">
+            <ion-label>
+                <p class="item-heading">{{ 'core.courses.notenrollable' | translate }}</p>
+            </ion-label>
+        </ion-item>
+    </ng-container>
+
+    <ion-button class="ion-margin" *ngIf="canAccessCourse && downloadCourseEnabled" (click)="prefetchCourse()" expand="block"
+        [attr.aria-label]="prefetchCourseData.statusTranslatable | translate">
+        <ion-icon *ngIf="(prefetchCourseData.status != statusDownloaded) && !prefetchCourseData.loading" [name]="prefetchCourseData.icon"
+            slot="start" aria-hidden="true">
+        </ion-icon>
+        <ion-icon *ngIf="(prefetchCourseData.status == statusDownloaded) && !prefetchCourseData.loading" slot="start"
+            [name]="prefetchCourseData.icon" color="success" aria-hidden="true" role="status">
+        </ion-icon>
+        <ion-spinner *ngIf="prefetchCourseData.loading" slot="start" [attr.aria-label]="'core.loading' | translate"></ion-spinner>
+        <ion-label *ngIf="prefetchCourseData.status != statusDownloaded">{{ 'core.course.downloadcourse' | translate }}</ion-label>
+        <ion-label *ngIf="prefetchCourseData.status == statusDownloaded">{{ 'core.course.refreshcourse' | translate }}</ion-label>
+    </ion-button>
+
+    <ion-button class="ion-margin" (click)="openCourse()" *ngIf="!avoidOpenCourse && canAccessCourse" expand="block">
+        <ion-icon name="fas-briefcase" slot="start" aria-hidden="true"></ion-icon>
+        <ion-label>
+            {{ 'core.course' | translate }}
+        </ion-label>
+    </ion-button>
+</ion-footer>
diff --git a/src/core/features/course/pages/preview/preview.module.ts b/src/core/features/course/pages/preview/preview.module.ts
index 168aed845..3ef168504 100644
--- a/src/core/features/course/pages/preview/preview.module.ts
+++ b/src/core/features/course/pages/preview/preview.module.ts
@@ -24,15 +24,22 @@ const routes: Routes = [
         component: CoreCoursePreviewPage,
     },
 ];
-
 @NgModule({
     imports: [
-        RouterModule.forChild(routes),
         CoreSharedModule,
     ],
     declarations: [
         CoreCoursePreviewPage,
     ],
+})
+export class CoreCoursePreviewPageComponentModule { }
+
+@NgModule({
+    imports: [
+        RouterModule.forChild(routes),
+        CoreSharedModule,
+        CoreCoursePreviewPageComponentModule,
+    ],
     exports: [RouterModule],
 })
 export class CoreCoursePreviewPageModule { }
diff --git a/src/core/features/course/pages/preview/preview.page.ts b/src/core/features/course/pages/preview/preview.page.ts
index 425bf962b..561dcb8a4 100644
--- a/src/core/features/course/pages/preview/preview.page.ts
+++ b/src/core/features/course/pages/preview/preview.page.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Component, OnDestroy, OnInit, Input } from '@angular/core';
 import { IonRefresher } from '@ionic/angular';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreSites } from '@services/sites';
@@ -29,7 +29,7 @@ import {
 import { CoreCourseOptionsDelegate } from '@features/course/services/course-options-delegate';
 import { CoreCourse, CoreCourseProvider } from '@features/course/services/course';
 import { CoreCourseHelper, CorePrefetchStatusInfo } from '@features/course/services/course-helper';
-import { NgZone, Platform, Translate } from '@singletons';
+import { ModalController, NgZone, Platform, Translate } from '@singletons';
 import { CoreConstants } from '@/core/constants';
 import { CoreCoursesSelfEnrolPasswordComponent } from '../../../courses/components/self-enrol-password/self-enrol-password';
 import { CoreNavigator } from '@services/navigator';
@@ -47,7 +47,9 @@ import { Subscription } from 'rxjs';
 })
 export class CoreCoursePreviewPage implements OnInit, OnDestroy {
 
-    course?: CoreCourseSummaryData;
+    @Input() course?: CoreCourseSummaryData;
+    @Input() courseId = 0;
+
     isEnrolled = false;
     canAccessCourse = true;
     selfEnrolInstances: CoreCourseEnrolmentMethod[] = [];
@@ -76,7 +78,6 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
     protected enrolUrl = '';
     protected pageDestroyed = false;
     protected courseStatusObserver?: CoreEventObserver;
-    protected courseId!: number;
     protected appResumeSubscription: Subscription;
     protected waitingForBrowserEnrol = false;
 
@@ -111,18 +112,24 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
      * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
-        try {
-            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
-        } catch (error) {
-            CoreDomUtils.showErrorModal(error);
-            CoreNavigator.back();
+        if (!this.courseId) {
+            // Opened as a page.
+            try {
+                this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            } catch (error) {
+                CoreDomUtils.showErrorModal(error);
+                CoreNavigator.back();
+                this.closeModal(); // Just in case.
 
-            return;
+                return;
+            }
+
+            this.course = CoreNavigator.getRouteParam('course');
+        } else {
+            // Opened as a modal.
+            this.avoidOpenCourse = true;
         }
 
-        this.avoidOpenCourse = !!CoreNavigator.getRouteBooleanParam('avoidOpenCourse');
-        this.course = CoreNavigator.getRouteParam('course');
-
         const currentSiteUrl = CoreSites.getRequiredCurrentSite().getURL();
         this.enrolUrl = CoreTextUtils.concatenatePaths(currentSiteUrl, 'enrol/index.php?id=' + this.courseId);
         this.courseUrl = CoreTextUtils.concatenatePaths(currentSiteUrl, 'course/view.php?id=' + this.courseId);
@@ -452,6 +459,13 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
         }
     }
 
+    /**
+     * Close the modal.
+     */
+    closeModal(): void {
+        ModalController.dismiss();
+    }
+
     /**
      * Prefetch the course.
      */
diff --git a/src/core/features/course/pages/preview/preview.scss b/src/core/features/course/pages/preview/preview.scss
index 8f159c333..ae3a0347f 100644
--- a/src/core/features/course/pages/preview/preview.scss
+++ b/src/core/features/course/pages/preview/preview.scss
@@ -1,43 +1,12 @@
 :host {
-    ion-content:not(.animating) {
-        &::part(scroll) {
-            perspective: 1px;
-            perspective-origin: center top;
-            transform-style: preserve-3d;
-        }
-
-        .core-course-thumb {
-            transform-origin: center top;
-
-            --scroll-factor: 0.5;
-            --translate-z: calc(-2 * var(--scroll-factor))px;
-            --scale: calc(1 + var(--scroll-factor) * 2);
-
-            /**
-            * Calculated with scroll-factor: 0.5;
-            * translate-z: -2 * $scroll-factor px;
-            * scale: 1 + $scroll-factor * 2;
-            */
-            transform: translateZ(-1px) scale(2);
-        }
-    }
-
-    .core-course-thumb-parallax-content {
-        transform: translateZ(0);
-        -webkit-filter: drop-shadow(0px -3px 3px rgba(var(--drop-shadow)));
-        filter: drop-shadow(0px -3px 3px rgba(var(--drop-shadow)));
-    }
-
-    .core-course-thumb-parallax {
+    .core-course-thumb {
+        overflow: hidden;
+        text-align: center;
         height: 40vw;
         max-height: 35vh;
         z-index: -1;
         overflow: hidden;
-    }
-
-    .core-course-thumb {
-        overflow: hidden;
-        text-align: center;
+        border-bottom: 1px solid var(--stroke);
     }
 
 
diff --git a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts
index ce23461e3..f1140b4ec 100644
--- a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts
+++ b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts
@@ -58,7 +58,6 @@ export class CoreMainMenuUserButtonComponent implements OnInit {
 
         CoreDomUtils.openSideModal<void>({
             component: CoreMainMenuUserMenuComponent,
-            cssClass: 'core-modal-lateral',
         });
     }
 

From 449727d2c2ac6ea31af7b5e47f0e42af4713134f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 11 Feb 2022 16:17:05 +0100
Subject: [PATCH 0508/1008] MOBILE-3970 course: Delete download course from
 Course summary

---
 .../course/pages/preview/preview.html         | 13 ---
 .../course/pages/preview/preview.page.ts      | 79 +------------------
 2 files changed, 2 insertions(+), 90 deletions(-)

diff --git a/src/core/features/course/pages/preview/preview.html b/src/core/features/course/pages/preview/preview.html
index e787a7d42..60cedf7c5 100644
--- a/src/core/features/course/pages/preview/preview.html
+++ b/src/core/features/course/pages/preview/preview.html
@@ -124,19 +124,6 @@
         </ion-item>
     </ng-container>
 
-    <ion-button class="ion-margin" *ngIf="canAccessCourse && downloadCourseEnabled" (click)="prefetchCourse()" expand="block"
-        [attr.aria-label]="prefetchCourseData.statusTranslatable | translate">
-        <ion-icon *ngIf="(prefetchCourseData.status != statusDownloaded) && !prefetchCourseData.loading" [name]="prefetchCourseData.icon"
-            slot="start" aria-hidden="true">
-        </ion-icon>
-        <ion-icon *ngIf="(prefetchCourseData.status == statusDownloaded) && !prefetchCourseData.loading" slot="start"
-            [name]="prefetchCourseData.icon" color="success" aria-hidden="true" role="status">
-        </ion-icon>
-        <ion-spinner *ngIf="prefetchCourseData.loading" slot="start" [attr.aria-label]="'core.loading' | translate"></ion-spinner>
-        <ion-label *ngIf="prefetchCourseData.status != statusDownloaded">{{ 'core.course.downloadcourse' | translate }}</ion-label>
-        <ion-label *ngIf="prefetchCourseData.status == statusDownloaded">{{ 'core.course.refreshcourse' | translate }}</ion-label>
-    </ion-button>
-
     <ion-button class="ion-margin" (click)="openCourse()" *ngIf="!avoidOpenCourse && canAccessCourse" expand="block">
         <ion-icon name="fas-briefcase" slot="start" aria-hidden="true"></ion-icon>
         <ion-label>
diff --git a/src/core/features/course/pages/preview/preview.page.ts b/src/core/features/course/pages/preview/preview.page.ts
index 561dcb8a4..c2b686885 100644
--- a/src/core/features/course/pages/preview/preview.page.ts
+++ b/src/core/features/course/pages/preview/preview.page.ts
@@ -27,10 +27,8 @@ import {
     CoreEnrolledCourseData,
 } from '@features/courses/services/courses';
 import { CoreCourseOptionsDelegate } from '@features/course/services/course-options-delegate';
-import { CoreCourse, CoreCourseProvider } from '@features/course/services/course';
-import { CoreCourseHelper, CorePrefetchStatusInfo } from '@features/course/services/course-helper';
+import { CoreCourseHelper } from '@features/course/services/course-helper';
 import { ModalController, NgZone, Platform, Translate } from '@singletons';
-import { CoreConstants } from '@/core/constants';
 import { CoreCoursesSelfEnrolPasswordComponent } from '../../../courses/components/self-enrol-password/self-enrol-password';
 import { CoreNavigator } from '@services/navigator';
 import { CoreUtils } from '@services/utils/utils';
@@ -56,16 +54,7 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
     paypalEnabled = false;
     dataLoaded = false;
     avoidOpenCourse = false;
-    prefetchCourseData: CorePrefetchStatusInfo = {
-        icon: '',
-        statusTranslatable: 'core.loading',
-        status: '',
-        loading: true,
-    };
 
-    statusDownloaded = CoreConstants.DOWNLOADED;
-
-    downloadCourseEnabled: boolean;
     courseUrl = '';
     courseImageUrl?: string;
     progress?: number;
@@ -82,17 +71,6 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
     protected waitingForBrowserEnrol = false;
 
     constructor() {
-        this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
-
-        if (this.downloadCourseEnabled) {
-            // Listen for status change in course.
-            this.courseStatusObserver = CoreEvents.on(CoreEvents.COURSE_STATUS_CHANGED, (data) => {
-                if (data.courseId == this.courseId || data.courseId == CoreCourseProvider.ALL_COURSES_CLEARED) {
-                    this.updateCourseStatus(data.status);
-                }
-            }, CoreSites.getCurrentSiteId());
-        }
-
         // Refresh the view when the app is resumed.
         this.appResumeSubscription = Platform.resume.subscribe(() => {
             if (!this.waitingForBrowserEnrol || !this.dataLoaded) {
@@ -134,31 +112,7 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
         this.enrolUrl = CoreTextUtils.concatenatePaths(currentSiteUrl, 'enrol/index.php?id=' + this.courseId);
         this.courseUrl = CoreTextUtils.concatenatePaths(currentSiteUrl, 'course/view.php?id=' + this.courseId);
 
-        try {
-            await this.getCourse();
-        } finally {
-            if (this.downloadCourseEnabled) {
-
-                // Determine course prefetch icon.
-                this.prefetchCourseData = await CoreCourseHelper.getCourseStatusIconAndTitle(this.courseId);
-
-                if (this.prefetchCourseData.loading) {
-                    // Course is being downloaded. Get the download promise.
-                    const promise = CoreCourseHelper.getCourseDownloadPromise(this.courseId);
-                    if (promise) {
-                        // There is a download promise. If it fails, show an error.
-                        promise.catch((error) => {
-                            if (!this.pageDestroyed) {
-                                CoreDomUtils.showErrorModalDefault(error, 'core.course.errordownloadingcourse', true);
-                            }
-                        });
-                    } else {
-                        // No download, this probably means that the app was closed while downloading. Set previous status.
-                        CoreCourse.setCoursePreviousStatus(this.courseId);
-                    }
-                }
-            }
-        }
+        await this.getCourse();
     }
 
     /**
@@ -410,20 +364,6 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
         });
     }
 
-    /**
-     * Update the course status icon and title.
-     *
-     * @param status Status to show.
-     */
-    protected updateCourseStatus(status: string): void {
-        const statusData = CoreCourseHelper.getCoursePrefetchStatusInfo(status);
-
-        this.prefetchCourseData.status = statusData.status;
-        this.prefetchCourseData.icon = statusData.icon;
-        this.prefetchCourseData.statusTranslatable = statusData.statusTranslatable;
-        this.prefetchCourseData.loading = statusData.loading;
-    }
-
     /**
      * Wait for the user to be enrolled in the course.
      *
@@ -466,21 +406,6 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
         ModalController.dismiss();
     }
 
-    /**
-     * Prefetch the course.
-     */
-    async prefetchCourse(): Promise<void> {
-        try {
-            await CoreCourseHelper.confirmAndPrefetchCourse(this.prefetchCourseData, this.course as CoreEnrolledCourseData, {
-                isGuest: this.useGuestAccess,
-            });
-        } catch (error) {
-            if (!this.pageDestroyed) {
-                CoreDomUtils.showErrorModalDefault(error, 'core.course.errordownloadingcourse', true);
-            }
-        }
-    }
-
     /**
      * @inheritdoc
      */

From 53f986a26bd573ef4cd9e4bf77e1ae7839eabfea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 11 Feb 2022 16:34:25 +0100
Subject: [PATCH 0509/1008] MOBILE-3970 course: Move courseMenuHandlers to
 course summary

---
 .../course/pages/contents/contents.html       |  5 ---
 .../course/pages/contents/contents.ts         | 28 +-------------
 .../course/pages/preview/preview.html         | 16 ++++++--
 .../course/pages/preview/preview.page.ts      | 38 ++++++++++++++++++-
 4 files changed, 49 insertions(+), 38 deletions(-)

diff --git a/src/core/features/course/pages/contents/contents.html b/src/core/features/course/pages/contents/contents.html
index 2648ff943..b12da3cc6 100644
--- a/src/core/features/course/pages/contents/contents.html
+++ b/src/core/features/course/pages/contents/contents.html
@@ -1,9 +1,4 @@
 <core-navbar-buttons slot="end">
-    <core-context-menu>
-        <core-context-menu-item *ngFor="let item of courseMenuHandlers" [priority]="item.priority" (action)="openMenuItem(item)"
-            [content]="item.data.title | translate" [iconAction]="item.data.icon" [class]="item.data.class">
-        </core-context-menu-item>
-    </core-context-menu>
 </core-navbar-buttons>
 <ion-content>
     <ion-refresher slot="fixed" [disabled]="!dataLoaded || !displayRefresher" (ionRefresh)="doRefresh($event.target)">
diff --git a/src/core/features/course/pages/contents/contents.ts b/src/core/features/course/pages/contents/contents.ts
index d93a3cb18..26c407028 100644
--- a/src/core/features/course/pages/contents/contents.ts
+++ b/src/core/features/course/pages/contents/contents.ts
@@ -29,10 +29,7 @@ import {
 } from '@features/course/services/course-helper';
 import { CoreCourseFormatDelegate } from '@features/course/services/format-delegate';
 import { CoreCourseModulePrefetchDelegate } from '@features/course/services/module-prefetch-delegate';
-import {
-    CoreCourseOptionsDelegate,
-    CoreCourseOptionsMenuHandlerToDisplay,
-} from '@features/course/services/course-options-delegate';
+import { CoreCourseOptionsMenuHandlerToDisplay } from '@features/course/services/course-options-delegate';
 import { CoreCourseSync, CoreCourseSyncProvider } from '@features/course/services/sync';
 import { CoreCourseFormatComponent } from '../../components/format/format';
 import {
@@ -69,7 +66,6 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
     protected syncObserver?: CoreEventObserver;
     protected isDestroyed = false;
     protected modulesHaveCompletion = false;
-    protected isGuest = false;
     protected debouncedUpdateCachedCompletion?: () => void; // Update the cached completion after a certain time.
 
     /**
@@ -89,7 +85,6 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
         this.sectionId = CoreNavigator.getRouteNumberParam('sectionId');
         this.sectionNumber = CoreNavigator.getRouteNumberParam('sectionNumber');
         this.moduleId = CoreNavigator.getRouteNumberParam('moduleId');
-        this.isGuest = !!CoreNavigator.getRouteBooleanParam('isGuest');
 
         this.debouncedUpdateCachedCompletion = CoreUtils.debounce(() => {
             if (this.modulesHaveCompletion) {
@@ -184,7 +179,6 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
         try {
             await Promise.all([
                 this.loadSections(refresh),
-                this.loadMenuHandlers(refresh),
                 this.loadCourseFormatOptions(),
             ]);
         } catch (error) {
@@ -248,16 +242,6 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
         this.displayRefresher = CoreCourseFormatDelegate.displayRefresher(this.course, this.sections);
     }
 
-    /**
-     * Load the course menu handlers.
-     *
-     * @param refresh If it's refreshing content.
-     * @return Promise resolved when done.
-     */
-    protected async loadMenuHandlers(refresh?: boolean): Promise<void> {
-        this.courseMenuHandlers = await CoreCourseOptionsDelegate.getMenuHandlersToDisplay(this.course, refresh, this.isGuest);
-    }
-
     /**
      * Load course format options if needed.
      *
@@ -379,16 +363,6 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
         }
     }
 
-    /**
-     * Opens a menu item registered to the delegate.
-     *
-     * @param item Item to open
-     */
-    openMenuItem(item: CoreCourseOptionsMenuHandlerToDisplay): void {
-        const params = Object.assign({ course: this.course }, item.data.pageParams);
-        CoreNavigator.navigateToSitePath(item.data.page, { params });
-    }
-
     /**
      * Page destroyed.
      */
diff --git a/src/core/features/course/pages/preview/preview.html b/src/core/features/course/pages/preview/preview.html
index 60cedf7c5..2bb64554c 100644
--- a/src/core/features/course/pages/preview/preview.html
+++ b/src/core/features/course/pages/preview/preview.html
@@ -23,7 +23,7 @@
         <div *ngIf="courseImageUrl" class="core-course-thumb">
             <img [src]="courseImageUrl" core-external-content alt="" />
         </div>
-        <div *ngIf="course">
+        <ng-container *ngIf="course">
             <ion-item class="ion-text-wrap">
                 <ion-label>
                     <p *ngIf="course.categoryname">
@@ -94,13 +94,13 @@
                     </ng-container>
                 </ion-label>
             </ion-item>
-        </div>
+        </ng-container>
     </core-loading>
 </ion-content>
 
-<ion-footer>
+<ion-footer *ngIf="course && dataLoaded">
     <!-- Enrol -->
-    <ng-container *ngIf="!isEnrolled">
+    <ion-card *ngIf="!isEnrolled">
         <ion-item class="ion-text-wrap" *ngFor="let instance of selfEnrolInstances">
             <ion-label>
                 <p class="item-heading">{{ instance.name }}</p>
@@ -122,6 +122,14 @@
                 <p class="item-heading">{{ 'core.courses.notenrollable' | translate }}</p>
             </ion-label>
         </ion-item>
+    </ion-card>
+
+    <ng-container *ngIf="canAccessCourse">
+        <ion-button class="ion-margin" *ngFor="let item of courseMenuHandlers" (click)="openMenuItem(item)" [class]="item.data.class"
+            expand="block">
+            <ion-icon *ngIf="item.data.icon" [name]="item.data.icon" slot="start" aria-hidden="true"></ion-icon>
+            <ion-label>{{item.data.title | translate }}</ion-label>
+        </ion-button>
     </ng-container>
 
     <ion-button class="ion-margin" (click)="openCourse()" *ngIf="!avoidOpenCourse && canAccessCourse" expand="block">
diff --git a/src/core/features/course/pages/preview/preview.page.ts b/src/core/features/course/pages/preview/preview.page.ts
index c2b686885..f269e84c3 100644
--- a/src/core/features/course/pages/preview/preview.page.ts
+++ b/src/core/features/course/pages/preview/preview.page.ts
@@ -26,7 +26,10 @@ import {
     CoreCoursesProvider,
     CoreEnrolledCourseData,
 } from '@features/courses/services/courses';
-import { CoreCourseOptionsDelegate } from '@features/course/services/course-options-delegate';
+import {
+    CoreCourseOptionsDelegate,
+    CoreCourseOptionsMenuHandlerToDisplay,
+} from '@features/course/services/course-options-delegate';
 import { CoreCourseHelper } from '@features/course/services/course-helper';
 import { ModalController, NgZone, Platform, Translate } from '@singletons';
 import { CoreCoursesSelfEnrolPasswordComponent } from '../../../courses/components/self-enrol-password/self-enrol-password';
@@ -59,6 +62,8 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
     courseImageUrl?: string;
     progress?: number;
 
+    courseMenuHandlers: CoreCourseOptionsMenuHandlerToDisplay[] = [];
+
     protected isGuestEnabled = false;
     protected useGuestAccess = false;
     protected guestInstanceId?: number;
@@ -145,8 +150,10 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
 
     /**
      * Convenience function to get course. We use this to determine if a user can see the course or not.
+     *
+     * @param refresh If it's refreshing content.
      */
-    protected async getCourse(): Promise<void> {
+    protected async getCourse(refresh = false): Promise<void> {
         // Get course enrolment methods.
         this.selfEnrolInstances = [];
 
@@ -223,9 +230,26 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
             this.progress = this.course.progress;
         }
 
+        await this.loadMenuHandlers(refresh);
+
         this.dataLoaded = true;
     }
 
+    /**
+     * Load the course menu handlers.
+     *
+     * @param refresh If it's refreshing content.
+     * @return Promise resolved when done.
+     */
+    protected async loadMenuHandlers(refresh?: boolean): Promise<void> {
+        if (!this.course) {
+            return;
+        }
+
+        this.courseMenuHandlers =
+            await CoreCourseOptionsDelegate.getMenuHandlersToDisplay(this.course, refresh, this.useGuestAccess);
+    }
+
     /**
      * Open the course.
      *
@@ -399,6 +423,16 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
         }
     }
 
+    /**
+     * Opens a menu item registered to the delegate.
+     *
+     * @param item Item to open
+     */
+    openMenuItem(item: CoreCourseOptionsMenuHandlerToDisplay): void {
+        const params = Object.assign({ course: this.course }, item.data.pageParams);
+        CoreNavigator.navigateToSitePath(item.data.page, { params });
+    }
+
     /**
      * Close the modal.
      */

From f22fec5e97137d43893c6b4f5cb385f83d9cd286 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 11 Feb 2022 16:51:29 +0100
Subject: [PATCH 0510/1008] MOBILE-3970 course: Add course date styles

---
 scripts/langindex.json                        |  2 ++
 src/core/features/course/lang.json            |  2 ++
 .../course/pages/preview/preview.html         | 27 ++++++++++++-------
 .../course/pages/preview/preview.page.ts      |  6 ++---
 .../course/pages/preview/preview.scss         | 14 +++++++++-
 5 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 0b8edb055..4edb31980 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1549,6 +1549,7 @@
   "core.course.downloadcourse": "tool_mobile",
   "core.course.downloadcoursesprogressdescription": "local_moodlemobileapp",
   "core.course.downloadsectionprogressdescription": "local_moodlemobileapp",
+  "core.course.enddate": "moodle",
   "core.course.errordownloadingcourse": "local_moodlemobileapp",
   "core.course.errordownloadingsection": "local_moodlemobileapp",
   "core.course.errorgetmodule": "local_moodlemobileapp",
@@ -1568,6 +1569,7 @@
   "core.course.overriddennotice": "grades",
   "core.course.refreshcourse": "local_moodlemobileapp",
   "core.course.section": "moodle",
+  "core.course.startdate": "moodle",
   "core.course.thisweek": "format_weeks/currentsection",
   "core.course.todo": "completion",
   "core.course.useactivityonbrowser": "local_moodlemobileapp",
diff --git a/src/core/features/course/lang.json b/src/core/features/course/lang.json
index 4fddbfd81..36f792de9 100644
--- a/src/core/features/course/lang.json
+++ b/src/core/features/course/lang.json
@@ -32,6 +32,7 @@
     "downloadcourse": "Download course",
     "downloadcoursesprogressdescription": "Downloading courses: downloaded {{count}} out of {{total}}.",
     "downloadsectionprogressdescription": "Downloading section: downloaded {{count}} out of {{total}}.",
+    "enddate": "Course end date",
     "errordownloadingcourse": "Error downloading course.",
     "errordownloadingsection": "Error downloading section.",
     "errorgetmodule": "Error getting activity data.",
@@ -51,6 +52,7 @@
     "overriddennotice": "Your final grade from this activity was manually adjusted.",
     "refreshcourse": "Refresh course",
     "section": "Section",
+    "startdate": "Course start date",
     "thisweek": "This week",
     "todo": "To do",
     "useactivityonbrowser": "You can still use it using your device's web browser.",
diff --git a/src/core/features/course/pages/preview/preview.html b/src/core/features/course/pages/preview/preview.html
index 2bb64554c..56baec734 100644
--- a/src/core/features/course/pages/preview/preview.html
+++ b/src/core/features/course/pages/preview/preview.html
@@ -8,7 +8,7 @@
                 {{'core.course.coursesummary' | translate}}
             </h1>
         </ion-title>
-        <ion-buttons slot="end" *ngIf="avoidOpenCourse">
+        <ion-buttons slot="end" *ngIf="isModal">
             <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
                 <ion-icon slot="icon-only" name="fas-times" aria-hidden="true"></ion-icon>
             </ion-button>
@@ -34,18 +34,27 @@
                         <core-format-text [text]="course.fullname" contextLevel="course" [contextInstanceId]="course.id">
                         </core-format-text>
                     </h2>
-                    <p *ngIf="course.startdate">
-                        {{course.startdate * 1000 | coreFormatDate:"strftimedatefullshort" }}
-                        <span *ngIf="course.enddate"> - {{course.enddate * 1000 | coreFormatDate:"strftimedatefullshort" }}</span>
-                    </p>
+
                     <div class="core-course-progress" *ngIf="progress !== undefined">
                         <core-progress-bar [progress]="progress" a11yText="core.course.aria:sectionprogress">
                         </core-progress-bar>
                     </div>
+                    <div *ngIf="course.startdate || course.enddate" class="core-course-dates">
+                        <p *ngIf="course.startdate">
+                            <ion-icon name="fas-calendar" aria-hidden="true"></ion-icon>
+                            <strong>{{ 'core.course.startdate' | translate }}: </strong> {{ course.startdate * 1000 |
+                            coreFormatDate:'strftimedatefullshort' }}
+                        </p>
+                        <p *ngIf="course.enddate">
+                            <ion-icon name="fas-calendar" aria-hidden="true"></ion-icon>
+                            <strong>{{ 'core.course.enddate' | translate }}: </strong> {{ course.enddate * 1000 |
+                            coreFormatDate:'strftimedatefullshort' }}
+                        </p>
+                    </div>
                 </ion-label>
                 <ion-button fill="clear" [href]="courseUrl" core-link [showBrowserWarning]="false" color="dark"
                     [attr.aria-label]="'core.openinbrowser' | translate" slot="end">
-                    <ion-icon name="fas-external-link-alt" slot="start" aria-hidden="true"></ion-icon>
+                    <ion-icon name="fas-external-link-alt" slot="icon-only" aria-hidden="true"></ion-icon>
                 </ion-button>
             </ion-item>
 
@@ -62,7 +71,7 @@
             <ion-list *ngIf="course.contacts && course.contacts.length">
                 <ion-item-divider class="ion-text-wrap">
                     <ion-label>
-                        <h2>{{ 'core.teachers' | translate }}</h2>
+                        <p class="item-heading">{{ 'core.teachers' | translate }}</p>
                     </ion-label>
                 </ion-item-divider>
                 <ion-item button class="ion-text-wrap" *ngFor="let contact of course.contacts" core-user-link [userId]="contact.id"
@@ -109,7 +118,7 @@
                 </ion-button>
             </ion-label>
         </ion-item>
-       <ion-item class="ion-text-wrap" *ngIf="paypalEnabled">
+        <ion-item class="ion-text-wrap" *ngIf="paypalEnabled">
             <ion-label>
                 <p class="item-heading">{{ 'core.courses.otherenrolments' | translate }}</p>
                 <ion-button expand="block" class="ion-margin-top" (click)="browserEnrol()">
@@ -132,7 +141,7 @@
         </ion-button>
     </ng-container>
 
-    <ion-button class="ion-margin" (click)="openCourse()" *ngIf="!avoidOpenCourse && canAccessCourse" expand="block">
+    <ion-button class="ion-margin" (click)="openCourse()" *ngIf="!isModal && canAccessCourse" expand="block">
         <ion-icon name="fas-briefcase" slot="start" aria-hidden="true"></ion-icon>
         <ion-label>
             {{ 'core.course' | translate }}
diff --git a/src/core/features/course/pages/preview/preview.page.ts b/src/core/features/course/pages/preview/preview.page.ts
index f269e84c3..e53981367 100644
--- a/src/core/features/course/pages/preview/preview.page.ts
+++ b/src/core/features/course/pages/preview/preview.page.ts
@@ -56,7 +56,7 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
     selfEnrolInstances: CoreCourseEnrolmentMethod[] = [];
     paypalEnabled = false;
     dataLoaded = false;
-    avoidOpenCourse = false;
+    isModal = false;
 
     courseUrl = '';
     courseImageUrl?: string;
@@ -110,7 +110,7 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
             this.course = CoreNavigator.getRouteParam('course');
         } else {
             // Opened as a modal.
-            this.avoidOpenCourse = true;
+            this.isModal = true;
         }
 
         const currentSiteUrl = CoreSites.getRequiredCurrentSite().getURL();
@@ -256,7 +256,7 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
      * @param replaceCurrentPage If current place should be replaced in the navigation stack.
      */
     openCourse(replaceCurrentPage = false): void {
-        if (!this.canAccessCourse || !this.course || this.avoidOpenCourse) {
+        if (!this.canAccessCourse || !this.course || this.isModal) {
             return;
         }
 
diff --git a/src/core/features/course/pages/preview/preview.scss b/src/core/features/course/pages/preview/preview.scss
index ae3a0347f..0386bcac6 100644
--- a/src/core/features/course/pages/preview/preview.scss
+++ b/src/core/features/course/pages/preview/preview.scss
@@ -1,8 +1,9 @@
+@import '~theme/globals.scss';
+
 :host {
     .core-course-thumb {
         overflow: hidden;
         text-align: center;
-        height: 40vw;
         max-height: 35vh;
         z-index: -1;
         overflow: hidden;
@@ -13,4 +14,15 @@
     .core-customfieldvalue core-format-text {
         display: inline;
     }
+
+    .core-course-dates {
+        background: var(--light);
+        border-radius: var(--small-radius);
+        padding: 8px;
+
+        ion-icon {
+            @include margin-horizontal(null, 8px);
+        }
+    }
+
 }

From d26e39861b8e582330e7e87e7e97e558e7b50193 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 14 Feb 2022 10:50:46 +0100
Subject: [PATCH 0511/1008] MOBILE-3970 course: Change course preview page name
 to course summary

---
 src/core/features/course/course-lazy.module.ts         |  4 ++--
 .../course-summary.html}                               |  0
 .../course-summary.module.ts}                          |  8 ++++----
 .../course-summary.scss}                               |  0
 .../course-summary.ts}                                 | 10 +++++-----
 src/core/features/course/pages/index/index.module.ts   |  2 +-
 src/core/features/course/pages/index/index.ts          |  4 ++--
 .../components/course-list-item/course-list-item.ts    |  2 +-
 .../courses/services/handlers/enrol-push-click.ts      |  2 +-
 .../courses/services/handlers/request-push-click.ts    |  2 +-
 upgrade.txt                                            |  1 +
 11 files changed, 18 insertions(+), 17 deletions(-)
 rename src/core/features/course/pages/{preview/preview.html => course-summary/course-summary.html} (100%)
 rename src/core/features/course/pages/{preview/preview.module.ts => course-summary/course-summary.module.ts} (86%)
 rename src/core/features/course/pages/{preview/preview.scss => course-summary/course-summary.scss} (100%)
 rename src/core/features/course/pages/{preview/preview.page.ts => course-summary/course-summary.ts} (98%)

diff --git a/src/core/features/course/course-lazy.module.ts b/src/core/features/course/course-lazy.module.ts
index 5233864dd..691b8c05b 100644
--- a/src/core/features/course/course-lazy.module.ts
+++ b/src/core/features/course/course-lazy.module.ts
@@ -32,9 +32,9 @@ const routes: Routes = [
         loadChildren: () => import('./pages/list-mod-type/list-mod-type.module').then(m => m.CoreCourseListModTypePageModule),
     },
     {
-        path: ':courseId/preview',
+        path: ':courseId/summary',
         loadChildren: () =>
-            import('./pages/preview/preview.module').then(m => m.CoreCoursePreviewPageModule),
+            import('./pages/course-summary/course-summary.module').then(m => m.CoreCourseSummaryPageModule),
     },
 ];
 
diff --git a/src/core/features/course/pages/preview/preview.html b/src/core/features/course/pages/course-summary/course-summary.html
similarity index 100%
rename from src/core/features/course/pages/preview/preview.html
rename to src/core/features/course/pages/course-summary/course-summary.html
diff --git a/src/core/features/course/pages/preview/preview.module.ts b/src/core/features/course/pages/course-summary/course-summary.module.ts
similarity index 86%
rename from src/core/features/course/pages/preview/preview.module.ts
rename to src/core/features/course/pages/course-summary/course-summary.module.ts
index 3ef168504..daeb7f70c 100644
--- a/src/core/features/course/pages/preview/preview.module.ts
+++ b/src/core/features/course/pages/course-summary/course-summary.module.ts
@@ -16,12 +16,12 @@ import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
 import { CoreSharedModule } from '@/core/shared.module';
-import { CoreCoursePreviewPage } from './preview.page';
+import { CoreCourseSummaryPage } from './course-summary';
 
 const routes: Routes = [
     {
         path: '',
-        component: CoreCoursePreviewPage,
+        component: CoreCourseSummaryPage,
     },
 ];
 @NgModule({
@@ -29,7 +29,7 @@ const routes: Routes = [
         CoreSharedModule,
     ],
     declarations: [
-        CoreCoursePreviewPage,
+        CoreCourseSummaryPage,
     ],
 })
 export class CoreCoursePreviewPageComponentModule { }
@@ -42,4 +42,4 @@ export class CoreCoursePreviewPageComponentModule { }
     ],
     exports: [RouterModule],
 })
-export class CoreCoursePreviewPageModule { }
+export class CoreCourseSummaryPageModule { }
diff --git a/src/core/features/course/pages/preview/preview.scss b/src/core/features/course/pages/course-summary/course-summary.scss
similarity index 100%
rename from src/core/features/course/pages/preview/preview.scss
rename to src/core/features/course/pages/course-summary/course-summary.scss
diff --git a/src/core/features/course/pages/preview/preview.page.ts b/src/core/features/course/pages/course-summary/course-summary.ts
similarity index 98%
rename from src/core/features/course/pages/preview/preview.page.ts
rename to src/core/features/course/pages/course-summary/course-summary.ts
index e53981367..547e9a6cb 100644
--- a/src/core/features/course/pages/preview/preview.page.ts
+++ b/src/core/features/course/pages/course-summary/course-summary.ts
@@ -39,14 +39,14 @@ import { CoreCourseWithImageAndColor } from '@features/courses/services/courses-
 import { Subscription } from 'rxjs';
 
 /**
- * Page that allows "previewing" a course and enrolling in it if enabled and not enrolled.
+ * Page that shows the summary of a course including buttons to enrol and other available options.
  */
 @Component({
-    selector: 'page-core-course-preview',
-    templateUrl: 'preview.html',
-    styleUrls: ['preview.scss'],
+    selector: 'page-core-course-summary',
+    templateUrl: 'course-summary.html',
+    styleUrls: ['course-summary.scss'],
 })
-export class CoreCoursePreviewPage implements OnInit, OnDestroy {
+export class CoreCourseSummaryPage implements OnInit, OnDestroy {
 
     @Input() course?: CoreCourseSummaryData;
     @Input() courseId = 0;
diff --git a/src/core/features/course/pages/index/index.module.ts b/src/core/features/course/pages/index/index.module.ts
index b3dcd1791..fafa96425 100644
--- a/src/core/features/course/pages/index/index.module.ts
+++ b/src/core/features/course/pages/index/index.module.ts
@@ -19,7 +19,7 @@ import { resolveModuleRoutes } from '@/app/app-routing.module';
 import { CoreSharedModule } from '@/core/shared.module';
 import { CoreCourseIndexPage } from '.';
 import { COURSE_INDEX_ROUTES } from './index-routing.module';
-import { CoreCoursePreviewPageComponentModule } from '../preview/preview.module';
+import { CoreCoursePreviewPageComponentModule } from '../course-summary/course-summary.module';
 
 function buildRoutes(injector: Injector): Routes {
     const routes = resolveModuleRoutes(injector, COURSE_INDEX_ROUTES);
diff --git a/src/core/features/course/pages/index/index.ts b/src/core/features/course/pages/index/index.ts
index cf49aea06..449058e33 100644
--- a/src/core/features/course/pages/index/index.ts
+++ b/src/core/features/course/pages/index/index.ts
@@ -28,7 +28,7 @@ import { CoreNavigator } from '@services/navigator';
 import { CONTENTS_PAGE_NAME } from '@features/course/course.module';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreCollapsibleHeaderDirective } from '@directives/collapsible-header';
-import { CoreCoursePreviewPage } from '../preview/preview.page';
+import { CoreCourseSummaryPage } from '../course-summary/course-summary';
 
 /**
  * Page that displays the list of courses the user is enrolled in.
@@ -281,7 +281,7 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
         }
 
         CoreDomUtils.openSideModal<void>({
-            component: CoreCoursePreviewPage,
+            component: CoreCourseSummaryPage,
             componentProps: {
                 courseId: this.course.id,
                 course: this.course,
diff --git a/src/core/features/courses/components/course-list-item/course-list-item.ts b/src/core/features/courses/components/course-list-item/course-list-item.ts
index c44645ed9..c73a3dd3a 100644
--- a/src/core/features/courses/components/course-list-item/course-list-item.ts
+++ b/src/core/features/courses/components/course-list-item/course-list-item.ts
@@ -171,7 +171,7 @@ export class CoreCoursesCourseListItemComponent implements OnInit, OnDestroy, On
             CoreCourseHelper.openCourse(this.course);
         } else {
             CoreNavigator.navigateToSitePath(
-                `/course/${this.course.id}/preview`,
+                `/course/${this.course.id}/summary`,
                 { params: { course: this.course } },
             );
         }
diff --git a/src/core/features/courses/services/handlers/enrol-push-click.ts b/src/core/features/courses/services/handlers/enrol-push-click.ts
index c606d3384..63408f432 100644
--- a/src/core/features/courses/services/handlers/enrol-push-click.ts
+++ b/src/core/features/courses/services/handlers/enrol-push-click.ts
@@ -66,7 +66,7 @@ export class CoreCoursesEnrolPushClickHandlerService implements CorePushNotifica
                 params.selectedTab = 'participants'; // @todo: Set this when participants is done.
             } else if (!result.enrolled) {
                 // User not enrolled anymore, open the preview page.
-                page += '/preview';
+                page += '/summary';
             }
 
             await CoreNavigator.navigateToSitePath(page, { params, siteId: notification.site });
diff --git a/src/core/features/courses/services/handlers/request-push-click.ts b/src/core/features/courses/services/handlers/request-push-click.ts
index 92fdea4fc..2eb12d9a9 100644
--- a/src/core/features/courses/services/handlers/request-push-click.ts
+++ b/src/core/features/courses/services/handlers/request-push-click.ts
@@ -79,7 +79,7 @@ export class CoreCoursesRequestPushClickHandlerService implements CorePushNotifi
 
             if (!result.enrolled) {
                 // User not enrolled (shouldn't happen), open the preview page.
-                page += '/preview';
+                page += '/summary';
             }
 
             await CoreNavigator.navigateToSitePath(page, { params, siteId: notification.site });
diff --git a/upgrade.txt b/upgrade.txt
index a7549b1c3..e943d0f93 100644
--- a/upgrade.txt
+++ b/upgrade.txt
@@ -18,6 +18,7 @@ information provided here is intended especially for developers.
 - CoreCourseHelperProvider.openCourse parameters changed, now it admits CoreNavigationOptions + siteId on the same object that includes Params passed to page.
 - displaySectionSelector has been deprecated on CoreCourseFormatHandler, use displayCourseIndex instead.
 - Most of the functions or callbacks that handle redirects/deeplinks have been modified to accept an object instead of just path + options. E.g.: CoreLoginHelper.isSiteLoggedOut, CoreLoginHelper.openBrowserForSSOLogin, CoreLoginHelper.openBrowserForOAuthLogin, CoreLoginHelper.prepareForSSOLogin, CoreApp.storeRedirect, CoreSites.loadSite.
+- Course preview page route has changed from course/:courseId/preview to course/:courseId/summary to match with the page name and characteristics.
 
 === 3.9.5 ===
 

From a626930e7250884f120615990614cddfadbbb59e Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 8 Feb 2022 14:38:35 +0100
Subject: [PATCH 0512/1008] MOBILE-3981 core: Optimize filepool tables

---
 .../classes/database/database-table-proxy.ts  |  40 +++-
 src/core/classes/database/database-table.ts   | 172 +++++++++++++++-
 .../classes/database/debug-database-table.ts  |  50 ++++-
 .../classes/database/eager-database-table.ts  |  61 +++++-
 .../classes/database/lazy-database-table.ts   |  31 ++-
 src/core/classes/sqlitedb.ts                  |  88 ++++-----
 src/core/classes/tests/database-table.test.ts |  40 +++-
 src/core/features/h5p/classes/framework.ts    |   3 +-
 src/core/services/filepool.ts                 | 186 +++++++++---------
 9 files changed, 489 insertions(+), 182 deletions(-)

diff --git a/src/core/classes/database/database-table-proxy.ts b/src/core/classes/database/database-table-proxy.ts
index bda6135bc..d9d676bcc 100644
--- a/src/core/classes/database/database-table-proxy.ts
+++ b/src/core/classes/database/database-table-proxy.ts
@@ -17,7 +17,13 @@ import { asyncInstance } from '@/core/utils/async-instance';
 import { SQLiteDB, SQLiteDBRecordValues } from '@classes/sqlitedb';
 import { CoreConfig, CoreConfigProvider } from '@services/config';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
-import { CoreDatabaseReducer, CoreDatabaseTable, CoreDatabaseConditions, GetDBRecordPrimaryKey } from './database-table';
+import {
+    CoreDatabaseReducer,
+    CoreDatabaseTable,
+    CoreDatabaseConditions,
+    GetDBRecordPrimaryKey,
+    CoreDatabaseQueryOptions,
+} from './database-table';
 import { CoreDebugDatabaseTable } from './debug-database-table';
 import { CoreEagerDatabaseTable } from './eager-database-table';
 import { CoreLazyDatabaseTable } from './lazy-database-table';
@@ -67,15 +73,25 @@ export class CoreDatabaseTableProxy<
     /**
      * @inheritdoc
      */
-    async getMany(conditions?: Partial<DBRecord>): Promise<DBRecord[]> {
-        return this.target.getMany(conditions);
+    async getMany(conditions?: Partial<DBRecord>, options?: Partial<CoreDatabaseQueryOptions<DBRecord>>): Promise<DBRecord[]> {
+        return this.target.getMany(conditions, options);
     }
 
     /**
      * @inheritdoc
      */
-    async getOne(conditions: Partial<DBRecord>): Promise<DBRecord> {
-        return this.target.getOne(conditions);
+    getManyWhere(conditions: CoreDatabaseConditions<DBRecord>): Promise<DBRecord[]>  {
+        return this.target.getManyWhere(conditions);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async getOne(
+        conditions?: Partial<DBRecord>,
+        options?: Partial<Omit<CoreDatabaseQueryOptions<DBRecord>, 'offset' | 'limit'>>,
+    ): Promise<DBRecord> {
+        return this.target.getOne(conditions, options);
     }
 
     /**
@@ -92,6 +108,20 @@ export class CoreDatabaseTableProxy<
         return this.target.reduce<T>(reducer, conditions);
     }
 
+    /**
+     * @inheritdoc
+     */
+    hasAny(conditions?: Partial<DBRecord>): Promise<boolean> {
+        return this.target.hasAny(conditions);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    count(conditions?: Partial<DBRecord>): Promise<number> {
+        return this.target.count(conditions);
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/src/core/classes/database/database-table.ts b/src/core/classes/database/database-table.ts
index f018b062c..6ff8f92d5 100644
--- a/src/core/classes/database/database-table.ts
+++ b/src/core/classes/database/database-table.ts
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { CoreError } from '@classes/errors/error';
 import { SQLiteDB, SQLiteDBRecordValue, SQLiteDBRecordValues } from '@classes/sqlitedb';
 
 /**
@@ -78,22 +79,57 @@ export class CoreDatabaseTable<
      * Get records matching the given conditions.
      *
      * @param conditions Matching conditions. If this argument is missing, all records in the table will be returned.
+     * @param options Query options.
      * @returns Database records.
      */
-    getMany(conditions?: Partial<DBRecord>): Promise<DBRecord[]> {
-        return conditions
-            ? this.database.getRecords(this.tableName, conditions)
-            : this.database.getAllRecords(this.tableName);
+    getMany(conditions?: Partial<DBRecord>, options?: Partial<CoreDatabaseQueryOptions<DBRecord>>): Promise<DBRecord[]> {
+        if (!conditions && !options) {
+            return this.database.getAllRecords(this.tableName);
+        }
+
+        const sorting = options?.sorting
+            && this.normalizedSorting(options.sorting).map(([column, direction]) => `${column} ${direction}`).join(', ');
+
+        return this.database.getRecords(this.tableName, conditions, sorting, '*', options?.offset, options?.limit);
+    }
+
+    /**
+     * Get records matching the given conditions.
+     *
+     * This method should be used when it's necessary to apply complex conditions; the simple `getMany`
+     * method should be favored otherwise for better performance.
+     *
+     * @param conditions Matching conditions in SQL and JavaScript.
+     */
+    getManyWhere(conditions: CoreDatabaseConditions<DBRecord>): Promise<DBRecord[]>  {
+        return this.database.getRecordsSelect(this.tableName, conditions.sql, conditions.sqlParams);
     }
 
     /**
      * Find one record matching the given conditions.
      *
      * @param conditions Matching conditions.
+     * @param options Result options.
      * @returns Database record.
      */
-    getOne(conditions: Partial<DBRecord>): Promise<DBRecord> {
-        return this.database.getRecord<DBRecord>(this.tableName, conditions);
+    async getOne(
+        conditions?: Partial<DBRecord>,
+        options?: Partial<Omit<CoreDatabaseQueryOptions<DBRecord>, 'offset' | 'limit'>>,
+    ): Promise<DBRecord> {
+        if (!options) {
+            return this.database.getRecord<DBRecord>(this.tableName, conditions);
+        }
+
+        const records = await this.getMany(conditions, {
+            ...options,
+            limit: 1,
+        });
+
+        if (records.length === 0) {
+            throw new CoreError('No records found.');
+        }
+
+        return records[0];
     }
 
     /**
@@ -121,6 +157,43 @@ export class CoreDatabaseTable<
         ) as unknown as Promise<T>;
     }
 
+    /**
+     * Check whether the table is empty or not.
+     *
+     * @returns Whether the table is empty or not.
+     */
+    isEmpty(): Promise<boolean> {
+        return this.hasAny();
+    }
+
+    /**
+     * Check whether the table has any record matching the given conditions.
+     *
+     * @param conditions Matching conditions. If this argument is missing, this method will return whether the table
+     *                   is empty or not.
+     * @returns Whether the table contains any records matching the given conditions.
+     */
+    async hasAny(conditions?: Partial<DBRecord>): Promise<boolean> {
+        try {
+            await this.getOne(conditions);
+
+            return true;
+        } catch (error) {
+            // Couldn't get a single record.
+            return false;
+        }
+    }
+
+    /**
+     * Count records in table.
+     *
+     * @param conditions Matching conditions.
+     * @returns Number of records matching the given conditions.
+     */
+    count(conditions?: Partial<DBRecord>): Promise<number> {
+        return this.database.countRecords(this.tableName, conditions);
+    }
+
     /**
      * Insert a new record.
      *
@@ -208,6 +281,59 @@ export class CoreDatabaseTable<
         return !Object.entries(conditions).some(([column, value]) => record[column] !== value);
     }
 
+    /**
+     * Sort a list of records with the given order. This method mutates the input array.
+     *
+     * @param records Array of records to sort.
+     * @param sorting Sorting conditions.
+     * @returns Sorted array. This will be the same reference that was given as an argument.
+     */
+    protected sortRecords(records: DBRecord[], sorting: CoreDatabaseSorting<DBRecord>): DBRecord[] {
+        const columnsSorting = this.normalizedSorting(sorting);
+
+        records.sort((a, b) => {
+            for (const [column, direction] of columnsSorting) {
+                const aValue = a[column];
+                const bValue = b[column];
+
+                if (aValue > bValue) {
+                    return direction === 'desc' ? -1 : 1;
+                }
+
+                if (aValue < bValue) {
+                    return direction === 'desc' ? 1 : -1;
+                }
+            }
+
+            return 0;
+        });
+
+        return records;
+    }
+
+    /**
+     * Get a normalized array of sorting conditions.
+     *
+     * @param sorting Sorting conditions.
+     * @returns Normalized sorting conditions.
+     */
+    protected normalizedSorting(sorting: CoreDatabaseSorting<DBRecord>): [keyof DBRecord, 'asc' | 'desc'][] {
+        const sortingArray = Array.isArray(sorting) ? sorting : [sorting];
+
+        return sortingArray.reduce((normalizedSorting, columnSorting) => {
+            normalizedSorting.push(
+                typeof columnSorting === 'object'
+                    ? [
+                        Object.keys(columnSorting)[0] as keyof DBRecord,
+                        Object.values(columnSorting)[0] as 'asc' | 'desc',
+                    ]
+                    : [columnSorting, 'asc'],
+            );
+
+            return normalizedSorting;
+        }, [] as [keyof DBRecord, 'asc' | 'desc'][]);
+    }
+
 }
 
 /**
@@ -238,3 +364,37 @@ export type CoreDatabaseConditions<DBRecord> = {
     sqlParams?: SQLiteDBRecordValue[];
     js: (record: DBRecord) => boolean;
 };
+
+/**
+ * Sorting conditions for a single column.
+ *
+ * This type will accept an object that defines sorting conditions for a single column, but not more.
+ * For example, `{id: 'desc'}` and `{name: 'asc'}` would be acceptend values, but `{id: 'desc', name: 'asc'}` wouldn't.
+ *
+ * @see https://stackoverflow.com/questions/57571664/typescript-type-for-an-object-with-only-one-key-no-union-type-allowed-as-a-key
+ */
+export type CoreDatabaseColumnSorting<DBRecordColumn extends string | symbol | number> = {
+    [Column in DBRecordColumn]:
+    (Record<Column, 'asc' | 'desc'> & Partial<Record<Exclude<DBRecordColumn, Column>, never>>) extends infer ColumnSorting
+        ? { [Column in keyof ColumnSorting]: ColumnSorting[Column] }
+        : never;
+}[DBRecordColumn];
+
+/**
+ * Sorting conditions to apply to query results.
+ *
+ * Columns will be sorted in ascending order by default.
+ */
+export type CoreDatabaseSorting<DBRecord> =
+    keyof DBRecord |
+    CoreDatabaseColumnSorting<keyof DBRecord> |
+    Array<keyof DBRecord | CoreDatabaseColumnSorting<keyof DBRecord>>;
+
+/**
+ * Options to configure query results.
+ */
+export type CoreDatabaseQueryOptions<DBRecord> = {
+    offset: number;
+    limit: number;
+    sorting: CoreDatabaseSorting<DBRecord>;
+};
diff --git a/src/core/classes/database/debug-database-table.ts b/src/core/classes/database/debug-database-table.ts
index 209c9abb1..f944b8a01 100644
--- a/src/core/classes/database/debug-database-table.ts
+++ b/src/core/classes/database/debug-database-table.ts
@@ -14,7 +14,13 @@
 
 import { SQLiteDBRecordValues } from '@classes/sqlitedb';
 import { CoreLogger } from '@singletons/logger';
-import { CoreDatabaseTable, CoreDatabaseConditions, GetDBRecordPrimaryKey, CoreDatabaseReducer } from './database-table';
+import {
+    CoreDatabaseTable,
+    CoreDatabaseConditions,
+    GetDBRecordPrimaryKey,
+    CoreDatabaseReducer,
+    CoreDatabaseQueryOptions,
+} from './database-table';
 
 /**
  * Database table proxy used to debug runtime operations.
@@ -58,19 +64,31 @@ export class CoreDebugDatabaseTable<
     /**
      * @inheritdoc
      */
-    getMany(conditions?: Partial<DBRecord>): Promise<DBRecord[]> {
-        this.logger.log('getMany', conditions);
+    getMany(conditions?: Partial<DBRecord>, options?: Partial<CoreDatabaseQueryOptions<DBRecord>>): Promise<DBRecord[]> {
+        this.logger.log('getMany', conditions, options);
 
-        return this.target.getMany(conditions);
+        return this.target.getMany(conditions, options);
     }
 
     /**
      * @inheritdoc
      */
-    getOne(conditions: Partial<DBRecord>): Promise<DBRecord> {
-        this.logger.log('getOne', conditions);
+    getManyWhere(conditions: CoreDatabaseConditions<DBRecord>): Promise<DBRecord[]> {
+        this.logger.log('getManyWhere', conditions);
 
-        return this.target.getOne(conditions);
+        return this.target.getManyWhere(conditions);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    getOne(
+        conditions?: Partial<DBRecord>,
+        options?: Partial<Omit<CoreDatabaseQueryOptions<DBRecord>, 'offset' | 'limit'>>,
+    ): Promise<DBRecord> {
+        this.logger.log('getOne', conditions, options);
+
+        return this.target.getOne(conditions, options);
     }
 
     /**
@@ -91,6 +109,24 @@ export class CoreDebugDatabaseTable<
         return this.target.reduce<T>(reducer, conditions);
     }
 
+    /**
+     * @inheritdoc
+     */
+    hasAny(conditions?: Partial<DBRecord>): Promise<boolean> {
+        this.logger.log('hasAny', conditions);
+
+        return this.target.hasAny(conditions);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    count(conditions?: Partial<DBRecord>): Promise<number> {
+        this.logger.log('count', conditions);
+
+        return this.target.count(conditions);
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/src/core/classes/database/eager-database-table.ts b/src/core/classes/database/eager-database-table.ts
index 37b09342c..461485df5 100644
--- a/src/core/classes/database/eager-database-table.ts
+++ b/src/core/classes/database/eager-database-table.ts
@@ -14,7 +14,13 @@
 
 import { CoreError } from '@classes/errors/error';
 import { SQLiteDBRecordValues } from '@classes/sqlitedb';
-import { CoreDatabaseTable, CoreDatabaseConditions, GetDBRecordPrimaryKey, CoreDatabaseReducer } from './database-table';
+import {
+    CoreDatabaseTable,
+    CoreDatabaseConditions,
+    GetDBRecordPrimaryKey,
+    CoreDatabaseReducer,
+    CoreDatabaseQueryOptions,
+} from './database-table';
 
 /**
  * Wrapper used to improve performance by caching all the records for faster read operations.
@@ -48,21 +54,44 @@ export class CoreEagerDatabaseTable<
     /**
      * @inheritdoc
      */
-    async getMany(conditions?: Partial<DBRecord>): Promise<DBRecord[]> {
+    async getMany(conditions?: Partial<DBRecord>, options?: Partial<CoreDatabaseQueryOptions<DBRecord>>): Promise<DBRecord[]> {
         const records = Object.values(this.records);
-
-        return conditions
+        const filteredRecords = conditions
             ? records.filter(record => this.recordMatches(record, conditions))
             : records;
+
+        if (options?.sorting) {
+            this.sortRecords(filteredRecords, options.sorting);
+        }
+
+        return filteredRecords.slice(options?.offset ?? 0, options?.limit);
     }
 
     /**
      * @inheritdoc
      */
-    async getOne(conditions: Partial<DBRecord>): Promise<DBRecord> {
-        const record = Object.values(this.records).find(record => this.recordMatches(record, conditions)) ?? null;
+    async getManyWhere(conditions: CoreDatabaseConditions<DBRecord>): Promise<DBRecord[]> {
+        return Object.values(this.records).filter(record => conditions.js(record));
+    }
 
-        if (record === null) {
+    /**
+     * @inheritdoc
+     */
+    async getOne(
+        conditions?: Partial<DBRecord>,
+        options?: Partial<Omit<CoreDatabaseQueryOptions<DBRecord>, 'offset' | 'limit'>>,
+    ): Promise<DBRecord> {
+        let record: DBRecord | undefined;
+
+        if (options?.sorting) {
+            record = this.getMany(conditions, { ...options, limit: 1 })[0];
+        } else if (conditions) {
+            record = Object.values(this.records).find(record => this.recordMatches(record, conditions));
+        } else {
+            record = Object.values(this.records)[0];
+        }
+
+        if (!record) {
             throw new CoreError('No records found.');
         }
 
@@ -94,6 +123,24 @@ export class CoreEagerDatabaseTable<
             );
     }
 
+    /**
+     * @inheritdoc
+     */
+    async hasAny(conditions?: Partial<DBRecord>): Promise<boolean> {
+        return conditions
+            ? Object.values(this.records).some(record => this.recordMatches(record, conditions))
+            : Object.values(this.records).length > 0;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async count(conditions?: Partial<DBRecord>): Promise<number> {
+        return conditions
+            ? Object.values(this.records).filter(record => this.recordMatches(record, conditions)).length
+            : Object.values(this.records).length;
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/src/core/classes/database/lazy-database-table.ts b/src/core/classes/database/lazy-database-table.ts
index 9ec890a20..489b21a54 100644
--- a/src/core/classes/database/lazy-database-table.ts
+++ b/src/core/classes/database/lazy-database-table.ts
@@ -14,7 +14,7 @@
 
 import { CoreError } from '@classes/errors/error';
 import { SQLiteDBRecordValues } from '@classes/sqlitedb';
-import { CoreDatabaseTable, CoreDatabaseConditions, GetDBRecordPrimaryKey } from './database-table';
+import { CoreDatabaseTable, CoreDatabaseConditions, GetDBRecordPrimaryKey, CoreDatabaseQueryOptions } from './database-table';
 
 /**
  * Wrapper used to improve performance by caching records that are used often for faster read operations.
@@ -33,15 +33,13 @@ export class CoreLazyDatabaseTable<
     /**
      * @inheritdoc
      */
-    async getOne(conditions: Partial<DBRecord>): Promise<DBRecord> {
-        let record: DBRecord | null =
-            Object.values(this.records).find(record => record && this.recordMatches(record, conditions)) ?? null;
+    async getOne(
+        conditions?: Partial<DBRecord>,
+        options?: Partial<Omit<CoreDatabaseQueryOptions<DBRecord>, 'offset' | 'limit'>>,
+    ): Promise<DBRecord> {
+        const record = await super.getOne(conditions, options);
 
-        if (!record) {
-            record = await super.getOne(conditions);
-
-            this.records[this.serializePrimaryKey(this.getPrimaryKeyFromRecord(record))] = record;
-        }
+        this.records[this.serializePrimaryKey(this.getPrimaryKeyFromRecord(record))] = record;
 
         return record;
     }
@@ -75,6 +73,21 @@ export class CoreLazyDatabaseTable<
         return record;
     }
 
+    /**
+     * @inheritdoc
+     */
+    async hasAny(conditions?: Partial<DBRecord>): Promise<boolean> {
+        const hasAnyMatching = Object
+            .values(this.records)
+            .some(record => record !== null && (!conditions || this.recordMatches(record, conditions)));
+
+        if (hasAnyMatching) {
+            return true;
+        }
+
+        return super.hasAny(conditions);
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/src/core/classes/sqlitedb.ts b/src/core/classes/sqlitedb.ts
index 915ea9ffb..fc5f762e9 100644
--- a/src/core/classes/sqlitedb.ts
+++ b/src/core/classes/sqlitedb.ts
@@ -136,6 +136,50 @@ export interface SQLiteDBForeignKeySchema {
  */
 export class SQLiteDB {
 
+    /**
+     * Constructs 'IN()' or '=' sql fragment
+     *
+     * @param items A single value or array of values for the expression. It doesn't accept objects.
+     * @param equal True means we want to equate to the constructed expression.
+     * @param onEmptyItems This defines the behavior when the array of items provided is empty. Defaults to false,
+     *                     meaning return empty. Other values will become part of the returned SQL fragment.
+     * @return A list containing the constructed sql fragment and an array of parameters.
+     */
+    static getInOrEqual(
+        items: SQLiteDBRecordValue | SQLiteDBRecordValue[],
+        equal: boolean = true,
+        onEmptyItems?: SQLiteDBRecordValue | null,
+    ): SQLiteDBQueryParams {
+        let sql = '';
+        let params: SQLiteDBRecordValue[];
+
+        // Default behavior, return empty data on empty array.
+        if (Array.isArray(items) && !items.length && onEmptyItems === undefined) {
+            return { sql: '', params: [] };
+        }
+
+        // Handle onEmptyItems on empty array of items.
+        if (Array.isArray(items) && !items.length) {
+            if (onEmptyItems === null) { // Special case, NULL value.
+                sql = equal ? ' IS NULL' : ' IS NOT NULL';
+
+                return { sql, params: [] };
+            } else {
+                items = [onEmptyItems as SQLiteDBRecordValue]; // Rest of cases, prepare items for processing.
+            }
+        }
+
+        if (!Array.isArray(items) || items.length == 1) {
+            sql = equal ? '= ?' : '<> ?';
+            params = Array.isArray(items) ? items : [items];
+        } else {
+            sql = (equal ? '' : 'NOT ') + 'IN (' + ',?'.repeat(items.length).substring(1) + ')';
+            params = items;
+        }
+
+        return { sql, params };
+    }
+
     db?: SQLiteObject;
     promise!: Promise<void>;
 
@@ -564,50 +608,6 @@ export class SQLiteDB {
         return record[Object.keys(record)[0]];
     }
 
-    /**
-     * Constructs 'IN()' or '=' sql fragment
-     *
-     * @param items A single value or array of values for the expression. It doesn't accept objects.
-     * @param equal True means we want to equate to the constructed expression.
-     * @param onEmptyItems This defines the behavior when the array of items provided is empty. Defaults to false,
-     *                     meaning return empty. Other values will become part of the returned SQL fragment.
-     * @return A list containing the constructed sql fragment and an array of parameters.
-     */
-    getInOrEqual(
-        items: SQLiteDBRecordValue | SQLiteDBRecordValue[],
-        equal: boolean = true,
-        onEmptyItems?: SQLiteDBRecordValue | null,
-    ): SQLiteDBQueryParams {
-        let sql = '';
-        let params: SQLiteDBRecordValue[];
-
-        // Default behavior, return empty data on empty array.
-        if (Array.isArray(items) && !items.length && onEmptyItems === undefined) {
-            return { sql: '', params: [] };
-        }
-
-        // Handle onEmptyItems on empty array of items.
-        if (Array.isArray(items) && !items.length) {
-            if (onEmptyItems === null || onEmptyItems === undefined) { // Special case, NULL value.
-                sql = equal ? ' IS NULL' : ' IS NOT NULL';
-
-                return { sql, params: [] };
-            } else {
-                items = [onEmptyItems]; // Rest of cases, prepare items for processing.
-            }
-        }
-
-        if (!Array.isArray(items) || items.length == 1) {
-            sql = equal ? '= ?' : '<> ?';
-            params = Array.isArray(items) ? items : [items];
-        } else {
-            sql = (equal ? '' : 'NOT ') + 'IN (' + ',?'.repeat(items.length).substring(1) + ')';
-            params = items;
-        }
-
-        return { sql, params };
-    }
-
     /**
      * Get the database name.
      *
diff --git a/src/core/classes/tests/database-table.test.ts b/src/core/classes/tests/database-table.test.ts
index a942959c1..2cf4840b0 100644
--- a/src/core/classes/tests/database-table.test.ts
+++ b/src/core/classes/tests/database-table.test.ts
@@ -13,20 +13,20 @@
 // limitations under the License.
 
 import { mock, mockSingleton } from '@/testing/utils';
-import { CoreDatabaseTable } from '@classes/database/database-table';
+import { CoreDatabaseSorting, CoreDatabaseTable } from '@classes/database/database-table';
 import {
     CoreDatabaseCachingStrategy,
     CoreDatabaseConfiguration,
     CoreDatabaseTableProxy,
 } from '@classes/database/database-table-proxy';
-import { SQLiteDB, SQLiteDBRecordValues } from '@classes/sqlitedb';
+import { SQLiteDB } from '@classes/sqlitedb';
 import { CoreConfig } from '@services/config';
 
-interface User extends SQLiteDBRecordValues {
+type User = {
     id: number;
     name: string;
     surname: string;
-}
+};
 
 function userMatches(user: User, conditions: Partial<User>) {
     return !Object.entries(conditions).some(([column, value]) => user[column] !== value);
@@ -45,7 +45,7 @@ function prepareStubs(config: Partial<CoreDatabaseConfiguration> = {}): [User[],
             return record as unknown as T;
         },
         getRecords: async <T>(_, conditions) => records.filter(record => userMatches(record, conditions)) as unknown as T[],
-        getAllRecords: async <T>() => records as unknown as T[],
+        getAllRecords: async <T>() => records.slice(0) as unknown as T[],
         deleteRecords: async (_, conditions) => {
             const usersToDelete: User[] = [];
 
@@ -81,10 +81,10 @@ async function testFindItems(records: User[], table: CoreDatabaseTable<User>) {
 
     await table.initialize();
 
-    await expect(table.getOneByPrimaryKey({ id: 1 })).resolves.toEqual(john);
-    await expect(table.getOneByPrimaryKey({ id: 2 })).resolves.toEqual(amy);
     await expect(table.getOne({ surname: 'Doe', name: 'John' })).resolves.toEqual(john);
     await expect(table.getOne({ surname: 'Doe', name: 'Amy' })).resolves.toEqual(amy);
+    await expect(table.getOneByPrimaryKey({ id: 1 })).resolves.toEqual(john);
+    await expect(table.getOneByPrimaryKey({ id: 2 })).resolves.toEqual(amy);
 }
 
 async function testInsertItems(records: User[], database: SQLiteDB, table: CoreDatabaseTable<User>) {
@@ -165,6 +165,32 @@ describe('CoreDatabaseTable with eager caching', () => {
         expect(database.getRecord).not.toHaveBeenCalled();
     });
 
+    it('sorts items', async () => {
+        // Arrange.
+        const john = { id: 1, name: 'John', surname: 'Doe' };
+        const amy = { id: 2, name: 'Amy', surname: 'Doe' };
+        const jane = { id: 3, name: 'Jane', surname: 'Smith' };
+        const expectSorting = async (sorting: CoreDatabaseSorting<User>, expectedResults: User[]) => {
+            const results = await table.getMany({}, { sorting });
+
+            expect(results).toEqual(expectedResults);
+        };
+
+        records.push(john);
+        records.push(amy);
+        records.push(jane);
+
+        await table.initialize();
+
+        // Act & Assert.
+        await expectSorting('name', [amy, jane, john]);
+        await expectSorting('surname', [john, amy, jane]);
+        await expectSorting({ name: 'desc' }, [john, jane, amy]);
+        await expectSorting({ surname: 'desc' }, [jane, john, amy]);
+        await expectSorting(['name', { surname: 'desc' }], [amy, jane, john]);
+        await expectSorting([{ surname: 'desc' }, 'name'], [jane, amy, john]);
+    });
+
     it('inserts items', () => testInsertItems(records, database, table));
     it('deletes items', () => testDeleteItems(records, database, table));
     it('deletes items by primary key', () => testDeleteItemsByPrimaryKey(records, database, table));
diff --git a/src/core/features/h5p/classes/framework.ts b/src/core/features/h5p/classes/framework.ts
index 6386d853e..8b20463dc 100644
--- a/src/core/features/h5p/classes/framework.ts
+++ b/src/core/features/h5p/classes/framework.ts
@@ -43,6 +43,7 @@ import { CoreH5PContentBeingSaved, CoreH5PLibraryBeingSaved } from './storage';
 import { CoreH5PLibraryAddTo, CoreH5PLibraryMetadataSettings } from './validator';
 import { CoreH5PMetadata } from './metadata';
 import { Translate } from '@singletons';
+import { SQLiteDB } from '@classes/sqlitedb';
 
 /**
  * Equivalent to Moodle's implementation of H5PFrameworkInterface.
@@ -64,7 +65,7 @@ export class CoreH5PFramework {
 
         const db = await CoreSites.getSiteDb(siteId);
 
-        const whereAndParams = db.getInOrEqual(libraryIds);
+        const whereAndParams = SQLiteDB.getInOrEqual(libraryIds);
         whereAndParams.sql = 'mainlibraryid ' + whereAndParams.sql;
 
         await db.updateRecordsWhere(CONTENT_TABLE_NAME, { filtered: null }, whereAndParams.sql, whereAndParams.params);
diff --git a/src/core/services/filepool.ts b/src/core/services/filepool.ts
index 06b54fb61..fd11e1fe5 100644
--- a/src/core/services/filepool.ts
+++ b/src/core/services/filepool.ts
@@ -49,7 +49,7 @@ import {
 import { CoreFileHelper } from './file-helper';
 import { CoreUrl } from '@singletons/url';
 import { CoreDatabaseTable } from '@classes/database/database-table';
-import { CoreDatabaseCachingStrategy } from '@classes/database/database-table-proxy';
+import { CoreDatabaseCachingStrategy, CoreDatabaseTableProxy } from '@classes/database/database-table-proxy';
 import { lazyMap, LazyMap } from '../utils/lazy-map';
 import { asyncInstance, AsyncInstance } from '../utils/async-instance';
 
@@ -98,14 +98,14 @@ export class CoreFilepoolProvider {
     // Variables to prevent downloading packages/files twice at the same time.
     protected packagesPromises: { [s: string]: { [s: string]: Promise<void> } } = {};
     protected filePromises: { [s: string]: { [s: string]: Promise<string> } } = {};
-
-    // Variables for DB.
-    protected appDB: Promise<SQLiteDB>;
-    protected resolveAppDB!: (appDB: SQLiteDB) => void;
     protected filesTables: LazyMap<AsyncInstance<CoreDatabaseTable<CoreFilepoolFileEntry, 'fileId'>>>;
+    protected linksTables:
+        LazyMap<AsyncInstance<CoreDatabaseTable<CoreFilepoolLinksRecord, 'fileId' | 'component' | 'componentId'>>>;
+
+    protected packagesTables: LazyMap<AsyncInstance<CoreDatabaseTable<CoreFilepoolPackageEntry>>>;
+    protected queueTable = asyncInstance<CoreDatabaseTable<CoreFilepoolQueueDBEntry, 'siteId' | 'fileId'>>();
 
     constructor() {
-        this.appDB = new Promise(resolve => this.resolveAppDB = resolve);
         this.logger = CoreLogger.getInstance('CoreFilepoolProvider');
         this.filesTables = lazyMap(
             siteId => asyncInstance(
@@ -116,6 +116,23 @@ export class CoreFilepoolProvider {
                 }),
             ),
         );
+        this.linksTables = lazyMap(
+            siteId => asyncInstance(
+                () => CoreSites.getSiteTable<CoreFilepoolLinksRecord, 'fileId' | 'component' | 'componentId'>(LINKS_TABLE_NAME, {
+                    siteId,
+                    config: { cachingStrategy: CoreDatabaseCachingStrategy.Lazy },
+                    primaryKeyColumns: ['fileId', 'component', 'componentId'],
+                }),
+            ),
+        );
+        this.packagesTables = lazyMap(
+            siteId => asyncInstance(
+                () => CoreSites.getSiteTable<CoreFilepoolPackageEntry, 'id'>(PACKAGES_TABLE_NAME, {
+                    siteId,
+                    config: { cachingStrategy: CoreDatabaseCachingStrategy.Lazy },
+                }),
+            ),
+        );
     }
 
     /**
@@ -154,7 +171,16 @@ export class CoreFilepoolProvider {
             // Ignore errors.
         }
 
-        this.resolveAppDB(CoreApp.getDB());
+        const queueTable = new CoreDatabaseTableProxy<CoreFilepoolQueueDBEntry, 'siteId' | 'fileId'>(
+            { cachingStrategy: CoreDatabaseCachingStrategy.Lazy },
+            CoreApp.getDB(),
+            QUEUE_TABLE_NAME,
+            ['siteId','fileId'],
+        );
+
+        await queueTable.initialize();
+
+        this.queueTable.setInstance(queueTable);
     }
 
     /**
@@ -171,16 +197,11 @@ export class CoreFilepoolProvider {
             throw new CoreError('Cannot add link because component is invalid.');
         }
 
-        componentId = this.fixComponentId(componentId);
-
-        const db = await CoreSites.getSiteDb(siteId);
-        const newEntry: CoreFilepoolLinksRecord = {
+        await this.linksTables[siteId].insert({
             fileId,
             component,
-            componentId: componentId || '',
-        };
-
-        await db.insertRecord(LINKS_TABLE_NAME, newEntry);
+            componentId: this.fixComponentId(componentId) || '',
+        });
     }
 
     /**
@@ -301,9 +322,7 @@ export class CoreFilepoolProvider {
     ): Promise<void> {
         this.logger.debug(`Adding ${fileId} to the queue`);
 
-        const db = await this.appDB;
-
-        await db.insertRecord(QUEUE_TABLE_NAME, {
+        await this.queueTable.insert({
             siteId,
             fileId,
             url,
@@ -431,10 +450,7 @@ export class CoreFilepoolProvider {
             // Update only when required.
             this.logger.debug(`Updating file ${fileId} which is already in queue`);
 
-            const db = await this.appDB;
-
-            return db.updateRecords(QUEUE_TABLE_NAME, newData, primaryKey).then(() =>
-                this.getQueuePromise(siteId, fileId, true, onProgress));
+            return this.queueTable.update(newData, primaryKey).then(() => this.getQueuePromise(siteId, fileId, true, onProgress));
         }
 
         this.logger.debug(`File ${fileId} already in queue and does not require update`);
@@ -560,11 +576,10 @@ export class CoreFilepoolProvider {
     async clearAllPackagesStatus(siteId: string): Promise<void> {
         this.logger.debug('Clear all packages status for site ' + siteId);
 
-        const site = await CoreSites.getSite(siteId);
         // Get all the packages to be able to "notify" the change in the status.
-        const entries: CoreFilepoolPackageEntry[] = await site.getDb().getAllRecords(PACKAGES_TABLE_NAME);
+        const entries = await this.packagesTables[siteId].getMany();
         // Delete all the entries.
-        await site.getDb().deleteRecords(PACKAGES_TABLE_NAME);
+        await this.packagesTables[siteId].delete();
 
         entries.forEach((entry) => {
             if (!entry.component) {
@@ -583,15 +598,13 @@ export class CoreFilepoolProvider {
      * @return Promise resolved when the filepool is cleared.
      */
     async clearFilepool(siteId: string): Promise<void> {
-        const db = await CoreSites.getSiteDb(siteId);
-
         // Read the data first to be able to notify the deletions.
         const filesEntries = await this.filesTables[siteId].getMany();
-        const filesLinks = await db.getAllRecords<CoreFilepoolLinksRecord>(LINKS_TABLE_NAME);
+        const filesLinks = await this.linksTables[siteId].getMany();
 
         await Promise.all([
             this.filesTables[siteId].delete(),
-            db.deleteRecords(LINKS_TABLE_NAME),
+            this.linksTables[siteId].delete(),
         ]);
 
         // Notify now.
@@ -609,14 +622,14 @@ export class CoreFilepoolProvider {
      * @return Resolved means yes, rejected means no.
      */
     async componentHasFiles(siteId: string, component: string, componentId?: string | number): Promise<void> {
-        const db = await CoreSites.getSiteDb(siteId);
         const conditions = {
             component,
             componentId: this.fixComponentId(componentId),
         };
 
-        const count = await db.countRecords(LINKS_TABLE_NAME, conditions);
-        if (count <= 0) {
+        const hasAnyLinks = await this.linksTables[siteId].hasAny(conditions);
+
+        if (!hasAnyLinks) {
             throw new CoreError('Component doesn\'t have files');
         }
     }
@@ -1144,7 +1157,6 @@ export class CoreFilepoolProvider {
             return;
         }
 
-        const db = await CoreSites.getSiteDb(siteId);
         const extension = CoreMimetypeUtils.getFileExtension(entry.path);
         if (!extension) {
             // Files does not have extension. Invalidate file (stale = true).
@@ -1170,7 +1182,7 @@ export class CoreFilepoolProvider {
         }
 
         // Now update the links.
-        await db.updateRecords(LINKS_TABLE_NAME, { fileId: entry.fileId }, { fileId });
+        await this.linksTables[siteId].update({ fileId: entry.fileId }, { fileId });
     }
 
     /**
@@ -1228,16 +1240,18 @@ export class CoreFilepoolProvider {
      * @return Promise resolved with the files.
      */
     protected async getComponentFiles(
-        db: SQLiteDB,
+        siteId: string | undefined,
         component: string,
         componentId?: string | number,
     ): Promise<CoreFilepoolLinksRecord[]> {
+        siteId = siteId ?? CoreSites.getCurrentSiteId();
         const conditions = {
             component,
             componentId: this.fixComponentId(componentId),
         };
 
-        const items = await db.getRecords<CoreFilepoolLinksRecord>(LINKS_TABLE_NAME, conditions);
+        const items = await this.linksTables[siteId].getMany(conditions);
+
         items.forEach((item) => {
             item.componentId = this.fixComponentId(item.componentId);
         });
@@ -1349,8 +1363,7 @@ export class CoreFilepoolProvider {
      * @return Promise resolved with the links.
      */
     protected async getFileLinks(siteId: string, fileId: string): Promise<CoreFilepoolLinksRecord[]> {
-        const db = await CoreSites.getSiteDb(siteId);
-        const items = await db.getRecords<CoreFilepoolLinksRecord>(LINKS_TABLE_NAME, { fileId });
+        const items = await this.linksTables[siteId].getMany({ fileId });
 
         items.forEach((item) => {
             item.componentId = this.fixComponentId(item.componentId);
@@ -1421,8 +1434,7 @@ export class CoreFilepoolProvider {
      * @return Promise resolved with the files on success.
      */
     async getFilesByComponent(siteId: string, component: string, componentId?: string | number): Promise<CoreFilepoolFileEntry[]> {
-        const db = await CoreSites.getSiteDb(siteId);
-        const items = await this.getComponentFiles(db, component, componentId);
+        const items = await this.getComponentFiles(siteId, component, componentId);
         const files: CoreFilepoolFileEntry[] = [];
 
         await Promise.all(items.map(async (item) => {
@@ -1706,10 +1718,9 @@ export class CoreFilepoolProvider {
     async getPackageData(siteId: string, component: string, componentId?: string | number): Promise<CoreFilepoolPackageEntry> {
         componentId = this.fixComponentId(componentId);
 
-        const site = await CoreSites.getSite(siteId);
         const packageId = this.getPackageId(component, componentId);
 
-        return site.getDb().getRecord(PACKAGES_TABLE_NAME, { id: packageId });
+        return this.packagesTables[siteId].getOneByPrimaryKey({ id: packageId });
     }
 
     /**
@@ -2171,16 +2182,16 @@ export class CoreFilepoolProvider {
      * @return Resolved with file object from DB on success, rejected otherwise.
      */
     protected async hasFileInQueue(siteId: string, fileId: string): Promise<CoreFilepoolQueueEntry> {
-        const db = await this.appDB;
-        const entry = await db.getRecord<CoreFilepoolQueueEntry>(QUEUE_TABLE_NAME, { siteId, fileId });
+        const entry = await this.queueTable.getOneByPrimaryKey({ siteId, fileId });
 
         if (entry === undefined) {
             throw new CoreError('File not found in queue.');
         }
-        // Convert the links to an object.
-        entry.linksUnserialized = <CoreFilepoolComponentLink[]> CoreTextUtils.parseJSON(entry.links || '[]', []);
 
-        return entry;
+        return {
+            ...entry,
+            linksUnserialized: CoreTextUtils.parseJSON(entry.links, []),
+        };
     }
 
     /**
@@ -2238,8 +2249,7 @@ export class CoreFilepoolProvider {
         componentId?: string | number,
         onlyUnknown: boolean = true,
     ): Promise<void> {
-        const db = await CoreSites.getSiteDb(siteId);
-        const items = await this.getComponentFiles(db, component, componentId);
+        const items = await this.getComponentFiles(siteId, component, componentId);
 
         if (!items.length) {
             // Nothing to invalidate.
@@ -2250,7 +2260,7 @@ export class CoreFilepoolProvider {
 
         const fileIds = items.map((item) => item.fileId);
 
-        const whereAndParams = db.getInOrEqual(fileIds);
+        const whereAndParams = SQLiteDB.getInOrEqual(fileIds);
 
         whereAndParams.sql = 'fileId ' + whereAndParams.sql;
 
@@ -2523,30 +2533,25 @@ export class CoreFilepoolProvider {
      * @return Resolved on success. Rejected on failure.
      */
     protected async processImportantQueueItem(): Promise<void> {
-        let items: CoreFilepoolQueueEntry[];
-        const db = await this.appDB;
-
         try {
-            items = await db.getRecords<CoreFilepoolQueueEntry>(
-                QUEUE_TABLE_NAME,
-                undefined,
-                'priority DESC, added ASC',
-                undefined,
-                0,
-                1,
-            );
+            const item = await this.queueTable.getOne({}, {
+                sorting: [
+                    { priority: 'desc' },
+                    { added: 'asc' },
+                ],
+            });
+
+            if (!item) {
+                throw CoreFilepoolProvider.ERR_QUEUE_IS_EMPTY;
+            }
+
+            return this.processQueueItem({
+                ...item,
+                linksUnserialized: CoreTextUtils.parseJSON(item.links, []),
+            });
         } catch (err) {
             throw CoreFilepoolProvider.ERR_QUEUE_IS_EMPTY;
         }
-
-        const item = items.pop();
-        if (!item) {
-            throw CoreFilepoolProvider.ERR_QUEUE_IS_EMPTY;
-        }
-        // Convert the links to an object.
-        item.linksUnserialized = <CoreFilepoolComponentLink[]> CoreTextUtils.parseJSON(item.links, []);
-
-        return this.processQueueItem(item);
     }
 
     /**
@@ -2671,9 +2676,7 @@ export class CoreFilepoolProvider {
      * @return Resolved on success. Rejected on failure. It is advised to silently ignore failures.
      */
     protected async removeFromQueue(siteId: string, fileId: string): Promise<void> {
-        const db = await this.appDB;
-
-        await db.deleteRecords(QUEUE_TABLE_NAME, { siteId, fileId });
+        await this.queueTable.deleteByPrimaryKey({ siteId, fileId });
     }
 
     /**
@@ -2684,8 +2687,6 @@ export class CoreFilepoolProvider {
      * @return Resolved on success.
      */
     protected async removeFileById(siteId: string, fileId: string): Promise<void> {
-        const db = await CoreSites.getSiteDb(siteId);
-
         // Get the path to the file first since it relies on the file object stored in the pool.
         // Don't use getFilePath to prevent performing 2 DB requests.
         let path = this.getFilepoolFolderPath(siteId) + '/' + fileId;
@@ -2714,7 +2715,7 @@ export class CoreFilepoolProvider {
         promises.push(this.filesTables[siteId].delete(conditions));
 
         // Remove links.
-        promises.push(db.deleteRecords(LINKS_TABLE_NAME, conditions));
+        promises.push(this.linksTables[siteId].delete(conditions));
 
         // Remove the file.
         if (CoreFile.isAvailable()) {
@@ -2745,8 +2746,7 @@ export class CoreFilepoolProvider {
      * @return Resolved on success.
      */
     async removeFilesByComponent(siteId: string, component: string, componentId?: string | number): Promise<void> {
-        const db = await CoreSites.getSiteDb(siteId);
-        const items = await this.getComponentFiles(db, component, componentId);
+        const items = await this.getComponentFiles(siteId, component, componentId);
 
         await Promise.all(items.map((item) => this.removeFileById(siteId, item.fileId)));
     }
@@ -2795,11 +2795,10 @@ export class CoreFilepoolProvider {
         componentId = this.fixComponentId(componentId);
         this.logger.debug(`Set previous status for package ${component} ${componentId}`);
 
-        const site = await CoreSites.getSite(siteId);
         const packageId = this.getPackageId(component, componentId);
 
         // Get current stored data, we'll only update 'status' and 'updated' fields.
-        const entry = <CoreFilepoolPackageEntry> site.getDb().getRecord(PACKAGES_TABLE_NAME, { id: packageId });
+        const entry = await this.packagesTables[siteId].getOneByPrimaryKey({ id: packageId });
         const newData: CoreFilepoolPackageEntry = {};
         if (entry.status == CoreConstants.DOWNLOADING) {
             // Going back from downloading to previous status, restore previous download time.
@@ -2809,9 +2808,9 @@ export class CoreFilepoolProvider {
         newData.updated = Date.now();
         this.logger.debug(`Set previous status '${entry.status}' for package ${component} ${componentId}`);
 
-        await site.getDb().updateRecords(PACKAGES_TABLE_NAME, newData, { id: packageId });
+        await this.packagesTables[siteId].update(newData, { id: packageId });
         // Success updating, trigger event.
-        this.triggerPackageStatusChanged(site.getId(), newData.status, component, componentId);
+        this.triggerPackageStatusChanged(siteId, newData.status, component, componentId);
 
         return newData.status;
     }
@@ -2900,7 +2899,6 @@ export class CoreFilepoolProvider {
         this.logger.debug(`Set status '${status}' for package ${component} ${componentId}`);
         componentId = this.fixComponentId(componentId);
 
-        const site = await CoreSites.getSite(siteId);
         const packageId = this.getPackageId(component, componentId);
         let downloadTime: number | undefined;
         let previousDownloadTime: number | undefined;
@@ -2913,7 +2911,7 @@ export class CoreFilepoolProvider {
         let previousStatus: string | undefined;
         // Search current status to set it as previous status.
         try {
-            const entry = await site.getDb().getRecord<CoreFilepoolPackageEntry>(PACKAGES_TABLE_NAME, { id: packageId });
+            const entry = await this.packagesTables[siteId].getOneByPrimaryKey({ id: packageId });
 
             extra = extra ?? entry.extra;
             if (downloadTime === undefined) {
@@ -2930,7 +2928,12 @@ export class CoreFilepoolProvider {
             // No previous status.
         }
 
-        const packageEntry: CoreFilepoolPackageEntry = {
+        if (previousStatus === status) {
+            // The package already has this status, no need to change it.
+            return;
+        }
+
+        await this.packagesTables[siteId].insert({
             id: packageId,
             component,
             componentId,
@@ -2940,14 +2943,7 @@ export class CoreFilepoolProvider {
             downloadTime,
             previousDownloadTime,
             extra,
-        };
-
-        if (previousStatus === status) {
-            // The package already has this status, no need to change it.
-            return;
-        }
-
-        await site.getDb().insertRecord(PACKAGES_TABLE_NAME, packageEntry);
+        });
 
         // Success inserting, trigger event.
         this.triggerPackageStatusChanged(siteId, status, component, componentId);
@@ -3067,11 +3063,9 @@ export class CoreFilepoolProvider {
     async updatePackageDownloadTime(siteId: string, component: string, componentId?: string | number): Promise<void> {
         componentId = this.fixComponentId(componentId);
 
-        const site = await CoreSites.getSite(siteId);
         const packageId = this.getPackageId(component, componentId);
 
-        await site.getDb().updateRecords(
-            PACKAGES_TABLE_NAME,
+        await this.packagesTables[siteId].update(
             { downloadTime: CoreTimeUtils.timestamp() },
             { id: packageId },
         );

From df2388297d9f54e6499ab6119509aad55d99f502 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 8 Feb 2022 14:46:51 +0100
Subject: [PATCH 0513/1008] MOBILE-3981 core: Optimize app tables

---
 src/core/services/app.ts | 68 +++++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 32 deletions(-)

diff --git a/src/core/services/app.ts b/src/core/services/app.ts
index e0710a084..95031a923 100644
--- a/src/core/services/app.ts
+++ b/src/core/services/app.ts
@@ -25,14 +25,9 @@ import { CoreColors } from '@singletons/colors';
 import { DBNAME, SCHEMA_VERSIONS_TABLE_NAME, SCHEMA_VERSIONS_TABLE_SCHEMA, SchemaVersionsDBEntry } from '@services/database/app';
 import { CoreObject } from '@singletons/object';
 import { CoreRedirectPayload } from './navigator';
-
-/**
- * Object responsible of managing schema versions.
- */
-type SchemaVersionsManager = {
-    get(schemaName: string): Promise<number>;
-    set(schemaName: string, version: number): Promise<void>;
-};
+import { CoreDatabaseCachingStrategy, CoreDatabaseTableProxy } from '@classes/database/database-table-proxy';
+import { asyncInstance } from '../utils/async-instance';
+import { CoreDatabaseTable } from '@classes/database/database-table';
 
 /**
  * Factory to provide some global functionalities, like access to the global app database.
@@ -58,13 +53,9 @@ export class CoreAppProvider {
     protected keyboardClosing = false;
     protected forceOffline = false;
     protected redirect?: CoreRedirectData;
-
-    // Variables for DB.
-    protected schemaVersionsManager: Promise<SchemaVersionsManager>;
-    protected resolveSchemaVersionsManager!: (schemaVersionsManager: SchemaVersionsManager) => void;
+    protected schemaVersionsTable = asyncInstance<CoreDatabaseTable<SchemaVersionsDBEntry, 'name'>>();
 
     constructor() {
-        this.schemaVersionsManager = new Promise(resolve => this.resolveSchemaVersionsManager = resolve);
         this.logger = CoreLogger.getInstance('CoreAppProvider');
     }
 
@@ -81,24 +72,20 @@ export class CoreAppProvider {
      * Initialize database.
      */
     async initializeDatabase(): Promise<void> {
-        await this.getDB().createTableFromSchema(SCHEMA_VERSIONS_TABLE_SCHEMA);
+        const database = this.getDB();
 
-        this.resolveSchemaVersionsManager({
-            get: async name => {
-                try {
-                    // Fetch installed version of the schema.
-                    const entry = await this.getDB().getRecord<SchemaVersionsDBEntry>(SCHEMA_VERSIONS_TABLE_NAME, { name });
+        await database.createTableFromSchema(SCHEMA_VERSIONS_TABLE_SCHEMA);
 
-                    return entry.version;
-                } catch (error) {
-                    // No installed version yet.
-                    return 0;
-                }
-            },
-            set: async (name, version) => {
-                await this.getDB().insertRecord(SCHEMA_VERSIONS_TABLE_NAME, { name, version });
-            },
-        });
+        const schemaVersionsTable = new CoreDatabaseTableProxy<SchemaVersionsDBEntry, 'name'>(
+            { cachingStrategy: CoreDatabaseCachingStrategy.Eager },
+            database,
+            SCHEMA_VERSIONS_TABLE_NAME,
+            ['name'],
+        );
+
+        await schemaVersionsTable.initialize();
+
+        this.schemaVersionsTable.setInstance(schemaVersionsTable);
     }
 
     /**
@@ -137,8 +124,7 @@ export class CoreAppProvider {
     async createTablesFromSchema(schema: CoreAppSchema): Promise<void> {
         this.logger.debug(`Apply schema to app DB: ${schema.name}`);
 
-        const schemaVersionsManager = await this.schemaVersionsManager;
-        const oldVersion = await schemaVersionsManager.get(schema.name);
+        const oldVersion = await this.getInstalledSchemaVersion(schema);
 
         if (oldVersion >= schema.version) {
             // Version already installed, nothing else to do.
@@ -155,7 +141,7 @@ export class CoreAppProvider {
         }
 
         // Set installed version.
-        schemaVersionsManager.set(schema.name, schema.version);
+        await this.schemaVersionsTable.insert({ name: schema.name, version: schema.version });
     }
 
     /**
@@ -683,6 +669,24 @@ export class CoreAppProvider {
         this.forceOffline = !!value;
     }
 
+    /**
+     * Get the installed version for the given schema.
+     *
+     * @param schema App schema.
+     * @returns Installed version number, or 0 if the schema is not installed.
+     */
+    protected async getInstalledSchemaVersion(schema: CoreAppSchema): Promise<number> {
+        try {
+            // Fetch installed version of the schema.
+            const entry = await this.schemaVersionsTable.getOneByPrimaryKey({ name: schema.name });
+
+            return entry.version;
+        } catch (error) {
+            // No installed version yet.
+            return 0;
+        }
+    }
+
 }
 
 export const CoreApp = makeSingleton(CoreAppProvider);

From cc006bad26e612953ceb8679098a163f8c7ef5eb Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 8 Feb 2022 14:47:39 +0100
Subject: [PATCH 0514/1008] MOBILE-3981 core: Optimize sites tables

---
 src/core/services/app.ts            |   9 ++
 src/core/services/config.ts         |  16 +++
 src/core/services/database/sites.ts |  22 ----
 src/core/services/sites.ts          | 152 ++++++++++++++++------------
 4 files changed, 112 insertions(+), 87 deletions(-)

diff --git a/src/core/services/app.ts b/src/core/services/app.ts
index 95031a923..523418254 100644
--- a/src/core/services/app.ts
+++ b/src/core/services/app.ts
@@ -144,6 +144,15 @@ export class CoreAppProvider {
         await this.schemaVersionsTable.insert({ name: schema.name, version: schema.version });
     }
 
+    /**
+     * Delete table schema.
+     *
+     * @param name Schema name.
+     */
+    async deleteTableSchema(name: string): Promise<void> {
+        await this.schemaVersionsTable.deleteByPrimaryKey({ name });
+    }
+
     /**
      * Get the application global database.
      *
diff --git a/src/core/services/config.ts b/src/core/services/config.ts
index b203690a3..f8d65ee23 100644
--- a/src/core/services/config.ts
+++ b/src/core/services/config.ts
@@ -120,6 +120,22 @@ export class CoreConfigProvider {
         }
     }
 
+    /**
+     * Check whether the given app setting exists.
+     *
+     * @param name The config name.
+     * @returns Whether the app setting exists.
+     */
+    async has(name: string): Promise<boolean> {
+        try {
+            await this.table.getOneByPrimaryKey({ name });
+
+            return true;
+        } catch (error) {
+            return false;
+        }
+    }
+
     /**
      * Set an app setting.
      *
diff --git a/src/core/services/database/sites.ts b/src/core/services/database/sites.ts
index 857bdba4b..930955e46 100644
--- a/src/core/services/database/sites.ts
+++ b/src/core/services/database/sites.ts
@@ -21,7 +21,6 @@ import { CoreSite } from '@classes/site';
  * Database variables for CoreSites service.
  */
 export const SITES_TABLE_NAME = 'sites_2';
-export const CURRENT_SITE_TABLE_NAME = 'current_site';
 export const SCHEMA_VERSIONS_TABLE_NAME = 'schema_versions';
 
 // Schema to register in App DB.
@@ -68,22 +67,6 @@ export const APP_SCHEMA: CoreAppSchema = {
                 },
             ],
         },
-        {
-            name: CURRENT_SITE_TABLE_NAME,
-            columns: [
-                {
-                    name: 'id',
-                    type: 'INTEGER',
-                    primaryKey: true,
-                },
-                {
-                    name: 'siteId',
-                    type: 'TEXT',
-                    notNull: true,
-                    unique: true,
-                },
-            ],
-        },
     ],
     async migrate(db: SQLiteDB, oldVersion: number): Promise<void> {
         if (oldVersion < 2) {
@@ -184,11 +167,6 @@ export type SiteDBEntry = {
     oauthId?: number | null;
 };
 
-export type CurrentSiteDBEntry = {
-    id: number;
-    siteId: string;
-};
-
 export type SchemaVersionsDBEntry = {
     name: string;
     version: number;
diff --git a/src/core/services/sites.ts b/src/core/services/sites.ts
index ee324ae59..1dedfd9cf 100644
--- a/src/core/services/sites.ts
+++ b/src/core/services/sites.ts
@@ -41,10 +41,8 @@ import {
     APP_SCHEMA,
     SCHEMA_VERSIONS_TABLE_SCHEMA,
     SITES_TABLE_NAME,
-    CURRENT_SITE_TABLE_NAME,
     SCHEMA_VERSIONS_TABLE_NAME,
     SiteDBEntry,
-    CurrentSiteDBEntry,
     SchemaVersionsDBEntry,
 } from '@services/database/sites';
 import { CoreArray } from '../singletons/array';
@@ -59,7 +57,13 @@ import { CoreAjaxWSError } from '@classes/errors/ajaxwserror';
 import { CoreSitePlugins } from '@features/siteplugins/services/siteplugins';
 import { CorePromisedValue } from '@classes/promised-value';
 import { CoreDatabaseTable } from '@classes/database/database-table';
-import { CoreDatabaseConfiguration, CoreDatabaseTableProxy } from '@classes/database/database-table-proxy';
+import {
+    CoreDatabaseCachingStrategy,
+    CoreDatabaseConfiguration,
+    CoreDatabaseTableProxy,
+} from '@classes/database/database-table-proxy';
+import { asyncInstance, AsyncInstance } from '../utils/async-instance';
+import { CoreConfig } from './config';
 
 export const CORE_SITE_SCHEMAS = new InjectionToken<CoreSiteSchema[]>('CORE_SITE_SCHEMAS');
 
@@ -84,14 +88,11 @@ export class CoreSitesProvider {
     protected siteSchemasMigration: { [siteId: string]: Promise<void> } = {};
     protected siteSchemas: { [name: string]: CoreRegisteredSiteSchema } = {};
     protected pluginsSiteSchemas: { [name: string]: CoreRegisteredSiteSchema } = {};
-
-    // Variables for DB.
-    protected appDB: Promise<SQLiteDB>;
-    protected resolveAppDB!: (appDB: SQLiteDB) => void;
     protected siteTables: Record<string, Record<string, CorePromisedValue<CoreDatabaseTable>>> = {};
+    protected schemasTables: Record<string, AsyncInstance<CoreDatabaseTable<SchemaVersionsDBEntry, 'name'>>> = {};
+    protected sitesTable = asyncInstance<CoreDatabaseTable<SiteDBEntry>>();
 
     constructor(@Optional() @Inject(CORE_SITE_SCHEMAS) siteSchemas: CoreSiteSchema[][] = []) {
-        this.appDB = new Promise(resolve => this.resolveAppDB = resolve);
         this.logger = CoreLogger.getInstance('CoreSitesProvider');
         this.siteSchemas = CoreArray.flatten(siteSchemas).reduce(
             (siteSchemas, schema) => {
@@ -132,7 +133,15 @@ export class CoreSitesProvider {
             // Ignore errors.
         }
 
-        this.resolveAppDB(CoreApp.getDB());
+        const sitesTable = new CoreDatabaseTableProxy<SiteDBEntry>(
+            { cachingStrategy: CoreDatabaseCachingStrategy.Eager },
+            CoreApp.getDB(),
+            SITES_TABLE_NAME,
+        );
+
+        await sitesTable.initialize();
+
+        this.sitesTable.setInstance(sitesTable);
     }
 
     /**
@@ -743,8 +752,7 @@ export class CoreSitesProvider {
         config?: CoreSiteConfig,
         oauthId?: number,
     ): Promise<void> {
-        const db = await this.appDB;
-        const entry: SiteDBEntry = {
+        await this.sitesTable.insert({
             id,
             siteUrl,
             token,
@@ -753,9 +761,7 @@ export class CoreSitesProvider {
             config: config ? JSON.stringify(config) : undefined,
             loggedOut: 0,
             oauthId,
-        };
-
-        await db.insertRecord(SITES_TABLE_NAME, entry);
+        });
     }
 
     /**
@@ -982,9 +988,7 @@ export class CoreSitesProvider {
         delete this.sites[siteId];
 
         try {
-            const db = await this.appDB;
-
-            await db.deleteRecords(SITES_TABLE_NAME, { id: siteId });
+            await this.sitesTable.deleteByPrimaryKey({ id: siteId });
         } catch (err) {
             // DB remove shouldn't fail, but we'll go ahead even if it does.
         }
@@ -1001,10 +1005,9 @@ export class CoreSitesProvider {
      * @return Promise resolved with true if there are sites and false if there aren't.
      */
     async hasSites(): Promise<boolean> {
-        const db = await this.appDB;
-        const count = await db.countRecords(SITES_TABLE_NAME);
+        const isEmpty = await this.sitesTable.isEmpty();
 
-        return count > 0;
+        return !isEmpty;
     }
 
     /**
@@ -1026,9 +1029,8 @@ export class CoreSitesProvider {
             return this.sites[siteId];
         } else {
             // Retrieve and create the site.
-            const db = await this.appDB;
             try {
-                const data = await db.getRecord<SiteDBEntry>(SITES_TABLE_NAME, { id: siteId });
+                const data = await this.sitesTable.getOneByPrimaryKey({ id: siteId });
 
                 return this.makeSiteFromSiteListEntry(data);
             } catch {
@@ -1044,8 +1046,7 @@ export class CoreSitesProvider {
      * @return Promise resolved with the site.
      */
     async getSiteByUrl(siteUrl: string): Promise<CoreSite> {
-        const db = await this.appDB;
-        const data = await db.getRecord<SiteDBEntry>(SITES_TABLE_NAME, { siteUrl });
+        const data = await this.sitesTable.getOne({ siteUrl });
 
         if (this.sites[data.id] !== undefined) {
             return this.sites[data.id];
@@ -1131,8 +1132,7 @@ export class CoreSitesProvider {
      * @return Promise resolved when the sites are retrieved.
      */
     async getSites(ids?: string[]): Promise<CoreSiteBasicInfo[]> {
-        const db = await this.appDB;
-        const sites = await db.getAllRecords<SiteDBEntry>(SITES_TABLE_NAME);
+        const sites = await this.sitesTable.getMany();
 
         const formattedSites: CoreSiteBasicInfo[] = [];
         sites.forEach((site) => {
@@ -1197,8 +1197,7 @@ export class CoreSitesProvider {
      * @return Promise resolved when the sites IDs are retrieved.
      */
     async getLoggedInSitesIds(): Promise<string[]> {
-        const db = await this.appDB;
-        const sites = await db.getRecords<SiteDBEntry>(SITES_TABLE_NAME, { loggedOut : 0 });
+        const sites = await this.sitesTable.getMany({ loggedOut : 0 });
 
         return sites.map((site) => site.id);
     }
@@ -1209,8 +1208,7 @@ export class CoreSitesProvider {
      * @return Promise resolved when the sites IDs are retrieved.
      */
     async getSitesIds(): Promise<string[]> {
-        const db = await this.appDB;
-        const sites = await db.getAllRecords<SiteDBEntry>(SITES_TABLE_NAME);
+        const sites = await this.sitesTable.getMany();
 
         return sites.map((site) => site.id);
     }
@@ -1233,13 +1231,7 @@ export class CoreSitesProvider {
      * @return Promise resolved when current site is stored.
      */
     async login(siteId: string): Promise<void> {
-        const db = await this.appDB;
-        const entry = {
-            id: 1,
-            siteId,
-        };
-
-        await db.insertRecord(CURRENT_SITE_TABLE_NAME, entry);
+        await CoreConfig.set('current_site_id', siteId);
 
         CoreEvents.trigger(CoreEvents.LOGIN, {}, siteId);
     }
@@ -1308,13 +1300,10 @@ export class CoreSitesProvider {
             return Promise.reject(new CoreError('Session already restored.'));
         }
 
-        const db = await this.appDB;
-
         this.sessionRestored = true;
 
         try {
-            const currentSite = await db.getRecord<CurrentSiteDBEntry>(CURRENT_SITE_TABLE_NAME, { id: 1 });
-            const siteId = currentSite.siteId;
+            const siteId = await this.getStoredCurrentSiteId();
             this.logger.debug(`Restore session in site ${siteId}`);
 
             await this.loadSite(siteId);
@@ -1330,12 +1319,11 @@ export class CoreSitesProvider {
      * @return Promise resolved when done.
      */
     protected async setSiteLoggedOut(siteId: string): Promise<void> {
-        const db = await this.appDB;
         const site = await this.getSite(siteId);
 
         site.setLoggedOut(true);
 
-        await db.updateRecords(SITES_TABLE_NAME, { loggedOut: 1 }, { id: siteId });
+        await this.sitesTable.update({ loggedOut: 1 }, { id: siteId });
     }
 
     /**
@@ -1371,19 +1359,20 @@ export class CoreSitesProvider {
      * @return A promise resolved when the site is updated.
      */
     async updateSiteTokenBySiteId(siteId: string, token: string, privateToken: string = ''): Promise<void> {
-        const db = await this.appDB;
         const site = await this.getSite(siteId);
-        const newValues: Partial<SiteDBEntry> = {
-            token,
-            privateToken,
-            loggedOut: 0,
-        };
 
         site.token = token;
         site.privateToken = privateToken;
         site.setLoggedOut(false); // Token updated means the user authenticated again, not logged out anymore.
 
-        await db.updateRecords(SITES_TABLE_NAME, newValues, { id: siteId });
+        await this.sitesTable.update(
+            {
+                token,
+                privateToken,
+                loggedOut: 0,
+            },
+            { id: siteId },
+        );
     }
 
     /**
@@ -1425,9 +1414,7 @@ export class CoreSitesProvider {
             }
 
             try {
-                const db = await this.appDB;
-
-                await db.updateRecords(SITES_TABLE_NAME, newValues, { id: siteId });
+                await this.sitesTable.update(newValues, { id: siteId });
             } finally {
                 CoreEvents.trigger(CoreEvents.SITE_UPDATED, info, siteId);
             }
@@ -1484,8 +1471,7 @@ export class CoreSitesProvider {
         }
 
         try {
-            const db = await this.appDB;
-            const siteEntries = await db.getAllRecords<SiteDBEntry>(SITES_TABLE_NAME);
+            const siteEntries = await this.sitesTable.getMany();
             const ids: string[] = [];
             const promises: Promise<unknown>[] = [];
 
@@ -1516,10 +1502,9 @@ export class CoreSitesProvider {
      * @return Promise resolved with the site ID.
      */
     async getStoredCurrentSiteId(): Promise<string> {
-        const db = await this.appDB;
-        const currentSite = await db.getRecord<CurrentSiteDBEntry>(CURRENT_SITE_TABLE_NAME, { id: 1 });
+        await this.migrateCurrentSiteLegacyTable();
 
-        return currentSite.siteId;
+        return CoreConfig.get('current_site_id');
     }
 
     /**
@@ -1528,9 +1513,7 @@ export class CoreSitesProvider {
      * @return Promise resolved when done.
      */
     async removeStoredCurrentSite(): Promise<void> {
-        const db = await this.appDB;
-
-        await db.deleteRecords(CURRENT_SITE_TABLE_NAME, { id: 1 });
+        await CoreConfig.delete('current_site_id');
     }
 
     /**
@@ -1645,10 +1628,8 @@ export class CoreSitesProvider {
      * @return Promise resolved when done.
      */
     protected async applySiteSchemas(site: CoreSite, schemas: {[name: string]: CoreRegisteredSiteSchema}): Promise<void> {
-        const db = site.getDb();
-
         // Fetch installed versions of the schema.
-        const records = await db.getAllRecords<SchemaVersionsDBEntry>(SCHEMA_VERSIONS_TABLE_NAME);
+        const records = await this.getSiteSchemasTable(site).getMany();
 
         const versions: {[name: string]: number} = {};
         records.forEach((record) => {
@@ -1695,7 +1676,7 @@ export class CoreSitesProvider {
         }
 
         // Set installed version.
-        await db.insertRecord(SCHEMA_VERSIONS_TABLE_NAME, { name: schema.name, version: schema.version });
+        await this.getSiteSchemasTable(site).insert({ name: schema.name, version: schema.version });
     }
 
     /**
@@ -1794,6 +1775,47 @@ export class CoreSitesProvider {
         return [];
     }
 
+    /**
+     * Migrate the legacy current_site table.
+     */
+    protected async migrateCurrentSiteLegacyTable(): Promise<void> {
+        if (await CoreConfig.has('current_site_migrated')) {
+            // Already migrated.
+            return;
+        }
+
+        try {
+            const db = CoreApp.getDB();
+
+            const { siteId } = await db.getRecord<{ siteId: string }>('current_site');
+
+            await CoreConfig.set('current_site_id', siteId);
+            await CoreApp.deleteTableSchema('current_site');
+            await db.dropTable('current_site');
+        } finally {
+            await CoreConfig.set('current_site_migrated', 1);
+        }
+    }
+
+    /**
+     * Get schemas table for the given site.
+     *
+     * @param site Site.
+     * @returns Scehmas Table.
+     */
+    protected getSiteSchemasTable(site: CoreSite): AsyncInstance<CoreDatabaseTable<SchemaVersionsDBEntry, 'name'>> {
+        this.schemasTables[site.getId()] = this.schemasTables[site.getId()] ?? asyncInstance(
+            () => this.getSiteTable(SCHEMA_VERSIONS_TABLE_NAME, {
+                siteId: site.getId(),
+                database: site.getDb(),
+                config: { cachingStrategy: CoreDatabaseCachingStrategy.Eager },
+                primaryKeyColumns: ['name'],
+            }),
+        );
+
+        return this.schemasTables[site.getId()];
+    }
+
 }
 
 export const CoreSites = makeSingleton(CoreSitesProvider);

From 18c48940bf06bf1ac89093c2800e3af7bce598c0 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 10 Feb 2022 15:55:03 +0100
Subject: [PATCH 0515/1008] MOBILE-3981 core: Optimize cron table

---
 src/core/services/cron.ts | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/core/services/cron.ts b/src/core/services/cron.ts
index a5b82dfa3..eca0b1447 100644
--- a/src/core/services/cron.ts
+++ b/src/core/services/cron.ts
@@ -18,12 +18,14 @@ import { CoreApp } from '@services/app';
 import { CoreConfig } from '@services/config';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreConstants } from '@/core/constants';
-import { SQLiteDB } from '@classes/sqlitedb';
 import { CoreError } from '@classes/errors/error';
 
 import { makeSingleton } from '@singletons';
 import { CoreLogger } from '@singletons/logger';
 import { APP_SCHEMA, CRON_TABLE_NAME, CronDBEntry } from '@services/database/cron';
+import { asyncInstance } from '../utils/async-instance';
+import { CoreDatabaseTable } from '@classes/database/database-table';
+import { CoreDatabaseCachingStrategy, CoreDatabaseTableProxy } from '@classes/database/database-table-proxy';
 
 /*
  * Service to handle cron processes. The registered processes will be executed every certain time.
@@ -39,13 +41,9 @@ export class CoreCronDelegateService {
     protected logger: CoreLogger;
     protected handlers: { [s: string]: CoreCronHandler } = {};
     protected queuePromise: Promise<void> = Promise.resolve();
-
-    // Variables for DB.
-    protected appDB: Promise<SQLiteDB>;
-    protected resolveAppDB!: (appDB: SQLiteDB) => void;
+    protected table = asyncInstance<CoreDatabaseTable<CronDBEntry>>();
 
     constructor() {
-        this.appDB = new Promise(resolve => this.resolveAppDB = resolve);
         this.logger = CoreLogger.getInstance('CoreCronDelegate');
     }
 
@@ -59,7 +57,15 @@ export class CoreCronDelegateService {
             // Ignore errors.
         }
 
-        this.resolveAppDB(CoreApp.getDB());
+        const table = new CoreDatabaseTableProxy<CronDBEntry>(
+            { cachingStrategy: CoreDatabaseCachingStrategy.Eager },
+            CoreApp.getDB(),
+            CRON_TABLE_NAME,
+        );
+
+        await table.initialize();
+
+        this.table.setInstance(table);
     }
 
     /**
@@ -238,11 +244,10 @@ export class CoreCronDelegateService {
      * @return Promise resolved with the handler's last execution time.
      */
     protected async getHandlerLastExecutionTime(name: string): Promise<number> {
-        const db = await this.appDB;
         const id = this.getHandlerLastExecutionId(name);
 
         try {
-            const entry = await db.getRecord<CronDBEntry>(CRON_TABLE_NAME, { id });
+            const entry = await this.table.getOneByPrimaryKey({ id });
 
             const time = Number(entry.value);
 
@@ -397,14 +402,13 @@ export class CoreCronDelegateService {
      * @return Promise resolved when the execution time is saved.
      */
     protected async setHandlerLastExecutionTime(name: string, time: number): Promise<void> {
-        const db = await this.appDB;
         const id = this.getHandlerLastExecutionId(name);
         const entry = {
             id,
             value: time,
         };
 
-        await db.insertRecord(CRON_TABLE_NAME, entry);
+        await this.table.insert(entry);
     }
 
     /**

From 84307d6f70cf07e3f661dc9257961ce070b0a9c2 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 10 Feb 2022 15:57:02 +0100
Subject: [PATCH 0516/1008] MOBILE-3981 pushnotifications: Optimize tables

---
 .../services/pushnotifications.ts             | 95 +++++++++++--------
 1 file changed, 56 insertions(+), 39 deletions(-)

diff --git a/src/core/features/pushnotifications/services/pushnotifications.ts b/src/core/features/pushnotifications/services/pushnotifications.ts
index a4aadf0a7..be515b7c9 100644
--- a/src/core/features/pushnotifications/services/pushnotifications.ts
+++ b/src/core/features/pushnotifications/services/pushnotifications.ts
@@ -24,7 +24,6 @@ import { CoreUtils } from '@services/utils/utils';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreConfig } from '@services/config';
 import { CoreConstants } from '@/core/constants';
-import { SQLiteDB } from '@classes/sqlitedb';
 import { CoreSite, CoreSiteInfo } from '@classes/site';
 import { makeSingleton, Badge, Push, Device, Translate, Platform, ApplicationInit, NgZone } from '@singletons';
 import { CoreLogger } from '@singletons/logger';
@@ -42,6 +41,11 @@ import { CoreError } from '@classes/errors/error';
 import { CoreWSExternalWarning } from '@services/ws';
 import { CoreSitesFactory } from '@services/sites-factory';
 import { CoreMainMenuProvider } from '@features/mainmenu/services/mainmenu';
+import { AsyncInstance, asyncInstance } from '@/core/utils/async-instance';
+import { CoreDatabaseTable } from '@classes/database/database-table';
+import { CoreDatabaseCachingStrategy, CoreDatabaseTableProxy } from '@classes/database/database-table-proxy';
+import { CoreObject } from '@singletons/object';
+import { lazyMap, LazyMap } from '@/core/utils/lazy-map';
 
 /**
  * Service to handle push notifications.
@@ -53,14 +57,27 @@ export class CorePushNotificationsProvider {
 
     protected logger: CoreLogger;
     protected pushID?: string;
+    protected badgesTable = asyncInstance<CoreDatabaseTable<CorePushNotificationsBadgeDBRecord, 'siteid' | 'addon'>>();
+    protected pendingUnregistersTable =
+        asyncInstance<CoreDatabaseTable<CorePushNotificationsPendingUnregisterDBRecord, 'siteid'>>();
 
-    // Variables for DB.
-    protected appDB: Promise<SQLiteDB>;
-    protected resolveAppDB!: (appDB: SQLiteDB) => void;
+    protected registeredDevicesTables:
+        LazyMap<AsyncInstance<CoreDatabaseTable<CorePushNotificationsRegisteredDeviceDBRecord, 'appid' | 'uuid'>>>;
 
     constructor() {
-        this.appDB = new Promise(resolve => this.resolveAppDB = resolve);
         this.logger = CoreLogger.getInstance('CorePushNotificationsProvider');
+        this.registeredDevicesTables = lazyMap(
+            siteId => asyncInstance(
+                () => CoreSites.getSiteTable<CorePushNotificationsRegisteredDeviceDBRecord, 'appid' | 'uuid'>(
+                    REGISTERED_DEVICES_TABLE_NAME,
+                    {
+                        siteId,
+                        config: { cachingStrategy: CoreDatabaseCachingStrategy.None },
+                        primaryKeyColumns: ['appid', 'uuid'],
+                    },
+                ),
+            ),
+        );
     }
 
     /**
@@ -157,7 +174,27 @@ export class CorePushNotificationsProvider {
             // Ignore errors.
         }
 
-        this.resolveAppDB(CoreApp.getDB());
+        const database = CoreApp.getDB();
+        const badgesTable = new CoreDatabaseTableProxy<CorePushNotificationsBadgeDBRecord, 'siteid' | 'addon'>(
+            { cachingStrategy: CoreDatabaseCachingStrategy.Eager },
+            database,
+            BADGE_TABLE_NAME,
+            ['siteid', 'addon'],
+        );
+        const pendingUnregistersTable = new CoreDatabaseTableProxy<CorePushNotificationsPendingUnregisterDBRecord, 'siteid'>(
+            { cachingStrategy: CoreDatabaseCachingStrategy.Eager },
+            database,
+            PENDING_UNREGISTER_TABLE_NAME,
+            ['siteid'],
+        );
+
+        await Promise.all([
+            badgesTable.initialize(),
+            pendingUnregistersTable.initialize(),
+        ]);
+
+        this.badgesTable.setInstance(badgesTable);
+        this.pendingUnregistersTable.setInstance(pendingUnregistersTable);
     }
 
     /**
@@ -177,8 +214,7 @@ export class CorePushNotificationsProvider {
      */
     async cleanSiteCounters(siteId: string): Promise<void> {
         try {
-            const db = await this.appDB;
-            await db.deleteRecords(BADGE_TABLE_NAME, { siteid: siteId } );
+            await this.badgesTable.delete({ siteid: siteId });
         } finally {
             this.updateAppCounter();
         }
@@ -514,7 +550,6 @@ export class CorePushNotificationsProvider {
 
         this.logger.debug(`Unregister device on Moodle: '${site.getId()}'`);
 
-        const db = await this.appDB;
         const data: CoreUserRemoveUserDeviceWSParams = {
             appid: CoreConstants.CONFIG.app_id,
             uuid:  Device.uuid,
@@ -526,7 +561,7 @@ export class CorePushNotificationsProvider {
         } catch (error) {
             if (CoreUtils.isWebServiceError(error) || CoreUtils.isExpiredTokenError(error)) {
                 // Cannot unregister. Don't try again.
-                await CoreUtils.ignoreErrors(db.deleteRecords(PENDING_UNREGISTER_TABLE_NAME, {
+                await CoreUtils.ignoreErrors(this.pendingUnregistersTable.delete({
                     token: site.getToken(),
                     siteid: site.getId(),
                 }));
@@ -535,13 +570,12 @@ export class CorePushNotificationsProvider {
             }
 
             // Store the pending unregister so it's retried again later.
-            const entry: CorePushNotificationsPendingUnregisterDBRecord = {
+            await this.pendingUnregistersTable.insert({
                 siteid: site.getId(),
                 siteurl: site.getURL(),
                 token: site.getToken(),
                 info: JSON.stringify(site.getInfo()),
-            };
-            await db.insertRecord(PENDING_UNREGISTER_TABLE_NAME, entry);
+            });
 
             return;
         }
@@ -552,9 +586,9 @@ export class CorePushNotificationsProvider {
 
         await CoreUtils.ignoreErrors(Promise.all([
             // Remove the device from the local DB.
-            site.getDb().deleteRecords(REGISTERED_DEVICES_TABLE_NAME, this.getRegisterData()),
+            this.registeredDevicesTables[site.getId()].delete(this.getRegisterData()),
             // Remove pending unregisters for this site.
-            db.deleteRecords(PENDING_UNREGISTER_TABLE_NAME, { siteid: site.getId() }),
+            this.pendingUnregistersTable.deleteByPrimaryKey({ siteid: site.getId() }),
         ]));
     }
 
@@ -714,15 +748,14 @@ export class CorePushNotificationsProvider {
 
                 // Insert the device in the local DB.
                 try {
-                    await site.getDb().insertRecord(REGISTERED_DEVICES_TABLE_NAME, data);
+                    await this.registeredDevicesTables[site.getId()].insert(data);
                 } catch (err) {
                     // Ignore errors.
                 }
             }
         } finally {
             // Remove pending unregisters for this site.
-            const db = await this.appDB;
-            await CoreUtils.ignoreErrors(db.deleteRecords(PENDING_UNREGISTER_TABLE_NAME, { siteid: site.getId() }));
+            await CoreUtils.ignoreErrors(this.pendingUnregistersTable.deleteByPrimaryKey({ siteid: site.getId() }));
         }
     }
 
@@ -735,8 +768,7 @@ export class CorePushNotificationsProvider {
      */
     protected async getAddonBadge(siteId?: string, addon: string = 'site'): Promise<number> {
         try {
-            const db = await this.appDB;
-            const entry = await db.getRecord<CorePushNotificationsBadgeDBRecord>(BADGE_TABLE_NAME, { siteid: siteId, addon });
+            const entry = await this.badgesTable.getOne({ siteid: siteId, addon });
 
             return entry?.number || 0;
         } catch (err) {
@@ -751,19 +783,7 @@ export class CorePushNotificationsProvider {
      * @return Promise resolved when done.
      */
     async retryUnregisters(siteId?: string): Promise<void> {
-
-        const db = await this.appDB;
-        let results: CorePushNotificationsPendingUnregisterDBRecord[];
-
-        if (siteId) {
-            // Check if the site has a pending unregister.
-            results = await db.getRecords<CorePushNotificationsPendingUnregisterDBRecord>(PENDING_UNREGISTER_TABLE_NAME, {
-                siteid: siteId,
-            });
-        } else {
-            // Get all pending unregisters.
-            results = await db.getAllRecords<CorePushNotificationsPendingUnregisterDBRecord>(PENDING_UNREGISTER_TABLE_NAME);
-        }
+        const results = await this.pendingUnregistersTable.getMany(CoreObject.withoutEmpty({ siteid: siteId }));
 
         await Promise.all(results.map(async (result) => {
             // Create a temporary site to unregister.
@@ -789,14 +809,11 @@ export class CorePushNotificationsProvider {
     protected async saveAddonBadge(value: number, siteId?: string, addon: string = 'site'): Promise<number> {
         siteId = siteId || CoreSites.getCurrentSiteId();
 
-        const entry: CorePushNotificationsBadgeDBRecord = {
+        await this.badgesTable.insert({
             siteid: siteId,
             addon,
             number: value, // eslint-disable-line id-blacklist
-        };
-
-        const db = await this.appDB;
-        await db.insertRecord(BADGE_TABLE_NAME, entry);
+        });
 
         return value;
     }
@@ -815,7 +832,7 @@ export class CorePushNotificationsProvider {
 
         // Check if the device is already registered.
         const records = await CoreUtils.ignoreErrors(
-            site.getDb().getRecords<CorePushNotificationsRegisteredDeviceDBRecord>(REGISTERED_DEVICES_TABLE_NAME, {
+            this.registeredDevicesTables[site.getId()].getMany({
                 appid: data.appid,
                 uuid: data.uuid,
                 name: data.name,

From 4504d1ba8ab0d44b1eb59653b67d9f14a770c0cb Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 10 Feb 2022 15:59:22 +0100
Subject: [PATCH 0517/1008] MOBILE-3981 course: Optimize tables

---
 src/core/features/course/services/course.ts | 41 ++++++++++++---------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/core/features/course/services/course.ts b/src/core/features/course/services/course.ts
index 565198a71..5e1496358 100644
--- a/src/core/features/course/services/course.ts
+++ b/src/core/features/course/services/course.ts
@@ -45,6 +45,10 @@ import { CoreCourseAutoSyncData, CoreCourseSyncProvider } from './sync';
 import { CoreTagItem } from '@features/tag/services/tag';
 import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
 import { CoreCourseModuleDelegate } from './module-delegate';
+import { lazyMap, LazyMap } from '@/core/utils/lazy-map';
+import { asyncInstance, AsyncInstance } from '@/core/utils/async-instance';
+import { CoreDatabaseTable } from '@classes/database/database-table';
+import { CoreDatabaseCachingStrategy } from '@classes/database/database-table-proxy';
 
 const ROOT_CACHE_KEY = 'mmCourse:';
 
@@ -140,9 +144,18 @@ export class CoreCourseProvider {
     ];
 
     protected logger: CoreLogger;
+    protected statusTables: LazyMap<AsyncInstance<CoreDatabaseTable<CoreCourseStatusDBRecord>>>;
 
     constructor() {
         this.logger = CoreLogger.getInstance('CoreCourseProvider');
+        this.statusTables = lazyMap(
+            siteId => asyncInstance(
+                () => CoreSites.getSiteTable(COURSE_STATUS_TABLE, {
+                    siteId,
+                    config: { cachingStrategy: CoreDatabaseCachingStrategy.Eager },
+                }),
+            ),
+        );
     }
 
     /**
@@ -221,7 +234,7 @@ export class CoreCourseProvider {
         const site = await CoreSites.getSite(siteId);
         this.logger.debug('Clear all course status for site ' + site.id);
 
-        await site.getDb().deleteRecords(COURSE_STATUS_TABLE);
+        await this.statusTables[site.getId()].delete();
         this.triggerCourseStatusChanged(CoreCourseProvider.ALL_COURSES_CLEARED, CoreConstants.NOT_DOWNLOADED, site.id);
     }
 
@@ -373,7 +386,7 @@ export class CoreCourseProvider {
      */
     async getCourseStatusData(courseId: number, siteId?: string): Promise<CoreCourseStatusDBRecord> {
         const site = await CoreSites.getSite(siteId);
-        const entry: CoreCourseStatusDBRecord = await site.getDb().getRecord(COURSE_STATUS_TABLE, { id: courseId });
+        const entry = await this.statusTables[site.getId()].getOneByPrimaryKey({ id: courseId });
         if (!entry) {
             throw Error('No entry found on course status table');
         }
@@ -405,16 +418,13 @@ export class CoreCourseProvider {
      * @return Resolves with an array containing downloaded course ids.
      */
     async getDownloadedCourseIds(siteId?: string): Promise<number[]> {
+        const downloadedStatuses = [CoreConstants.DOWNLOADED, CoreConstants.DOWNLOADING, CoreConstants.OUTDATED];
         const site = await CoreSites.getSite(siteId);
-        const entries: CoreCourseStatusDBRecord[] = await site.getDb().getRecordsList(
-            COURSE_STATUS_TABLE,
-            'status',
-            [
-                CoreConstants.DOWNLOADED,
-                CoreConstants.DOWNLOADING,
-                CoreConstants.OUTDATED,
-            ],
-        );
+        const entries = await this.statusTables[site.getId()].getManyWhere({
+            sql: 'status IN (?,?,?)',
+            sqlParams: downloadedStatuses,
+            js: ({ status }) => downloadedStatuses.includes(status),
+        });
 
         return entries.map((entry) => entry.id);
     }
@@ -1269,7 +1279,6 @@ export class CoreCourseProvider {
         this.logger.debug(`Set previous status for course ${courseId} in site ${siteId}`);
 
         const site = await CoreSites.getSite(siteId);
-        const db = site.getDb();
         const entry = await this.getCourseStatusData(courseId, siteId);
 
         this.logger.debug(`Set previous status '${entry.status}' for course ${courseId}`);
@@ -1282,7 +1291,7 @@ export class CoreCourseProvider {
             downloadTime: entry.status == CoreConstants.DOWNLOADING ? entry.previousDownloadTime : entry.downloadTime,
         };
 
-        await db.updateRecords(COURSE_STATUS_TABLE, newData, { id: courseId });
+        await this.statusTables[site.getId()].update(newData, { id: courseId });
         // Success updating, trigger event.
         this.triggerCourseStatusChanged(courseId, newData.status, siteId);
 
@@ -1329,16 +1338,14 @@ export class CoreCourseProvider {
 
         if (previousStatus != status) {
             // Status has changed, update it.
-            const data: CoreCourseStatusDBRecord = {
+            await this.statusTables[site.getId()].insert({
                 id: courseId,
                 status: status,
                 previous: previousStatus,
                 updated: new Date().getTime(),
                 downloadTime: downloadTime,
                 previousDownloadTime: previousDownloadTime,
-            };
-
-            await site.getDb().insertRecord(COURSE_STATUS_TABLE, data);
+            });
         }
 
         // Success inserting, trigger event.

From b95c67874f622aab929bf4844070266356a58542 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 10 Feb 2022 15:59:54 +0100
Subject: [PATCH 0518/1008] MOBILE-3981 core: Optimize site tables

---
 src/core/classes/site.ts | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/core/classes/site.ts b/src/core/classes/site.ts
index 0c91b0466..f88defc5d 100644
--- a/src/core/classes/site.ts
+++ b/src/core/classes/site.ts
@@ -108,6 +108,7 @@ export class CoreSite {
     protected logger: CoreLogger;
     protected db?: SQLiteDB;
     protected cacheTable: AsyncInstance<CoreDatabaseTable<CoreSiteWSCacheRecord>>;
+    protected configTable: AsyncInstance<CoreDatabaseTable<CoreSiteConfigDBRecord, 'name'>>;
     protected cleanUnicode = false;
     protected lastAutoLogin = 0;
     protected offlineDisabled = false;
@@ -146,6 +147,12 @@ export class CoreSite {
             database: this.getDb(),
             config: { cachingStrategy: CoreDatabaseCachingStrategy.None },
         }));
+        this.configTable = asyncInstance(() => CoreSites.getSiteTable(CoreSite.CONFIG_TABLE, {
+            siteId: this.getId(),
+            database: this.getDb(),
+            config: { cachingStrategy: CoreDatabaseCachingStrategy.Eager },
+            primaryKeyColumns: ['name'],
+        }));
         this.setInfo(infos);
         this.calculateOfflineDisabled();
 
@@ -1825,7 +1832,7 @@ export class CoreSite {
      * @return Promise resolved when done.
      */
     async deleteSiteConfig(name: string): Promise<void> {
-        await this.getDb().deleteRecords(CoreSite.CONFIG_TABLE, { name });
+        await this.configTable.deleteByPrimaryKey({ name });
     }
 
     /**
@@ -1837,7 +1844,7 @@ export class CoreSite {
      */
     async getLocalSiteConfig<T extends number | string>(name: string, defaultValue?: T): Promise<T> {
         try {
-            const entry = await this.getDb().getRecord<CoreSiteConfigDBRecord>(CoreSite.CONFIG_TABLE, { name });
+            const entry = await this.configTable.getOneByPrimaryKey({ name });
 
             return <T> entry.value;
         } catch (error) {
@@ -1857,7 +1864,7 @@ export class CoreSite {
      * @return Promise resolved when done.
      */
     async setLocalSiteConfig(name: string, value: number | string): Promise<void> {
-        await this.getDb().insertRecord(CoreSite.CONFIG_TABLE, { name, value });
+        await this.configTable.insert({ name, value });
     }
 
     /**

From 95e566a9c29634a8eec59c91e43245abedbf9b6e Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 10 Feb 2022 16:03:00 +0100
Subject: [PATCH 0519/1008] MOBILE-3981 core: Log database table instance

---
 src/core/classes/database/debug-database-table.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/classes/database/debug-database-table.ts b/src/core/classes/database/debug-database-table.ts
index f944b8a01..3e236c5c3 100644
--- a/src/core/classes/database/debug-database-table.ts
+++ b/src/core/classes/database/debug-database-table.ts
@@ -47,7 +47,7 @@ export class CoreDebugDatabaseTable<
      * @inheritdoc
      */
     initialize(): Promise<void> {
-        this.logger.log('initialize');
+        this.logger.log('initialize', this.target);
 
         return this.target.initialize();
     }

From e31c88ca1e0aae9cd860c7d42717d20e69e25cb1 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 15 Feb 2022 08:52:00 +0100
Subject: [PATCH 0520/1008] MOBILE-3828 notifications: Filter notification
 subject in app

---
 src/addons/notifications/pages/list/list.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/addons/notifications/pages/list/list.html b/src/addons/notifications/pages/list/list.html
index 0acb02682..64bfcc028 100644
--- a/src/addons/notifications/pages/list/list.html
+++ b/src/addons/notifications/pages/list/list.html
@@ -44,7 +44,11 @@
                     class="core-notification-icon" slot="start">
 
                 <ion-label>
-                    <p class="item-heading">{{ notification.subject }}</p>
+                    <p class="item-heading">
+                        <core-format-text [text]="notification.subject" contextLevel="system" [contextInstanceId]="0"
+                            [wsNotFiltered]="true">
+                        </core-format-text>
+                    </p>
                     <p *ngIf="notification.useridfrom > 0">{{ notification.userfromfullname }}</p>
                 </ion-label>
                 <ion-note slot="end" class="ion-float-end ion-text-end">

From c037a8ea17edc87ceb39aff66a38648d0bcf87fa Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 16 Feb 2022 09:36:41 +0100
Subject: [PATCH 0521/1008] MOBILE-3855 resource: Fix activity not found for
 new resources

---
 src/addons/mod/forum/components/index/index.ts   | 14 +++++---------
 .../course/classes/main-activity-component.ts    |  4 ++--
 .../course/classes/main-resource-component.ts    | 16 ++++++++++++++++
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/addons/mod/forum/components/index/index.ts b/src/addons/mod/forum/components/index/index.ts
index 02a14872c..3c8337d41 100644
--- a/src/addons/mod/forum/components/index/index.ts
+++ b/src/addons/mod/forum/components/index/index.ts
@@ -89,6 +89,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
         component: AddonModForumSortOrderSelectorComponent,
     };
 
+    protected fetchContentDefaultError = 'addon.mod_forum.errorgetforum';
     protected syncEventName = AddonModForumSyncProvider.AUTO_SYNCED;
     protected syncManualObserver?: CoreEventObserver; // It will observe the sync manual event.
     protected replyObserver?: CoreEventObserver;
@@ -325,17 +326,12 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
                 }),
             ]);
         } catch (error) {
-            if (refresh) {
-                CoreDomUtils.showErrorModalDefault(error, 'addon.mod_forum.errorgetforum', true);
+            this.fetchFailed = true; // Set to prevent infinite calls with infinite-loading.
 
-                this.fetchFailed = true; // Set to prevent infinite calls with infinite-loading.
-            } else {
-                // Get forum failed, retry without using cache since it might be a new activity.
-                await this.refreshContent(sync);
-            }
+            throw error; // Pass the error to the parent catch.
+        } finally {
+            this.fillContextMenu(refresh);
         }
-
-        this.fillContextMenu(refresh);
     }
 
     private async fetchForum(sync: boolean = false, showErrors: boolean = false): Promise<void> {
diff --git a/src/core/features/course/classes/main-activity-component.ts b/src/core/features/course/classes/main-activity-component.ts
index 3288f7d65..1c2621036 100644
--- a/src/core/features/course/classes/main-activity-component.ts
+++ b/src/core/features/course/classes/main-activity-component.ts
@@ -208,8 +208,8 @@ export class CoreCourseModuleMainActivityComponent extends CoreCourseModuleMainR
 
             await this.fetchContent(refresh, sync, showErrors);
         } catch (error) {
-            if (!refresh && !CoreSites.getCurrentSite()?.isOfflineDisabled()) {
-                // Some call failed, retry without using cache since it might be a new activity.
+            if (!refresh && !CoreSites.getCurrentSite()?.isOfflineDisabled() && this.isNotFoundError(error)) {
+                // Module not found, retry without using cache.
                 return await this.refreshContent(sync);
             }
 
diff --git a/src/core/features/course/classes/main-resource-component.ts b/src/core/features/course/classes/main-resource-component.ts
index 24964fc75..d3c200727 100644
--- a/src/core/features/course/classes/main-resource-component.ts
+++ b/src/core/features/course/classes/main-resource-component.ts
@@ -17,6 +17,7 @@ import { AddonBlog } from '@addons/blog/services/blog';
 import { AddonBlogMainMenuHandlerService } from '@addons/blog/services/handlers/mainmenu';
 import { OnInit, OnDestroy, Input, Output, EventEmitter, Component, Optional, Inject } from '@angular/core';
 import { Params } from '@angular/router';
+import { CoreAnyError } from '@classes/errors/error';
 import { IonRefresher } from '@ionic/angular';
 import { CoreApp } from '@services/app';
 import { CoreNavigator } from '@services/navigator';
@@ -212,6 +213,11 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
         try {
             await this.fetchContent(refresh);
         } catch (error) {
+            if (!refresh && !CoreSites.getCurrentSite()?.isOfflineDisabled() && this.isNotFoundError(error)) {
+                // Module not found, retry without using cache.
+                return await this.refreshContent();
+            }
+
             CoreDomUtils.showErrorModalDefault(error, this.fetchContentDefaultError, true);
         } finally {
             this.loaded = true;
@@ -219,6 +225,16 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
         }
     }
 
+    /**
+     * Check if an error is a "module not found" error.
+     *
+     * @param error Error.
+     * @return Whether the error is a "module not found" error.
+     */
+    protected isNotFoundError(error: CoreAnyError): boolean {
+        return CoreTextUtils.getErrorMessageFromError(error) === Translate.instant('core.course.modulenotfound');
+    }
+
     /**
      * Fill the context menu options
      */

From 97d7ec80457218f028df2ba9b48900c44017d7df Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 16 Feb 2022 10:18:19 +0100
Subject: [PATCH 0522/1008] MOBILE-3799 h5p: Use new string 'Attempts report'

---
 scripts/langindex.json                                        | 3 +--
 .../components/index/addon-mod-h5pactivity-index.html         | 4 ++--
 src/addons/mod/h5pactivity/lang.json                          | 3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 4edb31980..917f69b68 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -706,6 +706,7 @@
   "addon.mod_h5pactivity.attempt_success_unknown": "h5pactivity",
   "addon.mod_h5pactivity.attempts": "h5pactivity",
   "addon.mod_h5pactivity.attempts_none": "h5pactivity",
+  "addon.mod_h5pactivity.attempts_report": "h5pactivity",
   "addon.mod_h5pactivity.completion": "h5pactivity",
   "addon.mod_h5pactivity.downloadh5pfile": "local_moodlemobileapp",
   "addon.mod_h5pactivity.duration": "h5pactivity",
@@ -722,8 +723,6 @@
   "addon.mod_h5pactivity.previewmode": "h5pactivity",
   "addon.mod_h5pactivity.result_fill-in": "h5pactivity",
   "addon.mod_h5pactivity.result_other": "h5pactivity",
-  "addon.mod_h5pactivity.review_attempts": "local_moodlemobileapp",
-  "addon.mod_h5pactivity.review_my_attempts": "h5pactivity",
   "addon.mod_h5pactivity.review_user_attempts": "h5pactivity",
   "addon.mod_h5pactivity.score": "h5pactivity",
   "addon.mod_h5pactivity.score_out_of": "h5pactivity",
diff --git a/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html b/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
index 3d51c3406..1338852c1 100644
--- a/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
+++ b/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
@@ -2,10 +2,10 @@
 <core-navbar-buttons slot="end">
     <core-context-menu>
         <core-context-menu-item *ngIf="h5pActivity && h5pActivity.enabletracking && accessInfo && !accessInfo.canreviewattempts"
-            [priority]="1000" [content]="'addon.mod_h5pactivity.review_my_attempts' | translate" (action)="viewMyAttempts()"
+            [priority]="1000" [content]="'addon.mod_h5pactivity.attempts_report' | translate" (action)="viewMyAttempts()"
             iconAction="stats-chart">
         </core-context-menu-item>
-        <core-context-menu-item *ngIf="canViewAllAttempts" [priority]="1000" [content]="'addon.mod_h5pactivity.review_attempts' | translate"
+        <core-context-menu-item *ngIf="canViewAllAttempts" [priority]="1000" [content]="'addon.mod_h5pactivity.attempts_report' | translate"
             (action)="viewAllAttempts()" iconAction="stats-chart">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
diff --git a/src/addons/mod/h5pactivity/lang.json b/src/addons/mod/h5pactivity/lang.json
index 55044c8dd..e3d710888 100644
--- a/src/addons/mod/h5pactivity/lang.json
+++ b/src/addons/mod/h5pactivity/lang.json
@@ -13,6 +13,7 @@
     "attempt_success_unknown": "Not reported",
     "attempts": "Attempts",
     "attempts_none": "This user has no attempts to display.",
+    "attempts_report": "Attempts report",
     "completion": "Completion",
     "downloadh5pfile": "Download H5P file",
     "duration": "Duration",
@@ -29,8 +30,6 @@
     "previewmode": "This content is displayed in preview mode. No attempt tracking will be stored.",
     "result_fill-in": "Fill-in text",
     "result_other": "Unknown interaction type",
-    "review_attempts": "View all attempts",
-    "review_my_attempts": "View my attempts",
     "review_user_attempts": "View user attempts ({{$a}})",
     "score": "Score",
     "score_out_of": "{{$a.rawscore}} out of {{$a.maxscore}}",

From 12cb62b7c25103abe6c39b15cca3d74a7a58cab7 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 16 Feb 2022 11:05:01 +0100
Subject: [PATCH 0523/1008] MOBILE-3799 iframe: Fix fullscreen on rotate in new
 pages

---
 src/core/components/iframe/iframe.ts | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/core/components/iframe/iframe.ts b/src/core/components/iframe/iframe.ts
index b80264904..522d46867 100644
--- a/src/core/components/iframe/iframe.ts
+++ b/src/core/components/iframe/iframe.ts
@@ -58,7 +58,7 @@ export class CoreIframeComponent implements OnChanges, OnDestroy {
     protected orientationObs?: CoreEventObserver;
     protected navSubscription?: Subscription;
 
-    constructor() {
+    constructor(protected elementRef: ElementRef<HTMLElement>) {
         this.loaded = new EventEmitter<HTMLIFrameElement>();
     }
 
@@ -104,6 +104,10 @@ export class CoreIframeComponent implements OnChanges, OnDestroy {
                 this.toggleFullscreen(CoreScreen.isLandscape);
 
                 this.orientationObs = CoreEvents.on(CoreEvents.ORIENTATION_CHANGE, (data) => {
+                    if (this.isInHiddenPage()) {
+                        return;
+                    }
+
                     this.toggleFullscreen(data.orientation == CoreScreenOrientation.LANDSCAPE);
                 });
             }
@@ -131,6 +135,16 @@ export class CoreIframeComponent implements OnChanges, OnDestroy {
         }
     }
 
+    /**
+     * Check if the element is in a hidden page.
+     *
+     * @return Whether the element is in a hidden page.
+     */
+    protected isInHiddenPage(): boolean {
+        // If we can't find the parent ion-page, consider it to be hidden too.
+        return !this.elementRef.nativeElement.closest('.ion-page') || !!this.elementRef.nativeElement.closest('.ion-page-hidden');
+    }
+
     /**
      * Detect changes on input properties.
      */

From a834f3c0c855b2f94ce269d17353e969c348489d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 16 Feb 2022 10:14:37 +0100
Subject: [PATCH 0524/1008] MOBILE-3814 storagemanager: Fix titles not shown

---
 .../pages/courses-storage/courses-storage.html            | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/addons/storagemanager/pages/courses-storage/courses-storage.html b/src/addons/storagemanager/pages/courses-storage/courses-storage.html
index cbd478a0d..beb388d23 100644
--- a/src/addons/storagemanager/pages/courses-storage/courses-storage.html
+++ b/src/addons/storagemanager/pages/courses-storage/courses-storage.html
@@ -10,11 +10,11 @@
 </ion-header>
 <ion-content>
     <core-loading [hideUntil]="loaded">
-        <div class="ion-padding-horizontal ion-text-wrap" *ngIf="downloadedCourses.length">
+        <div class="ion-padding-horizontal ion-text-wrap" *ngIf="spaceUsage">
             <h2>{{ 'addon.storagemanager.alldata' | translate }}</h2>
         </div>
-        <ion-card>
-            <ion-item class="ion-text-wrap total" *ngIf="spaceUsage">
+        <ion-card *ngIf="spaceUsage">
+            <ion-item class="ion-text-wrap total">
                 <ion-label>
                     <p class="item-heading ion-text-wrap">{{ 'addon.storagemanager.totalspaceusage' | translate }}</p>
                     <ion-badge color="light" *ngIf="spaceUsage.spaceUsage">{{ spaceUsage.spaceUsage | coreBytesToSize }}</ion-badge>
@@ -27,7 +27,7 @@
             </ion-item>
         </ion-card>
 
-        <div class="ion-padding-horizontal ion-text-wrap" *ngIf="downloadedCourses.length">
+        <div class="ion-padding-horizontal ion-text-wrap">
             <h2>{{ 'addon.storagemanager.downloadedcourses' | translate }}</h2>
         </div>
         <ion-card>

From 183bc133d5abceebf3e127d1356f284c1e810cfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 16 Feb 2022 10:22:17 +0100
Subject: [PATCH 0525/1008] MOBILE-3814 module: Fix navigation buttons position

---
 .../module-navigation/core-course-module-navigation.html      | 4 ++--
 .../components/module-navigation/module-navigation.scss       | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/core/features/course/components/module-navigation/core-course-module-navigation.html b/src/core/features/course/components/module-navigation/core-course-module-navigation.html
index 6d04ae094..203fc8f2a 100644
--- a/src/core/features/course/components/module-navigation/core-course-module-navigation.html
+++ b/src/core/features/course/components/module-navigation/core-course-module-navigation.html
@@ -1,6 +1,6 @@
 <core-loading [hideUntil]="loaded" [fullscreen]="false">
     <ion-row class="ion-justify-content-between ion-align-items-center ion-no-padding ion-wrap" *ngIf="previousModule || nextModule">
-        <ion-col size="auto" class="ion-no-padding">
+        <ion-col size="auto" class="ion-no-padding core-course-module-navigation-arrow">
             <ion-button fill="clear" class="core-course-previous-module" *ngIf="previousModule" (click)="goToActivity(false)"
                 [attr.aria-label]="'core.course.gotopreviousactivity' | translate">
                 <ion-icon name="fas-arrow-left" slot="icon-only" aria-hidden="true"></ion-icon>
@@ -13,7 +13,7 @@
                 [moduleId]="currentModule.id" [showManualCompletion]="true" (completionChanged)="completionChanged.emit($event)">
             </core-course-module-completion>
         </ion-col>
-        <ion-col size="auto" class="ion-no-padding">
+        <ion-col size="auto" class="ion-no-padding core-course-module-navigation-arrow">
             <ion-button fill="clear" class="core-course-next-module" *ngIf="nextModule" (click)="goToActivity(true)"
                 [attr.aria-label]="'core.course.gotonextactivity' | translate">
                 <ion-icon name="fas-arrow-right" slot="icon-only" aria-hidden="true"></ion-icon>
diff --git a/src/core/features/course/components/module-navigation/module-navigation.scss b/src/core/features/course/components/module-navigation/module-navigation.scss
index 823c18328..767ea4da6 100644
--- a/src/core/features/course/components/module-navigation/module-navigation.scss
+++ b/src/core/features/course/components/module-navigation/module-navigation.scss
@@ -25,6 +25,10 @@
         margin-top: var(--button-vertical-margin);
         margin-bottom: var(--button-vertical-margin);
     }
+
+    .core-course-module-navigation-arrow {
+        min-width: 48px;
+    }
 }
 
 :host-context(.core-iframe-fullscreen) {

From 66305150cdab74714d987dc4079f01e4358a9135 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 16 Feb 2022 11:29:14 +0100
Subject: [PATCH 0526/1008] MOBILE-3814 styles: Fix double margin on my courses

---
 src/core/features/courses/pages/my/my.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/core/features/courses/pages/my/my.scss b/src/core/features/courses/pages/my/my.scss
index 1f5841edc..31a27190b 100644
--- a/src/core/features/courses/pages/my/my.scss
+++ b/src/core/features/courses/pages/my/my.scss
@@ -14,6 +14,7 @@
 core-block ::ng-deep ion-card.addon-block-myoverview {
     --border-width: 0;
     --background: transparent;
+    margin: 0;
 }
 
 @if ($core-dashboard-logo) {

From 33cc7e73b8981dbb17d5657be0b89650cf89b26f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 16 Feb 2022 11:35:20 +0100
Subject: [PATCH 0527/1008] MOBILE-3814 icons: Fix wrongly minimized empty icon

---
 src/assets/img/icons/empty.svg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/img/icons/empty.svg b/src/assets/img/icons/empty.svg
index d13e2fd95..3348abd48 100644
--- a/src/assets/img/icons/empty.svg
+++ b/src/assets/img/icons/empty.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" preserveAspectRatio="xMinYMid meet" overflow="visible"/> height="16" viewBox="0 0 16 16" preserveAspectRatio="xMinYMid meet" overflow="visible"></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" preserveAspectRatio="xMinYMid meet" overflow="visible"/>

From e217203ce1b432f4772696287d335e92684e7d8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 16 Feb 2022 11:45:20 +0100
Subject: [PATCH 0528/1008] MOBILE-3814 styles: Reduce bar heights

---
 .../components/user-menu-button/user-menu-button.scss  |  2 +-
 src/theme/theme.base.scss                              |  8 ++++++--
 src/theme/theme.light.scss                             | 10 +++++-----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.scss b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.scss
index d9faceaac..1b47049ad 100644
--- a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.scss
+++ b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.scss
@@ -8,5 +8,5 @@ core-user-avatar {
 
 :host-context(ion-toolbar) core-user-avatar ::ng-deep img,
 :host-context(ion-tab-bar) core-user-avatar ::ng-deep img {
-    padding: 2px !important;
+    padding: 6px !important;
 }
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index e890184f2..c30dae7a9 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -214,8 +214,8 @@ ion-header ion-toolbar {
     .button.button-clear.button-has-icon-only,
     .button.button-solid.button-has-icon-only {
         --border-radius: var(--huge-radius);
-        width: 48px;
-        height: 48px;
+        width: var(--a11y-min-target-size);
+        height: var(--a11y-min-target-size);
     }
 
 
@@ -310,6 +310,10 @@ ion-button ion-spinner {
     --color: inherit !important;
 }
 
+ion-button.button-has-icon-only {
+    margin: 2px;
+}
+
 ion-button:not(.button-has-icon-only):not(.button-small) > ion-icon {
     min-width: 20px;
 }
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 39eb96a05..33ef85f65 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -111,7 +111,7 @@
     --core-bottom-tabs-background-selected: transparent;
     --core-bottom-tabs-badge-color: var(--brand);
     --core-bottom-tabs-badge-text-color: var(--brand-contrast);
-    --bottom-tabs-size: 56px;
+    --bottom-tabs-size: 48px;
     ion-tab-bar.mainmenu-tabs {
         --background: var(--core-bottom-tabs-background);
         --color: var(--core-bottom-tabs-color);
@@ -126,12 +126,12 @@
 
     --core-header-toolbar-button-image-size: var(--a11y-min-target-size);
     --core-header-toolbar-background: var(--white);
-    --core-header-toolbar-border-width: 1px;
+    --core-header-toolbar-border-width: 0px;
     --core-header-toolbar-border-color: var(--stroke);
     --core-header-toolbar-color: var(--gray-900);
-    --core-header-toolbar-height: 56px;
+    --core-header-toolbar-height: 48px;
     html.ios {
-        --core-header-toolbar-height: 54px;
+        --core-header-toolbar-height: 48px;
     }
 
     ion-header ion-toolbar {
@@ -220,7 +220,7 @@
     --core-tab-color-active: var(--dark);
     --core-tab-border-color-active: var(--brand);
     --core-tab-font-weight-active: normal;
-    --core-tabs-height: 56px;
+    --core-tabs-height: 48px;
     core-tabs, core-tabs-outlet {
         ion-slide {
             --background: var(--core-tab-background);

From 656f315655c0af1f9f29d55cd8cabaefe9bf7cb3 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 16 Feb 2022 13:04:18 +0100
Subject: [PATCH 0529/1008] MOBILE-3799 cordova: Update Cordova CLI to v11

---
 package-lock.json | 2384 +++++++++++++++++++++++++++------------------
 package.json      |    2 +-
 2 files changed, 1435 insertions(+), 951 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e2c75415c..d336ccd2c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -57,7 +57,7 @@
         "@types/dom-mediacapture-record": "^1.0.7",
         "chart.js": "^2.9.4",
         "com-darryncampbell-cordova-plugin-intent": "^2.2.0",
-        "cordova": "^10.0.0",
+        "cordova": "^11.0.0",
         "cordova-android": "^10.1.1",
         "cordova-clipboard": "^1.3.0",
         "cordova-ios": "^6.2.0",
@@ -3247,8 +3247,7 @@
     "node_modules/@gar/promisify": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.2.tgz",
-      "integrity": "sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw==",
-      "dev": true
+      "integrity": "sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw=="
     },
     "node_modules/@ionic-native/badge": {
       "version": "5.33.0",
@@ -4162,37 +4161,6 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
       "dev": true
     },
-    "node_modules/@ionic/cli/node_modules/os-name": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/os-name/-/os-name-4.0.0.tgz",
-      "integrity": "sha512-caABzDdJMbtykt7GmSogEat3faTKQhmZf0BS5l/pZGmP0vPWQjXWqOhbLyK+b6j2/DQPmEvYdzLXJXXLJNVDNg==",
-      "dev": true,
-      "dependencies": {
-        "macos-release": "^2.2.0",
-        "windows-release": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@ionic/cli/node_modules/windows-release": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-4.0.0.tgz",
-      "integrity": "sha512-OxmV4wzDKB1x7AZaZgXMVsdJ1qER1ed83ZrTYd5Bwq2HfJVg3DJS8nqlAG4sMoJ7mu8cuRmLEYyU13BKwctRAg==",
-      "dev": true,
-      "dependencies": {
-        "execa": "^4.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/@ionic/core": {
       "version": "5.9.2",
       "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.9.2.tgz",
@@ -5352,7 +5320,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.0.0.tgz",
       "integrity": "sha512-8ltnOpRR/oJbOp8vaGUnipOi3bqkcW+sLHFlyXIr08OGHmVJLB1Hn7QtGXbYcpVtH1gAYZTlmDXtE4YV0+AMMQ==",
-      "dev": true,
       "dependencies": {
         "@gar/promisify": "^1.0.1",
         "semver": "^7.3.5"
@@ -5362,7 +5329,6 @@
       "version": "7.3.5",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
       "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-      "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -5394,9 +5360,9 @@
       "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="
     },
     "node_modules/@npmcli/git/node_modules/hosted-git-info": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
-      "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
+      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -5503,9 +5469,9 @@
       }
     },
     "node_modules/@npmcli/node-gyp": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-1.0.2.tgz",
-      "integrity": "sha512-yrJUe6reVMpktcvagumoqD9r08fH1iRo01gn1u0zoCApa9lnZGEigVKUd2hzsCId4gdtkZZIVscLhNxMECKgRg=="
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-1.0.3.tgz",
+      "integrity": "sha512-fnkhw+fmX65kiLqk6E3BFLXNC26rUhK90zVwe2yncPliVT/Qos3xjhTLE59Df8KnPlcwIERXKVlU1bXoUQ+liA=="
     },
     "node_modules/@npmcli/promise-spawn": {
       "version": "1.3.2",
@@ -5516,13 +5482,12 @@
       }
     },
     "node_modules/@npmcli/run-script": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.8.5.tgz",
-      "integrity": "sha512-NQspusBCpTjNwNRFMtz2C5MxoxyzlbuJ4YEhxAKrIonTiirKDtatsZictx9RgamQIx6+QuHMNmPl0wQdoESs9A==",
+      "version": "1.8.6",
+      "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.8.6.tgz",
+      "integrity": "sha512-e42bVZnC6VluBZBAFEr3YrdqSspG3bgilyg4nSLBJ7TRGNCzxHa92XAHxQBLYg0BmgwO4b2mf3h/l5EkEWRn3g==",
       "dependencies": {
         "@npmcli/node-gyp": "^1.0.2",
         "@npmcli/promise-spawn": "^1.3.2",
-        "infer-owner": "^1.0.4",
         "node-gyp": "^7.1.0",
         "read-package-json-fast": "^2.0.1"
       }
@@ -6875,24 +6840,56 @@
       "integrity": "sha1-DELU+xcWDVqa8eSEus4cZpIsGyE="
     },
     "node_modules/ansi-align": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz",
-      "integrity": "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz",
+      "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==",
       "dependencies": {
-        "string-width": "^3.0.0"
+        "string-width": "^4.1.0"
+      }
+    },
+    "node_modules/ansi-align/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-align/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
+    "node_modules/ansi-align/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "engines": {
+        "node": ">=8"
       }
     },
     "node_modules/ansi-align/node_modules/string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "dependencies": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-align/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
     "node_modules/ansi-colors": {
@@ -7575,6 +7572,14 @@
         "node": ">= 4.5.0"
       }
     },
+    "node_modules/atomically": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/atomically/-/atomically-1.7.0.tgz",
+      "integrity": "sha512-Xcz9l0z7y9yQ9rdDaxlmaI4uJHf/T8g9hOEzJcsEqX2SjCj4J20uK7+ldkDHMbpJDK76wF7xEIgxc/vSlsfw5w==",
+      "engines": {
+        "node": ">=10.12.0"
+      }
+    },
     "node_modules/autoprefixer": {
       "version": "9.8.0",
       "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.0.tgz",
@@ -8152,34 +8157,60 @@
       "dev": true
     },
     "node_modules/boxen": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/boxen/-/boxen-4.2.0.tgz",
-      "integrity": "sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/boxen/-/boxen-5.1.2.tgz",
+      "integrity": "sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ==",
       "dependencies": {
         "ansi-align": "^3.0.0",
-        "camelcase": "^5.3.1",
-        "chalk": "^3.0.0",
-        "cli-boxes": "^2.2.0",
-        "string-width": "^4.1.0",
-        "term-size": "^2.1.0",
-        "type-fest": "^0.8.1",
-        "widest-line": "^3.1.0"
+        "camelcase": "^6.2.0",
+        "chalk": "^4.1.0",
+        "cli-boxes": "^2.2.1",
+        "string-width": "^4.2.2",
+        "type-fest": "^0.20.2",
+        "widest-line": "^3.1.0",
+        "wrap-ansi": "^7.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/boxen/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "engines": {
         "node": ">=8"
       }
     },
+    "node_modules/boxen/node_modules/camelcase": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/boxen/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
     "node_modules/boxen/node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@@ -8194,29 +8225,56 @@
       }
     },
     "node_modules/boxen/node_modules/string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
+        "strip-ansi": "^6.0.1"
       },
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/boxen/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dependencies": {
-        "ansi-regex": "^5.0.0"
+        "ansi-regex": "^5.0.1"
       },
       "engines": {
         "node": ">=8"
       }
     },
+    "node_modules/boxen/node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/boxen/node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
     "node_modules/bplist-creator": {
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.8.tgz",
@@ -8667,6 +8725,7 @@
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
       "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -10187,66 +10246,90 @@
       }
     },
     "node_modules/conf": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/conf/-/conf-1.4.0.tgz",
-      "integrity": "sha512-bzlVWS2THbMetHqXKB8ypsXN4DQ/1qopGwNJi1eYbpwesJcd86FBjFciCQX/YwAhp9bM7NVnPFqZ5LpV7gP0Dg==",
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/conf/-/conf-10.1.1.tgz",
+      "integrity": "sha512-z2civwq/k8TMYtcn3SVP0Peso4otIWnHtcTuHhQ0zDZDdP4NTxqEc8owfkz4zBsdMYdn/LFcE+ZhbCeqkhtq3Q==",
       "dependencies": {
-        "dot-prop": "^4.1.0",
-        "env-paths": "^1.0.0",
-        "make-dir": "^1.0.0",
-        "pkg-up": "^2.0.0",
-        "write-file-atomic": "^2.3.0"
+        "ajv": "^8.6.3",
+        "ajv-formats": "^2.1.1",
+        "atomically": "^1.7.0",
+        "debounce-fn": "^4.0.0",
+        "dot-prop": "^6.0.1",
+        "env-paths": "^2.2.1",
+        "json-schema-typed": "^7.0.3",
+        "onetime": "^5.1.2",
+        "pkg-up": "^3.1.0",
+        "semver": "^7.3.5"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/conf/node_modules/ajv": {
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.10.0.tgz",
+      "integrity": "sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/conf/node_modules/ajv-formats": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
+      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+      "dependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
       }
     },
     "node_modules/conf/node_modules/dot-prop": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.1.tgz",
-      "integrity": "sha512-l0p4+mIuJIua0mhxGoh4a+iNL9bmeK5DvnSVQa6T0OhrVmaEa1XScX5Etc673FePCJOArq/4Pa2cLGODUWTPOQ==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz",
+      "integrity": "sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA==",
       "dependencies": {
-        "is-obj": "^1.0.0"
+        "is-obj": "^2.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/conf/node_modules/is-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+    "node_modules/conf/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
     },
-    "node_modules/conf/node_modules/make-dir": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-      "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+    "node_modules/conf/node_modules/semver": {
+      "version": "7.3.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
       "dependencies": {
-        "pify": "^3.0.0"
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
       },
       "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/conf/node_modules/pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/conf/node_modules/write-file-atomic": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz",
-      "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==",
-      "dependencies": {
-        "graceful-fs": "^4.1.11",
-        "imurmurhash": "^0.1.4",
-        "signal-exit": "^3.0.2"
+        "node": ">=10"
       }
     },
     "node_modules/configstore": {
@@ -10477,29 +10560,29 @@
       }
     },
     "node_modules/cordova": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/cordova/-/cordova-10.0.0.tgz",
-      "integrity": "sha512-00wMcj3X9ILhKtvRG2iEwO2qly4B+vgXFhH4WhVepWg2UVbD1opl1q9jSZ+j2AaI/vsBWW8e6M2M5FAHasnuWw==",
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/cordova/-/cordova-11.0.0.tgz",
+      "integrity": "sha512-Hu2YeT0naeP/1sEm/xfJYUsXN48XV6zagxbi1+4q0Ei9c5TKsIq8v4EWukvSHF4UO2pnh+9ViaDlGMcS1Wrnfg==",
       "dependencies": {
         "configstore": "^5.0.1",
         "cordova-common": "^4.0.2",
-        "cordova-create": "^3.0.0",
-        "cordova-lib": "^10.0.0",
+        "cordova-create": "^4.0.0",
+        "cordova-lib": "^11.0.0",
         "editor": "^1.0.0",
-        "execa": "^4.0.3",
-        "fs-extra": "^9.0.1",
-        "insight": "^0.10.3",
+        "execa": "^5.1.1",
+        "fs-extra": "^10.0.0",
+        "insight": "^0.11.1",
         "loud-rejection": "^2.2.0",
-        "nopt": "^4.0.3",
-        "semver": "^7.3.2",
-        "systeminformation": "^4.26.10",
-        "update-notifier": "^4.1.0"
+        "nopt": "^5.0.0",
+        "semver": "^7.3.5",
+        "systeminformation": "^5.9.17",
+        "update-notifier": "^5.1.0"
       },
       "bin": {
         "cordova": "bin/cordova"
       },
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=12.0.0"
       }
     },
     "node_modules/cordova-android": {
@@ -10577,20 +10660,6 @@
         "node": ">=10.17.0"
       }
     },
-    "node_modules/cordova-android/node_modules/nopt": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
-      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
-      "dependencies": {
-        "abbrev": "1"
-      },
-      "bin": {
-        "nopt": "bin/nopt.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/cordova-android/node_modules/semver": {
       "version": "7.3.5",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
@@ -10606,9 +10675,9 @@
       }
     },
     "node_modules/cordova-app-hello-world": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-5.0.0.tgz",
-      "integrity": "sha512-5My01wsYoeYwS0f/t5Ck52xPm0+2zYJ0SlvxG9vUsndDGtgiP6t/G8upPgWcyDRRz7Rs/50yZuOntmHqmJxccQ=="
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-6.0.0.tgz",
+      "integrity": "sha512-wPZsm+fzNUwdiTRODT+fQuPV410RNmd3Buiw63vT8BPxjC+cn6Bu8emrgwrDM4pbmU5sa5Unwu3xPcbQGQ3G3g=="
     },
     "node_modules/cordova-clipboard": {
       "version": "1.3.0",
@@ -10640,18 +10709,18 @@
       }
     },
     "node_modules/cordova-create": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cordova-create/-/cordova-create-3.0.0.tgz",
-      "integrity": "sha512-WxZRTnt5RHxSAB9urnHFUtVBcIe1YjR4sfwHLsxakNoKkFhcie3HrV5QmNBgRQ5DkxmanRN3VSx4OrPVsNmAaQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-create/-/cordova-create-4.0.0.tgz",
+      "integrity": "sha512-t/4zaDZ4ZsFpC7j6x7s9hR9OeEo8nD2m7rSrzV2PUEfA4BPQujkmk0AIC+5iBvjfR7+ReHOHKsY/NfB1LnMQxQ==",
       "dependencies": {
-        "cordova-app-hello-world": "^5.0.0",
-        "cordova-common": "^4.0.1",
-        "cordova-fetch": "^3.0.0",
-        "fs-extra": "^9.0.0",
-        "globby": "^11.0.0",
-        "import-fresh": "^3.2.1",
+        "cordova-app-hello-world": "^6.0.0",
+        "cordova-common": "^4.0.2",
+        "cordova-fetch": "^3.0.1",
+        "fs-extra": "^10.0.0",
+        "globby": "^11.0.4",
+        "import-fresh": "^3.3.0",
         "isobject": "^4.0.0",
-        "npm-package-arg": "^8.0.1",
+        "npm-package-arg": "^8.1.5",
         "path-is-inside": "^1.0.2",
         "tmp": "^0.2.1",
         "valid-identifier": "0.0.2"
@@ -10660,6 +10729,57 @@
         "node": ">=10"
       }
     },
+    "node_modules/cordova-create/node_modules/fs-extra": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
+      "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/cordova-create/node_modules/hosted-git-info": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
+      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cordova-create/node_modules/npm-package-arg": {
+      "version": "8.1.5",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.5.tgz",
+      "integrity": "sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==",
+      "dependencies": {
+        "hosted-git-info": "^4.0.1",
+        "semver": "^7.3.4",
+        "validate-npm-package-name": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cordova-create/node_modules/semver": {
+      "version": "7.3.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/cordova-fetch": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-3.0.1.tgz",
@@ -10691,9 +10811,9 @@
       }
     },
     "node_modules/cordova-fetch/node_modules/agentkeepalive": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.1.4.tgz",
-      "integrity": "sha512-+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.0.tgz",
+      "integrity": "sha512-0PhAp58jZNw13UJv7NVdTGb0ZcghHUb3DrZ046JiiJY/BOaTTpbwdHq2VObPCBV8M2GPh7sgrJ3AQ8Ey468LJw==",
       "dependencies": {
         "debug": "^4.1.0",
         "depd": "^1.1.2",
@@ -10704,10 +10824,11 @@
       }
     },
     "node_modules/cordova-fetch/node_modules/cacache": {
-      "version": "15.2.0",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.2.0.tgz",
-      "integrity": "sha512-uKoJSHmnrqXgthDFx/IU6ED/5xd+NNGe+Bb+kLZy7Ku4P+BaiWEUflAKPZ7eAzsYGcsAGASJZsybXp+quEcHTw==",
+      "version": "15.3.0",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz",
+      "integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==",
       "dependencies": {
+        "@npmcli/fs": "^1.0.0",
         "@npmcli/move-file": "^1.0.1",
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
@@ -10731,9 +10852,9 @@
       }
     },
     "node_modules/cordova-fetch/node_modules/debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -10777,9 +10898,9 @@
       }
     },
     "node_modules/cordova-fetch/node_modules/make-fetch-happen": {
-      "version": "9.0.4",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.0.4.tgz",
-      "integrity": "sha512-sQWNKMYqSmbAGXqJg2jZ+PmHh5JAybvwu0xM8mZR/bsTjGiTASj3ldXJV7KFHy1k/IJIBkjxQFoWIVsv9+PQMg==",
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz",
+      "integrity": "sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==",
       "dependencies": {
         "agentkeepalive": "^4.1.3",
         "cacache": "^15.2.0",
@@ -10795,7 +10916,7 @@
         "minipass-pipeline": "^1.2.4",
         "negotiator": "^0.6.2",
         "promise-retry": "^2.0.1",
-        "socks-proxy-agent": "^5.0.0",
+        "socks-proxy-agent": "^6.0.0",
         "ssri": "^8.0.0"
       },
       "engines": {
@@ -10906,17 +11027,30 @@
         "node": ">=10"
       }
     },
-    "node_modules/cordova-fetch/node_modules/socks-proxy-agent": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz",
-      "integrity": "sha512-vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ==",
+    "node_modules/cordova-fetch/node_modules/socks": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.6.2.tgz",
+      "integrity": "sha512-zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA==",
       "dependencies": {
-        "agent-base": "^6.0.2",
-        "debug": "4",
-        "socks": "^2.3.3"
+        "ip": "^1.1.5",
+        "smart-buffer": "^4.2.0"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">= 10.13.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/cordova-fetch/node_modules/socks-proxy-agent": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.1.1.tgz",
+      "integrity": "sha512-t8J0kG3csjA4g6FTbsMOWws+7R7vuRC8aQ/wy3/1OWmsgwA68zs/+cExQ0koSitUDXqhufF/YJr9wtNMZHw5Ew==",
+      "dependencies": {
+        "agent-base": "^6.0.2",
+        "debug": "^4.3.1",
+        "socks": "^2.6.1"
+      },
+      "engines": {
+        "node": ">= 10"
       }
     },
     "node_modules/cordova-ios": {
@@ -10939,20 +11073,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/cordova-ios/node_modules/nopt": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
-      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
-      "dependencies": {
-        "abbrev": "1"
-      },
-      "bin": {
-        "nopt": "bin/nopt.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/cordova-ios/node_modules/semver": {
       "version": "7.3.5",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
@@ -10988,29 +11108,83 @@
       }
     },
     "node_modules/cordova-lib": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/cordova-lib/-/cordova-lib-10.0.0.tgz",
-      "integrity": "sha512-azU/WH0x/3fQg33tU5bKCtj+Weh/bHelz9FWCVdXqVOHXmjzbi3p6p61z5Si967Tfh3TkmHRrodNxS0ovZ7iFQ==",
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-lib/-/cordova-lib-11.0.0.tgz",
+      "integrity": "sha512-3XSCIAlS060/hzxWKDrF+sMfv3PVU8bglCaL31HMCyj3YrZn1CZhqrRRrW5lwRxtz7Sh4XCxv97rNxF38uj9hg==",
       "dependencies": {
         "cordova-common": "^4.0.2",
-        "cordova-fetch": "^3.0.0",
+        "cordova-fetch": "^3.0.1",
         "cordova-serve": "^4.0.0",
         "dep-graph": "^1.1.0",
-        "detect-indent": "^6.0.0",
+        "detect-indent": "^6.1.0",
         "detect-newline": "^3.1.0",
         "elementtree": "^0.1.7",
-        "execa": "^4.0.3",
-        "fs-extra": "^9.0.1",
-        "globby": "^11.0.1",
-        "init-package-json": "^1.10.3",
+        "execa": "^5.1.1",
+        "fs-extra": "^10.0.0",
+        "globby": "^11.0.4",
+        "init-package-json": "^2.0.5",
         "md5-file": "^5.0.0",
         "pify": "^5.0.0",
-        "semver": "^7.3.2",
+        "semver": "^7.3.5",
         "stringify-package": "^1.0.1",
         "write-file-atomic": "^3.0.3"
       },
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=12"
+      }
+    },
+    "node_modules/cordova-lib/node_modules/execa": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/cordova-lib/node_modules/fs-extra": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
+      "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/cordova-lib/node_modules/get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cordova-lib/node_modules/human-signals": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+      "engines": {
+        "node": ">=10.17.0"
       }
     },
     "node_modules/cordova-lib/node_modules/pify": {
@@ -11024,6 +11198,20 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/cordova-lib/node_modules/semver": {
+      "version": "7.3.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/cordova-plugin-add-swift-support": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/cordova-plugin-add-swift-support/-/cordova-plugin-add-swift-support-2.0.2.tgz",
@@ -11378,6 +11566,74 @@
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
       "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
     },
+    "node_modules/cordova/node_modules/execa": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/cordova/node_modules/fs-extra": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
+      "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/cordova/node_modules/get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cordova/node_modules/human-signals": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+      "engines": {
+        "node": ">=10.17.0"
+      }
+    },
+    "node_modules/cordova/node_modules/semver": {
+      "version": "7.3.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/core-js": {
       "version": "3.9.1",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.9.1.tgz",
@@ -11958,6 +12214,28 @@
         "node": ">=10"
       }
     },
+    "node_modules/debounce-fn": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/debounce-fn/-/debounce-fn-4.0.0.tgz",
+      "integrity": "sha512-8pYCQiL9Xdcg0UPSD3d+0KMlOjp+KGU5EPwYddgzQ7DATsg4fuUDjQtsYLmWjnk2obnNHgV3vE2Y4jejSOJVBQ==",
+      "dependencies": {
+        "mimic-fn": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/debounce-fn/node_modules/mimic-fn": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.1.0.tgz",
+      "integrity": "sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -12798,7 +13076,8 @@
     "node_modules/emoji-regex": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "dev": true
     },
     "node_modules/emojis-list": {
       "version": "3.0.0",
@@ -12898,11 +13177,11 @@
       "dev": true
     },
     "node_modules/env-paths": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-1.0.0.tgz",
-      "integrity": "sha1-QWgTO0K7BcOKNbGuQ5fIKYqzaeA=",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
+      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
       "engines": {
-        "node": ">=4"
+        "node": ">=6"
       }
     },
     "node_modules/err-code": {
@@ -14393,6 +14672,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
       "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+      "dev": true,
       "dependencies": {
         "locate-path": "^2.0.0"
       },
@@ -14820,8 +15100,7 @@
     "node_modules/function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
     "node_modules/functional-red-black-tree": {
       "version": "1.0.1",
@@ -15395,23 +15674,26 @@
       }
     },
     "node_modules/global-dirs": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-2.1.0.tgz",
-      "integrity": "sha512-MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.0.tgz",
+      "integrity": "sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==",
       "dependencies": {
-        "ini": "1.3.7"
+        "ini": "2.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/global-dirs/node_modules/ini": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.7.tgz",
-      "integrity": "sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ=="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz",
+      "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==",
+      "engines": {
+        "node": ">=10"
+      }
     },
     "node_modules/global-modules": {
       "version": "1.0.0",
@@ -15465,15 +15747,15 @@
       }
     },
     "node_modules/globby": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz",
-      "integrity": "sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==",
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
       "dependencies": {
         "array-union": "^2.1.0",
         "dir-glob": "^3.0.1",
-        "fast-glob": "^3.1.1",
-        "ignore": "^5.1.4",
-        "merge2": "^1.3.0",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
         "slash": "^3.0.0"
       },
       "engines": {
@@ -15483,6 +15765,14 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/globby/node_modules/ignore": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
     "node_modules/glogg": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
@@ -16062,7 +16352,6 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
       "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
       "dependencies": {
         "function-bind": "^1.1.1"
       },
@@ -16722,6 +17011,7 @@
       "version": "5.1.8",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
       "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+      "dev": true,
       "engines": {
         "node": ">= 4"
       }
@@ -16765,15 +17055,18 @@
       }
     },
     "node_modules/import-fresh": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
-      "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
       "dependencies": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
       },
       "engines": {
         "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/import-from": {
@@ -16872,42 +17165,86 @@
       }
     },
     "node_modules/init-package-json": {
-      "version": "1.10.3",
-      "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.10.3.tgz",
-      "integrity": "sha512-zKSiXKhQveNteyhcj1CoOP8tqp1QuxPIPBl8Bid99DGLFqA1p87M6lNgfjJHSBoWJJlidGOv5rWjyYKEB3g2Jw==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-2.0.5.tgz",
+      "integrity": "sha512-u1uGAtEFu3VA6HNl/yUWw57jmKEMx8SKOxHhxjGnOFUiIlFnohKDFg4ZrPpv9wWqk44nDxGJAtqjdQFm+9XXQA==",
       "dependencies": {
-        "glob": "^7.1.1",
-        "npm-package-arg": "^4.0.0 || ^5.0.0 || ^6.0.0",
+        "npm-package-arg": "^8.1.5",
         "promzard": "^0.3.0",
         "read": "~1.0.1",
-        "read-package-json": "1 || 2",
-        "semver": "2.x || 3.x || 4 || 5",
-        "validate-npm-package-license": "^3.0.1",
+        "read-package-json": "^4.1.1",
+        "semver": "^7.3.5",
+        "validate-npm-package-license": "^3.0.4",
         "validate-npm-package-name": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
     "node_modules/init-package-json/node_modules/hosted-git-info": {
-      "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
+      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/init-package-json/node_modules/normalize-package-data": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
+      "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
+      "dependencies": {
+        "hosted-git-info": "^4.0.1",
+        "is-core-module": "^2.5.0",
+        "semver": "^7.3.4",
+        "validate-npm-package-license": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
     },
     "node_modules/init-package-json/node_modules/npm-package-arg": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
-      "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
+      "version": "8.1.5",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.5.tgz",
+      "integrity": "sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==",
       "dependencies": {
-        "hosted-git-info": "^2.7.1",
-        "osenv": "^0.1.5",
-        "semver": "^5.6.0",
+        "hosted-git-info": "^4.0.1",
+        "semver": "^7.3.4",
         "validate-npm-package-name": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/init-package-json/node_modules/read-package-json": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-4.1.1.tgz",
+      "integrity": "sha512-P82sbZJ3ldDrWCOSKxJT0r/CXMWR0OR3KRh55SgKo3p91GSIEEC32v3lSHAvO/UcH3/IoL7uqhOFBduAnwdldw==",
+      "dependencies": {
+        "glob": "^7.1.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "normalize-package-data": "^3.0.0",
+        "npm-normalize-package-bin": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
     "node_modules/init-package-json/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "version": "7.3.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
       "bin": {
-        "semver": "bin/semver"
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
     "node_modules/inquirer": {
@@ -16995,78 +17332,66 @@
       }
     },
     "node_modules/insight": {
-      "version": "0.10.3",
-      "resolved": "https://registry.npmjs.org/insight/-/insight-0.10.3.tgz",
-      "integrity": "sha512-YOncxSN6Omh+1Oqxt+OJAvJVMDKw7l6IEG0wT2cTMGxjsTcroOGW4IR926QDzxg/uZHcFZ2cZbckDWdZhc2pZw==",
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/insight/-/insight-0.11.1.tgz",
+      "integrity": "sha512-TBcZ0qC9dgdmcxL93OoqkY/RZXJtIi0i07phX/QyYk2ysmJtZex59dgTj4Doq50N9CG9dLRe/RIudc/5CCoFNw==",
       "dependencies": {
         "async": "^2.6.2",
-        "chalk": "^2.4.2",
-        "conf": "^1.4.0",
+        "chalk": "^4.1.1",
+        "conf": "^10.0.1",
         "inquirer": "^6.3.1",
         "lodash.debounce": "^4.0.8",
-        "os-name": "^3.1.0",
+        "os-name": "^4.0.1",
         "request": "^2.88.0",
-        "tough-cookie": "^3.0.1",
-        "uuid": "^3.3.2"
+        "tough-cookie": "^4.0.0",
+        "uuid": "^8.3.2"
+      },
+      "engines": {
+        "node": ">=12.20"
+      }
+    },
+    "node_modules/insight/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/insight/node_modules/tough-cookie": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
+      "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
+      "dependencies": {
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.1.2"
       },
       "engines": {
         "node": ">=6"
       }
     },
-    "node_modules/insight/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
+    "node_modules/insight/node_modules/universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
       "engines": {
-        "node": ">=4"
+        "node": ">= 4.0.0"
       }
     },
-    "node_modules/insight/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/insight/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/insight/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-    },
-    "node_modules/insight/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/insight/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
+    "node_modules/insight/node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "bin": {
+        "uuid": "dist/bin/uuid"
       }
     },
     "node_modules/internal-ip": {
@@ -17174,6 +17499,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
       "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
+      "dev": true,
       "engines": {
         "node": ">=4"
       }
@@ -17326,6 +17652,17 @@
         "rgba-regex": "^1.0.0"
       }
     },
+    "node_modules/is-core-module": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz",
+      "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==",
+      "dependencies": {
+        "has": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-data-descriptor": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
@@ -17454,15 +17791,15 @@
       }
     },
     "node_modules/is-installed-globally": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.3.2.tgz",
-      "integrity": "sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz",
+      "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==",
       "dependencies": {
-        "global-dirs": "^2.0.1",
-        "is-path-inside": "^3.0.1"
+        "global-dirs": "^3.0.0",
+        "is-path-inside": "^3.0.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -17501,11 +17838,14 @@
       }
     },
     "node_modules/is-npm": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz",
-      "integrity": "sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-5.0.0.tgz",
+      "integrity": "sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA==",
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/is-number": {
@@ -19383,6 +19723,11 @@
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
     },
+    "node_modules/json-schema-typed": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/json-schema-typed/-/json-schema-typed-7.0.3.tgz",
+      "integrity": "sha512-7DE8mpG+/fVw+dTpjbxnx47TaMnDfOI1jwft9g1VybltZCduyRQPJPvc+zzKY9WPHxhPWczyFuYa6I8Mw4iU5A=="
+    },
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
@@ -19862,6 +20207,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
       "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+      "dev": true,
       "dependencies": {
         "p-locate": "^2.0.0",
         "path-exists": "^3.0.0"
@@ -20138,9 +20484,9 @@
       }
     },
     "node_modules/macos-release": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.4.1.tgz",
-      "integrity": "sha512-H/QHeBIN1fIGJX517pvK8IEK53yQOW7YcEI55oYtgjDdoCQQz7eJS94qt5kNrscReEyuD/JcdFCm2XBEcGOITg==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.5.0.tgz",
+      "integrity": "sha512-EIgv+QZ9r+814gjJj0Bt5vSLJLzswGmSUbUpbi9AIr/fsN2IWFBl2NucV9PAiek+U1STK468tEkxmVYUtuAN3g==",
       "engines": {
         "node": ">=6"
       },
@@ -20810,9 +21156,9 @@
       }
     },
     "node_modules/minipass-fetch": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.3.4.tgz",
-      "integrity": "sha512-TielGogIzbUEtd1LsjZFs47RWuHHfhl6TiCx1InVxApBAmQ8bL0dL5ilkLGcRvuyW/A9nE+Lvn855Ewz8S0PnQ==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.4.1.tgz",
+      "integrity": "sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==",
       "dependencies": {
         "minipass": "^3.1.0",
         "minipass-sized": "^1.0.3",
@@ -21190,7 +21536,8 @@
     "node_modules/nice-try": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+      "dev": true
     },
     "node_modules/nl.kingsquare.cordova.background-audio": {
       "version": "1.0.1",
@@ -21276,28 +21623,6 @@
         "node": ">= 10.12.0"
       }
     },
-    "node_modules/node-gyp/node_modules/env-paths": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
-      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/node-gyp/node_modules/nopt": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
-      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
-      "dependencies": {
-        "abbrev": "1"
-      },
-      "bin": {
-        "nopt": "bin/nopt.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/node-int64": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
@@ -21403,21 +21728,24 @@
       "optional": true
     },
     "node_modules/nopt": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
-      "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
+      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
       "dependencies": {
-        "abbrev": "1",
-        "osenv": "^0.1.4"
+        "abbrev": "1"
       },
       "bin": {
         "nopt": "bin/nopt.js"
+      },
+      "engines": {
+        "node": ">=6"
       }
     },
     "node_modules/normalize-package-data": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
       "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
       "dependencies": {
         "hosted-git-info": "^2.1.4",
         "resolve": "^1.10.0",
@@ -21428,12 +21756,14 @@
     "node_modules/normalize-package-data/node_modules/hosted-git-info": {
       "version": "2.8.8",
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
-      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="
+      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+      "dev": true
     },
     "node_modules/normalize-package-data/node_modules/semver": {
       "version": "5.7.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
       "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
       "bin": {
         "semver": "bin/semver"
       }
@@ -22154,6 +22484,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
       "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -22171,15 +22502,18 @@
       }
     },
     "node_modules/os-name": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/os-name/-/os-name-3.1.0.tgz",
-      "integrity": "sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/os-name/-/os-name-4.0.1.tgz",
+      "integrity": "sha512-xl9MAoU97MH1Xt5K9ERft2YfCAoaO6msy1OBA0ozxEC0x0TmIoE6K3QvgJMMZA9yKGLmHXNY/YZoDbiGDj4zYw==",
       "dependencies": {
-        "macos-release": "^2.2.0",
-        "windows-release": "^3.1.0"
+        "macos-release": "^2.5.0",
+        "windows-release": "^4.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/os-tmpdir": {
@@ -22194,6 +22528,7 @@
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
       "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+      "dev": true,
       "dependencies": {
         "os-homedir": "^1.0.0",
         "os-tmpdir": "^1.0.0"
@@ -22228,6 +22563,7 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
       "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+      "dev": true,
       "dependencies": {
         "p-try": "^1.0.0"
       },
@@ -22239,6 +22575,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
       "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+      "dev": true,
       "engines": {
         "node": ">=4"
       }
@@ -22247,6 +22584,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
       "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "dev": true,
       "dependencies": {
         "p-limit": "^1.1.0"
       },
@@ -22972,14 +23310,62 @@
       }
     },
     "node_modules/pkg-up": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz",
-      "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
+      "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
       "dependencies": {
-        "find-up": "^2.1.0"
+        "find-up": "^3.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
+      }
+    },
+    "node_modules/pkg-up/node_modules/find-up": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "dependencies": {
+        "locate-path": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pkg-up/node_modules/locate-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "dependencies": {
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pkg-up/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/pkg-up/node_modules/p-locate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "dependencies": {
+        "p-limit": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
       }
     },
     "node_modules/plist": {
@@ -24570,6 +24956,7 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.2.tgz",
       "integrity": "sha512-D1KmuLQr6ZSJS0tW8hf3WGpRlwszJOXZ3E8Yd/DNRaM5d+1wVRZdHlpGBLAuovjr28LbWvjpWkBHMxpRGGjzNA==",
+      "dev": true,
       "dependencies": {
         "glob": "^7.1.1",
         "json-parse-even-better-errors": "^2.3.0",
@@ -25090,7 +25477,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
       "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -26399,9 +26785,9 @@
       }
     },
     "node_modules/smart-buffer": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.1.0.tgz",
-      "integrity": "sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
       "engines": {
         "node": ">= 6.0.0",
         "npm": ">= 3.0.0"
@@ -26613,6 +26999,7 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/socks/-/socks-2.3.3.tgz",
       "integrity": "sha512-o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA==",
+      "dev": true,
       "dependencies": {
         "ip": "1.1.5",
         "smart-buffer": "^4.1.0"
@@ -27384,6 +27771,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
       "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -27816,9 +28204,9 @@
       "dev": true
     },
     "node_modules/systeminformation": {
-      "version": "4.34.23",
-      "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-4.34.23.tgz",
-      "integrity": "sha512-33+lQwlLxXoxy0o9WLOgw8OjbXeS3Jv+pSl+nxKc2AOClBI28HsdRPpH0u9Xa9OVjHLT9vonnOMw1ug7YXI0dA==",
+      "version": "5.11.3",
+      "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.11.3.tgz",
+      "integrity": "sha512-sjvlk4SUefhwrONUeLijXt+NQyptAiqShd5v6bFJFNr9EVJUr3YSnNxDqCz0gp5EJBUj88pL1ssc8ZHPtngBOw==",
       "os": [
         "darwin",
         "linux",
@@ -27826,13 +28214,14 @@
         "freebsd",
         "openbsd",
         "netbsd",
-        "sunos"
+        "sunos",
+        "android"
       ],
       "bin": {
         "systeminformation": "lib/cli.js"
       },
       "engines": {
-        "node": ">=4.0.0"
+        "node": ">=8.0.0"
       },
       "funding": {
         "type": "Buy me a coffee",
@@ -28021,17 +28410,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/term-size": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz",
-      "integrity": "sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/terminal-link": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
@@ -28487,6 +28865,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
       "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
+      "dev": true,
       "dependencies": {
         "ip-regex": "^2.1.0",
         "psl": "^1.1.28",
@@ -28720,6 +29099,7 @@
       "version": "0.8.1",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
       "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -29108,31 +29488,61 @@
       }
     },
     "node_modules/update-notifier": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.3.tgz",
-      "integrity": "sha512-Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-5.1.0.tgz",
+      "integrity": "sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw==",
       "dependencies": {
-        "boxen": "^4.2.0",
-        "chalk": "^3.0.0",
+        "boxen": "^5.0.0",
+        "chalk": "^4.1.0",
         "configstore": "^5.0.1",
         "has-yarn": "^2.1.0",
         "import-lazy": "^2.1.0",
         "is-ci": "^2.0.0",
-        "is-installed-globally": "^0.3.1",
-        "is-npm": "^4.0.0",
+        "is-installed-globally": "^0.4.0",
+        "is-npm": "^5.0.0",
         "is-yarn-global": "^0.3.0",
-        "latest-version": "^5.0.0",
-        "pupa": "^2.0.1",
+        "latest-version": "^5.1.0",
+        "pupa": "^2.1.1",
+        "semver": "^7.3.4",
         "semver-diff": "^3.1.1",
         "xdg-basedir": "^4.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       },
       "funding": {
         "url": "https://github.com/yeoman/update-notifier?sponsor=1"
       }
     },
+    "node_modules/update-notifier/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/update-notifier/node_modules/semver": {
+      "version": "7.3.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/upper-case": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
@@ -30532,9 +30942,9 @@
       }
     },
     "node_modules/widest-line/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "engines": {
         "node": ">=8"
       }
@@ -30553,151 +30963,43 @@
       }
     },
     "node_modules/widest-line/node_modules/string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
+        "strip-ansi": "^6.0.1"
       },
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/widest-line/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dependencies": {
-        "ansi-regex": "^5.0.0"
+        "ansi-regex": "^5.0.1"
       },
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/windows-release": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-3.3.3.tgz",
-      "integrity": "sha512-OSOGH1QYiW5yVor9TtmXKQvt2vjQqbYS+DqmsZw+r7xDwLXEeT3JGW0ZppFmHx4diyXmxt238KFR3N9jzevBRg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-4.0.0.tgz",
+      "integrity": "sha512-OxmV4wzDKB1x7AZaZgXMVsdJ1qER1ed83ZrTYd5Bwq2HfJVg3DJS8nqlAG4sMoJ7mu8cuRmLEYyU13BKwctRAg==",
       "dependencies": {
-        "execa": "^1.0.0"
+        "execa": "^4.0.2"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=10"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/windows-release/node_modules/cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-      "dependencies": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      },
-      "engines": {
-        "node": ">=4.8"
-      }
-    },
-    "node_modules/windows-release/node_modules/execa": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-      "dependencies": {
-        "cross-spawn": "^6.0.0",
-        "get-stream": "^4.0.0",
-        "is-stream": "^1.1.0",
-        "npm-run-path": "^2.0.0",
-        "p-finally": "^1.0.0",
-        "signal-exit": "^3.0.0",
-        "strip-eof": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/windows-release/node_modules/get-stream": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/windows-release/node_modules/is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/windows-release/node_modules/npm-run-path": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-      "dependencies": {
-        "path-key": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/windows-release/node_modules/path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/windows-release/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/windows-release/node_modules/shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-      "dependencies": {
-        "shebang-regex": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/windows-release/node_modules/shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/windows-release/node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
     "node_modules/with-open-file": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/with-open-file/-/with-open-file-0.1.7.tgz",
@@ -33482,8 +33784,7 @@
     "@gar/promisify": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.2.tgz",
-      "integrity": "sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw==",
-      "dev": true
+      "integrity": "sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw=="
     },
     "@ionic-native/badge": {
       "version": "5.33.0",
@@ -33978,25 +34279,6 @@
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
           "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
-        },
-        "os-name": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/os-name/-/os-name-4.0.0.tgz",
-          "integrity": "sha512-caABzDdJMbtykt7GmSogEat3faTKQhmZf0BS5l/pZGmP0vPWQjXWqOhbLyK+b6j2/DQPmEvYdzLXJXXLJNVDNg==",
-          "dev": true,
-          "requires": {
-            "macos-release": "^2.2.0",
-            "windows-release": "^4.0.0"
-          }
-        },
-        "windows-release": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-4.0.0.tgz",
-          "integrity": "sha512-OxmV4wzDKB1x7AZaZgXMVsdJ1qER1ed83ZrTYd5Bwq2HfJVg3DJS8nqlAG4sMoJ7mu8cuRmLEYyU13BKwctRAg==",
-          "dev": true,
-          "requires": {
-            "execa": "^4.0.2"
-          }
         }
       }
     },
@@ -35083,7 +35365,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.0.0.tgz",
       "integrity": "sha512-8ltnOpRR/oJbOp8vaGUnipOi3bqkcW+sLHFlyXIr08OGHmVJLB1Hn7QtGXbYcpVtH1gAYZTlmDXtE4YV0+AMMQ==",
-      "dev": true,
       "requires": {
         "@gar/promisify": "^1.0.1",
         "semver": "^7.3.5"
@@ -35093,7 +35374,6 @@
           "version": "7.3.5",
           "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
           "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-          "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
           }
@@ -35121,9 +35401,9 @@
           "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="
         },
         "hosted-git-info": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
-          "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
+          "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
           "requires": {
             "lru-cache": "^6.0.0"
           }
@@ -35198,9 +35478,9 @@
       }
     },
     "@npmcli/node-gyp": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-1.0.2.tgz",
-      "integrity": "sha512-yrJUe6reVMpktcvagumoqD9r08fH1iRo01gn1u0zoCApa9lnZGEigVKUd2hzsCId4gdtkZZIVscLhNxMECKgRg=="
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-1.0.3.tgz",
+      "integrity": "sha512-fnkhw+fmX65kiLqk6E3BFLXNC26rUhK90zVwe2yncPliVT/Qos3xjhTLE59Df8KnPlcwIERXKVlU1bXoUQ+liA=="
     },
     "@npmcli/promise-spawn": {
       "version": "1.3.2",
@@ -35211,13 +35491,12 @@
       }
     },
     "@npmcli/run-script": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.8.5.tgz",
-      "integrity": "sha512-NQspusBCpTjNwNRFMtz2C5MxoxyzlbuJ4YEhxAKrIonTiirKDtatsZictx9RgamQIx6+QuHMNmPl0wQdoESs9A==",
+      "version": "1.8.6",
+      "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.8.6.tgz",
+      "integrity": "sha512-e42bVZnC6VluBZBAFEr3YrdqSspG3bgilyg4nSLBJ7TRGNCzxHa92XAHxQBLYg0BmgwO4b2mf3h/l5EkEWRn3g==",
       "requires": {
         "@npmcli/node-gyp": "^1.0.2",
         "@npmcli/promise-spawn": "^1.3.2",
-        "infer-owner": "^1.0.4",
         "node-gyp": "^7.1.0",
         "read-package-json-fast": "^2.0.1"
       }
@@ -36285,21 +36564,44 @@
       "integrity": "sha1-DELU+xcWDVqa8eSEus4cZpIsGyE="
     },
     "ansi-align": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz",
-      "integrity": "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz",
+      "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==",
       "requires": {
-        "string-width": "^3.0.0"
+        "string-width": "^4.1.0"
       },
       "dependencies": {
+        "ansi-regex": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
+        },
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+        },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
+        },
         "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "version": "4.2.3",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
           "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.1"
+          }
+        },
+        "strip-ansi": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+          "requires": {
+            "ansi-regex": "^5.0.1"
           }
         }
       }
@@ -36819,6 +37121,11 @@
       "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
       "dev": true
     },
+    "atomically": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/atomically/-/atomically-1.7.0.tgz",
+      "integrity": "sha512-Xcz9l0z7y9yQ9rdDaxlmaI4uJHf/T8g9hOEzJcsEqX2SjCj4J20uK7+ldkDHMbpJDK76wF7xEIgxc/vSlsfw5w=="
+    },
     "autoprefixer": {
       "version": "9.8.0",
       "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.0.tgz",
@@ -37283,24 +37590,38 @@
       "dev": true
     },
     "boxen": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/boxen/-/boxen-4.2.0.tgz",
-      "integrity": "sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/boxen/-/boxen-5.1.2.tgz",
+      "integrity": "sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ==",
       "requires": {
         "ansi-align": "^3.0.0",
-        "camelcase": "^5.3.1",
-        "chalk": "^3.0.0",
-        "cli-boxes": "^2.2.0",
-        "string-width": "^4.1.0",
-        "term-size": "^2.1.0",
-        "type-fest": "^0.8.1",
-        "widest-line": "^3.1.0"
+        "camelcase": "^6.2.0",
+        "chalk": "^4.1.0",
+        "cli-boxes": "^2.2.1",
+        "string-width": "^4.2.2",
+        "type-fest": "^0.20.2",
+        "widest-line": "^3.1.0",
+        "wrap-ansi": "^7.0.0"
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
+        },
+        "camelcase": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+          "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
         },
         "emoji-regex": {
           "version": "8.0.0",
@@ -37313,21 +37634,36 @@
           "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
         },
         "string-width": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+          "version": "4.2.3",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
           "requires": {
             "emoji-regex": "^8.0.0",
             "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
+            "strip-ansi": "^6.0.1"
           }
         },
         "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
           "requires": {
-            "ansi-regex": "^5.0.0"
+            "ansi-regex": "^5.0.1"
+          }
+        },
+        "type-fest": {
+          "version": "0.20.2",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="
+        },
+        "wrap-ansi": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+          "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0"
           }
         }
       }
@@ -37712,7 +38048,8 @@
     "camelcase": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true
     },
     "caniuse-api": {
       "version": "3.0.0",
@@ -38931,51 +39268,60 @@
       }
     },
     "conf": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/conf/-/conf-1.4.0.tgz",
-      "integrity": "sha512-bzlVWS2THbMetHqXKB8ypsXN4DQ/1qopGwNJi1eYbpwesJcd86FBjFciCQX/YwAhp9bM7NVnPFqZ5LpV7gP0Dg==",
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/conf/-/conf-10.1.1.tgz",
+      "integrity": "sha512-z2civwq/k8TMYtcn3SVP0Peso4otIWnHtcTuHhQ0zDZDdP4NTxqEc8owfkz4zBsdMYdn/LFcE+ZhbCeqkhtq3Q==",
       "requires": {
-        "dot-prop": "^4.1.0",
-        "env-paths": "^1.0.0",
-        "make-dir": "^1.0.0",
-        "pkg-up": "^2.0.0",
-        "write-file-atomic": "^2.3.0"
+        "ajv": "^8.6.3",
+        "ajv-formats": "^2.1.1",
+        "atomically": "^1.7.0",
+        "debounce-fn": "^4.0.0",
+        "dot-prop": "^6.0.1",
+        "env-paths": "^2.2.1",
+        "json-schema-typed": "^7.0.3",
+        "onetime": "^5.1.2",
+        "pkg-up": "^3.1.0",
+        "semver": "^7.3.5"
       },
       "dependencies": {
+        "ajv": {
+          "version": "8.10.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.10.0.tgz",
+          "integrity": "sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==",
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "json-schema-traverse": "^1.0.0",
+            "require-from-string": "^2.0.2",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-formats": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
+          "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+          "requires": {
+            "ajv": "^8.0.0"
+          }
+        },
         "dot-prop": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.1.tgz",
-          "integrity": "sha512-l0p4+mIuJIua0mhxGoh4a+iNL9bmeK5DvnSVQa6T0OhrVmaEa1XScX5Etc673FePCJOArq/4Pa2cLGODUWTPOQ==",
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz",
+          "integrity": "sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA==",
           "requires": {
-            "is-obj": "^1.0.0"
+            "is-obj": "^2.0.0"
           }
         },
-        "is-obj": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-          "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
+        "json-schema-traverse": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
         },
-        "make-dir": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-          "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+        "semver": {
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
           "requires": {
-            "pify": "^3.0.0"
-          }
-        },
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
-        },
-        "write-file-atomic": {
-          "version": "2.4.3",
-          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz",
-          "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==",
-          "requires": {
-            "graceful-fs": "^4.1.11",
-            "imurmurhash": "^0.1.4",
-            "signal-exit": "^3.0.2"
+            "lru-cache": "^6.0.0"
           }
         }
       }
@@ -39163,23 +39509,69 @@
       }
     },
     "cordova": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/cordova/-/cordova-10.0.0.tgz",
-      "integrity": "sha512-00wMcj3X9ILhKtvRG2iEwO2qly4B+vgXFhH4WhVepWg2UVbD1opl1q9jSZ+j2AaI/vsBWW8e6M2M5FAHasnuWw==",
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/cordova/-/cordova-11.0.0.tgz",
+      "integrity": "sha512-Hu2YeT0naeP/1sEm/xfJYUsXN48XV6zagxbi1+4q0Ei9c5TKsIq8v4EWukvSHF4UO2pnh+9ViaDlGMcS1Wrnfg==",
       "requires": {
         "configstore": "^5.0.1",
         "cordova-common": "^4.0.2",
-        "cordova-create": "^3.0.0",
-        "cordova-lib": "^10.0.0",
+        "cordova-create": "^4.0.0",
+        "cordova-lib": "^11.0.0",
         "editor": "^1.0.0",
-        "execa": "^4.0.3",
-        "fs-extra": "^9.0.1",
-        "insight": "^0.10.3",
+        "execa": "^5.1.1",
+        "fs-extra": "^10.0.0",
+        "insight": "^0.11.1",
         "loud-rejection": "^2.2.0",
-        "nopt": "^4.0.3",
-        "semver": "^7.3.2",
-        "systeminformation": "^4.26.10",
-        "update-notifier": "^4.1.0"
+        "nopt": "^5.0.0",
+        "semver": "^7.3.5",
+        "systeminformation": "^5.9.17",
+        "update-notifier": "^5.1.0"
+      },
+      "dependencies": {
+        "execa": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+          "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+          "requires": {
+            "cross-spawn": "^7.0.3",
+            "get-stream": "^6.0.0",
+            "human-signals": "^2.1.0",
+            "is-stream": "^2.0.0",
+            "merge-stream": "^2.0.0",
+            "npm-run-path": "^4.0.1",
+            "onetime": "^5.1.2",
+            "signal-exit": "^3.0.3",
+            "strip-final-newline": "^2.0.0"
+          }
+        },
+        "fs-extra": {
+          "version": "10.0.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
+          "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
+          "requires": {
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^6.0.1",
+            "universalify": "^2.0.0"
+          }
+        },
+        "get-stream": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+          "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="
+        },
+        "human-signals": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+          "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="
+        },
+        "semver": {
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        }
       }
     },
     "cordova-android": {
@@ -39236,14 +39628,6 @@
           "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
           "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="
         },
-        "nopt": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
-          "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
-          "requires": {
-            "abbrev": "1"
-          }
-        },
         "semver": {
           "version": "7.3.5",
           "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
@@ -39255,9 +39639,9 @@
       }
     },
     "cordova-app-hello-world": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-5.0.0.tgz",
-      "integrity": "sha512-5My01wsYoeYwS0f/t5Ck52xPm0+2zYJ0SlvxG9vUsndDGtgiP6t/G8upPgWcyDRRz7Rs/50yZuOntmHqmJxccQ=="
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-6.0.0.tgz",
+      "integrity": "sha512-wPZsm+fzNUwdiTRODT+fQuPV410RNmd3Buiw63vT8BPxjC+cn6Bu8emrgwrDM4pbmU5sa5Unwu3xPcbQGQ3G3g=="
     },
     "cordova-clipboard": {
       "version": "1.3.0",
@@ -39286,21 +39670,59 @@
       }
     },
     "cordova-create": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cordova-create/-/cordova-create-3.0.0.tgz",
-      "integrity": "sha512-WxZRTnt5RHxSAB9urnHFUtVBcIe1YjR4sfwHLsxakNoKkFhcie3HrV5QmNBgRQ5DkxmanRN3VSx4OrPVsNmAaQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-create/-/cordova-create-4.0.0.tgz",
+      "integrity": "sha512-t/4zaDZ4ZsFpC7j6x7s9hR9OeEo8nD2m7rSrzV2PUEfA4BPQujkmk0AIC+5iBvjfR7+ReHOHKsY/NfB1LnMQxQ==",
       "requires": {
-        "cordova-app-hello-world": "^5.0.0",
-        "cordova-common": "^4.0.1",
-        "cordova-fetch": "^3.0.0",
-        "fs-extra": "^9.0.0",
-        "globby": "^11.0.0",
-        "import-fresh": "^3.2.1",
+        "cordova-app-hello-world": "^6.0.0",
+        "cordova-common": "^4.0.2",
+        "cordova-fetch": "^3.0.1",
+        "fs-extra": "^10.0.0",
+        "globby": "^11.0.4",
+        "import-fresh": "^3.3.0",
         "isobject": "^4.0.0",
-        "npm-package-arg": "^8.0.1",
+        "npm-package-arg": "^8.1.5",
         "path-is-inside": "^1.0.2",
         "tmp": "^0.2.1",
         "valid-identifier": "0.0.2"
+      },
+      "dependencies": {
+        "fs-extra": {
+          "version": "10.0.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
+          "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
+          "requires": {
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^6.0.1",
+            "universalify": "^2.0.0"
+          }
+        },
+        "hosted-git-info": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
+          "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "npm-package-arg": {
+          "version": "8.1.5",
+          "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.5.tgz",
+          "integrity": "sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==",
+          "requires": {
+            "hosted-git-info": "^4.0.1",
+            "semver": "^7.3.4",
+            "validate-npm-package-name": "^3.0.0"
+          }
+        },
+        "semver": {
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        }
       }
     },
     "cordova-fetch": {
@@ -39327,9 +39749,9 @@
           }
         },
         "agentkeepalive": {
-          "version": "4.1.4",
-          "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.1.4.tgz",
-          "integrity": "sha512-+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.0.tgz",
+          "integrity": "sha512-0PhAp58jZNw13UJv7NVdTGb0ZcghHUb3DrZ046JiiJY/BOaTTpbwdHq2VObPCBV8M2GPh7sgrJ3AQ8Ey468LJw==",
           "requires": {
             "debug": "^4.1.0",
             "depd": "^1.1.2",
@@ -39337,10 +39759,11 @@
           }
         },
         "cacache": {
-          "version": "15.2.0",
-          "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.2.0.tgz",
-          "integrity": "sha512-uKoJSHmnrqXgthDFx/IU6ED/5xd+NNGe+Bb+kLZy7Ku4P+BaiWEUflAKPZ7eAzsYGcsAGASJZsybXp+quEcHTw==",
+          "version": "15.3.0",
+          "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz",
+          "integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==",
           "requires": {
+            "@npmcli/fs": "^1.0.0",
             "@npmcli/move-file": "^1.0.1",
             "chownr": "^2.0.0",
             "fs-minipass": "^2.0.0",
@@ -39361,9 +39784,9 @@
           }
         },
         "debug": {
-          "version": "4.3.2",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-          "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+          "version": "4.3.3",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+          "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
           "requires": {
             "ms": "2.1.2"
           }
@@ -39393,9 +39816,9 @@
           }
         },
         "make-fetch-happen": {
-          "version": "9.0.4",
-          "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.0.4.tgz",
-          "integrity": "sha512-sQWNKMYqSmbAGXqJg2jZ+PmHh5JAybvwu0xM8mZR/bsTjGiTASj3ldXJV7KFHy1k/IJIBkjxQFoWIVsv9+PQMg==",
+          "version": "9.1.0",
+          "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz",
+          "integrity": "sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==",
           "requires": {
             "agentkeepalive": "^4.1.3",
             "cacache": "^15.2.0",
@@ -39411,7 +39834,7 @@
             "minipass-pipeline": "^1.2.4",
             "negotiator": "^0.6.2",
             "promise-retry": "^2.0.1",
-            "socks-proxy-agent": "^5.0.0",
+            "socks-proxy-agent": "^6.0.0",
             "ssri": "^8.0.0"
           }
         },
@@ -39489,14 +39912,23 @@
             "retry": "^0.12.0"
           }
         },
+        "socks": {
+          "version": "2.6.2",
+          "resolved": "https://registry.npmjs.org/socks/-/socks-2.6.2.tgz",
+          "integrity": "sha512-zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA==",
+          "requires": {
+            "ip": "^1.1.5",
+            "smart-buffer": "^4.2.0"
+          }
+        },
         "socks-proxy-agent": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz",
-          "integrity": "sha512-vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ==",
+          "version": "6.1.1",
+          "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.1.1.tgz",
+          "integrity": "sha512-t8J0kG3csjA4g6FTbsMOWws+7R7vuRC8aQ/wy3/1OWmsgwA68zs/+cExQ0koSitUDXqhufF/YJr9wtNMZHw5Ew==",
           "requires": {
             "agent-base": "^6.0.2",
-            "debug": "4",
-            "socks": "^2.3.3"
+            "debug": "^4.3.1",
+            "socks": "^2.6.1"
           }
         }
       }
@@ -39518,14 +39950,6 @@
         "xml-escape": "^1.1.0"
       },
       "dependencies": {
-        "nopt": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
-          "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
-          "requires": {
-            "abbrev": "1"
-          }
-        },
         "semver": {
           "version": "7.3.5",
           "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
@@ -39551,32 +39975,76 @@
       }
     },
     "cordova-lib": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/cordova-lib/-/cordova-lib-10.0.0.tgz",
-      "integrity": "sha512-azU/WH0x/3fQg33tU5bKCtj+Weh/bHelz9FWCVdXqVOHXmjzbi3p6p61z5Si967Tfh3TkmHRrodNxS0ovZ7iFQ==",
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-lib/-/cordova-lib-11.0.0.tgz",
+      "integrity": "sha512-3XSCIAlS060/hzxWKDrF+sMfv3PVU8bglCaL31HMCyj3YrZn1CZhqrRRrW5lwRxtz7Sh4XCxv97rNxF38uj9hg==",
       "requires": {
         "cordova-common": "^4.0.2",
-        "cordova-fetch": "^3.0.0",
+        "cordova-fetch": "^3.0.1",
         "cordova-serve": "^4.0.0",
         "dep-graph": "^1.1.0",
-        "detect-indent": "^6.0.0",
+        "detect-indent": "^6.1.0",
         "detect-newline": "^3.1.0",
         "elementtree": "^0.1.7",
-        "execa": "^4.0.3",
-        "fs-extra": "^9.0.1",
-        "globby": "^11.0.1",
-        "init-package-json": "^1.10.3",
+        "execa": "^5.1.1",
+        "fs-extra": "^10.0.0",
+        "globby": "^11.0.4",
+        "init-package-json": "^2.0.5",
         "md5-file": "^5.0.0",
         "pify": "^5.0.0",
-        "semver": "^7.3.2",
+        "semver": "^7.3.5",
         "stringify-package": "^1.0.1",
         "write-file-atomic": "^3.0.3"
       },
       "dependencies": {
+        "execa": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+          "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+          "requires": {
+            "cross-spawn": "^7.0.3",
+            "get-stream": "^6.0.0",
+            "human-signals": "^2.1.0",
+            "is-stream": "^2.0.0",
+            "merge-stream": "^2.0.0",
+            "npm-run-path": "^4.0.1",
+            "onetime": "^5.1.2",
+            "signal-exit": "^3.0.3",
+            "strip-final-newline": "^2.0.0"
+          }
+        },
+        "fs-extra": {
+          "version": "10.0.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
+          "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
+          "requires": {
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^6.0.1",
+            "universalify": "^2.0.0"
+          }
+        },
+        "get-stream": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+          "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="
+        },
+        "human-signals": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+          "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="
+        },
         "pify": {
           "version": "5.0.0",
           "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz",
           "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA=="
+        },
+        "semver": {
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
         }
       }
     },
@@ -40217,6 +40685,21 @@
         "whatwg-url": "^8.0.0"
       }
     },
+    "debounce-fn": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/debounce-fn/-/debounce-fn-4.0.0.tgz",
+      "integrity": "sha512-8pYCQiL9Xdcg0UPSD3d+0KMlOjp+KGU5EPwYddgzQ7DATsg4fuUDjQtsYLmWjnk2obnNHgV3vE2Y4jejSOJVBQ==",
+      "requires": {
+        "mimic-fn": "^3.0.0"
+      },
+      "dependencies": {
+        "mimic-fn": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.1.0.tgz",
+          "integrity": "sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ=="
+        }
+      }
+    },
     "debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -40904,7 +41387,8 @@
     "emoji-regex": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "dev": true
     },
     "emojis-list": {
       "version": "3.0.0",
@@ -40990,9 +41474,9 @@
       "dev": true
     },
     "env-paths": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-1.0.0.tgz",
-      "integrity": "sha1-QWgTO0K7BcOKNbGuQ5fIKYqzaeA="
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
+      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="
     },
     "err-code": {
       "version": "1.1.2",
@@ -42152,6 +42636,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
       "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+      "dev": true,
       "requires": {
         "locate-path": "^2.0.0"
       }
@@ -42493,8 +42978,7 @@
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
     "functional-red-black-tree": {
       "version": "1.0.1",
@@ -42962,17 +43446,17 @@
       }
     },
     "global-dirs": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-2.1.0.tgz",
-      "integrity": "sha512-MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.0.tgz",
+      "integrity": "sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==",
       "requires": {
-        "ini": "1.3.7"
+        "ini": "2.0.0"
       },
       "dependencies": {
         "ini": {
-          "version": "1.3.7",
-          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.7.tgz",
-          "integrity": "sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ=="
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz",
+          "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA=="
         }
       }
     },
@@ -43018,16 +43502,23 @@
       "dev": true
     },
     "globby": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz",
-      "integrity": "sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==",
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
       "requires": {
         "array-union": "^2.1.0",
         "dir-glob": "^3.0.1",
-        "fast-glob": "^3.1.1",
-        "ignore": "^5.1.4",
-        "merge2": "^1.3.0",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
         "slash": "^3.0.0"
+      },
+      "dependencies": {
+        "ignore": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+          "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="
+        }
       }
     },
     "glogg": {
@@ -43505,7 +43996,6 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
       "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
       "requires": {
         "function-bind": "^1.1.1"
       }
@@ -44057,7 +44547,8 @@
     "ignore": {
       "version": "5.1.8",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-      "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="
+      "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+      "dev": true
     },
     "ignore-walk": {
       "version": "3.0.3",
@@ -44089,9 +44580,9 @@
       }
     },
     "import-fresh": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
-      "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
       "requires": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
@@ -44170,40 +44661,66 @@
       "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
     },
     "init-package-json": {
-      "version": "1.10.3",
-      "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.10.3.tgz",
-      "integrity": "sha512-zKSiXKhQveNteyhcj1CoOP8tqp1QuxPIPBl8Bid99DGLFqA1p87M6lNgfjJHSBoWJJlidGOv5rWjyYKEB3g2Jw==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-2.0.5.tgz",
+      "integrity": "sha512-u1uGAtEFu3VA6HNl/yUWw57jmKEMx8SKOxHhxjGnOFUiIlFnohKDFg4ZrPpv9wWqk44nDxGJAtqjdQFm+9XXQA==",
       "requires": {
-        "glob": "^7.1.1",
-        "npm-package-arg": "^4.0.0 || ^5.0.0 || ^6.0.0",
+        "npm-package-arg": "^8.1.5",
         "promzard": "^0.3.0",
         "read": "~1.0.1",
-        "read-package-json": "1 || 2",
-        "semver": "2.x || 3.x || 4 || 5",
-        "validate-npm-package-license": "^3.0.1",
+        "read-package-json": "^4.1.1",
+        "semver": "^7.3.5",
+        "validate-npm-package-license": "^3.0.4",
         "validate-npm-package-name": "^3.0.0"
       },
       "dependencies": {
         "hosted-git-info": {
-          "version": "2.8.9",
-          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-          "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
+          "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "normalize-package-data": {
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
+          "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
+          "requires": {
+            "hosted-git-info": "^4.0.1",
+            "is-core-module": "^2.5.0",
+            "semver": "^7.3.4",
+            "validate-npm-package-license": "^3.0.1"
+          }
         },
         "npm-package-arg": {
-          "version": "6.1.1",
-          "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
-          "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
+          "version": "8.1.5",
+          "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.5.tgz",
+          "integrity": "sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==",
           "requires": {
-            "hosted-git-info": "^2.7.1",
-            "osenv": "^0.1.5",
-            "semver": "^5.6.0",
+            "hosted-git-info": "^4.0.1",
+            "semver": "^7.3.4",
             "validate-npm-package-name": "^3.0.0"
           }
         },
+        "read-package-json": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-4.1.1.tgz",
+          "integrity": "sha512-P82sbZJ3ldDrWCOSKxJT0r/CXMWR0OR3KRh55SgKo3p91GSIEEC32v3lSHAvO/UcH3/IoL7uqhOFBduAnwdldw==",
+          "requires": {
+            "glob": "^7.1.1",
+            "json-parse-even-better-errors": "^2.3.0",
+            "normalize-package-data": "^3.0.0",
+            "npm-normalize-package-bin": "^1.0.0"
+          }
+        },
         "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
         }
       }
     },
@@ -44279,64 +44796,49 @@
       }
     },
     "insight": {
-      "version": "0.10.3",
-      "resolved": "https://registry.npmjs.org/insight/-/insight-0.10.3.tgz",
-      "integrity": "sha512-YOncxSN6Omh+1Oqxt+OJAvJVMDKw7l6IEG0wT2cTMGxjsTcroOGW4IR926QDzxg/uZHcFZ2cZbckDWdZhc2pZw==",
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/insight/-/insight-0.11.1.tgz",
+      "integrity": "sha512-TBcZ0qC9dgdmcxL93OoqkY/RZXJtIi0i07phX/QyYk2ysmJtZex59dgTj4Doq50N9CG9dLRe/RIudc/5CCoFNw==",
       "requires": {
         "async": "^2.6.2",
-        "chalk": "^2.4.2",
-        "conf": "^1.4.0",
+        "chalk": "^4.1.1",
+        "conf": "^10.0.1",
         "inquirer": "^6.3.1",
         "lodash.debounce": "^4.0.8",
-        "os-name": "^3.1.0",
+        "os-name": "^4.0.1",
         "request": "^2.88.0",
-        "tough-cookie": "^3.0.1",
-        "uuid": "^3.3.2"
+        "tough-cookie": "^4.0.0",
+        "uuid": "^8.3.2"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
         "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
           }
         },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+        "tough-cookie": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
+          "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
           "requires": {
-            "color-name": "1.1.3"
+            "psl": "^1.1.33",
+            "punycode": "^2.1.1",
+            "universalify": "^0.1.2"
           }
         },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+        "universalify": {
+          "version": "0.1.2",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+          "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
         },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
+        "uuid": {
+          "version": "8.3.2",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+          "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
         }
       }
     },
@@ -44420,7 +44922,8 @@
     "ip-regex": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
-      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk="
+      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
+      "dev": true
     },
     "ipaddr.js": {
       "version": "1.9.1",
@@ -44533,6 +45036,14 @@
         "rgba-regex": "^1.0.0"
       }
     },
+    "is-core-module": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz",
+      "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==",
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
     "is-data-descriptor": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
@@ -44620,12 +45131,12 @@
       }
     },
     "is-installed-globally": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.3.2.tgz",
-      "integrity": "sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz",
+      "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==",
       "requires": {
-        "global-dirs": "^2.0.1",
-        "is-path-inside": "^3.0.1"
+        "global-dirs": "^3.0.0",
+        "is-path-inside": "^3.0.2"
       }
     },
     "is-interactive": {
@@ -44652,9 +45163,9 @@
       "dev": true
     },
     "is-npm": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz",
-      "integrity": "sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig=="
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-5.0.0.tgz",
+      "integrity": "sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA=="
     },
     "is-number": {
       "version": "7.0.0",
@@ -46075,6 +46586,11 @@
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
     },
+    "json-schema-typed": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/json-schema-typed/-/json-schema-typed-7.0.3.tgz",
+      "integrity": "sha512-7DE8mpG+/fVw+dTpjbxnx47TaMnDfOI1jwft9g1VybltZCduyRQPJPvc+zzKY9WPHxhPWczyFuYa6I8Mw4iU5A=="
+    },
     "json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
@@ -46457,6 +46973,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
       "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+      "dev": true,
       "requires": {
         "p-locate": "^2.0.0",
         "path-exists": "^3.0.0"
@@ -46698,9 +47215,9 @@
       }
     },
     "macos-release": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.4.1.tgz",
-      "integrity": "sha512-H/QHeBIN1fIGJX517pvK8IEK53yQOW7YcEI55oYtgjDdoCQQz7eJS94qt5kNrscReEyuD/JcdFCm2XBEcGOITg=="
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.5.0.tgz",
+      "integrity": "sha512-EIgv+QZ9r+814gjJj0Bt5vSLJLzswGmSUbUpbi9AIr/fsN2IWFBl2NucV9PAiek+U1STK468tEkxmVYUtuAN3g=="
     },
     "magic-string": {
       "version": "0.25.7",
@@ -47246,9 +47763,9 @@
       }
     },
     "minipass-fetch": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.3.4.tgz",
-      "integrity": "sha512-TielGogIzbUEtd1LsjZFs47RWuHHfhl6TiCx1InVxApBAmQ8bL0dL5ilkLGcRvuyW/A9nE+Lvn855Ewz8S0PnQ==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.4.1.tgz",
+      "integrity": "sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==",
       "requires": {
         "encoding": "^0.1.12",
         "minipass": "^3.1.0",
@@ -47558,7 +48075,8 @@
     "nice-try": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+      "dev": true
     },
     "nl.kingsquare.cordova.background-audio": {
       "version": "1.0.1",
@@ -47629,21 +48147,6 @@
         "semver": "^7.3.2",
         "tar": "^6.0.2",
         "which": "^2.0.2"
-      },
-      "dependencies": {
-        "env-paths": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
-          "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="
-        },
-        "nopt": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
-          "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
-          "requires": {
-            "abbrev": "1"
-          }
-        }
       }
     },
     "node-int64": {
@@ -47749,18 +48252,18 @@
       "optional": true
     },
     "nopt": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
-      "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
+      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
       "requires": {
-        "abbrev": "1",
-        "osenv": "^0.1.4"
+        "abbrev": "1"
       }
     },
     "normalize-package-data": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
       "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
       "requires": {
         "hosted-git-info": "^2.1.4",
         "resolve": "^1.10.0",
@@ -47771,12 +48274,14 @@
         "hosted-git-info": {
           "version": "2.8.8",
           "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
-          "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="
+          "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+          "dev": true
         },
         "semver": {
           "version": "5.7.1",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
         }
       }
     },
@@ -48343,7 +48848,8 @@
     "os-homedir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+      "dev": true
     },
     "os-locale": {
       "version": "1.4.0",
@@ -48355,12 +48861,12 @@
       }
     },
     "os-name": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/os-name/-/os-name-3.1.0.tgz",
-      "integrity": "sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/os-name/-/os-name-4.0.1.tgz",
+      "integrity": "sha512-xl9MAoU97MH1Xt5K9ERft2YfCAoaO6msy1OBA0ozxEC0x0TmIoE6K3QvgJMMZA9yKGLmHXNY/YZoDbiGDj4zYw==",
       "requires": {
-        "macos-release": "^2.2.0",
-        "windows-release": "^3.1.0"
+        "macos-release": "^2.5.0",
+        "windows-release": "^4.0.0"
       }
     },
     "os-tmpdir": {
@@ -48372,6 +48878,7 @@
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
       "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+      "dev": true,
       "requires": {
         "os-homedir": "^1.0.0",
         "os-tmpdir": "^1.0.0"
@@ -48397,6 +48904,7 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
       "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+      "dev": true,
       "requires": {
         "p-try": "^1.0.0"
       },
@@ -48404,7 +48912,8 @@
         "p-try": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
+          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+          "dev": true
         }
       }
     },
@@ -48412,6 +48921,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
       "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "dev": true,
       "requires": {
         "p-limit": "^1.1.0"
       }
@@ -49005,11 +49515,46 @@
       }
     },
     "pkg-up": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz",
-      "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
+      "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
       "requires": {
-        "find-up": "^2.1.0"
+        "find-up": "^3.0.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        }
       }
     },
     "plist": {
@@ -50347,6 +50892,7 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.2.tgz",
       "integrity": "sha512-D1KmuLQr6ZSJS0tW8hf3WGpRlwszJOXZ3E8Yd/DNRaM5d+1wVRZdHlpGBLAuovjr28LbWvjpWkBHMxpRGGjzNA==",
+      "dev": true,
       "requires": {
         "glob": "^7.1.1",
         "json-parse-even-better-errors": "^2.3.0",
@@ -50759,8 +51305,7 @@
     "require-from-string": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "dev": true
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="
     },
     "require-main-filename": {
       "version": "2.0.0",
@@ -51802,9 +52347,9 @@
       }
     },
     "smart-buffer": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.1.0.tgz",
-      "integrity": "sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw=="
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="
     },
     "snapdragon": {
       "version": "0.8.2",
@@ -51980,6 +52525,7 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/socks/-/socks-2.3.3.tgz",
       "integrity": "sha512-o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA==",
+      "dev": true,
       "requires": {
         "ip": "1.1.5",
         "smart-buffer": "^4.1.0"
@@ -52610,7 +53156,8 @@
     "strip-eof": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
+      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
+      "dev": true
     },
     "strip-final-newline": {
       "version": "2.0.0",
@@ -52948,9 +53495,9 @@
       "dev": true
     },
     "systeminformation": {
-      "version": "4.34.23",
-      "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-4.34.23.tgz",
-      "integrity": "sha512-33+lQwlLxXoxy0o9WLOgw8OjbXeS3Jv+pSl+nxKc2AOClBI28HsdRPpH0u9Xa9OVjHLT9vonnOMw1ug7YXI0dA=="
+      "version": "5.11.3",
+      "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.11.3.tgz",
+      "integrity": "sha512-sjvlk4SUefhwrONUeLijXt+NQyptAiqShd5v6bFJFNr9EVJUr3YSnNxDqCz0gp5EJBUj88pL1ssc8ZHPtngBOw=="
     },
     "table": {
       "version": "6.6.0",
@@ -53102,11 +53649,6 @@
         }
       }
     },
-    "term-size": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz",
-      "integrity": "sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg=="
-    },
     "terminal-link": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
@@ -53459,6 +54001,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
       "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
+      "dev": true,
       "requires": {
         "ip-regex": "^2.1.0",
         "psl": "^1.1.28",
@@ -53631,7 +54174,8 @@
     "type-fest": {
       "version": "0.8.1",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "dev": true
     },
     "type-is": {
       "version": "1.6.18",
@@ -53942,23 +54486,43 @@
       "dev": true
     },
     "update-notifier": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.3.tgz",
-      "integrity": "sha512-Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-5.1.0.tgz",
+      "integrity": "sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw==",
       "requires": {
-        "boxen": "^4.2.0",
-        "chalk": "^3.0.0",
+        "boxen": "^5.0.0",
+        "chalk": "^4.1.0",
         "configstore": "^5.0.1",
         "has-yarn": "^2.1.0",
         "import-lazy": "^2.1.0",
         "is-ci": "^2.0.0",
-        "is-installed-globally": "^0.3.1",
-        "is-npm": "^4.0.0",
+        "is-installed-globally": "^0.4.0",
+        "is-npm": "^5.0.0",
         "is-yarn-global": "^0.3.0",
-        "latest-version": "^5.0.0",
-        "pupa": "^2.0.1",
+        "latest-version": "^5.1.0",
+        "pupa": "^2.1.1",
+        "semver": "^7.3.4",
         "semver-diff": "^3.1.1",
         "xdg-basedir": "^4.0.0"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "semver": {
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        }
       }
     },
     "upper-case": {
@@ -55108,9 +55672,9 @@
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
         },
         "emoji-regex": {
           "version": "8.0.0",
@@ -55123,111 +55687,31 @@
           "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
         },
         "string-width": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+          "version": "4.2.3",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
           "requires": {
             "emoji-regex": "^8.0.0",
             "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
+            "strip-ansi": "^6.0.1"
           }
         },
         "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
           "requires": {
-            "ansi-regex": "^5.0.0"
+            "ansi-regex": "^5.0.1"
           }
         }
       }
     },
     "windows-release": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-3.3.3.tgz",
-      "integrity": "sha512-OSOGH1QYiW5yVor9TtmXKQvt2vjQqbYS+DqmsZw+r7xDwLXEeT3JGW0ZppFmHx4diyXmxt238KFR3N9jzevBRg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-4.0.0.tgz",
+      "integrity": "sha512-OxmV4wzDKB1x7AZaZgXMVsdJ1qER1ed83ZrTYd5Bwq2HfJVg3DJS8nqlAG4sMoJ7mu8cuRmLEYyU13BKwctRAg==",
       "requires": {
-        "execa": "^1.0.0"
-      },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "6.0.5",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-          "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        },
-        "execa": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-          "requires": {
-            "cross-spawn": "^6.0.0",
-            "get-stream": "^4.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
-          }
-        },
-        "get-stream": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        },
-        "is-stream": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-          "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
-        },
-        "npm-run-path": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-          "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-          "requires": {
-            "path-key": "^2.0.0"
-          }
-        },
-        "path-key": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-          "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
-        },
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
-        },
-        "shebang-command": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-          "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-          "requires": {
-            "shebang-regex": "^1.0.0"
-          }
-        },
-        "shebang-regex": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-          "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
-        },
-        "which": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        }
+        "execa": "^4.0.2"
       }
     },
     "with-open-file": {
diff --git a/package.json b/package.json
index 2142826c7..5dabe13ec 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "@types/dom-mediacapture-record": "^1.0.7",
     "chart.js": "^2.9.4",
     "com-darryncampbell-cordova-plugin-intent": "^2.2.0",
-    "cordova": "^10.0.0",
+    "cordova": "^11.0.0",
     "cordova-android": "^10.1.1",
     "cordova-clipboard": "^1.3.0",
     "cordova-ios": "^6.2.0",

From b155c8eec159af7112896fafc3dc25dfc2edb6bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 16 Feb 2022 12:15:14 +0100
Subject: [PATCH 0530/1008] MOBILE-3814 myoverview: Fix filter margins and
 icons

---
 .../myoverview/addon-block-myoverview.html    | 14 ++++++-------
 .../components/myoverview/myoverview.scss     | 21 +++++++++++++++++++
 .../components/myoverview/myoverview.ts       |  1 +
 src/core/components/combobox/combobox.scss    |  2 +-
 src/theme/theme.base.scss                     |  7 ++++++-
 5 files changed, 36 insertions(+), 9 deletions(-)
 create mode 100644 src/addons/block/myoverview/components/myoverview/myoverview.scss

diff --git a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
index e76d98387..86f4ba3b1 100644
--- a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
+++ b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
@@ -22,19 +22,19 @@
 </ion-item-divider>
 <core-loading [hideUntil]="loaded" [fullscreen]="false">
 
-    <ion-row class="ion-no-padding ion-justify-content-between ion-align-items-center" *ngIf="hasCourses">
-        <ion-col size="auto" class="ion-no-padding" *ngIf="filters.enabled">
+    <ion-row class="ion-justify-content-between ion-align-items-center addon-block-myoverview-filter" *ngIf="hasCourses">
+        <ion-col size="auto" *ngIf="filters.enabled">
             <core-combobox interface="modal" [label]="'core.courses.filtermycourses' | translate" (onChange)="filterOptionsChanged($event)"
                 icon="fas-filter" [badge]="filters.count" [modalOptions]="filterModalOptions">
             </core-combobox>
         </ion-col>
-        <ion-col class="ion-no-padding">
+        <ion-col>
             <!-- Filter courses. -->
             <ion-searchbar class="ion-hide-md-down" [(ngModel)]="textFilter" (ionInput)="filterTextChanged($event.target)"
                 (ionCancel)="filterTextChanged($event.target)" [placeholder]="'core.filter' | translate">
             </ion-searchbar>
         </ion-col>
-        <ion-col size="auto" class="ion-no-padding" *ngIf="sort.enabled">
+        <ion-col size="auto" *ngIf="sort.enabled">
             <core-combobox [label]="'core.sortby' | translate" [selection]="sort.selected" (onChange)="sortCourses($event)"
                 icon="fas-sort-amount-down-alt">
                 <ion-select-option class="ion-text-wrap" value="fullname">
@@ -48,7 +48,7 @@
                 </ion-select-option>
             </core-combobox>
         </ion-col>
-        <ion-col size="auto" class="ion-no-padding" *ngIf="isLayoutSwitcherAvailable">
+        <ion-col size="auto" *ngIf="isLayoutSwitcherAvailable">
             <ion-button *ngIf="layout == 'card'" fill="outline" (click)="toggleLayout('list')"
                 [attr.aria-label]="'addon.block_myoverview.list' | translate">
                 <ion-icon slot="icon-only" name="fas-list"></ion-icon>
@@ -59,8 +59,8 @@
             </ion-button>
         </ion-col>
     </ion-row>
-    <ion-row class="ion-no-padding ion-hide-md-up" *ngIf="hasCourses">
-        <ion-col class="ion-no-padding">
+    <ion-row class="ion-hide-md-up addon-block-myoverview-filter" *ngIf="hasCourses">
+        <ion-col>
             <!-- Filter courses. -->
             <ion-searchbar [(ngModel)]="textFilter" (ionInput)="filterTextChanged($event.target)"
                 (ionCancel)="filterTextChanged($event.target)" [placeholder]="'core.filter' | translate">
diff --git a/src/addons/block/myoverview/components/myoverview/myoverview.scss b/src/addons/block/myoverview/components/myoverview/myoverview.scss
new file mode 100644
index 000000000..9c2cb0d56
--- /dev/null
+++ b/src/addons/block/myoverview/components/myoverview/myoverview.scss
@@ -0,0 +1,21 @@
+:host {
+    ion-row.addon-block-myoverview-filter {
+        padding: 4px 8px 0px 8px;
+
+        ion-col {
+            padding: 0 2px;
+        }
+
+        ion-button,
+        core-combobox ::ng-deep ion-button {
+            margin: 0;
+            ion-icon {
+                font-size: 20px;
+            }
+        }
+
+        ::ng-deep ion-searchbar {
+            padding: 0;
+        }
+    }
+}
diff --git a/src/addons/block/myoverview/components/myoverview/myoverview.ts b/src/addons/block/myoverview/components/myoverview/myoverview.ts
index b7201c44c..c1f84f909 100644
--- a/src/addons/block/myoverview/components/myoverview/myoverview.ts
+++ b/src/addons/block/myoverview/components/myoverview/myoverview.ts
@@ -39,6 +39,7 @@ const FILTER_PRIORITY: AddonBlockMyOverviewTimeFilters[] = ['all', 'inprogress',
 @Component({
     selector: 'addon-block-myoverview',
     templateUrl: 'addon-block-myoverview.html',
+    styleUrls: ['myoverview.scss'],
 })
 export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implements OnInit, OnDestroy {
 
diff --git a/src/core/components/combobox/combobox.scss b/src/core/components/combobox/combobox.scss
index 7bbd14a23..8ebd587a7 100644
--- a/src/core/components/combobox/combobox.scss
+++ b/src/core/components/combobox/combobox.scss
@@ -7,7 +7,7 @@
 
     ion-select,
     ion-button {
-        --icon-margin: 0 8px;
+        --icon-margin: 0 4px;
         --background: var(--core-combobox-background);
         --background-hover: black;
         --background-activated: black;
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index c30dae7a9..45e7221d6 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -948,7 +948,12 @@ ion-searchbar {
         top: 4px;
     }
     .searchbar-search-icon.md {
-        top: 12px;
+    }
+
+    .searchbar-input,
+    .sc-ion-searchbar-md.searchbar-input,
+    .sc-ion-searchbar-ios.searchbar-input {
+        @include padding-horizontal(48px);
     }
 }
 

From 72541486f6398b7bbd4897eaab9cf0949243b414 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 16 Feb 2022 12:32:14 +0100
Subject: [PATCH 0531/1008] MOBILE-3814 tag: Fix tag search columns

---
 .../features/search/components/search-box/search-box.scss   | 4 ++--
 src/core/features/tag/pages/search/search.html              | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/core/features/search/components/search-box/search-box.scss b/src/core/features/search/components/search-box/search-box.scss
index 950c685b5..958a5edc7 100644
--- a/src/core/features/search/components/search-box/search-box.scss
+++ b/src/core/features/search/components/search-box/search-box.scss
@@ -2,14 +2,14 @@
     min-height: var(--a11y-min-target-size);
     display: block;
     position: relative;
+    margin: 8px;
 
     ion-card {
         position: absolute;
         left: 0;
         right: 0;
         z-index: 4;
-        margin-top: 8px;
-        margin-bottom: 8px;
+        margin: 0;
         --border-color: var(--core-search-box-border-color);
         --border-radius: var(--core-search-box-border-radius);
         --background: var(--core-search-box-background);
diff --git a/src/core/features/tag/pages/search/search.html b/src/core/features/tag/pages/search/search.html
index b6d2a5d8b..bf4568ef6 100644
--- a/src/core/features/tag/pages/search/search.html
+++ b/src/core/features/tag/pages/search/search.html
@@ -16,12 +16,12 @@
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
     <ion-grid class="safe-area-padding">
-        <ion-row>
-            <ion-col size="12" [attr.col-sm-6]="collections && collections.length > 1 ? '' : null">
+        <ion-row class="ion-no-padding ion-wrap">
+            <ion-col class="ion-no-padding" size="12" size-sm="6" [attr.col-sm-6]="collections && collections.length > 1 ? '' : null">
                 <core-search-box (onSubmit)="searchTags($event)" (onClear)="searchTags('')" [initialSearch]="query" [disabled]="searching"
                     autocorrect="off" [spellcheck]="false" [autoFocus]="false" [lengthCheck]="0" searchArea="CoreTag"></core-search-box>
             </ion-col>
-            <ion-col size="12" size-sm="6" *ngIf="collections && collections.length > 1">
+            <ion-col class="ion-no-padding" size="12" size-sm="6" *ngIf="collections && collections.length > 1">
                 <core-combobox [selection]="collectionId" (onChange)="searchTags($event)" [disabled]="searching">
                     <ion-select-option class="ion-text-wrap" [value]="0">
                         {{ 'core.tag.inalltagcoll' | translate }}

From b40bbef46b55553aacb7fda4182b246344eb78f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 16 Feb 2022 12:58:54 +0100
Subject: [PATCH 0532/1008] MOBILE-3814 styles: Improve top logo management

---
 src/assets/img/top_logo.png                   | Bin 0 -> 16563 bytes
 src/core/features/courses/pages/my/my.html    |   3 +-
 src/core/features/courses/pages/my/my.scss    |  16 --
 .../features/mainmenu/pages/home/home.html    |   3 +-
 .../features/mainmenu/pages/home/home.scss    |  15 --
 src/core/features/mainmenu/pages/home/home.ts |   1 -
 src/theme/theme.base.scss                     | 183 ++++++++++--------
 src/theme/theme.light.scss                    |  10 +
 8 files changed, 116 insertions(+), 115 deletions(-)
 create mode 100644 src/assets/img/top_logo.png
 delete mode 100644 src/core/features/mainmenu/pages/home/home.scss

diff --git a/src/assets/img/top_logo.png b/src/assets/img/top_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..0cbb69d0e497af9fb7d6aec5c53e8cbb32af1219
GIT binary patch
literal 16563
zcmajH1yGz#^DhdEy9alN;1ZnR?kuhm+=Kh#E&+nO1QvIP#VrJPTL=UR9$e49-~0dW
ztvdIfI<@<(bj>`~)7|r%p6;F}T2oyC3!Mxd4h{}WNl{iC4h~=d`<;b~4Eyw05mbhK
zA%9R&kcE4N^MHf1q+C>lQP5lz4Zpy8Ed6uAOS5Eq!-y#EN@{W_zmSMAaEWuAjH}_`
zXyBA&rF6YlPjY?yO+H`0Zteg4k*n14naP&*G2vKcu80QJsSSFgBZYg5wT_F23u1a_
zyCUnd)eArmbRFUvrz=N|p_xtXW)n@VR<WA3>TX>B`}j+pmcust+is?k?`ExjPk(yT
z?WVQx)V}bP&rdwe0dCBXAq2>iYoJYdhj%{{W8UK^ql7=oKO~m^G+~NqLlzqEvrZ3w
zo|Ss(6$BjNOl3j1|LHV<_|1|e0`^9G`_DgaOag;{{{8<DnCkx1{{L<9UxKOy>Azk6
zcR~h)_unp{&;Plj<^P8OnE00o?*F#<FX6vjS^n>Y|FZdi<omx&{67QvFX8{r=6_rK
zm(7fFhHA8<{O6lB4ebiulqd(JCb%^?Q3MS}{Alx+KjyD7RcZejAmTTkxPY6L$cTst
zWMD3q1J)0KC-~(U^B9gFUMCp2AbI)GTdq|5o|5}hwaq`GV5)0T{QWamR0i0J(t_kk
z%9Q7+yI=_1o=5!z7laT5MD?c@3bL^o9ZdU27a5SO^&i>qxG3dj5+F4|_+~z!b1K+r
zDAueTlP3Ej>N|)pxU#dOL)zZ;KRN^n6lRKgal(Pw^7cO$v8)m;7qgXl!rw#{*$`Wh
zarqW~ileH9s6o<oJ;rv1Vi$Y||Ivb~g&GUC*!g?>=r9xp*%Cvbc_G*j9`=&cx<a=Q
zsed<4Eki4S{|s3IsdRL7pf8I4N9%yfQ{mkt8J0J((RO~HKmj0xU<43?u17XFNf`kx
zvbGFT3?T+ddU|-IRk!{tEj?4WyX{CmZtf)Qg}A6=?YD1mkg;pf!KP7(xBhn7%vG2s
z>~!YZ3nQ>G9V<@%%iIEv0+kO#cXzjhtHZn*0s;aG!e7}>RIWydOL-OXGYI}_vOV=S
zGev>qW&gt$XNIVklQi%<p!4SDh6<Sin?gCKoKGphs$L%o57mYKmWzF32+;ahWI)jb
zu}j5=hX-D;h%wN-8XO5w0Cd8$4!=VUcuN8Z#PAo+RF(L$pX;@H!2i!M2n<d$-#O>W
zYVi{-7q+(EHbclk^s=8G5OH+}43XcyO`ni#yWRBTNZR<9|Mooy0#2$d9S_zrUrbRe
zTrD%UriKROCNWqPc%8};^Wt&VeY+a<KlgSL`bVZ|$~w9p`cMvtXt2+qLJ&b3Jk+fq
z;9_Tp-I0atpHZT{Wo~L|DGN4@8QL)h6@z4=bXZi~zX7Ztdx91yz1A%iLjDzoz5j~e
zS+}i&gF^*!MK85C!nByuYA0YF;6HQwjB?uc3wy%xKa-THZaA_1%f6MahX%A8{Ge{(
ze8iX5|9ck0UmwV2(&g=%h$a3%M&|S*laHC5P62!rJ?H~2Q|tE(M7;YNWwNxe0IavP
z{@2cjb3(C26vd|2;DwOyXzE+-c$vgG5S9?W!{cxnHI2&W{A=K3#$c&GC~(wBn{p;)
z@=UgCH*mxiNAHNa%pCTd{<WILWnSx_Immdz6n7M^p4YZ1U8ZLUJ>}rmw`N_-;~W1$
z7__ST;^t-#vU4VABZM6k!BJwGkMu30?H?S9<4AFBFMa2Ax^7}`|7Qf$3n$5ZV<g}p
zb@IRj&01VsL~w}u2gruMjb!-N!Di=L33#O9$U3+?BM0=SSSo7b_GxRq{fow%<Ugk!
ze>neI{Rj5Ys%H3{H@gnC2y+X-%sf8Mh)&p|6-OFCj~7_upeC3}eiazol?_6YN&M~4
zm6}<=2V$}iaovNbR)kZ|aS$Xt&^bWpkaI`MtXq4%3@$zQ&Xnzo`=r!mrE3+k`~Ew;
zPLzEb6F57cS5y0d_(1Le{u}dj+SrZsjL{4?#mXccG6Bb-Y<PttKQI+J9I;60y<91x
zc0yR723w_0sdDezgIsR34)brgc8-p@019fk8SCJH%;jeIk=VBvj{Vj9KXW@>W{Tuw
ze%;rB!eO@(Ud3A`TE<>}lYzDyOgiv}ytiXHHJA=p@70T_uIQl=-y7Nc2mOUNo576r
z25Du9wt{C1m_n2C){i*7t`cP}R8Vj29q?HRmwHI$IuW4D|Hg>1pq!01G_!|$R7@&|
z??eh3cyZOEt82grYQ9%Y6=_t{+NFf+;Htx^Ge+~2&Lq19Jpjqm%U`&wsOh4^^+-z*
z!-zi7V7jSP2Gk*XzYp`%F*0J3suj3H#q{{0h_?B&{20{%=LdK->u^Bu&EAm)byDq%
zSnN4JzW9-XxVYdj^SiyD>rKjo?7{kQqWVEC?EQMt%JYZ}T3<V?2ukRH#^fL{3lXqZ
zSJhj_GRat;V!w-U*Aj}yU{qvwWn%RL?szy=Q%`o8mO@EZWZ(rqNI+A;Bjc^KO&8a2
zZ6>nnTxrUcr`@-k=@n032&Hgq(c;bIa!Nd~FJ_M2cQRTrxww9+SN7ZE9-!paaEir(
zL>K;^GS7a<YEnKwF4?dQ-&JHNR@J@1Mos`=SCYjDoQN$}$QRl9-NM}>w896el{Hmr
zUnmC}-@a)}+J9f13OzySBK5|qqpts6mt3F7yl~WJj`f7nX1Z+!62(QHJ-O!qKgZ^B
z*bqj?@JG9`9I%7*ET)czt3kxwVa3htmL54=NT=|pvTfBnK8ZfcjB_n+DVsc)S*-}&
z#U1q&8g$d4vr^kV$>Bkq1ac-i%|x7wY5(yaJOtE}tZ)LFhp$8T;r(!}acn3)DyZt_
zeh+}?EHobq%D!^SJm~T>7G{32v*uFh=00wmlK8|+nlBXm$PYs)+c~vtS)?}XJKa)k
zL(eJkTZc<?Tu&=G`b^FXy1ze<K5S_d>Fk_~K7jUvjisCjudIml9<vge2ArCfc@P$4
zJM1Vn5xR($BbE^kM7-9>`mRx3;^}%*SbV3aQrX=Wcdx6$FtRS#vf_5s);lYI1?+<h
zJx%3RK=2<DPp=^hW+9>#nyN@CIu3_&##&@7KFM~CG|oty*j?bGLNXjbof`C2MhG?V
zj`HYvDKv)K!NegG0$yNp7h(LGN4Ey*K@uX%Q1SOosYvGgNaWg4@&~s&Ax2F5qJlr~
zmuF3aUC2MUh(<w2XAM_d3D*4h7wcLLG7@YJTg~L#`9@>F$HA9cJ9NvU+LCz#b!;s)
zNcZhUUKnI$q5WZha{7M0QIbu|p*w?DFF&0nugDK;)AGRUplrk3MZO?8U+Z92+diLd
zH!S+9TI~y#K&6m6=13LE8bE*`Kt6jvkTWD}OqmO_J`^mkgn-NBt}ViG5S(eT`4kr{
za$XI$nTwu){VZ2p2RtAkGoZ4mPN}Ft70C?84f8w#d{^_G<X9Q#@QiSmN%xLvx<@z3
zi&y`hO`VakF#%meEjUkWqg(X`vG6Bm6J!!?250YSr}5qT3j{gNG^N~kl7$&QpDv*S
zyhOKb|0b_D)Svi@%UdMFsWPY#h@MqSC!&*z14qs5X}k3JIsSu3`VFOQ;CHr4zP@oZ
zQPzkME3qP5pzEV8^!<_KQvs$J{1Zu=$=8m4$?x2>;d(qa^3h~OKE;q|prtWR_F>-<
z;2s!e472pFXjQ9dRod1m<>RVA;csnh6B4R%b5(Tb&QOJrm#+->7kQNpRF-={afa`@
zUP)@In_mS52<U|+JAAft`W0|~)EH%%-D%_Dx9sDiDgcP_(n&6vrf<U`)sXNbS7YBP
zf31XS8Ow!C#t>WCO9^P~U_CGzP4L_Jdt#TKsLhPkN^adm$L`H&Txy<A{MeFr_^#{2
zvYpW;@Kh+Adb?njib@k|1qaVZ^9IVHO)2Vy0T5r*-#3fJb(C;5dbIDmM|k^IsbmNY
zes!Zw#?VcoQ^TnPJhOva+$K$)xy}V-gJSoq)u*WQg*cokEg7q;tA%%d{0Tym(C|;N
z+p#-NtM0PzEL=KSTleEo5^h*dzFri3(=H#T1F8gtGG(+CbrcJu--XKhSGJY-eE+~*
zTr;e-oU9_BOrgxM1h>VUaGe>2Os_;iaIXSvFKT0GHMf<T3nSr@kxJ30YftZgh3iGc
zw*FA&qohlmbB5~cSoGshtd!2i7PtmcP1{7gjvc%OA84N2czq<`fT)hUHzj=qgZh<f
z50tB1(b&R--@~ZF^4l7aAp&=L5&xP~tS6E*NzH8m%V}QDk7J=i!QIWx&B<+Wf2l#v
zxPEo22Jr;78AjW=orDaBhc6Ik;9jw1k{WPmfgfrD_1{@eiB_dQXPwSY9TYtpVtEtl
z@Mez!iVSU5O;~rdg?2;oi(|Y#EGK7!d%;`jSZiP6LvEGg*(GuyyKVd_G(FyK@jD!t
zq78hJA*3E`PR6sJyM9FxPik=Ue6UAaMr*?q@+vR(5gERVPewB20<xWPfF<c`#@(QZ
z>&MPEH9g2zzEN)?C@1-1r6!iqt6&ZeOWN2cY~&imKsA5+@y0@dz)xa(e15mnv**(4
z0~F_uNnBx+?WFHf&co5VWJtzXPO(jpny@^q?B7f*kvlM2DmVqn)xiJO0KkjlHwK>-
znUHbXZu*qd>+6#<BE?XyP~vhT^&mKiqdi)nyCAbIp+<)e6!eJ2SSDq&%9^8aGWTQ(
z&j`+uLRE?$in&J}KUa<m#U&@0gzD}RKqd#@RWREFE?6Ol<z~gQwQpPZhaGBs^Y#Nu
zSA$=j@i`7Ws`({a{=lL9JT_e_5`e?dtO3VVjva_Q!2SHH$cZJIW!-76+n|&`>!(%2
zED>|bbgwBYKmA9}$FZWjl(WZ!C1aZ?bbT9qi2@B!eF5V{!YzSrU+Rk6e=9hXy(ihd
z0R*a0DDWkJA@N<{aknMeZ5bw!aZTHJvxfrl0&z$|ls#%*3hBBeF^8>cm_VNgId>Rb
zxgRYd9|xCCBRh`?{*Vk@apTead8^lu@cvx>?pB~A>aUO^o>}A4B->?z=_P}>=~m4#
zM@ko(7*xFcCmDK{WGY%mzWc@W2fr_&MfnJ;m7?D`!o@-63i!EHp1U=wt^4+R=uF3>
zOmcf9@iMqpj#2^BfF~SqXC&oH?CeQ+magnHMuRry9&T#B?#R%m?P^Hk`zan<ex{El
z&1^MBtq`URv?mhxL~ffN8cKJZE|Y~D0BmYT;_ffqyX)&O;mALx!&U+X<<eP<dV!uZ
zX0a*1K61SZUF`uRUAkn&Y9CKRIX_$!w|yqRsS}CP{&tjFi_VHr!IY0LHKS;m1%8KZ
zF_k~pb>j_C{UbP9bLMcT(JtfNr%(LhA}9^1)284sTDd`@IjC)f+n7O~Jv7WBCPJZ1
ztkGU!Y?4Tx8F8z@LcP$OBRb)q&qDW3coDh6IBBf~4+z7rOjg}G$eaZD-yi#8CTn^d
zYy5hm@6dlSF>)GpdDr9bXDok$Il$RE3pTS8AIybMf&pt;ZDc<!LteNs-KZ5&?p@pG
zs62m{*$*y76EHcADL_dJ5Smyq8z>J8xS>aVmVS*IIVxukb}1|EX6M0)g+Ext^Pign
zE2lY_MK!4;!*;%G(z3uN6|oR0-VQ(Y@bB^_n(QdLO`L~#j=mKhWydR?(piJ!9|4Qb
z6Sb@BXp%W^xymxV+AHVA)^+Ca$15Ih>NIMmYCb185Kd8|4@*dt5`OyrVaHC06{?%`
zvyT3c>_M2+PlYRYXby*o307<SnN}Kgx^GqkCzXLeXDbfOylxhshC47l`I+f<Wd@1W
zRZY4T0Yd8ZJ*LM$)F?4P0@ZAF52gW93w{E&NP5FM621Cdk&cb%8uJmyqaV-dLjpBJ
zbBCR@442n&X^COtakcj3Wpf;IRnNpjZf7_b-dW4iYjr>2c~y_^q7FM*sra>yVoYG2
zxwVnCVUS*EQMO+}h2ozw=2PtZR(A1%%ym;UNyYi6EVVkq1>Sbj08Y889w_Z5HRbmB
z*QDrgrHr=K0&Jw!*ea?N$Qt)(SyR<_gnWKi0XkM_EIRWapSj^ZHzgAO+V<@Q+a0^^
zmRs>C6B1AUM3qOvwMMK#AdT7QNyo0icDx^ig_l-PV*}Ezct>RoLLq_UA54NCUu)Ux
z=<v`ed;Bx+GF-H0k~Gy<D$`p}*1LPiLx)!#aGJtTR?_!?q?lQ<$+z&<4SUE<iF)%t
zxrlVm$i56vzHZ5YY8(F{dU`#f>1r$%*s2zz#N?{w#pEDT#4^SS%9GLSV$;-ESdN5{
zkD&C>C3pGhe0|5Pz}=C?5@X_97ZKHMkP=Z=;x;Z(>9gU9M4+ENEPAo)veV^|z5fQ+
znQB~aVKSuN(u&0dAGuv&PU>Z|{y}AcrZoj}OY*vAk}~9y4<tO3gisG3JICYyeLvNp
z7Ezxk+#zr-bM#Bz7F7&QOfHA+$Tlo66~Ervk;#=5Oc`t%Tp{2)Ws7dk&N=psa(U~V
z009r-ZR6Gx+iTa!Fzw7g``P3+uO=Y9%au>%>qnYw{l4$zd`UuaG&(7JFT%Z+<u-qe
z>fcS$^du>1aNoeyN*HPqI$S|=(^y9NoQJtr^g-cNs#pAVdBUt(#LW=+%;x&SF<_uz
zB2WqnZnIOVE{D6-eMhuJ_ckrn^U<0}-n|93Y^r?Sb4y_{MyN&DRP(<&@ulxZa8ar+
zJ`@l1n>y0MsFJ}EPvyo8pt%&Q-92)Y`=kkE4o9(9*U98MPPc9)eU1{|dzZe1duRe}
zQ6tcwWYrSS6(X;#k9Mq)wYHh&HxJ31l&CqAY?W&w3<$n67+>bU(cF8gE508%yg8lR
zgkp2pT$IaF)2ox1a$O<3BIUtR!Rx_wFUWa{xH|TUgNyv_j}^bHPph;PxA{W52h)S>
zW`3ftV_#y0_eK#D%{r1#p$l9e?<wa<fZ^VviMpj1{h;rW{p-0t?9-#S@F@M-&atm9
z?Dv_U4b<#=ZKw2o4p0F8X~I>hU(2bUEm$p-jN+&b%{Yk^a!Pcv5}bejennt?W-jOd
zkzejOB3JFiq;|me{r#OL_pck(I=lJU?s6(*|JAs^R>^ScY&)hnPahlirC3)(?}iH~
zRUC)S2)voWBXIf-H|E;Wo+v%CC+r^yLA?ab$vs5g^5s_#ec*J5GJ)VC{?fi|peerw
zjry$cLc|b>m+~3(=ip|gk%^cgnn|!rMLs%)+v0Cxe#O>(6hbEs<aSZe5&}kWD8=f8
z&ezfdd8m0YzQLYbCK#gadJyPyP#D<+^KYDsu$Qan@bXve1z<1|<6gx1@w&Oguj|d7
z{dN8$ZcLGEj4usqLGm5jZ8BsnIKbYf#GH$v1wM}|Z3fjSE7is_m*f*;0<(e1Mzv(b
zbSST;sqA;wU4{hK<@h!VIq~_2ad?b~kYiEazOr;TR^&-rxv7#sHx3Sjj^Id;0&a)a
zL*+9cQ3m|6(MhQA!fj2nkOsovSjv^&hm-K{@7i%hzOcp%Wv;%N;)Gv9_1909BWkMU
zS$4s;M1%8{wqUK}Kep+iT6m7KZ|EWJ3>OjH0n?{zFU)~IZVKGO<zIiDk<{70iW`$=
zg_8<o!E{@SKG*=yV*69PdpGjsy)}<bU@f)#t)s5RWR^he%Zt!+nhK6y+9{fl89m5Y
zqTBjRt#+g4TuEcO8GGwO32KsLPiUBlrsw2fA&G~i7R0%2T6As&Y7FkSKi^z~uSE`Q
zuQxx&YQZmcf7{#}v#DnC{+128#YR{ZMo2zI>SF@~#1dWg&$?rUKj0JKH<cW}%upb2
z)<a6OYuK*2p>1ThQbAqGN%{001~mEez)&-8H^dNRQLPUiM!ygz9&txJC}bQ%|9Z*n
z5q8t~b>tW>^NUt>aE+qa-<>AHS+lu?YTUkmn<F?PIwM}vr|uO#`-rC1jV?qTd+2vB
zDw!54C8-;#@QQF3#l)6a@{{zD;`gBeM3NkN@_VoZs!4G6a@7*+11EG`%cpKJN*a#`
z)a<(L7RVS=BjWa$w;A@mS1ZjKkC?I=;{xRgPiW;<C2`EKyZBUt>p-iZ(_8N}Xd%59
zWES>Vxe1`C?rSnvneLR*$|!0gazSqX+j5N{skhq+NrCwhx)-qv5~PTE@Oh+1KQ<0n
ziNS8X=TdfGFnAdcY%P;I1u1va6F2?Rvccz{?b0i{5uc2bW5w>gV%%9yrkuKPLYQfK
z`mV&z{p;!dD(TE+?inszzvy7~$Pr3VVEd%Q<0NeQEu_vWsuy|Q$2mz0k?s|$PCqv+
zCE9IahEulx5xY87{7idJ`?hw&if4XiUGccv?PTv2<vehUOPtaAI^hp2)NpG-!XHH4
z^gbu>Lzm8ANibhOjn_w!(OME$anrvzp`l#!qjRuT0;6h=z#@+Ag7ne{f(J=F?Rh+1
z&=JwIQ^rUHP{(^sd0gZLY3_z*DT;Nl!n}bOAD`>Y7Q($ju(X#r({Dm0M{dapNJtK9
zSN`3R6UXX3)d!6&(#(R#<e8Yt<k6<R*g(G*siZ0Thnk}uqgea$TDSxZQ3d^>(&d%7
z;gRv$${Ft<G9jwO#P7GKJtH_BGH7`lRlTFmT&Z&>_ai`e30KVN6M>`9H&VUR#6QTI
zGp1SUMP2;kfA>uxsh{(02F*zYs;;qb<S|!-TZ5($%==ETZk429U>J48ZV!d?#=UFP
z@L3;P;7$hOYt#VLE1mL&vjc)Z#(t0QBKDKASXd6dR;5gwD(@J0COfyov;A{)<l9hL
zsbaqF2<r6;Y)8#Uc`^NU+ie~;#hT`C^%9fb9ec&ts~k2LEJ_hH!s)=UA>AO2(TwJx
z54{CA6LUR8QtzsKw4sTK{=K6%`0iuPNC3VWj!?9syoYL8vLGP8I@x-gGpx19*Q0|&
zlHsGf7tfqoIg4-lu=K6AU5fng4OZ4Oo-A`r(MGC+N7u7%Z74B-`B5sc)Zb^XO-vR5
z^A`ifdf;;qtA<Gg#@tdXR+YB4Kk5VWX=!nkpe>zGEvLNwp9lAXhK(n@A>Tc~@9aYX
zm4$_t@fo;yu6A#&OWE0Vw7vG+Vj%cX2Pp8Lol9lqpF&vtKAvQnb_B2^j@Cp#Z8#r7
zyHnJm@eWb^qt&{uyRfU(l~m-`Y{96+pOc(gfx`Zowp%mSb5Upt>!rq{qxeS&r<D9Z
z3Ke2C=XlU8vZyM3IOkaldMv!91TkE1M~=a?m^@scw8uHhaGtYJRZW`ea3Y4QPdg<Q
zHFA1<<B<aiq~u#-vb*JKPivC0SFwRfQ=%8@O?xT~yUI}69e$i)8wa6dC4bj3BBBDF
z>9yIvo%Rhi-`D;YMw!7q4fXxHK@Rvc9rEoOqiT3qzB&e71DL`|{_CqghX$vR4UzMP
z$fr*CF!N4~VYv^^t9y`6x!oj|7|vsu!Y^w&PgiYfIC~vScgC;=6)>8iQ-Gk$wUNcm
z(lvBcH|BHu5hJT^fXX95JPY-3!103Q#Z_Zql6if*R9CSvR3DGgu;QFmLH>hj=lKO)
z`!JTqw*{pgZ=R*rt~@x2H;lX65%-nDC$#v%uQB~_7c=u3_B8HWp-h4YLkoY);N1}G
z8h?5Dq2D<uPfX-+=KSqsk9o?vi`b?aMn(&*`aXWq7Jt|!H9hfEpgCuMUExqj({DJq
z+2p!dcj-!(+hYdunBZuw!XpX!B_`OZO1*k0u=ab8y?W|mV<3O8vKmREWdiO?_V|w*
zqM)bo$<(O7QX44#-#akG;O+*SZ0Bl>VS)9d&a)oB6sl7V#{+r^J(ueB2}r3oFDDN=
zYe#HB`c7R{GK4DauXRFOsQyBCu)c`XFY929$Fa-5oIe@Jr^bHaRU<xAxOTv&|IkUs
zdb6chh~ypl>-GpqUEaIyBIm*@XS5#57w}&0C*sTRJ7X`Pkbfw0RjMldnOoNk3w&<D
ztqOEA8Me)2r!zrwqfM#$u_~0r*hBdzMoc<sHBOi7qlA|RvPO#OAR}nlPdqT~yNGo+
zz&-<Igdn-(SIaUL4ej`k2z->O)9qh=TrjmuPQEjLrZCSohEDk1Ueq{73JDoo-3~`p
zKSfn2G437uBDf$b#_%#0{<uopAfvy@)+4<NBaf>55k%<ynNaSp?C!3q=gOX!sj2A(
z>`DVe*RRyYuWh3U{)nHoVdWETI|r`anT*DD3%F6c^bR;@0Xg+}=}*QP1j#s^tJ8wN
zNS%2Q)uBOA#2Hv5Wpl)4KjYo77Cq$kA<<K7VR1T0r@q?}j7$fl+tPK=Zsd8jfRdqT
z_(kk^>aKO<W`AY?BjHk>GWC4IP^<*UNou4TSPD8T+~W=wqAMUKpe`h*SNlc{7%go3
z>%`{rnN6#`)2u<9Idl*2BEElQ_)!aeB%E@kxoNILnhg;je6+eJ>BlhfmGJXp1?`#!
zR%Rz~-485nK1NT?bjZ%cs)wJ-uGAmHt(z<qg*nQQ>MpJ1OEf!%9$&%Ru9|sRF}~H~
zdMl{#`kT}o7J6Ou{aqv%J8YA2$QSjt&#}MPm~<bivBh;w7+cYcH?q;T62OYpb;Ux1
z(1q06chZXbz$eKv4^h0r_iS1Zlh=pKcey(#W>EG|Tb}5=d8$(UdZ+hw!h16E{3_(f
z6V<-denpFzrS(mq?oZ~Pb68Zan`&J-`oFaR=%2`UKF*|9S;_4I+p2}z$b`6vc2VrQ
zy~{>#i5PE*QuTJSvWCxx{0%v2o%RpV!_Iv7tH70UYj~G&k!JEaCjnynC!(^S;RiTR
zs{iznm3v0~@fR!}e@7q8Jnr7xuRbSz<9KTQvuc5&%Oh`~_0R8k(VAT~*i}xcf0=dC
z;j_2sW7KLi)H4}y%o`BJ)Emd#aWLPm(JN~b&v=+1P1@ReO4!D}kVm})eXtvk6r~JY
z(v=sg(d*L3MfuQKgd;SCgZ|vii+^~NM(a}l5ocVYh~Av;Je6t3ow0@mf%y9x`qV-d
z&MG<{og^bRtIN<Lq>uhN@`K-E<*<3XnCl%vT{)E)A%1Y}eI%SH8%0F`UD?iJ=Y3G%
zuwUEeY9Z}`{4_i0qJ`3!okHZvZMp+c*~?aE!Yu6W(cQ*yel|mxPJ!@7^o_x*=clW0
zP|oF6OH&X~L^8HOL1+_kox$uX(TE&9{#RY#&a5DOE$O{!36YKG9p|mzL9P7;%FFSo
z6O_CyzTRKv{^^h_z8+r*AyULYF%ar^NMl~6ULL_|g0$}V^@#B}x^os70NK0TOEXHu
zN*+HabZHD#=oT*#Zk7P;t%sIw<*{LVS;!Futj{#&F(lZ2kzxp`JUc?ZOvp<!@rsj|
zQ^HN3aV44;MSX%e|6yHNRs0m<k90@s^cRkjigUD@(G5k^xMUTjhI2p`Qd&_kt@B4B
zi2#0EWG5@H#wNahHx6&Jti2<u;{zU=scLRAc86auHT311^#*=kN-<lH>EsN``H}wa
zcqWou+t&+?!Yd=G#y<oGpCS4{ujV#na{RVfYZlfW2K%nzPH}w&Wdv}|8&fn_{Z*Ti
z`fUQ@eUG7T?-@srkE~q>cu?d>jdcY!d+KdJtyIL{!a1!Pp)cm$?ox)`X>mpBzYTop
z+`}HCLQWGq=a7*Clk?2WmsF45agXnu8w0+k3VfMgkiWV;Z1L~5Ug=%xBUwrCHml*N
z`=^iq#|G&uom*X_hMtE{jyax2ZVry}@x4ph_tM~E*(f?fN?*-Sh<v?#r!g07E*>4#
z-<>W`O4fX1APa4xMXQG4hJUV<v)W|C*qyFf=hd1cS^Jdb+K|0I8<QD+KX`bbB=hSv
zpB-mN8CrYY;r2~?Y(F?Cs|ifTIYU_2TRd_d@>IIHHaO)y5jBw=f7{?;z+>~Z8Bvce
zIRm?^;-NP3XC|LD@0*1<{Ny&C7`o5vpM$6X9t}{i9g>$qKE1E5OZsvH%AL-$qeeS|
zm+kvm7Qc8Jx5k7#bLlpt5RuBO0<oiEgI);y!0QkJ{@_SxjbJ%W>`3vo-SYRmZWFxk
zc^kgpk-RSSr@%tuyjx<8q$80VJ5a6Kn869iYQ2Ui+@s#Bj{@Eb+L4#EV~fQ3Midp0
z&Xt%z6EGDI!Ka(anzt%;f8j4m+MqmL&8JJg^V%RqcW<Zj`o)Pg+VM`%YrxdBk;vwG
z$n%atkGSHAz&ov2;nd7<I#uz<Sp{6wSBT@yP4A=QHNkoh)yyM}E4Yx~SY*5gd*7xP
zLOzgSRsHHYLvay5ci~PmnRd6c33UMpcrD9(0c!LWr#P)Mvc+69SaB+<t#YI50FIAb
zmID2JUt;PueQ6fVP-CS|%?E{@OzMnzGIs8zf=c=bV_d1*@Y@q*$82mjqSq~uER!BZ
zU1DH78ANx<n^pCtLrhP<D=*j^on7H>S@D7PJQIFO*#`}@CfG=?U>Tgk!%7*Lz<@tU
z<UeCK-wu>#dtfau7JlujG$WU?Ode2hiZ7XkV^qSZ%auv?(;pBP*UG&az~9MU;>@Ui
z`0&1yCi6&s8L3h$F9+_1cF?go^uZzQZ<(~eSO%mViE81lRe;C9*35U~_PsrGF?Mr!
z<;VKKqvcR`*FzM2sl`TJMuJLpBKh(z?gYBqJ`t)!@wlMNe&UDVW-&ey0<S|yy^4cI
z0*IKb0T{U?^^)SJ*2i5ByIQw>Oy@Sps$;JC>X*$fpWk)@M>g|%Vv(IU5=o^V>lBrs
z&oEp-ivA_6i|AEqh%A*~z7+tz**R_K<4+nU-c3vLI4C?&D@oZPApig`T)gI1NisKz
zNB@e$P5mVUi<WHjD`>&u2Ps-yx{3ljoIM|+!sZ(IvuPz<(!9Tr*^hit^}3DMZpG+K
zCrl5ZDd1uv2bOJfj?Bc&XR=ojPRg#vCNw<d@B{)d81~?G+0uUFdCJTMS6Ai6`O<F7
z>6o6bKI_iwx4zMJNA<cNEj!<FO@-Dp0n2x)>>x}jV(irL>=Y7iZFP==rWEULacE&N
z18PY;yvFRS2UvUsydhe-pHDu`V<dm|Y%9N-$PDl3b~Vzfjq4<-BDD8YG4a8h$UCse
z#hEaRoVr{(B+&n2iTe>i3+>6PtN;0evAjwyXt*?l;Mw5Gdo=98q7)gcY?>Z$PM{Tj
zQCry@fvET)<JyzR#5B63Ov&+&UC!vLr-<d3zUAP4Wh1`%RK(F1s^F-qv)@CUi|X>-
zj*}ExORdRWETsusT6Pz?V6*Nm^hzMLZ1CO{-(n;zQCJJ)uop83_>)<+W+X~_9fHmn
z85?6h<;YXMhj@yQCSPFR;LU!j{N4x6YpbnYsMEIE-tX;1$_05m&j2Umyf@BM2t<1!
z@A|Dt<3ANc_H4yw@(weF5WDGuz%@EN>XmkU5aZ&_e49wiU)|<S;#>L1DY87-FSuTt
ze6jnP7Jgdm;W#Ap^zS_<@hqw1yp5Sfg@kNs<crOI$mb8_u3W)eE!N-4&b4*2&X258
z5$J<9Y?}g|Wzu>@j9s#v6@8Zu5%d8QoT6%C#~-9mGEcGANX2>jxjw=241_SlmMFgx
zUC;ddRrg3ZT@~TfZ3C0oAg1#Q*Otb(mJ$~$oU~viw`Uf}HEN#><V4adrMLd9&orwy
zzd<3eI5jVz5GDiZRk%Z<9yNeT$5H?vPiP``p2Z^vrN*dwBh9)HrAg?Acc=2p%6rON
zkUTGu7gd$S)lf%d-jUn-kfj=XXJvs!Ts-8c-l|+!M=bdB#J4oiqx@ZXNz@%oL6oG}
z`psKqY{v#8SoH{}_<@|n6=n;>!1c7qi|bOxuA^wCbyGy6pLOnNWPU`ZKCD&+p4+zl
zP^B=&$Z8aArC{qkpNN%4Yc4RS#Xv29x#HDWZ1`JojV=T@vm$^rU0bP;W*8PqA#r)n
z0;B?*PcU*YJy|Q%5&a6$t(;wA?cCwSb|SUkF9yS@M2Fva^W_RL?}%H4ALZklrPBE>
z&IHgfV)Hbl(sD8S(gvFXU+L+lY8vTPwD*@5;yG+S{+0tL-)2+}QF=Eco4l0@XqMp_
zEe+Ne_1`VdZ1kmvGn`f+*`=aS2>)V9ZWI~fz(hcJ#I{mumQ*S<h=)ympSphtsRLHi
zowpUcCc$ANz103x3)3w2cf1~)Zy^eka$>!}yYx2K{_{qN$jcIeV2rlT-}_fB;04{^
z;w~$qbJaPbUh1iZs-NaoalxhSyz12ao5LIQa1r~MOb7@&|8~pc<=HY4U~epSW3h`H
zu^PRuS*9x&$xfx-Ok@_<9@B-&<vY4<_3M1L|F`Z@&Z$VxOKp!ZqM2q^VmUb|P1oQn
z_ND3K5xo%7;?n@EI4~A+%|+S({xJDzK6%eOsrfH_{GT1F3JR0RYHnh$3rj}X^eRWf
zU9I(@*H1)dI*|c&eA7qgKK5uoRQHt`dop&}rUP!vt2&q3J!}AFS;>eOS6b_-LRs)X
z>fdZdLBN+@i`W)Kcys#llqXu-c#t#&R)j9oUZCWb<nl@mU^BF{IO)5lVN1*PqLf8+
zWwSK&m1t^mLGA5<Cbx{{CUTpyB>@1ZtI6^zaGfz=65hG|%U^C3l^FE*gi7$<^JCwL
zH>r>fr;GxA0qjZ773|*>J9$|tN3B_`6|3BvY^)bt@~@J5XAdZFYRxnwIx?7%y7(|m
zD~}x}AIQg96_I-P4k$>xrQ>QRDr3_?(CEnWg<Qx`PR3u`5G!LCX+!)brF-hwS%sTY
zY8fPk-w86*!D=IwA!ptf^1&Zk5#oHw>Lflxsj)})u+h)TBb{;98mQQqp@Pgaj+r<8
zMrL0lZqm@#6GYF(FvD?h-u_tdPp=|wDL9w6Fpo?$Jyt5^?x!OIyt>~}p`dqxsZOMI
zqi<q~eGzC%=hz{+Z594J1l~d7>2E4AKtviw?YYDouSDx_hy>!W$P*eb%g?>m2Z^gP
z>GNR$c#h`$>IQa~q5<YNNKU3x*!Sw|R<RPpm37wDodrT90t8!GZlt0Y>7R@>u4d)<
z&6!TA_4kT-%L8dmlBz2ol4LNxRM_SJ;Kne_&F>?KI>%ASrh%8x{JMU#cu9_D0A9s<
z8b|!5HL^Z3TADi?+pQ&0MeGP{3?BTTAc&L`xAx=rtJdyz@=GY24^%Mnj8`R<3)^GY
zPLJG!+vX<tmkarN&)4OTqWyH}3lbzQcM{I2F%)K85$}VLw6|@b8&+@3c@^>zsobyH
za&?6(xH4>|*2wV<U>jZZrwE~i9<;Z`FP_#HA#U`i325Tb`42(1wOJ(N7!Bp)<iUxe
zfmf4hB?;bzG%+gsPk3I}=Wq$P&}#wyZ+-}WUH^1<U?f{FiVDi+d%SfgCtQt@(lPap
zjZty)D=-O0YVCFJiow*~FUJsNg)r;rVmEyYO5PnE*QdryCXb$4i(OQe7f*JYQjn24
zwF7AoSetnD2}15I6(-PN+ob??;$%%vI8OJjC`{U?j*Fb9sNr^67Vi1vPN`JDDLR#g
z)?Pm>M-&Ll5mik{kQ|MwD_jHCm*k&-9o>F5&t~Y9_`5ieY)bTA8KSd65Y27#Fb(y>
zICdE2WTWOY)j4`&3>V|VW;HC7`$h=i-F=@GU>}x`=Lt+Yt8BeN6?KbLIkq)!l~#)(
z{u`j&T>WYJx9=TU3d!~q_L7zamq?8hrIrPUSy$Wg>Z&hmT~IS_ljS@yoma6hHTTrE
zPNIDATukmH#&e4kbKXW_fe$*E_?KWg8Pp8=g5?Riq;Ns7XJ)2yzR`!Jx{{tts0ni@
z;=`plqc79IQLba!(BD|k(lXOBB)c`toFS*m2TZ|yUtNQrx9k{dj5MEV&qeqm$eU7d
zihPMr*(AH9w*Q7=SeYzy2LW}tCN+;n1?9&X$@X#GrAXVxjDvbdB|)OH3{6^g^W<i1
zM<_Lr6OJXsbH?~985s<#xX1XG%YFx=X(ULei{IN)$mf@1|Fej|F>7Bm*bZy}6;Vhp
zxiN<F7qx>p;jS1|2SV&(zOX|UU-VsJ#&8PI>-FR`iN1v`>L%Kj_Xw-YAlKzW*o;ma
zUa8BCV|#`Gv8gi=f1a~Nw=T|A_bcuxj%3e|ymvM{qbmeg0<T9bNwQET%0-_V(b@VJ
z+Sp&ZA}SzDrC;x$urQyiu?stfbqV`tVdA^DzsyfRnC8K~(2%#+vh)$)`th8)KLsj5
z-4`y142K%s@&;Q4?eTs!l5NkbT2IM$!@+i`(z|Z!8%!nxFD#N2=x%(u<u7nCQcl#V
zTL6XZwpF2u1S+C7WbfhakJ-Uzgk#N%GUQ=Wf8ScbyYATNlh04c9T?U^j*gD#Vv2&q
z&mjoOSUSa26;Wa+PbJ8SdD#96Y%@>XqXO6*B%R*o;?8WANx6oc%r7W+V$BuRHw5^X
z>o$Q}VuuJl#u)KfITdVMSfLIo%RHVHef+o)A>ZV$g{j+6GxS2wI)A2&BNQKn-c@%l
zkGk#%T`+;DaXbXyMdq%!66l3ePDazU-?EsfP>?(9*rm#zQ`CQ7VH5>OvLm-6#89?p
z1^AKdmIa$(QtY1BPtp6PZJ9+0djD{Rl?uWtd5^wDw45q#yDf5_?Z#9<Rv<upMr;;N
zhYPbB6*0_)Xl))3{!y&K%zk^?nmo9`th_C8aIt=GwXs|q{H<A)0NtNrnqCE;4NdDW
z4QK0yT(vkN4Q9#5ebQH=JL}3icIT#*h|j)Y$AxkX_Vk56C_V9O#<})a8*7ZSl~JFT
zW<%=Li1pFSwCL83E6fzdmb`c;T5Vw)e7S92i|}6xXVvFlQuW_VWu5Bc{%NIgm{LRP
zL8mw~ND49s=7r$R@{<gQt>*e{ra<16s||q|&aqP^?S(tq6rEl_C~yL?<$FglIesYf
z*eFLzouVe?vtMHDh^aJZWD|j$LmXyZLr}#BM{Lr_x*Aa^04DUwFAP97YCPo0!@i$o
zTIBPE1>xMIrTsLml5ATH*z1z$w+fB+cWKa#Zq^_R<vRQ@<MMdo3HqN-K>>tvXD~B=
zd4GP{^~N%Z9@DKNYTj62(<LW_$ZgZV4<v#7RF0gusj#h|obNwjVcnQQGR!@y_4ZS%
z+#T8lUhl;6*ofR!gX*=X<7`A8PqM9pF=@Ee-@O8A$g^6fKoc&CRFH03ul}?o4pRG?
z*cDF_ZMfq5>mkY@X$x?FUaGKka&eUDvX0$)PAu@w5C(NAgLYsJjpgJ=g7M}-&`7fd
z+c_<?yTHpQ*-M9H_a$O9Nb3ZpV$hUkK|&L!5I)V6R-}rp9Gh0+rF!pTZVq6shLjzs
z(wwS#Q>L7TA%!zw+BN2K^S&LwjR`(IOzPBZsyM@LBGC*LQIjE^j&t1~{rpBGgP0&M
zqCk@sxt*G=3uk%q;+GfhUAXMS<cDd0*RY#UAx{~SvRo?(bzaj7*UjZ7sK;mCoC**C
zzpvFD_BuDy!;6EkBKZMV`DFbn*)~6dH~E1vlC<1IbnL|q%ay*@gHG_9@RQ0|i>!wz
z=0l{_=au`(2LC{#$5@#LI3Y~0LxBAJIxLlCADkpK`9r7R{*D}28IUBmg4a~PigFE|
z<iapvph|T5)-UEK3`2OVJI3>Eqw2lE*t;2sc~O*kxYVg$lJu@^eIdsyK9{vQcM9QW
z>aIh%E5#l9+;@6%jYCH9X&}2Qv1)`djQ2rNkL2}p!L=;DVehR;_+Pu@!gNB?xV9e5
zlS)axvQ<+ptL%Jy{s{Jj2)tvv%yzF+R<j^YiEvL^DlE812EA5uzHJs9H}fd8rMYoh
z5XE!(%**(0%t}url@9|Gaq^a7CwMm8gT|nQ&4O>RHH!%lq?J4YOYlreoZf^!Y4VKb
zYUEr5c9OL`^Y2{IIV0$WZtlxHiDJ6pAowJiO`~RDr{%uCK@m?CGAylD`St!N4oK$7
z|BAmyIbRkW01%>RL%zCIDxxM1UC(9h<)^W}cACvtqL%jY(V+u-&&9}4VESwRa?aAD
zf9%D~Fjr?>RCfG`u#!PR7kgTmWYP)g8)Q_An`tCDP|VqQZun467J8~&Pk$>8Gz)z!
z$sx!s4aqre^}6jb`K;qa;akp|1VigL_SU&INJ=y)6o$_;ch-~9!o0^LB-T&1SOKLA
z&-*O1=nlrkOE!oJ2tKX-y)i@c9xz8h1CU6MDX+{U)1zJ8935CK6@!q;kbL*vDD2zL
z7Ya=xduKS$+WK#-@Fz-Fr&lWzJfP32A`HQGq2D!yv95xcla`7W-=e5rk8zQwm^PRj
z0x=1!;r#H-7X$^>B@g@szX}J<$NY|i#|n+e2lafrYb(hcjE$}^5`3x9&_SEMP0w`0
zK1WzjBO}*3!;2)OV5(nwWK9k7J9keuk-%gD9Dbn20w(te)HSk+;`$97SyHfGjExaR
z7vRP>b#likNp*-%SxmbZN45sv=^2k3eGbKhb3CMZz2)J9nj41qKM&D(p}U^u+AjVe
zFTwQRnsN!x5%vW29v1jnu#D!hj=n(h7Jm$r;Y%r!s6Lxdhei>QG9PU>2j^Bw5=5`T
zR?*O>sL!2m)k1kHY*2maWP3Dnf}1{YG?*#VY+cW#y^`V(Bb}q{9FOVQ*+0ud&InJE
z_%J@^^|BEVQZe^zWVMzFF5*GuK!Q*vyObR(-g8`+uhhHgwP(bzgIp<7-c4RO%F?~6
zCi#<J_j*#%UBYP`FVld(=%nYQdP2@QcHW+Sw!cg-fN-$nk0FNlT=+(5+-pD#Aq4{M
z^^41>mzB8ch%cY3>&L{9{NKV-<PHbv|J-=a`v+ImjjRTuQxoN?ku0P(nCqc$+_jo7
z%V{c-<}Zjkd(=0&t%FiS^6TknEyWayQk{`_kqSs9D%2J0;~j-5x_=l?%<G!8H`!ej
z_3mqZy*WQj^+wt!;Y2b1O>7N6Qi%L&0$Ka5VX5L~0t6~|oPr!|6FZD2jGZIFzQ<td
zNrR(LREXk?Qd0tj_Hkkge_v@iC$EE>hvj|nw?DpY-uEUj^>4xsrB#d}ZcHG;iVY^e
zQKkTy5>y_Ww(_`y1fZ1nfwCI3>g1a1{X+}XcnKPg-Ir)+c`i2=k}R0${wuQI>Zy{i
zgXu;PV!0DvAMS8my0-FOQz%3`BrO0F8CQ2wfsEtK!Dr5e7*8}VRHMW&R)K1m-hP&v
zNsUOq39RF{@R3eSqXM}%@`9|s5OnnX@R^QuAv@1i62Ung20WPmw7P<yz6Asgi@gj)
z2OERDN<*J0v%iw}BYvy@d^{}zlfJkb)S<u{<Kb!#qD1vp6=egVnW$sKQg-hHRA<l?
z(-^(`J^AR^;f=JH+P;)uAl&Ycy8x!N>1SqG>D@g2@b84gg7cDs5vRWF84om2e))Nx
zd(!J!*^4EC!SJ__VyhUIibwciAEP(AQ#ObKnTwqDXV|r+dN_CTdHcXI)Vo2nMa~FL
zYXHx29E7vms2(GG(Blr>Dy1FWg}~0;ATzV~Bip$?^qEE@GmShpUb7HoSA`5?alZvx
zW`Ld(HM-Ataz6<R=0SK{SjvzliroEPGyu*3PHVT{wnr$O$eY_!oKNhqR608?Yw(s?
zTY8(`MmXe1X&FThs(gK=rp4RANpv+2d@_e6@s&jmUO4(^28Ab>KKSq8p3}>1rej|w
zW_yqu<K>OtJSP@7BfJcLBkDB*1cr}lN!;g`t#!Whi-(=8bSUg>deTA7hnIj88{Iv(
zVs$||cS@=)34OXW8hnV`jN0!^v*{U>GkP80y|Ch-<rI0TP&MAZi1^}r<mqtV_!oyR
z2QJ5Gqh2G`^@SQr&v1nSD=G;$Y^rCz2rnutyNi|c=5p;{Elqh!NfR<1ij=)74)nVX
zTAY`G88%6F2c&gBQmkl;#+T4_@nWC(d|wPcC*<5S|49vo71AZLqln^ZgnPzFn^-xj
z{w0E1hRE)86hLLhpiJybkNkBV^)Pq89{rL_N1{#CCtL&INbM8mbi%oB(Ag8$++Pem
zRtvF_k;94ewZE0L4^;hs-uDdcUI|IU=O9opj&eQS^g|2?MVgGlhTo{M9l(3HG!?WL
zYtK|7N+{(JSl!6-U;-qi?nv=DuGf5-a+uXa7U0BXC|AzVOhU&aL5c94s!19L$Tjb;
zP-HJ%L`F4)G;+3jltHf%Qa68TB;nQR-gIAU@|#9?hv>6i#-d-&r{1J_PE77u@gHbG
zlVQsyKWHLY17U>k!aiOCU=lGpCC;W%x;nBLm<2l^OC!)L3V7jLUU8GBiwP{K9~DV>
zc$-R&*V(`&*Jc!Et>bu))(h4BIF!ekn=LNMHnz8b^dj?~ohwzSik#3pwXNWqOHnrQ
z`~I!!-IMlVfhORT&69tl_$Z)T1SJ8<vo_h~nf{zSY3(aRCqW<Y#EkBQFqz-*8JcKA
zzQW!b1Z~g<xi$BFz810*N;}|6<br+b(Yl%}-4&<-uy0VKpuFKDU31b7)R$QsM?Z&U
z{)PbygSQ}hFvfE>h*ZGjAni_ms(DaJ=XLLKh)TH9d6q+{q7eh{T(!ROP?XF^AFj6Q
zrf)5{+I}5H9D)Tolf7~-uel1%Q`%R%So2ecAPgmBI)e9{*?2XeHc%``&EPg8FZRhJ
z;yE$Y3QCPS^_a!wB>gsy_od!{hQ&cAEIUJ5-~Pv{bXT`#+=#*{1+WLJD`C0VgJD`T
zlDsHN=m}~B^@0SXF?7f8$2qSyWxWgWbUF*ydR=q<Wk+#|pH}${D{TmX;&?XkN69-Q
zm&M&SBKjgaT~V40;fOXW#qTyl^spb;39la9H4kc6?w*JUUvpJ3M09}INU-Bs2%a@g
znq98^sB$~S$!o#cNH5XTC$0OfZK~^*)`Ch5laO^gY6|RQq&rx_@8=I13n!3C)Yd|=
zeC$hOlZ1jonry;PS*V?0H|~0CS96P2@Ut0x$0r2)SZo3o+H(>Y>N=7(g56%atCH2u
ziR=!cv=9?sX)m{JAzZe^$G#)HU%lg$b0yMt<l*wn0F_<XT=h~LDK=Y{w&k{iYgsY~
z>us@PwoXVP*&<0hy7MhyTXsfl-%_b#6X;!AiC667j#D%El$BB>f;2-Zg$=l=<-F<y
ztie@)r7ji?Z9Xjn8c(GO@XUpSVuYA1&|LDPHsi<tew_#HQiYG(Oz^3CDoY9C(Z<I(
za2#YwEO&NHpTU(xHuttBOH5mCM&P^RUKcM&w3&wuv8doZ=#Zr`9@JwS(EEyJrLd5K
zkmamHoiKRGNAdmq_!jQp1Iusl{NVBx3}Vg+@dDT|%jS%}@?k8Nr@&#g6e=Fjf6@|1
z&CuT<IZ>ck%R<Ee*u)b9{s30>AKUE%Tl8Wi`)TS0W6!g3&caTNcU27qmJw@RRAP*!
zg5fi<cEPbfnvQ~0fW&{bJ**cnI><hSM@iK7^U{%OCx4)mV)amO9m<N+yW-5C#b@+S
zO^p&{aR?uGDEMqZU3ExLdxQB6jPb&@W01cucjW^lg=1yYVkIDaoAj{vwkfxfR)D1d
z%6?gDMm}du^Ss}p*ia&2V-&u^(y8PRs3UMaUKD))1(;ErSs8eZ)ZH%!dsG0+KhFh7
zgi#O%TZ#4I*`o#+^BC1BFT!HPPAfQdP^DrI3nbiLpM%;hIX{^KhR0xi;FRRlWox7@
GLjD)g;l$Md

literal 0
HcmV?d00001

diff --git a/src/core/features/courses/pages/my/my.html b/src/core/features/courses/pages/my/my.html
index 65f89ff10..0d1d12031 100644
--- a/src/core/features/courses/pages/my/my.html
+++ b/src/core/features/courses/pages/my/my.html
@@ -5,7 +5,8 @@
         </ion-buttons>
         <ion-title>
             <h1>
-                <core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="0"></core-format-text>
+                <core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="0" class="core-header-sitename">
+                </core-format-text>
                 <img src="assets/img/top_logo.png" class="core-header-logo" [alt]="siteName">
             </h1>
         </ion-title>
diff --git a/src/core/features/courses/pages/my/my.scss b/src/core/features/courses/pages/my/my.scss
index 31a27190b..e073b4273 100644
--- a/src/core/features/courses/pages/my/my.scss
+++ b/src/core/features/courses/pages/my/my.scss
@@ -1,5 +1,3 @@
-@import "~theme/globals";
-
 :host ::ng-deep ion-item-divider {
     display: none !important;
 }
@@ -16,17 +14,3 @@ core-block ::ng-deep ion-card.addon-block-myoverview {
     --background: transparent;
     margin: 0;
 }
-
-@if ($core-dashboard-logo) {
-    .in-toolbar h1 .core-header-logo {
-        max-height: calc(var(--core-header-toolbar-height) - 24px);
-    }
-
-    .in-toolbar h1 core-format-text {
-        display: none;
-    }
-} @else {
-    .in-toolbar h1 .core-header-logo {
-        display: none;
-    }
-}
diff --git a/src/core/features/mainmenu/pages/home/home.html b/src/core/features/mainmenu/pages/home/home.html
index bb7bd1179..faba964d0 100644
--- a/src/core/features/mainmenu/pages/home/home.html
+++ b/src/core/features/mainmenu/pages/home/home.html
@@ -5,7 +5,8 @@
         </ion-buttons>
         <ion-title>
             <h1>
-                <core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="0"></core-format-text>
+                <core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="0" class="core-header-sitename">
+                </core-format-text>
                 <img src="assets/img/top_logo.png" class="core-header-logo" [alt]="siteName">
             </h1>
         </ion-title>
diff --git a/src/core/features/mainmenu/pages/home/home.scss b/src/core/features/mainmenu/pages/home/home.scss
deleted file mode 100644
index b8ba15df9..000000000
--- a/src/core/features/mainmenu/pages/home/home.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-@import "~theme/globals";
-
-@if ($core-dashboard-logo) {
-    .in-toolbar h1 .core-header-logo {
-        max-height: calc(var(--core-header-toolbar-height) - 24px);
-    }
-
-    .in-toolbar h1 core-format-text {
-        display: none;
-    }
-} @else {
-    .in-toolbar h1 .core-header-logo {
-        display: none;
-    }
-}
diff --git a/src/core/features/mainmenu/pages/home/home.ts b/src/core/features/mainmenu/pages/home/home.ts
index d536a54bd..9187887b0 100644
--- a/src/core/features/mainmenu/pages/home/home.ts
+++ b/src/core/features/mainmenu/pages/home/home.ts
@@ -29,7 +29,6 @@ import { CoreMainMenuDeepLinkManager } from '@features/mainmenu/classes/deep-lin
 @Component({
     selector: 'page-core-mainmenu-home',
     templateUrl: 'home.html',
-    styleUrls: ['home.scss'],
 })
 export class CoreMainMenuHomePage implements OnInit {
 
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 45e7221d6..f11236c58 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -119,53 +119,6 @@ body {
     }
 }
 
-ion-header ion-title{
-    h1, h2, .subheading {
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        overflow: hidden;
-        margin: 0;
-    }
-
-    .filter_mathjaxloader_equation div {
-        display: inline !important;
-    }
-}
-
-ion-app.md ion-header ion-title{
-    @include padding(0, 20px);
-
-    h1, h2, .subheading {
-        font-size: 20px;
-        font-weight: 500;
-        letter-spacing: .0125em;
-    }
-
-    h1 + h2,
-    h1 + .subheading {
-        font-size: 14px;
-        font-weight: 400;
-    }
-}
-
-ion-app.ios ion-header ion-title {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-
-    h1, h2, .subheading {
-        font-size: 17px;
-        font-weight: 600;
-    }
-
-    h1 + h2,
-    h1 + .subheading {
-        font-size: 14px;
-        font-weight: 400;
-    }
-}
-
-
 // Correctly inherit ion-text-wrap onto labels.
 .item ion-label core-format-text .core-format-text-content > *,
 .fake-ion-item core-format-text .core-format-text-content > * {
@@ -196,32 +149,109 @@ ion-toolbar {
     --min-height: var(--core-header-toolbar-height);
 }
 
-ion-header ion-toolbar {
-    ion-back-button,
-    .in-toolbar.button-clear {
-        --color: var(--core-header-toolbar-color);
-        --ion-toolbar-color: var(--core-header-toolbar-color);
-        --border-radius: var(--huge-radius);
-    }
+// Header.
+ion-header {
+    z-index: 12; // To hide ion-slides on scroll.
 
-    .button.button-clear,
-    .button.button-solid {
-        --background: transparent;
-        --color: var(--core-header-toolbar-color);
-        --primary: var(--core-header-toolbar-color);
-    }
+    ion-toolbar {
+        ion-spinner {
+            margin: 10px;
+        }
 
-    .button.button-clear.button-has-icon-only,
-    .button.button-solid.button-has-icon-only {
-        --border-radius: var(--huge-radius);
-        width: var(--a11y-min-target-size);
-        height: var(--a11y-min-target-size);
-    }
+        ion-back-button,
+        .in-toolbar.button-clear {
+            --color: var(--core-header-toolbar-color);
+            --ion-toolbar-color: var(--core-header-toolbar-color);
+            --border-radius: var(--huge-radius);
+        }
+
+        .button.button-clear,
+        .button.button-solid {
+            --background: transparent;
+            --color: var(--core-header-toolbar-color);
+            --primary: var(--core-header-toolbar-color);
+        }
+
+        .button.button-clear.button-has-icon-only,
+        .button.button-solid.button-has-icon-only {
+            --border-radius: var(--huge-radius);
+            width: var(--a11y-min-target-size);
+            height: var(--a11y-min-target-size);
+            ion-icon {
+                font-size: 24px;
+            }
+        }
 
 
-    .core-navbar-button-hidden {
-        display: none !important;
+        .core-navbar-button-hidden {
+            display: none !important;
+        }
     }
+
+    ion-title {
+        @include padding(0, 16px);
+
+        h1, h2, .subheading {
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            overflow: hidden;
+            margin: 0;
+        }
+
+        .filter_mathjaxloader_equation div {
+            display: inline !important;
+        }
+
+        h1 {
+            .core-header-logo {
+                max-height: var(--core-mainpage-headerlogo-maxheight);
+                display: var( --core-mainpage-headerlogo-display);
+            }
+
+            .core-header-sitename {
+                display: var(--core-mainpage-sitename-display);
+            }
+        }
+
+        h1, h2, .subheading {
+            font-size: 20px;
+            font-weight: 500;
+            letter-spacing: .0125em;
+            text-align: start;
+            padding: 0;
+        }
+
+        h1 + h2,
+        h1 + .subheading {
+            font-size: 14px;
+            font-weight: 400;
+        }
+
+        &.ios {
+            position: static;
+            width: auto;
+            height: auto;
+            left: auto;
+            right: auto;
+            top: auto;
+            text-align: start;
+
+            h1, h2, .subheading {
+                font-size: 17px;
+                font-weight: 600;
+            }
+
+            h1 + h2,
+            h1 + .subheading {
+                font-size: 14px;
+                font-weight: 400;
+            }
+        }
+    }
+}
+
+ion-tabs.hide-header ion-header {
+    display: none;
 }
 
 ion-footer ion-toolbar.ion-color-contrast {
@@ -474,19 +504,6 @@ core-split-view.menu-and-content {
     }
 }
 
-// Header.
-ion-header {
-    z-index: 12; // To hide ion-slides on scroll.
-}
-ion-tabs.hide-header ion-header {
-    display: none;
-}
-ion-toolbar {
-    ion-spinner {
-        margin: 10px;
-    }
-}
-
 // Iframe fullscreen manage.
 // Using router outlet to avoid changing styles on modals.
 body.core-iframe-fullscreen ion-router-outlet {
@@ -955,6 +972,10 @@ ion-searchbar {
     .sc-ion-searchbar-ios.searchbar-input {
         @include padding-horizontal(48px);
     }
+
+    .searchbar-input {
+        @include padding-horizontal(48px);
+    }
 }
 
 // File uploader.
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 33ef85f65..6f2e2b837 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -363,4 +363,14 @@
     @each $type, $value in $activity-icon-colors {
         --activity#{$type}: #{$value};
     }
+
+    --core-mainpage-sitename-display: none;
+    --core-mainpage-headerlogo-display: none;
+    --core-mainpage-headerlogo-maxheight: calc(var(--core-header-toolbar-height) - 16px);
+
+    @if ($core-dashboard-logo) {
+        --core-mainpage-headerlogo-display: inline;
+    } @else {
+        --core-mainpage-sitename-display: inline;
+    }
 }

From 3f71825ead42c1f9d9a8d22f7bdc1260efdee742 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 16 Feb 2022 13:26:33 +0100
Subject: [PATCH 0533/1008] MOBILE-3833 core: Improve database config updates

---
 .../classes/database/database-table-proxy.ts  | 42 ++++++++++---
 src/core/classes/database/database-table.ts   | 17 ++++++
 .../classes/database/debug-database-table.ts  |  7 +++
 .../login/pages/credentials/credentials.ts    |  9 ++-
 .../login/pages/reconnect/reconnect.ts        | 12 +++-
 src/core/features/styles/services/styles.ts   | 16 ++---
 src/core/services/config.ts                   | 39 ++++++++++--
 src/core/services/sites.ts                    | 59 ++++++++++++++-----
 src/core/singletons/events.ts                 |  9 +++
 9 files changed, 169 insertions(+), 41 deletions(-)

diff --git a/src/core/classes/database/database-table-proxy.ts b/src/core/classes/database/database-table-proxy.ts
index d9d676bcc..7e183f95a 100644
--- a/src/core/classes/database/database-table-proxy.ts
+++ b/src/core/classes/database/database-table-proxy.ts
@@ -23,6 +23,7 @@ import {
     CoreDatabaseConditions,
     GetDBRecordPrimaryKey,
     CoreDatabaseQueryOptions,
+    CoreDatabaseTableConstructor,
 } from './database-table';
 import { CoreDebugDatabaseTable } from './debug-database-table';
 import { CoreEagerDatabaseTable } from './eager-database-table';
@@ -42,6 +43,14 @@ export class CoreDatabaseTableProxy<
     protected config: CoreDatabaseConfiguration;
     protected target = asyncInstance<CoreDatabaseTable<DBRecord, PrimaryKeyColumn>>();
     protected environmentObserver?: CoreEventObserver;
+    protected targetConstructors: Record<
+        CoreDatabaseCachingStrategy,
+        CoreDatabaseTableConstructor<DBRecord, PrimaryKeyColumn, PrimaryKey>
+    > = {
+        [CoreDatabaseCachingStrategy.Eager]: CoreEagerDatabaseTable,
+        [CoreDatabaseCachingStrategy.Lazy]: CoreLazyDatabaseTable,
+        [CoreDatabaseCachingStrategy.None]: CoreDatabaseTable,
+    };
 
     constructor(
         config: Partial<CoreDatabaseConfiguration>,
@@ -58,7 +67,13 @@ export class CoreDatabaseTableProxy<
      * @inheritdoc
      */
     async initialize(): Promise<void> {
-        this.environmentObserver = CoreEvents.on(CoreConfigProvider.ENVIRONMENT_UPDATED, () => this.updateTarget());
+        this.environmentObserver = CoreEvents.on(CoreConfigProvider.ENVIRONMENT_UPDATED, async () => {
+            if (!(await this.shouldUpdateTarget())) {
+                return;
+            }
+
+            this.updateTarget();
+        });
 
         await this.updateTarget();
     }
@@ -202,6 +217,20 @@ export class CoreDatabaseTableProxy<
         this.target.setInstance(newTarget);
     }
 
+    /**
+     * Check whether the underlying target should be updated.
+     *
+     * @returns Whether target should be updated.
+     */
+    protected async shouldUpdateTarget(): Promise<boolean> {
+        const config = await this.getRuntimeConfig();
+        const target = await this.target.getInstance();
+        const originalTarget = target instanceof CoreDebugDatabaseTable ? target.getTarget() : target;
+
+        return (config.debug && target === originalTarget)
+            || originalTarget?.constructor !== this.targetConstructors[config.cachingStrategy];
+    }
+
     /**
      * Create proxy target.
      *
@@ -221,14 +250,9 @@ export class CoreDatabaseTableProxy<
      * @returns Database table.
      */
     protected createTable(cachingStrategy: CoreDatabaseCachingStrategy): CoreDatabaseTable<DBRecord, PrimaryKeyColumn> {
-        switch (cachingStrategy) {
-            case CoreDatabaseCachingStrategy.Eager:
-                return new CoreEagerDatabaseTable(this.database, this.tableName, this.primaryKeyColumns);
-            case CoreDatabaseCachingStrategy.Lazy:
-                return new CoreLazyDatabaseTable(this.database, this.tableName, this.primaryKeyColumns);
-            case CoreDatabaseCachingStrategy.None:
-                return new CoreDatabaseTable(this.database, this.tableName, this.primaryKeyColumns);
-        }
+        const DatabaseTable = this.targetConstructors[cachingStrategy];
+
+        return new DatabaseTable(this.database, this.tableName, this.primaryKeyColumns);
     }
 
 }
diff --git a/src/core/classes/database/database-table.ts b/src/core/classes/database/database-table.ts
index 6ff8f92d5..f198b333e 100644
--- a/src/core/classes/database/database-table.ts
+++ b/src/core/classes/database/database-table.ts
@@ -336,6 +336,23 @@ export class CoreDatabaseTable<
 
 }
 
+/**
+ * CoreDatabaseTable constructor.
+ */
+export type CoreDatabaseTableConstructor<
+    DBRecord extends SQLiteDBRecordValues = SQLiteDBRecordValues,
+    PrimaryKeyColumn extends keyof DBRecord = 'id',
+    PrimaryKey extends GetDBRecordPrimaryKey<DBRecord, PrimaryKeyColumn> = GetDBRecordPrimaryKey<DBRecord, PrimaryKeyColumn>
+> = {
+
+    new (
+        database: SQLiteDB,
+        tableName: string,
+        primaryKeyColumns?: PrimaryKeyColumn[]
+    ): CoreDatabaseTable<DBRecord, PrimaryKeyColumn, PrimaryKey>;
+
+};
+
 /**
  * Infer primary key type from database record and primary key column types.
  */
diff --git a/src/core/classes/database/debug-database-table.ts b/src/core/classes/database/debug-database-table.ts
index 3e236c5c3..d7e58b56b 100644
--- a/src/core/classes/database/debug-database-table.ts
+++ b/src/core/classes/database/debug-database-table.ts
@@ -43,6 +43,13 @@ export class CoreDebugDatabaseTable<
         this.logger = CoreLogger.getInstance(`CoreDatabase[${this.tableName}]`);
     }
 
+    /**
+     * Get underlying table instance.
+     */
+    getTarget(): CoreDatabaseTable<DBRecord, PrimaryKeyColumn, PrimaryKey> {
+        return this.target;
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/src/core/features/login/pages/credentials/credentials.ts b/src/core/features/login/pages/credentials/credentials.ts
index f8777a1d3..6e805abe7 100644
--- a/src/core/features/login/pages/credentials/credentials.ts
+++ b/src/core/features/login/pages/credentials/credentials.ts
@@ -333,7 +333,14 @@ export class CoreLoginCredentialsPage implements OnInit, OnDestroy {
      */
     ngOnDestroy(): void {
         this.viewLeft = true;
-        CoreEvents.trigger(CoreEvents.LOGIN_SITE_UNCHECKED, { config: this.siteConfig }, this.siteId);
+        CoreEvents.trigger(
+            CoreEvents.LOGIN_SITE_UNCHECKED,
+            {
+                config: this.siteConfig,
+                loginSuccessful: !!this.siteId,
+            },
+            this.siteId,
+        );
         this.valueChangeSubscription?.unsubscribe();
     }
 
diff --git a/src/core/features/login/pages/reconnect/reconnect.ts b/src/core/features/login/pages/reconnect/reconnect.ts
index 0a884a552..f40c6fd05 100644
--- a/src/core/features/login/pages/reconnect/reconnect.ts
+++ b/src/core/features/login/pages/reconnect/reconnect.ts
@@ -57,6 +57,7 @@ export class CoreLoginReconnectPage implements OnInit, OnDestroy {
     protected viewLeft = false;
     protected eventThrown = false;
     protected redirectData?: CoreRedirectPayload;
+    protected loginSuccessful = false;
 
     constructor(
         protected fb: FormBuilder,
@@ -117,7 +118,14 @@ export class CoreLoginReconnectPage implements OnInit, OnDestroy {
      */
     ngOnDestroy(): void {
         this.viewLeft = true;
-        CoreEvents.trigger(CoreEvents.LOGIN_SITE_UNCHECKED, { config: this.siteConfig }, this.siteId);
+        CoreEvents.trigger(
+            CoreEvents.LOGIN_SITE_UNCHECKED,
+            {
+                config: this.siteConfig,
+                loginSuccessful: this.loginSuccessful,
+            },
+            this.siteId,
+        );
     }
 
     /**
@@ -214,6 +222,8 @@ export class CoreLoginReconnectPage implements OnInit, OnDestroy {
             this.credForm.controls['password'].reset();
 
             // Go to the site initial page.
+            this.loginSuccessful = true;
+
             await CoreNavigator.navigateToSiteHome({
                 params: this.redirectData,
             });
diff --git a/src/core/features/styles/services/styles.ts b/src/core/features/styles/services/styles.ts
index 7bb761f42..fd07b1f6c 100644
--- a/src/core/features/styles/services/styles.ts
+++ b/src/core/features/styles/services/styles.ts
@@ -108,19 +108,11 @@ export class CoreStylesService {
      * Listen events.
      */
     protected listenEvents(): void {
-        let addingSite: string | undefined;
-
         // When a new site is added to the app, add its styles.
         CoreEvents.on(CoreEvents.SITE_ADDED, async (data) => {
-            addingSite = data.siteId;
-
             try {
                 await this.addSite(data.siteId);
 
-                if (addingSite == data.siteId) {
-                    addingSite = undefined;
-                }
-
                 // User has logged in, remove tmp styles and enable loaded styles.
                 if (data.siteId == CoreSites.getCurrentSiteId()) {
                     this.unloadTmpStyles();
@@ -164,10 +156,10 @@ export class CoreStylesService {
         });
 
         // Unload temporary styles when site config is "unchecked" in login.
-        CoreEvents.on(CoreEvents.LOGIN_SITE_UNCHECKED, (data) => {
-            if (data.siteId && data.siteId === addingSite) {
-                // The tmp styles are from a site that is being added permanently.
-                // Wait for the final site styles to be loaded before removing the tmp styles so there is no blink effect.
+        CoreEvents.on(CoreEvents.LOGIN_SITE_UNCHECKED, ({ loginSuccessful }) => {
+            if (loginSuccessful) {
+                // The tmp styles have been added for a site we've logged into, so we'll wait for the final
+                // site styles to be loaded before removing the tmp styles so there is no blink effect.
                 return;
             }
 
diff --git a/src/core/services/config.ts b/src/core/services/config.ts
index f8d65ee23..a76ec716b 100644
--- a/src/core/services/config.ts
+++ b/src/core/services/config.ts
@@ -120,6 +120,19 @@ export class CoreConfigProvider {
         }
     }
 
+    /**
+     * Get an app setting directly from the database, without using any optimizations..
+     *
+     * @param name The config name.
+     * @return Resolves upon success along with the config data. Reject on failure.
+     */
+    async getFromDB<T>(name: string): Promise<T> {
+        const db = CoreApp.getDB();
+        const record = await db.getRecord<ConfigDBEntry>(CONFIG_TABLE_NAME, { name });
+
+        return record.value;
+    }
+
     /**
      * Check whether the given app setting exists.
      *
@@ -151,9 +164,14 @@ export class CoreConfigProvider {
      * Update config with the given values.
      *
      * @param config Config updates.
+     * @param reset Whether to reset environment before applying the patch.
      */
-    patchEnvironment(config: Partial<EnvironmentConfig>): void {
-        this.defaultEnvironment = this.defaultEnvironment ?? CoreConstants.CONFIG;
+    patchEnvironment(config: Partial<EnvironmentConfig>, reset: boolean = false): void {
+        this.defaultEnvironment = this.defaultEnvironment ?? { ...CoreConstants.CONFIG };
+
+        if (reset) {
+            this.resetEnvironmentSilently();
+        }
 
         Object.assign(CoreConstants.CONFIG, config);
         CoreEvents.trigger(CoreConfigProvider.ENVIRONMENT_UPDATED, CoreConstants.CONFIG);
@@ -169,8 +187,7 @@ export class CoreConfigProvider {
             return;
         }
 
-        Object.keys(CoreConstants.CONFIG).forEach(key => delete CoreConstants.CONFIG[key]);
-        Object.assign(CoreConstants.CONFIG, this.defaultEnvironment);
+        this.resetEnvironmentSilently();
         CoreEvents.trigger(CoreConfigProvider.ENVIRONMENT_UPDATED, CoreConstants.CONFIG);
     }
 
@@ -185,6 +202,20 @@ export class CoreConfigProvider {
         this.patchEnvironment(JSON.parse(CoreUtils.getCookie('MoodleAppConfig') ?? '{}'));
     }
 
+    /**
+     * Reset config values to its original state without emitting any events.
+     */
+    protected resetEnvironmentSilently(): void {
+        if (!this.defaultEnvironment) {
+            // The environment config hasn't been modified; there's not need to reset.
+
+            return;
+        }
+
+        Object.keys(CoreConstants.CONFIG).forEach(key => delete CoreConstants.CONFIG[key]);
+        Object.assign(CoreConstants.CONFIG, this.defaultEnvironment);
+    }
+
 }
 
 export const CoreConfig = makeSingleton(CoreConfigProvider);
diff --git a/src/core/services/sites.ts b/src/core/services/sites.ts
index 1dedfd9cf..e865afc2d 100644
--- a/src/core/services/sites.ts
+++ b/src/core/services/sites.ts
@@ -66,6 +66,7 @@ import { asyncInstance, AsyncInstance } from '../utils/async-instance';
 import { CoreConfig } from './config';
 
 export const CORE_SITE_SCHEMAS = new InjectionToken<CoreSiteSchema[]>('CORE_SITE_SCHEMAS');
+export const CORE_SITE_CURRENT_SITE_ID_CONFIG = 'current_site_id';
 
 /*
  * Service to manage and interact with sites.
@@ -1032,13 +1033,31 @@ export class CoreSitesProvider {
             try {
                 const data = await this.sitesTable.getOneByPrimaryKey({ id: siteId });
 
-                return this.makeSiteFromSiteListEntry(data);
+                return this.addSiteFromSiteListEntry(data);
             } catch {
                 throw new CoreError('SiteId not found');
             }
         }
     }
 
+    /**
+     * Get a site directly from the database, without using any optimizations.
+     *
+     * @param siteId Site id.
+     * @return Site.
+     */
+    async getSiteFromDB(siteId: string): Promise<CoreSite> {
+        const db = CoreApp.getDB();
+
+        try {
+            const record = await db.getRecord<SiteDBEntry>(SITES_TABLE_NAME, { id: siteId });
+
+            return this.makeSiteFromSiteListEntry(record);
+        } catch {
+            throw new CoreError('SiteId not found');
+        }
+    }
+
     /**
      * Finds a site with a certain URL. It will return the first site found.
      *
@@ -1052,7 +1071,7 @@ export class CoreSitesProvider {
             return this.sites[data.id];
         }
 
-        return this.makeSiteFromSiteListEntry(data);
+        return this.addSiteFromSiteListEntry(data);
     }
 
     /**
@@ -1061,8 +1080,25 @@ export class CoreSitesProvider {
      * @param entry Site list entry.
      * @return Promised resolved with the created site.
      */
-    makeSiteFromSiteListEntry(entry: SiteDBEntry): Promise<CoreSite> {
+    addSiteFromSiteListEntry(entry: SiteDBEntry): Promise<CoreSite> {
         // Parse info and config.
+        const site = this.makeSiteFromSiteListEntry(entry);
+
+        return this.migrateSiteSchemas(site).then(() => {
+            // Set site after migrating schemas, or a call to getSite could get the site while tables are being created.
+            this.sites[entry.id] = site;
+
+            return site;
+        });
+    }
+
+    /**
+     * Make a site instance from a database entry.
+     *
+     * @param entry Site database entry.
+     * @return Site.
+     */
+    makeSiteFromSiteListEntry(entry: SiteDBEntry): CoreSite {
         const info = entry.info ? <CoreSiteInfo> CoreTextUtils.parseJSON(entry.info) : undefined;
         const config = entry.config ? <CoreSiteConfig> CoreTextUtils.parseJSON(entry.config) : undefined;
 
@@ -1077,12 +1113,7 @@ export class CoreSitesProvider {
         );
         site.setOAuthId(entry.oauthId || undefined);
 
-        return this.migrateSiteSchemas(site).then(() => {
-            // Set site after migrating schemas, or a call to getSite could get the site while tables are being created.
-            this.sites[entry.id] = site;
-
-            return site;
-        });
+        return site;
     }
 
     /**
@@ -1231,7 +1262,7 @@ export class CoreSitesProvider {
      * @return Promise resolved when current site is stored.
      */
     async login(siteId: string): Promise<void> {
-        await CoreConfig.set('current_site_id', siteId);
+        await CoreConfig.set(CORE_SITE_CURRENT_SITE_ID_CONFIG, siteId);
 
         CoreEvents.trigger(CoreEvents.LOGIN, {}, siteId);
     }
@@ -1477,7 +1508,7 @@ export class CoreSitesProvider {
 
             siteEntries.forEach((site) => {
                 if (!this.sites[site.id]) {
-                    promises.push(this.makeSiteFromSiteListEntry(site));
+                    promises.push(this.addSiteFromSiteListEntry(site));
                 }
 
                 if (this.sites[site.id].containsUrl(url)) {
@@ -1504,7 +1535,7 @@ export class CoreSitesProvider {
     async getStoredCurrentSiteId(): Promise<string> {
         await this.migrateCurrentSiteLegacyTable();
 
-        return CoreConfig.get('current_site_id');
+        return CoreConfig.get(CORE_SITE_CURRENT_SITE_ID_CONFIG);
     }
 
     /**
@@ -1513,7 +1544,7 @@ export class CoreSitesProvider {
      * @return Promise resolved when done.
      */
     async removeStoredCurrentSite(): Promise<void> {
-        await CoreConfig.delete('current_site_id');
+        await CoreConfig.delete(CORE_SITE_CURRENT_SITE_ID_CONFIG);
     }
 
     /**
@@ -1789,7 +1820,7 @@ export class CoreSitesProvider {
 
             const { siteId } = await db.getRecord<{ siteId: string }>('current_site');
 
-            await CoreConfig.set('current_site_id', siteId);
+            await CoreConfig.set(CORE_SITE_CURRENT_SITE_ID_CONFIG, siteId);
             await CoreApp.deleteTableSchema('current_site');
             await db.dropTable('current_site');
         } finally {
diff --git a/src/core/singletons/events.ts b/src/core/singletons/events.ts
index 547acc270..84b8522d3 100644
--- a/src/core/singletons/events.ts
+++ b/src/core/singletons/events.ts
@@ -56,6 +56,7 @@ export interface CoreEventsData {
     [CoreEvents.ACTIVITY_DATA_SENT]: CoreEventActivityDataSentData;
     [CoreEvents.IAB_LOAD_START]: InAppBrowserEvent;
     [CoreEvents.LOGIN_SITE_CHECKED]: CoreEventLoginSiteCheckedData;
+    [CoreEvents.LOGIN_SITE_UNCHECKED]: CoreEventLoginSiteUncheckedData;
     [CoreEvents.SEND_ON_ENTER_CHANGED]: CoreEventSendOnEnterChangedData;
     [CoreEvents.COMPONENT_FILE_ACTION]: CoreFilepoolComponentFileEventData;
     [CoreEvents.FILE_SHARED]: CoreEventFileSharedData;
@@ -400,6 +401,14 @@ export type CoreEventLoginSiteCheckedData = {
     config: CoreSitePublicConfigResponse;
 };
 
+/**
+ * Data passed to LOGIN_SITE_UNCHECKED event.
+ */
+export type CoreEventLoginSiteUncheckedData = {
+    config?: CoreSitePublicConfigResponse;
+    loginSuccessful: boolean;
+};
+
 /**
  * Data passed to SEND_ON_ENTER_CHANGED event.
  */

From f5918e08a74944b9a809b7dee1dca9ed79ceba78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 15 Feb 2022 12:05:37 +0100
Subject: [PATCH 0534/1008] MOBILE-3931 lesson: Add missing ion-labels

---
 .../mod/lesson/pages/player/player.html       | 36 +++++++++++--------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/addons/mod/lesson/pages/player/player.html b/src/addons/mod/lesson/pages/player/player.html
index 69e51bc97..3d0739c2f 100644
--- a/src/addons/mod/lesson/pages/player/player.html
+++ b/src/addons/mod/lesson/pages/player/player.html
@@ -36,20 +36,24 @@
 
             <!-- Retake and ongoing score. -->
             <ion-item class="ion-text-wrap" *ngIf="showRetake && !eolData && !processData">
-                <p>{{ 'addon.mod_lesson.attempt' | translate:{$a: retake} }}</p>
+                <ion-label>
+                    <p>{{ 'addon.mod_lesson.attempt' | translate:{$a: retake} }}</p>
+                </ion-label>
             </ion-item>
             <ion-item *ngIf="pageData && pageData.ongoingscore && !eolData && !processData"
                 class="addon-mod_lesson-ongoingscore ion-text-wrap">
-                {{ pageData.ongoingscore }}
+                <ion-label>{{ pageData.ongoingscore }}</ion-label>
             </ion-item>
 
             <!-- Page content. -->
             <ion-card *ngIf="!eolData && !processData">
                 <!-- Content page. -->
                 <ion-item class="ion-text-wrap" *ngIf="!question && pageContent">
-                    <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="pageContent" contextLevel="module"
-                        [contextInstanceId]="lesson.coursemodule" [courseId]="courseId">
-                    </core-format-text>
+                    <ion-label>
+                        <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="pageContent"
+                            contextLevel="module" [contextInstanceId]="lesson.coursemodule" [courseId]="courseId">
+                        </core-format-text>
+                    </ion-label>
                 </ion-item>
 
                 <!-- Question page. -->
@@ -71,20 +75,24 @@
 
                         <!-- Short answer. -->
                         <ion-item class="ion-text-wrap" *ngSwitchCase="'shortanswer'">
-                            <ion-input [type]="question.input!.type" placeholder="{{ 'addon.mod_lesson.youranswer' | translate }}"
-                                [id]="question.input!.id" [formControlName]="question.input!.name" autocorrect="off"
-                                [maxlength]="question.input!.maxlength">
-                            </ion-input>
+                            <ion-label>
+                                <ion-input [type]="question.input!.type" placeholder="{{ 'addon.mod_lesson.youranswer' | translate }}"
+                                    [id]="question.input!.id" [formControlName]="question.input!.name" autocorrect="off"
+                                    [maxlength]="question.input!.maxlength">
+                                </ion-input>
+                            </ion-label>
                         </ion-item>
 
                         <!-- Essay. -->
                         <ng-container *ngSwitchCase="'essay'">
                             <ion-item *ngIf="question.textarea">
-                                <core-rich-text-editor placeholder="{{ 'addon.mod_lesson.youranswer' | translate }}"
-                                    [control]="question.control" [component]="component" [componentId]="lesson?.coursemodule"
-                                    [autoSave]="true" contextLevel="module" [contextInstanceId]="lesson?.coursemodule"
-                                    elementId="answer_editor">
-                                </core-rich-text-editor>
+                                <ion-label>
+                                    <core-rich-text-editor placeholder="{{ 'addon.mod_lesson.youranswer' | translate }}"
+                                        [control]="question.control" [component]="component" [componentId]="lesson?.coursemodule"
+                                        [autoSave]="true" contextLevel="module" [contextInstanceId]="lesson?.coursemodule"
+                                        elementId="answer_editor">
+                                    </core-rich-text-editor>
+                                </ion-label>
                             </ion-item>
                             <ion-item class="ion-text-wrap" *ngIf="!question.textarea && question.useranswer">
                                 <ion-label>

From 926f56193a9c87a4cc1ca5025cba72ad67226da8 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 15 Feb 2022 12:43:14 +0100
Subject: [PATCH 0535/1008] MOBILE-3982 core: Fix collapsible header flicker

---
 src/core/directives/collapsible-header.ts | 79 +++++++++++++++--------
 1 file changed, 51 insertions(+), 28 deletions(-)

diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts
index b80be74e7..970195123 100644
--- a/src/core/directives/collapsible-header.ts
+++ b/src/core/directives/collapsible-header.ts
@@ -34,6 +34,7 @@ export class CoreCollapsibleHeaderDirective implements OnDestroy {
 
     protected loadingObserver: CoreEventObserver;
     protected content?: HTMLIonContentElement | null;
+    protected contentScroll?: HTMLElement;
     protected header: HTMLIonHeaderElement;
     protected titleTopDifference = 1;
     protected h1StartDifference = 0;
@@ -46,9 +47,11 @@ export class CoreCollapsibleHeaderDirective implements OnDestroy {
     protected title?: HTMLElement | null;
     protected titleHeight = 0;
     protected contentH1?: HTMLElement | null;
+    protected debouncedUpdateCollapseProgress: () => void;
 
     constructor(el: ElementRef<HTMLIonHeaderElement>) {
         this.header = el.nativeElement;
+        this.debouncedUpdateCollapseProgress = CoreUtils.debounce(() => this.updateCollapseProgress(), 50);
 
         this.loadingObserver = CoreEvents.on(CoreEvents.CORE_LOADING_CHANGED, async (data) => {
             if (!data.loaded) {
@@ -67,6 +70,21 @@ export class CoreCollapsibleHeaderDirective implements OnDestroy {
         });
     }
 
+    /**
+     * Set content element.
+     *
+     * @param content Content element.
+     */
+    protected async setContent(content?: HTMLIonContentElement | null): Promise<void> {
+        this.content = content;
+
+        if (content) {
+            this.contentScroll = await content.getScrollElement();
+        } else {
+            delete this.contentScroll;
+        }
+    }
+
     /**
      * Gets the loading content id to wait for the loading to finish.
      *
@@ -74,7 +92,7 @@ export class CoreCollapsibleHeaderDirective implements OnDestroy {
      */
     protected async getLoadingId(): Promise<string | undefined> {
         if (!this.content) {
-            this.content = this.header.parentElement?.querySelector('ion-content:not(.disable-scroll-y)');
+            this.setContent(this.header.parentElement?.querySelector('ion-content:not(.disable-scroll-y)'));
 
             if (!this.content) {
                 this.cannotCollapse();
@@ -101,7 +119,7 @@ export class CoreCollapsibleHeaderDirective implements OnDestroy {
      * Call this function when header is not collapsible.
      */
     protected cannotCollapse(): void {
-        this.content = undefined;
+        this.setContent();
         this.loadingObserver.off();
         this.header.classList.add('core-header-collapsed');
     }
@@ -112,7 +130,6 @@ export class CoreCollapsibleHeaderDirective implements OnDestroy {
      * @return Promise resolved when done.
      */
     protected async setupRealTitle(): Promise<void> {
-
         if (!this.content) {
             this.cannotCollapse();
 
@@ -141,7 +158,6 @@ export class CoreCollapsibleHeaderDirective implements OnDestroy {
 
         this.title = title;
         this.titleHeight = title.getBoundingClientRect().height;
-
         this.titleTopDifference = this.contentH1.getBoundingClientRect().top - headerH1.getBoundingClientRect().top;
 
         if (this.titleTopDifference <= 0) {
@@ -224,7 +240,7 @@ export class CoreCollapsibleHeaderDirective implements OnDestroy {
      */
     async setupContent(parentId?: string, retries = 5): Promise<void> {
         if (parentId) {
-            this.content = this.header.parentElement?.querySelector(`#${parentId} ion-content:not(.disable-scroll-y)`);
+            this.setContent(this.header.parentElement?.querySelector(`#${parentId} ion-content:not(.disable-scroll-y)`));
             this.inContent = false;
             if (!this.content && retries > 0) {
                 await CoreUtils.nextTick();
@@ -233,7 +249,7 @@ export class CoreCollapsibleHeaderDirective implements OnDestroy {
                 return;
             }
 
-            this.onScroll(this.content?.scrollTop || 0);
+            this.updateCollapseProgress();
         }
 
         if (!this.title || !this.content) {
@@ -260,55 +276,62 @@ export class CoreCollapsibleHeaderDirective implements OnDestroy {
         }
 
         this.content.scrollEvents = true;
-        this.content.addEventListener('ionScroll', (e: CustomEvent<ScrollDetail>): void => {
-            if (e.target == this.content) {
-                this.onScroll(e.detail.scrollTop);
+        this.content.addEventListener('ionScroll', ({ target }: CustomEvent<ScrollDetail>): void => {
+            if (target !== this.content) {
+                return;
             }
+
+            this.updateCollapseProgress();
+            this.debouncedUpdateCollapseProgress();
         });
     }
 
     /**
-     * On scroll function.
-     *
-     * @param scrollTop Scroll top measure.
+     * Update collapse progress according to the current scroll position.
      */
-    protected onScroll(
-        scrollTop: number,
-    ): void {
-        if (!this.title || !this.contentH1) {
+    protected updateCollapseProgress(): void {
+        if (!this.contentScroll || !this.title || !this.contentH1) {
             return;
         }
 
-        const progress = CoreMath.clamp(scrollTop / this.titleTopDifference, 0, 1);
-        const collapsed = progress >= 1;
+        const collapsibleHeaderHeight = this.title.shadowRoot?.children[0].clientHeight ?? this.title.clientHeight;
+        const scrollableHeight = this.contentScroll.scrollHeight - this.contentScroll.clientHeight;
+        const collapsedHeight = collapsibleHeaderHeight - this.title.clientHeight;
+        const progress = CoreMath.clamp(
+            scrollableHeight + collapsedHeight <= 2 * collapsibleHeaderHeight
+                ? this.contentScroll.scrollTop / (this.contentScroll.scrollHeight - this.contentScroll.clientHeight)
+                : this.contentScroll.scrollTop / collapsibleHeaderHeight,
+            0,
+            1,
+        );
+        const collapsed = progress === 1;
 
         if (!this.inContent) {
-            this.title.style.transform = 'translateY(-' + scrollTop + 'px)';
-            const height = this.titleHeight - scrollTop;
-            this.title.style.height = (height > 0 ? height : 0) + 'px';
+            this.title.style.transform = `translateY(-${this.titleTopDifference * progress}px)`;
+            this.title.style.height = `${collapsibleHeaderHeight * (1 - progress)}px`;
         }
 
         // Check total collapse.
         this.header.classList.toggle('core-header-collapsed', collapsed);
         this.title.classList.toggle('collapsible-title-collapsed', collapsed);
-        this.title.classList.toggle('collapsible-title-collapse-started', scrollTop > 0);
+        this.title.classList.toggle('collapsible-title-collapse-started', progress > 0);
         this.title.classList.toggle('collapsible-title-collapse-nowrap', progress > 0.5);
-        this.title.style.setProperty('--collapse-opacity', (1 - progress) +'');
+        this.title.style.setProperty('--collapse-opacity', `${1 - progress}`);
 
         if (collapsed) {
-            this.contentH1.style.transform = 'translateX(-' + this.h1StartDifference + 'px)';
-            this.contentH1.style.setProperty('font-size', this.headerH1FontSize + 'px');
+            this.contentH1.style.transform = `translateX(-${this.h1StartDifference}px)`;
+            this.contentH1.style.setProperty('font-size', `${this.headerH1FontSize}px`);
 
             return;
         }
 
         // Zoom font-size out.
         const newFontSize = this.contentH1FontSize - ((this.contentH1FontSize - this.headerH1FontSize) * progress);
-        this.contentH1.style.setProperty('font-size', newFontSize + 'px');
+        this.contentH1.style.setProperty('font-size', `${newFontSize}px`);
 
         // Move.
-        const newStart = - this.h1StartDifference * progress;
-        this.contentH1.style.transform = 'translateX(' + newStart + 'px)';
+        const newStart = -this.h1StartDifference * progress;
+        this.contentH1.style.transform = `translateX(${newStart}px)`;
     }
 
     /**

From 51b2174ef2356e70a3008c2c71c8cf90c795640d Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 16 Feb 2022 13:11:47 +0100
Subject: [PATCH 0536/1008] MOBILE-3799 filepool: Fix files considered outdated
 when they aren't

---
 src/core/services/filepool.ts | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/core/services/filepool.ts b/src/core/services/filepool.ts
index fd11e1fe5..49d639d12 100644
--- a/src/core/services/filepool.ts
+++ b/src/core/services/filepool.ts
@@ -386,10 +386,10 @@ export class CoreFilepoolProvider {
             const file = await this.fixPluginfileURL(siteId, fileUrl);
 
             fileUrl = CoreFileHelper.getFileUrl(file);
-            timemodified = file.timemodified || timemodified;
+            timemodified = file.timemodified ?? timemodified;
         }
 
-        revision = revision || this.getRevisionFromUrl(fileUrl);
+        revision = revision ?? this.getRevisionFromUrl(fileUrl);
         const fileId = this.getFileIdByUrl(fileUrl);
 
         const primaryKey = { siteId, fileId };
@@ -1032,11 +1032,10 @@ export class CoreFilepoolProvider {
 
         const file = await this.fixPluginfileURL(siteId, fileUrl);
         fileUrl = CoreFileHelper.getFileUrl(file);
-        timemodified = file.timemodified || timemodified;
 
         options = Object.assign({}, options); // Create a copy to prevent modifying the original object.
-        options.timemodified = timemodified || 0;
-        options.revision = revision || this.getRevisionFromUrl(fileUrl);
+        options.timemodified = file.timemodified ?? timemodified ?? 0;
+        options.revision = revision ?? this.getRevisionFromUrl(fileUrl);
         const fileId = this.getFileIdByUrl(fileUrl);
 
         const links = this.createComponentLinks(component, componentId);
@@ -1506,8 +1505,8 @@ export class CoreFilepoolProvider {
         }
 
         fileUrl = CoreUrl.removeUrlAnchor(CoreFileHelper.getFileUrl(file));
-        timemodified = file.timemodified || timemodified;
-        revision = revision || this.getRevisionFromUrl(fileUrl);
+        timemodified = file.timemodified ?? timemodified;
+        revision = revision ?? this.getRevisionFromUrl(fileUrl);
         const fileId = this.getFileIdByUrl(fileUrl);
 
         try {
@@ -1592,8 +1591,8 @@ export class CoreFilepoolProvider {
         const file = await this.fixPluginfileURL(siteId, fileUrl, timemodified);
 
         fileUrl = CoreFileHelper.getFileUrl(file);
-        timemodified = file.timemodified || timemodified;
-        revision = revision || this.getRevisionFromUrl(fileUrl);
+        timemodified = file.timemodified ?? timemodified;
+        revision = revision ?? this.getRevisionFromUrl(fileUrl);
         const fileId = this.getFileIdByUrl(fileUrl);
 
         try {
@@ -2566,10 +2565,10 @@ export class CoreFilepoolProvider {
         const fileId = item.fileId;
         const fileUrl = item.url;
         const options = {
-            revision: item.revision || undefined,
-            timemodified: item.timemodified || undefined,
-            isexternalfile: item.isexternalfile || undefined,
-            repositorytype: item.repositorytype || undefined,
+            revision: item.revision ?? undefined,
+            timemodified: item.timemodified ?? undefined,
+            isexternalfile: item.isexternalfile ?? undefined,
+            repositorytype: item.repositorytype ?? undefined,
         };
         const filePath = item.path || undefined;
         const links = item.linksUnserialized || [];

From f4cb040aa00727aa4de5f9c9fd3fb0bc0e5837d5 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 15 Feb 2022 08:40:48 +0100
Subject: [PATCH 0537/1008] MOBILE-3980 book: Add index page for book

---
 scripts/langindex.json                        |   1 +
 src/addons/mod/book/book-lazy.module.ts       |   4 +
 .../mod/book/components/components.module.ts  |   2 -
 .../index/addon-mod-book-index.html           |  44 +-
 src/addons/mod/book/components/index/index.ts | 319 ++-----------
 src/addons/mod/book/lang.json                 |   3 +-
 .../mod/book/pages/contents/contents.html     |  53 +++
 .../book/pages/contents/contents.module.ts    |  40 ++
 .../mod/book/pages/contents/contents.ts       | 428 ++++++++++++++++++
 src/addons/mod/book/pages/index/index.html    |   2 +-
 src/addons/mod/book/pages/index/index.page.ts |  17 +-
 11 files changed, 592 insertions(+), 321 deletions(-)
 create mode 100644 src/addons/mod/book/pages/contents/contents.html
 create mode 100644 src/addons/mod/book/pages/contents/contents.module.ts
 create mode 100644 src/addons/mod/book/pages/contents/contents.ts

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 4edb31980..5a733c08e 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -450,6 +450,7 @@
   "addon.mod_bigbluebuttonbn.view_message_session_started_at": "bigbluebuttonbn",
   "addon.mod_bigbluebuttonbn.view_message_viewer": "bigbluebuttonbn",
   "addon.mod_bigbluebuttonbn.view_message_viewers": "bigbluebuttonbn",
+  "addon.mod_book.book:read": "book",
   "addon.mod_book.errorchapter": "book",
   "addon.mod_book.modulenameplural": "book",
   "addon.mod_book.navnexttitle": "book",
diff --git a/src/addons/mod/book/book-lazy.module.ts b/src/addons/mod/book/book-lazy.module.ts
index 974dce981..0c81566fc 100644
--- a/src/addons/mod/book/book-lazy.module.ts
+++ b/src/addons/mod/book/book-lazy.module.ts
@@ -23,6 +23,10 @@ const routes: Routes = [
         path: ':courseId/:cmId',
         component: AddonModBookIndexPage,
     },
+    {
+        path: ':courseId/:cmId/contents',
+        loadChildren: () => import('./pages/contents/contents.module').then(m => m.AddonModBookContentsPageModule),
+    },
 ];
 
 @NgModule({
diff --git a/src/addons/mod/book/components/components.module.ts b/src/addons/mod/book/components/components.module.ts
index 0254605d5..d31d09782 100644
--- a/src/addons/mod/book/components/components.module.ts
+++ b/src/addons/mod/book/components/components.module.ts
@@ -16,7 +16,6 @@ import { NgModule } from '@angular/core';
 
 import { CoreSharedModule } from '@/core/shared.module';
 import { CoreCourseComponentsModule } from '@features/course/components/components.module';
-import { CoreTagComponentsModule } from '@features/tag/components/components.module';
 
 import { AddonModBookIndexComponent } from './index/index';
 import { AddonModBookTocComponent } from './toc/toc';
@@ -29,7 +28,6 @@ import { AddonModBookTocComponent } from './toc/toc';
     imports: [
         CoreSharedModule,
         CoreCourseComponentsModule,
-        CoreTagComponentsModule,
     ],
     exports: [
         AddonModBookIndexComponent,
diff --git a/src/addons/mod/book/components/index/addon-mod-book-index.html b/src/addons/mod/book/components/index/addon-mod-book-index.html
index 0789f53c5..a87c06a88 100644
--- a/src/addons/mod/book/components/index/addon-mod-book-index.html
+++ b/src/addons/mod/book/components/index/addon-mod-book-index.html
@@ -1,8 +1,5 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <ion-button (click)="showToc()" [attr.aria-label]="'addon.mod_book.toc' | translate" aria-haspopup="true" *ngIf="loaded">
-        <ion-icon name="fas-bookmark" slot="icon-only" aria-hidden="true"></ion-icon>
-    </ion-button>
     <core-context-menu>
         <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
             iconAction="fas-external-link-alt" [showBrowserWarning]="false"></core-context-menu-item>
@@ -28,31 +25,30 @@
         [courseId]="courseId">
     </core-course-module-info>
 
-    <ion-card class="core-warning-card" *ngIf="warning">
+    <ion-list>
         <ion-item>
-            <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
-            <ion-label><span [innerHTML]="warning"></span></ion-label>
+            <ion-label>
+                <h2>{{ 'addon.mod_book.toc' | translate }}</h2>
+            </ion-label>
         </ion-item>
-    </ion-card>
 
-    <div class="safe-area-padding-horizontal">
-        <core-navigation-bar *ngIf="displayNavBar" [items]="navigationItems" [showTitles]="displayTitlesInNavBar"
-            previousTranslate="addon.mod_book.navprevtitle" nextTranslate="addon.mod_book.navnexttitle" (action)="changeChapter($event.id)">
-        </core-navigation-bar>
+        <ion-item class="ion-text-wrap" *ngFor="let chapter of chapters" [class.item-dimmed]="chapter.hidden" button detail="true"
+            (click)="openBook(chapter.id)">
+            <ion-label>
+                <p [class.ion-padding-start]="addPadding && chapter.level == 1 ? true : null">
+                    <span *ngIf="showNumbers" class="addon-mod-book-number">{{chapter.indexNumber}}&nbsp;</span>
+                    <span *ngIf="showBullets" class="addon-mod-book-bullet">&bull;&nbsp;</span>
+                    <core-format-text [text]="chapter.title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
+                    </core-format-text>
+                </p>
+            </ion-label>
+        </ion-item>
 
-        <core-swipe-slides [manager]="manager" [options]="slidesOpts">
-            <ng-template let-chapter="item">
-                <div class="ion-padding">
-                    <core-format-text [component]="component" [componentId]="componentId" [text]="chapter.content" contextLevel="module"
-                        [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text>
-                    <div class="ion-margin-top" *ngIf="chapter.tags?.length > 0">
-                        <strong>{{ 'core.tag.tags' | translate }}: </strong>
-                        <core-tag-list [tags]="chapter.tags"></core-tag-list>
-                    </div>
-                </div>
-            </ng-template>
-        </core-swipe-slides>
-    </div>
+        <ion-button class="ion-margin" expand="block" (click)="openBook()">
+            {{ 'addon.mod_book.book:read' | translate }}
+        </ion-button>
+
+    </ion-list>
 
 </core-loading>
 
diff --git a/src/addons/mod/book/components/index/index.ts b/src/addons/mod/book/components/index/index.ts
index a984af095..35f24bbd2 100644
--- a/src/addons/mod/book/components/index/index.ts
+++ b/src/addons/mod/book/components/index/index.ts
@@ -12,33 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, Optional, Input, OnInit, ViewChild, ElementRef, OnDestroy } from '@angular/core';
+import { Component, Optional, OnInit, OnDestroy } from '@angular/core';
 import { CoreCourseModuleMainResourceComponent } from '@features/course/classes/main-resource-component';
-import {
-    AddonModBookProvider,
-    AddonModBookContentsMap,
-    AddonModBookTocChapter,
-    AddonModBookNavStyle,
-    AddonModBook,
-    AddonModBookBookWSData,
-} from '../../services/book';
-import { CoreTag, CoreTagItem } from '@features/tag/services/tag';
-import { CoreDomUtils } from '@services/utils/dom';
+import { AddonModBook, AddonModBookBookWSData, AddonModBookNumbering, AddonModBookTocChapter } from '../../services/book';
 import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
-import { CoreUtils } from '@services/utils/utils';
 import { CoreCourse } from '@features/course/services/course';
-import { AddonModBookTocComponent } from '../toc/toc';
-import { CoreNavigationBarItem } from '@components/navigation-bar/navigation-bar';
-import { CoreError } from '@classes/errors/error';
-import { Translate } from '@singletons';
-import { CoreSwipeSlidesComponent, CoreSwipeSlidesOptions } from '@components/swipe-slides/swipe-slides';
-import { CoreSwipeSlidesItemsManagerSource } from '@classes/items-management/swipe-slides-items-manager-source';
-import { CoreCourseModule } from '@features/course/services/course-helper';
-import { CoreSwipeSlidesItemsManager } from '@classes/items-management/swipe-slides-items-manager';
-import { CoreTextUtils } from '@services/utils/text';
+import { CoreNavigator } from '@services/navigator';
 
 /**
- * Component that displays a book.
+ * Component that displays a book entry page.
  */
 @Component({
     selector: 'addon-mod-book-index',
@@ -46,191 +28,63 @@ import { CoreTextUtils } from '@services/utils/text';
 })
 export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy {
 
-    @ViewChild(CoreSwipeSlidesComponent) slides?: CoreSwipeSlidesComponent;
+    showNumbers = true;
+    addPadding = true;
+    showBullets = false;
+    chapters: AddonModBookTocChapter[] = [];
 
-    @Input() initialChapterId?: number; // The initial chapter ID to load.
+    protected book?: AddonModBookBookWSData;
 
-    component = AddonModBookProvider.COMPONENT;
-    manager?: CoreSwipeSlidesItemsManager<LoadedChapter, AddonModBookSlidesItemsManagerSource>;
-    warning = '';
-    displayNavBar = true;
-    navigationItems: CoreNavigationBarItem<AddonModBookTocChapter>[] = [];
-    displayTitlesInNavBar = false;
-    slidesOpts: CoreSwipeSlidesOptions = {
-        autoHeight: true,
-        scrollOnChange: 'top',
-    };
-
-    protected firstLoad = true;
-    protected element: HTMLElement;
-    protected managerUnsubscribe?: () => void;
-
-    constructor(
-        elementRef: ElementRef,
-        @Optional() courseContentsPage?: CoreCourseContentsPage,
-    ) {
+    constructor( @Optional() courseContentsPage?: CoreCourseContentsPage) {
         super('AddonModBookIndexComponent', courseContentsPage);
-
-        this.element = elementRef.nativeElement;
     }
 
     /**
-     * Component being initialized.
+     * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
         super.ngOnInit();
 
-        const source = new AddonModBookSlidesItemsManagerSource(
-            this.courseId,
-            this.module,
-            CoreTag.areTagsAvailableInSite(),
-            this.initialChapterId,
-        );
-        this.manager = new CoreSwipeSlidesItemsManager(source);
-        this.managerUnsubscribe = this.manager.addListener({
-            onSelectedItemUpdated: (item) => {
-                this.onChapterViewed(item.id);
-            },
-        });
-
         this.loadContent();
     }
 
-    get book(): AddonModBookBookWSData | undefined {
-        return this.manager?.getSource().book;
-    }
+    /**
+     * @inheritdoc
+     */
+    protected async fetchContent(refresh?: boolean): Promise<void> {
+        try {
+            this.book = await AddonModBook.getBook(this.courseId, this.module.id);
 
-    get chapters(): AddonModBookTocChapter[] {
-        return this.manager?.getSource().chapters || [];
+            if (this.book) {
+                this.dataRetrieved.emit(this.book);
+
+                this.description = this.book.intro;
+                this.showNumbers = this.book.numbering == AddonModBookNumbering.NUMBERS;
+                this.showBullets = this.book.numbering == AddonModBookNumbering.BULLETS;
+                this.addPadding = this.book.numbering != AddonModBookNumbering.NONE;
+            }
+
+            const contents = await CoreCourse.getModuleContents(this.module, this.courseId);
+
+            this.chapters = AddonModBook.getTocList(contents);
+        } finally {
+            this.fillContextMenu(refresh);
+        }
     }
 
     /**
-     * Show the TOC.
+     * Open the book in a certain chapter.
+     *
+     * @param chapterId Chapter to open, undefined for first chapter.
      */
-    async showToc(): Promise<void> {
-        // Create the toc modal.
-        const visibleChapter = this.manager?.getSelectedItem();
-
-        const modalData = await CoreDomUtils.openSideModal<number>({
-            component: AddonModBookTocComponent,
-            componentProps: {
-                moduleId: this.module.id,
-                chapters: this.chapters,
-                selected: visibleChapter,
+    openBook(chapterId?: number): void {
+        CoreNavigator.navigate('contents', {
+            params: {
+                cmId: this.module.id,
                 courseId: this.courseId,
-                book: this.book,
+                chapterId,
             },
         });
-
-        if (modalData) {
-            this.changeChapter(modalData);
-        }
-    }
-
-    /**
-     * Change the current chapter.
-     *
-     * @param chapterId Chapter to load.
-     * @return Promise resolved when done.
-     */
-    changeChapter(chapterId: number): void {
-        if (!chapterId) {
-            return;
-        }
-
-        this.slides?.slideToItem({ id: chapterId });
-    }
-
-    /**
-     * Perform the invalidate content function.
-     *
-     * @return Resolved when done.
-     */
-    protected async invalidateContent(): Promise<void> {
-        await this.manager?.getSource().invalidateContent();
-    }
-
-    /**
-     * Download book contents and load the current chapter.
-     *
-     * @param refresh Whether we're refreshing data.
-     * @return Promise resolved when done.
-     */
-    protected async fetchContent(refresh = false): Promise<void> {
-        try {
-            const source = this.manager?.getSource();
-            if (!source) {
-                return;
-            }
-
-            const downloadResult = await this.downloadResourceIfNeeded(refresh);
-
-            const book = await source.loadBookData();
-
-            if (book) {
-                this.dataRetrieved.emit(book);
-
-                this.description = book.intro;
-                this.displayNavBar = book.navstyle != AddonModBookNavStyle.TOC_ONLY;
-                this.displayTitlesInNavBar = book.navstyle == AddonModBookNavStyle.TEXT;
-            }
-
-            // Get contents. No need to refresh, it has been done in downloadResourceIfNeeded.
-            await source.loadContents();
-
-            await source.load();
-
-            this.warning = downloadResult?.failed ? this.getErrorDownloadingSomeFilesMessage(downloadResult.error || '') : '';
-        } finally {
-            // Pass false because downloadResourceIfNeeded already invalidates and refresh data if refresh=true.
-            this.fillContextMenu(false);
-        }
-    }
-
-    /**
-     * Update data related to chapter being viewed.
-     *
-     * @param chapterId Chapter viewed.
-     * @return Promise resolved when done.
-     */
-    protected async onChapterViewed(chapterId: number): Promise<void> {
-        // Don't log the chapter ID when the user has just opened the book.
-        const logChapterId = this.firstLoad;
-        this.firstLoad = false;
-
-        if (this.displayNavBar) {
-            this.navigationItems = this.getNavigationItems(chapterId);
-        }
-
-        // Chapter loaded, log view.
-        await CoreUtils.ignoreErrors(AddonModBook.logView(
-            this.module.instance,
-            logChapterId ? chapterId : undefined,
-            this.module.name,
-        ));
-
-        const currentChapterIndex = this.chapters.findIndex((chapter) => chapter.id == chapterId);
-        const isLastChapter = currentChapterIndex < 0 || this.chapters[currentChapterIndex + 1] === undefined;
-
-        // Module is completed when last chapter is viewed, so we only check completion if the last is reached.
-        if (isLastChapter) {
-            CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
-        }
-    }
-
-    /**
-     * Converts chapters to navigation items.
-     *
-     * @param chapterId Current chapter Id.
-     * @return Navigation items.
-     */
-    protected getNavigationItems(chapterId: number): CoreNavigationBarItem<AddonModBookTocChapter>[] {
-        return this.chapters.map((chapter) => ({
-            item: chapter,
-            title: chapter.title,
-            current: chapter.id == chapterId,
-            enabled: true,
-        }));
     }
 
     /**
@@ -238,99 +92,6 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
      */
     ngOnDestroy(): void {
         super.ngOnDestroy();
-
-        this.managerUnsubscribe && this.managerUnsubscribe();
-    }
-
-}
-
-type LoadedChapter = {
-    id: number;
-    content?: string;
-    tags?: CoreTagItem[];
-};
-
-/**
- * Helper to manage swiping within a collection of chapters.
- */
-class AddonModBookSlidesItemsManagerSource extends CoreSwipeSlidesItemsManagerSource<LoadedChapter> {
-
-    readonly COURSE_ID: number;
-    readonly MODULE: CoreCourseModule;
-    readonly TAGS_ENABLED: boolean;
-
-    book?: AddonModBookBookWSData;
-    chapters: AddonModBookTocChapter[] = [];
-    contentsMap: AddonModBookContentsMap = {};
-
-    constructor(courseId: number, module: CoreCourseModule, tagsEnabled: boolean, initialChapterId?: number) {
-        super(initialChapterId ? { id: initialChapterId } : undefined);
-
-        this.COURSE_ID = courseId;
-        this.MODULE = module;
-        this.TAGS_ENABLED = tagsEnabled;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    getItemId(item: LoadedChapter): string | number {
-        return item.id;
-    }
-
-    /**
-     * Load book data from WS.
-     *
-     * @return Promise resolved when done.
-     */
-    async loadBookData(): Promise<AddonModBookBookWSData> {
-        this.book = await AddonModBook.getBook(this.COURSE_ID, this.MODULE.id);
-
-        return this.book;
-    }
-
-    /**
-     * Load module contents.
-     */
-    async loadContents(): Promise<void> {
-        const contents = await CoreCourse.getModuleContents(this.MODULE, this.COURSE_ID);
-
-        this.contentsMap = AddonModBook.getContentsMap(contents);
-        this.chapters = AddonModBook.getTocList(contents);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected async loadItems(): Promise<LoadedChapter[]> {
-        try {
-            const newChapters = await Promise.all(this.chapters.map(async (chapter) => {
-                const content = await AddonModBook.getChapterContent(this.contentsMap, chapter.id, this.MODULE.id);
-
-                return {
-                    id: chapter.id,
-                    content,
-                    tags: this.TAGS_ENABLED ? this.contentsMap[chapter.id].tags : [],
-                };
-            }));
-
-            return newChapters;
-        } catch (error) {
-            if (!CoreTextUtils.getErrorMessageFromError(error)) {
-                throw new CoreError(Translate.instant('addon.mod_book.errorchapter'));
-            }
-
-            throw error;
-        }
-    }
-
-    /**
-     * Perform the invalidate content function.
-     *
-     * @return Resolved when done.
-     */
-    invalidateContent(): Promise<void> {
-        return AddonModBook.invalidateContent(this.MODULE.id, this.COURSE_ID);
     }
 
 }
diff --git a/src/addons/mod/book/lang.json b/src/addons/mod/book/lang.json
index 200e96ce1..8b6812eb9 100644
--- a/src/addons/mod/book/lang.json
+++ b/src/addons/mod/book/lang.json
@@ -1,8 +1,9 @@
 {
+    "book:read": "View book",
     "errorchapter": "Error reading chapter of book.",
     "modulenameplural": "Books",
     "navnexttitle": "Next: {{$a}}",
     "navprevtitle": "Previous: {{$a}}",
     "tagarea_book_chapters": "Book chapters",
     "toc": "Table of contents"
-}
\ No newline at end of file
+}
diff --git a/src/addons/mod/book/pages/contents/contents.html b/src/addons/mod/book/pages/contents/contents.html
new file mode 100644
index 000000000..f5a6d6f4a
--- /dev/null
+++ b/src/addons/mod/book/pages/contents/contents.html
@@ -0,0 +1,53 @@
+<ion-header>
+    <ion-toolbar>
+        <ion-buttons slot="start">
+            <ion-back-button [text]="'core.back' | translate"></ion-back-button>
+        </ion-buttons>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="cmId" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
+        <ion-buttons slot="end">
+            <ion-button (click)="showToc()" [attr.aria-label]="'addon.mod_book.toc' | translate" aria-haspopup="true" *ngIf="loaded">
+                <ion-icon name="fas-bookmark" slot="icon-only" aria-hidden="true"></ion-icon>
+            </ion-button>
+        </ion-buttons>
+    </ion-toolbar>
+</ion-header>
+<ion-content>
+    <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="doRefresh($event.target)">
+        <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
+    </ion-refresher>
+
+    <core-loading [hideUntil]="loaded">
+
+        <ion-card class="core-warning-card" *ngIf="warning">
+            <ion-item>
+                <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
+                <ion-label><span [innerHTML]="warning"></span></ion-label>
+            </ion-item>
+        </ion-card>
+
+        <div class="safe-area-padding-horizontal">
+            <core-navigation-bar *ngIf="displayNavBar" [items]="navigationItems" [showTitles]="displayTitlesInNavBar"
+                previousTranslate="addon.mod_book.navprevtitle" nextTranslate="addon.mod_book.navnexttitle"
+                (action)="changeChapter($event.id)">
+            </core-navigation-bar>
+
+            <core-swipe-slides [manager]="manager" [options]="slidesOpts">
+                <ng-template let-chapter="item">
+                    <div class="ion-padding">
+                        <core-format-text [component]="component" [componentId]="cmId" [text]="chapter.content" contextLevel="module"
+                            [contextInstanceId]="cmId" [courseId]="courseId"></core-format-text>
+                        <div class="ion-margin-top" *ngIf="chapter.tags?.length > 0">
+                            <strong>{{ 'core.tag.tags' | translate }}: </strong>
+                            <core-tag-list [tags]="chapter.tags"></core-tag-list>
+                        </div>
+                    </div>
+                </ng-template>
+            </core-swipe-slides>
+        </div>
+    </core-loading>
+</ion-content>
diff --git a/src/addons/mod/book/pages/contents/contents.module.ts b/src/addons/mod/book/pages/contents/contents.module.ts
new file mode 100644
index 000000000..2c2bea53c
--- /dev/null
+++ b/src/addons/mod/book/pages/contents/contents.module.ts
@@ -0,0 +1,40 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { RouterModule, Routes } from '@angular/router';
+
+import { CoreSharedModule } from '@/core/shared.module';
+import { AddonModBookContentsPage } from './contents';
+import { CoreTagComponentsModule } from '@features/tag/components/components.module';
+
+const routes: Routes = [
+    {
+        path: '',
+        component: AddonModBookContentsPage,
+    },
+];
+
+@NgModule({
+    imports: [
+        RouterModule.forChild(routes),
+        CoreSharedModule,
+        CoreTagComponentsModule,
+    ],
+    declarations: [
+        AddonModBookContentsPage,
+    ],
+    exports: [RouterModule],
+})
+export class AddonModBookContentsPageModule {}
diff --git a/src/addons/mod/book/pages/contents/contents.ts b/src/addons/mod/book/pages/contents/contents.ts
new file mode 100644
index 000000000..de3de0c6f
--- /dev/null
+++ b/src/addons/mod/book/pages/contents/contents.ts
@@ -0,0 +1,428 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreConstants } from '@/core/constants';
+import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { CoreError } from '@classes/errors/error';
+import { CoreSwipeSlidesItemsManager } from '@classes/items-management/swipe-slides-items-manager';
+import { CoreSwipeSlidesItemsManagerSource } from '@classes/items-management/swipe-slides-items-manager-source';
+import { CoreNavigationBarItem } from '@components/navigation-bar/navigation-bar';
+import { CoreSwipeSlidesComponent, CoreSwipeSlidesOptions } from '@components/swipe-slides/swipe-slides';
+import { CoreCourseResourceDownloadResult } from '@features/course/classes/main-resource-component';
+import { CoreCourse } from '@features/course/services/course';
+import { CoreCourseModuleData } from '@features/course/services/course-helper';
+import { CoreCourseModulePrefetchDelegate } from '@features/course/services/module-prefetch-delegate';
+import { CoreTag, CoreTagItem } from '@features/tag/services/tag';
+import { IonRefresher } from '@ionic/angular';
+import { CoreApp } from '@services/app';
+import { CoreNavigator } from '@services/navigator';
+import { CoreDomUtils } from '@services/utils/dom';
+import { CoreTextUtils } from '@services/utils/text';
+import { CoreUtils } from '@services/utils/utils';
+import { Translate } from '@singletons';
+import { AddonModBookTocComponent } from '../../components/toc/toc';
+import {
+    AddonModBook,
+    AddonModBookBookWSData,
+    AddonModBookContentsMap,
+    AddonModBookNavStyle,
+    AddonModBookProvider,
+    AddonModBookTocChapter,
+} from '../../services/book';
+
+/**
+ * Page that displays a book contents.
+ */
+@Component({
+    selector: 'page-addon-mod-book-contents',
+    templateUrl: 'contents.html',
+})
+export class AddonModBookContentsPage implements OnInit, OnDestroy {
+
+    @ViewChild(CoreSwipeSlidesComponent) slides?: CoreSwipeSlidesComponent;
+
+    title!: string;
+    cmId!: number;
+    courseId!: number;
+    initialChapterId?: number;
+    component = AddonModBookProvider.COMPONENT;
+    manager?: CoreSwipeSlidesItemsManager<LoadedChapter, AddonModBookSlidesItemsManagerSource>;
+    warning = '';
+    displayNavBar = true;
+    navigationItems: CoreNavigationBarItem<AddonModBookTocChapter>[] = [];
+    displayTitlesInNavBar = false;
+    slidesOpts: CoreSwipeSlidesOptions = {
+        autoHeight: true,
+        scrollOnChange: 'top',
+    };
+
+    loaded = false;
+
+    protected firstLoad = true;
+    protected managerUnsubscribe?: () => void;
+
+    /**
+     * @inheritdoc
+     */
+    ngOnInit(): void {
+        try {
+            this.cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
+            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            this.initialChapterId = CoreNavigator.getRouteNumberParam('chapterId');
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
+        }
+
+        const source = new AddonModBookSlidesItemsManagerSource(
+            this.courseId,
+            this.cmId,
+            CoreTag.areTagsAvailableInSite(),
+            this.initialChapterId,
+        );
+        this.manager = new CoreSwipeSlidesItemsManager(source);
+        this.managerUnsubscribe = this.manager.addListener({
+            onSelectedItemUpdated: (item) => {
+                this.onChapterViewed(item.id);
+            },
+        });
+
+        this.fetchContent();
+    }
+
+    get module(): CoreCourseModuleData | undefined {
+        return this.manager?.getSource().module;
+    }
+
+    get book(): AddonModBookBookWSData | undefined {
+        return this.manager?.getSource().book;
+    }
+
+    get chapters(): AddonModBookTocChapter[] {
+        return this.manager?.getSource().chapters || [];
+    }
+
+    /**
+     * Download book contents and load the current chapter.
+     *
+     * @param refresh Whether we're refreshing data.
+     * @return Promise resolved when done.
+     */
+    protected async fetchContent(refresh = false): Promise<void> {
+        try {
+            const source = this.manager?.getSource();
+            if (!source) {
+                return;
+            }
+
+            const { module, book } = await source.loadBookData();
+
+            const downloadResult = await this.downloadResourceIfNeeded(module, refresh);
+
+            if (book) {
+                this.displayNavBar = book.navstyle != AddonModBookNavStyle.TOC_ONLY;
+                this.displayTitlesInNavBar = book.navstyle == AddonModBookNavStyle.TEXT;
+                this.title = book.name;
+            } else {
+                this.title = this.title || Translate.instant('addon.mod_book.book:read');
+            }
+
+            // Get contents. No need to refresh, it has been done in downloadResourceIfNeeded.
+            await source.loadContents();
+
+            await source.load();
+
+            if (downloadResult?.failed) {
+                const error = CoreTextUtils.getErrorMessageFromError(downloadResult.error) || downloadResult.error;
+                this.warning = Translate.instant('core.errordownloadingsomefiles') + (error ? ' ' + error : '');
+            } else {
+                this.warning = '';
+            }
+        } finally {
+            this.loaded = true;
+        }
+    }
+
+    /**
+     * Download a resource if needed.
+     * If the download call fails the promise won't be rejected, but the error will be included in the returned object.
+     * If module.contents cannot be loaded then the Promise will be rejected.
+     *
+     * @param refresh Whether we're refreshing data.
+     * @return Promise resolved when done.
+     */
+    protected async downloadResourceIfNeeded(
+        module: CoreCourseModuleData,
+        refresh = false,
+    ): Promise<CoreCourseResourceDownloadResult> {
+
+        const result: CoreCourseResourceDownloadResult = {
+            failed: false,
+        };
+        let contentsAlreadyLoaded = false;
+
+        // Get module status to determine if it needs to be downloaded.
+        const status = await CoreCourseModulePrefetchDelegate.getModuleStatus(module, this.courseId, undefined, refresh);
+
+        if (status !== CoreConstants.DOWNLOADED) {
+            // Download content. This function also loads module contents if needed.
+            try {
+                await CoreCourseModulePrefetchDelegate.downloadModule(module, this.courseId);
+
+                // If we reach here it means the download process already loaded the contents, no need to do it again.
+                contentsAlreadyLoaded = true;
+            } catch (error) {
+                // Mark download as failed but go on since the main files could have been downloaded.
+                result.failed = true;
+                result.error = error;
+            }
+        }
+
+        if (!module.contents?.length || (refresh && !contentsAlreadyLoaded)) {
+            // Try to load the contents.
+            const ignoreCache = refresh && CoreApp.isOnline();
+
+            try {
+                await CoreCourse.loadModuleContents(module, undefined, undefined, false, ignoreCache);
+            } catch (error) {
+                // Error loading contents. If we ignored cache, try to get the cached value.
+                if (ignoreCache && !module.contents) {
+                    await CoreCourse.loadModuleContents(module);
+                } else if (!module.contents) {
+                    // Not able to load contents, throw the error.
+                    throw error;
+                }
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * Change the current chapter.
+     *
+     * @param chapterId Chapter to load.
+     * @return Promise resolved when done.
+     */
+    changeChapter(chapterId: number): void {
+        if (!chapterId) {
+            return;
+        }
+
+        this.slides?.slideToItem({ id: chapterId });
+    }
+
+    /**
+     * Refresh the data.
+     *
+     * @param refresher Refresher.
+     * @return Promise resolved when done.
+     */
+    async doRefresh(refresher?: IonRefresher): Promise<void> {
+        if (this.manager) {
+            await CoreUtils.ignoreErrors(Promise.all([
+                this.manager.getSource().invalidateContent(),
+                CoreCourseModulePrefetchDelegate.invalidateCourseUpdates(this.courseId), // To detect if book was updated.
+            ]));
+        }
+
+        await CoreUtils.ignoreErrors(this.fetchContent(true));
+
+        refresher?.complete();
+    }
+
+    /**
+     * Show the TOC.
+     */
+    async showToc(): Promise<void> {
+        // Create the toc modal.
+        const visibleChapter = this.manager?.getSelectedItem();
+
+        const modalData = await CoreDomUtils.openSideModal<number>({
+            component: AddonModBookTocComponent,
+            componentProps: {
+                moduleId: this.cmId,
+                chapters: this.chapters,
+                selected: visibleChapter,
+                courseId: this.courseId,
+                book: this.book,
+            },
+        });
+
+        if (modalData) {
+            this.changeChapter(modalData);
+        }
+    }
+
+    /**
+     * Update data related to chapter being viewed.
+     *
+     * @param chapterId Chapter viewed.
+     * @return Promise resolved when done.
+     */
+    protected async onChapterViewed(chapterId: number): Promise<void> {
+        // Don't log the chapter ID when the user has just opened the book.
+        const logChapterId = this.firstLoad;
+        this.firstLoad = false;
+
+        if (this.displayNavBar) {
+            this.navigationItems = this.getNavigationItems(chapterId);
+        }
+
+        if (!this.module) {
+            return;
+        }
+
+        // Chapter loaded, log view.
+        await CoreUtils.ignoreErrors(AddonModBook.logView(
+            this.module.instance,
+            logChapterId ? chapterId : undefined,
+            this.module.name,
+        ));
+
+        const currentChapterIndex = this.chapters.findIndex((chapter) => chapter.id == chapterId);
+        const isLastChapter = currentChapterIndex < 0 || this.chapters[currentChapterIndex + 1] === undefined;
+
+        // Module is completed when last chapter is viewed, so we only check completion if the last is reached.
+        if (isLastChapter) {
+            CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
+        }
+    }
+
+    /**
+     * Converts chapters to navigation items.
+     *
+     * @param chapterId Current chapter Id.
+     * @return Navigation items.
+     */
+    protected getNavigationItems(chapterId: number): CoreNavigationBarItem<AddonModBookTocChapter>[] {
+        return this.chapters.map((chapter) => ({
+            item: chapter,
+            title: chapter.title,
+            current: chapter.id == chapterId,
+            enabled: true,
+        }));
+    }
+
+    /**
+     * @inheritdoc
+     */
+    ngOnDestroy(): void {
+        this.managerUnsubscribe && this.managerUnsubscribe();
+    }
+
+}
+
+type LoadedChapter = {
+    id: number;
+    content?: string;
+    tags?: CoreTagItem[];
+};
+
+/**
+ * Helper to manage swiping within a collection of chapters.
+ */
+class AddonModBookSlidesItemsManagerSource extends CoreSwipeSlidesItemsManagerSource<LoadedChapter> {
+
+    readonly COURSE_ID: number;
+    readonly CM_ID: number;
+    readonly TAGS_ENABLED: boolean;
+
+    module?: CoreCourseModuleData;
+    book?: AddonModBookBookWSData;
+    chapters: AddonModBookTocChapter[] = [];
+    contentsMap: AddonModBookContentsMap = {};
+
+    constructor(courseId: number, cmId: number, tagsEnabled: boolean, initialChapterId?: number) {
+        super(initialChapterId ? { id: initialChapterId } : undefined);
+
+        this.COURSE_ID = courseId;
+        this.CM_ID = cmId;
+        this.TAGS_ENABLED = tagsEnabled;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    getItemId(item: LoadedChapter): string | number {
+        return item.id;
+    }
+
+    /**
+     * Load book data from WS.
+     *
+     * @return Promise resolved when done.
+     */
+    async loadBookData(): Promise<{ module: CoreCourseModuleData; book: AddonModBookBookWSData }> {
+        this.module = await CoreCourse.getModule(this.CM_ID, this.COURSE_ID);
+        this.book = await AddonModBook.getBook(this.COURSE_ID, this.CM_ID);
+
+        return {
+            module: this.module,
+            book: this.book,
+        };
+    }
+
+    /**
+     * Load module contents.
+     */
+    async loadContents(): Promise<void> {
+        if (!this.module) {
+            return;
+        }
+
+        const contents = await CoreCourse.getModuleContents(this.module, this.COURSE_ID);
+
+        this.contentsMap = AddonModBook.getContentsMap(contents);
+        this.chapters = AddonModBook.getTocList(contents);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected async loadItems(): Promise<LoadedChapter[]> {
+        try {
+            const newChapters = await Promise.all(this.chapters.map(async (chapter) => {
+                const content = await AddonModBook.getChapterContent(this.contentsMap, chapter.id, this.CM_ID);
+
+                return {
+                    id: chapter.id,
+                    content,
+                    tags: this.TAGS_ENABLED ? this.contentsMap[chapter.id].tags : [],
+                };
+            }));
+
+            return newChapters;
+        } catch (error) {
+            if (!CoreTextUtils.getErrorMessageFromError(error)) {
+                throw new CoreError(Translate.instant('addon.mod_book.errorchapter'));
+            }
+
+            throw error;
+        }
+    }
+
+    /**
+     * Perform the invalidate content function.
+     *
+     * @return Resolved when done.
+     */
+    invalidateContent(): Promise<void> {
+        return AddonModBook.invalidateContent(this.CM_ID, this.COURSE_ID);
+    }
+
+}
diff --git a/src/addons/mod/book/pages/index/index.html b/src/addons/mod/book/pages/index/index.html
index 2c06606d2..b09bfab96 100644
--- a/src/addons/mod/book/pages/index/index.html
+++ b/src/addons/mod/book/pages/index/index.html
@@ -19,6 +19,6 @@
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
-    <addon-mod-book-index [module]="module" [courseId]="courseId" [initialChapterId]="chapterId" (dataRetrieved)="updateData($event)">
+    <addon-mod-book-index [module]="module" [courseId]="courseId" (dataRetrieved)="updateData($event)">
     </addon-mod-book-index>
 </ion-content>
diff --git a/src/addons/mod/book/pages/index/index.page.ts b/src/addons/mod/book/pages/index/index.page.ts
index e361ca8ba..81fc1fa66 100644
--- a/src/addons/mod/book/pages/index/index.page.ts
+++ b/src/addons/mod/book/pages/index/index.page.ts
@@ -12,30 +12,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, OnInit, ViewChild } from '@angular/core';
+import { Component, ViewChild } from '@angular/core';
 import { CoreCourseModuleMainActivityPage } from '@features/course/classes/main-activity-page';
-import { CoreNavigator } from '@services/navigator';
 import { AddonModBookIndexComponent } from '../../components/index/index';
 
 /**
- * Page that displays a book.
+ * Page that displays a book entry page.
  */
 @Component({
     selector: 'page-addon-mod-book-index',
     templateUrl: 'index.html',
 })
-export class AddonModBookIndexPage extends CoreCourseModuleMainActivityPage<AddonModBookIndexComponent> implements OnInit {
+export class AddonModBookIndexPage extends CoreCourseModuleMainActivityPage<AddonModBookIndexComponent> {
 
     @ViewChild(AddonModBookIndexComponent) activityComponent?: AddonModBookIndexComponent;
 
-    chapterId?: number;
-
-    /**
-     * Component being initialized.
-     */
-    ngOnInit(): void {
-        super.ngOnInit();
-        this.chapterId = CoreNavigator.getRouteNumberParam('chapterId');
-    }
-
 }

From 52e10ea15dad9239d6664fefa1278f99c489861c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 15 Feb 2022 12:45:54 +0100
Subject: [PATCH 0538/1008] MOBILE-3980 book: Open book contents when clicking
 link

---
 .../assign/services/handlers/push-click.ts    |  5 +-
 .../mod/book/services/handlers/index-link.ts  | 29 ++++--
 .../feedback/services/handlers/push-click.ts  |  5 +-
 .../lesson/services/handlers/grade-link.ts    |  6 +-
 .../lesson/services/handlers/index-link.ts    | 16 +++-
 .../mod/quiz/services/handlers/push-click.ts  |  5 +-
 .../classes/module-grade-handler.ts           |  9 +-
 .../classes/module-index-handler.ts           | 51 +++++++---
 src/core/features/course/pages/index/index.ts | 18 +++-
 .../features/course/services/course-helper.ts | 96 +++++++++++--------
 .../features/sitehome/pages/index/index.ts    | 13 ++-
 upgrade.txt                                   |  1 +
 12 files changed, 178 insertions(+), 76 deletions(-)

diff --git a/src/addons/mod/assign/services/handlers/push-click.ts b/src/addons/mod/assign/services/handlers/push-click.ts
index 1973435e2..1b5714c8c 100644
--- a/src/addons/mod/assign/services/handlers/push-click.ts
+++ b/src/addons/mod/assign/services/handlers/push-click.ts
@@ -54,7 +54,10 @@ export class AddonModAssignPushClickHandlerService implements CorePushNotificati
         const moduleId = Number(contextUrlParams.id);
 
         await CoreUtils.ignoreErrors(AddonModAssign.invalidateContent(moduleId, courseId, notification.site));
-        await CoreCourseHelper.navigateToModule(moduleId, notification.site, courseId);
+        await CoreCourseHelper.navigateToModule(moduleId, {
+            courseId,
+            siteId: notification.site,
+        });
     }
 
 }
diff --git a/src/addons/mod/book/services/handlers/index-link.ts b/src/addons/mod/book/services/handlers/index-link.ts
index c0b5389ce..83015b7ef 100644
--- a/src/addons/mod/book/services/handlers/index-link.ts
+++ b/src/addons/mod/book/services/handlers/index-link.ts
@@ -15,6 +15,7 @@
 import { Injectable } from '@angular/core';
 import { Params } from '@angular/router';
 import { CoreContentLinksModuleIndexHandler } from '@features/contentlinks/classes/module-index-handler';
+import { CoreNavigationOptions } from '@services/navigator';
 import { makeSingleton } from '@singletons';
 import { AddonModBook } from '../book';
 
@@ -31,20 +32,32 @@ export class AddonModBookIndexLinkHandlerService extends CoreContentLinksModuleI
     }
 
     /**
-     * Get the mod params necessary to open an activity.
-     *
-     * @param url      The URL to treat.
-     * @param params   The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @return List of params to pass to navigateToModule / navigateToModuleByInstance.
+     * @inheritdoc
+     */
+    getModNavOptions(url: string, params: Record<string, string>): CoreNavigationOptions {
+        const chapterId = params.chapterid ? parseInt(params.chapterid, 10) : undefined;
+
+        return {
+            nextNavigation: {
+                path: 'contents',
+                options: {
+                    params: {
+                        chapterId,
+                    },
+                },
+            },
+        };
+    }
+
+    /**
+     * @inheritdoc
      */
     getPageParams(url: string, params: Record<string, string>): Params {
         return params.chapterid ? { chapterId: parseInt(params.chapterid, 10) } : {};
     }
 
     /**
-     * Check if the handler is enabled for a certain site (site + user) and a URL.
-     *
-     * @return Whether the handler is enabled for the URL and site.
+     * @inheritdoc
      */
     isEnabled(siteId: string): Promise<boolean> {
         return AddonModBook.isPluginEnabled(siteId);
diff --git a/src/addons/mod/feedback/services/handlers/push-click.ts b/src/addons/mod/feedback/services/handlers/push-click.ts
index e736768db..02ad4aedb 100644
--- a/src/addons/mod/feedback/services/handlers/push-click.ts
+++ b/src/addons/mod/feedback/services/handlers/push-click.ts
@@ -55,7 +55,10 @@ export class AddonModFeedbackPushClickHandlerService implements CorePushNotifica
         if (notification.name == 'submission') {
             return AddonModFeedbackHelper.handleShowEntriesLink(contextUrlParams, notification.site);
         } else {
-            return CoreCourseHelper.navigateToModule(moduleId, notification.site, courseId);
+            return CoreCourseHelper.navigateToModule(moduleId, {
+                courseId,
+                siteId: notification.site,
+            });
         }
     }
 
diff --git a/src/addons/mod/lesson/services/handlers/grade-link.ts b/src/addons/mod/lesson/services/handlers/grade-link.ts
index bc16a1ef5..c1da1506d 100644
--- a/src/addons/mod/lesson/services/handlers/grade-link.ts
+++ b/src/addons/mod/lesson/services/handlers/grade-link.ts
@@ -76,7 +76,11 @@ export class AddonModLessonGradeLinkHandlerService extends CoreContentLinksModul
                 );
             } else {
                 // User cannot view the report, go to lesson index.
-                CoreCourseHelper.navigateToModule(moduleId, siteId, module.course, module.section);
+                CoreCourseHelper.navigateToModule(moduleId, {
+                    courseId: module.course,
+                    sectionId: module.section,
+                    siteId,
+                });
             }
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'core.course.errorgetmodule', true);
diff --git a/src/addons/mod/lesson/services/handlers/index-link.ts b/src/addons/mod/lesson/services/handlers/index-link.ts
index 21be65658..5c0f88f6a 100644
--- a/src/addons/mod/lesson/services/handlers/index-link.ts
+++ b/src/addons/mod/lesson/services/handlers/index-link.ts
@@ -61,7 +61,10 @@ export class AddonModLessonIndexLinkHandlerService extends CoreContentLinksModul
                 if (params.userpassword) {
                     this.navigateToModuleWithPassword(parseInt(params.id, 10), courseId!, params.userpassword, siteId);
                 } else {
-                    CoreCourseHelper.navigateToModule(parseInt(params.id, 10), siteId, courseId);
+                    CoreCourseHelper.navigateToModule(parseInt(params.id, 10), {
+                        courseId,
+                        siteId,
+                    });
                 }
             },
         }];
@@ -94,10 +97,17 @@ export class AddonModLessonIndexLinkHandlerService extends CoreContentLinksModul
             // Store the password so it's automatically used.
             await CoreUtils.ignoreErrors(AddonModLesson.storePassword(module.instance, password, siteId));
 
-            await CoreCourseHelper.navigateToModule(moduleId, siteId, module.course, module.section);
+            await CoreCourseHelper.navigateToModule(moduleId, {
+                courseId: module.course,
+                sectionId: module.section,
+                siteId,
+            });
         } catch {
             // Error, go to index page.
-            await CoreCourseHelper.navigateToModule(moduleId, siteId, courseId);
+            await CoreCourseHelper.navigateToModule(moduleId, {
+                courseId,
+                siteId,
+            });
         } finally {
             modal.dismiss();
         }
diff --git a/src/addons/mod/quiz/services/handlers/push-click.ts b/src/addons/mod/quiz/services/handlers/push-click.ts
index 7144d7a03..05492395a 100644
--- a/src/addons/mod/quiz/services/handlers/push-click.ts
+++ b/src/addons/mod/quiz/services/handlers/push-click.ts
@@ -72,7 +72,10 @@ export class AddonModQuizPushClickHandlerService implements CorePushNotification
 
         await CoreUtils.ignoreErrors(AddonModQuiz.invalidateContent(moduleId, courseId, notification.site));
 
-        return CoreCourseHelper.navigateToModule(moduleId, notification.site, courseId);
+        return CoreCourseHelper.navigateToModule(moduleId, {
+            courseId,
+            siteId: notification.site,
+        });
     }
 
 }
diff --git a/src/core/features/contentlinks/classes/module-grade-handler.ts b/src/core/features/contentlinks/classes/module-grade-handler.ts
index 1b3b8f29b..cce3bad41 100644
--- a/src/core/features/contentlinks/classes/module-grade-handler.ts
+++ b/src/core/features/contentlinks/classes/module-grade-handler.ts
@@ -78,10 +78,11 @@ export class CoreContentLinksModuleGradeHandler extends CoreContentLinksHandlerB
                     // No user specified or current user. Navigate to module.
                     CoreCourseHelper.navigateToModule(
                         Number(params.id),
-                        siteId,
-                        courseId,
-                        undefined,
-                        this.useModNameToGetModule ? this.modName : undefined,
+                        {
+                            courseId,
+                            modName: this.useModNameToGetModule ? this.modName : undefined,
+                            siteId,
+                        },
                     );
                 } else if (this.canReview) {
                     // Use the goToReview function.
diff --git a/src/core/features/contentlinks/classes/module-index-handler.ts b/src/core/features/contentlinks/classes/module-index-handler.ts
index 5efc4c83a..384d37155 100644
--- a/src/core/features/contentlinks/classes/module-index-handler.ts
+++ b/src/core/features/contentlinks/classes/module-index-handler.ts
@@ -16,6 +16,7 @@ import { CoreContentLinksHandlerBase } from './base-handler';
 import { Params } from '@angular/router';
 import { CoreContentLinksAction } from '../services/contentlinks-delegate';
 import { CoreCourseHelper } from '@features/course/services/course-helper';
+import { CoreNavigationOptions } from '@services/navigator';
 
 /**
  * Handler to handle URLs pointing to the index of a module.
@@ -58,12 +59,27 @@ export class CoreContentLinksModuleIndexHandler extends CoreContentLinksHandlerB
      * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
      * @param courseId Course ID related to the URL. Optional but recommended.
      * @return List of params to pass to navigateToModule / navigateToModuleByInstance.
+     * @deprecated since 4.0
      */
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     getPageParams(url: string, params: Record<string, string>, courseId?: number): Params {
         return {};
     }
 
+    /**
+     * Get the navigation options to open the module.
+     *
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param siteId The site ID.
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Navigation options to open the module.
+     */
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    getModNavOptions(url: string, params: Record<string, string>, siteId: string, courseId?: number): CoreNavigationOptions {
+        return {};
+    }
+
     /**
      * Get the list of actions for a link (url).
      *
@@ -81,7 +97,18 @@ export class CoreContentLinksModuleIndexHandler extends CoreContentLinksHandlerB
     ): CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
 
         courseId = Number(courseId || params.courseid || params.cid);
-        const pageParams = this.getPageParams(url, params, courseId);
+        const getModNavOptions = (siteId: string): CoreNavigationOptions => {
+            let modNavOptions = this.getModNavOptions(url, params, siteId, courseId);
+            if (!modNavOptions) {
+                // Use the old function, currently deprecated.
+                const pageParams = this.getPageParams(url, params, courseId);
+                if (pageParams && Object.keys(pageParams).length > 0) {
+                    modNavOptions = { params: pageParams };
+                }
+            }
+
+            return modNavOptions;
+        };
 
         if (this.instanceIdParam && params[this.instanceIdParam] !== undefined) {
             const instanceId = parseInt(params[this.instanceIdParam], 10);
@@ -91,11 +118,12 @@ export class CoreContentLinksModuleIndexHandler extends CoreContentLinksHandlerB
                     CoreCourseHelper.navigateToModuleByInstance(
                         instanceId,
                         this.modName,
-                        siteId,
-                        courseId,
-                        undefined,
-                        this.useModNameToGetModule,
-                        pageParams,
+                        {
+                            courseId,
+                            useModNameToGetModule: this.useModNameToGetModule,
+                            modNavOptions: getModNavOptions(siteId),
+                            siteId,
+                        },
                     );
                 },
             }];
@@ -105,11 +133,12 @@ export class CoreContentLinksModuleIndexHandler extends CoreContentLinksHandlerB
             action: (siteId) => {
                 CoreCourseHelper.navigateToModule(
                     parseInt(params.id, 10),
-                    siteId,
-                    courseId,
-                    undefined,
-                    this.useModNameToGetModule ? this.modName : undefined,
-                    pageParams,
+                    {
+                        courseId,
+                        modName: this.useModNameToGetModule ? this.modName : undefined,
+                        modNavOptions: getModNavOptions(siteId),
+                        siteId,
+                    },
                 );
             },
         }];
diff --git a/src/core/features/course/pages/index/index.ts b/src/core/features/course/pages/index/index.ts
index 449058e33..9991c008d 100644
--- a/src/core/features/course/pages/index/index.ts
+++ b/src/core/features/course/pages/index/index.ts
@@ -24,7 +24,7 @@ import { CoreCourse, CoreCourseModuleCompletionStatus, CoreCourseWSSection } fro
 import { CoreCourseHelper, CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreTextUtils } from '@services/utils/text';
-import { CoreNavigator } from '@services/navigator';
+import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
 import { CONTENTS_PAGE_NAME } from '@features/course/course.module';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreCollapsibleHeaderDirective } from '@directives/collapsible-header';
@@ -57,7 +57,7 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
     protected sections: CoreCourseWSSection[] = []; // List of course sections.
     protected firstTabName?: string;
     protected module?: CoreCourseModuleData;
-    protected modParams?: Params;
+    protected modNavOptions?: CoreNavigationOptions;
     protected isGuest = false;
     protected contentsTab: CoreTabsOutletTab & { pageParams: Params } = {
         page: CONTENTS_PAGE_NAME,
@@ -136,8 +136,15 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
 
         this.firstTabName = CoreNavigator.getRouteParam('selectedTab');
         this.module = CoreNavigator.getRouteParam<CoreCourseModuleData>('module');
-        this.modParams = CoreNavigator.getRouteParam<Params>('modParams');
         this.isGuest = !!CoreNavigator.getRouteBooleanParam('isGuest');
+        this.modNavOptions = CoreNavigator.getRouteParam<CoreNavigationOptions>('modNavOptions');
+        if (!this.modNavOptions) {
+            // Fallback to old way of passing params. @deprecated since 4.0.
+            const modParams = CoreNavigator.getRouteParam<Params>('modParams');
+            if (modParams) {
+                this.modNavOptions = { params: modParams };
+            }
+        }
 
         this.currentPagePath = CoreNavigator.getCurrentPath();
         this.contentsTab.page = CoreTextUtils.concatenatePaths(this.currentPagePath, this.contentsTab.page);
@@ -171,7 +178,10 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
             return;
         }
         // Now that the first tab has been selected we can load the module.
-        CoreCourseHelper.openModule(this.module, this.course.id, this.contentsTab.pageParams.sectionId, this.modParams);
+        CoreCourseHelper.openModule(this.module, this.course.id, {
+            sectionId: this.contentsTab.pageParams.sectionId,
+            modNavOptions: this.modNavOptions,
+        });
 
         delete this.module;
     }
diff --git a/src/core/features/course/services/course-helper.ts b/src/core/features/course/services/course-helper.ts
index d0e16d0c2..93c8b0ca6 100644
--- a/src/core/features/course/services/course-helper.ts
+++ b/src/core/features/course/services/course-helper.ts
@@ -1573,36 +1573,27 @@ export class CoreCourseHelperProvider {
      *
      * @param instanceId Activity instance ID.
      * @param modName Module name of the activity.
-     * @param siteId Site ID. If not defined, current site.
-     * @param courseId Course ID. If not defined we'll try to retrieve it from the site.
-     * @param sectionId Section the module belongs to. If not defined we'll try to retrieve it from the site.
-     * @param useModNameToGetModule If true, the app will retrieve all modules of this type with a single WS call. This reduces the
-     *                              number of WS calls, but it isn't recommended for modules that can return a lot of contents.
-     * @param modParams Params to pass to the module
+     * @param options Other options.
      * @return Promise resolved when done.
      */
     async navigateToModuleByInstance(
         instanceId: number,
         modName: string,
-        siteId?: string,
-        courseId?: number,
-        sectionId?: number,
-        useModNameToGetModule: boolean = false,
-        modParams?: Params,
+        options: CoreCourseNavigateToModuleByInstanceOptions = {},
     ): Promise<void> {
 
         const modal = await CoreDomUtils.showModalLoading();
 
         try {
-            const module = await CoreCourse.getModuleBasicInfoByInstance(instanceId, modName, { siteId });
+            const module = await CoreCourse.getModuleBasicInfoByInstance(instanceId, modName, { siteId: options.siteId });
 
             this.navigateToModule(
                 module.id,
-                siteId,
-                module.course,
-                sectionId,
-                useModNameToGetModule ? modName : undefined,
-                modParams,
+                {
+                    ...options,
+                    courseId: module.course,
+                    modName: options.useModNameToGetModule ? modName : undefined,
+                },
             );
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'core.course.errorgetmodule', true);
@@ -1616,23 +1607,16 @@ export class CoreCourseHelperProvider {
      * Navigate to a module.
      *
      * @param moduleId Module's ID.
-     * @param siteId Site ID. If not defined, current site.
-     * @param courseId Course ID. If not defined we'll try to retrieve it from the site.
-     * @param sectionId Section the module belongs to. If not defined we'll try to retrieve it from the site.
-     * @param modName If set, the app will retrieve all modules of this type with a single WS call. This reduces the
-     *                number of WS calls, but it isn't recommended for modules that can return a lot of contents.
-     * @param modParams Params to pass to the module
+     * @param options Other options.
      * @return Promise resolved when done.
      */
     async navigateToModule(
         moduleId: number,
-        siteId?: string,
-        courseId?: number,
-        sectionId?: number,
-        modName?: string,
-        modParams?: Params,
+        options: CoreCourseNavigateToModuleOptions = {},
     ): Promise<void> {
-        siteId = siteId || CoreSites.getCurrentSiteId();
+        const siteId = options.siteId || CoreSites.getCurrentSiteId();
+        let courseId = options.courseId;
+        let sectionId = options.sectionId;
 
         const modal = await CoreDomUtils.showModalLoading();
 
@@ -1651,10 +1635,9 @@ export class CoreCourseHelperProvider {
             const site = await CoreSites.getSite(siteId);
 
             // Get the module.
-            const module =
-                await CoreCourse.getModule(moduleId, courseId, sectionId, false, false, siteId, modName);
+            const module = await CoreCourse.getModule(moduleId, courseId, sectionId, false, false, siteId, options.modName);
 
-            if (CoreSites.getCurrentSiteId() == site.getId()) {
+            if (CoreSites.getCurrentSiteId() === site.getId()) {
                 // Try to use the module's handler to navigate cleanly.
                 module.handlerData = await CoreCourseModuleDelegate.getModuleDataFor(
                     module.modname,
@@ -1667,7 +1650,7 @@ export class CoreCourseHelperProvider {
                 if (module.handlerData?.action) {
                     modal.dismiss();
 
-                    return module.handlerData.action(new Event('click'), module, courseId, { params: modParams });
+                    return module.handlerData.action(new Event('click'), module, courseId, options.modNavOptions);
                 }
             }
 
@@ -1675,7 +1658,7 @@ export class CoreCourseHelperProvider {
                 course: { id: courseId },
                 module,
                 sectionId,
-                modParams,
+                modNavOptions: options.modNavOptions,
             };
 
             if (courseId == site.getSiteHomeId()) {
@@ -1704,23 +1687,25 @@ export class CoreCourseHelperProvider {
      *
      * @param module The module to open.
      * @param courseId The course ID of the module.
-     * @param sectionId The section ID of the module.
-     * @param modParams Params to pass to the module
+     * @param options Other options.
      * @param True if module can be opened, false otherwise.
      */
-    async openModule(module: CoreCourseModuleData, courseId: number, sectionId?: number, modParams?: Params): Promise<boolean> {
+    async openModule(module: CoreCourseModuleData, courseId: number, options: CoreCourseOpenModuleOptions = {}): Promise<boolean> {
         if (!module.handlerData) {
             module.handlerData = await CoreCourseModuleDelegate.getModuleDataFor(
                 module.modname,
                 module,
                 courseId,
-                sectionId,
+                options.sectionId,
                 false,
             );
         }
 
         if (module.handlerData?.action) {
-            module.handlerData.action(new Event('click'), module, courseId, { animated: false, params: modParams });
+            module.handlerData.action(new Event('click'), module, courseId, {
+                animated: false,
+                ...options.modNavOptions,
+            });
 
             return true;
         }
@@ -2206,6 +2191,39 @@ export type CoreCourseConfirmPrefetchCoursesOptions = CoreCoursePrefetchCoursesO
     onProgress?: (data: CoreCourseCoursesProgress) => void;
 };
 
+/**
+ * Common options for navigate to module functions.
+ */
+type CoreCourseNavigateToModuleCommonOptions = {
+    courseId?: number; // Course ID. If not defined we'll try to retrieve it from the site.
+    sectionId?: number; // Section the module belongs to. If not defined we'll try to retrieve it from the site.
+    modNavOptions?: CoreNavigationOptions; // Navigation options to open the module, including params to pass to the module.
+    siteId?: string; // Site ID. If not defined, current site.
+};
+
+/**
+ * Options for navigate to module by instance function.
+ */
+export type CoreCourseNavigateToModuleByInstanceOptions = CoreCourseNavigateToModuleCommonOptions & {
+    // True to retrieve all instances with a single WS call. Not recommended if can return a lot of contents.
+    useModNameToGetModule?: boolean;
+};
+
+/**
+ * Options for navigate to module function.
+ */
+export type CoreCourseNavigateToModuleOptions = CoreCourseNavigateToModuleCommonOptions & {
+    modName?: string; // To retrieve all instances with a single WS call. Not recommended if can return a lot of contents.
+};
+
+/**
+ * Options for open module function.
+ */
+export type CoreCourseOpenModuleOptions = {
+    sectionId?: number; // Section the module belongs to.
+    modNavOptions?: CoreNavigationOptions; // Navigation options to open the module, including params to pass to the module.
+};
+
 type ComponentWithContextMenu = {
     prefetchStatusIcon?: string;
     isDestroyed?: boolean;
diff --git a/src/core/features/sitehome/pages/index/index.ts b/src/core/features/sitehome/pages/index/index.ts
index b58998e07..087589a5d 100644
--- a/src/core/features/sitehome/pages/index/index.ts
+++ b/src/core/features/sitehome/pages/index/index.ts
@@ -26,7 +26,7 @@ import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreCourseHelper, CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate';
 import { CoreCourseModulePrefetchDelegate } from '@features/course/services/module-prefetch-delegate';
-import { CoreNavigator } from '@services/navigator';
+import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
 import { CoreBlockHelper } from '@features/block/services/block-helper';
 import { CoreUtils } from '@services/utils/utils';
 
@@ -73,8 +73,15 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
 
         const module = CoreNavigator.getRouteParam<CoreCourseModuleData>('module');
         if (module) {
-            const modParams = CoreNavigator.getRouteParam<Params>('modParams');
-            CoreCourseHelper.openModule(module, this.siteHomeId, undefined, modParams);
+            let modNavOptions = CoreNavigator.getRouteParam<CoreNavigationOptions>('modNavOptions');
+            if (!modNavOptions) {
+                // Fallback to old way of passing params. @deprecated since 4.0.
+                const modParams = CoreNavigator.getRouteParam<Params>('modParams');
+                if (modParams) {
+                    modNavOptions = { params: modParams };
+                }
+            }
+            CoreCourseHelper.openModule(module, this.siteHomeId, { modNavOptions });
         }
 
         this.loadContent().finally(() => {
diff --git a/upgrade.txt b/upgrade.txt
index e943d0f93..4755f12ea 100644
--- a/upgrade.txt
+++ b/upgrade.txt
@@ -19,6 +19,7 @@ information provided here is intended especially for developers.
 - displaySectionSelector has been deprecated on CoreCourseFormatHandler, use displayCourseIndex instead.
 - Most of the functions or callbacks that handle redirects/deeplinks have been modified to accept an object instead of just path + options. E.g.: CoreLoginHelper.isSiteLoggedOut, CoreLoginHelper.openBrowserForSSOLogin, CoreLoginHelper.openBrowserForOAuthLogin, CoreLoginHelper.prepareForSSOLogin, CoreApp.storeRedirect, CoreSites.loadSite.
 - Course preview page route has changed from course/:courseId/preview to course/:courseId/summary to match with the page name and characteristics.
+- The parameters of the following functions in CoreCourseHelper have changed: navigateToModuleByInstance, navigateToModule, openModule.
 
 === 3.9.5 ===
 

From 5f3e7bb0b58c703d2d8aae8f82e9581b8f3f9c97 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 15 Feb 2022 14:42:23 +0100
Subject: [PATCH 0539/1008] MOBILE-3980 mod: Fix print [object...] in error
 download files

---
 src/core/features/course/classes/main-resource-component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/features/course/classes/main-resource-component.ts b/src/core/features/course/classes/main-resource-component.ts
index 24964fc75..625278153 100644
--- a/src/core/features/course/classes/main-resource-component.ts
+++ b/src/core/features/course/classes/main-resource-component.ts
@@ -295,7 +295,7 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
                 error,
             ]);
         } else {
-            error = CoreTextUtils.getErrorMessageFromError(error) || error;
+            error = CoreTextUtils.getErrorMessageFromError(error) || '';
 
             return Translate.instant('core.errordownloadingsomefiles') + (error ? ' ' + error : '');
         }

From 1b67036aca4fb4cc4dfe30e2a382c51b82527eab Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 16 Feb 2022 08:18:36 +0100
Subject: [PATCH 0540/1008] MOBILE-3980 book: Support resuming a book

---
 scripts/langindex.json                        |  4 +-
 .../calendar/services/database/calendar.ts    |  2 +-
 src/addons/mod/book/book.module.ts            |  7 +++
 .../index/addon-mod-book-index.html           |  3 +-
 src/addons/mod/book/components/index/index.ts | 51 ++++++++++++++-----
 src/addons/mod/book/lang.json                 |  1 -
 .../mod/book/pages/contents/contents.ts       | 23 ++++++---
 src/addons/mod/book/services/book.ts          | 50 ++++++++++++++++++
 src/addons/mod/book/services/database/book.ts | 46 +++++++++++++++++
 src/core/lang.json                            |  1 +
 10 files changed, 162 insertions(+), 26 deletions(-)
 create mode 100644 src/addons/mod/book/services/database/book.ts

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 5a733c08e..18d1bdd5c 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -450,7 +450,6 @@
   "addon.mod_bigbluebuttonbn.view_message_session_started_at": "bigbluebuttonbn",
   "addon.mod_bigbluebuttonbn.view_message_viewer": "bigbluebuttonbn",
   "addon.mod_bigbluebuttonbn.view_message_viewers": "bigbluebuttonbn",
-  "addon.mod_book.book:read": "book",
   "addon.mod_book.errorchapter": "book",
   "addon.mod_book.modulenameplural": "book",
   "addon.mod_book.navnexttitle": "book",
@@ -2127,6 +2126,7 @@
   "core.resources": "moodle",
   "core.restore": "moodle",
   "core.restricted": "moodle",
+  "core.resume": "local_moodlemobileapp",
   "core.retry": "local_moodlemobileapp",
   "core.save": "moodle",
   "core.savechanges": "assign",
@@ -2253,7 +2253,7 @@
   "core.sorry": "local_moodlemobileapp",
   "core.sort": "moodle",
   "core.sortby": "moodle",
-  "core.start": "grouptool",
+  "core.start": "local_moodlemobileapp",
   "core.storingfiles": "local_moodlemobileapp",
   "core.strftimedate": "langconfig",
   "core.strftimedatefullshort": "langconfig",
diff --git a/src/addons/calendar/services/database/calendar.ts b/src/addons/calendar/services/database/calendar.ts
index 359f9ea4b..b21928140 100644
--- a/src/addons/calendar/services/database/calendar.ts
+++ b/src/addons/calendar/services/database/calendar.ts
@@ -19,7 +19,7 @@ import { CoreUtils } from '@services/utils/utils';
 import { AddonCalendar, AddonCalendarEventType, AddonCalendarProvider } from '../calendar';
 
 /**
- * Database variables for AddonDatabase service.
+ * Database variables for AddonCalendarProvider service.
  */
 export const EVENTS_TABLE = 'addon_calendar_events_3';
 export const REMINDERS_TABLE = 'addon_calendar_reminders';
diff --git a/src/addons/mod/book/book.module.ts b/src/addons/mod/book/book.module.ts
index 3ac80f207..351e3ee18 100644
--- a/src/addons/mod/book/book.module.ts
+++ b/src/addons/mod/book/book.module.ts
@@ -26,6 +26,8 @@ import { AddonModBookListLinkHandler } from './services/handlers/list-link';
 import { AddonModBookPrefetchHandler } from './services/handlers/prefetch';
 import { AddonModBookTagAreaHandler } from './services/handlers/tag-area';
 import { AddonModBookProvider } from './services/book';
+import { CORE_SITE_SCHEMAS } from '@services/sites';
+import { BOOK_SITE_SCHEMA } from './services/database/book';
 
 export const ADDON_MOD_BOOK_SERVICES: Type<unknown>[] = [
     AddonModBookProvider,
@@ -44,6 +46,11 @@ const routes: Routes = [
         AddonModBookComponentsModule,
     ],
     providers: [
+        {
+            provide: CORE_SITE_SCHEMAS,
+            useValue: [BOOK_SITE_SCHEMA],
+            multi: true,
+        },
         {
             provide: APP_INITIALIZER,
             multi: true,
diff --git a/src/addons/mod/book/components/index/addon-mod-book-index.html b/src/addons/mod/book/components/index/addon-mod-book-index.html
index a87c06a88..0ebdcb21f 100644
--- a/src/addons/mod/book/components/index/addon-mod-book-index.html
+++ b/src/addons/mod/book/components/index/addon-mod-book-index.html
@@ -45,7 +45,8 @@
         </ion-item>
 
         <ion-button class="ion-margin" expand="block" (click)="openBook()">
-            {{ 'addon.mod_book.book:read' | translate }}
+            <span *ngIf="!hasStartedBook">{{ 'core.start' | translate }}</span>
+            <span *ngIf="hasStartedBook">{{ 'core.resume' | translate }}</span>
         </ion-button>
 
     </ion-list>
diff --git a/src/addons/mod/book/components/index/index.ts b/src/addons/mod/book/components/index/index.ts
index 35f24bbd2..4ef609091 100644
--- a/src/addons/mod/book/components/index/index.ts
+++ b/src/addons/mod/book/components/index/index.ts
@@ -32,6 +32,7 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
     addPadding = true;
     showBullets = false;
     chapters: AddonModBookTocChapter[] = [];
+    hasStartedBook = false;
 
     protected book?: AddonModBookBookWSData;
 
@@ -53,25 +54,45 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
      */
     protected async fetchContent(refresh?: boolean): Promise<void> {
         try {
-            this.book = await AddonModBook.getBook(this.courseId, this.module.id);
-
-            if (this.book) {
-                this.dataRetrieved.emit(this.book);
-
-                this.description = this.book.intro;
-                this.showNumbers = this.book.numbering == AddonModBookNumbering.NUMBERS;
-                this.showBullets = this.book.numbering == AddonModBookNumbering.BULLETS;
-                this.addPadding = this.book.numbering != AddonModBookNumbering.NONE;
-            }
-
-            const contents = await CoreCourse.getModuleContents(this.module, this.courseId);
-
-            this.chapters = AddonModBook.getTocList(contents);
+            await Promise.all([
+                this.loadBook(),
+                this.loadTOC(),
+            ]);
         } finally {
             this.fillContextMenu(refresh);
         }
     }
 
+    /**
+     * Load book data.
+     *
+     * @return Promise resolved when done.
+     */
+    protected async loadBook(): Promise<void> {
+        this.book = await AddonModBook.getBook(this.courseId, this.module.id);
+
+        this.dataRetrieved.emit(this.book);
+
+        this.description = this.book.intro;
+        this.showNumbers = this.book.numbering == AddonModBookNumbering.NUMBERS;
+        this.showBullets = this.book.numbering == AddonModBookNumbering.BULLETS;
+        this.addPadding = this.book.numbering != AddonModBookNumbering.NONE;
+
+        const lastChapterViewed = await AddonModBook.getLastChapterViewed(this.book.id);
+        this.hasStartedBook = lastChapterViewed !== undefined;
+    }
+
+    /**
+     * Load book TOC.
+     *
+     * @return Promise resolved when done.
+     */
+    protected async loadTOC(): Promise<void> {
+        const contents = await CoreCourse.getModuleContents(this.module, this.courseId);
+
+        this.chapters = AddonModBook.getTocList(contents);
+    }
+
     /**
      * Open the book in a certain chapter.
      *
@@ -85,6 +106,8 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
                 chapterId,
             },
         });
+
+        this.hasStartedBook = true;
     }
 
     /**
diff --git a/src/addons/mod/book/lang.json b/src/addons/mod/book/lang.json
index 8b6812eb9..64afa1cd7 100644
--- a/src/addons/mod/book/lang.json
+++ b/src/addons/mod/book/lang.json
@@ -1,5 +1,4 @@
 {
-    "book:read": "View book",
     "errorchapter": "Error reading chapter of book.",
     "modulenameplural": "Books",
     "navnexttitle": "Next: {{$a}}",
diff --git a/src/addons/mod/book/pages/contents/contents.ts b/src/addons/mod/book/pages/contents/contents.ts
index de3de0c6f..0f2444198 100644
--- a/src/addons/mod/book/pages/contents/contents.ts
+++ b/src/addons/mod/book/pages/contents/contents.ts
@@ -133,13 +133,9 @@ export class AddonModBookContentsPage implements OnInit, OnDestroy {
 
             const downloadResult = await this.downloadResourceIfNeeded(module, refresh);
 
-            if (book) {
-                this.displayNavBar = book.navstyle != AddonModBookNavStyle.TOC_ONLY;
-                this.displayTitlesInNavBar = book.navstyle == AddonModBookNavStyle.TEXT;
-                this.title = book.name;
-            } else {
-                this.title = this.title || Translate.instant('addon.mod_book.book:read');
-            }
+            this.displayNavBar = book.navstyle != AddonModBookNavStyle.TOC_ONLY;
+            this.displayTitlesInNavBar = book.navstyle == AddonModBookNavStyle.TEXT;
+            this.title = book.name;
 
             // Get contents. No need to refresh, it has been done in downloadResourceIfNeeded.
             await source.loadContents();
@@ -283,6 +279,10 @@ export class AddonModBookContentsPage implements OnInit, OnDestroy {
             this.navigationItems = this.getNavigationItems(chapterId);
         }
 
+        if (this.book) {
+            AddonModBook.storeLastChapterViewed(this.book.id, chapterId);
+        }
+
         if (!this.module) {
             return;
         }
@@ -371,6 +371,15 @@ class AddonModBookSlidesItemsManagerSource extends CoreSwipeSlidesItemsManagerSo
         this.module = await CoreCourse.getModule(this.CM_ID, this.COURSE_ID);
         this.book = await AddonModBook.getBook(this.COURSE_ID, this.CM_ID);
 
+        if (!this.initialItem) {
+            // No chapter ID specified. Calculate last viewed.
+            const lastViewed = await AddonModBook.getLastChapterViewed(this.book.id);
+
+            if (lastViewed) {
+                this.initialItem = { id: lastViewed };
+            }
+        }
+
         return {
             module: this.module,
             book: this.book,
diff --git a/src/addons/mod/book/services/book.ts b/src/addons/mod/book/services/book.ts
index 1efa28d21..6b6c18a8f 100644
--- a/src/addons/mod/book/services/book.ts
+++ b/src/addons/mod/book/services/book.ts
@@ -26,6 +26,11 @@ import { CoreTextUtils } from '@services/utils/text';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreFile } from '@services/file';
 import { CoreError } from '@classes/errors/error';
+import { lazyMap, LazyMap } from '@/core/utils/lazy-map';
+import { asyncInstance, AsyncInstance } from '@/core/utils/async-instance';
+import { CoreDatabaseTable } from '@classes/database/database-table';
+import { AddonModBookLastChapterViewedDBRecord, LAST_CHAPTER_VIEWED_TABLE } from './database/book';
+import { CoreDatabaseCachingStrategy } from '@classes/database/database-table-proxy';
 
 /**
  * Constants to define how the chapters and subchapters of a book should be displayed in that table of contents.
@@ -56,6 +61,19 @@ export class AddonModBookProvider {
 
     static readonly COMPONENT = 'mmaModBook';
 
+    protected lastChapterViewedTables: LazyMap<AsyncInstance<CoreDatabaseTable<AddonModBookLastChapterViewedDBRecord>>>;
+
+    constructor() {
+        this.lastChapterViewedTables = lazyMap(
+            siteId => asyncInstance(
+                () => CoreSites.getSiteTable(LAST_CHAPTER_VIEWED_TABLE, {
+                    siteId,
+                    config: { cachingStrategy: CoreDatabaseCachingStrategy.None },
+                }),
+            ),
+        );
+    }
+
     /**
      * Get a book by course module ID.
      *
@@ -216,6 +234,24 @@ export class AddonModBookProvider {
         return chapters[0].id;
     }
 
+    /**
+     * Get last chapter viewed in the app for a book.
+     *
+     * @param id Book instance ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with last chapter viewed, undefined if none.
+     */
+    async getLastChapterViewed(id: number, siteId?: string): Promise<number | undefined> {
+        try {
+            const site = await CoreSites.getSite(siteId);
+            const entry = await this.lastChapterViewedTables[site.getId()].getOneByPrimaryKey({ id });
+
+            return entry.chapterid;
+        } catch {
+            // No last chapter viewed.
+        }
+    }
+
     /**
      * Get the book toc as an array.
      *
@@ -363,6 +399,20 @@ export class AddonModBookProvider {
         );
     }
 
+    /**
+     * Store last chapter viewed in the app for a book.
+     *
+     * @param id Book instance ID.
+     * @param chapterId Chapter ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with last chapter viewed, undefined if none.
+     */
+    async storeLastChapterViewed(id: number, chapterId: number, siteId?: string): Promise<void> {
+        const site = await CoreSites.getSite(siteId);
+
+        await this.lastChapterViewedTables[site.getId()].insert({ id, chapterid: chapterId });
+    }
+
 }
 
 export const AddonModBook = makeSingleton(AddonModBookProvider);
diff --git a/src/addons/mod/book/services/database/book.ts b/src/addons/mod/book/services/database/book.ts
new file mode 100644
index 000000000..38f526348
--- /dev/null
+++ b/src/addons/mod/book/services/database/book.ts
@@ -0,0 +1,46 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreSiteSchema } from '@services/sites';
+
+/**
+ * Database variables for AddonModBookProvider service.
+ */
+export const LAST_CHAPTER_VIEWED_TABLE = 'addon_mod_book_last_chapter_viewed';
+export const BOOK_SITE_SCHEMA: CoreSiteSchema = {
+    name: 'AddonModBookProvider',
+    version: 1,
+    tables: [
+        {
+            name: LAST_CHAPTER_VIEWED_TABLE,
+            columns: [
+                {
+                    name: 'id',
+                    type: 'INTEGER',
+                    primaryKey: true,
+                },
+                {
+                    name: 'chapterid',
+                    type: 'INTEGER',
+                    notNull: true,
+                },
+            ],
+        },
+    ],
+};
+
+export type AddonModBookLastChapterViewedDBRecord = {
+    id: number;
+    chapterid: number;
+};
diff --git a/src/core/lang.json b/src/core/lang.json
index 651d5fd54..5b58a7e07 100644
--- a/src/core/lang.json
+++ b/src/core/lang.json
@@ -248,6 +248,7 @@
     "restore": "Restore",
     "restricted": "Restricted",
     "retry": "Retry",
+    "resume": "Resume",
     "save": "Save",
     "savechanges": "Save changes",
     "scanqr": "Scan QR code",

From f8cba471fdb2ec34dbe4e6a2d4b0d0b505ceef84 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 16 Feb 2022 14:26:04 +0100
Subject: [PATCH 0541/1008] MOBILE-3833 core: Fix current site table migration

---
 src/core/services/sites.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/core/services/sites.ts b/src/core/services/sites.ts
index 1dedfd9cf..128eb25f3 100644
--- a/src/core/services/sites.ts
+++ b/src/core/services/sites.ts
@@ -1792,6 +1792,8 @@ export class CoreSitesProvider {
             await CoreConfig.set('current_site_id', siteId);
             await CoreApp.deleteTableSchema('current_site');
             await db.dropTable('current_site');
+        } catch {
+            // There was no current site, silence the error.
         } finally {
             await CoreConfig.set('current_site_migrated', 1);
         }

From 06797b9b31dc049b098e91adf04f1a1a970ee37b Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 17 Feb 2022 10:29:01 +0100
Subject: [PATCH 0542/1008] MOBILE-3799 filepool: Fix regression when checking
 outdated files

---
 src/core/services/filepool.ts | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/core/services/filepool.ts b/src/core/services/filepool.ts
index 49d639d12..30d857010 100644
--- a/src/core/services/filepool.ts
+++ b/src/core/services/filepool.ts
@@ -383,7 +383,7 @@ export class CoreFilepoolProvider {
 
         if (!alreadyFixed) {
             // Fix the URL and use the fixed data.
-            const file = await this.fixPluginfileURL(siteId, fileUrl);
+            const file = await this.fixPluginfileURL(siteId, fileUrl, timemodified);
 
             fileUrl = CoreFileHelper.getFileUrl(file);
             timemodified = file.timemodified ?? timemodified;
@@ -1030,11 +1030,11 @@ export class CoreFilepoolProvider {
             throw new CoreError('File system cannot be used.');
         }
 
-        const file = await this.fixPluginfileURL(siteId, fileUrl);
+        const file = await this.fixPluginfileURL(siteId, fileUrl, timemodified);
         fileUrl = CoreFileHelper.getFileUrl(file);
 
         options = Object.assign({}, options); // Create a copy to prevent modifying the original object.
-        options.timemodified = file.timemodified ?? timemodified ?? 0;
+        options.timemodified = file.timemodified ?? timemodified;
         options.revision = revision ?? this.getRevisionFromUrl(fileUrl);
         const fileId = this.getFileIdByUrl(fileUrl);
 
@@ -2340,10 +2340,12 @@ export class CoreFilepoolProvider {
      * @param timemodified The time this file was modified.
      * @param Whether the file is outdated.
      */
-    protected isFileOutdated(entry: CoreFilepoolFileEntry, revision?: number, timemodified?: number): boolean {
-        return !!entry.stale ||
-            (revision !== undefined && (entry.revision === undefined || revision > entry.revision)) ||
-            (timemodified !== undefined && (entry.timemodified === undefined || timemodified > entry.timemodified));
+    protected isFileOutdated(entry: CoreFilepoolFileEntry, revision = 0, timemodified = 0): boolean {
+        // Don't allow undefined values, convert them to 0.
+        const entryTimemodified = entry.timemodified ?? 0;
+        const entryRevision = entry.revision ?? 0;
+
+        return !!entry.stale || revision > entryRevision || timemodified > entryTimemodified;
     }
 
     /**
@@ -2565,8 +2567,8 @@ export class CoreFilepoolProvider {
         const fileId = item.fileId;
         const fileUrl = item.url;
         const options = {
-            revision: item.revision ?? undefined,
-            timemodified: item.timemodified ?? undefined,
+            revision: item.revision ?? 0,
+            timemodified: item.timemodified ?? 0,
             isexternalfile: item.isexternalfile ?? undefined,
             repositorytype: item.repositorytype ?? undefined,
         };

From 8df2680eacbb9877566be9513a8e01889f287620 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 17 Feb 2022 12:37:59 +0100
Subject: [PATCH 0543/1008] MOBILE-3833 course: Fix refresh course when manual
 compl changes

---
 .../module-completion-legacy.ts               |  7 +--
 .../module-manual-completion.ts               |  8 ++--
 .../course/pages/contents/contents.html       |  3 +-
 .../course/pages/contents/contents.ts         | 48 +++++++++++--------
 src/core/features/course/pages/index/index.ts |  2 +-
 src/core/features/course/services/course.ts   |  5 --
 .../components/course-format/course-format.ts |  3 +-
 src/core/singletons/events.ts                 | 10 ----
 8 files changed, 36 insertions(+), 50 deletions(-)

diff --git a/src/core/features/course/components/module-completion-legacy/module-completion-legacy.ts b/src/core/features/course/components/module-completion-legacy/module-completion-legacy.ts
index 3f10eefa4..f7c5b55e8 100644
--- a/src/core/features/course/components/module-completion-legacy/module-completion-legacy.ts
+++ b/src/core/features/course/components/module-completion-legacy/module-completion-legacy.ts
@@ -16,7 +16,6 @@ import { Component, OnDestroy, OnInit } from '@angular/core';
 
 import { CoreUser } from '@features/user/services/user';
 import {
-    CoreCourseCompletionType,
     CoreCourseModuleCompletionStatus,
     CoreCourseModuleCompletionTracking,
 } from '@features/course/services/course';
@@ -52,8 +51,8 @@ export class CoreCourseModuleCompletionLegacyComponent extends CoreCourseModuleC
      * @inheritdoc
      */
     ngOnInit(): void {
-        this.completionObserver = CoreEvents.on(CoreEvents.COMPLETION_CHANGED, (data) => {
-            if (!this.completion || this.completion.cmid != data.completion.cmid || data.type != CoreCourseCompletionType.MANUAL) {
+        this.completionObserver = CoreEvents.on(CoreEvents.MANUAL_COMPLETION_CHANGED, (data) => {
+            if (!this.completion || this.completion.cmid != data.completion.cmid) {
                 return;
             }
 
@@ -149,9 +148,7 @@ export class CoreCourseModuleCompletionLegacyComponent extends CoreCourseModuleC
 
         await CoreCourseHelper.changeManualCompletion(this.completion, event);
 
-        // @deprecated MANUAL_COMPLETION_CHANGED is deprecated since 4.0 use COMPLETION_CHANGED instead.
         CoreEvents.trigger(CoreEvents.MANUAL_COMPLETION_CHANGED, { completion: this.completion });
-        CoreEvents.trigger(CoreEvents.COMPLETION_CHANGED, { completion: this.completion, type: CoreCourseCompletionType.MANUAL });
     }
 
     /**
diff --git a/src/core/features/course/components/module-manual-completion/module-manual-completion.ts b/src/core/features/course/components/module-manual-completion/module-manual-completion.ts
index f2468cdab..5d3c51f4f 100644
--- a/src/core/features/course/components/module-manual-completion/module-manual-completion.ts
+++ b/src/core/features/course/components/module-manual-completion/module-manual-completion.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChange } from '@angular/core';
-import { CoreCourseCompletionMode, CoreCourseCompletionType } from '@features/course/services/course';
+import { CoreCourseCompletionMode } from '@features/course/services/course';
 import { CoreCourseHelper, CoreCourseModuleCompletionData } from '@features/course/services/course-helper';
 import { CoreUser } from '@features/user/services/user';
 import { Translate } from '@singletons';
@@ -41,8 +41,8 @@ export class CoreCourseModuleManualCompletionComponent implements OnInit, OnChan
      * @inheritdoc
      */
     ngOnInit(): void {
-        this.completionObserver = CoreEvents.on(CoreEvents.COMPLETION_CHANGED, (data) => {
-            if (!this.completion || this.completion.cmid != data.completion.cmid || data.type != CoreCourseCompletionType.MANUAL) {
+        this.completionObserver = CoreEvents.on(CoreEvents.MANUAL_COMPLETION_CHANGED, (data) => {
+            if (!this.completion || this.completion.cmid != data.completion.cmid) {
                 return;
             }
 
@@ -102,9 +102,7 @@ export class CoreCourseModuleManualCompletionComponent implements OnInit, OnChan
 
         await CoreCourseHelper.changeManualCompletion(this.completion, event);
 
-        // @deprecated MANUAL_COMPLETION_CHANGED is deprecated since 4.0 use COMPLETION_CHANGED instead.
         CoreEvents.trigger(CoreEvents.MANUAL_COMPLETION_CHANGED, { completion: this.completion });
-        CoreEvents.trigger(CoreEvents.COMPLETION_CHANGED, { completion: this.completion, type: CoreCourseCompletionType.MANUAL });
     }
 
     /**
diff --git a/src/core/features/course/pages/contents/contents.html b/src/core/features/course/pages/contents/contents.html
index b12da3cc6..64ff48a05 100644
--- a/src/core/features/course/pages/contents/contents.html
+++ b/src/core/features/course/pages/contents/contents.html
@@ -7,8 +7,7 @@
 
     <core-loading [hideUntil]="dataLoaded">
         <core-course-format [course]="course" [sections]="sections" [initialSectionId]="sectionId" [initialSectionNumber]="sectionNumber"
-            [moduleId]="moduleId" (completionChanged)="onCompletionChange($event)" class="core-course-format-{{course.format}}"
-            *ngIf="dataLoaded">
+            [moduleId]="moduleId" class="core-course-format-{{course.format}}" *ngIf="dataLoaded">
         </core-course-format>
     </core-loading>
 </ion-content>
diff --git a/src/core/features/course/pages/contents/contents.ts b/src/core/features/course/pages/contents/contents.ts
index 26c407028..77d752743 100644
--- a/src/core/features/course/pages/contents/contents.ts
+++ b/src/core/features/course/pages/contents/contents.ts
@@ -63,6 +63,7 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
 
     protected formatOptions?: Record<string, unknown>;
     protected completionObserver?: CoreEventObserver;
+    protected manualCompletionObserver?: CoreEventObserver;
     protected syncObserver?: CoreEventObserver;
     protected isDestroyed = false;
     protected modulesHaveCompletion = false;
@@ -114,36 +115,40 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
      * @return Promise resolved when done.
      */
     protected async initListeners(): Promise<void> {
+        if (this.completionObserver) {
+            return; // Already initialized.
+        }
+
         // Check if the course format requires the view to be refreshed when completion changes.
         const shouldRefresh = await CoreCourseFormatDelegate.shouldRefreshWhenCompletionChanges(this.course);
         if (!shouldRefresh) {
             return;
         }
 
-        if (!this.completionObserver) {
-            this.completionObserver = CoreEvents.on(
-                CoreEvents.COMPLETION_MODULE_VIEWED,
-                (data) => {
-                    if (data && data.courseId == this.course.id) {
-                        this.refreshAfterCompletionChange(true);
-                    }
-                },
-            );
-        }
-
-        if (!this.syncObserver) {
-            this.syncObserver = CoreEvents.on(CoreCourseSyncProvider.AUTO_SYNCED, (data) => {
-                if (!data || data.courseId != this.course.id) {
-                    return;
+        this.completionObserver = CoreEvents.on(
+            CoreEvents.COMPLETION_MODULE_VIEWED,
+            (data) => {
+                if (data && data.courseId == this.course.id) {
+                    this.refreshAfterCompletionChange(true);
                 }
+            },
+        );
 
-                this.refreshAfterCompletionChange(false);
+        this.manualCompletionObserver = CoreEvents.on(CoreEvents.MANUAL_COMPLETION_CHANGED, (data) => {
+            this.onCompletionChange(data.completion);
+        });
 
-                if (data.warnings && data.warnings[0]) {
-                    CoreDomUtils.showErrorModal(data.warnings[0]);
-                }
-            });
-        }
+        this.syncObserver = CoreEvents.on(CoreCourseSyncProvider.AUTO_SYNCED, (data) => {
+            if (!data || data.courseId != this.course.id) {
+                return;
+            }
+
+            this.refreshAfterCompletionChange(false);
+
+            if (data.warnings && data.warnings[0]) {
+                CoreDomUtils.showErrorModal(data.warnings[0]);
+            }
+        });
     }
 
     /**
@@ -369,6 +374,7 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
     ngOnDestroy(): void {
         this.isDestroyed = true;
         this.completionObserver?.off();
+        this.manualCompletionObserver?.off();
         this.syncObserver?.off();
     }
 
diff --git a/src/core/features/course/pages/index/index.ts b/src/core/features/course/pages/index/index.ts
index 9991c008d..56e10b136 100644
--- a/src/core/features/course/pages/index/index.ts
+++ b/src/core/features/course/pages/index/index.ts
@@ -88,7 +88,7 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
         });
 
         // The completion of any of the modules have changed.
-        this.completionObserver = CoreEvents.on(CoreEvents.COMPLETION_CHANGED, (data) => {
+        this.completionObserver = CoreEvents.on(CoreEvents.MANUAL_COMPLETION_CHANGED, (data) => {
             if (data.completion.courseId != this.course?.id) {
                 return;
             }
diff --git a/src/core/features/course/services/course.ts b/src/core/features/course/services/course.ts
index 5e1496358..55c7fc262 100644
--- a/src/core/features/course/services/course.ts
+++ b/src/core/features/course/services/course.ts
@@ -75,11 +75,6 @@ export enum CoreCourseModuleCompletionStatus {
     COMPLETION_COMPLETE_FAIL = 3,
 }
 
-export enum CoreCourseCompletionType {
-    MANUAL = 0,
-    AUTO = 1,
-}
-
 export enum CoreCourseCompletionMode {
     FULL = 'full',
     BASIC = 'basic',
diff --git a/src/core/features/siteplugins/components/course-format/course-format.ts b/src/core/features/siteplugins/components/course-format/course-format.ts
index 3f87875e8..d2bc5c401 100644
--- a/src/core/features/siteplugins/components/course-format/course-format.ts
+++ b/src/core/features/siteplugins/components/course-format/course-format.ts
@@ -37,7 +37,8 @@ export class CoreSitePluginsCourseFormatComponent implements OnChanges {
     @Input() initialSectionId?: number; // The section to load first (by ID).
     @Input() initialSectionNumber?: number; // The section to load first (by number).
     @Input() moduleId?: number; // The module ID to scroll to. Must be inside the initial selected section.
-    @Output() completionChanged = new EventEmitter<CoreCourseModuleCompletionData>(); // Notify when any module completion changes.
+    // Notify when any module completion changes. @deprecated since 4.0, now we use CoreEvents.
+    @Output() completionChanged = new EventEmitter<CoreCourseModuleCompletionData>();
 
     // Special input, allows access to the parent instance properties and methods.
     // Please notice that all the other inputs/outputs are also accessible through this instance, so they could be removed.
diff --git a/src/core/singletons/events.ts b/src/core/singletons/events.ts
index 84b8522d3..57d112fd8 100644
--- a/src/core/singletons/events.ts
+++ b/src/core/singletons/events.ts
@@ -20,7 +20,6 @@ import { CoreFilepoolComponentFileEventData } from '@services/filepool';
 import { CoreRedirectPayload } from '@services/navigator';
 import { CoreCourseModuleCompletionData } from '@features/course/services/course-helper';
 import { CoreScreenOrientation } from '@services/screen';
-import { CoreCourseCompletionType } from '@features/course/services/course';
 
 /**
  * Observer instance to stop listening to an event.
@@ -51,7 +50,6 @@ export interface CoreEventsData {
     [CoreEvents.SELECT_COURSE_TAB]: CoreEventSelectCourseTabData;
     [CoreEvents.COMPLETION_MODULE_VIEWED]: CoreEventCompletionModuleViewedData;
     [CoreEvents.MANUAL_COMPLETION_CHANGED]: CoreEventManualCompletionChangedData;
-    [CoreEvents.COMPLETION_CHANGED]: CoreEventCompletionChangedData;
     [CoreEvents.SECTION_STATUS_CHANGED]: CoreEventSectionStatusChangedData;
     [CoreEvents.ACTIVITY_DATA_SENT]: CoreEventActivityDataSentData;
     [CoreEvents.IAB_LOAD_START]: InAppBrowserEvent;
@@ -371,14 +369,6 @@ export type CoreEventManualCompletionChangedData = {
     completion: CoreCourseModuleCompletionData;
 };
 
-/**
- * Data passed to COMPLETION_CHANGED event.
- */
-export type CoreEventCompletionChangedData = {
-    completion: CoreCourseModuleCompletionData;
-    type: CoreCourseCompletionType;
-};
-
 /**
  * Data passed to SECTION_STATUS_CHANGED event.
  */

From 6fd082e9567866160858f3c245faaae732921196 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 17 Feb 2022 14:16:49 +0100
Subject: [PATCH 0544/1008] MOBILE-3833 course: Fix collapsible header after
 manual compl change

---
 src/core/directives/collapsible-header.ts | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts
index 970195123..95c31c943 100644
--- a/src/core/directives/collapsible-header.ts
+++ b/src/core/directives/collapsible-header.ts
@@ -297,13 +297,16 @@ export class CoreCollapsibleHeaderDirective implements OnDestroy {
         const collapsibleHeaderHeight = this.title.shadowRoot?.children[0].clientHeight ?? this.title.clientHeight;
         const scrollableHeight = this.contentScroll.scrollHeight - this.contentScroll.clientHeight;
         const collapsedHeight = collapsibleHeaderHeight - this.title.clientHeight;
-        const progress = CoreMath.clamp(
-            scrollableHeight + collapsedHeight <= 2 * collapsibleHeaderHeight
-                ? this.contentScroll.scrollTop / (this.contentScroll.scrollHeight - this.contentScroll.clientHeight)
-                : this.contentScroll.scrollTop / collapsibleHeaderHeight,
-            0,
-            1,
-        );
+        let progress = 0;
+        if (scrollableHeight !== 0) {
+            progress = CoreMath.clamp(
+                scrollableHeight + collapsedHeight <= 2 * collapsibleHeaderHeight
+                    ? this.contentScroll.scrollTop / scrollableHeight
+                    : this.contentScroll.scrollTop / collapsibleHeaderHeight,
+                0,
+                1,
+            );
+        }
         const collapsed = progress === 1;
 
         if (!this.inContent) {

From 1b24f0955d137ee6032684ab59e0d19db7d049f2 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 17 Feb 2022 13:52:40 +0100
Subject: [PATCH 0545/1008] MOBILE-3821 core: Configure lazy cache lifetime

---
 .../classes/database/database-table-proxy.ts  | 78 ++++++++++---------
 src/core/classes/database/database-table.ts   | 35 ++++++++-
 .../classes/database/debug-database-table.ts  | 10 ++-
 .../classes/database/eager-database-table.ts  |  2 +
 .../classes/database/lazy-database-table.ts   | 52 ++++++++++++-
 src/core/classes/tests/database-table.test.ts |  8 +-
 src/core/services/sites.ts                    |  8 +-
 src/types/config.d.ts                         |  2 +-
 8 files changed, 139 insertions(+), 56 deletions(-)

diff --git a/src/core/classes/database/database-table-proxy.ts b/src/core/classes/database/database-table-proxy.ts
index 7e183f95a..b1cba7e88 100644
--- a/src/core/classes/database/database-table-proxy.ts
+++ b/src/core/classes/database/database-table-proxy.ts
@@ -14,10 +14,11 @@
 
 import { CoreConstants } from '@/core/constants';
 import { asyncInstance } from '@/core/utils/async-instance';
-import { SQLiteDB, SQLiteDBRecordValues } from '@classes/sqlitedb';
+import { SQLiteDBRecordValues } from '@classes/sqlitedb';
 import { CoreConfig, CoreConfigProvider } from '@services/config';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import {
+    CoreDatabaseConfiguration,
     CoreDatabaseReducer,
     CoreDatabaseTable,
     CoreDatabaseConditions,
@@ -40,7 +41,8 @@ export class CoreDatabaseTableProxy<
     PrimaryKey extends GetDBRecordPrimaryKey<DBRecord, PrimaryKeyColumn> = GetDBRecordPrimaryKey<DBRecord, PrimaryKeyColumn>
 > extends CoreDatabaseTable<DBRecord, PrimaryKeyColumn, PrimaryKey> {
 
-    protected config: CoreDatabaseConfiguration;
+    protected readonly DEFAULT_CACHING_STRATEGY = CoreDatabaseCachingStrategy.None;
+
     protected target = asyncInstance<CoreDatabaseTable<DBRecord, PrimaryKeyColumn>>();
     protected environmentObserver?: CoreEventObserver;
     protected targetConstructors: Record<
@@ -52,21 +54,12 @@ export class CoreDatabaseTableProxy<
         [CoreDatabaseCachingStrategy.None]: CoreDatabaseTable,
     };
 
-    constructor(
-        config: Partial<CoreDatabaseConfiguration>,
-        database: SQLiteDB,
-        tableName: string,
-        primaryKeyColumns?: PrimaryKeyColumn[],
-    ) {
-        super(database, tableName, primaryKeyColumns);
-
-        this.config = { ...this.getConfigDefaults(), ...config };
-    }
-
     /**
      * @inheritdoc
      */
     async initialize(): Promise<void> {
+        await super.initialize();
+
         this.environmentObserver = CoreEvents.on(CoreConfigProvider.ENVIRONMENT_UPDATED, async () => {
             if (!(await this.shouldUpdateTarget())) {
                 return;
@@ -82,9 +75,23 @@ export class CoreDatabaseTableProxy<
      * @inheritdoc
      */
     async destroy(): Promise<void> {
+        await super.destroy();
+
         this.environmentObserver?.off();
     }
 
+    /**
+     * @inheritdoc
+     */
+    matchesConfig(config: Partial<CoreDatabaseConfiguration>): boolean {
+        const thisDebug = this.config.debug ?? false;
+        const thisCachingStrategy = this.config.cachingStrategy ?? this.DEFAULT_CACHING_STRATEGY;
+        const otherDebug = config.debug ?? false;
+        const otherCachingStrategy = config.cachingStrategy ?? this.DEFAULT_CACHING_STRATEGY;
+
+        return super.matchesConfig(config) && thisDebug === otherDebug && thisCachingStrategy === otherCachingStrategy;
+    }
+
     /**
      * @inheritdoc
      */
@@ -172,24 +179,12 @@ export class CoreDatabaseTableProxy<
         return this.target.deleteByPrimaryKey(primaryKey);
     }
 
-    /**
-     * Get default configuration values.
-     *
-     * @returns Config defaults.
-     */
-    protected getConfigDefaults(): CoreDatabaseConfiguration {
-        return {
-            cachingStrategy: CoreDatabaseCachingStrategy.None,
-            debug: false,
-        };
-    }
-
     /**
      * Get database configuration to use at runtime.
      *
      * @returns Database configuration.
      */
-    protected async getRuntimeConfig(): Promise<CoreDatabaseConfiguration> {
+    protected async getRuntimeConfig(): Promise<Partial<CoreDatabaseConfiguration>> {
         await CoreConfig.ready();
 
         return {
@@ -228,7 +223,8 @@ export class CoreDatabaseTableProxy<
         const originalTarget = target instanceof CoreDebugDatabaseTable ? target.getTarget() : target;
 
         return (config.debug && target === originalTarget)
-            || originalTarget?.constructor !== this.targetConstructors[config.cachingStrategy];
+            || originalTarget?.constructor !== this.targetConstructors[config.cachingStrategy ?? this.DEFAULT_CACHING_STRATEGY]
+            || !originalTarget.matchesConfig(config);
     }
 
     /**
@@ -238,7 +234,7 @@ export class CoreDatabaseTableProxy<
      */
     protected async createTarget(): Promise<CoreDatabaseTable<DBRecord, PrimaryKeyColumn>> {
         const config = await this.getRuntimeConfig();
-        const table = this.createTable(config.cachingStrategy);
+        const table = this.createTable(config);
 
         return config.debug ? new CoreDebugDatabaseTable(table) : table;
     }
@@ -246,23 +242,29 @@ export class CoreDatabaseTableProxy<
     /**
      * Create a database table using the given caching strategy.
      *
-     * @param cachingStrategy Caching strategy.
+     * @param config Database configuration.
      * @returns Database table.
      */
-    protected createTable(cachingStrategy: CoreDatabaseCachingStrategy): CoreDatabaseTable<DBRecord, PrimaryKeyColumn> {
-        const DatabaseTable = this.targetConstructors[cachingStrategy];
+    protected createTable(config: Partial<CoreDatabaseConfiguration>): CoreDatabaseTable<DBRecord, PrimaryKeyColumn> {
+        const DatabaseTable = this.targetConstructors[config.cachingStrategy ?? this.DEFAULT_CACHING_STRATEGY];
 
-        return new DatabaseTable(this.database, this.tableName, this.primaryKeyColumns);
+        return new DatabaseTable(config, this.database, this.tableName, this.primaryKeyColumns);
     }
 
 }
 
-/**
- * Database proxy configuration.
- */
-export interface CoreDatabaseConfiguration {
-    cachingStrategy: CoreDatabaseCachingStrategy;
-    debug: boolean;
+declare module '@classes/database/database-table' {
+
+    /**
+     * Augment CoreDatabaseConfiguration interface with data specific to this class.
+     *
+     * @see https://www.typescriptlang.org/docs/handbook/declaration-merging.html#module-augmentation
+     */
+    export interface CoreDatabaseConfiguration {
+        cachingStrategy: CoreDatabaseCachingStrategy;
+        debug: boolean;
+    }
+
 }
 
 /**
diff --git a/src/core/classes/database/database-table.ts b/src/core/classes/database/database-table.ts
index f198b333e..5aae6cac5 100644
--- a/src/core/classes/database/database-table.ts
+++ b/src/core/classes/database/database-table.ts
@@ -24,16 +24,30 @@ export class CoreDatabaseTable<
     PrimaryKey extends GetDBRecordPrimaryKey<DBRecord, PrimaryKeyColumn> = GetDBRecordPrimaryKey<DBRecord, PrimaryKeyColumn>
 > {
 
+    protected config: Partial<CoreDatabaseConfiguration>;
     protected database: SQLiteDB;
     protected tableName: string;
     protected primaryKeyColumns: PrimaryKeyColumn[];
 
-    constructor(database: SQLiteDB, tableName: string, primaryKeyColumns?: PrimaryKeyColumn[]) {
+    constructor(
+        config: Partial<CoreDatabaseConfiguration>,
+        database: SQLiteDB,
+        tableName: string,
+        primaryKeyColumns?: PrimaryKeyColumn[],
+    ) {
+        this.config = config;
         this.database = database;
         this.tableName = tableName;
         this.primaryKeyColumns = primaryKeyColumns ?? ['id'] as PrimaryKeyColumn[];
     }
 
+    /**
+     * Get database configuration.
+     */
+    getConfig(): Partial<CoreDatabaseConfiguration> {
+        return this.config;
+    }
+
     /**
      * Get database connection.
      *
@@ -75,6 +89,17 @@ export class CoreDatabaseTable<
         // Nothing to destroy by default, override this method if necessary.
     }
 
+    /**
+     * Check whether the table matches the given configuration for the values that concern it.
+     *
+     * @param config Database config.
+     * @returns Whether the table matches the given configuration.
+     */
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    matchesConfig(config: Partial<CoreDatabaseConfiguration>): boolean {
+        return true;
+    }
+
     /**
      * Get records matching the given conditions.
      *
@@ -336,6 +361,13 @@ export class CoreDatabaseTable<
 
 }
 
+/**
+ * Database configuration.
+ */
+export interface CoreDatabaseConfiguration {
+    // This definition is augmented in subclasses.
+}
+
 /**
  * CoreDatabaseTable constructor.
  */
@@ -346,6 +378,7 @@ export type CoreDatabaseTableConstructor<
 > = {
 
     new (
+        config: Partial<CoreDatabaseConfiguration>,
         database: SQLiteDB,
         tableName: string,
         primaryKeyColumns?: PrimaryKeyColumn[]
diff --git a/src/core/classes/database/debug-database-table.ts b/src/core/classes/database/debug-database-table.ts
index d7e58b56b..5ab22bb8e 100644
--- a/src/core/classes/database/debug-database-table.ts
+++ b/src/core/classes/database/debug-database-table.ts
@@ -37,7 +37,7 @@ export class CoreDebugDatabaseTable<
     protected logger: CoreLogger;
 
     constructor(target: CoreDatabaseTable<DBRecord, PrimaryKeyColumn, PrimaryKey>) {
-        super(target.getDatabase(), target.getTableName(), target.getPrimaryKeyColumns());
+        super(target.getConfig(), target.getDatabase(), target.getTableName(), target.getPrimaryKeyColumns());
 
         this.target = target;
         this.logger = CoreLogger.getInstance(`CoreDatabase[${this.tableName}]`);
@@ -53,7 +53,9 @@ export class CoreDebugDatabaseTable<
     /**
      * @inheritdoc
      */
-    initialize(): Promise<void> {
+    async initialize(): Promise<void> {
+        await super.initialize();
+
         this.logger.log('initialize', this.target);
 
         return this.target.initialize();
@@ -62,7 +64,9 @@ export class CoreDebugDatabaseTable<
     /**
      * @inheritdoc
      */
-    destroy(): Promise<void> {
+    async destroy(): Promise<void> {
+        await super.destroy();
+
         this.logger.log('destroy');
 
         return this.target.destroy();
diff --git a/src/core/classes/database/eager-database-table.ts b/src/core/classes/database/eager-database-table.ts
index 461485df5..97aac2f19 100644
--- a/src/core/classes/database/eager-database-table.ts
+++ b/src/core/classes/database/eager-database-table.ts
@@ -40,6 +40,8 @@ export class CoreEagerDatabaseTable<
      * @inheritdoc
      */
     async initialize(): Promise<void> {
+        await super.initialize();
+
         const records = await super.getMany();
 
         this.records = records.reduce((data, record) => {
diff --git a/src/core/classes/database/lazy-database-table.ts b/src/core/classes/database/lazy-database-table.ts
index 489b21a54..f29bbddb7 100644
--- a/src/core/classes/database/lazy-database-table.ts
+++ b/src/core/classes/database/lazy-database-table.ts
@@ -14,7 +14,13 @@
 
 import { CoreError } from '@classes/errors/error';
 import { SQLiteDBRecordValues } from '@classes/sqlitedb';
-import { CoreDatabaseTable, CoreDatabaseConditions, GetDBRecordPrimaryKey, CoreDatabaseQueryOptions } from './database-table';
+import {
+    CoreDatabaseConfiguration,
+    CoreDatabaseTable,
+    CoreDatabaseConditions,
+    GetDBRecordPrimaryKey,
+    CoreDatabaseQueryOptions,
+} from './database-table';
 
 /**
  * Wrapper used to improve performance by caching records that are used often for faster read operations.
@@ -28,7 +34,38 @@ export class CoreLazyDatabaseTable<
     PrimaryKey extends GetDBRecordPrimaryKey<DBRecord, PrimaryKeyColumn> = GetDBRecordPrimaryKey<DBRecord, PrimaryKeyColumn>
 > extends CoreDatabaseTable<DBRecord, PrimaryKeyColumn, PrimaryKey> {
 
+    protected readonly DEFAULT_CACHE_LIFETIME = 60000;
+
     protected records: Record<string, DBRecord | null> = {};
+    protected interval?: number;
+
+    /**
+     * @inheritdoc
+     */
+    async initialize(): Promise<void> {
+        await super.initialize();
+
+        this.interval = window.setInterval(() => (this.records = {}), this.config.lazyCacheLifetime ?? this.DEFAULT_CACHE_LIFETIME);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async destroy(): Promise<void> {
+        await super.destroy();
+
+        this.interval && window.clearInterval(this.interval);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    matchesConfig(config: Partial<CoreDatabaseConfiguration>): boolean {
+        const thisCacheLifetime = this.config.lazyCacheLifetime ?? this.DEFAULT_CACHE_LIFETIME;
+        const otherCacheLifetime = config.lazyCacheLifetime ?? this.DEFAULT_CACHE_LIFETIME;
+
+        return super.matchesConfig(config) && thisCacheLifetime === otherCacheLifetime;
+    }
 
     /**
      * @inheritdoc
@@ -152,3 +189,16 @@ export class CoreLazyDatabaseTable<
     }
 
 }
+
+declare module '@classes/database/database-table' {
+
+    /**
+     * Augment CoreDatabaseConfiguration interface with data specific to this table.
+     *
+     * @see https://www.typescriptlang.org/docs/handbook/declaration-merging.html#module-augmentation
+     */
+    export interface CoreDatabaseConfiguration {
+        lazyCacheLifetime: number;
+    }
+
+}
diff --git a/src/core/classes/tests/database-table.test.ts b/src/core/classes/tests/database-table.test.ts
index 2cf4840b0..8e1e0f1e9 100644
--- a/src/core/classes/tests/database-table.test.ts
+++ b/src/core/classes/tests/database-table.test.ts
@@ -13,12 +13,8 @@
 // limitations under the License.
 
 import { mock, mockSingleton } from '@/testing/utils';
-import { CoreDatabaseSorting, CoreDatabaseTable } from '@classes/database/database-table';
-import {
-    CoreDatabaseCachingStrategy,
-    CoreDatabaseConfiguration,
-    CoreDatabaseTableProxy,
-} from '@classes/database/database-table-proxy';
+import { CoreDatabaseConfiguration, CoreDatabaseSorting, CoreDatabaseTable } from '@classes/database/database-table';
+import { CoreDatabaseCachingStrategy, CoreDatabaseTableProxy } from '@classes/database/database-table-proxy';
 import { SQLiteDB } from '@classes/sqlitedb';
 import { CoreConfig } from '@services/config';
 
diff --git a/src/core/services/sites.ts b/src/core/services/sites.ts
index 9388baaa5..d18284bd7 100644
--- a/src/core/services/sites.ts
+++ b/src/core/services/sites.ts
@@ -56,12 +56,8 @@ import { CoreAjaxError } from '@classes/errors/ajaxerror';
 import { CoreAjaxWSError } from '@classes/errors/ajaxwserror';
 import { CoreSitePlugins } from '@features/siteplugins/services/siteplugins';
 import { CorePromisedValue } from '@classes/promised-value';
-import { CoreDatabaseTable } from '@classes/database/database-table';
-import {
-    CoreDatabaseCachingStrategy,
-    CoreDatabaseConfiguration,
-    CoreDatabaseTableProxy,
-} from '@classes/database/database-table-proxy';
+import { CoreDatabaseConfiguration, CoreDatabaseTable } from '@classes/database/database-table';
+import { CoreDatabaseCachingStrategy, CoreDatabaseTableProxy } from '@classes/database/database-table-proxy';
 import { asyncInstance, AsyncInstance } from '../utils/async-instance';
 import { CoreConfig } from './config';
 
diff --git a/src/types/config.d.ts b/src/types/config.d.ts
index c8fa468bc..ef8c23349 100644
--- a/src/types/config.d.ts
+++ b/src/types/config.d.ts
@@ -17,7 +17,7 @@ import { CoreMainMenuLocalizedCustomItem } from '@features/mainmenu/services/mai
 import { CoreSitesDemoSiteData } from '@services/sites';
 import { OpenFileAction } from '@services/utils/utils';
 import { CoreLoginSiteSelectorListMethod } from '@features/login/services/login-helper';
-import { CoreDatabaseConfiguration } from '@classes/database/database-table-proxy';
+import { CoreDatabaseConfiguration } from '@classes/database/database-table';
 
 /* eslint-disable @typescript-eslint/naming-convention */
 

From 1b8ada7b5769c4be9ea902fdb0d26a5e4be9c605 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 17 Feb 2022 13:53:22 +0100
Subject: [PATCH 0546/1008] MOBILE-3833 core: Improve deepEquals typings

---
 src/core/singletons/object.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/singletons/object.ts b/src/core/singletons/object.ts
index 9bc8fe760..5e5571451 100644
--- a/src/core/singletons/object.ts
+++ b/src/core/singletons/object.ts
@@ -32,7 +32,7 @@ export class CoreObject {
      * @param b Second object.
      * @return Whether objects are equal.
      */
-    static deepEquals(a: unknown, b: unknown): boolean {
+    static deepEquals<T=unknown>(a: T, b: T): boolean {
         return JSON.stringify(a) === JSON.stringify(b);
     }
 

From 279071634b14f80c960f3898be67d2ac02d2ae6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 14 Feb 2022 10:54:02 +0100
Subject: [PATCH 0547/1008] MOBILE-3931 course: Change format component folder
 name to course-format

---
 src/core/features/course/components/components.module.ts      | 2 +-
 .../course-format.html}                                       | 0
 .../{format/format.scss => course-format/course-format.scss}  | 0
 .../{format/format.ts => course-format/course-format.ts}      | 4 ++--
 src/core/features/course/pages/contents/contents.ts           | 2 +-
 .../siteplugins/components/course-format/course-format.ts     | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename src/core/features/course/components/{format/core-course-format.html => course-format/course-format.html} (100%)
 rename src/core/features/course/components/{format/format.scss => course-format/course-format.scss} (100%)
 rename src/core/features/course/components/{format/format.ts => course-format/course-format.ts} (99%)

diff --git a/src/core/features/course/components/components.module.ts b/src/core/features/course/components/components.module.ts
index 739dc216e..53f7d8563 100644
--- a/src/core/features/course/components/components.module.ts
+++ b/src/core/features/course/components/components.module.ts
@@ -16,7 +16,7 @@ import { NgModule } from '@angular/core';
 
 import { CoreSharedModule } from '@/core/shared.module';
 import { CoreBlockComponentsModule } from '@features/block/components/components.module';
-import { CoreCourseFormatComponent } from './format/format';
+import { CoreCourseFormatComponent } from './course-format/course-format';
 import { CoreCourseModuleComponent } from './module/module';
 import { CoreCourseModuleCompletionComponent } from './module-completion/module-completion';
 import { CoreCourseModuleDescriptionComponent } from './module-description/module-description';
diff --git a/src/core/features/course/components/format/core-course-format.html b/src/core/features/course/components/course-format/course-format.html
similarity index 100%
rename from src/core/features/course/components/format/core-course-format.html
rename to src/core/features/course/components/course-format/course-format.html
diff --git a/src/core/features/course/components/format/format.scss b/src/core/features/course/components/course-format/course-format.scss
similarity index 100%
rename from src/core/features/course/components/format/format.scss
rename to src/core/features/course/components/course-format/course-format.scss
diff --git a/src/core/features/course/components/format/format.ts b/src/core/features/course/components/course-format/course-format.ts
similarity index 99%
rename from src/core/features/course/components/format/format.ts
rename to src/core/features/course/components/course-format/course-format.ts
index 2d5067cdc..5b6797f98 100644
--- a/src/core/features/course/components/format/format.ts
+++ b/src/core/features/course/components/course-format/course-format.ts
@@ -55,8 +55,8 @@ import { CoreCourseModuleDelegate } from '@features/course/services/module-deleg
  */
 @Component({
     selector: 'core-course-format',
-    templateUrl: 'core-course-format.html',
-    styleUrls: ['format.scss'],
+    templateUrl: 'course-format.html',
+    styleUrls: ['course-format.scss'],
 })
 export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
 
diff --git a/src/core/features/course/pages/contents/contents.ts b/src/core/features/course/pages/contents/contents.ts
index 77d752743..85d7bfce1 100644
--- a/src/core/features/course/pages/contents/contents.ts
+++ b/src/core/features/course/pages/contents/contents.ts
@@ -31,7 +31,7 @@ import { CoreCourseFormatDelegate } from '@features/course/services/format-deleg
 import { CoreCourseModulePrefetchDelegate } from '@features/course/services/module-prefetch-delegate';
 import { CoreCourseOptionsMenuHandlerToDisplay } from '@features/course/services/course-options-delegate';
 import { CoreCourseSync, CoreCourseSyncProvider } from '@features/course/services/sync';
-import { CoreCourseFormatComponent } from '../../components/format/format';
+import { CoreCourseFormatComponent } from '../../components/course-format/course-format';
 import {
     CoreEvents,
     CoreEventObserver,
diff --git a/src/core/features/siteplugins/components/course-format/course-format.ts b/src/core/features/siteplugins/components/course-format/course-format.ts
index d2bc5c401..45eaf0266 100644
--- a/src/core/features/siteplugins/components/course-format/course-format.ts
+++ b/src/core/features/siteplugins/components/course-format/course-format.ts
@@ -15,7 +15,7 @@
 import { Component, OnChanges, Input, ViewChild, Output, EventEmitter } from '@angular/core';
 import { IonRefresher } from '@ionic/angular';
 
-import { CoreCourseFormatComponent } from '@features/course/components/format/format';
+import { CoreCourseFormatComponent } from '@features/course/components/course-format/course-format';
 import { CoreCourseModuleCompletionData, CoreCourseSection } from '@features/course/services/course-helper';
 import { CoreCourseFormatDelegate } from '@features/course/services/format-delegate';
 import { CoreCourseAnyCourseData } from '@features/courses/services/courses';

From d224876f427c778130e4c954ea46669219f6e275 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 17 Feb 2022 15:55:10 +0100
Subject: [PATCH 0548/1008] MOBILE-3931 module: Add a new module summary page

---
 .../index/addon-mod-assign-index.html         |   4 +
 .../components/index/index.html               |   4 +
 .../index/addon-mod-book-index.html           |   4 +
 .../index/addon-mod-chat-index.html           |   4 +
 .../index/addon-mod-choice-index.html         |   4 +
 .../index/addon-mod-data-index.html           |   4 +
 .../index/addon-mod-feedback-index.html       |   4 +
 .../index/addon-mod-folder-index.html         |   4 +
 .../mod/forum/components/index/index.html     |   4 +
 .../index/addon-mod-glossary-index.html       |   4 +
 .../index/addon-mod-h5pactivity-index.html    |   4 +
 .../index/addon-mod-imscp-index.html          |   4 +
 .../index/addon-mod-lesson-index.html         |   4 +
 .../components/index/addon-mod-lti-index.html |   4 +
 .../index/addon-mod-page-index.html           |   4 +
 .../index/addon-mod-quiz-index.html           |   4 +
 .../index/addon-mod-resource-index.html       |   4 +
 .../index/addon-mod-scorm-index.html          |   4 +
 .../index/addon-mod-survey-index.html         |   4 +
 .../components/index/addon-mod-url-index.html |   4 +
 .../index/addon-mod-wiki-index.html           |   4 +
 .../index/addon-mod-workshop-index.html       |   4 +
 .../components/side-blocks/side-blocks.html   |   7 +-
 .../course/classes/main-activity-component.ts |   1 -
 .../course/classes/main-resource-component.ts |  55 +++-
 .../course/components/components.module.ts    |   3 +
 .../module-summary/module-summary.html        |  82 +++++
 .../module-summary/module-summary.scss        |   8 +
 .../module-summary/module-summary.ts          | 311 ++++++++++++++++++
 src/theme/theme.base.scss                     |  18 +
 30 files changed, 559 insertions(+), 14 deletions(-)
 create mode 100644 src/core/features/course/components/module-summary/module-summary.html
 create mode 100644 src/core/features/course/components/module-summary/module-summary.scss
 create mode 100644 src/core/features/course/components/module-summary/module-summary.ts

diff --git a/src/addons/mod/assign/components/index/addon-mod-assign-index.html b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
index de9b9a462..73d0903e9 100644
--- a/src/addons/mod/assign/components/index/addon-mod-assign-index.html
+++ b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
@@ -24,6 +24,10 @@
             iconDescription="fas-archive" (action)="removeFiles($event)" iconAction="fas-trash" [closeOnClick]="false">
         </core-context-menu-item>
     </core-context-menu>
+
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+        <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
+    </ion-button>
 </core-navbar-buttons>
 
 <!-- Content. -->
diff --git a/src/addons/mod/bigbluebuttonbn/components/index/index.html b/src/addons/mod/bigbluebuttonbn/components/index/index.html
index 7b5f0aa7b..e10694728 100644
--- a/src/addons/mod/bigbluebuttonbn/components/index/index.html
+++ b/src/addons/mod/bigbluebuttonbn/components/index/index.html
@@ -17,6 +17,10 @@
             [iconAction]="prefetchStatusIcon" [closeOnClick]="false">
         </core-context-menu-item>
     </core-context-menu>
+
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+        <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
+    </ion-button>
 </core-navbar-buttons>
 
 <!-- Content. -->
diff --git a/src/addons/mod/book/components/index/addon-mod-book-index.html b/src/addons/mod/book/components/index/addon-mod-book-index.html
index 0ebdcb21f..4e1084b7a 100644
--- a/src/addons/mod/book/components/index/addon-mod-book-index.html
+++ b/src/addons/mod/book/components/index/addon-mod-book-index.html
@@ -15,6 +15,10 @@
             iconDescription="fas-archive" (action)="removeFiles($event)" iconAction="fas-trash" [closeOnClick]="false">
         </core-context-menu-item>
     </core-context-menu>
+
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+        <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
+    </ion-button>
 </core-navbar-buttons>
 
 <!-- Content. -->
diff --git a/src/addons/mod/chat/components/index/addon-mod-chat-index.html b/src/addons/mod/chat/components/index/addon-mod-chat-index.html
index d9106e2bf..5851b8e75 100644
--- a/src/addons/mod/chat/components/index/addon-mod-chat-index.html
+++ b/src/addons/mod/chat/components/index/addon-mod-chat-index.html
@@ -21,6 +21,10 @@
             [iconAction]="prefetchStatusIcon" [closeOnClick]="false">
         </core-context-menu-item>
     </core-context-menu>
+
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+        <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
+    </ion-button>
 </core-navbar-buttons>
 
 <!-- Content. -->
diff --git a/src/addons/mod/choice/components/index/addon-mod-choice-index.html b/src/addons/mod/choice/components/index/addon-mod-choice-index.html
index 730623b79..4b32c2dbf 100644
--- a/src/addons/mod/choice/components/index/addon-mod-choice-index.html
+++ b/src/addons/mod/choice/components/index/addon-mod-choice-index.html
@@ -23,6 +23,10 @@
             iconDescription="fas-archive" (action)="removeFiles($event)" iconAction="fas-trash" [closeOnClick]="false">
         </core-context-menu-item>
     </core-context-menu>
+
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+        <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
+    </ion-button>
 </core-navbar-buttons>
 
 <!-- Content. -->
diff --git a/src/addons/mod/data/components/index/addon-mod-data-index.html b/src/addons/mod/data/components/index/addon-mod-data-index.html
index c33a3a94a..b64adbce8 100644
--- a/src/addons/mod/data/components/index/addon-mod-data-index.html
+++ b/src/addons/mod/data/components/index/addon-mod-data-index.html
@@ -33,6 +33,10 @@
             iconDescription="fas-archive" (action)="removeFiles($event)" iconAction="fas-trash" [closeOnClick]="false">
         </core-context-menu-item>
     </core-context-menu>
+
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+        <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
+    </ion-button>
 </core-navbar-buttons>
 
 <!-- Content. -->
diff --git a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
index f7bde4f52..bb3b4550e 100644
--- a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
+++ b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
@@ -23,6 +23,10 @@
             iconDescription="fas-archive" (action)="removeFiles($event)" iconAction="fas-trash" [closeOnClick]="false">
         </core-context-menu-item>
     </core-context-menu>
+
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+        <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
+    </ion-button>
 </core-navbar-buttons>
 
 <!-- Content. -->
diff --git a/src/addons/mod/folder/components/index/addon-mod-folder-index.html b/src/addons/mod/folder/components/index/addon-mod-folder-index.html
index adceb5976..ea4d48cdf 100644
--- a/src/addons/mod/folder/components/index/addon-mod-folder-index.html
+++ b/src/addons/mod/folder/components/index/addon-mod-folder-index.html
@@ -20,6 +20,10 @@
             iconDescription="fas-archive" (action)="removeFiles($event)" iconAction="fas-trash" [closeOnClick]="false">
         </core-context-menu-item>
     </core-context-menu>
+
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+        <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
+    </ion-button>
 </core-navbar-buttons>
 
 <!-- Content. -->
diff --git a/src/addons/mod/forum/components/index/index.html b/src/addons/mod/forum/components/index/index.html
index 11a307a79..3bd8b6ada 100644
--- a/src/addons/mod/forum/components/index/index.html
+++ b/src/addons/mod/forum/components/index/index.html
@@ -28,6 +28,10 @@
             (action)="showSortOrderSelector()">
         </core-context-menu-item>
     </core-context-menu>
+
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+        <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
+    </ion-button>
 </core-navbar-buttons>
 
 <!-- Content. -->
diff --git a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
index a3437f70d..142f410eb 100644
--- a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
+++ b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
@@ -36,6 +36,10 @@
             iconDescription="fas-archive" (action)="removeFiles($event)" iconAction="fas-trash" [closeOnClick]="false">
         </core-context-menu-item>
     </core-context-menu>
+
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+        <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
+    </ion-button>
 </core-navbar-buttons>
 
 <!-- Content. -->
diff --git a/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html b/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
index 1338852c1..e7b6e7ea2 100644
--- a/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
+++ b/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
@@ -30,6 +30,10 @@
             iconDescription="fas-archive" (action)="removeFiles($event)" iconAction="fas-trash" [closeOnClick]="false">
         </core-context-menu-item>
     </core-context-menu>
+
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+        <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
+    </ion-button>
 </core-navbar-buttons>
 
 <!-- Content. -->
diff --git a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
index 7a7a036c2..b6856d0db 100644
--- a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
+++ b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
@@ -23,6 +23,10 @@
             iconDescription="fas-archive" (action)="removeFiles($event)" iconAction="fas-trash" [closeOnClick]="false">
         </core-context-menu-item>
     </core-context-menu>
+
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+        <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
+    </ion-button>
 </core-navbar-buttons>
 
 <!-- Content. -->
diff --git a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
index 1dd4b2270..dd57d8860 100644
--- a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
+++ b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
@@ -23,6 +23,10 @@
             iconDescription="fas-archive" (action)="removeFiles($event)" iconAction="fas-trash" [closeOnClick]="false">
         </core-context-menu-item>
     </core-context-menu>
+
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+        <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
+    </ion-button>
 </core-navbar-buttons>
 
 <!-- Content. -->
diff --git a/src/addons/mod/lti/components/index/addon-mod-lti-index.html b/src/addons/mod/lti/components/index/addon-mod-lti-index.html
index 9430ef52b..9dfc934b2 100644
--- a/src/addons/mod/lti/components/index/addon-mod-lti-index.html
+++ b/src/addons/mod/lti/components/index/addon-mod-lti-index.html
@@ -14,6 +14,10 @@
             (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false">
         </core-context-menu-item>
     </core-context-menu>
+
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+        <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
+    </ion-button>
 </core-navbar-buttons>
 
 <!-- Content. -->
diff --git a/src/addons/mod/page/components/index/addon-mod-page-index.html b/src/addons/mod/page/components/index/addon-mod-page-index.html
index 1c8cab9ed..bd5f3a6ba 100644
--- a/src/addons/mod/page/components/index/addon-mod-page-index.html
+++ b/src/addons/mod/page/components/index/addon-mod-page-index.html
@@ -20,6 +20,10 @@
             iconDescription="fas-archive" (action)="removeFiles($event)" iconAction="fas-trash" [closeOnClick]="false">
         </core-context-menu-item>
     </core-context-menu>
+
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+        <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
+    </ion-button>
 </core-navbar-buttons>
 
 <!-- Content. -->
diff --git a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
index dffa76b76..8060c0171 100644
--- a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
+++ b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
@@ -23,6 +23,10 @@
             iconDescription="fas-archive" (action)="removeFiles($event)" iconAction="fas-trash" [closeOnClick]="false">
         </core-context-menu-item>
     </core-context-menu>
+
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+        <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
+    </ion-button>
 </core-navbar-buttons>
 
 <!-- Content. -->
diff --git a/src/addons/mod/resource/components/index/addon-mod-resource-index.html b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
index bbad8ec56..78357a63f 100644
--- a/src/addons/mod/resource/components/index/addon-mod-resource-index.html
+++ b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
@@ -15,6 +15,10 @@
             iconDescription="fas-archive" (action)="removeFiles($event)" iconAction="fas-trash" [closeOnClick]="false">
         </core-context-menu-item>
     </core-context-menu>
+
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+        <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
+    </ion-button>
 </core-navbar-buttons>
 
 <!-- Content. -->
diff --git a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
index aeb744521..e5eea8e77 100644
--- a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
+++ b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
@@ -23,6 +23,10 @@
             iconDescription="fas-archive" (action)="removeFiles($event)" iconAction="fas-trash" [closeOnClick]="false">
         </core-context-menu-item>
     </core-context-menu>
+
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+        <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
+    </ion-button>
 </core-navbar-buttons>
 
 <!-- Content. -->
diff --git a/src/addons/mod/survey/components/index/addon-mod-survey-index.html b/src/addons/mod/survey/components/index/addon-mod-survey-index.html
index 99a46962c..8f73a5c47 100644
--- a/src/addons/mod/survey/components/index/addon-mod-survey-index.html
+++ b/src/addons/mod/survey/components/index/addon-mod-survey-index.html
@@ -24,6 +24,10 @@
             iconDescription="fas-archive" (action)="removeFiles($event)" iconAction="fas-trash" [closeOnClick]="false">
         </core-context-menu-item>
     </core-context-menu>
+
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+        <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
+    </ion-button>
 </core-navbar-buttons>
 
 <!-- Content. -->
diff --git a/src/addons/mod/url/components/index/addon-mod-url-index.html b/src/addons/mod/url/components/index/addon-mod-url-index.html
index 24f4579bd..47d00e1af 100644
--- a/src/addons/mod/url/components/index/addon-mod-url-index.html
+++ b/src/addons/mod/url/components/index/addon-mod-url-index.html
@@ -10,6 +10,10 @@
         <core-context-menu-item [priority]="700" [content]="'core.refresh' | translate" (action)="doRefresh(null, $event)"
             [iconAction]="refreshIcon" [closeOnClick]="false"></core-context-menu-item>
     </core-context-menu>
+
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+        <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
+    </ion-button>
 </core-navbar-buttons>
 
 <!-- Content. -->
diff --git a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
index 7db05d66b..c689ec193 100644
--- a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
+++ b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
@@ -42,6 +42,10 @@
             iconDescription="fas-archive" (action)="removeFiles($event)" iconAction="fas-trash" [closeOnClick]="false">
         </core-context-menu-item>
     </core-context-menu>
+
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+        <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
+    </ion-button>
 </core-navbar-buttons>
 
 <!-- Content. -->
diff --git a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
index a5a979a6f..ec5719b0d 100644
--- a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
+++ b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
@@ -24,6 +24,10 @@
             iconDescription="fas-archive" (action)="removeFiles($event)" iconAction="fas-trash" [closeOnClick]="false">
         </core-context-menu-item>
     </core-context-menu>
+
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+        <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
+    </ion-button>
 </core-navbar-buttons>
 
 <!-- Content. -->
diff --git a/src/core/features/block/components/side-blocks/side-blocks.html b/src/core/features/block/components/side-blocks/side-blocks.html
index 198cb21d2..91fee4e1e 100644
--- a/src/core/features/block/components/side-blocks/side-blocks.html
+++ b/src/core/features/block/components/side-blocks/side-blocks.html
@@ -1,8 +1,5 @@
-<ion-header>
+<ion-header class="no-title">
     <ion-toolbar>
-        <ion-title>
-            <h2>{{ 'core.block.blocks' | translate }}</h2>
-        </ion-title>
         <ion-buttons slot="end">
             <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
                 <ion-icon name="fas-times" slot="icon-only" aria-hidden=true></ion-icon>
@@ -10,7 +7,7 @@
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
-<ion-content>
+<ion-content [fullscreen]="true">
     <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
diff --git a/src/core/features/course/classes/main-activity-component.ts b/src/core/features/course/classes/main-activity-component.ts
index 1c2621036..e89d53476 100644
--- a/src/core/features/course/classes/main-activity-component.ts
+++ b/src/core/features/course/classes/main-activity-component.ts
@@ -42,7 +42,6 @@ export class CoreCourseModuleMainActivityComponent extends CoreCourseModuleMainR
 
     // Data for context menu.
     syncIcon?: string; // Sync icon.
-    hasOffline?: boolean; // If it has offline data to be synced.
     isOnline?: boolean; // If the app is online or not.
 
     protected syncObserver?: CoreEventObserver; // It will observe the sync auto event.
diff --git a/src/core/features/course/classes/main-resource-component.ts b/src/core/features/course/classes/main-resource-component.ts
index 1cf1b4a0b..cc1f72c67 100644
--- a/src/core/features/course/classes/main-resource-component.ts
+++ b/src/core/features/course/classes/main-resource-component.ts
@@ -29,6 +29,7 @@ import { CoreUtils } from '@services/utils/utils';
 import { Translate } from '@singletons';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreLogger } from '@singletons/logger';
+import { CoreCourseModuleSummaryComponent, CoreCourseModuleSummaryResult } from '../components/module-summary/module-summary';
 import { CoreCourseContentsPage } from '../pages/contents/contents';
 import { CoreCourse } from '../services/course';
 import { CoreCourseHelper, CoreCourseModuleData } from '../services/course-helper';
@@ -58,6 +59,7 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
     loaded = false; // If the component has been loaded.
     component?: string; // Component name.
     componentId?: number; // Component ID.
+    hasOffline = false; // Resources don't have any data to sync.
     blog?: boolean; // If blog is available.
 
     // Data for context menu.
@@ -253,16 +255,11 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
 
     /**
      * Expand the description.
+     *
+     * @deprecated Use openModuleSummary instead.
      */
     expandDescription(): void {
-        CoreTextUtils.viewText(Translate.instant('core.description'), this.description!, {
-            component: this.component,
-            componentId: this.module.id,
-            filter: true,
-            contextLevel: 'module',
-            instanceId: this.module.id,
-            courseId: this.courseId,
-        });
+        this.openModuleSummary();
     }
 
     /**
@@ -449,6 +446,48 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
         this.module = module;
     }
 
+    /**
+     * Opens a module summary page.
+     */
+    async openModuleSummary(): Promise<void> {
+        if (!this.module) {
+            return;
+        }
+
+        const data = await CoreDomUtils.openSideModal<CoreCourseModuleSummaryResult>({
+            component: CoreCourseModuleSummaryComponent,
+            componentProps: {
+                moduleId: this.module.id,
+                module: this.module,
+                description: this.description,
+                component: this.component,
+                courseId: this.courseId,
+                hasOffline: this.hasOffline,
+            },
+        });
+
+        if (data) {
+            if (data.action == 'refresh') {
+                const modal = await CoreDomUtils.showModalLoading();
+
+                try {
+                    await this.doRefresh();
+                } finally {
+                    modal.dismiss();
+                }
+            } else if(data.action == 'sync') {
+                const modal = await CoreDomUtils.showModalLoading();
+
+                try {
+                    await this.doRefresh( undefined, undefined, true);
+                } finally {
+                    modal.dismiss();
+                }
+            }
+
+        }
+    }
+
     /**
      * Component being destroyed.
      */
diff --git a/src/core/features/course/components/components.module.ts b/src/core/features/course/components/components.module.ts
index 53f7d8563..5eee268bf 100644
--- a/src/core/features/course/components/components.module.ts
+++ b/src/core/features/course/components/components.module.ts
@@ -27,6 +27,7 @@ import { CoreCourseModuleCompletionLegacyComponent } from './module-completion-l
 import { CoreCourseModuleInfoComponent } from './module-info/module-info';
 import { CoreCourseModuleManualCompletionComponent } from './module-manual-completion/module-manual-completion';
 import { CoreCourseModuleNavigationComponent } from './module-navigation/module-navigation';
+import { CoreCourseModuleSummaryComponent } from './module-summary/module-summary';
 
 @NgModule({
     declarations: [
@@ -41,6 +42,7 @@ import { CoreCourseModuleNavigationComponent } from './module-navigation/module-
         CoreCourseTagAreaComponent,
         CoreCourseUnsupportedModuleComponent,
         CoreCourseModuleNavigationComponent,
+        CoreCourseModuleSummaryComponent,
     ],
     imports: [
         CoreBlockComponentsModule,
@@ -58,6 +60,7 @@ import { CoreCourseModuleNavigationComponent } from './module-navigation/module-
         CoreCourseTagAreaComponent,
         CoreCourseUnsupportedModuleComponent,
         CoreCourseModuleNavigationComponent,
+        CoreCourseModuleSummaryComponent,
     ],
 })
 export class CoreCourseComponentsModule {}
diff --git a/src/core/features/course/components/module-summary/module-summary.html b/src/core/features/course/components/module-summary/module-summary.html
new file mode 100644
index 000000000..26d20c8b6
--- /dev/null
+++ b/src/core/features/course/components/module-summary/module-summary.html
@@ -0,0 +1,82 @@
+<ion-header class="no-title">
+    <ion-toolbar>
+        <ion-buttons slot="end">
+            <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
+                <ion-icon slot="icon-only" name="fas-times" aria-hidden="true"></ion-icon>
+            </ion-button>
+        </ion-buttons>
+    </ion-toolbar>
+</ion-header>
+<ion-content [fullscreen]="true">
+    <!-- Content. -->
+    <core-loading [hideUntil]="loaded">
+        <!-- Activity info. -->
+        <ion-item class="ion-text-wrap" *ngIf="module">
+            <ion-label>
+                <h1>
+                    <core-format-text [text]="module.name" contextLevel="module" [component]="component" [componentId]="componentId"
+                        [contextInstanceId]="module.id" [courseId]="courseId">
+                    </core-format-text>
+                </h1>
+            </ion-label>
+            <ion-button fill="clear" [href]="externalUrl" core-link [showBrowserWarning]="false" color="dark"
+                [attr.aria-label]="'core.openinbrowser' | translate" slot="end">
+                <ion-icon name="fas-external-link-alt" slot="icon-only" aria-hidden="true"></ion-icon>
+            </ion-button>
+        </ion-item>
+        <ion-item class="ion-text-wrap" *ngIf="module && description">
+            <ion-label>
+                <core-format-text [text]="description" [component]="component" [componentId]="componentId" contextLevel="module"
+                    [contextInstanceId]="module.id" [courseId]="courseId" [maxHeight]="120">
+                </core-format-text>
+            </ion-label>
+        </ion-item>
+
+        <ion-item button class="ion-margin" *ngIf="prefetchText" class="ion-text-wrap">
+            <ion-label>
+                <p class="item-heading ion-text-wrap">{{ prefetchText }}</p>
+                <p *ngIf="downloadTimeReadable">{{ downloadTimeReadable }}</p>
+            </ion-label>
+            <ion-button *ngIf="prefetchStatusIcon && prefetchStatusIcon != 'spinner'" (click)="prefetch()" color="primary" fill="outline"
+                [attr.aria-label]="'core.download' | translate" slot="end">
+                <ion-icon [name]="prefetchStatusIcon" slot="icon-only" aria-hidden="true">
+                </ion-icon>
+            </ion-button>
+            <ion-spinner *ngIf="prefetchStatusIcon == 'spinner'" slot="end" aria-hidden="true"></ion-spinner>
+        </ion-item>
+
+        <ion-item button class="ion-margin" *ngIf="sizeReadable" class="ion-text-wrap">
+            <ion-label>
+                <p class="item-heading ion-text-wrap">{{ 'addon.storagemanager.totalspaceusage' | translate }}</p>
+                <ion-badge color="light">{{ sizeReadable | coreBytesToSize }}</ion-badge>
+            </ion-label>
+            <ion-button *ngIf="!removeFilesLoading && size > 0" (click)="removeFiles()" color="danger" fill="outline"
+                [attr.aria-label]="'core.clearstoreddata' | translate:{$a: sizeReadable}" slot="end">
+                <ion-icon name="fas-trash" slot="icon-only" aria-hidden="true"></ion-icon>
+            </ion-button>
+            <ion-spinner *ngIf="removeFilesLoading" slot="end" aria-hidden="true"></ion-spinner>
+        </ion-item>
+
+        <ion-button *ngIf="blog" class="ion-margin" (click)="gotoBlog()" expand="block" fill="outline">
+            <ion-icon name="far-newspaper" slot="start" aria-hidden="true"></ion-icon>
+            <ion-label>
+                {{ 'addon.blog.blog' | translate }}
+            </ion-label>
+        </ion-button>
+    </core-loading>
+</ion-content>
+<ion-footer *ngIf="loaded && isOnline">
+    <ion-button class="ion-margin" *ngIf="!hasOffline" (click)="refresh()" expand="block">
+        <ion-icon name="fas-redo-alt" slot="start" aria-hidden="true"></ion-icon>
+        <ion-label>
+            {{ 'core.refresh' | translate }}
+        </ion-label>
+    </ion-button>
+
+    <ion-button class="ion-margin" *ngIf="hasOffline" (click)="sync()" expand="block">
+        <ion-icon name="fas-sync-alt" slot="start" aria-hidden="true"></ion-icon>
+        <ion-label>
+            {{ 'core.settings.synchronizenow' | translate }}
+        </ion-label>
+    </ion-button>
+</ion-footer>
diff --git a/src/core/features/course/components/module-summary/module-summary.scss b/src/core/features/course/components/module-summary/module-summary.scss
new file mode 100644
index 000000000..fb9664764
--- /dev/null
+++ b/src/core/features/course/components/module-summary/module-summary.scss
@@ -0,0 +1,8 @@
+
+:host ::ng-deep .collapsible-title ion-label {
+    margin-top: 12px;
+}
+
+h1 {
+    font-size: 20px;
+}
diff --git a/src/core/features/course/components/module-summary/module-summary.ts b/src/core/features/course/components/module-summary/module-summary.ts
new file mode 100644
index 000000000..58d159945
--- /dev/null
+++ b/src/core/features/course/components/module-summary/module-summary.ts
@@ -0,0 +1,311 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreConstants } from '@/core/constants';
+import { AddonBlog } from '@addons/blog/services/blog';
+import { AddonBlogMainMenuHandlerService } from '@addons/blog/services/handlers/mainmenu';
+import { Component, Input, OnDestroy, OnInit } from '@angular/core';
+import { Params } from '@angular/router';
+import { CoreCourseHelper, CoreCourseModuleData } from '@features/course/services/course-helper';
+import { CoreCourseModulePrefetchDelegate } from '@features/course/services/module-prefetch-delegate';
+import { CoreApp } from '@services/app';
+import { CoreFilepool } from '@services/filepool';
+import { CoreNavigator } from '@services/navigator';
+import { CoreSites } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
+import { CoreTextUtils } from '@services/utils/text';
+import { CoreUtils } from '@services/utils/utils';
+import { ModalController, Network, Translate, NgZone } from '@singletons';
+import { CoreEventObserver, CoreEvents } from '@singletons/events';
+import { Subscription } from 'rxjs';
+
+/**
+ * Component to display a module summary modal.
+ */
+@Component({
+    selector: 'core-course-module-summary',
+    templateUrl: 'module-summary.html',
+    styleUrls: ['module-summary.scss'],
+})
+export class CoreCourseModuleSummaryComponent implements OnInit, OnDestroy {
+
+    @Input() module?: CoreCourseModuleData; // The module of the component.
+    @Input() courseId = 0; // Course ID the component belongs to.
+    @Input() moduleId = 0; // Module ID the component belongs to.
+    @Input() component = ''; // Component name.
+    @Input() description = ''; // Module description.
+    @Input() hasOffline = false; // If it has offline data to be synced.
+
+    loaded = false; // If the component has been loaded.
+    componentId?: number; // Component ID.
+
+    // Data for context menu.
+    externalUrl?: string; // External URL to open in browser.
+
+    removeFilesLoading = false;
+    prefetchStatusIcon?: string;
+    prefetchStatus?: string;
+    prefetchText?: string;
+    sizeReadable?: string;
+    downloadTimeReadable?: string; // Last download time in a readable format.
+    size = 0;
+
+    blog = false; // If blog is available.
+
+    isOnline = false; // If the app is online or not.
+
+    protected onlineSubscription: Subscription; // It will observe the status of the network connection.
+
+    protected packageStatusObserver?: CoreEventObserver; // Observer of package status.
+    protected fileStatusObserver?: CoreEventObserver; // Observer of file status.
+    protected siteId: string;
+    protected isDestroyed = false;
+
+    constructor() {
+        this.siteId = CoreSites.getCurrentSiteId();
+        this.isOnline = CoreApp.isOnline();
+
+        // Refresh online status when changes.
+        this.onlineSubscription = Network.onChange().subscribe(() => {
+            // Execute the callback in the Angular zone, so change detection doesn't stop working.
+            NgZone.run(() => {
+                this.isOnline = CoreApp.isOnline();
+            });
+        });
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async ngOnInit(): Promise<void> {
+        if (!this.module) {
+            this.closeModal();
+
+            return;
+        }
+
+        this.fetchContent();
+
+        if (this.component) {
+            this.packageStatusObserver = CoreEvents.on(
+                CoreEvents.PACKAGE_STATUS_CHANGED,
+                (data) => {
+                    if (data.componentId == module.id && data.component == this.component) {
+                        this.getPackageStatus();
+                    }
+                },
+                this.siteId,
+            );
+
+            // Debounce the update size function to prevent too many calls when downloading or deleting a whole activity.
+            const debouncedUpdateSize = CoreUtils.debounce(async () => {
+                if (!this.module) {
+                    return;
+                }
+
+                const moduleSize = await CoreCourseModulePrefetchDelegate.getModuleStoredSize(this.module, this.courseId);
+
+                this.sizeReadable = moduleSize > 0 ? CoreTextUtils.bytesToSize(moduleSize, 2) : '';
+            }, 1000);
+
+            this.fileStatusObserver = CoreEvents.on(
+                CoreEvents.COMPONENT_FILE_ACTION,
+                (data) => {
+                    if (data.component != this.component || data.componentId != module.id) {
+                        // The event doesn't belong to this component, ignore.
+                        return;
+                    }
+
+                    if (!CoreFilepool.isFileEventDownloadedOrDeleted(data)) {
+                        return;
+                    }
+
+                    // Update the module size.
+                    debouncedUpdateSize();
+                },
+                this.siteId,
+            );
+        }
+
+    }
+
+    /**
+     * Fetch content to populate the page.
+     */
+    protected async fetchContent(): Promise<void> {
+        if (!this.module) {
+            return;
+        }
+
+        this.componentId = this.module.id;
+        this.externalUrl = this.module.url;
+        this.courseId = this.courseId || this.module.course;
+
+        this.blog = await AddonBlog.isPluginEnabled();
+
+        await this.getPackageStatus();
+
+        this.loaded = true;
+    }
+
+    /**
+     * Updage package status.
+     *
+     * @param refresh If prefetch info has to be refreshed.
+     */
+    async getPackageStatus(refresh = false): Promise<void> {
+        if (!this.module) {
+            return;
+        }
+
+        const moduleInfo =
+            await CoreCourseHelper.getModulePrefetchInfo(this.module, this.courseId, refresh, this.component);
+
+        this.prefetchStatusIcon = moduleInfo.statusIcon;
+        this.prefetchStatus = moduleInfo.status;
+        this.downloadTimeReadable = '';
+
+        if (moduleInfo.status != CoreConstants.NOT_DOWNLOADABLE) {
+            // Module is downloadable, get the text to display to prefetch.
+            if (moduleInfo.downloadTime && moduleInfo.downloadTime > 0) {
+                this.prefetchText = Translate.instant('core.lastdownloaded');
+                this.downloadTimeReadable = CoreTextUtils.ucFirst(moduleInfo.downloadTimeReadable);
+            } else {
+                // Module not downloaded, show a default text.
+                this.prefetchText = Translate.instant('core.download');
+            }
+        }
+
+        this.sizeReadable = moduleInfo.sizeReadable;
+        this.size = moduleInfo.size;
+        if (moduleInfo.status == CoreConstants.DOWNLOADING) {
+            // Set this to empty to prevent "remove file" option showing up while downloading.
+            this.sizeReadable = '';
+        }
+    }
+
+    /**
+     * Go to blog posts.
+     */
+    async gotoBlog(): Promise<void> {
+        const params: Params = { cmId: this.moduleId };
+
+        await CoreNavigator.navigateToSitePath(AddonBlogMainMenuHandlerService.PAGE_NAME, { params });
+    }
+
+    /**
+     * Prefetch the module.
+     */
+    async prefetch(): Promise<void> {
+        if (!this.module) {
+            return;
+        }
+
+        const initialIcon = this.prefetchStatusIcon;
+        this.prefetchStatusIcon = CoreConstants.ICON_DOWNLOADING; // Show spinner since this operation might take a while.
+
+        try {
+            // We need to call getDownloadSize, the package might have been updated.
+            const size = await CoreCourseModulePrefetchDelegate.getModuleDownloadSize(this.module, this.courseId, true);
+
+            await CoreDomUtils.confirmDownloadSize(size);
+
+            await CoreCourseModulePrefetchDelegate.prefetchModule(this.module, this.courseId, true);
+
+            await this.getPackageStatus(true);
+        } catch (error) {
+            this.prefetchStatusIcon = initialIcon;
+
+            if (!this.isDestroyed) {
+                CoreDomUtils.showErrorModalDefault(error, 'core.errordownloading', true);
+            }
+        }
+    }
+
+    /**
+     * Confirm and remove downloaded files.
+     */
+    async removeFiles(): Promise<void> {
+        if (!this.module) {
+            return;
+        }
+
+        if (this.prefetchStatus == CoreConstants.DOWNLOADING) {
+            CoreDomUtils.showAlertTranslated(undefined, 'core.course.cannotdeletewhiledownloading');
+
+            return;
+        }
+
+        try {
+            await CoreDomUtils.showDeleteConfirm('addon.storagemanager.confirmdeletedatafrom', { name: this.module.name });
+
+            this.removeFilesLoading = true;
+
+            await CoreCourseHelper.removeModuleStoredData(this.module, this.courseId);
+
+        } catch (error) {
+            if (!this.isDestroyed &&error) {
+                CoreDomUtils.showErrorModal(error);
+            }
+        } finally {
+            this.removeFilesLoading = false;
+        }
+
+        await this.getPackageStatus();
+    }
+
+    /**
+     * Refresh the data.
+     */
+    async refresh(): Promise<void> {
+        if (!this.module) {
+            return;
+        }
+
+        ModalController.dismiss({ action: 'refresh' });
+    }
+
+    /**
+     * Sync the data.
+     */
+    async sync(): Promise<void> {
+        if (!this.module) {
+            return;
+        }
+
+        ModalController.dismiss({ action: 'sync' });
+    }
+
+    /**
+     * Close the modal.
+     */
+    closeModal(): void {
+        ModalController.dismiss();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    ngOnDestroy(): void {
+        this.isDestroyed = true;
+        this.packageStatusObserver?.off();
+        this.fileStatusObserver?.off();
+        this.onlineSubscription.unsubscribe();
+    }
+
+}
+
+export type CoreCourseModuleSummaryResult =  {
+    action: 'sync'|'refresh';
+};
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index f11236c58..a2f2df66f 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -297,6 +297,14 @@ button,
 
 ion-button {
     margin: 4px 8px;
+
+    ion-spinner[slot=start] {
+        @include margin-horizontal(-0.3em, 0.3em);
+    }
+
+    ion-spinner[slot=end] {
+        @include margin-horizontal(-0.3em, 0.3em);
+    }
 }
 
 ion-button.button-outline {
@@ -1465,6 +1473,16 @@ ion-grid.core-no-grid > ion-row {
     }
 }
 
+ion-header.no-title {
+    --core-header-toolbar-border-width: 0;
+    --core-header-toolbar-background: transparent;
+
+    ion-toolbar .button.button-clear,
+    ion-toolbar .button.button-solid {
+        --background: var(--ion-background-color);
+    }
+}
+
 ion-header[collapsible] {
     @include core-transition(all, 500ms);
 

From 344ee6d57ecc65b7a521639512e3da8ffa1f7195 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 14 Feb 2022 17:07:46 +0100
Subject: [PATCH 0549/1008] MOBILE-3931 module: Remove unnecessary variables
 and menus from modules

---
 scripts/langindex.json                        |   1 -
 .../index/addon-mod-assign-index.html         |  25 ----
 .../mod/assign/components/index/index.ts      | 136 +++++++-----------
 .../components/index/index.html               |  18 ---
 .../bigbluebuttonbn/components/index/index.ts |  19 ++-
 .../index/addon-mod-book-index.html           |  16 ---
 src/addons/mod/book/components/index/index.ts |  14 +-
 .../index/addon-mod-chat-index.html           |  22 ---
 src/addons/mod/chat/components/index/index.ts |  32 ++---
 .../index/addon-mod-choice-index.html         |  24 ----
 .../mod/choice/components/index/index.ts      |  60 ++++----
 .../index/addon-mod-data-index.html           |  22 ---
 src/addons/mod/data/components/index/index.ts |  10 +-
 .../index/addon-mod-feedback-index.html       |  24 ----
 .../mod/feedback/components/index/index.ts    |   5 +-
 .../index/addon-mod-folder-index.html         |  21 ---
 .../mod/folder/components/index/index.ts      |  22 +--
 .../mod/forum/components/index/index.html     |  23 ---
 .../mod/forum/components/index/index.ts       |  10 +-
 src/addons/mod/forum/lang.json                |   1 -
 .../index/addon-mod-glossary-index.html       |  22 ---
 .../mod/glossary/components/index/index.ts    |  54 ++++---
 .../index/addon-mod-h5pactivity-index.html    |  25 +---
 .../mod/h5pactivity/components/index/index.ts |  81 +++++------
 .../index/addon-mod-imscp-index.html          |  20 ---
 .../mod/imscp/components/index/index.ts       |  50 +++----
 .../index/addon-mod-lesson-index.html         |  24 ----
 .../mod/lesson/components/index/index.ts      | 115 +++++++--------
 .../components/index/addon-mod-lti-index.html |  17 +--
 src/addons/mod/lti/components/index/index.ts  |  15 +-
 .../index/addon-mod-page-index.html           |  21 ---
 src/addons/mod/page/components/index/index.ts |  29 ++--
 .../index/addon-mod-quiz-index.html           |  26 +---
 src/addons/mod/quiz/components/index/index.ts | 135 ++++++++---------
 .../index/addon-mod-resource-index.html       |  21 +--
 .../mod/resource/components/index/index.ts    | 114 ++++++++-------
 .../index/addon-mod-scorm-index.html          |  26 +---
 .../mod/scorm/components/index/index.ts       |  50 +++----
 .../index/addon-mod-survey-index.html         |  27 +---
 .../mod/survey/components/index/index.ts      |  45 +++---
 .../components/index/addon-mod-url-index.html |  11 --
 .../index/addon-mod-wiki-index.html           |  22 ---
 src/addons/mod/wiki/components/index/index.ts |  23 ++-
 .../index/addon-mod-workshop-index.html       |  25 ----
 .../mod/workshop/components/index/index.ts    |  82 +++++------
 .../course/classes/main-activity-component.ts |  53 +------
 .../course/classes/main-resource-component.ts | 125 ++++++----------
 .../features/course/services/course-helper.ts |   2 +
 48 files changed, 534 insertions(+), 1231 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 3bdd8c444..07000f48f 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -649,7 +649,6 @@
   "addon.mod_forum.posttomygroups": "forum",
   "addon.mod_forum.privatereply": "forum",
   "addon.mod_forum.re": "forum",
-  "addon.mod_forum.refreshdiscussions": "local_moodlemobileapp",
   "addon.mod_forum.refreshposts": "local_moodlemobileapp",
   "addon.mod_forum.removefromfavourites": "forum",
   "addon.mod_forum.reply": "forum",
diff --git a/src/addons/mod/assign/components/index/addon-mod-assign-index.html b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
index 73d0903e9..69b0d2d25 100644
--- a/src/addons/mod/assign/components/index/addon-mod-assign-index.html
+++ b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
@@ -1,30 +1,5 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
-            iconAction="fas-external-link-alt" [showBrowserWarning]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="assign && (description || (assign.introattachments && assign.introattachments.length))"
-            [priority]="800" [content]="'core.moduleintro' | translate" (action)="expandDescription()" iconAction="fas-arrow-right">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
-            (action)="gotoBlog()">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="loaded && !hasOffline && isOnline" [priority]="700" [content]="'core.refresh' | translate"
-            (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="loaded && hasOffline && isOnline" [priority]="600"
-            [content]="'core.settings.synchronizenow' | translate" (action)="doRefresh(null, $event, true)" [iconAction]="syncIcon"
-            [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="500" [content]="prefetchText" (action)="prefetch($event)"
-            [iconAction]="prefetchStatusIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="size" [priority]="400" [content]="'core.clearstoreddata' | translate:{$a: size}"
-            iconDescription="fas-archive" (action)="removeFiles($event)" iconAction="fas-trash" [closeOnClick]="false">
-        </core-context-menu-item>
-    </core-context-menu>
-
     <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
diff --git a/src/addons/mod/assign/components/index/index.ts b/src/addons/mod/assign/components/index/index.ts
index 28827e331..c78728728 100644
--- a/src/addons/mod/assign/components/index/index.ts
+++ b/src/addons/mod/assign/components/index/index.ts
@@ -23,7 +23,6 @@ import { CoreGroupInfo, CoreGroups } from '@services/groups';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
-import { CoreTextUtils } from '@services/utils/text';
 import { CoreTimeUtils } from '@services/utils/time';
 import { CoreUtils } from '@services/utils/utils';
 import { Translate } from '@singletons';
@@ -161,104 +160,75 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
     }
 
     /**
-     * Expand the description.
+     * @inheritdoc
      */
-    expandDescription(ev?: Event): void {
-        ev?.preventDefault();
-        ev?.stopPropagation();
-
-        if (this.assign && (this.description || this.assign.introattachments)) {
-            CoreTextUtils.viewText(Translate.instant('core.description'), this.description || '', {
-                component: this.component,
-                componentId: this.module.id,
-                files: this.assign.introattachments,
-                filter: true,
-                contextLevel: 'module',
-                instanceId: this.module.id,
-                courseId: this.courseId,
-            });
-        }
-    }
-
-    /**
-     * Get assignment data.
-     *
-     * @param refresh If it's refreshing content.
-     * @param sync If it should try to sync.
-     * @param showErrors If show errors to the user of hide them.
-     * @return Promise resolved when done.
-     */
-    protected async fetchContent(refresh = false, sync = false, showErrors = false): Promise<void> {
+    protected async fetchContent(refresh?: boolean, sync = false, showErrors = false): Promise<void> {
 
         // Get assignment data.
-        try {
-            this.assign = await AddonModAssign.getAssignment(this.courseId, this.module.id);
+        this.assign = await AddonModAssign.getAssignment(this.courseId, this.module.id);
 
-            this.dataRetrieved.emit(this.assign);
-            this.description = this.assign.intro;
+        this.dataRetrieved.emit(this.assign);
+        this.description = this.assign.intro;
 
-            if (sync) {
-                // Try to synchronize the assign.
-                await CoreUtils.ignoreErrors(this.syncActivity(showErrors));
-            }
+        if (sync) {
+            // Try to synchronize the assign.
+            await CoreUtils.ignoreErrors(this.syncActivity(showErrors));
+        }
 
-            // Check if there's any offline data for this assign.
-            this.hasOffline = await AddonModAssignOffline.hasAssignOfflineData(this.assign.id);
+        // Check if there's any offline data for this assign.
+        this.hasOffline = await AddonModAssignOffline.hasAssignOfflineData(this.assign.id);
 
-            // Get assignment submissions.
-            const submissions = await AddonModAssign.getSubmissions(this.assign.id, { cmId: this.module.id });
-            const time = CoreTimeUtils.timestamp();
+        // Get assignment submissions.
+        const submissions = await AddonModAssign.getSubmissions(this.assign.id, { cmId: this.module.id });
+        const time = CoreTimeUtils.timestamp();
 
-            this.canViewAllSubmissions = submissions.canviewsubmissions;
+        this.canViewAllSubmissions = submissions.canviewsubmissions;
 
-            if (submissions.canviewsubmissions) {
+        if (submissions.canviewsubmissions) {
 
-                // Calculate the messages to display about time remaining and late submissions.
-                if (this.assign.duedate > 0) {
-                    if (this.assign.duedate - time <= 0) {
-                        this.timeRemaining = Translate.instant('addon.mod_assign.assignmentisdue');
-                    } else {
-                        this.timeRemaining = CoreTimeUtils.formatDuration(this.assign.duedate - time, 3);
-
-                        if (this.assign.cutoffdate) {
-                            if (this.assign.cutoffdate > time) {
-                                this.lateSubmissions = Translate.instant(
-                                    'addon.mod_assign.latesubmissionsaccepted',
-                                    { $a: CoreTimeUtils.userDate(this.assign.cutoffdate * 1000) },
-                                );
-                            } else {
-                                this.lateSubmissions = Translate.instant('addon.mod_assign.nomoresubmissionsaccepted');
-                            }
-                        } else {
-                            this.lateSubmissions = '';
-                        }
-                    }
+            // Calculate the messages to display about time remaining and late submissions.
+            if (this.assign.duedate > 0) {
+                if (this.assign.duedate - time <= 0) {
+                    this.timeRemaining = Translate.instant('addon.mod_assign.assignmentisdue');
                 } else {
-                    this.timeRemaining = '';
-                    this.lateSubmissions = '';
+                    this.timeRemaining = CoreTimeUtils.formatDuration(this.assign.duedate - time, 3);
+
+                    if (this.assign.cutoffdate) {
+                        if (this.assign.cutoffdate > time) {
+                            this.lateSubmissions = Translate.instant(
+                                'addon.mod_assign.latesubmissionsaccepted',
+                                { $a: CoreTimeUtils.userDate(this.assign.cutoffdate * 1000) },
+                            );
+                        } else {
+                            this.lateSubmissions = Translate.instant('addon.mod_assign.nomoresubmissionsaccepted');
+                        }
+                    } else {
+                        this.lateSubmissions = '';
+                    }
                 }
-
-                // Check if groupmode is enabled to avoid showing wrong numbers.
-                this.groupInfo = await CoreGroups.getActivityGroupInfo(this.assign.cmid, false);
-
-                await this.setGroup(CoreGroups.validateGroupId(this.group, this.groupInfo));
-
-                return;
+            } else {
+                this.timeRemaining = '';
+                this.lateSubmissions = '';
             }
 
-            try {
-                // Check if the user can view their own submission.
-                await AddonModAssign.getSubmissionStatus(this.assign.id, { cmId: this.module.id });
-                this.canViewOwnSubmission = true;
-            } catch (error) {
-                this.canViewOwnSubmission = false;
+            // Check if groupmode is enabled to avoid showing wrong numbers.
+            this.groupInfo = await CoreGroups.getActivityGroupInfo(this.assign.cmid, false);
 
-                if (error.errorcode !== 'nopermission') {
-                    throw error;
-                }
+            await this.setGroup(CoreGroups.validateGroupId(this.group, this.groupInfo));
+
+            return;
+        }
+
+        try {
+            // Check if the user can view their own submission.
+            await AddonModAssign.getSubmissionStatus(this.assign.id, { cmId: this.module.id });
+            this.canViewOwnSubmission = true;
+        } catch (error) {
+            this.canViewOwnSubmission = false;
+
+            if (error.errorcode !== 'nopermission') {
+                throw error;
             }
-        } finally {
-            this.fillContextMenu(refresh);
         }
     }
 
diff --git a/src/addons/mod/bigbluebuttonbn/components/index/index.html b/src/addons/mod/bigbluebuttonbn/components/index/index.html
index e10694728..e46bb4a56 100644
--- a/src/addons/mod/bigbluebuttonbn/components/index/index.html
+++ b/src/addons/mod/bigbluebuttonbn/components/index/index.html
@@ -1,23 +1,5 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
-            iconAction="fas-external-link-alt">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
-            (action)="expandDescription()" iconAction="fas-arrow-right">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
-            (action)="gotoBlog()">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="loaded && isOnline" [priority]="700" [content]="'core.refresh' | translate"
-            (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="500" [content]="prefetchText" (action)="prefetch($event)"
-            [iconAction]="prefetchStatusIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-    </core-context-menu>
-
     <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
diff --git a/src/addons/mod/bigbluebuttonbn/components/index/index.ts b/src/addons/mod/bigbluebuttonbn/components/index/index.ts
index 16ff70143..8d85abf94 100644
--- a/src/addons/mod/bigbluebuttonbn/components/index/index.ts
+++ b/src/addons/mod/bigbluebuttonbn/components/index/index.ts
@@ -71,21 +71,18 @@ export class AddonModBBBIndexComponent extends CoreCourseModuleMainActivityCompo
     /**
      * @inheritdoc
      */
-    protected async fetchContent(refresh: boolean = false): Promise<void> {
-        try {
-            this.bbb = await AddonModBBB.getBBB(this.courseId, this.module.id);
+    protected async fetchContent(): Promise<void> {
+        this.bbb = await AddonModBBB.getBBB(this.courseId, this.module.id);
 
-            this.description = this.bbb.intro;
-            this.dataRetrieved.emit(this.bbb);
+        this.description = this.bbb.intro;
+        this.dataRetrieved.emit(this.bbb);
 
-            this.groupInfo = await CoreGroups.getActivityGroupInfo(this.module.id, false);
+        this.groupInfo = await CoreGroups.getActivityGroupInfo(this.module.id, false);
 
-            this.groupId = CoreGroups.validateGroupId(this.groupId, this.groupInfo);
+        this.groupId = CoreGroups.validateGroupId(this.groupId, this.groupInfo);
+
+        await this.fetchMeetingInfo();
 
-            await this.fetchMeetingInfo();
-        } finally {
-            this.fillContextMenu(refresh);
-        }
     }
 
     /**
diff --git a/src/addons/mod/book/components/index/addon-mod-book-index.html b/src/addons/mod/book/components/index/addon-mod-book-index.html
index 4e1084b7a..c673defcf 100644
--- a/src/addons/mod/book/components/index/addon-mod-book-index.html
+++ b/src/addons/mod/book/components/index/addon-mod-book-index.html
@@ -1,21 +1,5 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
-            iconAction="fas-external-link-alt" [showBrowserWarning]="false"></core-context-menu-item>
-        <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
-            (action)="expandDescription()" iconAction="fas-arrow-right"></core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
-            (action)="gotoBlog()"></core-context-menu-item>
-        <core-context-menu-item [priority]="700" [content]="'core.refresh' | translate" (action)="doRefresh(null, $event)"
-            [iconAction]="refreshIcon" [closeOnClick]="false"></core-context-menu-item>
-        <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="600" [content]="prefetchText" (action)="prefetch($event)"
-            [iconAction]="prefetchStatusIcon" [closeOnClick]="false"></core-context-menu-item>
-        <core-context-menu-item *ngIf="size" [priority]="500" [content]="'core.clearstoreddata' | translate:{$a: size}"
-            iconDescription="fas-archive" (action)="removeFiles($event)" iconAction="fas-trash" [closeOnClick]="false">
-        </core-context-menu-item>
-    </core-context-menu>
-
     <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
diff --git a/src/addons/mod/book/components/index/index.ts b/src/addons/mod/book/components/index/index.ts
index 4ef609091..b8d7f4bea 100644
--- a/src/addons/mod/book/components/index/index.ts
+++ b/src/addons/mod/book/components/index/index.ts
@@ -52,15 +52,11 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
     /**
      * @inheritdoc
      */
-    protected async fetchContent(refresh?: boolean): Promise<void> {
-        try {
-            await Promise.all([
-                this.loadBook(),
-                this.loadTOC(),
-            ]);
-        } finally {
-            this.fillContextMenu(refresh);
-        }
+    protected async fetchContent(): Promise<void> {
+        await Promise.all([
+            this.loadBook(),
+            this.loadTOC(),
+        ]);
     }
 
     /**
diff --git a/src/addons/mod/chat/components/index/addon-mod-chat-index.html b/src/addons/mod/chat/components/index/addon-mod-chat-index.html
index 5851b8e75..43db1e541 100644
--- a/src/addons/mod/chat/components/index/addon-mod-chat-index.html
+++ b/src/addons/mod/chat/components/index/addon-mod-chat-index.html
@@ -1,27 +1,5 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
-            iconAction="fas-external-link-alt" [showBrowserWarning]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
-            (action)="expandDescription()" iconAction="fas-arrow-right">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
-            (action)="gotoBlog()">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="loaded && isOnline" [priority]="700" [content]="'core.refresh' | translate"
-            (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="loaded && hasOffline && isOnline" [priority]="600"
-            [content]="'core.settings.synchronizenow' | translate" (action)="doRefresh(null, $event, true)" [iconAction]="syncIcon"
-            [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="500" [content]="prefetchText" (action)="prefetch($event)"
-            [iconAction]="prefetchStatusIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-    </core-context-menu>
-
     <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
diff --git a/src/addons/mod/chat/components/index/index.ts b/src/addons/mod/chat/components/index/index.ts
index fe6a7dd65..159f4e462 100644
--- a/src/addons/mod/chat/components/index/index.ts
+++ b/src/addons/mod/chat/components/index/index.ts
@@ -70,27 +70,23 @@ export class AddonModChatIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * @inheritdoc
      */
-    protected async fetchContent(refresh: boolean = false): Promise<void> {
-        try {
-            this.chat = await AddonModChat.getChat(this.courseId, this.module.id);
+    protected async fetchContent(): Promise<void> {
+        this.chat = await AddonModChat.getChat(this.courseId, this.module.id);
 
-            this.description = this.chat.intro;
-            const now = CoreTimeUtils.timestamp();
-            const span = (this.chat.chattime || 0) - now;
+        this.description = this.chat.intro;
+        const now = CoreTimeUtils.timestamp();
+        const span = (this.chat.chattime || 0) - now;
 
-            if (this.chat.chattime && this.chat.schedule && span > 0) {
-                this.chatInfo = {
-                    date: CoreTimeUtils.userDate(this.chat.chattime * 1000),
-                    fromnow: CoreTimeUtils.formatTime(span),
-                };
-            } else {
-                this.chatInfo = undefined;
-            }
-
-            this.dataRetrieved.emit(this.chat);
-        } finally {
-            this.fillContextMenu(refresh);
+        if (this.chat.chattime && this.chat.schedule && span > 0) {
+            this.chatInfo = {
+                date: CoreTimeUtils.userDate(this.chat.chattime * 1000),
+                fromnow: CoreTimeUtils.formatTime(span),
+            };
+        } else {
+            this.chatInfo = undefined;
         }
+
+        this.dataRetrieved.emit(this.chat);
     }
 
     /**
diff --git a/src/addons/mod/choice/components/index/addon-mod-choice-index.html b/src/addons/mod/choice/components/index/addon-mod-choice-index.html
index 4b32c2dbf..15cdfbec4 100644
--- a/src/addons/mod/choice/components/index/addon-mod-choice-index.html
+++ b/src/addons/mod/choice/components/index/addon-mod-choice-index.html
@@ -1,29 +1,5 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
-            iconAction="fas-external-link-alt" [showBrowserWarning]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
-            (action)="expandDescription()" iconAction="fas-arrow-right">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
-            (action)="gotoBlog()">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="loaded && !hasOffline && isOnline" [priority]="700" [content]="'core.refresh' | translate"
-            (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="loaded && hasOffline && isOnline" [priority]="600" (action)="doRefresh(null, $event, true)"
-            [content]="'core.settings.synchronizenow' | translate" [iconAction]="syncIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="500" [content]="prefetchText" (action)="prefetch($event)"
-            [iconAction]="prefetchStatusIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="size" [priority]="400" [content]="'core.clearstoreddata' | translate:{$a: size}"
-            iconDescription="fas-archive" (action)="removeFiles($event)" iconAction="fas-trash" [closeOnClick]="false">
-        </core-context-menu-item>
-    </core-context-menu>
-
     <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
diff --git a/src/addons/mod/choice/components/index/index.ts b/src/addons/mod/choice/components/index/index.ts
index 171ebf8fa..2597bde19 100644
--- a/src/addons/mod/choice/components/index/index.ts
+++ b/src/addons/mod/choice/components/index/index.ts
@@ -132,43 +132,39 @@ export class AddonModChoiceIndexComponent extends CoreCourseModuleMainActivityCo
     /**
      * @inheritdoc
      */
-    protected async fetchContent(refresh: boolean = false, sync: boolean = false, showErrors: boolean = false): Promise<void> {
+    protected async fetchContent(refresh?: boolean, sync = false, showErrors = false): Promise<void> {
         this.now = Date.now();
 
-        try {
-            this.choice = await AddonModChoice.getChoice(this.courseId, this.module.id);
+        this.choice = await AddonModChoice.getChoice(this.courseId, this.module.id);
 
-            if (sync) {
-                // Try to synchronize the choice.
-                const updated = await this.syncActivity(showErrors);
+        if (sync) {
+            // Try to synchronize the choice.
+            const updated = await this.syncActivity(showErrors);
 
-                if (updated) {
-                    // Responses were sent, update the choice.
-                    this.choice = await AddonModChoice.getChoice(this.courseId, this.module.id);
-                }
+            if (updated) {
+                // Responses were sent, update the choice.
+                this.choice = await AddonModChoice.getChoice(this.courseId, this.module.id);
             }
-
-            this.choice.timeopen = (this.choice.timeopen || 0) * 1000;
-            this.choice.timeclose = (this.choice.timeclose || 0) * 1000;
-            this.openTimeReadable = CoreTimeUtils.userDate(this.choice.timeopen);
-            this.closeTimeReadable = CoreTimeUtils.userDate(this.choice.timeclose);
-
-            this.description = this.choice.intro;
-            this.choiceNotOpenYet = !!this.choice.timeopen && this.choice.timeopen > this.now;
-            this.choiceClosed = !!this.choice.timeclose && this.choice.timeclose <= this.now;
-
-            this.dataRetrieved.emit(this.choice);
-
-            // Check if there are responses stored in offline.
-            this.hasOffline = await AddonModChoiceOffline.hasResponse(this.choice.id);
-
-            // We need fetchOptions to finish before calling fetchResults because it needs hasAnsweredOnline variable.
-            await this.fetchOptions(this.choice);
-
-            await this.fetchResults(this.choice);
-        } finally {
-            this.fillContextMenu(refresh);
         }
+
+        this.choice.timeopen = (this.choice.timeopen || 0) * 1000;
+        this.choice.timeclose = (this.choice.timeclose || 0) * 1000;
+        this.openTimeReadable = CoreTimeUtils.userDate(this.choice.timeopen);
+        this.closeTimeReadable = CoreTimeUtils.userDate(this.choice.timeclose);
+
+        this.description = this.choice.intro;
+        this.choiceNotOpenYet = !!this.choice.timeopen && this.choice.timeopen > this.now;
+        this.choiceClosed = !!this.choice.timeclose && this.choice.timeclose <= this.now;
+
+        this.dataRetrieved.emit(this.choice);
+
+        // Check if there are responses stored in offline.
+        this.hasOffline = await AddonModChoiceOffline.hasResponse(this.choice.id);
+
+        // We need fetchOptions to finish before calling fetchResults because it needs hasAnsweredOnline variable.
+        await this.fetchOptions(this.choice);
+
+        await this.fetchResults(this.choice);
     }
 
     /**
@@ -433,7 +429,7 @@ export class AddonModChoiceIndexComponent extends CoreCourseModuleMainActivityCo
      * @return Promise resolved when done.
      */
     protected async dataUpdated(online: boolean): Promise<void> {
-        if (!online || !this.isPrefetched) {
+        if (!online || !this.isPrefetched()) {
             // Not downloaded, just refresh the data.
             return this.refreshContent(false);
         }
diff --git a/src/addons/mod/data/components/index/addon-mod-data-index.html b/src/addons/mod/data/components/index/addon-mod-data-index.html
index b64adbce8..a80142873 100644
--- a/src/addons/mod/data/components/index/addon-mod-data-index.html
+++ b/src/addons/mod/data/components/index/addon-mod-data-index.html
@@ -4,34 +4,12 @@
         <ion-icon name="fas-search" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
     <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
-            iconAction="fas-external-link-alt" [showBrowserWarning]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
-            (action)="expandDescription()" iconAction="fas-arrow-right">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
-            (action)="gotoBlog()">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="loaded && !(hasOffline || hasOfflineRatings) && isOnline" [priority]="700"
-            [content]="'core.refresh' | translate" (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="loaded && (hasOffline || hasOfflineRatings) && isOnline" [priority]="600"
-            [content]="'core.settings.synchronizenow' | translate" (action)="doRefresh(null, $event, true)" [iconAction]="syncIcon"
-            [closeOnClick]="false">
-        </core-context-menu-item>
         <core-context-menu-item [priority]="500" *ngIf="canAdd" [content]="'addon.mod_data.addentries' | translate" iconAction="fas-plus"
             (action)="gotoAddEntries()">
         </core-context-menu-item>
         <core-context-menu-item [priority]="400" *ngIf="firstEntry" [content]="'addon.mod_data.single' | translate" iconAction="fas-file"
             (action)="gotoEntry(firstEntry)">
         </core-context-menu-item>
-        <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="300" [content]="prefetchText" (action)="prefetch($event)"
-            [iconAction]="prefetchStatusIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="size" [priority]="200" [content]="'core.clearstoreddata' | translate:{$a: size}"
-            iconDescription="fas-archive" (action)="removeFiles($event)" iconAction="fas-trash" [closeOnClick]="false">
-        </core-context-menu-item>
     </core-context-menu>
 
     <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
diff --git a/src/addons/mod/data/components/index/index.ts b/src/addons/mod/data/components/index/index.ts
index 3386cbd82..543cceeda 100644
--- a/src/addons/mod/data/components/index/index.ts
+++ b/src/addons/mod/data/components/index/index.ts
@@ -202,14 +202,9 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
     }
 
     /**
-     * Download data contents.
-     *
-     * @param refresh If it's refreshing content.
-     * @param sync If it should try to sync.
-     * @param showErrors If show errors to the user of hide them.
-     * @return Promise resolved when done.
+     * @inheritdoc
      */
-    protected async fetchContent(refresh: boolean = false, sync: boolean = false, showErrors: boolean = false): Promise<void> {
+    protected async fetchContent(refresh?: boolean, sync = false, showErrors = false): Promise<void> {
         let canAdd = false;
         let canSearch = false;
 
@@ -270,7 +265,6 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
         } finally {
             this.canAdd = canAdd;
             this.canSearch = canSearch;
-            this.fillContextMenu(refresh);
         }
     }
 
diff --git a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
index bb3b4550e..eb54799b8 100644
--- a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
+++ b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
@@ -1,29 +1,5 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
-            iconAction="fas-external-link-alt" [showBrowserWarning]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
-            (action)="expandDescription()" iconAction="fas-arrow-right">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
-            (action)="gotoBlog()">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="loaded && !hasOffline && isOnline" [priority]="700" [content]="'core.refresh' | translate"
-            (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="loaded && hasOffline && isOnline" [priority]="600" (action)="doRefresh(null, $event, true)"
-            [content]="'core.settings.synchronizenow' | translate" [iconAction]="syncIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="500" [content]="prefetchText" (action)="prefetch($event)"
-            [iconAction]="prefetchStatusIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="size" [priority]="400" [content]="'core.clearstoreddata' | translate:{$a: size}"
-            iconDescription="fas-archive" (action)="removeFiles($event)" iconAction="fas-trash" [closeOnClick]="false">
-        </core-context-menu-item>
-    </core-context-menu>
-
     <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
diff --git a/src/addons/mod/feedback/components/index/index.ts b/src/addons/mod/feedback/components/index/index.ts
index 3f3f94027..255b0e6ce 100644
--- a/src/addons/mod/feedback/components/index/index.ts
+++ b/src/addons/mod/feedback/components/index/index.ts
@@ -172,7 +172,7 @@ export class AddonModFeedbackIndexComponent extends CoreCourseModuleMainActivity
     /**
      * @inheritdoc
      */
-    protected async fetchContent(refresh: boolean = false, sync: boolean = false, showErrors: boolean = false): Promise<void> {
+    protected async fetchContent(refresh?: boolean, sync = false, showErrors = false): Promise<void> {
         try {
             this.feedback = await AddonModFeedback.getFeedback(this.courseId, this.module.id);
 
@@ -201,9 +201,6 @@ export class AddonModFeedbackIndexComponent extends CoreCourseModuleMainActivity
 
             await this.fetchFeedbackOverviewData();
         } finally {
-            // Now fill the context menu.
-            this.fillContextMenu(refresh);
-
             if (this.feedback) {
                 // Check if there are responses stored in offline.
                 this.hasOffline = await AddonModFeedbackOffline.hasFeedbackOfflineData(this.feedback.id);
diff --git a/src/addons/mod/folder/components/index/addon-mod-folder-index.html b/src/addons/mod/folder/components/index/addon-mod-folder-index.html
index ea4d48cdf..e50f4f51b 100644
--- a/src/addons/mod/folder/components/index/addon-mod-folder-index.html
+++ b/src/addons/mod/folder/components/index/addon-mod-folder-index.html
@@ -1,26 +1,5 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
-            iconAction="fas-external-link-alt" [showBrowserWarning]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
-            (action)="expandDescription()" iconAction="fas-arrow-right">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
-            (action)="gotoBlog()">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="!subfolder" [priority]="700" [content]="'core.refresh' | translate"
-            (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="600" [content]="prefetchText" (action)="prefetch($event)"
-            [iconAction]="prefetchStatusIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="size" [priority]="500" [content]="'core.clearstoreddata' | translate:{$a: size}"
-            iconDescription="fas-archive" (action)="removeFiles($event)" iconAction="fas-trash" [closeOnClick]="false">
-        </core-context-menu-item>
-    </core-context-menu>
-
     <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
diff --git a/src/addons/mod/folder/components/index/index.ts b/src/addons/mod/folder/components/index/index.ts
index 73cdb6271..562a2824e 100644
--- a/src/addons/mod/folder/components/index/index.ts
+++ b/src/addons/mod/folder/components/index/index.ts
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { CoreConstants } from '@/core/constants';
 import { Component, Input, OnInit, Optional } from '@angular/core';
 import { Params } from '@angular/router';
 import { CoreCourseModuleMainResourceComponent } from '@features/course/classes/main-resource-component';
@@ -57,7 +56,6 @@ export class AddonModFolderIndexComponent extends CoreCourseModuleMainResourceCo
             this.contents = this.subfolder;
 
             this.loaded = true;
-            this.refreshIcon = CoreConstants.ICON_REFRESH;
 
             return;
         }
@@ -73,7 +71,6 @@ export class AddonModFolderIndexComponent extends CoreCourseModuleMainResourceCo
             }
         } finally {
             this.loaded = true;
-            this.refreshIcon = CoreConstants.ICON_REFRESH;
         }
     }
 
@@ -87,24 +84,17 @@ export class AddonModFolderIndexComponent extends CoreCourseModuleMainResourceCo
     }
 
     /**
-     * Download folder contents.
-     *
-     * @param refresh Whether we're refreshing data.
-     * @return Promise resolved when done.
+     * @inheritdoc
      */
     protected async fetchContent(refresh = false): Promise<void> {
-        try {
-            this.folderInstance = await AddonModFolder.getFolder(this.courseId, this.module.id);
+        this.folderInstance = await AddonModFolder.getFolder(this.courseId, this.module.id);
 
-            const contents = await CoreCourse.getModuleContents(this.module, undefined, undefined, false, refresh);
+        const contents = await CoreCourse.getModuleContents(this.module, undefined, undefined, false, refresh);
 
-            this.dataRetrieved.emit(this.folderInstance || this.module);
+        this.dataRetrieved.emit(this.folderInstance || this.module);
 
-            this.description = this.folderInstance ? this.folderInstance.intro : this.module.description;
-            this.contents = AddonModFolderHelper.formatContents(contents);
-        } finally {
-            this.fillContextMenu(refresh);
-        }
+        this.description = this.folderInstance ? this.folderInstance.intro : this.module.description;
+        this.contents = AddonModFolderHelper.formatContents(contents);
     }
 
     /**
diff --git a/src/addons/mod/forum/components/index/index.html b/src/addons/mod/forum/components/index/index.html
index 3bd8b6ada..b16a7b9d4 100644
--- a/src/addons/mod/forum/components/index/index.html
+++ b/src/addons/mod/forum/components/index/index.html
@@ -1,29 +1,6 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
     <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
-            iconAction="fas-external-link-alt" [showBrowserWarning]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
-            (action)="expandDescription()" iconAction="fas-arrow-right">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
-            (action)="gotoBlog()">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="discussions && discussions.loaded && !(hasOffline || hasOfflineRatings) && isOnline" [priority]="700"
-            [content]="'addon.mod_forum.refreshdiscussions' | translate" [iconAction]="refreshIcon" [closeOnClick]="false"
-            (action)="doRefresh(null, $event)">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="discussions && discussions.loaded && (hasOffline || hasOfflineRatings) && isOnline" [priority]="600"
-            [content]="'core.settings.synchronizenow' | translate" [iconAction]="syncIcon" [closeOnClick]="false"
-            (action)="doRefresh(null, $event, true)">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="500" [content]="prefetchText" [iconAction]="prefetchStatusIcon"
-            [closeOnClick]="false" (action)="prefetch($event)">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="size" iconDescription="fas-archive" iconAction="fas-trash" [priority]="400"
-            [content]="'core.clearstoreddata' | translate:{$a: size}" [closeOnClick]="false" (action)="removeFiles($event)">
-        </core-context-menu-item>
         <core-context-menu-item *ngIf="sortingAvailable" iconAction="fas-sort" [priority]="300" [content]="'core.sort' | translate"
             (action)="showSortOrderSelector()">
         </core-context-menu-item>
diff --git a/src/addons/mod/forum/components/index/index.ts b/src/addons/mod/forum/components/index/index.ts
index 3c8337d41..40fda05ae 100644
--- a/src/addons/mod/forum/components/index/index.ts
+++ b/src/addons/mod/forum/components/index/index.ts
@@ -296,13 +296,9 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
     }
 
     /**
-     * Download the component contents.
-     *
-     * @param refresh Whether we're refreshing data.
-     * @param sync If the refresh needs syncing.
-     * @param showErrors Wether to show errors to the user or hide them.
+     * @inheritdoc
      */
-    protected async fetchContent(refresh: boolean = false, sync: boolean = false, showErrors: boolean = false): Promise<void> {
+    protected async fetchContent(refresh = false, sync = false, showErrors = false): Promise<void> {
         this.fetchFailed = false;
 
         try {
@@ -329,8 +325,6 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
             this.fetchFailed = true; // Set to prevent infinite calls with infinite-loading.
 
             throw error; // Pass the error to the parent catch.
-        } finally {
-            this.fillContextMenu(refresh);
         }
     }
 
diff --git a/src/addons/mod/forum/lang.json b/src/addons/mod/forum/lang.json
index 11f77ca53..86e48abf7 100644
--- a/src/addons/mod/forum/lang.json
+++ b/src/addons/mod/forum/lang.json
@@ -50,7 +50,6 @@
     "posttomygroups": "Post a copy to all groups",
     "privatereply": "Reply privately",
     "re": "Re:",
-    "refreshdiscussions": "Refresh discussions",
     "refreshposts": "Refresh posts",
     "removefromfavourites": "Unstar this discussion",
     "reply": "Reply",
diff --git a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
index 142f410eb..2341c36e7 100644
--- a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
+++ b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
@@ -10,31 +10,9 @@
     </ion-button>
 
     <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
-            iconAction="fas-external-link-alt" [showBrowserWarning]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
-            (action)="expandDescription()" iconAction="fas-arrow-right">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
-            (action)="gotoBlog()">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="loaded && !(hasOffline || hasOfflineRatings) && isOnline" [priority]="700"
-            [content]="'core.refresh' | translate" (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="loaded && (hasOffline || hasOfflineRatings) && isOnline" [priority]="600"
-            (action)="doRefresh(null, $event, true)" [content]="'core.settings.synchronizenow' | translate" [iconAction]="syncIcon"
-            [closeOnClick]="false">
-        </core-context-menu-item>
         <core-context-menu-item *ngIf="canAdd" [priority]="550" [content]="'addon.mod_glossary.addentry' | translate"
             (action)="openNewEntry()" iconAction="fas-plus">
         </core-context-menu-item>
-        <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="500" [content]="prefetchText" (action)="prefetch($event)"
-            [iconAction]="prefetchStatusIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="size" [priority]="400" [content]="'core.clearstoreddata' | translate:{$a: size}"
-            iconDescription="fas-archive" (action)="removeFiles($event)" iconAction="fas-trash" [closeOnClick]="false">
-        </core-context-menu-item>
     </core-context-menu>
 
     <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
diff --git a/src/addons/mod/glossary/components/index/index.ts b/src/addons/mod/glossary/components/index/index.ts
index 7cf42ded3..cbcc5aa89 100644
--- a/src/addons/mod/glossary/components/index/index.ts
+++ b/src/addons/mod/glossary/components/index/index.ts
@@ -177,39 +177,35 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
     /**
      * @inheritdoc
      */
-    protected async fetchContent(refresh: boolean = false, sync: boolean = false, showErrors: boolean = false): Promise<void> {
+    protected async fetchContent(refresh = false, sync = false, showErrors = false): Promise<void> {
         const entries = await this.promisedEntries;
 
-        try {
-            await entries.getSource().loadGlossary();
+        await entries.getSource().loadGlossary();
 
-            if (!this.glossary) {
-                return;
-            }
-
-            this.description = this.glossary.intro || this.description;
-            this.canAdd = !!this.glossary.canaddentry || false;
-
-            this.dataRetrieved.emit(this.glossary);
-
-            if (!entries.getSource().fetchMode) {
-                this.switchMode('letter_all');
-            }
-
-            if (sync) {
-                // Try to synchronize the glossary.
-                await this.syncActivity(showErrors);
-            }
-
-            const [hasOfflineRatings] = await Promise.all([
-                CoreRatingOffline.hasRatings('mod_glossary', 'entry', ContextLevel.MODULE, this.glossary.coursemodule),
-                refresh ? entries.reload() : entries.load(),
-            ]);
-
-            this.hasOfflineRatings = hasOfflineRatings;
-        } finally {
-            this.fillContextMenu(refresh);
+        if (!this.glossary) {
+            return;
         }
+
+        this.description = this.glossary.intro || this.description;
+        this.canAdd = !!this.glossary.canaddentry || false;
+
+        this.dataRetrieved.emit(this.glossary);
+
+        if (!entries.getSource().fetchMode) {
+            this.switchMode('letter_all');
+        }
+
+        if (sync) {
+            // Try to synchronize the glossary.
+            await this.syncActivity(showErrors);
+        }
+
+        const [hasOfflineRatings] = await Promise.all([
+            CoreRatingOffline.hasRatings('mod_glossary', 'entry', ContextLevel.MODULE, this.glossary.coursemodule),
+            refresh ? entries.reload() : entries.load(),
+        ]);
+
+        this.hasOfflineRatings = hasOfflineRatings;
     }
 
     /**
diff --git a/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html b/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
index e7b6e7ea2..fc7dfb9ed 100644
--- a/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
+++ b/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
@@ -3,31 +3,10 @@
     <core-context-menu>
         <core-context-menu-item *ngIf="h5pActivity && h5pActivity.enabletracking && accessInfo && !accessInfo.canreviewattempts"
             [priority]="1000" [content]="'addon.mod_h5pactivity.attempts_report' | translate" (action)="viewMyAttempts()"
-            iconAction="stats-chart">
+            iconAction="fas-chart-bar">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="canViewAllAttempts" [priority]="1000" [content]="'addon.mod_h5pactivity.attempts_report' | translate"
-            (action)="viewAllAttempts()" iconAction="stats-chart">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
-            iconAction="fas-external-link-alt" [showBrowserWarning]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
-            (action)="expandDescription()" iconAction="fas-arrow-right">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
-            (action)="gotoBlog()">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="loaded && !hasOffline && isOnline" [priority]="700" [content]="'core.refresh' | translate"
-            (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="loaded && hasOffline && isOnline" [priority]="600" (action)="doRefresh(null, $event, true)"
-            [content]="'core.settings.synchronizenow' | translate" [iconAction]="syncIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="500" [content]="prefetchText" (action)="prefetch($event)"
-            [iconAction]="prefetchStatusIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="size" [priority]="400" [content]="'core.clearstoreddata' | translate:{$a: size}"
-            iconDescription="fas-archive" (action)="removeFiles($event)" iconAction="fas-trash" [closeOnClick]="false">
+            (action)="viewAllAttempts()" iconAction="fas-chart-bar">
         </core-context-menu-item>
     </core-context-menu>
 
diff --git a/src/addons/mod/h5pactivity/components/index/index.ts b/src/addons/mod/h5pactivity/components/index/index.ts
index f8cb4d015..834a623a7 100644
--- a/src/addons/mod/h5pactivity/components/index/index.ts
+++ b/src/addons/mod/h5pactivity/components/index/index.ts
@@ -112,51 +112,47 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
     /**
      * @inheritdoc
      */
-    protected async fetchContent(refresh: boolean = false, sync: boolean = false, showErrors: boolean = false): Promise<void> {
-        try {
-            this.h5pActivity = await AddonModH5PActivity.getH5PActivity(this.courseId, this.module.id, {
-                siteId: this.siteId,
-            });
+    protected async fetchContent(refresh?: boolean, sync = false, showErrors = false): Promise<void> {
+        this.h5pActivity = await AddonModH5PActivity.getH5PActivity(this.courseId, this.module.id, {
+            siteId: this.siteId,
+        });
 
-            this.dataRetrieved.emit(this.h5pActivity);
-            this.description = this.h5pActivity.intro;
-            this.displayOptions = CoreH5PHelper.decodeDisplayOptions(this.h5pActivity.displayoptions);
+        this.dataRetrieved.emit(this.h5pActivity);
+        this.description = this.h5pActivity.intro;
+        this.displayOptions = CoreH5PHelper.decodeDisplayOptions(this.h5pActivity.displayoptions);
 
-            if (sync) {
-                await this.syncActivity(showErrors);
-            }
+        if (sync) {
+            await this.syncActivity(showErrors);
+        }
 
-            await Promise.all([
-                this.checkHasOffline(),
-                this.fetchAccessInfo(),
-                this.fetchDeployedFileData(),
-            ]);
+        await Promise.all([
+            this.checkHasOffline(),
+            this.fetchAccessInfo(),
+            this.fetchDeployedFileData(),
+        ]);
 
-            this.trackComponent = this.accessInfo?.cansubmit ? AddonModH5PActivityProvider.TRACK_COMPONENT : '';
-            this.canViewAllAttempts = !!this.h5pActivity.enabletracking && !!this.accessInfo?.canreviewattempts &&
+        this.trackComponent = this.accessInfo?.cansubmit ? AddonModH5PActivityProvider.TRACK_COMPONENT : '';
+        this.canViewAllAttempts = !!this.h5pActivity.enabletracking && !!this.accessInfo?.canreviewattempts &&
                 AddonModH5PActivity.canGetUsersAttemptsInSite();
 
-            if (this.h5pActivity.package && this.h5pActivity.package[0]) {
-                // The online player should use the original file, not the trusted one.
-                this.onlinePlayerUrl = CoreH5P.h5pPlayer.calculateOnlinePlayerUrl(
-                    this.site.getURL(),
-                    this.h5pActivity.package[0].fileurl,
-                    this.displayOptions,
-                    this.trackComponent,
-                );
-            }
+        if (this.h5pActivity.package && this.h5pActivity.package[0]) {
+            // The online player should use the original file, not the trusted one.
+            this.onlinePlayerUrl = CoreH5P.h5pPlayer.calculateOnlinePlayerUrl(
+                this.site.getURL(),
+                this.h5pActivity.package[0].fileurl,
+                this.displayOptions,
+                this.trackComponent,
+            );
+        }
 
-            if (!this.siteCanDownload || this.state == CoreConstants.DOWNLOADED) {
-                // Cannot download the file or already downloaded, play the package directly.
-                this.play();
+        if (!this.siteCanDownload || this.state == CoreConstants.DOWNLOADED) {
+            // Cannot download the file or already downloaded, play the package directly.
+            this.play();
 
-            } else if ((this.state == CoreConstants.NOT_DOWNLOADED || this.state == CoreConstants.OUTDATED) && CoreApp.isOnline() &&
+        } else if ((this.state == CoreConstants.NOT_DOWNLOADED || this.state == CoreConstants.OUTDATED) && CoreApp.isOnline() &&
                     this.deployedFile?.filesize && CoreFilepool.shouldDownload(this.deployedFile.filesize)) {
-                // Package is small, download it automatically. Don't block this function for this.
-                this.downloadAutomatically();
-            }
-        } finally {
-            this.fillContextMenu(refresh);
+            // Package is small, download it automatically. Don't block this function for this.
+            this.downloadAutomatically();
         }
     }
 
@@ -529,19 +525,6 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
         this.checkHasOffline();
     }
 
-    /**
-     * @inheritdoc
-     */
-    async gotoBlog(): Promise<void> {
-        this.isOpeningPage = true;
-
-        try {
-            await super.gotoBlog();
-        } finally {
-            this.isOpeningPage = false;
-        }
-    }
-
     /**
      * Component destroyed.
      */
diff --git a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
index b6856d0db..a8d3096cf 100644
--- a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
+++ b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
@@ -3,26 +3,6 @@
     <ion-button *ngIf="loaded" (click)="showToc()" aria-haspopup="true" [attr.aria-label]="'addon.mod_imscp.toc' | translate">
         <ion-icon name="fas-bookmark" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
-    <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
-            iconAction="fas-external-link-alt" [showBrowserWarning]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
-            (action)="expandDescription()" iconAction="fas-arrow-right">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
-            (action)="gotoBlog()">
-        </core-context-menu-item>
-        <core-context-menu-item [priority]="700" [content]="'core.refresh' | translate" (action)="doRefresh(null, $event)"
-            [iconAction]="refreshIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="600" [content]="prefetchText" (action)="prefetch($event)"
-            [iconAction]="prefetchStatusIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="size" [priority]="500" [content]="'core.clearstoreddata' | translate:{$a: size}"
-            iconDescription="fas-archive" (action)="removeFiles($event)" iconAction="fas-trash" [closeOnClick]="false">
-        </core-context-menu-item>
-    </core-context-menu>
 
     <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
diff --git a/src/addons/mod/imscp/components/index/index.ts b/src/addons/mod/imscp/components/index/index.ts
index 0b6ae75a5..78df65bac 100644
--- a/src/addons/mod/imscp/components/index/index.ts
+++ b/src/addons/mod/imscp/components/index/index.ts
@@ -39,6 +39,7 @@ export class AddonModImscpIndexComponent extends CoreCourseModuleMainResourceCom
 
     protected items: AddonModImscpTocItem[] = [];
     protected currentHref?: string;
+    protected displayDescription = false;
 
     constructor(@Optional() courseContentsPage?: CoreCourseContentsPage) {
         super('AddonModImscpIndexComponent', courseContentsPage);
@@ -70,42 +71,33 @@ export class AddonModImscpIndexComponent extends CoreCourseModuleMainResourceCom
     }
 
     /**
-     * Download imscp contents.
-     *
-     * @param refresh Whether we're refreshing data.
-     * @return Promise resolved when done.
+     * @inheritdoc
      */
     protected async fetchContent(refresh = false): Promise<void> {
-        try {
-            const downloadResult = await this.downloadResourceIfNeeded(refresh);
+        const downloadResult = await this.downloadResourceIfNeeded(refresh);
 
-            const imscp = await AddonModImscp.getImscp(this.courseId, this.module.id);
-            this.description = imscp.intro;
-            this.dataRetrieved.emit(imscp);
+        const imscp = await AddonModImscp.getImscp(this.courseId, this.module.id);
+        this.description = imscp.intro;
+        this.dataRetrieved.emit(imscp);
 
-            // Get contents. No need to refresh, it has been done in downloadResourceIfNeeded.
-            const contents = await CoreCourse.getModuleContents(this.module);
+        // Get contents. No need to refresh, it has been done in downloadResourceIfNeeded.
+        const contents = await CoreCourse.getModuleContents(this.module);
 
-            this.items = AddonModImscp.createItemList(contents);
+        this.items = AddonModImscp.createItemList(contents);
 
-            if (this.items.length && this.currentHref === undefined) {
-                this.currentHref = this.items[0].href;
-            }
-
-            try {
-                await this.loadItemHref(this.currentHref);
-            } catch (error) {
-                CoreDomUtils.showErrorModalDefault(error, 'addon.mod_imscp.deploymenterror', true);
-
-                throw new CoreSilentError(error);
-            }
-
-            this.warning = downloadResult.failed ? this.getErrorDownloadingSomeFilesMessage(downloadResult.error!) : '';
-
-        } finally {
-            // Pass false because downloadResourceIfNeeded already invalidates and refresh data if refresh=true.
-            this.fillContextMenu(false);
+        if (this.items.length && this.currentHref === undefined) {
+            this.currentHref = this.items[0].href;
         }
+
+        try {
+            await this.loadItemHref(this.currentHref);
+        } catch (error) {
+            CoreDomUtils.showErrorModalDefault(error, 'addon.mod_imscp.deploymenterror', true);
+
+            throw new CoreSilentError(error);
+        }
+
+        this.warning = downloadResult.failed ? this.getErrorDownloadingSomeFilesMessage(downloadResult.error!) : '';
     }
 
     /**
diff --git a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
index dd57d8860..350ed2e21 100644
--- a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
+++ b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
@@ -1,29 +1,5 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
-            iconAction="fas-external-link-alt" [showBrowserWarning]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
-            (action)="expandDescription()" iconAction="fas-arrow-right">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
-            (action)="gotoBlog()">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="loaded && !hasOffline && isOnline" [priority]="700" [content]="'core.refresh' | translate"
-            (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="loaded && hasOffline && isOnline" [priority]="600" (action)="doRefresh(null, $event, true)"
-            [content]="'core.settings.synchronizenow' | translate" [iconAction]="syncIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="500" [content]="prefetchText" (action)="prefetch($event)"
-            [iconAction]="prefetchStatusIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="size" [priority]="400" [content]="'core.clearstoreddata' | translate:{$a: size}"
-            iconDescription="fas-archive" (action)="removeFiles($event)" iconAction="fas-trash" [closeOnClick]="false">
-        </core-context-menu-item>
-    </core-context-menu>
-
     <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
diff --git a/src/addons/mod/lesson/components/index/index.ts b/src/addons/mod/lesson/components/index/index.ts
index 522d769fa..8c3a34a4a 100644
--- a/src/addons/mod/lesson/components/index/index.ts
+++ b/src/addons/mod/lesson/components/index/index.ts
@@ -136,85 +136,76 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo
     }
 
     /**
-     * Get the lesson data.
-     *
-     * @param refresh If it's refreshing content.
-     * @param sync If it should try to sync.
-     * @param showErrors If show errors to the user of hide them.
-     * @return Promise resolved when done.
+     * @inheritdoc
      */
-    protected async fetchContent(refresh: boolean = false, sync: boolean = false, showErrors: boolean = false): Promise<void> {
-        try {
-            let lessonReady = true;
-            this.askPassword = false;
+    protected async fetchContent(refresh?: boolean, sync = false, showErrors = false): Promise<void> {
+        let lessonReady = true;
+        this.askPassword = false;
 
-            this.lesson = await AddonModLesson.getLesson(this.courseId, this.module.id);
+        this.lesson = await AddonModLesson.getLesson(this.courseId, this.module.id);
 
-            this.dataRetrieved.emit(this.lesson);
-            this.description = this.lesson.intro; // Show description only if intro is present.
+        this.dataRetrieved.emit(this.lesson);
+        this.description = this.lesson.intro; // Show description only if intro is present.
 
-            if (sync) {
-                // Try to synchronize the lesson.
-                await this.syncActivity(showErrors);
-            }
+        if (sync) {
+            // Try to synchronize the lesson.
+            await this.syncActivity(showErrors);
+        }
 
-            this.accessInfo = await AddonModLesson.getAccessInformation(this.lesson.id, { cmId: this.module.id });
-            this.canManage = this.accessInfo.canmanage;
-            this.canViewReports = this.accessInfo.canviewreports;
-            this.preventReasons = [];
-            const promises: Promise<void>[] = [];
+        this.accessInfo = await AddonModLesson.getAccessInformation(this.lesson.id, { cmId: this.module.id });
+        this.canManage = this.accessInfo.canmanage;
+        this.canViewReports = this.accessInfo.canviewreports;
+        this.preventReasons = [];
+        const promises: Promise<void>[] = [];
 
-            if (AddonModLesson.isLessonOffline(this.lesson)) {
-                // Handle status.
-                this.setStatusListener();
+        if (AddonModLesson.isLessonOffline(this.lesson)) {
+            // Handle status.
+            this.setStatusListener();
 
-                promises.push(this.loadOfflineData());
-            }
+            promises.push(this.loadOfflineData());
+        }
 
-            if (this.accessInfo.preventaccessreasons.length) {
-                let preventReason = AddonModLesson.getPreventAccessReason(this.accessInfo, false);
-                const askPassword = preventReason?.reason == 'passwordprotectedlesson';
+        if (this.accessInfo.preventaccessreasons.length) {
+            let preventReason = AddonModLesson.getPreventAccessReason(this.accessInfo, false);
+            const askPassword = preventReason?.reason == 'passwordprotectedlesson';
 
-                if (askPassword) {
-                    try {
-                        // The lesson requires a password. Check if there is one in memory or DB.
-                        const password = this.password ?
-                            this.password :
-                            await AddonModLesson.getStoredPassword(this.lesson.id);
+            if (askPassword) {
+                try {
+                    // The lesson requires a password. Check if there is one in memory or DB.
+                    const password = this.password ?
+                        this.password :
+                        await AddonModLesson.getStoredPassword(this.lesson.id);
 
-                        await this.validatePassword(password);
+                    await this.validatePassword(password);
 
-                        // Now that we have the password, get the access reason again ignoring the password.
-                        preventReason = AddonModLesson.getPreventAccessReason(this.accessInfo, true);
-                        if (preventReason) {
-                            this.preventReasons = [preventReason];
-                        }
-                    } catch {
-                        // No password or the validation failed. Show password form.
-                        this.askPassword = true;
-                        this.preventReasons = [preventReason!];
-                        lessonReady = false;
+                    // Now that we have the password, get the access reason again ignoring the password.
+                    preventReason = AddonModLesson.getPreventAccessReason(this.accessInfo, true);
+                    if (preventReason) {
+                        this.preventReasons = [preventReason];
                     }
-                } else {
-                    // Lesson cannot be started.
+                } catch {
+                    // No password or the validation failed. Show password form.
+                    this.askPassword = true;
                     this.preventReasons = [preventReason!];
                     lessonReady = false;
                 }
+            } else {
+                // Lesson cannot be started.
+                this.preventReasons = [preventReason!];
+                lessonReady = false;
             }
+        }
 
-            if (this.selectedTab == 1 && this.canViewReports) {
-                // Only fetch the report data if the tab is selected.
-                promises.push(this.fetchReportData());
-            }
+        if (this.selectedTab == 1 && this.canViewReports) {
+            // Only fetch the report data if the tab is selected.
+            promises.push(this.fetchReportData());
+        }
 
-            await Promise.all(promises);
+        await Promise.all(promises);
 
-            if (lessonReady) {
-                // Lesson can be started, don't ask the password and don't show prevent messages.
-                this.lessonReady();
-            }
-        } finally {
-            this.fillContextMenu(refresh);
+        if (lessonReady) {
+            // Lesson can be started, don't ask the password and don't show prevent messages.
+            this.lessonReady();
         }
     }
 
@@ -633,8 +624,6 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo
         }
 
         this.loaded = false;
-        this.refreshIcon = CoreConstants.ICON_LOADING;
-        this.syncIcon = CoreConstants.ICON_LOADING;
 
         try {
             await this.validatePassword(<string> password);
@@ -652,8 +641,6 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo
             CoreDomUtils.showErrorModal(error);
         } finally {
             this.loaded = true;
-            this.refreshIcon = CoreConstants.ICON_REFRESH;
-            this.syncIcon = CoreConstants.ICON_SYNC;
 
             CoreForms.triggerFormSubmittedEvent(this.formElement, true, this.siteId);
         }
diff --git a/src/addons/mod/lti/components/index/addon-mod-lti-index.html b/src/addons/mod/lti/components/index/addon-mod-lti-index.html
index 9dfc934b2..9892dd3ae 100644
--- a/src/addons/mod/lti/components/index/addon-mod-lti-index.html
+++ b/src/addons/mod/lti/components/index/addon-mod-lti-index.html
@@ -1,20 +1,5 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
-            iconAction="fas-external-link-alt" [showBrowserWarning]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
-            (action)="expandDescription()" iconAction="fas-arrow-right">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
-            (action)="gotoBlog()">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="loaded && isOnline" [priority]="700" [content]="'core.refresh' | translate"
-            (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-    </core-context-menu>
-
     <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
@@ -24,7 +9,7 @@
 <core-loading [hideUntil]="loaded" class="safe-area-padding">
 
     <!-- Activity info. -->
-    <core-course-module-info [module]="module" [description]="lti && lti.showdescriptionlaunch && description" [component]="component"
+    <core-course-module-info [module]="module" [description]="displayDescription && description" [component]="component"
         [componentId]="componentId" [courseId]="courseId">
     </core-course-module-info>
 
diff --git a/src/addons/mod/lti/components/index/index.ts b/src/addons/mod/lti/components/index/index.ts
index f18244c01..333f0bb48 100644
--- a/src/addons/mod/lti/components/index/index.ts
+++ b/src/addons/mod/lti/components/index/index.ts
@@ -31,6 +31,7 @@ export class AddonModLtiIndexComponent extends CoreCourseModuleMainActivityCompo
 
     component = AddonModLtiProvider.COMPONENT;
     moduleName = 'lti';
+    displayDescription = false;
 
     lti?: AddonModLtiLti; // The LTI object.
 
@@ -55,15 +56,13 @@ export class AddonModLtiIndexComponent extends CoreCourseModuleMainActivityCompo
     /**
      * @inheritdoc
      */
-    protected async fetchContent(refresh: boolean = false): Promise<void> {
-        try {
-            this.lti = await AddonModLti.getLti(this.courseId, this.module.id);
+    protected async fetchContent(): Promise<void> {
+        this.lti = await AddonModLti.getLti(this.courseId, this.module.id);
 
-            this.description = this.lti.intro;
-            this.dataRetrieved.emit(this.lti);
-        } finally {
-            this.fillContextMenu(refresh);
-        }
+        this.description = this.lti.intro;
+
+        this.displayDescription = this.lti && !!this.lti.showdescriptionlaunch;
+        this.dataRetrieved.emit(this.lti);
     }
 
     /**
diff --git a/src/addons/mod/page/components/index/addon-mod-page-index.html b/src/addons/mod/page/components/index/addon-mod-page-index.html
index bd5f3a6ba..e17fa3571 100644
--- a/src/addons/mod/page/components/index/addon-mod-page-index.html
+++ b/src/addons/mod/page/components/index/addon-mod-page-index.html
@@ -1,26 +1,5 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
-            iconAction="fas-external-link-alt" [showBrowserWarning]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
-            (action)="expandDescription()" iconAction="fas-arrow-right">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
-            (action)="gotoBlog()">
-        </core-context-menu-item>
-        <core-context-menu-item [priority]="700" [content]="'core.refresh' | translate" (action)="doRefresh(null, $event)"
-            [iconAction]="refreshIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="600" [content]="prefetchText" (action)="prefetch($event)"
-            [iconAction]="prefetchStatusIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="size" [priority]="500" [content]="'core.clearstoreddata' | translate:{$a: size}"
-            iconDescription="fas-archive" (action)="removeFiles($event)" iconAction="fas-trash" [closeOnClick]="false">
-        </core-context-menu-item>
-    </core-context-menu>
-
     <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
diff --git a/src/addons/mod/page/components/index/index.ts b/src/addons/mod/page/components/index/index.ts
index dfba12b29..bbf8ac151 100644
--- a/src/addons/mod/page/components/index/index.ts
+++ b/src/addons/mod/page/components/index/index.ts
@@ -71,29 +71,22 @@ export class AddonModPageIndexComponent extends CoreCourseModuleMainResourceComp
     }
 
     /**
-     * Download page contents.
-     *
-     * @param refresh Whether we're refreshing data.
-     * @return Promise resolved when done.
+     * @inheritdoc
      */
     protected async fetchContent(refresh?: boolean): Promise<void> {
-        try {
-            // Download the resource if it needs to be downloaded.
-            const downloadResult = await this.downloadResourceIfNeeded(refresh);
+        // Download the resource if it needs to be downloaded.
+        const downloadResult = await this.downloadResourceIfNeeded(refresh);
 
-            // Get contents. No need to refresh, it has been done in downloadResourceIfNeeded.
-            const contents = await CoreCourse.getModuleContents(this.module);
+        // Get contents. No need to refresh, it has been done in downloadResourceIfNeeded.
+        const contents = await CoreCourse.getModuleContents(this.module);
 
-            const results = await Promise.all([
-                this.loadPageData(),
-                AddonModPageHelper.getPageHtml(contents, this.module.id),
-            ]);
+        const results = await Promise.all([
+            this.loadPageData(),
+            AddonModPageHelper.getPageHtml(contents, this.module.id),
+        ]);
 
-            this.contents = results[1];
-            this.warning = downloadResult?.failed ? this.getErrorDownloadingSomeFilesMessage(downloadResult.error!) : '';
-        } finally {
-            this.fillContextMenu(refresh);
-        }
+        this.contents = results[1];
+        this.warning = downloadResult?.failed ? this.getErrorDownloadingSomeFilesMessage(downloadResult.error!) : '';
     }
 
     /**
diff --git a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
index 8060c0171..4f6ec82f8 100644
--- a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
+++ b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
@@ -1,29 +1,5 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
-            iconAction="fas-external-link-alt" [showBrowserWarning]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
-            (action)="expandDescription()" iconAction="fas-arrow-right">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" [iconAction]="'far-newspaper'"
-            (action)="gotoBlog()">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="loaded && !hasOffline && isOnline" [priority]="700" [content]="'core.refresh' | translate"
-            (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="loaded && hasOffline && isOnline" [priority]="600" (action)="doRefresh(null, $event, true)"
-            [content]="'core.settings.synchronizenow' | translate" [iconAction]="syncIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="500" [content]="prefetchText" (action)="prefetch($event)"
-            [iconAction]="prefetchStatusIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="size" [priority]="400" [content]="'core.clearstoreddata' | translate:{$a: size}"
-            iconDescription="fas-archive" (action)="removeFiles($event)" iconAction="fas-trash" [closeOnClick]="false">
-        </core-context-menu-item>
-    </core-context-menu>
-
     <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
@@ -214,7 +190,7 @@
 
             <!-- Button to open in browser if it cannot be attempted in the app. -->
             <ion-button class="ion-text-wrap ion-margin" *ngIf="!buttonText && ((!hasSupportedQuestions && unsupportedQuestions.length) ||
-                unsupportedRules.length || behaviourSupported === false)" expand="block" [href]="externalUrl" core-link
+                unsupportedRules.length || behaviourSupported === false)" expand="block" [href]="module.url" core-link
                 [showBrowserWarning]="false">
                 {{ 'core.openinbrowser' | translate }}
                 <ion-icon name="fas-external-link-alt" slot="end" aria-hidden="true"></ion-icon>
diff --git a/src/addons/mod/quiz/components/index/index.ts b/src/addons/mod/quiz/components/index/index.ts
index 92bdfd881..1f03d876e 100644
--- a/src/addons/mod/quiz/components/index/index.ts
+++ b/src/addons/mod/quiz/components/index/index.ts
@@ -180,82 +180,73 @@ export class AddonModQuizIndexComponent extends CoreCourseModuleMainActivityComp
     }
 
     /**
-     * Get the quiz data.
-     *
-     * @param refresh If it's refreshing content.
-     * @param sync If it should try to sync.
-     * @param showErrors If show errors to the user of hide them.
-     * @return Promise resolved when done.
+     * @inheritdoc
      */
-    protected async fetchContent(refresh: boolean = false, sync: boolean = false, showErrors: boolean = false): Promise<void> {
-        try {
-            // First get the quiz instance.
-            const quiz = await AddonModQuiz.getQuiz(this.courseId, this.module.id);
+    protected async fetchContent(refresh?: boolean, sync = false, showErrors = false): Promise<void> {
+        // First get the quiz instance.
+        const quiz = await AddonModQuiz.getQuiz(this.courseId, this.module.id);
 
-            this.gradeMethodReadable = AddonModQuiz.getQuizGradeMethod(quiz.grademethod);
-            this.now = Date.now();
-            this.dataRetrieved.emit(quiz);
-            this.description = quiz.intro || this.description;
-            this.candidateQuiz = quiz;
+        this.gradeMethodReadable = AddonModQuiz.getQuizGradeMethod(quiz.grademethod);
+        this.now = Date.now();
+        this.dataRetrieved.emit(quiz);
+        this.description = quiz.intro || this.description;
+        this.candidateQuiz = quiz;
 
-            // Try to get warnings from automatic sync.
-            const warnings = await AddonModQuizSync.getSyncWarnings(quiz.id);
+        // Try to get warnings from automatic sync.
+        const warnings = await AddonModQuizSync.getSyncWarnings(quiz.id);
 
-            if (warnings?.length) {
-                // Show warnings and delete them so they aren't shown again.
-                CoreDomUtils.showErrorModal(CoreTextUtils.buildMessage(warnings));
+        if (warnings?.length) {
+            // Show warnings and delete them so they aren't shown again.
+            CoreDomUtils.showErrorModal(CoreTextUtils.buildMessage(warnings));
 
-                await AddonModQuizSync.setSyncWarnings(quiz.id, []);
-            }
-
-            if (AddonModQuiz.isQuizOffline(quiz)) {
-                if (sync) {
-                    // Try to sync the quiz.
-                    try {
-                        await this.syncActivity(showErrors);
-                    } catch {
-                        // Ignore errors, keep getting data even if sync fails.
-                        this.autoReview = undefined;
-                    }
-                }
-            } else {
-                this.autoReview = undefined;
-                this.showStatusSpinner = false;
-            }
-
-            if (AddonModQuiz.isQuizOffline(quiz)) {
-                // Handle status.
-                this.setStatusListener();
-
-                // Get last synchronization time and check if sync button should be seen.
-                this.syncTime = await AddonModQuizSync.getReadableSyncTime(quiz.id);
-                this.hasOffline = await AddonModQuizSync.hasDataToSync(quiz.id);
-            }
-
-            // Get quiz access info.
-            this.quizAccessInfo = await AddonModQuiz.getQuizAccessInformation(quiz.id, { cmId: this.module.id });
-
-            this.showReviewColumn = this.quizAccessInfo.canreviewmyattempts;
-            this.accessRules = this.quizAccessInfo.accessrules;
-            this.unsupportedRules = AddonModQuiz.getUnsupportedRules(this.quizAccessInfo.activerulenames);
-
-            if (quiz.preferredbehaviour) {
-                this.behaviourSupported = CoreQuestionBehaviourDelegate.isBehaviourSupported(quiz.preferredbehaviour);
-            }
-
-            // Get question types in the quiz.
-            const types = await AddonModQuiz.getQuizRequiredQtypes(quiz.id, { cmId: this.module.id });
-
-            this.unsupportedQuestions = AddonModQuiz.getUnsupportedQuestions(types);
-            this.hasSupportedQuestions = !!types.find((type) => type != 'random' && this.unsupportedQuestions.indexOf(type) == -1);
-
-            await this.getAttempts(quiz);
-
-            // Quiz is ready to be shown, move it to the variable that is displayed.
-            this.quiz = quiz;
-        } finally {
-            this.fillContextMenu(refresh);
+            await AddonModQuizSync.setSyncWarnings(quiz.id, []);
         }
+
+        if (AddonModQuiz.isQuizOffline(quiz)) {
+            if (sync) {
+                // Try to sync the quiz.
+                try {
+                    await this.syncActivity(showErrors);
+                } catch {
+                    // Ignore errors, keep getting data even if sync fails.
+                    this.autoReview = undefined;
+                }
+            }
+        } else {
+            this.autoReview = undefined;
+            this.showStatusSpinner = false;
+        }
+
+        if (AddonModQuiz.isQuizOffline(quiz)) {
+            // Handle status.
+            this.setStatusListener();
+
+            // Get last synchronization time and check if sync button should be seen.
+            this.syncTime = await AddonModQuizSync.getReadableSyncTime(quiz.id);
+            this.hasOffline = await AddonModQuizSync.hasDataToSync(quiz.id);
+        }
+
+        // Get quiz access info.
+        this.quizAccessInfo = await AddonModQuiz.getQuizAccessInformation(quiz.id, { cmId: this.module.id });
+
+        this.showReviewColumn = this.quizAccessInfo.canreviewmyattempts;
+        this.accessRules = this.quizAccessInfo.accessrules;
+        this.unsupportedRules = AddonModQuiz.getUnsupportedRules(this.quizAccessInfo.activerulenames);
+
+        if (quiz.preferredbehaviour) {
+            this.behaviourSupported = CoreQuestionBehaviourDelegate.isBehaviourSupported(quiz.preferredbehaviour);
+        }
+
+        // Get question types in the quiz.
+        const types = await AddonModQuiz.getQuizRequiredQtypes(quiz.id, { cmId: this.module.id });
+
+        this.unsupportedQuestions = AddonModQuiz.getUnsupportedQuestions(types);
+        this.hasSupportedQuestions = !!types.find((type) => type != 'random' && this.unsupportedQuestions.indexOf(type) == -1);
+
+        await this.getAttempts(quiz);
+
+        // Quiz is ready to be shown, move it to the variable that is displayed.
+        this.quiz = quiz;
     }
 
     /**
@@ -465,16 +456,12 @@ export class AddonModQuizIndexComponent extends CoreCourseModuleMainActivityComp
 
         // Refresh data.
         this.loaded = false;
-        this.refreshIcon = CoreConstants.ICON_LOADING;
-        this.syncIcon = CoreConstants.ICON_LOADING;
         this.content?.scrollToTop();
 
         await promise;
         await CoreUtils.ignoreErrors(this.refreshContent(true));
 
         this.loaded = true;
-        this.refreshIcon = CoreConstants.ICON_REFRESH;
-        this.syncIcon = CoreConstants.ICON_SYNC;
     }
 
     /**
diff --git a/src/addons/mod/resource/components/index/addon-mod-resource-index.html b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
index 78357a63f..c209b8031 100644
--- a/src/addons/mod/resource/components/index/addon-mod-resource-index.html
+++ b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
@@ -1,21 +1,5 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
-            iconAction="fas-external-link-alt" [showBrowserWarning]="false"></core-context-menu-item>
-        <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
-            (action)="expandDescription()" iconAction="fas-arrow-right"></core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
-            (action)="gotoBlog()"></core-context-menu-item>
-        <core-context-menu-item [priority]="700" [content]="'core.refresh' | translate" (action)="doRefresh(null, $event)"
-            [iconAction]="refreshIcon" [closeOnClick]="false"></core-context-menu-item>
-        <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="600" [content]="prefetchText" (action)="prefetch($event)"
-            [iconAction]="prefetchStatusIcon" [closeOnClick]="false"></core-context-menu-item>
-        <core-context-menu-item *ngIf="size" [priority]="500" [content]="'core.clearstoreddata' | translate:{$a: size}"
-            iconDescription="fas-archive" (action)="removeFiles($event)" iconAction="fas-trash" [closeOnClick]="false">
-        </core-context-menu-item>
-    </core-context-menu>
-
     <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
@@ -25,9 +9,8 @@
 <core-loading [hideUntil]="loaded" class="safe-area-padding">
 
     <!-- Activity info. -->
-    <core-course-module-info [module]="module" [courseId]="courseId"
-        [description]="mode != 'iframe' && (mode != 'embedded' || displayDescription) && description" [component]="component"
-        [componentId]="componentId">
+    <core-course-module-info [module]="module" [courseId]="courseId" [description]="displayDescription && description"
+        [component]="component" [componentId]="componentId">
     </core-course-module-info>
 
     <ion-card class="core-warning-card" *ngIf="warning">
diff --git a/src/addons/mod/resource/components/index/index.ts b/src/addons/mod/resource/components/index/index.ts
index 897711e19..203b2349e 100644
--- a/src/addons/mod/resource/components/index/index.ts
+++ b/src/addons/mod/resource/components/index/index.ts
@@ -116,76 +116,74 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
             throw new CoreError(Translate.instant('core.filenotfound'));
         }
 
-        let hasCalledDownloadResource = false;
-
         // Get the resource instance to get the latest name/description and to know if it's embedded.
         const resource = await AddonModResource.getResourceData(this.courseId, this.module.id);
         this.description = resource.intro || '';
         const options: AddonModResourceCustomData =
             resource.displayoptions ? CoreTextUtils.unserialize(resource.displayoptions) : {};
 
-        try {
-            this.displayDescription = options.printintro === undefined || !!options.printintro;
-            this.dataRetrieved.emit(resource);
+        this.displayDescription = options.printintro === undefined || !!options.printintro;
+        this.dataRetrieved.emit(resource);
 
-            if (AddonModResourceHelper.isDisplayedInIframe(this.module)) {
-                hasCalledDownloadResource = true;
+        if (AddonModResourceHelper.isDisplayedInIframe(this.module)) {
 
-                const downloadResult = await this.downloadResourceIfNeeded(refresh, true);
-                const src = await AddonModResourceHelper.getIframeSrc(this.module);
-                this.mode = 'iframe';
+            const downloadResult = await this.downloadResourceIfNeeded(refresh, true);
+            const src = await AddonModResourceHelper.getIframeSrc(this.module);
+            this.mode = 'iframe';
 
-                if (this.src && src.toString() == this.src.toString()) {
-                    // Re-loading same page.
-                    // Set it to empty and then re-set the src in the next digest so it detects it has changed.
-                    this.src = '';
-                    setTimeout(() => {
-                        this.src = src;
-                    });
-                } else {
+            if (this.src && src.toString() == this.src.toString()) {
+                // Re-loading same page.
+                // Set it to empty and then re-set the src in the next digest so it detects it has changed.
+                this.src = '';
+                setTimeout(() => {
                     this.src = src;
-                }
-
-                this.warning = downloadResult.failed
-                    ? this.getErrorDownloadingSomeFilesMessage(downloadResult.error!)
-                    : '';
-
-                return;
-            }
-
-            if (resource && 'display' in resource && AddonModResourceHelper.isDisplayedEmbedded(this.module, resource.display)) {
-                this.mode = 'embedded';
-                this.warning = '';
-
-                this.contentText = await AddonModResourceHelper.getEmbeddedHtml(this.module);
-                this.mode = this.contentText.length > 0 ? 'embedded' : 'external';
+                });
             } else {
-                this.mode = 'external';
-                this.warning = '';
-                let mimetype: string;
-
-                if (this.isIOS) {
-                    this.shouldOpenInBrowser = CoreFileHelper.shouldOpenInBrowser(contents[0]);
-                }
-
-                if ('contentsinfo' in this.module && this.module.contentsinfo) {
-                    mimetype = this.module.contentsinfo.mimetypes[0];
-                    this.readableSize = CoreTextUtils.bytesToSize(this.module.contentsinfo.filessize, 1);
-                    this.timemodified = this.module.contentsinfo.lastmodified * 1000;
-                } else {
-                    mimetype = await CoreUtils.getMimeTypeFromUrl(CoreFileHelper.getFileUrl(contents[0]));
-                    this.readableSize = CoreTextUtils.bytesToSize(contents[0].filesize, 1);
-                    this.timemodified = contents[0].timemodified * 1000;
-                }
-
-                this.timecreated = contents[0].timecreated * 1000;
-                this.isExternalFile = !!contents[0].isexternalfile;
-                this.type = CoreMimetypeUtils.getMimetypeDescription(mimetype);
-                this.isStreamedFile = CoreMimetypeUtils.isStreamedMimetype(mimetype);
+                this.src = src;
             }
-        } finally {
-            // Pass false in some cases because downloadResourceIfNeeded already invalidates and refresh data if refresh=true.
-            this.fillContextMenu(hasCalledDownloadResource ? false : refresh);
+
+            // Never show description on iframe.
+            this.displayDescription = false;
+
+            this.warning = downloadResult.failed
+                ? this.getErrorDownloadingSomeFilesMessage(downloadResult.error!)
+                : '';
+
+            return;
+        }
+
+        if (resource && 'display' in resource && AddonModResourceHelper.isDisplayedEmbedded(this.module, resource.display)) {
+            this.mode = 'embedded';
+            this.warning = '';
+
+            this.contentText = await AddonModResourceHelper.getEmbeddedHtml(this.module);
+            this.mode = this.contentText.length > 0 ? 'embedded' : 'external';
+        } else {
+            this.mode = 'external';
+            this.warning = '';
+            let mimetype: string;
+
+            // Always show description on external.
+            this.displayDescription = true;
+
+            if (this.isIOS) {
+                this.shouldOpenInBrowser = CoreFileHelper.shouldOpenInBrowser(contents[0]);
+            }
+
+            if ('contentsinfo' in this.module && this.module.contentsinfo) {
+                mimetype = this.module.contentsinfo.mimetypes[0];
+                this.readableSize = CoreTextUtils.bytesToSize(this.module.contentsinfo.filessize, 1);
+                this.timemodified = this.module.contentsinfo.lastmodified * 1000;
+            } else {
+                mimetype = await CoreUtils.getMimeTypeFromUrl(CoreFileHelper.getFileUrl(contents[0]));
+                this.readableSize = CoreTextUtils.bytesToSize(contents[0].filesize, 1);
+                this.timemodified = contents[0].timemodified * 1000;
+            }
+
+            this.timecreated = contents[0].timecreated * 1000;
+            this.isExternalFile = !!contents[0].isexternalfile;
+            this.type = CoreMimetypeUtils.getMimetypeDescription(mimetype);
+            this.isStreamedFile = CoreMimetypeUtils.isStreamedMimetype(mimetype);
         }
     }
 
diff --git a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
index e5eea8e77..0fa5c17a4 100644
--- a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
+++ b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
@@ -1,29 +1,5 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
-            iconAction="fas-external-link-alt" [showBrowserWarning]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
-            (action)="expandDescription()" iconAction="fas-arrow-right">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
-            (action)="gotoBlog()">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="loaded && !hasOffline && isOnline" [priority]="700" [content]="'core.refresh' | translate"
-            (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="loaded && hasOffline && isOnline" [priority]="600" (action)="doRefresh(null, $event, true)"
-            [content]="'core.settings.synchronizenow' | translate" [iconAction]="syncIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="500" [content]="prefetchText" (action)="prefetch($event)"
-            [iconAction]="prefetchStatusIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="size" [priority]="400" [content]="'core.clearstoreddata' | translate:{$a: size}"
-            iconDescription="fas-archive" (action)="removeFiles($event)" iconAction="fas-trash" [closeOnClick]="false">
-        </core-context-menu-item>
-    </core-context-menu>
-
     <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
@@ -176,7 +152,7 @@
                     <p class="text-danger">{{ errorMessage | translate }}</p>
                 </ion-label>
             </ion-item>
-            <ion-button class="ion-margin ion-text-wrap" expand="block" [href]="externalUrl" core-link [showBrowserWarning]="false">
+            <ion-button class="ion-margin ion-text-wrap" expand="block" [href]="module.url" core-link [showBrowserWarning]="false">
                 {{ 'core.openinbrowser' | translate }}
                 <ion-icon name="fas-external-link-alt" slot="end" aria-hidden="true"></ion-icon>
             </ion-button>
diff --git a/src/addons/mod/scorm/components/index/index.ts b/src/addons/mod/scorm/components/index/index.ts
index 44985f6d1..88dd7b2c8 100644
--- a/src/addons/mod/scorm/components/index/index.ts
+++ b/src/addons/mod/scorm/components/index/index.ts
@@ -175,43 +175,39 @@ export class AddonModScormIndexComponent extends CoreCourseModuleMainActivityCom
     /**
      * @inheritdoc
      */
-    protected async fetchContent(refresh: boolean = false, sync: boolean = false, showErrors: boolean = false): Promise<void> {
-        try {
-            // Get the SCORM instance.
-            this.scorm = await AddonModScorm.getScorm(this.courseId, this.module.id, { moduleUrl: this.module.url });
+    protected async fetchContent(refresh?: boolean, sync = false, showErrors = false): Promise<void> {
+        // Get the SCORM instance.
+        this.scorm = await AddonModScorm.getScorm(this.courseId, this.module.id, { moduleUrl: this.module.url });
 
-            this.dataRetrieved.emit(this.scorm);
-            this.description = this.scorm.intro || this.description;
-            this.errorMessage = AddonModScorm.isScormUnsupported(this.scorm);
+        this.dataRetrieved.emit(this.scorm);
+        this.description = this.scorm.intro || this.description;
+        this.errorMessage = AddonModScorm.isScormUnsupported(this.scorm);
 
-            if (this.scorm.warningMessage) {
-                return; // SCORM is closed or not open yet, we can't get more data.
-            }
+        if (this.scorm.warningMessage) {
+            return; // SCORM is closed or not open yet, we can't get more data.
+        }
 
-            if (sync) {
-                // Try to synchronize the SCORM.
-                await CoreUtils.ignoreErrors(this.syncActivity(showErrors));
-            }
+        if (sync) {
+            // Try to synchronize the SCORM.
+            await CoreUtils.ignoreErrors(this.syncActivity(showErrors));
+        }
 
-            const [syncTime, accessInfo] = await Promise.all([
-                AddonModScormSync.getReadableSyncTime(this.scorm.id),
-                AddonModScorm.getAccessInformation(this.scorm.id, { cmId: this.module.id }),
-                this.fetchAttemptData(this.scorm),
-            ]);
+        const [syncTime, accessInfo] = await Promise.all([
+            AddonModScormSync.getReadableSyncTime(this.scorm.id),
+            AddonModScorm.getAccessInformation(this.scorm.id, { cmId: this.module.id }),
+            this.fetchAttemptData(this.scorm),
+        ]);
 
-            this.syncTime = syncTime;
-            this.accessInfo = accessInfo;
+        this.syncTime = syncTime;
+        this.accessInfo = accessInfo;
 
-            // Check whether to launch the SCORM immediately.
-            if (this.skip === undefined) {
-                this.skip = !this.hasOffline && !this.errorMessage &&
+        // Check whether to launch the SCORM immediately.
+        if (this.skip === undefined) {
+            this.skip = !this.hasOffline && !this.errorMessage &&
                     (!this.scorm.lastattemptlock || this.attemptsLeft > 0) &&
                     this.accessInfo.canskipview && !this.accessInfo.canviewreport &&
                     this.scorm.skipview! >= AddonModScormProvider.SKIPVIEW_FIRST &&
                     (this.scorm.skipview == AddonModScormProvider.SKIPVIEW_ALWAYS || this.lastAttempt == 0);
-            }
-        } finally {
-            this.fillContextMenu(refresh);
         }
     }
 
diff --git a/src/addons/mod/survey/components/index/addon-mod-survey-index.html b/src/addons/mod/survey/components/index/addon-mod-survey-index.html
index 8f73a5c47..dedf029c9 100644
--- a/src/addons/mod/survey/components/index/addon-mod-survey-index.html
+++ b/src/addons/mod/survey/components/index/addon-mod-survey-index.html
@@ -1,30 +1,5 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
-            iconAction="fas-external-link-alt" [showBrowserWarning]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
-            (action)="expandDescription()" iconAction="fas-arrow-right">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
-            (action)="gotoBlog()">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="loaded && !hasOffline && isOnline" [priority]="700" [content]="'core.refresh' | translate"
-            (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="loaded && hasOffline && isOnline" [priority]="600"
-            [content]="'core.settings.synchronizenow' | translate" (action)="doRefresh(null, $event, true)" [iconAction]="syncIcon"
-            [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="500" [content]="prefetchText" (action)="prefetch($event)"
-            [iconAction]="prefetchStatusIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="size" [priority]="400" [content]="'core.clearstoreddata' | translate:{$a: size}"
-            iconDescription="fas-archive" (action)="removeFiles($event)" iconAction="fas-trash" [closeOnClick]="false">
-        </core-context-menu-item>
-    </core-context-menu>
-
     <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
@@ -41,7 +16,7 @@
     <!-- Survey already done -->
     <ion-card class="ion-padding" *ngIf="survey && survey.surveydone">
         <p class="ion-padding">{{ 'addon.mod_survey.surveycompletednograph' | translate }}</p>
-        <ion-button expand="block" [href]="externalUrl" core-link>
+        <ion-button expand="block" [href]="module.url" core-link>
             <ion-icon name="fas-external-link-alt" slot="start" aria-hidden="true"></ion-icon>
             {{ 'addon.mod_survey.results' | translate }}
         </ion-button>
diff --git a/src/addons/mod/survey/components/index/index.ts b/src/addons/mod/survey/components/index/index.ts
index 0be63e920..eca06619b 100644
--- a/src/addons/mod/survey/components/index/index.ts
+++ b/src/addons/mod/survey/components/index/index.ts
@@ -115,39 +115,30 @@ export class AddonModSurveyIndexComponent extends CoreCourseModuleMainActivityCo
     }
 
     /**
-     * Download survey contents.
-     *
-     * @param refresh If it's refreshing content.
-     * @param sync If it should try to sync.
-     * @param showErrors If show errors to the user of hide them.
-     * @return Promise resolved when done.
+     * @inheritdoc
      */
-    protected async fetchContent(refresh: boolean = false, sync: boolean = false, showErrors: boolean = false): Promise<void> {
-        try {
-            this.survey = await AddonModSurvey.getSurvey(this.courseId, this.module.id);
+    protected async fetchContent(refresh?: boolean, sync = false, showErrors = false): Promise<void> {
+        this.survey = await AddonModSurvey.getSurvey(this.courseId, this.module.id);
 
-            this.description = this.survey.intro;
-            this.dataRetrieved.emit(this.survey);
+        this.description = this.survey.intro;
+        this.dataRetrieved.emit(this.survey);
 
-            if (sync) {
-                // Try to synchronize the survey.
-                const answersSent = await this.syncActivity(showErrors);
-                if (answersSent) {
-                    // Answers were sent, update the survey.
-                    this.survey = await AddonModSurvey.getSurvey(this.courseId, this.module.id);
-                }
+        if (sync) {
+            // Try to synchronize the survey.
+            const answersSent = await this.syncActivity(showErrors);
+            if (answersSent) {
+                // Answers were sent, update the survey.
+                this.survey = await AddonModSurvey.getSurvey(this.courseId, this.module.id);
             }
+        }
 
-            // Check if there are answers stored in offline.
-            this.hasOffline = this.survey.surveydone
-                ? false
-                : await AddonModSurveyOffline.hasAnswers(this.survey.id);
+        // Check if there are answers stored in offline.
+        this.hasOffline = this.survey.surveydone
+            ? false
+            : await AddonModSurveyOffline.hasAnswers(this.survey.id);
 
-            if (!this.survey.surveydone && !this.hasOffline) {
-                await this.fetchQuestions();
-            }
-        } finally {
-            this.fillContextMenu(refresh);
+        if (!this.survey.surveydone && !this.hasOffline) {
+            await this.fetchQuestions();
         }
     }
 
diff --git a/src/addons/mod/url/components/index/addon-mod-url-index.html b/src/addons/mod/url/components/index/addon-mod-url-index.html
index 47d00e1af..8b531ded4 100644
--- a/src/addons/mod/url/components/index/addon-mod-url-index.html
+++ b/src/addons/mod/url/components/index/addon-mod-url-index.html
@@ -1,16 +1,5 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
-            iconAction="fas-external-link-alt" [showBrowserWarning]="false"></core-context-menu-item>
-        <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
-            (action)="expandDescription()" iconAction="fas-arrow-right"></core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
-            (action)="gotoBlog()"></core-context-menu-item>
-        <core-context-menu-item [priority]="700" [content]="'core.refresh' | translate" (action)="doRefresh(null, $event)"
-            [iconAction]="refreshIcon" [closeOnClick]="false"></core-context-menu-item>
-    </core-context-menu>
-
     <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
diff --git a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
index c689ec193..de251b747 100644
--- a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
+++ b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
@@ -13,34 +13,12 @@
     </ion-button>
 
     <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
-            iconAction="fas-external-link-alt" [showBrowserWarning]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
-            (action)="expandDescription()" iconAction="fas-arrow-right">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
-            (action)="gotoBlog()">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="loaded && !hasOffline && isOnline && !pageIsOffline" [priority]="700"
-            [content]="'core.refresh' | translate" (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="loaded && isOnline && (hasOffline || pageIsOffline)" [priority]="600"
-            [content]="'core.settings.synchronizenow' | translate" (action)="doRefresh(null, $event, true)" [iconAction]="syncIcon"
-            [closeOnClick]="false">
-        </core-context-menu-item>
         <core-context-menu-item *ngIf="canEdit && (isOnline || pageIsOffline)" [priority]="590" [content]="'core.edit' | translate"
             iconAction="fas-edit" (action)="goToEditPage()">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="canEdit" [priority]="580" [content]="'addon.mod_wiki.createpage' | translate" iconAction="fas-plus"
             (action)="goToNewPage()">
         </core-context-menu-item>
-        <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="500" [content]="prefetchText" (action)="prefetch($event)"
-            [iconAction]="prefetchStatusIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="size" [priority]="400" [content]="'core.clearstoreddata' | translate:{$a: size}"
-            iconDescription="fas-archive" (action)="removeFiles($event)" iconAction="fas-trash" [closeOnClick]="false">
-        </core-context-menu-item>
     </core-context-menu>
 
     <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
diff --git a/src/addons/mod/wiki/components/index/index.ts b/src/addons/mod/wiki/components/index/index.ts
index 4f5a4709f..a9b8780de 100644
--- a/src/addons/mod/wiki/components/index/index.ts
+++ b/src/addons/mod/wiki/components/index/index.ts
@@ -21,14 +21,16 @@ import { CoreCourse } from '@features/course/services/course';
 import { CoreTag, CoreTagItem } from '@features/tag/services/tag';
 import { CoreUser } from '@features/user/services/user';
 import { IonContent } from '@ionic/angular';
+import { CoreApp } from '@services/app';
 import { CoreGroup, CoreGroups } from '@services/groups';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreUtils } from '@services/utils/utils';
-import { Translate } from '@singletons';
+import { Network, Translate, NgZone } from '@singletons';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
+import { Subscription } from 'rxjs';
 import { Md5 } from 'ts-md5';
 import { AddonModWikiPageDBRecord } from '../../services/database/wiki';
 import { AddonModWikiModuleHandlerService } from '../../services/handlers/module';
@@ -76,6 +78,8 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
     moduleName = 'wiki';
     groupWiki = false;
 
+    isOnline = false;
+
     wiki?: AddonModWikiWiki; // The wiki instance.
     isMainPage = false; // Whether the user is viewing wiki's main page (just entered the wiki).
     canEdit = false; // Whether user can edit the page.
@@ -104,12 +108,23 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
     protected ignoreManualSyncEvent = false; // Whether manual sync event should be ignored.
     protected currentUserId?: number; // Current user ID.
     protected currentPath!: string;
+    protected onlineSubscription: Subscription; // It will observe the status of the network connection.
 
     constructor(
         protected content?: IonContent,
         @Optional() courseContentsPage?: CoreCourseContentsPage,
     ) {
         super('AddonModLessonIndexComponent', content, courseContentsPage);
+
+        this.isOnline = CoreApp.isOnline();
+
+        // Refresh online status when changes.
+        this.onlineSubscription = Network.onChange().subscribe(() => {
+            // Execute the callback in the Angular zone, so change detection doesn't stop working.
+            NgZone.run(() => {
+                this.isOnline = CoreApp.isOnline();
+            });
+        });
     }
 
     /**
@@ -212,7 +227,7 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * @inheritdoc
      */
-    protected async fetchContent(refresh = false, sync = false, showErrors = false): Promise<void> {
+    protected async fetchContent(refresh?: boolean, sync = false, showErrors = false): Promise<void> {
         try {
             // Get the wiki instance.
             this.wiki = await AddonModWiki.getWiki(this.courseId, this.module.id);
@@ -240,7 +255,6 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
             }
 
             this.description = this.wiki.intro || this.module.description;
-            this.externalUrl = this.module.url;
             this.componentId = this.module.id;
 
             await this.fetchSubwikis(this.wiki.id);
@@ -278,8 +292,6 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
             }
 
             throw error;
-        } finally {
-            this.fillContextMenu(refresh);
         }
     }
 
@@ -835,6 +847,7 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
 
         this.manualSyncObserver?.off();
         this.newPageObserver?.off();
+        this.onlineSubscription.unsubscribe();
         if (this.wiki) {
             AddonModWiki.wikiPageClosed(this.wiki.id, this.currentPath);
         }
diff --git a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
index ec5719b0d..9ff979bf8 100644
--- a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
+++ b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
@@ -1,30 +1,5 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <core-context-menu>
-        <core-context-menu-item *ngIf="externalUrl" [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
-            iconAction="fas-external-link-alt" [showBrowserWarning]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="description" [priority]="800" [content]="'core.moduleintro' | translate"
-            (action)="expandDescription()" iconAction="fas-arrow-right">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" iconAction="far-newspaper"
-            (action)="gotoBlog()">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="loaded && !hasOffline && isOnline" [priority]="700" [content]="'core.refresh' | translate"
-            (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="loaded && hasOffline && isOnline" [priority]="600"
-            [content]="'core.settings.synchronizenow' | translate" (action)="doRefresh(null, $event, true)" [iconAction]="syncIcon"
-            [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="500" [content]="prefetchText" (action)="prefetch($event)"
-            [iconAction]="prefetchStatusIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item *ngIf="size" [priority]="200" [content]="'core.clearstoreddata' | translate:{$a: size}"
-            iconDescription="fas-archive" (action)="removeFiles($event)" iconAction="fas-trash" [closeOnClick]="false">
-        </core-context-menu-item>
-    </core-context-menu>
-
     <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
diff --git a/src/addons/mod/workshop/components/index/index.ts b/src/addons/mod/workshop/components/index/index.ts
index f3cd51e4d..1376c7433 100644
--- a/src/addons/mod/workshop/components/index/index.ts
+++ b/src/addons/mod/workshop/components/index/index.ts
@@ -216,55 +216,45 @@ export class AddonModWorkshopIndexComponent extends CoreCourseModuleMainActivity
     }
 
     /**
-     * Download feedback contents.
-     *
-     * @param refresh If it's refreshing content.
-     * @param sync If it should try to sync.
-     * @param showErrors If show errors to the user of hide them.
-     * @return Promise resolved when done.
+     * @inheritdoc
      */
-    protected async fetchContent(refresh = false, sync = false, showErrors = false): Promise<void> {
-        try {
-            this.workshop = await AddonModWorkshop.getWorkshop(this.courseId, this.module.id);
+    protected async fetchContent(refresh?: boolean, sync = false, showErrors = false): Promise<void> {
+        this.workshop = await AddonModWorkshop.getWorkshop(this.courseId, this.module.id);
 
-            this.description = this.workshop.intro;
-            this.dataRetrieved.emit(this.workshop);
+        this.description = this.workshop.intro;
+        this.dataRetrieved.emit(this.workshop);
 
-            if (sync) {
-                // Try to synchronize the feedback.
-                await this.syncActivity(showErrors);
-            }
-
-            // Check if there are answers stored in offline.
-            this.access = await AddonModWorkshop.getWorkshopAccessInformation(this.workshop.id, { cmId: this.module.id });
-
-            if (this.access.canviewallsubmissions) {
-                this.groupInfo = await CoreGroups.getActivityGroupInfo(this.workshop.coursemodule);
-                this.group = CoreGroups.validateGroupId(this.group, this.groupInfo);
-            }
-
-            this.phases = await AddonModWorkshop.getUserPlanPhases(this.workshop.id, { cmId: this.module.id });
-
-            this.phases[this.workshop.phase].tasks.forEach((task) => {
-                if (!task.link && (task.code == 'examples' || task.code == 'prepareexamples')) {
-                    // Add links to manage examples.
-                    task.link = this.externalUrl!;
-                }
-            });
-
-            // Check if there are info stored in offline.
-            this.hasOffline = await AddonModWorkshopOffline.hasWorkshopOfflineData(this.workshop.id);
-            if (this.hasOffline) {
-                this.offlineSubmissions = await AddonModWorkshopOffline.getSubmissions(this.workshop.id);
-            } else {
-                this.offlineSubmissions = [];
-            }
-
-            await this.setPhaseInfo();
-
-        } finally {
-            this.fillContextMenu(refresh);
+        if (sync) {
+            // Try to synchronize the feedback.
+            await this.syncActivity(showErrors);
         }
+
+        // Check if there are answers stored in offline.
+        this.access = await AddonModWorkshop.getWorkshopAccessInformation(this.workshop.id, { cmId: this.module.id });
+
+        if (this.access.canviewallsubmissions) {
+            this.groupInfo = await CoreGroups.getActivityGroupInfo(this.workshop.coursemodule);
+            this.group = CoreGroups.validateGroupId(this.group, this.groupInfo);
+        }
+
+        this.phases = await AddonModWorkshop.getUserPlanPhases(this.workshop.id, { cmId: this.module.id });
+
+        this.phases[this.workshop.phase].tasks.forEach((task) => {
+            if (!task.link && (task.code == 'examples' || task.code == 'prepareexamples')) {
+                // Add links to manage examples.
+                task.link = this.module.url || '';
+            }
+        });
+
+        // Check if there are info stored in offline.
+        this.hasOffline = await AddonModWorkshopOffline.hasWorkshopOfflineData(this.workshop.id);
+        if (this.hasOffline) {
+            this.offlineSubmissions = await AddonModWorkshopOffline.getSubmissions(this.workshop.id);
+        } else {
+            this.offlineSubmissions = [];
+        }
+
+        await this.setPhaseInfo();
     }
 
     /**
@@ -394,7 +384,7 @@ export class AddonModWorkshopIndexComponent extends CoreCourseModuleMainActivity
                 componentProps: {
                     phases: CoreUtils.objectToArray(this.phases),
                     workshopPhase: this.workshop!.phase,
-                    externalUrl: this.externalUrl,
+                    externalUrl: this.module.url,
                     showSubmit: this.showSubmit,
                 },
             });
diff --git a/src/core/features/course/classes/main-activity-component.ts b/src/core/features/course/classes/main-activity-component.ts
index e89d53476..d0214e996 100644
--- a/src/core/features/course/classes/main-activity-component.ts
+++ b/src/core/features/course/classes/main-activity-component.ts
@@ -17,15 +17,11 @@ import { IonContent } from '@ionic/angular';
 
 import { CoreCourseModuleMainResourceComponent } from './main-resource-component';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
-import { Network, NgZone } from '@singletons';
-import { Subscription } from 'rxjs';
-import { CoreApp } from '@services/app';
 import { CoreCourse } from '../services/course';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreWSExternalWarning } from '@services/ws';
 import { CoreCourseContentsPage } from '../pages/contents/contents';
-import { CoreConstants } from '@/core/constants';
 import { CoreSites } from '@services/sites';
 
 /**
@@ -40,12 +36,7 @@ export class CoreCourseModuleMainActivityComponent extends CoreCourseModuleMainR
 
     moduleName?: string; // Raw module name to be translated. It will be translated on init.
 
-    // Data for context menu.
-    syncIcon?: string; // Sync icon.
-    isOnline?: boolean; // If the app is online or not.
-
     protected syncObserver?: CoreEventObserver; // It will observe the sync auto event.
-    protected onlineSubscription: Subscription; // It will observe the status of the network connection.
     protected syncEventName?: string; // Auto sync event name.
 
     constructor(
@@ -54,14 +45,6 @@ export class CoreCourseModuleMainActivityComponent extends CoreCourseModuleMainR
         courseContentsPage?: CoreCourseContentsPage,
     ) {
         super(loggerName, courseContentsPage);
-
-        // Refresh online status when changes.
-        this.onlineSubscription = Network.onChange().subscribe(() => {
-            // Execute the callback in the Angular zone, so change detection doesn't stop working.
-            NgZone.run(() => {
-                this.isOnline = CoreApp.isOnline();
-            });
-        });
     }
 
     /**
@@ -71,7 +54,6 @@ export class CoreCourseModuleMainActivityComponent extends CoreCourseModuleMainR
         await super.ngOnInit();
 
         this.hasOffline = false;
-        this.syncIcon = CoreConstants.ICON_LOADING;
         this.moduleName = CoreCourse.translateModuleName(this.moduleName || '');
 
         if (this.syncEventName) {
@@ -118,20 +100,12 @@ export class CoreCourseModuleMainActivityComponent extends CoreCourseModuleMainR
             return;
         }
 
-        this.refreshIcon = CoreConstants.ICON_LOADING;
-        this.syncIcon = CoreConstants.ICON_LOADING;
+        await CoreUtils.ignoreErrors(Promise.all([
+            this.invalidateContent(),
+            this.showCompletion ? CoreCourse.invalidateModule(this.module.id) : undefined,
+        ]));
 
-        try {
-            await CoreUtils.ignoreErrors(Promise.all([
-                this.invalidateContent(),
-                this.showCompletion ? CoreCourse.invalidateModule(this.module.id) : undefined,
-            ]));
-
-            await this.loadContent(true, sync, showErrors);
-        } finally {
-            this.refreshIcon = CoreConstants.ICON_REFRESH;
-            this.syncIcon = CoreConstants.ICON_SYNC;
-        }
+        await this.loadContent(true, sync, showErrors);
     }
 
     /**
@@ -142,17 +116,10 @@ export class CoreCourseModuleMainActivityComponent extends CoreCourseModuleMainR
      * @return Resolved when done.
      */
     protected async showLoadingAndFetch(sync: boolean = false, showErrors: boolean = false): Promise<void> {
-        this.refreshIcon = CoreConstants.ICON_LOADING;
-        this.syncIcon = CoreConstants.ICON_LOADING;
         this.loaded = false;
         this.content?.scrollToTop();
 
-        try {
-            await this.loadContent(false, sync, showErrors);
-        } finally {
-            this.refreshIcon = CoreConstants.ICON_REFRESH;
-            this.syncIcon = CoreConstants.ICON_REFRESH;
-        }
+        await this.loadContent(false, sync, showErrors);
     }
 
     /**
@@ -163,8 +130,6 @@ export class CoreCourseModuleMainActivityComponent extends CoreCourseModuleMainR
      * @return Resolved when done.
      */
     protected showLoadingAndRefresh(sync: boolean = false, showErrors: boolean = false): Promise<void> {
-        this.refreshIcon = CoreConstants.ICON_LOADING;
-        this.syncIcon = CoreConstants.ICON_LOADING;
         this.loaded = false;
         this.content?.scrollToTop();
 
@@ -193,8 +158,6 @@ export class CoreCourseModuleMainActivityComponent extends CoreCourseModuleMainR
      * @return Promise resolved when done.
      */
     protected async loadContent(refresh?: boolean, sync: boolean = false, showErrors: boolean = false): Promise<void> {
-        this.isOnline = CoreApp.isOnline();
-
         if (!this.module) {
             // This can happen if course format changes from single activity to weekly/topics.
             return;
@@ -215,8 +178,6 @@ export class CoreCourseModuleMainActivityComponent extends CoreCourseModuleMainR
             CoreDomUtils.showErrorModalDefault(error, this.fetchContentDefaultError, true);
         } finally {
             this.loaded = true;
-            this.refreshIcon = CoreConstants.ICON_REFRESH;
-            this.syncIcon = CoreConstants.ICON_REFRESH;
         }
     }
 
@@ -269,8 +230,6 @@ export class CoreCourseModuleMainActivityComponent extends CoreCourseModuleMainR
      */
     ngOnDestroy(): void {
         super.ngOnDestroy();
-
-        this.onlineSubscription?.unsubscribe();
         this.syncObserver?.off();
     }
 
diff --git a/src/core/features/course/classes/main-resource-component.ts b/src/core/features/course/classes/main-resource-component.ts
index cc1f72c67..d59380505 100644
--- a/src/core/features/course/classes/main-resource-component.ts
+++ b/src/core/features/course/classes/main-resource-component.ts
@@ -13,14 +13,10 @@
 // limitations under the License.
 
 import { CoreConstants } from '@/core/constants';
-import { AddonBlog } from '@addons/blog/services/blog';
-import { AddonBlogMainMenuHandlerService } from '@addons/blog/services/handlers/mainmenu';
 import { OnInit, OnDestroy, Input, Output, EventEmitter, Component, Optional, Inject } from '@angular/core';
-import { Params } from '@angular/router';
 import { CoreAnyError } from '@classes/errors/error';
 import { IonRefresher } from '@ionic/angular';
 import { CoreApp } from '@services/app';
-import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 
@@ -60,20 +56,11 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
     component?: string; // Component name.
     componentId?: number; // Component ID.
     hasOffline = false; // Resources don't have any data to sync.
-    blog?: boolean; // If blog is available.
 
-    // Data for context menu.
-    externalUrl?: string; // External URL to open in browser.
     description?: string; // Module description.
-    refreshIcon = CoreConstants.ICON_LOADING; // Refresh icon, normally spinner or refresh.
-    prefetchStatusIcon?: string; // Used when calling fillContextMenu.
-    prefetchStatus?: string; // Used when calling fillContextMenu.
-    prefetchText?: string; // Used when calling fillContextMenu.
-    size?: string; // Used when calling fillContextMenu.
-    downloadTimeReadable?: string; // Last download time in a readable format. Used when calling fillContextMenu.
-    isDestroyed = false; // Whether the component is destroyed, used when calling fillContextMenu.
-    contextMenuStatusObserver?: CoreEventObserver; // Observer of package status, used when calling fillContextMenu.
-    contextFileStatusObserver?: CoreEventObserver; // Observer of file status, used when calling fillContextMenu.
+    prefetchStatus?: string;
+    downloadTimeReadable?: string; // Last download time in a readable format.
+    isDestroyed = false; // Whether the component is destroyed.
 
     protected fetchContentDefaultError = 'core.course.errorgetmodule'; // Default error to show when loading contents.
     protected isCurrentView = false; // Whether the component is in the current view.
@@ -84,6 +71,8 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
     protected logger: CoreLogger;
     protected debouncedUpdateModule?: () => void; // Update the module after a certain time.
     protected showCompletion = false; // Whether to show completion inside the activity.
+    protected displayDescription = true; // Wether to show Module description on module page, and not on summary or the contrary.
+    protected packageStatusObserver?: CoreEventObserver; // Observer of package status.
 
     constructor(
         @Optional() @Inject('') loggerName: string = 'CoreCourseModuleMainResourceComponent',
@@ -93,13 +82,12 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
     }
 
     /**
-     * Component being initialized.
+     * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
         this.siteId = CoreSites.getCurrentSiteId();
         this.description = this.module.description;
         this.componentId = this.module.id;
-        this.externalUrl = this.module.url;
         this.courseId = this.courseId || this.module.course;
         this.showCompletion = !!CoreSites.getRequiredCurrentSite().isVersionGreaterEqualThan('3.11');
 
@@ -119,14 +107,22 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
             }, 10000);
         }
 
-        this.blog = await AddonBlog.isPluginEnabled();
+        this.packageStatusObserver = CoreEvents.on(
+            CoreEvents.PACKAGE_STATUS_CHANGED,
+            (data) => {
+                if (data.componentId == module.id && data.component == this.component) {
+                    this.getPackageStatus();
+                }
+            },
+            this.siteId,
+        );
     }
 
     /**
      * Refresh the data.
      *
      * @param refresher Refresher.
-     * @param done Function to call when done.
+     * @param done Function to call when done. Never used.
      * @param showErrors If show errors to the user of hide them.
      * @return Promise resolved when done.
      */
@@ -145,7 +141,6 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
         await CoreUtils.ignoreErrors(this.refreshContent(true, showErrors));
 
         refresher?.complete();
-        done && done();
     }
 
     /**
@@ -162,22 +157,16 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
             return;
         }
 
-        this.refreshIcon = CoreConstants.ICON_LOADING;
+        await CoreUtils.ignoreErrors(Promise.all([
+            this.invalidateContent(),
+            this.showCompletion ? CoreCourse.invalidateModule(this.module.id) : undefined,
+        ]));
 
-        try {
-            await CoreUtils.ignoreErrors(Promise.all([
-                this.invalidateContent(),
-                this.showCompletion ? CoreCourse.invalidateModule(this.module.id) : undefined,
-            ]));
-
-            if (this.showCompletion) {
-                this.fetchModule();
-            }
-
-            await this.loadContent(true);
-        } finally {
-            this.refreshIcon = CoreConstants.ICON_REFRESH;
+        if (this.showCompletion) {
+            this.fetchModule();
         }
+
+        await this.loadContent(true);
     }
 
     /**
@@ -214,6 +203,7 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
 
         try {
             await this.fetchContent(refresh);
+            await this.getPackageStatus(refresh);
         } catch (error) {
             if (!refresh && !CoreSites.getCurrentSite()?.isOfflineDisabled() && this.isNotFoundError(error)) {
                 // Module not found, retry without using cache.
@@ -223,7 +213,6 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
             CoreDomUtils.showErrorModalDefault(error, this.fetchContentDefaultError, true);
         } finally {
             this.loaded = true;
-            this.refreshIcon = CoreConstants.ICON_REFRESH;
         }
     }
 
@@ -238,11 +227,20 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
     }
 
     /**
-     * Fill the context menu options
+     * Updage package status.
+     *
+     * @param refresh If prefetch info has to be refreshed.
      */
-    protected fillContextMenu(refresh: boolean = false): void {
-        // All data obtained, now fill the context menu.
-        CoreCourseHelper.fillContextMenu(this, this.module, this.courseId, refresh, this.component);
+    async getPackageStatus(refresh = false): Promise<void> {
+        if (!this.module) {
+            return;
+        }
+
+        const moduleInfo =
+                await CoreCourseHelper.getModulePrefetchInfo(this.module, this.courseId, refresh, this.component);
+
+        this.downloadTimeReadable = CoreTextUtils.ucFirst(moduleInfo.downloadTimeReadable);
+        this.prefetchStatus = moduleInfo.status;
     }
 
     /**
@@ -253,48 +251,6 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
         return this.prefetchStatus != CoreConstants.NOT_DOWNLOADABLE && this.prefetchStatus != CoreConstants.NOT_DOWNLOADED;
     }
 
-    /**
-     * Expand the description.
-     *
-     * @deprecated Use openModuleSummary instead.
-     */
-    expandDescription(): void {
-        this.openModuleSummary();
-    }
-
-    /**
-     * Go to blog posts.
-     */
-    async gotoBlog(): Promise<void> {
-        const params: Params = { cmId: this.module.id };
-
-        await CoreNavigator.navigateToSitePath(AddonBlogMainMenuHandlerService.PAGE_NAME, { params });
-    }
-
-    /**
-     * Prefetch the module.
-     *
-     * @param done Function to call when done.
-     */
-    prefetch(done?: () => void): void {
-        CoreCourseHelper.contextMenuPrefetch(this, this.module, this.courseId, done);
-    }
-
-    /**
-     * Confirm and remove downloaded files.
-     *
-     * @param done Function to call when done.
-     */
-    removeFiles(done?: () => void): void {
-        if (this.prefetchStatus == CoreConstants.DOWNLOADING) {
-            CoreDomUtils.showAlertTranslated(undefined, 'core.course.cannotdeletewhiledownloading');
-
-            return;
-        }
-
-        CoreCourseHelper.confirmAndRemoveFiles(this.module, this.courseId, done);
-    }
-
     /**
      * Get message about an error occurred while downloading files.
      *
@@ -459,7 +415,7 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
             componentProps: {
                 moduleId: this.module.id,
                 module: this.module,
-                description: this.description,
+                description: !this.displayDescription ? this.description : '',
                 component: this.component,
                 courseId: this.courseId,
                 hasOffline: this.hasOffline,
@@ -493,10 +449,9 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
      */
     ngOnDestroy(): void {
         this.isDestroyed = true;
-        this.contextMenuStatusObserver?.off();
-        this.contextFileStatusObserver?.off();
         this.statusObserver?.off();
         this.completionObserver?.off();
+        this.packageStatusObserver?.off();
     }
 
     /**
diff --git a/src/core/features/course/services/course-helper.ts b/src/core/features/course/services/course-helper.ts
index 93c8b0ca6..39e917109 100644
--- a/src/core/features/course/services/course-helper.ts
+++ b/src/core/features/course/services/course-helper.ts
@@ -493,6 +493,7 @@ export class CoreCourseHelperProvider {
      * @param courseId Course ID the module belongs to.
      * @param done Function to call when done. It will close the context menu.
      * @return Promise resolved when done.
+     * @deprecated since 4.0
      */
     async confirmAndRemoveFiles(module: CoreCourseModuleData, courseId: number, done?: () => void): Promise<void> {
         let modal: CoreIonLoadingElement | undefined;
@@ -580,6 +581,7 @@ export class CoreCourseHelperProvider {
      * @param courseId Course ID the module belongs to.
      * @param done Function to call when done. It will close the context menu.
      * @return Promise resolved when done.
+     * @deprecated since 4.0
      */
     async contextMenuPrefetch(
         instance: ComponentWithContextMenu,

From 16cee9df14d3e78b3f8340cca72bf21df858a2b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 15 Feb 2022 17:12:37 +0100
Subject: [PATCH 0550/1008] MOBILE-3931 module: Merge duplicated prefetch
 statuses

---
 .../mod/lesson/components/index/index.ts      |   8 +-
 .../index/addon-mod-resource-index.html       |   2 +-
 .../mod/resource/components/index/index.ts    |   4 +-
 .../course/classes/main-resource-component.ts |  43 +++----
 .../module-navigation/module-navigation.ts    |   2 +-
 .../features/course/services/course-helper.ts | 112 +++++++++---------
 src/theme/theme.light.scss                    |   3 +
 7 files changed, 82 insertions(+), 92 deletions(-)

diff --git a/src/addons/mod/lesson/components/index/index.ts b/src/addons/mod/lesson/components/index/index.ts
index 8c3a34a4a..c449a9fe9 100644
--- a/src/addons/mod/lesson/components/index/index.ts
+++ b/src/addons/mod/lesson/components/index/index.ts
@@ -558,13 +558,9 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo
     }
 
     /**
-     * Displays some data based on the current status.
-     *
-     * @param status The current status.
-     * @param previousStatus The previous status. If not defined, there is no previous status.
+     * @inheritdoc
      */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    protected showStatus(status: string, previousStatus?: string): void {
+    protected showStatus(status: string): void {
         this.showSpinner = status == CoreConstants.DOWNLOADING;
     }
 
diff --git a/src/addons/mod/resource/components/index/addon-mod-resource-index.html b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
index c209b8031..a299d9a31 100644
--- a/src/addons/mod/resource/components/index/addon-mod-resource-index.html
+++ b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
@@ -63,7 +63,7 @@
                     <ion-label>
                         <h3>{{ 'core.lastdownloaded' | translate }}</h3>
                         <p>{{ downloadTimeReadable }}</p>
-                        <ion-grid *ngIf="prefetchStatus === outdatedStatus" class="addon-mod_resource-outdated">
+                        <ion-grid *ngIf="currentStatus === outdatedStatus" class="addon-mod_resource-outdated">
                             <ion-row class="ion-align-items-center">
                                 <ion-col size="auto">
                                     <ion-icon color="warning" name="fas-exclamation-triangle" aria-hidden="true"></ion-icon>
diff --git a/src/addons/mod/resource/components/index/index.ts b/src/addons/mod/resource/components/index/index.ts
index 203b2349e..6c26ec16e 100644
--- a/src/addons/mod/resource/components/index/index.ts
+++ b/src/addons/mod/resource/components/index/index.ts
@@ -125,6 +125,8 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
         this.displayDescription = options.printintro === undefined || !!options.printintro;
         this.dataRetrieved.emit(resource);
 
+        this.setStatusListener();
+
         if (AddonModResourceHelper.isDisplayedInIframe(this.module)) {
 
             const downloadResult = await this.downloadResourceIfNeeded(refresh, true);
@@ -202,7 +204,7 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
             downloadable = await AddonModResourceHelper.isMainFileDownloadable(this.module);
 
             if (downloadable) {
-                if (this.prefetchStatus === CoreConstants.OUTDATED && !this.isOnline) {
+                if (this.currentStatus === CoreConstants.OUTDATED && !this.isOnline) {
                     // Warn the user that the file isn't updated.
                     const alert = await CoreDomUtils.showAlert(
                         undefined,
diff --git a/src/core/features/course/classes/main-resource-component.ts b/src/core/features/course/classes/main-resource-component.ts
index d59380505..d94f853dd 100644
--- a/src/core/features/course/classes/main-resource-component.ts
+++ b/src/core/features/course/classes/main-resource-component.ts
@@ -58,21 +58,20 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
     hasOffline = false; // Resources don't have any data to sync.
 
     description?: string; // Module description.
-    prefetchStatus?: string;
-    downloadTimeReadable?: string; // Last download time in a readable format.
     isDestroyed = false; // Whether the component is destroyed.
 
     protected fetchContentDefaultError = 'core.course.errorgetmodule'; // Default error to show when loading contents.
     protected isCurrentView = false; // Whether the component is in the current view.
     protected siteId?: string; // Current Site ID.
     protected statusObserver?: CoreEventObserver; // Observer of package status. Only if setStatusListener is called.
-    protected currentStatus?: string; // The current status of the module. Only if setStatusListener is called.
+    currentStatus?: string; // The current status of the module. Only if setStatusListener is called.
+    downloadTimeReadable?: string; // Last download time in a readable format. Only if setStatusListener is called.
+
     protected completionObserver?: CoreEventObserver;
     protected logger: CoreLogger;
     protected debouncedUpdateModule?: () => void; // Update the module after a certain time.
     protected showCompletion = false; // Whether to show completion inside the activity.
     protected displayDescription = true; // Wether to show Module description on module page, and not on summary or the contrary.
-    protected packageStatusObserver?: CoreEventObserver; // Observer of package status.
 
     constructor(
         @Optional() @Inject('') loggerName: string = 'CoreCourseModuleMainResourceComponent',
@@ -106,16 +105,6 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
                 this.fetchModule();
             }, 10000);
         }
-
-        this.packageStatusObserver = CoreEvents.on(
-            CoreEvents.PACKAGE_STATUS_CHANGED,
-            (data) => {
-                if (data.componentId == module.id && data.component == this.component) {
-                    this.getPackageStatus();
-                }
-            },
-            this.siteId,
-        );
     }
 
     /**
@@ -203,7 +192,6 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
 
         try {
             await this.fetchContent(refresh);
-            await this.getPackageStatus(refresh);
         } catch (error) {
             if (!refresh && !CoreSites.getCurrentSite()?.isOfflineDisabled() && this.isNotFoundError(error)) {
                 // Module not found, retry without using cache.
@@ -227,28 +215,25 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
     }
 
     /**
-     * Updage package status.
-     *
-     * @param refresh If prefetch info has to be refreshed.
+     * Updage package last downloaded.
      */
-    async getPackageStatus(refresh = false): Promise<void> {
+    protected async getPackageLastDownloaded(): Promise<void> {
         if (!this.module) {
             return;
         }
 
-        const moduleInfo =
-                await CoreCourseHelper.getModulePrefetchInfo(this.module, this.courseId, refresh, this.component);
+        const lastDownloaded =
+                await CoreCourseHelper.getModulePackageLastDownloaded(this.module, this.component);
 
-        this.downloadTimeReadable = CoreTextUtils.ucFirst(moduleInfo.downloadTimeReadable);
-        this.prefetchStatus = moduleInfo.status;
+        this.downloadTimeReadable = lastDownloaded.downloadTimeReadable;
     }
 
     /**
-     * Check if the module is prefetched or being prefetched. To make it faster, just use the data calculated by fillContextMenu.
-     * This means that you need to call fillContextMenu to make this work.
+     * Check if the module is prefetched or being prefetched.
+     * To make it faster, just use the data calculated by setStatusListener.
      */
     protected isPrefetched(): boolean {
-        return this.prefetchStatus != CoreConstants.NOT_DOWNLOADABLE && this.prefetchStatus != CoreConstants.NOT_DOWNLOADED;
+        return this.currentStatus != CoreConstants.NOT_DOWNLOADABLE && this.currentStatus != CoreConstants.NOT_DOWNLOADED;
     }
 
     /**
@@ -308,6 +293,8 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
                 const previousStatus = this.currentStatus;
                 this.currentStatus = data.status;
 
+                this.getPackageLastDownloaded();
+
                 this.showStatus(this.currentStatus, previousStatus);
             }, this.siteId);
         } else if (!refresh) {
@@ -322,6 +309,9 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
         const status = await CoreCourseModulePrefetchDelegate.getModuleStatus(this.module, this.courseId, undefined, refresh);
 
         this.currentStatus = status;
+
+        this.getPackageLastDownloaded();
+
         this.showStatus(status);
     }
 
@@ -451,7 +441,6 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
         this.isDestroyed = true;
         this.statusObserver?.off();
         this.completionObserver?.off();
-        this.packageStatusObserver?.off();
     }
 
     /**
diff --git a/src/core/features/course/components/module-navigation/module-navigation.ts b/src/core/features/course/components/module-navigation/module-navigation.ts
index 2b3573738..3a566c701 100644
--- a/src/core/features/course/components/module-navigation/module-navigation.ts
+++ b/src/core/features/course/components/module-navigation/module-navigation.ts
@@ -110,7 +110,7 @@ export class CoreCourseModuleNavigationComponent implements OnInit, OnDestroy {
             return;
         }
         // Set a minimum height value.
-        this.initialHeight = this.initialHeight || 56;
+        this.initialHeight = this.initialHeight || 48;
         this.previousHeight = this.initialHeight;
 
         this.content = this.element.closest('ion-content');
diff --git a/src/core/features/course/services/course-helper.ts b/src/core/features/course/services/course-helper.ts
index 39e917109..77aab7baa 100644
--- a/src/core/features/course/services/course-helper.ts
+++ b/src/core/features/course/services/course-helper.ts
@@ -75,36 +75,19 @@ import { CoreStatusWithWarningsWSResponse } from '@services/ws';
 /**
  * Prefetch info of a module.
  */
-export type CoreCourseModulePrefetchInfo = {
-    /**
-     * Downloaded size.
-     */
-    size: number;
+export type CoreCourseModulePrefetchInfo = CoreCourseModulePackageLastDownloaded & {
+    size: number; // Downloaded size.
+    sizeReadable: string; // Downloadable size in a readable format.
+    status: string; // Module status.
+    statusIcon?: string; // Icon's name of the module status.
+};
 
-    /**
-     * Downloadable size in a readable format.
-     */
-    sizeReadable: string;
-
-    /**
-     * Module status.
-     */
-    status: string;
-
-    /**
-     * Icon's name of the module status.
-     */
-    statusIcon?: string;
-
-    /**
-     * Time when the module was last downloaded.
-     */
-    downloadTime: number;
-
-    /**
-     * Download time in a readable format.
-     */
-    downloadTimeReadable: string;
+/**
+ * Prefetch info of a module.
+ */
+export type CoreCourseModulePackageLastDownloaded = {
+    downloadTime: number; // Time when the module was last downloaded.
+    downloadTimeReadable: string; // Download time in a readable format.
 };
 
 /**
@@ -1484,12 +1467,9 @@ export class CoreCourseHelperProvider {
     async getModulePrefetchInfo(
         module: CoreCourseModuleData,
         courseId: number,
-        invalidateCache?: boolean,
-        component?: string,
+        invalidateCache = false,
+        component = '',
     ): Promise<CoreCourseModulePrefetchInfo> {
-
-        const siteId = CoreSites.getCurrentSiteId();
-
         if (invalidateCache) {
             // Currently, some modules pass invalidateCache=false because they already invalidate data in downloadResourceIfNeeded.
             // If this function is changed to do more actions if invalidateCache=true, please review those modules.
@@ -1501,7 +1481,7 @@ export class CoreCourseHelperProvider {
         const results = await Promise.all([
             CoreCourseModulePrefetchDelegate.getModuleStoredSize(module, courseId),
             CoreCourseModulePrefetchDelegate.getModuleStatus(module, courseId),
-            CoreUtils.ignoreErrors(CoreFilepool.getPackageData(siteId, component || '', module.id)),
+            this.getModulePackageLastDownloaded(module, component),
         ]);
 
         // Treat stored size.
@@ -1528,33 +1508,53 @@ export class CoreCourseHelperProvider {
                 break;
         }
 
-        // Treat download time.
-        if (!results[2] || !results[2].downloadTime || !CoreFileHelper.isStateDownloaded(results[2].status || '')) {
-            // Not downloaded.
-            return {
-                size,
-                sizeReadable,
-                status,
-                statusIcon,
-                downloadTime: 0,
-                downloadTimeReadable: '',
-            };
-        }
-
-        const now = CoreTimeUtils.timestamp();
-        const downloadTime = results[2].downloadTime;
-        let downloadTimeReadable = '';
-        if (now - results[2].downloadTime < 7 * 86400) {
-            downloadTimeReadable = moment(results[2].downloadTime * 1000).fromNow();
-        } else {
-            downloadTimeReadable = moment(results[2].downloadTime * 1000).calendar();
-        }
+        const packageData = results[2];
 
         return {
             size,
             sizeReadable,
             status,
             statusIcon,
+            downloadTime: packageData.downloadTime,
+            downloadTimeReadable: packageData.downloadTimeReadable,
+        };
+    }
+
+    /**
+     * Get prefetch info for a module.
+     *
+     * @param module Module to get the info from.
+     * @param component Component of the module.
+     * @return Promise resolved with the info.
+     */
+    async getModulePackageLastDownloaded(
+        module: CoreCourseModuleData,
+        component = '',
+    ): Promise<CoreCourseModulePackageLastDownloaded> {
+        const siteId = CoreSites.getCurrentSiteId();
+        const packageData = await CoreUtils.ignoreErrors(CoreFilepool.getPackageData(siteId, component, module.id));
+
+        // Treat download time.
+        if (!packageData || !packageData.downloadTime || !CoreFileHelper.isStateDownloaded(packageData.status || '')) {
+            // Not downloaded.
+            return {
+                downloadTime: 0,
+                downloadTimeReadable: '',
+            };
+        }
+
+        const now = CoreTimeUtils.timestamp();
+        const downloadTime = packageData.downloadTime;
+        let downloadTimeReadable = '';
+        if (now - downloadTime < 7 * 86400) {
+            downloadTimeReadable = moment(downloadTime * 1000).fromNow();
+        } else {
+            downloadTimeReadable = moment(downloadTime * 1000).calendar();
+        }
+
+        downloadTimeReadable = CoreTextUtils.ucFirst(downloadTimeReadable);
+
+        return {
             downloadTime,
             downloadTimeReadable,
         };
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 6f2e2b837..edcdad2f9 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -233,6 +233,9 @@
     }
 
     --core-loading-spinner: var(--brand);
+    ion-loading {
+        --spinner-color: var(--core-loading-spinner);
+    }
     ion-spinner, ion-refresher {
         --ion-color-base: var(--core-loading-spinner);
         --ion-color-primary: var(--core-loading-spinner);

From 6c782e3b3eaaaeb9e3f222746f9212db45c87164 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 16 Feb 2022 15:32:09 +0100
Subject: [PATCH 0551/1008] MOBILE-3931 module: Adapt module site plugins code

---
 .../course/classes/main-resource-component.ts |  15 +-
 .../module-summary/module-summary.html        |  14 +-
 .../module-summary/module-summary.ts          |  21 ++-
 .../features/course/services/course-helper.ts | 139 +----------------
 .../course/services/module-delegate.ts        |   4 +-
 .../core-siteplugins-module-index.html        |  26 +---
 .../components/module-index/module-index.ts   | 140 +++++++++++++-----
 7 files changed, 145 insertions(+), 214 deletions(-)

diff --git a/src/core/features/course/classes/main-resource-component.ts b/src/core/features/course/classes/main-resource-component.ts
index d94f853dd..edbcd1680 100644
--- a/src/core/features/course/classes/main-resource-component.ts
+++ b/src/core/features/course/classes/main-resource-component.ts
@@ -58,7 +58,6 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
     hasOffline = false; // Resources don't have any data to sync.
 
     description?: string; // Module description.
-    isDestroyed = false; // Whether the component is destroyed.
 
     protected fetchContentDefaultError = 'core.course.errorgetmodule'; // Default error to show when loading contents.
     protected isCurrentView = false; // Whether the component is in the current view.
@@ -72,6 +71,7 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
     protected debouncedUpdateModule?: () => void; // Update the module after a certain time.
     protected showCompletion = false; // Whether to show completion inside the activity.
     protected displayDescription = true; // Wether to show Module description on module page, and not on summary or the contrary.
+    protected isDestroyed = false; // Whether the component is destroyed.
 
     constructor(
         @Optional() @Inject('') loggerName: string = 'CoreCourseModuleMainResourceComponent',
@@ -111,11 +111,10 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
      * Refresh the data.
      *
      * @param refresher Refresher.
-     * @param done Function to call when done. Never used.
      * @param showErrors If show errors to the user of hide them.
      * @return Promise resolved when done.
      */
-    async doRefresh(refresher?: IonRefresher | null, done?: () => void, showErrors: boolean = false): Promise<void> {
+    async doRefresh(refresher?: IonRefresher | null, showErrors = false): Promise<void> {
         if (!this.loaded || !this.module) {
             // Module can be undefined if course format changes from single activity to weekly/topics.
             return;
@@ -405,10 +404,14 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
             componentProps: {
                 moduleId: this.module.id,
                 module: this.module,
-                description: !this.displayDescription ? this.description : '',
+                description: this.description,
                 component: this.component,
                 courseId: this.courseId,
                 hasOffline: this.hasOffline,
+                displayOptions: {
+                    // Show description on summary if not shown on the page.
+                    displayDescription: !this.displayDescription,
+                },
             },
         });
 
@@ -421,11 +424,11 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
                 } finally {
                     modal.dismiss();
                 }
-            } else if(data.action == 'sync') {
+            } else if (data.action == 'sync') {
                 const modal = await CoreDomUtils.showModalLoading();
 
                 try {
-                    await this.doRefresh( undefined, undefined, true);
+                    await this.doRefresh( undefined, true);
                 } finally {
                     modal.dismiss();
                 }
diff --git a/src/core/features/course/components/module-summary/module-summary.html b/src/core/features/course/components/module-summary/module-summary.html
index 26d20c8b6..7830b0baf 100644
--- a/src/core/features/course/components/module-summary/module-summary.html
+++ b/src/core/features/course/components/module-summary/module-summary.html
@@ -19,12 +19,12 @@
                     </core-format-text>
                 </h1>
             </ion-label>
-            <ion-button fill="clear" [href]="externalUrl" core-link [showBrowserWarning]="false" color="dark"
-                [attr.aria-label]="'core.openinbrowser' | translate" slot="end">
+            <ion-button fill="clear" *ngIf="displayOptions.displayOpenInBrowser" [href]="externalUrl" core-link [showBrowserWarning]="false"
+                color="dark" [attr.aria-label]="'core.openinbrowser' | translate" slot="end">
                 <ion-icon name="fas-external-link-alt" slot="icon-only" aria-hidden="true"></ion-icon>
             </ion-button>
         </ion-item>
-        <ion-item class="ion-text-wrap" *ngIf="module && description">
+        <ion-item class="ion-text-wrap" *ngIf="module && description && displayOptions.displayDescription">
             <ion-label>
                 <core-format-text [text]="description" [component]="component" [componentId]="componentId" contextLevel="module"
                     [contextInstanceId]="module.id" [courseId]="courseId" [maxHeight]="120">
@@ -32,7 +32,7 @@
             </ion-label>
         </ion-item>
 
-        <ion-item button class="ion-margin" *ngIf="prefetchText" class="ion-text-wrap">
+        <ion-item button class="ion-margin" *ngIf="prefetchText && displayOptions.displayPrefetch" class="ion-text-wrap">
             <ion-label>
                 <p class="item-heading ion-text-wrap">{{ prefetchText }}</p>
                 <p *ngIf="downloadTimeReadable">{{ downloadTimeReadable }}</p>
@@ -45,7 +45,7 @@
             <ion-spinner *ngIf="prefetchStatusIcon == 'spinner'" slot="end" aria-hidden="true"></ion-spinner>
         </ion-item>
 
-        <ion-item button class="ion-margin" *ngIf="sizeReadable" class="ion-text-wrap">
+        <ion-item button class="ion-margin" *ngIf="sizeReadable && displayOptions.displaySize" class="ion-text-wrap">
             <ion-label>
                 <p class="item-heading ion-text-wrap">{{ 'addon.storagemanager.totalspaceusage' | translate }}</p>
                 <ion-badge color="light">{{ sizeReadable | coreBytesToSize }}</ion-badge>
@@ -57,7 +57,7 @@
             <ion-spinner *ngIf="removeFilesLoading" slot="end" aria-hidden="true"></ion-spinner>
         </ion-item>
 
-        <ion-button *ngIf="blog" class="ion-margin" (click)="gotoBlog()" expand="block" fill="outline">
+        <ion-button *ngIf="blog && displayOptions.displayBlog" class="ion-margin" (click)="gotoBlog()" expand="block" fill="outline">
             <ion-icon name="far-newspaper" slot="start" aria-hidden="true"></ion-icon>
             <ion-label>
                 {{ 'addon.blog.blog' | translate }}
@@ -65,7 +65,7 @@
         </ion-button>
     </core-loading>
 </ion-content>
-<ion-footer *ngIf="loaded && isOnline">
+<ion-footer *ngIf="loaded && isOnline && displayOptions.displayRefresh">
     <ion-button class="ion-margin" *ngIf="!hasOffline" (click)="refresh()" expand="block">
         <ion-icon name="fas-redo-alt" slot="start" aria-hidden="true"></ion-icon>
         <ion-label>
diff --git a/src/core/features/course/components/module-summary/module-summary.ts b/src/core/features/course/components/module-summary/module-summary.ts
index 58d159945..3475ca44f 100644
--- a/src/core/features/course/components/module-summary/module-summary.ts
+++ b/src/core/features/course/components/module-summary/module-summary.ts
@@ -46,6 +46,7 @@ export class CoreCourseModuleSummaryComponent implements OnInit, OnDestroy {
     @Input() component = ''; // Component name.
     @Input() description = ''; // Module description.
     @Input() hasOffline = false; // If it has offline data to be synced.
+    @Input() displayOptions: CoreCourseModuleSummaryDisplayOptions = {};
 
     loaded = false; // If the component has been loaded.
     componentId?: number; // Component ID.
@@ -95,6 +96,15 @@ export class CoreCourseModuleSummaryComponent implements OnInit, OnDestroy {
             return;
         }
 
+        this.displayOptions = Object.assign({
+            displayOpenInBrowser: true,
+            displayDescription: true,
+            displayRefresh: true,
+            displayPrefetch: true,
+            displaySize: true,
+            displayBlog: true,
+        }, this.displayOptions);
+
         this.fetchContent();
 
         if (this.component) {
@@ -306,6 +316,15 @@ export class CoreCourseModuleSummaryComponent implements OnInit, OnDestroy {
 
 }
 
-export type CoreCourseModuleSummaryResult =  {
+export type CoreCourseModuleSummaryResult = {
     action: 'sync'|'refresh';
 };
+
+export type CoreCourseModuleSummaryDisplayOptions = {
+    displayOpenInBrowser?: boolean;
+    displayDescription?: boolean;
+    displayRefresh?: boolean;
+    displayPrefetch?: boolean;
+    displaySize?: boolean;
+    displayBlog?: boolean;
+};
diff --git a/src/core/features/course/services/course-helper.ts b/src/core/features/course/services/course-helper.ts
index 77aab7baa..4c807d5e1 100644
--- a/src/core/features/course/services/course-helper.ts
+++ b/src/core/features/course/services/course-helper.ts
@@ -64,7 +64,6 @@ import { CoreFile } from '@services/file';
 import { CoreUrlUtils } from '@services/utils/url';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreTimeUtils } from '@services/utils/time';
-import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreFilterHelper } from '@features/filter/services/filter-helper';
 import { CoreNetworkError } from '@classes/errors/network-error';
 import { CoreSiteHome } from '@features/sitehome/services/sitehome';
@@ -474,23 +473,18 @@ export class CoreCourseHelperProvider {
      *
      * @param module Module to remove the files.
      * @param courseId Course ID the module belongs to.
-     * @param done Function to call when done. It will close the context menu.
      * @return Promise resolved when done.
      * @deprecated since 4.0
      */
-    async confirmAndRemoveFiles(module: CoreCourseModuleData, courseId: number, done?: () => void): Promise<void> {
+    async confirmAndRemoveFiles(module: CoreCourseModuleData, courseId: number): Promise<void> {
         let modal: CoreIonLoadingElement | undefined;
 
         try {
-
             await CoreDomUtils.showDeleteConfirm('addon.storagemanager.confirmdeletedatafrom', { name: module.name });
 
             modal = await CoreDomUtils.showModalLoading();
 
             await this.removeModuleStoredData(module, courseId);
-
-            done && done();
-
         } catch (error) {
             if (error) {
                 CoreDomUtils.showErrorModal(error);
@@ -555,45 +549,6 @@ export class CoreCourseHelperProvider {
         await CoreDomUtils.confirmDownloadSize(sizeSum, undefined, undefined, undefined, undefined, alwaysConfirm);
     }
 
-    /**
-     * Helper function to prefetch a module, showing a confirmation modal if the size is big.
-     * This function is meant to be called from a context menu option. It will also modify some data like the prefetch icon.
-     *
-     * @param instance The component instance that has the context menu.
-     * @param module Module to be prefetched
-     * @param courseId Course ID the module belongs to.
-     * @param done Function to call when done. It will close the context menu.
-     * @return Promise resolved when done.
-     * @deprecated since 4.0
-     */
-    async contextMenuPrefetch(
-        instance: ComponentWithContextMenu,
-        module: CoreCourseModuleData,
-        courseId: number,
-        done?: () => void,
-    ): Promise<void> {
-        const initialIcon = instance.prefetchStatusIcon;
-        instance.prefetchStatusIcon = CoreConstants.ICON_DOWNLOADING; // Show spinner since this operation might take a while.
-
-        try {
-            // We need to call getDownloadSize, the package might have been updated.
-            const size = await CoreCourseModulePrefetchDelegate.getModuleDownloadSize(module, courseId, true);
-
-            await CoreDomUtils.confirmDownloadSize(size);
-
-            await CoreCourseModulePrefetchDelegate.prefetchModule(module, courseId, true);
-
-            // Success, close menu.
-            done && done();
-        } catch (error) {
-            instance.prefetchStatusIcon = initialIcon;
-
-            if (!instance.isDestroyed) {
-                CoreDomUtils.showErrorModalDefault(error, 'core.errordownloading', true);
-            }
-        }
-    }
-
     /**
      * Check whether a course is accessed using guest access.
      *
@@ -1030,87 +985,6 @@ export class CoreCourseHelperProvider {
         await CoreFilepool.downloadOrPrefetchFiles(siteId, files, false, false, component, componentId);
     }
 
-    /**
-     * Fill the Context Menu for a certain module.
-     *
-     * @param instance The component instance that has the context menu.
-     * @param module Module to be prefetched
-     * @param courseId Course ID the module belongs to.
-     * @param invalidateCache Invalidates the cache first.
-     * @param component Component of the module.
-     * @return Promise resolved when done.
-     */
-    async fillContextMenu(
-        instance: ComponentWithContextMenu,
-        module: CoreCourseModuleData,
-        courseId: number,
-        invalidateCache?: boolean,
-        component?: string,
-    ): Promise<void> {
-        const siteId = CoreSites.getCurrentSiteId();
-
-        const moduleInfo = await this.getModulePrefetchInfo(module, courseId, invalidateCache, component);
-
-        instance.size = moduleInfo.sizeReadable;
-        instance.prefetchStatusIcon = moduleInfo.statusIcon;
-        instance.prefetchStatus = moduleInfo.status;
-        instance.downloadTimeReadable = CoreTextUtils.ucFirst(moduleInfo.downloadTimeReadable);
-
-        if (moduleInfo.status != CoreConstants.NOT_DOWNLOADABLE) {
-            // Module is downloadable, get the text to display to prefetch.
-            if (moduleInfo.downloadTime && moduleInfo.downloadTime > 0) {
-                instance.prefetchText = Translate.instant('core.lastdownloaded') + ': ' + moduleInfo.downloadTimeReadable;
-            } else {
-                // Module not downloaded, show a default text.
-                instance.prefetchText = Translate.instant('core.download');
-            }
-        }
-
-        if (moduleInfo.status == CoreConstants.DOWNLOADING) {
-            // Set this to empty to prevent "remove file" option showing up while downloading.
-            instance.size = '';
-        }
-
-        if (!instance.contextMenuStatusObserver && component) {
-            instance.contextMenuStatusObserver = CoreEvents.on(
-                CoreEvents.PACKAGE_STATUS_CHANGED,
-                (data) => {
-                    if (data.componentId == module.id && data.component == component) {
-                        this.fillContextMenu(instance, module, courseId, false, component);
-                    }
-                },
-                siteId,
-            );
-        }
-
-        if (!instance.contextFileStatusObserver && component) {
-            // Debounce the update size function to prevent too many calls when downloading or deleting a whole activity.
-            const debouncedUpdateSize = CoreUtils.debounce(async () => {
-                const moduleSize = await CoreCourseModulePrefetchDelegate.getModuleStoredSize(module, courseId);
-
-                instance.size = moduleSize > 0 ? CoreTextUtils.bytesToSize(moduleSize, 2) : '';
-            }, 1000);
-
-            instance.contextFileStatusObserver = CoreEvents.on(
-                CoreEvents.COMPONENT_FILE_ACTION,
-                (data) => {
-                    if (data.component != component || data.componentId != module.id) {
-                        // The event doesn't belong to this component, ignore.
-                        return;
-                    }
-
-                    if (!CoreFilepool.isFileEventDownloadedOrDeleted(data)) {
-                        return;
-                    }
-
-                    // Update the module size.
-                    debouncedUpdateSize();
-                },
-                siteId,
-            );
-        }
-    }
-
     /**
      * Get a course. It will first check the user courses, and fallback to another WS if not enrolled.
      *
@@ -2225,14 +2099,3 @@ export type CoreCourseOpenModuleOptions = {
     sectionId?: number; // Section the module belongs to.
     modNavOptions?: CoreNavigationOptions; // Navigation options to open the module, including params to pass to the module.
 };
-
-type ComponentWithContextMenu = {
-    prefetchStatusIcon?: string;
-    isDestroyed?: boolean;
-    size?: string;
-    prefetchStatus?: string;
-    prefetchText?: string;
-    downloadTimeReadable?: string;
-    contextMenuStatusObserver?: CoreEventObserver;
-    contextFileStatusObserver?: CoreEventObserver;
-};
diff --git a/src/core/features/course/services/module-delegate.ts b/src/core/features/course/services/module-delegate.ts
index d32c1be3e..6c9a73055 100644
--- a/src/core/features/course/services/module-delegate.ts
+++ b/src/core/features/course/services/module-delegate.ts
@@ -202,10 +202,10 @@ export interface CoreCourseModuleMainComponent {
      * Refresh the data.
      *
      * @param refresher Refresher.
-     * @param done Function to call when done.
+     * @param showErrors If show errors to the user of hide them.
      * @return Promise resolved when done.
      */
-    doRefresh(refresher?: IonRefresher, done?: () => void): Promise<void>;
+    doRefresh(refresher?: IonRefresher | null, showErrors?: boolean): Promise<void>;
 }
 
 /**
diff --git a/src/core/features/siteplugins/components/module-index/core-siteplugins-module-index.html b/src/core/features/siteplugins/components/module-index/core-siteplugins-module-index.html
index 89dfe24d8..d4f915a10 100644
--- a/src/core/features/siteplugins/components/module-index/core-siteplugins-module-index.html
+++ b/src/core/features/siteplugins/components/module-index/core-siteplugins-module-index.html
@@ -1,28 +1,8 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <core-context-menu>
-        <core-context-menu-item [hidden]="!displayOpenInBrowser || !externalUrl || (
-            content?.compileComponent?.componentInstance?.displayOpenInBrowser === false)" [priority]="900"
-            [content]="'core.openinbrowser' | translate" [href]="externalUrl" iconAction="fas-external-link-alt">
-        </core-context-menu-item>
-        <core-context-menu-item [hidden]="!displayDescription || !description || (
-            content?.compileComponent?.componentInstance?.displayDescription === false)" [priority]="800"
-            [content]="'core.moduleintro' | translate" (action)="expandDescription()" iconAction="fas-arrow-right">
-        </core-context-menu-item>
-        <core-context-menu-item [hidden]="!displayRefresh || (
-            content?.compileComponent?.componentInstance?.displayRefresh === false)" [priority]="700"
-            [content]="'core.refresh' | translate" (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item [hidden]="!displayPrefetch || !prefetchStatusIcon || (
-            content?.compileComponent?.componentInstance?.displayPrefetch === false)" [priority]="600" [content]="prefetchText"
-            (action)="prefetch()" [iconAction]="prefetchStatusIcon" [closeOnClick]="false">
-        </core-context-menu-item>
-        <core-context-menu-item [hidden]="!displaySize || !size || (
-            content?.compileComponent?.componentInstance?.displaySize === false)" [priority]="500"
-            [content]="'core.clearstoreddata' | translate:{$a: size}" [iconDescription]="'fas-archive'" (action)="removeFiles()"
-            iconAction="fas-trash" [closeOnClick]="false">
-        </core-context-menu-item>
-    </core-context-menu>
+    <ion-button fill="clear" (click)="openModuleSummary()" [attr.aria-label]="'core.info' | translate">
+        <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
+    </ion-button>
 </core-navbar-buttons>
 
 <core-site-plugins-plugin-content *ngIf="component && method" [component]="component" [method]="method" [args]="args"
diff --git a/src/core/features/siteplugins/components/module-index/module-index.ts b/src/core/features/siteplugins/components/module-index/module-index.ts
index 7b8d9311e..a87dd2527 100644
--- a/src/core/features/siteplugins/components/module-index/module-index.ts
+++ b/src/core/features/siteplugins/components/module-index/module-index.ts
@@ -14,8 +14,13 @@
 
 import { CoreConstants } from '@/core/constants';
 import { Component, OnInit, OnDestroy, Input, ViewChild } from '@angular/core';
+import { CoreIonLoadingElement } from '@classes/ion-loading';
 
 import { CoreSiteWSPreSets } from '@classes/site';
+import {
+    CoreCourseModuleSummaryResult,
+    CoreCourseModuleSummaryComponent,
+} from '@features/course/components/module-summary/module-summary';
 import { CoreCourseHelper, CoreCourseModuleData } from '@features/course/services/course-helper';
 import {
     CoreCourseModuleDelegate,
@@ -28,10 +33,8 @@ import {
     CoreSitePluginsCourseModuleHandlerData,
 } from '@features/siteplugins/services/siteplugins';
 import { IonRefresher } from '@ionic/angular';
-import { CoreTextUtils } from '@services/utils/text';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
-import { Translate } from '@singletons';
-import { CoreEventObserver } from '@singletons/events';
 import { CoreSitePluginsPluginContentComponent } from '../plugin-content/plugin-content';
 
 /**
@@ -55,22 +58,39 @@ export class CoreSitePluginsModuleIndexComponent implements OnInit, OnDestroy, C
     args?: Record<string, unknown>;
     initResult?: CoreSitePluginsContent | null;
     preSets?: CoreSiteWSPreSets;
-
-    // Data for context menu.
-    externalUrl?: string;
     description?: string;
-    refreshIcon?: string;
+
+    /**
+     * @deprecated since 4.0, use module.url instead.
+     */
+    externalUrl?: string;
+    /**
+     * @deprecated since 4.0. It won't be populated anymore.
+     */
+    refreshIcon = CoreConstants.ICON_REFRESH;
+    /**
+     * @deprecated since 4.0.. It won't be populated anymore.
+     */
     prefetchStatus?: string;
+    /**
+     * @deprecated since 4.0. It won't be populated anymore.
+     */
     prefetchStatusIcon?: string;
+    /**
+     * @deprecated since 4.0. It won't be populated anymore.
+     */
     prefetchText?: string;
+    /**
+     * @deprecated since 4.0. It won't be populated anymore.
+     */
     size?: string;
-    contextMenuStatusObserver?: CoreEventObserver;
-    contextFileStatusObserver?: CoreEventObserver;
+
     displayOpenInBrowser = true;
     displayDescription = true;
     displayRefresh = true;
     displayPrefetch = true;
     displaySize = true;
+
     ptrEnabled = true;
     isDestroyed = false;
 
@@ -80,8 +100,6 @@ export class CoreSitePluginsModuleIndexComponent implements OnInit, OnDestroy, C
      * Component being initialized.
      */
     ngOnInit(): void {
-        this.refreshIcon = CoreConstants.ICON_LOADING;
-
         if (!this.module) {
             return;
         }
@@ -122,71 +140,119 @@ export class CoreSitePluginsModuleIndexComponent implements OnInit, OnDestroy, C
      * Refresh the data.
      *
      * @param refresher Refresher.
-     * @param done Function to call when done.
      * @return Promise resolved when done.
      */
-    async doRefresh(refresher?: IonRefresher | null, done?: () => void): Promise<void> {
-        if (this.content) {
-            this.refreshIcon = CoreConstants.ICON_LOADING;
-        }
-
+    async doRefresh(refresher?: IonRefresher | null): Promise<void> {
         try {
             await this.content?.refreshContent(false);
         } finally {
             refresher?.complete();
-            done && done();
         }
     }
 
     /**
      * Function called when the data of the site plugin content is loaded.
      */
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     contentLoaded(refresh: boolean): void {
-        this.refreshIcon = CoreConstants.ICON_REFRESH;
-
-        // Check if there is a prefetch handler for this type of module.
-        if (CoreCourseModulePrefetchDelegate.getPrefetchHandlerFor(this.module.modname)) {
-            CoreCourseHelper.fillContextMenu(this, this.module, this.courseId, refresh, this.component);
-        }
+        return;
     }
 
     /**
      * Function called when starting to load the data of the site plugin content.
      */
     contentLoading(): void {
-        this.refreshIcon = CoreConstants.ICON_LOADING;
+        return;
     }
 
     /**
      * Expand the description.
+     *
+     * @deprecated since 4.0
      */
     expandDescription(): void {
-        if (!this.description) {
+        this.openModuleSummary();
+    }
+
+    /**
+     * Opens a module summary page.
+     */
+    async openModuleSummary(): Promise<void> {
+        if (!this.module) {
             return;
         }
 
-        CoreTextUtils.viewText(Translate.instant('core.description'), this.description, {
-            component: this.component,
-            componentId: this.module.id,
-            filter: true,
-            contextLevel: 'module',
-            instanceId: this.module.id,
-            courseId: this.courseId,
+        const data = await CoreDomUtils.openSideModal<CoreCourseModuleSummaryResult>({
+            component: CoreCourseModuleSummaryComponent,
+            componentProps: {
+                moduleId: this.module.id,
+                module: this.module,
+                description: this.description,
+                component: this.component,
+                courseId: this.courseId,
+                displayOptions: {
+                    displayOpenInBrowser: this.displayOpenInBrowser,
+                    displayDescription: this.displayDescription,
+                    displayRefresh: this.displayRefresh,
+                    displayPrefetch: this.displayPrefetch,
+                    displaySize: this.displaySize,
+                    displayBlog: false,
+                },
+            },
         });
+
+        if (data && data.action == 'refresh') {
+            const modal = await CoreDomUtils.showModalLoading();
+
+            try {
+                await this.doRefresh();
+            } finally {
+                modal.dismiss();
+            }
+        }
     }
 
     /**
      * Prefetch the module.
+     *
+     * @deprecated since 4.0
      */
-    prefetch(): void {
-        CoreCourseHelper.contextMenuPrefetch(this, this.module, this.courseId);
+    async prefetch(): Promise<void> {
+        try {
+            // We need to call getDownloadSize, the package might have been updated.
+            const size = await CoreCourseModulePrefetchDelegate.getModuleDownloadSize(this.module, this.courseId, true);
+
+            await CoreDomUtils.confirmDownloadSize(size);
+
+            await CoreCourseModulePrefetchDelegate.prefetchModule(this.module, this.courseId, true);
+        } catch (error) {
+            if (!this.isDestroyed) {
+                CoreDomUtils.showErrorModalDefault(error, 'core.errordownloading', true);
+            }
+        }
     }
 
     /**
      * Confirm and remove downloaded files.
+     *
+     * @deprecated since 4.0
      */
-    removeFiles(): void {
-        CoreCourseHelper.confirmAndRemoveFiles(this.module, this.courseId);
+    async removeFiles(): Promise<void> {
+        let modal: CoreIonLoadingElement | undefined;
+
+        try {
+            await CoreDomUtils.showDeleteConfirm('addon.storagemanager.confirmdeletedatafrom', { name: this.module.name });
+
+            modal = await CoreDomUtils.showModalLoading();
+
+            await CoreCourseHelper.removeModuleStoredData(this.module, this.courseId);
+        } catch (error) {
+            if (error) {
+                CoreDomUtils.showErrorModal(error);
+            }
+        } finally {
+            modal?.dismiss();
+        }
     }
 
     /**

From 6dcd37234fddedc26670a08d549f1cda9928eedc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 16 Feb 2022 17:02:18 +0100
Subject: [PATCH 0552/1008] MOBILE-3931 module: Remove duplicated context menu
 items

---
 src/addons/mod/forum/components/index/index.html         | 6 ------
 .../components/index/addon-mod-glossary-index.html       | 6 ------
 .../course/pages/module-preview/module-preview.html      | 9 ++++-----
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/src/addons/mod/forum/components/index/index.html b/src/addons/mod/forum/components/index/index.html
index b16a7b9d4..f6d887a7f 100644
--- a/src/addons/mod/forum/components/index/index.html
+++ b/src/addons/mod/forum/components/index/index.html
@@ -1,11 +1,5 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <core-context-menu>
-        <core-context-menu-item *ngIf="sortingAvailable" iconAction="fas-sort" [priority]="300" [content]="'core.sort' | translate"
-            (action)="showSortOrderSelector()">
-        </core-context-menu-item>
-    </core-context-menu>
-
     <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
diff --git a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
index 2341c36e7..05414fc94 100644
--- a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
+++ b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
@@ -9,12 +9,6 @@
         <ion-icon name="fas-search" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
 
-    <core-context-menu>
-        <core-context-menu-item *ngIf="canAdd" [priority]="550" [content]="'addon.mod_glossary.addentry' | translate"
-            (action)="openNewEntry()" iconAction="fas-plus">
-        </core-context-menu-item>
-    </core-context-menu>
-
     <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
diff --git a/src/core/features/course/pages/module-preview/module-preview.html b/src/core/features/course/pages/module-preview/module-preview.html
index 3fceb9d64..eb42c4b54 100644
--- a/src/core/features/course/pages/module-preview/module-preview.html
+++ b/src/core/features/course/pages/module-preview/module-preview.html
@@ -11,11 +11,10 @@
         </ion-title>
 
         <ion-buttons slot="end">
-            <core-context-menu>
-                <core-context-menu-item [priority]="900" *ngIf="module.url" [href]="module!.url"
-                    [content]="'core.openinbrowser' | translate" iconAction="fas-external-link-alt">
-                </core-context-menu-item>
-            </core-context-menu>
+            <ion-button fill="clear" *ngIf="module.url" [href]="module.url" core-link [showBrowserWarning]="false" color="dark"
+                [attr.aria-label]="'core.openinbrowser' | translate">
+                <ion-icon name="fas-external-link-alt" slot="icon-only" aria-hidden="true"></ion-icon>
+            </ion-button>
         </ion-buttons>
     </ion-toolbar>
 </ion-header>

From 71788e83bf8f43c7c37779d7f734219e012d413d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 16 Feb 2022 21:21:33 +0100
Subject: [PATCH 0553/1008] MOBILE-3931 grades: Fix navigate to gradeId

---
 src/core/features/grades/grades.module.ts     |  4 +--
 .../features/grades/pages/course/course.html  | 36 +------------------
 .../grades/pages/course/course.page.ts        | 34 +++++++++++++++---
 .../features/grades/services/grades-helper.ts | 12 ++++---
 src/core/features/grades/services/grades.ts   |  2 +-
 .../grades/services/handlers/overview-link.ts |  2 +-
 .../features/grades/services/handlers/user.ts |  2 +-
 7 files changed, 42 insertions(+), 50 deletions(-)

diff --git a/src/core/features/grades/grades.module.ts b/src/core/features/grades/grades.module.ts
index 6669a9161..8935c6ee8 100644
--- a/src/core/features/grades/grades.module.ts
+++ b/src/core/features/grades/grades.module.ts
@@ -22,7 +22,7 @@ import { CoreMainMenuTabRoutingModule } from '@features/mainmenu/mainmenu-tab-ro
 import { CoreUserDelegate } from '@features/user/services/user-delegate';
 import { PARTICIPANTS_PAGE_NAME } from '@features/user/user.module';
 import { CoreGradesProvider } from './services/grades';
-import { CoreGradesHelperProvider } from './services/grades-helper';
+import { CoreGradesHelperProvider, GRADES_PAGE_NAME } from './services/grades-helper';
 import { CoreGradesCourseOptionHandler } from './services/handlers/course-option';
 import { CoreGradesOverviewLinkHandler } from './services/handlers/overview-link';
 import { CoreGradesUserHandler } from './services/handlers/user';
@@ -33,8 +33,6 @@ export const CORE_GRADES_SERVICES: Type<unknown>[] = [
     CoreGradesHelperProvider,
 ];
 
-export const GRADES_PAGE_NAME = 'grades';
-
 const mainMenuChildrenRoutes: Routes = [
     {
         path: GRADES_PAGE_NAME,
diff --git a/src/core/features/grades/pages/course/course.html b/src/core/features/grades/pages/course/course.html
index c484de9f0..6cbbae4e4 100644
--- a/src/core/features/grades/pages/course/course.html
+++ b/src/core/features/grades/pages/course/course.html
@@ -31,7 +31,7 @@
                             [attr.tabindex]="row.expandable && showSummary && 0" [attr.aria-expanded]="row.expanded"
                             [attr.aria-label]="rowAriaLabel(row)" [attr.aria-controls]="row.detailsid"
                             (ariaButtonClick)="row.expandable && showSummary && toggleRow(row)" [class]="row.rowclass"
-                            [class.core-grades-grade-clickable]="row.expandable && showSummary">
+                            [class.core-grades-grade-clickable]="row.expandable && showSummary" [id]="'grade-'+row.id">
                             <ng-container *ngIf="row.itemtype">
                                 <td *ngIf="row.itemtype == 'category'" class="core-grades-table-category" [attr.rowspan]="row.rowspan">
                                 </td>
@@ -71,40 +71,6 @@
                         <tr *ngIf="row.expandable" [id]="row.detailsid" [class]="row.rowclass" [hidden]="!row.expanded">
                             <td [attr.colspan]="totalColumnsSpan">
                                 <ion-list>
-                                    <ion-item *ngIf="row.itemname && row.link" class="ion-text-wrap" detail="true" [href]="row.link"
-                                        core-link capture="true">
-                                        <ion-icon *ngIf="row.icon" name="{{row.icon}}" slot="start" [attr.aria-label]="row.iconAlt">
-                                        </ion-icon>
-                                        <img *ngIf="row.image && !row.itemmodule" [src]="row.image && row.itemmodule" slot="start"
-                                            [alt]="row.iconAlt" />
-                                        <core-mod-icon *ngIf="row.image && row.itemmodule" [modicon]="row.image" slot="start"
-                                            [modname]="row.itemmodule">
-                                        </core-mod-icon>
-                                        <ion-label>
-                                            <h2>
-                                                <core-format-text [text]="row.itemname" contextLevel="course"
-                                                    [contextInstanceId]="courseId">
-                                                </core-format-text>
-                                            </h2>
-                                        </ion-label>
-                                    </ion-item>
-
-                                    <ion-item *ngIf="row.itemname && !row.link" class="ion-text-wrap">
-                                        <ion-icon *ngIf="row.icon" name="{{row.icon}}" slot="start" [attr.aria-label]="row.iconAlt">
-                                        </ion-icon>
-                                        <img *ngIf="row.image && !row.itemmodule" [src]="row.image" slot="start" [alt]="row.iconAlt" />
-                                        <core-mod-icon *ngIf="row.image && row.itemmodule" [modicon]="row.image" slot="start"
-                                            [modname]="row.itemmodule">
-                                        </core-mod-icon>
-                                        <ion-label>
-                                            <h2>
-                                                <core-format-text [text]="row.itemname" contextLevel="course"
-                                                    [contextInstanceId]="courseId">
-                                                </core-format-text>
-                                            </h2>
-                                        </ion-label>
-                                    </ion-item>
-
                                     <ion-item class="ion-text-wrap" *ngIf="row.weight">
                                         <ion-label>
                                             <h2>{{ 'core.grades.weight' | translate}}</h2>
diff --git a/src/core/features/grades/pages/course/course.page.ts b/src/core/features/grades/pages/course/course.page.ts
index fe22fc527..22fadfa71 100644
--- a/src/core/features/grades/pages/course/course.page.ts
+++ b/src/core/features/grades/pages/course/course.page.ts
@@ -13,8 +13,8 @@
 // limitations under the License.
 
 import { ActivatedRoute } from '@angular/router';
-import { AfterViewInit, Component, ElementRef, OnDestroy } from '@angular/core';
-import { IonRefresher } from '@ionic/angular';
+import { AfterViewInit, Component, ElementRef, OnDestroy, Optional } from '@angular/core';
+import { IonContent, IonRefresher } from '@ionic/angular';
 
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreGrades } from '@features/grades/services/grades';
@@ -44,6 +44,7 @@ export class CoreGradesCoursePage implements AfterViewInit, OnDestroy {
 
     courseId!: number;
     userId!: number;
+    gradeId?: number;
     expandLabel!: string;
     collapseLabel!: string;
     title?: string;
@@ -53,10 +54,16 @@ export class CoreGradesCoursePage implements AfterViewInit, OnDestroy {
     totalColumnsSpan?: number;
     withinSplitView?: boolean;
 
-    constructor(protected route: ActivatedRoute, protected element: ElementRef<HTMLElement>) {
+    constructor(
+        protected route: ActivatedRoute,
+        protected element: ElementRef<HTMLElement>,
+        @Optional() protected content?: IonContent,
+    ) {
         try {
             this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId', { route });
             this.userId = CoreNavigator.getRouteNumberParam('userId', { route }) ?? CoreSites.getCurrentSiteUserId();
+            this.gradeId = CoreNavigator.getRouteNumberParam('gradeId', { route });
+
             this.expandLabel = Translate.instant('core.expand');
             this.collapseLabel = Translate.instant('core.collapse');
 
@@ -116,13 +123,14 @@ export class CoreGradesCoursePage implements AfterViewInit, OnDestroy {
      * Toggle whether a row is expanded or collapsed.
      *
      * @param row Row.
+     * @param expand If defined, force expand or collapse.
      */
-    toggleRow(row: CoreGradesFormattedTableRow): void {
+    toggleRow(row: CoreGradesFormattedTableRow, expand?: boolean): void {
         if (!this.rows || !this.columns) {
             return;
         }
 
-        row.expanded = !row.expanded;
+        row.expanded = expand ?? !row.expanded;
 
         let colspan: number = this.columns.length + (row.colspan ?? 0) - 1;
         for (let i = this.rows.indexOf(row) - 1; i >= 0; i--) {
@@ -155,6 +163,22 @@ export class CoreGradesCoursePage implements AfterViewInit, OnDestroy {
     private async fetchInitialGrades(): Promise<void> {
         try {
             await this.fetchGrades();
+
+            if (this.gradeId && this.rows) {
+                const row = this.rows.find((row) => row.id == this.gradeId);
+
+                if (row) {
+                    this.toggleRow(row, true);
+                    await CoreUtils.nextTick();
+
+                    CoreDomUtils.scrollToElementBySelector(
+                        this.element.nativeElement,
+                        this.content,
+                        '#grade-' + row.id,
+                    );
+                    this.gradeId = undefined;
+                }
+            }
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'Error loading course');
 
diff --git a/src/core/features/grades/services/grades-helper.ts b/src/core/features/grades/services/grades-helper.ts
index c343c2c71..942f46895 100644
--- a/src/core/features/grades/services/grades-helper.ts
+++ b/src/core/features/grades/services/grades-helper.ts
@@ -35,7 +35,8 @@ import { CoreNavigator } from '@services/navigator';
 import { makeSingleton, Translate } from '@singletons';
 import { CoreError } from '@classes/errors/error';
 import { CoreCourseHelper } from '@features/course/services/course-helper';
-import { GRADES_PAGE_NAME } from '../grades.module';
+
+export const GRADES_PAGE_NAME = 'grades';
 
 /**
  * Service that provides some features regarding grades information.
@@ -497,9 +498,12 @@ export class CoreGradesHelperProvider {
             const gradeId = item.id;
 
             await CoreUtils.ignoreErrors(
-                CoreNavigator.navigateToSitePath(`/${GRADES_PAGE_NAME}/${courseId}/${gradeId}`, { siteId }),
+                CoreNavigator.navigateToSitePath(
+                    `/${GRADES_PAGE_NAME}/${courseId}`,
+                    { params: { gradeId }, siteId },
+                ),
             );
-        } catch (error) {
+        } catch {
             try {
                 // Cannot get grade items or there's no need to.
                 if (userId && userId != currentUserId) {
@@ -519,7 +523,7 @@ export class CoreGradesHelperProvider {
 
                 // Open the course with the grades tab selected.
                 await CoreCourseHelper.getAndOpenCourse(courseId, { selectedTab: 'CoreGrades' }, siteId);
-            } catch (error) {
+            } catch {
                 // Cannot get course for some reason, just open the grades page.
                 await CoreNavigator.navigateToSitePath(`/${GRADES_PAGE_NAME}/${courseId}`, { siteId });
             }
diff --git a/src/core/features/grades/services/grades.ts b/src/core/features/grades/services/grades.ts
index 80b588e8a..c7aa1aa7c 100644
--- a/src/core/features/grades/services/grades.ts
+++ b/src/core/features/grades/services/grades.ts
@@ -199,7 +199,7 @@ export class CoreGradesProvider {
         const table = await site.read<CoreGradesGetUserGradesTableWSResponse>('gradereport_user_get_grades_table', params, preSets);
 
         if (!table?.tables?.[0]) {
-            throw new CoreError('Coudln\'t get course grades table');
+            throw new CoreError('Couldn\'t get course grades table');
         }
 
         return table.tables[0];
diff --git a/src/core/features/grades/services/handlers/overview-link.ts b/src/core/features/grades/services/handlers/overview-link.ts
index 241e2fc19..2205e29ea 100644
--- a/src/core/features/grades/services/handlers/overview-link.ts
+++ b/src/core/features/grades/services/handlers/overview-link.ts
@@ -15,10 +15,10 @@
 import { Injectable } from '@angular/core';
 import { CoreContentLinksHandlerBase } from '@features/contentlinks/classes/base-handler';
 import { CoreContentLinksAction } from '@features/contentlinks/services/contentlinks-delegate';
-import { GRADES_PAGE_NAME } from '@features/grades/grades.module';
 import { CoreNavigator } from '@services/navigator';
 import { makeSingleton } from '@singletons';
 import { CoreGrades } from '../grades';
+import { GRADES_PAGE_NAME } from '../grades-helper';
 
 /**
  * Handler to treat links to overview courses grades.
diff --git a/src/core/features/grades/services/handlers/user.ts b/src/core/features/grades/services/handlers/user.ts
index 945972f4e..ade60adf5 100644
--- a/src/core/features/grades/services/handlers/user.ts
+++ b/src/core/features/grades/services/handlers/user.ts
@@ -14,7 +14,6 @@
 
 import { Injectable } from '@angular/core';
 import { COURSE_PAGE_NAME } from '@features/course/course.module';
-import { GRADES_PAGE_NAME } from '@features/grades/grades.module';
 
 import { CoreGrades } from '@features/grades/services/grades';
 import { CoreUserProfile } from '@features/user/services/user';
@@ -29,6 +28,7 @@ import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
 import { makeSingleton } from '@singletons';
+import { GRADES_PAGE_NAME } from '../grades-helper';
 
 /**
  * Profile grades handler.

From 6a862730e2b71220eb42c6ae7762a04c00011fd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 16 Feb 2022 21:30:05 +0100
Subject: [PATCH 0554/1008] MOBILE-3931 module: Add grades and course to module
 summary

---
 scripts/langindex.json                        |   1 +
 .../module-summary/module-summary.html        | 112 +++++++++++++++++-
 .../module-summary/module-summary.ts          |  69 ++++++++++-
 .../services/handlers/default-format.ts       |  10 +-
 src/core/features/grades/lang.json            |   1 +
 .../features/grades/services/grades-helper.ts |  32 +++++
 .../components/module-index/module-index.ts   |   7 +-
 .../siteplugins/services/siteplugins.ts       |   1 +
 8 files changed, 221 insertions(+), 12 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 07000f48f..59d395a92 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1741,6 +1741,7 @@
   "core.grades.fail": "grades",
   "core.grades.feedback": "grades",
   "core.grades.grade": "grades",
+  "core.grades.gradebook": "grades",
   "core.grades.gradeitem": "grades",
   "core.grades.gradepass": "grades",
   "core.grades.grades": "grades",
diff --git a/src/core/features/course/components/module-summary/module-summary.html b/src/core/features/course/components/module-summary/module-summary.html
index 7830b0baf..e77abac35 100644
--- a/src/core/features/course/components/module-summary/module-summary.html
+++ b/src/core/features/course/components/module-summary/module-summary.html
@@ -24,6 +24,17 @@
                 <ion-icon name="fas-external-link-alt" slot="icon-only" aria-hidden="true"></ion-icon>
             </ion-button>
         </ion-item>
+
+        <ion-item class="ion-text-wrap" *ngIf="course" (click)="openCourse()" button [detail]="true">
+            <ion-label>
+                <p class="item-heading">{{ 'core.course' | translate}}</p>
+                <p>
+                    <core-format-text [text]="course.displayname || course.fullname" contextLevel="course" [contextInstanceId]="courseId">
+                    </core-format-text>
+                </p>
+            </ion-label>
+        </ion-item>
+
         <ion-item class="ion-text-wrap" *ngIf="module && description && displayOptions.displayDescription">
             <ion-label>
                 <core-format-text [text]="description" [component]="component" [componentId]="componentId" contextLevel="module"
@@ -32,7 +43,7 @@
             </ion-label>
         </ion-item>
 
-        <ion-item button class="ion-margin" *ngIf="prefetchText && displayOptions.displayPrefetch" class="ion-text-wrap">
+        <ion-item button *ngIf="prefetchText && displayOptions.displayPrefetch" class="ion-text-wrap">
             <ion-label>
                 <p class="item-heading ion-text-wrap">{{ prefetchText }}</p>
                 <p *ngIf="downloadTimeReadable">{{ downloadTimeReadable }}</p>
@@ -45,7 +56,7 @@
             <ion-spinner *ngIf="prefetchStatusIcon == 'spinner'" slot="end" aria-hidden="true"></ion-spinner>
         </ion-item>
 
-        <ion-item button class="ion-margin" *ngIf="sizeReadable && displayOptions.displaySize" class="ion-text-wrap">
+        <ion-item button *ngIf="sizeReadable && displayOptions.displaySize" class="ion-text-wrap">
             <ion-label>
                 <p class="item-heading ion-text-wrap">{{ 'addon.storagemanager.totalspaceusage' | translate }}</p>
                 <ion-badge color="light">{{ sizeReadable | coreBytesToSize }}</ion-badge>
@@ -57,7 +68,102 @@
             <ion-spinner *ngIf="removeFilesLoading" slot="end" aria-hidden="true"></ion-spinner>
         </ion-item>
 
-        <ion-button *ngIf="blog && displayOptions.displayBlog" class="ion-margin" (click)="gotoBlog()" expand="block" fill="outline">
+        <ion-card *ngIf="displayOptions.displayGrades && grades?.length > 0">
+            <ion-list>
+                <ion-item lines="full" class="ion-text-wrap">
+                    <ion-label>
+                        <h2>{{ 'core.grades.gradebook' | translate }}</h2>
+                    </ion-label>
+                </ion-item>
+                <ng-container *ngFor="let grade of grades">
+                    <ion-item button *ngIf="grade.gradeitem" class="ion-text-wrap divider" (click)="toggleGrade(grade)"
+                        [attr.aria-label]="(grade.expanded ? 'core.collapse' : 'core.expand') | translate"
+                        [attr.aria-expanded]="grade.expanded" [attr.aria-controls]="'grade-'+grade.id" role="heading" detail="false">
+                        <ion-icon name="fas-chevron-right" flip-rtl slot="start" aria-hidden="true" class="expandable-status-icon"
+                            [class.expandable-status-icon-expanded]="grade.expanded">
+                        </ion-icon>
+                        <ion-label>
+                            <p class="item-heading" *ngIf="!grade.itemmodule">
+                                <core-format-text [text]="grade.gradeitem" contextLevel="course" [contextInstanceId]="courseId">
+                                </core-format-text>
+                            </p>
+                            <p class="item-heading" *ngIf="grade.itemmodule">
+                                {{ 'core.grades.grade' | translate}}
+                            </p>
+                            <p *ngIf="grade.grade" [innerHTML]="grade.grade"></p>
+                        </ion-label>
+                        <ion-icon *ngIf="grade.icon" name="{{grade.icon}}" slot="end" [attr.aria-label]="grade.iconAlt">
+                        </ion-icon>
+                        <img *ngIf="grade.image && !grade.itemmodule" [src]="grade.image" slot="end" [alt]="grade.iconAlt" />
+                        <ion-icon *ngIf="grade.image && grade.itemmodule" name="fas-chart-bar" slot="end" [attr.aria-label]="grade.iconAlt">
+                        </ion-icon>
+                    </ion-item>
+                    <div *ngIf="grade.expanded" [id]="'grade-'+grade.id">
+                        <ion-item class="ion-text-wrap" *ngIf="grade.weight?.length > 0 && grade.weight != '-'">
+                            <ion-label>
+                                <p class="item-heading">{{ 'core.grades.weight' | translate}}</p>
+                                <p [innerHTML]="grade.weight"></p>
+                            </ion-label>
+                        </ion-item>
+                        <ion-item class="ion-text-wrap" *ngIf="grade.range?.length > 0 && grade.range != '-'">
+                            <ion-label>
+                                <p class="item-heading">{{ 'core.grades.range' | translate}}</p>
+                                <p [innerHTML]="grade.range"></p>
+                            </ion-label>
+                        </ion-item>
+
+                        <ion-item class="ion-text-wrap" *ngIf="grade.percentage?.length > 0 && grade.percentage != '-'">
+                            <ion-label>
+                                <p class="item-heading">{{ 'core.grades.percentage' | translate}}</p>
+                                <p [innerHTML]="grade.percentage"></p>
+                            </ion-label>
+                        </ion-item>
+
+                        <ion-item class="ion-text-wrap" *ngIf="grade.lettergrade?.length > 0 && grade.lettergrade != '-'">
+                            <ion-label>
+                                <p class="item-heading">{{ 'core.grades.lettergrade' | translate}}</p>
+                                <p [innerHTML]="grade.lettergrade"></p>
+                            </ion-label>
+                        </ion-item>
+
+                        <ion-item class="ion-text-wrap" *ngIf="grade.rank?.length > 0 && grade.rank != '-'">
+                            <ion-label>
+                                <p class="item-heading">{{ 'core.grades.rank' | translate}}</p>
+                                <p [innerHTML]="grade.rank"></p>
+                            </ion-label>
+                        </ion-item>
+
+                        <ion-item class="ion-text-wrap" *ngIf="grade.average?.length > 0 && grade.average != '-'">
+                            <ion-label>
+                                <p class="item-heading">{{ 'core.grades.average' | translate}}</p>
+                                <p [innerHTML]="grade.average"></p>
+                            </ion-label>
+                        </ion-item>
+
+                        <ion-item class="ion-text-wrap" *ngIf="grade.feedback?.length > 0 && grade.feedback != '-'">
+                            <ion-label>
+                                <p class="item-heading">{{ 'core.grades.feedback' | translate}}</p>
+                                <p>
+                                    <core-format-text [maxHeight]="120" [text]="grade.feedback" contextLevel="course"
+                                        [contextInstanceId]="courseId">
+                                    </core-format-text>
+                                </p>
+                            </ion-label>
+                        </ion-item>
+
+                        <ion-item class="ion-text-wrap"
+                            *ngIf="grade.contributiontocoursetotal?.length > 0 && grade.contributiontocoursetotal != '-'">
+                            <ion-label>
+                                <p class="item-heading">{{ 'core.grades.contributiontocoursetotal' | translate}}</p>
+                                <p [innerHTML]="grade.contributiontocoursetotal"></p>
+                            </ion-label>
+                        </ion-item>
+                    </div>
+                </ng-container>
+            </ion-list>
+        </ion-card>
+
+        <ion-button *ngIf="blog && displayOptions.displayBlog" (click)="gotoBlog()" expand="block" fill="outline">
             <ion-icon name="far-newspaper" slot="start" aria-hidden="true"></ion-icon>
             <ion-label>
                 {{ 'addon.blog.blog' | translate }}
diff --git a/src/core/features/course/components/module-summary/module-summary.ts b/src/core/features/course/components/module-summary/module-summary.ts
index 3475ca44f..f66609555 100644
--- a/src/core/features/course/components/module-summary/module-summary.ts
+++ b/src/core/features/course/components/module-summary/module-summary.ts
@@ -17,8 +17,12 @@ import { AddonBlog } from '@addons/blog/services/blog';
 import { AddonBlogMainMenuHandlerService } from '@addons/blog/services/handlers/mainmenu';
 import { Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { Params } from '@angular/router';
+import { CoreCourse } from '@features/course/services/course';
 import { CoreCourseHelper, CoreCourseModuleData } from '@features/course/services/course-helper';
+import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate';
 import { CoreCourseModulePrefetchDelegate } from '@features/course/services/module-prefetch-delegate';
+import { CoreCourses, CoreEnrolledCourseData } from '@features/courses/services/courses';
+import { CoreGradesFormattedRow, CoreGradesFormattedTableRow, CoreGradesHelper } from '@features/grades/services/grades-helper';
 import { CoreApp } from '@services/app';
 import { CoreFilepool } from '@services/filepool';
 import { CoreNavigator } from '@services/navigator';
@@ -61,13 +65,12 @@ export class CoreCourseModuleSummaryComponent implements OnInit, OnDestroy {
     sizeReadable?: string;
     downloadTimeReadable?: string; // Last download time in a readable format.
     size = 0;
-
+    grades?: CoreGradesFormattedRow[];
     blog = false; // If blog is available.
-
     isOnline = false; // If the app is online or not.
+    course?: CoreEnrolledCourseData;
 
     protected onlineSubscription: Subscription; // It will observe the status of the network connection.
-
     protected packageStatusObserver?: CoreEventObserver; // Observer of package status.
     protected fileStatusObserver?: CoreEventObserver; // Observer of file status.
     protected siteId: string;
@@ -103,8 +106,15 @@ export class CoreCourseModuleSummaryComponent implements OnInit, OnDestroy {
             displayPrefetch: true,
             displaySize: true,
             displayBlog: true,
+            displayGrades: true,
         }, this.displayOptions);
 
+        this.displayOptions.displayGrades = this.displayOptions.displayGrades &&
+            CoreCourseModuleDelegate.supportsFeature(this.module.modname, CoreConstants.FEATURE_GRADE_HAS_GRADE, true);
+
+        this.displayOptions.displayDescription = this.displayOptions.displayDescription &&
+            CoreCourseModuleDelegate.supportsFeature(this.module.modname, CoreConstants.FEATURE_SHOW_DESCRIPTION, true);
+
         this.fetchContent();
 
         if (this.component) {
@@ -164,7 +174,11 @@ export class CoreCourseModuleSummaryComponent implements OnInit, OnDestroy {
 
         this.blog = await AddonBlog.isPluginEnabled();
 
-        await this.getPackageStatus();
+        await Promise.all([
+            this.getPackageStatus(),
+            this.fetchGrades(),
+            this.fetchCourse(),
+        ]);
 
         this.loaded = true;
     }
@@ -174,7 +188,7 @@ export class CoreCourseModuleSummaryComponent implements OnInit, OnDestroy {
      *
      * @param refresh If prefetch info has to be refreshed.
      */
-    async getPackageStatus(refresh = false): Promise<void> {
+    protected async getPackageStatus(refresh = false): Promise<void> {
         if (!this.module) {
             return;
         }
@@ -214,6 +228,50 @@ export class CoreCourseModuleSummaryComponent implements OnInit, OnDestroy {
         await CoreNavigator.navigateToSitePath(AddonBlogMainMenuHandlerService.PAGE_NAME, { params });
     }
 
+    /**
+     * Fetch grade module info.
+     */
+    protected async fetchGrades(): Promise<void> {
+        if (!this.displayOptions.displayGrades) {
+            return;
+        }
+
+        this.grades = await CoreGradesHelper.getModuleGrades(this.courseId, this.moduleId);
+    }
+
+    /**
+     * Toggle grades expand.
+     *
+     * @param grade Row to expand.
+     */
+    toggleGrade(grade: CoreGradesFormattedTableRow): void {
+        grade.expanded = !grade.expanded;
+    }
+
+    /**
+     * Fetch course.
+     */
+    protected async fetchCourse(): Promise<void> {
+        this.course = await CoreCourses.getUserCourse(this.courseId, true);
+    }
+
+    /**
+     * Open course.
+     */
+    openCourse(): void {
+        if (!this.course) {
+            return;
+        }
+
+        CoreCourse.openCourse(
+            this.course,
+            {
+                replace: true,
+                animationDirection: 'back',
+            },
+        );
+    }
+
     /**
      * Prefetch the module.
      */
@@ -327,4 +385,5 @@ export type CoreCourseModuleSummaryDisplayOptions = {
     displayPrefetch?: boolean;
     displaySize?: boolean;
     displayBlog?: boolean;
+    displayGrades?: boolean;
 };
diff --git a/src/core/features/course/services/handlers/default-format.ts b/src/core/features/course/services/handlers/default-format.ts
index 38c68d3df..5a4833f15 100644
--- a/src/core/features/course/services/handlers/default-format.ts
+++ b/src/core/features/course/services/handlers/default-format.ts
@@ -130,9 +130,13 @@ export class CoreCourseFormatDefaultHandler implements CoreCourseFormatHandler {
         navOptions.params = navOptions.params || {};
         Object.assign(navOptions.params, { course: course });
 
-        // Don't return the .push promise, we don't want to display a loading modal during the page transition.
-        const currentTab = CoreNavigator.getCurrentMainMenuTab();
-        const routeDepth = CoreNavigator.getRouteDepth(`/main/${currentTab}/course/${course.id}`);
+        // When replace is true, disable route depth.
+        let routeDepth = 0;
+        if (!navOptions.replace) {
+            // Don't return the .push promise, we don't want to display a loading modal during the page transition.
+            const currentTab = CoreNavigator.getCurrentMainMenuTab();
+            routeDepth = CoreNavigator.getRouteDepth(`/main/${currentTab}/course/${course.id}`);
+        }
         const deepPath = '/deep'.repeat(routeDepth);
 
         CoreNavigator.navigateToSitePath(`course${deepPath}/${course.id}`, navOptions);
diff --git a/src/core/features/grades/lang.json b/src/core/features/grades/lang.json
index 504a4ae34..456ff43e8 100644
--- a/src/core/features/grades/lang.json
+++ b/src/core/features/grades/lang.json
@@ -9,6 +9,7 @@
     "fail": "Fail",
     "feedback": "Feedback",
     "grade": "Grade",
+    "gradebook": "Gradebook",
     "gradeitem": "Grade item",
     "gradepass": "Grade to pass",
     "grades": "Grades",
diff --git a/src/core/features/grades/services/grades-helper.ts b/src/core/features/grades/services/grades-helper.ts
index 942f46895..1a827ce7d 100644
--- a/src/core/features/grades/services/grades-helper.ts
+++ b/src/core/features/grades/services/grades-helper.ts
@@ -457,6 +457,38 @@ export class CoreGradesHelperProvider {
         }).map((row) => this.formatGradeRow(row)));
     }
 
+    /**
+     * Get module grades to display.
+     *
+     * @param courseId Course Id.
+     * @param moduleId Module Id.
+     * @return Formatted table rows.
+     */
+    async getModuleGrades(courseId: number, moduleId: number): Promise<CoreGradesFormattedTableRow[] > {
+        const table = await CoreGrades.getCourseGradesTable(courseId);
+
+        if (!table.tabledata) {
+            return [];
+        }
+
+        // Find href containing "/mod/xxx/xxx.php".
+        const regex = /href="([^"]*\/mod\/[^"|^/]*\/[^"|^.]*\.php[^"]*)/;
+
+        return await Promise.all(table.tabledata.filter((row) => {
+            if (row.itemname && row.itemname.content) {
+                const matches = row.itemname.content.match(regex);
+
+                if (matches && matches.length) {
+                    const hrefParams = CoreUrlUtils.extractUrlParams(matches[1]);
+
+                    return hrefParams && parseInt(hrefParams.id) === moduleId;
+                }
+            }
+
+            return false;
+        }).map((row) => this.formatGradeRowForTable(row)));
+    }
+
     /**
      * Go to view grades.
      *
diff --git a/src/core/features/siteplugins/components/module-index/module-index.ts b/src/core/features/siteplugins/components/module-index/module-index.ts
index a87dd2527..2bd8be6b8 100644
--- a/src/core/features/siteplugins/components/module-index/module-index.ts
+++ b/src/core/features/siteplugins/components/module-index/module-index.ts
@@ -90,6 +90,9 @@ export class CoreSitePluginsModuleIndexComponent implements OnInit, OnDestroy, C
     displayRefresh = true;
     displayPrefetch = true;
     displaySize = true;
+    displayGrades = false;
+    // @TODO:  // Currently display blogs is not an option since it may change soon adding new summary handlers.
+    displayBlog = false;
 
     ptrEnabled = true;
     isDestroyed = false;
@@ -128,6 +131,7 @@ export class CoreSitePluginsModuleIndexComponent implements OnInit, OnDestroy, C
             this.displayRefresh = !CoreUtils.isFalseOrZero(handlerSchema.displayrefresh);
             this.displayPrefetch = !CoreUtils.isFalseOrZero(handlerSchema.displayprefetch);
             this.displaySize = !CoreUtils.isFalseOrZero(handlerSchema.displaysize);
+            this.displayGrades = CoreUtils.isTrueOrOne(handlerSchema.displaygrades); // False by default.
             this.ptrEnabled = !CoreUtils.isFalseOrZero(handlerSchema.ptrenabled);
         }
 
@@ -196,7 +200,8 @@ export class CoreSitePluginsModuleIndexComponent implements OnInit, OnDestroy, C
                     displayRefresh: this.displayRefresh,
                     displayPrefetch: this.displayPrefetch,
                     displaySize: this.displaySize,
-                    displayBlog: false,
+                    displayBlog: this.displayBlog,
+                    displayGrades: this.displayGrades,
                 },
             },
         });
diff --git a/src/core/features/siteplugins/services/siteplugins.ts b/src/core/features/siteplugins/services/siteplugins.ts
index eded0cd07..29ba79e0a 100644
--- a/src/core/features/siteplugins/services/siteplugins.ts
+++ b/src/core/features/siteplugins/services/siteplugins.ts
@@ -871,6 +871,7 @@ export type CoreSitePluginsCourseModuleHandlerData = CoreSitePluginsHandlerCommo
     displayrefresh?: boolean;
     displayprefetch?: boolean;
     displaysize?: boolean;
+    displaygrades?: boolean;
     coursepagemethod?: string;
     ptrenabled?: boolean;
     supportedfeatures?: Record<string, unknown>;

From 9bab09daced7d12977a7ba6df0782936e8dee386 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 17 Feb 2022 09:02:54 +0100
Subject: [PATCH 0555/1008] MOBILE-3931 performance: Fix memory leak on context
 menu

---
 .../components/context-menu/context-menu-item.ts     | 12 +++++++++++-
 src/core/components/context-menu/context-menu.ts     | 10 ++++++----
 .../context-menu/core-context-menu-popover.html      |  2 --
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/core/components/context-menu/context-menu-item.ts b/src/core/components/context-menu/context-menu-item.ts
index 2d6a66587..922332a07 100644
--- a/src/core/components/context-menu/context-menu-item.ts
+++ b/src/core/components/context-menu/context-menu-item.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import { Component, Input, Output, OnInit, OnDestroy, EventEmitter, OnChanges, SimpleChange } from '@angular/core';
+import { CoreLogger } from '@singletons/logger';
 import { CoreContextMenuComponent } from '../context-menu/context-menu';
 
 /**
@@ -35,7 +36,6 @@ import { CoreContextMenuComponent } from '../context-menu/context-menu';
 export class CoreContextMenuItemComponent implements OnInit, OnDestroy, OnChanges {
 
     @Input() content?: string; // Content of the item.
-    @Input() iconDescription?: string; // Name of the icon to be shown on the left side of the item.
     @Input() iconAction?: string; // Name of the icon to show on the right side of the item. Represents the action to do on click.
     // If is "spinner" an spinner will be shown.
     // If is "toggle" a toggle switch will be shown.
@@ -58,6 +58,11 @@ export class CoreContextMenuItemComponent implements OnInit, OnDestroy, OnChange
     @Output() onClosed?: EventEmitter<() => void>; // Will emit an event when the popover is closed because the item was clicked.
     @Output() toggleChange = new EventEmitter<boolean>();// Will emit an event when toggle changes to enable 2-way data binding.
 
+    /**
+     * @deprecated since 4.0.
+     */
+    @Input() iconDescription?: string; // Name of the icon to be shown on the left side of the item. Not used anymore.
+
     protected hasAction = false;
     protected destroyed = false;
 
@@ -88,6 +93,11 @@ export class CoreContextMenuItemComponent implements OnInit, OnDestroy, OnChange
         if (!this.destroyed) {
             this.ctxtMenu.addItem(this);
         }
+
+        if (this.iconDescription !== undefined) {
+            CoreLogger.getInstance('CoreContextMenuItemComponent')
+                .warn('iconDescription Input is deprecated and should not be used');
+        }
     }
 
     /**
diff --git a/src/core/components/context-menu/context-menu.ts b/src/core/components/context-menu/context-menu.ts
index c2108a54a..e981e7500 100644
--- a/src/core/components/context-menu/context-menu.ts
+++ b/src/core/components/context-menu/context-menu.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { Component, Input, OnInit, OnDestroy, ElementRef, ChangeDetectorRef } from '@angular/core';
-import { Subject } from 'rxjs';
+import { Subject, Subscription } from 'rxjs';
 import { auditTime } from 'rxjs/operators';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
@@ -42,11 +42,12 @@ export class CoreContextMenuComponent implements OnInit, OnDestroy {
     protected itemsChangedStream: Subject<void>; // Stream to update the hideMenu boolean when items change.
     protected parentContextMenu?: CoreContextMenuComponent;
     protected expanded = false;
+    protected itemsSubscription: Subscription;
 
     constructor(elementRef: ElementRef, changeDetector: ChangeDetectorRef) {
         // Create the stream and subscribe to it. We ignore successive changes during 250ms.
         this.itemsChangedStream = new Subject<void>();
-        this.itemsChangedStream.pipe(auditTime(250)).subscribe(() => {
+        this.itemsSubscription = this.itemsChangedStream.pipe(auditTime(250)).subscribe(() => {
             // Hide the menu if all items are hidden.
             this.hideMenu = !this.items.some((item) => !item.hidden);
 
@@ -63,7 +64,7 @@ export class CoreContextMenuComponent implements OnInit, OnDestroy {
     }
 
     /**
-     * Component being initialized.
+     * @inheritdoc
      */
     ngOnInit(): void {
         this.icon = this.icon || 'ellipsis-vertical';
@@ -197,10 +198,11 @@ export class CoreContextMenuComponent implements OnInit, OnDestroy {
     }
 
     /**
-     * Component destroyed.
+     * @inheritdoc
      */
     ngOnDestroy(): void {
         this.removeMergedItems();
+        this.itemsSubscription.unsubscribe();
     }
 
 }
diff --git a/src/core/components/context-menu/core-context-menu-popover.html b/src/core/components/context-menu/core-context-menu-popover.html
index 7e73792da..c6cb35d5d 100644
--- a/src/core/components/context-menu/core-context-menu-popover.html
+++ b/src/core/components/context-menu/core-context-menu-popover.html
@@ -6,8 +6,6 @@
         [href]="item.href" (click)="itemClicked($event, item)" [attr.aria-label]="item.ariaAction" [hidden]="item.hidden"
         [detail]="(item.href && !item.iconAction) || null" role="menuitem" [button]="(item.href && !item.iconAction)"
         [showBrowserWarning]="item.showBrowserWarning">
-        <ion-icon *ngIf="item.iconDescription" [name]="item.iconDescription" aria-hidden="true" slot="start">
-        </ion-icon>
         <ion-label>
             <p class="item-heading">
                 <core-format-text [clean]="true" [text]="item.content" [filter]="false"></core-format-text>

From c2ec52584ce16b6b2abc1d6025ec7e623048d2b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 17 Feb 2022 13:22:49 +0100
Subject: [PATCH 0556/1008] MOBILE-3931 login: Style oauth providers as buttons

---
 .../login/pages/credentials/credentials.html       |  6 +++---
 .../features/login/pages/reconnect/reconnect.html  |  8 ++++----
 src/theme/theme.base.scss                          | 14 ++++++++++++--
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/core/features/login/pages/credentials/credentials.html b/src/core/features/login/pages/credentials/credentials.html
index ce0c56988..b9a85c9d3 100644
--- a/src/core/features/login/pages/credentials/credentials.html
+++ b/src/core/features/login/pages/credentials/credentials.html
@@ -73,11 +73,11 @@
                     <h3 class="item-heading">{{ 'core.login.potentialidps' | translate }}</h3>
                 </ion-label>
             </ion-item>
-            <ion-item button *ngFor="let provider of identityProviders" class="ion-text-wrap core-oauth-icon"
-                (click)="oauthClicked(provider)" [attr.aria-label]="provider.name" detail="false">
+            <ion-button fill="outline" *ngFor="let provider of identityProviders" class="ion-text-wrap core-oauth-provider"
+                (click)="oauthClicked(provider)" [attr.aria-label]="provider.name" expand="block">
                 <img [src]="provider.iconurl" alt="" width="32" height="32" slot="start">
                 <ion-label>{{provider.name}}</ion-label>
-            </ion-item>
+            </ion-button>
         </ion-list>
 
         <ion-list *ngIf="canSignup" class="ion-padding-top core-login-sign-up">
diff --git a/src/core/features/login/pages/reconnect/reconnect.html b/src/core/features/login/pages/reconnect/reconnect.html
index 6d7ae2d7a..3a37bd1f0 100644
--- a/src/core/features/login/pages/reconnect/reconnect.html
+++ b/src/core/features/login/pages/reconnect/reconnect.html
@@ -87,11 +87,11 @@
                 <h3 class="item-heading">{{ 'core.login.potentialidps' | translate }}</h3>
             </ion-label>
         </ion-item>
-        <ion-item button *ngFor="let provider of identityProviders" class="ion-text-wrap core-oauth-icon" (click)="oauthClicked(provider)"
-            detail="false">
-            <img [src]="provider.iconurl" alt="" role="presentation" width="32" height="32" slot="start">
+        <ion-button fill="outline" *ngFor="let provider of identityProviders" class="ion-text-wrap core-oauth-provider"
+            (click)="oauthClicked(provider)" [attr.aria-label]="provider.name" expand="block">
+            <img [src]="provider.iconurl" alt="" width="32" height="32" slot="start">
             <ion-label>{{provider.name}}</ion-label>
-        </ion-item>
+        </ion-button>
     </ion-list>
 
     <!-- If OAuth, display cancel button since the form isn't displayed. -->
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index a2f2df66f..55ba3c65c 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -298,11 +298,13 @@ button,
 ion-button {
     margin: 4px 8px;
 
-    ion-spinner[slot=start] {
+    ion-spinner[slot=start],
+    img[slot=start] {
         @include margin-horizontal(-0.3em, 0.3em);
     }
 
-    ion-spinner[slot=end] {
+    ion-spinner[slot=end],
+    img[slot=end] {
         @include margin-horizontal(-0.3em, 0.3em);
     }
 }
@@ -468,6 +470,14 @@ ion-alert {
     }
 }
 
+ion-loading {
+    --border-radius: var(--huge-radius);
+
+    .loading-wrapper {
+        border-radius: var(--border-radius) !important;
+    }
+}
+
 // Ionic list.
 ion-list {
     padding: 0 !important;

From 97a8dc3f7a94439f530c1e83d703f96cae15851a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 17 Feb 2022 13:58:10 +0100
Subject: [PATCH 0557/1008] MOBILE-3931 module: Improve module summary style

---
 scripts/langindex.json                        |  1 +
 .../index/addon-mod-assign-index.html         |  2 +-
 .../components/index/index.html               |  2 +-
 .../index/addon-mod-book-index.html           |  2 +-
 .../index/addon-mod-chat-index.html           |  2 +-
 .../index/addon-mod-choice-index.html         |  2 +-
 .../index/addon-mod-data-index.html           |  2 +-
 src/addons/mod/data/components/index/index.ts |  2 +-
 .../index/addon-mod-feedback-index.html       |  2 +-
 .../index/addon-mod-folder-index.html         |  2 +-
 .../mod/forum/components/index/index.html     |  2 +-
 .../index/addon-mod-glossary-index.html       |  2 +-
 .../index/addon-mod-h5pactivity-index.html    |  2 +-
 .../index/addon-mod-imscp-index.html          |  2 +-
 .../index/addon-mod-lesson-index.html         |  2 +-
 .../mod/lesson/components/index/index.ts      |  1 -
 .../components/index/addon-mod-lti-index.html |  2 +-
 .../index/addon-mod-page-index.html           |  2 +-
 .../index/addon-mod-quiz-index.html           |  2 +-
 .../index/addon-mod-resource-index.html       |  2 +-
 .../index/addon-mod-scorm-index.html          |  2 +-
 .../index/addon-mod-survey-index.html         |  2 +-
 .../components/index/addon-mod-url-index.html |  2 +-
 .../index/addon-mod-wiki-index.html           |  2 +-
 .../index/addon-mod-workshop-index.html       |  2 +-
 src/addons/storagemanager/lang.json           |  1 +
 .../course/classes/main-resource-component.ts | 22 ++---
 .../module-summary/module-summary.html        | 87 ++++++++++++-------
 .../module-summary/module-summary.scss        | 16 ++++
 .../module-summary/module-summary.ts          | 46 +++++-----
 .../features/course/services/course-helper.ts |  2 -
 .../core-courses-course-list-item.html        |  5 +-
 .../features/grades/pages/course/course.scss  |  4 +-
 .../features/grades/services/grades-helper.ts |  2 +-
 .../components/module-index/module-index.ts   | 10 +--
 src/theme/theme.base.scss                     |  5 ++
 36 files changed, 137 insertions(+), 111 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 59d395a92..e1beb3757 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1114,6 +1114,7 @@
   "addon.storagemanager.deletedata": "local_moodlemobileapp",
   "addon.storagemanager.deletedatafrom": "local_moodlemobileapp",
   "addon.storagemanager.downloadedcourses": "local_moodlemobileapp",
+  "addon.storagemanager.downloads": "local_moodlemobileapp",
   "addon.storagemanager.errordeletedownloadeddata": "local_moodlemobileapp",
   "addon.storagemanager.managedownloads": "local_moodlemobileapp",
   "addon.storagemanager.totaldownloads": "local_moodlemobileapp",
diff --git a/src/addons/mod/assign/components/index/addon-mod-assign-index.html b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
index 69b0d2d25..44fce0030 100644
--- a/src/addons/mod/assign/components/index/addon-mod-assign-index.html
+++ b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
@@ -1,6 +1,6 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.info' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
 </core-navbar-buttons>
diff --git a/src/addons/mod/bigbluebuttonbn/components/index/index.html b/src/addons/mod/bigbluebuttonbn/components/index/index.html
index e46bb4a56..49ebe332d 100644
--- a/src/addons/mod/bigbluebuttonbn/components/index/index.html
+++ b/src/addons/mod/bigbluebuttonbn/components/index/index.html
@@ -1,6 +1,6 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.info' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
 </core-navbar-buttons>
diff --git a/src/addons/mod/book/components/index/addon-mod-book-index.html b/src/addons/mod/book/components/index/addon-mod-book-index.html
index c673defcf..f8d3545b6 100644
--- a/src/addons/mod/book/components/index/addon-mod-book-index.html
+++ b/src/addons/mod/book/components/index/addon-mod-book-index.html
@@ -1,6 +1,6 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.info' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
 </core-navbar-buttons>
diff --git a/src/addons/mod/chat/components/index/addon-mod-chat-index.html b/src/addons/mod/chat/components/index/addon-mod-chat-index.html
index 43db1e541..47f13bd8c 100644
--- a/src/addons/mod/chat/components/index/addon-mod-chat-index.html
+++ b/src/addons/mod/chat/components/index/addon-mod-chat-index.html
@@ -1,6 +1,6 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.info' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
 </core-navbar-buttons>
diff --git a/src/addons/mod/choice/components/index/addon-mod-choice-index.html b/src/addons/mod/choice/components/index/addon-mod-choice-index.html
index 15cdfbec4..e29970de6 100644
--- a/src/addons/mod/choice/components/index/addon-mod-choice-index.html
+++ b/src/addons/mod/choice/components/index/addon-mod-choice-index.html
@@ -1,6 +1,6 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.info' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
 </core-navbar-buttons>
diff --git a/src/addons/mod/data/components/index/addon-mod-data-index.html b/src/addons/mod/data/components/index/addon-mod-data-index.html
index a80142873..59f79533d 100644
--- a/src/addons/mod/data/components/index/addon-mod-data-index.html
+++ b/src/addons/mod/data/components/index/addon-mod-data-index.html
@@ -12,7 +12,7 @@
         </core-context-menu-item>
     </core-context-menu>
 
-    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.info' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
 </core-navbar-buttons>
diff --git a/src/addons/mod/data/components/index/index.ts b/src/addons/mod/data/components/index/index.ts
index 543cceeda..9bdb523fe 100644
--- a/src/addons/mod/data/components/index/index.ts
+++ b/src/addons/mod/data/components/index/index.ts
@@ -296,7 +296,7 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
         this.hasNextPage = numEntries >= AddonModDataProvider.PER_PAGE && ((this.search.page + 1) *
             AddonModDataProvider.PER_PAGE) < entries.totalcount;
 
-        this.hasOffline = entries.hasOfflineActions;
+        this.hasOffline = !!entries.hasOfflineActions;
 
         this.hasOfflineRatings = !!entries.hasOfflineRatings;
 
diff --git a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
index eb54799b8..f564311d8 100644
--- a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
+++ b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
@@ -1,6 +1,6 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.info' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
 </core-navbar-buttons>
diff --git a/src/addons/mod/folder/components/index/addon-mod-folder-index.html b/src/addons/mod/folder/components/index/addon-mod-folder-index.html
index e50f4f51b..b01b72741 100644
--- a/src/addons/mod/folder/components/index/addon-mod-folder-index.html
+++ b/src/addons/mod/folder/components/index/addon-mod-folder-index.html
@@ -1,6 +1,6 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.info' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
 </core-navbar-buttons>
diff --git a/src/addons/mod/forum/components/index/index.html b/src/addons/mod/forum/components/index/index.html
index f6d887a7f..a7a5afbdc 100644
--- a/src/addons/mod/forum/components/index/index.html
+++ b/src/addons/mod/forum/components/index/index.html
@@ -1,6 +1,6 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.info' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
 </core-navbar-buttons>
diff --git a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
index 05414fc94..524abb9b1 100644
--- a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
+++ b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
@@ -9,7 +9,7 @@
         <ion-icon name="fas-search" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
 
-    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.info' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
 </core-navbar-buttons>
diff --git a/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html b/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
index fc7dfb9ed..039f30ce2 100644
--- a/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
+++ b/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
@@ -10,7 +10,7 @@
         </core-context-menu-item>
     </core-context-menu>
 
-    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.info' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
 </core-navbar-buttons>
diff --git a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
index a8d3096cf..d795fb3fe 100644
--- a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
+++ b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
@@ -4,7 +4,7 @@
         <ion-icon name="fas-bookmark" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
 
-    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.info' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
 </core-navbar-buttons>
diff --git a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
index 350ed2e21..cb63e1d65 100644
--- a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
+++ b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
@@ -1,6 +1,6 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.info' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
 </core-navbar-buttons>
diff --git a/src/addons/mod/lesson/components/index/index.ts b/src/addons/mod/lesson/components/index/index.ts
index c449a9fe9..1a9e8b614 100644
--- a/src/addons/mod/lesson/components/index/index.ts
+++ b/src/addons/mod/lesson/components/index/index.ts
@@ -73,7 +73,6 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo
     canManage?: boolean; // Whether the user can manage the lesson.
     canViewReports?: boolean; // Whether the user can view the lesson reports.
     showSpinner?: boolean; // Whether to display a spinner.
-    hasOffline?: boolean; // Whether there's offline data.
     retakeToReview?: AddonModLessonRetakeFinishedInSyncDBRecord; // A retake to review.
     preventReasons: AddonModLessonPreventAccessReason[] = []; // List of reasons that prevent the lesson from being seen.
     leftDuringTimed?: boolean; // Whether the user has started and left a retake.
diff --git a/src/addons/mod/lti/components/index/addon-mod-lti-index.html b/src/addons/mod/lti/components/index/addon-mod-lti-index.html
index 9892dd3ae..dc3b6068d 100644
--- a/src/addons/mod/lti/components/index/addon-mod-lti-index.html
+++ b/src/addons/mod/lti/components/index/addon-mod-lti-index.html
@@ -1,6 +1,6 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.info' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
 </core-navbar-buttons>
diff --git a/src/addons/mod/page/components/index/addon-mod-page-index.html b/src/addons/mod/page/components/index/addon-mod-page-index.html
index e17fa3571..1cfc5f303 100644
--- a/src/addons/mod/page/components/index/addon-mod-page-index.html
+++ b/src/addons/mod/page/components/index/addon-mod-page-index.html
@@ -1,6 +1,6 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.info' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
 </core-navbar-buttons>
diff --git a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
index 4f6ec82f8..6323f3cb5 100644
--- a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
+++ b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
@@ -1,6 +1,6 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.info' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
 </core-navbar-buttons>
diff --git a/src/addons/mod/resource/components/index/addon-mod-resource-index.html b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
index a299d9a31..89fbf28f7 100644
--- a/src/addons/mod/resource/components/index/addon-mod-resource-index.html
+++ b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
@@ -1,6 +1,6 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.info' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
 </core-navbar-buttons>
diff --git a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
index 0fa5c17a4..275c81125 100644
--- a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
+++ b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
@@ -1,6 +1,6 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.info' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
 </core-navbar-buttons>
diff --git a/src/addons/mod/survey/components/index/addon-mod-survey-index.html b/src/addons/mod/survey/components/index/addon-mod-survey-index.html
index dedf029c9..6f08add31 100644
--- a/src/addons/mod/survey/components/index/addon-mod-survey-index.html
+++ b/src/addons/mod/survey/components/index/addon-mod-survey-index.html
@@ -1,6 +1,6 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.info' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
 </core-navbar-buttons>
diff --git a/src/addons/mod/url/components/index/addon-mod-url-index.html b/src/addons/mod/url/components/index/addon-mod-url-index.html
index 8b531ded4..ccf09a1a2 100644
--- a/src/addons/mod/url/components/index/addon-mod-url-index.html
+++ b/src/addons/mod/url/components/index/addon-mod-url-index.html
@@ -1,6 +1,6 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.info' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
 </core-navbar-buttons>
diff --git a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
index de251b747..462d5a1b4 100644
--- a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
+++ b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
@@ -21,7 +21,7 @@
         </core-context-menu-item>
     </core-context-menu>
 
-    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.info' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
 </core-navbar-buttons>
diff --git a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
index 9ff979bf8..f24b28232 100644
--- a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
+++ b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
@@ -1,6 +1,6 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.course.modulesummary' | translate">
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.info' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
 </core-navbar-buttons>
diff --git a/src/addons/storagemanager/lang.json b/src/addons/storagemanager/lang.json
index 84988fe0d..93476bbf6 100644
--- a/src/addons/storagemanager/lang.json
+++ b/src/addons/storagemanager/lang.json
@@ -11,6 +11,7 @@
     "deletedata": "Delete downloaded data",
     "deletedatafrom": "Delete all downloaded data from '{{name}}'",
     "downloadedcourses": "Downloaded courses",
+    "downloads": "Downloads",
     "errordeletedownloadeddata": "Error deleting downloaded data.",
     "managedownloads": "Manage downloads",
     "totaldownloads": "Total downloads",
diff --git a/src/core/features/course/classes/main-resource-component.ts b/src/core/features/course/classes/main-resource-component.ts
index edbcd1680..6536145e0 100644
--- a/src/core/features/course/classes/main-resource-component.ts
+++ b/src/core/features/course/classes/main-resource-component.ts
@@ -115,7 +115,7 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
      * @return Promise resolved when done.
      */
     async doRefresh(refresher?: IonRefresher | null, showErrors = false): Promise<void> {
-        if (!this.loaded || !this.module) {
+        if (!this.module) {
             // Module can be undefined if course format changes from single activity to weekly/topics.
             return;
         }
@@ -224,7 +224,7 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
         const lastDownloaded =
                 await CoreCourseHelper.getModulePackageLastDownloaded(this.module, this.component);
 
-        this.downloadTimeReadable = lastDownloaded.downloadTimeReadable;
+        this.downloadTimeReadable = CoreTextUtils.ucFirst(lastDownloaded.downloadTimeReadable);
     }
 
     /**
@@ -416,24 +416,14 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
         });
 
         if (data) {
-            if (data.action == 'refresh') {
-                const modal = await CoreDomUtils.showModalLoading();
-
+            if (this.loaded && (data.action == 'refresh' || data.action == 'sync')) {
+                this.loaded = false;
                 try {
-                    await this.doRefresh();
+                    await this.doRefresh(undefined, data.action == 'sync');
                 } finally {
-                    modal.dismiss();
-                }
-            } else if (data.action == 'sync') {
-                const modal = await CoreDomUtils.showModalLoading();
-
-                try {
-                    await this.doRefresh( undefined, true);
-                } finally {
-                    modal.dismiss();
+                    this.loaded = true;
                 }
             }
-
         }
     }
 
diff --git a/src/core/features/course/components/module-summary/module-summary.html b/src/core/features/course/components/module-summary/module-summary.html
index e77abac35..820e944ef 100644
--- a/src/core/features/course/components/module-summary/module-summary.html
+++ b/src/core/features/course/components/module-summary/module-summary.html
@@ -11,8 +11,13 @@
     <!-- Content. -->
     <core-loading [hideUntil]="loaded">
         <!-- Activity info. -->
-        <ion-item class="ion-text-wrap" *ngIf="module">
+        <ion-item class="ion-text-wrap" *ngIf="module" lines="full">
             <ion-label>
+                <p *ngIf="moduleNameTranslated" class="core-modulename">
+                    <core-mod-icon slot="start" [modicon]="modicon" [modname]="module.modname" [componentId]="module.instance">
+                    </core-mod-icon>
+                    {{moduleNameTranslated}}
+                </p>
                 <h1>
                     <core-format-text [text]="module.name" contextLevel="module" [component]="component" [componentId]="componentId"
                         [contextInstanceId]="module.id" [courseId]="courseId">
@@ -25,9 +30,12 @@
             </ion-button>
         </ion-item>
 
-        <ion-item class="ion-text-wrap" *ngIf="course" (click)="openCourse()" button [detail]="true">
+        <ion-item class="ion-text-wrap" *ngIf="course" (click)="openCourse()" button [detail]="true" lines="full">
             <ion-label>
-                <p class="item-heading">{{ 'core.course' | translate}}</p>
+                <p class="item-heading">
+                    <ion-icon name="fas-graduation-cap" aria-hidden="true"></ion-icon>
+                    {{ 'core.course' | translate}}
+                </p>
                 <p>
                     <core-format-text [text]="course.displayname || course.fullname" contextLevel="course" [contextInstanceId]="courseId">
                     </core-format-text>
@@ -35,44 +43,60 @@
             </ion-label>
         </ion-item>
 
-        <ion-item class="ion-text-wrap" *ngIf="module && description && displayOptions.displayDescription">
+        <ion-item class="ion-text-wrap" *ngIf="module && description && displayOptions.displayDescription" lines="full">
             <ion-label>
+                <p class="item-heading">
+                    {{ 'core.description' | translate}}
+                </p>
                 <core-format-text [text]="description" [component]="component" [componentId]="componentId" contextLevel="module"
                     [contextInstanceId]="module.id" [courseId]="courseId" [maxHeight]="120">
                 </core-format-text>
             </ion-label>
         </ion-item>
 
-        <ion-item button *ngIf="prefetchText && displayOptions.displayPrefetch" class="ion-text-wrap">
-            <ion-label>
-                <p class="item-heading ion-text-wrap">{{ prefetchText }}</p>
-                <p *ngIf="downloadTimeReadable">{{ downloadTimeReadable }}</p>
-            </ion-label>
-            <ion-button *ngIf="prefetchStatusIcon && prefetchStatusIcon != 'spinner'" (click)="prefetch()" color="primary" fill="outline"
-                [attr.aria-label]="'core.download' | translate" slot="end">
-                <ion-icon [name]="prefetchStatusIcon" slot="icon-only" aria-hidden="true">
-                </ion-icon>
+        <ion-card *ngIf="(canPrefetch && displayOptions.displayPrefetch) || (sizeReadable && displayOptions.displaySize)">
+            <ion-item lines="full" class="ion-text-wrap">
+                <ion-label>
+                    <h2>
+                        <ion-icon name="cloud-done" aria-hidden="true"></ion-icon>
+                        {{ 'addon.storagemanager.downloads' | translate }}
+                    </h2>
+                </ion-label>
+            </ion-item>
+            <ion-item *ngIf="sizeReadable && displayOptions.displaySize" class="ion-text-wrap">
+                <ion-label>
+                    <p class="item-heading ion-text-wrap">{{ 'addon.storagemanager.totalspaceusage' | translate }}</p>
+                    <ion-badge color="light">{{ sizeReadable | coreBytesToSize }}</ion-badge>
+                </ion-label>
+                <ion-button *ngIf="!removeFilesLoading" [disabled]="prefetchLoading" (click)="removeFiles()" color="danger" fill="clear"
+                    [attr.aria-label]="'core.clearstoreddata' | translate:{$a: sizeReadable}" slot="end">
+                    <ion-icon name="fas-trash" slot="icon-only" aria-hidden="true"></ion-icon>
+                </ion-button>
+                <ion-spinner *ngIf="removeFilesLoading" slot="end" aria-hidden="true"></ion-spinner>
+            </ion-item>
+            <ion-item *ngIf="downloadTimeReadable" class="ion-text-wrap">
+                <ion-label>
+                    <p class="ion-text-wrap">{{ 'core.lastdownloaded' | translate }} {{ downloadTimeReadable }}</p>
+                </ion-label>
+            </ion-item>
+            <ion-button fill="outline" expand="block" *ngIf="canPrefetch && displayOptions.displayPrefetch" class="ion-text-wrap"
+                (click)="prefetch()" color="primary" [disabled]="prefetchDisabled">
+                <ion-icon *ngIf="!prefetchLoading" name="cloud-done" slot="start" aria-hidden="true"></ion-icon>
+                <ion-spinner *ngIf="prefetchLoading" slot="start" aria-hidden="true"></ion-spinner>
+                <ion-label>
+                    {{ 'core.download' | translate }}
+                </ion-label>
             </ion-button>
-            <ion-spinner *ngIf="prefetchStatusIcon == 'spinner'" slot="end" aria-hidden="true"></ion-spinner>
-        </ion-item>
-
-        <ion-item button *ngIf="sizeReadable && displayOptions.displaySize" class="ion-text-wrap">
-            <ion-label>
-                <p class="item-heading ion-text-wrap">{{ 'addon.storagemanager.totalspaceusage' | translate }}</p>
-                <ion-badge color="light">{{ sizeReadable | coreBytesToSize }}</ion-badge>
-            </ion-label>
-            <ion-button *ngIf="!removeFilesLoading && size > 0" (click)="removeFiles()" color="danger" fill="outline"
-                [attr.aria-label]="'core.clearstoreddata' | translate:{$a: sizeReadable}" slot="end">
-                <ion-icon name="fas-trash" slot="icon-only" aria-hidden="true"></ion-icon>
-            </ion-button>
-            <ion-spinner *ngIf="removeFilesLoading" slot="end" aria-hidden="true"></ion-spinner>
-        </ion-item>
+        </ion-card>
 
         <ion-card *ngIf="displayOptions.displayGrades && grades?.length > 0">
             <ion-list>
                 <ion-item lines="full" class="ion-text-wrap">
                     <ion-label>
-                        <h2>{{ 'core.grades.gradebook' | translate }}</h2>
+                        <h2>
+                            <ion-icon name="fas-chart-bar" slot="end" aria-hidden="true"></ion-icon>{{ 'core.grades.gradebook' | translate
+                            }}
+                        </h2>
                     </ion-label>
                 </ion-item>
                 <ng-container *ngFor="let grade of grades">
@@ -90,7 +114,8 @@
                             <p class="item-heading" *ngIf="grade.itemmodule">
                                 {{ 'core.grades.grade' | translate}}
                             </p>
-                            <p *ngIf="grade.grade" [innerHTML]="grade.grade"></p>
+                            <p *ngIf="grade.grade && grade.grade != '-'" [innerHTML]="grade.grade"></p>
+                            <ion-badge *ngIf="!grade.grade || grade.grade == '-'" color="light">Not graded</ion-badge>
                         </ion-label>
                         <ion-icon *ngIf="grade.icon" name="{{grade.icon}}" slot="end" [attr.aria-label]="grade.iconAlt">
                         </ion-icon>
@@ -163,12 +188,12 @@
             </ion-list>
         </ion-card>
 
-        <ion-button *ngIf="blog && displayOptions.displayBlog" (click)="gotoBlog()" expand="block" fill="outline">
+        <ion-item button *ngIf="blog && displayOptions.displayBlog" (click)="gotoBlog()" [detail]="true">
             <ion-icon name="far-newspaper" slot="start" aria-hidden="true"></ion-icon>
             <ion-label>
                 {{ 'addon.blog.blog' | translate }}
             </ion-label>
-        </ion-button>
+        </ion-item>
     </core-loading>
 </ion-content>
 <ion-footer *ngIf="loaded && isOnline && displayOptions.displayRefresh">
diff --git a/src/core/features/course/components/module-summary/module-summary.scss b/src/core/features/course/components/module-summary/module-summary.scss
index fb9664764..59ce443d5 100644
--- a/src/core/features/course/components/module-summary/module-summary.scss
+++ b/src/core/features/course/components/module-summary/module-summary.scss
@@ -1,3 +1,4 @@
+@import "~theme/globals";
 
 :host ::ng-deep .collapsible-title ion-label {
     margin-top: 12px;
@@ -6,3 +7,18 @@
 h1 {
     font-size: 20px;
 }
+
+.core-modulename {
+    text-transform: uppercase;
+    core-mod-icon {
+        padding: 3px;
+        --size: 10px;
+        margin: 0;
+    }
+}
+
+
+ion-item ion-label ion-icon {
+    @include margin-horizontal(0, 4px);
+    vertical-align: text-top;
+}
diff --git a/src/core/features/course/components/module-summary/module-summary.ts b/src/core/features/course/components/module-summary/module-summary.ts
index f66609555..a82c4801c 100644
--- a/src/core/features/course/components/module-summary/module-summary.ts
+++ b/src/core/features/course/components/module-summary/module-summary.ts
@@ -30,7 +30,7 @@ import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreUtils } from '@services/utils/utils';
-import { ModalController, Network, Translate, NgZone } from '@singletons';
+import { ModalController, Network, NgZone } from '@singletons';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { Subscription } from 'rxjs';
 
@@ -59,16 +59,17 @@ export class CoreCourseModuleSummaryComponent implements OnInit, OnDestroy {
     externalUrl?: string; // External URL to open in browser.
 
     removeFilesLoading = false;
-    prefetchStatusIcon?: string;
-    prefetchStatus?: string;
-    prefetchText?: string;
-    sizeReadable?: string;
-    downloadTimeReadable?: string; // Last download time in a readable format.
-    size = 0;
+    prefetchLoading = false;
+    canPrefetch = false;;
+    prefetchDisabled = false;
+    sizeReadable = '';
+    downloadTimeReadable = ''; // Last download time in a readable format.
     grades?: CoreGradesFormattedRow[];
     blog = false; // If blog is available.
     isOnline = false; // If the app is online or not.
     course?: CoreEnrolledCourseData;
+    modicon = '';
+    moduleNameTranslated = '';
 
     protected onlineSubscription: Subscription; // It will observe the status of the network connection.
     protected packageStatusObserver?: CoreEventObserver; // Observer of package status.
@@ -172,6 +173,9 @@ export class CoreCourseModuleSummaryComponent implements OnInit, OnDestroy {
         this.externalUrl = this.module.url;
         this.courseId = this.courseId || this.module.course;
 
+        this.modicon = await CoreCourseModuleDelegate.getModuleIconSrc(this.module.modname, this.module.modicon, this.module);
+        this.moduleNameTranslated = CoreCourse.translateModuleName(this.module.modname || '');
+
         this.blog = await AddonBlog.isPluginEnabled();
 
         await Promise.all([
@@ -196,27 +200,20 @@ export class CoreCourseModuleSummaryComponent implements OnInit, OnDestroy {
         const moduleInfo =
             await CoreCourseHelper.getModulePrefetchInfo(this.module, this.courseId, refresh, this.component);
 
-        this.prefetchStatusIcon = moduleInfo.statusIcon;
-        this.prefetchStatus = moduleInfo.status;
+        this.canPrefetch = moduleInfo.status != CoreConstants.NOT_DOWNLOADABLE;
         this.downloadTimeReadable = '';
 
-        if (moduleInfo.status != CoreConstants.NOT_DOWNLOADABLE) {
-            // Module is downloadable, get the text to display to prefetch.
+        if (this.canPrefetch) {
             if (moduleInfo.downloadTime && moduleInfo.downloadTime > 0) {
-                this.prefetchText = Translate.instant('core.lastdownloaded');
                 this.downloadTimeReadable = CoreTextUtils.ucFirst(moduleInfo.downloadTimeReadable);
-            } else {
-                // Module not downloaded, show a default text.
-                this.prefetchText = Translate.instant('core.download');
             }
+            this.prefetchLoading = moduleInfo.status == CoreConstants.DOWNLOADING;
+            this.prefetchDisabled = moduleInfo.status == CoreConstants.DOWNLOADED;
         }
 
-        this.sizeReadable = moduleInfo.sizeReadable;
-        this.size = moduleInfo.size;
-        if (moduleInfo.status == CoreConstants.DOWNLOADING) {
-            // Set this to empty to prevent "remove file" option showing up while downloading.
-            this.sizeReadable = '';
-        }
+        this.sizeReadable = moduleInfo.size && moduleInfo.size > 0
+            ? moduleInfo.sizeReadable
+            : '';
     }
 
     /**
@@ -280,8 +277,7 @@ export class CoreCourseModuleSummaryComponent implements OnInit, OnDestroy {
             return;
         }
 
-        const initialIcon = this.prefetchStatusIcon;
-        this.prefetchStatusIcon = CoreConstants.ICON_DOWNLOADING; // Show spinner since this operation might take a while.
+        this.prefetchLoading = true; // Show spinner since this operation might take a while.
 
         try {
             // We need to call getDownloadSize, the package might have been updated.
@@ -293,7 +289,7 @@ export class CoreCourseModuleSummaryComponent implements OnInit, OnDestroy {
 
             await this.getPackageStatus(true);
         } catch (error) {
-            this.prefetchStatusIcon = initialIcon;
+            this.prefetchLoading = false;
 
             if (!this.isDestroyed) {
                 CoreDomUtils.showErrorModalDefault(error, 'core.errordownloading', true);
@@ -309,7 +305,7 @@ export class CoreCourseModuleSummaryComponent implements OnInit, OnDestroy {
             return;
         }
 
-        if (this.prefetchStatus == CoreConstants.DOWNLOADING) {
+        if (this.prefetchLoading) {
             CoreDomUtils.showAlertTranslated(undefined, 'core.course.cannotdeletewhiledownloading');
 
             return;
diff --git a/src/core/features/course/services/course-helper.ts b/src/core/features/course/services/course-helper.ts
index 4c807d5e1..e14cae7f0 100644
--- a/src/core/features/course/services/course-helper.ts
+++ b/src/core/features/course/services/course-helper.ts
@@ -1426,8 +1426,6 @@ export class CoreCourseHelperProvider {
             downloadTimeReadable = moment(downloadTime * 1000).calendar();
         }
 
-        downloadTimeReadable = CoreTextUtils.ucFirst(downloadTimeReadable);
-
         return {
             downloadTime,
             downloadTimeReadable,
diff --git a/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html b/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
index 51cb1e650..c63576239 100644
--- a/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
+++ b/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
@@ -4,7 +4,7 @@
     <div *ngIf="layout == 'card' || layout == 'summarycard'" (click)="openCourse()" class="core-course-thumb"
         [class.core-course-color-img]="course.courseImage">
         <img *ngIf="course.courseImage" [src]="course.courseImage" core-external-content alt="" />
-        <ion-icon *ngIf="!course.courseImage" name="fas-graduation-cap" class="course-icon">
+        <ion-icon *ngIf="!course.courseImage" name="fas-graduation-cap" class="course-icon" aria-hidden="true">
         </ion-icon>
     </div>
 
@@ -31,7 +31,8 @@
         [class.item-disabled]="course.visible == 0">
 
         <ng-container *ngIf="layout == 'list' || layout == 'listwithenrol'">
-            <ion-icon *ngIf="!course.courseImage" name="fas-graduation-cap" slot="start" class="course-icon core-course-thumb">
+            <ion-icon *ngIf="!course.courseImage" name="fas-graduation-cap" slot="start" class="course-icon core-course-thumb"
+                aria-hidden="true">
             </ion-icon>
             <ion-avatar *ngIf="course.courseImage" slot="start" class="core-course-thumb">
                 <img [src]="course.courseImage" core-external-content alt="" />
diff --git a/src/core/features/grades/pages/course/course.scss b/src/core/features/grades/pages/course/course.scss
index 32bb2b00a..1d73d15e2 100644
--- a/src/core/features/grades/pages/course/course.scss
+++ b/src/core/features/grades/pages/course/course.scss
@@ -80,8 +80,8 @@
         }
 
         core-mod-icon {
-            padding: 0.1rem;
-            --size: 16px;
+            padding: 3px;
+            --size: 10px;
         }
 
 
diff --git a/src/core/features/grades/services/grades-helper.ts b/src/core/features/grades/services/grades-helper.ts
index 1a827ce7d..cff4e9b98 100644
--- a/src/core/features/grades/services/grades-helper.ts
+++ b/src/core/features/grades/services/grades-helper.ts
@@ -601,7 +601,7 @@ export class CoreGradesHelperProvider {
             row.iconAlt = Translate.instant('core.grades.aggregatesum');
         } else if (text.indexOf('/outcomes') > -1 || text.indexOf('fa-tasks') > -1) {
             row.itemtype = 'outcome';
-            row.icon = 'fas-chart-pie';
+            row.icon = 'fas-tasks';
             row.iconAlt = Translate.instant('core.grades.outcome');
         } else if (text.indexOf('i/folder') > -1 || text.indexOf('fa-folder') > -1) {
             row.itemtype = 'category';
diff --git a/src/core/features/siteplugins/components/module-index/module-index.ts b/src/core/features/siteplugins/components/module-index/module-index.ts
index 2bd8be6b8..3e15a13dc 100644
--- a/src/core/features/siteplugins/components/module-index/module-index.ts
+++ b/src/core/features/siteplugins/components/module-index/module-index.ts
@@ -206,14 +206,8 @@ export class CoreSitePluginsModuleIndexComponent implements OnInit, OnDestroy, C
             },
         });
 
-        if (data && data.action == 'refresh') {
-            const modal = await CoreDomUtils.showModalLoading();
-
-            try {
-                await this.doRefresh();
-            } finally {
-                modal.dismiss();
-            }
+        if (data && data.action == 'refresh' && this.content?.dataLoaded) {
+            this.content?.refreshContent(true);
         }
     }
 
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 55ba3c65c..c0d3691c8 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -307,6 +307,11 @@ ion-button {
     img[slot=end] {
         @include margin-horizontal(-0.3em, 0.3em);
     }
+
+    ion-spinner[slot] {
+        width: 20px;
+        color: inherit;
+    }
 }
 
 ion-button.button-outline {

From b28ff9415fc7350a1fb356e92e9ee4d8ed179fc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 18 Feb 2022 10:13:40 +0100
Subject: [PATCH 0558/1008] MOBILE-3931 chore: Annotations on upgrade.txt

---
 upgrade.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/upgrade.txt b/upgrade.txt
index 4755f12ea..ebb311bcb 100644
--- a/upgrade.txt
+++ b/upgrade.txt
@@ -20,6 +20,10 @@ information provided here is intended especially for developers.
 - Most of the functions or callbacks that handle redirects/deeplinks have been modified to accept an object instead of just path + options. E.g.: CoreLoginHelper.isSiteLoggedOut, CoreLoginHelper.openBrowserForSSOLogin, CoreLoginHelper.openBrowserForOAuthLogin, CoreLoginHelper.prepareForSSOLogin, CoreApp.storeRedirect, CoreSites.loadSite.
 - Course preview page route has changed from course/:courseId/preview to course/:courseId/summary to match with the page name and characteristics.
 - The parameters of the following functions in CoreCourseHelper have changed: navigateToModuleByInstance, navigateToModule, openModule.
+- fillContextMenu, expandDescription, gotoBlog, prefetch and removeFiles functions have been removed from CoreCourseModuleMainResourceComponent.
+- contextMenuPrefetch and fillContextMenu have been removed from CoreCourseHelper.
+
+
 
 === 3.9.5 ===
 

From 5c2eb8fc0ae76f4f8e159dc22317ce6f8559bbae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 18 Feb 2022 13:54:00 +0100
Subject: [PATCH 0559/1008] MOBILE-3814 siteplugins: Add collapsible header to
 site module plugins

---
 .../module-index/core-siteplugins-module-index.html           | 4 ++++
 .../features/siteplugins/pages/module-index/module-index.html | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/core/features/siteplugins/components/module-index/core-siteplugins-module-index.html b/src/core/features/siteplugins/components/module-index/core-siteplugins-module-index.html
index d4f915a10..94574fcbe 100644
--- a/src/core/features/siteplugins/components/module-index/core-siteplugins-module-index.html
+++ b/src/core/features/siteplugins/components/module-index/core-siteplugins-module-index.html
@@ -5,6 +5,10 @@
     </ion-button>
 </core-navbar-buttons>
 
+<!-- Activity info. -->
+<core-course-module-info [module]="module" [courseId]="courseId" [component]="component" [componentId]="module.id">
+</core-course-module-info>
+
 <core-site-plugins-plugin-content *ngIf="component && method" [component]="component" [method]="method" [args]="args"
     [initResult]="initResult" [data]="jsData" [pageTitle]="pageTitle" [preSets]="preSets" (onContentLoaded)="contentLoaded($event)"
     (onLoadingContent)="contentLoading()">
diff --git a/src/core/features/siteplugins/pages/module-index/module-index.html b/src/core/features/siteplugins/pages/module-index/module-index.html
index 7bbd67a91..58f3efc7c 100644
--- a/src/core/features/siteplugins/pages/module-index/module-index.html
+++ b/src/core/features/siteplugins/pages/module-index/module-index.html
@@ -1,4 +1,4 @@
-<ion-header>
+<ion-header collapsible>
     <ion-toolbar>
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>

From a34736bc60ab0ae7d5c0cab0ac13e1c942a80e47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 18 Feb 2022 12:41:04 +0100
Subject: [PATCH 0560/1008] MOBILE-3814 module: Adapt module preview page

---
 scripts/langindex.json                        |  3 -
 .../module-info/core-course-module-info.html  | 33 +++++++----
 .../module-info/course-module-info.scss       | 26 ++++++++-
 .../components/module-info/module-info.ts     |  2 +
 .../core-course-unsupported-module.html       | 37 ++++++------
 .../unsupported-module/unsupported-module.ts  |  9 +--
 src/core/features/course/lang.json            |  2 -
 .../pages/module-preview/module-preview.html  | 56 ++++++-------------
 .../module-preview/module-preview.page.ts     |  3 +
 src/core/lang.json                            |  1 -
 10 files changed, 91 insertions(+), 81 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index e1beb3757..092fbfb2c 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1517,10 +1517,8 @@
   "core.course": "moodle",
   "core.course.activitydisabled": "local_moodlemobileapp",
   "core.course.activitynotyetviewableremoteaddon": "local_moodlemobileapp",
-  "core.course.activitynotyetviewablesiteupgradeneeded": "local_moodlemobileapp",
   "core.course.allsections": "local_moodlemobileapp",
   "core.course.aria:sectionprogress": "local_moodlemobileapp",
-  "core.course.askadmintosupport": "local_moodlemobileapp",
   "core.course.availablespace": "local_moodlemobileapp",
   "core.course.cannotdeletewhiledownloading": "local_moodlemobileapp",
   "core.course.completion_automatic:done": "course",
@@ -2357,7 +2355,6 @@
   "core.whatisyourage": "moodle",
   "core.wheredoyoulive": "moodle",
   "core.whoissiteadmin": "local_moodlemobileapp",
-  "core.whoops": "local_moodlemobileapp",
   "core.whyisthishappening": "local_moodlemobileapp",
   "core.whyisthisrequired": "moodle",
   "core.wsfunctionnotavailable": "local_moodlemobileapp",
diff --git a/src/core/features/course/components/module-info/core-course-module-info.html b/src/core/features/course/components/module-info/core-course-module-info.html
index 256f2c789..f6f50dd35 100644
--- a/src/core/features/course/components/module-info/core-course-module-info.html
+++ b/src/core/features/course/components/module-info/core-course-module-info.html
@@ -7,6 +7,8 @@
             <core-format-text [text]="module.name" contextLevel="module" [component]="component" [componentId]="componentId"
                 [contextInstanceId]="module.id" [courseId]="courseId">
             </core-format-text>
+            <ion-icon name="fas-lock" *ngIf="module.visible === 0 || module.uservisible === false"
+                [attr.aria-label]="'core.restricted' | translate"></ion-icon>
         </h1>
         <ng-content select="[title]"></ng-content>
     </ion-label>
@@ -20,22 +22,33 @@
 </ion-item>
 <ng-content select="[description]"></ng-content>
 
-<ion-item class="ion-text-wrap" *ngIf="showCompletion && (module.dates?.length ||
-(module.completiondata && module.completiondata.isautomatic && module.uservisible))">
+<!-- Module completion. -->
+<ion-item class="ion-text-wrap" *ngIf="showCompletion && module.completiondata && module.completiondata.isautomatic">
     <ion-label>
-        <!-- Activity dates. -->
-        <div *ngIf="module.dates?.length" class="core-module-dates">
-            <p *ngFor="let date of module.dates">
-                <ion-icon name="fas-calendar" aria-hidden="true"></ion-icon><strong>{{ date.label }}</strong> {{ date.timestamp * 1000 |
-                coreFormatDate:'strftimedatetime' }}
-            </p>
-        </div>
-        <!-- Module completion. -->
         <core-course-module-completion [completion]="module.completiondata" [moduleName]="module.name" [moduleId]="module.id"
             [showCompletionConditions]="true">
         </core-course-module-completion>
     </ion-label>
 </ion-item>
+
+<div class="core-module-dates-availabilityinfo"
+    *ngIf="(module.dates && module.dates.length) || (showAvailabilityInfo && module.availabilityinfo)">
+    <!-- Activity dates. -->
+    <div *ngIf="module.dates && module.dates.length" class="core-module-dates">
+        <p *ngFor="let date of module.dates">
+            <ion-icon name="fas-calendar" aria-hidden="true"></ion-icon><strong>{{ date.label }}</strong> {{ date.timestamp
+            *
+            1000 | coreFormatDate:'strftimedatetime' }}
+        </p>
+    </div>
+    <!-- Availability info space. -->
+    <div class="core-module-availabilityinfo" *ngIf="showAvailabilityInfo">
+        <ion-icon name="fas-lock" [attr.aria-label]="'core.restricted' | translate"></ion-icon>
+        <core-format-text [text]="module.availabilityinfo" contextLevel="module" [contextInstanceId]="module.id" [courseId]="module.course">
+        </core-format-text>
+    </div>
+</div>
+
 <ng-content></ng-content>
 
 <!-- Activity has something offline. -->
diff --git a/src/core/features/course/components/module-info/course-module-info.scss b/src/core/features/course/components/module-info/course-module-info.scss
index 46d6c970c..75e76aedd 100644
--- a/src/core/features/course/components/module-info/course-module-info.scss
+++ b/src/core/features/course/components/module-info/course-module-info.scss
@@ -16,16 +16,38 @@
         align-self: flex-start;
     }
 
-    .core-module-dates {
+    h1 ion-icon {
+        color: var(--medium);
+        @include margin-horizontal(8px, null);
+        font-size: 80%;
+
+    }
+
+    .core-module-dates-availabilityinfo {
         background: var(--light);
         border-radius: var(--small-radius);
         padding: 8px;
-
+        margin: 8px;
+        font-size: 90%;
         ion-icon {
+            position: static;
             @include margin-horizontal(null, 8px);
         }
+
+        p,
+        ul {
+            margin-top: 4px;
+            margin-bottom: 4px;
+        }
     }
 
+    .core-module-dates + .core-module-availabilityinfo {
+        border-top: 1px solid var(--stroke);
+        padding-top: 8px;
+    }
+
+
+
 }
 
 :host-context(.core-iframe-fullscreen) {
diff --git a/src/core/features/course/components/module-info/module-info.ts b/src/core/features/course/components/module-info/module-info.ts
index f57b95e7e..bd1fe0780 100644
--- a/src/core/features/course/components/module-info/module-info.ts
+++ b/src/core/features/course/components/module-info/module-info.ts
@@ -44,6 +44,8 @@ export class CoreCourseModuleInfoComponent implements OnInit {
     @Input() description?: string | false; // The description to display. If false, no description will be shown.
     @Input() expandDescription = false; // If the description should be expanded by default.
 
+    @Input() showAvailabilityInfo = false; // If show availability info on the box.
+
     @Input() hasDataToSync = false; // If the activity has any data to be synced.
 
     modicon = '';
diff --git a/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html b/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html
index 4fd22a35d..f8b7bd52f 100644
--- a/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html
+++ b/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html
@@ -1,21 +1,22 @@
-<div class="ion-padding">
-    <h2 *ngIf="!isDisabledInSite && isSupportedByTheApp">{{ 'core.whoops' | translate }}</h2>
-    <h2 *ngIf="isDisabledInSite || !isSupportedByTheApp">{{ 'core.uhoh' | translate }}</h2>
-
-    <p class="core-big" *ngIf="isDisabledInSite">{{ 'core.course.activitydisabled' | translate }}</p>
-    <p class="core-big" *ngIf="!isDisabledInSite && isSupportedByTheApp">
-        {{ 'core.course.activitynotyetviewablesiteupgradeneeded' | translate }}
-    </p>
-    <p class="core-big" *ngIf="!isDisabledInSite && !isSupportedByTheApp">
-        {{ 'core.course.activitynotyetviewableremoteaddon' | translate }}
-    </p>
-    <p *ngIf="isDisabledInSite || !isSupportedByTheApp"><strong>{{ 'core.course.askadmintosupport' | translate }}</strong></p>
-
-    <div *ngIf="module && module.url">
-        <p><strong>{{ 'core.course.useactivityonbrowser' | translate }}</strong></p>
-        <ion-button expand="block" [href]="module.url" core-link [showBrowserWarning]="false">
+<ion-card class="core-danger-card">
+    <ion-item>
+        <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
+        <ion-label>
+            <p><strong>{{ 'core.uhoh' | translate }} </strong>
+                <ng-container *ngIf="isDisabledInSite">{{ 'core.course.activitydisabled' | translate }}</ng-container>
+                <ng-container *ngIf="!isDisabledInSite">
+                    {{ 'core.course.activitynotyetviewableremoteaddon' | translate }}
+                </ng-container>
+            </p>
+        </ion-label>
+    </ion-item>
+</ion-card>
+<ion-item lines="none" class="ion-text-wrap" *ngIf="module?.url && module?.uservisible">
+    <ion-label>
+        <p>{{ 'core.course.useactivityonbrowser' | translate }}</p>
+        <ion-button expand="block" [href]="module?.url" core-link [showBrowserWarning]="false">
             {{ 'core.openinbrowser' | translate }}
             <ion-icon name="fas-external-link-alt" slot="end" aria-hidden="true"></ion-icon>
         </ion-button>
-    </div>
-</div>
+    </ion-label>
+</ion-item>
diff --git a/src/core/features/course/components/unsupported-module/unsupported-module.ts b/src/core/features/course/components/unsupported-module/unsupported-module.ts
index 5df40ab8f..15c3e7902 100644
--- a/src/core/features/course/components/unsupported-module/unsupported-module.ts
+++ b/src/core/features/course/components/unsupported-module/unsupported-module.ts
@@ -14,7 +14,6 @@
 
 import { Component, Input, OnInit } from '@angular/core';
 
-import { CoreCourse } from '@features/course/services/course';
 import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate';
 
@@ -27,12 +26,10 @@ import { CoreCourseModuleDelegate } from '@features/course/services/module-deleg
 })
 export class CoreCourseUnsupportedModuleComponent implements OnInit {
 
-    @Input() courseId?: number; // The course to module belongs to.
+    @Input() courseId?: number; // The course to module belongs to (unused).
     @Input() module?: CoreCourseModuleData; // The module to render.
 
-    isDisabledInSite?: boolean;
-    isSupportedByTheApp?: boolean;
-    moduleName?: string;
+    isDisabledInSite = false; // It is implicit than if not disabled it will be unsupported.
 
     /**
      * Component being initialized.
@@ -43,8 +40,6 @@ export class CoreCourseUnsupportedModuleComponent implements OnInit {
         }
 
         this.isDisabledInSite = CoreCourseModuleDelegate.isModuleDisabledInSite(this.module.modname);
-        this.isSupportedByTheApp = CoreCourseModuleDelegate.hasHandler(this.module.modname);
-        this.moduleName = CoreCourse.translateModuleName(this.module.modname);
     }
 
 }
diff --git a/src/core/features/course/lang.json b/src/core/features/course/lang.json
index 36f792de9..554f22f43 100644
--- a/src/core/features/course/lang.json
+++ b/src/core/features/course/lang.json
@@ -1,10 +1,8 @@
 {
     "activitydisabled": "Your organisation has disabled this activity in the mobile app.",
     "activitynotyetviewableremoteaddon": "Your organisation installed a plugin that is not yet supported.",
-    "activitynotyetviewablesiteupgradeneeded": "Your organisation's Moodle installation needs to be updated.",
     "allsections": "All sections",
     "aria:sectionprogress": "Section progress:",
-    "askadmintosupport": "Contact the site administrator and tell them you want to use this activity with the Moodle Mobile app.",
     "availablespace": " You currently have about {{available}} free space.",
     "cannotdeletewhiledownloading": "Files cannot be deleted while the activity is being downloaded. Please wait for the download to finish.",
     "completion_automatic:done": "Done:",
diff --git a/src/core/features/course/pages/module-preview/module-preview.html b/src/core/features/course/pages/module-preview/module-preview.html
index eb42c4b54..010351d87 100644
--- a/src/core/features/course/pages/module-preview/module-preview.html
+++ b/src/core/features/course/pages/module-preview/module-preview.html
@@ -11,8 +11,8 @@
         </ion-title>
 
         <ion-buttons slot="end">
-            <ion-button fill="clear" *ngIf="module.url" [href]="module.url" core-link [showBrowserWarning]="false" color="dark"
-                [attr.aria-label]="'core.openinbrowser' | translate">
+            <ion-button fill="clear" *ngIf="module.url && module.uservisible && !unsupported" [href]="module.url" core-link
+                [showBrowserWarning]="false" color="dark" [attr.aria-label]="'core.openinbrowser' | translate">
                 <ion-icon name="fas-external-link-alt" slot="icon-only" aria-hidden="true"></ion-icon>
             </ion-button>
         </ion-buttons>
@@ -24,44 +24,24 @@
     </ion-refresher>
     <core-loading [hideUntil]="loaded">
         <core-course-module-info [module]="module" [courseId]="courseId" [description]="module.description" [component]="module.modname"
-            [componentId]="module.id" [expandDescription]="true">
+            [componentId]="module.id" [expandDescription]="true" [showAvailabilityInfo]="true">
+            <div class="core-module-additional-info" title>
+                <ion-chip *ngIf="module.handlerData?.extraBadge" [color]="module.handlerData?.extraBadgeColor"
+                    class="ion-text-wrap ion-text-start" [outline]="true">
+                    <ion-label><span [innerHTML]="module.handlerData?.extraBadge"></span></ion-label>
+                </ion-chip>
 
-            <ion-item class="ion-text-wrap" *ngIf="module.handlerData?.extraBadge ||
-                (module.visible === 0 && (!section || section.visible)) ||
-                    (module.visible !== 0 && module.isStealth) ||
-                    module.availabilityinfo">
-                <ion-label>
-                    <div class="ion-padding" *ngIf="module.handlerData?.extraBadge">
-                        <ion-chip *ngIf="module.handlerData?.extraBadge" [color]="module.handlerData?.extraBadgeColor"
-                            class="ion-text-wrap ion-text-start" [outline]="true">
-                            <ion-label><span [innerHTML]="module.handlerData?.extraBadge"></span></ion-label>
-                        </ion-chip>
-                    </div>
-
-                    <!-- Hidden badges -->
-                    <div *ngIf="module.visible === 0 && (!section || section.visible)">
-                        <ion-badge color="warning">
-                            {{ 'core.course.hiddenfromstudents' | translate }}
-                        </ion-badge>
-                    </div>
-                    <div *ngIf="module.visible !== 0 && module.isStealth">
-                        <ion-badge color="warning">
-                            {{ 'core.course.hiddenoncoursepage' | translate }}
-                        </ion-badge>
-                    </div>
-
-                    <!-- Availability info -->
-                    <div *ngIf="module.availabilityinfo" class="core-module-availabilityinfo">
-                        <ion-icon name="fas-lock" [attr.aria-label]="'core.restricted' | translate"></ion-icon>
-                        <core-format-text [text]="module.availabilityinfo" contextLevel="module" [contextInstanceId]="module.id"
-                            [courseId]="module.course">
-                        </core-format-text>
-                    </div>
-                </ion-label>
-            </ion-item>
-
-            <core-course-unsupported-module *ngIf="unsupported" [module]="module" [courseId]="courseId"></core-course-unsupported-module>
+                <!-- Hidden badges -->
+                <ion-badge color="warning" *ngIf="module.visible === 0">
+                    {{ 'core.course.hiddenfromstudents' | translate }}
+                </ion-badge>
+                <ion-badge color="warning" *ngIf="module.visible !== 0 && module.isStealth">
+                    {{ 'core.course.hiddenoncoursepage' | translate }}
+                </ion-badge>
+            </div>
         </core-course-module-info>
+
+        <core-course-unsupported-module *ngIf="unsupported" [module]="module"></core-course-unsupported-module>
     </core-loading>
 
     <core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module"
diff --git a/src/core/features/course/pages/module-preview/module-preview.page.ts b/src/core/features/course/pages/module-preview/module-preview.page.ts
index 258a1fe18..40320aeef 100644
--- a/src/core/features/course/pages/module-preview/module-preview.page.ts
+++ b/src/core/features/course/pages/module-preview/module-preview.page.ts
@@ -37,6 +37,7 @@ export class CoreCourseModulePreviewPage implements OnInit {
     courseId!: number;
     loaded = false;
     unsupported = false;
+    isDisabledInSite = false;
     showManualCompletion = false;
 
     protected debouncedUpdateModule?: () => void; // Update the module after a certain time.
@@ -80,6 +81,8 @@ export class CoreCourseModulePreviewPage implements OnInit {
         if (!this.unsupported) {
             this.module.handlerData =
                 await CoreCourseModuleDelegate.getModuleDataFor(this.module.modname, this.module, this.courseId);
+        } else {
+            this.isDisabledInSite = CoreCourseModuleDelegate.isModuleDisabledInSite(this.module.modname);
         }
 
         this.title = this.module.name;
diff --git a/src/core/lang.json b/src/core/lang.json
index 5b58a7e07..2a72d84e7 100644
--- a/src/core/lang.json
+++ b/src/core/lang.json
@@ -342,7 +342,6 @@
     "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?",
     "wsfunctionnotavailable": "The web service function is not available.",

From bdd6e488b9a0bf27e08be894773b82a033820796 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 17 Feb 2022 13:54:54 +0100
Subject: [PATCH 0561/1008] MOBILE-3821 core: Improve database debugging DX

---
 src/core/classes/sqlitedb.ts                  | 49 ++++++++++++----
 .../features/emulator/classes/sqlitedb.ts     | 58 ++++++++++---------
 src/core/initializers/prepare-devtools.ts     |  3 +
 src/core/services/db.ts                       | 23 +++++---
 4 files changed, 88 insertions(+), 45 deletions(-)

diff --git a/src/core/classes/sqlitedb.ts b/src/core/classes/sqlitedb.ts
index fc5f762e9..0d5bce2df 100644
--- a/src/core/classes/sqlitedb.ts
+++ b/src/core/classes/sqlitedb.ts
@@ -1170,27 +1170,54 @@ export class SQLiteDB {
      */
     protected getDatabaseSpies(db: SQLiteObject): Partial<SQLiteObject> {
         return {
-            executeSql(statement, params) {
+            async executeSql(statement, params) {
                 const start = performance.now();
 
-                return db.executeSql(statement, params).then(result => {
-                    CoreDB.logQuery(statement, performance.now() - start, params);
+                try {
+                    const result = await db.executeSql(statement, params);
+
+                    CoreDB.logQuery({
+                        params,
+                        sql: statement,
+                        duration:  performance.now() - start,
+                    });
 
                     return result;
-                });
+                } catch (error) {
+                    CoreDB.logQuery({
+                        params,
+                        error,
+                        sql: statement,
+                        duration:  performance.now() - start,
+                    });
+
+                    throw error;
+                }
             },
-            sqlBatch(statements) {
+            async sqlBatch(statements) {
                 const start = performance.now();
+                const sql = Array.isArray(statements)
+                    ? statements.join(' | ')
+                    : String(statements);
 
-                return db.sqlBatch(statements).then(result => {
-                    const sql = Array.isArray(statements)
-                        ? statements.join(' | ')
-                        : String(statements);
+                try {
+                    const result = await db.sqlBatch(statements);
 
-                    CoreDB.logQuery(sql, performance.now() - start);
+                    CoreDB.logQuery({
+                        sql,
+                        duration: performance.now() - start,
+                    });
 
                     return result;
-                });
+                } catch (error) {
+                    CoreDB.logQuery({
+                        sql,
+                        error,
+                        duration: performance.now() - start,
+                    });
+
+                    throw error;
+                }
             },
         };
     }
diff --git a/src/core/features/emulator/classes/sqlitedb.ts b/src/core/features/emulator/classes/sqlitedb.ts
index 18ad526b6..8b7f5c682 100644
--- a/src/core/features/emulator/classes/sqlitedb.ts
+++ b/src/core/features/emulator/classes/sqlitedb.ts
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-/* tslint:disable:no-console */
-
 import { SQLiteDB } from '@classes/sqlitedb';
 import { DbTransaction, SQLiteObject } from '@ionic-native/sqlite/ngx';
 import { CoreDB } from '@services/db';
@@ -53,7 +51,7 @@ export class SQLiteDBMock extends SQLiteDB {
         await this.ready();
 
         return new Promise((resolve, reject): void => {
-            this.db!.transaction((tx) => {
+            this.db?.transaction((tx) => {
                 // Query all tables from sqlite_master that we have created and can modify.
                 const args = [];
                 const query = `SELECT * FROM sqlite_master
@@ -99,15 +97,13 @@ export class SQLiteDBMock extends SQLiteDB {
 
         return new Promise((resolve, reject): void => {
             // With WebSQL, all queries must be run in a transaction.
-            this.db!.transaction((tx) => {
-                tx.executeSql(sql, params, (tx, results) => {
-                    resolve(results);
-                }, (tx, error) => {
-                    // eslint-disable-next-line no-console
-                    console.error(sql, params, error);
-
-                    reject(error);
-                });
+            this.db?.transaction((tx) => {
+                tx.executeSql(
+                    sql,
+                    params,
+                    (_, results) => resolve(results),
+                    (_, error) => reject(new Error(`SQL failed: ${sql}, reason: ${error?.message}`)),
+                );
             });
         });
     }
@@ -126,7 +122,7 @@ export class SQLiteDBMock extends SQLiteDB {
 
         return new Promise((resolve, reject): void => {
             // Create a transaction to execute the queries.
-            this.db!.transaction((tx) => {
+            this.db?.transaction((tx) => {
                 const promises: Promise<void>[] = [];
 
                 // Execute all the queries. Each statement can be a string or an array.
@@ -143,14 +139,7 @@ export class SQLiteDBMock extends SQLiteDB {
                             params = null;
                         }
 
-                        tx.executeSql(query, params, (tx, results) => {
-                            resolve(results);
-                        }, (tx, error) => {
-                            // eslint-disable-next-line no-console
-                            console.error(query, params, error);
-
-                            reject(error);
-                        });
+                        tx.executeSql(query, params, (_, results) => resolve(results), (_, error) => reject(error));
                     }));
                 });
 
@@ -187,13 +176,30 @@ export class SQLiteDBMock extends SQLiteDB {
                 const transactionSpy: DbTransaction = {
                     executeSql(sql, params, success, error) {
                         const start = performance.now();
-                        const resolve = callback => (...args) => {
-                            CoreDB.logQuery(sql, performance.now() - start, params);
 
-                            return callback(...args);
-                        };
+                        return transaction.executeSql(
+                            sql,
+                            params,
+                            (...args) => {
+                                CoreDB.logQuery({
+                                    sql,
+                                    params,
+                                    duration: performance.now() - start,
+                                });
 
-                        return transaction.executeSql(sql, params, resolve(success), resolve(error));
+                                return success?.(...args);
+                            },
+                            (...args) => {
+                                CoreDB.logQuery({
+                                    sql,
+                                    params,
+                                    error: args[0],
+                                    duration: performance.now() - start,
+                                });
+
+                                return error?.(...args);
+                            },
+                        );
                     },
                 };
 
diff --git a/src/core/initializers/prepare-devtools.ts b/src/core/initializers/prepare-devtools.ts
index ffed96e55..e3326eaf2 100644
--- a/src/core/initializers/prepare-devtools.ts
+++ b/src/core/initializers/prepare-devtools.ts
@@ -13,14 +13,17 @@
 // limitations under the License.
 
 import { CoreConfig, CoreConfigProvider } from '@services/config';
+import { CoreDB, CoreDbProvider } from '@services/db';
 import { CoreConstants } from '../constants';
 
 type DevelopmentWindow = Window & {
     configProvider?: CoreConfigProvider;
+    dbProvider?: CoreDbProvider;
 };
 
 function initializeDevelopmentWindow(window: DevelopmentWindow) {
     window.configProvider = CoreConfig.instance;
+    window.dbProvider = CoreDB.instance;
 }
 
 export default function(): void {
diff --git a/src/core/services/db.ts b/src/core/services/db.ts
index 489d44072..de01fd469 100644
--- a/src/core/services/db.ts
+++ b/src/core/services/db.ts
@@ -18,6 +18,7 @@ import { SQLiteDB } from '@classes/sqlitedb';
 import { SQLiteDBMock } from '@features/emulator/classes/sqlitedb';
 import { makeSingleton, SQLite, Platform } from '@singletons';
 import { CoreAppProvider } from './app';
+import { CoreUtils } from './utils/utils';
 
 /**
  * This service allows interacting with the local database to store and retrieve data.
@@ -35,15 +36,21 @@ export class CoreDbProvider {
      * @returns Whether queries should be logged.
      */
     loggingEnabled(): boolean {
-        return CoreAppProvider.isAutomated();
+        return CoreUtils.hasCookie('MoodleAppDBLoggingEnabled') || CoreAppProvider.isAutomated();
     }
 
     /**
      * Print query history in console.
+     *
+     * @param format Log format, with the following substitutions: :sql, :duration, and :result.
      */
-    printHistory(): void {
-        const substituteParams = ({ sql, params }: CoreDbQueryLog) =>
-            Object.values(params ?? []).reduce((sql: string, param: string) => sql.replace('?', param), sql);
+    printHistory(format: string = ':sql | Duration: :duration | Result: :result'): void {
+        const substituteParams = ({ sql, params, duration, error }: CoreDbQueryLog) => format
+            .replace(':sql', Object
+                .values(params ?? [])
+                .reduce((sql: string, param: string) => sql.replace('?', param) as string, sql) as string)
+            .replace(':duration', `${Math.round(duration).toString().padStart(4, '0')}ms`)
+            .replace(':result', error?.message ?? 'Success');
 
         // eslint-disable-next-line no-console
         console.log(this.queryLogs.map(substituteParams).join('\n'));
@@ -52,11 +59,10 @@ export class CoreDbProvider {
     /**
      * Log a query.
      *
-     * @param sql Query SQL.
-     * @param params Query parameters.
+     * @param log Query log.
      */
-    logQuery(sql: string, duration: number, params?: unknown[]): void {
-        this.queryLogs.push({ sql, duration, params });
+    logQuery(log: CoreDbQueryLog): void {
+        this.queryLogs.push(log);
     }
 
     /**
@@ -121,5 +127,6 @@ export const CoreDB = makeSingleton(CoreDbProvider);
 export interface CoreDbQueryLog {
     sql: string;
     duration: number;
+    error?: Error;
     params?: unknown[];
 }

From 84afd1ea4d3839680dd174aabe683f467483f266 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 17 Feb 2022 13:59:06 +0100
Subject: [PATCH 0562/1008] MOBILE-3821 messages: Cache total badge count

---
 .../messages/services/handlers/mainmenu.ts    | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/addons/messages/services/handlers/mainmenu.ts b/src/addons/messages/services/handlers/mainmenu.ts
index ea20c90d6..5df64592f 100644
--- a/src/addons/messages/services/handlers/mainmenu.ts
+++ b/src/addons/messages/services/handlers/mainmenu.ts
@@ -54,18 +54,21 @@ export class AddonMessagesMainMenuHandlerService implements CoreMainMenuHandler,
     protected unreadCount = 0;
     protected contactRequestsCount = 0;
     protected orMore = false;
+    protected badgeCount?: number;
 
     constructor() {
 
         CoreEvents.on(AddonMessagesProvider.UNREAD_CONVERSATION_COUNTS_EVENT, (data) => {
             this.unreadCount = data.favourites + data.individual + data.group + data.self;
             this.orMore = !!data.orMore;
-            this.updateBadge(data.siteId!);
+
+            data.siteId && this.updateBadge(data.siteId);
         });
 
         CoreEvents.on(AddonMessagesProvider.CONTACT_REQUESTS_COUNT_EVENT, (data) => {
             this.contactRequestsCount = data.count;
-            this.updateBadge(data.siteId!);
+
+            data.siteId && this.updateBadge(data.siteId);
         });
 
         // Reset info on logout.
@@ -123,27 +126,28 @@ export class AddonMessagesMainMenuHandlerService implements CoreMainMenuHandler,
      * @return Resolve when done.
      */
     async refreshBadge(siteId?: string, unreadOnly?: boolean): Promise<void> {
-        siteId = siteId || CoreSites.getCurrentSiteId();
-        if (!siteId) {
+        const badgeSiteId = siteId || CoreSites.getCurrentSiteId();
+
+        if (!badgeSiteId) {
             return;
         }
 
         const promises: Promise<unknown>[] = [];
 
-        promises.push(AddonMessages.refreshUnreadConversationCounts(siteId).catch(() => {
+        promises.push(AddonMessages.refreshUnreadConversationCounts(badgeSiteId).catch(() => {
             this.unreadCount = 0;
             this.orMore = false;
         }));
 
         // Refresh the number of contact requests in 3.6+ sites.
         if (!unreadOnly && AddonMessages.isGroupMessagingEnabled()) {
-            promises.push(AddonMessages.refreshContactRequestsCount(siteId).catch(() => {
+            promises.push(AddonMessages.refreshContactRequestsCount(badgeSiteId).catch(() => {
                 this.contactRequestsCount = 0;
             }));
         }
 
         await Promise.all(promises).finally(() => {
-            this.updateBadge(siteId!);
+            this.updateBadge(badgeSiteId);
             this.handler.loading = false;
         });
     }
@@ -155,6 +159,13 @@ export class AddonMessagesMainMenuHandlerService implements CoreMainMenuHandler,
      */
     updateBadge(siteId: string): void {
         const totalCount = this.unreadCount + (this.contactRequestsCount || 0);
+
+        if (this.badgeCount === totalCount) {
+            return;
+        }
+
+        this.badgeCount = totalCount;
+
         if (totalCount > 0) {
             this.handler.badge = totalCount + (this.orMore ? '+' : '');
         } else {

From d80ba6698b9271518aa1b84a0d1d576919993f18 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Mon, 21 Feb 2022 12:31:56 +0100
Subject: [PATCH 0563/1008] MOBILE-3821 core: Fix databases clean up

---
 src/addons/mod/book/services/book.ts          |  1 +
 src/core/classes/database/database-table.ts   | 19 ++++++++++++++++++-
 src/core/features/course/services/course.ts   |  1 +
 .../services/pushnotifications.ts             |  1 +
 src/core/services/filepool.ts                 | 13 +++----------
 src/core/services/sites.ts                    | 12 +++++++++---
 6 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/src/addons/mod/book/services/book.ts b/src/addons/mod/book/services/book.ts
index 6b6c18a8f..64d025dd6 100644
--- a/src/addons/mod/book/services/book.ts
+++ b/src/addons/mod/book/services/book.ts
@@ -69,6 +69,7 @@ export class AddonModBookProvider {
                 () => CoreSites.getSiteTable(LAST_CHAPTER_VIEWED_TABLE, {
                     siteId,
                     config: { cachingStrategy: CoreDatabaseCachingStrategy.None },
+                    onDestroy: () => delete this.lastChapterViewedTables[siteId],
                 }),
             ),
         );
diff --git a/src/core/classes/database/database-table.ts b/src/core/classes/database/database-table.ts
index 5aae6cac5..43e0ac125 100644
--- a/src/core/classes/database/database-table.ts
+++ b/src/core/classes/database/database-table.ts
@@ -28,6 +28,7 @@ export class CoreDatabaseTable<
     protected database: SQLiteDB;
     protected tableName: string;
     protected primaryKeyColumns: PrimaryKeyColumn[];
+    protected listeners: CoreDatabaseTableListener[] = [];
 
     constructor(
         config: Partial<CoreDatabaseConfiguration>,
@@ -86,7 +87,16 @@ export class CoreDatabaseTable<
      * Destroy.
      */
     async destroy(): Promise<void> {
-        // Nothing to destroy by default, override this method if necessary.
+        this.listeners.forEach(listener => listener.onDestroy?.());
+    }
+
+    /**
+     * Add listener.
+     *
+     * @param listener Listener.
+     */
+    addListener(listener: CoreDatabaseTableListener): void {
+        this.listeners.push(listener);
     }
 
     /**
@@ -368,6 +378,13 @@ export interface CoreDatabaseConfiguration {
     // This definition is augmented in subclasses.
 }
 
+/**
+ * Database table listener.
+ */
+export interface CoreDatabaseTableListener {
+    onDestroy?(): void;
+}
+
 /**
  * CoreDatabaseTable constructor.
  */
diff --git a/src/core/features/course/services/course.ts b/src/core/features/course/services/course.ts
index 5e1496358..f3f449c4e 100644
--- a/src/core/features/course/services/course.ts
+++ b/src/core/features/course/services/course.ts
@@ -153,6 +153,7 @@ export class CoreCourseProvider {
                 () => CoreSites.getSiteTable(COURSE_STATUS_TABLE, {
                     siteId,
                     config: { cachingStrategy: CoreDatabaseCachingStrategy.Eager },
+                    onDestroy: () => delete this.statusTables[siteId],
                 }),
             ),
         );
diff --git a/src/core/features/pushnotifications/services/pushnotifications.ts b/src/core/features/pushnotifications/services/pushnotifications.ts
index be515b7c9..2477b1cfc 100644
--- a/src/core/features/pushnotifications/services/pushnotifications.ts
+++ b/src/core/features/pushnotifications/services/pushnotifications.ts
@@ -74,6 +74,7 @@ export class CorePushNotificationsProvider {
                         siteId,
                         config: { cachingStrategy: CoreDatabaseCachingStrategy.None },
                         primaryKeyColumns: ['appid', 'uuid'],
+                        onDestroy: () => delete this.registeredDevicesTables[siteId],
                     },
                 ),
             ),
diff --git a/src/core/services/filepool.ts b/src/core/services/filepool.ts
index 30d857010..f41ee3cd4 100644
--- a/src/core/services/filepool.ts
+++ b/src/core/services/filepool.ts
@@ -113,6 +113,7 @@ export class CoreFilepoolProvider {
                     siteId,
                     config: { cachingStrategy: CoreDatabaseCachingStrategy.Lazy },
                     primaryKeyColumns: ['fileId'],
+                    onDestroy: () => delete this.filesTables[siteId],
                 }),
             ),
         );
@@ -122,6 +123,7 @@ export class CoreFilepoolProvider {
                     siteId,
                     config: { cachingStrategy: CoreDatabaseCachingStrategy.Lazy },
                     primaryKeyColumns: ['fileId', 'component', 'componentId'],
+                    onDestroy: () => delete this.linksTables[siteId],
                 }),
             ),
         );
@@ -130,6 +132,7 @@ export class CoreFilepoolProvider {
                 () => CoreSites.getSiteTable<CoreFilepoolPackageEntry, 'id'>(PACKAGES_TABLE_NAME, {
                     siteId,
                     config: { cachingStrategy: CoreDatabaseCachingStrategy.Lazy },
+                    onDestroy: () => delete this.packagesTables[siteId],
                 }),
             ),
         );
@@ -149,16 +152,6 @@ export class CoreFilepoolProvider {
                 NgZone.run(() => this.checkQueueProcessing());
             });
         });
-
-        CoreEvents.on(CoreEvents.SITE_DELETED, async ({ siteId }) => {
-            if (!siteId || !(siteId in this.filesTables)) {
-                return;
-            }
-
-            await this.filesTables[siteId].destroy();
-
-            delete this.filesTables[siteId];
-        });
     }
 
     /**
diff --git a/src/core/services/sites.ts b/src/core/services/sites.ts
index d18284bd7..c7cc2ba8e 100644
--- a/src/core/services/sites.ts
+++ b/src/core/services/sites.ts
@@ -158,6 +158,7 @@ export class CoreSitesProvider {
             config: Partial<CoreDatabaseConfiguration>;
             database: SQLiteDB;
             primaryKeyColumns: PrimaryKeyColumn[];
+            onDestroy(): void;
         }> = {},
     ): Promise<CoreDatabaseTable<DBRecord, PrimaryKeyColumn>> {
         const siteId = options.siteId ?? this.getCurrentSiteId();
@@ -176,6 +177,8 @@ export class CoreSitesProvider {
                 options.primaryKeyColumns,
             );
 
+            options.onDestroy && table.addListener({ onDestroy: options.onDestroy });
+
             await table.initialize();
 
             promisedTable.resolve(table as unknown as CoreDatabaseTable);
@@ -1833,16 +1836,19 @@ export class CoreSitesProvider {
      * @returns Scehmas Table.
      */
     protected getSiteSchemasTable(site: CoreSite): AsyncInstance<CoreDatabaseTable<SchemaVersionsDBEntry, 'name'>> {
-        this.schemasTables[site.getId()] = this.schemasTables[site.getId()] ?? asyncInstance(
+        const siteId = site.getId();
+
+        this.schemasTables[siteId] = this.schemasTables[siteId] ?? asyncInstance(
             () => this.getSiteTable(SCHEMA_VERSIONS_TABLE_NAME, {
-                siteId: site.getId(),
+                siteId: siteId,
                 database: site.getDb(),
                 config: { cachingStrategy: CoreDatabaseCachingStrategy.Eager },
                 primaryKeyColumns: ['name'],
+                onDestroy: () => delete this.schemasTables[siteId],
             }),
         );
 
-        return this.schemasTables[site.getId()];
+        return this.schemasTables[siteId];
     }
 
 }

From 16ad2edc3a2e9f766ba3441ad64bd8c506f25d12 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Mon, 21 Feb 2022 12:33:17 +0100
Subject: [PATCH 0564/1008] MOBILE-3833 core: Expose urlSchemes in development

---
 src/core/initializers/prepare-devtools.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/core/initializers/prepare-devtools.ts b/src/core/initializers/prepare-devtools.ts
index e3326eaf2..adc324726 100644
--- a/src/core/initializers/prepare-devtools.ts
+++ b/src/core/initializers/prepare-devtools.ts
@@ -14,16 +14,19 @@
 
 import { CoreConfig, CoreConfigProvider } from '@services/config';
 import { CoreDB, CoreDbProvider } from '@services/db';
+import { CoreCustomURLSchemes, CoreCustomURLSchemesProvider } from '@services/urlschemes';
 import { CoreConstants } from '../constants';
 
 type DevelopmentWindow = Window & {
     configProvider?: CoreConfigProvider;
     dbProvider?: CoreDbProvider;
+    urlSchemes?: CoreCustomURLSchemesProvider;
 };
 
 function initializeDevelopmentWindow(window: DevelopmentWindow) {
     window.configProvider = CoreConfig.instance;
     window.dbProvider = CoreDB.instance;
+    window.urlSchemes = CoreCustomURLSchemes.instance;
 }
 
 export default function(): void {

From b185c0fc4583f25d2615904677848142be1cba12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 18 Feb 2022 15:49:07 +0100
Subject: [PATCH 0565/1008] MOBILE-3814 module: Add prefetch status on module
 activity cards

---
 .../components/module/core-course-module.html |  2 +
 .../course/components/module/module.scss      |  1 +
 .../course/components/module/module.ts        | 72 ++++++++++++++++++-
 3 files changed, 72 insertions(+), 3 deletions(-)

diff --git a/src/core/features/course/components/module/core-course-module.html b/src/core/features/course/components/module/core-course-module.html
index e1048efe5..579f101e5 100644
--- a/src/core/features/course/components/module/core-course-module.html
+++ b/src/core/features/course/components/module/core-course-module.html
@@ -17,6 +17,8 @@
                     </core-format-text>
                     <ion-icon name="fas-lock" *ngIf="module.visible === 0 || module.uservisible === false"
                         [attr.aria-label]="'core.restricted' | translate"></ion-icon>
+                    <ion-icon [name]="prefetchStatusIcon" *ngIf="prefetchStatusIcon" color="success"
+                        [attr.aria-label]="prefetchStatusText | translate"></ion-icon>
                 </p>
 
                 <div class="core-module-additional-info">
diff --git a/src/core/features/course/components/module/module.scss b/src/core/features/course/components/module/module.scss
index da557da41..c4fd942bd 100644
--- a/src/core/features/course/components/module/module.scss
+++ b/src/core/features/course/components/module/module.scss
@@ -13,6 +13,7 @@
 
         .core-module-title .item-heading ion-icon {
             @include margin-horizontal(8px, null);
+            vertical-align: middle;
         }
 
         .core-module-buttons,
diff --git a/src/core/features/course/components/module/module.ts b/src/core/features/course/components/module/module.ts
index 0761f2ad6..478dc0b62 100644
--- a/src/core/features/course/components/module/module.ts
+++ b/src/core/features/course/components/module/module.ts
@@ -22,6 +22,12 @@ import {
 } from '@features/course/services/course-helper';
 import { CoreCourse } from '@features/course/services/course';
 import { CoreCourseModuleDelegate, CoreCourseModuleHandlerButton } from '@features/course/services/module-delegate';
+import {
+    CoreCourseModulePrefetchDelegate,
+    CoreCourseModulePrefetchHandler,
+} from '@features/course/services/module-prefetch-delegate';
+import { CoreConstants } from '@/core/constants';
+import { CoreEventObserver, CoreEvents } from '@singletons/events';
 
 /**
  * Component to display a module entry in a list of modules.
@@ -47,11 +53,16 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy {
     hasInfo = false;
     showLegacyCompletion = false; // Whether to show module completion in the old format.
     showManualCompletion = false; // Whether to show manual completion when completion conditions are disabled.
+    prefetchStatusIcon = ''; // Module prefetch status icon.
+    prefetchStatusText = ''; // Module prefetch status text.
+    protected prefetchHandler?: CoreCourseModulePrefetchHandler;
+
+    protected moduleStatusObserver?: CoreEventObserver;
 
     /**
-     * Component being initialized.
+     * @inheritdoc
      */
-    ngOnInit(): void {
+    async ngOnInit(): Promise<void> {
         this.modNameTranslated = CoreCourse.translateModuleName(this.module.modname) || '';
         this.showLegacyCompletion = !CoreSites.getCurrentSite()?.isVersionGreaterEqualThan('3.11');
         this.checkShowManualCompletion();
@@ -70,6 +81,60 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy {
             (this.module.visible !== 0 && this.module.isStealth) ||
             (this.module.availabilityinfo)
         );
+
+        if (this.module.handlerData?.showDownloadButton) {
+            const status = await CoreCourseModulePrefetchDelegate.getModuleStatus(this.module, this.module.course);
+            this.updateModuleStatus(status);
+
+            // Listen for changes on this module status, even if download isn't enabled.
+            this.prefetchHandler = CoreCourseModulePrefetchDelegate.getPrefetchHandlerFor(this.module.modname);
+            if (!this.prefetchHandler) {
+                return;
+            }
+
+            this.moduleStatusObserver = CoreEvents.on(CoreEvents.PACKAGE_STATUS_CHANGED, (data) => {
+                if (this.module.id != data.componentId || data.component != this.prefetchHandler?.component) {
+                    return;
+                }
+
+                let status = data.status;
+                if (this.prefetchHandler.determineStatus) {
+                    // Call determineStatus to get the right status to display.
+                    status = this.prefetchHandler.determineStatus(this.module, status, true);
+                }
+
+                // Update the status.
+                this.updateModuleStatus(status);
+            }, CoreSites.getCurrentSiteId());
+        }
+    }
+
+    /**
+     * Show module status.
+     *
+     * @param prefetchstatus Module status.
+     */
+    protected updateModuleStatus(prefetchstatus: string): void {
+        if (!prefetchstatus) {
+            return;
+        }
+
+        switch (prefetchstatus) {
+            case CoreConstants.OUTDATED:
+                this.prefetchStatusIcon = CoreConstants.ICON_OUTDATED;
+                this.prefetchStatusText = 'core.outdated';
+                break;
+            case CoreConstants.DOWNLOADED:
+                this.prefetchStatusIcon = CoreConstants.ICON_DOWNLOADED;
+                this.prefetchStatusText = 'core.downloaded';
+                break;
+            default:
+                this.prefetchStatusIcon = '';
+                this.prefetchStatusText = '';
+                break;
+        }
+
+        this.module.handlerData?.updateStatus?.(prefetchstatus);
     }
 
     /**
@@ -109,10 +174,11 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy {
     }
 
     /**
-     * Component destroyed.
+     * @inheritdoc
      */
     ngOnDestroy(): void {
         this.module.handlerData?.onDestroy?.();
+        this.moduleStatusObserver?.off();
     }
 
 }

From 8d5e906b1e802efdd950fefa5c8cb7da92c5d4cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 21 Feb 2022 11:31:00 +0100
Subject: [PATCH 0566/1008] MOBILE-3814 module: Change cloud icons to new
 fontawesome custom icons

---
 .../services/handlers/course-menu.ts          |  2 +-
 .../fonts/moodle/font-awesome/cloud-done.svg  |  1 +
 .../moodle/font-awesome/cloud-refresh.svg     |  1 +
 .../core-download-refresh.html                |  8 ++--
 src/core/constants.ts                         |  6 +--
 src/core/directives/fa-icon.ts                | 47 ++++++++++++-------
 .../module-summary/module-summary.html        |  4 +-
 .../core-courses-course-list-item.html        |  4 +-
 .../core-courses-course-progress.html         |  2 +-
 9 files changed, 44 insertions(+), 31 deletions(-)
 create mode 100644 src/assets/fonts/moodle/font-awesome/cloud-done.svg
 create mode 100644 src/assets/fonts/moodle/font-awesome/cloud-refresh.svg

diff --git a/src/addons/storagemanager/services/handlers/course-menu.ts b/src/addons/storagemanager/services/handlers/course-menu.ts
index 7aa36c6de..74dc8f409 100644
--- a/src/addons/storagemanager/services/handlers/course-menu.ts
+++ b/src/addons/storagemanager/services/handlers/course-menu.ts
@@ -48,7 +48,7 @@ export class AddonStorageManagerCourseMenuHandlerService implements CoreCourseOp
         course: CoreCourseAnyCourseDataWithOptions,
     ): CoreCourseOptionsMenuHandlerData {
         return {
-            icon: 'cloud-download',
+            icon: 'fas-cloud-download-alt',
             title: 'addon.storagemanager.coursedownloads',
             page: 'storage/' + course.id,
             pageParams: {
diff --git a/src/assets/fonts/moodle/font-awesome/cloud-done.svg b/src/assets/fonts/moodle/font-awesome/cloud-done.svg
new file mode 100644
index 000000000..9f80a5392
--- /dev/null
+++ b/src/assets/fonts/moodle/font-awesome/cloud-done.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><!-- Font Awesome Free 5.15.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) --><path d="M20.4 10C20.4 10.4575 20.3137 10.8962 20.16 11.2975C22.35 11.74 24 13.6787 24 16C24 18.6512 21.8513 20.8 19.2 20.8H5.4C2.41875 20.8 0 18.3812 0 15.4C0 13.045 1.5075 11.0425 3.6075 10.3038C3.60375 10.2025 3.6 10.1012 3.6 10C3.6 6.685 6.285 4 9.6 4C11.8238 4 13.7625 5.2075 14.8013 7.0075C15.3713 6.625 16.0613 6.4 16.8 6.4C18.7875 6.4 20.4 8.0125 20.4 10ZM4.98276 14.5878L9.03876 18.6438C9.28244 18.8875 9.67753 18.8875 9.92124 18.6439L17.0972 11.4678C17.3409 11.2241 17.3409 10.829 17.0972 10.5853L16.2148 9.70288C15.9711 9.4592 15.576 9.4592 15.3323 9.70288L9.48 15.5552L6.74768 12.8229C6.504 12.5792 6.10888 12.5792 5.86521 12.8229L4.98276 13.7054C4.73908 13.9491 4.73908 14.3441 4.98276 14.5878Z"/></svg>
diff --git a/src/assets/fonts/moodle/font-awesome/cloud-refresh.svg b/src/assets/fonts/moodle/font-awesome/cloud-refresh.svg
new file mode 100644
index 000000000..2e336c793
--- /dev/null
+++ b/src/assets/fonts/moodle/font-awesome/cloud-refresh.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><!-- Font Awesome Free 5.15.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) --><path d="M20.4 10C20.4 10.4575 20.3137 10.8962 20.16 11.2975C22.35 11.74 24 13.6787 24 16C24 18.6512 21.8513 20.8 19.2 20.8H5.4C2.41875 20.8 0 18.3812 0 15.4C0 13.045 1.5075 11.0425 3.6075 10.3038C3.60375 10.2025 3.6 10.1012 3.6 10C3.6 6.685 6.285 4 9.6 4C11.8238 4 13.7625 5.2075 14.8013 7.0075C15.3713 6.625 16.0613 6.4 16.8 6.4C18.7875 6.4 20.4 8.0125 20.4 10ZM14.6873 10.0224C13.7416 9.11858 12.4606 8.5626 11.0497 8.56007C8.13698 8.55485 5.75998 10.9274 5.76 13.8401C5.76003 16.7561 8.12395 19.1201 11.04 19.1201C12.401 19.1201 13.6417 18.6051 14.578 17.7594C14.6868 17.6611 14.692 17.492 14.5882 17.3883L13.7438 16.5439C13.6488 16.4489 13.4963 16.4435 13.3953 16.5321C12.7432 17.1043 11.9156 17.4168 11.04 17.4168C9.04263 17.4168 7.4795 15.799 7.46336 13.8709C7.44635 11.8384 9.10454 10.2464 11.0717 10.2634C11.9751 10.2712 12.8253 10.612 13.4824 11.2273L12.5936 12.1162C12.2717 12.4381 12.4996 12.9885 12.9549 12.9885H15.809C16.0912 12.9885 16.32 12.7597 16.32 12.4775V9.62333C16.32 9.1681 15.7696 8.94012 15.4477 9.26201L14.6873 10.0224Z"/></svg>
diff --git a/src/core/components/download-refresh/core-download-refresh.html b/src/core/components/download-refresh/core-download-refresh.html
index f9580727f..21d380920 100644
--- a/src/core/components/download-refresh/core-download-refresh.html
+++ b/src/core/components/download-refresh/core-download-refresh.html
@@ -2,19 +2,19 @@
     <!-- Download button. -->
     <ion-button *ngIf="status == statusNotDownloaded" fill="clear" (click)="download($event, false)" color="dark" @coreShowHideAnimation
         [attr.aria-label]="(statusTranslatable || 'core.download') | translate">
-        <ion-icon slot="icon-only" name="cloud-download" aria-hidden="true"></ion-icon>
+        <ion-icon slot="icon-only" name="fas-cloud-download-alt" aria-hidden="true"></ion-icon>
     </ion-button>
 
     <!-- Refresh button. -->
     <ion-button *ngIf="status == statusOutdated || (status == statusDownloaded && !canTrustDownload)" fill="clear"
-        (click)="download($event, true)" color="dark" @coreShowHideAnimation
+        (click)="download($event, true)" color="primary" @coreShowHideAnimation
         [attr.aria-label]="(statusTranslatable || 'core.refresh') | translate">
-        <ion-icon slot="icon-only" name="fas-redo-alt" aria-hidden="true"></ion-icon>
+        <ion-icon slot="icon-only" name="fam-cloud-refresh" aria-hidden="true"></ion-icon>
     </ion-button>
 
     <!-- Downloaded status icon. -->
     <ion-icon *ngIf="status == statusDownloaded && canTrustDownload" class="core-icon-downloaded ion-padding-horizontal" color="success"
-        name="cloud-done" [attr.aria-label]="(statusTranslatable || 'core.downloaded') | translate" role="status"></ion-icon>
+        name="fam-cloud-done" [attr.aria-label]="(statusTranslatable || 'core.downloaded') | translate" role="status"></ion-icon>
 
     <ion-spinner *ngIf="status === statusDownloading" @coreShowHideAnimation
         [attr.aria-label]="(statusTranslatable || 'core.downloading') | translate"></ion-spinner>
diff --git a/src/core/constants.ts b/src/core/constants.ts
index 7113598cc..0fcd0ddd3 100644
--- a/src/core/constants.ts
+++ b/src/core/constants.ts
@@ -93,10 +93,10 @@ export class CoreConstants {
     static readonly NOT_DOWNLOADABLE = 'notdownloadable';
 
     // Download / prefetch status icon.
-    static readonly ICON_DOWNLOADED = 'cloud-done';
+    static readonly ICON_DOWNLOADED = 'fam-cloud-done';
     static readonly ICON_DOWNLOADING = 'spinner';
-    static readonly ICON_NOT_DOWNLOADED = 'cloud-download';
-    static readonly ICON_OUTDATED = 'fas-redo-alt';
+    static readonly ICON_NOT_DOWNLOADED = 'fas-cloud-download-alt';
+    static readonly ICON_OUTDATED = 'fam-cloud-refresh';
     static readonly ICON_NOT_DOWNLOADABLE = '';
 
     // General download and sync icons.
diff --git a/src/core/directives/fa-icon.ts b/src/core/directives/fa-icon.ts
index 8a262dd45..9de2de27a 100644
--- a/src/core/directives/fa-icon.ts
+++ b/src/core/directives/fa-icon.ts
@@ -45,47 +45,58 @@ export class CoreFaIconDirective implements AfterViewInit, OnChanges {
      * Detect icon name and use svg.
      */
     async setIcon(): Promise<void> {
-        let library = 'ionic';
+        let library = '';
         let iconName = this.name;
+        let font = 'ionicons';
         const parts = iconName.split('-', 2);
         if (parts.length == 2) {
             switch (parts[0]) {
                 case 'far':
                     library = 'regular';
-                    iconName = iconName.substring(4);
+                    font = 'font-awesome';
                     break;
                 case 'fa':
                 case 'fas':
                     library = 'solid';
-                    iconName = iconName.substring(parts[0].length + 1);
+                    font = 'font-awesome';
                     break;
                 case 'fab':
                     library = 'brands';
-                    iconName = iconName.substring(4);
+                    font = 'font-awesome';
+                    break;
+                case 'moodle':
+                    library = 'moodle';
+                    font = 'moodle';
+                    break;
+                case 'fam':
+                    library = 'font-awesome';
+                    font = 'moodle';
                     break;
                 default:
                     break;
             }
         }
 
-        if (library != 'ionic') {
-            const src = `assets/fonts/font-awesome/${library}/${iconName}.svg`;
-            this.element.setAttribute('src', src);
-            this.element.classList.add('faicon');
-
-            if (CoreConstants.BUILD.isDevelopment || CoreConstants.BUILD.isTesting) {
-                try {
-                    await Http.get(src, { responseType: 'text' }).toPromise();
-                } catch (error) {
-                    this.logger.error(`Icon ${this.name} not found`);
-                }
-            }
-        } else {
+        if (font == 'ionicons') {
             this.element.removeAttribute('src');
             this.logger.warn(`Ionic icon ${this.name} detected`);
+
+            return;
         }
 
-        return;
+        iconName = iconName.substring(parts[0].length + 1);
+
+        const src = `assets/fonts/${font}/${library}/${iconName}.svg`;
+        this.element.setAttribute('src', src);
+        this.element.classList.add('faicon');
+
+        if (CoreConstants.BUILD.isDevelopment || CoreConstants.BUILD.isTesting) {
+            try {
+                await Http.get(src, { responseType: 'text' }).toPromise();
+            } catch (error) {
+                this.logger.error(`Icon ${this.name} not found`);
+            }
+        }
     }
 
     /**
diff --git a/src/core/features/course/components/module-summary/module-summary.html b/src/core/features/course/components/module-summary/module-summary.html
index 820e944ef..6c60ba185 100644
--- a/src/core/features/course/components/module-summary/module-summary.html
+++ b/src/core/features/course/components/module-summary/module-summary.html
@@ -58,7 +58,7 @@
             <ion-item lines="full" class="ion-text-wrap">
                 <ion-label>
                     <h2>
-                        <ion-icon name="cloud-done" aria-hidden="true"></ion-icon>
+                        <ion-icon name="fam-cloud-done" aria-hidden="true"></ion-icon>
                         {{ 'addon.storagemanager.downloads' | translate }}
                     </h2>
                 </ion-label>
@@ -81,7 +81,7 @@
             </ion-item>
             <ion-button fill="outline" expand="block" *ngIf="canPrefetch && displayOptions.displayPrefetch" class="ion-text-wrap"
                 (click)="prefetch()" color="primary" [disabled]="prefetchDisabled">
-                <ion-icon *ngIf="!prefetchLoading" name="cloud-done" slot="start" aria-hidden="true"></ion-icon>
+                <ion-icon *ngIf="!prefetchLoading" name="fam-cloud-done" slot="start" aria-hidden="true"></ion-icon>
                 <ion-spinner *ngIf="prefetchLoading" slot="start" aria-hidden="true"></ion-spinner>
                 <ion-label>
                     {{ 'core.download' | translate }}
diff --git a/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html b/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
index c63576239..39bf2b5e2 100644
--- a/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
+++ b/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
@@ -62,8 +62,8 @@
                         </ion-icon>
                     </span>
 
-                    <ion-icon *ngIf="prefetchCourseData.downloadSucceeded" class="core-icon-downloaded" name="cloud-done" color="success"
-                        role="status" [attr.aria-label]="'core.downloaded' | translate"></ion-icon>
+                    <ion-icon *ngIf="prefetchCourseData.downloadSucceeded" class="core-icon-downloaded" name="fam-cloud-done"
+                        color="success" role="status" [attr.aria-label]="'core.downloaded' | translate"></ion-icon>
                 </p>
 
                 <ion-chip color="brand" *ngIf="course.categoryname"
diff --git a/src/core/features/courses/components/course-progress/core-courses-course-progress.html b/src/core/features/courses/components/course-progress/core-courses-course-progress.html
index ab0ce2457..9a5976b70 100644
--- a/src/core/features/courses/components/course-progress/core-courses-course-progress.html
+++ b/src/core/features/courses/components/course-progress/core-courses-course-progress.html
@@ -44,7 +44,7 @@
 
             <!-- Downloaded icon. -->
             <ion-icon *ngIf="downloadCourseEnabled && prefetchCourseData.downloadSucceeded && !showSpinner" class="core-icon-downloaded"
-                name="cloud-done" color="success" role="status" [attr.aria-label]="'core.downloaded' | translate"></ion-icon>
+                name="fam-cloud-done" color="success" role="status" [attr.aria-label]="'core.downloaded' | translate"></ion-icon>
 
             <!-- Options menu. -->
             <ion-button fill="clear" color="dark" (click)="showCourseOptionsMenu($event)" *ngIf="!showSpinner"

From 953952b4cda3e2a93ccf83a6df63d6c451fcdcf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 21 Feb 2022 13:51:05 +0100
Subject: [PATCH 0567/1008] MOBILE-3814 grades: Use ion icon to render grades
 svg

---
 src/assets/fonts/moodle/moodle/agg_mean.svg        | 1 +
 src/assets/fonts/moodle/moodle/agg_sum.svg         | 1 +
 src/assets/img/grades/agg_mean.svg                 | 1 -
 src/assets/img/grades/agg_sum.svg                  | 1 -
 src/core/features/grades/services/grades-helper.ts | 4 ++--
 5 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 src/assets/fonts/moodle/moodle/agg_mean.svg
 create mode 100644 src/assets/fonts/moodle/moodle/agg_sum.svg
 delete mode 100644 src/assets/img/grades/agg_mean.svg
 delete mode 100644 src/assets/img/grades/agg_sum.svg

diff --git a/src/assets/fonts/moodle/moodle/agg_mean.svg b/src/assets/fonts/moodle/moodle/agg_mean.svg
new file mode 100644
index 000000000..c10adf743
--- /dev/null
+++ b/src/assets/fonts/moodle/moodle/agg_mean.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-0.9 0 16 16" preserveAspectRatio="xMinYMid meet" overflow="visible"><path d="M2.3 4.8 6.7 4c.8 1.2 1.4 2.6 1.7 4.1.8-1.1 1.4-2 1.9-2.5.6-.7 1-1.1 1.4-1.3.4-.2.8-.3 1.2-.3.5 0 .8.1 1.1.4.2.3.4.6.4 1s-.1.7-.4 1c-.2.3-.6.4-.9.4-.3 0-.6 0-.9-.1-.3-.1-.6-.1-.7-.1-.4 0-.7.1-1 .4-.6.3-1.2 1-1.8 2.1.7 2.5 1.3 4 1.7 4.6.3.3.5.5.8.5.2 0 .4-.1.6-.2.2-.2.6-.6 1.1-1.3l.5.3c-.7 1.2-1.5 2-2.2 2.5-.5.4-1.1.6-1.6.6s-1-.1-1.3-.4c-.4-.2-.7-.6-.9-1.2-.3-.5-.6-1.4-1-2.6-1 1.2-1.7 2.2-2.3 2.7-.6.6-1 .9-1.4 1.1s-.9.3-1.3.3-.8-.1-1-.4-.4-.5-.4-.9.1-.8.4-1.1c.3-.3.6-.4 1.1-.4.2 0 .5.1.8.2.4.2.7.3.9.3.2 0 .5-.1.7-.2.3-.1.6-.4 1-.8.1-.2.5-.7 1.1-1.6-.8-3-1.4-4.8-1.9-5.3-.2-.4-.6-.6-1-.6-.2 0-.5 0-.8.1v-.5zM6.5 0h7.3L13 2.6H5.7L6.5 0z"/></svg>
diff --git a/src/assets/fonts/moodle/moodle/agg_sum.svg b/src/assets/fonts/moodle/moodle/agg_sum.svg
new file mode 100644
index 000000000..6108dc6df
--- /dev/null
+++ b/src/assets/fonts/moodle/moodle/agg_sum.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-1.9 0 16 16" preserveAspectRatio="xMinYMid meet" overflow="visible"><path d="M9.2 12.4c-.7.3-1.4.5-2.1.6H2.7l5.2-5.9L5.4 2H7c1.1 0 2 .1 2.6.3.5.2 1 .5 1.3 1 .2.4.3.7.3 1.7h.4l1.3-5H2v2l2.8 5.6L0 13v3h10.4l2.5-6h-.5c-1 1-2 1.8-3.2 2.4z"/></svg>
diff --git a/src/assets/img/grades/agg_mean.svg b/src/assets/img/grades/agg_mean.svg
deleted file mode 100644
index ac4368d15..000000000
--- a/src/assets/img/grades/agg_mean.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="-0.9 0 16 16" preserveAspectRatio="xMinYMid meet" overflow="visible"><path d="M2.3 4.8 6.7 4c.8 1.2 1.4 2.6 1.7 4.1.8-1.1 1.4-2 1.9-2.5.6-.7 1-1.1 1.4-1.3.4-.2.8-.3 1.2-.3.5 0 .8.1 1.1.4.2.3.4.6.4 1s-.1.7-.4 1c-.2.3-.6.4-.9.4-.3 0-.6 0-.9-.1-.3-.1-.6-.1-.7-.1-.4 0-.7.1-1 .4-.6.3-1.2 1-1.8 2.1.7 2.5 1.3 4 1.7 4.6.3.3.5.5.8.5.2 0 .4-.1.6-.2.2-.2.6-.6 1.1-1.3l.5.3c-.7 1.2-1.5 2-2.2 2.5-.5.4-1.1.6-1.6.6s-1-.1-1.3-.4c-.4-.2-.7-.6-.9-1.2-.3-.5-.6-1.4-1-2.6-1 1.2-1.7 2.2-2.3 2.7-.6.6-1 .9-1.4 1.1s-.9.3-1.3.3-.8-.1-1-.4-.4-.5-.4-.9.1-.8.4-1.1c.3-.3.6-.4 1.1-.4.2 0 .5.1.8.2.4.2.7.3.9.3.2 0 .5-.1.7-.2.3-.1.6-.4 1-.8.1-.2.5-.7 1.1-1.6-.8-3-1.4-4.8-1.9-5.3-.2-.4-.6-.6-1-.6-.2 0-.5 0-.8.1v-.5zM6.5 0h7.3L13 2.6H5.7L6.5 0z" fill="#999"/></svg>
diff --git a/src/assets/img/grades/agg_sum.svg b/src/assets/img/grades/agg_sum.svg
deleted file mode 100644
index 9ebd5c23d..000000000
--- a/src/assets/img/grades/agg_sum.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="-1.9 0 16 16" preserveAspectRatio="xMinYMid meet" overflow="visible"><path d="M9.2 12.4c-.7.3-1.4.5-2.1.6H2.7l5.2-5.9L5.4 2H7c1.1 0 2 .1 2.6.3.5.2 1 .5 1.3 1 .2.4.3.7.3 1.7h.4l1.3-5H2v2l2.8 5.6L0 13v3h10.4l2.5-6h-.5c-1 1-2 1.8-3.2 2.4z" fill="#999"/></svg>
diff --git a/src/core/features/grades/services/grades-helper.ts b/src/core/features/grades/services/grades-helper.ts
index cff4e9b98..1720fd445 100644
--- a/src/core/features/grades/services/grades-helper.ts
+++ b/src/core/features/grades/services/grades-helper.ts
@@ -593,11 +593,11 @@ export class CoreGradesHelperProvider {
         text = text.replace('%2F', '/').replace('%2f', '/');
         if (text.indexOf('/agg_mean') > -1) {
             row.itemtype = 'agg_mean';
-            row.image = 'assets/img/grades/agg_mean.svg';
+            row.icon = 'moodle-agg_mean';
             row.iconAlt = Translate.instant('core.grades.aggregatemean');
         } else if (text.indexOf('/agg_sum') > -1) {
             row.itemtype = 'agg_sum';
-            row.image = 'assets/img/grades/agg_sum.svg';
+            row.icon = 'moodle-agg_sum';
             row.iconAlt = Translate.instant('core.grades.aggregatesum');
         } else if (text.indexOf('/outcomes') > -1 || text.indexOf('fa-tasks') > -1) {
             row.itemtype = 'outcome';

From b676289e1bd0cd941f89a957937d255fe27f4963 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 21 Feb 2022 14:06:12 +0100
Subject: [PATCH 0568/1008] MOBILE-3814 calendar: Restore calendar dot colors

---
 .../calendar/components/calendar/calendar.scss | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/addons/calendar/components/calendar/calendar.scss b/src/addons/calendar/components/calendar/calendar.scss
index 35cd3ccbd..057745e3b 100644
--- a/src/addons/calendar/components/calendar/calendar.scss
+++ b/src/addons/calendar/components/calendar/calendar.scss
@@ -133,20 +133,10 @@
         margin-right: 1px;
         margin-left: 1px;
 
-        &.calendar_event_category {
-            background-color: var(--addon-calendar-event-category-color);
-        }
-        &.calendar_event_course {
-            background-color: var(--addon-calendar-event-course-color);
-        }
-        &.calendar_event_group {
-            background-color: var(--addon-calendar-event-group-color);
-        }
-        &.calendar_event_user {
-            background-color: var(--addon-calendar-event-user-color);
-        }
-        &.calendar_event_site {
-            background-color: var(--addon-calendar-event-site-color);
+        @each $category, $value in $calendar-event-category-colors {
+            &.calendar_event_#{$category} {
+                background-color: $value;
+            }
         }
     }
 

From a3c5914e5c10ddc8aeeefb57b0e0f60f6f08759a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 21 Feb 2022 14:26:19 +0100
Subject: [PATCH 0569/1008] MOBILE-3814 grades: Mod icon colors on grade should
 be B/W

---
 src/core/components/mod-icon/mod-icon.scss       |  3 ++-
 .../features/grades/pages/course/course.scss     | 16 ++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/core/components/mod-icon/mod-icon.scss b/src/core/components/mod-icon/mod-icon.scss
index 45b236cb6..f5f7dbdcb 100644
--- a/src/core/components/mod-icon/mod-icon.scss
+++ b/src/core/components/mod-icon/mod-icon.scss
@@ -6,6 +6,7 @@
     --margin-end: 0px;
     --margin-vertical: 0px;
     --icon-radius: var(--small-radius);
+    --filter: brightness(0) invert(1);
 
     margin-top: var(--margin-vertical);
     margin-bottom: var(--margin-vertical);
@@ -20,7 +21,7 @@
         &.#{$type} {
             background-color: var(--activity#{$type});
             img {
-                filter: brightness(0) invert(1);
+                filter: var(--filter);
             }
         }
     }
diff --git a/src/core/features/grades/pages/course/course.scss b/src/core/features/grades/pages/course/course.scss
index 1d73d15e2..bed25f18e 100644
--- a/src/core/features/grades/pages/course/course.scss
+++ b/src/core/features/grades/pages/course/course.scss
@@ -3,11 +3,12 @@
 :host {
     --header-background: var(--white);
     --odd-cell-background: var(--light);
-    --even-cell-background: var(--white);
     --odd-cell-hover: var(--gray-200);
+    --even-cell-background: var(--white);
     --even-cell-hover: var(--light);
     --icon-color: var(--gray-500);
     --border-color: var(--stroke);
+    --mod-icon-filter: brightness(0);
 
     .odd {
         --cell-background: var(--odd-cell-background);
@@ -23,11 +24,12 @@
 
 :host-context(body.dark) {
     --header-background: var(--gray-900);
-    --odd-cell-background: var(--medium);
+    --odd-cell-background: var(--gray-800);
+    --odd-cell-hover: var(--gray-600);
     --even-cell-background: var(--gray-900);
-    --odd-cell-hover: var(--gray-500);
-    --even-cell-hover: var(--medium);
+    --even-cell-hover: var(--gray-700);
     --icon-color: var(--gray-200);
+    --mod-icon-filter: brightness(0) invert(1);
 }
 
 .core-grades-table {
@@ -80,8 +82,10 @@
         }
 
         core-mod-icon {
-            padding: 3px;
-            --size: 10px;
+            padding: 0px;
+            --size: 16px;
+            background: transparent;
+            --filter: var(--mod-icon-filter);
         }
 
 

From dd1050d4e6cc25063e279abd5fe7f65124088fa5 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 21 Feb 2022 15:44:34 +0100
Subject: [PATCH 0570/1008] MOBILE-3927 swipe: Make swipe-slides fill whole
 height

---
 .../calendar/addon-calendar-calendar.html     | 192 +++++++++---------
 .../components/calendar/calendar.scss         |   5 +
 src/addons/calendar/pages/day/day.html        | 142 ++++++-------
 src/addons/calendar/pages/day/day.scss        |   9 +-
 .../mod/book/pages/contents/contents.html     |  16 +-
 .../mod/book/pages/contents/contents.scss     |   7 +
 .../mod/book/pages/contents/contents.ts       |   1 +
 src/core/components/loading/loading.scss      |   4 +
 .../components/swipe-slides/swipe-slides.scss |   4 +-
 .../components/swipe-slides/swipe-slides.ts   |  34 +++-
 .../login/pages/site-policy/site-policy.html  |   2 +-
 .../login/pages/site-policy/site-policy.scss  |   6 -
 src/theme/theme.base.scss                     |  11 +
 13 files changed, 235 insertions(+), 198 deletions(-)
 create mode 100644 src/addons/mod/book/pages/contents/contents.scss

diff --git a/src/addons/calendar/components/calendar/addon-calendar-calendar.html b/src/addons/calendar/components/calendar/addon-calendar-calendar.html
index 9d072a910..39466f120 100644
--- a/src/addons/calendar/components/calendar/addon-calendar-calendar.html
+++ b/src/addons/calendar/components/calendar/addon-calendar-calendar.html
@@ -7,102 +7,104 @@
     </core-context-menu>
 </core-navbar-buttons>
 
-<core-loading [hideUntil]="loaded" class="safe-area-padding">
-    <!-- Period name and arrows to navigate. -->
-    <ion-grid class="ion-no-padding addon-calendar-navigation">
-        <ion-row class="ion-align-items-center">
-            <ion-col class="ion-text-start" *ngIf="canNavigate">
-                <ion-button fill="clear" (click)="loadPrevious()" [attr.aria-label]="'core.previous' | translate">
-                    <ion-icon name="fas-chevron-left" slot="icon-only" aria-hidden="true"></ion-icon>
-                </ion-button>
-            </ion-col>
-            <ion-col class="ion-text-center addon-calendar-period">
-                <h2 id="addon-calendar-monthname">
-                    {{ periodName }}
-                    <ion-spinner *ngIf="!selectedMonthLoaded()" class="addon-calendar-loading-month">
-                    </ion-spinner>
-                </h2>
-            </ion-col>
-            <ion-col class="ion-text-end" *ngIf="canNavigate">
-                <ion-button fill="clear" (click)="loadNext()" [attr.aria-label]="'core.next' | translate">
-                    <ion-icon name="fas-chevron-right" slot="icon-only" aria-hidden="true"></ion-icon>
-                </ion-button>
-            </ion-col>
-        </ion-row>
-    </ion-grid>
+<core-loading [hideUntil]="loaded" class="safe-area-padding core-loading-full-height">
+    <div class="core-swipe-slides-container">
+        <!-- Period name and arrows to navigate. -->
+        <ion-grid class="ion-no-padding addon-calendar-navigation">
+            <ion-row class="ion-align-items-center">
+                <ion-col class="ion-text-start" *ngIf="canNavigate">
+                    <ion-button fill="clear" (click)="loadPrevious()" [attr.aria-label]="'core.previous' | translate">
+                        <ion-icon name="fas-chevron-left" slot="icon-only" aria-hidden="true"></ion-icon>
+                    </ion-button>
+                </ion-col>
+                <ion-col class="ion-text-center addon-calendar-period">
+                    <h2 id="addon-calendar-monthname">
+                        {{ periodName }}
+                        <ion-spinner *ngIf="!selectedMonthLoaded()" class="addon-calendar-loading-month">
+                        </ion-spinner>
+                    </h2>
+                </ion-col>
+                <ion-col class="ion-text-end" *ngIf="canNavigate">
+                    <ion-button fill="clear" (click)="loadNext()" [attr.aria-label]="'core.next' | translate">
+                        <ion-icon name="fas-chevron-right" slot="icon-only" aria-hidden="true"></ion-icon>
+                    </ion-button>
+                </ion-col>
+            </ion-row>
+        </ion-grid>
 
-    <core-swipe-slides [manager]="manager">
-        <ng-template let-month="item">
-            <!-- Calendar view. -->
-            <ion-grid class="addon-calendar-months" role="table" aria-describedby="addon-calendar-monthname">
-                <div role="rowgroup">
-                    <!-- List of days. -->
-                    <ion-row role="row">
-                        <ion-col class="ion-text-center addon-calendar-weekday" *ngFor="let day of month.weekDays" role="columnheader">
-                            <span class="sr-only">{{ day.fullname | translate }}</span>
-                            <span class="ion-hide-md-up" aria-hidden="true">{{ day.shortname | translate }}</span>
-                            <span class="ion-hide-md-down" aria-hidden="true">{{ day.fullname | translate }}</span>
-                        </ion-col>
-                    </ion-row>
-                </div>
-                <div role="rowgroup">
-                    <!-- Weeks. -->
-                    <ion-row *ngFor="let week of month.weeks" class="addon-calendar-week" role="row">
-                        <!-- Empty slots (first week). -->
-                        <ion-col *ngFor="let value of week.prepadding" class="dayblank addon-calendar-day" role="cell">
-                        </ion-col>
-                        <ion-col *ngFor="let day of week.days" class="addon-calendar-day ion-text-center" [ngClass]='{
-                                "hasevents": day.hasevents,
-                                "today": month.isCurrentMonth && day.istoday,
-                                "weekend": day.isweekend,
-                                "duration_finish": day.haslastdayofevent
-                            }' [class.addon-calendar-event-past-day]="month.isPastMonth || day.ispast" role="cell" tabindex="0"
-                            (ariaButtonClick)="dayClicked(day.mday)">
-                            <p class="addon-calendar-day-number" role="button">
-                                <span aria-hidden="true">{{ day.mday }}</span>
-                                <span class="sr-only">{{ day.periodName | translate }}</span>
-                            </p>
-
-                            <!-- In phone, display some dots to indicate the type of events. -->
-                            <p class="ion-hide-md-up addon-calendar-dot-types"><span *ngFor="let type of day.calendareventtypes"
-                                    class="calendar_event_type calendar_event_{{type}}"></span></p>
-
-                            <!-- In tablet, display list of events. -->
-                            <div class="ion-hide-md-down addon-calendar-day-events" *ngIf="day.filteredEvents">
-                                <ng-container *ngFor="let event of day.filteredEvents | slice:0:4; let index = index">
-                                    <div *ngIf="index < 3 || day.filteredEvents.length == 4" class="addon-calendar-event"
-                                        [class.addon-calendar-event-past]="event.ispast" role="button" tabindex="0"
-                                        (ariaButtonClick)="eventClicked(event, $event)">
-                                        <span class="calendar_event_type calendar_event_{{event.formattedType}}"></span>
-                                        <ion-icon *ngIf="event.offline && !event.deleted" name="fas-clock"
-                                            [attr.aria-label]="'core.notsent' | translate"></ion-icon>
-                                        <ion-icon *ngIf="event.deleted" name="fas-trash"
-                                            [attr.aria-label]="'core.deletedoffline' | translate"></ion-icon>
-                                        <span class="addon-calendar-event-time">
-                                            {{ event.timestart * 1000 | coreFormatDate: timeFormat }}
-                                        </span>
-                                        <!-- Add the icon title so accessibility tools read it. -->
-                                        <span class="sr-only">
-                                            {{ 'addon.calendar.type' + event.formattedType | translate }}
-                                            <span class="sr-only" *ngIf="event.iconTitle">
-                                                {{ event.iconTitle }}
-                                            </span>
-                                        </span>
-                                        <span class="addon-calendar-event-name">{{event.name}}</span>
-                                    </div>
-                                </ng-container>
-                                <p *ngIf="day.filteredEvents.length > 4" class="addon-calendar-day-more">
-                                    <b>{{ 'core.nummore' | translate:{$a: day.filteredEvents.length - 3} }}</b>
+        <core-swipe-slides [manager]="manager">
+            <ng-template let-month="item">
+                <!-- Calendar view. -->
+                <ion-grid class="addon-calendar-months" role="table" aria-describedby="addon-calendar-monthname">
+                    <div role="rowgroup">
+                        <!-- List of days. -->
+                        <ion-row role="row">
+                            <ion-col class="ion-text-center addon-calendar-weekday" *ngFor="let day of month.weekDays" role="columnheader">
+                                <span class="sr-only">{{ day.fullname | translate }}</span>
+                                <span class="ion-hide-md-up" aria-hidden="true">{{ day.shortname | translate }}</span>
+                                <span class="ion-hide-md-down" aria-hidden="true">{{ day.fullname | translate }}</span>
+                            </ion-col>
+                        </ion-row>
+                    </div>
+                    <div role="rowgroup">
+                        <!-- Weeks. -->
+                        <ion-row *ngFor="let week of month.weeks" class="addon-calendar-week" role="row">
+                            <!-- Empty slots (first week). -->
+                            <ion-col *ngFor="let value of week.prepadding" class="dayblank addon-calendar-day" role="cell">
+                            </ion-col>
+                            <ion-col *ngFor="let day of week.days" class="addon-calendar-day ion-text-center" [ngClass]='{
+                                    "hasevents": day.hasevents,
+                                    "today": month.isCurrentMonth && day.istoday,
+                                    "weekend": day.isweekend,
+                                    "duration_finish": day.haslastdayofevent
+                                }' [class.addon-calendar-event-past-day]="month.isPastMonth || day.ispast" role="cell" tabindex="0"
+                                (ariaButtonClick)="dayClicked(day.mday)">
+                                <p class="addon-calendar-day-number" role="button">
+                                    <span aria-hidden="true">{{ day.mday }}</span>
+                                    <span class="sr-only">{{ day.periodName | translate }}</span>
                                 </p>
-                            </div>
-                        </ion-col>
-                        <!-- Empty slots (last week). -->
-                        <ion-col *ngFor="let value of week.postpadding" class="dayblank addon-calendar-day" role="cell">
-                        </ion-col>
-                    </ion-row>
-                </div>
-            </ion-grid>
-        </ng-template>
-    </core-swipe-slides>
+
+                                <!-- In phone, display some dots to indicate the type of events. -->
+                                <p class="ion-hide-md-up addon-calendar-dot-types"><span *ngFor="let type of day.calendareventtypes"
+                                        class="calendar_event_type calendar_event_{{type}}"></span></p>
+
+                                <!-- In tablet, display list of events. -->
+                                <div class="ion-hide-md-down addon-calendar-day-events" *ngIf="day.filteredEvents">
+                                    <ng-container *ngFor="let event of day.filteredEvents | slice:0:4; let index = index">
+                                        <div *ngIf="index < 3 || day.filteredEvents.length == 4" class="addon-calendar-event"
+                                            [class.addon-calendar-event-past]="event.ispast" role="button" tabindex="0"
+                                            (ariaButtonClick)="eventClicked(event, $event)">
+                                            <span class="calendar_event_type calendar_event_{{event.formattedType}}"></span>
+                                            <ion-icon *ngIf="event.offline && !event.deleted" name="fas-clock"
+                                                [attr.aria-label]="'core.notsent' | translate"></ion-icon>
+                                            <ion-icon *ngIf="event.deleted" name="fas-trash"
+                                                [attr.aria-label]="'core.deletedoffline' | translate"></ion-icon>
+                                            <span class="addon-calendar-event-time">
+                                                {{ event.timestart * 1000 | coreFormatDate: timeFormat }}
+                                            </span>
+                                            <!-- Add the icon title so accessibility tools read it. -->
+                                            <span class="sr-only">
+                                                {{ 'addon.calendar.type' + event.formattedType | translate }}
+                                                <span class="sr-only" *ngIf="event.iconTitle">
+                                                    {{ event.iconTitle }}
+                                                </span>
+                                            </span>
+                                            <span class="addon-calendar-event-name">{{event.name}}</span>
+                                        </div>
+                                    </ng-container>
+                                    <p *ngIf="day.filteredEvents.length > 4" class="addon-calendar-day-more">
+                                        <b>{{ 'core.nummore' | translate:{$a: day.filteredEvents.length - 3} }}</b>
+                                    </p>
+                                </div>
+                            </ion-col>
+                            <!-- Empty slots (last week). -->
+                            <ion-col *ngFor="let value of week.postpadding" class="dayblank addon-calendar-day" role="cell">
+                            </ion-col>
+                        </ion-row>
+                    </div>
+                </ion-grid>
+            </ng-template>
+        </core-swipe-slides>
+    </div>
 
 </core-loading>
diff --git a/src/addons/calendar/components/calendar/calendar.scss b/src/addons/calendar/components/calendar/calendar.scss
index 35cd3ccbd..7a358700e 100644
--- a/src/addons/calendar/components/calendar/calendar.scss
+++ b/src/addons/calendar/components/calendar/calendar.scss
@@ -3,6 +3,11 @@
 :host {
     --addon-calendar-blank-day-background-color: var(--light);
 
+    .core-swipe-slides-container ion-grid {
+        flex: none;
+        width: 100%;
+    }
+
     .addon-calendar-navigation {
         padding-top: 5px;
         padding-left: 10px;
diff --git a/src/addons/calendar/pages/day/day.html b/src/addons/calendar/pages/day/day.html
index 62939f984..d245f7258 100644
--- a/src/addons/calendar/pages/day/day.html
+++ b/src/addons/calendar/pages/day/day.html
@@ -27,78 +27,80 @@
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
-    <core-loading [hideUntil]="loaded">
-        <!-- Period name and arrows to navigate. -->
-        <ion-grid class="ion-no-padding safe-area-padding">
-            <ion-row class="ion-align-items-center">
-                <ion-col class="ion-text-start">
-                    <ion-button fill="clear" (click)="loadPrevious()" [attr.aria-label]="'addon.calendar.dayprev' | translate">
-                        <ion-icon name="fas-chevron-left" slot="icon-only" aria-hidden="true"></ion-icon>
-                    </ion-button>
-                </ion-col>
-                <ion-col class="ion-text-center addon-calendar-period">
-                    <h3>{{ periodName }}</h3>
-                </ion-col>
-                <ion-col class="ion-text-end">
-                    <ion-button fill="clear" (click)="loadNext()" [attr.aria-label]="'addon.calendar.daynext' | translate">
-                        <ion-icon name="fas-chevron-right" slot="icon-only" aria-hidden="true"></ion-icon>
-                    </ion-button>
-                </ion-col>
-            </ion-row>
-        </ion-grid>
+    <core-loading [hideUntil]="loaded" class="core-loading-full-height">
+        <div class="core-swipe-slides-container">
+            <!-- Period name and arrows to navigate. -->
+            <ion-grid class="ion-no-padding safe-area-padding">
+                <ion-row class="ion-align-items-center">
+                    <ion-col class="ion-text-start">
+                        <ion-button fill="clear" (click)="loadPrevious()" [attr.aria-label]="'addon.calendar.dayprev' | translate">
+                            <ion-icon name="fas-chevron-left" slot="icon-only" aria-hidden="true"></ion-icon>
+                        </ion-button>
+                    </ion-col>
+                    <ion-col class="ion-text-center addon-calendar-period">
+                        <h3>{{ periodName }}</h3>
+                    </ion-col>
+                    <ion-col class="ion-text-end">
+                        <ion-button fill="clear" (click)="loadNext()" [attr.aria-label]="'addon.calendar.daynext' | translate">
+                            <ion-icon name="fas-chevron-right" slot="icon-only" aria-hidden="true"></ion-icon>
+                        </ion-button>
+                    </ion-col>
+                </ion-row>
+            </ion-grid>
 
-        <core-swipe-slides [manager]="manager">
-            <ng-template let-day="item">
-                <core-loading [hideUntil]="day.loaded" class="safe-area-padding">
-                    <!-- There is data to be synchronized -->
-                    <ion-card class="core-warning-card" *ngIf="day.hasOffline">
-                        <ion-item>
-                            <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
-                            <ion-label>{{ 'core.hasdatatosync' | translate:{$a: 'core.day' | translate} }}</ion-label>
-                        </ion-item>
-                    </ion-card>
-
-                    <core-empty-box *ngIf="!day.filteredEvents || !day.filteredEvents.length" icon="fas-calendar" inline="true"
-                        [message]="'addon.calendar.noevents' | translate">
-                    </core-empty-box>
-
-                    <ion-list *ngIf="day.filteredEvents && day.filteredEvents.length" class="ion-no-margin">
-                        <ng-container *ngFor="let event of day.filteredEvents">
-                            <ion-item class="addon-calendar-event ion-text-wrap" [attr.aria-label]="event.name"
-                                (click)="gotoEvent(event.id)" [class.item-dimmed]="event.ispast"
-                                [ngClass]="['addon-calendar-eventtype-'+event.eventtype]" button detail="true">
-                                <core-mod-icon *ngIf="event.moduleIcon" [modicon]="event.moduleIcon" slot="start" [showAlt]="false"
-                                    [modname]="event.modulename" [componentId]="event.instance">
-                                </core-mod-icon>
-                                <ion-icon *ngIf="event.eventIcon && !event.moduleIcon" [name]="event.eventIcon" slot="start"
-                                    aria-hidden="true">
-                                </ion-icon>
-                                <ion-label>
-                                    <!-- Add the icon title so accessibility tools read it. -->
-                                    <span class="sr-only">
-                                        {{ 'addon.calendar.type' + event.formattedType | translate }}
-                                        <span class="sr-only" *ngIf="event.moduleIcon && event.iconTitle">{{ event.iconTitle }}</span>
-                                    </span>
-                                    <p class="item-heading">
-                                        <core-format-text [text]="event.name" [contextLevel]="event.contextLevel"
-                                            [contextInstanceId]="event.contextInstanceId"></core-format-text>
-                                    </p>
-                                    <p [innerHTML]="event.formattedtime"></p>
-                                </ion-label>
-                                <ion-note *ngIf="event.offline && !event.deleted" slot="end">
-                                    <ion-icon name="fas-clock" aria-hidden="true"></ion-icon>
-                                    <span class="ion-text-wrap">{{ 'core.notsent' | translate }}</span>
-                                </ion-note>
-                                <ion-note *ngIf="event.deleted" slot="end">
-                                    <ion-icon name="fas-trash" aria-hidden="true"></ion-icon>
-                                    <span class="ion-text-wrap">{{ 'core.deletedoffline' | translate }}</span>
-                                </ion-note>
+            <core-swipe-slides [manager]="manager">
+                <ng-template let-day="item">
+                    <core-loading [hideUntil]="day.loaded" class="safe-area-padding">
+                        <!-- There is data to be synchronized -->
+                        <ion-card class="core-warning-card" *ngIf="day.hasOffline">
+                            <ion-item>
+                                <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
+                                <ion-label>{{ 'core.hasdatatosync' | translate:{$a: 'core.day' | translate} }}</ion-label>
                             </ion-item>
-                        </ng-container>
-                    </ion-list>
-                </core-loading>
-            </ng-template>
-        </core-swipe-slides>
+                        </ion-card>
+
+                        <core-empty-box *ngIf="!day.filteredEvents || !day.filteredEvents.length" icon="fas-calendar" inline="true"
+                            [message]="'addon.calendar.noevents' | translate">
+                        </core-empty-box>
+
+                        <ion-list *ngIf="day.filteredEvents && day.filteredEvents.length" class="ion-no-margin">
+                            <ng-container *ngFor="let event of day.filteredEvents">
+                                <ion-item class="addon-calendar-event ion-text-wrap" [attr.aria-label]="event.name"
+                                    (click)="gotoEvent(event.id)" [class.item-dimmed]="event.ispast"
+                                    [ngClass]="['addon-calendar-eventtype-'+event.eventtype]" button detail="true">
+                                    <core-mod-icon *ngIf="event.moduleIcon" [modicon]="event.moduleIcon" slot="start" [showAlt]="false"
+                                        [modname]="event.modulename" [componentId]="event.instance">
+                                    </core-mod-icon>
+                                    <ion-icon *ngIf="event.eventIcon && !event.moduleIcon" [name]="event.eventIcon" slot="start"
+                                        aria-hidden="true">
+                                    </ion-icon>
+                                    <ion-label>
+                                        <!-- Add the icon title so accessibility tools read it. -->
+                                        <span class="sr-only">
+                                            {{ 'addon.calendar.type' + event.formattedType | translate }}
+                                            <span class="sr-only" *ngIf="event.moduleIcon && event.iconTitle">{{ event.iconTitle }}</span>
+                                        </span>
+                                        <p class="item-heading">
+                                            <core-format-text [text]="event.name" [contextLevel]="event.contextLevel"
+                                                [contextInstanceId]="event.contextInstanceId"></core-format-text>
+                                        </p>
+                                        <p [innerHTML]="event.formattedtime"></p>
+                                    </ion-label>
+                                    <ion-note *ngIf="event.offline && !event.deleted" slot="end">
+                                        <ion-icon name="fas-clock" aria-hidden="true"></ion-icon>
+                                        <span class="ion-text-wrap">{{ 'core.notsent' | translate }}</span>
+                                    </ion-note>
+                                    <ion-note *ngIf="event.deleted" slot="end">
+                                        <ion-icon name="fas-trash" aria-hidden="true"></ion-icon>
+                                        <span class="ion-text-wrap">{{ 'core.deletedoffline' | translate }}</span>
+                                    </ion-note>
+                                </ion-item>
+                            </ng-container>
+                        </ion-list>
+                    </core-loading>
+                </ng-template>
+            </core-swipe-slides>
+        </div>
     </core-loading>
 
     <!-- Create a calendar event. -->
diff --git a/src/addons/calendar/pages/day/day.scss b/src/addons/calendar/pages/day/day.scss
index d3fdad33c..145eccfb8 100644
--- a/src/addons/calendar/pages/day/day.scss
+++ b/src/addons/calendar/pages/day/day.scss
@@ -1,4 +1,9 @@
 :host {
+    .core-swipe-slides-container ion-grid {
+        flex: none;
+        width: 100%;
+    }
+
     .addon-calendar-period {
         flex-grow: 3;
         h3 {
@@ -6,8 +11,4 @@
             font-size: 1.2rem;
         }
     }
-
-    core-swipe-slides {
-        --swipe-slides-min-height: calc(100% - 52px);
-    }
 }
diff --git a/src/addons/mod/book/pages/contents/contents.html b/src/addons/mod/book/pages/contents/contents.html
index f5a6d6f4a..6e6334aab 100644
--- a/src/addons/mod/book/pages/contents/contents.html
+++ b/src/addons/mod/book/pages/contents/contents.html
@@ -21,16 +21,16 @@
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
-    <core-loading [hideUntil]="loaded">
+    <core-loading [hideUntil]="loaded" class="core-loading-full-height">
+        <div class="safe-area-padding-horizontal core-swipe-slides-container">
 
-        <ion-card class="core-warning-card" *ngIf="warning">
-            <ion-item>
-                <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
-                <ion-label><span [innerHTML]="warning"></span></ion-label>
-            </ion-item>
-        </ion-card>
+            <ion-card class="core-warning-card" *ngIf="warning">
+                <ion-item>
+                    <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
+                    <ion-label><span [innerHTML]="warning"></span></ion-label>
+                </ion-item>
+            </ion-card>
 
-        <div class="safe-area-padding-horizontal">
             <core-navigation-bar *ngIf="displayNavBar" [items]="navigationItems" [showTitles]="displayTitlesInNavBar"
                 previousTranslate="addon.mod_book.navprevtitle" nextTranslate="addon.mod_book.navnexttitle"
                 (action)="changeChapter($event.id)">
diff --git a/src/addons/mod/book/pages/contents/contents.scss b/src/addons/mod/book/pages/contents/contents.scss
new file mode 100644
index 000000000..de654bcac
--- /dev/null
+++ b/src/addons/mod/book/pages/contents/contents.scss
@@ -0,0 +1,7 @@
+:host {
+    .core-swipe-slides-container {
+        ion-card, core-navigation-bar {
+            flex: none;
+        }
+    }
+}
diff --git a/src/addons/mod/book/pages/contents/contents.ts b/src/addons/mod/book/pages/contents/contents.ts
index 0f2444198..36af98196 100644
--- a/src/addons/mod/book/pages/contents/contents.ts
+++ b/src/addons/mod/book/pages/contents/contents.ts
@@ -47,6 +47,7 @@ import {
 @Component({
     selector: 'page-addon-mod-book-contents',
     templateUrl: 'contents.html',
+    styleUrls: ['contents.scss'],
 })
 export class AddonModBookContentsPage implements OnInit, OnDestroy {
 
diff --git a/src/core/components/loading/loading.scss b/src/core/components/loading/loading.scss
index 6f439e64e..bd77cefd5 100644
--- a/src/core/components/loading/loading.scss
+++ b/src/core/components/loading/loading.scss
@@ -71,6 +71,10 @@
         }
     }
 
+    &.core-loading-full-height .core-loading-content {
+        height: 100%;
+    }
+
     &.safe-area-padding:not(.core-loading-inline) .core-loading-content,
     &.safe-area-padding-horizontal:not(.core-loading-inline) .core-loading-content {
         @include safe-area-padding-horizontal(0px, 0px);
diff --git a/src/core/components/swipe-slides/swipe-slides.scss b/src/core/components/swipe-slides/swipe-slides.scss
index 71cf2f9f6..90b467e57 100644
--- a/src/core/components/swipe-slides/swipe-slides.scss
+++ b/src/core/components/swipe-slides/swipe-slides.scss
@@ -1,8 +1,6 @@
 :host {
-    --swipe-slides-min-height: auto;
-
     ion-slides {
-        min-height: var(--swipe-slides-min-height);
+        height: 100%;
     }
 
     ion-slide {
diff --git a/src/core/components/swipe-slides/swipe-slides.ts b/src/core/components/swipe-slides/swipe-slides.ts
index 139393670..a169714e4 100644
--- a/src/core/components/swipe-slides/swipe-slides.ts
+++ b/src/core/components/swipe-slides/swipe-slides.ts
@@ -181,17 +181,8 @@ export class CoreSwipeSlidesComponent<Item = unknown> implements OnChanges, OnDe
 
         this.onWillChange.emit(currentItemData);
 
-        if (this.options.scrollOnChange !== 'top') {
-            return;
-        }
-
-        // Scroll top. This can be improved in the future to keep the scroll for each slide.
-        const scrollElement = await this.content?.getScrollElement();
-
-        if (!scrollElement || CoreDomUtils.isElementOutsideOfScreen(scrollElement, this.hostElement, VerticalPoint.TOP)) {
-            // Scroll to top.
-            this.hostElement.scrollIntoView({ behavior: 'smooth' });
-        }
+        // Apply scroll on change. In some devices it's too soon to do it, that's why it's done again in DidChange.
+        await this.applyScrollOnChange();
     }
 
     /**
@@ -204,6 +195,27 @@ export class CoreSwipeSlidesComponent<Item = unknown> implements OnChanges, OnDe
         }
 
         this.onDidChange.emit(currentItemData);
+
+        await this.applyScrollOnChange();
+    }
+
+    /**
+     * Treat scroll on change.
+     *
+     * @return Promise resolved when done.
+     */
+    protected async applyScrollOnChange(): Promise<void> {
+        if (this.options.scrollOnChange !== 'top') {
+            return;
+        }
+
+        // Scroll top. This can be improved in the future to keep the scroll for each slide.
+        const scrollElement = await this.content?.getScrollElement();
+
+        if (!scrollElement || CoreDomUtils.isElementOutsideOfScreen(scrollElement, this.hostElement, VerticalPoint.TOP)) {
+            // Scroll to top.
+            this.hostElement.scrollIntoView({ behavior: 'smooth' });
+        }
     }
 
     /**
diff --git a/src/core/features/login/pages/site-policy/site-policy.html b/src/core/features/login/pages/site-policy/site-policy.html
index 05a67d683..af2cd7267 100644
--- a/src/core/features/login/pages/site-policy/site-policy.html
+++ b/src/core/features/login/pages/site-policy/site-policy.html
@@ -10,7 +10,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <core-loading [hideUntil]="policyLoaded">
+    <core-loading [hideUntil]="policyLoaded" class="core-loading-full-height">
         <ion-list *ngIf="sitePolicy">
             <ion-item class="ion-text-wrap">
                 <ion-label>
diff --git a/src/core/features/login/pages/site-policy/site-policy.scss b/src/core/features/login/pages/site-policy/site-policy.scss
index f54f35631..fa7bca312 100644
--- a/src/core/features/login/pages/site-policy/site-policy.scss
+++ b/src/core/features/login/pages/site-policy/site-policy.scss
@@ -18,9 +18,3 @@
         }
     }
 }
-
-:host core-loading ::ng-deep {
-    .core-loading-content {
-        height: 100%;
-    }
-}
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index c0d3691c8..ff9231e33 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -1581,3 +1581,14 @@ ion-app.md .collapsible-title h1 {
 body.core-iframe-fullscreen ion-content {
     --offset-top: 0px !important;
 }
+
+// To make core-swipe-slides fill the remaining height.
+.core-swipe-slides-container {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+
+    core-swipe-slides {
+        flex-grow: 1;
+    }
+}

From f668f874a5479f9ec85c5df47bf06287865d1a5f Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 22 Feb 2022 08:55:07 +0100
Subject: [PATCH 0571/1008] MOBILE-3926 core: Fix swipe navigation

---
 .../swipe-navigation-items-manager.ts         |  48 ++++---
 .../swipe-navigation-items-manager.test.ts    | 135 ++++++++++++++++++
 src/core/directives/swipe-navigation.ts       |  75 +++++-----
 3 files changed, 197 insertions(+), 61 deletions(-)
 create mode 100644 src/core/classes/tests/swipe-navigation-items-manager.test.ts

diff --git a/src/core/classes/items-management/swipe-navigation-items-manager.ts b/src/core/classes/items-management/swipe-navigation-items-manager.ts
index 2548b7b7d..846d4e147 100644
--- a/src/core/classes/items-management/swipe-navigation-items-manager.ts
+++ b/src/core/classes/items-management/swipe-navigation-items-manager.ts
@@ -39,21 +39,21 @@ export class CoreSwipeNavigationItemsManager<
      * Navigate to the next item.
      */
     async navigateToNextItem(): Promise<void> {
-        await this.navigateToItemBy(-1, 'back');
+        await this.navigateToItemBy(1, 'forward');
     }
 
     /**
      * Navigate to the previous item.
      */
     async navigateToPreviousItem(): Promise<void> {
-        await this.navigateToItemBy(1, 'forward');
+        await this.navigateToItemBy(-1, 'back');
     }
 
     /**
      * Has a next item.
      */
     async hasNextItem(): Promise<boolean> {
-        const item = await this.getItemBy(-1);
+        const item = await this.getItemBy(1);
 
         return !!item;
     }
@@ -62,7 +62,7 @@ export class CoreSwipeNavigationItemsManager<
      * Has a previous item.
      */
     async hasPreviousItem(): Promise<boolean> {
-        const item = await this.getItemBy(1);
+        const item = await this.getItemBy(-1);
 
         return !!item;
     }
@@ -100,13 +100,7 @@ export class CoreSwipeNavigationItemsManager<
      * @param animationDirection Animation direction.
      */
     protected async navigateToItemBy(delta: number, animationDirection: 'forward' | 'back'): Promise<void> {
-        let item: Item | null;
-
-        do {
-            item = await this.getItemBy(delta);
-
-            delta += delta > 0 ? 1 : -1;
-        } while (item && this.skipItemInSwipe(item));
+        const item = await this.getItemBy(delta);
 
         if (!item) {
             return;
@@ -122,25 +116,41 @@ export class CoreSwipeNavigationItemsManager<
      */
     protected async getItemBy(delta: number): Promise<Item | null> {
         const items = this.getSource().getItems();
-
-        // Get selected item.
         const selectedIndex = (this.selectedItem && items?.indexOf(this.selectedItem)) ?? -1;
-        const nextIndex = selectedIndex + delta;
 
-        if (selectedIndex === -1 || nextIndex < 0) {
+        if (selectedIndex === -1 || items === null) {
             return null;
         }
 
-        // Get item by delta.
-        const item = items?.[nextIndex] ?? null;
+        const deltaStep = delta > 0 ? 1 : -1;
+        let nextIndex = selectedIndex;
+        let deltaMoved = 0;
 
-        if (!item && !this.getSource().isCompleted()) {
+        while (deltaMoved !== delta) {
+            nextIndex += deltaStep;
+
+            if (nextIndex < 0 || nextIndex >= items.length) {
+                break;
+            }
+
+            if (this.skipItemInSwipe(items[nextIndex])) {
+                continue;
+            }
+
+            deltaMoved += deltaStep;
+        }
+
+        if (deltaMoved === delta) {
+            return items[nextIndex];
+        }
+
+        if (!this.getSource().isCompleted()) {
             await this.getSource().load();
 
             return this.getItemBy(delta);
         }
 
-        return item;
+        return null;
     }
 
     /**
diff --git a/src/core/classes/tests/swipe-navigation-items-manager.test.ts b/src/core/classes/tests/swipe-navigation-items-manager.test.ts
new file mode 100644
index 000000000..4603fe670
--- /dev/null
+++ b/src/core/classes/tests/swipe-navigation-items-manager.test.ts
@@ -0,0 +1,135 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { mock, mockSingleton } from '@/testing/utils';
+import { ActivatedRoute, ActivatedRouteSnapshot, UrlSegment } from '@angular/router';
+import { CoreRoutedItemsManagerSource } from '@classes/items-management/routed-items-manager-source';
+import { CoreSwipeNavigationItemsManager } from '@classes/items-management/swipe-navigation-items-manager';
+import { CoreNavigator } from '@services/navigator';
+
+interface Item {
+    path: string;
+}
+
+class StubSource extends CoreRoutedItemsManagerSource<Item> {
+
+    stubItems: Item[];
+
+    constructor(stubItems: Item[] = []) {
+        super();
+
+        this.stubItems = stubItems;
+    }
+
+    getItemPath(item: Item): string {
+        return item.path;
+    }
+
+    protected async loadPageItems(): Promise<{ items: Item[] }> {
+        return { items: this.stubItems };
+    }
+
+}
+
+class StubManager extends CoreSwipeNavigationItemsManager {
+
+    skipItemInSwipe(item: Item): boolean {
+        return item.path.includes('skip');
+    }
+
+}
+
+describe('CoreSwipeNavigationItemsManager', () => {
+
+    let items: Item[];
+    let currentPath: string;
+    let source: StubSource;
+    let instance: StubManager;
+
+    beforeEach(async () => {
+        mockSingleton(CoreNavigator, {
+            navigate: jest.fn(),
+            getCurrentRoute: () => mock<ActivatedRoute>({
+                snapshot: mock<ActivatedRouteSnapshot>({
+                    url: [mock<UrlSegment>({ path: currentPath })],
+                }),
+            }),
+        });
+
+        items = [];
+        currentPath = '';
+        source = new StubSource(items);
+        instance = new StubManager(source);
+    });
+
+    it('navigates to next item', async () => {
+        // Arrange.
+        currentPath = 'foo';
+        items.push({ path: 'foo' });
+        items.push({ path: 'bar' });
+
+        await source.load();
+
+        // Act.
+        await instance.navigateToNextItem();
+
+        // Assert.
+        expect(CoreNavigator.navigate).toHaveBeenCalledWith('../bar', { animationDirection: 'forward', params: {}, replace: true });
+    });
+
+    it('navigates to previous item', async () => {
+        // Arrange.
+        currentPath = 'bar';
+        items.push({ path: 'foo' });
+        items.push({ path: 'bar' });
+
+        await source.load();
+
+        // Act.
+        await instance.navigateToPreviousItem();
+
+        // Assert.
+        expect(CoreNavigator.navigate).toHaveBeenCalledWith('../foo', { animationDirection: 'back', params: {}, replace: true });
+    });
+
+    it('skips items', async () => {
+        // Arrange.
+        currentPath = 'foo';
+        items.push({ path: 'foo' });
+        items.push({ path: 'skip' });
+        items.push({ path: 'bar' });
+
+        await source.load();
+
+        // Act.
+        await instance.navigateToNextItem();
+
+        // Assert.
+        expect(CoreNavigator.navigate).toHaveBeenCalledWith('../bar', { animationDirection: 'forward', params: {}, replace: true });
+    });
+
+    it('checks items', async () => {
+        // Arrange.
+        currentPath = 'foo';
+        items.push({ path: 'foo' });
+        items.push({ path: 'bar' });
+
+        await source.load();
+
+        // Assert.
+        await expect(instance.hasNextItem()).resolves.toBe(true);
+        await expect(instance.hasPreviousItem()).resolves.toBe(false);
+    });
+
+});
diff --git a/src/core/directives/swipe-navigation.ts b/src/core/directives/swipe-navigation.ts
index 31caacaef..0a7bec5bb 100644
--- a/src/core/directives/swipe-navigation.ts
+++ b/src/core/directives/swipe-navigation.ts
@@ -14,7 +14,7 @@
 
 import {  AfterViewInit, Directive, ElementRef, Input, OnDestroy } from '@angular/core';
 import { CoreSwipeNavigationItemsManager } from '@classes/items-management/swipe-navigation-items-manager';
-import { Gesture } from '@ionic/angular';
+import { Gesture, GestureDetail } from '@ionic/angular';
 import { CoreScreen } from '@services/screen';
 import { GestureController } from '@singletons';
 
@@ -65,45 +65,7 @@ export class CoreSwipeNavigationDirective implements AfterViewInit, OnDestroy {
                 style.transform = `translateX(${ev.deltaX * SWIPE_FRICTION }px)`;
             },
             onEnd: (ev) => {
-                style.transition = '.5s ease-out';
-
-                if (ev.deltaX > ACTIVATION_THRESHOLD) {
-                    this.manager?.hasNextItem().then((hasNext) => {
-                        if (hasNext) {
-                            this.preventClickOnElement();
-
-                            style.transform = 'translateX(100%) !important';
-                            this.swipeRight();
-                        } else {
-                            style.transform = '';
-                        }
-
-                        return;
-                    });
-
-                    return;
-                }
-
-                if (ev.deltaX < -ACTIVATION_THRESHOLD) {
-                    this.manager?.hasPreviousItem().then((hasPrevious) => {
-                        if (hasPrevious) {
-
-                            this.preventClickOnElement();
-
-                            style.transform = 'translateX(-100%) !important';
-                            this.swipeLeft();
-                        } else {
-                            style.transform = '';
-                        }
-
-                        return;
-                    });
-
-                    return;
-                }
-
-                style.transform = '';
-
+                this.onRelease(ev);
             },
         });
         this.swipeGesture.enable();
@@ -117,7 +79,7 @@ export class CoreSwipeNavigationDirective implements AfterViewInit, OnDestroy {
             return;
         }
 
-        this.manager?.navigateToPreviousItem();
+        this.manager?.navigateToNextItem();
     }
 
     /**
@@ -128,7 +90,7 @@ export class CoreSwipeNavigationDirective implements AfterViewInit, OnDestroy {
             return;
         }
 
-        this.manager?.navigateToNextItem();
+        this.manager?.navigateToPreviousItem();
     }
 
     /**
@@ -155,4 +117,33 @@ export class CoreSwipeNavigationDirective implements AfterViewInit, OnDestroy {
         this.swipeGesture?.destroy();
     }
 
+    /**
+     * Handle swipe release event.
+     *
+     * @param event Event.
+     */
+    protected async onRelease(event: GestureDetail): Promise<void> {
+        this.element.style.transition = '.5s ease-out';
+
+        if (event.deltaX > ACTIVATION_THRESHOLD && await this.manager?.hasPreviousItem()) {
+            this.preventClickOnElement();
+            this.swipeRight();
+
+            this.element.style.transform = 'translateX(100%) !important';
+
+            return;
+        }
+
+        if (event.deltaX < -ACTIVATION_THRESHOLD && await this.manager?.hasNextItem()) {
+            this.element.style.transform = 'translateX(-100%) !important';
+
+            this.preventClickOnElement();
+            this.swipeLeft();
+
+            return;
+        }
+
+        this.element.style.transform = '';
+    }
+
 }

From 2d541a2ff82cade5d351129df212f1ed31650fbc Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 22 Feb 2022 09:24:48 +0100
Subject: [PATCH 0572/1008] MOBILE-3780 attachments: Fix detect file size in
 Android

---
 .../components/attachments/attachments.scss   |  5 ++
 .../components/attachments/attachments.ts     | 10 ++-
 .../attachments/core-attachments.html         | 73 ++++++++++---------
 .../services/fileuploader-helper.ts           | 12 +--
 4 files changed, 54 insertions(+), 46 deletions(-)
 create mode 100644 src/core/components/attachments/attachments.scss

diff --git a/src/core/components/attachments/attachments.scss b/src/core/components/attachments/attachments.scss
new file mode 100644
index 000000000..4582f0e2b
--- /dev/null
+++ b/src/core/components/attachments/attachments.scss
@@ -0,0 +1,5 @@
+:host {
+    core-loading {
+        --loading-inline-min-height: 60px;
+    }
+}
diff --git a/src/core/components/attachments/attachments.ts b/src/core/components/attachments/attachments.ts
index 925d71de7..d8e1c6fa0 100644
--- a/src/core/components/attachments/attachments.ts
+++ b/src/core/components/attachments/attachments.ts
@@ -42,6 +42,7 @@ import { CoreUtils } from '@services/utils/utils';
 @Component({
     selector: 'core-attachments',
     templateUrl: 'core-attachments.html',
+    styleUrls: ['attachments.scss'],
 })
 export class CoreAttachmentsComponent implements OnInit {
 
@@ -59,16 +60,17 @@ export class CoreAttachmentsComponent implements OnInit {
     maxSubmissionsReadable?: string;
     unlimitedFiles?: boolean;
     fileTypes?: CoreFileUploaderTypeList;
+    loaded = false;
 
     /**
-     * Component being initialized.
+     * @inheritdoc
      */
-    ngOnInit(): void {
+    async ngOnInit(): Promise<void> {
         this.files = this.files || [];
         this.maxSize = this.maxSize !== null ? Number(this.maxSize) : NaN;
 
         if (this.maxSize === 0) {
-            this.getMaxSizeOfArea();
+            await this.getMaxSizeOfArea();
         } else if (this.maxSize > 0) {
             this.maxSizeReadable = CoreTextUtils.bytesToSize(this.maxSize, 2);
         } else if (this.maxSize === -1) {
@@ -90,6 +92,8 @@ export class CoreAttachmentsComponent implements OnInit {
         if (this.acceptedTypes && this.acceptedTypes != '*') {
             this.fileTypes = CoreFileUploader.prepareFiletypeList(this.acceptedTypes);
         }
+
+        this.loaded = true;
     }
 
     /**
diff --git a/src/core/components/attachments/core-attachments.html b/src/core/components/attachments/core-attachments.html
index f18d06124..3b5cd9371 100644
--- a/src/core/components/attachments/core-attachments.html
+++ b/src/core/components/attachments/core-attachments.html
@@ -1,37 +1,40 @@
-<ion-item class="ion-text-wrap">
-    <ion-label>
-        <span *ngIf="maxSubmissionsReadable">
-            {{ 'core.maxsizeandattachments' | translate:{$a: {size: maxSizeReadable, attachments: maxSubmissionsReadable} } }}
-        </span>
-        <span *ngIf="!maxSubmissionsReadable">{{ 'core.maxfilesize' | translate:{$a: maxSizeReadable} }}</span>
-        <span [core-mark-required]="required" class="core-mark-required"></span>
-    </ion-label>
-</ion-item>
-<ion-item class="ion-text-wrap" *ngIf="fileTypes && fileTypes.mimetypes && fileTypes.mimetypes.length">
-    <ion-label>
-        <p>{{ 'core.fileuploader.filesofthesetypes' | translate }}</p>
-        <ul class="list-with-style">
-            <li *ngFor="let typeInfo of fileTypes.info">
-                <strong *ngIf="typeInfo.name">{{typeInfo.name}} </strong>{{typeInfo.extlist}}
-            </li>
-        </ul>
-    </ion-label>
-</ion-item>
-<div *ngFor="let file of files; let index=index">
-    <!-- Files already attached to the submission, either in online or in offline. -->
-    <core-file *ngIf="!file.name" [file]="file" [component]="component" [componentId]="componentId" [canDelete]="true"
-        (onDelete)="delete(index, true)" [canDownload]="!file.offline">
-    </core-file>
+<core-loading [hideUntil]="loaded" [fullscreen]="false">
+    <ion-item class="ion-text-wrap">
+        <ion-label>
+            <span *ngIf="maxSubmissionsReadable">
+                {{ 'core.maxsizeandattachments' | translate:{$a: {size: maxSizeReadable, attachments: maxSubmissionsReadable} } }}
+            </span>
+            <span *ngIf="!maxSubmissionsReadable">{{ 'core.maxfilesize' | translate:{$a: maxSizeReadable} }}</span>
+            <span [core-mark-required]="required" class="core-mark-required"></span>
+        </ion-label>
+    </ion-item>
+    <ion-item class="ion-text-wrap" *ngIf="fileTypes && fileTypes.mimetypes && fileTypes.mimetypes.length">
+        <ion-label>
+            <p>{{ 'core.fileuploader.filesofthesetypes' | translate }}</p>
+            <ul class="list-with-style">
+                <li *ngFor="let typeInfo of fileTypes.info">
+                    <strong *ngIf="typeInfo.name">{{typeInfo.name}} </strong>{{typeInfo.extlist}}
+                </li>
+            </ul>
+        </ion-label>
+    </ion-item>
+    <div *ngFor="let file of files; let index=index">
+        <!-- Files already attached to the submission, either in online or in offline. -->
+        <core-file *ngIf="!file.name" [file]="file" [component]="component" [componentId]="componentId" [canDelete]="true"
+            (onDelete)="delete(index, true)" [canDownload]="!file.offline">
+        </core-file>
 
-    <!-- Files added to draft but not attached to submission yet. -->
-    <core-local-file *ngIf="file.name" [file]="file" [manage]="true" (onDelete)="delete(index, false)" (onRename)="renamed(index, $event)">
-    </core-local-file>
-</div>
+        <!-- Files added to draft but not attached to submission yet. -->
+        <core-local-file *ngIf="file.name" [file]="file" [manage]="true" (onDelete)="delete(index, false)"
+            (onRename)="renamed(index, $event)">
+        </core-local-file>
+    </div>
 
-<!-- Button to add more files. -->
-<ion-button expand="block"
-    *ngIf="unlimitedFiles || (maxSubmissions !== undefined && maxSubmissions >= 0 && files && files.length < maxSubmissions)"
-    class="ion-text-wrap ion-margin" (click)="add()">
-    <ion-icon name="fas-plus" slot="start" aria-hidden="true"></ion-icon>
-    {{ 'core.fileuploader.addfiletext' | translate }}
-</ion-button>
+    <!-- Button to add more files. -->
+    <ion-button expand="block"
+        *ngIf="unlimitedFiles || (maxSubmissions !== undefined && maxSubmissions >= 0 && files && files.length < maxSubmissions)"
+        class="ion-text-wrap ion-margin" (click)="add()">
+        <ion-icon name="fas-plus" slot="start" aria-hidden="true"></ion-icon>
+        {{ 'core.fileuploader.addfiletext' | translate }}
+    </ion-button>
+</core-loading>
diff --git a/src/core/features/fileuploader/services/fileuploader-helper.ts b/src/core/features/fileuploader/services/fileuploader-helper.ts
index 33b70931d..0aae60598 100644
--- a/src/core/features/fileuploader/services/fileuploader-helper.ts
+++ b/src/core/features/fileuploader/services/fileuploader-helper.ts
@@ -204,16 +204,12 @@ export class CoreFileUploaderHelperProvider {
 
         // Check that size isn't too large.
         if (maxSize !== undefined && maxSize != -1) {
-            try {
-                const fileEntry = await CoreFile.getExternalFile(path);
+            const fileEntry = await CoreFile.getExternalFile(path);
 
-                const fileData = await CoreFile.getFileObjectFromFileEntry(fileEntry);
+            const fileData = await CoreFile.getFileObjectFromFileEntry(fileEntry);
 
-                if (fileData.size > maxSize) {
-                    throw this.createMaxBytesError(maxSize, fileEntry.name);
-                }
-            } catch (error) {
-                // Ignore failures.
+            if (fileData.size > maxSize) {
+                throw this.createMaxBytesError(maxSize, fileEntry.name);
             }
         }
 

From 09862cba7c6f127054912c04a7523323e623e468 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 22 Feb 2022 12:41:32 +0100
Subject: [PATCH 0573/1008] MOBILE-3990 notifications: Support notification
 links

---
 .../notifications/notifications.module.ts     |  5 ++
 .../services/handlers/notifications-link.ts   | 49 ++++++++++++++
 .../services/handlers/preferences-link.ts     | 64 +++++++++++++++++++
 3 files changed, 118 insertions(+)
 create mode 100644 src/addons/notifications/services/handlers/notifications-link.ts
 create mode 100644 src/addons/notifications/services/handlers/preferences-link.ts

diff --git a/src/addons/notifications/notifications.module.ts b/src/addons/notifications/notifications.module.ts
index 7a4cac5df..d62457eea 100644
--- a/src/addons/notifications/notifications.module.ts
+++ b/src/addons/notifications/notifications.module.ts
@@ -28,6 +28,9 @@ import { AddonNotificationsSettingsHandler, AddonNotificationsSettingsHandlerSer
 import { CoreSitePreferencesRoutingModule } from '@features/settings/pages/site/site-routing';
 import { AddonNotificationsProvider } from './services/notifications';
 import { AddonNotificationsHelperProvider } from './services/notifications-helper';
+import { CoreContentLinksDelegate } from '@features/contentlinks/services/contentlinks-delegate';
+import { AddonNotificationsPreferencesLinkHandler } from './services/handlers/preferences-link';
+import { AddonNotificationsLinkHandler } from './services/handlers/notifications-link';
 
 export const ADDON_NOTIFICATIONS_SERVICES: Type<unknown>[] = [
     AddonNotificationsProvider,
@@ -63,6 +66,8 @@ const preferencesRoutes: Routes = [
                 CoreCronDelegate.register(AddonNotificationsCronHandler.instance);
                 CorePushNotificationsDelegate.registerClickHandler(AddonNotificationsPushClickHandler.instance);
                 CoreSettingsDelegate.registerHandler(AddonNotificationsSettingsHandler.instance);
+                CoreContentLinksDelegate.registerHandler(AddonNotificationsLinkHandler.instance);
+                CoreContentLinksDelegate.registerHandler(AddonNotificationsPreferencesLinkHandler.instance);
 
                 AddonNotificationsMainMenuHandler.initialize();
             },
diff --git a/src/addons/notifications/services/handlers/notifications-link.ts b/src/addons/notifications/services/handlers/notifications-link.ts
new file mode 100644
index 000000000..9d560d165
--- /dev/null
+++ b/src/addons/notifications/services/handlers/notifications-link.ts
@@ -0,0 +1,49 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { Injectable } from '@angular/core';
+
+import { CoreContentLinksHandlerBase } from '@features/contentlinks/classes/base-handler';
+import { CoreContentLinksAction } from '@features/contentlinks/services/contentlinks-delegate';
+import { CoreNavigator } from '@services/navigator';
+import { makeSingleton } from '@singletons';
+import { AddonNotificationsMainMenuHandlerService } from './mainmenu';
+
+/**
+ * Handler to treat links to notifications.
+ */
+@Injectable({ providedIn: 'root' })
+export class AddonNotificationsLinkHandlerService extends CoreContentLinksHandlerBase {
+
+    name = 'AddonNotificationsLinkHandler';
+    pattern = /\/message\/output\/popup\/notifications\.php/;
+    featureName = 'CoreMainMenuDelegate_AddonNotifications';
+
+    /**
+     * @inheritdoc
+     */
+    getActions(): CoreContentLinksAction[] {
+        return [{
+            action: (siteId: string): void => {
+                CoreNavigator.navigateToSitePath(AddonNotificationsMainMenuHandlerService.PAGE_NAME, {
+                    preferCurrentTab: false,
+                    siteId,
+                });
+            },
+        }];
+    }
+
+}
+
+export const AddonNotificationsLinkHandler = makeSingleton(AddonNotificationsLinkHandlerService);
diff --git a/src/addons/notifications/services/handlers/preferences-link.ts b/src/addons/notifications/services/handlers/preferences-link.ts
new file mode 100644
index 000000000..a2ab6da07
--- /dev/null
+++ b/src/addons/notifications/services/handlers/preferences-link.ts
@@ -0,0 +1,64 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { Injectable } from '@angular/core';
+
+import { CoreContentLinksHandlerBase } from '@features/contentlinks/classes/base-handler';
+import { CoreContentLinksAction } from '@features/contentlinks/services/contentlinks-delegate';
+import { CoreNavigator } from '@services/navigator';
+import { CoreSites } from '@services/sites';
+import { makeSingleton } from '@singletons';
+import { AddonNotificationsSettingsHandlerService } from './settings';
+
+/**
+ * Handler to treat links to notification preferences.
+ */
+@Injectable({ providedIn: 'root' })
+export class AddonNotificationsPreferencesLinkHandlerService extends CoreContentLinksHandlerBase {
+
+    name = 'AddonNotificationsPreferencesLinkHandler';
+    pattern = /\/message\/notificationpreferences\.php/;
+    checkAllUsers = true;
+    featureName = 'CoreMainMenuDelegate_AddonNotifications';
+
+    /**
+     * @inheritdoc
+     */
+    getActions(): CoreContentLinksAction[] {
+        return [{
+            action: (siteId: string): void => {
+                CoreNavigator.navigateToSitePath(`preferences/${AddonNotificationsSettingsHandlerService.PAGE_NAME}`, { siteId });
+            },
+        }];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async isEnabled(siteId: string, url: string, params: Record<string, string>): Promise<boolean> {
+        if (params.userid) {
+            // Check it's current user ID.
+            const site = await CoreSites.getSite(siteId);
+
+            if (Number(params.userid) !== site.getUserId()) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+}
+
+export const AddonNotificationsPreferencesLinkHandler = makeSingleton(AddonNotificationsPreferencesLinkHandlerService);

From 97915ddb90d06930b1d09058ea261903bcc503a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 21 Feb 2022 15:40:31 +0100
Subject: [PATCH 0574/1008] MOBILE-3833 styles: Fix warning cards icon colors
 on buttons

---
 src/theme/theme.base.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index ff9231e33..0b950dde8 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -740,7 +740,7 @@ body.core-iframe-fullscreen ion-router-outlet {
         ion-label {
             white-space: normal !important;
         }
-        ion-icon {
+        ion-item > ion-icon {
             color: var(--color-shade);
             @include margin-horizontal(null, 16px);
         }

From 42e368140746fa1c735701635c4529db551c7385 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 22 Feb 2022 15:34:42 +0100
Subject: [PATCH 0575/1008] MOBILE-3833 assign: Invalidate submission component
 before is null

---
 src/addons/mod/assign/components/index/index.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/addons/mod/assign/components/index/index.ts b/src/addons/mod/assign/components/index/index.ts
index c78728728..226d5e28a 100644
--- a/src/addons/mod/assign/components/index/index.ts
+++ b/src/addons/mod/assign/components/index/index.ts
@@ -109,7 +109,7 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
             AddonModAssignProvider.SUBMISSION_SAVED_EVENT,
             (data) => {
                 if (this.assign && data.assignmentId == this.assign.id && data.userId == this.currentUserId) {
-                // Assignment submission saved, refresh data.
+                    // Assignment submission saved, refresh data.
                     this.showLoadingAndRefresh(true, false);
                 }
             },
@@ -326,6 +326,8 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
         const promises: Promise<void>[] = [];
 
         promises.push(AddonModAssign.invalidateAssignmentData(this.courseId));
+        // Invalidate before component becomes null.
+        promises.push(this.submissionComponent?.invalidateAndRefresh(true) || Promise.resolve());
 
         if (this.assign) {
             promises.push(AddonModAssign.invalidateAllSubmissionData(this.assign.id));
@@ -335,9 +337,7 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
             }
         }
 
-        await Promise.all(promises).finally(() => {
-            this.submissionComponent?.invalidateAndRefresh(true);
-        });
+        await Promise.all(promises);
     }
 
     /**

From befee634ff62e9a3e36b666f8095f0d6f6764469 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 22 Feb 2022 17:03:41 +0100
Subject: [PATCH 0576/1008] MOBILE-3833 forum: Fix hasOffline flag on index
 page.

---
 src/addons/mod/forum/components/index/index.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/addons/mod/forum/components/index/index.ts b/src/addons/mod/forum/components/index/index.ts
index 40fda05ae..55ac9daaa 100644
--- a/src/addons/mod/forum/components/index/index.ts
+++ b/src/addons/mod/forum/components/index/index.ts
@@ -174,7 +174,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
                 // Check if there are replies for discussions stored in offline.
                 const hasOffline = await AddonModForumOffline.hasForumReplies(this.forum.id);
 
-                this.hasOffline = this.hasOffline || hasOffline;
+                this.hasOffline = this.hasOffline || hasOffline || this.hasOfflineRatings;
 
                 if (hasOffline) {
                     // Only update new fetched discussions.
@@ -258,6 +258,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
             if (this.forum && data.component == 'mod_forum' && data.ratingArea == 'post' &&
                     data.contextLevel == ContextLevel.MODULE && data.instanceId == this.forum.cmid) {
                 this.hasOfflineRatings = true;
+                this.hasOffline = true;
             }
         });
 
@@ -266,6 +267,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
                     data.contextLevel == ContextLevel.MODULE && data.instanceId == this.forum.cmid) {
                 this.hasOfflineRatings =
                     await CoreRatingOffline.hasRatings('mod_forum', 'post', ContextLevel.MODULE, this.forum.cmid);
+                this.hasOffline = this.hasOffline || this.hasOfflineRatings;
             }
         });
     }

From 3d2d99fb7dfa38ab31a9f7f3b676c169f67f8d24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 22 Feb 2022 22:50:00 +0100
Subject: [PATCH 0577/1008] MOBILE-3833 assign: Fix duplicated id

---
 .../assign/pages/submission-list/submission-list.html  | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/addons/mod/assign/pages/submission-list/submission-list.html b/src/addons/mod/assign/pages/submission-list/submission-list.html
index 40ad93441..09beab4e9 100644
--- a/src/addons/mod/assign/pages/submission-list/submission-list.html
+++ b/src/addons/mod/assign/pages/submission-list/submission-list.html
@@ -26,13 +26,11 @@
 
             <ion-list>
                 <ion-item class="ion-text-wrap" *ngIf="(groupInfo.separateGroups || groupInfo.visibleGroups)">
-                    <ion-label id="addon-assign-groupslabel" *ngIf="groupInfo.separateGroups">
-                        {{ 'core.groupsseparate' | translate }}
+                    <ion-label id="addon-assign-groupslabel-list">
+                        <ng-container *ngIf="groupInfo.separateGroups">{{'core.groupsseparate' | translate }}</ng-container>
+                        <ng-container *ngIf="groupInfo.visibleGroups">{{'core.groupsvisible' | translate }}</ng-container>
                     </ion-label>
-                    <ion-label id="addon-assign-groupslabel" *ngIf="groupInfo.visibleGroups">
-                        {{ 'core.groupsvisible' | translate }}
-                    </ion-label>
-                    <ion-select [(ngModel)]="groupId" (ionChange)="reloadSubmissions()" aria-labelledby="addon-assign-groupslabel"
+                    <ion-select [(ngModel)]="groupId" (ionChange)="reloadSubmissions()" aria-labelledby="addon-assign-groupslabel-list"
                         interface="action-sheet" slot="end" [interfaceOptions]="{header: 'core.group' | translate}">
                         <ion-select-option *ngFor="let groupOpt of groupInfo.groups" [value]="groupOpt.id">
                             {{groupOpt.name}}

From d4a9bd2ec59402c1a9c806d03355a8d2809ff385 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 22 Feb 2022 23:03:40 +0100
Subject: [PATCH 0578/1008] MOBILE-3833 course: Do not display course
 displayname on course page

---
 .../services/handlers/singleactivity-format.ts            | 8 +-------
 .../features/course/services/handlers/default-format.ts   | 8 +-------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/core/features/course/format/singleactivity/services/handlers/singleactivity-format.ts b/src/core/features/course/format/singleactivity/services/handlers/singleactivity-format.ts
index 8e4b1f6d3..999a1c08c 100644
--- a/src/core/features/course/format/singleactivity/services/handlers/singleactivity-format.ts
+++ b/src/core/features/course/format/singleactivity/services/handlers/singleactivity-format.ts
@@ -59,13 +59,7 @@ export class CoreCourseFormatSingleActivityHandlerService implements CoreCourseF
             return sections[0].modules[0].name;
         }
 
-        if (course.displayname) {
-            return course.displayname;
-        } else if (course.fullname) {
-            return course.fullname;
-        }
-
-        return '';
+        return course.fullname || '';
     }
 
     /**
diff --git a/src/core/features/course/services/handlers/default-format.ts b/src/core/features/course/services/handlers/default-format.ts
index 5a4833f15..ff60f6c39 100644
--- a/src/core/features/course/services/handlers/default-format.ts
+++ b/src/core/features/course/services/handlers/default-format.ts
@@ -40,13 +40,7 @@ export class CoreCourseFormatDefaultHandler implements CoreCourseFormatHandler {
      * @inheritdoc
      */
     getCourseTitle(course: CoreCourseAnyCourseData): string {
-        if (course.displayname) {
-            return course.displayname;
-        } else if (course.fullname) {
-            return course.fullname;
-        }
-
-        return '';
+        return course.fullname || '';
     }
 
     /**

From 55e2e5f3a1cc36397ecdc2db52499a4e353bec85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 22 Feb 2022 23:10:11 +0100
Subject: [PATCH 0579/1008] MOBILE-3833 assign: Add text wrap to badges

---
 .../components/submission/addon-mod-assign-submission.html   | 4 ++--
 src/addons/mod/assign/components/submission/submission.scss  | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
index 506fea6e4..7b0f32cf6 100644
--- a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
+++ b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
@@ -391,10 +391,10 @@
         </p>
     </ng-container>
     <p>
-        <ion-badge *ngIf="statusTranslated" [color]="statusColor">
+        <ion-badge *ngIf="statusTranslated" [color]="statusColor" class="ion-text-wrap ion-text-start">
             {{ statusTranslated }}
         </ion-badge>
-        <ion-badge class="ion-margin-start" *ngIf="gradingStatusTranslationId" [color]="gradingColor">
+        <ion-badge class="ion-text-wrap ion-text-start" *ngIf="gradingStatusTranslationId" [color]="gradingColor">
             {{ gradingStatusTranslationId | translate }}
         </ion-badge>
     </p>
diff --git a/src/addons/mod/assign/components/submission/submission.scss b/src/addons/mod/assign/components/submission/submission.scss
index 51e8c8838..935b96fe7 100644
--- a/src/addons/mod/assign/components/submission/submission.scss
+++ b/src/addons/mod/assign/components/submission/submission.scss
@@ -21,6 +21,11 @@
     .core-grading-summary .advancedgrade {
         display: none;
     }
+
+    ion-badge {
+        margin-left: 2px;
+        margin-right: 2px;
+    }
 }
 
 :host-context(body.dark) ::ng-deep {

From 0c167326ab9f4bba87ad280405e032c8c42a9bbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 22 Feb 2022 23:15:08 +0100
Subject: [PATCH 0580/1008] MOBILE-3833 survey: Improve survey success card
 look'n'feel

---
 .../components/index/addon-mod-survey-index.html      | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/addons/mod/survey/components/index/addon-mod-survey-index.html b/src/addons/mod/survey/components/index/addon-mod-survey-index.html
index 6f08add31..acafdf331 100644
--- a/src/addons/mod/survey/components/index/addon-mod-survey-index.html
+++ b/src/addons/mod/survey/components/index/addon-mod-survey-index.html
@@ -14,9 +14,14 @@
     </core-course-module-info>
 
     <!-- Survey already done -->
-    <ion-card class="ion-padding" *ngIf="survey && survey.surveydone">
-        <p class="ion-padding">{{ 'addon.mod_survey.surveycompletednograph' | translate }}</p>
-        <ion-button expand="block" [href]="module.url" core-link>
+    <ion-card class="core-success-card" *ngIf="survey && survey.surveydone">
+        <ion-item>
+            <ion-icon name="fas-check" slot="start" aria-hidden="true"></ion-icon>
+            <ion-label>
+                {{ 'addon.mod_survey.surveycompletednograph' | translate }}
+            </ion-label>
+        </ion-item>
+        <ion-button class="ion-margin" expand="block" [href]="module.url" core-link>
             <ion-icon name="fas-external-link-alt" slot="start" aria-hidden="true"></ion-icon>
             {{ 'addon.mod_survey.results' | translate }}
         </ion-button>

From 9d4c12083dcca4e1a10eb552fe56956e086e0d95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 22 Feb 2022 23:25:05 +0100
Subject: [PATCH 0581/1008] MOBILE-3833 chore: Improve toast grid

---
 src/theme/theme.base.scss | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 0b950dde8..064a3dcee 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -483,6 +483,16 @@ ion-loading {
     }
 }
 
+// Toasts.
+ion-toast {
+    --button-color: var(--primary-tint);
+    @include media-breakpoint-down(sm) {
+        &::part(container) {
+            flex-direction: column;
+        }
+    }
+}
+
 // Ionic list.
 ion-list {
     padding: 0 !important;

From dde78d9286d7bb00385d93a1bc8a144bb254e035 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 22 Feb 2022 11:42:36 +0100
Subject: [PATCH 0582/1008] MOBILE-3993 groups: Add a class to group data in UI

---
 src/addons/calendar/pages/edit-event/edit-event.html        | 2 +-
 src/addons/calendar/pages/event/event.html                  | 2 +-
 .../mod/assign/components/index/addon-mod-assign-index.html | 2 +-
 .../components/submission/addon-mod-assign-submission.html  | 4 +++-
 .../mod/assign/pages/submission-list/submission-list.html   | 6 ++++--
 src/addons/mod/bigbluebuttonbn/components/index/index.html  | 2 +-
 src/addons/mod/chat/pages/sessions/sessions.html            | 2 +-
 .../mod/data/components/index/addon-mod-data-index.html     | 2 +-
 src/addons/mod/data/pages/edit/edit.html                    | 2 +-
 src/addons/mod/data/pages/entry/entry.html                  | 2 +-
 .../feedback/components/index/addon-mod-feedback-index.html | 2 +-
 src/addons/mod/feedback/pages/attempts/attempts.html        | 3 ++-
 .../mod/feedback/pages/nonrespondents/nonrespondents.html   | 2 +-
 src/addons/mod/forum/components/index/index.html            | 2 +-
 src/addons/mod/forum/components/post/post.html              | 2 +-
 .../mod/forum/pages/new-discussion/new-discussion.html      | 2 +-
 .../mod/lesson/components/index/addon-mod-lesson-index.html | 3 ++-
 .../workshop/components/index/addon-mod-workshop-index.html | 2 +-
 18 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/src/addons/calendar/pages/edit-event/edit-event.html b/src/addons/calendar/pages/edit-event/edit-event.html
index 5e111568f..6c28db54b 100644
--- a/src/addons/calendar/pages/edit-event/edit-event.html
+++ b/src/addons/calendar/pages/edit-event/edit-event.html
@@ -95,7 +95,7 @@
                     </ion-label>
                 </ion-item>
                 <!-- Select the group. -->
-                <ion-item class="ion-text-wrap" *ngIf="!loadingGroups && groups.length > 0">
+                <ion-item class="ion-text-wrap core-edit-set-group" *ngIf="!loadingGroups && groups.length > 0">
                     <ion-label>
                         <p class="item-heading" [core-mark-required]="true">{{ 'core.group' | translate }}</p>
                     </ion-label>
diff --git a/src/addons/calendar/pages/event/event.html b/src/addons/calendar/pages/event/event.html
index 2719ab3c4..ae1306688 100644
--- a/src/addons/calendar/pages/event/event.html
+++ b/src/addons/calendar/pages/event/event.html
@@ -84,7 +84,7 @@
                     </p>
                 </ion-label>
             </ion-item>
-            <ion-item class="ion-text-wrap" *ngIf="groupName">
+            <ion-item class="ion-text-wrap core-groupname" *ngIf="groupName">
                 <ion-label>
                     <h2>{{ 'core.group' | translate}}</h2>
                     <p>{{ groupName }}</p>
diff --git a/src/addons/mod/assign/components/index/addon-mod-assign-index.html b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
index 44fce0030..8ae559539 100644
--- a/src/addons/mod/assign/components/index/addon-mod-assign-index.html
+++ b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
@@ -20,7 +20,7 @@
     <!-- User can view all submissions (teacher). -->
     <ng-container *ngIf="assign && canViewAllSubmissions">
         <ion-list class="core-list-align-detail-right">
-            <ion-item class="ion-text-wrap" *ngIf="(groupInfo.separateGroups || groupInfo.visibleGroups)">
+            <ion-item class="ion-text-wrap core-group-selector" *ngIf="(groupInfo.separateGroups || groupInfo.visibleGroups)">
                 <ion-label id="addon-assign-groupslabel">
                     <ng-container *ngIf="groupInfo.separateGroups">{{'core.groupsseparate' | translate }}</ng-container>
                     <ng-container *ngIf="groupInfo.visibleGroups">{{'core.groupsvisible' | translate }}</ng-container>
diff --git a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
index 7b0f32cf6..c8a116590 100644
--- a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
+++ b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
@@ -372,7 +372,9 @@
 <!-- Template to render some data regarding the submission status. -->
 <ng-template #submissionStatus>
     <ng-container *ngIf="assign && assign!.teamsubmission && lastAttempt">
-        <p *ngIf="lastAttempt!.submissiongroup && lastAttempt!.submissiongroupname">{{lastAttempt!.submissiongroupname}}</p>
+        <p *ngIf="lastAttempt!.submissiongroup && lastAttempt!.submissiongroupname" class="core-groupname">
+            {{lastAttempt!.submissiongroupname}}
+        </p>
         <ng-container *ngIf="assign!.preventsubmissionnotingroup &&
             !lastAttempt!.submissiongroup &&
             (!lastAttempt!.usergroups || lastAttempt!.usergroups.length <= 0)">
diff --git a/src/addons/mod/assign/pages/submission-list/submission-list.html b/src/addons/mod/assign/pages/submission-list/submission-list.html
index 09beab4e9..89ff9f3b9 100644
--- a/src/addons/mod/assign/pages/submission-list/submission-list.html
+++ b/src/addons/mod/assign/pages/submission-list/submission-list.html
@@ -25,7 +25,7 @@
             </core-empty-box>
 
             <ion-list>
-                <ion-item class="ion-text-wrap" *ngIf="(groupInfo.separateGroups || groupInfo.visibleGroups)">
+                <ion-item class="ion-text-wrap core-group-selector" *ngIf="(groupInfo.separateGroups || groupInfo.visibleGroups)">
                     <ion-label id="addon-assign-groupslabel-list">
                         <ng-container *ngIf="groupInfo.separateGroups">{{'core.groupsseparate' | translate }}</ng-container>
                         <ng-container *ngIf="groupInfo.visibleGroups">{{'core.groupsvisible' | translate }}</ng-container>
@@ -48,7 +48,9 @@
                                 {{ 'addon.mod_assign.hiddenuser' | translate }}{{submission.blindid}}
                             </p>
                             <p *ngIf="assign && assign!.teamsubmission">
-                                <span *ngIf="submission.groupname">{{submission.groupname}}</span>
+                                <span *ngIf="submission.groupname" class="core-groupname">
+                                    {{submission.groupname}}
+                                </span>
                                 <span *ngIf="assign!.preventsubmissionnotingroup && !submission.groupname && submission.noGroups
                                     && !submission.blindid" class="text-danger">
                                     {{ 'addon.mod_assign.noteam' | translate }}
diff --git a/src/addons/mod/bigbluebuttonbn/components/index/index.html b/src/addons/mod/bigbluebuttonbn/components/index/index.html
index 49ebe332d..39f7bd548 100644
--- a/src/addons/mod/bigbluebuttonbn/components/index/index.html
+++ b/src/addons/mod/bigbluebuttonbn/components/index/index.html
@@ -21,7 +21,7 @@
             </ion-item>
         </ion-card>
 
-        <ion-item class="ion-text-wrap">
+        <ion-item class="ion-text-wrap core-group-selector">
             <ion-label id="addon-bigbluebuttonbn-groupslabel">
                 <ng-container *ngIf="groupInfo.separateGroups">{{'core.groupsseparate' | translate }}</ng-container>
                 <ng-container *ngIf="groupInfo.visibleGroups">{{'core.groupsvisible' | translate }}</ng-container>
diff --git a/src/addons/mod/chat/pages/sessions/sessions.html b/src/addons/mod/chat/pages/sessions/sessions.html
index 53115aac3..9676d15bb 100644
--- a/src/addons/mod/chat/pages/sessions/sessions.html
+++ b/src/addons/mod/chat/pages/sessions/sessions.html
@@ -14,7 +14,7 @@
             <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
         </ion-refresher>
         <core-loading [hideUntil]="sessions.loaded">
-            <ion-item class="ion-text-wrap" *ngIf="groupInfo && (groupInfo.separateGroups || groupInfo.visibleGroups)">
+            <ion-item class="ion-text-wrap core-group-selector" *ngIf="groupInfo && (groupInfo.separateGroups || groupInfo.visibleGroups)">
                 <ion-label id="addon-chat-groupslabel">
                     <ng-container *ngIf="groupInfo.separateGroups">{{'core.groupsseparate' | translate }}</ng-container>
                     <ng-container *ngIf="groupInfo.visibleGroups">{{'core.groupsvisible' | translate }}</ng-container>
diff --git a/src/addons/mod/data/components/index/addon-mod-data-index.html b/src/addons/mod/data/components/index/addon-mod-data-index.html
index 59f79533d..3a8aa7713 100644
--- a/src/addons/mod/data/components/index/addon-mod-data-index.html
+++ b/src/addons/mod/data/components/index/addon-mod-data-index.html
@@ -25,7 +25,7 @@
         [courseId]="courseId" [hasDataToSync]="hasOffline || hasOfflineRatings">
     </core-course-module-info>
 
-    <ion-item class="ion-text-wrap" *ngIf="groupInfo && (groupInfo.separateGroups || groupInfo.visibleGroups)">
+    <ion-item class="ion-text-wrap core-group-selector" *ngIf="groupInfo && (groupInfo.separateGroups || groupInfo.visibleGroups)">
         <ion-label id="addon-data-groupslabel">
             <ng-container *ngIf="groupInfo.separateGroups">{{'core.groupsseparate' | translate }}</ng-container>
             <ng-container *ngIf="groupInfo.visibleGroups">{{'core.groupsvisible' | translate }}</ng-container>
diff --git a/src/addons/mod/data/pages/edit/edit.html b/src/addons/mod/data/pages/edit/edit.html
index 0ee3b6e22..4b04f9b68 100644
--- a/src/addons/mod/data/pages/edit/edit.html
+++ b/src/addons/mod/data/pages/edit/edit.html
@@ -18,7 +18,7 @@
 </ion-header>
 <ion-content>
     <core-loading [hideUntil]="loaded">
-        <ion-item class="ion-text-wrap" *ngIf="groupInfo && (groupInfo.separateGroups || groupInfo.visibleGroups)">
+        <ion-item class="ion-text-wrap core-group-selector" *ngIf="groupInfo && (groupInfo.separateGroups || groupInfo.visibleGroups)">
             <ion-label id="addon-data-groupslabel">
                 <ng-container *ngIf="groupInfo.separateGroups">{{ 'core.groupsvisible' | translate }}</ng-container>
                 <ng-container *ngIf="groupInfo.visibleGroups">{{ 'core.groupsseparate' | translate }}</ng-container>
diff --git a/src/addons/mod/data/pages/entry/entry.html b/src/addons/mod/data/pages/entry/entry.html
index 0bf31d990..7ecfe25c5 100644
--- a/src/addons/mod/data/pages/entry/entry.html
+++ b/src/addons/mod/data/pages/entry/entry.html
@@ -25,7 +25,7 @@
             </ion-item>
         </ion-card>
 
-        <ion-item class="ion-text-wrap" *ngIf="groupInfo && (groupInfo.separateGroups || groupInfo.visibleGroups)">
+        <ion-item class="ion-text-wrap core-group-selector" *ngIf="groupInfo && (groupInfo.separateGroups || groupInfo.visibleGroups)">
             <ion-label id="addon-data-groupslabel">
                 <ng-container *ngIf="groupInfo.separateGroups">{{ 'core.groupsvisible' | translate }}</ng-container>
                 <ng-container *ngIf="groupInfo.visibleGroups">{{ 'core.groupsseparate' | translate }}</ng-container>
diff --git a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
index f564311d8..e336d35e1 100644
--- a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
+++ b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
@@ -40,7 +40,7 @@
 
 <ng-template #basicInfo>
     <ion-list *ngIf="access && access.canviewanalysis && !access.isempty">
-        <ion-item class="ion-text-wrap" *ngIf="groupInfo && (groupInfo.separateGroups || groupInfo.visibleGroups)">
+        <ion-item class="ion-text-wrap core-group-selector" *ngIf="groupInfo && (groupInfo.separateGroups || groupInfo.visibleGroups)">
             <ion-label id="addon-feedback-groupslabel">
                 <ng-container *ngIf="groupInfo.separateGroups">{{'core.groupsseparate' | translate }}</ng-container>
                 <ng-container *ngIf="groupInfo.visibleGroups">{{'core.groupsvisible' | translate }}</ng-container>
diff --git a/src/addons/mod/feedback/pages/attempts/attempts.html b/src/addons/mod/feedback/pages/attempts/attempts.html
index 123818d86..a435f5861 100644
--- a/src/addons/mod/feedback/pages/attempts/attempts.html
+++ b/src/addons/mod/feedback/pages/attempts/attempts.html
@@ -15,7 +15,8 @@
         </ion-refresher>
         <core-loading [hideUntil]="attempts && attempts.loaded">
             <ion-list class="ion-no-margin">
-                <ion-item class="ion-text-wrap" *ngIf="groupInfo && (groupInfo.separateGroups || groupInfo.visibleGroups)">
+                <ion-item class="ion-text-wrap core-group-selector"
+                    *ngIf="groupInfo && (groupInfo.separateGroups || groupInfo.visibleGroups)">
                     <ion-label id="addon-feedback-groupslabel">
                         <ng-container *ngIf="groupInfo.separateGroups">{{'core.groupsseparate' | translate }}</ng-container>
                         <ng-container *ngIf="groupInfo.visibleGroups">{{'core.groupsvisible' | translate }}</ng-container>
diff --git a/src/addons/mod/feedback/pages/nonrespondents/nonrespondents.html b/src/addons/mod/feedback/pages/nonrespondents/nonrespondents.html
index 7f85fd6dd..e5634aab3 100644
--- a/src/addons/mod/feedback/pages/nonrespondents/nonrespondents.html
+++ b/src/addons/mod/feedback/pages/nonrespondents/nonrespondents.html
@@ -14,7 +14,7 @@
     </ion-refresher>
     <core-loading [hideUntil]="loaded">
         <ion-list class="ion-no-margin">
-            <ion-item class="ion-text-wrap" *ngIf="groupInfo && (groupInfo.separateGroups || groupInfo.visibleGroups)">
+            <ion-item class="ion-text-wrap core-group-selector" *ngIf="groupInfo && (groupInfo.separateGroups || groupInfo.visibleGroups)">
                 <ion-label id="addon-feedback-groupslabel">
                     <ng-container *ngIf="groupInfo.separateGroups">{{'core.groupsseparate' | translate }}</ng-container>
                     <ng-container *ngIf="groupInfo.visibleGroups">{{'core.groupsvisible' | translate }}</ng-container>
diff --git a/src/addons/mod/forum/components/index/index.html b/src/addons/mod/forum/components/index/index.html
index a7a5afbdc..35776441c 100644
--- a/src/addons/mod/forum/components/index/index.html
+++ b/src/addons/mod/forum/components/index/index.html
@@ -67,7 +67,7 @@
                         </core-user-avatar>
                         <div class="addon-mod-forum-discussion-author">
                             <span *ngIf="discussion.userfullname">{{discussion.userfullname}}</span>
-                            <p *ngIf="discussion.groupname">
+                            <p *ngIf="discussion.groupname" class="core-groupname">
                                 <ion-icon name="fas-users" [attr.aria-label]="'addon.mod_forum.group' | translate">
                                 </ion-icon> {{ discussion.groupname }}
                             </p>
diff --git a/src/addons/mod/forum/components/post/post.html b/src/addons/mod/forum/components/post/post.html
index a077ebe88..4cbc6f849 100644
--- a/src/addons/mod/forum/components/post/post.html
+++ b/src/addons/mod/forum/components/post/post.html
@@ -31,7 +31,7 @@
                         </core-user-avatar>
                         <div class="addon-mod-forum-post-author">
                             <span *ngIf="post.author && post.author.fullname">{{post.author.fullname}}</span>
-                            <p *ngIf="post.author && post.author.groups">
+                            <p *ngIf="post.author && post.author.groups" class="core-groupname">
                                 <ng-container *ngFor="let group of post.author.groups">
                                     <ion-icon name="fas-users" [attr.aria-label]="'addon.mod_forum.group' | translate">
                                     </ion-icon> {{ group.name }}
diff --git a/src/addons/mod/forum/pages/new-discussion/new-discussion.html b/src/addons/mod/forum/pages/new-discussion/new-discussion.html
index 85ca66dcf..748509102 100644
--- a/src/addons/mod/forum/pages/new-discussion/new-discussion.html
+++ b/src/addons/mod/forum/pages/new-discussion/new-discussion.html
@@ -45,7 +45,7 @@
                     <ion-label>{{ 'addon.mod_forum.posttomygroups' | translate }}</ion-label>
                     <ion-toggle [(ngModel)]="newDiscussion.postToAllGroups" name="postallgroups"></ion-toggle>
                 </ion-item>
-                <ion-item *ngIf="showGroups">
+                <ion-item *ngIf="showGroups" class="core-edit-set-group">
                     <ion-label id="addon-mod-forum-groupslabel">{{ 'addon.mod_forum.group' | translate }}</ion-label>
                     <ion-select [(ngModel)]="newDiscussion.groupId" [disabled]="newDiscussion.postToAllGroups"
                         aria-labelledby="addon-mod-forum-groupslabel" interface="action-sheet" name="groupid"
diff --git a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
index cb63e1d65..29a420944 100644
--- a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
+++ b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
@@ -126,7 +126,8 @@
             <ng-template>
                 <core-loading [hideUntil]="reportLoaded">
                     <!-- Group selector if the activity uses groups. -->
-                    <ion-item class="ion-text-wrap" *ngIf="groupInfo && (groupInfo.separateGroups || groupInfo.visibleGroups)">
+                    <ion-item class="ion-text-wrap core-group-selector"
+                        *ngIf="groupInfo && (groupInfo.separateGroups || groupInfo.visibleGroups)">
                         <ion-label id="addon-mod_lesson-groupslabel">
                             <span *ngIf="groupInfo.separateGroups">{{ 'core.groupsseparate' | translate }}</span>
                             <span *ngIf="groupInfo.visibleGroups">{{ 'core.groupsvisible' | translate }}</span>
diff --git a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
index f24b28232..9fc19b652 100644
--- a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
+++ b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
@@ -192,7 +192,7 @@
                     <h2 *ngIf="workshop!.phase > PHASE_SUBMISSION">{{ 'addon.mod_workshop.gradesreport' | translate }}</h2>
                 </ion-label>
             </ion-item-divider>
-            <ion-item class="ion-text-wrap" *ngIf="groupInfo && (groupInfo.separateGroups || groupInfo.visibleGroups)">
+            <ion-item class="ion-text-wrap core-group-selector" *ngIf="groupInfo && (groupInfo.separateGroups || groupInfo.visibleGroups)">
                 <ion-label id="addon-workshop-groupslabel" *ngIf="groupInfo.separateGroups">
                     {{ 'core.groupsseparate' | translate }}
                 </ion-label>

From 82419c3f5051b087209c169ffa82f25c1f2bcd25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 23 Feb 2022 09:49:06 +0100
Subject: [PATCH 0583/1008] MOBILE-3811 resource: Remove mimetype icons from
 resource only on 4.0+

This partially reverts commit 96b172c42ca216aacc986502eb628e5a911d0671.
---
 .../mod/forum/services/handlers/module.ts     |  9 +++--
 .../mod/resource/services/handlers/module.ts  | 40 ++++++++++++++++++-
 .../course/services/module-delegate.ts        |  3 +-
 3 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/src/addons/mod/forum/services/handlers/module.ts b/src/addons/mod/forum/services/handlers/module.ts
index a750b83b6..780f432b1 100644
--- a/src/addons/mod/forum/services/handlers/module.ts
+++ b/src/addons/mod/forum/services/handlers/module.ts
@@ -23,6 +23,7 @@ import { CoreConstants, ModPurpose } from '@/core/constants';
 import { AddonModForumIndexComponent } from '../../components/index';
 import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
 import { CoreCourseModuleData } from '@features/course/services/course-helper';
+import { CoreIonicColorNames } from '@singletons/colors';
 
 /**
  * Handler to support forum modules.
@@ -58,7 +59,7 @@ export class AddonModForumModuleHandlerService extends CoreModuleHandlerBase imp
         const data = await super.getData(module, courseId);
 
         if ('afterlink' in module && !!module.afterlink) {
-            data.extraBadgeColor = '';
+            data.extraBadgeColor = undefined;
             const match = />(\d+)[^<]+/.exec(module.afterlink);
             data.extraBadge = match ? Translate.instant('addon.mod_forum.unreadpostsnumber', { $a : match[1] }) : '';
         } else {
@@ -112,7 +113,7 @@ export class AddonModForumModuleHandlerService extends CoreModuleHandlerBase imp
         }
 
         data.extraBadge = Translate.instant('core.loading');
-        data.extraBadgeColor = 'light';
+        data.extraBadgeColor = CoreIonicColorNames.DARK;
 
         await CoreUtils.ignoreErrors(AddonModForum.invalidateForumData(courseId));
 
@@ -120,7 +121,7 @@ export class AddonModForumModuleHandlerService extends CoreModuleHandlerBase imp
             // Handle unread posts.
             const forum = await AddonModForum.getForum(courseId, moduleId, { siteId });
 
-            data.extraBadgeColor = '';
+            data.extraBadgeColor = undefined;
             data.extraBadge = forum.unreadpostscount
                 ? Translate.instant(
                     'addon.mod_forum.unreadpostsnumber',
@@ -129,7 +130,7 @@ export class AddonModForumModuleHandlerService extends CoreModuleHandlerBase imp
                 : '';
         } catch {
             // Ignore errors.
-            data.extraBadgeColor = '';
+            data.extraBadgeColor = undefined;
             data.extraBadge = '';
         }
     }
diff --git a/src/addons/mod/resource/services/handlers/module.ts b/src/addons/mod/resource/services/handlers/module.ts
index 0eaab6861..3304a1b8c 100644
--- a/src/addons/mod/resource/services/handlers/module.ts
+++ b/src/addons/mod/resource/services/handlers/module.ts
@@ -20,6 +20,7 @@ import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
 import { CoreCourseModulePrefetchDelegate } from '@features/course/services/module-prefetch-delegate';
 import { CoreFileHelper } from '@services/file-helper';
+import { CoreSites } from '@services/sites';
 import { CoreMimetypeUtils } from '@services/utils/mimetype';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreTimeUtils } from '@services/utils/time';
@@ -95,7 +96,14 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase
 
         this.getResourceData(module, courseId, handlerData).then((extra) => {
             handlerData.extraBadge = extra;
-            handlerData.extraBadgeColor = '';
+
+            return;
+        }).catch(() => {
+            // Ignore errors.
+        });
+
+        this.getIconSrc(module).then((icon) => {
+            handlerData.icon = icon;
 
             return;
         }).catch(() => {
@@ -214,6 +222,36 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase
         return extra.join(' ');
     }
 
+    /**
+     * @inheritdoc
+     */
+    async getIconSrc(module?: CoreCourseModuleData): Promise<string | undefined> {
+        if (!module) {
+            return;
+        }
+
+        if (CoreSites.getCurrentSite()?.isVersionGreaterEqualThan('4.0')) {
+            return await CoreCourse.getModuleIconSrc(module.modname, module.modicon);
+        }
+        let mimetypeIcon = '';
+
+        if (module.contentsinfo) {
+            // No need to use the list of files.
+            const mimetype = module.contentsinfo.mimetypes[0];
+            if (mimetype) {
+                mimetypeIcon = CoreMimetypeUtils.getMimetypeIcon(mimetype);
+            }
+
+        } else if (module.contents && module.contents[0]) {
+            const files = module.contents;
+            const file = files[0];
+
+            mimetypeIcon = CoreMimetypeUtils.getFileIcon(file.filename || '');
+        }
+
+        return await CoreCourse.getModuleIconSrc(module.modname, module.modicon, mimetypeIcon);
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/src/core/features/course/services/module-delegate.ts b/src/core/features/course/services/module-delegate.ts
index 6c9a73055..ba49c4c72 100644
--- a/src/core/features/course/services/module-delegate.ts
+++ b/src/core/features/course/services/module-delegate.ts
@@ -25,6 +25,7 @@ import { CoreSites } from '@services/sites';
 import { makeSingleton } from '@singletons';
 import { CoreCourseModuleData } from './course-helper';
 import { CoreNavigationOptions } from '@services/navigator';
+import { CoreIonicColorNames } from '@singletons/colors';
 
 /**
  * Interface that all course module handlers must implement.
@@ -146,7 +147,7 @@ export interface CoreCourseModuleHandlerData {
     /**
      * The color of the extra badge. Default: primary.
      */
-    extraBadgeColor?: string;
+    extraBadgeColor?: CoreIonicColorNames;
 
     /**
      * Whether to display a button to download/refresh the module if it's downloadable.

From 0c684f238e4dbb279d8491d439fb84a29585e3a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 23 Feb 2022 10:12:57 +0100
Subject: [PATCH 0584/1008] MOBILE-3833 activities: Use black and white icons
 on the activity block

---
 .../components/activitymodules/activitymodules.scss | 13 +++++++++++++
 .../components/activitymodules/activitymodules.ts   | 13 ++++++-------
 .../addon-block-activitymodules.html                |  2 +-
 3 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 src/addons/block/activitymodules/components/activitymodules/activitymodules.scss

diff --git a/src/addons/block/activitymodules/components/activitymodules/activitymodules.scss b/src/addons/block/activitymodules/components/activitymodules/activitymodules.scss
new file mode 100644
index 000000000..21ce02313
--- /dev/null
+++ b/src/addons/block/activitymodules/components/activitymodules/activitymodules.scss
@@ -0,0 +1,13 @@
+:host {
+    --mod-icon-filter: brightness(0);
+
+    core-mod-icon {
+        background: transparent;
+        margin: 0;
+        --filter: var(--mod-icon-filter);
+    }
+}
+
+:host-context(body.dark) {
+    --mod-icon-filter: brightness(0) invert(1);
+}
diff --git a/src/addons/block/activitymodules/components/activitymodules/activitymodules.ts b/src/addons/block/activitymodules/components/activitymodules/activitymodules.ts
index 60db4a0c0..129c1ca6d 100644
--- a/src/addons/block/activitymodules/components/activitymodules/activitymodules.ts
+++ b/src/addons/block/activitymodules/components/activitymodules/activitymodules.ts
@@ -28,6 +28,7 @@ import { CoreNavigator } from '@services/navigator';
 @Component({
     selector: 'addon-block-activitymodules',
     templateUrl: 'addon-block-activitymodules.html',
+    styleUrls: ['activitymodules.scss'],
 })
 export class AddonBlockActivityModulesComponent extends CoreBlockBaseComponent implements OnInit {
 
@@ -96,16 +97,13 @@ export class AddonBlockActivityModulesComponent extends CoreBlockBaseComponent i
         // Sort the modnames alphabetically.
         modFullNames = CoreUtils.sortValues(modFullNames);
         for (const modName in modFullNames) {
-            let icon: string;
+            const iconModName = modName === 'resources' ? 'page' : modName;
 
-            if (modName === 'resources') {
-                icon = await CoreCourse.getModuleIconSrc('page', modIcons['page']);
-            } else {
-                icon = await CoreCourseModuleDelegate.getModuleIconSrc(modName, modIcons[modName]);
-            }
+            const icon = await CoreCourseModuleDelegate.getModuleIconSrc(iconModName, modIcons[iconModName]);
 
             this.entries.push({
-                icon: icon,
+                icon,
+                iconModName,
                 name: modFullNames[modName],
                 modName,
             });
@@ -145,4 +143,5 @@ type AddonBlockActivityModuleEntry = {
     icon: string;
     name: string;
     modName: string;
+    iconModName: string;
 };
diff --git a/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html b/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html
index 44810d334..a22f3d549 100644
--- a/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html
+++ b/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html
@@ -5,7 +5,7 @@
 </ion-item-divider>
 <core-loading [hideUntil]="loaded" [fullscreen]="false">
     <ion-item class="ion-text-wrap" *ngFor="let entry of entries" detail="true" button (click)="gotoCoureListModType(entry)">
-        <core-mod-icon slot="start" [modicon]="entry.icon" [modname]="entry.modName" [showAlt]="false">
+        <core-mod-icon slot="start" [modicon]="entry.icon" [modname]="entry.iconModName" [showAlt]="false">
         </core-mod-icon>
         <ion-label>{{ entry.name }}</ion-label>
     </ion-item>

From 8ba7da055245d227c5640acbf504de4f5e1f9783 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 23 Feb 2022 10:29:11 +0100
Subject: [PATCH 0585/1008] MOBILE-3833 chips: Do not make it look clickable

---
 src/theme/theme.base.scss | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 064a3dcee..7d39abe82 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -983,6 +983,12 @@ ion-chip {
     min-height: 24px;
     height: auto;
 
+    // Chips are not currently clickable.
+    &.ion-activatable {
+        cursor: auto;
+        pointer-events: none;
+    }
+
     &.ion-color {
         background: var(--ion-color-tint);
         &.chip-outline {

From 452acd45e9877f204526868d99d6f7bbd0e56469 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 23 Feb 2022 10:33:59 +0100
Subject: [PATCH 0586/1008] MOBILE-3833 module: Fix get course when non
 enrolled

---
 .../course/components/module-summary/module-summary.html  | 2 +-
 .../course/components/module-summary/module-summary.ts    | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/core/features/course/components/module-summary/module-summary.html b/src/core/features/course/components/module-summary/module-summary.html
index 6c60ba185..52dc0f284 100644
--- a/src/core/features/course/components/module-summary/module-summary.html
+++ b/src/core/features/course/components/module-summary/module-summary.html
@@ -37,7 +37,7 @@
                     {{ 'core.course' | translate}}
                 </p>
                 <p>
-                    <core-format-text [text]="course.displayname || course.fullname" contextLevel="course" [contextInstanceId]="courseId">
+                    <core-format-text [text]="course.fullname" contextLevel="course" [contextInstanceId]="courseId">
                     </core-format-text>
                 </p>
             </ion-label>
diff --git a/src/core/features/course/components/module-summary/module-summary.ts b/src/core/features/course/components/module-summary/module-summary.ts
index a82c4801c..f480c8469 100644
--- a/src/core/features/course/components/module-summary/module-summary.ts
+++ b/src/core/features/course/components/module-summary/module-summary.ts
@@ -249,7 +249,13 @@ export class CoreCourseModuleSummaryComponent implements OnInit, OnDestroy {
      * Fetch course.
      */
     protected async fetchCourse(): Promise<void> {
-        this.course = await CoreCourses.getUserCourse(this.courseId, true);
+        // Fix that.
+        try {
+            this.course = await CoreCourses.getUserCourse(this.courseId, true);
+        } catch {
+            // The user is not enrolled in the course. Use getCourses to see if it's an admin/manager and can see the course.
+            this.course = await CoreCourses.getCourse(this.courseId);
+        }
     }
 
     /**

From e8e4b60a20af366954942a849a542f2c268dfcdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 23 Feb 2022 11:58:18 +0100
Subject: [PATCH 0587/1008] MOBILE-3833 course: Increase toggle area on course
 index

---
 .../components/course-index/course-index.scss | 35 ++++++++++++++-----
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/core/features/course/components/course-index/course-index.scss b/src/core/features/course/components/course-index/course-index.scss
index 169950d9d..854d9c3a3 100644
--- a/src/core/features/course/components/course-index/course-index.scss
+++ b/src/core/features/course/components/course-index/course-index.scss
@@ -33,16 +33,35 @@ ion-item.item.item-current {
     --background: var(--primary);
     --color: var(--primary-contrast);
     border: 0;
-
-    ion-badge {
-        border: 1px solid var(--primary-contrast);
-    }
-
-    ::ng-deep ion-icon {
-        color: var(--primary-contrast);
-    }
 }
 
 ion-icon.restricted {
     font-size: 14px;
 }
+
+ion-item.item.divider.section {
+    --padding-start: 0px;
+
+    &.item-current {
+        ion-badge {
+            border: 1px solid var(--primary-contrast);
+        }
+
+        ion-icon.expandable-status-icon {
+            color: var(--primary-contrast);
+
+            &:hover {
+                background: var(--primary-shade);
+            }
+        }
+    }
+
+    ion-icon.expandable-status-icon {
+        padding: 13px;
+        margin: 3px;
+        border-radius: 50%;
+        &:hover {
+            background: var(--gray-300);
+        }
+    }
+}

From c939fd23ca7d03bf2d4841b92ed97ab7b3b56149 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 23 Feb 2022 12:51:29 +0100
Subject: [PATCH 0588/1008] MOBILE-3833 profile: Do not show online when the
 user can change avatar

---
 src/core/features/user/pages/about/about.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/features/user/pages/about/about.html b/src/core/features/user/pages/about/about.html
index c539e7b3c..d31800b14 100644
--- a/src/core/features/user/pages/about/about.html
+++ b/src/core/features/user/pages/about/about.html
@@ -15,7 +15,7 @@
     <core-loading [hideUntil]="userLoaded">
         <ion-list *ngIf="user">
             <ion-item class="ion-text-center core-user-profile-maininfo ion-text-wrap" lines="full">
-                <core-user-avatar [user]="user" [userId]="user.id" [linkProfile]="false" [checkOnline]="true">
+                <core-user-avatar [user]="user" [userId]="user.id" [linkProfile]="false" [checkOnline]="!canChangeProfilePicture">
                     <ion-button class="edit-avatar" *ngIf="canChangeProfilePicture" (click)="changeProfilePicture()"
                         [attr.aria-label]="'core.user.newpicture' | translate" fill="clear" color="dark">
                         <ion-icon slot="icon-only" name="fas-pen" aria-hidden="true"></ion-icon>

From 57ba1f93635fa03cbccd802044132d59b7200b34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 23 Feb 2022 14:24:24 +0100
Subject: [PATCH 0589/1008] MOBILE-3833 module: Only show uncompleted
 completion conditions

---
 .../core-course-module-completion.html             | 11 +++++++----
 .../module-completion/module-completion.scss       | 12 ------------
 .../module-completion/module-completion.ts         |  1 -
 .../components/module/core-course-module.html      |  2 +-
 .../features/course/components/module/module.scss  |  7 +++++++
 .../features/course/components/module/module.ts    | 14 ++++++++++++--
 6 files changed, 27 insertions(+), 20 deletions(-)
 delete mode 100644 src/core/features/course/components/module-completion/module-completion.scss

diff --git a/src/core/features/course/components/module-completion/core-course-module-completion.html b/src/core/features/course/components/module-completion/core-course-module-completion.html
index d449ff532..969b358d7 100644
--- a/src/core/features/course/components/module-completion/core-course-module-completion.html
+++ b/src/core/features/course/components/module-completion/core-course-module-completion.html
@@ -5,21 +5,24 @@
 
             <ng-container *ngIf="completion.istrackeduser">
                 <ng-container *ngFor="let rule of details">
-                    <ion-chip *ngIf="rule.statuscomplete" color="success" role="listitem" [attr.aria-label]="rule.accessibleDescription">
+                    <ion-chip *ngIf="rule.statuscomplete" color="success" role="listitem" [attr.aria-label]="rule.accessibleDescription"
+                        class="completioninfo completion_complete">
                         <ion-icon name="fas-check" [attr.aria-label]="'core.course.completion_automatic:done' | translate "></ion-icon>
                         <ion-label>
                             {{ rule.rulevalue.description }}
                         </ion-label>
                     </ion-chip>
 
-                    <ion-chip *ngIf="rule.statuscompletefail" color="danger" role="listitem" [attr.aria-label]="rule.accessibleDescription">
+                    <ion-chip *ngIf="rule.statuscompletefail" color="danger" role="listitem" [attr.aria-label]="rule.accessibleDescription"
+                        class="completioninfo completion_fail">
                         <ion-icon name="fas-times" [attr.aria-label]="'core.course.completion_automatic:failed' | translate "></ion-icon>
                         <ion-label>
                             {{ rule.rulevalue.description }}
                         </ion-label>
                     </ion-chip>
 
-                    <ion-chip *ngIf="rule.statusincomplete" color="dark" role="listitem" [attr.aria-label]="rule.accessibleDescription">
+                    <ion-chip *ngIf="rule.statusincomplete" color="dark" role="listitem" [attr.aria-label]="rule.accessibleDescription"
+                        class="completioninfo completion_incomplete">
                         <ion-icon name="fas-edit" [attr.aria-label]="'core.course.completion_automatic:todo' | translate "></ion-icon>
                         <ion-label>
                             {{ rule.rulevalue.description }}
@@ -29,7 +32,7 @@
             </ng-container>
 
             <ng-container *ngIf="!completion.istrackeduser">
-                <ion-chip *ngFor="let rule of details" role="listitem">
+                <ion-chip *ngFor="let rule of details" role="listitem" class="core-module-completion-todo">
                     <ion-icon name="fas-edit" [attr.aria-label]="'core.course.completion_automatic:todo' | translate "></ion-icon>
                     <ion-label>
                         {{ rule.rulevalue.description }}
diff --git a/src/core/features/course/components/module-completion/module-completion.scss b/src/core/features/course/components/module-completion/module-completion.scss
deleted file mode 100644
index 946eac3bd..000000000
--- a/src/core/features/course/components/module-completion/module-completion.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-:host {
-    .core-module-automatic-completion-conditions {
-        ion-badge {
-            font-weight: normal;
-            margin-right: 5px;
-
-            &[color="medium"] {
-                color: black;
-            }
-        }
-    }
-}
diff --git a/src/core/features/course/components/module-completion/module-completion.ts b/src/core/features/course/components/module-completion/module-completion.ts
index 060cdd7dd..5a6d5b986 100644
--- a/src/core/features/course/components/module-completion/module-completion.ts
+++ b/src/core/features/course/components/module-completion/module-completion.ts
@@ -36,7 +36,6 @@ import { Translate } from '@singletons';
 @Component({
     selector: 'core-course-module-completion',
     templateUrl: 'core-course-module-completion.html',
-    styleUrls: ['module-completion.scss'],
 })
 export class CoreCourseModuleCompletionComponent extends CoreCourseModuleCompletionBaseComponent {
 
diff --git a/src/core/features/course/components/module/core-course-module.html b/src/core/features/course/components/module/core-course-module.html
index 579f101e5..86afecafe 100644
--- a/src/core/features/course/components/module/core-course-module.html
+++ b/src/core/features/course/components/module/core-course-module.html
@@ -71,7 +71,7 @@
                 </core-format-text>
 
                 <!-- Module completion. Only auto conditions-->
-                <core-course-module-completion *ngIf="module.completiondata && module.uservisible" [completion]="module.completiondata"
+                <core-course-module-completion *ngIf="autoCompletionTodo && module.uservisible" [completion]="module.completiondata"
                     [moduleName]="module.name" [moduleId]="module.id" [showCompletionConditions]="showCompletionConditions">
                 </core-course-module-completion>
 
diff --git a/src/core/features/course/components/module/module.scss b/src/core/features/course/components/module/module.scss
index c4fd942bd..614464d9e 100644
--- a/src/core/features/course/components/module/module.scss
+++ b/src/core/features/course/components/module/module.scss
@@ -8,6 +8,10 @@
         margin-right: var(--horizontal-margin);
     }
 
+    ion-item {
+        --padding-start: 12px;
+    }
+
     ion-item.core-module-main-item {
         --min-height: 52px;
 
@@ -84,4 +88,7 @@
         @include margin-horizontal(null, 8px);
     }
 
+    .core-course-module-info ::ng-deep core-course-module-completion .core-module-automatic-completion-conditions .completioninfo.completion_complete {
+        display: none;
+    }
 }
diff --git a/src/core/features/course/components/module/module.ts b/src/core/features/course/components/module/module.ts
index 478dc0b62..2ea4748e8 100644
--- a/src/core/features/course/components/module/module.ts
+++ b/src/core/features/course/components/module/module.ts
@@ -20,7 +20,7 @@ import {
     CoreCourseModuleCompletionData,
     CoreCourseSection,
 } from '@features/course/services/course-helper';
-import { CoreCourse } from '@features/course/services/course';
+import { CoreCourse, CoreCourseModuleCompletionStatus, CoreCourseModuleCompletionTracking } from '@features/course/services/course';
 import { CoreCourseModuleDelegate, CoreCourseModuleHandlerButton } from '@features/course/services/module-delegate';
 import {
     CoreCourseModulePrefetchDelegate,
@@ -55,6 +55,8 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy {
     showManualCompletion = false; // Whether to show manual completion when completion conditions are disabled.
     prefetchStatusIcon = ''; // Module prefetch status icon.
     prefetchStatusText = ''; // Module prefetch status text.
+    autoCompletionTodo = false;
+
     protected prefetchHandler?: CoreCourseModulePrefetchHandler;
 
     protected moduleStatusObserver?: CoreEventObserver;
@@ -73,10 +75,18 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy {
 
         this.module.handlerData.a11yTitle = this.module.handlerData.a11yTitle ?? this.module.handlerData.title;
 
+        const completionStatus = this.showCompletionConditions && this.module.completiondata?.isautomatic &&
+            this.module.completiondata.tracking == CoreCourseModuleCompletionTracking.COMPLETION_TRACKING_AUTOMATIC
+            ? this.module.completiondata.state
+            : undefined;
+
+        this.autoCompletionTodo = completionStatus == CoreCourseModuleCompletionStatus.COMPLETION_INCOMPLETE ||
+            completionStatus == CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE_FAIL;
+
         this.hasInfo = !!(
             this.module.description ||
             (this.showActivityDates && this.module.dates && this.module.dates.length) ||
-            (this.module.completiondata && this.showCompletionConditions && this.module.completiondata.isautomatic) ||
+            (this.autoCompletionTodo) ||
             (this.module.visible === 0 && (!this.section || this.section.visible)) ||
             (this.module.visible !== 0 && this.module.isStealth) ||
             (this.module.availabilityinfo)

From 8fab7a9121b2a22c1d5d0a33b95314eb4503af9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 23 Feb 2022 14:30:06 +0100
Subject: [PATCH 0590/1008] MOBILE-3833 course: Move course shortname to course
 summary

---
 .../course/pages/course-summary/course-summary.html | 13 +++++++++++--
 src/core/features/course/pages/index/index.html     |  4 ----
 src/core/features/course/pages/index/index.ts       |  1 -
 .../core-courses-course-list-item.html              |  3 ++-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/core/features/course/pages/course-summary/course-summary.html b/src/core/features/course/pages/course-summary/course-summary.html
index 56baec734..46926639f 100644
--- a/src/core/features/course/pages/course-summary/course-summary.html
+++ b/src/core/features/course/pages/course-summary/course-summary.html
@@ -26,14 +26,23 @@
         <ng-container *ngIf="course">
             <ion-item class="ion-text-wrap">
                 <ion-label>
-                    <p *ngIf="course.categoryname">
-                        <core-format-text [text]="course.categoryname" contextLevel="coursecat" [contextInstanceId]="course.categoryid">
+                    <p *ngIf="course.displayname && course.shortname && course.fullname != course.displayname"
+                        class="core-course-shortname">
+                        <core-format-text [text]="course.shortname" contextLevel="course" [contextInstanceId]="course.id">
                         </core-format-text>
                     </p>
                     <h2>
+                        <span class="sr-only">{{ 'core.courses.aria:coursename' | translate }}</span>
                         <core-format-text [text]="course.fullname" contextLevel="course" [contextInstanceId]="course.id">
                         </core-format-text>
                     </h2>
+                    <ion-chip color="brand" *ngIf="course.categoryname" class="core-course-category ion-text-nowrap">
+                        <span class="sr-only">{{ 'core.courses.aria:coursecategory' | translate }}</span>
+                        <ion-label>
+                            <core-format-text [text]="course.categoryname" contextLevel="coursecat" [contextInstanceId]="course.categoryid">
+                            </core-format-text>
+                        </ion-label>
+                    </ion-chip>
 
                     <div class="core-course-progress" *ngIf="progress !== undefined">
                         <core-progress-bar [progress]="progress" a11yText="core.course.aria:sectionprogress">
diff --git a/src/core/features/course/pages/index/index.html b/src/core/features/course/pages/index/index.html
index 0187dc8e4..2a234b5d5 100644
--- a/src/core/features/course/pages/index/index.html
+++ b/src/core/features/course/pages/index/index.html
@@ -21,10 +21,6 @@
         <img [src]="imageThumb" core-external-content alt="" />
     </ion-avatar>
     <ion-label>
-        <p *ngIf="category">
-            <core-format-text [text]="category" contextLevel="coursecat" [contextInstanceId]="course!.categoryid">
-            </core-format-text>
-        </p>
         <h1>{{ title }}</h1>
         <div class="core-course-progress" *ngIf="progress !== undefined">
             <core-progress-bar [progress]="progress" a11yText="core.course.aria:sectionprogress">
diff --git a/src/core/features/course/pages/index/index.ts b/src/core/features/course/pages/index/index.ts
index 56e10b136..c6b24df14 100644
--- a/src/core/features/course/pages/index/index.ts
+++ b/src/core/features/course/pages/index/index.ts
@@ -238,7 +238,6 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
 
         // Get the title to display initially.
         this.title = CoreCourseFormatDelegate.getCourseTitle(this.course);
-        this.category = 'categoryname' in this.course ? this.course.categoryname : '';
 
         if ('overviewfiles' in this.course) {
             this.imageThumb = this.course.overviewfiles?.[0]?.fileurl;
diff --git a/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html b/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
index 39bf2b5e2..fd2a803bc 100644
--- a/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
+++ b/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
@@ -70,7 +70,8 @@
                     class="core-course-category core-course-additional-info ion-text-nowrap">
                     <span class="sr-only">{{ 'core.courses.aria:coursecategory' | translate }}</span>
                     <ion-label>
-                        <core-format-text [text]="course.categoryname"></core-format-text>
+                        <core-format-text [text]="course.categoryname" contextLevel="coursecat" [contextInstanceId]="course.categoryid">
+                        </core-format-text>
                     </ion-label>
                 </ion-chip>
             </div>

From 6ecb08246bbae89f4dd355d0eac264680b4bca2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 23 Feb 2022 14:42:11 +0100
Subject: [PATCH 0591/1008] MOBILE-3833 course: Move course downloads to course
 page

---
 .../services/handlers/course-menu.ts          | 62 -------------------
 .../storagemanager/storagemanager.module.ts   |  3 -
 src/core/components/iframe/core-iframe.html   |  2 +-
 .../module-summary/module-summary.html        |  4 +-
 .../course/pages/contents/contents.html       |  5 +-
 .../course/pages/contents/contents.ts         | 12 +++-
 6 files changed, 16 insertions(+), 72 deletions(-)
 delete mode 100644 src/addons/storagemanager/services/handlers/course-menu.ts

diff --git a/src/addons/storagemanager/services/handlers/course-menu.ts b/src/addons/storagemanager/services/handlers/course-menu.ts
deleted file mode 100644
index 74dc8f409..000000000
--- a/src/addons/storagemanager/services/handlers/course-menu.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-// (C) Copyright 2015 Moodle Pty Ltd.
-//
-// 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 { Injectable } from '@angular/core';
-import { CoreCourseOptionsMenuHandler, CoreCourseOptionsMenuHandlerData } from '@features/course/services/course-options-delegate';
-import { CoreCourseAnyCourseDataWithOptions } from '@features/courses/services/courses';
-import { makeSingleton } from '@singletons';
-
-/**
- * Handler to inject an option into course menu so that user can get to the manage storage page.
- */
-@Injectable( { providedIn: 'root' })
-export class AddonStorageManagerCourseMenuHandlerService implements CoreCourseOptionsMenuHandler {
-
-    name = 'AddonStorageManager';
-    priority = 500;
-    isMenuHandler = true;
-
-    /**
-     * @inheritdoc
-     */
-    async isEnabledForCourse(): Promise<boolean> {
-        return true;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    async isEnabled(): Promise<boolean> {
-        return true;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    getMenuDisplayData(
-        course: CoreCourseAnyCourseDataWithOptions,
-    ): CoreCourseOptionsMenuHandlerData {
-        return {
-            icon: 'fas-cloud-download-alt',
-            title: 'addon.storagemanager.coursedownloads',
-            page: 'storage/' + course.id,
-            pageParams: {
-                title: course.displayname ?? course.fullname,
-            },
-            class: 'addon-storagemanager-coursemenu-handler',
-        };
-    }
-
-}
-export const AddonStorageManagerCourseMenuHandler = makeSingleton(AddonStorageManagerCourseMenuHandlerService);
diff --git a/src/addons/storagemanager/storagemanager.module.ts b/src/addons/storagemanager/storagemanager.module.ts
index 187d66cdd..fbf97bdaf 100644
--- a/src/addons/storagemanager/storagemanager.module.ts
+++ b/src/addons/storagemanager/storagemanager.module.ts
@@ -14,12 +14,10 @@
 
 import { NgModule, APP_INITIALIZER } from '@angular/core';
 import { Routes } from '@angular/router';
-import { CoreCourseOptionsDelegate } from '@features/course/services/course-options-delegate';
 import { CoreMainMenuRoutingModule } from '@features/mainmenu/mainmenu-routing.module';
 import { CoreMainMenuTabRoutingModule } from '@features/mainmenu/mainmenu-tab-routing.module';
 import { CoreSitePreferencesRoutingModule } from '@features/settings/pages/site/site-routing';
 import { CoreSettingsDelegate } from '@features/settings/services/settings-delegate';
-import { AddonStorageManagerCourseMenuHandler } from './services/handlers/course-menu';
 import { AddonStorageManagerSettingsHandler } from './services/handlers/settings';
 
 const routes: Routes = [
@@ -41,7 +39,6 @@ const routes: Routes = [
             provide: APP_INITIALIZER,
             multi: true,
             useValue: () => {
-                CoreCourseOptionsDelegate.registerHandler(AddonStorageManagerCourseMenuHandler.instance);
                 CoreSettingsDelegate.registerHandler(AddonStorageManagerSettingsHandler.instance);
             },
         },
diff --git a/src/core/components/iframe/core-iframe.html b/src/core/components/iframe/core-iframe.html
index 776cfbbee..78c405420 100644
--- a/src/core/components/iframe/core-iframe.html
+++ b/src/core/components/iframe/core-iframe.html
@@ -1,6 +1,6 @@
 <div [class.core-loading-container]="loading || !safeUrl" [ngStyle]="{'width': iframeWidth, 'height': iframeHeight}">
 
-    <core-navbar-buttons slot="end" append *ngIf="initialized && showFullscreenOnToolbar">
+    <core-navbar-buttons slot="end" prepend *ngIf="initialized && showFullscreenOnToolbar">
         <ion-button fill="clear" (click)="toggleFullscreen()"
             [attr.aria-label]="(fullscreen ? 'core.disablefullscreen' : 'core.fullscreen') | translate">
             <ion-icon *ngIf="!fullscreen" name="fas-expand" slot="icon-only" aria-hidden="true"></ion-icon>
diff --git a/src/core/features/course/components/module-summary/module-summary.html b/src/core/features/course/components/module-summary/module-summary.html
index 52dc0f284..09a0e3354 100644
--- a/src/core/features/course/components/module-summary/module-summary.html
+++ b/src/core/features/course/components/module-summary/module-summary.html
@@ -58,7 +58,7 @@
             <ion-item lines="full" class="ion-text-wrap">
                 <ion-label>
                     <h2>
-                        <ion-icon name="fam-cloud-done" aria-hidden="true"></ion-icon>
+                        <ion-icon name="fas-cloud-download-alt" aria-hidden="true"></ion-icon>
                         {{ 'addon.storagemanager.downloads' | translate }}
                     </h2>
                 </ion-label>
@@ -81,7 +81,7 @@
             </ion-item>
             <ion-button fill="outline" expand="block" *ngIf="canPrefetch && displayOptions.displayPrefetch" class="ion-text-wrap"
                 (click)="prefetch()" color="primary" [disabled]="prefetchDisabled">
-                <ion-icon *ngIf="!prefetchLoading" name="fam-cloud-done" slot="start" aria-hidden="true"></ion-icon>
+                <ion-icon *ngIf="!prefetchLoading" name="fas-cloud-download-alt" slot="start" aria-hidden="true"></ion-icon>
                 <ion-spinner *ngIf="prefetchLoading" slot="start" aria-hidden="true"></ion-spinner>
                 <ion-label>
                     {{ 'core.download' | translate }}
diff --git a/src/core/features/course/pages/contents/contents.html b/src/core/features/course/pages/contents/contents.html
index 64ff48a05..bc3f404f8 100644
--- a/src/core/features/course/pages/contents/contents.html
+++ b/src/core/features/course/pages/contents/contents.html
@@ -1,4 +1,7 @@
-<core-navbar-buttons slot="end">
+<core-navbar-buttons slot="end" prepend>
+    <ion-button fill="clear" (click)="gotoCourseDownloads()" [attr.aria-label]="'addon.storagemanager.coursedownloads' | translate">
+        <ion-icon name="fas-cloud-download-alt" slot="icon-only" aria-hidden="true"></ion-icon>
+    </ion-button>
 </core-navbar-buttons>
 <ion-content>
     <ion-refresher slot="fixed" [disabled]="!dataLoaded || !displayRefresher" (ionRefresh)="doRefresh($event.target)">
diff --git a/src/core/features/course/pages/contents/contents.ts b/src/core/features/course/pages/contents/contents.ts
index 85d7bfce1..81953a209 100644
--- a/src/core/features/course/pages/contents/contents.ts
+++ b/src/core/features/course/pages/contents/contents.ts
@@ -29,7 +29,6 @@ import {
 } from '@features/course/services/course-helper';
 import { CoreCourseFormatDelegate } from '@features/course/services/format-delegate';
 import { CoreCourseModulePrefetchDelegate } from '@features/course/services/module-prefetch-delegate';
-import { CoreCourseOptionsMenuHandlerToDisplay } from '@features/course/services/course-options-delegate';
 import { CoreCourseSync, CoreCourseSyncProvider } from '@features/course/services/sync';
 import { CoreCourseFormatComponent } from '../../components/course-format/course-format';
 import {
@@ -54,7 +53,6 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
     sections?: CoreCourseSection[];
     sectionId?: number;
     sectionNumber?: number;
-    courseMenuHandlers: CoreCourseOptionsMenuHandlerToDisplay[] = [];
     dataLoaded = false;
     downloadCourseEnabled = false;
     moduleId?: number;
@@ -368,8 +366,16 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
         }
     }
 
+    gotoCourseDownloads(): void {
+        CoreNavigator.navigateToSitePath(
+            `storage/${this.course.id}`,
+            { params: { title: this.course.fullname } },
+        );
+
+    }
+
     /**
-     * Page destroyed.
+     * @inheritdoc
      */
     ngOnDestroy(): void {
         this.isDestroyed = true;

From 2fd8a72f39758e0cc753f9624f1b77072994d7f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 23 Feb 2022 15:24:04 +0100
Subject: [PATCH 0592/1008] MOBILE-3833 style: Use same card margin on ios and
 md

---
 src/core/features/course/components/module/module.scss | 4 ++--
 src/core/features/login/login.scss                     | 4 ++++
 src/theme/theme.base.scss                              | 5 +++++
 src/theme/theme.light.scss                             | 2 ++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/core/features/course/components/module/module.scss b/src/core/features/course/components/module/module.scss
index 614464d9e..4c06e9ca0 100644
--- a/src/core/features/course/components/module/module.scss
+++ b/src/core/features/course/components/module/module.scss
@@ -2,10 +2,10 @@
 
 :host {
     --horizontal-margin: 10px;
+    --vertical-margin: 10px;
 
     ion-card {
-        margin-left: var(--horizontal-margin);
-        margin-right: var(--horizontal-margin);
+        margin: var(--vertical-margin) var(--horizontal-margin);
     }
 
     ion-item {
diff --git a/src/core/features/login/login.scss b/src/core/features/login/login.scss
index 6aeb84b40..165ba96e3 100644
--- a/src/core/features/login/login.scss
+++ b/src/core/features/login/login.scss
@@ -34,6 +34,10 @@
         margin-bottom: 16px;
     }
 
+    form .core-username.ios {
+        --inner-border-width: 0 0 1px 0;
+    }
+
     form .item,
     form .item ion-label {
         --background: var(--core-login-input-background);
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 7d39abe82..10175cb7e 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -813,6 +813,7 @@ ion-card {
     border-color: var(--border-color);
     box-shadow: var(--box-shadow);
     border-radius: var(--border-radius);
+    margin: var(--ion-card-vertical-margin) var(--ion-card-horizontal-margin);
 
     ion-item:only-child {
         --inner-border-width: 0px;
@@ -1151,6 +1152,10 @@ ion-item.item-lines-inset {
     --border-width: 0px;
 }
 
+ion-item.item-input.ios {
+    --inner-border-width: 0 0 1px 0;
+}
+
 // Fake item.
 div.fake-ion-item {
     position: relative;
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index edcdad2f9..448d88505 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -88,6 +88,8 @@
     --subdued-text-color: var(--gray-700);
 
     --ion-card-color: var(--text-color);
+    --ion-card-vertical-margin: 10px;
+    --ion-card-horizontal-margin: 10px;
     ion-card {
         --border-width: 1px;
         --border-style: solid;

From daf4090ac6d1a6601bb86af4eef945b4db3000b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 23 Feb 2022 15:29:11 +0100
Subject: [PATCH 0593/1008] MOBILE-3833 style: Remove back text from back
 button on iOS

---
 src/theme/theme.base.scss | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 10175cb7e..0ac775748 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -164,6 +164,9 @@ ion-header {
             --ion-toolbar-color: var(--core-header-toolbar-color);
             --border-radius: var(--huge-radius);
         }
+        ion-back-button::part(text) {
+            display: none;
+        }
 
         .button.button-clear,
         .button.button-solid {

From 15dbfa514a59d6f4ba50859d8eca1cce9f228d1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 23 Feb 2022 15:57:10 +0100
Subject: [PATCH 0594/1008] MOBILE-3833 format-text: Change toggle style

---
 .../pages/course-storage/course-storage.scss  |  5 +-
 src/core/directives/collapsible-item.ts       | 14 ++--
 src/core/directives/format-text.ts            | 26 ++++---
 src/theme/components/format-text.scss         | 74 ++----------------
 src/theme/globals.mixins.scss                 | 77 ++++++++++++++++++-
 src/theme/theme.base.scss                     | 72 +----------------
 src/theme/theme.dark.scss                     |  4 +
 src/theme/theme.light.scss                    |  6 ++
 8 files changed, 118 insertions(+), 160 deletions(-)

diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.scss b/src/addons/storagemanager/pages/course-storage/course-storage.scss
index 29bc1c7d8..87de86c13 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.scss
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.scss
@@ -1,7 +1,6 @@
 @import "~theme/globals";
 
 :host {
-    --core-format-text-background-gradient-rgb: var(--background-rgb, #{$ion-item-background-rgb});
     --course-storage-max-activity-height: 120px;
 
     ion-card.section ion-card-header {
@@ -23,8 +22,8 @@
             min-height: var(--course-storage-max-activity-height);
             position: absolute;
             @include position(0, 0, null, 0);
-            background: -webkit-linear-gradient(top, rgba(var(--core-format-text-background-gradient-rgb), 0) calc(100% - 30px), rgba(var(--core-format-text-background-gradient-rgb), 1) calc(100% - 20px));
-            background: linear-gradient(to bottom, rgba(var(--core-format-text-background-gradient-rgb), 0) calc(100% - 30px), rgba(var(--core-format-text-background-gradient-rgb), 1) calc(100% - 20px));
+            background: -webkit-linear-gradient(top, rgba(var(--background-gradient-rgb), 0) calc(100% - 30px), rgba(var(--background-gradient-rgb), 1) calc(100% - 20px));
+            background: linear-gradient(to bottom, rgba(var(--background-gradient-rgb), 0) calc(100% - 30px), rgba(var(--background-gradient-rgb), 1) calc(100% - 20px));
             z-index: 6;
             pointer-events: none;
         }
diff --git a/src/core/directives/collapsible-item.ts b/src/core/directives/collapsible-item.ts
index c7f069354..d572a0586 100644
--- a/src/core/directives/collapsible-item.ts
+++ b/src/core/directives/collapsible-item.ts
@@ -64,8 +64,8 @@ export class CoreCollapsibleItemDirective implements OnInit {
         }
         this.maxHeight = this.maxHeight < defaultMaxHeight ? defaultMaxHeight : this.maxHeight;
 
-        if (!this.maxHeight || (window.innerWidth > 576 && window.innerHeight > 576)) {
-            // Do not collapse on big screens.
+        if (!this.maxHeight) {
+            // Do not collapse.
             return;
         }
 
@@ -91,9 +91,6 @@ export class CoreCollapsibleItemDirective implements OnInit {
      */
     protected calculateHeight(): void {
         // @todo: Work on calculate this height better.
-        if (!this.maxHeight) {
-            return;
-        }
 
         // Remove max-height (if any) to calculate the real height.
         const initialMaxHeight = this.element.style.maxHeight;
@@ -117,7 +114,11 @@ export class CoreCollapsibleItemDirective implements OnInit {
         this.toggleExpandEnabled = enable;
         this.element.classList.toggle('collapsible-enabled', enable);
 
-        if (!enable || this.element.querySelector('ion-button.collapsible-toggle'))  {
+        if (!enable || this.element.querySelector('ion-button.collapsible-toggle')) {
+            this.element.style.maxHeight = !enable || this.expanded
+                ? ''
+                : this.maxHeight + 'px';
+
             return;
         }
 
@@ -128,6 +129,7 @@ export class CoreCollapsibleItemDirective implements OnInit {
 
         const toggleText = document.createElement('span');
         toggleText.classList.add('collapsible-toggle-text');
+        toggleText.classList.add('sr-only');
         toggleButton.appendChild(toggleText);
 
         const expandArrow = document.createElement('span');
diff --git a/src/core/directives/format-text.ts b/src/core/directives/format-text.ts
index b87e1fbe0..cf080adea 100644
--- a/src/core/directives/format-text.ts
+++ b/src/core/directives/format-text.ts
@@ -279,23 +279,28 @@ export class CoreFormatTextDirective implements OnChanges {
      */
     protected setExpandButtonEnabled(enable: boolean): void {
         this.toggleExpandEnabled = enable;
-        this.element.classList.toggle('core-text-formatted', enable);
+        this.element.classList.toggle('collapsible-enabled', enable);
+
+        if (!enable || this.element.querySelector('ion-button.collapsible-toggle'))  {
+            this.element.style.maxHeight = !enable || this.expanded
+                ? ''
+                : this.maxHeight + 'px';
 
-        if (!enable || this.element.querySelector('ion-button.core-format-text-toggle'))  {
             return;
         }
 
         // Add expand/collapse buttons
         const toggleButton = document.createElement('ion-button');
-        toggleButton.classList.add('core-format-text-toggle');
+        toggleButton.classList.add('collapsible-toggle');
         toggleButton.setAttribute('fill', 'clear');
 
         const toggleText = document.createElement('span');
-        toggleText.classList.add('core-format-text-toggle-text');
+        toggleText.classList.add('collapsible-toggle-text');
+        toggleText.classList.add('sr-only');
         toggleButton.appendChild(toggleText);
 
         const expandArrow = document.createElement('span');
-        expandArrow.classList.add('core-format-text-arrow');
+        expandArrow.classList.add('collapsible-toggle-arrow');
         toggleButton.appendChild(expandArrow);
 
         this.element.appendChild(toggleButton);
@@ -313,12 +318,12 @@ export class CoreFormatTextDirective implements OnChanges {
             expand = !this.expanded;
         }
         this.expanded = expand;
-        this.element.classList.toggle('core-text-format-expanded', expand);
-        this.element.classList.toggle('core-text-format-collapsed', !expand);
+        this.element.classList.toggle('collapsible-expanded', expand);
+        this.element.classList.toggle('collapsible-collapsed', !expand);
         this.element.style.maxHeight = expand ? '' : this.maxHeight + 'px';
 
-        const toggleButton = this.element.querySelector('ion-button.core-format-text-toggle');
-        const toggleText = toggleButton?.querySelector('.core-format-text-toggle-text');
+        const toggleButton = this.element.querySelector('ion-button.collapsible-toggle');
+        const toggleText = toggleButton?.querySelector('.collapsible-toggle-text');
         if (!toggleButton || !toggleText) {
             return;
         }
@@ -396,8 +401,7 @@ export class CoreFormatTextDirective implements OnChanges {
         this.element.classList.add('core-disable-media-adapt');
 
         this.contentSpan.innerHTML = ''; // Remove current contents.
-        if (this.maxHeight && result.div.innerHTML != '' &&
-                (window.innerWidth < 576 || window.innerHeight < 576)) { // Don't collapse in big screens.
+        if (this.maxHeight && result.div.innerHTML != '') {
 
             // Move the children to the current element to be able to calculate the height.
             CoreDomUtils.moveChildren(result.div, this.contentSpan);
diff --git a/src/theme/components/format-text.scss b/src/theme/components/format-text.scss
index 1aa0b8c1e..02581a519 100644
--- a/src/theme/components/format-text.scss
+++ b/src/theme/components/format-text.scss
@@ -4,13 +4,11 @@
 
 core-format-text {
     --core-format-text-background: var(--background, var(--ion-item-background));
-    --core-format-text-background-gradient-rgb: var(--background-rgb, #{$ion-item-background-rgb});
     --core-format-text-viewer-icon-background: rgba(255, 255, 255, .5);
     --core-format-text-loader-shine: 251,251,251;
 }
 
 body.dark core-format-text {
-    --core-format-text-background-gradient-rgb: var(--background-rgb, #{$ion-item-background-dark-rgb});
     --core-format-text-viewer-icon-background: rgba(0, 0, 0, .5);
     --core-format-text-loader-shine: 90,90,90;
 }
@@ -51,12 +49,12 @@ core-format-text {
             display: inline;
         }
 
-        .core-format-text-toggle {
+        .collapsible-toggle {
             display: none !important;
         }
     }
 
-    .core-format-text-toggle {
+    .collapsible-toggle {
         display: none;
     }
 
@@ -84,81 +82,21 @@ core-format-text {
         }
 
         // This is to allow clicks in radio/checkbox content.
-        &.core-text-formatted {
+        &.collapsible-enabled {
             cursor: pointer;
             pointer-events: auto;
 
-            .core-format-text-toggle {
-                display: block;
-                position: absolute;
-                bottom: 0;
-                left: 0;
-                right: 0;
-                text-align: center;
-                z-index: 7;
-                text-transform: none;
-                text-align: end;
-                font-size: 14px;
-                background-color: var(--core-format-text-background);
-                color: var(--text-color);
-                margin: 0;
-
-
-                .core-format-text-arrow {
-                    width: var(--a11y-min-target-size);
-                    height: var(--a11y-min-target-size);
-
-                    background-position: center;
-                    background-repeat: no-repeat;
-                    background-size: 14px 14px;
-                    @include core-transition(transform, 500ms);
-
-                    @include push-arrow-color(626262, true);
-
-                    @include darkmode() {
-                        @include push-arrow-color(ffffff, true);
-                    }
-                }
-            }
-
-            &.core-text-format-collapsed {
-                overflow: hidden;
-                min-height: 50px;
-
-                .core-format-text-arrow {
-                    transform: rotate(90deg);
-                }
-
-                &:before {
-                    content: '';
-                    height: 100%;
-                    position: absolute;
-                    @include position(null, 0, 0, 0);
-                    background: -webkit-linear-gradient(top, rgba(var(--core-format-text-background-gradient-rgb), 0) calc(100% - 60px), rgba(var(--core-format-text-background-gradient-rgb), 1) calc(100% - 40px));
-                    background: linear-gradient(to bottom, rgba(var(--core-format-text-background-gradient-rgb), 0) calc(100% - 60px), rgba(var(--core-format-text-background-gradient-rgb), 1) calc(100% - 40px));
-                    z-index: 6;
-                }
-            }
-
-            &.core-text-format-expanded {
-                max-height: none !important;
-
-                padding-bottom: 50px; // So the Show less button can fit.
-
-                .core-format-text-arrow {
-                    transform: rotate(-90deg);
-                }
-            }
+            @include collapsible-item();
         }
     }
 
     @if ($core-format-text-never-shorten) {
         &[maxHeight],
         &[ng-reflect-max-height] {
-            &.core-text-formatted.core-text-format-expanded {
+            &.collapsible-enabled.collapsible-expanded {
                 max-height: none !important;
 
-                .core-format-text-toggle {
+                .collapsible-toggle {
                     display: none !important;
                 }
 
diff --git a/src/theme/globals.mixins.scss b/src/theme/globals.mixins.scss
index 0082bb1e5..f9529da61 100644
--- a/src/theme/globals.mixins.scss
+++ b/src/theme/globals.mixins.scss
@@ -219,9 +219,84 @@
             --horizontal-margin: 6px;
         }
     }
-
 }
 
+@mixin collapsible-item() {
+    --display-toggle: none;
+    .collapsible-toggle {
+        display: var(--display-toggle);
+    }
+
+    @include media-breakpoint-down(sm) {
+        &.collapsible-enabled {
+            position:relative;
+            --display-toggle: block;
+
+            .collapsible-toggle {
+                position: absolute;
+                @include position (null, 0, 0, null);
+                text-align: center;
+                z-index: 7;
+                text-transform: none;
+                font-size: 14px;
+                font-weight: normal;
+                background-color: var(--collapsible-toggle-background);
+                color: var(--collapsible-toggle-text);
+                min-height: var(--a11y-min-target-size);
+                min-width: var(--a11y-min-target-size);
+                --border-radius: var(--huge-radius);
+                border-radius: var(--border-radius);
+                --padding-start: 0px;
+                --padding-end: 0px;
+                margin: 0px;
+
+                .collapsible-toggle-arrow {
+                    width: var(--a11y-min-target-size);
+                    height: var(--a11y-min-target-size);
+
+                    background-position: center;
+                    background-repeat: no-repeat;
+                    background-size: 14px 14px;
+                    @include core-transition(transform, 500ms);
+
+                    @include push-arrow-color(626262, true);
+
+                    @include darkmode() {
+                        @include push-arrow-color(ffffff, true);
+                    }
+                }
+            }
+
+            &.collapsible-collapsed {
+                overflow: hidden;
+                min-height: calc(var(--collapsible-min-button-height) + 12px);
+
+                .collapsible-toggle-arrow {
+                    transform: rotate(90deg);
+                }
+
+                &:before {
+                    content: '';
+                    height: 100%;
+                    position: absolute;
+                    @include position(null, 0, 0, 0);
+                    background: -webkit-linear-gradient(top, rgba(var(--background-gradient-rgb), 0) calc(100% - 56px), rgba(var(--background-gradient-rgb), 1) calc(100% - 5px));
+                    background: linear-gradient(to bottom, rgba(var(--background-gradient-rgb), 0) calc(100% - 56px), rgba(var(--background-gradient-rgb), 1) calc(100% - 5px));
+                    z-index: 6;
+                }
+            }
+
+            &.collapsible-expanded {
+                max-height: none !important;
+                padding-bottom: var(--collapsible-min-button-height); // So the Show less button can fit.
+
+                .collapsible-toggle-arrow {
+                    transform: rotate(-90deg);
+                }
+            }
+        }
+    }
+}
 
 // Color mixins.
 @function get_brightness($color) {
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 0ac775748..461393019 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -1439,77 +1439,7 @@ ion-grid.core-no-grid > ion-row {
 }
 
 [collapsible-item] {
-    --collapsible-display-toggle: none;
-    --collapsible-toggle-background: var(--ion-item-background);
-    --collapsible-min-button-height: 44px;
-
-    .collapsible-toggle {
-        display: var(--collapsible-display-toggle);
-    }
-
-    &.collapsible-enabled {
-        --collapsible-display-toggle: block;
-
-        .collapsible-toggle {
-            display: var(--collapsible-display-toggle);
-            position: absolute;
-            bottom: 0;
-            left: 0;
-            right: 0;
-            text-align: center;
-            z-index: 7;
-            text-transform: none;
-            text-align: end;
-            font-size: 14px;
-            background-color: var(--collapsible-toggle-background);
-            color: var(--text-color);
-            margin: 0;
-
-            .collapsible-toggle-arrow {
-                width: var(--a11y-min-target-size);
-                height: var(--a11y-min-target-size);
-
-                background-position: center;
-                background-repeat: no-repeat;
-                background-size: 14px 14px;
-                @include core-transition(transform, 500ms);
-
-                @include push-arrow-color(626262, true);
-
-                @include darkmode() {
-                    @include push-arrow-color(ffffff, true);
-                }
-            }
-        }
-
-        &.collapsible-collapsed {
-            overflow: hidden;
-            min-height: calc(var(--collapsible-min-button-height) + 12);
-
-            .collapsible-toggle-arrow {
-                transform: rotate(90deg);
-            }
-
-            &:before {
-                content: '';
-                height: 100%;
-                position: absolute;
-                @include position(null, 0, 0, 0);
-                background: -webkit-linear-gradient(top, rgba(var(--core-format-text-background-gradient-rgb), 0) calc(100% - 60px), rgba(var(--core-format-text-background-gradient-rgb), 1) calc(100% - 40px));
-                background: linear-gradient(to bottom, rgba(var(--core-format-text-background-gradient-rgb), 0) calc(100% - 60px), rgba(var(--core-format-text-background-gradient-rgb), 1) calc(100% - 40px));
-                z-index: 6;
-            }
-        }
-
-        &.collapsible-expanded {
-            max-height: none !important;
-            padding-bottom: var(--collapsible-min-button-height); // So the Show less button can fit.
-
-            .collapsible-toggle-arrow {
-                transform: rotate(-90deg);
-            }
-        }
-    }
+    @include collapsible-item();
 }
 
 ion-header.no-title {
diff --git a/src/theme/theme.dark.scss b/src/theme/theme.dark.scss
index 206f6e2d4..6f0743f7c 100644
--- a/src/theme/theme.dark.scss
+++ b/src/theme/theme.dark.scss
@@ -97,6 +97,10 @@
     --core-combobox-color: var(--text-color);
     --core-combobox-border-color: var(--core-input-stroke);
 
+    --collapsible-toggle-background: var(--light);
+
+    --background-gradient-rgb: #{$ion-item-background-dark-rgb};
+
     --core-login-background: var(--gray-900);
     --core-login-text-color: var(--white);
     --core-login-input-background: var(--core-login-background);
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 448d88505..32b099920 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -288,6 +288,12 @@
     --selected-item-color: var(--primary);
     --selected-item-border-width: 5px;
 
+    --collapsible-toggle-background: var(--light);
+    --collapsible-min-button-height: 44px;
+    --collapsible-toggle-text: var(--text-color);
+
+    --background-gradient-rgb: #{$ion-item-background-rgb};
+
     --core-login-background: var(--white);
     --core-login-text-color: var(--gray-900);
     --core-login-input-background: var(--white);

From 766dc70a1bf6d6058e906c8e4d34679ef0a1ca70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 24 Feb 2022 08:54:29 +0100
Subject: [PATCH 0595/1008] MOBILE-3833 h5p: Align first column to start on
 reports

---
 .../h5pactivity/pages/attempt-results/attempt-results.html    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.html b/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.html
index 00a903743..718811590 100644
--- a/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.html
+++ b/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.html
@@ -109,7 +109,7 @@
                         <ion-item class="ion-text-wrap addon-mod_h5pactivity-result-table-header">
                             <ion-label>
                                 <ion-row class="ion-align-items-center">
-                                    <ion-col class="ion-text-center">{{ result.optionslabel }}</ion-col>
+                                    <ion-col class="ion-text-start">{{ result.optionslabel }}</ion-col>
                                     <ion-col class="ion-text-center">{{ result.correctlabel }}</ion-col>
                                     <ion-col class="ion-text-center">{{ result.answerlabel }}</ion-col>
                                 </ion-row>
@@ -118,7 +118,7 @@
                         <ion-item *ngFor="let option of result.options" class="ion-text-wrap addon-mod_h5pactivity-result-table-row">
                             <ion-label>
                                 <ion-row class="ion-align-items-center">
-                                    <ion-col class="ion-text-center">
+                                    <ion-col class="ion-text-start">
                                         <core-format-text [text]="option.description" [component]="component" [componentId]="cmId"
                                             contextLevel="module" [contextInstanceId]="cmId" [courseId]="courseId">
                                         </core-format-text>

From f3f0b69c90cdfc87153fd889987be3f23a91fb7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 24 Feb 2022 09:14:03 +0100
Subject: [PATCH 0596/1008] MOBILE-3916 style: Same color on system top bar
 than header bar

---
 src/core/services/app.ts | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/core/services/app.ts b/src/core/services/app.ts
index 523418254..4ab97df7f 100644
--- a/src/core/services/app.ts
+++ b/src/core/services/app.ts
@@ -638,14 +638,6 @@ export class CoreAppProvider {
             color = CoreColors.getToolbarBackgroundColor();
         }
 
-        // Make darker on Android, except white.
-        if (this.isAndroid()) {
-            const rgb = CoreColors.hexToRGB(color);
-            if (rgb.red != 255 || rgb.green != 255 || rgb.blue != 255) {
-                color = CoreColors.darker(color, 10);
-            }
-        }
-
         this.logger.debug(`Set status bar color ${color}`);
 
         const useLightText = CoreColors.isWhiteContrastingBetter(color);

From 40a0d63394314789c6c5f68951face26099512b4 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 23 Feb 2022 12:36:47 +0100
Subject: [PATCH 0597/1008] MOBILE-3780 ws: Improve error displayed when upload
 file

---
 src/core/services/utils/text.ts | 12 +++++
 src/core/services/ws.ts         | 85 +++++++++++++++++----------------
 2 files changed, 57 insertions(+), 40 deletions(-)

diff --git a/src/core/services/utils/text.ts b/src/core/services/utils/text.ts
index 4c6d5f307..9a091db74 100644
--- a/src/core/services/utils/text.ts
+++ b/src/core/services/utils/text.ts
@@ -530,6 +530,18 @@ export class CoreTextUtilsProvider {
         return error.message || error.error || error.content || error.body;
     }
 
+    /**
+     * Given some HTML code, return the HTML code inside <body> tags. If there are no body tags, return the whole HTML.
+     *
+     * @param html HTML text.
+     * @return Body HTML.
+     */
+    getHTMLBodyContent(html: string): string {
+        const matches = html.match(/<body>([\s\S]*)<\/body>/im);
+
+        return matches?.[1] ?? html;
+    }
+
     /**
      * Get the pluginfile URL to replace @@PLUGINFILE@@ wildcards.
      *
diff --git a/src/core/services/ws.ts b/src/core/services/ws.ts
index d1ab15a5e..bde6e1526 100644
--- a/src/core/services/ws.ts
+++ b/src/core/services/ws.ts
@@ -16,7 +16,7 @@ import { Injectable } from '@angular/core';
 import { HttpResponse, HttpParams } from '@angular/common/http';
 
 import { FileEntry } from '@ionic-native/file/ngx';
-import { FileUploadOptions } from '@ionic-native/file-transfer/ngx';
+import { FileUploadOptions, FileUploadResult } from '@ionic-native/file-transfer/ngx';
 import { Md5 } from 'ts-md5/dist/md5';
 import { Observable } from 'rxjs';
 import { timeout } from 'rxjs/operators';
@@ -885,51 +885,56 @@ export class CoreWSProvider {
         options.headers = {};
         options['Connection'] = 'close';
 
+        let success: FileUploadResult;
+
         try {
-            const success = await transfer.upload(filePath, uploadUrl, options, true);
-
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            const data = CoreTextUtils.parseJSON<any>(
-                success.response,
-                null,
-                this.logger.error.bind(this.logger, 'Error parsing response from upload', success.response),
-            );
-
-            if (data === null) {
-                throw new CoreError(Translate.instant('core.errorinvalidresponse'));
-            }
-
-            if (!data) {
-                throw new CoreError(Translate.instant('core.serverconnection'));
-            } else if (typeof data != 'object') {
-                this.logger.warn('Upload file: Response of type "' + typeof data + '" received, expecting "object"');
-
-                throw new CoreError(Translate.instant('core.errorinvalidresponse'));
-            }
-
-            if (data.exception !== undefined) {
-                throw new CoreWSError(data);
-            } else if (data.error !== undefined) {
-                throw new CoreWSError({
-                    errorcode: data.errortype,
-                    message: data.error,
-                });
-            } else if (data[0] && data[0].error !== undefined) {
-                throw new CoreWSError({
-                    errorcode: data[0].errortype,
-                    message: data[0].error,
-                });
-            }
-
-            // We uploaded only 1 file, so we only return the first file returned.
-            this.logger.debug('Successfully uploaded file', filePath);
-
-            return data[0];
+            success = await transfer.upload(filePath, uploadUrl, options, true);
         } catch (error) {
             this.logger.error('Error while uploading file', filePath, error);
 
+            throw new CoreError(CoreTextUtils.buildSeveralParagraphsMessage([
+                Translate.instant('core.cannotconnecttrouble'),
+                CoreTextUtils.getHTMLBodyContent(CoreTextUtils.getErrorMessageFromError(error) || ''),
+            ]));
+        }
+
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const data = CoreTextUtils.parseJSON<any>(
+            success.response,
+            null,
+            this.logger.error.bind(this.logger, 'Error parsing response from upload', success.response),
+        );
+
+        if (data === null) {
             throw new CoreError(Translate.instant('core.errorinvalidresponse'));
         }
+
+        if (!data) {
+            throw new CoreError(Translate.instant('core.serverconnection'));
+        } else if (typeof data != 'object') {
+            this.logger.warn('Upload file: Response of type "' + typeof data + '" received, expecting "object"');
+
+            throw new CoreError(Translate.instant('core.errorinvalidresponse'));
+        }
+
+        if (data.exception !== undefined) {
+            throw new CoreWSError(data);
+        } else if (data.error !== undefined) {
+            throw new CoreWSError({
+                errorcode: data.errortype,
+                message: data.error,
+            });
+        } else if (data[0] && data[0].error !== undefined) {
+            throw new CoreWSError({
+                errorcode: data[0].errortype,
+                message: data[0].error,
+            });
+        }
+
+        // We uploaded only 1 file, so we only return the first file returned.
+        this.logger.debug('Successfully uploaded file', filePath);
+
+        return data[0];
     }
 
     /**

From 3a51b361fd321539906cbd94c7c76aea182cba59 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 23 Feb 2022 14:47:38 +0100
Subject: [PATCH 0598/1008] MOBILE-3780 core: Fix spinner not shown in forum
 when refreshing

The variable loaded has been renamed to showLoading in index components
---
 .../components/index/addon-mod-assign-index.html       |  7 ++++---
 src/addons/mod/assign/pages/index/index.html           |  2 +-
 .../mod/bigbluebuttonbn/components/index/index.html    |  5 +++--
 .../mod/bigbluebuttonbn/components/index/index.ts      |  8 ++++----
 src/addons/mod/bigbluebuttonbn/pages/index/index.html  |  2 +-
 .../book/components/index/addon-mod-book-index.html    |  5 +++--
 src/addons/mod/book/pages/index/index.html             |  2 +-
 .../chat/components/index/addon-mod-chat-index.html    |  5 +++--
 src/addons/mod/chat/pages/index/index.html             |  2 +-
 .../components/index/addon-mod-choice-index.html       |  5 +++--
 src/addons/mod/choice/pages/index/index.html           |  2 +-
 .../data/components/index/addon-mod-data-index.html    |  5 +++--
 src/addons/mod/data/components/index/index.ts          |  8 ++++----
 src/addons/mod/data/pages/index/index.html             |  2 +-
 .../components/index/addon-mod-feedback-index.html     |  5 +++--
 src/addons/mod/feedback/components/index/index.ts      |  2 +-
 src/addons/mod/feedback/pages/index/index.html         |  2 +-
 .../components/index/addon-mod-folder-index.html       |  5 +++--
 src/addons/mod/folder/components/index/index.ts        |  4 ++--
 src/addons/mod/folder/pages/index/index.html           |  2 +-
 src/addons/mod/forum/components/index/index.html       |  6 +++---
 .../components/index/addon-mod-glossary-index.html     |  6 +++---
 src/addons/mod/glossary/components/index/index.ts      |  4 ++--
 .../components/index/addon-mod-h5pactivity-index.html  |  5 +++--
 src/addons/mod/h5pactivity/pages/index/index.html      |  2 +-
 .../imscp/components/index/addon-mod-imscp-index.html  |  9 +++++----
 .../components/index/addon-mod-lesson-index.html       |  7 ++++---
 src/addons/mod/lesson/components/index/index.ts        |  4 ++--
 src/addons/mod/lesson/pages/index/index.html           |  2 +-
 .../mod/lti/components/index/addon-mod-lti-index.html  |  5 +++--
 src/addons/mod/lti/pages/index/index.html              |  2 +-
 .../page/components/index/addon-mod-page-index.html    |  5 +++--
 src/addons/mod/page/pages/index/index.html             |  2 +-
 .../quiz/components/index/addon-mod-quiz-index.html    |  5 +++--
 src/addons/mod/quiz/components/index/index.ts          |  7 +++----
 src/addons/mod/quiz/pages/index/index.html             |  2 +-
 .../components/index/addon-mod-resource-index.html     |  5 +++--
 src/addons/mod/resource/pages/index/index.html         |  2 +-
 .../scorm/components/index/addon-mod-scorm-index.html  |  7 ++++---
 src/addons/mod/scorm/pages/index/index.html            |  2 +-
 .../components/index/addon-mod-survey-index.html       |  5 +++--
 src/addons/mod/survey/pages/index/index.html           |  2 +-
 .../mod/url/components/index/addon-mod-url-index.html  |  5 +++--
 src/addons/mod/url/pages/index/index.html              |  2 +-
 .../wiki/components/index/addon-mod-wiki-index.html    |  7 ++++---
 src/addons/mod/wiki/pages/index/index.html             |  2 +-
 .../components/index/addon-mod-workshop-index.html     |  5 +++--
 src/addons/mod/workshop/pages/index/index.html         |  2 +-
 .../features/course/classes/main-activity-component.ts |  6 +++---
 .../features/course/classes/main-resource-component.ts | 10 +++++-----
 upgrade.txt                                            |  1 +
 51 files changed, 118 insertions(+), 98 deletions(-)

diff --git a/src/addons/mod/assign/components/index/addon-mod-assign-index.html b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
index 44fce0030..72d05bb18 100644
--- a/src/addons/mod/assign/components/index/addon-mod-assign-index.html
+++ b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="loaded">
+<core-loading [hideUntil]="!showLoading">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
@@ -122,10 +122,11 @@
     </ng-container>
 
     <!-- If it's a student, display his submission. -->
-    <addon-mod-assign-submission *ngIf="loaded && !canViewAllSubmissions && canViewOwnSubmission" [courseId]="courseId"
+    <addon-mod-assign-submission *ngIf="!showLoading && !canViewAllSubmissions && canViewOwnSubmission" [courseId]="courseId"
         [moduleId]="module.id">
     </addon-mod-assign-submission>
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+    (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/assign/pages/index/index.html b/src/addons/mod/assign/pages/index/index.html
index 0d424c637..71f69b398 100644
--- a/src/addons/mod/assign/pages/index/index.html
+++ b/src/addons/mod/assign/pages/index/index.html
@@ -16,7 +16,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-refresher slot="fixed" [disabled]="!activityComponent?.loaded" (ionRefresh)="activityComponent?.doRefresh($event.target)">
+    <ion-refresher slot="fixed" [disabled]="activityComponent?.showLoading" (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
diff --git a/src/addons/mod/bigbluebuttonbn/components/index/index.html b/src/addons/mod/bigbluebuttonbn/components/index/index.html
index 49ebe332d..98a773c09 100644
--- a/src/addons/mod/bigbluebuttonbn/components/index/index.html
+++ b/src/addons/mod/bigbluebuttonbn/components/index/index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="loaded" class="safe-area-page">
+<core-loading [hideUntil]="!showLoading" class="safe-area-page">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
@@ -112,5 +112,6 @@
     </ng-container>
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+    (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/bigbluebuttonbn/components/index/index.ts b/src/addons/mod/bigbluebuttonbn/components/index/index.ts
index 8d85abf94..5f1e648cb 100644
--- a/src/addons/mod/bigbluebuttonbn/components/index/index.ts
+++ b/src/addons/mod/bigbluebuttonbn/components/index/index.ts
@@ -115,14 +115,14 @@ export class AddonModBBBIndexComponent extends CoreCourseModuleMainActivityCompo
             return;
         }
 
-        this.loaded = false;
+        this.showLoading = true;
 
         try {
             await AddonModBBB.invalidateAllGroupsMeetingInfo(this.bbb.id);
 
             await this.fetchMeetingInfo();
         } finally {
-            this.loaded = true;
+            this.showLoading = false;
         }
     }
 
@@ -148,14 +148,14 @@ export class AddonModBBBIndexComponent extends CoreCourseModuleMainActivityCompo
      * @return Promise resolved when done.
      */
     async groupChanged(): Promise<void> {
-        this.loaded = false;
+        this.showLoading = true;
 
         try {
             await this.fetchMeetingInfo();
         } catch (error) {
             CoreDomUtils.showErrorModal(error);
         } finally {
-            this.loaded = true;
+            this.showLoading = false;
         }
     }
 
diff --git a/src/addons/mod/bigbluebuttonbn/pages/index/index.html b/src/addons/mod/bigbluebuttonbn/pages/index/index.html
index 5d8e5197e..f6e0e524e 100644
--- a/src/addons/mod/bigbluebuttonbn/pages/index/index.html
+++ b/src/addons/mod/bigbluebuttonbn/pages/index/index.html
@@ -15,7 +15,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-refresher slot="fixed" [disabled]="!activityComponent?.loaded" (ionRefresh)="activityComponent?.doRefresh($event.target)">
+    <ion-refresher slot="fixed" [disabled]="activityComponent?.showLoading" (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
diff --git a/src/addons/mod/book/components/index/addon-mod-book-index.html b/src/addons/mod/book/components/index/addon-mod-book-index.html
index f8d3545b6..410dd43cc 100644
--- a/src/addons/mod/book/components/index/addon-mod-book-index.html
+++ b/src/addons/mod/book/components/index/addon-mod-book-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="loaded">
+<core-loading [hideUntil]="!showLoading">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
@@ -41,5 +41,6 @@
 
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+    (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/book/pages/index/index.html b/src/addons/mod/book/pages/index/index.html
index b09bfab96..fb3db333b 100644
--- a/src/addons/mod/book/pages/index/index.html
+++ b/src/addons/mod/book/pages/index/index.html
@@ -15,7 +15,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-refresher slot="fixed" [disabled]="!activityComponent?.loaded" (ionRefresh)="activityComponent?.doRefresh($event.target)">
+    <ion-refresher slot="fixed" [disabled]="activityComponent?.showLoading" (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
diff --git a/src/addons/mod/chat/components/index/addon-mod-chat-index.html b/src/addons/mod/chat/components/index/addon-mod-chat-index.html
index 47f13bd8c..7296cddb5 100644
--- a/src/addons/mod/chat/components/index/addon-mod-chat-index.html
+++ b/src/addons/mod/chat/components/index/addon-mod-chat-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="loaded" class="safe-area-padding">
+<core-loading [hideUntil]="!showLoading" class="safe-area-padding">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
@@ -30,5 +30,6 @@
     </ng-container>
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+    (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/chat/pages/index/index.html b/src/addons/mod/chat/pages/index/index.html
index ed096fe29..bc5f254eb 100644
--- a/src/addons/mod/chat/pages/index/index.html
+++ b/src/addons/mod/chat/pages/index/index.html
@@ -15,7 +15,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-refresher slot="fixed" [disabled]="!activityComponent?.loaded" (ionRefresh)="activityComponent?.doRefresh($event.target)">
+    <ion-refresher slot="fixed" [disabled]="activityComponent?.showLoading" (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
diff --git a/src/addons/mod/choice/components/index/addon-mod-choice-index.html b/src/addons/mod/choice/components/index/addon-mod-choice-index.html
index e29970de6..1eebfa01c 100644
--- a/src/addons/mod/choice/components/index/addon-mod-choice-index.html
+++ b/src/addons/mod/choice/components/index/addon-mod-choice-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="loaded">
+<core-loading [hideUntil]="!showLoading">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
@@ -135,7 +135,8 @@
     </ion-card>
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+    (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
 
 <!-- Template to render a choice option label. -->
diff --git a/src/addons/mod/choice/pages/index/index.html b/src/addons/mod/choice/pages/index/index.html
index 7c56322d2..b5a04c2a6 100644
--- a/src/addons/mod/choice/pages/index/index.html
+++ b/src/addons/mod/choice/pages/index/index.html
@@ -15,7 +15,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-refresher slot="fixed" [disabled]="!activityComponent?.loaded" (ionRefresh)="activityComponent?.doRefresh($event.target)">
+    <ion-refresher slot="fixed" [disabled]="activityComponent?.showLoading" (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
diff --git a/src/addons/mod/data/components/index/addon-mod-data-index.html b/src/addons/mod/data/components/index/addon-mod-data-index.html
index 59f79533d..bb10fd6d3 100644
--- a/src/addons/mod/data/components/index/addon-mod-data-index.html
+++ b/src/addons/mod/data/components/index/addon-mod-data-index.html
@@ -18,7 +18,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="loaded">
+<core-loading [hideUntil]="!showLoading">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
@@ -120,7 +120,8 @@
 
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+    (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
 
 <ion-fab slot="fixed" core-fab vertical="bottom" horizontal="end" *ngIf="canAdd">
diff --git a/src/addons/mod/data/components/index/index.ts b/src/addons/mod/data/components/index/index.ts
index 9bdb523fe..2c367fa48 100644
--- a/src/addons/mod/data/components/index/index.ts
+++ b/src/addons/mod/data/components/index/index.ts
@@ -133,7 +133,7 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
         // Refresh entries on change.
         this.entryChangedObserver = CoreEvents.on(AddonModDataProvider.ENTRY_CHANGED, (eventData) => {
             if (this.database?.id == eventData.dataId) {
-                this.loaded = false;
+                this.showLoading = true;
 
                 return this.loadContent(true);
             }
@@ -191,7 +191,7 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
      */
     protected isRefreshSyncNeeded(syncEventData: AddonModDataAutoSyncData): boolean {
         if (this.database && syncEventData.dataId == this.database.id && syncEventData.entryId === undefined) {
-            this.loaded = false;
+            this.showLoading = true;
             // Refresh the data.
             this.content?.scrollToTop();
 
@@ -404,7 +404,7 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
      * @return Resolved when done.
      */
     async searchEntries(page: number): Promise<void> {
-        this.loaded = false;
+        this.showLoading = true;
         this.search.page = page;
 
         try {
@@ -414,7 +414,7 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'core.course.errorgetmodule', true);
         } finally {
-            this.loaded = true;
+            this.showLoading = false;
         }
     }
 
diff --git a/src/addons/mod/data/pages/index/index.html b/src/addons/mod/data/pages/index/index.html
index 46e4a1dd9..ff9ed701e 100644
--- a/src/addons/mod/data/pages/index/index.html
+++ b/src/addons/mod/data/pages/index/index.html
@@ -16,7 +16,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-refresher slot="fixed" [disabled]="!activityComponent?.loaded" (ionRefresh)="activityComponent?.doRefresh($event.target)">
+    <ion-refresher slot="fixed" [disabled]="activityComponent?.showLoading" (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
diff --git a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
index f564311d8..1da7a6b31 100644
--- a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
+++ b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="loaded">
+<core-loading [hideUntil]="!showLoading">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
@@ -35,7 +35,8 @@
     </core-tabs>
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+    (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
 
 <ng-template #basicInfo>
diff --git a/src/addons/mod/feedback/components/index/index.ts b/src/addons/mod/feedback/components/index/index.ts
index 255b0e6ce..e31b5f529 100644
--- a/src/addons/mod/feedback/components/index/index.ts
+++ b/src/addons/mod/feedback/components/index/index.ts
@@ -97,7 +97,7 @@ export class AddonModFeedbackIndexComponent extends CoreCourseModuleMainActivity
 
             this.tabsLoaded.analysis = false;
             this.tabsLoaded.overview = false;
-            this.loaded = false;
+            this.showLoading = true;
 
             // Prefetch data if needed.
             if (!data.offline && this.isPrefetched()) {
diff --git a/src/addons/mod/feedback/pages/index/index.html b/src/addons/mod/feedback/pages/index/index.html
index fa031ccc7..6996000e4 100644
--- a/src/addons/mod/feedback/pages/index/index.html
+++ b/src/addons/mod/feedback/pages/index/index.html
@@ -15,7 +15,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-refresher slot="fixed" [disabled]="!activityComponent?.loaded" (ionRefresh)="activityComponent?.doRefresh($event.target)">
+    <ion-refresher slot="fixed" [disabled]="activityComponent?.showLoading" (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
diff --git a/src/addons/mod/folder/components/index/addon-mod-folder-index.html b/src/addons/mod/folder/components/index/addon-mod-folder-index.html
index b01b72741..82cb66284 100644
--- a/src/addons/mod/folder/components/index/addon-mod-folder-index.html
+++ b/src/addons/mod/folder/components/index/addon-mod-folder-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="loaded">
+<core-loading [hideUntil]="!showLoading">
 
     <!-- Activity info. -->
     <core-course-module-info *ngIf="!subfolder" [module]="module" [description]="description" [component]="component"
@@ -32,5 +32,6 @@
 
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+    (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/folder/components/index/index.ts b/src/addons/mod/folder/components/index/index.ts
index 562a2824e..fcfa675c7 100644
--- a/src/addons/mod/folder/components/index/index.ts
+++ b/src/addons/mod/folder/components/index/index.ts
@@ -55,7 +55,7 @@ export class AddonModFolderIndexComponent extends CoreCourseModuleMainResourceCo
             this.description = this.folderInstance ? this.folderInstance.intro : this.module.description;
             this.contents = this.subfolder;
 
-            this.loaded = true;
+            this.showLoading = false;
 
             return;
         }
@@ -70,7 +70,7 @@ export class AddonModFolderIndexComponent extends CoreCourseModuleMainResourceCo
                 // Ignore errors.
             }
         } finally {
-            this.loaded = true;
+            this.showLoading = false;
         }
     }
 
diff --git a/src/addons/mod/folder/pages/index/index.html b/src/addons/mod/folder/pages/index/index.html
index 442b976ec..b83a186f5 100644
--- a/src/addons/mod/folder/pages/index/index.html
+++ b/src/addons/mod/folder/pages/index/index.html
@@ -16,7 +16,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-refresher slot="fixed" [disabled]="subfolder || !activityComponent?.loaded"
+    <ion-refresher slot="fixed" [disabled]="subfolder || activityComponent?.showLoading"
         (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
diff --git a/src/addons/mod/forum/components/index/index.html b/src/addons/mod/forum/components/index/index.html
index a7a5afbdc..1c8e9e08a 100644
--- a/src/addons/mod/forum/components/index/index.html
+++ b/src/addons/mod/forum/components/index/index.html
@@ -7,11 +7,11 @@
 
 <!-- Content. -->
 <core-split-view>
-    <ion-refresher slot="fixed" [disabled]="discussions && !discussions.loaded" (ionRefresh)="doRefresh($event.target)">
+    <ion-refresher slot="fixed" [disabled]="showLoading || (discussions && !discussions.loaded)" (ionRefresh)="doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
-    <core-loading [hideUntil]="discussions && discussions.loaded">
+    <core-loading [hideUntil]="!showLoading && discussions && discussions.loaded">
         <!-- Activity info. -->
         <core-course-module-info [module]="module" [description]="forum && forum.type != 'single' && description" [component]="component"
             [componentId]="componentId" [courseId]="courseId" [hasDataToSync]="hasOffline || hasOfflineRatings">
@@ -114,7 +114,7 @@
         </ng-container>
     </core-loading>
 
-    <core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module"
+    <core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
         (completionChanged)="onCompletionChange()">
     </core-course-module-navigation>
 
diff --git a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
index 524abb9b1..c973a95a3 100644
--- a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
+++ b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
@@ -16,7 +16,7 @@
 
 <!-- Content. -->
 <core-split-view>
-    <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="doRefresh($event.target)">
+    <ion-refresher slot="fixed" [disabled]="showLoading" (ionRefresh)="doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
@@ -24,7 +24,7 @@
         [autoFocus]="true" [lengthCheck]="2" (onClear)="toggleSearch()" searchArea="AddonModGlossary-{{module.id}}">
     </core-search-box>
 
-    <core-loading [hideUntil]="loaded">
+    <core-loading [hideUntil]="!showLoading">
         <!-- Activity info. -->
         <core-course-module-info *ngIf="!isSearch" [module]="module" [description]="description" [component]="component"
             [componentId]="componentId" [courseId]="courseId" [hasDataToSync]="hasOffline || hasOfflineRatings">
@@ -72,7 +72,7 @@
         </core-infinite-loading>
     </core-loading>
 
-    <core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module"
+    <core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
         (completionChanged)="onCompletionChange()">
     </core-course-module-navigation>
 
diff --git a/src/addons/mod/glossary/components/index/index.ts b/src/addons/mod/glossary/components/index/index.ts
index cbcc5aa89..4e483a919 100644
--- a/src/addons/mod/glossary/components/index/index.ts
+++ b/src/addons/mod/glossary/components/index/index.ts
@@ -393,7 +393,7 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
         this.loadingMessage = Translate.instant('core.loading');
         this.content?.scrollToTop();
         this.switchMode(mode);
-        this.loaded = false;
+        this.showLoading = true;
         this.loadContent();
     }
 
@@ -411,7 +411,7 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
      */
     search(query: string): void {
         this.loadingMessage = Translate.instant('core.searching');
-        this.loaded = false;
+        this.showLoading = true;
 
         this.entries?.getSource().search(query);
         this.loadContent();
diff --git a/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html b/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
index 039f30ce2..deed6960a 100644
--- a/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
+++ b/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
@@ -16,7 +16,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="loaded" class="safe-area-padding">
+<core-loading [hideUntil]="!showLoading" class="safe-area-padding">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
@@ -68,5 +68,6 @@
     </core-h5p-iframe>
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+    (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/h5pactivity/pages/index/index.html b/src/addons/mod/h5pactivity/pages/index/index.html
index 6ac751048..8c2890fee 100644
--- a/src/addons/mod/h5pactivity/pages/index/index.html
+++ b/src/addons/mod/h5pactivity/pages/index/index.html
@@ -16,7 +16,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-refresher slot="fixed" [disabled]="!activityComponent?.loaded" (ionRefresh)="activityComponent?.doRefresh($event.target)">
+    <ion-refresher slot="fixed" [disabled]="activityComponent?.showLoading" (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
diff --git a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
index d795fb3fe..a3ce89920 100644
--- a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
+++ b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
@@ -1,6 +1,6 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <ion-button *ngIf="loaded" (click)="showToc()" aria-haspopup="true" [attr.aria-label]="'addon.mod_imscp.toc' | translate">
+    <ion-button *ngIf="!showLoading" (click)="showToc()" aria-haspopup="true" [attr.aria-label]="'addon.mod_imscp.toc' | translate">
         <ion-icon name="fas-bookmark" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
 
@@ -10,7 +10,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="loaded" class="safe-area-padding">
+<core-loading [hideUntil]="!showLoading" class="safe-area-padding">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module">
@@ -26,9 +26,10 @@
     <div class="addon-mod-imscp-container">
         <core-navigation-bar [items]="navigationItems" (action)="loadItem($event)">
         </core-navigation-bar>
-        <core-iframe *ngIf="loaded" [src]="src" [showFullscreenOnToolbar]="true" [autoFullscreenOnRotate]="true"></core-iframe>
+        <core-iframe *ngIf="!showLoading" [src]="src" [showFullscreenOnToolbar]="true" [autoFullscreenOnRotate]="true"></core-iframe>
     </div>
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+    (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
index cb63e1d65..b183a984a 100644
--- a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
+++ b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
@@ -6,8 +6,8 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="loaded">
-    <core-tabs [hideUntil]="loaded" [selectedIndex]="selectedTab">
+<core-loading [hideUntil]="!showLoading">
+    <core-tabs [hideUntil]="!showLoading" [selectedIndex]="selectedTab">
         <!-- Index/Preview tab. -->
         <core-tab [title]="'addon.mod_lesson.preview' | translate" (ionSelect)="indexSelected()">
             <ng-template>
@@ -278,5 +278,6 @@
     </core-tabs>
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+    (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/lesson/components/index/index.ts b/src/addons/mod/lesson/components/index/index.ts
index 1a9e8b614..415bf0555 100644
--- a/src/addons/mod/lesson/components/index/index.ts
+++ b/src/addons/mod/lesson/components/index/index.ts
@@ -618,7 +618,7 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo
             return;
         }
 
-        this.loaded = false;
+        this.showLoading = true;
 
         try {
             await this.validatePassword(<string> password);
@@ -635,7 +635,7 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo
         } catch (error) {
             CoreDomUtils.showErrorModal(error);
         } finally {
-            this.loaded = true;
+            this.showLoading = false;
 
             CoreForms.triggerFormSubmittedEvent(this.formElement, true, this.siteId);
         }
diff --git a/src/addons/mod/lesson/pages/index/index.html b/src/addons/mod/lesson/pages/index/index.html
index a6b75a913..fec01e323 100644
--- a/src/addons/mod/lesson/pages/index/index.html
+++ b/src/addons/mod/lesson/pages/index/index.html
@@ -15,7 +15,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-refresher slot="fixed" [disabled]="!activityComponent?.loaded" (ionRefresh)="activityComponent?.doRefresh($event.target)">
+    <ion-refresher slot="fixed" [disabled]="activityComponent?.showLoading" (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
diff --git a/src/addons/mod/lti/components/index/addon-mod-lti-index.html b/src/addons/mod/lti/components/index/addon-mod-lti-index.html
index dc3b6068d..1452e0c18 100644
--- a/src/addons/mod/lti/components/index/addon-mod-lti-index.html
+++ b/src/addons/mod/lti/components/index/addon-mod-lti-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="loaded" class="safe-area-padding">
+<core-loading [hideUntil]="!showLoading" class="safe-area-padding">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="displayDescription && description" [component]="component"
@@ -21,5 +21,6 @@
     </div>
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+    (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/lti/pages/index/index.html b/src/addons/mod/lti/pages/index/index.html
index 9b7017a3f..38ce5fc89 100644
--- a/src/addons/mod/lti/pages/index/index.html
+++ b/src/addons/mod/lti/pages/index/index.html
@@ -16,7 +16,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-refresher slot="fixed" [disabled]="!activityComponent?.loaded" (ionRefresh)="activityComponent?.doRefresh($event.target)">
+    <ion-refresher slot="fixed" [disabled]="activityComponent?.showLoading" (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
diff --git a/src/addons/mod/page/components/index/addon-mod-page-index.html b/src/addons/mod/page/components/index/addon-mod-page-index.html
index 1cfc5f303..83536200d 100644
--- a/src/addons/mod/page/components/index/addon-mod-page-index.html
+++ b/src/addons/mod/page/components/index/addon-mod-page-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="loaded" class="safe-area-padding">
+<core-loading [hideUntil]="!showLoading" class="safe-area-padding">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="displayDescription && description" [component]="component"
@@ -32,5 +32,6 @@
 
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+    (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/page/pages/index/index.html b/src/addons/mod/page/pages/index/index.html
index cab819bed..fc6dc2f86 100644
--- a/src/addons/mod/page/pages/index/index.html
+++ b/src/addons/mod/page/pages/index/index.html
@@ -15,7 +15,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-refresher slot="fixed" [disabled]="!activityComponent?.loaded" (ionRefresh)="activityComponent?.doRefresh($event.target)">
+    <ion-refresher slot="fixed" [disabled]="activityComponent?.showLoading" (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
diff --git a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
index 6323f3cb5..59961b31c 100644
--- a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
+++ b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="loaded">
+<core-loading [hideUntil]="!showLoading">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
@@ -206,5 +206,6 @@
     </ion-card>
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+    (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/quiz/components/index/index.ts b/src/addons/mod/quiz/components/index/index.ts
index 1f03d876e..d827022de 100644
--- a/src/addons/mod/quiz/components/index/index.ts
+++ b/src/addons/mod/quiz/components/index/index.ts
@@ -455,13 +455,13 @@ export class AddonModQuizIndexComponent extends CoreCourseModuleMainActivityComp
         }
 
         // Refresh data.
-        this.loaded = false;
+        this.showLoading = true;
         this.content?.scrollToTop();
 
         await promise;
         await CoreUtils.ignoreErrors(this.refreshContent(true));
 
-        this.loaded = true;
+        this.showLoading = false;
     }
 
     /**
@@ -547,8 +547,7 @@ export class AddonModQuizIndexComponent extends CoreCourseModuleMainActivityComp
 
         if (status == CoreConstants.DOWNLOADED && previousStatus == CoreConstants.DOWNLOADING) {
             // Quiz downloaded now, maybe a new attempt was created. Load content again.
-            this.loaded = false;
-            this.loadContent();
+            this.showLoadingAndFetch();
         }
     }
 
diff --git a/src/addons/mod/quiz/pages/index/index.html b/src/addons/mod/quiz/pages/index/index.html
index 9a58a95ff..233973f4f 100644
--- a/src/addons/mod/quiz/pages/index/index.html
+++ b/src/addons/mod/quiz/pages/index/index.html
@@ -16,7 +16,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-refresher slot="fixed" [disabled]="!activityComponent?.loaded" (ionRefresh)="activityComponent?.doRefresh($event.target)">
+    <ion-refresher slot="fixed" [disabled]="activityComponent?.showLoading" (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
diff --git a/src/addons/mod/resource/components/index/addon-mod-resource-index.html b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
index 89fbf28f7..1efbca3f9 100644
--- a/src/addons/mod/resource/components/index/addon-mod-resource-index.html
+++ b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="loaded" class="safe-area-padding">
+<core-loading [hideUntil]="!showLoading" class="safe-area-padding">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [courseId]="courseId" [description]="displayDescription && description"
@@ -97,5 +97,6 @@
     </ng-container>
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+    (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/resource/pages/index/index.html b/src/addons/mod/resource/pages/index/index.html
index ac1c3727e..4bfe3e2a6 100644
--- a/src/addons/mod/resource/pages/index/index.html
+++ b/src/addons/mod/resource/pages/index/index.html
@@ -16,7 +16,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-refresher slot="fixed" [disabled]="!activityComponent?.loaded || activityComponent?.mode == 'iframe'"
+    <ion-refresher slot="fixed" [disabled]="activityComponent?.showLoading || activityComponent?.mode == 'iframe'"
         (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
diff --git a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
index 275c81125..96329ba19 100644
--- a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
+++ b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="loaded" class="safe-area-padding">
+<core-loading [hideUntil]="!showLoading" class="safe-area-padding">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
@@ -21,7 +21,7 @@
         </ion-item>
     </ion-card>
 
-    <ng-container *ngIf="scorm && loaded && !scorm.warningMessage">
+    <ng-container *ngIf="scorm && !showLoading && !scorm.warningMessage">
         <!-- Attempts status. -->
         <ion-card *ngIf="(scorm.displayattemptstatus || offlineAttempts.length) && !skip">
             <ion-card-header class="ion-text-wrap">
@@ -217,5 +217,6 @@
     </ng-container>
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+    (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/scorm/pages/index/index.html b/src/addons/mod/scorm/pages/index/index.html
index fc1e6f57f..00e1aa739 100644
--- a/src/addons/mod/scorm/pages/index/index.html
+++ b/src/addons/mod/scorm/pages/index/index.html
@@ -15,7 +15,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-refresher slot="fixed" [disabled]="!activityComponent?.loaded" (ionRefresh)="activityComponent?.doRefresh($event.target)">
+    <ion-refresher slot="fixed" [disabled]="activityComponent?.showLoading" (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
diff --git a/src/addons/mod/survey/components/index/addon-mod-survey-index.html b/src/addons/mod/survey/components/index/addon-mod-survey-index.html
index acafdf331..8c99699fc 100644
--- a/src/addons/mod/survey/components/index/addon-mod-survey-index.html
+++ b/src/addons/mod/survey/components/index/addon-mod-survey-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="loaded" class="safe-area-padding">
+<core-loading [hideUntil]="!showLoading" class="safe-area-padding">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="survey && !survey.surveydone && !hasOffline && description"
@@ -131,5 +131,6 @@
 
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+    (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/survey/pages/index/index.html b/src/addons/mod/survey/pages/index/index.html
index 808d88eb1..02673c75d 100644
--- a/src/addons/mod/survey/pages/index/index.html
+++ b/src/addons/mod/survey/pages/index/index.html
@@ -15,7 +15,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-refresher slot="fixed" [disabled]="!activityComponent?.loaded" (ionRefresh)="activityComponent?.doRefresh($event.target)">
+    <ion-refresher slot="fixed" [disabled]="activityComponent?.showLoading" (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
diff --git a/src/addons/mod/url/components/index/addon-mod-url-index.html b/src/addons/mod/url/components/index/addon-mod-url-index.html
index ccf09a1a2..0153bcdf7 100644
--- a/src/addons/mod/url/components/index/addon-mod-url-index.html
+++ b/src/addons/mod/url/components/index/addon-mod-url-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="loaded">
+<core-loading [hideUntil]="!showLoading">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="displayDescription && description" [component]="component"
@@ -46,5 +46,6 @@
     </ion-list>
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+    (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/url/pages/index/index.html b/src/addons/mod/url/pages/index/index.html
index 45dc4198c..f940549ef 100644
--- a/src/addons/mod/url/pages/index/index.html
+++ b/src/addons/mod/url/pages/index/index.html
@@ -15,7 +15,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-refresher slot="fixed" [disabled]="!activityComponent?.loaded" (ionRefresh)="activityComponent?.doRefresh($event.target)">
+    <ion-refresher slot="fixed" [disabled]="activityComponent?.showLoading" (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
diff --git a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
index 462d5a1b4..342e83895 100644
--- a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
+++ b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
@@ -7,7 +7,7 @@
         <ion-icon *ngIf="groupWiki" name="fas-users" aria-hidden="true"></ion-icon>
     </ion-button>
 
-    <ion-button *ngIf="loaded && currentPageObj" (click)="openMap()" [attr.aria-label]="'addon.mod_wiki.map' | translate"
+    <ion-button *ngIf="!showLoading && currentPageObj" (click)="openMap()" [attr.aria-label]="'addon.mod_wiki.map' | translate"
         aria-haspopup="true">
         <ion-icon name="fas-map" aria-hidden="true"></ion-icon>
     </ion-button>
@@ -27,7 +27,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="loaded">
+<core-loading [hideUntil]="!showLoading">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
@@ -71,7 +71,8 @@
     </div>
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+    (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
 
 <ion-fab slot="fixed" core-fab vertical="bottom" horizontal="end" *ngIf="canEdit">
diff --git a/src/addons/mod/wiki/pages/index/index.html b/src/addons/mod/wiki/pages/index/index.html
index a33c7c251..0c013169c 100644
--- a/src/addons/mod/wiki/pages/index/index.html
+++ b/src/addons/mod/wiki/pages/index/index.html
@@ -16,7 +16,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-refresher slot="fixed" [disabled]="!activityComponent?.loaded" (ionRefresh)="activityComponent?.doRefresh($event.target)">
+    <ion-refresher slot="fixed" [disabled]="activityComponent?.showLoading" (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
diff --git a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
index f24b28232..02761fc74 100644
--- a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
+++ b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="loaded">
+<core-loading [hideUntil]="!showLoading">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [hasDataToSync]="hasOffline">
@@ -233,5 +233,6 @@
     </div>
 </core-loading>
 
-<core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+    (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/workshop/pages/index/index.html b/src/addons/mod/workshop/pages/index/index.html
index 9b639898c..c9fdc573a 100644
--- a/src/addons/mod/workshop/pages/index/index.html
+++ b/src/addons/mod/workshop/pages/index/index.html
@@ -15,7 +15,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-refresher slot="fixed" [disabled]="!activityComponent?.loaded" (ionRefresh)="activityComponent?.doRefresh($event.target)">
+    <ion-refresher slot="fixed" [disabled]="activityComponent?.showLoading" (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
diff --git a/src/core/features/course/classes/main-activity-component.ts b/src/core/features/course/classes/main-activity-component.ts
index d0214e996..e41b66bfb 100644
--- a/src/core/features/course/classes/main-activity-component.ts
+++ b/src/core/features/course/classes/main-activity-component.ts
@@ -116,7 +116,7 @@ export class CoreCourseModuleMainActivityComponent extends CoreCourseModuleMainR
      * @return Resolved when done.
      */
     protected async showLoadingAndFetch(sync: boolean = false, showErrors: boolean = false): Promise<void> {
-        this.loaded = false;
+        this.showLoading = true;
         this.content?.scrollToTop();
 
         await this.loadContent(false, sync, showErrors);
@@ -130,7 +130,7 @@ export class CoreCourseModuleMainActivityComponent extends CoreCourseModuleMainR
      * @return Resolved when done.
      */
     protected showLoadingAndRefresh(sync: boolean = false, showErrors: boolean = false): Promise<void> {
-        this.loaded = false;
+        this.showLoading = true;
         this.content?.scrollToTop();
 
         return this.refreshContent(sync, showErrors);
@@ -177,7 +177,7 @@ export class CoreCourseModuleMainActivityComponent extends CoreCourseModuleMainR
 
             CoreDomUtils.showErrorModalDefault(error, this.fetchContentDefaultError, true);
         } finally {
-            this.loaded = true;
+            this.showLoading = false;
         }
     }
 
diff --git a/src/core/features/course/classes/main-resource-component.ts b/src/core/features/course/classes/main-resource-component.ts
index 6536145e0..2a0eed662 100644
--- a/src/core/features/course/classes/main-resource-component.ts
+++ b/src/core/features/course/classes/main-resource-component.ts
@@ -52,7 +52,7 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
     @Input() courseId!: number; // Course ID the component belongs to.
     @Output() dataRetrieved = new EventEmitter<unknown>(); // Called to notify changes the index page from the main component.
 
-    loaded = false; // If the component has been loaded.
+    showLoading = true; // Whether to show loading.
     component?: string; // Component name.
     componentId?: number; // Component ID.
     hasOffline = false; // Resources don't have any data to sync.
@@ -199,7 +199,7 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
 
             CoreDomUtils.showErrorModalDefault(error, this.fetchContentDefaultError, true);
         } finally {
-            this.loaded = true;
+            this.showLoading = false;
         }
     }
 
@@ -416,12 +416,12 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
         });
 
         if (data) {
-            if (this.loaded && (data.action == 'refresh' || data.action == 'sync')) {
-                this.loaded = false;
+            if (!this.showLoading && (data.action == 'refresh' || data.action == 'sync')) {
+                this.showLoading = true;
                 try {
                     await this.doRefresh(undefined, data.action == 'sync');
                 } finally {
-                    this.loaded = true;
+                    this.showLoading = false;
                 }
             }
         }
diff --git a/upgrade.txt b/upgrade.txt
index ebb311bcb..e01fe0058 100644
--- a/upgrade.txt
+++ b/upgrade.txt
@@ -22,6 +22,7 @@ information provided here is intended especially for developers.
 - The parameters of the following functions in CoreCourseHelper have changed: navigateToModuleByInstance, navigateToModule, openModule.
 - fillContextMenu, expandDescription, gotoBlog, prefetch and removeFiles functions have been removed from CoreCourseModuleMainResourceComponent.
 - contextMenuPrefetch and fillContextMenu have been removed from CoreCourseHelper.
+-The variable "loaded" in CoreCourseModuleMainResourceComponent has been changed to "showLoading" to reflect its purpose better.
 
 
 

From be0ce93a0f72a0142b8bc8989424a1630366c468 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 23 Feb 2022 14:54:25 +0100
Subject: [PATCH 0599/1008] MOBILE-3780 assign: Fix getSizeForEdit in file
 submissions

---
 src/addons/mod/assign/services/assign-helper.ts           | 2 +-
 src/addons/mod/assign/submission/file/services/handler.ts | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/addons/mod/assign/services/assign-helper.ts b/src/addons/mod/assign/services/assign-helper.ts
index cb062c240..c3f948527 100644
--- a/src/addons/mod/assign/services/assign-helper.ts
+++ b/src/addons/mod/assign/services/assign-helper.ts
@@ -15,7 +15,7 @@
 import { Injectable } from '@angular/core';
 import { CoreFileUploader, CoreFileUploaderStoreFilesResult } from '@features/fileuploader/services/fileuploader';
 import { CoreSites, CoreSitesCommonWSOptions } from '@services/sites';
-import { FileEntry } from '@ionic-native/file/ngx';
+import { FileEntry, DirectoryEntry } from '@ionic-native/file/ngx';
 import {
     AddonModAssignProvider,
     AddonModAssignAssign,
diff --git a/src/addons/mod/assign/submission/file/services/handler.ts b/src/addons/mod/assign/submission/file/services/handler.ts
index f1b52ea2f..7c684ea89 100644
--- a/src/addons/mod/assign/submission/file/services/handler.ts
+++ b/src/addons/mod/assign/submission/file/services/handler.ts
@@ -187,7 +187,8 @@ export class AddonModAssignSubmissionFileHandlerService implements AddonModAssig
         plugin: AddonModAssignPlugin,
     ): Promise<number> {
         // Check if there's any change.
-        if (this.hasDataChanged(assign, submission, plugin)) {
+        const hasChanged = await this.hasDataChanged(assign, submission, plugin);
+        if (hasChanged) {
             const files = CoreFileSession.getFiles(AddonModAssignProvider.COMPONENT, assign.id);
 
             return CoreFileHelper.getTotalFilesSize(files);

From 9ded4b7c5ba03ce4d0ec65d12e122afc0dda5d89 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 23 Feb 2022 16:14:28 +0100
Subject: [PATCH 0600/1008] MOBILE-3780 core: Don't store offline if 4xx or 5xx
 http error

---
 src/addons/mod/assign/pages/edit/edit.ts      |  3 +-
 src/addons/mod/data/pages/edit/edit.ts        |  3 +-
 src/addons/mod/forum/components/post/post.ts  |  2 +-
 src/addons/mod/forum/services/forum-helper.ts |  4 +++
 src/addons/mod/glossary/pages/edit/edit.ts    |  7 ++++-
 .../assessment-strategy.ts                    |  6 +++-
 .../pages/edit-submission/edit-submission.ts  |  7 ++++-
 src/core/classes/errors/errors.ts             |  2 ++
 src/core/classes/errors/httperror.ts          | 30 +++++++++++++++++++
 src/core/services/utils/utils.ts              | 11 +++++--
 src/core/services/ws.ts                       | 26 ++++++++++++----
 11 files changed, 87 insertions(+), 14 deletions(-)
 create mode 100644 src/core/classes/errors/httperror.ts

diff --git a/src/addons/mod/assign/pages/edit/edit.ts b/src/addons/mod/assign/pages/edit/edit.ts
index 01ddb7499..6e0f06b8d 100644
--- a/src/addons/mod/assign/pages/edit/edit.ts
+++ b/src/addons/mod/assign/pages/edit/edit.ts
@@ -36,6 +36,7 @@ import {
 import { AddonModAssignHelper } from '../../services/assign-helper';
 import { AddonModAssignOffline } from '../../services/assign-offline';
 import { AddonModAssignSync } from '../../services/assign-sync';
+import { CoreUtils } from '@services/utils/utils';
 
 /**
  * Page that allows adding or editing an assigment submission.
@@ -255,7 +256,7 @@ export class AddonModAssignEditPage implements OnInit, OnDestroy, CanLeave {
                 this.hasOffline,
             );
         } catch (error) {
-            if (this.allowOffline && !this.saveOffline) {
+            if (this.allowOffline && !this.saveOffline && !CoreUtils.isWebServiceError(error)) {
                 // Cannot submit in online, prepare for offline usage.
                 this.saveOffline = true;
 
diff --git a/src/addons/mod/data/pages/edit/edit.ts b/src/addons/mod/data/pages/edit/edit.ts
index dc307eaa2..e6878e177 100644
--- a/src/addons/mod/data/pages/edit/edit.ts
+++ b/src/addons/mod/data/pages/edit/edit.ts
@@ -266,9 +266,10 @@ export class AddonModDataEditPage implements OnInit {
                         this.offline,
                     );
                 } catch (error) {
-                    if (this.offline) {
+                    if (this.offline || CoreUtils.isWebServiceError(error)) {
                         throw error;
                     }
+
                     // Cannot submit in online, prepare for offline usage.
                     this.offline = true;
 
diff --git a/src/addons/mod/forum/components/post/post.ts b/src/addons/mod/forum/components/post/post.ts
index 2a2cf19ed..cfd60670f 100644
--- a/src/addons/mod/forum/components/post/post.ts
+++ b/src/addons/mod/forum/components/post/post.ts
@@ -364,7 +364,7 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
                     );
                 } catch (error) {
                     // Cannot upload them in online, save them in offline.
-                    if (!this.forum.id || isEditOnline) {
+                    if (!this.forum.id || isEditOnline || CoreUtils.isWebServiceError(error)) {
                         // Cannot store them in offline. Reject.
                         throw error;
                     }
diff --git a/src/addons/mod/forum/services/forum-helper.ts b/src/addons/mod/forum/services/forum-helper.ts
index 0519efe28..47c2bd0cc 100644
--- a/src/addons/mod/forum/services/forum-helper.ts
+++ b/src/addons/mod/forum/services/forum-helper.ts
@@ -106,6 +106,10 @@ export class AddonModForumHelperProvider {
             try {
                 await Promise.all(promises);
             } catch (error) {
+                if (CoreUtils.isWebServiceError(error)) {
+                    throw error;
+                }
+
                 // Cannot upload them in online, save them in offline.
                 saveOffline = true;
 
diff --git a/src/addons/mod/glossary/pages/edit/edit.ts b/src/addons/mod/glossary/pages/edit/edit.ts
index 2edc0d440..127a5ea4a 100644
--- a/src/addons/mod/glossary/pages/edit/edit.ts
+++ b/src/addons/mod/glossary/pages/edit/edit.ts
@@ -25,6 +25,7 @@ import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTextUtils } from '@services/utils/text';
+import { CoreUtils } from '@services/utils/utils';
 import { Translate } from '@singletons';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreForms } from '@singletons/form';
@@ -392,7 +393,11 @@ export class AddonModGlossaryEditPage implements OnInit, OnDestroy, CanLeave {
                 saveOffline: false,
                 attachmentsResult,
             };
-        } catch {
+        } catch (error) {
+            if (CoreUtils.isWebServiceError(error)) {
+                throw error;
+            }
+
             // Cannot upload them in online, save them in offline.
             const attachmentsResult = await AddonModGlossaryHelper.storeFiles(
                 this.glossary.id,
diff --git a/src/addons/mod/workshop/components/assessment-strategy/assessment-strategy.ts b/src/addons/mod/workshop/components/assessment-strategy/assessment-strategy.ts
index f46b85d90..26d9b61c1 100644
--- a/src/addons/mod/workshop/components/assessment-strategy/assessment-strategy.ts
+++ b/src/addons/mod/workshop/components/assessment-strategy/assessment-strategy.ts
@@ -304,7 +304,11 @@ export class AddonModWorkshopAssessmentStrategyComponent implements OnInit, OnDe
                     files,
                     saveOffline,
                 );
-            } catch {
+            } catch (error) {
+                if (CoreUtils.isWebServiceError(error)) {
+                    throw error;
+                }
+
                 // Cannot upload them in online, save them in offline.
                 saveOffline = true;
                 allowOffline = true;
diff --git a/src/addons/mod/workshop/pages/edit-submission/edit-submission.ts b/src/addons/mod/workshop/pages/edit-submission/edit-submission.ts
index aa215a1ce..23b7e7e5e 100644
--- a/src/addons/mod/workshop/pages/edit-submission/edit-submission.ts
+++ b/src/addons/mod/workshop/pages/edit-submission/edit-submission.ts
@@ -25,6 +25,7 @@ import { CoreSites } from '@services/sites';
 import { CoreSync } from '@services/sync';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTextUtils } from '@services/utils/text';
+import { CoreUtils } from '@services/utils/utils';
 import { Translate } from '@singletons';
 import { CoreEvents } from '@singletons/events';
 import { CoreForms } from '@singletons/form';
@@ -349,7 +350,11 @@ export class AddonModWorkshopEditSubmissionPage implements OnInit, OnDestroy, Ca
                     inputData.attachmentfiles,
                     false,
                 );
-            } catch {
+            } catch (error) {
+                if (CoreUtils.isWebServiceError(error)) {
+                    throw error;
+                }
+
                 // Cannot upload them in online, save them in offline.
                 saveOffline = true;
                 allowOffline = true;
diff --git a/src/core/classes/errors/errors.ts b/src/core/classes/errors/errors.ts
index 94b34a72f..517d91910 100644
--- a/src/core/classes/errors/errors.ts
+++ b/src/core/classes/errors/errors.ts
@@ -24,6 +24,7 @@ import { CoreCaptureError } from './captureerror';
 import { CoreNetworkError } from './network-error';
 import { CoreSiteError } from './siteerror';
 import { CoreErrorWithTitle } from './errorwithtitle';
+import { CoreHttpError } from './httperror';
 
 export const CORE_ERRORS_CLASSES: Type<unknown>[] = [
     CoreAjaxError,
@@ -36,4 +37,5 @@ export const CORE_ERRORS_CLASSES: Type<unknown>[] = [
     CoreSiteError,
     CoreWSError,
     CoreErrorWithTitle,
+    CoreHttpError,
 ];
diff --git a/src/core/classes/errors/httperror.ts b/src/core/classes/errors/httperror.ts
new file mode 100644
index 000000000..598cc4455
--- /dev/null
+++ b/src/core/classes/errors/httperror.ts
@@ -0,0 +1,30 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreError } from '@classes/errors/error';
+
+/**
+ * HTTP error.
+ */
+export class CoreHttpError extends CoreError {
+
+    status: number; // HTTP status. 0 if cannot connect or similar errors.
+
+    constructor(message: string, status?: number) {
+        super(message);
+
+        this.status = status ?? 0;
+    }
+
+}
diff --git a/src/core/services/utils/utils.ts b/src/core/services/utils/utils.ts
index 4808ccca5..e211d3350 100644
--- a/src/core/services/utils/utils.ts
+++ b/src/core/services/utils/utils.ts
@@ -858,12 +858,17 @@ export class CoreUtilsProvider {
      */
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     isWebServiceError(error: any): boolean {
-        return error && (error.warningcode !== undefined || (error.errorcode !== undefined &&
-                error.errorcode != 'userdeleted' && error.errorcode != 'upgraderunning' &&
+        return error && (
+            error.warningcode !== undefined ||
+            (
+                error.errorcode !== undefined && error.errorcode != 'userdeleted' && error.errorcode != 'upgraderunning' &&
                 error.errorcode != 'forcepasswordchangenotice' && error.errorcode != 'usernotfullysetup' &&
                 error.errorcode != 'sitepolicynotagreed' && error.errorcode != 'sitemaintenance' &&
                 error.errorcode != 'wsaccessusersuspended' && error.errorcode != 'wsaccessuserdeleted' &&
-                !this.isExpiredTokenError(error)));
+                !this.isExpiredTokenError(error)
+            ) ||
+            error.status && error.status >= 400 // CoreHttpError, assume status 400 and above are like WebService errors.
+        );
     }
 
     /**
diff --git a/src/core/services/ws.ts b/src/core/services/ws.ts
index bde6e1526..866ed0724 100644
--- a/src/core/services/ws.ts
+++ b/src/core/services/ws.ts
@@ -25,7 +25,7 @@ import { CoreNativeToAngularHttpResponse } from '@classes/native-to-angular-http
 import { CoreApp } from '@services/app';
 import { CoreFile, CoreFileFormat } from '@services/file';
 import { CoreMimetypeUtils } from '@services/utils/mimetype';
-import { CoreTextUtils } from '@services/utils/text';
+import { CoreTextErrorObject, CoreTextUtils } from '@services/utils/text';
 import { CoreUtils, PromiseDefer } from '@services/utils/utils';
 import { CoreConstants } from '@/core/constants';
 import { CoreError } from '@classes/errors/error';
@@ -38,6 +38,7 @@ import { CoreAjaxError } from '@classes/errors/ajaxerror';
 import { CoreAjaxWSError } from '@classes/errors/ajaxwserror';
 import { CoreNetworkError } from '@classes/errors/network-error';
 import { CoreSite } from '@classes/site';
+import { CoreHttpError } from '@classes/errors/httperror';
 
 /**
  * This service allows performing WS calls and download/upload files.
@@ -693,6 +694,8 @@ export class CoreWSProvider {
                 return retryPromise;
             } else if (error.status === -2) {
                 throw new CoreError(this.getCertificateErrorMessage(error.error));
+            } else if (error.status > 0) {
+                throw this.createHttpError(error, error.status);
             }
 
             throw new CoreError(Translate.instant('core.serverconnection'));
@@ -892,10 +895,7 @@ export class CoreWSProvider {
         } catch (error) {
             this.logger.error('Error while uploading file', filePath, error);
 
-            throw new CoreError(CoreTextUtils.buildSeveralParagraphsMessage([
-                Translate.instant('core.cannotconnecttrouble'),
-                CoreTextUtils.getHTMLBodyContent(CoreTextUtils.getErrorMessageFromError(error) || ''),
-            ]));
+            throw this.createHttpError(error, error.http_status ?? 0);
         }
 
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -937,6 +937,22 @@ export class CoreWSProvider {
         return data[0];
     }
 
+    /**
+     * Create a CoreHttpError based on a certain error.
+     *
+     * @param error Original error.
+     * @param status Status code (if any).
+     * @return CoreHttpError.
+     */
+    protected createHttpError(error: CoreTextErrorObject, status: number): CoreHttpError {
+        const message = CoreTextUtils.buildSeveralParagraphsMessage([
+            Translate.instant('core.cannotconnecttrouble'),
+            CoreTextUtils.getHTMLBodyContent(CoreTextUtils.getErrorMessageFromError(error) || ''),
+        ]);
+
+        return new CoreHttpError(message, status);
+    }
+
     /**
      * Perform an HTTP request requesting for a text response.
      *

From b3cadf8cd70a7512e790317552551c695d7affdb Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 24 Feb 2022 13:18:30 +0100
Subject: [PATCH 0601/1008] MOBILE-3833 qr: Set color-scheme to normal when
 open QR scanner

For some reason leaving this value to 'light dark' displays a black screen in Android
---
 src/core/services/utils/utils.ts | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/core/services/utils/utils.ts b/src/core/services/utils/utils.ts
index 4808ccca5..81f37d7b1 100644
--- a/src/core/services/utils/utils.ts
+++ b/src/core/services/utils/utils.ts
@@ -49,6 +49,7 @@ export class CoreUtilsProvider {
     protected iabInstance?: InAppBrowserObject;
     protected uniqueIds: {[name: string]: number} = {};
     protected qrScanData?: {deferred: PromiseDefer<string>; observable: Subscription};
+    protected initialColorSchemeContent = 'light dark';
 
     constructor() {
         this.logger = CoreLogger.getInstance('CoreUtilsProvider');
@@ -1646,6 +1647,13 @@ export class CoreUtilsProvider {
 
                 document.body.classList.add('core-scanning-qr');
 
+                // Set color-scheme to 'normal', otherwise the camera isn't seen in Android.
+                const colorSchemeMeta = document.querySelector('meta[name="color-scheme"]');
+                if (colorSchemeMeta) {
+                    this.initialColorSchemeContent = colorSchemeMeta.getAttribute('content') || this.initialColorSchemeContent;
+                    colorSchemeMeta.setAttribute('content', 'normal');
+                }
+
                 return this.qrScanData.deferred.promise;
             } catch (e) {
                 this.stopScanQR(e, true);
@@ -1674,6 +1682,10 @@ export class CoreUtilsProvider {
 
         // Hide camera preview.
         document.body.classList.remove('core-scanning-qr');
+
+        // Set color-scheme to the initial value.
+        document.querySelector('meta[name="color-scheme"]')?.setAttribute('content', this.initialColorSchemeContent);
+
         QRScanner.hide();
         QRScanner.destroy();
 

From 294c94b934643761448d6b66f5513a97042322a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 24 Feb 2022 09:55:40 +0100
Subject: [PATCH 0602/1008] MOBILE-3996 navbar: Update style on navigation bar

---
 .../mod/book/pages/contents/contents.html     |  5 ++--
 .../mod/book/pages/contents/contents.ts       |  2 --
 .../navigation-bar/core-navigation-bar.html   | 30 +++++++------------
 .../navigation-bar/navigation-bar.scss        | 25 +++++++++++-----
 .../navigation-bar/navigation-bar.ts          | 22 ++++----------
 .../progress-bar/core-progress-bar.html       |  2 +-
 .../components/progress-bar/progress-bar.ts   |  5 ++--
 .../core-course-module-navigation.html        |  4 +--
 .../module-navigation/module-navigation.scss  |  8 ++---
 .../module-navigation/module-navigation.ts    |  4 +--
 src/theme/theme.base.scss                     |  4 +--
 src/theme/theme.dark.scss                     |  2 ++
 src/theme/theme.light.scss                    |  4 +--
 13 files changed, 49 insertions(+), 68 deletions(-)

diff --git a/src/addons/mod/book/pages/contents/contents.html b/src/addons/mod/book/pages/contents/contents.html
index 6e6334aab..9cb91f696 100644
--- a/src/addons/mod/book/pages/contents/contents.html
+++ b/src/addons/mod/book/pages/contents/contents.html
@@ -31,9 +31,8 @@
                 </ion-item>
             </ion-card>
 
-            <core-navigation-bar *ngIf="displayNavBar" [items]="navigationItems" [showTitles]="displayTitlesInNavBar"
-                previousTranslate="addon.mod_book.navprevtitle" nextTranslate="addon.mod_book.navnexttitle"
-                (action)="changeChapter($event.id)">
+            <core-navigation-bar *ngIf="displayNavBar" [items]="navigationItems" previousTranslate="addon.mod_book.navprevtitle"
+                nextTranslate="addon.mod_book.navnexttitle" (action)="changeChapter($event.id)">
             </core-navigation-bar>
 
             <core-swipe-slides [manager]="manager" [options]="slidesOpts">
diff --git a/src/addons/mod/book/pages/contents/contents.ts b/src/addons/mod/book/pages/contents/contents.ts
index 36af98196..21436d557 100644
--- a/src/addons/mod/book/pages/contents/contents.ts
+++ b/src/addons/mod/book/pages/contents/contents.ts
@@ -62,7 +62,6 @@ export class AddonModBookContentsPage implements OnInit, OnDestroy {
     warning = '';
     displayNavBar = true;
     navigationItems: CoreNavigationBarItem<AddonModBookTocChapter>[] = [];
-    displayTitlesInNavBar = false;
     slidesOpts: CoreSwipeSlidesOptions = {
         autoHeight: true,
         scrollOnChange: 'top',
@@ -135,7 +134,6 @@ export class AddonModBookContentsPage implements OnInit, OnDestroy {
             const downloadResult = await this.downloadResourceIfNeeded(module, refresh);
 
             this.displayNavBar = book.navstyle != AddonModBookNavStyle.TOC_ONLY;
-            this.displayTitlesInNavBar = book.navstyle == AddonModBookNavStyle.TEXT;
             this.title = book.name;
 
             // Get contents. No need to refresh, it has been done in downloadResourceIfNeeded.
diff --git a/src/core/components/navigation-bar/core-navigation-bar.html b/src/core/components/navigation-bar/core-navigation-bar.html
index 3f5b6df49..087ffbdf9 100644
--- a/src/core/components/navigation-bar/core-navigation-bar.html
+++ b/src/core/components/navigation-bar/core-navigation-bar.html
@@ -1,27 +1,17 @@
-<ion-row class="ion-justify-content-between ion-align-items-center ion-no-padding"
-    *ngIf="previousIndex >= 0 || nextIndex >= 0 || items.length > 1">
-    <ion-col class="ion-text-start ion-padding-end" [size]="showTitles ? 4 : 3">
-        <ion-button *ngIf="previousIndex >=0" class="core-navigation-bar-arrow" fill="clear" [attr.aria-label]="previousTitle"
+<ion-row class="ion-justify-content-between ion-align-items-center ion-no-padding ion-wrap" *ngIf="items.length > 1">
+    <ion-col class="ion-text-start ion-no-padding core-navigation-arrow" size="auto">
+        <ion-button [disabled]="previousIndex < 0" fill="clear" color="dark" [attr.aria-label]="previousTitle"
             (click)="navigate(previousIndex)">
-            <ion-icon name="fas-arrow-left" [slot]="showTitles ? 'start' : 'icon-only'" aria-hidden="true"></ion-icon>
-            <core-format-text *ngIf="showTitles" [text]="previousTitle" [component]="component" [componentId]="componentId"
-                [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId" aria-hidden="true">
-            </core-format-text>
+            <ion-icon name="fas-chevron-left" slot="icon-only" aria-hidden="true"></ion-icon>
         </ion-button>
     </ion-col>
-    <ion-col class="ion-text-center" [size]="showTitles ? 4 : 6">
-        <ion-range min="0" [max]="items.length -1" debounce="500" snaps="true" (ionChange)="navigateOnRange($event.target)"
-            [value]="currentIndex">
-            <p slot="end">{{currentIndex + 1}} / {{items.length}}</p>
-        </ion-range>
+    <ion-col class="ion-text-center">
+        <core-progress-bar [progress]="progress" [text]="progressText" *ngIf="currentIndex >= 0">
+        </core-progress-bar>
     </ion-col>
-    <ion-col class="ion-text-end ion-padding-start" [size]="showTitles ? 4 : 3">
-        <ion-button fill="clear" *ngIf="nextIndex >= 0" class="core-navigation-bar-arrow" [attr.aria-label]="nextTitle"
-            (click)="navigate(nextIndex)">
-            <core-format-text *ngIf="showTitles" [text]="nextTitle" [component]="component" [componentId]="componentId"
-                [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId" aria-hidden="true">
-            </core-format-text>
-            <ion-icon name="fas-arrow-right" [slot]="showTitles ? 'end' : 'icon-only'" aria-hidden="true"></ion-icon>
+    <ion-col class="ion-text-end ion-no-padding core-navigation-arrow" size="auto">
+        <ion-button [disabled]="nextIndex < 0" fill="clear" color="dark" [attr.aria-label]="nextTitle" (click)="navigate(nextIndex)">
+            <ion-icon name="fas-chevron-right" slot="icon-only" aria-hidden="true"></ion-icon>
         </ion-button>
     </ion-col>
 </ion-row>
diff --git a/src/core/components/navigation-bar/navigation-bar.scss b/src/core/components/navigation-bar/navigation-bar.scss
index b79c274dd..a007f12b3 100644
--- a/src/core/components/navigation-bar/navigation-bar.scss
+++ b/src/core/components/navigation-bar/navigation-bar.scss
@@ -1,15 +1,24 @@
-:host {
-    --background: var(--core-course-module-navigation-background);
+@import "~theme/globals";
 
+:host {
+    --height: var(--core-navigation-height, var(--core-navigation-max-height));
+    --background: var(--core-navigation-background);
+    --button-vertical-margin: 2px;
+
+    height: var(--height);
     width: 100%;
     background-color: var(--background);
     display: block;
+    bottom: 0;
+    z-index: 3;
+    border-top: 1px solid var(--stroke);
 
-    .core-navigation-bar-arrow {
-        text-transform: none;
-        max-width: 100%;
-        ion-icon {
-            flex-shrink: 0;
-        }
+    @include core-transition(all, 200ms);
+
+    ion-button,
+    ::ng-deep ion-button {
+        margin-top: var(--button-vertical-margin);
+        margin-bottom: var(--button-vertical-margin);
     }
+
 }
diff --git a/src/core/components/navigation-bar/navigation-bar.ts b/src/core/components/navigation-bar/navigation-bar.ts
index 92681ea06..4f1f76b80 100644
--- a/src/core/components/navigation-bar/navigation-bar.ts
+++ b/src/core/components/navigation-bar/navigation-bar.ts
@@ -32,7 +32,6 @@ import { Translate } from '@singletons';
 export class CoreNavigationBarComponent implements OnChanges {
 
     @Input() items: CoreNavigationBarItem[] = []; // List of items.
-    @Input() showTitles = false; // Display titles on buttons.
     @Input() previousTranslate = 'core.previous'; // Previous translatable text, can admit $a variable.
     @Input() nextTranslate = 'core.next'; // Next translatable text, can admit $a variable.
     @Input() component?: string; // Component the bar belongs to.
@@ -46,6 +45,8 @@ export class CoreNavigationBarComponent implements OnChanges {
     previousIndex = -1; // Previous item index. If -1, the previous arrow won't be shown.
     nextIndex = -1; // Next item index. If -1, the next arrow won't be shown.
     currentIndex = 0;
+    progress = 0;
+    progressText = '';
 
     // Function to call when arrow is clicked. Will receive as a param the item to load.
     @Output() action: EventEmitter<unknown> = new EventEmitter<unknown>();
@@ -63,6 +64,9 @@ export class CoreNavigationBarComponent implements OnChanges {
             return;
         }
 
+        this.progress = ((this.currentIndex + 1) / this.items.length) * 100;
+        this.progressText = `${this.currentIndex + 1} / ${this.items.length}`;
+
         this.nextIndex = this.items[this.currentIndex + 1]?.enabled ? this.currentIndex + 1 : -1;
         if (this.nextIndex >= 0) {
             this.nextTitle = Translate.instant(this.nextTranslate, { $a: this.items[this.nextIndex].title || '' });
@@ -88,22 +92,6 @@ export class CoreNavigationBarComponent implements OnChanges {
         this.action.emit(this.items[itemIndex].item);
     }
 
-    /**
-     * Navigate to an item with the range component.
-     *
-     * @param target: Element changed.
-     */
-    navigateOnRange(target: HTMLIonRangeElement): void {
-        const selectedIndex = target.value as number; // Single value, use number.
-        if (!this.items[selectedIndex].enabled) {
-            target.value = this.currentIndex;
-
-            return;
-        }
-
-        this.navigate(selectedIndex);
-    }
-
 }
 
 export type CoreNavigationBarItem<T = unknown> = {
diff --git a/src/core/components/progress-bar/core-progress-bar.html b/src/core/components/progress-bar/core-progress-bar.html
index dd3335981..dc7dc744e 100644
--- a/src/core/components/progress-bar/core-progress-bar.html
+++ b/src/core/components/progress-bar/core-progress-bar.html
@@ -4,7 +4,7 @@
     </progress>
     <div class="core-progress-text">
         <span class="sr-only" *ngIf="a11yText">{{ a11yText | translate }}</span>
-        {{ 'core.percentagenumber' | translate: {$a: text} }}
+        {{ text }}
     </div>
 </ng-container>
 
diff --git a/src/core/components/progress-bar/progress-bar.ts b/src/core/components/progress-bar/progress-bar.ts
index 78d74f287..357d948e5 100644
--- a/src/core/components/progress-bar/progress-bar.ts
+++ b/src/core/components/progress-bar/progress-bar.ts
@@ -86,7 +86,7 @@ export class CoreProgressBarComponent implements OnInit, OnChanges {
                 this.progress = Math.floor(this.progress);
 
                 if (!this.textSupplied) {
-                    this.text = String(this.progress);
+                    this.text = Translate.instant('core.percentagenumber', { $a: this.progress });
                 }
 
                 this.width = DomSanitizer.bypassSecurityTrustStyle(this.progress + '%');
@@ -94,8 +94,7 @@ export class CoreProgressBarComponent implements OnInit, OnChanges {
         }
 
         if (changes.text || changes.progress || changes.a11yText) {
-            this.progressBarValueText = (this.a11yText ? Translate.instant(this.a11yText) + ' ' : '') +
-                Translate.instant('core.percentagenumber', { $a: this.text });
+            this.progressBarValueText = (this.a11yText ? Translate.instant(this.a11yText) + ' ' : '') + this.text;
         }
     }
 
diff --git a/src/core/features/course/components/module-navigation/core-course-module-navigation.html b/src/core/features/course/components/module-navigation/core-course-module-navigation.html
index 203fc8f2a..3beaf4af2 100644
--- a/src/core/features/course/components/module-navigation/core-course-module-navigation.html
+++ b/src/core/features/course/components/module-navigation/core-course-module-navigation.html
@@ -1,7 +1,7 @@
 <core-loading [hideUntil]="loaded" [fullscreen]="false">
     <ion-row class="ion-justify-content-between ion-align-items-center ion-no-padding ion-wrap" *ngIf="previousModule || nextModule">
         <ion-col size="auto" class="ion-no-padding core-course-module-navigation-arrow">
-            <ion-button fill="clear" class="core-course-previous-module" *ngIf="previousModule" (click)="goToActivity(false)"
+            <ion-button fill="clear" class="core-course-previous-module" [disabled]="!previousModule" (click)="goToActivity(false)"
                 [attr.aria-label]="'core.course.gotopreviousactivity' | translate">
                 <ion-icon name="fas-arrow-left" slot="icon-only" aria-hidden="true"></ion-icon>
             </ion-button>
@@ -14,7 +14,7 @@
             </core-course-module-completion>
         </ion-col>
         <ion-col size="auto" class="ion-no-padding core-course-module-navigation-arrow">
-            <ion-button fill="clear" class="core-course-next-module" *ngIf="nextModule" (click)="goToActivity(true)"
+            <ion-button fill="clear" class="core-course-next-module" [disabled]="!nextModule" (click)="goToActivity(true)"
                 [attr.aria-label]="'core.course.gotonextactivity' | translate">
                 <ion-icon name="fas-arrow-right" slot="icon-only" aria-hidden="true"></ion-icon>
             </ion-button>
diff --git a/src/core/features/course/components/module-navigation/module-navigation.scss b/src/core/features/course/components/module-navigation/module-navigation.scss
index 767ea4da6..48713703f 100644
--- a/src/core/features/course/components/module-navigation/module-navigation.scss
+++ b/src/core/features/course/components/module-navigation/module-navigation.scss
@@ -1,8 +1,8 @@
 @import "~theme/globals";
 
 :host {
-    --height: var(--core-course-module-navigation-height, var(--core-course-module-navigation-max-height));
-    --background: var(--core-course-module-navigation-background);
+    --height: var(--core-navigation-height, var(--core-navigation-max-height));
+    --background: var(--core-navigation-background);
     --button-vertical-margin: 2px;
 
     height: var(--height);
@@ -25,10 +25,6 @@
         margin-top: var(--button-vertical-margin);
         margin-bottom: var(--button-vertical-margin);
     }
-
-    .core-course-module-navigation-arrow {
-        min-width: 48px;
-    }
 }
 
 :host-context(.core-iframe-fullscreen) {
diff --git a/src/core/features/course/components/module-navigation/module-navigation.ts b/src/core/features/course/components/module-navigation/module-navigation.ts
index 3a566c701..5b6a4062f 100644
--- a/src/core/features/course/components/module-navigation/module-navigation.ts
+++ b/src/core/features/course/components/module-navigation/module-navigation.ts
@@ -128,7 +128,7 @@ export class CoreCourseModuleNavigationComponent implements OnInit, OnDestroy {
             return;
         }
 
-        this.content.classList.add('has-core-course-module-navigation');
+        this.content.classList.add('has-core-navigation');
 
         // Move element to the nearest ion-content if it's not the parent.
         if (this.element.parentElement?.nodeName != 'ION-CONTENT') {
@@ -347,7 +347,7 @@ export class CoreCourseModuleNavigationComponent implements OnInit, OnDestroy {
         }
 
         this.element.style.opacity = height <= 0 ? '0' : '1';
-        this.content?.style.setProperty('--core-course-module-navigation-height', height + 'px');
+        this.content?.style.setProperty('--core-navigation-height', height + 'px');
         this.previousHeight = height;
 
         if (height > 0 && height < this.initialHeight) {
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 461393019..e2fbd0a46 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -1124,8 +1124,8 @@ ion-fab[core-fab] {
     }
 }
 
-ion-content.has-core-course-module-navigation ion-fab {
-    bottom: calc(var(--core-course-module-navigation-height, 0px) + 10px);
+ion-content.has-core-navigation ion-fab {
+    bottom: calc(var(--core-navigation-height, 0px) + 10px);
     @include core-transition(all, 200ms);
 }
 
diff --git a/src/theme/theme.dark.scss b/src/theme/theme.dark.scss
index 6f0743f7c..b5be2494e 100644
--- a/src/theme/theme.dark.scss
+++ b/src/theme/theme.dark.scss
@@ -129,6 +129,8 @@
     --core-send-message-input-background: var(--gray-900);
     --core-send-message-input-color: var(--white);
 
+    --core-navigation-background: var(--contrast-background);
+
     --addon-messages-message-bg: var(--gray-800);
     --addon-messages-message-activated-bg: var(--gray-700);
     --addon-messages-message-note-text: var(--subdued-text-color);
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 32b099920..58a0cc3a5 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -310,8 +310,8 @@
     --core-courseimage-on-course-size: 72px;
     --core-courseimage-radius: var(--medium-radius);
 
-    --core-course-module-navigation-max-height: 48px;
-    --core-course-module-navigation-background: var(--contrast-background);
+    --core-navigation-max-height: 48px;
+    --core-navigation-background: var(--contrast-background);
 
     --core-user-menu-site-logo-max-height: 32px;
 

From 533fe8e1b443968ab41c99bba2b984fd29530885 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 24 Feb 2022 10:42:12 +0100
Subject: [PATCH 0603/1008] MOBILE-3996 navbar: Add navbar at the bottom which
 disappears on scroll

---
 .../mod/book/pages/contents/contents.html     |  12 +-
 .../mod/book/pages/contents/contents.scss     |   8 +-
 .../index/addon-mod-imscp-index.html          |   7 +-
 src/addons/mod/scorm/pages/player/player.html |   7 +-
 src/core/classes/tabs.ts                      |   3 +-
 .../navigation-bar/navigation-bar.scss        |   6 +-
 .../navigation-bar/navigation-bar.ts          | 126 +++++++++++++++++-
 src/theme/theme.base.scss                     |  12 +-
 8 files changed, 163 insertions(+), 18 deletions(-)

diff --git a/src/addons/mod/book/pages/contents/contents.html b/src/addons/mod/book/pages/contents/contents.html
index 9cb91f696..a25501544 100644
--- a/src/addons/mod/book/pages/contents/contents.html
+++ b/src/addons/mod/book/pages/contents/contents.html
@@ -21,9 +21,8 @@
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
-    <core-loading [hideUntil]="loaded" class="core-loading-full-height">
+    <core-loading [hideUntil]="loaded">
         <div class="safe-area-padding-horizontal core-swipe-slides-container">
-
             <ion-card class="core-warning-card" *ngIf="warning">
                 <ion-item>
                     <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
@@ -31,10 +30,6 @@
                 </ion-item>
             </ion-card>
 
-            <core-navigation-bar *ngIf="displayNavBar" [items]="navigationItems" previousTranslate="addon.mod_book.navprevtitle"
-                nextTranslate="addon.mod_book.navnexttitle" (action)="changeChapter($event.id)">
-            </core-navigation-bar>
-
             <core-swipe-slides [manager]="manager" [options]="slidesOpts">
                 <ng-template let-chapter="item">
                     <div class="ion-padding">
@@ -49,4 +44,9 @@
             </core-swipe-slides>
         </div>
     </core-loading>
+
+    <core-navigation-bar *ngIf="loaded && displayNavBar && navigationItems.length > 1" [items]="navigationItems"
+        previousTranslate="addon.mod_book.navprevtitle" nextTranslate="addon.mod_book.navnexttitle" (action)="changeChapter($event.id)"
+        slot="fixed">
+    </core-navigation-bar>
 </ion-content>
diff --git a/src/addons/mod/book/pages/contents/contents.scss b/src/addons/mod/book/pages/contents/contents.scss
index de654bcac..823126ed0 100644
--- a/src/addons/mod/book/pages/contents/contents.scss
+++ b/src/addons/mod/book/pages/contents/contents.scss
@@ -1,6 +1,12 @@
 :host {
+    core-loading ::ng-deep .core-loading-content {
+        min-height: 100%;
+        display: flex;
+        flex-direction: column;
+    }
+
     .core-swipe-slides-container {
-        ion-card, core-navigation-bar {
+        ion-card {
             flex: none;
         }
     }
diff --git a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
index a3ce89920..ea00f00ce 100644
--- a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
+++ b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
@@ -10,7 +10,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="!showLoading" class="safe-area-padding">
+<core-loading [hideUntil]="!showLoading" class="safe-area-padding core-loading-full-height">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module">
@@ -24,12 +24,13 @@
     </ion-card>
 
     <div class="addon-mod-imscp-container">
-        <core-navigation-bar [items]="navigationItems" (action)="loadItem($event)">
-        </core-navigation-bar>
         <core-iframe *ngIf="!showLoading" [src]="src" [showFullscreenOnToolbar]="true" [autoFullscreenOnRotate]="true"></core-iframe>
     </div>
 </core-loading>
 
+<!-- TODO Add a contents page to avoid having both bars -->
+<core-navigation-bar *ngIf="!showLoading && navigationItems.length > 1 && false" [items]="navigationItems" (action)="loadItem($event)">
+</core-navigation-bar>
 <core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
     (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/scorm/pages/player/player.html b/src/addons/mod/scorm/pages/player/player.html
index 73bb4de59..f50283787 100644
--- a/src/addons/mod/scorm/pages/player/player.html
+++ b/src/addons/mod/scorm/pages/player/player.html
@@ -20,13 +20,14 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <core-loading [hideUntil]="loaded">
-        <core-navigation-bar [items]="navigationItems" (action)="loadSco($event)"></core-navigation-bar>
-
+    <core-loading [hideUntil]="loaded" class="core-loading-full-height">
         <core-iframe *ngIf="loaded && src" [src]="src" [iframeWidth]="scormWidth" [iframeHeight]="scormHeight"
             [showFullscreenOnToolbar]="true" [autoFullscreenOnRotate]="true">
         </core-iframe>
 
         <p *ngIf="!src && errorMessage">{{ errorMessage | translate }}</p>
     </core-loading>
+
+    <core-navigation-bar *ngIf="loaded && navigationItems.length > 1" [items]="navigationItems" (action)="loadSco($event)" slot="fixed">
+    </core-navigation-bar>
 </ion-content>
diff --git a/src/core/classes/tabs.ts b/src/core/classes/tabs.ts
index 76527de07..ca644c64e 100644
--- a/src/core/classes/tabs.ts
+++ b/src/core/classes/tabs.ts
@@ -85,7 +85,8 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
     protected firstSelectedTab?: string; // ID of the first selected tab to control history.
     protected backButtonFunction: (event: BackButtonEvent) => void;
     protected languageChangedSubscription?: Subscription;
-    protected isInTransition = false; // Weather Slides is in transition.
+    // Swiper 6 documentation: https://swiper6.vercel.app/
+    protected isInTransition = false; // Wether Slides is in transition.
     protected slidesSwiper: any; // eslint-disable-line @typescript-eslint/no-explicit-any
     protected slidesSwiperLoaded = false;
     protected scrollElements: Record<string | number, HTMLElement> = {}; // Scroll elements for each loaded tab.
diff --git a/src/core/components/navigation-bar/navigation-bar.scss b/src/core/components/navigation-bar/navigation-bar.scss
index a007f12b3..42a6491d7 100644
--- a/src/core/components/navigation-bar/navigation-bar.scss
+++ b/src/core/components/navigation-bar/navigation-bar.scss
@@ -20,5 +20,9 @@
         margin-top: var(--button-vertical-margin);
         margin-bottom: var(--button-vertical-margin);
     }
-
+}
+
+:host-context(.core-iframe-fullscreen) {
+    opacity: 0 !important;
+    height: 0 !important;
 }
diff --git a/src/core/components/navigation-bar/navigation-bar.ts b/src/core/components/navigation-bar/navigation-bar.ts
index 4f1f76b80..4fa88cfe6 100644
--- a/src/core/components/navigation-bar/navigation-bar.ts
+++ b/src/core/components/navigation-bar/navigation-bar.ts
@@ -12,8 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, EventEmitter, Input, OnChanges, Output, SimpleChange } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnChanges, OnDestroy, Output, SimpleChange } from '@angular/core';
+import { IonContent } from '@ionic/angular';
+import { ScrollDetail } from '@ionic/core';
+import { CoreUtils } from '@services/utils/utils';
 import { Translate } from '@singletons';
+import { CoreMath } from '@singletons/math';
 
 /**
  * Component to show a "bar" with arrows to navigate forward/backward and an slider to move around.
@@ -29,7 +33,7 @@ import { Translate } from '@singletons';
     templateUrl: 'core-navigation-bar.html',
     styleUrls: ['navigation-bar.scss'],
 })
-export class CoreNavigationBarComponent implements OnChanges {
+export class CoreNavigationBarComponent implements OnDestroy, OnChanges {
 
     @Input() items: CoreNavigationBarItem[] = []; // List of items.
     @Input() previousTranslate = 'core.previous'; // Previous translatable text, can admit $a variable.
@@ -48,9 +52,118 @@ export class CoreNavigationBarComponent implements OnChanges {
     progress = 0;
     progressText = '';
 
+    protected element: HTMLElement;
+    protected initialHeight = 0;
+    protected initialPaddingBottom = 0;
+    protected previousTop = 0;
+    protected previousHeight = 0;
+    protected stickTimeout?: number;
+    protected content?: HTMLIonContentElement | null;
+
     // Function to call when arrow is clicked. Will receive as a param the item to load.
     @Output() action: EventEmitter<unknown> = new EventEmitter<unknown>();
 
+    constructor(el: ElementRef, protected ionContent: IonContent) {
+        this.element = el.nativeElement;
+        this.element.setAttribute('slot', 'fixed'); // Just in case somebody forgets to add it.
+    }
+
+    /**
+     * Setup scroll event listener.
+     *
+     * @param retries Number of retries left.
+     */
+    protected async listenScrollEvents(retries = 3): Promise<void> {
+        // Already initialized.
+        if (this.initialHeight > 0) {
+            return;
+        }
+
+        this.initialHeight = this.element.getBoundingClientRect().height;
+
+        if (this.initialHeight == 0 && retries > 0) {
+            await CoreUtils.nextTicks(50);
+
+            this.listenScrollEvents(retries - 1);
+
+            return;
+        }
+        // Set a minimum height value.
+        this.initialHeight = this.initialHeight || 48;
+        this.previousHeight = this.initialHeight;
+
+        this.content = this.element.closest('ion-content');
+
+        if (!this.content) {
+            return;
+        }
+
+        this.content.classList.add('has-core-navigation');
+
+        // Move element to the nearest ion-content if it's not the parent.
+        if (this.element.parentElement?.nodeName != 'ION-CONTENT') {
+            this.content.appendChild(this.element);
+        }
+
+        // Set a padding to not overlap elements.
+        this.initialPaddingBottom = parseFloat(this.content.style.getPropertyValue('--padding-bottom') || '0');
+        this.content.style.setProperty('--padding-bottom', this.initialPaddingBottom + this.initialHeight + 'px');
+        const scroll = await this.content.getScrollElement();
+        this.content.scrollEvents = true;
+
+        this.setBarHeight(this.initialHeight);
+        this.content.addEventListener('ionScroll', (e: CustomEvent<ScrollDetail>): void => {
+            if (!this.content) {
+                return;
+            }
+
+            this.onScroll(e.detail, scroll);
+        });
+
+    }
+
+    /**
+     * On scroll function.
+     *
+     * @param scrollDetail Scroll detail object.
+     * @param scrollElement Scroll element to calculate maxScroll.
+     */
+    protected onScroll(scrollDetail: ScrollDetail, scrollElement: HTMLElement): void {
+        const maxScroll = scrollElement.scrollHeight - scrollElement.offsetHeight;
+        if (scrollDetail.scrollTop <= 0 || scrollDetail.scrollTop >= maxScroll) {
+            // Reset.
+            this.setBarHeight(this.initialHeight);
+        } else {
+            let newHeight = this.previousHeight - (scrollDetail.scrollTop - this.previousTop);
+            newHeight = CoreMath.clamp(newHeight, 0, this.initialHeight);
+
+            this.setBarHeight(newHeight);
+        }
+        this.previousTop = scrollDetail.scrollTop;
+    }
+
+    /**
+     * Sets the bar height.
+     *
+     * @param height The new bar height.
+     */
+    protected setBarHeight(height: number): void {
+        if (this.stickTimeout) {
+            clearTimeout(this.stickTimeout);
+        }
+
+        this.element.style.opacity = height <= 0 ? '0' : '1';
+        this.content?.style.setProperty('--core-navigation-height', height + 'px');
+        this.previousHeight = height;
+
+        if (height > 0 && height < this.initialHeight) {
+            // Finish opening or closing the bar.
+            const newHeight = height < this.initialHeight / 2 ? 0 : this.initialHeight;
+
+            this.stickTimeout = window.setTimeout(() => this.setBarHeight(newHeight), 500);
+        }
+    }
+
     /**
      * @inheritdoc
      */
@@ -76,6 +189,8 @@ export class CoreNavigationBarComponent implements OnChanges {
         if (this.previousIndex >= 0) {
             this.previousTitle = Translate.instant(this.previousTranslate, { $a: this.items[this.previousIndex].title || '' });
         }
+
+        this.listenScrollEvents();
     }
 
     /**
@@ -92,6 +207,13 @@ export class CoreNavigationBarComponent implements OnChanges {
         this.action.emit(this.items[itemIndex].item);
     }
 
+    /**
+     * @inheritdoc
+     */
+    async ngOnDestroy(): Promise<void> {
+        this.content?.style.setProperty('--padding-bottom', this.initialPaddingBottom + 'px');
+    }
+
 }
 
 export type CoreNavigationBarItem<T = unknown> = {
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index e2fbd0a46..822b5b991 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -1540,9 +1540,19 @@ body.core-iframe-fullscreen ion-content {
 .core-swipe-slides-container {
     display: flex;
     flex-direction: column;
-    height: 100%;
+    flex-grow: 1;
+    min-height: 100%;
 
     core-swipe-slides {
+        display: flex;
+        flex-direction: column;
         flex-grow: 1;
+
+        ion-slides {
+            flex-grow: 1;
+            max-width: 100%;
+        }
     }
+
+
 }

From b5e20713183d1dd390e3762d074f1f586df31b93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 24 Feb 2022 14:27:39 +0100
Subject: [PATCH 0604/1008] MOBILE-3996 navbar: Move collapsible footer feature
 to a new directive

---
 .../index/addon-mod-assign-index.html         |   2 +-
 .../components/index/index.html               |   2 +-
 .../index/addon-mod-book-index.html           |   2 +-
 .../mod/book/pages/contents/contents.html     |   2 +-
 .../index/addon-mod-chat-index.html           |   2 +-
 .../index/addon-mod-choice-index.html         |   2 +-
 .../index/addon-mod-data-index.html           |   2 +-
 .../index/addon-mod-feedback-index.html       |   2 +-
 .../index/addon-mod-folder-index.html         |   2 +-
 .../mod/forum/components/index/index.html     |   2 +-
 .../index/addon-mod-glossary-index.html       |   2 +-
 .../index/addon-mod-h5pactivity-index.html    |   2 +-
 .../index/addon-mod-imscp-index.html          |   5 +-
 .../index/addon-mod-lesson-index.html         |   2 +-
 .../components/index/addon-mod-lti-index.html |   2 +-
 .../index/addon-mod-page-index.html           |   2 +-
 .../index/addon-mod-quiz-index.html           |   2 +-
 .../index/addon-mod-resource-index.html       |   2 +-
 .../index/addon-mod-scorm-index.html          |   2 +-
 src/addons/mod/scorm/pages/player/player.html |   3 +-
 .../index/addon-mod-survey-index.html         |   2 +-
 .../components/index/addon-mod-url-index.html |   2 +-
 .../index/addon-mod-wiki-index.html           |   2 +-
 .../index/addon-mod-workshop-index.html       |   2 +-
 .../navigation-bar/navigation-bar.scss        |  11 +-
 .../navigation-bar/navigation-bar.ts          | 130 +-------------
 src/core/directives/collapsible-footer.ts     | 158 ++++++++++++++++++
 src/core/directives/directives.module.ts      |   3 +
 .../module-navigation/module-navigation.scss  |  11 +-
 .../module-navigation/module-navigation.ts    | 116 -------------
 .../pages/module-preview/module-preview.html  |   2 +-
 .../core-siteplugins-module-index.html        |   2 +-
 src/theme/theme.base.scss                     |  26 ++-
 src/theme/theme.dark.scss                     |   2 +
 src/theme/theme.light.scss                    |   4 +-
 35 files changed, 226 insertions(+), 291 deletions(-)
 create mode 100644 src/core/directives/collapsible-footer.ts

diff --git a/src/addons/mod/assign/components/index/addon-mod-assign-index.html b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
index 1f7633bd4..a11a4b319 100644
--- a/src/addons/mod/assign/components/index/addon-mod-assign-index.html
+++ b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
@@ -127,6 +127,6 @@
     </addon-mod-assign-submission>
 </core-loading>
 
-<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
     (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/bigbluebuttonbn/components/index/index.html b/src/addons/mod/bigbluebuttonbn/components/index/index.html
index 911bc6123..f17bc8bf5 100644
--- a/src/addons/mod/bigbluebuttonbn/components/index/index.html
+++ b/src/addons/mod/bigbluebuttonbn/components/index/index.html
@@ -112,6 +112,6 @@
     </ng-container>
 </core-loading>
 
-<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
     (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/book/components/index/addon-mod-book-index.html b/src/addons/mod/book/components/index/addon-mod-book-index.html
index 410dd43cc..cdd809546 100644
--- a/src/addons/mod/book/components/index/addon-mod-book-index.html
+++ b/src/addons/mod/book/components/index/addon-mod-book-index.html
@@ -41,6 +41,6 @@
 
 </core-loading>
 
-<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
     (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/book/pages/contents/contents.html b/src/addons/mod/book/pages/contents/contents.html
index a25501544..5089297cf 100644
--- a/src/addons/mod/book/pages/contents/contents.html
+++ b/src/addons/mod/book/pages/contents/contents.html
@@ -45,7 +45,7 @@
         </div>
     </core-loading>
 
-    <core-navigation-bar *ngIf="loaded && displayNavBar && navigationItems.length > 1" [items]="navigationItems"
+    <core-navigation-bar collapsible-footer *ngIf="loaded && displayNavBar && navigationItems.length > 1" [items]="navigationItems"
         previousTranslate="addon.mod_book.navprevtitle" nextTranslate="addon.mod_book.navnexttitle" (action)="changeChapter($event.id)"
         slot="fixed">
     </core-navigation-bar>
diff --git a/src/addons/mod/chat/components/index/addon-mod-chat-index.html b/src/addons/mod/chat/components/index/addon-mod-chat-index.html
index 7296cddb5..52c2a5cc4 100644
--- a/src/addons/mod/chat/components/index/addon-mod-chat-index.html
+++ b/src/addons/mod/chat/components/index/addon-mod-chat-index.html
@@ -30,6 +30,6 @@
     </ng-container>
 </core-loading>
 
-<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
     (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/choice/components/index/addon-mod-choice-index.html b/src/addons/mod/choice/components/index/addon-mod-choice-index.html
index 1eebfa01c..6ef6a30cc 100644
--- a/src/addons/mod/choice/components/index/addon-mod-choice-index.html
+++ b/src/addons/mod/choice/components/index/addon-mod-choice-index.html
@@ -135,7 +135,7 @@
     </ion-card>
 </core-loading>
 
-<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
     (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
 
diff --git a/src/addons/mod/data/components/index/addon-mod-data-index.html b/src/addons/mod/data/components/index/addon-mod-data-index.html
index 6f15f5132..40b51ef5a 100644
--- a/src/addons/mod/data/components/index/addon-mod-data-index.html
+++ b/src/addons/mod/data/components/index/addon-mod-data-index.html
@@ -120,7 +120,7 @@
 
 </core-loading>
 
-<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
     (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
 
diff --git a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
index 3abdff768..4ffa61d9a 100644
--- a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
+++ b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
@@ -35,7 +35,7 @@
     </core-tabs>
 </core-loading>
 
-<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
     (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
 
diff --git a/src/addons/mod/folder/components/index/addon-mod-folder-index.html b/src/addons/mod/folder/components/index/addon-mod-folder-index.html
index 82cb66284..fd09820a8 100644
--- a/src/addons/mod/folder/components/index/addon-mod-folder-index.html
+++ b/src/addons/mod/folder/components/index/addon-mod-folder-index.html
@@ -32,6 +32,6 @@
 
 </core-loading>
 
-<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
     (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/forum/components/index/index.html b/src/addons/mod/forum/components/index/index.html
index 61ff3501f..e49167d13 100644
--- a/src/addons/mod/forum/components/index/index.html
+++ b/src/addons/mod/forum/components/index/index.html
@@ -114,7 +114,7 @@
         </ng-container>
     </core-loading>
 
-    <core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+    <core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
         (completionChanged)="onCompletionChange()">
     </core-course-module-navigation>
 
diff --git a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
index c973a95a3..d391f6172 100644
--- a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
+++ b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
@@ -72,7 +72,7 @@
         </core-infinite-loading>
     </core-loading>
 
-    <core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+    <core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
         (completionChanged)="onCompletionChange()">
     </core-course-module-navigation>
 
diff --git a/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html b/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
index deed6960a..0ef0f7b2d 100644
--- a/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
+++ b/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
@@ -68,6 +68,6 @@
     </core-h5p-iframe>
 </core-loading>
 
-<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
     (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
index ea00f00ce..608162e22 100644
--- a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
+++ b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
@@ -29,8 +29,9 @@
 </core-loading>
 
 <!-- TODO Add a contents page to avoid having both bars -->
-<core-navigation-bar *ngIf="!showLoading && navigationItems.length > 1 && false" [items]="navigationItems" (action)="loadItem($event)">
+<core-navigation-bar collapsible-footer *ngIf="!showLoading && navigationItems.length > 1 && false" [items]="navigationItems"
+    (action)="loadItem($event)">
 </core-navigation-bar>
-<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
     (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
index d79ecd5a1..188c0ca97 100644
--- a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
+++ b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
@@ -279,6 +279,6 @@
     </core-tabs>
 </core-loading>
 
-<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
     (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/lti/components/index/addon-mod-lti-index.html b/src/addons/mod/lti/components/index/addon-mod-lti-index.html
index 1452e0c18..217ee88b2 100644
--- a/src/addons/mod/lti/components/index/addon-mod-lti-index.html
+++ b/src/addons/mod/lti/components/index/addon-mod-lti-index.html
@@ -21,6 +21,6 @@
     </div>
 </core-loading>
 
-<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
     (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/page/components/index/addon-mod-page-index.html b/src/addons/mod/page/components/index/addon-mod-page-index.html
index 83536200d..e995cc5a0 100644
--- a/src/addons/mod/page/components/index/addon-mod-page-index.html
+++ b/src/addons/mod/page/components/index/addon-mod-page-index.html
@@ -32,6 +32,6 @@
 
 </core-loading>
 
-<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
     (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
index 59961b31c..5b80f4744 100644
--- a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
+++ b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
@@ -206,6 +206,6 @@
     </ion-card>
 </core-loading>
 
-<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
     (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/resource/components/index/addon-mod-resource-index.html b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
index 1efbca3f9..0fd7713b7 100644
--- a/src/addons/mod/resource/components/index/addon-mod-resource-index.html
+++ b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
@@ -97,6 +97,6 @@
     </ng-container>
 </core-loading>
 
-<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
     (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
index 96329ba19..49c22490a 100644
--- a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
+++ b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
@@ -217,6 +217,6 @@
     </ng-container>
 </core-loading>
 
-<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
     (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/scorm/pages/player/player.html b/src/addons/mod/scorm/pages/player/player.html
index f50283787..895ae27f0 100644
--- a/src/addons/mod/scorm/pages/player/player.html
+++ b/src/addons/mod/scorm/pages/player/player.html
@@ -28,6 +28,7 @@
         <p *ngIf="!src && errorMessage">{{ errorMessage | translate }}</p>
     </core-loading>
 
-    <core-navigation-bar *ngIf="loaded && navigationItems.length > 1" [items]="navigationItems" (action)="loadSco($event)" slot="fixed">
+    <core-navigation-bar collapsible-footer *ngIf="loaded && navigationItems.length > 1" [items]="navigationItems"
+        (action)="loadSco($event)" slot="fixed">
     </core-navigation-bar>
 </ion-content>
diff --git a/src/addons/mod/survey/components/index/addon-mod-survey-index.html b/src/addons/mod/survey/components/index/addon-mod-survey-index.html
index 8c99699fc..6fd4d8906 100644
--- a/src/addons/mod/survey/components/index/addon-mod-survey-index.html
+++ b/src/addons/mod/survey/components/index/addon-mod-survey-index.html
@@ -131,6 +131,6 @@
 
 </core-loading>
 
-<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
     (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/url/components/index/addon-mod-url-index.html b/src/addons/mod/url/components/index/addon-mod-url-index.html
index 0153bcdf7..9bd9966eb 100644
--- a/src/addons/mod/url/components/index/addon-mod-url-index.html
+++ b/src/addons/mod/url/components/index/addon-mod-url-index.html
@@ -46,6 +46,6 @@
     </ion-list>
 </core-loading>
 
-<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
     (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
index 342e83895..f7208d4ce 100644
--- a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
+++ b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
@@ -71,7 +71,7 @@
     </div>
 </core-loading>
 
-<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
     (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
 
diff --git a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
index ebb5b73a3..adc5c72e4 100644
--- a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
+++ b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
@@ -233,6 +233,6 @@
     </div>
 </core-loading>
 
-<core-course-module-navigation [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
     (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/core/components/navigation-bar/navigation-bar.scss b/src/core/components/navigation-bar/navigation-bar.scss
index 42a6491d7..6579ff761 100644
--- a/src/core/components/navigation-bar/navigation-bar.scss
+++ b/src/core/components/navigation-bar/navigation-bar.scss
@@ -1,7 +1,7 @@
 @import "~theme/globals";
 
 :host {
-    --height: var(--core-navigation-height, var(--core-navigation-max-height));
+    --height: var(--core-navigation-max-height);
     --background: var(--core-navigation-background);
     --button-vertical-margin: 2px;
 
@@ -9,20 +9,11 @@
     width: 100%;
     background-color: var(--background);
     display: block;
-    bottom: 0;
-    z-index: 3;
     border-top: 1px solid var(--stroke);
 
-    @include core-transition(all, 200ms);
-
     ion-button,
     ::ng-deep ion-button {
         margin-top: var(--button-vertical-margin);
         margin-bottom: var(--button-vertical-margin);
     }
 }
-
-:host-context(.core-iframe-fullscreen) {
-    opacity: 0 !important;
-    height: 0 !important;
-}
diff --git a/src/core/components/navigation-bar/navigation-bar.ts b/src/core/components/navigation-bar/navigation-bar.ts
index 4fa88cfe6..c749dfa5f 100644
--- a/src/core/components/navigation-bar/navigation-bar.ts
+++ b/src/core/components/navigation-bar/navigation-bar.ts
@@ -12,18 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, ElementRef, EventEmitter, Input, OnChanges, OnDestroy, Output, SimpleChange } from '@angular/core';
-import { IonContent } from '@ionic/angular';
-import { ScrollDetail } from '@ionic/core';
-import { CoreUtils } from '@services/utils/utils';
+import { Component, EventEmitter, Input, OnChanges, Output, SimpleChange } from '@angular/core';
 import { Translate } from '@singletons';
-import { CoreMath } from '@singletons/math';
 
 /**
- * Component to show a "bar" with arrows to navigate forward/backward and an slider to move around.
+ * Component to show a "bar" with arrows to navigate forward/backward and an progressbar to see the status.
  *
  * This directive will show two arrows at the left and right of the screen to navigate to previous/next item when clicked.
- * If no previous/next item is defined, that arrow won't be shown.
+ * If no previous/next item is defined, that arrow will be disabled.
  *
  * Example usage:
  * <core-navigation-bar [items]="items" (action)="goTo($event)"></core-navigation-bar>
@@ -33,7 +29,7 @@ import { CoreMath } from '@singletons/math';
     templateUrl: 'core-navigation-bar.html',
     styleUrls: ['navigation-bar.scss'],
 })
-export class CoreNavigationBarComponent implements OnDestroy, OnChanges {
+export class CoreNavigationBarComponent implements OnChanges {
 
     @Input() items: CoreNavigationBarItem[] = []; // List of items.
     @Input() previousTranslate = 'core.previous'; // Previous translatable text, can admit $a variable.
@@ -52,118 +48,9 @@ export class CoreNavigationBarComponent implements OnDestroy, OnChanges {
     progress = 0;
     progressText = '';
 
-    protected element: HTMLElement;
-    protected initialHeight = 0;
-    protected initialPaddingBottom = 0;
-    protected previousTop = 0;
-    protected previousHeight = 0;
-    protected stickTimeout?: number;
-    protected content?: HTMLIonContentElement | null;
-
     // Function to call when arrow is clicked. Will receive as a param the item to load.
     @Output() action: EventEmitter<unknown> = new EventEmitter<unknown>();
 
-    constructor(el: ElementRef, protected ionContent: IonContent) {
-        this.element = el.nativeElement;
-        this.element.setAttribute('slot', 'fixed'); // Just in case somebody forgets to add it.
-    }
-
-    /**
-     * Setup scroll event listener.
-     *
-     * @param retries Number of retries left.
-     */
-    protected async listenScrollEvents(retries = 3): Promise<void> {
-        // Already initialized.
-        if (this.initialHeight > 0) {
-            return;
-        }
-
-        this.initialHeight = this.element.getBoundingClientRect().height;
-
-        if (this.initialHeight == 0 && retries > 0) {
-            await CoreUtils.nextTicks(50);
-
-            this.listenScrollEvents(retries - 1);
-
-            return;
-        }
-        // Set a minimum height value.
-        this.initialHeight = this.initialHeight || 48;
-        this.previousHeight = this.initialHeight;
-
-        this.content = this.element.closest('ion-content');
-
-        if (!this.content) {
-            return;
-        }
-
-        this.content.classList.add('has-core-navigation');
-
-        // Move element to the nearest ion-content if it's not the parent.
-        if (this.element.parentElement?.nodeName != 'ION-CONTENT') {
-            this.content.appendChild(this.element);
-        }
-
-        // Set a padding to not overlap elements.
-        this.initialPaddingBottom = parseFloat(this.content.style.getPropertyValue('--padding-bottom') || '0');
-        this.content.style.setProperty('--padding-bottom', this.initialPaddingBottom + this.initialHeight + 'px');
-        const scroll = await this.content.getScrollElement();
-        this.content.scrollEvents = true;
-
-        this.setBarHeight(this.initialHeight);
-        this.content.addEventListener('ionScroll', (e: CustomEvent<ScrollDetail>): void => {
-            if (!this.content) {
-                return;
-            }
-
-            this.onScroll(e.detail, scroll);
-        });
-
-    }
-
-    /**
-     * On scroll function.
-     *
-     * @param scrollDetail Scroll detail object.
-     * @param scrollElement Scroll element to calculate maxScroll.
-     */
-    protected onScroll(scrollDetail: ScrollDetail, scrollElement: HTMLElement): void {
-        const maxScroll = scrollElement.scrollHeight - scrollElement.offsetHeight;
-        if (scrollDetail.scrollTop <= 0 || scrollDetail.scrollTop >= maxScroll) {
-            // Reset.
-            this.setBarHeight(this.initialHeight);
-        } else {
-            let newHeight = this.previousHeight - (scrollDetail.scrollTop - this.previousTop);
-            newHeight = CoreMath.clamp(newHeight, 0, this.initialHeight);
-
-            this.setBarHeight(newHeight);
-        }
-        this.previousTop = scrollDetail.scrollTop;
-    }
-
-    /**
-     * Sets the bar height.
-     *
-     * @param height The new bar height.
-     */
-    protected setBarHeight(height: number): void {
-        if (this.stickTimeout) {
-            clearTimeout(this.stickTimeout);
-        }
-
-        this.element.style.opacity = height <= 0 ? '0' : '1';
-        this.content?.style.setProperty('--core-navigation-height', height + 'px');
-        this.previousHeight = height;
-
-        if (height > 0 && height < this.initialHeight) {
-            // Finish opening or closing the bar.
-            const newHeight = height < this.initialHeight / 2 ? 0 : this.initialHeight;
-
-            this.stickTimeout = window.setTimeout(() => this.setBarHeight(newHeight), 500);
-        }
-    }
-
     /**
      * @inheritdoc
      */
@@ -189,8 +76,6 @@ export class CoreNavigationBarComponent implements OnDestroy, OnChanges {
         if (this.previousIndex >= 0) {
             this.previousTitle = Translate.instant(this.previousTranslate, { $a: this.items[this.previousIndex].title || '' });
         }
-
-        this.listenScrollEvents();
     }
 
     /**
@@ -207,13 +92,6 @@ export class CoreNavigationBarComponent implements OnDestroy, OnChanges {
         this.action.emit(this.items[itemIndex].item);
     }
 
-    /**
-     * @inheritdoc
-     */
-    async ngOnDestroy(): Promise<void> {
-        this.content?.style.setProperty('--padding-bottom', this.initialPaddingBottom + 'px');
-    }
-
 }
 
 export type CoreNavigationBarItem<T = unknown> = {
diff --git a/src/core/directives/collapsible-footer.ts b/src/core/directives/collapsible-footer.ts
new file mode 100644
index 000000000..71fd0b7fd
--- /dev/null
+++ b/src/core/directives/collapsible-footer.ts
@@ -0,0 +1,158 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { Directive, ElementRef, OnDestroy, OnInit } from '@angular/core';
+import { ScrollDetail } from '@ionic/core';
+import { IonContent } from '@ionic/angular';
+import { CoreUtils } from '@services/utils/utils';
+import { CoreMath } from '@singletons/math';
+
+/**
+ * Directive to make an element fixed at the bottom collapsible when scrolling.
+ *
+ * Example usage:
+ *
+ * <div collapsible-footer>
+ */
+@Directive({
+    selector: '[collapsible-footer]',
+})
+export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
+
+    protected element: HTMLElement;
+    protected initialHeight = 0;
+    protected initialPaddingBottom = 0;
+    protected previousTop = 0;
+    protected previousHeight = 0;
+    protected stickTimeout?: number;
+    protected content?: HTMLIonContentElement | null;
+
+    constructor(el: ElementRef, protected ionContent: IonContent) {
+        this.element = el.nativeElement;
+        this.element.setAttribute('slot', 'fixed'); // Just in case somebody forgets to add it.
+    }
+
+    /**
+     * Setup scroll event listener.
+     *
+     * @param retries Number of retries left.
+     */
+    protected async listenScrollEvents(retries = 5): Promise<void> {
+        // Already initialized.
+        if (this.initialHeight > 0) {
+            return;
+        }
+
+        this.initialHeight = this.element.getBoundingClientRect().height;
+
+        if (this.initialHeight == 0 && retries > 0) {
+            await CoreUtils.nextTicks(50);
+
+            this.listenScrollEvents(retries - 1);
+
+            return;
+        }
+
+        // Set a minimum height value.
+        this.initialHeight = this.initialHeight || 48;
+        this.previousHeight = this.initialHeight;
+
+        this.content = this.element.closest('ion-content');
+
+        if (!this.content) {
+            return;
+        }
+
+        this.content.classList.add('has-collapsible-footer');
+
+        // Move element to the nearest ion-content if it's not the parent.
+        if (this.element.parentElement?.nodeName != 'ION-CONTENT') {
+            this.content.appendChild(this.element);
+        }
+
+        // Set a padding to not overlap elements.
+        this.initialPaddingBottom = parseFloat(this.content.style.getPropertyValue('--padding-bottom') || '0');
+        this.content.style.setProperty('--padding-bottom', this.initialPaddingBottom + this.initialHeight + 'px');
+        const scroll = await this.content.getScrollElement();
+        this.content.scrollEvents = true;
+
+        this.setBarHeight(this.initialHeight);
+        this.content.addEventListener('ionScroll', (e: CustomEvent<ScrollDetail>): void => {
+            if (!this.content) {
+                return;
+            }
+
+            this.onScroll(e.detail, scroll);
+        });
+
+    }
+
+    /**
+     * On scroll function.
+     *
+     * @param scrollDetail Scroll detail object.
+     * @param scrollElement Scroll element to calculate maxScroll.
+     */
+    protected onScroll(scrollDetail: ScrollDetail, scrollElement: HTMLElement): void {
+        const maxScroll = scrollElement.scrollHeight - scrollElement.offsetHeight;
+        if (scrollDetail.scrollTop <= 0 || scrollDetail.scrollTop >= maxScroll) {
+            // Reset.
+            this.setBarHeight(this.initialHeight);
+        } else {
+            let newHeight = this.previousHeight - (scrollDetail.scrollTop - this.previousTop);
+            newHeight = CoreMath.clamp(newHeight, 0, this.initialHeight);
+
+            this.setBarHeight(newHeight);
+        }
+        this.previousTop = scrollDetail.scrollTop;
+    }
+
+    /**
+     * Sets the bar height.
+     *
+     * @param height The new bar height.
+     */
+    protected setBarHeight(height: number): void {
+        if (this.stickTimeout) {
+            clearTimeout(this.stickTimeout);
+        }
+
+        this.element.classList.toggle('footer-collapsed', height <= 0);
+        this.element.classList.toggle('footer-expanded', height >= this.initialHeight);
+        this.content?.style.setProperty('--core-collapsible-footer-height', height + 'px');
+        this.previousHeight = height;
+
+        if (height > 0 && height < this.initialHeight) {
+            // Finish opening or closing the bar.
+            const newHeight = height < this.initialHeight / 2 ? 0 : this.initialHeight;
+
+            this.stickTimeout = window.setTimeout(() => this.setBarHeight(newHeight), 500);
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    ngOnInit(): void {
+        this.listenScrollEvents();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async ngOnDestroy(): Promise<void> {
+        this.content?.style.setProperty('--padding-bottom', this.initialPaddingBottom + 'px');
+    }
+
+}
diff --git a/src/core/directives/directives.module.ts b/src/core/directives/directives.module.ts
index 42a2b3c79..9f518532f 100644
--- a/src/core/directives/directives.module.ts
+++ b/src/core/directives/directives.module.ts
@@ -30,6 +30,7 @@ import { CoreDownloadFileDirective } from './download-file';
 import { CoreCollapsibleHeaderDirective } from './collapsible-header';
 import { CoreSwipeNavigationDirective } from './swipe-navigation';
 import { CoreCollapsibleItemDirective } from './collapsible-item';
+import { CoreCollapsibleFooterDirective } from './collapsible-footer';
 
 @NgModule({
     declarations: [
@@ -49,6 +50,7 @@ import { CoreCollapsibleItemDirective } from './collapsible-item';
         CoreCollapsibleHeaderDirective,
         CoreSwipeNavigationDirective,
         CoreCollapsibleItemDirective,
+        CoreCollapsibleFooterDirective,
     ],
     exports: [
         CoreAutoFocusDirective,
@@ -67,6 +69,7 @@ import { CoreCollapsibleItemDirective } from './collapsible-item';
         CoreCollapsibleHeaderDirective,
         CoreSwipeNavigationDirective,
         CoreCollapsibleItemDirective,
+        CoreCollapsibleFooterDirective,
     ],
 })
 export class CoreDirectivesModule {}
diff --git a/src/core/features/course/components/module-navigation/module-navigation.scss b/src/core/features/course/components/module-navigation/module-navigation.scss
index 48713703f..7ae45b850 100644
--- a/src/core/features/course/components/module-navigation/module-navigation.scss
+++ b/src/core/features/course/components/module-navigation/module-navigation.scss
@@ -1,7 +1,7 @@
 @import "~theme/globals";
 
 :host {
-    --height: var(--core-navigation-height, var(--core-navigation-max-height));
+    --height: var(--core-navigation-max-height);
     --background: var(--core-navigation-background);
     --button-vertical-margin: 2px;
 
@@ -9,12 +9,8 @@
     width: 100%;
     background-color: var(--background);
     display: block;
-    bottom: 0;
-    z-index: 3;
     border-top: 1px solid var(--stroke);
 
-    @include core-transition(all, 200ms);
-
     core-loading {
         text-align: center;
         --loading-inline-min-height: var(--height);
@@ -27,11 +23,6 @@
     }
 }
 
-:host-context(.core-iframe-fullscreen) {
-    opacity: 0 !important;
-    height: 0 !important;
-}
-
 :host-context(core-course-format.core-course-format-singleactivity) {
     opacity: 0 !important;
     height: 0 !important;
diff --git a/src/core/features/course/components/module-navigation/module-navigation.ts b/src/core/features/course/components/module-navigation/module-navigation.ts
index 5b6a4062f..af20ac47e 100644
--- a/src/core/features/course/components/module-navigation/module-navigation.ts
+++ b/src/core/features/course/components/module-navigation/module-navigation.ts
@@ -17,13 +17,11 @@ import { CoreCourse, CoreCourseProvider, CoreCourseWSSection } from '@features/c
 import { CoreCourseModuleCompletionData, CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate';
 import { IonContent } from '@ionic/angular';
-import { ScrollDetail } from '@ionic/core';
 import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
 import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
-import { CoreMath } from '@singletons/math';
 
 /**
  * Component to show a button to go to the next resource/activity.
@@ -51,21 +49,11 @@ export class CoreCourseModuleNavigationComponent implements OnInit, OnDestroy {
     loaded = false;
     showCompletion = false; // Whether to show completion.
 
-    protected element: HTMLElement;
-    protected initialHeight = 0;
-    protected initialPaddingBottom = 0;
-    protected previousTop = 0;
-    protected previousHeight = 0;
-    protected stickTimeout?: number;
-    protected content?: HTMLIonContentElement | null;
     protected completionObserver: CoreEventObserver;
 
     constructor(el: ElementRef, protected ionContent: IonContent) {
         const siteId = CoreSites.getCurrentSiteId();
 
-        this.element = el.nativeElement;
-        this.element.setAttribute('slot', 'fixed');
-
         this.completionObserver = CoreEvents.on(CoreEvents.COMPLETION_MODULE_VIEWED, async (data) => {
             if (data && data.courseId == this.courseId) {
                 // Check if now there's a next module.
@@ -88,76 +76,14 @@ export class CoreCourseModuleNavigationComponent implements OnInit, OnDestroy {
             await this.setNextAndPreviousModules(CoreSitesReadingStrategy.PREFER_CACHE);
         } finally {
             this.loaded = true;
-
-            await CoreUtils.nextTicks(50);
-            this.listenScrollEvents();
         }
     }
 
-    /**
-     * Setup scroll event listener.
-     *
-     * @param retries Number of retries left.
-     */
-    protected async listenScrollEvents(retries = 3): Promise<void> {
-        this.initialHeight = this.element.getBoundingClientRect().height;
-
-        if (this.initialHeight == 0 && retries > 0) {
-            await CoreUtils.nextTicks(50);
-
-            this.listenScrollEvents(retries - 1);
-
-            return;
-        }
-        // Set a minimum height value.
-        this.initialHeight = this.initialHeight || 48;
-        this.previousHeight = this.initialHeight;
-
-        this.content = this.element.closest('ion-content');
-
-        if (!this.content) {
-            return;
-        }
-
-        // Special case where there's no navigation.
-        const courseFormat = this.element.closest('core-course-format.core-course-format-singleactivity');
-        if (courseFormat) {
-            this.element.remove();
-            this.ngOnDestroy();
-
-            return;
-        }
-
-        this.content.classList.add('has-core-navigation');
-
-        // Move element to the nearest ion-content if it's not the parent.
-        if (this.element.parentElement?.nodeName != 'ION-CONTENT') {
-            this.content.appendChild(this.element);
-        }
-
-        // Set a padding to not overlap elements.
-        this.initialPaddingBottom = parseFloat(this.content.style.getPropertyValue('--padding-bottom') || '0');
-        this.content.style.setProperty('--padding-bottom', this.initialPaddingBottom + this.initialHeight + 'px');
-        const scroll = await this.content.getScrollElement();
-        this.content.scrollEvents = true;
-
-        this.setBarHeight(this.initialHeight);
-        this.content.addEventListener('ionScroll', (e: CustomEvent<ScrollDetail>): void => {
-            if (!this.content) {
-                return;
-            }
-
-            this.onScroll(e.detail, scroll);
-        });
-
-    }
-
     /**
      * @inheritdoc
      */
     async ngOnDestroy(): Promise<void> {
         this.completionObserver.off();
-        this.content?.style.setProperty('--padding-bottom', this.initialPaddingBottom + 'px');
     }
 
     /**
@@ -316,46 +242,4 @@ export class CoreCourseModuleNavigationComponent implements OnInit, OnDestroy {
         }
     }
 
-    /**
-     * On scroll function.
-     *
-     * @param scrollDetail Scroll detail object.
-     * @param scrollElement Scroll element to calculate maxScroll.
-     */
-    protected onScroll(scrollDetail: ScrollDetail, scrollElement: HTMLElement): void {
-        const maxScroll = scrollElement.scrollHeight - scrollElement.offsetHeight;
-        if (scrollDetail.scrollTop <= 0 || scrollDetail.scrollTop >= maxScroll) {
-            // Reset.
-            this.setBarHeight(this.initialHeight);
-        } else {
-            let newHeight = this.previousHeight - (scrollDetail.scrollTop - this.previousTop);
-            newHeight = CoreMath.clamp(newHeight, 0, this.initialHeight);
-
-            this.setBarHeight(newHeight);
-        }
-        this.previousTop = scrollDetail.scrollTop;
-    }
-
-    /**
-     * Sets the bar height.
-     *
-     * @param height The new bar height.
-     */
-    protected setBarHeight(height: number): void {
-        if (this.stickTimeout) {
-            clearTimeout(this.stickTimeout);
-        }
-
-        this.element.style.opacity = height <= 0 ? '0' : '1';
-        this.content?.style.setProperty('--core-navigation-height', height + 'px');
-        this.previousHeight = height;
-
-        if (height > 0 && height < this.initialHeight) {
-            // Finish opening or closing the bar.
-            const newHeight = height < this.initialHeight / 2 ? 0 : this.initialHeight;
-
-            this.stickTimeout = window.setTimeout(() => this.setBarHeight(newHeight), 500);
-        }
-    }
-
 }
diff --git a/src/core/features/course/pages/module-preview/module-preview.html b/src/core/features/course/pages/module-preview/module-preview.html
index 010351d87..60efcbee6 100644
--- a/src/core/features/course/pages/module-preview/module-preview.html
+++ b/src/core/features/course/pages/module-preview/module-preview.html
@@ -44,6 +44,6 @@
         <core-course-unsupported-module *ngIf="unsupported" [module]="module"></core-course-unsupported-module>
     </core-loading>
 
-    <core-course-module-navigation [hidden]="!loaded" [courseId]="courseId" [currentModule]="module"
+    <core-course-module-navigation collapsible-footer [hidden]="!loaded" [courseId]="courseId" [currentModule]="module"
         (completionChanged)="onCompletionChange()" [showManualCompletion]="showManualCompletion"></core-course-module-navigation>
 </ion-content>
diff --git a/src/core/features/siteplugins/components/module-index/core-siteplugins-module-index.html b/src/core/features/siteplugins/components/module-index/core-siteplugins-module-index.html
index 94574fcbe..b47edea6c 100644
--- a/src/core/features/siteplugins/components/module-index/core-siteplugins-module-index.html
+++ b/src/core/features/siteplugins/components/module-index/core-siteplugins-module-index.html
@@ -14,5 +14,5 @@
     (onLoadingContent)="contentLoading()">
 </core-site-plugins-plugin-content>
 
-<core-course-module-navigation *ngIf="module" [courseId]="courseId" [currentModule]="module">
+<core-course-module-navigation collapsible-footer *ngIf="module" [courseId]="courseId" [currentModule]="module">
 </core-course-module-navigation>
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 822b5b991..8261707ae 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -1124,7 +1124,7 @@ ion-fab[core-fab] {
     }
 }
 
-ion-content.has-core-navigation ion-fab {
+ion-content.has-collapsible-footer ion-fab {
     bottom: calc(var(--core-navigation-height, 0px) + 10px);
     @include core-transition(all, 200ms);
 }
@@ -1442,6 +1442,30 @@ ion-grid.core-no-grid > ion-row {
     @include collapsible-item();
 }
 
+[collapsible-footer] {
+    &.footer-collapsed {
+        --core-collapsible-footer-height: 0;
+        opacity: 0;
+    }
+    &.footer-expanded {
+        --core-collapsible-footer-height: auto;
+    }
+
+    width: 100%;
+    bottom: 0;
+    z-index: 3;
+    height: var(--core-collapsible-footer-height, auto);
+    background-color: var(--core-collapsible-footer-background);
+    display: block;
+    border-top: 1px solid var(--stroke);
+    @include core-transition(all, 200ms);
+}
+
+.core-iframe-fullscreen [collapsible-footer] {
+    opacity: 0 !important;
+    height: 0 !important;
+}
+
 ion-header.no-title {
     --core-header-toolbar-border-width: 0;
     --core-header-toolbar-background: transparent;
diff --git a/src/theme/theme.dark.scss b/src/theme/theme.dark.scss
index b5be2494e..358d341f1 100644
--- a/src/theme/theme.dark.scss
+++ b/src/theme/theme.dark.scss
@@ -131,6 +131,8 @@
 
     --core-navigation-background: var(--contrast-background);
 
+    --core-collapsible-footer-background: var(--contrast-background);
+
     --addon-messages-message-bg: var(--gray-800);
     --addon-messages-message-activated-bg: var(--gray-700);
     --addon-messages-message-note-text: var(--subdued-text-color);
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 58a0cc3a5..34fa46c45 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -310,9 +310,11 @@
     --core-courseimage-on-course-size: 72px;
     --core-courseimage-radius: var(--medium-radius);
 
-    --core-navigation-max-height: 48px;
+    --core-navigation-height: 48px;
     --core-navigation-background: var(--contrast-background);
 
+    --core-collapsible-footer-background: var(--contrast-background);
+
     --core-user-menu-site-logo-max-height: 32px;
 
     --addon-calendar-today-border-color: var(--primary);

From 8dbefef88bc809dcefa626551215046a7c66b869 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 24 Feb 2022 16:10:51 +0100
Subject: [PATCH 0605/1008] MOBILE-3833 core: Don't display token expired error
 modal

The same message is displayed in reconnect page.
---
 scripts/langindex.json                              |  1 -
 src/core/classes/site.ts                            | 13 +++++++++++--
 src/core/features/login/lang.json                   |  1 -
 .../features/login/pages/reconnect/reconnect.html   |  2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 092fbfb2c..11f362ee4 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1970,7 +1970,6 @@
   "core.login.recaptchaexpired": "local_moodlemobileapp",
   "core.login.recaptchaincorrect": "local_moodlemobileapp",
   "core.login.reconnect": "local_moodlemobileapp",
-  "core.login.reconnectdescription": "local_moodlemobileapp",
   "core.login.reconnectssodescription": "local_moodlemobileapp",
   "core.login.removeaccount": "local_moodlemobileapp",
   "core.login.resendemail": "moodle",
diff --git a/src/core/classes/site.ts b/src/core/classes/site.ts
index f88defc5d..99f9bb496 100644
--- a/src/core/classes/site.ts
+++ b/src/core/classes/site.ts
@@ -45,6 +45,7 @@ import { CoreSites } from '@services/sites';
 import { asyncInstance, AsyncInstance } from '../utils/async-instance';
 import { CoreDatabaseTable } from './database/database-table';
 import { CoreDatabaseCachingStrategy } from './database/database-table-proxy';
+import { CoreSilentError } from './errors/silenterror';
 
 /**
  * QR Code type enumeration.
@@ -520,7 +521,8 @@ export class CoreSite {
             // Site is logged out, it cannot call WebServices.
             CoreEvents.trigger(CoreEvents.SESSION_EXPIRED, {}, this.id);
 
-            throw new CoreError(Translate.instant('core.lostconnection'));
+            // Use a silent error, the SESSION_EXPIRED event will display a message if needed.
+            throw new CoreSilentError(Translate.instant('core.lostconnection'));
         }
 
         const initialToken = this.token || '';
@@ -610,6 +612,8 @@ export class CoreSite {
 
                 return response;
             } catch (error) {
+                let useSilentError = false;
+
                 if (CoreUtils.isExpiredTokenError(error)) {
                     if (initialToken !== this.token && !retrying) {
                         // Token has changed, retry with the new token.
@@ -627,6 +631,7 @@ export class CoreSite {
                     CoreEvents.trigger(CoreEvents.SESSION_EXPIRED, {}, this.id);
                     // Change error message. Try to get data from cache, the event will handle the error.
                     error.message = Translate.instant('core.lostconnection');
+                    useSilentError = true; // Use a silent error, the SESSION_EXPIRED event will display a message if needed.
                 } else if (error.errorcode === 'userdeleted' || error.errorcode === 'wsaccessuserdeleted') {
                     // User deleted, trigger event.
                     CoreEvents.trigger(CoreEvents.USER_DELETED, { params: data }, this.id);
@@ -707,7 +712,11 @@ export class CoreSite {
 
                 try {
                     return await this.getFromCache<T>(method, data, preSets, true);
-                } catch (e) {
+                } catch {
+                    if (useSilentError) {
+                        throw new CoreSilentError(error.message);
+                    }
+
                     throw new CoreWSError(error);
                 }
             }
diff --git a/src/core/features/login/lang.json b/src/core/features/login/lang.json
index f3716516e..6eb0b227f 100644
--- a/src/core/features/login/lang.json
+++ b/src/core/features/login/lang.json
@@ -96,7 +96,6 @@
     "recaptchaexpired": "Verification expired. Answer the security question again.",
     "recaptchaincorrect": "The security question answer is incorrect.",
     "reconnect": "Reconnect",
-    "reconnectdescription": "Your authentication token is invalid or has expired. You have to reconnect to the site.",
     "reconnectssodescription": "Your authentication token is invalid or has expired. You have to reconnect to the site. You need to log in to the site in a browser window.",
     "removeaccount": "Remove account",
     "resendemail": "Resend email",
diff --git a/src/core/features/login/pages/reconnect/reconnect.html b/src/core/features/login/pages/reconnect/reconnect.html
index 3a37bd1f0..61bf8066f 100644
--- a/src/core/features/login/pages/reconnect/reconnect.html
+++ b/src/core/features/login/pages/reconnect/reconnect.html
@@ -30,7 +30,7 @@
             <ion-item>
                 <ion-icon name="fas-exclamation-circle" slot="start" aria-hidden="true"></ion-icon>
                 <ion-label>
-                    <p>{{ 'core.login.reconnectdescription' | translate }}</p>
+                    <p>{{ 'core.lostconnection' | translate }}</p>
                 </ion-label>
             </ion-item>
         </ion-card>

From 8c960d4739839f06f95db03d6b911104e8e1c62c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 24 Feb 2022 17:04:34 +0100
Subject: [PATCH 0606/1008] MOBILE-3833 core: Fix download file spinner shown
 forever

---
 src/core/services/filepool.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/services/filepool.ts b/src/core/services/filepool.ts
index f41ee3cd4..b3db06a44 100644
--- a/src/core/services/filepool.ts
+++ b/src/core/services/filepool.ts
@@ -2603,12 +2603,12 @@ export class CoreFilepoolProvider {
             // Success, we add links and remove from queue.
             CoreUtils.ignoreErrors(this.addFileLinks(siteId, fileId, links));
 
-            this.treatQueueDeferred(siteId, fileId, true);
-            this.notifyFileDownloaded(siteId, fileId, links);
-
             // Wait for the item to be removed from queue before resolving the promise.
             // If the item could not be removed from queue we still resolve the promise.
             await CoreUtils.ignoreErrors(this.removeFromQueue(siteId, fileId));
+
+            this.treatQueueDeferred(siteId, fileId, true);
+            this.notifyFileDownloaded(siteId, fileId, links);
         } catch (errorObject) {
             // Whoops, we have an error...
             let dropFromQueue = false;

From 8d540e6010ec7b01646f0b4a6268f366fc16dc87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 25 Feb 2022 09:25:35 +0100
Subject: [PATCH 0607/1008] MOBILE-3149 choice: Collapse list of users in
 results

---
 .../index/addon-mod-choice-index.html         | 22 ++++++++++++-------
 .../mod/choice/components/index/index.ts      | 10 +++++++++
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/addons/mod/choice/components/index/addon-mod-choice-index.html b/src/addons/mod/choice/components/index/addon-mod-choice-index.html
index 6ef6a30cc..f5620647c 100644
--- a/src/addons/mod/choice/components/index/addon-mod-choice-index.html
+++ b/src/addons/mod/choice/components/index/addon-mod-choice-index.html
@@ -96,7 +96,11 @@
                 </ion-col>
                 <ion-col *ngIf="choice.publish && results" size="12" size-lg="7">
                     <ion-item-group *ngFor="let result of results">
-                        <ion-item-divider class="ion-text-wrap">
+                        <ion-item [button]="result.numberofuser > 0" class="divider ion-text-wrap" (click)="toggle(result)"
+                            [attr.aria-label]="(result.expanded ? 'core.collapse' : 'core.expand') | translate" detail="false">
+                            <ion-icon [name]="result.numberofuser > 0 ? 'fas-chevron-right' : ''" flip-rtl slot="start" aria-hidden="true"
+                                class="expandable-status-icon" [class.expandable-status-icon-expanded]="result.expanded">
+                            </ion-icon>
                             <ion-label>
                                 <h3 class="item-heading">
                                     <core-format-text [text]="result.text" contextLevel="module" [contextInstanceId]="module.id"
@@ -111,14 +115,16 @@
                                     {{ 'addon.mod_choice.limita' | translate:{$a: result.maxanswer} }}
                                 </p>
                             </ion-label>
-                        </ion-item-divider>
-                        <ion-item *ngFor="let user of result.userresponses" core-user-link [courseId]="courseId" [userId]="user.userid"
-                            [attr.aria-label]="user.fullname" class="ion-text-wrap">
-                            <core-user-avatar [user]="user" slot="start" [courseId]="courseId"></core-user-avatar>
-                            <ion-label>
-                                <p>{{user.fullname}}</p>
-                            </ion-label>
                         </ion-item>
+                        <ng-container *ngIf="result.expanded">
+                            <ion-item *ngFor="let user of result.userresponses" core-user-link [courseId]="courseId" [userId]="user.userid"
+                                [attr.aria-label]="user.fullname" class="ion-text-wrap">
+                                <core-user-avatar [user]="user" slot="start" [courseId]="courseId"></core-user-avatar>
+                                <ion-label>
+                                    <p>{{user.fullname}}</p>
+                                </ion-label>
+                            </ion-item>
+                        </ng-container>
                     </ion-item-group>
                 </ion-col>
             </ion-row>
diff --git a/src/addons/mod/choice/components/index/index.ts b/src/addons/mod/choice/components/index/index.ts
index 2597bde19..a43fc8c58 100644
--- a/src/addons/mod/choice/components/index/index.ts
+++ b/src/addons/mod/choice/components/index/index.ts
@@ -446,6 +446,15 @@ export class AddonModChoiceIndexComponent extends CoreCourseModuleMainActivityCo
         }
     }
 
+    /**
+     * Toggle list of users in a result visible.
+     *
+     * @param result Result to expand.
+     */
+    toggle(result: AddonModChoiceResultFormatted): void {
+        result.expanded = !result.expanded;
+    }
+
     /**
      * Performs the sync of the activity.
      *
@@ -472,4 +481,5 @@ export class AddonModChoiceIndexComponent extends CoreCourseModuleMainActivityCo
  */
 export type AddonModChoiceResultFormatted = AddonModChoiceResult & {
     percentageamountfixed: string; // Percentage of users answers with fixed decimals.
+    expanded?: boolean;
 };

From 9f7a0e303eef113dd88d24bcc62460a5a8465593 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 25 Feb 2022 10:06:35 +0100
Subject: [PATCH 0608/1008] MOBILE-3149 quiz: Change quiz index page warning
 cards

---
 .../index/addon-mod-quiz-index.html           | 61 +++++++++++--------
 1 file changed, 35 insertions(+), 26 deletions(-)

diff --git a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
index 5b80f4744..53daf6b16 100644
--- a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
+++ b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
@@ -10,7 +10,7 @@
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
-        [courseId]="courseId" [hasDataToSync]="buttonText && hasOffline && !showStatusSpinner">
+        [courseId]="courseId" [hasDataToSync]="buttonText && hasOffline">
     </core-course-module-info>
 
     <!-- Access rules description messages. -->
@@ -134,22 +134,26 @@
         </ion-list>
     </ion-card>
 
-    <!-- More data and button to start/continue. -->
-    <ion-card *ngIf="quiz">
-        <ion-list>
-            <!-- Error messages. -->
-            <ion-item class="ion-text-wrap core-danger-item addon-mod_quiz-prevent-messages" *ngFor="let message of preventMessages">
+    <!-- More data. -->
+    <ng-container *ngIf="quiz">
+        <!-- Error messages. -->
+        <ion-card class="core-danger-card addon-mod_quiz-prevent-messages">
+            <ion-item class="ion-text-wrap" *ngFor="let message of preventMessages">
                 <ion-label>
                     <p>{{ message }}</p>
                 </ion-label>
             </ion-item>
-            <ion-item class="ion-text-wrap core-danger-item addon-mod_quiz-no-questions" *ngIf="quiz.hasquestions === 0">
+        </ion-card>
+        <ion-card class="core-danger-card addon-mod_quiz-no-questions" *ngIf="quiz.hasquestions === 0">
+            <ion-item class="ion-text-wrap">
                 <ion-label>
                     <p>{{ 'addon.mod_quiz.noquestions' | translate }}</p>
                 </ion-label>
             </ion-item>
-            <ion-item class="ion-text-wrap core-danger-item addon-mod_quiz-unsupported-questions"
-                *ngIf="!hasSupportedQuestions && unsupportedQuestions.length">
+        </ion-card>
+        <ion-card class="core-danger-card addon-mod_quiz-unsupported-questions"
+            *ngIf="!hasSupportedQuestions && unsupportedQuestions.length">
+            <ion-item class="ion-text-wrap">
                 <ion-label>
                     <p class="item-heading">{{ 'addon.mod_quiz.errorquestionsnotsupported' | translate }}</p>
                     <p *ngFor="let type of unsupportedQuestions"
@@ -158,7 +162,9 @@
                     </p>
                 </ion-label>
             </ion-item>
-            <ion-item class="ion-text-wrap core-danger-item addon-mod_quiz-unsupported-rules" *ngIf="unsupportedRules.length">
+        </ion-card>
+        <ion-card class="core-danger-card addon-mod_quiz-unsupported-rules" *ngIf="unsupportedRules.length">
+            <ion-item class="ion-text-wrap">
                 <ion-label>
                     <p class="item-heading">{{ 'addon.mod_quiz.errorrulesnotsupported' | translate }}</p>
                     <p *ngFor="let name of unsupportedRules"
@@ -167,24 +173,34 @@
                     </p>
                 </ion-label>
             </ion-item>
-            <ion-item class="ion-text-wrap core-danger-item addon-mod_quiz-unsupported-behaviours" *ngIf="behaviourSupported === false">
+        </ion-card>
+        <ion-card class="core-danger-card addon-mod_quiz-unsupported-behaviours" *ngIf="behaviourSupported === false">
+            <ion-item class="ion-text-wrap">
                 <ion-label>
                     <p class="item-heading">{{ 'addon.mod_quiz.errorbehaviournotsupported' | translate }}</p>
                     <p class="addon-mod_quiz-unsupported-behaviour">{{ quiz.preferredbehaviour }}</p>
                 </ion-label>
             </ion-item>
+        </ion-card>
 
-            <!-- Other warnings. -->
-            <ion-item class="core-warning-item ion-text-wrap" *ngIf="hasSupportedQuestions && unsupportedQuestions.length">
+        <!-- Other warnings. -->
+        <ion-card class="core-warning-card" *ngIf="hasSupportedQuestions && unsupportedQuestions.length">
+            <ion-item class="ion-text-wrap">
                 <ion-label>
                     <p class="item-heading">{{ 'addon.mod_quiz.canattemptbutnotsubmit' | translate }}</p>
                     <p>{{ 'addon.mod_quiz.warningquestionsnotsupported' | translate }}</p>
                     <p *ngFor="let type of unsupportedQuestions">{{ type }}</p>
                 </ion-label>
             </ion-item>
+        </ion-card>
+    </ng-container>
 
+    <div collapsible-footer *ngIf="!showLoading" slot="fixed">
+        <div class="list-item-limited-width" *ngIf="quiz">
             <!-- Button to start/continue. -->
-            <ion-button *ngIf="buttonText && !showStatusSpinner" expand="block" (click)="attemptQuiz()" class="ion-margin ion-text-wrap">
+            <ion-button *ngIf="buttonText" expand="block" (click)="attemptQuiz()" class="ion-margin ion-text-wrap"
+                [disabled]="showStatusSpinner">
+                <ion-spinner *ngIf="showStatusSpinner" slot="start" aria-hidden="true"></ion-spinner>
                 {{ buttonText | translate }}
             </ion-button>
 
@@ -195,17 +211,10 @@
                 {{ 'core.openinbrowser' | translate }}
                 <ion-icon name="fas-external-link-alt" slot="end" aria-hidden="true"></ion-icon>
             </ion-button>
+        </div>
 
-            <!-- Spinner shown while downloading or calculating. -->
-            <ion-item class="ion-text-center" *ngIf="showStatusSpinner">
-                <ion-label>
-                    <ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner>
-                </ion-label>
-            </ion-item>
-        </ion-list>
-    </ion-card>
+        <core-course-module-navigation [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+        </core-course-module-navigation>
+
+    </div>
 </core-loading>
-
-<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
-    (completionChanged)="onCompletionChange()">
-</core-course-module-navigation>

From 540141bad55b2aa6f70094a1f50985611c99b4f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 25 Feb 2022 10:54:23 +0100
Subject: [PATCH 0609/1008] MOBILE-3149 scorm: Collapse grades on scorm page

---
 .../index/addon-mod-scorm-index.html          | 35 ++++++++++++-------
 .../mod/scorm/components/index/index.ts       |  8 +++++
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
index 49c22490a..f3dc13496 100644
--- a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
+++ b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
@@ -31,7 +31,7 @@
                 <ng-container *ngIf="scorm.displayattemptstatus">
                     <ion-item class="ion-text-wrap" *ngIf="scorm.maxattempt! >= 0">
                         <ion-label>
-                            <h3>{{ 'addon.mod_scorm.noattemptsallowed' | translate }}</h3>
+                            <p class="item-heading">{{ 'addon.mod_scorm.noattemptsallowed' | translate }}</p>
                         </ion-label>
                         <p slot="end">
                             <span *ngIf="scorm.maxattempt == 0">{{ 'core.unlimited' | translate }}</span>
@@ -40,23 +40,34 @@
                     </ion-item>
                     <ion-item class="ion-text-wrap" *ngIf="numAttempts >= 0">
                         <ion-label>
-                            <h3>{{ 'addon.mod_scorm.noattemptsmade' | translate }}</h3>
+                            <p class="item-heading">{{ 'addon.mod_scorm.noattemptsmade' | translate }}</p>
                         </ion-label>
                         <p slot="end">{{ numAttempts }}</p>
                     </ion-item>
-                    <ion-item class="ion-text-wrap" *ngFor="let attempt of onlineAttempts">
+                    <ion-item *ngIf="onlineAttempts.length > 0" button class="divider ion-text-wrap" (click)="toggleGrades()"
+                        [attr.aria-label]="(gradesExpanded ? 'core.collapse' : 'core.expand') | translate" detail="false">
+                        <ion-icon name="fas-chevron-right" flip-rtl slot="start" aria-hidden="true" class="expandable-status-icon"
+                            [class.expandable-status-icon-expanded]="gradesExpanded">
+                        </ion-icon>
                         <ion-label>
-                            <h3>{{ 'addon.mod_scorm.gradeforattempt' | translate }} {{attempt.num}}</h3>
+                            <h3 class="item-heading">{{'core.grades.grades' | translate}}</h3>
                         </ion-label>
-                        <p slot="end">
-                            <span *ngIf="attempt.grade != -1">{{ attempt.gradeFormatted }}</span>
-                            <span *ngIf="attempt.grade == -1">{{ 'addon.mod_scorm.cannotcalculategrade' | translate }}</span>
-                        </p>
                     </ion-item>
+                    <ng-container *ngIf="gradesExpanded && onlineAttempts.length > 0">
+                        <ion-item class="ion-text-wrap" *ngFor="let attempt of onlineAttempts">
+                            <ion-label>
+                                <p class="item-heading">{{ 'addon.mod_scorm.gradeforattempt' | translate }} {{attempt.num}}</p>
+                            </ion-label>
+                            <p slot="end">
+                                <span *ngIf="attempt.grade != -1">{{ attempt.gradeFormatted }}</span>
+                                <span *ngIf="attempt.grade == -1">{{ 'addon.mod_scorm.cannotcalculategrade' | translate }}</span>
+                            </p>
+                        </ion-item>
+                    </ng-container>
                 </ng-container>
                 <ion-item class="ion-text-wrap" *ngFor="let attempt of offlineAttempts">
                     <ion-label>
-                        <h3>{{ 'addon.mod_scorm.gradeforattempt' | translate }} {{attempt.num}}</h3>
+                        <p class="item-heading">{{ 'addon.mod_scorm.gradeforattempt' | translate }} {{attempt.num}}</p>
                         <p *ngIf="!scorm.maxattempt || attempt.num <= scorm.maxattempt">
                             {{ 'addon.mod_scorm.offlineattemptnote' | translate }}
                         </p>
@@ -71,13 +82,13 @@
                 </ion-item>
                 <ion-item class="ion-text-wrap" *ngIf="scorm.displayattemptstatus && gradeMethodReadable">
                     <ion-label>
-                        <h3>{{ 'addon.mod_scorm.grademethod' | translate }}</h3>
+                        <p class="item-heading">{{ 'addon.mod_scorm.grademethod' | translate }}</p>
                     </ion-label>
                     <p slot="end">{{ gradeMethodReadable }}</p>
                 </ion-item>
                 <ion-item class="ion-text-wrap" *ngIf="scorm.displayattemptstatus && gradeFormatted">
                     <ion-label>
-                        <h3>{{ 'addon.mod_scorm.gradereported' | translate }}</h3>
+                        <p class="item-heading">{{ 'addon.mod_scorm.gradereported' | translate }}</p>
                     </ion-label>
                     <p slot="end">
                         <span *ngIf="grade != -1">{{ gradeFormatted }}</span>
@@ -86,7 +97,7 @@
                 </ion-item>
                 <ion-item class="ion-text-wrap" *ngIf="syncTime">
                     <ion-label>
-                        <h3>{{ 'core.lastsync' | translate }}</h3>
+                        <p class="item-heading">{{ 'core.lastsync' | translate }}</p>
                         <p>{{ syncTime }}</p>
                     </ion-label>
                 </ion-item>
diff --git a/src/addons/mod/scorm/components/index/index.ts b/src/addons/mod/scorm/components/index/index.ts
index 88dd7b2c8..fcfa22b41 100644
--- a/src/addons/mod/scorm/components/index/index.ts
+++ b/src/addons/mod/scorm/components/index/index.ts
@@ -81,6 +81,7 @@ export class AddonModScormIndexComponent extends CoreCourseModuleMainActivityCom
     attemptsLeft = -1; // Number of attempts left.
     onlineAttempts: AttemptGrade[] = []; // Grades for online attempts.
     offlineAttempts: AttemptGrade[] = []; // Grades for offline attempts.
+    gradesExpanded = false;
 
     protected fetchContentDefaultError = 'addon.mod_scorm.errorgetscorm'; // Default error to show when loading contents.
     protected syncEventName = AddonModScormSyncProvider.AUTO_SYNCED;
@@ -523,6 +524,13 @@ export class AddonModScormIndexComponent extends CoreCourseModuleMainActivityCom
         }
     }
 
+    /**
+     * Toggle list of grades.
+     */
+    toggleGrades(): void {
+        this.gradesExpanded = !this.gradesExpanded;
+    }
+
     /**
      * Open a SCORM package.
      *

From d4515ca74cee5029be65a0a2e1fce224b9c1bb59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 24 Feb 2022 16:44:24 +0100
Subject: [PATCH 0610/1008] MOBILE-3149 module: Add collapsible footer buttons
 on module index pages

---
 .../components/index/index.html               |  29 ++--
 .../index/addon-mod-book-index.html           |  21 +--
 .../index/addon-mod-chat-index.html           |  26 +--
 .../index/addon-mod-choice-index.html         |  25 +--
 .../index/addon-mod-feedback-index.html       |  47 +++---
 .../index/addon-mod-imscp-index.html          |  16 +-
 .../index/addon-mod-lesson-index.html         | 152 +++++++++---------
 .../components/index/addon-mod-lti-index.html |  19 +--
 .../index/addon-mod-resource-index.html       |  22 +--
 .../index/addon-mod-scorm-index.html          |  90 +++++------
 .../index/addon-mod-survey-index.html         |  32 ++--
 .../components/index/addon-mod-url-index.html |  23 ++-
 .../index/addon-mod-workshop-index.html       |  39 ++---
 src/theme/theme.base.scss                     |  14 +-
 src/theme/theme.light.scss                    |   4 +-
 15 files changed, 288 insertions(+), 271 deletions(-)

diff --git a/src/addons/mod/bigbluebuttonbn/components/index/index.html b/src/addons/mod/bigbluebuttonbn/components/index/index.html
index f17bc8bf5..1463c7c65 100644
--- a/src/addons/mod/bigbluebuttonbn/components/index/index.html
+++ b/src/addons/mod/bigbluebuttonbn/components/index/index.html
@@ -94,15 +94,6 @@
             </ion-item>
         </ng-container>
 
-        <ion-button *ngIf="meetingInfo.canjoin" class="ion-margin" expand="block" (click)="joinRoom()">
-            {{ 'addon.mod_bigbluebuttonbn.view_conference_action_join' | translate }}
-        </ion-button>
-
-        <ion-button *ngIf="meetingInfo.statusrunning && meetingInfo.ismoderator" color="light" class="ion-margin" expand="block"
-            (click)="endMeeting()">
-            {{ 'addon.mod_bigbluebuttonbn.view_conference_action_end' | translate }}
-        </ion-button>
-
         <ion-card *ngIf="!meetingInfo.canjoin" class="core-warning-card">
             <ion-item class="ion-text-wrap">
                 <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
@@ -110,8 +101,20 @@
             </ion-item>
         </ion-card>
     </ng-container>
-</core-loading>
 
-<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
-    (completionChanged)="onCompletionChange()">
-</core-course-module-navigation>
+    <div collapsible-footer *ngIf="!showLoading" slot="fixed">
+        <div class="list-item-limited-width"
+            *ngIf="meetingInfo && (meetingInfo.canjoin || meetingInfo.statusrunning && meetingInfo.ismoderator)">
+            <ion-button *ngIf="meetingInfo.statusrunning && meetingInfo.ismoderator" fill="outline" class="ion-margin ion-text-wrap"
+                expand="block" (click)="endMeeting()">
+                {{ 'addon.mod_bigbluebuttonbn.view_conference_action_end' | translate }}
+            </ion-button>
+            <ion-button *ngIf="meetingInfo.canjoin" class="ion-margin ion-text-wrap" expand="block" (click)="joinRoom()">
+                {{ 'addon.mod_bigbluebuttonbn.view_conference_action_join' | translate }}
+            </ion-button>
+        </div>
+
+        <core-course-module-navigation [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+        </core-course-module-navigation>
+    </div>
+</core-loading>
diff --git a/src/addons/mod/book/components/index/addon-mod-book-index.html b/src/addons/mod/book/components/index/addon-mod-book-index.html
index cdd809546..5e95da64d 100644
--- a/src/addons/mod/book/components/index/addon-mod-book-index.html
+++ b/src/addons/mod/book/components/index/addon-mod-book-index.html
@@ -31,16 +31,17 @@
                 </p>
             </ion-label>
         </ion-item>
-
-        <ion-button class="ion-margin" expand="block" (click)="openBook()">
-            <span *ngIf="!hasStartedBook">{{ 'core.start' | translate }}</span>
-            <span *ngIf="hasStartedBook">{{ 'core.resume' | translate }}</span>
-        </ion-button>
-
     </ion-list>
 
-</core-loading>
+    <div collapsible-footer *ngIf="!showLoading" slot="fixed">
+        <div class="list-item-limited-width">
+            <ion-button expand="block" (click)="openBook()" class="ion-margin ion-text-wrap">
+                <span *ngIf="!hasStartedBook">{{ 'core.start' | translate }}</span>
+                <span *ngIf="hasStartedBook">{{ 'core.resume' | translate }}</span>
+            </ion-button>
+        </div>
 
-<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
-    (completionChanged)="onCompletionChange()">
-</core-course-module-navigation>
+        <core-course-module-navigation [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+        </core-course-module-navigation>
+    </div>
+</core-loading>
diff --git a/src/addons/mod/chat/components/index/addon-mod-chat-index.html b/src/addons/mod/chat/components/index/addon-mod-chat-index.html
index 52c2a5cc4..764e01db2 100644
--- a/src/addons/mod/chat/components/index/addon-mod-chat-index.html
+++ b/src/addons/mod/chat/components/index/addon-mod-chat-index.html
@@ -20,16 +20,18 @@
         </ion-item>
     </ion-card>
 
-    <ng-container *ngIf="chat">
-        <ion-button class="ion-margin ion-text-wrap" expand="block" color="primary" (click)="enterChat()">
-            {{ 'addon.mod_chat.enterchat' | translate }}
-        </ion-button>
-        <ion-button class="ion-margin ion-text-wrap" expand="block" color="light" (click)="viewSessions()">
-            {{ 'addon.mod_chat.viewreport' | translate }}
-        </ion-button>
-    </ng-container>
-</core-loading>
+    <ion-button *ngIf="chat" class="ion-margin ion-text-wrap" expand="block" fill="outline" (click)="viewSessions()">
+        {{ 'addon.mod_chat.viewreport' | translate }}
+    </ion-button>
 
-<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
-    (completionChanged)="onCompletionChange()">
-</core-course-module-navigation>
+    <div collapsible-footer *ngIf="!showLoading" slot="fixed">
+        <div class="list-item-limited-width" *ngIf="chat">
+            <ion-button class="ion-margin ion-text-wrap" expand="block" color="primary" (click)="enterChat()">
+                {{ 'addon.mod_chat.enterchat' | translate }}
+            </ion-button>
+        </div>
+
+        <core-course-module-navigation [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+        </core-course-module-navigation>
+    </div>
+</core-loading>
diff --git a/src/addons/mod/choice/components/index/addon-mod-choice-index.html b/src/addons/mod/choice/components/index/addon-mod-choice-index.html
index f5620647c..be4e8eb0b 100644
--- a/src/addons/mod/choice/components/index/addon-mod-choice-index.html
+++ b/src/addons/mod/choice/components/index/addon-mod-choice-index.html
@@ -64,12 +64,6 @@
                 <ion-radio slot="end" [value]="option.id" [disabled]="option.disabled || !canEdit"></ion-radio>
             </ion-item>
         </ion-radio-group>
-        <ion-button *ngIf="canEdit" expand="block" (click)="save()" [disabled]="!canSave()" class="ion-margin">
-            {{ 'addon.mod_choice.savemychoice' | translate }}
-        </ion-button>
-        <ion-button *ngIf="canDelete" expand="block" color="light" (click)="delete()" class="ion-margin">
-            {{ 'addon.mod_choice.removemychoice' | translate }}
-        </ion-button>
     </ion-card>
 
     <!-- Choice results -->
@@ -139,11 +133,24 @@
             </ion-label>
         </ion-item>
     </ion-card>
+
+
+    <div collapsible-footer *ngIf="!showLoading" slot="fixed">
+        <div class="list-item-limited-width" *ngIf="options.length && choice && (canEdit || canDelete)">
+            <ion-button *ngIf="canDelete" expand="block" fill="outline" (click)="delete()" class="ion-margin ion-text-wrap">
+                {{ 'addon.mod_choice.removemychoice' | translate }}
+            </ion-button>
+            <ion-button *ngIf="canEdit" expand="block" (click)="save()" [disabled]="!canSave()" class="ion-margin ion-text-wrap">
+                {{ 'addon.mod_choice.savemychoice' | translate }}
+            </ion-button>
+        </div>
+
+        <core-course-module-navigation [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+        </core-course-module-navigation>
+    </div>
 </core-loading>
 
-<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
-    (completionChanged)="onCompletionChange()">
-</core-course-module-navigation>
+
 
 <!-- Template to render a choice option label. -->
 <ng-template #optionLabelTemplate let-option="option">
diff --git a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
index 4ffa61d9a..00bc860e7 100644
--- a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
+++ b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
@@ -33,11 +33,28 @@
             </ng-template>
         </core-tab>
     </core-tabs>
-</core-loading>
 
-<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
-    (completionChanged)="onCompletionChange()">
-</core-course-module-navigation>
+    <div collapsible-footer *ngIf="!showLoading" slot="fixed">
+        <div class="list-item-limited-width" *ngIf="access && (access.canedititems || access.canviewreports || !access.isempty)">
+            <ion-button expand="block" fill="outline" (click)="gotoAnswerQuestions(true)" class="ion-margin ion-text-wrap">
+                <ion-icon name="fas-search" slot="start" aria-hidden="true"></ion-icon>
+                {{ 'addon.mod_feedback.preview' | translate }}
+            </ion-button>
+            <ion-button *ngIf="access.cancomplete && access.cansubmit && access.isopen" expand="block" (click)="gotoAnswerQuestions()"
+                class="ion-margin ion-text-wrap">
+                <ng-container *ngIf="!goPage">
+                    {{ 'addon.mod_feedback.complete_the_form' | translate }}
+                </ng-container>
+                <ng-container *ngIf="goPage">
+                    {{ 'addon.mod_feedback.continue_the_form' | translate }}
+                </ng-container>
+            </ion-button>
+        </div>
+
+        <core-course-module-navigation [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+        </core-course-module-navigation>
+    </div>
+</core-loading>
 
 <ng-template #basicInfo>
     <ion-list *ngIf="access && access.canviewanalysis && !access.isempty">
@@ -133,28 +150,6 @@
                         <p *ngIf="!access.isanonymous">{{ 'addon.mod_feedback.non_anonymous' | translate }}</p>
                     </ion-label>
                 </ion-item>
-                <ion-grid>
-                    <ion-row class="ion-align-items-center">
-                        <ion-col>
-                            <ion-button expand="block" fill="outline" (click)="gotoAnswerQuestions(true)" class="ion-text-wrap">
-                                <ion-icon name="fas-search" slot="start" aria-hidden="true"></ion-icon>
-                                {{ 'addon.mod_feedback.preview' | translate }}
-                            </ion-button>
-                        </ion-col>
-                        <ion-col *ngIf="access.cancomplete && access.cansubmit && access.isopen">
-                            <ion-button expand="block" (click)="gotoAnswerQuestions()" class="ion-text-wrap">
-                                <ng-container *ngIf="!goPage">
-                                    {{ 'addon.mod_feedback.complete_the_form' | translate }}
-                                </ng-container>
-                                <ng-container *ngIf="goPage">
-                                    {{ 'addon.mod_feedback.continue_the_form' | translate }}
-                                </ng-container>
-                                <ion-icon name="fas-chevron-right" slot="end" aria-hidden="true"></ion-icon>
-                            </ion-button>
-                        </ion-col>
-                    </ion-row>
-                </ion-grid>
-
             </ng-container>
         </ion-list>
     </core-loading>
diff --git a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
index 608162e22..e4cfff579 100644
--- a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
+++ b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
@@ -26,12 +26,12 @@
     <div class="addon-mod-imscp-container">
         <core-iframe *ngIf="!showLoading" [src]="src" [showFullscreenOnToolbar]="true" [autoFullscreenOnRotate]="true"></core-iframe>
     </div>
-</core-loading>
 
-<!-- TODO Add a contents page to avoid having both bars -->
-<core-navigation-bar collapsible-footer *ngIf="!showLoading && navigationItems.length > 1 && false" [items]="navigationItems"
-    (action)="loadItem($event)">
-</core-navigation-bar>
-<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
-    (completionChanged)="onCompletionChange()">
-</core-course-module-navigation>
+    <div collapsible-footer *ngIf="!showLoading" slot="fixed">
+        <!-- TODO Add a contents page to avoid having both bars. Please add here start/resume buttons. -->
+        <core-navigation-bar *ngIf="navigationItems.length > 1" [items]="navigationItems" (action)="loadItem($event)">
+        </core-navigation-bar>
+        <core-course-module-navigation [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+        </core-course-module-navigation>
+    </div>
+</core-loading>
diff --git a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
index 188c0ca97..c2f13b4e5 100644
--- a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
+++ b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
@@ -38,84 +38,15 @@
                         </ion-item>
                         <ion-button expand="block" type="submit">
                             {{ 'addon.mod_lesson.continue' | translate }}
-                            <ion-icon slot="end" name="fas-chevron-right" aria-hidden="true"></ion-icon>
                         </ion-button>
                         <!-- Remove this once Ionic fixes this bug: https://github.com/ionic-team/ionic-framework/issues/19368 -->
                         <input type="submit" class="core-submit-hidden-enter" />
                     </form>
                 </ion-card>
 
-                <core-loading [hideUntil]="!showSpinner">
+                <core-loading [hideUntil]="!showSpinner" *ngIf="canViewReports">
                     <ion-list *ngIf="(lesson && !preventReasons.length) || retakeToReview">
-                        <ng-container *ngIf="retakeToReview">
-                            <!-- A retake was finished in a synchronization, allow reviewing it. -->
-                            <ion-item class="ion-text-wrap">
-                                <ion-label class="ion-padding-bottom">
-                                    {{ 'addon.mod_lesson.retakefinishedinsync' | translate }}
-                                </ion-label>
-                            </ion-item>
-                            <ion-button class="ion-text-wrap ion-margin" expand="block" (click)="review()">
-                                {{ 'addon.mod_lesson.review' | translate }}
-                            </ion-button>
-                        </ng-container>
-
-                        <ng-container *ngIf="lesson && !preventReasons.length">
-                            <ion-item class="ion-text-wrap" *ngIf="leftDuringTimed && !lesson.timelimit && !finishedOffline">
-                                <!-- User left during the session and there is no time limit, ask to continue. -->
-                                <ion-label>
-                                    <p [innerHTML]="'addon.mod_lesson.youhaveseen' | translate"></p>
-                                    <ion-grid>
-                                        <ion-row>
-                                            <ion-col>
-                                                <ion-button expand="block" color="light" (click)="start(false)">
-                                                    {{ 'core.no' | translate }}
-                                                </ion-button>
-                                            </ion-col>
-                                            <ion-col>
-                                                <ion-button expand="block" (click)="start(true)">
-                                                    {{ 'core.yes' | translate }}
-                                                </ion-button>
-                                            </ion-col>
-                                        </ion-row>
-                                    </ion-grid>
-                                </ion-label>
-                            </ion-item>
-
-                            <ng-container *ngIf="leftDuringTimed && lesson.timelimit && lesson.retake && !finishedOffline">
-                                <ion-item class="ion-text-wrap">
-                                    <!-- User left during the session with time limit and retakes allowed, ask to continue. -->
-                                    <ion-label [innerHTML]="'addon.mod_lesson.leftduringtimed' | translate"></ion-label>
-                                </ion-item>
-                                <ion-button class="ion-text-wrap ion-margin" expand="block" (click)="start(false)">
-                                    {{ 'addon.mod_lesson.continue' | translate }}
-                                    <ion-icon name="fas-chevron-right" slot="end" aria-hidden="true"></ion-icon>
-                                </ion-button>
-                            </ng-container>
-
-                            <ion-item class="ion-text-wrap" *ngIf="leftDuringTimed && lesson.timelimit && !lesson.retake">
-                                <!-- User left during the session with time limit and retakes not allowed.
-                                    This should be handled by preventMessages. -->
-                                <ion-label [innerHTML]="'addon.mod_lesson.leftduringtimednoretake' | translate"></ion-label>
-                            </ion-item>
-
-                            <ng-container *ngIf="!leftDuringTimed && !finishedOffline">
-                                <!-- User hasn't left during the session, show a start button. -->
-                                <ion-button class="ion-text-wrap ion-margin" expand="block" *ngIf="!canManage" (click)="start(false)">
-                                    {{ 'core.start' | translate }}
-                                    <ion-icon name="fas-chevron-right" slot="end" aria-hidden="true"></ion-icon>
-                                </ion-button>
-                                <ion-button class="ion-text-wrap ion-margin" expand="block" *ngIf="canManage" (click)="start(false)">
-                                    {{ 'addon.mod_lesson.preview' | translate }}
-                                    <ion-icon name="fas-search" slot="end" aria-hidden="true"></ion-icon>
-                                </ion-button>
-                            </ng-container>
-
-                            <ion-button class="ion-text-wrap" *ngIf="finishedOffline" expand="block" (click)="start(true)">
-                                <!-- There's an attempt finished in offline. Let the user continue, showing the end of lesson. -->
-                                {{ 'addon.mod_lesson.continue' | translate }}
-                                <ion-icon name="fas-chevron-right" slot="end" aria-hidden="true"></ion-icon>
-                            </ion-button>
-                        </ng-container>
+                        <ng-container *ngTemplateOutlet="buttons"></ng-container>
                     </ion-list>
                 </core-loading>
             </ng-template>
@@ -277,8 +208,81 @@
             </ng-template>
         </core-tab>
     </core-tabs>
+
+    <div collapsible-footer *ngIf="!showLoading" slot="fixed">
+        <div class="list-item-limited-width" *ngIf="!canViewReports && ((lesson && !preventReasons.length) || retakeToReview)">
+            <ng-container *ngTemplateOutlet="buttons"></ng-container>
+        </div>
+
+        <core-course-module-navigation [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+        </core-course-module-navigation>
+    </div>
 </core-loading>
 
-<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
-    (completionChanged)="onCompletionChange()">
-</core-course-module-navigation>
+
+<ng-template #buttons>
+    <ng-container *ngIf="retakeToReview">
+        <!-- A retake was finished in a synchronization, allow reviewing it. -->
+        <ion-item class="ion-text-wrap">
+            <ion-label class="ion-padding-bottom">
+                {{ 'addon.mod_lesson.retakefinishedinsync' | translate }}
+            </ion-label>
+        </ion-item>
+        <ion-button class="ion-text-wrap ion-margin" expand="block" (click)="review()">
+            {{ 'addon.mod_lesson.review' | translate }}
+        </ion-button>
+    </ng-container>
+
+    <ng-container *ngIf="lesson && !preventReasons.length">
+        <ion-item class="ion-text-wrap" *ngIf="leftDuringTimed && !lesson.timelimit && !finishedOffline">
+            <!-- User left during the session and there is no time limit, ask to continue. -->
+            <ion-label>
+                <p [innerHTML]="'addon.mod_lesson.youhaveseen' | translate"></p>
+                <ion-row>
+                    <ion-col>
+                        <ion-button expand="block" fill="outline" (click)="start(false)">
+                            {{ 'core.no' | translate }}
+                        </ion-button>
+                    </ion-col>
+                    <ion-col>
+                        <ion-button expand="block" (click)="start(true)">
+                            {{ 'core.yes' | translate }}
+                        </ion-button>
+                    </ion-col>
+                </ion-row>
+            </ion-label>
+        </ion-item>
+
+        <ng-container *ngIf="leftDuringTimed && lesson.timelimit && lesson.retake && !finishedOffline">
+            <ion-item class="ion-text-wrap">
+                <!-- User left during the session with time limit and retakes allowed, ask to continue. -->
+                <ion-label [innerHTML]="'addon.mod_lesson.leftduringtimed' | translate"></ion-label>
+            </ion-item>
+            <ion-button class="ion-text-wrap ion-margin" expand="block" (click)="start(false)">
+                {{ 'addon.mod_lesson.continue' | translate }}
+            </ion-button>
+        </ng-container>
+
+        <ion-item class="ion-text-wrap" *ngIf="leftDuringTimed && lesson.timelimit && !lesson.retake">
+            <!-- User left during the session with time limit and retakes not allowed.
+                This should be handled by preventMessages. -->
+            <ion-label [innerHTML]="'addon.mod_lesson.leftduringtimednoretake' | translate"></ion-label>
+        </ion-item>
+
+        <ng-container *ngIf="!leftDuringTimed && !finishedOffline">
+            <!-- User hasn't left during the session, show a start button. -->
+            <ion-button class="ion-text-wrap ion-margin" expand="block" *ngIf="!canManage" (click)="start(false)">
+                {{ 'core.start' | translate }}
+            </ion-button>
+            <ion-button class="ion-text-wrap ion-margin" expand="block" fill="outline" *ngIf="canManage" (click)="start(false)">
+                <ion-icon name="fas-search" slot="start" aria-hidden="true"></ion-icon>
+                {{ 'addon.mod_lesson.preview' | translate }}
+            </ion-button>
+        </ng-container>
+
+        <ion-button class="ion-text-wrap ion-margin" *ngIf="finishedOffline" expand="block" (click)="start(true)">
+            <!-- There's an attempt finished in offline. Let the user continue, showing the end of lesson. -->
+            {{ 'addon.mod_lesson.continue' | translate }}
+        </ion-button>
+    </ng-container>
+</ng-template>
diff --git a/src/addons/mod/lti/components/index/addon-mod-lti-index.html b/src/addons/mod/lti/components/index/addon-mod-lti-index.html
index 217ee88b2..a85613113 100644
--- a/src/addons/mod/lti/components/index/addon-mod-lti-index.html
+++ b/src/addons/mod/lti/components/index/addon-mod-lti-index.html
@@ -13,14 +13,15 @@
         [componentId]="componentId" [courseId]="courseId">
     </core-course-module-info>
 
-    <div class="ion-padding">
-        <ion-button expand="block" (click)="launch()">
-            <ion-icon name="fas-external-link-alt" slot="start" aria-hidden="true"></ion-icon>
-            {{ 'addon.mod_lti.launchactivity' | translate }}
-        </ion-button>
+    <div collapsible-footer *ngIf="!showLoading" slot="fixed">
+        <div class="list-item-limited-width">
+            <ion-button expand="block" (click)="launch()" class="ion-margin ion-text-wrap">
+                {{ 'addon.mod_lti.launchactivity' | translate }}
+                <ion-icon name="fas-external-link-alt" slot="end" aria-hidden="true"></ion-icon>
+            </ion-button>
+        </div>
+
+        <core-course-module-navigation [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+        </core-course-module-navigation>
     </div>
 </core-loading>
-
-<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
-    (completionChanged)="onCompletionChange()">
-</core-course-module-navigation>
diff --git a/src/addons/mod/resource/components/index/addon-mod-resource-index.html b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
index 0fd7713b7..cf24bdd04 100644
--- a/src/addons/mod/resource/components/index/addon-mod-resource-index.html
+++ b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="!showLoading" class="safe-area-padding">
+<core-loading [hideUntil]="!showLoading" class="safe-area-padding core-loading-full-height">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [courseId]="courseId" [description]="displayDescription && description"
@@ -76,8 +76,12 @@
                     </ion-label>
                 </ion-item>
             </ng-container>
+        </ion-list>
+    </ng-container>
 
-            <ion-button expand="block" class="ion-margin" (click)="open(openFileAction.OPEN)">
+    <div collapsible-footer *ngIf="!showLoading" slot="fixed">
+        <div class="list-item-limited-width" *ngIf="mode == 'external'">
+            <ion-button expand="block" (click)="open(openFileAction.OPEN)" class="ion-margin ion-text-wrap">
                 <ng-container *ngIf="isStreamedFile">
                     <ion-icon name="fas-play" slot="start" aria-hidden="true"></ion-icon>
                     {{ 'core.play' | translate }}
@@ -88,15 +92,13 @@
                 </ng-container>
             </ion-button>
 
-            <ion-button *ngIf="isIOS && (!shouldOpenInBrowser || !isOnline)" expand="block" class="ion-margin"
-                (click)="open(openFileAction.OPEN_WITH)">
+            <ion-button *ngIf="isIOS && (!shouldOpenInBrowser || !isOnline)" expand="block" (click)="open(openFileAction.OPEN_WITH)"
+                class="ion-margin ion-text-wrap">
                 <ion-icon name="far-share-square" slot="start" aria-hidden="true"></ion-icon>
                 {{ 'core.openwith' | translate }}
             </ion-button>
-        </ion-list>
-    </ng-container>
+        </div>
+        <core-course-module-navigation [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+        </core-course-module-navigation>
+    </div>
 </core-loading>
-
-<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
-    (completionChanged)="onCompletionChange()">
-</core-course-module-navigation>
diff --git a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
index f3dc13496..0c2f0ea6c 100644
--- a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
+++ b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
@@ -21,7 +21,7 @@
         </ion-item>
     </ion-card>
 
-    <ng-container *ngIf="scorm && !showLoading && !scorm.warningMessage">
+    <div *ngIf="scorm && !showLoading && !scorm.warningMessage" class="list-item-limited-width">
         <!-- Attempts status. -->
         <ion-card *ngIf="(scorm.displayattemptstatus || offlineAttempts.length) && !skip">
             <ion-card-header class="ion-text-wrap">
@@ -155,32 +155,34 @@
                 </ion-item>
             </ion-list>
         </ion-card>
+    </div>
 
-        <!-- Open in browser button. -->
-        <ion-card *ngIf="errorMessage">
-            <ion-item class="ion-text-wrap">
-                <ion-label>
-                    <p class="text-danger">{{ errorMessage | translate }}</p>
-                </ion-label>
-            </ion-item>
-            <ion-button class="ion-margin ion-text-wrap" expand="block" [href]="module.url" core-link [showBrowserWarning]="false">
-                {{ 'core.openinbrowser' | translate }}
-                <ion-icon name="fas-external-link-alt" slot="end" aria-hidden="true"></ion-icon>
-            </ion-button>
-        </ion-card>
+    <div collapsible-footer *ngIf="!showLoading" slot="fixed">
+        <div class="list-item-limited-width" *ngIf="scorm && !scorm.warningMessage">
+            <!-- Open in browser button. -->
+            <ng-container *ngIf="errorMessage">
+                <ion-item class="ion-text-wrap">
+                    <ion-label>
+                        <p class="text-danger">{{ errorMessage | translate }}</p>
+                    </ion-label>
+                </ion-item>
+                <ion-button class="ion-margin ion-text-wrap" expand="block" [href]="module.url" core-link [showBrowserWarning]="false">
+                    {{ 'core.openinbrowser' | translate }}
+                    <ion-icon name="fas-external-link-alt" slot="end" aria-hidden="true"></ion-icon>
+                </ion-button>
+            </ng-container>
 
-        <!-- Warning that user doesn't have any more attempts. -->
-        <ion-card *ngIf="!errorMessage && attemptsLeft == 0">
-            <ion-item class="ion-text-wrap">
-                <ion-label>
-                    <p class="text-danger">{{ 'addon.mod_scorm.exceededmaxattempts' | translate }}</p>
-                </ion-label>
-            </ion-item>
-        </ion-card>
+            <!-- Warning that user doesn't have any more attempts. -->
+            <ion-card *ngIf="!errorMessage && attemptsLeft == 0" class="core-danger-card">
+                <ion-item class="ion-text-wrap">
+                    <ion-label>
+                        <p>{{ 'addon.mod_scorm.exceededmaxattempts' | translate }}</p>
+                    </ion-label>
+                </ion-item>
+            </ion-card>
 
-        <!-- Open SCORM in app form -->
-        <ion-card *ngIf="!errorMessage && scorm && (!scorm.lastattemptlock || attemptsLeft > 0)">
-            <ion-list>
+            <ng-container *ngIf="!errorMessage && (!scorm.lastattemptlock || attemptsLeft > 0)">
+                <!-- Open SCORM in app form -->
                 <ng-container *ngIf="!downloading && !skip">
                     <!-- Create new attempt -->
                     <ion-item class="ion-text-wrap" *ngIf="!scorm.forcenewattempt && numAttempts > 0 && !incomplete && attemptsLeft > 0">
@@ -189,29 +191,21 @@
                         </ion-checkbox>
                     </ion-item>
 
-                    <ion-item class="ion-text-wrap" *ngIf="statusMessage">
-                        <ion-label>
+                    <ion-item *ngIf="statusMessage">
+                        <ion-label class="ion-text-wrap ion-no-margin ion-margin-top">
                             <p>{{ statusMessage | translate }}</p>
                         </ion-label>
                     </ion-item>
 
                     <!-- Open mode (Preview or Normal) -->
-                    <ion-grid>
-                        <ion-row class="ion-align-items-center">
-                            <ion-col *ngIf="!scorm.hidebrowse">
-                                <ion-button expand="block" fill="outline" (click)="open($event, true)" class="ion-text-wrap">
-                                    {{ 'addon.mod_scorm.browse' | translate }}
-                                    <ion-icon name="fas-search" slot="end" aria-hidden="true"></ion-icon>
-                                </ion-button>
-                            </ion-col>
-                            <ion-col>
-                                <ion-button expand="block" (click)="open($event)" class="ion-text-wrap">
-                                    {{ 'addon.mod_scorm.enter' | translate }}
-                                    <ion-icon name="fas-arrow-right" slot="end" aria-hidden="true"></ion-icon>
-                                </ion-button>
-                            </ion-col>
-                        </ion-row>
-                    </ion-grid>
+                    <ion-button *ngIf="!scorm.hidebrowse" expand="block" fill="outline" (click)="open($event, true)"
+                        class="ion-text-wrap ion-margin">
+                        <ion-icon name="fas-search" slot="start" aria-hidden="true"></ion-icon>
+                        {{ 'addon.mod_scorm.browse' | translate }}
+                    </ion-button>
+                    <ion-button expand="block" (click)="open($event)" class="ion-text-wrap ion-margin">
+                        {{ 'addon.mod_scorm.enter' | translate }}
+                    </ion-button>
                 </ng-container>
 
                 <!-- Download progress. -->
@@ -223,11 +217,9 @@
                         </core-progress-bar>
                     </ion-label>
                 </ion-item>
-            </ion-list>
-        </ion-card>
-    </ng-container>
+            </ng-container>
+        </div>
+        <core-course-module-navigation [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+        </core-course-module-navigation>
+    </div>
 </core-loading>
-
-<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
-    (completionChanged)="onCompletionChange()">
-</core-course-module-navigation>
diff --git a/src/addons/mod/survey/components/index/addon-mod-survey-index.html b/src/addons/mod/survey/components/index/addon-mod-survey-index.html
index 6fd4d8906..431d04f34 100644
--- a/src/addons/mod/survey/components/index/addon-mod-survey-index.html
+++ b/src/addons/mod/survey/components/index/addon-mod-survey-index.html
@@ -21,10 +21,6 @@
                 {{ 'addon.mod_survey.surveycompletednograph' | translate }}
             </ion-label>
         </ion-item>
-        <ion-button class="ion-margin" expand="block" [href]="module.url" core-link>
-            <ion-icon name="fas-external-link-alt" slot="start" aria-hidden="true"></ion-icon>
-            {{ 'addon.mod_survey.results' | translate }}
-        </ion-button>
     </ion-card>
 
     <!-- Survey questions -->
@@ -119,18 +115,22 @@
 
             </ng-container>
         </ion-grid>
-
-        <ion-item>
-            <ion-label>
-                <ion-button expand="block" (click)="submit()" [disabled]="!isValidResponse()">
-                    {{ 'core.submit' | translate }}
-                </ion-button>
-            </ion-label>
-        </ion-item>
     </form>
 
-</core-loading>
+    <div collapsible-footer *ngIf="!showLoading" slot="fixed">
+        <div class="list-item-limited-width" *ngIf="survey && (survey.surveydone || (!hasOffline && questions && questions.length))">
+            <ion-button class="ion-text-wrap ion-margin" expand="block" [href]="module.url" core-link *ngIf="survey.surveydone">
+                {{ 'addon.mod_survey.results' | translate }}
+                <ion-icon name="fas-external-link-alt" slot="end" aria-hidden="true"></ion-icon>
+            </ion-button>
 
-<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
-    (completionChanged)="onCompletionChange()">
-</core-course-module-navigation>
+            <ion-button expand="block" class="ion-text-wrap ion-margin" (click)="submit()" [disabled]="!isValidResponse()"
+                *ngIf="!survey.surveydone && !hasOffline && questions && questions.length">
+                {{ 'core.submit' | translate }}
+            </ion-button>
+        </div>
+
+        <core-course-module-navigation [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+        </core-course-module-navigation>
+    </div>
+</core-loading>
diff --git a/src/addons/mod/url/components/index/addon-mod-url-index.html b/src/addons/mod/url/components/index/addon-mod-url-index.html
index 9bd9966eb..734fbbe7e 100644
--- a/src/addons/mod/url/components/index/addon-mod-url-index.html
+++ b/src/addons/mod/url/components/index/addon-mod-url-index.html
@@ -35,17 +35,16 @@
                 <p>{{ url }}</p>
             </ion-label>
         </ion-item>
-        <ion-item class="ion-text-wrap">
-            <ion-label>
-                <ion-button expand="block" (click)="go()">
-                    <ion-icon name="fas-link" slot="start" aria-hidden="true"></ion-icon>
-                    {{ 'addon.mod_url.accessurl' | translate }}
-                </ion-button>
-            </ion-label>
-        </ion-item>
     </ion-list>
-</core-loading>
 
-<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
-    (completionChanged)="onCompletionChange()">
-</core-course-module-navigation>
+    <div collapsible-footer *ngIf="!showLoading" slot="fixed">
+        <div class="list-item-limited-width" *ngIf="url && !shouldIframe && (!shouldEmbed || !isOther)">
+            <ion-button expand="block" (click)="go()" class="ion-margin ion-text-wrap">
+                <ion-icon name="fas-link" slot="start" aria-hidden="true"></ion-icon>
+                {{ 'addon.mod_url.accessurl' | translate }}
+            </ion-button>
+        </div>
+        <core-course-module-navigation [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+        </core-course-module-navigation>
+    </div>
+</core-loading>
diff --git a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
index adc5c72e4..7ce927fb2 100644
--- a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
+++ b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
@@ -117,20 +117,6 @@
             <addon-mod-workshop-submission *ngIf="submission" [submission]="submission" [courseId]="workshop!.course" [module]="module"
                 [workshop]="workshop" [access]="access">
             </addon-mod-workshop-submission>
-
-            <!-- Show only on current phase -->
-            <ion-item class="ion-text-wrap" *ngIf="showSubmit">
-                <ion-label>
-                    <ion-button expand="block" *ngIf="access.creatingsubmissionallowed && !submission" (click)="gotoSubmit()">
-                        <ion-icon slot="start" name="fas-plus" aria-hidden="true"></ion-icon>
-                        {{ 'addon.mod_workshop.createsubmission' | translate }}
-                    </ion-button>
-                    <ion-button expand="block" *ngIf="access.modifyingsubmissionallowed && submission" (click)="gotoSubmit()">
-                        <ion-icon slot="start" name="fas-edit" aria-hidden="true"></ion-icon>
-                        {{ 'addon.mod_workshop.editsubmission' | translate }}
-                    </ion-button>
-                </ion-label>
-            </ion-item>
         </ion-card>
 
 
@@ -231,8 +217,25 @@
             </ion-grid>
         </ion-card>
     </div>
-</core-loading>
 
-<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
-    (completionChanged)="onCompletionChange()">
-</core-course-module-navigation>
+
+    <div collapsible-footer *ngIf="!showLoading" slot="fixed">
+        <div class="list-item-limited-width" *ngIf="access && workshop?.phase >= PHASE_SUBMISSION && canSubmit && showSubmit &&
+                ((access.creatingsubmissionallowed && !submission) || (access.modifyingsubmissionallowed && submission))">
+            <!-- Show only on current phase -->
+            <ion-button expand="block" *ngIf="access.creatingsubmissionallowed && !submission" (click)="gotoSubmit()"
+                class="ion-text-wrap ion-margin">
+                <ion-icon slot="start" name="fas-plus" aria-hidden="true"></ion-icon>
+                {{ 'addon.mod_workshop.createsubmission' | translate }}
+            </ion-button>
+            <ion-button expand="block" *ngIf="access.modifyingsubmissionallowed && submission" (click)="gotoSubmit()"
+                class="ion-text-wrap ion-margin">
+                <ion-icon slot="start" name="fas-edit" aria-hidden="true"></ion-icon>
+                {{ 'addon.mod_workshop.editsubmission' | translate }}
+            </ion-button>
+        </div>
+
+        <core-course-module-navigation [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+        </core-course-module-navigation>
+    </div>
+</core-loading>
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 8261707ae..f3d4ef15b 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -140,7 +140,7 @@ body {
 @each $color-name, $unused in $colors {
     .text-#{$color-name},
     p.text-#{$color-name} {
-        color: var(--ion-color-#{$color-name});
+        color: var(--ion-color-#{$color-name}) !important;
     }
 }
 
@@ -831,8 +831,8 @@ ion-list.core-course-module-list-wrapper,
 .list-item-limited-width,
 .core-course-module-list-wrapper {
     max-width: var(--list-item--max-width);
-    margin-left: auto;
-    margin-right: auto;
+    margin-left: auto !important;
+    margin-right: auto !important;
 }
 
 ion-toolbar h1 img.core-bar-button-image,
@@ -1451,13 +1451,19 @@ ion-grid.core-no-grid > ion-row {
         --core-collapsible-footer-height: auto;
     }
 
+    .ion-margin {
+        margin-top: 8px;
+        margin-bottom: 8px;
+    }
+
+    filter: var(--scroll-shadow-top, none);
+    -webkit-filter: var(--scroll-shadow-top, none);
     width: 100%;
     bottom: 0;
     z-index: 3;
     height: var(--core-collapsible-footer-height, auto);
     background-color: var(--core-collapsible-footer-background);
     display: block;
-    border-top: 1px solid var(--stroke);
     @include core-transition(all, 200ms);
 }
 
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 34fa46c45..febfd5762 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -334,7 +334,9 @@
     --addon-forum-border-color: var(--stroke);
     --addon-forum-highlight-color: var(--light);
 
-    --drop-shadow: 0, 0, 0, 0.18;
+    --drop-shadow: 0, 0, 0, 0.5;
+    --scroll-shadow-bottom: drop-shadow(0px 3px 3px rgba(var(--drop-shadow)));
+    --scroll-shadow-top: drop-shadow(0px 3px 3px rgba(var(--drop-shadow)));
 
     --core-question-correct-color: var(--success-shade);
     --core-question-correct-color-bg: var(--success-tint);

From 079d914de6daa96a2995ff205b49b3ac6f8e13df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 25 Feb 2022 11:37:31 +0100
Subject: [PATCH 0611/1008] MOBILE-3149 style: Fix collapsible items on tablet

---
 src/core/directives/collapsible-item.ts | 6 +++++-
 src/core/directives/format-text.ts      | 7 +++++--
 src/theme/globals.mixins.scss           | 1 +
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/core/directives/collapsible-item.ts b/src/core/directives/collapsible-item.ts
index d572a0586..5556d8669 100644
--- a/src/core/directives/collapsible-item.ts
+++ b/src/core/directives/collapsible-item.ts
@@ -153,7 +153,11 @@ export class CoreCollapsibleItemDirective implements OnInit {
         this.expanded = expand;
         this.element.classList.toggle('collapsible-expanded', expand);
         this.element.classList.toggle('collapsible-collapsed', !expand);
-        this.element.style.maxHeight = expand ? '' : (this.maxHeight + buttonHeight) + 'px';
+        if (expand) {
+            this.element.style.setProperty('--max-height', this.maxHeight + buttonHeight + 'px');
+        } else {
+            this.element.style.removeProperty('--max-height');
+        }
 
         const toggleButton = this.element.querySelector('ion-button.collapsible-toggle');
         const toggleText = toggleButton?.querySelector('.collapsible-toggle-text');
diff --git a/src/core/directives/format-text.ts b/src/core/directives/format-text.ts
index cf080adea..959735eef 100644
--- a/src/core/directives/format-text.ts
+++ b/src/core/directives/format-text.ts
@@ -320,8 +320,11 @@ export class CoreFormatTextDirective implements OnChanges {
         this.expanded = expand;
         this.element.classList.toggle('collapsible-expanded', expand);
         this.element.classList.toggle('collapsible-collapsed', !expand);
-        this.element.style.maxHeight = expand ? '' : this.maxHeight + 'px';
-
+        if (expand) {
+            this.element.style.setProperty('--max-height', this.maxHeight + 'px');
+        } else {
+            this.element.style.removeProperty('--max-height');
+        }
         const toggleButton = this.element.querySelector('ion-button.collapsible-toggle');
         const toggleText = toggleButton?.querySelector('.collapsible-toggle-text');
         if (!toggleButton || !toggleText) {
diff --git a/src/theme/globals.mixins.scss b/src/theme/globals.mixins.scss
index f9529da61..2199bf76b 100644
--- a/src/theme/globals.mixins.scss
+++ b/src/theme/globals.mixins.scss
@@ -270,6 +270,7 @@
             &.collapsible-collapsed {
                 overflow: hidden;
                 min-height: calc(var(--collapsible-min-button-height) + 12px);
+                max-height: calc(var(--max-height), auto);
 
                 .collapsible-toggle-arrow {
                     transform: rotate(90deg);

From be1bacba0c05a244240c4091884ee35e1178048f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 25 Feb 2022 12:01:09 +0100
Subject: [PATCH 0612/1008] MOBILE-3149 style: Remove hide-detail

---
 .../assign/components/index/addon-mod-assign-index.html   | 8 ++++----
 .../components/index/addon-mod-feedback-index.html        | 4 ++--
 .../h5pactivity/pages/user-attempts/user-attempts.html    | 2 +-
 .../h5pactivity/pages/users-attempts/users-attempts.html  | 2 +-
 src/theme/theme.base.scss                                 | 5 -----
 5 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/addons/mod/assign/components/index/addon-mod-assign-index.html b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
index a11a4b319..4072066ff 100644
--- a/src/addons/mod/assign/components/index/addon-mod-assign-index.html
+++ b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
@@ -65,7 +65,7 @@
 
             <!-- Summary of submissions with draft status. -->
             <ion-item class="ion-text-wrap" *ngIf="assign.submissiondrafts && summary && summary.submissionsenabled"
-                [class.hide-detail]="!summary.submissiondraftscount" detail="true" [button]="summary.submissiondraftscount"
+                [detail]="summary.submissiondraftscount" [button]="summary.submissiondraftscount"
                 (click)="goToSubmissionList(submissionStatusDraft, !!summary.submissiondraftscount)">
                 <ion-label>
                     <h2>{{ 'addon.mod_assign.numberofdraftsubmissions' | translate }}</h2>
@@ -80,8 +80,8 @@
             </ion-item>
 
             <!-- Summary of submissions with submitted status. -->
-            <ion-item class="ion-text-wrap" *ngIf="summary && summary.submissionsenabled"
-                [class.hide-detail]="!summary.submissionssubmittedcount" detail="true" [button]="summary.submissionssubmittedcount"
+            <ion-item class="ion-text-wrap" *ngIf="summary && summary.submissionsenabled" [detail]="summary.submissionssubmittedcount"
+                [button]="summary.submissionssubmittedcount"
                 (click)="goToSubmissionList(submissionStatusSubmitted, !!summary.submissionssubmittedcount)">
                 <ion-label>
                     <h2>{{ 'addon.mod_assign.numberofsubmittedassignments' | translate }}</h2>
@@ -97,7 +97,7 @@
 
             <!-- Summary of submissions that need grading. -->
             <ion-item class="ion-text-wrap" *ngIf="summary && summary.submissionsenabled && !assign.teamsubmission"
-                [class.hide-detail]="!needsGradingAvailable" detail="true" [button]="needsGradingAvailable"
+                [detail]="needsGradingAvailable" [button]="needsGradingAvailable"
                 (click)="goToSubmissionList(needGrading, needsGradingAvailable)">
                 <ion-label>
                     <h2>{{ 'addon.mod_assign.numberofsubmissionsneedgrading' | translate }}</h2>
diff --git a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
index 00bc860e7..bf91cdaec 100644
--- a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
+++ b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
@@ -70,8 +70,8 @@
                 </ion-select-option>
             </ion-select>
         </ion-item>
-        <ion-item class="ion-text-wrap" (click)="openAttempts()" [class.hide-detail]="!(access.canviewreports && completedCount > 0)"
-            detail="true" [button]="access.canviewreports && completedCount > 0">
+        <ion-item class="ion-text-wrap" (click)="openAttempts()" [detail]="access.canviewreports && completedCount > 0"
+            [button]="access.canviewreports && completedCount > 0">
             <ion-label>
                 <h2>{{ 'addon.mod_feedback.completed_feedbacks' | translate }}</h2>
             </ion-label>
diff --git a/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.html b/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.html
index 5432ccb09..fe477e1e8 100644
--- a/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.html
+++ b/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.html
@@ -65,7 +65,7 @@
 <!-- Template to render a list of conversations. -->
 <ng-template #attemptsTemplate let-attempts="attempts">
     <!-- "Header" of the table -->
-    <ion-item class="ion-text-wrap addon-mod_h5pactivity-table-header hide-detail" detail="true">
+    <ion-item class="ion-text-wrap addon-mod_h5pactivity-table-header" [detail]="false">
         <ion-label>
             <ion-row class="ion-align-items-center">
                 <ion-col class="ion-text-center">#</ion-col>
diff --git a/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.html b/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.html
index 375cb84cc..c9a58d517 100644
--- a/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.html
+++ b/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.html
@@ -19,7 +19,7 @@
     <core-loading [hideUntil]="loaded">
         <ion-list *ngIf="users.length">
             <!-- "Header" of the table -->
-            <ion-item class="addon-mod_h5pactivity-table-header hide-detail font-bold" detail="true">
+            <ion-item class="addon-mod_h5pactivity-table-header font-bold" [detail]="false">
                 <ion-label>
                     <ion-row class="ion-align-items-center">
                         <ion-col class="ion-text-center" size="4">{{ 'core.user' | translate }}</ion-col>
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index f3d4ef15b..58b86f8a2 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -1257,11 +1257,6 @@ ion-datetime.datetime-disabled {
     opacity: .8 !important;
 }
 
-// Hide details on items to align badges.
-ion-item.hide-detail {
-    --detail-icon-opacity: 0;
-}
-
 // Make links clickable when inside radio or checkbox items. Style part.
 @media (hover: hover) {
     ion-item.item-multiple-inputs:hover::part(native) {

From 859230ddf3bfc3ec640bcb6dcc42857f13de240b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 25 Feb 2022 15:45:39 +0100
Subject: [PATCH 0613/1008] MOBILE-3149 style: Change light to outline in
 buttons

---
 .../components/events/addon-block-timeline-events.html |  2 +-
 src/addons/calendar/pages/edit-event/edit-event.html   | 10 +++++-----
 src/addons/messages/pages/discussion/discussion.html   |  2 +-
 src/addons/messages/pages/search/search.html           |  2 +-
 src/addons/mod/chat/pages/chat/chat.html               |  2 +-
 src/addons/mod/forum/components/post/post.html         |  6 +++---
 .../mod/forum/pages/new-discussion/new-discussion.html |  6 +++---
 .../mod/lesson/pages/user-retake/user-retake.html      |  2 +-
 src/addons/mod/quiz/pages/review/review.html           |  4 ++--
 src/addons/notifications/pages/list/list.html          |  2 +-
 .../multichoice/component/addon-qtype-multichoice.html |  2 +-
 .../infinite-loading/core-infinite-loading.html        |  8 ++++----
 src/core/components/recaptcha/core-recaptcha.html      |  2 +-
 .../components/site-onboarding/site-onboarding.html    |  6 +++---
 .../login/pages/change-password/change-password.html   |  2 +-
 .../features/login/pages/credentials/credentials.html  |  4 ++--
 src/core/features/login/pages/reconnect/reconnect.html |  6 +++---
 .../features/login/pages/site-policy/site-policy.html  |  2 +-
 src/core/features/login/pages/site/site.html           |  2 +-
 .../question/components/question/core-question.html    |  2 +-
 src/core/features/viewer/components/text/text.html     |  2 +-
 21 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/addons/block/timeline/components/events/addon-block-timeline-events.html b/src/addons/block/timeline/components/events/addon-block-timeline-events.html
index 68a2ac180..4bb4161f4 100644
--- a/src/addons/block/timeline/components/events/addon-block-timeline-events.html
+++ b/src/addons/block/timeline/components/events/addon-block-timeline-events.html
@@ -68,7 +68,7 @@
 
 <div class="ion-padding ion-text-center" *ngIf="canLoadMore && !empty">
     <!-- Button and spinner to show more attempts. -->
-    <ion-button expand="block" (click)="loadMoreEvents()" color="light" *ngIf="!loadingMore">
+    <ion-button expand="block" (click)="loadMoreEvents()" fill="outline" *ngIf="!loadingMore">
         {{ 'core.loadmore' | translate }}
     </ion-button>
     <ion-spinner *ngIf="loadingMore" [attr.aria-label]="'core.loading' | translate"></ion-spinner>
diff --git a/src/addons/calendar/pages/edit-event/edit-event.html b/src/addons/calendar/pages/edit-event/edit-event.html
index 6c28db54b..b02c1cf05 100644
--- a/src/addons/calendar/pages/edit-event/edit-event.html
+++ b/src/addons/calendar/pages/edit-event/edit-event.html
@@ -235,16 +235,16 @@
             <ion-item>
                 <ion-label>
                     <ion-row>
+                        <ion-col *ngIf="hasOffline && eventId && eventId < 0">
+                            <ion-button expand="block" fill="outline" (click)="discard()">
+                                {{ 'core.discard' | translate }}
+                            </ion-button>
+                        </ion-col>
                         <ion-col>
                             <ion-button expand="block" (click)="submit()" [disabled]="!form.valid" type="submit">
                                 {{ 'core.save' | translate }}
                             </ion-button>
                         </ion-col>
-                        <ion-col *ngIf="hasOffline && eventId && eventId < 0">
-                            <ion-button expand="block" color="light" (click)="discard()">
-                                {{ 'core.discard' | translate }}
-                            </ion-button>
-                        </ion-col>
                     </ion-row>
                 </ion-label>
             </ion-item>
diff --git a/src/addons/messages/pages/discussion/discussion.html b/src/addons/messages/pages/discussion/discussion.html
index 68417d729..fc9dd7c3c 100644
--- a/src/addons/messages/pages/discussion/discussion.html
+++ b/src/addons/messages/pages/discussion/discussion.html
@@ -157,7 +157,7 @@
             <ion-button expand="block" class="ion-text-wrap ion-margin-bottom" (click)="confirmContactRequest()">
                 {{ 'addon.messages.acceptandaddcontact' | translate }}
             </ion-button>
-            <ion-button expand="block" class="ion-text-wrap ion-margin-bottom" color="light" (click)="declineContactRequest()">
+            <ion-button expand="block" class="ion-text-wrap ion-margin-bottom" fill="outline" (click)="declineContactRequest()">
                 {{ 'addon.messages.decline' | translate }}
             </ion-button>
         </div>
diff --git a/src/addons/messages/pages/search/search.html b/src/addons/messages/pages/search/search.html
index 6c5d98f08..133b5c5ae 100644
--- a/src/addons/messages/pages/search/search.html
+++ b/src/addons/messages/pages/search/search.html
@@ -68,7 +68,7 @@
         <!-- Load more button for contacts and non-contacts -->
         <ng-container *ngIf="item.type != 'messages'">
             <div class="ion-padding-horizontal" *ngIf="item.canLoadMore && !item.loadingMore">
-                <ion-button expand="block" color="light" (click)="search(query, item.type)">
+                <ion-button expand="block" fill="outline" (click)="search(query, item.type)">
                     {{ 'core.loadmore' | translate }}
                 </ion-button>
             </div>
diff --git a/src/addons/mod/chat/pages/chat/chat.html b/src/addons/mod/chat/pages/chat/chat.html
index 558eb4165..0fc26f280 100644
--- a/src/addons/mod/chat/pages/chat/chat.html
+++ b/src/addons/mod/chat/pages/chat/chat.html
@@ -119,7 +119,7 @@
             (onSubmit)="sendMessage($event)" [placeholder]="'addon.messages.newmessage' | translate">
         </core-send-message-form>
 
-        <ion-button *ngIf="isOnline && !polling && loaded" (click)="reconnect()" expand="block" color="light">
+        <ion-button *ngIf="isOnline && !polling && loaded" (click)="reconnect()" expand="block" fill="outline">
             {{ 'core.login.reconnect' | translate }}
         </ion-button>
     </ion-toolbar>
diff --git a/src/addons/mod/forum/components/post/post.html b/src/addons/mod/forum/components/post/post.html
index 4cbc6f849..a5e99970d 100644
--- a/src/addons/mod/forum/components/post/post.html
+++ b/src/addons/mod/forum/components/post/post.html
@@ -134,15 +134,15 @@
         </ng-container>
         <ion-grid>
             <ion-row>
+                <ion-col>
+                    <ion-button expand="block" fill="outline" (click)="cancel()">{{ 'core.cancel' | translate }}</ion-button>
+                </ion-col>
                 <ion-col>
                     <ion-button expand="block" (click)="send()" [disabled]="formData.subject == '' || formData.message == null">
                         <span *ngIf="formData.isEditing">{{ 'core.savechanges' | translate }}</span>
                         <span *ngIf="!formData.isEditing">{{ 'addon.mod_forum.posttoforum' | translate }}</span>
                     </ion-button>
                 </ion-col>
-                <ion-col>
-                    <ion-button expand="block" color="light" (click)="cancel()">{{ 'core.cancel' | translate }}</ion-button>
-                </ion-col>
             </ion-row>
         </ion-grid>
     </form>
diff --git a/src/addons/mod/forum/pages/new-discussion/new-discussion.html b/src/addons/mod/forum/pages/new-discussion/new-discussion.html
index 748509102..efe7b9dc0 100644
--- a/src/addons/mod/forum/pages/new-discussion/new-discussion.html
+++ b/src/addons/mod/forum/pages/new-discussion/new-discussion.html
@@ -69,15 +69,15 @@
             <ion-item>
                 <ion-label>
                     <ion-row>
+                        <ion-col *ngIf="hasOffline">
+                            <ion-button expand="block" fill="outline" (click)="discard()">{{ 'core.discard' | translate }}</ion-button>
+                        </ion-col>
                         <ion-col>
                             <ion-button expand="block" [disabled]="newDiscussion.subject == '' || newDiscussion.message == null"
                                 (click)="add()">
                                 {{ 'addon.mod_forum.posttoforum' | translate }}
                             </ion-button>
                         </ion-col>
-                        <ion-col *ngIf="hasOffline">
-                            <ion-button expand="block" color="light" (click)="discard()">{{ 'core.discard' | translate }}</ion-button>
-                        </ion-col>
                     </ion-row>
                 </ion-label>
             </ion-item>
diff --git a/src/addons/mod/lesson/pages/user-retake/user-retake.html b/src/addons/mod/lesson/pages/user-retake/user-retake.html
index 5c4a27e7a..872b6577a 100644
--- a/src/addons/mod/lesson/pages/user-retake/user-retake.html
+++ b/src/addons/mod/lesson/pages/user-retake/user-retake.html
@@ -113,7 +113,7 @@
                                         <!-- Content page, display a button and the content. -->
                                         <ion-row>
                                             <ion-col>
-                                                <ion-button expand="block" class="ion-text-wrap" color="light" [disabled]="true">
+                                                <ion-button expand="block" class="ion-text-wrap" fill="outline" [disabled]="true">
                                                     {{ answer[0].buttonText }}
                                                 </ion-button>
                                             </ion-col>
diff --git a/src/addons/mod/quiz/pages/review/review.html b/src/addons/mod/quiz/pages/review/review.html
index a83b93d8d..068dc2a6f 100644
--- a/src/addons/mod/quiz/pages/review/review.html
+++ b/src/addons/mod/quiz/pages/review/review.html
@@ -125,13 +125,13 @@
     <ion-grid>
         <ion-row class="ion-align-items-center">
             <ion-col class="ion-text-start">
-                <ion-button color="light" *ngIf="previousPage >= 0" (click)="changePage(previousPage)"
+                <ion-button fill="outline" *ngIf="previousPage >= 0" (click)="changePage(previousPage)"
                     [title]="'core.previous' | translate">
                     <ion-icon name="fas-chevron-left" slot="icon-only" aria-hidden="true"></ion-icon>
                 </ion-button>
             </ion-col>
             <ion-col class="ion-text-end">
-                <ion-button color="light" *ngIf="nextPage >= -1" (click)="changePage(nextPage)" [attr.aria-label]="'core.next' | translate">
+                <ion-button *ngIf="nextPage >= -1" (click)="changePage(nextPage)" [attr.aria-label]="'core.next' | translate">
                     <ion-icon name="fas-chevron-right" slot="icon-only" aria-hidden="true"></ion-icon>
                 </ion-button>
             </ion-col>
diff --git a/src/addons/notifications/pages/list/list.html b/src/addons/notifications/pages/list/list.html
index 64bfcc028..0630a22d2 100644
--- a/src/addons/notifications/pages/list/list.html
+++ b/src/addons/notifications/pages/list/list.html
@@ -17,7 +17,7 @@
     </ion-refresher>
     <core-loading [hideUntil]="notificationsLoaded">
         <div class="ion-padding" *ngIf="canMarkAllNotificationsAsRead">
-            <ion-button [disabled]="loadingMarkAllNotificationsAsRead" expand="block" (click)="markAllNotificationsAsRead()" color="light">
+            <ion-button [disabled]="loadingMarkAllNotificationsAsRead" expand="block" (click)="markAllNotificationsAsRead()" fill="outline">
                 <ion-icon slot="start" name="fas-check" aria-hidden="true" *ngIf="!loadingMarkAllNotificationsAsRead"></ion-icon>
                 <ion-spinner slot="start" [attr.aria-label]="'core.loading' | translate" *ngIf="loadingMarkAllNotificationsAsRead">
                 </ion-spinner>
diff --git a/src/addons/qtype/multichoice/component/addon-qtype-multichoice.html b/src/addons/qtype/multichoice/component/addon-qtype-multichoice.html
index b94cebadc..da99394bc 100644
--- a/src/addons/qtype/multichoice/component/addon-qtype-multichoice.html
+++ b/src/addons/qtype/multichoice/component/addon-qtype-multichoice.html
@@ -62,7 +62,7 @@
             <ion-icon *ngIf="option.isCorrect === 0" class="core-correct-icon" name="fas-times" color="danger"
                 [attr.aria-label]="'core.question.incorrect' | translate"></ion-icon>
         </ion-item>
-        <ion-button *ngIf="!multiQuestion.disabled" class="ion-text-wrap ion-margin" expand="full" color="light"
+        <ion-button *ngIf="!multiQuestion.disabled" class="ion-text-wrap ion-margin-top" expand="block" fill="outline"
             [disabled]="!multiQuestion.singleChoiceModel" (click)="clear()" type="reset">
             {{ 'addon.mod_quiz.clearchoice' | translate }}
         </ion-button>
diff --git a/src/core/components/infinite-loading/core-infinite-loading.html b/src/core/components/infinite-loading/core-infinite-loading.html
index 333c14f76..8cb69a24d 100644
--- a/src/core/components/infinite-loading/core-infinite-loading.html
+++ b/src/core/components/infinite-loading/core-infinite-loading.html
@@ -1,9 +1,9 @@
 <ng-container *ngIf="!loadingMore && position != 'top'">
     <div *ngIf="enabled || error" class="ion-padding-horizontal" #bottombutton>
-        <ion-button *ngIf="!error" expand="block" (click)="loadMore()" color="light">
+        <ion-button *ngIf="!error" expand="block" (click)="loadMore()" fill="outline">
             {{ 'core.loadmore' | translate }}
         </ion-button>
-        <ion-button *ngIf="error" expand="block" (click)="loadMore()" color="light">
+        <ion-button *ngIf="error" expand="block" (click)="loadMore()" fill="outline">
             {{ 'core.tryagain' | translate }}
         </ion-button>
     </div>
@@ -15,10 +15,10 @@
 
 <ng-container *ngIf="!loadingMore && position == 'top'">
     <div *ngIf="enabled || error" class="ion-padding-horizontal" #topbutton>
-        <ion-button *ngIf="!error" expand="block" (click)="loadMore()" color="light">
+        <ion-button *ngIf="!error" expand="block" (click)="loadMore()" fill="outline">
             {{ 'core.loadmore' | translate }}
         </ion-button>
-        <ion-button *ngIf="error" expand="block" (click)="loadMore()" color="light">
+        <ion-button *ngIf="error" expand="block" (click)="loadMore()" fill="outline">
             {{ 'core.tryagain' | translate }}
         </ion-button>
     </div>
diff --git a/src/core/components/recaptcha/core-recaptcha.html b/src/core/components/recaptcha/core-recaptcha.html
index d332e8958..102ddefc2 100644
--- a/src/core/components/recaptcha/core-recaptcha.html
+++ b/src/core/components/recaptcha/core-recaptcha.html
@@ -1,7 +1,7 @@
 <!-- ReCAPTCHA V2 -->
 <div *ngIf="publicKey && siteUrl && model">
     <!-- A button to open the recaptcha modal. -->
-    <ion-button expand="block" color="light" class="ion-margin" *ngIf="!model[modelValueName]" (click)="answerRecaptcha()">
+    <ion-button expand="block" fill="outline" class="ion-margin" *ngIf="!model[modelValueName]" (click)="answerRecaptcha()">
         {{ 'core.opensecurityquestion' | translate }}
     </ion-button>
     <ion-item *ngIf="model[modelValueName]">
diff --git a/src/core/features/login/components/site-onboarding/site-onboarding.html b/src/core/features/login/components/site-onboarding/site-onboarding.html
index cd000ea2b..403c74200 100644
--- a/src/core/features/login/components/site-onboarding/site-onboarding.html
+++ b/src/core/features/login/components/site-onboarding/site-onboarding.html
@@ -24,10 +24,10 @@
         </h3>
 
         <div *ngIf="step == 0" class="core-login-onboarding-step">
-            <ion-button expand="block" (click)="skip($event)" class="ion-margin-bottom" color="light">
+            <ion-button expand="block" (click)="skip($event)" class="ion-margin-bottom" fill="outline">
                 {{'core.login.onboardingimalearner' | translate}}
             </ion-button>
-            <ion-button expand="block" (click)="next($event)" class="ion-margin-bottom" color="light">
+            <ion-button expand="block" (click)="next($event)" class="ion-margin-bottom" fill="outline">
                 {{'core.login.onboardingimaneducator' | translate}}
             </ion-button>
         </div>
@@ -36,7 +36,7 @@
             <p class="core-login-onboarding-text">
                 {{ 'core.login.onboardingtoconnect' | translate }}
             </p>
-            <ion-button expand="block" (click)="skip($event)" class="ion-margin-bottom" color="light">
+            <ion-button expand="block" (click)="skip($event)" class="ion-margin-bottom" fill="outline">
                 {{ 'core.login.onboardingialreadyhaveasite' | translate }}
             </ion-button>
             <ion-button expand="block" (click)="next($event)" class="ion-margin-bottom">
diff --git a/src/core/features/login/pages/change-password/change-password.html b/src/core/features/login/pages/change-password/change-password.html
index 9d89d49e4..b36619a1b 100644
--- a/src/core/features/login/pages/change-password/change-password.html
+++ b/src/core/features/login/pages/change-password/change-password.html
@@ -43,7 +43,7 @@
                 <p>{{ 'core.login.changepasswordlogoutinstructions' | translate }}</p>
             </ion-label>
         </ion-item>
-        <ion-button class="ion-text-wrap ion-margin" expand="block" color="light" (click)="logout()">
+        <ion-button class="ion-text-wrap ion-margin" expand="block" fill="outline" (click)="logout()">
             {{ logoutLabel | translate }}
         </ion-button>
     </ion-list>
diff --git a/src/core/features/login/pages/credentials/credentials.html b/src/core/features/login/pages/credentials/credentials.html
index b9a85c9d3..2335e3cca 100644
--- a/src/core/features/login/pages/credentials/credentials.html
+++ b/src/core/features/login/pages/credentials/credentials.html
@@ -54,7 +54,7 @@
 
             <ng-container *ngIf="showScanQR">
                 <div class="ion-text-center ion-padding">{{ 'core.login.or' | translate }}</div>
-                <ion-button expand="block" color="light" class="ion-margin" (click)="showInstructionsAndScanQR()">
+                <ion-button expand="block" fill="outline" class="ion-margin" (click)="showInstructionsAndScanQR()">
                     <ion-icon slot="start" name="fas-qrcode" aria-hidden="true"></ion-icon>
                     {{ 'core.scanqr' | translate }}
                 </ion-button>
@@ -93,7 +93,7 @@
                     </p>
                 </ion-label>
             </ion-item>
-            <ion-button expand="block" class="ion-margin ion-text-wrap" color="light" (click)="openEmailSignup()">
+            <ion-button expand="block" class="ion-margin ion-text-wrap" fill="outline" (click)="openEmailSignup()">
                 {{ 'core.login.startsignup' | translate }}
             </ion-button>
         </ion-list>
diff --git a/src/core/features/login/pages/reconnect/reconnect.html b/src/core/features/login/pages/reconnect/reconnect.html
index 61bf8066f..73c657428 100644
--- a/src/core/features/login/pages/reconnect/reconnect.html
+++ b/src/core/features/login/pages/reconnect/reconnect.html
@@ -53,7 +53,7 @@
         <ion-grid class="ion-padding">
             <ion-row>
                 <ion-col>
-                    <ion-button expand="block" color="light" (click)="cancel($event)">
+                    <ion-button expand="block" fill="outline" (click)="cancel($event)">
                         {{ 'core.login.cancel' | translate }}
                     </ion-button>
                 </ion-col>
@@ -67,7 +67,7 @@
 
         <ng-container *ngIf="showScanQR">
             <div class="ion-text-center ion-padding">{{ 'core.login.or' | translate }}</div>
-            <ion-button expand="block" color="light" class="ion-margin" (click)="showInstructionsAndScanQR()">
+            <ion-button expand="block" fill="outline" class="ion-margin" (click)="showInstructionsAndScanQR()">
                 <ion-icon slot="start" name="fas-qrcode" aria-hidden="true"></ion-icon>
                 {{ 'core.scanqr' | translate }}
             </ion-button>
@@ -96,7 +96,7 @@
 
     <!-- If OAuth, display cancel button since the form isn't displayed. -->
     <ion-list *ngIf="isOAuth">
-        <ion-button expand="block" class="ion-margin" color="light" (click)="cancel($event)">
+        <ion-button expand="block" class="ion-margin" fill="outline" (click)="cancel($event)">
             {{ 'core.login.cancel' | translate }}
         </ion-button>
     </ion-list>
diff --git a/src/core/features/login/pages/site-policy/site-policy.html b/src/core/features/login/pages/site-policy/site-policy.html
index af2cd7267..dbef122e6 100644
--- a/src/core/features/login/pages/site-policy/site-policy.html
+++ b/src/core/features/login/pages/site-policy/site-policy.html
@@ -30,7 +30,7 @@
             <ion-button class="ion-text-wrap ion-margin-horizontal" expand="block" (click)="accept()">
                 {{ 'core.login.policyacceptmandatory' | translate }}
             </ion-button>
-            <ion-button class="ion-text-wrap ion-margin-horizontal ion-margin-bottom" expand="block" color="light" (click)="cancel()">
+            <ion-button class="ion-text-wrap ion-margin-horizontal ion-margin-bottom" expand="block" fill="outline" (click)="cancel()">
                 {{ 'core.login.cancel' | translate }}
             </ion-button>
         </ion-list>
diff --git a/src/core/features/login/pages/site/site.html b/src/core/features/login/pages/site/site.html
index 5adb6101f..70254c58a 100644
--- a/src/core/features/login/pages/site/site.html
+++ b/src/core/features/login/pages/site/site.html
@@ -101,7 +101,7 @@
 
     <ng-container *ngIf="showScanQR && !hasSites && !enteredSiteUrl">
         <div class="ion-text-center ion-padding ion-margin-top">{{ 'core.login.or' | translate }}</div>
-        <ion-button expand="block" color="light" class="ion-margin" (click)="showInstructionsAndScanQR()" aria-haspopup="dialog">
+        <ion-button expand="block" fill="outline" class="ion-margin" (click)="showInstructionsAndScanQR()" aria-haspopup="dialog">
             <ion-icon slot="start" name="fas-qrcode" aria-hidden="true"></ion-icon>
             {{ 'core.scanqr' | translate }}
         </ion-button>
diff --git a/src/core/features/question/components/question/core-question.html b/src/core/features/question/components/question/core-question.html
index fb523c3e3..994ba6a4d 100644
--- a/src/core/features/question/components/question/core-question.html
+++ b/src/core/features/question/components/question/core-question.html
@@ -19,7 +19,7 @@
 </ion-item>
 
 <!-- Question behaviour buttons. -->
-<ion-button *ngFor="let button of question?.behaviourButtons" class="ion-margin ion-text-wrap" expand="block"
+<ion-button *ngFor="let button of question?.behaviourButtons" class="ion-margin-vertical ion-text-wrap" expand="block"
     (click)="buttonClicked.emit(button)" [disabled]="button.disabled">
     {{ button.value }}
 </ion-button>
diff --git a/src/core/features/viewer/components/text/text.html b/src/core/features/viewer/components/text/text.html
index 851bf8f03..6dedd7b76 100644
--- a/src/core/features/viewer/components/text/text.html
+++ b/src/core/features/viewer/components/text/text.html
@@ -20,7 +20,7 @@
     </ion-card>
 </ion-content>
 <ion-footer *ngIf="displayCopyButton">
-    <ion-button expand="block" color="light" (click)="copyText()">
+    <ion-button expand="block" fill="outline" (click)="copyText()">
         <ion-icon name="fas-copy" aria-hidden="true" slot="start"></ion-icon>
         {{ 'core.copytoclipboard' | translate }}
     </ion-button>

From 3a11cdbfe2898f5da44fc7b6bf1a337f61b3d8cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 25 Feb 2022 12:31:30 +0100
Subject: [PATCH 0614/1008] MOBILE-3149 module: Add collapsible footer buttons
 inside activities

---
 scripts/langindex.json                        |  2 -
 src/addons/mod/data/pages/entry/entry.html    | 24 ++---
 src/addons/mod/feedback/lang.json             |  2 -
 src/addons/mod/feedback/pages/form/form.html  | 82 ++++++++---------
 src/addons/mod/feedback/pages/form/form.ts    |  6 +-
 .../mod/lesson/pages/player/player.html       | 29 +++---
 .../mod/lesson/services/lesson-helper.ts      |  2 +-
 .../navigation-modal/navigation-modal.html    | 32 ++-----
 .../navigation-modal/navigation-modal.ts      | 16 ----
 .../mod/quiz/pages/attempt/attempt.html       | 14 ++-
 src/addons/mod/quiz/pages/player/player.html  | 90 +++++++------------
 .../mod/quiz/pages/player/player.page.ts      |  6 +-
 src/addons/mod/quiz/pages/review/review.html  | 46 +++++-----
 .../mod/quiz/pages/review/review.page.ts      | 15 +---
 .../qtype/essay/services/handlers/essay.ts    |  2 +-
 src/core/components/timer/timer.scss          |  1 +
 src/core/features/course/lang.json            |  4 +-
 17 files changed, 153 insertions(+), 220 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 11f362ee4..081689da2 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -576,7 +576,6 @@
   "addon.mod_feedback.minimal": "feedback",
   "addon.mod_feedback.mode": "feedback",
   "addon.mod_feedback.modulenameplural": "feedback",
-  "addon.mod_feedback.next_page": "feedback",
   "addon.mod_feedback.non_anonymous": "feedback",
   "addon.mod_feedback.non_anonymous_entries": "feedback",
   "addon.mod_feedback.non_respondents_students": "feedback",
@@ -586,7 +585,6 @@
   "addon.mod_feedback.overview": "feedback",
   "addon.mod_feedback.page_after_submit": "feedback",
   "addon.mod_feedback.preview": "moodle",
-  "addon.mod_feedback.previous_page": "feedback",
   "addon.mod_feedback.questions": "feedback",
   "addon.mod_feedback.questionscountdescription": "local_moodlemobileapp",
   "addon.mod_feedback.response_nr": "feedback",
diff --git a/src/addons/mod/data/pages/entry/entry.html b/src/addons/mod/data/pages/entry/entry.html
index 7ecfe25c5..e66b33145 100644
--- a/src/addons/mod/data/pages/entry/entry.html
+++ b/src/addons/mod/data/pages/entry/entry.html
@@ -60,21 +60,23 @@
             (onLoading)="setLoadingComments($event)" [showItem]="true">
         </core-comments>
 
-        <ion-grid *ngIf="hasPrevious || hasNext">
-            <ion-row class="ion-align-items-center">
-                <ion-col *ngIf="hasPrevious">
-                    <ion-button expand="block" fill="outline" (click)="gotoEntry(offset! -1)">
-                        <ion-icon name="fas-chevron-left" slot="start" aria-hidden="true"></ion-icon>
-                        {{ 'core.previous' | translate }}
+        <div collapsible-footer *ngIf="entryLoaded && hasPrevious || hasNext" slot="fixed">
+            <ion-row class="ion-justify-content-between ion-align-items-center ion-no-padding ion-wrap">
+                <ion-col class="ion-text-start ion-no-padding core-navigation-arrow" size="auto">
+                    <ion-button [disabled]="!hasPrevious" fill="clear" color="dark" [attr.aria-label]="'core.previous' | translate"
+                        (click)="gotoEntry(offset! -1)">
+                        <ion-icon name="fas-chevron-left" slot="icon-only" aria-hidden="true"></ion-icon>
                     </ion-button>
                 </ion-col>
-                <ion-col *ngIf="hasNext">
-                    <ion-button expand="block" (click)="gotoEntry(offset! + 1)">
-                        {{ 'core.next' | translate }}
-                        <ion-icon name="fas-chevron-right" slot="end" aria-hidden="true"></ion-icon>
+                <ion-col class="ion-text-center">
+                </ion-col>
+                <ion-col class="ion-text-end ion-no-padding core-navigation-arrow" size="auto">
+                    <ion-button [disabled]="!hasNext" fill="clear" color="dark" [attr.aria-label]=" 'core.next' | translate"
+                        (click)="gotoEntry(offset! + 1)">
+                        <ion-icon name="fas-chevron-right" slot="icon-only" aria-hidden="true"></ion-icon>
                     </ion-button>
                 </ion-col>
             </ion-row>
-        </ion-grid>
+        </div>
     </core-loading>
 </ion-content>
diff --git a/src/addons/mod/feedback/lang.json b/src/addons/mod/feedback/lang.json
index 903a127e3..bfab7c6e0 100644
--- a/src/addons/mod/feedback/lang.json
+++ b/src/addons/mod/feedback/lang.json
@@ -18,7 +18,6 @@
     "minimal": "Minimum",
     "mode": "Mode",
     "modulenameplural": "Feedback",
-    "next_page": "Next page",
     "non_anonymous": "User's name will be logged and shown with answers",
     "non_anonymous_entries": "Non anonymous entries ({{$a}})",
     "non_respondents_students": "Non-respondent students ({{$a}})",
@@ -28,7 +27,6 @@
     "overview": "Overview",
     "page_after_submit": "Completion message",
     "preview": "Preview",
-    "previous_page": "Previous page",
     "questions": "Questions",
     "questionscountdescription": "There are {{count}} questions.",
     "response_nr": "Response number",
diff --git a/src/addons/mod/feedback/pages/form/form.html b/src/addons/mod/feedback/pages/form/form.html
index 4ed5b620f..e2a2a4079 100644
--- a/src/addons/mod/feedback/pages/form/form.html
+++ b/src/addons/mod/feedback/pages/form/form.html
@@ -109,32 +109,31 @@
                         </ng-container>
                     </ng-container>
                 </ng-container>
-                <ion-grid *ngIf="!preview">
-                    <ion-row class="ion-align-items-center">
-                        <ion-col *ngIf="hasPrevPage">
-                            <ion-button expand="block" fill="outline" (click)="gotoPage(true)" class="ion-text-wrap">
-                                <ion-icon name="fas-chevron-left" slot="start" aria-hidden="true"></ion-icon>
-                                {{ 'addon.mod_feedback.previous_page' | translate }}
-                            </ion-button>
-                        </ion-col>
-                        <ion-col *ngIf="hasNextPage">
-                            <ion-button expand="block" (click)="gotoPage(false)" class="ion-text-wrap">
-                                {{ 'addon.mod_feedback.next_page' | translate }}
-                                <ion-icon name="fas-chevron-right" slot="end" aria-hidden="true"></ion-icon>
-                            </ion-button>
-                        </ion-col>
-                        <ion-col *ngIf="!hasNextPage">
-                            <ion-button expand="block" (click)="gotoPage(false)" class="ion-text-wrap">
-                                {{ 'addon.mod_feedback.save_entries' | translate }}
-                            </ion-button>
-                        </ion-col>
-                    </ion-row>
-                </ion-grid>
+
+                <ion-row class="ion-align-items-center" *ngIf="!preview">
+                    <ion-col *ngIf="hasPrevPage">
+                        <ion-button expand="block" fill="outline" (click)="gotoPage(true)" class="ion-text-wrap">
+                            <ion-icon name="fas-chevron-left" slot="start" aria-hidden="true"></ion-icon>
+                            {{ 'core.previous' | translate }}
+                        </ion-button>
+                    </ion-col>
+                    <ion-col *ngIf="hasNextPage">
+                        <ion-button expand="block" (click)="gotoPage(false)" class="ion-text-wrap">
+                            {{ 'core.next' | translate }}
+                            <ion-icon name="fas-chevron-right" slot="end" aria-hidden="true"></ion-icon>
+                        </ion-button>
+                    </ion-col>
+                    <ion-col *ngIf="!hasNextPage">
+                        <ion-button expand="block" (click)="gotoPage(false)" class="ion-text-wrap">
+                            {{ 'core.submit' | translate }}
+                        </ion-button>
+                    </ion-col>
+                </ion-row>
             </ion-list>
         </ng-container>
 
         <ion-card class="core-success-card" *ngIf="completed">
-            <ion-item>
+            <ion-item class="ion-text-wrap">
                 <ion-icon name="fas-check" slot="start" aria-hidden="true"></ion-icon>
                 <ion-label>
                     <p *ngIf="!completionPageContents && !completedOffline">
@@ -143,32 +142,25 @@
                     <p *ngIf="!completionPageContents && completedOffline">
                         {{ 'addon.mod_feedback.feedback_submitted_offline' | translate }}
                     </p>
-                    <p *ngIf="completionPageContents">
-                        <core-format-text [component]="component" componentId="componentId" [text]="completionPageContents"
-                            contextLevel="module" [contextInstanceId]="cmId" [courseId]="courseId">
-                        </core-format-text>
-                    </p>
+                    <core-format-text *ngIf="completionPageContents" [component]="component" componentId="componentId"
+                        [text]="completionPageContents" contextLevel="module" [contextInstanceId]="cmId" [courseId]="courseId">
+                    </core-format-text>
                 </ion-label>
             </ion-item>
         </ion-card>
 
-        <ion-card *ngIf="completed && (access!.canviewanalysis || hasNextPage)">
-            <ion-grid>
-                <ion-row class="ion-align-items-center">
-                    <ion-col *ngIf="access!.canviewanalysis">
-                        <ion-button expand="block" fill="outline" (click)="showAnalysis()" class="ion-text-wrap">
-                            <ion-icon name="fas-chart-bar" slot="start" aria-hidden="true"></ion-icon>
-                            {{ 'addon.mod_feedback.completed_feedbacks' | translate }}
-                        </ion-button>
-                    </ion-col>
-                    <ion-col *ngIf="hasNextPage">
-                        <ion-button expand="block" (click)="continue()" class="ion-text-wrap">
-                            {{ 'core.continue' | translate }}
-                            <ion-icon name="fas-chevron-right" slot="end" aria-hidden="true"></ion-icon>
-                        </ion-button>
-                    </ion-col>
-                </ion-row>
-            </ion-grid>
-        </ion-card>
+        <div collapsible-footer *ngIf="feedbackLoaded && completed" slot="fixed">
+            <div class="list-item-limited-width">
+                <ion-button expand="block" fill="outline" (click)="showAnalysis()" class="ion-text-wrap ion-margin"
+                    *ngIf="access!.canviewanalysis">
+                    <ion-icon name="fas-chart-bar" slot="start" aria-hidden="true"></ion-icon>
+                    {{ 'addon.mod_feedback.completed_feedbacks' | translate }}
+                </ion-button>
+                <ion-button expand="block" (click)="continue()" class="ion-text-wrap ion-margin">
+                    <ng-container *ngIf="!siteAfterSubmit">{{ 'core.continue' | translate }}</ng-container>
+                    <ng-container *ngIf="siteAfterSubmit">{{ 'core.course.gotonextactivity' | translate }}</ng-container>
+                </ion-button>
+            </div>
+        </div>
     </core-loading>
 </ion-content>
diff --git a/src/addons/mod/feedback/pages/form/form.ts b/src/addons/mod/feedback/pages/form/form.ts
index 5807d7e3e..8134221a6 100644
--- a/src/addons/mod/feedback/pages/form/form.ts
+++ b/src/addons/mod/feedback/pages/form/form.ts
@@ -16,7 +16,7 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { CoreSite } from '@classes/site';
 import { CoreContentLinksHelper } from '@features/contentlinks/services/contentlinks-helper';
 import { CoreCourse, CoreCourseCommonModWSOptions } from '@features/course/services/course';
-import { CoreCourseHelper, CoreCourseModuleData } from '@features/course/services/course-helper';
+import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CanLeave } from '@guards/can-leave';
 import { IonContent } from '@ionic/angular';
 import { CoreApp } from '@services/app';
@@ -53,7 +53,6 @@ export class AddonModFeedbackFormPage implements OnInit, OnDestroy, CanLeave {
 
     protected module?: CoreCourseModuleData;
     protected currentPage?: number;
-    protected siteAfterSubmit?: string;
     protected onlineObserver: Subscription;
     protected originalData?: Record<string, AddonModFeedbackResponseValue>;
     protected currentSite: CoreSite;
@@ -75,6 +74,7 @@ export class AddonModFeedbackFormPage implements OnInit, OnDestroy, CanLeave {
     hasNextPage = false;
     completed = false;
     completedOffline = false;
+    siteAfterSubmit?: string;
 
     constructor() {
         this.currentSite = CoreSites.getRequiredCurrentSite();
@@ -409,7 +409,7 @@ export class AddonModFeedbackFormPage implements OnInit, OnDestroy, CanLeave {
      */
     async continue(): Promise<void> {
         if (!this.siteAfterSubmit) {
-            return CoreCourseHelper.getAndOpenCourse(this.courseId, {}, this.currentSite.getId());
+            return CoreNavigator.back();
         }
 
         const modal = await CoreDomUtils.showModalLoading();
diff --git a/src/addons/mod/lesson/pages/player/player.html b/src/addons/mod/lesson/pages/player/player.html
index 3d0739c2f..adb7dd441 100644
--- a/src/addons/mod/lesson/pages/player/player.html
+++ b/src/addons/mod/lesson/pages/player/player.html
@@ -21,7 +21,7 @@
     <core-loading [hideUntil]="loaded">
         <!-- Info messages. Only show the first one. -->
         <ion-card class="core-info-card" *ngIf="lesson && messages?.length">
-            <ion-item>
+            <ion-item class="ion-text-wrap">
                 <ion-icon name="fas-info-circle" slot="start" aria-hidden="true"></ion-icon>
                 <ion-label>{{ messages[0].message }}</ion-label>
             </ion-item>
@@ -86,13 +86,12 @@
                         <!-- Essay. -->
                         <ng-container *ngSwitchCase="'essay'">
                             <ion-item *ngIf="question.textarea">
-                                <ion-label>
-                                    <core-rich-text-editor placeholder="{{ 'addon.mod_lesson.youranswer' | translate }}"
-                                        [control]="question.control" [component]="component" [componentId]="lesson?.coursemodule"
-                                        [autoSave]="true" contextLevel="module" [contextInstanceId]="lesson?.coursemodule"
-                                        elementId="answer_editor">
-                                    </core-rich-text-editor>
-                                </ion-label>
+                                <ion-label class="sr-only">{{ 'core.content' | translate }}</ion-label>
+                                <core-rich-text-editor placeholder="{{ 'addon.mod_lesson.youranswer' | translate }}"
+                                    [control]="question.control" [component]="component" [componentId]="lesson?.coursemodule"
+                                    [autoSave]="true" contextLevel="module" [contextInstanceId]="lesson?.coursemodule"
+                                    elementId="answer_editor">
+                                </core-rich-text-editor>
                             </ion-item>
                             <ion-item class="ion-text-wrap" *ngIf="!question.textarea && question.useranswer">
                                 <ion-label>
@@ -185,12 +184,12 @@
                         </core-progress-bar>
                     </ion-label>
                 </ion-item>
-                <div class="core-info-card" *ngIf="lesson?.progressbar && canManage">
-                    <ion-item>
+                <ion-card class="core-info-card" *ngIf="lesson?.progressbar && canManage">
+                    <ion-item class="ion-text-wrap">
                         <ion-icon name="fas-info-circle" slot="start" aria-hidden="true"></ion-icon>
                         <ion-label>{{ 'addon.mod_lesson.progressbarteacherwarning2' | translate }}</ion-label>
                     </ion-item>
-                </div>
+                </ion-card>
             </ion-list>
 
             <!-- End of lesson reached. -->
@@ -254,8 +253,8 @@
                     <ion-label>{{ eolData.modattemptsnoteacher.message }}</ion-label>
                 </ion-item>
                 <!-- If activity link was successfully formatted, render the button. -->
-                <ion-button *ngIf="activityLink && activityLink.formatted" expand="block" color="light" [href]="activityLink.href" core-link
-                    [capture]="true" class="ion-text-wrap ion-margin button-no-uppercase">
+                <ion-button *ngIf="activityLink && activityLink.formatted" expand="block" fill="outline" [href]="activityLink.href"
+                    core-link [capture]="true" class="ion-text-wrap ion-margin button-no-uppercase">
                     <core-format-text [text]="activityLink.label" contextLevel="module" [contextInstanceId]="lesson?.coursemodule"
                         [courseId]="courseId">
                     </core-format-text>
@@ -290,10 +289,10 @@
                     </ion-label>
                 </ion-item>
 
-                <ion-button expand="block" class="ion-text-wrap ion-margin" color="light" *ngIf="review" (click)="changePage(LESSON_EOL)">
+                <ion-button expand="block" class="ion-text-wrap ion-margin" *ngIf="review" (click)="changePage(LESSON_EOL)">
                     {{ 'addon.mod_lesson.finish' | translate }}
                 </ion-button>
-                <ion-button expand="block" class="ion-text-wrap ion-margin" color="light" *ngFor="let button of processDataButtons"
+                <ion-button expand="block" class="ion-text-wrap ion-margin" fill="outline" *ngFor="let button of processDataButtons"
                     (click)="changePage(button.pageId, true)">
                     {{ button.label | translate }}
                 </ion-button>
diff --git a/src/addons/mod/lesson/services/lesson-helper.ts b/src/addons/mod/lesson/services/lesson-helper.ts
index 669a9bd5b..1ec765591 100644
--- a/src/addons/mod/lesson/services/lesson-helper.ts
+++ b/src/addons/mod/lesson/services/lesson-helper.ts
@@ -557,7 +557,7 @@ export class AddonModLessonHelperProvider {
 
             // Add some HTML to the answer if needed.
             if (textarea) {
-                data[textarea.name] = CoreTextUtils.formatHtmlLines(<string> data[textarea.name]);
+                data[textarea.name] = CoreTextUtils.formatHtmlLines(<string> data[textarea.name] || '');
             }
         } else if (question.template == 'multichoice' && (<AddonModLessonMultichoiceQuestion> question).multi) {
             // Only send the options with value set to true.
diff --git a/src/addons/mod/quiz/components/navigation-modal/navigation-modal.html b/src/addons/mod/quiz/components/navigation-modal/navigation-modal.html
index 9899cb608..239b919fa 100644
--- a/src/addons/mod/quiz/components/navigation-modal/navigation-modal.html
+++ b/src/addons/mod/quiz/components/navigation-modal/navigation-modal.html
@@ -13,19 +13,6 @@
 <ion-content class="addon-mod_quiz-navigation-modal">
     <nav>
         <ion-list>
-            <!-- In player, show button to finish attempt. -->
-            <ion-item button class="ion-text-wrap" *ngIf="!isReview" (click)="loadPage(-1)" detail="true">
-                <ion-label>{{ 'addon.mod_quiz.finishattemptdots' | translate }}</ion-label>
-            </ion-item>
-
-            <!-- In review we can toggle between all questions in same page or one page at a time. -->
-            <ion-item button class="ion-text-wrap" *ngIf="isReview && numPages > 1" (click)="switchMode()" detail="true">
-                <ion-label>
-                    <span *ngIf="!showAll">{{ 'addon.mod_quiz.showall' | translate }}</span>
-                    <span *ngIf="showAll">{{ 'addon.mod_quiz.showeachpage' | translate }}</span>
-                </ion-label>
-            </ion-item>
-
             <ion-item button class="ion-text-wrap {{question.stateClass}}" *ngFor="let question of navigation"
                 [attr.aria-current]="!summaryShown && currentPage == question.page ? 'page' : 'false'"
                 (click)="loadPage(question.page, question.slot)" detail="false">
@@ -50,19 +37,12 @@
                     slot="end">
                 </ion-icon>
             </ion-item>
-
-            <!-- In player, show button to finish attempt. -->
-            <ion-item button class="ion-text-wrap" *ngIf="!isReview" (click)="loadPage(-1)" detail="true">
-                <ion-label>{{ 'addon.mod_quiz.finishattemptdots' | translate }}</ion-label>
-            </ion-item>
-
-            <!-- In review we can toggle between all questions in same page or one page at a time. -->
-            <ion-item button class="ion-text-wrap" *ngIf="isReview && numPages > 1" (click)="switchMode()" detail="true">
-                <ion-label>
-                    <span *ngIf="!showAll">{{ 'addon.mod_quiz.showall' | translate }}</span>
-                    <span *ngIf="showAll">{{ 'addon.mod_quiz.showeachpage' | translate }}</span>
-                </ion-label>
-            </ion-item>
         </ion-list>
     </nav>
 </ion-content>
+<ion-footer *ngIf="!isReview">
+    <!-- In player, show button to finish attempt. -->
+    <ion-button class="ion-text-wrap ion-margin" expand="block" (click)="loadPage(-1)">
+        {{ 'addon.mod_quiz.finishattemptdots' | translate }}
+    </ion-button>
+</ion-footer>
diff --git a/src/addons/mod/quiz/components/navigation-modal/navigation-modal.ts b/src/addons/mod/quiz/components/navigation-modal/navigation-modal.ts
index 92c958c0a..93fb6848c 100644
--- a/src/addons/mod/quiz/components/navigation-modal/navigation-modal.ts
+++ b/src/addons/mod/quiz/components/navigation-modal/navigation-modal.ts
@@ -26,15 +26,10 @@ import { ModalController } from '@singletons';
 })
 export class AddonModQuizNavigationModalComponent {
 
-    static readonly CHANGE_PAGE = 1;
-    static readonly SWITCH_MODE = 2;
-
     @Input() navigation?: AddonModQuizNavigationQuestion[]; // Whether the user is reviewing the attempt.
     @Input() summaryShown?: boolean; // Whether summary is currently being shown.
     @Input() currentPage?: number; // Current page.
     @Input() isReview?: boolean; // Whether the user is reviewing the attempt.
-    @Input() numPages = 0; // Num of pages for review mode.
-    @Input() showAll?: boolean; // Whether to show all questions in same page or not for review mode.
 
     /**
      * Close modal.
@@ -51,21 +46,11 @@ export class AddonModQuizNavigationModalComponent {
      */
     loadPage(page: number, slot?: number): void {
         ModalController.dismiss(<AddonModQuizNavigationModalReturn>{
-            action: AddonModQuizNavigationModalComponent.CHANGE_PAGE,
             page,
             slot,
         });
     }
 
-    /**
-     * Switch mode in review.
-     */
-    switchMode(): void {
-        ModalController.dismiss(<AddonModQuizNavigationModalReturn>{
-            action: AddonModQuizNavigationModalComponent.SWITCH_MODE,
-        });
-    }
-
 }
 
 /**
@@ -76,7 +61,6 @@ export type AddonModQuizNavigationQuestion = CoreQuestionQuestionParsed & {
 };
 
 export type AddonModQuizNavigationModalReturn = {
-    action: number;
     page?: number;
     slot?: number;
 };
diff --git a/src/addons/mod/quiz/pages/attempt/attempt.html b/src/addons/mod/quiz/pages/attempt/attempt.html
index 9454e17a9..c6a47f24d 100644
--- a/src/addons/mod/quiz/pages/attempt/attempt.html
+++ b/src/addons/mod/quiz/pages/attempt/attempt.html
@@ -53,15 +53,21 @@
                     </p>
                 </ion-label>
             </ion-item>
-            <ion-button *ngIf="showReviewColumn && attempt.finished" class="ion-margin" expand="block" (click)="reviewAttempt()">
-                <ion-icon name="fas-search" slot="start" aria-hidden="true"></ion-icon>
-                {{ 'addon.mod_quiz.review' | translate }}
-            </ion-button>
+
             <ion-item class="ion-text-wrap core-danger-item" *ngIf="!showReviewColumn">
                 <ion-label>
                     <p>{{ 'addon.mod_quiz.noreviewattempt' | translate }}</p>
                 </ion-label>
             </ion-item>
         </ion-list>
+
+        <div collapsible-footer *ngIf="loaded && attempt && showReviewColumn && attempt.finished" slot="fixed">
+            <div class="list-item-limited-width">
+                <ion-button class="ion-margin ion-text-wrap" expand="block" (click)="reviewAttempt()">
+                    <ion-icon name="fas-search" slot="start" aria-hidden="true"></ion-icon>
+                    {{ 'addon.mod_quiz.review' | translate }}
+                </ion-button>
+            </div>
+        </div>
     </core-loading>
 </ion-content>
diff --git a/src/addons/mod/quiz/pages/player/player.html b/src/addons/mod/quiz/pages/player/player.html
index b234f85ef..089a3ecf9 100644
--- a/src/addons/mod/quiz/pages/player/player.html
+++ b/src/addons/mod/quiz/pages/player/player.html
@@ -28,32 +28,10 @@
             <core-timer [endTime]="endTime" (finished)="timeUp()" [timerText]="'addon.mod_quiz.timeleft' | translate" [align]="'center'">
             </core-timer>
         </ion-title>
-        <ion-buttons slot="end">
-            <ion-button fill="clear" *ngIf="previousPage >= 0" (click)="changePage(previousPage)"
-                [attr.aria-label]="'core.previous' | translate">
-                <ion-icon name="fas-chevron-left" slot="icon-only" aria-hidden="true"></ion-icon>
-            </ion-button>
-            <ion-button *ngIf="nextPage >= -1" (click)="changePage(nextPage)" [attr.aria-label]="'core.next' | translate">
-                <ion-icon name="fas-chevron-right" slot="icon-only" aria-hidden="true"></ion-icon>
-            </ion-button>
-        </ion-buttons>
     </ion-toolbar>
 </ion-header>
 <ion-content>
     <core-loading [hideUntil]="loaded">
-        <!-- Navigation arrows if there's no timer. -->
-        <ion-toolbar *ngIf="!endTime && questions.length && !quizAborted && !showSummary" color="light">
-            <ion-buttons slot="end">
-                <ion-button fill="clear" *ngIf="previousPage >= 0" (click)="changePage(previousPage)"
-                    [attr.aria-label]="'core.previous' | translate">
-                    <ion-icon name="fas-chevron-left" slot="icon-only" aria-hidden="true"></ion-icon>
-                </ion-button>
-                <ion-button *ngIf="nextPage >= -1" (click)="changePage(nextPage)" [attr.aria-label]="'core.next' | translate">
-                    <ion-icon name="fas-chevron-right" slot="icon-only" aria-hidden="true"></ion-icon>
-                </ion-button>
-            </ion-buttons>
-        </ion-toolbar>
-
         <!-- Button to start attempting. -->
         <ion-button *ngIf="!attempt" expand="block" class="ion-margin" (click)="start()">
             {{ 'addon.mod_quiz.startattempt' | translate }}
@@ -89,22 +67,23 @@
         </form>
 
         <!-- Go to next or previous page. -->
-        <ion-grid class="ion-text-wrap" *ngIf="questions.length && !quizAborted && !showSummary">
-            <ion-row>
-                <ion-col *ngIf="previousPage >= 0">
-                    <ion-button expand="block" color="light" (click)="changePage(previousPage)">
-                        <ion-icon name="fas-chevron-left" slot="start" aria-hidden="true"></ion-icon>
-                        {{ 'core.previous' | translate }}
-                    </ion-button>
-                </ion-col>
-                <ion-col *ngIf="nextPage >= -1">
-                    <ion-button expand="block" (click)="changePage(nextPage)">
-                        {{ 'core.next' | translate }}
-                        <ion-icon name="fas-chevron-right" slot="end" aria-hidden="true"></ion-icon>
-                    </ion-button>
-                </ion-col>
-            </ion-row>
-        </ion-grid>
+        <ion-row *ngIf="questions.length && !quizAborted && !showSummary">
+            <ion-col *ngIf="previousPage >= 0">
+                <ion-button expand="block" fill="outline" (click)="changePage(previousPage)" class="ion-text-wrap">
+                    <ion-icon name="fas-chevron-left" slot="start" aria-hidden="true"></ion-icon>
+                    {{ 'core.previous' | translate }}
+                </ion-button>
+            </ion-col>
+            <ion-col *ngIf="nextPage >= -1">
+                <ion-button expand="block" (click)="changePage(nextPage)" class="ion-text-wrap" *ngIf="nextPage > 0">
+                    {{ 'core.next' | translate }}
+                    <ion-icon name="fas-chevron-right" slot="end" aria-hidden="true"></ion-icon>
+                </ion-button>
+                <ion-button expand="block" (click)="changePage(nextPage)" class="ion-text-wrap" *ngIf="nextPage == -1">
+                    {{ 'core.submit' | translate }}
+                </ion-button>
+            </ion-col>
+        </ion-row>
 
         <!-- Summary -->
         <ion-card *ngIf="!quizAborted && showSummary && summaryQuestions.length" class="addon-mod_quiz-table">
@@ -141,11 +120,6 @@
                 </ion-item>
             </ng-container>
 
-            <!-- Button to return to last page seen. -->
-            <ion-button *ngIf="canReturn" expand="block" class="ion-margin" (click)="changePage(attempt!.currentpage!)">
-                {{ 'addon.mod_quiz.returnattempt' | translate }}
-            </ion-button>
-
             <!-- Due date warning. -->
             <ion-item class="ion-text-wrap" *ngIf="dueDateWarning">
                 <ion-label>{{ dueDateWarning }}</ion-label>
@@ -162,17 +136,6 @@
                     <p *ngFor="let message of preventSubmitMessages">{{message}}</p>
                 </ion-label>
             </ion-item>
-
-            <ion-button *ngIf="preventSubmitMessages.length" expand="block" [href]="moduleUrl" core-link [showBrowserWarning]="false">
-                {{ 'core.openinbrowser' | translate }}
-                <ion-icon name="fas-external-link-alt" slot="end" aria-hidden="true"></ion-icon>
-            </ion-button>
-
-            <!-- Button to submit the quiz. -->
-            <ion-button *ngIf="!attempt!.finishedOffline && !preventSubmitMessages.length" expand="block" class="ion-margin"
-                (click)="finishAttempt(true)">
-                {{ 'addon.mod_quiz.submitallandfinish' | translate }}
-            </ion-button>
         </ion-card>
 
         <!-- Quiz aborted -->
@@ -180,10 +143,25 @@
             <ion-item class="ion-text-wrap">
                 <ion-label>{{ 'addon.mod_quiz.errorparsequestions' | translate }}</ion-label>
             </ion-item>
-            <ion-button expand="block" class="ion-margin" [href]="moduleUrl" core-link [showBrowserWarning]="false">
+            <ion-button *ngIf="canReturn" expand="block" class="ion-margin ion-text-wrap" fill="outline"
+                (click)="changePage(attempt!.currentpage!)">
+                {{ 'addon.mod_quiz.returnattempt' | translate }}
+            </ion-button>
+        </ion-card>
+
+        <div collapsible-footer *ngIf="!quizAborted && showSummary && summaryQuestions.length && loaded" slot="fixed"
+            class="list-item-limited-width">
+            <ion-button *ngIf="preventSubmitMessages.length" expand="block" class="ion-margin ion-text-wrap" [href]="moduleUrl" core-link
+                [showBrowserWarning]="false">
                 {{ 'core.openinbrowser' | translate }}
                 <ion-icon name="fas-external-link-alt" slot="end" aria-hidden="true"></ion-icon>
             </ion-button>
-        </ion-card>
+
+            <!-- Button to submit the quiz. -->
+            <ion-button *ngIf="!attempt!.finishedOffline && !preventSubmitMessages.length" expand="block" class="ion-margin ion-text-wrap"
+                (click)="finishAttempt(true)">
+                {{ 'addon.mod_quiz.submitallandfinish' | translate }}
+            </ion-button>
+        </div>
     </core-loading>
 </ion-content>
diff --git a/src/addons/mod/quiz/pages/player/player.page.ts b/src/addons/mod/quiz/pages/player/player.page.ts
index 16e1a22de..d022c6d5e 100644
--- a/src/addons/mod/quiz/pages/player/player.page.ts
+++ b/src/addons/mod/quiz/pages/player/player.page.ts
@@ -602,9 +602,11 @@ export class AddonModQuizPlayerPage implements OnInit, OnDestroy, CanLeave {
             },
         });
 
-        if (modalData && modalData.action == AddonModQuizNavigationModalComponent.CHANGE_PAGE) {
-            this.changePage(modalData.page!, true, modalData.slot);
+        if (!modalData) {
+            return;
         }
+
+        this.changePage(modalData.page!, true, modalData.slot);
     }
 
     /**
diff --git a/src/addons/mod/quiz/pages/review/review.html b/src/addons/mod/quiz/pages/review/review.html
index 068dc2a6f..38286d18a 100644
--- a/src/addons/mod/quiz/pages/review/review.html
+++ b/src/addons/mod/quiz/pages/review/review.html
@@ -87,8 +87,6 @@
 
         <!-- Questions -->
         <div *ngIf="attempt && questions.length">
-            <!-- Arrows to go to next/previous. -->
-            <ng-container *ngTemplateOutlet="navArrows"></ng-container>
 
             <!-- Questions. -->
             <div *ngFor="let question of questions">
@@ -113,28 +111,30 @@
                     </core-question>
                 </ion-card>
             </div>
+        </div>
 
-            <!-- Arrows to go to next/previous. -->
-            <ng-container *ngTemplateOutlet="navArrows"></ng-container>
+        <div collapsible-footer *ngIf="loaded && numPages > 1" slot="fixed">
+            <ion-row class="ion-justify-content-between ion-align-items-center ion-no-padding ion-wrap">
+                <ion-col class="ion-text-start ion-no-padding core-navigation-arrow" size="auto" *ngIf="!showAll">
+                    <ion-button [disabled]="previousPage < 0" fill="clear" color="dark" [attr.aria-label]="'core.previous' | translate"
+                        (click)="changePage(previousPage)">
+                        <ion-icon name="fas-chevron-left" slot="icon-only" aria-hidden="true"></ion-icon>
+                    </ion-button>
+                </ion-col>
+                <ion-col class="ion-text-center">
+                    <!-- In review we can toggle between all questions in same page or one page at a time. -->
+                    <ion-button class="ion-text-wrap" *ngIf="numPages > 1" (click)="switchMode()" fill="outline">
+                        <span *ngIf="!showAll">{{ 'addon.mod_quiz.showall' | translate }}</span>
+                        <span *ngIf="showAll">{{ 'addon.mod_quiz.showeachpage' | translate }}</span>
+                    </ion-button>
+                </ion-col>
+                <ion-col class="ion-text-end ion-no-padding core-navigation-arrow" size="auto" *ngIf="!showAll">
+                    <ion-button [disabled]="nextPage >= numPages" fill="clear" color="dark" [attr.aria-label]="'core.next' | translate"
+                        (click)="changePage(nextPage)">
+                        <ion-icon name="fas-chevron-right" slot="icon-only" aria-hidden="true"></ion-icon>
+                    </ion-button>
+                </ion-col>
+            </ion-row>
         </div>
     </core-loading>
 </ion-content>
-
-<!-- Arrows to go to next/previous. -->
-<ng-template #navArrows>
-    <ion-grid>
-        <ion-row class="ion-align-items-center">
-            <ion-col class="ion-text-start">
-                <ion-button fill="outline" *ngIf="previousPage >= 0" (click)="changePage(previousPage)"
-                    [title]="'core.previous' | translate">
-                    <ion-icon name="fas-chevron-left" slot="icon-only" aria-hidden="true"></ion-icon>
-                </ion-button>
-            </ion-col>
-            <ion-col class="ion-text-end">
-                <ion-button *ngIf="nextPage >= -1" (click)="changePage(nextPage)" [attr.aria-label]="'core.next' | translate">
-                    <ion-icon name="fas-chevron-right" slot="icon-only" aria-hidden="true"></ion-icon>
-                </ion-button>
-            </ion-col>
-        </ion-row>
-    </ion-grid>
-</ng-template>
diff --git a/src/addons/mod/quiz/pages/review/review.page.ts b/src/addons/mod/quiz/pages/review/review.page.ts
index 07fb1c5cd..04b7bb7a7 100644
--- a/src/addons/mod/quiz/pages/review/review.page.ts
+++ b/src/addons/mod/quiz/pages/review/review.page.ts
@@ -53,7 +53,7 @@ export class AddonModQuizReviewPage implements OnInit {
     attempt?: AddonModQuizAttemptWSData; // The attempt being reviewed.
     component = AddonModQuizProvider.COMPONENT; // Component to link the files to.
     showAll = false; // Whether to view all questions in the same page.
-    numPages?: number; // Number of pages.
+    numPages = 1; // Number of pages.
     showCompleted = false; // Whether to show completed time.
     additionalData?: AddonModQuizWSAdditionalData[]; // Additional data to display for the attempt.
     loaded = false; // Whether data has been loaded.
@@ -112,10 +112,9 @@ export class AddonModQuizReviewPage implements OnInit {
      * Change the current page. If slot is supplied, try to scroll to that question.
      *
      * @param page Page to load. -1 means all questions in same page.
-     * @param fromModal Whether the page was selected using the navigation modal.
      * @param slot Slot of the question to scroll to.
      */
-    async changePage(page: number, fromModal?: boolean, slot?: number): Promise<void> {
+    async changePage(page: number, slot?: number): Promise<void> {
         if (slot !== undefined && (this.attempt!.currentpage == -1 || page == this.currentPage)) {
             // Scrol to a certain question in the current page.
             this.scrollToQuestion(slot);
@@ -183,7 +182,7 @@ export class AddonModQuizReviewPage implements OnInit {
         this.setSummaryCalculatedData(data);
 
         this.questions = data.questions;
-        this.nextPage = page == -1 ? -2 : page + 1;
+        this.nextPage = page + 1;
         this.previousPage = page - 1;
 
         this.questions.forEach((question) => {
@@ -341,8 +340,6 @@ export class AddonModQuizReviewPage implements OnInit {
                 summaryShown: false,
                 currentPage: this.attempt?.currentpage,
                 isReview: true,
-                numPages: this.numPages,
-                showAll: this.showAll,
             },
         });
 
@@ -350,11 +347,7 @@ export class AddonModQuizReviewPage implements OnInit {
             return;
         }
 
-        if (modalData.action == AddonModQuizNavigationModalComponent.CHANGE_PAGE) {
-            this.changePage(modalData.page!, true, modalData.slot);
-        } else if (modalData.action == AddonModQuizNavigationModalComponent.SWITCH_MODE) {
-            this.switchMode();
-        }
+        this.changePage(modalData.page!, modalData.slot);
     }
 
 }
diff --git a/src/addons/qtype/essay/services/handlers/essay.ts b/src/addons/qtype/essay/services/handlers/essay.ts
index 707c9737e..94b3912b0 100644
--- a/src/addons/qtype/essay/services/handlers/essay.ts
+++ b/src/addons/qtype/essay/services/handlers/essay.ts
@@ -516,7 +516,7 @@ export class AddonQtypeEssayHandlerService implements CoreQuestionHandler {
 
         if (!isPlainText) {
             // Add some HTML to the text if needed.
-            answers[textarea.name] = CoreTextUtils.formatHtmlLines(<string> answers[textarea.name]);
+            answers[textarea.name] = CoreTextUtils.formatHtmlLines(<string> answers[textarea.name] || '');
         }
     }
 
diff --git a/src/core/components/timer/timer.scss b/src/core/components/timer/timer.scss
index 077ea389d..c7c9cc39c 100644
--- a/src/core/components/timer/timer.scss
+++ b/src/core/components/timer/timer.scss
@@ -6,6 +6,7 @@ $core-timer-iterations: 15 !default;
 :host {
     .core-timer {
         --background: transparent !important;
+        border-radius: var(--big-radius);
 
         .core-timer-time-left, .core-timesup {
             font-weight: bold;
diff --git a/src/core/features/course/lang.json b/src/core/features/course/lang.json
index 554f22f43..efa7b5613 100644
--- a/src/core/features/course/lang.json
+++ b/src/core/features/course/lang.json
@@ -35,9 +35,9 @@
     "errordownloadingsection": "Error downloading section.",
     "errorgetmodule": "Error getting activity data.",
     "failed": "Failed",
-    "gotonextactivity": "Continue to next activity",
+    "gotonextactivity": "Go to next activity",
     "gotonextactivitynotfound": "Next activity not found. It's possible that it has been hidden or deleted.",
-    "gotopreviousactivity": "Continue to previous activity",
+    "gotopreviousactivity": "Go to previous activity",
     "gotopreviousactivitynotfound": "Previous activity not found. It's possible that it has been hidden or deleted.",
     "hiddenfromstudents": "Hidden from students",
     "hiddenoncoursepage": "Available but not shown on course page",

From 521d4cec4b37951c8d705f26c0f90c34f50fdb56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 25 Feb 2022 16:39:08 +0100
Subject: [PATCH 0615/1008] MOBILE-3149 style: Add spacers

---
 src/addons/mod/feedback/pages/form/form.html  |  6 +--
 src/addons/mod/quiz/pages/player/player.html  |  4 +-
 src/core/components/loading/loading.scss      |  6 +++
 .../core-course-unsupported-module.html       | 41 ++++++++++---------
 .../unsupported-module.scss                   |  3 ++
 .../unsupported-module/unsupported-module.ts  |  1 +
 .../pages/module-preview/module-preview.html  |  2 +-
 src/theme/theme.base.scss                     | 15 +++++++
 8 files changed, 53 insertions(+), 25 deletions(-)
 create mode 100644 src/core/features/course/components/unsupported-module/unsupported-module.scss

diff --git a/src/addons/mod/feedback/pages/form/form.html b/src/addons/mod/feedback/pages/form/form.html
index e2a2a4079..82446c6ad 100644
--- a/src/addons/mod/feedback/pages/form/form.html
+++ b/src/addons/mod/feedback/pages/form/form.html
@@ -12,9 +12,9 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <core-loading [hideUntil]="feedbackLoaded">
+    <core-loading [hideUntil]="feedbackLoaded" class="has-spacer">
         <ng-container *ngIf="items && items.length">
-            <ion-list class="ion-no-margin">
+            <ion-list class="ion-no-margin has-spacer">
                 <ion-item class="ion-text-wrap">
                     <ion-label>
                         <h2>{{ 'addon.mod_feedback.mode' | translate }}</h2>
@@ -110,7 +110,7 @@
                     </ng-container>
                 </ng-container>
 
-                <ion-row class="ion-align-items-center" *ngIf="!preview">
+                <ion-row class="ion-align-items-center spacer-top" *ngIf="!preview">
                     <ion-col *ngIf="hasPrevPage">
                         <ion-button expand="block" fill="outline" (click)="gotoPage(true)" class="ion-text-wrap">
                             <ion-icon name="fas-chevron-left" slot="start" aria-hidden="true"></ion-icon>
diff --git a/src/addons/mod/quiz/pages/player/player.html b/src/addons/mod/quiz/pages/player/player.html
index 089a3ecf9..94d0aa3be 100644
--- a/src/addons/mod/quiz/pages/player/player.html
+++ b/src/addons/mod/quiz/pages/player/player.html
@@ -31,7 +31,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <core-loading [hideUntil]="loaded">
+    <core-loading [hideUntil]="loaded" class="has-spacer">
         <!-- Button to start attempting. -->
         <ion-button *ngIf="!attempt" expand="block" class="ion-margin" (click)="start()">
             {{ 'addon.mod_quiz.startattempt' | translate }}
@@ -67,7 +67,7 @@
         </form>
 
         <!-- Go to next or previous page. -->
-        <ion-row *ngIf="questions.length && !quizAborted && !showSummary">
+        <ion-row *ngIf="questions.length && !quizAborted && !showSummary" class="spacer-top">
             <ion-col *ngIf="previousPage >= 0">
                 <ion-button expand="block" fill="outline" (click)="changePage(previousPage)" class="ion-text-wrap">
                     <ion-icon name="fas-chevron-left" slot="start" aria-hidden="true"></ion-icon>
diff --git a/src/core/components/loading/loading.scss b/src/core/components/loading/loading.scss
index bd77cefd5..a843495ec 100644
--- a/src/core/components/loading/loading.scss
+++ b/src/core/components/loading/loading.scss
@@ -75,6 +75,12 @@
         height: 100%;
     }
 
+    &.has-spacer .core-loading-content {
+        min-height: 100%;
+        display: flex;
+        flex-direction: column;
+    }
+
     &.safe-area-padding:not(.core-loading-inline) .core-loading-content,
     &.safe-area-padding-horizontal:not(.core-loading-inline) .core-loading-content {
         @include safe-area-padding-horizontal(0px, 0px);
diff --git a/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html b/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html
index f8b7bd52f..92a7d5562 100644
--- a/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html
+++ b/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html
@@ -1,22 +1,25 @@
-<ion-card class="core-danger-card">
-    <ion-item>
-        <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
+<div class="has-spacer">
+    <ion-card class="core-danger-card">
+        <ion-item>
+            <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
+            <ion-label>
+                <p><strong>{{ 'core.uhoh' | translate }} </strong>
+                    <ng-container *ngIf="isDisabledInSite">{{ 'core.course.activitydisabled' | translate }}</ng-container>
+                    <ng-container *ngIf="!isDisabledInSite">
+                        {{ 'core.course.activitynotyetviewableremoteaddon' | translate }}
+                    </ng-container>
+                </p>
+            </ion-label>
+        </ion-item>
+    </ion-card>
+    <div class="spacer"></div>
+    <ion-item lines="none" class="ion-text-wrap" *ngIf="module?.url && module?.uservisible">
         <ion-label>
-            <p><strong>{{ 'core.uhoh' | translate }} </strong>
-                <ng-container *ngIf="isDisabledInSite">{{ 'core.course.activitydisabled' | translate }}</ng-container>
-                <ng-container *ngIf="!isDisabledInSite">
-                    {{ 'core.course.activitynotyetviewableremoteaddon' | translate }}
-                </ng-container>
-            </p>
+            <p>{{ 'core.course.useactivityonbrowser' | translate }}</p>
+            <ion-button expand="block" [href]="module?.url" core-link [showBrowserWarning]="false">
+                {{ 'core.openinbrowser' | translate }}
+                <ion-icon name="fas-external-link-alt" slot="end" aria-hidden="true"></ion-icon>
+            </ion-button>
         </ion-label>
     </ion-item>
-</ion-card>
-<ion-item lines="none" class="ion-text-wrap" *ngIf="module?.url && module?.uservisible">
-    <ion-label>
-        <p>{{ 'core.course.useactivityonbrowser' | translate }}</p>
-        <ion-button expand="block" [href]="module?.url" core-link [showBrowserWarning]="false">
-            {{ 'core.openinbrowser' | translate }}
-            <ion-icon name="fas-external-link-alt" slot="end" aria-hidden="true"></ion-icon>
-        </ion-button>
-    </ion-label>
-</ion-item>
+</div>
diff --git a/src/core/features/course/components/unsupported-module/unsupported-module.scss b/src/core/features/course/components/unsupported-module/unsupported-module.scss
new file mode 100644
index 000000000..b7ca8fa44
--- /dev/null
+++ b/src/core/features/course/components/unsupported-module/unsupported-module.scss
@@ -0,0 +1,3 @@
+:host {
+    display: contents;
+}
diff --git a/src/core/features/course/components/unsupported-module/unsupported-module.ts b/src/core/features/course/components/unsupported-module/unsupported-module.ts
index 15c3e7902..ab4892af8 100644
--- a/src/core/features/course/components/unsupported-module/unsupported-module.ts
+++ b/src/core/features/course/components/unsupported-module/unsupported-module.ts
@@ -23,6 +23,7 @@ import { CoreCourseModuleDelegate } from '@features/course/services/module-deleg
 @Component({
     selector: 'core-course-unsupported-module',
     templateUrl: 'core-course-unsupported-module.html',
+    styleUrls: ['unsupported-module.scss'],
 })
 export class CoreCourseUnsupportedModuleComponent implements OnInit {
 
diff --git a/src/core/features/course/pages/module-preview/module-preview.html b/src/core/features/course/pages/module-preview/module-preview.html
index 60efcbee6..cd47cd96d 100644
--- a/src/core/features/course/pages/module-preview/module-preview.html
+++ b/src/core/features/course/pages/module-preview/module-preview.html
@@ -22,7 +22,7 @@
     <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <core-loading [hideUntil]="loaded">
+    <core-loading [hideUntil]="loaded" class="has-spacer">
         <core-course-module-info [module]="module" [courseId]="courseId" [description]="module.description" [component]="module.modname"
             [componentId]="module.id" [expandDescription]="true" [showAvailabilityInfo]="true">
             <div class="core-module-additional-info" title>
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 58b86f8a2..a48641aba 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -1581,3 +1581,18 @@ body.core-iframe-fullscreen ion-content {
 
 
 }
+
+.has-spacer {
+    display: flex;
+    flex-direction: column;
+    min-height: 100%;
+    flex-grow: 1;
+
+    .spacer-top {
+        flex-grow: 1;
+        align-content: flex-end;
+    }
+    .spacer {
+        flex-grow: 1;
+    }
+}

From 952bfd1ddf8b2c2c20d9549edd4de915cecd95e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 28 Feb 2022 10:15:53 +0100
Subject: [PATCH 0616/1008] MOBILE-3149 module: Show 2-buttons on row on
 collapsible footer

---
 .../components/index/index.html               |  2 +-
 .../index/addon-mod-choice-index.html         |  2 +-
 .../index/addon-mod-feedback-index.html       |  3 ++-
 src/addons/mod/feedback/pages/form/form.html  |  2 +-
 .../index/addon-mod-scorm-index.html          | 20 ++++++++++---------
 src/theme/theme.base.scss                     | 10 ++++++++++
 6 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/addons/mod/bigbluebuttonbn/components/index/index.html b/src/addons/mod/bigbluebuttonbn/components/index/index.html
index 1463c7c65..b960f1f79 100644
--- a/src/addons/mod/bigbluebuttonbn/components/index/index.html
+++ b/src/addons/mod/bigbluebuttonbn/components/index/index.html
@@ -103,7 +103,7 @@
     </ng-container>
 
     <div collapsible-footer *ngIf="!showLoading" slot="fixed">
-        <div class="list-item-limited-width"
+        <div class="list-item-limited-width adaptable-buttons-row"
             *ngIf="meetingInfo && (meetingInfo.canjoin || meetingInfo.statusrunning && meetingInfo.ismoderator)">
             <ion-button *ngIf="meetingInfo.statusrunning && meetingInfo.ismoderator" fill="outline" class="ion-margin ion-text-wrap"
                 expand="block" (click)="endMeeting()">
diff --git a/src/addons/mod/choice/components/index/addon-mod-choice-index.html b/src/addons/mod/choice/components/index/addon-mod-choice-index.html
index be4e8eb0b..715d95fc2 100644
--- a/src/addons/mod/choice/components/index/addon-mod-choice-index.html
+++ b/src/addons/mod/choice/components/index/addon-mod-choice-index.html
@@ -136,7 +136,7 @@
 
 
     <div collapsible-footer *ngIf="!showLoading" slot="fixed">
-        <div class="list-item-limited-width" *ngIf="options.length && choice && (canEdit || canDelete)">
+        <div class="list-item-limited-width adaptable-buttons-row" *ngIf="options.length && choice && (canEdit || canDelete)">
             <ion-button *ngIf="canDelete" expand="block" fill="outline" (click)="delete()" class="ion-margin ion-text-wrap">
                 {{ 'addon.mod_choice.removemychoice' | translate }}
             </ion-button>
diff --git a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
index bf91cdaec..7a1c4b742 100644
--- a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
+++ b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
@@ -35,7 +35,8 @@
     </core-tabs>
 
     <div collapsible-footer *ngIf="!showLoading" slot="fixed">
-        <div class="list-item-limited-width" *ngIf="access && (access.canedititems || access.canviewreports || !access.isempty)">
+        <div class="list-item-limited-width adaptable-buttons-row"
+            *ngIf="access && (access.canedititems || access.canviewreports || !access.isempty)">
             <ion-button expand="block" fill="outline" (click)="gotoAnswerQuestions(true)" class="ion-margin ion-text-wrap">
                 <ion-icon name="fas-search" slot="start" aria-hidden="true"></ion-icon>
                 {{ 'addon.mod_feedback.preview' | translate }}
diff --git a/src/addons/mod/feedback/pages/form/form.html b/src/addons/mod/feedback/pages/form/form.html
index 82446c6ad..99d48dd4e 100644
--- a/src/addons/mod/feedback/pages/form/form.html
+++ b/src/addons/mod/feedback/pages/form/form.html
@@ -150,7 +150,7 @@
         </ion-card>
 
         <div collapsible-footer *ngIf="feedbackLoaded && completed" slot="fixed">
-            <div class="list-item-limited-width">
+            <div class="list-item-limited-width adaptable-buttons-row">
                 <ion-button expand="block" fill="outline" (click)="showAnalysis()" class="ion-text-wrap ion-margin"
                     *ngIf="access!.canviewanalysis">
                     <ion-icon name="fas-chart-bar" slot="start" aria-hidden="true"></ion-icon>
diff --git a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
index 0c2f0ea6c..953256c40 100644
--- a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
+++ b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
@@ -197,15 +197,17 @@
                         </ion-label>
                     </ion-item>
 
-                    <!-- Open mode (Preview or Normal) -->
-                    <ion-button *ngIf="!scorm.hidebrowse" expand="block" fill="outline" (click)="open($event, true)"
-                        class="ion-text-wrap ion-margin">
-                        <ion-icon name="fas-search" slot="start" aria-hidden="true"></ion-icon>
-                        {{ 'addon.mod_scorm.browse' | translate }}
-                    </ion-button>
-                    <ion-button expand="block" (click)="open($event)" class="ion-text-wrap ion-margin">
-                        {{ 'addon.mod_scorm.enter' | translate }}
-                    </ion-button>
+                    <div class="adaptable-buttons-row">
+                        <!-- Open mode (Preview or Normal) -->
+                        <ion-button *ngIf="!scorm.hidebrowse" expand="block" fill="outline" (click)="open($event, true)"
+                            class="ion-text-wrap ion-margin">
+                            <ion-icon name="fas-search" slot="start" aria-hidden="true"></ion-icon>
+                            {{ 'addon.mod_scorm.browse' | translate }}
+                        </ion-button>
+                        <ion-button expand="block" (click)="open($event)" class="ion-text-wrap ion-margin">
+                            {{ 'addon.mod_scorm.enter' | translate }}
+                        </ion-button>
+                    </div>
                 </ng-container>
 
                 <!-- Download progress. -->
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index a48641aba..a9b897801 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -1467,6 +1467,16 @@ ion-grid.core-no-grid > ion-row {
     height: 0 !important;
 }
 
+@include media-breakpoint-up(md) {
+    .adaptable-buttons-row {
+        display: flex;
+        flex-direction: row;
+        ion-button {
+            flex: 1;
+        }
+    }
+}
+
 ion-header.no-title {
     --core-header-toolbar-border-width: 0;
     --core-header-toolbar-background: transparent;

From 223fd19f1dbfda33ba0d439237039bc3df5ea620 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 25 Feb 2022 10:25:24 +0100
Subject: [PATCH 0617/1008] MOBILE-3998 imscp: Add entry page to IMSCP

---
 src/addons/mod/book/components/index/index.ts |   2 +-
 .../mod/book/pages/contents/contents.ts       |   4 +-
 .../index/addon-mod-imscp-index.html          |  37 ++-
 .../mod/imscp/components/index/index.ts       | 113 +++-----
 src/addons/mod/imscp/imscp-lazy.module.ts     |   4 +
 src/addons/mod/imscp/pages/view/view.html     |  39 +++
 .../mod/imscp/pages/view/view.module.ts       |  38 +++
 src/addons/mod/imscp/pages/view/view.ts       | 273 ++++++++++++++++++
 8 files changed, 424 insertions(+), 86 deletions(-)
 create mode 100644 src/addons/mod/imscp/pages/view/view.html
 create mode 100644 src/addons/mod/imscp/pages/view/view.module.ts
 create mode 100644 src/addons/mod/imscp/pages/view/view.ts

diff --git a/src/addons/mod/book/components/index/index.ts b/src/addons/mod/book/components/index/index.ts
index b8d7f4bea..09263edda 100644
--- a/src/addons/mod/book/components/index/index.ts
+++ b/src/addons/mod/book/components/index/index.ts
@@ -92,7 +92,7 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
     /**
      * Open the book in a certain chapter.
      *
-     * @param chapterId Chapter to open, undefined for first chapter.
+     * @param chapterId Chapter to open, undefined for last chapter viewed.
      */
     openBook(chapterId?: number): void {
         CoreNavigator.navigate('contents', {
diff --git a/src/addons/mod/book/pages/contents/contents.ts b/src/addons/mod/book/pages/contents/contents.ts
index 21436d557..e32661914 100644
--- a/src/addons/mod/book/pages/contents/contents.ts
+++ b/src/addons/mod/book/pages/contents/contents.ts
@@ -53,7 +53,7 @@ export class AddonModBookContentsPage implements OnInit, OnDestroy {
 
     @ViewChild(CoreSwipeSlidesComponent) slides?: CoreSwipeSlidesComponent;
 
-    title!: string;
+    title = '';
     cmId!: number;
     courseId!: number;
     initialChapterId?: number;
@@ -147,6 +147,8 @@ export class AddonModBookContentsPage implements OnInit, OnDestroy {
             } else {
                 this.warning = '';
             }
+        } catch (error) {
+            CoreDomUtils.showErrorModalDefault(error, 'core.course.errorgetmodule', true);
         } finally {
             this.loaded = true;
         }
diff --git a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
index e4cfff579..0f43d70d2 100644
--- a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
+++ b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
@@ -1,9 +1,5 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <ion-button *ngIf="!showLoading" (click)="showToc()" aria-haspopup="true" [attr.aria-label]="'addon.mod_imscp.toc' | translate">
-        <ion-icon name="fas-bookmark" slot="icon-only" aria-hidden="true"></ion-icon>
-    </ion-button>
-
     <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.info' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
@@ -13,24 +9,35 @@
 <core-loading [hideUntil]="!showLoading" class="safe-area-padding core-loading-full-height">
 
     <!-- Activity info. -->
-    <core-course-module-info [module]="module">
+    <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
+        [courseId]="courseId">
     </core-course-module-info>
 
-    <ion-card class="core-warning-card" *ngIf="warning">
+    <ion-list>
         <ion-item>
-            <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
-            <ion-label><span [innerHTML]="warning"></span></ion-label>
+            <ion-label>
+                <h2>{{ 'addon.mod_imscp.toc' | translate }}</h2>
+            </ion-label>
         </ion-item>
-    </ion-card>
 
-    <div class="addon-mod-imscp-container">
-        <core-iframe *ngIf="!showLoading" [src]="src" [showFullscreenOnToolbar]="true" [autoFullscreenOnRotate]="true"></core-iframe>
-    </div>
+        <ion-item class="ion-text-wrap" *ngFor="let item of items" (click)="openImscp(item.href)" button detail="true">
+            <ion-label [class.core-bold]="!item.href">
+                <p>
+                    <span class="ion-padding-start" *ngFor="let i of getNumberForPadding(item.level)"></span>
+                    {{item.title}}
+                </p>
+            </ion-label>
+        </ion-item>
+    </ion-list>
 
     <div collapsible-footer *ngIf="!showLoading" slot="fixed">
-        <!-- TODO Add a contents page to avoid having both bars. Please add here start/resume buttons. -->
-        <core-navigation-bar *ngIf="navigationItems.length > 1" [items]="navigationItems" (action)="loadItem($event)">
-        </core-navigation-bar>
+        <div class="list-item-limited-width">
+            <ion-button class="ion-margin ion-text-wrap" expand="block" (click)="openImscp()">
+                <span *ngIf="!hasStarted">{{ 'core.start' | translate }}</span>
+                <span *ngIf="hasStarted">{{ 'core.resume' | translate }}</span>
+            </ion-button>
+        </div>
+
         <core-course-module-navigation [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
         </core-course-module-navigation>
     </div>
diff --git a/src/addons/mod/imscp/components/index/index.ts b/src/addons/mod/imscp/components/index/index.ts
index 78df65bac..8538b3e54 100644
--- a/src/addons/mod/imscp/components/index/index.ts
+++ b/src/addons/mod/imscp/components/index/index.ts
@@ -13,14 +13,11 @@
 // limitations under the License.
 
 import { Component, OnInit, Optional } from '@angular/core';
-import { CoreSilentError } from '@classes/errors/silenterror';
-import { CoreNavigationBarItem } from '@components/navigation-bar/navigation-bar';
 import { CoreCourseModuleMainResourceComponent } from '@features/course/classes/main-resource-component';
 import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
 import { CoreCourse } from '@features/course/services/course';
-import { CoreDomUtils } from '@services/utils/dom';
+import { CoreNavigator } from '@services/navigator';
 import { AddonModImscpProvider, AddonModImscp, AddonModImscpTocItem } from '../../services/imscp';
-import { AddonModImscpTocComponent } from '../toc/toc';
 
 /**
  * Component that displays a IMSCP.
@@ -33,13 +30,9 @@ import { AddonModImscpTocComponent } from '../toc/toc';
 export class AddonModImscpIndexComponent extends CoreCourseModuleMainResourceComponent implements OnInit {
 
     component = AddonModImscpProvider.COMPONENT;
-    src = '';
-    warning = '';
-    navigationItems: CoreNavigationBarItem<AddonModImscpTocItem>[] = [];
 
-    protected items: AddonModImscpTocItem[] = [];
-    protected currentHref?: string;
-    protected displayDescription = false;
+    items: AddonModImscpTocItem[] = [];
+    hasStarted = false;
 
     constructor(@Optional() courseContentsPage?: CoreCourseContentsPage) {
         super('AddonModImscpIndexComponent', courseContentsPage);
@@ -73,85 +66,67 @@ export class AddonModImscpIndexComponent extends CoreCourseModuleMainResourceCom
     /**
      * @inheritdoc
      */
-    protected async fetchContent(refresh = false): Promise<void> {
-        const downloadResult = await this.downloadResourceIfNeeded(refresh);
-
-        const imscp = await AddonModImscp.getImscp(this.courseId, this.module.id);
-        this.description = imscp.intro;
-        this.dataRetrieved.emit(imscp);
-
-        // Get contents. No need to refresh, it has been done in downloadResourceIfNeeded.
-        const contents = await CoreCourse.getModuleContents(this.module);
-
-        this.items = AddonModImscp.createItemList(contents);
-
-        if (this.items.length && this.currentHref === undefined) {
-            this.currentHref = this.items[0].href;
-        }
-
-        try {
-            await this.loadItemHref(this.currentHref);
-        } catch (error) {
-            CoreDomUtils.showErrorModalDefault(error, 'addon.mod_imscp.deploymenterror', true);
-
-            throw new CoreSilentError(error);
-        }
-
-        this.warning = downloadResult.failed ? this.getErrorDownloadingSomeFilesMessage(downloadResult.error!) : '';
+    protected async fetchContent(): Promise<void> {
+        await Promise.all([
+            this.loadImscp(),
+            this.loadTOC(),
+        ]);
     }
 
     /**
-     * Loads an item.
+     * Load IMSCP data.
      *
-     * @param itemHref Item Href.
      * @return Promise resolved when done.
      */
-    async loadItemHref(itemHref?: string): Promise<void> {
-        const src = await AddonModImscp.getIframeSrc(this.module, itemHref);
-        this.currentHref = itemHref;
+    protected async loadImscp(): Promise<void> {
+        const imscp = await AddonModImscp.getImscp(this.courseId, this.module.id);
 
-        this.navigationItems = this.items.map((item) => ({
-            item: item,
-            current: item.href == this.currentHref,
-            enabled: !!item.href,
-        }));
+        this.dataRetrieved.emit(imscp);
 
-        if (this.src && src == this.src) {
-            // Re-loading same page. Set it to empty and then re-set the src in the next digest so it detects it has changed.
-            this.src = '';
-            setTimeout(() => {
-                this.src = src;
-            });
-        } else {
-            this.src = src;
-        }
+        this.dataRetrieved.emit(imscp);
+
+        this.description = imscp.intro;
+
+        // @todo: Check if user already started the IMSCP.
     }
 
     /**
-     * Loads an item.
+     * Load book TOC.
      *
-     * @param item Item.
+     * @return Promise resolved when done.
      */
-    loadItem(item: AddonModImscpTocItem): void {
-        this.loadItemHref(item.href);
+    protected async loadTOC(): Promise<void> {
+        // Get contents. No need to refresh, it has been done in downloadResourceIfNeeded.
+        const contents = await CoreCourse.getModuleContents(this.module, this.courseId);
+
+        this.items = AddonModImscp.createItemList(contents);
     }
 
     /**
-     * Show the TOC.
+     * Open IMSCP book with a certain item.
+     *
+     * @param href Item href to open, undefined for last item seen.
      */
-    async showToc(): Promise<void> {
-        // Create the toc modal.
-        const modalData = await CoreDomUtils.openSideModal<string>({
-            component: AddonModImscpTocComponent,
-            componentProps: {
-                items: this.items,
-                selected: this.currentHref,
+    openImscp(href?: string): void {
+        CoreNavigator.navigate('view', {
+            params: {
+                cmId: this.module.id,
+                courseId: this.courseId,
+                initialHref: href,
             },
         });
 
-        if (modalData) {
-            this.loadItemHref(modalData);
-        }
+        this.hasStarted = true;
+    }
+
+    /**
+     * Get dummy array for padding.
+     *
+     * @param n Array length.
+     * @return Dummy array with n elements.
+     */
+    getNumberForPadding(n: number): number[] {
+        return new Array(n);
     }
 
 }
diff --git a/src/addons/mod/imscp/imscp-lazy.module.ts b/src/addons/mod/imscp/imscp-lazy.module.ts
index 2fe070b1f..1fb94112d 100644
--- a/src/addons/mod/imscp/imscp-lazy.module.ts
+++ b/src/addons/mod/imscp/imscp-lazy.module.ts
@@ -24,6 +24,10 @@ const routes: Routes = [
         path: ':courseId/:cmId',
         component: AddonModImscpIndexPage,
     },
+    {
+        path: ':courseId/:cmId/view',
+        loadChildren: () => import('./pages/view/view.module').then(m => m.AddonModImscpViewPageModule),
+    },
 ];
 
 @NgModule({
diff --git a/src/addons/mod/imscp/pages/view/view.html b/src/addons/mod/imscp/pages/view/view.html
new file mode 100644
index 000000000..309b6b94a
--- /dev/null
+++ b/src/addons/mod/imscp/pages/view/view.html
@@ -0,0 +1,39 @@
+<ion-header>
+    <ion-toolbar>
+        <ion-buttons slot="start">
+            <ion-back-button [text]="'core.back' | translate"></ion-back-button>
+        </ion-buttons>
+        <ion-title>
+            <h1>
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="cmId" [courseId]="courseId">
+                </core-format-text>
+            </h1>
+        </ion-title>
+
+        <ion-buttons slot="end">
+            <ion-button *ngIf="loaded" (click)="showToc()" aria-haspopup="true" [attr.aria-label]="'addon.mod_imscp.toc' | translate">
+                <ion-icon name="fas-bookmark" slot="icon-only" aria-hidden="true"></ion-icon>
+            </ion-button>
+        </ion-buttons>
+    </ion-toolbar>
+</ion-header>
+<ion-content>
+    <!-- Content. -->
+    <core-loading [hideUntil]="loaded" class="safe-area-padding core-loading-full-height">
+
+        <ion-card class="core-warning-card" *ngIf="warning">
+            <ion-item>
+                <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
+                <ion-label><span [innerHTML]="warning"></span></ion-label>
+            </ion-item>
+        </ion-card>
+
+        <div class="addon-mod-imscp-container">
+            <core-iframe *ngIf="loaded" [src]="src" [showFullscreenOnToolbar]="true" [autoFullscreenOnRotate]="true"></core-iframe>
+        </div>
+    </core-loading>
+
+    <core-navigation-bar collapsible-footer *ngIf="loaded && navigationItems.length > 1 && false" [items]="navigationItems"
+        (action)="loadItem($event)">
+    </core-navigation-bar>
+</ion-content>
diff --git a/src/addons/mod/imscp/pages/view/view.module.ts b/src/addons/mod/imscp/pages/view/view.module.ts
new file mode 100644
index 000000000..a4232dac5
--- /dev/null
+++ b/src/addons/mod/imscp/pages/view/view.module.ts
@@ -0,0 +1,38 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { RouterModule, Routes } from '@angular/router';
+
+import { CoreSharedModule } from '@/core/shared.module';
+import { AddonModImscpViewPage } from './view';
+
+const routes: Routes = [
+    {
+        path: '',
+        component: AddonModImscpViewPage,
+    },
+];
+
+@NgModule({
+    imports: [
+        RouterModule.forChild(routes),
+        CoreSharedModule,
+    ],
+    declarations: [
+        AddonModImscpViewPage,
+    ],
+    exports: [RouterModule],
+})
+export class AddonModImscpViewPageModule {}
diff --git a/src/addons/mod/imscp/pages/view/view.ts b/src/addons/mod/imscp/pages/view/view.ts
new file mode 100644
index 000000000..58123db94
--- /dev/null
+++ b/src/addons/mod/imscp/pages/view/view.ts
@@ -0,0 +1,273 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreConstants } from '@/core/constants';
+import { Component, OnInit } from '@angular/core';
+import { CoreNavigationBarItem } from '@components/navigation-bar/navigation-bar';
+import { CoreCourseResourceDownloadResult } from '@features/course/classes/main-resource-component';
+import { CoreCourse } from '@features/course/services/course';
+import { CoreCourseModuleData } from '@features/course/services/course-helper';
+import { CoreCourseModulePrefetchDelegate } from '@features/course/services/module-prefetch-delegate';
+import { IonRefresher } from '@ionic/angular';
+import { CoreApp } from '@services/app';
+import { CoreNavigator } from '@services/navigator';
+import { CoreDomUtils } from '@services/utils/dom';
+import { CoreTextUtils } from '@services/utils/text';
+import { CoreUtils } from '@services/utils/utils';
+import { Translate } from '@singletons';
+import { AddonModImscpTocComponent } from '../../components/toc/toc';
+import { AddonModImscp, AddonModImscpImscp, AddonModImscpTocItem } from '../../services/imscp';
+
+/**
+ * Page that displays a IMSCP content.
+ */
+@Component({
+    selector: 'page-addon-mod-imscp-view',
+    templateUrl: 'view.html',
+})
+export class AddonModImscpViewPage implements OnInit {
+
+    title = '';
+    cmId!: number;
+    courseId!: number;
+    initialItemHref?: string;
+    src = '';
+    warning = '';
+    navigationItems: CoreNavigationBarItem<AddonModImscpTocItem>[] = [];
+    loaded = false;
+
+    protected module?: CoreCourseModuleData;
+    protected imscp?: AddonModImscpImscp;
+    protected items: AddonModImscpTocItem[] = [];
+    protected currentHref?: string;
+
+    /**
+     * @inheritdoc
+     */
+    ngOnInit(): void {
+        try {
+            this.cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
+            this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
+            this.initialItemHref = CoreNavigator.getRouteParam('initialHref');
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+
+            CoreNavigator.back();
+
+            return;
+        }
+
+        this.fetchContent();
+    }
+
+    /**
+     * Download IMSCP contents and load the current item.
+     *
+     * @param refresh Whether we're refreshing data.
+     * @return Promise resolved when done.
+     */
+    protected async fetchContent(refresh = false): Promise<void> {
+        try {
+            const { module, imscp } = await this.loadImscpData();
+
+            this.title = imscp.name;
+
+            const downloadResult = await this.downloadResourceIfNeeded(module, refresh);
+
+            // Get contents. No need to refresh, it has been done in downloadResourceIfNeeded.
+            const contents = await CoreCourse.getModuleContents(module, this.courseId);
+
+            this.items = AddonModImscp.createItemList(contents);
+
+            if (this.items.length) {
+                if (this.initialItemHref) {
+                    // Check it's valid.
+                    if (this.items.some(item => item.href === this.initialItemHref)) {
+                        this.currentHref = this.initialItemHref;
+                    }
+                }
+
+                if (this.currentHref === undefined) {
+                    // @todo: Use last item viewed.
+                    this.currentHref = this.items[0].href;
+                }
+            }
+
+            try {
+                await this.loadItemHref(this.currentHref);
+            } catch (error) {
+                CoreDomUtils.showErrorModalDefault(error, 'addon.mod_imscp.deploymenterror', true);
+
+                return;
+            }
+
+            if (downloadResult?.failed) {
+                const error = CoreTextUtils.getErrorMessageFromError(downloadResult.error) || downloadResult.error;
+                this.warning = Translate.instant('core.errordownloadingsomefiles') + (error ? ' ' + error : '');
+            } else {
+                this.warning = '';
+            }
+        } catch (error) {
+            CoreDomUtils.showErrorModalDefault(error, 'core.course.errorgetmodule', true);
+        } finally {
+            this.loaded = true;
+        }
+    }
+
+    /**
+     * Load IMSCP data from WS.
+     *
+     * @return Promise resolved when done.
+     */
+    async loadImscpData(): Promise<{ module: CoreCourseModuleData; imscp: AddonModImscpImscp }> {
+        this.module = await CoreCourse.getModule(this.cmId, this.courseId);
+        this.imscp = await AddonModImscp.getImscp(this.courseId, this.cmId);
+
+        return {
+            module: this.module,
+            imscp: this.imscp,
+        };
+    }
+
+    /**
+     * Download a resource if needed.
+     * If the download call fails the promise won't be rejected, but the error will be included in the returned object.
+     * If module.contents cannot be loaded then the Promise will be rejected.
+     *
+     * @param refresh Whether we're refreshing data.
+     * @return Promise resolved when done.
+     */
+    protected async downloadResourceIfNeeded(
+        module: CoreCourseModuleData,
+        refresh = false,
+    ): Promise<CoreCourseResourceDownloadResult> {
+
+        const result: CoreCourseResourceDownloadResult = {
+            failed: false,
+        };
+        let contentsAlreadyLoaded = false;
+
+        // Get module status to determine if it needs to be downloaded.
+        const status = await CoreCourseModulePrefetchDelegate.getModuleStatus(module, this.courseId, undefined, refresh);
+
+        if (status !== CoreConstants.DOWNLOADED) {
+            // Download content. This function also loads module contents if needed.
+            try {
+                await CoreCourseModulePrefetchDelegate.downloadModule(module, this.courseId);
+
+                // If we reach here it means the download process already loaded the contents, no need to do it again.
+                contentsAlreadyLoaded = true;
+            } catch (error) {
+                // Mark download as failed but go on since the main files could have been downloaded.
+                result.failed = true;
+                result.error = error;
+            }
+        }
+
+        if (!module.contents?.length || (refresh && !contentsAlreadyLoaded)) {
+            // Try to load the contents.
+            const ignoreCache = refresh && CoreApp.isOnline();
+
+            try {
+                await CoreCourse.loadModuleContents(module, undefined, undefined, false, ignoreCache);
+            } catch (error) {
+                // Error loading contents. If we ignored cache, try to get the cached value.
+                if (ignoreCache && !module.contents) {
+                    await CoreCourse.loadModuleContents(module);
+                } else if (!module.contents) {
+                    // Not able to load contents, throw the error.
+                    throw error;
+                }
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * Refresh the data.
+     *
+     * @param refresher Refresher.
+     * @return Promise resolved when done.
+     */
+    async doRefresh(refresher?: IonRefresher): Promise<void> {
+        await CoreUtils.ignoreErrors(Promise.all([
+            AddonModImscp.invalidateContent(this.cmId, this.courseId),
+            CoreCourseModulePrefetchDelegate.invalidateCourseUpdates(this.courseId), // To detect if IMSCP was updated.
+        ]));
+
+        await CoreUtils.ignoreErrors(this.fetchContent(true));
+
+        refresher?.complete();
+    }
+
+    /**
+     * Loads an item.
+     *
+     * @param itemHref Item Href.
+     * @return Promise resolved when done.
+     */
+    async loadItemHref(itemHref?: string): Promise<void> {
+        if (!this.module) {
+            return;
+        }
+
+        const src = await AddonModImscp.getIframeSrc(this.module, itemHref);
+        this.currentHref = itemHref;
+
+        this.navigationItems = this.items.map((item) => ({
+            item: item,
+            current: item.href == this.currentHref,
+            enabled: !!item.href,
+        }));
+
+        if (this.src && src == this.src) {
+            // Re-loading same page. Set it to empty and then re-set the src in the next digest so it detects it has changed.
+            this.src = '';
+            setTimeout(() => {
+                this.src = src;
+            });
+        } else {
+            this.src = src;
+        }
+    }
+
+    /**
+     * Loads an item.
+     *
+     * @param item Item.
+     */
+    loadItem(item: AddonModImscpTocItem): void {
+        this.loadItemHref(item.href);
+    }
+
+    /**
+     * Show the TOC.
+     */
+    async showToc(): Promise<void> {
+        // Create the toc modal.
+        const modalData = await CoreDomUtils.openSideModal<string>({
+            component: AddonModImscpTocComponent,
+            componentProps: {
+                items: this.items,
+                selected: this.currentHref,
+            },
+        });
+
+        if (modalData) {
+            this.loadItemHref(modalData);
+        }
+    }
+
+}

From f695d673acd0609c0052e6dcae9d47c20f977c02 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 28 Feb 2022 12:38:46 +0100
Subject: [PATCH 0618/1008] MOBILE-3998 imscp: Remember last item viewed

---
 .../mod/book/pages/contents/contents.ts       |  2 +-
 src/addons/mod/book/services/book.ts          | 36 +++---------
 .../mod/imscp/components/index/index.ts       |  3 +-
 src/addons/mod/imscp/pages/view/view.ts       | 28 +++++++--
 src/addons/mod/imscp/services/imscp.ts        | 47 ++++++++++-----
 src/core/classes/site.ts                      | 58 +++++++++++++++++++
 src/core/services/database/sites.ts           | 25 +++++++-
 7 files changed, 149 insertions(+), 50 deletions(-)

diff --git a/src/addons/mod/book/pages/contents/contents.ts b/src/addons/mod/book/pages/contents/contents.ts
index e32661914..7a2055bd3 100644
--- a/src/addons/mod/book/pages/contents/contents.ts
+++ b/src/addons/mod/book/pages/contents/contents.ts
@@ -281,7 +281,7 @@ export class AddonModBookContentsPage implements OnInit, OnDestroy {
         }
 
         if (this.book) {
-            AddonModBook.storeLastChapterViewed(this.book.id, chapterId);
+            AddonModBook.storeLastChapterViewed(this.book.id, chapterId, this.courseId);
         }
 
         if (!this.module) {
diff --git a/src/addons/mod/book/services/book.ts b/src/addons/mod/book/services/book.ts
index 64d025dd6..16cdd0360 100644
--- a/src/addons/mod/book/services/book.ts
+++ b/src/addons/mod/book/services/book.ts
@@ -26,11 +26,6 @@ import { CoreTextUtils } from '@services/utils/text';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreFile } from '@services/file';
 import { CoreError } from '@classes/errors/error';
-import { lazyMap, LazyMap } from '@/core/utils/lazy-map';
-import { asyncInstance, AsyncInstance } from '@/core/utils/async-instance';
-import { CoreDatabaseTable } from '@classes/database/database-table';
-import { AddonModBookLastChapterViewedDBRecord, LAST_CHAPTER_VIEWED_TABLE } from './database/book';
-import { CoreDatabaseCachingStrategy } from '@classes/database/database-table-proxy';
 
 /**
  * Constants to define how the chapters and subchapters of a book should be displayed in that table of contents.
@@ -61,20 +56,6 @@ export class AddonModBookProvider {
 
     static readonly COMPONENT = 'mmaModBook';
 
-    protected lastChapterViewedTables: LazyMap<AsyncInstance<CoreDatabaseTable<AddonModBookLastChapterViewedDBRecord>>>;
-
-    constructor() {
-        this.lastChapterViewedTables = lazyMap(
-            siteId => asyncInstance(
-                () => CoreSites.getSiteTable(LAST_CHAPTER_VIEWED_TABLE, {
-                    siteId,
-                    config: { cachingStrategy: CoreDatabaseCachingStrategy.None },
-                    onDestroy: () => delete this.lastChapterViewedTables[siteId],
-                }),
-            ),
-        );
-    }
-
     /**
      * Get a book by course module ID.
      *
@@ -243,14 +224,12 @@ export class AddonModBookProvider {
      * @return Promise resolved with last chapter viewed, undefined if none.
      */
     async getLastChapterViewed(id: number, siteId?: string): Promise<number | undefined> {
-        try {
-            const site = await CoreSites.getSite(siteId);
-            const entry = await this.lastChapterViewedTables[site.getId()].getOneByPrimaryKey({ id });
+        const site = await CoreSites.getSite(siteId);
+        const entry = await site.getLastViewed(AddonModBookProvider.COMPONENT, id);
 
-            return entry.chapterid;
-        } catch {
-            // No last chapter viewed.
-        }
+        const chapterId = Number(entry?.value);
+
+        return isNaN(chapterId) ? undefined : chapterId;
     }
 
     /**
@@ -405,13 +384,14 @@ export class AddonModBookProvider {
      *
      * @param id Book instance ID.
      * @param chapterId Chapter ID.
+     * @param courseId Course ID.
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with last chapter viewed, undefined if none.
      */
-    async storeLastChapterViewed(id: number, chapterId: number, siteId?: string): Promise<void> {
+    async storeLastChapterViewed(id: number, chapterId: number, courseId: number, siteId?: string): Promise<void> {
         const site = await CoreSites.getSite(siteId);
 
-        await this.lastChapterViewedTables[site.getId()].insert({ id, chapterid: chapterId });
+        await site.storeLastViewed(AddonModBookProvider.COMPONENT, id, chapterId, String(courseId));
     }
 
 }
diff --git a/src/addons/mod/imscp/components/index/index.ts b/src/addons/mod/imscp/components/index/index.ts
index 8538b3e54..6d6e501b4 100644
--- a/src/addons/mod/imscp/components/index/index.ts
+++ b/src/addons/mod/imscp/components/index/index.ts
@@ -87,7 +87,8 @@ export class AddonModImscpIndexComponent extends CoreCourseModuleMainResourceCom
 
         this.description = imscp.intro;
 
-        // @todo: Check if user already started the IMSCP.
+        const lastViewed = await AddonModImscp.getLastItemViewed(imscp.id);
+        this.hasStarted = lastViewed !== undefined;
     }
 
     /**
diff --git a/src/addons/mod/imscp/pages/view/view.ts b/src/addons/mod/imscp/pages/view/view.ts
index 58123db94..18da77400 100644
--- a/src/addons/mod/imscp/pages/view/view.ts
+++ b/src/addons/mod/imscp/pages/view/view.ts
@@ -14,6 +14,7 @@
 
 import { CoreConstants } from '@/core/constants';
 import { Component, OnInit } from '@angular/core';
+import { CoreError } from '@classes/errors/error';
 import { CoreNavigationBarItem } from '@components/navigation-bar/navigation-bar';
 import { CoreCourseResourceDownloadResult } from '@features/course/classes/main-resource-component';
 import { CoreCourse } from '@features/course/services/course';
@@ -99,11 +100,22 @@ export class AddonModImscpViewPage implements OnInit {
                 }
 
                 if (this.currentHref === undefined) {
-                    // @todo: Use last item viewed.
-                    this.currentHref = this.items[0].href;
+                    // Get last viewed.
+                    const lastViewedHref = await AddonModImscp.getLastItemViewed(imscp.id);
+
+                    if (lastViewedHref !== undefined) {
+                        this.currentHref = lastViewedHref;
+                    } else {
+                        // Use first one.
+                        this.currentHref = this.items[0].href;
+                    }
                 }
             }
 
+            if (this.currentHref === undefined) {
+                throw new CoreError('Empty TOC');
+            }
+
             try {
                 await this.loadItemHref(this.currentHref);
             } catch (error) {
@@ -218,7 +230,7 @@ export class AddonModImscpViewPage implements OnInit {
      * @param itemHref Item Href.
      * @return Promise resolved when done.
      */
-    async loadItemHref(itemHref?: string): Promise<void> {
+    async loadItemHref(itemHref: string): Promise<void> {
         if (!this.module) {
             return;
         }
@@ -241,6 +253,10 @@ export class AddonModImscpViewPage implements OnInit {
         } else {
             this.src = src;
         }
+
+        if (this.imscp) {
+            AddonModImscp.storeLastItemViewed(this.imscp.id, itemHref, this.courseId);
+        }
     }
 
     /**
@@ -257,7 +273,7 @@ export class AddonModImscpViewPage implements OnInit {
      */
     async showToc(): Promise<void> {
         // Create the toc modal.
-        const modalData = await CoreDomUtils.openSideModal<string>({
+        const itemHref = await CoreDomUtils.openSideModal<string>({
             component: AddonModImscpTocComponent,
             componentProps: {
                 items: this.items,
@@ -265,8 +281,8 @@ export class AddonModImscpViewPage implements OnInit {
             },
         });
 
-        if (modalData) {
-            this.loadItemHref(modalData);
+        if (itemHref) {
+            this.loadItemHref(itemHref);
         }
     }
 
diff --git a/src/addons/mod/imscp/services/imscp.ts b/src/addons/mod/imscp/services/imscp.ts
index 121577ea3..abfcd0d87 100644
--- a/src/addons/mod/imscp/services/imscp.ts
+++ b/src/addons/mod/imscp/services/imscp.ts
@@ -168,29 +168,21 @@ export class AddonModImscpProvider {
      * Get src of a imscp item.
      *
      * @param module The module object.
-     * @param itemHref Href of item to get. If not defined, gets src of main item.
+     * @param itemHref Href of item to get.
      * @return Promise resolved with the item src.
      */
-    async getIframeSrc(module: CoreCourseModuleData, itemHref?: string): Promise<string> {
-        const contents = await CoreCourse.getModuleContents(module);
-
-        if (!itemHref) {
-            const toc = this.getToc(contents);
-            if (!toc.length) {
-                throw new CoreError('Empty TOC');
-            }
-            itemHref = toc[0].href;
-        }
-
+    async getIframeSrc(module: CoreCourseModuleData, itemHref: string): Promise<string> {
         const siteId = CoreSites.getCurrentSiteId();
 
         try {
-            const dirPath = await CoreFilepool.getPackageDirUrlByUrl(siteId, module.url!);
+            const dirPath = await CoreFilepool.getPackageDirUrlByUrl(siteId, module.url || '');
 
             return CoreTextUtils.concatenatePaths(dirPath, itemHref);
         } catch (error) {
             // Error getting directory, there was an error downloading or we're in browser. Return online URL if connected.
             if (CoreApp.isOnline()) {
+                const contents = await CoreCourse.getModuleContents(module);
+
                 const indexUrl = this.getFileUrlFromContents(contents, itemHref);
 
                 if (indexUrl) {
@@ -204,6 +196,20 @@ export class AddonModImscpProvider {
         }
     }
 
+    /**
+     * Get last item viewed's href in the app for a IMSCP.
+     *
+     * @param id IMSCP instance ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with last item viewed's href, undefined if none.
+     */
+    async getLastItemViewed(id: number, siteId?: string): Promise<string | undefined> {
+        const site = await CoreSites.getSite(siteId);
+        const entry = await site.getLastViewed(AddonModImscpProvider.COMPONENT, id);
+
+        return entry?.value;
+    }
+
     /**
      * Invalidate the prefetched content.
      *
@@ -285,6 +291,21 @@ export class AddonModImscpProvider {
         );
     }
 
+    /**
+     * Store last item viewed in the app for a IMSCP.
+     *
+     * @param id IMSCP instance ID.
+     * @param href Item href.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with last item viewed, undefined if none.
+     */
+    async storeLastItemViewed(id: number, href: string, courseId: number, siteId?: string): Promise<void> {
+        const site = await CoreSites.getSite(siteId);
+
+        await site.storeLastViewed(AddonModImscpProvider.COMPONENT, id, href, String(courseId));
+    }
+
 }
 export const AddonModImscp = makeSingleton(AddonModImscpProvider);
 
diff --git a/src/core/classes/site.ts b/src/core/classes/site.ts
index 99f9bb496..0f5ace6b2 100644
--- a/src/core/classes/site.ts
+++ b/src/core/classes/site.ts
@@ -82,6 +82,7 @@ export class CoreSite {
     // Variables for the database.
     static readonly WS_CACHE_TABLE = 'wscache_2';
     static readonly CONFIG_TABLE = 'core_site_config';
+    static readonly LAST_VIEWED_TABLE = 'core_site_last_viewed';
 
     static readonly MINIMUM_MOODLE_VERSION = '3.5';
 
@@ -110,6 +111,7 @@ export class CoreSite {
     protected db?: SQLiteDB;
     protected cacheTable: AsyncInstance<CoreDatabaseTable<CoreSiteWSCacheRecord>>;
     protected configTable: AsyncInstance<CoreDatabaseTable<CoreSiteConfigDBRecord, 'name'>>;
+    protected lastViewedTable: AsyncInstance<CoreDatabaseTable<CoreSiteLastViewedDBRecord, 'component' | 'id'>>;
     protected cleanUnicode = false;
     protected lastAutoLogin = 0;
     protected offlineDisabled = false;
@@ -154,6 +156,12 @@ export class CoreSite {
             config: { cachingStrategy: CoreDatabaseCachingStrategy.Eager },
             primaryKeyColumns: ['name'],
         }));
+        this.lastViewedTable = asyncInstance(() => CoreSites.getSiteTable(CoreSite.LAST_VIEWED_TABLE, {
+            siteId: this.getId(),
+            database: this.getDb(),
+            config: { cachingStrategy: CoreDatabaseCachingStrategy.None },
+            primaryKeyColumns: ['component', 'id'],
+        }));
         this.setInfo(infos);
         this.calculateOfflineDisabled();
 
@@ -1955,6 +1963,49 @@ export class CoreSite {
         return this.containsUrl(url);
     }
 
+    /**
+     * Deletes last viewed records based on some conditions.
+     *
+     * @param conditions Conditions.
+     * @return Promise resolved when done.
+     */
+    async deleteLastViewed(conditions?: Partial<CoreSiteLastViewedDBRecord>): Promise<void> {
+        await this.lastViewedTable.delete(conditions);
+    }
+
+    /**
+     * Get a last viewed record for a component+id.
+     *
+     * @param component The component.
+     * @param id ID.
+     * @return Resolves with last viewed record, undefined if not found.
+     */
+    async getLastViewed(component: string, id: number): Promise<CoreSiteLastViewedDBRecord | undefined> {
+        try {
+            return await this.lastViewedTable.getOneByPrimaryKey({ component, id });
+        } catch (error) {
+            // Not found.
+        }
+    }
+
+    /**
+     * Store a last viewed record.
+     *
+     * @param component The component.
+     * @param id ID.
+     * @param value Last viewed item value.
+     * @param data Other data.
+     * @return Promise resolved when done.
+     */
+    async storeLastViewed(component: string, id: number, value: string | number, data?: string): Promise<void> {
+        await this.lastViewedTable.insert({
+            component,
+            id,
+            value: String(value),
+            data,
+        });
+    }
+
 }
 
 /**
@@ -2281,3 +2332,10 @@ export type CoreSiteWSCacheRecord = {
     component?: string;
     componentId?: number;
 };
+
+export type CoreSiteLastViewedDBRecord = {
+    component: string;
+    id: number;
+    value: string;
+    data?: string;
+};
diff --git a/src/core/services/database/sites.ts b/src/core/services/database/sites.ts
index 930955e46..8d2083e1d 100644
--- a/src/core/services/database/sites.ts
+++ b/src/core/services/database/sites.ts
@@ -78,7 +78,7 @@ export const APP_SCHEMA: CoreAppSchema = {
 // Schema to register for Site DB.
 export const SITE_SCHEMA: CoreSiteSchema = {
     name: 'CoreSitesProvider',
-    version: 2,
+    version: 3,
     canBeCleared: [CoreSite.WS_CACHE_TABLE],
     tables: [
         {
@@ -125,6 +125,29 @@ export const SITE_SCHEMA: CoreSiteSchema = {
                 },
             ],
         },
+        {
+            name: CoreSite.LAST_VIEWED_TABLE,
+            columns: [
+                {
+                    name: 'component',
+                    type: 'TEXT',
+                },
+                {
+                    name: 'id',
+                    type: 'INTEGER',
+                },
+                {
+                    name: 'value',
+                    type: 'TEXT',
+                    notNull: true,
+                },
+                {
+                    name: 'data',
+                    type: 'TEXT',
+                },
+            ],
+            primaryKeys: ['component', 'id'],
+        },
     ],
     async migrate(db: SQLiteDB, oldVersion: number): Promise<void> {
         if (oldVersion < 2) {

From 46e6bfc6a2cfdaccb64159cef8a48425e43ad039 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 1 Mar 2022 08:20:58 +0100
Subject: [PATCH 0619/1008] MOBILE-3833 core: Fix
 invalidateWsCacheForKeyStartingWith

---
 src/addons/mod/bigbluebuttonbn/components/index/index.ts | 4 +++-
 src/core/classes/site.ts                                 | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/addons/mod/bigbluebuttonbn/components/index/index.ts b/src/addons/mod/bigbluebuttonbn/components/index/index.ts
index 5f1e648cb..69383338a 100644
--- a/src/addons/mod/bigbluebuttonbn/components/index/index.ts
+++ b/src/addons/mod/bigbluebuttonbn/components/index/index.ts
@@ -95,7 +95,9 @@ export class AddonModBBBIndexComponent extends CoreCourseModuleMainActivityCompo
             return;
         }
 
-        this.meetingInfo = await AddonModBBB.getMeetingInfo(this.bbb.id, this.groupId);
+        this.meetingInfo = await AddonModBBB.getMeetingInfo(this.bbb.id, this.groupId, {
+            cmId: this.module.id,
+        });
 
         if (this.meetingInfo.statusrunning && this.meetingInfo.userlimit > 0) {
             const count = (this.meetingInfo.participantcount || 0) + (this.meetingInfo.moderatorcount || 0);
diff --git a/src/core/classes/site.ts b/src/core/classes/site.ts
index 0f5ace6b2..776cc58ac 100644
--- a/src/core/classes/site.ts
+++ b/src/core/classes/site.ts
@@ -1217,7 +1217,7 @@ export class CoreSite {
 
         await this.cacheTable.updateWhere({ expirationTime: 0 }, {
             sql: 'key LIKE ?',
-            sqlParams: [key],
+            sqlParams: [key + '%'],
             js: record => !!record.key?.startsWith(key),
         });
     }

From dbd465e31004392fbf2cef625850f1733e2b504e Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 1 Mar 2022 09:43:30 +0100
Subject: [PATCH 0620/1008] MOBILE-3997 core: Don't show autologin URL in
 warning message

---
 .../bigbluebuttonbn/components/index/index.ts  |  4 +++-
 src/core/classes/site.ts                       | 18 +++++++++++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/addons/mod/bigbluebuttonbn/components/index/index.ts b/src/addons/mod/bigbluebuttonbn/components/index/index.ts
index 69383338a..d8b639b95 100644
--- a/src/addons/mod/bigbluebuttonbn/components/index/index.ts
+++ b/src/addons/mod/bigbluebuttonbn/components/index/index.ts
@@ -172,7 +172,9 @@ export class AddonModBBBIndexComponent extends CoreCourseModuleMainActivityCompo
         try {
             const joinUrl = await AddonModBBB.getJoinUrl(this.module.id, this.groupId);
 
-            CoreUtils.openInBrowser(joinUrl);
+            CoreUtils.openInBrowser(joinUrl, {
+                showBrowserWarning: false,
+            });
 
             this.updateMeetingInfo();
         } catch (error) {
diff --git a/src/core/classes/site.ts b/src/core/classes/site.ts
index 776cc58ac..eaefeb159 100644
--- a/src/core/classes/site.ts
+++ b/src/core/classes/site.ts
@@ -46,6 +46,7 @@ import { asyncInstance, AsyncInstance } from '../utils/async-instance';
 import { CoreDatabaseTable } from './database/database-table';
 import { CoreDatabaseCachingStrategy } from './database/database-table-proxy';
 import { CoreSilentError } from './errors/silenterror';
+import { CoreWindow } from '@singletons/window';
 
 /**
  * QR Code type enumeration.
@@ -1509,7 +1510,7 @@ export class CoreSite {
         alertMessage?: string,
     ): Promise<InAppBrowserObject | void> {
         // Get the URL to open.
-        url = await this.getAutoLoginUrl(url);
+        const autoLoginUrl = await this.getAutoLoginUrl(url);
 
         if (alertMessage) {
             // Show an alert first.
@@ -1526,9 +1527,20 @@ export class CoreSite {
 
         // Open the URL.
         if (inApp) {
-            return CoreUtils.openInApp(url, options);
+            return CoreUtils.openInApp(autoLoginUrl, options);
         } else {
-            return CoreUtils.openInBrowser(url, options);
+            if ((options.showBrowserWarning || options.showBrowserWarning === undefined) && autoLoginUrl !== url) {
+                // Don't display the autologin URL in the warning.
+                try {
+                    await CoreWindow.confirmOpenBrowserIfNeeded(url);
+
+                    options.showBrowserWarning = false;
+                } catch (error) {
+                    return; // Cancelled, stop.
+                }
+            }
+
+            return CoreUtils.openInBrowser(autoLoginUrl, options);
         }
     }
 

From be4bfc5a8d90b7938e8a857a6705915e4248dbe3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 25 Feb 2022 16:45:31 +0100
Subject: [PATCH 0621/1008] MOBILE-3814 style: Limit page width on some content
 pages

---
 src/addons/blog/pages/entries/entries.html    |   5 +-
 .../addon-calendar-upcoming-events.html       |  58 +--
 src/addons/calendar/pages/day/day.html        |  65 +--
 .../messages/pages/discussion/discussion.html |   5 +-
 .../addon-mod-assign-submission.html          |   2 +-
 .../components/index/index.html               |   2 +-
 .../index/addon-mod-book-index.html           |   2 +-
 .../index/addon-mod-chat-index.html           |   2 +-
 .../index/addon-mod-choice-index.html         | 109 ++---
 src/addons/mod/feedback/pages/form/form.html  |   2 +-
 .../index/addon-mod-folder-index.html         |   2 +-
 .../forum/pages/discussion/discussion.html    |   2 +-
 .../mod/glossary/pages/entry/entry.html       |   2 +-
 .../index/addon-mod-imscp-index.html          |   2 +-
 .../index/addon-mod-lesson-index.html         |   2 +-
 .../mod/lesson/pages/player/player.html       |   2 +-
 .../lesson/pages/user-retake/user-retake.html |   2 +-
 .../components/index/addon-mod-lti-index.html |   2 +-
 .../index/addon-mod-page-index.html           |   2 +-
 .../index/addon-mod-quiz-index.html           |   2 +-
 .../mod/quiz/pages/attempt/attempt.html       |   2 +-
 src/addons/mod/quiz/pages/player/player.html  |   2 +-
 src/addons/mod/quiz/pages/review/review.html  |   2 +-
 .../index/addon-mod-scorm-index.html          |   4 +-
 .../index/addon-mod-survey-index.html         |   2 +-
 .../index/addon-mod-wiki-index.html           |   2 +-
 .../addon-mod-workshop-assessment.html        |   2 +-
 .../index/addon-mod-workshop-index.html       |   2 +-
 .../addon-mod-workshop-submission.html        |   2 +-
 src/addons/notes/pages/list/list.html         |   2 +-
 src/addons/notifications/pages/list/list.html |  97 ++--
 .../pages/course-storage/course-storage.html  |   2 +-
 .../courses-storage/courses-storage.html      |   2 +-
 src/core/components/loading/loading.scss      |   6 +
 .../pages/module-preview/module-preview.html  |   2 +-
 .../change-password/change-password.html      |   2 +-
 .../login/pages/credentials/credentials.html  |   4 +-
 .../pages/email-signup/email-signup.html      | 432 +++++++++---------
 .../forgotten-password.html                   |  67 +--
 .../login/pages/reconnect/reconnect.html      | 166 +++----
 src/core/features/login/pages/site/site.html  | 174 +++----
 src/core/features/login/pages/site/site.scss  |  10 +-
 .../features/login/pages/sites/sites.html     |   2 +-
 .../features/settings/pages/about/about.html  |   2 +-
 src/core/features/settings/pages/dev/dev.html |   2 +-
 .../settings/pages/deviceinfo/deviceinfo.html |   2 +-
 .../settings/pages/general/general.html       |  11 +-
 .../settings/pages/licenses/licenses.html     |   2 +-
 .../pages/space-usage/space-usage.html        |   2 +-
 .../synchronization/synchronization.html      |   2 +-
 50 files changed, 653 insertions(+), 630 deletions(-)

diff --git a/src/addons/blog/pages/entries/entries.html b/src/addons/blog/pages/entries/entries.html
index 41697ecd3..d1a56b3c0 100644
--- a/src/addons/blog/pages/entries/entries.html
+++ b/src/addons/blog/pages/entries/entries.html
@@ -15,7 +15,7 @@
     <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="refresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <core-loading [hideUntil]="loaded">
+    <core-loading [hideUntil]="loaded" class="list-item-limited-width">
         <ion-item *ngIf="showMyEntriesToggle">
             <ion-label>{{ 'addon.blog.showonlyyourentries' | translate }}</ion-label>
             <ion-toggle [(ngModel)]="onlyMyEntries" (ionChange)="onlyMyEntriesToggleChanged(onlyMyEntries)"></ion-toggle>
@@ -68,7 +68,8 @@
                 </ion-card-content>
                 <div class="ion-text-center ion-margin-bottom" *ngIf="entry.lastmodified > entry.created">
                     <ion-note>
-                        <ion-icon name="fas-clock" [attr.aria-label]="'core.lastmodified' | translate"></ion-icon> {{entry.lastmodified |
+                        <ion-icon name="fas-clock" [attr.aria-label]="'core.lastmodified' | translate"></ion-icon> {{entry.lastmodified
+                        |
                         coreTimeAgo}}
                     </ion-note>
                 </div>
diff --git a/src/addons/calendar/components/upcoming-events/addon-calendar-upcoming-events.html b/src/addons/calendar/components/upcoming-events/addon-calendar-upcoming-events.html
index 143eec51c..23283d242 100644
--- a/src/addons/calendar/components/upcoming-events/addon-calendar-upcoming-events.html
+++ b/src/addons/calendar/components/upcoming-events/addon-calendar-upcoming-events.html
@@ -1,36 +1,38 @@
-<core-loading [hideUntil]="loaded">
+<core-loading [hideUntil]="loaded" class="list-item-limited-width">
     <core-empty-box *ngIf="!filteredEvents || !filteredEvents.length" icon="fas-calendar" [message]="'addon.calendar.noevents' | translate">
     </core-empty-box>
 
     <ion-list *ngIf="filteredEvents && filteredEvents.length" class="ion-no-margin">
         <ng-container *ngFor="let event of filteredEvents">
-            <ion-item class="ion-text-wrap addon-calendar-event" [attr.aria-label]="event.name" (click)="eventClicked(event)" button
-                [ngClass]="['addon-calendar-eventtype-'+event.eventtype]" detail="true">
-                <core-mod-icon *ngIf="event.moduleIcon" [modicon]="event.moduleIcon" slot="start" [modname]="event.modulename"
-                    [componentId]="event.instance" [showAlt]="false"></core-mod-icon>
-                <ion-icon *ngIf="event.eventIcon && !event.moduleIcon" [name]="event.eventIcon" slot="start" aria-hidden="true">
-                </ion-icon>
-                <ion-label>
-                    <!-- Add the icon title so accessibility tools read it. -->
-                    <span class="sr-only">
-                        {{ 'addon.calendar.type' + event.formattedType | translate }}
-                        <span class="sr-only" *ngIf="event.moduleIcon && event.iconTitle">{{ event.iconTitle }}</span>
-                    </span>
-                    <p class="item-heading">
-                        <core-format-text [text]="event.name" [contextLevel]="event.contextLevel"
-                            [contextInstanceId]="event.contextInstanceId"></core-format-text>
-                    </p>
-                    <p [innerHTML]="event.formattedtime"></p>
-                </ion-label>
-                <ion-note *ngIf="event.offline && !event.deleted" slot="end">
-                    <ion-icon name="fas-clock" aria-hidden="true"></ion-icon>
-                    <span class="ion-text-wrap">{{ 'core.notsent' | translate }}</span>
-                </ion-note>
-                <ion-note *ngIf="event.deleted" slot="end">
-                    <ion-icon name="fas-trash" aria-hidden="true"></ion-icon>
-                    <span class="ion-text-wrap">{{ 'core.deletedoffline' | translate }}</span>
-                </ion-note>
-            </ion-item>
+            <ion-card>
+                <ion-item class="ion-text-wrap addon-calendar-event" [attr.aria-label]="event.name" (click)="eventClicked(event)" button
+                    [ngClass]="['addon-calendar-eventtype-'+event.eventtype]" detail="true">
+                    <core-mod-icon *ngIf="event.moduleIcon" [modicon]="event.moduleIcon" slot="start" [modname]="event.modulename"
+                        [componentId]="event.instance" [showAlt]="false"></core-mod-icon>
+                    <ion-icon *ngIf="event.eventIcon && !event.moduleIcon" [name]="event.eventIcon" slot="start" aria-hidden="true">
+                    </ion-icon>
+                    <ion-label>
+                        <!-- Add the icon title so accessibility tools read it. -->
+                        <span class="sr-only">
+                            {{ 'addon.calendar.type' + event.formattedType | translate }}
+                            <span class="sr-only" *ngIf="event.moduleIcon && event.iconTitle">{{ event.iconTitle }}</span>
+                        </span>
+                        <p class="item-heading">
+                            <core-format-text [text]="event.name" [contextLevel]="event.contextLevel"
+                                [contextInstanceId]="event.contextInstanceId"></core-format-text>
+                        </p>
+                        <p [innerHTML]="event.formattedtime"></p>
+                    </ion-label>
+                    <ion-note *ngIf="event.offline && !event.deleted" slot="end">
+                        <ion-icon name="fas-clock" aria-hidden="true"></ion-icon>
+                        <span class="ion-text-wrap">{{ 'core.notsent' | translate }}</span>
+                    </ion-note>
+                    <ion-note *ngIf="event.deleted" slot="end">
+                        <ion-icon name="fas-trash" aria-hidden="true"></ion-icon>
+                        <span class="ion-text-wrap">{{ 'core.deletedoffline' | translate }}</span>
+                    </ion-note>
+                </ion-item>
+            </ion-card>
         </ng-container>
     </ion-list>
 
diff --git a/src/addons/calendar/pages/day/day.html b/src/addons/calendar/pages/day/day.html
index d245f7258..e3f7b3766 100644
--- a/src/addons/calendar/pages/day/day.html
+++ b/src/addons/calendar/pages/day/day.html
@@ -50,7 +50,7 @@
 
             <core-swipe-slides [manager]="manager">
                 <ng-template let-day="item">
-                    <core-loading [hideUntil]="day.loaded" class="safe-area-padding">
+                    <core-loading [hideUntil]="day.loaded" class="safe-area-padding list-item-limited-width">
                         <!-- There is data to be synchronized -->
                         <ion-card class="core-warning-card" *ngIf="day.hasOffline">
                             <ion-item>
@@ -65,36 +65,39 @@
 
                         <ion-list *ngIf="day.filteredEvents && day.filteredEvents.length" class="ion-no-margin">
                             <ng-container *ngFor="let event of day.filteredEvents">
-                                <ion-item class="addon-calendar-event ion-text-wrap" [attr.aria-label]="event.name"
-                                    (click)="gotoEvent(event.id)" [class.item-dimmed]="event.ispast"
-                                    [ngClass]="['addon-calendar-eventtype-'+event.eventtype]" button detail="true">
-                                    <core-mod-icon *ngIf="event.moduleIcon" [modicon]="event.moduleIcon" slot="start" [showAlt]="false"
-                                        [modname]="event.modulename" [componentId]="event.instance">
-                                    </core-mod-icon>
-                                    <ion-icon *ngIf="event.eventIcon && !event.moduleIcon" [name]="event.eventIcon" slot="start"
-                                        aria-hidden="true">
-                                    </ion-icon>
-                                    <ion-label>
-                                        <!-- Add the icon title so accessibility tools read it. -->
-                                        <span class="sr-only">
-                                            {{ 'addon.calendar.type' + event.formattedType | translate }}
-                                            <span class="sr-only" *ngIf="event.moduleIcon && event.iconTitle">{{ event.iconTitle }}</span>
-                                        </span>
-                                        <p class="item-heading">
-                                            <core-format-text [text]="event.name" [contextLevel]="event.contextLevel"
-                                                [contextInstanceId]="event.contextInstanceId"></core-format-text>
-                                        </p>
-                                        <p [innerHTML]="event.formattedtime"></p>
-                                    </ion-label>
-                                    <ion-note *ngIf="event.offline && !event.deleted" slot="end">
-                                        <ion-icon name="fas-clock" aria-hidden="true"></ion-icon>
-                                        <span class="ion-text-wrap">{{ 'core.notsent' | translate }}</span>
-                                    </ion-note>
-                                    <ion-note *ngIf="event.deleted" slot="end">
-                                        <ion-icon name="fas-trash" aria-hidden="true"></ion-icon>
-                                        <span class="ion-text-wrap">{{ 'core.deletedoffline' | translate }}</span>
-                                    </ion-note>
-                                </ion-item>
+                                <ion-card>
+                                    <ion-item class="addon-calendar-event ion-text-wrap" [attr.aria-label]="event.name"
+                                        (click)="gotoEvent(event.id)" [class.item-dimmed]="event.ispast"
+                                        [ngClass]="['addon-calendar-eventtype-'+event.eventtype]" button [detail]="false">
+                                        <core-mod-icon *ngIf="event.moduleIcon" [modicon]="event.moduleIcon" slot="start" [showAlt]="false"
+                                            [modname]="event.modulename" [componentId]="event.instance">
+                                        </core-mod-icon>
+                                        <ion-icon *ngIf="event.eventIcon && !event.moduleIcon" [name]="event.eventIcon" slot="start"
+                                            aria-hidden="true">
+                                        </ion-icon>
+                                        <ion-label>
+                                            <!-- Add the icon title so accessibility tools read it. -->
+                                            <span class="sr-only">
+                                                {{ 'addon.calendar.type' + event.formattedType | translate }}
+                                                <span class="sr-only" *ngIf="event.moduleIcon && event.iconTitle">{{ event.iconTitle
+                                                    }}</span>
+                                            </span>
+                                            <p class="item-heading">
+                                                <core-format-text [text]="event.name" [contextLevel]="event.contextLevel"
+                                                    [contextInstanceId]="event.contextInstanceId"></core-format-text>
+                                            </p>
+                                            <p [innerHTML]="event.formattedtime"></p>
+                                        </ion-label>
+                                        <ion-note *ngIf="event.offline && !event.deleted" slot="end">
+                                            <ion-icon name="fas-clock" aria-hidden="true"></ion-icon>
+                                            <span class="ion-text-wrap">{{ 'core.notsent' | translate }}</span>
+                                        </ion-note>
+                                        <ion-note *ngIf="event.deleted" slot="end">
+                                            <ion-icon name="fas-trash" aria-hidden="true"></ion-icon>
+                                            <span class="ion-text-wrap">{{ 'core.deletedoffline' | translate }}</span>
+                                        </ion-note>
+                                    </ion-item>
+                                </ion-card>
                             </ng-container>
                         </ion-list>
                     </core-loading>
diff --git a/src/addons/messages/pages/discussion/discussion.html b/src/addons/messages/pages/discussion/discussion.html
index fc9dd7c3c..7427dbd18 100644
--- a/src/addons/messages/pages/discussion/discussion.html
+++ b/src/addons/messages/pages/discussion/discussion.html
@@ -69,7 +69,8 @@
 
         <h2 class="sr-only">{{ title }}</h2>
 
-        <ion-list class="addon-messages-discussion-container" [class.addon-messages-discussion-group]="isGroup" [attr.aria-live]="'polite'">
+        <ion-list class="addon-messages-discussion-container list-item-limited-width" [class.addon-messages-discussion-group]="isGroup"
+            [attr.aria-live]="'polite'">
             <ng-container *ngFor="let message of messages; index as index; last as last">
                 <h3 class="ion-text-center addon-messages-date" *ngIf="message.showDate">
                     {{ message.timecreated | coreFormatDate: "strftimedayshort" }}
@@ -157,7 +158,7 @@
             <ion-button expand="block" class="ion-text-wrap ion-margin-bottom" (click)="confirmContactRequest()">
                 {{ 'addon.messages.acceptandaddcontact' | translate }}
             </ion-button>
-            <ion-button expand="block" class="ion-text-wrap ion-margin-bottom" fill="outline" (click)="declineContactRequest()">
+            <ion-button expand="block" class="ion-text-wrap ion-margin-bottom" color="light" (click)="declineContactRequest()">
                 {{ 'addon.messages.decline' | translate }}
             </ion-button>
         </div>
diff --git a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
index c8a116590..c2e5b2ad1 100644
--- a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
+++ b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
@@ -1,4 +1,4 @@
-<core-loading [hideUntil]="loaded">
+<core-loading [hideUntil]="loaded" class="list-item-limited-width">
 
     <!-- User and status of the submission. -->
     <ion-item class="ion-text-wrap" *ngIf="!blindMarking && user" core-user-link [userId]="submitId" [courseId]="courseId"
diff --git a/src/addons/mod/bigbluebuttonbn/components/index/index.html b/src/addons/mod/bigbluebuttonbn/components/index/index.html
index b960f1f79..fc7415313 100644
--- a/src/addons/mod/bigbluebuttonbn/components/index/index.html
+++ b/src/addons/mod/bigbluebuttonbn/components/index/index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="!showLoading" class="safe-area-page">
+<core-loading [hideUntil]="!showLoading" class="safe-area-page list-item-limited-width">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
diff --git a/src/addons/mod/book/components/index/addon-mod-book-index.html b/src/addons/mod/book/components/index/addon-mod-book-index.html
index 5e95da64d..3a1b9b960 100644
--- a/src/addons/mod/book/components/index/addon-mod-book-index.html
+++ b/src/addons/mod/book/components/index/addon-mod-book-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="!showLoading">
+<core-loading [hideUntil]="!showLoading" class="list-item-limited-width">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
diff --git a/src/addons/mod/chat/components/index/addon-mod-chat-index.html b/src/addons/mod/chat/components/index/addon-mod-chat-index.html
index 764e01db2..c55d7e8c7 100644
--- a/src/addons/mod/chat/components/index/addon-mod-chat-index.html
+++ b/src/addons/mod/chat/components/index/addon-mod-chat-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="!showLoading" class="safe-area-padding">
+<core-loading [hideUntil]="!showLoading" class="safe-area-padding list-item-limited-width">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
diff --git a/src/addons/mod/choice/components/index/addon-mod-choice-index.html b/src/addons/mod/choice/components/index/addon-mod-choice-index.html
index 715d95fc2..dbbb13b50 100644
--- a/src/addons/mod/choice/components/index/addon-mod-choice-index.html
+++ b/src/addons/mod/choice/components/index/addon-mod-choice-index.html
@@ -7,65 +7,66 @@
 
 <!-- Content. -->
 <core-loading [hideUntil]="!showLoading">
+    <div class="list-item-limited-width">
+        <!-- Activity info. -->
+        <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
+            [courseId]="courseId" [hasDataToSync]="hasOffline">
+        </core-course-module-info>
 
-    <!-- Activity info. -->
-    <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
-        [courseId]="courseId" [hasDataToSync]="hasOffline">
-    </core-course-module-info>
-
-    <!-- Activity availability messages -->
-    <ion-card class="core-info-card" *ngIf="choiceNotOpenYet">
-        <ion-item>
-            <ion-icon name="fas-info-circle" slot="start" aria-hidden="true"></ion-icon>
-            <ion-label>
-                <p *ngIf="options.length">{{ 'addon.mod_choice.previewonly' | translate:{$a: openTimeReadable} }}</p>
-                <p *ngIf="!options.length">{{ 'addon.mod_choice.notopenyet' | translate:{$a: openTimeReadable} }}</p>
-            </ion-label>
-        </ion-item>
-    </ion-card>
-
-    <ion-card class="core-info-card" *ngIf="choiceClosed">
-        <ion-item>
-            <ion-icon name="fas-info-circle" slot="start" aria-hidden="true"></ion-icon>
-            <ion-label>
-                <p *ngIf="options.length">
-                    {{ 'addon.mod_choice.yourselection' | translate }}
-                    <core-format-text [text]="options[0].text" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
-                    </core-format-text>
-                </p>
-                <p>{{ 'addon.mod_choice.expired' | translate:{$a: closeTimeReadable} }}</p>
-            </ion-label>
-        </ion-item>
-    </ion-card>
-
-    <!-- Inform what will happen with the choices. -->
-    <ion-card class="core-info-card" *ngIf="canEdit && publishInfo && options.length">
-        <ion-item>
-            <ion-icon name="fas-info-circle" slot="start" aria-hidden="true"></ion-icon>
-            <ion-label>{{ publishInfo | translate }}</ion-label>
-        </ion-item>
-    </ion-card>
-
-    <!-- Choice options -->
-    <ion-card *ngIf="options.length && choice">
-        <ng-container *ngIf="choice.allowmultiple">
-            <ion-item class="ion-text-wrap" *ngFor="let option of options">
+        <!-- Activity availability messages -->
+        <ion-card class="core-info-card" *ngIf="choiceNotOpenYet">
+            <ion-item>
+                <ion-icon name="fas-info-circle" slot="start" aria-hidden="true"></ion-icon>
                 <ion-label>
-                    <ng-container *ngTemplateOutlet="optionLabelTemplate; context: {option: option}"></ng-container>
+                    <p *ngIf="options.length">{{ 'addon.mod_choice.previewonly' | translate:{$a: openTimeReadable} }}</p>
+                    <p *ngIf="!options.length">{{ 'addon.mod_choice.notopenyet' | translate:{$a: openTimeReadable} }}</p>
                 </ion-label>
-                <ion-checkbox slot="end" [(ngModel)]="option.checked" [disabled]="option.disabled || !canEdit"></ion-checkbox>
             </ion-item>
-        </ng-container>
-        <ion-radio-group *ngIf="!choice.allowmultiple" [(ngModel)]="selectedOption.id">
-            <ion-item class="ion-text-wrap" *ngFor="let option of options">
-                <ion-label>
-                    <ng-container *ngTemplateOutlet="optionLabelTemplate; context: {option: option}"></ng-container>
-                </ion-label>
-                <ion-radio slot="end" [value]="option.id" [disabled]="option.disabled || !canEdit"></ion-radio>
-            </ion-item>
-        </ion-radio-group>
-    </ion-card>
+        </ion-card>
 
+        <ion-card class="core-info-card" *ngIf="choiceClosed">
+            <ion-item>
+                <ion-icon name="fas-info-circle" slot="start" aria-hidden="true"></ion-icon>
+                <ion-label>
+                    <p *ngIf="options.length">
+                        {{ 'addon.mod_choice.yourselection' | translate }}
+                        <core-format-text [text]="options[0].text" contextLevel="module" [contextInstanceId]="module.id"
+                            [courseId]="courseId">
+                        </core-format-text>
+                    </p>
+                    <p>{{ 'addon.mod_choice.expired' | translate:{$a: closeTimeReadable} }}</p>
+                </ion-label>
+            </ion-item>
+        </ion-card>
+
+        <!-- Inform what will happen with the choices. -->
+        <ion-card class="core-info-card" *ngIf="canEdit && publishInfo && options.length">
+            <ion-item>
+                <ion-icon name="fas-info-circle" slot="start" aria-hidden="true"></ion-icon>
+                <ion-label>{{ publishInfo | translate }}</ion-label>
+            </ion-item>
+        </ion-card>
+
+        <!-- Choice options -->
+        <ion-card *ngIf="options.length && choice">
+            <ng-container *ngIf="choice.allowmultiple">
+                <ion-item class="ion-text-wrap" *ngFor="let option of options">
+                    <ion-label>
+                        <ng-container *ngTemplateOutlet="optionLabelTemplate; context: {option: option}"></ng-container>
+                    </ion-label>
+                    <ion-checkbox slot="end" [(ngModel)]="option.checked" [disabled]="option.disabled || !canEdit"></ion-checkbox>
+                </ion-item>
+            </ng-container>
+            <ion-radio-group *ngIf="!choice.allowmultiple" [(ngModel)]="selectedOption.id">
+                <ion-item class="ion-text-wrap" *ngFor="let option of options">
+                    <ion-label>
+                        <ng-container *ngTemplateOutlet="optionLabelTemplate; context: {option: option}"></ng-container>
+                    </ion-label>
+                    <ion-radio slot="end" [value]="option.id" [disabled]="option.disabled || !canEdit"></ion-radio>
+                </ion-item>
+            </ion-radio-group>
+        </ion-card>
+    </div>
     <!-- Choice results -->
     <div *ngIf="canSeeResults && choice">
         <ion-item-divider>
diff --git a/src/addons/mod/feedback/pages/form/form.html b/src/addons/mod/feedback/pages/form/form.html
index 99d48dd4e..5133f7347 100644
--- a/src/addons/mod/feedback/pages/form/form.html
+++ b/src/addons/mod/feedback/pages/form/form.html
@@ -12,7 +12,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <core-loading [hideUntil]="feedbackLoaded" class="has-spacer">
+    <core-loading [hideUntil]="feedbackLoaded" class="has-spacer list-item-limited-width">
         <ng-container *ngIf="items && items.length">
             <ion-list class="ion-no-margin has-spacer">
                 <ion-item class="ion-text-wrap">
diff --git a/src/addons/mod/folder/components/index/addon-mod-folder-index.html b/src/addons/mod/folder/components/index/addon-mod-folder-index.html
index fd09820a8..e4c02d9d6 100644
--- a/src/addons/mod/folder/components/index/addon-mod-folder-index.html
+++ b/src/addons/mod/folder/components/index/addon-mod-folder-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="!showLoading">
+<core-loading [hideUntil]="!showLoading" class="list-item-limited-width">
 
     <!-- Activity info. -->
     <core-course-module-info *ngIf="!subfolder" [module]="module" [description]="description" [component]="component"
diff --git a/src/addons/mod/forum/pages/discussion/discussion.html b/src/addons/mod/forum/pages/discussion/discussion.html
index fa0eb810a..37157efb5 100644
--- a/src/addons/mod/forum/pages/discussion/discussion.html
+++ b/src/addons/mod/forum/pages/discussion/discussion.html
@@ -60,7 +60,7 @@
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
-    <core-loading [hideUntil]="discussionLoaded">
+    <core-loading [hideUntil]="discussionLoaded" class="list-item-limited-width">
         <!-- Discussion replies found to be synchronized -->
         <ion-card class="core-warning-card" *ngIf="postHasOffline || hasOfflineRatings">
             <ion-item>
diff --git a/src/addons/mod/glossary/pages/entry/entry.html b/src/addons/mod/glossary/pages/entry/entry.html
index c68402e12..3965b0f64 100644
--- a/src/addons/mod/glossary/pages/entry/entry.html
+++ b/src/addons/mod/glossary/pages/entry/entry.html
@@ -16,7 +16,7 @@
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
-    <core-loading [hideUntil]="loaded">
+    <core-loading [hideUntil]="loaded" class="list-item-limited-width">
         <ng-container *ngIf="entry && loaded">
             <ion-item class="ion-text-wrap" *ngIf="showAuthor">
                 <core-user-avatar [user]="entry" slot="start"></core-user-avatar>
diff --git a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
index 0f43d70d2..9d025fe8d 100644
--- a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
+++ b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="!showLoading" class="safe-area-padding core-loading-full-height">
+<core-loading [hideUntil]="!showLoading" class="safe-area-padding list-item-limited-width">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
diff --git a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
index c2f13b4e5..c3ca38e97 100644
--- a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
+++ b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="!showLoading">
+<core-loading [hideUntil]="!showLoading" class="list-item-limited-width">
     <core-tabs [hideUntil]="!showLoading" [selectedIndex]="selectedTab">
         <!-- Index/Preview tab. -->
         <core-tab [title]="'addon.mod_lesson.preview' | translate" (ionSelect)="indexSelected()">
diff --git a/src/addons/mod/lesson/pages/player/player.html b/src/addons/mod/lesson/pages/player/player.html
index adb7dd441..5e49e931a 100644
--- a/src/addons/mod/lesson/pages/player/player.html
+++ b/src/addons/mod/lesson/pages/player/player.html
@@ -18,7 +18,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <core-loading [hideUntil]="loaded">
+    <core-loading [hideUntil]="loaded" class="list-item-limited-width">
         <!-- Info messages. Only show the first one. -->
         <ion-card class="core-info-card" *ngIf="lesson && messages?.length">
             <ion-item class="ion-text-wrap">
diff --git a/src/addons/mod/lesson/pages/user-retake/user-retake.html b/src/addons/mod/lesson/pages/user-retake/user-retake.html
index 872b6577a..6b90ad1b0 100644
--- a/src/addons/mod/lesson/pages/user-retake/user-retake.html
+++ b/src/addons/mod/lesson/pages/user-retake/user-retake.html
@@ -13,7 +13,7 @@
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
-    <core-loading [hideUntil]="loaded">
+    <core-loading [hideUntil]="loaded" class="list-item-limited-width">
         <div *ngIf="student">
             <!-- Student data. -->
             <ion-item class="ion-text-wrap" core-user-link [userId]="student.id" [courseId]="courseId" [attr.aria-label]="student.fullname">
diff --git a/src/addons/mod/lti/components/index/addon-mod-lti-index.html b/src/addons/mod/lti/components/index/addon-mod-lti-index.html
index a85613113..1ab132e1e 100644
--- a/src/addons/mod/lti/components/index/addon-mod-lti-index.html
+++ b/src/addons/mod/lti/components/index/addon-mod-lti-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="!showLoading" class="safe-area-padding">
+<core-loading [hideUntil]="!showLoading" class="safe-area-padding list-item-limited-width">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="displayDescription && description" [component]="component"
diff --git a/src/addons/mod/page/components/index/addon-mod-page-index.html b/src/addons/mod/page/components/index/addon-mod-page-index.html
index e995cc5a0..a080af3e6 100644
--- a/src/addons/mod/page/components/index/addon-mod-page-index.html
+++ b/src/addons/mod/page/components/index/addon-mod-page-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="!showLoading" class="safe-area-padding">
+<core-loading [hideUntil]="!showLoading" class="safe-area-padding list-item-limited-width">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="displayDescription && description" [component]="component"
diff --git a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
index 53daf6b16..897861bcd 100644
--- a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
+++ b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="!showLoading">
+<core-loading [hideUntil]="!showLoading" class="list-item-limited-width">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
diff --git a/src/addons/mod/quiz/pages/attempt/attempt.html b/src/addons/mod/quiz/pages/attempt/attempt.html
index c6a47f24d..7d4dc6879 100644
--- a/src/addons/mod/quiz/pages/attempt/attempt.html
+++ b/src/addons/mod/quiz/pages/attempt/attempt.html
@@ -16,7 +16,7 @@
     <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <core-loading [hideUntil]="loaded">
+    <core-loading [hideUntil]="loaded" class="list-item-limited-width">
         <ion-list *ngIf="attempt">
             <ion-item class="ion-text-wrap">
                 <ion-label>
diff --git a/src/addons/mod/quiz/pages/player/player.html b/src/addons/mod/quiz/pages/player/player.html
index 94d0aa3be..f34cf4c47 100644
--- a/src/addons/mod/quiz/pages/player/player.html
+++ b/src/addons/mod/quiz/pages/player/player.html
@@ -31,7 +31,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <core-loading [hideUntil]="loaded" class="has-spacer">
+    <core-loading [hideUntil]="loaded" class="has-spacer list-item-limited-width">
         <!-- Button to start attempting. -->
         <ion-button *ngIf="!attempt" expand="block" class="ion-margin" (click)="start()">
             {{ 'addon.mod_quiz.startattempt' | translate }}
diff --git a/src/addons/mod/quiz/pages/review/review.html b/src/addons/mod/quiz/pages/review/review.html
index 38286d18a..a7aa60562 100644
--- a/src/addons/mod/quiz/pages/review/review.html
+++ b/src/addons/mod/quiz/pages/review/review.html
@@ -19,7 +19,7 @@
     <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="refreshData($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <core-loading [hideUntil]="loaded">
+    <core-loading [hideUntil]="loaded" class="list-item-limited-width">
 
         <!-- Review summary -->
         <ion-card *ngIf="attempt">
diff --git a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
index 953256c40..fb33799bb 100644
--- a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
+++ b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="!showLoading" class="safe-area-padding">
+<core-loading [hideUntil]="!showLoading" class="safe-area-padding list-item-limited-width">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
@@ -21,7 +21,7 @@
         </ion-item>
     </ion-card>
 
-    <div *ngIf="scorm && !showLoading && !scorm.warningMessage" class="list-item-limited-width">
+    <div *ngIf="scorm && !showLoading && !scorm.warningMessage">
         <!-- Attempts status. -->
         <ion-card *ngIf="(scorm.displayattemptstatus || offlineAttempts.length) && !skip">
             <ion-card-header class="ion-text-wrap">
diff --git a/src/addons/mod/survey/components/index/addon-mod-survey-index.html b/src/addons/mod/survey/components/index/addon-mod-survey-index.html
index 431d04f34..8c20281fe 100644
--- a/src/addons/mod/survey/components/index/addon-mod-survey-index.html
+++ b/src/addons/mod/survey/components/index/addon-mod-survey-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="!showLoading" class="safe-area-padding">
+<core-loading [hideUntil]="!showLoading" class="safe-area-padding list-item-limited-width">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="survey && !survey.surveydone && !hasOffline && description"
diff --git a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
index f7208d4ce..2b9a9d2e0 100644
--- a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
+++ b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
@@ -27,7 +27,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="!showLoading">
+<core-loading [hideUntil]="!showLoading" class="list-item-limited-width">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
diff --git a/src/addons/mod/workshop/components/assessment/addon-mod-workshop-assessment.html b/src/addons/mod/workshop/components/assessment/addon-mod-workshop-assessment.html
index 8c0388f09..90e393f77 100644
--- a/src/addons/mod/workshop/components/assessment/addon-mod-workshop-assessment.html
+++ b/src/addons/mod/workshop/components/assessment/addon-mod-workshop-assessment.html
@@ -1,4 +1,4 @@
-<core-loading [hideUntil]="loaded">
+<core-loading [hideUntil]="loaded" class="list-item-limited-width">
     <ion-item class="ion-text-wrap" [detail]="canViewAssessment && !canSelfAssess" (click)="gotoAssessment($event)"
         [button]="canViewAssessment && !canSelfAssess">
         <core-user-avatar [user]="profile" slot="start" [courseId]="courseId" [userId]="profile?.id"></core-user-avatar>
diff --git a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
index 7ce927fb2..15e6f16dd 100644
--- a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
+++ b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="!showLoading">
+<core-loading [hideUntil]="!showLoading" class="list-item-limited-width">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [hasDataToSync]="hasOffline">
diff --git a/src/addons/mod/workshop/components/submission/addon-mod-workshop-submission.html b/src/addons/mod/workshop/components/submission/addon-mod-workshop-submission.html
index f69d312a9..ee7f08609 100644
--- a/src/addons/mod/workshop/components/submission/addon-mod-workshop-submission.html
+++ b/src/addons/mod/workshop/components/submission/addon-mod-workshop-submission.html
@@ -1,4 +1,4 @@
-<core-loading [hideUntil]="loaded">
+<core-loading [hideUntil]="loaded" class="list-item-limited-width">
     <div *ngIf="!summary">
         <ion-item class="ion-text-wrap addon-workshop-submission-title">
             <core-user-avatar [user]="profile" [courseId]="courseId" [userId]="profile?.id" slot="start">
diff --git a/src/addons/notes/pages/list/list.html b/src/addons/notes/pages/list/list.html
index e3a373bbe..db1ee143d 100644
--- a/src/addons/notes/pages/list/list.html
+++ b/src/addons/notes/pages/list/list.html
@@ -30,7 +30,7 @@
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
-    <core-loading [hideUntil]="notesLoaded">
+    <core-loading [hideUntil]="notesLoaded" class="list-item-limited-width">
         <ion-item class="ion-text-wrap" *ngIf="user">
             <core-user-avatar [user]="user" [courseId]="courseId" slot="start" [linkProfile]="false"></core-user-avatar>
             <ion-label>
diff --git a/src/addons/notifications/pages/list/list.html b/src/addons/notifications/pages/list/list.html
index 0630a22d2..17f97fcf5 100644
--- a/src/addons/notifications/pages/list/list.html
+++ b/src/addons/notifications/pages/list/list.html
@@ -16,64 +16,67 @@
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
     <core-loading [hideUntil]="notificationsLoaded">
-        <div class="ion-padding" *ngIf="canMarkAllNotificationsAsRead">
-            <ion-button [disabled]="loadingMarkAllNotificationsAsRead" expand="block" (click)="markAllNotificationsAsRead()" fill="outline">
-                <ion-icon slot="start" name="fas-check" aria-hidden="true" *ngIf="!loadingMarkAllNotificationsAsRead"></ion-icon>
-                <ion-spinner slot="start" [attr.aria-label]="'core.loading' | translate" *ngIf="loadingMarkAllNotificationsAsRead">
-                </ion-spinner>
-                {{ 'addon.notifications.markallread' | translate }}
-            </ion-button>
-        </div>
+        <div class="list-item-limited-width">
 
-        <ion-card *ngFor="let notification of notifications">
-            <ion-item class="ion-text-wrap" [attr.aria-label]="
+            <div class="ion-padding" *ngIf="canMarkAllNotificationsAsRead">
+                <ion-button [disabled]="loadingMarkAllNotificationsAsRead" expand="block" (click)="markAllNotificationsAsRead()"
+                    fill="outline">
+                    <ion-icon slot="start" name="fas-check" aria-hidden="true" *ngIf="!loadingMarkAllNotificationsAsRead"></ion-icon>
+                    <ion-spinner slot="start" [attr.aria-label]="'core.loading' | translate" *ngIf="loadingMarkAllNotificationsAsRead">
+                    </ion-spinner>
+                    {{ 'addon.notifications.markallread' | translate }}
+                </ion-button>
+            </div>
+
+            <ion-card *ngFor="let notification of notifications">
+                <ion-item class="ion-text-wrap" [attr.aria-label]="
                     notification.timeread
                     ? notification.subject
                     : 'addon.notifications.unreadnotification' | translate: {$a: notification.subject}">
-                <core-user-avatar *ngIf="notification.useridfrom > 0" [user]="notification" slot="start"
-                    [profileUrl]="notification.profileimageurlfrom" [fullname]="notification.userfromfullname"
-                    [userId]="notification.useridfrom">
-                    <img *ngIf="notification.iconurl && !notification.modname" [src]="notification.iconurl" alt="" role="presentation"
-                        class="core-avatar-extra">
-                    <core-mod-icon *ngIf="notification.modname" [modicon]="notification.iconurl" [modname]="notification.modname"
-                        [showAlt]="false" class="core-avatar-extra">
-                    </core-mod-icon>
-                </core-user-avatar>
+                    <core-user-avatar *ngIf="notification.useridfrom > 0" [user]="notification" slot="start"
+                        [profileUrl]="notification.profileimageurlfrom" [fullname]="notification.userfromfullname"
+                        [userId]="notification.useridfrom">
+                        <img *ngIf="notification.iconurl && !notification.modname" [src]="notification.iconurl" alt="" role="presentation"
+                            class="core-avatar-extra">
+                        <core-mod-icon *ngIf="notification.modname" [modicon]="notification.iconurl" [modname]="notification.modname"
+                            [showAlt]="false" class="core-avatar-extra">
+                        </core-mod-icon>
+                    </core-user-avatar>
 
-                <img *ngIf="notification.useridfrom <= 0 && notification.iconurl" [src]="notification.iconurl" alt="" role="presentation"
-                    class="core-notification-icon" slot="start">
+                    <img *ngIf="notification.useridfrom <= 0 && notification.iconurl" [src]="notification.iconurl" alt=""
+                        role="presentation" class="core-notification-icon" slot="start">
 
-                <ion-label>
-                    <p class="item-heading">
-                        <core-format-text [text]="notification.subject" contextLevel="system" [contextInstanceId]="0"
-                            [wsNotFiltered]="true">
+                    <ion-label>
+                        <p class="item-heading">
+                            <core-format-text [text]="notification.subject" contextLevel="system" [contextInstanceId]="0"
+                                [wsNotFiltered]="true">
+                            </core-format-text>
+                        </p>
+                        <p *ngIf="notification.useridfrom > 0">{{ notification.userfromfullname }}</p>
+                    </ion-label>
+                    <ion-note slot="end" class="ion-float-end ion-text-end">
+                        {{ notification.timecreated | coreDateDayOrTime }}
+                        <span *ngIf="!notification.timeread">
+                            <ion-icon name="fas-circle" color="primary" aria-hidden="true"></ion-icon>
+                        </span>
+                    </ion-note>
+                </ion-item>
+                <ion-item class="ion-text-wrap">
+                    <ion-label>
+                        <core-format-text [text]="notification.mobiletext | coreCreateLinks" contextLevel="system" [contextInstanceId]="0"
+                            [maxHeight]="120">
                         </core-format-text>
-                    </p>
-                    <p *ngIf="notification.useridfrom > 0">{{ notification.userfromfullname }}</p>
-                </ion-label>
-                <ion-note slot="end" class="ion-float-end ion-text-end">
-                    {{ notification.timecreated | coreDateDayOrTime }}
-                    <span *ngIf="!notification.timeread">
-                        <ion-icon name="fas-circle" color="primary" aria-hidden="true"></ion-icon>
-                    </span>
-                </ion-note>
-            </ion-item>
-            <ion-item class="ion-text-wrap">
-                <ion-label>
-                    <core-format-text [text]="notification.mobiletext | coreCreateLinks" contextLevel="system" [contextInstanceId]="0"
-                        [maxHeight]="120">
-                    </core-format-text>
-                </ion-label>
-            </ion-item>
-            <addon-notifications-actions [contextUrl]="notification.contexturl" [courseId]="notification.courseid"
-                [data]="notification.customdata">
-            </addon-notifications-actions>
-        </ion-card>
+                    </ion-label>
+                </ion-item>
+                <addon-notifications-actions [contextUrl]="notification.contexturl" [courseId]="notification.courseid"
+                    [data]="notification.customdata">
+                </addon-notifications-actions>
+            </ion-card>
+        </div>
 
         <core-empty-box *ngIf="!notifications || notifications.length <= 0" icon="far-bell"
             [message]="'addon.notifications.therearentnotificationsyet' | translate">
         </core-empty-box>
-
         <core-infinite-loading [enabled]="canLoadMore" (action)="loadMoreNotifications($event)" [error]="loadMoreError">
         </core-infinite-loading>
     </core-loading>
diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.html b/src/addons/storagemanager/pages/course-storage/course-storage.html
index bd058183d..47f5e7b6c 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.html
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.html
@@ -9,7 +9,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <core-loading [hideUntil]="loaded">
+    <core-loading [hideUntil]="loaded" class="list-item-limited-width">
         <ion-card class="wholecourse">
             <ion-card-header>
                 <p class="ion-text-wrap ion-no-margin">{{ 'addon.storagemanager.courseinfo' | translate }}</p>
diff --git a/src/addons/storagemanager/pages/courses-storage/courses-storage.html b/src/addons/storagemanager/pages/courses-storage/courses-storage.html
index beb388d23..93aa52341 100644
--- a/src/addons/storagemanager/pages/courses-storage/courses-storage.html
+++ b/src/addons/storagemanager/pages/courses-storage/courses-storage.html
@@ -9,7 +9,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <core-loading [hideUntil]="loaded">
+    <core-loading [hideUntil]="loaded" class="list-item-limited-width">
         <div class="ion-padding-horizontal ion-text-wrap" *ngIf="spaceUsage">
             <h2>{{ 'addon.storagemanager.alldata' | translate }}</h2>
         </div>
diff --git a/src/core/components/loading/loading.scss b/src/core/components/loading/loading.scss
index a843495ec..1f704d0e6 100644
--- a/src/core/components/loading/loading.scss
+++ b/src/core/components/loading/loading.scss
@@ -81,6 +81,12 @@
         flex-direction: column;
     }
 
+    &.list-item-limited-width .core-loading-content {
+        max-width: var(--list-item--max-width);
+        margin-left: auto !important;
+        margin-right: auto !important;
+    }
+
     &.safe-area-padding:not(.core-loading-inline) .core-loading-content,
     &.safe-area-padding-horizontal:not(.core-loading-inline) .core-loading-content {
         @include safe-area-padding-horizontal(0px, 0px);
diff --git a/src/core/features/course/pages/module-preview/module-preview.html b/src/core/features/course/pages/module-preview/module-preview.html
index cd47cd96d..ee720ffd2 100644
--- a/src/core/features/course/pages/module-preview/module-preview.html
+++ b/src/core/features/course/pages/module-preview/module-preview.html
@@ -22,7 +22,7 @@
     <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <core-loading [hideUntil]="loaded" class="has-spacer">
+    <core-loading [hideUntil]="loaded" class="has-spacer list-item-limited-width">
         <core-course-module-info [module]="module" [courseId]="courseId" [description]="module.description" [component]="module.modname"
             [componentId]="module.id" [expandDescription]="true" [showAvailabilityInfo]="true">
             <div class="core-module-additional-info" title>
diff --git a/src/core/features/login/pages/change-password/change-password.html b/src/core/features/login/pages/change-password/change-password.html
index b36619a1b..7b808cbd7 100644
--- a/src/core/features/login/pages/change-password/change-password.html
+++ b/src/core/features/login/pages/change-password/change-password.html
@@ -16,7 +16,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-list>
+    <ion-list class="list-item-limited-width">
         <ng-container *ngIf="!changingPassword">
             <ion-item class="ion-text-wrap">
                 <ion-label>
diff --git a/src/core/features/login/pages/credentials/credentials.html b/src/core/features/login/pages/credentials/credentials.html
index 2335e3cca..61d29ffbf 100644
--- a/src/core/features/login/pages/credentials/credentials.html
+++ b/src/core/features/login/pages/credentials/credentials.html
@@ -16,7 +16,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content class="ion-padding">
-    <core-loading [hideUntil]="pageLoaded">
+    <core-loading [hideUntil]="pageLoaded" class="list-item-limited-width">
         <div class="ion-text-wrap ion-text-center ion-margin-bottom">
             <div class="core-login-site-logo">
                 <!-- Show site logo or a default image. -->
@@ -73,7 +73,7 @@
                     <h3 class="item-heading">{{ 'core.login.potentialidps' | translate }}</h3>
                 </ion-label>
             </ion-item>
-            <ion-button fill="outline" *ngFor="let provider of identityProviders" class="ion-text-wrap core-oauth-provider"
+            <ion-button fill="outline" *ngFor="let provider of identityProviders" class="ion-text-wrap ion-margin core-oauth-provider"
                 (click)="oauthClicked(provider)" [attr.aria-label]="provider.name" expand="block">
                 <img [src]="provider.iconurl" alt="" width="32" height="32" slot="start">
                 <ion-label>{{provider.name}}</ion-label>
diff --git a/src/core/features/login/pages/email-signup/email-signup.html b/src/core/features/login/pages/email-signup/email-signup.html
index d4ab18e0c..1308598e1 100644
--- a/src/core/features/login/pages/email-signup/email-signup.html
+++ b/src/core/features/login/pages/email-signup/email-signup.html
@@ -20,228 +20,230 @@
     <ion-refresher slot="fixed" [disabled]="!settingsLoaded || isMinor" (ionRefresh)="refreshSettings($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
+    <div class="list-item-limited-width">
 
-    <core-loading [hideUntil]="settingsLoaded" *ngIf="!isMinor">
+        <core-loading [hideUntil]="settingsLoaded" *ngIf="!isMinor">
 
-        <!-- Site has an unsupported required field. -->
-        <ion-list *ngIf="!allRequiredSupported">
+            <!-- Site has an unsupported required field. -->
+            <ion-list *ngIf="!allRequiredSupported">
+                <ion-item class="ion-text-wrap">
+                    <ion-label>
+                        {{ 'core.login.signuprequiredfieldnotsupported' | translate }}
+                    </ion-label>
+                </ion-item>
+                <ion-button expand="block" class="ion-margin" [href]="signupUrl" core-link autoLogin="no" [showBrowserWarning]="false">
+                    {{ 'core.openinbrowser' | translate }}
+                </ion-button>
+            </ion-list>
+
+            <!-- Age verification. -->
+            <form *ngIf="allRequiredSupported && settingsLoaded && settings && ageDigitalConsentVerification"
+                [formGroup]="ageVerificationForm" (ngSubmit)="verifyAge($event)" #ageForm>
+
+                <ion-item-divider class="ion-text-wrap">
+                    <ion-label>
+                        <h3>{{ 'core.agelocationverification' | translate }}</h3>
+                    </ion-label>
+                </ion-item-divider>
+
+                <ion-item class="ion-text-wrap">
+                    <ion-label position="stacked">
+                        <span core-mark-required="true">{{ 'core.whatisyourage' | translate }}</span>
+                    </ion-label>
+                    <ion-input type="number" name="age" placeholder="0" formControlName="age" autocapitalize="none" autocorrect="off">
+                    </ion-input>
+                </ion-item>
+
+                <ion-item class="ion-text-wrap">
+                    <ion-label position="stacked">
+                        <span core-mark-required="true">{{ 'core.wheredoyoulive' | translate }}</span>
+                    </ion-label>
+                    <ion-select name="country" formControlName="country" [placeholder]="'core.login.selectacountry' | translate">
+                        <ion-select-option value="">{{ 'core.login.selectacountry' | translate }}</ion-select-option>
+                        <ion-select-option *ngFor="let country of countries" [value]="country.code">{{country.name}}</ion-select-option>
+                    </ion-select>
+                </ion-item>
+
+                <!-- Submit button. -->
+                <ion-button expand="block" class="ion-margin" type="submit" [disabled]="!ageVerificationForm.valid">
+                    {{ 'core.proceed' | translate }}
+                </ion-button>
+
+                <ion-item class="ion-text-wrap">
+                    <ion-label>
+                        <h3 class="item-heading">{{ 'core.whyisthisrequired' | translate }}</h3>
+                        <p>{{ 'core.explanationdigitalminor' | translate }}</p>
+                    </ion-label>
+                </ion-item>
+            </form>
+
+            <!-- Signup form. -->
+            <form *ngIf="allRequiredSupported && settingsLoaded && settings && !ageDigitalConsentVerification" [formGroup]="signupForm"
+                (ngSubmit)="create($event)" #signupFormEl>
+
+                <ion-item class="ion-text-wrap ion-text-center">
+                    <ion-label>
+                        <!-- If no sitename show big siteurl. -->
+                        <p *ngIf="!siteName" class="ion-padding item-heading">{{siteUrl}}</p>
+                        <!-- If sitename, show big sitename and small siteurl. -->
+                        <p *ngIf="siteName" class="ion-padding item-heading">
+                            <core-format-text [text]="siteName" [filter]="false"></core-format-text>
+                        </p>
+                        <p *ngIf="siteName">{{siteUrl}}</p>
+                    </ion-label>
+                </ion-item>
+
+                <!-- Username and password. -->
+                <ion-item-divider class="ion-text-wrap">
+                    <ion-label>
+                        <h3>{{ 'core.login.createuserandpass' | translate }}</h3>
+                    </ion-label>
+                </ion-item-divider>
+                <ion-item class="ion-text-wrap">
+                    <ion-label position="stacked">
+                        <span core-mark-required="true">{{ 'core.login.username' | translate }}</span>
+                    </ion-label>
+                    <ion-input type="text" name="username" placeholder="{{ 'core.login.username' | translate }}" formControlName="username"
+                        autocapitalize="none" autocorrect="off">
+                    </ion-input>
+                    <core-input-errors [control]="signupForm.controls.username" [errorMessages]="usernameErrors"></core-input-errors>
+                </ion-item>
+                <ion-item class="ion-text-wrap">
+                    <ion-label position="stacked">
+                        <span core-mark-required="true">{{ 'core.login.password' | translate }}</span>
+                    </ion-label>
+                    <core-show-password name="password">
+                        <ion-input name="password" type="password" placeholder="{{ 'core.login.password' | translate }}"
+                            formControlName="password" [clearOnEdit]="false" autocomplete="new-password" required="true">
+                        </ion-input>
+                    </core-show-password>
+                    <p *ngIf="settings.passwordpolicy" class="core-input-footnote">
+                        {{settings.passwordpolicy}}
+                    </p>
+                    <core-input-errors [control]="signupForm.controls.password" [errorMessages]="passwordErrors"></core-input-errors>
+                </ion-item>
+
+                <!-- More details. -->
+                <ion-item-divider class="ion-text-wrap">
+                    <ion-label>
+                        <h3>{{ 'core.login.supplyinfo' | translate }}</h3>
+                    </ion-label>
+                </ion-item-divider>
+                <ion-item class="ion-text-wrap">
+                    <ion-label position="stacked">
+                        <span core-mark-required="true">{{ 'core.user.email' | translate }}</span>
+                    </ion-label>
+                    <ion-input type="email" name="email" placeholder="{{ 'core.user.email' | translate }}" formControlName="email"
+                        autocapitalize="none" autocorrect="off">
+                    </ion-input>
+                    <core-input-errors [control]="signupForm.controls.email" [errorMessages]="emailErrors"></core-input-errors>
+                </ion-item>
+                <ion-item class="ion-text-wrap">
+                    <ion-label position="stacked">
+                        <span core-mark-required="true">{{ 'core.user.emailagain' | translate }}</span>
+                    </ion-label>
+                    <ion-input type="email" name="email2" placeholder="{{ 'core.user.emailagain' | translate }}" autocapitalize="none"
+                        formControlName="email2" autocorrect="off" [pattern]="escapeMail(signupForm.controls.email.value)">
+                    </ion-input>
+                    <core-input-errors [control]="signupForm.controls.email2" [errorMessages]="email2Errors"></core-input-errors>
+                </ion-item>
+                <ion-item *ngFor="let nameField of settings.namefields" class="ion-text-wrap">
+                    <ion-label position="stacked">
+                        <span core-mark-required="true">{{ 'core.user.' + nameField | translate }}</span>
+                    </ion-label>
+                    <ion-input type="text" name="nameField" placeholder="{{ 'core.user.' + nameField | translate }}"
+                        formControlName="{{nameField}}" autocorrect="off">
+                    </ion-input>
+                    <core-input-errors [control]="signupForm.controls[nameField]" [errorMessages]="namefieldsErrors![nameField]">
+                    </core-input-errors>
+                </ion-item>
+                <ion-item class="ion-text-wrap">
+                    <ion-label position="stacked">{{ 'core.user.city' | translate }}</ion-label>
+                    <ion-input type="text" name="city" placeholder="{{ 'core.user.city' | translate }}" formControlName="city"
+                        autocorrect="off">
+                    </ion-input>
+                </ion-item>
+                <ion-item class="ion-text-wrap">
+                    <ion-label position="stacked" id="core-login-signup-country">{{ 'core.user.country' | translate }}</ion-label>
+                    <ion-select name="country" formControlName="country" aria-labelledby="core-login-signup-country"
+                        [placeholder]="'core.login.selectacountry' | translate">
+
+                        <ion-select-option value="">{{ 'core.login.selectacountry' | translate }}</ion-select-option>
+                        <ion-select-option *ngFor="let country of countries" [value]="country.code">{{country.name}}</ion-select-option>
+                    </ion-select>
+                </ion-item>
+
+                <!-- Other categories. -->
+                <ng-container *ngFor="let category of categories">
+                    <ion-item-divider class="ion-text-wrap">
+                        <ion-label>
+                            <p class="item-heading">{{ category.name }}</p>
+                        </ion-label>
+                    </ion-item-divider>
+                    <core-user-profile-field *ngFor="let field of category.fields" [field]="field" [edit]="true" [signup]="true"
+                        registerAuth="email" [form]="signupForm"></core-user-profile-field>
+                </ng-container>
+
+                <!-- ReCAPTCHA -->
+                <ng-container *ngIf="settings.recaptchapublickey">
+                    <ion-item-divider class="ion-text-wrap">
+                        <ion-label>
+                            <h3><span [core-mark-required]="true">{{ 'core.login.security_question' | translate }}</span></h3>
+                        </ion-label>
+                    </ion-item-divider>
+                    <core-recaptcha [publicKey]="settings.recaptchapublickey" [model]="captcha" [siteUrl]="siteUrl"></core-recaptcha>
+                </ng-container>
+
+                <!-- Site policy (if any). -->
+                <ng-container *ngIf="settings.sitepolicy">
+                    <ion-item-divider class="ion-text-wrap">
+                        <ion-label>
+                            <h3>{{ 'core.login.policyagreement' | translate }}</h3>
+                        </ion-label>
+                    </ion-item-divider>
+                    <ion-item class="ion-text-wrap">
+                        <ion-label>
+                            <a [href]="settings.sitepolicy" core-link capture="false">
+                                {{ 'core.login.policyagreementclick' | translate }}
+                            </a>
+                        </ion-label>
+                    </ion-item>
+                    <ion-item class="ion-text-wrap">
+                        <ion-label>
+                            <span [core-mark-required]="true">{{ 'core.login.policyacceptmandatory' | translate }}</span>
+                            <core-input-errors [control]="signupForm.controls.policyagreed" [errorMessages]="policyErrors">
+                            </core-input-errors>
+                        </ion-label>
+                        <ion-checkbox slot="end" name="policyagreed" formControlName="policyagreed"></ion-checkbox>
+                    </ion-item>
+                </ng-container>
+
+                <!-- Submit button. -->
+                <ion-button expand="block" class="ion-margin" type="submit">{{ 'core.login.createaccount' | translate }}</ion-button>
+                <!-- Remove this once Ionic fixes this bug: https://github.com/ionic-team/ionic-framework/issues/19368 -->
+                <input type="submit" class="core-submit-hidden-enter" />
+            </form>
+        </core-loading>
+
+        <ion-list *ngIf="allRequiredSupported && isMinor">
+            <ion-item-divider class="ion-text-wrap">
+                <ion-label>
+                    <h3 *ngIf="siteName" class="item-heading ion-padding">
+                        <core-format-text [text]="siteName" [filter]="false"></core-format-text>
+                    </h3>
+                </ion-label>
+            </ion-item-divider>
             <ion-item class="ion-text-wrap">
                 <ion-label>
-                    {{ 'core.login.signuprequiredfieldnotsupported' | translate }}
+                    <h3 class="item-heading">{{ 'core.considereddigitalminor' | translate }}</h3>
+                    <p>{{ 'core.digitalminor_desc' | translate }}</p>
+                    <p *ngIf="supportName">{{ supportName }}</p>
+                    <p *ngIf="supportEmail">{{ supportEmail }}</p>
                 </ion-label>
             </ion-item>
-            <ion-button expand="block" class="ion-margin" [href]="signupUrl" core-link autoLogin="no" [showBrowserWarning]="false">
+            <ion-button *ngIf="!supportName && !supportEmail" expand="block" class="ion-margin" (click)="showContactOnSite()">
                 {{ 'core.openinbrowser' | translate }}
             </ion-button>
         </ion-list>
-
-        <!-- Age verification. -->
-        <form *ngIf="allRequiredSupported && settingsLoaded && settings && ageDigitalConsentVerification" [formGroup]="ageVerificationForm"
-            (ngSubmit)="verifyAge($event)" #ageForm>
-
-            <ion-item-divider class="ion-text-wrap">
-                <ion-label>
-                    <h3>{{ 'core.agelocationverification' | translate }}</h3>
-                </ion-label>
-            </ion-item-divider>
-
-            <ion-item class="ion-text-wrap">
-                <ion-label position="stacked">
-                    <span core-mark-required="true">{{ 'core.whatisyourage' | translate }}</span>
-                </ion-label>
-                <ion-input type="number" name="age" placeholder="0" formControlName="age" autocapitalize="none" autocorrect="off">
-                </ion-input>
-            </ion-item>
-
-            <ion-item class="ion-text-wrap">
-                <ion-label position="stacked">
-                    <span core-mark-required="true">{{ 'core.wheredoyoulive' | translate }}</span>
-                </ion-label>
-                <ion-select name="country" formControlName="country" [placeholder]="'core.login.selectacountry' | translate">
-                    <ion-select-option value="">{{ 'core.login.selectacountry' | translate }}</ion-select-option>
-                    <ion-select-option *ngFor="let country of countries" [value]="country.code">{{country.name}}</ion-select-option>
-                </ion-select>
-            </ion-item>
-
-            <!-- Submit button. -->
-            <ion-button expand="block" class="ion-margin" type="submit" [disabled]="!ageVerificationForm.valid">
-                {{ 'core.proceed' | translate }}
-            </ion-button>
-
-            <ion-item class="ion-text-wrap">
-                <ion-label>
-                    <h3 class="item-heading">{{ 'core.whyisthisrequired' | translate }}</h3>
-                    <p>{{ 'core.explanationdigitalminor' | translate }}</p>
-                </ion-label>
-            </ion-item>
-        </form>
-
-        <!-- Signup form. -->
-        <form *ngIf="allRequiredSupported && settingsLoaded && settings && !ageDigitalConsentVerification" [formGroup]="signupForm"
-            (ngSubmit)="create($event)" #signupFormEl>
-
-            <ion-item class="ion-text-wrap ion-text-center">
-                <ion-label>
-                    <!-- If no sitename show big siteurl. -->
-                    <p *ngIf="!siteName" class="ion-padding item-heading">{{siteUrl}}</p>
-                    <!-- If sitename, show big sitename and small siteurl. -->
-                    <p *ngIf="siteName" class="ion-padding item-heading">
-                        <core-format-text [text]="siteName" [filter]="false"></core-format-text>
-                    </p>
-                    <p *ngIf="siteName">{{siteUrl}}</p>
-                </ion-label>
-            </ion-item>
-
-            <!-- Username and password. -->
-            <ion-item-divider class="ion-text-wrap">
-                <ion-label>
-                    <h3>{{ 'core.login.createuserandpass' | translate }}</h3>
-                </ion-label>
-            </ion-item-divider>
-            <ion-item class="ion-text-wrap">
-                <ion-label position="stacked">
-                    <span core-mark-required="true">{{ 'core.login.username' | translate }}</span>
-                </ion-label>
-                <ion-input type="text" name="username" placeholder="{{ 'core.login.username' | translate }}" formControlName="username"
-                    autocapitalize="none" autocorrect="off">
-                </ion-input>
-                <core-input-errors [control]="signupForm.controls.username" [errorMessages]="usernameErrors"></core-input-errors>
-            </ion-item>
-            <ion-item class="ion-text-wrap">
-                <ion-label position="stacked">
-                    <span core-mark-required="true">{{ 'core.login.password' | translate }}</span>
-                </ion-label>
-                <core-show-password name="password">
-                    <ion-input name="password" type="password" placeholder="{{ 'core.login.password' | translate }}"
-                        formControlName="password" [clearOnEdit]="false" autocomplete="new-password" required="true">
-                    </ion-input>
-                </core-show-password>
-                <p *ngIf="settings.passwordpolicy" class="core-input-footnote">
-                    {{settings.passwordpolicy}}
-                </p>
-                <core-input-errors [control]="signupForm.controls.password" [errorMessages]="passwordErrors"></core-input-errors>
-            </ion-item>
-
-            <!-- More details. -->
-            <ion-item-divider class="ion-text-wrap">
-                <ion-label>
-                    <h3>{{ 'core.login.supplyinfo' | translate }}</h3>
-                </ion-label>
-            </ion-item-divider>
-            <ion-item class="ion-text-wrap">
-                <ion-label position="stacked">
-                    <span core-mark-required="true">{{ 'core.user.email' | translate }}</span>
-                </ion-label>
-                <ion-input type="email" name="email" placeholder="{{ 'core.user.email' | translate }}" formControlName="email"
-                    autocapitalize="none" autocorrect="off">
-                </ion-input>
-                <core-input-errors [control]="signupForm.controls.email" [errorMessages]="emailErrors"></core-input-errors>
-            </ion-item>
-            <ion-item class="ion-text-wrap">
-                <ion-label position="stacked">
-                    <span core-mark-required="true">{{ 'core.user.emailagain' | translate }}</span>
-                </ion-label>
-                <ion-input type="email" name="email2" placeholder="{{ 'core.user.emailagain' | translate }}" autocapitalize="none"
-                    formControlName="email2" autocorrect="off" [pattern]="escapeMail(signupForm.controls.email.value)">
-                </ion-input>
-                <core-input-errors [control]="signupForm.controls.email2" [errorMessages]="email2Errors"></core-input-errors>
-            </ion-item>
-            <ion-item *ngFor="let nameField of settings.namefields" class="ion-text-wrap">
-                <ion-label position="stacked">
-                    <span core-mark-required="true">{{ 'core.user.' + nameField | translate }}</span>
-                </ion-label>
-                <ion-input type="text" name="nameField" placeholder="{{ 'core.user.' + nameField | translate }}"
-                    formControlName="{{nameField}}" autocorrect="off">
-                </ion-input>
-                <core-input-errors [control]="signupForm.controls[nameField]" [errorMessages]="namefieldsErrors![nameField]">
-                </core-input-errors>
-            </ion-item>
-            <ion-item class="ion-text-wrap">
-                <ion-label position="stacked">{{ 'core.user.city' | translate }}</ion-label>
-                <ion-input type="text" name="city" placeholder="{{ 'core.user.city' | translate }}" formControlName="city"
-                    autocorrect="off">
-                </ion-input>
-            </ion-item>
-            <ion-item class="ion-text-wrap">
-                <ion-label position="stacked" id="core-login-signup-country">{{ 'core.user.country' | translate }}</ion-label>
-                <ion-select name="country" formControlName="country" aria-labelledby="core-login-signup-country"
-                    [placeholder]="'core.login.selectacountry' | translate">
-
-                    <ion-select-option value="">{{ 'core.login.selectacountry' | translate }}</ion-select-option>
-                    <ion-select-option *ngFor="let country of countries" [value]="country.code">{{country.name}}</ion-select-option>
-                </ion-select>
-            </ion-item>
-
-            <!-- Other categories. -->
-            <ng-container *ngFor="let category of categories">
-                <ion-item-divider class="ion-text-wrap">
-                    <ion-label>
-                        <p class="item-heading">{{ category.name }}</p>
-                    </ion-label>
-                </ion-item-divider>
-                <core-user-profile-field *ngFor="let field of category.fields" [field]="field" [edit]="true" [signup]="true"
-                    registerAuth="email" [form]="signupForm"></core-user-profile-field>
-            </ng-container>
-
-            <!-- ReCAPTCHA -->
-            <ng-container *ngIf="settings.recaptchapublickey">
-                <ion-item-divider class="ion-text-wrap">
-                    <ion-label>
-                        <h3><span [core-mark-required]="true">{{ 'core.login.security_question' | translate }}</span></h3>
-                    </ion-label>
-                </ion-item-divider>
-                <core-recaptcha [publicKey]="settings.recaptchapublickey" [model]="captcha" [siteUrl]="siteUrl"></core-recaptcha>
-            </ng-container>
-
-            <!-- Site policy (if any). -->
-            <ng-container *ngIf="settings.sitepolicy">
-                <ion-item-divider class="ion-text-wrap">
-                    <ion-label>
-                        <h3>{{ 'core.login.policyagreement' | translate }}</h3>
-                    </ion-label>
-                </ion-item-divider>
-                <ion-item class="ion-text-wrap">
-                    <ion-label>
-                        <a [href]="settings.sitepolicy" core-link capture="false">
-                            {{ 'core.login.policyagreementclick' | translate }}
-                        </a>
-                    </ion-label>
-                </ion-item>
-                <ion-item class="ion-text-wrap">
-                    <ion-label>
-                        <span [core-mark-required]="true">{{ 'core.login.policyacceptmandatory' | translate }}</span>
-                        <core-input-errors [control]="signupForm.controls.policyagreed" [errorMessages]="policyErrors">
-                        </core-input-errors>
-                    </ion-label>
-                    <ion-checkbox slot="end" name="policyagreed" formControlName="policyagreed"></ion-checkbox>
-                </ion-item>
-            </ng-container>
-
-            <!-- Submit button. -->
-            <ion-button expand="block" class="ion-margin" type="submit">{{ 'core.login.createaccount' | translate }}</ion-button>
-            <!-- Remove this once Ionic fixes this bug: https://github.com/ionic-team/ionic-framework/issues/19368 -->
-            <input type="submit" class="core-submit-hidden-enter" />
-        </form>
-    </core-loading>
-
-    <ion-list *ngIf="allRequiredSupported && isMinor">
-        <ion-item-divider class="ion-text-wrap">
-            <ion-label>
-                <h3 *ngIf="siteName" class="item-heading ion-padding">
-                    <core-format-text [text]="siteName" [filter]="false"></core-format-text>
-                </h3>
-            </ion-label>
-        </ion-item-divider>
-        <ion-item class="ion-text-wrap">
-            <ion-label>
-                <h3 class="item-heading">{{ 'core.considereddigitalminor' | translate }}</h3>
-                <p>{{ 'core.digitalminor_desc' | translate }}</p>
-                <p *ngIf="supportName">{{ supportName }}</p>
-                <p *ngIf="supportEmail">{{ supportEmail }}</p>
-            </ion-label>
-        </ion-item>
-        <ion-button *ngIf="!supportName && !supportEmail" expand="block" class="ion-margin" (click)="showContactOnSite()">
-            {{ 'core.openinbrowser' | translate }}
-        </ion-button>
-    </ion-list>
+    </div>
 </ion-content>
diff --git a/src/core/features/login/pages/forgotten-password/forgotten-password.html b/src/core/features/login/pages/forgotten-password/forgotten-password.html
index d5a307706..5fe821695 100644
--- a/src/core/features/login/pages/forgotten-password/forgotten-password.html
+++ b/src/core/features/login/pages/forgotten-password/forgotten-password.html
@@ -10,37 +10,40 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-list>
-        <ion-item class="ion-text-wrap">
-            <ion-label>{{ 'core.login.passwordforgotteninstructions2' | translate }}</ion-label>
-        </ion-item>
-    </ion-list>
-    <ion-card>
-        <form [formGroup]="myForm" (ngSubmit)="resetPassword($event)" #resetPasswordForm>
-            <ion-item-divider class="ion-text-wrap">
-                <ion-label>
-                    <h2>{{ 'core.login.searchby' | translate }}</h2>
-                </ion-label>
-            </ion-item-divider>
-            <ion-radio-group formControlName="field">
-                <ion-item>
-                    <ion-label>{{ 'core.login.username' | translate }}</ion-label>
-                    <ion-radio slot="end" value="username"></ion-radio>
-                </ion-item>
-                <ion-item>
-                    <ion-label>{{ 'core.user.email' | translate }}</ion-label>
-                    <ion-radio slot="end" value="email"></ion-radio>
-                </ion-item>
-            </ion-radio-group>
-            <ion-item>
-                <ion-label class="sr-only">{{ 'core.login.usernameoremail' | translate }}</ion-label>
-                <ion-input type="text" name="value" placeholder="{{ 'core.login.usernameoremail' | translate }}" formControlName="value"
-                    autocapitalize="none" autocorrect="off" [core-auto-focus]="autoFocus">
-                </ion-input>
+    <div class="list-item-limited-width">
+
+        <ion-list>
+            <ion-item class="ion-text-wrap">
+                <ion-label>{{ 'core.login.passwordforgotteninstructions2' | translate }}</ion-label>
             </ion-item>
-            <ion-button type="submit" class="ion-margin" expand="block" [disabled]="!myForm.valid">
-                {{ 'core.courses.search' | translate }}
-            </ion-button>
-        </form>
-    </ion-card>
+        </ion-list>
+        <ion-card>
+            <form [formGroup]="myForm" (ngSubmit)="resetPassword($event)" #resetPasswordForm>
+                <ion-item-divider class="ion-text-wrap">
+                    <ion-label>
+                        <h2>{{ 'core.login.searchby' | translate }}</h2>
+                    </ion-label>
+                </ion-item-divider>
+                <ion-radio-group formControlName="field">
+                    <ion-item>
+                        <ion-label>{{ 'core.login.username' | translate }}</ion-label>
+                        <ion-radio slot="end" value="username"></ion-radio>
+                    </ion-item>
+                    <ion-item>
+                        <ion-label>{{ 'core.user.email' | translate }}</ion-label>
+                        <ion-radio slot="end" value="email"></ion-radio>
+                    </ion-item>
+                </ion-radio-group>
+                <ion-item>
+                    <ion-label class="sr-only">{{ 'core.login.usernameoremail' | translate }}</ion-label>
+                    <ion-input type="text" name="value" placeholder="{{ 'core.login.usernameoremail' | translate }}" formControlName="value"
+                        autocapitalize="none" autocorrect="off" [core-auto-focus]="autoFocus">
+                    </ion-input>
+                </ion-item>
+                <ion-button type="submit" class="ion-margin" expand="block" [disabled]="!myForm.valid">
+                    {{ 'core.courses.search' | translate }}
+                </ion-button>
+            </form>
+        </ion-card>
+    </div>
 </ion-content>
diff --git a/src/core/features/login/pages/reconnect/reconnect.html b/src/core/features/login/pages/reconnect/reconnect.html
index 73c657428..2f628b064 100644
--- a/src/core/features/login/pages/reconnect/reconnect.html
+++ b/src/core/features/login/pages/reconnect/reconnect.html
@@ -10,94 +10,96 @@
     </ion-toolbar>
 </ion-header>
 <ion-content class="ion-padding" (keydown)="keyDown($event)" (keyup)="keyUp($event)">
-    <div class="ion-text-wrap ion-text-center ion-margin-bottom" [ngClass]="{'item-avatar-center': showSiteAvatar}">
-        <!-- Show user avatar. -->
-        <img *ngIf="showSiteAvatar" [src]="userAvatar" class="large-avatar" core-external-content [siteId]="siteId"
-            alt="{{ 'core.pictureof' | translate:{$a: userFullName} }}" onError="this.src='assets/img/user-avatar.png'">
+    <div class="list-item-limited-width">
+        <div class="ion-text-wrap ion-text-center ion-margin-bottom" [ngClass]="{'item-avatar-center': showSiteAvatar}">
+            <!-- Show user avatar. -->
+            <img *ngIf="showSiteAvatar" [src]="userAvatar" class="large-avatar" core-external-content [siteId]="siteId"
+                alt="{{ 'core.pictureof' | translate:{$a: userFullName} }}" onError="this.src='assets/img/user-avatar.png'">
 
-        <div class="core-login-site-logo" *ngIf="!showSiteAvatar">
-            <!-- Show site logo or a default image. -->
-            <img *ngIf="logoUrl" [src]="logoUrl" role="presentation" onError="this.src='assets/img/login_logo.png'" alt="">
-            <img *ngIf="!logoUrl" src="assets/img/login_logo.png" role="presentation" alt="">
+            <div class="core-login-site-logo" *ngIf="!showSiteAvatar">
+                <!-- Show site logo or a default image. -->
+                <img *ngIf="logoUrl" [src]="logoUrl" role="presentation" onError="this.src='assets/img/login_logo.png'" alt="">
+                <img *ngIf="!logoUrl" src="assets/img/login_logo.png" role="presentation" alt="">
+            </div>
+
+            <p *ngIf="siteName" class="ion-padding core-sitename">
+                <core-format-text [text]="siteName" [filter]="false"></core-format-text>
+            </p>
+            <p class="core-siteurl">{{siteUrl}}</p>
+
+            <ion-card *ngIf="!isLoggedOut" class="core-danger-card core-login-reconnect-warning">
+                <ion-item>
+                    <ion-icon name="fas-exclamation-circle" slot="start" aria-hidden="true"></ion-icon>
+                    <ion-label>
+                        <p>{{ 'core.lostconnection' | translate }}</p>
+                    </ion-label>
+                </ion-item>
+            </ion-card>
         </div>
-
-        <p *ngIf="siteName" class="ion-padding core-sitename">
-            <core-format-text [text]="siteName" [filter]="false"></core-format-text>
-        </p>
-        <p class="core-siteurl">{{siteUrl}}</p>
-
-        <ion-card *ngIf="!isLoggedOut" class="core-danger-card core-login-reconnect-warning">
-            <ion-item>
-                <ion-icon name="fas-exclamation-circle" slot="start" aria-hidden="true"></ion-icon>
+        <form *ngIf="!isOAuth" [formGroup]="credForm" (ngSubmit)="login($event)" class="core-login-form" #reconnectForm>
+            <ion-item class="ion-text-wrap core-username item-interactive">
                 <ion-label>
-                    <p>{{ 'core.lostconnection' | translate }}</p>
+                    <p>{{username}}</p>
                 </ion-label>
             </ion-item>
-        </ion-card>
-    </div>
-    <form *ngIf="!isOAuth" [formGroup]="credForm" (ngSubmit)="login($event)" class="core-login-form" #reconnectForm>
-        <ion-item class="ion-text-wrap core-username item-interactive">
-            <ion-label>
-                <p>{{username}}</p>
-            </ion-label>
-        </ion-item>
-        <ion-item class="ion-margin-bottom">
-            <ion-label class="sr-only">{{ 'core.login.password' | translate }}</ion-label>
-            <core-show-password name="password">
-                <ion-input class="core-ioninput-password" name="password" type="password"
-                    placeholder="{{ 'core.login.password' | translate }}" formControlName="password" [clearOnEdit]="false"
-                    autocomplete="current-password" enterkeyhint="go" required="true">
-                </ion-input>
-            </core-show-password>
-        </ion-item>
-        <ion-grid class="ion-padding">
-            <ion-row>
-                <ion-col>
-                    <ion-button expand="block" fill="outline" (click)="cancel($event)">
-                        {{ 'core.login.cancel' | translate }}
-                    </ion-button>
-                </ion-col>
-                <ion-col>
-                    <ion-button type="submit" expand="block" [disabled]="!credForm.valid">
-                        {{ 'core.login.loginbutton' | translate }}
-                    </ion-button>
-                </ion-col>
-            </ion-row>
-        </ion-grid>
+            <ion-item class="ion-margin-bottom">
+                <ion-label class="sr-only">{{ 'core.login.password' | translate }}</ion-label>
+                <core-show-password name="password">
+                    <ion-input class="core-ioninput-password" name="password" type="password"
+                        placeholder="{{ 'core.login.password' | translate }}" formControlName="password" [clearOnEdit]="false"
+                        autocomplete="current-password" enterkeyhint="go" required="true">
+                    </ion-input>
+                </core-show-password>
+            </ion-item>
+            <ion-grid class="ion-padding">
+                <ion-row>
+                    <ion-col>
+                        <ion-button expand="block" fill="outline" (click)="cancel($event)">
+                            {{ 'core.login.cancel' | translate }}
+                        </ion-button>
+                    </ion-col>
+                    <ion-col>
+                        <ion-button type="submit" expand="block" [disabled]="!credForm.valid">
+                            {{ 'core.login.loginbutton' | translate }}
+                        </ion-button>
+                    </ion-col>
+                </ion-row>
+            </ion-grid>
 
-        <ng-container *ngIf="showScanQR">
-            <div class="ion-text-center ion-padding">{{ 'core.login.or' | translate }}</div>
-            <ion-button expand="block" fill="outline" class="ion-margin" (click)="showInstructionsAndScanQR()">
-                <ion-icon slot="start" name="fas-qrcode" aria-hidden="true"></ion-icon>
-                {{ 'core.scanqr' | translate }}
+            <ng-container *ngIf="showScanQR">
+                <div class="ion-text-center ion-padding">{{ 'core.login.or' | translate }}</div>
+                <ion-button expand="block" fill="outline" class="ion-margin" (click)="showInstructionsAndScanQR()">
+                    <ion-icon slot="start" name="fas-qrcode" aria-hidden="true"></ion-icon>
+                    {{ 'core.scanqr' | translate }}
+                </ion-button>
+            </ng-container>
+        </form>
+
+        <!-- Forgotten password option. -->
+        <ion-button *ngIf="showForgottenPassword && !isOAuth" expand="block" fill="clear" color="dark"
+            class="core-login-forgotten-password core-button-as-link ion-text-wrap" (click)="forgottenPassword()">
+            {{ 'core.login.forgotten' | translate }}
+        </ion-button>
+
+        <!-- Identity providers. -->
+        <ion-list *ngIf="identityProviders && identityProviders.length" class="ion-padding-top core-login-identity-providers">
+            <ion-item class="ion-text-wrap">
+                <ion-label>
+                    <h3 class="item-heading">{{ 'core.login.potentialidps' | translate }}</h3>
+                </ion-label>
+            </ion-item>
+            <ion-button fill="outline" *ngFor="let provider of identityProviders" class="ion-text-wrap ion-margin core-oauth-provider"
+                (click)="oauthClicked(provider)" [attr.aria-label]="provider.name" expand="block">
+                <img [src]="provider.iconurl" alt="" width="32" height="32" slot="start">
+                <ion-label>{{provider.name}}</ion-label>
             </ion-button>
-        </ng-container>
-    </form>
+        </ion-list>
 
-    <!-- Forgotten password option. -->
-    <ion-button *ngIf="showForgottenPassword && !isOAuth" expand="block" fill="clear" color="dark"
-        class="core-login-forgotten-password core-button-as-link ion-text-wrap" (click)="forgottenPassword()">
-        {{ 'core.login.forgotten' | translate }}
-    </ion-button>
-
-    <!-- Identity providers. -->
-    <ion-list *ngIf="identityProviders && identityProviders.length" class="ion-padding-top core-login-identity-providers">
-        <ion-item class="ion-text-wrap">
-            <ion-label>
-                <h3 class="item-heading">{{ 'core.login.potentialidps' | translate }}</h3>
-            </ion-label>
-        </ion-item>
-        <ion-button fill="outline" *ngFor="let provider of identityProviders" class="ion-text-wrap core-oauth-provider"
-            (click)="oauthClicked(provider)" [attr.aria-label]="provider.name" expand="block">
-            <img [src]="provider.iconurl" alt="" width="32" height="32" slot="start">
-            <ion-label>{{provider.name}}</ion-label>
-        </ion-button>
-    </ion-list>
-
-    <!-- If OAuth, display cancel button since the form isn't displayed. -->
-    <ion-list *ngIf="isOAuth">
-        <ion-button expand="block" class="ion-margin" fill="outline" (click)="cancel($event)">
-            {{ 'core.login.cancel' | translate }}
-        </ion-button>
-    </ion-list>
+        <!-- If OAuth, display cancel button since the form isn't displayed. -->
+        <ion-list *ngIf="isOAuth">
+            <ion-button expand="block" class="ion-margin" fill="outline" (click)="cancel($event)">
+                {{ 'core.login.cancel' | translate }}
+            </ion-button>
+        </ion-list>
+    </div>
 </ion-content>
diff --git a/src/core/features/login/pages/site/site.html b/src/core/features/login/pages/site/site.html
index 70254c58a..c51e50ee4 100644
--- a/src/core/features/login/pages/site/site.html
+++ b/src/core/features/login/pages/site/site.html
@@ -16,102 +16,104 @@
     </ion-toolbar>
 </ion-header>
 <ion-content class="ion-padding">
-    <div class="ion-text-center ion-padding ion-margin-bottom core-login-site-logo" [class.hidden]="hasSites || enteredSiteUrl">
-        <img src="assets/img/login_logo.png" class="avatar-full login-logo" role="presentation" alt="">
-    </div>
-    <form [formGroup]="siteForm" (ngSubmit)="connect($event, siteForm.value.siteUrl)" *ngIf="!fixedSites" #siteFormEl>
-        <!-- Form to input the site URL if there are no fixed sites. -->
-        <ng-container *ngIf="siteSelector == 'url'">
-            <ion-item>
-                <ion-label position="stacked">
-                    <h2>{{ 'core.login.siteaddress' | translate }}</h2>
-                </ion-label>
-                <ion-input name="url" type="url" placeholder="{{ 'core.login.siteaddressplaceholder' | translate }}"
-                    formControlName="siteUrl" [core-auto-focus]="showKeyboard && !showScanQR">
-                </ion-input>
-            </ion-item>
-        </ng-container>
-        <ng-container *ngIf="siteSelector != 'url'">
-            <ion-item>
-                <ion-label position="stacked">
-                    <h2>{{ 'core.login.siteaddress' | translate }}</h2>
-                </ion-label>
-                <ion-input name="url" placeholder="{{ 'core.login.siteaddressplaceholder' | translate }}" formControlName="siteUrl"
-                    [core-auto-focus]="showKeyboard && !showScanQR" (ionChange)="searchSite($event, siteForm.value.siteUrl)">
-                </ion-input>
-            </ion-item>
+    <div class="list-item-limited-width">
+        <div class="ion-text-center ion-padding ion-margin-bottom core-login-site-logo" [class.hidden]="hasSites || enteredSiteUrl">
+            <img src="assets/img/login_logo.png" class="avatar-full login-logo" role="presentation" alt="">
+        </div>
+        <form [formGroup]="siteForm" (ngSubmit)="connect($event, siteForm.value.siteUrl)" *ngIf="!fixedSites" #siteFormEl>
+            <!-- Form to input the site URL if there are no fixed sites. -->
+            <ng-container *ngIf=" siteSelector=='url'">
+                <ion-item>
+                    <ion-label position=" stacked">
+                        <h2>{{ 'core.login.siteaddress' | translate }}</h2>
+                    </ion-label>
+                    <ion-input name="url" type="url" placeholder="{{ 'core.login.siteaddressplaceholder' | translate }}"
+                        formControlName="siteUrl" [core-auto-focus]="showKeyboard && !showScanQR">
+                    </ion-input>
+                </ion-item>
+            </ng-container>
+            <ng-container *ngIf="siteSelector != 'url'">
+                <ion-item>
+                    <ion-label position="stacked">
+                        <h2>{{ 'core.login.siteaddress' | translate }}</h2>
+                    </ion-label>
+                    <ion-input name="url" placeholder="{{ 'core.login.siteaddressplaceholder' | translate }}" formControlName="siteUrl"
+                        [core-auto-focus]="showKeyboard && !showScanQR" (ionChange)="searchSite($event, siteForm.value.siteUrl)">
+                    </ion-input>
+                </ion-item>
 
-            <ion-list [class.hidden]="!hasSites && !enteredSiteUrl" class="core-login-site-list">
-                <ion-item class="core-login-site-list-title">
+                <ion-list [class.hidden]="!hasSites && !enteredSiteUrl" class="core-login-site-list">
+                    <ion-item class="core-login-site-list-title">
+                        <ion-label>
+                            <h2 class="item-heading">{{ 'core.login.selectsite' | translate }}</h2>
+                        </ion-label>
+                    </ion-item>
+                    <ion-item button *ngIf="enteredSiteUrl" (click)="connect($event, enteredSiteUrl.url)"
+                        [attr.aria-label]="'core.login.connect' | translate" detail="true" class="core-login-entered-site">
+                        <ion-thumbnail slot="start" aria-hidden="true">
+                            <ion-icon name="fas-pen" aria-hidden="true"></ion-icon>
+                        </ion-thumbnail>
+                        <ion-label>
+                            <h2 class="ion-text-wrap">{{ 'core.login.yourenteredsite' | translate }}</h2>
+                            <p>{{enteredSiteUrl.noProtocolUrl}}</p>
+                        </ion-label>
+                    </ion-item>
+
+                    <div class="core-login-site-list-found" [class.hidden]="!hasSites" [class.dimmed]="loadingSites">
+                        <div *ngIf="loadingSites" class="core-login-site-list-loading">
+                            <ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner>
+                        </div>
+                        <ng-container *ngFor="let site of sites">
+                            <ng-container *ngTemplateOutlet="sitelisting; context: {site: site}"></ng-container>
+                        </ng-container>
+                    </div>
+                </ion-list>
+
+                <div *ngIf="!hasSites && loadingSites" class="core-login-site-nolist-loading">
+                    <ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner>
+                </div>
+            </ng-container>
+
+            <ion-item *ngIf="siteSelector == 'url'">
+                <ion-label>
+                    <ion-button expand="block" [disabled]="!siteForm.valid" class="ion-text-wrap" type="submit">
+                        {{ 'core.login.connect' | translate }}
+                    </ion-button>
+                </ion-label>
+            </ion-item>
+        </form>
+
+        <ng-container *ngIf="fixedSites">
+            <!-- Pick the site from a list of fixed sites. -->
+            <ion-list *ngIf="siteSelector == 'list'">
+                <ion-item>
                     <ion-label>
                         <h2 class="item-heading">{{ 'core.login.selectsite' | translate }}</h2>
                     </ion-label>
                 </ion-item>
-                <ion-item button *ngIf="enteredSiteUrl" (click)="connect($event, enteredSiteUrl.url)"
-                    [attr.aria-label]="'core.login.connect' | translate" detail="true" class="core-login-entered-site">
-                    <ion-thumbnail slot="start" aria-hidden="true">
-                        <ion-icon name="fas-pen" aria-hidden="true"></ion-icon>
-                    </ion-thumbnail>
-                    <ion-label>
-                        <h2 class="ion-text-wrap">{{ 'core.login.yourenteredsite' | translate }}</h2>
-                        <p>{{enteredSiteUrl.noProtocolUrl}}</p>
-                    </ion-label>
-                </ion-item>
-
-                <div class="core-login-site-list-found" [class.hidden]="!hasSites" [class.dimmed]="loadingSites">
-                    <div *ngIf="loadingSites" class="core-login-site-list-loading">
-                        <ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner>
-                    </div>
-                    <ng-container *ngFor="let site of sites">
-                        <ng-container *ngTemplateOutlet="sitelisting; context: {site: site}"></ng-container>
-                    </ng-container>
-                </div>
+                <ion-searchbar *ngIf="fixedSites.length > 4" [(ngModel)]="filter" (ionInput)="filterChanged($event)"
+                    (ionCancel)="filterChanged()" [placeholder]="'core.login.findyoursite' | translate">
+                </ion-searchbar>
+                <ng-container *ngFor="let site of filteredSites">
+                    <ng-container *ngTemplateOutlet="sitelisting; context: {site: site}"></ng-container>
+                </ng-container>
             </ion-list>
-
-            <div *ngIf="!hasSites && loadingSites" class="core-login-site-nolist-loading">
-                <ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner>
-            </div>
         </ng-container>
 
-        <ion-item *ngIf="siteSelector == 'url'">
-            <ion-label>
-                <ion-button expand="block" [disabled]="!siteForm.valid" class="ion-text-wrap" type="submit">
-                    {{ 'core.login.connect' | translate }}
-                </ion-button>
-            </ion-label>
-        </ion-item>
-    </form>
+        <ng-container *ngIf="showScanQR && !hasSites && !enteredSiteUrl">
+            <div class="ion-text-center ion-padding ion-margin-top">{{ 'core.login.or' | translate }}</div>
+            <ion-button expand="block" fill="outline" class="ion-margin" (click)="showInstructionsAndScanQR()" aria-haspopup="dialog">
+                <ion-icon slot="start" name="fas-qrcode" aria-hidden="true"></ion-icon>
+                {{ 'core.scanqr' | translate }}
+            </ion-button>
+        </ng-container>
 
-    <ng-container *ngIf="fixedSites">
-        <!-- Pick the site from a list of fixed sites. -->
-        <ion-list *ngIf="siteSelector == 'list'">
-            <ion-item>
-                <ion-label>
-                    <h2 class="item-heading">{{ 'core.login.selectsite' | translate }}</h2>
-                </ion-label>
-            </ion-item>
-            <ion-searchbar *ngIf="fixedSites.length > 4" [(ngModel)]="filter" (ionInput)="filterChanged($event)"
-                (ionCancel)="filterChanged()" [placeholder]="'core.login.findyoursite' | translate">
-            </ion-searchbar>
-            <ng-container *ngFor="let site of filteredSites">
-                <ng-container *ngTemplateOutlet="sitelisting; context: {site: site}"></ng-container>
-            </ng-container>
-        </ion-list>
-    </ng-container>
-
-    <ng-container *ngIf="showScanQR && !hasSites && !enteredSiteUrl">
-        <div class="ion-text-center ion-padding ion-margin-top">{{ 'core.login.or' | translate }}</div>
-        <ion-button expand="block" fill="outline" class="ion-margin" (click)="showInstructionsAndScanQR()" aria-haspopup="dialog">
-            <ion-icon slot="start" name="fas-qrcode" aria-hidden="true"></ion-icon>
-            {{ 'core.scanqr' | translate }}
+        <!-- Help. -->
+        <ion-button class="ion-margin-top core-login-need-help core-button-as-link ion-text-wrap" (click)="showHelp()"
+            aria-haspopup="dialog" expand="block" fill="clear" color="dark">
+            {{ 'core.needhelp' | translate }}
         </ion-button>
-    </ng-container>
-
-    <!-- Help. -->
-    <ion-button class="ion-margin-top core-login-need-help core-button-as-link ion-text-wrap" (click)="showHelp()" aria-haspopup="dialog"
-        expand="block" fill="clear" color="dark">
-        {{ 'core.needhelp' | translate }}
-    </ion-button>
+    </div>
 </ion-content>
 
 <!-- Template site selector. -->
diff --git a/src/core/features/login/pages/site/site.scss b/src/core/features/login/pages/site/site.scss
index 8c655c802..c3c49cbd2 100644
--- a/src/core/features/login/pages/site/site.scss
+++ b/src/core/features/login/pages/site/site.scss
@@ -1,5 +1,9 @@
 @import "~theme/globals";
 
+:host {
+    --list-item--max-width: 600px;
+}
+
 .item-input:last-child {
     margin-bottom: 20px;
 }
@@ -101,12 +105,6 @@
 }
 
 @include media-breakpoint-up(md) {
-    ion-content > * {
-        max-width: 600px;
-        margin: 0 auto;
-        width: 100%;
-    }
-
     ion-content .core-login-site-logo {
         margin-top: 20%;
         &.hidden {
diff --git a/src/core/features/login/pages/sites/sites.html b/src/core/features/login/pages/sites/sites.html
index d7a06fa24..c1e6cadf3 100644
--- a/src/core/features/login/pages/sites/sites.html
+++ b/src/core/features/login/pages/sites/sites.html
@@ -20,7 +20,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <core-loading [hideUntil]="loaded">
+    <core-loading [hideUntil]="loaded" class="list-item-limited-width">
         <ion-list class="core-sitelist">
             <ion-card *ngFor="let sites of accountsList.otherSites">
                 <ion-item-divider sticky="true" *ngIf="sites[0]" class="core-sitelist-sitename">
diff --git a/src/core/features/settings/pages/about/about.html b/src/core/features/settings/pages/about/about.html
index 4af2acfda..7417a8084 100644
--- a/src/core/features/settings/pages/about/about.html
+++ b/src/core/features/settings/pages/about/about.html
@@ -12,7 +12,7 @@
 </ion-header>
 
 <ion-content>
-    <ion-list>
+    <ion-list class="list-item-limited-width">
         <ion-item button class="ion-text-wrap" (click)="openPage('licenses')" detail="true">
             <ion-icon name="far-copyright" slot="start" aria-hidden="true"></ion-icon>
             <ion-label>{{ 'core.settings.opensourcelicenses' | translate }}</ion-label>
diff --git a/src/core/features/settings/pages/dev/dev.html b/src/core/features/settings/pages/dev/dev.html
index 2140d1bfa..61d6f0f52 100644
--- a/src/core/features/settings/pages/dev/dev.html
+++ b/src/core/features/settings/pages/dev/dev.html
@@ -16,7 +16,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-list>
+    <ion-list class="list-item-limited-width">
         <ion-item class="ion-text-wrap">
             <ion-label>
                 <h2>{{ 'core.settings.textdirection' | translate }}</h2>
diff --git a/src/core/features/settings/pages/deviceinfo/deviceinfo.html b/src/core/features/settings/pages/deviceinfo/deviceinfo.html
index 54ffba79a..cd049841d 100644
--- a/src/core/features/settings/pages/deviceinfo/deviceinfo.html
+++ b/src/core/features/settings/pages/deviceinfo/deviceinfo.html
@@ -17,7 +17,7 @@
 </ion-header>
 
 <ion-content>
-    <ion-list>
+    <ion-list class="list-item-limited-width">
         <ion-item *ngIf="showDevOptions" detail="true" (click)="gotoDevOptions()">
             <ion-icon name="fas-terminal" slot="start" aria-hidden="true"></ion-icon>
             <ion-label class="ion-text-wrap">
diff --git a/src/core/features/settings/pages/general/general.html b/src/core/features/settings/pages/general/general.html
index a48de95bc..3c463ffe7 100644
--- a/src/core/features/settings/pages/general/general.html
+++ b/src/core/features/settings/pages/general/general.html
@@ -10,8 +10,8 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-list>
-        <ion-item class="ion-text-wrap">
+    <ion-list class="list-item-limited-width">
+        <ion-item class="ion-text-wrap" lines="none">
             <ion-label>
                 <h2>{{ 'core.settings.language' | translate }}</h2>
             </ion-label>
@@ -20,7 +20,7 @@
                 <ion-select-option *ngFor="let entry of languages" [value]="entry.code">{{ entry.name }}</ion-select-option>
             </ion-select>
         </ion-item>
-        <ion-item class="ion-text-wrap core-settings-general-font-size item-interactive">
+        <ion-item class="ion-text-wrap core-settings-general-font-size item-interactive" lines="none">
             <ion-label>
                 <h2>{{ 'core.settings.fontsize' | translate }}</h2>
             </ion-label>
@@ -35,8 +35,7 @@
                 </ion-segment-button>
             </ion-segment>
         </ion-item>
-        <ion-item class="ion-text-wrap core-settings-general-color-scheme" *ngIf="colorSchemes.length > 0"
-            [lines]="selectedScheme=='system' && isAndroid ? 'none' : ''">
+        <ion-item class="ion-text-wrap core-settings-general-color-scheme" *ngIf="colorSchemes.length > 0" lines="none">
             <ion-label>
                 <h2>{{ 'core.settings.colorscheme' | translate }}</h2>
                 <p *ngIf="colorSchemeDisabled" class="text-danger">{{ 'core.settings.forcedsetting' | translate }}</p>
@@ -47,7 +46,7 @@
                     {{ 'core.settings.colorscheme-' + scheme | translate }}</ion-select-option>
             </ion-select>
         </ion-item>
-        <ion-item text-wrap *ngIf="colorSchemes.length > 0 && selectedScheme=='system' && isAndroid">
+        <ion-item text-wrap *ngIf="colorSchemes.length > 0 && selectedScheme=='system' && isAndroid" lines="none">
             <ion-label>
                 <p>{{ 'core.settings.colorscheme-system-notice' | translate }}</p>
             </ion-label>
diff --git a/src/core/features/settings/pages/licenses/licenses.html b/src/core/features/settings/pages/licenses/licenses.html
index 8306bb9e9..e33be5446 100644
--- a/src/core/features/settings/pages/licenses/licenses.html
+++ b/src/core/features/settings/pages/licenses/licenses.html
@@ -10,7 +10,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <core-loading [hideUntil]="loaded">
+    <core-loading [hideUntil]="loaded" class="list-item-limited-width">
         <ion-searchbar [(ngModel)]="textFilter" (ionInput)="filterChanged($event.target)" (ionCancel)="filterChanged($event.target)"
             [placeholder]="'core.filter' | translate">
         </ion-searchbar>
diff --git a/src/core/features/settings/pages/space-usage/space-usage.html b/src/core/features/settings/pages/space-usage/space-usage.html
index 57586ef86..38c8c0f61 100644
--- a/src/core/features/settings/pages/space-usage/space-usage.html
+++ b/src/core/features/settings/pages/space-usage/space-usage.html
@@ -16,7 +16,7 @@
     <ion-refresher [disabled]="!loaded" (ionRefresh)="refreshData($event.target)" slot="fixed">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <core-loading [hideUntil]="loaded">
+    <core-loading [hideUntil]="loaded" class="list-item-limited-width">
         <ion-list>
             <ion-item *ngFor="let site of sites" [class.item-current]="site.id == currentSiteId">
                 <ion-label class="ion-text-wrap">
diff --git a/src/core/features/settings/pages/synchronization/synchronization.html b/src/core/features/settings/pages/synchronization/synchronization.html
index cb0243de0..6dc4c3d51 100644
--- a/src/core/features/settings/pages/synchronization/synchronization.html
+++ b/src/core/features/settings/pages/synchronization/synchronization.html
@@ -16,7 +16,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <core-loading [hideUntil]="sitesLoaded">
+    <core-loading [hideUntil]="sitesLoaded" class="list-item-limited-width">
         <ion-list>
             <ion-item-divider>
                 <ion-label>

From 64f687f8a8067b850a9a99ce99dda567a92f9049 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 28 Feb 2022 15:48:58 +0100
Subject: [PATCH 0622/1008] MOBILE-3814 calendar: Change calendar filter to a
 side modal

---
 .../pages/issued-badge/issued-badge.html      |  2 +-
 .../calendar/components/components.module.ts  |  6 ++--
 .../filter/addon-calendar-filter-popover.html | 18 ------------
 .../calendar/components/filter/filter.html    | 29 +++++++++++++++++++
 .../{filter-popover.scss => filter.scss}      |  0
 .../calendar/components/filter/filter.ts      | 18 ++++++++----
 .../addon-calendar-upcoming-events.html       |  2 +-
 src/addons/calendar/pages/day/day.html        |  2 +-
 src/addons/calendar/pages/day/day.page.ts     | 13 ++++-----
 src/addons/calendar/pages/index/index.html    |  2 +-
 src/addons/calendar/pages/index/index.page.ts | 13 ++++-----
 .../pages/competency/competency.html          |  2 +-
 .../competencysummary/competencysummary.html  |  2 +-
 .../coursecompetencies.html                   |  2 +-
 src/addons/competency/pages/plan/plan.html    |  2 +-
 .../index/addon-mod-assign-index.html         |  2 +-
 .../index/addon-mod-data-index.html           |  2 +-
 src/addons/mod/data/pages/entry/entry.html    |  3 +-
 .../index/addon-mod-feedback-index.html       |  2 +-
 .../index/addon-mod-resource-index.html       |  2 +-
 .../components/index/addon-mod-url-index.html |  2 +-
 .../privatefiles/pages/index/index.html       |  2 +-
 .../comments/pages/viewer/viewer.html         |  2 +-
 .../tag-area/core-course-tag-area.html        | 18 +++++++-----
 .../tag/components/feed/core-tag-feed.html    | 24 ++++++++-------
 .../tag/pages/index-area/index-area.html      |  2 +-
 .../tag-area/core-user-tag-area.html          | 15 ++++++----
 src/core/features/user/pages/about/about.html |  2 +-
 .../features/user/pages/profile/profile.html  |  2 +-
 29 files changed, 107 insertions(+), 86 deletions(-)
 delete mode 100644 src/addons/calendar/components/filter/addon-calendar-filter-popover.html
 create mode 100644 src/addons/calendar/components/filter/filter.html
 rename src/addons/calendar/components/filter/{filter-popover.scss => filter.scss} (100%)

diff --git a/src/addons/badges/pages/issued-badge/issued-badge.html b/src/addons/badges/pages/issued-badge/issued-badge.html
index 834845a06..fde877cb2 100644
--- a/src/addons/badges/pages/issued-badge/issued-badge.html
+++ b/src/addons/badges/pages/issued-badge/issued-badge.html
@@ -13,7 +13,7 @@
     <ion-refresher slot="fixed" [disabled]="!badgeLoaded" (ionRefresh)="refreshBadges($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <core-loading [hideUntil]="badgeLoaded">
+    <core-loading [hideUntil]="badgeLoaded" class="list-item-limited-width">
         <ion-item-group *ngIf="badge">
             <ion-item class="ion-text-wrap ion-text-center">
                 <ion-label>
diff --git a/src/addons/calendar/components/components.module.ts b/src/addons/calendar/components/components.module.ts
index 283909027..68b2bdee2 100644
--- a/src/addons/calendar/components/components.module.ts
+++ b/src/addons/calendar/components/components.module.ts
@@ -18,14 +18,14 @@ import { CoreSharedModule } from '@/core/shared.module';
 
 import { AddonCalendarCalendarComponent } from './calendar/calendar';
 import { AddonCalendarUpcomingEventsComponent } from './upcoming-events/upcoming-events';
-import { AddonCalendarFilterPopoverComponent } from './filter/filter';
+import { AddonCalendarFilterComponent } from './filter/filter';
 import { AddonCalendarReminderTimeModalComponent } from './reminder-time-modal/reminder-time-modal';
 
 @NgModule({
     declarations: [
         AddonCalendarCalendarComponent,
         AddonCalendarUpcomingEventsComponent,
-        AddonCalendarFilterPopoverComponent,
+        AddonCalendarFilterComponent,
         AddonCalendarReminderTimeModalComponent,
     ],
     imports: [
@@ -36,7 +36,7 @@ import { AddonCalendarReminderTimeModalComponent } from './reminder-time-modal/r
     exports: [
         AddonCalendarCalendarComponent,
         AddonCalendarUpcomingEventsComponent,
-        AddonCalendarFilterPopoverComponent,
+        AddonCalendarFilterComponent,
         AddonCalendarReminderTimeModalComponent,
     ],
 })
diff --git a/src/addons/calendar/components/filter/addon-calendar-filter-popover.html b/src/addons/calendar/components/filter/addon-calendar-filter-popover.html
deleted file mode 100644
index fd88358b3..000000000
--- a/src/addons/calendar/components/filter/addon-calendar-filter-popover.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<ion-list>
-    <ion-item *ngFor="let type of types" class="addon-calendar-event" [ngClass]="['addon-calendar-eventtype-'+type]">
-        <ion-icon [name]="typeIcons[type]" slot="start" aria-hidden="true"></ion-icon>
-        <ion-label>{{ 'addon.calendar.' + type + 'events' | translate}}</ion-label>
-        <ion-toggle [(ngModel)]="filter[type]" (ionChange)="onChange()" slot="end"></ion-toggle>
-    </ion-item>
-    <core-spacer *ngIf="filter.course || filter.category || filter.group"></core-spacer>
-    <ng-container *ngIf="filter.course || filter.category || filter.group">
-        <ion-radio-group [(ngModel)]="courseId" (ionChange)="onChange()">
-            <ion-item class="ion-text-wrap" *ngFor="let course of courses">
-                <ion-label>
-                    <core-format-text [text]="course.fullname"></core-format-text>
-                </ion-label>
-                <ion-radio slot="end" [value]="course.id"></ion-radio>
-            </ion-item>
-        </ion-radio-group>
-    </ng-container>
-</ion-list>
diff --git a/src/addons/calendar/components/filter/filter.html b/src/addons/calendar/components/filter/filter.html
new file mode 100644
index 000000000..c49826ce1
--- /dev/null
+++ b/src/addons/calendar/components/filter/filter.html
@@ -0,0 +1,29 @@
+<ion-header class="no-title">
+    <ion-toolbar>
+        <ion-buttons slot="end">
+            <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
+                <ion-icon name="fas-times" slot="icon-only" aria-hidden=true></ion-icon>
+            </ion-button>
+        </ion-buttons>
+    </ion-toolbar>
+</ion-header>
+<ion-content [fullscreen]="true">
+    <ion-list>
+        <ion-item *ngFor="let type of types" class="addon-calendar-event" [ngClass]="['addon-calendar-eventtype-'+type]">
+            <ion-icon [name]="typeIcons[type]" slot="start" aria-hidden="true"></ion-icon>
+            <ion-label>{{ 'addon.calendar.' + type + 'events' | translate}}</ion-label>
+            <ion-toggle [(ngModel)]="filter[type]" (ionChange)="onChange()" slot="end"></ion-toggle>
+        </ion-item>
+        <core-spacer *ngIf="filter.course || filter.category || filter.group"></core-spacer>
+        <ng-container *ngIf="filter.course || filter.category || filter.group">
+            <ion-radio-group [(ngModel)]="courseId" (ionChange)="onChange()">
+                <ion-item class="ion-text-wrap" *ngFor="let course of courses">
+                    <ion-label>
+                        <core-format-text [text]="course.fullname"></core-format-text>
+                    </ion-label>
+                    <ion-radio slot="end" [value]="course.id"></ion-radio>
+                </ion-item>
+            </ion-radio-group>
+        </ng-container>
+    </ion-list>
+</ion-content>
diff --git a/src/addons/calendar/components/filter/filter-popover.scss b/src/addons/calendar/components/filter/filter.scss
similarity index 100%
rename from src/addons/calendar/components/filter/filter-popover.scss
rename to src/addons/calendar/components/filter/filter.scss
diff --git a/src/addons/calendar/components/filter/filter.ts b/src/addons/calendar/components/filter/filter.ts
index 8827846c5..9d25721b2 100644
--- a/src/addons/calendar/components/filter/filter.ts
+++ b/src/addons/calendar/components/filter/filter.ts
@@ -15,6 +15,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { CoreEnrolledCourseData } from '@features/courses/services/courses';
 import { CoreUtils } from '@services/utils/utils';
+import { ModalController } from '@singletons';
 import { CoreEvents } from '@singletons/events';
 import { AddonCalendarEventType, AddonCalendarProvider } from '../../services/calendar';
 import { AddonCalendarFilter, AddonCalendarEventIcons } from '../../services/calendar-helper';
@@ -23,11 +24,11 @@ import { AddonCalendarFilter, AddonCalendarEventIcons } from '../../services/cal
  * Component to display the events filter that includes events types and a list of courses.
  */
 @Component({
-    selector: 'addon-calendar-filter-popover',
-    templateUrl: 'addon-calendar-filter-popover.html',
-    styleUrls: ['../../calendar-common.scss', 'filter-popover.scss'],
+    selector: 'addon-calendar-filter',
+    templateUrl: 'filter.html',
+    styleUrls: ['../../calendar-common.scss', 'filter.scss'],
 })
-export class AddonCalendarFilterPopoverComponent implements OnInit {
+export class AddonCalendarFilterComponent implements OnInit {
 
     @Input() filter: AddonCalendarFilter = {
         filtered: false,
@@ -56,7 +57,7 @@ export class AddonCalendarFilterPopoverComponent implements OnInit {
     }
 
     /**
-     * Init the component.
+     * @inheritdoc
      */
     ngOnInit(): void {
         this.courseId = this.filter.courseId || -1;
@@ -80,4 +81,11 @@ export class AddonCalendarFilterPopoverComponent implements OnInit {
         CoreEvents.trigger(AddonCalendarProvider.FILTER_CHANGED_EVENT, this.filter);
     }
 
+    /**
+     * Close modal.
+     */
+    closeModal(): void {
+        ModalController.dismiss();
+    }
+
 }
diff --git a/src/addons/calendar/components/upcoming-events/addon-calendar-upcoming-events.html b/src/addons/calendar/components/upcoming-events/addon-calendar-upcoming-events.html
index 23283d242..e5a295569 100644
--- a/src/addons/calendar/components/upcoming-events/addon-calendar-upcoming-events.html
+++ b/src/addons/calendar/components/upcoming-events/addon-calendar-upcoming-events.html
@@ -6,7 +6,7 @@
         <ng-container *ngFor="let event of filteredEvents">
             <ion-card>
                 <ion-item class="ion-text-wrap addon-calendar-event" [attr.aria-label]="event.name" (click)="eventClicked(event)" button
-                    [ngClass]="['addon-calendar-eventtype-'+event.eventtype]" detail="true">
+                    [ngClass]="['addon-calendar-eventtype-'+event.eventtype]" [detail]="false">
                     <core-mod-icon *ngIf="event.moduleIcon" [modicon]="event.moduleIcon" slot="start" [modname]="event.modulename"
                         [componentId]="event.instance" [showAlt]="false"></core-mod-icon>
                     <ion-icon *ngIf="event.eventIcon && !event.moduleIcon" [name]="event.eventIcon" slot="start" aria-hidden="true">
diff --git a/src/addons/calendar/pages/day/day.html b/src/addons/calendar/pages/day/day.html
index e3f7b3766..daf9206dd 100644
--- a/src/addons/calendar/pages/day/day.html
+++ b/src/addons/calendar/pages/day/day.html
@@ -7,7 +7,7 @@
             <h1>{{ 'addon.calendar.calendarevents' | translate }}</h1>
         </ion-title>
         <ion-buttons slot="end">
-            <ion-button fill="clear" (click)="openFilter($event)" [attr.aria-label]="'core.filter' | translate">
+            <ion-button fill="clear" (click)="openFilter()" [attr.aria-label]="'core.filter' | translate">
                 <ion-icon slot="icon-only" name="fas-filter" aria-hidden="true"></ion-icon>
             </ion-button>
             <core-context-menu>
diff --git a/src/addons/calendar/pages/day/day.page.ts b/src/addons/calendar/pages/day/day.page.ts
index 03b10b0b2..be2c15588 100644
--- a/src/addons/calendar/pages/day/day.page.ts
+++ b/src/addons/calendar/pages/day/day.page.ts
@@ -31,7 +31,7 @@ import { AddonCalendarFilter, AddonCalendarHelper } from '../../services/calenda
 import { AddonCalendarSync, AddonCalendarSyncProvider } from '../../services/calendar-sync';
 import { CoreCategoryData, CoreCourses, CoreEnrolledCourseData } from '@features/courses/services/courses';
 import { CoreCoursesHelper } from '@features/courses/services/courses-helper';
-import { AddonCalendarFilterPopoverComponent } from '../../components/filter/filter';
+import { AddonCalendarFilterComponent } from '../../components/filter/filter';
 import moment from 'moment';
 import { Network, NgZone } from '@singletons';
 import { CoreNavigator } from '@services/navigator';
@@ -348,18 +348,15 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
     }
 
     /**
-     * Show the context menu.
-     *
-     * @param event Event.
+     * Show the filter menu.
      */
-    async openFilter(event: MouseEvent): Promise<void> {
-        await CoreDomUtils.openPopover({
-            component: AddonCalendarFilterPopoverComponent,
+    async openFilter(): Promise<void> {
+        await CoreDomUtils.openSideModal({
+            component: AddonCalendarFilterComponent,
             componentProps: {
                 courses: this.manager?.getSource().courses,
                 filter: this.filter,
             },
-            event,
         });
     }
 
diff --git a/src/addons/calendar/pages/index/index.html b/src/addons/calendar/pages/index/index.html
index 8675bca95..61b07e7d5 100644
--- a/src/addons/calendar/pages/index/index.html
+++ b/src/addons/calendar/pages/index/index.html
@@ -7,7 +7,7 @@
             <h1>{{ (showCalendar ? 'addon.calendar.calendarevents' : 'addon.calendar.upcomingevents') | translate }}</h1>
         </ion-title>
         <ion-buttons slot="end">
-            <ion-button fill="clear" (click)="openFilter($event)" [attr.aria-label]="'core.filter' | translate">
+            <ion-button fill="clear" (click)="openFilter()" [attr.aria-label]="'core.filter' | translate">
                 <ion-icon slot="icon-only" name="fas-filter" aria-hidden="true"></ion-icon>
             </ion-button>
             <core-context-menu>
diff --git a/src/addons/calendar/pages/index/index.page.ts b/src/addons/calendar/pages/index/index.page.ts
index 0b55de067..c0ac2fb1c 100644
--- a/src/addons/calendar/pages/index/index.page.ts
+++ b/src/addons/calendar/pages/index/index.page.ts
@@ -29,7 +29,7 @@ import { CoreEnrolledCourseData } from '@features/courses/services/courses';
 import { ActivatedRoute, Params } from '@angular/router';
 import { AddonCalendarCalendarComponent } from '../../components/calendar/calendar';
 import { AddonCalendarUpcomingEventsComponent } from '../../components/upcoming-events/upcoming-events';
-import { AddonCalendarFilterPopoverComponent } from '../../components/filter/filter';
+import { AddonCalendarFilterComponent } from '../../components/filter/filter';
 import { CoreNavigator } from '@services/navigator';
 import { CoreLocalNotifications } from '@services/local-notifications';
 import { CoreConstants } from '@/core/constants';
@@ -328,18 +328,15 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy {
     }
 
     /**
-     * Show the context menu.
-     *
-     * @param event Event.
+     * Show the filter menu.
      */
-    async openFilter(event: MouseEvent): Promise<void> {
-        await CoreDomUtils.openPopover({
-            component: AddonCalendarFilterPopoverComponent,
+    async openFilter(): Promise<void> {
+        await CoreDomUtils.openSideModal({
+            component: AddonCalendarFilterComponent,
             componentProps: {
                 courses: this.courses,
                 filter: this.filter,
             },
-            event,
         });
     }
 
diff --git a/src/addons/competency/pages/competency/competency.html b/src/addons/competency/pages/competency/competency.html
index a73a97e2c..53b0778d7 100644
--- a/src/addons/competency/pages/competency/competency.html
+++ b/src/addons/competency/pages/competency/competency.html
@@ -14,7 +14,7 @@
     <ion-refresher slot="fixed" [disabled]="!competencyLoaded" (ionRefresh)="refreshCompetency($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <core-loading [hideUntil]="competencyLoaded">
+    <core-loading [hideUntil]="competencyLoaded" class="list-item-limited-width">
         <ion-card *ngIf="user">
             <ion-item class="ion-text-wrap">
                 <core-user-avatar [user]="user" slot="start"></core-user-avatar>
diff --git a/src/addons/competency/pages/competencysummary/competencysummary.html b/src/addons/competency/pages/competencysummary/competencysummary.html
index 1467f6e50..b5314d334 100644
--- a/src/addons/competency/pages/competencysummary/competencysummary.html
+++ b/src/addons/competency/pages/competencysummary/competencysummary.html
@@ -14,7 +14,7 @@
     <ion-refresher slot="fixed" [disabled]="!competencyLoaded" (ionRefresh)="refreshCompetency($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <core-loading [hideUntil]="competencyLoaded">
+    <core-loading [hideUntil]="competencyLoaded" class="list-item-limited-width">
         <ion-card *ngIf="competency">
             <ion-item class="ion-text-wrap" *ngIf="competency.competency.description">
                 <ion-label>
diff --git a/src/addons/competency/pages/coursecompetencies/coursecompetencies.html b/src/addons/competency/pages/coursecompetencies/coursecompetencies.html
index fd6746901..6ca87f8af 100644
--- a/src/addons/competency/pages/coursecompetencies/coursecompetencies.html
+++ b/src/addons/competency/pages/coursecompetencies/coursecompetencies.html
@@ -12,7 +12,7 @@
     <ion-refresher slot="fixed" [disabled]="!competencies.loaded" (ionRefresh)="refreshCourseCompetencies($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <core-loading [hideUntil]="competencies.loaded">
+    <core-loading [hideUntil]="competencies.loaded" class="list-item-limited-width">
         <ion-card *ngIf="!user && courseCompetencies && courseCompetencies.statistics.competencycount > 0">
             <ng-container *ngIf="courseCompetencies.cangradecompetencies">
                 <ion-item class="ion-text-wrap" *ngIf="courseCompetencies.settings.pushratingstouserplans">
diff --git a/src/addons/competency/pages/plan/plan.html b/src/addons/competency/pages/plan/plan.html
index 0f84cbb7f..1f2275c70 100644
--- a/src/addons/competency/pages/plan/plan.html
+++ b/src/addons/competency/pages/plan/plan.html
@@ -12,7 +12,7 @@
     <ion-refresher slot="fixed" [disabled]="!competencies.loaded" (ionRefresh)="refreshLearningPlan($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <core-loading [hideUntil]="competencies.loaded">
+    <core-loading [hideUntil]="competencies.loaded" class="list-item-limited-width">
         <ion-card *ngIf="user">
             <ion-item class="ion-text-wrap">
                 <ion-label>
diff --git a/src/addons/mod/assign/components/index/addon-mod-assign-index.html b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
index 4072066ff..2c09b70b1 100644
--- a/src/addons/mod/assign/components/index/addon-mod-assign-index.html
+++ b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="!showLoading">
+<core-loading [hideUntil]="!showLoading" class="list-item-limited-width">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
diff --git a/src/addons/mod/data/components/index/addon-mod-data-index.html b/src/addons/mod/data/components/index/addon-mod-data-index.html
index 40b51ef5a..3289a134c 100644
--- a/src/addons/mod/data/components/index/addon-mod-data-index.html
+++ b/src/addons/mod/data/components/index/addon-mod-data-index.html
@@ -18,7 +18,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="!showLoading">
+<core-loading [hideUntil]="!showLoading" class="list-item-limited-width">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
diff --git a/src/addons/mod/data/pages/entry/entry.html b/src/addons/mod/data/pages/entry/entry.html
index e66b33145..3b4c9b000 100644
--- a/src/addons/mod/data/pages/entry/entry.html
+++ b/src/addons/mod/data/pages/entry/entry.html
@@ -16,7 +16,8 @@
         (ionRefresh)="refreshDatabase($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <core-loading [hideUntil]="entryLoaded && (isPullingToRefresh || !renderingEntry && !loadingRating && !loadingComments)">
+    <core-loading [hideUntil]="entryLoaded && (isPullingToRefresh || !renderingEntry && !loadingRating && !loadingComments)"
+        class="list-item-limited-width">
         <!-- Database entries found to be synchronized -->
         <ion-card class="core-warning-card" *ngIf="entry && entry.hasOffline">
             <ion-item>
diff --git a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
index 7a1c4b742..f74b6c412 100644
--- a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
+++ b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="!showLoading">
+<core-loading [hideUntil]="!showLoading" class="list-item-limited-width">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
diff --git a/src/addons/mod/resource/components/index/addon-mod-resource-index.html b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
index cf24bdd04..bcac791b8 100644
--- a/src/addons/mod/resource/components/index/addon-mod-resource-index.html
+++ b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="!showLoading" class="safe-area-padding core-loading-full-height">
+<core-loading [hideUntil]="!showLoading" class="safe-area-padding core-loading-full-height list-item-limited-width">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [courseId]="courseId" [description]="displayDescription && description"
diff --git a/src/addons/mod/url/components/index/addon-mod-url-index.html b/src/addons/mod/url/components/index/addon-mod-url-index.html
index 734fbbe7e..0b115989f 100644
--- a/src/addons/mod/url/components/index/addon-mod-url-index.html
+++ b/src/addons/mod/url/components/index/addon-mod-url-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="!showLoading">
+<core-loading [hideUntil]="!showLoading" class="list-item-limited-width">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="displayDescription && description" [component]="component"
diff --git a/src/addons/privatefiles/pages/index/index.html b/src/addons/privatefiles/pages/index/index.html
index 3ddf3e3f7..a3555462f 100644
--- a/src/addons/privatefiles/pages/index/index.html
+++ b/src/addons/privatefiles/pages/index/index.html
@@ -14,7 +14,7 @@
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
-    <core-loading [hideUntil]="filesLoaded" *ngIf="showPrivateFiles || showSiteFiles">
+    <core-loading [hideUntil]="filesLoaded" *ngIf="showPrivateFiles || showSiteFiles" class="list-item-limited-width">
         <!-- Allow selecting the files to see: private or site. -->
         <core-combobox [selection]="root" (onChange)="rootChanged($event)" *ngIf="showPrivateFiles && showSiteFiles && !path">
             <ion-select-option class="ion-text-wrap" value="my">
diff --git a/src/core/features/comments/pages/viewer/viewer.html b/src/core/features/comments/pages/viewer/viewer.html
index 1534cdcef..4e1336a18 100644
--- a/src/core/features/comments/pages/viewer/viewer.html
+++ b/src/core/features/comments/pages/viewer/viewer.html
@@ -38,7 +38,7 @@
         <core-infinite-loading [enabled]="canLoadMore" position="top" (action)="loadPrevious($event)" [error]="loadMoreError">
         </core-infinite-loading>
 
-        <ion-list class="addon-messages-discussion-container">
+        <ion-list class="addon-messages-discussion-container  list-item-limited-width">
             <ng-container *ngFor="let comment of comments; index as index; last as last">
 
                 <p class="ion-text-center addon-messages-date" *ngIf="comment.showDate">
diff --git a/src/core/features/course/components/tag-area/core-course-tag-area.html b/src/core/features/course/components/tag-area/core-course-tag-area.html
index aa0f0df2b..033ffc509 100644
--- a/src/core/features/course/components/tag-area/core-course-tag-area.html
+++ b/src/core/features/course/components/tag-area/core-course-tag-area.html
@@ -1,8 +1,10 @@
-<ion-item class="ion-text-wrap" *ngFor="let item of items" (click)="openCourse(item.courseId)" [attr.aria-label]="item.courseName" button
-    detail="true">
-    <ion-icon name="fas-graduation-cap" slot="start" aria-hidden="true"></ion-icon>
-    <ion-label>
-        <p class="item-heading">{{ item.courseName }}</p>
-        <p *ngIf="item.categoryName">{{ 'core.category' | translate }}: {{ item.categoryName }}</p>
-    </ion-label>
-</ion-item>
+<ion-card *ngFor="let item of items">
+    <ion-item class="ion-text-wrap" (click)="openCourse(item.courseId)" [attr.aria-label]="item.courseName" button detail="true">
+        <ion-icon name="fas-graduation-cap" slot="start" aria-hidden="true"></ion-icon>
+        <ion-label>
+            <p class="item-heading">{{ item.courseName }}</p>
+            <p *ngIf="item.categoryName">{{ 'core.category' | translate }}: {{ item.categoryName }}</p>
+        </ion-label>
+    </ion-item>
+
+</ion-card>
diff --git a/src/core/features/tag/components/feed/core-tag-feed.html b/src/core/features/tag/components/feed/core-tag-feed.html
index 629c2189c..9e8f44309 100644
--- a/src/core/features/tag/components/feed/core-tag-feed.html
+++ b/src/core/features/tag/components/feed/core-tag-feed.html
@@ -1,11 +1,13 @@
-<ion-item class="ion-text-wrap" *ngFor="let item of items" [href]="item.url" core-link [capture]="true">
-    <ion-avatar slot="start" *ngIf="item.avatarUrl">
-        <img [src]="item.avatarUrl" core-external-content alt="" role="presentation" onError="this.src='assets/img/user-avatar.png'">
-    </ion-avatar>
-    <core-mod-icon *ngIf="item.iconUrl" [modicon]="item.iconUrl" slot="start" [showAlt]="false">
-    </core-mod-icon>
-    <ion-label>
-        <h2>{{ item.heading }}</h2>
-        <p *ngFor="let text of item.details">{{ text }}</p>
-    </ion-label>
-</ion-item>
+<ion-card *ngFor="let item of items">
+    <ion-item class="ion-text-wrap" [href]="item.url" core-link [capture]="true">
+        <ion-avatar slot="start" *ngIf="item.avatarUrl">
+            <img [src]="item.avatarUrl" core-external-content alt="" role="presentation" onError="this.src='assets/img/user-avatar.png'">
+        </ion-avatar>
+        <core-mod-icon *ngIf="item.iconUrl" [modicon]="item.iconUrl" slot="start" [showAlt]="false">
+        </core-mod-icon>
+        <ion-label>
+            <h2>{{ item.heading }}</h2>
+            <p *ngFor="let text of item.details">{{ text }}</p>
+        </ion-label>
+    </ion-item>
+</ion-card>
diff --git a/src/core/features/tag/pages/index-area/index-area.html b/src/core/features/tag/pages/index-area/index-area.html
index 5a03671d8..9cb089c17 100644
--- a/src/core/features/tag/pages/index-area/index-area.html
+++ b/src/core/features/tag/pages/index-area/index-area.html
@@ -14,7 +14,7 @@
     <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="refreshData($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <core-loading [hideUntil]="loaded">
+    <core-loading [hideUntil]="loaded" class="list-item-limited-width">
         <ng-container *ngIf="loaded">
             <core-dynamic-component [component]="areaComponent" [data]="{items: items}"></core-dynamic-component>
         </ng-container>
diff --git a/src/core/features/user/components/tag-area/core-user-tag-area.html b/src/core/features/user/components/tag-area/core-user-tag-area.html
index f4f4a9392..bfd6c0af4 100644
--- a/src/core/features/user/components/tag-area/core-user-tag-area.html
+++ b/src/core/features/user/components/tag-area/core-user-tag-area.html
@@ -1,6 +1,9 @@
-<ion-item class="ion-text-wrap" *ngFor="let item of items" core-user-link [userId]="item.user.id">
-    <core-user-avatar [user]="item.user" slot="start"></core-user-avatar>
-    <ion-label>
-        <h2>{{ item.heading }}</h2>
-    </ion-label>
-</ion-item>
+<ion-card *ngFor="let item of items">
+    <ion-item class="ion-text-wrap" core-user-link [userId]="item.user.id">
+        <core-user-avatar [user]="item.user" slot="start"></core-user-avatar>
+        <ion-label>
+            <h2>{{ item.heading }}</h2>
+        </ion-label>
+    </ion-item>
+
+</ion-card>
diff --git a/src/core/features/user/pages/about/about.html b/src/core/features/user/pages/about/about.html
index d31800b14..295192bbe 100644
--- a/src/core/features/user/pages/about/about.html
+++ b/src/core/features/user/pages/about/about.html
@@ -12,7 +12,7 @@
     <ion-refresher slot="fixed" [disabled]="!userLoaded" (ionRefresh)="refreshUser($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <core-loading [hideUntil]="userLoaded">
+    <core-loading [hideUntil]="userLoaded" class="list-item-limited-width">
         <ion-list *ngIf="user">
             <ion-item class="ion-text-center core-user-profile-maininfo ion-text-wrap" lines="full">
                 <core-user-avatar [user]="user" [userId]="user.id" [linkProfile]="false" [checkOnline]="!canChangeProfilePicture">
diff --git a/src/core/features/user/pages/profile/profile.html b/src/core/features/user/pages/profile/profile.html
index e135eced7..5dbb82b82 100644
--- a/src/core/features/user/pages/profile/profile.html
+++ b/src/core/features/user/pages/profile/profile.html
@@ -12,7 +12,7 @@
     <ion-refresher slot="fixed" [disabled]="!userLoaded" (ionRefresh)="refreshUser($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <core-loading [hideUntil]="userLoaded">
+    <core-loading [hideUntil]="userLoaded" class="list-item-limited-width">
         <ion-list *ngIf="user && !isDeleted && isEnrolled">
             <ion-item class="ion-text-center core-user-profile-maininfo ion-text-wrap">
                 <core-user-avatar [user]="user" [userId]="user.id" [linkProfile]="false" [checkOnline]="true">

From 331b16440f0af2f70ce100bf78cad31fb6a18e8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 1 Mar 2022 10:03:23 +0100
Subject: [PATCH 0623/1008] MOBILE-3814 style: Fix typo on
 --list-item--max-width

---
 src/core/components/loading/loading.scss                        | 2 +-
 .../courses/components/course-list-item/course-list-item.scss   | 2 +-
 src/core/features/login/pages/site/site.scss                    | 2 +-
 src/theme/theme.base.scss                                       | 2 +-
 src/theme/theme.light.scss                                      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/core/components/loading/loading.scss b/src/core/components/loading/loading.scss
index 1f704d0e6..fc4d95b1f 100644
--- a/src/core/components/loading/loading.scss
+++ b/src/core/components/loading/loading.scss
@@ -82,7 +82,7 @@
     }
 
     &.list-item-limited-width .core-loading-content {
-        max-width: var(--list-item--max-width);
+        max-width: var(--list-item-max-width);
         margin-left: auto !important;
         margin-right: auto !important;
     }
diff --git a/src/core/features/courses/components/course-list-item/course-list-item.scss b/src/core/features/courses/components/course-list-item/course-list-item.scss
index d6bc0342e..48e3c7284 100644
--- a/src/core/features/courses/components/course-list-item/course-list-item.scss
+++ b/src/core/features/courses/components/course-list-item/course-list-item.scss
@@ -102,7 +102,7 @@ ion-chip {
 
 // List layout.
 ion-card.core-course-list-item {
-    max-width: var(--list-item--max-width);
+    max-width: var(--list-item-max-width);
 
     ion-icon.course-icon {
         padding: 12px;
diff --git a/src/core/features/login/pages/site/site.scss b/src/core/features/login/pages/site/site.scss
index c3c49cbd2..927315fa1 100644
--- a/src/core/features/login/pages/site/site.scss
+++ b/src/core/features/login/pages/site/site.scss
@@ -1,7 +1,7 @@
 @import "~theme/globals";
 
 :host {
-    --list-item--max-width: 600px;
+    --list-item-max-width: 600px;
 }
 
 .item-input:last-child {
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index a9b897801..9a182fa5c 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -830,7 +830,7 @@ ion-card {
 ion-list.core-course-module-list-wrapper,
 .list-item-limited-width,
 .core-course-module-list-wrapper {
-    max-width: var(--list-item--max-width);
+    max-width: var(--list-item-max-width);
     margin-left: auto !important;
     margin-right: auto !important;
 }
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index febfd5762..e04f70066 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -79,7 +79,7 @@
     --module-icon-size: 24px;
     --module-icon-radius: var(--medium-radius);
 
-    --list-item--max-width: 768px;
+    --list-item-max-width: 768px;
 
     --contrast-background: white;
 

From 717978388e013e451625e9c518b48e9aca92eb49 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 1 Mar 2022 11:47:57 +0100
Subject: [PATCH 0624/1008] MOBILE-3982 core: Extract CoreComponentsRegistry

---
 .../components/context-menu/context-menu.ts     |  3 ++-
 .../components/navbar-buttons/navbar-buttons.ts |  9 +++++----
 src/core/components/tabs-outlet/tabs-outlet.ts  |  3 +--
 src/core/components/tabs/tab.ts                 |  4 ++--
 src/core/core.module.ts                         |  2 ++
 src/core/services/utils/dom.ts                  | 17 +++++++++++------
 6 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/src/core/components/context-menu/context-menu.ts b/src/core/components/context-menu/context-menu.ts
index e981e7500..157407562 100644
--- a/src/core/components/context-menu/context-menu.ts
+++ b/src/core/components/context-menu/context-menu.ts
@@ -20,6 +20,7 @@ import { CoreUtils } from '@services/utils/utils';
 import { Translate } from '@singletons';
 import { CoreContextMenuItemComponent } from './context-menu-item';
 import { CoreContextMenuPopoverComponent } from './context-menu-popover';
+import { CoreComponentsRegistry } from '@singletons/components-registry';
 
 /**
  * This component adds a button (usually in the navigation bar) that displays a context menu popover.
@@ -60,7 +61,7 @@ export class CoreContextMenuComponent implements OnInit, OnDestroy {
         // Calculate the unique ID.
         this.uniqueId = 'core-context-menu-' + CoreUtils.getUniqueId('CoreContextMenuComponent');
 
-        CoreDomUtils.storeInstanceByElement(elementRef.nativeElement, this);
+        CoreComponentsRegistry.register(elementRef.nativeElement, this);
     }
 
     /**
diff --git a/src/core/components/navbar-buttons/navbar-buttons.ts b/src/core/components/navbar-buttons/navbar-buttons.ts
index 48439908e..205ec43db 100644
--- a/src/core/components/navbar-buttons/navbar-buttons.ts
+++ b/src/core/components/navbar-buttons/navbar-buttons.ts
@@ -25,6 +25,7 @@ import {
 import { CoreLogger } from '@singletons/logger';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreContextMenuComponent } from '../context-menu/context-menu';
+import { CoreComponentsRegistry } from '@singletons/components-registry';
 
 const BUTTON_HIDDEN_CLASS = 'core-navbar-button-hidden';
 
@@ -80,7 +81,7 @@ export class CoreNavBarButtonsComponent implements OnInit, OnDestroy {
         this.element = element.nativeElement;
         this.logger = CoreLogger.getInstance('CoreNavBarButtonsComponent');
 
-        CoreDomUtils.storeInstanceByElement(this.element, this);
+        CoreComponentsRegistry.register(this.element, this);
     }
 
     /**
@@ -154,11 +155,11 @@ export class CoreNavBarButtonsComponent implements OnInit, OnDestroy {
         }
 
         const mainContextMenu = buttonsContainer.querySelector('core-context-menu');
-        const secondaryContextMenuInstance = CoreDomUtils.getInstanceByElement<CoreContextMenuComponent>(secondaryContextMenu);
-        let mainContextMenuInstance: CoreContextMenuComponent | undefined;
+        const secondaryContextMenuInstance = CoreComponentsRegistry.resolve(secondaryContextMenu, CoreContextMenuComponent);
+        let mainContextMenuInstance: CoreContextMenuComponent | null;
         if (mainContextMenu) {
             // Both containers have a context menu. Merge them to prevent having 2 menus at the same time.
-            mainContextMenuInstance = CoreDomUtils.getInstanceByElement<CoreContextMenuComponent>(mainContextMenu);
+            mainContextMenuInstance = CoreComponentsRegistry.resolve(mainContextMenu, CoreContextMenuComponent);
         } else {
             // There is a context-menu in these buttons, but there is no main context menu in the header.
             // Create one main context menu dynamically.
diff --git a/src/core/components/tabs-outlet/tabs-outlet.ts b/src/core/components/tabs-outlet/tabs-outlet.ts
index d7575f2fe..32f0f7872 100644
--- a/src/core/components/tabs-outlet/tabs-outlet.ts
+++ b/src/core/components/tabs-outlet/tabs-outlet.ts
@@ -29,7 +29,6 @@ import { Subscription } from 'rxjs';
 import { CoreUtils } from '@services/utils/utils';
 import { Params } from '@angular/router';
 import { CoreNavBarButtonsComponent } from '../navbar-buttons/navbar-buttons';
-import { CoreDomUtils } from '@services/utils/dom';
 import { StackEvent } from '@ionic/angular/directives/navigation/stack-utils';
 import { CoreNavigator } from '@services/navigator';
 import { CoreTabBase, CoreTabsBaseComponent } from '@classes/tabs';
@@ -188,7 +187,7 @@ export class CoreTabsOutletComponent extends CoreTabsBaseComponent<CoreTabsOutle
     protected showHideNavBarButtons(activatedPageName: string): void {
         const elements = this.ionTabs.outlet.nativeEl.querySelectorAll('core-navbar-buttons');
         elements.forEach((element) => {
-            const instance = CoreDomUtils.getInstanceByElement<CoreNavBarButtonsComponent>(element);
+            const instance = CoreComponentsRegistry.resolve(element, CoreNavBarButtonsComponent);
 
             if (instance) {
                 const pagetagName = element.closest('.ion-page')?.tagName;
diff --git a/src/core/components/tabs/tab.ts b/src/core/components/tabs/tab.ts
index 0fb0865fb..2d3166fd5 100644
--- a/src/core/components/tabs/tab.ts
+++ b/src/core/components/tabs/tab.ts
@@ -15,8 +15,8 @@
 import { Component, Input, Output, OnInit, OnDestroy, ElementRef, EventEmitter, ContentChild, TemplateRef } from '@angular/core';
 import { CoreTabBase } from '@classes/tabs';
 
-import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
+import { CoreComponentsRegistry } from '@singletons/components-registry';
 import { CoreNavBarButtonsComponent } from '../navbar-buttons/navbar-buttons';
 import { CoreTabsComponent } from './tabs';
 
@@ -144,7 +144,7 @@ export class CoreTabComponent implements OnInit, OnDestroy, CoreTabBase {
     protected showHideNavBarButtons(show: boolean): void {
         const elements = this.element.querySelectorAll('core-navbar-buttons');
         elements.forEach((element) => {
-            const instance = CoreDomUtils.getInstanceByElement<CoreNavBarButtonsComponent>(element);
+            const instance = CoreComponentsRegistry.resolve(element, CoreNavBarButtonsComponent);
 
             if (instance) {
                 instance.forceHide(!show);
diff --git a/src/core/core.module.ts b/src/core/core.module.ts
index d5c75b618..aa68a6e2a 100644
--- a/src/core/core.module.ts
+++ b/src/core/core.module.ts
@@ -51,9 +51,11 @@ import { CoreUpdateManagerProvider } from '@services/update-manager';
 import { CoreUrlUtilsProvider } from '@services/utils/url';
 import { CoreUtilsProvider } from '@services/utils/utils';
 import { CoreWSProvider } from '@services/ws';
+import { CoreComponentsRegistry } from '@singletons/components-registry';
 
 export const CORE_SERVICES: Type<unknown>[] = [
     CoreAppProvider,
+    CoreComponentsRegistry,
     CoreConfigProvider,
     CoreCronDelegateService,
     CoreCustomURLSchemesProvider,
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index 47c013e9c..a84b182df 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -52,6 +52,7 @@ import { CoreSites } from '@services/sites';
 import { NavigationStart } from '@angular/router';
 import { filter } from 'rxjs/operators';
 import { Subscription } from 'rxjs';
+import { CoreComponentsRegistry } from '@singletons/components-registry';
 
 /*
  * "Utils" service with helper functions for UI, DOM elements and HTML code.
@@ -68,7 +69,6 @@ export class CoreDomUtilsProvider {
     protected template: HTMLTemplateElement = document.createElement('template'); // A template element to convert HTML to element.
 
     protected matchesFunctionName?: string; // Name of the "matches" function to use when simulating a closest call.
-    protected instances: WeakMap<Element, unknown> = new WeakMap(); // Store component/directive instances indexed by element.
     protected debugDisplay = false; // Whether to display debug messages. Store it in a variable to make it synchronous.
     protected displayedAlerts: Record<string, HTMLIonAlertElement> = {}; // To prevent duplicated alerts.
     protected displayedModals: Record<string, HTMLIonModalElement> = {}; // To prevent duplicated modals.
@@ -671,9 +671,10 @@ export class CoreDomUtilsProvider {
      *
      * @param element The root element of the component/directive.
      * @return The instance, undefined if not found.
+     * @deprecated since 4.0.0. Use CoreComponentsRegistry instead.
      */
     getInstanceByElement<T = unknown>(element: Element): T | undefined {
-        return this.instances.get(element) as T;
+        return CoreComponentsRegistry.resolve<T>(element) ?? undefined;
     }
 
     /**
@@ -892,19 +893,22 @@ export class CoreDomUtilsProvider {
      * Remove a component/directive instance using the DOM Element.
      *
      * @param element The root element of the component/directive.
+     * @deprecated since 4.0.0. It's no longer necessary to remove instances.
      */
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     removeInstanceByElement(element: Element): void {
-        const id = element.getAttribute(this.INSTANCE_ID_ATTR_NAME);
-        id && delete this.instances[id];
+        //
     }
 
     /**
      * Remove a component/directive instance using the ID.
      *
      * @param id The ID to remove.
+     * @deprecated since 4.0.0. It's no longer necessary to remove instances.
      */
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     removeInstanceById(id: string): void {
-        delete this.instances[id];
+        //
     }
 
     /**
@@ -1664,9 +1668,10 @@ export class CoreDomUtilsProvider {
      *
      * @param element The root element of the component/directive.
      * @param instance The instance to store.
+     * @deprecated since 4.0.0. Use CoreComponentsRegistry instead.
      */
     storeInstanceByElement(element: Element, instance: unknown): void {
-        this.instances.set(element, instance);
+        CoreComponentsRegistry.register(element, instance);
     }
 
     /**

From 6b5d1db43c8b1eb2241fcb9a5bfe3b36ec8fbaa7 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 24 Feb 2022 17:23:22 +0100
Subject: [PATCH 0625/1008] MOBILE-3982 core: Refactor collapsible-header

---
 src/addons/calendar/pages/event/event.html    |   3 +-
 .../components/tabs-outlet/tabs-outlet.ts     |  14 +-
 src/core/directives/collapsible-header.ts     | 603 +++++++++---------
 src/core/directives/format-text.ts            |  19 +
 .../module-info/core-course-module-info.html  |   2 +-
 .../module-summary/module-summary.scss        |   2 +-
 .../components/single-activity.scss           |   2 +-
 .../features/course/pages/index/index.html    |   4 +-
 src/core/features/course/pages/index/index.ts |   4 +-
 src/core/singletons/components-registry.ts    |  53 ++
 src/theme/components/collapsible-header.scss  |  86 +++
 src/theme/globals.mixins.scss                 |  17 +-
 src/theme/theme.base.scss                     |  82 ---
 src/theme/theme.scss                          |   1 +
 14 files changed, 489 insertions(+), 403 deletions(-)
 create mode 100644 src/core/singletons/components-registry.ts
 create mode 100644 src/theme/components/collapsible-header.scss

diff --git a/src/addons/calendar/pages/event/event.html b/src/addons/calendar/pages/event/event.html
index ae1306688..39364fbc8 100644
--- a/src/addons/calendar/pages/event/event.html
+++ b/src/addons/calendar/pages/event/event.html
@@ -40,8 +40,7 @@
         </ion-card>
 
         <ion-list *ngIf="event">
-            <ion-item class="collapsible-title ion-text-wrap addon-calendar-event"
-                [ngClass]="['addon-calendar-eventtype-'+event.eventtype]">
+            <ion-item class="ion-text-wrap addon-calendar-event" collapsible [ngClass]="['addon-calendar-eventtype-'+event.eventtype]">
                 <core-mod-icon *ngIf="event.moduleIcon" [modicon]="event.moduleIcon" [showAlt]="false" [modname]="event.modulename"
                     [componentId]="event.instance" slot="start"></core-mod-icon>
                 <ion-icon *ngIf=" event.eventIcon && !event.moduleIcon" [name]="event.eventIcon" aria-hidden="true" slot="start">
diff --git a/src/core/components/tabs-outlet/tabs-outlet.ts b/src/core/components/tabs-outlet/tabs-outlet.ts
index 32f0f7872..e2ffef98f 100644
--- a/src/core/components/tabs-outlet/tabs-outlet.ts
+++ b/src/core/components/tabs-outlet/tabs-outlet.ts
@@ -23,7 +23,7 @@ import {
     ElementRef,
     SimpleChange,
 } from '@angular/core';
-import { IonTabs, ViewDidEnter, ViewDidLeave } from '@ionic/angular';
+import { IonRouterOutlet, IonTabs, ViewDidEnter, ViewDidLeave } from '@ionic/angular';
 import { Subscription } from 'rxjs';
 
 import { CoreUtils } from '@services/utils/utils';
@@ -32,6 +32,7 @@ import { CoreNavBarButtonsComponent } from '../navbar-buttons/navbar-buttons';
 import { StackEvent } from '@ionic/angular/directives/navigation/stack-utils';
 import { CoreNavigator } from '@services/navigator';
 import { CoreTabBase, CoreTabsBaseComponent } from '@classes/tabs';
+import { CoreComponentsRegistry } from '@singletons/components-registry';
 
 /**
  * This component displays some top scrollable tabs that will autohide on vertical scroll.
@@ -70,6 +71,8 @@ export class CoreTabsOutletComponent extends CoreTabsBaseComponent<CoreTabsOutle
 
     constructor(element: ElementRef) {
         super(element);
+
+        CoreComponentsRegistry.register(element.nativeElement, this);
     }
 
     /**
@@ -165,6 +168,15 @@ export class CoreTabsOutletComponent extends CoreTabsBaseComponent<CoreTabsOutle
         this.lastActiveComponent?.ionViewDidLeave?.();
     }
 
+    /**
+     * Get router outlet.
+     *
+     * @returns Router outlet
+     */
+    getOutlet(): IonRouterOutlet {
+        return this.ionTabs.outlet;
+    }
+
     /**
      * Load the tab.
      *
diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts
index 95c31c943..61c2f9d1a 100644
--- a/src/core/directives/collapsible-header.ts
+++ b/src/core/directives/collapsible-header.ts
@@ -12,336 +12,331 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Directive, ElementRef, OnDestroy } from '@angular/core';
+import { Directive, ElementRef, OnDestroy, OnInit } from '@angular/core';
+import { CoreTabsOutletComponent } from '@components/tabs-outlet/tabs-outlet';
 import { ScrollDetail } from '@ionic/core';
 import { CoreUtils } from '@services/utils/utils';
-import { Platform } from '@singletons';
-import { CoreEventObserver, CoreEvents } from '@singletons/events';
+import { CoreComponentsRegistry } from '@singletons/components-registry';
 import { CoreMath } from '@singletons/math';
+import { Subscription } from 'rxjs';
+import { CoreFormatTextDirective } from './format-text';
 
 /**
- * Directive to make ion-header collapsible.
- * Ion content should have h1 tag inside.
+ * Directive to make <ion-header> collapsible.
+ *
+ * This directive expects h1 titles to be duplicated in a header and an item inside the page, and it will transition
+ * from one state to another listening to the scroll in the page content. The item to be used as the expanded form
+ * should also have the [collapsed] attribute.
  *
  * Example usage:
  *
  * <ion-header collapsible>
+ *     <ion-toolbar>
+ *         <ion-title>
+ *             <h1>Title</h1>
+ *         </ion-title>
+ *     </ion-toolbar>
+ * </ion-header>
+ *
+ * <ion-content>
+ *     <ion-item collapsible>
+ *         <ion-label>
+ *             <h1>Title</h1>
+ *         </ion-label>
+ *     </ion-item>
+ *     ...
+ * </ion-content>
  */
 @Directive({
     selector: 'ion-header[collapsible]',
 })
-export class CoreCollapsibleHeaderDirective implements OnDestroy {
+export class CoreCollapsibleHeaderDirective implements OnInit, OnDestroy {
 
-    protected loadingObserver: CoreEventObserver;
-    protected content?: HTMLIonContentElement | null;
-    protected contentScroll?: HTMLElement;
-    protected header: HTMLIonHeaderElement;
-    protected titleTopDifference = 1;
-    protected h1StartDifference = 0;
-    protected headerH1FontSize = 0;
-    protected contentH1FontSize = 0;
-    protected headerSubHeadingFontSize = 0;
-    protected contentSubHeadingFontSize = 0;
-    protected subHeadingStartDifference = 0;
-    protected inContent = true;
-    protected title?: HTMLElement | null;
-    protected titleHeight = 0;
-    protected contentH1?: HTMLElement | null;
-    protected debouncedUpdateCollapseProgress: () => void;
+    protected page?: HTMLElement;
+    protected collapsedHeader?: Element;
+    protected collapsedFontStyles?: Partial<CSSStyleDeclaration>;
+    protected expandedHeader?: Element;
+    protected expandedHeaderHeight?: number;
+    protected expandedFontStyles?: Partial<CSSStyleDeclaration>;
+    protected content?: HTMLIonContentElement;
+    protected contentScrollListener?: EventListener;
+    protected floatingTitle?: HTMLElement;
+    protected scrollingHeight?: number;
+    protected subscriptions: Subscription[] = [];
 
-    constructor(el: ElementRef<HTMLIonHeaderElement>) {
-        this.header = el.nativeElement;
-        this.debouncedUpdateCollapseProgress = CoreUtils.debounce(() => this.updateCollapseProgress(), 50);
-
-        this.loadingObserver = CoreEvents.on(CoreEvents.CORE_LOADING_CHANGED, async (data) => {
-            if (!data.loaded) {
-                return;
-            }
-
-            const loadingId = await this.getLoadingId();
-            if (loadingId && data.uniqueId == loadingId) {
-                // Remove event when loading is done.
-                this.loadingObserver.off();
-
-                // Wait to render.
-                await CoreUtils.nextTick();
-                this.setupRealTitle();
-            }
-        });
-    }
+    constructor(protected el: ElementRef) {}
 
     /**
-     * Set content element.
-     *
-     * @param content Content element.
+     * @inheritdoc
      */
-    protected async setContent(content?: HTMLIonContentElement | null): Promise<void> {
-        this.content = content;
+    async ngOnInit(): Promise<void> {
+        this.collapsedHeader = this.el.nativeElement;
 
-        if (content) {
-            this.contentScroll = await content.getScrollElement();
-        } else {
-            delete this.contentScroll;
-        }
-    }
+        await Promise.all([
+            this.initializePage(),
+            this.initializeCollapsedHeader(),
+            this.initializeExpandedHeader(),
+        ]);
 
-    /**
-     * Gets the loading content id to wait for the loading to finish.
-     *
-     * @return Promise resolved with Loading Id, if any.
-     */
-    protected async getLoadingId(): Promise<string | undefined> {
-        if (!this.content) {
-            this.setContent(this.header.parentElement?.querySelector('ion-content:not(.disable-scroll-y)'));
-
-            if (!this.content) {
-                this.cannotCollapse();
-
-                return;
-            }
-
-            const title = this.header.parentElement?.querySelector('.collapsible-title') || null;
-
-            if (title) {
-                // Title already found, no need to wait for loading.
-                this.loadingObserver.off();
-                this.setupRealTitle();
-
-                return;
-            }
-
-        }
-
-        return this.content.querySelector('core-loading.core-loading-loaded:not(.core-loading-inline) .core-loading-content')?.id;
-    }
-
-    /**
-     * Call this function when header is not collapsible.
-     */
-    protected cannotCollapse(): void {
-        this.setContent();
-        this.loadingObserver.off();
-        this.header.classList.add('core-header-collapsed');
-    }
-
-    /**
-     * Gets the real title on ion content to watch scroll.
-     *
-     * @return Promise resolved when done.
-     */
-    protected async setupRealTitle(): Promise<void> {
-        if (!this.content) {
-            this.cannotCollapse();
-
-            return;
-        }
-
-        // Wait animations to finish.
-        const animations = (this.content.getAnimations && this.content.getAnimations()) || [];
-        await Promise.all(animations.map(async (animation) => {
-            await animation.finished;
-        }));
-
-        let title = this.content.querySelector<HTMLElement>('.collapsible-title');
-        if (!title) {
-            // Title is outside the ion-content.
-            title = this.header.parentElement?.querySelector('.collapsible-title') || null;
-            this.inContent = false;
-        }
-        this.contentH1 = title?.querySelector<HTMLElement>('h1');
-        const headerH1 = this.header.querySelector<HTMLElement>('h1');
-        if (!title || !this.contentH1 || !headerH1 || !this.contentH1.parentElement) {
-            this.cannotCollapse();
-
-            return;
-        }
-
-        this.title = title;
-        this.titleHeight = title.getBoundingClientRect().height;
-        this.titleTopDifference = this.contentH1.getBoundingClientRect().top - headerH1.getBoundingClientRect().top;
-
-        if (this.titleTopDifference <= 0) {
-            this.cannotCollapse();
-
-            return;
-        }
-
-        // Split view part.
-        const contentAux = this.header.parentElement?.querySelector<HTMLElement>('ion-content.disable-scroll-y');
-        if (contentAux) {
-            if (contentAux.querySelector('core-split-view.menu-and-content')) {
-                this.cannotCollapse();
-                title.remove();
-
-                return;
-            }
-            contentAux.style.setProperty('--offset-top', this.header.clientHeight + 'px');
-        }
-
-        const headerH1Styles = getComputedStyle(headerH1);
-        const contentH1Styles = getComputedStyle(this.contentH1);
-
-        if (Platform.isRTL) {
-            // Checking position over parent because transition may not be finished.
-            const contentH1Position = this.contentH1.getBoundingClientRect().right - this.content.getBoundingClientRect().right;
-            const headerH1Position = headerH1.getBoundingClientRect().right - this.header.getBoundingClientRect().right;
-
-            this.h1StartDifference = Math.round(contentH1Position - (headerH1Position - parseFloat(headerH1Styles.paddingRight)));
-        } else {
-            // Checking position over parent because transition may not be finished.
-            const contentH1Position = this.contentH1.getBoundingClientRect().left - this.content.getBoundingClientRect().left;
-            const headerH1Position = headerH1.getBoundingClientRect().left - this.header.getBoundingClientRect().left;
-
-            this.h1StartDifference = Math.round(contentH1Position - (headerH1Position + parseFloat(headerH1Styles.paddingLeft)));
-        }
-
-        this.headerH1FontSize = parseFloat(headerH1Styles.fontSize);
-        this.contentH1FontSize = parseFloat(contentH1Styles.fontSize);
-
-        // Transfer font styles.
-        Array.from(headerH1Styles).forEach((styleName) => {
-            if (styleName != 'font-size' &&
-                styleName != 'font-family' &&
-                (styleName.startsWith('font-') || styleName.startsWith('letter-'))) {
-                this.contentH1?.style.setProperty(styleName, headerH1Styles.getPropertyValue(styleName));
-            }
-        });
-        this.contentH1.style.setProperty(
-            '--max-width',
-            (parseFloat(headerH1Styles.width)
-                -parseFloat(headerH1Styles.paddingLeft)
-                -parseFloat(headerH1Styles.paddingRight)
-                +'px'),
-        );
-
-        this.contentH1.setAttribute('aria-hidden', 'true');
-
-        // Clone element to let the other elements be static.
-        const contentH1Clone = this.contentH1.cloneNode(true) as HTMLElement;
-        contentH1Clone.classList.add('cloned');
-        this.contentH1.parentElement.insertBefore(contentH1Clone, this.contentH1);
-        this.contentH1.style.setProperty(
-            'top',
-            (contentH1Clone.getBoundingClientRect().top -
-            this.contentH1.parentElement.getBoundingClientRect().top +
-            parseInt(getComputedStyle(this.contentH1.parentElement).marginTop || '0', 10)) + 'px',
-        );
-        this.contentH1.style.setProperty('position', 'absolute');
-        this.contentH1.parentElement.style.setProperty('position', 'relative');
-
-        this.setupContent();
-    }
-
-    /**
-     * Setup content scroll.
-     *
-     * @param parentId Parent id to recalculate content
-     * @param retries  Retries to find content in case it's loading.
-     */
-    async setupContent(parentId?: string, retries = 5): Promise<void> {
-        if (parentId) {
-            this.setContent(this.header.parentElement?.querySelector(`#${parentId} ion-content:not(.disable-scroll-y)`));
-            this.inContent = false;
-            if (!this.content && retries > 0) {
-                await CoreUtils.nextTick();
-                await this.setupContent(parentId, --retries);
-
-                return;
-            }
-
-            this.updateCollapseProgress();
-        }
-
-        if (!this.title || !this.content) {
-            return;
-        }
-
-        // Add something under the hood to change the page background.
-        let color = getComputedStyle(this.title).getPropertyValue('backgroundColor').trim();
-        if (color == '') {
-            color = getComputedStyle(this.title).getPropertyValue('--background').trim();
-        }
-
-        const underHeader = document.createElement('div');
-        underHeader.classList.add('core-underheader');
-        underHeader.style.setProperty('height', this.header.clientHeight + 'px');
-        underHeader.style.setProperty('background', color);
-        if (this.inContent) {
-            this.content.shadowRoot?.querySelector('#background-content')?.prepend(underHeader);
-            this.content.style.setProperty('--offset-top', this.header.clientHeight + 'px');
-        } else {
-            if (!this.header.closest('.ion-page')?.querySelector('.core-underheader')) {
-                this.header.closest('.ion-page')?.insertBefore(underHeader, this.header);
-            }
-        }
-
-        this.content.scrollEvents = true;
-        this.content.addEventListener('ionScroll', ({ target }: CustomEvent<ScrollDetail>): void => {
-            if (target !== this.content) {
-                return;
-            }
-
-            this.updateCollapseProgress();
-            this.debouncedUpdateCollapseProgress();
-        });
-    }
-
-    /**
-     * Update collapse progress according to the current scroll position.
-     */
-    protected updateCollapseProgress(): void {
-        if (!this.contentScroll || !this.title || !this.contentH1) {
-            return;
-        }
-
-        const collapsibleHeaderHeight = this.title.shadowRoot?.children[0].clientHeight ?? this.title.clientHeight;
-        const scrollableHeight = this.contentScroll.scrollHeight - this.contentScroll.clientHeight;
-        const collapsedHeight = collapsibleHeaderHeight - this.title.clientHeight;
-        let progress = 0;
-        if (scrollableHeight !== 0) {
-            progress = CoreMath.clamp(
-                scrollableHeight + collapsedHeight <= 2 * collapsibleHeaderHeight
-                    ? this.contentScroll.scrollTop / scrollableHeight
-                    : this.contentScroll.scrollTop / collapsibleHeaderHeight,
-                0,
-                1,
-            );
-        }
-        const collapsed = progress === 1;
-
-        if (!this.inContent) {
-            this.title.style.transform = `translateY(-${this.titleTopDifference * progress}px)`;
-            this.title.style.height = `${collapsibleHeaderHeight * (1 - progress)}px`;
-        }
-
-        // Check total collapse.
-        this.header.classList.toggle('core-header-collapsed', collapsed);
-        this.title.classList.toggle('collapsible-title-collapsed', collapsed);
-        this.title.classList.toggle('collapsible-title-collapse-started', progress > 0);
-        this.title.classList.toggle('collapsible-title-collapse-nowrap', progress > 0.5);
-        this.title.style.setProperty('--collapse-opacity', `${1 - progress}`);
-
-        if (collapsed) {
-            this.contentH1.style.transform = `translateX(-${this.h1StartDifference}px)`;
-            this.contentH1.style.setProperty('font-size', `${this.headerH1FontSize}px`);
-
-            return;
-        }
-
-        // Zoom font-size out.
-        const newFontSize = this.contentH1FontSize - ((this.contentH1FontSize - this.headerH1FontSize) * progress);
-        this.contentH1.style.setProperty('font-size', `${newFontSize}px`);
-
-        // Move.
-        const newStart = -this.h1StartDifference * progress;
-        this.contentH1.style.transform = `translateX(${newStart}px)`;
+        this.initializeFloatingTitle();
+        this.initializeContent();
     }
 
     /**
      * @inheritdoc
      */
     ngOnDestroy(): void {
-        this.loadingObserver.off();
+        this.subscriptions.forEach(subscription => subscription.unsubscribe());
+
+        if (this.content && this.contentScrollListener) {
+            this.content.removeEventListener('ionScroll', this.contentScrollListener);
+        }
+    }
+
+    /**
+     * Search the page element, initialize it, and wait until it's ready for the transition to trigger on scroll.
+     */
+    protected async initializePage(): Promise<void> {
+        if (!this.collapsedHeader?.parentElement) {
+            throw new Error('[collapsible-header] Couldn\'t get page');
+        }
+
+        // Find element and prepare classes.
+        this.page = this.collapsedHeader.parentElement;
+
+        this.page.classList.add('collapsible-header-page');
+    }
+
+    /**
+     * Search the collapsed header element, initialize it, and wait until it's ready for the transition to trigger on scroll.
+     */
+    protected async initializeCollapsedHeader(): Promise<void> {
+        if (!this.collapsedHeader) {
+            throw new Error('[collapsible-header] Couldn\'t initialize collapsed header');
+        }
+
+        this.collapsedHeader.classList.add('collapsible-header-collapsed');
+
+        await this.waitFormatTextsRendered(this.collapsedHeader);
+    }
+
+    /**
+     * Search the expanded header element, initialize it, and wait until it's ready for the transition to trigger on scroll.
+     */
+    protected async initializeExpandedHeader(): Promise<void> {
+        do {
+            await CoreUtils.wait(50);
+
+            this.expandedHeader = this.page?.querySelector('ion-item[collapsible]') ?? undefined;
+
+            if (!this.expandedHeader) {
+                continue;
+            }
+
+            await this.waitFormatTextsRendered(this.expandedHeader);
+        } while (
+            !this.expandedHeader ||
+            this.expandedHeader.clientHeight === 0 ||
+            this.expandedHeader.closest('ion-content.animating')
+        );
+
+        this.expandedHeader.classList.add('collapsible-header-expanded');
+    }
+
+    /**
+     * Search the page content, initialize it, and wait until it's ready for the transition to trigger on scroll.
+     */
+    protected async initializeContent(): Promise<void> {
+        // Initialize from tabs.
+        const tabs = CoreComponentsRegistry.resolve(this.page?.querySelector('core-tabs-outlet'), CoreTabsOutletComponent);
+
+        if (tabs) {
+            const outlet = tabs.getOutlet();
+            const onOutletUpdated = () => {
+                const activePage = outlet.nativeEl.querySelector('.ion-page:not(.ion-page-hidden)');
+
+                this.updateContent(activePage?.querySelector('ion-content:not(.disable-scroll-y)') as HTMLIonContentElement);
+            };
+
+            this.subscriptions.push(outlet.activateEvents.subscribe(onOutletUpdated));
+            this.subscriptions.push(outlet.deactivateEvents.subscribe(onOutletUpdated));
+
+            onOutletUpdated();
+
+            return;
+        }
+
+        // Initialize from page content.
+        const content = this.page?.querySelector('ion-content:not(.disable-scroll-y)');
+
+        if (!content) {
+            throw new Error('[collapsible-header] Couldn\'t get content');
+        }
+
+        this.trackContentScroll(content as HTMLIonContentElement);
+    }
+
+    /**
+     * Initialize a floating title to mimic transitioning the title from one state to the other.
+     */
+    protected initializeFloatingTitle(): void {
+        if (!this.page || !this.collapsedHeader || !this.expandedHeader) {
+            throw new Error('[collapsible-header] Couldn\'t create floating title');
+        }
+
+        // Add floating title and measure initial position.
+        const collapsedHeaderTitle = this.collapsedHeader.querySelector('h1') as HTMLElement;
+        const originalTitle = this.expandedHeader.querySelector('h1') as HTMLElement;
+        const floatingTitleWrapper = originalTitle.parentElement as HTMLElement;
+        const floatingTitle = originalTitle.cloneNode(true) as HTMLElement;
+
+        originalTitle.classList.add('collapsible-header-original-title');
+        floatingTitle.classList.add('collapsible-header-floating-title');
+        floatingTitleWrapper.classList.add('collapsible-header-floating-title-wrapper');
+        floatingTitleWrapper.insertBefore(floatingTitle, originalTitle);
+
+        const floatingTitleBoundingBox = floatingTitle.getBoundingClientRect();
+
+        // Prepare styles variables.
+        const collapsedHeaderTitleBoundingBox = collapsedHeaderTitle.getBoundingClientRect();
+        const collapsedTitleStyles = getComputedStyle(collapsedHeaderTitle);
+        const expandedHeaderHeight = this.expandedHeader.clientHeight;
+        const expandedTitleStyles = getComputedStyle(originalTitle);
+        const originalTitleBoundingBox = originalTitle.getBoundingClientRect();
+        const textProperties = ['overflow', 'white-space', 'text-overflow', 'color'];
+        const [collapsedFontStyles, expandedFontStyles] = Array
+            .from(collapsedTitleStyles)
+            .filter(
+                property =>
+                    property.startsWith('font-') ||
+                    property.startsWith('letter-') ||
+                    textProperties.includes(property),
+            )
+            .reduce((styles, property) => {
+                styles[0][property] = collapsedTitleStyles.getPropertyValue(property);
+                styles[1][property] = expandedTitleStyles.getPropertyValue(property);
+
+                return styles;
+            }, [{}, {}]);
+        const cssVariables = {
+            '--collapsible-header-collapsed-height': `${this.collapsedHeader.clientHeight}px`,
+            '--collapsible-header-expanded-y-delta': `-${this.collapsedHeader.clientHeight}px`,
+            '--collapsible-header-expanded-height': `${expandedHeaderHeight}px`,
+            '--collapsible-header-floating-title-top': `${originalTitleBoundingBox.top - floatingTitleBoundingBox.top}px`,
+            '--collapsible-header-floating-title-left': `${originalTitleBoundingBox.left - floatingTitleBoundingBox.left}px`,
+            '--collapsible-header-floating-title-width': `${originalTitle.clientWidth}px`,
+            '--collapsible-header-floating-title-x-delta':
+                `${collapsedHeaderTitleBoundingBox.left - originalTitleBoundingBox.left}px`,
+            '--collapsible-header-floating-title-width-delta': `${collapsedHeaderTitle.clientWidth - originalTitle.clientWidth}px`,
+        };
+
+        Object
+            .entries(cssVariables)
+            .forEach(([property, value]) => this.page?.style.setProperty(property, value));
+
+        Object
+            .entries(expandedFontStyles)
+            .forEach(([property, value]) => floatingTitle.style.setProperty(property, value as string));
+
+        // Activate styles.
+        this.page.classList.add('is-active');
+
+        this.floatingTitle = floatingTitle;
+        this.scrollingHeight = originalTitleBoundingBox.top - collapsedHeaderTitleBoundingBox.top;
+        this.collapsedFontStyles = collapsedFontStyles;
+        this.expandedFontStyles = expandedFontStyles;
+        this.expandedHeaderHeight = expandedHeaderHeight;
+    }
+
+    /**
+     * Wait until all <core-format-text> children inside the element are done rendering.
+     *
+     * @param element Element.
+     */
+    protected async waitFormatTextsRendered(element: Element): Promise<void> {
+        const formatTexts = Array
+            .from(element.querySelectorAll('core-format-text'))
+            .map(element => CoreComponentsRegistry.resolve(element, CoreFormatTextDirective));
+
+        await Promise.all(formatTexts.map(formatText => formatText?.rendered()));
+    }
+
+    /**
+     * Update content element whos scroll is being tracked.
+     *
+     * @param content Content element.
+     */
+    protected updateContent(content?: HTMLIonContentElement | null): void {
+        if (this.content && this.contentScrollListener) {
+            this.content.removeEventListener('ionScroll', this.contentScrollListener);
+
+            delete this.content;
+            delete this.contentScrollListener;
+        }
+
+        content && this.trackContentScroll(content);
+    }
+
+    /**
+     * Listen to a content element for scroll events that will control the header state transition.
+     *
+     * @param content Content element.
+     */
+    protected async trackContentScroll(content: HTMLIonContentElement): Promise<void> {
+        if (content === this.content) {
+            return;
+        }
+
+        const page = this.page;
+        const scrollingHeight = this.scrollingHeight;
+        const expandedHeader = this.expandedHeader;
+        const expandedHeaderHeight = this.expandedHeaderHeight;
+        const expandedFontStyles = this.expandedFontStyles;
+        const collapsedFontStyles = this.collapsedFontStyles;
+        const floatingTitle = this.floatingTitle;
+        const contentScroll = await content.getScrollElement();
+
+        if (
+            !page ||
+            !scrollingHeight ||
+            !expandedHeader ||
+            !expandedHeaderHeight ||
+            !expandedFontStyles ||
+            !collapsedFontStyles ||
+            !floatingTitle
+        ) {
+            throw new Error('[collapsible-header] Couldn\'t set up scrolling');
+        }
+
+        page.style.setProperty('--collapsible-header-progress', '0');
+        page.classList.toggle('is-within-content', content.contains(expandedHeader));
+        page.classList.toggle('is-collapsed', false);
+
+        Object
+            .entries(expandedFontStyles)
+            .forEach(([property, value]) => floatingTitle.style.setProperty(property, value as string));
+
+        this.content = content;
+        this.content.addEventListener('ionScroll', this.contentScrollListener = ({ target }: CustomEvent<ScrollDetail>): void => {
+            if (target !== this.content) {
+                return;
+            }
+
+            const scrollableHeight = contentScroll.scrollHeight - contentScroll.clientHeight;
+            const collapsedHeight = expandedHeaderHeight - (expandedHeader.clientHeight ?? 0);
+            const frozen = scrollableHeight + collapsedHeight <= 2 * expandedHeaderHeight;
+            const progress = frozen
+                ? 0
+                :  CoreMath.clamp(contentScroll.scrollTop / scrollingHeight, 0, 1);
+
+            page.style.setProperty('--collapsible-header-progress', `${progress}`);
+            page.classList.toggle('is-frozen', frozen);
+            page.classList.toggle('is-collapsed', progress === 1);
+
+            Object
+                .entries(progress > .5 ? collapsedFontStyles : expandedFontStyles)
+                .forEach(([property, value]) => floatingTitle.style.setProperty(property, value as string));
+        });
     }
 
 }
diff --git a/src/core/directives/format-text.ts b/src/core/directives/format-text.ts
index 959735eef..5171ae54b 100644
--- a/src/core/directives/format-text.ts
+++ b/src/core/directives/format-text.ts
@@ -39,6 +39,7 @@ import { CoreFilter, CoreFilterFilter, CoreFilterFormatTextOptions } from '@feat
 import { CoreFilterDelegate } from '@features/filter/services/filter-delegate';
 import { CoreFilterHelper } from '@features/filter/services/filter-helper';
 import { CoreSubscriptions } from '@singletons/subscriptions';
+import { CoreComponentsRegistry } from '@singletons/components-registry';
 
 /**
  * Directive to format text rendered. It renders the HTML and treats all links and media, using CoreLinkDirective
@@ -95,6 +96,8 @@ export class CoreFormatTextDirective implements OnChanges {
         @Optional() protected content: IonContent,
         protected viewContainerRef: ViewContainerRef,
     ) {
+        CoreComponentsRegistry.register(element.nativeElement, this);
+
         this.element = element.nativeElement;
         this.element.classList.add('core-format-text-loading'); // Hide contents until they're treated.
 
@@ -125,6 +128,22 @@ export class CoreFormatTextDirective implements OnChanges {
         }
     }
 
+    /**
+     * Wait until the text is fully rendered.
+     */
+    async rendered(): Promise<void> {
+        if (!this.element.classList.contains('core-format-text-loading')) {
+            return;
+        }
+
+        await new Promise<void>(resolve => {
+            const subscription = this.afterRender.subscribe(() => {
+                subscription.unsubscribe();
+                resolve();
+            });
+        });
+    }
+
     /**
      * Apply CoreExternalContentDirective to a certain element.
      *
diff --git a/src/core/features/course/components/module-info/core-course-module-info.html b/src/core/features/course/components/module-info/core-course-module-info.html
index f6f50dd35..a4e77744e 100644
--- a/src/core/features/course/components/module-info/core-course-module-info.html
+++ b/src/core/features/course/components/module-info/core-course-module-info.html
@@ -1,4 +1,4 @@
-<ion-item class="ion-text-wrap collapsible-title">
+<ion-item class="ion-text-wrap" collapsible>
     <core-mod-icon slot="start" [modicon]="modicon" [modname]="module.modname" [componentId]="module.instance">
     </core-mod-icon>
     <ion-label>
diff --git a/src/core/features/course/components/module-summary/module-summary.scss b/src/core/features/course/components/module-summary/module-summary.scss
index 59ce443d5..5f86396c2 100644
--- a/src/core/features/course/components/module-summary/module-summary.scss
+++ b/src/core/features/course/components/module-summary/module-summary.scss
@@ -1,6 +1,6 @@
 @import "~theme/globals";
 
-:host ::ng-deep .collapsible-title ion-label {
+:host ::ng-deep ion-item[collapsible] ion-label {
     margin-top: 12px;
 }
 
diff --git a/src/core/features/course/format/singleactivity/components/single-activity.scss b/src/core/features/course/format/singleactivity/components/single-activity.scss
index 1352a5254..50ff5bd01 100644
--- a/src/core/features/course/format/singleactivity/components/single-activity.scss
+++ b/src/core/features/course/format/singleactivity/components/single-activity.scss
@@ -1,3 +1,3 @@
-:host ::ng-deep .collapsible-title {
+:host ::ng-deep ion-item[collapsible] {
     display: none;
 }
diff --git a/src/core/features/course/pages/index/index.html b/src/core/features/course/pages/index/index.html
index 2a234b5d5..c1d586d11 100644
--- a/src/core/features/course/pages/index/index.html
+++ b/src/core/features/course/pages/index/index.html
@@ -16,7 +16,7 @@
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
-<ion-item class="core-format-progress-list ion-text-wrap collapsible-title list-item-limited-width">
+<ion-item class="core-format-progress-list ion-text-wrap list-item-limited-width" collapsible>
     <ion-avatar slot="start" class="core-course-thumb" *ngIf="imageThumb">
         <img [src]="imageThumb" core-external-content alt="" />
     </ion-avatar>
@@ -29,4 +29,4 @@
     </ion-label>
 
 </ion-item>
-<core-tabs-outlet [tabs]="tabs" [hideUntil]="loaded" (ionChange)="tabSelected($event)"></core-tabs-outlet>
+<core-tabs-outlet [tabs]="tabs" [hideUntil]="loaded" (ionChange)="tabSelected()"></core-tabs-outlet>
diff --git a/src/core/features/course/pages/index/index.ts b/src/core/features/course/pages/index/index.ts
index c6b24df14..82ddef122 100644
--- a/src/core/features/course/pages/index/index.ts
+++ b/src/core/features/course/pages/index/index.ts
@@ -171,9 +171,7 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
     /**
      * A tab was selected.
      */
-    tabSelected(tabToSelect: CoreTabsOutletTab): void {
-        this.ionCollapsibleHeader?.setupContent(tabToSelect.id);
-
+    tabSelected(): void {
         if (!this.module || !this.course) {
             return;
         }
diff --git a/src/core/singletons/components-registry.ts b/src/core/singletons/components-registry.ts
new file mode 100644
index 000000000..a5c7b12fb
--- /dev/null
+++ b/src/core/singletons/components-registry.ts
@@ -0,0 +1,53 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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.
+
+/**
+ * Registry to keep track of component instances.
+ */
+export class CoreComponentsRegistry {
+
+    private static instances: WeakMap<Element, unknown> = new WeakMap();
+
+    /**
+     * Register a component instance.
+     *
+     * @param element Root element.
+     * @param instance Component instance.
+     */
+    static register(element: Element, instance: unknown): void {
+        this.instances.set(element, instance);
+    }
+
+    /**
+     * Resolve a component instance.
+     *
+     * @param element Root element.
+     * @param componentClass Component class.
+     * @returns Component instance.
+     */
+    static resolve<T>(element?: Element | null, componentClass?: ComponentConstructor<T>): T | null {
+        const instance = (element && this.instances.get(element) as T) ?? null;
+
+        return instance && (!componentClass || instance instanceof componentClass)
+            ? instance
+            : null;
+    }
+
+}
+
+/**
+ * Component constructor.
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export type ComponentConstructor<T> = { new(...args: any[]): T };
diff --git a/src/theme/components/collapsible-header.scss b/src/theme/components/collapsible-header.scss
new file mode 100644
index 000000000..750a3807f
--- /dev/null
+++ b/src/theme/components/collapsible-header.scss
@@ -0,0 +1,86 @@
+.collapsible-header-page {
+    --collapsible-header-progress: 0;
+    --collapsible-header-collapsed-height: 0px;
+    --collapsible-header-expanded-y-delta: 0px;
+    --collapsible-header-expanded-height: 0px;
+    --collapsible-header-floating-title-top: 0px;
+    --collapsible-header-floating-title-left: 0px;
+    --collapsible-header-floating-title-width: 0px;
+    --collapsible-header-floating-title-x-delta: 0px;
+    --collapsible-header-floating-title-width-delta: 0px;
+
+    .collapsible-header-expanded .collapsible-header-floating-title {
+        position: absolute;
+        top: var(--collapsible-header-floating-title-top);
+        left: var(--collapsible-header-floating-title-left);
+        transform: translateX(calc(var(--collapsible-header-floating-title-x-delta) * var(--collapsible-header-progress)));
+        opacity: 0;
+    }
+
+    &:not(.is-collapsed) .collapsible-header-collapsed {
+        --core-header-toolbar-border-width: 0;
+        --core-header-toolbar-background: transparent;
+
+        h1 {
+            opacity: 0;
+        }
+
+    }
+
+    &.is-active {
+
+        .collapsible-header-expanded {
+            height: calc(var(--collapsible-header-expanded-height) * (1 - var(--collapsible-header-progress)));
+            transform: translateY(calc(var(--collapsible-header-expanded-y-delta) * var(--collapsible-header-progress)));
+            overflow: visible;
+
+            @include core-transition(height transform, 200ms, linear);
+
+            .collapsible-header-floating-title {
+                opacity: 1;
+                width: calc(var(--collapsible-header-floating-title-width) + var(--collapsible-header-progress) * var(--collapsible-header-floating-title-width-delta));
+
+                @include core-transition(width transform, 200ms, linear);
+            }
+
+            .collapsible-header-original-title {
+                opacity: 0;
+            }
+
+            & > *:not(.collapsible-header-floating-title-wrapper),
+            .collapsible-header-floating-title-wrapper > *:not(.collapsible-header-floating-title):not(.collapsible-header-original-title) {
+                opacity: calc(1 - var(--collapsible-header-progress));
+
+                @include core-transition(opacity, 200ms, linear);
+            }
+
+        }
+
+    }
+
+    &.is-active.is-within-content  {
+
+        ion-content {
+            --offset-top: var(--collapsible-header-collapsed-height) !important;
+        }
+
+        .collapsible-header-expanded {
+            transform: none;
+            height: auto;
+        }
+
+    }
+
+    &.is-active.is-frozen {
+
+        .collapsible-header-floating-title {
+            display: none;
+        }
+
+        .collapsible-header-expanded h1 {
+            opacity: 1;
+        }
+
+    }
+
+}
diff --git a/src/theme/globals.mixins.scss b/src/theme/globals.mixins.scss
index 2199bf76b..e77e74181 100644
--- a/src/theme/globals.mixins.scss
+++ b/src/theme/globals.mixins.scss
@@ -25,12 +25,17 @@
     // border: var(--a11y-focus-width) solid var(--a11y-focus-color);
 }
 
-@mixin core-transition($property: all, $duration: 500ms, $timing-function: ease-in-out) {
-    -webkit-transition: $property $duration $timing-function;
-    -moz-transition: $property $duration $timing-function;
-    -ms-transition: $property $duration $timing-function;
-    -o-transition: $property $duration $timing-function;
-    transition: $property $duration $timing-function;
+@mixin core-transition($properties: all, $duration: 500ms, $timing-function: ease-in-out) {
+    $transitions: ();
+    @each $property in $properties {
+      $transitions: append($transitions, $property $duration $timing-function, comma);
+    }
+
+    -webkit-transition: $transitions;
+    -moz-transition: $transitions;
+    -ms-transition: $transitions;
+    -o-transition: $transitions;
+    transition: $transitions;
 }
 
 @mixin push-arrow-color($color: dedede, $flip-rtl: false) {
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 9a182fa5c..2c79ec6b5 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -1487,89 +1487,7 @@ ion-header.no-title {
     }
 }
 
-ion-header[collapsible] {
-    @include core-transition(all, 500ms);
 
-    ion-title {
-        @include core-transition(opacity, 0ms);
-    }
-}
-
-// Only hide header when not in fullscreen.
-body:not(.core-iframe-fullscreen) ion-header[collapsible]:not(.core-header-collapsed) {
-    ion-toolbar {
-        --core-header-toolbar-background: rgba(255, 255, 255, 0);
-        --core-header-toolbar-border-width: 0;
-    }
-
-    ion-title, &::after {
-        opacity: 0;
-        z-index: 0;
-    }
-}
-
-.collapsible-title {
-    overflow: visible;
-    --inner-padding-top: 0px;
-    --padding-top: 0px;
-
-    ion-label {
-        margin-top: 0px;
-    }
-
-    *, h1 {
-        @include core-transition(all, 200ms, linear);
-    }
-
-    ion-label {
-        overflow: visible !important;
-    }
-
-    h1 {
-        --max-width: none;
-    }
-    h1.cloned {
-        opacity: 0 !important;
-    }
-}
-
-ion-app.ios .collapsible-title h1 {
-    font-weight: 600; // Default heading weight.
-}
-ion-app.md .collapsible-title h1 {
-    font-weight: 500; // Default heading weight.
-    letter-spacing: .0125em;
-}
-
-.collapsible-title.collapsible-title-collapsed {
-    ion-label, h1, ion-row, ion-col {
-        opacity: 0;
-    }
-}
-
-.collapsible-title.collapsible-title-collapse-started {
-    * {
-        opacity: var(--collapse-opacity, 0);
-    }
-
-    ion-label, h1, ion-row, ion-col, .subheading {
-        opacity: 1;
-    }
-}
-
-.collapsible-title.collapsible-title-collapse-nowrap {
-    h1:not(.cloned) {
-        max-width: var(--max-width);
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-    }
-}
-
-// In fullscreen, disable the offset-top added by collapsible header.
-body.core-iframe-fullscreen ion-content {
-    --offset-top: 0px !important;
-}
 
 // To make core-swipe-slides fill the remaining height.
 .core-swipe-slides-container {
diff --git a/src/theme/theme.scss b/src/theme/theme.scss
index 385b314f6..cd0769b6d 100644
--- a/src/theme/theme.scss
+++ b/src/theme/theme.scss
@@ -19,6 +19,7 @@
 @import "./theme.base.scss";
 
 /* Components */
+@import "./components/collapsible-header.scss";
 @import "./components/format-text.scss";
 @import "./components/rubrics.scss";
 @import "./components/mod-label.scss";

From d973bd3028255052140918cc161be0423fef436c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 1 Mar 2022 15:38:22 +0100
Subject: [PATCH 0626/1008] MOBILE-3814 messages: Fix on some styles

---
 .../messages/pages/discussion/discussion.html |   7 +-
 src/addons/mod/chat/pages/chat/chat.html      |   6 +-
 .../session-messages/session-messages.html    |   6 +-
 .../comments/pages/viewer/viewer.html         |  12 +-
 .../components/user-menu/user-menu.ts         |   2 +-
 src/theme/components/discussion.scss          | 342 +++++++++---------
 src/theme/theme.light.scss                    |   6 +-
 7 files changed, 184 insertions(+), 197 deletions(-)

diff --git a/src/addons/messages/pages/discussion/discussion.html b/src/addons/messages/pages/discussion/discussion.html
index 7427dbd18..cc9770632 100644
--- a/src/addons/messages/pages/discussion/discussion.html
+++ b/src/addons/messages/pages/discussion/discussion.html
@@ -69,8 +69,7 @@
 
         <h2 class="sr-only">{{ title }}</h2>
 
-        <ion-list class="addon-messages-discussion-container list-item-limited-width" [class.addon-messages-discussion-group]="isGroup"
-            [attr.aria-live]="'polite'">
+        <ion-list class="addon-messages-discussion-container" [class.addon-messages-discussion-group]="isGroup" [attr.aria-live]="'polite'">
             <ng-container *ngFor="let message of messages; index as index; last as last">
                 <h3 class="ion-text-center addon-messages-date" *ngIf="message.showDate">
                     {{ message.timecreated | coreFormatDate: "strftimedayshort" }}
@@ -100,10 +99,10 @@
                         </div>
 
                         <!-- Some messages have <p> and some others don't. Add a <p> so they all have same styles. -->
-                        <p class="addon-message-text">
+                        <div class="addon-message-text">
                             <core-format-text (afterRender)="last && scrollToBottom()" [text]="message.text" contextLevel="system"
                                 [contextInstanceId]="0"></core-format-text>
-                        </p>
+                        </div>
                     </ion-label>
                     <ion-note *ngIf="!message.pending" slot="end">{{ message.timecreated | coreFormatDate: "strftimetime" }}</ion-note>
                     <ion-note *ngIf="message.pending" slot="end">
diff --git a/src/addons/mod/chat/pages/chat/chat.html b/src/addons/mod/chat/pages/chat/chat.html
index 0fc26f280..92e022753 100644
--- a/src/addons/mod/chat/pages/chat/chat.html
+++ b/src/addons/mod/chat/pages/chat/chat.html
@@ -93,13 +93,13 @@
                             <div>{{ message.userfullname }}</div>
                         </h2>
 
-                        <p class="addon-message-text">
+                        <div class="addon-message-text">
                             <core-format-text [text]="message.message" contextLevel="module" [contextInstanceId]="cmId"
                                 [courseId]="courseId" (afterRender)="last && scrollToBottom()">
                             </core-format-text>
-                        </p>
+                        </div>
                     </ion-label>
-                    <ion-note>{{ message.timestamp * 1000 | coreFormatDate: "strftimetime" }}</ion-note>
+                    <ion-note slot="end">{{ message.timestamp * 1000 | coreFormatDate: "strftimetime" }}</ion-note>
                     <div class="tail" *ngIf="message.showTail"></div>
                 </ion-item>
             </ng-container>
diff --git a/src/addons/mod/chat/pages/session-messages/session-messages.html b/src/addons/mod/chat/pages/session-messages/session-messages.html
index 7d0a57911..501e76cf8 100644
--- a/src/addons/mod/chat/pages/session-messages/session-messages.html
+++ b/src/addons/mod/chat/pages/session-messages/session-messages.html
@@ -86,13 +86,13 @@
                             <div *ngIf="message.showUserData">{{ message.userfullname }}</div>
                         </h2>
 
-                        <p class="addon-message-text">
+                        <div class="addon-message-text">
                             <core-format-text [text]="message.message" contextLevel="module" [contextInstanceId]="cmId"
                                 [courseId]="courseId">
                             </core-format-text>
-                        </p>
-                        <ion-note>{{ message.timestamp * 1000 | coreFormatDate: "strftimetime" }}</ion-note>
+                        </div>
                     </ion-label>
+                    <ion-note slot="end">{{ message.timestamp * 1000 | coreFormatDate: "strftimetime" }}</ion-note>
                     <div class="tail" *ngIf="message.showTail"></div>
                 </ion-item>
             </ng-container>
diff --git a/src/core/features/comments/pages/viewer/viewer.html b/src/core/features/comments/pages/viewer/viewer.html
index 4e1336a18..8a909686e 100644
--- a/src/core/features/comments/pages/viewer/viewer.html
+++ b/src/core/features/comments/pages/viewer/viewer.html
@@ -38,7 +38,7 @@
         <core-infinite-loading [enabled]="canLoadMore" position="top" (action)="loadPrevious($event)" [error]="loadMoreError">
         </core-infinite-loading>
 
-        <ion-list class="addon-messages-discussion-container  list-item-limited-width">
+        <ion-list class="addon-messages-discussion-container">
             <ng-container *ngFor="let comment of comments; index as index; last as last">
 
                 <p class="ion-text-center addon-messages-date" *ngIf="comment.showDate">
@@ -56,13 +56,13 @@
                             <div>{{ comment.fullname }}</div>
                         </h2>
 
-                        <p class="addon-message-text">
+                        <div class="addon-message-text">
                             <core-format-text [text]="comment.content" [contextLevel]="contextLevel" [contextInstanceId]="instanceId"
                                 [courseId]="courseId">
                             </core-format-text>
-                        </p>
+                        </div>
                     </ion-label>
-                    <ion-note>
+                    <ion-note slot="end">
                         <ng-container *ngIf="!comment.deleted">
                             {{ comment.timecreated * 1000 | coreFormatDate: 'strftimetime' }}
                         </ng-container>
@@ -94,11 +94,11 @@
                         {{ 'core.thereisdatatosync' | translate:{$a: 'core.comments.comments' | translate | lowercase } }}
                     </p>
 
-                    <p class="addon-message-text">
+                    <div class="addon-message-text">
                         <core-format-text [text]="offlineComment.content" [contextLevel]="contextLevel" [contextInstanceId]="instanceId"
                             [courseId]="courseId">
                         </core-format-text>
-                    </p>
+                    </div>
                 </ion-label>
                 <ion-note>
                     <ion-icon name="fas-clock" aria-hidden="true"></ion-icon> {{ 'core.notsent' | translate }}
diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.ts b/src/core/features/mainmenu/components/user-menu/user-menu.ts
index a43cb3f66..87cd958f9 100644
--- a/src/core/features/mainmenu/components/user-menu/user-menu.ts
+++ b/src/core/features/mainmenu/components/user-menu/user-menu.ts
@@ -207,7 +207,7 @@ export class CoreMainMenuUserMenuComponent implements OnInit, OnDestroy {
 
         const closeAll = await CoreDomUtils.openSideModal<boolean>({
             component: CoreLoginSitesComponent,
-            cssClass: 'core-modal-lateral-sm',
+            cssClass: 'core-modal-lateral core-modal-lateral-sm',
         });
 
         if (closeAll) {
diff --git a/src/theme/components/discussion.scss b/src/theme/components/discussion.scss
index be9ec19d3..d6756b142 100644
--- a/src/theme/components/discussion.scss
+++ b/src/theme/components/discussion.scss
@@ -1,185 +1,173 @@
 @import "~theme/globals.scss";
 
-:host {
-    ion-content {
-        --background: var(--background-alternative);
-
-        &::part(scroll) {
-            padding-bottom: 0 !important;
-        }
-    }
-
-    .addon-messages-discussion-container {
-        display: flex;
-        flex-direction: column;
-        padding-bottom: 15px;
-        background: var(--background-alternative);
-    }
-
-    .addon-messages-date {
-        font-weight: normal;
-        font-size: 0.9rem;
-    }
-
-    // Message item.
-    ion-item.addon-message {
-        border: 0;
-        border-radius: var(--small-radius);
-        padding: 0 8px 0 8px;
-        margin: 10px 8px 0 8px;
-        --background: var(--addon-messages-message-bg);
-        background: var(--background);
-        align-self: flex-start;
-        width: 90%;
-        max-width: 90%;
-        --min-height: var(--a11y-min-target-size);
-        position: relative;
-        @include core-transition(width);
-        // This is needed to display bubble tails.
-        overflow: visible;
-
-        &::part(native) {
-            --inner-border-width: 0px;
-            --inner-padding-end: 0px;
-            padding: 0;
-            margin: 0;
-        }
-
-        core-format-text > p:only-child {
-            display: inline;
-        }
-
-        .addon-message-user {
-            display: flex;
-            flex-direction: row;
-            justify-content: space-between;
-            align-items: center;
-            margin-bottom: .5rem;
-            margin-top: 0;
-            color: var(--ion-text-color);
-
-            core-user-avatar {
-                display: block;
-                --core-avatar-size: var(--addon-messages-avatar-size);
-                margin: 0;
-            }
-
-            div {
-                font-weight: 500;
-                flex-grow: 1;
-                @include padding-horizontal(.5rem);
-                overflow: hidden;
-                text-overflow: ellipsis;
-                white-space: nowrap;
-            }
-        }
-
-        ion-note {
-            color: var(--addon-messages-message-note-text);
-            font-size: var(--addon-messages-message-note-font-size);
-            margin: 0;
-            padding: 0 0 8px 0;
-            align-self: flex-end;
-        }
-
-        &[tappable]:active {
-            --background: var(--addon-messages-message-activated-bg);
-        }
-
-        ion-label {
-            margin: 0;
-            padding: 8px 0;
-        }
-
-        .addon-message-text {
-            display: inline-flex;
-            * {
-                color: var(--ion-text-color);
-            }
-        }
-
-        .tail {
-            content: '';
-            width: 0;
-            height: 0;
-            border: 0.5rem solid transparent;
-            position: absolute;
-            touch-action: none;
-            bottom: 0;
-        }
-
-        // Defines when an item-message is the user's.
-        &.addon-message-mine {
-            --background: var(--addon-messages-message-mine-bg);
-            align-self: flex-end;
-
-            &[tappable]:active {
-                --background: var(--addon-messages-message-mine-activated-bg);
-            }
-
-            .spinner {
-                @include float(end);
-                @include margin(2px, -3px, -2px, 5px);
-
-                svg {
-                    width: 16px;
-                    height: 16px;
-                }
-            }
-
-            .tail {
-                @include position(null, -8px, null, null);
-                @include margin-horizontal(null, -0.5rem);
-                border-bottom-color: var(--addon-messages-message-mine-bg);
-            }
-
-            &[tappable]:active .tail {
-                border-bottom-color: var(--addon-messages-message-mine-activated-bg);
-            }
-        }
-
-        &.addon-message-not-mine .tail {
-            border-bottom-color: var(--addon-messages-message-bg);
-            @include position(null, null, null, -8px);
-            @include margin-horizontal(-0.5rem, null);
-        }
-
-        &[tappable].addon-message-not-mine.activated .tail {
-            border-bottom-color: var(--addon-messages-message-activated-bg);
-        }
-
-        .addon-messages-delete-button {
-            min-height: initial;
-            line-height: initial;
-            @include margin(0, null, 0, null);
-            height: var(--a11y-min-target-size) !important;
-            align-self: flex-end;
-
-            ion-icon {
-                font-size: 1.4em;
-                line-height: initial;
-                color: var(--danger);
-            }
-        }
-
-        &.addon-message-no-user {
-            margin-top: 8px;
-        }
-    }
-
-    ion-item.addon-message.addon-message-mine + ion-item.addon-message.addon-message-no-user.addon-message-mine,
-    ion-item.addon-message.addon-message-not-mine + ion-item.addon-message.addon-message-no-user.addon-message-not-mine {
-        .item-heading {
-            margin-bottom: 0;
-        }
-        padding-top: 0;
-    }
-
-}
-
 :host-context(.ios) {
     ion-footer .toolbar:last-child {
         padding-bottom: 4px;
         min-height: 0;
     }
 }
+
+ion-content {
+    --content-background: var(--background-alternative);
+    --background: var(--content-background);
+
+    &::part(scroll) {
+        padding-bottom: 0 !important;
+    }
+}
+
+.addon-messages-discussion-container {
+    display: flex;
+    flex-direction: column;
+    padding-bottom: 16px !important;
+    background: var(--content-background);
+}
+
+.addon-messages-date {
+    font-weight: normal;
+    font-size: 0.9rem;
+}
+
+// Message item.
+ion-item.addon-message {
+    --message-background: var(--addon-messages-message-bg);
+    --message-activated-background: var(--addon-messages-message-activated-bg);
+    --message-alignment: flex-start;
+
+    border: 0;
+    border-radius: var(--medium-radius);
+    padding: 0 8px 0 8px;
+    margin: 8px;
+    --background: var(--message-background);
+    background: var(--message-background);
+    align-self: var(--message-alignment);
+    width: 90%;
+    max-width: var(--list-item-max-width);
+    --min-height: var(--a11y-min-target-size);
+    position: relative;
+    @include core-transition(width);
+    // This is needed to display bubble tails.
+    overflow: visible;
+
+    &::part(native) {
+        --inner-border-width: 0px;
+        --inner-padding-end: 0px;
+        padding: 0;
+        margin: 0;
+    }
+
+    &:hover {
+        filter: drop-shadow(2px 2px 2px rgba(0,0,0,.3));
+    }
+
+    core-format-text > p:only-child {
+        display: inline;
+    }
+
+    .addon-message-user {
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+        align-items: center;
+        margin-bottom: .5rem;
+        margin-top: 0;
+        color: var(--ion-text-color);
+
+        core-user-avatar {
+            display: block;
+            --core-avatar-size: var(--addon-messages-avatar-size);
+            margin: 0;
+        }
+
+        div {
+            font-weight: 500;
+            flex-grow: 1;
+            padding-left: .5rem;
+            padding-right: .5rem;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
+    }
+
+    ion-note {
+        color: var(--addon-messages-message-note-text);
+        font-size: var(--addon-messages-message-note-font-size);
+        margin: 0;
+        padding: 8px 0;
+        align-self: flex-start;
+    }
+
+    &[tappable]:active {
+        --message-background: var(--message-activated-background);
+    }
+
+    ion-label {
+        margin: 0;
+        padding: 8px 0;
+    }
+
+    .addon-message-text {
+        display: inline-flex;
+        * {
+            color: var(--ion-text-color);
+        }
+    }
+
+    .tail {
+        content: '';
+        width: 0;
+        height: 0;
+        border: 0.5rem solid transparent;
+        position: absolute;
+        touch-action: none;
+        bottom: 0;
+        border-bottom-color: var(--message-background);
+    }
+
+    // Defines when an item-message is the user's.
+    &.addon-message-mine {
+        --message-background: var(--addon-messages-message-mine-bg);
+        --message-activated-background: var(--addon-messages-message-mine-activated-bg);
+        --message-alignment: flex-end;
+
+        .spinner {
+            @include float(end);
+            @include margin(2px, -3px, -2px, 5px);
+
+            svg {
+                width: 16px;
+                height: 16px;
+            }
+        }
+
+        .tail {
+            @include position(null, -8px, null, null);
+            @include margin-horizontal(null, -0.5rem);
+        }
+    }
+
+    &.addon-message-not-mine .tail {
+        @include position(null, null, null, -8px);
+        @include margin-horizontal(-0.5rem, null);
+    }
+
+    .addon-messages-delete-button {
+        min-height: initial;
+        line-height: initial;
+        margin-top: 0px;
+        margin-bottom: 0px;
+        height: var(--a11y-min-target-size) !important;
+        align-self: flex-end;
+
+        ion-icon {
+            font-size: 1.4em;
+            line-height: initial;
+            color: var(--danger);
+        }
+    }
+
+    &.addon-message-no-user {
+        margin-top: 0px;
+    }
+}
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index e04f70066..5b44db892 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -104,7 +104,7 @@
 
     ion-content {
         --background: var(--ion-background-color);
-        --background-alternative: var(--light);
+        --background-alternative: var(--gray-200);
     }
 
     --core-bottom-tabs-background: var(--white);
@@ -324,8 +324,8 @@
     --addon-messages-message-activated-bg: var(--gray-200);
     --addon-messages-message-note-text: var(--gray-500);
     --addon-messages-message-note-font-size: 75%;
-    --addon-messages-message-mine-bg: var(--gray-200);
-    --addon-messages-message-mine-activated-bg: var(--gray-300);
+    --addon-messages-message-mine-bg: var(--gray-300);
+    --addon-messages-message-mine-activated-bg: var(--gray-400);
     --addon-messages-avatar-size: 30px;
     --addon-messages-discussion-badge: var(--primary);
     --addon-messages-discussion-badge-text: var(--white);

From a91b19aedb3d38bc73a69f27eb3b659d3a2190a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 1 Mar 2022 15:38:39 +0100
Subject: [PATCH 0627/1008] MOBILE-3814 styles: Improve side modal widths

---
 src/theme/globals.variables.scss |  2 --
 src/theme/theme.base.scss        | 60 ++++++++++----------------------
 src/theme/theme.light.scss       |  3 ++
 3 files changed, 21 insertions(+), 44 deletions(-)

diff --git a/src/theme/globals.variables.scss b/src/theme/globals.variables.scss
index 5ab1d48fb..09430b3a4 100644
--- a/src/theme/globals.variables.scss
+++ b/src/theme/globals.variables.scss
@@ -79,8 +79,6 @@ $screen-breakpoints: (
     xl: 1200px
 ) !default;
 
-$modal-lateral-width: 360px;
-
 $core-course-image-background: #81ecec, #74b9ff, #a29bfe, #dfe6e9, #00b894, #0984e3, #b2bec3, #fdcb6e, #fd79a8, #6c5ce7 !default;
 $core-dd-question-colors: #FFFFFF, #B0C4DE, #DCDCDC, #D8BFD8, #87CEFA, #DAA520, #FFD700, #F0E68C !default;
 $core-text-hightlight-background-color: lighten($blue, 40%) !default;
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 2c79ec6b5..3181dbb72 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -628,55 +628,31 @@ body.core-iframe-fullscreen ion-router-outlet {
     z-index: 100000 !important;
 }
 
-.core-modal-lateral .modal-wrapper {
-    @include margin-horizontal(16px, null);
-}
+.core-modal-lateral {
+    --ion-safe-area-left: 0px;
+    --ion-safe-area-right: 0px;
 
-@media only screen and (min-height: 400px) and (min-width: #{$modal-lateral-width}) {
-    .core-modal-lateral {
-        --ion-safe-area-left: 0px;
-        --ion-safe-area-right: 0px;
+    .modal-wrapper {
+        @include margin-horizontal(var(--modal-lateral-margin), null);
 
-        .modal-wrapper {
-            position: absolute;
-            @include position(0 !important, 0 !important, 0 !important, unset !important);
-            display: block;
-            height: 100% !important;
-            width: auto;
-            min-width: calc(#{$modal-lateral-width} - 16px);
-            box-shadow: 0 28px 48px rgba(0, 0, 0, 0.4);
-        }
-        ion-backdrop {
-            visibility: visible;
-        }
+        position: absolute;
+        @include position(0 !important, 0 !important, 0 !important, unset !important);
+        display: block;
+        height: 100% !important;
+        width: calc(100% - var(--modal-lateral-margin));
+        max-width: calc(var(--modal-lateral-max-width));
+        box-shadow: 0 28px 48px rgba(0, 0, 0, 0.4);
+    }
+
+    ion-backdrop {
+        visibility: visible;
     }
 }
 
 @each $breakpoint, $width in $screen-breakpoints {
-    .core-modal-lateral-#{$breakpoint} .modal-wrapper {
-        @include margin-horizontal(16px, null);
+    .core-modal-lateral-#{$breakpoint} {
+        --modal-lateral-max-width: #{$width};
     }
-
-    @media only screen and (min-height: 400px) and (min-width: #{$width}) {
-        .core-modal-lateral-#{$breakpoint} {
-            --ion-safe-area-left: 0px;
-            --ion-safe-area-right: 0px;
-
-            .modal-wrapper {
-                position: absolute;
-                @include position(0 !important, 0 !important, 0 !important, unset !important);
-                display: block;
-                height: 100% !important;
-                width: auto;
-                min-width: #{$width};
-                box-shadow: 0 28px 48px rgba(0, 0, 0, 0.4);
-            }
-            ion-backdrop {
-                visibility: visible;
-            }
-        }
-    }
-
 }
 
 // Hidden submit button.
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 5b44db892..99cc6f2a9 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -81,6 +81,9 @@
 
     --list-item-max-width: 768px;
 
+    --modal-lateral-max-width: 320px;
+    --modal-lateral-margin: 56px;
+
     --contrast-background: white;
 
     --ion-text-color: var(--text-color);

From 389a1c896411fd5a4900e079ffce3ebdb1701e86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 1 Mar 2022 14:23:29 +0100
Subject: [PATCH 0628/1008] MOBILE-3814 format-text: Fix expandable items
 height

---
 src/core/directives/collapsible-footer.ts | 81 ++++++++++++++++-------
 src/core/directives/collapsible-item.ts   | 62 +++++++++++------
 src/core/directives/format-text.ts        | 35 ++++++----
 src/theme/globals.mixins.scss             | 14 ++--
 4 files changed, 126 insertions(+), 66 deletions(-)

diff --git a/src/core/directives/collapsible-footer.ts b/src/core/directives/collapsible-footer.ts
index 71fd0b7fd..4f87f379f 100644
--- a/src/core/directives/collapsible-footer.ts
+++ b/src/core/directives/collapsible-footer.ts
@@ -17,6 +17,10 @@ import { ScrollDetail } from '@ionic/core';
 import { IonContent } from '@ionic/angular';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreMath } from '@singletons/math';
+import { CoreComponentsRegistry } from '@singletons/components-registry';
+import { CoreFormatTextDirective } from './format-text';
+import { CoreDomUtils } from '@services/utils/dom';
+import { CoreEventLoadingChangedData, CoreEventObserver, CoreEvents } from '@singletons/events';
 
 /**
  * Directive to make an element fixed at the bottom collapsible when scrolling.
@@ -32,11 +36,12 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
 
     protected element: HTMLElement;
     protected initialHeight = 0;
-    protected initialPaddingBottom = 0;
+    protected initialPaddingBottom = '0px';
     protected previousTop = 0;
     protected previousHeight = 0;
     protected stickTimeout?: number;
     protected content?: HTMLIonContentElement | null;
+    protected loadingChangedListener?: CoreEventObserver;
 
     constructor(el: ElementRef, protected ionContent: IonContent) {
         this.element = el.nativeElement;
@@ -44,30 +49,28 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
     }
 
     /**
-     * Setup scroll event listener.
-     *
-     * @param retries Number of retries left.
+     * Calculate the height of the footer.
      */
-    protected async listenScrollEvents(retries = 5): Promise<void> {
-        // Already initialized.
-        if (this.initialHeight > 0) {
-            return;
-        }
+    protected async calculateHeight(): Promise<void> {
+        await this.waitFormatTextsRendered(this.element);
 
-        this.initialHeight = this.element.getBoundingClientRect().height;
-
-        if (this.initialHeight == 0 && retries > 0) {
-            await CoreUtils.nextTicks(50);
-
-            this.listenScrollEvents(retries - 1);
-
-            return;
-        }
+        await CoreUtils.nextTick();
 
         // Set a minimum height value.
-        this.initialHeight = this.initialHeight || 48;
+        this.initialHeight = this.element.getBoundingClientRect().height || 48;
         this.previousHeight = this.initialHeight;
 
+        this.setBarHeight(this.initialHeight);
+    }
+
+    /**
+     * Setup scroll event listener.
+     */
+    protected async listenScrollEvents(): Promise<void> {
+        if (this.content) {
+            return;
+        }
+
         this.content = this.element.closest('ion-content');
 
         if (!this.content) {
@@ -82,12 +85,15 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
         }
 
         // Set a padding to not overlap elements.
-        this.initialPaddingBottom = parseFloat(this.content.style.getPropertyValue('--padding-bottom') || '0');
-        this.content.style.setProperty('--padding-bottom', this.initialPaddingBottom + this.initialHeight + 'px');
+        this.initialPaddingBottom = this.content.style.getPropertyValue('--padding-bottom') || this.initialPaddingBottom;
+        this.content.style.setProperty(
+            '--padding-bottom',
+            `calc(${this.initialPaddingBottom} + var(--core-collapsible-footer-height, 0px))`,
+        );
+
         const scroll = await this.content.getScrollElement();
         this.content.scrollEvents = true;
 
-        this.setBarHeight(this.initialHeight);
         this.content.addEventListener('ionScroll', (e: CustomEvent<ScrollDetail>): void => {
             if (!this.content) {
                 return;
@@ -98,6 +104,19 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
 
     }
 
+    /**
+     * Wait until all <core-format-text> children inside the element are done rendering.
+     *
+     * @param element Element.
+     */
+    protected async waitFormatTextsRendered(element: Element): Promise<void> {
+        const formatTexts = Array
+            .from(element.querySelectorAll('core-format-text'))
+            .map(element => CoreComponentsRegistry.resolve(element, CoreFormatTextDirective));
+
+        await Promise.all(formatTexts.map(formatText => formatText?.rendered()));
+    }
+
     /**
      * On scroll function.
      *
@@ -144,15 +163,29 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
     /**
      * @inheritdoc
      */
-    ngOnInit(): void {
+    async ngOnInit(): Promise<void> {
+        // Calculate the height now.
+        await this.calculateHeight();
+        setTimeout(() => this.calculateHeight(), 200); // Try again, sometimes the first calculation is wrong.
+
         this.listenScrollEvents();
+
+        // Recalculate the height if a parent core-loading displays the content.
+        this.loadingChangedListener =
+            CoreEvents.on(CoreEvents.CORE_LOADING_CHANGED, async (data: CoreEventLoadingChangedData) => {
+                if (data.loaded && CoreDomUtils.closest(this.element.parentElement, '#' + data.uniqueId)) {
+                    // The format-text is inside the loading, re-calculate the height.
+                    await this.calculateHeight();
+                    setTimeout(() => this.calculateHeight(), 200);
+                }
+            });
     }
 
     /**
      * @inheritdoc
      */
     async ngOnDestroy(): Promise<void> {
-        this.content?.style.setProperty('--padding-bottom', this.initialPaddingBottom + 'px');
+        this.content?.style.setProperty('--padding-bottom', this.initialPaddingBottom);
     }
 
 }
diff --git a/src/core/directives/collapsible-item.ts b/src/core/directives/collapsible-item.ts
index 5556d8669..3188421e9 100644
--- a/src/core/directives/collapsible-item.ts
+++ b/src/core/directives/collapsible-item.ts
@@ -14,8 +14,11 @@
 
 import { Directive, ElementRef, Input, OnInit } from '@angular/core';
 import { CoreDomUtils } from '@services/utils/dom';
+import { CoreUtils } from '@services/utils/utils';
 import { Translate } from '@singletons';
+import { CoreComponentsRegistry } from '@singletons/components-registry';
 import { CoreEventLoadingChangedData, CoreEventObserver, CoreEvents } from '@singletons/events';
+import { CoreFormatTextDirective } from './format-text';
 
 const defaultMaxHeight = 56;
 const buttonHeight = 44;
@@ -54,7 +57,7 @@ export class CoreCollapsibleItemDirective implements OnInit {
     /**
      * @inheritdoc
      */
-    ngOnInit(): void {
+    async ngOnInit(): Promise<void> {
         if (typeof this.height === 'string') {
             this.maxHeight = this.height === ''
                 ? defaultMaxHeight
@@ -70,31 +73,44 @@ export class CoreCollapsibleItemDirective implements OnInit {
         }
 
         // Calculate the height now.
-        this.calculateHeight();
+        await this.calculateHeight();
         setTimeout(() => this.calculateHeight(), 200); // Try again, sometimes the first calculation is wrong.
 
-        this.setExpandButtonEnabled(false);
-
         // Recalculate the height if a parent core-loading displays the content.
         this.loadingChangedListener =
-            CoreEvents.on(CoreEvents.CORE_LOADING_CHANGED, (data: CoreEventLoadingChangedData) => {
+            CoreEvents.on(CoreEvents.CORE_LOADING_CHANGED, async (data: CoreEventLoadingChangedData) => {
                 if (data.loaded && CoreDomUtils.closest(this.element.parentElement, '#' + data.uniqueId)) {
-                    // The format-text is inside the loading, re-calculate the height.
-                    this.calculateHeight();
+                    // The element is inside the loading, re-calculate the height.
+                    await this.calculateHeight();
                     setTimeout(() => this.calculateHeight(), 200);
                 }
             });
     }
 
+    /**
+     * Wait until all <core-format-text> children inside the element are done rendering.
+     *
+     * @param element Element.
+     */
+    protected async waitFormatTextsRendered(element: Element): Promise<void> {
+        const formatTexts = Array
+            .from(element.querySelectorAll('core-format-text'))
+            .map(element => CoreComponentsRegistry.resolve(element, CoreFormatTextDirective));
+
+        await Promise.all(formatTexts.map(formatText => formatText?.rendered()));
+    }
+
     /**
      * Calculate the height and check if we need to display show more or not.
      */
-    protected calculateHeight(): void {
-        // @todo: Work on calculate this height better.
+    protected async calculateHeight(): Promise<void> {
+        await this.waitFormatTextsRendered(this.element);
 
         // Remove max-height (if any) to calculate the real height.
         const initialMaxHeight = this.element.style.maxHeight;
-        this.element.style.maxHeight = '';
+        this.element.style.maxHeight = 'none';
+
+        await CoreUtils.nextTick();
 
         const height = CoreDomUtils.getElementHeight(this.element) || 0;
 
@@ -102,7 +118,7 @@ export class CoreCollapsibleItemDirective implements OnInit {
         this.element.style.maxHeight = initialMaxHeight;
 
         // If cannot calculate height, shorten always.
-        this.setExpandButtonEnabled(!height || height > this.maxHeight);
+        this.setExpandButtonEnabled(!height || height >= this.maxHeight);
     }
 
     /**
@@ -115,9 +131,7 @@ export class CoreCollapsibleItemDirective implements OnInit {
         this.element.classList.toggle('collapsible-enabled', enable);
 
         if (!enable || this.element.querySelector('ion-button.collapsible-toggle')) {
-            this.element.style.maxHeight = !enable || this.expanded
-                ? ''
-                : this.maxHeight + 'px';
+            this.setMaxHeight(!enable || this.expanded? undefined : this.maxHeight);
 
             return;
         }
@@ -141,6 +155,19 @@ export class CoreCollapsibleItemDirective implements OnInit {
         this.toggleExpand(this.expanded);
     }
 
+    /**
+     * Set max height to element.
+     *
+     * @param maxHeight Max height if collapsed or undefined if expanded.
+     */
+    protected setMaxHeight(maxHeight?: number): void {
+        if (maxHeight) {
+            this.element.style.setProperty('--max-height', maxHeight + buttonHeight + 'px');
+        } else {
+            this.element.style.removeProperty('--max-height');
+        }
+    }
+
     /**
      * Expand or collapse text.
      *
@@ -151,13 +178,8 @@ export class CoreCollapsibleItemDirective implements OnInit {
             expand = !this.expanded;
         }
         this.expanded = expand;
-        this.element.classList.toggle('collapsible-expanded', expand);
         this.element.classList.toggle('collapsible-collapsed', !expand);
-        if (expand) {
-            this.element.style.setProperty('--max-height', this.maxHeight + buttonHeight + 'px');
-        } else {
-            this.element.style.removeProperty('--max-height');
-        }
+        this.setMaxHeight(!expand? this.maxHeight: undefined);
 
         const toggleButton = this.element.querySelector('ion-button.collapsible-toggle');
         const toggleText = toggleButton?.querySelector('.collapsible-toggle-text');
diff --git a/src/core/directives/format-text.ts b/src/core/directives/format-text.ts
index 5171ae54b..8d93e24d6 100644
--- a/src/core/directives/format-text.ts
+++ b/src/core/directives/format-text.ts
@@ -272,15 +272,19 @@ export class CoreFormatTextDirective implements OnChanges {
     /**
      * Calculate the height and check if we need to display show more or not.
      */
-    protected calculateHeight(): void {
+    protected async calculateHeight(): Promise<void> {
         // @todo: Work on calculate this height better.
         if (!this.maxHeight) {
             return;
         }
 
+        await this.rendered();
+
         // Remove max-height (if any) to calculate the real height.
         const initialMaxHeight = this.element.style.maxHeight;
-        this.element.style.maxHeight = '';
+        this.element.style.maxHeight = 'none';
+
+        await CoreUtils.nextTick();
 
         const height = this.getElementHeight(this.element);
 
@@ -288,7 +292,20 @@ export class CoreFormatTextDirective implements OnChanges {
         this.element.style.maxHeight = initialMaxHeight;
 
         // If cannot calculate height, shorten always.
-        this.setExpandButtonEnabled(!height || height > this.maxHeight);
+        this.setExpandButtonEnabled(!height || height >= this.maxHeight);
+    }
+
+    /**
+     * Set max height to element.
+     *
+     * @param maxHeight Max height if collapsed or undefined if expanded.
+     */
+    protected setMaxHeight(maxHeight?: number): void {
+        if (maxHeight) {
+            this.element.style.setProperty('--max-height', maxHeight + 'px');
+        } else {
+            this.element.style.removeProperty('--max-height');
+        }
     }
 
     /**
@@ -301,9 +318,7 @@ export class CoreFormatTextDirective implements OnChanges {
         this.element.classList.toggle('collapsible-enabled', enable);
 
         if (!enable || this.element.querySelector('ion-button.collapsible-toggle'))  {
-            this.element.style.maxHeight = !enable || this.expanded
-                ? ''
-                : this.maxHeight + 'px';
+            this.setMaxHeight(!enable || this.expanded? undefined : this.maxHeight);
 
             return;
         }
@@ -337,13 +352,9 @@ export class CoreFormatTextDirective implements OnChanges {
             expand = !this.expanded;
         }
         this.expanded = expand;
-        this.element.classList.toggle('collapsible-expanded', expand);
         this.element.classList.toggle('collapsible-collapsed', !expand);
-        if (expand) {
-            this.element.style.setProperty('--max-height', this.maxHeight + 'px');
-        } else {
-            this.element.style.removeProperty('--max-height');
-        }
+        this.setMaxHeight(!expand? this.maxHeight: undefined);
+
         const toggleButton = this.element.querySelector('ion-button.collapsible-toggle');
         const toggleText = toggleButton?.querySelector('.collapsible-toggle-text');
         if (!toggleButton || !toggleText) {
diff --git a/src/theme/globals.mixins.scss b/src/theme/globals.mixins.scss
index e77e74181..cbde34e92 100644
--- a/src/theme/globals.mixins.scss
+++ b/src/theme/globals.mixins.scss
@@ -235,6 +235,7 @@
     @include media-breakpoint-down(sm) {
         &.collapsible-enabled {
             position:relative;
+            padding-bottom: var(--collapsible-min-button-height); // So the Show less button can fit.
             --display-toggle: block;
 
             .collapsible-toggle {
@@ -262,6 +263,8 @@
                     background-position: center;
                     background-repeat: no-repeat;
                     background-size: 14px 14px;
+                    transform: rotate(-90deg);
+
                     @include core-transition(transform, 500ms);
 
                     @include push-arrow-color(626262, true);
@@ -275,7 +278,7 @@
             &.collapsible-collapsed {
                 overflow: hidden;
                 min-height: calc(var(--collapsible-min-button-height) + 12px);
-                max-height: calc(var(--max-height), auto);
+                max-height: calc(var(--max-height, auto));
 
                 .collapsible-toggle-arrow {
                     transform: rotate(90deg);
@@ -291,15 +294,6 @@
                     z-index: 6;
                 }
             }
-
-            &.collapsible-expanded {
-                max-height: none !important;
-                padding-bottom: var(--collapsible-min-button-height); // So the Show less button can fit.
-
-                .collapsible-toggle-arrow {
-                    transform: rotate(-90deg);
-                }
-            }
         }
     }
 }

From 4008772d059e255735d95dd03e20f1b68e34fc2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 1 Mar 2022 15:58:22 +0100
Subject: [PATCH 0629/1008] MOBILE-3968 dashboard: Temp hack to remove forced
 myoverview MDL-72092

---
 src/core/features/courses/services/dashboard.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/core/features/courses/services/dashboard.ts b/src/core/features/courses/services/dashboard.ts
index 97e86c2d2..117c8d6df 100644
--- a/src/core/features/courses/services/dashboard.ts
+++ b/src/core/features/courses/services/dashboard.ts
@@ -76,6 +76,14 @@ export class CoreCoursesDashboardProvider {
         }
         const result = await site.read<CoreBlockGetDashboardBlocksWSResponse>('core_block_get_dashboard_blocks', params, preSets);
 
+        if (site.isVersionGreaterEqualThan('4.0')) {
+            // Temporary hack to have course overview on 3.9.5 but not on 4.0 onwards.
+            // To be removed in a near future.
+            // Remove myoverview when is forced. See MDL-72092.
+            result.blocks = result.blocks.filter((block) =>
+                block.instanceid != 0 || block.name != 'myoverview' || block.region != 'forced');
+        }
+
         return result.blocks || [];
     }
 

From 4b55774497e0553dd749189174f228db89b20ff4 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 1 Mar 2022 15:04:54 +0100
Subject: [PATCH 0630/1008] MOBILE-4005 vimeo: Support privacy hash in vimeo
 URL

---
 src/core/directives/format-text.ts | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/core/directives/format-text.ts b/src/core/directives/format-text.ts
index 5171ae54b..5426588bc 100644
--- a/src/core/directives/format-text.ts
+++ b/src/core/directives/format-text.ts
@@ -786,11 +786,22 @@ export class CoreFormatTextDirective implements OnChanges {
 
         if (site && src) {
             // Check if it's a Vimeo video. If it is, use the wsplayer script instead to make restricted videos work.
-            const matches = iframe.src.match(/https?:\/\/player\.vimeo\.com\/video\/([0-9]+)/);
+            const matches = src.match(/https?:\/\/player\.vimeo\.com\/video\/([0-9]+)([?&]+h=([a-zA-Z0-9]*))?/);
             if (matches && matches[1]) {
                 let newUrl = CoreTextUtils.concatenatePaths(site.getURL(), '/media/player/vimeo/wsplayer.php?video=') +
                     matches[1] + '&token=' + site.getToken();
 
+                let privacyHash: string | undefined | null = matches[3];
+                if (!privacyHash) {
+                    // No privacy hash using the new format. Check the legacy format.
+                    const matches = src.match(/https?:\/\/player\.vimeo\.com\/video\/([0-9]+)(\/([a-zA-Z0-9]+))?/);
+                    privacyHash = matches && matches[3];
+                }
+
+                if (privacyHash) {
+                    newUrl += `&h=${privacyHash}`;
+                }
+
                 // Width and height are mandatory, we need to calculate them.
                 let width: string | number;
                 let height: string | number;
@@ -818,7 +829,7 @@ export class CoreFormatTextDirective implements OnChanges {
                     newUrl += '&width=' + width + '&height=' + height;
                 }
 
-                await CoreIframeUtils.fixIframeCookies(src);
+                await CoreIframeUtils.fixIframeCookies(newUrl);
 
                 iframe.src = newUrl;
 

From 2bae918685060ef78f2f279eafc300fefa82d7b5 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 2 Mar 2022 16:35:32 +0100
Subject: [PATCH 0631/1008] MOBILE-3833 core: Fix collapsible header height

---
 src/theme/components/collapsible-header.scss | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/theme/components/collapsible-header.scss b/src/theme/components/collapsible-header.scss
index 750a3807f..f9993274d 100644
--- a/src/theme/components/collapsible-header.scss
+++ b/src/theme/components/collapsible-header.scss
@@ -9,7 +9,12 @@
     --collapsible-header-floating-title-x-delta: 0px;
     --collapsible-header-floating-title-width-delta: 0px;
 
-    .collapsible-header-expanded .collapsible-header-floating-title {
+    .collapsible-header-expanded {
+        overflow: hidden;
+        flex-shrink: 0;
+    }
+
+    .collapsible-header-floating-title {
         position: absolute;
         top: var(--collapsible-header-floating-title-top);
         left: var(--collapsible-header-floating-title-left);

From 4c1e277e413e742efb63d5bacbbe2fc6f8344224 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 2 Mar 2022 11:52:12 +0100
Subject: [PATCH 0632/1008] MOBILE-3814 lang: Update languages

---
 src/addons/badges/lang.json              |  4 ++--
 src/addons/mod/bigbluebuttonbn/lang.json | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/addons/badges/lang.json b/src/addons/badges/lang.json
index 6c8a2b856..26c4f835c 100644
--- a/src/addons/badges/lang.json
+++ b/src/addons/badges/lang.json
@@ -20,10 +20,10 @@
     "issuerurl": "Issuer URL",
     "language": "Language",
     "noalignment": "This badge does not have any external skills or standards specified.",
-    "nobadges": "There are no badges available.",
+    "nobadges": "There are currently no badges available for users to earn.",
     "norelated": "This badge does not have any related badges.",
     "recipientdetails": "Recipient details",
     "relatedbages": "Related badges",
     "version": "Version",
     "warnexpired": "(This badge has expired!)"
-}
\ No newline at end of file
+}
diff --git a/src/addons/mod/bigbluebuttonbn/lang.json b/src/addons/mod/bigbluebuttonbn/lang.json
index dba17cf44..959a678e0 100644
--- a/src/addons/mod/bigbluebuttonbn/lang.json
+++ b/src/addons/mod/bigbluebuttonbn/lang.json
@@ -1,15 +1,15 @@
 {
-    "end_session_confirm": "Are you sure you want to end the virtual classroom session?",
+    "end_session_confirm": "Are you sure you want to end the session?",
     "end_session_confirm_title": "Really end session?",
-    "mod_form_field_closingtime": "Join closed",
-    "mod_form_field_openingtime": "Join open",
-    "userlimitreached": "The number of users allowed in a meeting has been reached.",
+    "mod_form_field_closingtime": "Close",
+    "mod_form_field_openingtime": "Open",
+    "userlimitreached": "The number of users allowed in a session has been reached.",
     "view_conference_action_end": "End session",
     "view_conference_action_join": "Join session",
-    "view_error_unable_join_student": "Unable to connect to the BigBlueButton server. Please contact your Teacher or the Administrator.",
-    "view_groups_selection_warning": "There is a conference room for each group and you have access to more than one. Be sure to select the correct one.",
-    "view_message_conference_in_progress": "This conference is in progress.",
-    "view_message_conference_room_ready": "This conference room is ready. You can join the session now.",
+    "view_error_unable_join_student": "Unable to connect to the BigBlueButton server.",
+    "view_groups_selection_warning": "There is a room for each group and you have access to more than one. Be sure to select the correct one.",
+    "view_message_conference_in_progress": "The session is in progress.",
+    "view_message_conference_room_ready": "This room is ready. You can join the session now.",
     "view_message_moderator": "moderator",
     "view_message_moderators": "moderators",
     "view_message_session_started_at": "This session started at",

From df1f910ee2bde4078bea32edce20538ea24bb59e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 2 Mar 2022 12:28:54 +0100
Subject: [PATCH 0633/1008] MOBILE-3814 menu: Fix badges overflow and resize
 menu to 56px on tablet

---
 .../features/mainmenu/pages/menu/menu.scss    | 285 ++++++++++--------
 src/theme/theme.light.scss                    |   1 +
 2 files changed, 152 insertions(+), 134 deletions(-)

diff --git a/src/core/features/mainmenu/pages/menu/menu.scss b/src/core/features/mainmenu/pages/menu/menu.scss
index e6e0b7fea..4f0ebd805 100644
--- a/src/core/features/mainmenu/pages/menu/menu.scss
+++ b/src/core/features/mainmenu/pages/menu/menu.scss
@@ -1,161 +1,178 @@
 @import "~theme/globals";
 
-:host{
-    --menutabbar-size: var(--bottom-tabs-size);
-
-    ion-tab-bar {
-        height: var(--menutabbar-size);
-    }
-
-    @if ($core-always-show-main-menu) {
-        ion-tabs.placement-bottom ion-tab-bar {
-            height: var(--menutabbar-size) !important;
-            visibility: visible !important;
-            transform: translateY(0) !important;
-        }
-    } @else {
-        ion-tabs.tabshidden.placement-bottom ion-tab-bar {
-            pointer-events: none;
-
-            ion-tab-button {
-                height: auto;
-            }
-        }
-
-    }
-
-    ion-tab-button ion-icon.core-tab-icon {
-        text-overflow: unset;
-        overflow: visible;
-        text-align: center;
-    }
-
-    ion-tab-button.ios ion-icon.core-tab-icon {
-        font-size: 25px;
-    }
-
-    ion-tab-button.md ion-badge.core-tab-badge {
-        font-size: 12px;
-        font-weight: bold;
-        border-radius: 10px;
-        padding-left: 6px;
-        padding-right: 6px;
-        line-height: 14px;
-    }
-
-    ion-tab-button.tab-selected {
-        background: var(--background-selected);
-    }
-
-    ion-icon.core-tab-badge {
-        color: var(--core-bottom-tabs-badge-color);
-        padding: 3px 6px 2px;
-        @include position(8px, null, null, calc(50% + 6px));
-        min-width: 12px;
-        font-size: 8px;
-        font-weight: normal;
-        box-sizing: border-box;
-        position: absolute;
-        z-index: 1;
-    }
-
-    ion-badge.core-tab-badge {
-        --background: var(--core-bottom-tabs-badge-color);
-        --color: var(--core-bottom-tabs-badge-text-color);
-    }
-
-    ion-tabs.placement-bottom ion-tab-button {
-        ion-icon.core-tab-icon {
-            transition: margin 500ms ease-in-out, transform 300ms ease-in-out;
-        }
-        ion-icon.core-tab-badge,
-        ion-badge.core-tab-badge {
-            top: 8px;
-        }
+:host {
+    ion-tabs {
+        --menutabbar-size: var(--bottom-tabs-size);
     }
 
     ion-tabs.placement-side {
-        flex-direction: row;
-        ion-tab-bar {
-            order: -1;
-            width: var(--menutabbar-size);
-            height: calc(100% - var(--ion-safe-area-top) - var(--ion-safe-area-bottom));
-            flex-direction: column;
-            @include border-end(var(--border));
-            border-top: 0;
-            justify-content: flex-start;
-
-            @include padding(var(--ion-safe-area-top), 0px, var(--ion-safe-area-bottom), var(--ion-safe-area-left));
-
-            ion-tab-button, core-user-menu-button {
-                width: 100%;
-                min-height: var(--menutabbar-size);
-                flex: 0;
-
-                ion-icon.core-tab-badge,
-                ion-badge.core-tab-badge {
-                    top: calc(50% - 20px);
-                }
-            }
-        }
+        --menutabbar-size: var(--side-tabs-size);
     }
 
+    --network-margin-bottom: 0px;
+    --network-message-background: transparent;
+    --network-message-offline: none;
+    --network-message-online: none;
+    --network-message-height: 16px;
+}
+
+:host-context(.core-online),
+:host-context(.core-offline) {
+    .core-network-message {
+        visibility: visible;
+        height: var(--network-message-height);
+        padding-bottom: calc(var(--ion-safe-area-bottom, 0px) + var(--network-message-height));
+    }
+}
+
+:host-context(.core-online) {
+    --network-margin-bottom: 8px;
+
+    --network-message-background: var(--success);
+    --network-message-online: block;
+}
+
+:host-context(.core-offline) {
+    --network-margin-bottom: 8px;
+
+    --network-message-background: var(--danger);
+    --network-message-offline: block;
+}
+
+ion-tab-bar {
+    height: var(--menutabbar-size);
+
     core-user-menu-button {
         align-items: center;
         display: flex;
         justify-content: center;
     }
 
-    .core-network-message {
-        --network-message-height: 16px;
-        position: absolute;
-        bottom: 0;
-        left: 0;
-        right: 0;
-        padding-left: 10px;
-        padding-right: 10px;
-        text-align: center;
-        color: white;
-        visibility: hidden;
-        height: 0;
-        transition: all 500ms ease-in-out;
-        opacity: .8;
-        z-index: 12;
-    }
+    ion-tab-button {
+        &.tab-selected {
+            background: var(--background-selected);
+        }
 
-    .core-online-message,
-    .core-offline-message {
-        display: none;
+        ion-icon.core-tab-icon {
+            text-overflow: unset;
+            overflow: visible;
+            text-align: center;
+            font-size: 24px;
+        }
+
+        ion-badge.core-tab-badge {
+            font-size: 12px;
+            font-weight: bold;
+            border-radius: 10px;
+            padding-left: 6px;
+            padding-right: 6px;
+            line-height: 14px;
+            --background: var(--core-bottom-tabs-badge-color);
+            --color: var(--core-bottom-tabs-badge-text-color);
+        }
+
+        ion-icon.core-tab-badge {
+            color: var(--core-bottom-tabs-badge-color);
+            padding: 3px 6px 2px;
+            @include position(8px, null, null, calc(50% + 6px));
+            min-width: 12px;
+            font-size: 8px;
+            font-weight: normal;
+            box-sizing: border-box;
+            position: absolute;
+            z-index: 1;
+        }
     }
 }
 
-:host-context(.core-online),
-:host-context(.core-offline) {
-    ion-tabs.placement-bottom ion-tab-button ion-icon.core-tab-icon {
-        margin-bottom: 8px;
+ion-tabs.placement-bottom {
+    ion-tab-button {
+        ion-icon.core-tab-icon {
+            margin-bottom: var(--network-margin-bottom);
+            transition: margin 500ms ease-in-out, transform 300ms ease-in-out;
+        }
+
+        ion-icon.core-tab-badge,
+        ion-badge.core-tab-badge {
+            top: 8px;
+        }
     }
 
-    ion-tabs.placement-bottom ion-tab-button.ios ion-icon.core-tab-icon {
-        margin-bottom: 14px;
-    }
+    @if ($core-always-show-main-menu) {
+        ion-tab-bar {
+            height: var(--menutabbar-size) !important;
+            visibility: visible !important;
+            transform: translateY(0) !important;
+        }
+    } @else {
+        &.tabshidden ion-tab-bar {
+            pointer-events: none;
 
-    .core-network-message {
-        visibility: visible;
-        height: var(--network-message-height);
-        padding-bottom: calc(var(--ion-safe-area-bottom, 0px) + var(--network-message-height));
-        pointer-events: none;
+            ion-tab-button {
+                height: auto;
+            }
+        }
     }
 }
 
-:host-context(.core-offline) .core-offline-message,
-:host-context(.core-online) .core-online-message {
-    display: block;
+ion-tabs.placement-side {
+    flex-direction: row;
+
+    ion-tab-bar {
+        order: -1;
+        width: var(--menutabbar-size);
+        height: calc(100% - var(--ion-safe-area-top) - var(--ion-safe-area-bottom));
+        flex-direction: column;
+        @include border-end(var(--border));
+        border-top: 0;
+        justify-content: flex-start;
+
+        @include padding(var(--ion-safe-area-top), 0px, var(--ion-safe-area-bottom), var(--ion-safe-area-left));
+
+        ion-tab-button {
+            --padding-start: 0;
+            --padding-end: 0;
+            ion-badge.core-tab-badge {
+                @include position(null, 1px, null, auto);
+            }
+        }
+
+
+        ion-tab-button, core-user-menu-button {
+            width: 100%;
+            min-height: var(--menutabbar-size);
+            flex: 0;
+
+            ion-icon.core-tab-badge,
+            ion-badge.core-tab-badge {
+                top: calc(50% - 20px);
+            }
+        }
+    }
 }
 
-:host-context(.core-online) .core-network-message {
-    background: var(--success);
-}
+.core-network-message {
+    background: var(--network-message-background);
+    pointer-events: none;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    padding-left: 10px;
+    padding-right: 10px;
+    text-align: center;
+    color: white;
+    visibility: hidden;
+    height: 0;
+    transition: all 500ms ease-in-out;
+    opacity: .8;
+    z-index: 12;
 
-:host-context(.core-offline) .core-network-message {
-    background: var(--danger);
+    .core-online {
+        display: var(--network-message-online);
+    }
+
+    .core-offline {
+        display: var(--network-message-offline);
+    }
 }
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 99cc6f2a9..41545859f 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -117,6 +117,7 @@
     --core-bottom-tabs-badge-color: var(--brand);
     --core-bottom-tabs-badge-text-color: var(--brand-contrast);
     --bottom-tabs-size: 48px;
+    --side-tabs-size: 56px;
     ion-tab-bar.mainmenu-tabs {
         --background: var(--core-bottom-tabs-background);
         --color: var(--core-bottom-tabs-color);

From bde07cb125dbe3e6ae177c01dd9649c5c44aee13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 2 Mar 2022 13:40:07 +0100
Subject: [PATCH 0634/1008] MOBILE-3814 completion: Move manual completion
 button to module info

---
 .../index/addon-mod-assign-index.html         |  5 ++---
 .../components/index/index.html               |  4 ++--
 .../index/addon-mod-book-index.html           |  4 ++--
 .../index/addon-mod-chat-index.html           |  4 ++--
 .../index/addon-mod-choice-index.html         |  4 ++--
 .../index/addon-mod-data-index.html           |  5 ++---
 .../index/addon-mod-feedback-index.html       |  4 ++--
 .../index/addon-mod-folder-index.html         |  2 +-
 .../mod/forum/components/index/index.html     |  6 +++---
 .../index/addon-mod-glossary-index.html       |  6 +++---
 .../index/addon-mod-h5pactivity-index.html    |  5 ++---
 .../index/addon-mod-imscp-index.html          |  4 ++--
 .../index/addon-mod-lesson-index.html         |  4 ++--
 .../components/index/addon-mod-lti-index.html |  4 ++--
 .../index/addon-mod-page-index.html           |  5 ++---
 .../index/addon-mod-quiz-index.html           |  4 ++--
 .../index/addon-mod-resource-index.html       |  4 ++--
 .../index/addon-mod-scorm-index.html          |  4 ++--
 .../index/addon-mod-survey-index.html         |  5 +++--
 .../components/index/addon-mod-url-index.html |  4 ++--
 .../index/addon-mod-wiki-index.html           |  5 ++---
 .../index/addon-mod-workshop-index.html       |  4 ++--
 .../module-info/core-course-module-info.html  |  6 ++++--
 .../components/module-info/module-info.ts     |  7 +++++--
 .../core-course-module-navigation.html        |  7 -------
 .../module-navigation/module-navigation.ts    | 19 ++++++-------------
 .../pages/module-preview/module-preview.html  |  7 ++++---
 .../core-siteplugins-module-index.html        |  2 +-
 28 files changed, 66 insertions(+), 78 deletions(-)

diff --git a/src/addons/mod/assign/components/index/addon-mod-assign-index.html b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
index 2c09b70b1..d5aef9734 100644
--- a/src/addons/mod/assign/components/index/addon-mod-assign-index.html
+++ b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
@@ -10,7 +10,7 @@
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
-        [courseId]="courseId" [hasDataToSync]="hasOffline">
+        [courseId]="courseId" [hasDataToSync]="hasOffline" (completionChanged)="onCompletionChange()">
         <ion-list inset="true" description *ngIf="assign && assign.introattachments && assign.introattachments.length">
             <core-file *ngFor="let file of assign.introattachments" [file]="file" [component]="component" [componentId]="componentId">
             </core-file>
@@ -127,6 +127,5 @@
     </addon-mod-assign-submission>
 </core-loading>
 
-<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
-    (completionChanged)="onCompletionChange()">
+<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModuleId]="module.id">
 </core-course-module-navigation>
diff --git a/src/addons/mod/bigbluebuttonbn/components/index/index.html b/src/addons/mod/bigbluebuttonbn/components/index/index.html
index fc7415313..f3047f77a 100644
--- a/src/addons/mod/bigbluebuttonbn/components/index/index.html
+++ b/src/addons/mod/bigbluebuttonbn/components/index/index.html
@@ -10,7 +10,7 @@
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
-        [courseId]="courseId">
+        [courseId]="courseId" (completionChanged)="onCompletionChange()">
     </core-course-module-info>
 
     <ng-container *ngIf="groupInfo && (groupInfo.separateGroups || groupInfo.visibleGroups)">
@@ -114,7 +114,7 @@
             </ion-button>
         </div>
 
-        <core-course-module-navigation [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+        <core-course-module-navigation [courseId]="courseId" [currentModuleId]="module.id">
         </core-course-module-navigation>
     </div>
 </core-loading>
diff --git a/src/addons/mod/book/components/index/addon-mod-book-index.html b/src/addons/mod/book/components/index/addon-mod-book-index.html
index 3a1b9b960..8018382c7 100644
--- a/src/addons/mod/book/components/index/addon-mod-book-index.html
+++ b/src/addons/mod/book/components/index/addon-mod-book-index.html
@@ -10,7 +10,7 @@
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
-        [courseId]="courseId">
+        [courseId]="courseId" (completionChanged)="onCompletionChange()">
     </core-course-module-info>
 
     <ion-list>
@@ -41,7 +41,7 @@
             </ion-button>
         </div>
 
-        <core-course-module-navigation [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+        <core-course-module-navigation [courseId]="courseId" [currentModuleId]="module.id">
         </core-course-module-navigation>
     </div>
 </core-loading>
diff --git a/src/addons/mod/chat/components/index/addon-mod-chat-index.html b/src/addons/mod/chat/components/index/addon-mod-chat-index.html
index c55d7e8c7..42ffedbd5 100644
--- a/src/addons/mod/chat/components/index/addon-mod-chat-index.html
+++ b/src/addons/mod/chat/components/index/addon-mod-chat-index.html
@@ -10,7 +10,7 @@
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
-        [courseId]="courseId">
+        [courseId]="courseId" (completionChanged)="onCompletionChange()">
     </core-course-module-info>
 
     <ion-card *ngIf="chatInfo" class="core-info-card">
@@ -31,7 +31,7 @@
             </ion-button>
         </div>
 
-        <core-course-module-navigation [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+        <core-course-module-navigation [courseId]="courseId" [currentModuleId]="module.id">
         </core-course-module-navigation>
     </div>
 </core-loading>
diff --git a/src/addons/mod/choice/components/index/addon-mod-choice-index.html b/src/addons/mod/choice/components/index/addon-mod-choice-index.html
index dbbb13b50..2dcdcf85c 100644
--- a/src/addons/mod/choice/components/index/addon-mod-choice-index.html
+++ b/src/addons/mod/choice/components/index/addon-mod-choice-index.html
@@ -10,7 +10,7 @@
     <div class="list-item-limited-width">
         <!-- Activity info. -->
         <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
-            [courseId]="courseId" [hasDataToSync]="hasOffline">
+            [courseId]="courseId" [hasDataToSync]="hasOffline" (completionChanged)="onCompletionChange()">
         </core-course-module-info>
 
         <!-- Activity availability messages -->
@@ -146,7 +146,7 @@
             </ion-button>
         </div>
 
-        <core-course-module-navigation [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+        <core-course-module-navigation [courseId]="courseId" [currentModuleId]="module.id">
         </core-course-module-navigation>
     </div>
 </core-loading>
diff --git a/src/addons/mod/data/components/index/addon-mod-data-index.html b/src/addons/mod/data/components/index/addon-mod-data-index.html
index 3289a134c..bcd05f929 100644
--- a/src/addons/mod/data/components/index/addon-mod-data-index.html
+++ b/src/addons/mod/data/components/index/addon-mod-data-index.html
@@ -22,7 +22,7 @@
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
-        [courseId]="courseId" [hasDataToSync]="hasOffline || hasOfflineRatings">
+        [courseId]="courseId" [hasDataToSync]="hasOffline || hasOfflineRatings" (completionChanged)="onCompletionChange()">
     </core-course-module-info>
 
     <ion-item class="ion-text-wrap core-group-selector" *ngIf="groupInfo && (groupInfo.separateGroups || groupInfo.visibleGroups)">
@@ -120,8 +120,7 @@
 
 </core-loading>
 
-<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
-    (completionChanged)="onCompletionChange()">
+<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModuleId]="module.id">
 </core-course-module-navigation>
 
 <ion-fab slot="fixed" core-fab vertical="bottom" horizontal="end" *ngIf="canAdd">
diff --git a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
index f74b6c412..38fab03e8 100644
--- a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
+++ b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
@@ -10,7 +10,7 @@
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
-        [courseId]="courseId" [hasDataToSync]="hasOffline">
+        [courseId]="courseId" [hasDataToSync]="hasOffline" (completionChanged)="onCompletionChange()">
     </core-course-module-info>
 
     <core-tabs [hideUntil]="tabsReady" [selectedIndex]="firstSelectedTab">
@@ -52,7 +52,7 @@
             </ion-button>
         </div>
 
-        <core-course-module-navigation [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+        <core-course-module-navigation [courseId]="courseId" [currentModuleId]="module.id">
         </core-course-module-navigation>
     </div>
 </core-loading>
diff --git a/src/addons/mod/folder/components/index/addon-mod-folder-index.html b/src/addons/mod/folder/components/index/addon-mod-folder-index.html
index e4c02d9d6..9b5ac6cad 100644
--- a/src/addons/mod/folder/components/index/addon-mod-folder-index.html
+++ b/src/addons/mod/folder/components/index/addon-mod-folder-index.html
@@ -32,6 +32,6 @@
 
 </core-loading>
 
-<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
+<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModuleId]="module.id"
     (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/forum/components/index/index.html b/src/addons/mod/forum/components/index/index.html
index e49167d13..c5e3e54f1 100644
--- a/src/addons/mod/forum/components/index/index.html
+++ b/src/addons/mod/forum/components/index/index.html
@@ -14,7 +14,8 @@
     <core-loading [hideUntil]="!showLoading && discussions && discussions.loaded">
         <!-- Activity info. -->
         <core-course-module-info [module]="module" [description]="forum && forum.type != 'single' && description" [component]="component"
-            [componentId]="componentId" [courseId]="courseId" [hasDataToSync]="hasOffline || hasOfflineRatings">
+            [componentId]="componentId" [courseId]="courseId" [hasDataToSync]="hasOffline || hasOfflineRatings"
+            (completionChanged)="onCompletionChange()">
             <ion-item class="ion-text-wrap">
                 <ion-label>
                     {{descriptionNote}}
@@ -114,8 +115,7 @@
         </ng-container>
     </core-loading>
 
-    <core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
-        (completionChanged)="onCompletionChange()">
+    <core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModuleId]="module.id">
     </core-course-module-navigation>
 
     <ion-fab slot="fixed" core-fab vertical="bottom" horizontal="end" *ngIf="forum && canAddDiscussion">
diff --git a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
index d391f6172..b32270973 100644
--- a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
+++ b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
@@ -27,7 +27,8 @@
     <core-loading [hideUntil]="!showLoading">
         <!-- Activity info. -->
         <core-course-module-info *ngIf="!isSearch" [module]="module" [description]="description" [component]="component"
-            [componentId]="componentId" [courseId]="courseId" [hasDataToSync]="hasOffline || hasOfflineRatings">
+            [componentId]="componentId" [courseId]="courseId" [hasDataToSync]="hasOffline || hasOfflineRatings"
+            (completionChanged)="onCompletionChange()">
         </core-course-module-info>
 
         <ion-list *ngIf="!isSearch && entries && entries.offlineEntries.length > 0">
@@ -72,8 +73,7 @@
         </core-infinite-loading>
     </core-loading>
 
-    <core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
-        (completionChanged)="onCompletionChange()">
+    <core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModuleId]="module.id">
     </core-course-module-navigation>
 
     <ion-fab slot="fixed" core-fab vertical="bottom" horizontal="end" *ngIf="canAdd">
diff --git a/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html b/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
index 0ef0f7b2d..f12d47baf 100644
--- a/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
+++ b/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
@@ -20,7 +20,7 @@
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
-        [courseId]="courseId" [hasDataToSync]="hasOffline">
+        [courseId]="courseId" [hasDataToSync]="hasOffline" (completionChanged)="onCompletionChange()">
     </core-course-module-info>
 
     <!-- Offline disabled. -->
@@ -68,6 +68,5 @@
     </core-h5p-iframe>
 </core-loading>
 
-<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
-    (completionChanged)="onCompletionChange()">
+<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModuleId]="module.id">
 </core-course-module-navigation>
diff --git a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
index 9d025fe8d..c8916bc9b 100644
--- a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
+++ b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
@@ -10,7 +10,7 @@
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
-        [courseId]="courseId">
+        [courseId]="courseId" (completionChanged)="onCompletionChange()">
     </core-course-module-info>
 
     <ion-list>
@@ -38,7 +38,7 @@
             </ion-button>
         </div>
 
-        <core-course-module-navigation [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+        <core-course-module-navigation [courseId]="courseId" [currentModuleId]="module.id">
         </core-course-module-navigation>
     </div>
 </core-loading>
diff --git a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
index c3ca38e97..ea987e830 100644
--- a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
+++ b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
@@ -14,7 +14,7 @@
 
                 <!-- Activity info. -->
                 <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
-                    [courseId]="courseId" [hasDataToSync]="hasOffline">
+                    [courseId]="courseId" [hasDataToSync]="hasOffline" (completionChanged)="onCompletionChange()">
                 </core-course-module-info>
 
                 <!-- Prevent access messages. Only show the first one. -->
@@ -214,7 +214,7 @@
             <ng-container *ngTemplateOutlet="buttons"></ng-container>
         </div>
 
-        <core-course-module-navigation [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+        <core-course-module-navigation [courseId]="courseId" [currentModuleId]="module.id">
         </core-course-module-navigation>
     </div>
 </core-loading>
diff --git a/src/addons/mod/lti/components/index/addon-mod-lti-index.html b/src/addons/mod/lti/components/index/addon-mod-lti-index.html
index 1ab132e1e..1a9fb4164 100644
--- a/src/addons/mod/lti/components/index/addon-mod-lti-index.html
+++ b/src/addons/mod/lti/components/index/addon-mod-lti-index.html
@@ -10,7 +10,7 @@
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="displayDescription && description" [component]="component"
-        [componentId]="componentId" [courseId]="courseId">
+        [componentId]="componentId" [courseId]="courseId" (completionChanged)="onCompletionChange()">
     </core-course-module-info>
 
     <div collapsible-footer *ngIf="!showLoading" slot="fixed">
@@ -21,7 +21,7 @@
             </ion-button>
         </div>
 
-        <core-course-module-navigation [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+        <core-course-module-navigation [courseId]="courseId" [currentModuleId]="module.id">
         </core-course-module-navigation>
     </div>
 </core-loading>
diff --git a/src/addons/mod/page/components/index/addon-mod-page-index.html b/src/addons/mod/page/components/index/addon-mod-page-index.html
index a080af3e6..0e92db006 100644
--- a/src/addons/mod/page/components/index/addon-mod-page-index.html
+++ b/src/addons/mod/page/components/index/addon-mod-page-index.html
@@ -10,7 +10,7 @@
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="displayDescription && description" [component]="component"
-        [componentId]="componentId" [courseId]="courseId">
+        [componentId]="componentId" [courseId]="courseId" (completionChanged)="onCompletionChange()">
     </core-course-module-info>
 
     <ion-card class="core-warning-card" *ngIf="warning">
@@ -32,6 +32,5 @@
 
 </core-loading>
 
-<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
-    (completionChanged)="onCompletionChange()">
+<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModuleId]="module.id">
 </core-course-module-navigation>
diff --git a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
index 897861bcd..a8b1b7988 100644
--- a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
+++ b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
@@ -10,7 +10,7 @@
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
-        [courseId]="courseId" [hasDataToSync]="buttonText && hasOffline">
+        [courseId]="courseId" [hasDataToSync]="buttonText && hasOffline" (completionChanged)="onCompletionChange()">
     </core-course-module-info>
 
     <!-- Access rules description messages. -->
@@ -213,7 +213,7 @@
             </ion-button>
         </div>
 
-        <core-course-module-navigation [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+        <core-course-module-navigation [courseId]="courseId" [currentModuleId]="module.id">
         </core-course-module-navigation>
 
     </div>
diff --git a/src/addons/mod/resource/components/index/addon-mod-resource-index.html b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
index bcac791b8..9ce2df420 100644
--- a/src/addons/mod/resource/components/index/addon-mod-resource-index.html
+++ b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
@@ -10,7 +10,7 @@
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [courseId]="courseId" [description]="displayDescription && description"
-        [component]="component" [componentId]="componentId">
+        [component]="component" [componentId]="componentId" (completionChanged)="onCompletionChange()">
     </core-course-module-info>
 
     <ion-card class="core-warning-card" *ngIf="warning">
@@ -98,7 +98,7 @@
                 {{ 'core.openwith' | translate }}
             </ion-button>
         </div>
-        <core-course-module-navigation [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+        <core-course-module-navigation [courseId]="courseId" [currentModuleId]="module.id">
         </core-course-module-navigation>
     </div>
 </core-loading>
diff --git a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
index fb33799bb..5d3f06b43 100644
--- a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
+++ b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
@@ -10,7 +10,7 @@
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
-        [courseId]="courseId" [hasDataToSync]="!errorMessage && hasOffline">
+        [courseId]="courseId" [hasDataToSync]="!errorMessage && hasOffline" (completionChanged)="onCompletionChange()">
     </core-course-module-info>
 
     <!-- Warning message. -->
@@ -221,7 +221,7 @@
                 </ion-item>
             </ng-container>
         </div>
-        <core-course-module-navigation [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+        <core-course-module-navigation [courseId]="courseId" [currentModuleId]="module.id">
         </core-course-module-navigation>
     </div>
 </core-loading>
diff --git a/src/addons/mod/survey/components/index/addon-mod-survey-index.html b/src/addons/mod/survey/components/index/addon-mod-survey-index.html
index 8c20281fe..b4370e1f6 100644
--- a/src/addons/mod/survey/components/index/addon-mod-survey-index.html
+++ b/src/addons/mod/survey/components/index/addon-mod-survey-index.html
@@ -10,7 +10,8 @@
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="survey && !survey.surveydone && !hasOffline && description"
-        [component]="component" [componentId]="componentId" [courseId]="courseId" [hasDataToSync]="hasOffline">
+        [component]="component" [componentId]="componentId" [courseId]="courseId" [hasDataToSync]="hasOffline"
+        (completionChanged)="onCompletionChange()">
     </core-course-module-info>
 
     <!-- Survey already done -->
@@ -130,7 +131,7 @@
             </ion-button>
         </div>
 
-        <core-course-module-navigation [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+        <core-course-module-navigation [courseId]="courseId" [currentModuleId]="module.id">
         </core-course-module-navigation>
     </div>
 </core-loading>
diff --git a/src/addons/mod/url/components/index/addon-mod-url-index.html b/src/addons/mod/url/components/index/addon-mod-url-index.html
index 0b115989f..085321c3f 100644
--- a/src/addons/mod/url/components/index/addon-mod-url-index.html
+++ b/src/addons/mod/url/components/index/addon-mod-url-index.html
@@ -10,7 +10,7 @@
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="displayDescription && description" [component]="component"
-        [componentId]="componentId" [courseId]="courseId">
+        [componentId]="componentId" [courseId]="courseId" (completionChanged)="onCompletionChange()">
     </core-course-module-info>
 
     <div *ngIf="shouldIframe || (shouldEmbed && isOther)" class="addon-mod_url-embedded-url">
@@ -44,7 +44,7 @@
                 {{ 'addon.mod_url.accessurl' | translate }}
             </ion-button>
         </div>
-        <core-course-module-navigation [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+        <core-course-module-navigation [courseId]="courseId" [currentModuleId]="module.id">
         </core-course-module-navigation>
     </div>
 </core-loading>
diff --git a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
index 2b9a9d2e0..cfe144af2 100644
--- a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
+++ b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
@@ -31,7 +31,7 @@
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
-        [courseId]="courseId">
+        [courseId]="courseId" (completionChanged)="onCompletionChange()">
     </core-course-module-info>
 
     <div *ngIf="pageIsOffline || hasOffline || pageWarning">
@@ -71,8 +71,7 @@
     </div>
 </core-loading>
 
-<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModule]="module"
-    (completionChanged)="onCompletionChange()">
+<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModuleId]="module.id">
 </core-course-module-navigation>
 
 <ion-fab slot="fixed" core-fab vertical="bottom" horizontal="end" *ngIf="canEdit">
diff --git a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
index 15e6f16dd..e36cc1c0f 100644
--- a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
+++ b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
@@ -9,7 +9,7 @@
 <core-loading [hideUntil]="!showLoading" class="list-item-limited-width">
 
     <!-- Activity info. -->
-    <core-course-module-info [module]="module" [hasDataToSync]="hasOffline">
+    <core-course-module-info [module]="module" [hasDataToSync]="hasOffline" (completionChanged)="onCompletionChange()">
     </core-course-module-info>
 
     <ion-card *ngIf="phases">
@@ -235,7 +235,7 @@
             </ion-button>
         </div>
 
-        <core-course-module-navigation [courseId]="courseId" [currentModule]="module" (completionChanged)="onCompletionChange()">
+        <core-course-module-navigation [courseId]="courseId" [currentModuleId]="module.id">
         </core-course-module-navigation>
     </div>
 </core-loading>
diff --git a/src/core/features/course/components/module-info/core-course-module-info.html b/src/core/features/course/components/module-info/core-course-module-info.html
index a4e77744e..6078a0650 100644
--- a/src/core/features/course/components/module-info/core-course-module-info.html
+++ b/src/core/features/course/components/module-info/core-course-module-info.html
@@ -23,10 +23,12 @@
 <ng-content select="[description]"></ng-content>
 
 <!-- Module completion. -->
-<ion-item class="ion-text-wrap" *ngIf="showCompletion && module.completiondata && module.completiondata.isautomatic">
+<ion-item class="ion-text-wrap"
+    *ngIf="showCompletion && module.completiondata && (module.completiondata.isautomatic || (showManualCompletion && module.uservisible))">
     <ion-label>
         <core-course-module-completion [completion]="module.completiondata" [moduleName]="module.name" [moduleId]="module.id"
-            [showCompletionConditions]="true">
+            [showCompletionConditions]="true" [showManualCompletion]="showManualCompletion && module.uservisible"
+            (completionChanged)="completionChanged.emit($event)">
         </core-course-module-completion>
     </ion-label>
 </ion-item>
diff --git a/src/core/features/course/components/module-info/module-info.ts b/src/core/features/course/components/module-info/module-info.ts
index bd1fe0780..e66bc55e1 100644
--- a/src/core/features/course/components/module-info/module-info.ts
+++ b/src/core/features/course/components/module-info/module-info.ts
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { CoreCourse } from '@features/course/services/course';
-import { CoreCourseModuleData } from '@features/course/services/course-helper';
+import { CoreCourseModuleCompletionData, CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate';
 import { CoreSites } from '@services/sites';
 
@@ -48,6 +48,9 @@ export class CoreCourseModuleInfoComponent implements OnInit {
 
     @Input() hasDataToSync = false; // If the activity has any data to be synced.
 
+    @Input() showManualCompletion = true; // Whether to show manual completion, true by default.
+    @Output() completionChanged = new EventEmitter<CoreCourseModuleCompletionData>(); // Notify when completion changes.
+
     modicon = '';
     showCompletion = false; // Whether to show completion.
     moduleNameTranslated = '';
diff --git a/src/core/features/course/components/module-navigation/core-course-module-navigation.html b/src/core/features/course/components/module-navigation/core-course-module-navigation.html
index 3beaf4af2..6b092bfb8 100644
--- a/src/core/features/course/components/module-navigation/core-course-module-navigation.html
+++ b/src/core/features/course/components/module-navigation/core-course-module-navigation.html
@@ -6,13 +6,6 @@
                 <ion-icon name="fas-arrow-left" slot="icon-only" aria-hidden="true"></ion-icon>
             </ion-button>
         </ion-col>
-        <ion-col class="ion-no-padding"
-            *ngIf="showCompletion && (currentModule.completiondata && showManualCompletion && currentModule.uservisible)">
-            <!-- Module completion. -->
-            <core-course-module-completion [completion]="currentModule.completiondata" [moduleName]="currentModule.name"
-                [moduleId]="currentModule.id" [showManualCompletion]="true" (completionChanged)="completionChanged.emit($event)">
-            </core-course-module-completion>
-        </ion-col>
         <ion-col size="auto" class="ion-no-padding core-course-module-navigation-arrow">
             <ion-button fill="clear" class="core-course-next-module" [disabled]="!nextModule" (click)="goToActivity(true)"
                 [attr.aria-label]="'core.course.gotonextactivity' | translate">
diff --git a/src/core/features/course/components/module-navigation/module-navigation.ts b/src/core/features/course/components/module-navigation/module-navigation.ts
index af20ac47e..132e8c27a 100644
--- a/src/core/features/course/components/module-navigation/module-navigation.ts
+++ b/src/core/features/course/components/module-navigation/module-navigation.ts
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, ElementRef, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
+import { Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { CoreCourse, CoreCourseProvider, CoreCourseWSSection } from '@features/course/services/course';
-import { CoreCourseModuleCompletionData, CoreCourseModuleData } from '@features/course/services/course-helper';
+import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate';
 import { IonContent } from '@ionic/angular';
 import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
@@ -27,7 +27,7 @@ import { CoreEventObserver, CoreEvents } from '@singletons/events';
  * Component to show a button to go to the next resource/activity.
  *
  * Example usage:
- * <core-course-module-navigation [courseId]="courseId" [currentModule]="module"></core-course-module-navigation>
+ * <core-course-module-navigation [courseId]="courseId" [currentModuleId]="moduleId"></core-course-module-navigation>
  */
 @Component({
     selector: 'core-course-module-navigation',
@@ -37,21 +37,17 @@ import { CoreEventObserver, CoreEvents } from '@singletons/events';
 export class CoreCourseModuleNavigationComponent implements OnInit, OnDestroy {
 
     @Input() courseId!: number; // Course ID.
-    @Input() currentModule!: CoreCourseModuleData; // Current module.
-    @Input() showManualCompletion = true; // Whether to show manual completion, true by default.
-
-    @Output() completionChanged = new EventEmitter<CoreCourseModuleCompletionData>(); // Notify when completion changes.
+    @Input() currentModuleId!: number; // Current module Id.
 
     nextModule?: CoreCourseModuleData;
     previousModule?: CoreCourseModuleData;
     nextModuleSection?: CoreCourseWSSection;
     previousModuleSection?: CoreCourseWSSection;
     loaded = false;
-    showCompletion = false; // Whether to show completion.
 
     protected completionObserver: CoreEventObserver;
 
-    constructor(el: ElementRef, protected ionContent: IonContent) {
+    constructor(protected ionContent: IonContent) {
         const siteId = CoreSites.getCurrentSiteId();
 
         this.completionObserver = CoreEvents.on(CoreEvents.COMPLETION_MODULE_VIEWED, async (data) => {
@@ -70,8 +66,6 @@ export class CoreCourseModuleNavigationComponent implements OnInit, OnDestroy {
      * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
-        this.showCompletion = CoreSites.getRequiredCurrentSite().isVersionGreaterEqualThan('3.11');
-
         try {
             await this.setNextAndPreviousModules(CoreSitesReadingStrategy.PREFER_CACHE);
         } finally {
@@ -104,7 +98,6 @@ export class CoreCourseModuleNavigationComponent implements OnInit, OnDestroy {
         }
 
         const preSets = CoreSites.getReadingStrategyPreSets(readingStrategy);
-        const currentModuleId = this.currentModule.id;
 
         const sections = await CoreCourse.getSections(this.courseId, false, true, preSets);
 
@@ -117,7 +110,7 @@ export class CoreCourseModuleNavigationComponent implements OnInit, OnDestroy {
                 return false;
             }
 
-            currentModuleIndex = section.modules.findIndex((module: CoreCourseModuleData) => module.id == currentModuleId);
+            currentModuleIndex = section.modules.findIndex((module: CoreCourseModuleData) => module.id == this.currentModuleId);
 
             return currentModuleIndex >= 0;
         });
diff --git a/src/core/features/course/pages/module-preview/module-preview.html b/src/core/features/course/pages/module-preview/module-preview.html
index ee720ffd2..1ff4dfa65 100644
--- a/src/core/features/course/pages/module-preview/module-preview.html
+++ b/src/core/features/course/pages/module-preview/module-preview.html
@@ -24,7 +24,8 @@
     </ion-refresher>
     <core-loading [hideUntil]="loaded" class="has-spacer list-item-limited-width">
         <core-course-module-info [module]="module" [courseId]="courseId" [description]="module.description" [component]="module.modname"
-            [componentId]="module.id" [expandDescription]="true" [showAvailabilityInfo]="true">
+            [componentId]="module.id" [expandDescription]="true" [showAvailabilityInfo]="true" (completionChanged)="onCompletionChange()"
+            [showManualCompletion]="showManualCompletion">
             <div class="core-module-additional-info" title>
                 <ion-chip *ngIf="module.handlerData?.extraBadge" [color]="module.handlerData?.extraBadgeColor"
                     class="ion-text-wrap ion-text-start" [outline]="true">
@@ -44,6 +45,6 @@
         <core-course-unsupported-module *ngIf="unsupported" [module]="module"></core-course-unsupported-module>
     </core-loading>
 
-    <core-course-module-navigation collapsible-footer [hidden]="!loaded" [courseId]="courseId" [currentModule]="module"
-        (completionChanged)="onCompletionChange()" [showManualCompletion]="showManualCompletion"></core-course-module-navigation>
+    <core-course-module-navigation collapsible-footer [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+    </core-course-module-navigation>
 </ion-content>
diff --git a/src/core/features/siteplugins/components/module-index/core-siteplugins-module-index.html b/src/core/features/siteplugins/components/module-index/core-siteplugins-module-index.html
index b47edea6c..287220e84 100644
--- a/src/core/features/siteplugins/components/module-index/core-siteplugins-module-index.html
+++ b/src/core/features/siteplugins/components/module-index/core-siteplugins-module-index.html
@@ -14,5 +14,5 @@
     (onLoadingContent)="contentLoading()">
 </core-site-plugins-plugin-content>
 
-<core-course-module-navigation collapsible-footer *ngIf="module" [courseId]="courseId" [currentModule]="module">
+<core-course-module-navigation collapsible-footer *ngIf="module" [courseId]="courseId" [currentModuleId]="module.id">
 </core-course-module-navigation>

From 42bdc2ae761a088068baf0803f0c2feabdad8082 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 2 Mar 2022 13:53:23 +0100
Subject: [PATCH 0635/1008] MOBILE-3814 completion: Change navigation arrows
 color

---
 .../module-navigation/core-course-module-navigation.html      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/features/course/components/module-navigation/core-course-module-navigation.html b/src/core/features/course/components/module-navigation/core-course-module-navigation.html
index 6b092bfb8..d2ef8639e 100644
--- a/src/core/features/course/components/module-navigation/core-course-module-navigation.html
+++ b/src/core/features/course/components/module-navigation/core-course-module-navigation.html
@@ -2,13 +2,13 @@
     <ion-row class="ion-justify-content-between ion-align-items-center ion-no-padding ion-wrap" *ngIf="previousModule || nextModule">
         <ion-col size="auto" class="ion-no-padding core-course-module-navigation-arrow">
             <ion-button fill="clear" class="core-course-previous-module" [disabled]="!previousModule" (click)="goToActivity(false)"
-                [attr.aria-label]="'core.course.gotopreviousactivity' | translate">
+                [attr.aria-label]="'core.course.gotopreviousactivity' | translate" color="dark">
                 <ion-icon name="fas-arrow-left" slot="icon-only" aria-hidden="true"></ion-icon>
             </ion-button>
         </ion-col>
         <ion-col size="auto" class="ion-no-padding core-course-module-navigation-arrow">
             <ion-button fill="clear" class="core-course-next-module" [disabled]="!nextModule" (click)="goToActivity(true)"
-                [attr.aria-label]="'core.course.gotonextactivity' | translate">
+                [attr.aria-label]="'core.course.gotonextactivity' | translate" color="dark">
                 <ion-icon name="fas-arrow-right" slot="icon-only" aria-hidden="true"></ion-icon>
             </ion-button>
         </ion-col>

From cfaf7d5b06787fa629cef5a6376dec667a19a493 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 2 Mar 2022 16:24:44 +0100
Subject: [PATCH 0636/1008] MOBILE-3814 styles: Revisit button colors

---
 .../myoverview/addon-block-myoverview.html    |  2 +-
 .../events/addon-block-timeline-events.html   |  2 +-
 .../calendar/pages/edit-event/edit-event.html |  2 +-
 src/addons/calendar/pages/event/event.html    |  4 ++--
 .../messages/pages/discussion/discussion.html |  2 +-
 .../addon-mod-assign-submission.html          | 15 +++++++--------
 .../addon-mod-assign-feedback-comments.html   |  2 +-
 .../index/addon-mod-chat-index.html           |  2 +-
 .../action/addon-mod-data-action.html         | 15 +++++++++------
 .../index/addon-mod-data-index.html           |  4 ++--
 src/addons/mod/data/pages/entry/entry.html    |  4 ++--
 .../mod/forum/components/index/index.html     |  2 +-
 .../mod/forum/components/post/post.html       |  8 ++++----
 src/addons/mod/quiz/pages/review/review.html  |  4 ++--
 .../pages/course-storage/course-storage.html  |  4 ++--
 .../courses-storage/courses-storage.html      |  4 ++--
 .../core-download-refresh.html                |  5 ++---
 src/core/components/file/core-file.html       |  3 +--
 .../core-horizontal-scroll-controls.html      |  8 ++++----
 src/core/components/iframe/core-iframe.html   |  4 ++--
 .../local-file/core-local-file.html           |  2 +-
 .../navigation-bar/core-navigation-bar.html   |  5 ++---
 .../core-send-message-form.html               |  2 +-
 .../course-format/course-format.html          |  6 +++---
 .../core-course-module-manual-completion.html |  6 +++---
 .../core-course-module-navigation.html        |  4 ++--
 .../module-summary/module-summary.html        |  8 ++++----
 .../components/module/core-course-module.html |  2 +-
 .../pages/course-summary/course-summary.html  |  4 ++--
 .../pages/module-preview/module-preview.html  |  2 +-
 .../core-courses-course-list-item.html        |  4 ++--
 .../core-courses-course-progress.html         |  2 +-
 src/core/features/courses/pages/my/my.html    |  2 +-
 .../login/pages/credentials/credentials.html  |  2 +-
 .../login/pages/reconnect/reconnect.html      |  2 +-
 src/core/features/login/pages/site/site.html  |  2 +-
 src/core/features/user/pages/about/about.html |  4 ++--
 src/core/singletons/colors.ts                 |  1 -
 src/theme/globals.variables.scss              | 13 ++++++-------
 src/theme/theme.base.scss                     |  4 ++++
 src/theme/theme.dark.scss                     |  2 +-
 src/theme/theme.light.scss                    | 19 ++++++++++---------
 42 files changed, 98 insertions(+), 96 deletions(-)

diff --git a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
index 86f4ba3b1..a567deefd 100644
--- a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
+++ b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
@@ -5,7 +5,7 @@
     <div slot="end" class="flex-row">
         <!-- Download all courses. -->
         <div *ngIf="downloadCoursesEnabled && filteredCourses.length > 1" class="core-button-spinner">
-            <ion-button *ngIf="!prefetchCoursesData.loading" fill="clear" color="dark" (click)="prefetchCourses()"
+            <ion-button *ngIf="!prefetchCoursesData.loading" fill="clear" (click)="prefetchCourses()"
                 [attr.aria-label]="prefetchCoursesData.statusTranslatable | translate">
                 <ion-icon [name]="prefetchCoursesData.icon" slot="icon-only" aria-hidden="true">
                 </ion-icon>
diff --git a/src/addons/block/timeline/components/events/addon-block-timeline-events.html b/src/addons/block/timeline/components/events/addon-block-timeline-events.html
index 4bb4161f4..f1764e5f8 100644
--- a/src/addons/block/timeline/components/events/addon-block-timeline-events.html
+++ b/src/addons/block/timeline/components/events/addon-block-timeline-events.html
@@ -53,7 +53,7 @@
                         </ion-row>
                     </ion-col>
                     <ion-col class="addon-block-timeline-activity-action ion-no-padding" *ngIf="event.action?.actionable">
-                        <ion-button fill="outline" color="medium" (click)="action($event, event.action.url)" [title]="event.action.name">
+                        <ion-button fill="outline" (click)="action($event, event.action.url)" [title]="event.action.name">
                             {{event.action.name}}
                             <ion-badge slot="end" class="ion-margin-start" *ngIf="event.action.showitemcount">
                                 {{event.action.itemcount}}
diff --git a/src/addons/calendar/pages/edit-event/edit-event.html b/src/addons/calendar/pages/edit-event/edit-event.html
index b02c1cf05..57b4eb6f4 100644
--- a/src/addons/calendar/pages/edit-event/edit-event.html
+++ b/src/addons/calendar/pages/edit-event/edit-event.html
@@ -118,7 +118,7 @@
                     <ion-label>
                         <p class="item-heading">{{ 'addon.calendar.reminders' | translate }}</p>
                     </ion-label>
-                    <ion-button fill="clear" color="dark" (click)="addReminder()" slot="end"
+                    <ion-button fill="clear" (click)="addReminder()" slot="end"
                         [attr.aria-label]="'addon.calendar.setnewreminder' | translate">
                         <ion-icon name="fas-plus" slot="icon-only" aria-hidden="true"></ion-icon>
                     </ion-button>
diff --git a/src/addons/calendar/pages/event/event.html b/src/addons/calendar/pages/event/event.html
index 39364fbc8..0b21ac1f4 100644
--- a/src/addons/calendar/pages/event/event.html
+++ b/src/addons/calendar/pages/event/event.html
@@ -120,7 +120,7 @@
             </ion-item>
             <ion-item *ngIf="moduleUrl">
                 <ion-label>
-                    <ion-button expand="block" color="primary" [href]="moduleUrl" core-link capture="true">
+                    <ion-button expand="block" [href]="moduleUrl" core-link capture="true">
                         {{ 'addon.calendar.gotoactivity' | translate }}
                     </ion-button>
                 </ion-label>
@@ -148,7 +148,7 @@
             <ng-container *ngIf="event.timestart > currentTime">
                 <ion-item>
                     <ion-label>
-                        <ion-button expand="block" color="primary" (click)="addReminder()">
+                        <ion-button expand="block" (click)="addReminder()">
                             {{ 'addon.calendar.setnewreminder' | translate }}
                         </ion-button>
                     </ion-label>
diff --git a/src/addons/messages/pages/discussion/discussion.html b/src/addons/messages/pages/discussion/discussion.html
index cc9770632..38ec30d17 100644
--- a/src/addons/messages/pages/discussion/discussion.html
+++ b/src/addons/messages/pages/discussion/discussion.html
@@ -157,7 +157,7 @@
             <ion-button expand="block" class="ion-text-wrap ion-margin-bottom" (click)="confirmContactRequest()">
                 {{ 'addon.messages.acceptandaddcontact' | translate }}
             </ion-button>
-            <ion-button expand="block" class="ion-text-wrap ion-margin-bottom" color="light" (click)="declineContactRequest()">
+            <ion-button expand="block" class="ion-text-wrap ion-margin-bottom" fill="outline" (click)="declineContactRequest()">
                 {{ 'addon.messages.decline' | translate }}
             </ion-button>
         </div>
diff --git a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
index c2e5b2ad1..d0efe3655 100644
--- a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
+++ b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
@@ -103,27 +103,26 @@
                     <ion-label>
                         <div *ngIf="!unsupportedEditPlugins.length && !showErrorStatementEdit">
                             <!-- If has offline data, show edit. -->
-                            <ion-button expand="block" class="ion-text-wrap" color="primary" *ngIf="hasOffline" (click)="goToEdit()">
+                            <ion-button expand="block" class="ion-text-wrap" *ngIf="hasOffline" (click)="goToEdit()">
                                 {{ 'addon.mod_assign.editsubmission' | translate }}
                             </ion-button>
                             <!-- If no submission or is new, show add submission. -->
-                            <ion-button expand="block" class="ion-text-wrap" color="primary" *ngIf="!hasOffline &&
-                                    (!userSubmission || !userSubmission!.status || userSubmission!.status == statusNew)"
-                                (click)="goToEdit()">
+                            <ion-button expand="block" class="ion-text-wrap" (click)="goToEdit()" *ngIf="!hasOffline &&
+                                    (!userSubmission || !userSubmission!.status || userSubmission!.status == statusNew)">
                                 {{ 'addon.mod_assign.addsubmission' | translate }}
                             </ion-button>
                             <!-- If reopened, show addfromprevious and addnewattempt. -->
                             <ng-container *ngIf="!hasOffline && userSubmission?.status == statusReopened">
-                                <ion-button *ngIf="!isPreviousAttemptEmpty" expand="block" class="ion-text-wrap" color="primary"
-                                    (click)="copyPrevious()">
+                                <ion-button *ngIf="!isPreviousAttemptEmpty" expand="block" class="ion-text-wrap" (click)="copyPrevious()">
                                     {{ 'addon.mod_assign.addnewattemptfromprevious' | translate }}
                                 </ion-button>
-                                <ion-button expand="block" class="ion-text-wrap" color="primary" (click)="goToEdit()">
+                                <ion-button expand="block" class="ion-text-wrap" (click)="goToEdit()">
                                     {{ 'addon.mod_assign.addnewattempt' | translate }}
                                 </ion-button>
                             </ng-container>
                             <!-- Else show editsubmission. -->
-                            <ion-button expand="block" class="ion-text-wrap" color="primary" *ngIf="!hasOffline && userSubmission && userSubmission!.status &&
+                            <ion-button expand="block" class="ion-text-wrap" *ngIf="!hasOffline &&
+                                    userSubmission && userSubmission!.status &&
                                     userSubmission!.status != statusNew &&
                                     userSubmission!.status != statusReopened" (click)="goToEdit()">
                                 {{ 'addon.mod_assign.editsubmission' | translate }}
diff --git a/src/addons/mod/assign/feedback/comments/component/addon-mod-assign-feedback-comments.html b/src/addons/mod/assign/feedback/comments/component/addon-mod-assign-feedback-comments.html
index 4a125adc0..d622f39aa 100644
--- a/src/addons/mod/assign/feedback/comments/component/addon-mod-assign-feedback-comments.html
+++ b/src/addons/mod/assign/feedback/comments/component/addon-mod-assign-feedback-comments.html
@@ -10,7 +10,7 @@
     </ion-label>
     <div slot="end">
         <div class="ion-text-end">
-            <ion-button fill="clear" *ngIf="canEdit" (click)="editComment()" color="dark" [attr.aria-label]="'core.edit' | translate">
+            <ion-button fill="clear" *ngIf="canEdit" (click)="editComment()" [attr.aria-label]="'core.edit' | translate">
                 <ion-icon name="fas-pen" slot="icon-only" aria-hidden="true"></ion-icon>
             </ion-button>
         </div>
diff --git a/src/addons/mod/chat/components/index/addon-mod-chat-index.html b/src/addons/mod/chat/components/index/addon-mod-chat-index.html
index 42ffedbd5..e9c2590d3 100644
--- a/src/addons/mod/chat/components/index/addon-mod-chat-index.html
+++ b/src/addons/mod/chat/components/index/addon-mod-chat-index.html
@@ -26,7 +26,7 @@
 
     <div collapsible-footer *ngIf="!showLoading" slot="fixed">
         <div class="list-item-limited-width" *ngIf="chat">
-            <ion-button class="ion-margin ion-text-wrap" expand="block" color="primary" (click)="enterChat()">
+            <ion-button class="ion-margin ion-text-wrap" expand="block" (click)="enterChat()">
                 {{ 'addon.mod_chat.enterchat' | translate }}
             </ion-button>
         </div>
diff --git a/src/addons/mod/data/components/action/addon-mod-data-action.html b/src/addons/mod/data/components/action/addon-mod-data-action.html
index ee307cfd9..09676dcea 100644
--- a/src/addons/mod/data/components/action/addon-mod-data-action.html
+++ b/src/addons/mod/data/components/action/addon-mod-data-action.html
@@ -1,24 +1,27 @@
-<ion-button *ngIf="action == 'more'" fill="clear" (click)="viewEntry()" [attr.aria-label]="'addon.mod_data.more' | translate">
+<ion-button size="small" *ngIf="action == 'more'" fill="clear" (click)="viewEntry()" [attr.aria-label]="'addon.mod_data.more' | translate">
     <ion-icon name="fas-search" slot="icon-only" aria-hidden="true"></ion-icon>
 </ion-button>
 
-<ion-button *ngIf="action == 'edit'" fill="clear" (click)="editEntry()" [attr.aria-label]="'core.edit' | translate">
+<ion-button size="small" *ngIf="action == 'edit'" fill="clear" (click)="editEntry()" [attr.aria-label]="'core.edit' | translate">
     <ion-icon name="fas-cog" slot="icon-only" aria-hidden="true"></ion-icon>
 </ion-button>
 
-<ion-button *ngIf="action == 'delete' && !entry.deleted" fill="clear" (click)="deleteEntry()" [attr.aria-label]="'core.delete' | translate">
+<ion-button size="small" *ngIf="action == 'delete' && !entry.deleted" fill="clear" color="danger" (click)="deleteEntry()"
+    [attr.aria-label]="'core.delete' | translate">
     <ion-icon name="fas-trash" slot="icon-only" aria-hidden="true"></ion-icon>
 </ion-button>
 
-<ion-button *ngIf="action == 'delete' && entry.deleted" fill="clear" (click)="undoDelete()" [attr.aria-label]="'core.restore' | translate">
+<ion-button size="small" *ngIf="action == 'delete' && entry.deleted" fill="clear" color="danger" (click)="undoDelete()"
+    [attr.aria-label]="'core.restore' | translate">
     <ion-icon name="fas-undo-alt" slot="icon-only" aria-hidden="true"></ion-icon>
 </ion-button>
 
-<ion-button *ngIf="action == 'approve'" fill="clear" (click)="approveEntry()" [attr.aria-label]="'addon.mod_data.approve' | translate">
+<ion-button size="small" *ngIf="action == 'approve'" fill="clear" (click)="approveEntry()"
+    [attr.aria-label]="'addon.mod_data.approve' | translate">
     <ion-icon name="fas-thumbs-up" slot="icon-only" aria-hidden="true"></ion-icon>
 </ion-button>
 
-<ion-button *ngIf="action == 'disapprove'" fill="clear" (click)="disapproveEntry()"
+<ion-button size="small" *ngIf="action == 'disapprove'" fill="clear" (click)="disapproveEntry()"
     [attr.aria-label]="'addon.mod_data.disapprove' | translate">
     <ion-icon name="far-thumbs-down" slot="icon-only" aria-hidden="true"></ion-icon>
 </ion-button>
diff --git a/src/addons/mod/data/components/index/addon-mod-data-index.html b/src/addons/mod/data/components/index/addon-mod-data-index.html
index bcd05f929..12860af6f 100644
--- a/src/addons/mod/data/components/index/addon-mod-data-index.html
+++ b/src/addons/mod/data/components/index/addon-mod-data-index.html
@@ -72,8 +72,8 @@
 
     <!-- Reset search. -->
     <ng-container *ngIf="search.searching && !isEmpty">
-        <ion-item (click)="searchReset()" button detail="false">
-            <ion-label color="primary">
+        <ion-item (click)="searchReset()" button detail="false" *ngIf="!foundRecordsTranslationData">
+            <ion-label color="info">
                 {{ 'addon.mod_data.resetsettings' | translate}}
             </ion-label>
         </ion-item>
diff --git a/src/addons/mod/data/pages/entry/entry.html b/src/addons/mod/data/pages/entry/entry.html
index 3b4c9b000..a4a1fccdb 100644
--- a/src/addons/mod/data/pages/entry/entry.html
+++ b/src/addons/mod/data/pages/entry/entry.html
@@ -64,7 +64,7 @@
         <div collapsible-footer *ngIf="entryLoaded && hasPrevious || hasNext" slot="fixed">
             <ion-row class="ion-justify-content-between ion-align-items-center ion-no-padding ion-wrap">
                 <ion-col class="ion-text-start ion-no-padding core-navigation-arrow" size="auto">
-                    <ion-button [disabled]="!hasPrevious" fill="clear" color="dark" [attr.aria-label]="'core.previous' | translate"
+                    <ion-button [disabled]="!hasPrevious" fill="clear" [attr.aria-label]="'core.previous' | translate"
                         (click)="gotoEntry(offset! -1)">
                         <ion-icon name="fas-chevron-left" slot="icon-only" aria-hidden="true"></ion-icon>
                     </ion-button>
@@ -72,7 +72,7 @@
                 <ion-col class="ion-text-center">
                 </ion-col>
                 <ion-col class="ion-text-end ion-no-padding core-navigation-arrow" size="auto">
-                    <ion-button [disabled]="!hasNext" fill="clear" color="dark" [attr.aria-label]=" 'core.next' | translate"
+                    <ion-button [disabled]="!hasNext" fill="clear" [attr.aria-label]=" 'core.next' | translate"
                         (click)="gotoEntry(offset! + 1)">
                         <ion-icon name="fas-chevron-right" slot="icon-only" aria-hidden="true"></ion-icon>
                     </ion-button>
diff --git a/src/addons/mod/forum/components/index/index.html b/src/addons/mod/forum/components/index/index.html
index c5e3e54f1..1dbc553e9 100644
--- a/src/addons/mod/forum/components/index/index.html
+++ b/src/addons/mod/forum/components/index/index.html
@@ -57,7 +57,7 @@
                                 [courseId]="courseId">
                             </core-format-text>
                         </p>
-                        <ion-button *ngIf="canPin || discussion.canlock || discussion.canfavourite" fill="clear" color="dark"
+                        <ion-button *ngIf="canPin || discussion.canlock || discussion.canfavourite" fill="clear"
                             [attr.aria-label]="('core.displayoptions' | translate)" (click)="showOptionsMenu($event, discussion)">
                             <ion-icon name="ellipsis-vertical" slot="icon-only" aria-hidden="true">
                             </ion-icon>
diff --git a/src/addons/mod/forum/components/post/post.html b/src/addons/mod/forum/components/post/post.html
index a5e99970d..9812ff26f 100644
--- a/src/addons/mod/forum/components/post/post.html
+++ b/src/addons/mod/forum/components/post/post.html
@@ -19,8 +19,8 @@
                             [attr.aria-label]="'addon.mod_forum.unread' | translate">
                             <ion-icon name="fas-circle" color="primary" aria-hidden="true"></ion-icon>
                         </ion-note>
-                        <ion-button *ngIf="optionsMenuEnabled" fill="clear" color="dark"
-                            [attr.aria-label]="('core.displayoptions' | translate)" (click)="showOptionsMenu($event)">
+                        <ion-button *ngIf="optionsMenuEnabled" fill="clear" [attr.aria-label]="('core.displayoptions' | translate)"
+                            (click)="showOptionsMenu($event)">
                             <ion-icon name="ellipsis-vertical" slot="icon-only" aria-hidden="true">
                             </ion-icon>
                         </ion-button>
@@ -47,8 +47,8 @@
                                 [attr.aria-label]="'addon.mod_forum.unread' | translate">
                                 <ion-icon name="fas-circle" color="primary" aria-hidden="true"></ion-icon>
                             </ion-note>
-                            <ion-button *ngIf="optionsMenuEnabled" fill="clear" color="dark"
-                                [attr.aria-label]="('core.displayoptions' | translate)" (click)="showOptionsMenu($event)">
+                            <ion-button *ngIf="optionsMenuEnabled" fill="clear" [attr.aria-label]="('core.displayoptions' | translate)"
+                                (click)="showOptionsMenu($event)">
                                 <ion-icon name="ellipsis-vertical" slot="icon-only" aria-hidden="true"></ion-icon>
                             </ion-button>
                         </ng-container>
diff --git a/src/addons/mod/quiz/pages/review/review.html b/src/addons/mod/quiz/pages/review/review.html
index a7aa60562..5399c89a1 100644
--- a/src/addons/mod/quiz/pages/review/review.html
+++ b/src/addons/mod/quiz/pages/review/review.html
@@ -116,7 +116,7 @@
         <div collapsible-footer *ngIf="loaded && numPages > 1" slot="fixed">
             <ion-row class="ion-justify-content-between ion-align-items-center ion-no-padding ion-wrap">
                 <ion-col class="ion-text-start ion-no-padding core-navigation-arrow" size="auto" *ngIf="!showAll">
-                    <ion-button [disabled]="previousPage < 0" fill="clear" color="dark" [attr.aria-label]="'core.previous' | translate"
+                    <ion-button [disabled]="previousPage < 0" fill="clear" [attr.aria-label]="'core.previous' | translate"
                         (click)="changePage(previousPage)">
                         <ion-icon name="fas-chevron-left" slot="icon-only" aria-hidden="true"></ion-icon>
                     </ion-button>
@@ -129,7 +129,7 @@
                     </ion-button>
                 </ion-col>
                 <ion-col class="ion-text-end ion-no-padding core-navigation-arrow" size="auto" *ngIf="!showAll">
-                    <ion-button [disabled]="nextPage >= numPages" fill="clear" color="dark" [attr.aria-label]="'core.next' | translate"
+                    <ion-button [disabled]="nextPage >= numPages" fill="clear" [attr.aria-label]="'core.next' | translate"
                         (click)="changePage(nextPage)">
                         <ion-icon name="fas-chevron-right" slot="icon-only" aria-hidden="true"></ion-icon>
                     </ion-button>
diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.html b/src/addons/storagemanager/pages/course-storage/course-storage.html
index 47f5e7b6c..3d5506ab1 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.html
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.html
@@ -19,7 +19,7 @@
                         <p class="item-heading ion-text-wrap">{{ 'addon.storagemanager.totaldownloads' | translate }}</p>
                         <ion-badge color="light">{{ totalSize | coreBytesToSize }}</ion-badge>
                     </ion-label>
-                    <ion-button slot="end" (click)="deleteForCourse()" [disabled]="totalSize == 0" color="danger" fill="outline">
+                    <ion-button slot="end" (click)="deleteForCourse()" [disabled]="totalSize == 0" color="danger" fill="clear">
                         <ion-icon name="fas-trash" slot="icon-only" [attr.aria-label]="'addon.storagemanager.deletedatafrom' | translate:
                         { name: title }">
                         </ion-icon>
@@ -48,7 +48,7 @@
                             </p>
                         </ion-label>
                         <div class="storage-buttons" slot="end" *ngIf="section.totalSize > 0 || downloadEnabled">
-                            <ion-button (click)="deleteForSection(section)" *ngIf="section.totalSize > 0" color="danger" fill="outline">
+                            <ion-button (click)="deleteForSection(section)" *ngIf="section.totalSize > 0" color="danger" fill="clear">
                                 <ion-icon name="fas-trash" slot="icon-only"
                                     [attr.aria-label]="'addon.storagemanager.deletedatafrom' | translate: { name: section.name }">
                                 </ion-icon>
diff --git a/src/addons/storagemanager/pages/courses-storage/courses-storage.html b/src/addons/storagemanager/pages/courses-storage/courses-storage.html
index 93aa52341..4c4f3217f 100644
--- a/src/addons/storagemanager/pages/courses-storage/courses-storage.html
+++ b/src/addons/storagemanager/pages/courses-storage/courses-storage.html
@@ -21,7 +21,7 @@
                 </ion-label>
                 <ion-button fill="clear" color="danger" slot="end" (click)="deleteSiteStorage($event)"
                     [hidden]="spaceUsage.spaceUsage! + spaceUsage.cacheEntries! <= 0"
-                    [attr.aria-label]="'addon.storagemanager.deleteallsitedata' | translate" fill="outline">
+                    [attr.aria-label]="'addon.storagemanager.deleteallsitedata' | translate">
                     <ion-icon name="fas-trash" slot="icon-only" aria-hidden="true"></ion-icon>
                 </ion-button>
             </ion-item>
@@ -37,7 +37,7 @@
                     <ion-badge color="light">{{ totalSize | coreBytesToSize }}</ion-badge>
                 </ion-label>
                 <ion-button slot="end" (click)="deleteCompletelyDownloadedCourses($event)"
-                    [disabled]="completelyDownloadedCourses.length === 0" color="danger" fill="outline">
+                    [disabled]="completelyDownloadedCourses.length === 0" color="danger" fill="clear">
                     <ion-icon name="fas-trash" slot="icon-only" ariaLabel="{{ 'addon.storagemanager.deletecourses' | translate }}">
                     </ion-icon>
                 </ion-button>
diff --git a/src/core/components/download-refresh/core-download-refresh.html b/src/core/components/download-refresh/core-download-refresh.html
index 21d380920..d30ef77b9 100644
--- a/src/core/components/download-refresh/core-download-refresh.html
+++ b/src/core/components/download-refresh/core-download-refresh.html
@@ -1,14 +1,13 @@
 <ng-container *ngIf="enabled && !loading">
     <!-- Download button. -->
-    <ion-button *ngIf="status == statusNotDownloaded" fill="clear" (click)="download($event, false)" color="dark" @coreShowHideAnimation
+    <ion-button *ngIf="status == statusNotDownloaded" fill="clear" (click)="download($event, false)" @coreShowHideAnimation
         [attr.aria-label]="(statusTranslatable || 'core.download') | translate">
         <ion-icon slot="icon-only" name="fas-cloud-download-alt" aria-hidden="true"></ion-icon>
     </ion-button>
 
     <!-- Refresh button. -->
     <ion-button *ngIf="status == statusOutdated || (status == statusDownloaded && !canTrustDownload)" fill="clear"
-        (click)="download($event, true)" color="primary" @coreShowHideAnimation
-        [attr.aria-label]="(statusTranslatable || 'core.refresh') | translate">
+        (click)="download($event, true)" @coreShowHideAnimation [attr.aria-label]="(statusTranslatable || 'core.refresh') | translate">
         <ion-icon slot="icon-only" name="fam-cloud-refresh" aria-hidden="true"></ion-icon>
     </ion-button>
 
diff --git a/src/core/components/file/core-file.html b/src/core/components/file/core-file.html
index ff3e41e9b..396b05120 100644
--- a/src/core/components/file/core-file.html
+++ b/src/core/components/file/core-file.html
@@ -12,8 +12,7 @@
             (action)="download()">
         </core-download-refresh>
 
-        <ion-button fill="clear" *ngIf="isDownloaded && isIOS" (click)="openFile($event, true)" color="dark"
-            [title]="openButtonLabel | translate">
+        <ion-button fill="clear" *ngIf="isDownloaded && isIOS" (click)="openFile($event, true)" [title]="openButtonLabel | translate">
             <ion-icon slot="icon-only" [name]="openButtonIcon" aria-hidden="true"></ion-icon>
         </ion-button>
 
diff --git a/src/core/components/horizontal-scroll-controls/core-horizontal-scroll-controls.html b/src/core/components/horizontal-scroll-controls/core-horizontal-scroll-controls.html
index e7d55fa25..787cea97b 100644
--- a/src/core/components/horizontal-scroll-controls/core-horizontal-scroll-controls.html
+++ b/src/core/components/horizontal-scroll-controls/core-horizontal-scroll-controls.html
@@ -1,9 +1,9 @@
-<ion-button fill="clear" color="dark" (click)="scroll('backward')" [hidden]="scrollPosition === 'hidden'"
-    [disabled]="scrollPosition === 'start'" [attr.aria-label]="'core.scrollbackward' | translate" [attr.aria-controls]="targetId">
+<ion-button fill="clear" (click)="scroll('backward')" [hidden]="scrollPosition === 'hidden'" [disabled]="scrollPosition === 'start'"
+    [attr.aria-label]="'core.scrollbackward' | translate" [attr.aria-controls]="targetId">
     <ion-icon name="fas-chevron-left" slot="icon-only" aria-hidden="true"></ion-icon>
 </ion-button>
 
-<ion-button fill="clear" color="dark" (click)="scroll('forward')" [hidden]="scrollPosition === 'hidden'"
-    [disabled]="scrollPosition === 'end'" [attr.aria-label]="'core.scrollforward' | translate" [attr.aria-controls]="targetId">
+<ion-button fill="clear" (click)="scroll('forward')" [hidden]="scrollPosition === 'hidden'" [disabled]="scrollPosition === 'end'"
+    [attr.aria-label]="'core.scrollforward' | translate" [attr.aria-controls]="targetId">
     <ion-icon name="fas-chevron-right" slot="icon-only" aria-hidden="true"></ion-icon>
 </ion-button>
diff --git a/src/core/components/iframe/core-iframe.html b/src/core/components/iframe/core-iframe.html
index 78c405420..e9664f6d3 100644
--- a/src/core/components/iframe/core-iframe.html
+++ b/src/core/components/iframe/core-iframe.html
@@ -13,8 +13,8 @@
         [src]="safeUrl" [attr.allowfullscreen]="allowFullscreen ? 'allowfullscreen' : null">
     </iframe>
 
-    <ion-button *ngIf="!loading && displayHelp" color="dark" expand="block" fill="clear" (click)="openIframeHelpModal()"
-        aria-haspopup="dialog" class="core-button-as-link core-iframe-help">
+    <ion-button *ngIf="!loading && displayHelp" expand="block" fill="clear" (click)="openIframeHelpModal()" aria-haspopup="dialog"
+        class="core-button-as-link core-iframe-help">
         {{ 'core.iframehelp' | translate }}
     </ion-button>
 
diff --git a/src/core/components/local-file/core-local-file.html b/src/core/components/local-file/core-local-file.html
index 52a52eb4e..7c5ede969 100644
--- a/src/core/components/local-file/core-local-file.html
+++ b/src/core/components/local-file/core-local-file.html
@@ -24,7 +24,7 @@
 
             <ng-container *ngIf="manage">
                 <ion-button *ngIf="!editMode" fill="clear" [core-suppress-events] (onClick)="activateEdit($event)"
-                    [attr.aria-label]="'core.edit' | translate" color="dark">
+                    [attr.aria-label]="'core.edit' | translate">
                     <ion-icon name="fas-pen" slot="icon-only" aria-hidden="true"></ion-icon>
                 </ion-button>
 
diff --git a/src/core/components/navigation-bar/core-navigation-bar.html b/src/core/components/navigation-bar/core-navigation-bar.html
index 087ffbdf9..1005bfcd5 100644
--- a/src/core/components/navigation-bar/core-navigation-bar.html
+++ b/src/core/components/navigation-bar/core-navigation-bar.html
@@ -1,7 +1,6 @@
 <ion-row class="ion-justify-content-between ion-align-items-center ion-no-padding ion-wrap" *ngIf="items.length > 1">
     <ion-col class="ion-text-start ion-no-padding core-navigation-arrow" size="auto">
-        <ion-button [disabled]="previousIndex < 0" fill="clear" color="dark" [attr.aria-label]="previousTitle"
-            (click)="navigate(previousIndex)">
+        <ion-button [disabled]="previousIndex < 0" fill="clear" [attr.aria-label]="previousTitle" (click)="navigate(previousIndex)">
             <ion-icon name="fas-chevron-left" slot="icon-only" aria-hidden="true"></ion-icon>
         </ion-button>
     </ion-col>
@@ -10,7 +9,7 @@
         </core-progress-bar>
     </ion-col>
     <ion-col class="ion-text-end ion-no-padding core-navigation-arrow" size="auto">
-        <ion-button [disabled]="nextIndex < 0" fill="clear" color="dark" [attr.aria-label]="nextTitle" (click)="navigate(nextIndex)">
+        <ion-button [disabled]="nextIndex < 0" fill="clear" [attr.aria-label]="nextTitle" (click)="navigate(nextIndex)">
             <ion-icon name="fas-chevron-right" slot="icon-only" aria-hidden="true"></ion-icon>
         </ion-button>
     </ion-col>
diff --git a/src/core/components/send-message-form/core-send-message-form.html b/src/core/components/send-message-form/core-send-message-form.html
index 44691f99e..dec9430f5 100644
--- a/src/core/components/send-message-form/core-send-message-form.html
+++ b/src/core/components/send-message-form/core-send-message-form.html
@@ -7,6 +7,6 @@
     </textarea>
     <ion-button fill="clear" size="large" type="submit" [disabled]="!message || sendDisabled" [attr.aria-label]="'core.send' | translate"
         [core-suppress-events] (onClick)="submitForm($event)">
-        <ion-icon name="send" color="dark" slot="icon-only" aria-hidden="true" flip-rtl></ion-icon>
+        <ion-icon name="send" slot="icon-only" aria-hidden="true" flip-rtl></ion-icon>
     </ion-button>
 </form>
diff --git a/src/core/features/course/components/course-format/course-format.html b/src/core/features/course/components/course-format/course-format.html
index 8c350f930..b457038b7 100644
--- a/src/core/features/course/components/course-format/course-format.html
+++ b/src/core/features/course/components/course-format/course-format.html
@@ -27,13 +27,13 @@
 
         <ion-buttons class="ion-padding core-course-section-nav-buttons safe-area-padding-horizontal list-item-limited-width"
             *ngIf="displayCourseIndex && (previousSection || nextSection)">
-            <ion-button *ngIf="previousSection" (click)="sectionChanged(previousSection)" color="primary" fill="solid" expand="block"
+            <ion-button *ngIf="previousSection" (click)="sectionChanged(previousSection)" fill="solid" expand="block"
                 [attr.aria-label]="('core.previous' | translate) + ': ' + previousSection.name">
                 <ion-icon name="fas-arrow-left" slot="start" aria-hidden="true"></ion-icon>
                 <core-format-text [text]="previousSection.name" contextLevel="course" [contextInstanceId]="course.id">
                 </core-format-text>
             </ion-button>
-            <ion-button *ngIf="nextSection" (click)="sectionChanged(nextSection)" color="primary" fill="solid" expand="block"
+            <ion-button *ngIf="nextSection" (click)="sectionChanged(nextSection)" fill="solid" expand="block"
                 [attr.aria-label]="('core.next' | translate) + ': ' + nextSection.name">
                 <core-format-text [text]="nextSection.name" contextLevel="course" [contextInstanceId]="course.id">
                 </core-format-text>
@@ -49,7 +49,7 @@
 
 <!-- Course Index button. -->
 <ion-fab slot="fixed" core-fab vertical="bottom" horizontal="end" *ngIf="loaded && displayCourseIndex">
-    <ion-fab-button (click)="openCourseIndex()" [attr.aria-label]="'core.course.courseindex' | translate">
+    <ion-fab-button (click)="openCourseIndex()" [attr.aria-label]="'core.course.courseindex' | translate" color="secondary">
         <ion-icon name="fas-list-ul" aria-hidden="true"></ion-icon>
         <span class="sr-only">{{'core.course.courseindex' | translate }}</span>
     </ion-fab-button>
diff --git a/src/core/features/course/components/module-manual-completion/core-course-module-manual-completion.html b/src/core/features/course/components/module-manual-completion/core-course-module-manual-completion.html
index 7da05d7ee..798e97f8d 100644
--- a/src/core/features/course/components/module-manual-completion/core-course-module-manual-completion.html
+++ b/src/core/features/course/components/module-manual-completion/core-course-module-manual-completion.html
@@ -7,8 +7,8 @@
             <ion-icon *ngIf="completion?.offline" name="fas-sync" [attr.aria-label]="'core.course.manualcompletionnotsynced' | translate"
                 slot="end"></ion-icon>
         </ion-button>
-        <ion-button *ngIf="!completion.state" color="dark" fill="outline" [attr.aria-label]="accessibleDescription"
-            (click)="completionClicked($event)" class="ion-text-wrap" [class.chip]="mode == 'basic'">
+        <ion-button *ngIf="!completion.state" fill="outline" [attr.aria-label]="accessibleDescription" (click)="completionClicked($event)"
+            class="ion-text-wrap" [class.chip]="mode == 'basic'">
             {{ 'core.course.completion_manual:markdone' | translate }}
             <ion-icon *ngIf="completion?.offline" name="fas-sync" [attr.aria-label]="'core.course.manualcompletionnotsynced' | translate"
                 slot="end"></ion-icon>
@@ -16,7 +16,7 @@
     </ng-container>
 
     <ng-container *ngIf="!completion.istrackeduser">
-        <ion-button disabled="true" color="dark" fill="outline" class="ion-text-wrap" [class.chip]="mode == 'basic'">
+        <ion-button disabled="true" fill="outline" class="ion-text-wrap" [class.chip]="mode == 'basic'">
             {{ 'core.course.completion_manual:markdone' | translate }}
         </ion-button>
     </ng-container>
diff --git a/src/core/features/course/components/module-navigation/core-course-module-navigation.html b/src/core/features/course/components/module-navigation/core-course-module-navigation.html
index d2ef8639e..6b092bfb8 100644
--- a/src/core/features/course/components/module-navigation/core-course-module-navigation.html
+++ b/src/core/features/course/components/module-navigation/core-course-module-navigation.html
@@ -2,13 +2,13 @@
     <ion-row class="ion-justify-content-between ion-align-items-center ion-no-padding ion-wrap" *ngIf="previousModule || nextModule">
         <ion-col size="auto" class="ion-no-padding core-course-module-navigation-arrow">
             <ion-button fill="clear" class="core-course-previous-module" [disabled]="!previousModule" (click)="goToActivity(false)"
-                [attr.aria-label]="'core.course.gotopreviousactivity' | translate" color="dark">
+                [attr.aria-label]="'core.course.gotopreviousactivity' | translate">
                 <ion-icon name="fas-arrow-left" slot="icon-only" aria-hidden="true"></ion-icon>
             </ion-button>
         </ion-col>
         <ion-col size="auto" class="ion-no-padding core-course-module-navigation-arrow">
             <ion-button fill="clear" class="core-course-next-module" [disabled]="!nextModule" (click)="goToActivity(true)"
-                [attr.aria-label]="'core.course.gotonextactivity' | translate" color="dark">
+                [attr.aria-label]="'core.course.gotonextactivity' | translate">
                 <ion-icon name="fas-arrow-right" slot="icon-only" aria-hidden="true"></ion-icon>
             </ion-button>
         </ion-col>
diff --git a/src/core/features/course/components/module-summary/module-summary.html b/src/core/features/course/components/module-summary/module-summary.html
index 09a0e3354..f60653532 100644
--- a/src/core/features/course/components/module-summary/module-summary.html
+++ b/src/core/features/course/components/module-summary/module-summary.html
@@ -25,7 +25,7 @@
                 </h1>
             </ion-label>
             <ion-button fill="clear" *ngIf="displayOptions.displayOpenInBrowser" [href]="externalUrl" core-link [showBrowserWarning]="false"
-                color="dark" [attr.aria-label]="'core.openinbrowser' | translate" slot="end">
+                [attr.aria-label]="'core.openinbrowser' | translate" slot="end">
                 <ion-icon name="fas-external-link-alt" slot="icon-only" aria-hidden="true"></ion-icon>
             </ion-button>
         </ion-item>
@@ -80,7 +80,7 @@
                 </ion-label>
             </ion-item>
             <ion-button fill="outline" expand="block" *ngIf="canPrefetch && displayOptions.displayPrefetch" class="ion-text-wrap"
-                (click)="prefetch()" color="primary" [disabled]="prefetchDisabled">
+                (click)="prefetch()" [disabled]="prefetchDisabled">
                 <ion-icon *ngIf="!prefetchLoading" name="fas-cloud-download-alt" slot="start" aria-hidden="true"></ion-icon>
                 <ion-spinner *ngIf="prefetchLoading" slot="start" aria-hidden="true"></ion-spinner>
                 <ion-label>
@@ -197,14 +197,14 @@
     </core-loading>
 </ion-content>
 <ion-footer *ngIf="loaded && isOnline && displayOptions.displayRefresh">
-    <ion-button class="ion-margin" *ngIf="!hasOffline" (click)="refresh()" expand="block">
+    <ion-button class="ion-margin" *ngIf="!hasOffline" (click)="refresh()" expand="block" fill="outline">
         <ion-icon name="fas-redo-alt" slot="start" aria-hidden="true"></ion-icon>
         <ion-label>
             {{ 'core.refresh' | translate }}
         </ion-label>
     </ion-button>
 
-    <ion-button class="ion-margin" *ngIf="hasOffline" (click)="sync()" expand="block">
+    <ion-button class="ion-margin" *ngIf="hasOffline" (click)="sync()" expand="block" fill="outline">
         <ion-icon name="fas-sync-alt" slot="start" aria-hidden="true"></ion-icon>
         <ion-label>
             {{ 'core.settings.synchronizenow' | translate }}
diff --git a/src/core/features/course/components/module/core-course-module.html b/src/core/features/course/components/module/core-course-module.html
index 86afecafe..17e53f4e1 100644
--- a/src/core/features/course/components/module/core-course-module.html
+++ b/src/core/features/course/components/module/core-course-module.html
@@ -53,7 +53,7 @@
 
                 <div class="core-module-buttons-more">
                     <!-- Buttons defined by the module handler. -->
-                    <ion-button fill="clear" *ngFor="let button of module.handlerData.buttons" color="dark"
+                    <ion-button fill="clear" *ngFor="let button of module.handlerData.buttons"
                         [hidden]="button.hidden || module.handlerData.spinner" class="core-animate-show-hide"
                         (click)="buttonClicked($event, button)" [attr.aria-label]="button.label | translate:{$a: module.handlerData.title}">
                         <ion-icon [name]="button.icon" slot="icon-only" aria-hidden="true"></ion-icon>
diff --git a/src/core/features/course/pages/course-summary/course-summary.html b/src/core/features/course/pages/course-summary/course-summary.html
index 46926639f..a4485773e 100644
--- a/src/core/features/course/pages/course-summary/course-summary.html
+++ b/src/core/features/course/pages/course-summary/course-summary.html
@@ -36,7 +36,7 @@
                         <core-format-text [text]="course.fullname" contextLevel="course" [contextInstanceId]="course.id">
                         </core-format-text>
                     </h2>
-                    <ion-chip color="brand" *ngIf="course.categoryname" class="core-course-category ion-text-nowrap">
+                    <ion-chip color="primary" *ngIf="course.categoryname" class="core-course-category ion-text-nowrap">
                         <span class="sr-only">{{ 'core.courses.aria:coursecategory' | translate }}</span>
                         <ion-label>
                             <core-format-text [text]="course.categoryname" contextLevel="coursecat" [contextInstanceId]="course.categoryid">
@@ -61,7 +61,7 @@
                         </p>
                     </div>
                 </ion-label>
-                <ion-button fill="clear" [href]="courseUrl" core-link [showBrowserWarning]="false" color="dark"
+                <ion-button fill="clear" [href]="courseUrl" core-link [showBrowserWarning]="false"
                     [attr.aria-label]="'core.openinbrowser' | translate" slot="end">
                     <ion-icon name="fas-external-link-alt" slot="icon-only" aria-hidden="true"></ion-icon>
                 </ion-button>
diff --git a/src/core/features/course/pages/module-preview/module-preview.html b/src/core/features/course/pages/module-preview/module-preview.html
index 1ff4dfa65..11cfb10da 100644
--- a/src/core/features/course/pages/module-preview/module-preview.html
+++ b/src/core/features/course/pages/module-preview/module-preview.html
@@ -12,7 +12,7 @@
 
         <ion-buttons slot="end">
             <ion-button fill="clear" *ngIf="module.url && module.uservisible && !unsupported" [href]="module.url" core-link
-                [showBrowserWarning]="false" color="dark" [attr.aria-label]="'core.openinbrowser' | translate">
+                [showBrowserWarning]="false" [attr.aria-label]="'core.openinbrowser' | translate">
                 <ion-icon name="fas-external-link-alt" slot="icon-only" aria-hidden="true"></ion-icon>
             </ion-button>
         </ion-buttons>
diff --git a/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html b/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
index fd2a803bc..e8d9a2749 100644
--- a/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
+++ b/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
@@ -17,7 +17,7 @@
 
         <div class="core-button-spinner" *ngIf="courseOptionMenuEnabled">
             <!-- Options menu. -->
-            <ion-button fill="clear" color="dark" (click)="showCourseOptionsMenu($event)" *ngIf="!showSpinner"
+            <ion-button fill="clear" (click)="showCourseOptionsMenu($event)" *ngIf="!showSpinner"
                 [attr.aria-label]="('core.displayoptions' | translate)">
                 <ion-icon name="ellipsis-vertical" slot="icon-only" aria-hidden="true"></ion-icon>
             </ion-button>
@@ -66,7 +66,7 @@
                         color="success" role="status" [attr.aria-label]="'core.downloaded' | translate"></ion-icon>
                 </p>
 
-                <ion-chip color="brand" *ngIf="course.categoryname"
+                <ion-chip color="primary" *ngIf="course.categoryname"
                     class="core-course-category core-course-additional-info ion-text-nowrap">
                     <span class="sr-only">{{ 'core.courses.aria:coursecategory' | translate }}</span>
                     <ion-label>
diff --git a/src/core/features/courses/components/course-progress/core-courses-course-progress.html b/src/core/features/courses/components/course-progress/core-courses-course-progress.html
index 9a5976b70..4d529d350 100644
--- a/src/core/features/courses/components/course-progress/core-courses-course-progress.html
+++ b/src/core/features/courses/components/course-progress/core-courses-course-progress.html
@@ -47,7 +47,7 @@
                 name="fam-cloud-done" color="success" role="status" [attr.aria-label]="'core.downloaded' | translate"></ion-icon>
 
             <!-- Options menu. -->
-            <ion-button fill="clear" color="dark" (click)="showCourseOptionsMenu($event)" *ngIf="!showSpinner"
+            <ion-button fill="clear" (click)="showCourseOptionsMenu($event)" *ngIf="!showSpinner"
                 [attr.aria-label]="('core.displayoptions' | translate)">
                 <ion-icon name="ellipsis-vertical" slot="icon-only" aria-hidden="true"></ion-icon>
             </ion-button>
diff --git a/src/core/features/courses/pages/my/my.html b/src/core/features/courses/pages/my/my.html
index 0d1d12031..c01f49f85 100644
--- a/src/core/features/courses/pages/my/my.html
+++ b/src/core/features/courses/pages/my/my.html
@@ -31,7 +31,7 @@
                 <!-- Download all courses. -->
                 <div *ngIf="downloadCoursesEnabled && myOverviewBlock && myOverviewBlock.filteredCourses.length > 1"
                     class="core-button-spinner">
-                    <ion-button *ngIf="!myOverviewBlock.prefetchCoursesData.loading" fill="clear" color="dark"
+                    <ion-button *ngIf="!myOverviewBlock.prefetchCoursesData.loading" fill="clear"
                         (click)="myOverviewBlock.prefetchCourses()"
                         [attr.aria-label]="myOverviewBlock.prefetchCoursesData.statusTranslatable | translate">
                         <ion-icon [name]="myOverviewBlock.prefetchCoursesData.icon" slot="icon-only" aria-hidden="true">
diff --git a/src/core/features/login/pages/credentials/credentials.html b/src/core/features/login/pages/credentials/credentials.html
index 61d29ffbf..bac39ab1b 100644
--- a/src/core/features/login/pages/credentials/credentials.html
+++ b/src/core/features/login/pages/credentials/credentials.html
@@ -62,7 +62,7 @@
         </form>
 
         <!-- Forgotten password option. -->
-        <ion-button *ngIf="showForgottenPassword" expand="block" fill="clear" color="dark"
+        <ion-button *ngIf="showForgottenPassword" expand="block" fill="clear"
             class="core-login-forgotten-password core-button-as-link ion-text-wrap" (click)="forgottenPassword()">
             {{ 'core.login.forgotten' | translate }}
         </ion-button>
diff --git a/src/core/features/login/pages/reconnect/reconnect.html b/src/core/features/login/pages/reconnect/reconnect.html
index 2f628b064..7854dfa37 100644
--- a/src/core/features/login/pages/reconnect/reconnect.html
+++ b/src/core/features/login/pages/reconnect/reconnect.html
@@ -76,7 +76,7 @@
         </form>
 
         <!-- Forgotten password option. -->
-        <ion-button *ngIf="showForgottenPassword && !isOAuth" expand="block" fill="clear" color="dark"
+        <ion-button *ngIf="showForgottenPassword && !isOAuth" expand="block" fill="clear"
             class="core-login-forgotten-password core-button-as-link ion-text-wrap" (click)="forgottenPassword()">
             {{ 'core.login.forgotten' | translate }}
         </ion-button>
diff --git a/src/core/features/login/pages/site/site.html b/src/core/features/login/pages/site/site.html
index c51e50ee4..3afa0eba1 100644
--- a/src/core/features/login/pages/site/site.html
+++ b/src/core/features/login/pages/site/site.html
@@ -110,7 +110,7 @@
 
         <!-- Help. -->
         <ion-button class="ion-margin-top core-login-need-help core-button-as-link ion-text-wrap" (click)="showHelp()"
-            aria-haspopup="dialog" expand="block" fill="clear" color="dark">
+            aria-haspopup="dialog" expand="block" fill="clear">
             {{ 'core.needhelp' | translate }}
         </ion-button>
     </div>
diff --git a/src/core/features/user/pages/about/about.html b/src/core/features/user/pages/about/about.html
index 295192bbe..62028bf62 100644
--- a/src/core/features/user/pages/about/about.html
+++ b/src/core/features/user/pages/about/about.html
@@ -17,7 +17,7 @@
             <ion-item class="ion-text-center core-user-profile-maininfo ion-text-wrap" lines="full">
                 <core-user-avatar [user]="user" [userId]="user.id" [linkProfile]="false" [checkOnline]="!canChangeProfilePicture">
                     <ion-button class="edit-avatar" *ngIf="canChangeProfilePicture" (click)="changeProfilePicture()"
-                        [attr.aria-label]="'core.user.newpicture' | translate" fill="clear" color="dark">
+                        [attr.aria-label]="'core.user.newpicture' | translate" fill="clear">
                         <ion-icon slot="icon-only" name="fas-pen" aria-hidden="true"></ion-icon>
                     </ion-button>
                 </core-user-avatar>
@@ -94,7 +94,7 @@
                             </a></p>
                     </ion-label>
                 </ion-item>
-                <ion-item class="ion-text-wrap" *ngIf="interests" class="core-user-profile-interests">
+                <ion-item class="ion-text-wrap core-user-profile-interests" *ngIf="interests">
                     <ion-label>
                         <h2>{{ 'core.user.interests' | translate}}</h2>
                         <ion-badge *ngFor="let interest of interests" role="link" (click)="openInterest(interest)">
diff --git a/src/core/singletons/colors.ts b/src/core/singletons/colors.ts
index b86c8b500..d0e0e3dfa 100644
--- a/src/core/singletons/colors.ts
+++ b/src/core/singletons/colors.ts
@@ -25,7 +25,6 @@ interface ColorComponents {
  * Ionic color names.
  */
 export enum CoreIonicColorNames {
-    BRAND = 'brand',
     PRIMARY = 'primary',
     SECONDARY = 'secondary',
     SUCCESS = 'success',
diff --git a/src/theme/globals.variables.scss b/src/theme/globals.variables.scss
index 09430b3a4..5f8d3a5fe 100644
--- a/src/theme/globals.variables.scss
+++ b/src/theme/globals.variables.scss
@@ -17,7 +17,7 @@ $gray-900:    #1d2125 !default; // Copy text
 $black:       #000000 !default; // Avoid usage
 
 $blue:        #0f6cbf !default;
-$cyan:        #008196 !default;
+$cyan:        #008196 !default; // Not used.
 $green:       #357a32 !default;
 $red:         #ca3120 !default;
 $yellow:      #f0ad4e !default;
@@ -39,19 +39,19 @@ $ion-item-background-rgb:  color-to-rgb-list($ion-item-background) !default;
 $ion-item-background-dark: $gray-900 !default;
 $ion-item-background-dark-rgb: color-to-rgb-list($ion-item-background-dark) !default;
 
-$primary:    $blue !default;
-$secondary:  $gray-400 !default;
+$primary:    $brand-color !default;
+$secondary:  $gray-300 !default;
 $danger:     $red !default;
 $warning:    $yellow !default;
 $success:    $green !default;
-$info:       $cyan !default;
+$info:       $blue !default;
 $light:      $gray-100 !default;
 $medium:     $gray-600 !default;
 $dark:       $gray-800 !default;
 
 $colors:  (
-    primary: (light: $primary),
-    secondary: (light: $secondary),
+    primary: (light: $primary, dark: $primary),
+    secondary: (light: $secondary, dark: $gray-700),
     success: (light: $success),
     warning: (light: $warning),
     danger:  (light: $danger),
@@ -59,7 +59,6 @@ $colors:  (
     light: (light: $light, dark: $dark),
     medium: (light: $medium, dark: $gray-200),
     dark: (light: $dark, dark: $light),
-    brand: (light: $brand-color, dark: $brand-color),
 ) !default;
 
 /**
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 3181dbb72..647a1d7f3 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -370,6 +370,10 @@ ion-button.button.button-clear.button-has-icon-only {
     --border-radius: var(--huge-radius);
 }
 
+ion-button.button.button-clear {
+    --color: var(--dark);
+}
+
 ion-button.button.button-solid,
 ion-button.button.button-outline {
     --border-radius: var(--core-input-radius);
diff --git a/src/theme/theme.dark.scss b/src/theme/theme.dark.scss
index 358d341f1..e4985f605 100644
--- a/src/theme/theme.dark.scss
+++ b/src/theme/theme.dark.scss
@@ -65,7 +65,7 @@
         }
     }
 
-    --core-link-color: var(--primary-tint);
+    --core-link-color: var(--info-tint);
 
     --core-header-toolbar-background:   var(--gray-900);
     --core-header-toolbar-color:        var(--white);
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 41545859f..2c054b588 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -47,7 +47,8 @@
         @include generate-color($color-name, $colors);
     }
 
-    --brand-color: var(--brand);
+    --brand-color: var(--primary);
+    --brand-contrast: var(--primary-contrast);
 
     // Accessibility vars.
     --a11y-min-target-size: 44px;
@@ -112,9 +113,9 @@
 
     --core-bottom-tabs-background: var(--white);
     --core-bottom-tabs-color: var(--gray-700);
-    --core-bottom-tabs-color-selected: var(--brand);
+    --core-bottom-tabs-color-selected: var(--brand-color);
     --core-bottom-tabs-background-selected: transparent;
-    --core-bottom-tabs-badge-color: var(--brand);
+    --core-bottom-tabs-badge-color: var(--brand-color);
     --core-bottom-tabs-badge-text-color: var(--brand-contrast);
     --bottom-tabs-size: 48px;
     --side-tabs-size: 56px;
@@ -125,7 +126,7 @@
         --background-selected: var(--core-bottom-tabs-background-selected);
     }
 
-    --core-link-color: var(--primary);
+    --core-link-color: var(--info);
     a {
         color: var(--core-link-color);
     }
@@ -202,7 +203,7 @@
     ion-action-sheet {
         --button-color: var(--ion-text-color);
         --button-color-selected: var(--ion-text-color);
-        --title-border-color: var(--brand);
+        --title-border-color: var(--brand-color);
 
         .action-sheet-title {
             --color: var(--ion-text-color);
@@ -224,7 +225,7 @@
     --core-tab-color: var(--subdued-text-color);
     --core-tab-border-color: var(--stroke);
     --core-tab-color-active: var(--dark);
-    --core-tab-border-color-active: var(--brand);
+    --core-tab-border-color-active: var(--brand-color);
     --core-tab-font-weight-active: normal;
     --core-tabs-height: 48px;
     core-tabs, core-tabs-outlet {
@@ -238,7 +239,7 @@
         }
     }
 
-    --core-loading-spinner: var(--brand);
+    --core-loading-spinner: var(--brand-color);
     ion-loading {
         --spinner-color: var(--core-loading-spinner);
     }
@@ -249,7 +250,7 @@
     }
 
     --core-progressbar-height: 8px;
-    --core-progressbar-color: var(--brand);
+    --core-progressbar-color: var(--brand-color);
     --core-progressbar-text-color: var(--medium);
     --core-progressbar-background: var(--brand-tint);
 
@@ -303,7 +304,7 @@
     --core-login-input-background: var(--white);
     --core-login-input-color: var(--gray-900);
 
-    --core-star-color: var(--brand);
+    --core-star-color: var(--brand-color);
 
     --core-large-avatar-size: 90px;
     --core-avatar-size: var(--a11y-min-target-size);

From b7a2a1ac8bf199117e99c3d7a57a387a65f03b8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 2 Mar 2022 17:19:22 +0100
Subject: [PATCH 0637/1008] MOBILE-3814 course: Change course index color

---
 .../features/course/components/course-index/course-index.scss  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/core/features/course/components/course-index/course-index.scss b/src/core/features/course/components/course-index/course-index.scss
index 854d9c3a3..130cdf756 100644
--- a/src/core/features/course/components/course-index/course-index.scss
+++ b/src/core/features/course/components/course-index/course-index.scss
@@ -30,8 +30,7 @@ ion-item.core-course-index-all::part(native) {
 }
 
 ion-item.item.item-current {
-    --background: var(--primary);
-    --color: var(--primary-contrast);
+    --background: var(--primary-tint);
     border: 0;
 }
 

From 4af7cd98d62ba88df8c303ac3295e1c9a547ccd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 2 Mar 2022 16:57:41 +0100
Subject: [PATCH 0638/1008] MOBILE-3814 eslint: Check duplicated attributes on
 templates

---
 .eslintrc.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.eslintrc.js b/.eslintrc.js
index deda33df6..d5a05ca9e 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -292,6 +292,7 @@ module.exports = {
                 '@angular-eslint/template/no-positive-tabindex': 'error',
                 '@angular-eslint/template/accessibility-table-scope': 'error',
                 '@angular-eslint/template/accessibility-valid-aria': 'error',
+                '@angular-eslint/template/no-duplicate-attributes': 'error',
             },
         },
         {

From 3e40999366e8ed2631dfaf1895e01cebf648eab1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 2 Mar 2022 17:26:39 +0100
Subject: [PATCH 0639/1008] MOBILE-3814 eslint: Fix duplicated attributes

---
 .../messages/pages/discussion/discussion.html       | 13 +++++++------
 .../group-conversations/group-conversations.html    |  8 +++++---
 ...d-workshop-assessment-strategy-accumulative.html |  4 ++--
 .../pages/edit-submission/edit-submission.html      |  6 +++---
 .../course/pages/course-summary/course-summary.html |  2 +-
 .../core-editor-rich-text-editor.html               |  3 +--
 .../core-siteplugins-only-title-block.html          |  2 +-
 7 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/addons/messages/pages/discussion/discussion.html b/src/addons/messages/pages/discussion/discussion.html
index 38ec30d17..b3de76af9 100644
--- a/src/addons/messages/pages/discussion/discussion.html
+++ b/src/addons/messages/pages/discussion/discussion.html
@@ -28,18 +28,19 @@
             <core-context-menu-item [hidden]="isSelf || !showInfo || !isGroup" [priority]="1000"
                 [content]="'addon.messages.groupinfo' | translate" (action)="viewInfo()" iconAction="fas-info-circle">
             </core-context-menu-item>
-            <core-context-menu-item [hidden]="!groupMessagingEnabled || !conversation" [priority]="800" [content]="(conversation && conversation.isfavourite ? 'addon.messages.removefromfavourites' :
-                'addon.messages.addtofavourites') | translate" (action)="changeFavourite($event)" [closeOnClick]="false"
-                [iconAction]="favouriteIcon" [iconSlash]="favouriteIconSlash"></core-context-menu-item>
+            <core-context-menu-item [hidden]="!groupMessagingEnabled || !conversation" [priority]="800" (action)="changeFavourite($event)"
+                [closeOnClick]="false" [content]="(conversation && conversation.isfavourite ? 'addon.messages.removefromfavourites' :
+                'addon.messages.addtofavourites') | translate" [iconAction]="favouriteIcon" [iconSlash]="favouriteIconSlash">
+            </core-context-menu-item>
             <core-context-menu-item [hidden]="isSelf || !otherMember || otherMember.isblocked" [priority]="700"
                 [content]="'addon.messages.blockuser' | translate" (action)="blockUser()" [iconAction]="blockIcon">
             </core-context-menu-item>
             <core-context-menu-item [hidden]="isSelf || !otherMember || !otherMember.isblocked" [priority]="700"
                 [content]="'addon.messages.unblockuser' | translate" (action)="unblockUser()" [iconAction]="blockIcon">
             </core-context-menu-item>
-            <core-context-menu-item [hidden]="isSelf || !muteEnabled || !conversation" [priority]="600" [content]="(conversation && conversation.ismuted ? 'addon.messages.unmuteconversation' :
-                'addon.messages.muteconversation') | translate" (action)="changeMute($event)" [closeOnClick]="false"
-                [iconAction]="muteIcon"></core-context-menu-item>
+            <core-context-menu-item [hidden]="isSelf || !muteEnabled || !conversation" [priority]="600" (action)="changeMute($event)"
+                [closeOnClick]="false" [content]="(conversation && conversation.ismuted ? 'addon.messages.unmuteconversation' :
+                'addon.messages.muteconversation') | translate" [iconAction]="muteIcon"></core-context-menu-item>
             <core-context-menu-item [hidden]="!canDelete || !messages || !messages.length" [priority]="400"
                 [content]="'addon.messages.showdeletemessages' | translate" iconAction="toggle" [(toggle)]="showDelete">
             </core-context-menu-item>
diff --git a/src/addons/messages/pages/group-conversations/group-conversations.html b/src/addons/messages/pages/group-conversations/group-conversations.html
index e6165166a..71f57c29d 100644
--- a/src/addons/messages/pages/group-conversations/group-conversations.html
+++ b/src/addons/messages/pages/group-conversations/group-conversations.html
@@ -146,9 +146,11 @@
 <!-- Template to render a list of conversations. -->
 <ng-template #conversationsTemplate let-conversations="conversations">
     <ion-item class="ion-text-wrap addon-message-discussion" *ngFor="let conversation of conversations" button detail="false"
-        [attr.aria-label]="conversation.name" (click)="gotoConversation(conversation.id, conversation.userid)" [attr.aria-current]="((conversation.id && conversation.id == selectedConversationId) ||
-            (conversation.userid && conversation.userid == selectedUserId)) ? 'page': 'false'"
-        id="addon-message-conversation-{{ conversation.id ? conversation.id : 'user-' + conversation.userid }}">
+        (click)="gotoConversation(conversation.id, conversation.userid)"
+        [attr.aria-current]="((conversation.id &&
+            conversation.id == selectedConversationId) || (conversation.userid && conversation.userid == selectedUserId)) ? 'page': 'false'"
+        id="addon-message-conversation-{{ conversation.id ? conversation.id : 'user-' + conversation.userid }}"
+        [attr.aria-label]="conversation.name">
         <!-- Group conversation image. -->
         <ion-avatar slot="start" *ngIf="conversation.type == typeGroup">
             <img [src]="conversation.imageurl" [alt]="conversation.name" core-external-content
diff --git a/src/addons/mod/workshop/assessment/accumulative/component/addon-mod-workshop-assessment-strategy-accumulative.html b/src/addons/mod/workshop/assessment/accumulative/component/addon-mod-workshop-assessment-strategy-accumulative.html
index 16790ec5e..d3d3ed85d 100644
--- a/src/addons/mod/workshop/assessment/accumulative/component/addon-mod-workshop-assessment-strategy-accumulative.html
+++ b/src/addons/mod/workshop/assessment/accumulative/component/addon-mod-workshop-assessment-strategy-accumulative.html
@@ -13,8 +13,8 @@
                     {{ 'addon.mod_workshop_assessment_accumulative.dimensiongradefor' | translate : {'$a': field.dimtitle } }}
                 </span>
             </ion-label>
-            <ion-select [(ngModel)]="selectedValues[n].grade" interface="action-sheet" [interfaceOptions]="{header: 'addon.mod_workshop_assessment_accumulative.dimensiongradefor' |
-                    translate : {'$a': field.dimtitle }}">
+            <ion-select [interfaceOptions]="{header: 'addon.mod_workshop_assessment_accumulative.dimensiongradefor' |
+                    translate : {'$a': field.dimtitle }}" [(ngModel)]="selectedValues[n].grade" interface="action-sheet">
                 <ion-select-option *ngFor="let grade of field.grades" [value]="grade.value">{{grade.label}}</ion-select-option>
             </ion-select>
             <core-input-errors *ngIf="fieldErrors['grade_' + n]" [errorText]="fieldErrors['grade_' + n]">
diff --git a/src/addons/mod/workshop/pages/edit-submission/edit-submission.html b/src/addons/mod/workshop/pages/edit-submission/edit-submission.html
index e7c928aad..044e1ca5d 100644
--- a/src/addons/mod/workshop/pages/edit-submission/edit-submission.html
+++ b/src/addons/mod/workshop/pages/edit-submission/edit-submission.html
@@ -34,9 +34,9 @@
                     </span>
                 </ion-label>
                 <core-rich-text-editor [control]="editForm.controls['content']" name="content"
-                    [placeholder]="'addon.mod_workshop.submissioncontent' | translate" name="content" [component]="component"
-                    [componentId]="componentId" [autoSave]="true" contextLevel="module" [contextInstanceId]="module.id"
-                    elementId="content_editor" [draftExtraParams]="editorExtraParams"></core-rich-text-editor>
+                    [placeholder]="'addon.mod_workshop.submissioncontent' | translate" [component]="component" [componentId]="componentId"
+                    [autoSave]="true" contextLevel="module" [contextInstanceId]="module.id" elementId="content_editor"
+                    [draftExtraParams]="editorExtraParams"></core-rich-text-editor>
             </ion-item>
 
             <core-attachments *ngIf="fileAvailable" [files]="attachments" [maxSize]="workshop.maxbytes"
diff --git a/src/core/features/course/pages/course-summary/course-summary.html b/src/core/features/course/pages/course-summary/course-summary.html
index a4485773e..88300031a 100644
--- a/src/core/features/course/pages/course-summary/course-summary.html
+++ b/src/core/features/course/pages/course-summary/course-summary.html
@@ -143,7 +143,7 @@
     </ion-card>
 
     <ng-container *ngIf="canAccessCourse">
-        <ion-button class="ion-margin" *ngFor="let item of courseMenuHandlers" (click)="openMenuItem(item)" [class]="item.data.class"
+        <ion-button *ngFor="let item of courseMenuHandlers" (click)="openMenuItem(item)" [class]="'ion-margin' + item.data.class"
             expand="block">
             <ion-icon *ngIf="item.data.icon" [name]="item.data.icon" slot="start" aria-hidden="true"></ion-icon>
             <ion-label>{{item.data.title | translate }}</ion-label>
diff --git a/src/core/features/editor/components/rich-text-editor/core-editor-rich-text-editor.html b/src/core/features/editor/components/rich-text-editor/core-editor-rich-text-editor.html
index 94c9dc386..5e1ad41d8 100644
--- a/src/core/features/editor/components/rich-text-editor/core-editor-rich-text-editor.html
+++ b/src/core/features/editor/components/rich-text-editor/core-editor-rich-text-editor.html
@@ -80,8 +80,7 @@
         </ion-slide>
         <ion-slide>
             <button [disabled]="!rteEnabled" [attr.aria-pressed]="toolbarStyles.ul" [title]="'core.editor.unorderedlist' | translate"
-                (click)="buttonAction($event, 'insertUnorderedList')" (click)="buttonAction($event, 'insertUnorderedList')"
-                (mousedown)="downAction($event)" (keydown)="downAction($event)">
+                (click)="buttonAction($event, 'insertUnorderedList')" (mousedown)="downAction($event)" (keydown)="downAction($event)">
                 <ion-icon name="fas-list-ul" aria-hidden="true"></ion-icon>
             </button>
         </ion-slide>
diff --git a/src/core/features/siteplugins/components/only-title-block/core-siteplugins-only-title-block.html b/src/core/features/siteplugins/components/only-title-block/core-siteplugins-only-title-block.html
index 04564f703..c80615fda 100644
--- a/src/core/features/siteplugins/components/only-title-block/core-siteplugins-only-title-block.html
+++ b/src/core/features/siteplugins/components/only-title-block/core-siteplugins-only-title-block.html
@@ -1,4 +1,4 @@
-<ion-item button class="divider ion-text-wrap" detail="true" (click)="gotoBlock()" detail="true">
+<ion-item button class="divider ion-text-wrap" detail="true" (click)="gotoBlock()">
     <ion-label>
         <h2>{{ title | translate }}</h2>
     </ion-label>

From fbcd0841f0bdc4362e2e4f596e8350506bf28f29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 3 Mar 2022 11:08:19 +0100
Subject: [PATCH 0640/1008] MOBILE-3814 style: Remove brand color from scss

---
 .../index/addon-mod-data-index.html           |  2 +-
 .../course-format/course-format.html          |  8 ++---
 src/theme/theme.dark.scss                     |  2 +-
 src/theme/theme.light.scss                    | 30 +++++++++----------
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/addons/mod/data/components/index/addon-mod-data-index.html b/src/addons/mod/data/components/index/addon-mod-data-index.html
index 12860af6f..b9dab9e0e 100644
--- a/src/addons/mod/data/components/index/addon-mod-data-index.html
+++ b/src/addons/mod/data/components/index/addon-mod-data-index.html
@@ -87,7 +87,7 @@
         </ion-card>
     </ng-container>
 
-    <div class="addon-data-contents addon-data-entries-{{database.id}} ion-padding-horizontal" *ngIf="!isEmpty && database">
+    <div class="addon-data-contents addon-data-entries-{{database.id}}" *ngIf="!isEmpty && database">
         <core-style [css]="database.csstemplate" prefix=".addon-data-entries-{{database.id}}"></core-style>
 
         <core-compile-html [text]="entriesRendered" [jsData]="jsData" [extraImports]="extraImports"></core-compile-html>
diff --git a/src/core/features/course/components/course-format/course-format.html b/src/core/features/course/components/course-format/course-format.html
index b457038b7..7232b31bf 100644
--- a/src/core/features/course/components/course-format/course-format.html
+++ b/src/core/features/course/components/course-format/course-format.html
@@ -25,21 +25,21 @@
             <core-infinite-loading [enabled]="canLoadMore" (action)="showMoreActivities($event)"></core-infinite-loading>
         </div>
 
-        <ion-buttons class="ion-padding core-course-section-nav-buttons safe-area-padding-horizontal list-item-limited-width"
+        <div class="ion-padding core-course-section-nav-buttons safe-area-padding-horizontal list-item-limited-width"
             *ngIf="displayCourseIndex && (previousSection || nextSection)">
-            <ion-button *ngIf="previousSection" (click)="sectionChanged(previousSection)" fill="solid" expand="block"
+            <ion-button *ngIf="previousSection" (click)="sectionChanged(previousSection)" expand="block"
                 [attr.aria-label]="('core.previous' | translate) + ': ' + previousSection.name">
                 <ion-icon name="fas-arrow-left" slot="start" aria-hidden="true"></ion-icon>
                 <core-format-text [text]="previousSection.name" contextLevel="course" [contextInstanceId]="course.id">
                 </core-format-text>
             </ion-button>
-            <ion-button *ngIf="nextSection" (click)="sectionChanged(nextSection)" fill="solid" expand="block"
+            <ion-button *ngIf="nextSection" (click)="sectionChanged(nextSection)" expand="block"
                 [attr.aria-label]="('core.next' | translate) + ': ' + nextSection.name">
                 <core-format-text [text]="nextSection.name" contextLevel="course" [contextInstanceId]="course.id">
                 </core-format-text>
                 <ion-icon name="fas-arrow-right" slot="end" aria-hidden="true"></ion-icon>
             </ion-button>
-        </ion-buttons>
+        </div>
     </core-loading>
 </core-dynamic-component>
 
diff --git a/src/theme/theme.dark.scss b/src/theme/theme.dark.scss
index e4985f605..57ddeeb61 100644
--- a/src/theme/theme.dark.scss
+++ b/src/theme/theme.dark.scss
@@ -55,7 +55,7 @@
         --background-alternative: var(--gray-900);
     }
 
-    --core-bottom-tabs-badge-text-color: var(--brand-contrast);
+    --core-bottom-tabs-badge-text-color: var(--primary-contrast);
     --core-bottom-tabs-background: var(--gray-900);
     --core-bottom-tabs-color: var(--gray-200);
 
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 2c054b588..f55a0c282 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -47,9 +47,6 @@
         @include generate-color($color-name, $colors);
     }
 
-    --brand-color: var(--primary);
-    --brand-contrast: var(--primary-contrast);
-
     // Accessibility vars.
     --a11y-min-target-size: 44px;
     --a11y-focus-color: var(--primary);
@@ -94,12 +91,15 @@
     --ion-card-color: var(--text-color);
     --ion-card-vertical-margin: 10px;
     --ion-card-horizontal-margin: 10px;
+    --ion-card-radius: var(--medium-radius);
+    --ion-card-border-width: 1px;
+    --ion-card-border-color: var(--stroke);
     ion-card {
-        --border-width: 1px;
+        --border-width: var(--ion-card-border-width);
         --border-style: solid;
-        --border-color: var(--stroke);
+        --border-color: var(--ion-card-border-color);
         --box-shadow: none;
-        --border-radius: var(--medium-radius);
+        --border-radius: var(--ion-card-radius);
     }
 
     --text-hightlight-background-color: #{$core-text-hightlight-background-color};
@@ -113,10 +113,10 @@
 
     --core-bottom-tabs-background: var(--white);
     --core-bottom-tabs-color: var(--gray-700);
-    --core-bottom-tabs-color-selected: var(--brand-color);
+    --core-bottom-tabs-color-selected: var(--primary);
     --core-bottom-tabs-background-selected: transparent;
-    --core-bottom-tabs-badge-color: var(--brand-color);
-    --core-bottom-tabs-badge-text-color: var(--brand-contrast);
+    --core-bottom-tabs-badge-color: var(--primary);
+    --core-bottom-tabs-badge-text-color: var(--primary-contrast);
     --bottom-tabs-size: 48px;
     --side-tabs-size: 56px;
     ion-tab-bar.mainmenu-tabs {
@@ -203,7 +203,7 @@
     ion-action-sheet {
         --button-color: var(--ion-text-color);
         --button-color-selected: var(--ion-text-color);
-        --title-border-color: var(--brand-color);
+        --title-border-color: var(--primary);
 
         .action-sheet-title {
             --color: var(--ion-text-color);
@@ -225,7 +225,7 @@
     --core-tab-color: var(--subdued-text-color);
     --core-tab-border-color: var(--stroke);
     --core-tab-color-active: var(--dark);
-    --core-tab-border-color-active: var(--brand-color);
+    --core-tab-border-color-active: var(--primary);
     --core-tab-font-weight-active: normal;
     --core-tabs-height: 48px;
     core-tabs, core-tabs-outlet {
@@ -239,7 +239,7 @@
         }
     }
 
-    --core-loading-spinner: var(--brand-color);
+    --core-loading-spinner: var(--primary);
     ion-loading {
         --spinner-color: var(--core-loading-spinner);
     }
@@ -250,9 +250,9 @@
     }
 
     --core-progressbar-height: 8px;
-    --core-progressbar-color: var(--brand-color);
+    --core-progressbar-color: var(--primary);
     --core-progressbar-text-color: var(--medium);
-    --core-progressbar-background: var(--brand-tint);
+    --core-progressbar-background: var(--primary-tint);
 
     --ion-item-background:        #{$ion-item-background};
     --ion-item-detail-icon-color: var(--medium);
@@ -304,7 +304,7 @@
     --core-login-input-background: var(--white);
     --core-login-input-color: var(--gray-900);
 
-    --core-star-color: var(--brand-color);
+    --core-star-color: var(--primary);
 
     --core-large-avatar-size: 90px;
     --core-avatar-size: var(--a11y-min-target-size);

From 2a20fea590830f38e86bd728a2c91b5b3039bda1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 3 Mar 2022 11:41:39 +0100
Subject: [PATCH 0641/1008] MOBILE-3814 collapsible: Use 108px as default max
 height

---
 src/core/directives/collapsible-item.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/directives/collapsible-item.ts b/src/core/directives/collapsible-item.ts
index 3188421e9..b097611a3 100644
--- a/src/core/directives/collapsible-item.ts
+++ b/src/core/directives/collapsible-item.ts
@@ -20,7 +20,7 @@ import { CoreComponentsRegistry } from '@singletons/components-registry';
 import { CoreEventLoadingChangedData, CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreFormatTextDirective } from './format-text';
 
-const defaultMaxHeight = 56;
+const defaultMaxHeight = 64;
 const buttonHeight = 44;
 
 /**

From 0b0920876bae3592c3147b9129fe703d608a54ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 3 Mar 2022 12:02:53 +0100
Subject: [PATCH 0642/1008] MOBILE-3998 imscp: Fix navbar not showing

---
 src/addons/mod/imscp/pages/view/view.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/addons/mod/imscp/pages/view/view.html b/src/addons/mod/imscp/pages/view/view.html
index 309b6b94a..548cf095c 100644
--- a/src/addons/mod/imscp/pages/view/view.html
+++ b/src/addons/mod/imscp/pages/view/view.html
@@ -33,7 +33,7 @@
         </div>
     </core-loading>
 
-    <core-navigation-bar collapsible-footer *ngIf="loaded && navigationItems.length > 1 && false" [items]="navigationItems"
+    <core-navigation-bar collapsible-footer *ngIf="loaded && navigationItems.length > 1" [items]="navigationItems"
         (action)="loadItem($event)">
     </core-navigation-bar>
 </ion-content>

From 0097b78963ef72649247c7c6bff308fbe76d1510 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 3 Mar 2022 12:43:15 +0100
Subject: [PATCH 0643/1008] MOBILE-3814 swipe: Limit angle on gesture

---
 src/core/directives/swipe-navigation.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/core/directives/swipe-navigation.ts b/src/core/directives/swipe-navigation.ts
index 0a7bec5bb..b1b632284 100644
--- a/src/core/directives/swipe-navigation.ts
+++ b/src/core/directives/swipe-navigation.ts
@@ -56,7 +56,9 @@ export class CoreSwipeNavigationDirective implements AfterViewInit, OnDestroy {
             el: this.element,
             gestureName: 'swipe',
             threshold: 10,
+            direction: 'x',
             gesturePriority: 10,
+            maxAngle: 20,
             canStart: () => this.enabled,
             onStart: () => {
                 style.transition = '';

From d0b59ce92b01a31d94df135b8d804459edc64dd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 3 Mar 2022 17:33:22 +0100
Subject: [PATCH 0644/1008] MOBILE-3814 course: Improve course storage page

---
 scripts/langindex.json                        |  1 +
 .../myoverview/addon-block-myoverview.html    |  2 +-
 src/addons/storagemanager/lang.json           |  1 +
 .../pages/course-storage/course-storage.html  | 70 ++++++++++++-------
 .../pages/course-storage/course-storage.scss  | 14 ++++
 .../pages/course-storage/course-storage.ts    |  2 +
 src/core/features/courses/lang.json           |  2 +-
 src/core/features/courses/pages/my/my.html    |  2 +-
 src/core/features/settings/lang.json          |  6 +-
 src/theme/theme.base.scss                     |  2 +-
 10 files changed, 69 insertions(+), 33 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 081689da2..56faabdba 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1106,6 +1106,7 @@
   "addon.storagemanager.confirmdeletedatafrom": "local_moodlemobileapp",
   "addon.storagemanager.coursedownloads": "local_moodlemobileapp",
   "addon.storagemanager.courseinfo": "local_moodlemobileapp",
+  "addon.storagemanager.deleteall": "moodle",
   "addon.storagemanager.deleteallsitedata": "local_moodlemobileapp",
   "addon.storagemanager.deleteallsitedatainfo": "local_moodlemobileapp",
   "addon.storagemanager.deletecourses": "local_moodlemobileapp",
diff --git a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
index a567deefd..07b679473 100644
--- a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
+++ b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
@@ -4,7 +4,7 @@
     </ion-label>
     <div slot="end" class="flex-row">
         <!-- Download all courses. -->
-        <div *ngIf="downloadCoursesEnabled && filteredCourses.length > 1" class="core-button-spinner">
+        <div *ngIf="downloadCoursesEnabled && filteredCourses.length > 0" class="core-button-spinner">
             <ion-button *ngIf="!prefetchCoursesData.loading" fill="clear" (click)="prefetchCourses()"
                 [attr.aria-label]="prefetchCoursesData.statusTranslatable | translate">
                 <ion-icon [name]="prefetchCoursesData.icon" slot="icon-only" aria-hidden="true">
diff --git a/src/addons/storagemanager/lang.json b/src/addons/storagemanager/lang.json
index 93476bbf6..9d058c222 100644
--- a/src/addons/storagemanager/lang.json
+++ b/src/addons/storagemanager/lang.json
@@ -5,6 +5,7 @@
     "confirmdeletedatafrom": "Delete all downloaded data from '{{name}}'?",
     "coursedownloads": "Course downloads",
     "courseinfo": "Download course content to work offline. Your activity will sync automatically when your device is back online.",
+    "deleteall": "Delete all",
     "deleteallsitedata": "Delete all site downloaded data",
     "deleteallsitedatainfo": "This will delete all downloaded data from '{{name}}', including all downloaded courses and data that allows you to work offline.",
     "deletecourses": "Delete downloaded data from all courses",
diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.html b/src/addons/storagemanager/pages/course-storage/course-storage.html
index 3d5506ab1..c66ed172f 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.html
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.html
@@ -10,36 +10,51 @@
 </ion-header>
 <ion-content>
     <core-loading [hideUntil]="loaded" class="list-item-limited-width">
+        <ion-item class="ion-text-wrap">
+            <ion-label>
+                <p>{{ 'addon.storagemanager.courseinfo' | translate }}</p>
+            </ion-label>
+        </ion-item>
+
+
         <ion-card class="wholecourse">
             <ion-card-header>
-                <p class="ion-text-wrap ion-no-margin">{{ 'addon.storagemanager.courseinfo' | translate }}</p>
                 <ion-card-title>{{ title }}</ion-card-title>
                 <ion-item class="size ion-text-wrap ion-no-padding">
                     <ion-label>
                         <p class="item-heading ion-text-wrap">{{ 'addon.storagemanager.totaldownloads' | translate }}</p>
-                        <ion-badge color="light">{{ totalSize | coreBytesToSize }}</ion-badge>
                     </ion-label>
-                    <ion-button slot="end" (click)="deleteForCourse()" [disabled]="totalSize == 0" color="danger" fill="clear">
-                        <ion-icon name="fas-trash" slot="icon-only" [attr.aria-label]="'addon.storagemanager.deletedatafrom' | translate:
-                        { name: title }">
-                        </ion-icon>
-                    </ion-button>
+                    <ion-badge color="light" slot="end">{{ totalSize | coreBytesToSize }}
+                    </ion-badge>
                 </ion-item>
-                <ion-button *ngIf="downloadCourseEnabled" (click)="prefetchCourse()" expand="block" fill="outline">
+                <ion-button *ngIf="downloadCourseEnabled" (click)="prefetchCourse()" expand="block" fill="outline" class="ion-no-margin">
                     <ion-icon *ngIf="!prefetchCourseData.loading" [name]="prefetchCourseData.icon" slot="start"></ion-icon>
                     <ion-spinner *ngIf="prefetchCourseData.loading" slot="start"></ion-spinner>
                     {{ prefetchCourseData.statusTranslatable | translate }}
                 </ion-button>
+                <ion-button *ngIf="totalSize > 0" (click)="deleteForCourse()" expand="block" color="danger"
+                    class="ion-no-margin ion-margin-top">
+                    <ion-icon name="fas-trash" slot="start" [attr.aria-label]="'addon.storagemanager.deletedatafrom' | translate:
+                        { name: title }">
+                    </ion-icon>
+                    {{ 'addon.storagemanager.deleteall' | translate }}
+                </ion-button>
             </ion-card-header>
         </ion-card>
         <ng-container *ngFor="let section of sections">
             <ion-card class="section" *ngIf="section.modules.length > 0">
                 <ion-card-header>
-                    <ion-item class="ion-no-padding">
+                    <ion-item class="ion-no-padding" lines="full">
                         <ion-label>
-                            <p class="item-heading ion-text-wrap">{{ section.name }}</p>
-                            <ion-badge color="light" *ngIf="section.totalSize > 0">
-                                {{ section.totalSize | coreBytesToSize }}
+                            <p class="item-heading ion-text-wrap">
+                                <core-format-text [text]="section.name" contextLevel="course" [contextInstanceId]="section.course"
+                                    [adaptImg]="false">
+                                </core-format-text>
+                            </p>
+                            <ion-badge [color]="section.downloadStatus == statusDownloaded ? 'success' : 'light'"
+                                *ngIf="section.totalSize > 0">
+                                <ion-icon aria-hidden="true" name="fam-cloud-done" *ngIf="section.downloadStatus == statusDownloaded">
+                                </ion-icon>{{ section.totalSize | coreBytesToSize }}
                             </ion-badge>
                             <!-- Download progress. -->
                             <p *ngIf="downloadEnabled && section.isDownloading">
@@ -48,15 +63,10 @@
                             </p>
                         </ion-label>
                         <div class="storage-buttons" slot="end" *ngIf="section.totalSize > 0 || downloadEnabled">
-                            <ion-button (click)="deleteForSection(section)" *ngIf="section.totalSize > 0" color="danger" fill="clear">
-                                <ion-icon name="fas-trash" slot="icon-only"
-                                    [attr.aria-label]="'addon.storagemanager.deletedatafrom' | translate: { name: section.name }">
-                                </ion-icon>
-                            </ion-button>
                             <div *ngIf="downloadEnabled" slot="end" class="core-button-spinner">
-                                <core-download-refresh *ngIf="!section.isDownloading" [status]="section.downloadStatus" [enabled]="true"
-                                    (action)="prefecthSection(section)" [loading]="section.isDownloading || section.isCalculating"
-                                    [canTrustDownload]="true">
+                                <core-download-refresh *ngIf="!section.isDownloading && section.downloadStatus != statusDownloaded"
+                                    [status]="section.downloadStatus" [enabled]="true" (action)="prefecthSection(section)"
+                                    [loading]="section.isDownloading || section.isCalculating" [canTrustDownload]="true">
                                 </core-download-refresh>
 
                                 <ion-badge class="core-course-download-section-progress"
@@ -66,6 +76,11 @@
                                     {{section.count}} / {{section.total}}
                                 </ion-badge>
                             </div>
+                            <ion-button (click)="deleteForSection(section)" *ngIf="section.totalSize > 0" color="danger" fill="clear">
+                                <ion-icon name="fas-trash" slot="icon-only"
+                                    [attr.aria-label]="'addon.storagemanager.deletedatafrom' | translate: { name: section.name }">
+                                </ion-icon>
+                            </ion-button>
                         </div>
                     </ion-item>
                 </ion-card-header>
@@ -81,22 +96,25 @@
                                         [contextInstanceId]="module.id" [adaptImg]="false">
                                     </core-format-text>
                                 </h3>
-                                <ion-badge color="light" *ngIf="module.totalSize > 0">
-                                    {{ module.totalSize | coreBytesToSize }}
+                                <ion-badge [color]="module.downloadStatus == statusDownloaded ? 'success' : 'light'"
+                                    *ngIf="module.totalSize > 0">
+                                    <ion-icon aria-hidden="true" name="fam-cloud-done" *ngIf="module.downloadStatus == statusDownloaded">
+                                    </ion-icon>{{ module.totalSize | coreBytesToSize }}
                                 </ion-badge>
                             </ion-label>
 
                             <div class="storage-buttons" slot="end">
+                                <core-download-refresh *ngIf="downloadEnabled && module.handlerData?.showDownloadButton &&
+                                    module.downloadStatus != statusDownloaded" [status]="module.downloadStatus" [enabled]="true"
+                                    [canTrustDownload]="true" [loading]="module.spinner || module.handlerData.spinner"
+                                    (action)="prefetchModule(module, section)">
+                                </core-download-refresh>
                                 <ion-button fill="clear" (click)="deleteForModule(module, section)" *ngIf="module.totalSize > 0"
                                     color="danger">
                                     <ion-icon name="fas-trash" slot="icon-only"
                                         [attr.aria-label]="'addon.storagemanager.deletedatafrom' | translate: { name: module.name }">
                                     </ion-icon>
                                 </ion-button>
-                                <core-download-refresh *ngIf="downloadEnabled && module.handlerData?.showDownloadButton"
-                                    [status]="module.downloadStatus" [enabled]="true" [canTrustDownload]="true"
-                                    [loading]="module.spinner || module.handlerData.spinner" (action)="prefetchModule(module, section)">
-                                </core-download-refresh>
                             </div>
                         </ion-item>
                     </ng-container>
diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.scss b/src/addons/storagemanager/pages/course-storage/course-storage.scss
index 87de86c13..91a4907f4 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.scss
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.scss
@@ -30,6 +30,20 @@
     }
 }
 
+ion-badge {
+    margin-top: 8px;
+    ion-icon {
+        @include margin-horizontal(null, 8px);
+    }
+}
+
+ion-item core-mod-icon {
+    --size: 18px;
+    padding: 9px;
+    --margin-vertical: 8px;
+    --margin-end: 8px;
+}
+
 .storage-buttons {
     display: flex;
     align-items: center;
diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.ts b/src/addons/storagemanager/pages/course-storage/course-storage.ts
index 3dc5ae558..aa14b5269 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.ts
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.ts
@@ -59,6 +59,8 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
         loading: true,
     };
 
+    statusDownloaded = CoreConstants.DOWNLOADED;
+
     protected siteUpdatedObserver?: CoreEventObserver;
     protected courseStatusObserver?: CoreEventObserver;
     protected sectionStatusObserver?: CoreEventObserver;
diff --git a/src/core/features/courses/lang.json b/src/core/features/courses/lang.json
index 933eb9aff..85ecd6681 100644
--- a/src/core/features/courses/lang.json
+++ b/src/core/features/courses/lang.json
@@ -12,7 +12,7 @@
     "completeenrolmentbrowser": "Complete enrolment in browser",
     "confirmselfenrol": "Are you sure you want to enrol yourself in this course?",
     "courses": "Courses",
-    "downloadcourses": "Download courses",
+    "downloadcourses": "Download all courses",
     "enrolme": "Enrol me",
     "errorloadcategories": "An error occurred while loading categories.",
     "errorloadcourses": "An error occurred while loading courses.",
diff --git a/src/core/features/courses/pages/my/my.html b/src/core/features/courses/pages/my/my.html
index c01f49f85..bf26674dc 100644
--- a/src/core/features/courses/pages/my/my.html
+++ b/src/core/features/courses/pages/my/my.html
@@ -29,7 +29,7 @@
             </ion-label>
             <div slot="end" class="flex-row">
                 <!-- Download all courses. -->
-                <div *ngIf="downloadCoursesEnabled && myOverviewBlock && myOverviewBlock.filteredCourses.length > 1"
+                <div *ngIf="downloadCoursesEnabled && myOverviewBlock && myOverviewBlock.filteredCourses.length > 0"
                     class="core-button-spinner">
                     <ion-button *ngIf="!myOverviewBlock.prefetchCoursesData.loading" fill="clear"
                         (click)="myOverviewBlock.prefetchCourses()"
diff --git a/src/core/features/settings/lang.json b/src/core/features/settings/lang.json
index 92dd83bda..76aa58bc0 100644
--- a/src/core/features/settings/lang.json
+++ b/src/core/features/settings/lang.json
@@ -7,10 +7,10 @@
     "cannotsyncoffline": "Cannot synchronise offline.",
     "cannotsyncwithoutwifi": "Cannot synchronise because the current settings only allow to synchronise when connected to Wi-Fi. Please connect to a Wi-Fi network.",
     "colorscheme": "Color Scheme",
-    "colorscheme-system": "System default",
-    "colorscheme-system-notice": "System default mode will depend on your device support.",
     "colorscheme-dark": "Dark",
     "colorscheme-light": "Light",
+    "colorscheme-system": "System default",
+    "colorscheme-system-notice": "System default mode will depend on your device support.",
     "compilationinfo": "Compilation info",
     "copyinfo": "Copy device info on the clipboard",
     "cordovadevicemodel": "Cordova device model",
@@ -27,7 +27,7 @@
     "disableall": "Disable notifications",
     "disabled": "Disabled",
     "disabledfeatures": "Disabled features",
-    "disallowed": "Disallowed",
+    "disallowed": "Locked off",
     "displayformat": "Display format",
     "enabledownloadsection": "Enable download sections",
     "enablefirebaseanalytics": "Enable Firebase analytics",
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 647a1d7f3..2a23c5d7e 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -936,7 +936,7 @@ ion-select-popover ion-item.core-select-option-title {
 
 ion-badge {
     line-height: 1.1;
-    padding: 4px 8px;
+    padding: 2px 8px;
     border-radius: var(--big-radius);
 }
 

From d6006ac5c3c729d94af32f849116b33a5d2f4b9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 4 Mar 2022 13:01:57 +0100
Subject: [PATCH 0645/1008] MOBILE-3814 style: Sort some gray colors

---
 .../send-message-form/send-message-form.scss  | 21 +++++++++++-----
 .../features/mainmenu/pages/more/more.scss    | 10 ++------
 src/theme/globals.variables.scss              |  6 ++---
 src/theme/theme.base.scss                     |  6 +++--
 src/theme/theme.dark.scss                     | 15 ++++++++----
 src/theme/theme.light.scss                    | 24 +++++++++++--------
 6 files changed, 49 insertions(+), 33 deletions(-)

diff --git a/src/core/components/send-message-form/send-message-form.scss b/src/core/components/send-message-form/send-message-form.scss
index 25a62dbdd..1607e186e 100644
--- a/src/core/components/send-message-form/send-message-form.scss
+++ b/src/core/components/send-message-form/send-message-form.scss
@@ -1,4 +1,10 @@
 :host {
+    --textarea-background: var(--core-input-background);
+    --textarea-color: var(--core-input-text);
+    --textarea-border-width: var(--core-input-border-width);
+    --textarea-border-color: var(--core-input-stroke);
+    --textarea-radius: var(--huge-radius);
+
     form {
         position: relative;
         display: flex;
@@ -11,14 +17,17 @@
         appearance: none;
         display: block;
         width: 100%;
-        border: 0;
         font-family: inherit;
-        background: var(--core-send-message-input-background);
-        color: var(--core-send-message-input-color);
-        border-radius: 21px;
+
+        background: var(--textarea-background);
+        color: var(--textarea-color);
+        border: var(--textarea-border-width) solid var(--textarea-border-color);
+        border-radius: var(--textarea-radius);
+
+        min-height: var(--a11y-min-target-size);
         line-height: 20px;
-        padding: 9px 12px 11px;
-        margin: 5px 10px;
+        padding: 10px;
+        margin: 4px 8px;
         resize: vertical;
     }
 
diff --git a/src/core/features/mainmenu/pages/more/more.scss b/src/core/features/mainmenu/pages/more/more.scss
index 32aeaef79..dfd54ad4c 100644
--- a/src/core/features/mainmenu/pages/more/more.scss
+++ b/src/core/features/mainmenu/pages/more/more.scss
@@ -1,13 +1,7 @@
 ion-item {
 	--border-color: var(--core-more-item-border, var(--ion-border-color));
 
-    ion-icon {
-        color: var(--core-more-icon, rgba(var(--ion-text-color-rgb, 0, 0, 0), 0.54));
-    }
-}
-
-:host-context(ion-app.ios) {
-    ion-item ion-icon {
-        color: var(--core-more-icon, inherit);
+    > ion-icon[slot] {
+        color: var(--core-more-icon) !important;
     }
 }
diff --git a/src/theme/globals.variables.scss b/src/theme/globals.variables.scss
index 5f8d3a5fe..696d70a77 100644
--- a/src/theme/globals.variables.scss
+++ b/src/theme/globals.variables.scss
@@ -9,7 +9,7 @@ $gray-100:    #f8f9fa !default;
 $gray-200:    #e9ecef !default;
 $gray-300:    #dee2e6 !default; // Stroke
 $gray-400:    #ced4da !default;
-$gray-500:    #8f959e !default;
+$gray-500:    #8f959e !default; // Stroke on inputs
 $gray-600:    #6a737b !default;
 $gray-700:    #495057 !default;
 $gray-800:    #343a40 !default;
@@ -46,8 +46,8 @@ $warning:    $yellow !default;
 $success:    $green !default;
 $info:       $blue !default;
 $light:      $gray-100 !default;
-$medium:     $gray-600 !default;
-$dark:       $gray-800 !default;
+$medium:     $gray-700 !default;
+$dark:       $gray-900 !default;
 
 $colors:  (
     primary: (light: $primary, dark: $primary),
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 2a23c5d7e..8f0bf1aac 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -321,7 +321,8 @@ ion-button.button-outline {
     --border-width: var(--core-input-border-width);
     --border-color: var(--core-input-stroke);
     --background: var(--core-input-background);
-    --color: var(--text-color);
+    --color: var(--core-input-text);
+    --ion-color-primary: var(--core-input-text);
 }
 
 ion-button.button-solid {
@@ -371,7 +372,8 @@ ion-button.button.button-clear.button-has-icon-only {
 }
 
 ion-button.button.button-clear {
-    --color: var(--dark);
+    --color: var(--core-input-text);
+    --ion-color-primary: var(--core-input-text);
 }
 
 ion-button.button.button-solid,
diff --git a/src/theme/theme.dark.scss b/src/theme/theme.dark.scss
index 57ddeeb61..ab278951a 100644
--- a/src/theme/theme.dark.scss
+++ b/src/theme/theme.dark.scss
@@ -36,18 +36,20 @@
     --text-color:               #{$text-color-dark};
     --ion-text-color:           var(--text-color);
     --ion-text-color-rgb:       #{$text-color-dark-rgb};
-    --subdued-text-color:       var(--gray-400);
+    --subdued-text-color:       var(--medium);
     --stroke:                   var(--gray-700);
 
     --contrast-background: black;
 
     --ion-card-color: var(--text-color);
     --ion-card-background: var(--ion-item-background);
+    --ion-card-border-color: var(--stroke);
 
     --ion-border-color: var(--stroke);
     --ion-item-border-color: var(--stroke);
 
-    --core-input-stroke: var(--gray-700);
+    --core-input-stroke: var(--gray-600);
+    --core-input-text: var(--dark);
     --core-input-background: var(--gray-900);
 
     ion-content {
@@ -68,7 +70,7 @@
     --core-link-color: var(--info-tint);
 
     --core-header-toolbar-background:   var(--gray-900);
-    --core-header-toolbar-color:        var(--white);
+    --core-header-toolbar-color:        var(--text-color);
     --core-header-toolbar-border-color: var(--stroke);
 
     --core-tabs-background: var(--gray-800);
@@ -80,10 +82,15 @@
     --core-progressbar-text-color: var(--gray-100);
 
     --ion-item-background: #{$ion-item-background-dark};
+    --ion-item-icon-color: var(--medium);
+    --ion-item-detail-icon-color: var(--dark);
+    --core-more-icon: var(--ion-item-icon-color);
+
     --item-divider-background: var(--ion-item-background);
     --item-divider-color: var(--text-color);
     --spacer-background: var(--gray-700);
 
+
     --ion-searchbar-background: var(--ion-background-color);
     --ion-searchbar-border-color: var(--core-input-stroke);
     --ion-searchbar-color: var(--text-color);
@@ -91,7 +98,7 @@
 
     --core-search-box-background: var(--ion-background-color);
     --core-search-box-border-color: var(--core-input-stroke);
-    --core-search-box-color: var(--text-color);
+    --core-search-box-color: var(--core-input-text);
 
     --core-combobox-background: var(--core-input-background);
     --core-combobox-color: var(--text-color);
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index f55a0c282..6b1c9f16b 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -69,7 +69,8 @@
     --ion-background-color-rgb: #{$background-color-rgb};
     --ion-border-color: var(--stroke);
 
-    --core-input-stroke: var(--gray-400);
+    --core-input-stroke: var(--gray-500);
+    --core-input-text: var(--dark);
     --core-input-background: var(--ion-background-color);
     --core-input-radius: var(--small-radius);
     --core-input-border-width: 1px;
@@ -86,7 +87,7 @@
 
     --ion-text-color: var(--text-color);
     --ion-text-color-rgb: #{$text-color-rgb};
-    --subdued-text-color: var(--gray-700);
+    --subdued-text-color: var(--medium);
 
     --ion-card-color: var(--text-color);
     --ion-card-vertical-margin: 10px;
@@ -112,7 +113,7 @@
     }
 
     --core-bottom-tabs-background: var(--white);
-    --core-bottom-tabs-color: var(--gray-700);
+    --core-bottom-tabs-color: var(--dark);
     --core-bottom-tabs-color-selected: var(--primary);
     --core-bottom-tabs-background-selected: transparent;
     --core-bottom-tabs-badge-color: var(--primary);
@@ -135,7 +136,7 @@
     --core-header-toolbar-background: var(--white);
     --core-header-toolbar-border-width: 0px;
     --core-header-toolbar-border-color: var(--stroke);
-    --core-header-toolbar-color: var(--gray-900);
+    --core-header-toolbar-color: var(--text-color);
     --core-header-toolbar-height: 48px;
     html.ios {
         --core-header-toolbar-height: 48px;
@@ -191,10 +192,10 @@
     --core-search-box-background: var(--ion-background-color);
     --core-search-box-border-color: var(--core-input-stroke);
     --core-search-box-border-radius: var(--core-input-radius);
-    --core-search-box-color: var(--text-color);
+    --core-search-box-color: var(--core-input-text);
 
     --core-combobox-background: var(--core-input-background);
-    --core-combobox-color: var(--text-color);
+    --core-combobox-color: var(--core-input-text);
     --core-combobox-border-color: var(--core-input-stroke);
     --core-combobox-border-width: var(--core-input-border-width);
     --core-combobox-radius: var(--core-input-radius);
@@ -255,13 +256,19 @@
     --core-progressbar-background: var(--primary-tint);
 
     --ion-item-background:        #{$ion-item-background};
-    --ion-item-detail-icon-color: var(--medium);
+    --ion-item-icon-color: var(--medium);
+    --ion-item-detail-icon-color: var(--dark);
     --ion-item-detail-icon-font-size: 20px;
     --ion-item-detail-icon-opacity: 1;
+    --core-more-icon: var(--ion-item-icon-color);
     ion-item {
         --detail-icon-color: var(--ion-item-detail-icon-color);
         --detail-icon-font-size: var(--ion-item-detail-icon-font-size);
         --detail-icon-opacity: var(--ion-item-detail-icon-opacity);
+
+        > ion-icon[slot] {
+            color: var(--ion-item-icon-color);
+        }
     }
 
     --item-divider-min-height: calc(var(--a11y-min-target-size) + 8px);
@@ -309,9 +316,6 @@
     --core-large-avatar-size: 90px;
     --core-avatar-size: var(--a11y-min-target-size);
 
-    --core-send-message-input-background: var(--gray-200);
-    --core-send-message-input-color: var(--gray-900);
-
     --core-courseimage-on-course-size: 72px;
     --core-courseimage-radius: var(--medium-radius);
 

From fa81717ccf4c6ec73b241faf8f31081bdb9aaf30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 4 Mar 2022 13:28:20 +0100
Subject: [PATCH 0646/1008] MOBILE-3814 course: Section navigation buttons
 stuck at the bottom

---
 .../course-format/course-format.html          | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/core/features/course/components/course-format/course-format.html b/src/core/features/course/components/course-format/course-format.html
index 7232b31bf..a8ca2b304 100644
--- a/src/core/features/course/components/course-format/course-format.html
+++ b/src/core/features/course/components/course-format/course-format.html
@@ -24,21 +24,21 @@
 
             <core-infinite-loading [enabled]="canLoadMore" (action)="showMoreActivities($event)"></core-infinite-loading>
         </div>
-
-        <div class="ion-padding core-course-section-nav-buttons safe-area-padding-horizontal list-item-limited-width"
-            *ngIf="displayCourseIndex && (previousSection || nextSection)">
-            <ion-button *ngIf="previousSection" (click)="sectionChanged(previousSection)" expand="block"
-                [attr.aria-label]="('core.previous' | translate) + ': ' + previousSection.name">
-                <ion-icon name="fas-arrow-left" slot="start" aria-hidden="true"></ion-icon>
-                <core-format-text [text]="previousSection.name" contextLevel="course" [contextInstanceId]="course.id">
-                </core-format-text>
-            </ion-button>
-            <ion-button *ngIf="nextSection" (click)="sectionChanged(nextSection)" expand="block"
-                [attr.aria-label]="('core.next' | translate) + ': ' + nextSection.name">
-                <core-format-text [text]="nextSection.name" contextLevel="course" [contextInstanceId]="course.id">
-                </core-format-text>
-                <ion-icon name="fas-arrow-right" slot="end" aria-hidden="true"></ion-icon>
-            </ion-button>
+        <div collapsible-footer *ngIf="displayCourseIndex && (previousSection || nextSection)" slot="fixed">
+            <div class="core-course-section-nav-buttons safe-area-padding-horizontal list-item-limited-width">
+                <ion-button *ngIf="previousSection" (click)="sectionChanged(previousSection)" expand="block"
+                    [attr.aria-label]="('core.previous' | translate) + ': ' + previousSection.name">
+                    <ion-icon name="fas-arrow-left" slot="start" aria-hidden="true"></ion-icon>
+                    <core-format-text [text]="previousSection.name" contextLevel="course" [contextInstanceId]="course.id">
+                    </core-format-text>
+                </ion-button>
+                <ion-button *ngIf="nextSection" (click)="sectionChanged(nextSection)" expand="block"
+                    [attr.aria-label]="('core.next' | translate) + ': ' + nextSection.name">
+                    <core-format-text [text]="nextSection.name" contextLevel="course" [contextInstanceId]="course.id">
+                    </core-format-text>
+                    <ion-icon name="fas-arrow-right" slot="end" aria-hidden="true"></ion-icon>
+                </ion-button>
+            </div>
         </div>
     </core-loading>
 </core-dynamic-component>

From feb4785ba077455c2a963fd006400c40b3f370ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 4 Mar 2022 13:35:32 +0100
Subject: [PATCH 0647/1008] MOBILE-3814 course: Show highlighted border on
 section

---
 .../components/course-index/course-index.html |  6 +-
 .../components/course-index/course-index.scss | 92 +++++++++++--------
 2 files changed, 55 insertions(+), 43 deletions(-)

diff --git a/src/core/features/course/components/course-index/course-index.html b/src/core/features/course/components/course-index/course-index.html
index e70f1b6fb..5e07e3ae6 100644
--- a/src/core/features/course/components/course-index/course-index.html
+++ b/src/core/features/course/components/course-index/course-index.html
@@ -24,8 +24,8 @@
             </ion-item>
             <ng-container *ngIf="allSectionId != section.id">
                 <ion-item class="divider section" (click)="selectSectionOrModule($event, section.id)" button
-                    [class.item-current]="selectedId === section.id" [class.item-dimmed]="section.visible === 0" detail="false"
-                    sticky="true">
+                    [class.item-current]="selectedId === section.id" [class.item-dimmed]="section.visible === 0"
+                    [class.item-hightlighted]="section.highlighted" detail="false" sticky="true">
                     <ion-icon *ngIf="section.hasVisibleModules" name="fas-chevron-right" flip-rtl slot="start"
                         class="expandable-status-icon" (click)="toggleExpand($event, section)"
                         [attr.aria-label]="(section.expanded ? 'core.collapse' : 'core.expand') | translate"
@@ -46,7 +46,7 @@
                 </ion-item>
                 <ng-container *ngIf="section.expanded">
                     <ng-container *ngFor="let module of section.modules">
-                        <ion-item class="module" [class.item-dimmed]="!module.visible"
+                        <ion-item class="module" [class.item-dimmed]="!module.visible" [class.item-hightlighted]="section.highlighted"
                             (click)="selectSectionOrModule($event, section.id, module.id)" button>
                             <ion-icon class="completioninfo completion_none" name="" *ngIf="module.completionStatus === undefined"
                                 slot="start" aria-hidden="true"></ion-icon>
diff --git a/src/core/features/course/components/course-index/course-index.scss b/src/core/features/course/components/course-index/course-index.scss
index 130cdf756..db08d3ad2 100644
--- a/src/core/features/course/components/course-index/course-index.scss
+++ b/src/core/features/course/components/course-index/course-index.scss
@@ -11,56 +11,68 @@ core-progress-bar {
     }
 }
 
-ion-icon.completioninfo {
-    font-size: 10px;
-    width: 18px;
-}
-
-ion-item.module::part(native) {
-    --padding-start: 0;
-}
-
-ion-item.module ion-icon {
-    margin: 0;
-    @include padding(12px, 16px, 12px, 16px);
-}
-
-ion-item.core-course-index-all::part(native) {
-    --padding-start: 16px;
-}
-
-ion-item.item.item-current {
-    --background: var(--primary-tint);
-    border: 0;
-}
-
-ion-icon.restricted {
-    font-size: 14px;
-}
-
-ion-item.item.divider.section {
-    --padding-start: 0px;
+ion-item.item {
+    &.core-course-index-all::part(native) {
+        --padding-start: 16px;
+    }
 
     &.item-current {
-        ion-badge {
-            border: 1px solid var(--primary-contrast);
+        --background: var(--primary-tint);
+        border: 0;
+    }
+
+    &.item-hightlighted {
+        @include safe-area-border-start(var(--selected-item-border-width), solid,  var(--selected-item-color));
+    }
+
+    &.divider.section {
+        --padding-start: 0px;
+
+        &.item-current {
+            ion-icon.expandable-status-icon {
+                color: var(--primary-contrast);
+
+                &:hover {
+                    background: var(--primary-shade);
+                }
+            }
         }
 
         ion-icon.expandable-status-icon {
-            color: var(--primary-contrast);
-
+            padding: 13px;
+            margin: 3px;
+            border-radius: 50%;
             &:hover {
-                background: var(--primary-shade);
+                background: var(--gray-300);
             }
         }
+
+        &.item-hightlighted ion-icon.expandable-status-icon {
+            @include margin-horizontal(-2px, null);
+        }
     }
 
-    ion-icon.expandable-status-icon {
-        padding: 13px;
-        margin: 3px;
-        border-radius: 50%;
-        &:hover {
-            background: var(--gray-300);
+    &.module {
+        &::part(native) {
+            --padding-start: 0;
+        }
+
+        &.item-hightlighted ion-icon.completioninfo {
+            @include padding-horizontal(11px, null);
+        }
+    }
+
+    ion-icon {
+        margin: 0;
+        padding: 12px 16px;
+
+        &.completioninfo {
+            font-size: 10px;
+            width: 18px;
+        }
+
+        &.restricted {
+            font-size: 14px;
         }
     }
 }

From aefbf6be86eafe4958bb0fb1b3d506f5b5f69740 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 4 Mar 2022 14:19:47 +0100
Subject: [PATCH 0648/1008] MOBILE-3814 style: Add box shadow to fab and blocks
 buttons

---
 .../components/side-blocks-button/side-blocks-button.scss     | 1 +
 src/theme/theme.base.scss                                     | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/src/core/features/block/components/side-blocks-button/side-blocks-button.scss b/src/core/features/block/components/side-blocks-button/side-blocks-button.scss
index 76b104a1a..f8f4f8250 100644
--- a/src/core/features/block/components/side-blocks-button/side-blocks-button.scss
+++ b/src/core/features/block/components/side-blocks-button/side-blocks-button.scss
@@ -12,6 +12,7 @@
         --padding-end: 0;
         --border-radius: 2em 0 0 2em;
         height: 56px;
+        --box-shadow: 0 3px 5px -1px rgba(0, 0, 0, .2), 0 6px 10px 0 rgba(0, 0, 0, .14), 0 1px 18px 0 rgba(0, 0, 0, .12);
 
         &::part(native) {
             @include core-transition(padding, 200ms);
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 8f0bf1aac..4268084bb 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -298,6 +298,10 @@ button,
     min-width: var(--a11y-min-target-size);
 }
 
+ion-fab-button {
+    --box-shadow: 0 3px 5px -1px rgba(0, 0, 0, .2), 0 6px 10px 0 rgba(0, 0, 0, .14), 0 1px 18px 0 rgba(0, 0, 0, .12);
+}
+
 ion-button {
     margin: 4px 8px;
 

From 52a3d62a4497fd8d9b7eea011ed6e394d690ff16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 4 Mar 2022 14:33:19 +0100
Subject: [PATCH 0649/1008] MOBILE-3814 collapsible: Fix collapsible footer
 scroll change problem

---
 src/core/directives/collapsible-footer.ts | 25 ++++++++++++++++-------
 src/theme/theme.base.scss                 |  2 +-
 src/theme/theme.light.scss                |  2 +-
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/core/directives/collapsible-footer.ts b/src/core/directives/collapsible-footer.ts
index 4f87f379f..976e65827 100644
--- a/src/core/directives/collapsible-footer.ts
+++ b/src/core/directives/collapsible-footer.ts
@@ -39,7 +39,7 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
     protected initialPaddingBottom = '0px';
     protected previousTop = 0;
     protected previousHeight = 0;
-    protected stickTimeout?: number;
+    protected endAnimationTimeout?: number;
     protected content?: HTMLIonContentElement | null;
     protected loadingChangedListener?: CoreEventObserver;
 
@@ -60,6 +60,8 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
         this.initialHeight = this.element.getBoundingClientRect().height || 48;
         this.previousHeight = this.initialHeight;
 
+        this.content?.style.setProperty('--core-collapsible-footer-max-height', this.initialHeight + 'px');
+
         this.setBarHeight(this.initialHeight);
     }
 
@@ -88,7 +90,7 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
         this.initialPaddingBottom = this.content.style.getPropertyValue('--padding-bottom') || this.initialPaddingBottom;
         this.content.style.setProperty(
             '--padding-bottom',
-            `calc(${this.initialPaddingBottom} + var(--core-collapsible-footer-height, 0px))`,
+            `calc(${this.initialPaddingBottom} + var(--core-collapsible-footer-max-height, 0px))`,
         );
 
         const scroll = await this.content.getScrollElement();
@@ -143,8 +145,8 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
      * @param height The new bar height.
      */
     protected setBarHeight(height: number): void {
-        if (this.stickTimeout) {
-            clearTimeout(this.stickTimeout);
+        if (this.endAnimationTimeout) {
+            clearTimeout(this.endAnimationTimeout);
         }
 
         this.element.classList.toggle('footer-collapsed', height <= 0);
@@ -154,12 +156,21 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
 
         if (height > 0 && height < this.initialHeight) {
             // Finish opening or closing the bar.
-            const newHeight = height < this.initialHeight / 2 ? 0 : this.initialHeight;
-
-            this.stickTimeout = window.setTimeout(() => this.setBarHeight(newHeight), 500);
+            this.endAnimationTimeout = window.setTimeout(() => this.endAnimation(height), 500);
         }
     }
 
+    /**
+     * End of animation when not scrolling.
+     *
+     * @param height Last height used.
+     */
+    protected endAnimation(height: number): void {
+        const newHeight = height < this.initialHeight / 2 ? 0 : this.initialHeight;
+
+        this.setBarHeight(newHeight);
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 4268084bb..e39774de1 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -1111,7 +1111,7 @@ ion-fab[core-fab] {
 }
 
 ion-content.has-collapsible-footer ion-fab {
-    bottom: calc(var(--core-navigation-height, 0px) + 10px);
+    bottom: calc(var(--core-collapsible-footer-height, 0px) + 10px);
     @include core-transition(all, 200ms);
 }
 
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 6b1c9f16b..2d0a532aa 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -319,7 +319,7 @@
     --core-courseimage-on-course-size: 72px;
     --core-courseimage-radius: var(--medium-radius);
 
-    --core-navigation-height: 48px;
+    --core-collapsible-footer-height: 48px;
     --core-navigation-background: var(--contrast-background);
 
     --core-collapsible-footer-background: var(--contrast-background);

From f5303b3cc6d999379027cbaeceb5fb490e4b08bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 4 Mar 2022 15:42:03 +0100
Subject: [PATCH 0650/1008] MOBILE-3814 collapsible: Now collapsible header can
 be disabled

---
 src/core/directives/collapsible-header.ts     | 52 ++++++++++++++++---
 .../features/course/pages/index/index.html    |  2 +-
 src/core/features/course/pages/index/index.ts |  2 -
 3 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts
index 61c2f9d1a..7918d377d 100644
--- a/src/core/directives/collapsible-header.ts
+++ b/src/core/directives/collapsible-header.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Directive, ElementRef, OnDestroy, OnInit } from '@angular/core';
+import { Directive, ElementRef, Input, OnChanges, OnDestroy, OnInit, SimpleChange } from '@angular/core';
 import { CoreTabsOutletComponent } from '@components/tabs-outlet/tabs-outlet';
 import { ScrollDetail } from '@ionic/core';
 import { CoreUtils } from '@services/utils/utils';
@@ -50,7 +50,9 @@ import { CoreFormatTextDirective } from './format-text';
 @Directive({
     selector: 'ion-header[collapsible]',
 })
-export class CoreCollapsibleHeaderDirective implements OnInit, OnDestroy {
+export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDestroy {
+
+    @Input() collapsible = true;
 
     protected page?: HTMLElement;
     protected collapsedHeader?: Element;
@@ -63,6 +65,7 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnDestroy {
     protected floatingTitle?: HTMLElement;
     protected scrollingHeight?: number;
     protected subscriptions: Subscription[] = [];
+    protected enabled = true;
 
     constructor(protected el: ElementRef) {}
 
@@ -82,6 +85,18 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnDestroy {
         this.initializeContent();
     }
 
+    /**
+     * @inheritdoc
+     */
+    ngOnChanges(changes: {[name: string]: SimpleChange}): void {
+        if (changes.collapsible) {
+            this.enabled = !CoreUtils.isFalseOrZero(changes.collapsible.currentValue);
+            setTimeout(() => {
+                this.setEnabled(this.enabled);
+            }, 200);
+        }
+    }
+
     /**
      * @inheritdoc
      */
@@ -277,6 +292,29 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnDestroy {
         content && this.trackContentScroll(content);
     }
 
+    /**
+     * Set collapsed/expanded based on properties.
+     *
+     * @param enable True to enable, false otherwise
+     */
+    async setEnabled(enable: boolean): Promise<void> {
+        if (!this.page || !this.content) {
+            return;
+        }
+
+        if (enable) {
+            const contentScroll = await this.content.getScrollElement();
+
+            // Do nothing, since scroll has already started on the page.
+            if (contentScroll.scrollTop > 0) {
+                return;
+            }
+        }
+
+        this.page.style.setProperty('--collapsible-header-progress', enable ? '0' : '1');
+        this.page.classList.toggle('is-collapsed', !enable);
+    }
+
     /**
      * Listen to a content element for scroll events that will control the header state transition.
      *
@@ -287,6 +325,8 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnDestroy {
             return;
         }
 
+        this.content = content;
+
         const page = this.page;
         const scrollingHeight = this.scrollingHeight;
         const expandedHeader = this.expandedHeader;
@@ -294,7 +334,7 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnDestroy {
         const expandedFontStyles = this.expandedFontStyles;
         const collapsedFontStyles = this.collapsedFontStyles;
         const floatingTitle = this.floatingTitle;
-        const contentScroll = await content.getScrollElement();
+        const contentScroll = await this.content.getScrollElement();
 
         if (
             !page ||
@@ -308,17 +348,15 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnDestroy {
             throw new Error('[collapsible-header] Couldn\'t set up scrolling');
         }
 
-        page.style.setProperty('--collapsible-header-progress', '0');
         page.classList.toggle('is-within-content', content.contains(expandedHeader));
-        page.classList.toggle('is-collapsed', false);
+        this.setEnabled(this.enabled);
 
         Object
             .entries(expandedFontStyles)
             .forEach(([property, value]) => floatingTitle.style.setProperty(property, value as string));
 
-        this.content = content;
         this.content.addEventListener('ionScroll', this.contentScrollListener = ({ target }: CustomEvent<ScrollDetail>): void => {
-            if (target !== this.content) {
+            if (target !== this.content || !this.enabled) {
                 return;
             }
 
diff --git a/src/core/features/course/pages/index/index.html b/src/core/features/course/pages/index/index.html
index c1d586d11..b864139cd 100644
--- a/src/core/features/course/pages/index/index.html
+++ b/src/core/features/course/pages/index/index.html
@@ -1,4 +1,4 @@
-<ion-header collapsible>
+<ion-header [collapsible]="tabsComponent?.selectedIndex == 0 || tabsComponent?.selectedIndex === undefined">
     <ion-toolbar>
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
diff --git a/src/core/features/course/pages/index/index.ts b/src/core/features/course/pages/index/index.ts
index 82ddef122..bb2537e83 100644
--- a/src/core/features/course/pages/index/index.ts
+++ b/src/core/features/course/pages/index/index.ts
@@ -27,7 +27,6 @@ import { CoreTextUtils } from '@services/utils/text';
 import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
 import { CONTENTS_PAGE_NAME } from '@features/course/course.module';
 import { CoreDomUtils } from '@services/utils/dom';
-import { CoreCollapsibleHeaderDirective } from '@directives/collapsible-header';
 import { CoreCourseSummaryPage } from '../course-summary/course-summary';
 
 /**
@@ -41,7 +40,6 @@ import { CoreCourseSummaryPage } from '../course-summary/course-summary';
 export class CoreCourseIndexPage implements OnInit, OnDestroy {
 
     @ViewChild(CoreTabsOutletComponent) tabsComponent?: CoreTabsOutletComponent;
-    @ViewChild(CoreCollapsibleHeaderDirective) ionCollapsibleHeader?: CoreCollapsibleHeaderDirective;
 
     title = '';
     category = '';

From 772899d827c2cccb00389233da32dd5d0a625356 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 4 Mar 2022 15:43:02 +0100
Subject: [PATCH 0651/1008] MOBILE-3814 collapsible: Now collapsible header
 ends animations

---
 src/core/directives/collapsible-header.ts | 26 +++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts
index 7918d377d..35655ad54 100644
--- a/src/core/directives/collapsible-header.ts
+++ b/src/core/directives/collapsible-header.ts
@@ -66,6 +66,7 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
     protected scrollingHeight?: number;
     protected subscriptions: Subscription[] = [];
     protected enabled = true;
+    protected endAnimationTimeout?: number;
 
     constructor(protected el: ElementRef) {}
 
@@ -360,6 +361,10 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
                 return;
             }
 
+            if (this.endAnimationTimeout) {
+                clearTimeout(this.endAnimationTimeout);
+            }
+
             const scrollableHeight = contentScroll.scrollHeight - contentScroll.clientHeight;
             const collapsedHeight = expandedHeaderHeight - (expandedHeader.clientHeight ?? 0);
             const frozen = scrollableHeight + collapsedHeight <= 2 * expandedHeaderHeight;
@@ -374,7 +379,28 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
             Object
                 .entries(progress > .5 ? collapsedFontStyles : expandedFontStyles)
                 .forEach(([property, value]) => floatingTitle.style.setProperty(property, value as string));
+
+            if (progress > 0 || progress < 1) {
+                // Finish opening or closing the bar.
+                this.endAnimationTimeout = window.setTimeout(() => this.endAnimation(progress), 500);
+            }
         });
     }
 
+    /**
+     * End of animation when stop scrolling.
+     *
+     * @param progress Progress.
+     */
+    protected endAnimation(progress: number): void {
+        if(!this.page) {
+            return;
+        }
+
+        const collapse = progress > 0.5;
+
+        this.page.style.setProperty('--collapsible-header-progress', collapse ? '1' : '0');
+        this.page.classList.toggle('is-collapsed', collapse);
+    }
+
 }

From 349dfc974503d6ccdd8b46ca798bedec951ca011 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 4 Mar 2022 15:44:59 +0100
Subject: [PATCH 0652/1008] MOBILE-3814 collapsible: Remove unnecessary calls

---
 src/core/directives/collapsible-header.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts
index 35655ad54..dab6b839c 100644
--- a/src/core/directives/collapsible-header.ts
+++ b/src/core/directives/collapsible-header.ts
@@ -175,9 +175,6 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
             };
 
             this.subscriptions.push(outlet.activateEvents.subscribe(onOutletUpdated));
-            this.subscriptions.push(outlet.deactivateEvents.subscribe(onOutletUpdated));
-
-            onOutletUpdated();
 
             return;
         }

From 8ee8a0f8920c87217070f08bcecad5c0c6d96d8c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 7 Mar 2022 07:53:02 +0100
Subject: [PATCH 0653/1008] MOBILE-3833 core: Decrease priority of redirect
 errors

---
 src/core/classes/errors/ajaxwserror.ts | 2 +-
 src/core/services/sites.ts             | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/core/classes/errors/ajaxwserror.ts b/src/core/classes/errors/ajaxwserror.ts
index b21eedd1b..5a114f033 100644
--- a/src/core/classes/errors/ajaxwserror.ts
+++ b/src/core/classes/errors/ajaxwserror.ts
@@ -30,7 +30,7 @@ export class CoreAjaxWSError extends CoreError {
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     constructor(error: any, available?: number) {
-        super(error.message);
+        super(error.message || error.error);
 
         this.exception = error.exception;
         this.errorcode = error.errorcode;
diff --git a/src/core/services/sites.ts b/src/core/services/sites.ts
index c7cc2ba8e..280e518a3 100644
--- a/src/core/services/sites.ts
+++ b/src/core/services/sites.ts
@@ -338,12 +338,15 @@ export class CoreSitesProvider {
         }
 
         // Service supported but an error happened. Return error.
+        let critical = true;
+
         if (error.errorcode === 'codingerror') {
             // This could be caused by a redirect. Check if it's the case.
             const redirect = await CoreUtils.checkRedirect(siteUrl);
 
             if (redirect) {
                 error.message = Translate.instant('core.login.sitehasredirect');
+                critical = false; // Keep checking fallback URLs.
             } else {
                 // We can't be sure if there is a redirect or not. Display cannot connect error.
                 error.message = Translate.instant('core.cannotconnecttrouble');
@@ -351,12 +354,14 @@ export class CoreSitesProvider {
         } else if (error.errorcode === 'invalidrecord') {
             // WebService not found, site not supported.
             error.message = Translate.instant('core.login.invalidmoodleversion', { $a: CoreSite.MINIMUM_MOODLE_VERSION });
+        } else if (error.errorcode === 'redirecterrordetected') {
+            critical = false; // Keep checking fallback URLs.
         }
 
         return new CoreSiteError({
             message: error.message,
             errorcode: error.errorcode,
-            critical: true,
+            critical,
         });
     }
 

From feefaa083f4837103db2da99e8ad9fca634d15f9 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 7 Mar 2022 09:21:01 +0100
Subject: [PATCH 0654/1008] MOBILE-3967 course: Allow using legacy completion
 in 3.11+

---
 .../img/completion/completion-auto-n-override.svg    |  2 +-
 .../img/completion/completion-auto-y-override.svg    |  2 +-
 .../img/completion/completion-manual-n-override.svg  |  2 +-
 .../img/completion/completion-manual-y-override.svg  |  2 +-
 .../course/components/module/core-course-module.html | 12 +++++++-----
 src/core/features/course/components/module/module.ts |  4 ++--
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/assets/img/completion/completion-auto-n-override.svg b/src/assets/img/completion/completion-auto-n-override.svg
index bffccb8b8..74fe158d4 100644
--- a/src/assets/img/completion/completion-auto-n-override.svg
+++ b/src/assets/img/completion/completion-auto-n-override.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" preserveAspectRatio="xMinYMid meet" overflow="visible"><path d="M10 0v2H6V0h4zm1 2h1c1.1 0 2 .9 2 2v1h2V2c0-1.1-.9-2-2-2h-3v2zm5 4h-2v4h2V6zm-2 5v1c0 1.1-.9 2-2 2h-1v2h3c1.1 0 2-.9 2-2v-3h-2zm-4 5v-2H6v2h4zm-5-2H4c-1.1 0-2-.9-2-2v-1H0v3c0 1.1.9 2 2 2h3v-2zm-5-4h2V6H0v4zm2-5V4c0-1.1.9-2 2-2h1V0H2C.9 0 0 .9 0 2v3h2z" fill="#FF2727"/></svg> height="16" viewBox="0 0 16 16" preserveAspectRatio="xMinYMid meet" overflow="visible"><path d="M10 0v2H6V0h4zm1 2h1c1.1 0 2 .9 2 2v1h2V2c0-1.1-.9-2-2-2h-3v2zm5 4h-2v4h2V6zm-2 5v1c0 1.1-.9 2-2 2h-1v2h3c1.1 0 2-.9 2-2v-3h-2zm-4 5v-2H6v2h4zm-5-2H4c-1.1 0-2-.9-2-2v-1H0v3c0 1.1.9 2 2 2h3v-2zm-5-4h2V6H0v4zm2-5V4c0-1.1.9-2 2-2h1V0H2C.9 0 0 .9 0 2v3h2z" fill="#FF2727"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" preserveAspectRatio="xMinYMid meet" overflow="visible"><path d="M10 0v2H6V0h4zm1 2h1c1.1 0 2 .9 2 2v1h2V2c0-1.1-.9-2-2-2h-3v2zm5 4h-2v4h2V6zm-2 5v1c0 1.1-.9 2-2 2h-1v2h3c1.1 0 2-.9 2-2v-3h-2zm-4 5v-2H6v2h4zm-5-2H4c-1.1 0-2-.9-2-2v-1H0v3c0 1.1.9 2 2 2h3v-2zm-5-4h2V6H0v4zm2-5V4c0-1.1.9-2 2-2h1V0H2C.9 0 0 .9 0 2v3h2z" fill="#FF2727"/></svg>
\ No newline at end of file
diff --git a/src/assets/img/completion/completion-auto-y-override.svg b/src/assets/img/completion/completion-auto-y-override.svg
index 375e13266..1f4293f10 100644
--- a/src/assets/img/completion/completion-auto-y-override.svg
+++ b/src/assets/img/completion/completion-auto-y-override.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" preserveAspectRatio="xMinYMid meet" overflow="visible"><path d="M10 0v2H6V0h4zm1 2h1c.4 0 .8.1 1.1.3.3-.3.8-.4 1.2-.4.5 0 1 .2 1.4.6l.3.3V2c0-1.1-.9-2-2-2h-3v2zm3 8h2V6.4l-2 2V10zm0 1v1c0 1.1-.9 2-2 2h-1v2h3c1.1 0 2-.9 2-2v-3h-2zm-4 5v-2H6v2h4zm-5-2H4c-1.1 0-2-.9-2-2v-1H0v3c0 1.1.9 2 2 2h3v-2zm-5-4h2V6H0v4zm2-5V4c0-1.1.9-2 2-2h1V0H2C.9 0 0 .9 0 2v3h2z" fill="#FF2727"/><path d="m15.7 3.9-.7-.7c-.4-.4-1-.4-1.4 0l-6 6L5.4 7c-.4-.3-1-.3-1.4 0l-.7.7c-.4.4-.4 1 0 1.4l3.6 3.6c.4.4 1 .4 1.4 0l7.4-7.4c.4-.4.4-1 0-1.4z" fill="#76A1F0"/></svg> height="16" viewBox="0 0 16 16" preserveAspectRatio="xMinYMid meet" overflow="visible"><path d="M10 0v2H6V0h4zm1 2h1c.4 0 .8.1 1.1.3.3-.3.8-.4 1.2-.4.5 0 1 .2 1.4.6l.3.3V2c0-1.1-.9-2-2-2h-3v2zm3 8h2V6.4l-2 2V10zm0 1v1c0 1.1-.9 2-2 2h-1v2h3c1.1 0 2-.9 2-2v-3h-2zm-4 5v-2H6v2h4zm-5-2H4c-1.1 0-2-.9-2-2v-1H0v3c0 1.1.9 2 2 2h3v-2zm-5-4h2V6H0v4zm2-5V4c0-1.1.9-2 2-2h1V0H2C.9 0 0 .9 0 2v3h2z" fill="#FF2727"/><path d="M15.7 3.9l-.7-.7c-.4-.4-1-.4-1.4 0l-6 6L5.4 7c-.4-.3-1-.3-1.4 0l-.7.7c-.4.4-.4 1 0 1.4l3.6 3.6c.4.4 1 .4 1.4 0l7.4-7.4c.4-.4.4-1 0-1.4z" fill="#76A1F0"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" preserveAspectRatio="xMinYMid meet" overflow="visible"><path d="M10 0v2H6V0h4zm1 2h1c.4 0 .8.1 1.1.3.3-.3.8-.4 1.2-.4.5 0 1 .2 1.4.6l.3.3V2c0-1.1-.9-2-2-2h-3v2zm3 8h2V6.4l-2 2V10zm0 1v1c0 1.1-.9 2-2 2h-1v2h3c1.1 0 2-.9 2-2v-3h-2zm-4 5v-2H6v2h4zm-5-2H4c-1.1 0-2-.9-2-2v-1H0v3c0 1.1.9 2 2 2h3v-2zm-5-4h2V6H0v4zm2-5V4c0-1.1.9-2 2-2h1V0H2C.9 0 0 .9 0 2v3h2z" fill="#FF2727"/><path d="m15.7 3.9-.7-.7c-.4-.4-1-.4-1.4 0l-6 6L5.4 7c-.4-.3-1-.3-1.4 0l-.7.7c-.4.4-.4 1 0 1.4l3.6 3.6c.4.4 1 .4 1.4 0l7.4-7.4c.4-.4.4-1 0-1.4z" fill="#76A1F0"/></svg>
\ No newline at end of file
diff --git a/src/assets/img/completion/completion-manual-n-override.svg b/src/assets/img/completion/completion-manual-n-override.svg
index 9b929eafd..6c6d6484b 100644
--- a/src/assets/img/completion/completion-manual-n-override.svg
+++ b/src/assets/img/completion/completion-manual-n-override.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" preserveAspectRatio="xMinYMid meet" overflow="visible"><path d="M14 0H2C.9 0 0 .9 0 2v12c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V2c0-1.1-.9-2-2-2zm0 12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V4c0-1.1.9-2 2-2h8c1.1 0 2 .9 2 2v8z" fill="#FF2727"/></svg> height="16" viewBox="0 0 16 16" preserveAspectRatio="xMinYMid meet" overflow="visible"><path d="M14 0H2C.9 0 0 .9 0 2v12c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V2c0-1.1-.9-2-2-2zm0 12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V4c0-1.1.9-2 2-2h8c1.1 0 2 .9 2 2v8z" fill="#FF2727"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" preserveAspectRatio="xMinYMid meet" overflow="visible"><path d="M14 0H2C.9 0 0 .9 0 2v12c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V2c0-1.1-.9-2-2-2zm0 12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V4c0-1.1.9-2 2-2h8c1.1 0 2 .9 2 2v8z" fill="#FF2727"/></svg>
\ No newline at end of file
diff --git a/src/assets/img/completion/completion-manual-y-override.svg b/src/assets/img/completion/completion-manual-y-override.svg
index 849e3efc9..ad0db0c06 100644
--- a/src/assets/img/completion/completion-manual-y-override.svg
+++ b/src/assets/img/completion/completion-manual-y-override.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" preserveAspectRatio="xMinYMid meet" overflow="visible"><path d="M14 8.4V12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V4c0-1.1.9-2 2-2h8c.4 0 .8.1 1.1.3.3-.3.8-.4 1.2-.4.5 0 1 .2 1.4.6l.3.3V2c0-1.1-.9-2-2-2H2C.9 0 0 .9 0 2v12c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V6.4l-2 2z" fill="#FF2727"/><path d="m15.7 3.9-.7-.7c-.4-.4-1-.4-1.4 0l-6 6L5.4 7c-.4-.3-1-.3-1.4 0l-.7.7c-.4.4-.4 1 0 1.4l3.6 3.6c.4.4 1 .4 1.4 0l7.4-7.4c.4-.4.4-1 0-1.4z" fill="#76A1F0"/></svg> height="16" viewBox="0 0 16 16" preserveAspectRatio="xMinYMid meet" overflow="visible"><path d="M14 8.4V12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V4c0-1.1.9-2 2-2h8c.4 0 .8.1 1.1.3.3-.3.8-.4 1.2-.4.5 0 1 .2 1.4.6l.3.3V2c0-1.1-.9-2-2-2H2C.9 0 0 .9 0 2v12c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V6.4l-2 2z" fill="#FF2727"/><path d="M15.7 3.9l-.7-.7c-.4-.4-1-.4-1.4 0l-6 6L5.4 7c-.4-.3-1-.3-1.4 0l-.7.7c-.4.4-.4 1 0 1.4l3.6 3.6c.4.4 1 .4 1.4 0l7.4-7.4c.4-.4.4-1 0-1.4z" fill="#76A1F0"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" preserveAspectRatio="xMinYMid meet" overflow="visible"><path d="M14 8.4V12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V4c0-1.1.9-2 2-2h8c.4 0 .8.1 1.1.3.3-.3.8-.4 1.2-.4.5 0 1 .2 1.4.6l.3.3V2c0-1.1-.9-2-2-2H2C.9 0 0 .9 0 2v12c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V6.4l-2 2z" fill="#FF2727"/><path d="m15.7 3.9-.7-.7c-.4-.4-1-.4-1.4 0l-6 6L5.4 7c-.4-.3-1-.3-1.4 0l-.7.7c-.4.4-.4 1 0 1.4l3.6 3.6c.4.4 1 .4 1.4 0l7.4-7.4c.4-.4.4-1 0-1.4z" fill="#76A1F0"/></svg>
\ No newline at end of file
diff --git a/src/core/features/course/components/module/core-course-module.html b/src/core/features/course/components/module/core-course-module.html
index 17e53f4e1..60e2ece03 100644
--- a/src/core/features/course/components/module/core-course-module.html
+++ b/src/core/features/course/components/module/core-course-module.html
@@ -23,9 +23,10 @@
 
                 <div class="core-module-additional-info">
                     <!-- Basic module completion. -->
-                    <core-course-module-completion *ngIf="module.completiondata && module.uservisible" [completion]="module.completiondata"
-                        [moduleName]="module.name" [moduleId]="module.id" [showCompletionConditions]="showCompletionConditions"
-                        [showManualCompletion]="showManualCompletion" (completionChanged)="completionChanged.emit($event)" mode="basic">
+                    <core-course-module-completion *ngIf="module.completiondata && module.uservisible && !showLegacyCompletion"
+                        [completion]="module.completiondata" [moduleName]="module.name" [moduleId]="module.id"
+                        [showCompletionConditions]="showCompletionConditions" [showManualCompletion]="showManualCompletion"
+                        (completionChanged)="completionChanged.emit($event)" mode="basic">
                     </core-course-module-completion>
 
                     <ion-chip *ngIf="module.handlerData.extraBadge" [color]="module.handlerData.extraBadgeColor"
@@ -71,8 +72,9 @@
                 </core-format-text>
 
                 <!-- Module completion. Only auto conditions-->
-                <core-course-module-completion *ngIf="autoCompletionTodo && module.uservisible" [completion]="module.completiondata"
-                    [moduleName]="module.name" [moduleId]="module.id" [showCompletionConditions]="showCompletionConditions">
+                <core-course-module-completion *ngIf="autoCompletionTodo && module.uservisible && !showLegacyCompletion"
+                    [completion]="module.completiondata" [moduleName]="module.name" [moduleId]="module.id"
+                    [showCompletionConditions]="showCompletionConditions">
                 </core-course-module-completion>
 
                 <div class="core-module-dates-availabilityinfo"
diff --git a/src/core/features/course/components/module/module.ts b/src/core/features/course/components/module/module.ts
index 2ea4748e8..5b34bd98d 100644
--- a/src/core/features/course/components/module/module.ts
+++ b/src/core/features/course/components/module/module.ts
@@ -47,11 +47,11 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy {
     @Input() section?: CoreCourseSection; // The section the module belongs to.
     @Input() showActivityDates = false; // Whether to show activity dates.
     @Input() showCompletionConditions = false; // Whether to show activity completion conditions.
+    @Input() showLegacyCompletion?: boolean; // Whether to show module completion in the old format.
     @Output() completionChanged = new EventEmitter<CoreCourseModuleCompletionData>(); // Notify when module completion changes.
 
     modNameTranslated = '';
     hasInfo = false;
-    showLegacyCompletion = false; // Whether to show module completion in the old format.
     showManualCompletion = false; // Whether to show manual completion when completion conditions are disabled.
     prefetchStatusIcon = ''; // Module prefetch status icon.
     prefetchStatusText = ''; // Module prefetch status text.
@@ -66,7 +66,7 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy {
      */
     async ngOnInit(): Promise<void> {
         this.modNameTranslated = CoreCourse.translateModuleName(this.module.modname) || '';
-        this.showLegacyCompletion = !CoreSites.getCurrentSite()?.isVersionGreaterEqualThan('3.11');
+        this.showLegacyCompletion = this.showLegacyCompletion ?? !CoreSites.getCurrentSite()?.isVersionGreaterEqualThan('3.11');
         this.checkShowManualCompletion();
 
         if (!this.module.handlerData) {

From 20d986df837a0f1b489767c413d6c112fd5f2c9c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 7 Mar 2022 12:51:34 +0100
Subject: [PATCH 0655/1008] MOBILE-3967 course: Add config to always use legacy
 completion

---
 src/core/features/course/components/module/module.ts | 4 +++-
 src/types/config.d.ts                                | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/core/features/course/components/module/module.ts b/src/core/features/course/components/module/module.ts
index 5b34bd98d..29676e4ca 100644
--- a/src/core/features/course/components/module/module.ts
+++ b/src/core/features/course/components/module/module.ts
@@ -66,7 +66,9 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy {
      */
     async ngOnInit(): Promise<void> {
         this.modNameTranslated = CoreCourse.translateModuleName(this.module.modname) || '';
-        this.showLegacyCompletion = this.showLegacyCompletion ?? !CoreSites.getCurrentSite()?.isVersionGreaterEqualThan('3.11');
+        this.showLegacyCompletion = this.showLegacyCompletion ??
+            CoreConstants.CONFIG.uselegacycompletion ??
+            !CoreSites.getCurrentSite()?.isVersionGreaterEqualThan('3.11');
         this.checkShowManualCompletion();
 
         if (!this.module.handlerData) {
diff --git a/src/types/config.d.ts b/src/types/config.d.ts
index ef8c23349..ef01af18a 100644
--- a/src/types/config.d.ts
+++ b/src/types/config.d.ts
@@ -65,4 +65,5 @@ export interface EnvironmentConfig {
     wsrequestqueuedelay: number; // Maximum number of miliseconds to wait before processing the queue.
     calendarreminderdefaultvalue: number; // Initial value for default reminders (in seconds). User can change it later.
     removeaccountonlogout?: boolean; // True to remove the account when the user clicks logout. Doesn't affect switch account.
+    uselegacycompletion?: boolean; // Whether to use legacy completion by default in all course formats.
 }

From 328b39a5418c3a09a3262d1f4057b70930630791 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 7 Mar 2022 14:11:12 +0100
Subject: [PATCH 0656/1008] MOBILE-3980 book: Log book viewed in entry page

---
 src/addons/mod/book/components/index/index.ts  |  4 ++++
 src/addons/mod/book/pages/contents/contents.ts | 11 +----------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/addons/mod/book/components/index/index.ts b/src/addons/mod/book/components/index/index.ts
index 09263edda..e711670ba 100644
--- a/src/addons/mod/book/components/index/index.ts
+++ b/src/addons/mod/book/components/index/index.ts
@@ -18,6 +18,7 @@ import { AddonModBook, AddonModBookBookWSData, AddonModBookNumbering, AddonModBo
 import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
 import { CoreCourse } from '@features/course/services/course';
 import { CoreNavigator } from '@services/navigator';
+import { CoreUtils } from '@services/utils/utils';
 
 /**
  * Component that displays a book entry page.
@@ -47,6 +48,9 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
         super.ngOnInit();
 
         this.loadContent();
+
+        // Log book viewed.
+        await CoreUtils.ignoreErrors(AddonModBook.logView(this.module.instance, undefined, this.module.name));
     }
 
     /**
diff --git a/src/addons/mod/book/pages/contents/contents.ts b/src/addons/mod/book/pages/contents/contents.ts
index 7a2055bd3..1f8ebb2b9 100644
--- a/src/addons/mod/book/pages/contents/contents.ts
+++ b/src/addons/mod/book/pages/contents/contents.ts
@@ -69,7 +69,6 @@ export class AddonModBookContentsPage implements OnInit, OnDestroy {
 
     loaded = false;
 
-    protected firstLoad = true;
     protected managerUnsubscribe?: () => void;
 
     /**
@@ -272,10 +271,6 @@ export class AddonModBookContentsPage implements OnInit, OnDestroy {
      * @return Promise resolved when done.
      */
     protected async onChapterViewed(chapterId: number): Promise<void> {
-        // Don't log the chapter ID when the user has just opened the book.
-        const logChapterId = this.firstLoad;
-        this.firstLoad = false;
-
         if (this.displayNavBar) {
             this.navigationItems = this.getNavigationItems(chapterId);
         }
@@ -289,11 +284,7 @@ export class AddonModBookContentsPage implements OnInit, OnDestroy {
         }
 
         // Chapter loaded, log view.
-        await CoreUtils.ignoreErrors(AddonModBook.logView(
-            this.module.instance,
-            logChapterId ? chapterId : undefined,
-            this.module.name,
-        ));
+        await CoreUtils.ignoreErrors(AddonModBook.logView(this.module.instance, chapterId, this.module.name));
 
         const currentChapterIndex = this.chapters.findIndex((chapter) => chapter.id == chapterId);
         const isLastChapter = currentChapterIndex < 0 || this.chapters[currentChapterIndex + 1] === undefined;

From e33c91493531224e58ae8341971f4b9ea5782435 Mon Sep 17 00:00:00 2001
From: Juan Leyva <juanleyvadelgado@gmail.com>
Date: Tue, 8 Mar 2022 10:15:11 +0100
Subject: [PATCH 0657/1008] MOBILE-3833 release: Fix strings

- Use core accessibility and favourites
- Keep in English the developer options
- Remove the review of attempt one (redundant)
---
 scripts/langindex.json                               | 12 ++----------
 .../components/filteroptions/filteroptions.html      |  2 +-
 src/addons/block/myoverview/lang.json                |  2 +-
 src/addons/mod/quiz/lang.json                        |  2 --
 src/addons/mod/quiz/pages/review/review.html         |  8 --------
 src/core/features/settings/lang.json                 |  8 +-------
 src/core/features/settings/pages/about/about.html    |  2 +-
 src/core/features/settings/pages/dev/dev.html        | 12 ++++++------
 8 files changed, 12 insertions(+), 36 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 56faabdba..29d1c1122 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -40,9 +40,9 @@
   "addon.block_learningplans.pluginname": "block_lp",
   "addon.block_myoverview.all": "block_myoverview",
   "addon.block_myoverview.allincludinghidden": "block_myoverview",
+  "addon.block_myoverview.aria:favourites": "block_myoverview",
   "addon.block_myoverview.aria:hiddencourses": "block_myoverview",
   "addon.block_myoverview.card": "block_myoverview",
-  "addon.block_myoverview.favouritesonly": "local_moodlemobileapp",
   "addon.block_myoverview.future": "block_myoverview",
   "addon.block_myoverview.inprogress": "block_myoverview",
   "addon.block_myoverview.lastaccessed": "block_myoverview",
@@ -878,8 +878,6 @@
   "addon.mod_quiz.requirepasswordmessage": "quizaccess_password",
   "addon.mod_quiz.returnattempt": "quiz",
   "addon.mod_quiz.review": "quiz",
-  "addon.mod_quiz.reviewofattempt": "local_moodlemobileapp",
-  "addon.mod_quiz.reviewofpreview": "local_moodlemobileapp",
   "addon.mod_quiz.showall": "quiz",
   "addon.mod_quiz.showeachpage": "quiz",
   "addon.mod_quiz.startattempt": "quiz",
@@ -2142,7 +2140,7 @@
   "core.sending": "chat",
   "core.serverconnection": "error",
   "core.settings.about": "local_moodlemobileapp",
-  "core.settings.accessibilitystatement": "local_moodlemobileapp",
+  "core.settings.accessstatement": "access",
   "core.settings.appsettings": "local_moodlemobileapp",
   "core.settings.appversion": "local_moodlemobileapp",
   "core.settings.cannotsyncloggedout": "local_moodlemobileapp",
@@ -2168,7 +2166,6 @@
   "core.settings.deviceos": "local_moodlemobileapp",
   "core.settings.disableall": "message",
   "core.settings.disabled": "lesson",
-  "core.settings.disabledfeatures": "tool_mobile",
   "core.settings.disallowed": "message",
   "core.settings.displayformat": "local_moodlemobileapp",
   "core.settings.enabledownloadsection": "local_moodlemobileapp",
@@ -2185,7 +2182,6 @@
   "core.settings.fontsizecharacter": "block_accessibility/char",
   "core.settings.forced": "message",
   "core.settings.forcedsetting": "local_moodlemobileapp",
-  "core.settings.forcesafeareamargins": "local_moodlemobileapp",
   "core.settings.general": "moodle",
   "core.settings.helpusimprove": "local_moodlemobileapp",
   "core.settings.ioscookies": "local_moodlemobileapp",
@@ -2200,25 +2196,21 @@
   "core.settings.navigatoruseragent": "local_moodlemobileapp",
   "core.settings.networkstatus": "local_moodlemobileapp",
   "core.settings.opensourcelicenses": "local_moodlemobileapp",
-  "core.settings.pluginstyles": "local_moodlemobileapp",
   "core.settings.preferences": "moodle",
   "core.settings.privacypolicy": "local_moodlemobileapp",
   "core.settings.publisher": "local_moodlemobileapp",
   "core.settings.pushid": "local_moodlemobileapp",
-  "core.settings.remotestyles": "local_moodlemobileapp",
   "core.settings.reportinbackground": "local_moodlemobileapp",
   "core.settings.screen": "local_moodlemobileapp",
   "core.settings.settings": "moodle",
   "core.settings.showdownloadoptions": "local_moodlemobileapp",
   "core.settings.siteinfo": "local_moodlemobileapp",
-  "core.settings.siteplugins": "local_moodlemobileapp",
   "core.settings.sites": "moodle",
   "core.settings.spaceusage": "local_moodlemobileapp",
   "core.settings.synchronization": "local_moodlemobileapp",
   "core.settings.synchronizenow": "local_moodlemobileapp",
   "core.settings.synchronizenowhelp": "local_moodlemobileapp",
   "core.settings.syncsettings": "local_moodlemobileapp",
-  "core.settings.textdirection": "local_moodlemobileapp",
   "core.settings.total": "moodle",
   "core.settings.wificonnection": "local_moodlemobileapp",
   "core.settings.youradev": "local_moodlemobileapp",
diff --git a/src/addons/block/myoverview/components/filteroptions/filteroptions.html b/src/addons/block/myoverview/components/filteroptions/filteroptions.html
index 8d747fcfe..2a6caf36b 100644
--- a/src/addons/block/myoverview/components/filteroptions/filteroptions.html
+++ b/src/addons/block/myoverview/components/filteroptions/filteroptions.html
@@ -41,7 +41,7 @@
 
         <core-spacer></core-spacer>
         <ion-item *ngIf="options.show.favourite">
-            <ion-label>{{ 'addon.block_myoverview.favouritesonly' | translate }}</ion-label>
+            <ion-label>{{ 'addon.block_myoverview.aria:favourites' | translate }}</ion-label>
             <ion-toggle [(ngModel)]="options.favouriteSelected"></ion-toggle>
         </ion-item>
 
diff --git a/src/addons/block/myoverview/lang.json b/src/addons/block/myoverview/lang.json
index 02a3c43fa..8030a7813 100644
--- a/src/addons/block/myoverview/lang.json
+++ b/src/addons/block/myoverview/lang.json
@@ -1,9 +1,9 @@
 {
     "all": "All",
     "allincludinghidden": "All (including archived)",
+    "aria:favourites": "Show starred courses only",
     "aria:hiddencourses": "Show archived courses",
     "card": "Card",
-    "favouritesonly": "Show starred courses only",
     "future": "Future",
     "inprogress": "In progress",
     "lastaccessed": "Last accessed",
diff --git a/src/addons/mod/quiz/lang.json b/src/addons/mod/quiz/lang.json
index 8f59f8656..a1db1a409 100644
--- a/src/addons/mod/quiz/lang.json
+++ b/src/addons/mod/quiz/lang.json
@@ -57,8 +57,6 @@
     "requirepasswordmessage": "To attempt this quiz you need to know the quiz password",
     "returnattempt": "Return to attempt",
     "review": "Review",
-    "reviewofattempt": "Review of attempt {{$a}}",
-    "reviewofpreview": "Review of preview",
     "showall": "Show all questions on one page",
     "showeachpage": "Show one page at a time",
     "startattempt": "Start attempt",
diff --git a/src/addons/mod/quiz/pages/review/review.html b/src/addons/mod/quiz/pages/review/review.html
index 5399c89a1..2e3f97232 100644
--- a/src/addons/mod/quiz/pages/review/review.html
+++ b/src/addons/mod/quiz/pages/review/review.html
@@ -23,14 +23,6 @@
 
         <!-- Review summary -->
         <ion-card *ngIf="attempt">
-            <ion-card-header class="ion-text-wrap">
-                <ion-card-title>
-                    <ng-container *ngIf="attempt.preview">{{ 'addon.mod_quiz.reviewofpreview' | translate }}</ng-container>
-                    <ng-container *ngIf="!attempt.preview">
-                        {{ 'addon.mod_quiz.reviewofattempt' | translate:{$a: attempt.attempt} }}
-                    </ng-container>
-                </ion-card-title>
-            </ion-card-header>
             <ion-list>
                 <ion-item class="ion-text-wrap">
                     <ion-label>
diff --git a/src/core/features/settings/lang.json b/src/core/features/settings/lang.json
index 76aa58bc0..29c25bbff 100644
--- a/src/core/features/settings/lang.json
+++ b/src/core/features/settings/lang.json
@@ -1,6 +1,6 @@
 {
     "about": "About",
-    "accessibilitystatement": "Accessibility statement",
+    "accessstatement": "Accessibility statement",
     "appsettings": "App settings",
     "appversion": "App version",
     "cannotsyncloggedout": "This site cannot be synchronised because you've logged out. Please try again when you're logged in the site again.",
@@ -26,7 +26,6 @@
     "deviceos": "Device OS",
     "disableall": "Disable notifications",
     "disabled": "Disabled",
-    "disabledfeatures": "Disabled features",
     "disallowed": "Locked off",
     "displayformat": "Display format",
     "enabledownloadsection": "Enable download sections",
@@ -43,7 +42,6 @@
     "fontsizecharacter": "A",
     "forced": "Locked",
     "forcedsetting": "This setting has been forced by your site configuration.",
-    "forcesafeareamargins": "Force safe area margins",
     "general": "General",
     "helpusimprove": "Help us improve this app",
     "ioscookies": "Cross-Website Tracking",
@@ -58,25 +56,21 @@
     "navigatoruseragent": "Navigator userAgent",
     "networkstatus": "Internet connection status",
     "opensourcelicenses": "Open Source Licences",
-    "pluginstyles": "Enable site plugin styles",
     "preferences": "Preferences",
     "privacypolicy": "Privacy policy",
     "publisher": "Publisher",
     "pushid": "Push notifications ID",
-    "remotestyles": "Enable remote styles",
     "reportinbackground": "Report errors automatically",
     "screen": "Screen information",
     "settings": "Settings",
     "showdownloadoptions": "Show download options",
     "siteinfo": "Site info",
-    "siteplugins": "Site plugins",
     "sites": "Sites",
     "spaceusage": "Space usage",
     "synchronization": "Synchronisation",
     "synchronizenow": "Synchronise now",
     "synchronizenowhelp": "Synchronising a site will send pending changes and all offline activity stored in the device and will synchronise some data like messages and notifications.",
     "syncsettings": "Synchronisation settings",
-    "textdirection": "Text direction",
     "total": "Total",
     "wificonnection": "Wi-Fi connection",
     "youradev": "You are now a developer"
diff --git a/src/core/features/settings/pages/about/about.html b/src/core/features/settings/pages/about/about.html
index 7417a8084..bcab19c6b 100644
--- a/src/core/features/settings/pages/about/about.html
+++ b/src/core/features/settings/pages/about/about.html
@@ -25,7 +25,7 @@
         <ion-item *ngIf="a11yStatement" class="ion-text-wrap" button core-link auto-login="no" [href]="a11yStatement" detail="true"
             detailIcon="open-outline">
             <ion-icon name="fas-universal-access" slot="start" aria-hidden="true"></ion-icon>
-            <ion-label>{{ 'core.settings.accessibilitystatement' | translate }}</ion-label>
+            <ion-label>{{ 'core.settings.accessstatement' | translate }}</ion-label>
         </ion-item>
         <ion-item *ngIf="feedbackFormUrl" class="ion-text-wrap" button core-link [href]="feedbackFormUrl" detail="true"
             detailIcon="open-outline">
diff --git a/src/core/features/settings/pages/dev/dev.html b/src/core/features/settings/pages/dev/dev.html
index 61d6f0f52..d7dd7f061 100644
--- a/src/core/features/settings/pages/dev/dev.html
+++ b/src/core/features/settings/pages/dev/dev.html
@@ -19,28 +19,28 @@
     <ion-list class="list-item-limited-width">
         <ion-item class="ion-text-wrap">
             <ion-label>
-                <h2>{{ 'core.settings.textdirection' | translate }}</h2>
+                <h2>Text direction</h2>
                 <p>{{ direction }}</p>
             </ion-label>
             <ion-toggle [(ngModel)]="rtl" (ionChange)="RTLChanged()"></ion-toggle>
         </ion-item>
         <ion-item class="ion-text-wrap">
             <ion-label>
-                <h2>{{ 'core.settings.forcesafeareamargins' | translate }}</h2>
+                <h2>Force safe area margins</h2>
             </ion-label>
             <ion-toggle [(ngModel)]="forceSafeAreaMargins" (ionChange)="safeAreaChanged()"></ion-toggle>
         </ion-item>
         <ng-container *ngIf="siteId">
             <ion-item class="ion-text-wrap">
                 <ion-label>
-                    <h2>{{ 'core.settings.remotestyles' | translate }} <ion-badge>{{remoteStylesCount}}</ion-badge>
+                    <h2>Enable remote styles <ion-badge>{{remoteStylesCount}}</ion-badge>
                     </h2>
                 </ion-label>
                 <ion-toggle [(ngModel)]="remoteStyles" (ionChange)="remoteStylesChanged()"></ion-toggle>
             </ion-item>
             <ion-item class="ion-text-wrap">
                 <ion-label>
-                    <h2>{{ 'core.settings.pluginstyles' | translate }} <ion-badge>{{pluginStylesCount}}</ion-badge>
+                    <h2>Enable site plugin styles <ion-badge>{{pluginStylesCount}}</ion-badge>
                     </h2>
                 </ion-label>
                 <ion-toggle [(ngModel)]="pluginStyles" (ionChange)="pluginStylesChanged()"></ion-toggle>
@@ -48,7 +48,7 @@
 
             <ion-item-divider>
                 <ion-label>
-                    <h2>{{ 'core.settings.disabledfeatures' | translate }}</h2>
+                    <h2>Disabled features</h2>
                 </ion-label>
             </ion-item-divider>
             <ion-item class="ion-text-wrap" *ngFor="let feature of disabledFeatures">
@@ -59,7 +59,7 @@
 
             <ion-item-divider>
                 <ion-label>
-                    <h2>{{ 'core.settings.siteplugins' | translate }}</h2>
+                    <h2>Site plugins</h2>
                 </ion-label>
             </ion-item-divider>
             <ion-item class="ion-text-wrap" *ngFor="let plugin of sitePlugins">

From 71f65cec072a28e27d0151ee52e76ba4aafa8732 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 8 Mar 2022 07:42:09 +0100
Subject: [PATCH 0658/1008] MOBILE-3930 mod: Fix log view not called after PTR
 if fetch failed

---
 src/addons/blog/pages/entries/entries.ts      | 16 +++---
 .../pages/competency/competency.page.ts       | 55 ++++++++++---------
 .../competencysummary.page.ts                 | 12 ++--
 .../mod/assign/components/index/index.ts      | 41 +++++++-------
 .../bigbluebuttonbn/components/index/index.ts | 25 ++++-----
 src/addons/mod/book/components/index/index.ts | 12 ++--
 src/addons/mod/chat/components/index/index.ts | 24 ++++----
 .../mod/choice/components/index/index.ts      | 26 ++++-----
 src/addons/mod/data/components/index/index.ts | 22 ++------
 src/addons/mod/data/pages/entry/entry.ts      | 11 +++-
 .../mod/feedback/components/index/index.ts    | 16 ++++--
 .../mod/folder/components/index/index.ts      | 14 ++---
 .../mod/forum/components/index/index.ts       | 17 +++---
 .../mod/glossary/components/index/index.ts    | 32 ++++++-----
 .../mod/h5pactivity/components/index/index.ts |  6 +-
 .../pages/attempt-results/attempt-results.ts  | 38 +++++++------
 .../pages/user-attempts/user-attempts.ts      | 38 +++++++------
 .../pages/users-attempts/users-attempts.ts    | 32 ++++++-----
 .../mod/imscp/components/index/index.ts       | 14 ++---
 .../mod/lesson/components/index/index.ts      | 25 ++-------
 src/addons/mod/page/components/index/index.ts | 14 ++---
 src/addons/mod/quiz/components/index/index.ts | 30 +++++-----
 .../mod/quiz/pages/review/review.page.ts      | 12 ++--
 .../mod/resource/components/index/index.ts    | 13 +++--
 .../mod/scorm/components/index/index.ts       | 27 ++++-----
 .../mod/survey/components/index/index.ts      | 19 ++++---
 src/addons/mod/url/components/index/index.ts  | 22 +++++---
 src/addons/mod/wiki/components/index/index.ts | 34 ++++++------
 .../mod/workshop/components/index/index.ts    | 24 ++++----
 .../workshop/pages/submission/submission.ts   | 28 ++++++++--
 src/addons/notes/pages/list/list.page.ts      | 10 +++-
 .../items-management/list-items-manager.ts    | 21 ++++++-
 .../course/classes/main-activity-component.ts |  2 +
 .../course/classes/main-resource-component.ts | 44 +++++++++++++++
 .../grades/pages/course/course.page.ts        |  8 ++-
 .../features/sitehome/pages/index/index.ts    | 17 +++---
 .../user/pages/profile/profile.page.ts        | 25 +++++----
 37 files changed, 465 insertions(+), 361 deletions(-)

diff --git a/src/addons/blog/pages/entries/entries.ts b/src/addons/blog/pages/entries/entries.ts
index 98ae5f66a..100eec06b 100644
--- a/src/addons/blog/pages/entries/entries.ts
+++ b/src/addons/blog/pages/entries/entries.ts
@@ -43,6 +43,7 @@ export class AddonBlogEntriesPage implements OnInit {
     protected canLoadMoreEntries = false;
     protected canLoadMoreUserEntries = true;
     protected siteHomeId: number;
+    protected fetchSuccess = false;
 
     loaded = false;
     canLoadMore = false;
@@ -123,8 +124,6 @@ export class AddonBlogEntriesPage implements OnInit {
         deepLinkManager.treatLink();
 
         await this.fetchEntries();
-
-        CoreUtils.ignoreErrors(AddonBlog.logView(this.filter));
     }
 
     /**
@@ -176,13 +175,7 @@ export class AddonBlogEntriesPage implements OnInit {
 
                 entry.summary = CoreTextUtils.replacePluginfileUrls(entry.summary, entry.summaryfiles || []);
 
-                return CoreUser.getProfile(entry.userid, entry.courseid, true).then((user) => {
-                    entry.user = user;
-
-                    return;
-                }).catch(() => {
-                    // Ignore errors.
-                });
+                entry.user = await CoreUtils.ignoreErrors(CoreUser.getProfile(entry.userid, entry.courseid, true));
             });
 
             if (refresh) {
@@ -205,6 +198,11 @@ export class AddonBlogEntriesPage implements OnInit {
             }
 
             await Promise.all(promises);
+
+            if (!this.fetchSuccess) {
+                this.fetchSuccess = true;
+                CoreUtils.ignoreErrors(AddonBlog.logView(this.filter));
+            }
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'addon.blog.errorloadentries', true);
             this.loadMoreError = true; // Set to prevent infinite calls with infinite-loading.
diff --git a/src/addons/competency/pages/competency/competency.page.ts b/src/addons/competency/pages/competency/competency.page.ts
index e2c2a41a1..763d63ede 100644
--- a/src/addons/competency/pages/competency/competency.page.ts
+++ b/src/addons/competency/pages/competency/competency.page.ts
@@ -58,6 +58,8 @@ export class AddonCompetencyCompetencyPage implements OnInit, OnDestroy {
     contextLevel?: string;
     contextInstanceId?: number;
 
+    protected fetchSuccess = false;
+
     constructor() {
         try {
             const planId = CoreNavigator.getRouteNumberParam('planId');
@@ -117,33 +119,6 @@ export class AddonCompetencyCompetencyPage implements OnInit, OnDestroy {
             await source.reload();
             await this.competencies.start();
             await this.fetchCompetency();
-
-            if (!this.competency) {
-                return;
-            }
-
-            const name = this.competency.competency.competency.shortname;
-
-            if (source instanceof AddonCompetencyPlanCompetenciesSource) {
-                this.planStatus && await CoreUtils.ignoreErrors(
-                    AddonCompetency.logCompetencyInPlanView(
-                        source.PLAN_ID,
-                        this.requireCompetencyId(),
-                        this.planStatus,
-                        name,
-                        source.user?.id,
-                    ),
-                );
-            } else {
-                await CoreUtils.ignoreErrors(
-                    AddonCompetency.logCompetencyInCourseView(
-                        source.COURSE_ID,
-                        this.requireCompetencyId(),
-                        name,
-                        source.USER_ID,
-                    ),
-                );
-            }
         } finally {
             this.competencyLoaded = true;
         }
@@ -180,6 +155,32 @@ export class AddonCompetencyCompetencyPage implements OnInit, OnDestroy {
                     evidence.description = Translate.instant(key, { $a: evidence.desca });
                 }
             });
+
+            if (!this.fetchSuccess) {
+                this.fetchSuccess = true;
+                const name = this.competency.competency.competency.shortname;
+
+                if (source instanceof AddonCompetencyPlanCompetenciesSource) {
+                    this.planStatus && await CoreUtils.ignoreErrors(
+                        AddonCompetency.logCompetencyInPlanView(
+                            source.PLAN_ID,
+                            this.requireCompetencyId(),
+                            this.planStatus,
+                            name,
+                            source.user?.id,
+                        ),
+                    );
+                } else {
+                    await CoreUtils.ignoreErrors(
+                        AddonCompetency.logCompetencyInCourseView(
+                            source.COURSE_ID,
+                            this.requireCompetencyId(),
+                            name,
+                            source.USER_ID,
+                        ),
+                    );
+                }
+            }
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'Error getting competency data.');
         }
diff --git a/src/addons/competency/pages/competencysummary/competencysummary.page.ts b/src/addons/competency/pages/competencysummary/competencysummary.page.ts
index b490c4ed4..b6fe06664 100644
--- a/src/addons/competency/pages/competencysummary/competencysummary.page.ts
+++ b/src/addons/competency/pages/competencysummary/competencysummary.page.ts
@@ -36,6 +36,8 @@ export class AddonCompetencyCompetencySummaryPage implements OnInit {
     contextLevel?: ContextLevel;
     contextInstanceId?: number;
 
+    protected fetchSuccess = false; // Whether a fetch was finished successfully.
+
     /**
      * @inheritdoc
      */
@@ -54,9 +56,6 @@ export class AddonCompetencyCompetencySummaryPage implements OnInit {
 
         try {
             await this.fetchCompetency();
-            const name = this.competency!.competency && this.competency!.competency.shortname;
-
-            CoreUtils.ignoreErrors(AddonCompetency.logCompetencyView(this.competencyId, name));
         } finally {
             this.competencyLoaded = true;
         }
@@ -73,10 +72,15 @@ export class AddonCompetencyCompetencySummaryPage implements OnInit {
             if (!this.contextLevel || this.contextInstanceId === undefined) {
                 // Context not specified, use user context.
                 this.contextLevel = ContextLevel.USER;
-                this.contextInstanceId = result.usercompetency!.userid;
+                this.contextInstanceId = result.usercompetency?.userid;
             }
 
             this.competency = result.competency;
+
+            if (!this.fetchSuccess) {
+                this.fetchSuccess = true;
+                CoreUtils.ignoreErrors(AddonCompetency.logCompetencyView(this.competencyId, this.competency.competency.shortname));
+            }
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'Error getting competency summary data.');
         }
diff --git a/src/addons/mod/assign/components/index/index.ts b/src/addons/mod/assign/components/index/index.ts
index 226d5e28a..b2ae03e97 100644
--- a/src/addons/mod/assign/components/index/index.ts
+++ b/src/addons/mod/assign/components/index/index.ts
@@ -17,7 +17,6 @@ import { Params } from '@angular/router';
 import { CoreSite } from '@classes/site';
 import { CoreCourseModuleMainActivityComponent } from '@features/course/classes/main-activity-component';
 import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
-import { CoreCourse } from '@features/course/services/course';
 import { IonContent } from '@ionic/angular';
 import { CoreGroupInfo, CoreGroups } from '@services/groups';
 import { CoreNavigator } from '@services/navigator';
@@ -121,7 +120,7 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
             (data) => {
                 if (this.assign && data.assignmentId == this.assign.id && data.userId == this.currentUserId) {
                     // Assignment submitted, check completion.
-                    CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
+                    this.checkCompletion();
 
                     // Reload data since it can have offline data now.
                     this.showLoadingAndRefresh(true, false);
@@ -138,25 +137,6 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
         }, this.siteId);
 
         await this.loadContent(false, true);
-
-        if (!this.assign) {
-            return;
-        }
-
-        try {
-            await AddonModAssign.logView(this.assign.id, this.assign.name);
-            CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
-        } catch {
-            // Ignore errors. Just don't check Module completion.
-        }
-
-        if (this.canViewAllSubmissions) {
-            // User can see all submissions, log grading view.
-            CoreUtils.ignoreErrors(AddonModAssign.logGradingView(this.assign.id, this.assign.name));
-        } else if (this.canViewOwnSubmission) {
-            // User can only see their own submission, log view the user submission.
-            CoreUtils.ignoreErrors(AddonModAssign.logSubmissionView(this.assign.id, this.assign.name));
-        }
     }
 
     /**
@@ -232,6 +212,25 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
         }
     }
 
+    /**
+     * @inheritdoc
+     */
+    protected async logActivity(): Promise<void> {
+        if (!this.assign) {
+            return; // Shouldn't happen.
+        }
+
+        await AddonModAssign.logView(this.assign.id, this.assign.name);
+
+        if (this.canViewAllSubmissions) {
+            // User can see all submissions, log grading view.
+            CoreUtils.ignoreErrors(AddonModAssign.logGradingView(this.assign.id, this.assign.name));
+        } else if (this.canViewOwnSubmission) {
+            // User can only see their own submission, log view the user submission.
+            CoreUtils.ignoreErrors(AddonModAssign.logSubmissionView(this.assign.id, this.assign.name));
+        }
+    }
+
     /**
      * Set group to see the summary.
      *
diff --git a/src/addons/mod/bigbluebuttonbn/components/index/index.ts b/src/addons/mod/bigbluebuttonbn/components/index/index.ts
index d8b639b95..33a5fe693 100644
--- a/src/addons/mod/bigbluebuttonbn/components/index/index.ts
+++ b/src/addons/mod/bigbluebuttonbn/components/index/index.ts
@@ -15,7 +15,6 @@
 import { Component, OnInit, Optional } from '@angular/core';
 import { CoreCourseModuleMainActivityComponent } from '@features/course/classes/main-activity-component';
 import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
-import { CoreCourse } from '@features/course/services/course';
 import { IonContent } from '@ionic/angular';
 import { CoreGroupInfo, CoreGroups } from '@services/groups';
 import { CoreDomUtils } from '@services/utils/dom';
@@ -54,18 +53,6 @@ export class AddonModBBBIndexComponent extends CoreCourseModuleMainActivityCompo
         super.ngOnInit();
 
         await this.loadContent();
-
-        if (!this.bbb) {
-            return;
-        }
-
-        try {
-            await AddonModBBB.logView(this.bbb.id, this.bbb.name);
-
-            CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
-        } catch {
-            // Ignore errors.
-        }
     }
 
     /**
@@ -82,7 +69,6 @@ export class AddonModBBBIndexComponent extends CoreCourseModuleMainActivityCompo
         this.groupId = CoreGroups.validateGroupId(this.groupId, this.groupInfo);
 
         await this.fetchMeetingInfo();
-
     }
 
     /**
@@ -107,6 +93,17 @@ export class AddonModBBBIndexComponent extends CoreCourseModuleMainActivityCompo
         }
     }
 
+    /**
+     * @inheritdoc
+     */
+    protected async logActivity(): Promise<void> {
+        if (!this.bbb) {
+            return; // Shouldn't happen.
+        }
+
+        await AddonModBBB.logView(this.bbb.id, this.bbb.name);
+    }
+
     /**
      * Update meeting info.
      *
diff --git a/src/addons/mod/book/components/index/index.ts b/src/addons/mod/book/components/index/index.ts
index e711670ba..82747aa77 100644
--- a/src/addons/mod/book/components/index/index.ts
+++ b/src/addons/mod/book/components/index/index.ts
@@ -18,7 +18,6 @@ import { AddonModBook, AddonModBookBookWSData, AddonModBookNumbering, AddonModBo
 import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
 import { CoreCourse } from '@features/course/services/course';
 import { CoreNavigator } from '@services/navigator';
-import { CoreUtils } from '@services/utils/utils';
 
 /**
  * Component that displays a book entry page.
@@ -36,6 +35,7 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
     hasStartedBook = false;
 
     protected book?: AddonModBookBookWSData;
+    protected checkCompletionAfterLog = false;
 
     constructor( @Optional() courseContentsPage?: CoreCourseContentsPage) {
         super('AddonModBookIndexComponent', courseContentsPage);
@@ -48,9 +48,6 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
         super.ngOnInit();
 
         this.loadContent();
-
-        // Log book viewed.
-        await CoreUtils.ignoreErrors(AddonModBook.logView(this.module.instance, undefined, this.module.name));
     }
 
     /**
@@ -93,6 +90,13 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
         this.chapters = AddonModBook.getTocList(contents);
     }
 
+    /**
+     * @inheritdoc
+     */
+    protected async logActivity(): Promise<void> {
+        AddonModBook.logView(this.module.instance, undefined, this.module.name);
+    }
+
     /**
      * Open the book in a certain chapter.
      *
diff --git a/src/addons/mod/chat/components/index/index.ts b/src/addons/mod/chat/components/index/index.ts
index 159f4e462..813c08cff 100644
--- a/src/addons/mod/chat/components/index/index.ts
+++ b/src/addons/mod/chat/components/index/index.ts
@@ -15,7 +15,6 @@
 import { Component, OnInit, Optional } from '@angular/core';
 import { CoreCourseModuleMainActivityComponent } from '@features/course/classes/main-activity-component';
 import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
-import { CoreCourse } from '@features/course/services/course';
 import { IonContent } from '@ionic/angular';
 import { CoreNavigator } from '@services/navigator';
 import { CoreTimeUtils } from '@services/utils/time';
@@ -53,18 +52,6 @@ export class AddonModChatIndexComponent extends CoreCourseModuleMainActivityComp
         super.ngOnInit();
 
         await this.loadContent();
-
-        if (!this.chat) {
-            return;
-        }
-
-        try {
-            await AddonModChat.logView(this.chat.id, this.chat.name);
-
-            CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
-        } catch {
-            // Ignore errors.
-        }
     }
 
     /**
@@ -89,6 +76,17 @@ export class AddonModChatIndexComponent extends CoreCourseModuleMainActivityComp
         this.dataRetrieved.emit(this.chat);
     }
 
+    /**
+     * @inheritdoc
+     */
+    protected async logActivity(): Promise<void> {
+        if (!this.chat) {
+            return; // Shouldn't happen.
+        }
+
+        await AddonModChat.logView(this.chat.id, this.chat.name);
+    }
+
     /**
      * Enter the chat.
      */
diff --git a/src/addons/mod/choice/components/index/index.ts b/src/addons/mod/choice/components/index/index.ts
index a43fc8c58..aaa489e82 100644
--- a/src/addons/mod/choice/components/index/index.ts
+++ b/src/addons/mod/choice/components/index/index.ts
@@ -15,7 +15,6 @@
 import { Component, Optional, OnInit } from '@angular/core';
 import { CoreCourseModuleMainActivityComponent } from '@features/course/classes/main-activity-component';
 import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
-import { CoreCourse } from '@features/course/services/course';
 import { IonContent } from '@ionic/angular';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
@@ -86,18 +85,6 @@ export class AddonModChoiceIndexComponent extends CoreCourseModuleMainActivityCo
         this.userId = CoreSites.getCurrentSiteUserId();
 
         await this.loadContent(false, true);
-
-        if (!this.choice) {
-            return;
-        }
-
-        try {
-            await AddonModChoice.logView(this.choice.id, this.choice.name);
-
-            await CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
-        } catch {
-            // Ignore errors.
-        }
     }
 
     /**
@@ -325,6 +312,17 @@ export class AddonModChoiceIndexComponent extends CoreCourseModuleMainActivityCo
         this.canSeeResults = hasVotes || AddonModChoice.canStudentSeeResults(choice, this.hasAnsweredOnline);
     }
 
+    /**
+     * @inheritdoc
+     */
+    protected async logActivity(): Promise<void> {
+        if (!this.choice) {
+            return; // Shouldn't happen.
+        }
+
+        await AddonModChoice.logView(this.choice.id, this.choice.name);
+    }
+
     /**
      * Check if a choice is open.
      *
@@ -384,7 +382,7 @@ export class AddonModChoiceIndexComponent extends CoreCourseModuleMainActivityCo
             if (online) {
                 CoreEvents.trigger(CoreEvents.ACTIVITY_DATA_SENT, { module: this.moduleName });
                 // Check completion since it could be configured to complete once the user answers the choice.
-                CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
+                this.checkCompletion();
             }
 
             await this.dataUpdated(online);
diff --git a/src/addons/mod/data/components/index/index.ts b/src/addons/mod/data/components/index/index.ts
index 2c367fa48..164be2986 100644
--- a/src/addons/mod/data/components/index/index.ts
+++ b/src/addons/mod/data/components/index/index.ts
@@ -18,7 +18,6 @@ import { Params } from '@angular/router';
 import { CoreCommentsProvider } from '@features/comments/services/comments';
 import { CoreCourseModuleMainActivityComponent } from '@features/course/classes/main-activity-component';
 import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
-import { CoreCourse } from '@features/course/services/course';
 import { CoreRatingProvider } from '@features/rating/services/rating';
 import { CoreRatingSyncProvider } from '@features/rating/services/rating-sync';
 import { IonContent } from '@ionic/angular';
@@ -154,7 +153,6 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
         });
 
         await this.loadContent(false, true);
-        await this.logView(true);
     }
 
     /**
@@ -410,7 +408,7 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
         try {
             await this.fetchEntriesData();
             // Log activity view for coherence with Moodle web.
-            await this.logView();
+            await this.logActivity();
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'core.course.errorgetmodule', true);
         } finally {
@@ -456,7 +454,7 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
             await this.fetchEntriesData();
 
             // Log activity view for coherence with Moodle web.
-            return this.logView();
+            return this.logActivity();
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'core.course.errorgetmodule', true);
         }
@@ -522,24 +520,14 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
     }
 
     /**
-     * Log viewing the activity.
-     *
-     * @param checkCompletion Whether to check completion.
-     * @return Promise resolved when done.
+     * @inheritdoc
      */
-    protected async logView(checkCompletion = false): Promise<void> {
+    protected async logActivity(): Promise<void> {
         if (!this.database || !this.database.id) {
             return;
         }
 
-        try {
-            await AddonModData.logView(this.database.id, this.database.name);
-            if (checkCompletion) {
-                CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
-            }
-        } catch {
-            // Ignore errors, the user could be offline.
-        }
+        await AddonModData.logView(this.database.id, this.database.name);
     }
 
     /**
diff --git a/src/addons/mod/data/pages/entry/entry.ts b/src/addons/mod/data/pages/entry/entry.ts
index 173242ed4..d7ef66e84 100644
--- a/src/addons/mod/data/pages/entry/entry.ts
+++ b/src/addons/mod/data/pages/entry/entry.ts
@@ -55,6 +55,7 @@ export class AddonModDataEntryPage implements OnInit, OnDestroy {
     protected entryChangedObserver: CoreEventObserver; // It will observe the changed entry event.
     protected fields: Record<number, AddonModDataField> = {};
     protected fieldsArray: AddonModDataField[] = [];
+    protected logAfterFetch = true;
 
     moduleId = 0;
     courseId!: number;
@@ -149,7 +150,6 @@ export class AddonModDataEntryPage implements OnInit, OnDestroy {
         this.commentsEnabled = !CoreComments.areCommentsDisabledInSite();
 
         await this.fetchEntryData();
-        this.logView();
     }
 
     /**
@@ -201,6 +201,11 @@ export class AddonModDataEntryPage implements OnInit, OnDestroy {
                 title: this.title,
                 group: this.selectedGroup,
             };
+
+            if (this.logAfterFetch) {
+                this.logAfterFetch = false;
+                this.logView();
+            }
         } catch (error) {
             if (!refresh) {
                 // Some call failed, retry without using cache since it might be a new activity.
@@ -225,9 +230,9 @@ export class AddonModDataEntryPage implements OnInit, OnDestroy {
         this.entryId = undefined;
         this.entry = undefined;
         this.entryLoaded = false;
+        this.logAfterFetch = true;
 
         await this.fetchEntryData();
-        this.logView();
     }
 
     /**
@@ -286,9 +291,9 @@ export class AddonModDataEntryPage implements OnInit, OnDestroy {
         this.entry = undefined;
         this.entryId = undefined;
         this.entryLoaded = false;
+        this.logAfterFetch = true;
 
         await this.fetchEntryData();
-        this.logView();
     }
 
     /**
diff --git a/src/addons/mod/feedback/components/index/index.ts b/src/addons/mod/feedback/components/index/index.ts
index e31b5f529..cb20702f5 100644
--- a/src/addons/mod/feedback/components/index/index.ts
+++ b/src/addons/mod/feedback/components/index/index.ts
@@ -82,6 +82,7 @@ export class AddonModFeedbackIndexComponent extends CoreCourseModuleMainActivity
 
     protected submitObserver: CoreEventObserver;
     protected syncEventName = AddonModFeedbackSyncProvider.AUTO_SYNCED;
+    protected checkCompletionAfterLog = false;
 
     constructor(
         protected content?: IonContent,
@@ -125,15 +126,22 @@ export class AddonModFeedbackIndexComponent extends CoreCourseModuleMainActivity
 
         try {
             await this.loadContent(false, true);
-
-            if (this.feedback) {
-                CoreUtils.ignoreErrors(AddonModFeedback.logView(this.feedback.id, this.feedback.name));
-            }
         } finally {
             this.tabsReady = true;
         }
     }
 
+    /**
+     * @inheritdoc
+     */
+    protected async logActivity(): Promise<void> {
+        if (!this.feedback) {
+            return; // Shouldn't happen.
+        }
+
+        await AddonModFeedback.logView(this.feedback.id, this.feedback.name);
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/src/addons/mod/folder/components/index/index.ts b/src/addons/mod/folder/components/index/index.ts
index fcfa675c7..8cd1f0504 100644
--- a/src/addons/mod/folder/components/index/index.ts
+++ b/src/addons/mod/folder/components/index/index.ts
@@ -62,13 +62,6 @@ export class AddonModFolderIndexComponent extends CoreCourseModuleMainResourceCo
 
         try {
             await this.loadContent();
-
-            try {
-                await AddonModFolder.logView(this.module.instance, this.module.name);
-                CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
-            } catch {
-                // Ignore errors.
-            }
         } finally {
             this.showLoading = false;
         }
@@ -97,6 +90,13 @@ export class AddonModFolderIndexComponent extends CoreCourseModuleMainResourceCo
         this.contents = AddonModFolderHelper.formatContents(contents);
     }
 
+    /**
+     * @inheritdoc
+     */
+    protected async logActivity(): Promise<void> {
+        await AddonModFolder.logView(this.module.instance, this.module.name);
+    }
+
     /**
      * Navigate to a subfolder.
      *
diff --git a/src/addons/mod/forum/components/index/index.ts b/src/addons/mod/forum/components/index/index.ts
index 55ac9daaa..849453c42 100644
--- a/src/addons/mod/forum/components/index/index.ts
+++ b/src/addons/mod/forum/components/index/index.ts
@@ -99,6 +99,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
     protected ratingOfflineObserver?: CoreEventObserver;
     protected ratingSyncObserver?: CoreEventObserver;
     protected sourceUnsubscribe?: () => void;
+    protected checkCompletionAfterLog = false; // Use CoreListItemsManager log system instead.
 
     constructor(
         public route: ActivatedRoute,
@@ -570,7 +571,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
             });
 
             // Check completion since it could be configured to complete once the user adds a new discussion or replies.
-            CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
+            this.checkCompletion();
         }
     }
 
@@ -692,15 +693,13 @@ class AddonModForumDiscussionsManager extends CoreListItemsManager<AddonModForum
             return;
         }
 
-        CoreUtils.ignoreErrors(
-            AddonModForum.instance
-                .logView(forum.id, forum.name)
-                .then(async () => {
-                    CoreCourse.checkModuleCompletion(this.page.courseId, this.page.module.completiondata);
+        try {
+            await AddonModForum.instance.logView(forum.id, forum.name);
 
-                    return;
-                }),
-        );
+            CoreCourse.checkModuleCompletion(this.page.courseId, this.page.module.completiondata);
+        } catch {
+            // Ignore errors.
+        }
     }
 
 }
diff --git a/src/addons/mod/glossary/components/index/index.ts b/src/addons/mod/glossary/components/index/index.ts
index 4e483a919..8c3bbd65a 100644
--- a/src/addons/mod/glossary/components/index/index.ts
+++ b/src/addons/mod/glossary/components/index/index.ts
@@ -81,12 +81,13 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
     protected sourceUnsubscribe?: () => void;
     protected ratingOfflineObserver?: CoreEventObserver;
     protected ratingSyncObserver?: CoreEventObserver;
+    protected checkCompletionAfterLog = false; // Use CoreListItemsManager log system instead.
 
     getDivider?: (entry: AddonModGlossaryEntry) => string;
     showDivider: (entry: AddonModGlossaryEntry, previous?: AddonModGlossaryEntry) => boolean = () => false;
 
     constructor(
-        protected route: ActivatedRoute,
+        public route: ActivatedRoute,
         protected content?: IonContent,
         @Optional() protected courseContentsPage?: CoreCourseContentsPage,
     ) {
@@ -124,10 +125,7 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
             [this.courseId, this.module.id, this.courseContentsPage ? `${AddonModGlossaryModuleHandlerService.PAGE_NAME}/` : ''],
         );
 
-        this.promisedEntries.resolve(new AddonModGlossaryEntriesManager(
-            source,
-            this.route.component,
-        ));
+        this.promisedEntries.resolve(new AddonModGlossaryEntriesManager(source, this));
 
         this.sourceUnsubscribe = source.addListener({
             onItemsUpdated: items => this.hasOffline = !!items.find(item => source.isOfflineEntry(item)),
@@ -139,7 +137,7 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
                 this.showLoadingAndRefresh(false);
 
                 // Check completion since it could be configured to complete once the user adds a new entry.
-                CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
+                this.checkCompletion();
             }
         });
 
@@ -166,12 +164,6 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
 
         await this.loadContent(false, true);
         await entries.start(this.splitView);
-
-        try {
-            CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
-        } catch (error) {
-            // Ignore errors.
-        }
     }
 
     /**
@@ -437,6 +429,14 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
  */
 class AddonModGlossaryEntriesManager extends CoreListItemsManager<AddonModGlossaryEntryItem, AddonModGlossaryEntriesSource> {
 
+    page: AddonModGlossaryIndexComponent;
+
+    constructor(source: AddonModGlossaryEntriesSource, page: AddonModGlossaryIndexComponent) {
+        super(source, page.route.component);
+
+        this.page = page;
+    }
+
     get offlineEntries(): AddonModGlossaryOfflineEntry[] {
         return this.getSource().offlineEntries;
     }
@@ -463,7 +463,13 @@ class AddonModGlossaryEntriesManager extends CoreListItemsManager<AddonModGlossa
             return;
         }
 
-        await AddonModGlossary.logView(glossary.id, viewMode, glossary.name);
+        try {
+            await AddonModGlossary.logView(glossary.id, viewMode, glossary.name);
+
+            CoreCourse.checkModuleCompletion(this.page.courseId, this.page.module.completiondata);
+        } catch (error) {
+            // Ignore errors.
+        }
     }
 
 }
diff --git a/src/addons/mod/h5pactivity/components/index/index.ts b/src/addons/mod/h5pactivity/components/index/index.ts
index 834a623a7..217675e4d 100644
--- a/src/addons/mod/h5pactivity/components/index/index.ts
+++ b/src/addons/mod/h5pactivity/components/index/index.ts
@@ -19,7 +19,6 @@ import { CoreConstants } from '@/core/constants';
 import { CoreSite } from '@classes/site';
 import { CoreCourseModuleMainActivityComponent } from '@features/course/classes/main-activity-component';
 import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
-import { CoreCourse } from '@features/course/services/course';
 import { CoreH5PDisplayOptions } from '@features/h5p/classes/core';
 import { CoreH5PHelper } from '@features/h5p/classes/helper';
 import { CoreH5P } from '@features/h5p/services/h5p';
@@ -85,6 +84,7 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
     protected site: CoreSite;
     protected observer?: CoreEventObserver;
     protected messageListenerFunction: (event: MessageEvent) => Promise<void>;
+    protected checkCompletionAfterLog = false; // It's called later, when the user plays the package.
 
     constructor(
         protected content?: IonContent,
@@ -390,7 +390,7 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
         // Mark the activity as viewed.
         await AddonModH5PActivity.logView(this.h5pActivity.id, this.h5pActivity.name, this.siteId);
 
-        CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
+        this.checkCompletion();
     }
 
     /**
@@ -464,7 +464,7 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
                 // Check if the H5P has ended. Final statements don't include a subContentId.
                 const hasEnded = data.statements.some(statement => !statement.object.id.includes('subContentId='));
                 if (hasEnded) {
-                    CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
+                    this.checkCompletion();
                 }
             }
         } catch (error) {
diff --git a/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.ts b/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.ts
index ad89f085f..3b3727a2b 100644
--- a/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.ts
+++ b/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.ts
@@ -45,6 +45,7 @@ export class AddonModH5PActivityAttemptResultsPage implements OnInit {
     cmId!: number;
 
     protected attemptId!: number;
+    protected fetchSuccess = false;
 
     /**
      * @inheritdoc
@@ -62,17 +63,7 @@ export class AddonModH5PActivityAttemptResultsPage implements OnInit {
             return;
         }
 
-        try {
-            await this.fetchData();
-
-            if (this.h5pActivity) {
-                await AddonModH5PActivity.logViewReport(this.h5pActivity.id, this.h5pActivity.name, { attemptId: this.attemptId });
-            }
-        } catch (error) {
-            CoreDomUtils.showErrorModalDefault(error, 'Error loading attempt.');
-        } finally {
-            this.loaded = true;
-        }
+        await this.fetchData();
     }
 
     /**
@@ -92,13 +83,28 @@ export class AddonModH5PActivityAttemptResultsPage implements OnInit {
      * @return Promise resolved when done.
      */
     protected async fetchData(): Promise<void> {
-        this.h5pActivity = await AddonModH5PActivity.getH5PActivity(this.courseId, this.cmId);
+        try {
+            this.h5pActivity = await AddonModH5PActivity.getH5PActivity(this.courseId, this.cmId);
 
-        this.attempt = await AddonModH5PActivity.getAttemptResults(this.h5pActivity.id, this.attemptId, {
-            cmId: this.cmId,
-        });
+            this.attempt = await AddonModH5PActivity.getAttemptResults(this.h5pActivity.id, this.attemptId, {
+                cmId: this.cmId,
+            });
 
-        await this.fetchUserProfile();
+            await this.fetchUserProfile();
+
+            if (!this.fetchSuccess) {
+                this.fetchSuccess = true;
+                CoreUtils.ignoreErrors(AddonModH5PActivity.logViewReport(
+                    this.h5pActivity.id,
+                    this.h5pActivity.name,
+                    { attemptId: this.attemptId },
+                ));
+            }
+        } catch (error) {
+            CoreDomUtils.showErrorModalDefault(error, 'Error loading attempt.');
+        } finally {
+            this.loaded = true;
+        }
     }
 
     /**
diff --git a/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.ts b/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.ts
index 0165feb15..bb95f9fcb 100644
--- a/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.ts
+++ b/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.ts
@@ -46,6 +46,7 @@ export class AddonModH5PActivityUserAttemptsPage implements OnInit {
     isCurrentUser = false;
 
     protected userId!: number;
+    protected fetchSuccess = false;
 
     /**
      * @inheritdoc
@@ -65,17 +66,7 @@ export class AddonModH5PActivityUserAttemptsPage implements OnInit {
 
         this.isCurrentUser = this.userId == CoreSites.getCurrentSiteUserId();
 
-        try {
-            await this.fetchData();
-
-            if (this.h5pActivity) {
-                await AddonModH5PActivity.logViewReport(this.h5pActivity.id, this.h5pActivity.name, { userId: this.userId });
-            }
-        } catch (error) {
-            CoreDomUtils.showErrorModalDefault(error, 'Error loading attempts.');
-        } finally {
-            this.loaded = true;
-        }
+        await this.fetchData();
     }
 
     /**
@@ -95,12 +86,27 @@ export class AddonModH5PActivityUserAttemptsPage implements OnInit {
      * @return Promise resolved when done.
      */
     protected async fetchData(): Promise<void> {
-        this.h5pActivity = await AddonModH5PActivity.getH5PActivity(this.courseId, this.cmId);
+        try {
+            this.h5pActivity = await AddonModH5PActivity.getH5PActivity(this.courseId, this.cmId);
 
-        await Promise.all([
-            this.fetchAttempts(),
-            this.fetchUserProfile(),
-        ]);
+            await Promise.all([
+                this.fetchAttempts(),
+                this.fetchUserProfile(),
+            ]);
+
+            if (!this.fetchSuccess) {
+                this.fetchSuccess = true;
+                CoreUtils.ignoreErrors(AddonModH5PActivity.logViewReport(
+                    this.h5pActivity.id,
+                    this.h5pActivity.name,
+                    { userId: this.userId },
+                ));
+            }
+        } catch (error) {
+            CoreDomUtils.showErrorModalDefault(error, 'Error loading attempts.');
+        } finally {
+            this.loaded = true;
+        }
     }
 
     /**
diff --git a/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.ts b/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.ts
index 0d45c30b5..f50cd056c 100644
--- a/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.ts
+++ b/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.ts
@@ -44,6 +44,7 @@ export class AddonModH5PActivityUsersAttemptsPage implements OnInit {
     canLoadMore = false;
 
     protected page = 0;
+    protected fetchSuccess = false;
 
     /**
      * @inheritdoc
@@ -60,17 +61,7 @@ export class AddonModH5PActivityUsersAttemptsPage implements OnInit {
             return;
         }
 
-        try {
-            await this.fetchData();
-
-            if (this.h5pActivity) {
-                await AddonModH5PActivity.logViewReport(this.h5pActivity.id, this.h5pActivity.name);
-            }
-        } catch (error) {
-            CoreDomUtils.showErrorModalDefault(error, 'Error loading attempts.');
-        } finally {
-            this.loaded = true;
-        }
+        this.fetchData();
     }
 
     /**
@@ -91,11 +82,22 @@ export class AddonModH5PActivityUsersAttemptsPage implements OnInit {
      * @return Promise resolved when done.
      */
     protected async fetchData(refresh?: boolean): Promise<void> {
-        this.h5pActivity = await AddonModH5PActivity.getH5PActivity(this.courseId, this.cmId);
+        try {
+            this.h5pActivity = await AddonModH5PActivity.getH5PActivity(this.courseId, this.cmId);
 
-        await Promise.all([
-            this.fetchUsers(refresh),
-        ]);
+            await Promise.all([
+                this.fetchUsers(refresh),
+            ]);
+
+            if (!this.fetchSuccess) {
+                this.fetchSuccess = true;
+                CoreUtils.ignoreErrors(AddonModH5PActivity.logViewReport(this.h5pActivity.id, this.h5pActivity.name));
+            }
+        } catch (error) {
+            CoreDomUtils.showErrorModalDefault(error, 'Error loading attempts.');
+        } finally {
+            this.loaded = true;
+        }
     }
 
     /**
diff --git a/src/addons/mod/imscp/components/index/index.ts b/src/addons/mod/imscp/components/index/index.ts
index 6d6e501b4..97eff0801 100644
--- a/src/addons/mod/imscp/components/index/index.ts
+++ b/src/addons/mod/imscp/components/index/index.ts
@@ -45,13 +45,6 @@ export class AddonModImscpIndexComponent extends CoreCourseModuleMainResourceCom
         super.ngOnInit();
 
         await this.loadContent();
-
-        try {
-            await AddonModImscp.logView(this.module.instance, this.module.name);
-            CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
-        } catch {
-            // Ignore errors.
-        }
     }
 
     /**
@@ -103,6 +96,13 @@ export class AddonModImscpIndexComponent extends CoreCourseModuleMainResourceCom
         this.items = AddonModImscp.createItemList(contents);
     }
 
+    /**
+     * @inheritdoc
+     */
+    protected async logActivity(): Promise<void> {
+        await AddonModImscp.logView(this.module.instance, this.module.name);
+    }
+
     /**
      * Open IMSCP book with a certain item.
      *
diff --git a/src/addons/mod/lesson/components/index/index.ts b/src/addons/mod/lesson/components/index/index.ts
index 415bf0555..7b41a3d8b 100644
--- a/src/addons/mod/lesson/components/index/index.ts
+++ b/src/addons/mod/lesson/components/index/index.ts
@@ -18,7 +18,6 @@ import { Component, Input, ViewChild, ElementRef, OnInit, OnDestroy, Optional }
 import { CoreTabsComponent } from '@components/tabs/tabs';
 import { CoreCourseModuleMainActivityComponent } from '@features/course/classes/main-activity-component';
 import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
-import { CoreCourse } from '@features/course/services/course';
 import { CoreUser } from '@features/user/services/user';
 import { IonContent, IonInput } from '@ionic/angular';
 import { CoreGroupInfo, CoreGroups } from '@services/groups';
@@ -108,12 +107,6 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo
         this.selectedTab = this.action == 'report' ? 1 : 0;
 
         await this.loadContent(false, true);
-
-        if (!this.lesson || this.preventReasons.length) {
-            return;
-        }
-
-        this.logView();
     }
 
     /**
@@ -285,7 +278,7 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo
     protected hasSyncSucceed(result: AddonModLessonSyncResult): boolean {
         if (result.updated || this.dataSent) {
             // Check completion status if something was sent.
-            CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
+            this.checkCompletion();
         }
 
         this.dataSent = false;
@@ -373,20 +366,14 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo
     }
 
     /**
-     * Log viewing the lesson.
-     *
-     * @return Promise resolved when done.
+     * @inheritdoc
      */
-    protected async logView(): Promise<void> {
-        if (!this.lesson) {
+    protected async logActivity(): Promise<void> {
+        if (!this.lesson || this.preventReasons.length) {
             return;
         }
 
-        await CoreUtils.ignoreErrors(
-            AddonModLesson.logViewLesson(this.lesson.id, this.password, this.lesson.name),
-        );
-
-        CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
+        await AddonModLesson.logViewLesson(this.lesson.id, this.password, this.lesson.name);
     }
 
     /**
@@ -631,7 +618,7 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo
             this.preventReasons = preventReason ? [preventReason] : [];
 
             // Log view now that we have the password.
-            this.logView();
+            this.logActivity();
         } catch (error) {
             CoreDomUtils.showErrorModal(error);
         } finally {
diff --git a/src/addons/mod/page/components/index/index.ts b/src/addons/mod/page/components/index/index.ts
index bbf8ac151..bbcac903a 100644
--- a/src/addons/mod/page/components/index/index.ts
+++ b/src/addons/mod/page/components/index/index.ts
@@ -52,13 +52,6 @@ export class AddonModPageIndexComponent extends CoreCourseModuleMainResourceComp
         super.ngOnInit();
 
         await this.loadContent();
-
-        try {
-            await AddonModPage.logView(this.module.instance, this.module.name);
-            CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
-        } catch {
-            // Ignore errors.
-        }
     }
 
     /**
@@ -118,4 +111,11 @@ export class AddonModPageIndexComponent extends CoreCourseModuleMainResourceComp
         this.timemodified = 'timemodified' in this.page ? this.page.timemodified : undefined;
     }
 
+    /**
+     * @inheritdoc
+     */
+    protected async logActivity(): Promise<void> {
+        await AddonModPage.logView(this.module.instance, this.module.name);
+    }
+
 }
diff --git a/src/addons/mod/quiz/components/index/index.ts b/src/addons/mod/quiz/components/index/index.ts
index d827022de..bae07b503 100644
--- a/src/addons/mod/quiz/components/index/index.ts
+++ b/src/addons/mod/quiz/components/index/index.ts
@@ -17,7 +17,6 @@ import { Component, OnDestroy, OnInit, Optional } from '@angular/core';
 
 import { CoreCourseModuleMainActivityComponent } from '@features/course/classes/main-activity-component';
 import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
-import { CoreCourse } from '@features/course/services/course';
 import { CoreQuestionBehaviourDelegate } from '@features/question/services/behaviour-delegate';
 import { IonContent } from '@ionic/angular';
 import { CoreNavigator } from '@services/navigator';
@@ -121,18 +120,6 @@ export class AddonModQuizIndexComponent extends CoreCourseModuleMainActivityComp
         );
 
         await this.loadContent(false, true);
-
-        if (!this.quiz) {
-            return;
-        }
-
-        try {
-            await AddonModQuiz.logViewQuiz(this.quiz.id, this.quiz.name);
-
-            CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
-        } catch {
-            // Ignore errors.
-        }
     }
 
     /**
@@ -387,6 +374,17 @@ export class AddonModQuizIndexComponent extends CoreCourseModuleMainActivityComp
         }
     }
 
+    /**
+     * @inheritdoc
+     */
+    protected async logActivity(): Promise<void> {
+        if (!this.quiz) {
+            return; // Shouldn't happen.
+        }
+
+        await AddonModQuiz.logViewQuiz(this.quiz.id, this.quiz.name);
+    }
+
     /**
      * Go to review an attempt that has just been finished.
      *
@@ -398,7 +396,7 @@ export class AddonModQuizIndexComponent extends CoreCourseModuleMainActivityComp
         }
 
         // If we go to auto review it means an attempt was finished. Check completion status.
-        CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
+        this.checkCompletion();
 
         // Verify that user can see the review.
         const attemptId = this.autoReview.attemptId;
@@ -425,7 +423,7 @@ export class AddonModQuizIndexComponent extends CoreCourseModuleMainActivityComp
     protected hasSyncSucceed(result: AddonModQuizSyncResult): boolean {
         if (result.attemptFinished) {
             // An attempt was finished, check completion status.
-            CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
+            this.checkCompletion();
         }
 
         // If the sync call isn't rejected it means the sync was successful.
@@ -508,7 +506,7 @@ export class AddonModQuizIndexComponent extends CoreCourseModuleMainActivityComp
 
         if (syncEventData.attemptFinished) {
             // An attempt was finished, check completion status.
-            CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
+            this.checkCompletion();
         }
 
         if (this.quiz && syncEventData.quizId == this.quiz.id) {
diff --git a/src/addons/mod/quiz/pages/review/review.page.ts b/src/addons/mod/quiz/pages/review/review.page.ts
index 04b7bb7a7..e58aac16e 100644
--- a/src/addons/mod/quiz/pages/review/review.page.ts
+++ b/src/addons/mod/quiz/pages/review/review.page.ts
@@ -73,6 +73,7 @@ export class AddonModQuizReviewPage implements OnInit {
     protected attemptId!: number; // The attempt being reviewed.
     protected currentPage!: number; // The current page being reviewed.
     protected options?: AddonModQuizCombinedReviewOptions; // Review options.
+    protected fetchSuccess = false;
 
     constructor(
         protected elementRef: ElementRef,
@@ -99,10 +100,6 @@ export class AddonModQuizReviewPage implements OnInit {
 
         try {
             await this.fetchData();
-
-            CoreUtils.ignoreErrors(
-                AddonModQuiz.logViewAttemptReview(this.attemptId, this.quiz!.id, this.quiz!.name),
-            );
         } finally {
             this.loaded = true;
         }
@@ -160,6 +157,13 @@ export class AddonModQuizReviewPage implements OnInit {
 
             // Load questions.
             await this.loadPage(this.currentPage);
+
+            if (!this.fetchSuccess) {
+                this.fetchSuccess = true;
+                CoreUtils.ignoreErrors(
+                    AddonModQuiz.logViewAttemptReview(this.attemptId, this.quiz.id, this.quiz.name),
+                );
+            }
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'addon.mod_quiz.errorgetquiz', true);
         }
diff --git a/src/addons/mod/resource/components/index/index.ts b/src/addons/mod/resource/components/index/index.ts
index 6c26ec16e..6d6942ca2 100644
--- a/src/addons/mod/resource/components/index/index.ts
+++ b/src/addons/mod/resource/components/index/index.ts
@@ -90,12 +90,6 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
         });
 
         await this.loadContent();
-        try {
-            await AddonModResource.logView(this.module.instance, this.module.name);
-            CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
-        } catch {
-            // Ignore errors.
-        }
     }
 
     /**
@@ -189,6 +183,13 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
         }
     }
 
+    /**
+     * @inheritdoc
+     */
+    protected async logActivity(): Promise<void> {
+        await AddonModResource.logView(this.module.instance, this.module.name);
+    }
+
     /**
      * Opens a file.
      *
diff --git a/src/addons/mod/scorm/components/index/index.ts b/src/addons/mod/scorm/components/index/index.ts
index fcfa22b41..ddc814819 100644
--- a/src/addons/mod/scorm/components/index/index.ts
+++ b/src/addons/mod/scorm/components/index/index.ts
@@ -16,7 +16,6 @@ import { CoreConstants } from '@/core/constants';
 import { Component, OnInit, Optional } from '@angular/core';
 import { CoreCourseModuleMainActivityComponent } from '@features/course/classes/main-activity-component';
 import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
-import { CoreCourse } from '@features/course/services/course';
 import { IonContent } from '@ionic/angular';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSync } from '@services/sync';
@@ -114,21 +113,6 @@ export class AddonModScormIndexComponent extends CoreCourseModuleMainActivityCom
         if (this.skip) {
             this.open();
         }
-
-        try {
-            await AddonModScorm.logView(this.scorm.id, this.scorm.name);
-
-            this.checkCompletion();
-        } catch {
-            // Ignore errors.
-        }
-    }
-
-    /**
-     * Check the completion.
-     */
-    protected checkCompletion(): void {
-        CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
     }
 
     /**
@@ -357,6 +341,17 @@ export class AddonModScormIndexComponent extends CoreCourseModuleMainActivityCom
         this.gradeFormatted = AddonModScorm.formatGrade(scorm, this.grade);
     }
 
+    /**
+     * @inheritdoc
+     */
+    protected async logActivity(): Promise<void> {
+        if (!this.scorm) {
+            return; // Shouldn't happen.
+        }
+
+        await AddonModScorm.logView(this.scorm.id, this.scorm.name);
+    }
+
     /**
      * Checks if sync has succeed from result sync data.
      *
diff --git a/src/addons/mod/survey/components/index/index.ts b/src/addons/mod/survey/components/index/index.ts
index eca06619b..28845b771 100644
--- a/src/addons/mod/survey/components/index/index.ts
+++ b/src/addons/mod/survey/components/index/index.ts
@@ -16,7 +16,6 @@ import { Component, OnInit, Optional } from '@angular/core';
 import { CoreIonLoadingElement } from '@classes/ion-loading';
 import { CoreCourseModuleMainActivityComponent } from '@features/course/classes/main-activity-component';
 import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
-import { CoreCourse } from '@features/course/services/course';
 import { IonContent } from '@ionic/angular';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
@@ -75,13 +74,6 @@ export class AddonModSurveyIndexComponent extends CoreCourseModuleMainActivityCo
         this.currentUserId = CoreSites.getCurrentSiteUserId();
 
         await this.loadContent(false, true);
-
-        try {
-            await AddonModSurvey.logView(this.survey!.id, this.survey!.name);
-            CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
-        } catch {
-            // Ignore errors. Just don't check Module completion.
-        }
     }
 
     /**
@@ -166,6 +158,17 @@ export class AddonModSurveyIndexComponent extends CoreCourseModuleMainActivityCo
         });
     }
 
+    /**
+     * @inheritdoc
+     */
+    protected async logActivity(): Promise<void> {
+        if (!this.survey) {
+            return; // Shouldn't happen.
+        }
+
+        await AddonModSurvey.logView(this.survey.id, this.survey.name);
+    }
+
     /**
      * Check if answers are valid to be submitted.
      *
diff --git a/src/addons/mod/url/components/index/index.ts b/src/addons/mod/url/components/index/index.ts
index b79ee6610..9c253a334 100644
--- a/src/addons/mod/url/components/index/index.ts
+++ b/src/addons/mod/url/components/index/index.ts
@@ -47,6 +47,8 @@ export class AddonModUrlIndexComponent extends CoreCourseModuleMainResourceCompo
     mimetype?: string;
     displayDescription = true;
 
+    protected checkCompletionAfterLog = false;
+
     constructor(@Optional() courseContentsPage?: CoreCourseContentsPage) {
         super('AddonModUrlIndexComponent', courseContentsPage);
     }
@@ -58,12 +60,6 @@ export class AddonModUrlIndexComponent extends CoreCourseModuleMainResourceCompo
         super.ngOnInit();
 
         await this.loadContent();
-
-        if ((this.shouldIframe ||
-            (this.shouldEmbed && this.isOther)) ||
-            (!this.shouldIframe && (!this.shouldEmbed || !this.isOther))) {
-            this.logView();
-        }
     }
 
     /**
@@ -170,12 +166,24 @@ export class AddonModUrlIndexComponent extends CoreCourseModuleMainResourceCompo
     protected async logView(): Promise<void> {
         try {
             await AddonModUrl.logView(this.module.instance, this.module.name);
-            CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
+
+            this.checkCompletion();
         } catch {
             // Ignore errors.
         }
     }
 
+    /**
+     * @inheritdoc
+     */
+    protected async logActivity(): Promise<void> {
+        if ((this.shouldIframe ||
+            (this.shouldEmbed && this.isOther)) ||
+            (!this.shouldIframe && (!this.shouldEmbed || !this.isOther))) {
+            this.logView();
+        }
+    }
+
     /**
      * Opens a file.
      */
diff --git a/src/addons/mod/wiki/components/index/index.ts b/src/addons/mod/wiki/components/index/index.ts
index a9b8780de..bbe537f99 100644
--- a/src/addons/mod/wiki/components/index/index.ts
+++ b/src/addons/mod/wiki/components/index/index.ts
@@ -148,24 +148,6 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
                 this.openMap();
             }
         }
-
-        if (!this.wiki) {
-            CoreNavigator.back();
-
-            return;
-        }
-
-        if (!this.pageId) {
-            try {
-                await AddonModWiki.logView(this.wiki.id, this.wiki.name);
-
-                CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
-            } catch {
-                // Ignore errors.
-            }
-        } else {
-            CoreUtils.ignoreErrors(AddonModWiki.logPageView(this.pageId, this.wiki.id, this.wiki.name));
-        }
     }
 
     /**
@@ -449,6 +431,22 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
         }
     }
 
+    /**
+     * @inheritdoc
+     */
+    protected async logActivity(): Promise<void> {
+        if (!this.wiki) {
+            return; // Shouldn't happen.
+        }
+
+        if (!this.pageId) {
+            await AddonModWiki.logView(this.wiki.id, this.wiki.name);
+        } else {
+            this.checkCompletionAfterLog = false;
+            CoreUtils.ignoreErrors(AddonModWiki.logPageView(this.pageId, this.wiki.id, this.wiki.name));
+        }
+    }
+
     /**
      * Get path to the wiki home view. If cannot determine or it's current view, return undefined.
      *
diff --git a/src/addons/mod/workshop/components/index/index.ts b/src/addons/mod/workshop/components/index/index.ts
index 1376c7433..52808f0a9 100644
--- a/src/addons/mod/workshop/components/index/index.ts
+++ b/src/addons/mod/workshop/components/index/index.ts
@@ -16,7 +16,6 @@ import { Component, Input, OnDestroy, OnInit, Optional } from '@angular/core';
 import { Params } from '@angular/router';
 import { CoreCourseModuleMainActivityComponent } from '@features/course/classes/main-activity-component';
 import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
-import { CoreCourse } from '@features/course/services/course';
 import { IonContent } from '@ionic/angular';
 import { CoreGroupInfo, CoreGroups } from '@services/groups';
 import { CoreNavigator } from '@services/navigator';
@@ -138,16 +137,6 @@ export class AddonModWorkshopIndexComponent extends CoreCourseModuleMainActivity
         super.ngOnInit();
 
         await this.loadContent(false, true);
-        if (!this.workshop) {
-            return;
-        }
-
-        try {
-            await AddonModWorkshop.logView(this.workshop.id, this.workshop.name);
-            CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
-        } catch (error) {
-            // Ignore errors.
-        }
     }
 
     /**
@@ -164,7 +153,7 @@ export class AddonModWorkshopIndexComponent extends CoreCourseModuleMainActivity
             this.showLoadingAndRefresh(true);
 
             // Check completion since it could be configured to complete once the user adds a new discussion or replies.
-            CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
+            this.checkCompletion();
         }
     }
 
@@ -257,6 +246,17 @@ export class AddonModWorkshopIndexComponent extends CoreCourseModuleMainActivity
         await this.setPhaseInfo();
     }
 
+    /**
+     * @inheritdoc
+     */
+    protected async logActivity(): Promise<void> {
+        if (!this.workshop) {
+            return; // Shouldn't happen.
+        }
+
+        await AddonModWorkshop.logView(this.workshop.id, this.workshop.name);
+    }
+
     /**
      * Retrieves and shows submissions grade page.
      *
diff --git a/src/addons/mod/workshop/pages/submission/submission.ts b/src/addons/mod/workshop/pages/submission/submission.ts
index a131065af..e6c1fa6a2 100644
--- a/src/addons/mod/workshop/pages/submission/submission.ts
+++ b/src/addons/mod/workshop/pages/submission/submission.ts
@@ -102,6 +102,7 @@ export class AddonModWorkshopSubmissionPage implements OnInit, OnDestroy, CanLea
     protected obsAssessmentSaved: CoreEventObserver;
     protected syncObserver: CoreEventObserver;
     protected isDestroyed = false;
+    protected fetchSuccess = false;
 
     constructor(
         protected fb: FormBuilder,
@@ -157,12 +158,7 @@ export class AddonModWorkshopSubmissionPage implements OnInit, OnDestroy, CanLea
 
         await this.fetchSubmissionData();
 
-        try {
-            await AddonModWorkshop.logViewSubmission(this.submissionId, this.workshopId, this.workshop.name);
-            CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
-        } catch {
-            // Ignore errors.
-        }
+        this.logView();
     }
 
     /**
@@ -447,6 +443,8 @@ export class AddonModWorkshopSubmissionPage implements OnInit, OnDestroy, CanLea
             CoreEvents.trigger(AddonModWorkshopProvider.ASSESSMENT_INVALIDATED, null, this.siteId);
 
             await this.fetchSubmissionData();
+
+            this.logView();
         }
     }
 
@@ -596,6 +594,24 @@ export class AddonModWorkshopSubmissionPage implements OnInit, OnDestroy, CanLea
         });
     }
 
+    /**
+     * Log submission viewed.
+     */
+    protected async logView(): Promise<void> {
+        if (this.fetchSuccess) {
+            return; // Already done.
+        }
+
+        this.fetchSuccess = true;
+
+        try {
+            await AddonModWorkshop.logViewSubmission(this.submissionId, this.workshopId, this.workshop.name);
+            CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
+        } catch {
+            // Ignore errors.
+        }
+    }
+
     /**
      * Component being destroyed.
      */
diff --git a/src/addons/notes/pages/list/list.page.ts b/src/addons/notes/pages/list/list.page.ts
index be375f2dd..64c0a373d 100644
--- a/src/addons/notes/pages/list/list.page.ts
+++ b/src/addons/notes/pages/list/list.page.ts
@@ -54,6 +54,7 @@ export class AddonNotesListPage implements OnInit, OnDestroy {
     currentUserId!: number;
 
     protected syncObserver!: CoreEventObserver;
+    protected logAfterFetch = true;
 
     constructor() {
         try {
@@ -91,8 +92,6 @@ export class AddonNotesListPage implements OnInit, OnDestroy {
      */
     async ngOnInit(): Promise<void> {
         await this.fetchNotes(true);
-
-        CoreUtils.ignoreErrors(AddonNotes.logView(this.courseId, this.userId));
     }
 
     /**
@@ -128,6 +127,11 @@ export class AddonNotesListPage implements OnInit, OnDestroy {
             } else {
                 this.notes = await AddonNotes.getNotesUserData(notesList);
             }
+
+            if (this.logAfterFetch) {
+                this.logAfterFetch = false;
+                CoreUtils.ignoreErrors(AddonNotes.logView(this.courseId, this.userId));
+            }
         } catch (error) {
             CoreDomUtils.showErrorModal(error);
         } finally {
@@ -172,9 +176,9 @@ export class AddonNotesListPage implements OnInit, OnDestroy {
         this.notesLoaded = false;
         this.refreshIcon = CoreConstants.ICON_LOADING;
         this.syncIcon = CoreConstants.ICON_LOADING;
+        this.logAfterFetch = true;
 
         await this.fetchNotes(true);
-        CoreUtils.ignoreErrors(AddonNotes.logView(this.courseId, this.userId));
     }
 
     /**
diff --git a/src/core/classes/items-management/list-items-manager.ts b/src/core/classes/items-management/list-items-manager.ts
index 4fae782f3..aceac334a 100644
--- a/src/core/classes/items-management/list-items-manager.ts
+++ b/src/core/classes/items-management/list-items-manager.ts
@@ -34,6 +34,7 @@ export class CoreListItemsManager<
     protected pageRouteLocator?: unknown | ActivatedRoute;
     protected splitView?: CoreSplitViewComponent;
     protected splitViewOutletSubscription?: Subscription;
+    protected fetchSuccess = false; // Whether a fetch was finished successfully.
 
     constructor(source: Source, pageRouteLocator: unknown | ActivatedRoute) {
         super(source);
@@ -71,9 +72,6 @@ export class CoreListItemsManager<
 
         // Calculate current selected item.
         this.updateSelectedItem();
-
-        // Log activity.
-        await CoreUtils.ignoreErrors(this.logActivity());
     }
 
     /**
@@ -145,6 +143,8 @@ export class CoreListItemsManager<
      */
     async reload(): Promise<void> {
         await this.getSource().reload();
+
+        this.finishSuccessfulFetch();
     }
 
     /**
@@ -152,6 +152,21 @@ export class CoreListItemsManager<
      */
     async load(): Promise<void> {
         await this.getSource().load();
+
+        this.finishSuccessfulFetch();
+    }
+
+    /**
+     * Finish a successful fetch.
+     */
+    protected async finishSuccessfulFetch(): Promise<void> {
+        if (this.fetchSuccess) {
+            return; // Already treated.
+        }
+
+        // Log activity.
+        this.fetchSuccess = true;
+        await CoreUtils.ignoreErrors(this.logActivity());
     }
 
     /**
diff --git a/src/core/features/course/classes/main-activity-component.ts b/src/core/features/course/classes/main-activity-component.ts
index e41b66bfb..adcd02751 100644
--- a/src/core/features/course/classes/main-activity-component.ts
+++ b/src/core/features/course/classes/main-activity-component.ts
@@ -169,6 +169,8 @@ export class CoreCourseModuleMainActivityComponent extends CoreCourseModuleMainR
             }
 
             await this.fetchContent(refresh, sync, showErrors);
+
+            this.finishSuccessfulFetch();
         } catch (error) {
             if (!refresh && !CoreSites.getCurrentSite()?.isOfflineDisabled() && this.isNotFoundError(error)) {
                 // Module not found, retry without using cache.
diff --git a/src/core/features/course/classes/main-resource-component.ts b/src/core/features/course/classes/main-resource-component.ts
index 2a0eed662..1c3d9600f 100644
--- a/src/core/features/course/classes/main-resource-component.ts
+++ b/src/core/features/course/classes/main-resource-component.ts
@@ -72,6 +72,8 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
     protected showCompletion = false; // Whether to show completion inside the activity.
     protected displayDescription = true; // Wether to show Module description on module page, and not on summary or the contrary.
     protected isDestroyed = false; // Whether the component is destroyed.
+    protected fetchSuccess = false; // Whether a fetch was finished successfully.
+    protected checkCompletionAfterLog = true; // Whether to check if completion has changed after calling logActivity.
 
     constructor(
         @Optional() @Inject('') loggerName: string = 'CoreCourseModuleMainResourceComponent',
@@ -191,6 +193,8 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
 
         try {
             await this.fetchContent(refresh);
+
+            this.finishSuccessfulFetch();
         } catch (error) {
             if (!refresh && !CoreSites.getCurrentSite()?.isOfflineDisabled() && this.isNotFoundError(error)) {
                 // Module not found, retry without using cache.
@@ -427,6 +431,46 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
         }
     }
 
+    /**
+     * Finish a successful fetch.
+     *
+     * @return Promise resolved when done.
+     */
+    protected async finishSuccessfulFetch(): Promise<void> {
+        if (this.fetchSuccess) {
+            return; // Already treated.
+        }
+
+        this.fetchSuccess = true;
+
+        // Log activity now.
+        try {
+            await this.logActivity();
+
+            if (this.checkCompletionAfterLog) {
+                this.checkCompletion();
+            }
+        } catch {
+            // Ignore errors.
+        }
+    }
+
+    /**
+     * Log activity.
+     *
+     * @return Promise resolved when done.
+     */
+    protected async logActivity(): Promise<void> {
+        // To be overridden.
+    }
+
+    /**
+     * Check the module completion.
+     */
+    protected checkCompletion(): void {
+        CoreCourse.checkModuleCompletion(this.courseId, this.module.completiondata);
+    }
+
     /**
      * Component being destroyed.
      */
diff --git a/src/core/features/grades/pages/course/course.page.ts b/src/core/features/grades/pages/course/course.page.ts
index 22fadfa71..f877aba9c 100644
--- a/src/core/features/grades/pages/course/course.page.ts
+++ b/src/core/features/grades/pages/course/course.page.ts
@@ -54,6 +54,8 @@ export class CoreGradesCoursePage implements AfterViewInit, OnDestroy {
     totalColumnsSpan?: number;
     withinSplitView?: boolean;
 
+    protected fetchSuccess = false;
+
     constructor(
         protected route: ActivatedRoute,
         protected element: ElementRef<HTMLElement>,
@@ -93,7 +95,6 @@ export class CoreGradesCoursePage implements AfterViewInit, OnDestroy {
 
         await this.courses?.start();
         await this.fetchInitialGrades();
-        await CoreGrades.logCourseGradesView(this.courseId, this.userId);
     }
 
     /**
@@ -198,6 +199,11 @@ export class CoreGradesCoursePage implements AfterViewInit, OnDestroy {
         this.columns = formattedTable.columns;
         this.rows = formattedTable.rows;
         this.totalColumnsSpan = formattedTable.columns.reduce((total, column) => total + column.colspan, 0);
+
+        if (!this.fetchSuccess) {
+            this.fetchSuccess = true;
+            await CoreGrades.logCourseGradesView(this.courseId, this.userId);
+        }
     }
 
 }
diff --git a/src/core/features/sitehome/pages/index/index.ts b/src/core/features/sitehome/pages/index/index.ts
index 087589a5d..dbfc682e8 100644
--- a/src/core/features/sitehome/pages/index/index.ts
+++ b/src/core/features/sitehome/pages/index/index.ts
@@ -54,6 +54,7 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
     newsForumModule?: CoreCourseModuleData;
 
     protected updateSiteObserver: CoreEventObserver;
+    protected fetchSuccess = false;
 
     constructor() {
         // Refresh the enabled flags if site is updated.
@@ -137,13 +138,15 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
                 this.hasContent = result.hasContent || this.hasContent;
             }
 
-            // Add log in Moodle.
-            CoreUtils.ignoreErrors(CoreCourse.logView(
-                this.siteHomeId,
-                undefined,
-                undefined,
-                this.currentSite.getInfo()?.sitename,
-            ));
+            if (!this.fetchSuccess) {
+                this.fetchSuccess = true;
+                CoreUtils.ignoreErrors(CoreCourse.logView(
+                    this.siteHomeId,
+                    undefined,
+                    undefined,
+                    this.currentSite.getInfo()?.sitename,
+                ));
+            }
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'core.course.couldnotloadsectioncontent', true);
         }
diff --git a/src/core/features/user/pages/profile/profile.page.ts b/src/core/features/user/pages/profile/profile.page.ts
index ba3061238..b22146d00 100644
--- a/src/core/features/user/pages/profile/profile.page.ts
+++ b/src/core/features/user/pages/profile/profile.page.ts
@@ -48,6 +48,7 @@ export class CoreUserProfilePage implements OnInit, OnDestroy {
     protected site!: CoreSite;
     protected obsProfileRefreshed: CoreEventObserver;
     protected subscription?: Subscription;
+    protected fetchSuccess = false;
 
     userLoaded = false;
     isLoadingHandlers = false;
@@ -106,18 +107,6 @@ export class CoreUserProfilePage implements OnInit, OnDestroy {
 
         try {
             await this.fetchUser();
-
-            if (!this.user) {
-                return;
-            }
-
-            try {
-                await CoreUser.logView(this.userId, this.courseId, this.user.fullname);
-            } catch (error) {
-                this.isDeleted = error?.errorcode === 'userdeleted' || error?.errorcode === 'wsaccessuserdeleted';
-                this.isSuspended = error?.errorcode === 'wsaccessusersuspended';
-                this.isEnrolled = error?.errorcode !== 'notenrolledprofile';
-            }
         } finally {
             this.userLoaded = true;
         }
@@ -162,6 +151,18 @@ export class CoreUserProfilePage implements OnInit, OnDestroy {
                 this.isLoadingHandlers = !CoreUserDelegate.areHandlersLoaded(user.id, context, this.courseId);
             });
 
+            if (!this.fetchSuccess) {
+                this.fetchSuccess = true;
+
+                try {
+                    await CoreUser.logView(this.userId, this.courseId, this.user.fullname);
+                } catch (error) {
+                    this.isDeleted = error?.errorcode === 'userdeleted' || error?.errorcode === 'wsaccessuserdeleted';
+                    this.isSuspended = error?.errorcode === 'wsaccessusersuspended';
+                    this.isEnrolled = error?.errorcode !== 'notenrolledprofile';
+                }
+            }
+
         } catch (error) {
             // Error is null for deleted users, do not show the modal.
             CoreDomUtils.showErrorModal(error);

From e39520e96fe21688b30e4f3e855ff3bd59128557 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 7 Mar 2022 12:04:01 +0100
Subject: [PATCH 0659/1008] MOBILE-3814 module: Show text on module navigation

---
 .../module-navigation/core-course-module-navigation.html    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/core/features/course/components/module-navigation/core-course-module-navigation.html b/src/core/features/course/components/module-navigation/core-course-module-navigation.html
index 6b092bfb8..5ca66de46 100644
--- a/src/core/features/course/components/module-navigation/core-course-module-navigation.html
+++ b/src/core/features/course/components/module-navigation/core-course-module-navigation.html
@@ -3,13 +3,15 @@
         <ion-col size="auto" class="ion-no-padding core-course-module-navigation-arrow">
             <ion-button fill="clear" class="core-course-previous-module" [disabled]="!previousModule" (click)="goToActivity(false)"
                 [attr.aria-label]="'core.course.gotopreviousactivity' | translate">
-                <ion-icon name="fas-arrow-left" slot="icon-only" aria-hidden="true"></ion-icon>
+                <ion-icon name="fas-arrow-left" slot="start" aria-hidden="true"></ion-icon>
+                {{ 'core.previous' | translate }}
             </ion-button>
         </ion-col>
         <ion-col size="auto" class="ion-no-padding core-course-module-navigation-arrow">
             <ion-button fill="clear" class="core-course-next-module" [disabled]="!nextModule" (click)="goToActivity(true)"
                 [attr.aria-label]="'core.course.gotonextactivity' | translate">
-                <ion-icon name="fas-arrow-right" slot="icon-only" aria-hidden="true"></ion-icon>
+                {{ 'core.next' | translate }}
+                <ion-icon name="fas-arrow-right" slot="end" aria-hidden="true"></ion-icon>
             </ion-button>
         </ion-col>
     </ion-row>

From d52fc9b6666f8a97a2fe6d82bc49e223617012ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 7 Mar 2022 12:20:23 +0100
Subject: [PATCH 0660/1008] MOBILE-3814 module: Change description position
 inside module info

---
 .../module-info/core-course-module-info.html    | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/core/features/course/components/module-info/core-course-module-info.html b/src/core/features/course/components/module-info/core-course-module-info.html
index 6078a0650..430c40a72 100644
--- a/src/core/features/course/components/module-info/core-course-module-info.html
+++ b/src/core/features/course/components/module-info/core-course-module-info.html
@@ -13,14 +13,6 @@
         <ng-content select="[title]"></ng-content>
     </ion-label>
 </ion-item>
-<ion-item class="ion-text-wrap" *ngIf="description">
-    <ion-label>
-        <core-format-text [text]="description" [component]="component" [componentId]="componentId" contextLevel="module"
-            [contextInstanceId]="module.id" [courseId]="courseId" [maxHeight]="expandDescription ? null : 120">
-        </core-format-text>
-    </ion-label>
-</ion-item>
-<ng-content select="[description]"></ng-content>
 
 <!-- Module completion. -->
 <ion-item class="ion-text-wrap"
@@ -51,6 +43,15 @@
     </div>
 </div>
 
+<ion-item class="ion-text-wrap" *ngIf="description">
+    <ion-label>
+        <core-format-text [text]="description" [component]="component" [componentId]="componentId" contextLevel="module"
+            [contextInstanceId]="module.id" [courseId]="courseId" [maxHeight]="expandDescription ? null : 120">
+        </core-format-text>
+    </ion-label>
+</ion-item>
+<ng-content select="[description]"></ng-content>
+
 <ng-content></ng-content>
 
 <!-- Activity has something offline. -->

From ddd82378aa600d0e2c196453f492008431b067e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 7 Mar 2022 13:12:11 +0100
Subject: [PATCH 0661/1008] MOBILE-3814 collapsible: Change frozen status
 calculation

---
 src/core/directives/collapsible-header.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts
index dab6b839c..8dab80acb 100644
--- a/src/core/directives/collapsible-header.ts
+++ b/src/core/directives/collapsible-header.ts
@@ -363,8 +363,7 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
             }
 
             const scrollableHeight = contentScroll.scrollHeight - contentScroll.clientHeight;
-            const collapsedHeight = expandedHeaderHeight - (expandedHeader.clientHeight ?? 0);
-            const frozen = scrollableHeight + collapsedHeight <= 2 * expandedHeaderHeight;
+            const frozen = scrollableHeight <=  scrollingHeight;
             const progress = frozen
                 ? 0
                 :  CoreMath.clamp(contentScroll.scrollTop / scrollingHeight, 0, 1);
@@ -377,7 +376,7 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
                 .entries(progress > .5 ? collapsedFontStyles : expandedFontStyles)
                 .forEach(([property, value]) => floatingTitle.style.setProperty(property, value as string));
 
-            if (progress > 0 || progress < 1) {
+            if (progress > 0 && progress < 1) {
                 // Finish opening or closing the bar.
                 this.endAnimationTimeout = window.setTimeout(() => this.endAnimation(progress), 500);
             }

From 1c9f34b469eb7b119942ad9a8c5cbc7242bd585c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 7 Mar 2022 13:19:21 +0100
Subject: [PATCH 0662/1008] MOBILE-3814 collapsible: Animate collapse header
 end animation

---
 src/core/directives/collapsible-header.ts | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts
index 8dab80acb..9bb83a3ca 100644
--- a/src/core/directives/collapsible-header.ts
+++ b/src/core/directives/collapsible-header.ts
@@ -378,7 +378,7 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
 
             if (progress > 0 && progress < 1) {
                 // Finish opening or closing the bar.
-                this.endAnimationTimeout = window.setTimeout(() => this.endAnimation(progress), 500);
+                this.endAnimationTimeout = window.setTimeout(() => this.endAnimation(progress, contentScroll.scrollTop), 500);
             }
         });
     }
@@ -387,8 +387,9 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
      * End of animation when stop scrolling.
      *
      * @param progress Progress.
+     * @param scrollTop Current ScrollTop position.
      */
-    protected endAnimation(progress: number): void {
+    protected endAnimation(progress: number, scrollTop: number): void {
         if(!this.page) {
             return;
         }
@@ -397,6 +398,14 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
 
         this.page.style.setProperty('--collapsible-header-progress', collapse ? '1' : '0');
         this.page.classList.toggle('is-collapsed', collapse);
+
+        if (collapse && this.scrollingHeight && this.scrollingHeight > 0 && scrollTop < this.scrollingHeight) {
+            this.content?.scrollToPoint(null, this.scrollingHeight);
+        }
+
+        if (!collapse && this.scrollingHeight && this.scrollingHeight > 0 && scrollTop > 0) {
+            this.content?.scrollToPoint(null, 0);
+        }
     }
 
 }

From 18696269e0d2a4280cca4f422ddb4d448aee0bb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 7 Mar 2022 12:04:32 +0100
Subject: [PATCH 0663/1008] MOBILE-3814 collapsible: Add appear on bottom
 attribute to footer

---
 .../mod/book/components/index/addon-mod-book-index.html  | 2 +-
 .../folder/components/index/addon-mod-folder-index.html  | 2 +-
 .../imscp/components/index/addon-mod-imscp-index.html    | 2 +-
 .../mod/page/components/index/addon-mod-page-index.html  | 2 +-
 .../components/index/addon-mod-resource-index.html       | 2 +-
 .../mod/url/components/index/addon-mod-url-index.html    | 2 +-
 src/core/directives/collapsible-footer.ts                | 9 +++++++--
 .../course/pages/module-preview/module-preview.html      | 2 +-
 .../module-index/core-siteplugins-module-index.html      | 3 ++-
 .../siteplugins/components/module-index/module-index.ts  | 4 ++++
 10 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/addons/mod/book/components/index/addon-mod-book-index.html b/src/addons/mod/book/components/index/addon-mod-book-index.html
index 8018382c7..4727f8e6c 100644
--- a/src/addons/mod/book/components/index/addon-mod-book-index.html
+++ b/src/addons/mod/book/components/index/addon-mod-book-index.html
@@ -33,7 +33,7 @@
         </ion-item>
     </ion-list>
 
-    <div collapsible-footer *ngIf="!showLoading" slot="fixed">
+    <div collapsible-footer appearOnBottom *ngIf="!showLoading" slot="fixed">
         <div class="list-item-limited-width">
             <ion-button expand="block" (click)="openBook()" class="ion-margin ion-text-wrap">
                 <span *ngIf="!hasStartedBook">{{ 'core.start' | translate }}</span>
diff --git a/src/addons/mod/folder/components/index/addon-mod-folder-index.html b/src/addons/mod/folder/components/index/addon-mod-folder-index.html
index 9b5ac6cad..d9e0cf63d 100644
--- a/src/addons/mod/folder/components/index/addon-mod-folder-index.html
+++ b/src/addons/mod/folder/components/index/addon-mod-folder-index.html
@@ -32,6 +32,6 @@
 
 </core-loading>
 
-<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModuleId]="module.id"
+<core-course-module-navigation collapsible-footer appearOnBottom [hidden]="showLoading" [courseId]="courseId" [currentModuleId]="module.id"
     (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
index c8916bc9b..67c59580d 100644
--- a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
+++ b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
@@ -30,7 +30,7 @@
         </ion-item>
     </ion-list>
 
-    <div collapsible-footer *ngIf="!showLoading" slot="fixed">
+    <div collapsible-footer appearOnBottom *ngIf="!showLoading" slot="fixed">
         <div class="list-item-limited-width">
             <ion-button class="ion-margin ion-text-wrap" expand="block" (click)="openImscp()">
                 <span *ngIf="!hasStarted">{{ 'core.start' | translate }}</span>
diff --git a/src/addons/mod/page/components/index/addon-mod-page-index.html b/src/addons/mod/page/components/index/addon-mod-page-index.html
index 0e92db006..b93d43391 100644
--- a/src/addons/mod/page/components/index/addon-mod-page-index.html
+++ b/src/addons/mod/page/components/index/addon-mod-page-index.html
@@ -32,5 +32,5 @@
 
 </core-loading>
 
-<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModuleId]="module.id">
+<core-course-module-navigation collapsible-footer appearOnBottom [hidden]="showLoading" [courseId]="courseId" [currentModuleId]="module.id">
 </core-course-module-navigation>
diff --git a/src/addons/mod/resource/components/index/addon-mod-resource-index.html b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
index 9ce2df420..fd4d8b5b5 100644
--- a/src/addons/mod/resource/components/index/addon-mod-resource-index.html
+++ b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
@@ -79,7 +79,7 @@
         </ion-list>
     </ng-container>
 
-    <div collapsible-footer *ngIf="!showLoading" slot="fixed">
+    <div collapsible-footer appearOnBottom *ngIf="!showLoading" slot="fixed">
         <div class="list-item-limited-width" *ngIf="mode == 'external'">
             <ion-button expand="block" (click)="open(openFileAction.OPEN)" class="ion-margin ion-text-wrap">
                 <ng-container *ngIf="isStreamedFile">
diff --git a/src/addons/mod/url/components/index/addon-mod-url-index.html b/src/addons/mod/url/components/index/addon-mod-url-index.html
index 085321c3f..6b29fa18c 100644
--- a/src/addons/mod/url/components/index/addon-mod-url-index.html
+++ b/src/addons/mod/url/components/index/addon-mod-url-index.html
@@ -37,7 +37,7 @@
         </ion-item>
     </ion-list>
 
-    <div collapsible-footer *ngIf="!showLoading" slot="fixed">
+    <div collapsible-footer appearOnBottom *ngIf="!showLoading" slot="fixed">
         <div class="list-item-limited-width" *ngIf="url && !shouldIframe && (!shouldEmbed || !isOther)">
             <ion-button expand="block" (click)="go()" class="ion-margin ion-text-wrap">
                 <ion-icon name="fas-link" slot="start" aria-hidden="true"></ion-icon>
diff --git a/src/core/directives/collapsible-footer.ts b/src/core/directives/collapsible-footer.ts
index 976e65827..b9dc775bd 100644
--- a/src/core/directives/collapsible-footer.ts
+++ b/src/core/directives/collapsible-footer.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Directive, ElementRef, OnDestroy, OnInit } from '@angular/core';
+import { Directive, ElementRef, Input, OnDestroy, OnInit } from '@angular/core';
 import { ScrollDetail } from '@ionic/core';
 import { IonContent } from '@ionic/angular';
 import { CoreUtils } from '@services/utils/utils';
@@ -34,6 +34,8 @@ import { CoreEventLoadingChangedData, CoreEventObserver, CoreEvents } from '@sin
 })
 export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
 
+    @Input() appearOnBottom = false;
+
     protected element: HTMLElement;
     protected initialHeight = 0;
     protected initialPaddingBottom = '0px';
@@ -127,7 +129,7 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
      */
     protected onScroll(scrollDetail: ScrollDetail, scrollElement: HTMLElement): void {
         const maxScroll = scrollElement.scrollHeight - scrollElement.offsetHeight;
-        if (scrollDetail.scrollTop <= 0 || scrollDetail.scrollTop >= maxScroll) {
+        if (scrollDetail.scrollTop <= 0 || (this.appearOnBottom && scrollDetail.scrollTop >= maxScroll)) {
             // Reset.
             this.setBarHeight(this.initialHeight);
         } else {
@@ -181,6 +183,9 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
 
         this.listenScrollEvents();
 
+        // Only if not present or explicitly falsy it will be false.
+        this.appearOnBottom = !CoreUtils.isFalseOrZero(this.appearOnBottom);
+
         // Recalculate the height if a parent core-loading displays the content.
         this.loadingChangedListener =
             CoreEvents.on(CoreEvents.CORE_LOADING_CHANGED, async (data: CoreEventLoadingChangedData) => {
diff --git a/src/core/features/course/pages/module-preview/module-preview.html b/src/core/features/course/pages/module-preview/module-preview.html
index 11cfb10da..2dfdb164f 100644
--- a/src/core/features/course/pages/module-preview/module-preview.html
+++ b/src/core/features/course/pages/module-preview/module-preview.html
@@ -45,6 +45,6 @@
         <core-course-unsupported-module *ngIf="unsupported" [module]="module"></core-course-unsupported-module>
     </core-loading>
 
-    <core-course-module-navigation collapsible-footer [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
+    <core-course-module-navigation collapsible-footer appearOnBottom [hidden]="!loaded" [courseId]="courseId" [currentModuleId]="module.id">
     </core-course-module-navigation>
 </ion-content>
diff --git a/src/core/features/siteplugins/components/module-index/core-siteplugins-module-index.html b/src/core/features/siteplugins/components/module-index/core-siteplugins-module-index.html
index 287220e84..aeb66ed8c 100644
--- a/src/core/features/siteplugins/components/module-index/core-siteplugins-module-index.html
+++ b/src/core/features/siteplugins/components/module-index/core-siteplugins-module-index.html
@@ -14,5 +14,6 @@
     (onLoadingContent)="contentLoading()">
 </core-site-plugins-plugin-content>
 
-<core-course-module-navigation collapsible-footer *ngIf="module" [courseId]="courseId" [currentModuleId]="module.id">
+<core-course-module-navigation collapsible-footer [appearOnBottom]="collapsibleFooterAppearOnBottom" *ngIf="module" [courseId]="courseId"
+    [currentModuleId]="module.id">
 </core-course-module-navigation>
diff --git a/src/core/features/siteplugins/components/module-index/module-index.ts b/src/core/features/siteplugins/components/module-index/module-index.ts
index 3e15a13dc..bbaebb0d2 100644
--- a/src/core/features/siteplugins/components/module-index/module-index.ts
+++ b/src/core/features/siteplugins/components/module-index/module-index.ts
@@ -85,6 +85,8 @@ export class CoreSitePluginsModuleIndexComponent implements OnInit, OnDestroy, C
      */
     size?: string;
 
+    collapsibleFooterAppearOnBottom = true;
+
     displayOpenInBrowser = true;
     displayDescription = true;
     displayRefresh = true;
@@ -133,6 +135,8 @@ export class CoreSitePluginsModuleIndexComponent implements OnInit, OnDestroy, C
             this.displaySize = !CoreUtils.isFalseOrZero(handlerSchema.displaysize);
             this.displayGrades = CoreUtils.isTrueOrOne(handlerSchema.displaygrades); // False by default.
             this.ptrEnabled = !CoreUtils.isFalseOrZero(handlerSchema.ptrenabled);
+
+            this.collapsibleFooterAppearOnBottom = !CoreUtils.isFalseOrZero(handlerSchema.isresource);
         }
 
         // Get the data for the context menu.

From 09cd1af733077c1e710dca3be3413e57a6a6b29d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 7 Mar 2022 15:36:56 +0100
Subject: [PATCH 0664/1008] MOBILE-3814 collapsible: Do not collapse main
 action buttons

---
 src/core/directives/collapsible-footer.ts | 21 ++++++++++++++++-----
 src/theme/theme.base.scss                 | 10 ++++++++++
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/core/directives/collapsible-footer.ts b/src/core/directives/collapsible-footer.ts
index b9dc775bd..e9fcb9d6b 100644
--- a/src/core/directives/collapsible-footer.ts
+++ b/src/core/directives/collapsible-footer.ts
@@ -38,6 +38,7 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
 
     protected element: HTMLElement;
     protected initialHeight = 0;
+    protected finalHeight = 0;
     protected initialPaddingBottom = '0px';
     protected previousTop = 0;
     protected previousHeight = 0;
@@ -60,6 +61,12 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
 
         // Set a minimum height value.
         this.initialHeight = this.element.getBoundingClientRect().height || 48;
+        const moduleNav = this.element.querySelector('core-course-module-navigation');
+        if (moduleNav) {
+            this.element.classList.add('has-module-nav');
+            this.finalHeight = this.initialHeight - (moduleNav.getBoundingClientRect().height);
+        }
+
         this.previousHeight = this.initialHeight;
 
         this.content?.style.setProperty('--core-collapsible-footer-max-height', this.initialHeight + 'px');
@@ -134,7 +141,7 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
             this.setBarHeight(this.initialHeight);
         } else {
             let newHeight = this.previousHeight - (scrollDetail.scrollTop - this.previousTop);
-            newHeight = CoreMath.clamp(newHeight, 0, this.initialHeight);
+            newHeight = CoreMath.clamp(newHeight, this.finalHeight, this.initialHeight);
 
             this.setBarHeight(newHeight);
         }
@@ -151,12 +158,14 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
             clearTimeout(this.endAnimationTimeout);
         }
 
-        this.element.classList.toggle('footer-collapsed', height <= 0);
-        this.element.classList.toggle('footer-expanded', height >= this.initialHeight);
+        const collapsed = height <= this.finalHeight;
+        const expanded = height >= this.initialHeight;
+        this.element.classList.toggle('footer-collapsed', collapsed);
+        this.element.classList.toggle('footer-expanded', expanded);
         this.content?.style.setProperty('--core-collapsible-footer-height', height + 'px');
         this.previousHeight = height;
 
-        if (height > 0 && height < this.initialHeight) {
+        if (!collapsed && !expanded) {
             // Finish opening or closing the bar.
             this.endAnimationTimeout = window.setTimeout(() => this.endAnimation(height), 500);
         }
@@ -168,7 +177,9 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
      * @param height Last height used.
      */
     protected endAnimation(height: number): void {
-        const newHeight = height < this.initialHeight / 2 ? 0 : this.initialHeight;
+        const newHeight = (height - this.finalHeight) < (this.initialHeight - this.finalHeight) / 2
+            ? this.finalHeight
+            : this.initialHeight;
 
         this.setBarHeight(newHeight);
     }
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index e39774de1..8f5230675 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -1428,6 +1428,16 @@ ion-grid.core-no-grid > ion-row {
         --core-collapsible-footer-height: 0;
         opacity: 0;
     }
+    &.has-module-nav.footer-collapsed {
+        --core-collapsible-footer-height: auto;
+        opacity: 1;
+        core-course-module-navigation {
+            height: 0;
+            opacity: 0;
+            @include core-transition(all, 200ms);
+        }
+
+    }
     &.footer-expanded {
         --core-collapsible-footer-height: auto;
     }

From 112f00bcb51a73c1113204ae7e95d0e0f7d160a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 8 Mar 2022 11:25:37 +0100
Subject: [PATCH 0665/1008] MOBILE-3814 format-text: collapsible item directive
 replaces maxHeight

---
 .../addon-mod-assign-feedback-plugin.html     |   2 +-
 .../addon-mod-assign-submission-plugin.html   |   2 +-
 .../addon-mod-assign-feedback-comments.html   |   4 +-
 ...ddon-mod-assign-submission-onlinetext.html |   4 +-
 .../lesson/pages/user-retake/user-retake.html |   2 +-
 .../index/addon-mod-workshop-index.html       |  10 +-
 src/addons/notifications/pages/list/list.html |   2 +-
 src/core/directives/collapsible-item.ts       |  41 +++--
 src/core/directives/format-text.ts            | 170 +++---------------
 .../core-course-module-description.html       |   2 +-
 .../module-info/core-course-module-info.html  |   2 +-
 .../module-summary/module-summary.html        |   4 +-
 .../pages/course-summary/course-summary.html  |   5 +-
 .../courses/pages/categories/categories.html  |   2 +-
 .../features/grades/pages/course/course.html  |   4 +-
 src/theme/components/collapsible-item.scss    |  82 +++++++++
 src/theme/components/format-text.scss         |  39 +---
 src/theme/globals.mixins.scss                 |  72 --------
 src/theme/theme.base.scss                     |   4 -
 src/theme/theme.scss                          |   1 +
 20 files changed, 166 insertions(+), 288 deletions(-)
 create mode 100644 src/theme/components/collapsible-item.scss

diff --git a/src/addons/mod/assign/components/feedback-plugin/addon-mod-assign-feedback-plugin.html b/src/addons/mod/assign/components/feedback-plugin/addon-mod-assign-feedback-plugin.html
index fce2551b7..413cb3751 100644
--- a/src/addons/mod/assign/components/feedback-plugin/addon-mod-assign-feedback-plugin.html
+++ b/src/addons/mod/assign/components/feedback-plugin/addon-mod-assign-feedback-plugin.html
@@ -8,7 +8,7 @@
                     {{ 'addon.mod_assign.feedbacknotsupported' | translate }}
                 </ion-badge>
                 <p *ngIf="text">
-                    <core-format-text [component]="component" [componentId]="assign.cmid" [maxHeight]="120" [text]="text"
+                    <core-format-text [component]="component" [componentId]="assign.cmid" [collapsible-item]="120" [text]="text"
                         contextLevel="module" [contextInstanceId]="assign.cmid" [courseId]="assign.course">
                     </core-format-text>
                 </p>
diff --git a/src/addons/mod/assign/components/submission-plugin/addon-mod-assign-submission-plugin.html b/src/addons/mod/assign/components/submission-plugin/addon-mod-assign-submission-plugin.html
index 0359f704c..e466eb7b5 100644
--- a/src/addons/mod/assign/components/submission-plugin/addon-mod-assign-submission-plugin.html
+++ b/src/addons/mod/assign/components/submission-plugin/addon-mod-assign-submission-plugin.html
@@ -8,7 +8,7 @@
                     {{ 'addon.mod_assign.submissionnotsupported' | translate }}
                 </ion-badge>
                 <p *ngIf="text">
-                    <core-format-text [component]="component" [componentId]="assign.cmid" [maxHeight]="120" [text]="text"
+                    <core-format-text [component]="component" [componentId]="assign.cmid" [collapsible-item]="120" [text]="text"
                         contextLevel="module" [contextInstanceId]="assign.cmid" [courseId]="assign.course">
                     </core-format-text>
                 </p>
diff --git a/src/addons/mod/assign/feedback/comments/component/addon-mod-assign-feedback-comments.html b/src/addons/mod/assign/feedback/comments/component/addon-mod-assign-feedback-comments.html
index d622f39aa..3bcfbbb0f 100644
--- a/src/addons/mod/assign/feedback/comments/component/addon-mod-assign-feedback-comments.html
+++ b/src/addons/mod/assign/feedback/comments/component/addon-mod-assign-feedback-comments.html
@@ -3,8 +3,8 @@
     <ion-label>
         <h2>{{ plugin.name }}</h2>
         <p>
-            <core-format-text [component]="component" [componentId]="assign.cmid" [maxHeight]="120" [text]="text" contextLevel="module"
-                [contextInstanceId]="assign.cmid" [courseId]="assign.course">
+            <core-format-text [component]="component" [componentId]="assign.cmid" [collapsible-item]="120" [text]="text"
+                contextLevel="module" [contextInstanceId]="assign.cmid" [courseId]="assign.course">
             </core-format-text>
         </p>
     </ion-label>
diff --git a/src/addons/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html b/src/addons/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html
index 639d40c26..fe1dc1a17 100644
--- a/src/addons/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html
+++ b/src/addons/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html
@@ -4,8 +4,8 @@
         <h2>{{ plugin.name }}</h2>
         <p *ngIf="words">{{ 'addon.mod_assign.numwords' | translate: {'$a': words} }}</p>
         <p>
-            <core-format-text [component]="component" [componentId]="assign.cmid" [maxHeight]="120" [text]="text" contextLevel="module"
-                [contextInstanceId]="assign.cmid" [courseId]="assign.course">
+            <core-format-text [component]="component" [componentId]="assign.cmid" [collapsible-item]="120" [text]="text"
+                contextLevel="module" [contextInstanceId]="assign.cmid" [courseId]="assign.course">
             </core-format-text>
         </p>
     </ion-label>
diff --git a/src/addons/mod/lesson/pages/user-retake/user-retake.html b/src/addons/mod/lesson/pages/user-retake/user-retake.html
index 6b90ad1b0..428f88da9 100644
--- a/src/addons/mod/lesson/pages/user-retake/user-retake.html
+++ b/src/addons/mod/lesson/pages/user-retake/user-retake.html
@@ -87,7 +87,7 @@
                         <ion-label>
                             <h3 class="item-heading">{{ 'addon.mod_lesson.question' | translate }}</h3>
                             <p>
-                                <core-format-text [component]="component" [componentId]="lesson?.coursemodule" [maxHeight]="50"
+                                <core-format-text [component]="component" [componentId]="lesson?.coursemodule" [collapsible-item]="50"
                                     [text]="page.contents" contextLevel="module" [contextInstanceId]="lesson?.coursemodule"
                                     [courseId]="courseId">
                                 </core-format-text>
diff --git a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
index e36cc1c0f..5dd51d9ff 100644
--- a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
+++ b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
@@ -58,8 +58,8 @@
                 <ion-item class="ion-text-wrap">
                     <ion-label>
                         <h2>{{ 'addon.mod_workshop.conclusion' | translate }}</h2>
-                        <core-format-text [maxHeight]="120" [component]="component" [componentId]="module.id" [text]="workshop!.conclusion"
-                            contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
+                        <core-format-text [collapsible-item]="120" [component]="component" [componentId]="module.id"
+                            [text]="workshop!.conclusion" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
                         </core-format-text>
                     </ion-label>
                 </ion-item>
@@ -91,8 +91,8 @@
             <ion-item class="ion-text-wrap">
                 <ion-label>
                     <h2>{{ 'addon.mod_workshop.areainstructauthors' | translate }}</h2>
-                    <core-format-text [maxHeight]="120" [component]="component" [componentId]="module.id" [text]="workshop!.instructauthors"
-                        contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
+                    <core-format-text [collapsible-item]="120" [component]="component" [componentId]="module.id"
+                        [text]="workshop!.instructauthors" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
                     </core-format-text>
                 </ion-label>
             </ion-item>
@@ -141,7 +141,7 @@
                 <ion-item class="ion-text-wrap">
                     <ion-label>
                         <h2>{{ 'addon.mod_workshop.areainstructreviewers' | translate }}</h2>
-                        <core-format-text [maxHeight]="120" [component]="component" [componentId]="module.id"
+                        <core-format-text [collapsible-item]="120" [component]="component" [componentId]="module.id"
                             [text]="workshop!.instructreviewers" contextLevel="module" [contextInstanceId]="module.id"
                             [courseId]="courseId">
                         </core-format-text>
diff --git a/src/addons/notifications/pages/list/list.html b/src/addons/notifications/pages/list/list.html
index 17f97fcf5..965a5158d 100644
--- a/src/addons/notifications/pages/list/list.html
+++ b/src/addons/notifications/pages/list/list.html
@@ -64,7 +64,7 @@
                 <ion-item class="ion-text-wrap">
                     <ion-label>
                         <core-format-text [text]="notification.mobiletext | coreCreateLinks" contextLevel="system" [contextInstanceId]="0"
-                            [maxHeight]="120">
+                            [collapsible-item]="120">
                         </core-format-text>
                     </ion-label>
                 </ion-item>
diff --git a/src/core/directives/collapsible-item.ts b/src/core/directives/collapsible-item.ts
index b097611a3..32db35299 100644
--- a/src/core/directives/collapsible-item.ts
+++ b/src/core/directives/collapsible-item.ts
@@ -46,6 +46,7 @@ export class CoreCollapsibleItemDirective implements OnInit {
     protected toggleExpandEnabled = false;
     protected expanded = false;
     protected maxHeight = defaultMaxHeight;
+    protected expandedHeight = 0;
     protected loadingChangedListener?: CoreEventObserver;
 
     constructor(el: ElementRef<HTMLElement>) {
@@ -72,9 +73,10 @@ export class CoreCollapsibleItemDirective implements OnInit {
             return;
         }
 
+        this.element.classList.add('collapsible-item');
+
         // Calculate the height now.
         await this.calculateHeight();
-        setTimeout(() => this.calculateHeight(), 200); // Try again, sometimes the first calculation is wrong.
 
         // Recalculate the height if a parent core-loading displays the content.
         this.loadingChangedListener =
@@ -82,7 +84,6 @@ export class CoreCollapsibleItemDirective implements OnInit {
                 if (data.loaded && CoreDomUtils.closest(this.element.parentElement, '#' + data.uniqueId)) {
                     // The element is inside the loading, re-calculate the height.
                     await this.calculateHeight();
-                    setTimeout(() => this.calculateHeight(), 200);
                 }
             });
     }
@@ -93,9 +94,15 @@ export class CoreCollapsibleItemDirective implements OnInit {
      * @param element Element.
      */
     protected async waitFormatTextsRendered(element: Element): Promise<void> {
-        const formatTexts = Array
-            .from(element.querySelectorAll('core-format-text'))
-            .map(element => CoreComponentsRegistry.resolve(element, CoreFormatTextDirective));
+        let formatTextElements: HTMLElement[] = [];
+
+        if (this.element.tagName == 'CORE-FORMAT-TEXT') {
+            formatTextElements = [this.element];
+        } else {
+            formatTextElements = Array.from(element.querySelectorAll('core-format-text'));
+        }
+
+        const formatTexts = formatTextElements.map(element => CoreComponentsRegistry.resolve(element, CoreFormatTextDirective));
 
         await Promise.all(formatTexts.map(formatText => formatText?.rendered()));
     }
@@ -103,22 +110,25 @@ export class CoreCollapsibleItemDirective implements OnInit {
     /**
      * Calculate the height and check if we need to display show more or not.
      */
-    protected async calculateHeight(): Promise<void> {
-        await this.waitFormatTextsRendered(this.element);
-
+    protected async calculateHeight(retries = 3): Promise<void> {
         // Remove max-height (if any) to calculate the real height.
-        const initialMaxHeight = this.element.style.maxHeight;
-        this.element.style.maxHeight = 'none';
+        this.element.classList.add('collapsible-loading-height');
+
+        await this.waitFormatTextsRendered(this.element);
 
         await CoreUtils.nextTick();
 
-        const height = CoreDomUtils.getElementHeight(this.element) || 0;
+        this.expandedHeight = CoreDomUtils.getElementHeight(this.element) || 0;
 
         // Restore the max height now.
-        this.element.style.maxHeight = initialMaxHeight;
+        this.element.classList.remove('collapsible-loading-height');
 
         // If cannot calculate height, shorten always.
-        this.setExpandButtonEnabled(!height || height >= this.maxHeight);
+        this.setExpandButtonEnabled(!this.expandedHeight || this.expandedHeight >= this.maxHeight);
+
+        if (this.expandedHeight == 0 && retries > 0) {
+            setTimeout(() => this.calculateHeight(retries - 1), 200);
+        }
     }
 
     /**
@@ -163,8 +173,11 @@ export class CoreCollapsibleItemDirective implements OnInit {
     protected setMaxHeight(maxHeight?: number): void {
         if (maxHeight) {
             this.element.style.setProperty('--max-height', maxHeight + buttonHeight + 'px');
+        } else if (this.expandedHeight) {
+            this.element.style.setProperty('--max-height', this.expandedHeight + 'px');
         } else {
             this.element.style.removeProperty('--max-height');
+
         }
     }
 
@@ -195,7 +208,7 @@ export class CoreCollapsibleItemDirective implements OnInit {
      *
      * @param e Click event.
      */
-    protected elementClicked(e: MouseEvent): void {
+    elementClicked(e: MouseEvent): void {
         if (e.defaultPrevented) {
             // Ignore it if the event was prevented by some other listener.
             return;
diff --git a/src/core/directives/format-text.ts b/src/core/directives/format-text.ts
index 90030cdf2..ef15c4f68 100644
--- a/src/core/directives/format-text.ts
+++ b/src/core/directives/format-text.ts
@@ -22,10 +22,10 @@ import {
     SimpleChange,
     Optional,
     ViewContainerRef,
+    ViewChild,
 } from '@angular/core';
 import { IonContent } from '@ionic/angular';
 
-import { CoreEventLoadingChangedData, CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreIframeUtils, CoreIframeUtilsProvider } from '@services/utils/iframe';
@@ -40,6 +40,7 @@ import { CoreFilterDelegate } from '@features/filter/services/filter-delegate';
 import { CoreFilterHelper } from '@features/filter/services/filter-helper';
 import { CoreSubscriptions } from '@singletons/subscriptions';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
+import { CoreCollapsibleItemDirective } from './collapsible-item';
 
 /**
  * Directive to format text rendered. It renders the HTML and treats all links and media, using CoreLinkDirective
@@ -55,6 +56,8 @@ import { CoreComponentsRegistry } from '@singletons/components-registry';
 })
 export class CoreFormatTextDirective implements OnChanges {
 
+    @ViewChild(CoreCollapsibleItemDirective) collapsible?: CoreCollapsibleItemDirective;
+
     @Input() text?: string; // The text to format.
     @Input() siteId?: string; // Site ID to use.
     @Input() component?: string; // Component for CoreExternalContentDirective.
@@ -73,23 +76,18 @@ export class CoreFormatTextDirective implements OnChanges {
     @Input() hideIfEmpty = false; // If true, the tag will contain nothing if text is empty.
 
     @Input() fullOnClick?: boolean | string; // @deprecated on 4.0 Won't do anything.
-    @Input() fullTitle?: string; // @deprecated on 4.0 Won't do anything..
+    @Input() fullTitle?: string; // @deprecated on 4.0 Won't do anything.
     /**
      * Max height in pixels to render the content box. It should be 50 at least to make sense.
-     * Using this parameter will force display: block to calculate height better.
-     * If you want to avoid this use class="inline" at the same time to use display: inline-block.
      */
-    @Input() maxHeight?: number;
+    @Input() maxHeight?: number; // @deprecated on 4.0 Use collapsible-item directive instead.
 
     @Output() afterRender: EventEmitter<void>; // Called when the data is rendered.
     @Output() onClick: EventEmitter<void> = new EventEmitter(); // Called when clicked.
 
     protected element: HTMLElement;
-    protected expanded = false;
-    protected loadingChangedListener?: CoreEventObserver;
     protected emptyText = '';
     protected contentSpan: HTMLElement;
-    protected toggleExpandEnabled = false;
 
     constructor(
         element: ElementRef,
@@ -122,8 +120,6 @@ export class CoreFormatTextDirective implements OnChanges {
      */
     ngOnChanges(changes: { [name: string]: SimpleChange }): void {
         if (changes.text || changes.filter || changes.contextLevel || changes.contextInstanceId) {
-            this.setExpandButtonEnabled(false);
-
             this.formatAndRenderContents();
         }
     }
@@ -269,101 +265,6 @@ export class CoreFormatTextDirective implements OnChanges {
         });
     }
 
-    /**
-     * Calculate the height and check if we need to display show more or not.
-     */
-    protected async calculateHeight(): Promise<void> {
-        // @todo: Work on calculate this height better.
-        if (!this.maxHeight) {
-            return;
-        }
-
-        await this.rendered();
-
-        // Remove max-height (if any) to calculate the real height.
-        const initialMaxHeight = this.element.style.maxHeight;
-        this.element.style.maxHeight = 'none';
-
-        await CoreUtils.nextTick();
-
-        const height = this.getElementHeight(this.element);
-
-        // Restore the max height now.
-        this.element.style.maxHeight = initialMaxHeight;
-
-        // If cannot calculate height, shorten always.
-        this.setExpandButtonEnabled(!height || height >= this.maxHeight);
-    }
-
-    /**
-     * Set max height to element.
-     *
-     * @param maxHeight Max height if collapsed or undefined if expanded.
-     */
-    protected setMaxHeight(maxHeight?: number): void {
-        if (maxHeight) {
-            this.element.style.setProperty('--max-height', maxHeight + 'px');
-        } else {
-            this.element.style.removeProperty('--max-height');
-        }
-    }
-
-    /**
-     * Sets if expand button is enabled or not.
-     *
-     * @param enable Wether enable or disable.
-     */
-    protected setExpandButtonEnabled(enable: boolean): void {
-        this.toggleExpandEnabled = enable;
-        this.element.classList.toggle('collapsible-enabled', enable);
-
-        if (!enable || this.element.querySelector('ion-button.collapsible-toggle'))  {
-            this.setMaxHeight(!enable || this.expanded? undefined : this.maxHeight);
-
-            return;
-        }
-
-        // Add expand/collapse buttons
-        const toggleButton = document.createElement('ion-button');
-        toggleButton.classList.add('collapsible-toggle');
-        toggleButton.setAttribute('fill', 'clear');
-
-        const toggleText = document.createElement('span');
-        toggleText.classList.add('collapsible-toggle-text');
-        toggleText.classList.add('sr-only');
-        toggleButton.appendChild(toggleText);
-
-        const expandArrow = document.createElement('span');
-        expandArrow.classList.add('collapsible-toggle-arrow');
-        toggleButton.appendChild(expandArrow);
-
-        this.element.appendChild(toggleButton);
-
-        this.toggleExpand(this.expanded);
-    }
-
-    /**
-     * Expand or collapse text.
-     *
-     * @param expand Wether expand or collapse text. If undefined, will toggle.
-     */
-    protected toggleExpand(expand?: boolean): void {
-        if (expand === undefined) {
-            expand = !this.expanded;
-        }
-        this.expanded = expand;
-        this.element.classList.toggle('collapsible-collapsed', !expand);
-        this.setMaxHeight(!expand? this.maxHeight: undefined);
-
-        const toggleButton = this.element.querySelector('ion-button.collapsible-toggle');
-        const toggleText = toggleButton?.querySelector('.collapsible-toggle-text');
-        if (!toggleButton || !toggleText) {
-            return;
-        }
-        toggleText.innerHTML = expand ? Translate.instant('core.showless') : Translate.instant('core.showmore');
-        toggleButton.setAttribute('aria-expanded', expand ? 'true' : 'false');
-    }
-
     /**
      * Listener to call when the element is clicked.
      *
@@ -385,24 +286,18 @@ export class CoreFormatTextDirective implements OnChanges {
             return;
         }
 
-        if (!this.toggleExpandEnabled) {
-            // Nothing to do on click, just stop.
-            return;
-        }
-
-        e.preventDefault();
-        e.stopPropagation();
-
-        this.toggleExpand();
+        this.collapsible?.elementClicked(e);
     }
 
     /**
      * Finish the rendering, displaying the element again and calling afterRender.
      */
-    protected finishRender(): void {
+    protected async finishRender(): Promise<void> {
         // Show the element again.
         this.element.classList.remove('core-format-text-loading');
 
+        await CoreUtils.nextTick();
+
         // Emit the afterRender output.
         this.afterRender.emit();
     }
@@ -413,15 +308,12 @@ export class CoreFormatTextDirective implements OnChanges {
     protected async formatAndRenderContents(): Promise<void> {
         if (!this.text) {
             this.contentSpan.innerHTML = this.emptyText; // Remove current contents.
-            this.finishRender();
+
+            await this.finishRender();
 
             return;
         }
 
-        // In AOT the inputs and ng-reflect aren't in the DOM sometimes. Add them so styles are applied.
-        if (this.maxHeight && !this.element.getAttribute('maxHeight')) {
-            this.element.setAttribute('maxHeight', String(this.maxHeight));
-        }
         if (!this.element.getAttribute('singleLine')) {
             this.element.setAttribute('singleLine', String(CoreUtils.isTrueOrOne(this.singleLine)));
         }
@@ -434,36 +326,22 @@ export class CoreFormatTextDirective implements OnChanges {
         this.element.classList.add('core-disable-media-adapt');
 
         this.contentSpan.innerHTML = ''; // Remove current contents.
-        if (this.maxHeight && result.div.innerHTML != '') {
 
-            // Move the children to the current element to be able to calculate the height.
-            CoreDomUtils.moveChildren(result.div, this.contentSpan);
+        // Move the children to the current element to be able to calculate the height.
+        CoreDomUtils.moveChildren(result.div, this.contentSpan);
 
-            // Calculate the height now.
-            this.calculateHeight();
-            setTimeout(() => this.calculateHeight(), 200); // Try again, sometimes the first calculation is wrong.
+        await CoreUtils.nextTick();
 
-            // Add magnifying glasses to images.
-            this.addMagnifyingGlasses();
-
-            if (!this.loadingChangedListener) {
-                // Recalculate the height if a parent core-loading displays the content.
-                this.loadingChangedListener =
-                    CoreEvents.on(CoreEvents.CORE_LOADING_CHANGED, (data: CoreEventLoadingChangedData) => {
-                        if (data.loaded && CoreDomUtils.closest(this.element.parentElement, '#' + data.uniqueId)) {
-                            // The format-text is inside the loading, re-calculate the height.
-                            this.calculateHeight();
-                            setTimeout(() => this.calculateHeight(), 200);
-                        }
-                    });
-            }
-        } else {
-            CoreDomUtils.moveChildren(result.div, this.contentSpan);
-
-            // Add magnifying glasses to images.
-            this.addMagnifyingGlasses();
+        // Use collapsible-item directive instead.
+        if (this.maxHeight && !this.collapsible) {
+            this.collapsible = new CoreCollapsibleItemDirective(new ElementRef(this.element));
+            this.collapsible.height = this.maxHeight;
+            this.collapsible.ngOnInit();
         }
 
+        // Add magnifying glasses to images.
+        this.addMagnifyingGlasses();
+
         if (result.options.filter) {
             // Let filters handle HTML. We do it here because we don't want them to block the render of the text.
             CoreFilterDelegate.handleHtml(
@@ -479,7 +357,7 @@ export class CoreFormatTextDirective implements OnChanges {
         }
 
         this.element.classList.remove('core-disable-media-adapt');
-        this.finishRender();
+        await this.finishRender();
     }
 
     /**
diff --git a/src/core/features/course/components/module-description/core-course-module-description.html b/src/core/features/course/components/module-description/core-course-module-description.html
index 0f6d34c0a..1476d7476 100644
--- a/src/core/features/course/components/module-description/core-course-module-description.html
+++ b/src/core/features/course/components/module-description/core-course-module-description.html
@@ -1,7 +1,7 @@
 <ion-card *ngIf="description">
     <ion-item class="ion-text-wrap">
         <ion-label>
-            <core-format-text [text]="description" [component]="component" [componentId]="componentId" [maxHeight]="120"
+            <core-format-text [text]="description" [component]="component" [componentId]="componentId" [collapsible-item]="120"
                 [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId">
             </core-format-text>
         </ion-label>
diff --git a/src/core/features/course/components/module-info/core-course-module-info.html b/src/core/features/course/components/module-info/core-course-module-info.html
index 430c40a72..aea829834 100644
--- a/src/core/features/course/components/module-info/core-course-module-info.html
+++ b/src/core/features/course/components/module-info/core-course-module-info.html
@@ -46,7 +46,7 @@
 <ion-item class="ion-text-wrap" *ngIf="description">
     <ion-label>
         <core-format-text [text]="description" [component]="component" [componentId]="componentId" contextLevel="module"
-            [contextInstanceId]="module.id" [courseId]="courseId" [maxHeight]="expandDescription ? null : 120">
+            [contextInstanceId]="module.id" [courseId]="courseId" [collapsible-item]="expandDescription ? null : 120">
         </core-format-text>
     </ion-label>
 </ion-item>
diff --git a/src/core/features/course/components/module-summary/module-summary.html b/src/core/features/course/components/module-summary/module-summary.html
index f60653532..a510cf893 100644
--- a/src/core/features/course/components/module-summary/module-summary.html
+++ b/src/core/features/course/components/module-summary/module-summary.html
@@ -49,7 +49,7 @@
                     {{ 'core.description' | translate}}
                 </p>
                 <core-format-text [text]="description" [component]="component" [componentId]="componentId" contextLevel="module"
-                    [contextInstanceId]="module.id" [courseId]="courseId" [maxHeight]="120">
+                    [contextInstanceId]="module.id" [courseId]="courseId" [collapsible-item]="120">
                 </core-format-text>
             </ion-label>
         </ion-item>
@@ -169,7 +169,7 @@
                             <ion-label>
                                 <p class="item-heading">{{ 'core.grades.feedback' | translate}}</p>
                                 <p>
-                                    <core-format-text [maxHeight]="120" [text]="grade.feedback" contextLevel="course"
+                                    <core-format-text [collapsible-item]="120" [text]="grade.feedback" contextLevel="course"
                                         [contextInstanceId]="courseId">
                                     </core-format-text>
                                 </p>
diff --git a/src/core/features/course/pages/course-summary/course-summary.html b/src/core/features/course/pages/course-summary/course-summary.html
index 88300031a..9fbfb57a4 100644
--- a/src/core/features/course/pages/course-summary/course-summary.html
+++ b/src/core/features/course/pages/course-summary/course-summary.html
@@ -72,7 +72,8 @@
                     <p class="item-heading">
                         {{'core.summary' | translate}}
                     </p>
-                    <core-format-text [text]="course.summary" [maxHeight]="120" contextLevel="course" [contextInstanceId]="course.id">
+                    <core-format-text [text]="course.summary" [collapsible-item]="120" contextLevel="course"
+                        [contextInstanceId]="course.id">
                     </core-format-text>
                 </ion-label>
             </ion-item>
@@ -104,7 +105,7 @@
                                 </core-format-text>
                             </span><span class="core-customfieldseparator">: </span>
                             <span class="core-customfieldvalue">
-                                <core-format-text [text]="field.value" [maxHeight]="120" contextLevel="course"
+                                <core-format-text [text]="field.value" [collapsible-item]="120" contextLevel="course"
                                     [contextInstanceId]="course.id">
                                 </core-format-text>
                             </span>
diff --git a/src/core/features/courses/pages/categories/categories.html b/src/core/features/courses/pages/categories/categories.html
index e7c8280b4..fa208cdca 100644
--- a/src/core/features/courses/pages/categories/categories.html
+++ b/src/core/features/courses/pages/categories/categories.html
@@ -34,7 +34,7 @@
                         </core-format-text>
                     </p>
                     <p *ngIf="currentCategory.description">
-                        <core-format-text [text]="currentCategory.description" [maxHeight]="120" contextLevel="coursecat"
+                        <core-format-text [text]="currentCategory.description" [collapsible-item]="120" contextLevel="coursecat"
                             [contextInstanceId]="currentCategory.id"></core-format-text>
                     </p>
                 </ion-label>
diff --git a/src/core/features/grades/pages/course/course.html b/src/core/features/grades/pages/course/course.html
index 6cbbae4e4..2c237cf64 100644
--- a/src/core/features/grades/pages/course/course.html
+++ b/src/core/features/grades/pages/course/course.html
@@ -55,7 +55,7 @@
                                     </td>
                                     <td *ngIf="column.name === 'feedback' && row.feedback !== undefined"
                                         class="ion-text-start core-grades-table-feedback" [class.ion-hide-md-down]="column.hiddenPhone">
-                                        <core-format-text [maxHeight]="120" [text]="row.feedback" contextLevel="course"
+                                        <core-format-text [collapsible-item]="120" [text]="row.feedback" contextLevel="course"
                                             [contextInstanceId]="courseId">
                                         </core-format-text>
                                     </td>
@@ -124,7 +124,7 @@
                                         <ion-label>
                                             <h2>{{ 'core.grades.feedback' | translate}}</h2>
                                             <p>
-                                                <core-format-text [maxHeight]="120" [text]="row.feedback" contextLevel="course"
+                                                <core-format-text [collapsible-item]="120" [text]="row.feedback" contextLevel="course"
                                                     [contextInstanceId]="courseId">
                                                 </core-format-text>
                                             </p>
diff --git a/src/theme/components/collapsible-item.scss b/src/theme/components/collapsible-item.scss
new file mode 100644
index 000000000..979f5854a
--- /dev/null
+++ b/src/theme/components/collapsible-item.scss
@@ -0,0 +1,82 @@
+
+.collapsible-item {
+    --display-toggle: none;
+    --max-height: none;
+
+    &.collapsible-loading-height {
+        display: block !important;
+        height: auto !important;
+        --max-height: none !important;
+        --display-toggle: none !important;
+    }
+
+    .collapsible-toggle {
+        display: var(--display-toggle);
+    }
+
+    @include media-breakpoint-down(sm) {
+        &.collapsible-enabled {
+            position: relative;
+            padding-bottom: var(--collapsible-min-button-height); // So the Show less button can fit.
+            --display-toggle: block;
+            @include core-transition(height max-height, 500ms);
+            height: calc(var(--max-height, auto));
+
+            .collapsible-toggle {
+                position: absolute;
+                @include position (null, 0, 0, null);
+                text-align: center;
+                z-index: 7;
+                text-transform: none;
+                font-size: 14px;
+                font-weight: normal;
+                background-color: var(--collapsible-toggle-background);
+                color: var(--collapsible-toggle-text);
+                min-height: var(--a11y-min-target-size);
+                min-width: var(--a11y-min-target-size);
+                --border-radius: var(--huge-radius);
+                border-radius: var(--border-radius);
+                --padding-start: 0px;
+                --padding-end: 0px;
+                margin: 0px;
+
+                .collapsible-toggle-arrow {
+                    width: var(--a11y-min-target-size);
+                    height: var(--a11y-min-target-size);
+
+                    background-position: center;
+                    background-repeat: no-repeat;
+                    background-size: 14px 14px;
+                    transform: rotate(-90deg);
+
+                    @include core-transition(transform, 500ms);
+
+                    @include push-arrow-color(626262, true);
+
+                    @include darkmode() {
+                        @include push-arrow-color(ffffff, true);
+                    }
+                }
+            }
+
+            &.collapsible-collapsed {
+                overflow: hidden;
+                min-height: calc(var(--collapsible-min-button-height) + 12px);
+
+                .collapsible-toggle-arrow {
+                    transform: rotate(90deg);
+                }
+
+                &:before {
+                    content: '';
+                    height: 100%;
+                    position: absolute;
+                    @include position(null, 0, 0, 0);
+                    background: -webkit-linear-gradient(top, rgba(var(--background-gradient-rgb), 0) calc(100% - 56px), rgba(var(--background-gradient-rgb), 1) calc(100% - 5px));
+                    background: linear-gradient(to bottom, rgba(var(--background-gradient-rgb), 0) calc(100% - 56px), rgba(var(--background-gradient-rgb), 1) calc(100% - 5px));
+                    z-index: 6;
+                }
+            }
+        }
+    }
+}
diff --git a/src/theme/components/format-text.scss b/src/theme/components/format-text.scss
index 02581a519..7cca7ef2c 100644
--- a/src/theme/components/format-text.scss
+++ b/src/theme/components/format-text.scss
@@ -48,14 +48,6 @@ core-format-text {
             opacity: 0;
             display: inline;
         }
-
-        .collapsible-toggle {
-            display: none !important;
-        }
-    }
-
-    .collapsible-toggle {
-        display: none;
     }
 
     .core-format-text-content {
@@ -68,33 +60,20 @@ core-format-text {
         word-wrap: break-word;
     }
 
-    &[maxHeight],
-    &[ng-reflect-max-height] {
+    &.collapsible-item {
         display: block;
-        position: relative;
-        width: 100%;
-        overflow: hidden;
-
-        /* Force display inline */
-        &.inline {
-            display: inline-block;
-            width: auto;
-        }
-
         // This is to allow clicks in radio/checkbox content.
-        &.collapsible-enabled {
-            cursor: pointer;
-            pointer-events: auto;
+        cursor: pointer;
+        pointer-events: auto;
 
-            @include collapsible-item();
+        .core-format-text-content {
+            display: block;
         }
-    }
 
-    @if ($core-format-text-never-shorten) {
-        &[maxHeight],
-        &[ng-reflect-max-height] {
-            &.collapsible-enabled.collapsible-expanded {
-                max-height: none !important;
+        @if ($core-format-text-never-shorten) {
+            &.collapsible-enabled {
+                --display-toggle: none !important;
+                --max-height: none !important;
 
                 .collapsible-toggle {
                     display: none !important;
diff --git a/src/theme/globals.mixins.scss b/src/theme/globals.mixins.scss
index cbde34e92..9c0882ebb 100644
--- a/src/theme/globals.mixins.scss
+++ b/src/theme/globals.mixins.scss
@@ -226,78 +226,6 @@
     }
 }
 
-@mixin collapsible-item() {
-    --display-toggle: none;
-    .collapsible-toggle {
-        display: var(--display-toggle);
-    }
-
-    @include media-breakpoint-down(sm) {
-        &.collapsible-enabled {
-            position:relative;
-            padding-bottom: var(--collapsible-min-button-height); // So the Show less button can fit.
-            --display-toggle: block;
-
-            .collapsible-toggle {
-                position: absolute;
-                @include position (null, 0, 0, null);
-                text-align: center;
-                z-index: 7;
-                text-transform: none;
-                font-size: 14px;
-                font-weight: normal;
-                background-color: var(--collapsible-toggle-background);
-                color: var(--collapsible-toggle-text);
-                min-height: var(--a11y-min-target-size);
-                min-width: var(--a11y-min-target-size);
-                --border-radius: var(--huge-radius);
-                border-radius: var(--border-radius);
-                --padding-start: 0px;
-                --padding-end: 0px;
-                margin: 0px;
-
-                .collapsible-toggle-arrow {
-                    width: var(--a11y-min-target-size);
-                    height: var(--a11y-min-target-size);
-
-                    background-position: center;
-                    background-repeat: no-repeat;
-                    background-size: 14px 14px;
-                    transform: rotate(-90deg);
-
-                    @include core-transition(transform, 500ms);
-
-                    @include push-arrow-color(626262, true);
-
-                    @include darkmode() {
-                        @include push-arrow-color(ffffff, true);
-                    }
-                }
-            }
-
-            &.collapsible-collapsed {
-                overflow: hidden;
-                min-height: calc(var(--collapsible-min-button-height) + 12px);
-                max-height: calc(var(--max-height, auto));
-
-                .collapsible-toggle-arrow {
-                    transform: rotate(90deg);
-                }
-
-                &:before {
-                    content: '';
-                    height: 100%;
-                    position: absolute;
-                    @include position(null, 0, 0, 0);
-                    background: -webkit-linear-gradient(top, rgba(var(--background-gradient-rgb), 0) calc(100% - 56px), rgba(var(--background-gradient-rgb), 1) calc(100% - 5px));
-                    background: linear-gradient(to bottom, rgba(var(--background-gradient-rgb), 0) calc(100% - 56px), rgba(var(--background-gradient-rgb), 1) calc(100% - 5px));
-                    z-index: 6;
-                }
-            }
-        }
-    }
-}
-
 // Color mixins.
 @function get_brightness($color) {
     @return (red($color) + green($color) + blue($color)) / 3;
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 8f5230675..a08dc3fa9 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -1419,10 +1419,6 @@ ion-grid.core-no-grid > ion-row {
     right: 0;
 }
 
-[collapsible-item] {
-    @include collapsible-item();
-}
-
 [collapsible-footer] {
     &.footer-collapsed {
         --core-collapsible-footer-height: 0;
diff --git a/src/theme/theme.scss b/src/theme/theme.scss
index cd0769b6d..83f8fc8d9 100644
--- a/src/theme/theme.scss
+++ b/src/theme/theme.scss
@@ -20,6 +20,7 @@
 
 /* Components */
 @import "./components/collapsible-header.scss";
+@import "./components/collapsible-item.scss";
 @import "./components/format-text.scss";
 @import "./components/rubrics.scss";
 @import "./components/mod-label.scss";

From 9f03a64a85d561e9589f356ee7b941b8fb0a0147 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 8 Mar 2022 15:01:04 +0100
Subject: [PATCH 0666/1008] MOBILE-3814 lesson: Fix input inside a label

---
 src/addons/mod/lesson/pages/player/player.html | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/addons/mod/lesson/pages/player/player.html b/src/addons/mod/lesson/pages/player/player.html
index 5e49e931a..90b910843 100644
--- a/src/addons/mod/lesson/pages/player/player.html
+++ b/src/addons/mod/lesson/pages/player/player.html
@@ -75,12 +75,11 @@
 
                         <!-- Short answer. -->
                         <ion-item class="ion-text-wrap" *ngSwitchCase="'shortanswer'">
-                            <ion-label>
-                                <ion-input [type]="question.input!.type" placeholder="{{ 'addon.mod_lesson.youranswer' | translate }}"
-                                    [id]="question.input!.id" [formControlName]="question.input!.name" autocorrect="off"
-                                    [maxlength]="question.input!.maxlength">
-                                </ion-input>
-                            </ion-label>
+                            <ion-label class="sr-only" stacked></ion-label>
+                            <ion-input [type]="question.input!.type" placeholder="{{ 'addon.mod_lesson.youranswer' | translate }}"
+                                [id]="question.input!.id" [formControlName]="question.input!.name" autocorrect="off"
+                                [maxlength]="question.input!.maxlength">
+                            </ion-input>
                         </ion-item>
 
                         <!-- Essay. -->

From d10fa5db3cce02ec23b5b4ae65766b260198c046 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 8 Mar 2022 15:51:42 +0100
Subject: [PATCH 0667/1008] MOBILE-3930 h5pactivity: Support links to all users
 attempts

---
 .../services/handlers/report-link.ts          | 31 ++++++++++++++++---
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/addons/mod/h5pactivity/services/handlers/report-link.ts b/src/addons/mod/h5pactivity/services/handlers/report-link.ts
index f2f37c19c..f3272d2bf 100644
--- a/src/addons/mod/h5pactivity/services/handlers/report-link.ts
+++ b/src/addons/mod/h5pactivity/services/handlers/report-link.ts
@@ -20,6 +20,7 @@ import { CoreCourse } from '@features/course/services/course';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
+import { CoreUtils } from '@services/utils/utils';
 import { makeSingleton } from '@singletons';
 import { AddonModH5PActivity } from '../h5pactivity';
 import { AddonModH5PActivityModuleHandlerService } from './module';
@@ -60,7 +61,7 @@ export class AddonModH5PActivityReportLinkHandlerService extends CoreContentLink
                     } else {
                         const userId = params.userid ? Number(params.userid) : undefined;
 
-                        this.openUserAttempts(module.id, module.course, siteId, userId);
+                        await this.openUserAttempts(module.id, module.course, instanceId, siteId, userId);
                     }
                 } catch (error) {
                     CoreDomUtils.showErrorModalDefault(error, 'Error processing link.');
@@ -100,13 +101,35 @@ export class AddonModH5PActivityReportLinkHandlerService extends CoreContentLink
      *
      * @param cmId Module ID.
      * @param courseId Course ID.
+     * @param id Instance ID.
      * @param siteId Site ID.
      * @param userId User ID. If not defined, current user in site.
      * @return Promise resolved when done.
      */
-    protected openUserAttempts(cmId: number, courseId: number, siteId: string, userId?: number): void {
-        userId = userId || CoreSites.getCurrentSiteUserId();
-        const path = AddonModH5PActivityModuleHandlerService.PAGE_NAME + `/${courseId}/${cmId}/userattempts/${userId}`;
+    protected async openUserAttempts(cmId: number, courseId: number, id: number, siteId: string, userId?: number): Promise<void> {
+        let canViewAllAttempts = false;
+
+        if (!userId) {
+            // No user ID specified. Check if current user can view all attempts.
+            userId = CoreSites.getCurrentSiteUserId();
+            canViewAllAttempts = await AddonModH5PActivity.canGetUsersAttempts(siteId);
+
+            if (canViewAllAttempts) {
+                const accessInfo = await CoreUtils.ignoreErrors(AddonModH5PActivity.getAccessInformation(id, {
+                    cmId,
+                    siteId,
+                }));
+
+                canViewAllAttempts = !!accessInfo?.canreviewattempts;
+            }
+        }
+
+        let path: string;
+        if (canViewAllAttempts) {
+            path = `${AddonModH5PActivityModuleHandlerService.PAGE_NAME}/${courseId}/${cmId}/users`;
+        } else {
+            path = `${AddonModH5PActivityModuleHandlerService.PAGE_NAME}/${courseId}/${cmId}/userattempts/${userId}`;
+        }
 
         CoreNavigator.navigateToSitePath(path, {
             siteId,

From 5f4b250ea49e25b670b615127a52d2205a7e7650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 8 Mar 2022 15:51:03 +0100
Subject: [PATCH 0668/1008] MOBILE-3814 format-text: Do not add external
 content without site

---
 src/core/directives/format-text.ts | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/core/directives/format-text.ts b/src/core/directives/format-text.ts
index ef15c4f68..a879c3c83 100644
--- a/src/core/directives/format-text.ts
+++ b/src/core/directives/format-text.ts
@@ -113,6 +113,8 @@ export class CoreFormatTextDirective implements OnChanges {
         this.afterRender = new EventEmitter<void>();
 
         this.element.addEventListener('click', this.elementClicked.bind(this));
+
+        this.siteId = this.siteId || CoreSites.getCurrentSiteId();
     }
 
     /**
@@ -144,9 +146,13 @@ export class CoreFormatTextDirective implements OnChanges {
      * Apply CoreExternalContentDirective to a certain element.
      *
      * @param element Element to add the attributes to.
-     * @return External content instance.
+     * @return External content instance or undefined if siteId is not provided.
      */
-    protected addExternalContent(element: Element): CoreExternalContentDirective {
+    protected addExternalContent(element: Element): CoreExternalContentDirective | undefined {
+        if (!this.siteId) {
+            return;
+        }
+
         // Angular doesn't let adding directives dynamically. Create the CoreExternalContentDirective manually.
         const extContent = new CoreExternalContentDirective(new ElementRef(element));
 
@@ -459,7 +465,7 @@ export class CoreFormatTextDirective implements OnChanges {
                 this.addMediaAdaptClass(img);
 
                 const externalImage = this.addExternalContent(img);
-                if (!externalImage.invalid) {
+                if (externalImage && !externalImage.invalid) {
                     externalImages.push(externalImage);
                 }
 

From d2a12eec9c5c3d72df3865b33886814be1813120 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 9 Mar 2022 10:10:11 +0100
Subject: [PATCH 0669/1008] MOBILE-3814 collapsible: Add AppearOnBottom to non
 main activity pages

---
 src/addons/mod/book/pages/contents/contents.html            | 6 +++---
 src/addons/mod/data/pages/entry/entry.html                  | 2 +-
 src/addons/mod/feedback/pages/form/form.html                | 2 +-
 src/addons/mod/imscp/pages/view/view.html                   | 2 +-
 src/addons/mod/quiz/pages/attempt/attempt.html              | 2 +-
 src/addons/mod/quiz/pages/player/player.html                | 2 +-
 src/addons/mod/quiz/pages/review/review.html                | 2 +-
 src/addons/mod/scorm/pages/player/player.html               | 2 +-
 .../course/components/course-format/course-format.html      | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/addons/mod/book/pages/contents/contents.html b/src/addons/mod/book/pages/contents/contents.html
index 5089297cf..0f7605f0c 100644
--- a/src/addons/mod/book/pages/contents/contents.html
+++ b/src/addons/mod/book/pages/contents/contents.html
@@ -45,8 +45,8 @@
         </div>
     </core-loading>
 
-    <core-navigation-bar collapsible-footer *ngIf="loaded && displayNavBar && navigationItems.length > 1" [items]="navigationItems"
-        previousTranslate="addon.mod_book.navprevtitle" nextTranslate="addon.mod_book.navnexttitle" (action)="changeChapter($event.id)"
-        slot="fixed">
+    <core-navigation-bar collapsible-footer appearOnBottom *ngIf="loaded && displayNavBar && navigationItems.length > 1"
+        [items]="navigationItems" previousTranslate="addon.mod_book.navprevtitle" nextTranslate="addon.mod_book.navnexttitle"
+        (action)="changeChapter($event.id)" slot="fixed">
     </core-navigation-bar>
 </ion-content>
diff --git a/src/addons/mod/data/pages/entry/entry.html b/src/addons/mod/data/pages/entry/entry.html
index a4a1fccdb..ce14704a3 100644
--- a/src/addons/mod/data/pages/entry/entry.html
+++ b/src/addons/mod/data/pages/entry/entry.html
@@ -61,7 +61,7 @@
             (onLoading)="setLoadingComments($event)" [showItem]="true">
         </core-comments>
 
-        <div collapsible-footer *ngIf="entryLoaded && hasPrevious || hasNext" slot="fixed">
+        <div collapsible-footer *ngIf="entryLoaded && hasPrevious || hasNext" slot="fixed" appearOnBottom>
             <ion-row class="ion-justify-content-between ion-align-items-center ion-no-padding ion-wrap">
                 <ion-col class="ion-text-start ion-no-padding core-navigation-arrow" size="auto">
                     <ion-button [disabled]="!hasPrevious" fill="clear" [attr.aria-label]="'core.previous' | translate"
diff --git a/src/addons/mod/feedback/pages/form/form.html b/src/addons/mod/feedback/pages/form/form.html
index 5133f7347..597335624 100644
--- a/src/addons/mod/feedback/pages/form/form.html
+++ b/src/addons/mod/feedback/pages/form/form.html
@@ -149,7 +149,7 @@
             </ion-item>
         </ion-card>
 
-        <div collapsible-footer *ngIf="feedbackLoaded && completed" slot="fixed">
+        <div collapsible-footer *ngIf="feedbackLoaded && completed" slot="fixed" appearOnBottom>
             <div class="list-item-limited-width adaptable-buttons-row">
                 <ion-button expand="block" fill="outline" (click)="showAnalysis()" class="ion-text-wrap ion-margin"
                     *ngIf="access!.canviewanalysis">
diff --git a/src/addons/mod/imscp/pages/view/view.html b/src/addons/mod/imscp/pages/view/view.html
index 548cf095c..0611d34f8 100644
--- a/src/addons/mod/imscp/pages/view/view.html
+++ b/src/addons/mod/imscp/pages/view/view.html
@@ -33,7 +33,7 @@
         </div>
     </core-loading>
 
-    <core-navigation-bar collapsible-footer *ngIf="loaded && navigationItems.length > 1" [items]="navigationItems"
+    <core-navigation-bar collapsible-footer appearOnBottom *ngIf="loaded && navigationItems.length > 1" [items]="navigationItems"
         (action)="loadItem($event)">
     </core-navigation-bar>
 </ion-content>
diff --git a/src/addons/mod/quiz/pages/attempt/attempt.html b/src/addons/mod/quiz/pages/attempt/attempt.html
index 7d4dc6879..3df9ad96f 100644
--- a/src/addons/mod/quiz/pages/attempt/attempt.html
+++ b/src/addons/mod/quiz/pages/attempt/attempt.html
@@ -61,7 +61,7 @@
             </ion-item>
         </ion-list>
 
-        <div collapsible-footer *ngIf="loaded && attempt && showReviewColumn && attempt.finished" slot="fixed">
+        <div collapsible-footer appearOnBottom *ngIf="loaded && attempt && showReviewColumn && attempt.finished" slot="fixed">
             <div class="list-item-limited-width">
                 <ion-button class="ion-margin ion-text-wrap" expand="block" (click)="reviewAttempt()">
                     <ion-icon name="fas-search" slot="start" aria-hidden="true"></ion-icon>
diff --git a/src/addons/mod/quiz/pages/player/player.html b/src/addons/mod/quiz/pages/player/player.html
index f34cf4c47..9e787ecaf 100644
--- a/src/addons/mod/quiz/pages/player/player.html
+++ b/src/addons/mod/quiz/pages/player/player.html
@@ -149,7 +149,7 @@
             </ion-button>
         </ion-card>
 
-        <div collapsible-footer *ngIf="!quizAborted && showSummary && summaryQuestions.length && loaded" slot="fixed"
+        <div collapsible-footer appearOnBottom *ngIf="!quizAborted && showSummary && summaryQuestions.length && loaded" slot="fixed"
             class="list-item-limited-width">
             <ion-button *ngIf="preventSubmitMessages.length" expand="block" class="ion-margin ion-text-wrap" [href]="moduleUrl" core-link
                 [showBrowserWarning]="false">
diff --git a/src/addons/mod/quiz/pages/review/review.html b/src/addons/mod/quiz/pages/review/review.html
index 2e3f97232..43fc2206f 100644
--- a/src/addons/mod/quiz/pages/review/review.html
+++ b/src/addons/mod/quiz/pages/review/review.html
@@ -105,7 +105,7 @@
             </div>
         </div>
 
-        <div collapsible-footer *ngIf="loaded && numPages > 1" slot="fixed">
+        <div collapsible-footer appearOnBottom *ngIf="loaded && numPages > 1" slot="fixed">
             <ion-row class="ion-justify-content-between ion-align-items-center ion-no-padding ion-wrap">
                 <ion-col class="ion-text-start ion-no-padding core-navigation-arrow" size="auto" *ngIf="!showAll">
                     <ion-button [disabled]="previousPage < 0" fill="clear" [attr.aria-label]="'core.previous' | translate"
diff --git a/src/addons/mod/scorm/pages/player/player.html b/src/addons/mod/scorm/pages/player/player.html
index 895ae27f0..343397a9b 100644
--- a/src/addons/mod/scorm/pages/player/player.html
+++ b/src/addons/mod/scorm/pages/player/player.html
@@ -28,7 +28,7 @@
         <p *ngIf="!src && errorMessage">{{ errorMessage | translate }}</p>
     </core-loading>
 
-    <core-navigation-bar collapsible-footer *ngIf="loaded && navigationItems.length > 1" [items]="navigationItems"
+    <core-navigation-bar collapsible-footer appearOnBottom *ngIf="loaded && navigationItems.length > 1" [items]="navigationItems"
         (action)="loadSco($event)" slot="fixed">
     </core-navigation-bar>
 </ion-content>
diff --git a/src/core/features/course/components/course-format/course-format.html b/src/core/features/course/components/course-format/course-format.html
index a8ca2b304..14cc14669 100644
--- a/src/core/features/course/components/course-format/course-format.html
+++ b/src/core/features/course/components/course-format/course-format.html
@@ -24,7 +24,7 @@
 
             <core-infinite-loading [enabled]="canLoadMore" (action)="showMoreActivities($event)"></core-infinite-loading>
         </div>
-        <div collapsible-footer *ngIf="displayCourseIndex && (previousSection || nextSection)" slot="fixed">
+        <div collapsible-footer appearOnBottom *ngIf="displayCourseIndex && (previousSection || nextSection)" slot="fixed">
             <div class="core-course-section-nav-buttons safe-area-padding-horizontal list-item-limited-width">
                 <ion-button *ngIf="previousSection" (click)="sectionChanged(previousSection)" expand="block"
                     [attr.aria-label]="('core.previous' | translate) + ': ' + previousSection.name">

From a1d4eeb95a2775d87569b52b280549603a94004c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 9 Mar 2022 11:10:58 +0100
Subject: [PATCH 0670/1008] MOBILE-3814 collapsible: Partially revert header
 frozen calculations

---
 src/core/directives/collapsible-header.ts | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts
index 9bb83a3ca..7a0d36d89 100644
--- a/src/core/directives/collapsible-header.ts
+++ b/src/core/directives/collapsible-header.ts
@@ -67,6 +67,7 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
     protected subscriptions: Subscription[] = [];
     protected enabled = true;
     protected endAnimationTimeout?: number;
+    protected isWithinContent = false;
 
     constructor(protected el: ElementRef) {}
 
@@ -346,7 +347,8 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
             throw new Error('[collapsible-header] Couldn\'t set up scrolling');
         }
 
-        page.classList.toggle('is-within-content', content.contains(expandedHeader));
+        this.isWithinContent = content.contains(expandedHeader);
+        page.classList.toggle('is-within-content', this.isWithinContent);
         this.setEnabled(this.enabled);
 
         Object
@@ -363,10 +365,17 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
             }
 
             const scrollableHeight = contentScroll.scrollHeight - contentScroll.clientHeight;
-            const frozen = scrollableHeight <=  scrollingHeight;
+
+            let frozen = false;
+            if (this.isWithinContent) {
+                frozen = scrollableHeight <= scrollingHeight;
+            } else {
+                const collapsedHeight = expandedHeaderHeight - (expandedHeader.clientHeight ?? 0);
+                frozen = scrollableHeight + collapsedHeight <= 2 * expandedHeaderHeight;
+            }
             const progress = frozen
                 ? 0
-                :  CoreMath.clamp(contentScroll.scrollTop / scrollingHeight, 0, 1);
+                : CoreMath.clamp(contentScroll.scrollTop / scrollingHeight, 0, 1);
 
             page.style.setProperty('--collapsible-header-progress', `${progress}`);
             page.classList.toggle('is-frozen', frozen);

From f7954dc9939e3d0244497b19e302ca016d263546 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 9 Mar 2022 11:11:28 +0100
Subject: [PATCH 0671/1008] MOBILE-3814 style: Add background color to buttons
 on toolbar

---
 src/theme/components/collapsible-header.scss | 4 +++-
 src/theme/theme.base.scss                    | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/theme/components/collapsible-header.scss b/src/theme/components/collapsible-header.scss
index f9993274d..06eb839e0 100644
--- a/src/theme/components/collapsible-header.scss
+++ b/src/theme/components/collapsible-header.scss
@@ -24,7 +24,9 @@
 
     &:not(.is-collapsed) .collapsible-header-collapsed {
         --core-header-toolbar-border-width: 0;
-        --core-header-toolbar-background: transparent;
+        ion-toolbar {
+            --background: transparent;
+        }
 
         h1 {
             opacity: 0;
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index a08dc3fa9..41a76c55c 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -161,6 +161,7 @@ ion-header {
         ion-back-button,
         .in-toolbar.button-clear {
             --color: var(--core-header-toolbar-color);
+            --background: var(--core-header-toolbar-background);
             --ion-toolbar-color: var(--core-header-toolbar-color);
             --border-radius: var(--huge-radius);
         }
@@ -170,7 +171,7 @@ ion-header {
 
         .button.button-clear,
         .button.button-solid {
-            --background: transparent;
+            --background: var(--core-header-toolbar-background);
             --color: var(--core-header-toolbar-color);
             --primary: var(--core-header-toolbar-color);
         }

From d8bc60d4e20d2af15424d66695493c0a5a453b57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 9 Mar 2022 11:27:18 +0100
Subject: [PATCH 0672/1008] MOBILE-3814 style: Reduce manual completion buttons
 size on module info

---
 .../module-info/course-module-info.scss         | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/core/features/course/components/module-info/course-module-info.scss b/src/core/features/course/components/module-info/course-module-info.scss
index 75e76aedd..6091e0b2f 100644
--- a/src/core/features/course/components/module-info/course-module-info.scss
+++ b/src/core/features/course/components/module-info/course-module-info.scss
@@ -46,6 +46,23 @@
         padding-top: 8px;
     }
 
+    core-course-module-completion ::ng-deep ion-button {
+        min-height: 28px;
+        margin: 0;
+        font-size: 12px;
+        text-transform: none;
+        font-weight: normal;
+
+        ion-icon {
+            font-size: 16px;
+            min-width: 16px;
+            @include margin(0, 8px, 0, 0);
+        }
+
+        ion-label {
+            white-space: normal !important;
+        }
+    }
 
 
 }

From 44ba6878a11774f43dae69216ee816ff4d0af031 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 9 Mar 2022 11:42:50 +0100
Subject: [PATCH 0673/1008] MOBILE-3814 collapsible: Fix height errors

---
 src/core/directives/collapsible-item.ts    | 20 ++++++++++++--------
 src/theme/components/collapsible-item.scss | 13 +++++++------
 src/theme/components/format-text.scss      | 16 ++++++++++++++++
 3 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/src/core/directives/collapsible-item.ts b/src/core/directives/collapsible-item.ts
index 32db35299..279089fc6 100644
--- a/src/core/directives/collapsible-item.ts
+++ b/src/core/directives/collapsible-item.ts
@@ -59,6 +59,10 @@ export class CoreCollapsibleItemDirective implements OnInit {
      * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
+        if (this.height === null) {
+            return;
+        }
+
         if (typeof this.height === 'string') {
             this.maxHeight = this.height === ''
                 ? defaultMaxHeight
@@ -141,7 +145,7 @@ export class CoreCollapsibleItemDirective implements OnInit {
         this.element.classList.toggle('collapsible-enabled', enable);
 
         if (!enable || this.element.querySelector('ion-button.collapsible-toggle')) {
-            this.setMaxHeight(!enable || this.expanded? undefined : this.maxHeight);
+            this.setHeight(!enable || this.expanded ? undefined : this.maxHeight);
 
             return;
         }
@@ -168,15 +172,15 @@ export class CoreCollapsibleItemDirective implements OnInit {
     /**
      * Set max height to element.
      *
-     * @param maxHeight Max height if collapsed or undefined if expanded.
+     * @param height Max height if collapsed or undefined if expanded.
      */
-    protected setMaxHeight(maxHeight?: number): void {
-        if (maxHeight) {
-            this.element.style.setProperty('--max-height', maxHeight + buttonHeight + 'px');
+    protected setHeight(height?: number): void {
+        if (height) {
+            this.element.style.setProperty('--height', height + 'px');
         } else if (this.expandedHeight) {
-            this.element.style.setProperty('--max-height', this.expandedHeight + 'px');
+            this.element.style.setProperty('--height', this.expandedHeight + 'px');
         } else {
-            this.element.style.removeProperty('--max-height');
+            this.element.style.removeProperty('--height');
 
         }
     }
@@ -192,7 +196,7 @@ export class CoreCollapsibleItemDirective implements OnInit {
         }
         this.expanded = expand;
         this.element.classList.toggle('collapsible-collapsed', !expand);
-        this.setMaxHeight(!expand? this.maxHeight: undefined);
+        this.setHeight(!expand ? this.maxHeight: undefined);
 
         const toggleButton = this.element.querySelector('ion-button.collapsible-toggle');
         const toggleText = toggleButton?.querySelector('.collapsible-toggle-text');
diff --git a/src/theme/components/collapsible-item.scss b/src/theme/components/collapsible-item.scss
index 979f5854a..30fc99352 100644
--- a/src/theme/components/collapsible-item.scss
+++ b/src/theme/components/collapsible-item.scss
@@ -1,12 +1,12 @@
 
 .collapsible-item {
     --display-toggle: none;
-    --max-height: none;
+    --height: none;
 
     &.collapsible-loading-height {
         display: block !important;
         height: auto !important;
-        --max-height: none !important;
+        --height: auto !important;
         --display-toggle: none !important;
     }
 
@@ -15,12 +15,12 @@
     }
 
     @include media-breakpoint-down(sm) {
-        &.collapsible-enabled {
+        &.collapsible-enabled:not(.collapsible-loading-height) {
             position: relative;
             padding-bottom: var(--collapsible-min-button-height); // So the Show less button can fit.
             --display-toggle: block;
-            @include core-transition(height max-height, 500ms);
-            height: calc(var(--max-height, auto));
+            @include core-transition(height max-height, 300ms);
+            height: calc(var(--height, auto) + var(--collapsible-min-button-height));
 
             .collapsible-toggle {
                 position: absolute;
@@ -62,6 +62,7 @@
             &.collapsible-collapsed {
                 overflow: hidden;
                 min-height: calc(var(--collapsible-min-button-height) + 12px);
+                height: var(--height, auto);
 
                 .collapsible-toggle-arrow {
                     transform: rotate(90deg);
@@ -69,7 +70,7 @@
 
                 &:before {
                     content: '';
-                    height: 100%;
+                    height: 60px;
                     position: absolute;
                     @include position(null, 0, 0, 0);
                     background: -webkit-linear-gradient(top, rgba(var(--background-gradient-rgb), 0) calc(100% - 56px), rgba(var(--background-gradient-rgb), 1) calc(100% - 5px));
diff --git a/src/theme/components/format-text.scss b/src/theme/components/format-text.scss
index 7cca7ef2c..81003b07a 100644
--- a/src/theme/components/format-text.scss
+++ b/src/theme/components/format-text.scss
@@ -70,6 +70,16 @@ core-format-text {
             display: block;
         }
 
+        &.collapsible-enabled {
+            .core-format-text-content {
+                display: block;
+                max-height: none;
+            }
+            &.collapsible-collapsed .core-format-text-content {
+                overflow: hidden;
+            }
+        }
+
         @if ($core-format-text-never-shorten) {
             &.collapsible-enabled {
                 --display-toggle: none !important;
@@ -85,6 +95,12 @@ core-format-text {
             }
         }
     }
+    &.collapsible-item.inline {
+        display: inline-block;
+        &.collapsible-enabled .core-format-text-content {
+           display: inline-block;
+        }
+    }
 
     .core-adapted-img-container {
         position: relative;

From 4bd9f7f431401a7d48491bd951b0575aa0817b9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 9 Mar 2022 12:57:10 +0100
Subject: [PATCH 0674/1008] MOBILE-3814 collapsible: Use ionScrollEnd to finish
 animations

---
 src/core/directives/collapsible-footer.ts | 51 +++++++++---------
 src/core/directives/collapsible-header.ts | 66 +++++++++++------------
 2 files changed, 60 insertions(+), 57 deletions(-)

diff --git a/src/core/directives/collapsible-footer.ts b/src/core/directives/collapsible-footer.ts
index e9fcb9d6b..47fe99439 100644
--- a/src/core/directives/collapsible-footer.ts
+++ b/src/core/directives/collapsible-footer.ts
@@ -42,9 +42,10 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
     protected initialPaddingBottom = '0px';
     protected previousTop = 0;
     protected previousHeight = 0;
-    protected endAnimationTimeout?: number;
     protected content?: HTMLIonContentElement | null;
     protected loadingChangedListener?: CoreEventObserver;
+    protected contentScrollListener?: EventListener;
+    protected endContentScrollListener?: EventListener;
 
     constructor(el: ElementRef, protected ionContent: IonContent) {
         this.element = el.nativeElement;
@@ -105,7 +106,7 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
         const scroll = await this.content.getScrollElement();
         this.content.scrollEvents = true;
 
-        this.content.addEventListener('ionScroll', (e: CustomEvent<ScrollDetail>): void => {
+        this.content.addEventListener('ionScroll', this.contentScrollListener = (e: CustomEvent<ScrollDetail>): void => {
             if (!this.content) {
                 return;
             }
@@ -113,6 +114,23 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
             this.onScroll(e.detail, scroll);
         });
 
+        this.content.addEventListener('ionScrollEnd', this.endContentScrollListener = (): void => {
+            if (!this.content) {
+                return;
+            }
+
+            const height = this.previousHeight;
+            const collapsed = height <= this.finalHeight;
+            const expanded = height >= this.initialHeight;
+
+            if (!collapsed && !expanded) {
+                // Finish opening or closing the bar.
+                const newHeight = (height - this.finalHeight) < (this.initialHeight - this.finalHeight) / 2
+                    ? this.finalHeight
+                    : this.initialHeight;
+
+                this.setBarHeight(newHeight);            }
+        });
     }
 
     /**
@@ -154,34 +172,12 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
      * @param height The new bar height.
      */
     protected setBarHeight(height: number): void {
-        if (this.endAnimationTimeout) {
-            clearTimeout(this.endAnimationTimeout);
-        }
-
         const collapsed = height <= this.finalHeight;
         const expanded = height >= this.initialHeight;
         this.element.classList.toggle('footer-collapsed', collapsed);
         this.element.classList.toggle('footer-expanded', expanded);
         this.content?.style.setProperty('--core-collapsible-footer-height', height + 'px');
         this.previousHeight = height;
-
-        if (!collapsed && !expanded) {
-            // Finish opening or closing the bar.
-            this.endAnimationTimeout = window.setTimeout(() => this.endAnimation(height), 500);
-        }
-    }
-
-    /**
-     * End of animation when not scrolling.
-     *
-     * @param height Last height used.
-     */
-    protected endAnimation(height: number): void {
-        const newHeight = (height - this.finalHeight) < (this.initialHeight - this.finalHeight) / 2
-            ? this.finalHeight
-            : this.initialHeight;
-
-        this.setBarHeight(newHeight);
     }
 
     /**
@@ -213,6 +209,13 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
      */
     async ngOnDestroy(): Promise<void> {
         this.content?.style.setProperty('--padding-bottom', this.initialPaddingBottom);
+
+        if (this.content && this.contentScrollListener) {
+            this.content.removeEventListener('ionScroll', this.contentScrollListener);
+        }
+        if (this.content && this.endContentScrollListener) {
+            this.content.removeEventListener('ionScrollEnd', this.endContentScrollListener);
+        }
     }
 
 }
diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts
index 7a0d36d89..01f7b0470 100644
--- a/src/core/directives/collapsible-header.ts
+++ b/src/core/directives/collapsible-header.ts
@@ -62,11 +62,11 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
     protected expandedFontStyles?: Partial<CSSStyleDeclaration>;
     protected content?: HTMLIonContentElement;
     protected contentScrollListener?: EventListener;
+    protected endContentScrollListener?: EventListener;
     protected floatingTitle?: HTMLElement;
     protected scrollingHeight?: number;
     protected subscriptions: Subscription[] = [];
     protected enabled = true;
-    protected endAnimationTimeout?: number;
     protected isWithinContent = false;
 
     constructor(protected el: ElementRef) {}
@@ -108,6 +108,9 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
         if (this.content && this.contentScrollListener) {
             this.content.removeEventListener('ionScroll', this.contentScrollListener);
         }
+        if (this.content && this.endContentScrollListener) {
+            this.content.removeEventListener('ionScrollEnd', this.endContentScrollListener);
+        }
     }
 
     /**
@@ -281,11 +284,17 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
      * @param content Content element.
      */
     protected updateContent(content?: HTMLIonContentElement | null): void {
-        if (this.content && this.contentScrollListener) {
-            this.content.removeEventListener('ionScroll', this.contentScrollListener);
+        if (this.content) {
+            if (this.contentScrollListener) {
+                this.content.removeEventListener('ionScroll', this.contentScrollListener);
+                delete this.contentScrollListener;
+            }
 
+            if (this.endContentScrollListener) {
+                this.content.removeEventListener('ionScrollEnd', this.endContentScrollListener);
+                delete this.endContentScrollListener;
+            }
             delete this.content;
-            delete this.contentScrollListener;
         }
 
         content && this.trackContentScroll(content);
@@ -355,15 +364,12 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
             .entries(expandedFontStyles)
             .forEach(([property, value]) => floatingTitle.style.setProperty(property, value as string));
 
+        this.content.scrollEvents = true;
         this.content.addEventListener('ionScroll', this.contentScrollListener = ({ target }: CustomEvent<ScrollDetail>): void => {
             if (target !== this.content || !this.enabled) {
                 return;
             }
 
-            if (this.endAnimationTimeout) {
-                clearTimeout(this.endAnimationTimeout);
-            }
-
             const scrollableHeight = contentScroll.scrollHeight - contentScroll.clientHeight;
 
             let frozen = false;
@@ -384,37 +390,31 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
             Object
                 .entries(progress > .5 ? collapsedFontStyles : expandedFontStyles)
                 .forEach(([property, value]) => floatingTitle.style.setProperty(property, value as string));
-
-            if (progress > 0 && progress < 1) {
-                // Finish opening or closing the bar.
-                this.endAnimationTimeout = window.setTimeout(() => this.endAnimation(progress, contentScroll.scrollTop), 500);
-            }
         });
-    }
 
-    /**
-     * End of animation when stop scrolling.
-     *
-     * @param progress Progress.
-     * @param scrollTop Current ScrollTop position.
-     */
-    protected endAnimation(progress: number, scrollTop: number): void {
-        if(!this.page) {
-            return;
-        }
+        this.content.addEventListener(
+            'ionScrollEnd',
+            this.endContentScrollListener = ({ target }: CustomEvent<ScrollDetail>): void => {
+                if (target !== this.content || !this.enabled) {
+                    return;
+                }
 
-        const collapse = progress > 0.5;
+                const progress = parseFloat(page.style.getPropertyValue('--collapsible-header-progress'));
+                const scrollTop = contentScroll.scrollTop;
+                const collapse = progress > 0.5;
 
-        this.page.style.setProperty('--collapsible-header-progress', collapse ? '1' : '0');
-        this.page.classList.toggle('is-collapsed', collapse);
+                page.style.setProperty('--collapsible-header-progress', collapse ? '1' : '0');
+                page.classList.toggle('is-collapsed', collapse);
 
-        if (collapse && this.scrollingHeight && this.scrollingHeight > 0 && scrollTop < this.scrollingHeight) {
-            this.content?.scrollToPoint(null, this.scrollingHeight);
-        }
+                if (collapse && this.scrollingHeight && this.scrollingHeight > 0 && scrollTop < this.scrollingHeight) {
+                    this.content?.scrollToPoint(null, this.scrollingHeight);
+                }
 
-        if (!collapse && this.scrollingHeight && this.scrollingHeight > 0 && scrollTop > 0) {
-            this.content?.scrollToPoint(null, 0);
-        }
+                if (!collapse && this.scrollingHeight && this.scrollingHeight > 0 && scrollTop > 0) {
+                    this.content?.scrollToPoint(null, 0);
+                }
+            },
+        );
     }
 
 }

From c4bf0438f98a98bb675fb665c342b2d05f70cc0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 9 Mar 2022 12:42:25 +0100
Subject: [PATCH 0675/1008] MOBILE-3814 style: Apply shadow to header when
 scrolled

---
 .../pages/discussion/discussion.page.ts       |  6 ---
 src/app/app.component.ts                      |  8 +++-
 src/core/directives/content.ts                | 46 +++++++++++++++++++
 src/core/directives/directives.module.ts      |  3 ++
 src/theme/components/collapsible-header.scss  |  7 +++
 src/theme/theme.light.scss                    | 41 +++++++++++------
 6 files changed, 89 insertions(+), 22 deletions(-)
 create mode 100644 src/core/directives/content.ts

diff --git a/src/addons/messages/pages/discussion/discussion.page.ts b/src/addons/messages/pages/discussion/discussion.page.ts
index 7c4176af1..febd175eb 100644
--- a/src/addons/messages/pages/discussion/discussion.page.ts
+++ b/src/addons/messages/pages/discussion/discussion.page.ts
@@ -499,13 +499,7 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView
      */
     protected setNewMessagesBadge(addMessages: number): void {
         if (this.newMessages == 0 && addMessages > 0) {
-            // Setup scrolling.
-            this.content!.scrollEvents = true;
-
             this.scrollFunction();
-        } else if (this.newMessages > 0 && addMessages == 0) {
-            // Remove scrolling.
-            this.content!.scrollEvents = false;
         }
 
         this.newMessages = addMessages;
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 5df6a4cb0..7c361804a 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -14,7 +14,7 @@
 
 import { AfterViewInit, ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core';
 import { IonRouterOutlet } from '@ionic/angular';
-import { BackButtonEvent } from '@ionic/core';
+import { BackButtonEvent, ScrollDetail } from '@ionic/core';
 
 import { CoreLang } from '@services/lang';
 import { CoreLoginHelper } from '@features/login/services/login-helper';
@@ -89,6 +89,12 @@ export class AppComponent implements OnInit, AfterViewInit {
             }
         });
 
+        // Listen to scroll to add style when scroll is not 0.
+        win.addEventListener('ionScroll', ({ detail, target }: CustomEvent<ScrollDetail>) => {
+            const header = (target as HTMLElement).closest('.ion-page')?.querySelector('ion-header');
+            header?.classList.toggle('core-header-shadow', detail.scrollTop > 0);
+        });
+
         // Listen for session expired events.
         CoreEvents.on(CoreEvents.SESSION_EXPIRED, (data) => {
             CoreLoginHelper.sessionExpired(data);
diff --git a/src/core/directives/content.ts b/src/core/directives/content.ts
new file mode 100644
index 000000000..e214062bd
--- /dev/null
+++ b/src/core/directives/content.ts
@@ -0,0 +1,46 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { Directive, ElementRef, OnInit } from '@angular/core';
+
+/**
+ * Directive to enabled scroll events on ALL scrollable ion-content.
+ *
+ * Example usage:
+ *
+ * <ion-content>
+ */
+@Directive({
+    selector: 'ion-content',
+})
+export class CoreContentDirective implements OnInit {
+
+    protected element: HTMLIonContentElement;
+
+    constructor(el: ElementRef) {
+        this.element = el.nativeElement;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async ngOnInit(): Promise<void> {
+        if (this.element.classList.contains('disable-scroll-y')) {
+            return;
+        }
+
+        this.element.scrollEvents = true;
+    }
+
+}
diff --git a/src/core/directives/directives.module.ts b/src/core/directives/directives.module.ts
index 9f518532f..9350f14eb 100644
--- a/src/core/directives/directives.module.ts
+++ b/src/core/directives/directives.module.ts
@@ -31,6 +31,7 @@ import { CoreCollapsibleHeaderDirective } from './collapsible-header';
 import { CoreSwipeNavigationDirective } from './swipe-navigation';
 import { CoreCollapsibleItemDirective } from './collapsible-item';
 import { CoreCollapsibleFooterDirective } from './collapsible-footer';
+import { CoreContentDirective } from './content';
 
 @NgModule({
     declarations: [
@@ -51,6 +52,7 @@ import { CoreCollapsibleFooterDirective } from './collapsible-footer';
         CoreSwipeNavigationDirective,
         CoreCollapsibleItemDirective,
         CoreCollapsibleFooterDirective,
+        CoreContentDirective,
     ],
     exports: [
         CoreAutoFocusDirective,
@@ -70,6 +72,7 @@ import { CoreCollapsibleFooterDirective } from './collapsible-footer';
         CoreSwipeNavigationDirective,
         CoreCollapsibleItemDirective,
         CoreCollapsibleFooterDirective,
+        CoreContentDirective,
     ],
 })
 export class CoreDirectivesModule {}
diff --git a/src/theme/components/collapsible-header.scss b/src/theme/components/collapsible-header.scss
index 06eb839e0..41a6f1e03 100644
--- a/src/theme/components/collapsible-header.scss
+++ b/src/theme/components/collapsible-header.scss
@@ -8,6 +8,9 @@
     --collapsible-header-floating-title-width: 0px;
     --collapsible-header-floating-title-x-delta: 0px;
     --collapsible-header-floating-title-width-delta: 0px;
+    ion-header.core-header-shadow {
+        --core-header-shadow: none;
+    }
 
     .collapsible-header-expanded {
         overflow: hidden;
@@ -34,6 +37,10 @@
 
     }
 
+    &.is-active.is-collapsed.is-within-content ion-header.core-header-shadow {
+        --core-header-shadow: var(--scroll-shadow-bottom, none);
+    }
+
     &.is-active {
 
         .collapsible-header-expanded {
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 2d0a532aa..4f4deceb4 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -85,6 +85,10 @@
 
     --contrast-background: white;
 
+    --drop-shadow: 0, 0, 0, 0.5;
+    --scroll-shadow-bottom: drop-shadow(0px -3px 3px rgba(var(--drop-shadow)));
+    --scroll-shadow-top: drop-shadow(0px 3px 3px rgba(var(--drop-shadow)));
+
     --ion-text-color: var(--text-color);
     --ion-text-color-rgb: #{$text-color-rgb};
     --subdued-text-color: var(--medium);
@@ -138,27 +142,38 @@
     --core-header-toolbar-border-color: var(--stroke);
     --core-header-toolbar-color: var(--text-color);
     --core-header-toolbar-height: 48px;
+    --core-header-shadow: none;
     html.ios {
         --core-header-toolbar-height: 48px;
     }
 
-    ion-header ion-toolbar {
-        --color: var(--core-header-toolbar-color);
-        --background: var(--core-header-toolbar-background);
-        --border-width: 0 0 var(--core-header-toolbar-border-width) 0;
-        --border-color: var(--core-header-toolbar-border-color);
+    ion-header {
+        filter: var(--core-header-shadow, none);
+        -webkit-filter: var(--core-header-shadow, none);
 
-        ion-button {
-            --ion-toolbar-color: var(--core-header-toolbar-color);
+        ion-toolbar {
             --color: var(--core-header-toolbar-color);
-        }
+            --background: var(--core-header-toolbar-background);
+            --border-width: 0 0 var(--core-header-toolbar-border-width) 0;
+            --border-color: var(--core-header-toolbar-border-color);
 
-        ion-spinner {
-            --ion-color-base: var(--core-header-toolbar-color);
-            --color: var(--core-header-toolbar-color);
+            ion-button {
+                --ion-toolbar-color: var(--core-header-toolbar-color);
+                --color: var(--core-header-toolbar-color);
+            }
+
+            ion-spinner {
+                --ion-color-base: var(--core-header-toolbar-color);
+                --color: var(--core-header-toolbar-color);
+            }
         }
     }
 
+
+    ion-header.core-header-shadow {
+        --core-header-shadow: var(--scroll-shadow-bottom, none);
+    }
+
     ion-header::after {
         display: none;
     }
@@ -343,10 +358,6 @@
     --addon-forum-border-color: var(--stroke);
     --addon-forum-highlight-color: var(--light);
 
-    --drop-shadow: 0, 0, 0, 0.5;
-    --scroll-shadow-bottom: drop-shadow(0px 3px 3px rgba(var(--drop-shadow)));
-    --scroll-shadow-top: drop-shadow(0px 3px 3px rgba(var(--drop-shadow)));
-
     --core-question-correct-color: var(--success-shade);
     --core-question-correct-color-bg: var(--success-tint);
     --core-question-incorrect-color: var(--danger);

From 494382921f9c286b60e61677e41111a36da19088 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 9 Mar 2022 14:05:44 +0100
Subject: [PATCH 0676/1008] MOBILE-3814 messages: Fix fab button styles with
 badge

---
 .../messages/pages/discussion/discussion.html |  2 +-
 .../pages/discussion/discussion.page.ts       |  8 ++++----
 .../messages/pages/discussion/discussion.scss | 19 ++++++-------------
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/src/addons/messages/pages/discussion/discussion.html b/src/addons/messages/pages/discussion/discussion.html
index b3de76af9..2eb15f375 100644
--- a/src/addons/messages/pages/discussion/discussion.html
+++ b/src/addons/messages/pages/discussion/discussion.html
@@ -129,8 +129,8 @@
             [attr.aria-label]="'addon.messages.newmessages' | translate">
             <ion-icon name="fas-arrow-down" aria-hidden="true"></ion-icon>
             <span class="sr-only">{{ 'addon.messages.newmessages' | translate }}</span>
-            <ion-badge class="core-discussion-messages-badge">{{ newMessages }}</ion-badge>
         </ion-fab-button>
+        <ion-badge class="core-discussion-messages-badge">{{ newMessages }}</ion-badge>
     </ion-fab>
 </ion-content>
 <ion-footer class="footer-adjustable" *ngIf="loaded && (!conversationId || conversation)">
diff --git a/src/addons/messages/pages/discussion/discussion.page.ts b/src/addons/messages/pages/discussion/discussion.page.ts
index febd175eb..d2823438f 100644
--- a/src/addons/messages/pages/discussion/discussion.page.ts
+++ b/src/addons/messages/pages/discussion/discussion.page.ts
@@ -1092,8 +1092,8 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView
             // Leave time for the view to be rendered.
             await CoreUtils.nextTicks(5);
 
-            if (!this.viewDestroyed) {
-                this.content!.scrollToBottom(0);
+            if (!this.viewDestroyed && this.content) {
+                this.content.scrollToBottom(0);
             }
 
             if (force) {
@@ -1106,10 +1106,10 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView
      * Scroll to the first new unread message.
      */
     scrollToFirstUnreadMessage(): void {
-        if (this.newMessages > 0) {
+        if (this.newMessages > 0 && this.content) {
             const messages = Array.from(this.hostElement.querySelectorAll('.addon-message-not-mine'));
 
-            CoreDomUtils.scrollToElement(this.content!, <HTMLElement> messages[messages.length - this.newMessages]);
+            CoreDomUtils.scrollToElement(this.content, <HTMLElement> messages[messages.length - this.newMessages]);
         }
     }
 
diff --git a/src/addons/messages/pages/discussion/discussion.scss b/src/addons/messages/pages/discussion/discussion.scss
index 57320a0c6..2db2276f0 100644
--- a/src/addons/messages/pages/discussion/discussion.scss
+++ b/src/addons/messages/pages/discussion/discussion.scss
@@ -19,19 +19,12 @@
         padding-bottom: 0;
     }
 
-    ion-fab ion-fab-button {
-        &::part(native) {
-            contain: unset;
-            overflow: visible;
-        }
-
-        .core-discussion-messages-badge {
-            position: absolute;
-            color: var(--addon-messages-discussion-badge-text);
-            background-color: var(--addon-messages-discussion-badge);
-            display: block;
-            @include position(-6px, -6px, null, null);
-        }
+    ion-fab .core-discussion-messages-badge {
+        position: absolute;
+        color: var(--addon-messages-discussion-badge-text);
+        background-color: var(--addon-messages-discussion-badge);
+        display: block;
+        @include position(0, 0, null, null);
     }
 
     ion-header ion-toolbar h1 {

From b0165e87e4c25e665c644378b615346fa8f77adf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 9 Mar 2022 16:18:03 +0100
Subject: [PATCH 0677/1008] MOBILE-3814 collapsible: Reduce collapsible item
 size

---
 .../addon-mod-assign-feedback-plugin.html     |  2 +-
 .../addon-mod-assign-submission-plugin.html   |  2 +-
 .../addon-mod-assign-feedback-comments.html   |  4 ++--
 ...ddon-mod-assign-submission-onlinetext.html |  4 ++--
 .../lesson/pages/user-retake/user-retake.html |  2 +-
 .../index/addon-mod-workshop-index.html       | 10 ++++-----
 src/addons/notifications/pages/list/list.html |  2 +-
 src/core/directives/collapsible-item.ts       |  6 ++---
 .../core-course-module-description.html       |  2 +-
 .../module-info/core-course-module-info.html  |  2 +-
 .../module-summary/module-summary.html        |  4 ++--
 .../components/module/core-course-module.html |  2 +-
 .../pages/course-summary/course-summary.html  |  5 ++---
 .../courses/pages/categories/categories.html  |  2 +-
 .../features/grades/pages/course/course.html  |  4 ++--
 src/theme/components/collapsible-item.scss    | 22 ++++++++++---------
 src/theme/theme.dark.scss                     | 10 ++++++---
 src/theme/theme.light.scss                    |  5 ++---
 18 files changed, 47 insertions(+), 43 deletions(-)

diff --git a/src/addons/mod/assign/components/feedback-plugin/addon-mod-assign-feedback-plugin.html b/src/addons/mod/assign/components/feedback-plugin/addon-mod-assign-feedback-plugin.html
index 413cb3751..3a61b78e2 100644
--- a/src/addons/mod/assign/components/feedback-plugin/addon-mod-assign-feedback-plugin.html
+++ b/src/addons/mod/assign/components/feedback-plugin/addon-mod-assign-feedback-plugin.html
@@ -8,7 +8,7 @@
                     {{ 'addon.mod_assign.feedbacknotsupported' | translate }}
                 </ion-badge>
                 <p *ngIf="text">
-                    <core-format-text [component]="component" [componentId]="assign.cmid" [collapsible-item]="120" [text]="text"
+                    <core-format-text [component]="component" [componentId]="assign.cmid" collapsible-item [text]="text"
                         contextLevel="module" [contextInstanceId]="assign.cmid" [courseId]="assign.course">
                     </core-format-text>
                 </p>
diff --git a/src/addons/mod/assign/components/submission-plugin/addon-mod-assign-submission-plugin.html b/src/addons/mod/assign/components/submission-plugin/addon-mod-assign-submission-plugin.html
index e466eb7b5..29818a878 100644
--- a/src/addons/mod/assign/components/submission-plugin/addon-mod-assign-submission-plugin.html
+++ b/src/addons/mod/assign/components/submission-plugin/addon-mod-assign-submission-plugin.html
@@ -8,7 +8,7 @@
                     {{ 'addon.mod_assign.submissionnotsupported' | translate }}
                 </ion-badge>
                 <p *ngIf="text">
-                    <core-format-text [component]="component" [componentId]="assign.cmid" [collapsible-item]="120" [text]="text"
+                    <core-format-text [component]="component" [componentId]="assign.cmid" collapsible-item [text]="text"
                         contextLevel="module" [contextInstanceId]="assign.cmid" [courseId]="assign.course">
                     </core-format-text>
                 </p>
diff --git a/src/addons/mod/assign/feedback/comments/component/addon-mod-assign-feedback-comments.html b/src/addons/mod/assign/feedback/comments/component/addon-mod-assign-feedback-comments.html
index 3bcfbbb0f..e30f369a0 100644
--- a/src/addons/mod/assign/feedback/comments/component/addon-mod-assign-feedback-comments.html
+++ b/src/addons/mod/assign/feedback/comments/component/addon-mod-assign-feedback-comments.html
@@ -3,8 +3,8 @@
     <ion-label>
         <h2>{{ plugin.name }}</h2>
         <p>
-            <core-format-text [component]="component" [componentId]="assign.cmid" [collapsible-item]="120" [text]="text"
-                contextLevel="module" [contextInstanceId]="assign.cmid" [courseId]="assign.course">
+            <core-format-text [component]="component" [componentId]="assign.cmid" collapsible-item [text]="text" contextLevel="module"
+                [contextInstanceId]="assign.cmid" [courseId]="assign.course">
             </core-format-text>
         </p>
     </ion-label>
diff --git a/src/addons/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html b/src/addons/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html
index fe1dc1a17..549976d19 100644
--- a/src/addons/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html
+++ b/src/addons/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html
@@ -4,8 +4,8 @@
         <h2>{{ plugin.name }}</h2>
         <p *ngIf="words">{{ 'addon.mod_assign.numwords' | translate: {'$a': words} }}</p>
         <p>
-            <core-format-text [component]="component" [componentId]="assign.cmid" [collapsible-item]="120" [text]="text"
-                contextLevel="module" [contextInstanceId]="assign.cmid" [courseId]="assign.course">
+            <core-format-text [component]="component" [componentId]="assign.cmid" collapsible-item [text]="text" contextLevel="module"
+                [contextInstanceId]="assign.cmid" [courseId]="assign.course">
             </core-format-text>
         </p>
     </ion-label>
diff --git a/src/addons/mod/lesson/pages/user-retake/user-retake.html b/src/addons/mod/lesson/pages/user-retake/user-retake.html
index 428f88da9..6c8bcc2df 100644
--- a/src/addons/mod/lesson/pages/user-retake/user-retake.html
+++ b/src/addons/mod/lesson/pages/user-retake/user-retake.html
@@ -87,7 +87,7 @@
                         <ion-label>
                             <h3 class="item-heading">{{ 'addon.mod_lesson.question' | translate }}</h3>
                             <p>
-                                <core-format-text [component]="component" [componentId]="lesson?.coursemodule" [collapsible-item]="50"
+                                <core-format-text [component]="component" [componentId]="lesson?.coursemodule" collapsible-item
                                     [text]="page.contents" contextLevel="module" [contextInstanceId]="lesson?.coursemodule"
                                     [courseId]="courseId">
                                 </core-format-text>
diff --git a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
index 5dd51d9ff..9ccdc53bc 100644
--- a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
+++ b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
@@ -58,8 +58,8 @@
                 <ion-item class="ion-text-wrap">
                     <ion-label>
                         <h2>{{ 'addon.mod_workshop.conclusion' | translate }}</h2>
-                        <core-format-text [collapsible-item]="120" [component]="component" [componentId]="module.id"
-                            [text]="workshop!.conclusion" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
+                        <core-format-text collapsible-item [component]="component" [componentId]="module.id" [text]="workshop!.conclusion"
+                            contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
                         </core-format-text>
                     </ion-label>
                 </ion-item>
@@ -91,8 +91,8 @@
             <ion-item class="ion-text-wrap">
                 <ion-label>
                     <h2>{{ 'addon.mod_workshop.areainstructauthors' | translate }}</h2>
-                    <core-format-text [collapsible-item]="120" [component]="component" [componentId]="module.id"
-                        [text]="workshop!.instructauthors" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
+                    <core-format-text collapsible-item [component]="component" [componentId]="module.id" [text]="workshop!.instructauthors"
+                        contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
                     </core-format-text>
                 </ion-label>
             </ion-item>
@@ -141,7 +141,7 @@
                 <ion-item class="ion-text-wrap">
                     <ion-label>
                         <h2>{{ 'addon.mod_workshop.areainstructreviewers' | translate }}</h2>
-                        <core-format-text [collapsible-item]="120" [component]="component" [componentId]="module.id"
+                        <core-format-text collapsible-item [component]="component" [componentId]="module.id"
                             [text]="workshop!.instructreviewers" contextLevel="module" [contextInstanceId]="module.id"
                             [courseId]="courseId">
                         </core-format-text>
diff --git a/src/addons/notifications/pages/list/list.html b/src/addons/notifications/pages/list/list.html
index 965a5158d..d3b9fe72e 100644
--- a/src/addons/notifications/pages/list/list.html
+++ b/src/addons/notifications/pages/list/list.html
@@ -64,7 +64,7 @@
                 <ion-item class="ion-text-wrap">
                     <ion-label>
                         <core-format-text [text]="notification.mobiletext | coreCreateLinks" contextLevel="system" [contextInstanceId]="0"
-                            [collapsible-item]="120">
+                            collapsible-item>
                         </core-format-text>
                     </ion-label>
                 </ion-item>
diff --git a/src/core/directives/collapsible-item.ts b/src/core/directives/collapsible-item.ts
index 279089fc6..86acabe5f 100644
--- a/src/core/directives/collapsible-item.ts
+++ b/src/core/directives/collapsible-item.ts
@@ -20,8 +20,8 @@ import { CoreComponentsRegistry } from '@singletons/components-registry';
 import { CoreEventLoadingChangedData, CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreFormatTextDirective } from './format-text';
 
-const defaultMaxHeight = 64;
-const buttonHeight = 44;
+const defaultMaxHeight = 80;
+const minMaxHeight = 56;
 
 /**
  * Directive to make an element collapsible.
@@ -70,7 +70,7 @@ export class CoreCollapsibleItemDirective implements OnInit {
         } else {
             this.maxHeight = this.height;
         }
-        this.maxHeight = this.maxHeight < defaultMaxHeight ? defaultMaxHeight : this.maxHeight;
+        this.maxHeight = this.maxHeight < minMaxHeight ? defaultMaxHeight : this.maxHeight;
 
         if (!this.maxHeight) {
             // Do not collapse.
diff --git a/src/core/features/course/components/module-description/core-course-module-description.html b/src/core/features/course/components/module-description/core-course-module-description.html
index 1476d7476..0ada00665 100644
--- a/src/core/features/course/components/module-description/core-course-module-description.html
+++ b/src/core/features/course/components/module-description/core-course-module-description.html
@@ -1,7 +1,7 @@
 <ion-card *ngIf="description">
     <ion-item class="ion-text-wrap">
         <ion-label>
-            <core-format-text [text]="description" [component]="component" [componentId]="componentId" [collapsible-item]="120"
+            <core-format-text [text]="description" [component]="component" [componentId]="componentId" collapsible-item
                 [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId">
             </core-format-text>
         </ion-label>
diff --git a/src/core/features/course/components/module-info/core-course-module-info.html b/src/core/features/course/components/module-info/core-course-module-info.html
index aea829834..2ff034ce9 100644
--- a/src/core/features/course/components/module-info/core-course-module-info.html
+++ b/src/core/features/course/components/module-info/core-course-module-info.html
@@ -46,7 +46,7 @@
 <ion-item class="ion-text-wrap" *ngIf="description">
     <ion-label>
         <core-format-text [text]="description" [component]="component" [componentId]="componentId" contextLevel="module"
-            [contextInstanceId]="module.id" [courseId]="courseId" [collapsible-item]="expandDescription ? null : 120">
+            [contextInstanceId]="module.id" [courseId]="courseId" [collapsible-item]="expandDescription ? null : ''">
         </core-format-text>
     </ion-label>
 </ion-item>
diff --git a/src/core/features/course/components/module-summary/module-summary.html b/src/core/features/course/components/module-summary/module-summary.html
index a510cf893..11bb659c0 100644
--- a/src/core/features/course/components/module-summary/module-summary.html
+++ b/src/core/features/course/components/module-summary/module-summary.html
@@ -49,7 +49,7 @@
                     {{ 'core.description' | translate}}
                 </p>
                 <core-format-text [text]="description" [component]="component" [componentId]="componentId" contextLevel="module"
-                    [contextInstanceId]="module.id" [courseId]="courseId" [collapsible-item]="120">
+                    [contextInstanceId]="module.id" [courseId]="courseId" collapsible-item>
                 </core-format-text>
             </ion-label>
         </ion-item>
@@ -169,7 +169,7 @@
                             <ion-label>
                                 <p class="item-heading">{{ 'core.grades.feedback' | translate}}</p>
                                 <p>
-                                    <core-format-text [collapsible-item]="120" [text]="grade.feedback" contextLevel="course"
+                                    <core-format-text collapsible-item [text]="grade.feedback" contextLevel="course"
                                         [contextInstanceId]="courseId">
                                     </core-format-text>
                                 </p>
diff --git a/src/core/features/course/components/module/core-course-module.html b/src/core/features/course/components/module/core-course-module.html
index 60e2ece03..b9449db96 100644
--- a/src/core/features/course/components/module/core-course-module.html
+++ b/src/core/features/course/components/module/core-course-module.html
@@ -66,7 +66,7 @@
             class="ion-text-wrap core-course-module-handler core-course-module-info {{module.handlerData.class}}" [ngClass]="{
                 'item-dimmed': module.visible === 0 || module.uservisible === false
             }">
-            <ion-label collapsible-item>
+            <ion-label [collapsible-item]="64">
                 <core-format-text class="core-module-description" *ngIf="module.description" [text]="module.description"
                     contextLevel="module" [contextInstanceId]="module.id" [courseId]="module.course">
                 </core-format-text>
diff --git a/src/core/features/course/pages/course-summary/course-summary.html b/src/core/features/course/pages/course-summary/course-summary.html
index 9fbfb57a4..625e360ae 100644
--- a/src/core/features/course/pages/course-summary/course-summary.html
+++ b/src/core/features/course/pages/course-summary/course-summary.html
@@ -72,8 +72,7 @@
                     <p class="item-heading">
                         {{'core.summary' | translate}}
                     </p>
-                    <core-format-text [text]="course.summary" [collapsible-item]="120" contextLevel="course"
-                        [contextInstanceId]="course.id">
+                    <core-format-text [text]="course.summary" collapsible-item contextLevel="course" [contextInstanceId]="course.id">
                     </core-format-text>
                 </ion-label>
             </ion-item>
@@ -105,7 +104,7 @@
                                 </core-format-text>
                             </span><span class="core-customfieldseparator">: </span>
                             <span class="core-customfieldvalue">
-                                <core-format-text [text]="field.value" [collapsible-item]="120" contextLevel="course"
+                                <core-format-text [text]="field.value" collapsible-item contextLevel="course"
                                     [contextInstanceId]="course.id">
                                 </core-format-text>
                             </span>
diff --git a/src/core/features/courses/pages/categories/categories.html b/src/core/features/courses/pages/categories/categories.html
index fa208cdca..da1c214e4 100644
--- a/src/core/features/courses/pages/categories/categories.html
+++ b/src/core/features/courses/pages/categories/categories.html
@@ -34,7 +34,7 @@
                         </core-format-text>
                     </p>
                     <p *ngIf="currentCategory.description">
-                        <core-format-text [text]="currentCategory.description" [collapsible-item]="120" contextLevel="coursecat"
+                        <core-format-text [text]="currentCategory.description" collapsible-item contextLevel="coursecat"
                             [contextInstanceId]="currentCategory.id"></core-format-text>
                     </p>
                 </ion-label>
diff --git a/src/core/features/grades/pages/course/course.html b/src/core/features/grades/pages/course/course.html
index 2c237cf64..30e043ec3 100644
--- a/src/core/features/grades/pages/course/course.html
+++ b/src/core/features/grades/pages/course/course.html
@@ -55,7 +55,7 @@
                                     </td>
                                     <td *ngIf="column.name === 'feedback' && row.feedback !== undefined"
                                         class="ion-text-start core-grades-table-feedback" [class.ion-hide-md-down]="column.hiddenPhone">
-                                        <core-format-text [collapsible-item]="120" [text]="row.feedback" contextLevel="course"
+                                        <core-format-text collapsible-item [text]="row.feedback" contextLevel="course"
                                             [contextInstanceId]="courseId">
                                         </core-format-text>
                                     </td>
@@ -124,7 +124,7 @@
                                         <ion-label>
                                             <h2>{{ 'core.grades.feedback' | translate}}</h2>
                                             <p>
-                                                <core-format-text [collapsible-item]="120" [text]="row.feedback" contextLevel="course"
+                                                <core-format-text collapsible-item [text]="row.feedback" contextLevel="course"
                                                     [contextInstanceId]="courseId">
                                                 </core-format-text>
                                             </p>
diff --git a/src/theme/components/collapsible-item.scss b/src/theme/components/collapsible-item.scss
index 30fc99352..ab23a9b1d 100644
--- a/src/theme/components/collapsible-item.scss
+++ b/src/theme/components/collapsible-item.scss
@@ -2,6 +2,8 @@
 .collapsible-item {
     --display-toggle: none;
     --height: none;
+    --toggle-size: 24px;
+    --gradient-size: 44px;
 
     &.collapsible-loading-height {
         display: block !important;
@@ -17,10 +19,10 @@
     @include media-breakpoint-down(sm) {
         &.collapsible-enabled:not(.collapsible-loading-height) {
             position: relative;
-            padding-bottom: var(--collapsible-min-button-height); // So the Show less button can fit.
+            padding-bottom: var(--toggle-size); // So the Show less button can fit.
             --display-toggle: block;
             @include core-transition(height max-height, 300ms);
-            height: calc(var(--height, auto) + var(--collapsible-min-button-height));
+            height: calc(var(--height, auto) + var(--toggle-size));
 
             .collapsible-toggle {
                 position: absolute;
@@ -28,12 +30,12 @@
                 text-align: center;
                 z-index: 7;
                 text-transform: none;
-                font-size: 14px;
+                font-size: 11px;
                 font-weight: normal;
                 background-color: var(--collapsible-toggle-background);
                 color: var(--collapsible-toggle-text);
-                min-height: var(--a11y-min-target-size);
-                min-width: var(--a11y-min-target-size);
+                min-height: var(--toggle-size);
+                min-width: var(--toggle-size);
                 --border-radius: var(--huge-radius);
                 border-radius: var(--border-radius);
                 --padding-start: 0px;
@@ -41,8 +43,8 @@
                 margin: 0px;
 
                 .collapsible-toggle-arrow {
-                    width: var(--a11y-min-target-size);
-                    height: var(--a11y-min-target-size);
+                    width: var(--toggle-size);
+                    height: var(--toggle-size);
 
                     background-position: center;
                     background-repeat: no-repeat;
@@ -61,7 +63,7 @@
 
             &.collapsible-collapsed {
                 overflow: hidden;
-                min-height: calc(var(--collapsible-min-button-height) + 12px);
+                min-height: calc(var(--toggle-size) + 12px);
                 height: var(--height, auto);
 
                 .collapsible-toggle-arrow {
@@ -73,8 +75,8 @@
                     height: 60px;
                     position: absolute;
                     @include position(null, 0, 0, 0);
-                    background: -webkit-linear-gradient(top, rgba(var(--background-gradient-rgb), 0) calc(100% - 56px), rgba(var(--background-gradient-rgb), 1) calc(100% - 5px));
-                    background: linear-gradient(to bottom, rgba(var(--background-gradient-rgb), 0) calc(100% - 56px), rgba(var(--background-gradient-rgb), 1) calc(100% - 5px));
+                    background: -webkit-linear-gradient(top, rgba(var(--background-gradient-rgb), 0) calc(100% - var(--gradient-size)), rgba(var(--background-gradient-rgb), 1) calc(100% - 4px));
+                    background: linear-gradient(to bottom, rgba(var(--background-gradient-rgb), 0) calc(100% - var(--gradient-size)), rgba(var(--background-gradient-rgb), 1) calc(100% - 4px));
                     z-index: 6;
                 }
             }
diff --git a/src/theme/theme.dark.scss b/src/theme/theme.dark.scss
index ab278951a..a3a1a18da 100644
--- a/src/theme/theme.dark.scss
+++ b/src/theme/theme.dark.scss
@@ -39,7 +39,11 @@
     --subdued-text-color:       var(--medium);
     --stroke:                   var(--gray-700);
 
-    --contrast-background: black;
+    --contrast-background: var(--gray-900);
+
+    --drop-shadow: 0, 0, 0, 1;
+    --scroll-shadow-bottom: drop-shadow(0px -3px 3px rgba(var(--drop-shadow)));
+    --scroll-shadow-top: drop-shadow(0px 3px 3px rgba(var(--drop-shadow)));
 
     --ion-card-color: var(--text-color);
     --ion-card-background: var(--ion-item-background);
@@ -73,7 +77,7 @@
     --core-header-toolbar-color:        var(--text-color);
     --core-header-toolbar-border-color: var(--stroke);
 
-    --core-tabs-background: var(--gray-800);
+    --core-tabs-background: var(--gray-900);
     --core-tab-background: var(--core-tabs-background);
     --core-tab-color: var(--subdued-text-color);
     --core-tab-border-color: var(--gray-200);
@@ -104,7 +108,7 @@
     --core-combobox-color: var(--text-color);
     --core-combobox-border-color: var(--core-input-stroke);
 
-    --collapsible-toggle-background: var(--light);
+    --collapsible-toggle-text: var(--medium);
 
     --background-gradient-rgb: #{$ion-item-background-dark-rgb};
 
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 4f4deceb4..e3afcfc70 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -315,9 +315,8 @@
     --selected-item-color: var(--primary);
     --selected-item-border-width: 5px;
 
-    --collapsible-toggle-background: var(--light);
-    --collapsible-min-button-height: 44px;
-    --collapsible-toggle-text: var(--text-color);
+    --collapsible-toggle-background: transparent;
+    --collapsible-toggle-text: var(--medium);
 
     --background-gradient-rgb: #{$ion-item-background-rgb};
 

From 74670a270269994af9c04cc5313240e994a07fd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 9 Mar 2022 16:39:51 +0100
Subject: [PATCH 0678/1008] MOBILE-3814 user-menu: Add loading spinner

---
 .../components/user-menu/user-menu.html       | 102 +++++++++---------
 .../components/user-menu/user-menu.ts         |   3 -
 2 files changed, 52 insertions(+), 53 deletions(-)

diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.html b/src/core/features/mainmenu/components/user-menu/user-menu.html
index 3932978ae..d6e138a39 100644
--- a/src/core/features/mainmenu/components/user-menu/user-menu.html
+++ b/src/core/features/mainmenu/components/user-menu/user-menu.html
@@ -13,59 +13,61 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-list>
-        <ion-item button class="core-usermenu-siteinfo ion-text-wrap" *ngIf="siteInfo" lines="full" detail="false" [href]="siteUrl"
-            core-link auto-login="yes">
-            <ion-label>
-                <!-- Show site logo. -->
-                <img class="core-usermenu-site-logo" *ngIf="siteLogo && siteLogoLoaded" [src]="siteLogo" role="presentation" alt=""
-                    onError="this.class='image-not-found'">
-                <p class="core-usermenu-sitename">
-                    <core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="0" [wsNotFiltered]="true">
-                    </core-format-text>
-                </p>
-                <a [href]="siteUrl" core-link auto-login="yes" class="core-usermenu-siteurl">{{ siteUrl }}</a>
-            </ion-label>
-        </ion-item>
-        <ion-item button class="core-usermenu-handler ion-text-wrap" *ngIf="siteInfo" lines="full" (click)="openUserProfile($event)"
-            detail="true" [attr.aria-label]="'core.user.profile' | translate">
-            <core-user-avatar [user]="siteInfo" [userId]="siteInfo.userid" [linkProfile]="false" slot="start"></core-user-avatar>
-            <ion-label>
-                <h2>{{ siteInfo.fullname }}</h2>
-            </ion-label>
-        </ion-item>
+    <core-loading [hideUntil]="siteLogoLoaded && handlersLoaded">
+        <ion-list>
+            <ion-item button class="core-usermenu-siteinfo ion-text-wrap" *ngIf="siteInfo" lines="full" detail="false" [href]="siteUrl"
+                core-link auto-login="yes">
+                <ion-label>
+                    <!-- Show site logo. -->
+                    <img class="core-usermenu-site-logo" *ngIf="siteLogo && siteLogoLoaded" [src]="siteLogo" role="presentation" alt=""
+                        onError="this.class='image-not-found'">
+                    <p class="core-usermenu-sitename">
+                        <core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="0" [wsNotFiltered]="true">
+                        </core-format-text>
+                    </p>
+                    <a [href]="siteUrl" core-link auto-login="yes" class="core-usermenu-siteurl">{{ siteUrl }}</a>
+                </ion-label>
+            </ion-item>
+            <ion-item button class="core-usermenu-handler ion-text-wrap" *ngIf="siteInfo" lines="full" (click)="openUserProfile($event)"
+                detail="true" [attr.aria-label]="'core.user.profile' | translate">
+                <core-user-avatar [user]="siteInfo" [userId]="siteInfo.userid" [linkProfile]="false" slot="start"></core-user-avatar>
+                <ion-label>
+                    <h2>{{ siteInfo.fullname }}</h2>
+                </ion-label>
+            </ion-item>
 
-        <ion-item class="ion-text-center" *ngIf="(!handlers || !handlers.length) && !handlersLoaded">
-            <ion-label>
-                <ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner>
-            </ion-label>
-        </ion-item>
+            <ion-item class="ion-text-center" *ngIf="(!handlers || !handlers.length) && !handlersLoaded">
+                <ion-label>
+                    <ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner>
+                </ion-label>
+            </ion-item>
 
-        <ion-item button *ngFor="let handler of handlers" class="ion-text-wrap" (click)="handlerClicked($event, handler)"
-            [ngClass]="['core-user-menu-handler', handler.class || '']" [hidden]="handler.hidden"
-            [attr.aria-label]="handler.title | translate" detail="true">
-            <ion-icon *ngIf="handler.icon" [name]="handler.icon" slot="start" aria-hidden="true"></ion-icon>
-            <ion-label>
-                <p class="item-heading">{{ handler.title | translate }}</p>
-            </ion-label>
-            <ion-badge slot="end" *ngIf="handler.showBadge" [hidden]="handler.loading || !handler.badge" aria-hidden="true">
-                {{handler.badge}}
-            </ion-badge>
-            <span *ngIf="handler.showBadge && handler.badge && handler.badgeA11yText" class="sr-only">
-                {{ handler.badgeA11yText | translate: {$a : handler.badge } }}
-            </span>
-            <ion-spinner slot="end" *ngIf="handler.showBadge && handler.loading" [attr.aria-label]="'core.loading' | translate">
-            </ion-spinner>
-        </ion-item>
+            <ion-item button *ngFor="let handler of handlers" class="ion-text-wrap" (click)="handlerClicked($event, handler)"
+                [ngClass]="['core-user-menu-handler', handler.class || '']" [hidden]="handler.hidden"
+                [attr.aria-label]="handler.title | translate" detail="true">
+                <ion-icon *ngIf="handler.icon" [name]="handler.icon" slot="start" aria-hidden="true"></ion-icon>
+                <ion-label>
+                    <p class="item-heading">{{ handler.title | translate }}</p>
+                </ion-label>
+                <ion-badge slot="end" *ngIf="handler.showBadge" [hidden]="handler.loading || !handler.badge" aria-hidden="true">
+                    {{handler.badge}}
+                </ion-badge>
+                <span *ngIf="handler.showBadge && handler.badge && handler.badgeA11yText" class="sr-only">
+                    {{ handler.badgeA11yText | translate: {$a : handler.badge } }}
+                </span>
+                <ion-spinner slot="end" *ngIf="handler.showBadge && handler.loading" [attr.aria-label]="'core.loading' | translate">
+                </ion-spinner>
+            </ion-item>
 
-        <ion-item button (click)="openPreferences($event)" [attr.aria-label]="'core.settings.preferences' | translate" detail="true"
-            class="core-user-menu-preferences">
-            <ion-icon name="fas-wrench" slot="start" aria-hidden="true"></ion-icon>
-            <ion-label>
-                <p class="item-heading">{{ 'core.settings.preferences' | translate }}</p>
-            </ion-label>
-        </ion-item>
-    </ion-list>
+            <ion-item button (click)="openPreferences($event)" [attr.aria-label]="'core.settings.preferences' | translate" detail="true"
+                class="core-user-menu-preferences">
+                <ion-icon name="fas-wrench" slot="start" aria-hidden="true"></ion-icon>
+                <ion-label>
+                    <p class="item-heading">{{ 'core.settings.preferences' | translate }}</p>
+                </ion-label>
+            </ion-item>
+        </ion-list>
+    </core-loading>
 </ion-content>
 <ion-footer>
     <ion-item *ngIf="displaySwitchAccount" button lines="full" (click)="switchAccounts($event)" detail="true" class="ion-text-wrap">
diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.ts b/src/core/features/mainmenu/components/user-menu/user-menu.ts
index 87cd958f9..c84bc642a 100644
--- a/src/core/features/mainmenu/components/user-menu/user-menu.ts
+++ b/src/core/features/mainmenu/components/user-menu/user-menu.ts
@@ -49,7 +49,6 @@ export class CoreMainMenuUserMenuComponent implements OnInit, OnDestroy {
     siteUrl?: string;
     handlers: CoreUserProfileHandlerData[] = [];
     handlersLoaded = false;
-    loaded = false;
     user?: CoreUserProfile;
     displaySwitchAccount = true;
     removeAccountOnLogout = false;
@@ -68,8 +67,6 @@ export class CoreMainMenuUserMenuComponent implements OnInit, OnDestroy {
         this.displaySwitchAccount = !currentSite.isFeatureDisabled('NoDelegate_SwitchAccount');
         this.removeAccountOnLogout = !!CoreConstants.CONFIG.removeaccountonlogout;
 
-        this.loaded = true;
-
         this.loadSiteLogo(currentSite);
 
         // Load the handlers.

From c626c38acd57b45709fbd3612a29ea3669f45c2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 9 Mar 2022 17:56:19 +0100
Subject: [PATCH 0679/1008] MOBILE-3814 style: Use box-shadow instead of
 filters

---
 src/theme/components/collapsible-header.scss |  2 +-
 src/theme/components/discussion.scss         |  1 +
 src/theme/theme.base.scss                    | 15 ++++++++-------
 src/theme/theme.dark.scss                    |  6 +++---
 src/theme/theme.light.scss                   | 15 ++++++---------
 5 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/theme/components/collapsible-header.scss b/src/theme/components/collapsible-header.scss
index 41a6f1e03..c0650635a 100644
--- a/src/theme/components/collapsible-header.scss
+++ b/src/theme/components/collapsible-header.scss
@@ -38,7 +38,7 @@
     }
 
     &.is-active.is-collapsed.is-within-content ion-header.core-header-shadow {
-        --core-header-shadow: var(--scroll-shadow-bottom, none);
+        --core-header-shadow: var(--drop-shadow-bottom, none);
     }
 
     &.is-active {
diff --git a/src/theme/components/discussion.scss b/src/theme/components/discussion.scss
index d6756b142..540188a0e 100644
--- a/src/theme/components/discussion.scss
+++ b/src/theme/components/discussion.scss
@@ -57,6 +57,7 @@ ion-item.addon-message {
     }
 
     &:hover {
+        -webkit-filter: drop-shadow(2px 2px 2px rgba(0,0,0,.3));
         filter: drop-shadow(2px 2px 2px rgba(0,0,0,.3));
     }
 
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 41a76c55c..732686dd3 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -510,7 +510,6 @@ ion-toast {
 // Ionic list.
 ion-list {
     padding: 0 !important;
-    --ion-item-background: transparent;
 }
 
 // Safe areas
@@ -740,7 +739,7 @@ body.core-iframe-fullscreen ion-router-outlet {
         ion-label {
             white-space: normal !important;
         }
-        ion-item > ion-icon {
+        ion-item > ion-icon[slot] {
             color: var(--color-shade);
             @include margin-horizontal(null, 16px);
         }
@@ -753,7 +752,7 @@ body.core-iframe-fullscreen ion-router-outlet {
         --border-width: 0 0 3px 0;
         --border-color: var(--color-base);
         --inner-border-width: 0px;
-        ion-icon {
+        > ion-icon[slot] {
             color: var(--color-base);
         }
     }
@@ -836,8 +835,7 @@ ion-toolbar h1 .core-bar-button-image img {
 // Action sheet.
 .md ion-action-sheet {
     .action-sheet-group-cancel {
-        -webkit-filter: drop-shadow(0px 3px 6px rgba(var(--drop-shadow)));
-        filter: drop-shadow(0px 3px 6px rgba(var(--drop-shadow)));
+        box-shadow: var(--drop-shadow-top, none);
     }
 
     .action-sheet-title {
@@ -1348,7 +1346,10 @@ ion-item.item.divider {
     ion-label h2.big {
         font-size: var(--item-divider-font-size-big);
     }
+}
 
+ion-item-divider.item,
+ion-item.item {
     .expandable-status-icon {
         font-size: 18px;
         @include core-transition(transform, 200ms);
@@ -1444,8 +1445,7 @@ ion-grid.core-no-grid > ion-row {
         margin-bottom: 8px;
     }
 
-    filter: var(--scroll-shadow-top, none);
-    -webkit-filter: var(--scroll-shadow-top, none);
+    box-shadow: var(--drop-shadow-top, none);
     width: 100%;
     bottom: 0;
     z-index: 3;
@@ -1473,6 +1473,7 @@ ion-grid.core-no-grid > ion-row {
 ion-header.no-title {
     --core-header-toolbar-border-width: 0;
     --core-header-toolbar-background: transparent;
+    --core-header-shadow: none !important;
 
     ion-toolbar .button.button-clear,
     ion-toolbar .button.button-solid {
diff --git a/src/theme/theme.dark.scss b/src/theme/theme.dark.scss
index a3a1a18da..15d9b7e14 100644
--- a/src/theme/theme.dark.scss
+++ b/src/theme/theme.dark.scss
@@ -41,9 +41,9 @@
 
     --contrast-background: var(--gray-900);
 
-    --drop-shadow: 0, 0, 0, 1;
-    --scroll-shadow-bottom: drop-shadow(0px -3px 3px rgba(var(--drop-shadow)));
-    --scroll-shadow-top: drop-shadow(0px 3px 3px rgba(var(--drop-shadow)));
+    --drop-shadow-color: 0, 0, 0, 1;
+    --drop-shadow-top: 0px 2px 5px rgba(var(--drop-shadow-color));
+    --drop-shadow-bottom: 0px -2px 5px rgba(var(--drop-shadow-color));
 
     --ion-card-color: var(--text-color);
     --ion-card-background: var(--ion-item-background);
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index e3afcfc70..8d0d29859 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -85,9 +85,9 @@
 
     --contrast-background: white;
 
-    --drop-shadow: 0, 0, 0, 0.5;
-    --scroll-shadow-bottom: drop-shadow(0px -3px 3px rgba(var(--drop-shadow)));
-    --scroll-shadow-top: drop-shadow(0px 3px 3px rgba(var(--drop-shadow)));
+    --drop-shadow-color: 0, 0, 0, 0.5;
+    --drop-shadow-top: 0px 2px 5px rgba(var(--drop-shadow-color));
+    --drop-shadow-bottom: 0px -2px 5px rgba(var(--drop-shadow-color));
 
     --ion-text-color: var(--text-color);
     --ion-text-color-rgb: #{$text-color-rgb};
@@ -143,13 +143,10 @@
     --core-header-toolbar-color: var(--text-color);
     --core-header-toolbar-height: 48px;
     --core-header-shadow: none;
-    html.ios {
-        --core-header-toolbar-height: 48px;
-    }
 
     ion-header {
-        filter: var(--core-header-shadow, none);
-        -webkit-filter: var(--core-header-shadow, none);
+        box-shadow: var(--core-header-shadow, none);
+        transition: box-shadow 0.5s;
 
         ion-toolbar {
             --color: var(--core-header-toolbar-color);
@@ -171,7 +168,7 @@
 
 
     ion-header.core-header-shadow {
-        --core-header-shadow: var(--scroll-shadow-bottom, none);
+        --core-header-shadow: var(--drop-shadow-bottom, none);
     }
 
     ion-header::after {

From 6d249498f4e1f9d29fab34c4af430a423fa00386 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 10 Mar 2022 09:28:11 +0100
Subject: [PATCH 0680/1008] MOBILE-3814 collapsible: Change height var name to
 avoid confusion

---
 src/core/directives/collapsible-item.ts    |  6 +++---
 src/theme/components/collapsible-item.scss | 10 +++++-----
 src/theme/components/format-text.scss      |  4 +++-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/core/directives/collapsible-item.ts b/src/core/directives/collapsible-item.ts
index 86acabe5f..e0c9b15b9 100644
--- a/src/core/directives/collapsible-item.ts
+++ b/src/core/directives/collapsible-item.ts
@@ -176,11 +176,11 @@ export class CoreCollapsibleItemDirective implements OnInit {
      */
     protected setHeight(height?: number): void {
         if (height) {
-            this.element.style.setProperty('--height', height + 'px');
+            this.element.style.setProperty('--collapsible-height', height + 'px');
         } else if (this.expandedHeight) {
-            this.element.style.setProperty('--height', this.expandedHeight + 'px');
+            this.element.style.setProperty('--collapsible-height', this.expandedHeight + 'px');
         } else {
-            this.element.style.removeProperty('--height');
+            this.element.style.removeProperty('--collapsible-height');
 
         }
     }
diff --git a/src/theme/components/collapsible-item.scss b/src/theme/components/collapsible-item.scss
index ab23a9b1d..3aad02e3e 100644
--- a/src/theme/components/collapsible-item.scss
+++ b/src/theme/components/collapsible-item.scss
@@ -1,14 +1,14 @@
 
 .collapsible-item {
     --display-toggle: none;
-    --height: none;
+    --collapsible-height: none;
     --toggle-size: 24px;
     --gradient-size: 44px;
 
     &.collapsible-loading-height {
         display: block !important;
         height: auto !important;
-        --height: auto !important;
+        --collapsible-height: auto !important;
         --display-toggle: none !important;
     }
 
@@ -21,8 +21,8 @@
             position: relative;
             padding-bottom: var(--toggle-size); // So the Show less button can fit.
             --display-toggle: block;
-            @include core-transition(height max-height, 300ms);
-            height: calc(var(--height, auto) + var(--toggle-size));
+            @include core-transition(height, 300ms);
+            height: calc(var(--collapsible-height, auto) + var(--toggle-size));
 
             .collapsible-toggle {
                 position: absolute;
@@ -64,7 +64,7 @@
             &.collapsible-collapsed {
                 overflow: hidden;
                 min-height: calc(var(--toggle-size) + 12px);
-                height: var(--height, auto);
+                height: var(--collapsible-height, auto);
 
                 .collapsible-toggle-arrow {
                     transform: rotate(90deg);
diff --git a/src/theme/components/format-text.scss b/src/theme/components/format-text.scss
index 81003b07a..2bd618242 100644
--- a/src/theme/components/format-text.scss
+++ b/src/theme/components/format-text.scss
@@ -77,13 +77,15 @@ core-format-text {
             }
             &.collapsible-collapsed .core-format-text-content {
                 overflow: hidden;
+                height: var(--collapsible-height);
+                @include core-transition(height, 300ms);
             }
         }
 
         @if ($core-format-text-never-shorten) {
             &.collapsible-enabled {
                 --display-toggle: none !important;
-                --max-height: none !important;
+                --collapsible-height: auto !important;
 
                 .collapsible-toggle {
                     display: none !important;

From 7661832ac46c59422becb2cd400a1cce5c811412 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 10 Mar 2022 11:13:18 +0100
Subject: [PATCH 0681/1008] MOBILE-3833 a11y: Add downloaded labels in storage

---
 .../storagemanager/pages/course-storage/course-storage.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.html b/src/addons/storagemanager/pages/course-storage/course-storage.html
index c66ed172f..35b3f2b8f 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.html
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.html
@@ -53,7 +53,8 @@
                             </p>
                             <ion-badge [color]="section.downloadStatus == statusDownloaded ? 'success' : 'light'"
                                 *ngIf="section.totalSize > 0">
-                                <ion-icon aria-hidden="true" name="fam-cloud-done" *ngIf="section.downloadStatus == statusDownloaded">
+                                <ion-icon name="fam-cloud-done" *ngIf="section.downloadStatus == statusDownloaded"
+                                    [attr.aria-label]="'core.downloaded' | translate">
                                 </ion-icon>{{ section.totalSize | coreBytesToSize }}
                             </ion-badge>
                             <!-- Download progress. -->
@@ -98,7 +99,8 @@
                                 </h3>
                                 <ion-badge [color]="module.downloadStatus == statusDownloaded ? 'success' : 'light'"
                                     *ngIf="module.totalSize > 0">
-                                    <ion-icon aria-hidden="true" name="fam-cloud-done" *ngIf="module.downloadStatus == statusDownloaded">
+                                    <ion-icon name="fam-cloud-done" *ngIf="module.downloadStatus == statusDownloaded"
+                                        [attr.aria-label]="'core.downloaded' | translate">
                                     </ion-icon>{{ module.totalSize | coreBytesToSize }}
                                 </ion-badge>
                             </ion-label>

From 39e74f57c25f7bd00902f06bf368a0a39967e2f7 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 10 Mar 2022 11:13:42 +0100
Subject: [PATCH 0682/1008] MOBILE-3833 filepool: Fix dislay downloaded
 background images

---
 .../services/remotethemes-handler.ts          |  2 +-
 src/core/directives/external-content.ts       |  2 +-
 .../services/siteplugins-helper.ts            |  5 +++
 src/core/services/filepool.ts                 | 44 ++++++++++---------
 4 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/src/addons/remotethemes/services/remotethemes-handler.ts b/src/addons/remotethemes/services/remotethemes-handler.ts
index 5cde27432..d04eb9cd3 100644
--- a/src/addons/remotethemes/services/remotethemes-handler.ts
+++ b/src/addons/remotethemes/services/remotethemes-handler.ts
@@ -90,7 +90,7 @@ export class AddonRemoteThemesHandlerService implements CoreStyleHandler {
         if (style != '') {
             // Treat the CSS.
             CoreUtils.ignoreErrors(
-                CoreFilepool.treatCSSCode(siteId, fileUrl, style, COMPONENT, 2),
+                CoreFilepool.treatCSSCode(siteId, fileUrl, style, COMPONENT, 1),
             );
         }
 
diff --git a/src/core/directives/external-content.ts b/src/core/directives/external-content.ts
index 17635acd3..9d3afa58d 100644
--- a/src/core/directives/external-content.ts
+++ b/src/core/directives/external-content.ts
@@ -271,7 +271,7 @@ export class CoreExternalContentDirective implements AfterViewInit, OnChanges, O
         urls = CoreUtils.uniqueArray(urls); // Remove duplicates.
 
         const promises = urls.map(async (url) => {
-            const finalUrl = await CoreFilepool.getUrlByUrl(siteId, url, this.component, this.componentId, 0, true, true);
+            const finalUrl = await CoreFilepool.getSrcByUrl(siteId, url, this.component, this.componentId, 0, true, true);
 
             this.logger.debug('Using URL ' + finalUrl + ' for ' + url + ' in inline styles');
             inlineStyles = inlineStyles.replace(new RegExp(url, 'gi'), finalUrl);
diff --git a/src/core/features/siteplugins/services/siteplugins-helper.ts b/src/core/features/siteplugins/services/siteplugins-helper.ts
index 1c715bb6d..5de98ba3a 100644
--- a/src/core/features/siteplugins/services/siteplugins-helper.ts
+++ b/src/core/features/siteplugins/services/siteplugins-helper.ts
@@ -195,6 +195,11 @@ export class CoreSitePluginsHelperProvider {
             return '';
         }
 
+        // Update the schema with the final CSS URL.
+        if (handlerSchema.styles) {
+            handlerSchema.styles.url = url;
+        }
+
         // Download the file if not downloaded or the version changed.
         const path = await CoreFilepool.downloadUrl(
             site.getId(),
diff --git a/src/core/services/filepool.ts b/src/core/services/filepool.ts
index b3db06a44..55675f65f 100644
--- a/src/core/services/filepool.ts
+++ b/src/core/services/filepool.ts
@@ -2948,7 +2948,7 @@ export class CoreFilepoolProvider {
      * and store the result in the CSS file.
      *
      * @param siteId Site ID.
-     * @param fileUrl CSS file URL.
+     * @param fileUrl CSS file URL. If a local path is supplied the app will assume it's the path where to write the file.
      * @param cssCode CSS code.
      * @param component The component to link the file to.
      * @param componentId An ID to use in conjunction with the component.
@@ -2966,29 +2966,33 @@ export class CoreFilepoolProvider {
         const urls = CoreDomUtils.extractUrlsFromCSS(cssCode);
         let updated = false;
 
-        // Get the path of the CSS file.
-        const filePath = await this.getFilePathByUrl(siteId, fileUrl);
+        // Get the path of the CSS file. If it's a local file, assume it's the path where to write the file.
+        const filePath = CoreUrlUtils.isLocalFileUrl(fileUrl) ?
+            fileUrl :
+            await this.getFilePathByUrl(siteId, fileUrl);
 
         // Download all files in the CSS.
         await Promise.all(urls.map(async (url) => {
-            // Download the file only if it's an online URL.
-            if (CoreUrlUtils.isLocalFileUrl(url)) {
-                return;
-            }
-
             try {
-                const fileUrl = await this.downloadUrl(
-                    siteId,
-                    url,
-                    false,
-                    component,
-                    componentId,
-                    0,
-                    undefined,
-                    undefined,
-                    undefined,
-                    revision,
-                );
+                let fileUrl = url;
+                if (!CoreUrlUtils.isLocalFileUrl(url)) {
+                    // Not a local file, download it.
+                    fileUrl = await this.downloadUrl(
+                        siteId,
+                        url,
+                        false,
+                        component,
+                        componentId,
+                        0,
+                        undefined,
+                        undefined,
+                        undefined,
+                        revision,
+                    );
+                }
+
+                // Convert the URL so it works in mobile devices.
+                fileUrl = CoreFile.convertFileSrc(fileUrl);
 
                 if (fileUrl != url) {
                     cssCode = cssCode.replace(new RegExp(CoreTextUtils.escapeForRegex(url), 'g'), fileUrl);

From 031a261bc118f50a9bd144c1d3e078b28ed8a270 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 10 Mar 2022 10:00:20 +0100
Subject: [PATCH 0683/1008] MOBILE-3814 style: Fix some styles

---
 .../features/viewer/components/text/text.scss |  6 ++--
 .../features/viewer/components/text/text.ts   |  1 +
 src/theme/theme.base.scss                     | 30 ++++++++-----------
 3 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/src/core/features/viewer/components/text/text.scss b/src/core/features/viewer/components/text/text.scss
index 4377e35e3..05570b320 100644
--- a/src/core/features/viewer/components/text/text.scss
+++ b/src/core/features/viewer/components/text/text.scss
@@ -1,5 +1,3 @@
-ion-app.app-root page-core-viewer-text {
-    ion-footer {
-        padding: 6px;
-    }
+ion-footer {
+    padding: 6px;
 }
diff --git a/src/core/features/viewer/components/text/text.ts b/src/core/features/viewer/components/text/text.ts
index cd72a31f6..a6ae057fa 100644
--- a/src/core/features/viewer/components/text/text.ts
+++ b/src/core/features/viewer/components/text/text.ts
@@ -24,6 +24,7 @@ import { ModalController } from '@singletons';
 @Component({
     selector: 'page-core-viewer-text',
     templateUrl: 'text.html',
+    styleUrls: ['text.scss'],
 })
 export class CoreViewerTextComponent {
 
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 732686dd3..f8384c689 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -152,6 +152,7 @@ ion-toolbar {
 // Header.
 ion-header {
     z-index: 12; // To hide ion-slides on scroll.
+    --core-header-buttons-background: var(--core-header-toolbar-background);
 
     ion-toolbar {
         ion-spinner {
@@ -159,26 +160,22 @@ ion-header {
         }
 
         ion-back-button,
-        .in-toolbar.button-clear {
+        .in-toolbar.button-clear,
+        .in-toolbar.button-solid,
+        .button.button-clear,
+        .button.button-solid {
             --color: var(--core-header-toolbar-color);
-            --background: var(--core-header-toolbar-background);
+            --background: var(--core-header-buttons-background);
             --ion-toolbar-color: var(--core-header-toolbar-color);
             --border-radius: var(--huge-radius);
+            --primary: var(--core-header-toolbar-color);
         }
         ion-back-button::part(text) {
             display: none;
         }
 
-        .button.button-clear,
-        .button.button-solid {
-            --background: var(--core-header-toolbar-background);
-            --color: var(--core-header-toolbar-color);
-            --primary: var(--core-header-toolbar-color);
-        }
-
         .button.button-clear.button-has-icon-only,
         .button.button-solid.button-has-icon-only {
-            --border-radius: var(--huge-radius);
             width: var(--a11y-min-target-size);
             height: var(--a11y-min-target-size);
             ion-icon {
@@ -186,7 +183,6 @@ ion-header {
             }
         }
 
-
         .core-navbar-button-hidden {
             display: none !important;
         }
@@ -262,6 +258,10 @@ ion-footer ion-toolbar.ion-color-contrast {
     background-color: var(--contrast-background);
 }
 
+ion-footer {
+    background-color: var(--contrast-background);
+}
+
 // Ionic icon.
 ion-icon {
     position: relative;
@@ -1474,15 +1474,9 @@ ion-header.no-title {
     --core-header-toolbar-border-width: 0;
     --core-header-toolbar-background: transparent;
     --core-header-shadow: none !important;
-
-    ion-toolbar .button.button-clear,
-    ion-toolbar .button.button-solid {
-        --background: var(--ion-background-color);
-    }
+    --core-header-buttons-background: var(--ion-background-color);
 }
 
-
-
 // To make core-swipe-slides fill the remaining height.
 .core-swipe-slides-container {
     display: flex;

From d6269cf16d6889bd1f60bbdf9596a33ac7fa54a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 10 Mar 2022 11:25:10 +0100
Subject: [PATCH 0684/1008] MOBILE-3814 avatar: Improve a11y and reduce size of
 avatars

---
 .../competency/pages/competency/competency.html       |  2 +-
 .../submission/addon-mod-assign-submission.html       |  6 +++---
 .../components/index/addon-mod-choice-index.html      |  2 +-
 src/addons/mod/feedback/pages/attempt/attempt.html    |  2 +-
 .../pages/attempt-results/attempt-results.html        |  2 +-
 .../pages/user-attempts/user-attempts.html            |  2 +-
 .../mod/lesson/pages/user-retake/user-retake.html     |  2 +-
 src/core/components/user-avatar/user-avatar.scss      | 11 +++++++++--
 .../user/components/tag-area/core-user-tag-area.html  |  2 +-
 src/theme/components/format-text.scss                 |  2 --
 src/theme/theme.light.scss                            |  2 +-
 11 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/addons/competency/pages/competency/competency.html b/src/addons/competency/pages/competency/competency.html
index 53b0778d7..194bef3ca 100644
--- a/src/addons/competency/pages/competency/competency.html
+++ b/src/addons/competency/pages/competency/competency.html
@@ -122,7 +122,7 @@
             <ion-card *ngFor="let evidence of competency.evidence">
                 <ion-item class="ion-text-wrap" *ngIf="evidence.actionuser" core-user-link [userId]="evidence.actionuser.id"
                     [courseId]="courseId">
-                    <core-user-avatar [user]="evidence.actionuser" slot="start"></core-user-avatar>
+                    <core-user-avatar [user]="evidence.actionuser" slot="start" [linkProfile]="false"></core-user-avatar>
                     <ion-label>
                         <p class="item-heading">{{ evidence.actionuser.fullname }}</p>
                         <p>{{ evidence.timemodified * 1000 | coreFormatDate }}</p>
diff --git a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
index d0efe3655..5da98c6d8 100644
--- a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
+++ b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
@@ -3,7 +3,7 @@
     <!-- User and status of the submission. -->
     <ion-item class="ion-text-wrap" *ngIf="!blindMarking && user" core-user-link [userId]="submitId" [courseId]="courseId"
         [attr.aria-label]="user!.fullname">
-        <core-user-avatar [user]="user" slot="start"></core-user-avatar>
+        <core-user-avatar [user]="user" slot="start" [linkProfile]="false"></core-user-avatar>
         <ion-label>
             <h2>{{ user!.fullname }}</h2>
             <ng-container *ngTemplateOutlet="submissionStatus"></ng-container>
@@ -176,7 +176,7 @@
                     <ng-container *ngFor="let user of membersToSubmit">
                         <ion-item class="ion-text-wrap" core-user-link [userId]="user.id" [courseId]="courseId"
                             [attr.aria-label]="user.fullname">
-                            <core-user-avatar [user]="user" slot="start"></core-user-avatar>
+                            <core-user-avatar [user]="user" slot="start" [linkProfile]="false"></core-user-avatar>
                             <ion-label>
                                 <h2>{{ user.fullname }}</h2>
                             </ion-label>
@@ -334,7 +334,7 @@
                 <!-- Data about the grader (teacher who graded). -->
                 <ion-item class="ion-text-wrap" *ngIf="grader" core-user-link [userId]="grader!.id" [courseId]="courseId"
                     [attr.aria-label]="grader!.fullname" detail="true">
-                    <core-user-avatar [user]="grader" slot="start"></core-user-avatar>
+                    <core-user-avatar [user]="grader" slot="start" [linkProfile]="false"></core-user-avatar>
                     <ion-label>
                         <h2>{{ 'addon.mod_assign.gradedby' | translate }}</h2>
                         <h2>{{ grader!.fullname }}</h2>
diff --git a/src/addons/mod/choice/components/index/addon-mod-choice-index.html b/src/addons/mod/choice/components/index/addon-mod-choice-index.html
index 2dcdcf85c..cc554ee45 100644
--- a/src/addons/mod/choice/components/index/addon-mod-choice-index.html
+++ b/src/addons/mod/choice/components/index/addon-mod-choice-index.html
@@ -114,7 +114,7 @@
                         <ng-container *ngIf="result.expanded">
                             <ion-item *ngFor="let user of result.userresponses" core-user-link [courseId]="courseId" [userId]="user.userid"
                                 [attr.aria-label]="user.fullname" class="ion-text-wrap">
-                                <core-user-avatar [user]="user" slot="start" [courseId]="courseId"></core-user-avatar>
+                                <core-user-avatar [user]="user" slot="start" [courseId]="courseId" [linkProfile]="false"></core-user-avatar>
                                 <ion-label>
                                     <p>{{user.fullname}}</p>
                                 </ion-label>
diff --git a/src/addons/mod/feedback/pages/attempt/attempt.html b/src/addons/mod/feedback/pages/attempt/attempt.html
index cb30f110e..41005c393 100644
--- a/src/addons/mod/feedback/pages/attempt/attempt.html
+++ b/src/addons/mod/feedback/pages/attempt/attempt.html
@@ -14,7 +14,7 @@
         <ion-list class="ion-no-margin" *ngIf="attempt || anonAttempt">
             <ion-item *ngIf="attempt" class="ion-text-wrap" core-user-link [userId]="attempt.userid"
                 [attr.aria-label]="'core.user.viewprofile' | translate" [courseId]="attempt.courseid">
-                <core-user-avatar [user]="attempt" slot="start"></core-user-avatar>
+                <core-user-avatar [user]="attempt" slot="start" [linkProfile]="false"></core-user-avatar>
                 <ion-label>
                     <h2>{{attempt.fullname}}</h2>
                     <p *ngIf="attempt.timemodified">{{attempt.timemodified * 1000 | coreFormatDate }}</p>
diff --git a/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.html b/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.html
index 718811590..d40c53516 100644
--- a/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.html
+++ b/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.html
@@ -21,7 +21,7 @@
             <!-- Attempt number and user that did the attempt. -->
             <ion-item class="ion-text-wrap" *ngIf="user" core-user-link [userId]="user.id" [courseId]="courseId"
                 [attr.aria-label]="user.fullname">
-                <core-user-avatar [user]="user" slot="start" [courseId]="courseId"></core-user-avatar>
+                <core-user-avatar [user]="user" slot="start" [courseId]="courseId" [linkProfile]="false"></core-user-avatar>
                 <ion-label>
                     <h2>{{ 'addon.mod_h5pactivity.attempt' | translate }} #{{attempt.attempt}}: {{user.fullname}}</h2>
                 </ion-label>
diff --git a/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.html b/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.html
index fe477e1e8..52fb73ded 100644
--- a/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.html
+++ b/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.html
@@ -20,7 +20,7 @@
         <!-- User viewed. -->
         <ion-item class="ion-text-wrap" *ngIf="user && !isCurrentUser" core-user-link [userId]="user.id" [courseId]="courseId"
             [attr.aria-label]="user.fullname" button detail="true">
-            <core-user-avatar [user]="user" slot="start" [courseId]="courseId"></core-user-avatar>
+            <core-user-avatar [user]="user" slot="start" [courseId]="courseId" [linkProfile]="false"></core-user-avatar>
             <ion-label>
                 <h2>{{ user.fullname }}</h2>
             </ion-label>
diff --git a/src/addons/mod/lesson/pages/user-retake/user-retake.html b/src/addons/mod/lesson/pages/user-retake/user-retake.html
index 6c8bcc2df..722c6a495 100644
--- a/src/addons/mod/lesson/pages/user-retake/user-retake.html
+++ b/src/addons/mod/lesson/pages/user-retake/user-retake.html
@@ -17,7 +17,7 @@
         <div *ngIf="student">
             <!-- Student data. -->
             <ion-item class="ion-text-wrap" core-user-link [userId]="student.id" [courseId]="courseId" [attr.aria-label]="student.fullname">
-                <core-user-avatar [user]="student" slot="start" [userId]="student.id" [courseId]="courseId">
+                <core-user-avatar [user]="student" slot="start" [userId]="student.id" [courseId]="courseId" [linkProfile]="false">
                 </core-user-avatar>
                 <ion-label>
                     <h2>{{student.fullname}}</h2>
diff --git a/src/core/components/user-avatar/user-avatar.scss b/src/core/components/user-avatar/user-avatar.scss
index d7c33997c..ad04a1ec8 100644
--- a/src/core/components/user-avatar/user-avatar.scss
+++ b/src/core/components/user-avatar/user-avatar.scss
@@ -1,3 +1,5 @@
+@import '~theme/globals.scss';
+
 :host {
     position: relative;
     width: var(--core-avatar-size);
@@ -76,6 +78,11 @@
 }
 
 :host-context(ion-item) {
-    margin-top: 12px;
-    margin-bottom: 12px;
+    margin-top: 6px;
+    margin-bottom: 6px;
+    @include margin(6px, 8px, 6px, 0px);
+    img {
+        min-width: var(--core-avatar-size);
+        min-height: var(--core-avatar-size);
+    }
 }
diff --git a/src/core/features/user/components/tag-area/core-user-tag-area.html b/src/core/features/user/components/tag-area/core-user-tag-area.html
index bfd6c0af4..3531973e0 100644
--- a/src/core/features/user/components/tag-area/core-user-tag-area.html
+++ b/src/core/features/user/components/tag-area/core-user-tag-area.html
@@ -1,6 +1,6 @@
 <ion-card *ngFor="let item of items">
     <ion-item class="ion-text-wrap" core-user-link [userId]="item.user.id">
-        <core-user-avatar [user]="item.user" slot="start"></core-user-avatar>
+        <core-user-avatar [user]="item.user" slot="start" [linkProfile]="false"></core-user-avatar>
         <ion-label>
             <h2>{{ item.heading }}</h2>
         </ion-label>
diff --git a/src/theme/components/format-text.scss b/src/theme/components/format-text.scss
index 2bd618242..3b35bff23 100644
--- a/src/theme/components/format-text.scss
+++ b/src/theme/components/format-text.scss
@@ -77,8 +77,6 @@ core-format-text {
             }
             &.collapsible-collapsed .core-format-text-content {
                 overflow: hidden;
-                height: var(--collapsible-height);
-                @include core-transition(height, 300ms);
             }
         }
 
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 8d0d29859..193d74b8d 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -325,7 +325,7 @@
     --core-star-color: var(--primary);
 
     --core-large-avatar-size: 90px;
-    --core-avatar-size: var(--a11y-min-target-size);
+    --core-avatar-size: 40px;
 
     --core-courseimage-on-course-size: 72px;
     --core-courseimage-radius: var(--medium-radius);

From f2798ec817da5fd99208aea77e557723b1f91bf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 10 Mar 2022 12:28:39 +0100
Subject: [PATCH 0685/1008] MOBILE-3814 course: Add placeholder thumb on course
 page

---
 .../features/course/pages/index/index.html    | 13 +++++--
 .../features/course/pages/index/index.scss    | 16 +++++++++
 src/core/features/course/pages/index/index.ts | 36 +++++++++++++++----
 3 files changed, 56 insertions(+), 9 deletions(-)

diff --git a/src/core/features/course/pages/index/index.html b/src/core/features/course/pages/index/index.html
index b864139cd..a0e768d08 100644
--- a/src/core/features/course/pages/index/index.html
+++ b/src/core/features/course/pages/index/index.html
@@ -17,9 +17,16 @@
     </ion-toolbar>
 </ion-header>
 <ion-item class="core-format-progress-list ion-text-wrap list-item-limited-width" collapsible>
-    <ion-avatar slot="start" class="core-course-thumb" *ngIf="imageThumb">
-        <img [src]="imageThumb" core-external-content alt="" />
-    </ion-avatar>
+    <ng-container *ngIf="course">
+        <div *ngIf="!course.courseImage" #courseThumb slot="start" class="core-course-thumb">
+            <ion-icon *ngIf="!course.courseImage" name="fas-graduation-cap" class="course-icon" aria-hidden="true">
+            </ion-icon>
+        </div>
+        <ion-avatar *ngIf="course.courseImage" slot="start" class="core-course-thumb">
+            <img [src]="course.courseImage" core-external-content alt="" />
+        </ion-avatar>
+    </ng-container>
+
     <ion-label>
         <h1>{{ title }}</h1>
         <div class="core-course-progress" *ngIf="progress !== undefined">
diff --git a/src/core/features/course/pages/index/index.scss b/src/core/features/course/pages/index/index.scss
index 63efe0c1f..6b75fd1e8 100644
--- a/src/core/features/course/pages/index/index.scss
+++ b/src/core/features/course/pages/index/index.scss
@@ -11,6 +11,22 @@
         width: var(--core-courseimage-on-course-size);
         min-width: var(--core-courseimage-on-course-size);
         --border-radius: var(--core-courseimage-radius);
+        @include margin(8px, 16px, 8px, 0px);
+
+        @for $i from 0 to length($core-course-image-background) {
+            &.course-color-#{$i} {
+                --course-color: var(--core-course-color-#{$i});
+                --course-color-tint: var(--core-course-color-#{$i}-tint);
+            }
+        }
+
+        ion-icon.course-icon {
+            padding: 12px;
+            font-size: calc(var(--core-courseimage-on-course-size) - 24px);
+            border-radius: var(--border-radius);
+            color: var(--course-color-tint);
+            background: var(--course-color, transparent);
+        }
     }
 
     @if ($core-hide-courseimage-on-course) {
diff --git a/src/core/features/course/pages/index/index.ts b/src/core/features/course/pages/index/index.ts
index bb2537e83..3a7679baf 100644
--- a/src/core/features/course/pages/index/index.ts
+++ b/src/core/features/course/pages/index/index.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, ViewChild, OnDestroy, OnInit } from '@angular/core';
+import { Component, ViewChild, OnDestroy, OnInit, ElementRef } from '@angular/core';
 import { ActivatedRoute, Params } from '@angular/router';
 
 import { CoreTabsOutletTab, CoreTabsOutletComponent } from '@components/tabs-outlet/tabs-outlet';
@@ -28,6 +28,8 @@ import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
 import { CONTENTS_PAGE_NAME } from '@features/course/course.module';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreCourseSummaryPage } from '../course-summary/course-summary';
+import { CoreCoursesHelper, CoreCourseWithImageAndColor } from '@features/courses/services/courses-helper';
+import { CoreColors } from '@singletons/colors';
 
 /**
  * Page that displays the list of courses the user is enrolled in.
@@ -40,13 +42,13 @@ import { CoreCourseSummaryPage } from '../course-summary/course-summary';
 export class CoreCourseIndexPage implements OnInit, OnDestroy {
 
     @ViewChild(CoreTabsOutletComponent) tabsComponent?: CoreTabsOutletComponent;
+    @ViewChild('courseThumb') courseThumb?: ElementRef;
 
     title = '';
     category = '';
-    course?: CoreCourseAnyCourseData;
+    course?: CoreCourseWithImageAndColor & CoreCourseAnyCourseData;
     tabs: CourseTab[] = [];
     loaded = false;
-    imageThumb?: string;
     progress?: number;
 
     protected currentPagePath = '';
@@ -235,9 +237,7 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
         // Get the title to display initially.
         this.title = CoreCourseFormatDelegate.getCourseTitle(this.course);
 
-        if ('overviewfiles' in this.course) {
-            this.imageThumb = this.course.overviewfiles?.[0]?.fileurl;
-        }
+        await this.setCourseColor();
 
         this.updateProgress();
 
@@ -313,6 +313,30 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
         this.progress = this.course.progress;
     }
 
+    /**
+     * Set course color.
+     */
+    protected async setCourseColor(): Promise<void> {
+        if (!this.course) {
+            return;
+        }
+
+        await CoreCoursesHelper.loadCourseColorAndImage(this.course);
+
+        if (!this.courseThumb) {
+            return;
+        }
+
+        if (this.course.color) {
+            this.courseThumb.nativeElement.style.setProperty('--course-color', this.course.color);
+
+            const tint = CoreColors.lighter(this.course.color, 50);
+            this.courseThumb.nativeElement.style.setProperty('--course-color-tint', tint);
+        } else if(this.course.colorNumber !== undefined) {
+            this.courseThumb.nativeElement.classList.add('course-color-' + this.course.colorNumber);
+        }
+    }
+
 }
 
 type CourseTab = CoreTabsOutletTab & {

From 115ba52984eb96433b3aa165aea2877913e0e7a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 10 Mar 2022 11:25:05 +0100
Subject: [PATCH 0686/1008] MOBILE-3814 course: Style course summary page

---
 .../pages/course-summary/course-summary.html  | 111 ++++++++++--------
 .../pages/course-summary/course-summary.scss  |  89 ++++++++++++--
 .../pages/course-summary/course-summary.ts    |  84 +++++++------
 3 files changed, 192 insertions(+), 92 deletions(-)

diff --git a/src/core/features/course/pages/course-summary/course-summary.html b/src/core/features/course/pages/course-summary/course-summary.html
index 625e360ae..2b699e288 100644
--- a/src/core/features/course/pages/course-summary/course-summary.html
+++ b/src/core/features/course/pages/course-summary/course-summary.html
@@ -1,12 +1,9 @@
-<ion-header>
+<ion-header class="no-title">
     <ion-toolbar>
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
         <ion-title>
-            <h1>
-                {{'core.course.coursesummary' | translate}}
-            </h1>
         </ion-title>
         <ion-buttons slot="end" *ngIf="isModal">
             <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
@@ -15,27 +12,29 @@
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
-<ion-content>
+<ion-content [fullscreen]="true">
     <ion-refresher slot="fixed" [disabled]="!dataLoaded" (ionRefresh)="refreshData($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
     <core-loading [hideUntil]="dataLoaded">
-        <div *ngIf="courseImageUrl" class="core-course-thumb">
-            <img [src]="courseImageUrl" core-external-content alt="" />
+        <div *ngIf="course" class="core-course-thumb" #courseThumb>
+            <img *ngIf="course.courseImage" [src]="course.courseImage" core-external-content alt="" />
+            <ion-icon *ngIf="!course.courseImage" name="fas-graduation-cap" class="course-icon" aria-hidden="true">
+            </ion-icon>
         </div>
-        <ng-container *ngIf="course">
-            <ion-item class="ion-text-wrap">
+        <div *ngIf="course" class="course-container">
+            <ion-item class="ion-text-wrap course-name">
                 <ion-label>
                     <p *ngIf="course.displayname && course.shortname && course.fullname != course.displayname"
                         class="core-course-shortname">
                         <core-format-text [text]="course.shortname" contextLevel="course" [contextInstanceId]="course.id">
                         </core-format-text>
                     </p>
-                    <h2>
+                    <h1>
                         <span class="sr-only">{{ 'core.courses.aria:coursename' | translate }}</span>
                         <core-format-text [text]="course.fullname" contextLevel="course" [contextInstanceId]="course.id">
                         </core-format-text>
-                    </h2>
+                    </h1>
                     <ion-chip color="primary" *ngIf="course.categoryname" class="core-course-category ion-text-nowrap">
                         <span class="sr-only">{{ 'core.courses.aria:coursecategory' | translate }}</span>
                         <ion-label>
@@ -43,7 +42,14 @@
                             </core-format-text>
                         </ion-label>
                     </ion-chip>
-
+                </ion-label>
+                <ion-button fill="clear" [href]="courseUrl" core-link [showBrowserWarning]="false"
+                    [attr.aria-label]="'core.openinbrowser' | translate" slot="end">
+                    <ion-icon name="fas-external-link-alt" slot="icon-only" aria-hidden="true"></ion-icon>
+                </ion-button>
+            </ion-item>
+            <ion-item class="ion-text-wrap" *ngIf="progress !== undefined || course.startdate || course.enddate">
+                <ion-label>
                     <div class="core-course-progress" *ngIf="progress !== undefined">
                         <core-progress-bar [progress]="progress" a11yText="core.course.aria:sectionprogress">
                         </core-progress-bar>
@@ -51,26 +57,22 @@
                     <div *ngIf="course.startdate || course.enddate" class="core-course-dates">
                         <p *ngIf="course.startdate">
                             <ion-icon name="fas-calendar" aria-hidden="true"></ion-icon>
-                            <strong>{{ 'core.course.startdate' | translate }}: </strong> {{ course.startdate * 1000 |
-                            coreFormatDate:'strftimedatefullshort' }}
+                            <strong>{{ 'core.course.startdate' | translate }}</strong><br>
+                            {{ course.startdate * 1000 | coreFormatDate:'strftimedaydatetime' }}
                         </p>
                         <p *ngIf="course.enddate">
                             <ion-icon name="fas-calendar" aria-hidden="true"></ion-icon>
-                            <strong>{{ 'core.course.enddate' | translate }}: </strong> {{ course.enddate * 1000 |
-                            coreFormatDate:'strftimedatefullshort' }}
+                            <strong>{{ 'core.course.enddate' | translate }}</strong><br>
+                            {{ course.enddate * 1000 | coreFormatDate:'strftimedaydatetime' }}
                         </p>
                     </div>
                 </ion-label>
-                <ion-button fill="clear" [href]="courseUrl" core-link [showBrowserWarning]="false"
-                    [attr.aria-label]="'core.openinbrowser' | translate" slot="end">
-                    <ion-icon name="fas-external-link-alt" slot="icon-only" aria-hidden="true"></ion-icon>
-                </ion-button>
             </ion-item>
 
             <ion-item class="ion-text-wrap" *ngIf="course.summary" detail="false">
                 <ion-label>
                     <p class="item-heading">
-                        {{'core.summary' | translate}}
+                        {{'core.course.coursesummary' | translate}}
                     </p>
                     <core-format-text [text]="course.summary" collapsible-item contextLevel="course" [contextInstanceId]="course.id">
                     </core-format-text>
@@ -78,19 +80,28 @@
             </ion-item>
 
             <ion-list *ngIf="course.contacts && course.contacts.length">
-                <ion-item-divider class="ion-text-wrap">
+                <ion-item [button]="course.contacts.length >= 5" class="ion-text-wrap" (click)="toggleContacts()"
+                    [attr.aria-label]="(contactsExpanded ? 'core.collapse' : 'core.expand') | translate" detail="false">
+                    <ion-icon *ngIf="course.contacts.length >= 5" name="fas-chevron-right" flip-rtl slot="start" aria-hidden="true"
+                        class="expandable-status-icon" [class.expandable-status-icon-expanded]="contactsExpanded">
+                    </ion-icon>
                     <ion-label>
-                        <p class="item-heading">{{ 'core.teachers' | translate }}</p>
-                    </ion-label>
-                </ion-item-divider>
-                <ion-item button class="ion-text-wrap" *ngFor="let contact of course.contacts" core-user-link [userId]="contact.id"
-                    [courseId]="isEnrolled ? course.id : null" [attr.aria-label]="'core.viewprofile' | translate" detail="true">
-                    <core-user-avatar [user]="contact" slot="start" [userId]="contact.id" [courseId]="isEnrolled ? course.id : null">
-                    </core-user-avatar>
-                    <ion-label>
-                        <p class="item-heading">{{contact.fullname}}</p>
+                        <p class="item-heading">
+                            {{ 'core.teachers' | translate }}
+                        </p>
                     </ion-label>
                 </ion-item>
+                <ng-container *ngIf="contactsExpanded || course.contacts.length < 5">
+                    <ion-item button class="ion-text-wrap" *ngFor="let contact of course.contacts" core-user-link [userId]="contact.id"
+                        [courseId]="isEnrolled ? course.id : null" [attr.aria-label]="'core.viewprofile' | translate" detail="true">
+                        <core-user-avatar [user]="contact" slot="start" [userId]="contact.id" [courseId]="isEnrolled ? course.id : null"
+                            [linkProfile]="false">
+                        </core-user-avatar>
+                        <ion-label>
+                            <p class="item-heading">{{contact.fullname}}</p>
+                        </ion-label>
+                    </ion-item>
+                </ng-container>
                 <core-spacer></core-spacer>
             </ion-list>
 
@@ -102,23 +113,31 @@
                             <span class="core-customfieldname">
                                 <core-format-text [text]="field.name" contextLevel="course" [contextInstanceId]="course.id">
                                 </core-format-text>
-                            </span><span class="core-customfieldseparator">: </span>
+                                <span class="core-customfieldseparator">: </span>
+                            </span>
                             <span class="core-customfieldvalue">
-                                <core-format-text [text]="field.value" collapsible-item contextLevel="course"
-                                    [contextInstanceId]="course.id">
+                                <core-format-text [text]="field.value" [collapsible-item]="field.type == 'textarea'  ? '' : null"
+                                    contextLevel="course" [contextInstanceId]="course.id">
                                 </core-format-text>
                             </span>
                         </div>
                     </ng-container>
                 </ion-label>
             </ion-item>
-        </ng-container>
+        </div>
     </core-loading>
 </ion-content>
 
 <ion-footer *ngIf="course && dataLoaded">
+    <ng-container *ngIf="canAccessCourse">
+        <ion-button *ngFor="let item of courseMenuHandlers" (click)="openMenuItem(item)" [class]="item.data.class" expand="block">
+            <ion-icon *ngIf="item.data.icon" [name]="item.data.icon" slot="start" aria-hidden="true"></ion-icon>
+            <ion-label>{{item.data.title | translate }}</ion-label>
+        </ion-button>
+    </ng-container>
+
     <!-- Enrol -->
-    <ion-card *ngIf="!isEnrolled">
+    <ion-card *ngIf="!isEnrolled && (selfEnrolInstances.length > 0 || paypalEnabled)">
         <ion-item class="ion-text-wrap" *ngFor="let instance of selfEnrolInstances">
             <ion-label>
                 <p class="item-heading">{{ instance.name }}</p>
@@ -135,22 +154,16 @@
                 </ion-button>
             </ion-label>
         </ion-item>
-        <ion-item *ngIf="!selfEnrolInstances.length && !paypalEnabled">
-            <ion-label>
-                <p class="item-heading">{{ 'core.courses.notenrollable' | translate }}</p>
-            </ion-label>
+    </ion-card>
+
+    <ion-card class="core-info-card" *ngIf="!isEnrolled && !selfEnrolInstances.length && !paypalEnabled">
+        <ion-item>
+            <ion-icon name="fas-info-circle" slot="start" aria-hidden="true"></ion-icon>
+            <ion-label>{{ 'core.courses.notenrollable' | translate }}</ion-label>
         </ion-item>
     </ion-card>
 
-    <ng-container *ngIf="canAccessCourse">
-        <ion-button *ngFor="let item of courseMenuHandlers" (click)="openMenuItem(item)" [class]="'ion-margin' + item.data.class"
-            expand="block">
-            <ion-icon *ngIf="item.data.icon" [name]="item.data.icon" slot="start" aria-hidden="true"></ion-icon>
-            <ion-label>{{item.data.title | translate }}</ion-label>
-        </ion-button>
-    </ng-container>
-
-    <ion-button class="ion-margin" (click)="openCourse()" *ngIf="!isModal && canAccessCourse" expand="block">
+    <ion-button (click)="openCourse()" *ngIf="!isModal && canAccessCourse" expand="block">
         <ion-icon name="fas-briefcase" slot="start" aria-hidden="true"></ion-icon>
         <ion-label>
             {{ 'core.course' | translate }}
diff --git a/src/core/features/course/pages/course-summary/course-summary.scss b/src/core/features/course/pages/course-summary/course-summary.scss
index 0386bcac6..477f4a454 100644
--- a/src/core/features/course/pages/course-summary/course-summary.scss
+++ b/src/core/features/course/pages/course-summary/course-summary.scss
@@ -1,28 +1,99 @@
 @import '~theme/globals.scss';
 
 :host {
-    .core-course-thumb {
-        overflow: hidden;
-        text-align: center;
-        max-height: 35vh;
-        z-index: -1;
-        overflow: hidden;
-        border-bottom: 1px solid var(--stroke);
+    --thumb-height: 180px;
+
+    ion-content {
+        position: absolute;
     }
 
+    .core-course-thumb {
+        background: var(--course-color, white);
+        overflow: hidden;
+        text-align: center;
+        height: var(--thumb-height);
+        position: fixed;
+        z-index: -1;
+        width: 100%;
 
-    .core-customfieldvalue core-format-text {
-        display: inline;
+        @for $i from 0 to length($core-course-image-background) {
+            &.course-color-#{$i} {
+                --course-color: var(--core-course-color-#{$i});
+                --course-color-tint: var(--core-course-color-#{$i}-tint);
+            }
+        }
+
+        img {
+            width: 100%;
+            height: 100%;
+            object-fit: cover;
+        }
+
+        ion-icon.course-icon {
+            padding: 24px;
+            font-size: calc(var(--thumb-height) - 48px);
+            color: var(--course-color-tint);
+        }
+    }
+
+    .course-container {
+        position: relative;
+        top: calc(var(--thumb-height) - var(--big-radius));
+    }
+
+    .course-name {
+        border-radius: var(--big-radius) var(--big-radius) 0 0;
+        box-shadow: var(--drop-shadow-top);
+        ion-label {
+            margin-bottom: 0px;
+        }
+    }
+
+    h1 {
+        font-size: 20px;
+    }
+
+    .core-course-category {
+        margin-left: 0;
+        margin-right: 0;
     }
 
     .core-course-dates {
         background: var(--light);
         border-radius: var(--small-radius);
         padding: 8px;
+        width: 100%;
+
+        p {
+            margin-bottom: 8px;
+        }
+
+        p:last-child {
+            margin-bottom: 0px;
+        }
 
         ion-icon {
             @include margin-horizontal(null, 8px);
         }
     }
 
+
+    .core-customfield {
+        margin-bottom: 8px;
+
+        &.core-customfield_textarea {
+            display: flex;
+            flex-direction: column;
+            margin-bottom: 12px;
+        }
+
+        .core-customfieldname {
+            @include margin-horizontal(null, 4px);
+            font-weight: bold;
+            display: inline;
+        }
+        .core-customfieldvalue {
+            display: inline;
+        }
+    }
 }
diff --git a/src/core/features/course/pages/course-summary/course-summary.ts b/src/core/features/course/pages/course-summary/course-summary.ts
index 547e9a6cb..82e096ecf 100644
--- a/src/core/features/course/pages/course-summary/course-summary.ts
+++ b/src/core/features/course/pages/course-summary/course-summary.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, OnDestroy, OnInit, Input } from '@angular/core';
+import { Component, OnDestroy, OnInit, Input, ViewChild, ElementRef } from '@angular/core';
 import { IonRefresher } from '@ionic/angular';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreSites } from '@services/sites';
@@ -35,8 +35,9 @@ import { ModalController, NgZone, Platform, Translate } from '@singletons';
 import { CoreCoursesSelfEnrolPasswordComponent } from '../../../courses/components/self-enrol-password/self-enrol-password';
 import { CoreNavigator } from '@services/navigator';
 import { CoreUtils } from '@services/utils/utils';
-import { CoreCourseWithImageAndColor } from '@features/courses/services/courses-helper';
+import { CoreCoursesHelper, CoreCourseWithImageAndColor } from '@features/courses/services/courses-helper';
 import { Subscription } from 'rxjs';
+import { CoreColors } from '@singletons/colors';
 
 /**
  * Page that shows the summary of a course including buttons to enrol and other available options.
@@ -51,23 +52,23 @@ export class CoreCourseSummaryPage implements OnInit, OnDestroy {
     @Input() course?: CoreCourseSummaryData;
     @Input() courseId = 0;
 
+    @ViewChild('courseThumb') courseThumb?: ElementRef;
+
     isEnrolled = false;
     canAccessCourse = true;
     selfEnrolInstances: CoreCourseEnrolmentMethod[] = [];
     paypalEnabled = false;
     dataLoaded = false;
     isModal = false;
+    contactsExpanded = false;
 
     courseUrl = '';
-    courseImageUrl?: string;
     progress?: number;
 
     courseMenuHandlers: CoreCourseOptionsMenuHandlerToDisplay[] = [];
 
-    protected isGuestEnabled = false;
     protected useGuestAccess = false;
     protected guestInstanceId?: number;
-    protected enrolmentMethods: CoreCourseEnrolmentMethod[] = [];
     protected waitStart = 0;
     protected enrolUrl = '';
     protected pageDestroyed = false;
@@ -127,25 +128,14 @@ export class CoreCourseSummaryPage implements OnInit, OnDestroy {
      *         password is required for guest access.
      */
     protected async canAccessAsGuest(): Promise<boolean> {
-        if (!this.isGuestEnabled) {
-            throw Error('Guest access is not enabled.');
+        if (this.guestInstanceId === undefined) {
+            return false;
         }
 
-        // Search instance ID of guest enrolment method.
-        const method = this.enrolmentMethods.find((method) => method.type == 'guest');
-        this.guestInstanceId = method?.id;
+        const info = await CoreCourses.getCourseGuestEnrolmentInfo(this.guestInstanceId);
 
-        if (this.guestInstanceId) {
-            const info = await CoreCourses.getCourseGuestEnrolmentInfo(this.guestInstanceId);
-            if (!info.status) {
-                // Not active, reject.
-                throw Error('Guest access is not enabled.');
-            }
-
-            return info.passwordrequired;
-        }
-
-        throw Error('Guest enrollment method not found.');
+        // Guest access with password is not supported by the app.
+        return !!info.status && !info.passwordrequired;
     }
 
     /**
@@ -158,13 +148,14 @@ export class CoreCourseSummaryPage implements OnInit, OnDestroy {
         this.selfEnrolInstances = [];
 
         try {
-            this.enrolmentMethods = await CoreCourses.getCourseEnrolmentMethods(this.courseId);
+            const enrolmentMethods = await CoreCourses.getCourseEnrolmentMethods(this.courseId);
+            this.guestInstanceId = undefined;
 
-            this.enrolmentMethods.forEach((method) => {
+            enrolmentMethods.forEach((method) => {
                 if (method.type === 'self') {
                     this.selfEnrolInstances.push(method);
                 } else if (method.type === 'guest') {
-                    this.isGuestEnabled = true;
+                    this.guestInstanceId = method.id;
                 } else if (method.type === 'paypal') {
                     this.paypalEnabled = true;
                 }
@@ -189,16 +180,8 @@ export class CoreCourseSummaryPage implements OnInit, OnDestroy {
             this.useGuestAccess = false;
         } catch {
             // The user is not an admin/manager. Check if we can provide guest access to the course.
-            try {
-                this.canAccessCourse = !(await this.canAccessAsGuest());
-                this.useGuestAccess = this.canAccessCourse;
-            } catch {
-                this.canAccessCourse = false;
-            }
-        }
-
-        if (this.course && 'overviewfiles' in this.course && this.course.overviewfiles?.length) {
-            this.courseImageUrl = this.course.overviewfiles[0].fileurl;
+            this.canAccessCourse = await this.canAccessAsGuest();
+            this.useGuestAccess = this.canAccessCourse;
         }
 
         try {
@@ -219,6 +202,8 @@ export class CoreCourseSummaryPage implements OnInit, OnDestroy {
             // Ignore errors.
         }
 
+        await this.setCourseColor();
+
         if (!this.course ||
             !('progress' in this.course) ||
             typeof this.course.progress !== 'number' ||
@@ -433,6 +418,37 @@ export class CoreCourseSummaryPage implements OnInit, OnDestroy {
         CoreNavigator.navigateToSitePath(item.data.page, { params });
     }
 
+    /**
+     * Set course color.
+     */
+    protected async setCourseColor(): Promise<void> {
+        if (!this.course) {
+            return;
+        }
+
+        await CoreCoursesHelper.loadCourseColorAndImage(this.course);
+
+        if (!this.courseThumb) {
+            return;
+        }
+
+        if (this.course.color) {
+            this.courseThumb.nativeElement.style.setProperty('--course-color', this.course.color);
+
+            const tint = CoreColors.lighter(this.course.color, 50);
+            this.courseThumb.nativeElement.style.setProperty('--course-color-tint', tint);
+        } else if(this.course.colorNumber !== undefined) {
+            this.courseThumb.nativeElement.classList.add('course-color-' + this.course.colorNumber);
+        }
+    }
+
+    /**
+     * Toggle list of contacts.
+     */
+    toggleContacts(): void {
+        this.contactsExpanded = !this.contactsExpanded;
+    }
+
     /**
      * Close the modal.
      */

From f184a09550ebb1b255dee95a063520e6f0c7412c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 10 Mar 2022 13:58:14 +0100
Subject: [PATCH 0687/1008] MOBILE-3814 course: Add action sheet to enrol me on
 course summary

---
 scripts/langindex.json                        |  1 +
 .../pages/course-storage/course-storage.scss  |  8 +-
 src/core/features/course/lang.json            |  1 +
 .../pages/course-summary/course-summary.html  | 36 +++-----
 .../pages/course-summary/course-summary.ts    | 86 +++++++++++++++----
 .../course-list-item/course-list-item.ts      |  2 +-
 src/theme/theme.base.scss                     | 29 +++----
 src/theme/theme.light.scss                    |  3 +-
 8 files changed, 103 insertions(+), 63 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 29d1c1122..3010f8f0a 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1567,6 +1567,7 @@
   "core.course.thisweek": "format_weeks/currentsection",
   "core.course.todo": "completion",
   "core.course.useactivityonbrowser": "local_moodlemobileapp",
+  "core.course.viewcourse": "block_timeline",
   "core.course.warningmanualcompletionmodified": "local_moodlemobileapp",
   "core.course.warningofflinemanualcompletiondeleted": "local_moodlemobileapp",
   "core.coursedetails": "moodle",
diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.scss b/src/addons/storagemanager/pages/course-storage/course-storage.scss
index 91a4907f4..bf803e5ab 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.scss
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.scss
@@ -3,6 +3,10 @@
 :host {
     --course-storage-max-activity-height: 120px;
 
+    ion-card ion-item {
+        --inner-padding-end: 0px;
+    }
+
     ion-card.section ion-card-header {
         margin-bottom: 8px;
         padding-top: 8px;
@@ -48,7 +52,3 @@ ion-item core-mod-icon {
     display: flex;
     align-items: center;
 }
-
-ion-item {
-    --inner-padding-end: 0px;
-}
diff --git a/src/core/features/course/lang.json b/src/core/features/course/lang.json
index efa7b5613..1b1ae4835 100644
--- a/src/core/features/course/lang.json
+++ b/src/core/features/course/lang.json
@@ -54,6 +54,7 @@
     "thisweek": "This week",
     "todo": "To do",
     "useactivityonbrowser": "You can still use it using your device's web browser.",
+    "viewcourse": "View course",
     "warningmanualcompletionmodified": "The manual completion of an activity was modified on the site.",
     "warningofflinemanualcompletiondeleted": "Some offline manual completion of course '{{name}}' has been deleted. {{error}}"
 }
diff --git a/src/core/features/course/pages/course-summary/course-summary.html b/src/core/features/course/pages/course-summary/course-summary.html
index 2b699e288..cde4c68c3 100644
--- a/src/core/features/course/pages/course-summary/course-summary.html
+++ b/src/core/features/course/pages/course-summary/course-summary.html
@@ -130,43 +130,27 @@
 
 <ion-footer *ngIf="course && dataLoaded">
     <ng-container *ngIf="canAccessCourse">
-        <ion-button *ngFor="let item of courseMenuHandlers" (click)="openMenuItem(item)" [class]="item.data.class" expand="block">
+        <ion-button *ngFor="let item of courseMenuHandlers" (click)="openMenuItem(item)" [class]="'ion-text-wrap '+ item.data.class"
+            expand="block">
             <ion-icon *ngIf="item.data.icon" [name]="item.data.icon" slot="start" aria-hidden="true"></ion-icon>
             <ion-label>{{item.data.title | translate }}</ion-label>
         </ion-button>
     </ng-container>
 
-    <!-- Enrol -->
-    <ion-card *ngIf="!isEnrolled && (selfEnrolInstances.length > 0 || paypalEnabled)">
-        <ion-item class="ion-text-wrap" *ngFor="let instance of selfEnrolInstances">
-            <ion-label>
-                <p class="item-heading">{{ instance.name }}</p>
-                <ion-button expand="block" class="ion-margin-top" (click)="selfEnrolClicked(instance.id)">
-                    {{ 'core.courses.enrolme' | translate }}
-                </ion-button>
-            </ion-label>
-        </ion-item>
-        <ion-item class="ion-text-wrap" *ngIf="paypalEnabled">
-            <ion-label>
-                <p class="item-heading">{{ 'core.courses.otherenrolments' | translate }}</p>
-                <ion-button expand="block" class="ion-margin-top" (click)="browserEnrol()">
-                    {{ 'core.courses.completeenrolmentbrowser' | translate }}
-                </ion-button>
-            </ion-label>
-        </ion-item>
-    </ion-card>
+    <ion-button expand="block" (click)="enrolMe()" *ngIf="!isEnrolled && (selfEnrolInstances.length > 0 || otherEnrolments)"
+        class="ion-text-wrap">
+        {{ 'core.courses.enrolme' | translate }}
+    </ion-button>
 
-    <ion-card class="core-info-card" *ngIf="!isEnrolled && !selfEnrolInstances.length && !paypalEnabled">
+    <ion-card class="core-info-card ion-text-wrap" *ngIf="!isEnrolled && !selfEnrolInstances.length && !otherEnrolments">
         <ion-item>
             <ion-icon name="fas-info-circle" slot="start" aria-hidden="true"></ion-icon>
             <ion-label>{{ 'core.courses.notenrollable' | translate }}</ion-label>
         </ion-item>
     </ion-card>
 
-    <ion-button (click)="openCourse()" *ngIf="!isModal && canAccessCourse" expand="block">
-        <ion-icon name="fas-briefcase" slot="start" aria-hidden="true"></ion-icon>
-        <ion-label>
-            {{ 'core.course' | translate }}
-        </ion-label>
+    <ion-button (click)="openCourse()" *ngIf="!isModal && canAccessCourse" expand="block" fill="outline" class="ion-text-wrap">
+        <ion-icon name="fas-eye" slot="start" aria-hidden="true"></ion-icon>
+        {{ 'core.course.viewcourse' | translate }}
     </ion-button>
 </ion-footer>
diff --git a/src/core/features/course/pages/course-summary/course-summary.ts b/src/core/features/course/pages/course-summary/course-summary.ts
index 82e096ecf..694346601 100644
--- a/src/core/features/course/pages/course-summary/course-summary.ts
+++ b/src/core/features/course/pages/course-summary/course-summary.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { Component, OnDestroy, OnInit, Input, ViewChild, ElementRef } from '@angular/core';
-import { IonRefresher } from '@ionic/angular';
+import { ActionSheetButton, IonRefresher } from '@ionic/angular';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
@@ -31,7 +31,7 @@ import {
     CoreCourseOptionsMenuHandlerToDisplay,
 } from '@features/course/services/course-options-delegate';
 import { CoreCourseHelper } from '@features/course/services/course-helper';
-import { ModalController, NgZone, Platform, Translate } from '@singletons';
+import { ActionSheetController, ModalController, NgZone, Platform, Translate } from '@singletons';
 import { CoreCoursesSelfEnrolPasswordComponent } from '../../../courses/components/self-enrol-password/self-enrol-password';
 import { CoreNavigator } from '@services/navigator';
 import { CoreUtils } from '@services/utils/utils';
@@ -57,7 +57,7 @@ export class CoreCourseSummaryPage implements OnInit, OnDestroy {
     isEnrolled = false;
     canAccessCourse = true;
     selfEnrolInstances: CoreCourseEnrolmentMethod[] = [];
-    paypalEnabled = false;
+    otherEnrolments = false;
     dataLoaded = false;
     isModal = false;
     contactsExpanded = false;
@@ -65,6 +65,8 @@ export class CoreCourseSummaryPage implements OnInit, OnDestroy {
     courseUrl = '';
     progress?: number;
 
+    protected actionSheet?: HTMLIonActionSheetElement;
+
     courseMenuHandlers: CoreCourseOptionsMenuHandlerToDisplay[] = [];
 
     protected useGuestAccess = false;
@@ -146,18 +148,24 @@ export class CoreCourseSummaryPage implements OnInit, OnDestroy {
     protected async getCourse(refresh = false): Promise<void> {
         // Get course enrolment methods.
         this.selfEnrolInstances = [];
+        this.otherEnrolments = false;
 
         try {
             const enrolmentMethods = await CoreCourses.getCourseEnrolmentMethods(this.courseId);
             this.guestInstanceId = undefined;
 
             enrolmentMethods.forEach((method) => {
+                if (!method.status) {
+                    return;
+                }
+
                 if (method.type === 'self') {
                     this.selfEnrolInstances.push(method);
                 } else if (method.type === 'guest') {
                     this.guestInstanceId = method.id;
-                } else if (method.type === 'paypal') {
-                    this.paypalEnabled = true;
+                } else {
+                    // Other enrolments that comes from that WS should need user action.
+                    this.otherEnrolments = true;
                 }
             });
         } catch (error) {
@@ -196,7 +204,10 @@ export class CoreCourseSummaryPage implements OnInit, OnDestroy {
                 this.course = courseByField;
             }
 
-            this.paypalEnabled = !this.isEnrolled && courseByField.enrollmentmethods?.indexOf('paypal') > -1;
+            // enrollmentmethods contains ALL enrolment methods including manual.
+            if (!this.isEnrolled && courseByField.enrollmentmethods?.some((method) => method === 'paypal')) {
+                this.otherEnrolments = true;
+            }
 
         } catch {
             // Ignore errors.
@@ -256,7 +267,7 @@ export class CoreCourseSummaryPage implements OnInit, OnDestroy {
         try {
             await CoreDomUtils.showConfirm(
                 Translate.instant('core.courses.browserenrolinstructions'),
-                undefined,
+                Translate.instant('core.courses.completeenrolmentbrowser'),
                 Translate.instant('core.openinbrowser'),
             );
         } catch {
@@ -276,15 +287,15 @@ export class CoreCourseSummaryPage implements OnInit, OnDestroy {
     }
 
     /**
-     * User clicked in a self enrol button.
+     * Confirm user to Self enrol in course.
      *
-     * @param instanceId The instance ID of the enrolment method.
+     * @param enrolMethod The enrolment method.
      */
-    async selfEnrolClicked(instanceId: number): Promise<void> {
+    async selfEnrolConfirm(enrolMethod: CoreCourseEnrolmentMethod): Promise<void> {
         try {
-            await CoreDomUtils.showConfirm(Translate.instant('core.courses.confirmselfenrol'));
+            await CoreDomUtils.showConfirm(Translate.instant('core.courses.confirmselfenrol'), enrolMethod.name);
 
-            this.selfEnrolInCourse('', instanceId);
+            this.selfEnrolInCourse(enrolMethod.id);
         } catch {
             // User cancelled.
         }
@@ -293,11 +304,11 @@ export class CoreCourseSummaryPage implements OnInit, OnDestroy {
     /**
      * Self enrol in a course.
      *
-     * @param password Password to use.
      * @param instanceId The instance ID.
+     * @param password Password to use.
      * @return Promise resolved when self enrolled.
      */
-    async selfEnrolInCourse(password: string, instanceId: number): Promise<void> {
+    async selfEnrolInCourse(instanceId: number, password = ''): Promise<void> {
         const modal = await CoreDomUtils.showModalLoading('core.loading', true);
 
         try {
@@ -336,7 +347,7 @@ export class CoreCourseSummaryPage implements OnInit, OnDestroy {
                 );
 
                 if (modalData !== undefined) {
-                    this.selfEnrolInCourse(modalData, instanceId);
+                    this.selfEnrolInCourse(instanceId, modalData);
 
                     return;
                 }
@@ -442,6 +453,51 @@ export class CoreCourseSummaryPage implements OnInit, OnDestroy {
         }
     }
 
+    /**
+     * Open enrol action sheet.
+     */
+    async enrolMe(): Promise<void> {
+        if (this.selfEnrolInstances.length == 1 && !this.otherEnrolments) {
+            this.selfEnrolConfirm(this.selfEnrolInstances[0]);
+
+            return;
+        }
+
+        if (this.selfEnrolInstances.length == 0 && this.otherEnrolments) {
+            this.browserEnrol();
+
+            return;
+        }
+
+        const buttons: ActionSheetButton[] = this.selfEnrolInstances.map((enrolMethod) => ({
+            text: enrolMethod.name,
+            handler: (): void => {
+                this.selfEnrolConfirm(enrolMethod);
+            },
+        }));
+
+        if (this.otherEnrolments) {
+            buttons.push({
+                text: Translate.instant('core.courses.completeenrolmentbrowser'),
+                handler: (): void => {
+                    this.browserEnrol();
+                },
+            });
+        }
+
+        buttons.push({
+            text: Translate.instant('core.cancel'),
+            role: 'cancel',
+        });
+
+        this.actionSheet = await ActionSheetController.create({
+            header:  Translate.instant('core.courses.enrolme'),
+            buttons: buttons,
+        });
+
+        await this.actionSheet.present();
+    }
+
     /**
      * Toggle list of contacts.
      */
diff --git a/src/core/features/courses/components/course-list-item/course-list-item.ts b/src/core/features/courses/components/course-list-item/course-list-item.ts
index c73a3dd3a..c13587b47 100644
--- a/src/core/features/courses/components/course-list-item/course-list-item.ts
+++ b/src/core/features/courses/components/course-list-item/course-list-item.ts
@@ -114,7 +114,7 @@ export class CoreCoursesCourseListItemComponent implements OnInit, OnDestroy, On
                 } else if (instance === 'paypal') {
                     this.enrolmentIcons.push({
                         label: 'core.courses.otherenrolments',
-                        icon: 'fab-paypal',
+                        icon: 'fas-external-link-alt',
                     });
                 }
             });
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index f8384c689..1396e9a71 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -833,24 +833,23 @@ ion-toolbar h1 .core-bar-button-image img {
 }
 
 // Action sheet.
-.md ion-action-sheet {
+ion-action-sheet.md {
+    .action-sheet-title {
+        @include padding(4px, null, 4px, 16px);
+        font-size: 12px;
+        min-height: auto;
+        color: var(--medium);
+        line-height: 2em;
+        font-weight: normal;
+    }
+
+    .action-sheet-group:first-child {
+        border-radius: var(--big-radius) var(--big-radius) 0 0;
+    }
+
     .action-sheet-group-cancel {
         box-shadow: var(--drop-shadow-top, none);
     }
-
-    .action-sheet-title {
-        border-bottom: 2px solid var(--title-border-color);
-    }
-}
-
-.ios ion-action-sheet {
-    .action-sheet-title {
-        font-size: 16px;
-    }
-
-    .action-sheet-title {
-        border-bottom: 2px solid var(--title-border-color);
-    }
 }
 
 // Radio.
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 193d74b8d..c19cac3bf 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -216,7 +216,6 @@
     ion-action-sheet {
         --button-color: var(--ion-text-color);
         --button-color-selected: var(--ion-text-color);
-        --title-border-color: var(--primary);
 
         .action-sheet-title {
             --color: var(--ion-text-color);
@@ -325,7 +324,7 @@
     --core-star-color: var(--primary);
 
     --core-large-avatar-size: 90px;
-    --core-avatar-size: 40px;
+    --core-avatar-size: var(--a11y-min-target-size);
 
     --core-courseimage-on-course-size: 72px;
     --core-courseimage-radius: var(--medium-radius);

From d6795d72b539cd4d85f0e07183c5d17e3e5dd6cd Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 10 Mar 2022 15:46:00 +0100
Subject: [PATCH 0688/1008] MOBILE-3833 core: Fix RTL swipe navigation

---
 src/core/directives/swipe-navigation.ts | 44 +++++++++++++++++++++----
 1 file changed, 37 insertions(+), 7 deletions(-)

diff --git a/src/core/directives/swipe-navigation.ts b/src/core/directives/swipe-navigation.ts
index b1b632284..a90ae68b9 100644
--- a/src/core/directives/swipe-navigation.ts
+++ b/src/core/directives/swipe-navigation.ts
@@ -16,7 +16,7 @@ import {  AfterViewInit, Directive, ElementRef, Input, OnDestroy } from '@angula
 import { CoreSwipeNavigationItemsManager } from '@classes/items-management/swipe-navigation-items-manager';
 import { Gesture, GestureDetail } from '@ionic/angular';
 import { CoreScreen } from '@services/screen';
-import { GestureController } from '@singletons';
+import { GestureController, Platform } from '@singletons';
 
 const ACTIVATION_THRESHOLD = 150;
 const SWIPE_FRICTION = 0.6;
@@ -74,25 +74,55 @@ export class CoreSwipeNavigationDirective implements AfterViewInit, OnDestroy {
     }
 
     /**
-     * Swipe to previous item.
+     * Move to item to the left.
      */
     swipeLeft(): void {
         if (!this.enabled) {
             return;
         }
 
-        this.manager?.navigateToNextItem();
+        Platform.isRTL
+            ? this.manager?.navigateToPreviousItem()
+            : this.manager?.navigateToNextItem();
     }
 
     /**
-     * Swipe to next item.
+     * Move to item to the right.
      */
     swipeRight(): void {
         if (!this.enabled) {
             return;
         }
 
-        this.manager?.navigateToPreviousItem();
+        Platform.isRTL
+            ? this.manager?.navigateToNextItem()
+            : this.manager?.navigateToPreviousItem();
+    }
+
+    /**
+     * Check whether there is an item to the right of the current selection.
+     */
+    protected async hasItemRight(): Promise<boolean> {
+        if (!this.manager) {
+            return false;
+        }
+
+        return Platform.isRTL
+            ? await this.manager.hasNextItem()
+            : await this.manager.hasPreviousItem();
+    }
+
+    /**
+     * Check whether there is an item to the left of the current selection.
+     */
+    protected async hasItemLeft(): Promise<boolean> {
+        if (!this.manager) {
+            return false;
+        }
+
+        return Platform.isRTL
+            ? await this.manager.hasPreviousItem()
+            : await this.manager.hasNextItem();
     }
 
     /**
@@ -127,7 +157,7 @@ export class CoreSwipeNavigationDirective implements AfterViewInit, OnDestroy {
     protected async onRelease(event: GestureDetail): Promise<void> {
         this.element.style.transition = '.5s ease-out';
 
-        if (event.deltaX > ACTIVATION_THRESHOLD && await this.manager?.hasPreviousItem()) {
+        if (event.deltaX > ACTIVATION_THRESHOLD && await this.hasItemRight()) {
             this.preventClickOnElement();
             this.swipeRight();
 
@@ -136,7 +166,7 @@ export class CoreSwipeNavigationDirective implements AfterViewInit, OnDestroy {
             return;
         }
 
-        if (event.deltaX < -ACTIVATION_THRESHOLD && await this.manager?.hasNextItem()) {
+        if (event.deltaX < -ACTIVATION_THRESHOLD && await this.hasItemLeft()) {
             this.element.style.transform = 'translateX(-100%) !important';
 
             this.preventClickOnElement();

From 0d82115364824f3e52160263df738640126f9566 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 11 Mar 2022 10:09:29 +0100
Subject: [PATCH 0689/1008] MOBILE-3814 collapsible: Check frozen state before
 end the transition

---
 src/core/directives/collapsible-header.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts
index 01f7b0470..faf83ddbe 100644
--- a/src/core/directives/collapsible-header.ts
+++ b/src/core/directives/collapsible-header.ts
@@ -399,6 +399,10 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
                     return;
                 }
 
+                if (page.classList.contains('is-frozen')) {
+                    return;
+                }
+
                 const progress = parseFloat(page.style.getPropertyValue('--collapsible-header-progress'));
                 const scrollTop = contentScroll.scrollTop;
                 const collapse = progress > 0.5;

From 860c3e7483d4766a37dfbcba0842cd5b3373041b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 11 Mar 2022 10:17:03 +0100
Subject: [PATCH 0690/1008] MOBILE-3814 data: Fix not fixed navigation bar

---
 src/addons/mod/data/pages/entry/entry.html | 37 +++++++++++-----------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/addons/mod/data/pages/entry/entry.html b/src/addons/mod/data/pages/entry/entry.html
index ce14704a3..72c1598a7 100644
--- a/src/addons/mod/data/pages/entry/entry.html
+++ b/src/addons/mod/data/pages/entry/entry.html
@@ -60,24 +60,23 @@
             [instanceId]="database.coursemodule" component="mod_data" [itemId]="entry.id" area="database_entry" [courseId]="courseId"
             (onLoading)="setLoadingComments($event)" [showItem]="true">
         </core-comments>
-
-        <div collapsible-footer *ngIf="entryLoaded && hasPrevious || hasNext" slot="fixed" appearOnBottom>
-            <ion-row class="ion-justify-content-between ion-align-items-center ion-no-padding ion-wrap">
-                <ion-col class="ion-text-start ion-no-padding core-navigation-arrow" size="auto">
-                    <ion-button [disabled]="!hasPrevious" fill="clear" [attr.aria-label]="'core.previous' | translate"
-                        (click)="gotoEntry(offset! -1)">
-                        <ion-icon name="fas-chevron-left" slot="icon-only" aria-hidden="true"></ion-icon>
-                    </ion-button>
-                </ion-col>
-                <ion-col class="ion-text-center">
-                </ion-col>
-                <ion-col class="ion-text-end ion-no-padding core-navigation-arrow" size="auto">
-                    <ion-button [disabled]="!hasNext" fill="clear" [attr.aria-label]=" 'core.next' | translate"
-                        (click)="gotoEntry(offset! + 1)">
-                        <ion-icon name="fas-chevron-right" slot="icon-only" aria-hidden="true"></ion-icon>
-                    </ion-button>
-                </ion-col>
-            </ion-row>
-        </div>
     </core-loading>
+    <div collapsible-footer *ngIf="entryLoaded && hasPrevious || hasNext" slot="fixed" appearOnBottom>
+        <ion-row class="ion-justify-content-between ion-align-items-center ion-no-padding ion-wrap">
+            <ion-col class="ion-text-start ion-no-padding core-navigation-arrow" size="auto">
+                <ion-button [disabled]="!hasPrevious" fill="clear" [attr.aria-label]="'core.previous' | translate"
+                    (click)="gotoEntry(offset! -1)">
+                    <ion-icon name="fas-chevron-left" slot="icon-only" aria-hidden="true"></ion-icon>
+                </ion-button>
+            </ion-col>
+            <ion-col class="ion-text-center">
+            </ion-col>
+            <ion-col class="ion-text-end ion-no-padding core-navigation-arrow" size="auto">
+                <ion-button [disabled]="!hasNext" fill="clear" [attr.aria-label]=" 'core.next' | translate"
+                    (click)="gotoEntry(offset! + 1)">
+                    <ion-icon name="fas-chevron-right" slot="icon-only" aria-hidden="true"></ion-icon>
+                </ion-button>
+            </ion-col>
+        </ion-row>
+    </div>
 </ion-content>

From b72e247f81f2bda9bafd689af12ec493c42c1c43 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 9 Mar 2022 14:38:00 +0100
Subject: [PATCH 0691/1008] MOBILE-3930 course: Store and display modules
 viewed and last

---
 scripts/langindex.json                        |   1 +
 .../services/recentlyaccesseditems.ts         |  28 +++-
 src/addons/mod/book/services/book.ts          |   2 +-
 src/addons/mod/data/pages/entry/entry.ts      |  18 +--
 .../mod/feedback/pages/attempt/attempt.ts     |   7 +
 .../mod/feedback/pages/attempts/attempts.ts   |  22 +++-
 .../pages/nonrespondents/nonrespondents.ts    |   8 ++
 .../forum/pages/discussion/discussion.page.ts |   8 ++
 src/addons/mod/glossary/pages/entry/entry.ts  |  15 ++-
 .../pages/attempt-results/attempt-results.ts  |   4 +
 .../pages/user-attempts/user-attempts.ts      |   4 +
 .../pages/users-attempts/users-attempts.ts    |   4 +
 src/addons/mod/imscp/services/imscp.ts        |   2 +-
 .../pages/user-retake/user-retake.page.ts     |   8 ++
 .../mod/lti/services/handlers/module.ts       |   3 +
 .../mod/quiz/pages/review/review.page.ts      |   4 +
 .../mod/resource/services/handlers/module.ts  |   2 +
 .../mod/url/services/handlers/module.ts       |  10 +-
 src/core/classes/site.ts                      |  51 ++++++-
 .../course/classes/main-resource-component.ts |   1 +
 .../course-format/course-format.html          |   4 +-
 .../components/course-format/course-format.ts |  88 +++++++++++--
 .../components/course-index/course-index.ts   |   6 +-
 .../components/module/core-course-module.html |   5 +
 .../course/components/module/module.scss      |  15 +++
 .../course/components/module/module.ts        |   1 +
 .../weeks/services/handlers/weeks-format.ts   |  22 +++-
 src/core/features/course/lang.json            |   1 +
 .../features/course/services/course-helper.ts |   1 +
 src/core/features/course/services/course.ts   | 124 ++++++++++++++++--
 .../course/services/database/course.ts        |  35 ++++-
 .../course/services/format-delegate.ts        |  41 ++++--
 .../services/handlers/default-format.ts       |  17 ++-
 src/core/services/database/sites.ts           |   4 +
 src/core/singletons/events.ts                 |  12 ++
 upgrade.txt                                   |   3 +-
 36 files changed, 508 insertions(+), 73 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 56faabdba..d0ecb48f7 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1559,6 +1559,7 @@
   "core.course.highlighted": "moodle",
   "core.course.insufficientavailablequota": "local_moodlemobileapp",
   "core.course.insufficientavailablespace": "local_moodlemobileapp",
+  "core.course.lastaccessedactivity": "local_moodlemobileapp",
   "core.course.manualcompletionnotsynced": "local_moodlemobileapp",
   "core.course.modulenotfound": "local_moodlemobileapp",
   "core.course.nocontentavailable": "local_moodlemobileapp",
diff --git a/src/addons/block/recentlyaccesseditems/services/recentlyaccesseditems.ts b/src/addons/block/recentlyaccesseditems/services/recentlyaccesseditems.ts
index 8261f24d3..eaafaebec 100644
--- a/src/addons/block/recentlyaccesseditems/services/recentlyaccesseditems.ts
+++ b/src/addons/block/recentlyaccesseditems/services/recentlyaccesseditems.ts
@@ -49,17 +49,41 @@ export class AddonBlockRecentlyAccessedItemsProvider {
             cacheKey: this.getRecentItemsCacheKey(),
         };
 
-        const items: AddonBlockRecentlyAccessedItemsItem[] =
+        let items: AddonBlockRecentlyAccessedItemsItem[] =
             await site.read('block_recentlyaccesseditems_get_recent_items', undefined, preSets);
 
-        return await Promise.all(items.map(async (item) => {
+        const cmIds: number[] = [];
+
+        items = await Promise.all(items.map(async (item) => {
             const modicon = item.icon && CoreDomUtils.getHTMLElementAttribute(item.icon, 'src');
 
             item.iconUrl = await CoreCourse.getModuleIconSrc(item.modname, modicon || undefined);
             item.iconTitle = item.icon && CoreDomUtils.getHTMLElementAttribute(item.icon, 'title');
+            cmIds.push(item.cmid);
 
             return item;
         }));
+
+        // Check if the viewed module should be updated for each activity.
+        const lastViewedMap = await CoreCourse.getCertainModulesViewed(cmIds, site.getId());
+
+        items.forEach((recentItem) => {
+            const timeAccess = recentItem.timeaccess * 1000;
+            const lastViewed = lastViewedMap[recentItem.cmid];
+
+            if (lastViewed && lastViewed.timeaccess >= timeAccess) {
+                return; // No need to update.
+            }
+
+            // Update access.
+            CoreCourse.storeModuleViewed(recentItem.courseid, recentItem.cmid, {
+                timeaccess: recentItem.timeaccess * 1000,
+                sectionId: lastViewed && lastViewed.sectionId,
+                siteId: site.getId(),
+            });
+        });
+
+        return items;
     }
 
     /**
diff --git a/src/addons/mod/book/services/book.ts b/src/addons/mod/book/services/book.ts
index 16cdd0360..2c62c96b9 100644
--- a/src/addons/mod/book/services/book.ts
+++ b/src/addons/mod/book/services/book.ts
@@ -391,7 +391,7 @@ export class AddonModBookProvider {
     async storeLastChapterViewed(id: number, chapterId: number, courseId: number, siteId?: string): Promise<void> {
         const site = await CoreSites.getSite(siteId);
 
-        await site.storeLastViewed(AddonModBookProvider.COMPONENT, id, chapterId, String(courseId));
+        await site.storeLastViewed(AddonModBookProvider.COMPONENT, id, chapterId, { data: String(courseId) });
     }
 
 }
diff --git a/src/addons/mod/data/pages/entry/entry.ts b/src/addons/mod/data/pages/entry/entry.ts
index d7ef66e84..648726a62 100644
--- a/src/addons/mod/data/pages/entry/entry.ts
+++ b/src/addons/mod/data/pages/entry/entry.ts
@@ -204,7 +204,10 @@ export class AddonModDataEntryPage implements OnInit, OnDestroy {
 
             if (this.logAfterFetch) {
                 this.logAfterFetch = false;
-                this.logView();
+                await CoreUtils.ignoreErrors(AddonModData.logView(this.database.id, this.database.name));
+
+                // Store module viewed. It's done in this page because it can be reached using a link.
+                CoreCourse.storeModuleViewed(this.courseId, this.moduleId);
             }
         } catch (error) {
             if (!refresh) {
@@ -402,19 +405,6 @@ export class AddonModDataEntryPage implements OnInit, OnDestroy {
         AddonModData.invalidateEntryData(this.database!.id, this.entryId!);
     }
 
-    /**
-     * Log viewing the activity.
-     *
-     * @return Promise resolved when done.
-     */
-    protected async logView(): Promise<void> {
-        if (!this.database || !this.database.id) {
-            return;
-        }
-
-        await CoreUtils.ignoreErrors(AddonModData.logView(this.database.id, this.database.name));
-    }
-
     /**
      * Component being destroyed.
      */
diff --git a/src/addons/mod/feedback/pages/attempt/attempt.ts b/src/addons/mod/feedback/pages/attempt/attempt.ts
index 35733c4ed..7ee5e6028 100644
--- a/src/addons/mod/feedback/pages/attempt/attempt.ts
+++ b/src/addons/mod/feedback/pages/attempt/attempt.ts
@@ -16,6 +16,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core';
 import { ActivatedRouteSnapshot } from '@angular/router';
 import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
 import { CoreSwipeNavigationItemsManager } from '@classes/items-management/swipe-navigation-items-manager';
+import { CoreCourse } from '@features/course/services/course';
 import { CoreNavigator } from '@services/navigator';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTextUtils } from '@services/utils/text';
@@ -49,6 +50,7 @@ export class AddonModFeedbackAttemptPage implements OnInit, OnDestroy {
     loaded = false;
 
     protected attemptId: number;
+    protected fetchSuccess = false;
 
     constructor() {
         this.cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
@@ -131,6 +133,11 @@ export class AddonModFeedbackAttemptPage implements OnInit, OnDestroy {
                 return attemptItem;
             }).filter((itemData) => itemData); // Filter items with errors.
 
+            if (!this.fetchSuccess) {
+                this.fetchSuccess = true;
+                // Store module viewed. It's done in this page because it can be reached using a link.
+                CoreCourse.storeModuleViewed(this.courseId, this.cmId);
+            }
         } catch (message) {
             // Some call failed on fetch, go back.
             CoreDomUtils.showErrorModalDefault(message, 'core.course.errorgetmodule', true);
diff --git a/src/addons/mod/feedback/pages/attempts/attempts.ts b/src/addons/mod/feedback/pages/attempts/attempts.ts
index 40fe0a21f..1da06886d 100644
--- a/src/addons/mod/feedback/pages/attempts/attempts.ts
+++ b/src/addons/mod/feedback/pages/attempts/attempts.ts
@@ -25,6 +25,7 @@ import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
 import { AddonModFeedbackAttemptItem, AddonModFeedbackAttemptsSource } from '../../classes/feedback-attempts-source';
 import { AddonModFeedbackWSAnonAttempt, AddonModFeedbackWSAttempt } from '../../services/feedback';
+import { CoreCourse } from '@features/course/services/course';
 
 /**
  * Page that displays feedback attempts.
@@ -37,14 +38,14 @@ export class AddonModFeedbackAttemptsPage implements AfterViewInit, OnDestroy {
 
     @ViewChild(CoreSplitViewComponent) splitView!: CoreSplitViewComponent;
 
-    promisedAttempts: CorePromisedValue<CoreListItemsManager<AddonModFeedbackAttemptItem, AddonModFeedbackAttemptsSource>>;
+    promisedAttempts: CorePromisedValue<AddonModFeedbackAttemptsManager>;
     fetchFailed = false;
 
     constructor(protected route: ActivatedRoute) {
         this.promisedAttempts = new CorePromisedValue();
     }
 
-    get attempts(): CoreListItemsManager<AddonModFeedbackAttemptItem, AddonModFeedbackAttemptsSource> | null {
+    get attempts(): AddonModFeedbackAttemptsManager | null {
         return this.promisedAttempts.value;
     }
 
@@ -95,7 +96,7 @@ export class AddonModFeedbackAttemptsPage implements AfterViewInit, OnDestroy {
 
             source.selectedGroup = CoreNavigator.getRouteNumberParam('group') || 0;
 
-            this.promisedAttempts.resolve(new CoreListItemsManager(source, this.route.component));
+            this.promisedAttempts.resolve(new AddonModFeedbackAttemptsManager(source, this.route.component));
         } catch (error) {
             CoreDomUtils.showErrorModal(error);
 
@@ -181,3 +182,18 @@ export class AddonModFeedbackAttemptsPage implements AfterViewInit, OnDestroy {
     }
 
 }
+
+/**
+ * Attempts manager.
+ */
+class AddonModFeedbackAttemptsManager extends CoreListItemsManager<AddonModFeedbackAttemptItem, AddonModFeedbackAttemptsSource> {
+
+    /**
+     * @inheritdoc
+     */
+    protected async logActivity(): Promise<void> {
+        // Store module viewed. It's done in this page because it can be reached using a link.
+        CoreCourse.storeModuleViewed(this.getSource().COURSE_ID, this.getSource().CM_ID);
+    }
+
+}
diff --git a/src/addons/mod/feedback/pages/nonrespondents/nonrespondents.ts b/src/addons/mod/feedback/pages/nonrespondents/nonrespondents.ts
index db568a32a..59b4f7ca5 100644
--- a/src/addons/mod/feedback/pages/nonrespondents/nonrespondents.ts
+++ b/src/addons/mod/feedback/pages/nonrespondents/nonrespondents.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import { Component, OnInit } from '@angular/core';
+import { CoreCourse } from '@features/course/services/course';
 import { IonRefresher } from '@ionic/angular';
 import { CoreGroupInfo, CoreGroups } from '@services/groups';
 import { CoreNavigator } from '@services/navigator';
@@ -34,6 +35,7 @@ export class AddonModFeedbackNonRespondentsPage implements OnInit {
     protected courseId!: number;
     protected feedback?: AddonModFeedbackWSFeedback;
     protected page = 0;
+    protected fetchSuccess = false;
 
     selectedGroup!: number;
     groupInfo?: CoreGroupInfo;
@@ -81,6 +83,12 @@ export class AddonModFeedbackNonRespondentsPage implements OnInit {
             this.selectedGroup = CoreGroups.validateGroupId(this.selectedGroup, this.groupInfo);
 
             await this.loadGroupUsers(this.selectedGroup);
+
+            if (!this.fetchSuccess) {
+                this.fetchSuccess = true;
+                // Store module viewed. It's done in this page because it can be reached using a link.
+                CoreCourse.storeModuleViewed(this.courseId, this.cmId);
+            }
         } catch (message) {
             CoreDomUtils.showErrorModalDefault(message, 'core.course.errorgetmodule', true);
 
diff --git a/src/addons/mod/forum/pages/discussion/discussion.page.ts b/src/addons/mod/forum/pages/discussion/discussion.page.ts
index 12bf5c553..0f735704b 100644
--- a/src/addons/mod/forum/pages/discussion/discussion.page.ts
+++ b/src/addons/mod/forum/pages/discussion/discussion.page.ts
@@ -17,6 +17,7 @@ import { Component, OnDestroy, ViewChild, OnInit, AfterViewInit, ElementRef, Opt
 import { ActivatedRoute, ActivatedRouteSnapshot } from '@angular/router';
 import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
+import { CoreCourse } from '@features/course/services/course';
 import { CoreFileUploader } from '@features/fileuploader/services/fileuploader';
 import { CoreRatingInfo, CoreRatingProvider } from '@features/rating/services/rating';
 import { CoreRatingOffline } from '@features/rating/services/rating-offline';
@@ -118,6 +119,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
     protected ratingOfflineObserver?: CoreEventObserver;
     protected ratingSyncObserver?: CoreEventObserver;
     protected changeDiscObserver?: CoreEventObserver;
+    protected fetchSuccess = false;
 
     constructor(
         @Optional() protected splitView: CoreSplitViewComponent,
@@ -547,6 +549,12 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
 
             this.hasOfflineRatings =
                 await CoreRatingOffline.hasRatings('mod_forum', 'post', ContextLevel.MODULE, this.cmId, this.discussionId);
+
+            if (!this.fetchSuccess) {
+                this.fetchSuccess = true;
+                // Store module viewed. It's done in this page because it can be reached using a link.
+                this.courseId && this.cmId && CoreCourse.storeModuleViewed(this.courseId, this.cmId);
+            }
         } catch (error) {
             CoreDomUtils.showErrorModal(error);
         } finally {
diff --git a/src/addons/mod/glossary/pages/entry/entry.ts b/src/addons/mod/glossary/pages/entry/entry.ts
index 41dfb3b8c..f07b4004b 100644
--- a/src/addons/mod/glossary/pages/entry/entry.ts
+++ b/src/addons/mod/glossary/pages/entry/entry.ts
@@ -17,6 +17,7 @@ import { ActivatedRoute, ActivatedRouteSnapshot } from '@angular/router';
 import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
 import { CoreCommentsCommentsComponent } from '@features/comments/components/comments/comments';
 import { CoreComments } from '@features/comments/services/comments';
+import { CoreCourse } from '@features/course/services/course';
 import { CoreRatingInfo } from '@features/rating/services/rating';
 import { CoreTag } from '@features/tag/services/tag';
 import { IonRefresher } from '@ionic/angular';
@@ -55,8 +56,10 @@ export class AddonModGlossaryEntryPage implements OnInit, OnDestroy {
     tagsEnabled = false;
     commentsEnabled = false;
     courseId!: number;
+    cmId?: number;
 
     protected entryId!: number;
+    protected fetchSuccess = false;
 
     constructor(protected route: ActivatedRoute) {}
 
@@ -72,15 +75,17 @@ export class AddonModGlossaryEntryPage implements OnInit, OnDestroy {
             this.commentsEnabled = !CoreComments.areCommentsDisabledInSite();
 
             if (routeData.swipeEnabled ?? true) {
-                const cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
+                this.cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
                 const source = CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(
                     AddonModGlossaryEntriesSource,
-                    [this.courseId, cmId, routeData.glossaryPathPrefix ?? ''],
+                    [this.courseId, this.cmId, routeData.glossaryPathPrefix ?? ''],
                 );
 
                 this.entries = new AddonModGlossaryEntryEntriesSwipeManager(source);
 
                 await this.entries.start();
+            } else {
+                this.cmId = CoreNavigator.getRouteNumberParam('cmId');
             }
         } catch (error) {
             CoreDomUtils.showErrorModal(error);
@@ -143,6 +148,12 @@ export class AddonModGlossaryEntryPage implements OnInit, OnDestroy {
             this.entry = result.entry;
             this.ratingInfo = result.ratinginfo;
 
+            if (!this.fetchSuccess) {
+                this.fetchSuccess = true;
+                // Store module viewed. It's done in this page because it can be reached using a link.
+                this.cmId && CoreCourse.storeModuleViewed(this.courseId, this.cmId);
+            }
+
             if (this.glossary) {
                 // Glossary already loaded, nothing else to load.
                 return;
diff --git a/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.ts b/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.ts
index 3b3727a2b..458449191 100644
--- a/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.ts
+++ b/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.ts
@@ -25,6 +25,7 @@ import {
     AddonModH5PActivityData,
     AddonModH5PActivityAttemptResults,
 } from '../../services/h5pactivity';
+import { CoreCourse } from '@features/course/services/course';
 
 /**
  * Page that displays results of an attempt.
@@ -99,6 +100,9 @@ export class AddonModH5PActivityAttemptResultsPage implements OnInit {
                     this.h5pActivity.name,
                     { attemptId: this.attemptId },
                 ));
+
+                // Store module viewed. It's done in this page because it can be reached using a link.
+                CoreCourse.storeModuleViewed(this.courseId, this.cmId);
             }
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'Error loading attempt.');
diff --git a/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.ts b/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.ts
index bb95f9fcb..a45b31b05 100644
--- a/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.ts
+++ b/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.ts
@@ -26,6 +26,7 @@ import {
     AddonModH5PActivityData,
     AddonModH5PActivityUserAttempts,
 } from '../../services/h5pactivity';
+import { CoreCourse } from '@features/course/services/course';
 
 /**
  * Page that displays user attempts of a certain user.
@@ -101,6 +102,9 @@ export class AddonModH5PActivityUserAttemptsPage implements OnInit {
                     this.h5pActivity.name,
                     { userId: this.userId },
                 ));
+
+                // Store module viewed. It's done in this page because it can be reached using a link.
+                CoreCourse.storeModuleViewed(this.courseId, this.cmId);
             }
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'Error loading attempts.');
diff --git a/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.ts b/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.ts
index f50cd056c..2acb07e59 100644
--- a/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.ts
+++ b/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import { Component, OnInit } from '@angular/core';
+import { CoreCourse } from '@features/course/services/course';
 import { CoreUser, CoreUserProfile } from '@features/user/services/user';
 import { IonRefresher } from '@ionic/angular';
 
@@ -92,6 +93,9 @@ export class AddonModH5PActivityUsersAttemptsPage implements OnInit {
             if (!this.fetchSuccess) {
                 this.fetchSuccess = true;
                 CoreUtils.ignoreErrors(AddonModH5PActivity.logViewReport(this.h5pActivity.id, this.h5pActivity.name));
+
+                // Store module viewed. It's done in this page because it can be reached using a link.
+                CoreCourse.storeModuleViewed(this.courseId, this.cmId);
             }
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'Error loading attempts.');
diff --git a/src/addons/mod/imscp/services/imscp.ts b/src/addons/mod/imscp/services/imscp.ts
index abfcd0d87..226dcd7c5 100644
--- a/src/addons/mod/imscp/services/imscp.ts
+++ b/src/addons/mod/imscp/services/imscp.ts
@@ -303,7 +303,7 @@ export class AddonModImscpProvider {
     async storeLastItemViewed(id: number, href: string, courseId: number, siteId?: string): Promise<void> {
         const site = await CoreSites.getSite(siteId);
 
-        await site.storeLastViewed(AddonModImscpProvider.COMPONENT, id, href, String(courseId));
+        await site.storeLastViewed(AddonModImscpProvider.COMPONENT, id, href, { data: String(courseId) });
     }
 
 }
diff --git a/src/addons/mod/lesson/pages/user-retake/user-retake.page.ts b/src/addons/mod/lesson/pages/user-retake/user-retake.page.ts
index 634e08740..996bb5235 100644
--- a/src/addons/mod/lesson/pages/user-retake/user-retake.page.ts
+++ b/src/addons/mod/lesson/pages/user-retake/user-retake.page.ts
@@ -35,6 +35,7 @@ import {
 } from '../../services/lesson';
 import { AddonModLessonAnswerData, AddonModLessonHelper } from '../../services/lesson-helper';
 import { CoreTimeUtils } from '@services/utils/time';
+import { CoreCourse } from '@features/course/services/course';
 
 /**
  * Page that displays a retake made by a certain user.
@@ -59,6 +60,7 @@ export class AddonModLessonUserRetakePage implements OnInit {
     protected userId?: number; // User ID to see the retakes.
     protected retakeNumber?: number; // Number of the initial retake to see.
     protected previousSelectedRetake?: number; // To be able to detect the previous selected retake when it has changed.
+    protected fetchSuccess = false;
 
     /**
      * Component being initialized.
@@ -160,6 +162,12 @@ export class AddonModLessonUserRetakePage implements OnInit {
             this.student.profileimageurl = user?.profileimageurl;
 
             await this.setRetake(this.selectedRetake);
+
+            if (!this.fetchSuccess) {
+                this.fetchSuccess = true;
+                // Store module viewed. It's done in this page because it can be reached using a link.
+                CoreCourse.storeModuleViewed(this.courseId, this.cmId);
+            }
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'Error getting data.', true);
         }
diff --git a/src/addons/mod/lti/services/handlers/module.ts b/src/addons/mod/lti/services/handlers/module.ts
index 7e80a8f53..953e4264f 100644
--- a/src/addons/mod/lti/services/handlers/module.ts
+++ b/src/addons/mod/lti/services/handlers/module.ts
@@ -21,6 +21,7 @@ import { makeSingleton } from '@singletons';
 import { AddonModLtiHelper } from '../lti-helper';
 import { AddonModLtiIndexComponent } from '../../components/index';
 import { CoreModuleHandlerBase } from '@features/course/classes/module-base-handler';
+import { CoreCourse } from '@features/course/services/course';
 
 /**
  * Handler to support LTI modules.
@@ -67,6 +68,8 @@ export class AddonModLtiModuleHandlerService extends CoreModuleHandlerBase imple
             action: (event: Event, module: CoreCourseModuleData, courseId: number): void => {
                 // Launch the LTI.
                 AddonModLtiHelper.getDataAndLaunch(courseId, module);
+
+                CoreCourse.storeModuleViewed(courseId, module.id);
             },
         }];
 
diff --git a/src/addons/mod/quiz/pages/review/review.page.ts b/src/addons/mod/quiz/pages/review/review.page.ts
index e58aac16e..478d234b8 100644
--- a/src/addons/mod/quiz/pages/review/review.page.ts
+++ b/src/addons/mod/quiz/pages/review/review.page.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
+import { CoreCourse } from '@features/course/services/course';
 import { CoreQuestionQuestionParsed } from '@features/question/services/question';
 import { CoreQuestionHelper } from '@features/question/services/question-helper';
 import { IonContent, IonRefresher } from '@ionic/angular';
@@ -163,6 +164,9 @@ export class AddonModQuizReviewPage implements OnInit {
                 CoreUtils.ignoreErrors(
                     AddonModQuiz.logViewAttemptReview(this.attemptId, this.quiz.id, this.quiz.name),
                 );
+
+                // Store module viewed. It's done in this page because it can be reached using a link.
+                CoreCourse.storeModuleViewed(this.courseId, this.cmId);
             }
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'addon.mod_quiz.errorgetquiz', true);
diff --git a/src/addons/mod/resource/services/handlers/module.ts b/src/addons/mod/resource/services/handlers/module.ts
index 3304a1b8c..c6f7e9e82 100644
--- a/src/addons/mod/resource/services/handlers/module.ts
+++ b/src/addons/mod/resource/services/handlers/module.ts
@@ -90,6 +90,8 @@ export class AddonModResourceModuleHandlerService extends CoreModuleHandlerBase
                 const hide = await this.hideOpenButton(module);
                 if (!hide) {
                     AddonModResourceHelper.openModuleFile(module, courseId);
+
+                    CoreCourse.storeModuleViewed(courseId, module.id);
                 }
             },
         }];
diff --git a/src/addons/mod/url/services/handlers/module.ts b/src/addons/mod/url/services/handlers/module.ts
index 8d7adc10e..b9978c872 100644
--- a/src/addons/mod/url/services/handlers/module.ts
+++ b/src/addons/mod/url/services/handlers/module.ts
@@ -63,7 +63,7 @@ export class AddonModUrlModuleHandlerService extends CoreModuleHandlerBase imple
          * @param module The module object.
          * @param courseId The course ID.
          */
-        const openUrl = async (module: CoreCourseModuleData): Promise<void> => {
+        const openUrl = async (module: CoreCourseModuleData, courseId: number): Promise<void> => {
             try {
                 if (module.instance) {
                     await AddonModUrl.logView(module.instance, module.name);
@@ -73,6 +73,8 @@ export class AddonModUrlModuleHandlerService extends CoreModuleHandlerBase imple
                 // Ignore errors.
             }
 
+            CoreCourse.storeModuleViewed(courseId, module.id);
+
             const contents = await CoreCourse.getModuleContents(module);
             AddonModUrlHelper.open(contents[0].fileurl);
         };
@@ -89,7 +91,7 @@ export class AddonModUrlModuleHandlerService extends CoreModuleHandlerBase imple
                     const shouldOpen = await this.shouldOpenLink(module);
 
                     if (shouldOpen) {
-                        openUrl(module);
+                        openUrl(module, courseId);
                     } else {
                         this.openActivityPage(module, module.course, options);
                     }
@@ -101,8 +103,8 @@ export class AddonModUrlModuleHandlerService extends CoreModuleHandlerBase imple
                 hidden: true, // Hide it until we calculate if it should be displayed or not.
                 icon: 'fas-link',
                 label: 'core.openmodinbrowser',
-                action: (event: Event, module: CoreCourseModuleData): void => {
-                    openUrl(module);
+                action: (event: Event, module: CoreCourseModuleData, courseId: number): void => {
+                    openUrl(module, courseId);
                 },
             }],
         };
diff --git a/src/core/classes/site.ts b/src/core/classes/site.ts
index eaefeb159..dc2644d60 100644
--- a/src/core/classes/site.ts
+++ b/src/core/classes/site.ts
@@ -160,7 +160,7 @@ export class CoreSite {
         this.lastViewedTable = asyncInstance(() => CoreSites.getSiteTable(CoreSite.LAST_VIEWED_TABLE, {
             siteId: this.getId(),
             database: this.getDb(),
-            config: { cachingStrategy: CoreDatabaseCachingStrategy.None },
+            config: { cachingStrategy: CoreDatabaseCachingStrategy.Eager },
             primaryKeyColumns: ['component', 'id'],
         }));
         this.setInfo(infos);
@@ -2000,21 +2000,55 @@ export class CoreSite {
         }
     }
 
+    /**
+     * Get several last viewed for a certain component.
+     *
+     * @param component The component.
+     * @param ids IDs. If not provided or empty, return all last viewed for a component.
+     * @return Resolves with last viewed records, undefined if error.
+     */
+    async getComponentLastViewed(component: string, ids: number[] = []): Promise<CoreSiteLastViewedDBRecord[] | undefined> {
+        try {
+            if (!ids.length) {
+                return await this.lastViewedTable.getMany({ component });
+            }
+
+            const whereAndParams = SQLiteDB.getInOrEqual(ids);
+
+            whereAndParams.sql = 'id ' + whereAndParams.sql + ' AND component = ?';
+            whereAndParams.params.push(component);
+
+            return await this.lastViewedTable.getManyWhere({
+                sql: whereAndParams.sql,
+                sqlParams: whereAndParams.params,
+                js: (record) => record.component === component && ids.includes(record.id),
+            });
+        } catch (error) {
+            // Not found.
+        }
+    }
+
     /**
      * Store a last viewed record.
      *
      * @param component The component.
      * @param id ID.
      * @param value Last viewed item value.
-     * @param data Other data.
+     * @param options Options.
      * @return Promise resolved when done.
      */
-    async storeLastViewed(component: string, id: number, value: string | number, data?: string): Promise<void> {
+    async storeLastViewed(
+        component: string,
+        id: number,
+        value: string | number,
+        options: CoreSiteStoreLastViewedOptions = {},
+    ): Promise<void> {
         await this.lastViewedTable.insert({
             component,
             id,
             value: String(value),
-            data,
+            data: options.data,
+            timeaccess: options.timeaccess ?? Date.now(),
         });
     }
 
@@ -2349,5 +2383,14 @@ export type CoreSiteLastViewedDBRecord = {
     component: string;
     id: number;
     value: string;
+    timeaccess: number;
     data?: string;
 };
+
+/**
+ * Options for storeLastViewed.
+ */
+export type CoreSiteStoreLastViewedOptions = {
+    data?: string; // Other data.
+    timeaccess?: number; // Accessed time. If not set, current time.
+};
diff --git a/src/core/features/course/classes/main-resource-component.ts b/src/core/features/course/classes/main-resource-component.ts
index 1c3d9600f..a9600520c 100644
--- a/src/core/features/course/classes/main-resource-component.ts
+++ b/src/core/features/course/classes/main-resource-component.ts
@@ -442,6 +442,7 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
         }
 
         this.fetchSuccess = true;
+        CoreCourse.storeModuleViewed(this.courseId, this.module.id, { sectionId: this.module.section });
 
         // Log activity now.
         try {
diff --git a/src/core/features/course/components/course-format/course-format.html b/src/core/features/course/components/course-format/course-format.html
index a8ca2b304..6f4e8c236 100644
--- a/src/core/features/course/components/course-format/course-format.html
+++ b/src/core/features/course/components/course-format/course-format.html
@@ -97,7 +97,9 @@
 
         <ng-container *ngFor="let module of section.modules">
             <core-course-module *ngIf="module.visibleoncoursepage !== 0" [module]="module" [section]="section"
-                [showActivityDates]="course.showactivitydates" [showCompletionConditions]="course.showcompletionconditions">
+                [showActivityDates]="course.showactivitydates" [showCompletionConditions]="course.showcompletionconditions"
+                [isLastViewed]="lastModuleViewed && lastModuleViewed.cmId === module.id" [class.core-course-module-not-viewed]="
+                    !viewedModules[module.id] && (!module.completiondata || module.completiondata.state === completionStatusIncomplete)">
             </core-course-module>
         </ng-container>
     </section>
diff --git a/src/core/features/course/components/course-format/course-format.ts b/src/core/features/course/components/course-format/course-format.ts
index 5b6797f98..32c742a53 100644
--- a/src/core/features/course/components/course-format/course-format.ts
+++ b/src/core/features/course/components/course-format/course-format.ts
@@ -29,6 +29,7 @@ import { CoreDynamicComponent } from '@components/dynamic-component/dynamic-comp
 import { CoreCourseAnyCourseData } from '@features/courses/services/courses';
 import {
     CoreCourse,
+    CoreCourseModuleCompletionStatus,
     CoreCourseProvider,
 } from '@features/course/services/course';
 import {
@@ -42,6 +43,7 @@ import { CoreCourseCourseIndexComponent, CoreCourseIndexSectionWithModule } from
 import { CoreBlockHelper } from '@features/block/services/block-helper';
 import { CoreNavigator } from '@services/navigator';
 import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate';
+import { CoreCourseViewedModulesDBRecord } from '@features/course/services/database/course';
 
 /**
  * Component to display course contents using a certain format. If the format isn't found, use default one.
@@ -90,9 +92,14 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
     stealthModulesSectionId: number = CoreCourseProvider.STEALTH_MODULES_SECTION_ID;
     loaded = false;
     highlighted?: string;
+    lastModuleViewed?: CoreCourseViewedModulesDBRecord;
+    viewedModules: Record<number, boolean> = {};
+    completionStatusIncomplete = CoreCourseModuleCompletionStatus.COMPLETION_INCOMPLETE;
 
     protected selectTabObserver?: CoreEventObserver;
+    protected modViewedObserver?: CoreEventObserver;
     protected lastCourseFormat?: string;
+    protected viewedModulesInitialized = false;
 
     constructor(
         protected content: IonContent,
@@ -133,6 +140,16 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
             }
         });
 
+        this.modViewedObserver = CoreEvents.on(CoreEvents.COURSE_MODULE_VIEWED, (data) => {
+            if (data.courseId !== this.course.id) {
+                return;
+            }
+
+            this.viewedModules[data.cmId] = true;
+            if (!this.lastModuleViewed || data.timeaccess > this.lastModuleViewed.timeaccess) {
+                this.lastModuleViewed = data;
+            }
+        });
     }
 
     /**
@@ -179,8 +196,8 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
         this.lastCourseFormat = this.course.format;
 
         this.highlighted = CoreCourseFormatDelegate.getSectionHightlightedName(this.course);
-        const currentSection = await CoreCourseFormatDelegate.getCurrentSection(this.course, this.sections);
-        currentSection.highlighted = true;
+        const currentSectionData = await CoreCourseFormatDelegate.getCurrentSection(this.course, this.sections);
+        currentSectionData.section.highlighted = true;
 
         await Promise.all([
             this.loadCourseFormatComponent(),
@@ -236,6 +253,8 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
         const hasAllSections = sections[0].id == CoreCourseProvider.ALL_SECTIONS_ID;
         const hasSeveralSections = sections.length > 2 || (sections.length == 2 && !hasAllSections);
 
+        await this.initializeViewedModules();
+
         if (this.selectedSection) {
             const selectedSection = this.selectedSection;
             // We have a selected section, but the list has changed. Search the section in the list.
@@ -243,7 +262,8 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
 
             if (!newSection) {
                 // Section not found, calculate which one to use.
-                newSection = await CoreCourseFormatDelegate.getCurrentSection(this.course, sections);
+                const currentSectionData = await CoreCourseFormatDelegate.getCurrentSection(this.course, sections);
+                newSection = currentSectionData.section;
             }
 
             this.sectionChanged(newSection);
@@ -269,16 +289,60 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
         }
 
         if (!this.loaded) {
-            // No section specified, not found or not visible, get current section.
-            const section = await CoreCourseFormatDelegate.getCurrentSection(this.course, sections);
+            // No section specified, not found or not visible, load current section or the section with last module viewed.
+            const currentSectionData = await CoreCourseFormatDelegate.getCurrentSection(this.course, sections);
+
+            const lastModuleViewed = this.lastModuleViewed;
+            let section = currentSectionData.section;
+            let moduleId: number | undefined;
+
+            if (!currentSectionData.forceSelected && lastModuleViewed) {
+                // Search the section with the last module viewed.
+                let lastModuleSection: CoreCourseSection | undefined;
+
+                if (lastModuleViewed.sectionId) {
+                    lastModuleSection = sections.find(section => section.id === lastModuleViewed.sectionId);
+                }
+                if (!lastModuleSection) {
+                    // No sectionId or section not found. Search the module.
+                    lastModuleSection = sections.find(
+                        section => section.modules.some(module => module.id === lastModuleViewed.cmId),
+                    );
+                }
+
+                section = lastModuleSection || section;
+                moduleId = lastModuleSection ? lastModuleViewed?.cmId : undefined;
+            } else if (lastModuleViewed && currentSectionData.section.modules.some(module => module.id === lastModuleViewed.cmId)) {
+                // Last module viewed is inside the highlighted section.
+                moduleId = lastModuleViewed.cmId;
+            }
 
             this.loaded = true;
-            this.sectionChanged(section);
+            this.sectionChanged(section, moduleId);
         }
 
         return;
     }
 
+    /**
+     * Initialize viewed modules.
+     *
+     * @return Promise resolved when done.
+     */
+    protected async initializeViewedModules(): Promise<void> {
+        if (this.viewedModulesInitialized) {
+            return;
+        }
+
+        const viewedModules = await CoreCourse.getViewedModules(this.course.id);
+
+        this.viewedModulesInitialized = true;
+        this.lastModuleViewed = viewedModules[0];
+        viewedModules.forEach(entry => {
+            this.viewedModules[entry.cmId] = true;
+        });
+    }
+
     /**
      * Display the course index modal.
      */
@@ -345,8 +409,9 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
      * Function called when selected section changes.
      *
      * @param newSection The new selected section.
+     * @param moduleId The module to scroll to.
      */
-    sectionChanged(newSection: CoreCourseSection): void {
+    sectionChanged(newSection: CoreCourseSection, moduleId?: number): void {
         const previousValue = this.selectedSection;
         this.selectedSection = newSection;
         this.data.section = this.selectedSection;
@@ -377,12 +442,14 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
             this.showMoreActivities();
         }
 
-        if (this.moduleId && previousValue === undefined) {
+        // Scroll to module if needed. Give more priority to the input.
+        moduleId = this.moduleId && previousValue === undefined ? this.moduleId : moduleId;
+        if (moduleId) {
             setTimeout(() => {
                 CoreDomUtils.scrollToElementBySelector(
                     this.elementRef.nativeElement,
                     this.content,
-                    '#core-course-module-' + this.moduleId,
+                    '#core-course-module-' + moduleId,
                 );
             }, 200);
         } else {
@@ -502,7 +569,8 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
      * @inheritdoc
      */
     ngOnDestroy(): void {
-        this.selectTabObserver && this.selectTabObserver.off();
+        this.selectTabObserver?.off();
+        this.modViewedObserver?.off();
     }
 
     /**
diff --git a/src/core/features/course/components/course-index/course-index.ts b/src/core/features/course/components/course-index/course-index.ts
index a36cee588..e530867f0 100644
--- a/src/core/features/course/components/course-index/course-index.ts
+++ b/src/core/features/course/components/course-index/course-index.ts
@@ -68,11 +68,11 @@ export class CoreCourseCourseIndexComponent implements OnInit {
             completionEnabled = this.course.showcompletionconditions;
         }
 
-        const currentSection = await CoreCourseFormatDelegate.getCurrentSection(this.course, this.sections);
+        const currentSectionData = await CoreCourseFormatDelegate.getCurrentSection(this.course, this.sections);
 
         if (this.selectedId === undefined) {
             // Highlight current section if none is selected.
-            this.selectedId = currentSection.id;
+            this.selectedId = currentSectionData.section.id;
         }
 
         // Clone sections to add information.
@@ -104,7 +104,7 @@ export class CoreCourseCourseIndexComponent implements OnInit {
                     name: section.name,
                     availabilityinfo: !!section.availabilityinfo,
                     expanded: section.id === this.selectedId,
-                    highlighted: currentSection?.id === section.id,
+                    highlighted: currentSectionData.section.id === section.id,
                     hasVisibleModules: modules.length > 0,
                     modules: modules,
                 };
diff --git a/src/core/features/course/components/module/core-course-module.html b/src/core/features/course/components/module/core-course-module.html
index 60e2ece03..f8b7f88a3 100644
--- a/src/core/features/course/components/module/core-course-module.html
+++ b/src/core/features/course/components/module/core-course-module.html
@@ -99,6 +99,11 @@
 
             </ion-label>
         </ion-item>
+
+        <div class="core-course-last-module-viewed" *ngIf="isLastViewed">
+            <ion-icon name="fas-eye" aria-hidden="true"></ion-icon>
+            {{ 'core.course.lastaccessedactivity' | translate }}
+        </div>
     </ng-container>
 
     <!-- Loading. -->
diff --git a/src/core/features/course/components/module/module.scss b/src/core/features/course/components/module/module.scss
index 4c06e9ca0..be50d8664 100644
--- a/src/core/features/course/components/module/module.scss
+++ b/src/core/features/course/components/module/module.scss
@@ -3,6 +3,7 @@
 :host {
     --horizontal-margin: 10px;
     --vertical-margin: 10px;
+    --core-course-module-not-viewed-border-color: var(--gray-500);
 
     ion-card {
         margin: var(--vertical-margin) var(--horizontal-margin);
@@ -91,4 +92,18 @@
     .core-course-module-info ::ng-deep core-course-module-completion .core-module-automatic-completion-conditions .completioninfo.completion_complete {
         display: none;
     }
+
+    &.core-course-module-not-viewed {
+        --ion-card-border-color: var(--core-course-module-not-viewed-border-color);
+    }
+
+    .core-course-last-module-viewed {
+        padding: 8px 12px;
+        color: var(--subdued-text-color);
+        border-top: 1px solid var(--stroke);
+
+        ion-icon {
+            margin-right: 4px;
+        }
+    }
 }
diff --git a/src/core/features/course/components/module/module.ts b/src/core/features/course/components/module/module.ts
index 29676e4ca..471e7e7d9 100644
--- a/src/core/features/course/components/module/module.ts
+++ b/src/core/features/course/components/module/module.ts
@@ -48,6 +48,7 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy {
     @Input() showActivityDates = false; // Whether to show activity dates.
     @Input() showCompletionConditions = false; // Whether to show activity completion conditions.
     @Input() showLegacyCompletion?: boolean; // Whether to show module completion in the old format.
+    @Input() isLastViewed = false; // Whether it's the last module viewed in a course.
     @Output() completionChanged = new EventEmitter<CoreCourseModuleCompletionData>(); // Notify when module completion changes.
 
     modNameTranslated = '';
diff --git a/src/core/features/course/format/weeks/services/handlers/weeks-format.ts b/src/core/features/course/format/weeks/services/handlers/weeks-format.ts
index 3af676006..2d05d2700 100644
--- a/src/core/features/course/format/weeks/services/handlers/weeks-format.ts
+++ b/src/core/features/course/format/weeks/services/handlers/weeks-format.ts
@@ -15,7 +15,7 @@
 import { Injectable } from '@angular/core';
 
 import { CoreTimeUtils } from '@services/utils/time';
-import { CoreCourseFormatHandler } from '@features/course/services/format-delegate';
+import { CoreCourseFormatCurrentSectionData, CoreCourseFormatHandler } from '@features/course/services/format-delegate';
 import { makeSingleton, Translate } from '@singletons';
 import { CoreCourseAnyCourseData } from '@features/courses/services/courses';
 import { CoreCourseWSSection } from '@features/course/services/course';
@@ -41,12 +41,18 @@ export class CoreCourseFormatWeeksHandlerService implements CoreCourseFormatHand
     /**
      * @inheritdoc
      */
-    async getCurrentSection(course: CoreCourseAnyCourseData, sections: CoreCourseSection[]): Promise<CoreCourseSection> {
+    async getCurrentSection(
+        course: CoreCourseAnyCourseData,
+        sections: CoreCourseSection[],
+    ): Promise<CoreCourseFormatCurrentSectionData<CoreCourseSection>> {
         const now = CoreTimeUtils.timestamp();
 
         if ((course.startdate && now < course.startdate) || (course.enddate && now > course.enddate)) {
             // Course hasn't started yet or it has ended already. Return all sections.
-            return sections[0];
+            return {
+                section: sections[0],
+                forceSelected: false,
+            };
         }
 
         for (let i = 0; i < sections.length; i++) {
@@ -57,12 +63,18 @@ export class CoreCourseFormatWeeksHandlerService implements CoreCourseFormatHand
 
             const dates = this.getSectionDates(section, course.startdate || 0);
             if (now >= dates.start && now < dates.end) {
-                return section;
+                return {
+                    section,
+                    forceSelected: false,
+                };
             }
         }
 
         // The section wasn't found, return all sections.
-        return sections[0];
+        return {
+            section: sections[0],
+            forceSelected: false,
+        };
     }
 
     /**
diff --git a/src/core/features/course/lang.json b/src/core/features/course/lang.json
index efa7b5613..459926c1e 100644
--- a/src/core/features/course/lang.json
+++ b/src/core/features/course/lang.json
@@ -44,6 +44,7 @@
     "highlighted": "Highlighted",
     "insufficientavailablespace": "You are trying to download {{size}}. This will leave your device with insufficient space to operate normally. Please clear some storage space first.",
     "insufficientavailablequota": "Your device could not allocate space to save this download. It may be reserving space for app and system updates. Please clear some storage space first.",
+    "lastaccessedactivity": "Last accessed activity",
     "manualcompletionnotsynced": "Manual completion not synchronised.",
     "modulenotfound": "Resource or activity not found, please make sure you're online and it's still available.",
     "nocontentavailable": "No content available at the moment.",
diff --git a/src/core/features/course/services/course-helper.ts b/src/core/features/course/services/course-helper.ts
index e14cae7f0..7dc88fd7b 100644
--- a/src/core/features/course/services/course-helper.ts
+++ b/src/core/features/course/services/course-helper.ts
@@ -2022,6 +2022,7 @@ export type CoreCourseModuleData = Omit<CoreCourseGetContentsWSModule, 'completi
     isStealth?: boolean;
     handlerData?: CoreCourseModuleHandlerData;
     completiondata?: CoreCourseModuleCompletionData;
+    section: number;
 };
 
 /**
diff --git a/src/core/features/course/services/course.ts b/src/core/features/course/services/course.ts
index bce92b409..d0997cd51 100644
--- a/src/core/features/course/services/course.ts
+++ b/src/core/features/course/services/course.ts
@@ -26,7 +26,9 @@ import { CoreConstants } from '@/core/constants';
 import { makeSingleton, Platform, Translate } from '@singletons';
 import { CoreStatusWithWarningsWSResponse, CoreWSExternalFile, CoreWSExternalWarning } from '@services/ws';
 
-import { CoreCourseStatusDBRecord, COURSE_STATUS_TABLE } from './database/course';
+import {
+    CoreCourseStatusDBRecord, CoreCourseViewedModulesDBRecord, COURSE_STATUS_TABLE, COURSE_VIEWED_MODULES_TABLE ,
+} from './database/course';
 import { CoreCourseOffline } from './course-offline';
 import { CoreError } from '@classes/errors/error';
 import {
@@ -49,6 +51,7 @@ import { lazyMap, LazyMap } from '@/core/utils/lazy-map';
 import { asyncInstance, AsyncInstance } from '@/core/utils/async-instance';
 import { CoreDatabaseTable } from '@classes/database/database-table';
 import { CoreDatabaseCachingStrategy } from '@classes/database/database-table-proxy';
+import { SQLiteDB } from '@classes/sqlitedb';
 
 const ROOT_CACHE_KEY = 'mmCourse:';
 
@@ -140,6 +143,7 @@ export class CoreCourseProvider {
 
     protected logger: CoreLogger;
     protected statusTables: LazyMap<AsyncInstance<CoreDatabaseTable<CoreCourseStatusDBRecord>>>;
+    protected viewedModulesTables: LazyMap<AsyncInstance<CoreDatabaseTable<CoreCourseViewedModulesDBRecord, 'courseId' | 'cmId'>>>;
 
     constructor() {
         this.logger = CoreLogger.getInstance('CoreCourseProvider');
@@ -152,6 +156,17 @@ export class CoreCourseProvider {
                 }),
             ),
         );
+
+        this.viewedModulesTables = lazyMap(
+            siteId => asyncInstance(
+                () => CoreSites.getSiteTable<CoreCourseViewedModulesDBRecord, 'courseId' | 'cmId'>(COURSE_VIEWED_MODULES_TABLE, {
+                    siteId,
+                    config: { cachingStrategy: CoreDatabaseCachingStrategy.None },
+                    primaryKeyColumns: ['courseId', 'cmId'],
+                    onDestroy: () => delete this.viewedModulesTables[siteId],
+                }),
+            ),
+        );
     }
 
     /**
@@ -340,6 +355,31 @@ export class CoreCourseProvider {
         return ROOT_CACHE_KEY + 'activitiescompletion:' + courseId + ':' + userId;
     }
 
+    /**
+     * Get certain module viewed records in the app.
+     *
+     * @param ids Module IDs.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with map of last module viewed data.
+     */
+    async getCertainModulesViewed(ids: number[] = [], siteId?: string): Promise<Record<number, CoreCourseViewedModulesDBRecord>> {
+        if (!ids.length) {
+            return {};
+        }
+
+        const site = await CoreSites.getSite(siteId);
+
+        const whereAndParams = SQLiteDB.getInOrEqual(ids);
+
+        const entries = await this.viewedModulesTables[site.getId()].getManyWhere({
+            sql: 'cmId ' + whereAndParams.sql,
+            sqlParams: whereAndParams.params,
+            js: (record) => ids.includes(record.cmId),
+        });
+
+        return CoreUtils.arrayToObject(entries, 'cmId');
+    }
+
     /**
      * Get course blocks.
      *
@@ -425,6 +465,19 @@ export class CoreCourseProvider {
         return entries.map((entry) => entry.id);
     }
 
+    /**
+     * Get last module viewed in the app for a course.
+     *
+     * @param id Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with last module viewed data, undefined if none.
+     */
+    async getLastModuleViewed(id: number, siteId?: string): Promise<CoreCourseViewedModulesDBRecord | undefined> {
+        const viewedModules = await this.getViewedModules(id, siteId);
+
+        return viewedModules[0];
+    }
+
     /**
      * Get a module from Moodle.
      *
@@ -548,7 +601,7 @@ export class CoreCourseProvider {
 
         let foundModule: CoreCourseGetContentsWSModule | undefined;
 
-        const foundSection = sections.some((section) => {
+        const foundSection = sections.find((section) => {
             if (section.id != CoreCourseProvider.STEALTH_MODULES_SECTION_ID &&
                 sectionId !== undefined &&
                 sectionId != section.id
@@ -562,7 +615,7 @@ export class CoreCourseProvider {
         });
 
         if (foundSection && foundModule) {
-            return this.addAdditionalModuleData(foundModule, courseId);
+            return this.addAdditionalModuleData(foundModule, courseId, foundSection.id);
         }
 
         throw new CoreError(Translate.instant('core.course.modulenotfound'));
@@ -573,11 +626,13 @@ export class CoreCourseProvider {
      *
      * @param module Module.
      * @param courseId Course ID of the module.
+     * @param sectionId Section ID of the module.
      * @return Module with additional info.
      */
-    protected  addAdditionalModuleData(
+    protected addAdditionalModuleData(
         module: CoreCourseGetContentsWSModule,
         courseId: number,
+        sectionId: number,
     ): CoreCourseModuleData {
         let completionData: CoreCourseModuleCompletionData | undefined = undefined;
 
@@ -590,13 +645,12 @@ export class CoreCourseProvider {
             };
         }
 
-        const moduleWithCourse: CoreCourseModuleData = {
+        return  {
             ...module,
             course: courseId,
+            section: sectionId,
             completiondata: completionData,
         };
-
-        return moduleWithCourse;
     }
 
     /**
@@ -873,7 +927,7 @@ export class CoreCourseProvider {
         // Add course to all modules.
         return sections.map((section) => ({
             ...section,
-            modules: section.modules.map((module) => this.addAdditionalModuleData(module, courseId)),
+            modules: section.modules.map((module) => this.addAdditionalModuleData(module, courseId, section.id)),
         }));
     }
 
@@ -901,6 +955,23 @@ export class CoreCourseProvider {
         return sections.reduce((previous: CoreCourseModuleData[], section) => previous.concat(section.modules || []), []);
     }
 
+    /**
+     * Get all viewed modules in a course, ordered by timeaccess in descending order.
+     *
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the list of viewed modules.
+     */
+    async getViewedModules(courseId: number, siteId?: string): Promise<CoreCourseViewedModulesDBRecord[]> {
+        const site = await CoreSites.getSite(siteId);
+
+        return await this.viewedModulesTables[site.getId()].getMany({ courseId }, {
+            sorting: [
+                { timeaccess: 'desc' },
+            ],
+        });
+    }
+
     /**
      * Invalidates course blocks WS call.
      *
@@ -1348,6 +1419,34 @@ export class CoreCourseProvider {
         this.triggerCourseStatusChanged(courseId, status, siteId);
     }
 
+    /**
+     * Store activity as viewed.
+     *
+     * @param courseId Chapter ID.
+     * @param cmId Module ID.
+     * @param options Other options.
+     * @return Promise resolved with last chapter viewed, undefined if none.
+     */
+    async storeModuleViewed(courseId: number, cmId: number, options: CoreCourseStoreModuleViewedOptions = {}): Promise<void> {
+        const site = await CoreSites.getSite(options.siteId);
+
+        const timeaccess = options.timeaccess ?? Date.now();
+
+        await this.viewedModulesTables[site.getId()].insert({
+            courseId,
+            cmId,
+            sectionId: options.sectionId,
+            timeaccess,
+        });
+
+        CoreEvents.trigger(CoreEvents.COURSE_MODULE_VIEWED, {
+            courseId,
+            cmId,
+            timeaccess,
+            sectionId: options.sectionId,
+        }, site.getId());
+    }
+
     /**
      * Translate a module name to current language.
      *
@@ -1770,3 +1869,12 @@ type CoreCompletionUpdateActivityCompletionStatusManuallyWSParams = {
 export type CoreCourseAnyModuleData = CoreCourseModuleData | CoreCourseModuleBasicInfo & {
     contents?: CoreCourseModuleContentFile[]; // If needed, calculated in the app in loadModuleContents.
 };
+
+/**
+ * Options for storeModuleViewed.
+ */
+export type CoreCourseStoreModuleViewedOptions = {
+    sectionId?: number;
+    timeaccess?: number;
+    siteId?: string;
+};
diff --git a/src/core/features/course/services/database/course.ts b/src/core/features/course/services/database/course.ts
index 7869b8a55..47fa10b87 100644
--- a/src/core/features/course/services/database/course.ts
+++ b/src/core/features/course/services/database/course.ts
@@ -18,9 +18,10 @@ import { CoreSiteSchema } from '@services/sites';
  * Database variables for CoreCourse service.
  */
 export const COURSE_STATUS_TABLE = 'course_status';
+export const COURSE_VIEWED_MODULES_TABLE = 'course_viewed_modules';
 export const SITE_SCHEMA: CoreSiteSchema = {
     name: 'CoreCourseProvider',
-    version: 1,
+    version: 2,
     tables: [
         {
             name: COURSE_STATUS_TABLE,
@@ -53,6 +54,29 @@ export const SITE_SCHEMA: CoreSiteSchema = {
                 },
             ],
         },
+        {
+            name: COURSE_VIEWED_MODULES_TABLE,
+            columns: [
+                {
+                    name: 'courseId',
+                    type: 'INTEGER',
+                },
+                {
+                    name: 'cmId',
+                    type: 'INTEGER',
+                },
+                {
+                    name: 'timeaccess',
+                    type: 'INTEGER',
+                    notNull: true,
+                },
+                {
+                    name: 'sectionId',
+                    type: 'INTEGER',
+                },
+            ],
+            primaryKeys: ['courseId', 'cmId'],
+        },
     ],
 };
 
@@ -85,7 +109,7 @@ export const OFFLINE_SITE_SCHEMA: CoreSiteSchema = {
                     type: 'TEXT',
                 },
                 {
-                    name: 'timecompleted',
+                    name: 'timeaccess',
                     type: 'INTEGER',
                 },
             ],
@@ -102,6 +126,13 @@ export type CoreCourseStatusDBRecord = {
     previousDownloadTime: number;
 };
 
+export type CoreCourseViewedModulesDBRecord = {
+    courseId: number;
+    cmId: number;
+    timeaccess: number;
+    sectionId?: number;
+};
+
 export type CoreCourseManualCompletionDBRecord = {
     cmid: number;
     completed: number;
diff --git a/src/core/features/course/services/format-delegate.ts b/src/core/features/course/services/format-delegate.ts
index 94a4bcc4c..12f87c94d 100644
--- a/src/core/features/course/services/format-delegate.ts
+++ b/src/core/features/course/services/format-delegate.ts
@@ -98,9 +98,13 @@ export interface CoreCourseFormatHandler extends CoreDelegateHandler {
      *
      * @param course The course to get the title.
      * @param sections List of sections.
-     * @return Promise resolved with current section.
+     * @return Promise resolved with current section and whether the section should be selected. If only the section is returned,
+     *         forceSelected will default to false.
      */
-    getCurrentSection?(course: CoreCourseAnyCourseData, sections: CoreCourseSection[]): Promise<CoreCourseSection>;
+    getCurrentSection?(
+        course: CoreCourseAnyCourseData,
+        sections: CoreCourseSection[],
+    ): Promise<CoreCourseFormatCurrentSectionData<CoreCourseSection> | CoreCourseSection>;
 
     /**
      * Returns the name for the highlighted section.
@@ -299,21 +303,37 @@ export class CoreCourseFormatDelegateService extends CoreDelegate<CoreCourseForm
      *
      * @param course The course to get the title.
      * @param sections List of sections.
-     * @return Promise resolved with current section.
+     * @return Promise.
      */
-    async getCurrentSection<T = CoreCourseSection>(course: CoreCourseAnyCourseData, sections: T[]): Promise<T> {
+    async getCurrentSection<T = CoreCourseSection>(
+        course: CoreCourseAnyCourseData,
+        sections: T[],
+    ): Promise<CoreCourseFormatCurrentSectionData<T>> {
         try {
-            const section = await this.executeFunctionOnEnabled<T>(
+            const sectionData = await this.executeFunctionOnEnabled<CoreCourseFormatCurrentSectionData<T> | T>(
                 course.format || '',
                 'getCurrentSection',
                 [course, sections],
             );
 
-            return section || sections[0];
+            if (sectionData && 'forceSelected' in sectionData) {
+                return sectionData;
+            } else if (sectionData) {
+                // Function just returned the section, don't force selecting it.
+                return {
+                    section: sectionData,
+                    forceSelected: false,
+                };
+            }
         } catch {
-            // This function should never fail. Just return the first section (usually, "All sections").
-            return sections[0];
+            // This function should never fail.
         }
+
+        // Return the first section (usually, "All sections").
+        return {
+            section: sections[0],
+            forceSelected: false,
+        };
     }
 
     /**
@@ -380,3 +400,8 @@ export class CoreCourseFormatDelegateService extends CoreDelegate<CoreCourseForm
 }
 
 export const CoreCourseFormatDelegate = makeSingleton(CoreCourseFormatDelegateService);
+
+export type CoreCourseFormatCurrentSectionData<T = CoreCourseSection> = {
+    section: T; // Current section.
+    forceSelected: boolean; // If true, the app will force selecting the section when opening the course.
+};
diff --git a/src/core/features/course/services/handlers/default-format.ts b/src/core/features/course/services/handlers/default-format.ts
index ff60f6c39..383a645fc 100644
--- a/src/core/features/course/services/handlers/default-format.ts
+++ b/src/core/features/course/services/handlers/default-format.ts
@@ -18,7 +18,7 @@ import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
 import { CoreUtils } from '@services/utils/utils';
 import { Translate } from '@singletons';
 import { CoreCourseSection } from '../course-helper';
-import { CoreCourseFormatHandler } from '../format-delegate';
+import { CoreCourseFormatCurrentSectionData, CoreCourseFormatHandler } from '../format-delegate';
 
 /**
  * Default handler used when the course format doesn't have a specific implementation.
@@ -74,7 +74,10 @@ export class CoreCourseFormatDefaultHandler implements CoreCourseFormatHandler {
     /**
      * @inheritdoc
      */
-    async getCurrentSection(course: CoreCourseAnyCourseData, sections: CoreCourseSection[]): Promise<CoreCourseSection> {
+    async getCurrentSection(
+        course: CoreCourseAnyCourseData,
+        sections: CoreCourseSection[],
+    ): Promise<CoreCourseFormatCurrentSectionData<CoreCourseSection>> {
         let marker: number | undefined;
 
         // We need the "marker" to determine the current section.
@@ -93,12 +96,18 @@ export class CoreCourseFormatDefaultHandler implements CoreCourseFormatHandler {
             const section = sections.find((sect) => sect.section == marker);
 
             if (section) {
-                return section;
+                return {
+                    section,
+                    forceSelected: true,
+                };
             }
         }
 
         // Marked section not found or we couldn't retrieve the marker. Return all sections.
-        return sections[0];
+        return {
+            section: sections[0],
+            forceSelected: false,
+        };
     }
 
     /**
diff --git a/src/core/services/database/sites.ts b/src/core/services/database/sites.ts
index 8d2083e1d..80aadcd48 100644
--- a/src/core/services/database/sites.ts
+++ b/src/core/services/database/sites.ts
@@ -145,6 +145,10 @@ export const SITE_SCHEMA: CoreSiteSchema = {
                     name: 'data',
                     type: 'TEXT',
                 },
+                {
+                    name: 'timeaccess',
+                    type: 'INTEGER',
+                },
             ],
             primaryKeys: ['component', 'id'],
         },
diff --git a/src/core/singletons/events.ts b/src/core/singletons/events.ts
index 57d112fd8..4045c8212 100644
--- a/src/core/singletons/events.ts
+++ b/src/core/singletons/events.ts
@@ -60,6 +60,7 @@ export interface CoreEventsData {
     [CoreEvents.FILE_SHARED]: CoreEventFileSharedData;
     [CoreEvents.APP_LAUNCHED_URL]: CoreEventAppLaunchedData;
     [CoreEvents.ORIENTATION_CHANGE]: CoreEventOrientationData;
+    [CoreEvents.COURSE_MODULE_VIEWED]: CoreEventCourseModuleViewed;
 }
 
 /*
@@ -110,6 +111,7 @@ export class CoreEvents {
     static readonly FORM_ACTION = 'form_action';
     static readonly ACTIVITY_DATA_SENT = 'activity_data_sent';
     static readonly DEVICE_REGISTERED_IN_MOODLE = 'device_registered_in_moodle';
+    static readonly COURSE_MODULE_VIEWED = 'course_module_viewed';
 
     protected static logger = CoreLogger.getInstance('CoreEvents');
     protected static observables: { [eventName: string]: Subject<unknown> } = {};
@@ -427,3 +429,13 @@ export type CoreEventAppLaunchedData = {
 export type CoreEventOrientationData = {
     orientation: CoreScreenOrientation;
 };
+
+/**
+ * Data passed to COURSE_MODULE_VIEWED event.
+ */
+export type CoreEventCourseModuleViewed = {
+    courseId: number;
+    cmId: number;
+    timeaccess: number;
+    sectionId?: number;
+};
diff --git a/upgrade.txt b/upgrade.txt
index e01fe0058..5bb5fdf59 100644
--- a/upgrade.txt
+++ b/upgrade.txt
@@ -22,7 +22,8 @@ information provided here is intended especially for developers.
 - The parameters of the following functions in CoreCourseHelper have changed: navigateToModuleByInstance, navigateToModule, openModule.
 - fillContextMenu, expandDescription, gotoBlog, prefetch and removeFiles functions have been removed from CoreCourseModuleMainResourceComponent.
 - contextMenuPrefetch and fillContextMenu have been removed from CoreCourseHelper.
--The variable "loaded" in CoreCourseModuleMainResourceComponent has been changed to "showLoading" to reflect its purpose better.
+- The variable "loaded" in CoreCourseModuleMainResourceComponent has been changed to "showLoading" to reflect its purpose better.
+- The function getCurrentSection of course formats can now return a forceSelected boolean along with the section (defaults to false if not returned).
 
 
 

From 3f82998ae25863e7213db0522651167867c0dec7 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 11 Mar 2022 11:40:15 +0100
Subject: [PATCH 0692/1008] MOBILE-3930 course: Change section if needed when
 changing module

---
 .../components/course-format/course-format.ts | 68 ++++++++++++++-----
 .../module-summary/module-summary.ts          |  4 ++
 src/core/features/course/pages/index/index.ts |  8 ++-
 3 files changed, 61 insertions(+), 19 deletions(-)

diff --git a/src/core/features/course/components/course-format/course-format.ts b/src/core/features/course/components/course-format/course-format.ts
index 32c742a53..207d2dc8e 100644
--- a/src/core/features/course/components/course-format/course-format.ts
+++ b/src/core/features/course/components/course-format/course-format.ts
@@ -148,6 +148,14 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
             this.viewedModules[data.cmId] = true;
             if (!this.lastModuleViewed || data.timeaccess > this.lastModuleViewed.timeaccess) {
                 this.lastModuleViewed = data;
+
+                if (this.selectedSection) {
+                    // Change section to display the one with the last viewed module
+                    const lastViewedSection = this.getViewedModuleSection(this.sections, data);
+                    if (lastViewedSection && lastViewedSection.id !== this.selectedSection?.id) {
+                        this.sectionChanged(lastViewedSection, data.cmId);
+                    }
+                }
             }
         });
     }
@@ -298,17 +306,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
 
             if (!currentSectionData.forceSelected && lastModuleViewed) {
                 // Search the section with the last module viewed.
-                let lastModuleSection: CoreCourseSection | undefined;
-
-                if (lastModuleViewed.sectionId) {
-                    lastModuleSection = sections.find(section => section.id === lastModuleViewed.sectionId);
-                }
-                if (!lastModuleSection) {
-                    // No sectionId or section not found. Search the module.
-                    lastModuleSection = sections.find(
-                        section => section.modules.some(module => module.id === lastModuleViewed.cmId),
-                    );
-                }
+                const lastModuleSection = this.getViewedModuleSection(sections, lastModuleViewed);
 
                 section = lastModuleSection || section;
                 moduleId = lastModuleSection ? lastModuleViewed?.cmId : undefined;
@@ -343,6 +341,31 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
         });
     }
 
+    /**
+     * Get the section of a viewed module.
+     *
+     * @param sections List of sections.
+     * @param viewedModule Viewed module.
+     * @return Section, undefined if not found.
+     */
+    protected getViewedModuleSection(
+        sections: CoreCourseSection[],
+        viewedModule: CoreCourseViewedModulesDBRecord,
+    ): CoreCourseSection | undefined {
+        if (viewedModule.sectionId) {
+            const lastModuleSection = sections.find(section => section.id === viewedModule.sectionId);
+
+            if (lastModuleSection) {
+                return lastModuleSection;
+            }
+        }
+
+        // No sectionId or section not found. Search the module.
+        return sections.find(
+            section => section.modules.some(module => module.id === viewedModule.cmId),
+        );
+    }
+
     /**
      * Display the course index modal.
      */
@@ -443,14 +466,10 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
         }
 
         // Scroll to module if needed. Give more priority to the input.
-        moduleId = this.moduleId && previousValue === undefined ? this.moduleId : moduleId;
-        if (moduleId) {
+        const moduleIdToScroll = this.moduleId && previousValue === undefined ? this.moduleId : moduleId;
+        if (moduleIdToScroll) {
             setTimeout(() => {
-                CoreDomUtils.scrollToElementBySelector(
-                    this.elementRef.nativeElement,
-                    this.content,
-                    '#core-course-module-' + moduleId,
-                );
+                this.scrollToModule(moduleIdToScroll);
             }, 200);
         } else {
             this.content.scrollToTop(0);
@@ -466,6 +485,19 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
         this.invalidateSectionButtons();
     }
 
+    /**
+     * Scroll to a certain module.
+     *
+     * @param moduleId Module ID.
+     */
+    protected scrollToModule(moduleId: number): void {
+        CoreDomUtils.scrollToElementBySelector(
+            this.elementRef.nativeElement,
+            this.content,
+            '#core-course-module-' + moduleId,
+        );
+    }
+
     /**
      * Compare if two sections are equal.
      *
diff --git a/src/core/features/course/components/module-summary/module-summary.ts b/src/core/features/course/components/module-summary/module-summary.ts
index f480c8469..61e5695cf 100644
--- a/src/core/features/course/components/module-summary/module-summary.ts
+++ b/src/core/features/course/components/module-summary/module-summary.ts
@@ -271,6 +271,10 @@ export class CoreCourseModuleSummaryComponent implements OnInit, OnDestroy {
             {
                 replace: true,
                 animationDirection: 'back',
+                params: {
+                    module: this.module,
+                    openModule: false,
+                },
             },
         );
     }
diff --git a/src/core/features/course/pages/index/index.ts b/src/core/features/course/pages/index/index.ts
index bb2537e83..e6258e4e6 100644
--- a/src/core/features/course/pages/index/index.ts
+++ b/src/core/features/course/pages/index/index.ts
@@ -57,6 +57,7 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
     protected module?: CoreCourseModuleData;
     protected modNavOptions?: CoreNavigationOptions;
     protected isGuest = false;
+    protected openModule = true;
     protected contentsTab: CoreTabsOutletTab & { pageParams: Params } = {
         page: CONTENTS_PAGE_NAME,
         title: 'core.course',
@@ -136,6 +137,7 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
         this.module = CoreNavigator.getRouteParam<CoreCourseModuleData>('module');
         this.isGuest = !!CoreNavigator.getRouteBooleanParam('isGuest');
         this.modNavOptions = CoreNavigator.getRouteParam<CoreNavigationOptions>('modNavOptions');
+        this.openModule = CoreNavigator.getRouteBooleanParam('openModule') ?? true; // If false, just scroll to module.
         if (!this.modNavOptions) {
             // Fallback to old way of passing params. @deprecated since 4.0.
             const modParams = CoreNavigator.getRouteParam<Params>('modParams');
@@ -155,6 +157,10 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
 
         if (this.module) {
             this.contentsTab.pageParams.moduleId = this.module.id;
+            if (!this.contentsTab.pageParams.sectionId && !this.contentsTab.pageParams.sectionNumber) {
+                // No section specified, use module section.
+                this.contentsTab.pageParams.sectionId = this.module.section;
+            }
         }
 
         this.tabs.push(this.contentsTab);
@@ -170,7 +176,7 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
      * A tab was selected.
      */
     tabSelected(): void {
-        if (!this.module || !this.course) {
+        if (!this.module || !this.course || !this.openModule) {
             return;
         }
         // Now that the first tab has been selected we can load the module.

From 1ac9d8dd9f570b4a77105bf86451c84ada8872f6 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 11 Mar 2022 15:10:37 +0100
Subject: [PATCH 0693/1008] MOBILE-4001 quiz: Display decimals in quiz review
 percentage

---
 src/addons/mod/quiz/pages/review/review.page.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/addons/mod/quiz/pages/review/review.page.ts b/src/addons/mod/quiz/pages/review/review.page.ts
index 04b7bb7a7..88a645ec0 100644
--- a/src/addons/mod/quiz/pages/review/review.page.ts
+++ b/src/addons/mod/quiz/pages/review/review.page.ts
@@ -18,7 +18,6 @@ import { CoreQuestionHelper } from '@features/question/services/question-helper'
 import { IonContent, IonRefresher } from '@ionic/angular';
 import { CoreNavigator } from '@services/navigator';
 import { CoreDomUtils } from '@services/utils/dom';
-import { CoreTextUtils } from '@services/utils/text';
 import { CoreTimeUtils } from '@services/utils/time';
 import { CoreUtils } from '@services/utils/utils';
 import { Translate } from '@singletons';
@@ -303,9 +302,9 @@ export class AddonModQuizReviewPage implements OnInit {
                 };
 
                 if (this.quiz.grade != 100) {
-                    gradeObject.percent = CoreTextUtils.roundToDecimals(
-                        this.attempt.sumgrades! * 100 / this.quiz.sumgrades!,
-                        0,
+                    gradeObject.percent = AddonModQuiz.formatGrade(
+                        (this.attempt.sumgrades ?? 0) * 100 / (this.quiz.sumgrades ?? 1),
+                        this.quiz.decimalpoints,
                     );
                     this.readableGrade = Translate.instant('addon.mod_quiz.outofpercent', { $a: gradeObject });
                 } else {

From 463194d526fb9f87094e956bd575c66e28fe78d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 11 Mar 2022 12:42:44 +0100
Subject: [PATCH 0694/1008] MOBILE-3814 collapsible: Wait the page transition
 before calculating

---
 src/core/components/loading/loading.ts     | 80 ++++++++++---------
 src/core/directives/collapsible-header.ts  | 90 +++++++++++++---------
 src/core/singletons/components-registry.ts | 38 ++++++++-
 3 files changed, 135 insertions(+), 73 deletions(-)

diff --git a/src/core/components/loading/loading.ts b/src/core/components/loading/loading.ts
index a0254ee8b..dd06222c0 100644
--- a/src/core/components/loading/loading.ts
+++ b/src/core/components/loading/loading.ts
@@ -18,6 +18,8 @@ import { CoreEventLoadingChangedData, CoreEvents } from '@singletons/events';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreAnimations } from '@components/animations';
 import { Translate } from '@singletons';
+import { CoreComponentsRegistry } from '@singletons/components-registry';
+import { CorePromisedValue } from '@classes/promised-value';
 
 /**
  * Component to show a loading spinner and message while data is being loaded.
@@ -56,16 +58,18 @@ export class CoreLoadingComponent implements OnInit, OnChanges, AfterViewInit {
     uniqueId: string;
     protected element: HTMLElement; // Current element.
     loaded = false; // Only comes true once.
+    protected firstLoadedPromise = new CorePromisedValue<string>();
 
     constructor(element: ElementRef) {
         this.element = element.nativeElement;
+        CoreComponentsRegistry.register(this.element, this);
 
         // Calculate the unique ID.
         this.uniqueId = 'core-loading-content-' + CoreUtils.getUniqueId('CoreLoadingComponent');
     }
 
     /**
-     * Component being initialized.
+     * @inheritdoc
      */
     ngOnInit(): void {
         if (!this.message) {
@@ -77,50 +81,54 @@ export class CoreLoadingComponent implements OnInit, OnChanges, AfterViewInit {
     }
 
     /**
-     * View has been initialized.
+     * @inheritdoc
      */
     ngAfterViewInit(): void {
-        // Add class if loaded on init.
-        if (this.hideUntil) {
-            this.element.classList.add('core-loading-loaded');
-        }
-        this.loaded = !!this.hideUntil;
-
-        this.content?.nativeElement.classList.toggle('core-loading-content', !!this.hideUntil);
+        this.changeState(!!this.hideUntil);
     }
 
     /**
-     * Component input changed.
-     *
-     * @param changes Changes.
+     * @inheritdoc
      */
     ngOnChanges(changes: { [name: string]: SimpleChange }): void {
         if (changes.hideUntil) {
-            if (!this.loaded) {
-                this.loaded = !!this.hideUntil; // Only comes true once.
-            }
-
-            if (this.hideUntil) {
-                setTimeout(() => {
-                    // Content is loaded so, center the spinner on the content itself.
-                    this.element.classList.add('core-loading-loaded');
-                    // Change CSS to force calculate height.
-                    // Removed 500ms timeout to avoid reallocating html.
-                    this.content?.nativeElement.classList.add('core-loading-content');
-                });
-            } else {
-                this.element.classList.remove('core-loading-loaded');
-                this.content?.nativeElement.classList.remove('core-loading-content');
-            }
-
-            // Trigger the event after a timeout since the elements inside ngIf haven't been added to DOM yet.
-            setTimeout(() => {
-                CoreEvents.trigger(CoreEvents.CORE_LOADING_CHANGED, <CoreEventLoadingChangedData> {
-                    loaded: !!this.hideUntil,
-                    uniqueId: this.uniqueId,
-                });
-            });
+            this.changeState(!!this.hideUntil);
         }
     }
 
+    /**
+     * Change loaded state.
+     *
+     * @param loaded True to load, false otherwise.
+     * @return Promise resolved when done.
+     */
+    async changeState(loaded: boolean): Promise<void> {
+        await CoreUtils.nextTick();
+
+        this.element.classList.toggle('core-loading-loaded', loaded);
+        this.content?.nativeElement.classList.add('core-loading-content', loaded);
+
+        await CoreUtils.nextTick();
+
+        // Wait for next tick before triggering the event to make sure ngIf elements have been added to the DOM.
+        CoreEvents.trigger(CoreEvents.CORE_LOADING_CHANGED, <CoreEventLoadingChangedData> {
+            loaded: loaded,
+            uniqueId: this.uniqueId,
+        });
+
+        if (!this.loaded && loaded) {
+            this.loaded = true; // Only comes true once.
+            this.firstLoadedPromise.resolve(this.uniqueId);
+        }
+    }
+
+    /**
+     * Wait the loading to finish.
+     *
+     * @return Promise resolved with the uniqueId when done.
+     */
+    async whenLoaded(): Promise<string> {
+        return await this.firstLoadedPromise;
+    }
+
 }
diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts
index faf83ddbe..cceaca12e 100644
--- a/src/core/directives/collapsible-header.ts
+++ b/src/core/directives/collapsible-header.ts
@@ -13,6 +13,8 @@
 // limitations under the License.
 
 import { Directive, ElementRef, Input, OnChanges, OnDestroy, OnInit, SimpleChange } from '@angular/core';
+import { CorePromisedValue } from '@classes/promised-value';
+import { CoreLoadingComponent } from '@components/loading/loading';
 import { CoreTabsOutletComponent } from '@components/tabs-outlet/tabs-outlet';
 import { ScrollDetail } from '@ionic/core';
 import { CoreUtils } from '@services/utils/utils';
@@ -55,32 +57,36 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
     @Input() collapsible = true;
 
     protected page?: HTMLElement;
-    protected collapsedHeader?: Element;
+    protected collapsedHeader: HTMLIonHeaderElement;
     protected collapsedFontStyles?: Partial<CSSStyleDeclaration>;
-    protected expandedHeader?: Element;
+    protected expandedHeader?: HTMLIonItemElement;
     protected expandedHeaderHeight?: number;
     protected expandedFontStyles?: Partial<CSSStyleDeclaration>;
     protected content?: HTMLIonContentElement;
     protected contentScrollListener?: EventListener;
     protected endContentScrollListener?: EventListener;
-    protected floatingTitle?: HTMLElement;
+    protected pageDidEnterListener?: EventListener;
+    protected floatingTitle?: HTMLHeadingElement;
     protected scrollingHeight?: number;
     protected subscriptions: Subscription[] = [];
     protected enabled = true;
     protected isWithinContent = false;
+    protected enteredPromise = new CorePromisedValue<void>();
 
-    constructor(protected el: ElementRef) {}
+    constructor(el: ElementRef) {
+        this.collapsedHeader = el.nativeElement;
+    }
 
     /**
      * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
-        this.collapsedHeader = this.el.nativeElement;
+        this.initializePage();
 
         await Promise.all([
-            this.initializePage(),
             this.initializeCollapsedHeader(),
             this.initializeExpandedHeader(),
+            await this.enteredPromise,
         ]);
 
         this.initializeFloatingTitle();
@@ -111,30 +117,42 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
         if (this.content && this.endContentScrollListener) {
             this.content.removeEventListener('ionScrollEnd', this.endContentScrollListener);
         }
+        if (this.page && this.pageDidEnterListener) {
+            this.page.removeEventListener('ionViewDidEnter', this.pageDidEnterListener);
+        }
     }
 
     /**
      * Search the page element, initialize it, and wait until it's ready for the transition to trigger on scroll.
      */
-    protected async initializePage(): Promise<void> {
-        if (!this.collapsedHeader?.parentElement) {
+    protected initializePage(): void {
+        if (!this.collapsedHeader.parentElement) {
             throw new Error('[collapsible-header] Couldn\'t get page');
         }
 
         // Find element and prepare classes.
         this.page = this.collapsedHeader.parentElement;
-
         this.page.classList.add('collapsible-header-page');
+
+        this.page.addEventListener(
+            'ionViewDidEnter',
+            this.pageDidEnterListener = () => {
+                clearTimeout(timeout);
+                this.enteredPromise.resolve();
+            },
+            { once: true },
+        );
+
+        // Timeout in case event is never fired.
+        const timeout = window.setTimeout(() => {
+            this.enteredPromise.reject(new Error('[collapsible-header] Waiting for ionViewDidEnter timeout reached'));
+        }, 5000);
     }
 
     /**
      * Search the collapsed header element, initialize it, and wait until it's ready for the transition to trigger on scroll.
      */
     protected async initializeCollapsedHeader(): Promise<void> {
-        if (!this.collapsedHeader) {
-            throw new Error('[collapsible-header] Couldn\'t initialize collapsed header');
-        }
-
         this.collapsedHeader.classList.add('collapsible-header-collapsed');
 
         await this.waitFormatTextsRendered(this.collapsedHeader);
@@ -144,23 +162,16 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
      * Search the expanded header element, initialize it, and wait until it's ready for the transition to trigger on scroll.
      */
     protected async initializeExpandedHeader(): Promise<void> {
-        do {
-            await CoreUtils.wait(50);
+        await this.waitLoadingsDone();
 
-            this.expandedHeader = this.page?.querySelector('ion-item[collapsible]') ?? undefined;
-
-            if (!this.expandedHeader) {
-                continue;
-            }
-
-            await this.waitFormatTextsRendered(this.expandedHeader);
-        } while (
-            !this.expandedHeader ||
-            this.expandedHeader.clientHeight === 0 ||
-            this.expandedHeader.closest('ion-content.animating')
-        );
+        this.expandedHeader = this.page?.querySelector('ion-item[collapsible]') ?? undefined;
 
+        if (!this.expandedHeader) {
+            throw new Error('[collapsible-header] Couldn\'t initialize expanded header');
+        }
         this.expandedHeader.classList.add('collapsible-header-expanded');
+
+        await this.waitFormatTextsRendered(this.expandedHeader);
     }
 
     /**
@@ -180,6 +191,8 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
 
             this.subscriptions.push(outlet.activateEvents.subscribe(onOutletUpdated));
 
+            onOutletUpdated();
+
             return;
         }
 
@@ -197,15 +210,15 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
      * Initialize a floating title to mimic transitioning the title from one state to the other.
      */
     protected initializeFloatingTitle(): void {
-        if (!this.page || !this.collapsedHeader || !this.expandedHeader) {
+        if (!this.page || !this.expandedHeader) {
             throw new Error('[collapsible-header] Couldn\'t create floating title');
         }
 
         // Add floating title and measure initial position.
-        const collapsedHeaderTitle = this.collapsedHeader.querySelector('h1') as HTMLElement;
-        const originalTitle = this.expandedHeader.querySelector('h1') as HTMLElement;
+        const collapsedHeaderTitle = this.collapsedHeader.querySelector('h1') as HTMLHeadingElement;
+        const originalTitle = this.expandedHeader.querySelector('h1') as HTMLHeadingElement;
         const floatingTitleWrapper = originalTitle.parentElement as HTMLElement;
-        const floatingTitle = originalTitle.cloneNode(true) as HTMLElement;
+        const floatingTitle = originalTitle.cloneNode(true) as HTMLHeadingElement;
 
         originalTitle.classList.add('collapsible-header-original-title');
         floatingTitle.classList.add('collapsible-header-floating-title');
@@ -265,17 +278,22 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
         this.expandedHeaderHeight = expandedHeaderHeight;
     }
 
+    /**
+     * Wait until all <core-loading> children inside the page.
+     *
+     * @return Promise resolved when loadings are done.
+     */
+    protected async waitLoadingsDone(): Promise<void> {
+        await CoreComponentsRegistry.resolveAllElementsInside<CoreLoadingComponent>(this.page, 'core-loading', 'whenLoaded');
+    }
+
     /**
      * Wait until all <core-format-text> children inside the element are done rendering.
      *
      * @param element Element.
      */
     protected async waitFormatTextsRendered(element: Element): Promise<void> {
-        const formatTexts = Array
-            .from(element.querySelectorAll('core-format-text'))
-            .map(element => CoreComponentsRegistry.resolve(element, CoreFormatTextDirective));
-
-        await Promise.all(formatTexts.map(formatText => formatText?.rendered()));
+        await CoreComponentsRegistry.resolveAllElementsInside<CoreFormatTextDirective>(element, 'core-format-text', 'rendered');
     }
 
     /**
diff --git a/src/core/singletons/components-registry.ts b/src/core/singletons/components-registry.ts
index a5c7b12fb..8087d5409 100644
--- a/src/core/singletons/components-registry.ts
+++ b/src/core/singletons/components-registry.ts
@@ -12,6 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { Component } from '@angular/core';
+import { CoreUtils } from '@services/utils/utils';
+
 /**
  * Registry to keep track of component instances.
  */
@@ -36,7 +39,7 @@ export class CoreComponentsRegistry {
      * @param componentClass Component class.
      * @returns Component instance.
      */
-    static resolve<T>(element?: Element | null, componentClass?: ComponentConstructor<T>): T | null {
+    static resolve<T = Component>(element?: Element | null, componentClass?: ComponentConstructor<T>): T | null {
         const instance = (element && this.instances.get(element) as T) ?? null;
 
         return instance && (!componentClass || instance instanceof componentClass)
@@ -44,6 +47,39 @@ export class CoreComponentsRegistry {
             : null;
     }
 
+    /**
+     * Waits all elements to be resolved.
+     *
+     * @param element Parent element where to search.
+     * @param selector Selector to search on parent.
+     * @param fnName Function that needs to get resolved.
+     * @param params Params of function that needs to get resolved.
+     * @return Promise resolved when done.
+     */
+    static async resolveAllElementsInside<T = Component>(
+        element: Element | undefined | null,
+        selector: string,
+        fnName: string,
+        params?: unknown[],
+    ): Promise<void> {
+        if (!element) {
+            return;
+        }
+
+        const components = Array
+            .from(element.querySelectorAll(selector))
+            .map(element => CoreComponentsRegistry.resolve<T>(element));
+
+        await Promise.all(components.map(component => {
+            if (!component) {
+                return;
+            }
+
+            return component[fnName].apply(component, params);
+        }));
+        await CoreUtils.nextTick();
+    }
+
 }
 
 /**

From 81e227a8fa29bebe9c59048dd5299014fc9d1668 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 11 Mar 2022 14:53:10 +0100
Subject: [PATCH 0695/1008] MOBILE-3814 chore: Deprecate closest on
 CoreDomUtils

---
 .../navbar-buttons/navbar-buttons.ts          |  4 +-
 src/core/directives/external-content.ts       | 12 +++---
 .../classes/base-question-component.ts        |  2 +-
 .../question/services/question-helper.ts      |  2 +-
 src/core/services/utils/dom.ts                | 39 +------------------
 5 files changed, 12 insertions(+), 47 deletions(-)

diff --git a/src/core/components/navbar-buttons/navbar-buttons.ts b/src/core/components/navbar-buttons/navbar-buttons.ts
index 205ec43db..88e32057f 100644
--- a/src/core/components/navbar-buttons/navbar-buttons.ts
+++ b/src/core/components/navbar-buttons/navbar-buttons.ts
@@ -198,7 +198,7 @@ export class CoreNavBarButtonsComponent implements OnInit, OnDestroy {
      * @return Promise resolved with the header element.
      */
     protected async searchHeader(retries: number = 0): Promise<HTMLElement> {
-        let parentPage: HTMLElement = this.element;
+        let parentPage: HTMLElement | null = this.element;
 
         while (parentPage) {
             if (!parentPage.parentElement) {
@@ -207,7 +207,7 @@ export class CoreNavBarButtonsComponent implements OnInit, OnDestroy {
             }
 
             // Get the next parent page.
-            parentPage = <HTMLElement> CoreDomUtils.closest(parentPage.parentElement, '.ion-page');
+            parentPage = parentPage.parentElement.closest('.ion-page');
             if (parentPage) {
                 // Check if the page has a header. If it doesn't, search the next parent page.
                 const header = this.searchHeaderInPage(parentPage);
diff --git a/src/core/directives/external-content.ts b/src/core/directives/external-content.ts
index 9d3afa58d..908f9ada7 100644
--- a/src/core/directives/external-content.ts
+++ b/src/core/directives/external-content.ts
@@ -27,7 +27,6 @@ import { CoreApp } from '@services/app';
 import { CoreFile } from '@services/file';
 import { CoreFilepool, CoreFilepoolFileActions, CoreFilepoolFileEventData } from '@services/filepool';
 import { CoreSites } from '@services/sites';
-import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUrlUtils } from '@services/utils/url';
 import { CoreUtils } from '@services/utils/utils';
 import { Platform } from '@singletons';
@@ -418,13 +417,14 @@ export class CoreExternalContentDirective implements AfterViewInit, OnChanges, O
         // Set events to download big files (not downloaded automatically).
         if (targetAttr !== 'poster' && (tagName === 'VIDEO' || tagName === 'AUDIO' || tagName === 'A' || tagName === 'SOURCE')) {
             const eventName = tagName == 'A' ? 'click' : 'play';
-            let clickableEl = this.element;
+            let clickableEl: Element | null = this.element;
 
             if (tagName == 'SOURCE') {
-                clickableEl = <HTMLElement> CoreDomUtils.closest(this.element, 'video,audio');
-                if (!clickableEl) {
-                    return;
-                }
+                clickableEl = this.element.closest('video,audio');
+            }
+
+            if (!clickableEl) {
+                return;
             }
 
             clickableEl.addEventListener(eventName, () => {
diff --git a/src/core/features/question/classes/base-question-component.ts b/src/core/features/question/classes/base-question-component.ts
index 7753c9d86..86c15df55 100644
--- a/src/core/features/question/classes/base-question-component.ts
+++ b/src/core/features/question/classes/base-question-component.ts
@@ -458,7 +458,7 @@ export class CoreQuestionBaseComponent {
             name: input.name,
             value: input.value,
             readOnly: input.readOnly,
-            isInline: !!CoreDomUtils.closest(input, '.qtext'), // The answer can be inside the question text.
+            isInline: !!input.closest('.qtext'), // The answer can be inside the question text.
         };
 
         // Check if question is marked as correct.
diff --git a/src/core/features/question/services/question-helper.ts b/src/core/features/question/services/question-helper.ts
index 27bdfe3d4..dfd095096 100644
--- a/src/core/features/question/services/question-helper.ts
+++ b/src/core/features/question/services/question-helper.ts
@@ -258,7 +258,7 @@ export class CoreQuestionHelperProvider {
         // Get the last element and check it's not in the question contents.
         let last = matches.pop();
         while (last) {
-            if (!CoreDomUtils.closest(last, '.formulation')) {
+            if (!last.closest('.formulation')) {
                 // Not in question contents. Add it to a separate attribute and remove it from the HTML.
                 question[attrName] = last.innerHTML;
                 last.parentElement?.removeChild(last);
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index a84b182df..b1927edcc 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -99,45 +99,10 @@ export class CoreDomUtilsProvider {
      * @param element DOM Element.
      * @param selector Selector to search.
      * @return Closest ancestor.
+     * @deprecated Not needed anymore since it's supported on both Android and iOS. Use closest instead.
      */
     closest(element: Element | undefined | null, selector: string): Element | null {
-        if (!element) {
-            return null;
-        }
-
-        // Try to use closest if the browser supports it.
-        if (typeof element.closest == 'function') {
-            return element.closest(selector);
-        }
-
-        if (!this.matchesFunctionName) {
-            // Find the matches function supported by the browser.
-            ['matches', 'webkitMatchesSelector', 'mozMatchesSelector', 'msMatchesSelector', 'oMatchesSelector'].some((fn) => {
-                if (typeof document.body[fn] == 'function') {
-                    this.matchesFunctionName = fn;
-
-                    return true;
-                }
-
-                return false;
-            });
-
-            if (!this.matchesFunctionName) {
-                return null;
-            }
-        }
-
-        // Traverse parents.
-        let elementToTreat: Element | null = element;
-
-        while (elementToTreat) {
-            if (elementToTreat[this.matchesFunctionName](selector)) {
-                return elementToTreat;
-            }
-            elementToTreat = elementToTreat.parentElement;
-        }
-
-        return null;
+        return element?.closest(selector) ?? null;
     }
 
     /**

From f38372642ded056e9f8d9788180b0979e2363ceb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 11 Mar 2022 15:58:02 +0100
Subject: [PATCH 0696/1008] MOBILE-3814 collapsible: Wait to dom and loading
 with component registry

---
 src/core/directives/collapsible-footer.ts  | 53 +++++++++++++---------
 src/core/directives/collapsible-header.ts  | 13 +++++-
 src/core/directives/collapsible-item.ts    | 38 ++++++++--------
 src/core/services/utils/dom.ts             | 40 ++++++++++++++++
 src/core/singletons/components-registry.ts | 10 ++--
 5 files changed, 107 insertions(+), 47 deletions(-)

diff --git a/src/core/directives/collapsible-footer.ts b/src/core/directives/collapsible-footer.ts
index 47fe99439..dc1e2c55a 100644
--- a/src/core/directives/collapsible-footer.ts
+++ b/src/core/directives/collapsible-footer.ts
@@ -19,8 +19,8 @@ import { CoreUtils } from '@services/utils/utils';
 import { CoreMath } from '@singletons/math';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
 import { CoreFormatTextDirective } from './format-text';
-import { CoreDomUtils } from '@services/utils/dom';
-import { CoreEventLoadingChangedData, CoreEventObserver, CoreEvents } from '@singletons/events';
+import { CoreEventObserver } from '@singletons/events';
+import { CoreLoadingComponent } from '@components/loading/loading';
 
 /**
  * Directive to make an element fixed at the bottom collapsible when scrolling.
@@ -139,11 +139,11 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
      * @param element Element.
      */
     protected async waitFormatTextsRendered(element: Element): Promise<void> {
-        const formatTexts = Array
-            .from(element.querySelectorAll('core-format-text'))
-            .map(element => CoreComponentsRegistry.resolve(element, CoreFormatTextDirective));
-
-        await Promise.all(formatTexts.map(formatText => formatText?.rendered()));
+        await CoreComponentsRegistry.finishRenderingAllElementsInside<CoreFormatTextDirective>(
+            element,
+            'core-format-text',
+            'rendered',
+        );
     }
 
     /**
@@ -184,24 +184,33 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
      * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
-        // Calculate the height now.
-        await this.calculateHeight();
-        setTimeout(() => this.calculateHeight(), 200); // Try again, sometimes the first calculation is wrong.
-
-        this.listenScrollEvents();
-
         // Only if not present or explicitly falsy it will be false.
         this.appearOnBottom = !CoreUtils.isFalseOrZero(this.appearOnBottom);
 
-        // Recalculate the height if a parent core-loading displays the content.
-        this.loadingChangedListener =
-            CoreEvents.on(CoreEvents.CORE_LOADING_CHANGED, async (data: CoreEventLoadingChangedData) => {
-                if (data.loaded && CoreDomUtils.closest(this.element.parentElement, '#' + data.uniqueId)) {
-                    // The format-text is inside the loading, re-calculate the height.
-                    await this.calculateHeight();
-                    setTimeout(() => this.calculateHeight(), 200);
-                }
-            });
+        await this.waitLoadingsDone();
+
+        await this.calculateHeight();
+
+        this.listenScrollEvents();
+    }
+
+    /**
+     * Wait until all <core-loading> children inside the page.
+     *
+     * @return Promise resolved when loadings are done.
+     */
+    protected async waitLoadingsDone(): Promise<void> {
+        const scrollElement = await this.ionContent.getScrollElement();
+
+        await Promise.all([
+            await CoreComponentsRegistry.finishRenderingAllElementsInside<CoreLoadingComponent>
+            (scrollElement, 'core-loading', 'whenLoaded'),
+            await CoreComponentsRegistry.finishRenderingAllElementsInside<CoreLoadingComponent>(
+                this.element,
+                'core-loading',
+                'whenLoaded',
+            ),
+        ]);
     }
 
     /**
diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts
index cceaca12e..0c74b1a39 100644
--- a/src/core/directives/collapsible-header.ts
+++ b/src/core/directives/collapsible-header.ts
@@ -284,16 +284,25 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
      * @return Promise resolved when loadings are done.
      */
     protected async waitLoadingsDone(): Promise<void> {
-        await CoreComponentsRegistry.resolveAllElementsInside<CoreLoadingComponent>(this.page, 'core-loading', 'whenLoaded');
+        await CoreComponentsRegistry.finishRenderingAllElementsInside<CoreLoadingComponent>(
+            this.page,
+            'core-loading',
+            'whenLoaded',
+        );
     }
 
     /**
      * Wait until all <core-format-text> children inside the element are done rendering.
      *
      * @param element Element.
+     * @return Promise resolved when texts are rendered.
      */
     protected async waitFormatTextsRendered(element: Element): Promise<void> {
-        await CoreComponentsRegistry.resolveAllElementsInside<CoreFormatTextDirective>(element, 'core-format-text', 'rendered');
+        await CoreComponentsRegistry.finishRenderingAllElementsInside<CoreFormatTextDirective>(
+            element,
+            'core-format-text',
+            'rendered',
+        );
     }
 
     /**
diff --git a/src/core/directives/collapsible-item.ts b/src/core/directives/collapsible-item.ts
index e0c9b15b9..ba4489c4a 100644
--- a/src/core/directives/collapsible-item.ts
+++ b/src/core/directives/collapsible-item.ts
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 import { Directive, ElementRef, Input, OnInit } from '@angular/core';
+import { CoreLoadingComponent } from '@components/loading/loading';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
 import { Translate } from '@singletons';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
-import { CoreEventLoadingChangedData, CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreFormatTextDirective } from './format-text';
 
 const defaultMaxHeight = 80;
@@ -47,7 +47,6 @@ export class CoreCollapsibleItemDirective implements OnInit {
     protected expanded = false;
     protected maxHeight = defaultMaxHeight;
     protected expandedHeight = 0;
-    protected loadingChangedListener?: CoreEventObserver;
 
     constructor(el: ElementRef<HTMLElement>) {
         this.element = el.nativeElement;
@@ -79,17 +78,22 @@ export class CoreCollapsibleItemDirective implements OnInit {
 
         this.element.classList.add('collapsible-item');
 
-        // Calculate the height now.
-        await this.calculateHeight();
+        await this.waitLoadingsDone();
 
-        // Recalculate the height if a parent core-loading displays the content.
-        this.loadingChangedListener =
-            CoreEvents.on(CoreEvents.CORE_LOADING_CHANGED, async (data: CoreEventLoadingChangedData) => {
-                if (data.loaded && CoreDomUtils.closest(this.element.parentElement, '#' + data.uniqueId)) {
-                    // The element is inside the loading, re-calculate the height.
-                    await this.calculateHeight();
-                }
-            });
+        await this.calculateHeight();
+    }
+
+    /**
+     * Wait until all <core-loading> children inside the page.
+     *
+     * @return Promise resolved when loadings are done.
+     */
+    protected async waitLoadingsDone(): Promise<void> {
+        await CoreDomUtils.waitToDom(this.element);
+
+        const page = this.element.closest('.ion-page');
+
+        await CoreComponentsRegistry.finishRenderingAllElementsInside<CoreLoadingComponent>(page, 'core-loading', 'whenLoaded');
     }
 
     /**
@@ -109,19 +113,19 @@ export class CoreCollapsibleItemDirective implements OnInit {
         const formatTexts = formatTextElements.map(element => CoreComponentsRegistry.resolve(element, CoreFormatTextDirective));
 
         await Promise.all(formatTexts.map(formatText => formatText?.rendered()));
+
+        await CoreUtils.nextTick();
     }
 
     /**
      * Calculate the height and check if we need to display show more or not.
      */
-    protected async calculateHeight(retries = 3): Promise<void> {
+    protected async calculateHeight(): Promise<void> {
         // Remove max-height (if any) to calculate the real height.
         this.element.classList.add('collapsible-loading-height');
 
         await this.waitFormatTextsRendered(this.element);
 
-        await CoreUtils.nextTick();
-
         this.expandedHeight = CoreDomUtils.getElementHeight(this.element) || 0;
 
         // Restore the max height now.
@@ -129,10 +133,6 @@ export class CoreCollapsibleItemDirective implements OnInit {
 
         // If cannot calculate height, shorten always.
         this.setExpandButtonEnabled(!this.expandedHeight || this.expandedHeight >= this.maxHeight);
-
-        if (this.expandedHeight == 0 && retries > 0) {
-            setTimeout(() => this.calculateHeight(retries - 1), 200);
-        }
     }
 
     /**
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index b1927edcc..b3f31119c 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -53,6 +53,7 @@ import { NavigationStart } from '@angular/router';
 import { filter } from 'rxjs/operators';
 import { Subscription } from 'rxjs';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
+import { CorePromisedValue } from '@classes/promised-value';
 
 /*
  * "Utils" service with helper functions for UI, DOM elements and HTML code.
@@ -91,6 +92,45 @@ export class CoreDomUtilsProvider {
         this.debugDisplay = debugDisplay != 0;
     }
 
+    /**
+     * Wait an element to be in dom of another element.
+     *
+     * @param element Element to wait.
+     * @return Promise resolved when added. It will be rejected after a timeout of 5s.
+     */
+    waitToDom(
+        element: Element,
+    ): CorePromisedValue<void> {
+        let root = element.getRootNode({ composed: true });
+        const inDomPromise = new CorePromisedValue<void>();
+
+        if (root === document) {
+            // Already in DOM.
+            inDomPromise.resolve();
+
+            return inDomPromise;
+        }
+
+        // Disconnect observer for performance reasons.
+        const timeout = window.setTimeout(() => {
+            inDomPromise.reject(new Error('Waiting for DOM timeout reached'));
+            observer.disconnect();
+        }, 5000);
+
+        const observer = new MutationObserver(() => {
+            root = element.getRootNode({ composed: true });
+            if (root === document) {
+                observer.disconnect();
+                clearTimeout(timeout);
+                inDomPromise.resolve();
+            }
+        });
+
+        observer.observe(document.body, { subtree: true, childList: true });
+
+        return inDomPromise;
+    }
+
     /**
      * Equivalent to element.closest(). If the browser doesn't support element.closest, it will
      * traverse the parents to achieve the same functionality.
diff --git a/src/core/singletons/components-registry.ts b/src/core/singletons/components-registry.ts
index 8087d5409..db60b35a8 100644
--- a/src/core/singletons/components-registry.ts
+++ b/src/core/singletons/components-registry.ts
@@ -48,15 +48,15 @@ export class CoreComponentsRegistry {
     }
 
     /**
-     * Waits all elements to be resolved.
+     * Waits all elements to be rendered.
      *
      * @param element Parent element where to search.
      * @param selector Selector to search on parent.
-     * @param fnName Function that needs to get resolved.
-     * @param params Params of function that needs to get resolved.
+     * @param fnName Component function that have to be resolved when rendered.
+     * @param params Params of function that have to be resolved when rendered.
      * @return Promise resolved when done.
      */
-    static async resolveAllElementsInside<T = Component>(
+    static async finishRenderingAllElementsInside<T = Component>(
         element: Element | undefined | null,
         selector: string,
         fnName: string,
@@ -77,6 +77,8 @@ export class CoreComponentsRegistry {
 
             return component[fnName].apply(component, params);
         }));
+
+        // Wait for next tick to ensure components are completely rendered.
         await CoreUtils.nextTick();
     }
 

From 9e1acc1ccbfb7991b2ea4113ed806c91732db244 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 14 Mar 2022 11:44:02 +0100
Subject: [PATCH 0697/1008] MOBILE-3814 chore: Refactor waitToDom and rename it
 to waitToBeInDOM

---
 src/core/directives/collapsible-item.ts |  2 +-
 src/core/services/utils/dom.ts          | 44 +++++++++++--------------
 2 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/src/core/directives/collapsible-item.ts b/src/core/directives/collapsible-item.ts
index ba4489c4a..08cc6da18 100644
--- a/src/core/directives/collapsible-item.ts
+++ b/src/core/directives/collapsible-item.ts
@@ -89,7 +89,7 @@ export class CoreCollapsibleItemDirective implements OnInit {
      * @return Promise resolved when loadings are done.
      */
     protected async waitLoadingsDone(): Promise<void> {
-        await CoreDomUtils.waitToDom(this.element);
+        await CoreDomUtils.waitToBeInDOM(this.element);
 
         const page = this.element.closest('.ion-page');
 
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index b3f31119c..a91e89caf 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -53,7 +53,6 @@ import { NavigationStart } from '@angular/router';
 import { filter } from 'rxjs/operators';
 import { Subscription } from 'rxjs';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
-import { CorePromisedValue } from '@classes/promised-value';
 
 /*
  * "Utils" service with helper functions for UI, DOM elements and HTML code.
@@ -98,37 +97,34 @@ export class CoreDomUtilsProvider {
      * @param element Element to wait.
      * @return Promise resolved when added. It will be rejected after a timeout of 5s.
      */
-    waitToDom(
+    async waitToBeInDOM(
         element: Element,
-    ): CorePromisedValue<void> {
+    ): Promise<void> {
         let root = element.getRootNode({ composed: true });
-        const inDomPromise = new CorePromisedValue<void>();
 
         if (root === document) {
             // Already in DOM.
-            inDomPromise.resolve();
-
-            return inDomPromise;
+            return;
         }
 
-        // Disconnect observer for performance reasons.
-        const timeout = window.setTimeout(() => {
-            inDomPromise.reject(new Error('Waiting for DOM timeout reached'));
-            observer.disconnect();
-        }, 5000);
-
-        const observer = new MutationObserver(() => {
-            root = element.getRootNode({ composed: true });
-            if (root === document) {
+        return new Promise((resolve, reject) => {
+            // Disconnect observer for performance reasons.
+            const timeout = window.setTimeout(() => {
+                reject(new Error('Waiting for DOM timeout reached'));
                 observer.disconnect();
-                clearTimeout(timeout);
-                inDomPromise.resolve();
-            }
+            }, 5000);
+
+            const observer = new MutationObserver(() => {
+                root = element.getRootNode({ composed: true });
+                if (root === document) {
+                    observer.disconnect();
+                    clearTimeout(timeout);
+                    resolve();
+                }
+            });
+
+            observer.observe(document.body, { subtree: true, childList: true });
         });
-
-        observer.observe(document.body, { subtree: true, childList: true });
-
-        return inDomPromise;
     }
 
     /**
@@ -139,7 +135,7 @@ export class CoreDomUtilsProvider {
      * @param element DOM Element.
      * @param selector Selector to search.
      * @return Closest ancestor.
-     * @deprecated Not needed anymore since it's supported on both Android and iOS. Use closest instead.
+     * @deprecated since app 4.0 Not needed anymore since it's supported on both Android and iOS. Use closest instead.
      */
     closest(element: Element | undefined | null, selector: string): Element | null {
         return element?.closest(selector) ?? null;

From 58e6be64e4af2443d545e53c8f6a301e45a14409 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 8 Mar 2022 17:39:22 +0100
Subject: [PATCH 0698/1008] MOBILE-3153 usertours: Implement User Tours

---
 .eslintrc.js                                  |   1 -
 .../classes/database/database-table-proxy.ts  |   7 +
 src/core/classes/database/database-table.ts   |  17 ++
 .../classes/database/debug-database-table.ts  |   9 +
 .../classes/database/eager-database-table.ts  |   7 +
 .../classes/database/lazy-database-table.ts   |   9 +
 src/core/features/features.module.ts          |   2 +
 .../usertours/classes/focus-layout.ts         |  50 ++++
 .../usertours/classes/popover-layout.ts       | 213 +++++++++++++++
 .../usertours/components/components.module.ts |  34 +++
 .../user-tour/core-user-tours-user-tour.html  |   5 +
 .../components/user-tour/user-tour.scss       |  61 +++++
 .../components/user-tour/user-tour.ts         | 168 ++++++++++++
 .../usertours/services/database/user-tours.ts |  48 ++++
 .../features/usertours/services/user-tours.ts | 257 ++++++++++++++++++
 .../features/usertours/user-tours.module.ts   |  37 +++
 src/core/singletons/components-registry.ts    |  17 ++
 src/core/singletons/index.ts                  |  32 ++-
 src/core/utils/async-instance.ts              |  15 +
 src/core/utils/style-helpers.ts               |  36 +++
 20 files changed, 1019 insertions(+), 6 deletions(-)
 create mode 100644 src/core/features/usertours/classes/focus-layout.ts
 create mode 100644 src/core/features/usertours/classes/popover-layout.ts
 create mode 100644 src/core/features/usertours/components/components.module.ts
 create mode 100644 src/core/features/usertours/components/user-tour/core-user-tours-user-tour.html
 create mode 100644 src/core/features/usertours/components/user-tour/user-tour.scss
 create mode 100644 src/core/features/usertours/components/user-tour/user-tour.ts
 create mode 100644 src/core/features/usertours/services/database/user-tours.ts
 create mode 100644 src/core/features/usertours/services/user-tours.ts
 create mode 100644 src/core/features/usertours/user-tours.module.ts
 create mode 100644 src/core/utils/style-helpers.ts

diff --git a/.eslintrc.js b/.eslintrc.js
index d5a05ca9e..eba7eb33f 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -139,7 +139,6 @@ const appConfig = {
             'always',
         ],
         '@typescript-eslint/type-annotation-spacing': 'error',
-        '@typescript-eslint/unified-signatures': 'error',
         'header/header': [
             2,
             'line',
diff --git a/src/core/classes/database/database-table-proxy.ts b/src/core/classes/database/database-table-proxy.ts
index b1cba7e88..ea7bffd96 100644
--- a/src/core/classes/database/database-table-proxy.ts
+++ b/src/core/classes/database/database-table-proxy.ts
@@ -137,6 +137,13 @@ export class CoreDatabaseTableProxy<
         return this.target.hasAny(conditions);
     }
 
+    /**
+     * @inheritdoc
+     */
+    hasAnyByPrimaryKey(primaryKey: PrimaryKey): Promise<boolean> {
+        return this.target.hasAnyByPrimaryKey(primaryKey);
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/src/core/classes/database/database-table.ts b/src/core/classes/database/database-table.ts
index 43e0ac125..807f5dad1 100644
--- a/src/core/classes/database/database-table.ts
+++ b/src/core/classes/database/database-table.ts
@@ -219,6 +219,23 @@ export class CoreDatabaseTable<
         }
     }
 
+    /**
+     * Check whether the table has any record matching the given primary key.
+     *
+     * @param primaryKey Record primary key.
+     * @returns Whether the table contains a record matching the given primary key.
+     */
+    async hasAnyByPrimaryKey(primaryKey: PrimaryKey): Promise<boolean> {
+        try {
+            await this.getOneByPrimaryKey(primaryKey);
+
+            return true;
+        } catch (error) {
+            // Couldn't get the record.
+            return false;
+        }
+    }
+
     /**
      * Count records in table.
      *
diff --git a/src/core/classes/database/debug-database-table.ts b/src/core/classes/database/debug-database-table.ts
index 5ab22bb8e..db146144b 100644
--- a/src/core/classes/database/debug-database-table.ts
+++ b/src/core/classes/database/debug-database-table.ts
@@ -129,6 +129,15 @@ export class CoreDebugDatabaseTable<
         return this.target.hasAny(conditions);
     }
 
+    /**
+     * @inheritdoc
+     */
+    hasAnyByPrimaryKey(primaryKey: PrimaryKey): Promise<boolean> {
+        this.logger.log('hasAnyByPrimaryKey', primaryKey);
+
+        return this.target.hasAnyByPrimaryKey(primaryKey);
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/src/core/classes/database/eager-database-table.ts b/src/core/classes/database/eager-database-table.ts
index 97aac2f19..1a03e0fda 100644
--- a/src/core/classes/database/eager-database-table.ts
+++ b/src/core/classes/database/eager-database-table.ts
@@ -134,6 +134,13 @@ export class CoreEagerDatabaseTable<
             : Object.values(this.records).length > 0;
     }
 
+    /**
+     * @inheritdoc
+     */
+    async hasAnyByPrimaryKey(primaryKey: PrimaryKey): Promise<boolean> {
+        return this.serializePrimaryKey(primaryKey) in this.records;
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/src/core/classes/database/lazy-database-table.ts b/src/core/classes/database/lazy-database-table.ts
index f29bbddb7..2e1aabcc5 100644
--- a/src/core/classes/database/lazy-database-table.ts
+++ b/src/core/classes/database/lazy-database-table.ts
@@ -125,6 +125,15 @@ export class CoreLazyDatabaseTable<
         return super.hasAny(conditions);
     }
 
+    /**
+     * @inheritdoc
+     */
+    async hasAnyByPrimaryKey(primaryKey: PrimaryKey): Promise<boolean> {
+        const record = this.records[this.serializePrimaryKey(primaryKey)] ?? null;
+
+        return record !== null;
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/src/core/features/features.module.ts b/src/core/features/features.module.ts
index 534890791..b954b83d1 100644
--- a/src/core/features/features.module.ts
+++ b/src/core/features/features.module.ts
@@ -37,6 +37,7 @@ import { CoreSiteHomeModule } from './sitehome/sitehome.module';
 import { CoreSitePluginsModule } from './siteplugins/siteplugins.module';
 import { CoreStylesModule } from './styles/styles.module';
 import { CoreTagModule } from './tag/tag.module';
+import { CoreUserToursModule } from './usertours/user-tours.module';
 import { CoreUserModule } from './user/user.module';
 import { CoreViewerModule } from './viewer/viewer.module';
 import { CoreXAPIModule } from './xapi/xapi.module';
@@ -66,6 +67,7 @@ import { CoreXAPIModule } from './xapi/xapi.module';
         CoreSitePluginsModule,
         CoreTagModule,
         CoreStylesModule,
+        CoreUserToursModule,
         CoreUserModule,
         CoreViewerModule,
         CoreXAPIModule,
diff --git a/src/core/features/usertours/classes/focus-layout.ts b/src/core/features/usertours/classes/focus-layout.ts
new file mode 100644
index 000000000..e53994efc
--- /dev/null
+++ b/src/core/features/usertours/classes/focus-layout.ts
@@ -0,0 +1,50 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { renderInlineStyles } from '@/core/utils/style-helpers';
+
+/**
+ * Helper class to calculate layout styles for the focused area in a User Tour.
+ */
+export class CoreUserToursFocusLayout {
+
+    inlineStyles!: string;
+
+    private targetBoundingBox: DOMRect;
+    private targetComputedStyle: CSSStyleDeclaration;
+
+    constructor(target: HTMLElement) {
+        this.targetBoundingBox = target.getBoundingClientRect();
+        this.targetComputedStyle = window.getComputedStyle(target);
+
+        this.calculateStyles();
+    }
+
+    /**
+     * Calculate styles.
+     */
+    private calculateStyles(): void {
+        this.inlineStyles = renderInlineStyles({
+            'top': this.targetBoundingBox.top,
+            'left': this.targetBoundingBox.left,
+            'width': this.targetBoundingBox.width,
+            'height': this.targetBoundingBox.height,
+            'border-top-left-radius': this.targetComputedStyle.borderTopLeftRadius,
+            'border-top-right-radius': this.targetComputedStyle.borderTopRightRadius,
+            'border-bottom-left-radius': this.targetComputedStyle.borderBottomLeftRadius,
+            'border-bottom-right-radius': this.targetComputedStyle.borderBottomRightRadius,
+        });
+    }
+
+}
diff --git a/src/core/features/usertours/classes/popover-layout.ts b/src/core/features/usertours/classes/popover-layout.ts
new file mode 100644
index 000000000..e218f2be0
--- /dev/null
+++ b/src/core/features/usertours/classes/popover-layout.ts
@@ -0,0 +1,213 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreStyles, renderInlineStyles } from '@/core/utils/style-helpers';
+import { Platform } from '@singletons';
+import { CoreUserToursAlignment, CoreUserToursSide } from '../services/user-tours';
+
+const ARROW_HEIGHT = 22;
+const ARROW_WIDTH = 35;
+const BORDER_RADIUS = 8;
+const MARGIN = 16;
+
+/**
+ * Helper class to calculate layout styles for the popover wrapper in a User Tour.
+ */
+export class CoreUserToursPopoverLayout {
+
+    wrapperStyles: CoreStyles;
+    wrapperInlineStyles!: string;
+    wrapperArrowStyles: CoreStyles;
+    wrapperArrowInlineStyles!: string;
+
+    private targetBoundingBox: DOMRect;
+    private side: CoreUserToursSide;
+    private alignment: CoreUserToursAlignment;
+
+    constructor(target: HTMLElement, side: CoreUserToursSide, alignment: CoreUserToursAlignment) {
+        this.targetBoundingBox = target.getBoundingClientRect();
+        this.side = side;
+        this.alignment = alignment;
+        this.wrapperArrowStyles = {};
+        this.wrapperStyles = {};
+
+        this.calculateStyles();
+    }
+
+    /**
+     * Calculate styles.
+     */
+    private calculateStyles(): void {
+        const sideHandlers: Record<CoreUserToursSide, () => void> = {
+            [CoreUserToursSide.Top]: this.calculateWrapperTopSideStyles,
+            [CoreUserToursSide.Bottom]: this.calculateWrapperBottomSideStyles,
+            [CoreUserToursSide.Right]: this.calculateWrapperRightSideStyles,
+            [CoreUserToursSide.Left]: this.calculateWrapperLeftSideStyles,
+            [CoreUserToursSide.Start]: Platform.isRTL ? this.calculateWrapperRightSideStyles : this.calculateWrapperLeftSideStyles,
+            [CoreUserToursSide.End]: Platform.isRTL ? this.calculateWrapperLeftSideStyles : this.calculateWrapperRightSideStyles,
+        };
+
+        sideHandlers[this.side].call(this);
+
+        this.wrapperInlineStyles = renderInlineStyles(this.wrapperStyles);
+        this.wrapperArrowInlineStyles = renderInlineStyles(this.wrapperArrowStyles);
+    }
+
+    /**
+     * Calculate wrapper styles for an horizontal alignment.
+     */
+    private calculateWrapperHorizontalAlignmentStyles(): void {
+        const horizontalAlignmentHandlers: Record<CoreUserToursAlignment, () => void> ={
+            [CoreUserToursAlignment.Start]: Platform.isRTL
+                ? this.calculateWrapperRightAlignmentStyles
+                : this.calculateWrapperLeftAlignmentStyles,
+            [CoreUserToursAlignment.Center]: this.calculateWrapperCenterHorizontalAlignmentStyles,
+            [CoreUserToursAlignment.End]: Platform.isRTL
+                ? this.calculateWrapperLeftAlignmentStyles
+                : this.calculateWrapperRightAlignmentStyles,
+        };
+
+        horizontalAlignmentHandlers[this.alignment].call(this);
+    }
+
+    /**
+     * Calculate wrapper styles for a vertical alignment.
+     */
+    private calculateWrapperVerticalAlignmentStyles(): void {
+        const verticalAlignmentHandlers: Record<CoreUserToursAlignment, () => void> ={
+            [CoreUserToursAlignment.Start]: this.calculateWrapperTopAlignmentStyles,
+            [CoreUserToursAlignment.Center]: this.calculateWrapperCenterVerticalAlignmentStyles,
+            [CoreUserToursAlignment.End]: this.calculateWrapperBottomAlignmentStyles,
+        };
+
+        verticalAlignmentHandlers[this.alignment].call(this);
+    }
+
+    /**
+     * Calculate wrapper arrow styles for an horizontal orientation.
+     */
+    private calculateWrapperArrowHorizontalStyles(): void {
+        this.wrapperArrowStyles['border-width'] = `${ARROW_WIDTH / 2}px ${ARROW_HEIGHT}px`;
+    }
+
+    /**
+     * Calculate wrapper arrow styles for a vertical orientation.
+     */
+    private calculateWrapperArrowVerticalStyles(): void {
+        this.wrapperArrowStyles['border-width'] = `${ARROW_HEIGHT}px ${ARROW_WIDTH / 2}px`;
+    }
+
+    /**
+     * Calculate wrapper styles for a top side placement.
+     */
+    private calculateWrapperTopSideStyles(): void {
+        this.wrapperStyles.bottom = window.innerHeight - this.targetBoundingBox.y + ARROW_HEIGHT + MARGIN;
+        this.wrapperArrowStyles.bottom = -ARROW_HEIGHT*2;
+        this.wrapperArrowStyles['border-top-color'] = 'var(--popover-background)';
+
+        this.calculateWrapperArrowVerticalStyles();
+        this.calculateWrapperHorizontalAlignmentStyles();
+    }
+
+    /**
+     * Calculate wrapper styles for a bottom side placement.
+     */
+    private calculateWrapperBottomSideStyles(): void {
+        this.wrapperStyles.top = this.targetBoundingBox.y + this.targetBoundingBox.height + ARROW_HEIGHT + MARGIN;
+        this.wrapperArrowStyles.top = -ARROW_HEIGHT*2;
+        this.wrapperArrowStyles['border-bottom-color'] = 'var(--popover-background)';
+
+        this.calculateWrapperArrowVerticalStyles();
+        this.calculateWrapperHorizontalAlignmentStyles();
+    }
+
+    /**
+     * Calculate wrapper styles for a right side placement.
+     */
+    private calculateWrapperRightSideStyles(): void {
+        this.wrapperStyles.left = this.targetBoundingBox.x + this.targetBoundingBox.width + ARROW_HEIGHT + MARGIN;
+        this.wrapperArrowStyles.left = -ARROW_HEIGHT*2;
+        this.wrapperArrowStyles['border-right-color'] = 'var(--popover-background)';
+
+        this.calculateWrapperArrowHorizontalStyles();
+        this.calculateWrapperVerticalAlignmentStyles();
+    }
+
+    /**
+     * Calculate wrapper styles for a left side placement.
+     */
+    private calculateWrapperLeftSideStyles(): void {
+        this.wrapperStyles.right = window.innerWidth - this.targetBoundingBox.x + ARROW_HEIGHT + MARGIN;
+        this.wrapperArrowStyles.right = -ARROW_HEIGHT*2;
+        this.wrapperArrowStyles['border-left-color'] = 'var(--popover-background)';
+
+        this.calculateWrapperArrowHorizontalStyles();
+        this.calculateWrapperVerticalAlignmentStyles();
+    }
+
+    /**
+     * Calculate wrapper styles for top alignment.
+     */
+    private calculateWrapperTopAlignmentStyles() {
+        this.wrapperStyles.top = this.targetBoundingBox.y;
+        this.wrapperArrowStyles.top = BORDER_RADIUS;
+    }
+
+    /**
+     * Calculate wrapper styles for bottom alignment.
+     */
+    private calculateWrapperBottomAlignmentStyles(): void {
+        this.wrapperStyles.bottom = window.innerHeight - this.targetBoundingBox.y - this.targetBoundingBox.height;
+        this.wrapperArrowStyles.bottom = BORDER_RADIUS;
+    }
+
+    /**
+     * Calculate wrapper styles for right alignment.
+     */
+    private calculateWrapperRightAlignmentStyles() {
+        this.wrapperStyles.right = window.innerWidth - this.targetBoundingBox.x - this.targetBoundingBox.width;
+        this.wrapperArrowStyles.right = BORDER_RADIUS;
+    }
+
+    /**
+     * Calculate wrapper styles for left alignment.
+     */
+    private calculateWrapperLeftAlignmentStyles() {
+        this.wrapperStyles.left = this.targetBoundingBox.x;
+        this.wrapperArrowStyles.left = BORDER_RADIUS;
+    }
+
+    /**
+     * Calculate wrapper styles for center horizontal alignment.
+     */
+    private calculateWrapperCenterHorizontalAlignmentStyles() {
+        this.wrapperStyles.left = this.targetBoundingBox.x + this.targetBoundingBox.width / 2;
+        this.wrapperStyles.transform = 'translateX(-50%)';
+        this.wrapperStyles['transform-origin'] = '0 50%';
+        this.wrapperArrowStyles.left = '50%';
+        this.wrapperArrowStyles.transform = 'translateX(-50%)';
+    }
+
+    /**
+     * Calculate wrapper styles for center vertical alignment.
+     */
+    private calculateWrapperCenterVerticalAlignmentStyles() {
+        this.wrapperStyles.top = this.targetBoundingBox.y + this.targetBoundingBox.height / 2;
+        this.wrapperStyles.transform = 'translateY(-50%)';
+        this.wrapperStyles['transform-origin'] = '50% 0';
+        this.wrapperArrowStyles.top = '50%';
+        this.wrapperArrowStyles.transform = 'translateY(-50%)';
+    }
+
+}
diff --git a/src/core/features/usertours/components/components.module.ts b/src/core/features/usertours/components/components.module.ts
new file mode 100644
index 000000000..f2fd58527
--- /dev/null
+++ b/src/core/features/usertours/components/components.module.ts
@@ -0,0 +1,34 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreSharedModule } from '@/core/shared.module';
+import { CoreUserToursUserTourComponent } from './user-tour/user-tour';
+
+/**
+ * User Tours components module.
+ */
+@NgModule({
+    declarations: [
+        CoreUserToursUserTourComponent,
+    ],
+    imports: [
+        CoreSharedModule,
+    ],
+    exports: [
+        CoreUserToursUserTourComponent,
+    ],
+})
+export class CoreUserToursComponentsModule {}
diff --git a/src/core/features/usertours/components/user-tour/core-user-tours-user-tour.html b/src/core/features/usertours/components/user-tour/core-user-tours-user-tour.html
new file mode 100644
index 000000000..da742e058
--- /dev/null
+++ b/src/core/features/usertours/components/user-tour/core-user-tours-user-tour.html
@@ -0,0 +1,5 @@
+<div *ngIf="focusStyles" class="user-tour-focus" [style]="focusStyles"></div>
+<div *ngIf="!focusStyles" class="user-tour-overlay"></div>
+<div class="user-tour-wrapper" [style]="popoverWrapperStyles" #wrapper>
+    <span *ngIf="popover" class="user-tour-wrapper-arrow" [style]="popoverWrapperArrowStyles"></span>
+</div>
diff --git a/src/core/features/usertours/components/user-tour/user-tour.scss b/src/core/features/usertours/components/user-tour/user-tour.scss
new file mode 100644
index 000000000..3cb31e5bc
--- /dev/null
+++ b/src/core/features/usertours/components/user-tour/user-tour.scss
@@ -0,0 +1,61 @@
+:host {
+    --popover-background: var(--ion-overlay-background-color, var(--ion-background-color, #fff));
+
+    z-index: 99;
+    width: 100%;
+    height: 100%;
+    display: none;
+    color: white;
+
+    .user-tour-focus {
+        position: absolute;
+        box-shadow: 0 0 0 9999px rgba(0, 0, 0, 0.75);
+    }
+
+    .user-tour-overlay {
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        background: rgba(0, 0, 0, 0.75);
+    }
+
+    .user-tour-wrapper {
+        position: absolute;
+    }
+
+    &.is-active {
+        display: block;
+    }
+
+    &.is-popover .user-tour-wrapper {
+        color: var(--ion-text-color, #000);
+        background: var(--popover-background);
+        width: 70vw;
+        padding: 16px;
+        border-radius: 8px;
+
+        .user-tour-wrapper-arrow {
+            position: absolute;
+            border-style: solid;
+            border-color: transparent;
+        }
+
+    }
+
+    &:not(.is-popover) .user-tour-wrapper {
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+    }
+
+}
+
+:host-context(body.dark) {
+    --popover-background: var(--gray-700);
+}
diff --git a/src/core/features/usertours/components/user-tour/user-tour.ts b/src/core/features/usertours/components/user-tour/user-tour.ts
new file mode 100644
index 000000000..5ac56633f
--- /dev/null
+++ b/src/core/features/usertours/components/user-tour/user-tour.ts
@@ -0,0 +1,168 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { AfterViewInit, Component, ElementRef, HostBinding, Input, ViewChild } from '@angular/core';
+import { CorePromisedValue } from '@classes/promised-value';
+import { CoreUserToursFocusLayout } from '@features/usertours/classes/focus-layout';
+import { CoreUserToursPopoverLayout } from '@features/usertours/classes/popover-layout';
+import {
+    CoreUserTours,
+    CoreUserToursAlignment,
+    CoreUserToursSide,
+    CoreUserToursStyle,
+} from '@features/usertours/services/user-tours';
+import { CoreDomUtils } from '@services/utils/dom';
+import { AngularFrameworkDelegate } from '@singletons';
+import { CoreComponentsRegistry } from '@singletons/components-registry';
+
+const ANIMATION_DURATION = 200;
+
+/**
+ * User Tour wrapper component.
+ *
+ * User Tours content will be rendered within this component according to the configured style.
+ */
+@Component({
+    selector: 'core-user-tours-user-tour',
+    templateUrl: 'core-user-tours-user-tour.html',
+    styleUrls: ['user-tour.scss'],
+})
+export class CoreUserToursUserTourComponent implements AfterViewInit {
+
+    @Input() container!: HTMLElement;
+    @Input() id!: string;
+    @Input() component!: unknown;
+    @Input() componentProps?: Record<string, unknown>;
+    @Input() focus?: HTMLElement;
+    @Input() style?: CoreUserToursStyle; // When this is undefined in a tour with a focused element, popover style will be used.
+    @Input() side?: CoreUserToursSide;
+    @Input() alignment?: CoreUserToursAlignment;
+    @HostBinding('class.is-active') active = false;
+    @HostBinding('class.is-popover') popover = false;
+    @ViewChild('wrapper') wrapper?: ElementRef<HTMLElement>;
+
+    focusStyles?: string;
+    popoverWrapperStyles?: string;
+    popoverWrapperArrowStyles?: string;
+    private element: HTMLElement;
+    private wrapperTransform = '';
+    private wrapperElement = new CorePromisedValue<HTMLElement>();
+
+    constructor({ nativeElement: element }: ElementRef<HTMLElement>) {
+        this.element = element;
+
+        CoreComponentsRegistry.register(element, this);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    ngAfterViewInit(): void {
+        if (!this.wrapper) {
+            return;
+        }
+
+        this.wrapperElement.resolve(this.wrapper.nativeElement);
+    }
+
+    /**
+     * Present User Tour.
+     */
+    async present(): Promise<void> {
+        // Insert tour component and wait until it's ready.
+        const wrapper = await this.wrapperElement;
+        const tour = await AngularFrameworkDelegate.attachViewToDom(wrapper, this.component, this.componentProps ?? {});
+
+        await CoreDomUtils.waitForImages(tour);
+
+        this.calculateStyles();
+
+        // Show tour.
+        this.active = true;
+
+        await this.playEnterAnimation();
+    }
+
+    /**
+     * Dismiss User Tour.
+     *
+     * @param acknowledge Whether to confirm that the user has seen the User Tour.
+     */
+    async dismiss(acknowledge: boolean = true): Promise<void> {
+        await this.playLeaveAnimation();
+
+        AngularFrameworkDelegate.removeViewFromDom(this.container, this.element);
+
+        acknowledge && CoreUserTours.acknowledge(this.id);
+    }
+
+    /**
+     * Calculate inline styles.
+     */
+    private calculateStyles(): void {
+        if (!this.focus) {
+            return;
+        }
+
+        // Calculate focus styles.
+        const focusLayout = new CoreUserToursFocusLayout(this.focus);
+
+        this.focusStyles = focusLayout.inlineStyles;
+
+        // Calculate popup styles.
+        if ((this.style ?? CoreUserToursStyle.Popover) === CoreUserToursStyle.Popover) {
+            if (!this.side || !this.alignment) {
+                throw new Error('Cannot create a popover user tour without side and alignment');
+            }
+
+            const popoverLayout = new CoreUserToursPopoverLayout(this.focus, this.side, this.alignment);
+
+            this.popover = true;
+            this.popoverWrapperStyles = popoverLayout.wrapperInlineStyles;
+            this.popoverWrapperArrowStyles = popoverLayout.wrapperArrowInlineStyles;
+            this.wrapperTransform = `${popoverLayout.wrapperStyles.transform ?? ''}`;
+        }
+    }
+
+    /**
+     * Play animation to show that the User Tour has started.
+     */
+    private async playEnterAnimation(): Promise<void> {
+        const animations = [
+            this.element.animate({ opacity: ['0', '1'] }, { duration: ANIMATION_DURATION }),
+            this.wrapperElement.value?.animate(
+                { transform: [`scale(1.2) ${this.wrapperTransform}`, `scale(1) ${this.wrapperTransform}`] },
+                { duration: ANIMATION_DURATION },
+            ),
+        ];
+
+        await Promise.all(animations.map(animation => animation?.finished));
+    }
+
+    /**
+     * Play animation to show that the User Tour has endd.
+     */
+    private async playLeaveAnimation(): Promise<void> {
+        const animations = [
+            this.element.animate({ opacity: ['1', '0'] }, { duration: ANIMATION_DURATION }),
+            this.wrapperElement.value?.animate(
+                { transform: [`scale(1) ${this.wrapperTransform}`, `scale(1.2) ${this.wrapperTransform}`] },
+                { duration: ANIMATION_DURATION },
+            ),
+        ];
+
+        await Promise.all(animations.map(animation => animation?.finished));
+    }
+
+}
diff --git a/src/core/features/usertours/services/database/user-tours.ts b/src/core/features/usertours/services/database/user-tours.ts
new file mode 100644
index 000000000..c2252df0d
--- /dev/null
+++ b/src/core/features/usertours/services/database/user-tours.ts
@@ -0,0 +1,48 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreAppSchema } from '@services/app';
+
+/**
+ * Database variables for CoreUserTours service.
+ */
+export const USER_TOURS_TABLE_NAME = 'user_tours';
+export const APP_SCHEMA: CoreAppSchema = {
+    name: 'CoreUserTours',
+    version: 1,
+    tables: [
+        {
+            name: USER_TOURS_TABLE_NAME,
+            columns: [
+                {
+                    name: 'id',
+                    type: 'TEXT',
+                    primaryKey: true,
+                },
+                {
+                    name: 'acknowledgedTime',
+                    type: 'INTEGER',
+                },
+            ],
+        },
+    ],
+};
+
+/**
+ * User Tours database entry.
+ */
+export type CoreUserToursDBEntry = {
+    id: string;
+    acknowledgedTime: number;
+};
diff --git a/src/core/features/usertours/services/user-tours.ts b/src/core/features/usertours/services/user-tours.ts
new file mode 100644
index 000000000..ed328b406
--- /dev/null
+++ b/src/core/features/usertours/services/user-tours.ts
@@ -0,0 +1,257 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { asyncInstance } from '@/core/utils/async-instance';
+import { Injectable } from '@angular/core';
+import { CoreDatabaseTable } from '@classes/database/database-table';
+import { CoreDatabaseCachingStrategy, CoreDatabaseTableProxy } from '@classes/database/database-table-proxy';
+import { CoreApp } from '@services/app';
+import { CoreUtils } from '@services/utils/utils';
+import { AngularFrameworkDelegate, makeSingleton } from '@singletons';
+import { CoreComponentsRegistry } from '@singletons/components-registry';
+import { CoreUserToursUserTourComponent } from '../components/user-tour/user-tour';
+import { APP_SCHEMA, CoreUserToursDBEntry, USER_TOURS_TABLE_NAME } from './database/user-tours';
+
+/**
+ * Service to manage User Tours.
+ */
+@Injectable({ providedIn: 'root' })
+export class CoreUserToursService {
+
+    protected table = asyncInstance<CoreDatabaseTable<CoreUserToursDBEntry>>();
+    protected tours: CoreUserToursUserTourComponent[] = [];
+    protected tourReadyCallbacks = new WeakMap<CoreUserToursUserTourComponent, () => void>();
+
+    /**
+     * Initialize database.
+     */
+    async initializeDatabase(): Promise<void> {
+        await CoreUtils.ignoreErrors(CoreApp.createTablesFromSchema(APP_SCHEMA));
+
+        this.table.setLazyConstructor(async () => {
+            const table = new CoreDatabaseTableProxy<CoreUserToursDBEntry>(
+                { cachingStrategy: CoreDatabaseCachingStrategy.Eager },
+                CoreApp.getDB(),
+                USER_TOURS_TABLE_NAME,
+                ['id'],
+            );
+
+            await table.initialize();
+
+            return table;
+        });
+    }
+
+    /**
+     * Check whether a User Tour is pending or not.
+     *
+     * @param id User Tour id.
+     * @returns Whether the User Tour is pending or not.
+     */
+    async isPending(id: string): Promise<boolean> {
+        const isAcknowledged = await this.table.hasAnyByPrimaryKey({ id });
+
+        return !isAcknowledged;
+    }
+
+    /**
+     * Confirm that a User Tour has been seen by the user.
+     *
+     * @param id User Tour id.
+     */
+    async acknowledge(id: string): Promise<void> {
+        await this.table.insert({ id, acknowledgedTime: Date.now() });
+    }
+
+    /**
+     * Show a User Tour if it's pending.
+     *
+     * @param options User Tour options.
+     */
+    async showIfPending(options: CoreUserToursBasicOptions): Promise<void>;
+    async showIfPending(options: CoreUserToursPopoverFocusedOptions): Promise<void>;
+    async showIfPending(options: CoreUserToursOverlayFocusedOptions): Promise<void>;
+    async showIfPending(options: CoreUserToursOptions): Promise<void> {
+        const isPending = await CoreUserTours.isPending(options.id);
+
+        if (!isPending) {
+            return;
+        }
+
+        return this.show(options);
+    }
+
+    /**
+     * Show a User Tour.
+     *
+     * @param options User Tour options.
+     */
+    protected async show(options: CoreUserToursBasicOptions): Promise<void>;
+    protected async show(options: CoreUserToursPopoverFocusedOptions): Promise<void>;
+    protected async show(options: CoreUserToursOverlayFocusedOptions): Promise<void>;
+    protected async show(options: CoreUserToursOptions): Promise<void> {
+        const { delay, ...componentOptions } = options;
+
+        await CoreUtils.wait(delay ?? 200);
+
+        const container = document.querySelector('ion-app') ?? document.body;
+        const element = await AngularFrameworkDelegate.attachViewToDom(
+            container,
+            CoreUserToursUserTourComponent,
+            { ...componentOptions, container },
+        );
+        const tour = CoreComponentsRegistry.require(element, CoreUserToursUserTourComponent);
+
+        this.tours.push(tour);
+        this.tours.length > 1
+            ? await new Promise<void>(resolve => this.tourReadyCallbacks.set(tour, resolve))
+            : await tour.present();
+    }
+
+    /**
+     * Dismiss the active User Tour, if any.
+     *
+     * @param acknowledge Whether to acknowledge that the user has seen this User Tour or not.
+     */
+    async dismiss(acknowledge: boolean = true): Promise<void> {
+        if (this.tours.length === 0) {
+            return;
+        }
+
+        const activeTour = this.tours.shift() as CoreUserToursUserTourComponent;
+        const nextTour = this.tours[0] as CoreUserToursUserTourComponent | undefined;
+
+        await Promise.all([
+            activeTour.dismiss(acknowledge),
+            nextTour?.present(),
+        ]);
+
+        nextTour && this.tourReadyCallbacks.get(nextTour)?.();
+    }
+
+}
+
+export const CoreUserTours = makeSingleton(CoreUserToursService);
+
+/**
+ * User Tour style.
+ */
+export const enum CoreUserToursStyle {
+    Overlay = 'overlay',
+    Popover = 'popover',
+}
+
+/**
+ * User Tour side.
+ */
+export const enum CoreUserToursSide {
+    Top = 'top',
+    Bottom = 'bottom',
+    Right = 'right',
+    Left = 'left',
+    Start = 'start',
+    End = 'end',
+}
+
+/**
+ * User Tour alignment.
+ */
+export const enum CoreUserToursAlignment {
+    Start = 'start',
+    Center = 'center',
+    End = 'end',
+}
+
+/**
+ * Basic options to create a User Tour.
+ */
+export interface CoreUserToursBasicOptions {
+
+    /**
+     * Unique identifier.
+     */
+    id: string;
+
+    /**
+     * User Tour component.
+     */
+    component: unknown;
+
+    /**
+     * Properties to pass to the User Tour component.
+     */
+    componentProps?: Record<string, unknown>;
+
+    /**
+     * Milliseconds to wait until the User Tour is shown.
+     *
+     * Defaults to 200ms.
+     */
+    delay?: number;
+
+}
+
+/**
+ * Options to create a focused User Tour.
+ */
+export interface CoreUserToursFocusedOptions extends CoreUserToursBasicOptions {
+
+    /**
+     * Element to focus.
+     */
+    focus: HTMLElement;
+
+}
+
+/**
+ * Options to create a focused User Tour using the Popover style.
+ */
+export interface CoreUserToursPopoverFocusedOptions extends CoreUserToursFocusedOptions {
+
+    /**
+     * User Tour style.
+     */
+    style?: CoreUserToursStyle.Popover;
+
+    /**
+     * Position relative to the focused element.
+     */
+    side: CoreUserToursSide;
+
+    /**
+     * Alignment relative to the focused element.
+     */
+    alignment: CoreUserToursAlignment;
+
+}
+
+/**
+ * Options to create a focused User Tour using the Overlay style.
+ */
+export interface CoreUserToursOverlayFocusedOptions extends CoreUserToursFocusedOptions {
+
+    /**
+     * User Tour style.
+     */
+    style: CoreUserToursStyle.Overlay;
+
+}
+
+/**
+ * Options to create a User Tour.
+ */
+export type CoreUserToursOptions =
+    CoreUserToursBasicOptions |
+    CoreUserToursPopoverFocusedOptions |
+    CoreUserToursOverlayFocusedOptions;
diff --git a/src/core/features/usertours/user-tours.module.ts b/src/core/features/usertours/user-tours.module.ts
new file mode 100644
index 000000000..411530abb
--- /dev/null
+++ b/src/core/features/usertours/user-tours.module.ts
@@ -0,0 +1,37 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { APP_INITIALIZER, NgModule } from '@angular/core';
+
+import { CoreUserToursComponentsModule } from './components/components.module';
+import { CoreUserTours } from './services/user-tours';
+
+/**
+ * User Tours module.
+ */
+@NgModule({
+    imports: [
+        CoreUserToursComponentsModule,
+    ],
+    providers: [
+        {
+            provide: APP_INITIALIZER,
+            multi: true,
+            useValue: async () => {
+                await CoreUserTours.initializeDatabase();
+            },
+        },
+    ],
+})
+export class CoreUserToursModule {}
diff --git a/src/core/singletons/components-registry.ts b/src/core/singletons/components-registry.ts
index db60b35a8..5198ee90b 100644
--- a/src/core/singletons/components-registry.ts
+++ b/src/core/singletons/components-registry.ts
@@ -47,6 +47,23 @@ export class CoreComponentsRegistry {
             : null;
     }
 
+    /**
+     * Get a component instances and fail if it cannot be resolved.
+     *
+     * @param element Root element.
+     * @param componentClass Component class.
+     * @returns Component instance.
+     */
+    static require<T>(element: Element, componentClass?: ComponentConstructor<T>): T {
+        const instance = this.resolve(element, componentClass);
+
+        if (!instance) {
+            throw new Error('Couldn\'t resolve component instance');
+        }
+
+        return instance;
+    }
+
     /**
      * Waits all elements to be rendered.
      *
diff --git a/src/core/singletons/index.ts b/src/core/singletons/index.ts
index cb3a81e9a..0b57ec3fc 100644
--- a/src/core/singletons/index.ts
+++ b/src/core/singletons/index.ts
@@ -12,13 +12,22 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { AbstractType, ApplicationInitStatus, ApplicationRef, Injector, NgZone as NgZoneService, Type } from '@angular/core';
+import {
+    AbstractType,
+    ApplicationInitStatus,
+    ApplicationRef,
+    ComponentFactoryResolver as ComponentFactoryResolverService,
+    Injector,
+    NgZone as NgZoneService,
+    Type,
+} from '@angular/core';
 import { Router as RouterService } from '@angular/router';
 import { HttpClient } from '@angular/common/http';
 import { DomSanitizer as DomSanitizerService } from '@angular/platform-browser';
 
 import {
     Platform as PlatformService,
+    AngularDelegate as AngularDelegateService,
     AlertController as AlertControllerService,
     LoadingController as LoadingControllerService,
     ModalController as ModalControllerService,
@@ -58,11 +67,13 @@ import { Zip as ZipService } from '@ionic-native/zip/ngx';
 import { TranslateService } from '@ngx-translate/core';
 
 import { CoreApplicationInitStatus } from '@classes/application-init-status';
+import { asyncInstance } from '@/core/utils/async-instance';
+import { CorePromisedValue } from '@classes/promised-value';
 
 /**
  * Injector instance used to resolve singletons.
  */
-let singletonsInjector: Injector | null = null;
+const singletonsInjector = new CorePromisedValue<Injector>();
 
 /**
  * Helper to create a method that proxies calls to the underlying singleton instance.
@@ -87,7 +98,7 @@ export type CoreSingletonProxy<Service = unknown> = Service & {
  * @param injector Module injector.
  */
 export function setSingletonsInjector(injector: Injector): void {
-    singletonsInjector = injector;
+    singletonsInjector.resolve(injector);
 }
 
 /**
@@ -127,11 +138,13 @@ export function makeSingleton<Service extends object = object>( // eslint-disabl
 
     Object.defineProperty(singleton, 'instance', {
         get: () => {
-            if (!singletonsInjector) {
+            const injector = singletonsInjector.value;
+
+            if (!injector) {
                 throw new Error('Can\'t resolve a singleton instance without an injector');
             }
 
-            const instance = singletonsInjector.get(injectionToken);
+            const instance = injector.get(injectionToken);
 
             singleton.setInstance(instance);
 
@@ -194,7 +207,9 @@ export const NgZone = makeSingleton(NgZoneService);
 export const Http = makeSingleton(HttpClient);
 export const Platform = makeSingleton(PlatformService);
 export const ActionSheetController = makeSingleton(ActionSheetControllerService);
+export const AngularDelegate = makeSingleton(AngularDelegateService);
 export const AlertController = makeSingleton(AlertControllerService);
+export const ComponentFactoryResolver = makeSingleton(ComponentFactoryResolverService);
 export const LoadingController = makeSingleton(LoadingControllerService);
 export const ModalController = makeSingleton(ModalControllerService);
 export const PopoverController = makeSingleton(PopoverControllerService);
@@ -208,3 +223,10 @@ export const DomSanitizer = makeSingleton(DomSanitizerService);
 
 // Convert external libraries injectables.
 export const Translate = makeSingleton(TranslateService);
+
+// Async singletons.
+export const AngularFrameworkDelegate = asyncInstance(async () => {
+    const injector = await singletonsInjector;
+
+    return AngularDelegate.create(ComponentFactoryResolver.instance, injector);
+});
diff --git a/src/core/utils/async-instance.ts b/src/core/utils/async-instance.ts
index f687e8a70..977a8b83e 100644
--- a/src/core/utils/async-instance.ts
+++ b/src/core/utils/async-instance.ts
@@ -54,6 +54,20 @@ function createAsyncInstanceWrapper<T>(lazyConstructor?: () => T | Promise<T>):
 
             promisedInstance.resolve(instance);
         },
+        setLazyConstructor(constructor) {
+            if (!promisedInstance) {
+                lazyConstructor = constructor;
+
+                return;
+            }
+
+            if (!promisedInstance.isResolved()) {
+                // eslint-disable-next-line promise/catch-or-return
+                Promise
+                    .resolve(constructor())
+                    .then(instance => promisedInstance?.isResolved() || promisedInstance?.resolve(instance));
+            }
+        },
         resetInstance() {
             if (!promisedInstance) {
                 return;
@@ -72,6 +86,7 @@ export interface AsyncInstanceWrapper<T> {
     getInstance(): Promise<T>;
     getProperty<P extends keyof T>(property: P): Promise<T[P]>;
     setInstance(instance: T): void;
+    setLazyConstructor(lazyConstructor: () => T | Promise<T>): void;
     resetInstance(): void;
 }
 
diff --git a/src/core/utils/style-helpers.ts b/src/core/utils/style-helpers.ts
new file mode 100644
index 000000000..45ed8aa36
--- /dev/null
+++ b/src/core/utils/style-helpers.ts
@@ -0,0 +1,36 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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.
+
+/**
+ * Element styles.
+ *
+ * Number styles are interpreted as pixels; any other values should be set as a string.
+ */
+export type CoreStyles = Record<string, string | number>;
+
+/**
+ * Render the given styles to be used inline on an element.
+ *
+ * @param styles Styles.
+ * @returns Inline styles.
+ */
+export function renderInlineStyles(styles: CoreStyles): string {
+    return Object
+        .entries(styles)
+        .reduce((renderedStyles, [property, value]) => {
+            const propertyValue = typeof value === 'string' ? value : `${value}px`;
+
+            return `${property}:${propertyValue};${renderedStyles}`;
+        }, '');
+}

From c5f6b058db35742700e1aa787f8caa082d8707ae Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 8 Mar 2022 18:00:41 +0100
Subject: [PATCH 0699/1008] MOBILE-3153 mainmenu: Implement User Menu tour

---
 scripts/langindex.json                        |  3 +
 src/assets/img/user-tours/user-menu.svg       |  1 +
 src/core/directives/directives.module.ts      |  3 +
 src/core/directives/on-appear.ts              | 58 +++++++++++++++++++
 .../mainmenu/components/components.module.ts  |  3 +
 .../user-menu-button/user-menu-button.html    |  3 +-
 .../user-menu-button/user-menu-button.ts      | 22 ++++++-
 .../user-menu-tour/user-menu-tour.html        |  6 ++
 .../user-menu-tour/user-menu-tour.scss        | 26 +++++++++
 .../user-menu-tour/user-menu-tour.ts          | 35 +++++++++++
 src/core/features/mainmenu/lang.json          |  4 +-
 src/core/lang.json                            |  1 +
 src/core/services/utils/dom.ts                | 18 ++++++
 13 files changed, 180 insertions(+), 3 deletions(-)
 create mode 100644 src/assets/img/user-tours/user-menu.svg
 create mode 100644 src/core/directives/on-appear.ts
 create mode 100644 src/core/features/mainmenu/components/user-menu-tour/user-menu-tour.html
 create mode 100644 src/core/features/mainmenu/components/user-menu-tour/user-menu-tour.scss
 create mode 100644 src/core/features/mainmenu/components/user-menu-tour/user-menu-tour.ts

diff --git a/scripts/langindex.json b/scripts/langindex.json
index de6d427b4..85f7ebd97 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -2003,6 +2003,8 @@
   "core.mainmenu.home": "moodle",
   "core.mainmenu.logout": "moodle",
   "core.mainmenu.switchaccount": "local_moodlemobileapp",
+  "core.mainmenu.usermenutourdescription": "local_moodlemobileapp",
+  "core.mainmenu.usermenutourtitle": "local_moodlemobileapp",
   "core.maxfilesize": "moodle",
   "core.maxsizeandattachments": "moodle",
   "core.min": "moodle",
@@ -2335,6 +2337,7 @@
   "core.usernotfullysetup": "error",
   "core.users": "moodle",
   "core.usersuspended": "tool_reportbuilder",
+  "core.endonesteptour": "tool_usertours",
   "core.view": "moodle",
   "core.viewcode": "local_moodlemobileapp",
   "core.vieweditor": "local_moodlemobileapp",
diff --git a/src/assets/img/user-tours/user-menu.svg b/src/assets/img/user-tours/user-menu.svg
new file mode 100644
index 000000000..33528d215
--- /dev/null
+++ b/src/assets/img/user-tours/user-menu.svg
@@ -0,0 +1 @@
+<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 269 173"><path d="M130.298 171.955a1.999 1.999 0 1 0 2.404-3.196l-2.404 3.196Zm137.887-153.65a2 2 0 0 0 .426-2.796l-10.665-14.5a2 2 0 1 0-3.222 2.37l9.48 12.89-12.889 9.48a2 2 0 1 0 2.37 3.222l14.5-10.665ZM124.847 36.115c14.837-13.515 33.816-20.396 57.372-22.633 23.592-2.242 51.644.187 84.48 5.19l.602-3.954c-32.918-5.016-61.365-7.507-85.46-5.218-24.131 2.292-44.025 9.391-59.688 23.657l2.694 2.958Zm34.44 79.302c-13.382 1.869-23.94-.552-31.827-5.493-7.898-4.946-13.278-12.519-16.124-21.225-5.717-17.49-1.113-39.265 13.511-52.584l-2.694-2.958c-15.876 14.46-20.786 37.916-14.619 56.785 3.096 9.473 9.008 17.864 17.803 23.372 8.804 5.515 20.34 8.043 34.504 6.064l-.554-3.961Zm-26.585 53.343c-25.76-19.374-35.531-44.979-33.124-66.267 2.404-21.255 16.912-38.345 40.27-41.227l-.49-3.97c-25.369 3.13-41.163 21.836-43.754 44.747-2.587 22.876 7.954 49.803 34.694 69.913l2.404-3.196Zm7.146-107.494c23.592-2.91 41.413 9.316 46.813 22.682 2.682 6.636 2.305 13.48-1.745 19.109-4.087 5.679-12.172 10.48-25.629 12.36l.554 3.961c14.089-1.968 23.372-7.107 28.321-13.985 4.986-6.928 5.312-15.26 2.208-22.943-6.171-15.272-25.876-28.255-51.012-25.154l.49 3.97Z" fill="#fff"/></svg>
diff --git a/src/core/directives/directives.module.ts b/src/core/directives/directives.module.ts
index 9350f14eb..2767f4973 100644
--- a/src/core/directives/directives.module.ts
+++ b/src/core/directives/directives.module.ts
@@ -32,6 +32,7 @@ import { CoreSwipeNavigationDirective } from './swipe-navigation';
 import { CoreCollapsibleItemDirective } from './collapsible-item';
 import { CoreCollapsibleFooterDirective } from './collapsible-footer';
 import { CoreContentDirective } from './content';
+import { CoreOnAppearDirective } from './on-appear';
 
 @NgModule({
     declarations: [
@@ -46,6 +47,7 @@ import { CoreContentDirective } from './content';
         CoreSupressEventsDirective,
         CoreUserLinkDirective,
         CoreAriaButtonClickDirective,
+        CoreOnAppearDirective,
         CoreOnResizeDirective,
         CoreDownloadFileDirective,
         CoreCollapsibleHeaderDirective,
@@ -66,6 +68,7 @@ import { CoreContentDirective } from './content';
         CoreSupressEventsDirective,
         CoreUserLinkDirective,
         CoreAriaButtonClickDirective,
+        CoreOnAppearDirective,
         CoreOnResizeDirective,
         CoreDownloadFileDirective,
         CoreCollapsibleHeaderDirective,
diff --git a/src/core/directives/on-appear.ts b/src/core/directives/on-appear.ts
new file mode 100644
index 000000000..52d7691b6
--- /dev/null
+++ b/src/core/directives/on-appear.ts
@@ -0,0 +1,58 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { Directive, ElementRef, EventEmitter, OnDestroy, OnInit, Output } from '@angular/core';
+import { CoreDomUtils } from '@services/utils/dom';
+
+/**
+ * Directive to listen when an element becomes visible.
+ */
+@Directive({
+    selector: '[onAppear]',
+})
+export class CoreOnAppearDirective implements OnInit, OnDestroy {
+
+    @Output() onAppear = new EventEmitter();
+
+    private element: HTMLElement;
+    private interval?: number;
+
+    constructor(element: ElementRef) {
+        this.element = element.nativeElement;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    ngOnInit(): void {
+        this.interval = window.setInterval(() => {
+            if (!CoreDomUtils.isElementVisible(this.element)) {
+                return;
+            }
+
+            this.onAppear.emit();
+            window.clearInterval(this.interval);
+
+            delete this.interval;
+        }, 50);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    ngOnDestroy(): void {
+        this.interval && window.clearInterval(this.interval);
+    }
+
+}
diff --git a/src/core/features/mainmenu/components/components.module.ts b/src/core/features/mainmenu/components/components.module.ts
index 613c1c790..c81a44b1d 100644
--- a/src/core/features/mainmenu/components/components.module.ts
+++ b/src/core/features/mainmenu/components/components.module.ts
@@ -17,11 +17,13 @@ import { CoreSharedModule } from '@/core/shared.module';
 import { CoreMainMenuUserButtonComponent } from './user-menu-button/user-menu-button';
 import { CoreMainMenuUserMenuComponent } from './user-menu/user-menu';
 import { CoreLoginComponentsModule } from '@features/login/components/components.module';
+import { CoreMainMenuUserMenuTourComponent } from './user-menu-tour/user-menu-tour';
 
 @NgModule({
     declarations: [
         CoreMainMenuUserButtonComponent,
         CoreMainMenuUserMenuComponent,
+        CoreMainMenuUserMenuTourComponent,
     ],
     imports: [
         CoreSharedModule,
@@ -30,6 +32,7 @@ import { CoreLoginComponentsModule } from '@features/login/components/components
     exports: [
         CoreMainMenuUserButtonComponent,
         CoreMainMenuUserMenuComponent,
+        CoreMainMenuUserMenuTourComponent,
     ],
 })
 export class CoreMainMenuComponentsModule {}
diff --git a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.html b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.html
index 187ad5ef7..bd0e01204 100644
--- a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.html
+++ b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.html
@@ -1,3 +1,4 @@
 <core-user-avatar *ngIf="isMainScreen && siteInfo" [user]="siteInfo" class="core-bar-button-image clickable" [linkProfile]="false"
-    (ariaButtonClick)="openUserMenu($event)" role="button" tabindex="0" [attr.aria-label]="'core.user.useraccount' | translate">
+    (ariaButtonClick)="openUserMenu($event)" (onAppear)="showTour()" role="button" tabindex="0"
+    [attr.aria-label]="'core.user.useraccount' | translate" #avatar>
 </core-user-avatar>
diff --git a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts
index f1140b4ec..ebde9fb45 100644
--- a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts
+++ b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts
@@ -12,11 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, OnInit } from '@angular/core';
+import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
 import { CoreSiteInfo } from '@classes/site';
+import { CoreUserTours, CoreUserToursStyle } from '@features/usertours/services/user-tours';
 import { IonRouterOutlet } from '@ionic/angular';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
+import { CoreMainMenuUserMenuTourComponent } from '../user-menu-tour/user-menu-tour';
 import { CoreMainMenuUserMenuComponent } from '../user-menu/user-menu';
 
 /**
@@ -34,6 +36,8 @@ export class CoreMainMenuUserButtonComponent implements OnInit {
     siteInfo?: CoreSiteInfo;
     isMainScreen = false;
 
+    @ViewChild('avatar', { read: ElementRef }) avatar?: ElementRef<HTMLElement>;
+
     constructor(protected routerOutlet: IonRouterOutlet) {
         const currentSite = CoreSites.getRequiredCurrentSite();
 
@@ -61,4 +65,20 @@ export class CoreMainMenuUserButtonComponent implements OnInit {
         });
     }
 
+    /**
+     * Show User Tour.
+     */
+    async showTour(): Promise<void> {
+        if (!this.avatar) {
+            return;
+        }
+
+        await CoreUserTours.showIfPending({
+            id: 'user-menu',
+            component: CoreMainMenuUserMenuTourComponent,
+            focus: this.avatar.nativeElement,
+            style: CoreUserToursStyle.Overlay,
+        });
+    }
+
 }
diff --git a/src/core/features/mainmenu/components/user-menu-tour/user-menu-tour.html b/src/core/features/mainmenu/components/user-menu-tour/user-menu-tour.html
new file mode 100644
index 000000000..697f56fcb
--- /dev/null
+++ b/src/core/features/mainmenu/components/user-menu-tour/user-menu-tour.html
@@ -0,0 +1,6 @@
+<img src="assets/img/user-tours/user-menu.svg" alt="" />
+<h2>{{ 'core.mainmenu.usermenutourtitle' | translate }}</h2>
+<p>{{ 'core.mainmenu.usermenutourdescription' | translate }}</p>
+<ion-button (click)="dismiss()" expand="block">
+    {{ 'core.endonesteptour' | translate }}
+</ion-button>
diff --git a/src/core/features/mainmenu/components/user-menu-tour/user-menu-tour.scss b/src/core/features/mainmenu/components/user-menu-tour/user-menu-tour.scss
new file mode 100644
index 000000000..faecdd58f
--- /dev/null
+++ b/src/core/features/mainmenu/components/user-menu-tour/user-menu-tour.scss
@@ -0,0 +1,26 @@
+:host {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    max-width: 85vw;
+    align-items: center;
+    flex-direction: column;
+
+    img {
+        width: calc(100vw - var(--core-avatar-size) * 2 - 16px);
+        margin-top: 12px;
+    }
+
+    p {
+        text-align: center;
+    }
+
+    ion-button {
+        width: 100%;
+    }
+
+}
+
+:host-context([dir=rtl]) img {
+    transform: scaleX(-1);
+}
diff --git a/src/core/features/mainmenu/components/user-menu-tour/user-menu-tour.ts b/src/core/features/mainmenu/components/user-menu-tour/user-menu-tour.ts
new file mode 100644
index 000000000..4d7c1a3d7
--- /dev/null
+++ b/src/core/features/mainmenu/components/user-menu-tour/user-menu-tour.ts
@@ -0,0 +1,35 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreUserTours } from '@features/usertours/services/user-tours';
+
+/**
+ * Component showing the User Tour for the User Menu feature.
+ */
+@Component({
+    selector: 'core-mainmenu-user-menu-tour',
+    templateUrl: 'user-menu-tour.html',
+    styleUrls: ['user-menu-tour.scss'],
+})
+export class CoreMainMenuUserMenuTourComponent {
+
+    /**
+     * Dismiss the User Tour.
+     */
+    async dismiss(): Promise<void> {
+        await CoreUserTours.dismiss();
+    }
+
+}
diff --git a/src/core/features/mainmenu/lang.json b/src/core/features/mainmenu/lang.json
index 9e9977545..b0ff77c61 100644
--- a/src/core/features/mainmenu/lang.json
+++ b/src/core/features/mainmenu/lang.json
@@ -1,5 +1,7 @@
 {
     "home": "Home",
     "logout": "Log out",
-    "switchaccount": "Switch account"
+    "switchaccount": "Switch account",
+    "usermenutourdescription": "The place to check your grades, change your preferences or switch accounts.",
+    "usermenutourtitle": "Explore your personal area"
 }
diff --git a/src/core/lang.json b/src/core/lang.json
index 2a72d84e7..02ef670c7 100644
--- a/src/core/lang.json
+++ b/src/core/lang.json
@@ -329,6 +329,7 @@
     "usernotfullysetup": "User not fully set-up",
     "usernologin": "Authentication has been revoked for this account",
     "usersuspended": "Registration suspended",
+    "endonesteptour": "Got it",
     "users": "Users",
     "view": "View",
     "viewcode": "View code",
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index a91e89caf..390fe0c53 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -806,6 +806,24 @@ export class CoreDomUtilsProvider {
         return elementPoint > window.innerHeight || elementPoint < scrollTopPos;
     }
 
+    /**
+     * Check whether an element is visible or not.
+     *
+     * @param element Element.
+     */
+    isElementVisible(element: HTMLElement): boolean {
+        if (element.clientWidth === 0 || element.clientHeight === 0) {
+            return false;
+        }
+
+        const style = getComputedStyle(element);
+        if (style.opacity === '0' || style.display === 'none' || style.visibility === 'hidden') {
+            return false;
+        }
+
+        return element.offsetParent !== null;
+    }
+
     /**
      * Check if rich text editor is enabled.
      *

From 6d71565d6b50242f9b64446ecf7904f55f3bdb02 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 8 Mar 2022 18:05:28 +0100
Subject: [PATCH 0700/1008] MOBILE-3153 course: Implement Course Index tour

---
 scripts/langindex.json                        |  2 ++
 src/assets/img/user-tours/course-index.svg    |  1 +
 .../course/components/components.module.ts    |  3 ++
 .../course-format/course-format.html          |  3 +-
 .../components/course-format/course-format.ts | 23 ++++++++++++
 .../course-index-tour/course-index-tour.html  |  6 ++++
 .../course-index-tour/course-index-tour.scss  | 15 ++++++++
 .../course-index-tour/course-index-tour.ts    | 35 +++++++++++++++++++
 src/core/features/course/lang.json            |  2 ++
 9 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 src/assets/img/user-tours/course-index.svg
 create mode 100644 src/core/features/course/components/course-index-tour/course-index-tour.html
 create mode 100644 src/core/features/course/components/course-index-tour/course-index-tour.scss
 create mode 100644 src/core/features/course/components/course-index-tour/course-index-tour.ts

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 85f7ebd97..477741917 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1567,6 +1567,8 @@
   "core.course.startdate": "moodle",
   "core.course.thisweek": "format_weeks/currentsection",
   "core.course.todo": "completion",
+  "core.course.tour_navigation_course_index_student_content": "tool_usertours",
+  "core.course.tour_navigation_course_index_student_title": "tool_usertours",
   "core.course.useactivityonbrowser": "local_moodlemobileapp",
   "core.course.viewcourse": "block_timeline",
   "core.course.warningmanualcompletionmodified": "local_moodlemobileapp",
diff --git a/src/assets/img/user-tours/course-index.svg b/src/assets/img/user-tours/course-index.svg
new file mode 100644
index 000000000..c3ecbf014
--- /dev/null
+++ b/src/assets/img/user-tours/course-index.svg
@@ -0,0 +1 @@
+<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 206 143"><rect x=".5" y="11.017" width="180.187" height="112.617" rx="6.143" fill="#EAF6FF"/><mask id="a" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="6" y="11" width="170" height="113"><rect x="6.106" y="11.017" width="168.975" height="112.917" rx="6.143" fill="#EAF6FF"/></mask><g mask="url(#a)"><rect x="77.78" y="20.627" width="25.627" height="6.407" rx="3.203" fill="#86CBFF"/><rect x="28.529" y="37.444" width="124.129" height="10.411" rx="5.205" fill="#86CBFF"/><path fill-rule="evenodd" clip-rule="evenodd" d="M18.944 46.226a1.793 1.793 0 0 1-2.689.083l-4.859-5.178a1.793 1.793 0 1 1 2.615-2.454l3.533 3.765 3.646-4.05a1.793 1.793 0 0 1 2.665 2.4l-4.75 5.277c-.052.056-.105.108-.161.157Z" fill="#86CBFF"/><rect x="28.827" y="56.309" width="92.653" height="10.238" rx="5.119" fill="#C5E6FF"/><circle cx="17.821" cy="61.172" r="6.911" fill="#C5E6FF"/><rect x="28.827" y="76.537" width="78.32" height="10.238" rx="5.119" fill="#C5E6FF"/><circle cx="17.821" cy="81.4" r="6.911" fill="#C5E6FF"/><rect x="28.827" y="96.764" width="110.569" height="10.238" rx="5.119" fill="#C5E6FF"/><circle cx="17.821" cy="101.628" r="6.911" fill="#C5E6FF"/><rect x="28.827" y="116.992" width="90.605" height="10.238" rx="5.119" fill="#C5E6FF"/><circle cx="17.821" cy="121.855" r="6.911" fill="#C5E6FF"/></g><g filter="url(#b)"><rect x="155.45" y="90.299" width="48.05" height="48.05" rx="24.025" fill="#3880FF"/><path d="M170.466 106.952a1.638 1.638 0 1 0 0 3.276 1.638 1.638 0 0 0 0-3.276ZM174.561 107.362a1.228 1.228 0 1 0 0 2.457h14.742a1.229 1.229 0 1 0 0-2.457h-14.742ZM174.561 113.095a1.229 1.229 0 1 0 0 2.457h14.742a1.228 1.228 0 1 0 0-2.457h-14.742ZM173.332 120.057c0-.679.55-1.229 1.229-1.229h14.742a1.229 1.229 0 1 1 0 2.457h-14.742c-.679 0-1.229-.55-1.229-1.228ZM168.828 114.324a1.638 1.638 0 1 1 3.275 0 1.638 1.638 0 0 1-3.275 0ZM170.466 118.419a1.638 1.638 0 1 0 0 3.275 1.638 1.638 0 0 0 0-3.275Z" fill="#fff"/></g><path d="m166.471 0-11.559 20.02h23.118L166.471 0Zm-2.002 79.282a2.002 2.002 0 1 0 4.004 0h-4.004Zm0-69.844a2.002 2.002 0 1 0 4.004 0h-4.004Zm4.004 7.551a2.002 2.002 0 1 0-4.004 0h4.004Zm-4.004 18.877a2.002 2.002 0 1 0 4.004 0h-4.004Zm4.004 7.55a2.002 2.002 0 1 0-4.004 0h4.004Zm-4.004 18.877a2.002 2.002 0 1 0 4.004 0h-4.004Zm4.004 7.55a2.002 2.002 0 1 0-4.004 0h4.004Zm-4.004-52.854v18.877h4.004V16.989h-4.004Zm0 26.427v18.877h4.004V43.416h-4.004Zm0 26.428v9.438h4.004v-9.438h-4.004Z" fill="#0056B3"/><defs><filter id="b" x="153.266" y="90.299" width="52.418" height="52.418" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/><feOffset dy="2.184"/><feGaussianBlur stdDeviation="1.092"/><feComposite in2="hardAlpha" operator="out"/><feColorMatrix values="0 0 0 0 0.120972 0 0 0 0 0.203233 0 0 0 0 0.279167 0 0 0 0.25 0"/><feBlend in2="BackgroundImageFix" result="effect1_dropShadow_319_9155"/><feBlend in="SourceGraphic" in2="effect1_dropShadow_319_9155" result="shape"/></filter></defs></svg>
diff --git a/src/core/features/course/components/components.module.ts b/src/core/features/course/components/components.module.ts
index 5eee268bf..a8bbc04f1 100644
--- a/src/core/features/course/components/components.module.ts
+++ b/src/core/features/course/components/components.module.ts
@@ -28,6 +28,7 @@ import { CoreCourseModuleInfoComponent } from './module-info/module-info';
 import { CoreCourseModuleManualCompletionComponent } from './module-manual-completion/module-manual-completion';
 import { CoreCourseModuleNavigationComponent } from './module-navigation/module-navigation';
 import { CoreCourseModuleSummaryComponent } from './module-summary/module-summary';
+import { CoreCourseCourseIndexTourComponent } from './course-index-tour/course-index-tour';
 
 @NgModule({
     declarations: [
@@ -39,6 +40,7 @@ import { CoreCourseModuleSummaryComponent } from './module-summary/module-summar
         CoreCourseModuleInfoComponent,
         CoreCourseModuleManualCompletionComponent,
         CoreCourseCourseIndexComponent,
+        CoreCourseCourseIndexTourComponent,
         CoreCourseTagAreaComponent,
         CoreCourseUnsupportedModuleComponent,
         CoreCourseModuleNavigationComponent,
@@ -57,6 +59,7 @@ import { CoreCourseModuleSummaryComponent } from './module-summary/module-summar
         CoreCourseModuleInfoComponent,
         CoreCourseModuleManualCompletionComponent,
         CoreCourseCourseIndexComponent,
+        CoreCourseCourseIndexTourComponent,
         CoreCourseTagAreaComponent,
         CoreCourseUnsupportedModuleComponent,
         CoreCourseModuleNavigationComponent,
diff --git a/src/core/features/course/components/course-format/course-format.html b/src/core/features/course/components/course-format/course-format.html
index 73416f1c5..2d8cd3391 100644
--- a/src/core/features/course/components/course-format/course-format.html
+++ b/src/core/features/course/components/course-format/course-format.html
@@ -49,7 +49,8 @@
 
 <!-- Course Index button. -->
 <ion-fab slot="fixed" core-fab vertical="bottom" horizontal="end" *ngIf="loaded && displayCourseIndex">
-    <ion-fab-button (click)="openCourseIndex()" [attr.aria-label]="'core.course.courseindex' | translate" color="secondary">
+    <ion-fab-button (click)="openCourseIndex()" (onAppear)="showCourseIndexTour()" [attr.aria-label]="'core.course.courseindex' | translate"
+        color="secondary" #courseIndexFab>
         <ion-icon name="fas-list-ul" aria-hidden="true"></ion-icon>
         <span class="sr-only">{{'core.course.courseindex' | translate }}</span>
     </ion-fab-button>
diff --git a/src/core/features/course/components/course-format/course-format.ts b/src/core/features/course/components/course-format/course-format.ts
index 207d2dc8e..ee933d3c3 100644
--- a/src/core/features/course/components/course-format/course-format.ts
+++ b/src/core/features/course/components/course-format/course-format.ts
@@ -23,6 +23,7 @@ import {
     QueryList,
     Type,
     ElementRef,
+    ViewChild,
 } from '@angular/core';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreDynamicComponent } from '@components/dynamic-component/dynamic-component';
@@ -44,6 +45,8 @@ import { CoreBlockHelper } from '@features/block/services/block-helper';
 import { CoreNavigator } from '@services/navigator';
 import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate';
 import { CoreCourseViewedModulesDBRecord } from '@features/course/services/database/course';
+import { CoreUserTours, CoreUserToursAlignment, CoreUserToursSide } from '@features/usertours/services/user-tours';
+import { CoreCourseCourseIndexTourComponent } from '../course-index-tour/course-index-tour';
 
 /**
  * Component to display course contents using a certain format. If the format isn't found, use default one.
@@ -71,6 +74,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
     @Input() moduleId?: number; // The module ID to scroll to. Must be inside the initial selected section.
 
     @ViewChildren(CoreDynamicComponent) dynamicComponents?: QueryList<CoreDynamicComponent>;
+    @ViewChild('courseIndexFab', { read: ElementRef }) courseIndexFab?: ElementRef<HTMLElement>;
 
     // All the possible component classes.
     courseFormatComponent?: Type<unknown>;
@@ -160,6 +164,25 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
         });
     }
 
+    /**
+     * Show Course Index User Tour.
+     */
+    async showCourseIndexTour(): Promise<void> {
+        const nativeButton = this.courseIndexFab?.nativeElement.shadowRoot?.children[0] as HTMLElement;
+
+        if (!nativeButton) {
+            return;
+        }
+
+        await CoreUserTours.showIfPending({
+            id: 'course-index',
+            component: CoreCourseCourseIndexTourComponent,
+            focus: nativeButton,
+            side: CoreUserToursSide.Top,
+            alignment: CoreUserToursAlignment.End,
+        });
+    }
+
     /**
      * Detect changes on input properties.
      */
diff --git a/src/core/features/course/components/course-index-tour/course-index-tour.html b/src/core/features/course/components/course-index-tour/course-index-tour.html
new file mode 100644
index 000000000..c519d3152
--- /dev/null
+++ b/src/core/features/course/components/course-index-tour/course-index-tour.html
@@ -0,0 +1,6 @@
+<h2>{{ 'core.course.tour_navigation_course_index_student_title' | translate }}</h2>
+<img src="assets/img/user-tours/course-index.svg" alt="" />
+<p>{{ 'core.course.tour_navigation_course_index_student_content' | translate }}</p>
+<ion-button (click)="dismiss()" expand="block">
+    {{ 'core.endonesteptour' | translate }}
+</ion-button>
diff --git a/src/core/features/course/components/course-index-tour/course-index-tour.scss b/src/core/features/course/components/course-index-tour/course-index-tour.scss
new file mode 100644
index 000000000..b94fabe85
--- /dev/null
+++ b/src/core/features/course/components/course-index-tour/course-index-tour.scss
@@ -0,0 +1,15 @@
+:host {
+
+    h2 {
+        margin-top: 0;
+    }
+
+    p {
+        text-align: center;
+    }
+
+    ion-button {
+        margin: 0;
+    }
+
+}
diff --git a/src/core/features/course/components/course-index-tour/course-index-tour.ts b/src/core/features/course/components/course-index-tour/course-index-tour.ts
new file mode 100644
index 000000000..bcf3041e8
--- /dev/null
+++ b/src/core/features/course/components/course-index-tour/course-index-tour.ts
@@ -0,0 +1,35 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreUserTours } from '@features/usertours/services/user-tours';
+
+/**
+ * Component showing the User Tour for the Course Index feature.
+ */
+@Component({
+    selector: 'core-course-course-index-tour',
+    templateUrl: 'course-index-tour.html',
+    styleUrls: ['course-index-tour.scss'],
+})
+export class CoreCourseCourseIndexTourComponent {
+
+    /**
+     * Dismiss the User Tour.
+     */
+    async dismiss(): Promise<void> {
+        await CoreUserTours.dismiss();
+    }
+
+}
diff --git a/src/core/features/course/lang.json b/src/core/features/course/lang.json
index 4c1e75de6..1103a9902 100644
--- a/src/core/features/course/lang.json
+++ b/src/core/features/course/lang.json
@@ -54,6 +54,8 @@
     "startdate": "Course start date",
     "thisweek": "This week",
     "todo": "To do",
+    "tour_navigation_course_index_student_content": "Browse through activities and track your progress.",
+    "tour_navigation_course_index_student_title": "Find your way around",
     "useactivityonbrowser": "You can still use it using your device's web browser.",
     "viewcourse": "View course",
     "warningmanualcompletionmodified": "The manual completion of an activity was modified on the site.",

From 0376fd0f29d0f883d6d240940f21014fc526bec6 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 8 Mar 2022 18:09:43 +0100
Subject: [PATCH 0701/1008] MOBILE-3153 block: Implement Side Blocks tour

---
 scripts/langindex.json                        |  2 ++
 src/assets/img/user-tours/side-blocks.svg     |  1 +
 .../block/components/components.module.ts     |  3 ++
 .../side-blocks-button.html                   |  3 +-
 .../side-blocks-button/side-blocks-button.ts  | 24 ++++++++++++-
 .../side-blocks-tour/side-blocks-tour.html    |  6 ++++
 .../side-blocks-tour/side-blocks-tour.scss    | 15 ++++++++
 .../side-blocks-tour/side-blocks-tour.ts      | 35 +++++++++++++++++++
 src/core/features/block/lang.json             |  4 ++-
 9 files changed, 90 insertions(+), 3 deletions(-)
 create mode 100644 src/assets/img/user-tours/side-blocks.svg
 create mode 100644 src/core/features/block/components/side-blocks-tour/side-blocks-tour.html
 create mode 100644 src/core/features/block/components/side-blocks-tour/side-blocks-tour.scss
 create mode 100644 src/core/features/block/components/side-blocks-tour/side-blocks-tour.ts

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 477741917..b568c1a3c 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1450,6 +1450,8 @@
   "core.block.blocks": "moodle",
   "core.block.noblocks": "error",
   "core.block.opendrawerblocks": "moodle",
+  "core.block.tour_navigation_dashboard_content": "tool_usertours",
+  "core.block.tour_navigation_dashboard_title": "tool_usertours",
   "core.browser": "local_moodlemobileapp",
   "core.cancel": "moodle",
   "core.cannotconnect": "local_moodlemobileapp",
diff --git a/src/assets/img/user-tours/side-blocks.svg b/src/assets/img/user-tours/side-blocks.svg
new file mode 100644
index 000000000..c2c8d4372
--- /dev/null
+++ b/src/assets/img/user-tours/side-blocks.svg
@@ -0,0 +1 @@
+<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 125"><rect x="6.495" y="13.044" width="183.87" height="102.273" rx="6.818" transform="rotate(-1 6.495 13.044)" fill="#EAF6FF"/><mask id="a" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="6" y="9" width="187" height="107"><rect x="6.495" y="13.044" width="183.87" height="102.273" rx="6.818" transform="rotate(-1 6.495 13.044)" fill="#EAF6FF"/></mask><g mask="url(#a)"><path d="M1.704-23.385 2.608 10.8c96.253 23.32 167.942 24.014 191.755 21.446l-.297-11.232C124.547 16.427 36.859-10.497 1.704-23.385ZM6.405 121.583c24.753-17.058 137.208-28.467 190.341-32.04l.192 7.268C51.976 111.666 10.036 139.218 7.186 151.137l-.78-29.554Z" fill="#C5E6FF" fill-opacity=".44"/><path d="M4.252 105.864c53.467-15.022 150.465-22.507 192.281-24.372l-1.162-43.963c-73.082 4.44-159.46-12.992-193.514-22.263l2.395 90.598Z" fill="#C5E6FF" fill-opacity=".44"/><path d="M57.834 89.671c-.27 1.812-1.13 3.397-2.578 4.753-1.449 1.356-3.293 2.323-5.532 2.901-2.24.579-4.598.683-7.073.313a19.64 19.64 0 0 1-3.375-.825c-1.779.907-3.705 1.473-5.78 1.696a16.44 16.44 0 0 1-1.718.063l-.058-.009a.612.612 0 0 1-.376-.216.654.654 0 0 1-.162-.444.404.404 0 0 1 0-.13.776.776 0 0 1 .029-.126.419.419 0 0 1 .056-.111l.063-.09.084-.098.093-.086.102-.085.09-.076c.077-.069.25-.21.52-.422.271-.213.468-.38.593-.502.124-.121.298-.288.522-.501.224-.213.423-.44.598-.68.175-.241.351-.508.527-.801-1.466-1.18-2.558-2.522-3.274-4.028-.715-1.507-.957-3.035-.725-4.587.27-1.812 1.13-3.396 2.578-4.752 1.449-1.356 3.293-2.324 5.532-2.902 2.24-.578 4.598-.682 7.073-.312 2.476.37 4.7 1.159 6.673 2.367 1.973 1.207 3.453 2.671 4.442 4.392.988 1.72 1.347 3.486 1.076 5.298Zm6.718 6.122c-.234 1.564-.913 2.96-2.037 4.184-1.123 1.225-2.56 2.186-4.307 2.885.083.332.173.639.27.92a5 5 0 0 0 .374.825c.152.269.27.48.353.633.083.152.223.369.419.652a13.942 13.942 0 0 1 .439.655c.032.052.056.089.072.111a.849.849 0 0 1 .064.11c.025.05.043.089.052.117l.034.105.021.123-.01.129-.038.124a.734.734 0 0 1-.317.393.592.592 0 0 1-.448.073 16.686 16.686 0 0 1-1.625-.563c-1.918-.82-3.595-1.924-5.031-3.311a19.717 19.717 0 0 1-3.469-.198c-3.512-.525-6.443-1.843-8.79-3.953.743.164 1.31.276 1.699.334 2.087.312 4.133.318 6.139.018 2.006-.3 3.842-.886 5.51-1.756 1.799-.957 3.25-2.153 4.352-3.588 1.102-1.434 1.784-3.025 2.045-4.772.15-1.004.149-2.017-.003-3.039 1.534 1.176 2.682 2.533 3.446 4.074.764 1.54 1.026 3.112.786 4.715ZM103.599 87.974l1.526 5.695c.133.496.071.97-.187 1.42-.258.45-.633.742-1.125.874l-9.759 2.615a1.784 1.784 0 0 1-1.41-.194 1.813 1.813 0 0 1-.873-1.136l-2.08-7.767c-.134-.496-.071-.97.186-1.42.258-.45.633-.742 1.125-.873l2.568-.689a1.784 1.784 0 0 1 1.411.195c.449.261.74.64.873 1.136l.069.259 5.393-1.445a1.783 1.783 0 0 1 1.411.194c.448.261.739.64.872 1.136ZM130.789 102.466a1.625 1.625 0 0 0-.756-1.04 1.622 1.622 0 0 0-1.27-.201 1.62 1.62 0 0 0-1.041.756 1.622 1.622 0 0 0-.201 1.27c.108.451.36.798.756 1.04.396.243.819.31 1.27.201.451-.108.798-.36 1.04-.756.243-.395.31-.819.202-1.27Zm15.383 4.083c.109.451.043.871-.196 1.262l-4.759 7.784a1.68 1.68 0 0 1-1.049.751 1.61 1.61 0 0 1-1.262-.196l-11.32-6.948c-.399-.237-.776-.601-1.132-1.092-.357-.49-.589-.961-.697-1.412l-1.275-5.309a1.62 1.62 0 0 1 .209-1.266c.246-.4.59-.654 1.033-.76l5.309-1.275c.451-.108.976-.115 1.575-.02.599.094 1.098.265 1.499.51l11.314 6.923c.395.256.645.605.751 1.048ZM154.994 74.735l-.494 3.516a1.026 1.026 0 0 1-.412.704 1.029 1.029 0 0 1-.791.203l-3.517-.494a1.028 1.028 0 0 1-.704-.413 1.029 1.029 0 0 1-.202-.79l.494-3.517c.041-.293.179-.528.413-.704.234-.176.497-.244.79-.203l1.055.149.297-2.11-5.627-.791-.296 2.11 1.055.148c.293.041.527.179.704.413.176.234.244.497.202.79l-.494 3.517a1.027 1.027 0 0 1-.413.704 1.026 1.026 0 0 1-.79.203l-3.517-.495a1.03 1.03 0 0 1-.704-.412 1.025 1.025 0 0 1-.202-.79l.494-3.517c.041-.294.179-.528.413-.704.233-.177.497-.244.79-.203l1.055.148.297-2.11-5.627-.79-.297 2.11 1.055.148c.294.04.528.178.705.412.176.234.243.498.202.79l-.494 3.517a1.027 1.027 0 0 1-.413.704 1.026 1.026 0 0 1-.79.203l-3.517-.494a1.027 1.027 0 0 1-.704-.413 1.03 1.03 0 0 1-.203-.79l.495-3.517c.041-.293.178-.528.412-.704.234-.176.498-.244.791-.203l1.055.149.296-2.11c.054-.381.239-.691.557-.93.318-.24.667-.333 1.048-.28l5.626.792.297-2.11-1.055-.149a1.027 1.027 0 0 1-.704-.412 1.025 1.025 0 0 1-.203-.79l.494-3.517a1.03 1.03 0 0 1 .413-.705c.234-.176.498-.243.791-.202l3.516.494c.293.041.528.179.704.413.176.234.244.497.203.79l-.494 3.517a1.03 1.03 0 0 1-.413.704 1.029 1.029 0 0 1-.791.203l-1.055-.149-.296 2.11 5.626.791c.381.054.691.24.931.557.239.317.332.666.278 1.047l-.296 2.11 1.055.149c.293.04.528.178.704.412.176.234.244.498.202.79ZM159.542 33.815l-.377 5.764c-.054.839-.644 1.55-1.77 2.136-1.126.584-2.614.975-4.464 1.17-1.851.196-3.826.165-5.927-.093-2.102-.258-4.026-.706-5.774-1.343-1.748-.638-3.098-1.377-4.049-2.216-.951-.84-1.351-1.674-1.2-2.501l1.028-5.684 9.995 4.555c.255.117.54.195.854.234.313.038.608.031.885-.02l10.799-2.002Zm10.32-4.69c-.034.278-.19.448-.467.512l-21.069 3.885a.77.77 0 0 1-.184-.004.777.777 0 0 1-.179-.04l-11.351-5.181c-.57.346-1.081.967-1.534 1.861-.453.895-.791 1.947-1.013 3.158.707.528 1.007 1.233.899 2.114-.103.833-.532 1.436-1.289 1.81l.088 7.971a.54.54 0 0 1-.201.435.537.537 0 0 1-.459.146l-3.478-.427a.538.538 0 0 1-.41-.253.538.538 0 0 1-.089-.47l2.013-7.714c-.644-.545-.914-1.234-.812-2.067.108-.882.583-1.504 1.424-1.866.44-2.483 1.276-4.403 2.509-5.76l-5.8-2.624c-.254-.129-.364-.332-.33-.61.034-.278.19-.449.468-.513l21.069-3.885a.766.766 0 0 1 .183.005.765.765 0 0 1 .179.04l19.504 8.867c.253.129.363.332.329.61ZM89.868 67.27l3.925.552.552-3.925-3.925-.552-.552 3.925Zm4.797.674 4.362.613.551-3.925-4.36-.613-.553 3.925Zm-4.123-5.471 3.925.551.613-4.361-3.925-.552-.613 4.362Zm4.798.674 4.361.613.613-4.362-4.361-.613-.613 4.362Zm-4.062-5.908 3.925.552.552-3.926-3.926-.551-.551 3.925Zm8.621 11.44 4.361.614.552-3.925-4.361-.613-.552 3.925Zm-3.824-10.766 4.362.613.551-3.925-4.361-.613-.552 3.925Zm9.058 11.502 3.925.552.552-3.925-3.926-.552-.551 3.925Zm-4.56-5.533 4.362.613.613-4.361-4.362-.613-.613 4.361Zm-3.142-12.45.551-3.925a.423.423 0 0 0-.086-.325.423.423 0 0 0-.288-.172l-.873-.123a.423.423 0 0 0-.325.087.423.423 0 0 0-.172.288l-.552 3.925a.423.423 0 0 0 .087.325c.074.099.17.156.288.173l.872.122a.423.423 0 0 0 .325-.086.423.423 0 0 0 .173-.289Zm8.376 13.186 3.925.552.613-4.362-3.925-.551-.613 4.36Zm-4.498-5.97 4.361.614.552-3.926-4.361-.613-.552 3.926Zm5.234.736 3.925.552.551-3.925-3.925-.552-.551 3.925Zm1.355-6.48.552-3.926a.423.423 0 0 0-.087-.325.422.422 0 0 0-.288-.172l-.872-.123a.423.423 0 0 0-.325.087.423.423 0 0 0-.173.288l-.551 3.925a.422.422 0 0 0 .086.325c.074.099.17.156.288.173l.873.122a.424.424 0 0 0 .325-.086.426.426 0 0 0 .172-.289Zm5.356-.137-2.451 17.445a1.695 1.695 0 0 1-.691 1.154 1.693 1.693 0 0 1-1.299.346l-19.19-2.697a1.693 1.693 0 0 1-1.154-.69 1.693 1.693 0 0 1-.346-1.3l2.452-17.446c.066-.472.297-.857.69-1.154a1.693 1.693 0 0 1 1.3-.345l1.744.245.184-1.308c.085-.6.37-1.083.857-1.45a2.12 2.12 0 0 1 1.63-.425l.873.123c.6.084 1.083.37 1.45.857a2.12 2.12 0 0 1 .424 1.63l-.184 1.309 5.234.735.184-1.308c.084-.6.37-1.083.857-1.45a2.12 2.12 0 0 1 1.63-.424l.872.122c.6.085 1.083.37 1.45.857s.509 1.03.424 1.63l-.184 1.309 1.745.245c.472.066.857.297 1.154.69.297.394.412.827.345 1.3ZM185.616 53.236c-.119-1.511-.758-2.761-1.917-3.751-1.158-.99-2.494-1.425-4.005-1.306-1.511.118-2.762.757-3.752 1.916-.989 1.16-1.425 2.494-1.306 4.006.119 1.511.758 2.761 1.917 3.751 1.159.99 2.494 1.426 4.005 1.306 1.512-.118 2.762-.757 3.752-1.916.99-1.16 1.425-2.494 1.306-4.006Zm7.077 9.702c.033.425-.093.805-.379 1.14-.286.335-.641.519-1.066.552a1.463 1.463 0 0 1-1.14-.379l-4.533-3.86c-1.383 1.128-2.973 1.763-4.77 1.905a8.505 8.505 0 0 1-3.405-.417 8.654 8.654 0 0 1-2.902-1.62 8.645 8.645 0 0 1-2.055-2.613 8.493 8.493 0 0 1-.944-3.299 8.512 8.512 0 0 1 .416-3.405c.37-1.102.91-2.069 1.621-2.902a8.67 8.67 0 0 1 2.613-2.055 8.503 8.503 0 0 1 3.298-.944 8.505 8.505 0 0 1 3.405.417c1.102.37 2.069.91 2.902 1.62a8.642 8.642 0 0 1 2.055 2.613c.538 1.03.852 2.13.944 3.298a8.42 8.42 0 0 1-1.134 5.01l4.534 3.872c.326.279.506.634.54 1.067ZM51.843 40.931c-1.528.347-2.666 1.202-3.415 2.566l-1.908.371c-.778.151-1.47.085-2.077-.198-.606-.283-.982-.797-1.127-1.542-.655-3.369-.394-5.168.783-5.397.057-.01.283.05.678.18.394.132.896.245 1.506.34.609.094 1.194.087 1.753-.022a5.794 5.794 0 0 0 1.83-.697c.02.362.058.682.112.958.258 1.327.88 2.474 1.865 3.441Zm17.018 6.157c.222 1.146.052 2.117-.512 2.915-.564.798-1.42 1.309-2.568 1.532l-12.44 2.418c-1.149.223-2.134.07-2.955-.458-.822-.529-1.344-1.366-1.567-2.511a21.877 21.877 0 0 1-.238-1.492 14.933 14.933 0 0 1-.104-1.599c-.009-.578.016-1.12.075-1.627.06-.506.173-1.011.341-1.514.168-.504.387-.947.657-1.332.27-.384.626-.718 1.068-1.002a4.333 4.333 0 0 1 1.532-.595c.095-.019.319.044.672.189.353.144.743.306 1.172.485.429.18.981.31 1.657.391.675.082 1.336.06 1.981-.066a6.338 6.338 0 0 0 1.862-.68c.596-.33 1.06-.658 1.39-.984.33-.327.632-.623.905-.89.273-.265.457-.408.552-.426a4.332 4.332 0 0 1 1.643-.022c.516.097.972.274 1.366.53.394.254.764.584 1.108.987.344.404.639.83.883 1.277.245.448.471.941.68 1.48.207.54.375 1.047.502 1.522.127.476.24.966.338 1.472Zm-18.13-15.45a3.608 3.608 0 0 1-.564 2.8c-.572.854-1.361 1.378-2.367 1.574-1.006.196-1.934.005-2.785-.573a3.607 3.607 0 0 1-1.572-2.384 3.608 3.608 0 0 1 .564-2.799c.573-.854 1.362-1.379 2.368-1.574 1.006-.196 1.934-.005 2.785.573a3.608 3.608 0 0 1 1.571 2.384Zm11.09 3.55c.295 1.518.013 2.917-.846 4.199-.859 1.281-2.043 2.068-3.552 2.362-1.508.293-2.9.006-4.177-.86-1.276-.866-2.062-2.058-2.357-3.576-.295-1.517-.013-2.917.846-4.198.859-1.281 2.042-2.069 3.551-2.362 1.509-.293 2.902-.007 4.178.86 1.276.866 2.062 2.058 2.357 3.575Zm8.825 1.628c.144.745-.011 1.362-.468 1.852-.456.49-1.073.81-1.851.961L66.419 40c-1.205-.984-2.581-1.35-4.128-1.1.552-1.265.699-2.562.44-3.889a7.308 7.308 0 0 0-.254-.93 5.794 5.794 0 0 0 1.957-.04 5.061 5.061 0 0 0 1.634-.636 9.51 9.51 0 0 0 1.27-.879c.317-.27.503-.41.56-.42 1.177-.23 2.093 1.34 2.748 4.71Zm-3.517-8.365a3.608 3.608 0 0 1-.564 2.8c-.572.853-1.362 1.378-2.367 1.574-1.006.195-1.935.004-2.786-.573a3.608 3.608 0 0 1-1.57-2.384 3.608 3.608 0 0 1 .563-2.8c.572-.853 1.362-1.378 2.368-1.574 1.005-.195 1.934-.004 2.785.573a3.608 3.608 0 0 1 1.571 2.384Z" fill="#86CBFF"/></g><path d="m32.36 32.836-.448-3.926a1.905 1.905 0 0 0-.73-1.326 1.905 1.905 0 0 0-1.457-.414l-8.506.97-.97-8.507a1.905 1.905 0 0 0-.73-1.325 1.905 1.905 0 0 0-1.456-.414l-3.926.447a1.906 1.906 0 0 0-1.325.73c-.338.426-.476.911-.414 1.457l.969 8.506-8.507.97a1.905 1.905 0 0 0-1.325.73c-.338.425-.476.91-.414 1.456l.447 3.926c.063.545.306.987.731 1.325.426.338.91.476 1.456.414l8.506-.969.97 8.507c.062.545.306.987.73 1.325.426.338.911.476 1.456.414l3.926-.447a1.906 1.906 0 0 0 1.326-.731c.338-.425.476-.91.414-1.456l-.97-8.506 8.507-.97a1.906 1.906 0 0 0 1.325-.73c.338-.426.477-.911.414-1.456ZM197.012 95.186l.241-3.944a1.907 1.907 0 0 0-.49-1.432 1.906 1.906 0 0 0-1.362-.66l-8.545-.523.522-8.546a1.903 1.903 0 0 0-.489-1.432 1.905 1.905 0 0 0-1.362-.66l-3.944-.242a1.905 1.905 0 0 0-1.432.49c-.407.36-.627.814-.661 1.362l-.522 8.545-8.546-.523a1.905 1.905 0 0 0-1.432.49c-.407.36-.627.814-.66 1.362l-.242 3.944c-.033.548.13 1.025.49 1.432.36.407.814.627 1.362.66l8.545.523-.522 8.546a1.903 1.903 0 0 0 .489 1.432c.36.407.814.627 1.362.66l3.944.242a1.907 1.907 0 0 0 1.432-.49c.407-.36.627-.814.661-1.362l.522-8.545 8.546.522a1.905 1.905 0 0 0 1.432-.49c.407-.36.627-.813.661-1.361ZM124.934 25.352l-.327-1.95a.95.95 0 0 0-.4-.644.952.952 0 0 0-.738-.169l-4.226.708-.707-4.226a.957.957 0 0 0-.4-.644.956.956 0 0 0-.739-.168l-1.95.326a.953.953 0 0 0-.643.4.955.955 0 0 0-.169.738l.707 4.226-4.226.707a.953.953 0 0 0-.643.4.955.955 0 0 0-.169.739l.327 1.95a.95.95 0 0 0 .4.643.952.952 0 0 0 .738.17l4.226-.708.707 4.226c.045.27.179.485.4.643a.953.953 0 0 0 .738.169l1.951-.326a.953.953 0 0 0 .643-.4.954.954 0 0 0 .169-.739l-.707-4.226 4.226-.707a.956.956 0 0 0 .643-.4.954.954 0 0 0 .169-.738ZM86.593 110.663l.052-1.977a.956.956 0 0 0-.27-.708.953.953 0 0 0-.693-.306l-4.283-.112.112-4.283a.953.953 0 0 0-.27-.708.954.954 0 0 0-.692-.307l-1.977-.052a.955.955 0 0 0-.708.27.955.955 0 0 0-.306.693l-.113 4.283-4.283-.112a.955.955 0 0 0-.707.27.953.953 0 0 0-.307.692l-.052 1.977a.953.953 0 0 0 .27.708.958.958 0 0 0 .693.307l4.283.112-.112 4.283a.956.956 0 0 0 .27.708.953.953 0 0 0 .692.306l1.977.052a.955.955 0 0 0 .708-.27.954.954 0 0 0 .306-.693l.113-4.283 4.283.112a.95.95 0 0 0 .708-.269.957.957 0 0 0 .306-.693ZM39.984 59.205l.07-2.633a1.27 1.27 0 0 0-.36-.943 1.27 1.27 0 0 0-.923-.408l-5.706-.15.15-5.705a1.27 1.27 0 0 0-.36-.943 1.27 1.27 0 0 0-.922-.408l-2.634-.07a1.27 1.27 0 0 0-.942.36 1.27 1.27 0 0 0-.409.923l-.15 5.706-5.705-.15a1.27 1.27 0 0 0-.943.36 1.27 1.27 0 0 0-.408.922l-.07 2.634c-.009.365.111.68.36.942.25.263.557.4.923.409l5.706.15-.15 5.705c-.01.366.11.68.36.943.25.262.557.399.923.408l2.633.07c.366.009.68-.111.943-.36a1.27 1.27 0 0 0 .408-.923l.15-5.706 5.705.15c.366.01.68-.11.943-.36a1.27 1.27 0 0 0 .408-.923Z" fill="#0056B3"/></svg>
diff --git a/src/core/features/block/components/components.module.ts b/src/core/features/block/components/components.module.ts
index ab8bf883c..62552af04 100644
--- a/src/core/features/block/components/components.module.ts
+++ b/src/core/features/block/components/components.module.ts
@@ -19,6 +19,7 @@ import { CoreBlockPreRenderedComponent } from './pre-rendered-block/pre-rendered
 import { CoreSharedModule } from '@/core/shared.module';
 import { CoreBlockSideBlocksComponent } from './side-blocks/side-blocks';
 import { CoreBlockSideBlocksButtonComponent } from './side-blocks-button/side-blocks-button';
+import { CoreBlockSideBlocksTourComponent } from './side-blocks-tour/side-blocks-tour';
 
 @NgModule({
     declarations: [
@@ -27,6 +28,7 @@ import { CoreBlockSideBlocksButtonComponent } from './side-blocks-button/side-bl
         CoreBlockPreRenderedComponent,
         CoreBlockSideBlocksComponent,
         CoreBlockSideBlocksButtonComponent,
+        CoreBlockSideBlocksTourComponent,
     ],
     imports: [
         CoreSharedModule,
@@ -37,6 +39,7 @@ import { CoreBlockSideBlocksButtonComponent } from './side-blocks-button/side-bl
         CoreBlockPreRenderedComponent,
         CoreBlockSideBlocksComponent,
         CoreBlockSideBlocksButtonComponent,
+        CoreBlockSideBlocksTourComponent,
     ],
 })
 export class CoreBlockComponentsModule {}
diff --git a/src/core/features/block/components/side-blocks-button/side-blocks-button.html b/src/core/features/block/components/side-blocks-button/side-blocks-button.html
index 07dcf6632..13cd1b7fe 100644
--- a/src/core/features/block/components/side-blocks-button/side-blocks-button.html
+++ b/src/core/features/block/components/side-blocks-button/side-blocks-button.html
@@ -1,3 +1,4 @@
-<ion-button (click)="openBlocks()" [attr.aria-label]="'core.block.opendrawerblocks' | translate" color="secondary">
+<ion-button (click)="openBlocks()" (onAppear)="showTour()" [attr.aria-label]="'core.block.opendrawerblocks' | translate" color="secondary"
+    #button>
     <ion-icon name="fas-chevron-left" slot="icon-only" aria-hidden="true"></ion-icon>
 </ion-button>
diff --git a/src/core/features/block/components/side-blocks-button/side-blocks-button.ts b/src/core/features/block/components/side-blocks-button/side-blocks-button.ts
index bd59a030a..e8b369c29 100644
--- a/src/core/features/block/components/side-blocks-button/side-blocks-button.ts
+++ b/src/core/features/block/components/side-blocks-button/side-blocks-button.ts
@@ -12,8 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, Input } from '@angular/core';
+import { Component, ElementRef, Input, ViewChild } from '@angular/core';
+import { CoreUserTours, CoreUserToursAlignment, CoreUserToursSide } from '@features/usertours/services/user-tours';
 import { CoreDomUtils } from '@services/utils/dom';
+import { CoreBlockSideBlocksTourComponent } from '../side-blocks-tour/side-blocks-tour';
 import { CoreBlockSideBlocksComponent } from '../side-blocks/side-blocks';
 
 /**
@@ -27,6 +29,7 @@ import { CoreBlockSideBlocksComponent } from '../side-blocks/side-blocks';
 export class CoreBlockSideBlocksButtonComponent {
 
     @Input() courseId!: number;
+    @ViewChild('button', { read: ElementRef }) button?: ElementRef<HTMLElement>;
 
     /**
      * Open side blocks.
@@ -40,4 +43,23 @@ export class CoreBlockSideBlocksButtonComponent {
         });
     }
 
+    /**
+     * Show User Tour.
+     */
+    async showTour(): Promise<void> {
+        const nativeButton = this.button?.nativeElement.shadowRoot?.children[0] as HTMLElement;
+
+        if (!nativeButton) {
+            return;
+        }
+
+        await CoreUserTours.showIfPending({
+            id: 'side-blocks-button',
+            component: CoreBlockSideBlocksTourComponent,
+            focus: nativeButton,
+            side: CoreUserToursSide.Start,
+            alignment: CoreUserToursAlignment.Center,
+        });
+    }
+
 }
diff --git a/src/core/features/block/components/side-blocks-tour/side-blocks-tour.html b/src/core/features/block/components/side-blocks-tour/side-blocks-tour.html
new file mode 100644
index 000000000..47596569a
--- /dev/null
+++ b/src/core/features/block/components/side-blocks-tour/side-blocks-tour.html
@@ -0,0 +1,6 @@
+<h2>{{ 'core.block.tour_navigation_dashboard_title' | translate }}</h2>
+<img src="assets/img/user-tours/side-blocks.svg" alt="" />
+<p>{{ 'core.block.tour_navigation_dashboard_content' | translate }}</p>
+<ion-button (click)="dismiss()" expand="block">
+    {{ 'core.endonesteptour' | translate }}
+</ion-button>
diff --git a/src/core/features/block/components/side-blocks-tour/side-blocks-tour.scss b/src/core/features/block/components/side-blocks-tour/side-blocks-tour.scss
new file mode 100644
index 000000000..b94fabe85
--- /dev/null
+++ b/src/core/features/block/components/side-blocks-tour/side-blocks-tour.scss
@@ -0,0 +1,15 @@
+:host {
+
+    h2 {
+        margin-top: 0;
+    }
+
+    p {
+        text-align: center;
+    }
+
+    ion-button {
+        margin: 0;
+    }
+
+}
diff --git a/src/core/features/block/components/side-blocks-tour/side-blocks-tour.ts b/src/core/features/block/components/side-blocks-tour/side-blocks-tour.ts
new file mode 100644
index 000000000..2f5c2ada4
--- /dev/null
+++ b/src/core/features/block/components/side-blocks-tour/side-blocks-tour.ts
@@ -0,0 +1,35 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreUserTours } from '@features/usertours/services/user-tours';
+
+/**
+ * Component showing the User Tour for the Side Blocks feature.
+ */
+@Component({
+    selector: 'core-block-side-blocks-tour',
+    templateUrl: 'side-blocks-tour.html',
+    styleUrls: ['side-blocks-tour.scss'],
+})
+export class CoreBlockSideBlocksTourComponent {
+
+    /**
+     * Dismiss User Tour.
+     */
+    async dismiss(): Promise<void> {
+        await CoreUserTours.dismiss();
+    }
+
+}
diff --git a/src/core/features/block/lang.json b/src/core/features/block/lang.json
index cc3f3c95a..b3398e07b 100644
--- a/src/core/features/block/lang.json
+++ b/src/core/features/block/lang.json
@@ -1,5 +1,7 @@
 {
     "blocks": "Blocks",
     "noblocks": "No blocks found!",
-    "opendrawerblocks": "Open block drawer"
+    "opendrawerblocks": "Open block drawer",
+    "tour_navigation_dashboard_content": "This side panel can contain more features.",
+    "tour_navigation_dashboard_title": "Expand to explore"
 }

From bd37ed434513783f2bbc14aa9c5409e035bd1cfd Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 8 Mar 2022 18:11:49 +0100
Subject: [PATCH 0702/1008] MOBILE-3153 core: Implement Swipe Navigation tour

---
 scripts/langindex.json                        |  1 +
 .../img/user-tours/swipe-navigation.svg       |  1 +
 src/core/components/components.module.ts      |  3 ++
 .../core-swipe-navigation-tour.html           |  5 +++
 .../swipe-navigation-tour.scss                | 12 +++++++
 .../swipe-navigation-tour.ts                  | 35 +++++++++++++++++++
 src/core/directives/swipe-navigation.ts       | 25 ++++++++++++-
 src/core/lang.json                            |  1 +
 8 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 src/assets/img/user-tours/swipe-navigation.svg
 create mode 100644 src/core/components/swipe-navigation-tour/core-swipe-navigation-tour.html
 create mode 100644 src/core/components/swipe-navigation-tour/swipe-navigation-tour.scss
 create mode 100644 src/core/components/swipe-navigation-tour/swipe-navigation-tour.ts

diff --git a/scripts/langindex.json b/scripts/langindex.json
index b568c1a3c..ec7f4e8eb 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -2269,6 +2269,7 @@
   "core.submit": "moodle",
   "core.success": "moodle",
   "core.summary": "moodle",
+  "core.swipenavigationtourdescription": "local_moodlemobileapp",
   "core.tablet": "local_moodlemobileapp",
   "core.tag.defautltagcoll": "tag",
   "core.tag.errorareanotsupported": "local_moodlemobileapp",
diff --git a/src/assets/img/user-tours/swipe-navigation.svg b/src/assets/img/user-tours/swipe-navigation.svg
new file mode 100644
index 000000000..ac0c1732c
--- /dev/null
+++ b/src/assets/img/user-tours/swipe-navigation.svg
@@ -0,0 +1 @@
+<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 202 98"><path fill-rule="evenodd" clip-rule="evenodd" d="M98.269 84.491c1.654.528 10.173 2.987 25.555 7.378l13.172-21.987 1.308-12.462-11.649-8.533-12.69-4.665 5.051-19.274-3.955-4.534-5.864 1.961-7.052 26.911-3.439-.148-5.382 2.166-4.591 11.492 7.54 15.381c-.324 3.682.342 5.787 1.996 6.314Z" fill="#fff"/><path d="M117.797 47.53c-1.169-.307-2.275-.156-3.317.452-1.043.608-1.717 1.494-2.022 2.66l-1.106 4.22-1.058-.277.803-3.067c.277-1.055 6.047-23.565 6.047-23.565.381-1.454-.597-3.654-2.779-4.226-2.182-.571-4.113.866-4.494 2.32-.381 1.455-1.345 5.078-1.61 6.09l-8.252 31.489-.8-1.267 1.487-5.672c.276-1.055.158-2.044-.354-2.965-.513-.922-1.298-1.52-2.356-1.798-1.015-.266-1.98-.132-2.898.403-.918.535-1.51 1.308-1.774 2.32l-1.935 7.387c-.27 1.033-.121 2.036.449 3.007l7.694 12.449c.636 1.083.772 2.316.409 3.702-.15.571-.07 1.12.239 1.648.31.528.751.867 1.324 1.017l21.166 5.546c.573.15 1.124.072 1.652-.236.528-.308.867-.748 1.017-1.32l.216-.824a9.733 9.733 0 0 1 .996-2.453l7.338-13.442c.428-.734.76-1.552.996-2.453l2.126-8.113c.276-1.055.158-2.043-.355-2.965-.512-.921-1.298-1.52-2.356-1.798-1.014-.266-1.98-.131-2.897.404-.918.534-1.509 1.308-1.774 2.319l-.277 1.055-1.058-.277 1.08-4.122a3.95 3.95 0 0 0-.201-2.608c-.364-.859-.952-1.489-1.766-1.89a5.8 5.8 0 0 0-.743-.266c-1.015-.265-1.981-.13-2.898.404-.918.535-1.509 1.308-1.774 2.32l-1.106 4.22-1.058-.277 1.054-4.023a4.577 4.577 0 0 0-.302-3.233 4.098 4.098 0 0 0-2.352-2.15c-.105-.05-.245-.1-.421-.145Zm1.105-4.222c1.852.486 3.351 1.466 4.496 2.94a8.08 8.08 0 0 1 4.361-.055 8.136 8.136 0 0 1 3.438 1.853 8.036 8.036 0 0 1 2.187 3.251 8.043 8.043 0 0 1 2.012.28c2.205.579 3.873 1.856 5.004 3.832 1.132 1.977 1.41 4.064.834 6.263l-2.126 8.112c-.293 1.121-.748 2.271-1.363 3.45l-7.371 13.433c-.271.493-.541 1.256-.812 2.29-.461 1.759-1.47 3.092-3.027 4-1.557.907-3.218 1.13-4.981.668l-21.165-5.547c-1.852-.485-3.205-1.527-4.059-3.125-.853-1.598-1.038-3.32-.554-5.168l-7.629-12.43c-1.255-2.045-1.589-4.188-1.001-6.43l1.935-7.388c.57-2.176 1.835-3.836 3.796-4.978 1.96-1.143 4.032-1.428 6.214-.856.243.063.951.26 1.056.311.679-2.054 5.921-22.284 6.778-25.557.929-3.545 6.497-4.029 8.679-3.457 2.182.572 6.916 3.269 5.868 7.269-.191.727-4.365 16.347-4.461 16.71 0 0-.357-.26 1.891.33Z" fill="#0056B3"/><path d="M101.728 32.565c-.812.436-1.832.135-2.178-.719a15.246 15.246 0 0 1-1.051-7.043 15.418 15.418 0 0 1 3.22-8.154 15.566 15.566 0 0 1 7.157-5.113 15.504 15.504 0 0 1 8.774-.415 15.306 15.306 0 0 1 7.547 4.42 15.209 15.209 0 0 1 3.872 7.819c.5 2.93.132 5.947-1.057 8.685a15.51 15.51 0 0 1-4.319 5.75c-.702.582-1.735.37-2.242-.39-.507-.76-.292-1.78.394-2.386a12.146 12.146 0 0 0 3.112-4.273 12.014 12.014 0 0 0 .829-6.81 11.927 11.927 0 0 0-3.036-6.13 12.005 12.005 0 0 0-5.917-3.465 12.158 12.158 0 0 0-6.88.324 12.207 12.207 0 0 0-5.612 4.01 12.092 12.092 0 0 0-2.525 6.393 11.95 11.95 0 0 0 .695 5.187c.319.864.028 1.873-.783 2.31Z" fill="#86CBFF"/><rect x="76.039" y="12.141" width="23.308" height="3.759" rx="1.88" fill="#86CBFF"/><rect x="70.619" y="21.163" width="21.805" height="3.759" rx="1.88" fill="#86CBFF"/><rect x="80.394" y="30.186" width="16.541" height="3.759" rx="1.88" fill="#86CBFF"/><path d="M141.5 20.788a1.88 1.88 0 1 0 0 3.759v-3.76Zm60.15 1.88-18.797-10.853V33.52l18.797-10.853Zm-60.15 1.879h43.233v-3.76H141.5v3.76ZM61.15 24.547a1.88 1.88 0 0 0 0-3.76v3.76ZM1 22.667 19.797 33.52V11.815L1 22.667Zm60.15-1.88H17.917v3.76H61.15v-3.76Z" fill="#0056B3"/></svg>
diff --git a/src/core/components/components.module.ts b/src/core/components/components.module.ts
index 0bfb96dc3..2ab8a0a30 100644
--- a/src/core/components/components.module.ts
+++ b/src/core/components/components.module.ts
@@ -60,6 +60,7 @@ import { CoreSpacerComponent } from './spacer/spacer';
 import { CoreHorizontalScrollControlsComponent } from './horizontal-scroll-controls/horizontal-scroll-controls';
 import { CoreButtonWithSpinnerComponent } from './button-with-spinner/button-with-spinner';
 import { CoreSwipeSlidesComponent } from './swipe-slides/swipe-slides';
+import { CoreSwipeNavigationTourComponent } from './swipe-navigation-tour/swipe-navigation-tour';
 
 @NgModule({
     declarations: [
@@ -102,6 +103,7 @@ import { CoreSwipeSlidesComponent } from './swipe-slides/swipe-slides';
         CoreComboboxComponent,
         CoreSpacerComponent,
         CoreHorizontalScrollControlsComponent,
+        CoreSwipeNavigationTourComponent,
     ],
     imports: [
         CommonModule,
@@ -151,6 +153,7 @@ import { CoreSwipeSlidesComponent } from './swipe-slides/swipe-slides';
         CoreComboboxComponent,
         CoreSpacerComponent,
         CoreHorizontalScrollControlsComponent,
+        CoreSwipeNavigationTourComponent,
     ],
 })
 export class CoreComponentsModule {}
diff --git a/src/core/components/swipe-navigation-tour/core-swipe-navigation-tour.html b/src/core/components/swipe-navigation-tour/core-swipe-navigation-tour.html
new file mode 100644
index 000000000..e8b94a568
--- /dev/null
+++ b/src/core/components/swipe-navigation-tour/core-swipe-navigation-tour.html
@@ -0,0 +1,5 @@
+<img src="assets/img/user-tours/swipe-navigation.svg" alt="" />
+<p>{{ 'core.swipenavigationtourdescription' | translate }}</p>
+<ion-button (click)="dismiss()" expand="block">
+    {{ 'core.endonesteptour' | translate }}
+</ion-button>
diff --git a/src/core/components/swipe-navigation-tour/swipe-navigation-tour.scss b/src/core/components/swipe-navigation-tour/swipe-navigation-tour.scss
new file mode 100644
index 000000000..f71e25d12
--- /dev/null
+++ b/src/core/components/swipe-navigation-tour/swipe-navigation-tour.scss
@@ -0,0 +1,12 @@
+:host {
+    max-width: 85vw;
+
+    img {
+        max-width: 300px;
+    }
+
+    p {
+        text-align: center;
+    }
+
+}
diff --git a/src/core/components/swipe-navigation-tour/swipe-navigation-tour.ts b/src/core/components/swipe-navigation-tour/swipe-navigation-tour.ts
new file mode 100644
index 000000000..fb5c59085
--- /dev/null
+++ b/src/core/components/swipe-navigation-tour/swipe-navigation-tour.ts
@@ -0,0 +1,35 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreUserTours } from '@features/usertours/services/user-tours';
+
+/**
+ * Component showing the User Tour for the Swipe Navigation feature.
+ */
+@Component({
+    selector: 'core-swipe-navigation-tour',
+    templateUrl: 'core-swipe-navigation-tour.html',
+    styleUrls: ['swipe-navigation-tour.scss'],
+})
+export class CoreSwipeNavigationTourComponent {
+
+    /**
+     * Dismiss User Tour.
+     */
+    async dismiss(): Promise<void> {
+        await CoreUserTours.dismiss();
+    }
+
+}
diff --git a/src/core/directives/swipe-navigation.ts b/src/core/directives/swipe-navigation.ts
index a90ae68b9..081a7a85f 100644
--- a/src/core/directives/swipe-navigation.ts
+++ b/src/core/directives/swipe-navigation.ts
@@ -14,6 +14,8 @@
 
 import {  AfterViewInit, Directive, ElementRef, Input, OnDestroy } from '@angular/core';
 import { CoreSwipeNavigationItemsManager } from '@classes/items-management/swipe-navigation-items-manager';
+import { CoreSwipeNavigationTourComponent } from '@components/swipe-navigation-tour/swipe-navigation-tour';
+import { CoreUserTours } from '@features/usertours/services/user-tours';
 import { Gesture, GestureDetail } from '@ionic/angular';
 import { CoreScreen } from '@services/screen';
 import { GestureController, Platform } from '@singletons';
@@ -50,7 +52,8 @@ export class CoreSwipeNavigationDirective implements AfterViewInit, OnDestroy {
     /**
      * @inheritdoc
      */
-    ngAfterViewInit(): void {
+    async ngAfterViewInit(): Promise<void> {
+        // Set up gesture listener
         const style = this.element.style;
         this.swipeGesture = GestureController.create({
             el: this.element,
@@ -71,6 +74,26 @@ export class CoreSwipeNavigationDirective implements AfterViewInit, OnDestroy {
             },
         });
         this.swipeGesture.enable();
+
+        // Show user tour.
+        const source = this.manager?.getSource();
+
+        if (!source) {
+            return;
+        }
+
+        await source.waitForLoaded();
+
+        const items = source.getItems() ?? [];
+
+        if (items.length < 2) {
+            return;
+        }
+
+        await CoreUserTours.showIfPending({
+            id: 'swipe-navigation',
+            component: CoreSwipeNavigationTourComponent,
+        });
     }
 
     /**
diff --git a/src/core/lang.json b/src/core/lang.json
index 02ef670c7..8dd623b4e 100644
--- a/src/core/lang.json
+++ b/src/core/lang.json
@@ -302,6 +302,7 @@
     "submit": "Submit",
     "success": "Success",
     "summary": "Summary",
+    "swipenavigationtourdescription": "Swipe left and right to navigate around.",
     "tablet": "Tablet",
     "teachers": "Teachers",
     "thereisdatatosync": "There are offline {{$a}} to be synchronised.",

From 0a24df0f28d6b57a0bcfb9c043ced0fe7ba3a117 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 8 Mar 2022 18:12:33 +0100
Subject: [PATCH 0703/1008] MOBILE-3153 usertours: Disable from config

---
 src/core/features/usertours/services/user-tours.ts | 5 +++++
 src/types/config.d.ts                              | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/src/core/features/usertours/services/user-tours.ts b/src/core/features/usertours/services/user-tours.ts
index ed328b406..ff42e12f1 100644
--- a/src/core/features/usertours/services/user-tours.ts
+++ b/src/core/features/usertours/services/user-tours.ts
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { CoreConstants } from '@/core/constants';
 import { asyncInstance } from '@/core/utils/async-instance';
 import { Injectable } from '@angular/core';
 import { CoreDatabaseTable } from '@classes/database/database-table';
@@ -60,6 +61,10 @@ export class CoreUserToursService {
      * @returns Whether the User Tour is pending or not.
      */
     async isPending(id: string): Promise<boolean> {
+        if (CoreConstants.CONFIG.disableUserTours || CoreConstants.CONFIG.disabledUserTours?.includes(id)) {
+            return false;
+        }
+
         const isAcknowledged = await this.table.hasAnyByPrimaryKey({ id });
 
         return !isAcknowledged;
diff --git a/src/types/config.d.ts b/src/types/config.d.ts
index ef01af18a..024c0dfb7 100644
--- a/src/types/config.d.ts
+++ b/src/types/config.d.ts
@@ -34,6 +34,8 @@ export interface EnvironmentConfig {
     languages: Record<string, string>;
     databaseOptimizations?: Partial<CoreDatabaseConfiguration>;
     databaseTableOptimizations?: Record<string, Partial<CoreDatabaseConfiguration>>;
+    disableUserTours?: boolean;
+    disabledUserTours?: string[];
     wsservice: string;
     demo_sites: Record<string, CoreSitesDemoSiteData>;
     zoomlevels: Record<CoreZoomLevel, number>;

From b69e2ac8b7f892e119001954508aeedfc8145ff1 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 9 Mar 2022 09:53:12 +0100
Subject: [PATCH 0704/1008] MOBILE-3833 core: Add collapsible header listeners

---
 src/core/directives/collapsible-header.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts
index 0c74b1a39..3b26e56a1 100644
--- a/src/core/directives/collapsible-header.ts
+++ b/src/core/directives/collapsible-header.ts
@@ -190,6 +190,9 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
             };
 
             this.subscriptions.push(outlet.activateEvents.subscribe(onOutletUpdated));
+            this.subscriptions.push(outlet.activateEvents.subscribe(onOutletUpdated));
+
+            onOutletUpdated();
 
             onOutletUpdated();
 
@@ -311,6 +314,10 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
      * @param content Content element.
      */
     protected updateContent(content?: HTMLIonContentElement | null): void {
+        if (content === (this.content ?? null)) {
+            return;
+        }
+
         if (this.content) {
             if (this.contentScrollListener) {
                 this.content.removeEventListener('ionScroll', this.contentScrollListener);
@@ -321,6 +328,7 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
                 this.content.removeEventListener('ionScrollEnd', this.endContentScrollListener);
                 delete this.endContentScrollListener;
             }
+
             delete this.content;
         }
 

From 2103ad0c665d2e00a519554aa919afe2919a741c Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 9 Mar 2022 11:21:00 +0100
Subject: [PATCH 0705/1008] MOBILE-3153 lang: Remove placeholders from strings

This is necessary because we started using strings with placeholders that the app doesn't interpret, in particular the ones in user tours: https://github.com/moodle/moodle/blob/7ff6b2daef613b5c1ee73fa25b394288a82f6d4e/admin%2Ftool%2Fusertours%2Flang%2Fen%2Ftool_usertours.php#L274
---
 scripts/lang_functions.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/lang_functions.php b/scripts/lang_functions.php
index 38bd83b72..a6698560c 100644
--- a/scripts/lang_functions.php
+++ b/scripts/lang_functions.php
@@ -257,6 +257,7 @@ function build_lang($lang, $keys) {
             $text = str_replace('$a->', '$a.', $text);
             $text = str_replace('{$a', '{{$a', $text);
             $text = str_replace('}', '}}', $text);
+            $text = preg_replace('/@@.+?@@(<br>)?\\s*/', '', $text);
             // Prevent double.
             $text = str_replace(array('{{{', '}}}'), array('{{', '}}'), $text);
         } else {

From 09d9fab2bbe77f280b972d510876a7f62b7dc9e6 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 9 Mar 2022 15:59:56 +0100
Subject: [PATCH 0706/1008] MOBILE-3833 core: Add cookie to force logs

---
 src/core/services/config.ts      |  6 ++--
 src/core/services/db.ts          |  4 +--
 src/core/services/utils/utils.ts | 28 -------------------
 src/core/singletons/browser.ts   | 48 ++++++++++++++++++++++++++++++++
 src/core/singletons/logger.ts    |  6 +++-
 5 files changed, 58 insertions(+), 34 deletions(-)
 create mode 100644 src/core/singletons/browser.ts

diff --git a/src/core/services/config.ts b/src/core/services/config.ts
index a76ec716b..012e7c7bd 100644
--- a/src/core/services/config.ts
+++ b/src/core/services/config.ts
@@ -23,7 +23,7 @@ import { CoreEvents } from '@singletons/events';
 import { CoreDatabaseTable } from '@classes/database/database-table';
 import { asyncInstance } from '../utils/async-instance';
 import { CorePromisedValue } from '@classes/promised-value';
-import { CoreUtils } from './utils/utils';
+import { CoreBrowser } from '@singletons/browser';
 
 declare module '@singletons/events' {
 
@@ -195,11 +195,11 @@ export class CoreConfigProvider {
      * Load development config overrides.
      */
     protected loadDevelopmentConfig(): void {
-        if (!CoreConstants.enableDevTools() || !CoreUtils.hasCookie('MoodleAppConfig')) {
+        if (!CoreConstants.enableDevTools() || !CoreBrowser.hasCookie('MoodleAppConfig')) {
             return;
         }
 
-        this.patchEnvironment(JSON.parse(CoreUtils.getCookie('MoodleAppConfig') ?? '{}'));
+        this.patchEnvironment(JSON.parse(CoreBrowser.getCookie('MoodleAppConfig') ?? '{}'));
     }
 
     /**
diff --git a/src/core/services/db.ts b/src/core/services/db.ts
index de01fd469..26721e2a7 100644
--- a/src/core/services/db.ts
+++ b/src/core/services/db.ts
@@ -16,9 +16,9 @@ import { Injectable } from '@angular/core';
 
 import { SQLiteDB } from '@classes/sqlitedb';
 import { SQLiteDBMock } from '@features/emulator/classes/sqlitedb';
+import { CoreBrowser } from '@singletons/browser';
 import { makeSingleton, SQLite, Platform } from '@singletons';
 import { CoreAppProvider } from './app';
-import { CoreUtils } from './utils/utils';
 
 /**
  * This service allows interacting with the local database to store and retrieve data.
@@ -36,7 +36,7 @@ export class CoreDbProvider {
      * @returns Whether queries should be logged.
      */
     loggingEnabled(): boolean {
-        return CoreUtils.hasCookie('MoodleAppDBLoggingEnabled') || CoreAppProvider.isAutomated();
+        return CoreBrowser.hasCookie('MoodleAppDBLoggingEnabled') || CoreAppProvider.isAutomated();
     }
 
     /**
diff --git a/src/core/services/utils/utils.ts b/src/core/services/utils/utils.ts
index 08150ed3f..ef080cc23 100644
--- a/src/core/services/utils/utils.ts
+++ b/src/core/services/utils/utils.ts
@@ -1765,34 +1765,6 @@ export class CoreUtilsProvider {
         return CoreApp.isIOS() && openFileAction == OpenFileAction.OPEN_WITH;
     }
 
-    /**
-     * Check whether the given cookie is set.
-     *
-     * @param name Cookie name.
-     * @returns Whether the cookie is set.
-     */
-    hasCookie(name: string): boolean {
-        return new RegExp(`(\\s|;|^)${name}=`).test(document.cookie ?? '');
-    }
-
-    /**
-     * Read a cookie.
-     *
-     * @param name Cookie name.
-     * @return Cookie value.
-     */
-    getCookie(name: string): string | null {
-        const cookies = (document.cookie ?? '').split(';').reduce((cookies, cookie) => {
-            const [name, value] = cookie.trim().split('=');
-
-            cookies[name] = value;
-
-            return cookies;
-        }, {});
-
-        return cookies[name] ?? null;
-    }
-
 }
 
 export const CoreUtils = makeSingleton(CoreUtilsProvider);
diff --git a/src/core/singletons/browser.ts b/src/core/singletons/browser.ts
new file mode 100644
index 000000000..9ba90176b
--- /dev/null
+++ b/src/core/singletons/browser.ts
@@ -0,0 +1,48 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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.
+
+/**
+ * Helpers to interact with Browser APIs.
+ */
+export class CoreBrowser {
+
+    /**
+     * Check whether the given cookie is set.
+     *
+     * @param name Cookie name.
+     * @returns Whether the cookie is set.
+     */
+    static hasCookie(name: string): boolean {
+        return new RegExp(`(\\s|;|^)${name}=`).test(document.cookie ?? '');
+    }
+
+    /**
+     * Read a cookie.
+     *
+     * @param name Cookie name.
+     * @return Cookie value.
+     */
+    static getCookie(name: string): string | null {
+        const cookies = (document.cookie ?? '').split(';').reduce((cookies, cookie) => {
+            const [name, value] = cookie.trim().split('=');
+
+            cookies[name] = value;
+
+            return cookies;
+        }, {});
+
+        return cookies[name] ?? null;
+    }
+
+}
diff --git a/src/core/singletons/logger.ts b/src/core/singletons/logger.ts
index be7209703..27c61fe23 100644
--- a/src/core/singletons/logger.ts
+++ b/src/core/singletons/logger.ts
@@ -17,6 +17,7 @@ import moment from 'moment';
 import { CoreConstants } from '@/core/constants';
 
 import { CoreTime } from './time';
+import { CoreBrowser } from '@singletons/browser';
 
 /**
  * Method to warn that logs are disabled, called only once.
@@ -67,7 +68,10 @@ export class CoreLogger {
      */
     static getInstance(className: string): CoreLogger {
         // Disable log on production and testing.
-        if (CoreConstants.BUILD.isProduction || CoreConstants.BUILD.isTesting) {
+        if (
+            !CoreBrowser.hasCookie('MoodleAppLoggingEnabled') &&
+            (CoreConstants.BUILD.isProduction || CoreConstants.BUILD.isTesting)
+        ) {
             if (CoreConstants.BUILD.isProduction) {
                 warnLogsDisabled();
             }

From faec9c4a8e44f2e74a36252170293514f5758b8e Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 15 Mar 2022 10:36:51 +0100
Subject: [PATCH 0707/1008] MOBILE-3833 config: Fix patching in tests

---
 src/core/constants.ts       |  1 +
 src/core/services/config.ts | 14 ++++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/core/constants.ts b/src/core/constants.ts
index 0fcd0ddd3..cabb5585f 100644
--- a/src/core/constants.ts
+++ b/src/core/constants.ts
@@ -153,6 +153,7 @@ export class CoreConstants {
     static enableDevTools(): boolean {
         // @todo [4.0] This is not the proper way to check for development tools, we should rely only on the BUILD variable.
         return this.BUILD.isDevelopment
+            || this.BUILD.isTesting
             || this.CONFIG.versionname.includes('-dev');
     }
 
diff --git a/src/core/services/config.ts b/src/core/services/config.ts
index 012e7c7bd..eb2221487 100644
--- a/src/core/services/config.ts
+++ b/src/core/services/config.ts
@@ -164,15 +164,21 @@ export class CoreConfigProvider {
      * Update config with the given values.
      *
      * @param config Config updates.
-     * @param reset Whether to reset environment before applying the patch.
+     * @param options Patching options.
+     *  - reset: Whether to reset environment before applying the patch.
+     *  - patchDefault: Whether to patch default values as well.
      */
-    patchEnvironment(config: Partial<EnvironmentConfig>, reset: boolean = false): void {
+    patchEnvironment(config: Partial<EnvironmentConfig>, options: Partial<{ reset: boolean; patchDefault: boolean }> = {}): void {
         this.defaultEnvironment = this.defaultEnvironment ?? { ...CoreConstants.CONFIG };
 
-        if (reset) {
+        if (options.reset) {
             this.resetEnvironmentSilently();
         }
 
+        if (options.patchDefault) {
+            Object.assign(this.defaultEnvironment, config);
+        }
+
         Object.assign(CoreConstants.CONFIG, config);
         CoreEvents.trigger(CoreConfigProvider.ENVIRONMENT_UPDATED, CoreConstants.CONFIG);
     }
@@ -199,7 +205,7 @@ export class CoreConfigProvider {
             return;
         }
 
-        this.patchEnvironment(JSON.parse(CoreBrowser.getCookie('MoodleAppConfig') ?? '{}'));
+        this.patchEnvironment(JSON.parse(CoreBrowser.getCookie('MoodleAppConfig') ?? '{}'), { patchDefault: true });
     }
 
     /**

From 994d1bb1493bed779ed73911dd49339aab7e7683 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 15 Mar 2022 10:38:10 +0100
Subject: [PATCH 0708/1008] MOBILE-3833 behat: Document performance config

---
 tests/behat/classes/performance_measure.php | 39 ++++++++++++++++++++-
 tests/behat/performance.feature             | 19 ++++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/tests/behat/classes/performance_measure.php b/tests/behat/classes/performance_measure.php
index 3348fba36..4e3c8ee7d 100644
--- a/tests/behat/classes/performance_measure.php
+++ b/tests/behat/classes/performance_measure.php
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+use Behat\Mink\Exception\DriverException;
+use Facebook\WebDriver\Exception\InvalidArgumentException;
 use Moodle\BehatExtension\Driver\WebDriver;
 
 /**
@@ -268,7 +270,7 @@ class performance_measure implements behat_app_listener {
         $scripting = 0;
         $styling = 0;
         $networking = 0;
-        $logs = $this->driver->getWebDriver()->manage()->getLog('performance');
+        $logs = $this->getPerformanceLogs();
 
         foreach ($logs as $log) {
             // TODO this should filter by end time as well, but it seems like the timestamps are not
@@ -304,4 +306,39 @@ class performance_measure implements behat_app_listener {
         $this->networking = $networking;
     }
 
+    /**
+     * Get performance logs.
+     *
+     * @return array Performance logs.
+     */
+    private function getPerformanceLogs(): array {
+        try {
+            return $this->driver->getWebDriver()->manage()->getLog('performance');
+        } catch (InvalidArgumentException $e) {
+            throw new DriverException(
+                implode("\n", [
+                    "It wasn't possible to get performance logs, make sure that you have configured the following capabilities:",
+                    "",
+                    "\$CFG->behat_profiles = [",
+                    "    'default' => [",
+                    "        'browser' => 'chrome',",
+                    "        'wd_host' => 'http://selenium:4444/wd/hub',",
+                    "        'capabilities' => [",
+                    "            'extra_capabilities' => [",
+                    "                'goog:loggingPrefs' => ['performance' => 'ALL'],",
+                    "                'chromeOptions' => [",
+                    "                    'perfLoggingPrefs' => [",
+                    "                        'traceCategories' => 'devtools.timeline',",
+                    "                    ],",
+                    "                ],",
+                    "            ],",
+                    "        ],",
+                    "    ],",
+                    ");",
+                    "",
+                ])
+            );
+        }
+    }
+
 }
diff --git a/tests/behat/performance.feature b/tests/behat/performance.feature
index f90a81ce9..39a41c5d1 100644
--- a/tests/behat/performance.feature
+++ b/tests/behat/performance.feature
@@ -1,6 +1,25 @@
 @app @javascript @performance
 Feature: Measure performance.
 
+  # In order to run performance tests, you need to add the following capabilities to your Behat configuration:
+  #
+  # $CFG->behat_profiles = [
+  #     'default' => [
+  #         'browser' => 'chrome',
+  #         'wd_host' => 'http://selenium:4444/wd/hub',
+  #         'capabilities' => [
+  #             'extra_capabilities' => [
+  #                 'goog:loggingPrefs' => ['performance' => 'ALL'],
+  #                 'chromeOptions' => [
+  #                     'perfLoggingPrefs' => [
+  #                         'traceCategories' => 'devtools.timeline',
+  #                     ],
+  #                 ],
+  #             ],
+  #         ],
+  #     ],
+  # ];
+
   Background:
     Given the following "users" exist:
       | username |

From 66ef17eff949b97c161e853812130ed44c849cbd Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 15 Mar 2022 08:16:19 +0100
Subject: [PATCH 0709/1008] MOBILE-3833 course: Don't automatically change
 section in all sections

---
 .../features/course/components/course-format/course-format.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/features/course/components/course-format/course-format.ts b/src/core/features/course/components/course-format/course-format.ts
index ee933d3c3..c43830b42 100644
--- a/src/core/features/course/components/course-format/course-format.ts
+++ b/src/core/features/course/components/course-format/course-format.ts
@@ -153,7 +153,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
             if (!this.lastModuleViewed || data.timeaccess > this.lastModuleViewed.timeaccess) {
                 this.lastModuleViewed = data;
 
-                if (this.selectedSection) {
+                if (this.selectedSection && this.selectedSection.id !== this.allSectionsId) {
                     // Change section to display the one with the last viewed module
                     const lastViewedSection = this.getViewedModuleSection(this.sections, data);
                     if (lastViewedSection && lastViewedSection.id !== this.selectedSection?.id) {

From bcb5d937ee0829233f55a5e32294eb68f850a574 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 14 Mar 2022 13:09:41 +0100
Subject: [PATCH 0710/1008] MOBILE-3814 collapsible: Listen to resize to
 recalculate size

---
 .../ddimageortext/classes/ddimageortext.ts    | 12 ++--
 src/addons/qtype/ddmarker/classes/ddmarker.ts | 12 ++--
 src/addons/qtype/ddwtos/classes/ddwtos.ts     | 14 ++---
 src/core/classes/tabs.ts                      | 37 +++++++------
 src/core/directives/collapsible-footer.ts     | 46 ++++++++++------
 src/core/directives/collapsible-header.ts     | 33 ++++++++---
 src/core/directives/collapsible-item.ts       | 19 ++++++-
 src/core/features/mainmenu/pages/menu/menu.ts | 10 ++--
 src/core/features/mainmenu/pages/more/more.ts |  8 ++-
 src/core/services/utils/dom.ts                | 23 ++++++++
 src/theme/components/collapsible-header.scss  |  9 ++-
 src/theme/theme.base.scss                     | 55 ++++++++++---------
 src/theme/theme.light.scss                    |  1 -
 13 files changed, 178 insertions(+), 101 deletions(-)

diff --git a/src/addons/qtype/ddimageortext/classes/ddimageortext.ts b/src/addons/qtype/ddimageortext/classes/ddimageortext.ts
index 8a9f75b64..5fd0cc61b 100644
--- a/src/addons/qtype/ddimageortext/classes/ddimageortext.ts
+++ b/src/addons/qtype/ddimageortext/classes/ddimageortext.ts
@@ -14,6 +14,7 @@
 
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
+import { CoreEventObserver } from '@singletons/events';
 import { CoreLogger } from '@singletons/logger';
 import { AddonModQuizDdImageOrTextQuestionData } from '../component/ddimageortext';
 
@@ -28,7 +29,7 @@ export class AddonQtypeDdImageOrTextQuestion {
     protected afterImageLoadDone = false;
     protected proportion = 1;
     protected selected?: HTMLElement | null; // Selected element (being "dragged").
-    protected resizeFunction?: (ev?: Event) => void;
+    protected resizeListener?: CoreEventObserver;
 
     /**
      * Create the this.
@@ -174,9 +175,7 @@ export class AddonQtypeDdImageOrTextQuestion {
     destroy(): void {
         this.stopPolling();
 
-        if (this.resizeFunction) {
-            window.removeEventListener('resize', this.resizeFunction);
-        }
+        this.resizeListener?.off();
     }
 
     /**
@@ -360,8 +359,9 @@ export class AddonQtypeDdImageOrTextQuestion {
             this.pollForImageLoad();
         });
 
-        this.resizeFunction = this.windowResized.bind(this);
-        window.addEventListener('resize', this.resizeFunction!);
+        this.resizeListener = CoreDomUtils.onWindowResize(() => {
+            this.windowResized();
+        });
     }
 
     /**
diff --git a/src/addons/qtype/ddmarker/classes/ddmarker.ts b/src/addons/qtype/ddmarker/classes/ddmarker.ts
index 1e747e0de..a99b4387c 100644
--- a/src/addons/qtype/ddmarker/classes/ddmarker.ts
+++ b/src/addons/qtype/ddmarker/classes/ddmarker.ts
@@ -14,6 +14,7 @@
 
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTextUtils } from '@services/utils/text';
+import { CoreEventObserver } from '@singletons/events';
 import { CoreLogger } from '@singletons/logger';
 import { AddonQtypeDdMarkerQuestionData } from '../component/ddmarker';
 import { AddonQtypeDdMarkerGraphicsApi } from './graphics_api';
@@ -41,7 +42,7 @@ export class AddonQtypeDdMarkerQuestion {
     protected proportion = 1;
     protected selected?: HTMLElement; // Selected element (being "dragged").
     protected graphics: AddonQtypeDdMarkerGraphicsApi;
-    protected resizeFunction?: () => void;
+    protected resizeListener?: CoreEventObserver;
 
     doc!: AddonQtypeDdMarkerQuestionDocStructure;
     shapes: SVGElement[] = [];
@@ -160,9 +161,7 @@ export class AddonQtypeDdMarkerQuestion {
      * Function to call when the instance is no longer needed.
      */
     destroy(): void {
-        if (this.resizeFunction) {
-            window.removeEventListener('resize', this.resizeFunction);
-        }
+        this.resizeListener?.off();
     }
 
     /**
@@ -601,8 +600,9 @@ export class AddonQtypeDdMarkerQuestion {
             this.pollForImageLoad();
         });
 
-        this.resizeFunction = this.windowResized.bind(this);
-        window.addEventListener('resize', this.resizeFunction!);
+        this.resizeListener = CoreDomUtils.onWindowResize(() => {
+            this.windowResized();
+        });
     }
 
     /**
diff --git a/src/addons/qtype/ddwtos/classes/ddwtos.ts b/src/addons/qtype/ddwtos/classes/ddwtos.ts
index 7808cf602..9bb54147a 100644
--- a/src/addons/qtype/ddwtos/classes/ddwtos.ts
+++ b/src/addons/qtype/ddwtos/classes/ddwtos.ts
@@ -15,6 +15,7 @@
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreUtils } from '@services/utils/utils';
+import { CoreEventObserver } from '@singletons/events';
 import { CoreLogger } from '@singletons/logger';
 import { AddonModQuizDdwtosQuestionData } from '../component/ddwtos';
 
@@ -28,13 +29,11 @@ export class AddonQtypeDdwtosQuestion {
     protected selectors!: AddonQtypeDdwtosQuestionCSSSelectors; // Result of cssSelectors.
     protected placed: {[no: number]: number} = {}; // Map that relates drag elements numbers with drop zones numbers.
     protected selected?: HTMLElement; // Selected element (being "dragged").
-    protected resizeFunction?: () => void;
+    protected resizeListener?: CoreEventObserver;
 
     /**
      * Create the instance.
      *
-     * @param logger Logger provider.
-     * @param domUtils Dom Utils provider.
      * @param container The container HTMLElement of the question.
      * @param question The question instance.
      * @param readOnly Whether it's read only.
@@ -122,9 +121,7 @@ export class AddonQtypeDdwtosQuestion {
      * Function to call when the instance is no longer needed.
      */
     destroy(): void {
-        if (this.resizeFunction) {
-            window.removeEventListener('resize', this.resizeFunction);
-        }
+        this.resizeListener?.off();
     }
 
     /**
@@ -214,8 +211,9 @@ export class AddonQtypeDdwtosQuestion {
 
         this.positionDragItems();
 
-        this.resizeFunction = this.windowResized.bind(this);
-        window.addEventListener('resize', this.resizeFunction!);
+        this.resizeListener = CoreDomUtils.onWindowResize(() => {
+            this.windowResized();
+        });
     }
 
     /**
diff --git a/src/core/classes/tabs.ts b/src/core/classes/tabs.ts
index ca644c64e..bd4cf9efe 100644
--- a/src/core/classes/tabs.ts
+++ b/src/core/classes/tabs.ts
@@ -32,6 +32,8 @@ import { Subscription } from 'rxjs';
 import { Platform, Translate } from '@singletons';
 import { CoreSettingsHelper } from '@features/settings/services/settings-helper';
 import { CoreAriaRoleTab, CoreAriaRoleTabFindable } from './aria-role-tab';
+import { CoreEventObserver } from '@singletons/events';
+import { CoreDomUtils } from '@services/utils/dom';
 
 /**
  * Class to abstract some common code for tabs.
@@ -75,7 +77,7 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
     protected tabsElement?: HTMLElement; // The tabs parent element. It's the element that will be "scrolled" to hide tabs.
     protected tabBarElement?: HTMLIonTabBarElement; // The top tab bar element.
     protected tabsShown = true;
-    protected resizeFunction: EventListenerOrEventListenerObject;
+    protected resizeListener?: CoreEventObserver;
     protected isDestroyed = false;
     protected isCurrentView = true;
     protected shouldSlideToInitial = false; // Whether we need to slide to the initial slide because it's out of view.
@@ -99,7 +101,6 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
         protected element: ElementRef,
     ) {
         this.backButtonFunction = this.backButtonClicked.bind(this);
-        this.resizeFunction = this.windowResized.bind(this);
 
         this.tabAction = new CoreTabsRoleTab(this);
     }
@@ -134,7 +135,9 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
             await this.initializeTabs();
         }
 
-        window.addEventListener('resize', this.resizeFunction);
+        this.resizeListener = CoreDomUtils.onWindowResize(() => {
+            this.windowResized();
+        });
     }
 
     /**
@@ -419,24 +422,24 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
      */
     async slideNext(): Promise<void> {
         // Stop if slides are in transition.
-        if (!this.showNextButton || this.isInTransition) {
+        if (!this.showNextButton || this.isInTransition || !this.slides) {
             return;
         }
 
-        if (await this.slides!.isBeginning()) {
+        if (await this.slides.isBeginning()) {
             // Slide to the second page.
-            this.slides!.slideTo(this.maxSlides);
+            this.slides.slideTo(this.maxSlides);
         } else {
-            const currentIndex = await this.slides!.getActiveIndex();
+            const currentIndex = await this.slides.getActiveIndex();
             if (currentIndex !== undefined) {
                 const nextSlideIndex = currentIndex + this.maxSlides;
                 this.isInTransition = true;
                 if (nextSlideIndex < this.numTabsShown) {
                     // Slide to the next page.
-                    await this.slides!.slideTo(nextSlideIndex);
+                    await this.slides.slideTo(nextSlideIndex);
                 } else {
                     // Slide to the latest slide.
-                    await this.slides!.slideTo(this.numTabsShown - 1);
+                    await this.slides.slideTo(this.numTabsShown - 1);
                 }
             }
 
@@ -448,24 +451,24 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
      */
     async slidePrev(): Promise<void> {
         // Stop if slides are in transition.
-        if (!this.showPrevButton || this.isInTransition) {
+        if (!this.showPrevButton || this.isInTransition || !this.slides) {
             return;
         }
 
-        if (await this.slides!.isEnd()) {
-            this.slides!.slideTo(this.numTabsShown - this.maxSlides * 2);
+        if (await this.slides.isEnd()) {
+            this.slides.slideTo(this.numTabsShown - this.maxSlides * 2);
             // Slide to the previous of the latest page.
         } else {
-            const currentIndex = await this.slides!.getActiveIndex();
+            const currentIndex = await this.slides.getActiveIndex();
             if (currentIndex !== undefined) {
                 const prevSlideIndex = currentIndex - this.maxSlides;
                 this.isInTransition = true;
                 if (prevSlideIndex >= 0) {
                     // Slide to the previous page.
-                    await this.slides!.slideTo(prevSlideIndex);
+                    await this.slides.slideTo(prevSlideIndex);
                 } else {
                     // Slide to the first page.
-                    await this.slides!.slideTo(0);
+                    await this.slides.slideTo(0);
                 }
             }
         }
@@ -646,9 +649,7 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
     ngOnDestroy(): void {
         this.isDestroyed = true;
 
-        if (this.resizeFunction) {
-            window.removeEventListener('resize', this.resizeFunction);
-        }
+        this.resizeListener?.off();
         this.languageChangedSubscription?.unsubscribe();
     }
 
diff --git a/src/core/directives/collapsible-footer.ts b/src/core/directives/collapsible-footer.ts
index dc1e2c55a..601a12f5a 100644
--- a/src/core/directives/collapsible-footer.ts
+++ b/src/core/directives/collapsible-footer.ts
@@ -21,6 +21,7 @@ import { CoreComponentsRegistry } from '@singletons/components-registry';
 import { CoreFormatTextDirective } from './format-text';
 import { CoreEventObserver } from '@singletons/events';
 import { CoreLoadingComponent } from '@components/loading/loading';
+import { CoreDomUtils } from '@services/utils/dom';
 
 /**
  * Directive to make an element fixed at the bottom collapsible when scrolling.
@@ -37,7 +38,7 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
     @Input() appearOnBottom = false;
 
     protected element: HTMLElement;
-    protected initialHeight = 0;
+    protected initialHeight = 48;
     protected finalHeight = 0;
     protected initialPaddingBottom = '0px';
     protected previousTop = 0;
@@ -46,22 +47,38 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
     protected loadingChangedListener?: CoreEventObserver;
     protected contentScrollListener?: EventListener;
     protected endContentScrollListener?: EventListener;
+    protected resizeListener?: CoreEventObserver;
 
     constructor(el: ElementRef, protected ionContent: IonContent) {
         this.element = el.nativeElement;
         this.element.setAttribute('slot', 'fixed'); // Just in case somebody forgets to add it.
     }
 
+    /**
+     * @inheritdoc
+     */
+    async ngOnInit(): Promise<void> {
+        // Only if not present or explicitly falsy it will be false.
+        this.appearOnBottom = !CoreUtils.isFalseOrZero(this.appearOnBottom);
+
+        await CoreDomUtils.waitToBeInDOM(this.element);
+        await this.waitLoadingsDone();
+        await this.waitFormatTextsRendered(this.element);
+
+        await this.calculateHeight();
+
+        this.listenScrollEvents();
+    }
+
     /**
      * Calculate the height of the footer.
      */
     protected async calculateHeight(): Promise<void> {
-        await this.waitFormatTextsRendered(this.element);
-
+        this.element.classList.remove('is-active');
         await CoreUtils.nextTick();
 
         // Set a minimum height value.
-        this.initialHeight = this.element.getBoundingClientRect().height || 48;
+        this.initialHeight = this.element.getBoundingClientRect().height || this.initialHeight;
         const moduleNav = this.element.querySelector('core-course-module-navigation');
         if (moduleNav) {
             this.element.classList.add('has-module-nav');
@@ -71,6 +88,7 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
         this.previousHeight = this.initialHeight;
 
         this.content?.style.setProperty('--core-collapsible-footer-max-height', this.initialHeight + 'px');
+        this.element.classList.add('is-active');
 
         this.setBarHeight(this.initialHeight);
     }
@@ -131,6 +149,10 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
 
                 this.setBarHeight(newHeight);            }
         });
+
+        this.resizeListener = CoreDomUtils.onWindowResize(() => {
+            this.calculateHeight();
+        }, 50);
     }
 
     /**
@@ -180,20 +202,6 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
         this.previousHeight = height;
     }
 
-    /**
-     * @inheritdoc
-     */
-    async ngOnInit(): Promise<void> {
-        // Only if not present or explicitly falsy it will be false.
-        this.appearOnBottom = !CoreUtils.isFalseOrZero(this.appearOnBottom);
-
-        await this.waitLoadingsDone();
-
-        await this.calculateHeight();
-
-        this.listenScrollEvents();
-    }
-
     /**
      * Wait until all <core-loading> children inside the page.
      *
@@ -225,6 +233,8 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
         if (this.content && this.endContentScrollListener) {
             this.content.removeEventListener('ionScrollEnd', this.endContentScrollListener);
         }
+
+        this.resizeListener?.off();
     }
 
 }
diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts
index 3b26e56a1..867e73c14 100644
--- a/src/core/directives/collapsible-header.ts
+++ b/src/core/directives/collapsible-header.ts
@@ -17,8 +17,10 @@ import { CorePromisedValue } from '@classes/promised-value';
 import { CoreLoadingComponent } from '@components/loading/loading';
 import { CoreTabsOutletComponent } from '@components/tabs-outlet/tabs-outlet';
 import { ScrollDetail } from '@ionic/core';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
+import { CoreEventObserver } from '@singletons/events';
 import { CoreMath } from '@singletons/math';
 import { Subscription } from 'rxjs';
 import { CoreFormatTextDirective } from './format-text';
@@ -66,6 +68,7 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
     protected contentScrollListener?: EventListener;
     protected endContentScrollListener?: EventListener;
     protected pageDidEnterListener?: EventListener;
+    protected resizeListener?: CoreEventObserver;
     protected floatingTitle?: HTMLHeadingElement;
     protected scrollingHeight?: number;
     protected subscriptions: Subscription[] = [];
@@ -120,6 +123,8 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
         if (this.page && this.pageDidEnterListener) {
             this.page.removeEventListener('ionViewDidEnter', this.pageDidEnterListener);
         }
+
+        this.resizeListener?.off();
     }
 
     /**
@@ -147,6 +152,10 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
         const timeout = window.setTimeout(() => {
             this.enteredPromise.reject(new Error('[collapsible-header] Waiting for ionViewDidEnter timeout reached'));
         }, 5000);
+
+        this.resizeListener = CoreDomUtils.onWindowResize(() => {
+            this.initializeFloatingTitle();
+        }, 50);
     }
 
     /**
@@ -217,16 +226,26 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
             throw new Error('[collapsible-header] Couldn\'t create floating title');
         }
 
+        this.page.classList.remove('is-active');
+        CoreUtils.nextTick();
+
         // Add floating title and measure initial position.
         const collapsedHeaderTitle = this.collapsedHeader.querySelector('h1') as HTMLHeadingElement;
-        const originalTitle = this.expandedHeader.querySelector('h1') as HTMLHeadingElement;
-        const floatingTitleWrapper = originalTitle.parentElement as HTMLElement;
-        const floatingTitle = originalTitle.cloneNode(true) as HTMLHeadingElement;
+        const originalTitle = this.expandedHeader.querySelector('h1.collapsible-header-original-title') ||
+            this.expandedHeader.querySelector('h1') as HTMLHeadingElement;
 
-        originalTitle.classList.add('collapsible-header-original-title');
-        floatingTitle.classList.add('collapsible-header-floating-title');
-        floatingTitleWrapper.classList.add('collapsible-header-floating-title-wrapper');
-        floatingTitleWrapper.insertBefore(floatingTitle, originalTitle);
+        const floatingTitleWrapper = originalTitle.parentElement as HTMLElement;
+        let floatingTitle = floatingTitleWrapper.querySelector('.collapsible-header-floating-title') as HTMLHeadingElement;
+        if (!floatingTitle) {
+            // First time, create it.
+            floatingTitle = originalTitle.cloneNode(true) as HTMLHeadingElement;
+            floatingTitle.classList.add('collapsible-header-floating-title');
+
+            floatingTitleWrapper.classList.add('collapsible-header-floating-title-wrapper');
+            floatingTitleWrapper.insertBefore(floatingTitle, originalTitle);
+
+            originalTitle.classList.add('collapsible-header-original-title');
+        }
 
         const floatingTitleBoundingBox = floatingTitle.getBoundingClientRect();
 
diff --git a/src/core/directives/collapsible-item.ts b/src/core/directives/collapsible-item.ts
index 08cc6da18..fc1730cce 100644
--- a/src/core/directives/collapsible-item.ts
+++ b/src/core/directives/collapsible-item.ts
@@ -12,12 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Directive, ElementRef, Input, OnInit } from '@angular/core';
+import { Directive, ElementRef, Input, OnDestroy, OnInit } from '@angular/core';
 import { CoreLoadingComponent } from '@components/loading/loading';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
 import { Translate } from '@singletons';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
+import { CoreEventObserver } from '@singletons/events';
 import { CoreFormatTextDirective } from './format-text';
 
 const defaultMaxHeight = 80;
@@ -33,7 +34,7 @@ const minMaxHeight = 56;
 @Directive({
     selector: '[collapsible-item]',
 })
-export class CoreCollapsibleItemDirective implements OnInit {
+export class CoreCollapsibleItemDirective implements OnInit, OnDestroy {
 
     /**
      * Max height in pixels to render the content box. It should be 56 at least to make sense.
@@ -47,6 +48,7 @@ export class CoreCollapsibleItemDirective implements OnInit {
     protected expanded = false;
     protected maxHeight = defaultMaxHeight;
     protected expandedHeight = 0;
+    protected resizeListener?: CoreEventObserver;
 
     constructor(el: ElementRef<HTMLElement>) {
         this.element = el.nativeElement;
@@ -81,6 +83,10 @@ export class CoreCollapsibleItemDirective implements OnInit {
         await this.waitLoadingsDone();
 
         await this.calculateHeight();
+
+        this.resizeListener = CoreDomUtils.onWindowResize(() => {
+            this.calculateHeight();
+        }, 50);
     }
 
     /**
@@ -126,7 +132,7 @@ export class CoreCollapsibleItemDirective implements OnInit {
 
         await this.waitFormatTextsRendered(this.element);
 
-        this.expandedHeight = CoreDomUtils.getElementHeight(this.element) || 0;
+        this.expandedHeight = this.element.getBoundingClientRect().height;
 
         // Restore the max height now.
         this.element.classList.remove('collapsible-loading-height');
@@ -229,4 +235,11 @@ export class CoreCollapsibleItemDirective implements OnInit {
         this.toggleExpand();
     }
 
+    /**
+     * @inheritdoc
+     */
+    ngOnDestroy(): void {
+        this.resizeListener?.off();
+    }
+
 }
diff --git a/src/core/features/mainmenu/pages/menu/menu.ts b/src/core/features/mainmenu/pages/menu/menu.ts
index bda5d03dc..47275c179 100644
--- a/src/core/features/mainmenu/pages/menu/menu.ts
+++ b/src/core/features/mainmenu/pages/menu/menu.ts
@@ -29,6 +29,7 @@ import { filter } from 'rxjs/operators';
 import { NavigationEnd } from '@angular/router';
 import { trigger, state, style, transition, animate } from '@angular/animations';
 import { CoreSites } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
 
 /**
  * Page that displays the main menu of the app.
@@ -73,7 +74,7 @@ export class CoreMainMenuPage implements OnInit, OnDestroy {
     protected navSubscription?: Subscription;
     protected keyboardObserver?: CoreEventObserver;
     protected badgeUpdateObserver?: CoreEventObserver;
-    protected resizeFunction: () => void;
+    protected resizeListener?: CoreEventObserver;
     protected backButtonFunction: (event: BackButtonEvent) => void;
     protected selectHistory: string[] = [];
     protected firstSelectedTab?: string;
@@ -86,7 +87,6 @@ export class CoreMainMenuPage implements OnInit, OnDestroy {
     tabAction: CoreMainMenuRoleTab;
 
     constructor() {
-        this.resizeFunction = this.initHandlers.bind(this);
         this.backButtonFunction = this.backButtonClicked.bind(this);
         this.tabAction = new CoreMainMenuRoleTab(this);
 
@@ -122,7 +122,9 @@ export class CoreMainMenuPage implements OnInit, OnDestroy {
             }
         });
 
-        window.addEventListener('resize', this.resizeFunction);
+        this.resizeListener = CoreDomUtils.onWindowResize(() => {
+            this.initHandlers();
+        });
         document.addEventListener('ionBackButton', this.backButtonFunction);
 
         if (CoreApp.isIOS()) {
@@ -221,10 +223,10 @@ export class CoreMainMenuPage implements OnInit, OnDestroy {
     ngOnDestroy(): void {
         this.subscription?.unsubscribe();
         this.navSubscription?.unsubscribe();
-        window.removeEventListener('resize', this.resizeFunction);
         document.removeEventListener('ionBackButton', this.backButtonFunction);
         this.keyboardObserver?.off();
         this.badgeUpdateObserver?.off();
+        this.resizeListener?.off();
     }
 
     /**
diff --git a/src/core/features/mainmenu/pages/more/more.ts b/src/core/features/mainmenu/pages/more/more.ts
index 5a4f6d7b5..d3e91ebfa 100644
--- a/src/core/features/mainmenu/pages/more/more.ts
+++ b/src/core/features/mainmenu/pages/more/more.ts
@@ -26,6 +26,7 @@ import { CoreContentLinksHelper } from '@features/contentlinks/services/contentl
 import { CoreTextUtils } from '@services/utils/text';
 import { Translate } from '@singletons';
 import { CoreMainMenuDeepLinkManager } from '@features/mainmenu/classes/deep-link-manager';
+import { CoreDomUtils } from '@services/utils/dom';
 
 /**
  * Page that displays the more page of the app.
@@ -46,6 +47,7 @@ export class CoreMainMenuMorePage implements OnInit, OnDestroy {
     protected subscription!: Subscription;
     protected langObserver: CoreEventObserver;
     protected updateSiteObserver: CoreEventObserver;
+    protected resizeListener?: CoreEventObserver;
 
     constructor() {
         this.langObserver = CoreEvents.on(CoreEvents.LANGUAGE_CHANGED, this.loadCustomMenuItems.bind(this));
@@ -71,7 +73,9 @@ export class CoreMainMenuMorePage implements OnInit, OnDestroy {
             this.initHandlers();
         });
 
-        window.addEventListener('resize', this.initHandlers.bind(this));
+        this.resizeListener = CoreDomUtils.onWindowResize(() => {
+            this.initHandlers();
+        });
 
         const deepLinkManager = new CoreMainMenuDeepLinkManager();
         deepLinkManager.treatLink();
@@ -81,10 +85,10 @@ export class CoreMainMenuMorePage implements OnInit, OnDestroy {
      * @inheritdoc
      */
     ngOnDestroy(): void {
-        window.removeEventListener('resize', this.initHandlers.bind(this));
         this.langObserver?.off();
         this.updateSiteObserver?.off();
         this.subscription?.unsubscribe();
+        this.resizeListener?.off();
     }
 
     /**
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index 390fe0c53..c9c2aa227 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -53,6 +53,7 @@ import { NavigationStart } from '@angular/router';
 import { filter } from 'rxjs/operators';
 import { Subscription } from 'rxjs';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
+import { CoreEventObserver } from '@singletons/events';
 
 /*
  * "Utils" service with helper functions for UI, DOM elements and HTML code.
@@ -127,6 +128,28 @@ export class CoreDomUtilsProvider {
         });
     }
 
+    /**
+     * Window resize is widely checked and may have many performance issues, debouce usage is needed to avoid calling it too much.
+     * This function helps setting up the debounce feature and remove listener easily.
+     *
+     * @param resizeFunction Function to execute on resize.
+     * @param debounceDelay Debounce time in ms.
+     * @return Event observer to call off when finished.
+     */
+    onWindowResize(resizeFunction: (ev?: Event) => void, debounceDelay = 20): CoreEventObserver {
+        const resizeListener = CoreUtils.debounce((ev?: Event) => {
+            resizeFunction(ev);
+        }, debounceDelay);
+
+        window.addEventListener('resize', resizeListener);
+
+        return {
+            off: (): void => {
+                window.removeEventListener('resize', resizeListener);
+            },
+        };
+    }
+
     /**
      * Equivalent to element.closest(). If the browser doesn't support element.closest, it will
      * traverse the parents to achieve the same functionality.
diff --git a/src/theme/components/collapsible-header.scss b/src/theme/components/collapsible-header.scss
index c0650635a..a5bfd6a22 100644
--- a/src/theme/components/collapsible-header.scss
+++ b/src/theme/components/collapsible-header.scss
@@ -8,6 +8,7 @@
     --collapsible-header-floating-title-width: 0px;
     --collapsible-header-floating-title-x-delta: 0px;
     --collapsible-header-floating-title-width-delta: 0px;
+
     ion-header.core-header-shadow {
         --core-header-shadow: none;
     }
@@ -19,9 +20,8 @@
 
     .collapsible-header-floating-title {
         position: absolute;
-        top: var(--collapsible-header-floating-title-top);
-        left: var(--collapsible-header-floating-title-left);
-        transform: translateX(calc(var(--collapsible-header-floating-title-x-delta) * var(--collapsible-header-progress)));
+        top: 0;
+        left: 0;
         opacity: 0;
     }
 
@@ -52,6 +52,9 @@
 
             .collapsible-header-floating-title {
                 opacity: 1;
+                top: var(--collapsible-header-floating-title-top);
+                left: var(--collapsible-header-floating-title-left);
+                transform: translateX(calc(var(--collapsible-header-floating-title-x-delta) * var(--collapsible-header-progress)));
                 width: calc(var(--collapsible-header-floating-title-width) + var(--collapsible-header-progress) * var(--collapsible-header-floating-title-width-delta));
 
                 @include core-transition(width transform, 200ms, linear);
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 1396e9a71..250f07ba4 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -1421,37 +1421,42 @@ ion-grid.core-no-grid > ion-row {
 }
 
 [collapsible-footer] {
-    &.footer-collapsed {
-        --core-collapsible-footer-height: 0;
-        opacity: 0;
-    }
-    &.has-module-nav.footer-collapsed {
-        --core-collapsible-footer-height: auto;
-        opacity: 1;
-        core-course-module-navigation {
-            height: 0;
-            opacity: 0;
-            @include core-transition(all, 200ms);
-        }
-
-    }
-    &.footer-expanded {
-        --core-collapsible-footer-height: auto;
-    }
+    box-shadow: var(--drop-shadow-top, none);
+    width: 100%;
+    bottom: 0;
+    z-index: 3;
+    display: block;
+    background-color: var(--core-collapsible-footer-background);
 
     .ion-margin {
         margin-top: 8px;
         margin-bottom: 8px;
     }
 
-    box-shadow: var(--drop-shadow-top, none);
-    width: 100%;
-    bottom: 0;
-    z-index: 3;
-    height: var(--core-collapsible-footer-height, auto);
-    background-color: var(--core-collapsible-footer-background);
-    display: block;
-    @include core-transition(all, 200ms);
+    &.is-active {
+        height: var(--core-collapsible-footer-height, auto);
+        @include core-transition(all, 200ms);
+
+        &.footer-collapsed {
+            --core-collapsible-footer-height: 0;
+            opacity: 0;
+        }
+        &.has-module-nav.footer-collapsed {
+            --core-collapsible-footer-height: auto;
+            opacity: 1;
+            core-course-module-navigation {
+                height: 0;
+                opacity: 0;
+                @include core-transition(all, 200ms);
+            }
+
+        }
+        &.footer-expanded {
+            --core-collapsible-footer-height: auto;
+        }
+
+
+    }
 }
 
 .core-iframe-fullscreen [collapsible-footer] {
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index c19cac3bf..d736a833c 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -329,7 +329,6 @@
     --core-courseimage-on-course-size: 72px;
     --core-courseimage-radius: var(--medium-radius);
 
-    --core-collapsible-footer-height: 48px;
     --core-navigation-background: var(--contrast-background);
 
     --core-collapsible-footer-background: var(--contrast-background);

From 30d24f99e346da618b7882cf25a6ca64874a3380 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 14 Mar 2022 14:05:44 +0100
Subject: [PATCH 0711/1008] MOBILE-3814 chore: Deprecate getElementMeasure

---
 src/addons/mod/page/components/index/index.ts |   2 +-
 src/addons/qtype/ddmarker/classes/ddmarker.ts |  14 +-
 .../infinite-loading/infinite-loading.ts      |  26 +---
 src/core/directives/collapsible-footer.ts     |  10 +-
 src/core/directives/format-text.ts            |  59 ++++----
 .../rich-text-editor/rich-text-editor.scss    |   2 +-
 .../rich-text-editor/rich-text-editor.ts      | 136 +++++++-----------
 src/core/services/utils/dom.ts                |  10 +-
 8 files changed, 110 insertions(+), 149 deletions(-)

diff --git a/src/addons/mod/page/components/index/index.ts b/src/addons/mod/page/components/index/index.ts
index bbcac903a..dd9dc2ff7 100644
--- a/src/addons/mod/page/components/index/index.ts
+++ b/src/addons/mod/page/components/index/index.ts
@@ -33,7 +33,7 @@ export class AddonModPageIndexComponent extends CoreCourseModuleMainResourceComp
 
     component = AddonModPageProvider.COMPONENT;
     contents?: string;
-    displayDescription = true;
+    displayDescription = false;
     displayTimemodified = true;
     timemodified?: number;
     page?: AddonModPagePage;
diff --git a/src/addons/qtype/ddmarker/classes/ddmarker.ts b/src/addons/qtype/ddmarker/classes/ddmarker.ts
index a99b4387c..e1a1ddc06 100644
--- a/src/addons/qtype/ddmarker/classes/ddmarker.ts
+++ b/src/addons/qtype/ddmarker/classes/ddmarker.ts
@@ -272,8 +272,18 @@ export class AddonQtypeDdMarkerQuestion {
             return;
         }
 
-        const width = CoreDomUtils.getElementMeasure(markerSpan, true, true, false, true);
-        const height = CoreDomUtils.getElementMeasure(markerSpan, false, true, false, true);
+        const computedStyle = getComputedStyle(markerSpan);
+        const width = markerSpan.getBoundingClientRect().width +
+            CoreDomUtils.getComputedStyleMeasure(computedStyle, 'borderLeftWidth') +
+            CoreDomUtils.getComputedStyleMeasure(computedStyle, 'borderRightWidth') +
+            CoreDomUtils.getComputedStyleMeasure(computedStyle, 'paddingLeft') +
+            CoreDomUtils.getComputedStyleMeasure(computedStyle, 'paddingRight');
+
+        const height =  markerSpan.getBoundingClientRect().height +
+            CoreDomUtils.getComputedStyleMeasure(computedStyle, 'borderTopWidth') +
+            CoreDomUtils.getComputedStyleMeasure(computedStyle, 'borderBottomWidth') +
+            CoreDomUtils.getComputedStyleMeasure(computedStyle, 'paddingTop') +
+            CoreDomUtils.getComputedStyleMeasure(computedStyle, 'paddingBottom');
         markerSpan.style.opacity = '0.6';
         markerSpan.style.left = (xyForText.x - (width / 2)) + 'px';
         markerSpan.style.top = (xyForText.y - (height / 2)) + 'px';
diff --git a/src/core/components/infinite-loading/infinite-loading.ts b/src/core/components/infinite-loading/infinite-loading.ts
index 33eb9d81b..370c2473a 100644
--- a/src/core/components/infinite-loading/infinite-loading.ts
+++ b/src/core/components/infinite-loading/infinite-loading.ts
@@ -14,7 +14,6 @@
 
 import { Component, Input, Output, EventEmitter, OnChanges, SimpleChange, ViewChild, ElementRef } from '@angular/core';
 import { IonInfiniteScroll } from '@ionic/angular';
-import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
 
 const THRESHOLD = .15; // % of the scroll element height that must be close to the edge to consider loading more items necessary.
@@ -36,15 +35,12 @@ export class CoreInfiniteLoadingComponent implements OnChanges {
     @Input() position: 'top' | 'bottom' = 'bottom';
     @Output() action: EventEmitter<() => void>; // Will emit an event when triggered.
 
-    @ViewChild('topbutton') topButton?: ElementRef;
-    @ViewChild('bottombutton') bottomButton?: ElementRef;
-    @ViewChild('spinnercontainer') spinnerContainer?: ElementRef;
     @ViewChild(IonInfiniteScroll) infiniteScroll?: IonInfiniteScroll;
 
     loadingMore = false; // Hide button and avoid loading more.
     hostElement: HTMLElement;
 
-    constructor(protected element: ElementRef<HTMLElement>) {
+    constructor(element: ElementRef<HTMLElement>) {
         this.action = new EventEmitter();
         this.hostElement = element.nativeElement;
     }
@@ -142,11 +138,7 @@ export class CoreInfiniteLoadingComponent implements OnChanges {
      * @deprecated since 3.9.5
      */
     getHeight(): number {
-        return (this.position == 'top' ?
-            this.getElementHeight(this.topButton?.nativeElement) :
-            this.getElementHeight(this.bottomButton?.nativeElement)) +
-            this.getElementHeight(this.infiniteScrollElement) +
-            this.getElementHeight(this.spinnerContainer?.nativeElement);
+        return this.hostElement.getBoundingClientRect().height;
     }
 
     /**
@@ -158,18 +150,4 @@ export class CoreInfiniteLoadingComponent implements OnChanges {
         return this.hostElement.querySelector('ion-infinite-scroll');
     }
 
-    /**
-     * Get the height of an element.
-     *
-     * @param element Element ref.
-     * @return Height.
-     */
-    protected getElementHeight(element?: HTMLElement | null): number {
-        if (element) {
-            return CoreDomUtils.getElementHeight(element, true, true, true);
-        }
-
-        return 0;
-    }
-
 }
diff --git a/src/core/directives/collapsible-footer.ts b/src/core/directives/collapsible-footer.ts
index 601a12f5a..bc4505320 100644
--- a/src/core/directives/collapsible-footer.ts
+++ b/src/core/directives/collapsible-footer.ts
@@ -65,6 +65,8 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
         await this.waitLoadingsDone();
         await this.waitFormatTextsRendered(this.element);
 
+        this.content = this.element.closest('ion-content');
+
         await this.calculateHeight();
 
         this.listenScrollEvents();
@@ -97,13 +99,7 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
      * Setup scroll event listener.
      */
     protected async listenScrollEvents(): Promise<void> {
-        if (this.content) {
-            return;
-        }
-
-        this.content = this.element.closest('ion-content');
-
-        if (!this.content) {
+        if (!this.content || this.content?.classList.contains('has-collapsible-footer')) {
             return;
         }
 
diff --git a/src/core/directives/format-text.ts b/src/core/directives/format-text.ts
index a879c3c83..c5c041f4b 100644
--- a/src/core/directives/format-text.ts
+++ b/src/core/directives/format-text.ts
@@ -217,14 +217,14 @@ export class CoreFormatTextDirective implements OnChanges {
     /**
      * Add magnifying glass icons to view adapted images at full size.
      */
-    addMagnifyingGlasses(): void {
+    async addMagnifyingGlasses(): Promise<void> {
         const imgs = Array.from(this.contentSpan.querySelectorAll('.core-adapted-img-container > img'));
         if (!imgs.length) {
             return;
         }
 
         // If cannot calculate element's width, use viewport width to avoid false adapt image icons appearing.
-        const elWidth = this.getElementWidth(this.element) || window.innerWidth;
+        const elWidth = await this.getElementWidth();
 
         imgs.forEach((img: HTMLImageElement) => {
             // Skip image if it's inside a link.
@@ -543,41 +543,40 @@ export class CoreFormatTextDirective implements OnChanges {
     /**
      * Returns the element width in pixels.
      *
-     * @param element Element to get width from.
-     * @return The width of the element in pixels. When 0 is returned it means the element is not visible.
+     * @return The width of the element in pixels.
      */
-    protected getElementWidth(element: HTMLElement): number {
-        let width = CoreDomUtils.getElementWidth(element);
+    protected async getElementWidth(): Promise<number> {
+        await CoreUtils.ignoreErrors(CoreDomUtils.waitToBeInDOM(this.element));
 
+        let width = this.element.getBoundingClientRect().width;
         if (!width) {
             // All elements inside are floating or inline. Change display mode to allow calculate the width.
-            const parentWidth = element.parentElement ?
-                CoreDomUtils.getElementWidth(element.parentElement, true, false, false, true) : 0;
-            const previousDisplay = getComputedStyle(element, null).display;
+            const previousDisplay = getComputedStyle(this.element).display;
 
-            element.style.display = 'inline-block';
+            this.element.style.display = 'inline-block';
+            await CoreUtils.nextTick();
 
-            width = CoreDomUtils.getElementWidth(element);
+            width = this.element.getBoundingClientRect().width;
 
-            // If width is incorrectly calculated use parent width instead.
-            if (parentWidth > 0 && (!width || width > parentWidth)) {
-                width = parentWidth;
-            }
-
-            element.style.display = previousDisplay;
+            this.element.style.display = previousDisplay;
         }
 
-        return width;
-    }
+        // Aproximate using parent elements.
+        let element = this.element;
+        while (!width && element.parentElement) {
+            element = element.parentElement;
+            const computedStyle = getComputedStyle(element);
 
-    /**
-     * Returns the element height in pixels.
-     *
-     * @param elementAng Element to get height from.
-     * @return The height of the element in pixels. When 0 is returned it means the element is not visible.
-     */
-    protected getElementHeight(element: HTMLElement): number {
-        return CoreDomUtils.getElementHeight(element) || 0;
+            const padding = CoreDomUtils.getComputedStyleMeasure(computedStyle, 'paddingLeft') +
+                    CoreDomUtils.getComputedStyleMeasure(computedStyle, 'paddingRight');
+
+            // Use parent width as an aproximation.
+            width = element.getBoundingClientRect().width - padding;
+        }
+
+        return width > 0 && width < window.innerWidth
+            ? width
+            : window.innerWidth;
     }
 
     /**
@@ -701,10 +700,12 @@ export class CoreFormatTextDirective implements OnChanges {
                 let width: string | number;
                 let height: string | number;
 
+                await CoreDomUtils.waitToBeInDOM(iframe);
+
                 if (iframe.width) {
                     width = iframe.width;
                 } else {
-                    width = this.getElementWidth(iframe);
+                    width = iframe.getBoundingClientRect().width;
                     if (!width) {
                         width = window.innerWidth;
                     }
@@ -713,7 +714,7 @@ export class CoreFormatTextDirective implements OnChanges {
                 if (iframe.height) {
                     height = iframe.height;
                 } else {
-                    height = this.getElementHeight(iframe);
+                    height = iframe.getBoundingClientRect().height;
                     if (!height) {
                         height = width;
                     }
diff --git a/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss b/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss
index d869f7aae..d990a190e 100644
--- a/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss
+++ b/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss
@@ -16,7 +16,7 @@
 }
 
 :host {
-    height: 40vh;
+    height: var(--core-rte-height, auto);
     overflow: hidden;
     min-height: 200px; /* Just in case vh is not supported */
     min-height: 40vh;
diff --git a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
index 2b82866d7..2a4097c55 100644
--- a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
+++ b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
@@ -38,6 +38,8 @@ import { CoreUtils } from '@services/utils/utils';
 import { Platform, Translate } from '@singletons';
 import { CoreEventFormActionData, CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreEditorOffline } from '../../services/editor-offline';
+import { CoreComponentsRegistry } from '@singletons/components-registry';
+import { CoreLoadingComponent } from '@components/loading/loading';
 
 /**
  * Component to display a rich text editor if enabled.
@@ -101,7 +103,7 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
     protected resizeFunction?: () => Promise<number>;
     protected selectionChangeFunction?: () => void;
     protected languageChangedSubscription?: Subscription;
-    protected resizeObserver?: IntersectionObserver;
+    protected resizeListener?: CoreEventObserver;
 
     rteEnabled = false;
     isPhone = false;
@@ -140,14 +142,6 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
         this.contentChanged = new EventEmitter<string>();
         this.element = elementRef.nativeElement as HTMLDivElement;
         this.pageInstance = 'app_' + Date.now(); // Generate a "unique" ID based on timestamp.
-
-        if ('IntersectionObserver' in window) {
-            this.resizeObserver = new IntersectionObserver((observerEntry: IntersectionObserverEntry[]) => {
-                if (observerEntry[0].boundingClientRect.width > 0) {
-                    this.updateToolbarButtons();
-                }
-            });
-        }
     }
 
     /**
@@ -180,14 +174,9 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
         // Use paragraph on enter.
         document.execCommand('DefaultParagraphSeparator', false, 'p');
 
-        let i = 0;
-        this.initHeightInterval = window.setInterval(async () => {
-            const height = await this.maximizeEditorSize();
-            if (i >= 5 || height != 0) {
-                clearInterval(this.initHeightInterval);
-            }
-            i++;
-        }, 750);
+        await this.waitLoadingsDone();
+
+        this.maximizeEditorSize();
 
         this.setListeners();
         this.updateToolbarButtons();
@@ -256,14 +245,14 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
             );
         });
 
-        this.resizeFunction = this.windowResized.bind(this);
-        window.addEventListener('resize', this.resizeFunction!);
+        this.resizeListener = CoreDomUtils.onWindowResize(() => {
+            this.windowResized();
+        }, 50);
 
         // Start observing the target node for configured mutations
         this.resizeObserver?.observe(this.element);
 
-        this.selectionChangeFunction = this.updateToolbarStyles.bind(this);
-        document.addEventListener('selectionchange', this.selectionChangeFunction!);
+        document.addEventListener('selectionchange', this.selectionChangeFunction = this.updateToolbarStyles.bind(this));
 
         this.keyboardObserver = CoreEvents.on(CoreEvents.KEYBOARD_CHANGE, () => {
             // Opening or closing the keyboard also calls the resize function, but sometimes the resize is called too soon.
@@ -281,65 +270,57 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
 
     /**
      * Resize editor to maximize the space occupied.
-     *
-     * @return Resolved with calculated editor size.
      */
-    protected async maximizeEditorSize(): Promise<number> {
-        const contentVisibleHeight = await CoreDomUtils.getContentHeight(this.content);
-
-        if (contentVisibleHeight <= 0) {
-            return 0;
-        }
-
-        await CoreUtils.wait(100);
-
+    protected async maximizeEditorSize(): Promise<void> {
         // Editor is ready, adjust Height if needed.
-        const contentHeight = await CoreDomUtils.getContentHeight(this.content);
-        const height = contentHeight - this.getSurroundingHeight(this.element);
+        const blankHeight = await this.getBlankHeightInContent();
+        const newHeight = blankHeight + this.element.getBoundingClientRect().height;
 
-        if (height > this.minHeight) {
-            this.element.style.height = CoreDomUtils.formatPixelsSize(height - 1);
+        if (newHeight > this.minHeight) {
+            this.element.style.setProperty('--core-rte-height', (newHeight - 1)  + 'px');
         } else {
-            this.element.style.height = '';
+            this.element.style.removeProperty('--core-rte-height');
         }
-
-        return height;
     }
 
     /**
-     * Get the height of the surrounding elements from the current to the top element.
+     * Wait until all <core-loading> children inside the page.
      *
-     * @param element Directive DOM element to get surroundings elements from.
-     * @return Surrounding height in px.
+     * @return Promise resolved when loadings are done.
      */
-    protected getSurroundingHeight(element: HTMLElement): number {
-        let height = 0;
+    protected async waitLoadingsDone(): Promise<void> {
+        await CoreDomUtils.waitToBeInDOM(this.element);
 
-        while (element.parentElement?.tagName != 'ION-CONTENT') {
-            const parent = element.parentElement!;
-            if (element.tagName && element.tagName != 'CORE-LOADING') {
-                for (let x = 0; x < parent.children.length; x++) {
-                    const child = <HTMLElement> parent.children[x];
-                    if (child.tagName && child != element) {
-                        height += CoreDomUtils.getElementHeight(child, false, true, true);
-                    }
-                }
-            }
-            element = parent;
+        const page = this.element.closest('.ion-page');
+
+        await CoreComponentsRegistry.finishRenderingAllElementsInside<CoreLoadingComponent>(page, 'core-loading', 'whenLoaded');
+    }
+
+    /**
+     * Get the height of the space in blank at the end of the page.
+     *
+     * @return Blank height in px. Will be negative if no blank space.
+     */
+    protected async getBlankHeightInContent(): Promise<number> {
+        await CoreUtils.nextTicks(5); // Ensure content is completely loaded in the DOM.
+
+        let content: Element | null = this.element.closest('ion-content');
+        const contentHeight = await CoreDomUtils.getContentHeight(this.content);
+
+        // Get first children with content, not fixed.
+        let scrollContentHeight = 0;
+        while (scrollContentHeight == 0 && content?.children) {
+            const children = Array.from(content.children)
+                .filter((element) => element.slot !== 'fixed' && !element.classList.contains('core-loading-container'));
+
+            scrollContentHeight = children
+                .map((element) => element.getBoundingClientRect().height)
+                .reduce((a,b) => a + b, 0);
+
+            content = children[0];
         }
 
-        const computedStyle = getComputedStyle(element);
-        height += CoreDomUtils.getComputedStyleMeasure(computedStyle, 'paddingTop') +
-            CoreDomUtils.getComputedStyleMeasure(computedStyle, 'paddingBottom');
-
-        if (element.parentElement?.tagName == 'ION-CONTENT') {
-            const cs2 = getComputedStyle(element);
-
-            height -= CoreDomUtils.getComputedStyleMeasure(cs2, 'paddingTop') +
-                CoreDomUtils.getComputedStyleMeasure(cs2, 'paddingBottom');
-        }
-
-        return height;
+        return contentHeight - scrollContentHeight;
     }
 
     /**
@@ -625,7 +606,7 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
             this.editorElement.innerHTML = '<p></p>';
             this.textarea.value = '';
         } else {
-            this.editorElement.innerHTML = value!;
+            this.editorElement.innerHTML = value || '';
             this.textarea.value = value;
             this.treatExternalContent();
         }
@@ -759,10 +740,7 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
      * Show the toolbar.
      */
     showToolbar(event: Event): void {
-        if (!('IntersectionObserver' in window)) {
-            // Fallback if IntersectionObserver is not supported.
-            this.updateToolbarButtons();
-        }
+        this.updateToolbarButtons();
 
         this.element.classList.add('ion-touched');
         this.element.classList.remove('ion-untouched');
@@ -851,14 +829,9 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
 
         const length = await this.toolbarSlides.length();
 
-        const width = CoreDomUtils.getElementWidth(this.toolbar.nativeElement);
+        await CoreDomUtils.waitToBeInDOM(this.toolbar.nativeElement);
 
-        if (!width) {
-            // Width is not available yet, try later.
-            setTimeout(this.updateToolbarButtons.bind(this), 100);
-
-            return;
-        }
+        const width = this.toolbar.nativeElement.getBoundingClientRect().width;
 
         if (length > 0 && width > length * this.toolbarButtonWidth) {
             this.slidesOpts = { ...this.slidesOpts, slidesPerView: length };
@@ -1107,15 +1080,14 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
     ngOnDestroy(): void {
         this.valueChangeSubscription?.unsubscribe();
         this.languageChangedSubscription?.unsubscribe();
-        window.removeEventListener('resize', this.resizeFunction!);
-        document.removeEventListener('selectionchange', this.selectionChangeFunction!);
+        this.selectionChangeFunction && document.removeEventListener('selectionchange', this.selectionChangeFunction);
         clearInterval(this.initHeightInterval);
         clearInterval(this.autoSaveInterval);
         clearTimeout(this.hideMessageTimeout);
-        this.resizeObserver?.disconnect();
         this.resetObserver?.off();
         this.keyboardObserver?.off();
         this.labelObserver?.disconnect();
+        this.resizeListener?.off();
     }
 
 }
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index c9c2aa227..e02c40a90 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -111,8 +111,8 @@ export class CoreDomUtilsProvider {
         return new Promise((resolve, reject) => {
             // Disconnect observer for performance reasons.
             const timeout = window.setTimeout(() => {
-                reject(new Error('Waiting for DOM timeout reached'));
                 observer.disconnect();
+                reject(new Error('Waiting for DOM timeout reached'));
             }, 5000);
 
             const observer = new MutationObserver(() => {
@@ -454,6 +454,7 @@ export class CoreDomUtilsProvider {
      * @param useBorder Whether to use borders to calculate the measure.
      * @param innerMeasure If inner measure is needed: padding, margin or borders will be substracted.
      * @return Height in pixels.
+     * @deprecated since app 4.0 Use getBoundingClientRect.height instead.
      */
     getElementHeight(
         element: HTMLElement,
@@ -475,6 +476,7 @@ export class CoreDomUtilsProvider {
      * @param useBorder Whether to use borders to calculate the measure.
      * @param innerMeasure If inner measure is needed: padding, margin or borders will be substracted.
      * @return Measure in pixels.
+     * @deprecated since app 4.0 Use getBoundingClientRect.height or width instead.
      */
     getElementMeasure(
         element: HTMLElement,
@@ -547,6 +549,7 @@ export class CoreDomUtilsProvider {
      * @param useBorder Whether to use borders to calculate the measure.
      * @param innerMeasure If inner measure is needed: padding, margin or borders will be substracted.
      * @return Width in pixels.
+     * @deprecated since app 4.0 Use getBoundingClientRect.width instead.
      */
     getElementWidth(
         element: HTMLElement,
@@ -726,6 +729,7 @@ export class CoreDomUtilsProvider {
      *
      * @param findFunction The function used to find the element.
      * @return Resolved if found, rejected if too many tries.
+     * @deprecated since app 4.0 Use waitToBeInDOM instead.
      */
     waitElementToExist(findFunction: () => HTMLElement | null): Promise<HTMLElement> {
         const promiseInterval = CoreUtils.promiseDefer<HTMLElement>();
@@ -1077,7 +1081,7 @@ export class CoreDomUtilsProvider {
             const scrollElement = await content.getScrollElement();
 
             return scrollElement.clientHeight || 0;
-        } catch (error) {
+        } catch {
             return 0;
         }
     }
@@ -1093,7 +1097,7 @@ export class CoreDomUtilsProvider {
             const scrollElement = await content.getScrollElement();
 
             return scrollElement.scrollHeight || 0;
-        } catch (error) {
+        } catch {
             return 0;
         }
     }

From 23cfb29de06c6ce54830a3a2a117369bc7f8d3e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 14 Mar 2022 22:56:05 +0100
Subject: [PATCH 0712/1008] MOBILE-3814 chore: Add a disconnect method on
 waitToBeInDOM

---
 src/core/directives/collapsible-footer.ts     |  8 ++-
 src/core/directives/collapsible-item.ts       |  7 ++-
 src/core/directives/format-text.ts            | 17 +++++-
 .../rich-text-editor/rich-text-editor.ts      | 14 ++---
 src/core/services/utils/dom.ts                | 58 ++++++++++++-------
 src/core/singletons/events.ts                 | 15 +++++
 6 files changed, 84 insertions(+), 35 deletions(-)

diff --git a/src/core/directives/collapsible-footer.ts b/src/core/directives/collapsible-footer.ts
index bc4505320..cbd07969d 100644
--- a/src/core/directives/collapsible-footer.ts
+++ b/src/core/directives/collapsible-footer.ts
@@ -19,7 +19,7 @@ import { CoreUtils } from '@services/utils/utils';
 import { CoreMath } from '@singletons/math';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
 import { CoreFormatTextDirective } from './format-text';
-import { CoreEventObserver } from '@singletons/events';
+import { CoreEventObserver, CoreSingleTimeEventObserver } from '@singletons/events';
 import { CoreLoadingComponent } from '@components/loading/loading';
 import { CoreDomUtils } from '@services/utils/dom';
 
@@ -48,6 +48,7 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
     protected contentScrollListener?: EventListener;
     protected endContentScrollListener?: EventListener;
     protected resizeListener?: CoreEventObserver;
+    protected domListener?: CoreSingleTimeEventObserver;
 
     constructor(el: ElementRef, protected ionContent: IonContent) {
         this.element = el.nativeElement;
@@ -61,7 +62,9 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
         // Only if not present or explicitly falsy it will be false.
         this.appearOnBottom = !CoreUtils.isFalseOrZero(this.appearOnBottom);
 
-        await CoreDomUtils.waitToBeInDOM(this.element);
+        this.domListener = CoreDomUtils.waitToBeInDOM(this.element);
+        await this.domListener.promise;
+
         await this.waitLoadingsDone();
         await this.waitFormatTextsRendered(this.element);
 
@@ -231,6 +234,7 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
         }
 
         this.resizeListener?.off();
+        this.domListener?.off();
     }
 
 }
diff --git a/src/core/directives/collapsible-item.ts b/src/core/directives/collapsible-item.ts
index fc1730cce..d9ab8990e 100644
--- a/src/core/directives/collapsible-item.ts
+++ b/src/core/directives/collapsible-item.ts
@@ -18,7 +18,7 @@ import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
 import { Translate } from '@singletons';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
-import { CoreEventObserver } from '@singletons/events';
+import { CoreEventObserver, CoreSingleTimeEventObserver } from '@singletons/events';
 import { CoreFormatTextDirective } from './format-text';
 
 const defaultMaxHeight = 80;
@@ -49,6 +49,7 @@ export class CoreCollapsibleItemDirective implements OnInit, OnDestroy {
     protected maxHeight = defaultMaxHeight;
     protected expandedHeight = 0;
     protected resizeListener?: CoreEventObserver;
+    protected domListener?: CoreSingleTimeEventObserver;
 
     constructor(el: ElementRef<HTMLElement>) {
         this.element = el.nativeElement;
@@ -95,7 +96,8 @@ export class CoreCollapsibleItemDirective implements OnInit, OnDestroy {
      * @return Promise resolved when loadings are done.
      */
     protected async waitLoadingsDone(): Promise<void> {
-        await CoreDomUtils.waitToBeInDOM(this.element);
+        this.domListener = CoreDomUtils.waitToBeInDOM(this.element);
+        await this.domListener.promise;
 
         const page = this.element.closest('.ion-page');
 
@@ -240,6 +242,7 @@ export class CoreCollapsibleItemDirective implements OnInit, OnDestroy {
      */
     ngOnDestroy(): void {
         this.resizeListener?.off();
+        this.domListener?.off();
     }
 
 }
diff --git a/src/core/directives/format-text.ts b/src/core/directives/format-text.ts
index c5c041f4b..12dd1f0ed 100644
--- a/src/core/directives/format-text.ts
+++ b/src/core/directives/format-text.ts
@@ -23,6 +23,7 @@ import {
     Optional,
     ViewContainerRef,
     ViewChild,
+    OnDestroy,
 } from '@angular/core';
 import { IonContent } from '@ionic/angular';
 
@@ -41,6 +42,7 @@ import { CoreFilterHelper } from '@features/filter/services/filter-helper';
 import { CoreSubscriptions } from '@singletons/subscriptions';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
 import { CoreCollapsibleItemDirective } from './collapsible-item';
+import { CoreSingleTimeEventObserver } from '@singletons/events';
 
 /**
  * Directive to format text rendered. It renders the HTML and treats all links and media, using CoreLinkDirective
@@ -54,7 +56,7 @@ import { CoreCollapsibleItemDirective } from './collapsible-item';
 @Directive({
     selector: 'core-format-text',
 })
-export class CoreFormatTextDirective implements OnChanges {
+export class CoreFormatTextDirective implements OnChanges, OnDestroy {
 
     @ViewChild(CoreCollapsibleItemDirective) collapsible?: CoreCollapsibleItemDirective;
 
@@ -88,6 +90,7 @@ export class CoreFormatTextDirective implements OnChanges {
     protected element: HTMLElement;
     protected emptyText = '';
     protected contentSpan: HTMLElement;
+    protected domListener?: CoreSingleTimeEventObserver;
 
     constructor(
         element: ElementRef,
@@ -126,6 +129,13 @@ export class CoreFormatTextDirective implements OnChanges {
         }
     }
 
+    /**
+     * @inheritdoc
+     */
+    ngOnDestroy(): void {
+        this.domListener?.off();
+    }
+
     /**
      * Wait until the text is fully rendered.
      */
@@ -546,7 +556,8 @@ export class CoreFormatTextDirective implements OnChanges {
      * @return The width of the element in pixels.
      */
     protected async getElementWidth(): Promise<number> {
-        await CoreUtils.ignoreErrors(CoreDomUtils.waitToBeInDOM(this.element));
+        this.domListener = CoreDomUtils.waitToBeInDOM(this.element);
+        await this.domListener.promise;
 
         let width = this.element.getBoundingClientRect().width;
         if (!width) {
@@ -700,7 +711,7 @@ export class CoreFormatTextDirective implements OnChanges {
                 let width: string | number;
                 let height: string | number;
 
-                await CoreDomUtils.waitToBeInDOM(iframe);
+                await CoreDomUtils.waitToBeInDOM(iframe, 5000).promise;
 
                 if (iframe.width) {
                     width = iframe.width;
diff --git a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
index 2a4097c55..eb4010db4 100644
--- a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
+++ b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
@@ -36,7 +36,7 @@ import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUrlUtils } from '@services/utils/url';
 import { CoreUtils } from '@services/utils/utils';
 import { Platform, Translate } from '@singletons';
-import { CoreEventFormActionData, CoreEventObserver, CoreEvents } from '@singletons/events';
+import { CoreEventFormActionData, CoreEventObserver, CoreEvents, CoreSingleTimeEventObserver } from '@singletons/events';
 import { CoreEditorOffline } from '../../services/editor-offline';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
 import { CoreLoadingComponent } from '@components/loading/loading';
@@ -104,6 +104,7 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
     protected selectionChangeFunction?: () => void;
     protected languageChangedSubscription?: Subscription;
     protected resizeListener?: CoreEventObserver;
+    protected domListener?: CoreSingleTimeEventObserver;
 
     rteEnabled = false;
     isPhone = false;
@@ -249,9 +250,6 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
             this.windowResized();
         }, 50);
 
-        // Start observing the target node for configured mutations
-        this.resizeObserver?.observe(this.element);
-
         document.addEventListener('selectionchange', this.selectionChangeFunction = this.updateToolbarStyles.bind(this));
 
         this.keyboardObserver = CoreEvents.on(CoreEvents.KEYBOARD_CHANGE, () => {
@@ -289,7 +287,8 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
      * @return Promise resolved when loadings are done.
      */
     protected async waitLoadingsDone(): Promise<void> {
-        await CoreDomUtils.waitToBeInDOM(this.element);
+        this.domListener = CoreDomUtils.waitToBeInDOM(this.element);
+        await this.domListener.promise;
 
         const page = this.element.closest('.ion-page');
 
@@ -829,7 +828,7 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
 
         const length = await this.toolbarSlides.length();
 
-        await CoreDomUtils.waitToBeInDOM(this.toolbar.nativeElement);
+        await CoreDomUtils.waitToBeInDOM(this.toolbar.nativeElement, 5000).promise;
 
         const width = this.toolbar.nativeElement.getBoundingClientRect().width;
 
@@ -1075,7 +1074,7 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
     }
 
     /**
-     * Component being destroyed.
+     * @inheritdoc
      */
     ngOnDestroy(): void {
         this.valueChangeSubscription?.unsubscribe();
@@ -1088,6 +1087,7 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
         this.keyboardObserver?.off();
         this.labelObserver?.disconnect();
         this.resizeListener?.off();
+        this.domListener?.off();
     }
 
 }
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index e02c40a90..7b568abb8 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -53,7 +53,7 @@ import { NavigationStart } from '@angular/router';
 import { filter } from 'rxjs/operators';
 import { Subscription } from 'rxjs';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
-import { CoreEventObserver } from '@singletons/events';
+import { CoreEventObserver, CoreSingleTimeEventObserver } from '@singletons/events';
 
 /*
  * "Utils" service with helper functions for UI, DOM elements and HTML code.
@@ -96,36 +96,52 @@ export class CoreDomUtilsProvider {
      * Wait an element to be in dom of another element.
      *
      * @param element Element to wait.
-     * @return Promise resolved when added. It will be rejected after a timeout of 5s.
+     * @param timeout If defined, timeout to wait before rejecting the promise.
+     * @return Promise CoreSingleTimeEventObserver with a promise.
      */
-    async waitToBeInDOM(
+    waitToBeInDOM(
         element: Element,
-    ): Promise<void> {
+        timeout?: number,
+    ): CoreSingleTimeEventObserver {
         let root = element.getRootNode({ composed: true });
 
         if (root === document) {
             // Already in DOM.
-            return;
+            return {
+                off: (): void => {
+                    // Nothing to do here.
+                },
+                promise: Promise.resolve(),
+            };
         }
 
-        return new Promise((resolve, reject) => {
-            // Disconnect observer for performance reasons.
-            const timeout = window.setTimeout(() => {
-                observer.disconnect();
-                reject(new Error('Waiting for DOM timeout reached'));
-            }, 5000);
+        let observer: MutationObserver | undefined;
+        let observerTimeout: number | undefined;
+        if (timeout) {
+            observerTimeout = window.setTimeout(() => {
+                observer?.disconnect();
+                throw new Error('Waiting for DOM timeout reached');
+            }, timeout);
+        }
 
-            const observer = new MutationObserver(() => {
-                root = element.getRootNode({ composed: true });
-                if (root === document) {
-                    observer.disconnect();
-                    clearTimeout(timeout);
-                    resolve();
-                }
-            });
+        return {
+            off: (): void => {
+                observer?.disconnect();
+                clearTimeout(observerTimeout);
+            },
+            promise: new Promise((resolve) => {
+                observer = new MutationObserver(() => {
+                    root = element.getRootNode({ composed: true });
+                    if (root === document) {
+                        observer?.disconnect();
+                        clearTimeout(observerTimeout);
+                        resolve();
+                    }
+                });
 
-            observer.observe(document.body, { subtree: true, childList: true });
-        });
+                observer.observe(document.body, { subtree: true, childList: true });
+            }),
+        };
     }
 
     /**
diff --git a/src/core/singletons/events.ts b/src/core/singletons/events.ts
index 4045c8212..f69e0ea0a 100644
--- a/src/core/singletons/events.ts
+++ b/src/core/singletons/events.ts
@@ -31,6 +31,21 @@ export interface CoreEventObserver {
     off: () => void;
 }
 
+/**
+ * Observer instance to stop listening to an observer.
+ */
+export interface CoreSingleTimeEventObserver {
+    /**
+     * Stop the observer.
+     */
+    off: () => void;
+
+    /**
+     * Promise Resolved when event is done (first time).
+     */
+    promise: Promise<void>;
+}
+
 /**
  * Event payloads.
  */

From 0d01449393f3c6141ffaf6bde650cf6eb274850c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 14 Mar 2022 23:10:05 +0100
Subject: [PATCH 0713/1008] MOBILE-3814 chore: Use WaitToBeInDom on OnAppear
 directive

---
 src/core/directives/collapsible-header.ts |  3 ---
 src/core/directives/on-appear.ts          | 19 +++++++------------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts
index 867e73c14..af4aa4c2c 100644
--- a/src/core/directives/collapsible-header.ts
+++ b/src/core/directives/collapsible-header.ts
@@ -199,9 +199,6 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
             };
 
             this.subscriptions.push(outlet.activateEvents.subscribe(onOutletUpdated));
-            this.subscriptions.push(outlet.activateEvents.subscribe(onOutletUpdated));
-
-            onOutletUpdated();
 
             onOutletUpdated();
 
diff --git a/src/core/directives/on-appear.ts b/src/core/directives/on-appear.ts
index 52d7691b6..16519d58a 100644
--- a/src/core/directives/on-appear.ts
+++ b/src/core/directives/on-appear.ts
@@ -14,6 +14,7 @@
 
 import { Directive, ElementRef, EventEmitter, OnDestroy, OnInit, Output } from '@angular/core';
 import { CoreDomUtils } from '@services/utils/dom';
+import { CoreSingleTimeEventObserver } from '@singletons/events';
 
 /**
  * Directive to listen when an element becomes visible.
@@ -26,7 +27,7 @@ export class CoreOnAppearDirective implements OnInit, OnDestroy {
     @Output() onAppear = new EventEmitter();
 
     private element: HTMLElement;
-    private interval?: number;
+    protected domListener?: CoreSingleTimeEventObserver;
 
     constructor(element: ElementRef) {
         this.element = element.nativeElement;
@@ -35,24 +36,18 @@ export class CoreOnAppearDirective implements OnInit, OnDestroy {
     /**
      * @inheritdoc
      */
-    ngOnInit(): void {
-        this.interval = window.setInterval(() => {
-            if (!CoreDomUtils.isElementVisible(this.element)) {
-                return;
-            }
+    async ngOnInit(): Promise<void> {
+        this.domListener = CoreDomUtils.waitToBeInDOM(this.element);
+        await this.domListener.promise;
 
-            this.onAppear.emit();
-            window.clearInterval(this.interval);
-
-            delete this.interval;
-        }, 50);
+        this.onAppear.emit();
     }
 
     /**
      * @inheritdoc
      */
     ngOnDestroy(): void {
-        this.interval && window.clearInterval(this.interval);
+        this.domListener?.off();
     }
 
 }

From 39937e22526f18bb8ff56b742081a8d4d702fa97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 15 Mar 2022 10:13:21 +0100
Subject: [PATCH 0714/1008] MOBILE-3814 network: Improve network observable
 performance

---
 .../features/emulator/services/network.ts     | 35 +++++++++----------
 .../features/mainmenu/pages/menu/menu.scss    |  4 +--
 src/core/initializers/inject-ios-scripts.ts   |  2 +-
 3 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/core/features/emulator/services/network.ts b/src/core/features/emulator/services/network.ts
index 7b1f79222..cca7dab97 100644
--- a/src/core/features/emulator/services/network.ts
+++ b/src/core/features/emulator/services/network.ts
@@ -24,6 +24,9 @@ export class NetworkMock extends Network {
 
     type!: string;
 
+    protected connectObservable = new Subject<'connected'>();
+    protected disconnectObservable = new Subject<'disconnected'>();
+
     constructor() {
         super();
 
@@ -38,6 +41,14 @@ export class NetworkMock extends Network {
             CELL: 'cellular', // eslint-disable-line @typescript-eslint/naming-convention
             NONE: 'none', // eslint-disable-line @typescript-eslint/naming-convention
         };
+
+        window.addEventListener('online', () => {
+            this.connectObservable.next('connected');
+        }, false);
+
+        window.addEventListener('offline', () => {
+            this.disconnectObservable.next('disconnected');
+        }, false);
     }
 
     /**
@@ -45,8 +56,8 @@ export class NetworkMock extends Network {
      *
      * @return Observable.
      */
-    onchange(): Observable<unknown> {
-        return merge(this.onConnect(), this.onDisconnect());
+    onChange(): Observable<'connected' | 'disconnected'> {
+        return merge(this.connectObservable, this.disconnectObservable);
     }
 
     /**
@@ -54,14 +65,8 @@ export class NetworkMock extends Network {
      *
      * @return Observable.
      */
-    onConnect(): Observable<unknown> {
-        const observable = new Subject<unknown>();
-
-        window.addEventListener('online', (ev) => {
-            observable.next(ev);
-        }, false);
-
-        return observable;
+    onConnect(): Observable<'connected'> {
+        return this.connectObservable;
     }
 
     /**
@@ -69,14 +74,8 @@ export class NetworkMock extends Network {
      *
      * @return Observable.
      */
-    onDisconnect(): Observable<unknown> {
-        const observable = new Subject<unknown>();
-
-        window.addEventListener('offline', (ev) => {
-            observable.next(ev);
-        }, false);
-
-        return observable;
+    onDisconnect(): Observable<'disconnected'> {
+        return this.disconnectObservable;
     }
 
 }
diff --git a/src/core/features/mainmenu/pages/menu/menu.scss b/src/core/features/mainmenu/pages/menu/menu.scss
index 4f0ebd805..349a0fe15 100644
--- a/src/core/features/mainmenu/pages/menu/menu.scss
+++ b/src/core/features/mainmenu/pages/menu/menu.scss
@@ -168,11 +168,11 @@ ion-tabs.placement-side {
     opacity: .8;
     z-index: 12;
 
-    .core-online {
+    .core-online-message {
         display: var(--network-message-online);
     }
 
-    .core-offline {
+    .core-offline-message {
         display: var(--network-message-offline);
     }
 }
diff --git a/src/core/initializers/inject-ios-scripts.ts b/src/core/initializers/inject-ios-scripts.ts
index a1a728bb2..64b26993d 100644
--- a/src/core/initializers/inject-ios-scripts.ts
+++ b/src/core/initializers/inject-ios-scripts.ts
@@ -22,5 +22,5 @@ export default async function(): Promise<void> {
     }
 
     await Platform.ready();
-    await CoreIframeUtils.injectiOSScripts(window);
+    CoreIframeUtils.injectiOSScripts(window);
 }

From df1dba532ffa96a13a6f79098e281f31ac43cf08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 15 Mar 2022 10:36:45 +0100
Subject: [PATCH 0715/1008] MOBILE-3814 collapsible: Subscribe to dark mode
 change to color header

---
 src/core/directives/collapsible-header.ts     |  5 ++++
 .../settings/services/settings-helper.ts      | 30 ++++++++++++-------
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts
index af4aa4c2c..ba041f9ad 100644
--- a/src/core/directives/collapsible-header.ts
+++ b/src/core/directives/collapsible-header.ts
@@ -16,6 +16,7 @@ import { Directive, ElementRef, Input, OnChanges, OnDestroy, OnInit, SimpleChang
 import { CorePromisedValue } from '@classes/promised-value';
 import { CoreLoadingComponent } from '@components/loading/loading';
 import { CoreTabsOutletComponent } from '@components/tabs-outlet/tabs-outlet';
+import { CoreSettingsHelper } from '@features/settings/services/settings-helper';
 import { ScrollDetail } from '@ionic/core';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
@@ -156,6 +157,10 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
         this.resizeListener = CoreDomUtils.onWindowResize(() => {
             this.initializeFloatingTitle();
         }, 50);
+
+        this.subscriptions.push(CoreSettingsHelper.onDarkModeChange().subscribe(() => {
+            this.initializeFloatingTitle();
+        }));
     }
 
     /**
diff --git a/src/core/features/settings/services/settings-helper.ts b/src/core/features/settings/services/settings-helper.ts
index d8b845583..9f8a1d46a 100644
--- a/src/core/features/settings/services/settings-helper.ts
+++ b/src/core/features/settings/services/settings-helper.ts
@@ -27,6 +27,7 @@ import { CoreDomUtils } from '@services/utils/dom';
 import { CoreCourse } from '@features/course/services/course';
 import { makeSingleton, Translate } from '@singletons';
 import { CoreError } from '@classes/errors/error';
+import { Observable, Subject } from 'rxjs';
 
 /**
  * Object with space usage and cache entries that can be erased.
@@ -64,6 +65,7 @@ export class CoreSettingsHelperProvider {
     protected prefersDark?: MediaQueryList;
     protected colorSchemes: CoreColorScheme[] = [];
     protected currentColorScheme = CoreColorScheme.LIGHT;
+    protected darkModeObservable = new Subject<boolean>();
 
     async initialize(): Promise<void> {
         this.prefersDark = window.matchMedia('(prefers-color-scheme: dark)');
@@ -93,7 +95,9 @@ export class CoreSettingsHelperProvider {
         }
 
         // Listen for changes to the prefers-color-scheme media query.
-        this.prefersDark.addEventListener && this.prefersDark.addEventListener('change', this.toggleDarkModeListener.bind(this));
+        this.prefersDark.addEventListener && this.prefersDark.addEventListener('change', () => {
+            this.setColorScheme(this.currentColorScheme);
+        });
 
         // Init zoom level.
         await this.upgradeZoomLevel();
@@ -444,22 +448,28 @@ export class CoreSettingsHelperProvider {
         return window.matchMedia('(prefers-color-scheme)').media !== 'not all';
     }
 
-    /**
-     * Listener function to toggle dark mode.
-     */
-    protected toggleDarkModeListener(): void {
-        this.setColorScheme(this.currentColorScheme);
-    };
-
     /**
      * Toggles dark mode based on enabled boolean.
      *
      * @param enable True to enable dark mode, false to disable.
      */
     protected toggleDarkMode(enable: boolean = false): void {
-        document.body.classList.toggle('dark', enable);
+        const isDark = document.body.classList.contains('dark');
+        if (isDark !== enable) {
+            document.body.classList.toggle('dark', enable);
+            this.darkModeObservable.next(enable);
 
-        CoreApp.setStatusBarColor();
+            CoreApp.setStatusBarColor();
+        }
+    }
+
+    /**
+     * Returns dark mode change observable.
+     *
+     * @return Dark mode change observable.
+     */
+    onDarkModeChange(): Observable<boolean> {
+        return this.darkModeObservable;
     }
 
 }

From 98018138b1f0aaed32806166d9dce758d455180c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 15 Mar 2022 11:18:48 +0100
Subject: [PATCH 0716/1008] MOBILE-3814 menu: Check only width on menu to show
 menu on side

---
 .../features/mainmenu/services/mainmenu.ts    | 22 +++++--------------
 src/core/services/app.ts                      |  2 +-
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/core/features/mainmenu/services/mainmenu.ts b/src/core/features/mainmenu/services/mainmenu.ts
index f1c09fef0..a27b4e943 100644
--- a/src/core/features/mainmenu/services/mainmenu.ts
+++ b/src/core/features/mainmenu/services/mainmenu.ts
@@ -22,6 +22,7 @@ import { CoreMainMenuDelegate, CoreMainMenuHandlerToDisplay } from './mainmenu-d
 import { Device, makeSingleton } from '@singletons';
 import { CoreArray } from '@singletons/array';
 import { CoreTextUtils } from '@services/utils/text';
+import { CoreScreen } from '@services/screen';
 
 declare module '@singletons/events' {
 
@@ -47,12 +48,6 @@ export class CoreMainMenuProvider {
     static readonly MORE_PAGE_NAME = 'more';
     static readonly MAIN_MENU_HANDLER_BADGE_UPDATED = 'main_menu_handler_badge_updated';
 
-    protected tablet = false;
-
-    constructor() {
-        this.tablet = !!(window?.innerWidth && window.innerWidth >= 576 && window.innerHeight >= 576);
-    }
-
     /**
      * Get the current main menu handlers.
      *
@@ -227,7 +222,7 @@ export class CoreMainMenuProvider {
         if (!this.isResponsiveMainMenuItemsDisabledInCurrentSite() && window && window.innerWidth) {
             let numElements: number;
 
-            if (this.tablet) {
+            if (CoreScreen.isTablet) {
                 // Tablet, menu will be displayed vertically.
                 numElements = Math.floor(window.innerHeight / CoreMainMenuProvider.ITEM_MIN_WIDTH);
             } else {
@@ -250,20 +245,13 @@ export class CoreMainMenuProvider {
      * @return Tabs placement including side value.
      */
     getTabPlacement(): 'bottom' | 'side' {
-        const tablet = !!(window.innerWidth && window.innerWidth >= 576 && (window.innerHeight >= 576 ||
-                ((CoreApp.isKeyboardVisible() || CoreApp.isKeyboardOpening()) && window.innerHeight >= 200)));
-
-        if (tablet != this.tablet) {
-            this.tablet = tablet;
-        }
-
-        return tablet ? 'side' : 'bottom';
+        return CoreScreen.isTablet ? 'side' : 'bottom';
     }
 
     /**
      * Check if a certain page is the root of a main menu tab.
      *
-     * @param page Name of the page.
+     * @param pageName Name of the page.
      * @return Promise resolved with boolean: whether it's the root of a main menu tab.
      */
     async isMainMenuTab(pageName: string): Promise<boolean> {
@@ -277,7 +265,7 @@ export class CoreMainMenuProvider {
     /**
      * Check if a certain page is the root of a main menu handler currently displayed.
      *
-     * @param page Name of the page.
+     * @param pageName Name of the page.
      * @return Promise resolved with boolean: whether it's the root of a main menu handler.
      */
     async isCurrentMainMenuHandler(pageName: string): Promise<boolean> {
diff --git a/src/core/services/app.ts b/src/core/services/app.ts
index 4ab97df7f..cedb147db 100644
--- a/src/core/services/app.ts
+++ b/src/core/services/app.ts
@@ -437,7 +437,7 @@ export class CoreAppProvider {
     /**
      * Set keyboard shown or hidden.
      *
-     * @param Whether the keyboard is shown or hidden.
+     * @param shown Whether the keyboard is shown or hidden.
      */
     protected setKeyboardShown(shown: boolean): void {
         this.isKeyboardShown = shown;

From b475bd840abad9d97a3bc62a8006ba1ee21fc17b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 15 Mar 2022 11:34:03 +0100
Subject: [PATCH 0717/1008] MOBILE-3814 collapsible: Deactivate collapsible if
 something went wrong

---
 src/core/directives/collapsible-header.ts    | 17 +++++++++--------
 src/theme/components/collapsible-header.scss | 10 +++++-----
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts
index ba041f9ad..56365f4da 100644
--- a/src/core/directives/collapsible-header.ts
+++ b/src/core/directives/collapsible-header.ts
@@ -228,7 +228,7 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
             throw new Error('[collapsible-header] Couldn\'t create floating title');
         }
 
-        this.page.classList.remove('is-active');
+        this.page.classList.remove('collapsible-header-page-is-active');
         CoreUtils.nextTick();
 
         // Add floating title and measure initial position.
@@ -293,7 +293,7 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
             .forEach(([property, value]) => floatingTitle.style.setProperty(property, value as string));
 
         // Activate styles.
-        this.page.classList.add('is-active');
+        this.page.classList.add('collapsible-header-page-is-active');
 
         this.floatingTitle = floatingTitle;
         this.scrollingHeight = originalTitleBoundingBox.top - collapsedHeaderTitleBoundingBox.top;
@@ -376,7 +376,7 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
         }
 
         this.page.style.setProperty('--collapsible-header-progress', enable ? '0' : '1');
-        this.page.classList.toggle('is-collapsed', !enable);
+        this.page.classList.toggle('collapsible-header-page-is-collapsed', !enable);
     }
 
     /**
@@ -409,11 +409,12 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
             !collapsedFontStyles ||
             !floatingTitle
         ) {
+            page?.classList.remove('collapsible-header-page-is-active');
             throw new Error('[collapsible-header] Couldn\'t set up scrolling');
         }
 
         this.isWithinContent = content.contains(expandedHeader);
-        page.classList.toggle('is-within-content', this.isWithinContent);
+        page.classList.toggle('collapsible-header-page-is-within-content', this.isWithinContent);
         this.setEnabled(this.enabled);
 
         Object
@@ -440,8 +441,8 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
                 : CoreMath.clamp(contentScroll.scrollTop / scrollingHeight, 0, 1);
 
             page.style.setProperty('--collapsible-header-progress', `${progress}`);
-            page.classList.toggle('is-frozen', frozen);
-            page.classList.toggle('is-collapsed', progress === 1);
+            page.classList.toggle('collapsible-header-page-is-frozen', frozen);
+            page.classList.toggle('collapsible-header-page-is-collapsed', progress === 1);
 
             Object
                 .entries(progress > .5 ? collapsedFontStyles : expandedFontStyles)
@@ -455,7 +456,7 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
                     return;
                 }
 
-                if (page.classList.contains('is-frozen')) {
+                if (page.classList.contains('collapsible-header-page-is-frozen')) {
                     return;
                 }
 
@@ -464,7 +465,7 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
                 const collapse = progress > 0.5;
 
                 page.style.setProperty('--collapsible-header-progress', collapse ? '1' : '0');
-                page.classList.toggle('is-collapsed', collapse);
+                page.classList.toggle('collapsible-header-page-is-collapsed', collapse);
 
                 if (collapse && this.scrollingHeight && this.scrollingHeight > 0 && scrollTop < this.scrollingHeight) {
                     this.content?.scrollToPoint(null, this.scrollingHeight);
diff --git a/src/theme/components/collapsible-header.scss b/src/theme/components/collapsible-header.scss
index a5bfd6a22..ff7282027 100644
--- a/src/theme/components/collapsible-header.scss
+++ b/src/theme/components/collapsible-header.scss
@@ -25,7 +25,7 @@
         opacity: 0;
     }
 
-    &:not(.is-collapsed) .collapsible-header-collapsed {
+    &:not(.collapsible-header-page-is-collapsed) .collapsible-header-collapsed {
         --core-header-toolbar-border-width: 0;
         ion-toolbar {
             --background: transparent;
@@ -37,11 +37,11 @@
 
     }
 
-    &.is-active.is-collapsed.is-within-content ion-header.core-header-shadow {
+    &.collapsible-header-page-is-active.collapsible-header-page-is-collapsed.collapsible-header-page-is-within-content ion-header.core-header-shadow {
         --core-header-shadow: var(--drop-shadow-bottom, none);
     }
 
-    &.is-active {
+    &.collapsible-header-page-is-active {
 
         .collapsible-header-expanded {
             height: calc(var(--collapsible-header-expanded-height) * (1 - var(--collapsible-header-progress)));
@@ -75,7 +75,7 @@
 
     }
 
-    &.is-active.is-within-content  {
+    &.collapsible-header-page-is-active.collapsible-header-page-is-within-content  {
 
         ion-content {
             --offset-top: var(--collapsible-header-collapsed-height) !important;
@@ -88,7 +88,7 @@
 
     }
 
-    &.is-active.is-frozen {
+    &.collapsible-header-page-is-active.collapsible-header-page-is-frozen {
 
         .collapsible-header-floating-title {
             display: none;

From d6051f0e70aaae61585fd4402d51099588d531e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 15 Mar 2022 11:46:25 +0100
Subject: [PATCH 0718/1008] MOBILE-3814 loading: Fix bug showing content

---
 src/core/components/loading/loading.ts | 18 +++++++-----------
 src/core/singletons/events.ts          |  3 +++
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/core/components/loading/loading.ts b/src/core/components/loading/loading.ts
index dd06222c0..2fbd213cc 100644
--- a/src/core/components/loading/loading.ts
+++ b/src/core/components/loading/loading.ts
@@ -103,23 +103,19 @@ export class CoreLoadingComponent implements OnInit, OnChanges, AfterViewInit {
      * @return Promise resolved when done.
      */
     async changeState(loaded: boolean): Promise<void> {
-        await CoreUtils.nextTick();
-
         this.element.classList.toggle('core-loading-loaded', loaded);
-        this.content?.nativeElement.classList.add('core-loading-content', loaded);
-
-        await CoreUtils.nextTick();
-
-        // Wait for next tick before triggering the event to make sure ngIf elements have been added to the DOM.
-        CoreEvents.trigger(CoreEvents.CORE_LOADING_CHANGED, <CoreEventLoadingChangedData> {
-            loaded: loaded,
-            uniqueId: this.uniqueId,
-        });
+        this.content?.nativeElement.classList.toggle('core-loading-content', loaded);
 
         if (!this.loaded && loaded) {
             this.loaded = true; // Only comes true once.
             this.firstLoadedPromise.resolve(this.uniqueId);
         }
+
+        // Event has been deprecated since app 4.0.
+        CoreEvents.trigger(CoreEvents.CORE_LOADING_CHANGED, <CoreEventLoadingChangedData> {
+            loaded: true,
+            uniqueId: this.uniqueId,
+        });
     }
 
     /**
diff --git a/src/core/singletons/events.ts b/src/core/singletons/events.ts
index f69e0ea0a..33042ddfc 100644
--- a/src/core/singletons/events.ts
+++ b/src/core/singletons/events.ts
@@ -117,6 +117,9 @@ export class CoreEvents {
     static readonly APP_LAUNCHED_URL = 'app_launched_url'; // App opened with a certain URL (custom URL scheme).
     static readonly FILE_SHARED = 'file_shared';
     static readonly KEYBOARD_CHANGE = 'keyboard_change';
+    /**
+     * @deprecated since app 4.0. Use CoreComponentsRegistry promises instead.
+     */
     static readonly CORE_LOADING_CHANGED = 'core_loading_changed';
     static readonly ORIENTATION_CHANGE = 'orientation_change';
     static readonly SEND_ON_ENTER_CHANGED = 'send_on_enter_changed';

From 2bf21e34680fbf9812bef9e0c0546c8afba7b635 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 15 Mar 2022 12:27:25 +0100
Subject: [PATCH 0719/1008] MOBILE-3814 course: Add hidden sections to course
 index

---
 .../course/components/course-index/course-index.html      | 8 ++++++--
 .../course/components/course-index/course-index.ts        | 7 +++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/core/features/course/components/course-index/course-index.html b/src/core/features/course/components/course-index/course-index.html
index 5e07e3ae6..892a63767 100644
--- a/src/core/features/course/components/course-index/course-index.html
+++ b/src/core/features/course/components/course-index/course-index.html
@@ -24,7 +24,7 @@
             </ion-item>
             <ng-container *ngIf="allSectionId != section.id">
                 <ion-item class="divider section" (click)="selectSectionOrModule($event, section.id)" button
-                    [class.item-current]="selectedId === section.id" [class.item-dimmed]="section.visible === 0"
+                    [class.item-current]="selectedId === section.id" [class.item-dimmed]="!section.visible"
                     [class.item-hightlighted]="section.highlighted" detail="false" sticky="true">
                     <ion-icon *ngIf="section.hasVisibleModules" name="fas-chevron-right" flip-rtl slot="start"
                         class="expandable-status-icon" (click)="toggleExpand($event, section)"
@@ -40,9 +40,13 @@
                             </core-format-text>
                         </h2>
                     </ion-label>
-                    <ion-badge *ngIf="section.highlighted && highlighted">{{highlighted}}</ion-badge>
+                    <ion-badge *ngIf="section.highlighted && highlighted" slot="end">{{highlighted}}</ion-badge>
                     <ion-icon name="fas-lock" *ngIf="section.availabilityinfo" slot="end" class="restricted"
                         [attr.aria-label]="'core.restricted' | translate"></ion-icon>
+                    <ion-icon name="fas-eye-slash" *ngIf="!section.visible && !section.uservisible" slot="end" class="restricted"
+                        [attr.aria-label]="'core.notavailable' | translate"></ion-icon>
+                    <ion-icon name="fas-eye-slash" *ngIf="!section.visible && section.uservisible" slot="end" class="restricted"
+                        [attr.aria-label]="'core.course.hiddenfromstudents' | translate"></ion-icon>
                 </ion-item>
                 <ng-container *ngIf="section.expanded">
                     <ng-container *ngFor="let module of section.modules">
diff --git a/src/core/features/course/components/course-index/course-index.ts b/src/core/features/course/components/course-index/course-index.ts
index e530867f0..2c2503e7b 100644
--- a/src/core/features/course/components/course-index/course-index.ts
+++ b/src/core/features/course/components/course-index/course-index.ts
@@ -78,8 +78,7 @@ export class CoreCourseCourseIndexComponent implements OnInit {
         // Clone sections to add information.
         this.sectionsToRender = this.sections
             .filter((section) => !section.hiddenbynumsections &&
-                section.id != CoreCourseProvider.STEALTH_MODULES_SECTION_ID &&
-                section.uservisible !== false)
+                section.id != CoreCourseProvider.STEALTH_MODULES_SECTION_ID)
             .map((section) => {
                 const modules = section.modules
                     .filter((module) => module.visibleoncoursepage !== 0 && !module.noviewlink)
@@ -103,6 +102,8 @@ export class CoreCourseCourseIndexComponent implements OnInit {
                     id: section.id,
                     name: section.name,
                     availabilityinfo: !!section.availabilityinfo,
+                    visible: !!section.visible,
+                    uservisible: section.uservisible !== false,
                     expanded: section.id === this.selectedId,
                     highlighted: currentSectionData.section.id === section.id,
                     hasVisibleModules: modules.length > 0,
@@ -160,6 +161,8 @@ type CourseIndexSection = {
     expanded: boolean;
     hasVisibleModules: boolean;
     availabilityinfo: boolean;
+    visible: boolean;
+    uservisible: boolean;
     modules: {
         id: number;
         course: number;

From 7d3a650ac4122b70637f1f8063d4034ae297541e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 15 Mar 2022 12:59:19 +0100
Subject: [PATCH 0720/1008] MOBILE-3814 course: Fix navigation buttons to not
 be fixed at bottom

---
 .../course/components/course-format/course-format.html         | 2 +-
 .../features/course/components/course-format/course-format.ts  | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/core/features/course/components/course-format/course-format.html b/src/core/features/course/components/course-format/course-format.html
index 2d8cd3391..323216634 100644
--- a/src/core/features/course/components/course-format/course-format.html
+++ b/src/core/features/course/components/course-format/course-format.html
@@ -24,7 +24,7 @@
 
             <core-infinite-loading [enabled]="canLoadMore" (action)="showMoreActivities($event)"></core-infinite-loading>
         </div>
-        <div collapsible-footer appearOnBottom *ngIf="displayCourseIndex && (previousSection || nextSection)" slot="fixed">
+        <div collapsible-footer appearOnBottom *ngIf="displayCourseIndex && hasPreviousOrNextSections" slot="fixed">
             <div class="core-course-section-nav-buttons safe-area-padding-horizontal list-item-limited-width">
                 <ion-button *ngIf="previousSection" (click)="sectionChanged(previousSection)" expand="block"
                     [attr.aria-label]="('core.previous' | translate) + ': ' + previousSection.name">
diff --git a/src/core/features/course/components/course-format/course-format.ts b/src/core/features/course/components/course-format/course-format.ts
index c43830b42..4e0be0612 100644
--- a/src/core/features/course/components/course-format/course-format.ts
+++ b/src/core/features/course/components/course-format/course-format.ts
@@ -92,6 +92,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
     selectedSection?: CoreCourseSection;
     previousSection?: CoreCourseSection;
     nextSection?: CoreCourseSection;
+    hasPreviousOrNextSections = false;
     allSectionsId: number = CoreCourseProvider.ALL_SECTIONS_ID;
     stealthModulesSectionId: number = CoreCourseProvider.STEALTH_MODULES_SECTION_ID;
     loaded = false;
@@ -488,6 +489,8 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
             this.showMoreActivities();
         }
 
+        this.hasPreviousOrNextSections = !!this.previousSection || !!this.nextSection;
+
         // Scroll to module if needed. Give more priority to the input.
         const moduleIdToScroll = this.moduleId && previousValue === undefined ? this.moduleId : moduleId;
         if (moduleIdToScroll) {

From 8cf41088a88ded7422f658cdca8d3b0c4d72f617 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 15 Mar 2022 13:11:33 +0100
Subject: [PATCH 0721/1008] MOBILE-3814 blocks: Make tags bigger

---
 src/addons/block/blogtags/components/blogtags/blogtags.scss | 4 +---
 src/addons/block/tags/components/tags/tags.scss             | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/addons/block/blogtags/components/blogtags/blogtags.scss b/src/addons/block/blogtags/components/blogtags/blogtags.scss
index 0dbdc11a1..9554c90a9 100644
--- a/src/addons/block/blogtags/components/blogtags/blogtags.scss
+++ b/src/addons/block/blogtags/components/blogtags/blogtags.scss
@@ -1,9 +1,7 @@
 :host .core-block-content ::ng-deep {
     ul.inline-list {
-        font-size: 80%;
         list-style: none;
-        margin-left: 0;
-        margin-right: 0;
+        margin: 0;
         -webkit-padding-start: 0;
 
         li {
diff --git a/src/addons/block/tags/components/tags/tags.scss b/src/addons/block/tags/components/tags/tags.scss
index 658f42de8..e6141bf4e 100644
--- a/src/addons/block/tags/components/tags/tags.scss
+++ b/src/addons/block/tags/components/tags/tags.scss
@@ -1,11 +1,9 @@
 :host .core-block-content ::ng-deep {
     .tag_cloud {
-        font-size: 80%;
         text-align: center;
         ul.inline-list {
             list-style: none;
-            margin-left: 0;
-            margin-right: 0;
+            margin: 0;
             -webkit-padding-start: 0;
 
             li {

From 1ef14477fa935d8ee218328493940ad8326a1ee7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 15 Mar 2022 13:34:50 +0100
Subject: [PATCH 0722/1008] MOBILE-3814 glossary: Fix RTE not recovering saved
 text in offline

---
 .../components/index/addon-mod-glossary-index.html        | 4 ++--
 .../components/rich-text-editor/rich-text-editor.ts       | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
index b32270973..4f544012e 100644
--- a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
+++ b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
@@ -34,7 +34,7 @@
         <ion-list *ngIf="!isSearch && entries && entries.offlineEntries.length > 0">
             <ion-item-divider>
                 <ion-label>
-                    <h2>{{ 'addon.mod_glossary.entriestobesynced' | translate }}</h2>
+                    <h2 class="big">{{ 'addon.mod_glossary.entriestobesynced' | translate }}</h2>
                 </ion-label>
             </ion-item-divider>
             <ion-item *ngFor="let entry of entries.offlineEntries" (click)="entries.select(entry)" detail="false" button
@@ -51,7 +51,7 @@
             <ng-container *ngFor="let entry of entries.onlineEntries; let index = index">
                 <ion-item-divider *ngIf="getDivider && showDivider(entry, entries.onlineEntries[index - 1])">
                     <ion-label>
-                        <h2>{{ getDivider!(entry) }}</h2>
+                        <h2 class="big">{{ getDivider!(entry) }}</h2>
                     </ion-label>
                 </ion-item-divider>
 
diff --git a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
index eb4010db4..66b451146 100644
--- a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
+++ b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
@@ -40,6 +40,7 @@ import { CoreEventFormActionData, CoreEventObserver, CoreEvents, CoreSingleTimeE
 import { CoreEditorOffline } from '../../services/editor-offline';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
 import { CoreLoadingComponent } from '@components/loading/loading';
+import { CoreScreen } from '@services/screen';
 
 /**
  * Component to display a rich text editor if enabled.
@@ -150,7 +151,7 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
      */
     ngOnInit(): void {
         this.canScanQR = CoreUtils.canScanQR();
-        this.isPhone = Platform.is('mobile') && !Platform.is('tablet');
+        this.isPhone = CoreScreen.isMobile;
         this.toolbarHidden = this.isPhone;
         this.direction = Platform.isRTL ? 'rtl' : 'ltr';
     }
@@ -161,6 +162,8 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
     async ngAfterContentInit(): Promise<void> {
         this.rteEnabled = await CoreDomUtils.isRichTextEditorEnabled();
 
+        await this.waitLoadingsDone();
+
         // Setup the editor.
         this.editorElement = this.editor?.nativeElement as HTMLDivElement;
         this.setContent(this.control?.value);
@@ -175,8 +178,6 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
         // Use paragraph on enter.
         document.execCommand('DefaultParagraphSeparator', false, 'p');
 
-        await this.waitLoadingsDone();
-
         this.maximizeEditorSize();
 
         this.setListeners();
@@ -1052,6 +1053,7 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
      */
     protected async windowResized(): Promise<void> {
         await CoreDomUtils.waitForResizeDone();
+        this.isPhone = CoreScreen.isMobile;
 
         this.maximizeEditorSize();
         this.updateToolbarButtons();

From c0b170b5f01eb76b724d9d4b1e3cca22f3e2a65a Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 15 Mar 2022 15:25:07 +0100
Subject: [PATCH 0723/1008] MOBILE-3909 calendar: Fix default reminder
 duplicated when editing

---
 src/addons/calendar/pages/edit-event/edit-event.page.ts | 5 +++--
 src/addons/calendar/services/calendar.ts                | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/addons/calendar/pages/edit-event/edit-event.page.ts b/src/addons/calendar/pages/edit-event/edit-event.page.ts
index d7bcfd094..c1807d35f 100644
--- a/src/addons/calendar/pages/edit-event/edit-event.page.ts
+++ b/src/addons/calendar/pages/edit-event/edit-event.page.ts
@@ -520,7 +520,7 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy, CanLeave {
 
         try {
             const result = await AddonCalendar.submitEvent(this.eventId, data, {
-                reminders: this.reminders,
+                reminders: this.eventId ? [] : this.reminders, // Only allow adding reminders for new events.
             });
             event = result.event;
 
@@ -638,7 +638,8 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy, CanLeave {
      * @return Promise resolved when done.
      */
     protected async initReminders(): Promise<void> {
-        if (!this.notificationsEnabled) {
+        // Don't init reminders when editing an event. Right now, only allow adding reminders for new events.
+        if (!this.notificationsEnabled || this.eventId) {
             return;
         }
 
diff --git a/src/addons/calendar/services/calendar.ts b/src/addons/calendar/services/calendar.ts
index ec8c8db11..817b44ee1 100644
--- a/src/addons/calendar/services/calendar.ts
+++ b/src/addons/calendar/services/calendar.ts
@@ -1696,7 +1696,7 @@ export class AddonCalendarProvider {
             const event = await AddonCalendarOffline.saveEvent(eventId, formData, siteId);
 
             // Now save the reminders if any.
-            if (options.reminders) {
+            if (options.reminders?.length) {
                 await CoreUtils.ignoreErrors(
                     Promise.all(options.reminders.map((reminder) => this.addEventReminder(event, reminder.time, siteId))),
                 );
@@ -1718,7 +1718,7 @@ export class AddonCalendarProvider {
             const event = await this.submitEventOnline(eventId, formData, siteId);
 
             // Now save the reminders if any.
-            if (options.reminders) {
+            if (options.reminders?.length) {
                 await CoreUtils.ignoreErrors(
                     Promise.all(options.reminders.map((reminder) => this.addEventReminder(event, reminder.time, siteId))),
                 );

From 580f4a9f8a0f7d769140a45e0ba6f612e552f092 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 16 Mar 2022 08:16:19 +0100
Subject: [PATCH 0724/1008] MOBILE-3909 calendar: Sort reminders by time
 created and display date

---
 src/addons/calendar/pages/event/event.html    |  3 +-
 .../calendar/services/calendar-helper.ts      |  5 +++
 src/addons/calendar/services/calendar.ts      |  3 +-
 .../calendar/services/database/calendar.ts    | 32 ++++++++++++++-----
 4 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/src/addons/calendar/pages/event/event.html b/src/addons/calendar/pages/event/event.html
index 0b21ac1f4..ab3c5bcb8 100644
--- a/src/addons/calendar/pages/event/event.html
+++ b/src/addons/calendar/pages/event/event.html
@@ -136,7 +136,8 @@
             <ng-container *ngFor="let reminder of reminders">
                 <ion-item *ngIf="reminder.timestamp > 0" class="ion-text-wrap" [class.item-dimmed]="reminder.timestamp <= currentTime">
                     <ion-label>
-                        <p>{{ reminder.label }}</p>
+                        <p class="item-heading">{{ reminder.label }}</p>
+                        <p *ngIf="reminder.sublabel">{{ reminder.sublabel }}</p>
                     </ion-label>
                     <ion-button fill="clear" (click)="cancelNotification(reminder.id, $event)" [attr.aria-label]="'core.delete' | translate"
                         slot="end">
diff --git a/src/addons/calendar/services/calendar-helper.ts b/src/addons/calendar/services/calendar-helper.ts
index a4f3a9479..dce3c6fc5 100644
--- a/src/addons/calendar/services/calendar-helper.ts
+++ b/src/addons/calendar/services/calendar-helper.ts
@@ -37,6 +37,7 @@ import { AddonCalendarSyncInvalidateEvent } from './calendar-sync';
 import { AddonCalendarOfflineEventDBRecord } from './database/calendar-offline';
 import { CoreCategoryData } from '@features/courses/services/courses';
 import { AddonCalendarReminderDBRecord } from './database/calendar';
+import { CoreTimeUtils } from '@services/utils/time';
 
 /**
  * Context levels enumeration.
@@ -329,6 +330,9 @@ export class AddonCalendarHelperProvider {
 
             if (reminder.value && reminder.unit) {
                 reminder.label = AddonCalendar.getUnitValueLabel(reminder.value, reminder.unit, reminder.time === null);
+                if (reminder.timestamp) {
+                    reminder.sublabel = CoreTimeUtils.userDate(reminder.timestamp * 1000, 'core.strftimedatetime');
+                }
             }
 
             return reminder;
@@ -796,4 +800,5 @@ export type AddonCalendarEventReminder = AddonCalendarReminderDBRecord & {
     unit?: AddonCalendarReminderUnits; // Units.
     timestamp?: number; // Timestamp (in seconds).
     label?: string; // Label to represent the reminder.
+    sublabel?: string; // Sub label.
 };
diff --git a/src/addons/calendar/services/calendar.ts b/src/addons/calendar/services/calendar.ts
index 817b44ee1..d010a96d9 100644
--- a/src/addons/calendar/services/calendar.ts
+++ b/src/addons/calendar/services/calendar.ts
@@ -777,6 +777,7 @@ export class AddonCalendarProvider {
         const reminder: Partial<AddonCalendarReminderDBRecord> = {
             eventid: event.id,
             time: time ?? null,
+            timecreated: Date.now(),
         };
 
         const reminderId = await site.getDb().insertRecord(REMINDERS_TABLE, reminder);
@@ -913,7 +914,7 @@ export class AddonCalendarProvider {
     async getEventReminders(id: number, siteId?: string): Promise<AddonCalendarReminderDBRecord[]> {
         const site = await CoreSites.getSite(siteId);
 
-        return await site.getDb().getRecords(REMINDERS_TABLE, { eventid: id }, 'time ASC');
+        return await site.getDb().getRecords(REMINDERS_TABLE, { eventid: id }, 'timecreated ASC, time ASC');
     }
 
     /**
diff --git a/src/addons/calendar/services/database/calendar.ts b/src/addons/calendar/services/database/calendar.ts
index b21928140..1349eb9be 100644
--- a/src/addons/calendar/services/database/calendar.ts
+++ b/src/addons/calendar/services/database/calendar.ts
@@ -22,7 +22,7 @@ import { AddonCalendar, AddonCalendarEventType, AddonCalendarProvider } from '..
  * Database variables for AddonCalendarProvider service.
  */
 export const EVENTS_TABLE = 'addon_calendar_events_3';
-export const REMINDERS_TABLE = 'addon_calendar_reminders';
+export const REMINDERS_TABLE = 'addon_calendar_reminders_2';
 export const CALENDAR_SITE_SCHEMA: CoreSiteSchema = {
     name: 'AddonCalendarProvider',
     version: 4,
@@ -195,6 +195,10 @@ export const CALENDAR_SITE_SCHEMA: CoreSiteSchema = {
                     name: 'time',
                     type: 'INTEGER',
                 },
+                {
+                    name: 'timecreated',
+                    type: 'INTEGER',
+                },
             ],
             uniqueKeys: [
                 ['eventid', 'time'],
@@ -228,7 +232,16 @@ export const CALENDAR_SITE_SCHEMA: CoreSiteSchema = {
             }
 
             // Migrate reminders. New format @since 4.0.
-            const records = await db.getAllRecords<AddonCalendarReminderDBRecord>(REMINDERS_TABLE);
+            const oldTable = 'addon_calendar_reminders';
+
+            try {
+                await db.tableExists(oldTable);
+            } catch (error) {
+                // Old table does not exist, ignore.
+                return;
+            }
+
+            const records = await db.getAllRecords<AddonCalendarReminderDBRecord>(oldTable);
             const events: Record<number, AddonCalendarEventDBRecord> = {};
 
             await Promise.all(records.map(async (record) => {
@@ -237,9 +250,7 @@ export const CALENDAR_SITE_SCHEMA: CoreSiteSchema = {
                     try {
                         events[record.eventid] = await db.getRecord(EVENTS_TABLE, { id: record.eventid });
                     } catch {
-                        // Event not found in local DB, shouldn't happen. Delete the reminder.
-                        await db.deleteRecords(REMINDERS_TABLE, { id: record.id });
-
+                        // Event not found in local DB, shouldn't happen. Ignore the reminder.
                         return;
                     }
                 }
@@ -248,9 +259,7 @@ export const CALENDAR_SITE_SCHEMA: CoreSiteSchema = {
                     // Default reminder. Use null now.
                     record.time = null;
                 } else if (record.time > events[record.eventid].timestart) {
-                    // Reminder is after the event, delete it.
-                    await db.deleteRecords(REMINDERS_TABLE, { id: record.id });
-
+                    // Reminder is after the event, ignore it.
                     return;
                 } else {
                     // Remove seconds from the old reminder, it could include seconds by mistake.
@@ -259,6 +268,12 @@ export const CALENDAR_SITE_SCHEMA: CoreSiteSchema = {
 
                 return db.insertRecord(REMINDERS_TABLE, record);
             }));
+
+            try {
+                await db.dropTable(oldTable);
+            } catch (error) {
+                // Error deleting old table, ignore.
+            }
         }
     },
 };
@@ -308,4 +323,5 @@ export type AddonCalendarReminderDBRecord = {
     id: number;
     eventid: number;
     time: number | null; // Number of seconds before the event, null for default time.
+    timecreated?: number | null;
 };

From 975549b7ab8386f18487fe88d720a49a3ea5bcea Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 16 Mar 2022 09:08:24 +0100
Subject: [PATCH 0725/1008] MOBILE-3909 calendar: Always use current time in
 new events

---
 src/addons/calendar/pages/day/day.page.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/addons/calendar/pages/day/day.page.ts b/src/addons/calendar/pages/day/day.page.ts
index be2c15588..5c7e7c4b9 100644
--- a/src/addons/calendar/pages/day/day.page.ts
+++ b/src/addons/calendar/pages/day/day.page.ts
@@ -374,7 +374,9 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
 
             const selectedDay = this.manager?.getSelectedItem();
             if (selectedDay) {
-                params.timestamp = selectedDay.moment.unix() * 1000;
+                // Use current time but in the specified day.
+                const now = moment();
+                params.timestamp = selectedDay.moment.clone().set({ hour: now.hour(), minute: now.minute() }).unix() * 1000;
             }
         }
 

From 894e4a7b624e3847903c87d920edeb9e36e971bf Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 15 Mar 2022 17:33:20 +0100
Subject: [PATCH 0726/1008] MOBILE-3833 core: Implement cancellable promise

---
 src/core/classes/cancellable-promise.ts       | 56 +++++++++++
 src/core/classes/promise.ts                   | 54 +++++++++++
 src/core/classes/promised-value.ts            | 92 ++++++++-----------
 src/core/directives/collapsible-footer.ts     | 12 +--
 src/core/directives/collapsible-item.ts       | 12 ++-
 src/core/directives/format-text.ts            | 13 +--
 src/core/directives/on-appear.ts              | 11 ++-
 .../rich-text-editor/rich-text-editor.ts      | 14 +--
 src/core/services/utils/dom.ts                | 56 ++++++-----
 src/core/singletons/events.ts                 | 15 ---
 10 files changed, 208 insertions(+), 127 deletions(-)
 create mode 100644 src/core/classes/cancellable-promise.ts
 create mode 100644 src/core/classes/promise.ts

diff --git a/src/core/classes/cancellable-promise.ts b/src/core/classes/cancellable-promise.ts
new file mode 100644
index 000000000..fb3f0ad6c
--- /dev/null
+++ b/src/core/classes/cancellable-promise.ts
@@ -0,0 +1,56 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CorePromise } from '@classes/promise';
+
+/**
+ * Promise whose execution can be cancelled.
+ */
+export class CoreCancellablePromise<T = unknown> extends CorePromise<T> {
+
+    /**
+     * Create a new resolved promise.
+     *
+     * @returns Resolved promise.
+     */
+    static resolve(): CoreCancellablePromise<void>;
+    static resolve<T>(result: T): CoreCancellablePromise<T>;
+    static resolve<T>(result?: T): CoreCancellablePromise<T> {
+        return new this(resolve => result ? resolve(result) : (resolve as () => void)(), () => {
+            // Nothing to do here.
+        });
+    }
+
+    protected cancelPromise: () => void;
+
+    constructor(
+        executor: (resolve: (value: T | PromiseLike<T>) => void, reject: (reason?: Error) => void) => void,
+        cancelPromise: () => void,
+    ) {
+        super(new Promise(executor));
+
+        this.cancelPromise = cancelPromise;
+    }
+
+    /**
+     * Cancel promise.
+     *
+     * After this method is called, the promise will remain unresolved forever. Make sure that after calling
+     * this method there aren't any references to this object, or it could cause memory leaks.
+     */
+    cancel(): void {
+        this.cancelPromise();
+    }
+
+}
diff --git a/src/core/classes/promise.ts b/src/core/classes/promise.ts
new file mode 100644
index 000000000..7fe5897b5
--- /dev/null
+++ b/src/core/classes/promise.ts
@@ -0,0 +1,54 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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.
+
+/**
+ * Base class to use for implementing custom Promises.
+ */
+export abstract class CorePromise<T = unknown> implements Promise<T> {
+
+    protected nativePromise: Promise<T>;
+
+    constructor(nativePromise: Promise<T>) {
+        this.nativePromise = nativePromise;
+    }
+
+    [Symbol.toStringTag]: string;
+
+    /**
+     * @inheritdoc
+     */
+    then<TResult1 = T, TResult2 = never>(
+        onFulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | undefined | null,
+        onRejected?: ((reason: Error) => TResult2 | PromiseLike<TResult2>) | undefined | null,
+    ): Promise<TResult1 | TResult2> {
+        return this.nativePromise.then(onFulfilled, onRejected);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    catch<TResult = never>(
+        onRejected?: ((reason: Error) => TResult | PromiseLike<TResult>) | undefined | null,
+    ): Promise<T | TResult> {
+        return this.nativePromise.catch(onRejected);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    finally(onFinally?: (() => void) | null): Promise<T> {
+        return this.nativePromise.finally(onFinally);
+    }
+
+}
diff --git a/src/core/classes/promised-value.ts b/src/core/classes/promised-value.ts
index 16051be37..c4de39afa 100644
--- a/src/core/classes/promised-value.ts
+++ b/src/core/classes/promised-value.ts
@@ -12,10 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { CorePromise } from '@classes/promise';
+
 /**
  * Promise wrapper to expose result synchronously.
  */
-export class CorePromisedValue<T = unknown> implements Promise<T> {
+export class CorePromisedValue<T = unknown> extends CorePromise<T> {
 
     /**
      * Wrap an existing promise.
@@ -33,20 +35,28 @@ export class CorePromisedValue<T = unknown> implements Promise<T> {
         return promisedValue;
     }
 
-    private _resolvedValue?: T;
-    private _rejectedReason?: Error;
-    declare private promise: Promise<T>;
-    declare private _resolve: (result: T) => void;
-    declare private _reject: (error?: Error) => void;
+    protected resolvedValue?: T;
+    protected rejectedReason?: Error;
+    protected resolvePromise!: (result: T) => void;
+    protected rejectPromise!: (error?: Error) => void;
 
     constructor() {
-        this.initPromise();
+        let resolvePromise!: (result: T) => void;
+        let rejectPromise!: (error?: Error) => void;
+
+        const nativePromise = new Promise<T>((resolve, reject) => {
+            resolvePromise = resolve;
+            rejectPromise = reject;
+        });
+
+        super(nativePromise);
+
+        this.resolvePromise = resolvePromise;
+        this.rejectPromise = rejectPromise;
     }
 
-    [Symbol.toStringTag]: string;
-
     get value(): T | null {
-        return this._resolvedValue ?? null;
+        return this.resolvedValue ?? null;
     }
 
     /**
@@ -55,7 +65,7 @@ export class CorePromisedValue<T = unknown> implements Promise<T> {
      * @return Whether the promise resolved successfuly.
      */
     isResolved(): this is { value: T } {
-        return '_resolvedValue' in this;
+        return 'resolvedValue' in this;
     }
 
     /**
@@ -64,7 +74,7 @@ export class CorePromisedValue<T = unknown> implements Promise<T> {
      * @return Whether the promise was rejected.
      */
     isRejected(): boolean {
-        return '_rejectedReason' in this;
+        return 'rejectedReason' in this;
     }
 
     /**
@@ -76,32 +86,6 @@ export class CorePromisedValue<T = unknown> implements Promise<T> {
         return this.isResolved() || this.isRejected();
     }
 
-    /**
-     * @inheritdoc
-     */
-    then<TResult1 = T, TResult2 = never>(
-        onFulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | undefined | null,
-        onRejected?: ((reason: Error) => TResult2 | PromiseLike<TResult2>) | undefined | null,
-    ): Promise<TResult1 | TResult2> {
-        return this.promise.then(onFulfilled, onRejected);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    catch<TResult = never>(
-        onRejected?: ((reason: Error) => TResult | PromiseLike<TResult>) | undefined | null,
-    ): Promise<T | TResult> {
-        return this.promise.catch(onRejected);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    finally(onFinally?: (() => void) | null): Promise<T> {
-        return this.promise.finally(onFinally);
-    }
-
     /**
      * Resolve the promise.
      *
@@ -109,13 +93,13 @@ export class CorePromisedValue<T = unknown> implements Promise<T> {
      */
     resolve(value: T): void {
         if (this.isSettled()) {
-            delete this._rejectedReason;
+            delete this.rejectedReason;
 
-            this.initPromise();
+            this.resetNativePromise();
         }
 
-        this._resolvedValue = value;
-        this._resolve(value);
+        this.resolvedValue = value;
+        this.resolvePromise(value);
     }
 
     /**
@@ -125,32 +109,32 @@ export class CorePromisedValue<T = unknown> implements Promise<T> {
      */
     reject(reason?: Error): void {
         if (this.isSettled()) {
-            delete this._resolvedValue;
+            delete this.resolvedValue;
 
-            this.initPromise();
+            this.resetNativePromise();
         }
 
-        this._rejectedReason = reason;
-        this._reject(reason);
+        this.rejectedReason = reason;
+        this.rejectPromise(reason);
     }
 
     /**
      * Reset status and value.
      */
     reset(): void {
-        delete this._resolvedValue;
-        delete this._rejectedReason;
+        delete this.resolvedValue;
+        delete this.rejectedReason;
 
-        this.initPromise();
+        this.resetNativePromise();
     }
 
     /**
-     * Initialize the promise and the callbacks.
+     * Reset native promise and callbacks.
      */
-    private initPromise(): void {
-        this.promise = new Promise((resolve, reject) => {
-            this._resolve = resolve;
-            this._reject = reject;
+    protected resetNativePromise(): void {
+        this.nativePromise = new Promise((resolve, reject) => {
+            this.resolvePromise = resolve;
+            this.rejectPromise = reject;
         });
     }
 
diff --git a/src/core/directives/collapsible-footer.ts b/src/core/directives/collapsible-footer.ts
index cbd07969d..f63d1f57c 100644
--- a/src/core/directives/collapsible-footer.ts
+++ b/src/core/directives/collapsible-footer.ts
@@ -19,9 +19,10 @@ import { CoreUtils } from '@services/utils/utils';
 import { CoreMath } from '@singletons/math';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
 import { CoreFormatTextDirective } from './format-text';
-import { CoreEventObserver, CoreSingleTimeEventObserver } from '@singletons/events';
+import { CoreEventObserver } from '@singletons/events';
 import { CoreLoadingComponent } from '@components/loading/loading';
 import { CoreDomUtils } from '@services/utils/dom';
+import { CoreCancellablePromise } from '@classes/cancellable-promise';
 
 /**
  * Directive to make an element fixed at the bottom collapsible when scrolling.
@@ -48,7 +49,7 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
     protected contentScrollListener?: EventListener;
     protected endContentScrollListener?: EventListener;
     protected resizeListener?: CoreEventObserver;
-    protected domListener?: CoreSingleTimeEventObserver;
+    protected domPromise?: CoreCancellablePromise<void>;
 
     constructor(el: ElementRef, protected ionContent: IonContent) {
         this.element = el.nativeElement;
@@ -61,10 +62,9 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
     async ngOnInit(): Promise<void> {
         // Only if not present or explicitly falsy it will be false.
         this.appearOnBottom = !CoreUtils.isFalseOrZero(this.appearOnBottom);
+        this.domPromise = CoreDomUtils.waitToBeInDOM(this.element);
 
-        this.domListener = CoreDomUtils.waitToBeInDOM(this.element);
-        await this.domListener.promise;
-
+        await this.domPromise;
         await this.waitLoadingsDone();
         await this.waitFormatTextsRendered(this.element);
 
@@ -234,7 +234,7 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
         }
 
         this.resizeListener?.off();
-        this.domListener?.off();
+        this.domPromise?.cancel();
     }
 
 }
diff --git a/src/core/directives/collapsible-item.ts b/src/core/directives/collapsible-item.ts
index d9ab8990e..08e987035 100644
--- a/src/core/directives/collapsible-item.ts
+++ b/src/core/directives/collapsible-item.ts
@@ -13,12 +13,13 @@
 // limitations under the License.
 
 import { Directive, ElementRef, Input, OnDestroy, OnInit } from '@angular/core';
+import { CoreCancellablePromise } from '@classes/cancellable-promise';
 import { CoreLoadingComponent } from '@components/loading/loading';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
 import { Translate } from '@singletons';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
-import { CoreEventObserver, CoreSingleTimeEventObserver } from '@singletons/events';
+import { CoreEventObserver } from '@singletons/events';
 import { CoreFormatTextDirective } from './format-text';
 
 const defaultMaxHeight = 80;
@@ -49,7 +50,7 @@ export class CoreCollapsibleItemDirective implements OnInit, OnDestroy {
     protected maxHeight = defaultMaxHeight;
     protected expandedHeight = 0;
     protected resizeListener?: CoreEventObserver;
-    protected domListener?: CoreSingleTimeEventObserver;
+    protected domPromise?: CoreCancellablePromise<void>;
 
     constructor(el: ElementRef<HTMLElement>) {
         this.element = el.nativeElement;
@@ -96,8 +97,9 @@ export class CoreCollapsibleItemDirective implements OnInit, OnDestroy {
      * @return Promise resolved when loadings are done.
      */
     protected async waitLoadingsDone(): Promise<void> {
-        this.domListener = CoreDomUtils.waitToBeInDOM(this.element);
-        await this.domListener.promise;
+        this.domPromise = CoreDomUtils.waitToBeInDOM(this.element);
+
+        await this.domPromise;
 
         const page = this.element.closest('.ion-page');
 
@@ -242,7 +244,7 @@ export class CoreCollapsibleItemDirective implements OnInit, OnDestroy {
      */
     ngOnDestroy(): void {
         this.resizeListener?.off();
-        this.domListener?.off();
+        this.domPromise?.cancel();
     }
 
 }
diff --git a/src/core/directives/format-text.ts b/src/core/directives/format-text.ts
index 12dd1f0ed..42c780f76 100644
--- a/src/core/directives/format-text.ts
+++ b/src/core/directives/format-text.ts
@@ -42,7 +42,7 @@ import { CoreFilterHelper } from '@features/filter/services/filter-helper';
 import { CoreSubscriptions } from '@singletons/subscriptions';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
 import { CoreCollapsibleItemDirective } from './collapsible-item';
-import { CoreSingleTimeEventObserver } from '@singletons/events';
+import { CoreCancellablePromise } from '@classes/cancellable-promise';
 
 /**
  * Directive to format text rendered. It renders the HTML and treats all links and media, using CoreLinkDirective
@@ -90,7 +90,7 @@ export class CoreFormatTextDirective implements OnChanges, OnDestroy {
     protected element: HTMLElement;
     protected emptyText = '';
     protected contentSpan: HTMLElement;
-    protected domListener?: CoreSingleTimeEventObserver;
+    protected domPromise?: CoreCancellablePromise<void>;
 
     constructor(
         element: ElementRef,
@@ -133,7 +133,7 @@ export class CoreFormatTextDirective implements OnChanges, OnDestroy {
      * @inheritdoc
      */
     ngOnDestroy(): void {
-        this.domListener?.off();
+        this.domPromise?.cancel();
     }
 
     /**
@@ -556,8 +556,9 @@ export class CoreFormatTextDirective implements OnChanges, OnDestroy {
      * @return The width of the element in pixels.
      */
     protected async getElementWidth(): Promise<number> {
-        this.domListener = CoreDomUtils.waitToBeInDOM(this.element);
-        await this.domListener.promise;
+        this.domPromise = CoreDomUtils.waitToBeInDOM(this.element);
+
+        await this.domPromise;
 
         let width = this.element.getBoundingClientRect().width;
         if (!width) {
@@ -711,7 +712,7 @@ export class CoreFormatTextDirective implements OnChanges, OnDestroy {
                 let width: string | number;
                 let height: string | number;
 
-                await CoreDomUtils.waitToBeInDOM(iframe, 5000).promise;
+                await CoreDomUtils.waitToBeInDOM(iframe, 5000);
 
                 if (iframe.width) {
                     width = iframe.width;
diff --git a/src/core/directives/on-appear.ts b/src/core/directives/on-appear.ts
index 16519d58a..267fd3f9f 100644
--- a/src/core/directives/on-appear.ts
+++ b/src/core/directives/on-appear.ts
@@ -13,8 +13,8 @@
 // limitations under the License.
 
 import { Directive, ElementRef, EventEmitter, OnDestroy, OnInit, Output } from '@angular/core';
+import { CoreCancellablePromise } from '@classes/cancellable-promise';
 import { CoreDomUtils } from '@services/utils/dom';
-import { CoreSingleTimeEventObserver } from '@singletons/events';
 
 /**
  * Directive to listen when an element becomes visible.
@@ -27,7 +27,7 @@ export class CoreOnAppearDirective implements OnInit, OnDestroy {
     @Output() onAppear = new EventEmitter();
 
     private element: HTMLElement;
-    protected domListener?: CoreSingleTimeEventObserver;
+    protected domPromise?: CoreCancellablePromise<void>;
 
     constructor(element: ElementRef) {
         this.element = element.nativeElement;
@@ -37,8 +37,9 @@ export class CoreOnAppearDirective implements OnInit, OnDestroy {
      * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
-        this.domListener = CoreDomUtils.waitToBeInDOM(this.element);
-        await this.domListener.promise;
+        this.domPromise = CoreDomUtils.waitToBeInDOM(this.element);
+
+        await this.domPromise;
 
         this.onAppear.emit();
     }
@@ -47,7 +48,7 @@ export class CoreOnAppearDirective implements OnInit, OnDestroy {
      * @inheritdoc
      */
     ngOnDestroy(): void {
-        this.domListener?.off();
+        this.domPromise?.cancel();
     }
 
 }
diff --git a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
index 66b451146..550682a86 100644
--- a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
+++ b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
@@ -36,11 +36,12 @@ import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUrlUtils } from '@services/utils/url';
 import { CoreUtils } from '@services/utils/utils';
 import { Platform, Translate } from '@singletons';
-import { CoreEventFormActionData, CoreEventObserver, CoreEvents, CoreSingleTimeEventObserver } from '@singletons/events';
+import { CoreEventFormActionData, CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreEditorOffline } from '../../services/editor-offline';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
 import { CoreLoadingComponent } from '@components/loading/loading';
 import { CoreScreen } from '@services/screen';
+import { CoreCancellablePromise } from '@classes/cancellable-promise';
 
 /**
  * Component to display a rich text editor if enabled.
@@ -105,7 +106,7 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
     protected selectionChangeFunction?: () => void;
     protected languageChangedSubscription?: Subscription;
     protected resizeListener?: CoreEventObserver;
-    protected domListener?: CoreSingleTimeEventObserver;
+    protected domPromise?: CoreCancellablePromise<void>;
 
     rteEnabled = false;
     isPhone = false;
@@ -288,8 +289,9 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
      * @return Promise resolved when loadings are done.
      */
     protected async waitLoadingsDone(): Promise<void> {
-        this.domListener = CoreDomUtils.waitToBeInDOM(this.element);
-        await this.domListener.promise;
+        this.domPromise = CoreDomUtils.waitToBeInDOM(this.element);
+
+        await this.domPromise;
 
         const page = this.element.closest('.ion-page');
 
@@ -829,7 +831,7 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
 
         const length = await this.toolbarSlides.length();
 
-        await CoreDomUtils.waitToBeInDOM(this.toolbar.nativeElement, 5000).promise;
+        await CoreDomUtils.waitToBeInDOM(this.toolbar.nativeElement, 5000);
 
         const width = this.toolbar.nativeElement.getBoundingClientRect().width;
 
@@ -1089,7 +1091,7 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
         this.keyboardObserver?.off();
         this.labelObserver?.disconnect();
         this.resizeListener?.off();
-        this.domListener?.off();
+        this.domPromise?.cancel();
     }
 
 }
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index 7b568abb8..380064f49 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -53,7 +53,8 @@ import { NavigationStart } from '@angular/router';
 import { filter } from 'rxjs/operators';
 import { Subscription } from 'rxjs';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
-import { CoreEventObserver, CoreSingleTimeEventObserver } from '@singletons/events';
+import { CoreEventObserver } from '@singletons/events';
+import { CoreCancellablePromise } from '@classes/cancellable-promise';
 
 /*
  * "Utils" service with helper functions for UI, DOM elements and HTML code.
@@ -97,51 +98,46 @@ export class CoreDomUtilsProvider {
      *
      * @param element Element to wait.
      * @param timeout If defined, timeout to wait before rejecting the promise.
-     * @return Promise CoreSingleTimeEventObserver with a promise.
+     * @return Cancellable promise.
      */
-    waitToBeInDOM(
-        element: Element,
-        timeout?: number,
-    ): CoreSingleTimeEventObserver {
-        let root = element.getRootNode({ composed: true });
+    waitToBeInDOM(element: Element, timeout?: number): CoreCancellablePromise<void> {
+        const root = element.getRootNode({ composed: true });
 
         if (root === document) {
             // Already in DOM.
-            return {
-                off: (): void => {
-                    // Nothing to do here.
-                },
-                promise: Promise.resolve(),
-            };
+            return CoreCancellablePromise.resolve();
         }
 
-        let observer: MutationObserver | undefined;
+        let observer: MutationObserver;
         let observerTimeout: number | undefined;
-        if (timeout) {
-            observerTimeout = window.setTimeout(() => {
-                observer?.disconnect();
-                throw new Error('Waiting for DOM timeout reached');
-            }, timeout);
-        }
 
-        return {
-            off: (): void => {
-                observer?.disconnect();
-                clearTimeout(observerTimeout);
-            },
-            promise: new Promise((resolve) => {
+        return new CoreCancellablePromise<void>(
+            (resolve, reject) => {
                 observer = new MutationObserver(() => {
-                    root = element.getRootNode({ composed: true });
+                    const root = element.getRootNode({ composed: true });
+
                     if (root === document) {
                         observer?.disconnect();
-                        clearTimeout(observerTimeout);
+                        observerTimeout && clearTimeout(observerTimeout);
                         resolve();
                     }
                 });
 
+                if (timeout) {
+                    observerTimeout = window.setTimeout(() => {
+                        observer?.disconnect();
+
+                        reject(new Error('Waiting for DOM timeout reached'));
+                    }, timeout);
+                }
+
                 observer.observe(document.body, { subtree: true, childList: true });
-            }),
-        };
+            },
+            () => {
+                observer?.disconnect();
+                observerTimeout && clearTimeout(observerTimeout);
+            },
+        );
     }
 
     /**
diff --git a/src/core/singletons/events.ts b/src/core/singletons/events.ts
index 33042ddfc..d1d805e6c 100644
--- a/src/core/singletons/events.ts
+++ b/src/core/singletons/events.ts
@@ -31,21 +31,6 @@ export interface CoreEventObserver {
     off: () => void;
 }
 
-/**
- * Observer instance to stop listening to an observer.
- */
-export interface CoreSingleTimeEventObserver {
-    /**
-     * Stop the observer.
-     */
-    off: () => void;
-
-    /**
-     * Promise Resolved when event is done (first time).
-     */
-    promise: Promise<void>;
-}
-
 /**
  * Event payloads.
  */

From 96adce9becd01ff748710f2524323e8fcde5264a Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 16 Mar 2022 10:02:07 +0100
Subject: [PATCH 0727/1008] MOBILE-3909 calendar: Select custom value when
 input is clicked

---
 .../reminder-time-modal.html                  |  3 ++-
 .../reminder-time-modal.ts                    | 21 +++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/addons/calendar/components/reminder-time-modal/reminder-time-modal.html b/src/addons/calendar/components/reminder-time-modal/reminder-time-modal.html
index 3002fc5fe..21c7fecd9 100644
--- a/src/addons/calendar/components/reminder-time-modal/reminder-time-modal.html
+++ b/src/addons/calendar/components/reminder-time-modal/reminder-time-modal.html
@@ -38,7 +38,8 @@
 
             <div class="flex-row">
                 <!-- Input to enter the value. -->
-                <ion-input type="number" name="customvalue" [(ngModel)]="customValue" [disabled]="radioValue != 'custom'" placeholder="10">
+                <ion-input type="number" name="customvalue" [(ngModel)]="customValue" [disabled]="radioValue != 'custom'" placeholder="10"
+                    (click)="customInputClicked($event)">
                 </ion-input>
 
                 <!-- Units. -->
diff --git a/src/addons/calendar/components/reminder-time-modal/reminder-time-modal.ts b/src/addons/calendar/components/reminder-time-modal/reminder-time-modal.ts
index f505fde21..871530664 100644
--- a/src/addons/calendar/components/reminder-time-modal/reminder-time-modal.ts
+++ b/src/addons/calendar/components/reminder-time-modal/reminder-time-modal.ts
@@ -15,6 +15,7 @@
 import { AddonCalendar, AddonCalendarReminderUnits, AddonCalendarValueAndUnit } from '@addons/calendar/services/calendar';
 import { Component, Input, OnInit } from '@angular/core';
 import { CoreDomUtils } from '@services/utils/dom';
+import { CoreUtils } from '@services/utils/utils';
 import { ModalController } from '@singletons';
 
 /**
@@ -153,4 +154,24 @@ export class AddonCalendarReminderTimeModalComponent implements OnInit {
         }
     }
 
+    /**
+     * Custom value input clicked.
+     *
+     * @param ev Click event.
+     */
+    async customInputClicked(ev: Event): Promise<void> {
+        if (this.radioValue === 'custom') {
+            return;
+        }
+
+        this.radioValue = 'custom';
+
+        await CoreUtils.nextTick();
+
+        const target = <HTMLInputElement | Element | null> ev.target;
+        if (target && 'focus' in target) {
+            target.focus();
+        }
+    }
+
 }

From 8037168222a2ea3df2d72660c36aecb96b1f4179 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 15 Mar 2022 14:26:40 +0100
Subject: [PATCH 0728/1008] MOBILE-3814 courses: Always init prefetch course
 icons when not empty

---
 src/core/features/course/services/course-helper.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/core/features/course/services/course-helper.ts b/src/core/features/course/services/course-helper.ts
index 7dc88fd7b..ad36f9899 100644
--- a/src/core/features/course/services/course-helper.ts
+++ b/src/core/features/course/services/course-helper.ts
@@ -1064,15 +1064,13 @@ export class CoreCourseHelperProvider {
      *
      * @param courses Courses array to get info from.
      * @param prefetch Prefetch information.
-     * @param minCourses Min course to show icon.
      * @return Resolved with the prefetch information updated when done.
      */
     async initPrefetchCoursesIcons(
         courses: CoreCourseBasicData[],
         prefetch: CorePrefetchStatusInfo,
-        minCourses: number = 2,
     ): Promise<CorePrefetchStatusInfo> {
-        if (!courses || courses.length < minCourses) {
+        if (!courses || courses.length <= 0) {
             // Not enough courses.
             prefetch.icon = '';
 

From c30a768f35efbd61bb6c9aec33c5e78d137164d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 15 Mar 2022 16:42:41 +0100
Subject: [PATCH 0729/1008] MOBILE-3814 navigation: Jump disabled navigation
 items on bar

---
 .../navigation-bar/core-navigation-bar.html    |  2 +-
 .../navigation-bar/navigation-bar.ts           | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/core/components/navigation-bar/core-navigation-bar.html b/src/core/components/navigation-bar/core-navigation-bar.html
index 1005bfcd5..24703b279 100644
--- a/src/core/components/navigation-bar/core-navigation-bar.html
+++ b/src/core/components/navigation-bar/core-navigation-bar.html
@@ -9,7 +9,7 @@
         </core-progress-bar>
     </ion-col>
     <ion-col class="ion-text-end ion-no-padding core-navigation-arrow" size="auto">
-        <ion-button [disabled]="nextIndex < 0" fill="clear" [attr.aria-label]="nextTitle" (click)="navigate(nextIndex)">
+        <ion-button [disabled]="nextIndex >= items.length" fill="clear" [attr.aria-label]="nextTitle" (click)="navigate(nextIndex)">
             <ion-icon name="fas-chevron-right" slot="icon-only" aria-hidden="true"></ion-icon>
         </ion-button>
     </ion-col>
diff --git a/src/core/components/navigation-bar/navigation-bar.ts b/src/core/components/navigation-bar/navigation-bar.ts
index c749dfa5f..2fb5af91f 100644
--- a/src/core/components/navigation-bar/navigation-bar.ts
+++ b/src/core/components/navigation-bar/navigation-bar.ts
@@ -67,15 +67,21 @@ export class CoreNavigationBarComponent implements OnChanges {
         this.progress = ((this.currentIndex + 1) / this.items.length) * 100;
         this.progressText = `${this.currentIndex + 1} / ${this.items.length}`;
 
-        this.nextIndex = this.items[this.currentIndex + 1]?.enabled ? this.currentIndex + 1 : -1;
-        if (this.nextIndex >= 0) {
-            this.nextTitle = Translate.instant(this.nextTranslate, { $a: this.items[this.nextIndex].title || '' });
+        this.nextIndex =this.currentIndex + 1;
+        while (this.items[this.nextIndex] && !this.items[this.nextIndex].enabled) {
+            this.nextIndex++;
         }
+        this.nextTitle = this.items[this.nextIndex]
+            ? Translate.instant(this.nextTranslate, { $a: this.items[this.nextIndex].title || '' })
+            : '';
 
-        this.previousIndex = this.items[this.currentIndex - 1]?.enabled ? this.currentIndex - 1 : -1;
-        if (this.previousIndex >= 0) {
-            this.previousTitle = Translate.instant(this.previousTranslate, { $a: this.items[this.previousIndex].title || '' });
+        this.previousIndex =this.currentIndex - 1;
+        while (this.items[this.previousIndex] && !this.items[this.previousIndex].enabled) {
+            this.previousIndex--;
         }
+        this.previousTitle = this.items[this.previousIndex]
+            ? Translate.instant(this.previousTranslate, { $a: this.items[this.previousIndex].title || '' })
+            : '';
     }
 
     /**

From 9b7988f26d8b52301d84daa5e99a17b0528d5cd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 15 Mar 2022 17:21:10 +0100
Subject: [PATCH 0730/1008] MOBILE-3814 collapsible: Observe original title
 mutation

---
 src/core/directives/collapsible-header.ts | 28 +++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts
index 56365f4da..69f4929ef 100644
--- a/src/core/directives/collapsible-header.ts
+++ b/src/core/directives/collapsible-header.ts
@@ -76,6 +76,7 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
     protected enabled = true;
     protected isWithinContent = false;
     protected enteredPromise = new CorePromisedValue<void>();
+    protected mutationObserver?: MutationObserver;
 
     constructor(el: ElementRef) {
         this.collapsedHeader = el.nativeElement;
@@ -126,6 +127,7 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
         }
 
         this.resizeListener?.off();
+        this.mutationObserver?.disconnect();
     }
 
     /**
@@ -161,6 +163,31 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
         this.subscriptions.push(CoreSettingsHelper.onDarkModeChange().subscribe(() => {
             this.initializeFloatingTitle();
         }));
+
+        this.mutationObserver = new MutationObserver(() => {
+            if (!this.expandedHeader) {
+                return;
+            }
+
+            const originalTitle = this.expandedHeader.querySelector('h1.collapsible-header-original-title') ||
+                this.expandedHeader.querySelector('h1') as HTMLHeadingElement;
+
+            const floatingTitleWrapper = originalTitle.parentElement as HTMLElement;
+            const floatingTitle = floatingTitleWrapper.querySelector('.collapsible-header-floating-title') as HTMLHeadingElement;
+
+            if (!floatingTitle || !originalTitle) {
+                return;
+            }
+
+            // Original title changed, change the contents.
+            const newFloatingTitle = originalTitle.cloneNode(true) as HTMLHeadingElement;
+            newFloatingTitle.classList.add('collapsible-header-floating-title');
+            newFloatingTitle.classList.remove('collapsible-header-original-title');
+
+            floatingTitleWrapper.replaceChild(newFloatingTitle, floatingTitle);
+
+            this.initializeFloatingTitle();
+        });
     }
 
     /**
@@ -247,6 +274,7 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
             floatingTitleWrapper.insertBefore(floatingTitle, originalTitle);
 
             originalTitle.classList.add('collapsible-header-original-title');
+            this.mutationObserver?.observe(originalTitle, { childList: true, subtree: true });
         }
 
         const floatingTitleBoundingBox = floatingTitle.getBoundingClientRect();

From b1461680a8d676335683c11a1de6ae264655faac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 15 Mar 2022 17:48:33 +0100
Subject: [PATCH 0731/1008] MOBILE-3814 chore: Update non reactive attributes
 using a directive

---
 src/core/directives/directives.module.ts      |  3 +
 .../update-non-reactive-attributes.ts         | 68 +++++++++++++++++++
 .../course-format/course-format.html          |  2 +-
 .../components/course-format/course-format.ts | 24 -------
 4 files changed, 72 insertions(+), 25 deletions(-)
 create mode 100644 src/core/directives/update-non-reactive-attributes.ts

diff --git a/src/core/directives/directives.module.ts b/src/core/directives/directives.module.ts
index 2767f4973..3a89d007f 100644
--- a/src/core/directives/directives.module.ts
+++ b/src/core/directives/directives.module.ts
@@ -33,6 +33,7 @@ import { CoreCollapsibleItemDirective } from './collapsible-item';
 import { CoreCollapsibleFooterDirective } from './collapsible-footer';
 import { CoreContentDirective } from './content';
 import { CoreOnAppearDirective } from './on-appear';
+import { CoreUpdateNonReactiveAttributesDirective } from './update-non-reactive-attributes';
 
 @NgModule({
     declarations: [
@@ -55,6 +56,7 @@ import { CoreOnAppearDirective } from './on-appear';
         CoreCollapsibleItemDirective,
         CoreCollapsibleFooterDirective,
         CoreContentDirective,
+        CoreUpdateNonReactiveAttributesDirective,
     ],
     exports: [
         CoreAutoFocusDirective,
@@ -76,6 +78,7 @@ import { CoreOnAppearDirective } from './on-appear';
         CoreCollapsibleItemDirective,
         CoreCollapsibleFooterDirective,
         CoreContentDirective,
+        CoreUpdateNonReactiveAttributesDirective,
     ],
 })
 export class CoreDirectivesModule {}
diff --git a/src/core/directives/update-non-reactive-attributes.ts b/src/core/directives/update-non-reactive-attributes.ts
new file mode 100644
index 000000000..1c8508c3b
--- /dev/null
+++ b/src/core/directives/update-non-reactive-attributes.ts
@@ -0,0 +1,68 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { Directive, ElementRef, OnDestroy, OnInit } from '@angular/core';
+
+/**
+ * Directive to observe mutations on some attributes and propagate them inside.
+ * Current supported attributes: ion-button.aria-label
+ *
+ * This is necessary in order to update some attributes that are not reactive, for example aria-label.
+ *
+ * @see https://github.com/ionic-team/ionic-framework/issues/21534
+ */
+@Directive({
+    selector: 'ion-button',
+})
+export class CoreUpdateNonReactiveAttributesDirective implements OnInit, OnDestroy {
+
+    protected element: HTMLIonButtonElement;
+    protected mutationObserver: MutationObserver;
+
+    constructor(element: ElementRef<HTMLIonButtonElement>) {
+        this.element = element.nativeElement;
+        this.mutationObserver = new MutationObserver(() => {
+            const ariaLabel = this.element.getAttribute('aria-label');
+            if (!ariaLabel) {
+                // Aria label unset by ionButton component (when first created).
+                return;
+            }
+
+            // Propagate label to button.
+            const button = this.element.shadowRoot?.querySelector('button');
+            button?.setAttribute('aria-label', ariaLabel);
+        });
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async ngOnInit(): Promise<void> {
+        await this.element.componentOnReady();
+
+        if (!this.element.getAttribute('aria-label')) {
+            return;
+        }
+
+        this.mutationObserver.observe(this.element, { attributes: true, attributeFilter: ['aria-label'] });
+    }
+
+    /**
+     * @inheritdoc
+     */
+    ngOnDestroy(): void {
+        this.mutationObserver.disconnect();
+    }
+
+}
diff --git a/src/core/features/course/components/course-format/course-format.html b/src/core/features/course/components/course-format/course-format.html
index 323216634..2d8cd3391 100644
--- a/src/core/features/course/components/course-format/course-format.html
+++ b/src/core/features/course/components/course-format/course-format.html
@@ -24,7 +24,7 @@
 
             <core-infinite-loading [enabled]="canLoadMore" (action)="showMoreActivities($event)"></core-infinite-loading>
         </div>
-        <div collapsible-footer appearOnBottom *ngIf="displayCourseIndex && hasPreviousOrNextSections" slot="fixed">
+        <div collapsible-footer appearOnBottom *ngIf="displayCourseIndex && (previousSection || nextSection)" slot="fixed">
             <div class="core-course-section-nav-buttons safe-area-padding-horizontal list-item-limited-width">
                 <ion-button *ngIf="previousSection" (click)="sectionChanged(previousSection)" expand="block"
                     [attr.aria-label]="('core.previous' | translate) + ': ' + previousSection.name">
diff --git a/src/core/features/course/components/course-format/course-format.ts b/src/core/features/course/components/course-format/course-format.ts
index 4e0be0612..50460392d 100644
--- a/src/core/features/course/components/course-format/course-format.ts
+++ b/src/core/features/course/components/course-format/course-format.ts
@@ -92,7 +92,6 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
     selectedSection?: CoreCourseSection;
     previousSection?: CoreCourseSection;
     nextSection?: CoreCourseSection;
-    hasPreviousOrNextSections = false;
     allSectionsId: number = CoreCourseProvider.ALL_SECTIONS_ID;
     stealthModulesSectionId: number = CoreCourseProvider.STEALTH_MODULES_SECTION_ID;
     loaded = false;
@@ -489,8 +488,6 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
             this.showMoreActivities();
         }
 
-        this.hasPreviousOrNextSections = !!this.previousSection || !!this.nextSection;
-
         // Scroll to module if needed. Give more priority to the input.
         const moduleIdToScroll = this.moduleId && previousValue === undefined ? this.moduleId : moduleId;
         if (moduleIdToScroll) {
@@ -507,8 +504,6 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
                 CoreCourse.logView(this.course.id, newSection.section, undefined, this.course.fullname),
             );
         }
-
-        this.invalidateSectionButtons();
     }
 
     /**
@@ -563,25 +558,6 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
         done?.();
     }
 
-    /**
-     * Invalidate section buttons so that they are rendered again. This is necessary in order to update
-     * some attributes that are not reactive, for example aria-label.
-     *
-     * @see https://github.com/ionic-team/ionic-framework/issues/21534
-     */
-    protected async invalidateSectionButtons(): Promise<void> {
-        const previousSection = this.previousSection;
-        const nextSection = this.nextSection;
-
-        this.previousSection = undefined;
-        this.nextSection = undefined;
-
-        await CoreUtils.nextTick();
-
-        this.previousSection = previousSection;
-        this.nextSection = nextSection;
-    }
-
     /**
      * Show more activities (only used when showing all the sections at the same time).
      *

From 02c57342306fcb8255a83f4f177a657c376e2f19 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 16 Mar 2022 10:20:08 +0100
Subject: [PATCH 0732/1008] MOBILE-3909 calendar: Save reminder when Enter
 clicked

---
 .../reminder-time-modal.html                  | 86 ++++++++++---------
 1 file changed, 44 insertions(+), 42 deletions(-)

diff --git a/src/addons/calendar/components/reminder-time-modal/reminder-time-modal.html b/src/addons/calendar/components/reminder-time-modal/reminder-time-modal.html
index 21c7fecd9..052241aa9 100644
--- a/src/addons/calendar/components/reminder-time-modal/reminder-time-modal.html
+++ b/src/addons/calendar/components/reminder-time-modal/reminder-time-modal.html
@@ -11,50 +11,52 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-radio-group [(ngModel)]="radioValue" class="ion-text-wrap">
-        <!-- Preset options. -->
-        <ion-item *ngIf="allowDisable">
-            <ion-label>
-                <p>{{ 'core.settings.disabled' | translate }}</p>
-            </ion-label>
-            <ion-radio slot="end" value="disabled"></ion-radio>
-        </ion-item>
-        <ion-item *ngFor="let option of presetOptions">
-            <ion-label>
-                <p>{{ option.label }}</p>
-            </ion-label>
-            <ion-radio slot="end" [value]="option.radioValue"></ion-radio>
-        </ion-item>
+    <form (ngSubmit)="saveReminder()">
+        <ion-radio-group name="radiovalue" [(ngModel)]="radioValue" class="ion-text-wrap">
+            <!-- Preset options. -->
+            <ion-item *ngIf="allowDisable">
+                <ion-label>
+                    <p>{{ 'core.settings.disabled' | translate }}</p>
+                </ion-label>
+                <ion-radio slot="end" value="disabled"></ion-radio>
+            </ion-item>
+            <ion-item *ngFor="let option of presetOptions">
+                <ion-label>
+                    <p>{{ option.label }}</p>
+                </ion-label>
+                <ion-radio slot="end" [value]="option.radioValue"></ion-radio>
+            </ion-item>
 
-        <!-- Custom value. -->
-        <ion-item class="ion-text-wrap">
-            <ion-label>
-                <p>{{ 'core.custom' | translate }}</p>
-            </ion-label>
-            <ion-radio slot="end" value="custom"></ion-radio>
-        </ion-item>
-        <ion-item class="ion-text-wrap">
-            <ion-label></ion-label>
+            <!-- Custom value. -->
+            <ion-item class="ion-text-wrap">
+                <ion-label>
+                    <p>{{ 'core.custom' | translate }}</p>
+                </ion-label>
+                <ion-radio slot="end" value="custom"></ion-radio>
+            </ion-item>
+            <ion-item class="ion-text-wrap">
+                <ion-label></ion-label>
 
-            <div class="flex-row">
-                <!-- Input to enter the value. -->
-                <ion-input type="number" name="customvalue" [(ngModel)]="customValue" [disabled]="radioValue != 'custom'" placeholder="10"
-                    (click)="customInputClicked($event)">
-                </ion-input>
+                <div class="flex-row">
+                    <!-- Input to enter the value. -->
+                    <ion-input type="number" name="customvalue" [(ngModel)]="customValue" [disabled]="radioValue != 'custom'"
+                        placeholder="10" (click)="customInputClicked($event)">
+                    </ion-input>
 
-                <!-- Units. -->
-                <label class="accesshide" for="reminderUnits">{{ 'addon.calendar.units' | translate }}</label>
-                <ion-select id="reminderUnits" name="customunits" [(ngModel)]="customUnits" interface="action-sheet"
-                    [disabled]="radioValue != 'custom'" slot="end" [interfaceOptions]="{header: 'addon.calendar.units' | translate}">
-                    <ion-select-option *ngFor="let option of customUnitsOptions" [value]="option.value">
-                        {{ option.label | translate }}
-                    </ion-select-option>
-                </ion-select>
-            </div>
-        </ion-item>
-    </ion-radio-group>
+                    <!-- Units. -->
+                    <label class="accesshide" for="reminderUnits">{{ 'addon.calendar.units' | translate }}</label>
+                    <ion-select id="reminderUnits" name="customunits" [(ngModel)]="customUnits" interface="action-sheet"
+                        [disabled]="radioValue != 'custom'" slot="end" [interfaceOptions]="{header: 'addon.calendar.units' | translate}">
+                        <ion-select-option *ngFor="let option of customUnitsOptions" [value]="option.value">
+                            {{ option.label | translate }}
+                        </ion-select-option>
+                    </ion-select>
+                </div>
+            </ion-item>
+        </ion-radio-group>
 
-    <ion-button class="ion-margin" expand="block" (click)="saveReminder()" [disabled]="radioValue == 'custom' && !customValue">
-        {{ 'core.done' | translate }}
-    </ion-button>
+        <ion-button type="submit" class="ion-margin" expand="block" [disabled]="radioValue == 'custom' && !customValue">
+            {{ 'core.done' | translate }}
+        </ion-button>
+    </form>
 </ion-content>

From 4cdc6b9dd6934bf5aa5fcf2d79e2cd4fefc3e977 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 16 Mar 2022 13:49:58 +0100
Subject: [PATCH 0733/1008] MOBILE-3814 chore: Improve component registry wait
 for ready

---
 src/core/classes/async-component.ts           | 24 ++++++++
 src/core/components/loading/loading.ts        | 15 +++--
 src/core/directives/collapsible-footer.ts     | 21 ++-----
 src/core/directives/collapsible-header.ts     | 18 ++----
 src/core/directives/collapsible-item.ts       | 27 +++------
 src/core/directives/format-text.ts            |  7 ++-
 .../rich-text-editor/rich-text-editor.ts      |  5 +-
 src/core/singletons/components-registry.ts    | 57 +++++++++++--------
 8 files changed, 92 insertions(+), 82 deletions(-)
 create mode 100644 src/core/classes/async-component.ts

diff --git a/src/core/classes/async-component.ts b/src/core/classes/async-component.ts
new file mode 100644
index 000000000..77635a70f
--- /dev/null
+++ b/src/core/classes/async-component.ts
@@ -0,0 +1,24 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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.
+
+/**
+ * Component that is not rendered immediately after being mounted.
+ */
+export interface AsyncComponent {
+
+    /**
+     * Wait until the component is fully rendered and ready.
+     */
+    ready(): Promise<void>;
+}
diff --git a/src/core/components/loading/loading.ts b/src/core/components/loading/loading.ts
index 2fbd213cc..d5be19770 100644
--- a/src/core/components/loading/loading.ts
+++ b/src/core/components/loading/loading.ts
@@ -20,6 +20,7 @@ import { CoreAnimations } from '@components/animations';
 import { Translate } from '@singletons';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
 import { CorePromisedValue } from '@classes/promised-value';
+import { AsyncComponent } from '@classes/async-component';
 
 /**
  * Component to show a loading spinner and message while data is being loaded.
@@ -47,7 +48,7 @@ import { CorePromisedValue } from '@classes/promised-value';
     styleUrls: ['loading.scss'],
     animations: [CoreAnimations.SHOW_HIDE],
 })
-export class CoreLoadingComponent implements OnInit, OnChanges, AfterViewInit {
+export class CoreLoadingComponent implements OnInit, OnChanges, AfterViewInit, AsyncComponent {
 
     @Input() hideUntil: unknown; // Determine when should the contents be shown.
     @Input() message?: string; // Message to show while loading.
@@ -58,7 +59,7 @@ export class CoreLoadingComponent implements OnInit, OnChanges, AfterViewInit {
     uniqueId: string;
     protected element: HTMLElement; // Current element.
     loaded = false; // Only comes true once.
-    protected firstLoadedPromise = new CorePromisedValue<string>();
+    protected onReadyPromise = new CorePromisedValue<void>();
 
     constructor(element: ElementRef) {
         this.element = element.nativeElement;
@@ -108,7 +109,7 @@ export class CoreLoadingComponent implements OnInit, OnChanges, AfterViewInit {
 
         if (!this.loaded && loaded) {
             this.loaded = true; // Only comes true once.
-            this.firstLoadedPromise.resolve(this.uniqueId);
+            this.onReadyPromise.resolve();
         }
 
         // Event has been deprecated since app 4.0.
@@ -119,12 +120,10 @@ export class CoreLoadingComponent implements OnInit, OnChanges, AfterViewInit {
     }
 
     /**
-     * Wait the loading to finish.
-     *
-     * @return Promise resolved with the uniqueId when done.
+     * @inheritdoc
      */
-    async whenLoaded(): Promise<string> {
-        return await this.firstLoadedPromise;
+    async ready(): Promise<void> {
+        return await this.onReadyPromise;
     }
 
 }
diff --git a/src/core/directives/collapsible-footer.ts b/src/core/directives/collapsible-footer.ts
index f63d1f57c..2dccfd760 100644
--- a/src/core/directives/collapsible-footer.ts
+++ b/src/core/directives/collapsible-footer.ts
@@ -66,7 +66,7 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
 
         await this.domPromise;
         await this.waitLoadingsDone();
-        await this.waitFormatTextsRendered(this.element);
+        await this.waitFormatTextsRendered();
 
         this.content = this.element.closest('ion-content');
 
@@ -156,15 +156,9 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
 
     /**
      * Wait until all <core-format-text> children inside the element are done rendering.
-     *
-     * @param element Element.
      */
-    protected async waitFormatTextsRendered(element: Element): Promise<void> {
-        await CoreComponentsRegistry.finishRenderingAllElementsInside<CoreFormatTextDirective>(
-            element,
-            'core-format-text',
-            'rendered',
-        );
+    protected async waitFormatTextsRendered(): Promise<void> {
+        await CoreComponentsRegistry.waitComponentsReady(this.element, 'core-format-text', CoreFormatTextDirective);
     }
 
     /**
@@ -210,13 +204,8 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
         const scrollElement = await this.ionContent.getScrollElement();
 
         await Promise.all([
-            await CoreComponentsRegistry.finishRenderingAllElementsInside<CoreLoadingComponent>
-            (scrollElement, 'core-loading', 'whenLoaded'),
-            await CoreComponentsRegistry.finishRenderingAllElementsInside<CoreLoadingComponent>(
-                this.element,
-                'core-loading',
-                'whenLoaded',
-            ),
+            await CoreComponentsRegistry.waitComponentsReady(scrollElement, 'core-loading', CoreLoadingComponent),
+            await CoreComponentsRegistry.waitComponentsReady(this.element, 'core-loading', CoreLoadingComponent),
         ]);
     }
 
diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts
index 69f4929ef..0bf4d0738 100644
--- a/src/core/directives/collapsible-header.ts
+++ b/src/core/directives/collapsible-header.ts
@@ -332,15 +332,13 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
 
     /**
      * Wait until all <core-loading> children inside the page.
-     *
-     * @return Promise resolved when loadings are done.
      */
     protected async waitLoadingsDone(): Promise<void> {
-        await CoreComponentsRegistry.finishRenderingAllElementsInside<CoreLoadingComponent>(
-            this.page,
-            'core-loading',
-            'whenLoaded',
-        );
+        if (!this.page) {
+            return;
+        }
+
+        await CoreComponentsRegistry.waitComponentsReady(this.page, 'core-loading', CoreLoadingComponent);
     }
 
     /**
@@ -350,11 +348,7 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
      * @return Promise resolved when texts are rendered.
      */
     protected async waitFormatTextsRendered(element: Element): Promise<void> {
-        await CoreComponentsRegistry.finishRenderingAllElementsInside<CoreFormatTextDirective>(
-            element,
-            'core-format-text',
-            'rendered',
-        );
+        await CoreComponentsRegistry.waitComponentsReady(element, 'core-format-text', CoreFormatTextDirective);
     }
 
     /**
diff --git a/src/core/directives/collapsible-item.ts b/src/core/directives/collapsible-item.ts
index 08e987035..41990f722 100644
--- a/src/core/directives/collapsible-item.ts
+++ b/src/core/directives/collapsible-item.ts
@@ -16,7 +16,6 @@ import { Directive, ElementRef, Input, OnDestroy, OnInit } from '@angular/core';
 import { CoreCancellablePromise } from '@classes/cancellable-promise';
 import { CoreLoadingComponent } from '@components/loading/loading';
 import { CoreDomUtils } from '@services/utils/dom';
-import { CoreUtils } from '@services/utils/utils';
 import { Translate } from '@singletons';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
 import { CoreEventObserver } from '@singletons/events';
@@ -103,28 +102,18 @@ export class CoreCollapsibleItemDirective implements OnInit, OnDestroy {
 
         const page = this.element.closest('.ion-page');
 
-        await CoreComponentsRegistry.finishRenderingAllElementsInside<CoreLoadingComponent>(page, 'core-loading', 'whenLoaded');
+        if (!page) {
+            return;
+        }
+
+        await CoreComponentsRegistry.waitComponentsReady(page, 'core-loading', CoreLoadingComponent);
     }
 
     /**
      * Wait until all <core-format-text> children inside the element are done rendering.
-     *
-     * @param element Element.
      */
-    protected async waitFormatTextsRendered(element: Element): Promise<void> {
-        let formatTextElements: HTMLElement[] = [];
-
-        if (this.element.tagName == 'CORE-FORMAT-TEXT') {
-            formatTextElements = [this.element];
-        } else {
-            formatTextElements = Array.from(element.querySelectorAll('core-format-text'));
-        }
-
-        const formatTexts = formatTextElements.map(element => CoreComponentsRegistry.resolve(element, CoreFormatTextDirective));
-
-        await Promise.all(formatTexts.map(formatText => formatText?.rendered()));
-
-        await CoreUtils.nextTick();
+    protected async waitFormatTextsRendered(): Promise<void> {
+        await CoreComponentsRegistry.waitComponentsReady(this.element, 'core-format-text', CoreFormatTextDirective);
     }
 
     /**
@@ -134,7 +123,7 @@ export class CoreCollapsibleItemDirective implements OnInit, OnDestroy {
         // Remove max-height (if any) to calculate the real height.
         this.element.classList.add('collapsible-loading-height');
 
-        await this.waitFormatTextsRendered(this.element);
+        await this.waitFormatTextsRendered();
 
         this.expandedHeight = this.element.getBoundingClientRect().height;
 
diff --git a/src/core/directives/format-text.ts b/src/core/directives/format-text.ts
index 42c780f76..afd53beae 100644
--- a/src/core/directives/format-text.ts
+++ b/src/core/directives/format-text.ts
@@ -43,6 +43,7 @@ import { CoreSubscriptions } from '@singletons/subscriptions';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
 import { CoreCollapsibleItemDirective } from './collapsible-item';
 import { CoreCancellablePromise } from '@classes/cancellable-promise';
+import { AsyncComponent } from '@classes/async-component';
 
 /**
  * Directive to format text rendered. It renders the HTML and treats all links and media, using CoreLinkDirective
@@ -56,7 +57,7 @@ import { CoreCancellablePromise } from '@classes/cancellable-promise';
 @Directive({
     selector: 'core-format-text',
 })
-export class CoreFormatTextDirective implements OnChanges, OnDestroy {
+export class CoreFormatTextDirective implements OnChanges, OnDestroy, AsyncComponent {
 
     @ViewChild(CoreCollapsibleItemDirective) collapsible?: CoreCollapsibleItemDirective;
 
@@ -137,9 +138,9 @@ export class CoreFormatTextDirective implements OnChanges, OnDestroy {
     }
 
     /**
-     * Wait until the text is fully rendered.
+     * @inheritdoc
      */
-    async rendered(): Promise<void> {
+    async ready(): Promise<void> {
         if (!this.element.classList.contains('core-format-text-loading')) {
             return;
         }
diff --git a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
index 550682a86..18a9760fb 100644
--- a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
+++ b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
@@ -294,8 +294,11 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
         await this.domPromise;
 
         const page = this.element.closest('.ion-page');
+        if (!page) {
+            return;
+        }
 
-        await CoreComponentsRegistry.finishRenderingAllElementsInside<CoreLoadingComponent>(page, 'core-loading', 'whenLoaded');
+        await CoreComponentsRegistry.waitComponentsReady(page, 'core-loading', CoreLoadingComponent);
     }
 
     /**
diff --git a/src/core/singletons/components-registry.ts b/src/core/singletons/components-registry.ts
index 5198ee90b..32b08e3dd 100644
--- a/src/core/singletons/components-registry.ts
+++ b/src/core/singletons/components-registry.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import { Component } from '@angular/core';
+import { AsyncComponent } from '@classes/async-component';
 import { CoreUtils } from '@services/utils/utils';
 
 /**
@@ -39,7 +40,7 @@ export class CoreComponentsRegistry {
      * @param componentClass Component class.
      * @returns Component instance.
      */
-    static resolve<T = Component>(element?: Element | null, componentClass?: ComponentConstructor<T>): T | null {
+    static resolve<T>(element?: Element | null, componentClass?: ComponentConstructor<T>): T | null {
         const instance = (element && this.instances.get(element) as T) ?? null;
 
         return instance && (!componentClass || instance instanceof componentClass)
@@ -65,35 +66,45 @@ export class CoreComponentsRegistry {
     }
 
     /**
-     * Waits all elements to be rendered.
+     * Get a component instances and wait to be ready.
      *
-     * @param element Parent element where to search.
-     * @param selector Selector to search on parent.
-     * @param fnName Component function that have to be resolved when rendered.
-     * @param params Params of function that have to be resolved when rendered.
+     * @param element Root element.
+     * @param componentClass Component class.
      * @return Promise resolved when done.
      */
-    static async finishRenderingAllElementsInside<T = Component>(
-        element: Element | undefined | null,
-        selector: string,
-        fnName: string,
-        params?: unknown[],
+    static async waitComponentReady<T extends AsyncComponent>(
+        element: Element | null,
+        componentClass?: ComponentConstructor<T>,
     ): Promise<void> {
-        if (!element) {
+        const instance = this.resolve(element, componentClass);
+        if (!instance) {
             return;
         }
 
-        const components = Array
-            .from(element.querySelectorAll(selector))
-            .map(element => CoreComponentsRegistry.resolve<T>(element));
+        await instance.ready();
+    }
 
-        await Promise.all(components.map(component => {
-            if (!component) {
-                return;
-            }
-
-            return component[fnName].apply(component, params);
-        }));
+    /**
+     * Waits all elements matching to be ready.
+     *
+     * @param element Element where to search.
+     * @param selector Selector to search on parent.
+     * @param componentClass Component class.
+     * @return Promise resolved when done.
+     */
+    static async waitComponentsReady<T extends AsyncComponent>(
+        element: Element,
+        selector: string,
+        componentClass?: ComponentConstructor<T>,
+    ): Promise<void> {
+        if (element.matches(selector)) {
+            // Element to wait is myself.
+            await CoreComponentsRegistry.waitComponentReady<T>(element, componentClass);
+        } else {
+            await Promise.all(Array
+                .from(element.querySelectorAll(selector))
+                .map(element => CoreComponentsRegistry.waitComponentReady<T>(element, componentClass)));
+        }
 
         // Wait for next tick to ensure components are completely rendered.
         await CoreUtils.nextTick();
@@ -105,4 +116,4 @@ export class CoreComponentsRegistry {
  * Component constructor.
  */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export type ComponentConstructor<T> = { new(...args: any[]): T };
+export type ComponentConstructor<T = Component> = { new(...args: any[]): T };

From aaa8ee3fc8797dbdc9ccd5fc4622068aceeb483c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 16 Mar 2022 11:17:30 +0100
Subject: [PATCH 0734/1008] MOBILE-3814 styles: Make dark named color a bit
 darker

---
 src/theme/globals.mixins.ionic.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/theme/globals.mixins.ionic.scss b/src/theme/globals.mixins.ionic.scss
index a5fb16e60..3e9421a1b 100644
--- a/src/theme/globals.mixins.ionic.scss
+++ b/src/theme/globals.mixins.ionic.scss
@@ -80,7 +80,7 @@
 
     body.dark {
         $dark: map-get($base, 'dark');
-        $dark: mix($light, white, 40%) !default;
+        $dark: mix($light, white, 80%) !default;
         @include generate-color-variants($color-name, $dark);
     }
 }

From 8b3a07d22439e73926c43f1c9574e2c797b084d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 16 Mar 2022 11:55:39 +0100
Subject: [PATCH 0735/1008] MOBILE-3814 course: Limit width on course summary

---
 .../pages/course-summary/course-summary.html  | 233 +++++++++---------
 .../pages/course-summary/course-summary.scss  |   7 +-
 2 files changed, 124 insertions(+), 116 deletions(-)

diff --git a/src/core/features/course/pages/course-summary/course-summary.html b/src/core/features/course/pages/course-summary/course-summary.html
index cde4c68c3..d8932c734 100644
--- a/src/core/features/course/pages/course-summary/course-summary.html
+++ b/src/core/features/course/pages/course-summary/course-summary.html
@@ -23,134 +23,139 @@
             </ion-icon>
         </div>
         <div *ngIf="course" class="course-container">
-            <ion-item class="ion-text-wrap course-name">
-                <ion-label>
-                    <p *ngIf="course.displayname && course.shortname && course.fullname != course.displayname"
-                        class="core-course-shortname">
-                        <core-format-text [text]="course.shortname" contextLevel="course" [contextInstanceId]="course.id">
-                        </core-format-text>
-                    </p>
-                    <h1>
-                        <span class="sr-only">{{ 'core.courses.aria:coursename' | translate }}</span>
-                        <core-format-text [text]="course.fullname" contextLevel="course" [contextInstanceId]="course.id">
-                        </core-format-text>
-                    </h1>
-                    <ion-chip color="primary" *ngIf="course.categoryname" class="core-course-category ion-text-nowrap">
-                        <span class="sr-only">{{ 'core.courses.aria:coursecategory' | translate }}</span>
-                        <ion-label>
-                            <core-format-text [text]="course.categoryname" contextLevel="coursecat" [contextInstanceId]="course.categoryid">
-                            </core-format-text>
-                        </ion-label>
-                    </ion-chip>
-                </ion-label>
-                <ion-button fill="clear" [href]="courseUrl" core-link [showBrowserWarning]="false"
-                    [attr.aria-label]="'core.openinbrowser' | translate" slot="end">
-                    <ion-icon name="fas-external-link-alt" slot="icon-only" aria-hidden="true"></ion-icon>
-                </ion-button>
-            </ion-item>
-            <ion-item class="ion-text-wrap" *ngIf="progress !== undefined || course.startdate || course.enddate">
-                <ion-label>
-                    <div class="core-course-progress" *ngIf="progress !== undefined">
-                        <core-progress-bar [progress]="progress" a11yText="core.course.aria:sectionprogress">
-                        </core-progress-bar>
-                    </div>
-                    <div *ngIf="course.startdate || course.enddate" class="core-course-dates">
-                        <p *ngIf="course.startdate">
-                            <ion-icon name="fas-calendar" aria-hidden="true"></ion-icon>
-                            <strong>{{ 'core.course.startdate' | translate }}</strong><br>
-                            {{ course.startdate * 1000 | coreFormatDate:'strftimedaydatetime' }}
-                        </p>
-                        <p *ngIf="course.enddate">
-                            <ion-icon name="fas-calendar" aria-hidden="true"></ion-icon>
-                            <strong>{{ 'core.course.enddate' | translate }}</strong><br>
-                            {{ course.enddate * 1000 | coreFormatDate:'strftimedaydatetime' }}
-                        </p>
-                    </div>
-                </ion-label>
-            </ion-item>
-
-            <ion-item class="ion-text-wrap" *ngIf="course.summary" detail="false">
-                <ion-label>
-                    <p class="item-heading">
-                        {{'core.course.coursesummary' | translate}}
-                    </p>
-                    <core-format-text [text]="course.summary" collapsible-item contextLevel="course" [contextInstanceId]="course.id">
-                    </core-format-text>
-                </ion-label>
-            </ion-item>
-
-            <ion-list *ngIf="course.contacts && course.contacts.length">
-                <ion-item [button]="course.contacts.length >= 5" class="ion-text-wrap" (click)="toggleContacts()"
-                    [attr.aria-label]="(contactsExpanded ? 'core.collapse' : 'core.expand') | translate" detail="false">
-                    <ion-icon *ngIf="course.contacts.length >= 5" name="fas-chevron-right" flip-rtl slot="start" aria-hidden="true"
-                        class="expandable-status-icon" [class.expandable-status-icon-expanded]="contactsExpanded">
-                    </ion-icon>
+            <div class="list-item-limited-width">
+                <ion-item class="ion-text-wrap course-name">
                     <ion-label>
-                        <p class="item-heading">
-                            {{ 'core.teachers' | translate }}
+                        <p *ngIf="course.displayname && course.shortname && course.fullname != course.displayname"
+                            class="core-course-shortname">
+                            <core-format-text [text]="course.shortname" contextLevel="course" [contextInstanceId]="course.id">
+                            </core-format-text>
                         </p>
+                        <h1>
+                            <span class="sr-only">{{ 'core.courses.aria:coursename' | translate }}</span>
+                            <core-format-text [text]="course.fullname" contextLevel="course" [contextInstanceId]="course.id">
+                            </core-format-text>
+                        </h1>
+                        <ion-chip color="primary" *ngIf="course.categoryname" class="core-course-category ion-text-nowrap">
+                            <span class="sr-only">{{ 'core.courses.aria:coursecategory' | translate }}</span>
+                            <ion-label>
+                                <core-format-text [text]="course.categoryname" contextLevel="coursecat"
+                                    [contextInstanceId]="course.categoryid">
+                                </core-format-text>
+                            </ion-label>
+                        </ion-chip>
+                    </ion-label>
+                    <ion-button fill="clear" [href]="courseUrl" core-link [showBrowserWarning]="false"
+                        [attr.aria-label]="'core.openinbrowser' | translate" slot="end">
+                        <ion-icon name="fas-external-link-alt" slot="icon-only" aria-hidden="true"></ion-icon>
+                    </ion-button>
+                </ion-item>
+                <ion-item class="ion-text-wrap" *ngIf="progress !== undefined || course.startdate || course.enddate">
+                    <ion-label>
+                        <div class="core-course-progress" *ngIf="progress !== undefined">
+                            <core-progress-bar [progress]="progress" a11yText="core.course.aria:sectionprogress">
+                            </core-progress-bar>
+                        </div>
+                        <div *ngIf="course.startdate || course.enddate" class="core-course-dates">
+                            <p *ngIf="course.startdate">
+                                <ion-icon name="fas-calendar" aria-hidden="true"></ion-icon>
+                                <strong>{{ 'core.course.startdate' | translate }}</strong><br>
+                                {{ course.startdate * 1000 | coreFormatDate:'strftimedaydatetime' }}
+                            </p>
+                            <p *ngIf="course.enddate">
+                                <ion-icon name="fas-calendar" aria-hidden="true"></ion-icon>
+                                <strong>{{ 'core.course.enddate' | translate }}</strong><br>
+                                {{ course.enddate * 1000 | coreFormatDate:'strftimedaydatetime' }}
+                            </p>
+                        </div>
                     </ion-label>
                 </ion-item>
-                <ng-container *ngIf="contactsExpanded || course.contacts.length < 5">
-                    <ion-item button class="ion-text-wrap" *ngFor="let contact of course.contacts" core-user-link [userId]="contact.id"
-                        [courseId]="isEnrolled ? course.id : null" [attr.aria-label]="'core.viewprofile' | translate" detail="true">
-                        <core-user-avatar [user]="contact" slot="start" [userId]="contact.id" [courseId]="isEnrolled ? course.id : null"
-                            [linkProfile]="false">
-                        </core-user-avatar>
+
+                <ion-item class="ion-text-wrap" *ngIf="course.summary" detail="false">
+                    <ion-label>
+                        <p class="item-heading">
+                            {{'core.course.coursesummary' | translate}}
+                        </p>
+                        <core-format-text [text]="course.summary" collapsible-item contextLevel="course" [contextInstanceId]="course.id">
+                        </core-format-text>
+                    </ion-label>
+                </ion-item>
+
+                <ion-list *ngIf="course.contacts && course.contacts.length">
+                    <ion-item [button]="course.contacts.length >= 5" class="ion-text-wrap" (click)="toggleContacts()"
+                        [attr.aria-label]="(contactsExpanded ? 'core.collapse' : 'core.expand') | translate" detail="false">
+                        <ion-icon *ngIf="course.contacts.length >= 5" name="fas-chevron-right" flip-rtl slot="start" aria-hidden="true"
+                            class="expandable-status-icon" [class.expandable-status-icon-expanded]="contactsExpanded">
+                        </ion-icon>
                         <ion-label>
-                            <p class="item-heading">{{contact.fullname}}</p>
+                            <p class="item-heading">
+                                {{ 'core.teachers' | translate }}
+                            </p>
                         </ion-label>
                     </ion-item>
-                </ng-container>
-                <core-spacer></core-spacer>
-            </ion-list>
-
-            <ion-item class="ion-text-wrap" *ngIf="course.customfields">
-                <ion-label>
-                    <ng-container *ngFor="let field of course.customfields">
-                        <div *ngIf="field.value"
-                            class="core-customfield core-customfield_{{field.type}} core-customfield_{{field.shortname}}">
-                            <span class="core-customfieldname">
-                                <core-format-text [text]="field.name" contextLevel="course" [contextInstanceId]="course.id">
-                                </core-format-text>
-                                <span class="core-customfieldseparator">: </span>
-                            </span>
-                            <span class="core-customfieldvalue">
-                                <core-format-text [text]="field.value" [collapsible-item]="field.type == 'textarea'  ? '' : null"
-                                    contextLevel="course" [contextInstanceId]="course.id">
-                                </core-format-text>
-                            </span>
-                        </div>
+                    <ng-container *ngIf="contactsExpanded || course.contacts.length < 5">
+                        <ion-item button class="ion-text-wrap" *ngFor="let contact of course.contacts" core-user-link [userId]="contact.id"
+                            [courseId]="isEnrolled ? course.id : null" [attr.aria-label]="'core.viewprofile' | translate" detail="true">
+                            <core-user-avatar [user]="contact" slot="start" [userId]="contact.id" [courseId]="isEnrolled ? course.id : null"
+                                [linkProfile]="false">
+                            </core-user-avatar>
+                            <ion-label>
+                                <p class="item-heading">{{contact.fullname}}</p>
+                            </ion-label>
+                        </ion-item>
                     </ng-container>
-                </ion-label>
-            </ion-item>
+                    <core-spacer></core-spacer>
+                </ion-list>
+
+                <ion-item class="ion-text-wrap" *ngIf="course.customfields">
+                    <ion-label>
+                        <ng-container *ngFor="let field of course.customfields">
+                            <div *ngIf="field.value"
+                                class="core-customfield core-customfield_{{field.type}} core-customfield_{{field.shortname}}">
+                                <span class="core-customfieldname">
+                                    <core-format-text [text]="field.name" contextLevel="course" [contextInstanceId]="course.id">
+                                    </core-format-text>
+                                    <span class="core-customfieldseparator">: </span>
+                                </span>
+                                <span class="core-customfieldvalue">
+                                    <core-format-text [text]="field.value" [collapsible-item]="field.type == 'textarea'  ? '' : null"
+                                        contextLevel="course" [contextInstanceId]="course.id">
+                                    </core-format-text>
+                                </span>
+                            </div>
+                        </ng-container>
+                    </ion-label>
+                </ion-item>
+            </div>
         </div>
     </core-loading>
 </ion-content>
 
 <ion-footer *ngIf="course && dataLoaded">
-    <ng-container *ngIf="canAccessCourse">
-        <ion-button *ngFor="let item of courseMenuHandlers" (click)="openMenuItem(item)" [class]="'ion-text-wrap '+ item.data.class"
-            expand="block">
-            <ion-icon *ngIf="item.data.icon" [name]="item.data.icon" slot="start" aria-hidden="true"></ion-icon>
-            <ion-label>{{item.data.title | translate }}</ion-label>
+    <div class="list-item-limited-width">
+        <ng-container *ngIf="canAccessCourse">
+            <ion-button *ngFor="let item of courseMenuHandlers" (click)="openMenuItem(item)" [class]="'ion-text-wrap '+ item.data.class"
+                expand="block">
+                <ion-icon *ngIf="item.data.icon" [name]="item.data.icon" slot="start" aria-hidden="true"></ion-icon>
+                <ion-label>{{item.data.title | translate }}</ion-label>
+            </ion-button>
+        </ng-container>
+
+        <ion-button expand="block" (click)="enrolMe()" *ngIf="!isEnrolled && (selfEnrolInstances.length > 0 || otherEnrolments)"
+            class="ion-text-wrap">
+            {{ 'core.courses.enrolme' | translate }}
         </ion-button>
-    </ng-container>
 
-    <ion-button expand="block" (click)="enrolMe()" *ngIf="!isEnrolled && (selfEnrolInstances.length > 0 || otherEnrolments)"
-        class="ion-text-wrap">
-        {{ 'core.courses.enrolme' | translate }}
-    </ion-button>
+        <ion-card class="core-info-card ion-text-wrap" *ngIf="!isEnrolled && !selfEnrolInstances.length && !otherEnrolments">
+            <ion-item>
+                <ion-icon name="fas-info-circle" slot="start" aria-hidden="true"></ion-icon>
+                <ion-label>{{ 'core.courses.notenrollable' | translate }}</ion-label>
+            </ion-item>
+        </ion-card>
 
-    <ion-card class="core-info-card ion-text-wrap" *ngIf="!isEnrolled && !selfEnrolInstances.length && !otherEnrolments">
-        <ion-item>
-            <ion-icon name="fas-info-circle" slot="start" aria-hidden="true"></ion-icon>
-            <ion-label>{{ 'core.courses.notenrollable' | translate }}</ion-label>
-        </ion-item>
-    </ion-card>
-
-    <ion-button (click)="openCourse()" *ngIf="!isModal && canAccessCourse" expand="block" fill="outline" class="ion-text-wrap">
-        <ion-icon name="fas-eye" slot="start" aria-hidden="true"></ion-icon>
-        {{ 'core.course.viewcourse' | translate }}
-    </ion-button>
+        <ion-button (click)="openCourse()" *ngIf="!isModal && canAccessCourse" expand="block" fill="outline" class="ion-text-wrap">
+            <ion-icon name="fas-eye" slot="start" aria-hidden="true"></ion-icon>
+            {{ 'core.course.viewcourse' | translate }}
+        </ion-button>
+    </div>
 </ion-footer>
diff --git a/src/core/features/course/pages/course-summary/course-summary.scss b/src/core/features/course/pages/course-summary/course-summary.scss
index 477f4a454..17f6c76af 100644
--- a/src/core/features/course/pages/course-summary/course-summary.scss
+++ b/src/core/features/course/pages/course-summary/course-summary.scss
@@ -39,11 +39,14 @@
     .course-container {
         position: relative;
         top: calc(var(--thumb-height) - var(--big-radius));
+        border-radius: var(--big-radius) var(--big-radius) 0 0;
+        background-color: var(--ion-background-color);
+        box-shadow: var(--drop-shadow-top);
+        clip-path: inset(-5px 0px 0px 0px);
     }
 
     .course-name {
-        border-radius: var(--big-radius) var(--big-radius) 0 0;
-        box-shadow: var(--drop-shadow-top);
+        --background: transparent;
         ion-label {
             margin-bottom: 0px;
         }

From 1819c743a6ce8100c404fe0958ed54d9797c0928 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 16 Mar 2022 11:56:25 +0100
Subject: [PATCH 0736/1008] MOBILE-3814 chore: Create a wait to be visible
 function

---
 src/core/directives/on-appear.ts |  8 +++----
 src/core/services/utils/dom.ts   | 37 +++++++++++++++++++++++++++++++-
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/src/core/directives/on-appear.ts b/src/core/directives/on-appear.ts
index 267fd3f9f..c894878dc 100644
--- a/src/core/directives/on-appear.ts
+++ b/src/core/directives/on-appear.ts
@@ -27,7 +27,7 @@ export class CoreOnAppearDirective implements OnInit, OnDestroy {
     @Output() onAppear = new EventEmitter();
 
     private element: HTMLElement;
-    protected domPromise?: CoreCancellablePromise<void>;
+    protected visiblePromise?: CoreCancellablePromise<void>;
 
     constructor(element: ElementRef) {
         this.element = element.nativeElement;
@@ -37,9 +37,9 @@ export class CoreOnAppearDirective implements OnInit, OnDestroy {
      * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
-        this.domPromise = CoreDomUtils.waitToBeInDOM(this.element);
+        this.visiblePromise = CoreDomUtils.waitToBeVisible(this.element);
 
-        await this.domPromise;
+        await this.visiblePromise;
 
         this.onAppear.emit();
     }
@@ -48,7 +48,7 @@ export class CoreOnAppearDirective implements OnInit, OnDestroy {
      * @inheritdoc
      */
     ngOnDestroy(): void {
-        this.domPromise?.cancel();
+        this.visiblePromise?.cancel();
     }
 
 }
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index 380064f49..0e8f1dfc1 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -100,7 +100,7 @@ export class CoreDomUtilsProvider {
      * @param timeout If defined, timeout to wait before rejecting the promise.
      * @return Cancellable promise.
      */
-    waitToBeInDOM(element: Element, timeout?: number): CoreCancellablePromise<void> {
+    waitToBeInDOM(element: HTMLElement, timeout?: number): CoreCancellablePromise<void> {
         const root = element.getRootNode({ composed: true });
 
         if (root === document) {
@@ -140,6 +140,41 @@ export class CoreDomUtilsProvider {
         );
     }
 
+    /**
+     * Wait an element to be in dom and visible.
+     *
+     * @param element Element to wait.
+     * @return Cancellable promise.
+     */
+    waitToBeVisible(element: HTMLElement): CoreCancellablePromise<void> {
+        const domPromise = CoreDomUtils.waitToBeInDOM(element);
+
+        let interval: number | undefined;
+
+        return new CoreCancellablePromise<void>(
+            async (resolve) => {
+                await domPromise;
+
+                if (CoreDomUtils.isElementVisible(element)) {
+                    return resolve();
+                }
+
+                interval = window.setInterval(() => {
+                    if (!CoreDomUtils.isElementVisible(element)) {
+                        return;
+                    }
+
+                    resolve();
+                    window.clearInterval(interval);
+                }, 50);
+            },
+            () => {
+                domPromise.cancel();
+                window.clearInterval(interval);
+            },
+        );
+    }
+
     /**
      * Window resize is widely checked and may have many performance issues, debouce usage is needed to avoid calling it too much.
      * This function helps setting up the debounce feature and remove listener easily.

From 2887290c30abd1a10c0355836525ae507285c60e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 16 Mar 2022 12:15:32 +0100
Subject: [PATCH 0737/1008] MOBILE-3814 course: Add course header background
 color

---
 .../features/course/pages/index/index.html    | 39 ++++++++++---------
 .../features/course/pages/index/index.scss    |  4 ++
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/core/features/course/pages/index/index.html b/src/core/features/course/pages/index/index.html
index a0e768d08..7c445a8af 100644
--- a/src/core/features/course/pages/index/index.html
+++ b/src/core/features/course/pages/index/index.html
@@ -16,24 +16,25 @@
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
-<ion-item class="core-format-progress-list ion-text-wrap list-item-limited-width" collapsible>
-    <ng-container *ngIf="course">
-        <div *ngIf="!course.courseImage" #courseThumb slot="start" class="core-course-thumb">
-            <ion-icon *ngIf="!course.courseImage" name="fas-graduation-cap" class="course-icon" aria-hidden="true">
-            </ion-icon>
-        </div>
-        <ion-avatar *ngIf="course.courseImage" slot="start" class="core-course-thumb">
-            <img [src]="course.courseImage" core-external-content alt="" />
-        </ion-avatar>
-    </ng-container>
+<div class="core-course-header">
+    <ion-item class="core-format-progress-list ion-text-wrap list-item-limited-width" collapsible>
+        <ng-container *ngIf="course">
+            <div *ngIf="!course.courseImage" #courseThumb slot="start" class="core-course-thumb">
+                <ion-icon *ngIf="!course.courseImage" name="fas-graduation-cap" class="course-icon" aria-hidden="true">
+                </ion-icon>
+            </div>
+            <ion-avatar *ngIf="course.courseImage" slot="start" class="core-course-thumb">
+                <img [src]="course.courseImage" core-external-content alt="" />
+            </ion-avatar>
+        </ng-container>
 
-    <ion-label>
-        <h1>{{ title }}</h1>
-        <div class="core-course-progress" *ngIf="progress !== undefined">
-            <core-progress-bar [progress]="progress" a11yText="core.course.aria:sectionprogress">
-            </core-progress-bar>
-        </div>
-    </ion-label>
-
-</ion-item>
+        <ion-label>
+            <h1>{{ title }}</h1>
+            <div class="core-course-progress" *ngIf="progress !== undefined">
+                <core-progress-bar [progress]="progress" a11yText="core.course.aria:sectionprogress">
+                </core-progress-bar>
+            </div>
+        </ion-label>
+    </ion-item>
+</div>
 <core-tabs-outlet [tabs]="tabs" [hideUntil]="loaded" (ionChange)="tabSelected()"></core-tabs-outlet>
diff --git a/src/core/features/course/pages/index/index.scss b/src/core/features/course/pages/index/index.scss
index 6b75fd1e8..3ae1498bb 100644
--- a/src/core/features/course/pages/index/index.scss
+++ b/src/core/features/course/pages/index/index.scss
@@ -44,4 +44,8 @@
     h1 {
         font-size: 20px;
     }
+
+    .core-course-header {
+        background: var(--ion-item-background);
+    }
 }

From fed1e399bcaba9039479c1f826c55a0d33bb0cf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 16 Mar 2022 12:37:19 +0100
Subject: [PATCH 0738/1008] MOBILE-3814 lint: Fix missing spaces after
 assignment

---
 .../pages/group-conversations/group-conversations.page.ts     | 2 +-
 src/core/components/navigation-bar/navigation-bar.ts          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/addons/messages/pages/group-conversations/group-conversations.page.ts b/src/addons/messages/pages/group-conversations/group-conversations.page.ts
index 3e6216af7..f2d572663 100644
--- a/src/addons/messages/pages/group-conversations/group-conversations.page.ts
+++ b/src/addons/messages/pages/group-conversations/group-conversations.page.ts
@@ -271,7 +271,7 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
     async ngOnInit(): Promise<void> {
         this.route.queryParams.subscribe(async (params) => {
             // When a child page loads this callback is triggered too.
-            const conversationId =CoreNavigator.getRouteNumberParam('conversationId', { params });
+            const conversationId = CoreNavigator.getRouteNumberParam('conversationId', { params });
             const userId = CoreNavigator.getRouteNumberParam('userId', { params });
             if (conversationId || userId) {
                 // Update the selected ones.
diff --git a/src/core/components/navigation-bar/navigation-bar.ts b/src/core/components/navigation-bar/navigation-bar.ts
index 2fb5af91f..67b072824 100644
--- a/src/core/components/navigation-bar/navigation-bar.ts
+++ b/src/core/components/navigation-bar/navigation-bar.ts
@@ -67,7 +67,7 @@ export class CoreNavigationBarComponent implements OnChanges {
         this.progress = ((this.currentIndex + 1) / this.items.length) * 100;
         this.progressText = `${this.currentIndex + 1} / ${this.items.length}`;
 
-        this.nextIndex =this.currentIndex + 1;
+        this.nextIndex = this.currentIndex + 1;
         while (this.items[this.nextIndex] && !this.items[this.nextIndex].enabled) {
             this.nextIndex++;
         }
@@ -75,7 +75,7 @@ export class CoreNavigationBarComponent implements OnChanges {
             ? Translate.instant(this.nextTranslate, { $a: this.items[this.nextIndex].title || '' })
             : '';
 
-        this.previousIndex =this.currentIndex - 1;
+        this.previousIndex = this.currentIndex - 1;
         while (this.items[this.previousIndex] && !this.items[this.previousIndex].enabled) {
             this.previousIndex--;
         }

From 2c6f2bb6e66c709c59546d23bce39bf5f0cc293a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 16 Mar 2022 12:52:47 +0100
Subject: [PATCH 0739/1008] MOBILE-3814 course: Fix dark mode issues on course
 index

---
 .../features/course/components/course-index/course-index.scss | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/core/features/course/components/course-index/course-index.scss b/src/core/features/course/components/course-index/course-index.scss
index db08d3ad2..f4575ba22 100644
--- a/src/core/features/course/components/course-index/course-index.scss
+++ b/src/core/features/course/components/course-index/course-index.scss
@@ -18,6 +18,7 @@ ion-item.item {
 
     &.item-current {
         --background: var(--primary-tint);
+        --color: var(--gray-900);
         border: 0;
     }
 
@@ -34,6 +35,7 @@ ion-item.item {
 
                 &:hover {
                     background: var(--primary-shade);
+                    color: var(--gray-100);
                 }
             }
         }
@@ -43,7 +45,7 @@ ion-item.item {
             margin: 3px;
             border-radius: 50%;
             &:hover {
-                background: var(--gray-300);
+                background: var(--secondary);
             }
         }
 

From 4c06b78e8e7984609bb738d5a37d436933b62f89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 16 Mar 2022 13:33:06 +0100
Subject: [PATCH 0740/1008] MOBILE-3814 notifications: Fix dark mode issues on
 notifications page

---
 src/addons/notifications/notifications.scss   | 38 ++++++++++++-------
 src/addons/notifications/pages/list/list.html |  7 ++--
 .../pages/notification/notification.html      |  6 ++-
 .../components/user-avatar/user-avatar.scss   |  2 -
 4 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/src/addons/notifications/notifications.scss b/src/addons/notifications/notifications.scss
index 23e962567..5285ea7f0 100644
--- a/src/addons/notifications/notifications.scss
+++ b/src/addons/notifications/notifications.scss
@@ -1,29 +1,39 @@
 @import "~theme/globals";
 
 :host {
-    ::ng-deep {
-        core-user-avatar .core-avatar-extra {
+    --extra-icon-size: 16px;
+
+    ::ng-deep core-user-avatar {
+        .core-avatar-extra-img,
+        core-mod-icon {
             margin: 0 !important;
             position: absolute;
             right: -4px;
             bottom: -4px;
-        }
-        core-user-avatar img.core-avatar-extra {
-            background: none;
-            width: 24px;
-            height: 24px;
-            border-radius: 0 !important;
-        }
-        core-user-avatar core-mod-icon.core-avatar-extra {
-            --size: 16px;
             padding: 0.2rem;
         }
+
+        .core-avatar-extra-img {
+            background: var(--background-color);
+            border-radius: var(--medium-radius);
+            img {
+                max-width: var(--extra-icon-size);
+                max-height: var(--extra-icon-size);
+                display: block;
+            }
+        }
+
+        core-mod-icon  {
+            --size: var(--extra-icon-size);
+        }
     }
 
     .core-notification-icon {
-        width: 34px;
-        height: 34px;
-        margin: 10px !important;
+        width: var(--core-avatar-size);
+        height: var(--core-avatar-size);
+        @include margin(6px, 8px, 6px, 0px);
+        background: var(--background-color);
+        border-radius: var(--small-radius);
     }
 
     .item core-format-text ::ng-deep {
diff --git a/src/addons/notifications/pages/list/list.html b/src/addons/notifications/pages/list/list.html
index d3b9fe72e..bac0b73c5 100644
--- a/src/addons/notifications/pages/list/list.html
+++ b/src/addons/notifications/pages/list/list.html
@@ -36,10 +36,11 @@
                     <core-user-avatar *ngIf="notification.useridfrom > 0" [user]="notification" slot="start"
                         [profileUrl]="notification.profileimageurlfrom" [fullname]="notification.userfromfullname"
                         [userId]="notification.useridfrom">
-                        <img *ngIf="notification.iconurl && !notification.modname" [src]="notification.iconurl" alt="" role="presentation"
-                            class="core-avatar-extra">
+                        <div class="core-avatar-extra-img" *ngIf="notification.iconurl && !notification.modname">
+                            <img [src]="notification.iconurl" alt="" role="presentation">
+                        </div>
                         <core-mod-icon *ngIf="notification.modname" [modicon]="notification.iconurl" [modname]="notification.modname"
-                            [showAlt]="false" class="core-avatar-extra">
+                            [showAlt]="false">
                         </core-mod-icon>
                     </core-user-avatar>
 
diff --git a/src/addons/notifications/pages/notification/notification.html b/src/addons/notifications/pages/notification/notification.html
index 371835ddb..c0566dee0 100644
--- a/src/addons/notifications/pages/notification/notification.html
+++ b/src/addons/notifications/pages/notification/notification.html
@@ -13,8 +13,10 @@
         <ion-item class="ion-text-wrap" [attr.aria-label]="subject">
             <core-user-avatar *ngIf="userIdFrom > 0" slot="start" [userId]="userIdFrom" [profileUrl]="profileImageUrlFrom"
                 [fullname]="userFromFullName">
-                <img *ngIf="iconUrl && !modname" [src]="iconUrl" alt="" role="presentation" class="core-avatar-extra">
-                <core-mod-icon *ngIf="modname" [modicon]="iconUrl" [modname]="modname" [showAlt]="false" class="core-avatar-extra">
+                <div class="core-avatar-extra-img" *ngIf="iconUrl && !modname">
+                    <img [src]="iconUrl" alt="" role="presentation">
+                </div>
+                <core-mod-icon *ngIf="modname" [modicon]="iconUrl" [modname]="modname" [showAlt]="false">
                 </core-mod-icon>
             </core-user-avatar>
 
diff --git a/src/core/components/user-avatar/user-avatar.scss b/src/core/components/user-avatar/user-avatar.scss
index ad04a1ec8..38eea5500 100644
--- a/src/core/components/user-avatar/user-avatar.scss
+++ b/src/core/components/user-avatar/user-avatar.scss
@@ -78,8 +78,6 @@
 }
 
 :host-context(ion-item) {
-    margin-top: 6px;
-    margin-bottom: 6px;
     @include margin(6px, 8px, 6px, 0px);
     img {
         min-width: var(--core-avatar-size);

From d42bbdf2ca5001020dc4e64b70ccb14ac12b5254 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 16 Mar 2022 14:11:17 +0100
Subject: [PATCH 0741/1008] MOBILE-3930 course: Mark site plugins as module
 viewed

---
 .../components/module-index/module-index.ts          | 12 ++++++++----
 .../components/plugin-content/plugin-content.ts      | 11 ++++++++---
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/core/features/siteplugins/components/module-index/module-index.ts b/src/core/features/siteplugins/components/module-index/module-index.ts
index bbaebb0d2..a0001552f 100644
--- a/src/core/features/siteplugins/components/module-index/module-index.ts
+++ b/src/core/features/siteplugins/components/module-index/module-index.ts
@@ -21,6 +21,7 @@ import {
     CoreCourseModuleSummaryResult,
     CoreCourseModuleSummaryComponent,
 } from '@features/course/components/module-summary/module-summary';
+import { CoreCourse } from '@features/course/services/course';
 import { CoreCourseHelper, CoreCourseModuleData } from '@features/course/services/course-helper';
 import {
     CoreCourseModuleDelegate,
@@ -35,7 +36,7 @@ import {
 import { IonRefresher } from '@ionic/angular';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
-import { CoreSitePluginsPluginContentComponent } from '../plugin-content/plugin-content';
+import { CoreSitePluginsPluginContentComponent, CoreSitePluginsPluginContentLoadedData } from '../plugin-content/plugin-content';
 
 /**
  * Component that displays the index of a module site plugin.
@@ -161,9 +162,12 @@ export class CoreSitePluginsModuleIndexComponent implements OnInit, OnDestroy, C
     /**
      * Function called when the data of the site plugin content is loaded.
      */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    contentLoaded(refresh: boolean): void {
-        return;
+    contentLoaded(data: CoreSitePluginsPluginContentLoadedData): void {
+        if (data.success) {
+            CoreCourse.storeModuleViewed(this.courseId, this.module.id, {
+                sectionId: this.module.section,
+            });
+        }
     }
 
     /**
diff --git a/src/core/features/siteplugins/components/plugin-content/plugin-content.ts b/src/core/features/siteplugins/components/plugin-content/plugin-content.ts
index ce4c7e2d9..1704e3cff 100644
--- a/src/core/features/siteplugins/components/plugin-content/plugin-content.ts
+++ b/src/core/features/siteplugins/components/plugin-content/plugin-content.ts
@@ -43,7 +43,7 @@ export class CoreSitePluginsPluginContentComponent implements OnInit, DoCheck {
     @Input() data?: Record<string, unknown>; // Data to pass to the component.
     @Input() preSets?: CoreSiteWSPreSets; // The preSets for the WS call.
     @Input() pageTitle?: string; // Current page title. It can be used by the "new-content" directives.
-    @Output() onContentLoaded = new EventEmitter<boolean>(); // Emits an event when the content is loaded.
+    @Output() onContentLoaded = new EventEmitter<CoreSitePluginsPluginContentLoadedData>(); // Emits event when content is loaded.
     @Output() onLoadingContent = new EventEmitter<boolean>(); // Emits an event when starts to load the content.
 
     content?: string; // Content.
@@ -114,11 +114,11 @@ export class CoreSitePluginsPluginContentComponent implements OnInit, DoCheck {
             this.jsData.updateContent = this.updateContent.bind(this);
             this.jsData.updateModuleCourseContent = this.updateModuleCourseContent.bind(this);
 
-            this.onContentLoaded.emit(refresh);
+            this.onContentLoaded.emit({ refresh: !!refresh, success: true });
         } catch (error) {
             // Make it think it's loaded - otherwise it sticks on 'loading' and stops navigation working.
             this.content = '<div></div>';
-            this.onContentLoaded.emit(refresh);
+            this.onContentLoaded.emit({ refresh: !!refresh, success: false });
 
             CoreDomUtils.showErrorModalDefault(error, 'core.errorloadingcontent', true);
         } finally {
@@ -237,3 +237,8 @@ export class CoreSitePluginsPluginContentComponent implements OnInit, DoCheck {
     }
 
 }
+
+export type CoreSitePluginsPluginContentLoadedData = {
+    refresh: boolean;
+    success: boolean;
+};

From a6e56edd579ef10b86d617255e8af77e6a53fa1a Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 16 Mar 2022 14:33:47 +0100
Subject: [PATCH 0742/1008] MOBILE-3930 course: Don't mark labels as not viewed

---
 .../features/course/components/module/core-course-module.html   | 2 +-
 src/core/features/course/components/module/module.scss          | 2 +-
 src/core/features/course/components/module/module.ts            | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/core/features/course/components/module/core-course-module.html b/src/core/features/course/components/module/core-course-module.html
index 437f2f075..fe3204278 100644
--- a/src/core/features/course/components/module/core-course-module.html
+++ b/src/core/features/course/components/module/core-course-module.html
@@ -1,4 +1,4 @@
-<ion-card *ngIf="module.handlerData && module.visibleoncoursepage !== 0">
+<ion-card *ngIf="module.handlerData && module.visibleoncoursepage !== 0" [class.core-course-module-with-view]="moduleHasView">
     <ng-container *ngIf="!module.handlerData.loading">
         <ion-item id="core-course-module-{{module.id}}" detail="false"
             class="ion-text-wrap core-course-module-handler core-module-main-item {{module.handlerData.class}}"
diff --git a/src/core/features/course/components/module/module.scss b/src/core/features/course/components/module/module.scss
index be50d8664..2ef99974b 100644
--- a/src/core/features/course/components/module/module.scss
+++ b/src/core/features/course/components/module/module.scss
@@ -93,7 +93,7 @@
         display: none;
     }
 
-    &.core-course-module-not-viewed {
+    &.core-course-module-not-viewed ion-card.core-course-module-with-view {
         --ion-card-border-color: var(--core-course-module-not-viewed-border-color);
     }
 
diff --git a/src/core/features/course/components/module/module.ts b/src/core/features/course/components/module/module.ts
index 471e7e7d9..c90e0407d 100644
--- a/src/core/features/course/components/module/module.ts
+++ b/src/core/features/course/components/module/module.ts
@@ -57,6 +57,7 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy {
     prefetchStatusIcon = ''; // Module prefetch status icon.
     prefetchStatusText = ''; // Module prefetch status text.
     autoCompletionTodo = false;
+    moduleHasView = true;
 
     protected prefetchHandler?: CoreCourseModulePrefetchHandler;
 
@@ -77,6 +78,7 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy {
         }
 
         this.module.handlerData.a11yTitle = this.module.handlerData.a11yTitle ?? this.module.handlerData.title;
+        this.moduleHasView = CoreCourse.moduleHasView(this.module);
 
         const completionStatus = this.showCompletionConditions && this.module.completiondata?.isautomatic &&
             this.module.completiondata.tracking == CoreCourseModuleCompletionTracking.COMPLETION_TRACKING_AUTOMATIC

From 76c1e7834eadef19a1f4cb889b46a20f6336fcc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 16 Mar 2022 14:28:26 +0100
Subject: [PATCH 0743/1008] MOBILE-3814 style: Update ionic helpers

---
 src/core/features/login/pages/site/site.scss  |   5 +-
 src/theme/components/collapsible-item.scss    |   4 +-
 src/theme/globals.mixins.ionic.scss           | 629 ------------------
 src/theme/globals.scss                        |   6 +-
 .../custom.mixins.scss}                       | 138 ++--
 src/theme/helpers/helpers.scss                |  15 +
 .../helpers/ionic.components.mixins.scss      |  48 ++
 src/theme/helpers/ionic.functions.color.scss  |  66 ++
 src/theme/helpers/ionic.functions.string.scss | 160 +++++
 src/theme/helpers/ionic.mixins.scss           | 542 +++++++++++++++
 src/theme/theme.light.scss                    |   2 +-
 11 files changed, 913 insertions(+), 702 deletions(-)
 delete mode 100644 src/theme/globals.mixins.ionic.scss
 rename src/theme/{globals.mixins.scss => helpers/custom.mixins.scss} (65%)
 create mode 100644 src/theme/helpers/helpers.scss
 create mode 100644 src/theme/helpers/ionic.components.mixins.scss
 create mode 100644 src/theme/helpers/ionic.functions.color.scss
 create mode 100644 src/theme/helpers/ionic.functions.string.scss
 create mode 100644 src/theme/helpers/ionic.mixins.scss

diff --git a/src/core/features/login/pages/site/site.scss b/src/core/features/login/pages/site/site.scss
index 927315fa1..b7e1f5767 100644
--- a/src/core/features/login/pages/site/site.scss
+++ b/src/core/features/login/pages/site/site.scss
@@ -38,9 +38,8 @@
         max-width: fit-content;
         width: auto;
         height: auto;
-        margin: 0 auto;
-        margin-left: 50%;
-        transform: translateX(-50%);
+        margin: 0 50% 0 auto; // LTR will be applied on transform.
+        @include transform(translate3d(-50%,0,0));
         object-fit: cover;
         object-position: 50% 50%;
     }
diff --git a/src/theme/components/collapsible-item.scss b/src/theme/components/collapsible-item.scss
index 3aad02e3e..33d010fda 100644
--- a/src/theme/components/collapsible-item.scss
+++ b/src/theme/components/collapsible-item.scss
@@ -53,10 +53,10 @@
 
                     @include core-transition(transform, 500ms);
 
-                    @include push-arrow-color(626262, true);
+                    @include push-arrow-color(#626262);
 
                     @include darkmode() {
-                        @include push-arrow-color(ffffff, true);
+                        @include push-arrow-color(#ffffff);
                     }
                 }
             }
diff --git a/src/theme/globals.mixins.ionic.scss b/src/theme/globals.mixins.ionic.scss
deleted file mode 100644
index 3e9421a1b..000000000
--- a/src/theme/globals.mixins.ionic.scss
+++ /dev/null
@@ -1,629 +0,0 @@
-/*
- * Imported ionic mixins for SCSS
- * ----------------------------------------------------------------------------
- * Place here our custom mixins.
- * Extracted from ionic.mixins.scss
- * https://github.com/ionic-team/ionic-framework/blob/master/core/src/themes/ionic.mixins.scss
- */
-
-// Responsive Mixins
-// --------------------------------------------------
-// Creates a fixed width for the grid based on the screen size
-// ---------------------------------------------------------------------------------
-@mixin make-grid-widths($widths: $grid-widths, $breakpoints: $screen-breakpoints) {
-  @each $breakpoint, $width in $widths {
-    @include media-breakpoint-up($breakpoint, $breakpoints) {
-      width: $width;
-    }
-  }
-
-  max-width: 100%;
-}
-
-// Adds padding to the element based on breakpoints
-// ---------------------------------------------------------------------------------
-@mixin make-breakpoint-padding($paddings) {
-  @each $breakpoint in map-keys($paddings) {
-    @include media-breakpoint-up($breakpoint) {
-      $padding: map-get($paddings, $breakpoint);
-
-      @include padding($padding);
-    }
-  }
-}
-
-// Gets the active color's css variable from a variation. Alpha is optional.
-// --------------------------------------------------------------------------------------------
-// Example usage:
-// current-color(base) => var(--ion-color-base)
-// current-color(contrast, 0.1) => rgba(var(--ion-color-contrast-rgb), 0.1)
-// --------------------------------------------------------------------------------------------
-@function current-color($variation, $alpha: null) {
-  @if $alpha == null {
-    @return var(--ion-color-#{$variation});
-  } @else {
-    @return rgba(var(--ion-color-#{$variation}-rgb), #{$alpha});
-  }
-}
-
-// Mixes a color with black to create its shade.
-// Default to bootstrap level 6.
-// --------------------------------------------------------------------------------------------
-@function get-color-shade($color, $percent: 48%) {
-  @return mix(#000, $color, $percent);
-}
-
-// Mixes a color with white to create its tint.
-// Default to bootstrap level -10.
-// --------------------------------------------------------------------------------------------
-@function get-color-tint($color, $percent: 80%) {
-  @return mix(#fff, $color, $percent);
-}
-
-// Converts a color to a comma separated rgb.
-// --------------------------------------------------------------------------------------------
-@function color-to-rgb-list($color) {
-  @return #{red($color)},#{green($color)},#{blue($color)};
-}
-
-
-// Ionic Colors
-// --------------------------------------------------
-// Generates the color classes and variables based on the
-// colors map
-
-@mixin generate-color($color-name, $colors) {
-    $base: map-get($colors, $color-name);
-    $light: map-get($base, 'light');
-
-    @include generate-color-variants($color-name, $light);
-
-    body.dark {
-        $dark: map-get($base, 'dark');
-        $dark: mix($light, white, 80%) !default;
-        @include generate-color-variants($color-name, $dark);
-    }
-}
-
-@mixin generate-color-variants($color-name, $base) {
-    $contrast: get_contrast_color($base);
-    $shade: get-color-shade($base);
-    $tint: get-color-tint($base);
-
-    --#{$color-name}: #{$base};
-    --#{$color-name}-shade: #{$shade};
-    --#{$color-name}-tint: #{$tint};
-    --#{$color-name}-contrast: #{$contrast};
-
-    // Internal ionic use only.
-    --ion-color-#{$color-name}: var(--#{$color-name});
-    --ion-color-#{$color-name}-base: var(--ion-color-#{$color-name});
-    --ion-color-#{$color-name}-rgb: #{color-to-rgb-list($base)};
-    --ion-color-#{$color-name}-contrast: #{$contrast};
-    --ion-color-#{$color-name}-contrast-rgb: #{color-to-rgb-list($contrast)};
-    --ion-color-#{$color-name}-shade: #{$shade};
-    --ion-color-#{$color-name}-tint: #{$tint};
-
-    .ion-color-#{$color-name} {
-        --ion-color: var(--ion-color-#{$color-name});
-        --ion-color-base: var(--ion-color-#{$color-name}-base);
-        --ion-color-rgb: var(--ion-color-#{$color-name}-rgb);
-        --ion-color-contrast: var(--ion-color-#{$color-name}-contrast);
-        --ion-color-contrast-rgb: var(--ion-color-#{$color-name}-contrast-rgb);
-        --ion-color-shade: var(--ion-color-#{$color-name}-shade);
-        --ion-color-tint: var(--ion-color-#{$color-name}-tint);
-    }
-}
-
-@mixin input-cover() {
-    @include position(0, null, null, 0);
-    @include margin(0);
-
-    position: absolute;
-
-    width: 100%;
-    height: 100%;
-
-    border: 0;
-    background: transparent;
-    cursor: pointer;
-
-    appearance: none;
-    outline: none;
-
-    &::-moz-focus-inner {
-        border: 0;
-    }
-}
-
-@mixin text-inherit() {
-    font-family: inherit;
-    font-size: inherit;
-    font-style: inherit;
-    font-weight: inherit;
-    letter-spacing: inherit;
-    text-decoration: inherit;
-    text-indent: inherit;
-    text-overflow: inherit;
-    text-transform: inherit;
-    text-align: inherit;
-    white-space: inherit;
-    color: inherit;
-}
-
-@mixin button-state() {
-    @include position(0, 0, 0, 0);
-
-    position: absolute;
-
-    content: "";
-
-    opacity: 0;
-}
-
-// Font smoothing
-// --------------------------------------------------
-
-@mixin font-smoothing() {
-    -moz-osx-font-smoothing: grayscale;
-    -webkit-font-smoothing: antialiased;
-}
-
-// Get the key from a map based on the index
-@function index-to-key($map, $index) {
-    $keys: map-keys($map);
-
-    @return nth($keys, $index);
-}
-
-
-// Breakpoint Mixins
-// ---------------------------------------------------------------------------------
-
-// Breakpoint viewport sizes and media queries.
-//
-// Breakpoints are defined as a map of (name: minimum width), order from small to large:
-//
-//    (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px)
-//
-// The map defined in the `$screen-breakpoints` global variable is used as the `$breakpoints` argument by default.
-
-// ---------------------------------------------------------------------------------
-
-// Minimum breakpoint width. Null for the smallest (first) breakpoint.
-//
-//    >> breakpoint-min(sm, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px))
-//    576px
-@function breakpoint-min($name, $breakpoints: $screen-breakpoints) {
-    $min: map-get($breakpoints, $name);
-
-    @return if($name != index-to-key($breakpoints, 1), $min, null);
-}
-
-// Returns a blank string if smallest breakpoint, otherwise returns the name with a dash infront.
-// Useful for making responsive utilities.
-//
-//    >> breakpoint-infix(xs, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px))
-//    ""  (Returns a blank string)
-//    >> breakpoint-infix(sm, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px))
-//    "-sm"
-@function breakpoint-infix($name, $breakpoints: $screen-breakpoints) {
-    @return if(breakpoint-min($name, $breakpoints) == null, "", "-#{$name}");
-}
-
-// Media of at least the minimum breakpoint width. No query for the smallest breakpoint.
-// Makes the @content apply to the given breakpoint and wider.
-@mixin media-breakpoint-up($name, $breakpoints: $screen-breakpoints) {
-    $min: breakpoint-min($name, $breakpoints);
-    @if $min {
-        @media (min-width: $min) {
-            @content;
-        }
-    } @else {
-        @content;
-    }
-}
-
-// Name of the next breakpoint, or null for the last breakpoint.
-//
-//    >> breakpoint-next(sm)
-//    md
-//    >> breakpoint-next(sm, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px))
-//    md
-//    >> breakpoint-next(sm, $breakpoint-names: (xs sm md lg xl))
-//    md
-@function breakpoint-next($name, $breakpoints: $screen-breakpoints, $breakpoint-names: map-keys($breakpoints)) {
-    $n: index($breakpoint-names, $name);
-    @return if($n < length($breakpoint-names), nth($breakpoint-names, $n + 1), null);
-}
-
-// Maximum breakpoint width. Null for the smallest (first) breakpoint.
-// The maximum value is reduced by 0.02px to work around the limitations of
-// `min-` and `max-` prefixes and viewports with fractional widths.
-//
-// See https://www.w3.org/TR/mediaqueries-4/#mq-min-max
-// Uses 0.02px rather than 0.01px to work around a current rounding bug in Safari.	// Uses 0.02px rather than 0.01px to work around a current rounding bug in Safari.
-// See https://bugs.webkit.org/show_bug.cgi?id=178261	// See https://bugs.webkit.org/show_bug.cgi?id=178261
-//
-//    >> breakpoint-max(md, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px))
-//    767.98px
-@function breakpoint-max($name, $breakpoints: $screen-breakpoints) {
-    $max: map-get($breakpoints, $name);
-    @return if($max and $max > 0, $max - .02, null);
-}
-
-// Media of at most the maximum breakpoint width. No query for the largest breakpoint.
-// Makes the @content apply to the given breakpoint and narrower.
-@mixin media-breakpoint-down($name, $breakpoints: $screen-breakpoints) {
-    $max: breakpoint-max($name, $breakpoints);
-    @if $max {
-        @media (max-width: $max) {
-            @content;
-        }
-    } @else {
-        @content;
-    }
-}
-
-
-// Text Direction - ltr / rtl
-//
-// CSS defaults to use the ltr css, and adds [dir=rtl] selectors
-// to override ltr defaults.
-// ----------------------------------------------------------
-
-@mixin multi-dir() {
-    @content;
-
-    // $root: #{&};
-    // @at-root [dir] {
-    //   #{$root} {
-    //     @content;
-    //   }
-    // }
-}
-
-@mixin rtl() {
-    $root: #{&};
-
-    @at-root [dir=rtl] {
-        #{$root} {
-            @content;
-        }
-    }
-}
-
-@mixin ltr() {
-    @content;
-}
-
-
-// SVG Background Image Mixin
-// @param {string} $svg
-// ----------------------------------------------------------
-@mixin svg-background-image($svg, $flip-rtl: false) {
-    $url: url-encode($svg);
-    $viewBox: str-split(str-extract($svg, "viewBox='", "'"), " ");
-
-    @if $flip-rtl != true or $viewBox == null {
-        @include multi-dir() {
-            background-image: url("data:image/svg+xml;charset=utf-8,#{$url}");
-        }
-    } @else {
-        $transform: "transform='translate(#{nth($viewBox, 3)}, 0) scale(-1, 1)'";
-        $flipped-url: $svg;
-        $flipped-url: str-replace($flipped-url, "<path", "<path #{$transform}");
-        $flipped-url: str-replace($flipped-url, "<line", "<line #{$transform}");
-        $flipped-url: str-replace($flipped-url, "<polygon", "<polygon #{$transform}");
-        $flipped-url: url-encode($flipped-url);
-
-        @include ltr () {
-            background-image: url("data:image/svg+xml;charset=utf-8,#{$url}");
-        }
-        @include rtl() {
-            background-image: url("data:image/svg+xml;charset=utf-8,#{$flipped-url}");
-        }
-    }
-}
-
-// Add property horizontal
-// @param {string} $start
-// @param {string} $end
-// ----------------------------------------------------------
-@mixin property-horizontal($prop, $start, $end: $start) {
-    @if $start == 0 and $end == 0 {
-        #{$prop}-left: $start;
-        #{$prop}-right: $end;
-
-    } @else {
-        #{$prop}-left: $start;
-        #{$prop}-right: $end;
-
-        @at-root {
-            @supports ((margin-inline-start: 0) or (-webkit-margin-start: 0)) {
-                & {
-                    @if $start != null {
-                        #{$prop}-left: unset;
-                    }
-                    @if $end != null {
-                        #{$prop}-right: unset;
-                    }
-
-                    -webkit-#{$prop}-start: $start;
-                    #{$prop}-inline-start: $start;
-                    -webkit-#{$prop}-end: $end;
-                    #{$prop}-inline-end: $end;
-                }
-            }
-        }
-    }
-}
-
-// Add property for all directions
-// @param {string} $prop
-// @param {string} $top
-// @param {string} $end
-// @param {string} $bottom
-// @param {string} $start
-// @param {boolean} $content include content or use default
-// ----------------------------------------------------------
-@mixin property($prop, $top, $end: $top, $bottom: $top, $start: $end) {
-    @include property-horizontal($prop, $start, $end);
-    #{$prop}-top: $top;
-    #{$prop}-bottom: $bottom;
-}
-
-// Add padding horizontal
-// @param {string} $start
-// @param {string} $end
-// ----------------------------------------------------------
-@mixin padding-horizontal($start, $end: $start) {
-    @include property-horizontal(padding, $start, $end);
-}
-
-// Add padding for all directions
-// @param {string} $top
-// @param {string} $end
-// @param {string} $bottom
-// @param {string} $start
-// ----------------------------------------------------------
-@mixin padding($top, $end: $top, $bottom: $top, $start: $end) {
-    @include property(padding, $top, $end, $bottom, $start);
-}
-
-// Add margin horizontal
-// @param {string} $start
-// @param {string} $end
-// ----------------------------------------------------------
-@mixin margin-horizontal($start, $end: $start) {
-    @include property-horizontal(margin, $start, $end);
-}
-
-// Add margin for all directions
-// @param {string} $top
-// @param {string} $end
-// @param {string} $bottom
-// @param {string} $start
-// ----------------------------------------------------------
-@mixin margin($top, $end: $top, $bottom: $top, $start: $end) {
-    @include property(margin, $top, $end, $bottom, $start);
-}
-
-// Add position horizontal
-// @param {string} $start - amount to position start
-// @param {string} $end - amount to left: 0; end
-// ----------------------------------------------------------
-@mixin position-horizontal($start: null, $end: null) {
-    @if $start == $end {
-        @include multi-dir() {
-            left: $start;
-            right: $end;
-        }
-    } @else {
-        @include ltr() {
-            left: $start;
-            right: $end;
-        }
-        @include rtl() {
-            left: unset;
-            right: unset;
-
-            left: $end;
-            right: $start;
-        }
-    }
-}
-
-// Add position for all directions
-// @param {string} $top
-// @param {string} $end
-// @param {string} $bottom
-// @param {string} $start
-// ----------------------------------------------------------
-@mixin position($top: null, $end: null, $bottom: null, $start: null) {
-    @include position-horizontal($start, $end);
-    top: $top;
-    bottom: $bottom;
-}
-
-// Add border for all directions
-// @param {string} $top
-// @param {string} $end
-// @param {string} $bottom
-// @param {string} $start
-// ----------------------------------------------------------
-@mixin border($top, $end: $top, $bottom: $top, $start: $end) {
-    @include property(border, $top, $end, $bottom, $start);
-}
-
-// Add border radius for all directions
-// @param {string} $top-start
-// @param {string} $top-end
-// @param {string} $bottom-end
-// @param {string} $bottom-start
-// ----------------------------------------------------------
-@mixin border-radius($top-start, $top-end: $top-start, $bottom-end: $top-start, $bottom-start: $top-end) {
-    @if $top-start == $top-end and $top-start == $bottom-end and $top-start == $bottom-start {
-        @include multi-dir() {
-            border-radius: $top-start;
-        }
-    } @else {
-        @include ltr() {
-            border-top-left-radius: $top-start;
-            border-top-right-radius: $top-end;
-            border-bottom-right-radius: $bottom-end;
-            border-bottom-left-radius: $bottom-start;
-        }
-
-        @include rtl() {
-            border-top-left-radius: $top-end;
-            border-top-right-radius: $top-start;
-            border-bottom-right-radius: $bottom-start;
-            border-bottom-left-radius: $bottom-end;
-        }
-    }
-}
-
-// Add direction for all directions
-// @param {string} $dir - Direction on LTR
-@mixin direction($dir) {
-    $other-dir: null;
-
-    @if $dir == ltr {
-        $other-dir: rtl;
-    } @else {
-        $other-dir: ltr;
-    }
-
-    @include ltr() {
-        direction: $dir;
-    }
-    @include rtl() {
-        direction: $other-dir;
-    }
-}
-
-// Add float for all directions
-// @param {string} $side
-// @param {string} $decorator - !important
-@mixin float($side, $decorator: null) {
-    @if $side == start {
-        @include ltr() {
-            float: left $decorator;
-        }
-        @include rtl() {
-            float: right $decorator;
-        }
-    } @else if $side == end {
-        @include ltr() {
-            float: right $decorator;
-        }
-        @include rtl() {
-            float: left $decorator;
-        }
-    } @else {
-        @include multi-dir() {
-            float: $side $decorator;
-        }
-    }
-}
-
-@mixin background-position($horizontal, $horizontal-amount: null, $vertical: null, $vertical-amount: null) {
-    @if $horizontal == start or $horizontal == end {
-        $horizontal-ltr: null;
-        $horizontal-rtl: null;
-        @if $horizontal == start {
-            $horizontal-ltr: left;
-            $horizontal-rtl: right;
-        } @else {
-            $horizontal-ltr: right;
-            $horizontal-rtl: left;
-        }
-
-        @include ltr() {
-            background-position: $horizontal-ltr $horizontal-amount $vertical $vertical-amount;
-        }
-        @include rtl() {
-            background-position: $horizontal-rtl $horizontal-amount $vertical $vertical-amount;
-        }
-    } @else {
-        @include multi-dir() {
-            background-position: $horizontal $horizontal-amount $vertical $vertical-amount;
-        }
-    }
-}
-
-@mixin transform-origin($x-axis, $y-axis: null) {
-    @if $x-axis == start {
-        @include ltr() {
-            transform-origin: left $y-axis;
-        }
-        @include rtl() {
-            transform-origin: right $y-axis;
-        }
-    } @else if $x-axis == end {
-        @include ltr() {
-            transform-origin: right $y-axis;
-        }
-        @include rtl() {
-            transform-origin: left $y-axis;
-        }
-    } @else if $x-axis == left or $x-axis == right {
-        @include multi-dir() {
-            transform-origin: $x-axis $y-axis;
-        }
-    } @else {
-        @include ltr() {
-            transform-origin: $x-axis $y-axis;
-        }
-        @include rtl() {
-            transform-origin: calc(100% - #{$x-axis}) $y-axis;
-        }
-    }
-}
-
-// Add transform for all directions
-// @param {string} $transforms - comma separated list of transforms
-@mixin transform($transforms...) {
-    $extra: null;
-
-    $x: null;
-    $ltr-translate: null;
-    $rtl-translate: null;
-
-    @each $transform in $transforms {
-        @if (str-index($transform, translate3d)) {
-            $transform: str-replace($transform, 'translate3d(');
-            $transform: str-replace($transform, ')');
-
-            $coordinates: str-split($transform, ',');
-
-            $x: nth($coordinates, 1);
-            $y: nth($coordinates, 2);
-            $z: nth($coordinates, 3);
-
-            $ltr-translate: translate3d($x, $y, $z);
-            $rtl-translate: translate3d(calc(-1 * #{$x}), $y, $z);
-        } @else {
-            @if $extra == null {
-                $extra: $transform;
-            } @else {
-                $extra: $extra $transform;
-            }
-        }
-    }
-
-    @if $x == '0' or $x == null {
-        @include multi-dir() {
-            transform: $ltr-translate $extra;
-        }
-    } @else {
-        @include ltr() {
-            transform: $ltr-translate $extra;
-        }
-
-        @include rtl() {
-            transform: $rtl-translate $extra;
-        }
-    }
-}
diff --git a/src/theme/globals.scss b/src/theme/globals.scss
index e864c651c..b0cf557b9 100644
--- a/src/theme/globals.scss
+++ b/src/theme/globals.scss
@@ -1,4 +1,4 @@
-/*
+/**
  * App Global variables SCSS
  * ----------------------------------------------------------------------------
  * Place here the different files you should import to use global variables.
@@ -6,7 +6,7 @@
 
 $font-path: "../assets/fonts";
 $assets-path: "../assets";
-@import "./globals.mixins.scss";
-@import "./globals.mixins.ionic.scss";
+
+@import "./helpers/helpers.scss";
 @import "./globals.custom.scss";
 @import "./globals.variables.scss";
diff --git a/src/theme/globals.mixins.scss b/src/theme/helpers/custom.mixins.scss
similarity index 65%
rename from src/theme/globals.mixins.scss
rename to src/theme/helpers/custom.mixins.scss
index 9c0882ebb..d2f4c3085 100644
--- a/src/theme/globals.mixins.scss
+++ b/src/theme/helpers/custom.mixins.scss
@@ -1,11 +1,74 @@
 @use "sass:math" as math;
 
-/*
+/**
  * App custom mixins for SCSS
  * ----------------------------------------------------------------------------
  * Place here our custom mixins.
  */
 
+// Mixes a color with black to create its shade.
+// Default to bootstrap level 6.
+// --------------------------------------------------------------------------------------------
+@function get-color-shade-percent($color, $percent: 48%) {
+    @return mix(#000, $color, $percent);
+  }
+
+  // Mixes a color with white to create its tint.
+  // Default to bootstrap level -10.
+  // --------------------------------------------------------------------------------------------
+  @function get-color-tint-percent($color, $percent: 80%) {
+    @return mix(#fff, $color, $percent);
+  }
+
+  // Ionic Colors
+  // --------------------------------------------------
+  // Generates the color classes and variables based on the
+  // colors map
+
+  @mixin generate-color($color-name, $colors) {
+      $base: map-get($colors, $color-name);
+      $light: map-get($base, 'light');
+
+      @include generate-color-variants($color-name, $light);
+
+      body.dark {
+          $dark: map-get($base, 'dark');
+          $dark: mix($light, white, 80%) !default;
+          @include generate-color-variants($color-name, $dark);
+      }
+  }
+
+  @mixin generate-color-variants($color-name, $base) {
+      $contrast: get_contrast_color($base);
+      $shade: get-color-shade-percent($base);
+      $tint: get-color-tint-percent($base);
+
+      --#{$color-name}: #{$base};
+      --#{$color-name}-shade: #{$shade};
+      --#{$color-name}-tint: #{$tint};
+      --#{$color-name}-contrast: #{$contrast};
+
+      // Internal ionic use only.
+      --ion-color-#{$color-name}: var(--#{$color-name});
+      --ion-color-#{$color-name}-base: var(--ion-color-#{$color-name});
+      --ion-color-#{$color-name}-rgb: #{color-to-rgb-list($base)};
+      --ion-color-#{$color-name}-contrast: #{$contrast};
+      --ion-color-#{$color-name}-contrast-rgb: #{color-to-rgb-list($contrast)};
+      --ion-color-#{$color-name}-shade: #{$shade};
+      --ion-color-#{$color-name}-tint: #{$tint};
+
+      .ion-color-#{$color-name} {
+          --ion-color: var(--ion-color-#{$color-name});
+          --ion-color-base: var(--ion-color-#{$color-name}-base);
+          --ion-color-rgb: var(--ion-color-#{$color-name}-rgb);
+          --ion-color-contrast: var(--ion-color-#{$color-name}-contrast);
+          --ion-color-contrast-rgb: var(--ion-color-#{$color-name}-contrast-rgb);
+          --ion-color-shade: var(--ion-color-#{$color-name}-shade);
+          --ion-color-tint: var(--ion-color-#{$color-name}-tint);
+      }
+  }
+
+
  @mixin core-focus() {
     outline: none;
     position: relative;
@@ -32,47 +95,24 @@
     }
 
     -webkit-transition: $transitions;
-    -moz-transition: $transitions;
-    -ms-transition: $transitions;
-    -o-transition: $transitions;
     transition: $transitions;
 }
 
-@mixin push-arrow-color($color: dedede, $flip-rtl: false) {
-    $svg: "<svg%20xmlns='http://www.w3.org/2000/svg'%20viewBox='0%200%2012%2020'><path%20d='M2,20l-2-2l8-8L0,2l2-2l10,10L2,20z'%20fill='%23#{$color}'/></svg>";
-    @if $flip-rtl != true {
-        @include multi-dir() {
-            background-image: url("data:image/svg+xml;charset=utf-8,#{$svg}");
-        }
-    } @else {
-        $flipped-svg: "<svg%20xmlns='http://www.w3.org/2000/svg'%20viewBox='0%200%2012%2020'><path%20transform='translate(20,%200)%20scale(-1,%201)'%20d='M2,20l-2-2l8-8L0,2l2-2l10,10L2,20z'%20fill='%23#{$color}'/></svg>";
+/**
+ * Same as item-push-svg-url but admits flip-rtl
+ */
+@mixin push-arrow-color($fill: 626262, $flip-rtl: false) {
+    $item-detail-push-svg: "<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 12 20'><path d='M2,20l-2-2l8-8L0,2l2-2l10,10L2,20z' fill='#{$fill}'/></svg>";
 
-        @include ltr () {
-            background-image: url("data:image/svg+xml;charset=utf-8,#{$svg}");
-        }
-        @include rtl() {
-            background-image: url("data:image/svg+xml;charset=utf-8,#{$flipped-svg}");
-        }
-    }
+    @include svg-background-image($item-detail-push-svg, $flip-rtl);
 }
 
 @mixin border-start($px, $type: null, $color: null) {
-    border-left: $px $type $color;
-
-    @include rtl() {
-        border-left: unset;
-        border-right: $px $type $color;
-    }
+    @include property-horizontal(border, $px $type $color, null);
 }
 
-
 @mixin border-end($px, $type: null, $color: null) {
-    border-right: $px $type $color;
-
-    @include rtl() {
-        border-right: unset;
-        border-left: $px $type $color;
-    }
+    @include property-horizontal(border, null, $px $type $color);
 }
 
 @mixin safe-area-border-start($px, $type, $color) {
@@ -167,41 +207,11 @@
     }
 }
 
-@mixin core-as-items() {
-    .item-md.item-block > .item-inner {
-        border-bottom: 1px solid $list-md-border-color;
-    }
-
-    .item-ios.item-block > .item-inner {
-        border-bottom: $hairlines-width solid $list-ios-border-color;
-    }
-
-    &:last-child .item > .item-inner {
-        border-bottom: 0;
-    }
-}
-
-@mixin core-items() {
-    &.item-md.item-block > .item-inner {
-        border-bottom: 1px solid $list-md-border-color;
-    }
-
-    &.item-ios.item-block > .item-inner {
-        border-bottom: $hairlines-width solid $list-ios-border-color;
-    }
-
-    &.item-block:last-child > .item-inner {
-        border-bottom: 0;
-    }
-}
-
 @mixin darkmode() {
     $root: #{&};
 
-    @at-root body.dark {
-        #{$root} {
-            @content;
-        }
+    @at-root #{add-root-selector($root, "body.dark")} {
+        @content;
     }
 }
 
diff --git a/src/theme/helpers/helpers.scss b/src/theme/helpers/helpers.scss
new file mode 100644
index 000000000..03d86944d
--- /dev/null
+++ b/src/theme/helpers/helpers.scss
@@ -0,0 +1,15 @@
+
+// Global Utility Functions
+@import "./ionic.functions.string";
+
+// Global Color Functions
+@import "./ionic.functions.color";
+
+// Global Mixins
+@import "./ionic.mixins";
+
+// Global Mixins
+@import "./ionic.components.mixins";
+
+// Custom Mixins
+@import "./custom.mixins";
diff --git a/src/theme/helpers/ionic.components.mixins.scss b/src/theme/helpers/ionic.components.mixins.scss
new file mode 100644
index 000000000..529dfb75a
--- /dev/null
+++ b/src/theme/helpers/ionic.components.mixins.scss
@@ -0,0 +1,48 @@
+/**
+ * Imported ionic mixins for SCSS from different components
+ * ----------------------------------------------------------------------------
+ * Extracted from
+ * https://github.com/ionic-team/ionic-framework/blob/master/core/src/components/grid/grid.mixins.scss
+ * https://github.com/ionic-team/ionic-framework/blob/master/core/src/components/item/item.mixins.scss
+ */
+
+// Responsive Mixins
+// --------------------------------------------------
+
+
+// Creates a fixed width for the grid based on the screen size
+// ---------------------------------------------------------------------------------
+
+@mixin make-grid-widths($widths: $grid-widths, $breakpoints: $screen-breakpoints) {
+  @each $breakpoint, $width in $widths {
+    @include media-breakpoint-up($breakpoint, $breakpoints) {
+      width: $width;
+    }
+  }
+
+  max-width: 100%;
+}
+
+
+// Adds padding to the element based on breakpoints
+// ---------------------------------------------------------------------------------
+
+@mixin make-breakpoint-padding($paddings) {
+  @each $breakpoint in map-keys($paddings) {
+    @include media-breakpoint-up($breakpoint) {
+      $padding: map-get($paddings, $breakpoint);
+
+      @include padding($padding);
+    }
+  }
+}
+
+
+// Item Mixins
+// --------------------------------------------------
+
+@mixin item-push-svg-url($fill) {
+  $item-detail-push-svg: "<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 12 20'><path d='M2,20l-2-2l8-8L0,2l2-2l10,10L2,20z' fill='#{$fill}'/></svg>";
+
+  @include svg-background-image($item-detail-push-svg, true);
+}
diff --git a/src/theme/helpers/ionic.functions.color.scss b/src/theme/helpers/ionic.functions.color.scss
new file mode 100644
index 000000000..a6b9060a7
--- /dev/null
+++ b/src/theme/helpers/ionic.functions.color.scss
@@ -0,0 +1,66 @@
+/**
+ * Imported ionic color functions for SCSS
+ * ----------------------------------------------------------------------------
+ * Extracted from
+ * https://github.com/ionic-team/ionic-framework/blob/master/core/src/themes/ionic.functions.color.scss
+ */
+
+// Gets the active color's css variable from a variation. Alpha is optional.
+// --------------------------------------------------------------------------------------------
+// Example usage:
+// current-color(base) => var(--ion-color-base)
+// current-color(contrast, 0.1) => rgba(var(--ion-color-contrast-rgb), 0.1)
+// --------------------------------------------------------------------------------------------
+@function current-color($variation, $alpha: null) {
+  @if $alpha == null {
+    @return var(--ion-color-#{$variation});
+  } @else {
+    @return rgba(var(--ion-color-#{$variation}-rgb), #{$alpha});
+  }
+}
+
+// Gets the specific color's css variable from the name and variation. Alpha/rgb are optional.
+// --------------------------------------------------------------------------------------------
+// Example usage:
+// ion-color(primary, base) => var(--ion-color-primary, #3880ff)
+// ion-color(secondary, contrast) => var(--ion-color-secondary-contrast)
+// ion-color(primary, base, 0.5) => rgba(var(--ion-color-primary-rgb, 56, 128, 255), 0.5)
+// --------------------------------------------------------------------------------------------
+@function ion-color($name, $variation, $alpha: null, $rgb: null) {
+  $values: map-get($colors, $name);
+  $value: map-get($values, $variation);
+  $variable: --ion-color-#{$name}-#{$variation};
+
+  @if ($variation == base) {
+    $variable: --ion-color-#{$name};
+  }
+
+  @if ($alpha) {
+    $value: color-to-rgb-list($value);
+    @return rgba(var(#{$variable}-rgb, $value), $alpha);
+  }
+  @if ($rgb) {
+    $value: color-to-rgb-list($value);
+    $variable: #{$variable}-rgb;
+  }
+
+  @return var(#{$variable}, $value);
+}
+
+// Mixes a color with black to create its shade.
+// --------------------------------------------------------------------------------------------
+@function get-color-shade($color) {
+  @return mix(#000, $color, 12%);
+}
+
+// Mixes a color with white to create its tint.
+// --------------------------------------------------------------------------------------------
+@function get-color-tint($color) {
+  @return mix(#fff, $color, 10%);
+}
+
+// Converts a color to a comma separated rgb.
+// --------------------------------------------------------------------------------------------
+@function color-to-rgb-list($color) {
+  @return #{red($color)},#{green($color)},#{blue($color)};
+}
diff --git a/src/theme/helpers/ionic.functions.string.scss b/src/theme/helpers/ionic.functions.string.scss
new file mode 100644
index 000000000..db045dc75
--- /dev/null
+++ b/src/theme/helpers/ionic.functions.string.scss
@@ -0,0 +1,160 @@
+/**
+ * Imported ionic string functions for SCSS
+ * ----------------------------------------------------------------------------
+ * Extracted from
+ * https://github.com/ionic-team/ionic-framework/blob/master/core/src/themes/ionic.functions.string.scss
+ */
+
+
+// String Utility Functions
+// --------------------------------------------------------------------------------
+
+// String Replace Function
+// --------------------------------------------------------------------------------
+
+@function str-replace($string, $search, $replace: "") {
+  $index: str-index($string, $search);
+
+  @if $index {
+    @return str-slice($string, 1, $index - 1) + $replace + str-replace(str-slice($string, $index + str-length($search)), $search, $replace);
+  }
+
+  @return $string;
+}
+
+// String Split Function
+// --------------------------------------------------------------------------------
+
+
+@function str-split($string, $separator) {
+  // empty array/list
+  $split-arr: ();
+  // first index of separator in string
+  $index: str-index($string, $separator);
+  // loop through string
+  @while $index != null {
+    // get the substring from the first character to the separator
+    $item: str-slice($string, 1, $index - 1);
+    // push item to array
+    $split-arr: append($split-arr, $item);
+    // remove item and separator from string
+    $string: str-slice($string, $index + 1);
+    // find new index of separator
+    $index: str-index($string, $separator);
+  }
+  // add the remaining string to list (the last item)
+  $split-arr: append($split-arr, $string);
+
+  @return $split-arr;
+}
+
+
+// String Extract Function
+// --------------------------------------------------------------------------------
+
+@function str-extract($string, $start, $end) {
+  $start-index: str-index($string, $start);
+
+  @if $start-index {
+    $post: str-slice($string, $start-index + str-length($start));
+    $end-index: str-index($post, $end);
+
+    @if $end-index {
+      @return str-slice($post, 1, $end-index - 1);
+    }
+  }
+
+  @return null;
+}
+
+
+// String Contains Function
+// --------------------------------------------------------------------------------
+
+@function str-contains($string, $needle) {
+  @if (type-of($string) == string) {
+    @return str-index($string, $needle) != null;
+  }
+
+  @return false;
+}
+
+
+// URL Encode Function
+// --------------------------------------------------------------------------------
+
+@function url-encode($val) {
+  $spaces: str-replace($val, " ", "%20");
+  $encoded: str-replace($spaces, "#", "%23");
+  @return $encoded;
+}
+
+
+// Add Root Selector
+// --------------------------------------------------------------------------------
+// Adds a root selector using host-context based on the selector passed
+//
+// Examples
+// --------------------------------------------------------------------------------
+// @include add-root-selector("[dir=rtl]", ":host")
+// --> :host-context([dir=rtl])
+//
+// @include add-root-selector("[dir=rtl]", ":host(.fixed)")
+// --> :host-context([dir=rtl]):host(.fixed)
+// --> :host-context([dir=rtl]).fixed
+//
+// @include add-root-selector("[dir=rtl]", ":host(.tab-layout-icon-hide) ::slotted(ion-badge)")
+// --> :host-context([dir=rtl]).tab-layout-icon-hide ::slotted(ion-badge)
+//
+// @include add-root-selector("[dir=rtl]", ".shadow")
+// --> [dir=rtl] .shadow
+// --> :host-context([dir=rtl]) .shadow
+// --------------------------------------------------------------------------------
+
+@function add-root-selector($root, $addHostSelector) {
+  $selectors: str-split($root, ",");
+
+  $list: ();
+
+  @each $selector in $selectors {
+    // If the selector contains :host( it means it is targeting a class on the host
+    // element so we need to change how we target it
+    @if str-contains($selector, ":host(") {
+      $shadow-element: str-replace($selector, ":host(", ":host-context(#{$addHostSelector}):host(");
+      $list: append($list, $shadow-element, comma);
+
+      $new-element: ();
+      $elements: str-split($selector, " ");
+
+      @each $element in $elements {
+        @if str-contains($element, ":host(") {
+          $scoped-element: $element;
+
+          @if str-contains($element, "))") {
+            $scoped-element: str-replace($scoped-element, "))", ")");
+          } @else {
+            $scoped-element: str-replace($scoped-element, ")", "");
+          }
+          $scoped-element: str-replace($scoped-element, ":host(", ":host-context(#{$addHostSelector})");
+
+          $new-element: append($new-element, $scoped-element, space);
+        } @else {
+          $new-element: append($new-element, $element, space);
+        }
+      }
+
+      $list: append($list, $new-element, comma);
+    // If the selector contains :host it means it is targeting just the host
+    // element so we can change it to look for host-context
+    } @else if str-contains($selector, ":host") {
+      $list: append($list, ":host-context(#{$addHostSelector})", comma);
+    // If the selector does not contain host at all it is either a shadow
+    // or normal element so append both the dir check and host-context
+    } @else {
+      $list: append($list, "#{$addHostSelector} #{$selector}", comma);
+      $list: append($list, ":host-context(#{$addHostSelector}) #{$selector}", comma);
+    }
+  }
+
+  @return $list;
+}
diff --git a/src/theme/helpers/ionic.mixins.scss b/src/theme/helpers/ionic.mixins.scss
new file mode 100644
index 000000000..f212ad5f7
--- /dev/null
+++ b/src/theme/helpers/ionic.mixins.scss
@@ -0,0 +1,542 @@
+/**
+ * Imported ionic mixins for SCSS
+ * ----------------------------------------------------------------------------
+ * Extracted from
+ * https://github.com/ionic-team/ionic-framework/blob/master/core/src/themes/ionic.mixins.scss
+ */
+
+@mixin input-cover() {
+  @include position(0, null, null, 0);
+  @include margin(0);
+
+  position: absolute;
+
+  width: 100%;
+  height: 100%;
+
+  border: 0;
+  background: transparent;
+  cursor: pointer;
+
+  appearance: none;
+  outline: none;
+
+  &::-moz-focus-inner {
+    border: 0;
+  }
+}
+
+@mixin visually-hidden() {
+  position: absolute;
+
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+
+  width: 100%;
+  height: 100%;
+
+  margin: 0;
+  padding: 0;
+
+  border: 0;
+  outline: 0;
+  clip: rect(0 0 0 0);
+
+  opacity: 0;
+  overflow: hidden;
+
+  -webkit-appearance: none;
+  -moz-appearance: none;
+}
+
+@mixin text-inherit() {
+  font-family: inherit;
+  font-size: inherit;
+  font-style: inherit;
+  font-weight: inherit;
+  letter-spacing: inherit;
+  text-decoration: inherit;
+  text-indent: inherit;
+  text-overflow: inherit;
+  text-transform: inherit;
+  text-align: inherit;
+  white-space: inherit;
+  color: inherit;
+}
+
+@mixin button-state() {
+  @include position(0, 0, 0, 0);
+
+  position: absolute;
+
+  content: "";
+
+  opacity: 0;
+}
+
+// Font smoothing
+// --------------------------------------------------
+
+@mixin font-smoothing() {
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-font-smoothing: antialiased;
+}
+
+// Get the key from a map based on the index
+@function index-to-key($map, $index) {
+  $keys: map-keys($map);
+
+  @return nth($keys, $index);
+}
+
+
+// Breakpoint Mixins
+// ---------------------------------------------------------------------------------
+
+// Breakpoint viewport sizes and media queries.
+//
+// Breakpoints are defined as a map of (name: minimum width), order from small to large:
+//
+//    (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px)
+//
+// The map defined in the `$screen-breakpoints` global variable is used as the `$breakpoints` argument by default.
+
+// ---------------------------------------------------------------------------------
+
+// Minimum breakpoint width. Null for the smallest (first) breakpoint.
+//
+//    >> breakpoint-min(sm, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px))
+//    576px
+@function breakpoint-min($name, $breakpoints: $screen-breakpoints) {
+  $min: map-get($breakpoints, $name);
+
+  @return if($name != index-to-key($breakpoints, 1), $min, null);
+}
+
+// Returns a blank string if smallest breakpoint, otherwise returns the name with a dash infront.
+// Useful for making responsive utilities.
+//
+//    >> breakpoint-infix(xs, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px))
+//    ""  (Returns a blank string)
+//    >> breakpoint-infix(sm, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px))
+//    "-sm"
+@function breakpoint-infix($name, $breakpoints: $screen-breakpoints) {
+  @return if(breakpoint-min($name, $breakpoints) == null, "", "-#{$name}");
+}
+
+// Media of at least the minimum breakpoint width. No query for the smallest breakpoint.
+// Makes the @content apply to the given breakpoint and wider.
+@mixin media-breakpoint-up($name, $breakpoints: $screen-breakpoints) {
+  $min: breakpoint-min($name, $breakpoints);
+  @if $min {
+    @media (min-width: $min) {
+      @content;
+    }
+  } @else {
+    @content;
+  }
+}
+
+// Name of the next breakpoint, or null for the last breakpoint.
+//
+//    >> breakpoint-next(sm)
+//    md
+//    >> breakpoint-next(sm, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px))
+//    md
+//    >> breakpoint-next(sm, $breakpoint-names: (xs sm md lg xl))
+//    md
+@function breakpoint-next($name, $breakpoints: $screen-breakpoints, $breakpoint-names: map-keys($breakpoints)) {
+  $n: index($breakpoint-names, $name);
+  @return if($n < length($breakpoint-names), nth($breakpoint-names, $n + 1), null);
+}
+
+// Maximum breakpoint width. Null for the smallest (first) breakpoint.
+// The maximum value is reduced by 0.02px to work around the limitations of
+// `min-` and `max-` prefixes and viewports with fractional widths.
+//
+// See https://www.w3.org/TR/mediaqueries-4/#mq-min-max
+// Uses 0.02px rather than 0.01px to work around a current rounding bug in Safari.	// Uses 0.02px rather than 0.01px to work around a current rounding bug in Safari.
+// See https://bugs.webkit.org/show_bug.cgi?id=178261	// See https://bugs.webkit.org/show_bug.cgi?id=178261
+//
+//    >> breakpoint-max(md, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px))
+//    767.98px
+@function breakpoint-max($name, $breakpoints: $screen-breakpoints) {
+  $max: map-get($breakpoints, $name);
+  @return if($max and $max > 0, $max - .02, null);
+}
+
+// Media of at most the maximum breakpoint width. No query for the largest breakpoint.
+// Makes the @content apply to the given breakpoint and narrower.
+@mixin media-breakpoint-down($name, $breakpoints: $screen-breakpoints) {
+  $max: breakpoint-max($name, $breakpoints);
+  @if $max {
+    @media (max-width: $max) {
+      @content;
+    }
+  } @else {
+    @content;
+  }
+}
+
+
+// Text Direction - ltr / rtl
+//
+// CSS defaults to use the ltr css, and adds [dir=rtl] selectors
+// to override ltr defaults.
+// ----------------------------------------------------------
+
+@mixin multi-dir() {
+  @content;
+
+  // $root: #{&};
+  // @at-root [dir] {
+  //   #{$root} {
+  //     @content;
+  //   }
+  // }
+}
+
+@mixin rtl() {
+  $root: #{&};
+
+  @at-root #{add-root-selector($root, "[dir=rtl]")} {
+    @content;
+  }
+}
+
+@mixin ltr() {
+  @content;
+}
+
+
+// SVG Background Image Mixin
+// @param {string} $svg
+// ----------------------------------------------------------
+@mixin svg-background-image($svg, $flip-rtl: false) {
+  $url: url-encode($svg);
+  $viewBox: str-split(str-extract($svg, "viewBox='", "'"), " ");
+
+  @if $flip-rtl != true or $viewBox == null {
+    @include multi-dir() {
+      background-image: url("data:image/svg+xml;charset=utf-8,#{$url}");
+    }
+  } @else {
+    $transform: "transform='translate(#{nth($viewBox, 3)}, 0) scale(-1, 1)'";
+    $flipped-url: $svg;
+    $flipped-url: str-replace($flipped-url, "<path", "<path #{$transform}");
+    $flipped-url: str-replace($flipped-url, "<line", "<line #{$transform}");
+    $flipped-url: str-replace($flipped-url, "<polygon", "<polygon #{$transform}");
+    $flipped-url: url-encode($flipped-url);
+
+    @include ltr () {
+      background-image: url("data:image/svg+xml;charset=utf-8,#{$url}");
+    }
+    @include rtl() {
+      background-image: url("data:image/svg+xml;charset=utf-8,#{$flipped-url}");
+    }
+  }
+}
+
+// Add property horizontal
+// @param {string} $start
+// @param {string} $end
+// ----------------------------------------------------------
+@mixin property-horizontal($prop, $start, $end: $start) {
+  @if $start == 0 and $end == 0 {
+    #{$prop}-left: $start;
+    #{$prop}-right: $end;
+
+  } @else {
+    #{$prop}-left: $start;
+    #{$prop}-right: $end;
+
+    @at-root {
+      @supports ((margin-inline-start: 0) or (-webkit-margin-start: 0)) {
+        & {
+          @if $start != null {
+            #{$prop}-left: unset;
+          }
+          @if $end != null {
+            #{$prop}-right: unset;
+          }
+
+          -webkit-#{$prop}-start: $start;
+          #{$prop}-inline-start: $start;
+          -webkit-#{$prop}-end: $end;
+          #{$prop}-inline-end: $end;
+        }
+      }
+    }
+  }
+}
+
+// Add property for all directions
+// @param {string} $prop
+// @param {string} $top
+// @param {string} $end
+// @param {string} $bottom
+// @param {string} $start
+// @param {boolean} $content include content or use default
+// ----------------------------------------------------------
+@mixin property($prop, $top, $end: $top, $bottom: $top, $start: $end) {
+  @include property-horizontal($prop, $start, $end);
+  #{$prop}-top: $top;
+  #{$prop}-bottom: $bottom;
+}
+
+// Add padding horizontal
+// @param {string} $start
+// @param {string} $end
+// ----------------------------------------------------------
+@mixin padding-horizontal($start, $end: $start) {
+  @include property-horizontal(padding, $start, $end);
+}
+
+// Add padding for all directions
+// @param {string} $top
+// @param {string} $end
+// @param {string} $bottom
+// @param {string} $start
+// ----------------------------------------------------------
+@mixin padding($top, $end: $top, $bottom: $top, $start: $end) {
+  @include property(padding, $top, $end, $bottom, $start);
+}
+
+// Add margin horizontal
+// @param {string} $start
+// @param {string} $end
+// ----------------------------------------------------------
+@mixin margin-horizontal($start, $end: $start) {
+  @include property-horizontal(margin, $start, $end);
+}
+
+// Add margin for all directions
+// @param {string} $top
+// @param {string} $end
+// @param {string} $bottom
+// @param {string} $start
+// ----------------------------------------------------------
+@mixin margin($top, $end: $top, $bottom: $top, $start: $end) {
+  @include property(margin, $top, $end, $bottom, $start);
+}
+
+// Add position horizontal
+// @param {string} $start - amount to position start
+// @param {string} $end - amount to left: 0; end
+// ----------------------------------------------------------
+@mixin position-horizontal($start: null, $end: null) {
+  @if $start == $end {
+    @include multi-dir() {
+      left: $start;
+      right: $end;
+    }
+  } @else {
+    @include ltr() {
+      left: $start;
+      right: $end;
+    }
+    @include rtl() {
+      left: unset;
+      right: unset;
+
+      left: $end;
+      right: $start;
+    }
+  }
+}
+
+// Add position for all directions
+// @param {string} $top
+// @param {string} $end
+// @param {string} $bottom
+// @param {string} $start
+// ----------------------------------------------------------
+@mixin position($top: null, $end: null, $bottom: null, $start: null) {
+  @include position-horizontal($start, $end);
+  top: $top;
+  bottom: $bottom;
+}
+
+// Add border for all directions
+// @param {string} $top
+// @param {string} $end
+// @param {string} $bottom
+// @param {string} $start
+// ----------------------------------------------------------
+@mixin border($top, $end: $top, $bottom: $top, $start: $end) {
+  @include property(border, $top, $end, $bottom, $start);
+}
+
+// Add border radius for all directions
+// @param {string} $top-start
+// @param {string} $top-end
+// @param {string} $bottom-end
+// @param {string} $bottom-start
+// ----------------------------------------------------------
+@mixin border-radius($top-start, $top-end: $top-start, $bottom-end: $top-start, $bottom-start: $top-end) {
+  @if $top-start == $top-end and $top-start == $bottom-end and $top-start == $bottom-start {
+    @include multi-dir() {
+      border-radius: $top-start;
+    }
+  } @else {
+    @include ltr() {
+      border-top-left-radius: $top-start;
+      border-top-right-radius: $top-end;
+      border-bottom-right-radius: $bottom-end;
+      border-bottom-left-radius: $bottom-start;
+    }
+
+    @include rtl() {
+      border-top-left-radius: $top-end;
+      border-top-right-radius: $top-start;
+      border-bottom-right-radius: $bottom-start;
+      border-bottom-left-radius: $bottom-end;
+    }
+  }
+}
+
+// Add direction for all directions
+// @param {string} $dir - Direction on LTR
+@mixin direction($dir) {
+  $other-dir: null;
+
+  @if $dir == ltr {
+    $other-dir: rtl;
+  } @else {
+    $other-dir: ltr;
+  }
+
+  @include ltr() {
+    direction: $dir;
+  }
+  @include rtl() {
+    direction: $other-dir;
+  }
+}
+
+// Add float for all directions
+// @param {string} $side
+// @param {string} $decorator - !important
+@mixin float($side, $decorator: null) {
+  @if $side == start {
+    @include ltr() {
+      float: left $decorator;
+    }
+    @include rtl() {
+      float: right $decorator;
+    }
+  } @else if $side == end {
+    @include ltr() {
+      float: right $decorator;
+    }
+    @include rtl() {
+      float: left $decorator;
+    }
+  } @else {
+    @include multi-dir() {
+      float: $side $decorator;
+    }
+  }
+}
+
+@mixin background-position($horizontal, $horizontal-amount: null, $vertical: null, $vertical-amount: null) {
+  @if $horizontal == start or $horizontal == end {
+    $horizontal-ltr: null;
+    $horizontal-rtl: null;
+    @if $horizontal == start {
+      $horizontal-ltr: left;
+      $horizontal-rtl: right;
+    } @else {
+      $horizontal-ltr: right;
+      $horizontal-rtl: left;
+    }
+
+    @include ltr() {
+      background-position: $horizontal-ltr $horizontal-amount $vertical $vertical-amount;
+    }
+    @include rtl() {
+      background-position: $horizontal-rtl $horizontal-amount $vertical $vertical-amount;
+    }
+  } @else {
+    @include multi-dir() {
+      background-position: $horizontal $horizontal-amount $vertical $vertical-amount;
+    }
+  }
+}
+
+@mixin transform-origin($x-axis, $y-axis: null) {
+  @if $x-axis == start {
+    @include ltr() {
+      transform-origin: left $y-axis;
+    }
+    @include rtl() {
+      transform-origin: right $y-axis;
+    }
+  } @else if $x-axis == end {
+    @include ltr() {
+      transform-origin: right $y-axis;
+    }
+    @include rtl() {
+      transform-origin: left $y-axis;
+    }
+  } @else if $x-axis == left or $x-axis == right {
+    @include multi-dir() {
+      transform-origin: $x-axis $y-axis;
+    }
+  } @else {
+    @include ltr() {
+      transform-origin: $x-axis $y-axis;
+    }
+    @include rtl() {
+      transform-origin: calc(100% - #{$x-axis}) $y-axis;
+    }
+  }
+}
+
+// Add transform for all directions
+// @param {string} $transforms - comma separated list of transforms
+@mixin transform($transforms...) {
+  $extra: null;
+
+  $x: null;
+  $ltr-translate: null;
+  $rtl-translate: null;
+
+  @each $transform in $transforms {
+    @if (str-index($transform, translate3d)) {
+      $transform: str-replace($transform, 'translate3d(');
+      $transform: str-replace($transform, ')');
+
+      $coordinates: str-split($transform, ',');
+
+      $x: nth($coordinates, 1);
+      $y: nth($coordinates, 2);
+      $z: nth($coordinates, 3);
+
+      $ltr-translate: translate3d($x, $y, $z);
+      $rtl-translate: translate3d(calc(-1 * #{$x}), $y, $z);
+    } @else {
+      @if $extra == null {
+        $extra: $transform;
+      } @else {
+        $extra: $extra $transform;
+      }
+    }
+  }
+
+  @if $x == '0' or $x == null {
+    @include multi-dir() {
+      transform: $ltr-translate $extra;
+    }
+  } @else {
+    @include ltr() {
+      transform: $ltr-translate $extra;
+    }
+
+    @include rtl() {
+      transform: $rtl-translate $extra;
+    }
+  }
+}
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index d736a833c..533c22f1d 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -380,7 +380,7 @@
 
     @for $i from 0 to length($core-course-image-background) {
         --core-course-color-#{$i}: #{nth($core-course-image-background, $i + 1)};
-        --core-course-color-#{$i}-tint: #{get-color-tint(nth($core-course-image-background, $i + 1))};
+        --core-course-color-#{$i}-tint: #{get-color-tint-percent(nth($core-course-image-background, $i + 1))};
     }
 
     @for $i from 0 to length($core-dd-question-colors) {

From 7dc81feb9240b7ca5bb348b919461ee03e2fdd7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 16 Mar 2022 15:17:09 +0100
Subject: [PATCH 0744/1008] MOBILE-3814 style: Fix some rtl styles

---
 .../components/onlineusers/onlineusers.scss   | 26 ++--------
 .../recentactivity/recentactivity.scss        | 10 ++--
 .../components/calendar/calendar.scss         | 47 +++----------------
 .../calendar/components/filter/filter.scss    | 13 ++---
 src/addons/messages/messages-common.scss      | 23 ++-------
 .../core-horizontal-scroll-controls.html      |  4 +-
 .../course-list-item/course-list-item.scss    |  4 +-
 7 files changed, 27 insertions(+), 100 deletions(-)

diff --git a/src/addons/block/onlineusers/components/onlineusers/onlineusers.scss b/src/addons/block/onlineusers/components/onlineusers/onlineusers.scss
index c34c11af4..9c3d9a059 100644
--- a/src/addons/block/onlineusers/components/onlineusers/onlineusers.scss
+++ b/src/addons/block/onlineusers/components/onlineusers/onlineusers.scss
@@ -1,3 +1,5 @@
+@import "~theme/globals";
+
 :host .core-block-content ::ng-deep {
     max-height: 200px;
     overflow-y: auto;
@@ -17,14 +19,13 @@
             list-style-type: none;
 
             .user {
-                float: left;
+                @include float(start);
                 position: relative;
                 padding-bottom: 16px;
 
                 .core-adapted-img-container {
                     display: inline;
-                    margin-left: 0;
-                    margin-right: 8px;
+                    @include margin-horizontal(0px, 8px);
                 }
 
                 .userpicture {
@@ -33,7 +34,7 @@
             }
 
             .message {
-                float: right;
+                @include float(end);
                 margin-top: 3px;
             }
 
@@ -48,20 +49,3 @@
     }
 
 }
-
-:host-context([dir=rtl]) .core-block-content ::ng-deep {
-    .list li.listentry {
-        .user {
-            float: right;
-
-            .core-adapted-img-container {
-                margin-left: 8px;
-                margin-right: 0;
-            }
-        }
-
-        .message {
-            float: left;
-        }
-    }
-}
diff --git a/src/addons/block/recentactivity/components/recentactivity/recentactivity.scss b/src/addons/block/recentactivity/components/recentactivity/recentactivity.scss
index a2e9d77a2..a72a303fb 100644
--- a/src/addons/block/recentactivity/components/recentactivity/recentactivity.scss
+++ b/src/addons/block/recentactivity/components/recentactivity/recentactivity.scss
@@ -1,3 +1,5 @@
+@import "~theme/globals";
+
 :host .core-block-content ::ng-deep {
     .activitydate, .activityhead {
         text-align: center;
@@ -12,14 +14,8 @@
             margin-bottom: 1em;
 
             .head .date {
-                float: right;
+                @include float(end);
             }
         }
     }
 }
-
-:host-context([dir=rtl]) .core-block-content ::ng-deep {
-    .unlist li .head .date {
-        float: left;
-    }
-}
diff --git a/src/addons/calendar/components/calendar/calendar.scss b/src/addons/calendar/components/calendar/calendar.scss
index 5e8f8188d..b5c40fd10 100644
--- a/src/addons/calendar/components/calendar/calendar.scss
+++ b/src/addons/calendar/components/calendar/calendar.scss
@@ -22,17 +22,17 @@
 
     .addon-calendar-day {
         border-bottom: 1px solid var(--addon-calendar-border-color);
-        border-right: 1px solid var(--addon-calendar-border-color);
+        @include border-end(1px, solid var(--addon-calendar-border-color));
         overflow: hidden;
         min-height: 60px;
         cursor: pointer;
 
         &:first-child {
-            padding-left: 10px;
+            @include padding-horizontal(10px, null);
         }
         &:last-child {
-            border-right: 0;
-            padding-left: 8px;
+            @include border-end(0);
+            @include padding-horizontal(8px, null);
         }
 
         &.addon-calendar-event-past-day > .addon-calendar-dot-types,
@@ -89,9 +89,7 @@
         }
 
         .addon-calendar-day-more {
-            margin-top: 0.6em;
-            margin-bottom: 0.6em;
-            margin-right: 4px;
+            @include margin(0.6em, null, 0.6em, 4px);
         }
 
         .addon-calendar-dot-types {
@@ -117,10 +115,10 @@
     }
 
     .addon-calendar-day-events {
-        text-align: left;
+        text-align: start;
 
         ion-icon {
-            margin-right: 2px;
+            @include margin-horizontal(null, 2px);
             font-size: 1em;
         }
     }
@@ -154,37 +152,6 @@
     }
 }
 
-:host-context([dir=rtl]) {
-    .addon-calendar-day-events {
-        text-align: right;
-
-        ion-icon {
-            margin-right: unset;
-            margin-left: 2px;
-        }
-    }
-
-    .addon-calendar-day {
-        border-left: 1px solid var(--addon-calendar-border-color);
-        border-right: unset;
-
-        &:first-child {
-            padding-right: 10px;
-            padding-left: unset;
-        }
-        &:last-child {
-            border-left: 0;
-            border-right: unset;
-            padding-right: 8px;
-            padding-left: unset;
-        }
-        .addon-calendar-day-more {
-            margin-left: 4px;
-            margin-right: unset;
-        }
-    }
-}
-
 :host-context(body.dark) {
     --addon-calendar-blank-day-background-color: var(--gray-900);
 }
diff --git a/src/addons/calendar/components/filter/filter.scss b/src/addons/calendar/components/filter/filter.scss
index 904ccbfab..29e652dd0 100644
--- a/src/addons/calendar/components/filter/filter.scss
+++ b/src/addons/calendar/components/filter/filter.scss
@@ -1,7 +1,9 @@
+@import "~theme/globals";
+
 :host {
     ion-item {
         ion-icon, ion-radio {
-            margin-right: 8px;
+            @include margin-horizontal(null, 8px);
         }
 
         > ion-icon {
@@ -10,12 +12,3 @@
         }
     }
 }
-
-:host-context([dir=rtl]) {
-    ion-item {
-        ion-icon, ion-radio {
-            margin-left: 8px;
-            margin-right: unset;
-        }
-    }
-}
diff --git a/src/addons/messages/messages-common.scss b/src/addons/messages/messages-common.scss
index 8b480f462..255a9a156 100644
--- a/src/addons/messages/messages-common.scss
+++ b/src/addons/messages/messages-common.scss
@@ -1,3 +1,5 @@
+@import "~theme/globals";
+
 :host {
     .addon-messages-conversation-item,
     .addon-message-discussion {
@@ -12,7 +14,7 @@
             }
 
             ion-icon {
-                margin-left: 2px;
+                @include margin-horizontal(2px, null);
             }
         }
 
@@ -20,7 +22,7 @@
             display: flex;
             flex-direction: column;
             align-self: flex-start;
-            margin-left: 2px;
+            @include margin-horizontal(2px, null);
 
             ion-badge, ion-icon {
                 margin-top: 3px;
@@ -40,7 +42,7 @@
         .addon-message-last-message-user {
             white-space: nowrap;
             color: var(--ion-text-color);
-            margin-right: 2px;
+            @include margin-horizontal(null, 2px);
         }
 
         .addon-message-last-message-text {
@@ -62,18 +64,3 @@
         margin-right: 16px;
     }
 }
-
-:host-context([dir=rtl]) {
-    .addon-messages-conversation-item,
-    .addon-message-discussion {
-        .item-heading ion-icon {
-            margin-right: 2px;
-            margin-left: 0;
-        }
-
-        .addon-message-last-message-user {
-            margin-left: 2px;
-            margin-right: 0;
-        }
-    }
-}
diff --git a/src/core/components/horizontal-scroll-controls/core-horizontal-scroll-controls.html b/src/core/components/horizontal-scroll-controls/core-horizontal-scroll-controls.html
index 787cea97b..b49f2c683 100644
--- a/src/core/components/horizontal-scroll-controls/core-horizontal-scroll-controls.html
+++ b/src/core/components/horizontal-scroll-controls/core-horizontal-scroll-controls.html
@@ -1,9 +1,9 @@
 <ion-button fill="clear" (click)="scroll('backward')" [hidden]="scrollPosition === 'hidden'" [disabled]="scrollPosition === 'start'"
     [attr.aria-label]="'core.scrollbackward' | translate" [attr.aria-controls]="targetId">
-    <ion-icon name="fas-chevron-left" slot="icon-only" aria-hidden="true"></ion-icon>
+    <ion-icon name="fas-chevron-left" slot="icon-only" aria-hidden="true" flip-rtl="false"></ion-icon>
 </ion-button>
 
 <ion-button fill="clear" (click)="scroll('forward')" [hidden]="scrollPosition === 'hidden'" [disabled]="scrollPosition === 'end'"
     [attr.aria-label]="'core.scrollforward' | translate" [attr.aria-controls]="targetId">
-    <ion-icon name="fas-chevron-right" slot="icon-only" aria-hidden="true"></ion-icon>
+    <ion-icon name="fas-chevron-right" slot="icon-only" aria-hidden="true" flip-rtl="false"></ion-icon>
 </ion-button>
diff --git a/src/core/features/courses/components/course-list-item/course-list-item.scss b/src/core/features/courses/components/course-list-item/course-list-item.scss
index 48e3c7284..7d1bb34dc 100644
--- a/src/core/features/courses/components/course-list-item/course-list-item.scss
+++ b/src/core/features/courses/components/course-list-item/course-list-item.scss
@@ -35,7 +35,7 @@
 
 // Common styles.
 .item-heading ion-icon {
-    margin-right: 4px;
+    @include margin-horizontal(null, 4px);
     color: var(--core-star-color);
 }
 
@@ -130,7 +130,7 @@ ion-card.core-course-list-item {
     }
 
     .core-course-maininfo {
-        margin-right: 32px;
+        @include margin-horizontal(null, 32px);
     }
 }
 

From 6363a19b11410f1a03570f6c7ab86e92dbd1aaca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 16 Mar 2022 15:52:09 +0100
Subject: [PATCH 0745/1008] MOBILE-3814 loading: Display contents on loading
 content fixes iframe

---
 src/core/components/loading/loading.scss | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/core/components/loading/loading.scss b/src/core/components/loading/loading.scss
index fc4d95b1f..efa86a0de 100644
--- a/src/core/components/loading/loading.scss
+++ b/src/core/components/loading/loading.scss
@@ -8,6 +8,7 @@
     --loading-inline-margin: 0px;
     --loading-inline-min-height: 28px;
     --internal-loading-inline-min-height: var(--loading-inline-min-height);
+    --content-display: contents;
 
     position: static;
     color: var(--loading-text-color);
@@ -45,6 +46,7 @@
 
     .core-loading-content {
         @include core-transition(opacity, 200ms);
+        display: var(--content-display);
     }
 
     .core-loading-message {
@@ -75,10 +77,13 @@
         height: 100%;
     }
 
-    &.has-spacer .core-loading-content {
-        min-height: 100%;
-        display: flex;
-        flex-direction: column;
+    &.has-spacer {
+        --content-display: flex;
+
+        .core-loading-content {
+            min-height: 100%;
+            flex-direction: column;
+        }
     }
 
     &.list-item-limited-width .core-loading-content {

From 11cdb0fffe0ce68ba66d8ccdfd40dafc67dc1054 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 16 Mar 2022 16:37:58 +0100
Subject: [PATCH 0746/1008] MOBILE-3833 core: Wait for visible RTE content

---
 .../editor/components/rich-text-editor/rich-text-editor.ts      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
index 18a9760fb..07bf8b799 100644
--- a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
+++ b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
@@ -176,6 +176,8 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
         this.editorElement.oninput = this.onChange.bind(this);
         this.editorElement.onkeydown = this.moveCursor.bind(this);
 
+        await CoreDomUtils.waitToBeVisible(this.editorElement);
+
         // Use paragraph on enter.
         document.execCommand('DefaultParagraphSeparator', false, 'p');
 

From b7fe9236f6be160f18f60c5fcb9ead39b62ada7f Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 16 Mar 2022 16:39:02 +0100
Subject: [PATCH 0747/1008] MOBILE-3833 core: Fix button aria-label reactivity

---
 .../update-non-reactive-attributes.ts           | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/core/directives/update-non-reactive-attributes.ts b/src/core/directives/update-non-reactive-attributes.ts
index 1c8508c3b..6089403a4 100644
--- a/src/core/directives/update-non-reactive-attributes.ts
+++ b/src/core/directives/update-non-reactive-attributes.ts
@@ -33,15 +33,18 @@ export class CoreUpdateNonReactiveAttributesDirective implements OnInit, OnDestr
     constructor(element: ElementRef<HTMLIonButtonElement>) {
         this.element = element.nativeElement;
         this.mutationObserver = new MutationObserver(() => {
-            const ariaLabel = this.element.getAttribute('aria-label');
-            if (!ariaLabel) {
-                // Aria label unset by ionButton component (when first created).
+            const button = this.element.shadowRoot?.querySelector('button');
+
+            if (!button) {
                 return;
             }
 
             // Propagate label to button.
-            const button = this.element.shadowRoot?.querySelector('button');
-            button?.setAttribute('aria-label', ariaLabel);
+            const ariaLabel = this.element.getAttribute('aria-label');
+
+            ariaLabel
+                ? button.setAttribute('aria-label', ariaLabel)
+                : button.removeAttribute('aria-label');
         });
     }
 
@@ -51,10 +54,6 @@ export class CoreUpdateNonReactiveAttributesDirective implements OnInit, OnDestr
     async ngOnInit(): Promise<void> {
         await this.element.componentOnReady();
 
-        if (!this.element.getAttribute('aria-label')) {
-            return;
-        }
-
         this.mutationObserver.observe(this.element, { attributes: true, attributeFilter: ['aria-label'] });
     }
 

From 0db4781814337dd36ae45275b3df30e12bbc240f Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 17 Mar 2022 09:28:47 +0100
Subject: [PATCH 0748/1008] MOBILE-3153 usertours: Update design

---
 .../fonts/moodle/moodle/swipe-navigation.svg  |  1 +
 src/assets/img/user-tours/course-index.svg    |  1 -
 src/assets/img/user-tours/side-blocks.svg     |  1 -
 .../img/user-tours/swipe-navigation.svg       |  1 -
 src/assets/img/user-tours/user-menu.svg       |  1 -
 .../core-swipe-navigation-tour.html           |  4 +-
 .../swipe-navigation-tour.scss                | 13 ++++-
 .../side-blocks-tour/side-blocks-tour.html    |  1 -
 .../side-blocks-tour/side-blocks-tour.scss    |  2 +-
 .../course-index-tour/course-index-tour.html  |  1 -
 .../course-index-tour/course-index-tour.scss  |  2 +-
 .../user-menu-button/user-menu-button.ts      |  6 ++-
 .../user-menu-tour/user-menu-tour.html        |  1 -
 .../user-menu-tour/user-menu-tour.scss        | 19 ++-----
 .../components/user-tour/user-tour.ts         | 28 ++++-------
 .../features/usertours/services/user-tours.ts | 50 ++-----------------
 16 files changed, 38 insertions(+), 94 deletions(-)
 create mode 100644 src/assets/fonts/moodle/moodle/swipe-navigation.svg
 delete mode 100644 src/assets/img/user-tours/course-index.svg
 delete mode 100644 src/assets/img/user-tours/side-blocks.svg
 delete mode 100644 src/assets/img/user-tours/swipe-navigation.svg
 delete mode 100644 src/assets/img/user-tours/user-menu.svg

diff --git a/src/assets/fonts/moodle/moodle/swipe-navigation.svg b/src/assets/fonts/moodle/moodle/swipe-navigation.svg
new file mode 100644
index 000000000..e4c38b55b
--- /dev/null
+++ b/src/assets/fonts/moodle/moodle/swipe-navigation.svg
@@ -0,0 +1 @@
+<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 202 98"><path fill-rule="evenodd" clip-rule="evenodd" d="M98.269 84.491c1.654.528 10.173 2.987 25.555 7.378l13.172-21.987 1.308-12.462-11.649-8.533-12.69-4.665 5.051-19.274-3.955-4.534-5.864 1.961-7.052 26.911-3.439-.148-5.382 2.166-4.591 11.492 7.54 15.381c-.324 3.682.342 5.787 1.996 6.314Z" fill="#fff"/><path d="M117.797 47.53c-1.169-.307-2.275-.156-3.317.452-1.043.608-1.717 1.494-2.022 2.66l-1.106 4.22-1.058-.277.803-3.067c.277-1.055 6.047-23.565 6.047-23.565.381-1.454-.597-3.654-2.779-4.226-2.182-.571-4.113.866-4.494 2.32-.381 1.455-1.345 5.078-1.61 6.09l-8.252 31.489-.8-1.267 1.487-5.672c.276-1.055.158-2.044-.354-2.965-.513-.922-1.298-1.52-2.356-1.798-1.015-.266-1.98-.132-2.898.403-.918.535-1.51 1.308-1.774 2.32l-1.935 7.387c-.27 1.033-.121 2.036.449 3.007l7.694 12.449c.636 1.083.772 2.316.409 3.702-.15.571-.07 1.12.239 1.648.31.528.751.867 1.324 1.017l21.166 5.546c.573.15 1.124.072 1.652-.236.528-.308.867-.748 1.017-1.32l.216-.824a9.733 9.733 0 0 1 .996-2.453l7.338-13.442c.428-.734.76-1.552.996-2.453l2.126-8.113c.276-1.055.158-2.043-.355-2.965-.512-.921-1.298-1.52-2.356-1.798-1.014-.266-1.98-.131-2.897.404-.918.534-1.509 1.308-1.774 2.319l-.277 1.055-1.058-.277 1.08-4.122a3.95 3.95 0 0 0-.201-2.608c-.364-.859-.952-1.489-1.766-1.89a5.8 5.8 0 0 0-.743-.266c-1.015-.265-1.981-.13-2.898.404-.918.535-1.509 1.308-1.774 2.32l-1.106 4.22-1.058-.277 1.054-4.023a4.577 4.577 0 0 0-.302-3.233 4.098 4.098 0 0 0-2.352-2.15 2.35 2.35 0 0 0-.421-.145Zm1.105-4.222c1.852.486 3.351 1.466 4.496 2.94a8.08 8.08 0 0 1 4.361-.055 8.136 8.136 0 0 1 3.438 1.853 8.036 8.036 0 0 1 2.187 3.251 8.043 8.043 0 0 1 2.012.28c2.205.579 3.873 1.856 5.004 3.832 1.132 1.977 1.41 4.064.834 6.263l-2.126 8.112c-.293 1.121-.748 2.271-1.363 3.45l-7.371 13.433c-.271.493-.541 1.256-.812 2.29-.461 1.759-1.47 3.092-3.027 4-1.557.907-3.218 1.13-4.981.668l-21.165-5.547c-1.852-.485-3.205-1.527-4.059-3.125-.853-1.598-1.038-3.32-.554-5.168l-7.629-12.43c-1.255-2.045-1.589-4.188-1.001-6.43l1.935-7.388c.57-2.176 1.835-3.836 3.796-4.978 1.96-1.143 4.032-1.428 6.214-.856.243.063.951.26 1.056.311.679-2.054 5.921-22.284 6.778-25.557.929-3.545 6.497-4.029 8.679-3.457 2.182.572 6.916 3.269 5.868 7.269-.191.727-4.365 16.347-4.461 16.71 0 0-.357-.26 1.891.33Z" fill="var(--ion-color-primary)"/><path d="M101.728 32.565c-.812.436-1.832.135-2.178-.719a15.246 15.246 0 0 1-1.051-7.043 15.418 15.418 0 0 1 3.22-8.154 15.566 15.566 0 0 1 7.157-5.113 15.504 15.504 0 0 1 8.774-.415 15.306 15.306 0 0 1 7.547 4.42 15.209 15.209 0 0 1 3.872 7.819c.5 2.93.132 5.947-1.057 8.685a15.51 15.51 0 0 1-4.319 5.75c-.702.582-1.735.37-2.242-.39-.507-.76-.292-1.78.394-2.386a12.146 12.146 0 0 0 3.112-4.273 12.014 12.014 0 0 0 .829-6.81 11.927 11.927 0 0 0-3.036-6.13 12.005 12.005 0 0 0-5.917-3.465 12.158 12.158 0 0 0-6.88.324 12.207 12.207 0 0 0-5.612 4.01 12.092 12.092 0 0 0-2.525 6.393 11.95 11.95 0 0 0 .695 5.187c.319.864.028 1.873-.783 2.31Z" fill="var(--primary-tint)"/><rect x="76.039" y="12.141" width="23.308" height="3.759" rx="1.88" fill="var(--primary-tint)"/><rect x="70.619" y="21.163" width="21.805" height="3.759" rx="1.88" fill="var(--primary-tint)"/><rect x="80.394" y="30.186" width="16.541" height="3.759" rx="1.88" fill="var(--primary-tint)"/><path d="M141.5 20.788a1.88 1.88 0 1 0 0 3.759v-3.76Zm60.15 1.88-18.797-10.853V33.52l18.797-10.853Zm-60.15 1.879h43.233v-3.76H141.5v3.76Zm-80.35 0a1.88 1.88 0 0 0 0-3.76v3.76ZM1 22.667 19.797 33.52V11.815L1 22.667Zm60.15-1.88H17.917v3.76H61.15v-3.76Z" fill="var(--ion-color-primary)"/></svg>
diff --git a/src/assets/img/user-tours/course-index.svg b/src/assets/img/user-tours/course-index.svg
deleted file mode 100644
index c3ecbf014..000000000
--- a/src/assets/img/user-tours/course-index.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 206 143"><rect x=".5" y="11.017" width="180.187" height="112.617" rx="6.143" fill="#EAF6FF"/><mask id="a" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="6" y="11" width="170" height="113"><rect x="6.106" y="11.017" width="168.975" height="112.917" rx="6.143" fill="#EAF6FF"/></mask><g mask="url(#a)"><rect x="77.78" y="20.627" width="25.627" height="6.407" rx="3.203" fill="#86CBFF"/><rect x="28.529" y="37.444" width="124.129" height="10.411" rx="5.205" fill="#86CBFF"/><path fill-rule="evenodd" clip-rule="evenodd" d="M18.944 46.226a1.793 1.793 0 0 1-2.689.083l-4.859-5.178a1.793 1.793 0 1 1 2.615-2.454l3.533 3.765 3.646-4.05a1.793 1.793 0 0 1 2.665 2.4l-4.75 5.277c-.052.056-.105.108-.161.157Z" fill="#86CBFF"/><rect x="28.827" y="56.309" width="92.653" height="10.238" rx="5.119" fill="#C5E6FF"/><circle cx="17.821" cy="61.172" r="6.911" fill="#C5E6FF"/><rect x="28.827" y="76.537" width="78.32" height="10.238" rx="5.119" fill="#C5E6FF"/><circle cx="17.821" cy="81.4" r="6.911" fill="#C5E6FF"/><rect x="28.827" y="96.764" width="110.569" height="10.238" rx="5.119" fill="#C5E6FF"/><circle cx="17.821" cy="101.628" r="6.911" fill="#C5E6FF"/><rect x="28.827" y="116.992" width="90.605" height="10.238" rx="5.119" fill="#C5E6FF"/><circle cx="17.821" cy="121.855" r="6.911" fill="#C5E6FF"/></g><g filter="url(#b)"><rect x="155.45" y="90.299" width="48.05" height="48.05" rx="24.025" fill="#3880FF"/><path d="M170.466 106.952a1.638 1.638 0 1 0 0 3.276 1.638 1.638 0 0 0 0-3.276ZM174.561 107.362a1.228 1.228 0 1 0 0 2.457h14.742a1.229 1.229 0 1 0 0-2.457h-14.742ZM174.561 113.095a1.229 1.229 0 1 0 0 2.457h14.742a1.228 1.228 0 1 0 0-2.457h-14.742ZM173.332 120.057c0-.679.55-1.229 1.229-1.229h14.742a1.229 1.229 0 1 1 0 2.457h-14.742c-.679 0-1.229-.55-1.229-1.228ZM168.828 114.324a1.638 1.638 0 1 1 3.275 0 1.638 1.638 0 0 1-3.275 0ZM170.466 118.419a1.638 1.638 0 1 0 0 3.275 1.638 1.638 0 0 0 0-3.275Z" fill="#fff"/></g><path d="m166.471 0-11.559 20.02h23.118L166.471 0Zm-2.002 79.282a2.002 2.002 0 1 0 4.004 0h-4.004Zm0-69.844a2.002 2.002 0 1 0 4.004 0h-4.004Zm4.004 7.551a2.002 2.002 0 1 0-4.004 0h4.004Zm-4.004 18.877a2.002 2.002 0 1 0 4.004 0h-4.004Zm4.004 7.55a2.002 2.002 0 1 0-4.004 0h4.004Zm-4.004 18.877a2.002 2.002 0 1 0 4.004 0h-4.004Zm4.004 7.55a2.002 2.002 0 1 0-4.004 0h4.004Zm-4.004-52.854v18.877h4.004V16.989h-4.004Zm0 26.427v18.877h4.004V43.416h-4.004Zm0 26.428v9.438h4.004v-9.438h-4.004Z" fill="#0056B3"/><defs><filter id="b" x="153.266" y="90.299" width="52.418" height="52.418" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/><feOffset dy="2.184"/><feGaussianBlur stdDeviation="1.092"/><feComposite in2="hardAlpha" operator="out"/><feColorMatrix values="0 0 0 0 0.120972 0 0 0 0 0.203233 0 0 0 0 0.279167 0 0 0 0.25 0"/><feBlend in2="BackgroundImageFix" result="effect1_dropShadow_319_9155"/><feBlend in="SourceGraphic" in2="effect1_dropShadow_319_9155" result="shape"/></filter></defs></svg>
diff --git a/src/assets/img/user-tours/side-blocks.svg b/src/assets/img/user-tours/side-blocks.svg
deleted file mode 100644
index c2c8d4372..000000000
--- a/src/assets/img/user-tours/side-blocks.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 125"><rect x="6.495" y="13.044" width="183.87" height="102.273" rx="6.818" transform="rotate(-1 6.495 13.044)" fill="#EAF6FF"/><mask id="a" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="6" y="9" width="187" height="107"><rect x="6.495" y="13.044" width="183.87" height="102.273" rx="6.818" transform="rotate(-1 6.495 13.044)" fill="#EAF6FF"/></mask><g mask="url(#a)"><path d="M1.704-23.385 2.608 10.8c96.253 23.32 167.942 24.014 191.755 21.446l-.297-11.232C124.547 16.427 36.859-10.497 1.704-23.385ZM6.405 121.583c24.753-17.058 137.208-28.467 190.341-32.04l.192 7.268C51.976 111.666 10.036 139.218 7.186 151.137l-.78-29.554Z" fill="#C5E6FF" fill-opacity=".44"/><path d="M4.252 105.864c53.467-15.022 150.465-22.507 192.281-24.372l-1.162-43.963c-73.082 4.44-159.46-12.992-193.514-22.263l2.395 90.598Z" fill="#C5E6FF" fill-opacity=".44"/><path d="M57.834 89.671c-.27 1.812-1.13 3.397-2.578 4.753-1.449 1.356-3.293 2.323-5.532 2.901-2.24.579-4.598.683-7.073.313a19.64 19.64 0 0 1-3.375-.825c-1.779.907-3.705 1.473-5.78 1.696a16.44 16.44 0 0 1-1.718.063l-.058-.009a.612.612 0 0 1-.376-.216.654.654 0 0 1-.162-.444.404.404 0 0 1 0-.13.776.776 0 0 1 .029-.126.419.419 0 0 1 .056-.111l.063-.09.084-.098.093-.086.102-.085.09-.076c.077-.069.25-.21.52-.422.271-.213.468-.38.593-.502.124-.121.298-.288.522-.501.224-.213.423-.44.598-.68.175-.241.351-.508.527-.801-1.466-1.18-2.558-2.522-3.274-4.028-.715-1.507-.957-3.035-.725-4.587.27-1.812 1.13-3.396 2.578-4.752 1.449-1.356 3.293-2.324 5.532-2.902 2.24-.578 4.598-.682 7.073-.312 2.476.37 4.7 1.159 6.673 2.367 1.973 1.207 3.453 2.671 4.442 4.392.988 1.72 1.347 3.486 1.076 5.298Zm6.718 6.122c-.234 1.564-.913 2.96-2.037 4.184-1.123 1.225-2.56 2.186-4.307 2.885.083.332.173.639.27.92a5 5 0 0 0 .374.825c.152.269.27.48.353.633.083.152.223.369.419.652a13.942 13.942 0 0 1 .439.655c.032.052.056.089.072.111a.849.849 0 0 1 .064.11c.025.05.043.089.052.117l.034.105.021.123-.01.129-.038.124a.734.734 0 0 1-.317.393.592.592 0 0 1-.448.073 16.686 16.686 0 0 1-1.625-.563c-1.918-.82-3.595-1.924-5.031-3.311a19.717 19.717 0 0 1-3.469-.198c-3.512-.525-6.443-1.843-8.79-3.953.743.164 1.31.276 1.699.334 2.087.312 4.133.318 6.139.018 2.006-.3 3.842-.886 5.51-1.756 1.799-.957 3.25-2.153 4.352-3.588 1.102-1.434 1.784-3.025 2.045-4.772.15-1.004.149-2.017-.003-3.039 1.534 1.176 2.682 2.533 3.446 4.074.764 1.54 1.026 3.112.786 4.715ZM103.599 87.974l1.526 5.695c.133.496.071.97-.187 1.42-.258.45-.633.742-1.125.874l-9.759 2.615a1.784 1.784 0 0 1-1.41-.194 1.813 1.813 0 0 1-.873-1.136l-2.08-7.767c-.134-.496-.071-.97.186-1.42.258-.45.633-.742 1.125-.873l2.568-.689a1.784 1.784 0 0 1 1.411.195c.449.261.74.64.873 1.136l.069.259 5.393-1.445a1.783 1.783 0 0 1 1.411.194c.448.261.739.64.872 1.136ZM130.789 102.466a1.625 1.625 0 0 0-.756-1.04 1.622 1.622 0 0 0-1.27-.201 1.62 1.62 0 0 0-1.041.756 1.622 1.622 0 0 0-.201 1.27c.108.451.36.798.756 1.04.396.243.819.31 1.27.201.451-.108.798-.36 1.04-.756.243-.395.31-.819.202-1.27Zm15.383 4.083c.109.451.043.871-.196 1.262l-4.759 7.784a1.68 1.68 0 0 1-1.049.751 1.61 1.61 0 0 1-1.262-.196l-11.32-6.948c-.399-.237-.776-.601-1.132-1.092-.357-.49-.589-.961-.697-1.412l-1.275-5.309a1.62 1.62 0 0 1 .209-1.266c.246-.4.59-.654 1.033-.76l5.309-1.275c.451-.108.976-.115 1.575-.02.599.094 1.098.265 1.499.51l11.314 6.923c.395.256.645.605.751 1.048ZM154.994 74.735l-.494 3.516a1.026 1.026 0 0 1-.412.704 1.029 1.029 0 0 1-.791.203l-3.517-.494a1.028 1.028 0 0 1-.704-.413 1.029 1.029 0 0 1-.202-.79l.494-3.517c.041-.293.179-.528.413-.704.234-.176.497-.244.79-.203l1.055.149.297-2.11-5.627-.791-.296 2.11 1.055.148c.293.041.527.179.704.413.176.234.244.497.202.79l-.494 3.517a1.027 1.027 0 0 1-.413.704 1.026 1.026 0 0 1-.79.203l-3.517-.495a1.03 1.03 0 0 1-.704-.412 1.025 1.025 0 0 1-.202-.79l.494-3.517c.041-.294.179-.528.413-.704.233-.177.497-.244.79-.203l1.055.148.297-2.11-5.627-.79-.297 2.11 1.055.148c.294.04.528.178.705.412.176.234.243.498.202.79l-.494 3.517a1.027 1.027 0 0 1-.413.704 1.026 1.026 0 0 1-.79.203l-3.517-.494a1.027 1.027 0 0 1-.704-.413 1.03 1.03 0 0 1-.203-.79l.495-3.517c.041-.293.178-.528.412-.704.234-.176.498-.244.791-.203l1.055.149.296-2.11c.054-.381.239-.691.557-.93.318-.24.667-.333 1.048-.28l5.626.792.297-2.11-1.055-.149a1.027 1.027 0 0 1-.704-.412 1.025 1.025 0 0 1-.203-.79l.494-3.517a1.03 1.03 0 0 1 .413-.705c.234-.176.498-.243.791-.202l3.516.494c.293.041.528.179.704.413.176.234.244.497.203.79l-.494 3.517a1.03 1.03 0 0 1-.413.704 1.029 1.029 0 0 1-.791.203l-1.055-.149-.296 2.11 5.626.791c.381.054.691.24.931.557.239.317.332.666.278 1.047l-.296 2.11 1.055.149c.293.04.528.178.704.412.176.234.244.498.202.79ZM159.542 33.815l-.377 5.764c-.054.839-.644 1.55-1.77 2.136-1.126.584-2.614.975-4.464 1.17-1.851.196-3.826.165-5.927-.093-2.102-.258-4.026-.706-5.774-1.343-1.748-.638-3.098-1.377-4.049-2.216-.951-.84-1.351-1.674-1.2-2.501l1.028-5.684 9.995 4.555c.255.117.54.195.854.234.313.038.608.031.885-.02l10.799-2.002Zm10.32-4.69c-.034.278-.19.448-.467.512l-21.069 3.885a.77.77 0 0 1-.184-.004.777.777 0 0 1-.179-.04l-11.351-5.181c-.57.346-1.081.967-1.534 1.861-.453.895-.791 1.947-1.013 3.158.707.528 1.007 1.233.899 2.114-.103.833-.532 1.436-1.289 1.81l.088 7.971a.54.54 0 0 1-.201.435.537.537 0 0 1-.459.146l-3.478-.427a.538.538 0 0 1-.41-.253.538.538 0 0 1-.089-.47l2.013-7.714c-.644-.545-.914-1.234-.812-2.067.108-.882.583-1.504 1.424-1.866.44-2.483 1.276-4.403 2.509-5.76l-5.8-2.624c-.254-.129-.364-.332-.33-.61.034-.278.19-.449.468-.513l21.069-3.885a.766.766 0 0 1 .183.005.765.765 0 0 1 .179.04l19.504 8.867c.253.129.363.332.329.61ZM89.868 67.27l3.925.552.552-3.925-3.925-.552-.552 3.925Zm4.797.674 4.362.613.551-3.925-4.36-.613-.553 3.925Zm-4.123-5.471 3.925.551.613-4.361-3.925-.552-.613 4.362Zm4.798.674 4.361.613.613-4.362-4.361-.613-.613 4.362Zm-4.062-5.908 3.925.552.552-3.926-3.926-.551-.551 3.925Zm8.621 11.44 4.361.614.552-3.925-4.361-.613-.552 3.925Zm-3.824-10.766 4.362.613.551-3.925-4.361-.613-.552 3.925Zm9.058 11.502 3.925.552.552-3.925-3.926-.552-.551 3.925Zm-4.56-5.533 4.362.613.613-4.361-4.362-.613-.613 4.361Zm-3.142-12.45.551-3.925a.423.423 0 0 0-.086-.325.423.423 0 0 0-.288-.172l-.873-.123a.423.423 0 0 0-.325.087.423.423 0 0 0-.172.288l-.552 3.925a.423.423 0 0 0 .087.325c.074.099.17.156.288.173l.872.122a.423.423 0 0 0 .325-.086.423.423 0 0 0 .173-.289Zm8.376 13.186 3.925.552.613-4.362-3.925-.551-.613 4.36Zm-4.498-5.97 4.361.614.552-3.926-4.361-.613-.552 3.926Zm5.234.736 3.925.552.551-3.925-3.925-.552-.551 3.925Zm1.355-6.48.552-3.926a.423.423 0 0 0-.087-.325.422.422 0 0 0-.288-.172l-.872-.123a.423.423 0 0 0-.325.087.423.423 0 0 0-.173.288l-.551 3.925a.422.422 0 0 0 .086.325c.074.099.17.156.288.173l.873.122a.424.424 0 0 0 .325-.086.426.426 0 0 0 .172-.289Zm5.356-.137-2.451 17.445a1.695 1.695 0 0 1-.691 1.154 1.693 1.693 0 0 1-1.299.346l-19.19-2.697a1.693 1.693 0 0 1-1.154-.69 1.693 1.693 0 0 1-.346-1.3l2.452-17.446c.066-.472.297-.857.69-1.154a1.693 1.693 0 0 1 1.3-.345l1.744.245.184-1.308c.085-.6.37-1.083.857-1.45a2.12 2.12 0 0 1 1.63-.425l.873.123c.6.084 1.083.37 1.45.857a2.12 2.12 0 0 1 .424 1.63l-.184 1.309 5.234.735.184-1.308c.084-.6.37-1.083.857-1.45a2.12 2.12 0 0 1 1.63-.424l.872.122c.6.085 1.083.37 1.45.857s.509 1.03.424 1.63l-.184 1.309 1.745.245c.472.066.857.297 1.154.69.297.394.412.827.345 1.3ZM185.616 53.236c-.119-1.511-.758-2.761-1.917-3.751-1.158-.99-2.494-1.425-4.005-1.306-1.511.118-2.762.757-3.752 1.916-.989 1.16-1.425 2.494-1.306 4.006.119 1.511.758 2.761 1.917 3.751 1.159.99 2.494 1.426 4.005 1.306 1.512-.118 2.762-.757 3.752-1.916.99-1.16 1.425-2.494 1.306-4.006Zm7.077 9.702c.033.425-.093.805-.379 1.14-.286.335-.641.519-1.066.552a1.463 1.463 0 0 1-1.14-.379l-4.533-3.86c-1.383 1.128-2.973 1.763-4.77 1.905a8.505 8.505 0 0 1-3.405-.417 8.654 8.654 0 0 1-2.902-1.62 8.645 8.645 0 0 1-2.055-2.613 8.493 8.493 0 0 1-.944-3.299 8.512 8.512 0 0 1 .416-3.405c.37-1.102.91-2.069 1.621-2.902a8.67 8.67 0 0 1 2.613-2.055 8.503 8.503 0 0 1 3.298-.944 8.505 8.505 0 0 1 3.405.417c1.102.37 2.069.91 2.902 1.62a8.642 8.642 0 0 1 2.055 2.613c.538 1.03.852 2.13.944 3.298a8.42 8.42 0 0 1-1.134 5.01l4.534 3.872c.326.279.506.634.54 1.067ZM51.843 40.931c-1.528.347-2.666 1.202-3.415 2.566l-1.908.371c-.778.151-1.47.085-2.077-.198-.606-.283-.982-.797-1.127-1.542-.655-3.369-.394-5.168.783-5.397.057-.01.283.05.678.18.394.132.896.245 1.506.34.609.094 1.194.087 1.753-.022a5.794 5.794 0 0 0 1.83-.697c.02.362.058.682.112.958.258 1.327.88 2.474 1.865 3.441Zm17.018 6.157c.222 1.146.052 2.117-.512 2.915-.564.798-1.42 1.309-2.568 1.532l-12.44 2.418c-1.149.223-2.134.07-2.955-.458-.822-.529-1.344-1.366-1.567-2.511a21.877 21.877 0 0 1-.238-1.492 14.933 14.933 0 0 1-.104-1.599c-.009-.578.016-1.12.075-1.627.06-.506.173-1.011.341-1.514.168-.504.387-.947.657-1.332.27-.384.626-.718 1.068-1.002a4.333 4.333 0 0 1 1.532-.595c.095-.019.319.044.672.189.353.144.743.306 1.172.485.429.18.981.31 1.657.391.675.082 1.336.06 1.981-.066a6.338 6.338 0 0 0 1.862-.68c.596-.33 1.06-.658 1.39-.984.33-.327.632-.623.905-.89.273-.265.457-.408.552-.426a4.332 4.332 0 0 1 1.643-.022c.516.097.972.274 1.366.53.394.254.764.584 1.108.987.344.404.639.83.883 1.277.245.448.471.941.68 1.48.207.54.375 1.047.502 1.522.127.476.24.966.338 1.472Zm-18.13-15.45a3.608 3.608 0 0 1-.564 2.8c-.572.854-1.361 1.378-2.367 1.574-1.006.196-1.934.005-2.785-.573a3.607 3.607 0 0 1-1.572-2.384 3.608 3.608 0 0 1 .564-2.799c.573-.854 1.362-1.379 2.368-1.574 1.006-.196 1.934-.005 2.785.573a3.608 3.608 0 0 1 1.571 2.384Zm11.09 3.55c.295 1.518.013 2.917-.846 4.199-.859 1.281-2.043 2.068-3.552 2.362-1.508.293-2.9.006-4.177-.86-1.276-.866-2.062-2.058-2.357-3.576-.295-1.517-.013-2.917.846-4.198.859-1.281 2.042-2.069 3.551-2.362 1.509-.293 2.902-.007 4.178.86 1.276.866 2.062 2.058 2.357 3.575Zm8.825 1.628c.144.745-.011 1.362-.468 1.852-.456.49-1.073.81-1.851.961L66.419 40c-1.205-.984-2.581-1.35-4.128-1.1.552-1.265.699-2.562.44-3.889a7.308 7.308 0 0 0-.254-.93 5.794 5.794 0 0 0 1.957-.04 5.061 5.061 0 0 0 1.634-.636 9.51 9.51 0 0 0 1.27-.879c.317-.27.503-.41.56-.42 1.177-.23 2.093 1.34 2.748 4.71Zm-3.517-8.365a3.608 3.608 0 0 1-.564 2.8c-.572.853-1.362 1.378-2.367 1.574-1.006.195-1.935.004-2.786-.573a3.608 3.608 0 0 1-1.57-2.384 3.608 3.608 0 0 1 .563-2.8c.572-.853 1.362-1.378 2.368-1.574 1.005-.195 1.934-.004 2.785.573a3.608 3.608 0 0 1 1.571 2.384Z" fill="#86CBFF"/></g><path d="m32.36 32.836-.448-3.926a1.905 1.905 0 0 0-.73-1.326 1.905 1.905 0 0 0-1.457-.414l-8.506.97-.97-8.507a1.905 1.905 0 0 0-.73-1.325 1.905 1.905 0 0 0-1.456-.414l-3.926.447a1.906 1.906 0 0 0-1.325.73c-.338.426-.476.911-.414 1.457l.969 8.506-8.507.97a1.905 1.905 0 0 0-1.325.73c-.338.425-.476.91-.414 1.456l.447 3.926c.063.545.306.987.731 1.325.426.338.91.476 1.456.414l8.506-.969.97 8.507c.062.545.306.987.73 1.325.426.338.911.476 1.456.414l3.926-.447a1.906 1.906 0 0 0 1.326-.731c.338-.425.476-.91.414-1.456l-.97-8.506 8.507-.97a1.906 1.906 0 0 0 1.325-.73c.338-.426.477-.911.414-1.456ZM197.012 95.186l.241-3.944a1.907 1.907 0 0 0-.49-1.432 1.906 1.906 0 0 0-1.362-.66l-8.545-.523.522-8.546a1.903 1.903 0 0 0-.489-1.432 1.905 1.905 0 0 0-1.362-.66l-3.944-.242a1.905 1.905 0 0 0-1.432.49c-.407.36-.627.814-.661 1.362l-.522 8.545-8.546-.523a1.905 1.905 0 0 0-1.432.49c-.407.36-.627.814-.66 1.362l-.242 3.944c-.033.548.13 1.025.49 1.432.36.407.814.627 1.362.66l8.545.523-.522 8.546a1.903 1.903 0 0 0 .489 1.432c.36.407.814.627 1.362.66l3.944.242a1.907 1.907 0 0 0 1.432-.49c.407-.36.627-.814.661-1.362l.522-8.545 8.546.522a1.905 1.905 0 0 0 1.432-.49c.407-.36.627-.813.661-1.361ZM124.934 25.352l-.327-1.95a.95.95 0 0 0-.4-.644.952.952 0 0 0-.738-.169l-4.226.708-.707-4.226a.957.957 0 0 0-.4-.644.956.956 0 0 0-.739-.168l-1.95.326a.953.953 0 0 0-.643.4.955.955 0 0 0-.169.738l.707 4.226-4.226.707a.953.953 0 0 0-.643.4.955.955 0 0 0-.169.739l.327 1.95a.95.95 0 0 0 .4.643.952.952 0 0 0 .738.17l4.226-.708.707 4.226c.045.27.179.485.4.643a.953.953 0 0 0 .738.169l1.951-.326a.953.953 0 0 0 .643-.4.954.954 0 0 0 .169-.739l-.707-4.226 4.226-.707a.956.956 0 0 0 .643-.4.954.954 0 0 0 .169-.738ZM86.593 110.663l.052-1.977a.956.956 0 0 0-.27-.708.953.953 0 0 0-.693-.306l-4.283-.112.112-4.283a.953.953 0 0 0-.27-.708.954.954 0 0 0-.692-.307l-1.977-.052a.955.955 0 0 0-.708.27.955.955 0 0 0-.306.693l-.113 4.283-4.283-.112a.955.955 0 0 0-.707.27.953.953 0 0 0-.307.692l-.052 1.977a.953.953 0 0 0 .27.708.958.958 0 0 0 .693.307l4.283.112-.112 4.283a.956.956 0 0 0 .27.708.953.953 0 0 0 .692.306l1.977.052a.955.955 0 0 0 .708-.27.954.954 0 0 0 .306-.693l.113-4.283 4.283.112a.95.95 0 0 0 .708-.269.957.957 0 0 0 .306-.693ZM39.984 59.205l.07-2.633a1.27 1.27 0 0 0-.36-.943 1.27 1.27 0 0 0-.923-.408l-5.706-.15.15-5.705a1.27 1.27 0 0 0-.36-.943 1.27 1.27 0 0 0-.922-.408l-2.634-.07a1.27 1.27 0 0 0-.942.36 1.27 1.27 0 0 0-.409.923l-.15 5.706-5.705-.15a1.27 1.27 0 0 0-.943.36 1.27 1.27 0 0 0-.408.922l-.07 2.634c-.009.365.111.68.36.942.25.263.557.4.923.409l5.706.15-.15 5.705c-.01.366.11.68.36.943.25.262.557.399.923.408l2.633.07c.366.009.68-.111.943-.36a1.27 1.27 0 0 0 .408-.923l.15-5.706 5.705.15c.366.01.68-.11.943-.36a1.27 1.27 0 0 0 .408-.923Z" fill="#0056B3"/></svg>
diff --git a/src/assets/img/user-tours/swipe-navigation.svg b/src/assets/img/user-tours/swipe-navigation.svg
deleted file mode 100644
index ac0c1732c..000000000
--- a/src/assets/img/user-tours/swipe-navigation.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 202 98"><path fill-rule="evenodd" clip-rule="evenodd" d="M98.269 84.491c1.654.528 10.173 2.987 25.555 7.378l13.172-21.987 1.308-12.462-11.649-8.533-12.69-4.665 5.051-19.274-3.955-4.534-5.864 1.961-7.052 26.911-3.439-.148-5.382 2.166-4.591 11.492 7.54 15.381c-.324 3.682.342 5.787 1.996 6.314Z" fill="#fff"/><path d="M117.797 47.53c-1.169-.307-2.275-.156-3.317.452-1.043.608-1.717 1.494-2.022 2.66l-1.106 4.22-1.058-.277.803-3.067c.277-1.055 6.047-23.565 6.047-23.565.381-1.454-.597-3.654-2.779-4.226-2.182-.571-4.113.866-4.494 2.32-.381 1.455-1.345 5.078-1.61 6.09l-8.252 31.489-.8-1.267 1.487-5.672c.276-1.055.158-2.044-.354-2.965-.513-.922-1.298-1.52-2.356-1.798-1.015-.266-1.98-.132-2.898.403-.918.535-1.51 1.308-1.774 2.32l-1.935 7.387c-.27 1.033-.121 2.036.449 3.007l7.694 12.449c.636 1.083.772 2.316.409 3.702-.15.571-.07 1.12.239 1.648.31.528.751.867 1.324 1.017l21.166 5.546c.573.15 1.124.072 1.652-.236.528-.308.867-.748 1.017-1.32l.216-.824a9.733 9.733 0 0 1 .996-2.453l7.338-13.442c.428-.734.76-1.552.996-2.453l2.126-8.113c.276-1.055.158-2.043-.355-2.965-.512-.921-1.298-1.52-2.356-1.798-1.014-.266-1.98-.131-2.897.404-.918.534-1.509 1.308-1.774 2.319l-.277 1.055-1.058-.277 1.08-4.122a3.95 3.95 0 0 0-.201-2.608c-.364-.859-.952-1.489-1.766-1.89a5.8 5.8 0 0 0-.743-.266c-1.015-.265-1.981-.13-2.898.404-.918.535-1.509 1.308-1.774 2.32l-1.106 4.22-1.058-.277 1.054-4.023a4.577 4.577 0 0 0-.302-3.233 4.098 4.098 0 0 0-2.352-2.15c-.105-.05-.245-.1-.421-.145Zm1.105-4.222c1.852.486 3.351 1.466 4.496 2.94a8.08 8.08 0 0 1 4.361-.055 8.136 8.136 0 0 1 3.438 1.853 8.036 8.036 0 0 1 2.187 3.251 8.043 8.043 0 0 1 2.012.28c2.205.579 3.873 1.856 5.004 3.832 1.132 1.977 1.41 4.064.834 6.263l-2.126 8.112c-.293 1.121-.748 2.271-1.363 3.45l-7.371 13.433c-.271.493-.541 1.256-.812 2.29-.461 1.759-1.47 3.092-3.027 4-1.557.907-3.218 1.13-4.981.668l-21.165-5.547c-1.852-.485-3.205-1.527-4.059-3.125-.853-1.598-1.038-3.32-.554-5.168l-7.629-12.43c-1.255-2.045-1.589-4.188-1.001-6.43l1.935-7.388c.57-2.176 1.835-3.836 3.796-4.978 1.96-1.143 4.032-1.428 6.214-.856.243.063.951.26 1.056.311.679-2.054 5.921-22.284 6.778-25.557.929-3.545 6.497-4.029 8.679-3.457 2.182.572 6.916 3.269 5.868 7.269-.191.727-4.365 16.347-4.461 16.71 0 0-.357-.26 1.891.33Z" fill="#0056B3"/><path d="M101.728 32.565c-.812.436-1.832.135-2.178-.719a15.246 15.246 0 0 1-1.051-7.043 15.418 15.418 0 0 1 3.22-8.154 15.566 15.566 0 0 1 7.157-5.113 15.504 15.504 0 0 1 8.774-.415 15.306 15.306 0 0 1 7.547 4.42 15.209 15.209 0 0 1 3.872 7.819c.5 2.93.132 5.947-1.057 8.685a15.51 15.51 0 0 1-4.319 5.75c-.702.582-1.735.37-2.242-.39-.507-.76-.292-1.78.394-2.386a12.146 12.146 0 0 0 3.112-4.273 12.014 12.014 0 0 0 .829-6.81 11.927 11.927 0 0 0-3.036-6.13 12.005 12.005 0 0 0-5.917-3.465 12.158 12.158 0 0 0-6.88.324 12.207 12.207 0 0 0-5.612 4.01 12.092 12.092 0 0 0-2.525 6.393 11.95 11.95 0 0 0 .695 5.187c.319.864.028 1.873-.783 2.31Z" fill="#86CBFF"/><rect x="76.039" y="12.141" width="23.308" height="3.759" rx="1.88" fill="#86CBFF"/><rect x="70.619" y="21.163" width="21.805" height="3.759" rx="1.88" fill="#86CBFF"/><rect x="80.394" y="30.186" width="16.541" height="3.759" rx="1.88" fill="#86CBFF"/><path d="M141.5 20.788a1.88 1.88 0 1 0 0 3.759v-3.76Zm60.15 1.88-18.797-10.853V33.52l18.797-10.853Zm-60.15 1.879h43.233v-3.76H141.5v3.76ZM61.15 24.547a1.88 1.88 0 0 0 0-3.76v3.76ZM1 22.667 19.797 33.52V11.815L1 22.667Zm60.15-1.88H17.917v3.76H61.15v-3.76Z" fill="#0056B3"/></svg>
diff --git a/src/assets/img/user-tours/user-menu.svg b/src/assets/img/user-tours/user-menu.svg
deleted file mode 100644
index 33528d215..000000000
--- a/src/assets/img/user-tours/user-menu.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 269 173"><path d="M130.298 171.955a1.999 1.999 0 1 0 2.404-3.196l-2.404 3.196Zm137.887-153.65a2 2 0 0 0 .426-2.796l-10.665-14.5a2 2 0 1 0-3.222 2.37l9.48 12.89-12.889 9.48a2 2 0 1 0 2.37 3.222l14.5-10.665ZM124.847 36.115c14.837-13.515 33.816-20.396 57.372-22.633 23.592-2.242 51.644.187 84.48 5.19l.602-3.954c-32.918-5.016-61.365-7.507-85.46-5.218-24.131 2.292-44.025 9.391-59.688 23.657l2.694 2.958Zm34.44 79.302c-13.382 1.869-23.94-.552-31.827-5.493-7.898-4.946-13.278-12.519-16.124-21.225-5.717-17.49-1.113-39.265 13.511-52.584l-2.694-2.958c-15.876 14.46-20.786 37.916-14.619 56.785 3.096 9.473 9.008 17.864 17.803 23.372 8.804 5.515 20.34 8.043 34.504 6.064l-.554-3.961Zm-26.585 53.343c-25.76-19.374-35.531-44.979-33.124-66.267 2.404-21.255 16.912-38.345 40.27-41.227l-.49-3.97c-25.369 3.13-41.163 21.836-43.754 44.747-2.587 22.876 7.954 49.803 34.694 69.913l2.404-3.196Zm7.146-107.494c23.592-2.91 41.413 9.316 46.813 22.682 2.682 6.636 2.305 13.48-1.745 19.109-4.087 5.679-12.172 10.48-25.629 12.36l.554 3.961c14.089-1.968 23.372-7.107 28.321-13.985 4.986-6.928 5.312-15.26 2.208-22.943-6.171-15.272-25.876-28.255-51.012-25.154l.49 3.97Z" fill="#fff"/></svg>
diff --git a/src/core/components/swipe-navigation-tour/core-swipe-navigation-tour.html b/src/core/components/swipe-navigation-tour/core-swipe-navigation-tour.html
index e8b94a568..349247d15 100644
--- a/src/core/components/swipe-navigation-tour/core-swipe-navigation-tour.html
+++ b/src/core/components/swipe-navigation-tour/core-swipe-navigation-tour.html
@@ -1,5 +1,5 @@
-<img src="assets/img/user-tours/swipe-navigation.svg" alt="" />
+<ion-icon name="moodle-swipe-navigation" aria-hidden="true"></ion-icon>
 <p>{{ 'core.swipenavigationtourdescription' | translate }}</p>
-<ion-button (click)="dismiss()" expand="block">
+<ion-button (click)="dismiss()" expand="block" fill="outline">
     {{ 'core.endonesteptour' | translate }}
 </ion-button>
diff --git a/src/core/components/swipe-navigation-tour/swipe-navigation-tour.scss b/src/core/components/swipe-navigation-tour/swipe-navigation-tour.scss
index f71e25d12..66877c3df 100644
--- a/src/core/components/swipe-navigation-tour/swipe-navigation-tour.scss
+++ b/src/core/components/swipe-navigation-tour/swipe-navigation-tour.scss
@@ -1,12 +1,21 @@
 :host {
     max-width: 85vw;
 
-    img {
-        max-width: 300px;
+    ion-icon {
+        width: 100%;
+        height: 150px;
+        min-width: 300px;
     }
 
     p {
         text-align: center;
     }
 
+    ion-button {
+        --border-width: 2px;
+        --border-color: white;
+        --background: transparent;
+        --color: white;
+    }
+
 }
diff --git a/src/core/features/block/components/side-blocks-tour/side-blocks-tour.html b/src/core/features/block/components/side-blocks-tour/side-blocks-tour.html
index 47596569a..00793c3ff 100644
--- a/src/core/features/block/components/side-blocks-tour/side-blocks-tour.html
+++ b/src/core/features/block/components/side-blocks-tour/side-blocks-tour.html
@@ -1,5 +1,4 @@
 <h2>{{ 'core.block.tour_navigation_dashboard_title' | translate }}</h2>
-<img src="assets/img/user-tours/side-blocks.svg" alt="" />
 <p>{{ 'core.block.tour_navigation_dashboard_content' | translate }}</p>
 <ion-button (click)="dismiss()" expand="block">
     {{ 'core.endonesteptour' | translate }}
diff --git a/src/core/features/block/components/side-blocks-tour/side-blocks-tour.scss b/src/core/features/block/components/side-blocks-tour/side-blocks-tour.scss
index b94fabe85..e02e83905 100644
--- a/src/core/features/block/components/side-blocks-tour/side-blocks-tour.scss
+++ b/src/core/features/block/components/side-blocks-tour/side-blocks-tour.scss
@@ -4,7 +4,7 @@
         margin-top: 0;
     }
 
-    p {
+    h2, p {
         text-align: center;
     }
 
diff --git a/src/core/features/course/components/course-index-tour/course-index-tour.html b/src/core/features/course/components/course-index-tour/course-index-tour.html
index c519d3152..dbf65101b 100644
--- a/src/core/features/course/components/course-index-tour/course-index-tour.html
+++ b/src/core/features/course/components/course-index-tour/course-index-tour.html
@@ -1,5 +1,4 @@
 <h2>{{ 'core.course.tour_navigation_course_index_student_title' | translate }}</h2>
-<img src="assets/img/user-tours/course-index.svg" alt="" />
 <p>{{ 'core.course.tour_navigation_course_index_student_content' | translate }}</p>
 <ion-button (click)="dismiss()" expand="block">
     {{ 'core.endonesteptour' | translate }}
diff --git a/src/core/features/course/components/course-index-tour/course-index-tour.scss b/src/core/features/course/components/course-index-tour/course-index-tour.scss
index b94fabe85..e02e83905 100644
--- a/src/core/features/course/components/course-index-tour/course-index-tour.scss
+++ b/src/core/features/course/components/course-index-tour/course-index-tour.scss
@@ -4,7 +4,7 @@
         margin-top: 0;
     }
 
-    p {
+    h2, p {
         text-align: center;
     }
 
diff --git a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts
index ebde9fb45..8c8efb728 100644
--- a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts
+++ b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts
@@ -14,8 +14,9 @@
 
 import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
 import { CoreSiteInfo } from '@classes/site';
-import { CoreUserTours, CoreUserToursStyle } from '@features/usertours/services/user-tours';
+import { CoreUserTours, CoreUserToursAlignment, CoreUserToursSide } from '@features/usertours/services/user-tours';
 import { IonRouterOutlet } from '@ionic/angular';
+import { CoreScreen } from '@services/screen';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreMainMenuUserMenuTourComponent } from '../user-menu-tour/user-menu-tour';
@@ -77,7 +78,8 @@ export class CoreMainMenuUserButtonComponent implements OnInit {
             id: 'user-menu',
             component: CoreMainMenuUserMenuTourComponent,
             focus: this.avatar.nativeElement,
-            style: CoreUserToursStyle.Overlay,
+            alignment: CoreUserToursAlignment.Start,
+            side: CoreScreen.isMobile ? CoreUserToursSide.Start : CoreUserToursSide.End,
         });
     }
 
diff --git a/src/core/features/mainmenu/components/user-menu-tour/user-menu-tour.html b/src/core/features/mainmenu/components/user-menu-tour/user-menu-tour.html
index 697f56fcb..efef95b50 100644
--- a/src/core/features/mainmenu/components/user-menu-tour/user-menu-tour.html
+++ b/src/core/features/mainmenu/components/user-menu-tour/user-menu-tour.html
@@ -1,4 +1,3 @@
-<img src="assets/img/user-tours/user-menu.svg" alt="" />
 <h2>{{ 'core.mainmenu.usermenutourtitle' | translate }}</h2>
 <p>{{ 'core.mainmenu.usermenutourdescription' | translate }}</p>
 <ion-button (click)="dismiss()" expand="block">
diff --git a/src/core/features/mainmenu/components/user-menu-tour/user-menu-tour.scss b/src/core/features/mainmenu/components/user-menu-tour/user-menu-tour.scss
index faecdd58f..e02e83905 100644
--- a/src/core/features/mainmenu/components/user-menu-tour/user-menu-tour.scss
+++ b/src/core/features/mainmenu/components/user-menu-tour/user-menu-tour.scss
@@ -1,26 +1,15 @@
 :host {
-    width: 100%;
-    height: 100%;
-    display: flex;
-    max-width: 85vw;
-    align-items: center;
-    flex-direction: column;
 
-    img {
-        width: calc(100vw - var(--core-avatar-size) * 2 - 16px);
-        margin-top: 12px;
+    h2 {
+        margin-top: 0;
     }
 
-    p {
+    h2, p {
         text-align: center;
     }
 
     ion-button {
-        width: 100%;
+        margin: 0;
     }
 
 }
-
-:host-context([dir=rtl]) img {
-    transform: scaleX(-1);
-}
diff --git a/src/core/features/usertours/components/user-tour/user-tour.ts b/src/core/features/usertours/components/user-tour/user-tour.ts
index 5ac56633f..f0853164c 100644
--- a/src/core/features/usertours/components/user-tour/user-tour.ts
+++ b/src/core/features/usertours/components/user-tour/user-tour.ts
@@ -16,12 +16,7 @@ import { AfterViewInit, Component, ElementRef, HostBinding, Input, ViewChild } f
 import { CorePromisedValue } from '@classes/promised-value';
 import { CoreUserToursFocusLayout } from '@features/usertours/classes/focus-layout';
 import { CoreUserToursPopoverLayout } from '@features/usertours/classes/popover-layout';
-import {
-    CoreUserTours,
-    CoreUserToursAlignment,
-    CoreUserToursSide,
-    CoreUserToursStyle,
-} from '@features/usertours/services/user-tours';
+import { CoreUserTours, CoreUserToursAlignment, CoreUserToursSide } from '@features/usertours/services/user-tours';
 import { CoreDomUtils } from '@services/utils/dom';
 import { AngularFrameworkDelegate } from '@singletons';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
@@ -45,7 +40,6 @@ export class CoreUserToursUserTourComponent implements AfterViewInit {
     @Input() component!: unknown;
     @Input() componentProps?: Record<string, unknown>;
     @Input() focus?: HTMLElement;
-    @Input() style?: CoreUserToursStyle; // When this is undefined in a tour with a focused element, popover style will be used.
     @Input() side?: CoreUserToursSide;
     @Input() alignment?: CoreUserToursAlignment;
     @HostBinding('class.is-active') active = false;
@@ -121,18 +115,16 @@ export class CoreUserToursUserTourComponent implements AfterViewInit {
         this.focusStyles = focusLayout.inlineStyles;
 
         // Calculate popup styles.
-        if ((this.style ?? CoreUserToursStyle.Popover) === CoreUserToursStyle.Popover) {
-            if (!this.side || !this.alignment) {
-                throw new Error('Cannot create a popover user tour without side and alignment');
-            }
-
-            const popoverLayout = new CoreUserToursPopoverLayout(this.focus, this.side, this.alignment);
-
-            this.popover = true;
-            this.popoverWrapperStyles = popoverLayout.wrapperInlineStyles;
-            this.popoverWrapperArrowStyles = popoverLayout.wrapperArrowInlineStyles;
-            this.wrapperTransform = `${popoverLayout.wrapperStyles.transform ?? ''}`;
+        if (!this.side || !this.alignment) {
+            throw new Error('Cannot create a focused user tour without side and alignment');
         }
+
+        const popoverLayout = new CoreUserToursPopoverLayout(this.focus, this.side, this.alignment);
+
+        this.popover = true;
+        this.popoverWrapperStyles = popoverLayout.wrapperInlineStyles;
+        this.popoverWrapperArrowStyles = popoverLayout.wrapperArrowInlineStyles;
+        this.wrapperTransform = `${popoverLayout.wrapperStyles.transform ?? ''}`;
     }
 
     /**
diff --git a/src/core/features/usertours/services/user-tours.ts b/src/core/features/usertours/services/user-tours.ts
index ff42e12f1..9fedfff74 100644
--- a/src/core/features/usertours/services/user-tours.ts
+++ b/src/core/features/usertours/services/user-tours.ts
@@ -85,9 +85,8 @@ export class CoreUserToursService {
      * @param options User Tour options.
      */
     async showIfPending(options: CoreUserToursBasicOptions): Promise<void>;
-    async showIfPending(options: CoreUserToursPopoverFocusedOptions): Promise<void>;
-    async showIfPending(options: CoreUserToursOverlayFocusedOptions): Promise<void>;
-    async showIfPending(options: CoreUserToursOptions): Promise<void> {
+    async showIfPending(options: CoreUserToursFocusedOptions): Promise<void>;
+    async showIfPending(options: CoreUserToursBasicOptions | CoreUserToursFocusedOptions): Promise<void> {
         const isPending = await CoreUserTours.isPending(options.id);
 
         if (!isPending) {
@@ -103,9 +102,8 @@ export class CoreUserToursService {
      * @param options User Tour options.
      */
     protected async show(options: CoreUserToursBasicOptions): Promise<void>;
-    protected async show(options: CoreUserToursPopoverFocusedOptions): Promise<void>;
-    protected async show(options: CoreUserToursOverlayFocusedOptions): Promise<void>;
-    protected async show(options: CoreUserToursOptions): Promise<void> {
+    protected async show(options: CoreUserToursFocusedOptions): Promise<void>;
+    protected async show(options: CoreUserToursBasicOptions | CoreUserToursFocusedOptions): Promise<void> {
         const { delay, ...componentOptions } = options;
 
         await CoreUtils.wait(delay ?? 200);
@@ -149,14 +147,6 @@ export class CoreUserToursService {
 
 export const CoreUserTours = makeSingleton(CoreUserToursService);
 
-/**
- * User Tour style.
- */
-export const enum CoreUserToursStyle {
-    Overlay = 'overlay',
-    Popover = 'popover',
-}
-
 /**
  * User Tour side.
  */
@@ -217,18 +207,6 @@ export interface CoreUserToursFocusedOptions extends CoreUserToursBasicOptions {
      */
     focus: HTMLElement;
 
-}
-
-/**
- * Options to create a focused User Tour using the Popover style.
- */
-export interface CoreUserToursPopoverFocusedOptions extends CoreUserToursFocusedOptions {
-
-    /**
-     * User Tour style.
-     */
-    style?: CoreUserToursStyle.Popover;
-
     /**
      * Position relative to the focused element.
      */
@@ -240,23 +218,3 @@ export interface CoreUserToursPopoverFocusedOptions extends CoreUserToursFocused
     alignment: CoreUserToursAlignment;
 
 }
-
-/**
- * Options to create a focused User Tour using the Overlay style.
- */
-export interface CoreUserToursOverlayFocusedOptions extends CoreUserToursFocusedOptions {
-
-    /**
-     * User Tour style.
-     */
-    style: CoreUserToursStyle.Overlay;
-
-}
-
-/**
- * Options to create a User Tour.
- */
-export type CoreUserToursOptions =
-    CoreUserToursBasicOptions |
-    CoreUserToursPopoverFocusedOptions |
-    CoreUserToursOverlayFocusedOptions;

From fb3a01a55c8d1c5c56c008c98ae0549691fea212 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 17 Mar 2022 09:27:58 +0100
Subject: [PATCH 0749/1008] MOBILE-3814 style: Remove webkit gradients
 supported by browsers

---
 .../storagemanager/pages/course-storage/course-storage.scss   | 1 -
 src/core/features/course/pages/index/index.html               | 4 +++-
 src/theme/components/collapsible-item.scss                    | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.scss b/src/addons/storagemanager/pages/course-storage/course-storage.scss
index bf803e5ab..9f3ad5c36 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.scss
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.scss
@@ -26,7 +26,6 @@
             min-height: var(--course-storage-max-activity-height);
             position: absolute;
             @include position(0, 0, null, 0);
-            background: -webkit-linear-gradient(top, rgba(var(--background-gradient-rgb), 0) calc(100% - 30px), rgba(var(--background-gradient-rgb), 1) calc(100% - 20px));
             background: linear-gradient(to bottom, rgba(var(--background-gradient-rgb), 0) calc(100% - 30px), rgba(var(--background-gradient-rgb), 1) calc(100% - 20px));
             z-index: 6;
             pointer-events: none;
diff --git a/src/core/features/course/pages/index/index.html b/src/core/features/course/pages/index/index.html
index 7c445a8af..dec61a652 100644
--- a/src/core/features/course/pages/index/index.html
+++ b/src/core/features/course/pages/index/index.html
@@ -29,7 +29,9 @@
         </ng-container>
 
         <ion-label>
-            <h1>{{ title }}</h1>
+            <h1>
+                <core-format-text [text]="title" contextLevel="course" [contextInstanceId]="course?.id"></core-format-text>
+            </h1>
             <div class="core-course-progress" *ngIf="progress !== undefined">
                 <core-progress-bar [progress]="progress" a11yText="core.course.aria:sectionprogress">
                 </core-progress-bar>
diff --git a/src/theme/components/collapsible-item.scss b/src/theme/components/collapsible-item.scss
index 33d010fda..7297a8f0c 100644
--- a/src/theme/components/collapsible-item.scss
+++ b/src/theme/components/collapsible-item.scss
@@ -75,7 +75,6 @@
                     height: 60px;
                     position: absolute;
                     @include position(null, 0, 0, 0);
-                    background: -webkit-linear-gradient(top, rgba(var(--background-gradient-rgb), 0) calc(100% - var(--gradient-size)), rgba(var(--background-gradient-rgb), 1) calc(100% - 4px));
                     background: linear-gradient(to bottom, rgba(var(--background-gradient-rgb), 0) calc(100% - var(--gradient-size)), rgba(var(--background-gradient-rgb), 1) calc(100% - 4px));
                     z-index: 6;
                 }

From 2e473ee55d3a38a09e931ef785667094bf4414bc Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 17 Mar 2022 11:46:45 +0100
Subject: [PATCH 0750/1008] MOBILE-3153 usertours: Dismiss on removed elements

---
 .../components/user-tour/user-tour.ts         | 21 +++++++++---
 .../features/usertours/services/user-tours.ts | 33 +++++++++++--------
 2 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/src/core/features/usertours/components/user-tour/user-tour.ts b/src/core/features/usertours/components/user-tour/user-tour.ts
index f0853164c..0f0e3d2a1 100644
--- a/src/core/features/usertours/components/user-tour/user-tour.ts
+++ b/src/core/features/usertours/components/user-tour/user-tour.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { AfterViewInit, Component, ElementRef, HostBinding, Input, ViewChild } from '@angular/core';
+import { AfterViewInit, Component, ElementRef, EventEmitter, HostBinding, Input, Output, ViewChild } from '@angular/core';
 import { CorePromisedValue } from '@classes/promised-value';
 import { CoreUserToursFocusLayout } from '@features/usertours/classes/focus-layout';
 import { CoreUserToursPopoverLayout } from '@features/usertours/classes/popover-layout';
@@ -42,6 +42,8 @@ export class CoreUserToursUserTourComponent implements AfterViewInit {
     @Input() focus?: HTMLElement;
     @Input() side?: CoreUserToursSide;
     @Input() alignment?: CoreUserToursAlignment;
+    @Output() beforeDismiss = new EventEmitter<void>();
+    @Output() afterDismiss = new EventEmitter<void>();
     @HostBinding('class.is-active') active = false;
     @HostBinding('class.is-popover') popover = false;
     @ViewChild('wrapper') wrapper?: ElementRef<HTMLElement>;
@@ -80,6 +82,13 @@ export class CoreUserToursUserTourComponent implements AfterViewInit {
 
         await CoreDomUtils.waitForImages(tour);
 
+        // Calculate focus styles or dismiss if the element is gone.
+        if (this.focus && !CoreDomUtils.isElementVisible(this.focus)) {
+            await this.dismiss(false);
+
+            return;
+        }
+
         this.calculateStyles();
 
         // Show tour.
@@ -94,11 +103,15 @@ export class CoreUserToursUserTourComponent implements AfterViewInit {
      * @param acknowledge Whether to confirm that the user has seen the User Tour.
      */
     async dismiss(acknowledge: boolean = true): Promise<void> {
+        this.beforeDismiss.emit();
+
         await this.playLeaveAnimation();
+        await Promise.all<unknown>([
+            AngularFrameworkDelegate.removeViewFromDom(this.container, this.element),
+            acknowledge && CoreUserTours.acknowledge(this.id),
+        ]);
 
-        AngularFrameworkDelegate.removeViewFromDom(this.container, this.element);
-
-        acknowledge && CoreUserTours.acknowledge(this.id);
+        this.afterDismiss.emit();
     }
 
     /**
diff --git a/src/core/features/usertours/services/user-tours.ts b/src/core/features/usertours/services/user-tours.ts
index 9fedfff74..749287f1b 100644
--- a/src/core/features/usertours/services/user-tours.ts
+++ b/src/core/features/usertours/services/user-tours.ts
@@ -21,6 +21,7 @@ import { CoreApp } from '@services/app';
 import { CoreUtils } from '@services/utils/utils';
 import { AngularFrameworkDelegate, makeSingleton } from '@singletons';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
+import { CoreSubscriptions } from '@singletons/subscriptions';
 import { CoreUserToursUserTourComponent } from '../components/user-tour/user-tour';
 import { APP_SCHEMA, CoreUserToursDBEntry, USER_TOURS_TABLE_NAME } from './database/user-tours';
 
@@ -106,8 +107,10 @@ export class CoreUserToursService {
     protected async show(options: CoreUserToursBasicOptions | CoreUserToursFocusedOptions): Promise<void> {
         const { delay, ...componentOptions } = options;
 
+        // Delay start.
         await CoreUtils.wait(delay ?? 200);
 
+        // Create tour.
         const container = document.querySelector('ion-app') ?? document.body;
         const element = await AngularFrameworkDelegate.attachViewToDom(
             container,
@@ -117,6 +120,22 @@ export class CoreUserToursService {
         const tour = CoreComponentsRegistry.require(element, CoreUserToursUserTourComponent);
 
         this.tours.push(tour);
+
+        // Handle present/dismiss lifecycle.
+        CoreSubscriptions.once(tour.beforeDismiss, () => {
+            const index = this.tours.indexOf(tour);
+
+            if (index === -1) {
+                return;
+            }
+
+            this.tours.splice(index, 1);
+
+            const nextTour = this.tours[0] as CoreUserToursUserTourComponent | undefined;
+
+            nextTour?.present().then(() => this.tourReadyCallbacks.get(nextTour)?.());
+        });
+
         this.tours.length > 1
             ? await new Promise<void>(resolve => this.tourReadyCallbacks.set(tour, resolve))
             : await tour.present();
@@ -128,19 +147,7 @@ export class CoreUserToursService {
      * @param acknowledge Whether to acknowledge that the user has seen this User Tour or not.
      */
     async dismiss(acknowledge: boolean = true): Promise<void> {
-        if (this.tours.length === 0) {
-            return;
-        }
-
-        const activeTour = this.tours.shift() as CoreUserToursUserTourComponent;
-        const nextTour = this.tours[0] as CoreUserToursUserTourComponent | undefined;
-
-        await Promise.all([
-            activeTour.dismiss(acknowledge),
-            nextTour?.present(),
-        ]);
-
-        nextTour && this.tourReadyCallbacks.get(nextTour)?.();
+        await this.tours[0]?.dismiss(acknowledge);
     }
 
 }

From 68708d116b1c2bf855a202d360c89d36bcae3553 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 16 Mar 2022 15:24:43 +0100
Subject: [PATCH 0751/1008] MOBILE-3833 pipes: Restore coreToLocaleString pipe

---
 src/core/pipes/pipes.module.ts     |  3 ++
 src/core/pipes/to-locale-string.ts | 67 ++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 src/core/pipes/to-locale-string.ts

diff --git a/src/core/pipes/pipes.module.ts b/src/core/pipes/pipes.module.ts
index b8b197300..a45223af7 100644
--- a/src/core/pipes/pipes.module.ts
+++ b/src/core/pipes/pipes.module.ts
@@ -22,6 +22,7 @@ import { CoreFormatDatePipe } from './format-date';
 import { CoreNoTagsPipe } from './no-tags';
 import { CoreSecondsToHMSPipe } from './seconds-to-hms';
 import { CoreTimeAgoPipe } from './time-ago';
+import { CoreToLocaleStringPipe } from './to-locale-string';
 
 @NgModule({
     declarations: [
@@ -33,6 +34,7 @@ import { CoreTimeAgoPipe } from './time-ago';
         CoreNoTagsPipe,
         CoreSecondsToHMSPipe,
         CoreTimeAgoPipe,
+        CoreToLocaleStringPipe,
     ],
     exports: [
         CoreBytesToSizePipe,
@@ -43,6 +45,7 @@ import { CoreTimeAgoPipe } from './time-ago';
         CoreNoTagsPipe,
         CoreSecondsToHMSPipe,
         CoreTimeAgoPipe,
+        CoreToLocaleStringPipe,
     ],
 })
 export class CorePipesModule {}
diff --git a/src/core/pipes/to-locale-string.ts b/src/core/pipes/to-locale-string.ts
new file mode 100644
index 000000000..5783fea6c
--- /dev/null
+++ b/src/core/pipes/to-locale-string.ts
@@ -0,0 +1,67 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { Pipe, PipeTransform } from '@angular/core';
+import { CoreTimeUtils } from '@services/utils/time';
+
+import { CoreLogger } from '@singletons/logger';
+
+/**
+ * Filter to format a timestamp to a locale string. Timestamp can be in seconds or milliseconds.
+ *
+ * @deprecated since 3.6. Use coreFormatDate instead.
+ * This pipe wasn't removed in app 4.0 because some site plugins still used it. It will be removed in future versions.
+ */
+@Pipe({
+    name: 'coreToLocaleString',
+})
+export class CoreToLocaleStringPipe implements PipeTransform {
+
+    protected logger: CoreLogger;
+
+    constructor() {
+        this.logger = CoreLogger.getInstance('CoreToLocaleStringPipe');
+    }
+
+    /**
+     * Format a timestamp to a locale string.
+     *
+     * @param timestamp The timestamp (can be in seconds or milliseconds).
+     * @return Formatted time.
+     */
+    transform(timestamp: number | string): string {
+        if (typeof timestamp == 'string') {
+            // Convert the value to a number.
+            const numberTimestamp = parseInt(timestamp, 10);
+            if (isNaN(numberTimestamp)) {
+                this.logger.error('Invalid value received', timestamp);
+
+                return timestamp;
+            }
+            timestamp = numberTimestamp;
+        }
+
+        if (timestamp < 0) {
+            // Date not valid.
+            return '';
+        }
+        if (timestamp < 100000000000) {
+            // Timestamp is in seconds, convert it to milliseconds.
+            timestamp = timestamp * 1000;
+        }
+
+        return CoreTimeUtils.userDate(timestamp, 'core.strftimedatetimeshort');
+    }
+
+}

From b1dad1ef64a200c3e9fd0ebb55065d6530a0cd00 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 17 Mar 2022 12:23:50 +0100
Subject: [PATCH 0752/1008] MOBILE-3153 usertours: Silence back button

---
 .../usertours/components/user-tour/user-tour.ts    | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/core/features/usertours/components/user-tour/user-tour.ts b/src/core/features/usertours/components/user-tour/user-tour.ts
index 0f0e3d2a1..65f6e63dd 100644
--- a/src/core/features/usertours/components/user-tour/user-tour.ts
+++ b/src/core/features/usertours/components/user-tour/user-tour.ts
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { BackButtonEvent } from '@ionic/core';
 import { AfterViewInit, Component, ElementRef, EventEmitter, HostBinding, Input, Output, ViewChild } from '@angular/core';
 import { CorePromisedValue } from '@classes/promised-value';
 import { CoreUserToursFocusLayout } from '@features/usertours/classes/focus-layout';
@@ -22,6 +23,7 @@ import { AngularFrameworkDelegate } from '@singletons';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
 
 const ANIMATION_DURATION = 200;
+const USER_TOURS_BACK_BUTTON_PRIORITY = 100;
 
 /**
  * User Tour wrapper component.
@@ -54,6 +56,7 @@ export class CoreUserToursUserTourComponent implements AfterViewInit {
     private element: HTMLElement;
     private wrapperTransform = '';
     private wrapperElement = new CorePromisedValue<HTMLElement>();
+    private backButtonListener?: (event: BackButtonEvent) => void;
 
     constructor({ nativeElement: element }: ElementRef<HTMLElement>) {
         this.element = element;
@@ -94,6 +97,16 @@ export class CoreUserToursUserTourComponent implements AfterViewInit {
         // Show tour.
         this.active = true;
 
+        document.addEventListener(
+            'ionBackButton',
+            this.backButtonListener = ({ detail }) => detail.register(
+                USER_TOURS_BACK_BUTTON_PRIORITY,
+                () => {
+                    // Silence back button.
+                },
+            ),
+        );
+
         await this.playEnterAnimation();
     }
 
@@ -111,6 +124,7 @@ export class CoreUserToursUserTourComponent implements AfterViewInit {
             acknowledge && CoreUserTours.acknowledge(this.id),
         ]);
 
+        this.backButtonListener && document.removeEventListener('ionBackButton', this.backButtonListener);
         this.afterDismiss.emit();
     }
 

From 02c2a5e508d915deae6813d58fe26eba92dae328 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 17 Mar 2022 15:40:14 +0100
Subject: [PATCH 0753/1008] MOBILE-3833 feedback: Fix attempts pagination

---
 .../mod/feedback/classes/feedback-attempts-source.ts   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/addons/mod/feedback/classes/feedback-attempts-source.ts b/src/addons/mod/feedback/classes/feedback-attempts-source.ts
index 4ef92a857..62410098d 100644
--- a/src/addons/mod/feedback/classes/feedback-attempts-source.ts
+++ b/src/addons/mod/feedback/classes/feedback-attempts-source.ts
@@ -135,8 +135,14 @@ export class AddonModFeedbackAttemptsSource extends CoreRoutedItemsManagerSource
 
         const totalItemsLoaded = this.getPageLength() * (page + 1);
         const pageAttempts: AddonModFeedbackAttemptItem[] = [
-            ...result.attempts,
-            ...result.anonattempts,
+            // The page argument is ignored in the webservice when there is only one page,
+            // so we should ignore the responses of pages beyond the first if that's the case.
+            ...(page === 0 || result.totalattempts > AddonModFeedbackProvider.PER_PAGE)
+                ? result.attempts
+                : [],
+            ...(page === 0 || result.totalanonattempts > AddonModFeedbackProvider.PER_PAGE)
+                ? result.anonattempts
+                : [],
         ];
 
         return {

From 67fd2a23b16f8063f4235c4fc6e47bf5554cee39 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 17 Mar 2022 16:13:43 +0100
Subject: [PATCH 0754/1008] MOBILE-3833 messages: Fix route conflicts

---
 src/addons/messages/messages-lazy.module.ts                     | 2 +-
 .../pages/group-conversations/group-conversations.page.ts       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/addons/messages/messages-lazy.module.ts b/src/addons/messages/messages-lazy.module.ts
index 061f8f1e1..47a4d5d15 100644
--- a/src/addons/messages/messages-lazy.module.ts
+++ b/src/addons/messages/messages-lazy.module.ts
@@ -52,7 +52,7 @@ function buildRoutes(injector: Injector): Routes {
                 .then(m => m.AddonMessagesContactsPageModule),
         },
         {
-            path: 'preferences',
+            path: 'message-settings',
             loadChildren: () => import('./pages/settings/settings.module').then(m => m.AddonMessagesSettingsPageModule),
         },
         ...buildTabMainRoutes(injector, {
diff --git a/src/addons/messages/pages/group-conversations/group-conversations.page.ts b/src/addons/messages/pages/group-conversations/group-conversations.page.ts
index f2d572663..73ff7d7e1 100644
--- a/src/addons/messages/pages/group-conversations/group-conversations.page.ts
+++ b/src/addons/messages/pages/group-conversations/group-conversations.page.ts
@@ -538,7 +538,7 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
      * Navigate to message settings.
      */
     gotoSettings(): void {
-        CoreNavigator.navigateToSitePath('../preferences');
+        CoreNavigator.navigateToSitePath('../message-settings');
     }
 
     /**

From a11ca3726b7365b0f37ed56a1c63a9f5875529a5 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 17 Mar 2022 16:14:01 +0100
Subject: [PATCH 0755/1008] MOBILE-3833 calendar: Fix route conflicts

---
 src/addons/calendar/calendar-lazy.module.ts   | 2 +-
 src/addons/calendar/pages/index/index.page.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/addons/calendar/calendar-lazy.module.ts b/src/addons/calendar/calendar-lazy.module.ts
index d675bf134..c01e053cc 100644
--- a/src/addons/calendar/calendar-lazy.module.ts
+++ b/src/addons/calendar/calendar-lazy.module.ts
@@ -28,7 +28,7 @@ function buildRoutes(injector: Injector): Routes {
             loadChildren: () => import('@addons/calendar/pages/index/index.module').then(m => m.AddonCalendarIndexPageModule),
         },
         {
-            path: 'settings',
+            path: 'calendar-settings',
             loadChildren: () =>
                 import('@addons/calendar/pages/settings/settings.module').then(m => m.AddonCalendarSettingsPageModule),
         },
diff --git a/src/addons/calendar/pages/index/index.page.ts b/src/addons/calendar/pages/index/index.page.ts
index c0ac2fb1c..9b9fd080b 100644
--- a/src/addons/calendar/pages/index/index.page.ts
+++ b/src/addons/calendar/pages/index/index.page.ts
@@ -360,7 +360,7 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy {
      * Open calendar events settings.
      */
     openSettings(): void {
-        CoreNavigator.navigateToSitePath('/calendar/settings');
+        CoreNavigator.navigateToSitePath('/calendar/calendar-settings');
     }
 
     /**

From e2b70f604795e94db3d80e52133c03783502323c Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 17 Mar 2022 16:22:52 +0100
Subject: [PATCH 0756/1008] MOBILE-3153 core: Fix swipe tour in tablets

---
 src/core/directives/swipe-navigation.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/directives/swipe-navigation.ts b/src/core/directives/swipe-navigation.ts
index 081a7a85f..ee2f6c6a1 100644
--- a/src/core/directives/swipe-navigation.ts
+++ b/src/core/directives/swipe-navigation.ts
@@ -86,7 +86,7 @@ export class CoreSwipeNavigationDirective implements AfterViewInit, OnDestroy {
 
         const items = source.getItems() ?? [];
 
-        if (items.length < 2) {
+        if (!this.enabled || items.length < 2) {
             return;
         }
 

From 8ccd5aae81ee02b67fb3c8c4a1f8030ed01f68cd Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 17 Mar 2022 17:06:49 +0100
Subject: [PATCH 0757/1008] MOBILE-3833 grades: Support additional link

---
 src/core/features/grades/grades.module.ts     |  2 +
 .../grades/services/handlers/report-link.ts   | 82 +++++++++++++++++++
 .../grades/services/handlers/user-link.ts     |  4 +-
 3 files changed, 86 insertions(+), 2 deletions(-)
 create mode 100644 src/core/features/grades/services/handlers/report-link.ts

diff --git a/src/core/features/grades/grades.module.ts b/src/core/features/grades/grades.module.ts
index 8935c6ee8..9b6ae6251 100644
--- a/src/core/features/grades/grades.module.ts
+++ b/src/core/features/grades/grades.module.ts
@@ -26,6 +26,7 @@ import { CoreGradesHelperProvider, GRADES_PAGE_NAME } from './services/grades-he
 import { CoreGradesCourseOptionHandler } from './services/handlers/course-option';
 import { CoreGradesOverviewLinkHandler } from './services/handlers/overview-link';
 import { CoreGradesUserHandler } from './services/handlers/user';
+import { CoreGradesReportLinkHandler } from './services/handlers/report-link';
 import { CoreGradesUserLinkHandler } from './services/handlers/user-link';
 
 export const CORE_GRADES_SERVICES: Type<unknown>[] = [
@@ -62,6 +63,7 @@ const courseIndexRoutes: Routes = [
             multi: true,
             useValue: () => {
                 CoreUserDelegate.registerHandler(CoreGradesUserHandler.instance);
+                CoreContentLinksDelegate.registerHandler(CoreGradesReportLinkHandler.instance);
                 CoreContentLinksDelegate.registerHandler(CoreGradesUserLinkHandler.instance);
                 CoreContentLinksDelegate.registerHandler(CoreGradesOverviewLinkHandler.instance);
                 CoreCourseOptionsDelegate.registerHandler(CoreGradesCourseOptionHandler.instance);
diff --git a/src/core/features/grades/services/handlers/report-link.ts b/src/core/features/grades/services/handlers/report-link.ts
new file mode 100644
index 000000000..1efed0df7
--- /dev/null
+++ b/src/core/features/grades/services/handlers/report-link.ts
@@ -0,0 +1,82 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { Injectable } from '@angular/core';
+
+import { CoreContentLinksAction } from '@features/contentlinks/services/contentlinks-delegate';
+import { CoreContentLinksHandlerBase } from '@features/contentlinks/classes/base-handler';
+import { CoreGrades } from '@features/grades/services/grades';
+import { CoreGradesHelper } from '@features/grades/services/grades-helper';
+import { makeSingleton } from '@singletons';
+
+/**
+ * Handler to treat links to user grades.
+ */
+@Injectable({ providedIn: 'root' })
+export class CoreGradesReportLinkHandlerService extends CoreContentLinksHandlerBase {
+
+    name = 'CoreGradesReportLinkHandler';
+    pattern = /\/grade\/report(\/user)?\/index.php/;
+
+    /**
+     * Get the list of actions for a link (url).
+     *
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @param data Extra data to handle the URL.
+     * @return List of (or promise resolved with list of) actions.
+     */
+    getActions(
+        siteIds: string[],
+        url: string,
+        params: Record<string, string>,
+        courseId?: number,
+        data?: { cmid?: string },
+    ): CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
+        courseId = courseId || Number(params.id);
+        data = data || {};
+
+        return [{
+            action: (siteId): void => {
+                const userId = params.userid ? parseInt(params.userid, 10) : undefined;
+                const moduleId = data?.cmid && parseInt(data.cmid, 10) || undefined;
+
+                CoreGradesHelper.goToGrades(courseId!, userId, moduleId, siteId);
+            },
+        }];
+    }
+
+    /**
+     * Check if the handler is enabled for a certain site (site + user) and a URL.
+     * If not defined, defaults to true.
+     *
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
+     */
+    async isEnabled(siteId: string, url: string, params: Record<string, string>, courseId?: number): Promise<boolean> {
+        if (!courseId && !params.id) {
+            return false;
+        }
+
+        return CoreGrades.isPluginEnabledForCourse(courseId || Number(params.id), siteId);
+    }
+
+}
+
+export const CoreGradesReportLinkHandler = makeSingleton(CoreGradesReportLinkHandlerService);
diff --git a/src/core/features/grades/services/handlers/user-link.ts b/src/core/features/grades/services/handlers/user-link.ts
index 432ff1937..1f1ba4008 100644
--- a/src/core/features/grades/services/handlers/user-link.ts
+++ b/src/core/features/grades/services/handlers/user-link.ts
@@ -27,7 +27,7 @@ import { makeSingleton } from '@singletons';
 export class CoreGradesUserLinkHandlerService extends CoreContentLinksHandlerBase {
 
     name = 'CoreGradesUserLinkHandler';
-    pattern = /\/grade\/report(\/user)?\/index.php/;
+    pattern = /\/course\/user\.php.*[?&]mode=grade/;
 
     /**
      * Get the list of actions for a link (url).
@@ -51,7 +51,7 @@ export class CoreGradesUserLinkHandlerService extends CoreContentLinksHandlerBas
 
         return [{
             action: (siteId): void => {
-                const userId = params.userid ? parseInt(params.userid, 10) : undefined;
+                const userId = params.user ? parseInt(params.user, 10) : undefined;
                 const moduleId = data?.cmid && parseInt(data.cmid, 10) || undefined;
 
                 CoreGradesHelper.goToGrades(courseId!, userId, moduleId, siteId);

From e03ef0d26e6824cfacf2b454f74fc100a37d904e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 17 Mar 2022 09:51:17 +0100
Subject: [PATCH 0758/1008] MOBILE-3814 format-text: Use a general loader
 solution on format-text

---
 src/core/directives/format-text.ts            | 47 ++++++------
 src/core/directives/tests/format-text.test.ts |  2 +-
 src/theme/components/format-text.scss         | 73 ++++---------------
 src/theme/theme.base.scss                     | 45 ++++++++++--
 src/theme/theme.dark.scss                     |  2 +
 src/theme/theme.light.scss                    |  5 ++
 6 files changed, 84 insertions(+), 90 deletions(-)

diff --git a/src/core/directives/format-text.ts b/src/core/directives/format-text.ts
index afd53beae..4582f38ce 100644
--- a/src/core/directives/format-text.ts
+++ b/src/core/directives/format-text.ts
@@ -90,8 +90,8 @@ export class CoreFormatTextDirective implements OnChanges, OnDestroy, AsyncCompo
 
     protected element: HTMLElement;
     protected emptyText = '';
-    protected contentSpan: HTMLElement;
-    protected domPromise?: CoreCancellablePromise<void>;
+    protected domPromises: CoreCancellablePromise<void>[] = [];
+    protected domElementPromise?: CoreCancellablePromise<void>;
 
     constructor(
         element: ElementRef,
@@ -101,18 +101,10 @@ export class CoreFormatTextDirective implements OnChanges, OnDestroy, AsyncCompo
         CoreComponentsRegistry.register(element.nativeElement, this);
 
         this.element = element.nativeElement;
-        this.element.classList.add('core-format-text-loading'); // Hide contents until they're treated.
-
-        const placeholder = document.createElement('span');
-        placeholder.classList.add('core-format-text-loader');
-        this.element.appendChild(placeholder);
-
-        this.contentSpan = document.createElement('span');
-        this.contentSpan.classList.add('core-format-text-content');
-        this.element.appendChild(this.contentSpan);
+        this.element.classList.add('core-loading'); // Hide contents until they're treated.
 
         this.emptyText = this.hideIfEmpty ? '' : '&nbsp;';
-        this.contentSpan.innerHTML = this.emptyText;
+        this.element.innerHTML = this.emptyText;
 
         this.afterRender = new EventEmitter<void>();
 
@@ -134,14 +126,15 @@ export class CoreFormatTextDirective implements OnChanges, OnDestroy, AsyncCompo
      * @inheritdoc
      */
     ngOnDestroy(): void {
-        this.domPromise?.cancel();
+        this.domElementPromise?.cancel();
+        this.domPromises.forEach((promise) => { promise.cancel();});
     }
 
     /**
      * @inheritdoc
      */
     async ready(): Promise<void> {
-        if (!this.element.classList.contains('core-format-text-loading')) {
+        if (!this.element.classList.contains('core-loading')) {
             return;
         }
 
@@ -229,7 +222,7 @@ export class CoreFormatTextDirective implements OnChanges, OnDestroy, AsyncCompo
      * Add magnifying glass icons to view adapted images at full size.
      */
     async addMagnifyingGlasses(): Promise<void> {
-        const imgs = Array.from(this.contentSpan.querySelectorAll('.core-adapted-img-container > img'));
+        const imgs = Array.from(this.element.querySelectorAll('.core-adapted-img-container > img'));
         if (!imgs.length) {
             return;
         }
@@ -311,7 +304,7 @@ export class CoreFormatTextDirective implements OnChanges, OnDestroy, AsyncCompo
      */
     protected async finishRender(): Promise<void> {
         // Show the element again.
-        this.element.classList.remove('core-format-text-loading');
+        this.element.classList.remove('core-loading');
 
         await CoreUtils.nextTick();
 
@@ -324,7 +317,7 @@ export class CoreFormatTextDirective implements OnChanges, OnDestroy, AsyncCompo
      */
     protected async formatAndRenderContents(): Promise<void> {
         if (!this.text) {
-            this.contentSpan.innerHTML = this.emptyText; // Remove current contents.
+            this.element.innerHTML = this.emptyText; // Remove current contents.
 
             await this.finishRender();
 
@@ -342,10 +335,10 @@ export class CoreFormatTextDirective implements OnChanges, OnDestroy, AsyncCompo
         // Disable media adapt to correctly calculate the height.
         this.element.classList.add('core-disable-media-adapt');
 
-        this.contentSpan.innerHTML = ''; // Remove current contents.
+        this.element.innerHTML = ''; // Remove current contents.
 
         // Move the children to the current element to be able to calculate the height.
-        CoreDomUtils.moveChildren(result.div, this.contentSpan);
+        CoreDomUtils.moveChildren(result.div, this.element);
 
         await CoreUtils.nextTick();
 
@@ -362,7 +355,7 @@ export class CoreFormatTextDirective implements OnChanges, OnDestroy, AsyncCompo
         if (result.options.filter) {
             // Let filters handle HTML. We do it here because we don't want them to block the render of the text.
             CoreFilterDelegate.handleHtml(
-                this.contentSpan,
+                this.element,
                 result.filters,
                 this.viewContainerRef,
                 result.options,
@@ -557,9 +550,10 @@ export class CoreFormatTextDirective implements OnChanges, OnDestroy, AsyncCompo
      * @return The width of the element in pixels.
      */
     protected async getElementWidth(): Promise<number> {
-        this.domPromise = CoreDomUtils.waitToBeInDOM(this.element);
-
-        await this.domPromise;
+        if (!this.domElementPromise) {
+            this.domElementPromise = CoreDomUtils.waitToBeInDOM(this.element);
+        }
+        await this.domElementPromise;
 
         let width = this.element.getBoundingClientRect().width;
         if (!width) {
@@ -709,12 +703,15 @@ export class CoreFormatTextDirective implements OnChanges, OnDestroy, AsyncCompo
                     newUrl += `&h=${privacyHash}`;
                 }
 
+                const domPromise = CoreDomUtils.waitToBeInDOM(iframe);
+                this.domPromises.push(domPromise);
+
+                await domPromise;
+
                 // Width and height are mandatory, we need to calculate them.
                 let width: string | number;
                 let height: string | number;
 
-                await CoreDomUtils.waitToBeInDOM(iframe, 5000);
-
                 if (iframe.width) {
                     width = iframe.width;
                 } else {
diff --git a/src/core/directives/tests/format-text.test.ts b/src/core/directives/tests/format-text.test.ts
index 8be19f17e..48cb3ca44 100644
--- a/src/core/directives/tests/format-text.test.ts
+++ b/src/core/directives/tests/format-text.test.ts
@@ -58,7 +58,7 @@ describe('CoreFormatTextDirective', () => {
         );
 
         // Assert
-        const text = fixture.nativeElement.querySelector('core-format-text .core-format-text-content');
+        const text = fixture.nativeElement.querySelector('core-format-text');
         expect(text).not.toBeNull();
         expect(text.innerHTML).toEqual(sentence);
     });
diff --git a/src/theme/components/format-text.scss b/src/theme/components/format-text.scss
index 3b35bff23..a242fe175 100644
--- a/src/theme/components/format-text.scss
+++ b/src/theme/components/format-text.scss
@@ -5,77 +5,38 @@
 core-format-text {
     --core-format-text-background: var(--background, var(--ion-item-background));
     --core-format-text-viewer-icon-background: rgba(255, 255, 255, .5);
-    --core-format-text-loader-shine: 251,251,251;
 }
 
 body.dark core-format-text {
     --core-format-text-viewer-icon-background: rgba(0, 0, 0, .5);
-    --core-format-text-loader-shine: 90,90,90;
 }
 
 core-format-text {
     display: contents;
+    user-select: text;
+    word-break: break-word;
+    word-wrap: break-word;
 
-    .core-format-text-loader {
-        opacity: 0;
-        @include core-transition(opacity, 200ms);
-        display: contents;
-    }
-
-    &.core-format-text-loading {
-        position: relative;
+    @include core-transition(background-color color, 200ms);
+    &.core-loading {
         width: 100%;
-        height: 100%;
-        opacity: 1;
-        background-color: rgba(0,0,0,.1);
-        overflow: hidden;
-        display: block;
-        border-radius: var(--small-radius);
-
-        .core-format-text-loader {
-            position: absolute;
-            left: -45%;
-            height: 100%;
-            width: 45%;
-            background-image: -webkit-linear-gradient(to left, rgba(var(--core-format-text-loader-shine), .05), rgba(var(--core-format-text-loader-shine), .3), rgba(var(--core-format-text-loader-shine), .6), rgba(var(--core-format-text-loader-shine), .3), rgba(var(--core-format-text-loader-shine), .05));
-            background-image: linear-gradient(to left, rgba(var(--core-format-text-loader-shine), .05), rgba(var(--core-format-text-loader-shine), .3), rgba(var(--core-format-text-loader-shine), .6), rgba(var(--core-format-text-loader-shine), .3), rgba(var(--core-format-text-loader-shine), .05));
-            animation: loading 1s infinite;
-            opacity: 1;
-            display: inline;
-        }
-
-        .core-format-text-content {
+        &:empty:before {
+            content: 'E'; // Set a minimum empty text to have a minimum height of one line.
             opacity: 0;
-            display: inline;
         }
     }
 
-    .core-format-text-content {
-        opacity: 1;
-        @include core-transition(opacity, 200ms);
-
-        display: contents;
-        user-select: text;
-        word-break: break-word;
-        word-wrap: break-word;
-    }
-
     &.collapsible-item {
         display: block;
         // This is to allow clicks in radio/checkbox content.
         cursor: pointer;
         pointer-events: auto;
 
-        .core-format-text-content {
-            display: block;
-        }
-
         &.collapsible-enabled {
-            .core-format-text-content {
-                display: block;
-                max-height: none;
-            }
-            &.collapsible-collapsed .core-format-text-content {
+            display: block;
+            max-height: none;
+
+            &.collapsible-collapsed {
                 overflow: hidden;
             }
         }
@@ -97,7 +58,7 @@ core-format-text {
     }
     &.collapsible-item.inline {
         display: inline-block;
-        &.collapsible-enabled .core-format-text-content {
+        &.collapsible-enabled {
            display: inline-block;
         }
     }
@@ -141,7 +102,7 @@ core-format-text {
     }
 
     // Disable clicks in links inside MathJax equations.
-    .core-format-text-content .filter_mathjaxloader_equation .MathJax_Preview a {
+    .filter_mathjaxloader_equation .MathJax_Preview a {
         pointer-events: none;
     }
 
@@ -243,7 +204,7 @@ core-format-text {
 
 }
 
-core-format-text .core-format-text-content,
+core-format-text,
 core-rich-text-editor .core-rte-editor {
     @include core-headings();
 
@@ -657,14 +618,10 @@ core-rich-text-editor .core-rte-editor {
 
 // h1 is too big and ugly, reduce size when loading.
 ion-header.ios h1 core-format-text {
-    &.core-format-text-loading {
+    &.core-loading {
         max-height: 30px;
         margin-top: 10px;
     }
-    &.core-format-text-content {
-        display: block;
-        margin-top: -10px;
-    }
 }
 
 body.dark core-format-text select,
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 250f07ba4..ac9e6756d 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -120,15 +120,15 @@ body {
 }
 
 // Correctly inherit ion-text-wrap onto labels.
-.item ion-label core-format-text .core-format-text-content > *,
-.fake-ion-item core-format-text .core-format-text-content > * {
+.item ion-label core-format-text > *,
+.fake-ion-item core-format-text > * {
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
 }
 
-.item.ion-text-wrap > ion-label core-format-text .core-format-text-content > *,
-.fake-ion-item.ion-text-wrap core-format-text .core-format-text-content > * {
+.item.ion-text-wrap > ion-label core-format-text > *,
+.fake-ion-item.ion-text-wrap core-format-text > * {
     white-space: normal;
     overflow: inherit;
 }
@@ -334,7 +334,7 @@ ion-button.button-solid {
     --box-shadow: none;
 }
 
-ion-button core-format-text .core-format-text-content {
+ion-button core-format-text {
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
@@ -350,7 +350,7 @@ ion-button > * {
 
 ion-button.ion-text-wrap {
     white-space: normal;
-    core-format-text .core-format-text-content {
+    core-format-text {
         white-space: normal;
         display: contents;
     }
@@ -1516,3 +1516,36 @@ ion-header.no-title {
         flex-grow: 1;
     }
 }
+
+
+// Loader animation.
+.core-loading {
+    position: relative;
+    background-color: var(--loader-background-color);
+    color: transparent; // Hide contents.
+    overflow: hidden;
+    display: var(--loader-display);
+    border-radius: var(--loader-radius);
+    @include core-transition(all, 200ms);
+    min-height: 8px;
+    min-width: 50px;
+
+    // Hide contents.
+    > * {
+        opacity: 0;
+        @include core-transition(opacity, 200ms);
+    }
+
+    &::after {
+        content: '';
+        position: absolute;
+        left: -45%;
+        height: 100%;
+        width: 45%;
+        background-image: linear-gradient(to left, rgba(var(--loader-shine), .05), rgba(var(--loader-shine), .3), rgba(var(--loader-shine), .6), rgba(var(--loader-shine), .3), rgba(var(--loader-shine), .05));
+        animation: loading 1s infinite;
+        display: block;
+        top: 0;
+        bottom: 0;
+    }
+}
diff --git a/src/theme/theme.dark.scss b/src/theme/theme.dark.scss
index 15d9b7e14..ecd188b0c 100644
--- a/src/theme/theme.dark.scss
+++ b/src/theme/theme.dark.scss
@@ -41,6 +41,8 @@
 
     --contrast-background: var(--gray-900);
 
+    --loader-shine: 90, 90, 90;
+
     --drop-shadow-color: 0, 0, 0, 1;
     --drop-shadow-top: 0px 2px 5px rgba(var(--drop-shadow-color));
     --drop-shadow-bottom: 0px -2px 5px rgba(var(--drop-shadow-color));
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 533c22f1d..284d216cb 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -85,6 +85,11 @@
 
     --contrast-background: white;
 
+    --loader-background-color: rgba(0, 0, 0, .1);
+    --loader-shine: 251, 251, 251;
+    --loader-radius: var(--small-radius);
+    --loader-display: block;
+
     --drop-shadow-color: 0, 0, 0, 0.5;
     --drop-shadow-top: 0px 2px 5px rgba(var(--drop-shadow-color));
     --drop-shadow-bottom: 0px -2px 5px rgba(var(--drop-shadow-color));

From 9f61d559b17624649cb06819697b10f4866457ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 17 Mar 2022 10:56:29 +0100
Subject: [PATCH 0759/1008] MOBILE-3814 iframe: Add loading class to show
 iframe is loading

---
 src/core/services/utils/iframe.ts | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/core/services/utils/iframe.ts b/src/core/services/utils/iframe.ts
index 2e93414c7..7a2fb3727 100644
--- a/src/core/services/utils/iframe.ts
+++ b/src/core/services/utils/iframe.ts
@@ -51,7 +51,7 @@ export class CoreIframeUtilsProvider {
     protected waitAutoLoginDefer?: PromiseDefer<void>;
 
     constructor() {
-        this.logger = CoreLogger.getInstance('CoreUtilsProvider');
+        this.logger = CoreLogger.getInstance('CoreIframeUtilsProvider');
     }
 
     /**
@@ -237,7 +237,7 @@ export class CoreIframeUtilsProvider {
             contentDocument = 'contentDocument' in element && element.contentDocument
                 ? element.contentDocument
                 : contentWindow && contentWindow.document;
-        } catch (ex) {
+        } catch {
             // Ignore errors.
         }
 
@@ -250,7 +250,7 @@ export class CoreIframeUtilsProvider {
             // It's probably an <embed>. Try to get the window and the document.
             try {
                 contentDocument = element.getSVGDocument();
-            } catch (ex) {
+            } catch {
                 // Ignore errors.
             }
 
@@ -310,10 +310,10 @@ export class CoreIframeUtilsProvider {
             };
         }
 
-        if (contentDocument) {
+        if (contentDocument.body) {
             // Search sub frames.
             CoreIframeUtilsProvider.FRAME_TAGS.forEach((tag) => {
-                const elements = Array.from(contentDocument.querySelectorAll(tag));
+                const elements = Array.from(contentDocument.body.querySelectorAll(tag));
                 elements.forEach((subElement: CoreFrameElement) => {
                     this.treatFrame(subElement, true);
                 });
@@ -333,6 +333,8 @@ export class CoreIframeUtilsProvider {
             return;
         }
 
+        element.classList.add('core-loading');
+
         const treatElement = (sendResizeEvent: boolean = false) => {
             this.checkOnlineFrameInOffline(element, isSubframe);
 
@@ -348,9 +350,12 @@ export class CoreIframeUtilsProvider {
                 this.treatFrameLinks(element, document);
             }
 
+            // Iframe content has been loaded.
             // Send a resize events to the iframe so it calculates the right size if needed.
             if (window && sendResizeEvent) {
-                setTimeout(() => window.dispatchEvent(new Event('resize')), 1000);
+                element.classList.remove('core-loading');
+
+                setTimeout(() => window.dispatchEvent && window.dispatchEvent(new Event('resize')), 1000);
             }
         };
 

From e5d748f5e52f858cf83d84952e12795f263e5aff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 17 Mar 2022 11:08:10 +0100
Subject: [PATCH 0760/1008] MOBILE-3814 core: Remove timeout from waitToBeInDOM

---
 .../rich-text-editor/rich-text-editor.ts      |  7 +++++-
 src/core/services/utils/dom.ts                | 24 ++++++-------------
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
index 07bf8b799..d9b8c4abf 100644
--- a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
+++ b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
@@ -107,6 +107,7 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
     protected languageChangedSubscription?: Subscription;
     protected resizeListener?: CoreEventObserver;
     protected domPromise?: CoreCancellablePromise<void>;
+    protected buttonsDomPromise?: CoreCancellablePromise<void>;
 
     rteEnabled = false;
     isPhone = false;
@@ -836,7 +837,10 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
 
         const length = await this.toolbarSlides.length();
 
-        await CoreDomUtils.waitToBeInDOM(this.toolbar.nativeElement, 5000);
+        // Cancel previous one, if any.
+        this.buttonsDomPromise?.cancel();
+        this.buttonsDomPromise = CoreDomUtils.waitToBeInDOM(this.toolbar.nativeElement);
+        await this.buttonsDomPromise;
 
         const width = this.toolbar.nativeElement.getBoundingClientRect().width;
 
@@ -1097,6 +1101,7 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
         this.labelObserver?.disconnect();
         this.resizeListener?.off();
         this.domPromise?.cancel();
+        this.buttonsDomPromise?.cancel();
     }
 
 }
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index 0e8f1dfc1..65f00c7d3 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -97,10 +97,9 @@ export class CoreDomUtilsProvider {
      * Wait an element to be in dom of another element.
      *
      * @param element Element to wait.
-     * @param timeout If defined, timeout to wait before rejecting the promise.
      * @return Cancellable promise.
      */
-    waitToBeInDOM(element: HTMLElement, timeout?: number): CoreCancellablePromise<void> {
+    waitToBeInDOM(element: HTMLElement): CoreCancellablePromise<void> {
         const root = element.getRootNode({ composed: true });
 
         if (root === document) {
@@ -109,33 +108,24 @@ export class CoreDomUtilsProvider {
         }
 
         let observer: MutationObserver;
-        let observerTimeout: number | undefined;
 
         return new CoreCancellablePromise<void>(
-            (resolve, reject) => {
+            (resolve) => {
                 observer = new MutationObserver(() => {
                     const root = element.getRootNode({ composed: true });
 
-                    if (root === document) {
-                        observer?.disconnect();
-                        observerTimeout && clearTimeout(observerTimeout);
-                        resolve();
+                    if (root !== document) {
+                        return;
                     }
+
+                    observer?.disconnect();
+                    resolve();
                 });
 
-                if (timeout) {
-                    observerTimeout = window.setTimeout(() => {
-                        observer?.disconnect();
-
-                        reject(new Error('Waiting for DOM timeout reached'));
-                    }, timeout);
-                }
-
                 observer.observe(document.body, { subtree: true, childList: true });
             },
             () => {
                 observer?.disconnect();
-                observerTimeout && clearTimeout(observerTimeout);
             },
         );
     }

From 4dcceee3e26ae29f969aa4d441d7ffc223b111e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 17 Mar 2022 12:50:13 +0100
Subject: [PATCH 0761/1008] MOBILE-3814 core: Use waitToBeInViewport in
 onAppear directive

---
 src/core/directives/on-appear.ts |  2 +-
 src/core/services/utils/dom.ts   | 96 +++++++++++++++++++++++++++++++-
 2 files changed, 96 insertions(+), 2 deletions(-)

diff --git a/src/core/directives/on-appear.ts b/src/core/directives/on-appear.ts
index c894878dc..d3e9bd2da 100644
--- a/src/core/directives/on-appear.ts
+++ b/src/core/directives/on-appear.ts
@@ -37,7 +37,7 @@ export class CoreOnAppearDirective implements OnInit, OnDestroy {
      * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
-        this.visiblePromise = CoreDomUtils.waitToBeVisible(this.element);
+        this.visiblePromise = CoreDomUtils.waitToBeInViewport(this.element);
 
         await this.visiblePromise;
 
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index 65f00c7d3..2df0fcfc1 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -141,6 +141,7 @@ export class CoreDomUtilsProvider {
 
         let interval: number | undefined;
 
+        // Mutations did not observe for visibility properties.
         return new CoreCancellablePromise<void>(
             async (resolve) => {
                 await domPromise;
@@ -165,6 +166,60 @@ export class CoreDomUtilsProvider {
         );
     }
 
+    /**
+     * Wait an element to be in dom and visible.
+     *
+     * @param element Element to wait.
+     * @param intersectionRatio Intersection ratio (From 0 to 1).
+     * @return Cancellable promise.
+     */
+    waitToBeInViewport(element: HTMLElement, intersectionRatio = 1): CoreCancellablePromise<void> {
+        const visiblePromise = CoreDomUtils.waitToBeVisible(element);
+
+        let intersectionObserver: IntersectionObserver;
+        let interval: number | undefined;
+
+        return new CoreCancellablePromise<void>(
+            async (resolve) => {
+                await visiblePromise;
+
+                if (CoreDomUtils.isElementInViewport(element, intersectionRatio)) {
+
+                    return resolve();
+                }
+
+                if ('IntersectionObserver' in window) {
+                    intersectionObserver = new IntersectionObserver((observerEntries) => {
+                        const isIntersecting = observerEntries
+                            .some((entry) => entry.isIntersecting && entry.intersectionRatio >= intersectionRatio);
+                        if (!isIntersecting) {
+                            return;
+                        }
+
+                        resolve();
+                        intersectionObserver?.disconnect();
+                    });
+
+                    intersectionObserver.observe(element);
+                } else {
+                    interval = window.setInterval(() => {
+                        if (!CoreDomUtils.isElementInViewport(element, intersectionRatio)) {
+                            return;
+                        }
+
+                        resolve();
+                        window.clearInterval(interval);
+                    }, 50);
+                }
+            },
+            () => {
+                visiblePromise.cancel();
+                intersectionObserver?.disconnect();
+                window.clearInterval(interval);
+            },
+        );
+    }
+
     /**
      * Window resize is widely checked and may have many performance issues, debouce usage is needed to avoid calling it too much.
      * This function helps setting up the debounce feature and remove listener easily.
@@ -870,10 +925,21 @@ export class CoreDomUtilsProvider {
         return elementPoint > window.innerHeight || elementPoint < scrollTopPos;
     }
 
+    /**
+     * Check whether an element has been added to the DOM.
+     *
+     * @param element Element.
+     * @return True if element has been added to the DOM, false otherwise.
+     */
+    isElementInDom(element: HTMLElement): boolean {
+        return element.getRootNode({ composed: true }) === document;
+    }
+
     /**
      * Check whether an element is visible or not.
      *
      * @param element Element.
+     * @return True if element is visible inside the DOM.
      */
     isElementVisible(element: HTMLElement): boolean {
         if (element.clientWidth === 0 || element.clientHeight === 0) {
@@ -885,7 +951,35 @@ export class CoreDomUtilsProvider {
             return false;
         }
 
-        return element.offsetParent !== null;
+        return CoreDomUtils.isElementInDom(element);
+    }
+
+    /**
+     * Check whether an element is intersecting the intersectionRatio in viewport.
+     *
+     * @param element
+     * @param intersectionRatio Intersection ratio (From 0 to 1).
+     * @return True if in viewport.
+     */
+    isElementInViewport(element: HTMLElement, intersectionRatio = 1): boolean {
+        const elementRectangle = element.getBoundingClientRect();
+
+        const elementArea = elementRectangle.width * elementRectangle.height;
+        if (elementArea == 0) {
+            return false;
+        }
+
+        const intersectionRectangle = {
+            top: Math.max(0, elementRectangle.top),
+            left: Math.max(0, elementRectangle.left),
+            bottom: Math.min(window.innerHeight, elementRectangle.bottom),
+            right: Math.min(window.innerWidth, elementRectangle.right),
+        };
+
+        const intersectionArea = (intersectionRectangle.right - intersectionRectangle.left) *
+            (intersectionRectangle.bottom - intersectionRectangle.top);
+
+        return intersectionArea / elementArea >= intersectionRatio;
     }
 
     /**

From 7cbf59df2d211d3f3e5c0de4eeec1680c6907ea1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 17 Mar 2022 13:29:47 +0100
Subject: [PATCH 0762/1008] MOBILE-3814 rte: Do not hide toolbar when clicked
 inside element

---
 .../core-editor-rich-text-editor.html             |  2 +-
 .../rich-text-editor/rich-text-editor.ts          | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/core/features/editor/components/rich-text-editor/core-editor-rich-text-editor.html b/src/core/features/editor/components/rich-text-editor/core-editor-rich-text-editor.html
index 5e1ad41d8..a89f6356f 100644
--- a/src/core/features/editor/components/rich-text-editor/core-editor-rich-text-editor.html
+++ b/src/core/features/editor/components/rich-text-editor/core-editor-rich-text-editor.html
@@ -110,7 +110,7 @@
             </button>
         </ion-slide>
         <ion-slide *ngIf="isPhone">
-            <button [title]="'core.editor.hidetoolbar' | translate" (click)="hideToolbar($event)" (keyup)="hideToolbar($event)"
+            <button [title]="'core.editor.hidetoolbar' | translate" (click)="hideToolbar($event, true)" (keyup)="hideToolbar($event, true)"
                 (mousedown)="downAction($event)" (keydown)="downAction($event)">
                 <ion-icon name="fas-times" aria-hidden="true"></ion-icon>
             </button>
diff --git a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
index d9b8c4abf..c152c6c41 100644
--- a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
+++ b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
@@ -177,8 +177,6 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
         this.editorElement.oninput = this.onChange.bind(this);
         this.editorElement.onkeydown = this.moveCursor.bind(this);
 
-        await CoreDomUtils.waitToBeVisible(this.editorElement);
-
         // Use paragraph on enter.
         document.execCommand('DefaultParagraphSeparator', false, 'p');
 
@@ -340,7 +338,7 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
                 return;
             }
 
-            if (this.isNullOrWhiteSpace(this.editorElement.innerText)) {
+            if (this.isNullOrWhiteSpace(this.editorElement.textContent)) {
                 this.clearText();
             } else {
                 // The textarea and the form control must receive the original URLs.
@@ -719,8 +717,17 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
 
     /**
      * Hide the toolbar in phone mode.
+     *
+     * @param event Event.
+     * @param force If true it will not check the target of the event.
      */
-    hideToolbar(event: Event): void {
+    hideToolbar(event: Event, force = false): void {
+        if (!force && event.target && this.element.contains(event.target as HTMLElement)) {
+            // Do not hide if clicked inside the editor area, except forced.
+
+            return;
+        }
+
         if (event.type == 'keyup' && !this.isValidKeyboardKey(<KeyboardEvent>event)) {
             return;
         }

From e5ba19a835c1263e01ad0413c6cb2dacb42cbc5d Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 17 Mar 2022 12:15:03 +0100
Subject: [PATCH 0763/1008] MOBILE-3833 ws: Send User Agent in file transfer
 requests

---
 src/core/features/emulator/services/file-transfer.ts |  7 +++++--
 src/core/services/ws.ts                              | 10 ++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/core/features/emulator/services/file-transfer.ts b/src/core/features/emulator/services/file-transfer.ts
index 59961318f..63f8baa8f 100644
--- a/src/core/features/emulator/services/file-transfer.ts
+++ b/src/core/features/emulator/services/file-transfer.ts
@@ -113,7 +113,10 @@ export class FileTransferObjectMock extends FileTransferObject {
             xhr.open('GET', source, true);
             xhr.responseType = 'blob';
             for (const name in headers) {
-                xhr.setRequestHeader(name, headers[name]);
+                // We can't set the User-Agent in browser.
+                if (name !== 'User-Agent') {
+                    xhr.setRequestHeader(name, headers[name]);
+                }
             }
 
             xhr.onprogress = (ev: ProgressEvent): void => {
@@ -332,7 +335,7 @@ export class FileTransferObjectMock extends FileTransferObject {
                 xhr.open(httpMethod || 'POST', url);
                 for (const name in headers) {
                     // Filter "unsafe" headers.
-                    if (name != 'Connection') {
+                    if (name !=='Connection' && name !== 'User-Agent') {
                         xhr.setRequestHeader(name, headers[name]);
                     }
                 }
diff --git a/src/core/services/ws.ts b/src/core/services/ws.ts
index 866ed0724..9d9e270de 100644
--- a/src/core/services/ws.ts
+++ b/src/core/services/ws.ts
@@ -270,7 +270,11 @@ export class CoreWSProvider {
             onProgress && transfer.onProgress(onProgress);
 
             // Download the file in the tmp file.
-            await transfer.download(url, fileEntry.toURL(), true);
+            await transfer.download(url, fileEntry.toURL(), true, {
+                headers: {
+                    'User-Agent': navigator.userAgent, // eslint-disable-line @typescript-eslint/naming-convention
+                },
+            });
 
             let extension = '';
 
@@ -885,7 +889,9 @@ export class CoreWSProvider {
             itemid: options.itemId || 0,
         };
         options.chunkedMode = false;
-        options.headers = {};
+        options.headers = {
+            'User-Agent': navigator.userAgent, // eslint-disable-line @typescript-eslint/naming-convention
+        };
         options['Connection'] = 'close';
 
         let success: FileUploadResult;

From 265a170b1352866736116d11a507ecc361b432c2 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 17 Mar 2022 16:47:55 +0100
Subject: [PATCH 0764/1008] MOBILE-3833 core: Treat relative URLs inside CSS
 files

---
 src/addons/calendar/services/calendar.ts      |  3 +-
 .../airnotifier/services/airnotifier.ts       |  4 +-
 .../mod/assign/services/assign-offline.ts     |  5 +-
 src/addons/mod/data/services/data-offline.ts  |  5 +-
 .../mod/forum/services/forum-offline.ts       |  7 +--
 .../mod/glossary/services/glossary-offline.ts |  5 +-
 src/addons/mod/imscp/services/imscp.ts        |  5 +-
 .../mod/resource/services/resource-helper.ts  |  4 +-
 src/addons/mod/scorm/services/scorm.ts        |  3 +-
 src/addons/mod/wiki/components/index/index.ts |  4 +-
 .../mod/workshop/services/workshop-offline.ts |  7 +--
 .../services/remotethemes-handler.ts          |  2 +-
 src/core/components/local-file/local-file.ts  |  3 +-
 src/core/components/recaptcha/recaptcha.ts    |  4 +-
 src/core/directives/format-text.ts            |  3 +-
 src/core/directives/link.ts                   | 12 ++---
 .../pages/course-summary/course-summary.ts    |  6 +--
 src/core/features/course/pages/index/index.ts |  6 +--
 .../services/handlers/request-push-click.ts   |  4 +-
 .../components/capture-media/capture-media.ts |  6 +--
 src/core/features/emulator/services/file.ts   | 12 ++---
 src/core/features/emulator/services/zip.ts    |  7 ++-
 .../services/fileuploader-helper.ts           |  5 +-
 .../fileuploader/services/fileuploader.ts     |  4 +-
 src/core/features/h5p/classes/core.ts         |  5 +-
 src/core/features/h5p/classes/file-storage.ts | 25 +++++-----
 src/core/features/h5p/classes/helper.ts       | 10 ++--
 src/core/features/h5p/classes/player.ts       | 14 +++---
 src/core/features/h5p/classes/storage.ts      |  6 +--
 src/core/features/h5p/classes/validator.ts    | 18 +++----
 src/core/features/h5p/services/h5p.ts         |  4 +-
 .../login/pages/email-signup/email-signup.ts  |  5 +-
 .../features/login/services/login-helper.ts   |  5 +-
 .../features/question/services/question.ts    |  3 +-
 .../sharedfiles/components/list/list.ts       |  4 +-
 .../sharedfiles/services/sharedfiles.ts       |  6 +--
 .../services/siteplugins-helper.ts            |  9 ++--
 src/core/features/xapi/services/xapi.ts       |  4 +-
 src/core/services/file.ts                     |  5 +-
 src/core/services/filepool.ts                 | 32 ++++++++----
 src/core/services/urlschemes.ts               |  3 +-
 src/core/services/utils/iframe.ts             |  6 +--
 src/core/services/utils/text.ts               | 22 ++-------
 src/core/services/utils/url.ts                |  7 +--
 src/core/singletons/tests/url.test.ts         |  8 +++
 src/core/singletons/text.ts                   | 26 ++++++++++
 src/core/singletons/url.ts                    | 49 +++++++++++++++++++
 47 files changed, 246 insertions(+), 156 deletions(-)

diff --git a/src/addons/calendar/services/calendar.ts b/src/addons/calendar/services/calendar.ts
index d010a96d9..c8bbf90d3 100644
--- a/src/addons/calendar/services/calendar.ts
+++ b/src/addons/calendar/services/calendar.ts
@@ -40,6 +40,7 @@ import { CoreNavigator } from '@services/navigator';
 import { AddonCalendarFilter } from './calendar-helper';
 import { AddonCalendarSyncEvents, AddonCalendarSyncProvider } from './calendar-sync';
 import { CoreEvents } from '@singletons/events';
+import { CoreText } from '@singletons/text';
 
 const ROOT_CACHE_KEY = 'mmaCalendar:';
 
@@ -1218,7 +1219,7 @@ export class AddonCalendarProvider {
      */
     async getViewUrl(view: string, time?: number, courseId?: string, siteId?: string): Promise<string> {
         const site = await CoreSites.getSite(siteId);
-        let url = CoreTextUtils.concatenatePaths(site.getURL(), 'calendar/view.php?view=' + view);
+        let url = CoreText.concatenatePaths(site.getURL(), 'calendar/view.php?view=' + view);
 
         if (time) {
             url += '&time=' + time;
diff --git a/src/addons/messageoutput/airnotifier/services/airnotifier.ts b/src/addons/messageoutput/airnotifier/services/airnotifier.ts
index a7783ac6f..86c498b18 100644
--- a/src/addons/messageoutput/airnotifier/services/airnotifier.ts
+++ b/src/addons/messageoutput/airnotifier/services/airnotifier.ts
@@ -23,8 +23,8 @@ import { CoreWSError } from '@classes/errors/wserror';
 import { makeSingleton, Translate } from '@singletons';
 import { CoreEvents, CoreEventSiteData } from '@singletons/events';
 import { CoreDomUtils } from '@services/utils/dom';
-import { CoreTextUtils } from '@services/utils/text';
 import { CoreUtils } from '@services/utils/utils';
+import { CoreText } from '@singletons/text';
 
 const ROOT_CACHE_KEY = 'mmaMessageOutputAirnotifier:';
 
@@ -214,7 +214,7 @@ export class AddonMessageOutputAirnotifierProvider {
                         handler: (data, resolve) => {
                             resolve(data[0]);
 
-                            const url = CoreTextUtils.concatenatePaths(
+                            const url = CoreText.concatenatePaths(
                                 site.getURL(),
                                 site.isVersionGreaterEqualThan('3.11') ?
                                     'message/output/airnotifier/checkconfiguration.php' :
diff --git a/src/addons/mod/assign/services/assign-offline.ts b/src/addons/mod/assign/services/assign-offline.ts
index a2024439b..d57ce3d2e 100644
--- a/src/addons/mod/assign/services/assign-offline.ts
+++ b/src/addons/mod/assign/services/assign-offline.ts
@@ -20,6 +20,7 @@ import { CoreSites } from '@services/sites';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreTimeUtils } from '@services/utils/time';
 import { makeSingleton } from '@singletons';
+import { CoreText } from '@singletons/text';
 import { AddonModAssignOutcomes, AddonModAssignSavePluginData } from './assign';
 import {
     AddonModAssignSubmissionsDBRecord,
@@ -236,7 +237,7 @@ export class AddonModAssignOfflineProvider {
         const siteFolderPath = CoreFile.getSiteFolder(site.getId());
         const submissionFolderPath = 'offlineassign/' + assignId + '/' + userId;
 
-        return CoreTextUtils.concatenatePaths(siteFolderPath, submissionFolderPath);
+        return CoreText.concatenatePaths(siteFolderPath, submissionFolderPath);
     }
 
     /**
@@ -276,7 +277,7 @@ export class AddonModAssignOfflineProvider {
     async getSubmissionPluginFolder(assignId: number, pluginName: string, userId?: number, siteId?: string): Promise<string> {
         const folderPath = await this.getSubmissionFolder(assignId, userId, siteId);
 
-        return CoreTextUtils.concatenatePaths(folderPath, pluginName);
+        return CoreText.concatenatePaths(folderPath, pluginName);
     }
 
     /**
diff --git a/src/addons/mod/data/services/data-offline.ts b/src/addons/mod/data/services/data-offline.ts
index 67fdb5b78..4fa5d30b9 100644
--- a/src/addons/mod/data/services/data-offline.ts
+++ b/src/addons/mod/data/services/data-offline.ts
@@ -19,6 +19,7 @@ import { CoreSites } from '@services/sites';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreUtils } from '@services/utils/utils';
 import { makeSingleton } from '@singletons';
+import { CoreText } from '@singletons/text';
 import { AddonModDataAction, AddonModDataEntryWSField } from './data';
 import { AddonModDataEntryDBRecord, DATA_ENTRY_TABLE } from './database/data';
 
@@ -206,7 +207,7 @@ export class AddonModDataOfflineProvider {
         const siteFolderPath = CoreFile.getSiteFolder(site.getId());
         const folderPath = 'offlinedatabase/' + dataId;
 
-        return CoreTextUtils.concatenatePaths(siteFolderPath, folderPath);
+        return CoreText.concatenatePaths(siteFolderPath, folderPath);
     }
 
     /**
@@ -221,7 +222,7 @@ export class AddonModDataOfflineProvider {
     async getEntryFieldFolder(dataId: number, entryId: number, fieldId: number, siteId?: string): Promise<string> {
         const folderPath = await this.getDatabaseFolder(dataId, siteId);
 
-        return CoreTextUtils.concatenatePaths(folderPath, entryId + '_' + fieldId);
+        return CoreText.concatenatePaths(folderPath, entryId + '_' + fieldId);
     }
 
     /**
diff --git a/src/addons/mod/forum/services/forum-offline.ts b/src/addons/mod/forum/services/forum-offline.ts
index bb28c0287..01d91e606 100644
--- a/src/addons/mod/forum/services/forum-offline.ts
+++ b/src/addons/mod/forum/services/forum-offline.ts
@@ -25,6 +25,7 @@ import {
     DISCUSSIONS_TABLE,
     REPLIES_TABLE,
 } from './database/offline';
+import { CoreText } from '@singletons/text';
 
 /**
  * Service to handle offline forum.
@@ -341,7 +342,7 @@ export class AddonModForumOfflineProvider {
         const site = await CoreSites.getSite(siteId);
         const siteFolderPath = CoreFile.getSiteFolder(site.getId());
 
-        return CoreTextUtils.concatenatePaths(siteFolderPath, 'offlineforum/' + forumId);
+        return CoreText.concatenatePaths(siteFolderPath, 'offlineforum/' + forumId);
     }
 
     /**
@@ -355,7 +356,7 @@ export class AddonModForumOfflineProvider {
     async getNewDiscussionFolder(forumId: number, timeCreated: number, siteId?: string): Promise<string> {
         const folderPath = await this.getForumFolder(forumId, siteId);
 
-        return CoreTextUtils.concatenatePaths(folderPath, 'newdisc_' + timeCreated);
+        return CoreText.concatenatePaths(folderPath, 'newdisc_' + timeCreated);
     }
 
     /**
@@ -372,7 +373,7 @@ export class AddonModForumOfflineProvider {
         const site = await CoreSites.getSite(siteId);
         userId = userId || site.getUserId();
 
-        return CoreTextUtils.concatenatePaths(folderPath, 'reply_' + postId + '_' + userId);
+        return CoreText.concatenatePaths(folderPath, 'reply_' + postId + '_' + userId);
     }
 
     /**
diff --git a/src/addons/mod/glossary/services/glossary-offline.ts b/src/addons/mod/glossary/services/glossary-offline.ts
index 4c9d7216b..47319388b 100644
--- a/src/addons/mod/glossary/services/glossary-offline.ts
+++ b/src/addons/mod/glossary/services/glossary-offline.ts
@@ -19,6 +19,7 @@ import { CoreSites } from '@services/sites';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreUtils } from '@services/utils/utils';
 import { makeSingleton } from '@singletons';
+import { CoreText } from '@singletons/text';
 import { AddonModGlossaryOfflineEntryDBRecord, OFFLINE_ENTRIES_TABLE_NAME } from './database/glossary';
 import { AddonModGlossaryDiscardedEntry, AddonModGlossaryEntryOption } from './glossary';
 
@@ -213,7 +214,7 @@ export class AddonModGlossaryOfflineProvider {
         const siteFolderPath = CoreFile.getSiteFolder(site.getId());
         const folderPath = 'offlineglossary/' + glossaryId;
 
-        return CoreTextUtils.concatenatePaths(siteFolderPath, folderPath);
+        return CoreText.concatenatePaths(siteFolderPath, folderPath);
     }
 
     /**
@@ -228,7 +229,7 @@ export class AddonModGlossaryOfflineProvider {
     async getEntryFolder(glossaryId: number, concept: string, timeCreated: number, siteId?: string): Promise<string> {
         const folderPath = await this.getGlossaryFolder(glossaryId, siteId);
 
-        return CoreTextUtils.concatenatePaths(folderPath, 'newentry_' + concept + '_' + timeCreated);
+        return CoreText.concatenatePaths(folderPath, 'newentry_' + concept + '_' + timeCreated);
     }
 
     /**
diff --git a/src/addons/mod/imscp/services/imscp.ts b/src/addons/mod/imscp/services/imscp.ts
index 226dcd7c5..824dbb33f 100644
--- a/src/addons/mod/imscp/services/imscp.ts
+++ b/src/addons/mod/imscp/services/imscp.ts
@@ -25,6 +25,7 @@ import { CoreTextUtils } from '@services/utils/text';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreWSExternalFile, CoreWSExternalWarning } from '@services/ws';
 import { makeSingleton, Translate } from '@singletons';
+import { CoreText } from '@singletons/text';
 
 const ROOT_CACHE_KEY = 'mmaModImscp:';
 
@@ -154,7 +155,7 @@ export class AddonModImscpProvider {
                 return false;
             }
 
-            const filePath = CoreTextUtils.concatenatePaths(item.filepath, item.filename);
+            const filePath = CoreText.concatenatePaths(item.filepath, item.filename);
             const filePathAlt = filePath.charAt(0) === '/' ? filePath.substring(1) : '/' + filePath;
 
             // Check if it's main file.
@@ -177,7 +178,7 @@ export class AddonModImscpProvider {
         try {
             const dirPath = await CoreFilepool.getPackageDirUrlByUrl(siteId, module.url || '');
 
-            return CoreTextUtils.concatenatePaths(dirPath, itemHref);
+            return CoreText.concatenatePaths(dirPath, itemHref);
         } catch (error) {
             // Error getting directory, there was an error downloading or we're in browser. Return online URL if connected.
             if (CoreApp.isOnline()) {
diff --git a/src/addons/mod/resource/services/resource-helper.ts b/src/addons/mod/resource/services/resource-helper.ts
index 943bee509..41e4eec84 100644
--- a/src/addons/mod/resource/services/resource-helper.ts
+++ b/src/addons/mod/resource/services/resource-helper.ts
@@ -24,9 +24,9 @@ import { CoreFilepool } from '@services/filepool';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreMimetypeUtils } from '@services/utils/mimetype';
-import { CoreTextUtils } from '@services/utils/text';
 import { CoreUtilsOpenFileOptions } from '@services/utils/utils';
 import { makeSingleton, Translate } from '@singletons';
+import { CoreText } from '@singletons/text';
 import { AddonModResource, AddonModResourceProvider } from './resource';
 
 /**
@@ -77,7 +77,7 @@ export class AddonModResourceHelperProvider {
             const dirPath = await CoreFilepool.getPackageDirUrlByUrl(CoreSites.getCurrentSiteId(), module.url!);
 
             // This URL is going to be injected in an iframe, we need trustAsResourceUrl to make it work in a browser.
-            return CoreTextUtils.concatenatePaths(dirPath, mainFilePath);
+            return CoreText.concatenatePaths(dirPath, mainFilePath);
         } catch (e) {
             // Error getting directory, there was an error downloading or we're in browser. Return online URL.
             if (CoreApp.isOnline() && mainFile.fileurl) {
diff --git a/src/addons/mod/scorm/services/scorm.ts b/src/addons/mod/scorm/services/scorm.ts
index be1ac928c..27bb5c945 100644
--- a/src/addons/mod/scorm/services/scorm.ts
+++ b/src/addons/mod/scorm/services/scorm.ts
@@ -28,6 +28,7 @@ import { CoreUtils } from '@services/utils/utils';
 import { CoreWS, CoreWSExternalFile, CoreWSExternalWarning, CoreWSFile, CoreWSPreSets } from '@services/ws';
 import { makeSingleton, Translate } from '@singletons';
 import { CoreEvents } from '@singletons/events';
+import { CoreText } from '@singletons/text';
 import { AddonModScormOffline } from './scorm-offline';
 import { AddonModScormAutoSyncEventData, AddonModScormSyncProvider } from './scorm-sync';
 
@@ -960,7 +961,7 @@ export class AddonModScormProvider {
 
         const dirPath = await CoreFilepool.getPackageDirUrlByUrl(siteId, scorm.moduleurl!);
 
-        return CoreTextUtils.concatenatePaths(dirPath, launchUrl);
+        return CoreText.concatenatePaths(dirPath, launchUrl);
     }
 
     /**
diff --git a/src/addons/mod/wiki/components/index/index.ts b/src/addons/mod/wiki/components/index/index.ts
index bbe537f99..558db1026 100644
--- a/src/addons/mod/wiki/components/index/index.ts
+++ b/src/addons/mod/wiki/components/index/index.ts
@@ -26,10 +26,10 @@ import { CoreGroup, CoreGroups } from '@services/groups';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
-import { CoreTextUtils } from '@services/utils/text';
 import { CoreUtils } from '@services/utils/utils';
 import { Network, Translate, NgZone } from '@singletons';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
+import { CoreText } from '@singletons/text';
 import { Subscription } from 'rxjs';
 import { Md5 } from 'ts-md5';
 import { AddonModWikiPageDBRecord } from '../../services/database/wiki';
@@ -676,7 +676,7 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
         content = content.trim();
 
         if (content.length > 0) {
-            const editUrl = CoreTextUtils.concatenatePaths(CoreSites.getRequiredCurrentSite().getURL(), '/mod/wiki/edit.php');
+            const editUrl = CoreText.concatenatePaths(CoreSites.getRequiredCurrentSite().getURL(), '/mod/wiki/edit.php');
             content = content.replace(/href="edit\.php/g, 'href="' + editUrl);
         }
 
diff --git a/src/addons/mod/workshop/services/workshop-offline.ts b/src/addons/mod/workshop/services/workshop-offline.ts
index fdf5f0152..1246ef1f1 100644
--- a/src/addons/mod/workshop/services/workshop-offline.ts
+++ b/src/addons/mod/workshop/services/workshop-offline.ts
@@ -20,6 +20,7 @@ import { CoreTextUtils } from '@services/utils/text';
 import { CoreTimeUtils } from '@services/utils/time';
 import { makeSingleton } from '@singletons';
 import { CoreFormFields } from '@singletons/form';
+import { CoreText } from '@singletons/text';
 import {
     AddonModWorkshopAssessmentDBRecord,
     AddonModWorkshopEvaluateAssessmentDBRecord,
@@ -629,7 +630,7 @@ export class AddonModWorkshopOfflineProvider {
         const siteFolderPath = CoreFile.getSiteFolder(site.getId());
         const workshopFolderPath = 'offlineworkshop/' + workshopId + '/';
 
-        return CoreTextUtils.concatenatePaths(siteFolderPath, workshopFolderPath);
+        return CoreText.concatenatePaths(siteFolderPath, workshopFolderPath);
     }
 
     /**
@@ -642,7 +643,7 @@ export class AddonModWorkshopOfflineProvider {
     async getSubmissionFolder(workshopId: number, siteId?: string): Promise<string> {
         const folderPath = await this.getWorkshopFolder(workshopId, siteId);
 
-        return CoreTextUtils.concatenatePaths(folderPath, 'submission');
+        return CoreText.concatenatePaths(folderPath, 'submission');
     }
 
     /**
@@ -658,7 +659,7 @@ export class AddonModWorkshopOfflineProvider {
 
         folderPath += 'assessment/';
 
-        return CoreTextUtils.concatenatePaths(folderPath, String(assessmentId));
+        return CoreText.concatenatePaths(folderPath, String(assessmentId));
     }
 
 }
diff --git a/src/addons/remotethemes/services/remotethemes-handler.ts b/src/addons/remotethemes/services/remotethemes-handler.ts
index d04eb9cd3..2d553046f 100644
--- a/src/addons/remotethemes/services/remotethemes-handler.ts
+++ b/src/addons/remotethemes/services/remotethemes-handler.ts
@@ -90,7 +90,7 @@ export class AddonRemoteThemesHandlerService implements CoreStyleHandler {
         if (style != '') {
             // Treat the CSS.
             CoreUtils.ignoreErrors(
-                CoreFilepool.treatCSSCode(siteId, fileUrl, style, COMPONENT, 1),
+                CoreFilepool.treatCSSCode(siteId, infos.mobilecssurl, style, COMPONENT, 1),
             );
         }
 
diff --git a/src/core/components/local-file/local-file.ts b/src/core/components/local-file/local-file.ts
index 8f942bc6a..3ae64c44c 100644
--- a/src/core/components/local-file/local-file.ts
+++ b/src/core/components/local-file/local-file.ts
@@ -26,6 +26,7 @@ import { CoreTimeUtils } from '@services/utils/time';
 import { CoreUtils, CoreUtilsOpenFileOptions, OpenFileAction } from '@services/utils/utils';
 import { CoreForms } from '@singletons/form';
 import { CoreApp } from '@services/app';
+import { CoreText } from '@singletons/text';
 
 /**
  * Component to handle a local file. Only files inside the app folder can be managed.
@@ -174,7 +175,7 @@ export class CoreLocalFileComponent implements OnInit {
 
         const modal = await CoreDomUtils.showModalLoading();
         const fileAndDir = CoreFile.getFileAndDirectoryFromPath(this.relativePath!);
-        const newPath = CoreTextUtils.concatenatePaths(fileAndDir.directory, newName);
+        const newPath = CoreText.concatenatePaths(fileAndDir.directory, newName);
 
         try {
             // Check if there's a file with this name.
diff --git a/src/core/components/recaptcha/recaptcha.ts b/src/core/components/recaptcha/recaptcha.ts
index 45e1c8934..0e143c079 100644
--- a/src/core/components/recaptcha/recaptcha.ts
+++ b/src/core/components/recaptcha/recaptcha.ts
@@ -16,8 +16,8 @@ import { Component, Input, OnInit } from '@angular/core';
 
 import { CoreLang } from '@services/lang';
 import { CoreSites } from '@services/sites';
-import { CoreTextUtils } from '@services/utils/text';
 import { CoreUtils } from '@services/utils/utils';
+import { CoreText } from '@singletons/text';
 
 /**
  * Component that allows answering a recaptcha.
@@ -62,7 +62,7 @@ export class CoreRecaptchaComponent implements OnInit {
         // Open the recaptcha challenge in an InAppBrowser.
         // The app used to use an iframe for this, but the app can no longer access the iframe to create the required callbacks.
         // The app cannot render the recaptcha directly because it has problems with the local protocols and domains.
-        const src = CoreTextUtils.concatenatePaths(this.siteUrl!, 'webservice/recaptcha.php?lang=' + this.lang);
+        const src = CoreText.concatenatePaths(this.siteUrl!, 'webservice/recaptcha.php?lang=' + this.lang);
 
         const inAppBrowserWindow = CoreUtils.openInApp(src);
         if (!inAppBrowserWindow) {
diff --git a/src/core/directives/format-text.ts b/src/core/directives/format-text.ts
index afd53beae..c52760192 100644
--- a/src/core/directives/format-text.ts
+++ b/src/core/directives/format-text.ts
@@ -44,6 +44,7 @@ import { CoreComponentsRegistry } from '@singletons/components-registry';
 import { CoreCollapsibleItemDirective } from './collapsible-item';
 import { CoreCancellablePromise } from '@classes/cancellable-promise';
 import { AsyncComponent } from '@classes/async-component';
+import { CoreText } from '@singletons/text';
 
 /**
  * Directive to format text rendered. It renders the HTML and treats all links and media, using CoreLinkDirective
@@ -695,7 +696,7 @@ export class CoreFormatTextDirective implements OnChanges, OnDestroy, AsyncCompo
             // Check if it's a Vimeo video. If it is, use the wsplayer script instead to make restricted videos work.
             const matches = src.match(/https?:\/\/player\.vimeo\.com\/video\/([0-9]+)([?&]+h=([a-zA-Z0-9]*))?/);
             if (matches && matches[1]) {
-                let newUrl = CoreTextUtils.concatenatePaths(site.getURL(), '/media/player/vimeo/wsplayer.php?video=') +
+                let newUrl = CoreText.concatenatePaths(site.getURL(), '/media/player/vimeo/wsplayer.php?video=') +
                     matches[1] + '&token=' + site.getToken();
 
                 let privacyHash: string | undefined | null = matches[3];
diff --git a/src/core/directives/link.ts b/src/core/directives/link.ts
index e177b4a97..31a405e88 100644
--- a/src/core/directives/link.ts
+++ b/src/core/directives/link.ts
@@ -27,6 +27,7 @@ import { CoreContentLinksHelper } from '@features/contentlinks/services/contentl
 import { CoreCustomURLSchemes } from '@services/urlschemes';
 import { DomSanitizer } from '@singletons';
 import { CoreFilepool } from '@services/filepool';
+import { CoreUrl } from '@singletons/url';
 
 /**
  * Directive to open a link in external browser or in the app.
@@ -209,15 +210,8 @@ export class CoreLinkDirective implements OnInit {
 
         const currentSite = CoreSites.getRequiredCurrentSite();
 
-        // Check if URL does not have any protocol, so it's a relative URL.
-        if (!CoreUrlUtils.isAbsoluteURL(href)) {
-            // Add the site URL at the begining.
-            if (href.charAt(0) == '/') {
-                href = currentSite.getURL() + href;
-            } else {
-                href = currentSite.getURL() + '/' + href;
-            }
-        }
+        // Make sure it's an absolute URL.
+        href = CoreUrl.toAbsoluteURL(currentSite.getURL(), href);
 
         if (currentSite.isSitePluginFileUrl(href)) {
             // It's a site file. Check if it's being downloaded right now.
diff --git a/src/core/features/course/pages/course-summary/course-summary.ts b/src/core/features/course/pages/course-summary/course-summary.ts
index 694346601..a34255bfa 100644
--- a/src/core/features/course/pages/course-summary/course-summary.ts
+++ b/src/core/features/course/pages/course-summary/course-summary.ts
@@ -17,7 +17,6 @@ import { ActionSheetButton, IonRefresher } from '@ionic/angular';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
-import { CoreTextUtils } from '@services/utils/text';
 import {
     CoreCourseCustomField,
     CoreCourseEnrolmentMethod,
@@ -38,6 +37,7 @@ import { CoreUtils } from '@services/utils/utils';
 import { CoreCoursesHelper, CoreCourseWithImageAndColor } from '@features/courses/services/courses-helper';
 import { Subscription } from 'rxjs';
 import { CoreColors } from '@singletons/colors';
+import { CoreText } from '@singletons/text';
 
 /**
  * Page that shows the summary of a course including buttons to enrol and other available options.
@@ -117,8 +117,8 @@ export class CoreCourseSummaryPage implements OnInit, OnDestroy {
         }
 
         const currentSiteUrl = CoreSites.getRequiredCurrentSite().getURL();
-        this.enrolUrl = CoreTextUtils.concatenatePaths(currentSiteUrl, 'enrol/index.php?id=' + this.courseId);
-        this.courseUrl = CoreTextUtils.concatenatePaths(currentSiteUrl, 'course/view.php?id=' + this.courseId);
+        this.enrolUrl = CoreText.concatenatePaths(currentSiteUrl, 'enrol/index.php?id=' + this.courseId);
+        this.courseUrl = CoreText.concatenatePaths(currentSiteUrl, 'course/view.php?id=' + this.courseId);
 
         await this.getCourse();
     }
diff --git a/src/core/features/course/pages/index/index.ts b/src/core/features/course/pages/index/index.ts
index 3377bde84..fdd5e47c8 100644
--- a/src/core/features/course/pages/index/index.ts
+++ b/src/core/features/course/pages/index/index.ts
@@ -23,13 +23,13 @@ import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreCourse, CoreCourseModuleCompletionStatus, CoreCourseWSSection } from '@features/course/services/course';
 import { CoreCourseHelper, CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreUtils } from '@services/utils/utils';
-import { CoreTextUtils } from '@services/utils/text';
 import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
 import { CONTENTS_PAGE_NAME } from '@features/course/course.module';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreCourseSummaryPage } from '../course-summary/course-summary';
 import { CoreCoursesHelper, CoreCourseWithImageAndColor } from '@features/courses/services/courses-helper';
 import { CoreColors } from '@singletons/colors';
+import { CoreText } from '@singletons/text';
 
 /**
  * Page that displays the list of courses the user is enrolled in.
@@ -149,7 +149,7 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
         }
 
         this.currentPagePath = CoreNavigator.getCurrentPath();
-        this.contentsTab.page = CoreTextUtils.concatenatePaths(this.currentPagePath, this.contentsTab.page);
+        this.contentsTab.page = CoreText.concatenatePaths(this.currentPagePath, this.contentsTab.page);
         this.contentsTab.pageParams = {
             course: this.course,
             sectionId: CoreNavigator.getRouteNumberParam('sectionId'),
@@ -207,7 +207,7 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
 
         // Create the full path.
         handlers.forEach((handler, index) => {
-            handler.data.page = CoreTextUtils.concatenatePaths(this.currentPagePath, handler.data.page);
+            handler.data.page = CoreText.concatenatePaths(this.currentPagePath, handler.data.page);
             handler.data.pageParams = handler.data.pageParams || {};
 
             // Check if this handler should be the first selected tab.
diff --git a/src/core/features/courses/services/handlers/request-push-click.ts b/src/core/features/courses/services/handlers/request-push-click.ts
index 2eb12d9a9..265e9f0f9 100644
--- a/src/core/features/courses/services/handlers/request-push-click.ts
+++ b/src/core/features/courses/services/handlers/request-push-click.ts
@@ -20,9 +20,9 @@ import { CorePushNotificationsNotificationBasicData } from '@features/pushnotifi
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
-import { CoreTextUtils } from '@services/utils/text';
 import { CoreUtils } from '@services/utils/utils';
 import { makeSingleton } from '@singletons';
+import { CoreText } from '@singletons/text';
 import { CoreCourses } from '../courses';
 
 /**
@@ -58,7 +58,7 @@ export class CoreCoursesRequestPushClickHandlerService implements CorePushNotifi
         if (notification.name == 'courserequested') {
             // Feature not supported in the app, open in browser.
             const site = await CoreSites.getSite(notification.site);
-            const url = CoreTextUtils.concatenatePaths(site.getURL(), 'course/pending.php');
+            const url = CoreText.concatenatePaths(site.getURL(), 'course/pending.php');
 
             await site.openInBrowserWithAutoLogin(url);
 
diff --git a/src/core/features/emulator/components/capture-media/capture-media.ts b/src/core/features/emulator/components/capture-media/capture-media.ts
index aec2e3955..4d7fabd8e 100644
--- a/src/core/features/emulator/components/capture-media/capture-media.ts
+++ b/src/core/features/emulator/components/capture-media/capture-media.ts
@@ -21,12 +21,12 @@ import { CoreApp } from '@services/app';
 import { CoreFile, CoreFileProvider } from '@services/file';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreMimetypeUtils } from '@services/utils/mimetype';
-import { CoreTextUtils } from '@services/utils/text';
 import { CoreTimeUtils } from '@services/utils/time';
 import { Platform, ModalController, Media, Translate } from '@singletons';
 import { CoreError } from '@classes/errors/error';
 import { CoreCaptureError } from '@classes/errors/captureerror';
 import { CoreCanceledError } from '@classes/errors/cancelederror';
+import { CoreText } from '@singletons/text';
 
 /**
  * Page to capture media in browser, or to capture audio in mobile devices.
@@ -131,7 +131,7 @@ export class CoreEmulatorCaptureMediaComponent implements OnInit, OnDestroy {
      */
     protected async initCordovaMediaPlugin(): Promise<void> {
         this.filePath = this.getFilePath();
-        let absolutePath = CoreTextUtils.concatenatePaths(CoreFile.getBasePathInstant(), this.filePath);
+        let absolutePath = CoreText.concatenatePaths(CoreFile.getBasePathInstant(), this.filePath);
 
         if (Platform.is('ios')) {
             // In iOS we need to remove the file:// part.
@@ -534,7 +534,7 @@ export class CoreEmulatorCaptureMediaComponent implements OnInit, OnDestroy {
     protected getFilePath(): string {
         const fileName = this.type + '_' + CoreTimeUtils.readableTimestamp() + '.' + this.extension;
 
-        return CoreTextUtils.concatenatePaths(CoreFileProvider.TMPFOLDER, 'media/' + fileName);
+        return CoreText.concatenatePaths(CoreFileProvider.TMPFOLDER, 'media/' + fileName);
     }
 
     /**
diff --git a/src/core/features/emulator/services/file.ts b/src/core/features/emulator/services/file.ts
index 4ae67a3d5..cfd35de11 100644
--- a/src/core/features/emulator/services/file.ts
+++ b/src/core/features/emulator/services/file.ts
@@ -15,7 +15,7 @@
 import { Injectable } from '@angular/core';
 import { File, Entry, DirectoryEntry, FileEntry, IWriteOptions, RemoveResult } from '@ionic-native/file/ngx';
 
-import { CoreTextUtils } from '@services/utils/text';
+import { CoreText } from '@singletons/text';
 
 /**
  * Implement the File Error because the ionic-native plugin doesn't implement it.
@@ -58,7 +58,7 @@ export class FileMock extends File {
      * @return Returns a Promise that resolves to true if the directory exists or rejects with an error.
      */
     async checkDir(path: string, dir: string): Promise<boolean> {
-        const fullPath = CoreTextUtils.concatenatePaths(path, dir);
+        const fullPath = CoreText.concatenatePaths(path, dir);
 
         await this.resolveDirectoryUrl(fullPath);
 
@@ -73,7 +73,7 @@ export class FileMock extends File {
      * @return Returns a Promise that resolves with a boolean or rejects with an error.
      */
     async checkFile(path: string, file: string): Promise<boolean> {
-        const entry = await this.resolveLocalFilesystemUrl(CoreTextUtils.concatenatePaths(path, file));
+        const entry = await this.resolveLocalFilesystemUrl(CoreText.concatenatePaths(path, file));
 
         if (entry.isFile) {
             return true;
@@ -144,7 +144,7 @@ export class FileMock extends File {
     async copyFileOrDir(sourcePath: string, sourceName: string, destPath: string, destName: string): Promise<Entry> {
         const destFixed = this.fixPathAndName(destPath, destName);
 
-        const source = await this.resolveLocalFilesystemUrl(CoreTextUtils.concatenatePaths(sourcePath, sourceName));
+        const source = await this.resolveLocalFilesystemUrl(CoreText.concatenatePaths(sourcePath, sourceName));
 
         const destParentDir = await this.resolveDirectoryUrl(destFixed.path);
 
@@ -424,7 +424,7 @@ export class FileMock extends File {
     async moveFileOrDir(sourcePath: string, sourceName: string, destPath: string, destName: string): Promise<Entry> {
         const destFixed = this.fixPathAndName(destPath, destName);
 
-        const source = await this.resolveLocalFilesystemUrl(CoreTextUtils.concatenatePaths(sourcePath, sourceName));
+        const source = await this.resolveLocalFilesystemUrl(CoreText.concatenatePaths(sourcePath, sourceName));
 
         const destParentDir = await this.resolveDirectoryUrl(destFixed.path);
 
@@ -440,7 +440,7 @@ export class FileMock extends File {
      */
     protected fixPathAndName(path: string, name: string): {path: string; name: string} {
 
-        const fullPath = CoreTextUtils.concatenatePaths(path, name);
+        const fullPath = CoreText.concatenatePaths(path, name);
 
         return {
             path: fullPath.substring(0, fullPath.lastIndexOf('/')),
diff --git a/src/core/features/emulator/services/zip.ts b/src/core/features/emulator/services/zip.ts
index 47fa54b55..0420b2dce 100644
--- a/src/core/features/emulator/services/zip.ts
+++ b/src/core/features/emulator/services/zip.ts
@@ -16,8 +16,7 @@ import { Injectable } from '@angular/core';
 import { File } from '@ionic-native/file/ngx';
 import { Zip } from '@ionic-native/zip/ngx';
 import * as JSZip from 'jszip';
-
-import { CoreTextUtils } from '@services/utils/text';
+import { CoreText } from '@singletons/text';
 
 /**
  * Emulates the Cordova Zip plugin in browser.
@@ -46,7 +45,7 @@ export class ZipMock extends Zip {
             await this.file.createDir(destination, folder, true);
 
             // Folder created, add it to the destination path.
-            destination = CoreTextUtils.concatenatePaths(destination, folder);
+            destination = CoreText.concatenatePaths(destination, folder);
         }
     }
 
@@ -106,7 +105,7 @@ export class ZipMock extends Zip {
                     const fileData = await file.async('blob');
 
                     // File read and parent folder created, now write the file.
-                    const parentFolder = CoreTextUtils.concatenatePaths(destination, fileDir);
+                    const parentFolder = CoreText.concatenatePaths(destination, fileDir);
 
                     await this.file.writeFile(parentFolder, fileName, fileData, { replace: true });
                 } else {
diff --git a/src/core/features/fileuploader/services/fileuploader-helper.ts b/src/core/features/fileuploader/services/fileuploader-helper.ts
index 0aae60598..d8cdfb14f 100644
--- a/src/core/features/fileuploader/services/fileuploader-helper.ts
+++ b/src/core/features/fileuploader/services/fileuploader-helper.ts
@@ -35,6 +35,7 @@ import { CoreCaptureError } from '@classes/errors/captureerror';
 import { CoreIonLoadingElement } from '@classes/ion-loading';
 import { CoreWSUploadFileResult } from '@services/ws';
 import { CoreSites } from '@services/sites';
+import { CoreText } from '@singletons/text';
 
 /**
  * Helper service to upload files.
@@ -158,7 +159,7 @@ export class CoreFileUploaderHelperProvider {
             // Get unique name for the copy.
             const newName = await CoreFile.getUniqueNameInFolder(CoreFileProvider.TMPFOLDER, name);
 
-            const filePath = CoreTextUtils.concatenatePaths(CoreFileProvider.TMPFOLDER, newName);
+            const filePath = CoreText.concatenatePaths(CoreFileProvider.TMPFOLDER, newName);
 
             // Write the data into the file.
             fileEntry = await CoreFile.writeFileDataInFile(
@@ -218,7 +219,7 @@ export class CoreFileUploaderHelperProvider {
         const newName = await CoreFile.getUniqueNameInFolder(CoreFileProvider.TMPFOLDER, fileName, defaultExt);
 
         // Now move or copy the file.
-        const destPath = CoreTextUtils.concatenatePaths(CoreFileProvider.TMPFOLDER, newName);
+        const destPath = CoreText.concatenatePaths(CoreFileProvider.TMPFOLDER, newName);
         if (shouldDelete) {
             return CoreFile.moveExternalFile(path, destPath);
         } else {
diff --git a/src/core/features/fileuploader/services/fileuploader.ts b/src/core/features/fileuploader/services/fileuploader.ts
index cf17de72b..c9f94dac0 100644
--- a/src/core/features/fileuploader/services/fileuploader.ts
+++ b/src/core/features/fileuploader/services/fileuploader.ts
@@ -23,7 +23,6 @@ import { CoreFile, CoreFileProvider } from '@services/file';
 import { CoreFilepool } from '@services/filepool';
 import { CoreSites } from '@services/sites';
 import { CoreMimetypeUtils } from '@services/utils/mimetype';
-import { CoreTextUtils } from '@services/utils/text';
 import { CoreTimeUtils } from '@services/utils/time';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreWSFile, CoreWSFileUploadOptions, CoreWSUploadFileResult } from '@services/ws';
@@ -33,6 +32,7 @@ import { CoreEmulatorCaptureMediaComponent } from '@features/emulator/components
 import { CoreError } from '@classes/errors/error';
 import { CoreSite } from '@classes/site';
 import { CoreFileEntry, CoreFileHelper } from '@services/file-helper';
+import { CoreText } from '@singletons/text';
 
 /**
  * File upload options.
@@ -579,7 +579,7 @@ export class CoreFileUploaderProvider {
             } else {
                 // Local file, copy it.
                 // Use copy instead of move to prevent having a unstable state if some copies succeed and others don't.
-                const destFile = CoreTextUtils.concatenatePaths(folderPath, file.name);
+                const destFile = CoreText.concatenatePaths(folderPath, file.name);
                 result.offline++;
 
                 await CoreFile.copyFile(file.toURL(), destFile);
diff --git a/src/core/features/h5p/classes/core.ts b/src/core/features/h5p/classes/core.ts
index 948dabf40..8c50ea5eb 100644
--- a/src/core/features/h5p/classes/core.ts
+++ b/src/core/features/h5p/classes/core.ts
@@ -24,6 +24,7 @@ import { CoreH5PContentValidator, CoreH5PSemantics } from './content-validator';
 import { Translate } from '@singletons';
 import { CoreH5PContentBeingSaved } from './storage';
 import { CoreH5PLibraryAddTo } from './validator';
+import { CoreText } from '@singletons/text';
 
 /**
  * Equivalent to H5P's H5PCore class.
@@ -148,7 +149,7 @@ export class CoreH5PCore {
             urls.push(libUrl + script);
         });
 
-        urls.push(CoreTextUtils.concatenatePaths(libUrl, 'moodle/js/h5p_overrides.js'));
+        urls.push(CoreText.concatenatePaths(libUrl, 'moodle/js/h5p_overrides.js'));
 
         return urls;
     }
@@ -456,7 +457,7 @@ export class CoreH5PCore {
 
             // Add URL prefix if not external.
             if (asset.path.indexOf('://') == -1 && assetsFolderPath) {
-                url = CoreTextUtils.concatenatePaths(assetsFolderPath, url);
+                url = CoreText.concatenatePaths(assetsFolderPath, url);
             }
 
             // Add version if set.
diff --git a/src/core/features/h5p/classes/file-storage.ts b/src/core/features/h5p/classes/file-storage.ts
index 1c811674b..5bbab236d 100644
--- a/src/core/features/h5p/classes/file-storage.ts
+++ b/src/core/features/h5p/classes/file-storage.ts
@@ -28,6 +28,7 @@ import {
 } from './core';
 import { CONTENTS_LIBRARIES_TABLE_NAME, CONTENT_TABLE_NAME, CoreH5PLibraryCachedAssetsDBRecord } from '../services/database/h5p';
 import { CoreH5PLibraryBeingSaved } from './storage';
+import { CoreText } from '@singletons/text';
 
 /**
  * Equivalent to Moodle's implementation of H5PFileStorage.
@@ -60,7 +61,7 @@ export class CoreH5PFileStorage {
 
             // Create new file for cached assets.
             const fileName = key + '.' + (type == 'scripts' ? 'js' : 'css');
-            const path = CoreTextUtils.concatenatePaths(cachedAssetsPath, fileName);
+            const path = CoreText.concatenatePaths(cachedAssetsPath, fileName);
 
             // Store concatenated content.
             const content = await this.concatenateFiles(assets, type);
@@ -70,7 +71,7 @@ export class CoreH5PFileStorage {
             // Now update the files data.
             files[type] = [
                 {
-                    path: CoreTextUtils.concatenatePaths(CoreH5PFileStorage.CACHED_ASSETS_FOLDER_NAME, fileName),
+                    path: CoreText.concatenatePaths(CoreH5PFileStorage.CACHED_ASSETS_FOLDER_NAME, fileName),
                     version: '',
                 },
             ];
@@ -142,7 +143,7 @@ export class CoreH5PFileStorage {
 
                     fileContent = fileContent.replace(
                         new RegExp(CoreTextUtils.escapeForRegex(match), 'g'),
-                        'url("' + CoreTextUtils.concatenatePaths(basePath, url) + '")',
+                        'url("' + CoreText.concatenatePaths(basePath, url) + '")',
                     );
                 });
             }
@@ -170,7 +171,7 @@ export class CoreH5PFileStorage {
             const cachedAssetsFolder = this.getCachedAssetsFolderPath(entry.foldername, site.getId());
 
             ['js', 'css'].forEach((type) => {
-                const path = CoreTextUtils.concatenatePaths(cachedAssetsFolder, entry.hash + '.' + type);
+                const path = CoreText.concatenatePaths(cachedAssetsFolder, entry.hash + '.' + type);
 
                 promises.push(CoreFile.removeFile(path));
             });
@@ -282,7 +283,7 @@ export class CoreH5PFileStorage {
     protected async getCachedAsset(key: string, extension: string): Promise<CoreH5PDependencyAsset[] | undefined> {
 
         try {
-            const path = CoreTextUtils.concatenatePaths(CoreH5PFileStorage.CACHED_ASSETS_FOLDER_NAME, key + extension);
+            const path = CoreText.concatenatePaths(CoreH5PFileStorage.CACHED_ASSETS_FOLDER_NAME, key + extension);
 
             const size = await CoreFile.getFileSize(path);
 
@@ -307,7 +308,7 @@ export class CoreH5PFileStorage {
      * @return Path.
      */
     getCachedAssetsFolderPath(folderName: string, siteId: string): string {
-        return CoreTextUtils.concatenatePaths(
+        return CoreText.concatenatePaths(
             this.getContentFolderPath(folderName, siteId),
             CoreH5PFileStorage.CACHED_ASSETS_FOLDER_NAME,
         );
@@ -336,7 +337,7 @@ export class CoreH5PFileStorage {
      * @return Folder path.
      */
     getContentFolderPath(folderName: string, siteId: string): string {
-        return CoreTextUtils.concatenatePaths(
+        return CoreText.concatenatePaths(
             this.getExternalH5PFolderPath(siteId),
             'packages/' + folderName + '/content',
         );
@@ -367,7 +368,7 @@ export class CoreH5PFileStorage {
      * @return Folder path.
      */
     getContentIndexPath(folderName: string, siteId: string): string {
-        return CoreTextUtils.concatenatePaths(this.getContentFolderPath(folderName, siteId), 'index.html');
+        return CoreText.concatenatePaths(this.getContentFolderPath(folderName, siteId), 'index.html');
     }
 
     /**
@@ -376,7 +377,7 @@ export class CoreH5PFileStorage {
      * @return Folder path.
      */
     getCoreH5PPath(): string {
-        return CoreTextUtils.concatenatePaths(CoreFile.getWWWPath(), '/assets/lib/h5p/');
+        return CoreText.concatenatePaths(CoreFile.getWWWPath(), '/assets/lib/h5p/');
     }
 
     /**
@@ -396,7 +397,7 @@ export class CoreH5PFileStorage {
      * @return Folder path.
      */
     getExternalH5PFolderPath(siteId: string): string {
-        return CoreTextUtils.concatenatePaths(CoreFile.getSiteFolder(siteId), 'h5p');
+        return CoreText.concatenatePaths(CoreFile.getSiteFolder(siteId), 'h5p');
     }
 
     /**
@@ -406,7 +407,7 @@ export class CoreH5PFileStorage {
      * @return Folder path.
      */
     getLibrariesFolderPath(siteId: string): string {
-        return CoreTextUtils.concatenatePaths(this.getExternalH5PFolderPath(siteId), 'libraries');
+        return CoreText.concatenatePaths(this.getExternalH5PFolderPath(siteId), 'libraries');
     }
 
     /**
@@ -426,7 +427,7 @@ export class CoreH5PFileStorage {
             folderName = CoreH5PCore.libraryToString(libraryData, true);
         }
 
-        return CoreTextUtils.concatenatePaths(this.getLibrariesFolderPath(siteId), folderName);
+        return CoreText.concatenatePaths(this.getLibrariesFolderPath(siteId), folderName);
     }
 
     /**
diff --git a/src/core/features/h5p/classes/helper.ts b/src/core/features/h5p/classes/helper.ts
index 7e685b06b..d418fa615 100644
--- a/src/core/features/h5p/classes/helper.ts
+++ b/src/core/features/h5p/classes/helper.ts
@@ -17,11 +17,11 @@ import { FileEntry } from '@ionic-native/file/ngx';
 import { CoreFile, CoreFileProvider } from '@services/file';
 import { CoreSites } from '@services/sites';
 import { CoreMimetypeUtils } from '@services/utils/mimetype';
-import { CoreTextUtils } from '@services/utils/text';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreH5P } from '../services/h5p';
 import { CoreH5PCore, CoreH5PDisplayOptions } from './core';
 import { CoreError } from '@classes/errors/error';
+import { CoreText } from '@singletons/text';
 
 /**
  * Equivalent to Moodle's H5P helper class.
@@ -131,13 +131,13 @@ export class CoreH5PHelper {
         return {
             baseUrl: CoreFile.getWWWPath(),
             url: CoreFile.convertFileSrc(
-                CoreTextUtils.concatenatePaths(
+                CoreText.concatenatePaths(
                     basePath,
                     CoreH5P.h5pCore.h5pFS.getExternalH5PFolderPath(site.getId()),
                 ),
             ),
             urlLibraries: CoreFile.convertFileSrc(
-                CoreTextUtils.concatenatePaths(
+                CoreText.concatenatePaths(
                     basePath,
                     CoreH5P.h5pCore.h5pFS.getLibrariesFolderPath(site.getId()),
                 ),
@@ -155,7 +155,7 @@ export class CoreH5PHelper {
             crossorigin: null,
             libraryConfig: null,
             pluginCacheBuster: '',
-            libraryUrl: CoreTextUtils.concatenatePaths(CoreH5P.h5pCore.h5pFS.getCoreH5PPath(), 'js'),
+            libraryUrl: CoreText.concatenatePaths(CoreH5P.h5pCore.h5pFS.getCoreH5PPath(), 'js'),
         };
     }
 
@@ -197,7 +197,7 @@ export class CoreH5PHelper {
     ): Promise<void> {
 
         const folderName = CoreMimetypeUtils.removeExtension(file.name);
-        const destFolder = CoreTextUtils.concatenatePaths(CoreFileProvider.TMPFOLDER, 'h5p/' + folderName);
+        const destFolder = CoreText.concatenatePaths(CoreFileProvider.TMPFOLDER, 'h5p/' + folderName);
 
         // Unzip the file.
         await CoreFile.unzipFile(file.toURL(), destFolder, onProgress);
diff --git a/src/core/features/h5p/classes/player.ts b/src/core/features/h5p/classes/player.ts
index 73da742fe..b42a61ebc 100644
--- a/src/core/features/h5p/classes/player.ts
+++ b/src/core/features/h5p/classes/player.ts
@@ -14,7 +14,6 @@
 
 import { CoreFile } from '@services/file';
 import { CoreSites } from '@services/sites';
-import { CoreTextUtils } from '@services/utils/text';
 import { CoreUrlUtils } from '@services/utils/url';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreXAPI } from '@features/xapi/services/xapi';
@@ -22,6 +21,7 @@ import { CoreH5P } from '../services/h5p';
 import { CoreH5PCore, CoreH5PDisplayOptions, CoreH5PContentData, CoreH5PDependenciesFiles } from './core';
 import { CoreH5PCoreSettings, CoreH5PHelper } from './helper';
 import { CoreH5PStorage } from './storage';
+import { CoreText } from '@singletons/text';
 
 /**
  * Equivalent to Moodle's H5P player class.
@@ -51,7 +51,7 @@ export class CoreH5PPlayer {
             params.component = component;
         }
 
-        return CoreUrlUtils.addParamsToUrl(CoreTextUtils.concatenatePaths(siteUrl, '/h5p/embed.php'), params);
+        return CoreUrlUtils.addParamsToUrl(CoreText.concatenatePaths(siteUrl, '/h5p/embed.php'), params);
     }
 
     /**
@@ -78,7 +78,7 @@ export class CoreH5PPlayer {
         const contentId = this.getContentId(id);
         const basePath = CoreFile.getBasePathInstant();
         const contentUrl = CoreFile.convertFileSrc(
-            CoreTextUtils.concatenatePaths(
+            CoreText.concatenatePaths(
                 basePath,
                 this.h5pCore.h5pFS.getContentFolderPath(content.folderName, site.getId()),
             ),
@@ -122,7 +122,7 @@ export class CoreH5PPlayer {
                 JSON.stringify(result.settings).replace(/\//g, '\\/') + '</script>';
 
         // Add our own script to handle the params.
-        html += '<script type="text/javascript" src="' + CoreTextUtils.concatenatePaths(
+        html += '<script type="text/javascript" src="' + CoreText.concatenatePaths(
             this.h5pCore.h5pFS.getCoreH5PPath(),
             'moodle/js/params.js',
         ) + '"></script>';
@@ -132,7 +132,7 @@ export class CoreH5PPlayer {
         // Include the required JS at the beginning of the body, like Moodle web does.
         // Load the embed.js to allow communication with the parent window.
         html += '<script type="text/javascript" src="' +
-                CoreTextUtils.concatenatePaths(this.h5pCore.h5pFS.getCoreH5PPath(), 'moodle/js/embed.js') + '"></script>';
+                CoreText.concatenatePaths(this.h5pCore.h5pFS.getCoreH5PPath(), 'moodle/js/embed.js') + '"></script>';
 
         result.jsRequires.forEach((jsUrl) => {
             html += '<script type="text/javascript" src="' + jsUrl + '"></script>';
@@ -364,7 +364,7 @@ export class CoreH5PPlayer {
      * @return The embed URL.
      */
     protected getEmbedUrl(siteUrl: string, h5pUrl: string): string {
-        return CoreTextUtils.concatenatePaths(siteUrl, '/h5p/embed.php') + '?url=' + h5pUrl;
+        return CoreText.concatenatePaths(siteUrl, '/h5p/embed.php') + '?url=' + h5pUrl;
     }
 
     /**
@@ -382,7 +382,7 @@ export class CoreH5PPlayer {
      * @return URL.
      */
     getResizerScriptUrl(): string {
-        return CoreTextUtils.concatenatePaths(this.h5pCore.h5pFS.getCoreH5PPath(), 'js/h5p-resizer.js');
+        return CoreText.concatenatePaths(this.h5pCore.h5pFS.getCoreH5PPath(), 'js/h5p-resizer.js');
     }
 
     /**
diff --git a/src/core/features/h5p/classes/storage.ts b/src/core/features/h5p/classes/storage.ts
index 984dd022d..a94453190 100644
--- a/src/core/features/h5p/classes/storage.ts
+++ b/src/core/features/h5p/classes/storage.ts
@@ -14,8 +14,8 @@
 
 import { CoreFile, CoreFileProvider } from '@services/file';
 import { CoreSites } from '@services/sites';
-import { CoreTextUtils } from '@services/utils/text';
 import { CoreUtils } from '@services/utils/utils';
+import { CoreText } from '@singletons/text';
 import { CoreH5PCore, CoreH5PLibraryBasicData } from './core';
 import { CoreH5PFramework } from './framework';
 import { CoreH5PMetadata } from './metadata';
@@ -199,8 +199,8 @@ export class CoreH5PStorage {
             await this.h5pCore.saveContent(content, folderName, fileUrl, siteId);
 
             // Save the content files in their right place in FS.
-            const destFolder = CoreTextUtils.concatenatePaths(CoreFileProvider.TMPFOLDER, 'h5p/' + folderName);
-            const contentPath = CoreTextUtils.concatenatePaths(destFolder, 'content');
+            const destFolder = CoreText.concatenatePaths(CoreFileProvider.TMPFOLDER, 'h5p/' + folderName);
+            const contentPath = CoreText.concatenatePaths(destFolder, 'content');
 
             try {
                 await this.h5pCore.h5pFS.saveContent(contentPath, folderName, siteId);
diff --git a/src/core/features/h5p/classes/validator.ts b/src/core/features/h5p/classes/validator.ts
index b95399f4b..edc952aa2 100644
--- a/src/core/features/h5p/classes/validator.ts
+++ b/src/core/features/h5p/classes/validator.ts
@@ -15,8 +15,8 @@
 import { CoreError } from '@classes/errors/error';
 import { FileEntry, DirectoryEntry } from '@ionic-native/file/ngx';
 import { CoreFile, CoreFileFormat } from '@services/file';
-import { CoreTextUtils } from '@services/utils/text';
 import { Translate } from '@singletons';
+import { CoreText } from '@singletons/text';
 import { CoreH5PSemantics } from './content-validator';
 import { CoreH5PCore, CoreH5PLibraryBasicData, CoreH5PMissingLibrary } from './core';
 import { CoreH5PFramework } from './framework';
@@ -126,7 +126,7 @@ export class CoreH5PValidator {
                 return;
             }
 
-            const libDirPath = CoreTextUtils.concatenatePaths(packagePath, entry.name);
+            const libDirPath = CoreText.concatenatePaths(packagePath, entry.name);
 
             const libraryData = await this.getLibraryData(<DirectoryEntry> entry, libDirPath);
 
@@ -144,7 +144,7 @@ export class CoreH5PValidator {
      * @return Promise resolved with boolean: whether the library has an icon file.
      */
     protected async libraryHasIcon(libPath: string): Promise<boolean> {
-        const path = CoreTextUtils.concatenatePaths(libPath, 'icon.svg');
+        const path = CoreText.concatenatePaths(libPath, 'icon.svg');
 
         try {
             // Check if the file exists.
@@ -219,7 +219,7 @@ export class CoreH5PValidator {
      * @return Promise resolved with the parsed file contents.
      */
     protected readH5PContentJsonFile(packagePath: string): Promise<unknown> {
-        const path = CoreTextUtils.concatenatePaths(packagePath, 'content/content.json');
+        const path = CoreText.concatenatePaths(packagePath, 'content/content.json');
 
         return CoreFile.readFile(path, CoreFileFormat.FORMATJSON);
     }
@@ -231,7 +231,7 @@ export class CoreH5PValidator {
      * @return Promise resolved with the parsed file contents.
      */
     protected readH5PJsonFile(packagePath: string): Promise<CoreH5PMainJSONData> {
-        const path = CoreTextUtils.concatenatePaths(packagePath, 'h5p.json');
+        const path = CoreText.concatenatePaths(packagePath, 'h5p.json');
 
         return CoreFile.readFile(path, CoreFileFormat.FORMATJSON);
     }
@@ -243,7 +243,7 @@ export class CoreH5PValidator {
      * @return Promise resolved with the parsed file contents.
      */
     protected readLibraryJsonFile(libPath: string): Promise<CoreH5PLibraryMainJsonData> {
-        const path = CoreTextUtils.concatenatePaths(libPath, 'library.json');
+        const path = CoreText.concatenatePaths(libPath, 'library.json');
 
         return CoreFile.readFile<CoreH5PLibraryMainJsonData>(path, CoreFileFormat.FORMATJSON);
     }
@@ -256,14 +256,14 @@ export class CoreH5PValidator {
      */
     protected async readLibraryLanguageFiles(libPath: string): Promise<CoreH5PLibraryLangsJsonData | undefined> {
         try {
-            const path = CoreTextUtils.concatenatePaths(libPath, 'language');
+            const path = CoreText.concatenatePaths(libPath, 'language');
             const langIndex: CoreH5PLibraryLangsJsonData = {};
 
             // Read all the files in the language directory.
             const entries = await CoreFile.getDirectoryContents(path);
 
             await Promise.all(entries.map(async (entry) => {
-                const langFilePath = CoreTextUtils.concatenatePaths(path, entry.name);
+                const langFilePath = CoreText.concatenatePaths(path, entry.name);
 
                 try {
                     const langFileData = await CoreFile.readFile<CoreH5PLibraryLangJsonData>(
@@ -293,7 +293,7 @@ export class CoreH5PValidator {
      */
     protected async readLibrarySemanticsFile(libPath: string): Promise<CoreH5PSemantics[] | undefined> {
         try {
-            const path = CoreTextUtils.concatenatePaths(libPath, 'semantics.json');
+            const path = CoreText.concatenatePaths(libPath, 'semantics.json');
 
             return await CoreFile.readFile<CoreH5PSemantics[]>(path, CoreFileFormat.FORMATJSON);
         } catch (error) {
diff --git a/src/core/features/h5p/services/h5p.ts b/src/core/features/h5p/services/h5p.ts
index 92bf18bc8..fc4693645 100644
--- a/src/core/features/h5p/services/h5p.ts
+++ b/src/core/features/h5p/services/h5p.ts
@@ -16,7 +16,6 @@ import { Injectable } from '@angular/core';
 
 import { CoreSites } from '@services/sites';
 import { CoreWSExternalWarning, CoreWSExternalFile, CoreWSFile } from '@services/ws';
-import { CoreTextUtils } from '@services/utils/text';
 import { CoreUrlUtils } from '@services/utils/url';
 import { CoreQueueRunner } from '@classes/queue-runner';
 import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
@@ -29,6 +28,7 @@ import { CoreH5PValidator } from '../classes/validator';
 
 import { makeSingleton } from '@singletons';
 import { CoreError } from '@classes/errors/error';
+import { CoreText } from '@singletons/text';
 
 /**
  * Service to provide H5P functionalities.
@@ -207,7 +207,7 @@ export class CoreH5PProvider {
      * @return Treated url.
      */
     treatH5PUrl(url: string, siteUrl: string): string {
-        if (url.indexOf(CoreTextUtils.concatenatePaths(siteUrl, '/webservice/pluginfile.php')) === 0) {
+        if (url.indexOf(CoreText.concatenatePaths(siteUrl, '/webservice/pluginfile.php')) === 0) {
             url = url.replace('/webservice/pluginfile', '/pluginfile');
         }
 
diff --git a/src/core/features/login/pages/email-signup/email-signup.ts b/src/core/features/login/pages/email-signup/email-signup.ts
index 794e81e1d..f74f28463 100644
--- a/src/core/features/login/pages/email-signup/email-signup.ts
+++ b/src/core/features/login/pages/email-signup/email-signup.ts
@@ -34,6 +34,7 @@ import {
 import { CoreNavigator } from '@services/navigator';
 import { CoreForms } from '@singletons/form';
 import { CoreRecaptchaComponent } from '@components/recaptcha/recaptcha';
+import { CoreText } from '@singletons/text';
 
 /**
  * Page to signup using email.
@@ -161,7 +162,7 @@ export class CoreLoginEmailSignupPage implements OnInit {
         try {
             // Get site config.
             this.siteConfig = await CoreSites.getSitePublicConfig(this.siteUrl);
-            this.signupUrl = CoreTextUtils.concatenatePaths(this.siteConfig.httpswwwroot, 'login/signup.php');
+            this.signupUrl = CoreText.concatenatePaths(this.siteConfig.httpswwwroot, 'login/signup.php');
 
             if (this.treatSiteConfig()) {
                 // Check content verification.
@@ -385,7 +386,7 @@ export class CoreLoginEmailSignupPage implements OnInit {
      */
     showContactOnSite(): void {
         CoreUtils.openInBrowser(
-            CoreTextUtils.concatenatePaths(this.siteUrl, '/login/verify_age_location.php'),
+            CoreText.concatenatePaths(this.siteUrl, '/login/verify_age_location.php'),
             { showBrowserWarning: false },
         );
     }
diff --git a/src/core/features/login/services/login-helper.ts b/src/core/features/login/services/login-helper.ts
index 7416cf7c4..fb14d6eea 100644
--- a/src/core/features/login/services/login-helper.ts
+++ b/src/core/features/login/services/login-helper.ts
@@ -36,6 +36,7 @@ import { CoreNavigator, CoreRedirectPayload } from '@services/navigator';
 import { CoreCanceledError } from '@classes/errors/cancelederror';
 import { CoreCustomURLSchemes } from '@services/urlschemes';
 import { CorePushNotifications } from '@features/pushnotifications/services/pushnotifications';
+import { CoreText } from '@singletons/text';
 
 /**
  * Helper provider that provides some common features regarding authentication.
@@ -385,8 +386,8 @@ export class CoreLoginHelperProvider {
         }
 
         const validProviders: CoreSiteIdentityProvider[] = [];
-        const httpUrl = CoreTextUtils.concatenatePaths(siteConfig.wwwroot, 'auth/oauth2/');
-        const httpsUrl = CoreTextUtils.concatenatePaths(siteConfig.httpswwwroot, 'auth/oauth2/');
+        const httpUrl = CoreText.concatenatePaths(siteConfig.wwwroot, 'auth/oauth2/');
+        const httpsUrl = CoreText.concatenatePaths(siteConfig.httpswwwroot, 'auth/oauth2/');
 
         if (siteConfig.identityproviders && siteConfig.identityproviders.length) {
             siteConfig.identityproviders.forEach((provider) => {
diff --git a/src/core/features/question/services/question.ts b/src/core/features/question/services/question.ts
index 7514400fe..37914ca4b 100644
--- a/src/core/features/question/services/question.ts
+++ b/src/core/features/question/services/question.ts
@@ -21,6 +21,7 @@ import { CoreTimeUtils } from '@services/utils/time';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreWSExternalFile } from '@services/ws';
 import { makeSingleton } from '@singletons';
+import { CoreText } from '@singletons/text';
 import {
     CoreQuestionAnswerDBRecord,
     CoreQuestionDBRecord,
@@ -331,7 +332,7 @@ export class CoreQuestionProvider {
         const siteFolderPath = CoreFile.getSiteFolder(siteId);
         const questionFolderPath = 'offlinequestion/' + type + '/' + component + '/' + componentId;
 
-        return CoreTextUtils.concatenatePaths(siteFolderPath, questionFolderPath);
+        return CoreText.concatenatePaths(siteFolderPath, questionFolderPath);
     }
 
     /**
diff --git a/src/core/features/sharedfiles/components/list/list.ts b/src/core/features/sharedfiles/components/list/list.ts
index 936c2b71c..f56e5318f 100644
--- a/src/core/features/sharedfiles/components/list/list.ts
+++ b/src/core/features/sharedfiles/components/list/list.ts
@@ -20,8 +20,8 @@ import { Md5 } from 'ts-md5';
 import { CoreSharedFiles } from '@features/sharedfiles/services/sharedfiles';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
-import { CoreTextUtils } from '@services/utils/text';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
+import { CoreText } from '@singletons/text';
 
 /**
  * Component to display the list of shared files, either as a modal or inside a page.
@@ -113,7 +113,7 @@ export class CoreSharedFilesListComponent implements OnInit, OnDestroy {
      * @param folder The folder to open.
      */
     openFolder(folder: DirectoryEntry): void {
-        const path = CoreTextUtils.concatenatePaths(this.path || '', folder.name);
+        const path = CoreText.concatenatePaths(this.path || '', folder.name);
 
         if (this.isModal) {
             this.path = path;
diff --git a/src/core/features/sharedfiles/services/sharedfiles.ts b/src/core/features/sharedfiles/services/sharedfiles.ts
index 8384b6de2..599299576 100644
--- a/src/core/features/sharedfiles/services/sharedfiles.ts
+++ b/src/core/features/sharedfiles/services/sharedfiles.ts
@@ -21,12 +21,12 @@ import { CoreLogger } from '@singletons/logger';
 import { CoreApp } from '@services/app';
 import { CoreFile } from '@services/file';
 import { CoreUtils } from '@services/utils/utils';
-import { CoreTextUtils } from '@services/utils/text';
 import { CoreMimetypeUtils } from '@services/utils/mimetype';
 import { CoreSites } from '@services/sites';
 import { CoreEvents } from '@singletons/events';
 import { makeSingleton } from '@singletons';
 import { APP_SCHEMA, CoreSharedFilesDBRecord, SHARED_FILES_TABLE_NAME } from './database/sharedfiles';
+import { CoreText } from '@singletons/text';
 
 /**
  * Service to share files with the app.
@@ -157,7 +157,7 @@ export class CoreSharedFilesProvider {
     async getSiteSharedFiles(siteId?: string, path?: string, mimetypes?: string[]): Promise<(FileEntry | DirectoryEntry)[]> {
         let pathToGet = this.getSiteSharedFilesDirPath(siteId);
         if (path) {
-            pathToGet = CoreTextUtils.concatenatePaths(pathToGet, path);
+            pathToGet = CoreText.concatenatePaths(pathToGet, path);
         }
 
         try {
@@ -240,7 +240,7 @@ export class CoreSharedFilesProvider {
         newName = newName || entry.name;
 
         const sharedFilesFolder = this.getSiteSharedFilesDirPath(siteId);
-        const newPath = CoreTextUtils.concatenatePaths(sharedFilesFolder, newName);
+        const newPath = CoreText.concatenatePaths(sharedFilesFolder, newName);
 
         // Create dir if it doesn't exist already.
         await CoreFile.createDir(sharedFilesFolder);
diff --git a/src/core/features/siteplugins/services/siteplugins-helper.ts b/src/core/features/siteplugins/services/siteplugins-helper.ts
index 5de98ba3a..c036daacf 100644
--- a/src/core/features/siteplugins/services/siteplugins-helper.ts
+++ b/src/core/features/siteplugins/services/siteplugins-helper.ts
@@ -38,7 +38,6 @@ import { CoreFilepool } from '@services/filepool';
 import { CoreLang } from '@services/lang';
 import { CoreSites } from '@services/sites';
 import { CoreTextUtils } from '@services/utils/text';
-import { CoreUrlUtils } from '@services/utils/url';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreWS } from '@services/ws';
 import { CoreEvents } from '@singletons/events';
@@ -85,6 +84,7 @@ import { CoreContentLinksModuleIndexHandler } from '@features/contentlinks/class
 import { CoreContentLinksDelegate } from '@features/contentlinks/services/contentlinks-delegate';
 import { CoreContentLinksModuleListHandler } from '@features/contentlinks/classes/module-list-handler';
 import { CoreObject } from '@singletons/object';
+import { CoreUrl } from '@singletons/url';
 
 const HANDLER_DISABLED = 'core_site_plugins_helper_handler_disabled';
 
@@ -164,11 +164,8 @@ export class CoreSitePluginsHelperProvider {
     ): Promise<string> {
         const site = await CoreSites.getSite(siteId);
 
-        // Get the absolute URL. If it's a relative URL, add the site URL to it.
-        let url = handlerSchema.styles?.url;
-        if (url && !CoreUrlUtils.isAbsoluteURL(url)) {
-            url = CoreTextUtils.concatenatePaths(site.getURL(), url);
-        }
+        // Make sure it's an absolute URL.
+        let url = handlerSchema.styles?.url ? CoreUrl.toAbsoluteURL(site.getURL(), handlerSchema.styles.url) : undefined;
 
         if (url && handlerSchema.styles?.version) {
             // Add the version to the URL to prevent getting a cached file.
diff --git a/src/core/features/xapi/services/xapi.ts b/src/core/features/xapi/services/xapi.ts
index 5e53fa214..8f6a6e75f 100644
--- a/src/core/features/xapi/services/xapi.ts
+++ b/src/core/features/xapi/services/xapi.ts
@@ -16,11 +16,11 @@ import { Injectable } from '@angular/core';
 
 import { CoreApp } from '@services/app';
 import { CoreSites } from '@services/sites';
-import { CoreTextUtils } from '@services/utils/text';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreSite } from '@classes/site';
 import { CoreXAPIOffline, CoreXAPIOfflineSaveStatementsOptions } from './offline';
 import { makeSingleton } from '@singletons';
+import { CoreText } from '@singletons/text';
 
 /**
  * Service to provide XAPI functionalities.
@@ -65,7 +65,7 @@ export class CoreXAPIProvider {
     async getUrl(contextId: number, type: string, siteId?: string): Promise<string> {
         const site = await CoreSites.getSite(siteId);
 
-        return CoreTextUtils.concatenatePaths(site.getURL(), `xapi/${type}/${contextId}`);
+        return CoreText.concatenatePaths(site.getURL(), `xapi/${type}/${contextId}`);
     }
 
     /**
diff --git a/src/core/services/file.ts b/src/core/services/file.ts
index 21fdc08bd..ce592709e 100644
--- a/src/core/services/file.ts
+++ b/src/core/services/file.ts
@@ -26,6 +26,7 @@ import { CoreError } from '@classes/errors/error';
 import { CoreLogger } from '@singletons/logger';
 import { makeSingleton, File, Zip, Platform, WebView } from '@singletons';
 import { CoreFileEntry } from '@services/file-helper';
+import { CoreText } from '@singletons/text';
 
 /**
  * Progress event used when writing a file data into a file.
@@ -916,7 +917,7 @@ export class CoreFileProvider {
         if (path.indexOf(this.basePath) > -1) {
             return path;
         } else {
-            return CoreTextUtils.concatenatePaths(this.basePath, path);
+            return CoreText.concatenatePaths(this.basePath, path);
         }
     }
 
@@ -1245,7 +1246,7 @@ export class CoreFileProvider {
      */
     getWWWAbsolutePath(): string {
         if (window.cordova && cordova.file && cordova.file.applicationDirectory) {
-            return CoreTextUtils.concatenatePaths(cordova.file.applicationDirectory, 'www');
+            return CoreText.concatenatePaths(cordova.file.applicationDirectory, 'www');
         }
 
         // Cannot use Cordova to get it, use the WebView URL.
diff --git a/src/core/services/filepool.ts b/src/core/services/filepool.ts
index 55675f65f..3378566b6 100644
--- a/src/core/services/filepool.ts
+++ b/src/core/services/filepool.ts
@@ -52,6 +52,7 @@ import { CoreDatabaseTable } from '@classes/database/database-table';
 import { CoreDatabaseCachingStrategy, CoreDatabaseTableProxy } from '@classes/database/database-table-proxy';
 import { lazyMap, LazyMap } from '../utils/lazy-map';
 import { asyncInstance, AsyncInstance } from '../utils/async-instance';
+import { CoreText } from '@singletons/text';
 
 /*
  * Factory for handling downloading files and retrieve downloaded files.
@@ -811,7 +812,7 @@ export class CoreFilepoolProvider {
                 if (file.filepath && file.filepath !== '/') {
                     path = file.filepath.substring(1) + path;
                 }
-                path = CoreTextUtils.concatenatePaths(dirPath, path);
+                path = CoreText.concatenatePaths(dirPath, path);
             }
 
             if (prefetch) {
@@ -905,7 +906,7 @@ export class CoreFilepoolProvider {
                     if (file.filepath && file.filepath !== '/') {
                         path = file.filepath.substring(1) + path;
                     }
-                    path = CoreTextUtils.concatenatePaths(dirPath, path);
+                    path = CoreText.concatenatePaths(dirPath, path);
                 }
 
                 if (prefetch) {
@@ -2948,7 +2949,7 @@ export class CoreFilepoolProvider {
      * and store the result in the CSS file.
      *
      * @param siteId Site ID.
-     * @param fileUrl CSS file URL. If a local path is supplied the app will assume it's the path where to write the file.
+     * @param fileUrl CSS file URL. It must be the online URL, not a local path.
      * @param cssCode CSS code.
      * @param component The component to link the file to.
      * @param componentId An ID to use in conjunction with the component.
@@ -2967,19 +2968,24 @@ export class CoreFilepoolProvider {
         let updated = false;
 
         // Get the path of the CSS file. If it's a local file, assume it's the path where to write the file.
-        const filePath = CoreUrlUtils.isLocalFileUrl(fileUrl) ?
-            fileUrl :
-            await this.getFilePathByUrl(siteId, fileUrl);
+        const filePath = await this.getFilePathByUrl(siteId, fileUrl);
 
         // Download all files in the CSS.
         await Promise.all(urls.map(async (url) => {
+            if (!url.trim()) {
+                return; // Ignore empty URLs.
+            }
+
+            const absoluteUrl = CoreUrl.toAbsoluteURL(fileUrl, url);
+
             try {
-                let fileUrl = url;
-                if (!CoreUrlUtils.isLocalFileUrl(url)) {
+                let fileUrl = absoluteUrl;
+
+                if (!CoreUrlUtils.isLocalFileUrl(absoluteUrl)) {
                     // Not a local file, download it.
                     fileUrl = await this.downloadUrl(
                         siteId,
-                        url,
+                        absoluteUrl,
                         false,
                         component,
                         componentId,
@@ -2994,12 +3000,18 @@ export class CoreFilepoolProvider {
                 // Convert the URL so it works in mobile devices.
                 fileUrl = CoreFile.convertFileSrc(fileUrl);
 
-                if (fileUrl != url) {
+                if (fileUrl !== url) {
                     cssCode = cssCode.replace(new RegExp(CoreTextUtils.escapeForRegex(url), 'g'), fileUrl);
                     updated = true;
                 }
             } catch (error) {
                 this.logger.warn('Error treating file ', url, error);
+
+                // If the URL is relative, store the absolute URL.
+                if (absoluteUrl !== url) {
+                    cssCode = cssCode.replace(new RegExp(CoreTextUtils.escapeForRegex(url), 'g'), absoluteUrl);
+                    updated = true;
+                }
             }
         }));
 
diff --git a/src/core/services/urlschemes.ts b/src/core/services/urlschemes.ts
index 9ae998d07..131d2d41c 100644
--- a/src/core/services/urlschemes.ts
+++ b/src/core/services/urlschemes.ts
@@ -21,6 +21,7 @@ import { CoreContentLinksHelper } from '@features/contentlinks/services/contentl
 import { CoreLoginHelper, CoreLoginSSOData } from '@features/login/services/login-helper';
 import { ApplicationInit, makeSingleton, Translate } from '@singletons';
 import { CoreLogger } from '@singletons/logger';
+import { CoreText } from '@singletons/text';
 import { CoreConstants } from '../constants';
 import { CoreApp } from './app';
 import { CoreNavigator, CoreRedirectPayload } from './navigator';
@@ -163,7 +164,7 @@ export class CoreCustomURLSchemesProvider {
 
             if (data.redirect && !data.redirect.match(/^https?:\/\//)) {
                 // Redirect is a relative URL. Append the site URL.
-                data.redirect = CoreTextUtils.concatenatePaths(data.siteUrl, data.redirect);
+                data.redirect = CoreText.concatenatePaths(data.siteUrl, data.redirect);
             }
 
             let siteIds = [siteId];
diff --git a/src/core/services/utils/iframe.ts b/src/core/services/utils/iframe.ts
index 2e93414c7..31c32e7f2 100644
--- a/src/core/services/utils/iframe.ts
+++ b/src/core/services/utils/iframe.ts
@@ -21,7 +21,6 @@ import { CoreFile } from '@services/file';
 import { CoreFileHelper } from '@services/file-helper';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
-import { CoreTextUtils } from '@services/utils/text';
 import { CoreUrlUtils } from '@services/utils/url';
 import { CoreUtils, PromiseDefer } from '@services/utils/utils';
 
@@ -30,6 +29,7 @@ import { CoreLogger } from '@singletons/logger';
 import { CoreUrl } from '@singletons/url';
 import { CoreWindow } from '@singletons/window';
 import { CoreContentLinksHelper } from '@features/contentlinks/services/contentlinks-helper';
+import { CoreText } from '@singletons/text';
 
 /**
  * Possible types of frame elements.
@@ -415,7 +415,7 @@ export class CoreIframeUtilsProvider {
             if (src) {
                 const dirAndFile = CoreFile.getFileAndDirectoryFromPath(src);
                 if (dirAndFile.directory) {
-                    url = CoreTextUtils.concatenatePaths(dirAndFile.directory, url);
+                    url = CoreText.concatenatePaths(dirAndFile.directory, url);
                 } else {
                     this.logger.warn('Cannot get iframe dir path to open relative url', url, element);
 
@@ -555,7 +555,7 @@ export class CoreIframeUtilsProvider {
      */
     injectiOSScripts(userScriptWindow: WKUserScriptWindow): void {
         const wwwPath = CoreFile.getWWWAbsolutePath();
-        const linksPath = CoreTextUtils.concatenatePaths(wwwPath, 'assets/js/iframe-treat-links.js');
+        const linksPath = CoreText.concatenatePaths(wwwPath, 'assets/js/iframe-treat-links.js');
 
         userScriptWindow.WKUserScript?.addScript({ id: 'CoreIframeUtilsLinksScript', file: linksPath });
 
diff --git a/src/core/services/utils/text.ts b/src/core/services/utils/text.ts
index 9a091db74..b54f6d575 100644
--- a/src/core/services/utils/text.ts
+++ b/src/core/services/utils/text.ts
@@ -269,24 +269,10 @@ export class CoreTextUtilsProvider {
      * @param leftPath Left path.
      * @param rightPath Right path.
      * @return Concatenated path.
+     * @deprecated since 4.0. Use CoreText instead.
      */
     concatenatePaths(leftPath: string, rightPath: string): string {
-        if (!leftPath) {
-            return rightPath;
-        } else if (!rightPath) {
-            return leftPath;
-        }
-
-        const lastCharLeft = leftPath.slice(-1);
-        const firstCharRight = rightPath.charAt(0);
-
-        if (lastCharLeft === '/' && firstCharRight === '/') {
-            return leftPath + rightPath.substring(1);
-        } else if (lastCharLeft !== '/' && firstCharRight !== '/') {
-            return leftPath + '/' + rightPath;
-        } else {
-            return leftPath + rightPath;
-        }
+        return CoreText.concatenatePaths(leftPath, rightPath);
     }
 
     /**
@@ -770,7 +756,7 @@ export class CoreTextUtilsProvider {
             return { text };
         }
 
-        const draftfileUrl = this.concatenatePaths(siteUrl, 'draftfile.php');
+        const draftfileUrl = CoreText.concatenatePaths(siteUrl, 'draftfile.php');
         const matches = text.match(new RegExp(this.escapeForRegex(draftfileUrl) + '[^\'" ]+', 'ig'));
 
         if (!matches || !matches.length) {
@@ -839,7 +825,7 @@ export class CoreTextUtilsProvider {
             return treatedText;
         }
 
-        const draftfileUrl = this.concatenatePaths(siteUrl, 'draftfile.php');
+        const draftfileUrl = CoreText.concatenatePaths(siteUrl, 'draftfile.php');
         const draftfileUrlRegexPrefix = this.escapeForRegex(draftfileUrl) + '/[^/]+/[^/]+/[^/]+/[^/]+/';
 
         files.forEach((file) => {
diff --git a/src/core/services/utils/url.ts b/src/core/services/utils/url.ts
index 06681b696..a75e8d911 100644
--- a/src/core/services/utils/url.ts
+++ b/src/core/services/utils/url.ts
@@ -21,6 +21,7 @@ import { makeSingleton } from '@singletons';
 import { CoreUrl } from '@singletons/url';
 import { CoreApp } from '@services/app';
 import { CoreSites } from '@services/sites';
+import { CoreText } from '@singletons/text';
 
 /*
  * "Utils" service with helper functions for URLs.
@@ -118,8 +119,8 @@ export class CoreUrlUtilsProvider {
         // Do not use tokenpluginfile if site doesn't use slash params, the URL doesn't work.
         // Also, only use it for "core" pluginfile endpoints. Some plugins can implement their own endpoint (like customcert).
         return !!accessKey && !url.match(/[&?]file=/) && (
-            url.indexOf(CoreTextUtils.concatenatePaths(siteUrl, 'pluginfile.php')) === 0 ||
-            url.indexOf(CoreTextUtils.concatenatePaths(siteUrl, 'webservice/pluginfile.php')) === 0);
+            url.indexOf(CoreText.concatenatePaths(siteUrl, 'pluginfile.php')) === 0 ||
+            url.indexOf(CoreText.concatenatePaths(siteUrl, 'webservice/pluginfile.php')) === 0);
     }
 
     /**
@@ -201,7 +202,7 @@ export class CoreUrlUtilsProvider {
             url = url.replace(/(\/webservice)?\/pluginfile\.php/, '/tokenpluginfile.php/' + accessKey);
         } else {
             // Use pluginfile.php. Some webservices returns directly the correct download url, others not.
-            if (url.indexOf(CoreTextUtils.concatenatePaths(siteUrl, 'pluginfile.php')) === 0) {
+            if (url.indexOf(CoreText.concatenatePaths(siteUrl, 'pluginfile.php')) === 0) {
                 url = url.replace('/pluginfile', '/webservice/pluginfile');
             }
 
diff --git a/src/core/singletons/tests/url.test.ts b/src/core/singletons/tests/url.test.ts
index b15d0e918..e8c7b7755 100644
--- a/src/core/singletons/tests/url.test.ts
+++ b/src/core/singletons/tests/url.test.ts
@@ -56,4 +56,12 @@ describe('CoreUrl singleton', () => {
         expect(CoreUrl.sameDomainAndPath('https://school.edu/moodle', 'https://school.edu/moodle/about')).toBe(false);
     });
 
+    it('converts to absolute URLs', () => {
+        expect(CoreUrl.toAbsoluteURL('https://school.edu/foo/bar', 'https://mysite.edu')).toBe('https://mysite.edu');
+        expect(CoreUrl.toAbsoluteURL('https://school.edu/foo/bar', '//mysite.edu')).toBe('https://mysite.edu');
+        expect(CoreUrl.toAbsoluteURL('https://school.edu/foo/bar', '/image.png')).toBe('https://school.edu/image.png');
+        expect(CoreUrl.toAbsoluteURL('https://school.edu/foo/bar', 'image.png')).toBe('https://school.edu/foo/bar/image.png');
+        expect(CoreUrl.toAbsoluteURL('https://school.edu/foo.php', 'image.png')).toBe('https://school.edu/foo.php/image.png');
+    });
+
 });
diff --git a/src/core/singletons/text.ts b/src/core/singletons/text.ts
index 9f6c1af11..d84955206 100644
--- a/src/core/singletons/text.ts
+++ b/src/core/singletons/text.ts
@@ -40,4 +40,30 @@ export class CoreText {
         return text;
     }
 
+    /**
+     * Concatenate two paths, adding a slash between them if needed.
+     *
+     * @param leftPath Left path.
+     * @param rightPath Right path.
+     * @return Concatenated path.
+     */
+    static concatenatePaths(leftPath: string, rightPath: string): string {
+        if (!leftPath) {
+            return rightPath;
+        } else if (!rightPath) {
+            return leftPath;
+        }
+
+        const lastCharLeft = leftPath.slice(-1);
+        const firstCharRight = rightPath.charAt(0);
+
+        if (lastCharLeft === '/' && firstCharRight === '/') {
+            return leftPath + rightPath.substring(1);
+        } else if (lastCharLeft !== '/' && firstCharRight !== '/') {
+            return leftPath + '/' + rightPath;
+        } else {
+            return leftPath + rightPath;
+        }
+    }
+
 }
diff --git a/src/core/singletons/url.ts b/src/core/singletons/url.ts
index ebb7aa533..7a4bab437 100644
--- a/src/core/singletons/url.ts
+++ b/src/core/singletons/url.ts
@@ -111,6 +111,22 @@ export class CoreUrl {
         };
     }
 
+    /**
+     * Given some parts of a URL, returns the URL as a string.
+     *
+     * @param parts Parts.
+     * @return Assembled URL.
+     */
+    static assemble(parts: UrlParts): string {
+        return (parts.protocol ? `${parts.protocol}://` : '') +
+            (parts.credentials ? `${parts.credentials}@` : '') +
+            (parts.domain ?? '') +
+            (parts.port ? `:${parts.port}` : '') +
+            (parts.path ?? '') +
+            (parts.query ? `?${parts.query}` : '') +
+            (parts.fragment ? `#${parts.fragment}` : '');
+    }
+
     /**
      * Guess the Moodle domain from a site url.
      *
@@ -231,4 +247,37 @@ export class CoreUrl {
         return urlAndAnchor[0];
     }
 
+    /**
+     * Convert a URL to an absolute URL (if it isn't already).
+     *
+     * @param parentUrl The parent URL.
+     * @param url The url to convert.
+     * @return Absolute URL.
+     */
+    static toAbsoluteURL(parentUrl: string, url: string): string {
+        const parsedUrl = CoreUrl.parse(url);
+
+        if (parsedUrl?.protocol) {
+            return url; // Already absolute URL.
+        }
+
+        const parsedParentUrl = CoreUrl.parse(parentUrl);
+
+        if (url.startsWith('//')) {
+            // It only lacks the protocol, add it.
+            return (parsedParentUrl?.protocol || 'https') + ':' + url;
+        }
+
+        // The URL should be added after the domain (if starts with /) or after the parent path.
+        const treatedParentUrl = CoreUrl.assemble({
+            protocol: parsedParentUrl?.protocol || 'https',
+            domain: parsedParentUrl?.domain,
+            port: parsedParentUrl?.port,
+            credentials: parsedParentUrl?.credentials,
+            path: url.startsWith('/') ? undefined : parsedParentUrl?.path,
+        });
+
+        return CoreText.concatenatePaths(treatedParentUrl, url);
+    }
+
 }

From 1211bf1c032b12aa8377e4cb6da8a5567eecc511 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 18 Mar 2022 10:13:56 +0100
Subject: [PATCH 0765/1008] MOBILE-3833 course: Change courses routes to fix
 links

---
 .../features/courses/courses-lazy.module.ts   | 72 ++++++++++++-------
 src/core/features/courses/courses.module.ts   | 16 ++---
 .../features/courses/pages/my/my.module.ts    | 42 +++--------
 .../services/handlers/my-courses-mainmenu.ts  |  2 +-
 4 files changed, 59 insertions(+), 73 deletions(-)

diff --git a/src/core/features/courses/courses-lazy.module.ts b/src/core/features/courses/courses-lazy.module.ts
index cfffc2db4..595dbc641 100644
--- a/src/core/features/courses/courses-lazy.module.ts
+++ b/src/core/features/courses/courses-lazy.module.ts
@@ -12,35 +12,53 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
+import { Injector, NgModule } from '@angular/core';
+import { RouterModule, ROUTES, Routes } from '@angular/router';
+import { buildTabMainRoutes } from '@features/mainmenu/mainmenu-tab-routing.module';
+import { CoreCoursesMyCoursesMainMenuHandlerService } from './services/handlers/my-courses-mainmenu';
 
-const routes: Routes = [
-    {
-        path: '',
-        redirectTo: 'list',
-        pathMatch: 'full',
-    },
-    {
-        path: 'categories',
-        redirectTo: 'categories/root', // Fake "id".
-        pathMatch: 'full',
-    },
-    {
-        path: 'categories/:id',
-        loadChildren: () =>
-            import('./pages/categories/categories.module')
-                .then(m => m.CoreCoursesCategoriesPageModule),
-    },
-    {
-        path: 'list',
-        loadChildren: () =>
-            import('./pages/list/list.module')
-                .then(m => m.CoreCoursesListPageModule),
-    },
-];
+function buildRoutes(injector: Injector): Routes {
+    return [
+        {
+            path: 'my',
+            data: {
+                mainMenuTabRoot: CoreCoursesMyCoursesMainMenuHandlerService.PAGE_NAME,
+            },
+            loadChildren: () => import('./pages/my/my.module').then(m => m.CoreCoursesMyCoursesPageModule),
+        },
+        {
+            path: 'categories',
+            redirectTo: 'categories/root', // Fake "id".
+            pathMatch: 'full',
+        },
+        {
+            path: 'categories/:id',
+            loadChildren: () =>
+                import('./pages/categories/categories.module')
+                    .then(m => m.CoreCoursesCategoriesPageModule),
+        },
+        {
+            path: 'list',
+            loadChildren: () =>
+                import('./pages/list/list.module')
+                    .then(m => m.CoreCoursesListPageModule),
+        },
+        ...buildTabMainRoutes(injector, {
+            redirectTo: 'my',
+            pathMatch: 'full',
+        }),
+    ];
+}
 
 @NgModule({
-    imports: [RouterModule.forChild(routes)],
+    exports: [RouterModule],
+    providers: [
+        {
+            provide: ROUTES,
+            multi: true,
+            deps: [Injector],
+            useFactory: buildRoutes,
+        },
+    ],
 })
 export class CoreCoursesLazyModule {}
diff --git a/src/core/features/courses/courses.module.ts b/src/core/features/courses/courses.module.ts
index f4f801622..3423b63b2 100644
--- a/src/core/features/courses/courses.module.ts
+++ b/src/core/features/courses/courses.module.ts
@@ -50,17 +50,10 @@ const mainMenuHomeChildrenRoutes: Routes = [
     },
 ];
 
-const mainMenuHomeSiblingRoutes: Routes = [
-    {
-        path: 'courses',
-        loadChildren: () => import('./courses-lazy.module').then(m => m.CoreCoursesLazyModule),
-    },
-];
-
-const mainMenuTabRoutes: Routes = [
+const routes: Routes = [
     {
         path: CoreCoursesMyCoursesMainMenuHandlerService.PAGE_NAME,
-        loadChildren: () => import('./pages/my/my.module').then(m => m.CoreCoursesMyCoursesPageModule),
+        loadChildren: () => import('./courses-lazy.module').then(m => m.CoreCoursesLazyModule),
     },
 ];
 
@@ -68,10 +61,9 @@ const mainMenuTabRoutes: Routes = [
     imports: [
         CoreMainMenuHomeRoutingModule.forChild({
             children: mainMenuHomeChildrenRoutes,
-            siblings: mainMenuHomeSiblingRoutes,
         }),
-        CoreMainMenuRoutingModule.forChild({ children: mainMenuTabRoutes }),
-        CoreMainMenuTabRoutingModule.forChild(mainMenuTabRoutes),
+        CoreMainMenuRoutingModule.forChild({ children: routes }),
+        CoreMainMenuTabRoutingModule.forChild(routes),
     ],
     exports: [CoreMainMenuRoutingModule],
     providers: [
diff --git a/src/core/features/courses/pages/my/my.module.ts b/src/core/features/courses/pages/my/my.module.ts
index c6ed5b0b3..96b405151 100644
--- a/src/core/features/courses/pages/my/my.module.ts
+++ b/src/core/features/courses/pages/my/my.module.ts
@@ -12,53 +12,29 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Injector, NgModule } from '@angular/core';
-import { RouterModule, ROUTES, Routes } from '@angular/router';
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
 
 import { CoreSharedModule } from '@/core/shared.module';
 import { CoreBlockComponentsModule } from '@features/block/components/components.module';
 
 import { CoreCoursesMyCoursesPage } from './my';
 import { CoreMainMenuComponentsModule } from '@features/mainmenu/components/components.module';
-import { buildTabMainRoutes } from '@features/mainmenu/mainmenu-tab-routing.module';
-import { CoreCoursesMyCoursesMainMenuHandlerService } from '@features/courses/services/handlers/my-courses-mainmenu';
 
-function buildRoutes(injector: Injector): Routes {
-    return [
-        {
-            path: '',
-            component: CoreCoursesMyCoursesPage,
-            data: {
-                mainMenuTabRoot: CoreCoursesMyCoursesMainMenuHandlerService.PAGE_NAME,
-            },
-        },
-        {
-            path: 'list',
-            loadChildren: () =>
-                import('../list/list.module')
-                    .then(m => m.CoreCoursesListPageModule),
-        },
-        ...buildTabMainRoutes(injector, {
-            redirectTo: '',
-            pathMatch: 'full',
-        }),
-    ];
-}
+const routes: Routes = [
+    {
+        path: '',
+        component: CoreCoursesMyCoursesPage,
+    },
+];
 
 @NgModule({
     imports: [
+        RouterModule.forChild(routes),
         CoreSharedModule,
         CoreBlockComponentsModule,
         CoreMainMenuComponentsModule,
     ],
-    providers: [
-        {
-            provide: ROUTES,
-            multi: true,
-            deps: [Injector],
-            useFactory: buildRoutes,
-        },
-    ],
     declarations: [
         CoreCoursesMyCoursesPage,
     ],
diff --git a/src/core/features/courses/services/handlers/my-courses-mainmenu.ts b/src/core/features/courses/services/handlers/my-courses-mainmenu.ts
index b800900f8..619327dc7 100644
--- a/src/core/features/courses/services/handlers/my-courses-mainmenu.ts
+++ b/src/core/features/courses/services/handlers/my-courses-mainmenu.ts
@@ -27,7 +27,7 @@ import { CoreDashboardHomeHandler } from './dashboard-home';
 @Injectable({ providedIn: 'root' })
 export class CoreCoursesMyCoursesMainMenuHandlerService implements CoreMainMenuHandler {
 
-    static readonly PAGE_NAME = 'my';
+    static readonly PAGE_NAME = 'courses';
 
     name = 'CoreCoursesMyCourses';
     priority = 900;

From 5e0a46aa75f3488551746832db6c40f60a537aa6 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 18 Mar 2022 10:15:48 +0100
Subject: [PATCH 0766/1008] MOBILE-3833 core: Fix page loaded when switch
 account

---
 src/core/guards/redirect.ts    | 8 ++++++--
 src/core/services/navigator.ts | 4 +++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/core/guards/redirect.ts b/src/core/guards/redirect.ts
index e8dc44e78..da7c11a3e 100644
--- a/src/core/guards/redirect.ts
+++ b/src/core/guards/redirect.ts
@@ -55,11 +55,15 @@ export class CoreRedirectGuard implements CanLoad, CanActivate {
         // Redirect to site path.
         if (redirect.siteId && redirect.siteId !== CoreConstants.NO_SITE_ID) {
             const redirectData: CoreRedirectPayload = {
-                redirectPath: redirect.redirectPath,
-                redirectOptions: redirect.redirectOptions,
                 urlToOpen: redirect.urlToOpen,
             };
 
+            if (redirect.redirectPath !== 'main') {
+                // Only pass redirect path if the page to load isn't the main menu.
+                redirectData.redirectPath = redirect.redirectPath;
+                redirectData.redirectOptions = redirect.redirectOptions;
+            }
+
             const loggedIn = await CoreSites.loadSite(
                 redirect.siteId,
                 redirectData,
diff --git a/src/core/services/navigator.ts b/src/core/services/navigator.ts
index 88e012094..e2613e579 100644
--- a/src/core/services/navigator.ts
+++ b/src/core/services/navigator.ts
@@ -182,7 +182,9 @@ export class CoreNavigatorService {
      * @return Whether navigation suceeded.
      */
     async navigateToSiteHome(options: Omit<CoreNavigationOptions, 'reset'> & { siteId?: string } = {}): Promise<boolean> {
-        const landingPagePath = this.getLandingTabPage();
+        const siteId = options.siteId ?? CoreSites.getCurrentSiteId();
+        const landingPagePath = CoreSites.isLoggedIn() && CoreSites.getCurrentSiteId() === siteId ?
+            this.getLandingTabPage() : 'main';
 
         return this.navigateToSitePath(landingPagePath, {
             ...options,

From da11a08c074d593f927d0df65f669520615ef1b7 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 18 Mar 2022 12:51:30 +0100
Subject: [PATCH 0767/1008] MOBILE-3833 course: Fix open site home from module
 summary

---
 src/core/features/course/services/course.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/core/features/course/services/course.ts b/src/core/features/course/services/course.ts
index d0997cd51..94609b78b 100644
--- a/src/core/features/course/services/course.ts
+++ b/src/core/features/course/services/course.ts
@@ -1266,6 +1266,13 @@ export class CoreCourseProvider {
         course: CoreCourseAnyCourseData | { id: number },
         navOptions?: CoreNavigationOptions,
     ): Promise<void> {
+        if (course.id === CoreSites.getCurrentSite()?.getSiteHomeId()) {
+            // Open site home.
+            await CoreNavigator.navigate('/main/home/site', navOptions);
+
+            return;
+        }
+
         const loading = await CoreDomUtils.showModalLoading();
 
         // Wait for site plugins to be fetched.

From 5ee3dc13e20d31dd20e44a663b282b4aa74cb2c4 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 18 Mar 2022 15:10:02 +0100
Subject: [PATCH 0768/1008] MOBILE-3833 sitehome: Fix site home link handler

---
 src/core/classes/tabs.ts                      | 53 ++++++++++++++-----
 .../components/tabs-outlet/tabs-outlet.ts     | 29 ++++++++--
 .../sitehome/services/handlers/index-link.ts  | 23 +++-----
 3 files changed, 71 insertions(+), 34 deletions(-)

diff --git a/src/core/classes/tabs.ts b/src/core/classes/tabs.ts
index bd4cf9efe..a535e831b 100644
--- a/src/core/classes/tabs.ts
+++ b/src/core/classes/tabs.ts
@@ -306,13 +306,7 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
             this.calculateSlides();
         });
 
-        let selectedTab: T | undefined = this.tabs[this.selectedIndex || 0] || undefined;
-
-        if (!selectedTab || !selectedTab.enabled) {
-            // The tab is not enabled or not shown. Get the first tab that is enabled.
-            selectedTab = this.tabs.find((tab) => tab.enabled) || undefined;
-        }
-
+        const selectedTab = this.calculateInitialTab();
         if (!selectedTab) {
             return;
         }
@@ -329,6 +323,22 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
         this.calculateSlides();
     }
 
+    /**
+     * Calculate the initial tab to load.
+     *
+     * @return Initial tab, undefined if no valid tab found.
+     */
+    protected calculateInitialTab(): T | undefined {
+        const selectedTab: T | undefined = this.tabs[this.selectedIndex || 0] || undefined;
+
+        if (selectedTab && selectedTab.enabled) {
+            return selectedTab;
+        }
+
+        // The tab is not enabled or not shown. Get the first tab that is enabled.
+        return this.tabs.find((tab) => tab.enabled) || undefined;
+    }
+
     /**
      * Method executed when the slides are changed.
      */
@@ -564,8 +574,8 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
         }
 
         const tabToSelect = this.tabs[index];
-        if (!tabToSelect || !tabToSelect.enabled || tabToSelect.id == this.selected) {
-            // Already selected or not enabled.
+        if (!tabToSelect || !tabToSelect.enabled) {
+            // Not enabled.
             return;
         }
 
@@ -578,17 +588,32 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
             }
         }
 
+        if (tabToSelect.id === this.selected) {
+            // Already selected.
+            return;
+        }
+
         const ok = await this.loadTab(tabToSelect);
 
         if (ok !== false) {
-            this.selectHistory.push(tabToSelect.id!);
-            this.selected = tabToSelect.id;
-            this.selectedIndex = index;
-
-            this.ionChange.emit(tabToSelect);
+            this.tabSelected(tabToSelect, index);
         }
     }
 
+    /**
+     * Update selected tab.
+     *
+     * @param tab Tab.
+     * @param tabIndex Tab index.
+     */
+    protected tabSelected(tab: T, tabIndex: number): void {
+        this.selectHistory.push(tab.id ?? '');
+        this.selected = tab.id;
+        this.selectedIndex = tabIndex;
+
+        this.ionChange.emit(tab);
+    }
+
     /**
      * Load the tab.
      *
diff --git a/src/core/components/tabs-outlet/tabs-outlet.ts b/src/core/components/tabs-outlet/tabs-outlet.ts
index e2ffef98f..4a75166a9 100644
--- a/src/core/components/tabs-outlet/tabs-outlet.ts
+++ b/src/core/components/tabs-outlet/tabs-outlet.ts
@@ -88,7 +88,7 @@ export class CoreTabsOutletComponent extends CoreTabsBaseComponent<CoreTabsOutle
     }
 
     /**
-     * View has been initialized.
+     * @inheritdoc
      */
     async ngAfterViewInit(): Promise<void> {
         super.ngAfterViewInit();
@@ -103,12 +103,20 @@ export class CoreTabsOutletComponent extends CoreTabsBaseComponent<CoreTabsOutle
                 return;
             }
 
+            // Search the tab loaded.
+            const tabIndex = this.tabs.findIndex((tab) => tab.page == stackEvent.enteringView.url);
+            const tab = tabIndex >= 0 ? this.tabs[tabIndex] : undefined;
+
             // Add tabid to the tab content element.
             if (stackEvent.enteringView.element.id == '') {
-                const tab = this.tabs.find((tab) => tab.page == stackEvent.enteringView.url);
                 stackEvent.enteringView.element.id = tab?.id || '';
             }
 
+            if (tab && this.selected !== tab.id) {
+                // Tab loaded using a navigation, update the selected tab.
+                this.tabSelected(tab, tabIndex);
+            }
+
             this.showHideNavBarButtons(stackEvent.enteringView.element.tagName);
 
             await this.listenContentScroll(stackEvent.enteringView.element, stackEvent.enteringView.id);
@@ -125,7 +133,7 @@ export class CoreTabsOutletComponent extends CoreTabsBaseComponent<CoreTabsOutle
     }
 
     /**
-     * Detect changes on input properties.
+     * @inheritdoc
      */
     ngOnChanges(changes: Record<string, SimpleChange>): void {
         if (changes.tabs) {
@@ -168,6 +176,21 @@ export class CoreTabsOutletComponent extends CoreTabsBaseComponent<CoreTabsOutle
         this.lastActiveComponent?.ionViewDidLeave?.();
     }
 
+    /**
+     * @inheritdoc
+     */
+    protected calculateInitialTab(): CoreTabsOutletTab | undefined {
+        // Check if a tab should be selected because it was loaded by path.
+        const currentPath = CoreNavigator.getCurrentPath();
+        const currentPathTab = this.tabs.find(tab => tab.page === currentPath);
+
+        if (currentPathTab && currentPathTab.enabled) {
+            return currentPathTab;
+        }
+
+        return super.calculateInitialTab();
+    }
+
     /**
      * Get router outlet.
      *
diff --git a/src/core/features/sitehome/services/handlers/index-link.ts b/src/core/features/sitehome/services/handlers/index-link.ts
index fbc73a2f0..fcb3b4b99 100644
--- a/src/core/features/sitehome/services/handlers/index-link.ts
+++ b/src/core/features/sitehome/services/handlers/index-link.ts
@@ -32,32 +32,21 @@ export class CoreSiteHomeIndexLinkHandlerService extends CoreContentLinksHandler
     pattern = /\/course\/view\.php.*([?&]id=\d+)/;
 
     /**
-     * Get the list of actions for a link (url).
-     *
-     * @param siteIds List of sites the URL belongs to.
-     * @param url The URL to treat.
-     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param courseId Course ID related to the URL. Optional but recommended.
-     * @return List of (or promise resolved with list of) actions.
+     * @inheritdoc
      */
     getActions(): CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
         return [{
             action: (siteId: string): void => {
-                // @todo This should open the 'sitehome' setting as well.
-                CoreNavigator.navigateToSiteHome({ siteId });
+                CoreNavigator.navigateToSitePath('/home/site', {
+                    preferCurrentTab: false,
+                    siteId,
+                });
             },
         }];
     }
 
     /**
-     * Check if the handler is enabled for a certain site (site + user) and a URL.
-     * If not defined, defaults to true.
-     *
-     * @param siteId The site ID.
-     * @param url The URL to treat.
-     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param courseId Course ID related to the URL. Optional but recommended.
-     * @return Whether the handler is enabled for the URL and site.
+     * @inheritdoc
      */
     async isEnabled(siteId: string, url: string, params: Record<string, string>, courseId?: number): Promise<boolean> {
         courseId = parseInt(params.id, 10);

From 43d7ccc3454d5fcc71e3cc610480164e4bdf6c68 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 21 Mar 2022 10:03:09 +0100
Subject: [PATCH 0769/1008] MOBILE-4002 dashboard: Check new setting to disable
 dashboard

---
 .../services/handlers/dashboard-home.ts       | 37 ++++++-------------
 1 file changed, 12 insertions(+), 25 deletions(-)

diff --git a/src/core/features/courses/services/handlers/dashboard-home.ts b/src/core/features/courses/services/handlers/dashboard-home.ts
index 521038dea..778b1d3d2 100644
--- a/src/core/features/courses/services/handlers/dashboard-home.ts
+++ b/src/core/features/courses/services/handlers/dashboard-home.ts
@@ -15,6 +15,8 @@
 import { Injectable } from '@angular/core';
 import { CoreBlockDelegate } from '@features/block/services/block-delegate';
 import { CoreMainMenuHomeHandler, CoreMainMenuHomeHandlerToDisplay } from '@features/mainmenu/services/home-delegate';
+import { CoreSites } from '@services/sites';
+import { CoreUtils } from '@services/utils/utils';
 import { makeSingleton } from '@singletons';
 import { CoreCoursesDashboard } from '../dashboard';
 
@@ -45,40 +47,25 @@ export class CoreDashboardHomeHandlerService implements CoreMainMenuHomeHandler
      * @return Whether or not the handler is enabled on a site level.
      */
     async isEnabledForSite(siteId?: string): Promise<boolean> {
-        const promises: Promise<void>[] = [];
-        let blocksEnabled = false;
-        let dashboardAvailable = false;
-        let dashboardEnabled = false;
+        const site = await CoreSites.getSite(siteId);
 
         // Check if blocks and 3.6 dashboard is enabled.
-        promises.push(CoreBlockDelegate.areBlocksDisabled(siteId).then((disabled) => {
-            blocksEnabled = !disabled;
+        const [blocksDisabled, dashboardDisabled, dashboardAvailable, dashboardConfig] = await Promise.all([
+            CoreBlockDelegate.areBlocksDisabled(site.getId()),
+            CoreCoursesDashboard.isDisabled(site.getId()),
+            CoreCoursesDashboard.isAvailable(site.getId()),
+            CoreUtils.ignoreErrors(site.getConfig('enabledashboard'), '1'),
+        ]);
+        const dashboardEnabled = !dashboardDisabled && dashboardConfig !== '0';
 
-            return;
-        }));
-
-        promises.push(CoreCoursesDashboard.isDisabled(siteId).then((disabled) => {
-            dashboardEnabled = !disabled;
-
-            return;
-        }));
-
-        promises.push(CoreCoursesDashboard.isAvailable(siteId).then((available) => {
-            dashboardAvailable = available;
-
-            return;
-        }));
-
-        await Promise.all(promises);
-
-        if (dashboardAvailable && dashboardEnabled && blocksEnabled) {
+        if (dashboardAvailable && dashboardEnabled && !blocksDisabled) {
             const blocks = await CoreCoursesDashboard.getDashboardBlocks(undefined, siteId);
 
             return CoreBlockDelegate.hasSupportedBlock(blocks.mainBlocks) || CoreBlockDelegate.hasSupportedBlock(blocks.sideBlocks);
         }
 
         // Dashboard is enabled but not available, we will fake blocks.
-        return dashboardEnabled && blocksEnabled;
+        return dashboardEnabled && !blocksDisabled;
     }
 
     /**

From 96c562eec4c74443ff0251111a936d8e57cb5005 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 21 Mar 2022 14:57:24 +0100
Subject: [PATCH 0770/1008] MOBILE-3833 course: Improve load time of course
 summary

---
 .../pages/course-summary/course-summary.ts    | 128 +++++++++++-------
 1 file changed, 81 insertions(+), 47 deletions(-)

diff --git a/src/core/features/course/pages/course-summary/course-summary.ts b/src/core/features/course/pages/course-summary/course-summary.ts
index a34255bfa..21a7de434 100644
--- a/src/core/features/course/pages/course-summary/course-summary.ts
+++ b/src/core/features/course/pages/course-summary/course-summary.ts
@@ -38,6 +38,7 @@ import { CoreCoursesHelper, CoreCourseWithImageAndColor } from '@features/course
 import { Subscription } from 'rxjs';
 import { CoreColors } from '@singletons/colors';
 import { CoreText } from '@singletons/text';
+import { CorePromisedValue } from '@classes/promised-value';
 
 /**
  * Page that shows the summary of a course including buttons to enrol and other available options.
@@ -70,7 +71,8 @@ export class CoreCourseSummaryPage implements OnInit, OnDestroy {
     courseMenuHandlers: CoreCourseOptionsMenuHandlerToDisplay[] = [];
 
     protected useGuestAccess = false;
-    protected guestInstanceId?: number;
+    protected guestInstanceId = new CorePromisedValue<number | undefined>();
+    protected courseData = new CorePromisedValue<CoreCourseSummaryData | undefined>();
     protected waitStart = 0;
     protected enrolUrl = '';
     protected pageDestroyed = false;
@@ -130,11 +132,12 @@ export class CoreCourseSummaryPage implements OnInit, OnDestroy {
      *         password is required for guest access.
      */
     protected async canAccessAsGuest(): Promise<boolean> {
-        if (this.guestInstanceId === undefined) {
+        const guestInstanceId = await this.guestInstanceId;
+        if (guestInstanceId === undefined) {
             return false;
         }
 
-        const info = await CoreCourses.getCourseGuestEnrolmentInfo(this.guestInstanceId);
+        const info = await CoreCourses.getCourseGuestEnrolmentInfo(guestInstanceId);
 
         // Guest access with password is not supported by the app.
         return !!info.status && !info.passwordrequired;
@@ -146,32 +149,70 @@ export class CoreCourseSummaryPage implements OnInit, OnDestroy {
      * @param refresh If it's refreshing content.
      */
     protected async getCourse(refresh = false): Promise<void> {
-        // Get course enrolment methods.
-        this.selfEnrolInstances = [];
         this.otherEnrolments = false;
 
         try {
-            const enrolmentMethods = await CoreCourses.getCourseEnrolmentMethods(this.courseId);
-            this.guestInstanceId = undefined;
-
-            enrolmentMethods.forEach((method) => {
-                if (!method.status) {
-                    return;
-                }
-
-                if (method.type === 'self') {
-                    this.selfEnrolInstances.push(method);
-                } else if (method.type === 'guest') {
-                    this.guestInstanceId = method.id;
-                } else {
-                    // Other enrolments that comes from that WS should need user action.
-                    this.otherEnrolments = true;
-                }
-            });
+            await Promise.all([
+                this.getEnrolmentMethods(),
+                this.getCourseData(),
+                this.loadCourseExtraData(),
+            ]);
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'Error getting enrolment data');
         }
 
+        await this.setCourseColor();
+
+        if (!this.course ||
+            !('progress' in this.course) ||
+            typeof this.course.progress !== 'number' ||
+            this.course.progress < 0 ||
+            this.course.completionusertracked === false
+        ) {
+            this.progress = undefined;
+        } else {
+            this.progress = this.course.progress;
+        }
+
+        await this.loadMenuHandlers(refresh);
+
+        this.dataLoaded = true;
+    }
+
+    /**
+     * Get course enrolment methods.
+     */
+    protected async getEnrolmentMethods(): Promise<void> {
+        this.selfEnrolInstances = [];
+        this.guestInstanceId.reset();
+
+        const enrolmentMethods = await CoreCourses.getCourseEnrolmentMethods(this.courseId);
+
+        enrolmentMethods.forEach((method) => {
+            if (!method.status) {
+                return;
+            }
+
+            if (method.type === 'self') {
+                this.selfEnrolInstances.push(method);
+            } else if (method.type === 'guest') {
+                this.guestInstanceId.resolve(method.id);
+            } else {
+                // Other enrolments that comes from that WS should need user action.
+                this.otherEnrolments = true;
+            }
+        });
+
+        if (!this.guestInstanceId.isSettled()) {
+            // No guest instance found.
+            this.guestInstanceId.resolve(undefined);
+        }
+    }
+
+    /**
+     * Get course data.
+     */
+    protected async getCourseData(): Promise<void> {
         try {
             // Check if user is enrolled in the course.
             try {
@@ -192,16 +233,26 @@ export class CoreCourseSummaryPage implements OnInit, OnDestroy {
             this.useGuestAccess = this.canAccessCourse;
         }
 
+        this.courseData.resolve(this.course);
+    }
+
+    /**
+     * Load some extra data for the course.
+     */
+    protected async loadCourseExtraData(): Promise<void> {
         try {
             const courseByField = await CoreCourses.getCourseByField('id', this.courseId);
-            if (this.course) {
-                this.course.customfields = courseByField.customfields;
-                this.course.contacts = courseByField.contacts;
-                this.course.displayname = courseByField.displayname;
-                this.course.categoryname = courseByField.categoryname;
-                this.course.overviewfiles = courseByField.overviewfiles;
+            const courseData = await this.courseData;
+
+            if (courseData) {
+                courseData.customfields = courseByField.customfields;
+                courseData.contacts = courseByField.contacts;
+                courseData.displayname = courseByField.displayname;
+                courseData.categoryname = courseByField.categoryname;
+                courseData.overviewfiles = courseByField.overviewfiles;
             } else  {
                 this.course = courseByField;
+                this.courseData.resolve(courseByField);
             }
 
             // enrollmentmethods contains ALL enrolment methods including manual.
@@ -212,23 +263,6 @@ export class CoreCourseSummaryPage implements OnInit, OnDestroy {
         } catch {
             // Ignore errors.
         }
-
-        await this.setCourseColor();
-
-        if (!this.course ||
-            !('progress' in this.course) ||
-            typeof this.course.progress !== 'number' ||
-            this.course.progress < 0 ||
-            this.course.completionusertracked === false
-        ) {
-            this.progress = undefined;
-        } else {
-            this.progress = this.course.progress;
-        }
-
-        await this.loadMenuHandlers(refresh);
-
-        this.dataLoaded = true;
     }
 
     /**
@@ -375,8 +409,8 @@ export class CoreCourseSummaryPage implements OnInit, OnDestroy {
         promises.push(CoreCourses.invalidateCourseEnrolmentMethods(this.courseId));
         promises.push(CoreCourseOptionsDelegate.clearAndInvalidateCoursesOptions(this.courseId));
         promises.push(CoreCourses.invalidateCoursesByField('id', this.courseId));
-        if (this.guestInstanceId) {
-            promises.push(CoreCourses.invalidateCourseGuestEnrolmentInfo(this.guestInstanceId));
+        if (this.guestInstanceId.value) {
+            promises.push(CoreCourses.invalidateCourseGuestEnrolmentInfo(this.guestInstanceId.value));
         }
 
         await Promise.all(promises).finally(() => this.getCourse()).finally(() => {

From 43ed7495bf86864b7734f7d988a921c39bebb10f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 18 Mar 2022 09:18:52 +0100
Subject: [PATCH 0771/1008] MOBILE-3814 styles: Change chip text colors and
 completion chips

---
 .../core-course-module-completion.html               |  4 ++--
 src/theme/theme.base.scss                            | 12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/core/features/course/components/module-completion/core-course-module-completion.html b/src/core/features/course/components/module-completion/core-course-module-completion.html
index 969b358d7..05cbad4f7 100644
--- a/src/core/features/course/components/module-completion/core-course-module-completion.html
+++ b/src/core/features/course/components/module-completion/core-course-module-completion.html
@@ -21,7 +21,7 @@
                         </ion-label>
                     </ion-chip>
 
-                    <ion-chip *ngIf="rule.statusincomplete" color="dark" role="listitem" [attr.aria-label]="rule.accessibleDescription"
+                    <ion-chip *ngIf="rule.statusincomplete" color="secondary" role="listitem" [attr.aria-label]="rule.accessibleDescription"
                         class="completioninfo completion_incomplete">
                         <ion-icon name="fas-edit" [attr.aria-label]="'core.course.completion_automatic:todo' | translate "></ion-icon>
                         <ion-label>
@@ -42,7 +42,7 @@
         </div>
 
         <ng-container *ngIf="mode == 'basic' && completion.istrackeduser">
-            <ion-chip class="completioninfo completion_incomplete" *ngIf="completionStatus === 0" color="dark">
+            <ion-chip class="completioninfo completion_incomplete" *ngIf="completionStatus === 0" color="secondary">
                 <ion-icon name="fas-edit" aria-hidden="true"></ion-icon>
                 <ion-label>
                     {{ 'core.course.todo' | translate }}
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index ac9e6756d..791f5022e 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -985,6 +985,18 @@ ion-chip {
             color: var(--ion-color-base);
         }
     }
+
+    &.ion-color {
+        &.ion-color-light,
+        &.ion-color-medium,
+        &.ion-color-dark,
+        &.ion-color-secondary {
+            color: var(--gray-900);
+            &.chip-outline {
+                color: var(--text-color);
+            }
+        }
+    }
 }
 
 ion-searchbar {

From 4f36e6c1e8f9dff638848c2f5d86adfcd1499f8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 18 Mar 2022 09:46:07 +0100
Subject: [PATCH 0772/1008] MOBILE-3814 a11y: Add aria-controls to
 collapsible-item

---
 src/core/directives/collapsible-item.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/core/directives/collapsible-item.ts b/src/core/directives/collapsible-item.ts
index 41990f722..caffa6270 100644
--- a/src/core/directives/collapsible-item.ts
+++ b/src/core/directives/collapsible-item.ts
@@ -16,6 +16,7 @@ import { Directive, ElementRef, Input, OnDestroy, OnInit } from '@angular/core';
 import { CoreCancellablePromise } from '@classes/cancellable-promise';
 import { CoreLoadingComponent } from '@components/loading/loading';
 import { CoreDomUtils } from '@services/utils/dom';
+import { CoreUtils } from '@services/utils/utils';
 import { Translate } from '@singletons';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
 import { CoreEventObserver } from '@singletons/events';
@@ -50,11 +51,14 @@ export class CoreCollapsibleItemDirective implements OnInit, OnDestroy {
     protected expandedHeight = 0;
     protected resizeListener?: CoreEventObserver;
     protected domPromise?: CoreCancellablePromise<void>;
+    protected uniqueId: string;
 
     constructor(el: ElementRef<HTMLElement>) {
         this.element = el.nativeElement;
 
         this.element.addEventListener('click', this.elementClicked.bind(this));
+        this.uniqueId = 'collapsible-item-' + CoreUtils.getUniqueId('CoreCollapsibleItemDirective');
+        this.element.id = this.uniqueId;
     }
 
     /**
@@ -153,6 +157,7 @@ export class CoreCollapsibleItemDirective implements OnInit, OnDestroy {
         const toggleButton = document.createElement('ion-button');
         toggleButton.classList.add('collapsible-toggle');
         toggleButton.setAttribute('fill', 'clear');
+        toggleButton.setAttribute('aria-controls', this.uniqueId);
 
         const toggleText = document.createElement('span');
         toggleText.classList.add('collapsible-toggle-text');
@@ -163,7 +168,7 @@ export class CoreCollapsibleItemDirective implements OnInit, OnDestroy {
         expandArrow.classList.add('collapsible-toggle-arrow');
         toggleButton.appendChild(expandArrow);
 
-        this.element.appendChild(toggleButton);
+        this.element.append(toggleButton);
 
         this.toggleExpand(this.expanded);
     }
@@ -194,6 +199,9 @@ export class CoreCollapsibleItemDirective implements OnInit, OnDestroy {
             expand = !this.expanded;
         }
         this.expanded = expand;
+
+        // Reset scroll inside the element to show always the top part.
+        this.element.scrollTo(0, 0);
         this.element.classList.toggle('collapsible-collapsed', !expand);
         this.setHeight(!expand ? this.maxHeight: undefined);
 

From b4b7743a5a43e4f6f1f83f60c4974e8557b7cf22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 18 Mar 2022 11:33:47 +0100
Subject: [PATCH 0773/1008] MOBILE-3814 course: Add text-wrap to badges

---
 .../features/course/components/module/core-course-module.html | 4 ++--
 .../features/course/pages/module-preview/module-preview.html  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/core/features/course/components/module/core-course-module.html b/src/core/features/course/components/module/core-course-module.html
index fe3204278..0f304763d 100644
--- a/src/core/features/course/components/module/core-course-module.html
+++ b/src/core/features/course/components/module/core-course-module.html
@@ -35,10 +35,10 @@
                     </ion-chip>
 
                     <!-- Hidden badges -->
-                    <ion-badge color="warning" *ngIf="module.visible === 0">
+                    <ion-badge color="warning" *ngIf="module.visible === 0" class="ion-text-wrap">
                         {{ 'core.course.hiddenfromstudents' | translate }}
                     </ion-badge>
-                    <ion-badge color="warning" *ngIf="module.visible !== 0 && module.isStealth">
+                    <ion-badge color="warning" *ngIf="module.visible !== 0 && module.isStealth" class="ion-text-wrap">
                         {{ 'core.course.hiddenoncoursepage' | translate }}
                     </ion-badge>
                 </div>
diff --git a/src/core/features/course/pages/module-preview/module-preview.html b/src/core/features/course/pages/module-preview/module-preview.html
index 2dfdb164f..e25f768db 100644
--- a/src/core/features/course/pages/module-preview/module-preview.html
+++ b/src/core/features/course/pages/module-preview/module-preview.html
@@ -33,10 +33,10 @@
                 </ion-chip>
 
                 <!-- Hidden badges -->
-                <ion-badge color="warning" *ngIf="module.visible === 0">
+                <ion-badge color="warning" *ngIf="module.visible === 0" class="ion-text-wrap">
                     {{ 'core.course.hiddenfromstudents' | translate }}
                 </ion-badge>
-                <ion-badge color="warning" *ngIf="module.visible !== 0 && module.isStealth">
+                <ion-badge color="warning" *ngIf="module.visible !== 0 && module.isStealth" class="ion-text-wrap">
                     {{ 'core.course.hiddenoncoursepage' | translate }}
                 </ion-badge>
             </div>

From 8a5310ef1e80a4dfcb4d3d4ab728cfea47d0abdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 18 Mar 2022 15:00:20 +0100
Subject: [PATCH 0774/1008] MOBILE-3814 course: Add helper functions to check
 stealth and visibility

---
 .../activitymodules/activitymodules.ts        |  3 +-
 .../components/course-format/course-format.ts |  9 ++--
 .../components/course-index/course-index.ts   | 11 ++---
 .../module-navigation/module-navigation.ts    |  8 ++--
 .../course/components/module/module.ts        |  3 +-
 .../pages/list-mod-type/list-mod-type.page.ts |  2 +-
 .../features/course/services/course-helper.ts | 46 ++++++++++++++++++-
 .../services/module-prefetch-delegate.ts      |  4 +-
 .../features/filter/services/filter-helper.ts |  3 +-
 .../classes/handlers/module-handler.ts        |  4 +-
 10 files changed, 70 insertions(+), 23 deletions(-)

diff --git a/src/addons/block/activitymodules/components/activitymodules/activitymodules.ts b/src/addons/block/activitymodules/components/activitymodules/activitymodules.ts
index 129c1ca6d..9b9a2f2bb 100644
--- a/src/addons/block/activitymodules/components/activitymodules/activitymodules.ts
+++ b/src/addons/block/activitymodules/components/activitymodules/activitymodules.ts
@@ -21,6 +21,7 @@ import { ContextLevel, CoreConstants } from '@/core/constants';
 import { Translate } from '@singletons';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreNavigator } from '@services/navigator';
+import { CoreCourseHelper } from '@features/course/services/course-helper';
 
 /**
  * Component to render an "activity modules" block.
@@ -67,7 +68,7 @@ export class AddonBlockActivityModulesComponent extends CoreBlockBaseComponent i
             }
 
             section.modules.forEach((mod) => {
-                if (mod.uservisible === false || !CoreCourse.moduleHasView(mod) ||
+                if (!CoreCourseHelper.canUserViewModule(mod, section) || !CoreCourse.moduleHasView(mod) ||
                     modFullNames[mod.modname] !== undefined) {
                     // Ignore this module.
                     return;
diff --git a/src/core/features/course/components/course-format/course-format.ts b/src/core/features/course/components/course-format/course-format.ts
index 50460392d..453d03c2f 100644
--- a/src/core/features/course/components/course-format/course-format.ts
+++ b/src/core/features/course/components/course-format/course-format.ts
@@ -34,6 +34,7 @@ import {
     CoreCourseProvider,
 } from '@features/course/services/course';
 import {
+    CoreCourseHelper,
     CoreCourseSection,
 } from '@features/course/services/course-helper';
 import { CoreCourseFormatDelegate } from '@features/course/services/format-delegate';
@@ -444,7 +445,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
                             await CoreCourseModuleDelegate.getModuleDataFor(module.modname, module, this.course.id);
         }
 
-        if (module.uservisible !== false && module.handlerData?.action) {
+        if (CoreCourseHelper.canUserViewModule(module, section) && module.handlerData?.action) {
             module.handlerData.action(data.event, module, module.course);
         }
 
@@ -574,7 +575,8 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
                 continue;
             }
 
-            modulesLoaded += sections[i].modules.reduce((total, module) => module.visibleoncoursepage !== 0 ? total + 1 : total, 0);
+            modulesLoaded += sections[i].modules.reduce((total, module) =>
+                !CoreCourseHelper.isModuleStealth(module, sections[i]) ? total + 1 : total, 0);
 
             if (modulesLoaded >= CoreCourseFormatComponent.LOAD_MORE_ACTIVITIES) {
                 break;
@@ -632,8 +634,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
      * @return Whether the section can be viewed.
      */
     canViewSection(section: CoreCourseSection): boolean {
-        return section.uservisible !== false && !section.hiddenbynumsections &&
-                section.id != CoreCourseProvider.STEALTH_MODULES_SECTION_ID;
+        return CoreCourseHelper.canUserViewSection(section) && !CoreCourseHelper.isSectionStealth(section);
     }
 
 }
diff --git a/src/core/features/course/components/course-index/course-index.ts b/src/core/features/course/components/course-index/course-index.ts
index 2c2503e7b..ce2c1667d 100644
--- a/src/core/features/course/components/course-index/course-index.ts
+++ b/src/core/features/course/components/course-index/course-index.ts
@@ -18,7 +18,7 @@ import {
     CoreCourseModuleCompletionTracking,
     CoreCourseProvider,
 } from '@features/course/services/course';
-import { CoreCourseSection } from '@features/course/services/course-helper';
+import { CoreCourseHelper, CoreCourseSection } from '@features/course/services/course-helper';
 import { CoreCourseFormatDelegate } from '@features/course/services/format-delegate';
 import { CoreCourseAnyCourseData } from '@features/courses/services/courses';
 import { IonContent } from '@ionic/angular';
@@ -77,11 +77,10 @@ export class CoreCourseCourseIndexComponent implements OnInit {
 
         // Clone sections to add information.
         this.sectionsToRender = this.sections
-            .filter((section) => !section.hiddenbynumsections &&
-                section.id != CoreCourseProvider.STEALTH_MODULES_SECTION_ID)
+            .filter((section) => !CoreCourseHelper.isSectionStealth(section))
             .map((section) => {
                 const modules = section.modules
-                    .filter((module) => module.visibleoncoursepage !== 0 && !module.noviewlink)
+                    .filter((module) => !CoreCourseHelper.isModuleStealth(module, section) && !module.noviewlink)
                     .map((module) => {
                         const completionStatus = !completionEnabled || module.completiondata === undefined ||
                         module.completiondata.tracking == CoreCourseModuleCompletionTracking.COMPLETION_TRACKING_NONE
@@ -93,7 +92,7 @@ export class CoreCourseCourseIndexComponent implements OnInit {
                             name: module.name,
                             course: module.course,
                             visible: !!module.visible,
-                            uservisible: !!module.uservisible,
+                            uservisible: CoreCourseHelper.canUserViewModule(module, section),
                             completionStatus,
                         };
                     });
@@ -103,7 +102,7 @@ export class CoreCourseCourseIndexComponent implements OnInit {
                     name: section.name,
                     availabilityinfo: !!section.availabilityinfo,
                     visible: !!section.visible,
-                    uservisible: section.uservisible !== false,
+                    uservisible: CoreCourseHelper.canUserViewSection(section),
                     expanded: section.id === this.selectedId,
                     highlighted: currentSectionData.section.id === section.id,
                     hasVisibleModules: modules.length > 0,
diff --git a/src/core/features/course/components/module-navigation/module-navigation.ts b/src/core/features/course/components/module-navigation/module-navigation.ts
index 132e8c27a..40a36ad23 100644
--- a/src/core/features/course/components/module-navigation/module-navigation.ts
+++ b/src/core/features/course/components/module-navigation/module-navigation.ts
@@ -13,8 +13,8 @@
 // limitations under the License.
 
 import { Component, Input, OnDestroy, OnInit } from '@angular/core';
-import { CoreCourse, CoreCourseProvider, CoreCourseWSSection } from '@features/course/services/course';
-import { CoreCourseModuleData } from '@features/course/services/course-helper';
+import { CoreCourse, CoreCourseWSSection } from '@features/course/services/course';
+import { CoreCourseHelper, CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate';
 import { IonContent } from '@ionic/angular';
 import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
@@ -187,7 +187,7 @@ export class CoreCourseModuleNavigationComponent implements OnInit, OnDestroy {
      * @return Wether the module is available to the user or not.
      */
     protected isSectionAvailable(section: CoreCourseWSSection): boolean {
-        return section.uservisible !== false && section.id != CoreCourseProvider.STEALTH_MODULES_SECTION_ID;
+        return CoreCourseHelper.canUserViewSection(section) && !CoreCourseHelper.isSectionStealth(section);
     }
 
     /**
@@ -223,7 +223,7 @@ export class CoreCourseModuleNavigationComponent implements OnInit, OnDestroy {
             animationDirection: next ? 'forward' : 'back',
         };
 
-        if (module.uservisible === false) {
+        if (!CoreCourseHelper.canUserViewModule(module)) {
             const section = next ? this.nextModuleSection : this.previousModuleSection;
             options.params = {
                 module,
diff --git a/src/core/features/course/components/module/module.ts b/src/core/features/course/components/module/module.ts
index c90e0407d..d6078eaea 100644
--- a/src/core/features/course/components/module/module.ts
+++ b/src/core/features/course/components/module/module.ts
@@ -19,6 +19,7 @@ import {
     CoreCourseModuleData,
     CoreCourseModuleCompletionData,
     CoreCourseSection,
+    CoreCourseHelper,
 } from '@features/course/services/course-helper';
 import { CoreCourse, CoreCourseModuleCompletionStatus, CoreCourseModuleCompletionTracking } from '@features/course/services/course';
 import { CoreCourseModuleDelegate, CoreCourseModuleHandlerButton } from '@features/course/services/module-delegate';
@@ -166,7 +167,7 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy {
      * @param event Click event.
      */
     moduleClicked(event: Event): void {
-        if (this.module.uservisible !== false && this.module.handlerData?.action) {
+        if (CoreCourseHelper.canUserViewModule(this.module, this.section) && this.module.handlerData?.action) {
             this.module.handlerData.action(event, this.module, this.module.course);
         }
     }
diff --git a/src/core/features/course/pages/list-mod-type/list-mod-type.page.ts b/src/core/features/course/pages/list-mod-type/list-mod-type.page.ts
index fde5d1830..204abf7f8 100644
--- a/src/core/features/course/pages/list-mod-type/list-mod-type.page.ts
+++ b/src/core/features/course/pages/list-mod-type/list-mod-type.page.ts
@@ -75,7 +75,7 @@ export class CoreCourseListModTypePage implements OnInit {
                 }
 
                 section.modules = section.modules.filter((mod) => {
-                    if (mod.uservisible === false || !CoreCourse.moduleHasView(mod)) {
+                    if (!CoreCourseHelper.canUserViewModule(mod, section) || !CoreCourse.moduleHasView(mod)) {
                         // Ignore this module.
                         return false;
                     }
diff --git a/src/core/features/course/services/course-helper.ts b/src/core/features/course/services/course-helper.ts
index ad36f9899..422d4e3a6 100644
--- a/src/core/features/course/services/course-helper.ts
+++ b/src/core/features/course/services/course-helper.ts
@@ -198,7 +198,7 @@ export class CoreCourseHelperProvider {
                     }
 
                     // Check if the module is stealth.
-                    module.isStealth = module.visibleoncoursepage === 0 || (!!module.visible && !section.visible);
+                    module.isStealth = CoreCourseHelper.isModuleStealth(module, section);
                 }));
 
                 return section;
@@ -208,6 +208,50 @@ export class CoreCourseHelperProvider {
         return { hasContent, sections: formattedSections };
     }
 
+    /**
+     * Module is stealth.
+     *
+     * @param module Module to check.
+     * @param section Section to check.
+     * @return Wether the module is stealth.
+     */
+    isModuleStealth(module: CoreCourseModuleData, section?: CoreCourseWSSection): boolean {
+        // visibleoncoursepage can be 1 for teachers when the section is hidden.
+        return !!module.visible && (!module.visibleoncoursepage || (!!section && !section.visible));
+    }
+
+    /**
+     * Module is visible by the user.
+     *
+     * @param module Module to check.
+     * @param section Section to check. Omitted if not defined.
+     * @return Wether the section is visible by the user.
+     */
+    canUserViewModule(module: CoreCourseModuleData, section?: CoreCourseWSSection): boolean {
+        return module.uservisible !== false && (!section || CoreCourseHelper.canUserViewSection(section));
+    }
+
+    /**
+     * Section is stealth.
+     * This should not be true on Moodle 4.0 onwards.
+     *
+     * @param section Section to check.
+     * @return Wether section is stealth (accessible but not visible to students).
+     */
+    isSectionStealth(section: CoreCourseWSSection): boolean {
+        return section.hiddenbynumsections === 1 || section.id === CoreCourseProvider.STEALTH_MODULES_SECTION_ID;
+    }
+
+    /**
+     * Section is visible by the user.
+     *
+     * @param section Section to check.
+     * @return Wether the section is visible by the user.
+     */
+    canUserViewSection(section: CoreCourseWSSection): boolean {
+        return section.uservisible !== false;
+    }
+
     /**
      * Calculate completion data of a module.
      *
diff --git a/src/core/features/course/services/module-prefetch-delegate.ts b/src/core/features/course/services/module-prefetch-delegate.ts
index d75e36759..e0c83ec41 100644
--- a/src/core/features/course/services/module-prefetch-delegate.ts
+++ b/src/core/features/course/services/module-prefetch-delegate.ts
@@ -33,7 +33,7 @@ import { CoreError } from '@classes/errors/error';
 import { CoreWSFile, CoreWSExternalWarning } from '@services/ws';
 import { CHECK_UPDATES_TIMES_TABLE, CoreCourseCheckUpdatesDBRecord } from './database/module-prefetch';
 import { CoreFileSizeSum } from '@services/plugin-file-delegate';
-import { CoreCourseModuleData } from './course-helper';
+import { CoreCourseHelper, CoreCourseModuleData } from './course-helper';
 
 const ROOT_CACHE_KEY = 'mmCourse:';
 
@@ -956,7 +956,7 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
      * @return Promise resolved with true if downloadable, false otherwise.
      */
     async isModuleDownloadable(module: CoreCourseAnyModuleData, courseId: number): Promise<boolean> {
-        if ('uservisible' in module && module.uservisible === false) {
+        if ('uservisible' in module && !CoreCourseHelper.canUserViewModule(module)) {
             // Module isn't visible by the user, cannot be downloaded.
             return false;
         }
diff --git a/src/core/features/filter/services/filter-helper.ts b/src/core/features/filter/services/filter-helper.ts
index 574233d2c..bc6ed652e 100644
--- a/src/core/features/filter/services/filter-helper.ts
+++ b/src/core/features/filter/services/filter-helper.ts
@@ -30,6 +30,7 @@ import { makeSingleton } from '@singletons';
 import { CoreEvents, CoreEventSiteData } from '@singletons/events';
 import { CoreLogger } from '@singletons/logger';
 import { CoreSite } from '@classes/site';
+import { CoreCourseHelper } from '@features/course/services/course-helper';
 
 /**
  * Helper service to provide filter functionalities.
@@ -159,7 +160,7 @@ export class CoreFilterHelperProvider {
         sections.forEach((section) => {
             if (section.modules) {
                 section.modules.forEach((module) => {
-                    if (module.uservisible) {
+                    if (CoreCourseHelper.canUserViewModule(module, section)) {
                         contexts.push({
                             contextlevel: 'module',
                             instanceid: module.id,
diff --git a/src/core/features/siteplugins/classes/handlers/module-handler.ts b/src/core/features/siteplugins/classes/handlers/module-handler.ts
index 846fd28f9..e501e91c6 100644
--- a/src/core/features/siteplugins/classes/handlers/module-handler.ts
+++ b/src/core/features/siteplugins/classes/handlers/module-handler.ts
@@ -16,7 +16,7 @@ import { Type } from '@angular/core';
 
 import { CoreConstants } from '@/core/constants';
 import { CoreCourse } from '@features/course/services/course';
-import { CoreCourseModuleData } from '@features/course/services/course-helper';
+import { CoreCourseHelper, CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate';
 import { CoreSitePluginsModuleIndexComponent } from '@features/siteplugins/components/module-index/module-index';
 import {
@@ -105,7 +105,7 @@ export class CoreSitePluginsModuleHandler extends CoreSitePluginsBaseHandler imp
             };
         }
 
-        if (forCoursePage && this.handlerSchema.coursepagemethod && module.visibleoncoursepage !== 0) {
+        if (forCoursePage && this.handlerSchema.coursepagemethod && !CoreCourseHelper.isModuleStealth(module)) {
             // Call the method to get the course page template.
             const method = this.handlerSchema.coursepagemethod;
             this.loadCoursePageTemplate(module, courseId, handlerData, method);

From b3ccad2b92f820e7a8bc3c55acee2da74d7248b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 18 Mar 2022 15:00:42 +0100
Subject: [PATCH 0775/1008] MOBILE-3814 course: Do not navigate across stealth
 modules

---
 .../course/components/module-navigation/module-navigation.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/features/course/components/module-navigation/module-navigation.ts b/src/core/features/course/components/module-navigation/module-navigation.ts
index 40a36ad23..4e436af4b 100644
--- a/src/core/features/course/components/module-navigation/module-navigation.ts
+++ b/src/core/features/course/components/module-navigation/module-navigation.ts
@@ -177,7 +177,7 @@ export class CoreCourseModuleNavigationComponent implements OnInit, OnDestroy {
      * @return Wether the module is available to the user or not.
      */
     protected async isModuleAvailable(module: CoreCourseModuleData): Promise<boolean> {
-        return CoreCourse.instance.moduleHasView(module);
+        return !CoreCourseHelper.isModuleStealth(module) && CoreCourse.instance.moduleHasView(module);
     }
 
     /**

From 9bcbdfd3c691f558834bbaeb484065ee2e4af051 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 18 Mar 2022 16:20:12 +0100
Subject: [PATCH 0776/1008] MOBILE-3814 calendar: Add collapsible footer save
 and discard buttons

---
 .../calendar/pages/edit-event/edit-event.html | 30 ++++++++-----------
 src/core/directives/collapsible-footer.ts     |  3 +-
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/src/addons/calendar/pages/edit-event/edit-event.html b/src/addons/calendar/pages/edit-event/edit-event.html
index 57b4eb6f4..fe0a30baa 100644
--- a/src/addons/calendar/pages/edit-event/edit-event.html
+++ b/src/addons/calendar/pages/edit-event/edit-event.html
@@ -183,7 +183,7 @@
                 </ion-item>
                 <ion-item class="ion-text-wrap">
                     <ion-label position="stacked">
-                        <p>{{ 'addon.calendar.repeatweeksl' | translate }}</p>
+                        <p class="item-heading">{{ 'addon.calendar.repeatweeksl' | translate }}</p>
                     </ion-label>
                     <ion-input type="number" name="repeats" formControlName="repeats" [disabled]="!form.controls.repeat.value">
                     </ion-input>
@@ -231,23 +231,17 @@
                 <ion-input type="text" name="location" [placeholder]="'core.location' | translate" formControlName="location">
                 </ion-input>
             </ion-item>
-
-            <ion-item>
-                <ion-label>
-                    <ion-row>
-                        <ion-col *ngIf="hasOffline && eventId && eventId < 0">
-                            <ion-button expand="block" fill="outline" (click)="discard()">
-                                {{ 'core.discard' | translate }}
-                            </ion-button>
-                        </ion-col>
-                        <ion-col>
-                            <ion-button expand="block" (click)="submit()" [disabled]="!form.valid" type="submit">
-                                {{ 'core.save' | translate }}
-                            </ion-button>
-                        </ion-col>
-                    </ion-row>
-                </ion-label>
-            </ion-item>
         </form>
+        <div collapsible-footer appearOnBottom *ngIf="loaded && !error" slot="fixed">
+            <div class="list-item-limited-width adaptable-buttons-row">
+                <ion-button *ngIf="hasOffline && eventId && eventId < 0" expand="block" fill="outline" (click)="discard()"
+                    class="ion-margin ion-text-wrap">
+                    {{ 'core.discard' | translate }}
+                </ion-button>
+                <ion-button expand="block" (click)="submit()" [disabled]="!form.valid" type="submit" class="ion-margin ion-text-wrap">
+                    {{ 'core.save' | translate }}
+                </ion-button>
+            </div>
+        </div>
     </core-loading>
 </ion-content>
diff --git a/src/core/directives/collapsible-footer.ts b/src/core/directives/collapsible-footer.ts
index 2dccfd760..e041fa096 100644
--- a/src/core/directives/collapsible-footer.ts
+++ b/src/core/directives/collapsible-footer.ts
@@ -146,7 +146,8 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
                     ? this.finalHeight
                     : this.initialHeight;
 
-                this.setBarHeight(newHeight);            }
+                this.setBarHeight(newHeight);
+            }
         });
 
         this.resizeListener = CoreDomUtils.onWindowResize(() => {

From d727c5362167d2f519ed2dbdfe73a2a4f45bda53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 18 Mar 2022 16:20:56 +0100
Subject: [PATCH 0777/1008] MOBILE-3814 rte: Fix hover style on rte item

---
 .../rich-text-editor/rich-text-editor.ts      | 22 +++++++++----------
 src/theme/theme.base.scss                     |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
index c152c6c41..e13862358 100644
--- a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
+++ b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
@@ -20,7 +20,6 @@ import {
     ViewChild,
     ElementRef,
     OnInit,
-    AfterContentInit,
     OnDestroy,
     Optional,
     AfterViewInit,
@@ -56,7 +55,7 @@ import { CoreCancellablePromise } from '@classes/cancellable-promise';
     templateUrl: 'core-editor-rich-text-editor.html',
     styleUrls: ['rich-text-editor.scss'],
 })
-export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentInit, AfterViewInit, OnDestroy {
+export class CoreEditorRichTextEditorComponent implements OnInit, AfterViewInit, OnDestroy {
 
     // Based on: https://github.com/judgewest2000/Ionic3RichText/
     // @todo: Anchor button, fullscreen...
@@ -149,7 +148,7 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
     }
 
     /**
-     * Component being initialized.
+     * @inheritdoc
      */
     ngOnInit(): void {
         this.canScanQR = CoreUtils.canScanQR();
@@ -159,9 +158,9 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
     }
 
     /**
-     * Init editor.
+     * @inheritdoc
      */
-    async ngAfterContentInit(): Promise<void> {
+    async ngAfterViewInit(): Promise<void> {
         this.rteEnabled = await CoreDomUtils.isRichTextEditorEnabled();
 
         await this.waitLoadingsDone();
@@ -202,13 +201,14 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterContentIn
 
             this.deleteDraftOnSubmitOrCancel();
         }
-    }
 
-    /**
-     * @inheritdoc
-     */
-    async ngAfterViewInit(): Promise<void> {
-        const label = this.element.closest('ion-item')?.querySelector('ion-label');
+        const ionItem = this.element.closest<HTMLIonItemElement>('ion-item');
+        if (!ionItem) {
+            return;
+        }
+        ionItem.classList.add('item-rte');
+
+        const label = ionItem.querySelector('ion-label');
 
         if (!label) {
             return;
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 791f5022e..b60b71e4e 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -1255,7 +1255,7 @@ ion-datetime.datetime-disabled {
 
 // Make links clickable when inside radio or checkbox items. Style part.
 @media (hover: hover) {
-    ion-item.item-multiple-inputs:hover::part(native) {
+    ion-item.item-multiple-inputs:not(.item-rte):hover::part(native) {
         color: var(--color-hover);
 
         &::after {
@@ -1276,7 +1276,7 @@ ion-datetime.datetime-disabled {
 
 // It fixes the click on links where ion-ripple-effect is present.
 // Make links clickable when inside radio or checkbox items. Pointer and cursor part.
-ion-item.item-multiple-inputs:not(.only-links),
+ion-item.item-multiple-inputs:not(.only-links):not(.item-rte),
 ion-item.ion-activatable:not(.only-links) {
     cursor: pointer;
     ion-label {

From dcb19c0f11fb4f76449aeffd32d02c832733a2bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 18 Mar 2022 17:21:51 +0100
Subject: [PATCH 0778/1008] MOBILE-3814 collapsible: Recalculate Height when
 slotted

---
 src/core/directives/collapsible-footer.ts |  4 ++
 src/core/services/utils/dom.ts            | 47 +++++++++++++++++++++++
 2 files changed, 51 insertions(+)

diff --git a/src/core/directives/collapsible-footer.ts b/src/core/directives/collapsible-footer.ts
index e041fa096..57f24d707 100644
--- a/src/core/directives/collapsible-footer.ts
+++ b/src/core/directives/collapsible-footer.ts
@@ -72,6 +72,10 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
 
         await this.calculateHeight();
 
+        CoreDomUtils.onElementSlot(this.element, () => {
+            this.calculateHeight();
+        });
+
         this.listenScrollEvents();
     }
 
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index 2df0fcfc1..88215d904 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -220,6 +220,53 @@ export class CoreDomUtilsProvider {
         );
     }
 
+    /**
+     * Runs a function when an element has been slotted.
+     *
+     * @param element HTML Element inside an ion-content to wait for slot.
+     * @param callback Function to execute on resize.
+     */
+    onElementSlot(element: HTMLElement, callback: (ev?: Event) => void): void {
+        if (!element.slot) {
+            // Element not declared to be slotted.
+            return;
+        }
+
+        const slotName = element.slot;
+        if (element.assignedSlot?.name === slotName) {
+            // Slot already assigned.
+            callback();
+
+            return;
+        }
+
+        const content = element.closest('ion-content');
+        if (!content || !content.shadowRoot) {
+            // Cannot find content.
+            return;
+        }
+
+        const slots = content.shadowRoot.querySelectorAll('slot');
+        const slot = Array.from(slots).find((slot) => slot.name === slotName);
+
+        if (!slot) {
+            // Slot not found.
+            return;
+        }
+
+        const slotListener = () => {
+            if (element.assignedSlot?.name !== slotName) {
+                return;
+            }
+
+            callback();
+            // It would happen only once.
+            slot.removeEventListener('slotchange', slotListener);
+        };
+
+        slot.addEventListener('slotchange', slotListener);;
+    }
+
     /**
      * Window resize is widely checked and may have many performance issues, debouce usage is needed to avoid calling it too much.
      * This function helps setting up the debounce feature and remove listener easily.

From f31ee78cfbdecd42fc52618a345d0e8f2d49b922 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 18 Mar 2022 17:42:01 +0100
Subject: [PATCH 0779/1008] MOBILE-3814 fab: Use dom promises before
 calculating heights

---
 src/core/directives/fab.ts | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/core/directives/fab.ts b/src/core/directives/fab.ts
index d8cd1db30..2fb399c2e 100644
--- a/src/core/directives/fab.ts
+++ b/src/core/directives/fab.ts
@@ -13,7 +13,8 @@
 // limitations under the License.
 
 import { Directive, ElementRef, OnDestroy, OnInit } from '@angular/core';
-import { CoreUtils } from '@services/utils/utils';
+import { CoreCancellablePromise } from '@classes/cancellable-promise';
+import { CoreDomUtils } from '@services/utils/dom';
 
 /**
  * Directive to move ion-fab components as direct children of the nearest ion-content.
@@ -30,6 +31,7 @@ export class CoreFabDirective implements OnInit, OnDestroy {
     protected element: HTMLElement;
     protected content?: HTMLIonContentElement | null;
     protected initialPaddingBottom = 0;
+    protected domPromise?: CoreCancellablePromise<void>;
 
     constructor(el: ElementRef) {
         this.element = el.nativeElement;
@@ -39,15 +41,31 @@ export class CoreFabDirective implements OnInit, OnDestroy {
     /**
      * @inheritdoc
      */
-    async ngOnInit(retries = 3): Promise<void> {
+    async ngOnInit(): Promise<void> {
+        this.domPromise = CoreDomUtils.waitToBeInDOM(this.element);
+        await this.domPromise;
+
         this.content = this.element.closest('ion-content');
+
         if (!this.content) {
-            if(retries > 0) {
-                await CoreUtils.nextTicks(50);
+            return;
+        }
 
-                this.ngOnInit(retries - 1);
-            }
+        // Add space at the bottom to let the user see the whole content.
+        this.initialPaddingBottom = parseFloat(this.content.style.getPropertyValue('--padding-bottom') || '0');
 
+        await this.calculatePlace();
+
+        CoreDomUtils.onElementSlot(this.element, () => {
+            this.calculatePlace();
+        });
+    }
+
+    /**
+     * Calculate the height of the footer.
+     */
+    protected async calculatePlace(): Promise<void> {
+        if (!this.content) {
             return;
         }
 
@@ -58,8 +76,6 @@ export class CoreFabDirective implements OnInit, OnDestroy {
             this.content.appendChild(this.element);
         }
 
-        // Add space at the bottom to let the user see the whole content.
-        this.initialPaddingBottom = parseFloat(this.content.style.getPropertyValue('--padding-bottom') || '0');
         this.content.style.setProperty('--padding-bottom', this.initialPaddingBottom + initialHeight + 'px');
     }
 
@@ -70,6 +86,7 @@ export class CoreFabDirective implements OnInit, OnDestroy {
         if (this.content) {
             this.content.style.setProperty('--padding-bottom', this.initialPaddingBottom + 'px');
         }
+        this.domPromise?.cancel();
     }
 
 }

From fd1e5ee0ebdf9d657a3fe64774dda85b5f0f73ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Sat, 19 Mar 2022 15:57:15 +0100
Subject: [PATCH 0780/1008] MOBILE-3814 core: Use waitForResizeDone on
 onWindowResize listener

---
 .../qtype/ddimageortext/classes/ddimageortext.ts      | 11 +----------
 src/addons/qtype/ddmarker/classes/ddmarker.ts         | 11 +----------
 src/addons/qtype/ddwtos/classes/ddwtos.ts             | 11 +----------
 src/core/services/utils/dom.ts                        |  5 ++++-
 4 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/src/addons/qtype/ddimageortext/classes/ddimageortext.ts b/src/addons/qtype/ddimageortext/classes/ddimageortext.ts
index 5fd0cc61b..3d066d1f0 100644
--- a/src/addons/qtype/ddimageortext/classes/ddimageortext.ts
+++ b/src/addons/qtype/ddimageortext/classes/ddimageortext.ts
@@ -360,7 +360,7 @@ export class AddonQtypeDdImageOrTextQuestion {
         });
 
         this.resizeListener = CoreDomUtils.onWindowResize(() => {
-            this.windowResized();
+            this.repositionDragsForQuestion();
         });
     }
 
@@ -679,15 +679,6 @@ export class AddonQtypeDdImageOrTextQuestion {
         }
     }
 
-    /**
-     * Window resized.
-     */
-    async windowResized(): Promise<void> {
-        await CoreDomUtils.waitForResizeDone();
-
-        this.repositionDragsForQuestion();
-    }
-
 }
 
 /**
diff --git a/src/addons/qtype/ddmarker/classes/ddmarker.ts b/src/addons/qtype/ddmarker/classes/ddmarker.ts
index e1a1ddc06..ab7350a80 100644
--- a/src/addons/qtype/ddmarker/classes/ddmarker.ts
+++ b/src/addons/qtype/ddmarker/classes/ddmarker.ts
@@ -611,7 +611,7 @@ export class AddonQtypeDdMarkerQuestion {
         });
 
         this.resizeListener = CoreDomUtils.onWindowResize(() => {
-            this.windowResized();
+            this.redrawDragsAndDrops();
         });
     }
 
@@ -879,15 +879,6 @@ export class AddonQtypeDdMarkerQuestion {
         }
     }
 
-    /**
-     * Window resized.
-     */
-    async windowResized(): Promise<void> {
-        await CoreDomUtils.waitForResizeDone();
-
-        this.redrawDragsAndDrops();
-    }
-
 }
 
 /**
diff --git a/src/addons/qtype/ddwtos/classes/ddwtos.ts b/src/addons/qtype/ddwtos/classes/ddwtos.ts
index 9bb54147a..63c4fcc6c 100644
--- a/src/addons/qtype/ddwtos/classes/ddwtos.ts
+++ b/src/addons/qtype/ddwtos/classes/ddwtos.ts
@@ -212,7 +212,7 @@ export class AddonQtypeDdwtosQuestion {
         this.positionDragItems();
 
         this.resizeListener = CoreDomUtils.onWindowResize(() => {
-            this.windowResized();
+            this.positionDragItems();
         });
     }
 
@@ -513,15 +513,6 @@ export class AddonQtypeDdwtosQuestion {
         });
     }
 
-    /**
-     * Window resized.
-     */
-    async windowResized(): Promise<void> {
-        await CoreDomUtils.waitForResizeDone();
-
-        this.positionDragItems();
-    }
-
 }
 
 /**
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index 88215d904..5e1aed45e 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -276,7 +276,9 @@ export class CoreDomUtilsProvider {
      * @return Event observer to call off when finished.
      */
     onWindowResize(resizeFunction: (ev?: Event) => void, debounceDelay = 20): CoreEventObserver {
-        const resizeListener = CoreUtils.debounce((ev?: Event) => {
+        const resizeListener = CoreUtils.debounce(async (ev?: Event) => {
+            await this.waitForResizeDone();
+
             resizeFunction(ev);
         }, debounceDelay);
 
@@ -2153,6 +2155,7 @@ export class CoreDomUtilsProvider {
 
     /**
      * In iOS the resize event is triggered before the window size changes. Wait for the size to change.
+     * Use of this function is discouraged. Please use onWindowResize to check window resize event.
      *
      * @param windowWidth Initial window width.
      * @param windowHeight Initial window height.

From faa43fbece44ce81cf1b18d9b81f477f507a99bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Sat, 19 Mar 2022 16:06:40 +0100
Subject: [PATCH 0781/1008] MOBILE-3814 navbar-buttons: Use dom promises and
 rewrite searchHeader

---
 .../navbar-buttons/navbar-buttons.ts          | 58 ++++---------------
 1 file changed, 12 insertions(+), 46 deletions(-)

diff --git a/src/core/components/navbar-buttons/navbar-buttons.ts b/src/core/components/navbar-buttons/navbar-buttons.ts
index 88e32057f..96bcf0c21 100644
--- a/src/core/components/navbar-buttons/navbar-buttons.ts
+++ b/src/core/components/navbar-buttons/navbar-buttons.ts
@@ -103,7 +103,7 @@ export class CoreNavBarButtonsComponent implements OnInit, OnDestroy {
                     selector += '[slot="' + slot + '"]';
                 }
 
-                const buttonsContainer = <HTMLElement> header.querySelector(selector);
+                const buttonsContainer = header.querySelector<HTMLIonButtonsElement>(selector);
                 if (buttonsContainer) {
                     this.mergeContextMenus(buttonsContainer);
 
@@ -147,7 +147,7 @@ export class CoreNavBarButtonsComponent implements OnInit, OnDestroy {
      *
      * @param buttonsContainer The container where the buttons will be moved.
      */
-    protected mergeContextMenus(buttonsContainer: HTMLElement): void {
+    protected mergeContextMenus(buttonsContainer: HTMLIonButtonsElement): void {
         // Check if both button containers have a context menu.
         const secondaryContextMenu = this.element.querySelector('core-context-menu');
         if (!secondaryContextMenu) {
@@ -194,60 +194,26 @@ export class CoreNavBarButtonsComponent implements OnInit, OnDestroy {
     /**
      * Search the ion-header where the buttons should be added.
      *
-     * @param retries Number of retries so far.
      * @return Promise resolved with the header element.
      */
-    protected async searchHeader(retries: number = 0): Promise<HTMLElement> {
+    protected async searchHeader(): Promise<HTMLIonHeaderElement> {
+        await CoreDomUtils.waitToBeInDOM(this.element);
+
         let parentPage: HTMLElement | null = this.element;
-
-        while (parentPage) {
-            if (!parentPage.parentElement) {
-                // No parent, stop.
-                break;
-            }
-
+        while (parentPage && parentPage.parentElement) {
             // Get the next parent page.
             parentPage = parentPage.parentElement.closest('.ion-page');
-            if (parentPage) {
-                // Check if the page has a header. If it doesn't, search the next parent page.
-                const header = this.searchHeaderInPage(parentPage);
-                if (header && getComputedStyle(header, null).display != 'none') {
-                    return header;
-                }
+            // Check if the page has a header. If it doesn't, search the next parent page.
+            const header  = parentPage?.querySelector<HTMLIonHeaderElement>(':scope > ion-header');
+            if (header && getComputedStyle(header).display !== 'none') {
+                return header;
             }
         }
 
-        // Header not found.
-        if (retries < 5) {
-            // If the component or any of its parent is inside a ng-content or similar it can be detached when it's initialized.
-            // Try again after a while.
-            return new Promise((resolve, reject): void => {
-                setTimeout(() => {
-                    // eslint-disable-next-line promise/catch-or-return
-                    this.searchHeader(retries + 1).then(resolve, reject);
-                }, 200);
-            });
-        }
-
-        // We've waited enough time, reject.
+        // Header not found, reject.
         throw Error('Header not found.');
     }
 
-    /**
-     * Search ion-header inside a page. The header should be a direct child.
-     *
-     * @param page Page to search in.
-     * @return Header element. Undefined if not found.
-     */
-    protected searchHeaderInPage(page: HTMLElement): HTMLElement | undefined {
-        for (let i = 0; i < page.children.length; i++) {
-            const child = page.children[i];
-            if (child.tagName == 'ION-HEADER') {
-                return <HTMLElement> child;
-            }
-        }
-    }
-
     /**
      * Show or hide all the elements.
      */
@@ -280,7 +246,7 @@ export class CoreNavBarButtonsComponent implements OnInit, OnDestroy {
     }
 
     /**
-     * Component destroyed.
+     * @inheritdoc
      */
     ngOnDestroy(): void {
         // This component was destroyed, remove all the buttons that were moved.

From 505891fa1170e1d9c645c88204e6a9f37b1dd2d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 21 Mar 2022 10:52:45 +0100
Subject: [PATCH 0782/1008] MOBILE-3814 auto-focus: Improve focus handling

---
 .../services/handlers/mediaplugin.ts          | 14 +--
 .../show-password/core-show-password.html     |  6 +-
 .../components/show-password/show-password.ts | 97 +++++++++++--------
 src/core/directives/auto-focus.ts             | 50 +++-------
 .../rich-text-editor/rich-text-editor.ts      |  2 +-
 src/core/services/utils/dom.ts                | 29 ++++--
 src/core/singletons/form.ts                   |  4 +-
 7 files changed, 103 insertions(+), 99 deletions(-)

diff --git a/src/addons/filter/mediaplugin/services/handlers/mediaplugin.ts b/src/addons/filter/mediaplugin/services/handlers/mediaplugin.ts
index ad08e3186..509451927 100644
--- a/src/addons/filter/mediaplugin/services/handlers/mediaplugin.ts
+++ b/src/addons/filter/mediaplugin/services/handlers/mediaplugin.ts
@@ -15,7 +15,6 @@
 import { Injectable } from '@angular/core';
 
 import { CoreFilterDefaultHandler } from '@features/filter/services/handlers/default-filter';
-import { CoreFilterFilter, CoreFilterFormatTextOptions } from '@features/filter/services/filter';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreUrlUtils } from '@services/utils/url';
 import { makeSingleton } from '@singletons';
@@ -32,19 +31,10 @@ export class AddonFilterMediaPluginHandlerService extends CoreFilterDefaultHandl
     protected template = document.createElement('template'); // A template element to convert HTML to element.
 
     /**
-     * Filter some text.
-     *
-     * @param text The text to filter.
-     * @param filter The filter.
-     * @param options Options passed to the filters.
-     * @param siteId Site ID. If not defined, current site.
-     * @return Filtered text (or promise resolved with the filtered text).
+     * @inheritdoc
      */
     filter(
         text: string,
-        filter: CoreFilterFilter, // eslint-disable-line @typescript-eslint/no-unused-vars
-        options: CoreFilterFormatTextOptions, // eslint-disable-line @typescript-eslint/no-unused-vars
-        siteId?: string, // eslint-disable-line @typescript-eslint/no-unused-vars
     ): string | Promise<string> {
         this.template.innerHTML = text;
 
@@ -60,7 +50,7 @@ export class AddonFilterMediaPluginHandlerService extends CoreFilterDefaultHandl
     /**
      * Treat video filters. Currently only treating youtube video using video JS.
      *
-     * @param el Video element.
+     * @param video Video element.
      */
     protected treatVideoFilters(video: HTMLElement): void {
         // Treat Video JS Youtube video links and translate them to iframes.
diff --git a/src/core/components/show-password/core-show-password.html b/src/core/components/show-password/core-show-password.html
index b33aefbdd..f6f283d40 100644
--- a/src/core/components/show-password/core-show-password.html
+++ b/src/core/components/show-password/core-show-password.html
@@ -1,4 +1,6 @@
 <ng-content></ng-content>
-<ion-button fill="clear" [attr.aria-label]="label | translate" core-suppress-events (onClick)="toggle($event)">
-    <ion-icon [name]="iconName" slot="icon-only" aria-hidden="true"></ion-icon>
+<ion-button fill="clear" [attr.aria-label]="label | translate" core-suppress-events (onClick)="toggle($event)"
+    (mousedown)="doNotBlur($event)" (keydown)="doNotBlur($event)" (keyup)="toggle($event)">
+    <ion-icon [name]=" iconName" slot="icon-only" aria-hidden="true">
+    </ion-icon>
 </ion-button>
diff --git a/src/core/components/show-password/show-password.ts b/src/core/components/show-password/show-password.ts
index 56faad272..61d6bbc08 100644
--- a/src/core/components/show-password/show-password.ts
+++ b/src/core/components/show-password/show-password.ts
@@ -44,12 +44,11 @@ export class CoreShowPasswordComponent implements OnInit, AfterViewInit {
     @Input() initialShown?: boolean | string; // Whether the password should be shown at start.
     @ContentChild(IonInput) ionInput?: IonInput;
 
-    shown!: boolean; // Whether the password is shown.
-    label!: string; // Label for the button to show/hide.
-    iconName!: string; // Name of the icon of the button to show/hide.
-    selector = ''; // Selector to identify the input.
+    shown = false; // Whether the password is shown.
+    label = ''; // Label for the button to show/hide.
+    iconName = ''; // Name of the icon of the button to show/hide.
 
-    protected input?: HTMLInputElement | null; // Input affected.
+    protected input?: HTMLInputElement; // Input affected.
     protected element: HTMLElement; // Current element.
 
     constructor(element: ElementRef) {
@@ -57,58 +56,51 @@ export class CoreShowPasswordComponent implements OnInit, AfterViewInit {
     }
 
     /**
-     * Component being initialized.
+     * @inheritdoc
      */
     ngOnInit(): void {
         this.shown = CoreUtils.isTrueOrOne(this.initialShown);
-        this.selector = 'input[name="' + this.name + '"]';
-        this.setData();
     }
 
     /**
-     * View has been initialized.
+     * @inheritdoc
      */
-    ngAfterViewInit(): void {
-        this.searchInput();
-    }
-
-    /**
-     * Search the input to show/hide.
-     */
-    protected async searchInput(): Promise<void> {
+    async ngAfterViewInit(): Promise<void> {
         if (this.ionInput) {
             // It's an ion-input, use it to get the native element.
             this.input = await this.ionInput.getInputElement();
+            this.setData(this.input);
 
             return;
         }
 
         // Search the input.
-        this.input = <HTMLInputElement> this.element.querySelector(this.selector);
+        this.input = this.element.querySelector<HTMLInputElement>('input[name="' + this.name + '"]') ?? undefined;
 
-        if (this.input) {
-            // Input found. Set the right type.
-            this.input.type = this.shown ? 'text' : 'password';
+        if (!this.input) {
+            return;
+        }
 
-            // By default, don't autocapitalize and autocorrect.
-            if (!this.input.getAttribute('autocorrect')) {
-                this.input.setAttribute('autocorrect', 'off');
-            }
-            if (!this.input.getAttribute('autocapitalize')) {
-                this.input.setAttribute('autocapitalize', 'none');
-            }
+        this.setData(this.input);
+
+        // By default, don't autocapitalize and autocorrect.
+        if (!this.input.getAttribute('autocorrect')) {
+            this.input.setAttribute('autocorrect', 'off');
+        }
+        if (!this.input.getAttribute('autocapitalize')) {
+            this.input.setAttribute('autocapitalize', 'none');
         }
     }
 
     /**
      * Set label, icon name and input type.
+     *
+     * @param input The input element.
      */
-    protected setData(): void {
+    protected setData(input: HTMLInputElement): void {
         this.label = this.shown ? 'core.hide' : 'core.show';
         this.iconName = this.shown ? 'fas-eye-slash' : 'fas-eye';
-        if (this.input) {
-            this.input.type = this.shown ? 'text' : 'password';
-        }
+        input.type = this.shown ? 'text' : 'password';
     }
 
     /**
@@ -117,20 +109,49 @@ export class CoreShowPasswordComponent implements OnInit, AfterViewInit {
      * @param event The mouse event.
      */
     toggle(event: Event): void {
+        if (event.type == 'keyup' && !this.isValidKeyboardKey(<KeyboardEvent>event)) {
+            return;
+        }
+
         event.preventDefault();
         event.stopPropagation();
 
         const isFocused = document.activeElement === this.input;
-
         this.shown = !this.shown;
-        this.setData();
 
+        if (!this.input) {
+            return;
+        }
+
+        this.setData(this.input);
+        // In Android, the keyboard is closed when the input type changes. Focus it again.
         if (isFocused && CoreApp.isAndroid()) {
-            // In Android, the keyboard is closed when the input type changes. Focus it again.
-            setTimeout(() => {
-                CoreDomUtils.focusElement(this.input!);
-            }, 400);
+            CoreDomUtils.focusElement(this.input);
         }
     }
 
+    /**
+     * Do not loose focus.
+     *
+     * @param event The mouse event.
+     */
+    doNotBlur(event: Event): void {
+        if (event.type == 'keydown' && !this.isValidKeyboardKey(<KeyboardEvent>event)) {
+            return;
+        }
+
+        event.preventDefault();
+        event.stopPropagation();
+    }
+
+    /**
+     * Checks if Space or Enter have been pressed.
+     *
+     * @param event Keyboard Event.
+     * @returns Wether space or enter have been pressed.
+     */
+    protected isValidKeyboardKey(event: KeyboardEvent): boolean {
+        return event.key == ' ' || event.key == 'Enter';
+    }
+
 }
diff --git a/src/core/directives/auto-focus.ts b/src/core/directives/auto-focus.ts
index 6aeb4d829..152d3a5e4 100644
--- a/src/core/directives/auto-focus.ts
+++ b/src/core/directives/auto-focus.ts
@@ -32,7 +32,7 @@ export class CoreAutoFocusDirective implements AfterViewInit {
 
     @Input('core-auto-focus') autoFocus: boolean | string = true;
 
-    protected element: HTMLElement;
+    protected element: HTMLIonInputElement | HTMLIonTextareaElement | HTMLIonSearchbarElement | HTMLElement;
 
     constructor(element: ElementRef) {
         this.element = element.nativeElement;
@@ -41,51 +41,27 @@ export class CoreAutoFocusDirective implements AfterViewInit {
     /**
      * @inheritdoc
      */
-    ngAfterViewInit(): void {
+    async ngAfterViewInit(): Promise<void> {
         if (CoreUtils.isFalseOrZero(this.autoFocus)) {
             return;
         }
 
-        this.setFocus();
-    }
+        await CoreDomUtils.waitToBeInDOM(this.element);
 
-    /**
-     * Function to focus the element.
-     *
-     * @param retries Internal param to stop retrying on 0.
-     */
-    protected setFocus(retries = 10): void {
-        if (retries == 0) {
+        let focusElement = this.element;
+
+        if ('getInputElement' in focusElement) {
+            // If it's an Ionic element get the right input to use.
+            focusElement.componentOnReady && await focusElement.componentOnReady();
+            focusElement = await focusElement.getInputElement();
+        }
+
+        if (!focusElement) {
             return;
         }
 
-        // Wait a bit to make sure the view is loaded.
-        setTimeout(() => {
-            // If it's a ion-input or ion-textarea, search the right input to use.
-            let element: HTMLElement | null = null;
+        CoreDomUtils.focusElement(focusElement);
 
-            if (this.element.tagName == 'ION-INPUT') {
-                element = this.element.querySelector('input');
-            } else if (this.element.tagName == 'ION-TEXTAREA') {
-                element = this.element.querySelector('textarea');
-            } else {
-                element = this.element;
-            }
-
-            if (!element) {
-                this.setFocus(retries - 1);
-
-                return;
-            }
-
-            CoreDomUtils.focusElement(element);
-
-            if (element != document.activeElement) {
-                this.setFocus(retries - 1);
-
-                return;
-            }
-        }, 200);
     }
 
 }
diff --git a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
index e13862358..370816d78 100644
--- a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
+++ b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
@@ -773,7 +773,7 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterViewInit,
      * @param event Event.
      */
     stopBubble(event: Event): void {
-        if (event.type != 'touchend' &&event.type != 'mouseup' && event.type != 'keyup') {
+        if (event.type != 'touchend' && event.type != 'mouseup' && event.type != 'keyup') {
             event.preventDefault();
         }
         event.stopPropagation();
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index 5e1aed45e..a0f25b3c0 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -510,15 +510,30 @@ export class CoreDomUtilsProvider {
     /**
      * Focus an element and open keyboard.
      *
-     * @param el HTML element to focus.
+     * @param focusElement HTML element to focus.
      */
-    focusElement(el: HTMLElement): void {
-        if (el?.focus) {
-            el.focus();
-            if (CoreApp.isAndroid() && this.supportsInputKeyboard(el)) {
-                // On some Android versions the keyboard doesn't open automatically.
-                CoreApp.openKeyboard();
+    async focusElement(focusElement: HTMLElement): Promise<void> {
+        let retries = 10;
+
+        if (!focusElement.focus) {
+            throw new CoreError('Element to focus cannot be focused');
+        }
+
+        while (retries > 0 && focusElement !== document.activeElement) {
+            focusElement.focus();
+
+            if (focusElement === document.activeElement) {
+                await CoreUtils.nextTick();
+                if (CoreApp.isAndroid() && this.supportsInputKeyboard(focusElement)) {
+                    // On some Android versions the keyboard doesn't open automatically.
+                    CoreApp.openKeyboard();
+                }
+                break;
             }
+
+            // @TODO Probably a Mutation Observer would get this working.
+            await CoreUtils.wait(50);
+            retries--;
         }
     }
 
diff --git a/src/core/singletons/form.ts b/src/core/singletons/form.ts
index f3f3d8775..f4beefa7c 100644
--- a/src/core/singletons/form.ts
+++ b/src/core/singletons/form.ts
@@ -60,7 +60,7 @@ export class CoreForms {
     /**
      * Trigger form cancelled event.
      *
-     * @param form Form element.
+     * @param formRef Form element.
      * @param siteId The site affected. If not provided, no site affected.
      */
     static triggerFormCancelledEvent(formRef?: ElementRef | HTMLFormElement | undefined, siteId?: string): void {
@@ -77,7 +77,7 @@ export class CoreForms {
     /**
      * Trigger form submitted event.
      *
-     * @param form Form element.
+     * @param formRef Form element.
      * @param online Whether the action was done in offline or not.
      * @param siteId The site affected. If not provided, no site affected.
      */

From dbc91004e4391f26519f82f844f5ec987390f78e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 21 Mar 2022 11:29:46 +0100
Subject: [PATCH 0783/1008] MOBILE-3814 ddwtos: Use dom Promises to know if
 element is ready

---
 src/addons/qtype/ddwtos/classes/ddwtos.ts | 77 ++++++++++-------------
 1 file changed, 34 insertions(+), 43 deletions(-)

diff --git a/src/addons/qtype/ddwtos/classes/ddwtos.ts b/src/addons/qtype/ddwtos/classes/ddwtos.ts
index 63c4fcc6c..29ab292dc 100644
--- a/src/addons/qtype/ddwtos/classes/ddwtos.ts
+++ b/src/addons/qtype/ddwtos/classes/ddwtos.ts
@@ -12,9 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { CoreFormatTextDirective } from '@directives/format-text';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreUtils } from '@services/utils/utils';
+import { CoreComponentsRegistry } from '@singletons/components-registry';
 import { CoreEventObserver } from '@singletons/events';
 import { CoreLogger } from '@singletons/logger';
 import { AddonModQuizDdwtosQuestionData } from '../component/ddwtos';
@@ -26,7 +28,7 @@ export class AddonQtypeDdwtosQuestion {
 
     protected logger: CoreLogger;
     protected nextDragItemNo = 1;
-    protected selectors!: AddonQtypeDdwtosQuestionCSSSelectors; // Result of cssSelectors.
+    protected selectors = new AddonQtypeDdwtosQuestionCSSSelectors(); // Result of cssSelectors.
     protected placed: {[no: number]: number} = {}; // Map that relates drag elements numbers with drop zones numbers.
     protected selected?: HTMLElement; // Selected element (being "dragged").
     protected resizeListener?: CoreEventObserver;
@@ -80,8 +82,8 @@ export class AddonQtypeDdwtosQuestion {
      * Invisible 'drag homes' are output in the question. These have the same properties as the drag items but are invisible.
      * We clone these invisible elements to make the actual drag items.
      */
-    cloneDragItems(): void {
-        const dragHomes = <HTMLElement[]> Array.from(this.container.querySelectorAll(this.selectors.dragHomes()));
+    async cloneDragItems(): Promise<void> {
+        const dragHomes = Array.from(this.container.querySelectorAll<HTMLElement>(this.selectors.dragHomes()));
         for (let x = 0; x < dragHomes.length; x++) {
             this.cloneDragItemsForOneChoice(dragHomes[x]);
         }
@@ -110,7 +112,7 @@ export class AddonQtypeDdwtosQuestion {
      */
     deselectDrags(): void {
         // Remove the selected class from all drags.
-        const drags = <HTMLElement[]> Array.from(this.container.querySelectorAll(this.selectors.drags()));
+        const drags = Array.from(this.container.querySelectorAll<HTMLElement>(this.selectors.drags()));
         drags.forEach((drag) => {
             drag.classList.remove('selected');
         });
@@ -192,19 +194,13 @@ export class AddonQtypeDdwtosQuestion {
      * Initialize the question.
      */
     async initializer(): Promise<void> {
-        this.selectors = new AddonQtypeDdwtosQuestionCSSSelectors();
-
-        const container = <HTMLElement> this.container.querySelector(this.selectors.topNode());
-        if (this.readOnly) {
-            container.classList.add('readonly');
-        } else {
-            container.classList.add('notreadonly');
-        }
+        const container = this.container.querySelector<HTMLElement>(this.selectors.topNode());
+        container?.classList.add(this.readOnly ? 'readonly' : 'notreadonly');
 
         // Wait for the elements to be ready.
         await this.waitForReady();
 
-        this.setPaddingSizesAll();
+        await this.setPaddingSizesAll();
         this.cloneDragItems();
         this.initialPlaceOfDragItems();
         this.makeDropZones();
@@ -220,7 +216,7 @@ export class AddonQtypeDdwtosQuestion {
      * Initialize drag items, putting them in their initial place.
      */
     initialPlaceOfDragItems(): void {
-        const drags = <HTMLElement[]> Array.from(this.container.querySelectorAll(this.selectors.drags()));
+        const drags = Array.from(this.container.querySelectorAll<HTMLElement>(this.selectors.drags()));
 
         // Add the class 'unplaced' to all elements.
         drags.forEach((drag) => {
@@ -292,15 +288,15 @@ export class AddonQtypeDdwtosQuestion {
         }
 
         // Create all the drop zones.
-        const drops = <HTMLElement[]> Array.from(this.container.querySelectorAll(this.selectors.drops()));
+        const drops = Array.from(this.container.querySelectorAll<HTMLElement>(this.selectors.drops()));
         drops.forEach((drop) => {
             this.makeDropZone(drop);
         });
 
         // If home answer zone is clicked, return drag home.
-        const home = <HTMLElement> this.container.querySelector(this.selectors.topNode() + ' .answercontainer');
+        const home = this.container.querySelector<HTMLElement>(this.selectors.topNode() + ' .answercontainer');
 
-        home.addEventListener('click', () => {
+        home?.addEventListener('click', () => {
             const drag = this.selected;
             if (!drag) {
                 // No element selected, nothing to do.
@@ -413,36 +409,25 @@ export class AddonQtypeDdwtosQuestion {
      * Postition, or reposition, all the drag items. They're placed in the right drop zone or in the home zone.
      */
     positionDragItems(): void {
-        const drags = <HTMLElement[]> Array.from(this.container.querySelectorAll(this.selectors.drags()));
+        const drags = Array.from(this.container.querySelectorAll<HTMLElement>(this.selectors.drags()));
         drags.forEach((drag) => {
             this.positionDragItem(drag);
         });
     }
 
     /**
-     * Wait for the drag items to have an offsetParent. For some reason it takes a while.
+     * Wait for the drag home items to be in DOM.
      *
-     * @param retries Number of times this has been retried.
-     * @return Promise resolved when ready or if it took too long to load.
+     * @return Promise resolved when ready in the DOM.
      */
-    protected async waitForReady(retries: number = 0): Promise<void> {
-        const drag = <HTMLElement | null> Array.from(this.container.querySelectorAll(this.selectors.drags()))[0];
-        if (drag?.offsetParent || retries >= 10) {
-            // Ready or too many retries, stop.
-            return;
-        }
+    protected async waitForReady(): Promise<void> {
+        await CoreDomUtils.waitToBeInDOM(this.container);
 
-        const deferred = CoreUtils.promiseDefer<void>();
+        await CoreComponentsRegistry.waitComponentsReady(this.container, 'core-format-text', CoreFormatTextDirective);
 
-        setTimeout(async () => {
-            try {
-                await this.waitForReady(retries + 1);
-            } finally {
-                deferred.resolve();
-            }
-        }, 20);
+        const drag = Array.from(this.container.querySelectorAll<HTMLElement>(this.selectors.dragHomes()))[0];
 
-        return deferred.promise;
+        await CoreDomUtils.waitToBeInDOM(drag);
     }
 
     /**
@@ -452,7 +437,7 @@ export class AddonQtypeDdwtosQuestion {
      */
     removeDragFromDrop(drag: HTMLElement): void {
         const placeNo = this.placed[this.getNo(drag) ?? -1];
-        const drop = <HTMLElement> this.container.querySelector(this.selectors.dropForPlace(placeNo));
+        const drop = this.container.querySelector<HTMLElement>(this.selectors.dropForPlace(placeNo));
 
         this.placeDragInDrop(null, drop);
     }
@@ -473,9 +458,9 @@ export class AddonQtypeDdwtosQuestion {
     /**
      * Set the padding size for all groups.
      */
-    setPaddingSizesAll(): void {
+    async setPaddingSizesAll(): Promise<void> {
         for (let groupNo = 1; groupNo <= 8; groupNo++) {
-            this.setPaddingSizeForGroup(groupNo);
+            await this.setPaddingSizeForGroup(groupNo);
         }
     }
 
@@ -484,19 +469,25 @@ export class AddonQtypeDdwtosQuestion {
      *
      * @param groupNo Group number.
      */
-    setPaddingSizeForGroup(groupNo: number): void {
-        const groupItems = <HTMLElement[]> Array.from(this.container.querySelectorAll(this.selectors.dragHomesGroup(groupNo)));
+    async setPaddingSizeForGroup(groupNo: number): Promise<void> {
+        const groupItems = Array.from(this.container.querySelectorAll<HTMLElement>(this.selectors.dragHomesGroup(groupNo)));
 
         if (!groupItems.length) {
             return;
         }
 
+        await CoreDomUtils.waitToBeInDOM(groupItems[0]);
+
         let maxWidth = 0;
         let maxHeight = 0;
-
         // Find max height and width.
         groupItems.forEach((item) => {
             item.innerHTML = CoreTextUtils.decodeHTML(item.innerHTML);
+        });
+        // Wait to render in order to calculate size.
+        await CoreUtils.nextTick();
+
+        groupItems.forEach((item) => {
             maxWidth = Math.max(maxWidth, Math.ceil(item.offsetWidth));
             maxHeight = Math.max(maxHeight, Math.ceil(item.offsetHeight));
         });
@@ -507,7 +498,7 @@ export class AddonQtypeDdwtosQuestion {
             this.padToWidthHeight(item, maxWidth, maxHeight);
         });
 
-        const dropsGroup = <HTMLElement[]> Array.from(this.container.querySelectorAll(this.selectors.dropsGroup(groupNo)));
+        const dropsGroup = Array.from(this.container.querySelectorAll<HTMLElement>(this.selectors.dropsGroup(groupNo)));
         dropsGroup.forEach((item) => {
             this.padToWidthHeight(item, maxWidth + 2, maxHeight + 2);
         });

From a76914f25afe2c714897703c8843747544c4ddd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 21 Mar 2022 13:34:32 +0100
Subject: [PATCH 0784/1008] MOBILE-3814 dom: Improve scroll handling

---
 .../pages/discussion/discussion.page.ts       |   6 +-
 src/addons/mod/chat/pages/chat/chat.ts        |  13 +-
 src/addons/mod/data/pages/edit/edit.ts        |   9 +-
 src/addons/mod/forum/components/post/post.ts  |  19 +-
 .../forum/pages/discussion/discussion.page.ts |  11 +-
 .../preflight-modal/preflight-modal.ts        |   7 +-
 .../mod/quiz/pages/player/player.page.ts      |   9 +-
 .../mod/quiz/pages/review/review.page.ts      |   9 +-
 src/core/directives/link.ts                   |  12 +-
 .../components/course-format/course-format.ts |   7 +-
 .../components/course-index/course-index.ts   |  16 +-
 .../grades/pages/course/course.page.ts        |   9 +-
 .../login/pages/email-signup/email-signup.ts  |   6 +-
 src/core/services/utils/dom.ts                | 175 ++++++++++++------
 src/theme/components/collapsible-item.scss    |   2 +-
 15 files changed, 166 insertions(+), 144 deletions(-)

diff --git a/src/addons/messages/pages/discussion/discussion.page.ts b/src/addons/messages/pages/discussion/discussion.page.ts
index d2823438f..257881e38 100644
--- a/src/addons/messages/pages/discussion/discussion.page.ts
+++ b/src/addons/messages/pages/discussion/discussion.page.ts
@@ -1106,10 +1106,10 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView
      * Scroll to the first new unread message.
      */
     scrollToFirstUnreadMessage(): void {
-        if (this.newMessages > 0 && this.content) {
-            const messages = Array.from(this.hostElement.querySelectorAll('.addon-message-not-mine'));
+        if (this.newMessages > 0) {
+            const messages = Array.from(this.hostElement.querySelectorAll<HTMLElement>('.addon-message-not-mine'));
 
-            CoreDomUtils.scrollToElement(this.content, <HTMLElement> messages[messages.length - this.newMessages]);
+            CoreDomUtils.scrollViewToElement(messages[messages.length - this.newMessages]);
         }
     }
 
diff --git a/src/addons/mod/chat/pages/chat/chat.ts b/src/addons/mod/chat/pages/chat/chat.ts
index 809d5106b..595287512 100644
--- a/src/addons/mod/chat/pages/chat/chat.ts
+++ b/src/addons/mod/chat/pages/chat/chat.ts
@@ -159,7 +159,7 @@ export class AddonModChatChatPage implements OnInit, OnDestroy, CanLeave {
         this.messages[this.messages.length - 1].showTail = true;
 
         // New messages or beeps, scroll to bottom.
-        setTimeout(() => this.scrollToBottom());
+        this.scrollToBottom();
     }
 
     protected async loadMessageBeepWho(message: AddonModChatFormattedMessage): Promise<void> {
@@ -341,13 +341,12 @@ export class AddonModChatChatPage implements OnInit, OnDestroy, CanLeave {
     /**
      * Scroll bottom when render has finished.
      */
-    scrollToBottom(): void {
+    async scrollToBottom(): Promise<void> {
         // Need a timeout to leave time to the view to be rendered.
-        setTimeout(() => {
-            if (!this.viewDestroyed) {
-                this.content?.scrollToBottom();
-            }
-        });
+        await CoreUtils.nextTick();
+        if (!this.viewDestroyed) {
+            this.content?.scrollToBottom();
+        }
     }
 
     /**
diff --git a/src/addons/mod/data/pages/edit/edit.ts b/src/addons/mod/data/pages/edit/edit.ts
index e6878e177..87e4d0323 100644
--- a/src/addons/mod/data/pages/edit/edit.ts
+++ b/src/addons/mod/data/pages/edit/edit.ts
@@ -352,9 +352,7 @@ export class AddonModDataEditPage implements OnInit {
                     }
                     this.jsData!.errors = this.errors;
 
-                    setTimeout(() => {
-                        this.scrollToFirstError();
-                    });
+                    this.scrollToFirstError();
                 }
             } finally {
                 modal.dismiss();
@@ -449,8 +447,9 @@ export class AddonModDataEditPage implements OnInit {
     /**
      * Scroll to first error or to the top if not found.
      */
-    protected scrollToFirstError(): void {
-        if (!CoreDomUtils.scrollToElementBySelector(this.formElement.nativeElement, this.content, '.addon-data-error')) {
+    protected async scrollToFirstError(): Promise<void> {
+        const scrolled = await CoreDomUtils.scrollViewToElement(this.formElement.nativeElement, '.addon-data-error');
+        if (!scrolled) {
             this.content?.scrollToTop();
         }
     }
diff --git a/src/addons/mod/forum/components/post/post.ts b/src/addons/mod/forum/components/post/post.ts
index cfd60670f..7d2a3e31c 100644
--- a/src/addons/mod/forum/components/post/post.ts
+++ b/src/addons/mod/forum/components/post/post.ts
@@ -20,7 +20,6 @@ import {
     OnChanges,
     OnDestroy,
     OnInit,
-    Optional,
     Output,
     SimpleChange,
     ViewChild,
@@ -41,7 +40,6 @@ import {
 import { CoreTag } from '@features/tag/services/tag';
 import { Translate } from '@singletons';
 import { CoreFileUploader } from '@features/fileuploader/services/fileuploader';
-import { IonContent } from '@ionic/angular';
 import { AddonModForumSync } from '../../services/forum-sync';
 import { CoreSync } from '@services/sync';
 import { CoreTextUtils } from '@services/utils/text';
@@ -94,7 +92,6 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
 
     constructor(
         protected elementRef: ElementRef,
-        @Optional() protected content?: IonContent,
     ) {}
 
     get showForm(): boolean {
@@ -308,8 +305,8 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
                 this.post.id > 0 ? this.post.id : undefined,
             );
 
-            this.scrollToForm(5);
-        } catch (error) {
+            this.scrollToForm();
+        } catch {
             // Cancelled.
         }
     }
@@ -540,19 +537,11 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
     /**
      * Scroll to reply/edit form.
      *
-     * @param ticksToWait Number of ticks to wait before scrolling.
      * @return Promise resolved when done.
      */
-    protected async scrollToForm(ticksToWait = 1): Promise<void> {
-        if (!this.content) {
-            return;
-        }
-
-        await CoreUtils.nextTicks(ticksToWait);
-
-        CoreDomUtils.scrollToElementBySelector(
+    protected async scrollToForm(): Promise<void> {
+        await CoreDomUtils.scrollViewToElement(
             this.elementRef.nativeElement,
-            this.content,
             '#addon-forum-reply-edit-form-' + this.uniqueId,
         );
     }
diff --git a/src/addons/mod/forum/pages/discussion/discussion.page.ts b/src/addons/mod/forum/pages/discussion/discussion.page.ts
index 0f735704b..605821169 100644
--- a/src/addons/mod/forum/pages/discussion/discussion.page.ts
+++ b/src/addons/mod/forum/pages/discussion/discussion.page.ts
@@ -187,13 +187,10 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
         const scrollTo = this.postId || this.parent;
         if (scrollTo) {
             // Scroll to the post.
-            setTimeout(() => {
-                CoreDomUtils.scrollToElementBySelector(
-                    this.elementRef.nativeElement,
-                    this.content,
-                    '#addon-mod_forum-post-' + scrollTo,
-                );
-            });
+            CoreDomUtils.scrollViewToElement(
+                this.elementRef.nativeElement,
+                '#addon-mod_forum-post-' + scrollTo,
+            );
         }
     }
 
diff --git a/src/addons/mod/quiz/components/preflight-modal/preflight-modal.ts b/src/addons/mod/quiz/components/preflight-modal/preflight-modal.ts
index 2bc91c409..69685cdf3 100644
--- a/src/addons/mod/quiz/components/preflight-modal/preflight-modal.ts
+++ b/src/addons/mod/quiz/components/preflight-modal/preflight-modal.ts
@@ -14,7 +14,6 @@
 
 import { Component, OnInit, ViewChild, ElementRef, Input, Type } from '@angular/core';
 import { FormBuilder, FormGroup } from '@angular/forms';
-import { IonContent } from '@ionic/angular';
 import { CoreSites } from '@services/sites';
 
 import { CoreDomUtils } from '@services/utils/dom';
@@ -32,7 +31,6 @@ import { AddonModQuizAttemptWSData, AddonModQuizQuizWSData } from '../../service
 })
 export class AddonModQuizPreflightModalComponent implements OnInit {
 
-    @ViewChild(IonContent) content?: IonContent;
     @ViewChild('preflightFormEl') formElement?: ElementRef;
 
     @Input() title!: string;
@@ -111,15 +109,14 @@ export class AddonModQuizPreflightModalComponent implements OnInit {
      *
      * @param e Event.
      */
-    sendData(e: Event): void {
+    async sendData(e: Event): Promise<void> {
         e.preventDefault();
         e.stopPropagation();
 
         if (!this.preflightForm.valid) {
             // Form not valid. Scroll to the first element with errors.
-            const hasScrolled = CoreDomUtils.scrollToInputError(
+            const hasScrolled = await CoreDomUtils.scrollViewToInputError(
                 this.elementRef.nativeElement,
-                this.content,
             );
 
             if (!hasScrolled) {
diff --git a/src/addons/mod/quiz/pages/player/player.page.ts b/src/addons/mod/quiz/pages/player/player.page.ts
index d022c6d5e..4a01e09de 100644
--- a/src/addons/mod/quiz/pages/player/player.page.ts
+++ b/src/addons/mod/quiz/pages/player/player.page.ts
@@ -318,10 +318,8 @@ export class AddonModQuizPlayerPage implements OnInit, OnDestroy, CanLeave {
             this.loaded = true;
 
             if (slot !== undefined) {
-                // Scroll to the question. Give some time to the questions to render.
-                setTimeout(() => {
-                    this.scrollToQuestion(slot);
-                }, 2000);
+                // Scroll to the question.
+                this.scrollToQuestion(slot);
             }
         }
     }
@@ -689,9 +687,8 @@ export class AddonModQuizPlayerPage implements OnInit, OnDestroy, CanLeave {
      * @param slot Slot of the question to scroll to.
      */
     protected scrollToQuestion(slot: number): void {
-        CoreDomUtils.scrollToElementBySelector(
+        CoreDomUtils.scrollViewToElement(
             this.elementRef.nativeElement,
-            this.content,
             '#addon-mod_quiz-question-' + slot,
         );
     }
diff --git a/src/addons/mod/quiz/pages/review/review.page.ts b/src/addons/mod/quiz/pages/review/review.page.ts
index 1630ec38b..2ebdebe5e 100644
--- a/src/addons/mod/quiz/pages/review/review.page.ts
+++ b/src/addons/mod/quiz/pages/review/review.page.ts
@@ -133,10 +133,8 @@ export class AddonModQuizReviewPage implements OnInit {
             this.loaded = true;
 
             if (slot !== undefined) {
-                // Scroll to the question. Give some time to the questions to render.
-                setTimeout(() => {
-                    this.scrollToQuestion(slot);
-                }, 2000);
+                // Scroll to the question.
+                this.scrollToQuestion(slot);
             }
         }
     }
@@ -249,9 +247,8 @@ export class AddonModQuizReviewPage implements OnInit {
      * @param slot Slot of the question to scroll to.
      */
     protected scrollToQuestion(slot: number): void {
-        CoreDomUtils.scrollToElementBySelector(
+        CoreDomUtils.scrollViewToElement(
             this.elementRef.nativeElement,
-            this.content,
             `#addon-mod_quiz-question-${slot}`,
         );
     }
diff --git a/src/core/directives/link.ts b/src/core/directives/link.ts
index 31a405e88..18a26de30 100644
--- a/src/core/directives/link.ts
+++ b/src/core/directives/link.ts
@@ -142,11 +142,13 @@ export class CoreLinkDirective implements OnInit {
         if (href.charAt(0) == '#') {
             // Look for id or name.
             href = href.substring(1);
-            CoreDomUtils.scrollToElementBySelector(
-                this.element.closest('ion-content'),
-                this.content,
-                `#${href}, [name='${href}']`,
-            );
+            const container = this.element.closest('ion-content');
+            if (container) {
+                CoreDomUtils.scrollViewToElement(
+                    container,
+                    `#${href}, [name='${href}']`,
+                );
+            }
 
             return;
         }
diff --git a/src/core/features/course/components/course-format/course-format.ts b/src/core/features/course/components/course-format/course-format.ts
index 453d03c2f..4f100845e 100644
--- a/src/core/features/course/components/course-format/course-format.ts
+++ b/src/core/features/course/components/course-format/course-format.ts
@@ -492,9 +492,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
         // Scroll to module if needed. Give more priority to the input.
         const moduleIdToScroll = this.moduleId && previousValue === undefined ? this.moduleId : moduleId;
         if (moduleIdToScroll) {
-            setTimeout(() => {
-                this.scrollToModule(moduleIdToScroll);
-            }, 200);
+            this.scrollToModule(moduleIdToScroll);
         } else {
             this.content.scrollToTop(0);
         }
@@ -513,9 +511,8 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
      * @param moduleId Module ID.
      */
     protected scrollToModule(moduleId: number): void {
-        CoreDomUtils.scrollToElementBySelector(
+        CoreDomUtils.scrollViewToElement(
             this.elementRef.nativeElement,
-            this.content,
             '#core-course-module-' + moduleId,
         );
     }
diff --git a/src/core/features/course/components/course-index/course-index.ts b/src/core/features/course/components/course-index/course-index.ts
index ce2c1667d..6643c02f8 100644
--- a/src/core/features/course/components/course-index/course-index.ts
+++ b/src/core/features/course/components/course-index/course-index.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, ElementRef, Input, OnInit, ViewChild } from '@angular/core';
+import { Component, ElementRef, Input, OnInit } from '@angular/core';
 import {
     CoreCourseModuleCompletionStatus,
     CoreCourseModuleCompletionTracking,
@@ -21,7 +21,6 @@ import {
 import { CoreCourseHelper, CoreCourseSection } from '@features/course/services/course-helper';
 import { CoreCourseFormatDelegate } from '@features/course/services/format-delegate';
 import { CoreCourseAnyCourseData } from '@features/courses/services/courses';
-import { IonContent } from '@ionic/angular';
 import { CoreDomUtils } from '@services/utils/dom';
 import { ModalController } from '@singletons';
 
@@ -35,8 +34,6 @@ import { ModalController } from '@singletons';
 })
 export class CoreCourseCourseIndexComponent implements OnInit {
 
-    @ViewChild(IonContent) content?: IonContent;
-
     @Input() sections: CoreCourseSection[] = [];
     @Input() selectedId?: number;
     @Input() course?: CoreCourseAnyCourseData;
@@ -112,13 +109,10 @@ export class CoreCourseCourseIndexComponent implements OnInit {
 
         this.highlighted = CoreCourseFormatDelegate.getSectionHightlightedName(this.course);
 
-        setTimeout(() => {
-            CoreDomUtils.scrollToElementBySelector(
-                this.elementRef.nativeElement,
-                this.content,
-                '.item.item-current',
-            );
-        }, 300);
+        CoreDomUtils.scrollViewToElement(
+            this.elementRef.nativeElement,
+            '.item.item-current',
+        );
     }
 
     /**
diff --git a/src/core/features/grades/pages/course/course.page.ts b/src/core/features/grades/pages/course/course.page.ts
index f877aba9c..ccb3c92d3 100644
--- a/src/core/features/grades/pages/course/course.page.ts
+++ b/src/core/features/grades/pages/course/course.page.ts
@@ -13,8 +13,8 @@
 // limitations under the License.
 
 import { ActivatedRoute } from '@angular/router';
-import { AfterViewInit, Component, ElementRef, OnDestroy, Optional } from '@angular/core';
-import { IonContent, IonRefresher } from '@ionic/angular';
+import { AfterViewInit, Component, ElementRef, OnDestroy } from '@angular/core';
+import { IonRefresher } from '@ionic/angular';
 
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreGrades } from '@features/grades/services/grades';
@@ -59,7 +59,6 @@ export class CoreGradesCoursePage implements AfterViewInit, OnDestroy {
     constructor(
         protected route: ActivatedRoute,
         protected element: ElementRef<HTMLElement>,
-        @Optional() protected content?: IonContent,
     ) {
         try {
             this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId', { route });
@@ -170,11 +169,9 @@ export class CoreGradesCoursePage implements AfterViewInit, OnDestroy {
 
                 if (row) {
                     this.toggleRow(row, true);
-                    await CoreUtils.nextTick();
 
-                    CoreDomUtils.scrollToElementBySelector(
+                    CoreDomUtils.scrollViewToElement(
                         this.element.nativeElement,
-                        this.content,
                         '#grade-' + row.id,
                     );
                     this.gradeId = undefined;
diff --git a/src/core/features/login/pages/email-signup/email-signup.ts b/src/core/features/login/pages/email-signup/email-signup.ts
index f74f28463..7e18428b1 100644
--- a/src/core/features/login/pages/email-signup/email-signup.ts
+++ b/src/core/features/login/pages/email-signup/email-signup.ts
@@ -14,7 +14,7 @@
 
 import { Component, ViewChild, ElementRef, OnInit, ChangeDetectorRef } from '@angular/core';
 import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms';
-import { IonContent, IonRefresher } from '@ionic/angular';
+import { IonRefresher } from '@ionic/angular';
 
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
@@ -46,7 +46,6 @@ import { CoreText } from '@singletons/text';
 })
 export class CoreLoginEmailSignupPage implements OnInit {
 
-    @ViewChild(IonContent) content?: IonContent;
     @ViewChild(CoreRecaptchaComponent) recaptchaComponent?: CoreRecaptchaComponent;
     @ViewChild('ageForm') ageFormElement?: ElementRef;
     @ViewChild('signupFormEl') signupFormElement?: ElementRef;
@@ -285,9 +284,8 @@ export class CoreLoginEmailSignupPage implements OnInit {
             this.changeDetector.detectChanges();
 
             // Scroll to the first element with errors.
-            const errorFound = CoreDomUtils.scrollToInputError(
+            const errorFound = await CoreDomUtils.scrollViewToInputError(
                 this.elementRef.nativeElement,
-                this.content,
             );
 
             if (!errorFound) {
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index a0f25b3c0..d718396ca 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -725,10 +725,14 @@ export class CoreDomUtilsProvider {
      * @param positionParentClass Parent Class where to stop calculating the position. Default inner-scroll.
      * @return positionLeft, positionTop of the element relative to.
      */
-    getElementXY(container: HTMLElement, selector: undefined, positionParentClass?: string): number[];
+    getElementXY(container: HTMLElement, selector?: undefined, positionParentClass?: string): number[];
     getElementXY(container: HTMLElement, selector: string, positionParentClass?: string): number[] | null;
-    getElementXY(container: HTMLElement, selector?: string, positionParentClass?: string): number[] | null {
-        let element: HTMLElement | null = <HTMLElement> (selector ? container.querySelector(selector) : container);
+    getElementXY(container: HTMLElement, selector?: string, positionParentClass = 'inner-scroll'): number[] | null {
+        let element = (selector ? container.querySelector<HTMLElement>(selector) : container);
+        if (!element) {
+            return null;
+        }
+
         let positionTop = 0;
         let positionLeft = 0;
 
@@ -736,10 +740,6 @@ export class CoreDomUtilsProvider {
             positionParentClass = 'inner-scroll';
         }
 
-        if (!element) {
-            return null;
-        }
-
         while (element) {
             positionLeft += (element.offsetLeft - element.scrollLeft + element.clientLeft);
             positionTop += (element.offsetTop - element.scrollTop + element.clientTop);
@@ -766,6 +766,25 @@ export class CoreDomUtilsProvider {
         return [positionLeft, positionTop];
     }
 
+    /**
+     * Retrieve the position of a element relative to another element.
+     *
+     * @param element Element to get the position.
+     * @param parent Parent element to get relative position.
+     * @return X and Y position.
+     */
+    getRelativeElementPosition(element: HTMLElement, parent: HTMLElement): { x: number; y: number} {
+        // Get the top, left coordinates of two elements
+        const elementRectangle = element.getBoundingClientRect();
+        const parentRectangle = parent.getBoundingClientRect();
+
+        // Calculate the top and left positions
+        return {
+            x: elementRectangle.x - parentRectangle.x,
+            y: elementRectangle.y - parentRectangle.y,
+        };
+    }
+
     /**
      * Given a message, it deduce if it's a network error.
      *
@@ -1096,11 +1115,9 @@ export class CoreDomUtilsProvider {
      * @param selector Selector to search.
      */
     removeElement(element: HTMLElement, selector: string): void {
-        if (element) {
-            const selected = element.querySelector(selector);
-            if (selected) {
-                selected.remove();
-            }
+        const selected = element.querySelector(selector);
+        if (selected) {
+            selected.remove();
         }
     }
 
@@ -1198,9 +1215,9 @@ export class CoreDomUtilsProvider {
             }
 
             // Treat video posters.
-            if (media.tagName == 'VIDEO' && media.getAttribute('poster')) {
-                const currentPoster = media.getAttribute('poster');
-                const newPoster = paths[CoreTextUtils.decodeURIComponent(currentPoster!)];
+            const currentPoster = media.getAttribute('poster');
+            if (media.tagName == 'VIDEO' && currentPoster) {
+                const newPoster = paths[CoreTextUtils.decodeURIComponent(currentPoster)];
                 if (newPoster !== undefined) {
                     media.setAttribute('poster', newPoster);
                 }
@@ -1237,8 +1254,8 @@ export class CoreDomUtilsProvider {
      * @return Returns a promise which is resolved when the scroll has completed.
      * @deprecated since 3.9.5. Use directly the IonContent class.
      */
-    scrollTo(content: IonContent, x: number, y: number, duration?: number): Promise<void> {
-        return content.scrollToPoint(x, y, duration || 0);
+    scrollTo(content: IonContent, x: number, y: number, duration = 0): Promise<void> {
+        return content.scrollToPoint(x, y, duration);
     }
 
     /**
@@ -1261,7 +1278,7 @@ export class CoreDomUtilsProvider {
      * @return Returns a promise which is resolved when the scroll has completed.
      * @deprecated since 3.9.5. Use directly the IonContent class.
      */
-    scrollToTop(content: IonContent, duration?: number): Promise<void> {
+    scrollToTop(content: IonContent, duration = 0): Promise<void> {
         return content.scrollToTop(duration);
     }
 
@@ -1308,7 +1325,7 @@ export class CoreDomUtilsProvider {
             const scrollElement = await content.getScrollElement();
 
             return scrollElement.scrollTop || 0;
-        } catch (error) {
+        } catch {
             return 0;
         }
     }
@@ -1316,51 +1333,34 @@ export class CoreDomUtilsProvider {
     /**
      * Scroll to a certain element.
      *
-     * @param content The content that must be scrolled.
      * @param element The element to scroll to.
-     * @param scrollParentClass Parent class where to stop calculating the position. Default inner-scroll.
+     * @param selector Selector to find the element to scroll to inside the defined element.
      * @param duration Duration of the scroll animation in milliseconds.
-     * @return True if the element is found, false otherwise.
+     * @return Wether the scroll suceeded.
      */
-    scrollToElement(content: IonContent, element: HTMLElement, scrollParentClass?: string, duration?: number): boolean {
-        const position = this.getElementXY(element, undefined, scrollParentClass);
-        if (!position) {
-            return false;
+    async scrollViewToElement(element: HTMLElement, selector?: string, duration = 0): Promise<boolean> {
+        await CoreDomUtils.waitToBeInDOM(element);
+
+        if (selector) {
+            const foundElement = element.querySelector<HTMLElement>(selector);
+            if (!foundElement) {
+                // Element not found.
+                return false;
+            }
+
+            element = foundElement;
         }
 
-        content.scrollToPoint(position[0], position[1], duration || 0);
-
-        return true;
-    }
-
-    /**
-     * Scroll to a certain element using a selector to find it.
-     *
-     * @param container The element that contains the element that must be scrolled.
-     * @param content The content that must be scrolled.
-     * @param selector Selector to find the element to scroll to.
-     * @param scrollParentClass Parent class where to stop calculating the position. Default inner-scroll.
-     * @param duration Duration of the scroll animation in milliseconds.
-     * @return True if the element is found, false otherwise.
-     */
-    scrollToElementBySelector(
-        container: HTMLElement | null,
-        content: IonContent | undefined,
-        selector: string,
-        scrollParentClass?: string,
-        duration?: number,
-    ): boolean {
-        if (!container || !content) {
+        const content = element.closest<HTMLIonContentElement>('ion-content') ?? undefined;
+        if (!content) {
+            // Content to scroll, not found.
             return false;
         }
 
         try {
-            const position = this.getElementXY(container, selector, scrollParentClass);
-            if (!position) {
-                return false;
-            }
+            const position = CoreDomUtils.getRelativeElementPosition(element, content);
 
-            content.scrollToPoint(position[0], position[1], duration || 0);
+            await content.scrollToPoint(position.x, position.y, duration);
 
             return true;
         } catch {
@@ -1372,12 +1372,71 @@ export class CoreDomUtilsProvider {
      * Search for an input with error (core-input-error directive) and scrolls to it if found.
      *
      * @param container The element that contains the element that must be scrolled.
-     * @param content The content that must be scrolled.
-     * @param scrollParentClass Parent class where to stop calculating the position. Default inner-scroll.
      * @return True if the element is found, false otherwise.
      */
-    scrollToInputError(container: HTMLElement | null, content?: IonContent, scrollParentClass?: string): boolean {
-        return this.scrollToElementBySelector(container, content, '.core-input-error', scrollParentClass);
+    async scrollViewToInputError(container: HTMLElement): Promise<boolean> {
+        return this.scrollViewToElement(container, '.core-input-error');
+    }
+
+    /**
+     * Scroll to a certain element.
+     *
+     * @param content Not used anymore.
+     * @param element The element to scroll to.
+     * @param scrollParentClass Not used anymore.
+     * @param duration Duration of the scroll animation in milliseconds.
+     * @return True if the element is found, false otherwise.
+     * @deprecated since app 4.0 Use scrollViewToElement instead.
+     */
+    scrollToElement(content: IonContent, element: HTMLElement, scrollParentClass?: string, duration = 0): boolean {
+        CoreDomUtils.scrollViewToElement(element, undefined, duration);
+
+        return true;
+    }
+
+    /**
+     * Scroll to a certain element using a selector to find it.
+     *
+     * @param container The element that contains the element that must be scrolled.
+     * @param content Not used anymore.
+     * @param selector Selector to find the element to scroll to.
+     * @param scrollParentClass Not used anymore.
+     * @param duration Duration of the scroll animation in milliseconds.
+     * @return True if the element is found, false otherwise.
+     * @deprecated since app 4.0 Use scrollViewToElement instead.
+     */
+    scrollToElementBySelector(
+        container: HTMLElement | null,
+        content: unknown | null,
+        selector: string,
+        scrollParentClass?: string,
+        duration = 0,
+    ): boolean {
+        if (!container || !content) {
+            return false;
+        }
+
+        CoreDomUtils.scrollViewToElement(container, selector, duration);
+
+        return true;
+
+    }
+
+    /**
+     * Search for an input with error (core-input-error directive) and scrolls to it if found.
+     *
+     * @param container The element that contains the element that must be scrolled.
+     * @return True if the element is found, false otherwise.
+     * @deprecated since app 4.0 Use scrollViewToInputError instead.
+     */
+    scrollToInputError(container: HTMLElement | null): boolean {
+        if (!container) {
+            return false;
+        }
+
+        this.scrollViewToInputError(container);
+
+        return true;
     }
 
     /**
diff --git a/src/theme/components/collapsible-item.scss b/src/theme/components/collapsible-item.scss
index 7297a8f0c..a40ea19c4 100644
--- a/src/theme/components/collapsible-item.scss
+++ b/src/theme/components/collapsible-item.scss
@@ -72,7 +72,7 @@
 
                 &:before {
                     content: '';
-                    height: 60px;
+                    height: 100%;
                     position: absolute;
                     @include position(null, 0, 0, 0);
                     background: linear-gradient(to bottom, rgba(var(--background-gradient-rgb), 0) calc(100% - var(--gradient-size)), rgba(var(--background-gradient-rgb), 1) calc(100% - 4px));

From d500d1fd08237ae64e05bb9c060c1386316d0283 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 21 Mar 2022 15:58:44 +0100
Subject: [PATCH 0785/1008] MOBILE-3814 dom: Improve element position

---
 .../ddimageortext/classes/ddimageortext.ts    | 29 +++++---
 src/addons/qtype/ddmarker/classes/ddmarker.ts | 54 ++++++++-------
 .../qtype/ddmarker/classes/graphics_api.ts    | 20 ++----
 src/addons/qtype/ddwtos/classes/ddwtos.ts     | 40 ++++++-----
 src/core/services/utils/dom.ts                | 69 +++++++++----------
 5 files changed, 111 insertions(+), 101 deletions(-)

diff --git a/src/addons/qtype/ddimageortext/classes/ddimageortext.ts b/src/addons/qtype/ddimageortext/classes/ddimageortext.ts
index 3d066d1f0..bdebeaabf 100644
--- a/src/addons/qtype/ddimageortext/classes/ddimageortext.ts
+++ b/src/addons/qtype/ddimageortext/classes/ddimageortext.ts
@@ -78,13 +78,18 @@ export class AddonQtypeDdImageOrTextQuestion {
             return bgImgXY;
         }
 
-        const position = CoreDomUtils.getElementXY(bgImg, undefined, 'ddarea');
+        const ddArea = this.container.querySelector<HTMLElement>('.ddarea');
+        if (!ddArea) {
+            return bgImgXY;
+        }
+
+        const position = CoreDomUtils.getRelativeElementPosition(bgImg, ddArea);
 
         // Render the position related to the current image dimensions.
         bgImgXY[0] *= this.proportion;
         bgImgXY[1] *= this.proportion;
 
-        return [Number(bgImgXY[0]) + position[0] + 1, Number(bgImgXY[1]) + position[1] + 1];
+        return [bgImgXY[0] + position.x + 1, bgImgXY[1] + position.y + 1];
     }
 
     /**
@@ -409,10 +414,15 @@ export class AddonQtypeDdImageOrTextQuestion {
         }
 
         // Now position the draggable and set it to the input.
-        const position = CoreDomUtils.getElementXY(drop, undefined, 'ddarea');
+        const ddArea = this.container.querySelector<HTMLElement>('.ddarea');
+        if (!ddArea) {
+            return;
+        }
+
+        const position = CoreDomUtils.getRelativeElementPosition(drop, ddArea);
         const choice = drag.getAttribute('choice');
-        drag.style.left = position[0] - 1 + 'px';
-        drag.style.top = position[1] - 1 + 'px';
+        drag.style.left = position.x + 'px';
+        drag.style.top = position.y + 'px';
         drag.classList.add('placed');
 
         if (choice) {
@@ -458,13 +468,14 @@ export class AddonQtypeDdImageOrTextQuestion {
 
         // Move the element to its original position.
         const dragItemHome = this.doc.dragItemHome(Number(drag.getAttribute('dragitemno')));
-        if (!dragItemHome) {
+        const ddArea = this.container.querySelector<HTMLElement>('.ddarea');
+        if (!dragItemHome || !ddArea) {
             return;
         }
 
-        const position = CoreDomUtils.getElementXY(dragItemHome, undefined, 'ddarea');
-        drag.style.left = position[0] + 'px';
-        drag.style.top = position[1] + 'px';
+        const position = CoreDomUtils.getRelativeElementPosition(dragItemHome, ddArea);
+        drag.style.left = position.x + 'px';
+        drag.style.top = position.y + 'px';
         drag.classList.remove('placed');
 
         drag.setAttribute('inputid', '');
diff --git a/src/addons/qtype/ddmarker/classes/ddmarker.ts b/src/addons/qtype/ddmarker/classes/ddmarker.ts
index ab7350a80..89b5a997d 100644
--- a/src/addons/qtype/ddmarker/classes/ddmarker.ts
+++ b/src/addons/qtype/ddmarker/classes/ddmarker.ts
@@ -12,21 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { CoreDomUtils } from '@services/utils/dom';
+import { CoreCoordinates, CoreDomUtils } from '@services/utils/dom';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreEventObserver } from '@singletons/events';
 import { CoreLogger } from '@singletons/logger';
 import { AddonQtypeDdMarkerQuestionData } from '../component/ddmarker';
 import { AddonQtypeDdMarkerGraphicsApi } from './graphics_api';
 
-/**
- * Point type.
- */
-export type AddonQtypeDdMarkerQuestionPoint = {
-    x: number; // X axis coordinates.
-    y: number; // Y axis coordinates.
-};
-
 /**
  * Class to make a question of ddmarker type work.
  */
@@ -36,8 +28,7 @@ export class AddonQtypeDdMarkerQuestion {
 
     protected logger: CoreLogger;
     protected afterImageLoadDone = false;
-    protected drops;
-    protected topNode;
+    protected topNode?: HTMLElement | null;
     protected nextColourIndex = 0;
     protected proportion = 1;
     protected selected?: HTMLElement; // Selected element (being "dragged").
@@ -123,7 +114,7 @@ export class AddonQtypeDdMarkerQuestion {
             return [];
         }
 
-        const position = CoreDomUtils.getElementXY(bgImg, undefined, 'ddarea');
+        const position = this.getElementCoordinates(bgImg);
         let coordsNumbers = this.parsePoint(bgImgXY);
 
         coordsNumbers = this.makePointProportional(coordsNumbers);
@@ -131,13 +122,30 @@ export class AddonQtypeDdMarkerQuestion {
         return [coordsNumbers.x + position[0], coordsNumbers.y + position[1]];
     }
 
+    /**
+     * Returns elements coordinates relative to ddarea container.
+     *
+     * @param element Element.
+     * @return Array of X and Y coordinates.
+     */
+    protected getElementCoordinates(element: HTMLElement): number[] {
+        const ddArea = this.container.querySelector<HTMLElement>('.ddarea');
+        if (!ddArea) {
+            return [];
+        }
+
+        const position = CoreDomUtils.getRelativeElementPosition(element, ddArea);
+
+        return [position.x, position.y];
+    }
+
     /**
      * Check if some coordinates (X, Y) are inside the background image.
      *
      * @param coords Coordinates to check.
      * @return Whether they're inside the background image.
      */
-    coordsInImg(coords: AddonQtypeDdMarkerQuestionPoint): boolean {
+    coordsInImg(coords: CoreCoordinates): boolean {
         const bgImg = this.doc.bgImg();
         if (!bgImg) {
             return false;
@@ -177,13 +185,13 @@ export class AddonQtypeDdMarkerQuestion {
             const dragging = this.selected;
             if (dragging && !drag.classList.contains('unplaced')) {
 
-                const position = CoreDomUtils.getElementXY(drag, undefined, 'ddarea');
+                const position = this.getElementCoordinates(drag);
                 const bgImg = this.doc.bgImg();
                 if (!bgImg) {
                     return;
                 }
 
-                const bgImgPos = CoreDomUtils.getElementXY(bgImg, undefined, 'ddarea');
+                const bgImgPos = this.getElementCoordinates(bgImg);
 
                 position[0] = position[0] - bgImgPos[0] + e.offsetX;
                 position[1] = position[1] - bgImgPos[1] + e.offsetY;
@@ -217,7 +225,7 @@ export class AddonQtypeDdMarkerQuestion {
             return [];
         }
 
-        const position = CoreDomUtils.getElementXY(dragItemHome, undefined, 'ddarea');
+        const position = this.getElementCoordinates(dragItemHome);
 
         return [position[0], position[1]];
     }
@@ -317,7 +325,7 @@ export class AddonQtypeDdMarkerQuestion {
      * @param colour Colour of the circle.
      * @return X and Y position of the center of the circle.
      */
-    drawShapeCircle(dropZoneNo: number, coordinates: string, colour: string): AddonQtypeDdMarkerQuestionPoint | null {
+    drawShapeCircle(dropZoneNo: number, coordinates: string, colour: string): CoreCoordinates | null {
         if (!coordinates.match(/^\d+(\.\d+)?,\d+(\.\d+)?;\d+(\.\d+)?$/)) {
             return null;
         }
@@ -356,7 +364,7 @@ export class AddonQtypeDdMarkerQuestion {
      * @param colour Colour of the rectangle.
      * @return X and Y position of the center of the rectangle.
      */
-    drawShapeRectangle(dropZoneNo: number, coordinates: string, colour: string): AddonQtypeDdMarkerQuestionPoint | null {
+    drawShapeRectangle(dropZoneNo: number, coordinates: string, colour: string): CoreCoordinates | null {
         if (!coordinates.match(/^\d+(\.\d+)?,\d+(\.\d+)?;\d+(\.\d+)?,\d+(\.\d+)?$/)) {
             return null;
         }
@@ -399,7 +407,7 @@ export class AddonQtypeDdMarkerQuestion {
      * @param colour Colour of the polygon.
      * @return X and Y position of the center of the polygon.
      */
-    drawShapePolygon(dropZoneNo: number, coordinates: string, colour: string): AddonQtypeDdMarkerQuestionPoint | null {
+    drawShapePolygon(dropZoneNo: number, coordinates: string, colour: string): CoreCoordinates | null {
         if (!coordinates.match(/^\d+(\.\d+)?,\d+(\.\d+)?(?:;\d+(\.\d+)?,\d+(\.\d+)?)*$/)) {
             return null;
         }
@@ -449,7 +457,7 @@ export class AddonQtypeDdMarkerQuestion {
      * @param coordinates "x,y".
      * @return Coordinates to the point.
      */
-    parsePoint(coordinates: string): AddonQtypeDdMarkerQuestionPoint {
+    parsePoint(coordinates: string): CoreCoordinates {
         const bits = coordinates.split(',');
         if (bits.length !== 2) {
             throw coordinates + ' is not a valid point';
@@ -464,7 +472,7 @@ export class AddonQtypeDdMarkerQuestion {
      * @param point Point coordinates.
      * @return Converted point.
      */
-    makePointProportional(point: AddonQtypeDdMarkerQuestionPoint): AddonQtypeDdMarkerQuestionPoint {
+    makePointProportional(point: CoreCoordinates): CoreCoordinates {
         return {
             x: Math.round(point.x * this.proportion),
             y: Math.round(point.y * this.proportion),
@@ -542,10 +550,10 @@ export class AddonQtypeDdMarkerQuestion {
      * @return Coordinates.
      */
     getDragXY(dragItem: HTMLElement): number[] {
-        const position = CoreDomUtils.getElementXY(dragItem, undefined, 'ddarea');
+        const position = this.getElementCoordinates(dragItem);
         const bgImg = this.doc.bgImg();
         if (bgImg) {
-            const bgImgXY = CoreDomUtils.getElementXY(bgImg, undefined, 'ddarea');
+            const bgImgXY = this.getElementCoordinates(bgImg);
 
             position[0] -= bgImgXY[0];
             position[1] -= bgImgXY[1];
diff --git a/src/addons/qtype/ddmarker/classes/graphics_api.ts b/src/addons/qtype/ddmarker/classes/graphics_api.ts
index 8ab982905..1c66def35 100644
--- a/src/addons/qtype/ddmarker/classes/graphics_api.ts
+++ b/src/addons/qtype/ddmarker/classes/graphics_api.ts
@@ -23,12 +23,6 @@ export class AddonQtypeDdMarkerGraphicsApi {
     protected readonly NS = 'http://www.w3.org/2000/svg';
     protected dropZone?: SVGSVGElement;
 
-    /**
-     * Create the instance.
-     *
-     * @param instance Question instance.
-     * @param domUtils Dom Utils provider.
-     */
     constructor(protected instance: AddonQtypeDdMarkerQuestion) { }
 
     /**
@@ -60,20 +54,20 @@ export class AddonQtypeDdMarkerGraphicsApi {
         const bgImg = this.instance.doc?.bgImg();
         const dropZones = this.instance.doc?.topNode?.querySelector<HTMLElement>('div.ddarea div.dropzones');
         const markerTexts = this.instance.doc?.markerTexts();
-
-        if (!bgImg || !dropZones || !markerTexts) {
+        const ddArea = this.instance.doc?.topNode?.querySelector<HTMLElement>('.ddarea');
+        if (!bgImg || !dropZones || !markerTexts || !ddArea) {
             return;
         }
 
-        const position = CoreDomUtils.getElementXY(bgImg, undefined, 'ddarea');
+        const position = CoreDomUtils.getRelativeElementPosition(bgImg, ddArea);
 
-        dropZones.style.left = position[0] + 'px';
-        dropZones.style.top = position[1] + 'px';
+        dropZones.style.left = position.x + 'px';
+        dropZones.style.top = position.y + 'px';
         dropZones.style.width = bgImg.width + 'px';
         dropZones.style.height = bgImg.height + 'px';
 
-        markerTexts.style.left = position[0] + 'px';
-        markerTexts.style.top = position[1] + 'px';
+        markerTexts.style.left = position.x + 'px';
+        markerTexts.style.top = position.y + 'px';
         markerTexts.style.width = bgImg.width + 'px';
         markerTexts.style.height = bgImg.height + 'px';
 
diff --git a/src/addons/qtype/ddwtos/classes/ddwtos.ts b/src/addons/qtype/ddwtos/classes/ddwtos.ts
index 29ab292dc..60be1af6d 100644
--- a/src/addons/qtype/ddwtos/classes/ddwtos.ts
+++ b/src/addons/qtype/ddwtos/classes/ddwtos.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { CoreFormatTextDirective } from '@directives/format-text';
-import { CoreDomUtils } from '@services/utils/dom';
+import { CoreCoordinates, CoreDomUtils } from '@services/utils/dom';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
@@ -375,33 +375,37 @@ export class AddonQtypeDdwtosQuestion {
             return;
         }
 
-        let position;
-
         const placeNo = this.placed[this.getNo(drag) ?? -1];
+        const parent = this.container.querySelector<HTMLElement>('.addon-qtype-ddwtos-container');
+        if (!parent) {
+            return;
+        }
+
+        let position: CoreCoordinates | undefined;
+
         if (!placeNo) {
             // Not placed, put it in home zone.
             const groupNo = this.getGroup(drag) ?? -1;
             const choiceNo = this.getChoice(drag) ?? -1;
-
-            position = CoreDomUtils.getElementXY(
-                this.container,
-                this.selectors.dragHome(groupNo, choiceNo),
-                'answercontainer',
-            );
-            drag.classList.add('unplaced');
+            const dragHome = this.container.querySelector<HTMLElement>(this.selectors.dragHome(groupNo, choiceNo));
+            if (dragHome) {
+                position = CoreDomUtils.getRelativeElementPosition(dragHome, parent);
+            }
         } else {
             // Get the drop zone position.
-            position = CoreDomUtils.getElementXY(
-                this.container,
-                this.selectors.dropForPlace(placeNo),
-                'addon-qtype-ddwtos-container',
-            );
-            drag.classList.remove('unplaced');
+            const dropZone = this.container.querySelector<HTMLElement>(this.selectors.dropForPlace(placeNo));
+            if (dropZone) {
+                position = CoreDomUtils.getRelativeElementPosition(dropZone, parent);
+                // Avoid the border.
+                position.x++;
+                position.y++;
+            }
         }
+        drag.classList.toggle('unplaced', !placeNo);
 
         if (position) {
-            drag.style.left = position[0] + 'px';
-            drag.style.top = position[1] + 'px';
+            drag.style.left = position.x + 'px';
+            drag.style.top = position.y + 'px';
         }
     }
 
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index d718396ca..797faa9fb 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -720,50 +720,35 @@ export class CoreDomUtilsProvider {
     /**
      * Retrieve the position of a element relative to another element.
      *
-     * @param container Element to search in.
+     * @param element Element to search in.
      * @param selector Selector to find the element to gets the position.
      * @param positionParentClass Parent Class where to stop calculating the position. Default inner-scroll.
      * @return positionLeft, positionTop of the element relative to.
+     * @deprecated since app 4.0. Use getRelativeElementPosition instead.
      */
-    getElementXY(container: HTMLElement, selector?: undefined, positionParentClass?: string): number[];
-    getElementXY(container: HTMLElement, selector: string, positionParentClass?: string): number[] | null;
-    getElementXY(container: HTMLElement, selector?: string, positionParentClass = 'inner-scroll'): number[] | null {
-        let element = (selector ? container.querySelector<HTMLElement>(selector) : container);
-        if (!element) {
+    getElementXY(element: HTMLElement, selector?: string, positionParentClass = 'inner-scroll'): [number, number] | null {
+        if (selector) {
+            const foundElement = element.querySelector<HTMLElement>(selector);
+            if (!foundElement) {
+                // Element not found.
+                return null;
+            }
+
+            element = foundElement;
+        }
+
+        const parent = element.closest<HTMLElement>(`.${positionParentClass}`);
+        if (!parent) {
             return null;
         }
 
-        let positionTop = 0;
-        let positionLeft = 0;
+        const position = CoreDomUtils.getRelativeElementPosition(element, parent);
 
-        if (!positionParentClass) {
-            positionParentClass = 'inner-scroll';
-        }
-
-        while (element) {
-            positionLeft += (element.offsetLeft - element.scrollLeft + element.clientLeft);
-            positionTop += (element.offsetTop - element.scrollTop + element.clientTop);
-
-            const offsetElement = element.offsetParent;
-            element = element.parentElement;
-
-            // Every parent class has to be checked but the position has to be got form offsetParent.
-            while (offsetElement != element && element) {
-                // If positionParentClass element is reached, stop adding tops.
-                if (element.className.indexOf(positionParentClass) != -1) {
-                    element = null;
-                } else {
-                    element = element.parentElement;
-                }
-            }
-
-            // Finally, check again.
-            if (element?.className.indexOf(positionParentClass) != -1) {
-                element = null;
-            }
-        }
-
-        return [positionLeft, positionTop];
+        // Calculate the top and left positions.
+        return [
+            Math.ceil(position.x),
+            Math.ceil(position.y),
+        ];
     }
 
     /**
@@ -773,12 +758,12 @@ export class CoreDomUtilsProvider {
      * @param parent Parent element to get relative position.
      * @return X and Y position.
      */
-    getRelativeElementPosition(element: HTMLElement, parent: HTMLElement): { x: number; y: number} {
+    getRelativeElementPosition(element: HTMLElement, parent: HTMLElement): CoreCoordinates {
         // Get the top, left coordinates of two elements
         const elementRectangle = element.getBoundingClientRect();
         const parentRectangle = parent.getBoundingClientRect();
 
-        // Calculate the top and left positions
+        // Calculate the top and left positions.
         return {
             x: elementRectangle.x - parentRectangle.x,
             y: elementRectangle.y - parentRectangle.y,
@@ -2442,3 +2427,11 @@ export enum VerticalPoint {
     MID = 'mid',
     BOTTOM = 'bottom',
 }
+
+/**
+ * Coordinates of an element.
+ */
+export type CoreCoordinates = {
+    x: number; // X axis coordinates.
+    y: number; // Y axis coordinates.
+};

From ac5e4b1d796a1965ca2d8b5da2507f9a9ba91a6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 22 Mar 2022 10:09:54 +0100
Subject: [PATCH 0786/1008] MOBILE-3814 dom: Fix scroll to element with
 selector

---
 .../components/course-format/course-format.ts |  1 +
 .../components/course-index/course-index.ts   |  1 +
 src/core/services/utils/dom.ts                | 81 ++++++++++++++++---
 3 files changed, 71 insertions(+), 12 deletions(-)

diff --git a/src/core/features/course/components/course-format/course-format.ts b/src/core/features/course/components/course-format/course-format.ts
index 4f100845e..83ff3280f 100644
--- a/src/core/features/course/components/course-format/course-format.ts
+++ b/src/core/features/course/components/course-format/course-format.ts
@@ -514,6 +514,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
         CoreDomUtils.scrollViewToElement(
             this.elementRef.nativeElement,
             '#core-course-module-' + moduleId,
+            { addYAxis: -10 },
         );
     }
 
diff --git a/src/core/features/course/components/course-index/course-index.ts b/src/core/features/course/components/course-index/course-index.ts
index 6643c02f8..2d2141df6 100644
--- a/src/core/features/course/components/course-index/course-index.ts
+++ b/src/core/features/course/components/course-index/course-index.ts
@@ -112,6 +112,7 @@ export class CoreCourseCourseIndexComponent implements OnInit {
         CoreDomUtils.scrollViewToElement(
             this.elementRef.nativeElement,
             '.item.item-current',
+            { addYAxis: -10 },
         );
     }
 
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index 797faa9fb..ccb08d6f6 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -94,7 +94,7 @@ export class CoreDomUtilsProvider {
     }
 
     /**
-     * Wait an element to be in dom of another element.
+     * Wait an element to be added to the root DOM.
      *
      * @param element Element to wait.
      * @return Cancellable promise.
@@ -130,6 +130,44 @@ export class CoreDomUtilsProvider {
         );
     }
 
+    /**
+     * Wait an element to be in dom of another element using a selector
+     *
+     * @param container Element to wait.
+     * @return Cancellable promise.
+     */
+    async waitToBeInsideElement(container: HTMLElement, selector: string): Promise<CoreCancellablePromise<HTMLElement>> {
+        await CoreDomUtils.waitToBeInDOM(container);
+
+        let element = container.querySelector<HTMLElement>(selector);
+        if (element) {
+            // Already in DOM.
+            return CoreCancellablePromise.resolve(element);
+        }
+
+        let observer: MutationObserver;
+
+        return new CoreCancellablePromise<HTMLElement>(
+            (resolve) => {
+                observer = new MutationObserver(() => {
+                    element = container.querySelector<HTMLElement>(selector);
+
+                    if (!element) {
+                        return;
+                    }
+
+                    observer?.disconnect();
+                    resolve(element);
+                });
+
+                observer.observe(container, { subtree: true, childList: true });
+            },
+            () => {
+                observer?.disconnect();
+            },
+        );
+    }
+
     /**
      * Wait an element to be in dom and visible.
      *
@@ -889,7 +927,7 @@ export class CoreDomUtilsProvider {
      *
      * @param findFunction The function used to find the element.
      * @return Resolved if found, rejected if too many tries.
-     * @deprecated since app 4.0 Use waitToBeInDOM instead.
+     * @deprecated since app 4.0 Use waitToBeInsideElement instead.
      */
     waitElementToExist(findFunction: () => HTMLElement | null): Promise<HTMLElement> {
         const promiseInterval = CoreUtils.promiseDefer<HTMLElement>();
@@ -1320,14 +1358,12 @@ export class CoreDomUtilsProvider {
      *
      * @param element The element to scroll to.
      * @param selector Selector to find the element to scroll to inside the defined element.
-     * @param duration Duration of the scroll animation in milliseconds.
+     * @param scrollOptions Scroll Options.
      * @return Wether the scroll suceeded.
      */
-    async scrollViewToElement(element: HTMLElement, selector?: string, duration = 0): Promise<boolean> {
-        await CoreDomUtils.waitToBeInDOM(element);
-
+    async scrollViewToElement(element: HTMLElement, selector?: string, scrollOptions: CoreScrollOptions = {}): Promise<boolean> {
         if (selector) {
-            const foundElement = element.querySelector<HTMLElement>(selector);
+            const foundElement = await CoreDomUtils.waitToBeInsideElement(element, selector);
             if (!foundElement) {
                 // Element not found.
                 return false;
@@ -1336,16 +1372,28 @@ export class CoreDomUtilsProvider {
             element = foundElement;
         }
 
+        await CoreDomUtils.waitToBeVisible(element);
+
         const content = element.closest<HTMLIonContentElement>('ion-content') ?? undefined;
         if (!content) {
+
             // Content to scroll, not found.
             return false;
         }
 
         try {
             const position = CoreDomUtils.getRelativeElementPosition(element, content);
+            const scrollElement = await content.getScrollElement();
 
-            await content.scrollToPoint(position.x, position.y, duration);
+            scrollOptions.duration = scrollOptions.duration ?? 200;
+            scrollOptions.addXAxis = scrollOptions.addXAxis ?? 0;
+            scrollOptions.addYAxis = scrollOptions.addYAxis ?? 0;
+
+            await content.scrollToPoint(
+                position.x + scrollElement.scrollLeft + scrollOptions.addXAxis,
+                position.y + scrollElement.scrollTop + scrollOptions.addYAxis,
+                scrollOptions.duration,
+            );
 
             return true;
         } catch {
@@ -1373,8 +1421,8 @@ export class CoreDomUtilsProvider {
      * @return True if the element is found, false otherwise.
      * @deprecated since app 4.0 Use scrollViewToElement instead.
      */
-    scrollToElement(content: IonContent, element: HTMLElement, scrollParentClass?: string, duration = 0): boolean {
-        CoreDomUtils.scrollViewToElement(element, undefined, duration);
+    scrollToElement(content: IonContent, element: HTMLElement, scrollParentClass?: string, duration?: number): boolean {
+        CoreDomUtils.scrollViewToElement(element, undefined, { duration });
 
         return true;
     }
@@ -1395,13 +1443,13 @@ export class CoreDomUtilsProvider {
         content: unknown | null,
         selector: string,
         scrollParentClass?: string,
-        duration = 0,
+        duration?: number,
     ): boolean {
         if (!container || !content) {
             return false;
         }
 
-        CoreDomUtils.scrollViewToElement(container, selector, duration);
+        CoreDomUtils.scrollViewToElement(container, selector, { duration });
 
         return true;
 
@@ -2435,3 +2483,12 @@ export type CoreCoordinates = {
     x: number; // X axis coordinates.
     y: number; // Y axis coordinates.
 };
+
+/**
+ * Scroll options.
+ */
+export type CoreScrollOptions = {
+    duration?: number;
+    addYAxis?: number;
+    addXAxis?: number;
+};

From 6a1b692dc52fcc612a6c52f8ec273c2635efef88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 22 Mar 2022 10:47:14 +0100
Subject: [PATCH 0787/1008] MOBILE-3814 dom: Move new function to a singleton
 class

---
 .../pages/discussion/discussion.page.ts       |   3 +-
 src/addons/mod/data/pages/edit/edit.ts        |   3 +-
 src/addons/mod/forum/components/post/post.ts  |   3 +-
 .../forum/pages/discussion/discussion.page.ts |   3 +-
 .../preflight-modal/preflight-modal.ts        |   3 +-
 .../mod/quiz/pages/player/player.page.ts      |   3 +-
 .../mod/quiz/pages/review/review.page.ts      |   3 +-
 .../ddimageortext/classes/ddimageortext.ts    |   7 +-
 src/addons/qtype/ddmarker/classes/ddmarker.ts |   5 +-
 .../qtype/ddmarker/classes/graphics_api.ts    |   4 +-
 src/addons/qtype/ddwtos/classes/ddwtos.ts     |  13 +-
 .../navbar-buttons/navbar-buttons.ts          |   3 +-
 src/core/directives/auto-focus.ts             |   3 +-
 src/core/directives/collapsible-footer.ts     |   5 +-
 src/core/directives/collapsible-item.ts       |   3 +-
 src/core/directives/fab.ts                    |   6 +-
 src/core/directives/format-text.ts            |   5 +-
 src/core/directives/link.ts                   |   3 +-
 src/core/directives/on-appear.ts              |   4 +-
 src/core/features/compile/services/compile.ts |   2 +
 .../components/course-format/course-format.ts |   3 +-
 .../components/course-index/course-index.ts   |   4 +-
 .../rich-text-editor/rich-text-editor.ts      |   5 +-
 .../grades/pages/course/course.page.ts        |   3 +-
 .../login/pages/email-signup/email-signup.ts  |   3 +-
 .../components/user-tour/user-tour.ts         |   3 +-
 src/core/services/utils/dom.ts                | 393 +-----------------
 src/core/singletons/dom.ts                    | 390 +++++++++++++++++
 28 files changed, 468 insertions(+), 420 deletions(-)
 create mode 100644 src/core/singletons/dom.ts

diff --git a/src/addons/messages/pages/discussion/discussion.page.ts b/src/addons/messages/pages/discussion/discussion.page.ts
index 257881e38..0d4896837 100644
--- a/src/addons/messages/pages/discussion/discussion.page.ts
+++ b/src/addons/messages/pages/discussion/discussion.page.ts
@@ -45,6 +45,7 @@ import { CoreIonLoadingElement } from '@classes/ion-loading';
 import { ActivatedRoute } from '@angular/router';
 import { AddonMessagesConversationInfoComponent } from '../../components/conversation-info/conversation-info';
 import { CoreConstants } from '@/core/constants';
+import { CoreDom } from '@singletons/dom';
 
 /**
  * Page that displays a message discussion page.
@@ -1109,7 +1110,7 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView
         if (this.newMessages > 0) {
             const messages = Array.from(this.hostElement.querySelectorAll<HTMLElement>('.addon-message-not-mine'));
 
-            CoreDomUtils.scrollViewToElement(messages[messages.length - this.newMessages]);
+            CoreDom.scrollToElement(messages[messages.length - this.newMessages]);
         }
     }
 
diff --git a/src/addons/mod/data/pages/edit/edit.ts b/src/addons/mod/data/pages/edit/edit.ts
index 87e4d0323..53a73c691 100644
--- a/src/addons/mod/data/pages/edit/edit.ts
+++ b/src/addons/mod/data/pages/edit/edit.ts
@@ -40,6 +40,7 @@ import {
     AddonModDataEntryWSField,
 } from '../../services/data';
 import { AddonModDataHelper } from '../../services/data-helper';
+import { CoreDom } from '@singletons/dom';
 
 /**
  * Page that displays the view edit page.
@@ -448,7 +449,7 @@ export class AddonModDataEditPage implements OnInit {
      * Scroll to first error or to the top if not found.
      */
     protected async scrollToFirstError(): Promise<void> {
-        const scrolled = await CoreDomUtils.scrollViewToElement(this.formElement.nativeElement, '.addon-data-error');
+        const scrolled = await CoreDom.scrollToElement(this.formElement.nativeElement, '.addon-data-error');
         if (!scrolled) {
             this.content?.scrollToTop();
         }
diff --git a/src/addons/mod/forum/components/post/post.ts b/src/addons/mod/forum/components/post/post.ts
index 7d2a3e31c..5f0acd153 100644
--- a/src/addons/mod/forum/components/post/post.ts
+++ b/src/addons/mod/forum/components/post/post.ts
@@ -51,6 +51,7 @@ import { CoreRatingInfo } from '@features/rating/services/rating';
 import { CoreForms } from '@singletons/form';
 import { CoreFileEntry } from '@services/file-helper';
 import { AddonModForumSharedPostFormData } from '../../pages/discussion/discussion.page';
+import { CoreDom } from '@singletons/dom';
 
 /**
  * Components that shows a discussion post, its attachments and the action buttons allowed (reply, etc.).
@@ -540,7 +541,7 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
      * @return Promise resolved when done.
      */
     protected async scrollToForm(): Promise<void> {
-        await CoreDomUtils.scrollViewToElement(
+        await CoreDom.scrollToElement(
             this.elementRef.nativeElement,
             '#addon-forum-reply-edit-form-' + this.uniqueId,
         );
diff --git a/src/addons/mod/forum/pages/discussion/discussion.page.ts b/src/addons/mod/forum/pages/discussion/discussion.page.ts
index 605821169..a59703a50 100644
--- a/src/addons/mod/forum/pages/discussion/discussion.page.ts
+++ b/src/addons/mod/forum/pages/discussion/discussion.page.ts
@@ -33,6 +33,7 @@ import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
 import { Network, NgZone, Translate } from '@singletons';
 import { CoreArray } from '@singletons/array';
+import { CoreDom } from '@singletons/dom';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { Subscription } from 'rxjs';
 import { AddonModForumDiscussionsSource } from '../../classes/forum-discussions-source';
@@ -187,7 +188,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
         const scrollTo = this.postId || this.parent;
         if (scrollTo) {
             // Scroll to the post.
-            CoreDomUtils.scrollViewToElement(
+            CoreDom.scrollToElement(
                 this.elementRef.nativeElement,
                 '#addon-mod_forum-post-' + scrollTo,
             );
diff --git a/src/addons/mod/quiz/components/preflight-modal/preflight-modal.ts b/src/addons/mod/quiz/components/preflight-modal/preflight-modal.ts
index 69685cdf3..150ac1df1 100644
--- a/src/addons/mod/quiz/components/preflight-modal/preflight-modal.ts
+++ b/src/addons/mod/quiz/components/preflight-modal/preflight-modal.ts
@@ -21,6 +21,7 @@ import { CoreForms } from '@singletons/form';
 import { ModalController, Translate } from '@singletons';
 import { AddonModQuizAccessRuleDelegate } from '../../services/access-rules-delegate';
 import { AddonModQuizAttemptWSData, AddonModQuizQuizWSData } from '../../services/quiz';
+import { CoreDom } from '@singletons/dom';
 
 /**
  * Modal that renders the access rules for a quiz.
@@ -115,7 +116,7 @@ export class AddonModQuizPreflightModalComponent implements OnInit {
 
         if (!this.preflightForm.valid) {
             // Form not valid. Scroll to the first element with errors.
-            const hasScrolled = await CoreDomUtils.scrollViewToInputError(
+            const hasScrolled = await CoreDom.scrollToInputError(
                 this.elementRef.nativeElement,
             );
 
diff --git a/src/addons/mod/quiz/pages/player/player.page.ts b/src/addons/mod/quiz/pages/player/player.page.ts
index 4a01e09de..c793a18f1 100644
--- a/src/addons/mod/quiz/pages/player/player.page.ts
+++ b/src/addons/mod/quiz/pages/player/player.page.ts
@@ -46,6 +46,7 @@ import { AddonModQuizAttempt, AddonModQuizHelper } from '../../services/quiz-hel
 import { AddonModQuizSync } from '../../services/quiz-sync';
 import { CanLeave } from '@guards/can-leave';
 import { CoreForms } from '@singletons/form';
+import { CoreDom } from '@singletons/dom';
 
 /**
  * Page that allows attempting a quiz.
@@ -687,7 +688,7 @@ export class AddonModQuizPlayerPage implements OnInit, OnDestroy, CanLeave {
      * @param slot Slot of the question to scroll to.
      */
     protected scrollToQuestion(slot: number): void {
-        CoreDomUtils.scrollViewToElement(
+        CoreDom.scrollToElement(
             this.elementRef.nativeElement,
             '#addon-mod_quiz-question-' + slot,
         );
diff --git a/src/addons/mod/quiz/pages/review/review.page.ts b/src/addons/mod/quiz/pages/review/review.page.ts
index 2ebdebe5e..5443ffe30 100644
--- a/src/addons/mod/quiz/pages/review/review.page.ts
+++ b/src/addons/mod/quiz/pages/review/review.page.ts
@@ -22,6 +22,7 @@ import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTimeUtils } from '@services/utils/time';
 import { CoreUtils } from '@services/utils/utils';
 import { Translate } from '@singletons';
+import { CoreDom } from '@singletons/dom';
 import {
     AddonModQuizNavigationModalComponent,
     AddonModQuizNavigationModalReturn,
@@ -247,7 +248,7 @@ export class AddonModQuizReviewPage implements OnInit {
      * @param slot Slot of the question to scroll to.
      */
     protected scrollToQuestion(slot: number): void {
-        CoreDomUtils.scrollViewToElement(
+        CoreDom.scrollToElement(
             this.elementRef.nativeElement,
             `#addon-mod_quiz-question-${slot}`,
         );
diff --git a/src/addons/qtype/ddimageortext/classes/ddimageortext.ts b/src/addons/qtype/ddimageortext/classes/ddimageortext.ts
index bdebeaabf..3adb8a067 100644
--- a/src/addons/qtype/ddimageortext/classes/ddimageortext.ts
+++ b/src/addons/qtype/ddimageortext/classes/ddimageortext.ts
@@ -14,6 +14,7 @@
 
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
+import { CoreDom } from '@singletons/dom';
 import { CoreEventObserver } from '@singletons/events';
 import { CoreLogger } from '@singletons/logger';
 import { AddonModQuizDdImageOrTextQuestionData } from '../component/ddimageortext';
@@ -83,7 +84,7 @@ export class AddonQtypeDdImageOrTextQuestion {
             return bgImgXY;
         }
 
-        const position = CoreDomUtils.getRelativeElementPosition(bgImg, ddArea);
+        const position = CoreDom.getRelativeElementPosition(bgImg, ddArea);
 
         // Render the position related to the current image dimensions.
         bgImgXY[0] *= this.proportion;
@@ -419,7 +420,7 @@ export class AddonQtypeDdImageOrTextQuestion {
             return;
         }
 
-        const position = CoreDomUtils.getRelativeElementPosition(drop, ddArea);
+        const position = CoreDom.getRelativeElementPosition(drop, ddArea);
         const choice = drag.getAttribute('choice');
         drag.style.left = position.x + 'px';
         drag.style.top = position.y + 'px';
@@ -473,7 +474,7 @@ export class AddonQtypeDdImageOrTextQuestion {
             return;
         }
 
-        const position = CoreDomUtils.getRelativeElementPosition(dragItemHome, ddArea);
+        const position = CoreDom.getRelativeElementPosition(dragItemHome, ddArea);
         drag.style.left = position.x + 'px';
         drag.style.top = position.y + 'px';
         drag.classList.remove('placed');
diff --git a/src/addons/qtype/ddmarker/classes/ddmarker.ts b/src/addons/qtype/ddmarker/classes/ddmarker.ts
index 89b5a997d..a1c79281f 100644
--- a/src/addons/qtype/ddmarker/classes/ddmarker.ts
+++ b/src/addons/qtype/ddmarker/classes/ddmarker.ts
@@ -12,8 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { CoreCoordinates, CoreDomUtils } from '@services/utils/dom';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTextUtils } from '@services/utils/text';
+import { CoreCoordinates, CoreDom } from '@singletons/dom';
 import { CoreEventObserver } from '@singletons/events';
 import { CoreLogger } from '@singletons/logger';
 import { AddonQtypeDdMarkerQuestionData } from '../component/ddmarker';
@@ -134,7 +135,7 @@ export class AddonQtypeDdMarkerQuestion {
             return [];
         }
 
-        const position = CoreDomUtils.getRelativeElementPosition(element, ddArea);
+        const position = CoreDom.getRelativeElementPosition(element, ddArea);
 
         return [position.x, position.y];
     }
diff --git a/src/addons/qtype/ddmarker/classes/graphics_api.ts b/src/addons/qtype/ddmarker/classes/graphics_api.ts
index 1c66def35..4b865f6c0 100644
--- a/src/addons/qtype/ddmarker/classes/graphics_api.ts
+++ b/src/addons/qtype/ddmarker/classes/graphics_api.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { CoreDomUtils } from '@services/utils/dom';
+import { CoreDom } from '@singletons/dom';
 import { AddonQtypeDdMarkerQuestion } from './ddmarker';
 
 /**
@@ -59,7 +59,7 @@ export class AddonQtypeDdMarkerGraphicsApi {
             return;
         }
 
-        const position = CoreDomUtils.getRelativeElementPosition(bgImg, ddArea);
+        const position = CoreDom.getRelativeElementPosition(bgImg, ddArea);
 
         dropZones.style.left = position.x + 'px';
         dropZones.style.top = position.y + 'px';
diff --git a/src/addons/qtype/ddwtos/classes/ddwtos.ts b/src/addons/qtype/ddwtos/classes/ddwtos.ts
index 60be1af6d..7366d4d84 100644
--- a/src/addons/qtype/ddwtos/classes/ddwtos.ts
+++ b/src/addons/qtype/ddwtos/classes/ddwtos.ts
@@ -13,10 +13,11 @@
 // limitations under the License.
 
 import { CoreFormatTextDirective } from '@directives/format-text';
-import { CoreCoordinates, CoreDomUtils } from '@services/utils/dom';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
+import { CoreCoordinates, CoreDom } from '@singletons/dom';
 import { CoreEventObserver } from '@singletons/events';
 import { CoreLogger } from '@singletons/logger';
 import { AddonModQuizDdwtosQuestionData } from '../component/ddwtos';
@@ -389,13 +390,13 @@ export class AddonQtypeDdwtosQuestion {
             const choiceNo = this.getChoice(drag) ?? -1;
             const dragHome = this.container.querySelector<HTMLElement>(this.selectors.dragHome(groupNo, choiceNo));
             if (dragHome) {
-                position = CoreDomUtils.getRelativeElementPosition(dragHome, parent);
+                position = CoreDom.getRelativeElementPosition(dragHome, parent);
             }
         } else {
             // Get the drop zone position.
             const dropZone = this.container.querySelector<HTMLElement>(this.selectors.dropForPlace(placeNo));
             if (dropZone) {
-                position = CoreDomUtils.getRelativeElementPosition(dropZone, parent);
+                position = CoreDom.getRelativeElementPosition(dropZone, parent);
                 // Avoid the border.
                 position.x++;
                 position.y++;
@@ -425,13 +426,13 @@ export class AddonQtypeDdwtosQuestion {
      * @return Promise resolved when ready in the DOM.
      */
     protected async waitForReady(): Promise<void> {
-        await CoreDomUtils.waitToBeInDOM(this.container);
+        await CoreDom.waitToBeInDOM(this.container);
 
         await CoreComponentsRegistry.waitComponentsReady(this.container, 'core-format-text', CoreFormatTextDirective);
 
         const drag = Array.from(this.container.querySelectorAll<HTMLElement>(this.selectors.dragHomes()))[0];
 
-        await CoreDomUtils.waitToBeInDOM(drag);
+        await CoreDom.waitToBeInDOM(drag);
     }
 
     /**
@@ -480,7 +481,7 @@ export class AddonQtypeDdwtosQuestion {
             return;
         }
 
-        await CoreDomUtils.waitToBeInDOM(groupItems[0]);
+        await CoreDom.waitToBeInDOM(groupItems[0]);
 
         let maxWidth = 0;
         let maxHeight = 0;
diff --git a/src/core/components/navbar-buttons/navbar-buttons.ts b/src/core/components/navbar-buttons/navbar-buttons.ts
index 96bcf0c21..8655a1bae 100644
--- a/src/core/components/navbar-buttons/navbar-buttons.ts
+++ b/src/core/components/navbar-buttons/navbar-buttons.ts
@@ -26,6 +26,7 @@ import { CoreLogger } from '@singletons/logger';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreContextMenuComponent } from '../context-menu/context-menu';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
+import { CoreDom } from '@singletons/dom';
 
 const BUTTON_HIDDEN_CLASS = 'core-navbar-button-hidden';
 
@@ -197,7 +198,7 @@ export class CoreNavBarButtonsComponent implements OnInit, OnDestroy {
      * @return Promise resolved with the header element.
      */
     protected async searchHeader(): Promise<HTMLIonHeaderElement> {
-        await CoreDomUtils.waitToBeInDOM(this.element);
+        await CoreDom.waitToBeInDOM(this.element);
 
         let parentPage: HTMLElement | null = this.element;
         while (parentPage && parentPage.parentElement) {
diff --git a/src/core/directives/auto-focus.ts b/src/core/directives/auto-focus.ts
index 152d3a5e4..9a37a208f 100644
--- a/src/core/directives/auto-focus.ts
+++ b/src/core/directives/auto-focus.ts
@@ -16,6 +16,7 @@ import { Directive, Input, ElementRef, AfterViewInit } from '@angular/core';
 
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
+import { CoreDom } from '@singletons/dom';
 
 /**
  * Directive to auto focus an element when a view is loaded.
@@ -46,7 +47,7 @@ export class CoreAutoFocusDirective implements AfterViewInit {
             return;
         }
 
-        await CoreDomUtils.waitToBeInDOM(this.element);
+        await CoreDom.waitToBeInDOM(this.element);
 
         let focusElement = this.element;
 
diff --git a/src/core/directives/collapsible-footer.ts b/src/core/directives/collapsible-footer.ts
index 57f24d707..4a44fa0b9 100644
--- a/src/core/directives/collapsible-footer.ts
+++ b/src/core/directives/collapsible-footer.ts
@@ -23,6 +23,7 @@ import { CoreEventObserver } from '@singletons/events';
 import { CoreLoadingComponent } from '@components/loading/loading';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreCancellablePromise } from '@classes/cancellable-promise';
+import { CoreDom } from '@singletons/dom';
 
 /**
  * Directive to make an element fixed at the bottom collapsible when scrolling.
@@ -62,7 +63,7 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
     async ngOnInit(): Promise<void> {
         // Only if not present or explicitly falsy it will be false.
         this.appearOnBottom = !CoreUtils.isFalseOrZero(this.appearOnBottom);
-        this.domPromise = CoreDomUtils.waitToBeInDOM(this.element);
+        this.domPromise = CoreDom.waitToBeInDOM(this.element);
 
         await this.domPromise;
         await this.waitLoadingsDone();
@@ -72,7 +73,7 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
 
         await this.calculateHeight();
 
-        CoreDomUtils.onElementSlot(this.element, () => {
+        CoreDom.onElementSlot(this.element, () => {
             this.calculateHeight();
         });
 
diff --git a/src/core/directives/collapsible-item.ts b/src/core/directives/collapsible-item.ts
index caffa6270..f0839d8eb 100644
--- a/src/core/directives/collapsible-item.ts
+++ b/src/core/directives/collapsible-item.ts
@@ -19,6 +19,7 @@ import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
 import { Translate } from '@singletons';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
+import { CoreDom } from '@singletons/dom';
 import { CoreEventObserver } from '@singletons/events';
 import { CoreFormatTextDirective } from './format-text';
 
@@ -100,7 +101,7 @@ export class CoreCollapsibleItemDirective implements OnInit, OnDestroy {
      * @return Promise resolved when loadings are done.
      */
     protected async waitLoadingsDone(): Promise<void> {
-        this.domPromise = CoreDomUtils.waitToBeInDOM(this.element);
+        this.domPromise = CoreDom.waitToBeInDOM(this.element);
 
         await this.domPromise;
 
diff --git a/src/core/directives/fab.ts b/src/core/directives/fab.ts
index 2fb399c2e..90f700fc5 100644
--- a/src/core/directives/fab.ts
+++ b/src/core/directives/fab.ts
@@ -14,7 +14,7 @@
 
 import { Directive, ElementRef, OnDestroy, OnInit } from '@angular/core';
 import { CoreCancellablePromise } from '@classes/cancellable-promise';
-import { CoreDomUtils } from '@services/utils/dom';
+import { CoreDom } from '@singletons/dom';
 
 /**
  * Directive to move ion-fab components as direct children of the nearest ion-content.
@@ -42,7 +42,7 @@ export class CoreFabDirective implements OnInit, OnDestroy {
      * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
-        this.domPromise = CoreDomUtils.waitToBeInDOM(this.element);
+        this.domPromise = CoreDom.waitToBeInDOM(this.element);
         await this.domPromise;
 
         this.content = this.element.closest('ion-content');
@@ -56,7 +56,7 @@ export class CoreFabDirective implements OnInit, OnDestroy {
 
         await this.calculatePlace();
 
-        CoreDomUtils.onElementSlot(this.element, () => {
+        CoreDom.onElementSlot(this.element, () => {
             this.calculatePlace();
         });
     }
diff --git a/src/core/directives/format-text.ts b/src/core/directives/format-text.ts
index 3000967d3..f134eddd6 100644
--- a/src/core/directives/format-text.ts
+++ b/src/core/directives/format-text.ts
@@ -45,6 +45,7 @@ import { CoreCollapsibleItemDirective } from './collapsible-item';
 import { CoreCancellablePromise } from '@classes/cancellable-promise';
 import { AsyncComponent } from '@classes/async-component';
 import { CoreText } from '@singletons/text';
+import { CoreDom } from '@singletons/dom';
 
 /**
  * Directive to format text rendered. It renders the HTML and treats all links and media, using CoreLinkDirective
@@ -552,7 +553,7 @@ export class CoreFormatTextDirective implements OnChanges, OnDestroy, AsyncCompo
      */
     protected async getElementWidth(): Promise<number> {
         if (!this.domElementPromise) {
-            this.domElementPromise = CoreDomUtils.waitToBeInDOM(this.element);
+            this.domElementPromise = CoreDom.waitToBeInDOM(this.element);
         }
         await this.domElementPromise;
 
@@ -704,7 +705,7 @@ export class CoreFormatTextDirective implements OnChanges, OnDestroy, AsyncCompo
                     newUrl += `&h=${privacyHash}`;
                 }
 
-                const domPromise = CoreDomUtils.waitToBeInDOM(iframe);
+                const domPromise = CoreDom.waitToBeInDOM(iframe);
                 this.domPromises.push(domPromise);
 
                 await domPromise;
diff --git a/src/core/directives/link.ts b/src/core/directives/link.ts
index 18a26de30..37043ffc8 100644
--- a/src/core/directives/link.ts
+++ b/src/core/directives/link.ts
@@ -28,6 +28,7 @@ import { CoreCustomURLSchemes } from '@services/urlschemes';
 import { DomSanitizer } from '@singletons';
 import { CoreFilepool } from '@services/filepool';
 import { CoreUrl } from '@singletons/url';
+import { CoreDom } from '@singletons/dom';
 
 /**
  * Directive to open a link in external browser or in the app.
@@ -144,7 +145,7 @@ export class CoreLinkDirective implements OnInit {
             href = href.substring(1);
             const container = this.element.closest('ion-content');
             if (container) {
-                CoreDomUtils.scrollViewToElement(
+                CoreDom.scrollToElement(
                     container,
                     `#${href}, [name='${href}']`,
                 );
diff --git a/src/core/directives/on-appear.ts b/src/core/directives/on-appear.ts
index d3e9bd2da..4dff653c9 100644
--- a/src/core/directives/on-appear.ts
+++ b/src/core/directives/on-appear.ts
@@ -14,7 +14,7 @@
 
 import { Directive, ElementRef, EventEmitter, OnDestroy, OnInit, Output } from '@angular/core';
 import { CoreCancellablePromise } from '@classes/cancellable-promise';
-import { CoreDomUtils } from '@services/utils/dom';
+import { CoreDom } from '@singletons/dom';
 
 /**
  * Directive to listen when an element becomes visible.
@@ -37,7 +37,7 @@ export class CoreOnAppearDirective implements OnInit, OnDestroy {
      * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
-        this.visiblePromise = CoreDomUtils.waitToBeInViewport(this.element);
+        this.visiblePromise = CoreDom.waitToBeInViewport(this.element);
 
         await this.visiblePromise;
 
diff --git a/src/core/features/compile/services/compile.ts b/src/core/features/compile/services/compile.ts
index 929371c91..0f9f72c22 100644
--- a/src/core/features/compile/services/compile.ts
+++ b/src/core/features/compile/services/compile.ts
@@ -151,6 +151,7 @@ import { ADDON_PRIVATEFILES_SERVICES } from '@addons/privatefiles/privatefiles.m
 // Import some addon modules that define components, directives and pipes. Only import the important ones.
 import { AddonModAssignComponentsModule } from '@addons/mod/assign/components/components.module';
 import { AddonModWorkshopComponentsModule } from '@addons/mod/workshop/components/components.module';
+import { CoreDom } from '@singletons/dom';
 
 /**
  * Service to provide functionalities regarding compiling dynamic HTML and Javascript.
@@ -341,6 +342,7 @@ export class CoreCompileProvider {
         instance['Md5'] = Md5;
         instance['CoreSyncBaseProvider'] = CoreSyncBaseProvider;
         instance['CoreArray'] = CoreArray;
+        instance['CoreDom'] = CoreDom;
         instance['CoreText'] = CoreText;
         instance['CoreUrl'] = CoreUrl;
         instance['CoreWindow'] = CoreWindow;
diff --git a/src/core/features/course/components/course-format/course-format.ts b/src/core/features/course/components/course-format/course-format.ts
index 83ff3280f..dca3d5443 100644
--- a/src/core/features/course/components/course-format/course-format.ts
+++ b/src/core/features/course/components/course-format/course-format.ts
@@ -48,6 +48,7 @@ import { CoreCourseModuleDelegate } from '@features/course/services/module-deleg
 import { CoreCourseViewedModulesDBRecord } from '@features/course/services/database/course';
 import { CoreUserTours, CoreUserToursAlignment, CoreUserToursSide } from '@features/usertours/services/user-tours';
 import { CoreCourseCourseIndexTourComponent } from '../course-index-tour/course-index-tour';
+import { CoreDom } from '@singletons/dom';
 
 /**
  * Component to display course contents using a certain format. If the format isn't found, use default one.
@@ -511,7 +512,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
      * @param moduleId Module ID.
      */
     protected scrollToModule(moduleId: number): void {
-        CoreDomUtils.scrollViewToElement(
+        CoreDom.scrollToElement(
             this.elementRef.nativeElement,
             '#core-course-module-' + moduleId,
             { addYAxis: -10 },
diff --git a/src/core/features/course/components/course-index/course-index.ts b/src/core/features/course/components/course-index/course-index.ts
index 2d2141df6..f2a66fdde 100644
--- a/src/core/features/course/components/course-index/course-index.ts
+++ b/src/core/features/course/components/course-index/course-index.ts
@@ -21,8 +21,8 @@ import {
 import { CoreCourseHelper, CoreCourseSection } from '@features/course/services/course-helper';
 import { CoreCourseFormatDelegate } from '@features/course/services/format-delegate';
 import { CoreCourseAnyCourseData } from '@features/courses/services/courses';
-import { CoreDomUtils } from '@services/utils/dom';
 import { ModalController } from '@singletons';
+import { CoreDom } from '@singletons/dom';
 
 /**
  * Component to display course index modal.
@@ -109,7 +109,7 @@ export class CoreCourseCourseIndexComponent implements OnInit {
 
         this.highlighted = CoreCourseFormatDelegate.getSectionHightlightedName(this.course);
 
-        CoreDomUtils.scrollViewToElement(
+        CoreDom.scrollToElement(
             this.elementRef.nativeElement,
             '.item.item-current',
             { addYAxis: -10 },
diff --git a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
index 370816d78..76e9a1c5b 100644
--- a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
+++ b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
@@ -41,6 +41,7 @@ import { CoreComponentsRegistry } from '@singletons/components-registry';
 import { CoreLoadingComponent } from '@components/loading/loading';
 import { CoreScreen } from '@services/screen';
 import { CoreCancellablePromise } from '@classes/cancellable-promise';
+import { CoreDom } from '@singletons/dom';
 
 /**
  * Component to display a rich text editor if enabled.
@@ -290,7 +291,7 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterViewInit,
      * @return Promise resolved when loadings are done.
      */
     protected async waitLoadingsDone(): Promise<void> {
-        this.domPromise = CoreDomUtils.waitToBeInDOM(this.element);
+        this.domPromise = CoreDom.waitToBeInDOM(this.element);
 
         await this.domPromise;
 
@@ -846,7 +847,7 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterViewInit,
 
         // Cancel previous one, if any.
         this.buttonsDomPromise?.cancel();
-        this.buttonsDomPromise = CoreDomUtils.waitToBeInDOM(this.toolbar.nativeElement);
+        this.buttonsDomPromise = CoreDom.waitToBeInDOM(this.toolbar.nativeElement);
         await this.buttonsDomPromise;
 
         const width = this.toolbar.nativeElement.getBoundingClientRect().width;
diff --git a/src/core/features/grades/pages/course/course.page.ts b/src/core/features/grades/pages/course/course.page.ts
index ccb3c92d3..cdecf5322 100644
--- a/src/core/features/grades/pages/course/course.page.ts
+++ b/src/core/features/grades/pages/course/course.page.ts
@@ -31,6 +31,7 @@ import { Translate } from '@singletons';
 import { CoreSwipeNavigationItemsManager } from '@classes/items-management/swipe-navigation-items-manager';
 import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
 import { CoreGradesCoursesSource } from '@features/grades/classes/grades-courses-source';
+import { CoreDom } from '@singletons/dom';
 
 /**
  * Page that displays a course grades.
@@ -170,7 +171,7 @@ export class CoreGradesCoursePage implements AfterViewInit, OnDestroy {
                 if (row) {
                     this.toggleRow(row, true);
 
-                    CoreDomUtils.scrollViewToElement(
+                    CoreDom.scrollToElement(
                         this.element.nativeElement,
                         '#grade-' + row.id,
                     );
diff --git a/src/core/features/login/pages/email-signup/email-signup.ts b/src/core/features/login/pages/email-signup/email-signup.ts
index 7e18428b1..8f130cd45 100644
--- a/src/core/features/login/pages/email-signup/email-signup.ts
+++ b/src/core/features/login/pages/email-signup/email-signup.ts
@@ -35,6 +35,7 @@ import { CoreNavigator } from '@services/navigator';
 import { CoreForms } from '@singletons/form';
 import { CoreRecaptchaComponent } from '@components/recaptcha/recaptcha';
 import { CoreText } from '@singletons/text';
+import { CoreDom } from '@singletons/dom';
 
 /**
  * Page to signup using email.
@@ -284,7 +285,7 @@ export class CoreLoginEmailSignupPage implements OnInit {
             this.changeDetector.detectChanges();
 
             // Scroll to the first element with errors.
-            const errorFound = await CoreDomUtils.scrollViewToInputError(
+            const errorFound = await CoreDom.scrollToInputError(
                 this.elementRef.nativeElement,
             );
 
diff --git a/src/core/features/usertours/components/user-tour/user-tour.ts b/src/core/features/usertours/components/user-tour/user-tour.ts
index 65f6e63dd..fae112402 100644
--- a/src/core/features/usertours/components/user-tour/user-tour.ts
+++ b/src/core/features/usertours/components/user-tour/user-tour.ts
@@ -21,6 +21,7 @@ import { CoreUserTours, CoreUserToursAlignment, CoreUserToursSide } from '@featu
 import { CoreDomUtils } from '@services/utils/dom';
 import { AngularFrameworkDelegate } from '@singletons';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
+import { CoreDom } from '@singletons/dom';
 
 const ANIMATION_DURATION = 200;
 const USER_TOURS_BACK_BUTTON_PRIORITY = 100;
@@ -86,7 +87,7 @@ export class CoreUserToursUserTourComponent implements AfterViewInit {
         await CoreDomUtils.waitForImages(tour);
 
         // Calculate focus styles or dismiss if the element is gone.
-        if (this.focus && !CoreDomUtils.isElementVisible(this.focus)) {
+        if (this.focus && !CoreDom.isElementVisible(this.focus)) {
             await this.dismiss(false);
 
             return;
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index ccb08d6f6..b42da0973 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -54,7 +54,7 @@ import { filter } from 'rxjs/operators';
 import { Subscription } from 'rxjs';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
 import { CoreEventObserver } from '@singletons/events';
-import { CoreCancellablePromise } from '@classes/cancellable-promise';
+import { CoreDom } from '@singletons/dom';
 
 /*
  * "Utils" service with helper functions for UI, DOM elements and HTML code.
@@ -93,218 +93,6 @@ export class CoreDomUtilsProvider {
         this.debugDisplay = debugDisplay != 0;
     }
 
-    /**
-     * Wait an element to be added to the root DOM.
-     *
-     * @param element Element to wait.
-     * @return Cancellable promise.
-     */
-    waitToBeInDOM(element: HTMLElement): CoreCancellablePromise<void> {
-        const root = element.getRootNode({ composed: true });
-
-        if (root === document) {
-            // Already in DOM.
-            return CoreCancellablePromise.resolve();
-        }
-
-        let observer: MutationObserver;
-
-        return new CoreCancellablePromise<void>(
-            (resolve) => {
-                observer = new MutationObserver(() => {
-                    const root = element.getRootNode({ composed: true });
-
-                    if (root !== document) {
-                        return;
-                    }
-
-                    observer?.disconnect();
-                    resolve();
-                });
-
-                observer.observe(document.body, { subtree: true, childList: true });
-            },
-            () => {
-                observer?.disconnect();
-            },
-        );
-    }
-
-    /**
-     * Wait an element to be in dom of another element using a selector
-     *
-     * @param container Element to wait.
-     * @return Cancellable promise.
-     */
-    async waitToBeInsideElement(container: HTMLElement, selector: string): Promise<CoreCancellablePromise<HTMLElement>> {
-        await CoreDomUtils.waitToBeInDOM(container);
-
-        let element = container.querySelector<HTMLElement>(selector);
-        if (element) {
-            // Already in DOM.
-            return CoreCancellablePromise.resolve(element);
-        }
-
-        let observer: MutationObserver;
-
-        return new CoreCancellablePromise<HTMLElement>(
-            (resolve) => {
-                observer = new MutationObserver(() => {
-                    element = container.querySelector<HTMLElement>(selector);
-
-                    if (!element) {
-                        return;
-                    }
-
-                    observer?.disconnect();
-                    resolve(element);
-                });
-
-                observer.observe(container, { subtree: true, childList: true });
-            },
-            () => {
-                observer?.disconnect();
-            },
-        );
-    }
-
-    /**
-     * Wait an element to be in dom and visible.
-     *
-     * @param element Element to wait.
-     * @return Cancellable promise.
-     */
-    waitToBeVisible(element: HTMLElement): CoreCancellablePromise<void> {
-        const domPromise = CoreDomUtils.waitToBeInDOM(element);
-
-        let interval: number | undefined;
-
-        // Mutations did not observe for visibility properties.
-        return new CoreCancellablePromise<void>(
-            async (resolve) => {
-                await domPromise;
-
-                if (CoreDomUtils.isElementVisible(element)) {
-                    return resolve();
-                }
-
-                interval = window.setInterval(() => {
-                    if (!CoreDomUtils.isElementVisible(element)) {
-                        return;
-                    }
-
-                    resolve();
-                    window.clearInterval(interval);
-                }, 50);
-            },
-            () => {
-                domPromise.cancel();
-                window.clearInterval(interval);
-            },
-        );
-    }
-
-    /**
-     * Wait an element to be in dom and visible.
-     *
-     * @param element Element to wait.
-     * @param intersectionRatio Intersection ratio (From 0 to 1).
-     * @return Cancellable promise.
-     */
-    waitToBeInViewport(element: HTMLElement, intersectionRatio = 1): CoreCancellablePromise<void> {
-        const visiblePromise = CoreDomUtils.waitToBeVisible(element);
-
-        let intersectionObserver: IntersectionObserver;
-        let interval: number | undefined;
-
-        return new CoreCancellablePromise<void>(
-            async (resolve) => {
-                await visiblePromise;
-
-                if (CoreDomUtils.isElementInViewport(element, intersectionRatio)) {
-
-                    return resolve();
-                }
-
-                if ('IntersectionObserver' in window) {
-                    intersectionObserver = new IntersectionObserver((observerEntries) => {
-                        const isIntersecting = observerEntries
-                            .some((entry) => entry.isIntersecting && entry.intersectionRatio >= intersectionRatio);
-                        if (!isIntersecting) {
-                            return;
-                        }
-
-                        resolve();
-                        intersectionObserver?.disconnect();
-                    });
-
-                    intersectionObserver.observe(element);
-                } else {
-                    interval = window.setInterval(() => {
-                        if (!CoreDomUtils.isElementInViewport(element, intersectionRatio)) {
-                            return;
-                        }
-
-                        resolve();
-                        window.clearInterval(interval);
-                    }, 50);
-                }
-            },
-            () => {
-                visiblePromise.cancel();
-                intersectionObserver?.disconnect();
-                window.clearInterval(interval);
-            },
-        );
-    }
-
-    /**
-     * Runs a function when an element has been slotted.
-     *
-     * @param element HTML Element inside an ion-content to wait for slot.
-     * @param callback Function to execute on resize.
-     */
-    onElementSlot(element: HTMLElement, callback: (ev?: Event) => void): void {
-        if (!element.slot) {
-            // Element not declared to be slotted.
-            return;
-        }
-
-        const slotName = element.slot;
-        if (element.assignedSlot?.name === slotName) {
-            // Slot already assigned.
-            callback();
-
-            return;
-        }
-
-        const content = element.closest('ion-content');
-        if (!content || !content.shadowRoot) {
-            // Cannot find content.
-            return;
-        }
-
-        const slots = content.shadowRoot.querySelectorAll('slot');
-        const slot = Array.from(slots).find((slot) => slot.name === slotName);
-
-        if (!slot) {
-            // Slot not found.
-            return;
-        }
-
-        const slotListener = () => {
-            if (element.assignedSlot?.name !== slotName) {
-                return;
-            }
-
-            callback();
-            // It would happen only once.
-            slot.removeEventListener('slotchange', slotListener);
-        };
-
-        slot.addEventListener('slotchange', slotListener);;
-    }
-
     /**
      * Window resize is widely checked and may have many performance issues, debouce usage is needed to avoid calling it too much.
      * This function helps setting up the debounce feature and remove listener easily.
@@ -609,11 +397,9 @@ export class CoreDomUtilsProvider {
      * @return Selection contents. Undefined if not found.
      */
     getContentsOfElement(element: HTMLElement, selector: string): string | undefined {
-        if (element) {
-            const selected = element.querySelector(selector);
-            if (selected) {
-                return selected.innerHTML;
-            }
+        const selected = element.querySelector(selector);
+        if (selected) {
+            return selected.innerHTML;
         }
     }
 
@@ -762,7 +548,7 @@ export class CoreDomUtilsProvider {
      * @param selector Selector to find the element to gets the position.
      * @param positionParentClass Parent Class where to stop calculating the position. Default inner-scroll.
      * @return positionLeft, positionTop of the element relative to.
-     * @deprecated since app 4.0. Use getRelativeElementPosition instead.
+     * @deprecated since app 4.0. Use CoreDom.getRelativeElementPosition instead.
      */
     getElementXY(element: HTMLElement, selector?: string, positionParentClass = 'inner-scroll'): [number, number] | null {
         if (selector) {
@@ -780,7 +566,7 @@ export class CoreDomUtilsProvider {
             return null;
         }
 
-        const position = CoreDomUtils.getRelativeElementPosition(element, parent);
+        const position = CoreDom.getRelativeElementPosition(element, parent);
 
         // Calculate the top and left positions.
         return [
@@ -789,25 +575,6 @@ export class CoreDomUtilsProvider {
         ];
     }
 
-    /**
-     * Retrieve the position of a element relative to another element.
-     *
-     * @param element Element to get the position.
-     * @param parent Parent element to get relative position.
-     * @return X and Y position.
-     */
-    getRelativeElementPosition(element: HTMLElement, parent: HTMLElement): CoreCoordinates {
-        // Get the top, left coordinates of two elements
-        const elementRectangle = element.getBoundingClientRect();
-        const parentRectangle = parent.getBoundingClientRect();
-
-        // Calculate the top and left positions.
-        return {
-            x: elementRectangle.x - parentRectangle.x,
-            y: elementRectangle.y - parentRectangle.y,
-        };
-    }
-
     /**
      * Given a message, it deduce if it's a network error.
      *
@@ -927,7 +694,7 @@ export class CoreDomUtilsProvider {
      *
      * @param findFunction The function used to find the element.
      * @return Resolved if found, rejected if too many tries.
-     * @deprecated since app 4.0 Use waitToBeInsideElement instead.
+     * @deprecated since app 4.0 Use CoreDom.waitToBeInsideElement instead.
      */
     waitElementToExist(findFunction: () => HTMLElement | null): Promise<HTMLElement> {
         const promiseInterval = CoreUtils.promiseDefer<HTMLElement>();
@@ -1031,63 +798,6 @@ export class CoreDomUtilsProvider {
         return elementPoint > window.innerHeight || elementPoint < scrollTopPos;
     }
 
-    /**
-     * Check whether an element has been added to the DOM.
-     *
-     * @param element Element.
-     * @return True if element has been added to the DOM, false otherwise.
-     */
-    isElementInDom(element: HTMLElement): boolean {
-        return element.getRootNode({ composed: true }) === document;
-    }
-
-    /**
-     * Check whether an element is visible or not.
-     *
-     * @param element Element.
-     * @return True if element is visible inside the DOM.
-     */
-    isElementVisible(element: HTMLElement): boolean {
-        if (element.clientWidth === 0 || element.clientHeight === 0) {
-            return false;
-        }
-
-        const style = getComputedStyle(element);
-        if (style.opacity === '0' || style.display === 'none' || style.visibility === 'hidden') {
-            return false;
-        }
-
-        return CoreDomUtils.isElementInDom(element);
-    }
-
-    /**
-     * Check whether an element is intersecting the intersectionRatio in viewport.
-     *
-     * @param element
-     * @param intersectionRatio Intersection ratio (From 0 to 1).
-     * @return True if in viewport.
-     */
-    isElementInViewport(element: HTMLElement, intersectionRatio = 1): boolean {
-        const elementRectangle = element.getBoundingClientRect();
-
-        const elementArea = elementRectangle.width * elementRectangle.height;
-        if (elementArea == 0) {
-            return false;
-        }
-
-        const intersectionRectangle = {
-            top: Math.max(0, elementRectangle.top),
-            left: Math.max(0, elementRectangle.left),
-            bottom: Math.min(window.innerHeight, elementRectangle.bottom),
-            right: Math.min(window.innerWidth, elementRectangle.right),
-        };
-
-        const intersectionArea = (intersectionRectangle.right - intersectionRectangle.left) *
-            (intersectionRectangle.bottom - intersectionRectangle.top);
-
-        return intersectionArea / elementArea >= intersectionRatio;
-    }
-
     /**
      * Check if rich text editor is enabled.
      *
@@ -1289,7 +999,7 @@ export class CoreDomUtilsProvider {
      * @return Returns a promise which is resolved when the scroll has completed.
      * @deprecated since 3.9.5. Use directly the IonContent class.
      */
-    scrollToBottom(content: IonContent, duration?: number): Promise<void> {
+    scrollToBottom(content: IonContent, duration = 0): Promise<void> {
         return content.scrollToBottom(duration);
     }
 
@@ -1353,64 +1063,6 @@ export class CoreDomUtilsProvider {
         }
     }
 
-    /**
-     * Scroll to a certain element.
-     *
-     * @param element The element to scroll to.
-     * @param selector Selector to find the element to scroll to inside the defined element.
-     * @param scrollOptions Scroll Options.
-     * @return Wether the scroll suceeded.
-     */
-    async scrollViewToElement(element: HTMLElement, selector?: string, scrollOptions: CoreScrollOptions = {}): Promise<boolean> {
-        if (selector) {
-            const foundElement = await CoreDomUtils.waitToBeInsideElement(element, selector);
-            if (!foundElement) {
-                // Element not found.
-                return false;
-            }
-
-            element = foundElement;
-        }
-
-        await CoreDomUtils.waitToBeVisible(element);
-
-        const content = element.closest<HTMLIonContentElement>('ion-content') ?? undefined;
-        if (!content) {
-
-            // Content to scroll, not found.
-            return false;
-        }
-
-        try {
-            const position = CoreDomUtils.getRelativeElementPosition(element, content);
-            const scrollElement = await content.getScrollElement();
-
-            scrollOptions.duration = scrollOptions.duration ?? 200;
-            scrollOptions.addXAxis = scrollOptions.addXAxis ?? 0;
-            scrollOptions.addYAxis = scrollOptions.addYAxis ?? 0;
-
-            await content.scrollToPoint(
-                position.x + scrollElement.scrollLeft + scrollOptions.addXAxis,
-                position.y + scrollElement.scrollTop + scrollOptions.addYAxis,
-                scrollOptions.duration,
-            );
-
-            return true;
-        } catch {
-            return false;
-        }
-    }
-
-    /**
-     * Search for an input with error (core-input-error directive) and scrolls to it if found.
-     *
-     * @param container The element that contains the element that must be scrolled.
-     * @return True if the element is found, false otherwise.
-     */
-    async scrollViewToInputError(container: HTMLElement): Promise<boolean> {
-        return this.scrollViewToElement(container, '.core-input-error');
-    }
-
     /**
      * Scroll to a certain element.
      *
@@ -1419,10 +1071,10 @@ export class CoreDomUtilsProvider {
      * @param scrollParentClass Not used anymore.
      * @param duration Duration of the scroll animation in milliseconds.
      * @return True if the element is found, false otherwise.
-     * @deprecated since app 4.0 Use scrollViewToElement instead.
+     * @deprecated since app 4.0 Use CoreDom.scrollToElement instead.
      */
     scrollToElement(content: IonContent, element: HTMLElement, scrollParentClass?: string, duration?: number): boolean {
-        CoreDomUtils.scrollViewToElement(element, undefined, { duration });
+        CoreDom.scrollToElement(element, undefined, { duration });
 
         return true;
     }
@@ -1436,7 +1088,7 @@ export class CoreDomUtilsProvider {
      * @param scrollParentClass Not used anymore.
      * @param duration Duration of the scroll animation in milliseconds.
      * @return True if the element is found, false otherwise.
-     * @deprecated since app 4.0 Use scrollViewToElement instead.
+     * @deprecated since app 4.0 Use CoreDom.scrollToElement instead.
      */
     scrollToElementBySelector(
         container: HTMLElement | null,
@@ -1449,7 +1101,7 @@ export class CoreDomUtilsProvider {
             return false;
         }
 
-        CoreDomUtils.scrollViewToElement(container, selector, { duration });
+        CoreDom.scrollToElement(container, selector, { duration });
 
         return true;
 
@@ -1460,14 +1112,14 @@ export class CoreDomUtilsProvider {
      *
      * @param container The element that contains the element that must be scrolled.
      * @return True if the element is found, false otherwise.
-     * @deprecated since app 4.0 Use scrollViewToInputError instead.
+     * @deprecated since app 4.0 Use CoreDom.scrollToInputError instead.
      */
     scrollToInputError(container: HTMLElement | null): boolean {
         if (!container) {
             return false;
         }
 
-        this.scrollViewToInputError(container);
+        CoreDom.scrollToInputError(container);
 
         return true;
     }
@@ -2475,20 +2127,3 @@ export enum VerticalPoint {
     MID = 'mid',
     BOTTOM = 'bottom',
 }
-
-/**
- * Coordinates of an element.
- */
-export type CoreCoordinates = {
-    x: number; // X axis coordinates.
-    y: number; // Y axis coordinates.
-};
-
-/**
- * Scroll options.
- */
-export type CoreScrollOptions = {
-    duration?: number;
-    addYAxis?: number;
-    addXAxis?: number;
-};
diff --git a/src/core/singletons/dom.ts b/src/core/singletons/dom.ts
new file mode 100644
index 000000000..7bb8be177
--- /dev/null
+++ b/src/core/singletons/dom.ts
@@ -0,0 +1,390 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { CoreCancellablePromise } from '@classes/cancellable-promise';
+
+/**
+ * Singleton with helper functions for dom.
+ */
+export class CoreDom {
+
+    // Avoid creating singleton instances.
+    private constructor() {
+        // Nothing to do.
+    }
+
+    /**
+     * Retrieve the position of a element relative to another element.
+     *
+     * @param element Element to get the position.
+     * @param parent Parent element to get relative position.
+     * @return X and Y position.
+     */
+    static getRelativeElementPosition(element: HTMLElement, parent: HTMLElement): CoreCoordinates {
+        // Get the top, left coordinates of two elements
+        const elementRectangle = element.getBoundingClientRect();
+        const parentRectangle = parent.getBoundingClientRect();
+
+        // Calculate the top and left positions.
+        return {
+            x: elementRectangle.x - parentRectangle.x,
+            y: elementRectangle.y - parentRectangle.y,
+        };
+    }
+
+    /**
+     * Check whether an element has been added to the DOM.
+     *
+     * @param element Element.
+     * @return True if element has been added to the DOM, false otherwise.
+     */
+    static isElementInDom(element: HTMLElement): boolean {
+        return element.getRootNode({ composed: true }) === document;
+    }
+
+    /**
+     * Check whether an element is intersecting the intersectionRatio in viewport.
+     *
+     * @param element
+     * @param intersectionRatio Intersection ratio (From 0 to 1).
+     * @return True if in viewport.
+     */
+    static isElementInViewport(element: HTMLElement, intersectionRatio = 1): boolean {
+        const elementRectangle = element.getBoundingClientRect();
+
+        const elementArea = elementRectangle.width * elementRectangle.height;
+        if (elementArea == 0) {
+            return false;
+        }
+
+        const intersectionRectangle = {
+            top: Math.max(0, elementRectangle.top),
+            left: Math.max(0, elementRectangle.left),
+            bottom: Math.min(window.innerHeight, elementRectangle.bottom),
+            right: Math.min(window.innerWidth, elementRectangle.right),
+        };
+
+        const intersectionArea = (intersectionRectangle.right - intersectionRectangle.left) *
+            (intersectionRectangle.bottom - intersectionRectangle.top);
+
+        return intersectionArea / elementArea >= intersectionRatio;
+    }
+
+    /**
+     * Check whether an element is visible or not.
+     *
+     * @param element Element.
+     * @return True if element is visible inside the DOM.
+     */
+    static isElementVisible(element: HTMLElement): boolean {
+        if (element.clientWidth === 0 || element.clientHeight === 0) {
+            return false;
+        }
+
+        const style = getComputedStyle(element);
+        if (style.opacity === '0' || style.display === 'none' || style.visibility === 'hidden') {
+            return false;
+        }
+
+        return CoreDom.isElementInDom(element);
+    }
+
+    /**
+     * Runs a function when an element has been slotted.
+     *
+     * @param element HTML Element inside an ion-content to wait for slot.
+     * @param callback Function to execute on resize.
+     */
+    static onElementSlot(element: HTMLElement, callback: (ev?: Event) => void): void {
+        if (!element.slot) {
+            // Element not declared to be slotted.
+            return;
+        }
+
+        const slotName = element.slot;
+        if (element.assignedSlot?.name === slotName) {
+            // Slot already assigned.
+            callback();
+
+            return;
+        }
+
+        const content = element.closest('ion-content');
+        if (!content || !content.shadowRoot) {
+            // Cannot find content.
+            return;
+        }
+
+        const slots = content.shadowRoot.querySelectorAll('slot');
+        const slot = Array.from(slots).find((slot) => slot.name === slotName);
+
+        if (!slot) {
+            // Slot not found.
+            return;
+        }
+
+        const slotListener = () => {
+            if (element.assignedSlot?.name !== slotName) {
+                return;
+            }
+
+            callback();
+            // It would happen only once.
+            slot.removeEventListener('slotchange', slotListener);
+        };
+
+        slot.addEventListener('slotchange', slotListener);;
+    }
+
+    /**
+     * Scroll to a certain element.
+     *
+     * @param element The element to scroll to.
+     * @param selector Selector to find the element to scroll to inside the defined element.
+     * @param scrollOptions Scroll Options.
+     * @return Wether the scroll suceeded.
+     */
+    static async scrollToElement(element: HTMLElement, selector?: string, scrollOptions: CoreScrollOptions = {}): Promise<boolean> {
+        if (selector) {
+            const foundElement = await CoreDom.waitToBeInsideElement(element, selector);
+            if (!foundElement) {
+                // Element not found.
+                return false;
+            }
+
+            element = foundElement;
+        }
+
+        await CoreDom.waitToBeVisible(element);
+
+        const content = element.closest<HTMLIonContentElement>('ion-content') ?? undefined;
+        if (!content) {
+
+            // Content to scroll, not found.
+            return false;
+        }
+
+        try {
+            const position = CoreDom.getRelativeElementPosition(element, content);
+            const scrollElement = await content.getScrollElement();
+
+            scrollOptions.duration = scrollOptions.duration ?? 200;
+            scrollOptions.addXAxis = scrollOptions.addXAxis ?? 0;
+            scrollOptions.addYAxis = scrollOptions.addYAxis ?? 0;
+
+            await content.scrollToPoint(
+                position.x + scrollElement.scrollLeft + scrollOptions.addXAxis,
+                position.y + scrollElement.scrollTop + scrollOptions.addYAxis,
+                scrollOptions.duration,
+            );
+
+            return true;
+        } catch {
+            return false;
+        }
+    }
+
+    /**
+     * Search for an input with error (core-input-error directive) and scrolls to it if found.
+     *
+     * @param container The element that contains the element that must be scrolled.
+     * @return True if the element is found, false otherwise.
+     */
+    static async scrollToInputError(container: HTMLElement): Promise<boolean> {
+        return CoreDom.scrollToElement(container, '.core-input-error');
+    }
+
+    /**
+     * Wait an element to be added to the root DOM.
+     *
+     * @param element Element to wait.
+     * @return Cancellable promise.
+     */
+    static waitToBeInDOM(element: HTMLElement): CoreCancellablePromise<void> {
+        const root = element.getRootNode({ composed: true });
+
+        if (root === document) {
+            // Already in DOM.
+            return CoreCancellablePromise.resolve();
+        }
+
+        let observer: MutationObserver;
+
+        return new CoreCancellablePromise<void>(
+            (resolve) => {
+                observer = new MutationObserver(() => {
+                    const root = element.getRootNode({ composed: true });
+
+                    if (root !== document) {
+                        return;
+                    }
+
+                    observer?.disconnect();
+                    resolve();
+                });
+
+                observer.observe(document.body, { subtree: true, childList: true });
+            },
+            () => {
+                observer?.disconnect();
+            },
+        );
+    }
+
+    /**
+     * Wait an element to be in dom of another element using a selector
+     *
+     * @param container Element to wait.
+     * @return Cancellable promise.
+     */
+    static async waitToBeInsideElement(container: HTMLElement, selector: string): Promise<CoreCancellablePromise<HTMLElement>> {
+        await CoreDom.waitToBeInDOM(container);
+
+        let element = container.querySelector<HTMLElement>(selector);
+        if (element) {
+            // Already in DOM.
+            return CoreCancellablePromise.resolve(element);
+        }
+
+        let observer: MutationObserver;
+
+        return new CoreCancellablePromise<HTMLElement>(
+            (resolve) => {
+                observer = new MutationObserver(() => {
+                    element = container.querySelector<HTMLElement>(selector);
+
+                    if (!element) {
+                        return;
+                    }
+
+                    observer?.disconnect();
+                    resolve(element);
+                });
+
+                observer.observe(container, { subtree: true, childList: true });
+            },
+            () => {
+                observer?.disconnect();
+            },
+        );
+    }
+
+    /**
+     * Wait an element to be in dom and visible.
+     *
+     * @param element Element to wait.
+     * @param intersectionRatio Intersection ratio (From 0 to 1).
+     * @return Cancellable promise.
+     */
+    static waitToBeInViewport(element: HTMLElement, intersectionRatio = 1): CoreCancellablePromise<void> {
+        const visiblePromise = CoreDom.waitToBeVisible(element);
+
+        let intersectionObserver: IntersectionObserver;
+        let interval: number | undefined;
+
+        return new CoreCancellablePromise<void>(
+            async (resolve) => {
+                await visiblePromise;
+
+                if (CoreDom.isElementInViewport(element, intersectionRatio)) {
+
+                    return resolve();
+                }
+
+                if ('IntersectionObserver' in window) {
+                    intersectionObserver = new IntersectionObserver((observerEntries) => {
+                        const isIntersecting = observerEntries
+                            .some((entry) => entry.isIntersecting && entry.intersectionRatio >= intersectionRatio);
+                        if (!isIntersecting) {
+                            return;
+                        }
+
+                        resolve();
+                        intersectionObserver?.disconnect();
+                    });
+
+                    intersectionObserver.observe(element);
+                } else {
+                    interval = window.setInterval(() => {
+                        if (!CoreDom.isElementInViewport(element, intersectionRatio)) {
+                            return;
+                        }
+
+                        resolve();
+                        window.clearInterval(interval);
+                    }, 50);
+                }
+            },
+            () => {
+                visiblePromise.cancel();
+                intersectionObserver?.disconnect();
+                window.clearInterval(interval);
+            },
+        );
+    }
+
+    /**
+     * Wait an element to be in dom and visible.
+     *
+     * @param element Element to wait.
+     * @return Cancellable promise.
+     */
+    static waitToBeVisible(element: HTMLElement): CoreCancellablePromise<void> {
+        const domPromise = CoreDom.waitToBeInDOM(element);
+
+        let interval: number | undefined;
+
+        // Mutations did not observe for visibility properties.
+        return new CoreCancellablePromise<void>(
+            async (resolve) => {
+                await domPromise;
+
+                if (CoreDom.isElementVisible(element)) {
+                    return resolve();
+                }
+
+                interval = window.setInterval(() => {
+                    if (!CoreDom.isElementVisible(element)) {
+                        return;
+                    }
+
+                    resolve();
+                    window.clearInterval(interval);
+                }, 50);
+            },
+            () => {
+                domPromise.cancel();
+                window.clearInterval(interval);
+            },
+        );
+    }
+
+}
+
+/**
+ * Coordinates of an element.
+ */
+export type CoreCoordinates = {
+    x: number; // X axis coordinates.
+    y: number; // Y axis coordinates.
+};
+
+/**
+ * Scroll options.
+ */
+export type CoreScrollOptions = {
+    duration?: number;
+    addYAxis?: number;
+    addXAxis?: number;
+};

From d5dcf98e455c18f441340f67f2760d069c3f6dd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 22 Mar 2022 11:40:37 +0100
Subject: [PATCH 0788/1008] MOBILE-3814 course: Reorder module summary info

---
 .../module-summary/module-summary.html        | 72 +++++++++----------
 .../module-summary/module-summary.scss        | 13 ++++
 2 files changed, 49 insertions(+), 36 deletions(-)

diff --git a/src/core/features/course/components/module-summary/module-summary.html b/src/core/features/course/components/module-summary/module-summary.html
index 11bb659c0..7af594e4b 100644
--- a/src/core/features/course/components/module-summary/module-summary.html
+++ b/src/core/features/course/components/module-summary/module-summary.html
@@ -54,44 +54,9 @@
             </ion-label>
         </ion-item>
 
-        <ion-card *ngIf="(canPrefetch && displayOptions.displayPrefetch) || (sizeReadable && displayOptions.displaySize)">
-            <ion-item lines="full" class="ion-text-wrap">
-                <ion-label>
-                    <h2>
-                        <ion-icon name="fas-cloud-download-alt" aria-hidden="true"></ion-icon>
-                        {{ 'addon.storagemanager.downloads' | translate }}
-                    </h2>
-                </ion-label>
-            </ion-item>
-            <ion-item *ngIf="sizeReadable && displayOptions.displaySize" class="ion-text-wrap">
-                <ion-label>
-                    <p class="item-heading ion-text-wrap">{{ 'addon.storagemanager.totalspaceusage' | translate }}</p>
-                    <ion-badge color="light">{{ sizeReadable | coreBytesToSize }}</ion-badge>
-                </ion-label>
-                <ion-button *ngIf="!removeFilesLoading" [disabled]="prefetchLoading" (click)="removeFiles()" color="danger" fill="clear"
-                    [attr.aria-label]="'core.clearstoreddata' | translate:{$a: sizeReadable}" slot="end">
-                    <ion-icon name="fas-trash" slot="icon-only" aria-hidden="true"></ion-icon>
-                </ion-button>
-                <ion-spinner *ngIf="removeFilesLoading" slot="end" aria-hidden="true"></ion-spinner>
-            </ion-item>
-            <ion-item *ngIf="downloadTimeReadable" class="ion-text-wrap">
-                <ion-label>
-                    <p class="ion-text-wrap">{{ 'core.lastdownloaded' | translate }} {{ downloadTimeReadable }}</p>
-                </ion-label>
-            </ion-item>
-            <ion-button fill="outline" expand="block" *ngIf="canPrefetch && displayOptions.displayPrefetch" class="ion-text-wrap"
-                (click)="prefetch()" [disabled]="prefetchDisabled">
-                <ion-icon *ngIf="!prefetchLoading" name="fas-cloud-download-alt" slot="start" aria-hidden="true"></ion-icon>
-                <ion-spinner *ngIf="prefetchLoading" slot="start" aria-hidden="true"></ion-spinner>
-                <ion-label>
-                    {{ 'core.download' | translate }}
-                </ion-label>
-            </ion-button>
-        </ion-card>
-
         <ion-card *ngIf="displayOptions.displayGrades && grades?.length > 0">
             <ion-list>
-                <ion-item lines="full" class="ion-text-wrap">
+                <ion-item lines="full" class="ion-text-wrap card-header">
                     <ion-label>
                         <h2>
                             <ion-icon name="fas-chart-bar" slot="end" aria-hidden="true"></ion-icon>{{ 'core.grades.gradebook' | translate
@@ -188,6 +153,41 @@
             </ion-list>
         </ion-card>
 
+        <ion-card *ngIf="(canPrefetch && displayOptions.displayPrefetch) || (sizeReadable && displayOptions.displaySize)">
+            <ion-item lines="full" class="ion-text-wrap card-header">
+                <ion-label>
+                    <h2>
+                        <ion-icon name="fas-cloud-download-alt" aria-hidden="true"></ion-icon>
+                        {{ 'addon.storagemanager.downloads' | translate }}
+                    </h2>
+                </ion-label>
+            </ion-item>
+            <ion-item *ngIf="sizeReadable && displayOptions.displaySize" class="ion-text-wrap">
+                <ion-label>
+                    <p class="item-heading ion-text-wrap">{{ 'addon.storagemanager.totalspaceusage' | translate }}</p>
+                    <ion-badge color="light">{{ sizeReadable | coreBytesToSize }}</ion-badge>
+                </ion-label>
+                <ion-button *ngIf="!removeFilesLoading" [disabled]="prefetchLoading" (click)="removeFiles()" color="danger" fill="clear"
+                    [attr.aria-label]="'core.clearstoreddata' | translate:{$a: sizeReadable}" slot="end">
+                    <ion-icon name="fas-trash" slot="icon-only" aria-hidden="true"></ion-icon>
+                </ion-button>
+                <ion-spinner *ngIf="removeFilesLoading" slot="end" aria-hidden="true"></ion-spinner>
+            </ion-item>
+            <ion-item *ngIf="downloadTimeReadable" class="ion-text-wrap">
+                <ion-label>
+                    <p class="ion-text-wrap">{{ 'core.lastdownloaded' | translate }} {{ downloadTimeReadable }}</p>
+                </ion-label>
+            </ion-item>
+            <ion-button fill="outline" expand="block" *ngIf="canPrefetch && displayOptions.displayPrefetch" class="ion-text-wrap"
+                (click)="prefetch()" [disabled]="prefetchDisabled">
+                <ion-icon *ngIf="!prefetchLoading" name="fas-cloud-download-alt" slot="start" aria-hidden="true"></ion-icon>
+                <ion-spinner *ngIf="prefetchLoading" slot="start" aria-hidden="true"></ion-spinner>
+                <ion-label>
+                    {{ 'core.download' | translate }}
+                </ion-label>
+            </ion-button>
+        </ion-card>
+
         <ion-item button *ngIf="blog && displayOptions.displayBlog" (click)="gotoBlog()" [detail]="true">
             <ion-icon name="far-newspaper" slot="start" aria-hidden="true"></ion-icon>
             <ion-label>
diff --git a/src/core/features/course/components/module-summary/module-summary.scss b/src/core/features/course/components/module-summary/module-summary.scss
index 5f86396c2..a4bb647d2 100644
--- a/src/core/features/course/components/module-summary/module-summary.scss
+++ b/src/core/features/course/components/module-summary/module-summary.scss
@@ -22,3 +22,16 @@ ion-item ion-label ion-icon {
     @include margin-horizontal(0, 4px);
     vertical-align: text-top;
 }
+
+
+ion-item.card-header {
+    --padding-start: 8px;
+    --padding-end: 8px;
+    --inner-padding-start: 0px;
+    --inner-padding-end: 0px;
+    --min-height: 40px;
+
+    ion-label {
+        margin: 0px;
+    }
+}

From 2dcb3895fa2122b7ff7b6e9cffbe33fe826cc996 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 22 Mar 2022 11:15:23 +0100
Subject: [PATCH 0789/1008] MOBILE-4088 timeline: Don't filter courses, can
 contain activities due

---
 src/addons/block/timeline/components/timeline/timeline.ts | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/addons/block/timeline/components/timeline/timeline.ts b/src/addons/block/timeline/components/timeline/timeline.ts
index 969658ee7..ce962f59f 100644
--- a/src/addons/block/timeline/components/timeline/timeline.ts
+++ b/src/addons/block/timeline/components/timeline/timeline.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Component, OnInit } from '@angular/core';
-import { CoreTimeUtils } from '@services/utils/time';
 import { CoreSites } from '@services/sites';
 import { CoreBlockBaseComponent } from '@features/block/classes/base-block-component';
 import { AddonBlockTimeline } from '../../services/timeline';
@@ -171,11 +170,8 @@ export class AddonBlockTimelineComponent extends CoreBlockBaseComponent implemen
      * @return Promise resolved when done.
      */
     protected async fetchMyOverviewTimelineByCourses(): Promise<void> {
-        const courses = await CoreCoursesHelper.getUserCoursesWithOptions();
-        const today = CoreTimeUtils.timestamp();
-
-        this.timelineCourses.courses = courses.filter((course) =>
-            (course.startdate || 0) <= today && (!course.enddate || course.enddate >= today));
+        // Do not filter courses by date because they can contain activities due.
+        this.timelineCourses.courses = await CoreCoursesHelper.getUserCoursesWithOptions();
 
         if (this.timelineCourses.courses.length > 0) {
             this.courseIds = this.timelineCourses.courses.map((course) => course.id);

From 9514f1e719f76285c2ca559ba7a97932b35c0d1b Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 22 Mar 2022 09:56:32 +0100
Subject: [PATCH 0790/1008] MOBILE-3833 courses: Add site home link handler

---
 .../courses/services/handlers/dashboard-link.ts | 13 ++++++++++---
 .../sitehome/services/handlers/index-link.ts    | 17 +++++++++++------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/core/features/courses/services/handlers/dashboard-link.ts b/src/core/features/courses/services/handlers/dashboard-link.ts
index b506909cc..05ad995a0 100644
--- a/src/core/features/courses/services/handlers/dashboard-link.ts
+++ b/src/core/features/courses/services/handlers/dashboard-link.ts
@@ -15,17 +15,18 @@
 import { Injectable } from '@angular/core';
 import { CoreContentLinksHandlerBase } from '@features/contentlinks/classes/base-handler';
 import { CoreContentLinksAction } from '@features/contentlinks/services/contentlinks-delegate';
+import { CoreMainMenuHomeHandlerService } from '@features/mainmenu/services/handlers/mainmenu';
 import { CoreNavigator } from '@services/navigator';
 import { makeSingleton } from '@singletons';
 import { CoreDashboardHomeHandler, CoreDashboardHomeHandlerService } from './dashboard-home';
 
 /**
- * Handler to treat links to my overview.
+ * Handler to treat links to dashboard.
  */
 @Injectable({ providedIn: 'root' })
 export class CoreCoursesDashboardLinkHandlerService extends CoreContentLinksHandlerBase {
 
-    name = 'CoreCoursesMyOverviewLinkHandler';
+    name = 'CoreCoursesDashboardLinkHandler';
     pattern = /\/my\/?$/;
 
     /**
@@ -37,7 +38,13 @@ export class CoreCoursesDashboardLinkHandlerService extends CoreContentLinksHand
         return [{
             action: (siteId): void => {
                 // Use redirect to select the tab.
-                CoreNavigator.navigateToSitePath(CoreDashboardHomeHandlerService.PAGE_NAME, { siteId });
+                CoreNavigator.navigateToSitePath(
+                    `/${CoreMainMenuHomeHandlerService.PAGE_NAME}/${CoreDashboardHomeHandlerService.PAGE_NAME}`,
+                    {
+                        siteId,
+                        preferCurrentTab: false,
+                    },
+                );
             },
         }];
     }
diff --git a/src/core/features/sitehome/services/handlers/index-link.ts b/src/core/features/sitehome/services/handlers/index-link.ts
index fcb3b4b99..1f6e333a6 100644
--- a/src/core/features/sitehome/services/handlers/index-link.ts
+++ b/src/core/features/sitehome/services/handlers/index-link.ts
@@ -20,6 +20,8 @@ import { CoreContentLinksAction } from '@features/contentlinks/services/contentl
 import { CoreSiteHome } from '../sitehome';
 import { makeSingleton } from '@singletons';
 import { CoreNavigator } from '@services/navigator';
+import { CoreSiteHomeHomeHandlerService } from './sitehome-home';
+import { CoreMainMenuHomeHandlerService } from '@features/mainmenu/services/handlers/mainmenu';
 
 /**
  * Handler to treat links to site home index.
@@ -29,7 +31,7 @@ export class CoreSiteHomeIndexLinkHandlerService extends CoreContentLinksHandler
 
     name = 'CoreSiteHomeIndexLinkHandler';
     featureName = 'CoreMainMenuDelegate_CoreSiteHome';
-    pattern = /\/course\/view\.php.*([?&]id=\d+)/;
+    pattern = /\/course\/view\.php.*([?&]id=\d+)|\/index\.php(\?redirect=0)?/;
 
     /**
      * @inheritdoc
@@ -37,10 +39,13 @@ export class CoreSiteHomeIndexLinkHandlerService extends CoreContentLinksHandler
     getActions(): CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
         return [{
             action: (siteId: string): void => {
-                CoreNavigator.navigateToSitePath('/home/site', {
-                    preferCurrentTab: false,
-                    siteId,
-                });
+                CoreNavigator.navigateToSitePath(
+                    `/${CoreMainMenuHomeHandlerService.PAGE_NAME}/${CoreSiteHomeHomeHandlerService.PAGE_NAME}`,
+                    {
+                        preferCurrentTab: false,
+                        siteId,
+                    },
+                );
             },
         }];
     }
@@ -51,7 +56,7 @@ export class CoreSiteHomeIndexLinkHandlerService extends CoreContentLinksHandler
     async isEnabled(siteId: string, url: string, params: Record<string, string>, courseId?: number): Promise<boolean> {
         courseId = parseInt(params.id, 10);
         if (!courseId) {
-            return false;
+            return url.includes('index.php');
         }
 
         const site = await CoreSites.getSite(siteId);

From 8cd6869f354fff9ac31a12dbf22d091702da8295 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 22 Mar 2022 10:50:16 +0100
Subject: [PATCH 0791/1008] MOBILE-3833 core: Fix site listing styles

---
 src/core/features/login/pages/site/site.scss | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/core/features/login/pages/site/site.scss b/src/core/features/login/pages/site/site.scss
index b7e1f5767..5f666b0cf 100644
--- a/src/core/features/login/pages/site/site.scss
+++ b/src/core/features/login/pages/site/site.scss
@@ -38,7 +38,8 @@
         max-width: fit-content;
         width: auto;
         height: auto;
-        margin: 0 50% 0 auto; // LTR will be applied on transform.
+        margin: 0 auto;
+        margin-left: 50%;
         @include transform(translate3d(-50%,0,0));
         object-fit: cover;
         object-position: 50% 50%;
@@ -50,6 +51,15 @@
     }
 }
 
+:host-context([dir="rtl"]) {
+
+    .item ion-thumbnail img {
+        margin-left: 0;
+        margin-right: 50%;
+    }
+
+}
+
 .core-login-site-logo,
 .core-login-site-list,
 .core-login-site-list-found {

From 6e78c1847b1151c6c852bb244df52e1d3aa8b8ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 22 Mar 2022 12:21:16 +0100
Subject: [PATCH 0792/1008] MOBILE-3814 calendar: Fix calendar past events
 opacity

---
 src/addons/calendar/calendar-common.scss            | 6 ++++++
 src/addons/calendar/components/calendar/calendar.ts | 4 +---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/addons/calendar/calendar-common.scss b/src/addons/calendar/calendar-common.scss
index 3691d26f2..3746e7872 100644
--- a/src/addons/calendar/calendar-common.scss
+++ b/src/addons/calendar/calendar-common.scss
@@ -9,6 +9,12 @@
             color: white;
             border-radius: 50%;
             padding: 0.7rem;
+            --margin-vertical: 12px;
+            --margin-end: 12px;
+            margin-top: var(--margin-vertical);
+            margin-bottom: var(--margin-vertical);
+            @include margin-horizontal(null, var(--margin-end));
+
         }
 
         @each $category, $value in $calendar-event-category-colors {
diff --git a/src/addons/calendar/components/calendar/calendar.ts b/src/addons/calendar/components/calendar/calendar.ts
index 64cd0807d..4f984d83c 100644
--- a/src/addons/calendar/components/calendar/calendar.ts
+++ b/src/addons/calendar/components/calendar/calendar.ts
@@ -496,7 +496,6 @@ class AddonCalendarMonthSlidesItemsManagerSource extends CoreSwipeSlidesDynamicI
         const weeks = result.weeks as AddonCalendarWeek[];
         const currentDay = new Date().getDate();
         const currentTime = CoreTimeUtils.timestamp();
-        let isPast = true;
 
         const preloadedMonth: PreloadedMonth = {
             ...month,
@@ -523,8 +522,7 @@ class AddonCalendarMonthSlidesItemsManagerSource extends CoreSwipeSlidesDynamicI
 
                 if (preloadedMonth.isCurrentMonth) {
                     day.istoday = day.mday == currentDay;
-                    day.ispast = isPast && !day.istoday;
-                    isPast = day.ispast;
+                    day.ispast = preloadedMonth.isPastMonth || day.mday < currentDay;
 
                     if (day.istoday) {
                         day.eventsFormated?.forEach((event) => {

From 82c818600781107d79472eff27bca6d6c01c0428 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 22 Mar 2022 12:48:55 +0100
Subject: [PATCH 0793/1008] MOBILE-3814 login: Fix login button sizes and
 margins

---
 .../login/pages/credentials/credentials.html  |  2 +-
 .../login/pages/reconnect/reconnect.html      | 23 ++++++++-----------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/core/features/login/pages/credentials/credentials.html b/src/core/features/login/pages/credentials/credentials.html
index bac39ab1b..e8703bdfa 100644
--- a/src/core/features/login/pages/credentials/credentials.html
+++ b/src/core/features/login/pages/credentials/credentials.html
@@ -46,7 +46,7 @@
                 </core-show-password>
             </ion-item>
             <ion-button expand="block" type="submit" [disabled]="siteChecked && !isBrowserSSO && !credForm.valid"
-                class="ion-margin core-login-login-button">
+                class="ion-margin core-login-login-button ion-text-wrap">
                 {{ 'core.login.loginbutton' | translate }}
             </ion-button>
             <!-- Remove this once Ionic fixes this bug: https://github.com/ionic-team/ionic-framework/issues/19368 -->
diff --git a/src/core/features/login/pages/reconnect/reconnect.html b/src/core/features/login/pages/reconnect/reconnect.html
index 7854dfa37..8c6b71f6e 100644
--- a/src/core/features/login/pages/reconnect/reconnect.html
+++ b/src/core/features/login/pages/reconnect/reconnect.html
@@ -51,20 +51,15 @@
                     </ion-input>
                 </core-show-password>
             </ion-item>
-            <ion-grid class="ion-padding">
-                <ion-row>
-                    <ion-col>
-                        <ion-button expand="block" fill="outline" (click)="cancel($event)">
-                            {{ 'core.login.cancel' | translate }}
-                        </ion-button>
-                    </ion-col>
-                    <ion-col>
-                        <ion-button type="submit" expand="block" [disabled]="!credForm.valid">
-                            {{ 'core.login.loginbutton' | translate }}
-                        </ion-button>
-                    </ion-col>
-                </ion-row>
-            </ion-grid>
+            <div class="adaptable-buttons-row">
+                <ion-button expand="block" fill="outline" (click)="cancel($event)" class="ion-margin ion-text-wrap">
+                    {{ 'core.login.cancel' | translate }}
+                </ion-button>
+                <ion-button type="submit" expand="block" [disabled]="!credForm.valid"
+                    class="ion-margin core-login-login-button ion-text-wrap">
+                    {{ 'core.login.loginbutton' | translate }}
+                </ion-button>
+            </div>
 
             <ng-container *ngIf="showScanQR">
                 <div class="ion-text-center ion-padding">{{ 'core.login.or' | translate }}</div>

From a9d14f4fc32ef272cce4bd4f771abe312b4a16f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 22 Mar 2022 13:22:42 +0100
Subject: [PATCH 0794/1008] MOBILE-3814 calendar: Select custom when item over
 input is clicked

---
 .../reminder-time-modal/reminder-time-modal.html |  2 +-
 .../reminder-time-modal/reminder-time-modal.ts   |  9 +++------
 src/core/directives/auto-focus.ts                | 14 +-------------
 src/core/services/utils/dom.ts                   | 16 +++++++++++++---
 4 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/src/addons/calendar/components/reminder-time-modal/reminder-time-modal.html b/src/addons/calendar/components/reminder-time-modal/reminder-time-modal.html
index 052241aa9..1071b92d9 100644
--- a/src/addons/calendar/components/reminder-time-modal/reminder-time-modal.html
+++ b/src/addons/calendar/components/reminder-time-modal/reminder-time-modal.html
@@ -34,7 +34,7 @@
                 </ion-label>
                 <ion-radio slot="end" value="custom"></ion-radio>
             </ion-item>
-            <ion-item class="ion-text-wrap">
+            <ion-item class="ion-text-wrap" (click)="customInputClicked($event)">
                 <ion-label></ion-label>
 
                 <div class="flex-row">
diff --git a/src/addons/calendar/components/reminder-time-modal/reminder-time-modal.ts b/src/addons/calendar/components/reminder-time-modal/reminder-time-modal.ts
index 871530664..1a10a9c27 100644
--- a/src/addons/calendar/components/reminder-time-modal/reminder-time-modal.ts
+++ b/src/addons/calendar/components/reminder-time-modal/reminder-time-modal.ts
@@ -15,7 +15,6 @@
 import { AddonCalendar, AddonCalendarReminderUnits, AddonCalendarValueAndUnit } from '@addons/calendar/services/calendar';
 import { Component, Input, OnInit } from '@angular/core';
 import { CoreDomUtils } from '@services/utils/dom';
-import { CoreUtils } from '@services/utils/utils';
 import { ModalController } from '@singletons';
 
 /**
@@ -166,11 +165,9 @@ export class AddonCalendarReminderTimeModalComponent implements OnInit {
 
         this.radioValue = 'custom';
 
-        await CoreUtils.nextTick();
-
-        const target = <HTMLInputElement | Element | null> ev.target;
-        if (target && 'focus' in target) {
-            target.focus();
+        const target = <HTMLInputElement | HTMLElement | null> ev.target;
+        if (target) {
+            CoreDomUtils.focusElement(target);
         }
     }
 
diff --git a/src/core/directives/auto-focus.ts b/src/core/directives/auto-focus.ts
index 9a37a208f..d84252ad6 100644
--- a/src/core/directives/auto-focus.ts
+++ b/src/core/directives/auto-focus.ts
@@ -49,19 +49,7 @@ export class CoreAutoFocusDirective implements AfterViewInit {
 
         await CoreDom.waitToBeInDOM(this.element);
 
-        let focusElement = this.element;
-
-        if ('getInputElement' in focusElement) {
-            // If it's an Ionic element get the right input to use.
-            focusElement.componentOnReady && await focusElement.componentOnReady();
-            focusElement = await focusElement.getInputElement();
-        }
-
-        if (!focusElement) {
-            return;
-        }
-
-        CoreDomUtils.focusElement(focusElement);
+        CoreDomUtils.focusElement(this.element);
 
     }
 
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index b42da0973..9d2bc991a 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -336,12 +336,22 @@ export class CoreDomUtilsProvider {
     /**
      * Focus an element and open keyboard.
      *
-     * @param focusElement HTML element to focus.
+     * @param element HTML element to focus.
      */
-    async focusElement(focusElement: HTMLElement): Promise<void> {
+    async focusElement(
+        element: HTMLIonInputElement | HTMLIonTextareaElement | HTMLIonSearchbarElement | HTMLElement,
+    ): Promise<void> {
         let retries = 10;
 
-        if (!focusElement.focus) {
+        let focusElement = element;
+
+        if ('getInputElement' in focusElement) {
+            // If it's an Ionic element get the right input to use.
+            focusElement.componentOnReady && await focusElement.componentOnReady();
+            focusElement = await focusElement.getInputElement();
+        }
+
+        if (!focusElement || !focusElement.focus) {
             throw new CoreError('Element to focus cannot be focused');
         }
 

From dd0e2add0ac83cdab602322d5f6e953ab8e8d18d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 22 Mar 2022 14:57:54 +0100
Subject: [PATCH 0795/1008] MOBILE-3814 blocks: Fix slotting side blocks button

---
 src/core/directives/collapsible-footer.ts     |  9 +++---
 src/core/directives/fab.ts                    | 15 +++------
 .../side-blocks-button/side-blocks-button.ts  | 27 ++++++++++++++--
 .../core-course-format-single-activity.html   |  2 +-
 .../courses/pages/dashboard/dashboard.html    |  2 +-
 .../features/sitehome/pages/index/index.html  |  2 +-
 src/core/singletons/dom.ts                    | 32 +++++++++++++++++++
 7 files changed, 68 insertions(+), 21 deletions(-)

diff --git a/src/core/directives/collapsible-footer.ts b/src/core/directives/collapsible-footer.ts
index 4a44fa0b9..73e9dbd5a 100644
--- a/src/core/directives/collapsible-footer.ts
+++ b/src/core/directives/collapsible-footer.ts
@@ -50,11 +50,10 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
     protected contentScrollListener?: EventListener;
     protected endContentScrollListener?: EventListener;
     protected resizeListener?: CoreEventObserver;
-    protected domPromise?: CoreCancellablePromise<void>;
+    protected slotPromise?: CoreCancellablePromise<void>;
 
     constructor(el: ElementRef, protected ionContent: IonContent) {
         this.element = el.nativeElement;
-        this.element.setAttribute('slot', 'fixed'); // Just in case somebody forgets to add it.
     }
 
     /**
@@ -63,9 +62,9 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
     async ngOnInit(): Promise<void> {
         // Only if not present or explicitly falsy it will be false.
         this.appearOnBottom = !CoreUtils.isFalseOrZero(this.appearOnBottom);
-        this.domPromise = CoreDom.waitToBeInDOM(this.element);
+        this.slotPromise = CoreDom.slotOnContent(this.element);
 
-        await this.domPromise;
+        await this.slotPromise;
         await this.waitLoadingsDone();
         await this.waitFormatTextsRendered();
 
@@ -229,7 +228,7 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
         }
 
         this.resizeListener?.off();
-        this.domPromise?.cancel();
+        this.slotPromise?.cancel();
     }
 
 }
diff --git a/src/core/directives/fab.ts b/src/core/directives/fab.ts
index 90f700fc5..fe18f8274 100644
--- a/src/core/directives/fab.ts
+++ b/src/core/directives/fab.ts
@@ -31,19 +31,18 @@ export class CoreFabDirective implements OnInit, OnDestroy {
     protected element: HTMLElement;
     protected content?: HTMLIonContentElement | null;
     protected initialPaddingBottom = 0;
-    protected domPromise?: CoreCancellablePromise<void>;
+    protected slotPromise?: CoreCancellablePromise<void>;
 
     constructor(el: ElementRef) {
         this.element = el.nativeElement;
-        this.element.setAttribute('slot', 'fixed');
     }
 
     /**
      * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
-        this.domPromise = CoreDom.waitToBeInDOM(this.element);
-        await this.domPromise;
+        this.slotPromise = CoreDom.slotOnContent(this.element);
+        await this.slotPromise;
 
         this.content = this.element.closest('ion-content');
 
@@ -70,12 +69,6 @@ export class CoreFabDirective implements OnInit, OnDestroy {
         }
 
         const initialHeight = this.element.getBoundingClientRect().height || 56;
-
-        // Move element to the nearest ion-content if it's not the parent
-        if (this.element.parentElement?.nodeName != 'ION-CONTENT') {
-            this.content.appendChild(this.element);
-        }
-
         this.content.style.setProperty('--padding-bottom', this.initialPaddingBottom + initialHeight + 'px');
     }
 
@@ -86,7 +79,7 @@ export class CoreFabDirective implements OnInit, OnDestroy {
         if (this.content) {
             this.content.style.setProperty('--padding-bottom', this.initialPaddingBottom + 'px');
         }
-        this.domPromise?.cancel();
+        this.slotPromise?.cancel();
     }
 
 }
diff --git a/src/core/features/block/components/side-blocks-button/side-blocks-button.ts b/src/core/features/block/components/side-blocks-button/side-blocks-button.ts
index e8b369c29..e748b67aa 100644
--- a/src/core/features/block/components/side-blocks-button/side-blocks-button.ts
+++ b/src/core/features/block/components/side-blocks-button/side-blocks-button.ts
@@ -12,9 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, ElementRef, Input, ViewChild } from '@angular/core';
+import { Component, ElementRef, Input, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { CoreCancellablePromise } from '@classes/cancellable-promise';
 import { CoreUserTours, CoreUserToursAlignment, CoreUserToursSide } from '@features/usertours/services/user-tours';
 import { CoreDomUtils } from '@services/utils/dom';
+import { CoreDom } from '@singletons/dom';
 import { CoreBlockSideBlocksTourComponent } from '../side-blocks-tour/side-blocks-tour';
 import { CoreBlockSideBlocksComponent } from '../side-blocks/side-blocks';
 
@@ -26,11 +28,25 @@ import { CoreBlockSideBlocksComponent } from '../side-blocks/side-blocks';
     templateUrl: 'side-blocks-button.html',
     styleUrls: ['side-blocks-button.scss'],
 })
-export class CoreBlockSideBlocksButtonComponent {
+export class CoreBlockSideBlocksButtonComponent implements OnInit, OnDestroy {
 
     @Input() courseId!: number;
     @ViewChild('button', { read: ElementRef }) button?: ElementRef<HTMLElement>;
 
+    protected element: HTMLElement;
+    protected slotPromise?: CoreCancellablePromise<void>;
+
+    constructor(el: ElementRef) {
+        this.element = el.nativeElement;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async ngOnInit(): Promise<void> {
+        this.slotPromise = CoreDom.slotOnContent(this.element);
+    }
+
     /**
      * Open side blocks.
      */
@@ -62,4 +78,11 @@ export class CoreBlockSideBlocksButtonComponent {
         });
     }
 
+    /**
+     * @inheritdoc
+     */
+    ngOnDestroy(): void {
+        this.slotPromise?.cancel();
+    }
+
 }
diff --git a/src/core/features/course/format/singleactivity/components/core-course-format-single-activity.html b/src/core/features/course/format/singleactivity/components/core-course-format-single-activity.html
index 68eedcebf..aa42eeadb 100644
--- a/src/core/features/course/format/singleactivity/components/core-course-format-single-activity.html
+++ b/src/core/features/course/format/singleactivity/components/core-course-format-single-activity.html
@@ -1,4 +1,4 @@
 <core-dynamic-component [component]="componentClass" [data]="data"></core-dynamic-component>
 
-<core-block-side-blocks-button *ngIf="course && hasBlocks" [courseId]="course.id">
+<core-block-side-blocks-button slot="fixed" *ngIf="course && hasBlocks" [courseId]="course.id">
 </core-block-side-blocks-button>
diff --git a/src/core/features/courses/pages/dashboard/dashboard.html b/src/core/features/courses/pages/dashboard/dashboard.html
index 1e9771413..38dc1f17e 100644
--- a/src/core/features/courses/pages/dashboard/dashboard.html
+++ b/src/core/features/courses/pages/dashboard/dashboard.html
@@ -15,7 +15,7 @@
             </ng-container>
         </ion-list>
 
-        <core-block-side-blocks-button *ngIf="hasSideBlocks"></core-block-side-blocks-button>
+        <core-block-side-blocks-button slot="fixed" *ngIf="hasSideBlocks"></core-block-side-blocks-button>
 
         <core-empty-box *ngIf="blocks.length == 0" icon="fas-cubes" [message]="'core.course.nocontentavailable' | translate">
         </core-empty-box>
diff --git a/src/core/features/sitehome/pages/index/index.html b/src/core/features/sitehome/pages/index/index.html
index 97f7ba85a..f7c3d0856 100644
--- a/src/core/features/sitehome/pages/index/index.html
+++ b/src/core/features/sitehome/pages/index/index.html
@@ -45,7 +45,7 @@
                 </ng-container>
             </ng-container>
         </ion-list>
-        <core-block-side-blocks-button *ngIf="hasBlocks" [courseId]="siteHomeId">
+        <core-block-side-blocks-button slot="fixed" *ngIf="hasBlocks" [courseId]="siteHomeId">
         </core-block-side-blocks-button>
 
         <core-empty-box *ngIf="!hasContent" icon="fas-box-open" [message]="'core.course.nocontentavailable' | translate">
diff --git a/src/core/singletons/dom.ts b/src/core/singletons/dom.ts
index 7bb8be177..fdd0dd9d0 100644
--- a/src/core/singletons/dom.ts
+++ b/src/core/singletons/dom.ts
@@ -205,6 +205,38 @@ export class CoreDom {
         return CoreDom.scrollToElement(container, '.core-input-error');
     }
 
+    /**
+     * Move element to content so it can be slotted.
+     *
+     * @param element HTML Element.
+     * @param slot Slot name.
+     * @return Promise resolved when done.
+     */
+    static slotOnContent(element: HTMLElement, slot = 'fixed'): CoreCancellablePromise<void> {
+        element.setAttribute('slot', slot);
+        if (element.parentElement?.nodeName === 'ION-CONTENT') {
+            return CoreCancellablePromise.resolve();
+        }
+
+        const domPromise = CoreDom.waitToBeInDOM(element);
+
+        return new CoreCancellablePromise<void>(
+            async (resolve) => {
+                await domPromise;
+
+                // Move element to the nearest ion-content if it's not the parent
+                if (element.parentElement?.nodeName !== 'ION-CONTENT') {
+                    element.closest('ion-content')?.appendChild(element);
+                }
+
+                resolve();
+            },
+            () => {
+                domPromise.cancel();
+            },
+        );
+    }
+
     /**
      * Wait an element to be added to the root DOM.
      *

From d2b9cf89d87de59f2356dc51675e3533dbcea615 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 22 Mar 2022 15:48:49 +0100
Subject: [PATCH 0796/1008] MOBILE-3833 module: Improve performance of
 getModuleStoredSize

---
 .../services/module-prefetch-delegate.ts      | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/core/features/course/services/module-prefetch-delegate.ts b/src/core/features/course/services/module-prefetch-delegate.ts
index d75e36759..1556a75da 100644
--- a/src/core/features/course/services/module-prefetch-delegate.ts
+++ b/src/core/features/course/services/module-prefetch-delegate.ts
@@ -482,23 +482,17 @@ export class CoreCourseModulePrefetchDelegateService extends CoreDelegate<CoreCo
      * @return Promise resolved with the total size (0 if unknown)
      */
     async getModuleStoredSize(module: CoreCourseAnyModuleData, courseId: number): Promise<number> {
-        let downloadedSize = await this.getModuleDownloadedSize(module, courseId);
-
-        if (isNaN(downloadedSize)) {
-            downloadedSize = 0;
-        }
-
         const site = CoreSites.getCurrentSite();
         const handler = this.getPrefetchHandlerFor(module.modname);
-        if (!handler || !site) {
-            // If there is no handler then we can't find out the component name.
-            // We can't work out the cached size, so just return downloaded size.
-            return downloadedSize;
-        }
 
-        const cachedSize = await site.getComponentCacheSize(handler.component, module.id);
+        const [downloadedSize, cachedSize] = await Promise.all([
+            this.getModuleDownloadedSize(module, courseId),
+            handler && site ? site.getComponentCacheSize(handler.component, module.id) : 0,
+        ]);
 
-        return cachedSize + downloadedSize;
+        const totalSize = cachedSize + downloadedSize;
+
+        return isNaN(totalSize) ? 0 : totalSize;
     }
 
     /**

From 106a6abc706b8992cf205996692327386e002a04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 22 Mar 2022 16:01:09 +0100
Subject: [PATCH 0797/1008] MOBILE-3814 overview: Fix icon aria-label

---
 .../components/myoverview/addon-block-myoverview.html         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
index 07b679473..753f0fa8c 100644
--- a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
+++ b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
@@ -51,11 +51,11 @@
         <ion-col size="auto" *ngIf="isLayoutSwitcherAvailable">
             <ion-button *ngIf="layout == 'card'" fill="outline" (click)="toggleLayout('list')"
                 [attr.aria-label]="'addon.block_myoverview.list' | translate">
-                <ion-icon slot="icon-only" name="fas-list"></ion-icon>
+                <ion-icon slot="icon-only" name="fas-list" aria-hidden="true"></ion-icon>
             </ion-button>
             <ion-button *ngIf="layout == 'list'" fill="outline" (click)="toggleLayout('card')"
                 [attr.aria-label]="'addon.block_myoverview.card' | translate">
-                <ion-icon slot="icon-only" name="fas-th"></ion-icon>
+                <ion-icon slot="icon-only" name="fas-th" aria-hidden="true"></ion-icon>
             </ion-button>
         </ion-col>
     </ion-row>

From 718ae4637b3b33e14cb0dbc44c0ada5c89c3eeae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 22 Mar 2022 16:01:41 +0100
Subject: [PATCH 0798/1008] MOBILE-3814 core: Fix providers not found

---
 src/core/core.module.ts                       | 4 ----
 src/core/features/compile/services/compile.ts | 6 +++++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/core/core.module.ts b/src/core/core.module.ts
index aa68a6e2a..44ca6128e 100644
--- a/src/core/core.module.ts
+++ b/src/core/core.module.ts
@@ -33,7 +33,6 @@ import { CoreFileHelperProvider } from '@services/file-helper';
 import { CoreFilepoolProvider } from '@services/filepool';
 import { CoreFileProvider } from '@services/file';
 import { CoreFileSessionProvider } from '@services/file-session';
-import { CoreForms } from '@singletons/form';
 import { CoreGeolocationProvider } from '@services/geolocation';
 import { CoreGroupsProvider } from '@services/groups';
 import { CoreIframeUtilsProvider } from '@services/utils/iframe';
@@ -51,11 +50,9 @@ import { CoreUpdateManagerProvider } from '@services/update-manager';
 import { CoreUrlUtilsProvider } from '@services/utils/url';
 import { CoreUtilsProvider } from '@services/utils/utils';
 import { CoreWSProvider } from '@services/ws';
-import { CoreComponentsRegistry } from '@singletons/components-registry';
 
 export const CORE_SERVICES: Type<unknown>[] = [
     CoreAppProvider,
-    CoreComponentsRegistry,
     CoreConfigProvider,
     CoreCronDelegateService,
     CoreCustomURLSchemesProvider,
@@ -65,7 +62,6 @@ export const CORE_SERVICES: Type<unknown>[] = [
     CoreFilepoolProvider,
     CoreFileProvider,
     CoreFileSessionProvider,
-    CoreForms,
     CoreGeolocationProvider,
     CoreGroupsProvider,
     CoreIframeUtilsProvider,
diff --git a/src/core/features/compile/services/compile.ts b/src/core/features/compile/services/compile.ts
index 0f9f72c22..4be7f3875 100644
--- a/src/core/features/compile/services/compile.ts
+++ b/src/core/features/compile/services/compile.ts
@@ -79,6 +79,9 @@ import { Md5 } from 'ts-md5/dist/md5';
 // Import core classes that can be useful for site plugins.
 import { CoreSyncBaseProvider } from '@classes/base-sync';
 import { CoreArray } from '@singletons/array';
+import { CoreComponentsRegistry } from '@singletons/components-registry';
+import { CoreDom } from '@singletons/dom';
+import { CoreForms } from '@singletons/form';
 import { CoreText } from '@singletons/text';
 import { CoreUrl } from '@singletons/url';
 import { CoreWindow } from '@singletons/window';
@@ -151,7 +154,6 @@ import { ADDON_PRIVATEFILES_SERVICES } from '@addons/privatefiles/privatefiles.m
 // Import some addon modules that define components, directives and pipes. Only import the important ones.
 import { AddonModAssignComponentsModule } from '@addons/mod/assign/components/components.module';
 import { AddonModWorkshopComponentsModule } from '@addons/mod/workshop/components/components.module';
-import { CoreDom } from '@singletons/dom';
 
 /**
  * Service to provide functionalities regarding compiling dynamic HTML and Javascript.
@@ -342,7 +344,9 @@ export class CoreCompileProvider {
         instance['Md5'] = Md5;
         instance['CoreSyncBaseProvider'] = CoreSyncBaseProvider;
         instance['CoreArray'] = CoreArray;
+        instance['CoreComponentsRegistry'] = CoreComponentsRegistry;
         instance['CoreDom'] = CoreDom;
+        instance['CoreForms'] = CoreForms;
         instance['CoreText'] = CoreText;
         instance['CoreUrl'] = CoreUrl;
         instance['CoreWindow'] = CoreWindow;

From af5b72db6472dc88f28316a3dc4c248b23f3dd5c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 23 Mar 2022 08:12:05 +0100
Subject: [PATCH 0799/1008] MOBILE-3833 config: Lock plugins and libraries for
 4.0.0

---
 package-lock.json | 246 +++++++++++++++++++++++-----------------------
 package.json      | 246 +++++++++++++++++++++++-----------------------
 2 files changed, 246 insertions(+), 246 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d336ccd2c..53b5ea119 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,40 +9,40 @@
       "version": "4.0.0-dev",
       "license": "Apache-2.0",
       "dependencies": {
-        "@angular/animations": "~10.0.14",
-        "@angular/common": "~10.0.14",
-        "@angular/core": "~10.0.14",
-        "@angular/forms": "~10.0.14",
-        "@angular/platform-browser": "~10.0.14",
-        "@angular/platform-browser-dynamic": "~10.0.14",
-        "@angular/router": "~10.0.14",
-        "@ionic-native/badge": "^5.33.0",
-        "@ionic-native/camera": "^5.33.0",
-        "@ionic-native/chooser": "^5.33.0",
-        "@ionic-native/clipboard": "^5.33.0",
-        "@ionic-native/core": "^5.33.0",
-        "@ionic-native/device": "^5.33.0",
-        "@ionic-native/diagnostic": "^5.33.0",
-        "@ionic-native/file": "^5.33.0",
-        "@ionic-native/file-opener": "^5.33.0",
-        "@ionic-native/file-transfer": "^5.33.0",
-        "@ionic-native/geolocation": "^5.33.0",
-        "@ionic-native/http": "^5.33.0",
-        "@ionic-native/in-app-browser": "^5.33.0",
-        "@ionic-native/ionic-webview": "^5.33.0",
-        "@ionic-native/keyboard": "^5.33.0",
-        "@ionic-native/local-notifications": "^5.33.0",
-        "@ionic-native/media": "^5.33.0",
-        "@ionic-native/media-capture": "^5.33.0",
-        "@ionic-native/network": "^5.33.0",
-        "@ionic-native/push": "^5.33.0",
-        "@ionic-native/qr-scanner": "^5.33.0",
-        "@ionic-native/splash-screen": "^5.33.0",
-        "@ionic-native/sqlite": "^5.33.0",
-        "@ionic-native/status-bar": "^5.33.0",
-        "@ionic-native/web-intent": "^5.33.0",
-        "@ionic-native/zip": "^5.33.0",
-        "@ionic/angular": "^5.9.2",
+        "@angular/animations": "10.0.14",
+        "@angular/common": "10.0.14",
+        "@angular/core": "10.0.14",
+        "@angular/forms": "10.0.14",
+        "@angular/platform-browser": "10.0.14",
+        "@angular/platform-browser-dynamic": "10.0.14",
+        "@angular/router": "10.0.14",
+        "@ionic-native/badge": "5.33.0",
+        "@ionic-native/camera": "5.33.0",
+        "@ionic-native/chooser": "5.33.0",
+        "@ionic-native/clipboard": "5.33.0",
+        "@ionic-native/core": "5.33.0",
+        "@ionic-native/device": "5.33.0",
+        "@ionic-native/diagnostic": "5.33.0",
+        "@ionic-native/file": "5.33.0",
+        "@ionic-native/file-opener": "5.33.0",
+        "@ionic-native/file-transfer": "5.33.0",
+        "@ionic-native/geolocation": "5.33.0",
+        "@ionic-native/http": "5.33.0",
+        "@ionic-native/in-app-browser": "5.33.0",
+        "@ionic-native/ionic-webview": "5.33.0",
+        "@ionic-native/keyboard": "5.33.0",
+        "@ionic-native/local-notifications": "5.33.0",
+        "@ionic-native/media": "5.33.0",
+        "@ionic-native/media-capture": "5.33.0",
+        "@ionic-native/network": "5.33.0",
+        "@ionic-native/push": "5.33.0",
+        "@ionic-native/qr-scanner": "5.33.0",
+        "@ionic-native/splash-screen": "5.33.0",
+        "@ionic-native/sqlite": "5.33.0",
+        "@ionic-native/status-bar": "5.33.0",
+        "@ionic-native/web-intent": "5.33.0",
+        "@ionic-native/zip": "5.33.0",
+        "@ionic/angular": "5.9.2",
         "@moodlehq/cordova-plugin-file-transfer": "1.7.1-moodle.5",
         "@moodlehq/cordova-plugin-inappbrowser": "5.0.0-moodle.3",
         "@moodlehq/cordova-plugin-ionic-webview": "5.0.0-moodle.1",
@@ -50,105 +50,105 @@
         "@moodlehq/cordova-plugin-qrscanner": "3.0.1-moodle.2",
         "@moodlehq/cordova-plugin-zip": "3.1.0-moodle.1",
         "@moodlehq/phonegap-plugin-push": "2.0.0-moodle.2",
-        "@ngx-translate/core": "^13.0.0",
-        "@ngx-translate/http-loader": "^6.0.0",
-        "@types/chart.js": "^2.9.31",
+        "@ngx-translate/core": "13.0.0",
+        "@ngx-translate/http-loader": "6.0.0",
+        "@types/chart.js": "2.9.31",
         "@types/cordova": "0.0.34",
-        "@types/dom-mediacapture-record": "^1.0.7",
-        "chart.js": "^2.9.4",
-        "com-darryncampbell-cordova-plugin-intent": "^2.2.0",
-        "cordova": "^11.0.0",
-        "cordova-android": "^10.1.1",
-        "cordova-clipboard": "^1.3.0",
-        "cordova-ios": "^6.2.0",
-        "cordova-plugin-add-swift-support": "^2.0.2",
-        "cordova-plugin-advanced-http": "^3.2.2",
-        "cordova-plugin-badge": "^0.8.8",
-        "cordova-plugin-camera": "^6.0.0",
-        "cordova-plugin-chooser": "^1.3.2",
-        "cordova-plugin-customurlscheme": "^5.0.2",
-        "cordova-plugin-device": "^2.0.3",
-        "cordova-plugin-file": "^6.0.2",
-        "cordova-plugin-file-opener2": "^3.0.5",
-        "cordova-plugin-geolocation": "^4.1.0",
-        "cordova-plugin-globalization": "^1.11.0",
-        "cordova-plugin-ionic-keyboard": "^2.2.0",
-        "cordova-plugin-media": "^5.0.4",
-        "cordova-plugin-media-capture": "^3.0.3",
-        "cordova-plugin-network-information": "^3.0.0",
-        "cordova-plugin-prevent-override": "^1.0.1",
-        "cordova-plugin-splashscreen": "^6.0.0",
-        "cordova-plugin-statusbar": "^3.0.0",
-        "cordova-plugin-wkuserscript": "^1.0.1",
-        "cordova-plugin-wkwebview-cookies": "^1.0.1",
-        "cordova-sqlite-storage": "^6.0.0",
-        "cordova.plugins.diagnostic": "^6.1.1",
-        "core-js": "^3.9.1",
-        "es6-promise-plugin": "^4.2.2",
-        "hammerjs": "^2.0.8",
-        "jszip": "^3.5.0",
+        "@types/dom-mediacapture-record": "1.0.7",
+        "chart.js": "2.9.4",
+        "com-darryncampbell-cordova-plugin-intent": "2.2.0",
+        "cordova": "11.0.0",
+        "cordova-android": "10.1.1",
+        "cordova-clipboard": "1.3.0",
+        "cordova-ios": "6.2.0",
+        "cordova-plugin-add-swift-support": "2.0.2",
+        "cordova-plugin-advanced-http": "3.2.2",
+        "cordova-plugin-badge": "0.8.8",
+        "cordova-plugin-camera": "6.0.0",
+        "cordova-plugin-chooser": "1.3.2",
+        "cordova-plugin-customurlscheme": "5.0.2",
+        "cordova-plugin-device": "2.0.3",
+        "cordova-plugin-file": "6.0.2",
+        "cordova-plugin-file-opener2": "3.0.5",
+        "cordova-plugin-geolocation": "4.1.0",
+        "cordova-plugin-globalization": "1.11.0",
+        "cordova-plugin-ionic-keyboard": "2.2.0",
+        "cordova-plugin-media": "5.0.4",
+        "cordova-plugin-media-capture": "3.0.3",
+        "cordova-plugin-network-information": "3.0.0",
+        "cordova-plugin-prevent-override": "1.0.1",
+        "cordova-plugin-splashscreen": "6.0.0",
+        "cordova-plugin-statusbar": "3.0.0",
+        "cordova-plugin-wkuserscript": "1.0.1",
+        "cordova-plugin-wkwebview-cookies": "1.0.1",
+        "cordova-sqlite-storage": "6.0.0",
+        "cordova.plugins.diagnostic": "6.1.1",
+        "core-js": "3.9.1",
+        "es6-promise-plugin": "4.2.2",
+        "hammerjs": "2.0.8",
+        "jszip": "3.5.0",
         "mathjax": "2.7.7",
-        "moment": "^2.29.0",
-        "nl.kingsquare.cordova.background-audio": "^1.0.1",
-        "rxjs": "~6.5.5",
-        "ts-md5": "^1.2.7",
-        "tslib": "^2.3.1",
-        "zone.js": "~0.10.3"
+        "moment": "2.29.0",
+        "nl.kingsquare.cordova.background-audio": "1.0.1",
+        "rxjs": "6.5.5",
+        "ts-md5": "1.2.7",
+        "tslib": "2.3.1",
+        "zone.js": "0.10.3"
       },
       "devDependencies": {
-        "@angular-builders/custom-webpack": "^10.0.1",
-        "@angular-devkit/architect": "^0.1202.7",
-        "@angular-devkit/build-angular": "~0.1000.8",
-        "@angular-eslint/builder": "^4.2.0",
-        "@angular-eslint/eslint-plugin": "^4.2.0",
-        "@angular-eslint/eslint-plugin-template": "^4.2.0",
-        "@angular-eslint/schematics": "^4.2.0",
-        "@angular-eslint/template-parser": "^4.2.0",
-        "@angular/cli": "~10.0.8",
-        "@angular/compiler": "~10.0.14",
-        "@angular/compiler-cli": "~10.0.14",
-        "@angular/language-service": "~10.0.14",
-        "@ionic/angular-toolkit": "^2.3.3",
-        "@ionic/cli": "^6.14.1",
-        "@types/faker": "^5.1.3",
-        "@types/node": "^12.12.64",
-        "@types/resize-observer-browser": "^0.1.5",
-        "@types/webpack-env": "^1.16.0",
-        "@typescript-eslint/eslint-plugin": "^4.22.0",
-        "@typescript-eslint/parser": "^4.22.0",
-        "check-es-compat": "^1.1.1",
-        "cordova-plugin-androidx-adapter": "^1.1.3",
-        "eslint": "^7.25.0",
-        "eslint-config-prettier": "^8.3.0",
-        "eslint-plugin-header": "^3.1.1",
-        "eslint-plugin-import": "^2.22.1",
-        "eslint-plugin-jest": "^24.3.6",
-        "eslint-plugin-jsdoc": "^32.3.3",
-        "eslint-plugin-prefer-arrow": "^1.2.3",
-        "eslint-plugin-promise": "^5.1.0",
-        "faker": "^5.1.0",
-        "fs-extra": "^9.1.0",
+        "@angular-builders/custom-webpack": "10.0.1",
+        "@angular-devkit/architect": "0.1202.7",
+        "@angular-devkit/build-angular": "0.1000.8",
+        "@angular-eslint/builder": "4.2.0",
+        "@angular-eslint/eslint-plugin": "4.2.0",
+        "@angular-eslint/eslint-plugin-template": "4.2.0",
+        "@angular-eslint/schematics": "4.2.0",
+        "@angular-eslint/template-parser": "4.2.0",
+        "@angular/cli": "10.0.8",
+        "@angular/compiler": "10.0.14",
+        "@angular/compiler-cli": "10.0.14",
+        "@angular/language-service": "10.0.14",
+        "@ionic/angular-toolkit": "2.3.3",
+        "@ionic/cli": "6.14.1",
+        "@types/faker": "5.1.3",
+        "@types/node": "12.12.64",
+        "@types/resize-observer-browser": "0.1.5",
+        "@types/webpack-env": "1.16.0",
+        "@typescript-eslint/eslint-plugin": "4.22.0",
+        "@typescript-eslint/parser": "4.22.0",
+        "check-es-compat": "1.1.1",
+        "cordova-plugin-androidx-adapter": "1.1.3",
+        "eslint": "7.25.0",
+        "eslint-config-prettier": "8.3.0",
+        "eslint-plugin-header": "3.1.1",
+        "eslint-plugin-import": "2.22.1",
+        "eslint-plugin-jest": "24.3.6",
+        "eslint-plugin-jsdoc": "32.3.3",
+        "eslint-plugin-prefer-arrow": "1.2.3",
+        "eslint-plugin-promise": "5.1.0",
+        "faker": "5.1.0",
+        "fs-extra": "9.1.0",
         "gulp": "4.0.2",
-        "gulp-clip-empty-files": "^0.1.2",
-        "gulp-concat": "^2.6.1",
-        "gulp-flatten": "^0.4.0",
-        "gulp-htmlmin": "^5.0.1",
-        "gulp-rename": "^2.0.0",
-        "gulp-slash": "^1.1.3",
-        "jest": "^26.5.2",
-        "jest-preset-angular": "^8.3.1",
-        "jsonc-parser": "^2.3.1",
-        "native-run": "^1.4.0",
-        "terser-webpack-plugin": "^4.2.3",
-        "ts-jest": "^26.4.1",
-        "ts-node": "~8.3.0",
-        "typescript": "^3.9.9"
+        "gulp-clip-empty-files": "0.1.2",
+        "gulp-concat": "2.6.1",
+        "gulp-flatten": "0.4.0",
+        "gulp-htmlmin": "5.0.1",
+        "gulp-rename": "2.0.0",
+        "gulp-slash": "1.1.3",
+        "jest": "26.5.2",
+        "jest-preset-angular": "8.3.1",
+        "jsonc-parser": "2.3.1",
+        "native-run": "1.4.0",
+        "terser-webpack-plugin": "4.2.3",
+        "ts-jest": "26.4.1",
+        "ts-node": "8.3.0",
+        "typescript": "3.9.9"
       },
       "engines": {
         "node": ">=14.15.0 <15"
       },
       "optionalDependencies": {
-        "keytar": "^7.2.0"
+        "keytar": "7.2.0"
       }
     },
     "node_modules/@angular-builders/custom-webpack": {
diff --git a/package.json b/package.json
index 5dabe13ec..38a39b560 100644
--- a/package.json
+++ b/package.json
@@ -38,40 +38,40 @@
     "ionic:build:before": "gulp"
   },
   "dependencies": {
-    "@angular/animations": "~10.0.14",
-    "@angular/common": "~10.0.14",
-    "@angular/core": "~10.0.14",
-    "@angular/forms": "~10.0.14",
-    "@angular/platform-browser": "~10.0.14",
-    "@angular/platform-browser-dynamic": "~10.0.14",
-    "@angular/router": "~10.0.14",
-    "@ionic-native/badge": "^5.33.0",
-    "@ionic-native/camera": "^5.33.0",
-    "@ionic-native/chooser": "^5.33.0",
-    "@ionic-native/clipboard": "^5.33.0",
-    "@ionic-native/core": "^5.33.0",
-    "@ionic-native/device": "^5.33.0",
-    "@ionic-native/diagnostic": "^5.33.0",
-    "@ionic-native/file": "^5.33.0",
-    "@ionic-native/file-opener": "^5.33.0",
-    "@ionic-native/file-transfer": "^5.33.0",
-    "@ionic-native/geolocation": "^5.33.0",
-    "@ionic-native/http": "^5.33.0",
-    "@ionic-native/in-app-browser": "^5.33.0",
-    "@ionic-native/ionic-webview": "^5.33.0",
-    "@ionic-native/keyboard": "^5.33.0",
-    "@ionic-native/local-notifications": "^5.33.0",
-    "@ionic-native/media": "^5.33.0",
-    "@ionic-native/media-capture": "^5.33.0",
-    "@ionic-native/network": "^5.33.0",
-    "@ionic-native/push": "^5.33.0",
-    "@ionic-native/qr-scanner": "^5.33.0",
-    "@ionic-native/splash-screen": "^5.33.0",
-    "@ionic-native/sqlite": "^5.33.0",
-    "@ionic-native/status-bar": "^5.33.0",
-    "@ionic-native/web-intent": "^5.33.0",
-    "@ionic-native/zip": "^5.33.0",
-    "@ionic/angular": "^5.9.2",
+    "@angular/animations": "10.0.14",
+    "@angular/common": "10.0.14",
+    "@angular/core": "10.0.14",
+    "@angular/forms": "10.0.14",
+    "@angular/platform-browser": "10.0.14",
+    "@angular/platform-browser-dynamic": "10.0.14",
+    "@angular/router": "10.0.14",
+    "@ionic-native/badge": "5.33.0",
+    "@ionic-native/camera": "5.33.0",
+    "@ionic-native/chooser": "5.33.0",
+    "@ionic-native/clipboard": "5.33.0",
+    "@ionic-native/core": "5.33.0",
+    "@ionic-native/device": "5.33.0",
+    "@ionic-native/diagnostic": "5.33.0",
+    "@ionic-native/file": "5.33.0",
+    "@ionic-native/file-opener": "5.33.0",
+    "@ionic-native/file-transfer": "5.33.0",
+    "@ionic-native/geolocation": "5.33.0",
+    "@ionic-native/http": "5.33.0",
+    "@ionic-native/in-app-browser": "5.33.0",
+    "@ionic-native/ionic-webview": "5.33.0",
+    "@ionic-native/keyboard": "5.33.0",
+    "@ionic-native/local-notifications": "5.33.0",
+    "@ionic-native/media": "5.33.0",
+    "@ionic-native/media-capture": "5.33.0",
+    "@ionic-native/network": "5.33.0",
+    "@ionic-native/push": "5.33.0",
+    "@ionic-native/qr-scanner": "5.33.0",
+    "@ionic-native/splash-screen": "5.33.0",
+    "@ionic-native/sqlite": "5.33.0",
+    "@ionic-native/status-bar": "5.33.0",
+    "@ionic-native/web-intent": "5.33.0",
+    "@ionic-native/zip": "5.33.0",
+    "@ionic/angular": "5.9.2",
     "@moodlehq/cordova-plugin-file-transfer": "1.7.1-moodle.5",
     "@moodlehq/cordova-plugin-inappbrowser": "5.0.0-moodle.3",
     "@moodlehq/cordova-plugin-ionic-webview": "5.0.0-moodle.1",
@@ -79,99 +79,99 @@
     "@moodlehq/cordova-plugin-qrscanner": "3.0.1-moodle.2",
     "@moodlehq/cordova-plugin-zip": "3.1.0-moodle.1",
     "@moodlehq/phonegap-plugin-push": "2.0.0-moodle.2",
-    "@ngx-translate/core": "^13.0.0",
-    "@ngx-translate/http-loader": "^6.0.0",
-    "@types/chart.js": "^2.9.31",
+    "@ngx-translate/core": "13.0.0",
+    "@ngx-translate/http-loader": "6.0.0",
+    "@types/chart.js": "2.9.31",
     "@types/cordova": "0.0.34",
-    "@types/dom-mediacapture-record": "^1.0.7",
-    "chart.js": "^2.9.4",
-    "com-darryncampbell-cordova-plugin-intent": "^2.2.0",
-    "cordova": "^11.0.0",
-    "cordova-android": "^10.1.1",
-    "cordova-clipboard": "^1.3.0",
-    "cordova-ios": "^6.2.0",
-    "cordova-plugin-add-swift-support": "^2.0.2",
-    "cordova-plugin-advanced-http": "^3.2.2",
-    "cordova-plugin-badge": "^0.8.8",
-    "cordova-plugin-camera": "^6.0.0",
-    "cordova-plugin-chooser": "^1.3.2",
-    "cordova-plugin-customurlscheme": "^5.0.2",
-    "cordova-plugin-device": "^2.0.3",
-    "cordova-plugin-file": "^6.0.2",
-    "cordova-plugin-file-opener2": "^3.0.5",
-    "cordova-plugin-geolocation": "^4.1.0",
-    "cordova-plugin-globalization": "^1.11.0",
-    "cordova-plugin-ionic-keyboard": "^2.2.0",
-    "cordova-plugin-media": "^5.0.4",
-    "cordova-plugin-media-capture": "^3.0.3",
-    "cordova-plugin-network-information": "^3.0.0",
-    "cordova-plugin-prevent-override": "^1.0.1",
-    "cordova-plugin-splashscreen": "^6.0.0",
-    "cordova-plugin-statusbar": "^3.0.0",
-    "cordova-plugin-wkuserscript": "^1.0.1",
-    "cordova-plugin-wkwebview-cookies": "^1.0.1",
-    "cordova-sqlite-storage": "^6.0.0",
-    "cordova.plugins.diagnostic": "^6.1.1",
-    "core-js": "^3.9.1",
-    "es6-promise-plugin": "^4.2.2",
-    "hammerjs": "^2.0.8",
-    "jszip": "^3.5.0",
+    "@types/dom-mediacapture-record": "1.0.7",
+    "chart.js": "2.9.4",
+    "com-darryncampbell-cordova-plugin-intent": "2.2.0",
+    "cordova": "11.0.0",
+    "cordova-android": "10.1.1",
+    "cordova-clipboard": "1.3.0",
+    "cordova-ios": "6.2.0",
+    "cordova-plugin-add-swift-support": "2.0.2",
+    "cordova-plugin-advanced-http": "3.2.2",
+    "cordova-plugin-badge": "0.8.8",
+    "cordova-plugin-camera": "6.0.0",
+    "cordova-plugin-chooser": "1.3.2",
+    "cordova-plugin-customurlscheme": "5.0.2",
+    "cordova-plugin-device": "2.0.3",
+    "cordova-plugin-file": "6.0.2",
+    "cordova-plugin-file-opener2": "3.0.5",
+    "cordova-plugin-geolocation": "4.1.0",
+    "cordova-plugin-globalization": "1.11.0",
+    "cordova-plugin-ionic-keyboard": "2.2.0",
+    "cordova-plugin-media": "5.0.4",
+    "cordova-plugin-media-capture": "3.0.3",
+    "cordova-plugin-network-information": "3.0.0",
+    "cordova-plugin-prevent-override": "1.0.1",
+    "cordova-plugin-splashscreen": "6.0.0",
+    "cordova-plugin-statusbar": "3.0.0",
+    "cordova-plugin-wkuserscript": "1.0.1",
+    "cordova-plugin-wkwebview-cookies": "1.0.1",
+    "cordova-sqlite-storage": "6.0.0",
+    "cordova.plugins.diagnostic": "6.1.1",
+    "core-js": "3.9.1",
+    "es6-promise-plugin": "4.2.2",
+    "hammerjs": "2.0.8",
+    "jszip": "3.5.0",
     "mathjax": "2.7.7",
-    "moment": "^2.29.0",
-    "nl.kingsquare.cordova.background-audio": "^1.0.1",
-    "rxjs": "~6.5.5",
-    "ts-md5": "^1.2.7",
-    "tslib": "^2.3.1",
-    "zone.js": "~0.10.3"
+    "moment": "2.29.0",
+    "nl.kingsquare.cordova.background-audio": "1.0.1",
+    "rxjs": "6.5.5",
+    "ts-md5": "1.2.7",
+    "tslib": "2.3.1",
+    "zone.js": "0.10.3"
   },
   "devDependencies": {
-    "@angular-builders/custom-webpack": "^10.0.1",
-    "@angular-devkit/architect": "^0.1202.7",
-    "@angular-devkit/build-angular": "~0.1000.8",
-    "@angular-eslint/builder": "^4.2.0",
-    "@angular-eslint/eslint-plugin": "^4.2.0",
-    "@angular-eslint/eslint-plugin-template": "^4.2.0",
-    "@angular-eslint/schematics": "^4.2.0",
-    "@angular-eslint/template-parser": "^4.2.0",
-    "@angular/cli": "~10.0.8",
-    "@angular/compiler": "~10.0.14",
-    "@angular/compiler-cli": "~10.0.14",
-    "@angular/language-service": "~10.0.14",
-    "@ionic/angular-toolkit": "^2.3.3",
-    "@ionic/cli": "^6.14.1",
-    "@types/faker": "^5.1.3",
-    "@types/node": "^12.12.64",
-    "@types/resize-observer-browser": "^0.1.5",
-    "@types/webpack-env": "^1.16.0",
-    "@typescript-eslint/eslint-plugin": "^4.22.0",
-    "@typescript-eslint/parser": "^4.22.0",
-    "check-es-compat": "^1.1.1",
-    "cordova-plugin-androidx-adapter": "^1.1.3",
-    "eslint": "^7.25.0",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-header": "^3.1.1",
-    "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-jest": "^24.3.6",
-    "eslint-plugin-jsdoc": "^32.3.3",
-    "eslint-plugin-prefer-arrow": "^1.2.3",
-    "eslint-plugin-promise": "^5.1.0",
-    "faker": "^5.1.0",
-    "fs-extra": "^9.1.0",
+    "@angular-builders/custom-webpack": "10.0.1",
+    "@angular-devkit/architect": "0.1202.7",
+    "@angular-devkit/build-angular": "0.1000.8",
+    "@angular-eslint/builder": "4.2.0",
+    "@angular-eslint/eslint-plugin": "4.2.0",
+    "@angular-eslint/eslint-plugin-template": "4.2.0",
+    "@angular-eslint/schematics": "4.2.0",
+    "@angular-eslint/template-parser": "4.2.0",
+    "@angular/cli": "10.0.8",
+    "@angular/compiler": "10.0.14",
+    "@angular/compiler-cli": "10.0.14",
+    "@angular/language-service": "10.0.14",
+    "@ionic/angular-toolkit": "2.3.3",
+    "@ionic/cli": "6.14.1",
+    "@types/faker": "5.1.3",
+    "@types/node": "12.12.64",
+    "@types/resize-observer-browser": "0.1.5",
+    "@types/webpack-env": "1.16.0",
+    "@typescript-eslint/eslint-plugin": "4.22.0",
+    "@typescript-eslint/parser": "4.22.0",
+    "check-es-compat": "1.1.1",
+    "cordova-plugin-androidx-adapter": "1.1.3",
+    "eslint": "7.25.0",
+    "eslint-config-prettier": "8.3.0",
+    "eslint-plugin-header": "3.1.1",
+    "eslint-plugin-import": "2.22.1",
+    "eslint-plugin-jest": "24.3.6",
+    "eslint-plugin-jsdoc": "32.3.3",
+    "eslint-plugin-prefer-arrow": "1.2.3",
+    "eslint-plugin-promise": "5.1.0",
+    "faker": "5.1.0",
+    "fs-extra": "9.1.0",
     "gulp": "4.0.2",
-    "gulp-clip-empty-files": "^0.1.2",
-    "gulp-concat": "^2.6.1",
-    "gulp-flatten": "^0.4.0",
-    "gulp-htmlmin": "^5.0.1",
-    "gulp-rename": "^2.0.0",
-    "gulp-slash": "^1.1.3",
-    "jest": "^26.5.2",
-    "jest-preset-angular": "^8.3.1",
-    "jsonc-parser": "^2.3.1",
-    "native-run": "^1.4.0",
-    "terser-webpack-plugin": "^4.2.3",
-    "ts-jest": "^26.4.1",
-    "ts-node": "~8.3.0",
-    "typescript": "^3.9.9"
+    "gulp-clip-empty-files": "0.1.2",
+    "gulp-concat": "2.6.1",
+    "gulp-flatten": "0.4.0",
+    "gulp-htmlmin": "5.0.1",
+    "gulp-rename": "2.0.0",
+    "gulp-slash": "1.1.3",
+    "jest": "26.5.2",
+    "jest-preset-angular": "8.3.1",
+    "jsonc-parser": "2.3.1",
+    "native-run": "1.4.0",
+    "terser-webpack-plugin": "4.2.3",
+    "ts-jest": "26.4.1",
+    "ts-node": "8.3.0",
+    "typescript": "3.9.9"
   },
   "engines": {
     "node": ">=14.15.0 <15"
@@ -242,6 +242,6 @@
     }
   },
   "optionalDependencies": {
-    "keytar": "^7.2.0"
+    "keytar": "7.2.0"
   }
 }

From 01447912426d6bfab8a1bb8604e304a341b54f8d Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 23 Mar 2022 09:10:44 +0100
Subject: [PATCH 0800/1008] MOBILE-3833 editor: Fix RTE label

---
 .../editor/components/rich-text-editor/rich-text-editor.ts  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
index 76e9a1c5b..479933d77 100644
--- a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
+++ b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
@@ -215,8 +215,12 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterViewInit,
             return;
         }
 
-        this.labelObserver = new MutationObserver(() => this.ariaLabelledBy = label.getAttribute('id') ?? undefined);
+        const updateArialabelledBy = () => this.ariaLabelledBy = label.getAttribute('id') ?? undefined;
+
+        this.labelObserver = new MutationObserver(updateArialabelledBy);
         this.labelObserver.observe(label, { attributes: true, attributeFilter: ['id'] });
+
+        updateArialabelledBy();
     }
 
     /**

From 82afb28901a30c008a4ae1b19f3547ef8cd343e2 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 23 Mar 2022 09:34:52 +0100
Subject: [PATCH 0801/1008] MOBILE-3833 npm: Fix vulnerabilities detected by
 dependabot

---
 package-lock.json | 103 ++++++++++++++++++++++++----------------------
 1 file changed, 53 insertions(+), 50 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 53b5ea119..fd57e55ba 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7987,9 +7987,23 @@
       }
     },
     "node_modules/base64-js": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
-      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
     },
     "node_modules/batch": {
       "version": "0.6.1",
@@ -14880,9 +14894,9 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz",
-      "integrity": "sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==",
+      "version": "1.14.8",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz",
+      "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==",
       "dev": true,
       "funding": [
         {
@@ -14892,6 +14906,11 @@
       ],
       "engines": {
         "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
+        }
       }
     },
     "node_modules/for-in": {
@@ -23128,9 +23147,9 @@
       }
     },
     "node_modules/path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
     },
     "node_modules/path-root": {
       "version": "0.1.1",
@@ -23369,13 +23388,12 @@
       }
     },
     "node_modules/plist": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.1.tgz",
-      "integrity": "sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.4.tgz",
+      "integrity": "sha512-ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg==",
       "dependencies": {
-        "base64-js": "^1.2.3",
-        "xmlbuilder": "^9.0.7",
-        "xmldom": "0.1.x"
+        "base64-js": "^1.5.1",
+        "xmlbuilder": "^9.0.7"
       },
       "engines": {
         "node": ">=6"
@@ -29575,9 +29593,9 @@
       }
     },
     "node_modules/url-parse": {
-      "version": "1.4.7",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
-      "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
       "dev": true,
       "dependencies": {
         "querystringify": "^2.1.1",
@@ -31206,15 +31224,6 @@
       "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
       "dev": true
     },
-    "node_modules/xmldom": {
-      "version": "0.1.31",
-      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.31.tgz",
-      "integrity": "sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==",
-      "deprecated": "Deprecated due to CVE-2021-21366 resolved in 0.5.0",
-      "engines": {
-        "node": ">=0.1"
-      }
-    },
     "node_modules/xregexp": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz",
@@ -37446,9 +37455,9 @@
       }
     },
     "base64-js": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
-      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
     },
     "batch": {
       "version": "0.6.1",
@@ -42810,9 +42819,9 @@
       }
     },
     "follow-redirects": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz",
-      "integrity": "sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==",
+      "version": "1.14.8",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz",
+      "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==",
       "dev": true
     },
     "for-in": {
@@ -49379,9 +49388,9 @@
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
     },
     "path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
     },
     "path-root": {
       "version": "0.1.1",
@@ -49558,13 +49567,12 @@
       }
     },
     "plist": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.1.tgz",
-      "integrity": "sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.4.tgz",
+      "integrity": "sha512-ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg==",
       "requires": {
-        "base64-js": "^1.2.3",
-        "xmlbuilder": "^9.0.7",
-        "xmldom": "0.1.x"
+        "base64-js": "^1.5.1",
+        "xmlbuilder": "^9.0.7"
       }
     },
     "plugin-error": {
@@ -54564,9 +54572,9 @@
       }
     },
     "url-parse": {
-      "version": "1.4.7",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
-      "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
       "dev": true,
       "requires": {
         "querystringify": "^2.1.1",
@@ -55888,11 +55896,6 @@
       "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
       "dev": true
     },
-    "xmldom": {
-      "version": "0.1.31",
-      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.31.tgz",
-      "integrity": "sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ=="
-    },
     "xregexp": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz",

From 7c8e074de1540f2f2a2b0e18353f152556b51a1f Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 23 Mar 2022 09:45:35 +0100
Subject: [PATCH 0802/1008] MOBILE-3833 core: Avoid tabs shrinking

---
 src/core/components/tabs/tabs.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/core/components/tabs/tabs.scss b/src/core/components/tabs/tabs.scss
index 4b1ec3b9b..04a50ba1b 100644
--- a/src/core/components/tabs/tabs.scss
+++ b/src/core/components/tabs/tabs.scss
@@ -23,6 +23,7 @@
         border-bottom: 1px solid var(--stroke);
         display: flex;
         align-items: flex-end;
+        flex-shrink: 0;
 
         ion-row {
             width: 100%;

From 580515ab82b86d2ea9180ff52429965568f1c712 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 23 Mar 2022 10:13:44 +0100
Subject: [PATCH 0803/1008] MOBILE-4012 enrol: Support 'fee' enrolment method

---
 .../features/course/pages/course-summary/course-summary.ts    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/core/features/course/pages/course-summary/course-summary.ts b/src/core/features/course/pages/course-summary/course-summary.ts
index 21a7de434..1adcc8c72 100644
--- a/src/core/features/course/pages/course-summary/course-summary.ts
+++ b/src/core/features/course/pages/course-summary/course-summary.ts
@@ -40,6 +40,8 @@ import { CoreColors } from '@singletons/colors';
 import { CoreText } from '@singletons/text';
 import { CorePromisedValue } from '@classes/promised-value';
 
+const ENROL_BROWSER_METHODS = ['fee', 'paypal'];
+
 /**
  * Page that shows the summary of a course including buttons to enrol and other available options.
  */
@@ -256,7 +258,7 @@ export class CoreCourseSummaryPage implements OnInit, OnDestroy {
             }
 
             // enrollmentmethods contains ALL enrolment methods including manual.
-            if (!this.isEnrolled && courseByField.enrollmentmethods?.some((method) => method === 'paypal')) {
+            if (!this.isEnrolled && courseByField.enrollmentmethods?.some((method) => ENROL_BROWSER_METHODS.includes(method))) {
                 this.otherEnrolments = true;
             }
 

From 0bc6568f1f8bef6b00edcbe8c2e8a465ecb42b60 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 23 Mar 2022 10:31:55 +0100
Subject: [PATCH 0804/1008] MOBILE-3833 core: Fix 'undefined' handler in log

---
 src/core/services/plugin-file-delegate.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/core/services/plugin-file-delegate.ts b/src/core/services/plugin-file-delegate.ts
index ef78e78ae..cf5602af8 100644
--- a/src/core/services/plugin-file-delegate.ts
+++ b/src/core/services/plugin-file-delegate.ts
@@ -29,8 +29,6 @@ import { CoreFileHelper } from './file-helper';
 @Injectable({ providedIn: 'root' })
 export class CorePluginFileDelegateService extends CoreDelegate<CorePluginFileHandler> {
 
-    protected handlerNameProperty = 'component';
-
     constructor() {
         super('CorePluginFileDelegate', true);
     }

From e0309cf32077f616bf1abc39951e1aa67d5be03c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 23 Mar 2022 10:34:57 +0100
Subject: [PATCH 0805/1008] MOBILE-3833 compile: Increase log severity of
 inject error

---
 src/core/features/compile/services/compile.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/features/compile/services/compile.ts b/src/core/features/compile/services/compile.ts
index 4be7f3875..5f6cd1c4c 100644
--- a/src/core/features/compile/services/compile.ts
+++ b/src/core/features/compile/services/compile.ts
@@ -325,7 +325,7 @@ export class CoreCompileProvider {
                     // Inject the provider to the instance. We use the class name as the property name.
                     instance[providerDef.name.replace(/DelegateService$/, 'Delegate')] = this.injector.get(providerDef);
                 } catch (ex) {
-                    this.logger.warn('Error injecting provider', providerDef.name, ex);
+                    this.logger.error('Error injecting provider', providerDef.name, ex);
                 }
             }
         }

From 05ffa6f80768105c5d75c81016f93f57b55b2d3e Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 23 Mar 2022 12:59:53 +0100
Subject: [PATCH 0806/1008] MOBILE-3833 database: Fix log view not called when
 not open

---
 src/addons/mod/data/components/index/index.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/addons/mod/data/components/index/index.ts b/src/addons/mod/data/components/index/index.ts
index 164be2986..4708f24c7 100644
--- a/src/addons/mod/data/components/index/index.ts
+++ b/src/addons/mod/data/components/index/index.ts
@@ -243,6 +243,8 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
 
             this.isEmpty = true;
             this.groupInfo = undefined;
+
+            return;
         } else {
             canSearch = true;
             canAdd = this.access.canaddentry;

From 147df9b58ed0c157d8641ee5d5e63aa837322563 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 23 Mar 2022 15:02:24 +0100
Subject: [PATCH 0807/1008] MOBILE-3833 course: Improve
 getCoursesAdminAndNavOptions performance

---
 src/core/features/courses/services/courses.ts | 23 +++++--------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/core/features/courses/services/courses.ts b/src/core/features/courses/services/courses.ts
index a724803f0..8466592eb 100644
--- a/src/core/features/courses/services/courses.ts
+++ b/src/core/features/courses/services/courses.ts
@@ -20,6 +20,7 @@ import { CoreStatusWithWarningsWSResponse, CoreWarningsWSResponse, CoreWSExterna
 import { CoreEvents } from '@singletons/events';
 import { CoreWSError } from '@classes/errors/wserror';
 import { CoreCourseAnyCourseDataWithExtraInfoAndOptions, CoreCourseWithImageAndColor } from './courses-helper';
+import { CoreUtils } from '@services/utils/utils';
 
 const ROOT_CACHE_KEY = 'mmCourses:';
 
@@ -625,25 +626,13 @@ export class CoreCoursesProvider {
         // Get the list of courseIds to use based on the param.
         courseIds = await this.getCourseIdsForAdminAndNavOptions(courseIds, siteId);
 
-        let navOptions: CoreCourseUserAdminOrNavOptionCourseIndexed;
-        let admOptions: CoreCourseUserAdminOrNavOptionCourseIndexed;
-
         // Get user navigation and administration options.
-        try {
-            navOptions = await this.getUserNavigationOptions(courseIds, siteId);
-        } catch {
-            // Couldn't get it, return empty options.
-            navOptions = {};
-        }
+        const [navOptions, admOptions] = await Promise.all([
+            CoreUtils.ignoreErrors(this.getUserNavigationOptions(courseIds, siteId), {}),
+            CoreUtils.ignoreErrors(this.getUserAdministrationOptions(courseIds, siteId), {}),
+        ]);
 
-        try {
-            admOptions = await this.getUserAdministrationOptions(courseIds, siteId);
-        } catch {
-            // Couldn't get it, return empty options.
-            admOptions = {};
-        }
-
-        return ({ navOptions: navOptions, admOptions: admOptions });
+        return { navOptions: navOptions, admOptions: admOptions };
     }
 
     /**

From b86cf8d93c5a246446fafaec6787e10749ab50f1 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 24 Mar 2022 11:12:21 +0100
Subject: [PATCH 0808/1008] MOBILE-3833 course: Decrease WS calls to
 get_courses_by_fields

---
 .../components/myoverview/myoverview.ts       | 15 ++++++++++---
 .../recentlyaccessedcourses.ts                | 21 ++++++++++++-------
 .../starredcourses/starredcourses.ts          | 13 ++++++++++--
 3 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/src/addons/block/myoverview/components/myoverview/myoverview.ts b/src/addons/block/myoverview/components/myoverview/myoverview.ts
index c1f84f909..8c97fa6c6 100644
--- a/src/addons/block/myoverview/components/myoverview/myoverview.ts
+++ b/src/addons/block/myoverview/components/myoverview/myoverview.ts
@@ -203,6 +203,15 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
         await this.invalidateCourses(courseIds);
     }
 
+    /**
+     * Invalidate list of courses.
+     *
+     * @return Promise resolved when done.
+     */
+    protected invalidateCourseList(): Promise<void> {
+        return CoreCourses.invalidateUserCourses();
+    }
+
     /**
      * Helper function to invalidate only selected courses.
      *
@@ -213,7 +222,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
         const promises: Promise<void>[] = [];
 
         // Invalidate course completion data.
-        promises.push(CoreCourses.invalidateUserCourses().finally(() =>
+        promises.push(this.invalidateCourseList().finally(() =>
             CoreUtils.allPromises(courseIds.map((courseId) =>
                 AddonCourseCompletion.invalidateCourseCompletion(courseId)))));
 
@@ -397,7 +406,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
                 course.hidden = !!data.value;
             }
 
-            await this.invalidateCourses([course.id]);
+            await this.invalidateCourseList();
             await this.filterCourses();
         }
 
@@ -409,7 +418,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
 
             course.lastaccess = CoreTimeUtils.timestamp();
 
-            await this.invalidateCourses([course.id]);
+            await this.invalidateCourseList();
             await this.filterCourses();
         }
     }
diff --git a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
index eefd70ac4..ef7d67f3b 100644
--- a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
+++ b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
@@ -85,6 +85,17 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
         await this.invalidateCourses(courseIds);
     }
 
+    /**
+     * Invalidate list of courses.
+     *
+     * @return Promise resolved when done.
+     */
+    protected async invalidateCourseList(): Promise<void> {
+        return this.site.isVersionGreaterEqualThan('3.8')
+            ? CoreCourses.invalidateRecentCourses()
+            : CoreCourses.invalidateUserCourses();
+    }
+
     /**
      * Helper function to invalidate only selected courses.
      *
@@ -94,12 +105,8 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
     protected async invalidateCourses(courseIds: number[]): Promise<void> {
         const promises: Promise<void>[] = [];
 
-        const invalidateCoursePromise = this.site.isVersionGreaterEqualThan('3.8')
-            ? CoreCourses.invalidateRecentCourses()
-            : CoreCourses.invalidateUserCourses();
-
         // Invalidate course completion data.
-        promises.push(invalidateCoursePromise.finally(() =>
+        promises.push(this.invalidateCourseList().finally(() =>
             CoreUtils.allPromises(courseIds.map((courseId) =>
                 AddonCourseCompletion.invalidateCourseCompletion(courseId)))));
 
@@ -179,13 +186,13 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
             this.courses.splice(courseIndex, 1);
             this.courses.unshift(course);
 
-            await this.invalidateCourses([course.id]);
+            await this.invalidateCourseList();
         }
 
         if (data.action == CoreCoursesProvider.ACTION_STATE_CHANGED &&
             data.state == CoreCoursesProvider.STATE_FAVOURITE && course) {
             course.isfavourite = !!data.value;
-            await this.invalidateCourses([course.id]);
+            await this.invalidateCourseList();
         }
     }
 
diff --git a/src/addons/block/starredcourses/components/starredcourses/starredcourses.ts b/src/addons/block/starredcourses/components/starredcourses/starredcourses.ts
index c6e6fc447..c82a896dc 100644
--- a/src/addons/block/starredcourses/components/starredcourses/starredcourses.ts
+++ b/src/addons/block/starredcourses/components/starredcourses/starredcourses.ts
@@ -81,6 +81,15 @@ export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent im
         await this.invalidateCourses(courseIds);
     }
 
+    /**
+     * Invalidate list of courses.
+     *
+     * @return Promise resolved when done.
+     */
+    protected async invalidateCourseList(): Promise<void> {
+        return AddonBlockStarredCourses.invalidateStarredCourses();
+    }
+
     /**
      * Helper function to invalidate only selected courses.
      *
@@ -91,7 +100,7 @@ export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent im
         const promises: Promise<void>[] = [];
 
         // Invalidate course completion data.
-        promises.push(AddonBlockStarredCourses.invalidateStarredCourses().finally(() =>
+        promises.push(this.invalidateCourseList().finally(() =>
             CoreUtils.allPromises(courseIds.map((courseId) =>
                 AddonCourseCompletion.invalidateCourseCompletion(courseId)))));
 
@@ -172,7 +181,7 @@ export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent im
                 this.courses.unshift(course);
             }
 
-            await this.invalidateCourses([course.id]);
+            await this.invalidateCourseList();
         }
     }
 

From ea8664f8ba93366b8cd67062e8ae8e5f52de9208 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 22 Mar 2022 17:22:14 +0100
Subject: [PATCH 0809/1008] MOBILE-3833 dom: Move onWindowResize to CoreDom

---
 .../ddimageortext/classes/ddimageortext.ts    |  3 +-
 src/addons/qtype/ddmarker/classes/ddmarker.ts |  2 +-
 src/addons/qtype/ddwtos/classes/ddwtos.ts     |  3 +-
 src/core/classes/tabs.ts                      |  4 +--
 src/core/directives/collapsible-footer.ts     |  3 +-
 src/core/directives/collapsible-header.ts     |  4 +--
 src/core/directives/collapsible-item.ts       |  3 +-
 .../rich-text-editor/rich-text-editor.ts      |  2 +-
 src/core/features/mainmenu/pages/menu/menu.ts |  4 +--
 src/core/features/mainmenu/pages/more/more.ts |  4 +--
 src/core/services/utils/dom.ts                | 31 ++-----------------
 src/core/singletons/dom.ts                    | 27 ++++++++++++++++
 12 files changed, 44 insertions(+), 46 deletions(-)

diff --git a/src/addons/qtype/ddimageortext/classes/ddimageortext.ts b/src/addons/qtype/ddimageortext/classes/ddimageortext.ts
index 3adb8a067..c13ce8ddc 100644
--- a/src/addons/qtype/ddimageortext/classes/ddimageortext.ts
+++ b/src/addons/qtype/ddimageortext/classes/ddimageortext.ts
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreDom } from '@singletons/dom';
 import { CoreEventObserver } from '@singletons/events';
@@ -365,7 +364,7 @@ export class AddonQtypeDdImageOrTextQuestion {
             this.pollForImageLoad();
         });
 
-        this.resizeListener = CoreDomUtils.onWindowResize(() => {
+        this.resizeListener = CoreDom.onWindowResize(() => {
             this.repositionDragsForQuestion();
         });
     }
diff --git a/src/addons/qtype/ddmarker/classes/ddmarker.ts b/src/addons/qtype/ddmarker/classes/ddmarker.ts
index a1c79281f..667a744d7 100644
--- a/src/addons/qtype/ddmarker/classes/ddmarker.ts
+++ b/src/addons/qtype/ddmarker/classes/ddmarker.ts
@@ -619,7 +619,7 @@ export class AddonQtypeDdMarkerQuestion {
             this.pollForImageLoad();
         });
 
-        this.resizeListener = CoreDomUtils.onWindowResize(() => {
+        this.resizeListener = CoreDom.onWindowResize(() => {
             this.redrawDragsAndDrops();
         });
     }
diff --git a/src/addons/qtype/ddwtos/classes/ddwtos.ts b/src/addons/qtype/ddwtos/classes/ddwtos.ts
index 7366d4d84..8c04a3505 100644
--- a/src/addons/qtype/ddwtos/classes/ddwtos.ts
+++ b/src/addons/qtype/ddwtos/classes/ddwtos.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { CoreFormatTextDirective } from '@directives/format-text';
-import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
@@ -208,7 +207,7 @@ export class AddonQtypeDdwtosQuestion {
 
         this.positionDragItems();
 
-        this.resizeListener = CoreDomUtils.onWindowResize(() => {
+        this.resizeListener = CoreDom.onWindowResize(() => {
             this.positionDragItems();
         });
     }
diff --git a/src/core/classes/tabs.ts b/src/core/classes/tabs.ts
index a535e831b..fbb1d0f52 100644
--- a/src/core/classes/tabs.ts
+++ b/src/core/classes/tabs.ts
@@ -33,7 +33,7 @@ import { Platform, Translate } from '@singletons';
 import { CoreSettingsHelper } from '@features/settings/services/settings-helper';
 import { CoreAriaRoleTab, CoreAriaRoleTabFindable } from './aria-role-tab';
 import { CoreEventObserver } from '@singletons/events';
-import { CoreDomUtils } from '@services/utils/dom';
+import { CoreDom } from '@singletons/dom';
 
 /**
  * Class to abstract some common code for tabs.
@@ -135,7 +135,7 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
             await this.initializeTabs();
         }
 
-        this.resizeListener = CoreDomUtils.onWindowResize(() => {
+        this.resizeListener = CoreDom.onWindowResize(() => {
             this.windowResized();
         });
     }
diff --git a/src/core/directives/collapsible-footer.ts b/src/core/directives/collapsible-footer.ts
index 73e9dbd5a..f345a9b70 100644
--- a/src/core/directives/collapsible-footer.ts
+++ b/src/core/directives/collapsible-footer.ts
@@ -21,7 +21,6 @@ import { CoreComponentsRegistry } from '@singletons/components-registry';
 import { CoreFormatTextDirective } from './format-text';
 import { CoreEventObserver } from '@singletons/events';
 import { CoreLoadingComponent } from '@components/loading/loading';
-import { CoreDomUtils } from '@services/utils/dom';
 import { CoreCancellablePromise } from '@classes/cancellable-promise';
 import { CoreDom } from '@singletons/dom';
 
@@ -154,7 +153,7 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
             }
         });
 
-        this.resizeListener = CoreDomUtils.onWindowResize(() => {
+        this.resizeListener = CoreDom.onWindowResize(() => {
             this.calculateHeight();
         }, 50);
     }
diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts
index 0bf4d0738..fb15f6445 100644
--- a/src/core/directives/collapsible-header.ts
+++ b/src/core/directives/collapsible-header.ts
@@ -18,9 +18,9 @@ import { CoreLoadingComponent } from '@components/loading/loading';
 import { CoreTabsOutletComponent } from '@components/tabs-outlet/tabs-outlet';
 import { CoreSettingsHelper } from '@features/settings/services/settings-helper';
 import { ScrollDetail } from '@ionic/core';
-import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
+import { CoreDom } from '@singletons/dom';
 import { CoreEventObserver } from '@singletons/events';
 import { CoreMath } from '@singletons/math';
 import { Subscription } from 'rxjs';
@@ -156,7 +156,7 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
             this.enteredPromise.reject(new Error('[collapsible-header] Waiting for ionViewDidEnter timeout reached'));
         }, 5000);
 
-        this.resizeListener = CoreDomUtils.onWindowResize(() => {
+        this.resizeListener = CoreDom.onWindowResize(() => {
             this.initializeFloatingTitle();
         }, 50);
 
diff --git a/src/core/directives/collapsible-item.ts b/src/core/directives/collapsible-item.ts
index f0839d8eb..5084f128a 100644
--- a/src/core/directives/collapsible-item.ts
+++ b/src/core/directives/collapsible-item.ts
@@ -15,7 +15,6 @@
 import { Directive, ElementRef, Input, OnDestroy, OnInit } from '@angular/core';
 import { CoreCancellablePromise } from '@classes/cancellable-promise';
 import { CoreLoadingComponent } from '@components/loading/loading';
-import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
 import { Translate } from '@singletons';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
@@ -90,7 +89,7 @@ export class CoreCollapsibleItemDirective implements OnInit, OnDestroy {
 
         await this.calculateHeight();
 
-        this.resizeListener = CoreDomUtils.onWindowResize(() => {
+        this.resizeListener = CoreDom.onWindowResize(() => {
             this.calculateHeight();
         }, 50);
     }
diff --git a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
index 479933d77..ab00db484 100644
--- a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
+++ b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
@@ -254,7 +254,7 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterViewInit,
             );
         });
 
-        this.resizeListener = CoreDomUtils.onWindowResize(() => {
+        this.resizeListener = CoreDom.onWindowResize(() => {
             this.windowResized();
         }, 50);
 
diff --git a/src/core/features/mainmenu/pages/menu/menu.ts b/src/core/features/mainmenu/pages/menu/menu.ts
index 47275c179..0ff66fa97 100644
--- a/src/core/features/mainmenu/pages/menu/menu.ts
+++ b/src/core/features/mainmenu/pages/menu/menu.ts
@@ -29,7 +29,7 @@ import { filter } from 'rxjs/operators';
 import { NavigationEnd } from '@angular/router';
 import { trigger, state, style, transition, animate } from '@angular/animations';
 import { CoreSites } from '@services/sites';
-import { CoreDomUtils } from '@services/utils/dom';
+import { CoreDom } from '@singletons/dom';
 
 /**
  * Page that displays the main menu of the app.
@@ -122,7 +122,7 @@ export class CoreMainMenuPage implements OnInit, OnDestroy {
             }
         });
 
-        this.resizeListener = CoreDomUtils.onWindowResize(() => {
+        this.resizeListener = CoreDom.onWindowResize(() => {
             this.initHandlers();
         });
         document.addEventListener('ionBackButton', this.backButtonFunction);
diff --git a/src/core/features/mainmenu/pages/more/more.ts b/src/core/features/mainmenu/pages/more/more.ts
index d3e91ebfa..275686ba2 100644
--- a/src/core/features/mainmenu/pages/more/more.ts
+++ b/src/core/features/mainmenu/pages/more/more.ts
@@ -26,7 +26,7 @@ import { CoreContentLinksHelper } from '@features/contentlinks/services/contentl
 import { CoreTextUtils } from '@services/utils/text';
 import { Translate } from '@singletons';
 import { CoreMainMenuDeepLinkManager } from '@features/mainmenu/classes/deep-link-manager';
-import { CoreDomUtils } from '@services/utils/dom';
+import { CoreDom } from '@singletons/dom';
 
 /**
  * Page that displays the more page of the app.
@@ -73,7 +73,7 @@ export class CoreMainMenuMorePage implements OnInit, OnDestroy {
             this.initHandlers();
         });
 
-        this.resizeListener = CoreDomUtils.onWindowResize(() => {
+        this.resizeListener = CoreDom.onWindowResize(() => {
             this.initHandlers();
         });
 
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index 9d2bc991a..c0268ba1f 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -53,7 +53,6 @@ import { NavigationStart } from '@angular/router';
 import { filter } from 'rxjs/operators';
 import { Subscription } from 'rxjs';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
-import { CoreEventObserver } from '@singletons/events';
 import { CoreDom } from '@singletons/dom';
 
 /*
@@ -93,30 +92,6 @@ export class CoreDomUtilsProvider {
         this.debugDisplay = debugDisplay != 0;
     }
 
-    /**
-     * Window resize is widely checked and may have many performance issues, debouce usage is needed to avoid calling it too much.
-     * This function helps setting up the debounce feature and remove listener easily.
-     *
-     * @param resizeFunction Function to execute on resize.
-     * @param debounceDelay Debounce time in ms.
-     * @return Event observer to call off when finished.
-     */
-    onWindowResize(resizeFunction: (ev?: Event) => void, debounceDelay = 20): CoreEventObserver {
-        const resizeListener = CoreUtils.debounce(async (ev?: Event) => {
-            await this.waitForResizeDone();
-
-            resizeFunction(ev);
-        }, debounceDelay);
-
-        window.addEventListener('resize', resizeListener);
-
-        return {
-            off: (): void => {
-                window.removeEventListener('resize', resizeListener);
-            },
-        };
-    }
-
     /**
      * Equivalent to element.closest(). If the browser doesn't support element.closest, it will
      * traverse the parents to achieve the same functionality.
@@ -1902,7 +1877,7 @@ export class CoreDomUtilsProvider {
     /**
      * Trigger form cancelled event.
      *
-     * @param form Form element.
+     * @param formRef Form element.
      * @param siteId The site affected. If not provided, no site affected.
      * @deprecated since 3.9.5. Function has been moved to CoreForms.
      */
@@ -1913,7 +1888,7 @@ export class CoreDomUtilsProvider {
     /**
      * Trigger form submitted event.
      *
-     * @param form Form element.
+     * @param formRef Form element.
      * @param online Whether the action was done in offline or not.
      * @param siteId The site affected. If not provided, no site affected.
      * @deprecated since 3.9.5. Function has been moved to CoreForms.
@@ -1924,7 +1899,7 @@ export class CoreDomUtilsProvider {
 
     /**
      * In iOS the resize event is triggered before the window size changes. Wait for the size to change.
-     * Use of this function is discouraged. Please use onWindowResize to check window resize event.
+     * Use of this function is discouraged. Please use CoreDom.onWindowResize to check window resize event.
      *
      * @param windowWidth Initial window width.
      * @param windowHeight Initial window height.
diff --git a/src/core/singletons/dom.ts b/src/core/singletons/dom.ts
index fdd0dd9d0..d26b1834e 100644
--- a/src/core/singletons/dom.ts
+++ b/src/core/singletons/dom.ts
@@ -13,6 +13,9 @@
 // limitations under the License.
 
 import { CoreCancellablePromise } from '@classes/cancellable-promise';
+import { CoreDomUtils } from '@services/utils/dom';
+import { CoreUtils } from '@services/utils/utils';
+import { CoreEventObserver } from '@singletons/events';
 
 /**
  * Singleton with helper functions for dom.
@@ -147,6 +150,30 @@ export class CoreDom {
         slot.addEventListener('slotchange', slotListener);;
     }
 
+    /**
+     * Window resize is widely checked and may have many performance issues, debouce usage is needed to avoid calling it too much.
+     * This function helps setting up the debounce feature and remove listener easily.
+     *
+     * @param resizeFunction Function to execute on resize.
+     * @param debounceDelay Debounce time in ms.
+     * @return Event observer to call off when finished.
+     */
+    static onWindowResize(resizeFunction: (ev?: Event) => void, debounceDelay = 20): CoreEventObserver {
+        const resizeListener = CoreUtils.debounce(async (ev?: Event) => {
+            await CoreDomUtils.waitForResizeDone();
+
+            resizeFunction(ev);
+        }, debounceDelay);
+
+        window.addEventListener('resize', resizeListener);
+
+        return {
+            off: (): void => {
+                window.removeEventListener('resize', resizeListener);
+            },
+        };
+    }
+
     /**
      * Scroll to a certain element.
      *

From cd660513d93aadd5bd6852f049846a6054a9181a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 23 Mar 2022 16:33:00 +0100
Subject: [PATCH 0810/1008] MOBILE-3833 styles: Adapt button color to toolbar

---
 src/theme/components/collapsible-header.scss |  2 ++
 src/theme/theme.base.scss                    | 16 +++++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/theme/components/collapsible-header.scss b/src/theme/components/collapsible-header.scss
index ff7282027..04304a443 100644
--- a/src/theme/components/collapsible-header.scss
+++ b/src/theme/components/collapsible-header.scss
@@ -29,6 +29,8 @@
         --core-header-toolbar-border-width: 0;
         ion-toolbar {
             --background: transparent;
+            --core-header-buttons-background: var(--ion-background-color);
+            --core-header-buttons-color: var(--text-color);
         }
 
         h1 {
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index b60b71e4e..1c5db24cf 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -152,9 +152,11 @@ ion-toolbar {
 // Header.
 ion-header {
     z-index: 12; // To hide ion-slides on scroll.
-    --core-header-buttons-background: var(--core-header-toolbar-background);
 
     ion-toolbar {
+        --core-header-buttons-background: var(--core-header-toolbar-background);
+        --core-header-buttons-color: var(--core-header-toolbar-color);
+
         ion-spinner {
             margin: 10px;
         }
@@ -164,11 +166,11 @@ ion-header {
         .in-toolbar.button-solid,
         .button.button-clear,
         .button.button-solid {
-            --color: var(--core-header-toolbar-color);
+            --color: var(--core-header-buttons-color);
             --background: var(--core-header-buttons-background);
-            --ion-toolbar-color: var(--core-header-toolbar-color);
+            --ion-toolbar-color: var(--core-header-buttons-color);
             --border-radius: var(--huge-radius);
-            --primary: var(--core-header-toolbar-color);
+            --primary: var(--core-header-buttons-color);
         }
         ion-back-button::part(text) {
             display: none;
@@ -1490,7 +1492,11 @@ ion-header.no-title {
     --core-header-toolbar-border-width: 0;
     --core-header-toolbar-background: transparent;
     --core-header-shadow: none !important;
-    --core-header-buttons-background: var(--ion-background-color);
+    ion-toolbar {
+        --core-header-buttons-background: var(--ion-background-color);
+        --core-header-buttons-color: var(--text-color);
+    }
+
 }
 
 // To make core-swipe-slides fill the remaining height.

From a3762ef43a3ebedaebd39e729bdfb71456c41587 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 23 Mar 2022 16:47:10 +0100
Subject: [PATCH 0811/1008] MOBILE-3833 database: Fix '>' typos

---
 .../mod/data/components/index/addon-mod-data-index.html       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/addons/mod/data/components/index/addon-mod-data-index.html b/src/addons/mod/data/components/index/addon-mod-data-index.html
index b9dab9e0e..d8eef7e45 100644
--- a/src/addons/mod/data/components/index/addon-mod-data-index.html
+++ b/src/addons/mod/data/components/index/addon-mod-data-index.html
@@ -52,7 +52,7 @@
         </ion-item>
     </ion-card>
 
-    <ion-card class="core-info-card" *ngIf="access && access.entrieslefttoview">>
+    <ion-card class="core-info-card" *ngIf="access && access.entrieslefttoview">
         <ion-item>
             <ion-icon name="fas-info-circle" slot="start" aria-hidden="true"></ion-icon>
             <ion-label>
@@ -61,7 +61,7 @@
         </ion-item>
     </ion-card>
 
-    <ion-card class="core-info-card" *ngIf="access && access.entrieslefttoadd">>
+    <ion-card class="core-info-card" *ngIf="access && access.entrieslefttoadd">
         <ion-item>
             <ion-icon name="fas-info-circle" slot="start" aria-hidden="true"></ion-icon>
             <ion-label>

From ceae6f980deddb9a8020b08307d8e3203158217c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 23 Mar 2022 17:33:20 +0100
Subject: [PATCH 0812/1008] MOBILE-3833 core: Simplify empty box component

---
 .../myoverview/addon-block-myoverview.html    |  2 +-
 .../addon-block-recentlyaccessedcourses.html  |  2 +-
 .../addon-block-recentlyaccesseditems.html    |  2 +-
 .../addon-block-starredcourses.html           |  2 +-
 .../events/addon-block-timeline-events.html   |  4 +-
 .../timeline/addon-block-timeline.html        |  2 +-
 src/addons/calendar/pages/day/day.html        |  2 +-
 .../index/addon-mod-wiki-index.html           |  2 +-
 .../components/empty-box/core-empty-box.html  | 12 +--
 src/core/components/empty-box/empty-box.scss  | 89 ++++++-------------
 src/core/components/empty-box/empty-box.ts    | 11 ++-
 .../components/split-view/split-view.scss     |  3 +-
 src/theme/theme.base.scss                     |  3 +-
 13 files changed, 47 insertions(+), 89 deletions(-)

diff --git a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
index 753f0fa8c..8131987f4 100644
--- a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
+++ b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
@@ -69,7 +69,7 @@
     </ion-row>
 
     <core-empty-box *ngIf="filteredCourses.length == 0" image="assets/img/icons/courses.svg"
-        [message]="'addon.block_myoverview.nocourses' | translate" inline="true">
+        [message]="'addon.block_myoverview.nocourses' | translate">
     </core-empty-box>
 
     <!-- List of courses. -->
diff --git a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html
index 6ba01b2f2..93b5c04f7 100644
--- a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html
+++ b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html
@@ -8,7 +8,7 @@
     </div>
 </ion-item-divider>
 <core-loading [hideUntil]="loaded" [fullscreen]="false">
-    <core-empty-box *ngIf="courses.length == 0" image="assets/img/icons/courses.svg" inline="true"
+    <core-empty-box *ngIf="courses.length == 0" image="assets/img/icons/courses.svg"
         [message]="'addon.block_recentlyaccessedcourses.nocourses' | translate"></core-empty-box>
     <!-- List of courses. -->
     <div [hidden]="courses.length === 0" [id]="scrollElementId" class="core-horizontal-scroll"
diff --git a/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html b/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html
index 6d9bd7f36..cacc174c9 100644
--- a/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html
+++ b/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html
@@ -37,7 +37,7 @@
         </div>
     </div>
 
-    <core-empty-box *ngIf="items.length <= 0" image="assets/img/icons/activities.svg" inline="true"
+    <core-empty-box *ngIf="items.length <= 0" image="assets/img/icons/activities.svg"
         [message]="'addon.block_recentlyaccesseditems.noitems' | translate"></core-empty-box>
 
 </core-loading>
diff --git a/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html b/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html
index 1ff007fce..02398a668 100644
--- a/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html
+++ b/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html
@@ -8,7 +8,7 @@
     </div>
 </ion-item-divider>
 <core-loading [hideUntil]="loaded" [fullscreen]="false">
-    <core-empty-box *ngIf="courses.length == 0" image="assets/img/icons/courses.svg" inline="true"
+    <core-empty-box *ngIf="courses.length == 0" image="assets/img/icons/courses.svg"
         [message]="'addon.block_starredcourses.nocourses' | translate"></core-empty-box>
     <!-- List of courses. -->
     <div [hidden]="courses.length === 0" [id]="scrollElementId" class="core-horizontal-scroll"
diff --git a/src/addons/block/timeline/components/events/addon-block-timeline-events.html b/src/addons/block/timeline/components/events/addon-block-timeline-events.html
index f1764e5f8..b370beae4 100644
--- a/src/addons/block/timeline/components/events/addon-block-timeline-events.html
+++ b/src/addons/block/timeline/components/events/addon-block-timeline-events.html
@@ -79,5 +79,5 @@
         <p>{{'addon.block_timeline.noevents' | translate}}</p>
     </ion-label>
 </ion-item>
-<core-empty-box *ngIf="empty && !course" image="assets/img/icons/activities.svg" inline="true"
-    [message]="'addon.block_timeline.noevents' | translate"></core-empty-box>
+<core-empty-box *ngIf="empty && !course" image="assets/img/icons/activities.svg" [message]="'addon.block_timeline.noevents' | translate">
+</core-empty-box>
diff --git a/src/addons/block/timeline/components/timeline/addon-block-timeline.html b/src/addons/block/timeline/components/timeline/addon-block-timeline.html
index a4155a94d..b652282e9 100644
--- a/src/addons/block/timeline/components/timeline/addon-block-timeline.html
+++ b/src/addons/block/timeline/components/timeline/addon-block-timeline.html
@@ -66,7 +66,7 @@
             <addon-block-timeline-events [events]="course.events" [canLoadMore]="course.canLoadMore" (loadMore)="loadMore(course)"
                 [course]="course" [from]="dataFrom" [to]="dataTo"></addon-block-timeline-events>
         </ng-container>
-        <core-empty-box *ngIf="timelineCourses.courses.length == 0" image="assets/img/icons/courses.svg" inline="true"
+        <core-empty-box *ngIf="timelineCourses.courses.length == 0" image="assets/img/icons/courses.svg"
             [message]="'addon.block_timeline.noevents' | translate"></core-empty-box>
     </core-loading>
 </core-loading>
diff --git a/src/addons/calendar/pages/day/day.html b/src/addons/calendar/pages/day/day.html
index daf9206dd..67bdbd8b1 100644
--- a/src/addons/calendar/pages/day/day.html
+++ b/src/addons/calendar/pages/day/day.html
@@ -59,7 +59,7 @@
                             </ion-item>
                         </ion-card>
 
-                        <core-empty-box *ngIf="!day.filteredEvents || !day.filteredEvents.length" icon="fas-calendar" inline="true"
+                        <core-empty-box *ngIf="!day.filteredEvents || !day.filteredEvents.length" icon="fas-calendar"
                             [message]="'addon.calendar.noevents' | translate">
                         </core-empty-box>
 
diff --git a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
index cfe144af2..f4fd30532 100644
--- a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
+++ b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
@@ -60,7 +60,7 @@
             <core-format-text *ngIf="pageContent" [component]="component" [componentId]="componentId" [text]="pageContent"
                 contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
             </core-format-text>
-            <core-empty-box *ngIf="!pageContent" icon="fas-file-alt" [message]="'addon.mod_wiki.nocontent' | translate" inline="true">
+            <core-empty-box *ngIf="!pageContent" icon="fas-file-alt" [message]="'addon.mod_wiki.nocontent' | translate">
             </core-empty-box>
         </article>
 
diff --git a/src/core/components/empty-box/core-empty-box.html b/src/core/components/empty-box/core-empty-box.html
index 89f21cb33..34604cea3 100644
--- a/src/core/components/empty-box/core-empty-box.html
+++ b/src/core/components/empty-box/core-empty-box.html
@@ -1,8 +1,4 @@
-<div class="core-empty-box ion-padding" [class.core-empty-box-inline]="(!image && !icon) || inline">
-    <div class="core-empty-box-content">
-        <img *ngIf="image && !icon" [src]="image" role="presentation" alt="">
-        <ion-icon *ngIf="icon" [name]="icon" aria-hidden="true"></ion-icon>
-        <p *ngIf="message" [class.ion-padding-top]="image || icon">{{ message }}</p>
-        <ng-content></ng-content>
-    </div>
-</div>
+<img *ngIf="image && !icon" [src]="image" role="presentation" alt="">
+<ion-icon *ngIf="icon" [name]="icon" aria-hidden="true"></ion-icon>
+<p *ngIf="message">{{ message }}</p>
+<ng-content></ng-content>
diff --git a/src/core/components/empty-box/empty-box.scss b/src/core/components/empty-box/empty-box.scss
index b0b3c2254..812dde4ca 100644
--- a/src/core/components/empty-box/empty-box.scss
+++ b/src/core/components/empty-box/empty-box.scss
@@ -1,74 +1,35 @@
+@import "~theme/globals";
+
 :host {
-    display: contents;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    flex-grow: 1;
+
     color: var(--text-color);
+    margin: 0 auto;
+    text-align: center;
+    padding: 16px;
+    --image-size: 120px;
 
-    .core-empty-box {
-        position: absolute;
-        top: 0;
-        right: 0;
-        bottom: 0;
-        left: 0;
-        display: table;
-        height: 100%;
-        width: 100%;
-        margin: 0;
-        clear: both;
-        pointer-events: none;
-
-        .core-empty-box-content {
-            margin: 0;
-            display: table-cell;
-            text-align: center;
-            vertical-align: middle;
-            pointer-events: auto;
-        }
-
-        &.core-empty-box-inline {
-            position: relative;
-            z-index: initial;
-            top: initial;
-            right: initial;
-            bottom: 0;
-            left: initial;
-            height: auto;
-        }
-
-        ion-icon {
-            font-size: 120px;
-        }
-        img {
-            height: 125px;
-            width: 145px;
-            margin: 0 auto;
-        }
-        p {
-            font-size: 120%;
-        }
+    ion-icon {
+        font-size: var(--image-size);
+    }
+    img {
+        height: var(--image-size);
+    }
+    p {
+        font-size: 120%;
     }
 
-    &.core-empty-box-clickable .core-empty-box {
+    &.core-empty-box-clickable {
         z-index: 0;
     }
+}
 
-    @media (max-height: 550px) {
-        .core-empty-box {
-            position: relative;
-            height: auto;
-            margin-top: 50px;
-
-            ion-icon {
-                font-size: 100px;
-            }
-            img {
-                height: 104px;
-                width: 121px;
-            }
-        }
-    }
-
-     &.core-empty-inline .core-empty-box {
-        position: relative;
-        z-index: initial;
-        height: auto;
+@include media-breakpoint-down(sm) {
+    :host {
+        --image-size: 100px;
     }
 }
diff --git a/src/core/components/empty-box/empty-box.ts b/src/core/components/empty-box/empty-box.ts
index 3b9cf13f5..efbec5b2d 100644
--- a/src/core/components/empty-box/empty-box.ts
+++ b/src/core/components/empty-box/empty-box.ts
@@ -32,12 +32,11 @@ export class CoreEmptyBoxComponent {
     @Input() message = ''; // Message to display.
     @Input() icon?: string; // Name of the icon to use.
     @Input() image?: string; // Image source. If an icon is provided, image won't be used.
-
-    /**
-     * If this has to be shown inline instead of occupying whole page.
-     * If image or icon is not supplied, it's true by default.
-     */
-    @Input() inline = false;
     @Input() flipIconRtl = false; // Whether to flip the icon in RTL. Defaults to false.
 
+    /**
+     * @deprecated not used anymore.
+     */
+    @Input() inline = false;
+
 }
diff --git a/src/core/components/split-view/split-view.scss b/src/core/components/split-view/split-view.scss
index 089107563..fa9da2e18 100644
--- a/src/core/components/split-view/split-view.scss
+++ b/src/core/components/split-view/split-view.scss
@@ -10,7 +10,7 @@
     --menu-display: flex;
     --content-display: block;
     --content-outlet-display: none;
-    --content-placeholder-display: var(--content-display);
+    --content-placeholder-display: flex;
 
     top: 0;
     right: 0;
@@ -70,6 +70,7 @@
     --menu-min-width: 0px;
     --menu-max-width: 100%;
     --content-display: none;
+    --content-placeholder-display: none;
     --menu-border-width: 0px;
     --menu-box-shadow: none;
     --menu-z: 0px;
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 1c5db24cf..4448600ce 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -1520,7 +1520,8 @@ ion-header.no-title {
 
 }
 
-.has-spacer {
+.has-spacer,
+.core-flex-fill {
     display: flex;
     flex-direction: column;
     min-height: 100%;

From c3feb2c3ea14e22c71ae98094ebb9fd320d083fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 24 Mar 2022 11:45:44 +0100
Subject: [PATCH 0813/1008] MOBILE-3833 travis: Add packages

---
 .travis.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c2f2fe03c..9b254f518 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,12 +51,18 @@ jobs:
       apt:
         packages:
         - libsecret-1-dev
+        - php5-cli
+        - php5-common
   - stage: build
     name: "Build iOS"
     language: node_js
     if: env(BUILD_IOS) = 1 AND (env(DEPLOY) = 1 OR (env(DEPLOY) = 2 AND tag IS NOT blank))
     os: osx
-    osx_image: xcode12.5
+    osx_image: xcode13.1
+    addons:
+      homebrew:
+        packages:
+        - jq
   - stage: test
     name: "End to end tests (mod_forum and mod_messages)"
     services:

From 602331d2c65ca6d130b765d677a897aebc27a31f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 24 Mar 2022 12:58:55 +0100
Subject: [PATCH 0814/1008] MOBILE-3833 style: Shadow on collapsible footer
 only if not at bottom

---
 .../pages/discussion/discussion.page.ts       | 64 +++++++++----------
 src/app/app.component.ts                      | 19 +++++-
 src/core/directives/collapsible-footer.ts     |  3 +
 src/core/singletons/dom.ts                    | 15 +++++
 src/theme/theme.base.scss                     |  5 +-
 5 files changed, 68 insertions(+), 38 deletions(-)

diff --git a/src/addons/messages/pages/discussion/discussion.page.ts b/src/addons/messages/pages/discussion/discussion.page.ts
index 0d4896837..a7be06c6e 100644
--- a/src/addons/messages/pages/discussion/discussion.page.ts
+++ b/src/addons/messages/pages/discussion/discussion.page.ts
@@ -445,13 +445,9 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView
             return;
         }
 
-        // Don't use domUtils.getScrollHeight because it gives an outdated value after receiving a new message.
-        const scrollHeight = this.scrollElement ? this.scrollElement.scrollHeight : 0;
-
         // Check if we are at the bottom to scroll it after render.
         // Use a 5px error margin because in iOS there is 1px difference for some reason.
-        this.scrollBottom = Math.abs(scrollHeight - (this.scrollElement?.scrollTop || 0) -
-            (this.scrollElement?.clientHeight || 0)) < 5;
+        this.scrollBottom = CoreDom.scrollIsBottom(this.scrollElement, 5);
 
         if (this.messagesBeingSent > 0) {
             // Ignore polling due to a race condition.
@@ -510,39 +506,39 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView
      * The scroll was moved. Update new messages count.
      */
     scrollFunction(): void {
-        if (this.newMessages > 0) {
-            const scrollBottom = (this.scrollElement?.scrollTop || 0) + (this.scrollElement?.clientHeight || 0);
-            const scrollHeight = (this.scrollElement?.scrollHeight || 0);
-            if (scrollBottom > scrollHeight - 40) {
-                // At the bottom, reset.
-                this.setNewMessagesBadge(0);
+        if (this.newMessages == 0) {
+            return;
+        }
 
-                return;
+        if (CoreDom.scrollIsBottom(this.scrollElement, 40)) {
+            // At the bottom, reset.
+            this.setNewMessagesBadge(0);
+
+            return;
+        }
+
+        const scrollElRect = this.scrollElement?.getBoundingClientRect();
+        const scrollBottomPos = (scrollElRect && scrollElRect.bottom) || 0;
+
+        if (scrollBottomPos == 0) {
+            return;
+        }
+
+        const messages = Array.from(this.hostElement.querySelectorAll('.addon-message-not-mine'))
+            .slice(-this.newMessages)
+            .reverse();
+
+        const newMessagesUnread = messages.findIndex((message) => {
+            const elementRect = message.getBoundingClientRect();
+            if (!elementRect) {
+                return false;
             }
 
-            const scrollElRect = this.scrollElement?.getBoundingClientRect();
-            const scrollBottomPos = (scrollElRect && scrollElRect.bottom) || 0;
+            return elementRect.bottom <= scrollBottomPos;
+        });
 
-            if (scrollBottomPos == 0) {
-                return;
-            }
-
-            const messages = Array.from(this.hostElement.querySelectorAll('.addon-message-not-mine'))
-                .slice(-this.newMessages)
-                .reverse();
-
-            const newMessagesUnread = messages.findIndex((message) => {
-                const elementRect = message.getBoundingClientRect();
-                if (!elementRect) {
-                    return false;
-                }
-
-                return elementRect.bottom <= scrollBottomPos;
-            });
-
-            if (newMessagesUnread > 0 && newMessagesUnread < this.newMessages) {
-                this.setNewMessagesBadge(newMessagesUnread);
-            }
+        if (newMessagesUnread > 0 && newMessagesUnread < this.newMessages) {
+            this.setNewMessagesBadge(newMessagesUnread);
         }
     }
 
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 7c361804a..275daf547 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -31,6 +31,7 @@ import { CoreUrlUtils } from '@services/utils/url';
 import { CoreConstants } from '@/core/constants';
 import { CoreSitePlugins } from '@features/siteplugins/services/siteplugins';
 import { CoreDomUtils } from '@services/utils/dom';
+import { CoreDom } from '@singletons/dom';
 
 const MOODLE_VERSION_PREFIX = 'version-';
 const MOODLEAPP_VERSION_PREFIX = 'moodleapp-';
@@ -90,9 +91,21 @@ export class AppComponent implements OnInit, AfterViewInit {
         });
 
         // Listen to scroll to add style when scroll is not 0.
-        win.addEventListener('ionScroll', ({ detail, target }: CustomEvent<ScrollDetail>) => {
-            const header = (target as HTMLElement).closest('.ion-page')?.querySelector('ion-header');
-            header?.classList.toggle('core-header-shadow', detail.scrollTop > 0);
+        win.addEventListener('ionScroll', async ({ detail, target }: CustomEvent<ScrollDetail>) => {
+            if ((target as HTMLElement).tagName != 'ION-CONTENT') {
+                return;
+            }
+            const content = (target as HTMLIonContentElement);
+
+            const page = content.closest('.ion-page');
+            if (!page) {
+                return;
+            }
+
+            page.querySelector<HTMLIonHeaderElement>('ion-header')?.classList.toggle('core-header-shadow', detail.scrollTop > 0);
+
+            const scrollElement = await content.getScrollElement();
+            content.classList.toggle('core-footer-shadow', !CoreDom.scrollIsBottom(scrollElement));
         });
 
         // Listen for session expired events.
diff --git a/src/core/directives/collapsible-footer.ts b/src/core/directives/collapsible-footer.ts
index f345a9b70..7ead926a9 100644
--- a/src/core/directives/collapsible-footer.ts
+++ b/src/core/directives/collapsible-footer.ts
@@ -126,6 +126,9 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
         const scroll = await this.content.getScrollElement();
         this.content.scrollEvents = true;
 
+        // Init shadow.
+        this.content.classList.toggle('core-footer-shadow', !CoreDom.scrollIsBottom(scroll));
+
         this.content.addEventListener('ionScroll', this.contentScrollListener = (e: CustomEvent<ScrollDetail>): void => {
             if (!this.content) {
                 return;
diff --git a/src/core/singletons/dom.ts b/src/core/singletons/dom.ts
index d26b1834e..35306cc12 100644
--- a/src/core/singletons/dom.ts
+++ b/src/core/singletons/dom.ts
@@ -232,6 +232,21 @@ export class CoreDom {
         return CoreDom.scrollToElement(container, '.core-input-error');
     }
 
+    /**
+     * Has the scroll reached bottom?
+     *
+     * @param scrollElement Scroll Element.
+     * @param marginError Error margin when calculating.
+     * @return Wether the scroll reached the bottom.
+     */
+    static scrollIsBottom(scrollElement?: HTMLElement, marginError = 0): boolean {
+        if (!scrollElement) {
+            return true;
+        }
+
+        return scrollElement.scrollTop + scrollElement.clientHeight >= scrollElement.scrollHeight - marginError;
+    }
+
     /**
      * Move element to content so it can be slotted.
      *
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 4448600ce..7bc9f0437 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -1434,8 +1434,11 @@ ion-grid.core-no-grid > ion-row {
     right: 0;
 }
 
-[collapsible-footer] {
+.core-footer-shadow [collapsible-footer] {
     box-shadow: var(--drop-shadow-top, none);
+}
+[collapsible-footer] {
+    transition: box-shadow 0.5s;
     width: 100%;
     bottom: 0;
     z-index: 3;

From aa4f1cdee10aeb7341146e9773e34a526f868551 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 25 Mar 2022 14:48:56 +0100
Subject: [PATCH 0815/1008] MOBILE-3833 collapsible: Collapse footer when
 keyboard is open

---
 src/theme/theme.base.scss | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 7bc9f0437..59edeadaf 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -1471,8 +1471,13 @@ ion-grid.core-no-grid > ion-row {
         &.footer-expanded {
             --core-collapsible-footer-height: auto;
         }
+    }
+}
 
-
+.keyboard-is-open ion-content {
+    --core-collapsible-footer-height: 0px !important;
+    [collapsible-footer] {
+        height: 0;
     }
 }
 

From cb635411956e8fa6342edc5ede8e462a6cf52632 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 24 Mar 2022 16:08:17 +0100
Subject: [PATCH 0816/1008] MOBILE-3833 loading: Improve loading spinner styles

---
 src/core/components/loading/core-loading.html |   6 +-
 src/core/components/loading/loading.scss      | 127 ++++++++----------
 src/core/components/loading/loading.ts        |  17 ++-
 3 files changed, 64 insertions(+), 86 deletions(-)

diff --git a/src/core/components/loading/core-loading.html b/src/core/components/loading/core-loading.html
index 569682040..cabe746af 100644
--- a/src/core/components/loading/core-loading.html
+++ b/src/core/components/loading/core-loading.html
@@ -2,8 +2,4 @@
     <ion-spinner color="primary" aria-hidden="true"></ion-spinner>
     <p class="core-loading-message" *ngIf="message" role="status">{{message}}</p>
 </div>
-<div #content class="core-loading-content" [id]="uniqueId" [attr.aria-busy]="!hideUntil" @coreShowHideAnimation
-    [class.opacity-hide]="!hideUntil">
-    <ng-content *ngIf="loaded">
-    </ng-content>
-</div>
+<ng-content *ngIf="loaded" @coreShowHideAnimation></ng-content>
diff --git a/src/core/components/loading/loading.scss b/src/core/components/loading/loading.scss
index efa86a0de..82ab20289 100644
--- a/src/core/components/loading/loading.scss
+++ b/src/core/components/loading/loading.scss
@@ -1,5 +1,27 @@
 @import "~theme/globals";
 
+@mixin inline() {
+    min-height: var(--internal-loading-inline-min-height);
+    max-height: 100vh; // In order show it on the page (content will be cut).
+
+    &:not(.core-loading-loaded) {
+        position: relative;
+        --contents-display: flex;
+        flex-direction: column;
+    }
+
+    .core-loading-container {
+        --loading-background: rgba(var(--loading-background-inline), 0.4);
+        flex-direction: row;
+        height: auto;
+        width: auto;
+
+        .core-loading-message {
+            @include margin(0, 0, 0, 10px);
+        }
+    }
+}
+
 :host {
     --loading-background: var(--ion-background-color);
     --loading-background-inline: var(--ion-background-color-rgb);
@@ -8,27 +30,28 @@
     --loading-inline-margin: 0px;
     --loading-inline-min-height: 28px;
     --internal-loading-inline-min-height: var(--loading-inline-min-height);
-    --content-display: contents;
+    --loading-display: flex;
+    --loading-display-message: block;
+    --contents-display: contents;
 
-    position: static;
-    color: var(--loading-text-color);
     @include core-transition(all, 200ms);
-
-    &.margin {
-        --loading-inline-margin: 10px;
-        --internal-loading-inline-min-height: calc(var(--loading-inline-min-height) + var(--loading-inline-margin) + var(--loading-inline-margin));
-    }
+    pointer-events: none;
+    display: var(--contents-display);
 
     &.core-loading-loaded {
+        position: static;
+        pointer-events: auto;
         --internal-loading-inline-min-height: 0px;
-    }
 
-    ion-spinner {
-        --color: var(--loading-spinner);
-        color: var(--color);
+        &.has-spacer {
+            --contents-display: flex;
+            min-height: 100%;
+            flex-direction: column;
+        }
     }
 
     .core-loading-container {
+        pointer-events: none;
         position: absolute;
         @include position(0, 0, 0, 0);
         height: 100%;
@@ -36,78 +59,38 @@
         z-index: 3;
         margin: 0;
         padding: 0;
+        color: var(--loading-text-color);
         background-color: var(--loading-background);
         @include core-transition(all, 200ms);
-        display: flex;
+        display: var(--loading-display);
         justify-content: center;
         align-items: center;
         flex-direction: column;
-    }
-
-    .core-loading-content {
-        @include core-transition(opacity, 200ms);
-        display: var(--content-display);
-    }
-
-    .core-loading-message {
-        @include margin(10px, 0, 0, 0);
-    }
-
-    &.core-loading-loaded {
-        position: unset;
-        display: contents;
-    }
-
-    &.core-loading-inline {
-        --loading-background: rgba(var(--loading-background-inline), 0.5);
-        position: relative;
-        display: block;
-        min-height: var(--internal-loading-inline-min-height);
 
         .core-loading-message {
-            @include margin(0, 0, 0, 10px);
+            @include margin(10px, 0, 0, 0);
+            display: var(--loading-display-message);
         }
 
-        .core-loading-container {
-            flex-direction: row;
+        ion-spinner {
+            --color: var(--loading-spinner);
+            color: var(--color);
         }
     }
 
-    &.core-loading-full-height .core-loading-content {
-        height: 100%;
-    }
-
-    &.has-spacer {
-        --content-display: flex;
-
-        .core-loading-content {
-            min-height: 100%;
-            flex-direction: column;
-        }
-    }
-
-    &.list-item-limited-width .core-loading-content {
-        max-width: var(--list-item-max-width);
-        margin-left: auto !important;
-        margin-right: auto !important;
-    }
-
-    &.safe-area-padding:not(.core-loading-inline) .core-loading-content,
-    &.safe-area-padding-horizontal:not(.core-loading-inline) .core-loading-content {
-        @include safe-area-padding-horizontal(0px, 0px);
-    }
-
-    &.safe-area-padding:not(.core-loading-inline) .core-loading-content {
-        padding-bottom: var(--ion-safe-area-bottom);
-        > * {
-            --ion-safe-area-bottom: 0px;
-        }
-    }
-}
-
-:host-context(ion-item) {
     &.core-loading-inline {
-        position: static;
-        display: block;
+       @include inline();
     }
 }
+
+// Force inline on some contexts.
+:host-context(ion-item),
+:host-context(core-block) {
+    // Implicit Inline.
+    @include inline();
+}
+
+:host-context(.limited-width > ):not([slot]) {
+    --contents-display: flex;
+    flex-direction: column;
+}
diff --git a/src/core/components/loading/loading.ts b/src/core/components/loading/loading.ts
index d5be19770..7485ade46 100644
--- a/src/core/components/loading/loading.ts
+++ b/src/core/components/loading/loading.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, Input, OnInit, OnChanges, SimpleChange, ViewChild, ElementRef, AfterViewInit } from '@angular/core';
+import { Component, Input, OnInit, OnChanges, SimpleChange, ElementRef, AfterViewInit } from '@angular/core';
 
 import { CoreEventLoadingChangedData, CoreEvents } from '@singletons/events';
 import { CoreUtils } from '@services/utils/utils';
@@ -50,15 +50,14 @@ import { AsyncComponent } from '@classes/async-component';
 })
 export class CoreLoadingComponent implements OnInit, OnChanges, AfterViewInit, AsyncComponent {
 
-    @Input() hideUntil: unknown; // Determine when should the contents be shown.
+    @Input() hideUntil = false; // Determine when should the contents be shown.
     @Input() message?: string; // Message to show while loading.
     @Input() fullscreen = true; // Use the whole screen.
 
-    @ViewChild('content') content?: ElementRef;
-
     uniqueId: string;
-    protected element: HTMLElement; // Current element.
     loaded = false; // Only comes true once.
+
+    protected element: HTMLElement; // Current element.
     protected onReadyPromise = new CorePromisedValue<void>();
 
     constructor(element: ElementRef) {
@@ -67,6 +66,7 @@ export class CoreLoadingComponent implements OnInit, OnChanges, AfterViewInit, A
 
         // Calculate the unique ID.
         this.uniqueId = 'core-loading-content-' + CoreUtils.getUniqueId('CoreLoadingComponent');
+        this.element.setAttribute('id', this.uniqueId);
     }
 
     /**
@@ -77,7 +77,6 @@ export class CoreLoadingComponent implements OnInit, OnChanges, AfterViewInit, A
             // Default loading message.
             this.message = Translate.instant('core.loading');
         }
-
         this.element.classList.toggle('core-loading-inline', !this.fullscreen);
     }
 
@@ -85,7 +84,7 @@ export class CoreLoadingComponent implements OnInit, OnChanges, AfterViewInit, A
      * @inheritdoc
      */
     ngAfterViewInit(): void {
-        this.changeState(!!this.hideUntil);
+        this.changeState(this.hideUntil);
     }
 
     /**
@@ -93,7 +92,7 @@ export class CoreLoadingComponent implements OnInit, OnChanges, AfterViewInit, A
      */
     ngOnChanges(changes: { [name: string]: SimpleChange }): void {
         if (changes.hideUntil) {
-            this.changeState(!!this.hideUntil);
+            this.changeState(this.hideUntil);
         }
     }
 
@@ -105,7 +104,7 @@ export class CoreLoadingComponent implements OnInit, OnChanges, AfterViewInit, A
      */
     async changeState(loaded: boolean): Promise<void> {
         this.element.classList.toggle('core-loading-loaded', loaded);
-        this.content?.nativeElement.classList.toggle('core-loading-content', loaded);
+        this.element.setAttribute('aria-busy', loaded ?  'false' : 'true');
 
         if (!this.loaded && loaded) {
             this.loaded = true; // Only comes true once.

From 90ddcd78271c85562c4bd572a3682e129819c55f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 25 Mar 2022 10:16:12 +0100
Subject: [PATCH 0817/1008] MOBILE-3833 loading: Change loading usage

---
 .../pages/issued-badge/issued-badge.html      |   4 +-
 .../addon-block-activitymodules.html          |   2 +-
 .../myoverview/addon-block-myoverview.html    |   2 +-
 .../addon-block-recentlyaccessedcourses.html  |   2 +-
 .../addon-block-recentlyaccesseditems.html    |   2 +-
 .../addon-block-sitemainmenu.html             |   2 +-
 .../addon-block-starredcourses.html           |   2 +-
 .../timeline/addon-block-timeline.html        |   6 +-
 src/addons/blog/pages/entries/entries.html    |   4 +-
 .../calendar/addon-calendar-calendar.html     |   2 +-
 .../addon-calendar-upcoming-events.html       |   4 +-
 src/addons/calendar/pages/day/day.html        |   8 +-
 .../pages/competency/competency.html          |   4 +-
 .../competencysummary/competencysummary.html  |   4 +-
 .../coursecompetencies.html                   |   4 +-
 src/addons/competency/pages/plan/plan.html    |   4 +-
 .../messages/pages/discussion/discussion.html |   4 +-
 .../index/addon-mod-assign-index.html         |   2 +-
 .../addon-mod-assign-submission.html          | 670 +++++++++---------
 src/addons/mod/assign/pages/index/index.html  |   2 +-
 .../components/index/index.html               |   2 +-
 .../bigbluebuttonbn/pages/index/index.html    |   2 +-
 .../index/addon-mod-book-index.html           |   2 +-
 .../mod/book/pages/contents/contents.scss     |   6 -
 src/addons/mod/book/pages/index/index.html    |   2 +-
 .../index/addon-mod-chat-index.html           |   2 +-
 src/addons/mod/chat/pages/chat/chat.html      |   4 +-
 src/addons/mod/chat/pages/index/index.html    |   2 +-
 .../session-messages/session-messages.html    |   2 +-
 .../index/addon-mod-choice-index.html         | 103 ++-
 src/addons/mod/choice/pages/index/index.html  |   2 +-
 .../index/addon-mod-data-index.html           |   2 +-
 src/addons/mod/data/pages/entry/entry.html    |   5 +-
 src/addons/mod/data/pages/index/index.html    |   2 +-
 .../index/addon-mod-feedback-index.html       |   2 +-
 src/addons/mod/feedback/pages/form/form.html  |   4 +-
 .../mod/feedback/pages/index/index.html       |   2 +-
 .../index/addon-mod-folder-index.html         |   2 +-
 src/addons/mod/folder/pages/index/index.html  |   2 +-
 .../post-options-menu/post-options-menu.scss  |  13 +-
 .../forum/pages/discussion/discussion.html    |   4 +-
 .../mod/glossary/pages/entry/entry.html       |   4 +-
 .../index/addon-mod-h5pactivity-index.html    |   2 +-
 .../index/addon-mod-imscp-index.html          |   2 +-
 src/addons/mod/imscp/pages/index/index.html   |   2 +-
 src/addons/mod/imscp/pages/view/view.html     |   2 +-
 .../index/addon-mod-lesson-index.html         |   2 +-
 src/addons/mod/lesson/pages/index/index.html  |   2 +-
 .../mod/lesson/pages/player/player.html       |   4 +-
 .../lesson/pages/user-retake/user-retake.html |   4 +-
 .../components/index/addon-mod-lti-index.html |   2 +-
 src/addons/mod/lti/pages/index/index.html     |   2 +-
 .../index/addon-mod-page-index.html           |   2 +-
 .../mod/page/components/index/index.scss      |   8 -
 src/addons/mod/page/components/index/index.ts |   1 -
 src/addons/mod/page/pages/index/index.html    |   2 +-
 .../index/addon-mod-quiz-index.html           |   2 +-
 .../mod/quiz/pages/attempt/attempt.html       |   4 +-
 src/addons/mod/quiz/pages/index/index.html    |   2 +-
 src/addons/mod/quiz/pages/player/player.html  |   4 +-
 src/addons/mod/quiz/pages/review/review.html  |   4 +-
 .../index/addon-mod-resource-index.html       |   2 +-
 .../mod/resource/pages/index/index.html       |   2 +-
 .../index/addon-mod-scorm-index.html          |   2 +-
 src/addons/mod/scorm/pages/index/index.html   |   2 +-
 src/addons/mod/scorm/pages/player/player.html |   2 +-
 .../index/addon-mod-survey-index.html         |   2 +-
 src/addons/mod/survey/pages/index/index.html  |   2 +-
 .../components/index/addon-mod-url-index.html |   2 +-
 src/addons/mod/url/pages/index/index.html     |   2 +-
 .../index/addon-mod-wiki-index.html           |   2 +-
 src/addons/mod/wiki/pages/index/index.html    |   2 +-
 .../addon-mod-workshop-assessment.html        |   2 +-
 .../index/addon-mod-workshop-index.html       |   2 +-
 .../addon-mod-workshop-submission.html        |   2 +-
 .../mod/workshop/pages/index/index.html       |   2 +-
 .../workshop/pages/submission/submission.html |   2 +-
 src/addons/notes/pages/list/list.html         |   4 +-
 .../privatefiles/pages/index/index.html       |   4 +-
 .../pages/course-storage/course-storage.html  |   4 +-
 .../courses-storage/courses-storage.html      |   4 +-
 .../components/attachments/attachments.scss   |   6 +-
 src/core/components/iframe/core-iframe.html   |   9 +-
 src/core/components/iframe/iframe.scss        |  21 -
 .../core-course-format-single-activity.html   |   4 +-
 .../pages/module-preview/module-preview.html  |   4 +-
 .../features/grades/pages/course/course.html  |   2 +-
 .../h5p-iframe/core-h5p-iframe.html           |   2 +-
 .../login/pages/credentials/credentials.html  |   4 +-
 .../login/pages/site-policy/site-policy.html  |   2 +-
 .../features/login/pages/sites/sites.html     |   4 +-
 .../settings/pages/licenses/licenses.html     |   4 +-
 .../pages/space-usage/space-usage.html        |   4 +-
 .../synchronization/synchronization.html      |   4 +-
 .../tag/pages/index-area/index-area.html      |   8 +-
 .../features/tag/pages/search/search.html     |   2 +-
 src/core/features/user/pages/about/about.html |   4 +-
 .../features/user/pages/profile/profile.html  |   4 +-
 src/theme/theme.base.scss                     |   8 +-
 99 files changed, 528 insertions(+), 574 deletions(-)
 delete mode 100644 src/addons/mod/page/components/index/index.scss

diff --git a/src/addons/badges/pages/issued-badge/issued-badge.html b/src/addons/badges/pages/issued-badge/issued-badge.html
index fde877cb2..5f233087f 100644
--- a/src/addons/badges/pages/issued-badge/issued-badge.html
+++ b/src/addons/badges/pages/issued-badge/issued-badge.html
@@ -9,11 +9,11 @@
         </ion-title>
     </ion-toolbar>
 </ion-header>
-<ion-content [core-swipe-navigation]="badges">
+<ion-content [core-swipe-navigation]="badges" class="limited-width">
     <ion-refresher slot="fixed" [disabled]="!badgeLoaded" (ionRefresh)="refreshBadges($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <core-loading [hideUntil]="badgeLoaded" class="list-item-limited-width">
+    <core-loading [hideUntil]="badgeLoaded">
         <ion-item-group *ngIf="badge">
             <ion-item class="ion-text-wrap ion-text-center">
                 <ion-label>
diff --git a/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html b/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html
index a22f3d549..b4f800003 100644
--- a/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html
+++ b/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html
@@ -3,7 +3,7 @@
         <h2>{{ 'addon.block_activitymodules.pluginname' | translate }}</h2>
     </ion-label>
 </ion-item-divider>
-<core-loading [hideUntil]="loaded" [fullscreen]="false">
+<core-loading [hideUntil]="loaded">
     <ion-item class="ion-text-wrap" *ngFor="let entry of entries" detail="true" button (click)="gotoCoureListModType(entry)">
         <core-mod-icon slot="start" [modicon]="entry.icon" [modname]="entry.iconModName" [showAlt]="false">
         </core-mod-icon>
diff --git a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
index 8131987f4..3718ea8e7 100644
--- a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
+++ b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
@@ -20,7 +20,7 @@
         </div>
     </div>
 </ion-item-divider>
-<core-loading [hideUntil]="loaded" [fullscreen]="false">
+<core-loading [hideUntil]="loaded">
 
     <ion-row class="ion-justify-content-between ion-align-items-center addon-block-myoverview-filter" *ngIf="hasCourses">
         <ion-col size="auto" *ngIf="filters.enabled">
diff --git a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html
index 93b5c04f7..d4b28ea36 100644
--- a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html
+++ b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html
@@ -7,7 +7,7 @@
         </core-horizontal-scroll-controls>
     </div>
 </ion-item-divider>
-<core-loading [hideUntil]="loaded" [fullscreen]="false">
+<core-loading [hideUntil]="loaded">
     <core-empty-box *ngIf="courses.length == 0" image="assets/img/icons/courses.svg"
         [message]="'addon.block_recentlyaccessedcourses.nocourses' | translate"></core-empty-box>
     <!-- List of courses. -->
diff --git a/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html b/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html
index cacc174c9..bdab2ad19 100644
--- a/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html
+++ b/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html
@@ -7,7 +7,7 @@
         </core-horizontal-scroll-controls>
     </div>
 </ion-item-divider>
-<core-loading [hideUntil]="loaded" [fullscreen]="false">
+<core-loading [hideUntil]="loaded">
     <div [id]="scrollElementId" [hidden]="!items || items.length === 0" class="core-horizontal-scroll"
         (scroll)="scrollControls.updateScrollPosition()">
         <div *ngIf="items" (onResize)="scrollControls.updateScrollPosition()" class="flex-row">
diff --git a/src/addons/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html b/src/addons/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html
index fa38b0bc3..11bc7d2b8 100644
--- a/src/addons/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html
+++ b/src/addons/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html
@@ -3,7 +3,7 @@
         <h2>{{ 'addon.block_sitemainmenu.pluginname' | translate }}</h2>
     </ion-label>
 </ion-item-divider>
-<core-loading [hideUntil]="loaded" [fullscreen]="false">
+<core-loading [hideUntil]="loaded">
     <ion-list *ngIf="mainMenuBlock" class="core-course-module-list-wrapper">
         <ion-item class="ion-text-wrap" *ngIf="mainMenuBlock.summary">
             <ion-label>
diff --git a/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html b/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html
index 02398a668..88e7fdfce 100644
--- a/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html
+++ b/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html
@@ -7,7 +7,7 @@
         </core-horizontal-scroll-controls>
     </div>
 </ion-item-divider>
-<core-loading [hideUntil]="loaded" [fullscreen]="false">
+<core-loading [hideUntil]="loaded">
     <core-empty-box *ngIf="courses.length == 0" image="assets/img/icons/courses.svg"
         [message]="'addon.block_starredcourses.nocourses' | translate"></core-empty-box>
     <!-- List of courses. -->
diff --git a/src/addons/block/timeline/components/timeline/addon-block-timeline.html b/src/addons/block/timeline/components/timeline/addon-block-timeline.html
index b652282e9..949692cb2 100644
--- a/src/addons/block/timeline/components/timeline/addon-block-timeline.html
+++ b/src/addons/block/timeline/components/timeline/addon-block-timeline.html
@@ -3,7 +3,7 @@
         <h2>{{ 'addon.block_timeline.pluginname' | translate }}</h2>
     </ion-label>
 </ion-item-divider>
-<core-loading [hideUntil]="loaded" [fullscreen]="false">
+<core-loading [hideUntil]="loaded">
     <ion-row class="ion-no-padding ion-justify-content-between ion-align-items-center">
         <ion-col size="auto" class="ion-no-padding">
             <core-combobox [selection]="filter" (onChange)="switchFilter($event)" icon="fas-filter">
@@ -57,11 +57,11 @@
         </ion-col>
     </ion-row>
 
-    <core-loading [hideUntil]="timeline.loaded" [hidden]="sort != 'sortbydates'" [fullscreen]="false">
+    <core-loading [hideUntil]="timeline.loaded" [hidden]="sort != 'sortbydates'">
         <addon-block-timeline-events [events]="timeline.events" [canLoadMore]="timeline.canLoadMore" (loadMore)="loadMore()"
             [from]="dataFrom" [to]="dataTo"></addon-block-timeline-events>
     </core-loading>
-    <core-loading [hideUntil]="timelineCourses.loaded" [hidden]="sort != 'sortbycourses'" [fullscreen]="false" class="safe-area-page">
+    <core-loading [hideUntil]="timelineCourses.loaded" [hidden]="sort != 'sortbycourses'">
         <ng-container *ngFor="let course of timelineCourses.courses">
             <addon-block-timeline-events [events]="course.events" [canLoadMore]="course.canLoadMore" (loadMore)="loadMore(course)"
                 [course]="course" [from]="dataFrom" [to]="dataTo"></addon-block-timeline-events>
diff --git a/src/addons/blog/pages/entries/entries.html b/src/addons/blog/pages/entries/entries.html
index d1a56b3c0..06d703932 100644
--- a/src/addons/blog/pages/entries/entries.html
+++ b/src/addons/blog/pages/entries/entries.html
@@ -11,11 +11,11 @@
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
-<ion-content>
+<ion-content class="limited-width">
     <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="refresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <core-loading [hideUntil]="loaded" class="list-item-limited-width">
+    <core-loading [hideUntil]="loaded">
         <ion-item *ngIf="showMyEntriesToggle">
             <ion-label>{{ 'addon.blog.showonlyyourentries' | translate }}</ion-label>
             <ion-toggle [(ngModel)]="onlyMyEntries" (ionChange)="onlyMyEntriesToggleChanged(onlyMyEntries)"></ion-toggle>
diff --git a/src/addons/calendar/components/calendar/addon-calendar-calendar.html b/src/addons/calendar/components/calendar/addon-calendar-calendar.html
index 39466f120..21d0bc83d 100644
--- a/src/addons/calendar/components/calendar/addon-calendar-calendar.html
+++ b/src/addons/calendar/components/calendar/addon-calendar-calendar.html
@@ -7,7 +7,7 @@
     </core-context-menu>
 </core-navbar-buttons>
 
-<core-loading [hideUntil]="loaded" class="safe-area-padding core-loading-full-height">
+<core-loading [hideUntil]="loaded">
     <div class="core-swipe-slides-container">
         <!-- Period name and arrows to navigate. -->
         <ion-grid class="ion-no-padding addon-calendar-navigation">
diff --git a/src/addons/calendar/components/upcoming-events/addon-calendar-upcoming-events.html b/src/addons/calendar/components/upcoming-events/addon-calendar-upcoming-events.html
index e5a295569..ef63f7816 100644
--- a/src/addons/calendar/components/upcoming-events/addon-calendar-upcoming-events.html
+++ b/src/addons/calendar/components/upcoming-events/addon-calendar-upcoming-events.html
@@ -1,8 +1,8 @@
-<core-loading [hideUntil]="loaded" class="list-item-limited-width">
+<core-loading [hideUntil]="loaded">
     <core-empty-box *ngIf="!filteredEvents || !filteredEvents.length" icon="fas-calendar" [message]="'addon.calendar.noevents' | translate">
     </core-empty-box>
 
-    <ion-list *ngIf="filteredEvents && filteredEvents.length" class="ion-no-margin">
+    <ion-list *ngIf="filteredEvents && filteredEvents.length" class="list-item-limited-width">
         <ng-container *ngFor="let event of filteredEvents">
             <ion-card>
                 <ion-item class="ion-text-wrap addon-calendar-event" [attr.aria-label]="event.name" (click)="eventClicked(event)" button
diff --git a/src/addons/calendar/pages/day/day.html b/src/addons/calendar/pages/day/day.html
index 67bdbd8b1..fba17f45a 100644
--- a/src/addons/calendar/pages/day/day.html
+++ b/src/addons/calendar/pages/day/day.html
@@ -27,7 +27,7 @@
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
-    <core-loading [hideUntil]="loaded" class="core-loading-full-height">
+    <core-loading [hideUntil]="loaded">
         <div class="core-swipe-slides-container">
             <!-- Period name and arrows to navigate. -->
             <ion-grid class="ion-no-padding safe-area-padding">
@@ -50,9 +50,9 @@
 
             <core-swipe-slides [manager]="manager">
                 <ng-template let-day="item">
-                    <core-loading [hideUntil]="day.loaded" class="safe-area-padding list-item-limited-width">
+                    <core-loading [hideUntil]="day.loaded">
                         <!-- There is data to be synchronized -->
-                        <ion-card class="core-warning-card" *ngIf="day.hasOffline">
+                        <ion-card class="core-warning-card list-item-limited-width" *ngIf="day.hasOffline">
                             <ion-item>
                                 <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
                                 <ion-label>{{ 'core.hasdatatosync' | translate:{$a: 'core.day' | translate} }}</ion-label>
@@ -63,7 +63,7 @@
                             [message]="'addon.calendar.noevents' | translate">
                         </core-empty-box>
 
-                        <ion-list *ngIf="day.filteredEvents && day.filteredEvents.length" class="ion-no-margin">
+                        <ion-list *ngIf="day.filteredEvents && day.filteredEvents.length" class="list-item-limited-width">
                             <ng-container *ngFor="let event of day.filteredEvents">
                                 <ion-card>
                                     <ion-item class="addon-calendar-event ion-text-wrap" [attr.aria-label]="event.name"
diff --git a/src/addons/competency/pages/competency/competency.html b/src/addons/competency/pages/competency/competency.html
index 194bef3ca..f8a03e245 100644
--- a/src/addons/competency/pages/competency/competency.html
+++ b/src/addons/competency/pages/competency/competency.html
@@ -10,11 +10,11 @@
         </ion-title>
     </ion-toolbar>
 </ion-header>
-<ion-content [core-swipe-navigation]="competencies">
+<ion-content [core-swipe-navigation]="competencies" class="limited-width">
     <ion-refresher slot="fixed" [disabled]="!competencyLoaded" (ionRefresh)="refreshCompetency($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <core-loading [hideUntil]="competencyLoaded" class="list-item-limited-width">
+    <core-loading [hideUntil]="competencyLoaded">
         <ion-card *ngIf="user">
             <ion-item class="ion-text-wrap">
                 <core-user-avatar [user]="user" slot="start"></core-user-avatar>
diff --git a/src/addons/competency/pages/competencysummary/competencysummary.html b/src/addons/competency/pages/competencysummary/competencysummary.html
index b5314d334..57d59228e 100644
--- a/src/addons/competency/pages/competencysummary/competencysummary.html
+++ b/src/addons/competency/pages/competencysummary/competencysummary.html
@@ -10,11 +10,11 @@
         </ion-title>
     </ion-toolbar>
 </ion-header>
-<ion-content>
+<ion-content class="limited-width">
     <ion-refresher slot="fixed" [disabled]="!competencyLoaded" (ionRefresh)="refreshCompetency($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <core-loading [hideUntil]="competencyLoaded" class="list-item-limited-width">
+    <core-loading [hideUntil]="competencyLoaded">
         <ion-card *ngIf="competency">
             <ion-item class="ion-text-wrap" *ngIf="competency.competency.description">
                 <ion-label>
diff --git a/src/addons/competency/pages/coursecompetencies/coursecompetencies.html b/src/addons/competency/pages/coursecompetencies/coursecompetencies.html
index 6ca87f8af..daea95879 100644
--- a/src/addons/competency/pages/coursecompetencies/coursecompetencies.html
+++ b/src/addons/competency/pages/coursecompetencies/coursecompetencies.html
@@ -8,11 +8,11 @@
         </ion-title>
     </ion-toolbar>
 </ion-header>
-<ion-content>
+<ion-content class="limited-width">
     <ion-refresher slot="fixed" [disabled]="!competencies.loaded" (ionRefresh)="refreshCourseCompetencies($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <core-loading [hideUntil]="competencies.loaded" class="list-item-limited-width">
+    <core-loading [hideUntil]="competencies.loaded">
         <ion-card *ngIf="!user && courseCompetencies && courseCompetencies.statistics.competencycount > 0">
             <ng-container *ngIf="courseCompetencies.cangradecompetencies">
                 <ion-item class="ion-text-wrap" *ngIf="courseCompetencies.settings.pushratingstouserplans">
diff --git a/src/addons/competency/pages/plan/plan.html b/src/addons/competency/pages/plan/plan.html
index 1f2275c70..055972527 100644
--- a/src/addons/competency/pages/plan/plan.html
+++ b/src/addons/competency/pages/plan/plan.html
@@ -8,11 +8,11 @@
         </ion-title>
     </ion-toolbar>
 </ion-header>
-<ion-content [core-swipe-navigation]="plans">
+<ion-content [core-swipe-navigation]="plans" class="limited-width">
     <ion-refresher slot="fixed" [disabled]="!competencies.loaded" (ionRefresh)="refreshLearningPlan($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <core-loading [hideUntil]="competencies.loaded" class="list-item-limited-width">
+    <core-loading [hideUntil]="competencies.loaded">
         <ion-card *ngIf="user">
             <ion-item class="ion-text-wrap">
                 <ion-label>
diff --git a/src/addons/messages/pages/discussion/discussion.html b/src/addons/messages/pages/discussion/discussion.html
index 2eb15f375..924b36f7b 100644
--- a/src/addons/messages/pages/discussion/discussion.html
+++ b/src/addons/messages/pages/discussion/discussion.html
@@ -57,8 +57,8 @@
         </core-context-menu>
     </core-navbar-buttons>
 </ion-header>
-<ion-content class="has-footer" (ionScroll)="scrollFunction()">
-    <core-loading [hideUntil]="loaded" class="safe-area-padding-horizontal">
+<ion-content (ionScroll)="scrollFunction()">
+    <core-loading [hideUntil]="loaded">
         <!-- Load previous messages. -->
         <core-infinite-loading [enabled]="canLoadMore" (action)="loadPrevious($event)" position="top" [error]="loadMoreError">
         </core-infinite-loading>
diff --git a/src/addons/mod/assign/components/index/addon-mod-assign-index.html b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
index d5aef9734..c58552c55 100644
--- a/src/addons/mod/assign/components/index/addon-mod-assign-index.html
+++ b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="!showLoading" class="list-item-limited-width">
+<core-loading [hideUntil]="!showLoading">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
diff --git a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
index 5da98c6d8..7cd548372 100644
--- a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
+++ b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
@@ -1,316 +1,92 @@
-<core-loading [hideUntil]="loaded" class="list-item-limited-width">
+<core-loading [hideUntil]="loaded">
+    <div class="list-item-limited-width">
+        <!-- User and status of the submission. -->
+        <ion-item class="ion-text-wrap" *ngIf="!blindMarking && user" core-user-link [userId]="submitId" [courseId]="courseId"
+            [attr.aria-label]="user!.fullname">
+            <core-user-avatar [user]="user" slot="start" [linkProfile]="false"></core-user-avatar>
+            <ion-label>
+                <h2>{{ user!.fullname }}</h2>
+                <ng-container *ngTemplateOutlet="submissionStatus"></ng-container>
+            </ion-label>
+        </ion-item>
 
-    <!-- User and status of the submission. -->
-    <ion-item class="ion-text-wrap" *ngIf="!blindMarking && user" core-user-link [userId]="submitId" [courseId]="courseId"
-        [attr.aria-label]="user!.fullname">
-        <core-user-avatar [user]="user" slot="start" [linkProfile]="false"></core-user-avatar>
-        <ion-label>
-            <h2>{{ user!.fullname }}</h2>
-            <ng-container *ngTemplateOutlet="submissionStatus"></ng-container>
-        </ion-label>
-    </ion-item>
+        <!-- Status of the submission if user is blinded. -->
+        <ion-item class="ion-text-wrap" *ngIf="blindMarking && !user">
+            <ion-label>
+                <h2>{{ 'addon.mod_assign.hiddenuser' | translate }} {{blindId}}</h2>
+                <ng-container *ngTemplateOutlet="submissionStatus"></ng-container>
+            </ion-label>
+        </ion-item>
 
-    <!-- Status of the submission if user is blinded. -->
-    <ion-item class="ion-text-wrap" *ngIf="blindMarking && !user">
-        <ion-label>
-            <h2>{{ 'addon.mod_assign.hiddenuser' | translate }} {{blindId}}</h2>
-            <ng-container *ngTemplateOutlet="submissionStatus"></ng-container>
-        </ion-label>
-    </ion-item>
+        <!-- Status of the submission in the rest of cases. -->
+        <ion-item class="ion-text-wrap" *ngIf="(blindMarking && user) || (!blindMarking && !user)">
+            <ion-label>
+                <h2>{{ 'addon.mod_assign.submissionstatus' | translate }}</h2>
+                <ng-container *ngTemplateOutlet="submissionStatus"></ng-container>
+            </ion-label>
+        </ion-item>
 
-    <!-- Status of the submission in the rest of cases. -->
-    <ion-item class="ion-text-wrap" *ngIf="(blindMarking && user) || (!blindMarking && !user)">
-        <ion-label>
-            <h2>{{ 'addon.mod_assign.submissionstatus' | translate }}</h2>
-            <ng-container *ngTemplateOutlet="submissionStatus"></ng-container>
-        </ion-label>
-    </ion-item>
+        <!-- Tabs: see the submission or grade it. -->
+        <core-tabs [selectedIndex]="selectedTab" [hideUntil]="loaded" parentScrollable="true" (ionChange)="tabSelected($event)">
+            <!-- View the submission tab. -->
+            <core-tab [title]="'addon.mod_assign.submission' | translate" id="submission">
+                <ng-template>
+                    <addon-mod-assign-submission-plugin *ngFor="let plugin of submissionPlugins" [assign]="assign"
+                        [submission]="userSubmission" [plugin]="plugin">
+                    </addon-mod-assign-submission-plugin>
 
-    <!-- Tabs: see the submission or grade it. -->
-    <core-tabs [selectedIndex]="selectedTab" [hideUntil]="loaded" parentScrollable="true" (ionChange)="tabSelected($event)">
-        <!-- View the submission tab. -->
-        <core-tab [title]="'addon.mod_assign.submission' | translate" id="submission">
-            <ng-template>
-                <addon-mod-assign-submission-plugin *ngFor="let plugin of submissionPlugins" [assign]="assign" [submission]="userSubmission"
-                    [plugin]="plugin">
-                </addon-mod-assign-submission-plugin>
+                    <!-- Render some data about the submission. -->
+                    <ion-item class="ion-text-wrap"
+                        *ngIf="userSubmission && userSubmission!.status != statusNew && userSubmission!.timemodified">
+                        <ion-label>
+                            <h2>{{ 'addon.mod_assign.timemodified' | translate }}</h2>
+                            <p>{{ userSubmission!.timemodified * 1000 | coreFormatDate }}</p>
+                        </ion-label>
+                    </ion-item>
 
-                <!-- Render some data about the submission. -->
-                <ion-item class="ion-text-wrap"
-                    *ngIf="userSubmission && userSubmission!.status != statusNew && userSubmission!.timemodified">
-                    <ion-label>
-                        <h2>{{ 'addon.mod_assign.timemodified' | translate }}</h2>
-                        <p>{{ userSubmission!.timemodified * 1000 | coreFormatDate }}</p>
-                    </ion-label>
-                </ion-item>
+                    <ion-item class="ion-text-wrap" *ngIf="timeRemaining" [ngClass]="[timeRemainingClass]">
+                        <ion-label>
+                            <h2>{{ 'addon.mod_assign.timeremaining' | translate }}</h2>
+                            <p [innerHTML]="timeRemaining"></p>
+                        </ion-label>
+                    </ion-item>
 
-                <ion-item class="ion-text-wrap" *ngIf="timeRemaining" [ngClass]="[timeRemainingClass]">
-                    <ion-label>
-                        <h2>{{ 'addon.mod_assign.timeremaining' | translate }}</h2>
-                        <p [innerHTML]="timeRemaining"></p>
-                    </ion-label>
-                </ion-item>
-
-                <ion-item class="ion-text-wrap" *ngIf="showDates && fromDate && !isSubmittedForGrading">
-                    <ion-label>
-                        <p *ngIf="assign!.intro"
-                            [innerHTML]="'addon.mod_assign.allowsubmissionsfromdatesummary' | translate: {'$a': fromDate}">
-                        </p>
-                        <p *ngIf="!assign!.intro" [innerHTML]="'addon.mod_assign.allowsubmissionsanddescriptionfromdatesummary' | translate:
+                    <ion-item class="ion-text-wrap" *ngIf="showDates && fromDate && !isSubmittedForGrading">
+                        <ion-label>
+                            <p *ngIf="assign!.intro"
+                                [innerHTML]="'addon.mod_assign.allowsubmissionsfromdatesummary' | translate: {'$a': fromDate}">
+                            </p>
+                            <p *ngIf="!assign!.intro" [innerHTML]="'addon.mod_assign.allowsubmissionsanddescriptionfromdatesummary' | translate:
                                 {'$a': fromDate}">
-                        </p>
-                    </ion-label>
-                </ion-item>
-
-                <ion-item class="ion-text-wrap" *ngIf="showDates && assign!.duedate && !isSubmittedForGrading">
-                    <ion-label>
-                        <h2>{{ 'addon.mod_assign.duedate' | translate }}</h2>
-                        <p *ngIf="assign!.duedate">{{ assign!.duedate * 1000 | coreFormatDate }}</p>
-                        <p *ngIf="!assign!.duedate">{{ 'addon.mod_assign.duedateno' | translate }}</p>
-                    </ion-label>
-                </ion-item>
-
-                <ion-item class="ion-text-wrap" *ngIf="assign!.duedate && assign!.cutoffdate && isSubmittedForGrading">
-                    <ion-label>
-                        <h2>{{ 'addon.mod_assign.cutoffdate' | translate }}</h2>
-                        <p>{{ assign!.cutoffdate * 1000 | coreFormatDate }}</p>
-                    </ion-label>
-                </ion-item>
-
-                <ion-item class="ion-text-wrap" *ngIf="assign!.duedate && lastAttempt?.extensionduedate && !isSubmittedForGrading">
-                    <ion-label>
-                        <h2>{{ 'addon.mod_assign.extensionduedate' | translate }}</h2>
-                        <p>{{ lastAttempt!.extensionduedate * 1000 | coreFormatDate }}</p>
-                    </ion-label>
-                </ion-item>
-
-                <ion-item class="ion-text-wrap" *ngIf="currentAttempt && !isGrading">
-                    <ion-label>
-                        <h2>{{ 'addon.mod_assign.attemptnumber' | translate }}</h2>
-                        <p *ngIf="assign!.maxattempts == unlimitedAttempts">
-                            {{ 'addon.mod_assign.outof' | translate :
-                            {'$a': {'current': currentAttempt, 'total': maxAttemptsText} } }}
-                        </p>
-                        <p *ngIf="assign!.maxattempts != unlimitedAttempts">
-                            {{ 'addon.mod_assign.outof' | translate :
-                            {'$a': {'current': currentAttempt, 'total': assign!.maxattempts} } }}
-                        </p>
-                    </ion-label>
-                </ion-item>
-
-                <!-- Add or edit submission. -->
-                <ion-item class="ion-text-wrap" *ngIf="canEdit">
-                    <ion-label>
-                        <div *ngIf="!unsupportedEditPlugins.length && !showErrorStatementEdit">
-                            <!-- If has offline data, show edit. -->
-                            <ion-button expand="block" class="ion-text-wrap" *ngIf="hasOffline" (click)="goToEdit()">
-                                {{ 'addon.mod_assign.editsubmission' | translate }}
-                            </ion-button>
-                            <!-- If no submission or is new, show add submission. -->
-                            <ion-button expand="block" class="ion-text-wrap" (click)="goToEdit()" *ngIf="!hasOffline &&
-                                    (!userSubmission || !userSubmission!.status || userSubmission!.status == statusNew)">
-                                {{ 'addon.mod_assign.addsubmission' | translate }}
-                            </ion-button>
-                            <!-- If reopened, show addfromprevious and addnewattempt. -->
-                            <ng-container *ngIf="!hasOffline && userSubmission?.status == statusReopened">
-                                <ion-button *ngIf="!isPreviousAttemptEmpty" expand="block" class="ion-text-wrap" (click)="copyPrevious()">
-                                    {{ 'addon.mod_assign.addnewattemptfromprevious' | translate }}
-                                </ion-button>
-                                <ion-button expand="block" class="ion-text-wrap" (click)="goToEdit()">
-                                    {{ 'addon.mod_assign.addnewattempt' | translate }}
-                                </ion-button>
-                            </ng-container>
-                            <!-- Else show editsubmission. -->
-                            <ion-button expand="block" class="ion-text-wrap" *ngIf="!hasOffline &&
-                                    userSubmission && userSubmission!.status &&
-                                    userSubmission!.status != statusNew &&
-                                    userSubmission!.status != statusReopened" (click)="goToEdit()">
-                                {{ 'addon.mod_assign.editsubmission' | translate }}
-                            </ion-button>
-                        </div>
-                        <div *ngIf="unsupportedEditPlugins && unsupportedEditPlugins.length && !showErrorStatementEdit">
-                            <p class="core-danger-item">{{ 'addon.mod_assign.erroreditpluginsnotsupported' | translate }}</p>
-                            <p class="core-danger-item" *ngFor="let name of unsupportedEditPlugins">{{ name }}</p>
-                        </div>
-                        <div *ngIf="showErrorStatementEdit">
-                            <p class="core-danger-item">{{ 'addon.mod_assign.cannoteditduetostatementsubmission' | translate }}</p>
-                        </div>
-                    </ion-label>
-                </ion-item>
-
-                <!-- Submit for grading form. -->
-                <ng-container *ngIf="canSubmit">
-                    <ion-item class="ion-text-wrap" *ngIf="submissionStatement">
-                        <ion-label>
-                            <core-format-text [text]="submissionStatement" [filter]="false"></core-format-text>
-                        </ion-label>
-                        <ion-checkbox slot="end" name="submissionstatement" [(ngModel)]="acceptStatement">
-                        </ion-checkbox>
-                    </ion-item>
-                    <!-- Submit button. -->
-                    <ion-item class="ion-text-wrap" *ngIf="!showErrorStatementSubmit">
-                        <ion-label>
-                            <ion-button expand="block" class="ion-text-wrap" (click)="submitForGrading(acceptStatement)">
-                                {{ 'addon.mod_assign.submitassignment' | translate }}
-                            </ion-button>
-                            <p>{{ 'addon.mod_assign.submitassignment_help' | translate }}</p>
-                        </ion-label>
-                    </ion-item>
-                    <!-- Error because we lack submissions statement. -->
-                    <ion-item class="ion-text-wrap" *ngIf="showErrorStatementSubmit">
-                        <ion-label>
-                            <p class="core-danger-item">
-                                {{ 'addon.mod_assign.cannotsubmitduetostatementsubmission' | translate }}
                             </p>
                         </ion-label>
                     </ion-item>
-                </ng-container>
 
-                <!-- Team members that need to submit it too. -->
-                <ion-item-divider class="ion-text-wrap" *ngIf="membersToSubmit && membersToSubmit.length > 0">
-                    <ion-label>
-                        <h2>{{ 'addon.mod_assign.userswhoneedtosubmit' | translate: {$a: ''} }}</h2>
-                    </ion-label>
-                </ion-item-divider>
-                <ng-container *ngIf="membersToSubmit && membersToSubmit.length > 0 && !blindMarking">
-                    <ng-container *ngFor="let user of membersToSubmit">
-                        <ion-item class="ion-text-wrap" core-user-link [userId]="user.id" [courseId]="courseId"
-                            [attr.aria-label]="user.fullname">
-                            <core-user-avatar [user]="user" slot="start" [linkProfile]="false"></core-user-avatar>
-                            <ion-label>
-                                <h2>{{ user.fullname }}</h2>
-                            </ion-label>
-                        </ion-item>
-                    </ng-container>
-                </ng-container>
-                <ng-container *ngIf="membersToSubmit && membersToSubmit.length > 0 && blindMarking">
-                    <ng-container *ngFor="let blindId of membersToSubmitBlind">
-                        <ion-item class="ion-text-wrap">
-                            <ion-label>{{ 'addon.mod_assign.hiddenuser' | translate }} {{ blindId }}</ion-label>
-                        </ion-item>
-                    </ng-container>
-                </ng-container>
-
-                <!-- Submission is locked. -->
-                <ion-item class="ion-text-wrap" *ngIf="lastAttempt?.locked">
-                    <ion-label>
-                        <h2>{{ 'addon.mod_assign.submissionslocked' | translate }}</h2>
-                    </ion-label>
-                </ion-item>
-
-                <!-- Editing status. -->
-                <ion-item class="ion-text-wrap" *ngIf="lastAttempt && isSubmittedForGrading && lastAttempt!.caneditowner !== undefined"
-                    [ngClass]="{submissioneditable: lastAttempt!.caneditowner, submissionnoteditable: !lastAttempt!.caneditowner}">
-                    <ion-label>
-                        <h2>{{ 'addon.mod_assign.editingstatus' | translate }}</h2>
-                        <p *ngIf="lastAttempt!.caneditowner">{{ 'addon.mod_assign.submissioneditable' | translate }}</p>
-                        <p *ngIf="!lastAttempt!.caneditowner">{{ 'addon.mod_assign.submissionnoteditable' | translate }}</p>
-                    </ion-label>
-                </ion-item>
-            </ng-template>
-        </core-tab>
-
-        <!-- Grade the submission tab. -->
-        <core-tab [title]="'addon.mod_assign.grade' | translate" *ngIf="feedback || isGrading" id="grade">
-            <ng-template>
-                <!-- Current grade if method is advanced. -->
-                <ion-item class="ion-text-wrap core-grading-summary"
-                    *ngIf="feedback?.gradefordisplay && (!isGrading || grade.method != 'simple')">
-                    <ion-label>
-                        <h2>{{ 'addon.mod_assign.currentgrade' | translate }}</h2>
-                        <p>
-                            <core-format-text [text]="feedback!.gradefordisplay" [filter]="false"></core-format-text>
-                        </p>
-                    </ion-label>
-                    <ion-button slot="end" *ngIf="feedback!.advancedgrade" (click)="showAdvancedGrade()"
-                        [attr.aria-label]="'core.showadvanced' |translate">
-                        <ion-icon name="fas-search" slot="icon-only" aria-hidden="true"></ion-icon>
-                    </ion-button>
-                </ion-item>
-
-                <ng-container *ngIf="isGrading">
-                    <!-- Numeric grade.
-                        Use a text input because otherwise we cannot readthe value if it has an invalid character. -->
-                    <ion-item class="ion-text-wrap" *ngIf="grade.method == 'simple' && !grade.scale">
-                        <ion-label position="stacked">
-                            <h2>{{ 'addon.mod_assign.gradeoutof' | translate: {$a: gradeInfo!.grade} }}</h2>
-                        </ion-label>
-                        <ion-input *ngIf="!grade.disabled" type="text" [(ngModel)]="grade.grade" min="0" [max]="gradeInfo!.grade"
-                            [lang]="grade.lang">
-                        </ion-input>
-                        <p *ngIf="grade.disabled">{{ 'addon.mod_assign.gradelocked' | translate }}</p>
-                    </ion-item>
-
-                    <!-- Grade using a scale. -->
-                    <ion-item class="ion-text-wrap" *ngIf="grade.method == 'simple' && grade.scale">
+                    <ion-item class="ion-text-wrap" *ngIf="showDates && assign!.duedate && !isSubmittedForGrading">
                         <ion-label>
-                            <h2>{{ 'addon.mod_assign.grade' | translate }}</h2>
-                        </ion-label>
-                        <ion-select [(ngModel)]="grade.grade" interface="action-sheet" [disabled]="grade.disabled"
-                            [interfaceOptions]="{header: 'addon.mod_assign.grade' | translate}">
-                            <ion-select-option *ngFor="let grade of grade.scale" [value]="grade.value">
-                                {{grade.label}}
-                            </ion-select-option>
-                        </ion-select>
-                    </ion-item>
-
-                    <!-- Outcomes. -->
-                    <ion-item class="ion-text-wrap" *ngFor="let outcome of gradeInfo!.outcomes">
-                        <ion-label>
-                            <h2>{{ outcome.name }}</h2>
-                        </ion-label>
-                        <ion-select *ngIf="canSaveGrades && outcome.itemNumber" [(ngModel)]="outcome.selectedId" interface="action-sheet"
-                            [disabled]="gradeInfo!.disabled" [interfaceOptions]="{header: outcome.name }">
-                            <ion-select-option *ngFor="let grade of outcome.options" [value]="grade.value">
-                                {{grade.label}}
-                            </ion-select-option>
-                        </ion-select>
-                        <p *ngIf="!canSaveGrades || !outcome.itemNumber">{{ outcome.selected }}</p>
-                    </ion-item>
-
-                    <!-- Gradebook grade for simple grading. -->
-                    <ion-item class="ion-text-wrap" *ngIf="grade.method == 'simple'">
-                        <ion-label>
-                            <h2>{{ 'addon.mod_assign.currentgrade' | translate }}</h2>
-                            <p *ngIf="grade.gradebookGrade && !grade.scale">
-                                {{ grade.gradebookGrade }}
-                            </p>
-                            <p *ngIf="grade.gradebookGrade && grade.scale">
-                                {{ grade.scale[grade.gradebookGrade].label }}
-                            </p>
-                            <p *ngIf="!grade.gradebookGrade">-</p>
+                            <h2>{{ 'addon.mod_assign.duedate' | translate }}</h2>
+                            <p *ngIf="assign!.duedate">{{ assign!.duedate * 1000 | coreFormatDate }}</p>
+                            <p *ngIf="!assign!.duedate">{{ 'addon.mod_assign.duedateno' | translate }}</p>
                         </ion-label>
                     </ion-item>
-                </ng-container>
 
-                <ng-container *ngIf="feedback">
-                    <addon-mod-assign-feedback-plugin *ngFor="let plugin of feedback.plugins" [assign]="assign"
-                        [submission]="userSubmission" [userId]="submitId" [plugin]="plugin" [canEdit]="canSaveGrades">
-                    </addon-mod-assign-feedback-plugin>
-                </ng-container>
-
-                <!-- Workflow status. -->
-                <ion-item class="ion-text-wrap" *ngIf="workflowStatusTranslationId">
-                    <ion-label>
-                        <h2>{{ 'addon.mod_assign.markingworkflowstate' | translate }}</h2>
-                        <p>{{ workflowStatusTranslationId | translate }}</p>
-                    </ion-label>
-                </ion-item>
-
-                <!--- Apply grade to all team members. -->
-                <ion-item class="ion-text-wrap" *ngIf="assign!.teamsubmission && canSaveGrades">
-                    <ion-label>
-                        <h2>{{ 'addon.mod_assign.groupsubmissionsettings' | translate }}</h2>
-                        <p>{{ 'addon.mod_assign.applytoteam' | translate }}</p>
-                    </ion-label>
-                    <ion-toggle [(ngModel)]="grade.applyToAll"></ion-toggle>
-                </ion-item>
-
-                <!-- Attempt status. -->
-                <ng-container *ngIf="isGrading && assign!.attemptreopenmethod != attemptReopenMethodNone">
-                    <ion-item class="ion-text-wrap">
+                    <ion-item class="ion-text-wrap" *ngIf="assign!.duedate && assign!.cutoffdate && isSubmittedForGrading">
                         <ion-label>
-                            <h2>{{ 'addon.mod_assign.attemptsettings' | translate }}</h2>
+                            <h2>{{ 'addon.mod_assign.cutoffdate' | translate }}</h2>
+                            <p>{{ assign!.cutoffdate * 1000 | coreFormatDate }}</p>
+                        </ion-label>
+                    </ion-item>
+
+                    <ion-item class="ion-text-wrap" *ngIf="assign!.duedate && lastAttempt?.extensionduedate && !isSubmittedForGrading">
+                        <ion-label>
+                            <h2>{{ 'addon.mod_assign.extensionduedate' | translate }}</h2>
+                            <p>{{ lastAttempt!.extensionduedate * 1000 | coreFormatDate }}</p>
+                        </ion-label>
+                    </ion-item>
+
+                    <ion-item class="ion-text-wrap" *ngIf="currentAttempt && !isGrading">
+                        <ion-label>
+                            <h2>{{ 'addon.mod_assign.attemptnumber' | translate }}</h2>
                             <p *ngIf="assign!.maxattempts == unlimitedAttempts">
                                 {{ 'addon.mod_assign.outof' | translate :
                                 {'$a': {'current': currentAttempt, 'total': maxAttemptsText} } }}
@@ -319,53 +95,279 @@
                                 {{ 'addon.mod_assign.outof' | translate :
                                 {'$a': {'current': currentAttempt, 'total': assign!.maxattempts} } }}
                             </p>
+                        </ion-label>
+                    </ion-item>
+
+                    <!-- Add or edit submission. -->
+                    <ion-item class="ion-text-wrap" *ngIf="canEdit">
+                        <ion-label>
+                            <div *ngIf="!unsupportedEditPlugins.length && !showErrorStatementEdit">
+                                <!-- If has offline data, show edit. -->
+                                <ion-button expand="block" class="ion-text-wrap" *ngIf="hasOffline" (click)="goToEdit()">
+                                    {{ 'addon.mod_assign.editsubmission' | translate }}
+                                </ion-button>
+                                <!-- If no submission or is new, show add submission. -->
+                                <ion-button expand="block" class="ion-text-wrap" (click)="goToEdit()" *ngIf="!hasOffline &&
+                                    (!userSubmission || !userSubmission!.status || userSubmission!.status == statusNew)">
+                                    {{ 'addon.mod_assign.addsubmission' | translate }}
+                                </ion-button>
+                                <!-- If reopened, show addfromprevious and addnewattempt. -->
+                                <ng-container *ngIf="!hasOffline && userSubmission?.status == statusReopened">
+                                    <ion-button *ngIf="!isPreviousAttemptEmpty" expand="block" class="ion-text-wrap"
+                                        (click)="copyPrevious()">
+                                        {{ 'addon.mod_assign.addnewattemptfromprevious' | translate }}
+                                    </ion-button>
+                                    <ion-button expand="block" class="ion-text-wrap" (click)="goToEdit()">
+                                        {{ 'addon.mod_assign.addnewattempt' | translate }}
+                                    </ion-button>
+                                </ng-container>
+                                <!-- Else show editsubmission. -->
+                                <ion-button expand="block" class="ion-text-wrap" *ngIf="!hasOffline &&
+                                    userSubmission && userSubmission!.status &&
+                                    userSubmission!.status != statusNew &&
+                                    userSubmission!.status != statusReopened" (click)="goToEdit()">
+                                    {{ 'addon.mod_assign.editsubmission' | translate }}
+                                </ion-button>
+                            </div>
+                            <div *ngIf="unsupportedEditPlugins && unsupportedEditPlugins.length && !showErrorStatementEdit">
+                                <p class="core-danger-item">{{ 'addon.mod_assign.erroreditpluginsnotsupported' | translate }}</p>
+                                <p class="core-danger-item" *ngFor="let name of unsupportedEditPlugins">{{ name }}</p>
+                            </div>
+                            <div *ngIf="showErrorStatementEdit">
+                                <p class="core-danger-item">{{ 'addon.mod_assign.cannoteditduetostatementsubmission' | translate }}</p>
+                            </div>
+                        </ion-label>
+                    </ion-item>
+
+                    <!-- Submit for grading form. -->
+                    <ng-container *ngIf="canSubmit">
+                        <ion-item class="ion-text-wrap" *ngIf="submissionStatement">
+                            <ion-label>
+                                <core-format-text [text]="submissionStatement" [filter]="false"></core-format-text>
+                            </ion-label>
+                            <ion-checkbox slot="end" name="submissionstatement" [(ngModel)]="acceptStatement">
+                            </ion-checkbox>
+                        </ion-item>
+                        <!-- Submit button. -->
+                        <ion-item class="ion-text-wrap" *ngIf="!showErrorStatementSubmit">
+                            <ion-label>
+                                <ion-button expand="block" class="ion-text-wrap" (click)="submitForGrading(acceptStatement)">
+                                    {{ 'addon.mod_assign.submitassignment' | translate }}
+                                </ion-button>
+                                <p>{{ 'addon.mod_assign.submitassignment_help' | translate }}</p>
+                            </ion-label>
+                        </ion-item>
+                        <!-- Error because we lack submissions statement. -->
+                        <ion-item class="ion-text-wrap" *ngIf="showErrorStatementSubmit">
+                            <ion-label>
+                                <p class="core-danger-item">
+                                    {{ 'addon.mod_assign.cannotsubmitduetostatementsubmission' | translate }}
+                                </p>
+                            </ion-label>
+                        </ion-item>
+                    </ng-container>
+
+                    <!-- Team members that need to submit it too. -->
+                    <ion-item-divider class="ion-text-wrap" *ngIf="membersToSubmit && membersToSubmit.length > 0">
+                        <ion-label>
+                            <h2>{{ 'addon.mod_assign.userswhoneedtosubmit' | translate: {$a: ''} }}</h2>
+                        </ion-label>
+                    </ion-item-divider>
+                    <ng-container *ngIf="membersToSubmit && membersToSubmit.length > 0 && !blindMarking">
+                        <ng-container *ngFor="let user of membersToSubmit">
+                            <ion-item class="ion-text-wrap" core-user-link [userId]="user.id" [courseId]="courseId"
+                                [attr.aria-label]="user.fullname">
+                                <core-user-avatar [user]="user" slot="start" [linkProfile]="false"></core-user-avatar>
+                                <ion-label>
+                                    <h2>{{ user.fullname }}</h2>
+                                </ion-label>
+                            </ion-item>
+                        </ng-container>
+                    </ng-container>
+                    <ng-container *ngIf="membersToSubmit && membersToSubmit.length > 0 && blindMarking">
+                        <ng-container *ngFor="let blindId of membersToSubmitBlind">
+                            <ion-item class="ion-text-wrap">
+                                <ion-label>{{ 'addon.mod_assign.hiddenuser' | translate }} {{ blindId }}</ion-label>
+                            </ion-item>
+                        </ng-container>
+                    </ng-container>
+
+                    <!-- Submission is locked. -->
+                    <ion-item class="ion-text-wrap" *ngIf="lastAttempt?.locked">
+                        <ion-label>
+                            <h2>{{ 'addon.mod_assign.submissionslocked' | translate }}</h2>
+                        </ion-label>
+                    </ion-item>
+
+                    <!-- Editing status. -->
+                    <ion-item class="ion-text-wrap" *ngIf="lastAttempt && isSubmittedForGrading && lastAttempt!.caneditowner !== undefined"
+                        [ngClass]="{submissioneditable: lastAttempt!.caneditowner, submissionnoteditable: !lastAttempt!.caneditowner}">
+                        <ion-label>
+                            <h2>{{ 'addon.mod_assign.editingstatus' | translate }}</h2>
+                            <p *ngIf="lastAttempt!.caneditowner">{{ 'addon.mod_assign.submissioneditable' | translate }}</p>
+                            <p *ngIf="!lastAttempt!.caneditowner">{{ 'addon.mod_assign.submissionnoteditable' | translate }}</p>
+                        </ion-label>
+                    </ion-item>
+                </ng-template>
+            </core-tab>
+
+            <!-- Grade the submission tab. -->
+            <core-tab [title]="'addon.mod_assign.grade' | translate" *ngIf="feedback || isGrading" id="grade">
+                <ng-template>
+                    <!-- Current grade if method is advanced. -->
+                    <ion-item class="ion-text-wrap core-grading-summary"
+                        *ngIf="feedback?.gradefordisplay && (!isGrading || grade.method != 'simple')">
+                        <ion-label>
+                            <h2>{{ 'addon.mod_assign.currentgrade' | translate }}</h2>
                             <p>
-                                {{ 'addon.mod_assign.attemptreopenmethod' | translate }}:
-                                {{ 'addon.mod_assign.attemptreopenmethod_' + assign!.attemptreopenmethod | translate }}
+                                <core-format-text [text]="feedback!.gradefordisplay" [filter]="false"></core-format-text>
                             </p>
                         </ion-label>
+                        <ion-button slot="end" *ngIf="feedback!.advancedgrade" (click)="showAdvancedGrade()"
+                            [attr.aria-label]="'core.showadvanced' |translate">
+                            <ion-icon name="fas-search" slot="icon-only" aria-hidden="true"></ion-icon>
+                        </ion-button>
                     </ion-item>
-                    <ion-item *ngIf="canSaveGrades && allowAddAttempt">
-                        <ion-label>{{ 'addon.mod_assign.addattempt' | translate }}</ion-label>
-                        <ion-toggle [(ngModel)]="grade.addAttempt"></ion-toggle>
-                    </ion-item>
-                </ng-container>
 
-                <!-- Data about the grader (teacher who graded). -->
-                <ion-item class="ion-text-wrap" *ngIf="grader" core-user-link [userId]="grader!.id" [courseId]="courseId"
-                    [attr.aria-label]="grader!.fullname" detail="true">
-                    <core-user-avatar [user]="grader" slot="start" [linkProfile]="false"></core-user-avatar>
-                    <ion-label>
-                        <h2>{{ 'addon.mod_assign.gradedby' | translate }}</h2>
-                        <h2>{{ grader!.fullname }}</h2>
-                        <p *ngIf="feedback!.gradeddate">{{ feedback!.gradeddate * 1000 | coreFormatDate }}</p>
-                    </ion-label>
-                </ion-item>
+                    <ng-container *ngIf="isGrading">
+                        <!-- Numeric grade.
+                        Use a text input because otherwise we cannot readthe value if it has an invalid character. -->
+                        <ion-item class="ion-text-wrap" *ngIf="grade.method == 'simple' && !grade.scale">
+                            <ion-label position="stacked">
+                                <h2>{{ 'addon.mod_assign.gradeoutof' | translate: {$a: gradeInfo!.grade} }}</h2>
+                            </ion-label>
+                            <ion-input *ngIf="!grade.disabled" type="text" [(ngModel)]="grade.grade" min="0" [max]="gradeInfo!.grade"
+                                [lang]="grade.lang">
+                            </ion-input>
+                            <p *ngIf="grade.disabled">{{ 'addon.mod_assign.gradelocked' | translate }}</p>
+                        </ion-item>
 
-                <!-- Grader is hidden, display only the grade date. -->
-                <ion-item class="ion-text-wrap" *ngIf="!grader && feedback?.gradeddate">
-                    <ion-label>
-                        <h2>{{ 'addon.mod_assign.gradedon' | translate }}</h2>
-                        <p>{{ feedback!.gradeddate * 1000 | coreFormatDate }}</p>
-                    </ion-label>
-                </ion-item>
+                        <!-- Grade using a scale. -->
+                        <ion-item class="ion-text-wrap" *ngIf="grade.method == 'simple' && grade.scale">
+                            <ion-label>
+                                <h2>{{ 'addon.mod_assign.grade' | translate }}</h2>
+                            </ion-label>
+                            <ion-select [(ngModel)]="grade.grade" interface="action-sheet" [disabled]="grade.disabled"
+                                [interfaceOptions]="{header: 'addon.mod_assign.grade' | translate}">
+                                <ion-select-option *ngFor="let grade of grade.scale" [value]="grade.value">
+                                    {{grade.label}}
+                                </ion-select-option>
+                            </ion-select>
+                        </ion-item>
 
-                <!-- Warning message if cannot save grades. -->
-                <ion-card *ngIf="isGrading && !canSaveGrades" class="core-warning-card">
-                    <ion-item>
-                        <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
+                        <!-- Outcomes. -->
+                        <ion-item class="ion-text-wrap" *ngFor="let outcome of gradeInfo!.outcomes">
+                            <ion-label>
+                                <h2>{{ outcome.name }}</h2>
+                            </ion-label>
+                            <ion-select *ngIf="canSaveGrades && outcome.itemNumber" [(ngModel)]="outcome.selectedId"
+                                interface="action-sheet" [disabled]="gradeInfo!.disabled" [interfaceOptions]="{header: outcome.name }">
+                                <ion-select-option *ngFor="let grade of outcome.options" [value]="grade.value">
+                                    {{grade.label}}
+                                </ion-select-option>
+                            </ion-select>
+                            <p *ngIf="!canSaveGrades || !outcome.itemNumber">{{ outcome.selected }}</p>
+                        </ion-item>
+
+                        <!-- Gradebook grade for simple grading. -->
+                        <ion-item class="ion-text-wrap" *ngIf="grade.method == 'simple'">
+                            <ion-label>
+                                <h2>{{ 'addon.mod_assign.currentgrade' | translate }}</h2>
+                                <p *ngIf="grade.gradebookGrade && !grade.scale">
+                                    {{ grade.gradebookGrade }}
+                                </p>
+                                <p *ngIf="grade.gradebookGrade && grade.scale">
+                                    {{ grade.scale[grade.gradebookGrade].label }}
+                                </p>
+                                <p *ngIf="!grade.gradebookGrade">-</p>
+                            </ion-label>
+                        </ion-item>
+                    </ng-container>
+
+                    <ng-container *ngIf="feedback">
+                        <addon-mod-assign-feedback-plugin *ngFor="let plugin of feedback.plugins" [assign]="assign"
+                            [submission]="userSubmission" [userId]="submitId" [plugin]="plugin" [canEdit]="canSaveGrades">
+                        </addon-mod-assign-feedback-plugin>
+                    </ng-container>
+
+                    <!-- Workflow status. -->
+                    <ion-item class="ion-text-wrap" *ngIf="workflowStatusTranslationId">
                         <ion-label>
-                            <p>{{ 'addon.mod_assign.cannotgradefromapp' | translate }}</p>
-                            <ion-button expand="block" *ngIf="gradeUrl" [href]="gradeUrl" core-link [showBrowserWarning]="false">
-                                {{ 'core.openinbrowser' | translate }}
-                                <ion-icon name="fas-external-link-alt" slot="end" aria-hidden="true"></ion-icon>
-                            </ion-button>
+                            <h2>{{ 'addon.mod_assign.markingworkflowstate' | translate }}</h2>
+                            <p>{{ workflowStatusTranslationId | translate }}</p>
                         </ion-label>
                     </ion-item>
-                </ion-card>
-            </ng-template>
-        </core-tab>
-    </core-tabs>
+
+                    <!--- Apply grade to all team members. -->
+                    <ion-item class="ion-text-wrap" *ngIf="assign!.teamsubmission && canSaveGrades">
+                        <ion-label>
+                            <h2>{{ 'addon.mod_assign.groupsubmissionsettings' | translate }}</h2>
+                            <p>{{ 'addon.mod_assign.applytoteam' | translate }}</p>
+                        </ion-label>
+                        <ion-toggle [(ngModel)]="grade.applyToAll"></ion-toggle>
+                    </ion-item>
+
+                    <!-- Attempt status. -->
+                    <ng-container *ngIf="isGrading && assign!.attemptreopenmethod != attemptReopenMethodNone">
+                        <ion-item class="ion-text-wrap">
+                            <ion-label>
+                                <h2>{{ 'addon.mod_assign.attemptsettings' | translate }}</h2>
+                                <p *ngIf="assign!.maxattempts == unlimitedAttempts">
+                                    {{ 'addon.mod_assign.outof' | translate :
+                                    {'$a': {'current': currentAttempt, 'total': maxAttemptsText} } }}
+                                </p>
+                                <p *ngIf="assign!.maxattempts != unlimitedAttempts">
+                                    {{ 'addon.mod_assign.outof' | translate :
+                                    {'$a': {'current': currentAttempt, 'total': assign!.maxattempts} } }}
+                                </p>
+                                <p>
+                                    {{ 'addon.mod_assign.attemptreopenmethod' | translate }}:
+                                    {{ 'addon.mod_assign.attemptreopenmethod_' + assign!.attemptreopenmethod | translate }}
+                                </p>
+                            </ion-label>
+                        </ion-item>
+                        <ion-item *ngIf="canSaveGrades && allowAddAttempt">
+                            <ion-label>{{ 'addon.mod_assign.addattempt' | translate }}</ion-label>
+                            <ion-toggle [(ngModel)]="grade.addAttempt"></ion-toggle>
+                        </ion-item>
+                    </ng-container>
+
+                    <!-- Data about the grader (teacher who graded). -->
+                    <ion-item class="ion-text-wrap" *ngIf="grader" core-user-link [userId]="grader!.id" [courseId]="courseId"
+                        [attr.aria-label]="grader!.fullname" detail="true">
+                        <core-user-avatar [user]="grader" slot="start" [linkProfile]="false"></core-user-avatar>
+                        <ion-label>
+                            <h2>{{ 'addon.mod_assign.gradedby' | translate }}</h2>
+                            <h2>{{ grader!.fullname }}</h2>
+                            <p *ngIf="feedback!.gradeddate">{{ feedback!.gradeddate * 1000 | coreFormatDate }}</p>
+                        </ion-label>
+                    </ion-item>
+
+                    <!-- Grader is hidden, display only the grade date. -->
+                    <ion-item class="ion-text-wrap" *ngIf="!grader && feedback?.gradeddate">
+                        <ion-label>
+                            <h2>{{ 'addon.mod_assign.gradedon' | translate }}</h2>
+                            <p>{{ feedback!.gradeddate * 1000 | coreFormatDate }}</p>
+                        </ion-label>
+                    </ion-item>
+
+                    <!-- Warning message if cannot save grades. -->
+                    <ion-card *ngIf="isGrading && !canSaveGrades" class="core-warning-card">
+                        <ion-item>
+                            <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
+                            <ion-label>
+                                <p>{{ 'addon.mod_assign.cannotgradefromapp' | translate }}</p>
+                                <ion-button expand="block" *ngIf="gradeUrl" [href]="gradeUrl" core-link [showBrowserWarning]="false">
+                                    {{ 'core.openinbrowser' | translate }}
+                                    <ion-icon name="fas-external-link-alt" slot="end" aria-hidden="true"></ion-icon>
+                                </ion-button>
+                            </ion-label>
+                        </ion-item>
+                    </ion-card>
+                </ng-template>
+            </core-tab>
+        </core-tabs>
+    </div>
 </core-loading>
 
 <!-- Template to render some data regarding the submission status. -->
diff --git a/src/addons/mod/assign/pages/index/index.html b/src/addons/mod/assign/pages/index/index.html
index 71f69b398..2d3f9be93 100644
--- a/src/addons/mod/assign/pages/index/index.html
+++ b/src/addons/mod/assign/pages/index/index.html
@@ -15,7 +15,7 @@
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
-<ion-content>
+<ion-content class="limited-width">
     <ion-refresher slot="fixed" [disabled]="activityComponent?.showLoading" (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
diff --git a/src/addons/mod/bigbluebuttonbn/components/index/index.html b/src/addons/mod/bigbluebuttonbn/components/index/index.html
index f3047f77a..8003d0166 100644
--- a/src/addons/mod/bigbluebuttonbn/components/index/index.html
+++ b/src/addons/mod/bigbluebuttonbn/components/index/index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="!showLoading" class="safe-area-page list-item-limited-width">
+<core-loading [hideUntil]="!showLoading">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
diff --git a/src/addons/mod/bigbluebuttonbn/pages/index/index.html b/src/addons/mod/bigbluebuttonbn/pages/index/index.html
index f6e0e524e..273ff5994 100644
--- a/src/addons/mod/bigbluebuttonbn/pages/index/index.html
+++ b/src/addons/mod/bigbluebuttonbn/pages/index/index.html
@@ -14,7 +14,7 @@
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
-<ion-content>
+<ion-content class="limited-width">
     <ion-refresher slot="fixed" [disabled]="activityComponent?.showLoading" (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
diff --git a/src/addons/mod/book/components/index/addon-mod-book-index.html b/src/addons/mod/book/components/index/addon-mod-book-index.html
index 4727f8e6c..380582d58 100644
--- a/src/addons/mod/book/components/index/addon-mod-book-index.html
+++ b/src/addons/mod/book/components/index/addon-mod-book-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="!showLoading" class="list-item-limited-width">
+<core-loading [hideUntil]="!showLoading">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
diff --git a/src/addons/mod/book/pages/contents/contents.scss b/src/addons/mod/book/pages/contents/contents.scss
index 823126ed0..87e3729a3 100644
--- a/src/addons/mod/book/pages/contents/contents.scss
+++ b/src/addons/mod/book/pages/contents/contents.scss
@@ -1,10 +1,4 @@
 :host {
-    core-loading ::ng-deep .core-loading-content {
-        min-height: 100%;
-        display: flex;
-        flex-direction: column;
-    }
-
     .core-swipe-slides-container {
         ion-card {
             flex: none;
diff --git a/src/addons/mod/book/pages/index/index.html b/src/addons/mod/book/pages/index/index.html
index fb3db333b..5e55e1db3 100644
--- a/src/addons/mod/book/pages/index/index.html
+++ b/src/addons/mod/book/pages/index/index.html
@@ -14,7 +14,7 @@
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
-<ion-content>
+<ion-content class="limited-width">
     <ion-refresher slot="fixed" [disabled]="activityComponent?.showLoading" (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
diff --git a/src/addons/mod/chat/components/index/addon-mod-chat-index.html b/src/addons/mod/chat/components/index/addon-mod-chat-index.html
index e9c2590d3..6e928b3fe 100644
--- a/src/addons/mod/chat/components/index/addon-mod-chat-index.html
+++ b/src/addons/mod/chat/components/index/addon-mod-chat-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="!showLoading" class="safe-area-padding list-item-limited-width">
+<core-loading [hideUntil]="!showLoading">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
diff --git a/src/addons/mod/chat/pages/chat/chat.html b/src/addons/mod/chat/pages/chat/chat.html
index 92e022753..cc3112b5b 100644
--- a/src/addons/mod/chat/pages/chat/chat.html
+++ b/src/addons/mod/chat/pages/chat/chat.html
@@ -16,8 +16,8 @@
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
-<ion-content class="has-footer">
-    <core-loading [hideUntil]="loaded" class="safe-area-padding">
+<ion-content>
+    <core-loading [hideUntil]="loaded">
         <ion-list class="addon-messages-discussion-container" aria-live="polite">
             <ng-container *ngFor="let message of messages; index as index; last as last">
 
diff --git a/src/addons/mod/chat/pages/index/index.html b/src/addons/mod/chat/pages/index/index.html
index bc5f254eb..5f2cec7ce 100644
--- a/src/addons/mod/chat/pages/index/index.html
+++ b/src/addons/mod/chat/pages/index/index.html
@@ -14,7 +14,7 @@
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
-<ion-content>
+<ion-content class="limited-width">
     <ion-refresher slot="fixed" [disabled]="activityComponent?.showLoading" (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
diff --git a/src/addons/mod/chat/pages/session-messages/session-messages.html b/src/addons/mod/chat/pages/session-messages/session-messages.html
index 501e76cf8..9e18962a8 100644
--- a/src/addons/mod/chat/pages/session-messages/session-messages.html
+++ b/src/addons/mod/chat/pages/session-messages/session-messages.html
@@ -12,7 +12,7 @@
     <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="refreshMessages($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <core-loading [hideUntil]="loaded" class="safe-area-padding">
+    <core-loading [hideUntil]="loaded">
         <ion-list class="addon-messages-discussion-container">
             <ng-container *ngFor="let message of messages; index as index;">
 
diff --git a/src/addons/mod/choice/components/index/addon-mod-choice-index.html b/src/addons/mod/choice/components/index/addon-mod-choice-index.html
index cc554ee45..19cea320a 100644
--- a/src/addons/mod/choice/components/index/addon-mod-choice-index.html
+++ b/src/addons/mod/choice/components/index/addon-mod-choice-index.html
@@ -7,66 +7,63 @@
 
 <!-- Content. -->
 <core-loading [hideUntil]="!showLoading">
-    <div class="list-item-limited-width">
-        <!-- Activity info. -->
-        <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
-            [courseId]="courseId" [hasDataToSync]="hasOffline" (completionChanged)="onCompletionChange()">
-        </core-course-module-info>
+    <!-- Activity info. -->
+    <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
+        [courseId]="courseId" [hasDataToSync]="hasOffline" (completionChanged)="onCompletionChange()">
+    </core-course-module-info>
 
-        <!-- Activity availability messages -->
-        <ion-card class="core-info-card" *ngIf="choiceNotOpenYet">
-            <ion-item>
-                <ion-icon name="fas-info-circle" slot="start" aria-hidden="true"></ion-icon>
+    <!-- Activity availability messages -->
+    <ion-card class="core-info-card" *ngIf="choiceNotOpenYet">
+        <ion-item>
+            <ion-icon name="fas-info-circle" slot="start" aria-hidden="true"></ion-icon>
+            <ion-label>
+                <p *ngIf="options.length">{{ 'addon.mod_choice.previewonly' | translate:{$a: openTimeReadable} }}</p>
+                <p *ngIf="!options.length">{{ 'addon.mod_choice.notopenyet' | translate:{$a: openTimeReadable} }}</p>
+            </ion-label>
+        </ion-item>
+    </ion-card>
+
+    <ion-card class="core-info-card" *ngIf="choiceClosed">
+        <ion-item>
+            <ion-icon name="fas-info-circle" slot="start" aria-hidden="true"></ion-icon>
+            <ion-label>
+                <p *ngIf="options.length">
+                    {{ 'addon.mod_choice.yourselection' | translate }}
+                    <core-format-text [text]="options[0].text" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
+                    </core-format-text>
+                </p>
+                <p>{{ 'addon.mod_choice.expired' | translate:{$a: closeTimeReadable} }}</p>
+            </ion-label>
+        </ion-item>
+    </ion-card>
+
+    <!-- Inform what will happen with the choices. -->
+    <ion-card class="core-info-card" *ngIf="canEdit && publishInfo && options.length">
+        <ion-item>
+            <ion-icon name="fas-info-circle" slot="start" aria-hidden="true"></ion-icon>
+            <ion-label>{{ publishInfo | translate }}</ion-label>
+        </ion-item>
+    </ion-card>
+
+    <!-- Choice options -->
+    <ion-card *ngIf="options.length && choice">
+        <ng-container *ngIf="choice.allowmultiple">
+            <ion-item class="ion-text-wrap" *ngFor="let option of options">
                 <ion-label>
-                    <p *ngIf="options.length">{{ 'addon.mod_choice.previewonly' | translate:{$a: openTimeReadable} }}</p>
-                    <p *ngIf="!options.length">{{ 'addon.mod_choice.notopenyet' | translate:{$a: openTimeReadable} }}</p>
+                    <ng-container *ngTemplateOutlet="optionLabelTemplate; context: {option: option}"></ng-container>
                 </ion-label>
+                <ion-checkbox slot="end" [(ngModel)]="option.checked" [disabled]="option.disabled || !canEdit"></ion-checkbox>
             </ion-item>
-        </ion-card>
-
-        <ion-card class="core-info-card" *ngIf="choiceClosed">
-            <ion-item>
-                <ion-icon name="fas-info-circle" slot="start" aria-hidden="true"></ion-icon>
+        </ng-container>
+        <ion-radio-group *ngIf="!choice.allowmultiple" [(ngModel)]="selectedOption.id">
+            <ion-item class="ion-text-wrap" *ngFor="let option of options">
                 <ion-label>
-                    <p *ngIf="options.length">
-                        {{ 'addon.mod_choice.yourselection' | translate }}
-                        <core-format-text [text]="options[0].text" contextLevel="module" [contextInstanceId]="module.id"
-                            [courseId]="courseId">
-                        </core-format-text>
-                    </p>
-                    <p>{{ 'addon.mod_choice.expired' | translate:{$a: closeTimeReadable} }}</p>
+                    <ng-container *ngTemplateOutlet="optionLabelTemplate; context: {option: option}"></ng-container>
                 </ion-label>
+                <ion-radio slot="end" [value]="option.id" [disabled]="option.disabled || !canEdit"></ion-radio>
             </ion-item>
-        </ion-card>
-
-        <!-- Inform what will happen with the choices. -->
-        <ion-card class="core-info-card" *ngIf="canEdit && publishInfo && options.length">
-            <ion-item>
-                <ion-icon name="fas-info-circle" slot="start" aria-hidden="true"></ion-icon>
-                <ion-label>{{ publishInfo | translate }}</ion-label>
-            </ion-item>
-        </ion-card>
-
-        <!-- Choice options -->
-        <ion-card *ngIf="options.length && choice">
-            <ng-container *ngIf="choice.allowmultiple">
-                <ion-item class="ion-text-wrap" *ngFor="let option of options">
-                    <ion-label>
-                        <ng-container *ngTemplateOutlet="optionLabelTemplate; context: {option: option}"></ng-container>
-                    </ion-label>
-                    <ion-checkbox slot="end" [(ngModel)]="option.checked" [disabled]="option.disabled || !canEdit"></ion-checkbox>
-                </ion-item>
-            </ng-container>
-            <ion-radio-group *ngIf="!choice.allowmultiple" [(ngModel)]="selectedOption.id">
-                <ion-item class="ion-text-wrap" *ngFor="let option of options">
-                    <ion-label>
-                        <ng-container *ngTemplateOutlet="optionLabelTemplate; context: {option: option}"></ng-container>
-                    </ion-label>
-                    <ion-radio slot="end" [value]="option.id" [disabled]="option.disabled || !canEdit"></ion-radio>
-                </ion-item>
-            </ion-radio-group>
-        </ion-card>
-    </div>
+        </ion-radio-group>
+    </ion-card>
     <!-- Choice results -->
     <div *ngIf="canSeeResults && choice">
         <ion-item-divider>
diff --git a/src/addons/mod/choice/pages/index/index.html b/src/addons/mod/choice/pages/index/index.html
index b5a04c2a6..82d3899af 100644
--- a/src/addons/mod/choice/pages/index/index.html
+++ b/src/addons/mod/choice/pages/index/index.html
@@ -14,7 +14,7 @@
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
-<ion-content>
+<ion-content class="limited-width">
     <ion-refresher slot="fixed" [disabled]="activityComponent?.showLoading" (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
diff --git a/src/addons/mod/data/components/index/addon-mod-data-index.html b/src/addons/mod/data/components/index/addon-mod-data-index.html
index d8eef7e45..6a6b4724f 100644
--- a/src/addons/mod/data/components/index/addon-mod-data-index.html
+++ b/src/addons/mod/data/components/index/addon-mod-data-index.html
@@ -18,7 +18,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="!showLoading" class="list-item-limited-width">
+<core-loading [hideUntil]="!showLoading">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
diff --git a/src/addons/mod/data/pages/entry/entry.html b/src/addons/mod/data/pages/entry/entry.html
index 72c1598a7..a7be272a4 100644
--- a/src/addons/mod/data/pages/entry/entry.html
+++ b/src/addons/mod/data/pages/entry/entry.html
@@ -11,13 +11,12 @@
         </ion-title>
     </ion-toolbar>
 </ion-header>
-<ion-content>
+<ion-content class="limited-width">
     <ion-refresher slot="fixed" [disabled]="!entryLoaded || !(isPullingToRefresh || !renderingEntry && !loadingRating && !loadingComments)"
         (ionRefresh)="refreshDatabase($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <core-loading [hideUntil]="entryLoaded && (isPullingToRefresh || !renderingEntry && !loadingRating && !loadingComments)"
-        class="list-item-limited-width">
+    <core-loading [hideUntil]="entryLoaded && (isPullingToRefresh || !renderingEntry && !loadingRating && !loadingComments)">
         <!-- Database entries found to be synchronized -->
         <ion-card class="core-warning-card" *ngIf="entry && entry.hasOffline">
             <ion-item>
diff --git a/src/addons/mod/data/pages/index/index.html b/src/addons/mod/data/pages/index/index.html
index ff9ed701e..4d0cd6995 100644
--- a/src/addons/mod/data/pages/index/index.html
+++ b/src/addons/mod/data/pages/index/index.html
@@ -15,7 +15,7 @@
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
-<ion-content>
+<ion-content class="limited-width">
     <ion-refresher slot="fixed" [disabled]="activityComponent?.showLoading" (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
diff --git a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
index 38fab03e8..8a72abe19 100644
--- a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
+++ b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="!showLoading" class="list-item-limited-width">
+<core-loading [hideUntil]="!showLoading">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
diff --git a/src/addons/mod/feedback/pages/form/form.html b/src/addons/mod/feedback/pages/form/form.html
index 597335624..6ca2f58d8 100644
--- a/src/addons/mod/feedback/pages/form/form.html
+++ b/src/addons/mod/feedback/pages/form/form.html
@@ -11,8 +11,8 @@
         </ion-title>
     </ion-toolbar>
 </ion-header>
-<ion-content>
-    <core-loading [hideUntil]="feedbackLoaded" class="has-spacer list-item-limited-width">
+<ion-content class="limited-width">
+    <core-loading [hideUntil]="feedbackLoaded" class="has-spacer">
         <ng-container *ngIf="items && items.length">
             <ion-list class="ion-no-margin has-spacer">
                 <ion-item class="ion-text-wrap">
diff --git a/src/addons/mod/feedback/pages/index/index.html b/src/addons/mod/feedback/pages/index/index.html
index 6996000e4..091b40c1c 100644
--- a/src/addons/mod/feedback/pages/index/index.html
+++ b/src/addons/mod/feedback/pages/index/index.html
@@ -14,7 +14,7 @@
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
-<ion-content>
+<ion-content class="limited-width">
     <ion-refresher slot="fixed" [disabled]="activityComponent?.showLoading" (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
diff --git a/src/addons/mod/folder/components/index/addon-mod-folder-index.html b/src/addons/mod/folder/components/index/addon-mod-folder-index.html
index d9e0cf63d..eea0df71e 100644
--- a/src/addons/mod/folder/components/index/addon-mod-folder-index.html
+++ b/src/addons/mod/folder/components/index/addon-mod-folder-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="!showLoading" class="list-item-limited-width">
+<core-loading [hideUntil]="!showLoading">
 
     <!-- Activity info. -->
     <core-course-module-info *ngIf="!subfolder" [module]="module" [description]="description" [component]="component"
diff --git a/src/addons/mod/folder/pages/index/index.html b/src/addons/mod/folder/pages/index/index.html
index b83a186f5..66812df13 100644
--- a/src/addons/mod/folder/pages/index/index.html
+++ b/src/addons/mod/folder/pages/index/index.html
@@ -15,7 +15,7 @@
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
-<ion-content>
+<ion-content class="limited-width">
     <ion-refresher slot="fixed" [disabled]="subfolder || activityComponent?.showLoading"
         (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
diff --git a/src/addons/mod/forum/components/post-options-menu/post-options-menu.scss b/src/addons/mod/forum/components/post-options-menu/post-options-menu.scss
index 4ef3e574f..c09597ff5 100644
--- a/src/addons/mod/forum/components/post-options-menu/post-options-menu.scss
+++ b/src/addons/mod/forum/components/post-options-menu/post-options-menu.scss
@@ -1,11 +1,4 @@
-:host {
-    core-loading:not(.core-loading-loaded) > .core-loading-container {
-        position: relative !important;
-        padding-top: 10px !important;
-        padding-bottom: 10px !important;
-        overflow: hidden;
-    }
-    core-loading > .core-loading-container .core-loading-message {
-        display: none;
-    }
+core-loading {
+    --loading-inline-min-height: 48px;
+    --loading-display-message: none;
 }
diff --git a/src/addons/mod/forum/pages/discussion/discussion.html b/src/addons/mod/forum/pages/discussion/discussion.html
index 37157efb5..542fefeda 100644
--- a/src/addons/mod/forum/pages/discussion/discussion.html
+++ b/src/addons/mod/forum/pages/discussion/discussion.html
@@ -55,12 +55,12 @@
         </core-context-menu-item>
     </core-context-menu>
 </core-navbar-buttons>
-<ion-content [core-swipe-navigation]="discussions">
+<ion-content [core-swipe-navigation]="discussions" class="limited-width">
     <ion-refresher slot="fixed" [disabled]="!discussionLoaded" (ionRefresh)="doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
-    <core-loading [hideUntil]="discussionLoaded" class="list-item-limited-width">
+    <core-loading [hideUntil]="discussionLoaded">
         <!-- Discussion replies found to be synchronized -->
         <ion-card class="core-warning-card" *ngIf="postHasOffline || hasOfflineRatings">
             <ion-item>
diff --git a/src/addons/mod/glossary/pages/entry/entry.html b/src/addons/mod/glossary/pages/entry/entry.html
index 3965b0f64..ee112af6e 100644
--- a/src/addons/mod/glossary/pages/entry/entry.html
+++ b/src/addons/mod/glossary/pages/entry/entry.html
@@ -11,12 +11,12 @@
         </ion-title>
     </ion-toolbar>
 </ion-header>
-<ion-content [core-swipe-navigation]="entries">
+<ion-content [core-swipe-navigation]="entries" class="limited-width">
     <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
-    <core-loading [hideUntil]="loaded" class="list-item-limited-width">
+    <core-loading [hideUntil]="loaded">
         <ng-container *ngIf="entry && loaded">
             <ion-item class="ion-text-wrap" *ngIf="showAuthor">
                 <core-user-avatar [user]="entry" slot="start"></core-user-avatar>
diff --git a/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html b/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
index f12d47baf..41245df1a 100644
--- a/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
+++ b/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
@@ -16,7 +16,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="!showLoading" class="safe-area-padding">
+<core-loading [hideUntil]="!showLoading">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
diff --git a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
index 67c59580d..183e62461 100644
--- a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
+++ b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="!showLoading" class="safe-area-padding list-item-limited-width">
+<core-loading [hideUntil]="!showLoading">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
diff --git a/src/addons/mod/imscp/pages/index/index.html b/src/addons/mod/imscp/pages/index/index.html
index 712346154..12b3a7f08 100644
--- a/src/addons/mod/imscp/pages/index/index.html
+++ b/src/addons/mod/imscp/pages/index/index.html
@@ -15,6 +15,6 @@
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
-<ion-content>
+<ion-content class="limited-width">
     <addon-mod-imscp-index [module]="module" [courseId]="courseId" (dataRetrieved)="updateData($event)"></addon-mod-imscp-index>
 </ion-content>
diff --git a/src/addons/mod/imscp/pages/view/view.html b/src/addons/mod/imscp/pages/view/view.html
index 0611d34f8..e37142791 100644
--- a/src/addons/mod/imscp/pages/view/view.html
+++ b/src/addons/mod/imscp/pages/view/view.html
@@ -19,7 +19,7 @@
 </ion-header>
 <ion-content>
     <!-- Content. -->
-    <core-loading [hideUntil]="loaded" class="safe-area-padding core-loading-full-height">
+    <core-loading [hideUntil]="loaded">
 
         <ion-card class="core-warning-card" *ngIf="warning">
             <ion-item>
diff --git a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
index ea987e830..d039f0303 100644
--- a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
+++ b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="!showLoading" class="list-item-limited-width">
+<core-loading [hideUntil]="!showLoading">
     <core-tabs [hideUntil]="!showLoading" [selectedIndex]="selectedTab">
         <!-- Index/Preview tab. -->
         <core-tab [title]="'addon.mod_lesson.preview' | translate" (ionSelect)="indexSelected()">
diff --git a/src/addons/mod/lesson/pages/index/index.html b/src/addons/mod/lesson/pages/index/index.html
index fec01e323..f83508304 100644
--- a/src/addons/mod/lesson/pages/index/index.html
+++ b/src/addons/mod/lesson/pages/index/index.html
@@ -14,7 +14,7 @@
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
-<ion-content>
+<ion-content class="limited-width">
     <ion-refresher slot="fixed" [disabled]="activityComponent?.showLoading" (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
diff --git a/src/addons/mod/lesson/pages/player/player.html b/src/addons/mod/lesson/pages/player/player.html
index 90b910843..f0a46750e 100644
--- a/src/addons/mod/lesson/pages/player/player.html
+++ b/src/addons/mod/lesson/pages/player/player.html
@@ -17,8 +17,8 @@
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
-<ion-content>
-    <core-loading [hideUntil]="loaded" class="list-item-limited-width">
+<ion-content class="limited-width">
+    <core-loading [hideUntil]="loaded">
         <!-- Info messages. Only show the first one. -->
         <ion-card class="core-info-card" *ngIf="lesson && messages?.length">
             <ion-item class="ion-text-wrap">
diff --git a/src/addons/mod/lesson/pages/user-retake/user-retake.html b/src/addons/mod/lesson/pages/user-retake/user-retake.html
index 722c6a495..41e59c571 100644
--- a/src/addons/mod/lesson/pages/user-retake/user-retake.html
+++ b/src/addons/mod/lesson/pages/user-retake/user-retake.html
@@ -8,12 +8,12 @@
         </ion-title>
     </ion-toolbar>
 </ion-header>
-<ion-content>
+<ion-content class="limited-width">
     <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
-    <core-loading [hideUntil]="loaded" class="list-item-limited-width">
+    <core-loading [hideUntil]="loaded">
         <div *ngIf="student">
             <!-- Student data. -->
             <ion-item class="ion-text-wrap" core-user-link [userId]="student.id" [courseId]="courseId" [attr.aria-label]="student.fullname">
diff --git a/src/addons/mod/lti/components/index/addon-mod-lti-index.html b/src/addons/mod/lti/components/index/addon-mod-lti-index.html
index 1a9fb4164..db82dfce0 100644
--- a/src/addons/mod/lti/components/index/addon-mod-lti-index.html
+++ b/src/addons/mod/lti/components/index/addon-mod-lti-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="!showLoading" class="safe-area-padding list-item-limited-width">
+<core-loading [hideUntil]="!showLoading">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="displayDescription && description" [component]="component"
diff --git a/src/addons/mod/lti/pages/index/index.html b/src/addons/mod/lti/pages/index/index.html
index 38ce5fc89..566f57401 100644
--- a/src/addons/mod/lti/pages/index/index.html
+++ b/src/addons/mod/lti/pages/index/index.html
@@ -15,7 +15,7 @@
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
-<ion-content>
+<ion-content class="limited-width">
     <ion-refresher slot="fixed" [disabled]="activityComponent?.showLoading" (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
diff --git a/src/addons/mod/page/components/index/addon-mod-page-index.html b/src/addons/mod/page/components/index/addon-mod-page-index.html
index b93d43391..c629090b0 100644
--- a/src/addons/mod/page/components/index/addon-mod-page-index.html
+++ b/src/addons/mod/page/components/index/addon-mod-page-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="!showLoading" class="safe-area-padding list-item-limited-width">
+<core-loading [hideUntil]="!showLoading">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="displayDescription && description" [component]="component"
diff --git a/src/addons/mod/page/components/index/index.scss b/src/addons/mod/page/components/index/index.scss
deleted file mode 100644
index f769c305d..000000000
--- a/src/addons/mod/page/components/index/index.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-/* Solves iframe height */
-.core-loading-content > div[padding] {
-    height: 100%;
-}
-
-core-format-text > .no-overflow {
-    display: inline;
-}
diff --git a/src/addons/mod/page/components/index/index.ts b/src/addons/mod/page/components/index/index.ts
index dd9dc2ff7..37d2f0b8e 100644
--- a/src/addons/mod/page/components/index/index.ts
+++ b/src/addons/mod/page/components/index/index.ts
@@ -27,7 +27,6 @@ import { AddonModPageHelper } from '../../services/page-helper';
 @Component({
     selector: 'addon-mod-page-index',
     templateUrl: 'addon-mod-page-index.html',
-    styleUrls: ['index.scss'],
 })
 export class AddonModPageIndexComponent extends CoreCourseModuleMainResourceComponent implements OnInit {
 
diff --git a/src/addons/mod/page/pages/index/index.html b/src/addons/mod/page/pages/index/index.html
index fc6dc2f86..8cc1affc1 100644
--- a/src/addons/mod/page/pages/index/index.html
+++ b/src/addons/mod/page/pages/index/index.html
@@ -14,7 +14,7 @@
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
-<ion-content>
+<ion-content class="limited-width">
     <ion-refresher slot="fixed" [disabled]="activityComponent?.showLoading" (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
diff --git a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
index a8b1b7988..d8feca57d 100644
--- a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
+++ b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="!showLoading" class="list-item-limited-width">
+<core-loading [hideUntil]="!showLoading">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
diff --git a/src/addons/mod/quiz/pages/attempt/attempt.html b/src/addons/mod/quiz/pages/attempt/attempt.html
index 3df9ad96f..e7dfbdead 100644
--- a/src/addons/mod/quiz/pages/attempt/attempt.html
+++ b/src/addons/mod/quiz/pages/attempt/attempt.html
@@ -12,11 +12,11 @@
         </ion-title>
     </ion-toolbar>
 </ion-header>
-<ion-content>
+<ion-content class="limited-width">
     <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <core-loading [hideUntil]="loaded" class="list-item-limited-width">
+    <core-loading [hideUntil]="loaded">
         <ion-list *ngIf="attempt">
             <ion-item class="ion-text-wrap">
                 <ion-label>
diff --git a/src/addons/mod/quiz/pages/index/index.html b/src/addons/mod/quiz/pages/index/index.html
index 233973f4f..83bd934c9 100644
--- a/src/addons/mod/quiz/pages/index/index.html
+++ b/src/addons/mod/quiz/pages/index/index.html
@@ -15,7 +15,7 @@
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
-<ion-content>
+<ion-content class="limited-width">
     <ion-refresher slot="fixed" [disabled]="activityComponent?.showLoading" (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
diff --git a/src/addons/mod/quiz/pages/player/player.html b/src/addons/mod/quiz/pages/player/player.html
index 9e787ecaf..d74bcc8b2 100644
--- a/src/addons/mod/quiz/pages/player/player.html
+++ b/src/addons/mod/quiz/pages/player/player.html
@@ -30,8 +30,8 @@
         </ion-title>
     </ion-toolbar>
 </ion-header>
-<ion-content>
-    <core-loading [hideUntil]="loaded" class="has-spacer list-item-limited-width">
+<ion-content class="limited-width">
+    <core-loading [hideUntil]="loaded" class="has-spacer">
         <!-- Button to start attempting. -->
         <ion-button *ngIf="!attempt" expand="block" class="ion-margin" (click)="start()">
             {{ 'addon.mod_quiz.startattempt' | translate }}
diff --git a/src/addons/mod/quiz/pages/review/review.html b/src/addons/mod/quiz/pages/review/review.html
index 43fc2206f..0ab6d7c5d 100644
--- a/src/addons/mod/quiz/pages/review/review.html
+++ b/src/addons/mod/quiz/pages/review/review.html
@@ -15,11 +15,11 @@
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
-<ion-content>
+<ion-content class="limited-width">
     <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="refreshData($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <core-loading [hideUntil]="loaded" class="list-item-limited-width">
+    <core-loading [hideUntil]="loaded">
 
         <!-- Review summary -->
         <ion-card *ngIf="attempt">
diff --git a/src/addons/mod/resource/components/index/addon-mod-resource-index.html b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
index fd4d8b5b5..213d21523 100644
--- a/src/addons/mod/resource/components/index/addon-mod-resource-index.html
+++ b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="!showLoading" class="safe-area-padding core-loading-full-height list-item-limited-width">
+<core-loading [hideUntil]="!showLoading">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [courseId]="courseId" [description]="displayDescription && description"
diff --git a/src/addons/mod/resource/pages/index/index.html b/src/addons/mod/resource/pages/index/index.html
index 4bfe3e2a6..8413a0de5 100644
--- a/src/addons/mod/resource/pages/index/index.html
+++ b/src/addons/mod/resource/pages/index/index.html
@@ -15,7 +15,7 @@
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
-<ion-content>
+<ion-content class="limited-width">
     <ion-refresher slot="fixed" [disabled]="activityComponent?.showLoading || activityComponent?.mode == 'iframe'"
         (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
diff --git a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
index 5d3f06b43..d2b0c257f 100644
--- a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
+++ b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="!showLoading" class="safe-area-padding list-item-limited-width">
+<core-loading [hideUntil]="!showLoading">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
diff --git a/src/addons/mod/scorm/pages/index/index.html b/src/addons/mod/scorm/pages/index/index.html
index 00e1aa739..837e79cfb 100644
--- a/src/addons/mod/scorm/pages/index/index.html
+++ b/src/addons/mod/scorm/pages/index/index.html
@@ -14,7 +14,7 @@
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
-<ion-content>
+<ion-content class="limited-width">
     <ion-refresher slot="fixed" [disabled]="activityComponent?.showLoading" (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
diff --git a/src/addons/mod/scorm/pages/player/player.html b/src/addons/mod/scorm/pages/player/player.html
index 343397a9b..85093fb51 100644
--- a/src/addons/mod/scorm/pages/player/player.html
+++ b/src/addons/mod/scorm/pages/player/player.html
@@ -20,7 +20,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <core-loading [hideUntil]="loaded" class="core-loading-full-height">
+    <core-loading [hideUntil]="loaded">
         <core-iframe *ngIf="loaded && src" [src]="src" [iframeWidth]="scormWidth" [iframeHeight]="scormHeight"
             [showFullscreenOnToolbar]="true" [autoFullscreenOnRotate]="true">
         </core-iframe>
diff --git a/src/addons/mod/survey/components/index/addon-mod-survey-index.html b/src/addons/mod/survey/components/index/addon-mod-survey-index.html
index b4370e1f6..6d04fab7c 100644
--- a/src/addons/mod/survey/components/index/addon-mod-survey-index.html
+++ b/src/addons/mod/survey/components/index/addon-mod-survey-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="!showLoading" class="safe-area-padding list-item-limited-width">
+<core-loading [hideUntil]="!showLoading">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="survey && !survey.surveydone && !hasOffline && description"
diff --git a/src/addons/mod/survey/pages/index/index.html b/src/addons/mod/survey/pages/index/index.html
index 02673c75d..38ed35fea 100644
--- a/src/addons/mod/survey/pages/index/index.html
+++ b/src/addons/mod/survey/pages/index/index.html
@@ -14,7 +14,7 @@
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
-<ion-content>
+<ion-content class="limited-width">
     <ion-refresher slot="fixed" [disabled]="activityComponent?.showLoading" (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
diff --git a/src/addons/mod/url/components/index/addon-mod-url-index.html b/src/addons/mod/url/components/index/addon-mod-url-index.html
index 6b29fa18c..0e7fa1baa 100644
--- a/src/addons/mod/url/components/index/addon-mod-url-index.html
+++ b/src/addons/mod/url/components/index/addon-mod-url-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="!showLoading" class="list-item-limited-width">
+<core-loading [hideUntil]="!showLoading">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="displayDescription && description" [component]="component"
diff --git a/src/addons/mod/url/pages/index/index.html b/src/addons/mod/url/pages/index/index.html
index f940549ef..5de9e34ee 100644
--- a/src/addons/mod/url/pages/index/index.html
+++ b/src/addons/mod/url/pages/index/index.html
@@ -14,7 +14,7 @@
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
-<ion-content>
+<ion-content class="limited-width">
     <ion-refresher slot="fixed" [disabled]="activityComponent?.showLoading" (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
diff --git a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
index f4fd30532..4c220849f 100644
--- a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
+++ b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
@@ -27,7 +27,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="!showLoading" class="list-item-limited-width">
+<core-loading [hideUntil]="!showLoading">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
diff --git a/src/addons/mod/wiki/pages/index/index.html b/src/addons/mod/wiki/pages/index/index.html
index 0c013169c..fd6c31ce6 100644
--- a/src/addons/mod/wiki/pages/index/index.html
+++ b/src/addons/mod/wiki/pages/index/index.html
@@ -15,7 +15,7 @@
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
-<ion-content>
+<ion-content class="limited-width">
     <ion-refresher slot="fixed" [disabled]="activityComponent?.showLoading" (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
diff --git a/src/addons/mod/workshop/components/assessment/addon-mod-workshop-assessment.html b/src/addons/mod/workshop/components/assessment/addon-mod-workshop-assessment.html
index 90e393f77..8c0388f09 100644
--- a/src/addons/mod/workshop/components/assessment/addon-mod-workshop-assessment.html
+++ b/src/addons/mod/workshop/components/assessment/addon-mod-workshop-assessment.html
@@ -1,4 +1,4 @@
-<core-loading [hideUntil]="loaded" class="list-item-limited-width">
+<core-loading [hideUntil]="loaded">
     <ion-item class="ion-text-wrap" [detail]="canViewAssessment && !canSelfAssess" (click)="gotoAssessment($event)"
         [button]="canViewAssessment && !canSelfAssess">
         <core-user-avatar [user]="profile" slot="start" [courseId]="courseId" [userId]="profile?.id"></core-user-avatar>
diff --git a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
index 9ccdc53bc..9b98b2660 100644
--- a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
+++ b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
@@ -6,7 +6,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="!showLoading" class="list-item-limited-width">
+<core-loading [hideUntil]="!showLoading">
 
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [hasDataToSync]="hasOffline" (completionChanged)="onCompletionChange()">
diff --git a/src/addons/mod/workshop/components/submission/addon-mod-workshop-submission.html b/src/addons/mod/workshop/components/submission/addon-mod-workshop-submission.html
index ee7f08609..f69d312a9 100644
--- a/src/addons/mod/workshop/components/submission/addon-mod-workshop-submission.html
+++ b/src/addons/mod/workshop/components/submission/addon-mod-workshop-submission.html
@@ -1,4 +1,4 @@
-<core-loading [hideUntil]="loaded" class="list-item-limited-width">
+<core-loading [hideUntil]="loaded">
     <div *ngIf="!summary">
         <ion-item class="ion-text-wrap addon-workshop-submission-title">
             <core-user-avatar [user]="profile" [courseId]="courseId" [userId]="profile?.id" slot="start">
diff --git a/src/addons/mod/workshop/pages/index/index.html b/src/addons/mod/workshop/pages/index/index.html
index c9fdc573a..b28ffdd39 100644
--- a/src/addons/mod/workshop/pages/index/index.html
+++ b/src/addons/mod/workshop/pages/index/index.html
@@ -14,7 +14,7 @@
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
-<ion-content>
+<ion-content class="limited-width">
     <ion-refresher slot="fixed" [disabled]="activityComponent?.showLoading" (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
diff --git a/src/addons/mod/workshop/pages/submission/submission.html b/src/addons/mod/workshop/pages/submission/submission.html
index 754b7456a..294fdb3af 100644
--- a/src/addons/mod/workshop/pages/submission/submission.html
+++ b/src/addons/mod/workshop/pages/submission/submission.html
@@ -20,7 +20,7 @@
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
-<ion-content>
+<ion-content class="limited-width">
     <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="refreshSubmission($event.target)"
         *ngIf="!((assessmentId && access.assessingallowed) || canAddFeedback)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
diff --git a/src/addons/notes/pages/list/list.html b/src/addons/notes/pages/list/list.html
index db1ee143d..6c58feff3 100644
--- a/src/addons/notes/pages/list/list.html
+++ b/src/addons/notes/pages/list/list.html
@@ -25,12 +25,12 @@
             [closeOnClick]="false"></core-context-menu-item>
     </core-context-menu>
 </core-navbar-buttons>
-<ion-content>
+<ion-content class="limited-width">
     <ion-refresher slot="fixed" [disabled]="!notesLoaded" (ionRefresh)="refreshNotes(false, $event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
-    <core-loading [hideUntil]="notesLoaded" class="list-item-limited-width">
+    <core-loading [hideUntil]="notesLoaded">
         <ion-item class="ion-text-wrap" *ngIf="user">
             <core-user-avatar [user]="user" [courseId]="courseId" slot="start" [linkProfile]="false"></core-user-avatar>
             <ion-label>
diff --git a/src/addons/privatefiles/pages/index/index.html b/src/addons/privatefiles/pages/index/index.html
index a3555462f..ec245c9cd 100644
--- a/src/addons/privatefiles/pages/index/index.html
+++ b/src/addons/privatefiles/pages/index/index.html
@@ -8,13 +8,13 @@
         </ion-title>
     </ion-toolbar>
 </ion-header>
-<ion-content>
+<ion-content class="limited-width">
     <ion-refresher slot="fixed" [disabled]="!filesLoaded || (!showPrivateFiles && !showSiteFiles)"
         (ionRefresh)="refreshData($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
-    <core-loading [hideUntil]="filesLoaded" *ngIf="showPrivateFiles || showSiteFiles" class="list-item-limited-width">
+    <core-loading [hideUntil]="filesLoaded" *ngIf="showPrivateFiles || showSiteFiles">
         <!-- Allow selecting the files to see: private or site. -->
         <core-combobox [selection]="root" (onChange)="rootChanged($event)" *ngIf="showPrivateFiles && showSiteFiles && !path">
             <ion-select-option class="ion-text-wrap" value="my">
diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.html b/src/addons/storagemanager/pages/course-storage/course-storage.html
index 35b3f2b8f..b6353dd6c 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.html
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.html
@@ -8,8 +8,8 @@
         </ion-title>
     </ion-toolbar>
 </ion-header>
-<ion-content>
-    <core-loading [hideUntil]="loaded" class="list-item-limited-width">
+<ion-content class="limited-width">
+    <core-loading [hideUntil]="loaded">
         <ion-item class="ion-text-wrap">
             <ion-label>
                 <p>{{ 'addon.storagemanager.courseinfo' | translate }}</p>
diff --git a/src/addons/storagemanager/pages/courses-storage/courses-storage.html b/src/addons/storagemanager/pages/courses-storage/courses-storage.html
index 4c4f3217f..a0d9bc1eb 100644
--- a/src/addons/storagemanager/pages/courses-storage/courses-storage.html
+++ b/src/addons/storagemanager/pages/courses-storage/courses-storage.html
@@ -8,8 +8,8 @@
         </ion-title>
     </ion-toolbar>
 </ion-header>
-<ion-content>
-    <core-loading [hideUntil]="loaded" class="list-item-limited-width">
+<ion-content class="limited-width">
+    <core-loading [hideUntil]="loaded">
         <div class="ion-padding-horizontal ion-text-wrap" *ngIf="spaceUsage">
             <h2>{{ 'addon.storagemanager.alldata' | translate }}</h2>
         </div>
diff --git a/src/core/components/attachments/attachments.scss b/src/core/components/attachments/attachments.scss
index 4582f0e2b..c6955211f 100644
--- a/src/core/components/attachments/attachments.scss
+++ b/src/core/components/attachments/attachments.scss
@@ -1,5 +1,3 @@
-:host {
-    core-loading {
-        --loading-inline-min-height: 60px;
-    }
+core-loading {
+    --loading-inline-min-height: 60px;
 }
diff --git a/src/core/components/iframe/core-iframe.html b/src/core/components/iframe/core-iframe.html
index e9664f6d3..28ce77c89 100644
--- a/src/core/components/iframe/core-iframe.html
+++ b/src/core/components/iframe/core-iframe.html
@@ -1,5 +1,4 @@
-<div [class.core-loading-container]="loading || !safeUrl" [ngStyle]="{'width': iframeWidth, 'height': iframeHeight}">
-
+<core-loading [hideUntil]="!loading && safeUrl">
     <core-navbar-buttons slot="end" prepend *ngIf="initialized && showFullscreenOnToolbar">
         <ion-button fill="clear" (click)="toggleFullscreen()"
             [attr.aria-label]="(fullscreen ? 'core.disablefullscreen' : 'core.fullscreen') | translate">
@@ -17,8 +16,4 @@
         class="core-button-as-link core-iframe-help">
         {{ 'core.iframehelp' | translate }}
     </ion-button>
-
-    <span class="core-loading-spinner">
-        <ion-spinner *ngIf="loading" [attr.aria-label]="'core.loading' | translate"></ion-spinner>
-    </span>
-</div>
+</core-loading>
diff --git a/src/core/components/iframe/iframe.scss b/src/core/components/iframe/iframe.scss
index 23c1cfd68..bc8a94691 100644
--- a/src/core/components/iframe/iframe.scss
+++ b/src/core/components/iframe/iframe.scss
@@ -9,27 +9,6 @@
         max-width: 100%;
         background-color: var(--ion-background-color);
     }
-
-    .core-loading-container {
-        position: absolute;
-        top: 0;
-        bottom: 0;
-        left: 0;
-        right: 0;
-        display: table;
-        height: 100%;
-        width: 100%;
-        z-index: 1;
-        margin: 0;
-        padding: 0;
-        clear: both;
-
-        .core-loading-spinner {
-            display: table-cell;
-            text-align: center;
-            vertical-align: middle;
-        }
-    }
 }
 
 :host-context(.core-iframe-fullscreen) {
diff --git a/src/core/features/course/format/singleactivity/components/core-course-format-single-activity.html b/src/core/features/course/format/singleactivity/components/core-course-format-single-activity.html
index aa42eeadb..1e960e8a8 100644
--- a/src/core/features/course/format/singleactivity/components/core-course-format-single-activity.html
+++ b/src/core/features/course/format/singleactivity/components/core-course-format-single-activity.html
@@ -1,4 +1,6 @@
-<core-dynamic-component [component]="componentClass" [data]="data"></core-dynamic-component>
+<div class="list-item-limited-width">
+    <core-dynamic-component [component]="componentClass" [data]="data"></core-dynamic-component>
+</div>
 
 <core-block-side-blocks-button slot="fixed" *ngIf="course && hasBlocks" [courseId]="course.id">
 </core-block-side-blocks-button>
diff --git a/src/core/features/course/pages/module-preview/module-preview.html b/src/core/features/course/pages/module-preview/module-preview.html
index e25f768db..642782ee5 100644
--- a/src/core/features/course/pages/module-preview/module-preview.html
+++ b/src/core/features/course/pages/module-preview/module-preview.html
@@ -18,11 +18,11 @@
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
-<ion-content>
+<ion-content class="limited-width">
     <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <core-loading [hideUntil]="loaded" class="has-spacer list-item-limited-width">
+    <core-loading [hideUntil]="loaded" class="has-spacer">
         <core-course-module-info [module]="module" [courseId]="courseId" [description]="module.description" [component]="module.modname"
             [componentId]="module.id" [expandDescription]="true" [showAvailabilityInfo]="true" (completionChanged)="onCompletionChange()"
             [showManualCompletion]="showManualCompletion">
diff --git a/src/core/features/grades/pages/course/course.html b/src/core/features/grades/pages/course/course.html
index 30e043ec3..de30057bd 100644
--- a/src/core/features/grades/pages/course/course.html
+++ b/src/core/features/grades/pages/course/course.html
@@ -12,7 +12,7 @@
     <ion-refresher slot="fixed" [disabled]="!columns || !rows" (ionRefresh)="refreshGrades($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <core-loading [hideUntil]="columns && rows" class="safe-area-padding">
+    <core-loading [hideUntil]="columns && rows">
         <core-empty-box *ngIf="rows && rows.length === 0" icon="fas-chart-bar" [message]="'core.grades.nogradesreturned' | translate">
         </core-empty-box>
         <div *ngIf="rows && rows.length > 0" class="core-grades-container">
diff --git a/src/core/features/h5p/components/h5p-iframe/core-h5p-iframe.html b/src/core/features/h5p/components/h5p-iframe/core-h5p-iframe.html
index c60f30592..b09ea0ef2 100644
--- a/src/core/features/h5p/components/h5p-iframe/core-h5p-iframe.html
+++ b/src/core/features/h5p/components/h5p-iframe/core-h5p-iframe.html
@@ -1,4 +1,4 @@
-<core-loading [hideUntil]="iframeSrc" [fullscreen]="false" class="safe-area-padding">
+<core-loading [hideUntil]="iframeSrc" [fullscreen]="false">
     <core-iframe *ngIf="iframeSrc" [src]="iframeSrc" iframeHeight="auto" [allowFullscreen]="true" (loaded)="iframeLoaded()"
         [showFullscreenOnToolbar]="enableInAppFullscreen" [autoFullscreenOnRotate]="enableInAppFullscreen">
     </core-iframe>
diff --git a/src/core/features/login/pages/credentials/credentials.html b/src/core/features/login/pages/credentials/credentials.html
index e8703bdfa..94e021f17 100644
--- a/src/core/features/login/pages/credentials/credentials.html
+++ b/src/core/features/login/pages/credentials/credentials.html
@@ -15,8 +15,8 @@
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
-<ion-content class="ion-padding">
-    <core-loading [hideUntil]="pageLoaded" class="list-item-limited-width">
+<ion-content class="ion-padding limited-width">
+    <core-loading [hideUntil]="pageLoaded">
         <div class="ion-text-wrap ion-text-center ion-margin-bottom">
             <div class="core-login-site-logo">
                 <!-- Show site logo or a default image. -->
diff --git a/src/core/features/login/pages/site-policy/site-policy.html b/src/core/features/login/pages/site-policy/site-policy.html
index dbef122e6..25f2f27de 100644
--- a/src/core/features/login/pages/site-policy/site-policy.html
+++ b/src/core/features/login/pages/site-policy/site-policy.html
@@ -10,7 +10,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <core-loading [hideUntil]="policyLoaded" class="core-loading-full-height">
+    <core-loading [hideUntil]="policyLoaded">
         <ion-list *ngIf="sitePolicy">
             <ion-item class="ion-text-wrap">
                 <ion-label>
diff --git a/src/core/features/login/pages/sites/sites.html b/src/core/features/login/pages/sites/sites.html
index c1e6cadf3..6b97ae897 100644
--- a/src/core/features/login/pages/sites/sites.html
+++ b/src/core/features/login/pages/sites/sites.html
@@ -19,8 +19,8 @@
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
-<ion-content>
-    <core-loading [hideUntil]="loaded" class="list-item-limited-width">
+<ion-content class="limited-width">
+    <core-loading [hideUntil]="loaded">
         <ion-list class="core-sitelist">
             <ion-card *ngFor="let sites of accountsList.otherSites">
                 <ion-item-divider sticky="true" *ngIf="sites[0]" class="core-sitelist-sitename">
diff --git a/src/core/features/settings/pages/licenses/licenses.html b/src/core/features/settings/pages/licenses/licenses.html
index e33be5446..1221ab37e 100644
--- a/src/core/features/settings/pages/licenses/licenses.html
+++ b/src/core/features/settings/pages/licenses/licenses.html
@@ -9,8 +9,8 @@
         </ion-title>
     </ion-toolbar>
 </ion-header>
-<ion-content>
-    <core-loading [hideUntil]="loaded" class="list-item-limited-width">
+<ion-content class="limited-width">
+    <core-loading [hideUntil]="loaded">
         <ion-searchbar [(ngModel)]="textFilter" (ionInput)="filterChanged($event.target)" (ionCancel)="filterChanged($event.target)"
             [placeholder]="'core.filter' | translate">
         </ion-searchbar>
diff --git a/src/core/features/settings/pages/space-usage/space-usage.html b/src/core/features/settings/pages/space-usage/space-usage.html
index 38c8c0f61..ad5ce1a50 100644
--- a/src/core/features/settings/pages/space-usage/space-usage.html
+++ b/src/core/features/settings/pages/space-usage/space-usage.html
@@ -12,11 +12,11 @@
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
-<ion-content>
+<ion-content class="limited-width">
     <ion-refresher [disabled]="!loaded" (ionRefresh)="refreshData($event.target)" slot="fixed">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <core-loading [hideUntil]="loaded" class="list-item-limited-width">
+    <core-loading [hideUntil]="loaded">
         <ion-list>
             <ion-item *ngFor="let site of sites" [class.item-current]="site.id == currentSiteId">
                 <ion-label class="ion-text-wrap">
diff --git a/src/core/features/settings/pages/synchronization/synchronization.html b/src/core/features/settings/pages/synchronization/synchronization.html
index 6dc4c3d51..7e4911b89 100644
--- a/src/core/features/settings/pages/synchronization/synchronization.html
+++ b/src/core/features/settings/pages/synchronization/synchronization.html
@@ -15,8 +15,8 @@
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
-<ion-content>
-    <core-loading [hideUntil]="sitesLoaded" class="list-item-limited-width">
+<ion-content class="limited-width">
+    <core-loading [hideUntil]="sitesLoaded">
         <ion-list>
             <ion-item-divider>
                 <ion-label>
diff --git a/src/core/features/tag/pages/index-area/index-area.html b/src/core/features/tag/pages/index-area/index-area.html
index 9cb089c17..a23e1f352 100644
--- a/src/core/features/tag/pages/index-area/index-area.html
+++ b/src/core/features/tag/pages/index-area/index-area.html
@@ -10,14 +10,12 @@
         </ion-title>
     </ion-toolbar>
 </ion-header>
-<ion-content>
+<ion-content class="limited-width">
     <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="refreshData($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <core-loading [hideUntil]="loaded" class="list-item-limited-width">
-        <ng-container *ngIf="loaded">
-            <core-dynamic-component [component]="areaComponent" [data]="{items: items}"></core-dynamic-component>
-        </ng-container>
+    <core-loading [hideUntil]="loaded">
+        <core-dynamic-component [component]="areaComponent" [data]="{items: items}"></core-dynamic-component>
         <core-infinite-loading [enabled]="canLoadMore" (action)="loadMore($event)" [error]="loadMoreError">
         </core-infinite-loading>
     </core-loading>
diff --git a/src/core/features/tag/pages/search/search.html b/src/core/features/tag/pages/search/search.html
index bf4568ef6..6126aa8c3 100644
--- a/src/core/features/tag/pages/search/search.html
+++ b/src/core/features/tag/pages/search/search.html
@@ -32,7 +32,7 @@
             </ion-col>
         </ion-row>
     </ion-grid>
-    <core-loading [hideUntil]="loaded && !searching" class="safe-area-padding">
+    <core-loading [hideUntil]="loaded && !searching">
         <core-empty-box *ngIf="!cloud || !cloud!.tags || !cloud!.tags.length" icon="fas-tags"
             [message]="'core.tag.notagsfound' | translate: {$a: query}"></core-empty-box>
 
diff --git a/src/core/features/user/pages/about/about.html b/src/core/features/user/pages/about/about.html
index 62028bf62..751d3dd52 100644
--- a/src/core/features/user/pages/about/about.html
+++ b/src/core/features/user/pages/about/about.html
@@ -8,11 +8,11 @@
         </ion-title>
     </ion-toolbar>
 </ion-header>
-<ion-content>
+<ion-content class="limited-width">
     <ion-refresher slot="fixed" [disabled]="!userLoaded" (ionRefresh)="refreshUser($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <core-loading [hideUntil]="userLoaded" class="list-item-limited-width">
+    <core-loading [hideUntil]="userLoaded">
         <ion-list *ngIf="user">
             <ion-item class="ion-text-center core-user-profile-maininfo ion-text-wrap" lines="full">
                 <core-user-avatar [user]="user" [userId]="user.id" [linkProfile]="false" [checkOnline]="!canChangeProfilePicture">
diff --git a/src/core/features/user/pages/profile/profile.html b/src/core/features/user/pages/profile/profile.html
index 5dbb82b82..52d71a6cf 100644
--- a/src/core/features/user/pages/profile/profile.html
+++ b/src/core/features/user/pages/profile/profile.html
@@ -8,11 +8,11 @@
         </ion-title>
     </ion-toolbar>
 </ion-header>
-<ion-content [core-swipe-navigation]="users">
+<ion-content [core-swipe-navigation]="users" class="limited-width">
     <ion-refresher slot="fixed" [disabled]="!userLoaded" (ionRefresh)="refreshUser($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <core-loading [hideUntil]="userLoaded" class="list-item-limited-width">
+    <core-loading [hideUntil]="userLoaded">
         <ion-list *ngIf="user && !isDeleted && isEnrolled">
             <ion-item class="ion-text-center core-user-profile-maininfo ion-text-wrap">
                 <core-user-avatar [user]="user" [userId]="user.id" [linkProfile]="false" [checkOnline]="true">
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 59edeadaf..e3db5d413 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -817,12 +817,18 @@ ion-card {
 
 ion-list.core-course-module-list-wrapper,
 .list-item-limited-width,
-.core-course-module-list-wrapper {
+.core-course-module-list-wrapper,
+ion-content.limited-width > :not([slot]) {
     max-width: var(--list-item-max-width);
     margin-left: auto !important;
     margin-right: auto !important;
 }
 
+ion-content.limited-width > :not([slot]) {
+    display: flex;
+    flex-direction: column;
+}
+
 ion-toolbar h1 img.core-bar-button-image,
 ion-toolbar h1 .core-bar-button-image img {
     padding: 4px;

From ef1222b148ffb7c80711c9e24a047d678493df7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 24 Mar 2022 16:35:42 +0100
Subject: [PATCH 0818/1008] MOBILE-3833 notifications: Open notifications on a
 different page

---
 .../components/actions/actions.ts             | 90 -----------------
 .../actions/addon-notifications-actions.html  |  8 --
 .../components/components.module.ts           | 31 ------
 src/addons/notifications/notifications.scss   | 72 ++------------
 src/addons/notifications/pages/list/list.html | 97 +++++++++----------
 .../notifications/pages/list/list.module.ts   |  2 -
 src/addons/notifications/pages/list/list.ts   | 67 +++++++++----
 .../pages/notification/notification.html      | 71 +++++++++-----
 .../pages/notification/notification.module.ts |  2 -
 .../pages/notification/notification.scss      | 68 +++++++++++++
 .../pages/notification/notification.ts        | 81 +++++++++++++++-
 .../services/handlers/push-click.ts           | 14 +--
 .../services/notifications-helper.ts          | 45 +++++++++
 .../notifications/services/notifications.ts   | 21 ++++
 14 files changed, 367 insertions(+), 302 deletions(-)
 delete mode 100644 src/addons/notifications/components/actions/actions.ts
 delete mode 100644 src/addons/notifications/components/actions/addon-notifications-actions.html
 delete mode 100644 src/addons/notifications/components/components.module.ts
 create mode 100644 src/addons/notifications/pages/notification/notification.scss

diff --git a/src/addons/notifications/components/actions/actions.ts b/src/addons/notifications/components/actions/actions.ts
deleted file mode 100644
index 9ee3b221a..000000000
--- a/src/addons/notifications/components/actions/actions.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-// (C) Copyright 2015 Moodle Pty Ltd.
-//
-// 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, Input, OnInit } from '@angular/core';
-
-import { CoreSites } from '@services/sites';
-import { CoreContentLinksDelegate, CoreContentLinksAction } from '@features/contentlinks/services/contentlinks-delegate';
-
-/**
- * Component that displays the actions for a notification.
- */
-@Component({
-    selector: 'addon-notifications-actions',
-    templateUrl: 'addon-notifications-actions.html',
-})
-export class AddonNotificationsActionsComponent implements OnInit {
-
-    @Input() contextUrl?: string;
-    @Input() courseId?: number;
-    @Input() data?: Record<string, unknown>; // Extra data to handle the URL.
-
-    actions: CoreContentLinksAction[] = [];
-
-    /**
-     * Component being initialized.
-     */
-    async ngOnInit(): Promise<void> {
-        if (!this.contextUrl && (!this.data || !this.data.appurl)) {
-            // No URL, nothing to do.
-            return;
-        }
-
-        let actions: CoreContentLinksAction[] = [];
-
-        // Treat appurl first if any.
-        if (this.data?.appurl) {
-            actions = await CoreContentLinksDelegate.getActionsFor(
-                <string> this.data.appurl,
-                this.courseId,
-                undefined,
-                this.data,
-            );
-        }
-
-        if (!actions.length && this.contextUrl) {
-            // No appurl or cannot handle it. Try with contextUrl.
-            actions = await CoreContentLinksDelegate.getActionsFor(this.contextUrl, this.courseId, undefined, this.data);
-        }
-
-        if (!actions.length) {
-            // URL is not supported. Add an action to open it in browser.
-            actions.push({
-                message: 'core.view',
-                icon: 'fas-eye',
-                action: this.openInBrowser.bind(this),
-            });
-        }
-
-        this.actions = actions;
-    }
-
-    /**
-     * Default action. Open in browser.
-     *
-     * @param siteId Site ID to use.
-     */
-    protected async openInBrowser(siteId?: string): Promise<void> {
-        const url = <string> this.data?.appurl || this.contextUrl;
-
-        if (!url) {
-            return;
-        }
-
-        const site = await CoreSites.getSite(siteId);
-
-        site.openInBrowserWithAutoLogin(url);
-    }
-
-}
diff --git a/src/addons/notifications/components/actions/addon-notifications-actions.html b/src/addons/notifications/components/actions/addon-notifications-actions.html
deleted file mode 100644
index 348a2d701..000000000
--- a/src/addons/notifications/components/actions/addon-notifications-actions.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<ion-row *ngIf="actions && actions.length > 0" class="justify-content-around">
-    <ion-col *ngFor="let action of actions">
-        <ion-button fill="clear" expand="block" (click)="action.action()">
-            <ion-icon slot="start" name="{{action.icon}}" aria-hidden="true"></ion-icon>
-            {{ action.message | translate }}
-        </ion-button>
-    </ion-col>
-</ion-row>
diff --git a/src/addons/notifications/components/components.module.ts b/src/addons/notifications/components/components.module.ts
deleted file mode 100644
index 06e36bdcd..000000000
--- a/src/addons/notifications/components/components.module.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-// (C) Copyright 2015 Moodle Pty Ltd.
-//
-// 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 { CoreSharedModule } from '@/core/shared.module';
-
-import { AddonNotificationsActionsComponent } from './actions/actions';
-
-@NgModule({
-    declarations: [
-        AddonNotificationsActionsComponent,
-    ],
-    imports: [
-        CoreSharedModule,
-    ],
-    exports: [
-        AddonNotificationsActionsComponent,
-    ],
-})
-export class AddonNotificationsComponentsModule {}
diff --git a/src/addons/notifications/notifications.scss b/src/addons/notifications/notifications.scss
index 5285ea7f0..0583e27fa 100644
--- a/src/addons/notifications/notifications.scss
+++ b/src/addons/notifications/notifications.scss
@@ -2,6 +2,7 @@
 
 :host {
     --extra-icon-size: 16px;
+    --icon-size: 24px;
 
     ::ng-deep core-user-avatar {
         .core-avatar-extra-img,
@@ -28,71 +29,18 @@
         }
     }
 
-    .core-notification-icon {
-        width: var(--core-avatar-size);
-        height: var(--core-avatar-size);
-        @include margin(6px, 8px, 6px, 0px);
+    div.core-notification-icon {
+        img {
+            width: var(--icon-size);
+            height: var(--icon-size);
+        }
+        padding: 0.7rem;
         background: var(--background-color);
         border-radius: var(--small-radius);
     }
 
-    .item core-format-text ::ng-deep {
-        .forumpost {
-            border: 1px solid var(--gray-200);
-            width: 100%;
-            margin: 0 0 1em 0;
-
-            td {
-                padding: 10px;
-            }
-
-            .header {
-                background-color: var(--light);
-
-                .picture {
-                    width: 48px;
-                    text-align: center;
-                    @include padding-horizontal(4px, 0px);
-                    padding-top: 8px;
-
-                    img {
-                        width: 44px !important;
-                    }
-                }
-            }
-
-            .subject {
-                font-weight: 700;
-                margin-bottom: 1rem;
-            }
-        }
-
-        a {
-            text-decoration: none;
-        }
-
-        .userpicture {
-            border-radius: 50%;
-        }
-
-        .mdl-right {
-            text-align: end;
-            a {
-                display: none;
-            }
-            font {
-                font-size: 0.9em;
-            }
-        }
-
-        .commands {
-            display: none;
-        }
-
-        hr {
-            margin-top: 1.5rem;
-            margin-bottom: 1.5rem;
-            background-color: var(--gray-200);
-        }
+    .core-notification-icon {
+        --module-icon-size: var(--icon-size);
+        @include margin(6px, 8px, 6px, 0px);
     }
 }
diff --git a/src/addons/notifications/pages/list/list.html b/src/addons/notifications/pages/list/list.html
index bac0b73c5..955271699 100644
--- a/src/addons/notifications/pages/list/list.html
+++ b/src/addons/notifications/pages/list/list.html
@@ -11,69 +11,60 @@
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
-<ion-content>
+<ion-content class="limited-width">
     <ion-refresher slot="fixed" [disabled]="!notificationsLoaded" (ionRefresh)="refreshNotifications($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
     <core-loading [hideUntil]="notificationsLoaded">
-        <div class="list-item-limited-width">
 
-            <div class="ion-padding" *ngIf="canMarkAllNotificationsAsRead">
-                <ion-button [disabled]="loadingMarkAllNotificationsAsRead" expand="block" (click)="markAllNotificationsAsRead()"
-                    fill="outline">
-                    <ion-icon slot="start" name="fas-check" aria-hidden="true" *ngIf="!loadingMarkAllNotificationsAsRead"></ion-icon>
-                    <ion-spinner slot="start" [attr.aria-label]="'core.loading' | translate" *ngIf="loadingMarkAllNotificationsAsRead">
-                    </ion-spinner>
-                    {{ 'addon.notifications.markallread' | translate }}
-                </ion-button>
-            </div>
+        <div class="ion-padding" *ngIf="canMarkAllNotificationsAsRead">
+            <ion-button [disabled]="loadingMarkAllNotificationsAsRead" expand="block" (click)="markAllNotificationsAsRead()" fill="outline">
+                <ion-icon slot="start" name="fas-check" aria-hidden="true" *ngIf="!loadingMarkAllNotificationsAsRead"></ion-icon>
+                <ion-spinner slot="start" [attr.aria-label]="'core.loading' | translate" *ngIf="loadingMarkAllNotificationsAsRead">
+                </ion-spinner>
+                {{ 'addon.notifications.markallread' | translate }}
+            </ion-button>
+        </div>
 
-            <ion-card *ngFor="let notification of notifications">
-                <ion-item class="ion-text-wrap" [attr.aria-label]="
+        <ion-item *ngFor="let notification of notifications" class="ion-text-wrap" [attr.aria-label]="
                     notification.timeread
                     ? notification.subject
-                    : 'addon.notifications.unreadnotification' | translate: {$a: notification.subject}">
-                    <core-user-avatar *ngIf="notification.useridfrom > 0" [user]="notification" slot="start"
-                        [profileUrl]="notification.profileimageurlfrom" [fullname]="notification.userfromfullname"
-                        [userId]="notification.useridfrom">
-                        <div class="core-avatar-extra-img" *ngIf="notification.iconurl && !notification.modname">
-                            <img [src]="notification.iconurl" alt="" role="presentation">
-                        </div>
-                        <core-mod-icon *ngIf="notification.modname" [modicon]="notification.iconurl" [modname]="notification.modname"
-                            [showAlt]="false">
-                        </core-mod-icon>
-                    </core-user-avatar>
+                    : 'addon.notifications.unreadnotification' | translate: {$a: notification.subject}"
+            (click)="openNotification(notification)" button [detail]="true" lines="true">
+            <core-user-avatar *ngIf="notification.useridfrom > 0" [user]="notification" slot="start"
+                [profileUrl]="notification.profileimageurlfrom" [fullname]="notification.userfromfullname"
+                [userId]="notification.useridfrom">
+                <div class="core-avatar-extra-img" *ngIf="notification.iconurl && !notification.modname">
+                    <img [src]="notification.iconurl" alt="" role="presentation">
+                </div>
+                <core-mod-icon *ngIf="notification.modname" [modicon]="notification.iconurl" [modname]="notification.modname"
+                    [showAlt]="false">
+                </core-mod-icon>
+            </core-user-avatar>
 
-                    <img *ngIf="notification.useridfrom <= 0 && notification.iconurl" [src]="notification.iconurl" alt=""
-                        role="presentation" class="core-notification-icon" slot="start">
+            <ng-container *ngIf="notification.useridfrom <= 0 && notification.iconurl">
+                <div class="core-notification-icon" *ngIf="!notification.modname" slot="start">
+                    <img [src]="notification.iconurl" alt="" role="presentation">
+                </div>
+                <core-mod-icon *ngIf="notification.modname" [modicon]="notification.iconurl" [modname]="notification.modname"
+                    [showAlt]="false" class="core-notification-icon" slot="start">
+                </core-mod-icon>
+            </ng-container>
 
-                    <ion-label>
-                        <p class="item-heading">
-                            <core-format-text [text]="notification.subject" contextLevel="system" [contextInstanceId]="0"
-                                [wsNotFiltered]="true">
-                            </core-format-text>
-                        </p>
-                        <p *ngIf="notification.useridfrom > 0">{{ notification.userfromfullname }}</p>
-                    </ion-label>
-                    <ion-note slot="end" class="ion-float-end ion-text-end">
-                        {{ notification.timecreated | coreDateDayOrTime }}
-                        <span *ngIf="!notification.timeread">
-                            <ion-icon name="fas-circle" color="primary" aria-hidden="true"></ion-icon>
-                        </span>
-                    </ion-note>
-                </ion-item>
-                <ion-item class="ion-text-wrap">
-                    <ion-label>
-                        <core-format-text [text]="notification.mobiletext | coreCreateLinks" contextLevel="system" [contextInstanceId]="0"
-                            collapsible-item>
-                        </core-format-text>
-                    </ion-label>
-                </ion-item>
-                <addon-notifications-actions [contextUrl]="notification.contexturl" [courseId]="notification.courseid"
-                    [data]="notification.customdata">
-                </addon-notifications-actions>
-            </ion-card>
-        </div>
+            <ion-label>
+                <p class="item-heading">
+                    <core-format-text [text]="notification.subject" contextLevel="system" [contextInstanceId]="0" [wsNotFiltered]="true">
+                    </core-format-text>
+                </p>
+                <p *ngIf="notification.useridfrom > 0">{{ notification.userfromfullname }}</p>
+            </ion-label>
+            <ion-note slot="end">
+                {{ notification.timecreated | coreDateDayOrTime }}
+                <span *ngIf="!notification.timeread">
+                    <ion-icon name="fas-circle" color="primary" aria-hidden="true"></ion-icon>
+                </span>
+            </ion-note>
+        </ion-item>
 
         <core-empty-box *ngIf="!notifications || notifications.length <= 0" icon="far-bell"
             [message]="'addon.notifications.therearentnotificationsyet' | translate">
diff --git a/src/addons/notifications/pages/list/list.module.ts b/src/addons/notifications/pages/list/list.module.ts
index b592079e7..bf8eb18ec 100644
--- a/src/addons/notifications/pages/list/list.module.ts
+++ b/src/addons/notifications/pages/list/list.module.ts
@@ -16,7 +16,6 @@ import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
 import { CoreSharedModule } from '@/core/shared.module';
-import { AddonNotificationsComponentsModule } from '../../components/components.module';
 import { AddonNotificationsListPage } from './list';
 import { CoreMainMenuComponentsModule } from '@features/mainmenu/components/components.module';
 
@@ -31,7 +30,6 @@ const routes: Routes = [
     imports: [
         RouterModule.forChild(routes),
         CoreSharedModule,
-        AddonNotificationsComponentsModule,
         CoreMainMenuComponentsModule,
     ],
     declarations: [
diff --git a/src/addons/notifications/pages/list/list.ts b/src/addons/notifications/pages/list/list.ts
index f508814bf..5919309e9 100644
--- a/src/addons/notifications/pages/list/list.ts
+++ b/src/addons/notifications/pages/list/list.ts
@@ -30,6 +30,8 @@ import {
     AddonNotificationsNotificationToRender,
 } from '@addons/notifications/services/notifications-helper';
 import { CoreMainMenuDeepLinkManager } from '@features/mainmenu/classes/deep-link-manager';
+import { CoreNavigator } from '@services/navigator';
+import { CoreTimeUtils } from '@services/utils/time';
 
 /**
  * Page that displays the list of notifications.
@@ -50,6 +52,7 @@ export class AddonNotificationsListPage implements OnInit, OnDestroy {
 
     protected isCurrentView?: boolean;
     protected cronObserver?: CoreEventObserver;
+    protected readObserver?: CoreEventObserver;
     protected pushObserver?: Subscription;
     protected pendingRefresh = false;
 
@@ -84,6 +87,21 @@ export class AddonNotificationsListPage implements OnInit, OnDestroy {
             this.refreshNotifications();
         });
 
+        this.readObserver = CoreEvents.on(AddonNotificationsProvider.READ_CHANGED_EVENT, (data) => {
+            if (!data.id) {
+                return;
+            }
+
+            const notification = this.notifications.find((notification) => notification.id === data.id);
+            if (!notification) {
+                return;
+            }
+
+            notification.read = true;
+            notification.timeread = data.time;
+            this.loadMarkAllAsReadButton();
+        });
+
         const deepLinkManager = new CoreMainMenuDeepLinkManager();
         deepLinkManager.treatLink();
     }
@@ -91,7 +109,7 @@ export class AddonNotificationsListPage implements OnInit, OnDestroy {
     /**
      * Convenience function to get notifications. Gets unread notifications first.
      *
-     * @param refreh Whether we're refreshing data.
+     * @param refresh Whether we're refreshing data.
      * @return Resolved when done.
      */
     protected async fetchNotifications(refresh?: boolean): Promise<void> {
@@ -110,7 +128,7 @@ export class AddonNotificationsListPage implements OnInit, OnDestroy {
             }
             this.canLoadMore = result.canLoadMore;
 
-            this.markNotificationsAsRead(notifications);
+            await this.loadMarkAllAsReadButton();
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'addon.notifications.errorgetnotifications', true);
             this.loadMoreError = true; // Set to prevent infinite calls with infinite-loading.
@@ -129,7 +147,9 @@ export class AddonNotificationsListPage implements OnInit, OnDestroy {
 
         await CoreUtils.ignoreErrors(AddonNotifications.markAllNotificationsAsRead());
 
-        CoreEvents.trigger(AddonNotificationsProvider.READ_CHANGED_EVENT, {}, CoreSites.getCurrentSiteId());
+        CoreEvents.trigger(AddonNotificationsProvider.READ_CHANGED_EVENT, {
+            time: CoreTimeUtils.timestamp(),
+        }, CoreSites.getCurrentSiteId());
 
         // All marked as read, refresh the list.
         this.notificationsLoaded = false;
@@ -140,26 +160,25 @@ export class AddonNotificationsListPage implements OnInit, OnDestroy {
     /**
      * Mark notifications as read.
      *
-     * @param notifications Array of notification objects.
+     * @param notification Array of notification objects.
+     * @return Promise resolved when done.
      */
-    protected async markNotificationsAsRead(notifications: AddonNotificationsNotificationToRender[]): Promise<void> {
-        if (notifications.length > 0) {
-            const promises = notifications.map(async (notification) => {
-                if (notification.read) {
-                    // Already read, don't mark it.
-                    return;
-                }
+    protected async markNotificationAsRead(notification: AddonNotificationsNotificationToRender): Promise<void> {
+        const updated = await AddonNotificationsHelper.markNotificationAsRead(notification);
 
-                await AddonNotifications.markNotificationRead(notification.id);
-            });
-
-            await CoreUtils.ignoreErrors(Promise.all(promises));
-
-            await CoreUtils.ignoreErrors(AddonNotifications.invalidateNotificationsList());
-
-            CoreEvents.trigger(AddonNotificationsProvider.READ_CHANGED_EVENT, {}, CoreSites.getCurrentSiteId());
+        if (!updated) {
+            return;
         }
 
+        await this.loadMarkAllAsReadButton();
+    }
+
+    /**
+     * Load mark all notifications as read button.
+     *
+     * @return Promise resolved when done.
+     */
+    protected async loadMarkAllAsReadButton(): Promise<void> {
         // Check if mark all as read should be displayed (there are unread notifications).
         try {
             this.loadingMarkAllNotificationsAsRead = true;
@@ -201,6 +220,15 @@ export class AddonNotificationsListPage implements OnInit, OnDestroy {
         }
     }
 
+    /**
+     * Open Notification page.
+     *
+     * @param notification Notification to open.
+     */
+    openNotification(notification: AddonNotificationsNotificationToRender): void {
+        CoreNavigator.navigate('../notification', { params: { notification } });
+    }
+
     /**
      * User entered the page.
      */
@@ -229,6 +257,7 @@ export class AddonNotificationsListPage implements OnInit, OnDestroy {
      */
     ngOnDestroy(): void {
         this.cronObserver?.off();
+        this.readObserver?.off();
         this.pushObserver?.unsubscribe();
     }
 
diff --git a/src/addons/notifications/pages/notification/notification.html b/src/addons/notifications/pages/notification/notification.html
index c0566dee0..b5acae1bd 100644
--- a/src/addons/notifications/pages/notification/notification.html
+++ b/src/addons/notifications/pages/notification/notification.html
@@ -4,34 +4,61 @@
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
         <ion-title>
-            <h2>{{ 'addon.notifications.notifications' | translate }}</h2>
+            <h1>{{ 'addon.notifications.notifications' | translate }}</h1>
         </ion-title>
     </ion-toolbar>
 </ion-header>
 <ion-content>
     <core-loading [hideUntil]="loaded">
-        <ion-item class="ion-text-wrap" [attr.aria-label]="subject">
-            <core-user-avatar *ngIf="userIdFrom > 0" slot="start" [userId]="userIdFrom" [profileUrl]="profileImageUrlFrom"
-                [fullname]="userFromFullName">
-                <div class="core-avatar-extra-img" *ngIf="iconUrl && !modname">
-                    <img [src]="iconUrl" alt="" role="presentation">
-                </div>
-                <core-mod-icon *ngIf="modname" [modicon]="iconUrl" [modname]="modname" [showAlt]="false">
-                </core-mod-icon>
-            </core-user-avatar>
+        <div class="list-item-limited-width">
+            <ion-card>
 
-            <img *ngIf="userIdFrom <= 0 && iconUrl" [src]="iconUrl" alt="" role="presentation" class="core-notification-icon" slot="start">
+                <ion-item class="ion-text-wrap">
+                    <core-user-avatar *ngIf="userIdFrom > 0" slot="start" [userId]="userIdFrom" [profileUrl]="profileImageUrlFrom"
+                        [fullname]="userFromFullName">
+                        <div class="core-avatar-extra-img" *ngIf="iconUrl && !modname">
+                            <img [src]="iconUrl" alt="" role="presentation">
+                        </div>
+                        <core-mod-icon *ngIf="modname" [modicon]="iconUrl" [modname]="modname" [showAlt]="false">
+                        </core-mod-icon>
+                    </core-user-avatar>
 
-            <ion-label>
-                <p class="item-heading">{{ subject }}</p>
-                <p *ngIf="userIdFrom > 0">{{ userFromFullName }}</p>
-            </ion-label>
-        </ion-item>
-        <ion-item class="ion-text-wrap">
-            <ion-label>
-                <core-format-text [text]="content | coreCreateLinks" contextLevel="system" [contextInstanceId]="0">
-                </core-format-text>
-            </ion-label>
-        </ion-item>
+                    <ng-container *ngIf="userIdFrom <= 0 && iconUrl">
+                        <div class="core-notification-icon" *ngIf="!modname" slot="start">
+                            <img [src]="iconUrl" alt="" role="presentation">
+                        </div>
+                        <core-mod-icon *ngIf="modname" [modicon]="iconUrl" [modname]="modname" [showAlt]="false"
+                            class="core-notification-icon" slot="start">
+                        </core-mod-icon>
+                    </ng-container>
+
+                    <ion-label>
+                        <ion-card-subtitle *ngIf="userIdFrom > 0">{{ userFromFullName }}</ion-card-subtitle>
+                        <ion-card-title>
+                            <core-format-text [text]="subject" contextLevel="system" [contextInstanceId]="0" [wsNotFiltered]="true">
+                            </core-format-text>
+                        </ion-card-title>
+                    </ion-label>
+                    <ion-note slot="end" *ngIf="timecreated">
+                        {{ timecreated | coreDateDayOrTime }}
+                    </ion-note>
+                </ion-item>
+                <ion-item class="ion-text-wrap">
+                    <ion-label>
+                        <core-format-text [text]="content | coreCreateLinks" contextLevel="system" [contextInstanceId]="0">
+                        </core-format-text>
+                    </ion-label>
+                </ion-item>
+            </ion-card>
+        </div>
+
+        <div collapsible-footer appearOnBottom *ngIf="loaded && actions && actions.length > 0" slot="fixed">
+            <div class="list-item-limited-width adaptable-buttons-row">
+                <ion-button expand="block" (click)="action.action()" *ngFor="let action of actions">
+                    <ion-icon slot="start" name="{{action.icon}}" aria-hidden="true"></ion-icon>
+                    {{ action.message | translate }}
+                </ion-button>
+            </div>
+        </div>
     </core-loading>
 </ion-content>
diff --git a/src/addons/notifications/pages/notification/notification.module.ts b/src/addons/notifications/pages/notification/notification.module.ts
index b316d8bd4..e16e2860b 100644
--- a/src/addons/notifications/pages/notification/notification.module.ts
+++ b/src/addons/notifications/pages/notification/notification.module.ts
@@ -16,7 +16,6 @@ import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
 import { CoreSharedModule } from '@/core/shared.module';
-import { AddonNotificationsComponentsModule } from '../../components/components.module';
 import { AddonNotificationsNotificationPage } from './notification';
 
 const routes: Routes = [
@@ -30,7 +29,6 @@ const routes: Routes = [
     imports: [
         RouterModule.forChild(routes),
         CoreSharedModule,
-        AddonNotificationsComponentsModule,
     ],
     declarations: [
         AddonNotificationsNotificationPage,
diff --git a/src/addons/notifications/pages/notification/notification.scss b/src/addons/notifications/pages/notification/notification.scss
new file mode 100644
index 000000000..e296eadb9
--- /dev/null
+++ b/src/addons/notifications/pages/notification/notification.scss
@@ -0,0 +1,68 @@
+@import "~theme/globals";
+
+:host {
+
+    h2 {
+        font-weight: bold;
+    }
+
+    core-format-text ::ng-deep {
+        .forumpost {
+            border: 1px solid var(--gray-200);
+            width: 100%;
+            margin: 0 0 1em 0;
+
+            td {
+                padding: 10px;
+            }
+
+            .header {
+                background-color: var(--light);
+
+                .picture {
+                    width: 48px;
+                    text-align: center;
+                    @include padding-horizontal(4px, 0px);
+                    padding-top: 8px;
+
+                    img {
+                        width: 44px !important;
+                    }
+                }
+            }
+
+            .subject {
+                font-weight: 700;
+                margin-bottom: 1rem;
+            }
+        }
+
+        a {
+            text-decoration: none;
+        }
+
+        .userpicture {
+            border-radius: 50%;
+        }
+
+        .mdl-right {
+            text-align: end;
+            a {
+                display: none;
+            }
+            font {
+                font-size: 0.9em;
+            }
+        }
+
+        .commands {
+            display: none;
+        }
+
+        hr {
+            margin-top: 1.5rem;
+            margin-bottom: 1.5rem;
+            background-color: var(--gray-200);
+        }
+    }
+}
diff --git a/src/addons/notifications/pages/notification/notification.ts b/src/addons/notifications/pages/notification/notification.ts
index 9fb04f294..23282d713 100644
--- a/src/addons/notifications/pages/notification/notification.ts
+++ b/src/addons/notifications/pages/notification/notification.ts
@@ -19,7 +19,9 @@ import {
     AddonNotificationsNotificationToRender,
 } from '@addons/notifications/services/notifications-helper';
 import { Component, OnInit } from '@angular/core';
+import { CoreContentLinksAction, CoreContentLinksDelegate } from '@features/contentlinks/services/contentlinks-delegate';
 import { CoreNavigator } from '@services/navigator';
+import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
 
@@ -29,7 +31,7 @@ import { CoreUtils } from '@services/utils/utils';
 @Component({
     selector: 'page-addon-notifications-notification',
     templateUrl: 'notification.html',
-    styleUrls: ['../../notifications.scss'],
+    styleUrls: ['../../notifications.scss', 'notification.scss'],
 })
 export class AddonNotificationsNotificationPage implements OnInit {
 
@@ -41,12 +43,19 @@ export class AddonNotificationsNotificationPage implements OnInit {
     iconUrl?: string; // Icon URL.
     modname?: string; // Module name.
     loaded = false;
+    timecreated = 0;
+
+    // Actions data.
+    actions: CoreContentLinksAction[] = [];
+    contextUrl?: string;
+    courseId?: number;
+    actionsData?: Record<string, unknown>; // Extra data to handle the URL.
 
     /**
      * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
-        let notification: AddonNotificationsNotificationToRender | AddonNotificationsNotificationData;
+        let notification: AddonNotificationsNotification;
 
         try {
             notification = CoreNavigator.getRequiredRouteParam('notification');
@@ -85,6 +94,8 @@ export class AddonNotificationsNotificationPage implements OnInit {
                     this.modname = modname;
                 }
             }
+            this.timecreated = notification.timecreated;
+
         } else {
             this.subject = notification.title || '';
             this.content = notification.message || '';
@@ -93,7 +104,73 @@ export class AddonNotificationsNotificationPage implements OnInit {
             this.userFromFullName = notification.userfromfullname;
         }
 
+        await this.loadActions(notification);
+        AddonNotificationsHelper.markNotificationAsRead(notification);
+
         this.loaded = true;
     }
 
+    /**
+     * Load notification actions
+     *
+     * @param notification Notification.
+     * @return Promise resolved when done.
+     */
+    async loadActions(notification: AddonNotificationsNotification): Promise<void> {
+        if (!notification.contexturl && (!notification.customdata || !notification.customdata.appurl)) {
+            // No URL, nothing to do.
+            return;
+        }
+
+        let actions: CoreContentLinksAction[] = [];
+        this.actionsData = notification.customdata;
+        this.contextUrl = notification.contexturl;
+        this.courseId = 'courseid' in notification ? notification.courseid : undefined;
+
+        // Treat appurl first if any.
+        if (this.actionsData?.appurl) {
+            actions = await CoreContentLinksDelegate.getActionsFor(
+                <string> this.actionsData.appurl,
+                this.courseId,
+                undefined,
+                this.actionsData,
+            );
+        }
+
+        if (!actions.length && this.contextUrl) {
+            // No appurl or cannot handle it. Try with contextUrl.
+            actions = await CoreContentLinksDelegate.getActionsFor(this.contextUrl, this.courseId, undefined, this.actionsData);
+        }
+
+        if (!actions.length) {
+            // URL is not supported. Add an action to open it in browser.
+            actions.push({
+                message: 'core.view',
+                icon: 'fas-eye',
+                action: this.openInBrowser.bind(this),
+            });
+        }
+
+        this.actions = actions;
+    }
+
+    /**
+     * Default action. Open in browser.
+     *
+     * @param siteId Site ID to use.
+     */
+    protected async openInBrowser(siteId?: string): Promise<void> {
+        const url = <string> this.actionsData?.appurl || this.contextUrl;
+
+        if (!url) {
+            return;
+        }
+
+        const site = await CoreSites.getSite(siteId);
+
+        site.openInBrowserWithAutoLogin(url);
+    }
+
 }
+
+type AddonNotificationsNotification = AddonNotificationsNotificationToRender | AddonNotificationsNotificationData;
diff --git a/src/addons/notifications/services/handlers/push-click.ts b/src/addons/notifications/services/handlers/push-click.ts
index 2312b4e75..3fc1c4d0d 100644
--- a/src/addons/notifications/services/handlers/push-click.ts
+++ b/src/addons/notifications/services/handlers/push-click.ts
@@ -18,12 +18,12 @@ import { CoreNavigator } from '@services/navigator';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreUtils } from '@services/utils/utils';
 import { makeSingleton } from '@singletons';
-import { CoreEvents } from '@singletons/events';
 import { CorePushNotificationsClickHandler } from '@features/pushnotifications/services/push-delegate';
 import { CorePushNotificationsNotificationBasicData } from '@features/pushnotifications/services/pushnotifications';
 import { CoreContentLinksHelper } from '@features/contentlinks/services/contentlinks-helper';
-import { AddonNotifications, AddonNotificationsProvider } from '../notifications';
+import { AddonNotifications } from '../notifications';
 import { AddonNotificationsMainMenuHandlerService } from './mainmenu';
+import { AddonNotificationsHelper } from '../notifications-helper';
 
 /**
  * Handler for non-messaging push notifications clicks.
@@ -64,15 +64,7 @@ export class AddonNotificationsPushClickHandlerService implements CorePushNotifi
      * @return Promise resolved when done.
      */
     protected async markAsRead(notification: AddonNotificationsNotificationData): Promise<void> {
-        const notifId = notification.savedmessageid || notification.id;
-
-        if (!notifId) {
-            return;
-        }
-
-        await CoreUtils.ignoreErrors(AddonNotifications.markNotificationRead(notifId, notification.site));
-
-        CoreEvents.trigger(AddonNotificationsProvider.READ_CHANGED_EVENT, {}, notification.site);
+        await CoreUtils.ignoreErrors(AddonNotificationsHelper.markNotificationAsRead(notification));
     }
 
     /**
diff --git a/src/addons/notifications/services/notifications-helper.ts b/src/addons/notifications/services/notifications-helper.ts
index 8eb24bfdc..38d79ddc6 100644
--- a/src/addons/notifications/services/notifications-helper.ts
+++ b/src/addons/notifications/services/notifications-helper.ts
@@ -18,13 +18,18 @@ import { CoreUtils } from '@services/utils/utils';
 import { makeSingleton } from '@singletons';
 import { AddonMessageOutputDelegate } from '@addons/messageoutput/services/messageoutput-delegate';
 import {
+    AddonNotifications,
     AddonNotificationsNotificationMessageFormatted,
     AddonNotificationsPreferences,
     AddonNotificationsPreferencesComponent,
     AddonNotificationsPreferencesNotification,
     AddonNotificationsPreferencesNotificationProcessor,
     AddonNotificationsPreferencesProcessor,
+    AddonNotificationsProvider,
 } from './notifications';
+import { CoreEvents } from '@singletons/events';
+import { AddonNotificationsNotificationData } from './handlers/push-click';
+import { CoreTimeUtils } from '@services/utils/time';
 
 /**
  * Service that provides some helper functions for notifications.
@@ -115,6 +120,46 @@ export class AddonNotificationsHelperProvider {
         return result;
     }
 
+    /**
+     * Mark notification as read, trigger event and invalidate data.
+     *
+     * @param notification Notification object.
+     * @return Promise resolved when done.
+     */
+    async markNotificationAsRead(
+        notification: AddonNotificationsNotificationMessageFormatted | AddonNotificationsNotificationData,
+        siteId?: string,
+    ): Promise<boolean> {
+        if ('read' in notification && (notification.read || notification.timeread > 0)) {
+            // Already read, don't mark it.
+            return false;
+        }
+
+        const notifId = 'savedmessageid' in notification ? notification.savedmessageid || notification.id : notification.id;
+        if (!notifId) {
+            return false;
+        }
+
+        siteId = 'site' in notification ? notification.site : siteId;
+
+        await CoreUtils.ignoreErrors(AddonNotifications.markNotificationRead(notifId, siteId));
+
+        const time = CoreTimeUtils.timestamp();
+        if ('read' in notification) {
+            notification.read = true;
+            notification.timeread = time;
+        }
+
+        await CoreUtils.ignoreErrors(AddonNotifications.invalidateNotificationsList());
+
+        CoreEvents.trigger(AddonNotificationsProvider.READ_CHANGED_EVENT, {
+            id: notifId,
+            time,
+        }, siteId);
+
+        return true;
+    }
+
 }
 
 export const AddonNotificationsHelper = makeSingleton(AddonNotificationsHelperProvider);
diff --git a/src/addons/notifications/services/notifications.ts b/src/addons/notifications/services/notifications.ts
index 1fab101db..d6426b01a 100644
--- a/src/addons/notifications/services/notifications.ts
+++ b/src/addons/notifications/services/notifications.ts
@@ -24,6 +24,19 @@ import { CoreLogger } from '@singletons/logger';
 import { makeSingleton } from '@singletons';
 import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate';
 
+declare module '@singletons/events' {
+
+    /**
+     * Augment CoreEventsData interface with events specific to this service.
+     *
+     * @see https://www.typescriptlang.org/docs/handbook/declaration-merging.html#module-augmentation
+     */
+    export interface CoreEventsData {
+        [AddonNotificationsProvider.READ_CHANGED_EVENT]: AddonNotificationsReadChangedEvent;
+    }
+
+}
+
 const ROOT_CACHE_KEY = 'mmaNotifications:';
 
 /**
@@ -577,3 +590,11 @@ export enum AddonNotificationsGetReadType {
     READ = 1,
     BOTH = 2,
 }
+
+/**
+ * Event triggered when one or more notifications are read.
+ */
+export type AddonNotificationsReadChangedEvent = {
+    id?: number; // Set to the single id notification read. Undefined if multiple.
+    time: number; // Time of the change.
+};

From 6255c86708073ed5f2e353b925d2e2517e8e845f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 25 Mar 2022 15:51:15 +0100
Subject: [PATCH 0819/1008] MOBILE-3833 styles: Unify toast colors

---
 src/theme/theme.base.scss  | 1 -
 src/theme/theme.light.scss | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index e3db5d413..ebf03452b 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -501,7 +501,6 @@ ion-loading {
 
 // Toasts.
 ion-toast {
-    --button-color: var(--primary-tint);
     @include media-breakpoint-down(sm) {
         &::part(container) {
             flex-direction: column;
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 284d216cb..21e9485e1 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -237,6 +237,12 @@
         }
     }
 
+    ion-toast {
+        --color: var(--ion-color-step-50);
+        --button-color: var(--primary);
+        --background: var(--ion-color-step-800);
+    }
+
     --core-tabs-background: var(--white);
     --core-tab-background: var(--core-tabs-background);
     --core-tab-color: var(--subdued-text-color);

From c64f0b935381bf60aa8951a68516d836561c3c78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 28 Mar 2022 11:59:38 +0200
Subject: [PATCH 0820/1008] MOBILE-3833 notifications: Update styles

---
 src/addons/notifications/pages/list/list.html |  33 ++---
 src/addons/notifications/pages/list/list.scss |  72 +++++++++++
 src/addons/notifications/pages/list/list.ts   |  18 +--
 .../pages/notification/notification.html      |  67 +++++------
 .../pages/notification/notification.scss      | 113 ++++++++++--------
 5 files changed, 188 insertions(+), 115 deletions(-)
 create mode 100644 src/addons/notifications/pages/list/list.scss

diff --git a/src/addons/notifications/pages/list/list.html b/src/addons/notifications/pages/list/list.html
index 955271699..f208df1ae 100644
--- a/src/addons/notifications/pages/list/list.html
+++ b/src/addons/notifications/pages/list/list.html
@@ -17,20 +17,11 @@
     </ion-refresher>
     <core-loading [hideUntil]="notificationsLoaded">
 
-        <div class="ion-padding" *ngIf="canMarkAllNotificationsAsRead">
-            <ion-button [disabled]="loadingMarkAllNotificationsAsRead" expand="block" (click)="markAllNotificationsAsRead()" fill="outline">
-                <ion-icon slot="start" name="fas-check" aria-hidden="true" *ngIf="!loadingMarkAllNotificationsAsRead"></ion-icon>
-                <ion-spinner slot="start" [attr.aria-label]="'core.loading' | translate" *ngIf="loadingMarkAllNotificationsAsRead">
-                </ion-spinner>
-                {{ 'addon.notifications.markallread' | translate }}
-            </ion-button>
-        </div>
-
         <ion-item *ngFor="let notification of notifications" class="ion-text-wrap" [attr.aria-label]="
                     notification.timeread
                     ? notification.subject
                     : 'addon.notifications.unreadnotification' | translate: {$a: notification.subject}"
-            (click)="openNotification(notification)" button [detail]="true" lines="true">
+            (click)="openNotification(notification)" button [detail]="false" lines="full">
             <core-user-avatar *ngIf="notification.useridfrom > 0" [user]="notification" slot="start"
                 [profileUrl]="notification.profileimageurlfrom" [fullname]="notification.userfromfullname"
                 [userId]="notification.useridfrom">
@@ -56,13 +47,12 @@
                     <core-format-text [text]="notification.subject" contextLevel="system" [contextInstanceId]="0" [wsNotFiltered]="true">
                     </core-format-text>
                 </p>
-                <p *ngIf="notification.useridfrom > 0">{{ notification.userfromfullname }}</p>
+                <p>{{ notification.timecreated | coreTimeAgo }}<ng-container *ngIf="notification.useridfrom > 0"> · {{
+                        notification.userfromfullname }}</ng-container>
+                </p>
             </ion-label>
-            <ion-note slot="end">
-                {{ notification.timecreated | coreDateDayOrTime }}
-                <span *ngIf="!notification.timeread">
-                    <ion-icon name="fas-circle" color="primary" aria-hidden="true"></ion-icon>
-                </span>
+            <ion-note slot="end" *ngIf="!notification.timeread">
+                <ion-icon name="fas-circle" color="primary" aria-hidden="true"></ion-icon>
             </ion-note>
         </ion-item>
 
@@ -72,4 +62,15 @@
         <core-infinite-loading [enabled]="canLoadMore" (action)="loadMoreNotifications($event)" [error]="loadMoreError">
         </core-infinite-loading>
     </core-loading>
+
+
+    <div class="mark-all-as-read" slot="fixed" collapsible-footer appearOnBottom>
+        <ion-chip *ngIf="notificationsLoaded && canMarkAllNotificationsAsRead" [disabled]="loadingMarkAllNotificationsAsRead"
+            color="primary" (click)="markAllNotificationsAsRead()">
+            <ion-icon name="fas-eye" aria-hidden="true" *ngIf="!loadingMarkAllNotificationsAsRead"></ion-icon>
+            <ion-spinner [attr.aria-label]="'core.loading' | translate" *ngIf="loadingMarkAllNotificationsAsRead">
+            </ion-spinner>
+            {{ 'addon.notifications.markallread' | translate }}
+        </ion-chip>
+    </div>
 </ion-content>
diff --git a/src/addons/notifications/pages/list/list.scss b/src/addons/notifications/pages/list/list.scss
new file mode 100644
index 000000000..4ac957b62
--- /dev/null
+++ b/src/addons/notifications/pages/list/list.scss
@@ -0,0 +1,72 @@
+@import "~theme/globals";
+
+ion-item {
+    ion-label {
+        margin-top: 8px;
+        margin-bottom: 8px;
+        p.item-heading {
+            font-size: 14px;
+            -webkit-line-clamp: 3;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            -webkit-box-orient: vertical;
+            display: -webkit-box;
+        }
+        p {
+            font-size: 12px;
+        }
+    }
+
+    ion-note {
+        margin: 0;
+        @include padding-horizontal(8px, 0);
+        padding-top: 12px;
+
+        ion-icon {
+            font-size: 6px;
+            vertical-align: middle;
+        }
+    }
+
+    [slot=start] {
+        align-self: start;
+        margin-top: 16px;
+    }
+
+    --icon-size: 16px;
+    --extra-icon-size: 12px;
+    --core-avatar-size: 32px;
+
+    div.core-notification-icon,
+    core-mod-icon.core-notification-icon {
+        padding: 8px;
+    }
+}
+
+.mark-all-as-read {
+    padding-bottom: 16px;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    display: flex;
+    background: transparent;
+    box-shadow: none;
+    pointer-events: none;
+
+    ion-chip.ion-color {
+        pointer-events: all;
+        margin: 0 auto;
+        box-shadow: 0 2px 4px rgba(0, 0, 0, .4);
+
+        ion-spinner {
+            width: 16px;
+            height: 16px;
+            @include margin-horizontal(0, 8px);
+        }
+    }
+}
+
+
+ion-content::part(scroll) {
+    padding-bottom: 44px;
+}
diff --git a/src/addons/notifications/pages/list/list.ts b/src/addons/notifications/pages/list/list.ts
index 5919309e9..d8b29c4de 100644
--- a/src/addons/notifications/pages/list/list.ts
+++ b/src/addons/notifications/pages/list/list.ts
@@ -39,7 +39,7 @@ import { CoreTimeUtils } from '@services/utils/time';
 @Component({
     selector: 'page-addon-notifications-list',
     templateUrl: 'list.html',
-    styleUrls: ['../../notifications.scss'],
+    styleUrls: ['list.scss', '../../notifications.scss'],
 })
 export class AddonNotificationsListPage implements OnInit, OnDestroy {
 
@@ -157,22 +157,6 @@ export class AddonNotificationsListPage implements OnInit, OnDestroy {
         await this.refreshNotifications();
     }
 
-    /**
-     * Mark notifications as read.
-     *
-     * @param notification Array of notification objects.
-     * @return Promise resolved when done.
-     */
-    protected async markNotificationAsRead(notification: AddonNotificationsNotificationToRender): Promise<void> {
-        const updated = await AddonNotificationsHelper.markNotificationAsRead(notification);
-
-        if (!updated) {
-            return;
-        }
-
-        await this.loadMarkAllAsReadButton();
-    }
-
     /**
      * Load mark all notifications as read button.
      *
diff --git a/src/addons/notifications/pages/notification/notification.html b/src/addons/notifications/pages/notification/notification.html
index b5acae1bd..9c2254c43 100644
--- a/src/addons/notifications/pages/notification/notification.html
+++ b/src/addons/notifications/pages/notification/notification.html
@@ -11,45 +11,42 @@
 <ion-content>
     <core-loading [hideUntil]="loaded">
         <div class="list-item-limited-width">
-            <ion-card>
 
-                <ion-item class="ion-text-wrap">
-                    <core-user-avatar *ngIf="userIdFrom > 0" slot="start" [userId]="userIdFrom" [profileUrl]="profileImageUrlFrom"
-                        [fullname]="userFromFullName">
-                        <div class="core-avatar-extra-img" *ngIf="iconUrl && !modname">
-                            <img [src]="iconUrl" alt="" role="presentation">
-                        </div>
-                        <core-mod-icon *ngIf="modname" [modicon]="iconUrl" [modname]="modname" [showAlt]="false">
-                        </core-mod-icon>
-                    </core-user-avatar>
+            <ion-item class="ion-text-wrap core-notification-title" lines="full">
+                <core-user-avatar *ngIf="userIdFrom > 0" slot="start" [userId]="userIdFrom" [profileUrl]="profileImageUrlFrom"
+                    [fullname]="userFromFullName">
+                    <div class="core-avatar-extra-img" *ngIf="iconUrl && !modname">
+                        <img [src]="iconUrl" alt="" role="presentation">
+                    </div>
+                    <core-mod-icon *ngIf="modname" [modicon]="iconUrl" [modname]="modname" [showAlt]="false">
+                    </core-mod-icon>
+                </core-user-avatar>
 
-                    <ng-container *ngIf="userIdFrom <= 0 && iconUrl">
-                        <div class="core-notification-icon" *ngIf="!modname" slot="start">
-                            <img [src]="iconUrl" alt="" role="presentation">
-                        </div>
-                        <core-mod-icon *ngIf="modname" [modicon]="iconUrl" [modname]="modname" [showAlt]="false"
-                            class="core-notification-icon" slot="start">
-                        </core-mod-icon>
-                    </ng-container>
+                <ng-container *ngIf="userIdFrom <= 0 && iconUrl">
+                    <div class="core-notification-icon" *ngIf="!modname" slot="start">
+                        <img [src]="iconUrl" alt="" role="presentation">
+                    </div>
+                    <core-mod-icon *ngIf="modname" [modicon]="iconUrl" [modname]="modname" [showAlt]="false" class="core-notification-icon"
+                        slot="start">
+                    </core-mod-icon>
+                </ng-container>
 
-                    <ion-label>
-                        <ion-card-subtitle *ngIf="userIdFrom > 0">{{ userFromFullName }}</ion-card-subtitle>
-                        <ion-card-title>
-                            <core-format-text [text]="subject" contextLevel="system" [contextInstanceId]="0" [wsNotFiltered]="true">
-                            </core-format-text>
-                        </ion-card-title>
-                    </ion-label>
-                    <ion-note slot="end" *ngIf="timecreated">
-                        {{ timecreated | coreDateDayOrTime }}
-                    </ion-note>
-                </ion-item>
-                <ion-item class="ion-text-wrap">
-                    <ion-label>
-                        <core-format-text [text]="content | coreCreateLinks" contextLevel="system" [contextInstanceId]="0">
+                <ion-label>
+                    <p class="item-heading">
+                        <core-format-text [text]="subject" contextLevel="system" [contextInstanceId]="0" [wsNotFiltered]="true">
                         </core-format-text>
-                    </ion-label>
-                </ion-item>
-            </ion-card>
+                    </p>
+                    <p>{{ timecreated | coreTimeAgo }}<ng-container *ngIf="userIdFrom > 0"> · {{
+                            userFromFullName }}</ng-container>
+                    </p>
+                </ion-label>
+            </ion-item>
+            <ion-item class="ion-text-wrap core-notification-body">
+                <ion-label>
+                    <core-format-text [text]="content | coreCreateLinks" contextLevel="system" [contextInstanceId]="0">
+                    </core-format-text>
+                </ion-label>
+            </ion-item>
         </div>
 
         <div collapsible-footer appearOnBottom *ngIf="loaded && actions && actions.length > 0" slot="fixed">
diff --git a/src/addons/notifications/pages/notification/notification.scss b/src/addons/notifications/pages/notification/notification.scss
index e296eadb9..05f459851 100644
--- a/src/addons/notifications/pages/notification/notification.scss
+++ b/src/addons/notifications/pages/notification/notification.scss
@@ -2,67 +2,86 @@
 
 :host {
 
-    h2 {
-        font-weight: bold;
+    .core-notification-title {
+        [slot=start] {
+            align-self: start;
+            margin-top: 16px;
+        }
+        p.item-heading {
+            font-size: 16px;
+        }
+        p {
+            font-size: 12px;
+        }
     }
 
-    core-format-text ::ng-deep {
-        .forumpost {
-            border: 1px solid var(--gray-200);
-            width: 100%;
-            margin: 0 0 1em 0;
+    .core-notification-body {
+        core-format-text {
+            font-size: 14px;
+        }
 
-            td {
-                padding: 10px;
-            }
+        h2 {
+            font-weight: bold;
+        }
 
-            .header {
-                background-color: var(--light);
+        core-format-text ::ng-deep {
+            .forumpost {
+                border: 1px solid var(--gray-200);
+                width: 100%;
+                margin: 0 0 1em 0;
 
-                .picture {
-                    width: 48px;
-                    text-align: center;
-                    @include padding-horizontal(4px, 0px);
-                    padding-top: 8px;
+                td {
+                    padding: 10px;
+                }
 
-                    img {
-                        width: 44px !important;
+                .header {
+                    background-color: var(--light);
+
+                    .picture {
+                        width: 48px;
+                        text-align: center;
+                        @include padding-horizontal(4px, 0px);
+                        padding-top: 8px;
+
+                        img {
+                            width: 44px !important;
+                        }
                     }
                 }
+
+                .subject {
+                    font-weight: 700;
+                    margin-bottom: 1rem;
+                }
             }
 
-            .subject {
-                font-weight: 700;
-                margin-bottom: 1rem;
-            }
-        }
-
-        a {
-            text-decoration: none;
-        }
-
-        .userpicture {
-            border-radius: 50%;
-        }
-
-        .mdl-right {
-            text-align: end;
             a {
+                text-decoration: none;
+            }
+
+            .userpicture {
+                border-radius: 50%;
+            }
+
+            .mdl-right {
+                text-align: end;
+                a {
+                    display: none;
+                }
+                font {
+                    font-size: 0.9em;
+                }
+            }
+
+            .commands {
                 display: none;
             }
-            font {
-                font-size: 0.9em;
+
+            hr {
+                margin-top: 1.5rem;
+                margin-bottom: 1.5rem;
+                background-color: var(--gray-200);
             }
         }
-
-        .commands {
-            display: none;
-        }
-
-        hr {
-            margin-top: 1.5rem;
-            margin-bottom: 1.5rem;
-            background-color: var(--gray-200);
-        }
     }
 }

From 3d010010dab21efa35ce55998d1098ded0a37177 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Mon, 28 Mar 2022 13:42:59 +0200
Subject: [PATCH 0821/1008] MOBILE-3833 core: Update push notifications plugin

---
 package-lock.json | 14 +++++++-------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fd57e55ba..4b37ab371 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -49,7 +49,7 @@
         "@moodlehq/cordova-plugin-local-notification": "0.9.0-moodle.3",
         "@moodlehq/cordova-plugin-qrscanner": "3.0.1-moodle.2",
         "@moodlehq/cordova-plugin-zip": "3.1.0-moodle.1",
-        "@moodlehq/phonegap-plugin-push": "2.0.0-moodle.2",
+        "@moodlehq/phonegap-plugin-push": "2.0.0-moodle.3",
         "@ngx-translate/core": "13.0.0",
         "@ngx-translate/http-loader": "6.0.0",
         "@types/chart.js": "2.9.31",
@@ -5175,9 +5175,9 @@
       ]
     },
     "node_modules/@moodlehq/phonegap-plugin-push": {
-      "version": "2.0.0-moodle.2",
-      "resolved": "https://registry.npmjs.org/@moodlehq/phonegap-plugin-push/-/phonegap-plugin-push-2.0.0-moodle.2.tgz",
-      "integrity": "sha512-a1ZR36vOy0Gu0yaX2T+PODlNSQcIUuHMNzPZ/kn4I+cV+hyPwAw1LmdGQDdxfABAGKWCvtzwUyYs1T/NCz2fRQ==",
+      "version": "2.0.0-moodle.3",
+      "resolved": "https://registry.npmjs.org/@moodlehq/phonegap-plugin-push/-/phonegap-plugin-push-2.0.0-moodle.3.tgz",
+      "integrity": "sha512-J5V/uElS6DDCFXQKCpnwEBTi2JlfbOGFWOpOicOrua+fGupmh4uj65zxBajtNwZghDbvQ2HKtmT2++obJ+DKEg==",
       "engines": {
         "cordovaDependencies": {
           "1.0.0": {
@@ -35278,9 +35278,9 @@
       "integrity": "sha512-QD5S6bsm6awJrNMb8YN/vkYghKAMfZMHccdimx6s1i5S9fgZUSf7L477NJqjFu62imVZYJIJuavBbw5fR/562w=="
     },
     "@moodlehq/phonegap-plugin-push": {
-      "version": "2.0.0-moodle.2",
-      "resolved": "https://registry.npmjs.org/@moodlehq/phonegap-plugin-push/-/phonegap-plugin-push-2.0.0-moodle.2.tgz",
-      "integrity": "sha512-a1ZR36vOy0Gu0yaX2T+PODlNSQcIUuHMNzPZ/kn4I+cV+hyPwAw1LmdGQDdxfABAGKWCvtzwUyYs1T/NCz2fRQ=="
+      "version": "2.0.0-moodle.3",
+      "resolved": "https://registry.npmjs.org/@moodlehq/phonegap-plugin-push/-/phonegap-plugin-push-2.0.0-moodle.3.tgz",
+      "integrity": "sha512-J5V/uElS6DDCFXQKCpnwEBTi2JlfbOGFWOpOicOrua+fGupmh4uj65zxBajtNwZghDbvQ2HKtmT2++obJ+DKEg=="
     },
     "@netflix/nerror": {
       "version": "1.1.3",
diff --git a/package.json b/package.json
index 38a39b560..6621e9942 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,7 @@
     "@moodlehq/cordova-plugin-local-notification": "0.9.0-moodle.3",
     "@moodlehq/cordova-plugin-qrscanner": "3.0.1-moodle.2",
     "@moodlehq/cordova-plugin-zip": "3.1.0-moodle.1",
-    "@moodlehq/phonegap-plugin-push": "2.0.0-moodle.2",
+    "@moodlehq/phonegap-plugin-push": "2.0.0-moodle.3",
     "@ngx-translate/core": "13.0.0",
     "@ngx-translate/http-loader": "6.0.0",
     "@types/chart.js": "2.9.31",

From 831ae1789cc7287a16033677a88fcbfe1ee0b73e Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Mon, 28 Mar 2022 14:23:40 +0200
Subject: [PATCH 0822/1008] MOBILE-3833 blocks: Fix side-blocks contexts

---
 .../block/calendarupcoming/services/block-handler.ts  | 11 ++++++-----
 .../side-blocks-button/side-blocks-button.ts          |  6 ++++--
 .../block/components/side-blocks/side-blocks.html     |  2 +-
 .../block/components/side-blocks/side-blocks.ts       | 11 ++++++-----
 .../components/course-format/course-format.html       |  3 ++-
 .../core-course-format-single-activity.html           |  2 +-
 .../features/courses/pages/dashboard/dashboard.html   |  3 ++-
 src/core/features/sitehome/pages/index/index.html     |  2 +-
 8 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/addons/block/calendarupcoming/services/block-handler.ts b/src/addons/block/calendarupcoming/services/block-handler.ts
index 2201a1c32..ee59a8ed0 100644
--- a/src/addons/block/calendarupcoming/services/block-handler.ts
+++ b/src/addons/block/calendarupcoming/services/block-handler.ts
@@ -20,6 +20,7 @@ import { CoreCourseBlock } from '@features/course/services/course';
 import { Params } from '@angular/router';
 import { makeSingleton } from '@singletons';
 import { AddonCalendarMainMenuHandlerService } from '@addons/calendar/services/handlers/mainmenu';
+import { CoreSites } from '@services/sites';
 
 /**
  * Block handler.
@@ -39,8 +40,11 @@ export class AddonBlockCalendarUpcomingHandlerService extends CoreBlockBaseHandl
      * @return Data or promise resolved with the data.
      */
     getDisplayData(block: CoreCourseBlock, contextLevel: string, instanceId: number): CoreBlockHandlerData {
-        const linkParams: Params = contextLevel == 'course' ? { courseId: instanceId } : {};
-        linkParams.upcoming = true;
+        const linkParams: Params = { upcoming: true };
+
+        if (contextLevel == 'course' && instanceId !== CoreSites.getCurrentSiteHomeId()) {
+            linkParams.courseId = instanceId;
+        }
 
         return {
             title: 'addon.block_calendarupcoming.pluginname',
@@ -48,9 +52,6 @@ export class AddonBlockCalendarUpcomingHandlerService extends CoreBlockBaseHandl
             component: CoreBlockOnlyTitleComponent,
             link: AddonCalendarMainMenuHandlerService.PAGE_NAME,
             linkParams: linkParams,
-            navOptions: {
-                preferCurrentTab: false,
-            },
         };
     }
 
diff --git a/src/core/features/block/components/side-blocks-button/side-blocks-button.ts b/src/core/features/block/components/side-blocks-button/side-blocks-button.ts
index e748b67aa..3bec41f02 100644
--- a/src/core/features/block/components/side-blocks-button/side-blocks-button.ts
+++ b/src/core/features/block/components/side-blocks-button/side-blocks-button.ts
@@ -30,7 +30,8 @@ import { CoreBlockSideBlocksComponent } from '../side-blocks/side-blocks';
 })
 export class CoreBlockSideBlocksButtonComponent implements OnInit, OnDestroy {
 
-    @Input() courseId!: number;
+    @Input() contextLevel!: string;
+    @Input() instanceId!: number;
     @ViewChild('button', { read: ElementRef }) button?: ElementRef<HTMLElement>;
 
     protected element: HTMLElement;
@@ -54,7 +55,8 @@ export class CoreBlockSideBlocksButtonComponent implements OnInit, OnDestroy {
         CoreDomUtils.openSideModal({
             component: CoreBlockSideBlocksComponent,
             componentProps: {
-                courseId: this.courseId,
+                contextLevel: this.contextLevel,
+                instanceId: this.instanceId,
             },
         });
     }
diff --git a/src/core/features/block/components/side-blocks/side-blocks.html b/src/core/features/block/components/side-blocks/side-blocks.html
index 91fee4e1e..d9a0d3473 100644
--- a/src/core/features/block/components/side-blocks/side-blocks.html
+++ b/src/core/features/block/components/side-blocks/side-blocks.html
@@ -14,7 +14,7 @@
     <core-loading [hideUntil]="loaded">
         <ion-list *ngIf="blocks.length > 0">
             <ng-container *ngFor="let block of blocks">
-                <core-block *ngIf="block.visible" [block]="block" contextLevel="course" [instanceId]="courseId"></core-block>
+                <core-block *ngIf="block.visible" [block]="block" [contextLevel]="contextLevel" [instanceId]="instanceId"></core-block>
             </ng-container>
         </ion-list>
 
diff --git a/src/core/features/block/components/side-blocks/side-blocks.ts b/src/core/features/block/components/side-blocks/side-blocks.ts
index b44b32557..56624490f 100644
--- a/src/core/features/block/components/side-blocks/side-blocks.ts
+++ b/src/core/features/block/components/side-blocks/side-blocks.ts
@@ -32,7 +32,8 @@ import { CoreCoursesDashboard } from '@features/courses/services/dashboard';
 })
 export class CoreBlockSideBlocksComponent implements OnInit {
 
-    @Input() courseId?: number;
+    @Input() contextLevel!: string;
+    @Input() instanceId!: number;
 
     @ViewChildren(CoreBlockComponent) blocksComponents?: QueryList<CoreBlockComponent>;
 
@@ -56,8 +57,8 @@ export class CoreBlockSideBlocksComponent implements OnInit {
     async invalidateBlocks(): Promise<void> {
         const promises: Promise<void>[] = [];
 
-        if (this.courseId) {
-            promises.push(CoreCourse.invalidateCourseBlocks(this.courseId));
+        if (this.contextLevel === 'course') {
+            promises.push(CoreCourse.invalidateCourseBlocks(this.instanceId));
         } else {
             promises.push(CoreCoursesDashboard.invalidateDashboardBlocks());
         }
@@ -79,8 +80,8 @@ export class CoreBlockSideBlocksComponent implements OnInit {
      */
     async loadContent(): Promise<void> {
         try {
-            if (this.courseId) {
-                this.blocks = await CoreBlockHelper.getCourseBlocks(this.courseId);
+            if (this.contextLevel === 'course') {
+                this.blocks = await CoreBlockHelper.getCourseBlocks(this.instanceId);
             } else {
                 const blocks = await CoreCoursesDashboard.getDashboardBlocks();
 
diff --git a/src/core/features/course/components/course-format/course-format.html b/src/core/features/course/components/course-format/course-format.html
index 2d8cd3391..3afda6fd4 100644
--- a/src/core/features/course/components/course-format/course-format.html
+++ b/src/core/features/course/components/course-format/course-format.html
@@ -44,7 +44,8 @@
 </core-dynamic-component>
 
 
-<core-block-side-blocks-button slot="fixed" *ngIf="loaded && course && displayBlocks && hasBlocks" [courseId]="course.id">
+<core-block-side-blocks-button slot="fixed" *ngIf="loaded && course && displayBlocks && hasBlocks" contextlevel="course"
+    [instanceId]="course.id">
 </core-block-side-blocks-button>
 
 <!-- Course Index button. -->
diff --git a/src/core/features/course/format/singleactivity/components/core-course-format-single-activity.html b/src/core/features/course/format/singleactivity/components/core-course-format-single-activity.html
index 1e960e8a8..d5c1692c3 100644
--- a/src/core/features/course/format/singleactivity/components/core-course-format-single-activity.html
+++ b/src/core/features/course/format/singleactivity/components/core-course-format-single-activity.html
@@ -2,5 +2,5 @@
     <core-dynamic-component [component]="componentClass" [data]="data"></core-dynamic-component>
 </div>
 
-<core-block-side-blocks-button slot="fixed" *ngIf="course && hasBlocks" [courseId]="course.id">
+<core-block-side-blocks-button slot="fixed" *ngIf="course && hasBlocks" contextLevel="course" [instanceId]="course.id">
 </core-block-side-blocks-button>
diff --git a/src/core/features/courses/pages/dashboard/dashboard.html b/src/core/features/courses/pages/dashboard/dashboard.html
index 38dc1f17e..ee62e3917 100644
--- a/src/core/features/courses/pages/dashboard/dashboard.html
+++ b/src/core/features/courses/pages/dashboard/dashboard.html
@@ -15,7 +15,8 @@
             </ng-container>
         </ion-list>
 
-        <core-block-side-blocks-button slot="fixed" *ngIf="hasSideBlocks"></core-block-side-blocks-button>
+        <core-block-side-blocks-button slot="fixed" *ngIf="hasSideBlocks" contextLevel="user" [instanceId]="userId">
+        </core-block-side-blocks-button>
 
         <core-empty-box *ngIf="blocks.length == 0" icon="fas-cubes" [message]="'core.course.nocontentavailable' | translate">
         </core-empty-box>
diff --git a/src/core/features/sitehome/pages/index/index.html b/src/core/features/sitehome/pages/index/index.html
index f7c3d0856..b780c5565 100644
--- a/src/core/features/sitehome/pages/index/index.html
+++ b/src/core/features/sitehome/pages/index/index.html
@@ -45,7 +45,7 @@
                 </ng-container>
             </ng-container>
         </ion-list>
-        <core-block-side-blocks-button slot="fixed" *ngIf="hasBlocks" [courseId]="siteHomeId">
+        <core-block-side-blocks-button slot="fixed" *ngIf="hasBlocks" contextLevel="course" [instanceId]="siteHomeId">
         </core-block-side-blocks-button>
 
         <core-empty-box *ngIf="!hasContent" icon="fas-box-open" [message]="'core.course.nocontentavailable' | translate">

From 460bd0fa97ce8dc78491548e5940fe4445c93d41 Mon Sep 17 00:00:00 2001
From: Alfonso <alfonsomtb98@gmail.com>
Date: Mon, 28 Mar 2022 14:54:47 +0200
Subject: [PATCH 0823/1008] MOBILE-3833 package.json: fix npm start in windows
 with cross-env-shell

---
 package-lock.json | 28 ++++++++++++++++++++++++++++
 package.json      |  3 ++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/package-lock.json b/package-lock.json
index 4b37ab371..40f640b46 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -118,6 +118,7 @@
         "@typescript-eslint/parser": "4.22.0",
         "check-es-compat": "1.1.1",
         "cordova-plugin-androidx-adapter": "1.1.3",
+        "cross-env": "7.0.3",
         "eslint": "7.25.0",
         "eslint-config-prettier": "8.3.0",
         "eslint-plugin-header": "3.1.1",
@@ -11783,6 +11784,24 @@
       "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
       "dev": true
     },
+    "node_modules/cross-env": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
+      "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.1"
+      },
+      "bin": {
+        "cross-env": "src/bin/cross-env.js",
+        "cross-env-shell": "src/bin/cross-env-shell.js"
+      },
+      "engines": {
+        "node": ">=10.14",
+        "npm": ">=6",
+        "yarn": ">=1"
+      }
+    },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -40336,6 +40355,15 @@
       "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
       "dev": true
     },
+    "cross-env": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
+      "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "^7.0.1"
+      }
+    },
     "cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
diff --git a/package.json b/package.json
index 6621e9942..295ce081c 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "test:coverage": "NODE_ENV=testing gulp && jest --coverage",
     "lint": "NODE_OPTIONS=--max-old-space-size=4096 ng lint",
     "ionic:serve:before": "gulp",
-    "ionic:serve": "./scripts/serve.sh",
+    "ionic:serve": "cross-env-shell ./scripts/serve.sh",
     "ionic:build:before": "gulp"
   },
   "dependencies": {
@@ -147,6 +147,7 @@
     "@typescript-eslint/parser": "4.22.0",
     "check-es-compat": "1.1.1",
     "cordova-plugin-androidx-adapter": "1.1.3",
+    "cross-env": "7.0.3",
     "eslint": "7.25.0",
     "eslint-config-prettier": "8.3.0",
     "eslint-plugin-header": "3.1.1",

From 279deeb082c9837048e1ae04b465109ed2fd129c Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Mon, 28 Mar 2022 16:44:25 +0200
Subject: [PATCH 0824/1008] MOBILE-3833 calendar: Fix calendar view reactivity

---
 .../calendar/components/calendar/calendar.ts  | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/addons/calendar/components/calendar/calendar.ts b/src/addons/calendar/components/calendar/calendar.ts
index 4f984d83c..35b8f92d1 100644
--- a/src/addons/calendar/components/calendar/calendar.ts
+++ b/src/addons/calendar/components/calendar/calendar.ts
@@ -23,6 +23,7 @@ import {
     KeyValueDiffers,
     KeyValueDiffer,
     ViewChild,
+    HostBinding,
 } from '@angular/core';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreSites } from '@services/sites';
@@ -64,6 +65,7 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
     @Input() initialYear?: number; // Initial year to load.
     @Input() initialMonth?: number; // Initial month to load.
     @Input() filter?: AddonCalendarFilter; // Filter to apply.
+    @Input() hidden?: boolean; // Whether the component is hidden.
     @Input() canNavigate?: string | boolean; // Whether to include arrows to change the month. Defaults to true.
     @Input() displayNavButtons?: string | boolean; // Whether to display nav buttons created by this component. Defaults to true.
     @Output() onEventClicked = new EventEmitter<number>();
@@ -74,14 +76,13 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
     loaded = false;
 
     protected currentSiteId: string;
-    protected differ: KeyValueDiffer<unknown, unknown>; // To detect changes in the data input.
+    protected hiddenDiffer?: boolean; // To detect changes in the hidden input.
+    protected filterDiffer: KeyValueDiffer<unknown, unknown>; // To detect changes in the filters input.
     // Observers and listeners.
     protected undeleteEventObserver: CoreEventObserver;
     protected managerUnsubscribe?: () => void;
 
-    constructor(
-        differs: KeyValueDiffers,
-    ) {
+    constructor(differs: KeyValueDiffers) {
         this.currentSiteId = CoreSites.getCurrentSiteId();
 
         // Listen for events "undeleted" (offline).
@@ -104,7 +105,12 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
             this.currentSiteId,
         );
 
-        this.differ = differs.find([]).create();
+        this.hiddenDiffer = this.hidden;
+        this.filterDiffer = differs.find(this.filter ?? {}).create();
+    }
+
+    @HostBinding('attr.hidden') get hiddenAttribute(): string | null {
+        return this.hidden ? 'hidden' : null;
     }
 
     /**
@@ -137,7 +143,7 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
 
         if (items?.length) {
             // Check if there's any change in the filter object.
-            const changes = this.differ.diff(this.filter || {});
+            const changes = this.filterDiffer.diff(this.filter ?? {});
             if (changes) {
                 items.forEach((month) => {
                     if (month.loaded && month.weeks) {
@@ -146,6 +152,14 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
                 });
             }
         }
+
+        if (this.hiddenDiffer !== this.hidden) {
+            this.hiddenDiffer = this.hidden;
+
+            if (!this.hidden) {
+                this.slides?.slides?.getSwiper().then(swipper => swipper.update());
+            }
+        }
     }
 
     get timeFormat(): string {

From 1da073eefa5abe4f203f6d475bea7d38dfe302e2 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 4 Mar 2022 09:42:18 +0100
Subject: [PATCH 0825/1008] MOBILE-3919 assign: Support time limit in assigns

---
 scripts/langindex.json                        |   7 +
 .../index/addon-mod-assign-index.html         |   8 ++
 .../mod/assign/components/index/index.ts      |  21 ++-
 .../addon-mod-assign-submission.html          | 114 ++++++++++------
 .../components/submission/submission.scss     |  22 ++-
 .../components/submission/submission.ts       | 116 ++++++++++------
 src/addons/mod/assign/lang.json               |   7 +
 src/addons/mod/assign/pages/edit/edit.html    |   5 +
 src/addons/mod/assign/pages/edit/edit.scss    |  17 +++
 src/addons/mod/assign/pages/edit/edit.ts      |  62 +++++++++
 .../mod/assign/services/assign-helper.ts      |  19 +++
 src/addons/mod/assign/services/assign.ts      |  72 ++++++++++
 .../mod/assign/services/handlers/prefetch.ts  |   3 +-
 .../mod/h5pactivity/services/h5pactivity.ts   |   4 +-
 .../mod/lesson/pages/player/player.html       |   2 +-
 src/addons/mod/quiz/pages/player/player.scss  |  20 +++
 src/core/components/timer/core-timer.html     |  23 +++-
 src/core/components/timer/timer.scss          |  18 ---
 src/core/components/timer/timer.ts            |  52 ++++++--
 src/core/initializers/initialize-services.ts  |   2 +
 src/core/services/utils/dom.ts                |  20 ++-
 src/core/services/utils/time.ts               | 126 +++++++-----------
 src/theme/theme.base.scss                     |   9 ++
 23 files changed, 536 insertions(+), 213 deletions(-)
 create mode 100644 src/addons/mod/assign/pages/edit/edit.scss

diff --git a/scripts/langindex.json b/scripts/langindex.json
index ec7f4e8eb..ef683936a 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -331,14 +331,18 @@
   "addon.mod_assign.allowsubmissionsfromdatesummary": "assign",
   "addon.mod_assign.applytoteam": "assign",
   "addon.mod_assign.assignmentisdue": "assign",
+  "addon.mod_assign.assigntimeleft": "assign",
   "addon.mod_assign.attemptnumber": "assign",
   "addon.mod_assign.attemptreopenmethod": "assign",
   "addon.mod_assign.attemptreopenmethod_manual": "assign",
   "addon.mod_assign.attemptreopenmethod_untilpass": "assign",
   "addon.mod_assign.attemptsettings": "assign",
+  "addon.mod_assign.beginassignment": "assign",
+  "addon.mod_assign.caneditsubmission": "assign",
   "addon.mod_assign.cannoteditduetostatementsubmission": "local_moodlemobileapp",
   "addon.mod_assign.cannotgradefromapp": "local_moodlemobileapp",
   "addon.mod_assign.cannotsubmitduetostatementsubmission": "local_moodlemobileapp",
+  "addon.mod_assign.confirmstart": "assign",
   "addon.mod_assign.confirmsubmission": "assign",
   "addon.mod_assign.currentattempt": "assign",
   "addon.mod_assign.currentattemptof": "assign",
@@ -416,7 +420,10 @@
   "addon.mod_assign.submitassignment_help": "assign",
   "addon.mod_assign.submittedearly": "assign",
   "addon.mod_assign.submittedlate": "assign",
+  "addon.mod_assign.submittedovertime": "assign",
+  "addon.mod_assign.submittedundertime": "assign",
   "addon.mod_assign.syncblockedusercomponent": "local_moodlemobileapp",
+  "addon.mod_assign.timelimit": "assign",
   "addon.mod_assign.timemodified": "assign",
   "addon.mod_assign.timeremaining": "assign",
   "addon.mod_assign.ungroupedusers": "assign",
diff --git a/src/addons/mod/assign/components/index/addon-mod-assign-index.html b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
index c58552c55..ff974dd33 100644
--- a/src/addons/mod/assign/components/index/addon-mod-assign-index.html
+++ b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
@@ -33,6 +33,14 @@
                 </ion-select>
             </ion-item>
 
+            <ion-item class="ion-text-wrap">
+                <ion-label>
+                    <h2>{{ 'core.course.hiddenfromstudents' | translate }}</h2>
+                    <p *ngIf="module.visible">{{ 'core.no' | translate }}</p>
+                    <p *ngIf="!module.visible">{{ 'core.yes' | translate }}</p>
+                </ion-label>
+            </ion-item>
+
             <ion-item class="ion-text-wrap" *ngIf="timeRemaining">
                 <ion-label>
                     <h2>{{ 'addon.mod_assign.timeremaining' | translate }}</h2>
diff --git a/src/addons/mod/assign/components/index/index.ts b/src/addons/mod/assign/components/index/index.ts
index b2ae03e97..e39660b97 100644
--- a/src/addons/mod/assign/components/index/index.ts
+++ b/src/addons/mod/assign/components/index/index.ts
@@ -86,6 +86,7 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
     protected savedObserver?: CoreEventObserver;
     protected submittedObserver?: CoreEventObserver;
     protected gradedObserver?: CoreEventObserver;
+    protected startedObserver?: CoreEventObserver;
 
     constructor(
         protected content?: IonContent,
@@ -136,6 +137,13 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
             }
         }, this.siteId);
 
+        this.startedObserver = CoreEvents.on(AddonModAssignProvider.STARTED_EVENT, (data) => {
+            if (this.assign && data.assignmentId == this.assign.id) {
+                // Assignment submission started, refresh data.
+                this.showLoadingAndRefresh(false, false);
+            }
+        }, this.siteId);
+
         await this.loadContent(false, true);
     }
 
@@ -167,12 +175,17 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
         if (submissions.canviewsubmissions) {
 
             // Calculate the messages to display about time remaining and late submissions.
+            this.timeRemaining = '';
+            this.lateSubmissions = '';
+
             if (this.assign.duedate > 0) {
                 if (this.assign.duedate - time <= 0) {
                     this.timeRemaining = Translate.instant('addon.mod_assign.assignmentisdue');
                 } else {
-                    this.timeRemaining = CoreTimeUtils.formatDuration(this.assign.duedate - time, 3);
+                    this.timeRemaining = CoreTimeUtils.formatTime(this.assign.duedate - time);
+                }
 
+                if (this.assign.duedate < time) {
                     if (this.assign.cutoffdate) {
                         if (this.assign.cutoffdate > time) {
                             this.lateSubmissions = Translate.instant(
@@ -182,13 +195,8 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
                         } else {
                             this.lateSubmissions = Translate.instant('addon.mod_assign.nomoresubmissionsaccepted');
                         }
-                    } else {
-                        this.lateSubmissions = '';
                     }
                 }
-            } else {
-                this.timeRemaining = '';
-                this.lateSubmissions = '';
             }
 
             // Check if groupmode is enabled to avoid showing wrong numbers.
@@ -398,6 +406,7 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
         this.savedObserver?.off();
         this.submittedObserver?.off();
         this.gradedObserver?.off();
+        this.startedObserver?.off();
     }
 
 }
diff --git a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
index 7cd548372..42dde1d55 100644
--- a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
+++ b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
@@ -1,5 +1,15 @@
 <core-loading [hideUntil]="loaded">
     <div class="list-item-limited-width">
+        <!-- Time limit is over. -->
+        <ion-card *ngIf="timeLimitFinished" class="core-danger-card">
+            <ion-item class="ion-text-wrap">
+                <ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
+                <ion-label>
+                    <p>{{ 'addon.mod_assign.caneditsubmission' | translate }}</p>
+                </ion-label>
+            </ion-item>
+        </ion-card>
+
         <!-- User and status of the submission. -->
         <ion-item class="ion-text-wrap" *ngIf="!blindMarking && user" core-user-link [userId]="submitId" [courseId]="courseId"
             [attr.aria-label]="user!.fullname">
@@ -31,33 +41,36 @@
             <!-- View the submission tab. -->
             <core-tab [title]="'addon.mod_assign.submission' | translate" id="submission">
                 <ng-template>
-                    <addon-mod-assign-submission-plugin *ngFor="let plugin of submissionPlugins" [assign]="assign"
-                        [submission]="userSubmission" [plugin]="plugin">
-                    </addon-mod-assign-submission-plugin>
-
                     <!-- Render some data about the submission. -->
-                    <ion-item class="ion-text-wrap"
-                        *ngIf="userSubmission && userSubmission!.status != statusNew && userSubmission!.timemodified">
+                    <ion-item class="ion-text-wrap" *ngIf="currentAttempt && !isGrading">
                         <ion-label>
-                            <h2>{{ 'addon.mod_assign.timemodified' | translate }}</h2>
-                            <p>{{ userSubmission!.timemodified * 1000 | coreFormatDate }}</p>
+                            <h2>{{ 'addon.mod_assign.attemptnumber' | translate }}</h2>
+                            <p *ngIf="assign!.maxattempts == unlimitedAttempts">
+                                {{ 'addon.mod_assign.outof' | translate :
+                                {'$a': {'current': currentAttempt, 'total': maxAttemptsText} } }}
+                            </p>
+                            <p *ngIf="assign!.maxattempts != unlimitedAttempts">
+                                {{ 'addon.mod_assign.outof' | translate :
+                                {'$a': {'current': currentAttempt, 'total': assign!.maxattempts} } }}
+                            </p>
                         </ion-label>
                     </ion-item>
 
-                    <ion-item class="ion-text-wrap" *ngIf="timeRemaining" [ngClass]="[timeRemainingClass]">
+                    <!-- Submission is locked. -->
+                    <ion-item class="ion-text-wrap" *ngIf="lastAttempt?.locked">
                         <ion-label>
-                            <h2>{{ 'addon.mod_assign.timeremaining' | translate }}</h2>
-                            <p [innerHTML]="timeRemaining"></p>
+                            <h2>{{ 'addon.mod_assign.submissionslocked' | translate }}</h2>
                         </ion-label>
                     </ion-item>
 
+                    <!-- Dates. -->
                     <ion-item class="ion-text-wrap" *ngIf="showDates && fromDate && !isSubmittedForGrading">
                         <ion-label>
                             <p *ngIf="assign!.intro"
                                 [innerHTML]="'addon.mod_assign.allowsubmissionsfromdatesummary' | translate: {'$a': fromDate}">
                             </p>
                             <p *ngIf="!assign!.intro" [innerHTML]="'addon.mod_assign.allowsubmissionsanddescriptionfromdatesummary' | translate:
-                                {'$a': fromDate}">
+                                    {'$a': fromDate}">
                             </p>
                         </ion-label>
                     </ion-item>
@@ -84,20 +97,48 @@
                         </ion-label>
                     </ion-item>
 
-                    <ion-item class="ion-text-wrap" *ngIf="currentAttempt && !isGrading">
+                    <!-- Time remaining. -->
+                    <ion-item class="ion-text-wrap" *ngIf="timeRemaining || timeLimitEndTime > 0" [ngClass]="[timeRemainingClass]">
                         <ion-label>
-                            <h2>{{ 'addon.mod_assign.attemptnumber' | translate }}</h2>
-                            <p *ngIf="assign!.maxattempts == unlimitedAttempts">
-                                {{ 'addon.mod_assign.outof' | translate :
-                                {'$a': {'current': currentAttempt, 'total': maxAttemptsText} } }}
-                            </p>
-                            <p *ngIf="assign!.maxattempts != unlimitedAttempts">
-                                {{ 'addon.mod_assign.outof' | translate :
-                                {'$a': {'current': currentAttempt, 'total': assign!.maxattempts} } }}
-                            </p>
+                            <h2>{{ 'addon.mod_assign.timeremaining' | translate }}</h2>
+                            <p *ngIf="!timeLimitEndTime" [innerHTML]="timeRemaining"></p>
+                            <core-timer *ngIf="timeLimitEndTime > 0" [endTime]="timeLimitEndTime" mode="basic" timeUpText="00:00:00"
+                                [timeLeftClassThreshold]="-1" [underTimeClassThresholds]="[300, 900]" (finished)="timeUp()">
+                            </core-timer>
                         </ion-label>
                     </ion-item>
 
+                    <!-- Time limit. -->
+                    <ion-item class="ion-text-wrap" *ngIf="assign && assign.timelimit">
+                        <ion-label>
+                            <h2>{{ 'addon.mod_assign.timelimit' | translate }}</h2>
+                            <p>{{ assign.timelimit | coreDuration }}</p>
+                        </ion-label>
+                    </ion-item>
+
+                    <!-- Editing status. -->
+                    <ion-item class="ion-text-wrap" *ngIf="lastAttempt && isSubmittedForGrading && lastAttempt!.caneditowner !== undefined"
+                        [ngClass]="{submissioneditable: lastAttempt!.caneditowner, submissionnoteditable: !lastAttempt!.caneditowner}">
+                        <ion-label>
+                            <h2>{{ 'addon.mod_assign.editingstatus' | translate }}</h2>
+                            <p *ngIf="lastAttempt!.caneditowner">{{ 'addon.mod_assign.submissioneditable' | translate }}</p>
+                            <p *ngIf="!lastAttempt!.caneditowner">{{ 'addon.mod_assign.submissionnoteditable' | translate }}</p>
+                        </ion-label>
+                    </ion-item>
+
+                    <!-- Last modified. -->
+                    <ion-item class="ion-text-wrap"
+                        *ngIf="userSubmission && userSubmission!.status != statusNew && userSubmission!.timemodified">
+                        <ion-label>
+                            <h2>{{ 'addon.mod_assign.timemodified' | translate }}</h2>
+                            <p>{{ userSubmission!.timemodified * 1000 | coreFormatDate }}</p>
+                        </ion-label>
+                    </ion-item>
+
+                    <addon-mod-assign-submission-plugin *ngFor="let plugin of submissionPlugins" [assign]="assign"
+                        [submission]="userSubmission" [plugin]="plugin">
+                    </addon-mod-assign-submission-plugin>
+
                     <!-- Add or edit submission. -->
                     <ion-item class="ion-text-wrap" *ngIf="canEdit">
                         <ion-label>
@@ -109,7 +150,12 @@
                                 <!-- If no submission or is new, show add submission. -->
                                 <ion-button expand="block" class="ion-text-wrap" (click)="goToEdit()" *ngIf="!hasOffline &&
                                     (!userSubmission || !userSubmission!.status || userSubmission!.status == statusNew)">
-                                    {{ 'addon.mod_assign.addsubmission' | translate }}
+                                    <ng-container *ngIf="!assign?.timelimit || userSubmission?.timestarted">
+                                        {{ 'addon.mod_assign.addsubmission' | translate }}
+                                    </ng-container>
+                                    <ng-container *ngIf="assign?.timelimit && (!userSubmission || !userSubmission.timestarted)">
+                                        {{ 'addon.mod_assign.beginassignment' | translate }}
+                                    </ng-container>
                                 </ion-button>
                                 <!-- If reopened, show addfromprevious and addnewattempt. -->
                                 <ng-container *ngIf="!hasOffline && userSubmission?.status == statusReopened">
@@ -122,9 +168,8 @@
                                     </ion-button>
                                 </ng-container>
                                 <!-- Else show editsubmission. -->
-                                <ion-button expand="block" class="ion-text-wrap" *ngIf="!hasOffline &&
-                                    userSubmission && userSubmission!.status &&
-                                    userSubmission!.status != statusNew &&
+                                <ion-button expand="block" class="ion-text-wrap" *ngIf="!hasOffline && userSubmission &&
+                                    userSubmission!.status && userSubmission!.status != statusNew &&
                                     userSubmission!.status != statusReopened" (click)="goToEdit()">
                                     {{ 'addon.mod_assign.editsubmission' | translate }}
                                 </ion-button>
@@ -191,23 +236,6 @@
                             </ion-item>
                         </ng-container>
                     </ng-container>
-
-                    <!-- Submission is locked. -->
-                    <ion-item class="ion-text-wrap" *ngIf="lastAttempt?.locked">
-                        <ion-label>
-                            <h2>{{ 'addon.mod_assign.submissionslocked' | translate }}</h2>
-                        </ion-label>
-                    </ion-item>
-
-                    <!-- Editing status. -->
-                    <ion-item class="ion-text-wrap" *ngIf="lastAttempt && isSubmittedForGrading && lastAttempt!.caneditowner !== undefined"
-                        [ngClass]="{submissioneditable: lastAttempt!.caneditowner, submissionnoteditable: !lastAttempt!.caneditowner}">
-                        <ion-label>
-                            <h2>{{ 'addon.mod_assign.editingstatus' | translate }}</h2>
-                            <p *ngIf="lastAttempt!.caneditowner">{{ 'addon.mod_assign.submissioneditable' | translate }}</p>
-                            <p *ngIf="!lastAttempt!.caneditowner">{{ 'addon.mod_assign.submissionnoteditable' | translate }}</p>
-                        </ion-label>
-                    </ion-item>
                 </ng-template>
             </core-tab>
 
diff --git a/src/addons/mod/assign/components/submission/submission.scss b/src/addons/mod/assign/components/submission/submission.scss
index 935b96fe7..eb68d7add 100644
--- a/src/addons/mod/assign/components/submission/submission.scss
+++ b/src/addons/mod/assign/components/submission/submission.scss
@@ -1,20 +1,20 @@
 :host ::ng-deep {
-    div.latesubmission,
-    div.overdue {
+    ion-item.latesubmission,
+    ion-item.overdue {
         border-bottom: 3px solid var(--danger) !important;
         ion-icon {
             color: var(--danger);
         }
     }
 
-    div.earlysubmission {
+    ion-item.earlysubmission {
         border-bottom: 3px solid var(--success) !important;
         ion-icon {
             color: var(--success);
         }
     }
 
-    div.submissioneditable p {
+    ion-item.submissioneditable p {
         color: var(--danger);
     }
 
@@ -26,10 +26,22 @@
         margin-left: 2px;
         margin-right: 2px;
     }
+
+    core-timer .core-timer {
+        &.core-timer-under-300 {
+            background-color: var(--danger-tint);
+            color: var(--danger-shade);
+        }
+
+        &.core-timer-under-900 {
+            background-color: var(--warning-tint);
+            color: var(--warning-shade);
+        }
+    }
 }
 
 :host-context(body.dark) ::ng-deep {
-    div.submissioneditable p {
+    ion-item.submissioneditable p {
         color: var(--danger-tint);
     }
 }
diff --git a/src/addons/mod/assign/components/submission/submission.ts b/src/addons/mod/assign/components/submission/submission.ts
index 9d5735936..a5566cbb6 100644
--- a/src/addons/mod/assign/components/submission/submission.ts
+++ b/src/addons/mod/assign/components/submission/submission.ts
@@ -106,6 +106,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
     submissionPlugins: AddonModAssignPlugin[] = []; // List of submission plugins.
     timeRemaining = ''; // Message about time remaining.
     timeRemainingClass = ''; // Class to apply to time remaining message.
+    timeLimitEndTime = 0; // If time limit is enabled and submission is ongoing, the end time for the timer.
     statusTranslated?: string; // Status.
     statusColor = ''; // Color to apply to the status.
     unsupportedEditPlugins: string[] = []; // List of submission plugins that don't support edit.
@@ -126,6 +127,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
     gradeUrl?: string; // URL to grade in browser.
     isPreviousAttemptEmpty = true; // Whether the previous attempt contains an empty submission.
     showDates = false; // Whether to show some dates.
+    timeLimitFinished = false; // Whether there is a time limit and it finished, so the user will submit late.
 
     // Some constants.
     statusNew = AddonModAssignSubmissionStatusValues.NEW;
@@ -200,7 +202,12 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
             return;
         }
 
-        if (this.assign.duedate <= 0) {
+        const submissionStarted = !!this.userSubmission?.timestarted;
+        this.timeLimitEndTime = 0;
+        this.timeLimitFinished = false;
+
+        if (this.assign.duedate <= 0 && !submissionStarted) {
+            // No due date and no countdown.
             this.timeRemaining = '';
             this.timeRemainingClass = '';
 
@@ -208,53 +215,53 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
         }
 
         const time = CoreTimeUtils.timestamp();
-        const dueDate = response.lastattempt?.extensionduedate
-            ? response.lastattempt.extensionduedate
-            : this.assign.duedate;
-        const timeRemaining = dueDate - time;
+        const timeLimitEnabled = this.assign.timelimit && submissionStarted;
+        const dueDateReached = this.assign.duedate > 0 && this.assign.duedate - time <= 0;
+        const timeLimitEnabledBeforeDueDate = timeLimitEnabled && !dueDateReached;
 
-        if (timeRemaining > 0) {
-            this.timeRemaining = CoreTimeUtils.formatDuration(timeRemaining, 3);
-            this.timeRemainingClass = '';
+        if (this.userSubmission && this.userSubmission.status === AddonModAssignSubmissionStatusValues.SUBMITTED) {
+            // Submitted, display the relevant early/late message.
+            const lateCalculation = this.userSubmission.timemodified -
+                (timeLimitEnabledBeforeDueDate ? this.userSubmission.timecreated : 0);
+            const lateThreshold = timeLimitEnabledBeforeDueDate ? this.assign.timelimit || 0 : this.assign.duedate;
+            const earlyString = timeLimitEnabledBeforeDueDate ? 'submittedundertime' : 'submittedearly';
+            const lateString = timeLimitEnabledBeforeDueDate ? 'submittedovertime' : 'submittedlate';
+            const onTime = lateCalculation <= lateThreshold;
 
-            return;
-        }
-
-        // Not submitted.
-        if (!this.userSubmission || this.userSubmission.status != AddonModAssignSubmissionStatusValues.SUBMITTED) {
-
-            if (response.lastattempt?.submissionsenabled || response.gradingsummary?.submissionsenabled) {
-                this.timeRemaining = Translate.instant(
-                    'addon.mod_assign.overdue',
-                    { $a: CoreTimeUtils.formatDuration(-timeRemaining, 3) },
-                );
-                this.timeRemainingClass = 'overdue';
-
-                return;
-            }
-
-            this.timeRemaining = Translate.instant('addon.mod_assign.duedatereached');
-            this.timeRemainingClass = '';
-
-            return;
-        }
-
-        const timeSubmittedDiff = this.userSubmission.timemodified - dueDate;
-        if (timeSubmittedDiff > 0) {
             this.timeRemaining = Translate.instant(
-                'addon.mod_assign.submittedlate',
-                { $a: CoreTimeUtils.formatDuration(timeSubmittedDiff, 2) },
+                'addon.mod_assign.' + (onTime ? earlyString : lateString),
+                { $a: CoreTimeUtils.formatTime(Math.abs(lateCalculation - lateThreshold)) },
             );
-            this.timeRemainingClass = 'latesubmission';
+            this.timeRemainingClass = onTime ? 'earlysubmission' : 'latesubmission';
 
             return;
         }
 
-        this.timeRemaining = Translate.instant(
-            'addon.mod_assign.submittedearly',
-            { $a: CoreTimeUtils.formatDuration(-timeSubmittedDiff, 2) },
-        );
-        this.timeRemainingClass = 'earlysubmission';
+        if (dueDateReached) {
+            // There is no submission, due date has passed, show assignment is overdue.
+            const submissionsEnabled = response.lastattempt?.submissionsenabled || response.gradingsummary?.submissionsenabled;
+            this.timeRemaining = Translate.instant(
+                'addon.mod_assign.' + (submissionsEnabled ? 'overdue' : 'duedatereached'),
+                { $a: CoreTimeUtils.formatTime(time - this.assign.duedate) },
+            );
+            this.timeRemainingClass = 'overdue';
+            this.timeLimitFinished = true;
+
+            return;
+        }
+
+        if (timeLimitEnabled && submissionStarted) {
+            // An attempt has started and there is a time limit, display the time limit.
+            this.timeRemaining = '';
+            this.timeRemainingClass = 'timeremaining';
+            this.timeLimitEndTime = AddonModAssignHelper.calculateEndTime(this.assign, this.userSubmission);
+
+            return;
+        }
+
+        // Assignment is not overdue, and no submission has been made. Just display the due date.
+        this.timeRemaining = CoreTimeUtils.formatTime(this.assign.duedate - time);
+        this.timeRemainingClass = 'timeremaining';
     }
 
     /**
@@ -292,7 +299,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
 
         if (!this.previousAttempt?.submission) {
             // Cannot access previous attempts, just go to edit.
-            return this.goToEdit();
+            return this.goToEdit(true);
         }
 
         const previousSubmission = this.previousAttempt.submission;
@@ -319,7 +326,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
         try {
             await AddonModAssignHelper.copyPreviousAttempt(this.assign, previousSubmission);
             // Now go to edit.
-            this.goToEdit();
+            this.goToEdit(true);
 
             if (!this.assign.submissiondrafts && this.userSubmission) {
                 // No drafts allowed, so it was submitted. Trigger event.
@@ -352,8 +359,24 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
 
     /**
      * Go to the page to add or edit submission.
+     *
+     * @param afterCopyPrevious Whether the user has just copied the previous submission.
      */
-    goToEdit(): void {
+    async goToEdit(afterCopyPrevious = false): Promise<void> {
+        if (!afterCopyPrevious && this.assign?.timelimit && (!this.userSubmission || !this.userSubmission.timestarted)) {
+            try {
+                await CoreDomUtils.showConfirm(
+                    Translate.instant('addon.mod_assign.confirmstart', {
+                        $a: CoreTimeUtils.formatTime(this.assign.timelimit),
+                    }),
+                    undefined,
+                    Translate.instant('addon.mod_assign.beginassignment'),
+                );
+            } catch {
+                return; // User canceled.
+            }
+        }
+
         CoreNavigator.navigateToSitePath(
             AddonModAssignModuleHandlerService.PAGE_NAME + '/' + this.courseId + '/' + this.moduleId + '/edit',
             {
@@ -1175,6 +1198,13 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
         this.setGradeSyncBlocked(tab.id === 'grade');
     }
 
+    /**
+     * Function called when the time is up.
+     */
+    timeUp(): void {
+        this.timeLimitFinished = true;
+    }
+
     /**
      * Component being destroyed.
      */
diff --git a/src/addons/mod/assign/lang.json b/src/addons/mod/assign/lang.json
index d79de9089..ef812a4d9 100644
--- a/src/addons/mod/assign/lang.json
+++ b/src/addons/mod/assign/lang.json
@@ -9,14 +9,18 @@
     "allowsubmissionsfromdatesummary": "This assignment will accept submissions from <strong>{{$a}}</strong>",
     "applytoteam": "Apply grades and feedback to entire group",
     "assignmentisdue": "Assignment is due",
+    "assigntimeleft": "Time left",
     "attemptnumber": "Attempt number",
     "attemptreopenmethod": "Additional attempts",
     "attemptreopenmethod_manual": "Manually",
     "attemptreopenmethod_untilpass": "Automatically until pass",
     "attemptsettings": "Attempt settings",
+    "beginassignment": "Begin assignment",
+    "caneditsubmission": "You can submit/edit submission after time limit passed, but it will be marked as late.",
     "cannoteditduetostatementsubmission": "You can't add or edit a submission in the app because the submission statement could not be retrieved from the site.",
     "cannotgradefromapp": "Certain grading methods are not yet supported by the app and cannot be modified.",
     "cannotsubmitduetostatementsubmission": "You can't make a submission in the app because the submission statement could not be retrieved from the site.",
+    "confirmstart": "Your submission will have a time limit of {{$a}}. When you start, the timer will begin to count down and cannot be paused. You must finish your submission before it expires. Are you sure you wish to start now?",
     "confirmsubmission": "Are you sure you want to submit your work for grading? You will not be able to make any more changes.",
     "currentattempt": "This is attempt {{$a}}.",
     "currentattemptof": "This is attempt {{$a.attemptnumber}} ( {{$a.maxattempts}} attempts allowed ).",
@@ -94,7 +98,10 @@
     "submitassignment_help": "Once this assignment is submitted you will not be able to make any more changes.",
     "submittedearly": "Assignment was submitted {{$a}} early",
     "submittedlate": "Assignment was submitted {{$a}} late",
+    "submittedovertime": "Assignment was submitted {{$a}} over the time limit",
+    "submittedundertime": "Assignment was submitted {{$a}} under the time limit",
     "syncblockedusercomponent": "user grade",
+    "timelimit": "Time limit",
     "timemodified": "Last modified",
     "timeremaining": "Time remaining",
     "ungroupedusers": "The setting 'Require group to make submission' is enabled and some users are either not a member of any group, or are a member of more than one group, so are unable to make submissions.",
diff --git a/src/addons/mod/assign/pages/edit/edit.html b/src/addons/mod/assign/pages/edit/edit.html
index fab97200b..e661cbd84 100644
--- a/src/addons/mod/assign/pages/edit/edit.html
+++ b/src/addons/mod/assign/pages/edit/edit.html
@@ -20,6 +20,11 @@
     <core-loading [hideUntil]="loaded">
         <ion-list *ngIf="userSubmission && userSubmission.plugins && userSubmission.plugins.length">
             <!-- @todo: plagiarism_print_disclosure -->
+            <core-timer *ngIf="timeLimitEndTime > 0" [endTime]="timeLimitEndTime" (finished)="timeUp()" timeUpText="00:00:00"
+                [timerText]="'addon.mod_assign.assigntimeleft' | translate" [align]="'center'" [timeLeftClassThreshold]="-1"
+                [underTimeClassThresholds]="[300, 900]" class="ion-margin-horizontal">
+            </core-timer>
+
             <form name="addon-mod_assign-edit-form" #editSubmissionForm>
                 <!-- Submission statement. -->
                 <ion-item class="ion-text-wrap" *ngIf="submissionStatement">
diff --git a/src/addons/mod/assign/pages/edit/edit.scss b/src/addons/mod/assign/pages/edit/edit.scss
new file mode 100644
index 000000000..de79e53ed
--- /dev/null
+++ b/src/addons/mod/assign/pages/edit/edit.scss
@@ -0,0 +1,17 @@
+:host ::ng-deep {
+    core-timer {
+        display: block;
+
+        .core-timer {
+            &.core-timer-under-300 {
+                background-color: var(--danger-tint);
+                color: var(--danger-shade);
+            }
+
+            &.core-timer-under-900 {
+                background-color: var(--warning-tint);
+                color: var(--warning-shade);
+            }
+        }
+    }
+}
diff --git a/src/addons/mod/assign/pages/edit/edit.ts b/src/addons/mod/assign/pages/edit/edit.ts
index 6e0f06b8d..7f76ca8f4 100644
--- a/src/addons/mod/assign/pages/edit/edit.ts
+++ b/src/addons/mod/assign/pages/edit/edit.ts
@@ -32,6 +32,7 @@ import {
     AddonModAssignSubmissionStatusOptions,
     AddonModAssignGetSubmissionStatusWSResponse,
     AddonModAssignSavePluginData,
+    AddonModAssignSubmissionStatusValues,
 } from '../../services/assign';
 import { AddonModAssignHelper } from '../../services/assign-helper';
 import { AddonModAssignOffline } from '../../services/assign-offline';
@@ -44,6 +45,7 @@ import { CoreUtils } from '@services/utils/utils';
 @Component({
     selector: 'page-addon-mod-assign-edit',
     templateUrl: 'edit.html',
+    styleUrls: ['edit.scss'],
 })
 export class AddonModAssignEditPage implements OnInit, OnDestroy, CanLeave {
 
@@ -58,6 +60,7 @@ export class AddonModAssignEditPage implements OnInit, OnDestroy, CanLeave {
     submissionStatement?: string; // The submission statement.
     submissionStatementAccepted = false; // Whether submission statement is accepted.
     loaded = false; // Whether data has been loaded.
+    timeLimitEndTime = 0; // If time limit is enabled, the end time for the timer.
 
     protected userId: number; // User doing the submission.
     protected isBlind = false; // Whether blind is used.
@@ -179,6 +182,8 @@ export class AddonModAssignEditPage implements OnInit, OnDestroy, CanLeave {
                 throw new CoreError(Translate.instant('core.nopermissions', { $a: this.editText }));
             }
 
+            submissionStatus = await this.startSubmissionIfNeeded(submissionStatus, options);
+
             this.allowOffline = true; // If offline isn't allowed we shouldn't have reached this point.
             // Only show submission statement if we are editing our own submission.
             if (this.assign.requiresubmissionstatement && !this.assign.submissiondrafts && this.userId == currentUserId) {
@@ -187,6 +192,12 @@ export class AddonModAssignEditPage implements OnInit, OnDestroy, CanLeave {
                 this.submissionStatement = undefined;
             }
 
+            if (this.assign.timelimit && this.userSubmission?.timestarted) {
+                this.timeLimitEndTime = AddonModAssignHelper.calculateEndTime(this.assign, this.userSubmission);
+            } else {
+                this.timeLimitEndTime = 0;
+            }
+
             try {
                 // Check if there's any offline data for this submission.
                 const offlineData = await AddonModAssignOffline.getSubmission(this.assign.id, this.userId);
@@ -204,6 +215,45 @@ export class AddonModAssignEditPage implements OnInit, OnDestroy, CanLeave {
         }
     }
 
+    /**
+     * Start the submission if needed.
+     *
+     * @param submissionStatus Current submission status.
+     * @param options Options.
+     * @return Promise resolved with the new submission status if it changed, original submission status otherwise.
+     */
+    protected async startSubmissionIfNeeded(
+        submissionStatus: AddonModAssignGetSubmissionStatusWSResponse,
+        options: AddonModAssignSubmissionStatusOptions,
+    ): Promise<AddonModAssignGetSubmissionStatusWSResponse> {
+        if (!this.assign || !this.assign.timelimit) {
+            // Submission only needs to be started if there's a timelimit.
+            return submissionStatus;
+        }
+
+        if (this.userSubmission && this.userSubmission.status !== AddonModAssignSubmissionStatusValues.NEW &&
+            this.userSubmission.status !== AddonModAssignSubmissionStatusValues.REOPENED) {
+            // There is an ongoing submission, no need to start it.
+            return submissionStatus;
+        }
+
+        await AddonModAssign.startSubmission(this.assign.id);
+
+        CoreEvents.trigger(AddonModAssignProvider.STARTED_EVENT, {
+            assignmentId: this.assign.id,
+        }, CoreSites.getCurrentSiteId());
+
+        // Submission started, update the submission status.
+        const newSubmissionStatus = await AddonModAssign.getSubmissionStatus(this.assign.id, {
+            ...options,
+            readingStrategy: CoreSitesReadingStrategy.ONLY_NETWORK, // Make sure not to use cache.
+        });
+
+        this.userSubmission = AddonModAssign.getSubmissionObjectFromAttempt(this.assign, newSubmissionStatus.lastattempt);
+
+        return newSubmissionStatus;
+    }
+
     /**
      * Get the input data.
      *
@@ -392,6 +442,18 @@ export class AddonModAssignEditPage implements OnInit, OnDestroy, CanLeave {
         }
     }
 
+    /**
+     * Function called when the time is up.
+     */
+    timeUp(): void {
+        CoreDomUtils.showToastWithOptions({
+            message: Translate.instant('addon.mod_assign.caneditsubmission'),
+            duration: 0,
+            buttons: [Translate.instant('core.dismiss')],
+            cssClass: 'core-danger-toast',
+        });
+    }
+
     /**
      * Component being destroyed.
      */
diff --git a/src/addons/mod/assign/services/assign-helper.ts b/src/addons/mod/assign/services/assign-helper.ts
index c3f948527..01e48419b 100644
--- a/src/addons/mod/assign/services/assign-helper.ts
+++ b/src/addons/mod/assign/services/assign-helper.ts
@@ -44,6 +44,25 @@ import { CoreFileEntry } from '@services/file-helper';
 @Injectable({ providedIn: 'root' })
 export class AddonModAssignHelperProvider {
 
+    /**
+     * Calculate the end time (timestamp) for an assign and submission.
+     *
+     * @param assign Assign instance.
+     * @param submission Submission.
+     * @return End time.
+     */
+    calculateEndTime(assign: AddonModAssignAssign, submission?: AddonModAssignSubmissionFormatted): number {
+        const timeDue = (submission?.timestarted || 0) + (assign.timelimit || 0);
+
+        if (assign.duedate) {
+            return Math.min(timeDue, assign.duedate);
+        } else if (assign.cutoffdate) {
+            return Math.min(timeDue, assign.cutoffdate);
+        }
+
+        return timeDue;
+    }
+
     /**
      * Check if a submission can be edited in offline.
      *
diff --git a/src/addons/mod/assign/services/assign.ts b/src/addons/mod/assign/services/assign.ts
index 643e4647c..d24c61664 100644
--- a/src/addons/mod/assign/services/assign.ts
+++ b/src/addons/mod/assign/services/assign.ts
@@ -49,6 +49,7 @@ declare module '@singletons/events' {
         [AddonModAssignProvider.SUBMISSION_SAVED_EVENT]: AddonModAssignSubmissionSavedEventData;
         [AddonModAssignProvider.SUBMITTED_FOR_GRADING_EVENT]: AddonModAssignSubmittedForGradingEventData;
         [AddonModAssignProvider.GRADED_EVENT]: AddonModAssignGradedEventData;
+        [AddonModAssignProvider.STARTED_EVENT]: AddonModAssignStartedEventData;
         [AddonModAssignSyncProvider.MANUAL_SYNCED]: AddonModAssignManualSyncData;
         [AddonModAssignSyncProvider.AUTO_SYNCED]: AddonModAssignAutoSyncData;
     }
@@ -73,6 +74,7 @@ export class AddonModAssignProvider {
     static readonly SUBMISSION_SAVED_EVENT = 'addon_mod_assign_submission_saved';
     static readonly SUBMITTED_FOR_GRADING_EVENT = 'addon_mod_assign_submitted_for_grading';
     static readonly GRADED_EVENT = 'addon_mod_assign_graded';
+    static readonly STARTED_EVENT = 'addon_mod_assign_started';
 
     /**
      * Check if the user can submit in offline. This should only be used if submissionStatus.lastattempt.cansubmit cannot
@@ -1069,6 +1071,35 @@ export class AddonModAssignProvider {
         }
     }
 
+    /**
+     * Start a submission.
+     *
+     * @param assignId Assign ID.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Promise resolved when done.
+     */
+    async startSubmission(assignId: number, siteId?: string): Promise<void> {
+        const site = await CoreSites.getSite(siteId);
+
+        const params: AddonModAssignStartSubmissionWSParams = {
+            assignid: assignId,
+        };
+
+        const result = await site.write<AddonModAssignStartSubmissionWSResponse>('mod_assign_start_submission', params);
+
+        if (!result.warnings?.length) {
+            return;
+        }
+
+        // Ignore some warnings.
+        const warning = result.warnings.find(warning =>
+            warning.warningcode !== 'timelimitnotenabled' && warning.warningcode !== 'opensubmissionexists');
+
+        if (warning) {
+            throw new CoreWSError(warning);
+        }
+    }
+
     /**
      * Submit the current user assignment for grading.
      *
@@ -1351,6 +1382,11 @@ export type AddonModAssignAssign = {
     introformat?: number; // Intro format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
     introfiles?: CoreWSExternalFile[];
     introattachments?: CoreWSExternalFile[];
+    activity?: string; // @since 4.0. Description of activity.
+    activityformat?: number; // @since 4.0. Format of activity.
+    activityattachments?: CoreWSExternalFile[]; // @since 4.0. Files from activity field.
+    timelimit?: number; // @since 4.0. Time limit to complete assigment.
+    submissionattachments?: number; // @since 4.0. Flag to only show files during submission.
 };
 
 /**
@@ -1395,6 +1431,7 @@ export type AddonModAssignSubmission = {
     latest?: number; // Latest attempt.
     plugins?: AddonModAssignPlugin[]; // Plugins.
     gradingstatus?: AddonModAssignGradingStates; // Grading status.
+    timestarted?: number; // @since 4.0. Submission start time.
 };
 
 /**
@@ -1445,6 +1482,7 @@ export type AddonModAssignSubmissionAttempt = {
     blindmarking: boolean; // Whether blind marking is enabled.
     gradingstatus: AddonModAssignGradingStates; // Grading status.
     usergroups: number[]; // User groups in the course.
+    timelimit?: number; // @since 4.0. Time limit for submission.
 };
 
 /**
@@ -1604,6 +1642,14 @@ export type AddonModAssignGetSubmissionStatusWSResponse = {
     lastattempt?: AddonModAssignSubmissionAttempt; // Last attempt information.
     feedback?: AddonModAssignSubmissionFeedback; // Feedback for the last attempt.
     previousattempts?: AddonModAssignSubmissionPreviousAttempt[]; // List all the previous attempts did by the user.
+    assignmentdata?: { // @since 4.0. Extra information about assignment.
+        attachments?: { // Intro and activity attachments.
+            intro?: CoreWSExternalFile[]; // Intro attachments files.
+            activity?: CoreWSExternalFile[]; // Activity attachments files.
+        };
+        activity?: string; // Text of activity.
+        activityformat?: number; // Format of activity.
+    };
     warnings?: CoreWSExternalWarning[];
 };
 
@@ -1715,6 +1761,25 @@ type AddonModAssignSubmitGradingFormWSParams = {
     jsonformdata: string; // The data from the grading form, encoded as a json array.
 };
 
+/**
+ * Params of mod_assign_start_submission WS.
+ *
+ * @since 4.0
+ */
+type AddonModAssignStartSubmissionWSParams = {
+    assignid: number; // Assignment instance id.
+};
+
+/**
+ * Data returned by mod_assign_start_submission WS.
+ *
+ * @since 4.0
+ */
+export type AddonModAssignStartSubmissionWSResponse = {
+    submissionid: number; // New submission ID.
+    warnings?: CoreWSExternalWarning[];
+};
+
 /**
  * Assignment grade outcomes.
  */
@@ -1739,6 +1804,13 @@ export type AddonModAssignSubmissionSavedEventData = AddonModAssignSubmittedForG
  */
 export type AddonModAssignGradedEventData = AddonModAssignSubmittedForGradingEventData;
 
+/**
+ * Data sent by STARTED_EVENT event.
+ */
+export type AddonModAssignStartedEventData = {
+    assignmentId: number;
+};
+
 /**
  * Submission status.
  * Constants on LMS starting with ASSIGN_SUBMISSION_STATUS_
diff --git a/src/addons/mod/assign/services/handlers/prefetch.ts b/src/addons/mod/assign/services/handlers/prefetch.ts
index bd504ca3b..bb344e147 100644
--- a/src/addons/mod/assign/services/handlers/prefetch.ts
+++ b/src/addons/mod/assign/services/handlers/prefetch.ts
@@ -87,9 +87,10 @@ export class AddonModAssignPrefetchHandlerService extends CoreCourseActivityPref
 
         try {
             const assign = await AddonModAssign.getAssignment(courseId, module.id, { siteId });
-            // Get intro files and attachments.
+            // Get intro files, attachments and activity files.
             let files: CoreWSFile[] = assign.introattachments || [];
             files = files.concat(this.getIntroFilesFromInstance(module, assign));
+            files = files.concat(assign.activityattachments || []);
 
             // Now get the files in the submissions.
             const submissionData = await AddonModAssign.getSubmissions(assign.id, { cmId: module.id, siteId });
diff --git a/src/addons/mod/h5pactivity/services/h5pactivity.ts b/src/addons/mod/h5pactivity/services/h5pactivity.ts
index d8a80aee4..7d5dae0c2 100644
--- a/src/addons/mod/h5pactivity/services/h5pactivity.ts
+++ b/src/addons/mod/h5pactivity/services/h5pactivity.ts
@@ -90,8 +90,8 @@ export class AddonModH5PActivityProvider {
             formattedAttempt.durationReadable = '-';
             formattedAttempt.durationCompact = '-';
         } else {
-            formattedAttempt.durationReadable = CoreTimeUtils.formatTime(attempt.duration);
-            formattedAttempt.durationCompact = CoreTimeUtils.formatDurationShort(attempt.duration);
+            formattedAttempt.durationReadable = CoreTimeUtils.formatTime(attempt.duration, 3);
+            formattedAttempt.durationCompact = CoreTimeUtils.formatTimeShort(attempt.duration);
         }
 
         return formattedAttempt;
diff --git a/src/addons/mod/lesson/pages/player/player.html b/src/addons/mod/lesson/pages/player/player.html
index f0a46750e..da29653c9 100644
--- a/src/addons/mod/lesson/pages/player/player.html
+++ b/src/addons/mod/lesson/pages/player/player.html
@@ -30,7 +30,7 @@
         <div *ngIf="lesson" [ngClass]='{"addon-mod_lesson-slideshow": lesson.slideshow}'
             [ngStyle]="{'width': lessonWidth, 'height': lessonHeight}">
 
-            <core-timer *ngIf="endTime" [endTime]="endTime" (finished)="timeUp()"
+            <core-timer *ngIf="endTime" [endTime]="endTime" (finished)="timeUp()" [timeLeftClassThreshold]="-1"
                 [timerText]="'addon.mod_lesson.timeremaining' | translate">
             </core-timer>
 
diff --git a/src/addons/mod/quiz/pages/player/player.scss b/src/addons/mod/quiz/pages/player/player.scss
index 7d68762c8..ca4062557 100644
--- a/src/addons/mod/quiz/pages/player/player.scss
+++ b/src/addons/mod/quiz/pages/player/player.scss
@@ -1,3 +1,8 @@
+@import "~theme/globals";
+
+$quiz-timer-warn-color: $red !default;
+$quiz-timer-iterations: 15 !default;
+
 :host {
     .addon-mod_quiz-question-note p {
         margin-top: 2px;
@@ -7,4 +12,19 @@
     ion-content ion-toolbar {
         border-bottom: 1px solid var(--stroke);
     }
+
+    core-timer .core-timer {
+        // Make the timer go red when it's reaching 0.
+        @for $i from 0 through $quiz-timer-iterations {
+            &.core-timer-timeleft-#{$i} {
+                background-color: rgba($quiz-timer-warn-color, 1 - ($i / $quiz-timer-iterations)) !important;
+
+                @if $i <= $quiz-timer-iterations / 2 {
+                    label, span, ion-icon {
+                        color: var(--white);
+                    }
+                }
+            }
+        }
+    }
 }
diff --git a/src/core/components/timer/core-timer.html b/src/core/components/timer/core-timer.html
index 388a53324..8cf5a57e8 100644
--- a/src/core/components/timer/core-timer.html
+++ b/src/core/components/timer/core-timer.html
@@ -1,10 +1,21 @@
-<ion-item class="core-timer" role="timer" [ngClass]="{'ion-text-center': align == 'center', 'ion-text-end': align == 'right'}">
+<ion-item *ngIf="mode !== modeBasic" class="core-timer" role="timer"
+    [ngClass]="{'ion-text-center': align == 'center', 'ion-text-end': align == 'right'}">
     <ion-icon name="fas-clock" slot="start" aria-hidden="true"></ion-icon>
     <ion-label>
-        <span *ngIf="timeLeft && timeLeft > 0 && timerText" class="core-timer-text">{{ timerText }}</span>
-        <span *ngIf="timeLeft && timeLeft > 0" class="core-timer-time-left">{{ timeLeft | coreSecondsToHMS }}</span>
-        <span class="core-timesup" *ngIf="timeLeft !== undefined && timeLeft <= 0">
-            {{ 'core.timesup' | translate }}
-        </span>
+        <ng-container *ngTemplateOutlet="timerTemplate"></ng-container>
     </ion-label>
 </ion-item>
+
+<div *ngIf="mode === modeBasic" class="core-timer ion-padding" role="timer"
+    [ngClass]="{'ion-text-center': align == 'center', 'ion-text-end': align == 'right'}">
+    <ng-container *ngTemplateOutlet="timerTemplate"></ng-container>
+</div>
+
+<ng-template #timerTemplate>
+    <span *ngIf="timerText" class="core-timer-text">{{ timerText }}</span>
+    <span *ngIf="timeLeft && timeLeft > 0" class="core-timer-time-left">{{ timeLeft | coreSecondsToHMS }}</span>
+    <span class="core-timesup" *ngIf="timeLeft !== undefined && timeLeft <= 0">
+        <ng-container *ngIf="timeUpText">{{ timeUpText }}</ng-container>
+        <ng-container *ngIf="!timeUpText">{{ 'core.timesup' | translate }}</ng-container>
+    </span>
+</ng-template>
diff --git a/src/core/components/timer/timer.scss b/src/core/components/timer/timer.scss
index c7c9cc39c..12955ee2d 100644
--- a/src/core/components/timer/timer.scss
+++ b/src/core/components/timer/timer.scss
@@ -1,8 +1,3 @@
-@import "~theme/globals";
-
-$core-timer-warn-color: $red !default;
-$core-timer-iterations: 15 !default;
-
 :host {
     .core-timer {
         --background: transparent !important;
@@ -15,18 +10,5 @@ $core-timer-iterations: 15 !default;
         span {
             margin-right: 5px;
         }
-
-        // Create the timer warning colors.
-        @for $i from 0 through $core-timer-iterations {
-            &.core-timer-timeleft-#{$i} {
-                background-color: rgba($core-timer-warn-color, 1 - ($i / $core-timer-iterations)) !important;
-
-                @if $i <= $core-timer-iterations / 2 {
-                    label, span, ion-icon {
-                        color: var(--white);
-                    }
-                }
-            }
-        }
     }
 }
diff --git a/src/core/components/timer/timer.ts b/src/core/components/timer/timer.ts
index 581941a70..5d310af86 100644
--- a/src/core/components/timer/timer.ts
+++ b/src/core/components/timer/timer.ts
@@ -32,10 +32,15 @@ export class CoreTimerComponent implements OnInit, OnDestroy {
     @Input() endTime?: string | number; // Timestamp (in seconds) when the timer should end.
     @Input() timerText?: string; // Text to show next to the timer. If not defined, no text shown.
     @Input() timeLeftClass?: string; // Name of the class to apply with each second. By default, 'core-timer-timeleft-'.
+    @Input() timeLeftClassThreshold = 100; // Number of seconds to start adding the timeLeftClass. Set it to -1 to not add it.
     @Input() align?: string; // Where to align the time and text. Defaults to 'left'. Other values: 'center', 'right'.
+    @Input() timeUpText?: string; // Text to show when the timer reaches 0. If not defined, 'core.timesup'.
+    @Input() mode: CoreTimerMode = CoreTimerMode.ITEM; // How to display data.
+    @Input() underTimeClassThresholds = []; // Number of seconds to add the class 'core-timer-under-'.
     @Output() finished = new EventEmitter<void>(); // Will emit an event when the timer reaches 0.
 
     timeLeft?: number; // Seconds left to end.
+    modeBasic = CoreTimerMode.BASIC;
 
     protected timeInterval?: number;
     protected element?: HTMLElement;
@@ -50,31 +55,51 @@ export class CoreTimerComponent implements OnInit, OnDestroy {
     ngOnInit(): void {
         const timeLeftClass = this.timeLeftClass || 'core-timer-timeleft-';
         const endTime = Math.round(Number(this.endTime));
-        const container: HTMLElement | undefined = this.elementRef.nativeElement.querySelector('.core-timer');
+        this.underTimeClassThresholds.sort((a, b) => a - b); // Sort by increase order.
 
         if (!endTime) {
             return;
         }
 
+        let container: HTMLElement | undefined;
+
         // Check time left every 200ms.
         this.timeInterval = window.setInterval(() => {
-            this.timeLeft = endTime - CoreTimeUtils.timestamp();
+            container = container || this.elementRef.nativeElement.querySelector('.core-timer');
+            this.timeLeft = Math.max(endTime - CoreTimeUtils.timestamp(), 0);
 
-            if (this.timeLeft < 0) {
+            if (container) {
+                // Add class if timer is below timeLeftClassThreshold.
+                if (this.timeLeft < this.timeLeftClassThreshold && !container.classList.contains(timeLeftClass + this.timeLeft)) {
+                    // Time left has changed. Remove previous classes and add the new one.
+                    container.classList.remove(timeLeftClass + (this.timeLeft + 1));
+                    container.classList.remove(timeLeftClass + (this.timeLeft + 2));
+                    container.classList.add(timeLeftClass + this.timeLeft);
+                }
+
+                // Add classes for underTimeClassThresholds.
+                for (let i = 0; i < this.underTimeClassThresholds.length; i++) {
+                    const threshold = this.underTimeClassThresholds[i];
+                    if (this.timeLeft <= threshold) {
+                        if (!container.classList.contains('core-timer-under-' + this.timeLeft)) {
+                            // Add new class and remove the previous one.
+                            const nextTreshold = this.underTimeClassThresholds[i + 1];
+                            container.classList.add('core-timer-under-' + threshold);
+                            nextTreshold && container.classList.remove('core-timer-under-' + nextTreshold);
+                        }
+
+                        break;
+                    }
+                }
+            }
+
+            if (this.timeLeft === 0) {
                 // Time is up! Stop the timer and call the finish function.
                 clearInterval(this.timeInterval);
                 this.finished.emit();
 
                 return;
             }
-
-            // If the time has nearly expired, change the color.
-            if (this.timeLeft < 100 && container && !container.classList.contains(timeLeftClass + this.timeLeft)) {
-                // Time left has changed. Remove previous classes and add the new one.
-                container.classList.remove(timeLeftClass + (this.timeLeft + 1));
-                container.classList.remove(timeLeftClass + (this.timeLeft + 2));
-                container.classList.add(timeLeftClass + this.timeLeft);
-            }
         }, 200);
     }
 
@@ -86,3 +111,8 @@ export class CoreTimerComponent implements OnInit, OnDestroy {
     }
 
 }
+
+export enum CoreTimerMode {
+    ITEM = 'item',
+    BASIC = 'basic',
+}
diff --git a/src/core/initializers/initialize-services.ts b/src/core/initializers/initialize-services.ts
index 0806badd5..81aab20ed 100644
--- a/src/core/initializers/initialize-services.ts
+++ b/src/core/initializers/initialize-services.ts
@@ -18,6 +18,7 @@ import { CoreLang } from '@services/lang';
 import { CoreLocalNotifications } from '@services/local-notifications';
 import { CoreSites } from '@services/sites';
 import { CoreUpdateManager } from '@services/update-manager';
+import { CoreTimeUtils } from '@services/utils/time';
 
 export default async function(): Promise<void> {
     await Promise.all([
@@ -27,5 +28,6 @@ export default async function(): Promise<void> {
         CoreLang.initialize(),
         CoreLocalNotifications.initialize(),
         CoreUpdateManager.initialize(),
+        CoreTimeUtils.initialize(),
     ]);
 }
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index c0268ba1f..c6bbc23d4 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -14,7 +14,7 @@
 
 import { Injectable, SimpleChange, ElementRef, KeyValueChanges } from '@angular/core';
 import { IonContent } from '@ionic/angular';
-import { ModalOptions, PopoverOptions, AlertOptions, AlertButton, TextFieldTypes, getMode } from '@ionic/core';
+import { ModalOptions, PopoverOptions, AlertOptions, AlertButton, TextFieldTypes, getMode, ToastOptions } from '@ionic/core';
 import { Md5 } from 'ts-md5';
 
 import { CoreApp } from '@services/app';
@@ -1633,6 +1633,24 @@ export class CoreDomUtilsProvider {
         return loader;
     }
 
+    /**
+     * Show toast with some options.
+     *
+     * @param options Options.
+     * @return Promise resolved with Toast instance.
+     */
+    async showToastWithOptions(options: ToastOptions): Promise<HTMLIonToastElement> {
+        // Set some default values.
+        options.duration = options.duration ?? 2000;
+        options.position = options.position ?? 'bottom';
+
+        const loader = await ToastController.create(options);
+
+        await loader.present();
+
+        return loader;
+    }
+
     /**
      * Stores a component/directive instance.
      *
diff --git a/src/core/services/utils/time.ts b/src/core/services/utils/time.ts
index 60457d388..bac183265 100644
--- a/src/core/services/utils/time.ts
+++ b/src/core/services/utils/time.ts
@@ -15,7 +15,6 @@
 import { Injectable } from '@angular/core';
 
 import moment, { LongDateFormatKey } from 'moment';
-import { CoreConstants } from '@/core/constants';
 import { makeSingleton, Translate } from '@singletons';
 
 /*
@@ -68,6 +67,20 @@ export class CoreTimeUtilsProvider {
         '%%': '%',
     };
 
+    /**
+     * Initialize.
+     */
+    initialize(): void {
+        // Set relative time thresholds for humanize(), otherwise for example 47 minutes were converted to 'an hour'.
+        moment.relativeTimeThreshold('s', 60);
+        moment.relativeTimeThreshold('m', 60);
+        moment.relativeTimeThreshold('h', 24);
+        moment.relativeTimeThreshold('d', 31);
+        moment.relativeTimeThreshold('M', 12);
+        moment.relativeTimeThreshold('y', 365);
+        moment.relativeTimeThreshold('ss', 0); // To display exact number of seconds instead of just "a few seconds".
+    }
+
     /**
      * Convert a PHP format to a Moment format.
      *
@@ -142,82 +155,16 @@ export class CoreTimeUtilsProvider {
     }
 
     /**
-     * Returns hours, minutes and seconds in a human readable format
+     * Returns years, months, days, hours, minutes and seconds in a human readable format.
      *
      * @param seconds A number of seconds
+     * @param precision Number of elements to have in precision.
      * @return Seconds in a human readable format.
      */
-    formatTime(seconds: number): string {
-        const totalSecs = Math.abs(seconds);
-        const years = Math.floor(totalSecs / CoreConstants.SECONDS_YEAR);
-        let remainder = totalSecs - (years * CoreConstants.SECONDS_YEAR);
-        const days = Math.floor(remainder / CoreConstants.SECONDS_DAY);
+    formatTime(seconds: number, precision = 2): string {
+        precision = precision || 6; // Use max precision if 0 is passed.
 
-        remainder = totalSecs - (days * CoreConstants.SECONDS_DAY);
-
-        const hours = Math.floor(remainder / CoreConstants.SECONDS_HOUR);
-        remainder = remainder - (hours * CoreConstants.SECONDS_HOUR);
-
-        const mins = Math.floor(remainder / CoreConstants.SECONDS_MINUTE);
-        const secs = remainder - (mins * CoreConstants.SECONDS_MINUTE);
-
-        const ss = Translate.instant('core.' + (secs == 1 ? 'sec' : 'secs'));
-        const sm = Translate.instant('core.' + (mins == 1 ? 'min' : 'mins'));
-        const sh = Translate.instant('core.' + (hours == 1 ? 'hour' : 'hours'));
-        const sd = Translate.instant('core.' + (days == 1 ? 'day' : 'days'));
-        const sy = Translate.instant('core.' + (years == 1 ? 'year' : 'years'));
-        let oyears = '';
-        let odays = '';
-        let ohours = '';
-        let omins = '';
-        let osecs = '';
-
-        if (years) {
-            oyears = years + ' ' + sy;
-        }
-        if (days) {
-            odays = days + ' ' + sd;
-        }
-        if (hours) {
-            ohours = hours + ' ' + sh;
-        }
-        if (mins) {
-            omins = mins + ' ' + sm;
-        }
-        if (secs) {
-            osecs = secs + ' ' + ss;
-        }
-
-        if (years) {
-            return oyears + ' ' + odays;
-        }
-        if (days) {
-            return odays + ' ' + ohours;
-        }
-        if (hours) {
-            return ohours + ' ' + omins;
-        }
-        if (mins) {
-            return omins + ' ' + osecs;
-        }
-        if (secs) {
-            return osecs;
-        }
-
-        return Translate.instant('core.now');
-    }
-
-    /**
-     * Returns hours, minutes and seconds in a human readable format.
-     *
-     * @param duration Duration in seconds
-     * @param precision Number of elements to have in precision. 0 or undefined to full precission.
-     * @return Duration in a human readable format.
-     */
-    formatDuration(duration: number, precision?: number): string {
-        precision = precision || 5;
-
-        const eventDuration = moment.duration(duration, 'seconds');
+        const eventDuration = moment.duration(Math.abs(seconds), 'seconds');
         let durationString = '';
 
         if (precision && eventDuration.years() > 0) {
@@ -240,17 +187,21 @@ export class CoreTimeUtilsProvider {
             durationString += ' ' + moment.duration(eventDuration.minutes(), 'minutes').humanize();
             precision--;
         }
+        if (precision && (eventDuration.seconds() > 0 || !durationString)) {
+            durationString += ' ' + moment.duration(eventDuration.seconds(), 'seconds').humanize();
+            precision--;
+        }
 
         return durationString.trim();
     }
 
     /**
-     * Returns duration in a short human readable format: minutes and seconds, in fromat: 3' 27''.
+     * Converts a number of seconds into a short human readable format: minutes and seconds, in fromat: 3' 27''.
      *
-     * @param duration Duration in seconds
-     * @return Duration in a short human readable format.
+     * @param seconds Seconds
+     * @return Short human readable text.
      */
-    formatDurationShort(duration: number): string {
+    formatTimeShort(duration: number): string {
         const minutes = Math.floor(duration / 60);
         const seconds = duration - minutes * 60;
         const durations = <string[]>[];
@@ -266,6 +217,29 @@ export class CoreTimeUtilsProvider {
         return durations.join(' ');
     }
 
+    /**
+     * Returns hours, minutes and seconds in a human readable format.
+     *
+     * @param duration Duration in seconds
+     * @param precision Number of elements to have in precision. 0 or undefined to full precission.
+     * @return Duration in a human readable format.
+     * @deprecated since 4.0. Use formatTime instead.
+     */
+    formatDuration(duration: number, precision?: number): string {
+        return this.formatTime(duration, precision);
+    }
+
+    /**
+     * Returns duration in a short human readable format: minutes and seconds, in fromat: 3' 27''.
+     *
+     * @param duration Duration in seconds
+     * @return Duration in a short human readable format.
+     * @deprecated since 4.0. Use formatTime instead.
+     */
+    formatDurationShort(duration: number): string {
+        return this.formatTimeShort(duration);
+    }
+
     /**
      * Return the current timestamp in a "readable" format: YYYYMMDDHHmmSS.
      *
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index ebf03452b..78a7bf894 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -504,10 +504,19 @@ ion-toast {
     @include media-breakpoint-down(sm) {
         &::part(container) {
             flex-direction: column;
+            align-items: flex-end;
         }
     }
 }
 
+@each $color-name, $unused in $colors {
+    ion-toast.core-#{$color-name}-toast {
+        --background: var(--ion-color-#{$color-name}-tint);
+        --color: var(--ion-color-#{$color-name}-shade);
+        --button-color: var(--ion-color-#{$color-name}-shade);
+    }
+}
+
 // Ionic list.
 ion-list {
     padding: 0 !important;

From b793a9dbe9dbb3e3847a2c0bfb3d0581a91dc4c2 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 7 Mar 2022 07:47:51 +0100
Subject: [PATCH 0826/1008] MOBILE-3919 assign: Display activity instructions

---
 .../index/addon-mod-assign-index.html         |  2 +-
 src/addons/mod/assign/pages/edit/edit.html    | 14 ++++++++
 src/addons/mod/assign/pages/edit/edit.ts      | 18 ++++++++++
 .../mod/assign/services/handlers/prefetch.ts  | 34 ++++++++++++++-----
 4 files changed, 58 insertions(+), 10 deletions(-)

diff --git a/src/addons/mod/assign/components/index/addon-mod-assign-index.html b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
index ff974dd33..2b39744af 100644
--- a/src/addons/mod/assign/components/index/addon-mod-assign-index.html
+++ b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
@@ -11,7 +11,7 @@
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
         [courseId]="courseId" [hasDataToSync]="hasOffline" (completionChanged)="onCompletionChange()">
-        <ion-list inset="true" description *ngIf="assign && assign.introattachments && assign.introattachments.length">
+        <ion-list inset="true" description *ngIf="assign && assign.introattachments?.length && !assign.submissionattachments">
             <core-file *ngFor="let file of assign.introattachments" [file]="file" [component]="component" [componentId]="componentId">
             </core-file>
         </ion-list>
diff --git a/src/addons/mod/assign/pages/edit/edit.html b/src/addons/mod/assign/pages/edit/edit.html
index e661cbd84..c1675bdb5 100644
--- a/src/addons/mod/assign/pages/edit/edit.html
+++ b/src/addons/mod/assign/pages/edit/edit.html
@@ -25,6 +25,20 @@
                 [underTimeClassThresholds]="[300, 900]" class="ion-margin-horizontal">
             </core-timer>
 
+            <!-- Assign activity instructions and attachments if needed. -->
+            <ion-item class="ion-text-wrap" *ngIf="activityInstructions">
+                <ion-label>
+                    <core-format-text [text]="activityInstructions" [component]="component" [componentId]="moduleId" contextLevel="module"
+                        [contextInstanceId]="moduleId" [courseId]="courseId" [maxHeight]="120">
+                    </core-format-text>
+                </ion-label>
+            </ion-item>
+
+            <ng-container *ngIf="assign?.submissionattachments">
+                <core-file *ngFor="let file of introAttachments" [file]="file" [component]="component" [componentId]="moduleId">
+                </core-file>
+            </ng-container>
+
             <form name="addon-mod_assign-edit-form" #editSubmissionForm>
                 <!-- Submission statement. -->
                 <ion-item class="ion-text-wrap" *ngIf="submissionStatement">
diff --git a/src/addons/mod/assign/pages/edit/edit.ts b/src/addons/mod/assign/pages/edit/edit.ts
index 7f76ca8f4..4a5e59cfa 100644
--- a/src/addons/mod/assign/pages/edit/edit.ts
+++ b/src/addons/mod/assign/pages/edit/edit.ts
@@ -38,6 +38,7 @@ import { AddonModAssignHelper } from '../../services/assign-helper';
 import { AddonModAssignOffline } from '../../services/assign-offline';
 import { AddonModAssignSync } from '../../services/assign-sync';
 import { CoreUtils } from '@services/utils/utils';
+import { CoreWSExternalFile } from '@services/ws';
 
 /**
  * Page that allows adding or editing an assigment submission.
@@ -61,6 +62,9 @@ export class AddonModAssignEditPage implements OnInit, OnDestroy, CanLeave {
     submissionStatementAccepted = false; // Whether submission statement is accepted.
     loaded = false; // Whether data has been loaded.
     timeLimitEndTime = 0; // If time limit is enabled, the end time for the timer.
+    activityInstructions?: string; // Activity instructions.
+    introAttachments?: CoreWSExternalFile[]; // Intro attachments.
+    component = AddonModAssignProvider.COMPONENT;
 
     protected userId: number; // User doing the submission.
     protected isBlind = false; // Whether blind is used.
@@ -184,6 +188,20 @@ export class AddonModAssignEditPage implements OnInit, OnDestroy, CanLeave {
 
             submissionStatus = await this.startSubmissionIfNeeded(submissionStatus, options);
 
+            if (submissionStatus.assignmentdata?.activity) {
+                // There are activity instructions. Make sure to display it with filters applied.
+                const filteredSubmissionStatus = options.filter ?
+                    submissionStatus :
+                    await AddonModAssign.getSubmissionStatus(this.assign.id, {
+                        ...options,
+                        filter: true,
+                    });
+
+                this.activityInstructions = filteredSubmissionStatus.assignmentdata?.activity;
+            }
+
+            this.introAttachments = submissionStatus.assignmentdata?.attachments?.intro ?? this.assign.introattachments;
+
             this.allowOffline = true; // If offline isn't allowed we shouldn't have reached this point.
             // Only show submission statement if we are editing our own submission.
             if (this.assign.requiresubmissionstatement && !this.assign.submissiondrafts && this.userId == currentUserId) {
diff --git a/src/addons/mod/assign/services/handlers/prefetch.ts b/src/addons/mod/assign/services/handlers/prefetch.ts
index bb344e147..d44a3648a 100644
--- a/src/addons/mod/assign/services/handlers/prefetch.ts
+++ b/src/addons/mod/assign/services/handlers/prefetch.ts
@@ -101,19 +101,26 @@ export class AddonModAssignPrefetchHandlerService extends CoreCourseActivityPref
                     await AddonModAssignHelper.getSubmissionsUserData(assign, submissionData.submissions, 0, { siteId });
 
                 // Get all the files in the submissions.
-                const promises = submissions.map((submission) =>
-                    this.getSubmissionFiles(assign, submission.submitid!, !!submission.blindid, siteId).then((submissionFiles) => {
-                        files = files.concat(submissionFiles);
+                const promises = submissions.map(async (submission) => {
+                    try {
+                        const submissionFiles = await this.getSubmissionFiles(
+                            assign,
+                            submission.submitid!,
+                            !!submission.blindid,
+                            true,
+                            siteId,
+                        );
 
-                        return;
-                    }).catch((error) => {
+                        files = files.concat(submissionFiles);
+                    } catch (error) {
                         if (error && error.errorcode == 'nopermission') {
                             // The user does not have persmission to view this submission, ignore it.
                             return;
                         }
 
                         throw error;
-                    }));
+                    }
+                });
 
                 await Promise.all(promises);
             } else {
@@ -121,7 +128,7 @@ export class AddonModAssignPrefetchHandlerService extends CoreCourseActivityPref
                 const userId = CoreSites.getCurrentSiteUserId();
                 const blindMarking = !!assign.blindmarking && !assign.revealidentities;
 
-                const submissionFiles = await this.getSubmissionFiles(assign, userId, blindMarking, siteId);
+                const submissionFiles = await this.getSubmissionFiles(assign, userId, blindMarking, false, siteId);
                 files = files.concat(submissionFiles);
             }
 
@@ -138,6 +145,7 @@ export class AddonModAssignPrefetchHandlerService extends CoreCourseActivityPref
      * @param assign Assign.
      * @param submitId User ID of the submission to get.
      * @param blindMarking True if blind marking, false otherwise.
+     * @param canViewAllSubmissions Whether the user can view all submissions.
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with array of files.
      */
@@ -145,6 +153,7 @@ export class AddonModAssignPrefetchHandlerService extends CoreCourseActivityPref
         assign: AddonModAssignAssign,
         submitId: number,
         blindMarking: boolean,
+        canViewAllSubmissions: boolean,
         siteId?: string,
     ): Promise<CoreWSFile[]> {
 
@@ -155,8 +164,15 @@ export class AddonModAssignPrefetchHandlerService extends CoreCourseActivityPref
         });
         const userSubmission = AddonModAssign.getSubmissionObjectFromAttempt(assign, submissionStatus.lastattempt);
 
+        // Get intro and activity files from the submission status if it's a student.
+        // It's ok if they were already obtained from the assignment instance, they won't be downloaded twice.
+        const files = canViewAllSubmissions ?
+            [] :
+            (submissionStatus.assignmentdata?.attachments?.intro || [])
+                .concat(submissionStatus.assignmentdata?.attachments?.activity || []);
+
         if (!submissionStatus.lastattempt || !userSubmission) {
-            return [];
+            return files;
         }
 
         const promises: Promise<CoreWSFile[]>[] = [];
@@ -177,7 +193,7 @@ export class AddonModAssignPrefetchHandlerService extends CoreCourseActivityPref
 
         const filesLists = await Promise.all(promises);
 
-        return [].concat.apply([], filesLists);
+        return files.concat.apply(files, filesLists);
     }
 
     /**

From 9b40c5e87e60fd44a804eb4e91e63c4d1abfc7f0 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 29 Mar 2022 08:13:58 +0200
Subject: [PATCH 0827/1008] MOBILE-3919 utils: Move formatTime functions to
 CoreTime

---
 .../mod/assign/components/index/index.ts      |  3 +-
 .../components/submission/submission.ts       |  9 +--
 src/addons/mod/chat/components/index/index.ts |  3 +-
 .../mod/h5pactivity/services/h5pactivity.ts   |  6 +-
 .../mod/lesson/components/index/index.ts      |  8 +--
 .../pages/user-retake/user-retake.page.ts     |  4 +-
 .../mod/lesson/services/lesson-helper.ts      |  3 +-
 .../timelimit/component/timelimit.ts          |  4 +-
 .../mod/quiz/pages/player/player.page.ts      |  4 +-
 .../mod/quiz/pages/review/review.page.ts      |  6 +-
 src/core/pipes/duration.ts                    |  4 +-
 src/core/services/utils/time.ts               | 57 +++-------------
 src/core/singletons/time.ts                   | 65 +++++++++++++++++++
 13 files changed, 103 insertions(+), 73 deletions(-)

diff --git a/src/addons/mod/assign/components/index/index.ts b/src/addons/mod/assign/components/index/index.ts
index e39660b97..adef90a39 100644
--- a/src/addons/mod/assign/components/index/index.ts
+++ b/src/addons/mod/assign/components/index/index.ts
@@ -26,6 +26,7 @@ import { CoreTimeUtils } from '@services/utils/time';
 import { CoreUtils } from '@services/utils/utils';
 import { Translate } from '@singletons';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
+import { CoreTime } from '@singletons/time';
 import { AddonModAssignListFilterName } from '../../classes/submissions-source';
 import {
     AddonModAssign,
@@ -182,7 +183,7 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
                 if (this.assign.duedate - time <= 0) {
                     this.timeRemaining = Translate.instant('addon.mod_assign.assignmentisdue');
                 } else {
-                    this.timeRemaining = CoreTimeUtils.formatTime(this.assign.duedate - time);
+                    this.timeRemaining = CoreTime.formatTime(this.assign.duedate - time);
                 }
 
                 if (this.assign.duedate < time) {
diff --git a/src/addons/mod/assign/components/submission/submission.ts b/src/addons/mod/assign/components/submission/submission.ts
index a5566cbb6..3699d2c59 100644
--- a/src/addons/mod/assign/components/submission/submission.ts
+++ b/src/addons/mod/assign/components/submission/submission.ts
@@ -58,6 +58,7 @@ import { CoreSync } from '@services/sync';
 import { AddonModAssignSubmissionPluginComponent } from '../submission-plugin/submission-plugin';
 import { AddonModAssignModuleHandlerService } from '../../services/handlers/module';
 import { CanLeave } from '@guards/can-leave';
+import { CoreTime } from '@singletons/time';
 
 /**
  * Component that displays an assignment submission.
@@ -230,7 +231,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
 
             this.timeRemaining = Translate.instant(
                 'addon.mod_assign.' + (onTime ? earlyString : lateString),
-                { $a: CoreTimeUtils.formatTime(Math.abs(lateCalculation - lateThreshold)) },
+                { $a: CoreTime.formatTime(Math.abs(lateCalculation - lateThreshold)) },
             );
             this.timeRemainingClass = onTime ? 'earlysubmission' : 'latesubmission';
 
@@ -242,7 +243,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
             const submissionsEnabled = response.lastattempt?.submissionsenabled || response.gradingsummary?.submissionsenabled;
             this.timeRemaining = Translate.instant(
                 'addon.mod_assign.' + (submissionsEnabled ? 'overdue' : 'duedatereached'),
-                { $a: CoreTimeUtils.formatTime(time - this.assign.duedate) },
+                { $a: CoreTime.formatTime(time - this.assign.duedate) },
             );
             this.timeRemainingClass = 'overdue';
             this.timeLimitFinished = true;
@@ -260,7 +261,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
         }
 
         // Assignment is not overdue, and no submission has been made. Just display the due date.
-        this.timeRemaining = CoreTimeUtils.formatTime(this.assign.duedate - time);
+        this.timeRemaining = CoreTime.formatTime(this.assign.duedate - time);
         this.timeRemainingClass = 'timeremaining';
     }
 
@@ -367,7 +368,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
             try {
                 await CoreDomUtils.showConfirm(
                     Translate.instant('addon.mod_assign.confirmstart', {
-                        $a: CoreTimeUtils.formatTime(this.assign.timelimit),
+                        $a: CoreTime.formatTime(this.assign.timelimit),
                     }),
                     undefined,
                     Translate.instant('addon.mod_assign.beginassignment'),
diff --git a/src/addons/mod/chat/components/index/index.ts b/src/addons/mod/chat/components/index/index.ts
index 813c08cff..7315bdf70 100644
--- a/src/addons/mod/chat/components/index/index.ts
+++ b/src/addons/mod/chat/components/index/index.ts
@@ -18,6 +18,7 @@ import { CoreCourseContentsPage } from '@features/course/pages/contents/contents
 import { IonContent } from '@ionic/angular';
 import { CoreNavigator } from '@services/navigator';
 import { CoreTimeUtils } from '@services/utils/time';
+import { CoreTime } from '@singletons/time';
 import { AddonModChat, AddonModChatChat, AddonModChatProvider } from '../../services/chat';
 import { AddonModChatModuleHandlerService } from '../../services/handlers/module';
 
@@ -67,7 +68,7 @@ export class AddonModChatIndexComponent extends CoreCourseModuleMainActivityComp
         if (this.chat.chattime && this.chat.schedule && span > 0) {
             this.chatInfo = {
                 date: CoreTimeUtils.userDate(this.chat.chattime * 1000),
-                fromnow: CoreTimeUtils.formatTime(span),
+                fromnow: CoreTime.formatTime(span),
             };
         } else {
             this.chatInfo = undefined;
diff --git a/src/addons/mod/h5pactivity/services/h5pactivity.ts b/src/addons/mod/h5pactivity/services/h5pactivity.ts
index 7d5dae0c2..15e4a4a9d 100644
--- a/src/addons/mod/h5pactivity/services/h5pactivity.ts
+++ b/src/addons/mod/h5pactivity/services/h5pactivity.ts
@@ -16,7 +16,6 @@ import { Injectable } from '@angular/core';
 
 import { CoreSites, CoreSitesCommonWSOptions, CoreSitesReadingStrategy } from '@services/sites';
 import { CoreWSExternalWarning, CoreWSExternalFile, CoreWSFile } from '@services/ws';
-import { CoreTimeUtils } from '@services/utils/time';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
 import { CoreCourseLogHelper } from '@features/course/services/log-helper';
@@ -27,6 +26,7 @@ import { makeSingleton, Translate } from '@singletons/index';
 import { CoreWSError } from '@classes/errors/wserror';
 import { CoreError } from '@classes/errors/error';
 import { AddonModH5PActivityAutoSyncData, AddonModH5PActivitySyncProvider } from './h5pactivity-sync';
+import { CoreTime } from '@singletons/time';
 
 const ROOT_CACHE_KEY = 'mmaModH5PActivity:';
 
@@ -90,8 +90,8 @@ export class AddonModH5PActivityProvider {
             formattedAttempt.durationReadable = '-';
             formattedAttempt.durationCompact = '-';
         } else {
-            formattedAttempt.durationReadable = CoreTimeUtils.formatTime(attempt.duration, 3);
-            formattedAttempt.durationCompact = CoreTimeUtils.formatTimeShort(attempt.duration);
+            formattedAttempt.durationReadable = CoreTime.formatTime(attempt.duration, 3);
+            formattedAttempt.durationCompact = CoreTime.formatTimeShort(attempt.duration);
         }
 
         return formattedAttempt;
diff --git a/src/addons/mod/lesson/components/index/index.ts b/src/addons/mod/lesson/components/index/index.ts
index 7b41a3d8b..d2e6204b5 100644
--- a/src/addons/mod/lesson/components/index/index.ts
+++ b/src/addons/mod/lesson/components/index/index.ts
@@ -25,7 +25,6 @@ import { CoreNavigator } from '@services/navigator';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreForms } from '@singletons/form';
 import { CoreTextUtils } from '@services/utils/text';
-import { CoreTimeUtils } from '@services/utils/time';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { AddonModLessonRetakeFinishedInSyncDBRecord } from '../../services/database/lesson';
@@ -47,6 +46,7 @@ import {
     AddonModLessonSyncResult,
 } from '../../services/lesson-sync';
 import { AddonModLessonModuleHandlerService } from '../../services/handlers/module';
+import { CoreTime } from '@singletons/time';
 
 /**
  * Component that displays a lesson entry page.
@@ -505,15 +505,15 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo
         // Format times and grades.
         if (formattedData.avetime != null && formattedData.numofattempts) {
             formattedData.avetime = Math.floor(formattedData.avetime / formattedData.numofattempts);
-            this.avetimeReadable = CoreTimeUtils.formatTime(formattedData.avetime);
+            this.avetimeReadable = CoreTime.formatTime(formattedData.avetime);
         }
 
         if (formattedData.hightime != null) {
-            this.hightimeReadable = CoreTimeUtils.formatTime(formattedData.hightime);
+            this.hightimeReadable = CoreTime.formatTime(formattedData.hightime);
         }
 
         if (formattedData.lowtime != null) {
-            this.lowtimeReadable = CoreTimeUtils.formatTime(formattedData.lowtime);
+            this.lowtimeReadable = CoreTime.formatTime(formattedData.lowtime);
         }
 
         if (formattedData.lessonscored) {
diff --git a/src/addons/mod/lesson/pages/user-retake/user-retake.page.ts b/src/addons/mod/lesson/pages/user-retake/user-retake.page.ts
index 996bb5235..4ac48bf57 100644
--- a/src/addons/mod/lesson/pages/user-retake/user-retake.page.ts
+++ b/src/addons/mod/lesson/pages/user-retake/user-retake.page.ts
@@ -34,8 +34,8 @@ import {
     AddonModLessonUserAttemptAnswerPageWSData,
 } from '../../services/lesson';
 import { AddonModLessonAnswerData, AddonModLessonHelper } from '../../services/lesson-helper';
-import { CoreTimeUtils } from '@services/utils/time';
 import { CoreCourse } from '@features/course/services/course';
+import { CoreTime } from '@singletons/time';
 
 /**
  * Page that displays a retake made by a certain user.
@@ -222,7 +222,7 @@ export class AddonModLessonUserRetakePage implements OnInit {
         if (formattedData.userstats.gradeinfo) {
             // Completed.
             formattedData.userstats.grade = CoreTextUtils.roundToDecimals(formattedData.userstats.grade, 2);
-            this.timeTakenReadable = CoreTimeUtils.formatTime(formattedData.userstats.timetotake);
+            this.timeTakenReadable = CoreTime.formatTime(formattedData.userstats.timetotake);
         }
 
         // Format pages data.
diff --git a/src/addons/mod/lesson/services/lesson-helper.ts b/src/addons/mod/lesson/services/lesson-helper.ts
index 1ec765591..6047b8030 100644
--- a/src/addons/mod/lesson/services/lesson-helper.ts
+++ b/src/addons/mod/lesson/services/lesson-helper.ts
@@ -26,6 +26,7 @@ import {
     AddonModLessonGetPageDataWSResponse,
     AddonModLessonProvider,
 } from './lesson';
+import { CoreTime } from '@singletons/time';
 
 /**
  * Helper service that provides some features for quiz.
@@ -531,7 +532,7 @@ export class AddonModLessonHelperProvider {
             }
             data.timestart = CoreTimeUtils.userDate(retake.timestart * 1000);
             if (includeDuration) {
-                data.duration = CoreTimeUtils.formatTime(retake.timeend - retake.timestart);
+                data.duration = CoreTime.formatTime(retake.timeend - retake.timestart);
             }
         } else {
             // The user has not completed the retake.
diff --git a/src/addons/mod/quiz/accessrules/timelimit/component/timelimit.ts b/src/addons/mod/quiz/accessrules/timelimit/component/timelimit.ts
index d68cc64fa..b66ae5b3c 100644
--- a/src/addons/mod/quiz/accessrules/timelimit/component/timelimit.ts
+++ b/src/addons/mod/quiz/accessrules/timelimit/component/timelimit.ts
@@ -16,7 +16,7 @@ import { Component, Input, OnInit } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 
 import { AddonModQuizAttemptWSData, AddonModQuizQuizWSData } from '@addons/mod/quiz/services/quiz';
-import { CoreTimeUtils } from '@services/utils/time';
+import { CoreTime } from '@singletons/time';
 
 /**
  * Component to render the preflight for time limit.
@@ -41,7 +41,7 @@ export class AddonModQuizAccessTimeLimitComponent implements OnInit {
             return;
         }
 
-        this.readableTimeLimit = CoreTimeUtils.formatTime(this.quiz?.timelimit);
+        this.readableTimeLimit = CoreTime.formatTime(this.quiz?.timelimit);
     }
 
 }
diff --git a/src/addons/mod/quiz/pages/player/player.page.ts b/src/addons/mod/quiz/pages/player/player.page.ts
index c793a18f1..ceaf636da 100644
--- a/src/addons/mod/quiz/pages/player/player.page.ts
+++ b/src/addons/mod/quiz/pages/player/player.page.ts
@@ -24,7 +24,6 @@ import { CoreNavigator } from '@services/navigator';
 import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
 import { CoreSync } from '@services/sync';
 import { CoreDomUtils } from '@services/utils/dom';
-import { CoreTimeUtils } from '@services/utils/time';
 import { CoreUtils } from '@services/utils/utils';
 import { ModalController, Translate } from '@singletons';
 import { CoreEvents } from '@singletons/events';
@@ -47,6 +46,7 @@ import { AddonModQuizSync } from '../../services/quiz-sync';
 import { CanLeave } from '@guards/can-leave';
 import { CoreForms } from '@singletons/form';
 import { CoreDom } from '@singletons/dom';
+import { CoreTime } from '@singletons/time';
 
 /**
  * Page that allows attempting a quiz.
@@ -352,7 +352,7 @@ export class AddonModQuizPlayerPage implements OnInit, OnDestroy, CanLeave {
             }
 
             if (this.quiz!.timelimit && this.quiz!.timelimit > 0) {
-                this.readableTimeLimit = CoreTimeUtils.formatTime(this.quiz.timelimit);
+                this.readableTimeLimit = CoreTime.formatTime(this.quiz.timelimit);
             }
 
             // Get access information for the quiz.
diff --git a/src/addons/mod/quiz/pages/review/review.page.ts b/src/addons/mod/quiz/pages/review/review.page.ts
index 5443ffe30..1a3a4c3f6 100644
--- a/src/addons/mod/quiz/pages/review/review.page.ts
+++ b/src/addons/mod/quiz/pages/review/review.page.ts
@@ -19,10 +19,10 @@ import { CoreQuestionHelper } from '@features/question/services/question-helper'
 import { IonContent, IonRefresher } from '@ionic/angular';
 import { CoreNavigator } from '@services/navigator';
 import { CoreDomUtils } from '@services/utils/dom';
-import { CoreTimeUtils } from '@services/utils/time';
 import { CoreUtils } from '@services/utils/utils';
 import { Translate } from '@singletons';
 import { CoreDom } from '@singletons/dom';
+import { CoreTime } from '@singletons/time';
 import {
     AddonModQuizNavigationModalComponent,
     AddonModQuizNavigationModalReturn,
@@ -276,11 +276,11 @@ export class AddonModQuizReviewPage implements OnInit {
         const timeTaken = (this.attempt.timefinish || 0) - (this.attempt.timestart || 0);
         if (timeTaken > 0) {
             // Format time taken.
-            this.timeTaken = CoreTimeUtils.formatTime(timeTaken);
+            this.timeTaken = CoreTime.formatTime(timeTaken);
 
             // Calculate overdue time.
             if (this.quiz.timelimit && timeTaken > this.quiz.timelimit + 60) {
-                this.overTime = CoreTimeUtils.formatTime(timeTaken - this.quiz.timelimit);
+                this.overTime = CoreTime.formatTime(timeTaken - this.quiz.timelimit);
             }
         } else {
             this.timeTaken = undefined;
diff --git a/src/core/pipes/duration.ts b/src/core/pipes/duration.ts
index e1c666289..1e127a89b 100644
--- a/src/core/pipes/duration.ts
+++ b/src/core/pipes/duration.ts
@@ -14,7 +14,7 @@
 
 import { Pipe, PipeTransform } from '@angular/core';
 import { CoreLogger } from '@singletons/logger';
-import { CoreTimeUtils } from '@services/utils/time';
+import { CoreTime } from '@singletons/time';
 
 /**
  * Filter to turn a number of seconds to a duration. E.g. 60 -> 1 minute.
@@ -48,7 +48,7 @@ export class CoreDurationPipe implements PipeTransform {
             seconds = numberSeconds;
         }
 
-        return CoreTimeUtils.formatTime(seconds);
+        return CoreTime.formatTime(seconds);
     }
 
 }
diff --git a/src/core/services/utils/time.ts b/src/core/services/utils/time.ts
index bac183265..a771a6a21 100644
--- a/src/core/services/utils/time.ts
+++ b/src/core/services/utils/time.ts
@@ -16,6 +16,7 @@ import { Injectable } from '@angular/core';
 
 import moment, { LongDateFormatKey } from 'moment';
 import { makeSingleton, Translate } from '@singletons';
+import { CoreTime } from '@singletons/time';
 
 /*
  * "Utils" service with helper functions for date and time.
@@ -160,39 +161,10 @@ export class CoreTimeUtilsProvider {
      * @param seconds A number of seconds
      * @param precision Number of elements to have in precision.
      * @return Seconds in a human readable format.
+     * @deprecated since app 4.0. Use CoreTime.formatTime instead.
      */
     formatTime(seconds: number, precision = 2): string {
-        precision = precision || 6; // Use max precision if 0 is passed.
-
-        const eventDuration = moment.duration(Math.abs(seconds), 'seconds');
-        let durationString = '';
-
-        if (precision && eventDuration.years() > 0) {
-            durationString += ' ' + moment.duration(eventDuration.years(), 'years').humanize();
-            precision--;
-        }
-        if (precision && eventDuration.months() > 0) {
-            durationString += ' ' + moment.duration(eventDuration.months(), 'months').humanize();
-            precision--;
-        }
-        if (precision && eventDuration.days() > 0) {
-            durationString += ' ' + moment.duration(eventDuration.days(), 'days').humanize();
-            precision--;
-        }
-        if (precision && eventDuration.hours() > 0) {
-            durationString += ' ' + moment.duration(eventDuration.hours(), 'hours').humanize();
-            precision--;
-        }
-        if (precision && eventDuration.minutes() > 0) {
-            durationString += ' ' + moment.duration(eventDuration.minutes(), 'minutes').humanize();
-            precision--;
-        }
-        if (precision && (eventDuration.seconds() > 0 || !durationString)) {
-            durationString += ' ' + moment.duration(eventDuration.seconds(), 'seconds').humanize();
-            precision--;
-        }
-
-        return durationString.trim();
+        return CoreTime.formatTime(seconds, precision);
     }
 
     /**
@@ -200,21 +172,10 @@ export class CoreTimeUtilsProvider {
      *
      * @param seconds Seconds
      * @return Short human readable text.
+     * @deprecated since app 4.0. Use CoreTime.formatTimeShort instead.
      */
     formatTimeShort(duration: number): string {
-        const minutes = Math.floor(duration / 60);
-        const seconds = duration - minutes * 60;
-        const durations = <string[]>[];
-
-        if (minutes > 0) {
-            durations.push(minutes + '\'');
-        }
-
-        if (seconds > 0 || minutes === 0) {
-            durations.push(seconds + '\'\'');
-        }
-
-        return durations.join(' ');
+        return CoreTime.formatTimeShort(duration);
     }
 
     /**
@@ -223,10 +184,10 @@ export class CoreTimeUtilsProvider {
      * @param duration Duration in seconds
      * @param precision Number of elements to have in precision. 0 or undefined to full precission.
      * @return Duration in a human readable format.
-     * @deprecated since 4.0. Use formatTime instead.
+     * @deprecated since app 4.0. Use CoreTime.formatTime instead.
      */
     formatDuration(duration: number, precision?: number): string {
-        return this.formatTime(duration, precision);
+        return CoreTime.formatTime(duration, precision);
     }
 
     /**
@@ -234,10 +195,10 @@ export class CoreTimeUtilsProvider {
      *
      * @param duration Duration in seconds
      * @return Duration in a short human readable format.
-     * @deprecated since 4.0. Use formatTime instead.
+     * @deprecated since app 4.0. Use CoreTime.formatTimeShort instead.
      */
     formatDurationShort(duration: number): string {
-        return this.formatTimeShort(duration);
+        return CoreTime.formatTimeShort(duration);
     }
 
     /**
diff --git a/src/core/singletons/time.ts b/src/core/singletons/time.ts
index 8e8f92018..e3a0f0435 100644
--- a/src/core/singletons/time.ts
+++ b/src/core/singletons/time.ts
@@ -12,11 +12,76 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import moment from 'moment';
+
 /**
  * Singleton with helper functions for time operations.
  */
 export class CoreTime {
 
+    /**
+     * Returns years, months, days, hours, minutes and seconds in a human readable format.
+     *
+     * @param seconds A number of seconds
+     * @param precision Number of elements to have in precision.
+     * @return Seconds in a human readable format.
+     */
+    static formatTime(seconds: number, precision = 2): string {
+        precision = precision || 6; // Use max precision if 0 is passed.
+
+        const eventDuration = moment.duration(Math.abs(seconds), 'seconds');
+        let durationString = '';
+
+        if (precision && eventDuration.years() > 0) {
+            durationString += ' ' + moment.duration(eventDuration.years(), 'years').humanize();
+            precision--;
+        }
+        if (precision && eventDuration.months() > 0) {
+            durationString += ' ' + moment.duration(eventDuration.months(), 'months').humanize();
+            precision--;
+        }
+        if (precision && eventDuration.days() > 0) {
+            durationString += ' ' + moment.duration(eventDuration.days(), 'days').humanize();
+            precision--;
+        }
+        if (precision && eventDuration.hours() > 0) {
+            durationString += ' ' + moment.duration(eventDuration.hours(), 'hours').humanize();
+            precision--;
+        }
+        if (precision && eventDuration.minutes() > 0) {
+            durationString += ' ' + moment.duration(eventDuration.minutes(), 'minutes').humanize();
+            precision--;
+        }
+        if (precision && (eventDuration.seconds() > 0 || !durationString)) {
+            durationString += ' ' + moment.duration(eventDuration.seconds(), 'seconds').humanize();
+            precision--;
+        }
+
+        return durationString.trim();
+    }
+
+    /**
+     * Converts a number of seconds into a short human readable format: minutes and seconds, in fromat: 3' 27''.
+     *
+     * @param seconds Seconds
+     * @return Short human readable text.
+     */
+    static formatTimeShort(duration: number): string {
+        const minutes = Math.floor(duration / 60);
+        const seconds = duration - minutes * 60;
+        const durations = <string[]>[];
+
+        if (minutes > 0) {
+            durations.push(minutes + '\'');
+        }
+
+        if (seconds > 0 || minutes === 0) {
+            durations.push(seconds + '\'\'');
+        }
+
+        return durations.join(' ');
+    }
+
     /**
      * Wrap a function so that it is called only once.
      *

From 604e866943fa1124469edc0154f65a16c8966c43 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 24 Mar 2022 15:11:13 +0100
Subject: [PATCH 0828/1008] MOBILE-3833 data: Fix unable to change group for
 new entries

---
 src/addons/mod/bigbluebuttonbn/components/index/index.html  | 4 ++--
 src/addons/mod/data/pages/edit/edit.html                    | 4 ++--
 src/addons/mod/data/pages/edit/edit.ts                      | 6 ++++--
 .../feedback/components/index/addon-mod-feedback-index.html | 4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/addons/mod/bigbluebuttonbn/components/index/index.html b/src/addons/mod/bigbluebuttonbn/components/index/index.html
index 8003d0166..98308626b 100644
--- a/src/addons/mod/bigbluebuttonbn/components/index/index.html
+++ b/src/addons/mod/bigbluebuttonbn/components/index/index.html
@@ -23,8 +23,8 @@
 
         <ion-item class="ion-text-wrap core-group-selector">
             <ion-label id="addon-bigbluebuttonbn-groupslabel">
-                <ng-container *ngIf="groupInfo.separateGroups">{{'core.groupsseparate' | translate }}</ng-container>
-                <ng-container *ngIf="groupInfo.visibleGroups">{{'core.groupsvisible' | translate }}</ng-container>
+                <ng-container *ngIf="groupInfo.separateGroups">{{ 'core.groupsseparate' | translate }}</ng-container>
+                <ng-container *ngIf="groupInfo.visibleGroups">{{ 'core.groupsvisible' | translate }}</ng-container>
             </ion-label>
             <ion-select [(ngModel)]="groupId" (ionChange)="groupChanged()" aria-labelledby="addon-bigbluebuttonbn-groupslabel"
                 interface="action-sheet" [interfaceOptions]="{header: 'core.group' | translate}">
diff --git a/src/addons/mod/data/pages/edit/edit.html b/src/addons/mod/data/pages/edit/edit.html
index 4b04f9b68..875d160f0 100644
--- a/src/addons/mod/data/pages/edit/edit.html
+++ b/src/addons/mod/data/pages/edit/edit.html
@@ -20,8 +20,8 @@
     <core-loading [hideUntil]="loaded">
         <ion-item class="ion-text-wrap core-group-selector" *ngIf="groupInfo && (groupInfo.separateGroups || groupInfo.visibleGroups)">
             <ion-label id="addon-data-groupslabel">
-                <ng-container *ngIf="groupInfo.separateGroups">{{ 'core.groupsvisible' | translate }}</ng-container>
-                <ng-container *ngIf="groupInfo.visibleGroups">{{ 'core.groupsseparate' | translate }}</ng-container>
+                <ng-container *ngIf="groupInfo.separateGroups">{{ 'core.groupsseparate' | translate }}</ng-container>
+                <ng-container *ngIf="groupInfo.visibleGroups">{{ 'core.groupsvisible' | translate }}</ng-container>
             </ion-label>
             <ion-select [(ngModel)]="selectedGroup" (ionChange)="setGroup(selectedGroup)" aria-labelledby="addon-data-groupslabel"
                 interface="action-sheet" [interfaceOptions]="{header: 'core.group' | translate}">
diff --git a/src/addons/mod/data/pages/edit/edit.ts b/src/addons/mod/data/pages/edit/edit.ts
index 53a73c691..208d9de72 100644
--- a/src/addons/mod/data/pages/edit/edit.ts
+++ b/src/addons/mod/data/pages/edit/edit.ts
@@ -163,8 +163,10 @@ export class AddonModDataEditPage implements OnInit {
             const entry = await AddonModDataHelper.fetchEntry(this.database, this.fieldsArray, this.entryId || 0);
             this.entry = entry.entry;
 
-            // Load correct group.
-            this.selectedGroup = this.entry.groupid;
+            if (this.entryId) {
+                // Load correct group.
+                this.selectedGroup = this.entry.groupid;
+            }
 
             // Check permissions when adding a new entry or offline entry.
             if (!this.isEditing) {
diff --git a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
index 8a72abe19..eb378ee03 100644
--- a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
+++ b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
@@ -61,8 +61,8 @@
     <ion-list *ngIf="access && access.canviewanalysis && !access.isempty">
         <ion-item class="ion-text-wrap core-group-selector" *ngIf="groupInfo && (groupInfo.separateGroups || groupInfo.visibleGroups)">
             <ion-label id="addon-feedback-groupslabel">
-                <ng-container *ngIf="groupInfo.separateGroups">{{'core.groupsseparate' | translate }}</ng-container>
-                <ng-container *ngIf="groupInfo.visibleGroups">{{'core.groupsvisible' | translate }}</ng-container>
+                <ng-container *ngIf="groupInfo.separateGroups">{{ 'core.groupsseparate' | translate }}</ng-container>
+                <ng-container *ngIf="groupInfo.visibleGroups">{{ 'core.groupsvisible' | translate }}</ng-container>
             </ion-label>
             <ion-select [(ngModel)]="group" (ionChange)="setGroup(group)" aria-labelledby="addon-feedback-groupslabel"
                 interface="action-sheet" [interfaceOptions]="{header: 'core.group' | translate}">

From 9c2116c33b2d9a5f0b004482ce32c9437f9f37dd Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 24 Mar 2022 16:08:16 +0100
Subject: [PATCH 0829/1008] MOBILE-3833 data: Hide All participants with
 visible groups

---
 src/addons/mod/data/components/index/index.ts | 6 ++++++
 src/addons/mod/data/pages/edit/edit.ts        | 6 ++++++
 src/addons/mod/data/pages/entry/entry.ts      | 6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/src/addons/mod/data/components/index/index.ts b/src/addons/mod/data/components/index/index.ts
index 4708f24c7..bb4b1b8dc 100644
--- a/src/addons/mod/data/components/index/index.ts
+++ b/src/addons/mod/data/components/index/index.ts
@@ -218,6 +218,12 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
         }
 
         this.groupInfo = await CoreGroups.getActivityGroupInfo(this.database.coursemodule);
+        if (this.groupInfo.visibleGroups && this.groupInfo.groups?.length) {
+            // There is a bug in Moodle with All participants and visible groups (MOBILE-3597). Remove it.
+            this.groupInfo.groups = this.groupInfo.groups.filter(group => group.id !== 0);
+            this.groupInfo.defaultGroupId = this.groupInfo.groups[0].id;
+        }
+
         this.selectedGroup = CoreGroups.validateGroupId(this.selectedGroup, this.groupInfo);
 
         this.access = await AddonModData.getDatabaseAccessInformation(this.database.id, {
diff --git a/src/addons/mod/data/pages/edit/edit.ts b/src/addons/mod/data/pages/edit/edit.ts
index 208d9de72..52abfab1e 100644
--- a/src/addons/mod/data/pages/edit/edit.ts
+++ b/src/addons/mod/data/pages/edit/edit.ts
@@ -174,6 +174,12 @@ export class AddonModDataEditPage implements OnInit {
 
                 if (refresh) {
                     this.groupInfo = await CoreGroups.getActivityGroupInfo(this.database.coursemodule);
+                    if (this.groupInfo.visibleGroups && this.groupInfo.groups?.length) {
+                        // There is a bug in Moodle with All participants and visible groups (MOBILE-3597). Remove it.
+                        this.groupInfo.groups = this.groupInfo.groups.filter(group => group.id !== 0);
+                        this.groupInfo.defaultGroupId = this.groupInfo.groups[0].id;
+                    }
+
                     this.selectedGroup = CoreGroups.validateGroupId(this.selectedGroup, this.groupInfo);
                     this.initialSelectedGroup = this.selectedGroup;
                 }
diff --git a/src/addons/mod/data/pages/entry/entry.ts b/src/addons/mod/data/pages/entry/entry.ts
index 648726a62..6bc442857 100644
--- a/src/addons/mod/data/pages/entry/entry.ts
+++ b/src/addons/mod/data/pages/entry/entry.ts
@@ -174,6 +174,12 @@ export class AddonModDataEntryPage implements OnInit, OnDestroy {
             this.access = await AddonModData.getDatabaseAccessInformation(this.database.id, { cmId: this.moduleId });
 
             this.groupInfo = await CoreGroups.getActivityGroupInfo(this.database.coursemodule);
+            if (this.groupInfo.visibleGroups && this.groupInfo.groups?.length) {
+                // There is a bug in Moodle with All participants and visible groups (MOBILE-3597). Remove it.
+                this.groupInfo.groups = this.groupInfo.groups.filter(group => group.id !== 0);
+                this.groupInfo.defaultGroupId = this.groupInfo.groups[0].id;
+            }
+
             this.selectedGroup = CoreGroups.validateGroupId(this.selectedGroup, this.groupInfo);
 
             const actions = AddonModDataHelper.getActions(this.database, this.access, this.entry!);

From 1a0733139679f16421a1f64ae9b3898077db52ed Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 24 Mar 2022 17:29:58 +0100
Subject: [PATCH 0830/1008] MOBILE-3833 course: Display data ASAP in course
 downloads

---
 scripts/langindex.json                        |  3 +-
 .../pages/course-storage/course-storage.html  | 31 ++++++++-----
 .../pages/course-storage/course-storage.ts    | 43 +++++++++++--------
 src/core/lang.json                            |  1 +
 4 files changed, 49 insertions(+), 29 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index ec7f4e8eb..8221281fa 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1453,6 +1453,7 @@
   "core.block.tour_navigation_dashboard_content": "tool_usertours",
   "core.block.tour_navigation_dashboard_title": "tool_usertours",
   "core.browser": "local_moodlemobileapp",
+  "core.calculating": "local_moodlemobileapp",
   "core.cancel": "moodle",
   "core.cannotconnect": "local_moodlemobileapp",
   "core.cannotconnecttrouble": "local_moodlemobileapp",
@@ -1673,6 +1674,7 @@
   "core.editor.underline": "atto_underline/pluginname",
   "core.editor.unorderedlist": "atto_unorderedlist/pluginname",
   "core.emptysplit": "local_moodlemobileapp",
+  "core.endonesteptour": "tool_usertours",
   "core.error": "moodle",
   "core.errorchangecompletion": "local_moodlemobileapp",
   "core.errordeletefile": "local_moodlemobileapp",
@@ -2342,7 +2344,6 @@
   "core.usernotfullysetup": "error",
   "core.users": "moodle",
   "core.usersuspended": "tool_reportbuilder",
-  "core.endonesteptour": "tool_usertours",
   "core.view": "moodle",
   "core.viewcode": "local_moodlemobileapp",
   "core.vieweditor": "local_moodlemobileapp",
diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.html b/src/addons/storagemanager/pages/course-storage/course-storage.html
index b6353dd6c..b36d1e85d 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.html
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.html
@@ -24,15 +24,18 @@
                     <ion-label>
                         <p class="item-heading ion-text-wrap">{{ 'addon.storagemanager.totaldownloads' | translate }}</p>
                     </ion-label>
-                    <ion-badge color="light" slot="end">{{ totalSize | coreBytesToSize }}
+                    <ion-badge color="light" slot="end">
+                        <ng-container *ngIf="sizeLoaded">{{ totalSize | coreBytesToSize }}</ng-container>
+                        <ng-container *ngIf="!sizeLoaded">{{ 'core.calculating' | translate }}</ng-container>
                     </ion-badge>
                 </ion-item>
-                <ion-button *ngIf="downloadCourseEnabled" (click)="prefetchCourse()" expand="block" fill="outline" class="ion-no-margin">
+                <ion-button *ngIf="downloadCourseEnabled" (click)="prefetchCourse()" expand="block" fill="outline" class="ion-no-margin"
+                    [disabled]="prefetchCourseData.loading">
                     <ion-icon *ngIf="!prefetchCourseData.loading" [name]="prefetchCourseData.icon" slot="start"></ion-icon>
                     <ion-spinner *ngIf="prefetchCourseData.loading" slot="start"></ion-spinner>
                     {{ prefetchCourseData.statusTranslatable | translate }}
                 </ion-button>
-                <ion-button *ngIf="totalSize > 0" (click)="deleteForCourse()" expand="block" color="danger"
+                <ion-button *ngIf="sizeLoaded && totalSize > 0" (click)="deleteForCourse()" expand="block" color="danger"
                     class="ion-no-margin ion-margin-top">
                     <ion-icon name="fas-trash" slot="start" [attr.aria-label]="'addon.storagemanager.deletedatafrom' | translate:
                         { name: title }">
@@ -52,18 +55,21 @@
                                 </core-format-text>
                             </p>
                             <ion-badge [color]="section.downloadStatus == statusDownloaded ? 'success' : 'light'"
-                                *ngIf="section.totalSize > 0">
+                                *ngIf="section.sizeLoaded && section.totalSize > 0">
                                 <ion-icon name="fam-cloud-done" *ngIf="section.downloadStatus == statusDownloaded"
                                     [attr.aria-label]="'core.downloaded' | translate">
                                 </ion-icon>{{ section.totalSize | coreBytesToSize }}
                             </ion-badge>
+                            <ion-badge color="light" *ngIf="!section.sizeLoaded">
+                                {{ 'core.calculating' | translate }}
+                            </ion-badge>
                             <!-- Download progress. -->
                             <p *ngIf="downloadEnabled && section.isDownloading">
                                 <core-progress-bar [progress]="section.total == 0 ? -1 : section.count / section.total">
                                 </core-progress-bar>
                             </p>
                         </ion-label>
-                        <div class="storage-buttons" slot="end" *ngIf="section.totalSize > 0 || downloadEnabled">
+                        <div class="storage-buttons" slot="end" *ngIf="(section.sizeLoaded && section.totalSize > 0) || downloadEnabled">
                             <div *ngIf="downloadEnabled" slot="end" class="core-button-spinner">
                                 <core-download-refresh *ngIf="!section.isDownloading && section.downloadStatus != statusDownloaded"
                                     [status]="section.downloadStatus" [enabled]="true" (action)="prefecthSection(section)"
@@ -77,7 +83,8 @@
                                     {{section.count}} / {{section.total}}
                                 </ion-badge>
                             </div>
-                            <ion-button (click)="deleteForSection(section)" *ngIf="section.totalSize > 0" color="danger" fill="clear">
+                            <ion-button (click)="deleteForSection(section)" *ngIf="section.sizeLoaded && section.totalSize > 0"
+                                color="danger" fill="clear">
                                 <ion-icon name="fas-trash" slot="icon-only"
                                     [attr.aria-label]="'addon.storagemanager.deletedatafrom' | translate: { name: section.name }">
                                 </ion-icon>
@@ -87,7 +94,8 @@
                 </ion-card-header>
                 <ion-card-content>
                     <ng-container *ngFor="let module of section.modules">
-                        <ion-item class="ion-no-padding core-course-storage-activity" *ngIf="downloadEnabled || module.totalSize > 0">
+                        <ion-item class="ion-no-padding core-course-storage-activity"
+                            *ngIf="downloadEnabled || (module.sizeLoaded && module.totalSize > 0)">
                             <core-mod-icon slot="start" *ngIf="module.handlerData.icon" [modicon]="module.handlerData.icon"
                                 [modname]="module.modname" [componentId]="module.instance">
                             </core-mod-icon>
@@ -98,11 +106,14 @@
                                     </core-format-text>
                                 </h3>
                                 <ion-badge [color]="module.downloadStatus == statusDownloaded ? 'success' : 'light'"
-                                    *ngIf="module.totalSize > 0">
+                                    *ngIf="module.sizeLoaded && module.totalSize > 0">
                                     <ion-icon name="fam-cloud-done" *ngIf="module.downloadStatus == statusDownloaded"
                                         [attr.aria-label]="'core.downloaded' | translate">
                                     </ion-icon>{{ module.totalSize | coreBytesToSize }}
                                 </ion-badge>
+                                <ion-badge color="light" *ngIf="!module.sizeLoaded">
+                                    {{ 'core.calculating' | translate }}
+                                </ion-badge>
                             </ion-label>
 
                             <div class="storage-buttons" slot="end">
@@ -111,8 +122,8 @@
                                     [canTrustDownload]="true" [loading]="module.spinner || module.handlerData.spinner"
                                     (action)="prefetchModule(module, section)">
                                 </core-download-refresh>
-                                <ion-button fill="clear" (click)="deleteForModule(module, section)" *ngIf="module.totalSize > 0"
-                                    color="danger">
+                                <ion-button fill="clear" (click)="deleteForModule(module, section)"
+                                    *ngIf="module.sizeLoaded && module.totalSize > 0" color="danger">
                                     <ion-icon name="fas-trash" slot="icon-only"
                                         [attr.aria-label]="'addon.storagemanager.deletedatafrom' | translate: { name: module.name }">
                                     </ion-icon>
diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.ts b/src/addons/storagemanager/pages/course-storage/course-storage.ts
index aa14b5269..5c3f371cb 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.ts
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.ts
@@ -48,6 +48,7 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
     loaded = false;
     sections: AddonStorageManagerCourseSection[] = [];
     totalSize = 0;
+    sizeLoaded = false;
 
     downloadEnabled = false;
     downloadCourseEnabled = false;
@@ -107,13 +108,13 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
         this.sections = (await CoreCourseHelper.addHandlerDataForModules(sections, this.courseId)).sections
             .map((section) => ({ ...section, totalSize: 0 }));
 
+        this.loaded = true;
+
         await Promise.all([
             this.loadSizes(),
             this.initCoursePrefetch(),
             this.initModulePrefetch(),
         ]);
-
-        this.loaded = true;
     }
 
     /**
@@ -241,12 +242,15 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
      */
     protected async loadSizes(): Promise<void> {
         this.totalSize = 0;
+        this.sizeLoaded = false;
 
-        const promises: Promise<void>[] = [];
-        this.sections.forEach((section) => {
+        await Promise.all(this.sections.map(async (section) => {
             section.totalSize = 0;
-            section.modules.forEach((module) => {
+            section.sizeLoaded = false;
+
+            await Promise.all(section.modules.map(async (module) => {
                 module.totalSize = 0;
+                module.sizeLoaded = false;
 
                 // Note: This function only gets the size for modules which are downloadable.
                 // For other modules it always returns 0, even if they have downloaded some files.
@@ -255,21 +259,22 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
                 // But these aren't necessarily consistent, for example mod_frog vs mmaModFrog.
                 // There is nothing enforcing correct values.
                 // Most modules which have large files are downloadable, so I think this is sufficient.
-                const promise = CoreCourseModulePrefetchDelegate.getModuleStoredSize(module, this.courseId).then((size) => {
-                    // There are some cases where the return from this is not a valid number.
-                    if (!isNaN(size)) {
-                        module.totalSize = Number(size);
-                        section.totalSize += size;
-                        this.totalSize += size;
-                    }
+                const size = await CoreCourseModulePrefetchDelegate.getModuleStoredSize(module, this.courseId);
 
-                    return;
-                });
-                promises.push(promise);
-            });
-        });
+                // There are some cases where the return from this is not a valid number.
+                if (!isNaN(size)) {
+                    module.totalSize = Number(size);
+                    section.totalSize += size;
+                    this.totalSize += size;
+                }
 
-        await Promise.all(promises);
+                module.sizeLoaded = true;
+            }));
+
+            section.sizeLoaded = true;
+        }));
+
+        this.sizeLoaded = true;
 
         // Mark course as not downloaded if course size is 0.
         if (this.totalSize == 0) {
@@ -608,11 +613,13 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
 
 type AddonStorageManagerCourseSection = Omit<CoreCourseSectionWithStatus, 'modules'> & {
     totalSize: number;
+    sizeLoaded?: boolean;
     modules: AddonStorageManagerModule[];
 };
 
 type AddonStorageManagerModule = CoreCourseModuleData & {
     totalSize?: number;
+    sizeLoaded?: boolean;
     prefetchHandler?: CoreCourseModulePrefetchHandler;
     spinner?: boolean;
     downloadStatus?: string;
diff --git a/src/core/lang.json b/src/core/lang.json
index 8dd623b4e..a66c1a6a3 100644
--- a/src/core/lang.json
+++ b/src/core/lang.json
@@ -13,6 +13,7 @@
     "areyousure": "Are you sure?",
     "back": "Back",
     "browser": "Browser",
+    "calculating": "Calculating",
     "cancel": "Cancel",
     "cannotconnect": "Cannot connect",
     "cannotconnecttrouble": "We're having trouble connecting to your site.",

From 37af8e3c69b4338a874fe39fe8bb5fd85c5e39a2 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 28 Mar 2022 12:54:14 +0200
Subject: [PATCH 0831/1008] MOBILE-3833 course: Improve performance after
 download or delete

---
 .../pages/course-storage/course-storage.html  | 23 ++---
 .../pages/course-storage/course-storage.ts    | 91 ++++++++++++++-----
 2 files changed, 82 insertions(+), 32 deletions(-)

diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.html b/src/addons/storagemanager/pages/course-storage/course-storage.html
index b36d1e85d..57b45f33c 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.html
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.html
@@ -25,8 +25,8 @@
                         <p class="item-heading ion-text-wrap">{{ 'addon.storagemanager.totaldownloads' | translate }}</p>
                     </ion-label>
                     <ion-badge color="light" slot="end">
-                        <ng-container *ngIf="sizeLoaded">{{ totalSize | coreBytesToSize }}</ng-container>
-                        <ng-container *ngIf="!sizeLoaded">{{ 'core.calculating' | translate }}</ng-container>
+                        <ng-container *ngIf="!calculatingSize">{{ totalSize | coreBytesToSize }}</ng-container>
+                        <ng-container *ngIf="calculatingSize">{{ 'core.calculating' | translate }}</ng-container>
                     </ion-badge>
                 </ion-item>
                 <ion-button *ngIf="downloadCourseEnabled" (click)="prefetchCourse()" expand="block" fill="outline" class="ion-no-margin"
@@ -35,7 +35,7 @@
                     <ion-spinner *ngIf="prefetchCourseData.loading" slot="start"></ion-spinner>
                     {{ prefetchCourseData.statusTranslatable | translate }}
                 </ion-button>
-                <ion-button *ngIf="sizeLoaded && totalSize > 0" (click)="deleteForCourse()" expand="block" color="danger"
+                <ion-button [disabled]="calculatingSize || totalSize <= 0" (click)="deleteForCourse()" expand="block" color="danger"
                     class="ion-no-margin ion-margin-top">
                     <ion-icon name="fas-trash" slot="start" [attr.aria-label]="'addon.storagemanager.deletedatafrom' | translate:
                         { name: title }">
@@ -55,12 +55,12 @@
                                 </core-format-text>
                             </p>
                             <ion-badge [color]="section.downloadStatus == statusDownloaded ? 'success' : 'light'"
-                                *ngIf="section.sizeLoaded && section.totalSize > 0">
+                                *ngIf="!section.calculatingSize && section.totalSize > 0">
                                 <ion-icon name="fam-cloud-done" *ngIf="section.downloadStatus == statusDownloaded"
                                     [attr.aria-label]="'core.downloaded' | translate">
                                 </ion-icon>{{ section.totalSize | coreBytesToSize }}
                             </ion-badge>
-                            <ion-badge color="light" *ngIf="!section.sizeLoaded">
+                            <ion-badge color="light" *ngIf="section.calculatingSize">
                                 {{ 'core.calculating' | translate }}
                             </ion-badge>
                             <!-- Download progress. -->
@@ -69,7 +69,8 @@
                                 </core-progress-bar>
                             </p>
                         </ion-label>
-                        <div class="storage-buttons" slot="end" *ngIf="(section.sizeLoaded && section.totalSize > 0) || downloadEnabled">
+                        <div class="storage-buttons" slot="end"
+                            *ngIf="(!section.calculatingSize && section.totalSize > 0) || downloadEnabled">
                             <div *ngIf="downloadEnabled" slot="end" class="core-button-spinner">
                                 <core-download-refresh *ngIf="!section.isDownloading && section.downloadStatus != statusDownloaded"
                                     [status]="section.downloadStatus" [enabled]="true" (action)="prefecthSection(section)"
@@ -83,7 +84,7 @@
                                     {{section.count}} / {{section.total}}
                                 </ion-badge>
                             </div>
-                            <ion-button (click)="deleteForSection(section)" *ngIf="section.sizeLoaded && section.totalSize > 0"
+                            <ion-button (click)="deleteForSection(section)" *ngIf="!section.calculatingSize && section.totalSize > 0"
                                 color="danger" fill="clear">
                                 <ion-icon name="fas-trash" slot="icon-only"
                                     [attr.aria-label]="'addon.storagemanager.deletedatafrom' | translate: { name: section.name }">
@@ -95,7 +96,7 @@
                 <ion-card-content>
                     <ng-container *ngFor="let module of section.modules">
                         <ion-item class="ion-no-padding core-course-storage-activity"
-                            *ngIf="downloadEnabled || (module.sizeLoaded && module.totalSize > 0)">
+                            *ngIf="downloadEnabled || (!module.calculatingSize && module.totalSize > 0)">
                             <core-mod-icon slot="start" *ngIf="module.handlerData.icon" [modicon]="module.handlerData.icon"
                                 [modname]="module.modname" [componentId]="module.instance">
                             </core-mod-icon>
@@ -106,12 +107,12 @@
                                     </core-format-text>
                                 </h3>
                                 <ion-badge [color]="module.downloadStatus == statusDownloaded ? 'success' : 'light'"
-                                    *ngIf="module.sizeLoaded && module.totalSize > 0">
+                                    *ngIf="!module.calculatingSize && module.totalSize > 0">
                                     <ion-icon name="fam-cloud-done" *ngIf="module.downloadStatus == statusDownloaded"
                                         [attr.aria-label]="'core.downloaded' | translate">
                                     </ion-icon>{{ module.totalSize | coreBytesToSize }}
                                 </ion-badge>
-                                <ion-badge color="light" *ngIf="!module.sizeLoaded">
+                                <ion-badge color="light" *ngIf="module.calculatingSize">
                                     {{ 'core.calculating' | translate }}
                                 </ion-badge>
                             </ion-label>
@@ -123,7 +124,7 @@
                                     (action)="prefetchModule(module, section)">
                                 </core-download-refresh>
                                 <ion-button fill="clear" (click)="deleteForModule(module, section)"
-                                    *ngIf="module.sizeLoaded && module.totalSize > 0" color="danger">
+                                    *ngIf="!module.calculatingSize && module.totalSize > 0" color="danger">
                                     <ion-icon name="fas-trash" slot="icon-only"
                                         [attr.aria-label]="'addon.storagemanager.deletedatafrom' | translate: { name: module.name }">
                                     </ion-icon>
diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.ts b/src/addons/storagemanager/pages/course-storage/course-storage.ts
index 5c3f371cb..39c3d42d0 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.ts
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.ts
@@ -48,7 +48,7 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
     loaded = false;
     sections: AddonStorageManagerCourseSection[] = [];
     totalSize = 0;
-    sizeLoaded = false;
+    calculatingSize = true;
 
     downloadEnabled = false;
     downloadCourseEnabled = false;
@@ -106,12 +106,20 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
 
         const sections = await CoreCourse.getSections(this.courseId, false, true);
         this.sections = (await CoreCourseHelper.addHandlerDataForModules(sections, this.courseId)).sections
-            .map((section) => ({ ...section, totalSize: 0 }));
+            .map(section => ({
+                ...section,
+                totalSize: 0,
+                calculatingSize: true,
+                modules: section.modules.map(module => ({
+                    ...module,
+                    calculatingSize: true,
+                })),
+            }));
 
         this.loaded = true;
 
         await Promise.all([
-            this.loadSizes(),
+            this.initSizes(),
             this.initCoursePrefetch(),
             this.initModulePrefetch(),
         ]);
@@ -240,18 +248,9 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
     /**
      * Init section, course and modules sizes.
      */
-    protected async loadSizes(): Promise<void> {
-        this.totalSize = 0;
-        this.sizeLoaded = false;
-
+    protected async initSizes(): Promise<void> {
         await Promise.all(this.sections.map(async (section) => {
-            section.totalSize = 0;
-            section.sizeLoaded = false;
-
             await Promise.all(section.modules.map(async (module) => {
-                module.totalSize = 0;
-                module.sizeLoaded = false;
-
                 // Note: This function only gets the size for modules which are downloadable.
                 // For other modules it always returns 0, even if they have downloaded some files.
                 // However there is no 100% reliable way to actually track the files in this case.
@@ -268,13 +267,13 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
                     this.totalSize += size;
                 }
 
-                module.sizeLoaded = true;
+                module.calculatingSize = false;
             }));
 
-            section.sizeLoaded = true;
+            section.calculatingSize = false;
         }));
 
-        this.sizeLoaded = true;
+        this.calculatingSize = false;
 
         // Mark course as not downloaded if course size is 0.
         if (this.totalSize == 0) {
@@ -282,6 +281,56 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
         }
     }
 
+    /**
+     * Update the sizes of some modules.
+     *
+     * @param modules Modules.
+     * @param section Section the modules belong to.
+     * @return Promise resolved when done.
+     */
+    protected async updateModulesSizes(
+        modules: AddonStorageManagerModule[],
+        section?: AddonStorageManagerCourseSection,
+    ): Promise<void> {
+        this.calculatingSize = true;
+
+        await Promise.all(modules.map(async (module) => {
+            if (module.calculatingSize) {
+                return;
+            }
+
+            module.calculatingSize = true;
+
+            if (!section) {
+                section = this.sections.find((section) => section.modules.some((mod) => mod.id === module.id));
+                if (section) {
+                    section.calculatingSize = true;
+                }
+            }
+
+            try {
+                const size = await CoreCourseModulePrefetchDelegate.getModuleStoredSize(module, this.courseId);
+
+                const diff = (isNaN(size) ? 0 : size) - (module.totalSize ?? 0);
+
+                module.totalSize = Number(size);
+                this.totalSize += diff;
+                if (section) {
+                    section.totalSize += diff;
+                }
+            } catch {
+                // Ignore errors, it shouldn't happen.
+            } finally {
+                module.calculatingSize = false;
+            }
+        }));
+
+        this.calculatingSize = false;
+        if (section) {
+            section.calculatingSize = false;
+        }
+    }
+
     /**
      * The user has requested a delete for the whole course data.
      *
@@ -406,7 +455,7 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
         } finally {
             modal.dismiss();
 
-            await this.loadSizes();
+            await this.updateModulesSizes(modules, section);
             CoreCourseHelper.calculateSectionsStatus(this.sections, this.courseId, false, false);
         }
     }
@@ -455,7 +504,7 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
                     CoreDomUtils.showErrorModalDefault(error, 'core.course.errordownloadingsection', true);
                 }
             } finally {
-                await this.loadSizes();
+                await this.updateModulesSizes(section.modules, section);
             }
         } catch (error) {
             // User cancelled or there was an error calculating the size.
@@ -501,7 +550,7 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
         } finally {
             module.spinner = false;
 
-            await this.loadSizes();
+            await this.updateModulesSizes([module]);
         }
     }
 
@@ -613,13 +662,13 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
 
 type AddonStorageManagerCourseSection = Omit<CoreCourseSectionWithStatus, 'modules'> & {
     totalSize: number;
-    sizeLoaded?: boolean;
+    calculatingSize: boolean;
     modules: AddonStorageManagerModule[];
 };
 
 type AddonStorageManagerModule = CoreCourseModuleData & {
     totalSize?: number;
-    sizeLoaded?: boolean;
+    calculatingSize: boolean;
     prefetchHandler?: CoreCourseModulePrefetchHandler;
     spinner?: boolean;
     downloadStatus?: string;

From 0298273fc4c62b88b8473790d64cbaf976d6d246 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 29 Mar 2022 12:39:18 +0200
Subject: [PATCH 0832/1008] MOBILE-3833 course: Collapse sections in downloads
 page

---
 .../pages/course-storage/course-storage.html  | 84 ++++++++++---------
 .../pages/course-storage/course-storage.ts    | 30 ++++++-
 .../course-format/course-format.html          |  5 ++
 .../components/course-format/course-format.ts | 64 +++++++++-----
 .../components/course-index/course-index.html | 56 +++++++------
 .../course/pages/contents/contents.html       |  5 --
 .../course/pages/contents/contents.ts         |  8 --
 7 files changed, 152 insertions(+), 100 deletions(-)

diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.html b/src/addons/storagemanager/pages/course-storage/course-storage.html
index 57b45f33c..2df7b3282 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.html
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.html
@@ -47,7 +47,13 @@
         <ng-container *ngFor="let section of sections">
             <ion-card class="section" *ngIf="section.modules.length > 0">
                 <ion-card-header>
-                    <ion-item class="ion-no-padding" lines="full">
+                    <ion-item class="ion-no-padding" [lines]="section.expanded ? 'full' : 'none'" button detail="false"
+                        (click)="toggleExpand($event, section)" [class.core-course-storage-section-expanded]="section.expanded"
+                        [attr.aria-label]="(section.expanded ? 'core.collapse' : 'core.expand') | translate"
+                        [attr.aria-expanded]="section.expanded" [attr.aria-controls]="'core-course-storage-section-' + section.id">
+                        <ion-icon name="fas-chevron-right" flip-rtl slot="start" class="expandable-status-icon"
+                            [class.expandable-status-icon-expanded]="section.expanded">
+                        </ion-icon>
                         <ion-label>
                             <p class="item-heading ion-text-wrap">
                                 <core-format-text [text]="section.name" contextLevel="course" [contextInstanceId]="section.course"
@@ -93,44 +99,46 @@
                         </div>
                     </ion-item>
                 </ion-card-header>
-                <ion-card-content>
-                    <ng-container *ngFor="let module of section.modules">
-                        <ion-item class="ion-no-padding core-course-storage-activity"
-                            *ngIf="downloadEnabled || (!module.calculatingSize && module.totalSize > 0)">
-                            <core-mod-icon slot="start" *ngIf="module.handlerData.icon" [modicon]="module.handlerData.icon"
-                                [modname]="module.modname" [componentId]="module.instance">
-                            </core-mod-icon>
-                            <ion-label class="ion-text-wrap">
-                                <h3 class="{{module.handlerData!.class}} addon-storagemanager-module-size">
-                                    <core-format-text [text]="module.handlerData.title" [courseId]="module.course" contextLevel="module"
-                                        [contextInstanceId]="module.id" [adaptImg]="false">
-                                    </core-format-text>
-                                </h3>
-                                <ion-badge [color]="module.downloadStatus == statusDownloaded ? 'success' : 'light'"
-                                    *ngIf="!module.calculatingSize && module.totalSize > 0">
-                                    <ion-icon name="fam-cloud-done" *ngIf="module.downloadStatus == statusDownloaded"
-                                        [attr.aria-label]="'core.downloaded' | translate">
-                                    </ion-icon>{{ module.totalSize | coreBytesToSize }}
-                                </ion-badge>
-                                <ion-badge color="light" *ngIf="module.calculatingSize">
-                                    {{ 'core.calculating' | translate }}
-                                </ion-badge>
-                            </ion-label>
+                <ion-card-content id="core-course-storage-section-{{section.id}}">
+                    <ng-container *ngIf="section.expanded">
+                        <ng-container *ngFor="let module of section.modules">
+                            <ion-item class="ion-no-padding core-course-storage-activity"
+                                *ngIf="downloadEnabled || (!module.calculatingSize && module.totalSize > 0)">
+                                <core-mod-icon slot="start" *ngIf="module.handlerData.icon" [modicon]="module.handlerData.icon"
+                                    [modname]="module.modname" [componentId]="module.instance">
+                                </core-mod-icon>
+                                <ion-label class="ion-text-wrap">
+                                    <h3 class="{{module.handlerData!.class}} addon-storagemanager-module-size">
+                                        <core-format-text [text]="module.handlerData.title" [courseId]="module.course" contextLevel="module"
+                                            [contextInstanceId]="module.id" [adaptImg]="false">
+                                        </core-format-text>
+                                    </h3>
+                                    <ion-badge [color]="module.downloadStatus == statusDownloaded ? 'success' : 'light'"
+                                        *ngIf="!module.calculatingSize && module.totalSize > 0">
+                                        <ion-icon name="fam-cloud-done" *ngIf="module.downloadStatus == statusDownloaded"
+                                            [attr.aria-label]="'core.downloaded' | translate">
+                                        </ion-icon>{{ module.totalSize | coreBytesToSize }}
+                                    </ion-badge>
+                                    <ion-badge color="light" *ngIf="module.calculatingSize">
+                                        {{ 'core.calculating' | translate }}
+                                    </ion-badge>
+                                </ion-label>
 
-                            <div class="storage-buttons" slot="end">
-                                <core-download-refresh *ngIf="downloadEnabled && module.handlerData?.showDownloadButton &&
-                                    module.downloadStatus != statusDownloaded" [status]="module.downloadStatus" [enabled]="true"
-                                    [canTrustDownload]="true" [loading]="module.spinner || module.handlerData.spinner"
-                                    (action)="prefetchModule(module, section)">
-                                </core-download-refresh>
-                                <ion-button fill="clear" (click)="deleteForModule(module, section)"
-                                    *ngIf="!module.calculatingSize && module.totalSize > 0" color="danger">
-                                    <ion-icon name="fas-trash" slot="icon-only"
-                                        [attr.aria-label]="'addon.storagemanager.deletedatafrom' | translate: { name: module.name }">
-                                    </ion-icon>
-                                </ion-button>
-                            </div>
-                        </ion-item>
+                                <div class="storage-buttons" slot="end">
+                                    <core-download-refresh *ngIf="downloadEnabled && module.handlerData?.showDownloadButton &&
+                                        module.downloadStatus != statusDownloaded" [status]="module.downloadStatus" [enabled]="true"
+                                        [canTrustDownload]="true" [loading]="module.spinner || module.handlerData.spinner"
+                                        (action)="prefetchModule(module, section)">
+                                    </core-download-refresh>
+                                    <ion-button fill="clear" (click)="deleteForModule(module, section)"
+                                        *ngIf="!module.calculatingSize && module.totalSize > 0" color="danger">
+                                        <ion-icon name="fas-trash" slot="icon-only"
+                                            [attr.aria-label]="'addon.storagemanager.deletedatafrom' | translate: { name: module.name }">
+                                        </ion-icon>
+                                    </ion-button>
+                                </div>
+                            </ion-item>
+                        </ng-container>
                     </ng-container>
                 </ion-card-content>
             </ion-card>
diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.ts b/src/addons/storagemanager/pages/course-storage/course-storage.ts
index 39c3d42d0..6aa817913 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.ts
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { CoreConstants } from '@/core/constants';
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Component, ElementRef, OnDestroy, OnInit } from '@angular/core';
 import { CoreCourse, CoreCourseProvider } from '@features/course/services/course';
 import {
     CoreCourseHelper,
@@ -30,6 +30,7 @@ import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
 import { Translate } from '@singletons';
+import { CoreDom } from '@singletons/dom';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 
 /**
@@ -62,6 +63,7 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
 
     statusDownloaded = CoreConstants.DOWNLOADED;
 
+    protected initialSectionId?: number;
     protected siteUpdatedObserver?: CoreEventObserver;
     protected courseStatusObserver?: CoreEventObserver;
     protected sectionStatusObserver?: CoreEventObserver;
@@ -69,7 +71,7 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
     protected isDestroyed = false;
     protected isGuest = false;
 
-    constructor() {
+    constructor(protected elementRef: ElementRef) {
         // Refresh the enabled flags if site is updated.
         this.siteUpdatedObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, () => {
             this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
@@ -100,16 +102,19 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
         }
 
         this.isGuest = !!CoreNavigator.getRouteBooleanParam('isGuest');
+        this.initialSectionId = CoreNavigator.getRouteNumberParam('sectionId');
 
         this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
         this.downloadEnabled = !CoreSites.getRequiredCurrentSite().isOfflineDisabled();
 
-        const sections = await CoreCourse.getSections(this.courseId, false, true);
+        const sections = (await CoreCourse.getSections(this.courseId, false, true))
+            .filter((section) => !CoreCourseHelper.isSectionStealth(section));
         this.sections = (await CoreCourseHelper.addHandlerDataForModules(sections, this.courseId)).sections
             .map(section => ({
                 ...section,
                 totalSize: 0,
                 calculatingSize: true,
+                expanded: section.id === this.initialSectionId,
                 modules: section.modules.map(module => ({
                     ...module,
                     calculatingSize: true,
@@ -118,6 +123,12 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
 
         this.loaded = true;
 
+        CoreDom.scrollToElement(
+            this.elementRef.nativeElement,
+            '.core-course-storage-section-expanded',
+            { addYAxis: -10 },
+        );
+
         await Promise.all([
             this.initSizes(),
             this.initCoursePrefetch(),
@@ -641,6 +652,18 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
         }
     }
 
+    /**
+     * Toggle expand status.
+     *
+     * @param event Event object.
+     * @param section Section to expand / collapse.
+     */
+    toggleExpand(event: Event, section: AddonStorageManagerCourseSection): void {
+        section.expanded = !section.expanded;
+        event.stopPropagation();
+        event.preventDefault();
+    }
+
     /**
      * @inheritdoc
      */
@@ -663,6 +686,7 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
 type AddonStorageManagerCourseSection = Omit<CoreCourseSectionWithStatus, 'modules'> & {
     totalSize: number;
     calculatingSize: boolean;
+    expanded: boolean;
     modules: AddonStorageManagerModule[];
 };
 
diff --git a/src/core/features/course/components/course-format/course-format.html b/src/core/features/course/components/course-format/course-format.html
index 2d8cd3391..4031d1654 100644
--- a/src/core/features/course/components/course-format/course-format.html
+++ b/src/core/features/course/components/course-format/course-format.html
@@ -1,3 +1,8 @@
+<core-navbar-buttons slot="end" prepend>
+    <ion-button fill="clear" (click)="gotoCourseDownloads()" [attr.aria-label]="'addon.storagemanager.coursedownloads' | translate">
+        <ion-icon name="fas-cloud-download-alt" slot="icon-only" aria-hidden="true"></ion-icon>
+    </ion-button>
+</core-navbar-buttons>
 <core-dynamic-component [component]="courseFormatComponent" [data]="data">
     <!-- Default course format. -->
     <core-loading [hideUntil]="loaded">
diff --git a/src/core/features/course/components/course-format/course-format.ts b/src/core/features/course/components/course-format/course-format.ts
index dca3d5443..c1bee68f6 100644
--- a/src/core/features/course/components/course-format/course-format.ts
+++ b/src/core/features/course/components/course-format/course-format.ts
@@ -391,29 +391,38 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
         );
     }
 
+    /**
+     * Get selected section ID. If viewing all sections, use current scrolled section.
+     *
+     * @return Section ID, undefined if not found.
+     */
+    protected async getSelectedSectionId(): Promise<number | undefined> {
+        if (this.selectedSection?.id !== this.allSectionsId) {
+            return this.selectedSection?.id;
+        }
+
+        // Check current scrolled section.
+        const allSectionElements: NodeListOf<HTMLElement> =
+            this.elementRef.nativeElement.querySelectorAll('section.core-course-module-list-wrapper');
+
+        const scroll = await this.content.getScrollElement();
+        const containerTop = scroll.getBoundingClientRect().top;
+
+        const element = Array.from(allSectionElements).find((element) => {
+            const position = element.getBoundingClientRect();
+
+            // The bottom is inside the container or lower.
+            return position.bottom >= containerTop;
+        });
+
+        return Number(element?.getAttribute('id')) || undefined;
+    }
+
     /**
      * Display the course index modal.
      */
     async openCourseIndex(): Promise<void> {
-        let selectedId = this.selectedSection?.id;
-
-        if (selectedId == this.allSectionsId) {
-            // Check current scrolled section.
-            const allSectionElements: NodeListOf<HTMLElement> =
-                this.elementRef.nativeElement.querySelectorAll('section.section-wrapper');
-
-            const scroll = await this.content.getScrollElement();
-            const containerTop = scroll.getBoundingClientRect().top;
-
-            const element = Array.from(allSectionElements).find((element) => {
-                const position = element.getBoundingClientRect();
-
-                // The bottom is inside the container or lower.
-                return position.bottom >= containerTop;
-            });
-
-            selectedId = Number(element?.getAttribute('id')) || undefined;
-        }
+        const selectedId = await this.getSelectedSectionId();
 
         const data = await CoreDomUtils.openModal<CoreCourseIndexSectionWithModule>({
             component: CoreCourseCourseIndexComponent,
@@ -453,6 +462,23 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
         this.moduleId = data.moduleId;
     }
 
+    /**
+     * Open course downloads page.
+     */
+    async gotoCourseDownloads(): Promise<void> {
+        const selectedId = await this.getSelectedSectionId();
+
+        CoreNavigator.navigateToSitePath(
+            `storage/${this.course.id}`,
+            {
+                params: {
+                    title: this.course.fullname,
+                    sectionId: selectedId,
+                },
+            },
+        );
+    }
+
     /**
      * Function called when selected section changes.
      *
diff --git a/src/core/features/course/components/course-index/course-index.html b/src/core/features/course/components/course-index/course-index.html
index 892a63767..8de92a89b 100644
--- a/src/core/features/course/components/course-index/course-index.html
+++ b/src/core/features/course/components/course-index/course-index.html
@@ -48,34 +48,36 @@
                     <ion-icon name="fas-eye-slash" *ngIf="!section.visible && section.uservisible" slot="end" class="restricted"
                         [attr.aria-label]="'core.course.hiddenfromstudents' | translate"></ion-icon>
                 </ion-item>
-                <ng-container *ngIf="section.expanded">
-                    <ng-container *ngFor="let module of section.modules">
-                        <ion-item class="module" [class.item-dimmed]="!module.visible" [class.item-hightlighted]="section.highlighted"
-                            (click)="selectSectionOrModule($event, section.id, module.id)" button>
-                            <ion-icon class="completioninfo completion_none" name="" *ngIf="module.completionStatus === undefined"
-                                slot="start" aria-hidden="true"></ion-icon>
-                            <ion-icon class="completioninfo completion_incomplete" name="far-circle" *ngIf="module.completionStatus === 0"
-                                slot="start" [attr.aria-label]="'core.course.todo' | translate">
-                            </ion-icon>
-                            <ion-icon class="completioninfo completion_complete" name="fas-circle"
-                                *ngIf="module.completionStatus === 1 || module.completionStatus === 2" color="success" slot="start"
-                                [attr.aria-label]="'core.course.done' | translate">
-                            </ion-icon>
-                            <ion-icon class="completioninfo completion_fail" name="fas-circle" *ngIf="module.completionStatus === 3"
-                                color="danger" slot="start" [attr.aria-label]="'core.course.failed' | translate">
-                            </ion-icon>
-                            <ion-label>
-                                <p class="item-heading">
-                                    <core-format-text [text]="module.name" contextLevel="module" [contextInstanceId]="module.id"
-                                        [courseId]="module.course">
-                                    </core-format-text>
-                                </p>
-                            </ion-label>
-                            <ion-icon name="fas-lock" *ngIf="!module.uservisible" slot="end" class="restricted"
-                                [attr.aria-label]="'core.restricted' | translate"></ion-icon>
-                        </ion-item>
+                <div id="core-course-index-section-{{section.id}}">
+                    <ng-container *ngIf="section.expanded">
+                        <ng-container *ngFor="let module of section.modules">
+                            <ion-item class="module" [class.item-dimmed]="!module.visible" [class.item-hightlighted]="section.highlighted"
+                                (click)="selectSectionOrModule($event, section.id, module.id)" button>
+                                <ion-icon class="completioninfo completion_none" name="" *ngIf="module.completionStatus === undefined"
+                                    slot="start" aria-hidden="true"></ion-icon>
+                                <ion-icon class="completioninfo completion_incomplete" name="far-circle"
+                                    *ngIf="module.completionStatus === 0" slot="start" [attr.aria-label]="'core.course.todo' | translate">
+                                </ion-icon>
+                                <ion-icon class="completioninfo completion_complete" name="fas-circle"
+                                    *ngIf="module.completionStatus === 1 || module.completionStatus === 2" color="success" slot="start"
+                                    [attr.aria-label]="'core.course.done' | translate">
+                                </ion-icon>
+                                <ion-icon class="completioninfo completion_fail" name="fas-circle" *ngIf="module.completionStatus === 3"
+                                    color="danger" slot="start" [attr.aria-label]="'core.course.failed' | translate">
+                                </ion-icon>
+                                <ion-label>
+                                    <p class="item-heading">
+                                        <core-format-text [text]="module.name" contextLevel="module" [contextInstanceId]="module.id"
+                                            [courseId]="module.course">
+                                        </core-format-text>
+                                    </p>
+                                </ion-label>
+                                <ion-icon name="fas-lock" *ngIf="!module.uservisible" slot="end" class="restricted"
+                                    [attr.aria-label]="'core.restricted' | translate"></ion-icon>
+                            </ion-item>
+                        </ng-container>
                     </ng-container>
-                </ng-container>
+                </div>
             </ng-container>
         </ng-container>
     </ion-list>
diff --git a/src/core/features/course/pages/contents/contents.html b/src/core/features/course/pages/contents/contents.html
index bc3f404f8..2d0eeb1db 100644
--- a/src/core/features/course/pages/contents/contents.html
+++ b/src/core/features/course/pages/contents/contents.html
@@ -1,8 +1,3 @@
-<core-navbar-buttons slot="end" prepend>
-    <ion-button fill="clear" (click)="gotoCourseDownloads()" [attr.aria-label]="'addon.storagemanager.coursedownloads' | translate">
-        <ion-icon name="fas-cloud-download-alt" slot="icon-only" aria-hidden="true"></ion-icon>
-    </ion-button>
-</core-navbar-buttons>
 <ion-content>
     <ion-refresher slot="fixed" [disabled]="!dataLoaded || !displayRefresher" (ionRefresh)="doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
diff --git a/src/core/features/course/pages/contents/contents.ts b/src/core/features/course/pages/contents/contents.ts
index 81953a209..7413a0444 100644
--- a/src/core/features/course/pages/contents/contents.ts
+++ b/src/core/features/course/pages/contents/contents.ts
@@ -366,14 +366,6 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
         }
     }
 
-    gotoCourseDownloads(): void {
-        CoreNavigator.navigateToSitePath(
-            `storage/${this.course.id}`,
-            { params: { title: this.course.fullname } },
-        );
-
-    }
-
     /**
      * @inheritdoc
      */

From ca25ad0420e8bd1281f7ac9b9d727f1b8369578b Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 29 Mar 2022 13:22:52 +0200
Subject: [PATCH 0833/1008] MOBILE-3833 config: Remove unused globalization
 plugin

---
 config.xml        |  5 -----
 package-lock.json | 18 ------------------
 package.json      |  4 +---
 3 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/config.xml b/config.xml
index bfcacc07b..da7166bf5 100644
--- a/config.xml
+++ b/config.xml
@@ -130,11 +130,6 @@
                 <param name="android-package" value="org.apache.cordova.geolocation.Geolocation" />
             </feature>
         </config-file>
-        <config-file parent="/*" target="res/xml/config.xml">
-            <feature name="Globalization">
-                <param name="android-package" value="org.apache.cordova.globalization.Globalization" />
-            </feature>
-        </config-file>
         <config-file parent="/*" target="res/xml/config.xml">
             <feature name="InAppBrowser">
                 <param name="android-package" value="org.apache.cordova.inappbrowser.InAppBrowser" />
diff --git a/package-lock.json b/package-lock.json
index 40f640b46..a73545b60 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -71,7 +71,6 @@
         "cordova-plugin-file": "6.0.2",
         "cordova-plugin-file-opener2": "3.0.5",
         "cordova-plugin-geolocation": "4.1.0",
-        "cordova-plugin-globalization": "1.11.0",
         "cordova-plugin-ionic-keyboard": "2.2.0",
         "cordova-plugin-media": "5.0.4",
         "cordova-plugin-media-capture": "3.0.3",
@@ -11389,18 +11388,6 @@
         }
       }
     },
-    "node_modules/cordova-plugin-globalization": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-globalization/-/cordova-plugin-globalization-1.11.0.tgz",
-      "integrity": "sha1-6sMVgQAphJOvowvolA5pj2HvvP4=",
-      "engines": {
-        "cordovaDependencies": {
-          "2.0.0": {
-            "cordova": ">100"
-          }
-        }
-      }
-    },
     "node_modules/cordova-plugin-ionic-keyboard": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/cordova-plugin-ionic-keyboard/-/cordova-plugin-ionic-keyboard-2.2.0.tgz",
@@ -40148,11 +40135,6 @@
       "resolved": "https://registry.npmjs.org/cordova-plugin-geolocation/-/cordova-plugin-geolocation-4.1.0.tgz",
       "integrity": "sha512-y5io/P10xGMxSn2KEqfv/fExK47eA1pmSonJdmDqDsaSADV9JpgdPx0mUSA08+5pzma/OS9R0LoODeDPx7Jvjg=="
     },
-    "cordova-plugin-globalization": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-globalization/-/cordova-plugin-globalization-1.11.0.tgz",
-      "integrity": "sha1-6sMVgQAphJOvowvolA5pj2HvvP4="
-    },
     "cordova-plugin-ionic-keyboard": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/cordova-plugin-ionic-keyboard/-/cordova-plugin-ionic-keyboard-2.2.0.tgz",
diff --git a/package.json b/package.json
index 295ce081c..767ed5d13 100644
--- a/package.json
+++ b/package.json
@@ -100,7 +100,6 @@
     "cordova-plugin-file": "6.0.2",
     "cordova-plugin-file-opener2": "3.0.5",
     "cordova-plugin-geolocation": "4.1.0",
-    "cordova-plugin-globalization": "1.11.0",
     "cordova-plugin-ionic-keyboard": "2.2.0",
     "cordova-plugin-media": "5.0.4",
     "cordova-plugin-media-capture": "3.0.3",
@@ -236,7 +235,6 @@
         "ANDROIDX_VERSION": "1.0.0",
         "ANDROIDX_APPCOMPAT_VERSION": "1.3.1"
       },
-      "cordova-plugin-globalization": {},
       "@moodlehq/cordova-plugin-file-transfer": {},
       "cordova-plugin-prevent-override": {},
       "cordova-plugin-androidx-adapter": {}
@@ -245,4 +243,4 @@
   "optionalDependencies": {
     "keytar": "7.2.0"
   }
-}
+}
\ No newline at end of file

From 5313754a25570ec954854959f558187ddb07dffa Mon Sep 17 00:00:00 2001
From: Alfonso <alfonsomtb98@gmail.com>
Date: Tue, 29 Mar 2022 13:44:28 +0200
Subject: [PATCH 0834/1008] MOBILE-4010 about: show feedback item if there is a
 selected site

---
 src/core/features/settings/pages/about/about.html | 2 +-
 src/core/features/settings/pages/about/about.ts   | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/core/features/settings/pages/about/about.html b/src/core/features/settings/pages/about/about.html
index bcab19c6b..98a0e25cb 100644
--- a/src/core/features/settings/pages/about/about.html
+++ b/src/core/features/settings/pages/about/about.html
@@ -27,7 +27,7 @@
             <ion-icon name="fas-universal-access" slot="start" aria-hidden="true"></ion-icon>
             <ion-label>{{ 'core.settings.accessstatement' | translate }}</ion-label>
         </ion-item>
-        <ion-item *ngIf="feedbackFormUrl" class="ion-text-wrap" button core-link [href]="feedbackFormUrl" detail="true"
+        <ion-item *ngIf="currentSite && feedbackFormUrl" class="ion-text-wrap" button core-link [href]="feedbackFormUrl" detail="true"
             detailIcon="open-outline">
             <ion-icon name="fas-bullhorn" slot="start" aria-hidden="true"></ion-icon>
             <ion-label>{{ 'core.settings.helpusimprove' | translate }}</ion-label>
diff --git a/src/core/features/settings/pages/about/about.ts b/src/core/features/settings/pages/about/about.ts
index 256cf5fe6..3d64b1605 100644
--- a/src/core/features/settings/pages/about/about.ts
+++ b/src/core/features/settings/pages/about/about.ts
@@ -17,6 +17,7 @@ import { Component } from '@angular/core';
 import { CoreConstants } from '@/core/constants';
 import { CoreSites } from '@services/sites';
 import { CoreNavigator } from '@services/navigator';
+import { CoreSite } from '@classes/site';
 
 /**
  * App settings about menu page.
@@ -33,16 +34,17 @@ export class CoreSettingsAboutPage {
     privacyPolicy: string;
     feedbackFormUrl = CoreConstants.CONFIG.feedbackFormUrl ?? 'https://feedback.moodle.org/mobileapp';
     a11yStatement = CoreConstants.CONFIG.a11yStatement ?? 'https://apps.moodle.com/admin/tool/policy/view.php?versionid=5';
+    currentSite?: CoreSite;
 
     constructor() {
-        const currentSite = CoreSites.getCurrentSite();
+        this.currentSite = CoreSites.getCurrentSite();
 
         this.appName = CoreConstants.CONFIG.appname;
         this.versionName = CoreConstants.CONFIG.versionname;
 
         // Calculate the privacy policy to use.
-        this.privacyPolicy = (currentSite && (currentSite.getStoredConfig('tool_mobile_apppolicy') ||
-        currentSite.getStoredConfig('sitepolicy'))) || CoreConstants.CONFIG.privacypolicy;
+        this.privacyPolicy = (this.currentSite && (this.currentSite.getStoredConfig('tool_mobile_apppolicy') ||
+        this.currentSite.getStoredConfig('sitepolicy'))) || CoreConstants.CONFIG.privacypolicy;
     }
 
     /**

From 0a950061d709dcc27fea5082b06e7c2b99c7839f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 29 Mar 2022 10:24:16 +0200
Subject: [PATCH 0835/1008] MOBILE-3833 course: Remove duplicated side blocks
 button

---
 .../course/components/course-format/course-format.html |  2 +-
 .../components/core-course-format-single-activity.html |  3 ---
 .../format/singleactivity/components/singleactivity.ts | 10 +---------
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/core/features/course/components/course-format/course-format.html b/src/core/features/course/components/course-format/course-format.html
index 3afda6fd4..e796412d3 100644
--- a/src/core/features/course/components/course-format/course-format.html
+++ b/src/core/features/course/components/course-format/course-format.html
@@ -44,7 +44,7 @@
 </core-dynamic-component>
 
 
-<core-block-side-blocks-button slot="fixed" *ngIf="loaded && course && displayBlocks && hasBlocks" contextlevel="course"
+<core-block-side-blocks-button slot="fixed" *ngIf="loaded && course && displayBlocks && hasBlocks" contextLevel="course"
     [instanceId]="course.id">
 </core-block-side-blocks-button>
 
diff --git a/src/core/features/course/format/singleactivity/components/core-course-format-single-activity.html b/src/core/features/course/format/singleactivity/components/core-course-format-single-activity.html
index d5c1692c3..342f17c3e 100644
--- a/src/core/features/course/format/singleactivity/components/core-course-format-single-activity.html
+++ b/src/core/features/course/format/singleactivity/components/core-course-format-single-activity.html
@@ -1,6 +1,3 @@
 <div class="list-item-limited-width">
     <core-dynamic-component [component]="componentClass" [data]="data"></core-dynamic-component>
 </div>
-
-<core-block-side-blocks-button slot="fixed" *ngIf="course && hasBlocks" contextLevel="course" [instanceId]="course.id">
-</core-block-side-blocks-button>
diff --git a/src/core/features/course/format/singleactivity/components/singleactivity.ts b/src/core/features/course/format/singleactivity/components/singleactivity.ts
index 499d7f805..ac3be661c 100644
--- a/src/core/features/course/format/singleactivity/components/singleactivity.ts
+++ b/src/core/features/course/format/singleactivity/components/singleactivity.ts
@@ -20,7 +20,6 @@ import { CoreDynamicComponent } from '@components/dynamic-component/dynamic-comp
 import { CoreCourseAnyCourseData } from '@features/courses/services/courses';
 import { IonRefresher } from '@ionic/angular';
 import { CoreCourseModuleCompletionData, CoreCourseSection } from '@features/course/services/course-helper';
-import { CoreBlockHelper } from '@features/block/services/block-helper';
 import { CoreCourse } from '@features/course/services/course';
 
 /**
@@ -46,7 +45,6 @@ export class CoreCourseFormatSingleActivityComponent implements OnChanges {
 
     componentClass?: Type<unknown>; // The class of the component to render.
     data: Record<string | number, unknown> = {}; // Data to pass to the component.
-    hasBlocks = false;
 
     /**
      * @inheritdoc
@@ -60,8 +58,6 @@ export class CoreCourseFormatSingleActivityComponent implements OnChanges {
             return;
         }
 
-        this.hasBlocks = await CoreBlockHelper.hasCourseBlocks(this.course.id);
-
         // In single activity the module should only have 1 section and 1 module. Get the module.
         const module = this.sections?.[0].modules?.[0];
 
@@ -93,11 +89,7 @@ export class CoreCourseFormatSingleActivityComponent implements OnChanges {
 
         if (this.course) {
             const courseId = this.course.id;
-            await CoreCourse.invalidateCourseBlocks(courseId).then(async () => {
-                this.hasBlocks = await CoreBlockHelper.hasCourseBlocks(courseId);
-
-                return;
-            });
+            await CoreCourse.invalidateCourseBlocks(courseId);
         }
     }
 

From bbd0d5bb9b5fd50b41f716aa8354ceb94466863f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 29 Mar 2022 10:47:18 +0200
Subject: [PATCH 0836/1008] MOBILE-3833 module: Support empty module navigation

---
 .../components/module-navigation/module-navigation.scss   | 4 ++++
 .../components/module-navigation/module-navigation.ts     | 8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/core/features/course/components/module-navigation/module-navigation.scss b/src/core/features/course/components/module-navigation/module-navigation.scss
index 7ae45b850..4b4eb2a8c 100644
--- a/src/core/features/course/components/module-navigation/module-navigation.scss
+++ b/src/core/features/course/components/module-navigation/module-navigation.scss
@@ -21,6 +21,10 @@
         margin-top: var(--button-vertical-margin);
         margin-bottom: var(--button-vertical-margin);
     }
+
+    &.empty {
+        display: none;
+    }
 }
 
 :host-context(core-course-format.core-course-format-singleactivity) {
diff --git a/src/core/features/course/components/module-navigation/module-navigation.ts b/src/core/features/course/components/module-navigation/module-navigation.ts
index 4e436af4b..63211dbc2 100644
--- a/src/core/features/course/components/module-navigation/module-navigation.ts
+++ b/src/core/features/course/components/module-navigation/module-navigation.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, Input, OnDestroy, OnInit } from '@angular/core';
+import { Component, ElementRef, Input, OnDestroy, OnInit } from '@angular/core';
 import { CoreCourse, CoreCourseWSSection } from '@features/course/services/course';
 import { CoreCourseHelper, CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate';
@@ -44,11 +44,13 @@ export class CoreCourseModuleNavigationComponent implements OnInit, OnDestroy {
     nextModuleSection?: CoreCourseWSSection;
     previousModuleSection?: CoreCourseWSSection;
     loaded = false;
+    element: HTMLElement;
 
     protected completionObserver: CoreEventObserver;
 
-    constructor(protected ionContent: IonContent) {
+    constructor(protected ionContent: IonContent, element: ElementRef) {
         const siteId = CoreSites.getCurrentSiteId();
+        this.element = element.nativeElement;
 
         this.completionObserver = CoreEvents.on(CoreEvents.COMPLETION_MODULE_VIEWED, async (data) => {
             if (data && data.courseId == this.courseId) {
@@ -168,6 +170,8 @@ export class CoreCourseModuleNavigationComponent implements OnInit, OnDestroy {
                 }
             }
         }
+
+        this.element.classList.toggle('empty', !this.nextModule && !this.previousModule);
     }
 
     /**

From 88d479ccfdf92ff8cb50e459991ccefc347c866d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 29 Mar 2022 11:34:49 +0200
Subject: [PATCH 0837/1008] MOBILE-3833 style: Style checkboxes and radio on
 alerts

---
 src/theme/theme.base.scss | 52 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 48 insertions(+), 4 deletions(-)

diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 78a7bf894..dcc90ee4e 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -870,7 +870,8 @@ ion-action-sheet.md {
 
 // Radio.
 ion-radio,
-input[type=radio] {
+input[type=radio],
+.select-alert.ios .alert-radio-icon {
     --color: var(--text-color);
     --color-checked: var(--color);
     --border-radius: 50%;
@@ -882,7 +883,8 @@ input[type=radio] {
 }
 
 .ios ion-radio,
-.ios input[type=radio] {
+.ios input[type=radio],
+.select-alert.ios .alert-radio-icon {
     --border-width: 1px;
     --outer-border-width: 1px;
 }
@@ -911,8 +913,8 @@ input[type=radio] {
 
     &.radio-checked {
         &::part(container) {
-            border-color: var(--color-checked);
-            background: var(--color-checked);
+            border-color: var(--color);
+            background: var(--color);
         }
 
         &::part(mark) {
@@ -921,6 +923,44 @@ input[type=radio] {
     }
 }
 
+.select-alert.ios {
+    .alert-radio-icon {
+        height: var(--size);
+        width: var(--size);
+        min-width: var(--size);
+        border-radius: var(--border-radius);
+        border-width: var(--outer-border-width);
+        border-style: var(--border-style);
+        border-color: var(--color);
+        @include margin(10px, 8px, 10px, 8px);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+
+        .alert-radio-inner {
+            top: auto;
+            left: auto;
+            position: static;
+            border-radius: var(--inner-border-radius);
+            width: calc(50% + var(--outer-border-width));
+            height: calc(50% + var(--outer-border-width));
+            transform: scale3d(0, 0, 0);
+            transition: transform 280ms cubic-bezier(.4, 0, .2, 1);
+            background: var(--contrast-background);
+            border: 0 !important;
+        }
+    }
+
+    button[aria-checked=true] .alert-radio-icon {
+        border-color: var(--color-checked);
+        background: var(--color-checked);
+
+        .alert-radio-inner {
+            transform: scale3d(1, 1, 1);
+        }
+    }
+}
+
 // Checkbox.
 ion-checkbox,
 input[type=checkbox] {
@@ -938,6 +978,10 @@ input[type=checkbox] {
     --outer-border-width: 1px;
 }
 
+.select-alert.ios .alert-checkbox-icon {
+    border-radius: 2px;
+}
+
 // Select.
 ion-select::part(text) {
     white-space: normal;

From ddab1fc3d7334cb44e0b1dce75534f7f254141ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 29 Mar 2022 12:17:04 +0200
Subject: [PATCH 0838/1008] MOBILE-3833 style: Normalize text size

---
 src/theme/components/format-text.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/theme/components/format-text.scss b/src/theme/components/format-text.scss
index a242fe175..808d38dbc 100644
--- a/src/theme/components/format-text.scss
+++ b/src/theme/components/format-text.scss
@@ -208,6 +208,11 @@ core-format-text,
 core-rich-text-editor .core-rte-editor {
     @include core-headings();
 
+    p, ul, ol, li {
+        // Normalize font-size inside formatted text.
+        font-size: 14px;
+    }
+
     p {
         margin-bottom: 1rem;
         margin-block-start: 0;

From b25d5d5fca5e7290831be08967251b1cc2ec1425 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 29 Mar 2022 12:33:28 +0200
Subject: [PATCH 0839/1008] MOBILE-3833 chore: Add issue related to a
 deprecation

---
 src/core/pipes/to-locale-string.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/core/pipes/to-locale-string.ts b/src/core/pipes/to-locale-string.ts
index 5783fea6c..908bc84f7 100644
--- a/src/core/pipes/to-locale-string.ts
+++ b/src/core/pipes/to-locale-string.ts
@@ -21,7 +21,8 @@ import { CoreLogger } from '@singletons/logger';
  * Filter to format a timestamp to a locale string. Timestamp can be in seconds or milliseconds.
  *
  * @deprecated since 3.6. Use coreFormatDate instead.
- * This pipe wasn't removed in app 4.0 because some site plugins still used it. It will be removed in future versions.
+ * This pipe wasn't removed in app 4.0 because some site plugins still used it. It will be removed in future versions
+ * (see MOBILE-2823).
  */
 @Pipe({
     name: 'coreToLocaleString',

From e750ef2c6e532bdc31452ecd32ea73e6cda26a3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 29 Mar 2022 13:04:19 +0200
Subject: [PATCH 0840/1008] MOBILE-3833 collapsible: Fix disabled collapsible
 header on error

---
 src/core/directives/collapsible-header.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts
index fb15f6445..1cb15b1d6 100644
--- a/src/core/directives/collapsible-header.ts
+++ b/src/core/directives/collapsible-header.ts
@@ -208,7 +208,11 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
         this.expandedHeader = this.page?.querySelector('ion-item[collapsible]') ?? undefined;
 
         if (!this.expandedHeader) {
+            this.enabled = false;
+            this.setEnabled(this.enabled);
+
             throw new Error('[collapsible-header] Couldn\'t initialize expanded header');
+
         }
         this.expandedHeader.classList.add('collapsible-header-expanded');
 
@@ -384,11 +388,11 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
      * @param enable True to enable, false otherwise
      */
     async setEnabled(enable: boolean): Promise<void> {
-        if (!this.page || !this.content) {
+        if (!this.page) {
             return;
         }
 
-        if (enable) {
+        if (enable && this.content) {
             const contentScroll = await this.content.getScrollElement();
 
             // Do nothing, since scroll has already started on the page.

From 0051bb29d592467bf5d5d1be03af22208fdfa4ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 29 Mar 2022 14:31:52 +0200
Subject: [PATCH 0841/1008] MOBILE-3833 style: Improve module info and files
 boxes

---
 .../index/addon-mod-assign-index.html         |  4 +-
 .../index/addon-mod-folder-index.html         |  2 +-
 .../mod/folder/components/index/index.ts      | 25 +++++++
 .../privatefiles/pages/index/index.html       |  6 +-
 src/core/components/file/core-file.html       | 49 +++++++------
 .../local-file/core-local-file.html           | 73 ++++++++++---------
 src/core/components/local-file/local-file.ts  | 26 ++++---
 .../module-info/core-course-module-info.html  | 28 +++----
 .../module-info/course-module-info.scss       | 47 ++++++++----
 .../sharedfiles/components/list/list.html     |  6 +-
 src/theme/theme.base.scss                     | 27 ++++++-
 11 files changed, 187 insertions(+), 106 deletions(-)

diff --git a/src/addons/mod/assign/components/index/addon-mod-assign-index.html b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
index 2b39744af..5aa7a97af 100644
--- a/src/addons/mod/assign/components/index/addon-mod-assign-index.html
+++ b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
@@ -11,10 +11,10 @@
     <!-- Activity info. -->
     <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
         [courseId]="courseId" [hasDataToSync]="hasOffline" (completionChanged)="onCompletionChange()">
-        <ion-list inset="true" description *ngIf="assign && assign.introattachments?.length && !assign.submissionattachments">
+        <div description *ngIf="assign && assign.introattachments?.length && !assign.submissionattachments">
             <core-file *ngFor="let file of assign.introattachments" [file]="file" [component]="component" [componentId]="componentId">
             </core-file>
-        </ion-list>
+        </div>
     </core-course-module-info>
 
     <!-- User can view all submissions (teacher). -->
diff --git a/src/addons/mod/folder/components/index/addon-mod-folder-index.html b/src/addons/mod/folder/components/index/addon-mod-folder-index.html
index eea0df71e..3a121644d 100644
--- a/src/addons/mod/folder/components/index/addon-mod-folder-index.html
+++ b/src/addons/mod/folder/components/index/addon-mod-folder-index.html
@@ -15,7 +15,7 @@
 
     <ion-list *ngIf="contents && (contents.files.length + contents.folders.length > 0)">
         <ng-container *ngFor="let folder of contents.folders">
-            <ion-item class="item-file" (click)="openFolder(folder)" detail="true" button>
+            <ion-item class="ion-text-wrap item-file item-directory" (click)="openFolder(folder)" detail="true" button>
                 <ion-icon name="fas-folder" slot="start" [attr.aria-label]="'core.folder' | translate"></ion-icon>
                 <ion-label>
                     <p class="item-heading">{{folder.filename}}</p>
diff --git a/src/addons/mod/folder/components/index/index.ts b/src/addons/mod/folder/components/index/index.ts
index 8cd1f0504..e20e5cf7e 100644
--- a/src/addons/mod/folder/components/index/index.ts
+++ b/src/addons/mod/folder/components/index/index.ts
@@ -54,6 +54,7 @@ export class AddonModFolderIndexComponent extends CoreCourseModuleMainResourceCo
         if (this.subfolder) {
             this.description = this.folderInstance ? this.folderInstance.intro : this.module.description;
             this.contents = this.subfolder;
+            this.sortFilesAndFolders();
 
             this.showLoading = false;
 
@@ -88,6 +89,30 @@ export class AddonModFolderIndexComponent extends CoreCourseModuleMainResourceCo
 
         this.description = this.folderInstance ? this.folderInstance.intro : this.module.description;
         this.contents = AddonModFolderHelper.formatContents(contents);
+        this.sortFilesAndFolders();
+    }
+
+    /**
+     * Sort files and folders alphabetically.
+     */
+    protected sortFilesAndFolders(): void {
+        if (!this.contents) {
+            return;
+        }
+
+        this.contents.folders.sort((a, b) => {
+            const compareA = a.filename.toLowerCase();
+            const compareB = b.filename.toLowerCase();
+
+            return compareA.localeCompare(compareB);
+        });
+
+        this.contents.files.sort((a, b) => {
+            const compareA = a.filename.toLowerCase();
+            const compareB = b.filename.toLowerCase();
+
+            return compareA.localeCompare(compareB);
+        });
     }
 
     /**
diff --git a/src/addons/privatefiles/pages/index/index.html b/src/addons/privatefiles/pages/index/index.html
index ec245c9cd..3ad05578f 100644
--- a/src/addons/privatefiles/pages/index/index.html
+++ b/src/addons/privatefiles/pages/index/index.html
@@ -37,10 +37,8 @@
         <!-- List of files. -->
         <ion-list *ngIf="files && files.length > 0">
             <ng-container *ngFor="let file of files">
-                <ion-item button *ngIf="file.isdir" class="item-file" (click)="openFolder(file)" detail="true">
-                    <ion-thumbnail slot="start">
-                        <img [src]="file.imgPath" alt="" role="presentation">
-                    </ion-thumbnail>
+                <ion-item button *ngIf="file.isdir" class="ion-text-wrap item-file item-directory" (click)="openFolder(file)" detail="true">
+                    <ion-icon name="fas-folder" slot="start" [attr.aria-label]="'core.folder' | translate"></ion-icon>
                     <ion-label>{{file.filename}}</ion-label>
                 </ion-item>
                 <core-file *ngIf="!file.isdir" [file]="file" [component]="component" [componentId]="file.contextid"></core-file>
diff --git a/src/core/components/file/core-file.html b/src/core/components/file/core-file.html
index 396b05120..e6e2e729d 100644
--- a/src/core/components/file/core-file.html
+++ b/src/core/components/file/core-file.html
@@ -1,24 +1,29 @@
-<ion-item *ngIf="file" button class="ion-text-wrap item-file" (click)="download($event, true)" detail="false">
-    <ion-thumbnail slot="start">
-        <img [src]="fileIcon" alt="" role="presentation" />
-    </ion-thumbnail>
-    <ion-label>
-        <p class="item-heading">{{fileName}}</p>
-        <p *ngIf="fileSizeReadable">{{ fileSizeReadable }}</p>
-        <p *ngIf="showTime">{{ timemodified * 1000 | coreFormatDate }}</p>
-    </ion-label>
-    <div slot="end" class="flex-row">
-        <core-download-refresh [status]="state" [enabled]="canDownload" [loading]="isDownloading" [canTrustDownload]="!alwaysDownload"
-            (action)="download()">
-        </core-download-refresh>
+<ion-card class="card-file">
+    <ion-item *ngIf="file" button class="ion-text-wrap item-file" (click)="download($event, true)" detail="false">
+        <ion-thumbnail slot="start">
+            <img [src]="fileIcon" alt="" role="presentation" />
+        </ion-thumbnail>
+        <ion-label>
+            <p class="item-heading">{{fileName}}</p>
+            <p *ngIf="fileSizeReadable || showTime">
+                <ng-container *ngIf="fileSizeReadable">{{ fileSizeReadable }}</ng-container>
+                <ng-container *ngIf="fileSizeReadable && showTime"> · </ng-container>
+                <ng-container *ngIf="showTime">{{ timemodified * 1000 | coreFormatDate }}</ng-container>
+            </p>
+        </ion-label>
+        <div slot="end" class="flex-row">
+            <core-download-refresh [status]="state" [enabled]="canDownload" [loading]="isDownloading" [canTrustDownload]="!alwaysDownload"
+                (action)="download()">
+            </core-download-refresh>
 
-        <ion-button fill="clear" *ngIf="isDownloaded && isIOS" (click)="openFile($event, true)" [title]="openButtonLabel | translate">
-            <ion-icon slot="icon-only" [name]="openButtonIcon" aria-hidden="true"></ion-icon>
-        </ion-button>
+            <ion-button fill="clear" *ngIf="isDownloaded && isIOS" (click)="openFile($event, true)" [title]="openButtonLabel | translate">
+                <ion-icon slot="icon-only" [name]="openButtonIcon" aria-hidden="true"></ion-icon>
+            </ion-button>
 
-        <ion-button fill="clear" *ngIf="!isDownloading && canDelete" (click)="delete($event)" [attr.aria-label]="'core.delete' | translate"
-            color="danger">
-            <ion-icon slot="icon-only" name="fas-trash" aria-hidden="true"></ion-icon>
-        </ion-button>
-    </div>
-</ion-item>
+            <ion-button fill="clear" *ngIf="!isDownloading && canDelete" (click)="delete($event)"
+                [attr.aria-label]="'core.delete' | translate" color="danger">
+                <ion-icon slot="icon-only" name="fas-trash" aria-hidden="true"></ion-icon>
+            </ion-button>
+        </div>
+    </ion-item>
+</ion-card>
diff --git a/src/core/components/local-file/core-local-file.html b/src/core/components/local-file/core-local-file.html
index 7c5ede969..b723da5eb 100644
--- a/src/core/components/local-file/core-local-file.html
+++ b/src/core/components/local-file/core-local-file.html
@@ -1,41 +1,48 @@
 <form (ngSubmit)="changeName(newFileName, $event)" #nameForm>
-    <ion-item class="ion-text-wrap item-file" (click)="openFile($event)" button detail="false">
-        <ion-thumbnail slot="start">
-            <img [src]="fileIcon" [alt]="fileExtension" role="presentation" />
-        </ion-thumbnail>
+    <ion-card class="card-file">
+        <ion-item class="ion-text-wrap item-file" (click)="openFile($event)" button detail="false">
+            <ion-thumbnail slot="start">
+                <img [src]="fileIcon" [alt]="fileExtension" role="presentation" />
+            </ion-thumbnail>
 
-        <ion-label>
-            <!-- File name and edit button (if editable). -->
-            <p class="item-heading" *ngIf="!editMode">{{fileName}}</p>
-            <!-- More data about the file. -->
-            <p *ngIf="size && !editMode">{{ size }}</p>
-            <p *ngIf="timemodified && !editMode">{{ timemodified }}</p>
-        </ion-label>
+            <ion-label *ngIf="!editMode">
+                <!-- File name and edit button (if editable). -->
+                <p class="item-heading">{{fileName}}</p>
+                <!-- More data about the file. -->
+                <p *ngIf="size || timemodified">
+                    <ng-container *ngIf="size">{{ size }}</ng-container>
+                    <ng-container *ngIf="size && timemodified"> · </ng-container>
+                    <ng-container *ngIf="timemodified">{{ timemodified }}</ng-container>
+                </p>
+            </ion-label>
 
-        <!-- Form to edit the file's name. -->
-        <ion-input type="text" name="filename" [placeholder]="'core.filename' | translate" autocapitalize="none" autocorrect="off"
-            (click)="$event.stopPropagation()" core-auto-focus [(ngModel)]="newFileName" *ngIf="editMode">
-        </ion-input>
+            <!-- Form to edit the file's name. -->
+            <ion-input type="text" name="filename" [placeholder]="'core.filename' | translate" autocapitalize="none" autocorrect="off"
+                (click)="$event.stopPropagation()" core-auto-focus [(ngModel)]="newFileName" *ngIf="editMode">
+            </ion-input>
 
-        <div class="buttons" slot="end">
-            <ion-button fill="clear" *ngIf="isIOS" (click)="openFile($event, true)" [attr.aria-label]="openButtonLabel | translate">
-                <ion-icon slot="icon-only" [name]="openButtonIcon" aria-hidden="true"></ion-icon>
-            </ion-button>
-
-            <ng-container *ngIf="manage">
-                <ion-button *ngIf="!editMode" fill="clear" [core-suppress-events] (onClick)="activateEdit($event)"
-                    [attr.aria-label]="'core.edit' | translate">
-                    <ion-icon name="fas-pen" slot="icon-only" aria-hidden="true"></ion-icon>
+            <div class="buttons" slot="end">
+                <ion-button fill="clear" *ngIf="isIOS" (click)="openFile($event, true)" [attr.aria-label]="openButtonLabel | translate">
+                    <ion-icon slot="icon-only" [name]="openButtonIcon" aria-hidden="true"></ion-icon>
                 </ion-button>
 
-                <ion-button *ngIf="editMode" fill="clear" [attr.aria-label]="'core.save' | translate" color="success" type="submit">
-                    <ion-icon name="fas-check" slot="icon-only" aria-hidden="true"></ion-icon>
-                </ion-button>
+                <ng-container *ngIf="manage">
+                    <ion-button *ngIf="editMode" fill="clear" [attr.aria-label]="'core.save' | translate" color="success" type="submit"
+                        (click)="changeName(newFileName, $event)">
+                        <ion-icon name="fas-check" slot="icon-only" aria-hidden="true"></ion-icon>
+                    </ion-button>
 
-                <ion-button fill="clear" (click)="deleteFile($event)" [attr.aria-label]="'core.delete' | translate" color="danger">
-                    <ion-icon name="fas-trash" slot="icon-only" aria-hidden="true"></ion-icon>
-                </ion-button>
-            </ng-container>
-        </div>
-    </ion-item>
+                    <ion-button *ngIf="!editMode" fill="clear" [core-suppress-events] (onClick)="activateEdit($event)"
+                        [attr.aria-label]="'core.edit' | translate">
+                        <ion-icon name="fas-pen" slot="icon-only" aria-hidden="true"></ion-icon>
+                    </ion-button>
+
+                    <ion-button *ngIf="!editMode" fill="clear" (click)="deleteFile($event)" [attr.aria-label]="'core.delete' | translate"
+                        color="danger">
+                        <ion-icon name="fas-trash" slot="icon-only" aria-hidden="true"></ion-icon>
+                    </ion-button>
+                </ng-container>
+            </div>
+        </ion-item>
+    </ion-card>
 </form>
diff --git a/src/core/components/local-file/local-file.ts b/src/core/components/local-file/local-file.ts
index 3ae64c44c..568b657df 100644
--- a/src/core/components/local-file/local-file.ts
+++ b/src/core/components/local-file/local-file.ts
@@ -56,7 +56,7 @@ export class CoreLocalFileComponent implements OnInit {
     timemodified?: string;
     newFileName = '';
     editMode = false;
-    relativePath?: string;
+    relativePath = '';
     isIOS = false;
     openButtonIcon = '';
     openButtonLabel = '';
@@ -112,7 +112,7 @@ export class CoreLocalFileComponent implements OnInit {
      * @param isOpenButton Whether the open button was clicked.
      */
     async openFile(e: Event, isOpenButton = false): Promise<void> {
-        if (this.editMode) {
+        if (this.editMode || !this.file) {
             return;
         }
 
@@ -125,7 +125,7 @@ export class CoreLocalFileComponent implements OnInit {
             return;
         }
 
-        if (!CoreFileHelper.isOpenableInApp(this.file!)) {
+        if (!CoreFileHelper.isOpenableInApp(this.file)) {
             try {
                 await CoreFileHelper.showConfirmOpenUnsupportedFile();
             } catch (error) {
@@ -139,7 +139,7 @@ export class CoreLocalFileComponent implements OnInit {
             options.iOSOpenFileAction = this.defaultIsOpenWithPicker ? OpenFileAction.OPEN : OpenFileAction.OPEN_WITH;
         }
 
-        CoreUtils.openFile(this.file!.toURL(), options);
+        CoreUtils.openFile(this.file.toURL(), options);
     }
 
     /**
@@ -148,11 +148,15 @@ export class CoreLocalFileComponent implements OnInit {
      * @param e Click event.
      */
     activateEdit(e: Event): void {
+        if (!this.file) {
+            return;
+        }
+
         e.preventDefault();
         e.stopPropagation();
 
         this.editMode = true;
-        this.newFileName = this.file!.name;
+        this.newFileName = this.file.name;
     }
 
     /**
@@ -162,10 +166,14 @@ export class CoreLocalFileComponent implements OnInit {
      * @param e Click event.
      */
     async changeName(newName: string, e: Event): Promise<void> {
+        if (!this.file) {
+            return;
+        }
+
         e.preventDefault();
         e.stopPropagation();
 
-        if (newName == this.file!.name) {
+        if (newName == this.file.name) {
             // Name hasn't changed, stop.
             this.editMode = false;
             CoreForms.triggerFormCancelledEvent(this.formElement, CoreSites.getCurrentSiteId());
@@ -174,7 +182,7 @@ export class CoreLocalFileComponent implements OnInit {
         }
 
         const modal = await CoreDomUtils.showModalLoading();
-        const fileAndDir = CoreFile.getFileAndDirectoryFromPath(this.relativePath!);
+        const fileAndDir = CoreFile.getFileAndDirectoryFromPath(this.relativePath);
         const newPath = CoreText.concatenatePaths(fileAndDir.directory, newName);
 
         try {
@@ -186,7 +194,7 @@ export class CoreLocalFileComponent implements OnInit {
         } catch {
             try {
                 // File doesn't exist, move it.
-                const fileEntry = await CoreFile.moveFile(this.relativePath!, newPath);
+                const fileEntry = await CoreFile.moveFile(this.relativePath, newPath);
 
                 CoreForms.triggerFormSubmittedEvent(this.formElement, false, CoreSites.getCurrentSiteId());
 
@@ -219,7 +227,7 @@ export class CoreLocalFileComponent implements OnInit {
 
             modal = await CoreDomUtils.showModalLoading('core.deleting', true);
 
-            await CoreFile.removeFile(this.relativePath!);
+            await CoreFile.removeFile(this.relativePath);
 
             this.onDelete.emit();
         } catch (error) {
diff --git a/src/core/features/course/components/module-info/core-course-module-info.html b/src/core/features/course/components/module-info/core-course-module-info.html
index 2ff034ce9..62ccf0e34 100644
--- a/src/core/features/course/components/module-info/core-course-module-info.html
+++ b/src/core/features/course/components/module-info/core-course-module-info.html
@@ -14,43 +14,39 @@
     </ion-label>
 </ion-item>
 
-<!-- Module completion. -->
-<ion-item class="ion-text-wrap"
-    *ngIf="showCompletion && module.completiondata && (module.completiondata.isautomatic || (showManualCompletion && module.uservisible))">
-    <ion-label>
+<div class="core-module-info-box">
+    <!-- Module completion. -->
+    <div class="core-module-info-completion core-module-info-box-section" *ngIf="showCompletion &&
+            module.completiondata && (module.completiondata.isautomatic || (showManualCompletion && module.uservisible))">
         <core-course-module-completion [completion]="module.completiondata" [moduleName]="module.name" [moduleId]="module.id"
             [showCompletionConditions]="true" [showManualCompletion]="showManualCompletion && module.uservisible"
             (completionChanged)="completionChanged.emit($event)">
         </core-course-module-completion>
-    </ion-label>
-</ion-item>
+    </div>
 
-<div class="core-module-dates-availabilityinfo"
-    *ngIf="(module.dates && module.dates.length) || (showAvailabilityInfo && module.availabilityinfo)">
     <!-- Activity dates. -->
-    <div *ngIf="module.dates && module.dates.length" class="core-module-dates">
+    <div *ngIf="module.dates && module.dates.length" class="core-module-dates core-module-info-box-section">
         <p *ngFor="let date of module.dates">
             <ion-icon name="fas-calendar" aria-hidden="true"></ion-icon><strong>{{ date.label }}</strong> {{ date.timestamp
             *
             1000 | coreFormatDate:'strftimedatetime' }}
         </p>
     </div>
+
     <!-- Availability info space. -->
-    <div class="core-module-availabilityinfo" *ngIf="showAvailabilityInfo">
+    <div class="core-module-availabilityinfo core-module-info-box-section" *ngIf="showAvailabilityInfo">
         <ion-icon name="fas-lock" [attr.aria-label]="'core.restricted' | translate"></ion-icon>
         <core-format-text [text]="module.availabilityinfo" contextLevel="module" [contextInstanceId]="module.id" [courseId]="module.course">
         </core-format-text>
     </div>
-</div>
 
-<ion-item class="ion-text-wrap" *ngIf="description">
-    <ion-label>
+    <div class="core-module-info-description core-module-info-box-section" *ngIf="description">
         <core-format-text [text]="description" [component]="component" [componentId]="componentId" contextLevel="module"
             [contextInstanceId]="module.id" [courseId]="courseId" [collapsible-item]="expandDescription ? null : ''">
         </core-format-text>
-    </ion-label>
-</ion-item>
-<ng-content select="[description]"></ng-content>
+    </div>
+    <ng-content select="[description]"></ng-content>
+</div>
 
 <ng-content></ng-content>
 
diff --git a/src/core/features/course/components/module-info/course-module-info.scss b/src/core/features/course/components/module-info/course-module-info.scss
index 6091e0b2f..8b6c8feb0 100644
--- a/src/core/features/course/components/module-info/course-module-info.scss
+++ b/src/core/features/course/components/module-info/course-module-info.scss
@@ -23,27 +23,46 @@
 
     }
 
-    .core-module-dates-availabilityinfo {
+    .core-module-info-box {
         background: var(--light);
         border-radius: var(--small-radius);
-        padding: 8px;
         margin: 8px;
-        font-size: 90%;
-        ion-icon {
-            position: static;
-            @include margin-horizontal(null, 8px);
+        padding: 8px;
+
+        ::ng-deep ion-item {
+            --ion-item-background: var(--light);
+            --background: var(--light);
         }
 
-        p,
-        ul {
-            margin-top: 4px;
-            margin-bottom: 4px;
+        ::ng-deep ion-card.card-file {
+            --ion-card-horizontal-margin: 0px;
         }
-    }
 
-    .core-module-dates + .core-module-availabilityinfo {
-        border-top: 1px solid var(--stroke);
-        padding-top: 8px;
+        .core-module-info-box-section + .core-module-info-box-section {
+            border-top: 1px solid var(--stroke);
+            margin-top: 8px;
+            padding-top: 8px;
+        }
+
+        .core-module-dates ion-icon {
+            margin-left: 4px;
+            margin-right: 4px;
+        }
+
+        .core-module-dates,
+        .core-module-availabilityinfo {
+            font-size: 90%;
+            ion-icon {
+                position: static;
+                @include margin-horizontal(null, 8px);
+            }
+
+            p,
+            ul {
+                margin-top: 4px;
+                margin-bottom: 4px;
+            }
+        }
     }
 
     core-course-module-completion ::ng-deep ion-button {
diff --git a/src/core/features/sharedfiles/components/list/list.html b/src/core/features/sharedfiles/components/list/list.html
index e3ae1898e..96174712a 100644
--- a/src/core/features/sharedfiles/components/list/list.html
+++ b/src/core/features/sharedfiles/components/list/list.html
@@ -13,10 +13,8 @@
                 (onDelete)="fileDeleted(idx)" (onRename)="fileRenamed(idx, $event)">
             </core-local-file>
 
-            <ion-item button *ngIf="!file.isFile" class="ion-text-wrap item-file" (click)="openFolder(file)" detail="true">
-                <ion-thumbnail slot="start" aria-hidden="true">
-                    <img src="assets/img/files/folder-64.png" alt="">
-                </ion-thumbnail>
+            <ion-item button *ngIf="!file.isFile" class="ion-text-wrap item-file item-directory" (click)="openFolder(file)" detail="true">
+                <ion-icon name="fas-folder" slot="start" [attr.aria-label]="'core.folder' | translate"></ion-icon>
                 <ion-label>{{ file.name }}</ion-label>
             </ion-item>
         </ng-container>
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index dcc90ee4e..681843dd4 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -706,10 +706,35 @@ body.core-iframe-fullscreen ion-router-outlet {
 
 .item.item-file {
     ion-thumbnail {
-        --size: 32px;
+        --size: 24px;
         width: var(--size);
         height: var(--size);
     }
+
+    p.item-heading {
+        font-size: 14px;
+    }
+
+    p {
+        font-size: 12px;
+    }
+
+    ion-label {
+        margin-top: 8px;
+        margin-bottom: 8px;
+    }
+
+    ion-button {
+        --a11y-min-target-size: 40px;
+    }
+
+    &.item-directory ion-icon {
+        @include margin-horizontal(0px, 16px);
+    }
+
+    [slot=end] {
+        @include margin-horizontal(16px, null);
+    }
 }
 
 .item-dimmed {

From b129d3777bea1173aab93cb59ad64b1907bf5226 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 29 Mar 2022 15:28:31 +0200
Subject: [PATCH 0842/1008] MOBILE-3833 style: Dynamic collapsible item
 background

---
 src/core/directives/collapsible-item.ts | 38 ++++++++++++++++++++++++-
 src/core/singletons/colors.ts           | 38 +++++++++++++++++--------
 2 files changed, 63 insertions(+), 13 deletions(-)

diff --git a/src/core/directives/collapsible-item.ts b/src/core/directives/collapsible-item.ts
index 5084f128a..3bac8a97c 100644
--- a/src/core/directives/collapsible-item.ts
+++ b/src/core/directives/collapsible-item.ts
@@ -15,11 +15,14 @@
 import { Directive, ElementRef, Input, OnDestroy, OnInit } from '@angular/core';
 import { CoreCancellablePromise } from '@classes/cancellable-promise';
 import { CoreLoadingComponent } from '@components/loading/loading';
+import { CoreSettingsHelper } from '@features/settings/services/settings-helper';
 import { CoreUtils } from '@services/utils/utils';
 import { Translate } from '@singletons';
+import { CoreColors } from '@singletons/colors';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
 import { CoreDom } from '@singletons/dom';
 import { CoreEventObserver } from '@singletons/events';
+import { Subscription } from 'rxjs';
 import { CoreFormatTextDirective } from './format-text';
 
 const defaultMaxHeight = 80;
@@ -50,6 +53,7 @@ export class CoreCollapsibleItemDirective implements OnInit, OnDestroy {
     protected maxHeight = defaultMaxHeight;
     protected expandedHeight = 0;
     protected resizeListener?: CoreEventObserver;
+    protected darkModeListener?: Subscription;
     protected domPromise?: CoreCancellablePromise<void>;
     protected uniqueId: string;
 
@@ -92,6 +96,10 @@ export class CoreCollapsibleItemDirective implements OnInit, OnDestroy {
         this.resizeListener = CoreDom.onWindowResize(() => {
             this.calculateHeight();
         }, 50);
+
+        this.darkModeListener = CoreSettingsHelper.onDarkModeChange().subscribe(() => {
+            this.setGradientColor();
+        });
     }
 
     /**
@@ -135,7 +143,34 @@ export class CoreCollapsibleItemDirective implements OnInit, OnDestroy {
         this.element.classList.remove('collapsible-loading-height');
 
         // If cannot calculate height, shorten always.
-        this.setExpandButtonEnabled(!this.expandedHeight || this.expandedHeight >= this.maxHeight);
+        const enable = !this.expandedHeight || this.expandedHeight >= this.maxHeight;
+        this.setExpandButtonEnabled(enable);
+        this.setGradientColor();
+
+    }
+
+    /**
+     * Sets the gradient color based on the background.
+     */
+    protected setGradientColor(): void {
+        if (!this.toggleExpandEnabled) {
+            return;
+        }
+
+        let coloredElement: HTMLElement | null = this.element;
+        let backgroundColor = [0, 0, 0, 0];
+        let background = '';
+        while (coloredElement && backgroundColor[3] === 0) {
+            background = getComputedStyle(coloredElement).backgroundColor;
+            backgroundColor = CoreColors.getColorRGBA(background);
+            coloredElement = coloredElement.parentElement;
+        }
+
+        if (backgroundColor[3] !== 0) {
+            delete(backgroundColor[3]);
+            const bgList = backgroundColor.join(',');
+            this.element.style.setProperty('--background-gradient-rgb', `${bgList}`);
+        }
     }
 
     /**
@@ -241,6 +276,7 @@ export class CoreCollapsibleItemDirective implements OnInit, OnDestroy {
      */
     ngOnDestroy(): void {
         this.resizeListener?.off();
+        this.darkModeListener?.unsubscribe();
         this.domPromise?.cancel();
     }
 
diff --git a/src/core/singletons/colors.ts b/src/core/singletons/colors.ts
index d0e0e3dfa..ed70b8bdf 100644
--- a/src/core/singletons/colors.ts
+++ b/src/core/singletons/colors.ts
@@ -90,30 +90,44 @@ export class CoreColors {
      * Returns the hex code from any color css type (ie named).
      *
      * @param color Color in any format.
-     * @returns Color in hex format.
+     * @return Color in hex format.
      */
     static getColorHex(color: string): string {
-        const d = document.createElement('div');
-        d.style.color = color;
-        document.body.appendChild(d);
-
-        // Color in RGB .
-        const matches = getComputedStyle(d).color.match(/\d+/g) || [];
-        if (matches.length == 0) {
+        const rgba = CoreColors.getColorRGBA(color, true);
+        if (rgba.length === 0) {
             return '';
         }
 
-        const rgba = matches.map((a) => parseInt(a, 10));
-
         const hex = [0,1,2].map(
             (idx) => this.componentToHex(rgba[idx]),
         ).join('');
 
-        document.body.removeChild(d);
-
         return '#' + hex;
     }
 
+    /**
+     * Returns RGBA color from any color format.
+     *
+     * @param color Color in any format.
+     * @param createElement Wether create a new element is needed to calculate value.
+     * @return Red, green, blue and alpha.
+     */
+    static getColorRGBA(color: string, createElement = false): number[] {
+        if (createElement) {
+            const d = document.createElement('span');
+            d.style.color = color;
+            document.body.appendChild(d);
+
+            // Color in RGB.
+            color = getComputedStyle(d).color;
+            document.body.removeChild(d);
+        }
+
+        const matches = color.match(/\d+/g) || [];
+
+        return matches.map((a, index) => index < 3 ? parseInt(a, 10) : parseFloat(a));
+    }
+
     /**
      * Gets the luma of a color.
      *

From 1c2da44b442f4e9a9511ae59d2966a493d383cf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 29 Mar 2022 16:17:40 +0200
Subject: [PATCH 0843/1008] MOBILE-3833 files: Reduce size of filetype assets

---
 src/assets/img/files/archive-64.png     | Bin 3914 -> 0 bytes
 src/assets/img/files/archive.png        | Bin 0 -> 1257 bytes
 src/assets/img/files/audio-64.png       | Bin 4609 -> 0 bytes
 src/assets/img/files/audio.png          | Bin 0 -> 1388 bytes
 src/assets/img/files/avi-64.png         | Bin 4698 -> 0 bytes
 src/assets/img/files/avi.png            | Bin 0 -> 1370 bytes
 src/assets/img/files/base-64.png        | Bin 4069 -> 0 bytes
 src/assets/img/files/base.png           | Bin 0 -> 1261 bytes
 src/assets/img/files/bmp-64.png         | Bin 4270 -> 0 bytes
 src/assets/img/files/bmp.png            | Bin 0 -> 1322 bytes
 src/assets/img/files/calc-64.png        | Bin 3438 -> 0 bytes
 src/assets/img/files/calc.png           | Bin 0 -> 1200 bytes
 src/assets/img/files/chart-64.png       | Bin 3359 -> 0 bytes
 src/assets/img/files/chart.png          | Bin 0 -> 1145 bytes
 src/assets/img/files/database-64.png    | Bin 4949 -> 0 bytes
 src/assets/img/files/database.png       | Bin 0 -> 1416 bytes
 src/assets/img/files/document-64.png    | Bin 4876 -> 0 bytes
 src/assets/img/files/document.png       | Bin 0 -> 1409 bytes
 src/assets/img/files/draw-64.png        | Bin 3441 -> 0 bytes
 src/assets/img/files/draw.png           | Bin 0 -> 1097 bytes
 src/assets/img/files/eps-64.png         | Bin 3679 -> 0 bytes
 src/assets/img/files/eps.png            | Bin 0 -> 1242 bytes
 src/assets/img/files/epub-64.png        | Bin 3839 -> 0 bytes
 src/assets/img/files/epub.png           | Bin 0 -> 1344 bytes
 src/assets/img/files/flash-64.png       | Bin 3752 -> 0 bytes
 src/assets/img/files/flash.png          | Bin 0 -> 1264 bytes
 src/assets/img/files/folder-64.png      | Bin 1102 -> 0 bytes
 src/assets/img/files/folder-open-64.png | Bin 1255 -> 0 bytes
 src/assets/img/files/folder-open.png    | Bin 0 -> 539 bytes
 src/assets/img/files/folder.png         | Bin 0 -> 543 bytes
 src/assets/img/files/gif-64.png         | Bin 4540 -> 0 bytes
 src/assets/img/files/gif.png            | Bin 0 -> 1473 bytes
 src/assets/img/files/h5p-64.png         | Bin 2837 -> 0 bytes
 src/assets/img/files/h5p.png            | Bin 0 -> 1246 bytes
 src/assets/img/files/html-64.png        | Bin 2150 -> 0 bytes
 src/assets/img/files/html.png           | Bin 0 -> 888 bytes
 src/assets/img/files/image-64.png       | Bin 5800 -> 0 bytes
 src/assets/img/files/image.png          | Bin 0 -> 1222 bytes
 src/assets/img/files/impress-64.png     | Bin 3321 -> 0 bytes
 src/assets/img/files/impress.png        | Bin 0 -> 1157 bytes
 src/assets/img/files/isf-64.png         | Bin 3509 -> 0 bytes
 src/assets/img/files/isf.png            | Bin 0 -> 1213 bytes
 src/assets/img/files/jpeg-64.png        | Bin 4459 -> 0 bytes
 src/assets/img/files/jpeg.png           | Bin 0 -> 1336 bytes
 src/assets/img/files/markup-64.png      | Bin 4171 -> 0 bytes
 src/assets/img/files/markup.png         | Bin 0 -> 1296 bytes
 src/assets/img/files/math-64.png        | Bin 3170 -> 0 bytes
 src/assets/img/files/math.png           | Bin 0 -> 1094 bytes
 src/assets/img/files/moodle-64.png      | Bin 3578 -> 0 bytes
 src/assets/img/files/moodle.png         | Bin 0 -> 1212 bytes
 src/assets/img/files/mp3-64.png         | Bin 4301 -> 0 bytes
 src/assets/img/files/mp3.png            | Bin 0 -> 1369 bytes
 src/assets/img/files/mpeg-64.png        | Bin 5308 -> 0 bytes
 src/assets/img/files/mpeg.png           | Bin 0 -> 1467 bytes
 src/assets/img/files/oth-64.png         | Bin 3724 -> 0 bytes
 src/assets/img/files/oth.png            | Bin 0 -> 1098 bytes
 src/assets/img/files/pdf-64.png         | Bin 4231 -> 0 bytes
 src/assets/img/files/pdf.png            | Bin 0 -> 1319 bytes
 src/assets/img/files/png-64.png         | Bin 4528 -> 0 bytes
 src/assets/img/files/png.png            | Bin 0 -> 1279 bytes
 src/assets/img/files/powerpoint-64.png  | Bin 4634 -> 0 bytes
 src/assets/img/files/powerpoint.png     | Bin 0 -> 1371 bytes
 src/assets/img/files/psd-64.png         | Bin 3944 -> 0 bytes
 src/assets/img/files/psd.png            | Bin 0 -> 1320 bytes
 src/assets/img/files/publisher-64.png   | Bin 4973 -> 0 bytes
 src/assets/img/files/publisher.png      | Bin 0 -> 1424 bytes
 src/assets/img/files/quicktime-64.png   | Bin 4664 -> 0 bytes
 src/assets/img/files/quicktime.png      | Bin 0 -> 1399 bytes
 src/assets/img/files/sourcecode-64.png  | Bin 4297 -> 0 bytes
 src/assets/img/files/sourcecode.png     | Bin 0 -> 1308 bytes
 src/assets/img/files/spreadsheet-64.png | Bin 5317 -> 0 bytes
 src/assets/img/files/spreadsheet.png    | Bin 0 -> 1444 bytes
 src/assets/img/files/text-64.png        | Bin 3692 -> 0 bytes
 src/assets/img/files/text.png           | Bin 0 -> 1117 bytes
 src/assets/img/files/tiff-64.png        | Bin 4684 -> 0 bytes
 src/assets/img/files/tiff.png           | Bin 0 -> 1404 bytes
 src/assets/img/files/unknown-64.png     | Bin 2150 -> 0 bytes
 src/assets/img/files/unknown.png        | Bin 0 -> 888 bytes
 src/assets/img/files/video-64.png       | Bin 4211 -> 0 bytes
 src/assets/img/files/video.png          | Bin 0 -> 1261 bytes
 src/assets/img/files/wav-64.png         | Bin 5410 -> 0 bytes
 src/assets/img/files/wav.png            | Bin 0 -> 1417 bytes
 src/assets/img/files/wmv-64.png         | Bin 4211 -> 0 bytes
 src/assets/img/files/wmv.png            | Bin 0 -> 1261 bytes
 src/assets/img/files/writer-64.png      | Bin 2836 -> 0 bytes
 src/assets/img/files/writer.png         | Bin 0 -> 1113 bytes
 src/core/services/utils/mimetype.ts     |   4 ++--
 87 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 src/assets/img/files/archive-64.png
 create mode 100644 src/assets/img/files/archive.png
 delete mode 100644 src/assets/img/files/audio-64.png
 create mode 100644 src/assets/img/files/audio.png
 delete mode 100644 src/assets/img/files/avi-64.png
 create mode 100644 src/assets/img/files/avi.png
 delete mode 100644 src/assets/img/files/base-64.png
 create mode 100644 src/assets/img/files/base.png
 delete mode 100644 src/assets/img/files/bmp-64.png
 create mode 100644 src/assets/img/files/bmp.png
 delete mode 100644 src/assets/img/files/calc-64.png
 create mode 100644 src/assets/img/files/calc.png
 delete mode 100644 src/assets/img/files/chart-64.png
 create mode 100644 src/assets/img/files/chart.png
 delete mode 100644 src/assets/img/files/database-64.png
 create mode 100644 src/assets/img/files/database.png
 delete mode 100644 src/assets/img/files/document-64.png
 create mode 100644 src/assets/img/files/document.png
 delete mode 100644 src/assets/img/files/draw-64.png
 create mode 100644 src/assets/img/files/draw.png
 delete mode 100644 src/assets/img/files/eps-64.png
 create mode 100644 src/assets/img/files/eps.png
 delete mode 100644 src/assets/img/files/epub-64.png
 create mode 100644 src/assets/img/files/epub.png
 delete mode 100644 src/assets/img/files/flash-64.png
 create mode 100644 src/assets/img/files/flash.png
 delete mode 100644 src/assets/img/files/folder-64.png
 delete mode 100644 src/assets/img/files/folder-open-64.png
 create mode 100644 src/assets/img/files/folder-open.png
 create mode 100644 src/assets/img/files/folder.png
 delete mode 100644 src/assets/img/files/gif-64.png
 create mode 100644 src/assets/img/files/gif.png
 delete mode 100644 src/assets/img/files/h5p-64.png
 create mode 100644 src/assets/img/files/h5p.png
 delete mode 100644 src/assets/img/files/html-64.png
 create mode 100644 src/assets/img/files/html.png
 delete mode 100644 src/assets/img/files/image-64.png
 create mode 100644 src/assets/img/files/image.png
 delete mode 100644 src/assets/img/files/impress-64.png
 create mode 100644 src/assets/img/files/impress.png
 delete mode 100644 src/assets/img/files/isf-64.png
 create mode 100644 src/assets/img/files/isf.png
 delete mode 100644 src/assets/img/files/jpeg-64.png
 create mode 100644 src/assets/img/files/jpeg.png
 delete mode 100644 src/assets/img/files/markup-64.png
 create mode 100644 src/assets/img/files/markup.png
 delete mode 100644 src/assets/img/files/math-64.png
 create mode 100644 src/assets/img/files/math.png
 delete mode 100644 src/assets/img/files/moodle-64.png
 create mode 100644 src/assets/img/files/moodle.png
 delete mode 100644 src/assets/img/files/mp3-64.png
 create mode 100644 src/assets/img/files/mp3.png
 delete mode 100644 src/assets/img/files/mpeg-64.png
 create mode 100644 src/assets/img/files/mpeg.png
 delete mode 100644 src/assets/img/files/oth-64.png
 create mode 100644 src/assets/img/files/oth.png
 delete mode 100644 src/assets/img/files/pdf-64.png
 create mode 100644 src/assets/img/files/pdf.png
 delete mode 100644 src/assets/img/files/png-64.png
 create mode 100644 src/assets/img/files/png.png
 delete mode 100644 src/assets/img/files/powerpoint-64.png
 create mode 100644 src/assets/img/files/powerpoint.png
 delete mode 100644 src/assets/img/files/psd-64.png
 create mode 100644 src/assets/img/files/psd.png
 delete mode 100644 src/assets/img/files/publisher-64.png
 create mode 100644 src/assets/img/files/publisher.png
 delete mode 100644 src/assets/img/files/quicktime-64.png
 create mode 100644 src/assets/img/files/quicktime.png
 delete mode 100644 src/assets/img/files/sourcecode-64.png
 create mode 100644 src/assets/img/files/sourcecode.png
 delete mode 100644 src/assets/img/files/spreadsheet-64.png
 create mode 100644 src/assets/img/files/spreadsheet.png
 delete mode 100644 src/assets/img/files/text-64.png
 create mode 100644 src/assets/img/files/text.png
 delete mode 100644 src/assets/img/files/tiff-64.png
 create mode 100644 src/assets/img/files/tiff.png
 delete mode 100644 src/assets/img/files/unknown-64.png
 create mode 100644 src/assets/img/files/unknown.png
 delete mode 100644 src/assets/img/files/video-64.png
 create mode 100644 src/assets/img/files/video.png
 delete mode 100644 src/assets/img/files/wav-64.png
 create mode 100644 src/assets/img/files/wav.png
 delete mode 100644 src/assets/img/files/wmv-64.png
 create mode 100644 src/assets/img/files/wmv.png
 delete mode 100644 src/assets/img/files/writer-64.png
 create mode 100644 src/assets/img/files/writer.png

diff --git a/src/assets/img/files/archive-64.png b/src/assets/img/files/archive-64.png
deleted file mode 100644
index ba7111a024e281a4b889c45b587d5021832cc2d7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3914
zcmV-Q54G@#P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000jWNkl<Zcmd6t
z1(4*rxwap<-84I}G_w?5rX;%?I9wHGW@ct)X66+9|7B(lGc)JVGS3cUgKd4^ow(Yi
zx;m}xJ{4M3c`Vs&m!4Ppq*wA7RVADh|GqI1)6>&z+rEvt*}2MlANscEJ>bCo?>s-d
zm=0E}s47+jQOyslLVnFErNJ^26EkLRuA%?_lYjc_$G-8AUw+)vpMZ$+yGiQ)YEfT9
z6d6J(D1fTo-CDUuRgHTcL{UVe(crxwdS5npxV-DW+wT2@X0t&ljdI{j1S?9Wg5-H2
zwU)|2l^L0%v_;vubvt82qm%3IGWP$?>bQl~$cF$>{p|$MoZo1r9DgH<%vbsrz*>1l
zqtX6gS8)ualF|6#EYshaVEV!|CNpH3gOZ9RlTO|W?KGu6SZ9HGs<$t3)x)l2^QJ9%
ztJt<hMNzNWw18JIfEq2z4mBtAu-zq4E%KD2h>?+jSCq@~hx-wrz5@U2G|g^njKL)^
zk)dtdOnv1H3*Vn6X(mKjL?V_X>%dz}A_aU#bybx`7AWn5s~>tL8`p2bPpW|~>`=SH
zy5IWGIe3)37uM^Q<Euvo_o-?Fmxx6KUjS7df$s3LUpq(p$MeLQQY+O-jD@V|I$!_{
zAW&aD#5{A9cSl_L;LCq&c)Gy5yi4l+)EE#eBi7oQD*smidL{?I`1SLoKV77f8LII>
z-qLCnrR08_Ln)Qv8Z$bB*{NLlpx+YS@Al!=b|v*g!xXh6EI=5ZrEiRr{%na_2KCAS
zX%6q8aa6>Eb*AhLvP-$^11`G+;EM+oKgGS^Tei*e*H_?wu|ze4p%wT{1tr3Np%I8y
z#f+y@q`NJ5zVBVwbV<MiO7|XMj3M0e2@5MRpZx|tf#LE1YLo~=T#7s@&=vTJ_61ry
zGY;J6PHY;zL|R_e!ww7J;IlR}E2Dk-^F^wOGFTbFA~}52c_xmcVxGd*Bc__;EN@S^
z!@Ul&d35t70uM?!#dp8^-6@jIENj-S;p3nFG>z}gvizeNDk)UU10*8ECITQb9T6fZ
z+laJg7+*fm+}0+0?{VM~gb%x__^V(2D&W%E^=nI~KYKJPA2Y~u!axphQPX*#<U}Z8
zXjb6d@;KACTW0s&?#Pz0?(n%KEk_rHS5<6k;dcywF}okH9auw=T4{?X?tAp}YA52=
z3v=@fMKu!1z!ooXA{d2sY&e@tGQF#{0)KD?eha3{oNO{7ZMB&_G7T1>3%m&Bp&G+m
z)=(<PU_6uKJ3IwR1W^mn6J7)JK>UwS`wMVscy!~2=gdsZVX}yJY|#wg3Fq)hHR4=4
z$?-MkSu5+2?<{a8T0m7%S63txR_|HQ)D7eC{bj1vDxyjOCk2!Ok)iU)h^gsml8F{3
zG87`II-uNV4AmGrv^n=1no1bHM~W+@LBN%l=bJTSP2TdFDL%dt$Oa7KtqD%99cN%X
zW_z}g>PQXIq5>|4CAHLAWva=_Q5r&V-d;@y$bh0~BG43cCS!P}ik3R}Db6lb+Q*ul
zzy2s&9=|<bWg-%QFY<vgpzKX&WsPX5l30tPU=85xtqep=ET3m#Z^C*RWruEL>{+|W
zVkL?rOewnQfTyr|>k#Q}7r}aiTmdIaX}C;v_XvY`8N-+^-5!@(vkeY^{O2^UU0~?S
z^+*c{!h;54ARefc0mqnH+c^XP3ZpNI8H^ckUSM%Yi+y*$Gxj@kl(QOHSuq&qFU-*x
zU(E9WiUZBN^RNL3uHsY^<W~!z{($EoL?vI6uiG(7yPhG<4Cn(s;0EJN1aJb_&YC`z
z3<{4g8S!wPbL|P5yHaj{&x84Bf7;9;qWPe8>W4>}`R|hqWveg-R6%i-5LMUO9Vqq6
zC<yu4b$t}=l#6S%(K_pIH%9S}FudaphJdKz3y_NI0V+ymcoi4gQ>1$=cf8k~*gU!k
zQz&bo)o3yMr88_|6df=*tQ+78P#@R{A_^3s{#lhGZxhSlwh^{GZYybI5vynqc*VWD
zw*Ur2wAj$d;cFu`rtCDbM>uq!yWs4tYsI9IP)jRF3|1@((4(al54?*&{@IG4CD00J
zqOMo;1s@c^3jq<b&Spk^^&qo4huNdt`TlqH7B()%jR7?v4gv?>tEGMDK#$3vS45Oz
z7fDd0U-+;9u3$PZO*2bvu$FIQ#d{(yf530n^BZppujB`visY3<y?E~4ofWU_iPNno
zh}YVM5MV9}uYHFA2AfF^KbcNZ-4}ED0}FUBxmI!c0*G)t7vMz&r6?CY#23ar>jY45
zZ0P~dMMJ=w1>$;{xz;%4{iT&{tSh>~d&(+m3^|M{(nSDJ2jPzouBQ~|a1Rhg4U{S+
zQkywJjH^=sK0FJ=BQ?P7o?cj(pmK*2cYVNJ3Bx<NMTF{Ljmp>n+3^&rQ7Dc*uy9Lz
z&ldR{xH;G2>@Uu+=C<q5g3tZw3a=XO1@ZKSc?T!ZFbyuh_gxqr-3Uq;9@i>ysl=uS
z-Hy30o+lk|QQUQNKVi^9NL3&#06+}1=h}?_=NZ<%a2;xjdtvyVi=iK#{3S(7(`@n3
zj@@Th*7Iw#VxkYi<GOVwRMyql`1q}u6cq2-;Hs|2@)po;dj`gkMHynnLHB?UhQQlD
z|5|V<{p4*v@v2&-_Sq$xCJgT?TCBsOsKmn597`7#gLc;qP@WKhm0UNm#41r_7~MXG
z;*B%V4gTU=VxRxQ7bud5aA5y|A10-2mXx&@g9jJerE-bmKRm+Oe?7uLQU_xS0B@@E
z=X!S^1u0;<Jqw8BC032CV(i6Zr~#Ee;X{j|d*AC``1AYnQqzG4;K9XatJ&iGXHT%s
zu7!clAm~H%bbGxA!>nytyK5~wp1g}JvRJDKa#46!2!w#O68y|)!thQ|lUrfRNepF!
z6&q^lupsVQNEl~@BSotQX}fzDgIDcggu22PwKfFdO{cQbDJWn?5u?!OwAR!Ad()&8
zUcf3C_pXb<)5{1EPC<CrJ)AR>!mIlbxci`px=Kn|2ppILEv&CW-L)R@?oQtV^oB1^
z&YS1?UdG1d!)~w3J#gZwzvtK+-Z|&603mo2fX4+FQdr?Y4+zG&w_<eH0**0%e_@4V
z(kw#|2Nr}^x=aIM0gM5sK=`ADbAm#Butt63Dv}%9m|E252p<+Iv_!TdG-jKe`q?Sg
z-)<eM21VUe7l7CPL!igh=Q%A=5K&5{61RKUF3$hYDVpaS#gko@vw&-P9~^LHx5Mo2
zSAfP$i(~(CoY7aTFRZZVG`qkna5F=oC%j^cfsA|!y?%hLPumTt`;B(9v)W@1&o?k$
zUR5!<6}E_V9v}qo__coliZ(K8Jb15yZhfBH)A^}67RKi>8aenNNRjh5LtMU_NGb}(
zuxaN;e{TV}DLh{9&^`okzce9u0FX{sjVm#Szjp&S{=;=tTU9Uy^^J%Z+v4vHhL_6z
zEW*f!AvV8iBkFda0|Or}gl_&AV8ZaOeRJ4mv&qr_I>Jc08sn_6@9ugSp75E@b7_*X
zVb3TBp1GgQ<RMV>z#zOE{PpG!f(l{y0xY+}ZAz^O;@k>%pW57_r>i3rfF2v8g%zd(
zl86%-4Zyqj@6iJS5fFk0XG|nlq1Y8h0y{kvUEP8AzaxwSIMD>x019A&@NRH$M=t@~
z+l}c8?=m0`*5$ox;LiQ71Hc~}3cKwwDWCy(zxNeK4*~l9=LGj+XN3!Q=3siqxdZn7
zKi$U*@Psa^>BARiQL;2cB!8w~D{L@fcu<heVE`3HM35*jlDi6_JwJ)LGwJ|E1rr(K
zYHo$yG<-35Rod+YMTyHLM0yM0)Px{>Q7vnQ+Hjp!n+I9Gu0a&A!o48_+vebUh$u@l
z%N+m72}ZY$qJRShJa|#1-AZUDDVsK}|7Bb%%~0yw2PkSx03P>cMkKewdmp`zWB+lK
z#WTwQxXOEb{;vB6KcKp@A8xQb-QwDRIKtgtJ4Vt@v8hGf#Elw2a(L1-qZF4&7MIUG
z@43%-{_N~*URO^54Nie32wy+}nP4!izU68TJpUlJk%c!VAm9Z3-<dAgTwU^i*-x76
zz590dU$!&<lGQYAk|f0#L#<vR%QEKYmN;?p<ix9A_2P&A`d7camM$sQU<jCt!;3Py
zbv-wJ?=aVW=6d3_F&Mh}c?aS0o^=iTf7g4QI7>@QjNNh#_kPk<G@9)kbh**W!*OV6
z02O6wYMx*H`r64izwwn1KX&x+4{zpbum}Ny|ACby8Cwo)p*@~(>hq^bvlNA!+Sjfz
z?M;bY21D@j#k(+^nmEqm-ufVt%rdtEzqH&!L>L|(Ac_nZE==?5Utc%*mN(__-zJ=h
z0}+6t7>oz+@+yEaY<u8VZgtJA&{V;An~~mpsxAu-&g%(*0oScf_|cD7F)&(Zer`Dk
z|K=6=qel*Zi*V{;gdhly3uLmkP^y<;fL>o|d+px#Uey&rP&2fWl%=KSZvo#k1VBxH
z|ADEZzZ>|#dfweN#gaH5@a%614-mz1iIt-pe_!yx9|qoE(HX<g&~FD15Pj}*pXXP<
z`gJZs6d6=6O?dUD(0Z*xsr1{y14Q?`-+eiF@BknF@P{$R<U*jA7QB1T*;{KZ7ba$Y
zD|mniAWc(V@rqaQ>}Nka&qt-wB?n)etq3AYqtRx?+w_L-Er3h^|NsAg?t9<+YL;aZ
zMbRY(FRCmrH>lNWOioQtzW#MDePjpTbUEmM7H|*gx4-@E`7@_a{bJ{?y?0++T*COf
zyWu>ly<A|(^@Rj+0*eS~lI5ens?5IWjjwvniplvYumQJ4sqS3l^TQT-@4gn`QAdml
zz@bBj_I>yxAOFxTZ*i;Jr&;PYh}2&hVq6~FDb(^FFuh~G5H8IuHnZmN;p@-5@4fH%
z)V0@M`(vQyL0bn*2Be*%4YYuE=SVyE#R&lAjsSJQRIAm2p~1n;idKMFp+s>gk%0&>
z7@|-Ybmt;({A*4%_jC1cI5mteEiEp#+er$<1-y4yUw{sLvvah81V{@3a3T=lKnt*_
zDEmhN>*cv=-kk&2eCW_M0T-@ay1E9$C<Jjm#DzdG8Nb{E!u0u$ev$^uE@=<(`gsTc
Y3qk`2_p{c^J^%m!07*qoM6N<$f|Pb}X8-^I

diff --git a/src/assets/img/files/archive.png b/src/assets/img/files/archive.png
new file mode 100644
index 0000000000000000000000000000000000000000..20aab03e1d52ac88732dd942ef494457b50e77ad
GIT binary patch
literal 1257
zcmV<F1Qz>=P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000EANkl<Zcmaiz
z1F*zO7KXo0I+=UN*IL`QU0B;z*<9PjE!Wz%ZS&dodsm}OlJ0Xhm99!<eNx|?WN`5R
zJw{al@Lrx!al0h7#RuN}zLncwb<1b$4tK|kBKKKd;&vq2xaa2Y@Bj4s{SF}k(Dn-<
zi((TSUzQ~HI{-#RP}TkUJikD#>1EeWIr+*}+;qtiC(8w=vnBpE%0piJKyG&P1G4H_
zl?o-)R<s5bMMW`@aqDZtdq$Bt#~Nb*(x|!?*GyS_`ARxBI!4_Uyz`WI7Vi1-`>?aK
zQx(tozhOW`t@nP#m<W6B`R9_Xr1af@`IoL_JhRZZn7QGm+s(P>^X|*e_BPIYOkz+q
z;H3h>%n%5h1ZcuO{=tvs_P4nG)_b4!j$}Bsl>Hd%4cBkYxY?6#&*o@@>@*|4X@Po0
zMX>!2@gPBbEicAKnAo5ainlx1PrTs6BysY{*|l@D(+QIgPwC%sonf}Z<m?-fL|Ojj
z1Tw{!LUOwvW-mc=MO1Mo1%tb8U`J^^016twZuG~L&Y7dhf+BZJ?^1B^&|9!!N6fCA
zpvMkD5o?ehh(x#>7wApkMTu5p;<be0aEV<@QKy8^8k@V4qI67V8Qr^dxZex!&7kOV
zdd3ape>}lBgIB31^%Ww5uTfm#S-n-C^j1B*HXhK9NDP$XF}E|^`(^iGyE3#WN<<Xr
zg+hEqmA(HDIGhSXXsk-0?ZJgtUxgi5dFZPj%+Br(W$qB?vEvT?`)*Ji7brpN8qu(c
zN^Nr7vn)@RbT@j<2H~Q{p0#l{ce&l2ezw22M^@y7(*R<j7%62bhyiUi2+ct1?+K>x
zNGKj?TsGMEe(;^B>fvOPm8d4DffyFo&pG+^jZlIUK{V*@L#~k8gZ{0CY(8Qe5otA`
z2Eh7omI0+sgz3DKy08Kssn9x$YV%wohy`K@b;5S-4mPBgIcjPTl3_~!j^o+`F<MU@
zBoe~C)J5a2WpSL*-|V+)w2mnu8tsf~ZC<o$S-sl;uFp_Iqp^sF9Kb{d*Y-e^rhIz?
zP@3kkVRGGsYkz(XJ`?=E{s%%M%EB?a)rgxvdcTpVf_Ahe0&S+l<sRo1jSZsIlZi2?
ziBOfWRcvaBqLrAcL9?APhBQq`Y}{%PHoy=JPDUM8_j+W9OJV~?1XMAhTP<bkBFfS;
zJ6tf_8URX?rrdbL4L4kK^`+N!Itdn(MxG!8aVI996>L9vn=*6FR!ZB0@S7qp7*~Vr
z-(iP1O}PB>D`&5L&C6f#x4-@Q8UP!|F=go*{iIZSJAHQVN!6rebxf<Ew(kMMbUG!E
zb5{CY&Oh(M(^tRhCC@thtTTSxcyRsoH?Y0E1=`32qI7qAbZHlFAt7T7b`nt*1y@{t
z<>IxkdD(NT;y<Dl(OvFxXFm72&odYdNRqT7!B)g3CL$1r9MJZCL?>P0>Z`6kefi5?
z^wcxY_}lmSmoNb1@p$vopZ@%}_Vy3%P*!@Ws!_#gFvf(<K*DpAjftYe!$bF$x4ix>
zXZ-!IUjuqT3Cw{Rur#3wwwk<Gv8JjqV1XEj0Mnu!3gEpjs#pLi;6ekk(1iRS_{_kI
TFxK`y00000NkvXXu0mjf`fPRL

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/audio-64.png b/src/assets/img/files/audio-64.png
deleted file mode 100644
index e98c78dd7ab95c2234044611a139c2b592866c30..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4609
zcmV+c68`OpP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000rlNkl<Zcmd6t
z1(Y1gkwAY|Rm1RTMywSsNLt}ClWeWDjApjqGc()AObf?oW@cChfkDi&mc%d&O$7<p
zoAvssZd97rw`0o_QcOm5RrcsdMPz1VN*H4}y%<K`7s8>hua9%iJ(t0Of$V*+zvf*x
zE}eBru^dDlZH*{RRdrR3RjCZxwi=A#(D5#@@A<>#XIu7v<pcNq=i_g9+dJ(2-;S8t
z&zgx40>=@YPEP9pW6TPr^tIJiocua)9EWnb!r$Hhplmt3e!<Fl&99T%kn;pm#h_7D
ztu3pz)`XG56@otBU}h|4#`NiQHs^cJz3z_BG)$b~YbBkL5Y{qdbAYk@!elev8pjb&
z)a`&O_(#g+;J#Gn2ti~V%3FR!_nNOWTquxnvCxrxQI!P_WK|=LA4pu+Wk?EIFT029
z?s|iDfa^k7@iAIr5MYu37Ct5bj4-w91ga%WV#j|I-mBTJ<IvXD_>oM;d!QZ%G*sbt
zN0FQ>gdi!xaR?Q3t@$c_>%NHqVt8f2tpk*f9Z*$2k_cP|r9<N-cX90<uVd=Oj+AIi
zeS=BVG}y$mBm0?Tcbk$84cYzeZOw~~F=Z0sX{}FjfH9^GPK6H?^sfB|!@v42xvWRt
zbC60UpF)U}Ju{w5f9TS3@$Fo7>ubggPbz%ECSfNY6#}%<ZAz)UG5lW#kS?k4{p-I;
zal?1XSK%A8uFdz93;`4O>GcJ<i*Dtzn_oR<_>{0udE1FAGcq*<ST!WYs~3JC0pFa@
z*f;Nv{5nws6ZBOK&azv%Xw@sn0lc-XjufxnH(%QLy()Z$)`l!nYdagHiPF#?YRr<G
zxoG9ROq(<w;O%941PCEUh3{MU4T>+qXR7dxIgBv~Ax?3CAf5?&eUOW9Vfl)Cs_>oT
z<INj00(*1^SolzCde(f6;)d_p0k0*WL2DhuS5<>`f~dhuO;;I$g}1QuhP#+PdAz{a
z>~!%~tXM%!l$1>9?Bt*S{eLKJ{xJi;_%^wWOH<B6YGr{Ps5v3dD#x)?-m#*hGJiFT
zuD^49!W)zBfG3}PlB9G@oa7#U?2C@r`xu~U$Y$&u@460FMmV7yDvlN;#q(Bi{<U|E
zOZd^2`(AZPN=^Jo@uo{>yesqEn)Y%S($bi*dF_qt?>M+XB~lz2ju<}YMiyLq`?!WT
z2~CRk{g2*4LR#CK8s0I`--qYMd5uxvCI`D%%gPYLuVnr;w=?5+4IeM;!2zQTP%r%G
z;>kdgye>OIKI=ME0?jG?1qckG)Hdu3=dNPGnSr<Cj~|6ZVMKFN6G};dy5M8mq&uLw
zF-Jn|LTAX=gi_g#BiEJ@h7)B?>Ack}y!K4Jc@Wtg4}b1Hri(!?e#>9lvfOB0AG~eT
zbHHnDZb&R+1z{KwMsaZiCQ%X?q;~14DEx&tv*@}rG~fYlHqVnk_zGsnkH}2OapdW*
zF=NGB&_Stwcu4htCzVb*0I6+RYr{MiQCmyXSCT}FZ)3?Bp6Zk~OlojxXv-6c49A}O
z8qKqp(l&27GN?cbd|LFTi6gZksj8}>jLX?DitBr+;Y3jroPP^TR-A!Fjse&4a5GtJ
z>nLF1%2(5J@m+*f;3)Jt_|Si$!ir6W(cojtVAA<<l-49wDot3`K*sfa)ug)ua>=bM
zfBC&kpY*$j_c9r}P8?<bo-Jf@4H%;_GGNZCw;`sUkJg6%7k1LM=^>jQ^}?q+Kp7Hh
zBOtOnISPZIH*hdZZ{xxnUvWkX8zCUl@c38%i34B%BMMyya56c&O3gPkF>BS^@r{SU
z;owu>BrNnJ9JfCB^awB{RVib`-*p@YBNz9AJGgZ9E15RNk~Wjgk*NY?a*ZII)8)K<
z<C~xQDVgV=ra_f>?)wj*!+<KJ&G%^wE~07C3Zf`t@c4eZwm*@Kf>d}jS_)_b3AHKU
zxef)LAz#h8D{g+(Sn7E@f9D#T*}Z)ePk!xR+4ktSh-~hP)B!JwLe5>dl$qz8AD80$
zHgfcrKd3<>jAHiHcjJo}uLXxUJcJ6%AjE0m89fCw3AJSXfuZTLySe7}*NzE3lgXgn
z3_ttkXW8+YkCEN_RSFN?N8vZ?a5DLmP7)4oE(d^?5gjw;GUu+35jlCZaI2yI4Jv)d
z5Uz&|1E$PfK;t==5=lwl{=Ezz-iPC6F_?7t(PjZ-pr!)oEd{h(awj+3`8uX_PI$@i
z`Nk%?`v>{<{hvUt`A-&2Z6M#&YE!`kMNIt0?2d7Ne=l2~_%U84hd~heC8nHr0i9RA
z%C1X_J;yn=;b*v+ct65(1k*2CNkt0$a*6J}8*n@iAQj$NKvKmy+SN}@4<7C2XkU@b
zUUmypCQf`w@B*sv&1~KDD}MU7Z|AI@Uodm>1bi8%mx>Qc5OE*8T%Ij!9^#p={2|A;
zJW{=G00SzhFz=c>P;E2N299iel&Ca_a2#Y5F!h|Jn3l<CrRmzY6(d885vlODO;@~!
zHteM)Q5Y4L&YyL(I?s0qkpxbMkLT(PKy9Z8T$jgx_)QM|_(7IT${@T}{79pXL2K)T
zlY9QIOHX$<hu40Wxou7C`@z4`GV^@$9n;V<q_txboy%8p?BV}L9y`F`!98@&zZ4nx
z)q9;ZOh1oe&mjhm?k5=T$8BswYncjv+FIaCTaS{EXwLleK9<XPKMz5S2A|31={j+O
z?nBQYj7Erfi+umiUlVNq2}`Cn5*Y_2HO3fX2N=87&_>52vo_@Oc@{0dn89t2Ap5#F
zxaQj|y!RuhD753jjAhrb|FN&&1qFJa-O9v;SHzLydbG}*PhT}^80@Fif1I|K4p4F=
z{ODU^k38}yHPKqLY|+AvCfhV%BH3{|_-qw^<GLr<``!DP>K1T?Lky^CccFP=6M@2l
zYGW`Os;yP25`&c1<Z?L{-Sa`#9oUQMIl%GlYnb=)H{dq3qN0e7X|oXRGmuAj(|>Ru
zXc_l6n)a!)3AKap{i*}HXrH_E^zf%EhE}e8IU}W5tR%pb@bQQ}G+f}BpZo_)TPv7M
zs|D8vjEUD0fr?>G{MKvtY7t;t5b-)+hP1R#Wa6c_ao`6J67`;7_~^5AF1Xyz`?-cj
zvYj(19@;^nuM6o{z*d5a#%ez)GB{C%@?am15U0Q=F6x>Ftpb=7_}YO-sW?n4CA6C(
zv`1p5RzSrAoldSSW0kR88w8U_IyT=Y%v(YgmnaA*b{)3A2e6@@ZJTVryHXfNMLt3Z
z>-20xBTBePDGAC&5Ml(pZAM)Pd8CLj)aJ$1(OwAqGj^B}7RZ=dn8&#t+a&Ch$K-m%
zW`;4EY`%#Q4^K*>pteu~1PC`{9UMg=7#%|ygX6mP_d80Xq)dfR-xjXxU?d&B<{JyI
zUsMr;ni^!%KE)BXUo8NVqjMBRR+Rxa*FX)Ds)j*eqsIu>hJUS(iWE{Rgf<ArO@+4&
zrcMXc0gsLsF9vL>tZ<1zAqgJaSUWi$$l7&c$?Ccu1Kr1oDkV(bqj}O<wJ5O;8}9G6
z4)pR(wnSET%60H7MY}TejKIq^g4U_krGeAe0{<^~3#4f4n8=Lf*HbAL@r%Rwr2;{z
z+Lnt%VTg)B6XQx8`Z8{<GZO0z8{)s&v=&bW<l83EKJ#2u6k5n~xn$>ggQ1~)QXCyx
z+c9FOzZV($XyMS%)`5;AW(2&c!KA8}db(SCUYuIhX<Lv;mfrPV`sXjF+_fLA6gUp$
zfgZZ|Zlu_I3}M&$Vq^qZht#g)DlyBZU#{WMFMdL&FwDI0I`Zw4t#h;0dk6MEPw~V-
znhkW!Iv3$&0N*;N`|y5{5hB+_Q|A<PVjM`qo0paXhV&W4U{suQlP<gwk;q95R0g`(
z`;*VG|LO05<ALj)93*SAfzp7m16{=rSo@{>X_JHGI;OB__3H?O5HPse96Nvc1WsiL
zaye!!ybz@%#;zw6N1xq|Fot|fJ1w2l?7dWY1Js)W2^oDe!)TOWK~{=3ccXGut9GWj
zon^24B+K6LN04o>#fq}v8mZ%y(A5^OZN8zAORKd<7)h>v<40(kGS}v{>$>(oW9@nB
z$K+gxwrR7NeBN@Rz>f>4zFxYY-H8C&r_YX4K&e#tT2j<M4HEwmM%2H7S<5OJft1X<
z?k?J9p2vnS{1x5LY{ShrVi3sMLde8DRp>MS>YHiroXFfOZ^ADPBLw6cn)$(3KZ`u^
z9MXmPSFIx3G=Xw)*v|jY?pi~o=Ln6$FtZvN!pnmnq~t!3EQsog05itpDx-<Y#cIwj
z;D(R>JLkOYRRom^l|q3^sfbbv1OV1<Y;NJ4D{sd4eT*@7>ucAJEo}Pkf76o7&^Tcd
zi&x%5;8y_92DUu$6S63rY>v4XUWJUp6nJZ=fY&t!h?fGN{M;^Ryljpu-tvcZ&RfLc
z%}?6Vd)D%+iGtwdvQ=p!Rf+T7%W&k#A-?hVpP=28sZ>I)e%%{ro-&)#@DRCdju)QW
z$AL{x(&9KwnYVx`=PV`&{Zx2sTdh9@NOT|bL8X$is)}>3y@T_vyVDMQQ5f1h7h>cd
zUc7hs%b$J=wSOC`v60!!F6E*--)d(C0XW$#kAM4%WXeN?!mxD3Z8*6m2!~VQO>Ea6
z0m%#yV}wsW9Qnxu43h?L+aRd$vb*0v*XGCZ`%iG|2mc!FWYDTiLt_&=Hg90><KJUK
zHbcwADJ;7FHiB|F1wN%9vRYRJ)b_~4Z~c6J^xa!9QqeM@lU48eGcqQkW%}9p#R8t^
zQL6ZS@8AE1W)tB1lGXRTnZ^lIDGd(-sqnTnwoUhdH_8&=%)%!+g?^ct3zmTp7G5~Q
zZk2uc!M|i^&#!69WjSm9A}+l7)s#zxQQ>W?4Kk9oC3<~hfI%S6IDG9nVMldrstB@G
z_@8{^3vBxKe=@nH$?gW<@~%%owh3b$AWjco)gTD%eJ^9{mb%7(+Rrl$pIXvtW5^3d
zYerBk472(z?`O`%*HaiAvhbwC+kSx`5`+=crcK=Gxo$r$b*6wZ7$JV|@bLiZbHlxF
zrvKoxRJsqc;>{nTG+eZO5=Bew3IXUCK8hr+=Mol5$KLhMx4nB{V8E^-lOm*)Ba5Mq
z;o-`&VI(_*5Wjc$xQT0z(68X2$TYN4sg!7GZltxP*``DgM1)~vQzqY#rOL(7V37j{
z4|ae2WADFp_pY5A(+@^~G==d3k8QP5WO8}jTr)#MgBTq#bxJ3WBM5_tQrX9^wqC}w
zgI;g%5L>tJ?0MgN-+p%zzW!p!m~jGcYOQsGF`8pX597IlC{hd;$`nezEwWl$8*yDh
zS9c$~ckk)>lRx_C-7h@<?0QBKhx8B_Z}7ELw+<K_9E^|5O1@RCExe6}uC5p1_xAj8
z75@3>o?S;$>R$?vJNOZssK$nSu~-=s{OBn#zTmB0g9mH`s4>C=IG*QHRYuCVf=}Do
z6oQtPvB3j44?XlSyLRoiPH-H7G2;{70LkCqkk8_}V}l29Zn|kT7hZS)4?OSyLI~>!
z%=m-19TLl1r4(J={bPa$aB7DVANj~fc>CMmZf(bP#~pmFt(`5F%K^J~?imAo${_fe
z&wPf}t5+K-rFI-=+`;RrmP%!Nq~6op*YoL5eem8G9+9GTi3gDAWY(`=KXl~qp&j!V
zELu@06ypy`{NqQlZJPi#r#zPeX6<x`Bps}^CJLn;{f*HBfAohRdq;JVvlW;^EE+J0
zHnw9`2|Ib;)W98LXJi2`y6B?C4?OtK_s=|Q*3w8uCpU=9DV3o}*qm(A-#jCMsUzpD
zY2srzsl>C-{^rQv{q0};+nzmpHUs$)&?*5efrwZGz_)Fz5%GPUbU=pK0S$o2<#LTJ
z&CSydCJT55Txx1?MBGOp;x<J|w8XZsZQ6vJc-)M*k?@8v#bTil1Yrbt3HYR{6bJY~
zg;)b11frS)NI1daBxnuHNn9s237)h`+9_??XDQIBpXp?}ri8jlcZOA&jF4msoK8f_
r^=J^HuJ5Q%%;?uv%;?Um>pS>gFxZG|cAq(d00000NkvXXu0mjfW}5wl

diff --git a/src/assets/img/files/audio.png b/src/assets/img/files/audio.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d8a7824e719b3c874e703f368dae5d1db622aa0
GIT binary patch
literal 1388
zcmV-y1(W)TP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000FuNkl<Zcmai!
z1C;wp7{z~+Ow!$UZ9m(#ZQHhO+qP}nwrzIp-8OA7^K#lbC(r+{=jIFV{qCKlLTe2`
z6sa|%D4N}M9sj(OkFJ<|?7dApTN>)7JU^PA%8|=-I8}2m`_Agy?D@7<kprOrx+!&~
zk&d)~b{zR6fKW;ii*)32#cz?R%yi$6j6QK5)7kHt@O(x_Cn&Tn$cp=%MR!j(`RQr2
zCWbcLaW4Th8m%<K5@ADq%|ezXzLY`;0M~LW-Kp$%j6HHTPHuoqCQTR=$<MJQOYe9x
zt*vb_d5#&D0Hw5y)2I-_LVoqlw>YUZnJCA|qvuc^jANy%As0{Hz6c9#aSSajE%?QP
znfQOEPmaNqTyy!wnWLw(`K-+rbE^Cibage6?=e_CC$nsHScyC+7Qv7kYA{5WbO?hW
z5sHy0fV^$*RdFq`QgJMcopR9=<BT=TOXtRi$K-7#a*a;N69*`z82agJ8oOpo)<v6p
z46N3MTB<UYV#*5{8yhE^nXN<~XHMuB;h*Fs$W$f8`1*HupUT*muVc9tNknKcuslB^
zUyK+YonWGQ0p{BJ1X|7Hm|QJeV!LTHCTn5y-J4G$g=UsDcHz6Ht|!P(fe?ucQ<hRt
zh{;sf!YsPe$>q#_L#{zqWEkrGnQxxEov7$x$rP4T!PuuS@#7O$)4ueEc%qWN51zwv
zQkbX`fp<Rsif?)+)k=GwN?Tid>20y4gO$o4VtoJZ3w(9MVNASy9Xjy%;r*8w`tnWY
z+2RO(|KdHofuCtzd|iHi_jz=rO5{o>A<1v+7G|#5W_h{2qrH@=B^|Qge8l)yuTjiT
zGx7OLq;yE&q)`a8H_5jz-Ntf9-HO{WFTJ0>O8qPg@#WKZ5O~vQ%Pu=8K_D-=<_6*u
zBa@R}fL2bZCD~W*ApGt%lwE;sx#UBEQUPJ?u4}P1`0mB~@P@Ob+h=1m`!luktwi2e
z_=Ox!y0*+sxnyK)fyOi}OOh{!M8Zc|nlJ)wQ?jnY5HC<zj*C|);9wJl5d}X0%p$8q
z!NQbT9E1v)eZ9Sycc-(Md7Zt8WSXhTNxWi&WxIUy)^k+WHj%1p<(JRir>=VrCWd-Z
zs`Ns{Ju(BAArk>j=@$j0o4d)h%}R@9(=gxiynW+o^ndd)z8^<4`+Ur?@KSvJ-fN8i
z{sS{FzA7)=eLeLZJ*97>kedcb78z4XM4-a}9rz{Dnzor)@xY51{PrW<INwZD6_JLQ
zPCJOj*WH@Xa{1`l2iSPO<A@?NeNumRP~McAHh`d5K)MxlEwU0p!7G1&La^@M$I?9W
zTs(Be=`=JpG4rA;;1|4d%tGM04vw@*1o->EVj>jhN*Lx7VWnuDZGI-lM`LH7u;D((
zn!yx~>oPPrIM|#0sXvu+5MdaiwVru=BLA(5l=Ei?#84X3%^E44Tu0#Lr^!@RkxIEB
zY<~Uqx9Pq1*m>iRKmOna0L!-RWZJ($ne)mVC*;YwNDKP=`;ktHpMLszV%J@^+r*Fq
zU=0imBBc#UJn+|u%=v#u7zWr<^84?<=l9xk=dHf@{L|-23TxhZ=i%<V@1eT78pm;C
zILH`|BV#ya$kMqoWEoDWOVa5Kz1iN0U3T7nqt8D5_!<6I0-&z0uIY|D?s>euqjSz6
z2tuv3&>CUfh_VAv#+~U1VOb+1BjL#>A9wPnpM3N%kO2Z92TTJ6VMJs+X(mQ}OlkuX
uumKAY3I0+VAc`VCt~}rZp%L(mNbwI5YnD2vy#Cez0000<MNUMnLSTY#eX~vg

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/avi-64.png b/src/assets/img/files/avi-64.png
deleted file mode 100644
index ec1a942cd13bfa3441aa2d3914f05442a3c862a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4698
zcmV-g5~b~lP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000spNkl<Zcmd3r
z1ym$S(#L;URqfp{%nXdd*t)yBoXfhqyPUhb+uFIiyREyskGldh4J}obmH7qv-pADO
zXtvKU-wRS2sb56=Gb0OSt)+FdjQw0GkN*CCw%%qNHVqDDzjo}gmmRai4*S%r)wpBI
z6cTIENkVK4dSooUGp#W}z?y{%)zZ7~w!iG}|K2$_-gwJtmtKl7mVZsNxUXA=D5dZ`
zMXT1*0kVE%l9)rKSHS2ud7ekD(ct5s{j8q*<P+N;+uM7Fi6V;DI_Nk_oJC@xSR`wa
zd~Wl3*2y@W)yurDE_!mg4bx6O`D<QZU(?3g8w=q^_MdZrb^OX^Gr^tWgj?HofPlZL
zUJpM#u5*+kL{a+79|?c|TjF)=C`FM2jpNusH?^iI<A(J0W|O2+VO=hVe${K(_nh;X
zHESlm4|=$X)f%f5*ffBH#}NQl+0pqHR7aS`Cbb0Cj*flLqqDR4rc5UIY&#Ap2>df~
ztmldMNH;u>rnMwL{|WYwe;{A0Q3*pAaUI7l%_Ff;tReHJz=!2Bs|p2buY48z2>gt$
z$>U_(_z_H@jt86i-myPt(?3pP4242=$)wKm&ca(K)dFJ-V;vyh)CuFmn_v9`Zn>F~
zKz9TIS}FV}8r2)P0m>NY?q<EfM@JmR-e;X7@Lm5DJmbNq$E3!oZ&eCRVmgx~$y>|c
zI)FBsgEs>I+h4)$w@?zej%*ey>s}mhp>PgxX+<(=5*sA#hYmY}T~9xgng2X|I_+CT
zJ2kUorJ=x?rF{paBmcW!3;eAV6M+{nk^~oNz)S59o-u?S9jwY^=s)C8wm;=`W=)>_
zUxs&MXJcE?7W{911$W*~(Kz_gr&sB39f6ninrMEx=dtdfL)hk|Q|SGlfOpgJGr;L~
zoTfarMe}#vK~Za$_BcTq@cpzC9Q<&p#1dmzz5jvCJO0G~4R|+5eLuXk1C-Nzg8BJR
zUE~FRH1f^?o|irro#yMs0!yNpl?NQe++&WTZ_1Sa5qPk)Zo!d99yvNm1hh*Y{PQ<`
zmEs@%fW7(8lt$q5c^CDxG@L2rs2bv&#bL;DiTs?`zW#p@zI9a<+;-b-q+3^ax8MBH
z54^&I50D=oc9FM9f&!QJX(u@NAYhTeFWYB7=Dhl~^i7@mKL<ZixgYcti?{}^a=Uhi
z9WI;l^iz{OsrTiacUj@!GZ|DW?a|u7FODLX?Y%E^Uis>OJ$!0E@`4PWpTT$#*Xxj2
zpnZ7T;v5L>x!?j)t)ru>>k{+ab5!CO4ftdB2nFf1XX#%1{PXas@9>m|mkChfTqEO1
z$JB;~s4iQ^=EaL>E?>${uRo6Lq%KU7v;{v=3y?HVJ!TL=z7vSG#>X{$a5N6y7#hU_
ziy94=_HzZk_aB7!l#l0NeT=7wBF)fHmCb9`P+hoyx>&qyDgKIO<Tq}hD9<`YCuH~B
z8`IqbiEaztjcKt56r^ZLw_+yauCrF_GzC5m-ktMHnxc8x@aD?prd@c?6IcONet=N|
z8^;V)1$Nz9hL$d&{^E<oPd_QJD=5`#bXF=%m+#4}T1il@U`L*-R7Tf^(MuNL@4XMU
zZFsOPG!T^1C8|=Gdfh#o5=$36UXm~@&RQz#%cRJeCmY_l@POxgDOis%j;U5RQ(e89
z>Y{}-L}JOZB?NMlEc9=rB9Wbu&rvz%SV||Igq_)o>Fpy5BkJG$8qHt*9Mfz-HitHb
zc)^PV77Vlx-=Z1}B-Kefz#8N3^2mDnV$+n`ewnPVIQUTJzxEghuN1Ck@Poje5Q&Sd
zz-|`UwQD4@OKC_Nn*|HVNYsk88dFO}I%dxy5O5`tr(AZ|Wo<3}1A`22w<DFU=R>uQ
z72y0^-j09Z!PKt%JkhhyVmyy<(IWC;6BJ-3f=}_bl7M&=(itF-q1K}kP%@9DqFVv1
zKIAaAk|L*9&Uw#MXaOG@fnBqjp@j=+KK~p>qLW#_p3?9TQyUG+T9fVVC41Qw<aXSN
zSRAQ4#Rdn7zx_@0FMfszL&yp2&3~bO|9#ZYI+w1KPbDV~NW^K`0}mmy+wL^K_icuL
z^aH}>%di9eNYR2dx;1=CBC^z;0}`1xwZ_CTNS_GoT8ZxZ!wzTb<4zR#$u8o90{QG`
zK1s*&<&-47XA}xl`uZsBvJ3W!$1xk$V~RzW6|wB%19#j(X4~!Qm@*ZHYfvbXx%N#c
zsT{-WzaaX58VUt+lIqbHKFhkh@1%UywRG;fI}Oo&b<-v`?YR#dpL~LDc^A>OWHElv
zbkO=AfKN+cJO_+Kz1akTUnP+lJp4$uKk<~&Tb)HroG|CvXP7r{9`Q#%PG;_0B0nI?
zW-$E&*zbSGmC~jex#(7;q^>>k5F1WAgHE|2<^<N%8{`f+ko+Ed(D=dk8UDfd&_kP@
zBeD<NNA;;ES-jgG3`mCML^5Rw#EjXqnS9>)1mZ~ZPr#3x0ZJ)kP9qGlqRkZ&!N!qC
zvy;2hj&7E&GAxR72DaUf=3|dCc+(Ad7hXbTr=3x?1}a~GE3QWEcL4Ur>o89~i4~}P
z7!uuZ9UJethvHRNliO|wHjAD&tys<`z-F_|7D;*K3Z86&oik=Id0G#-!ww@Sf6J2$
zGo4+ST%JVaWy27ZdP#UYp#-c=JHVa)wp3!BjP=W2!5-<C87WU^GFg(j^U)I3Ne?~1
zutcl><kP5}dOG=15fw&w2keL4a}R3Y|2~cHd`p~DbJ<XM@P6tSKf#Lvm<$fOigVVq
zX>=a2Kl$@7z@IlCHDe}9_6wWIVZgm_v|>aW!YUTphG!xPB<T#W7VG=0Rf_NxuVP=>
zjAnFA8uy$J5Zh`i>c&zm<jHG||FxT_-ggi6%daF7eGcCB0z)GO&7uW#)$7bL2ITa}
z?zS7nx$~GIvdL_{EyyNmq_RuIsm6dwVi*B-u<_VbPV=-2-})4=o=5tX_j*aK<mi{P
z?<uFXgm+EH<OHB5X<IM`trSS=cRcwxwQH|pW2HjD^Vn+obSm3yOYWWThOM?n$(&A!
zY}R+MNo=r*h9p4=tcMi?ya4M4>9aiT2umD>ZNWPywUWTv1q-&o8N+}aFMD0{MyAOo
zgGpLect&fAGiR}}YcfVQC?l|1Qnn!*S|TajBWFGGc_gswGa2^~HWAoWtFg;hA`8x}
zHIRB}ks%fZDIjai*ozIG@6*%U=PFE#Z2{lLW#}(|`qStnilU)?=g(i&+uc1`dkReJ
z^41tbuF^qWPKHE^o<y|Wlr*nC|2)y-k7EG`trPb^zGO-$pBrP{-0k3Es*rbU#u|K)
zfR?p5i~!u4ZZ`4qd8|^-Stt(xRV*^?C%*!D1`<6n{6rG?Ocar7@n<_a-jehEKWb~$
zM76!LVxA%d5@VcYMLtuiRr0&;O6ARO#bk3}1guo%zVCjENk9ED#SzFjav;-17Qt?N
zxI!pbDzQk4sHN|FH#4HpNh+#V={e>YdM>>JqZ235I0(4yBOjn!HeF9yOdFA(@Rit~
z|9UgPXjJ#ue*1^wQh5-qCr@~*Q(OLbnEby<!IPH_uKbzL6L(L;#+sm<<<DRHCdp5K
zLXW^V;us;J_ah%8^V;Lw-M&yNvOuJG*JnS?j&dqAC0imn4yT`R0y97MDIzc9uI1YI
z`OW*^jd%0S^vIEDp?&yPm!X#*eH7_tf!c5*1wIBoeYOI|S{MCTs=>mZdot<M0^ivM
zwHkp${x4s=4*Qu;v17SJJ&N4bx9?-0B>T$O5(#XfT;_!*p5*RJ&u5oatMDbYn^N`7
zJmpkz(kBRYg0CYY-{Y5We>1u7ev|2iB5|9MPfZxFc}ZeOn-K%Bt>M#Na1PKC#qvQ1
z(|z5I*zO(z1HPp6pRW4?eEO4YFXP$>h(vnc7p|lD`qyDZF2&AHo|6*zu8YoPXSw#O
zLV-{mH(M&bd6GrO3&;i;B2V%2x4(tlcfP@N(R|Z6Jr&Xk;H8_m5CX<M>f9Ga%a<9-
z%@rn!V9p$d&%1!Z<*TsaB0SOllfVBBfmD6lNQCQgj4PhbzmU~4`_T72gdg~9l<V*l
z?|d6O$tKDOyhx~g=%FO1p1})`KY^?B{eXLKx{kt+e?Ygui-btTGRENGUILz%D1?;O
z31iyidOchq>ywpg{TfRt<!b+jFF2dI61{=0E)sVxLoxy@Sur)2Bf>qL)BS*GyCIQx
zx<sLy4W?Rym&u}yaqFQtVlawbZD7G=WxigclFK8j07Q}{Mk)6D-Jh}L4y@KK;ax0^
zA)n6;^mKP^W33%%=RZSjzr!<ejOm+=-De-X|7*@Hx*f-XD12q-;V?5Z(|U0AdNue9
zhMAd}8Fu|cde+0t&CE;>`o)f=QJlNDM<>#FI6kLNm1QOIcU`WOWiNnpKn|cX2J4~e
z=U_a{2tR4P8#cfs4C@I`+FI=G11H7HW(G49GHbQ4%dZdS{^82_eVe%QngES&0fjda
zc#)u9s+#@kOW1F}f#V5<zK-D-qc?6Xi)b*fp9gfm?jiQ?w$EIzO2a#FM=T+LF{(g(
z>DsVOsI0Bidu({PFNi|a&^itZ;K!|sp<dzXD`Vs_*!>|qM;c~8vii%H8V~?rBP6f_
zqvHaj8NlN_#(A0{6oQ}OZ&}D<ZyH|aH5DKQF9WXEt`af|8%g=V%kg+7I2KuJ+5b0y
z=gbBI2&ksHz)O8#hOiMLeC(bMzy#RZD0n!oqE<Za2a@p6`anwypfgQ>cs*t*fUPQ6
zO=<P%^rnxdepD22KLzi=Ie)$em>4`q4OD=tA8Y_-1txi=Bj8#KEMp|#8Pi;I0p#Nm
zc)&Pmg`JfOPvAs#59iU+`x0AvIF2RY9pmO1pm#t7UXqI$AOa)`nI%Z_N((r6T<1aN
z3vCQudS$Vs0Q%o*O#J=4;j@6H0Dqyny8uw<L&Sgzr}LBW!RMMbLP(^&s%^9eXa*#%
zZmO_31=cJO@L+BOczWy5DLb&1pKI0%8<@WEst)^r%EDDu-^v~vQ*RYiJ`=*%oA^fX
z-rDV=KHeJ2VQnZtx(AHHI~ItlDC(y=2XJ{xQ`s>N$Dqfwh*1PdR(jnmz;~DYOa$I`
z;b#l9ixNj1aqus#Jl~GIaUbB|jOh>0A23CUOP+lJ!&AHAOr}>%+f&Bg5=-2S6^463
zOG+_Y!z1-Fyp^}x2CPlC2Va(*dflOzoL+z1tvB4h!>>T)c^(SjqJM!V0xv4y5dZSh
zW?8T*!&re8OyR@#_z{t`9@J|QMS+nPu<zb`*Kf1h?b45x-D6&t-s<wMol{u3YSre4
zAG-Uh-+ujNe*YIE(Oba8;U)IV){L9KqE4^jrF(k=gX!*iqlZ8IloK)QQ@rr-(=)U6
z;>kYyjMqhP>(*WP^|$$3o__MdYnCrt@(m(ehS=s@8lJ&_22T%Tux{NNv~q*8tgw4>
z29wi0_<i>sNAAZrZQh38Jp40H)$pGov1P0_p$#a!cg|wx&Yg9-PkHdJS=)opG7rD0
z3%_8?(;j}=(j}iJ*b_x?5aGdbetx#?1(@3N*WnYlz(B(LSo?uG1FF9aF9Nh$IlKkK
zg9lG~UAyxI@2|p(0Q2U3j9-8Ktt&$PWzG#CJa_f?$3};d=YJJm1eh~t0vBF*0p5Q5
zZ5U&E+295ZK4^ixRaNDy{r0~OuQi}7OFZzv1GxF-o9j5s^MQk>=YyAne|ZDn+x!Li
zL=l`jcP=I-CY<l0Y?fsM2XDPiPtRa<bQD{*Zrk$sWA|Q1c+<xkZ7q63bDw?o*{-!~
zR{wn3>1SOrIXMLrwzTn>UQaxn*9T1FKoAw!T8pyi)YacPyW^=RAG*aiIX?h6OrMd&
z*D<Y<SdTk`Bcm9@-f+=H7oGj~JMX`B%+bf5TXsqpECg$#WF(d=7`gHxFw$3EGp_7Z
zs5+HdvSi`f*Is?$qxtjae+OVRfUX3%<E^B%z0Gz#t>kg50t``rF>hvMWMq7wz4t!S
z!4317AqQv<ndyDTz|hmgAfB<I*Ujk^9iUe=jGLO8oNTv?E<j7*)v8bc!tbHAy%ij{
zdZHPPpakO>y_$k+42?q{8FT6rV^(ihF-`4I3>8E(gttI^Gkx|`5T@aGG}&BwpJQq9
cntTU-2ar|&DZEPJ)&Kwi07*qoM6N<$f_23<y#N3J

diff --git a/src/assets/img/files/avi.png b/src/assets/img/files/avi.png
new file mode 100644
index 0000000000000000000000000000000000000000..700f9ce62c2520b2f646891a491ff9e45053f7b9
GIT binary patch
literal 1370
zcmV-g1*Q6lP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000FcNkl<Zcmai!
z1GFPu7KOiCxfMO;nZIq@wr$(~|BP+h_RPZAw%grlyVH;9xGv_dN?xrRpIW<Id!MsU
zohz-i0BCK_bJ#~FW%E7xeEQ5n;i}2LzTUZdUC&l3ObrbB>HQD*{Rxje@;i+2u@(!&
zcHz-jq%RZeeP4bDAQW&It5zG|u*qacqp*(qDpln4H06yO31(&}9(6SPKKlZbd+c_2
ztyI3xTCkCTJB9#@+l)ncLiOdk5BEH=ObQ_YlBCng#`<;055AAg_HEG9Lna6)pMC}h
z<X^$i$OyGkh5s7@jImN{ofg7FE?c=0naPl=Ht|37etJvuA-S2GW9@Or)A!hu3=Rzu
z)azJ)f6X3&UD%>(h(ca`;)(1(IXU>bV~_QFogL(Im}Zle`|L~Rp8G>`<;Vd90umlV
zN(`W_L$iUWBH|En1^I*PuEW)Gdb&_R`97XCtUTxtQuja1@YpC?X+$=Qs?|`{8bP%}
zb<1Y-+O?=Z{|Qmv#lXv74c*;Xr9&Ysk(lfo9>&yaVpp|_R*Fq0o<!#Uhv@0*WPb4?
zRIx~HXAuF&)dlo-zk@jW6moaphYbQsAN~N^^)7Mb(bzy?qwH-6SqTDEqrv>_EDiVJ
z=u0ohcOT4r{9AM#dpzmyf0yL%ev5I0$p;>xJ~Br61Mg+l^~hd%HT8=xCGD#4AnHLp
zWJ3t*PGrlm$8li(70&a1O6%6r{rle`jyMYQe4g3|-%H}tp9m{y?zcbbr=BI_dSjfJ
zf8r?^DN)sGWDCT4@aJFrf<$MhIp#edU}$udpj=0cPf%A1^TyXPfA|qdN1A;2F^mu-
zG8ux=F)Fnhdc%5fvyvJZplhG~u&QNIYa@jG)9$--;2wMYY;<gldZP&fNN1Q69=TkO
ziQDgB^P<I+UXf?;+UxKxx`b7)eg)aho0xdRo7uE%5qkA%4tm%7(LoRiw8|04w|(w&
zSZk+CrCNYBK6qFa(9C9$4?axM^O^g^#~3*4?63y~H!H$fIQ-UkQW_p%)AP?T>E^`>
zh~^+>lGNI?8)GB?uuyXXtG@Von$y$B{yw(UYSf>361#H;;(!BL@|7>rC>F6DS?V2~
z*fx)Gh$~3iv9P`fA+VlDuw@HL=W#+xn%1J0EyHS!5`sXxW6(rfsF%yAgAN5Dq6&x_
zZQ}xwcj2+A6~Y(-rBGU<j0q96&$Y3wdqIHK8q?0+8cReUs~~0(;jy7q*ff<$L;`_>
zjszU6C4lf8YyWKy{>`HBCDD4RR<7XfDxthYl)a9QZ2%1*2>%{1#zNcXWYWi%iI~7b
z1;!!}bRK#b-oStp@WM<@i!>zBw63kS;ed7TwKqm<z~U#9>?{_GTeqy+o=W*hi2k6c
z#6%*&@$dgIt)gPjXn7o8mX%f{JV*;ey1U!W-KO&W_uYBZ-~RUJtpL)I5d<pwXn|C<
zhbAr%!L%AG1eAA`sn;s(?UwgKVfFmI_uO{P(j|+29Q9zwjv_-tgJ5Ge#Yz7?^9Wdh
zF*^K}H*eltz5l*Du6N`=A{O$XgAU|<?|VO2UU?mrYBf#}7s0fTaUp<gwu6-`me0TP
zmHBHHFZx?V9tq6M%<#}d50-m+`u;LHHojlr{Ib>xYjFq_#6o4JbsZgr@Vx2iY4xgC
z<zKbv?|)qm><0uu1t<e`35dD5x%n%uxa0!g_j8Uk0Z70d@c<D+JS>3Ly6K_{WPzX!
c4H&@w16H=lm&rm&@&Et;07*qoM6N<$f=hg^!vFvP

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/base-64.png b/src/assets/img/files/base-64.png
deleted file mode 100644
index cf698f52540fe055284eb8319e0a2c8b208604d0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4069
zcmV<B4;t`^P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000lHNkl<ZcmdU#
z1#lZ#wy?k3-9lSr%M?4zj62NC%rpQ0cwm{Cnep*5Gw(1n^EjC>$BrqsSWWl!-r6oJ
zDr;<M$#bes-P>-}NqvVdbcB?WiNtj!LZI|;5ey9uvV7fYtieq3`=`I<y{qRfU1yDC
z>`*L>g<GKxHr^;bbu6@|DEoW23H$y%vfmv3!9PFnwI3voUxt+Y1w|sqr@o+As$l?w
znj%lLZTC1pRGQK?jbJ3o^*7yQci(kj@$yLLwf5FN5plp8%3)(G@G`cit{O{@h29+H
z;NU^TvNVg2T*HyU$eLhR>vBuVqO=^131o7|$l4B&AW_^h5HKFnH0>@XkO?!uaoo2S
zi{&qPV^!<{U8k(Ogun9?rJp=WX?q{hjHy6PX{)h_O#zcU7J0jbY)>*66X=(&;kbXh
zk{R9I=t9HF74hIf6G#_8B9I`!m51~BPy&zwq;&D$%W)W7{5iNt{GcTgO>grY@x`e)
zpt(>eKWAC?{OXhux<*kr*#CYX_K%+;bTCKrArn(NSeA+9TBwLCCz#~$X6XcdDGlqg
zRUC8URdgoPKFtJ?mKCto5v_`GCA_Ro{fZ|Ej_VSM1h*#>O>3njONAKK{6IuXnF6SW
zF9`?dzaK*W<^`JaHVNCnY7!WxiK;P6fFl5bK%%v$*qat`@e+={;c_|?Rq$1_8q*rj
z{xJCugaFr(DaVmvsB!?vi3-aFaX35<_BS3z{^3QUd55G7U^i)KWgA1HkO3qh92eQ%
z%Kla;UbK+)H(Wwj4fxvG01`O?n;f54Kg+6&sjwjx6LRWJunOM!_9Jj}FHIhNLJJ`y
z4w`9KH3*5YUF?n&eJu`S7cXGtjTbWG?+0I9Saq!e2wg{|{Wl-Ry=9{Z?<#mgE?6KW
zXchdzmXy09?2VfYU9^BDH=IXzqV4YsFM-<p7(xgp5>3}AX)gBvJcPV;Bhj2gf&dtz
zsz5*kuqDOL7`vMa96WCU3;*>TdZrD$noK<dgrQM%EU(+&kMz>MIcJm5!w~R^6*9tq
zbX@WsP3#Qj*?-nt=KbTD(+3`jq_!C6UvNRi`tQ&ji^<P??JGpT^)$|}o~1c!k<h{r
zwm}%6YoG~GP7o^X3+V{kwJiHipT*qkPGe@Wefq%r@1#Ub6l|&_){^Xa<c6>Hw%oO+
zHQ1jaB|;DhAcBUcI>M-Mg5y$%=pKBA-KTak=jv0Knd+E!@UH6;3<ZW-ld+}15EWwF
zu;3JYPh{;9OOieRmU?QSRqPt1*)p)BHd+}p1Squ;7~nu57GS%c_26eP=kk-h$WK3b
z{D}l9pjwQN9({G?i6K>vg>JGRc$wr_87m|)%7V&fr{FE?Pidc1kyr4k4q*DhPu2&G
zgJWZi6AB|@g~GA2r0h5ZOpD4+DTDyaA>Y}|4#wDhTKB6OUa^If(aH>vVOMi4;UHWK
z6hD64(JYr-SBxDZ!=BS;GS7qWc~!v6ntK5wnrf=d0Nk+>Woe;F8zf+(L|6``o+P^h
zIrg11mw8^p>q)*!;HCc{sTRX@ZN^35;!wsJCwD+NE@n@Py^#V3E?mg`Yfty!+g~-2
zm(&)+s(S6>Qp5sG1QLOR-H~R0%w*t_MJ)V>v(zT1QFyCdq@2xRmrB^C4S*3eFv4L%
zu_p9D_%93Z+o|mUm+A~qhaW7!LAJLukg_>+=~5Q|^SO1y_ix_9{%1Eax@{Nb!BN~o
z8C`<wIN-ScH4~by;|S2AAwq3Qk_+b0y>=<B^XC2e@RFKh*f<sV0t<%%7B)qUbSDF?
zlKiEMS$_TbbjPO-|Kjg&XY=pwfq^lSZD~?-duZOUnn-7wP)kB>tPo-xz_clkj8W_#
zBDbfXLw7yN&L7_j?FklNa0-jhI;A1_agntg;8r=nrRbPwtx5K$HJnSAvF7@VrhKHe
z3weI`&QEjbiA~I3w~~2pynxm<i;1+f)>ZS?*eJu#ZDz+W?&8Uhf1Pc2Jj4Z`eK)oq
zs0UunCAG6avydF7j*XUzGtd^Gbm>agUVlkl=lKV}^lkRt@-VIQXK}=*-bl|W$J7mv
zgg`t=#|cL$8=fs?)3aSSyqe2b$^cnW0<J&=gA4{OxNHqaUVjChiPkB@3$sja=K-YS
zGM38{jYV<)%x<qmo0Tokrm|fVzW)06kNrV>4H#jDN?D9^S909HUP)(s>hQj}Qlbfs
zvFEq)jSFsM^Ii9YV>Sf8<GzRa!Nu1rTb@m2yAgOPW$g=*5#Or<q~&U*zG36Yw_ZkP
zYdbh@UGM-_uBaN`yrb5z{pS0*^}2U+S5G_X)r;s@xtNxDGf8%}5eNqnLIY*P#VVPM
z_6;(!V=o6^+|1DPTd?*G(AL?(vTHA3$79ba+jYbHf3Hyl#@HV=<BKh=OiNeGuCCVh
zHE06q)VIzHpj^yjv@~(#C*H!mYtEtn{-+pt;w6SR?PS~i&wKAnI6~sME@~+RwFK&#
zhAsu6NSIiA3yW7Qqy3+~5<GDOiG}mnbM2dy?YiNm4_~7PJlMP!Uy5eAbV@4q?ywQK
zxhP$|?j4>4SE}_Lq@-=xBGR666O=}V$@dLW=pUkdD1(*FW0y<-jBt=Ztcg%6PP8*k
zQ&$=zo}jYfIgW`dWqt6IT!sJ`pV{^YDnWyK;881R3`^T>7j?k<PeMp?qgkqJKAdVH
z<Y~*&MUCw6JewJs;>``gQ~M}@7H@CC*Mz6x)>u#qG^DHx-hZcuL+pG0Ievb_I~m!w
z{m<UpXZP&kcW-!~vgz4w2p&o8Cg{2ozmb5b2Obbeq=06k?E2-c{O50Pr~AnDEI#W5
zW*xDHw)wNv`u<ArPA<dX_C4%*;yE_o_5k}If10rEDw|R?5P8%bDeAZtmeMDx_f#j;
zA*X%q64qUH30r=63kM$S<-Ug>!o?sEO%UyDCDPua4nAJ(1E^k5&gLl&j8Nzw#wv`V
zVUy5PEMLBkMc1CgGe7y2vRyAcYVMEqeI5ry9q=GPb#^@#X8Au~#^P(wrT>W+8GNFb
zk&WBP>^eYxV2E<>K5`z6V_5*`fdIj9m{e1go&}4E&zV8XvIVpqv7ELe*8=eT&9^Aq
z^}@@>z6>>fp06x9Js6?;xYsblQzW=%fzqK2=2#x9P{c7UP`?Whh(-t|nh2-jxO!-U
z{X7l8`w#Vg7!i%ZD`>-Dc-MZlEtY{`<-d;zMu>Do2)Ebn_HK<PcW8GXt#i5?f>#c#
z;Rvlp4`}cvM-m8y8QQ&-ubyx@&;Iz=xP?N)=Xu>S+4#%f^S>uvrfhn)>xcJ^)>i`c
z!~5b&mvpd`&|r?6-}El-`oI_IK6)*)k6uUTibb^abkWqBLTip!!Xxup^23K1+1E$^
zOIz6e=rinp^jXT8gLKAcDx03|2H+>T68lTR`)$xF6-jPb!08`+o3{$w%>D<SV(8At
z*mL`xIDjC65shL*f{1_tfV6DvqKRE7ASt2)F)hZdnX~D>@H`fI&GgQXenHu;AKu>%
z*Ru>Nl?W;7yubwMN`x+GTf2hv+U1l-Mi_c=8>4?*1-9=ef8Zdc(JbX$9;ajipeKTa
znwtnGV>Hd^AU?mF<gx{%S1v#_$B+_bQ@Rbo`(qs$AeDls2VPdxw!p9IV5)@~CmiAF
zYYwmZQUTYt0niKs8H!ADqy><TMPAn43~JPr`r!Q?mk|ii_xxrCdS8C!h8K<^n&O_u
zCWRl{wq4ouY&QTe{SoSOK>as4wh>^_IcE~entbz&Yxvdc-^b2Jp1`rJhHi59KlLns
zc<YCiEzhR1-4Hyoz8>J)6%AZtt^S8g5r)B*|M(eufAI%4|Kc}9+GdbmwTSkm3u&1@
zo2K?O;drxZgn(**rA$uk5=XZ0W?<7+hF;i0aqs|93>MB`!J^k)!NN<<Y6u=l%^DDn
z<5DH*Y_71$GVQbwqTw$#Lw)`9-Tp8G_dm_>i<=qqo(oP66AOu^)VD2^x=Moti0aKG
zx;klHxtR77*VA?8u{5Vr4Z{2XPcSsp-PN`f7@FJxS<eBMokoa1`*T&nwaM-4C%1Dy
zg*|<g4h&+AW-v1aoN^feJrp7sj}l163D0OFI;)H3x!oi?I~uR~ioZFwLm*%b&7Rev
z95D3~_zQfiiwK>_%x=;>-Hl&nG!Bn+C8e^7l&<DUojbw5{D;cFJbdl0kLzjKgEvi!
znLQoP8HPSQbq7cZLQG3||Gn!TzF`r7M1WLwu`L_JFens;_I&m;pLk<3nUJ1TJ3!W2
z0H-m$z%ngju?X>aGnQrlDbh9|h(tr!wnZi**|lrefp@?2&6m9J!gIZKZiPWi!?YI&
z^7%Z50i7K)DV549#q;^H>h|$i6e(SXM>4$h(#F0If8ZULZ{522>0mI(M50NcT9MPZ
z=7D|t_hRS*+jhug^JKF{6ns32rV9=p9O0!Gd;328!FT=<{t;a_s3jT`dSDvDONl_J
z#x^!OO1W&2%N0E>slUbJO=y~er+4F~z7K!sU6*g&^76xmp)-*<j-#|j2}mR$rdj0u
z(Uq>M`E0%t9(;Hec?EA&UGGV3+g9TgRsldvtEJ9Ao~yBJS}KAn?Q6m_{_W9nD#3lh
z&@>I#b*tb7Fpc2-XW{==B7{(pcU`+CyvL>Vl|;+svZ{7;U84eXn!(G8Q4K^QA#`2f
z!+&HPUP0Tot;Wej+pu8+AO7%17#J8-PSAt^n6B_@^lN!w;1IpN8~Z-;p?6-s#e>&0
zZOY)j__V}gF@EraA9BG3=cf;iW?wFqtX3h!^nkCh;kYhOKJgfH=FFpiV5sl??|tiK
zUgRI4LDBt*X`1}*cfX~tuP<`^@h84s6I#^uDF8XqT!Likz-pNE-maDt013H#o@_2h
zsa)=R&%57p#kQ@R9|nX{U;O8KG62v3Hy8|Rk3IJIZOd1zIem0Aix9E`)Q6fV3#tJp
zk9;*K)Jl6)TAP+dCX;3Fo*jc9{m2LYt+)5ZyMShtjDJ_DnEUEf&85-`Pia6vDaiHf
z*RS}}m%sYCp6=PJEX(wHMfFh=q`-#+V9JrNdSAWXQ=JW}wmlWwwr$z{nNNT0zj}Ln
zp8=vZV12ceLK!G2RdX!B23+3(I$!`nAOa8$hokX$tXoPM1PrC10~#Qz=Kd%^_%`v!
zN#>Ozt491p5JD||?$}r+TP~MPAXot{s~ligsHwoAs1(Y830S@Zsx!fNh6dn+`lHfn
z@Y>1*BQ>7oB#w|u$8AerE1ggy^=+m8yrNVDwMEpL*LWu;vr|U~)OemWTinT<S}p$v
XEl0?dh4B%@00000NkvXXu0mjfu9NHs

diff --git a/src/assets/img/files/base.png b/src/assets/img/files/base.png
new file mode 100644
index 0000000000000000000000000000000000000000..c75e01f12e2e1159eeef550fb4cbb67792baba96
GIT binary patch
literal 1261
zcmV<J1QPp+P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000EENkl<Zcmb7^
z1CT6T5{188Rqe5D|F&(L&whcmZQHhO+t0R*VfVDFyYAhZ8(k5#y>Id7L{8S#$&)8D
zS}3IekWyYKr5d&@)Bf;V-W|T+my?Tzn%f(v$U5;thM6iW*x1wgkE`Ci_!m;C0Q%jW
zgYx}T3ezx*(}95bHvpXgMN=xB-6;cRgFT)g_>v!C{(J}V%q-(-hC^4iF#6dS&^I<h
zE|~_Uf$+#FZ;kTyR9$W5<(6e^GD;U>gaXy}nK<GVKO(m26rrjZl_E^x$|27G+>7WQ
z8u(XmeBk)Nl~zMIj*LnP*5MP!up%KRl0?pd*BzKeG*uxdlAO4!o0<<iL0fMZg-jms
zfvYm+zN(Z@Icvo&kI>T6QvI&zt-+QZGl<q&lr1@MWi5d>+)HauC&lLg?m2(}tdC#1
z5W`_C_}hcRmH~nY4qn%Qc*A|Pc6Z=p?EeYw?cqzHWfNe9T5C`lTf|icm2^0JRW0E+
z-><=oSq~iYv$HtqtbS}p!&sG-<;;B!loDDgY>MPb6cU`ish_q_%%`QZ9j64Io0#Ij
zAJ<Tfr%+PAL>LA}EKK(`mk?@e1s||>-w0b7OOkhToVu=!OFpuk)~*h%xk8aRe4O9C
z;X^$9#rK?3^MAbkV|2Jl+Hbr{ul*8vW}Vq^2pJSy{NB}c^!4DM7CVtbx$8f?>OC}G
zI80?*BSHw$6Elo&+0E>cQ`8Ukq9}n=)&s!GbyiW=+PJ&3uUEO63x7k4g*?~2b`>qd
z{T%tjI?_i@Ynh@AHC+FqC8XjB4*g|=-jg11c?C~=<u!8~GqcI8t&|M;rbTQ0z16Sa
z^7&8Fd&3npTsR0qkWVDp@sr=O;mhCQ(gjcWn3p#iEGhMdfl{J;6s2@{^0V(HT2aBl
z->)Tk>WpR^Yigk9#>?rs{&EifZGAa=z1D`nqGbQ}+X5Jd$@f>iiYr&mXYk$|uxe`2
zcQPps{dpbhKK^AceCA=Dw7deZ1PjmbgL@T7Zhy`5$&bfb^WiUHXY~LO2!&|u?%>83
ztzhQtgbx^WHPY7ue+7PUT(>G>?D@(Mxz=rH@6-3AN{{v5Y@D?p`x?!cp6{Q3bfkoX
zKY?$0C|#^}$M%9{PrK~D!o;ovI0ak3GE9rwfi6a$eaLP6Xi0bJn;?N@n!+*-gyZOg
zo<t(O*ZmIqo9uZ}N-}3B$;OlJS`w<PAktJ1;K>5$>M$*fL_CoR1?A<@Xk@pg(I|oW
z!M#1e5Q129g9i0v^5k$F2bV0dSQLdI9#0fs{)!hZ{o7yuusakA&%G6X{mQ|0Jh!7Q
zpU*QfK8|5noE@LYtz5Bm!Eb;4i*My}c{f=c%eHNT!H~bXI!XXJ7xlWFxz-$nju-|L
zlau!9l}n#l^N+v&P?Ih(Fs{A!I{x^_KZ=T2OqiyLq20nX^tX;B_s(25&}+lc<ff;l
zb1RoGd14M6k7&sRKxJiR&9}e({htmEk6dZH=3WpbrlMRH|5^ycn4Xz-Ui<2oy?M==
zzkdaY0R<onB!QeLB{3tBNL4f%ZFV1;fCZR<0f;gOP-qtv3U)r3OeTOJQ1m580r`Id
Xv~}3Z9LSQF00000NkvXXu0mjfPL^+J

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/bmp-64.png b/src/assets/img/files/bmp-64.png
deleted file mode 100644
index 562e7bbab340de7772e77982737834c637a3c19a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4270
zcmV;f5K-@mP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000nmNkl<Zcmd6t
z1&|y!m&bqV?xE#f^TrS|eGo8Q=)-W1nVFfHneSs}W@aW+7`+bIF~q#=rJ3%Q^lsfX
zsv1?N=O*XW-OBY=Pipn7e}6sUtP&B5li)uGr2-}<CfIoS<xEXam%r;bU-xTUuKCWL
z(=+pFfByj17>qGkW3l#pZn8YphH6PTcKoE;|JY-4?Cy`f=Z*jPD_{NPpZf`{6`q|W
z?x%B6N)ZH#qEsk=h}>w5eUXSLz%?QW0u~nLdD(ybs~(wIz2%~-zVj#ISYuQ*gVkDR
zW?J$zNvTy7QXl2gp*pMAuBEGg`Pg^tT>q9e1LcM`5_k~KlM53-GJYlHQuM7LP+#j<
z0AuVQEG)$TnSTaK0VZMBVZ|38I>+ebJc(4%X_A4aX-bkLr1AN3LZcDWQ&W`mIJa(v
zpZcEb86I9s7zQjfQj8VE?>5B23n)O8xN>W3g8103%Bko4FbL@H@A`vMDSBBa0@N1a
zN77VZqLd#xfdZSxd}(B!uO3*Sp~DP5i4)@FJa|f)xICd=kLfB~DrStEHX45Nd#+_@
z`5N-kRv5w#H3#dJ#edJe<0_4{)N17;1N}YE6Ojd4Qe>^o2_Pc<kcT%q=9`Z<*mp!z
zu5=N0brCfZ0wPeLn*UG=0hZT7O37(nbTRzccU(9;d3fK)`F>NSz#7|cjH!y?3qW!5
z;nSGihhpx2N>i<Nqsl$Rae|T(E;-RGP%A@FKgso%rToZkJ1-pG3;W{UmX-$o&`^+>
z(5V0({NBSU_daE*)_N$_`bgpwBm#VX5h#Tg=1+0Wh6R4`rmGoR@&60&eCKs6fD8M*
zPbS=R+*0l8rq<Js))py;c_;z`7D%Vhuw(5k-}{m)7+N{J1mFST=_9~RbUF9{td9BC
z6Y*lt>#XOyd;1ZAFi@1k5X$c3njvNr?75R{TQkjfzTmkmTY1sa=y?$zyI24Ruh2=%
zR}L(2&oND<+C!zgA7dnY<~9~3LR1-)3b49Cef9*~S4?u-bz4}zYN^0Gzd(Q+Z@dwg
zv^Fdo8szn_eGT7wQnBYyol>QT?rJYdqA5iI5dltw2tY-o@htJwF|HUK<;I<xSg~sD
z5`!<^RYhO_`q#aR<;w=ckKa8JJTlgemJ+4zE*f!)ltNr`A_SqrH0GHbKf>0YGrV~F
z<*Z!2^x)fV_oJ@9<+!AiI$Lh~wO`vm-a9Zoms0ELrO`-1Y;LxXR7l!bU}p3%n`)<c
z;Z>I{X?Q7E2cn<)=dZSw`-TSlf93euI*C*W;sg*JwaWxW8qbkT9pkw@i||)(WYroU
zURr;v67o?fURgTX<cLG}Kerwmv<RvIzFmqMsb8L+ZB&h_G}n0ng%5_p>N%!P9c1?S
z{e<gRGkyOQN=^BIevkS+>)>7QG@rY&b<dENXJkN`Z(S4!p@Lhl*~FUVJ!maHyyq9p
z0kvAquP9eBvkj6Y^+HVn7KNAwY5g?i$p=YRY^SpE3Kp<=wWS5r<xK#wg3v5`hV$E-
z6+lQ*!^rUkuGvxJBHF=&6pVqWr>ECD>BX@oNz=^4#k>M55Rfu6d6FB3r|DY0o_+Q8
z{L(c6)j(s#aVvtRXT>R@06~;$`o&>iJm&or1|g$kWBlH`#!$g|eA^zrU^f`)H1z~9
z#x#$%35cMYAz2O#^@-D5vu28$uepLJPR%1nh13Xv6^uX_1eBwI`obI{LbX~&8-=#E
z!wFA1p8UcH8cB*ylV*fU4!%X@;vrzIX%RqSjcp!j6KID0Kv_u7o#mRfGu(0gb6K(K
zBAz(?ga;BuCFW<QdH**a;^0(;u-ePU)m_|r<#GmktE8qFzSC2k=Zm<bt{Xm23-2Tq
zp+Ep*TLoxFKuQ`X7z4{H3g*sm?S^^2^Tk)NeC04o0pb*gK!wB$v;61#c5|X@Cj-k@
zXU}$x#vHw~!LQz6=&1%6dG?k%*VY<~727F%E(O*YeAAf#jYdqhWC$ClxnbQb-*;mM
z@AZtEl&a;BFYn#Y@$!|dTs2H!lgw&mIC`$aHxDaH!Lz&0gA>3wz>eVyE<{`e*ev|J
zt5DUWyy!B^58kppccc}-y{prhLlcUg!8Pc(j%}H(Lo82DgrpJx_E~`!=Zbhkpa@=^
z-^m=HwWg~Ykj{>C<K+QAddD>k7F=dH#T8KP>cPYYs|0JsMMoxRfI_Jdc}DO;xfG$b
z!H9V9?oBrYL<E#7gs1Hgu$ERUMMBUR<>t-s<KKC0Av^+NErLK0a`mMH+16Maai4`T
zhDKtz;-ZKMc}DP+a)|?vA7*N1o-j~I!4A(@gNW?_UY=fnO3C7^S_VBo#!Xw);sxe)
zi}0)4?(MA=5QtOD&P^*8BgRrs40DY|tLsHG+_16C3oi?3q|z~b6h%x;jPrNzyqnKF
z)Swa-%<$5T0NWm3q&NzqBgam+s0r!9Y5wT@Z(#X~VXR0Id{Y36xZyy+5ANt?%dlbO
zY=|+!=2a2f*9BQ5*bd<V$|1b@qq~@{Y~u3|&GK!R)_C5!8ViZ_mr>j@Xn`;f-^pR<
zu3ewOr6fsbH(zn($;EYkNGU*y;G61O>kcK@tPEEUhg`K*0U%arXp`@GfiMgR0!R|$
z1!#A*%2#*Y$yW}Q>02|%{6d|#eC;g%^keIYf&gQs1<I`g0`1|8H$oG8U(;GnyPo@x
ze-xD}pNCi#z_$pH-{Hju#I%|11xlreqfedS_}CmT*|CL%I02v(MVuWy%^N;@kjk<h
zn501|5FS1{&qw!-^D{45&0Isb{GSACtn-WE+g*u$`Ac7Neg?Gl`B&Xj3(ZuT%21p0
zyf*|oKF>EN>rffq@#(u5sc+<x4GXLtDiNm;h497??_xB#j9v`d7{pr2q40rSqinyl
zn=Na*smC@q2@14_FFFj}e9J94Rp#dE4!i&!r@nV&ZU^sbYqct0`Q|?EI@v>cSud~q
z(pmoc`-kc4?cxhx+s&7ri0E5AfKD5TNOPD8vklGbKYx;c|Jln46mG(E%U~hAD-^B*
z##nr_?wvw-!Hs!C=QlY*7==uZkMXuI9;PyM86^_#J3P;a?wn-&%yC}->4Q`TFT*5t
zj4@5K7;PvA!rf0y^O4<W=&A&W1rUrI0xA#hvbGx`pkSRBP~_lSDcvvc1YUq@DdhE^
z+QTV(G5yM7jHVL8r|z9%?_Ecj2rr?gGH|ltWd$pOH2qQ_yyGj!*|D*Yt?T-5^N@%X
z!t+0EglL!Y@VPmlv%Njksuk{kXoOEcl+e?^44o!q0$RhuLd>E0HB_qIq-o;*zMz>K
zOw$y?<ZQyLKY18!EP*16Lb1j0?n&nYbOf((OHlqiF9cx#;^2iK2uSMly#5mpAblIL
zX-o#Cwd?I{V$@n=n<1}V_<Omg8o{?78Rx^hPExCcS$jc>;RRek7YooiyeqkbNUp6?
zurN1A5GY)9bXCiI<O_RvWO4<Sa)dT%4$NrdjeDErt>&V_QVQWspF6_g)AM9nTLGZ}
zUceRd<_q8eD2DeY3a7qnSE*Fk|L7t9>D_lBDnKbHmrEQze1vy>;|$${!|0@eX$^1P
z67EeAJb2v{!#3MkgTgX4-QeuGlt8)hUkoq*yCEP?3oqUzXxy<7l)|PB-u3wh*>ie1
zUw&|c?s7<g;q@Qc%S`D~uxSgZ&4;;lWhaCa!{TyhNOKNwogh*K?@%su4)AAtOY15C
z-L(pz`}$qne|CW0t}5^T<{75y@b%qy^Nm9#y1TkDX_^DfeC_g<ItOc8M6ga2i<|vj
zE>H;Xr0IMaZ2nWC+FoE<W02++cJ%C-#U<(})q$%~Hs;Kf<>enez~cuFQySQeNgMuu
z+6q>hxwS2qC_b2L>y|nz?zpX*&jk^n03Q6yR_R0lTuW65pP8`+1gfQgcYSIvr}R4d
zF}RJ(S00{0aS2iAwzYzY#acl!==@rr`F_0v_ue<6KyW+7%!<B*@xVJ0033bW+goca
z)k=wn_K)z1`{wChaS1w&abRH>WVzNU8H6uDzE1KYi1<Rdcf=|L!PVtweVpI4j)#C3
z^o5%o7p_UX!0SJLFG<&>L^^gGlYF@Q;2u=IJ}-s{UK?Za>O5d_<G=F=@J2uZylW6e
zA@}b;#62f!REH{Po%m4saCi0jHm$wxz&&{9JCPJ*etUStRXXb^0>mwCIe2fPw3d1z
zNZ5_lDb^SV)j_yR>ptEA<|acA9uOBz;thcU_?BqRDbP-U_IrDWk1+-SW3*e={BU<r
zt>f8>Kb~`;@2sVaMT91(ix67GkwSRaUZ>g#-`N}>C{(*UJnK$kmL$;-X{^<`<;{V3
zA~@d{ArIchjHsqKu9pkoMTp}BL5NBr)^;F(ct49TFtyfn*Q%^t*-NR`jTnO!4>||r
zjrSZFxbO$OdK_%CY(>%2RcSs0$irI^;zmN8q^w!9{E;XOCkZ>=2MD560X&EZlhbvk
z=MsMT#y%_xh`@m$xohl#5G|Ux{99hHEremniDQQupQ?L*!y*c3PNHe538Ro?cK+0_
z{pv6L`qb1^_8z_fQn&=FB6x&qxkM?1|NO*pM928yTRg7aIJVArg1It&8S>xrE2W5&
zggdU=z$aeyGhA`mGNQmzvPt%=S}SMKd2V`+qsNYo{_!9E_V<qLf8+q<lS;MrD-=UB
zGxdXMYK9bfc=t2ahC~A@%>B(zz88Jpj{piIAm2_hz`6N(qEOg&#YRMH#wKPsH(SSA
zOK)!%VW2oWI?4W#17m;vmw)(uho3yShiA4EbVGo`FDgq>NI4=05Badq!viSSuA>`W
zCy)vhCyyTIvP;(!H&Q02W|*6AWbl1`T?FUh&rUEh^61##{M8?Rzk@FpKnk`22ntpF
z{k#R+0^Gs(^Tqe}ot)?0m^6lo$ti}1S2H_TFNFW=MffKV9o&tVI*x!2zM}rWh0jgE
zjX2G&?>mR@{61hw!ndsV?rS{E1;PUaQ516C{IulY^Cvo`=<U5Qc!1ywU-%;X_m5;E
z1c5?iX~GNs@2^$MgyDt30|a;6aXZ_#UCqm0_A-=GnGnd*gLm)Yw!+3_OWlRQ<K}=g
zP5FaA_yd0Vmw!3)gD_lj@GdvjVy$FfrY!DlE(AV53BKhmZ{haaZx^k#4T50F!CMjL
z=NG6}tBj3LjQ#na{q7Go;Z@E$Oc6lKOR{Iro^vOTKlSkDEziAic6JU$ZZlKh=XZjV
zYnKPZ`E71=-PdqwqO;jw#7_OyU;fdrEN*fh09FA277&*^zi9^N`_ILJ2Td``0Nb~3
zf8NVp{;L04w|4y%sZL#EmAicf)#8K8DC&6+xTBjKCtRwt%T{&p;A1EL?O*@lwFeFy
zxDTk}Lz@<04Wvzrfd&vaEp0xxtpb#q0@MIisZ_dpdwPZiDFcx}h%+Hj5C95AP#l6T
zcfKMYp5iwF$v<#vD4Cm^osHup1tJ{0ZzeB5248Pl3?xA61i*>VGzaRy0$0wPgY|rT
z-_Hx`eCXmj+d5oxp`I7Sc!GEl;)XzRQu%UQ2-VSNbe5!j+0_+`*WqXI-<P|R-S7;j
QPXGV_07*qoM6N<$f~HtPF8}}l

diff --git a/src/assets/img/files/bmp.png b/src/assets/img/files/bmp.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b6dc8f37de98942ecaaf387cbd2eed4e96f53f8
GIT binary patch
literal 1322
zcmV+_1=aeAP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000E>Nkl<ZcmaKr
z1C0M(7R5iWeeKwupN+L`+qM}kf;Hl-gSBnj8~n|m?Xl;JwoluaHgCPRIdhTpoO{o=
zBb;*p7-Jt_VsDzt;yoY!SmzmW|7Z7&ZX0Yhnx?tgV6tl^x#!O0hSxpk;ny2W0^t7T
zPnE4hCNjR5B=T1P!dgoyGTm(Er)A`NW>+%4b&KWL<&2e;4HlPHx$E!}A9&?G*|~iy
z>y0)z{5v(bt7<><k9CMh=;5LMdqj~qE`<;PX@?Z)wUYd2#~~NJjE_hPW!OKk$lITF
zFD54@*l1)3!0~@VfVEB<V>*S1kf%-_r!!4Za+n_<aYWrCjCBh9R`(cN<`oa$&G`5@
zS*~%o|G$0c2_YZ&h$pda*Z#4`z2UQo>l$M+wFoJg78iK>BSx8=949X{N$hYnIRueF
zW-KUOlLrNm&wlsM5OMm5^NW^&{w6{=<mOopZ|UIVS`WvT)=|b%{Z?RInXRk)DrbdZ
z$5<zK-PTK?ZGB}0IXE~*QE0I-vqH12*wt}`yYK1c(Ei;>+hU~!lLOt@@RIW)p^gO1
zEUt55G3RdE`@)6bJdj16k>!fz<rN;h$MJ^89pF;4n@Df+y&Km!-yGuUchx+0e@yNz
zAb9LEkr1>y9T%+*zrjC8gtMrk;9ip(yz{yH7@HWUC={D*!_{n%)hy=BqTd>fho!2G
zsbF0NW2o)_7ZG{uZ8tK|71>X{<-tr%PLSssr42(vJv`?gmSc04#~qL;<49wH(q)!{
zFaPEYJ^drR;34B)0IfC7Ru@zc9>{&}7Itkp_?M~aDe|Hqi3Qd;l(9T$SHc5#Itp!x
zBEjG8yvjZHO>ySZ9N)RVL030CU|(M;OnpHRs812duYBgCez?4`(N<+nKwzE0IZy1+
z#*xUFt8+_y^cQnH=%8U{cAng(tS@cy$)8=~txp)i8WZfPwy#1OV{6YG;VUr~YaMY!
z6;|<u-(Fx-b@02}moZu(Tt;LSf4XgsExkF@Bc0W|CH`4KQbiyKffr4ah?`H&Vxlgx
z#wvd~sgX&9Q3|6KT50b)d8YW?EwjAzG23gNTA)@50=0KRC~LRMtuM2xx^eji#z|~B
zQ`&fPjPU}7BKLw(34^oFgFp{KfM5}hB!(aV?HtEueAhxNz-3|UlB~+cP!t-i;_#pC
z5#rx1sugfnbK}_tn=L_1MdqPAsj7&*h|ld@ljSMKT5K&Kgdj~5|8WF?U=IQs&4Pgr
z$G$PZfiVJWqB2X2^>wwehtigjUNFW2jwDT4Tv%9`xprZ$qa#7WzkWeV8MaOI^MnWN
zpfeE|Q*BjSP;D9P0Hrj&oiX=5yp@iwZe}lDZoJ|3uX^$Ax8E`YASzP5b8WqO+8UcU
zKt_T%78OYV1c4d=jm-w_c9ZQp_i*ym>GjvW_7%@PcJ$6aP=}nKUtoNE3|z3upG~eH
zko(65;vggtG_%6n#-+<wTIJ?1sL4Y_hYug(JKy;(eSLi-Nm?R7mPium>k87(YDkZI
zCMDh7J<MF2S%1|lU;2zAci#S6{w)N+;NalsH^2GaUrbGJ*{_t+&N<;+Wgot-FSAu2
zvJg?Uyu7SG@PT)K;Lba4`w7qkD4+>6fJ{^(ez~Nl#E^3?1|;Bf1c-ot4F_P1DavR8
gDWGeCb}f?s9h2h7tS)Bk4*&oF07*qoM6N<$f|V+P?EnA(

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/calc-64.png b/src/assets/img/files/calc-64.png
deleted file mode 100644
index b813dd2cbfad8bbc5a8682bd1112e1e485fe94aa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3438
zcmV-!4UzJRP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000d&Nkl<ZcmdU#
z1#slXwuZmc(r7$mSnnEk!_3T_TxPyE^q85MU*It_Gvj4uzF}Twbj&b@8A;vejlH8P
zMK!YJIIrUUU1z%`ozm2I`ZQ`qRcR;Z6cH9JBVlxGlq)a0nwk00-f#ZR*Ztg?mt1i5
zLO2{(D<zx*wSqdqxy6#DdTf;v8`-h{pnP)gUagHx{>vAB{onrO+S9H_m6uS8LQ+lC
zViB_P$(6n)j@_+*q+jKEhK_QT@BQxYi+AalFX%mE^Vg3}9}yFT%*_~_rD@GF7SsyX
zH7!<3UN`lLNzN#p!;ioECdyqMR}OTYbcu^uh+S-Gqm=`r`2kSS<J?**`Cm51e3~|D
zn*r9kA6r;x{BE-(E6@0-g|7^~mrw8iIAc?Xh-IEQ_OUTd6XK@X$TUp|L!~p=gv^$>
zb@L6}{hE6?^^{ZaJeaL75IYMZr~^<01p%io<V&CgPytn!JVzmc!I9L#p#XTsuwg^z
zk2eGHdqo1!H9y~YDvIKBvMFQ4LnGxAd;WpXANm*zc7n*v5l7w<Xk-Pu1P^f}L=jX<
zeR#7S+}eK=cfICr`Zo6`G;La1)3BKq&9t$S_RXd~nsTttQK<xbdpC4mrAm#Id{wfl
zsOm-_3y+JG&+Y$59vb>2o<B*YvVa%*G?HjW5TS^Gilf@m--Iu7<K~;V^ObkADFdHV
z%T)8OlVW8D5pY&FTB{w92>@ujj^#iy@bJY$|Hvc5pTrL)D3u#Tae$}=6c9v`mT>fx
z`e3TebsKNuJ$KyGgzsw$pPvn&Xd5<tA+l=wOwbp;L%{)Bd=SjQfBEn~@aV{=C^g}$
zm5?wl0SXw>?{-)MuMam_;o1#1^UhoEeL3N?9cxvy07iUVsC=mj|JcZ92uhQbJ0q<1
zzylQU4FHHkCB~ONqL~WUb>G6<ZvHy@wrqNN;T6c|#}^UW$(Z9U|Aj-x;Y+1)s$C(f
z9vCG_dtwk@P!!RA=Epm@wt5S1zTw_=1g`+aGr%(*wqg17zQ5zq;U;`AMzGlO&cg^z
z6ELY?v<|iX)F%S2D&N8zuDgf+mpkn<vq+x&x4rFcsrld1-PNtX|J#4US4ZC4?DwC<
z3nu932#I4K&r<-5NGb>x+k|h7mbkoh3$MQVZu+<M0qX=ld8UfA3&4jy^dZvf?dkPD
z^lg75TNj=nw4-#DLc*wo`bvNxsUV24xUi48VV{f4t-SKeyBJuf@G3bOaMOFv0|0@>
zT*Q`h`oD8`w7qY7?ifK=oyH=(IzRve$ni`Ni*3T!n(*gy3wJESpS1qqNh(U)Aoy?n
zp&Ljfu+h{0@7*`Ni^wcM=phL_01iP=EH)ZscDTej_GWIseEq_&G!FWc6NW@0#;=s8
zI`A5V3kF3IAerw)K#6g7kcAPC^Rx-yZ27?x6du6us-^=V>Xl;WYKAxhRS*)nr9a#N
z^J6|2d(A$7)rr#bn!6V8ySu$~09a_aCHUBa0_hc=&mgtY5?2Pd^6Dmh|A_*x$%T@Y
zZ(|`H0JTCK8*G#;aY2dcF@wyHl(@EfJFmU^?h^+dmR|>`0}=^1C%B~`2q37&RQv(L
zv49)8@8FHs-$UQ#O(za~@}B$v7!oB16E+s&$Y7nNHyFT8mASs>Hr{gM2@0>vW`JY@
zU~sV^YA74J`(e7w4V!M^9k<-erX2X#jWaoYVA+H-Vh}kV)V2745cp-v{&|Jq6Xos(
zoqORJ;4H+EQVsg><^paSXl`k5Tinm*Z)|oS`+FYSdp{eytB6S3-wNZHD2l08%4_ne
zM-8yOyy}Yor9&=W5ndG(MYZ4<V6D<o>ZLx>;Fc{n^6op9hX=)Yj_z)_`n12qmklVE
zv^?qH(9GX+toA;x-qQ3jYw(%=TMkcs7@!b5C@A?Epqf1c=p>pBxoz+!?tJxKY#J=G
zr4?-Cb5h^ibNl>6^bqyo_cFNYt+{=^tL4+b;mx^ye$mH{y&n-N1h2}nGDdqz%#%&j
z#$s;jzm_{+(}W)=wxtDd4#IdOcfe~jY5-U_mOJ1jJ}MKr175u`1DI98t7`s%$o}Vt
zlk6vQ&KwyY_rLk=-^bwQL9E(BqrDLyN5m(exfRp{QPL6&mT8O^uh}PZlLUSj6opUj
z=X3)9Umx8`qDC0aoO@Ewfz4Y6t`q^Z*i`4#(NQ*>KX4DebfVboxXoz&b4)Be$~nDj
z_4zC#GtZz<3|<rXoH3xZXOcv&9@aMw4E&52ls=+Py`u9xIO53Xyp!+Go#&$w<>>g=
zIQzn1&YkC@@#8*cocD{l^L#X=9GiFu5m2`heEwlbB7gUPehE^fUdj7fiD2A1JBSoq
z<e)1qazvJjTzDYy$%R)<`Dk%?^0xx`1HFA@6wJ;p7{vjyGJI<ch-}E`p1TvFl=g3d
zm6#8=B4YXC_PbZ~`O40(%k`NJpQGe=t_q$6zWqX|{SyVG0DN-4qeIxxHIERG?Qez%
z6F3M<^i&rx62E9431VvV1})n1D;<fERXSay=-S@mVxP-S{ZBlvv+X>;Yxp;qsQn(7
zU+^CYmA3Qz-qGJ)^11Zf_vQ|A2Pc1*$)*nl;S-1BrI3{&R|VlyK6&t<l!GePYA(Dg
ziO;ele7Ri3se(`lURVERX!W}~5knMPp56aDc%~D@k(OryhG#y9V%d7=_g3`TdGrr+
zeV(8G48AD?#o$x_6c2z%ad-gK5R@I0;a?$mWc#kDA@*uiDjsY1na0x!s>R_|Q`uB>
z3`nM&BKvtIMksOhsUITnHbI*O%<i$@;lRY-a`l-n&d2ITK-oY30Q<)N7N8J(a&MJg
zV3mg%fU`np_59p<zS_B&=y^*=`P{biyh7qb$v+F1GtV#j*kOxEQTP>(#MTV2iilvX
zWq9g~l)N6mk(QAXV-tH&l(E{ESM-^j|Jt%X#`uNd69!#P0Ft${s1!QJ5<JAWJbmO|
zR88AWjME0CK-cVJb%B!Ciz-M#_@peJ0opPtc82HFQt~{mI%T<ojDO&0?fqPJ(pr7~
zp2L$LURBE{r55i3t3SZBu~|IGXnTN}9Cn1GmW^F+$eriAs>gl0E3eC2<TQOQ!j8Qc
z3d3ts(oW{3fL9djl$f#HMb1Kf2IrPt<Rm`JuJGpT)2Iqs7=DFg@#Wy95Ii6bKZyD4
zv$wZB$N&%Z#_6aweYRb;qR$t0UYYCT%qZ1rfOQdmL3otJiVlLBECdRj+jn}`abE9F
zVvNb1Z$<ppKo_mi$Dmrl$Y5c3ZT+og5M0$qi@u&$u%UVff)xJ0yN0OXmNsXqi;Kd8
zIwcBYRNX4OK*29I9v0&j_+ld|;I+WBI{11cMAez5iU;7O|6KL|2%j_RJ5?G@_%Mt(
z?bOXr`Mx(^JOIfUunysq=gz%w!6JYnpo%KQQH<~V%+HS<`mNvm)gS8Z-Jnfn1E9Hs
z!1{$3qA;SnyFyP-7f}?qS~>=VO0`TJN6gG92M!!K_A@{ABky|VnWwg{aw!b54%1!`
z=H}+`eb}=3H0t%nVv0BKHL%Xn(_KZ?F+MTFbI)xXy6+c%^3L76cRn5j0qtZI$Qrti
z`#f;u=wW<Mh-1r4ZH`)P;W&Ix72^rR!xKFB?AD?Ce(9$c;lJv6K6x^<jlepDS49w<
zD$`R_G#U}j)9a?yajH%DPK-GYzjfR8q5FRMr|;aoYsXi7-=m$ZwTqU&5K=(aS<5G-
zQ@7OTYjbIM68OcIZ^8SS<2@yg<HfSbEC9&*n(C76`C{1!BdoQHX`ct50(V4_O@k-G
zH^$(c%fQR}n&*>iNqiL%S!#Lb;#~M9SHhMnGdo+u7{T)lDa>^Sujvw1s8q^$o{+%b
zpMqb6j^lVmcmQ+lwbydrefKjmGP)E5BLc84;gd4y%OfL`Y~8wT=>A{+sXKQy;f*nc
z!4oC4ba!|2FaPqdyzOmo?Vp^g?WotIJ`q_T@TqrL=XmsyhdA@hvw41GZ0Hw$?#JHK
zZ27P9BIPBOFbw(N2S32j&`{;J+wS-QBc|$9Nu=%S3QBR{q*&qHE++_p!tC4}wb@zf
zjmFT={>+cwwP*LvuK<#6%*=JZGEN3?K@gaS9(wrWmt1<~Yp14ah-eBl1)pvC3}BI#
z&w@f;+JkeBFj`#R);N4<-{=GP|KfLU-TLgOfv(iN<p5396SJ9m;)Arz0Hv1cHP>8o
z>F@u+AN}^Jr<`$l6os@T*{vq1WX=u>w|wS#X1*tz4a9N0XtHO|u7kh%8xQ{Z)~#Eg
z0IE5#iA61I0QHtNTK8hWB?0gN9|(X7Ku1SMwWp{16jcoXzhxd^0Lj#oQb1ZIBxPQ`
zjWkn|B!Y+{B5rzmrq)<o1woL4)=U86l!Yzug_bp1_o5^K*-S`+VE|H~Nom@E=NWBE
za;|lSKxoUPWtuXVlsT!N1S6>@{wm~4^6ELyq`-TMW<d73XtuZ&gPPI*0b(lTvHmt2
QlK=n!07*qoM6N<$g00NnvH$=8

diff --git a/src/assets/img/files/calc.png b/src/assets/img/files/calc.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec76dceac5a56c8737bfda586c8d51d63715b841
GIT binary patch
literal 1200
zcmV;h1W)^kP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000DcNkl<Zcmb7^
z1F$Pe8-}0m=?RZ*|F&)0wr$%++4XY^YumPUZQq=e8=R9tGTl3wsmW&6+f{EqW!?`B
zVT=JlYyC{E&6AX}{6GKmkGXBdD?T;7GCb-xMBusxHU={zy(`!K<lWys&uC*C3`79a
z^<xZ{l=6^mTh{=n*v(j@;ay^p89CZGjQxT`G>??IYj>GSEntRc@Z&dqi>ItS@j12i
zjjv)NB9h`vVq+4Y85-<;zEbj5Mf{JVlG*-p{Sc>a`z5RX?F<$ap6~KR{WQMyil4DO
zzf8^9phHd<IbGxiw9z66bRp~nwQu)+vYA}qTb@37%P(;3yBO{*Af&?+HlEEVUiC}n
zXBKdLH%)HRl_z>4lcA}%f9y4kPfYZ`=rhZib^A`n>;f&_WYBpg?|$~rnVp`;Z9X3I
z7ytrL@A&x(0G_(5vRUM^7T_@649TDLb7meRdEz5Ukc>@$9P00(r<fD2qc~devCB{6
zJx}~uMD9J@SV&i{W70&10OEwGpebpiRyC{?pU)Rx@JptrX7HLd*1erT(yoOztymWd
zV_G5NNJcDmh+~+}cS>rTrr%=DdK%w+)sMoN&qNz~q<T3A)=p!5@Fn<RvQq6vW`<u6
zz^)^wGBNa8a`ph_`aLKy$=uMFQzJ^2x?$@PY@Ojpum35FbDh(IlnNn5q(j@L^P#jr
zpre=&24!Vqa#DK`K@}Q{OpT0fTAEuluI~vtt!jF*Phzm}V!T$FhPN8&K-k@l4CG%B
zb}&LK0I%sJ^M7y$|NYKi+KyxOy5onW*<?cnl4I*zQDO)`s8V<LaHMi001fXDrRptY
z)F4%76Z!0XiaZ7oLTMd2WC)QyEt=lqC_@8txPApU*v@dM1FSWA>F=8%pBW~QtF)SF
za^2}bporIl-WCK1qo8FYw2j2Zv@)H~LSGb<Ce-0U9V9I%IxGFQfTX%{03|ll3~H=9
zhbh%I5szq%a(x@NRiftXrI1}n-wAC<)`L1Q#IhAM=qpY#HuOwfe+^&nW<1mZ%FbmB
z_C1+AuLSGgcwPhZz#9$`+OJ+auu!dSY|(+q7~=Na)*7Yim4F052#MAjFi2sAdO*@^
zPwwd`rn*j$V19P|71^wP_5BH|8(Ts>lX?;oK>8`rkxY#RV!x#n)k?LI&FJSB3i(Y6
z43H3Yk&_~S7(fsNSeBqzEMO2+D%I8xfApQtUUSuDo3hy)QV5Zr-{T+$@H~&w(WBAL
zKXSC>e(?*R{lvu=o_B)ldSS8(%J+RTnQVuQ<SYZ|w(KI+-DA;!h^3U2R#*KmfAO;)
zx&FGVPmhXDo|Tur^krOr`Q@UgSQM6JAtNX(8S9};ki<gB*p@OXuDn)uzxesje4tGZ
zq@D@^(A(QPaN>!lp8dopJ^6)xxT0GfR~pL>(jyZ>%JQ*t@bjPk;J4Rbf9-KV5oiJq
zPzPKAv|;7*`MyG-Fdlwr0Sd4H35YZRFfjzprtj73^(v47T3rd&0q;IUm%vF5p`<PV
O0000<MNUMnLSTa59zxUr

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/chart-64.png b/src/assets/img/files/chart-64.png
deleted file mode 100644
index 4b8f85bd679568e00265f2f4fe7752e7eb43e5ba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3359
zcmV+)4dC*LP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000c;Nkl<ZcmdU#
z1#lb5(#L;2GrJ;NcHq14W5(mV$IOh!{4p~#Gcz+YGc(gMQyh+C86@q_^pm$#Q__|!
zXI+<^uTx#qf}P6mKixyJs49~z1Vx0x$4xkX;y4$-<Pwf`kIujJ2cG+-`(Co|;uGCd
zd40}70QI0j3a5y{`#_sE58d;)-18rgDT}?I|GV${)1QCUuGgW;6KG28E(Q!)gtECQ
z9lbfv!>a)q?aEj~BW>|%pY-YZ@790)`N=cQbtgI}B}@BcXEF+4FX*rh9(*3COP!_T
zUEW|`$2ITYOET{++*>>NV$E2~G&fAJ&4tm81yE2B0ZkJ3_r{n%2hL6a@5AS=t@XZR
z(3S@uD;AsAn7?Tj4hJ4TeUzT<V{%K#Ky#r0&(<CCo-&iP$j=zAZoi*Tc>QhcJGciU
z>{;%0zxd3`GKio7KoJxKf{yV;C;?PJHGq!GAgY8ILl}NyjbU!C^?3s!zLSzoDuJ2R
z)!u(+S^n%&$`tU@H+<jY-^R}#{YlpRDt*_7%of0!F=&Yb_`cGzEm}(ru5Mn<ZEv`l
zxjj2ZkxC=2W3c5B9eYQ|g(;`LqA~U%&}gLh&(F0kQl-O)IaSKmP}Lnk86L9^zwmAR
z!l|F6m#*N`9=7iYfI(3N02M`1+G&fKGfh6y{wTM;wtz3wO^nLn<kzv;^a~;oyzcN`
z>rfH^bW&jjkP^J*`;L7Jzi{R!>DHDBjXo}O1l6JXhJa!aJj#q6z%RD=aQ&m)@~T@0
z@bi=5%kPb`=ma($M^>Gj2|C_~LIAYFBsc=!8^E9V7JjjS@1U&=n;Fz9qJjYeVF({+
z$qcQNEk5K1@UI-e?|stX%Y{{G6~Kxcj{G<COG`gRH|?OaeT=uL1<)b96m5>DsWUWA
z4MyHx#Z8w#sUsi1HiaK2B1|%CYytnh3*W*ocYcP|b@+B4qXspKAhBm7kV~KyW~rZ^
z;X`sYH(qut^Xntec7RtlGB+9Cp<Vc%N57R{UixWP(lgM?Fu{U=2vGzCg5<QaHnrm|
zJ{Yd%hKmRA`?d*ud}p$`_rCYNBkRAXJ=50j`?eqCCr|z;KY#qESWT9Yy2oS|bqZDy
zk;2s|K?2SG9O=;}AIz@h`U|%ee2i5Up==<OY-fAto=^OZPq_V${O|8t%uk?m87?tM
zs)$>65DOyU#ZzCKC3$pE^DEbL-Ae}W`?nu_2!XVgoY*x#`$FIZBj)yA`*BeUzv5{<
ztMv(gY5siIsl`S7j4#%CuK_C(I~E|fIj#OY$>9bcTD_iYw<&xK6jUf1?pdFIXfz#m
z%(3HB9(?psdXnM#76pO|h+>C5WRf$J4dIsu@Grh)+rn=)54z>Y{fGeKw7pc%6OXLg
zxXCdX0s&A|0&PElKQe&tuEXCvfZy?yga>eqc}FxswdR9%gph$KAcCMpn~A3#+Sn5V
z`20Gqed$vLUN_texaQ7;$S=_EdO{{>E&v2!*wFx<Ig(>_KFW1mci{kj-%|u$0o92L
zxR4V~hR0HJ2ssFXLCMrJXWP_{)VazH;4iu9oWno5ct4^NKgok<|IR~LtyP1E>H7dJ
zO^q4^^*|=5D!B&ck~WPK4X&zP!}aF@{_)lO`KCYlJgl+t7H7HF;nUvmrChl8HPzsC
z`ew-CA)0^&&|C;PgrKx*Gc*?m@bzoB;qn3e-gBS!B8t?(IEh<sV?m5=4Sw1rNcqD6
z!3$ZYv}an(E;YHTbrm<ha!~Vo&d*Ypx;h8u4`Hp10<88|Xw+sZ!xK$6D1iXcM9?7k
zT$!mgnOz;g&tAn%uO7gk$0Mx>7_kG70u19y@G;i-%%&Njgb-+^bvPkhGe0=bzwV~<
zexwZ==w)53Mgi#MYxv+R!N*vqWIzZ?Gy|!o)J`cMYJZSh-*98R#yX!%T?n4leg_*|
z6kw&-!H2vuyed=8wfxNJPLS0TU9M_>Xi)PvFn7WEhX?Q)Sj|>(BLb}TSII-ZC3scc
z_(J6HBPSWsljpg~7rcAlyWhjky}R-1pOj6GhN1+>bwq&m67aq{JUVPAYvBI>w;v%|
zH(T2OqFoQ|IJomdgW&btz<>8&e>weZ4I`EUE?eb|FM2mu9(pSPfj}?sV%5ccKsWE=
z)mMjC&?!3sH~SdT`fJ+V@xt~O+r<8X_SK#X_?|5B???ZZ)vSXR2SBH{#Ip~)pb$V6
zf(EkCBjBR|S>7Y4uLwW=G6cZg_xpD+N@Y{`PifvbnTPxW<Q$~E2#HAso??vyAhqkU
z8Jpp=JR?{o3gG*M5Vi!*#zz6%1v@UFWa;wqno$BE=b+{xsG>t>xa^hh@RUimHTc-!
z)Mc<_3dlK_@TS}JWos+&I*e5++zQ8Zk#jKHPlwyYs>7oSv90#=I3Shb`?^e?XR&rw
zm4=-wCBT+ds0^>we;L|(+AsDO`1(KmJRUjy05w;ShnQDC=Pi8JtG^xqm$#;p=@SfJ
zQvU1&5UC6wcW^yfrDs;acz{8?OvV~#Qv}N9wiS5QDBM}k0fmcHt9d~%III*7fRzLz
zwtS7X)e5K%KWz;J3{$KMeA%`Rr%bcz@Y8!VPY`^C8D5!e=L%kjZIxxPa79$AEp?(8
z5oGAVFdnbp@^_4wv3W-TV<z<@)!}1XK>&2<Qt>7SgG(GqnvmE8fI)<{F2Vyimyk#j
z=ZPdF7~^6Ih!GN3JQoE>LW(hV3-H8N&sqSsw#g9@k|d>8t5LHx0D{R$l4NY3pVm@>
zuVcjmkVze9Eub+Y*88w79*5~u!&tKgc#SR91gL(V7lAZQsHHVhn*!h^$2m8)&ZkLA
zuz3`qMq0qe5->uVregxsv^X$r4Swpi_!M}l01tqeBK^}eB?@5jqAZC28H&$Chysw2
zVyz{XfEbcminAjEP(!TQ5<E)uvz!FuMxgRvW7X>oTG}KrH2_R5q)Bb;Ca2kGV3l|w
zB1tF&AkGs)tJxa67T3gMa9e`c;lFB=AXI|~axc_tb(*F{A}IjY7Xrj?x^9Jfb6o%-
z3g8vvTr5)`49)fLjAVf10mN<r9yBOfKSwoGEP;wYROZ2>E|6G*69Yg9hG2Y5?=1J2
z1d?KO4FHKZczo<H_a0k=#F@Ah*<8p&z9sl>ua9al1FJ9zR)hzr%M4f4-iM0Er~xRz
zW|H~%P(p*(HLk-*l(+!fo$QY=v$C5vH*Uci7qc*PJ@&fil;Nk&`azZ60KVVPICOB&
ze>-PSQZn&AP_o^f&gz|mhjxp|6Z-r7gm^1^`}lbX;~N%<=NK(K%QD0mjvYJl$RGW|
zZ@qJVe(rWvEoXpkI0<ZDcp>X&%+5Aww`a(*d^plMAT*ja@;qZ{NqOj@hYo-77k>5!
z|M!3Y`}T@kVUTSGkAfhqtgPT1?A>#SZnsyY_{vHT9|G;!CaQsxr<VBt|G#75tH0t4
zK63B9cmGG4rc5%UK-pukt>9zCV~;<IvqGMGmO3kRI%^d0?Iy+wM~|N3|Nrmyg|Gg~
zFI<QJM{6A$nPH*=+YnwAK?tgxSzM&o%NX2V54=lI9l*CRrhw=6JMLWg>aY5ukKB9D
zUH{;mWs-UC3*T@fq=0O%k&kWAP}F>9WfYzWUyOVK?@HHuN}lIMyZJJxfNT?Z9Xp;E
zZLgmdBUq&UWcU&AK$iJY@Mz8$LkOV+FTnPJkFSN{cNGySMm~gmL--Iv;nU14FLy9T
zu+}hwxy|5ptW||ZqlUE-;lE}CejPf`^J(zW%%zuJ%2$8&*Kq9E@j?V60<dl2QH`~H
z?AU2;zx|GdulcGk{K!26cw@}jf=7$Av$M1O{LlXa?|tukcAsAC+|})7yF_Grz{fYh
zhrqx6>p%01XFQ7|$4)GK`Imm~hX*77k8IH_L+khZ{O<4m4hstljn};9b)Rm;G(#i@
zofIo5XAc~k>GyUUhyW-oudL8nUZ&gYEquurf6hnmyZ7#Y00fZIz)GbI01Ob)G&TSH
z&;RnrFMi2|Z&_UIAfh9n5o*H7mjO2)`7$VMl=cuppr5U8Z#z8t$OFf}_G`Z46K=o#
z|Nb19A<9Dllo&_%rC5g^l`=pwbiL$~OJ4F_-~GMccJRQ{UzTP4C|3EX2`Uj1fU_R?
z(&y#%o^m!6wLNgT@4kB;{+4h4x*xjz_S^pxXikQWo(;VRbcfy>zLx`GC;%34KngSf
z>h*fF-JU(5swv=xZiiyYcpO^+8MYAHDRIfP)W)etL=lm2=FC#3*X#9xbOc&U0^}p!
zAA+w9y*GR>V<<o=6QURfAcDp=dIX>1l-nsH=q5tw&}HZvy(~gG^`jUuj-?`OY%(RD
p^qFkdPlXH^dtD)0!e*kD?PG`pFPnI0-lzZo002ovPDHLkV1k#Pceell

diff --git a/src/assets/img/files/chart.png b/src/assets/img/files/chart.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e04b2bc876e8f2f4c48bd3509ff28984e4bb85c
GIT binary patch
literal 1145
zcmV-<1cv*GP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000C)Nkl<Zcmb7?
z1CT697lpsfs%qoewr#%`*82m$*LGlS2G_Q2+qP}*czSwXPqVr+w<n`ICS$Ouj@u`B
z?z!it&{_kalv<*cp6j|!<;)AtjNCEyroGbhQlo1{Q7e`zjO`pBS{GXX##uYhctX{*
zr_o>nwDqSoj+C<5^PJZJOacvK@;$}RLPSQj6q-2d*F$){>vdGOOHZ!MveHVf+;SNU
zX3eELpKlNmh%;#B=*F5JF+91-b>;gqI1rDBX!^Ip&m7Y9KVBEl5Q>8z%d^s3#+6$y
zWA@b9bQdggEOIPzZQKyGnu;j}ZqtuVM7?M&>*ds;zwE)M@wZ4g3G%YQn#_7GSamhi
zCQhf|7r|1B?x#E$8?>Br*X_B6vE#<2N9;c=^ik|RQjr8DQD9ki9p}%!rcOTX?~w-q
zAOLsN86!}lvfz`<XTqt**(D0BD6QkXDRuG*e~rAchLynBCP1b~C5WY>LKi~hx_p*4
zujl;9*D!s;jG@Va*8I<W+VnQLN){E68Z-d}38k(IR6X)NW!9HBa{014`NTSTwFnGK
zZt&Uf?&p#>Pvgt>4=m*b(f5R<K;rvVR*2<XwDBS)Pn<%rI)rk|=VT<!nAA8TUc^>y
z_rQGackeZkB+1oV&SB={8RRR4A<4@+XVyYGLAKDzZ`q$Hl=El;a{BcEaJRPXV8Xa@
zU(A{^Q`bEgLwIiH2i^S-s><iaf4@l4FVLB9r{tH=%JRQ|1-G1hP47b2u3WLAwF(dA
zIrXSg!N)h_ny#5-N-JBr6&Mbwl%^gMtwn$GOr?eUKE0NYT3<64MDXhqD1ZU#&AhQM
z4PtfQQvPG+YtDP|L>~S84!dlNAh@drR?sLxTE_seZE>YXIyQ`0C~hi~(m@IdS{szo
zT(^k9RHLjO*cJ5m+;d%0sT8qT)a)mdN&K2`l0~8sv*&ps?DubwfCoDP_UkcYgzGV8
z!bsw&xVb!H^f0R0H{)0`&Y1Bd@xr0NcV)dGf$KQJb!1<HhWB=pN4b;u|Ma675gu>m
zJ0~AhM}<<FrOE9~@a8ZnJg2WG8eG?-JKJ6O?z?Y0dn*^UTCMl;v}`v2RZXdooyar~
ztk+@CYAW>JuZtxfkD(D{v)$DrjyPoZ*Is$yu5dVl6hhekHOTFL3=x>GTrShz)`pZW
zt!?e40}t4Dk7u8L;;vGuTu+w8tyC(6LSehP1{HwnMKkZO+;|QGgHqDo(NQ`0z<vMs
z<{Pg*Xha7J<c19!dGW;;MIs&-j^iLrxH!^`4F=KJtB1tQr8MF)ote^s`|tCwUUC{j
zgHM2Ye#7p*`~FAg%$>KUQvbBpB2X&&+hWg!kTTPishxb{F=xK{=Igfrali+PKn^I0
zAc+%=MpLm^Y;66a1GqphN<j1rBN7t=->;N&xm-680;*Pm9-#a?OS09Zo#IlS00000
LNkvXXu0mjfZJR*B

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/database-64.png b/src/assets/img/files/database-64.png
deleted file mode 100644
index 33d5043c19bd08fc8d9baf32d068c844aad05de0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4949
zcmV-b6RPZqP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000vlNkl<Zcmd6t
z1$5*%(#L<Y-4NysCd0JM%*=eucYDmt%*@Qp%nVDnx4Z+pHyP$IHMng{_4Rh_myTbY
zp81aEpI1+^+wS;RQb{Gbm57imA^y2i7Q@5CtX#E<vC+}=r_X)%bFW@^=E?c7alf&n
z86Sg>Ca9E#sPs*MN~amvyi0kv?~?D2-|~&?KKZ6UKH+&cV~p_ckpLjmRg_X#mLf@s
z4iJ$Gv^M96hysLAmSvGI7I@ExKM?f%>A>2nyN`Q9kS~x8z*h#3fD!>7h7!6`ceRhz
zSkE9X^t7_NX%SuN#=)*9p7jN1S*I($w&D-~BLA8L1XNj)PC0+GEcK^@c0d{Y<%L4&
z1G75EQk0Y-`_+3We)ld)TlY~v;p3qxNq~!wOF#jiJY@@tNOv1U&0ybfJZIkgXcjJ9
zh-KU8yh|CL$i>wFB1{ngq9i=7Mir14wt!T5FRI&?MN3Ql%Tp=mLkHu4x-$Gm-w&24
zrDE_FB^BU*@~;Hnxra>uB#omUo(b@MAK&<t&=n^XD-Lk+I+{7qVdLL)45vTy(JW}|
zBrcKUE*zr9U}NwSzfY=fM;k+3U3z<KOXE=@QlLtXF^0GUM5F~~fhQpN?5)U8*VB;m
zX$~BMdWGXzpcMEDv=1m0g6f>lo-T#DejTSj>n0YocKl25%nA?jOC)xwQed=c(OPFk
znCSp&s2W~>>2~Co8)?V~v`D%PZ)25wY^J3EOB+mQ2Yb7~y?zxZJnQ;@89vtS6I#3K
zNaCTP02TKp&OyU}<qpiRHci2+3?{3wy!aP_(t_8~z=00U#PusV>e<(@u%+{V3=bfo
zQQHCWnAcw_!~ePrpPPawV^Au*r229#l;&sI+v+oX?F!c1d?kwx3wS`7y$2|zm`%!7
zl$1t){x-~S9-?8g3{MJdKrB?M3Ot0*&2MB^gG>LFD_QyU%UImnb$GPANDRA%1C(u5
z=5GC|zgAklal)s?&VU0b00oW}RVy){>uz9sI?uk#ma*(97avCOASBDV;DQT?q=SIA
zj&?rs+0T;w^4$bKexMBR(PCwhj1IfK4OW#Cv{2}*XPZ6A-iv!#`uGd!Y3)Az;6-M4
zz@Pv8XR6iK-Dwv-_6IBV`yJHnpQKr3&~*XIf)IP!2?h!+=`#ETyDwbCl1HCUPut-K
zKUcc%bfue!RMZ~NpLfo4TkaZYwYCq@7&rvk0Luc4X(<$FMWNX#!{^v}!9teYbS^#Z
zv%oV4d_2Qb;loN;hp-+?hLlv*0jUiyk;NVGr|aHAm71G7yPh5VZ8I(79)3o!Jw>F*
z2`Uf@opo%ra_qWrK1*&qrwl)jNXoHMDGQ?o6&Pd&QFSval$z-tC92v#A-qBnv4uwh
zSPCVA@pUqM4LO!?5lNJCypf4)lW*`$K*}Q~g%cR^^BUR4L>Yb|OK&`v#bL`U+d^e*
ziaUlGzjYg>t%Fzs*i%qqOxXk@24f7OHRZBm`jNVRq#iHJ7G5WnYXuR55ur3ZN$-uP
zv+`*d5#)<W@L@e+3`jL)s`wOHqwvru?Slv?HJ#xFhRKCZ>`-O+i+fpi(|JVjR>r~4
zxeR>qF8s}dv>w|-_q8XG>8J-MOqGSOC8K3_RhLJ?y3CAw0cMGDry<MsU){yt4LeY_
zssRs@5CcwKYr~9{o|$m*B)}>gT0(TNd?DA<!p>BVJy$Ge*<;S1hR-_WcMdb~k-yS*
zOb-j*ejQFz7V<v$0ip#l21LL}1Y0po6vJvds3oGQ3I`Q?@N|ay?lzRQ8xg4upO6hY
zzR^reVbHh)C;~uGT9r-XEpBIbU6K9QtYUe2s$1L^!l!JC`^P!(zCY3P*punFU=55E
zk)b>yQh`?)2P>NaZNLbKpbI6W<O3ik>J_GHElfO(0~CaVp6z9-dQvhxVUZXDKC?Rj
zJRk)ag6>ZCHF*qNzlN1hzGOPdQ3_)W1E08sg;yU_ftSI21yU+zu+k2bw>-r7AJ${i
zHh~yCw@BBOC(?H8N_5T*dqN0Lbx4pX2{b}&cwz4Ea(oQaQfLfC0t^9yhOTY~J2ay=
zt!4GoE}w=EyZ+!W*OO_?(tXv@MDV6;NN6aAKmA*V|9A(Q6h$<XOpqHMr0tV0K}Lg_
zV}ZyNn2~tnS1SxD!cd|Xe4?BHQ-!ba(G>>-xHuhU_)aL?xP~L1aW#utJ7)}-f$Nj|
z>sFRO?M%q|AcBeF+!&N?;ce?j-?^81+VK$-0S1ThTQ=hkjNm962?8X#Plpd|60$cH
z^7#f3sNM2&%JMP9t!PT<&KCA|*^J+K1V`R{%}jVeITraX12~RN!-{UC=wm_vjH#HU
zY)ZHEVdZi-q_F`9MVb`e;0U94_hDsI7*8W5gSZ;;3_Nn|mn{fOzxvo9o}Rh}L8uKc
zb2!2ZFjSjw0<5-X2D?(YHy*|DH($@f7(4*BMX7I)x<#!OXNWdY%TJF1UV!)ehp@3x
z1k@k5gmg~_3WGuz_~U)3lmiv;vIV9BX&x!HE}KD&#LP^c52nYATJX#n0#X$MMxmTE
zgXsXd@mNm1`BBVI*vV0rLLZnU+ua0#sT#-xV+>ddvul{(uAL}S2zi<xbqaD<A7i`s
zV3T3^mJO69CaZIU3Lx4*FxBEjy+G^8$rX6zd59PUYQWc+1uQ#V)u=Z6OZ}v-Jc?5u
zcTFOESOW_(^O`}M>6X`104kHlyKO7}_!x#1l&${ERh04t^iK@nklWqQ@P=)4_4eQo
zjAM!(;(Aanb-DCCpCItDltns|#&H~s2nw)T8&DR2)PxsF?gh^HmVGnm+yg_L^0FJ5
z-`Ne?)LhkBX&a2pnEDWbK$HLDMmz+AkF~Ue)Zz}ZD;FZ9FlaPB2mW#&9XE7P+I9f(
z0}N1XuyNZQe9OXhg~IR{`E7%=Wb0{PIFJ6l`|x)@gx%c+wp|0h#$ssmZ|^6P*1_be
z`3v_h=<I4oDP#_KU<#P&DNjO2U|IOPN67u7j{pcL(sb&QN}M}s2YX&KLH_{Yu>aQe
ztiJIAC<SDXT8wjiZyB<!(&CC~pu$8BZ44<amZxn7w(R29ANnF)3zuREwcwLO;3fL!
zRLTEj%M)K&XJ>w05K(il=M^GRdP@jDb*xf0`M>v(9~;IZgGWHuX)7r8?FT;~yS$5`
z{=FD%MmFzcba;r~r=E-5+s<rKD6%+gd({`1d|*3`M=fR9n;ysYuYEob-}(T7A4KT0
z!Oy)V_S@h8o=C<Rj$d=sT|sktlpttNhM&G(s#`xQwPxf`_fx_L6jE15cGUv(z+?rc
zY1JaUJMKXP9!2*2eLc&bbTM;j>pQ-|fnVRnit8^VD7p-M>CY^B>!Z;-hbfIsR;E+T
z9Pmktp-V2hh-wLt&lN-PWO$g4_b`d6n6fQOyNBt&^PdDL3`LrcUP`LD9(UIWmTl3v
zWFDk4czzLs!;atI$?2|#lTDK(wXlN&^Xph4f@N7m*B1V8AFA$D>{Sa9qlv?Z2gxCz
zwP7|1pyq-Hj0xc*18_A%zkh)7(Lo$C7+`GMUhaC%CkP5IS{Zz!@g%^<AXp6aZD-$|
z>*+oBM3S`f1=ljxWN~0qKfSAZX}Nmp+CW*P+nNw<W`!4-I}vhbg_mfuClQ{i4UXt0
zJyJlqhW)ocKoO4=76KH9h6slCqajSVG#V9Vo<flVn}6}QIUS%Jo0Fe$9olFtWfARW
zcU^rN<B|+djYP;ISv58=r&fZ3fHvsi0+RPB4vw<-frs%Rd`s*yNuC0J*-8{CQNSZ#
zaZ!LDt_?Q-=5|b=sU_R8L-_DG(0C8+L8YBp;lm@6<oy5Os|G<M=ux)<Z)Z~UZ|Gxq
zw4XFtgdz<+^XNHlE&lK%Moh)DF$BKP){UF+JRh*xw_!7T@7+YtDMxcCGC3E$a{#ez
z5HAiNb$}WnkN~f0yrnfpBgTMli1LALcifAMhry||^V&zB&50LZK;fTzrsC8K5I+Dn
zU}(6XkzLzS*c8aI>6d>wWC!FP+=?`0QDTr;;f1-T0gITF0uE;19-;+Gc%Py$G|G+#
z*W+X1;uByq@3=L%I|uOH5`LkGS2lNOob-}T);;?gO1K0FV6*90f8$VO@+Ah#3##-9
zD=?l;fDg+<9|NT3OAB3<2RNw|JMQ1WzM-ACcuX=$dU+@9^XK7D6hHtYl`dO<bT7?M
zIh%=H<M;%)6wnAe?!BKq_ip51we!v2z-z20v#tm6gCzJ6<&Yh~obZCeR82h?VPNMj
zTDup~+PjFRj&7Enbt374!DtP}pv&-$r>&y-acA(y7krl1`SUsY`pfBBy_`iyt)ru-
zhkffeb1>TTw(oM+2fxV3i9Ohs1(FOOHRZuigW;bNHRo?~suPcr>vGzS*KpdkS61TO
zcrFAQcSk>13X}I}x#(z|lb3VLE56L4vyWiylg{H5^O%|Ic@dH%uFv>i*0b{+-!1o+
z2RU%&YI;Xq6v^-a#1=#~9e{+U65s`tM5%C?|I5@AWx^XR6gt|#@B&(|JOQ(!i@V?R
zLsmWNOctMiGyux7P|VcG&+cUBM}9(jSvT3XR>bou?ipn4{;dpc-^EB;XgL2UPQLt1
z#`=aak_<0Mh;zu(pql$dr2?6;EiK`(A$oHofd(VAU3W5mR|8wV{ukCg`Fz@s=mDs#
z|98CO+oW0=XgqQ$b*mQ8|K&fh={?_JVqOEy+xFs(=kWp`ae$^evd1rHZDR{dSFgh@
zhtTlDgMcK$BZMZ0>HtAtR`{@}8Us{lRa1#JDBGs_hU4)YQXKg6dR9H|Z0hH?5y>AI
zW!rcDf}2SrlLc%)z@5k=CoN@7`#c)OCI|wI5tIVkcFJahgs>tBQy%g7uh9dNA|MGq
zl!;PMRo!V67(vyiX}aJDbYq6xrakmtaT2M<EY&I<7^S|Wjb+ELrI;^}&*gCgk9lNp
ze1kR`1=vbK*$e_=rk$*)36BWOwHi!neJWro`Tcy=R+Cc9aDoJe><K;C3tI6GjL~_*
za;%ii`0WqT_ma<%ncqsLyRG5?CzB?n1=}bZ)Ae9w2z-sP1h7Cwt)Wnlm~9cg84fik
zeDs`B?SYyOILIF-NR$U?Kug6`xMQm_DHKpYuO;*l<R9M7&fGW@vT*+vq*!9f>ZM4&
zg!X*Io8AB=-2KHEA}PzlL{nbLuO8(S;iEl@zz?F;>%peN3N;5j0>)@ig1x$nY)2N1
z!Ds`%##z`JOD&=4s1=;_&YPjD1+>A4(Bv7izF<rRb~?M1$YSHNQXoQhK|6c<2d1WC
zR5H8>rILprI4K)rYCE8M1(gUd2<heq{_(CK@bC|AM~s>Ipn=RhCxVqtV>>ofJ%m9J
zrGOY{k|gR4it$amX+7^q#F$y(jR+;zqvZK4SkSrNvF#CTW=I8rj;{sUCnk!0zVElA
zR02GpKo>pS;Ymbm1QK3U#vK@6u*7$C<6U}|??k|WC`h+AV%KFr1Qm_=W(wZ-1C&yX
zjt=en@CV<0@#yI2Cfl~-JwOttK$QfKfT8k_8+$YHmy>ajSyyI~^bSv?>RiGG2MXW!
zX=<vYslL9lq%M{GN~x40TbCvX0>;O3?AW<;;8m}D(RCX)tlz{eawM^rsoKBBG8)k!
z2mgvXsbyoJ$*VerBA?IWIMCg`0N3^KN<R65i`J&>lzPMnLqp?i*tlu%O>cO`4coT%
z-F4`zL6HRbSpB~UA5DjQ_wL5A6~3>Tm@F`vpMr00uE(|&{R6{nEW^L~jTQLYm_rr<
zv)SPZ4<d%Kv9U^b&*j~U88ZcMS&IJtN8leCd{Y^I>z2M-sUe41br{0O5-_*qlgkzV
zCHUkJI1J$hiQoY$JwX49@Bo(M*p!X94mbGtiVme{YWmmU0j%Hr=C^Fvu(9F<%TkCO
zp76rV|6i9)W8424Jb-oi<(F~73CHuH4}A!wRK*d<;RlZhRHe6CYx)O9{v~(-3&8h%
zUjFiz^Q>n*t5UaY`>=zLN*(@OwooWh&TVSIAL1bRg)e-8%PzZ2f*>%KWgT|#MudF6
zKsK9YaA<h&b+3KNO(DFB8wV)|pz0>M?Y7&-_w3&F;F`5ZUNAYCLlMv6lk4$(UWi{e
z3mDYg(FMU6gYN~E(O<-jzVQvOe0Dj>xeu7flnfwI8P!A6Q9bs#MBrBFj5NTBC!ToJ
zhd%tV5B4nXJ;o3G=wda?!bVlqnJ$uAJ_bzfn2#Li2O1q{)z|m%p7*}z?VsGVY12JG
zHU_P$fCIn}tpvD0DKtO)+*CUt6*`~}P?=1ozNxWsp&)6%5wM9&uoPH;LSZF$!KjSt
zDt?amf*+9B2UXrslFLm_mP(!vI1zlzbld?Ud@-~V;DzT+^@CcWMW7Lw6&=Sdf{oRw
zuE)!Sb8+aTbEZ06XX)w^cSe;3u^tkJK(bW)xCVqe$nQ89NsVIwso}hX`40XMy#x*V
TXzIVq00000NkvXXu0mjf?gV21

diff --git a/src/assets/img/files/database.png b/src/assets/img/files/database.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e9fd837ecae4899b59b0e273e682e3893aa2ac1
GIT binary patch
literal 1416
zcmV;31$X+1P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000F~Nkl<Zcmai#
z1CZ^^7KOh~I+-)JuZ?Hhwr$(C?b2U<wr$(*-m&dtC+Y5&o7AN8_^+yO;=OjS-Ze)U
zV*pS}-z(&dbfx#vSH3NCyI(gRHs06YlclDzL5=FsZm0jksXyHOB@h2ST00mpkoprJ
zwLv=4UU3}xT>zoACNvqVR-1FCMYcB=cgei$8;GCJQf!pjA<x>qPIJTSUc`~($7z%*
z7(<95t{omDz+f=iAS@B|^>*FZvc!}WLV&@g&2^h|+t{!D7VQgJbZ;lYUVwj(6Wrvw
zr!zD<5*Dv=y%M0ckxHqI5EgQ3ZU)(wp|>EAul+W?+jSV|!cb=Y5oZ~G-=i2D8p5wP
zF&OxN-KVY(CGU5OJ8^FO<lra!AL{fiS7Edp9Vlk+G(h`X9>mbt2!5r35r-d!N0FFB
zU<m+BpyPK^4)R;~el0CZ+*$r;0nc)g+lKjjkJI{&htREBDE@R7ry~Q7h4uoJ@1vAP
zD-~fdH1ZYPQ^Rzg8HwJBR~aL_#`@8fy2$G)L8Z#h-ACyTi+5FR^ztr4=f)5iyxjtJ
zZwHnmF@XXdg@P?5g{^(Ivqd`3j$)GTO@vjZNzpXe^b5@0?-<=5dpv#Z-FUOR4BYet
zvZsyghkwXFZv8Um-}5EVnxIsRP{leyp@y#efJp5@Dx!vKXyCE;fb-nqL(gD%beQt=
zHf>?IMr+hTSnT@~bo35V{M|IoTm>o~y4H*`w=D}*uR)I_iJ!y(Yw_1pY_IL>TfFx<
zVewJ?x`(g?PG<(A4BpiZyp0@#FM9x`)jbY=bp?MXM@==z*9#PiS$4M8@l1fxarZhk
z0P^Z7&4uG*KOY+%qtR%BEzt2OL`K<f{fTP7WZ>c$o;0jqndbN_9s&ZqLWPyLexAOY
zoS-?}iwaa6QL@Vd`Hs(g3}Z~TRI2+J<6uO1&>;dp?0o4bf25ktvHSK<kZl&p{r+#<
z#`lq~gPn14Z+x7=3n$21;Asu1?g1>NG$DYAO(9-EBjDf<vn;O8!|4Hh70@!$!|K8u
z+kc+{hzw3V<({<O;uLzngi$(<N1MdKB3APMg+l}1F!Sr*u`9~l=xGn+cF%YiH-FwE
z$x`GmU-&j@Rj1df?B>C-Q&SWpiIvU{tu<b)$+4T=h{2=dWQ0v^w1dv0$9T!Fzl__O
zq4cM@DD&$4CR3mLAwAE$KSPMP`=mUHK@t%VFI5E`J%5(q$T;dmH`b{kGSXuCgI_0?
zFSGK?37o*7{D8sRUVyeXjE*-srSu98a{{Fm2%?YW<x$#iIL`K0f5U88v~|5mt1`5o
zJ^_KkM&R{yQc^xT9#e!6xUPdE?Ucdc3be*<aoAj6!wHXKx{S55Np+`ycXSB*%n<?|
z#h4WHJs&rd!Dx-+y6o@m?QLx?@3dU|J_rJgF((Se+MHI}F&Gdc$~T?}9Yuz10RnAw
z2+5uWet_dxbhNccqrJAaUU~L2pYo8u|NSpN0kCY_P9`V@LZiq;T*I;u(oO~;^4A))
z!P3yIH#pec$F?1omsg5Ud+OsK8W)dc?e6X&r46Yc4WiCdB-c77Y9u~tt+1tJV`HQC
z>}NgY(UTKbeoRW%rArt2{O7+wXJ;pl<AylM5XX@rPK=E2MaUQ@I!fBYXtp-DicfvY
z6CQl^%HMy$zexb}^z;mT<}+XT_UPF7Ip6mKV~j9{kZ3jHZ~%0Cog77&UpAW!-tv~$
zzvaq5{`PgC9q@rFPyrf(*hGe%wukf@V{AYIHedlFMOp?xDdmN#0WJ^_8`OzSn*Ri~
W)q9NexkBjx0000<MNUMnLSTZpB*2;g

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/document-64.png b/src/assets/img/files/document-64.png
deleted file mode 100644
index 0888ebbbd8c668aa57328aa9ff7d347186f45f80..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4876
zcmV+n6Z7neP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000uxNkl<Zcmd6t
z1&|~+vaml@RpT%&uVER?Y#(`#+4$pw<9kfU%*@Qp%nWAx7|gs3!!tcSO;u99T1ADT
zyJM=i?;UMM<VY%*oiCNCOsQ6h2<alU-&e|GW@d&>8#gjHKcC(8ukZTD?dM;9PI<8$
z4h<DiVn7=(0><`jE0IBYiu?9Vs2hKCSf+0J%%|V;=KuARe|p;AV2tpm5ph40E=nmp
zPmw061`v^5TAK&OtpeObp65}mRCxQFUmsmHGq!d7j7$E1tx*F%YoXB^B5lEyjvz9a
zFd~-;FqKKx^pq%$t|!|&Hubj`ul(@IquE-h#cPMKJ^AAdAeLWAHWOUydFrQK8z2UM
zR;5yZ^K$n*1)d4{=*<zI|4o^FGYizn;28^UmGEdAp~47VYcO2MP|(v{wxh<AE;*Og
ztJmWD9!s@|7@qcNlLX!p0HVZ=9jYa4!*-Vd5!d%UkAZ>Wvoe|Bt=$-)5X0XVhS5n%
zDVoLi6e_Cmmh0#E%x~+=)HP+v;)_PK2Hk9gkf<IpmiHMv3cq!Ur(ALlL!+yg@wPM<
zcBsq3y0Nss=iu#F8$+Rx-90$ayHi9eG)Z8Lp-l=RG5~4t^L*~+kl6?-L6M9Y#0V{M
zq7+(Ste9h1PjJbGDo=gfISl@h@GJ}O`c9<nQKi6WGoZE3i_mHSjx7%U%{MIYg<B)0
zLq#RiLm(P4o`bio0xgP>zJTHI2$!5(=BbZ9i$5OTxqZjkb|YyI4Fy((t_|Se^-=f|
zU$`Y?DpXW6MFNb4$1{L40!Cn@=ri0n9K$d0)JLAd;MiXq-uA7wOVG{Czv=n~zI1!U
zbmURb6bQrs3X}(cBt|d-!+DRP`XMeoah|6<{M6$F-VT@d0Hst4JSbha@L!JMr|ODY
zrihPNa1oo=!FT{fN*Kw(VD%uEuAk*858WBVuQ@(uUZf4XvjObPn=ppIZk{jQ7BbOL
zG%|$*9&FQOgh+dgWexq6!(6s*h9~XX!QlAu0uMsE1iN<aa)T(+jEoHN!S}qI5Byfg
zF<)oW!rPfgEWc_oLTDt07y6fCw_iKOlP=!Q(D4YLQdI?4U3C@BGCn%wzw??Y?_2wN
zn5Y`+*`kek5rtB;7$G!@v5e3g!(X;`lD~h*@d@9l+z)d7qi&!ZRo3i!=0E;?W^nM}
z!XmYxh;Izy3CehJ>tT%mL`E^5G4w1Q;EJ_J_`3&hTOJ-z4hyR;l9Fr6vDj;NZ2Po5
zXJPEv^}B@^r>zoP`MMvvfr9@2p^<0axMz`SQr=>LZMs7ltPvsuE3y*9ALNQP?eLHZ
zJhHyBWp1QRVgcpg?Kr`3V>j~(R9i`_6pl?LFW9wM*>}Q7ARWG=1Ul+zHb77=*Yn~B
zC=((GF66BdjsgiQa!270#qbj?@PY4<^WpYGC4O-0B==5M@PNRxvEx*XRS;uaOmo|E
z&5lXh<X!iB=1Mgl{lJa<??-K?Qfs8aC;gN)ptr|&0}GnXpiBjcH2AG<92ywQLr?iI
zSFW4jZ<}JikoB2ftnsd&?B?F7Di>`Yi`RrTjP~WQDb+c%o2Ue&Ip$k8J<`57G>v--
z8GdyA-Q0HfVSHb8gtu)<3<UlC`Ientxvr5=qqN32!zc?sUQqPKZhz(a$ryfzgD=ML
zw;x>KCEvV<hiqTLvmSp6xokkWE;O{ANsNfA6paxFXAs2L>qzp9$gx~lk@2#O4)xk_
z6Om)Xr&NQ1o#{kG0op(mL8RTYp@9`W9(|RA{I3&d_`8c8Jh{N*-ibw?|FygLk4J6g
z!Q01~C}|ez5r_rFU~HRseXPk?B)Mk$&J)C{bjn^d8lHQeRCvdm9s(GH6K4R8gb_-F
zNMNitpuZZ&{7G~C{lz<7k>e>vBhtL`+xPJFi#PJ1ZQ~p%MR+Iz1zN<aaqt2-FsoXN
zI}uVO&$-r$T}YGr?q{f*eLfvtaG{lE0Kth;pfxIrPz`%n!RTOy!TMn?->|@w9@bjh
z7qT87xpptBM|yee8LQbd8&Zn|m4F8xHXFo%E({uxP_8FoVGPBLpLm&2u7-#;m|Gw0
zJ3WN}&r>ZBp*A>Rx`IzBg^g+AS72-ipz94r274I}C%A0WB2Rw!>CNzV_Dj`}pWZdg
z3!iujrJ68X)%^W8C#Y+&dj9Gh?|sx5GvyFtppfzS^e?9P@O2aPdWLeT#>+1|k%yf+
z%H4;Sc;0(|&tj==YY$>Ip&=W<$6onBj0%V%<5H%M9QOYh-g2M~tt#kx#7H4v*i3TS
zh7wPHWDC5@^}pXYPk$lHiQ|1N)iq;9pKRc<e@U3G!|$g<%ArY4WuOrme!0J54K-7a
zn2q(fdlt#~ibiOdFNe&Q8q6)m8n=@(RfhYr3=QP$@mZt|Q6z+sA=K^RlnyT)4B=r6
z%_@<mKc8WU87|*a=E;vavmM@wuM~G4TI8g$UR#i8BlHBYeLM@kBA@k`sTz)yHD2;p
zPRD?|XB!kVo=si3tjC=Pmn@XlLOnDVB=9|}Muc;AjG#pkHVjcHM3FUuZJi5rf_E3Y
zFo4ABc^-a!ip#cDdGh0r9%HRqwzgLa=9WS>jQ7xpT$*FYNCq)>9iZGW>|Th7dGQbn
zKUt3OJ(YNoV((;?*>c0y5zl!1$y~5=lt!ol!BcSBmJ#+%RGFEtGci-+@N|ts@jFN2
z);O@v@Ex;&QJx!kzE8PykVkK=#nsh$sqi%YLqo+(lGlY$!`7jIJOW0L$Z&5Aea47l
zwia^pks9^L(1SG)zJl4s2K%RKb}_tQ+X#2wH*dYk0HcF>R>uauWACE%5R^5%Wyxd$
zhJyr|&hR4XUJ&fxJKqGS*n4D>fB%ou7>(Uti=@H3R=}mXdL*px^BK(&18bBq+&NKa
z$3uqMKUe4OYi3XuB*}pW>J7s^hs$gn?O|_hi2Dwd2|Q)J;PedxsKBROiR?Oo!llYE
zG)Mqeq$7Oi&Crj2c&!^mp<Wz3X~V(M6>EmAW9VaVX>Hm<T!lB7^;qBIF)?2!Bf>os
zRY0+BD9@q!5MK-!jgGYKD-rHGu*B)>`k5~^m@U=uJ*b76(>4#q<A_E>V*=&2;Ud^Y
zlYD~P1$=4<Ed27hG)cJbq_;mO$P~VZ)YY-zk=Dx17(?Fo*gWWS)9#3ZuQ)VUXL?Cf
zu4#5pRIO3`SciK8W@baOp5os9W#l5m-pLY6mC&Z+jPJ4aq(Kf&R_y9;3@%lR^#JXV
z=nUWCNX&YG+YVcREj!Nm<v>o)MWGCLgtzxh(vlQ5pp~$7B!jQD%@hkI!~XdO`=@J^
z$_<L1VWijR%Ckmz>(_UaRdD~IGHXWij12@-YY}-L#s_l@59Z@6v4Fw>x$}s6sNF%Q
zAjgJJ+YCMI;SZ->%H^s9PlE@yHBI1c7})%LVt<CB7)%2i)sQ<5R&2VHFeJjTer<tE
z&Kc+3-`IoF#=8B?LIY1@C!wK*t=os=wh^yMvlO#giiI56z(*-tSrRs+)wNUL-5@Ol
zv^J@q8C55E6c}mU!HKX~*JKn7XJBG6#EUdH-aXI#M=E5+(5Qv%TwUPo4Fjy|&v4*K
z1JQ<`{Az+<-#KSX=UOGQ@&9*^+`vhzdb$4hN4WXkISwsq3b`D;#R8Geqg*7W!rMkV
z?giSV2?j+9eA9!1tKUmC%|b=nl6UK9hJ%w!6g}apo2Ttco)cqZ_pFoq@jTeJrpWz!
z=P3k=uU)mD(qhA|36TdEo;C)+15aH+tkz3@e%mD1{^oFOj2X&HWr`|`0#NDj$2t}c
z=p>yFFx~D>8<>v)D|Kzl)K$Y-9<sTg@Bey&V&3QAL<J?b9;Pqjab|1)fU`FA^Np+a
z5fpq5PgU?lFp*(&AjetThG~}J{v40KV4c;&GZlV*%OqF-VmG!9(Iyo>8Fg!b?%@G<
zq*bbFYPO8UuGlMwvYdNz9~o_s2KbWX{CdQul|?qL>H*;F&4Xl;#O^0;y%BM49RKT9
z^pGa2Mv7eWkP~^rgHB*!u}WpBf)PPMJG^s%&LNNjuR0%HTX<Um+7`PwWjw`re+FOm
zFp~EvS3;W&Fk%<PQ`Yy`eFDJF6Z;wM%TO*i@RPqhj5Oz;Iz~6*d5XTC9E+tgN&vMS
zywE8Pc(jRfX6y{F1Pg^*1nn-(eihDTyf_SUoIH}V(1a005vCq-ZanLW#Isyv!|Ec9
zdIZU#XD0Bt==3qVl}e>X6h)ojZJQ<@sUoTHIJYwHurUd7){f-exy`BTdkL)pG}6!%
zd^l(G5Y2M>hC#wc1SBWU!v)URGE6sO1a==RSx@K$pP>Aq1|SulgwWLi7GB6_6|07_
zkjR-E`jPn>rG;2$D-0KWww>5Vvz)zc7_$^oinTmfW6KHstQ;-SjqE#I;_6@RBbV_z
z!MmyKJ`Ey?o2yQrtDM_PGJC6sG8D7UrabP#RebPe=h?k~6d6_y=NanD(kzd<Xbm5F
z?E~@b2FP&grXiQpl~Qz)pWl3deFvrqf{oV0mV<YzV%lb?gZG0<g?E2stnT@B!@1Vg
zdbGgPpSXcevSK*T(=Odaleo>!QZ=;eN+B1}*OR5)9>2R|0_o)T;O@&Gz6PjceW-LH
zU<8VJkMV&F-HL$qiWqR2|BDE@tWR$-W4Fb>xOI|`eD!wjxPKNBnOUfF$L={>9wU+p
z@93r55NLJ!RCp^!+<D*1fvi0bY%8TZn^!@#8d0f*2+&)|Sm?y{$!2`kt?XmvXb-~!
zIf?~m;J6|@#9}2R@QVnf!6*D3c7q)wpcA}xe`8yvV0F{tM>4xw+j|6oXOF?!CGb7^
zd$V@7=Sp>UA6&FY<2^Cxnz14ygL#xvHZ`8Ptu;0N=%xdlzGWPx8Xe&gchPAV9w6@E
zZ+Uok$*%tW1)q`Lfc8^kr3}@&W}#e1Yq6klEZcicVy~|pEiyh*WOkv({rgM&^cM&1
zI<RKEhixYh#rFz$iD%rqe}VfCEpo-hYq<CRLmlBQvu&LPx-dYO|2ZMq2HV&V{N-o3
zujtW}53IXR&sA;S7E#uv$A$`t%VWh;_8ida8QVs!NBsJ>$vD*=;P0QXm6O*F0PwAA
z_AtGm<9D+Ou%yAe?RpeO?(DM5QdptV;jL(G>{;E)UhkMC>p*YTY8V*~O;zmSNEj`#
zc15rK^3x{POE#Y{V6{?<TD)fC`az!eq+znEYD29fe600)!`=@vKE`xm0BQf(3hzEy
z4fN%B?`M9_cdx$7Zi1Y2N;?XC&m-9$SR;x6>2KTTO#&l8F&~i4c-(Q{4Cn4#fstk5
z?e%)CLA?>OYSrj1f$z`a(;_O0bbAUKE|seHgkd<0Qp>`NeNL#=G;@nJyB!r;j>}U%
zSIM%wHE6%r`i_HZNp%XalR!QfxZ?}KeTO6rBfE&s%}pPA+go1u@VU9U+kM|}_W(&v
zfhq+a1Y;nd4_H&^b-*3J&!@nrpW(G+oR(ClP&C2@eSJlGdwT2)*XtpTMreWag{<8m
zEzFnMvv=?0bD#5Xm)v&iEw{6b1d<v8Dit2V9ikdH?Di9N=hIv0xT~}9OG{;f07ggF
zP^&d)#PCa%8d@7`6fwf|^a8iucKg&zU;OOL?!WJzU;g2{L6KB=*Z+&cyV&F4!TmPt
zgrTOiSYdI=!qeYhwEK>U$r)~o;a~O=3x5M0#6w^iJx<|4#4tZUZ{5ATRI_S~g}2#e
zV&W+L9aArj;qSZmp6f}M4r%asgl{?C5^D9(9^d~l@M$4%T*3?D-~sCa`j3OR;st?E
zthCDU2cOWl<m<k^KMLN8_x<nxfLm|9%^D#&S~@P_h1P$+kk8`#e-ykG@6nHb6lb1!
z25)`qTWt=t-XO;tynDfww_0l^CTIUBc((?GVaT(d^(>z8jAz)s=ljPSylb^F7$a0F
zb>iBld-!e^!4H4<!#wIykCG^gjOTgB9lVKkX{ka!pJ!@%X6l76_>U_Rc(sgnB>`64
zOLD^vH!K|3zwhQPTX*bQTr8v7>-6-#ZQD!Q*5@2p$5Pj|Ev2_1Y(#eT7cp}$dGT|e
z85cRf1y+C+1Bh!~->P=~*87rx<0Zz(0-SZ$Sv%kQws*c|-P-l1hEeDah(u`L*r=vH
zxF&7p+kojJ=G{jZjgGXs=bk$cyy5k)de7~*-~MYL-v+IlfFmGGv<}p;t<^BOZ<-B|
zNeoZ`R4$h*_VxCz79^YO8GJ}o@DzA}LgA&kple-U**1OatK0?GwwO;zxxBbouQx&<
zaPY0F+YOMwR}-xRjpVv%{zE;h4%C5pZrrL4ysghNeb=U3YlTj~W}3rw8CRDSV_1W<
yc!&#ubWzKUJ3*+fen)pAoyS(BlkvLz9sD<5m$&{S2w`*p0000<MNUMnLSTYP-<v)F

diff --git a/src/assets/img/files/document.png b/src/assets/img/files/document.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a4bb8ba55a20e85f897e503c0e0e9dc7df23ffb
GIT binary patch
literal 1409
zcmV-{1%CR8P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000F@Nkl<ZcmaKt
z1C%R47KXp-uIlJb-tf(2=GoTrU~SvBZQJ(l;o7!s@3XDRFzz&}wo{$cC(E1j_ig_F
ze{bD75ylt*;#l7~!Di2s!HeJU?)>k~&F()jxn`JlCyv`bld`V1RpcL@{ji(=UTc&A
z5)2+})&{AhdqFArT>zoACJ~u#wYsPBE~S&RZJz%9Hh;d-!T245<u-SlTIK_f-^sdl
zGt`^i-uo#4df5U@@23sI5z**Kd7tBmV^Ro#0k7l<@5r?lkNrlCBg-zHr|_egyKSlQ
z!H4dqGP%l<gW>;%0IiLT<2WybgFJQO7{#1ofe{{`kRNO0Ddq*8Zp1w+H9l~^4NOd|
zve(wL;eWf&uE|2)>^660X2Z6L@`FF14%d3*5JZN%3|IN!eP@`SnxxSQv32%|M4!Ab
zgCnqaBin8mRFL<2)pv*-b(<eu(?}80_TlbhbA04}6}oZ--}=W5h6)N7u<NA_CXV}A
zTj5&6XYFK(4Ku?8VVoN2Lslk6X>}vv_>1^)#J$$^$k(!@3!J;r;lSo8A|n8U5`u;w
z;W!RLfZvU+b6s6xVY$Y})x(&~y|IuY2%sAgEVa1TrjQRma0~gN5l)<3q%bzYr;fI`
z-{u0>mb!fJ&?2|rTINqj=ebdBakHIcY}+(SClM+-BCRSF$ih(=Ob~I`nFjBB*hZ$3
zo?o1Av3jh;#ahTKf0elF#Qf+)gLi-ZB1bMa_}QOl`PgTUQCs#|Tn=cqBQnnh21VrW
zes_{w&gl0)BN@en-0z0C0t%jDW7#3EHH&`Cxdq=+oW0sg+BVFYGYjBI{&8}df*UZk
zR-pS8q(3a=n)p|&ncDvI%JejT(8Wzhf*{gN<Rl|;z#q=HxH{Ki-MHf9r8>hxGrls%
z^@R>CA12F|ifl}?RTjukeC*A=n+x@NCrq+RpK0P)Ct`-}MZ=eVbrre+Pq|HnkA3Y7
zSNwp7-f<1LzUdf0{KG7>iygwK3}idp0>J4JCFnmS+dwTprr~RDvo6n>V{@#CWA1)%
zoaR!8i&yL1`4$!Ka`Osrf5twZ`M_<gsSGC`VsuYHn@qt;Q?@wSMrn6r3ZBEA_l&@7
zgH6MVeVbM?UUC>4QXJeq3Se8hbK@w(<$TX*)~0MsNn>DfQU^NLOq3<7DrMgNynWnq
z*BAhAea3z}mMcms$q|K|<kZDQPM^KO-Yw&FgMo>HOdxAf0!!|>F00Clf)YIMq1&=5
z?{nKVXl-menynDmags@zBl3NO7#z|6Xi;_`jAF)CxRx9s2sKNMF7;M`5W=?a%8e$C
zc8KE$4xd@JmBd<S0-mSvlpJVLT7h*}$SF>oyTL+r$zEHLD5l+s7%D1UnT~SDk2rK(
zFjCYE59RE;%JZ13R;$;pp1+YxctjLMJ=OKgwe~3;Yh?fdL{UtnwXI4gAbpT7<iLjN
zeP7HgilrjjI9$4Px%reQJ@&qT|NCEl0^qo=n@vz3wp8H=r0d`&NVBl*Npc41x<p~X
zY;`Un@;HC~LhbR7d&K=x@-&>;*(y@HFz}~gUF!k#uZ_;!qX*2mQgY?WmG)Df{Md&a
zJ#y&B41}|D=MFyq`7bauG=x%K0)<SVluV#fNP91ZOrdO+6pJOUUA<O&++!bkpTmd#
z{saCk1i<j{@c3sw^M!9$rf0T>VHhROgfWPIH6j~;^g7EzIL^YtLiF0#zT&lq{_(f3
z10^5?T0j%<MPEcFPD=?!5>gkCKrcIh7{Fi{fH;nWB-(%nM16ryU!?m_%obl;$4Rp)
P00000NkvXXu0mjfTs6a?

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/draw-64.png b/src/assets/img/files/draw-64.png
deleted file mode 100644
index 1b827c7c63d7fd2b88f7516b4aa9a143a95c487a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3441
zcmV-%4UY1OP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000d*Nkl<ZcmdUz
z1$5h3(}th9l2NupWrk(u|6^umW@ct)W@ct)W@au^3fpW04VW$I&adX!sgF+FINh|H
zzCEw!y8O({MNw5|leLNnM2<-q9UbAqi?5_!Inw*hH=p;Cn_aT}3coxRIOzmx0jp>z
zsAa|yD4O&*v}eEU*|I|ikMg-kzx`*Q%dWmHsw|)sJw9xy$s)w%(ouT5Ah0(Br2VgQ
z978e!dHfTe7Hs5e=U%nRJhVJ9Dk&!*EEzNe4VaFEU<1&=;wIA^yjD4oyans-dJito
zr!RA}>n>~rRI!0!7R{X)?VJDw1rg9h!u_2w=4Z^JSvw#M?Q^Qt`rD%zt34nNwJ<?`
z_(LT2e}v-EQIg`LfoZ~m`Vjhn54NGWX^(^DG<ydg!r8ZbJnL33$2j2E>R^2kK`nqH
zC<s^uG={1mfC{KuPyo>5FxZ(fSQG%q7<ziV=SGQmM>h$`RVwv=`F^lD-ZCN%72iSk
zyczHChY5o!X&O;9*oL41O$)X`<PbNNi{NwY>3t|?-R?20UEbHCnWfU&4jZdztj6u|
z8gKo!ZwjHcWHQM;y*=LLsuXFHt4drMRqX?2g_r$r!W;Q0>Qu=l>uBI&P*6|-D}X2l
zC6UduzZk(EtNg7W!<ra;hf!?U`Fk_W`5Q#QhT0c~nub^cK#55K3j*!%4F_}RO=OS3
zyX6SJf%*;>MN}}NSP=}MSWGI%{z;ELg$HxiEgl=e_s$C6xf?*yS=h9VE%sew9n<!A
zC|E$}u?WWD--tK*QAm`?rUPu?fGPqQz#<qFRf{C@>>tmuJNpne-|TU$U2y}#L;L5v
zb^%0OsxA1jk0FUNnXC_?gE$HZ0H8CK$K)6s%dso{P&VD<u{S)t!U_0sMTFU8Oa$*c
zaNvz($3G5EiHz3(bwI!v#R4D*f=URIXWx-LJChG(<28#3UIDuA05L9=I<W6ec%z>{
zoFZAz2kS7?^UapGfDob-*gKMAyBon@xrpFVl+JSRagTen?f)TOuApyv+Xu)Gf0)$J
zN5LtP_5w5%1O+3<lOTeT0JS~rI|k3gn1)~33oH_NZH`nC;sPP2T%mvY-@p2}Eo&Oz
z8t{WLyj%lZ2XPb=SsachfdKUj>>u*@U*i#MxNLF4TWd+C5~BmX`SXEM+T=d<eoFxm
zfnqu2f=#){ud_cMsFudbW__&hASg6HL7SZrqG2!lk7W6uAHiSxm_-RcGf+?=F5I_2
zZ6n7eeb&i6xprhfDQPs}!2qCGq&W_t2|r!=OCtDHixYmXb<oxE@HoDR8>Y%>*Mu{b
zH_!&IsD@x8_|Ys|nw39O;Q?IDxU{5*x=FQRNw7YkU;zP8!4RTaVDM;`t@;QyUe;{;
zMGvnX&jPN=rD$sbw9&x&iVeXaEqc%ZoCtm_%Qh3iUvUP(YwL^7(gA@oBLNMGET|9G
zDh2_yXtsyJ;Vj#ek6_akk2<3&uXL8HmUsfNfkp;{poBQdJo`sIc4QvT=Bp$46@6z8
zyq@?l<PydbV4L^)2B@`|d;~w?vD14Pn{V`J)-LZo^Wc?^GOEySEZ~FIEynex@AEq|
z5&TUaGjDjIhT75%3V&SM-4w7PSYL6{IS!OP_Vh<DIX7>@>)i0A;os9Z`cI@bh@phR
z5^4gQScOx#gxu=8o>q8OQ1k@nfY=luw797ZgHy`hr4QwtTRx_%$BgpuA7~u<ECqLn
zWnPLzHibA2Ab?L0Y^7BC3lsnP7U_*o!|l2Bw7`RccJ2V97FxzCj+5lzRFb^|5&Uht
zgP+>>8Qg=fU_<{A2KqgcUIOu4$R#5uAZ2kKrMJ+_`lVCoo);5L{^PX3t8zlQiA0u`
z97ouHxWvBx2XOW+9>toabHj&|e<45m0s58=K-Q(6>1R?mQwi7L+a5%PggZiS|5kd6
zJCUlga*1$w|GUtOKYd!@Rkibj$i$&xW)ueI(D0PI`M!5!_3|a4!JKnGtZt{UaTUe%
zdd7nbs5P!8lR1Zimzi1cth$U;2Jtf=W=Z`YU>*A0y_6<@1%+FlT6nY>XU~EA+h6^Y
zmi#(XOE&inu3OoESttTJ_iAsJ-jlr(=i`P0<Z~OznfPiCA_2YL8iI-25ct2tB|$0?
zP_FF2MhQ5j@Y;m$v<v*=K%SPWRljzp4gD`lC*ALt19j$t2XIUeOZ%_tYO6~mdhkmn
zT+c()$FbwsQwcxEV+erz=5Ot$B?VFm=Z|%p8B^;o6Is|pPIdRY=}k4jra%HT(R*6p
z>3kKyE%Ys;T?)x^scOKY$b!LFcD#y#@K-qQ3eXz0Y(GKIt>z8i`1>7@`XLhMy$S8R
zdspyufCn(vD(zOQ3x2%yhrdOB;^TOQB@p`9yu)bjVQAu<dBG=-eu35AUN)>wkv#ai
zuHdyfR_TxcW|8W`p6zA-8|mxsg-{@GxGr-$lDS9CyX~d)Hxfw?OorZENGAC2obaf^
zOq94WbkIV<*S9{0{`4>y4-!5{Qx_oK^G<5cJ5d6}O#>l8Vg(iFqB-Gpj!UsQmGGvz
zg<SdjB(nox18QD@O6u_#3iF2_{umiE0=R%rHFZf>@NFO6CqQIjuC(FUFUe&Cz=cG>
z1h*xTxyebb_Re)5CG8bJAV{QX6z<qHyz0!~6L;q|U?J}F#@~aJN`WIZ0>RDR`J~|O
zwujPRsDnvEN}2F(Og(w??%)Ab=Q{-!<}t&ejJPRqpb@4CGFQzT-rxEVmSz5nn;ihh
zQq3=;<~?p6@St>-IaTl|NHPnK0Vj!2fyp0t4R6Q3hW+2IS<|zFbbcie5-!Ozl6VNA
zJ!c;9dcq{Qvx9@8h{{RB1Nh#hsQ(8faLD!)C?0+ljYg5glKXaq55~SlIQ#|r+->x&
z9srhs)(KYhbI`vBhWpMNz8Sku0NS)%&u6Tjdotnwj=stsq>*ODa)*iWH!wN!2|{-r
zIK7CIMZ^%+uO;bkqbD;#VR;UdSO=jGX{D0e#No=_NtnBz1UxfQyG{TL^M+?_FB9R@
zBF+y`s0>2IrFZEHdbLg%Y#|H-R22l=ToNad23CO$AZf9=rCjG<La}&f(uoUC5?))e
z+YVUR2h2?J5)My1gNpY}mMz<fsf~kw3^p=N2_OPSAdw_UtYoyYnWGcekV@S&f_JV5
z{2b5XCxVv+dcEz*UBGy06~mMNq9?ltFFj1gDdI?gVDW8=TIf;pd#F{GQfaIw;hu+=
z&Vq8i;Zd6IdJ$Am1(5}Nz3uUOfLl_m-IU4kNmQ#q04R{aI9c4tUNS*40g5gdyf%N#
zZxK92PuIDW6S;rx`}~5zgIdLJ1gP41PJz?%Zhz|GYxM@I)<o()0h}@LomYLUN<D&a
zG<?>sS^h8Ab;i0+fGUVAO8C~VTdVE8iU5j$Dyk6p0j}#(sf-?Y%bQ>SjNaZJjTBFS
zc3cD&FTCJ4eDe7Wg+dPB51N$@03nl25d=O{Q_A4r;Ncg&;92+i&wu{4Wu8Z2kVV+`
zf>17(aa~xkd@Z$FeY(ZV<vO9Y6!KYAEn`Qg_}~Aw4!!E-&%gh!T|54sOeUF4MuE7|
zMLg$$L)RX}b%Y=YnJShk7OPCd7qS>fICA7D|NHNjp;x`)1;^n3;5aUwWSBJrix6HF
zL9nV!PE1g*`;<!6$Th5L1n*(YG(20jZX0^lD_?m3T|2k`-gO;jQy7Ls?tBnZKo(i$
zThXeWp7X_WJ3KS+QRSQPZtQta34#Ds?PeDMWN~eEq5?1->kWUpf>GOdf^P%2_<o40
z5|?X?!CD)GmqmEU0hQM8RYYXE^410&;UlhTpGc-uDq@V_IEFUNMFy|5M^(sVQaFyx
zz`wc;K7u9)f;r&<%vD!i#j9TRYKDhLrjuYq02VDgsxxzWczB#GTec3p`js!Z|IP^B
z7&A9`Of$6ke4fvJ?(^K^9(P|dK2h9WtN8;WvZ&7X0HL+~^)G*7!-h><H#|D@vX?yP
zeo^KBz)8xXsYav0cfRv&hK7bRH^2EUpJv2l?F>2SY-0tbdtd;a``xZX5&(r#xlFNC
zqE@dDz4%4Xe!%WsJAMxcAhE*AygC3dfK4Wo=1+h6^N%jP=(5{SOcW7OP|!Ghyz+6t
zE-D`fg-&e`)><0A&(u_rg9rAGyyn#}fBcp$|NR+|JDwgapl#!p!`N7xMw&K2qG`SI
z$}2B==eyqX)-|iwU*h`>nv(cc6I9}F2VGV^{_C;*9^%~)1Obs{_wJqh-~6W6esIf{
zE&l+r9bjAbo2~=3rt5$Y1b}TNzyVw!31k4$>2$VG$gft_B;Ypf00xlQxD^GY8KEt9
z9LJ=wNUIS<6cMqLlT*cdz1{$lZO|G^K+xt!6TI4V9cTc4D*^FNXeGk{w1KvwiG!cO
z#N!E)pmQWbo0g`v&G96}TR&*pwnYV0=q%|pZko=3ok6?mfcW?ByT#6#)R_Js>=Z*)
T5xp!m00000NkvXXu0mjf)^?Gt

diff --git a/src/assets/img/files/draw.png b/src/assets/img/files/draw.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9f2da1eac427eb2839d9b7e174b5780f05c6083
GIT binary patch
literal 1097
zcmV-P1h)H$P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000CKNkl<Zcma)*
z1JEo-6otR;>DA2tY}<%!mJ!=d3bAe5Mj^Is+s?ypb3J{tdAnUxQ~Of&y6WusyQj~+
zt3(6<YwdDtWq~nX@s{f@N^dpn;X{_q9yP9*m5^MK)!FgM!G?`L*<kl8U$IsaAXEiH
z^do|&wQflyypI4}f$@Wbxt}cQv88Mi!5>GX+diVuZ?OG28f9b5uJ<r~?g9$gArL_X
zoH=pVh`T4FM-AK982z=Wy%31bj3^DRB=zS3BubxS1D|Ahh=1(HB(}VV$us81;Yb80
zf+JwXsxY*^)*AEoie^kQ69!(tP5!Yz4dycl0z8%Fuc58bTi?s%sj~=+**IM4olA7j
zg@!ryfX$dRapH*Uj|h@};tOP014^>2$ZdgLR)J5MO<2kz>j-xOP=I;z>~SbnUab3n
zRHd{}k{l~aTTq^NACsocS|_->hb!P>Q()4=hau&%Dzq6?VTeBqTcS3&n~4?Y<zfz4
z3!HlAaRIf0x?F^E0c?MP73FQw8$D2g&%u_ea3y(=fjHcO>YP(kG{VNS9=4dLQEx<Y
z>)R`_Okd+%M9@vwA-Ny%C?d&4lqR2z@W1d_L~iM(U;kmnsv*)l-@xQ)vnkc!VduR_
zD#V+6GR!+0KiNp8@f2{G6TyWVoOlleFkcUD!{`YUf7x`}TnS4#<wjABIf78297^>?
zJC$VaHHHLiectX~-44v2XFZIF^z;wpiXt|(wuUCNACTz0o5IWsu<=+3+Al+uy6BsD
z4fTx%ZLLs|Mnu)atH;FZODK=qg`w2JZmOJf{GnG#X3{aZbvr<z0l;;?9-b-xKqCAZ
z8FNDQzK!A-)_nzDYKZpX7suU44x$1eK>a9Y^->ry3F&>I>aONySlgilJWb>H&ttLJ
znhCc|d<PMnXgBmuyb8bn7RC(hfQUkLhT^CtG<x^N=ii-E<HQQY{;@(-P$=1L>F~Ei
zY&!};)G$<-all&cHi`#@@jPWb9Tgw~y7NeYL1Wc~Dj<})SRBKc1bw}I*}wk!v&;80
z7!W|};YeLS>IGpKQZY*q_y~&L-oEnbXPk8SM<2ZNODdH{E2ZN3tveimLZLuMdplYi
z+S)tvM;~?gL2thP%47L_p;D|DQ!ExqCR4HIx@o}*7Kxx%h+?sTsvfnbqqDPk?9qqs
z_vt4eK3g>{0O&2Z+=_SKeOEOEf$}^Ly+#I4SI<4|6g|_Pu3l@s#$0z-cmC)j58LZM
zxEpo16u_`y!$v;-_|q@WU$Ah~Vr7YlsyVG4o#K%xrFC~tcX;mEr(OK%ryoB81V9PM
z0Ruo@)rxqTOlG+6`x8XO0}S8+8c=ZoAXO<!rD9=VV4x330_CUxgFxY5SUmvL82z2Z
P00000NkvXXu0mjf85s{p

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/eps-64.png b/src/assets/img/files/eps-64.png
deleted file mode 100644
index c42492441422918841a03f87313b53a5e27382fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3679
zcmV-l4xsUgP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000gqNkl<Zcmd6t
z1#ly~vWCBw#<3k(W`;w1nVFfHnVFfHnVA_2E;BRJ?p|7Eh9riWk^0$Z?NUV*C9aoK
z@1?7HN1BP@`_<jk8n37-X;b3sB8F3^PI1vimvHv%>7frjVciq&eWNAUojjKpBMStt
z;JWU?X>jip%`7JljLVVjZT<W&j(z6duYKPSAN1%a;=OXkm;#_-h=^c}kg}uzs(LHu
z{LNHV!rOr{hRH^gH@xLt<%Sbqx$It7Z#}qZd1`o^hqC9+LD8Q(MQXy)MwN-t8?$-E
zMplkhPAs{}eLo^gH?(l2i6H<~=O%!HbWDdT+0TrT9}O%(2mINMM*A((iX(=$v(&bK
zg7Q!ArEzqETIner6a{pTc?m`L=%8HyqlRNXV{+TWx#ry-$-1?xFcw_1h58ajKnVbS
zcm)Ael>R)RDrkfqPJt@@u{DN;3x}Uwsbp^(M1Xn+etS`rn?-~ezU2(%@7@i6eLuDV
z^)7U-blnw7QF6gAhgWpOaD)nHE_*}={-LZ{zL?ll6CoT>BiIOD<JSdv6rA_e>qC1M
zEgZdysx}~4=DjBtKvfsQH1MUt{rNqZe}9mQ7)I()TE$8~-vCj>faGAtEC;p1`HMO$
zf7cHDvbn)CEj+}3qS2p<fOmeObFQY!Q~@AuF}(l#d$GGd#E|L0j|eVT44$3^&D6sp
z%VAgH^yY_i)jQ7}J`VfDYKNJ|sUd*GYLX2Mzr6#$y91vY#%h8uz=#3>K2%**e60gt
zR5)?bBiMF_hp=|}|2I5<_MAZlP!LOi|1h;KeAVC`NKaFPp)Y~}?IFv-M#j-C59gBG
zJ%n}h0v=GNj{p%#EPN0CukXR``7qTk{IEq81O)^Gc)%bChIXbLIBz+$>ET>-s|U{$
zcm>r6J1szf&z16z?<U*zVTP=*U|3KO2w((3(VhsX&_dXEM%cgZVQjg12Y$tTfd?gR
z*{yDMEBfZjlEq7x@{ad@l-l1viR}CU6=N73Gq?go6|n*aFoHorp{2r}bB2AZ9?Iq$
zKZy175ngqA0e<}BA49N?04r?cXKyq0LtnwRxlrxfU^Kj&AYed@&_daJ-m-VuL)mnL
z2eN+U{DYsV-OrYfS^Cz@Jx{wiPh5WdtBcCh1*0`X*;b5rz+ebw1lk_<oVDy;*nz*^
z1Lifn_B|Hh=daof!4@o9GW_^_Z<FCdDMhhUUS==?2BqbNF8r<qov`n~uUoYQ3BWNj
zAk)ChH1I<FT1BGvR)P=%z|Uk^jmngHF;Ud2>M05?!1q=kJOZFXvufCTTG+kp5p2A{
zLs;8c`5;s1<rABm0ardqAbr^BqQI4aOTve7q6TC&1%g$r;yn05K|vtg?9`JR!~Rpk
z-gQr4aUl$U?$Mm7)=_0ZQ~FTE62<Lp-}_)1#){%w4Hn$wfz)qsA6#cl5*{>>16gfE
z!c4%op(q7k0@_nRK)j<Ivg|)&*thm!Y`w`tssHrdj2!wYroMo=TMQfK9#AECZ|)lB
zsWxtoN;W%uq8rSdW2yii3J>0e_!F<Vg_eWoEeASH&eoegh;=I$aN1^QrQY=`1RSOU
zY69H%#x5&SlObplKJX?|z$pal3E+CEWqZAScVpAcIK1@{Ty%>IO^z^Ei+}+%0;dP7
z(L5TXX?X1o!sP)4C`-U8vcz(<sBrwEM{@CPLVK%l#jd(WIj>RpN6=ou_0Kand~BJI
zE;@z6DR}{QvEhKLaPpEzvhDWWUEQK9a@Et}o`mkreK>l+4g{Zy03RkI;1u!_7&RQG
z!nund$(8TafnOHE4;%%F3Lk)An()>bTBCCz0%nERK~q2g=M*y{9L_Tump+oK-}xb|
znGRk9%%I@TEA8B)3L-+KVu<q{g|blc(qoN5GNBLcBVoJ`V$1~3peY~#nc-;LFuv{K
zT<flBcnN3&g}Zp+tmG`bRgIx8cnjLUE%60YM96bbb9u??>kO0cQ6_de)bydFyMPB(
z0&p5WeHW0dO5d!7V`p+2mpqhf-982XzbkTi?yy@dYpya1rGmiGT@9N1OX#gKDzuGb
z^X<l1xTZ?6*7M)plem_mMEM_505kwj2d|org6#CcR+y>d^zk}Zf70DpxqK<8OTa5L
znb&Cb5t`03wz&$W;+-N^sBO%c*jpm~mGz2M3lo4-y4Q-9&R7gX1jq0LZiasHlh8tz
zMLB-e&BKQ}z5Nm=0-A<bO^172*u*KtuxHV_Dz2%V-P30AWmW3yEK(I*0V+MQ)Nt_Y
zZH_L;X`b*Pf&w0h)4-*3K88=Hzzcq|AA%L{U%&Rb^-AU26R0HN0b%fadY&uU21|XR
zrMcH}@;7ZpHdd%Eu?(%SOziEY0bD44n><<PT5S<D{taFt_~<U60eyP-nI4IK_j}(b
zG(nzgUS-?w^P#ab6y=f>JQ{&(`koF#)0HgVG6V*ihf2y*%H*+v+NGA^O_p=JOZtix
zg|haVHI`p>nDLzjJ9jj}P9Fgw1(+Q^wHdnIZEr(dye21_0XzXuZyXEYV*$KUj&#F+
z2yJ>M_LrcB@qHyrFHuI;Tc`@Y2(R~rLR)c#;uJ_ULeBSKRa5Y>I>ct2^91+!jsxh7
z@EWQz;58gI@^)JpTH6i(jMhm{>x9QtgvNePG3n{1L4BpAEEKPCQ41^WJa~<dfjtGU
zI&&jrfJBp{Gr@<-J)L`S3SNblcP!jm0V9m>FBv~u(kvb0M@r5gDUhl#y2Vnu@Uwcb
z3v;JE=n(c{J_|gvHA19qpdTvL0}65IdjO}nQO}~aLugAGyU4O`VGS{$Ug;J^a%F6z
z#nc2>L=n(~6i<3jpg<a)-YhM^oZwaQ8loXCR7G2<Z8p@$GF(f^h78L#RHufxQ|gNi
z!>cT(ce_3u5FioI)NN3i89ppbT7VS1B;bP)1c){+sL=8yYc3js3Y`60!NDIFNY-z9
zKr6~6_o*_vDr3<_mJ|PWI0?#w;yqvpkrnL*byj#Kx(&=MfCvNy(ho32L(!6H?$PQ%
z$GX+O0=aVbKaPAtkxKZRcFT8Gz32+S!c7)a7u@9ZDG*1O62{?HM+_g12{R;32Y7lL
z7pCCt+%vqvP+yeMKIa)f>>&d$!NnL(?{ZKoBg=)cwT3bWF@OamDt;b<(D6=CQ}EHk
z4=ez)!S_NrRBso)B)K{kuCG7~&h2)z#uYCC#CcE)=MO38kCgZV7H+V3g`%bS3Ew&P
z;QLP01V#Csf)CORSOXO8g}Ef*L*9ew9W{h1S;cbVXK?&y4azoP!xvWwKrO?cKAj`B
zz&ohaEjz#A`RBKqI0qO)*azU?(RMh357Cj@45gzVklBB(@*eQu<J%KLKB=LTlc`}F
zL;&9euRREXq6z911&~nuQcs7KRN(_fWAH(5gEAvL5LPsRO+5lC(Yg5V=>J{RN=KES
zNH{cHM@hg(yRv}=h!jo!P#LOp1Qi#mXyp@)jYj7a4@@H=6wnwx&i_FpAj*JQ;Jqp?
z)PO`J#IR9Fd+;PeJIZ|`0bu5pk2XZXXAvO8mq-#`;~Ee*C@JVD71BR|#L%foo*BO1
zvFf0W5HRrX^PwG0!20+}ZtBtZ%;64Uo-zf9;rmCgltqd6imDFU3Ja2k51m?%D$e(5
zA|VKqnv)K96p#eAl7?5M-Of>ztYYzg00A`qH-_&6x)PV?Xx4ELK8DqJg(Zwr;U0sh
z4J`}QyU+(j@V*P*%4z2Xt5+}kduHuv?7)41q9SSd)+DQLc5mdGH$udsiCtJ?w-y($
zXdb~#S%eS{t}Li6UrW(!03d)0y@*tbqQqvFe0=io6QA(tC!INS25W6BfF^H&l7I(A
zT}gGtMp(Tyd{JiJn-hx^jb|=qVJ<*X6f7JYX0$#;(Qeaj7vy<?h*0aCE6b8|XD8UZ
zZ{P9fJ@;w%*#3{d?_e6sG?@Z2`~SUlIg~jHz@R@-N1zG8QX3mVn3$X-%V5R&Wwcs3
zdAne;(ZV^;SVt7~%E^=G_{a7gCtmiF=iF=euK)ag@ZDe_NW+Km|0z5Qh;Zo80WvET
zh2#8qgYn4=@Cz0UW36!P_$jt`;9vgI%i(`X+At_g<MR|AR6S?Up6!M^6CLobdw&7m
zm=650F8t0DFYCbX`tN^!L1crq!t)V+N?}!6?ShGk<{aSDDKIbLmC)4z-3Y+V5gx!~
znWgKI%{%zG4@QKsvAMwmnD2b&yZqxH+q)uQjG#I{;gzYMU#|^e?cCr2%pLD|2d;Ik
zYx1_Yy$un$5Dhy2;8BIp-r}6=RQuC&f(J14nu=#X``JA1agXbcG1ksI`2Nv(kM~NW
z(WcYe%n3d&f_&s7AK?ynxPz8u>5Vb-4&JLWIoY6At8wDwsS_`H;WO^jgO}JD&@zDV
zBJ`KP{N=fW2loH%(#x)VtMTy(1kk9BO^xHeUy1)N2J4xo1PKCr?<w+<JTFl7XI}b}
z=RUsE<op>}2>^IN!?8cc1Fk=gu4^CM^u!nfxc0TLeU-Pp{atTeziz|Tin0g~h&0|A
zB4G^SkXZQ`nDojMMO;xjT<PRL|M};^H@@N3@7=Lu#~*=O1nmMaB~bLd4YYuE&x_u5
z9|V9(Pk=fg)oOKkY;<&uqC-HYVClPJ1PmYuCLMwZ!2~2e7gP&>uJMJShUmn^_;|aW
z7eLmBkKDxq^x&I4Zv#0{^aUV@fFXeP!AzLPP7p8xkH!&rbS{QYpYssXb(&DuSd2)J
x5FsH2k|yzd76=*eJq9sN&V%Vp;tlv7{0}xne|NiVZr=a^002ovPDHLkV1j(m^&<cP

diff --git a/src/assets/img/files/eps.png b/src/assets/img/files/eps.png
new file mode 100644
index 0000000000000000000000000000000000000000..99b23525c77ca59133f890b207b6a27c6d325646
GIT binary patch
literal 1242
zcmV<01SR{4P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000D`Nkl<Zcmai!
z1F$4b7KOj8%Bt4v^z_@OwQbwBZJWWhZ6mbyZfL#x+cw8D&qkxVD)ZiljHsyJx8rpA
zJDI0$rBzh`yq9Ng>+UwS`S(8m(fX6}KfUyhV|(^>hw8h-jFrZHlH|58Jm;aWc=y?e
zB%mlz`2!SDY+~ahNn-yAuxqfb+xGjzze(I^<#Si_jyqh1?6>r;&B!+T%-!+v+~svY
z;C6So-Gc_b?mJaMRS9e*FoLCuVj|;4I(r`!MdnIti~&eV8fme3CCORurIsH>MrwGs
z!PIRZ&s|^p112UX$$C9*u?&c)_1@QwiLh5*y&qd^(J`yoGv7};p2m#aih^x;^NEZ;
z?>mf*O;8L6D8S8)zC5NZ``jl!fP39#V(gc%y<^hWDHv-ZcEF*|liBmQZ!kVFhRX$$
zHcGguz)ROWLsbI2;$Z*x@jH+jeUhC%M&3+Ov&n(hgW=9E=GIFG=+0h&qEJ2;MpzxW
zh?3s+UeMT!ss{xP!gfXyWT>Xs^GI)lxv^(Zzu((v|K(kH$pM2gWxSx^!^3#lk>U%7
zefuwo?)n(i_X(xDvI7TFz*@J@%-x^J<cq&gXE;x$jySOa3m~8Z5{IpK;LVN{XF#ER
z2i39?8-|iIf9J<@_t$@y@$nG`hmL`X0JAF<a7{3=!L2F|#dIRvic&am-rxlcTE<u!
zTzTO#)JEmr@A@WV+pXyGqWaw+K%NV&C)a7VEz^JKBMrm8`z7>FD;O4vb0DIqgc*b%
zyRxSiFXTRVxYNl`xy^0K@*%_t3L#?+QOMqiI5G^^J@I%<f8J5_ge+Hb56*{sEu}#K
zsKI{a$3I6^mp3*B1u6+4OPqjF$a5u~j2SKn*@mZa7t6|=qjS%MV`up=0}m2LA5;m+
zdM~JkQ(+Uf&MRsRxrg>0V$%AyMk8z^!p8=eL+*AJ3_|N7s#F~;p~~JiVN31}svvEM
z>k<3^mN6VE_j+ZW=ItYhLOeqczB+^I$A?x8%2$IZ<W5mFNM@KirJ&yr-Ln7x1zwaZ
z{*jYqA<8fV4Gd9Ae02uZh$PGa1&R&GmjsEx1Ix!eP7KZq8in>00aeN_s#a-G<`0M$
zvi<-e3NT?;g@6woQ-VW#I>h@jB4Z3`nvmGIVt}H74rznru8%-5#Ihr>3W;cdYET)s
zcx-bIDxM@wSzK6Hn3+C2SF0shP^d0oMNT?;d+zj+UlRa<B-N!^rM%x2jwFewrzr{?
zJ2usQ*E`?x+KVr~U<Sa(aZFLTN)HEsh@e`9Dy1YC8lczhk_~#??e6zr|NaB(?|Azg
zUw*~qm!3c<?EL%!<KttXm6)y%rLqiE1O^dLY%Nn$Q~h_n^Ubf?hX0>R+56u2KK$^9
zKjI}Xc_qDmzY3_DRNAm=0L^BLYp%X({WG8W#LF+c^x`T!7_6+U@ZR^nr`v9iTzH$?
z-tL~oc3!G#R52PHj1tTw9G6>TqG)+}*?so2pZM&hmt1rea8IBBdO#P*EMV5w*4AJA
z;^#j*Ns^AL#()K4AOcK9)lvZOeZF0Npa~Q~ct8N%0$Lub7#Q@~`2YX_07*qoM6N<$
Eg6N%H{Qv*}

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/epub-64.png b/src/assets/img/files/epub-64.png
deleted file mode 100644
index 298d5dcd9bd5947e92c05fbabeea0b66c5d59163..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3839
zcmV<b4gm3qP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000igNkl<Zcmd6t
z1$5h3x3-@nnUXl2P@8s`%FOf)GyMN$rou2YGhBv6_Zz&-%rMybXs|R`m~xvkCr)fj
zI{V7<S&>plb!gV)tnO|_cHnv6y^qe3tQg?9?+?eYdy7*)?~?3K*(o(6Ulf(CwGmNh
zEoi~d<q#1(Pe@prP21a9v*CCl=eqwfb{0R}wF&v;H~H2^g#e!Cp_EEHj(dsLGFwCv
zR1AwlNA~cqYnGqa;eGWJuBWo108{{~H9_`*Odv?Y2D<8LPA;OcWelT7joG?z+)w{Q
zUAj3ZB8u)I;r~K7D$WTNN7BppD%^x^ugYXnD@5x;BAJL6Kx>WiM?PP?&vm_Lw3ck8
zVv5du2On&Dg|%(3aisk?jsbQ(a9s%^dYnmH)aXWLwl3p}`M=1iV@}1kEwt!f;H3Jw
z$oc5Y5*~yyio&u~M=F(kroO)B_q7(WZ7X7BWQYh_ON-~}U+oPZ1OL&Mmsq>|C609-
z#l^$Z9*$33bX<zA7ev8vgGeTXl-t0xmZe-i?-yuoZADr1gqNP6((|18IvQf4m#_7S
zub0g5vX1Nin&){Vwbn#OqGtsNAT=U1^akJM!>`=_GG88em7>>4GOfS?g&-&hRS!~K
z#v<c2Go^VcSNhJ69zB{w!ltL_@ugqsa1VQtUdvvh-;N*{wo_bJXHdio5IYR~nw>AR
z{?My9x|4K`!YaXsD5y|`pzPCbGn1N@a@pKp_*UUX2#54n00X~vR|)>LZg|h5mm!EK
zQVB((*u(@M{*u|>E_~#q3Dq9~jPpMH#=}0m<Va@}S|siwLWxs#HZitwDHqNB`EMOw
zx{V3(`zk;HziLMrzNmAgGN#Byk)TopODS|mBj=v7gzrorUhuJo#lz?Lc<W0+*%x)$
zc@a>m1PWMX5fqfqi=vqG;p>*LXzI@mLwKsUfM~ESo6fGoyuayXzS{pP1uqx$yw;$U
z1mIRg1QEej3b)gTulY6RPa1~sB1qT+@d9jUdz*c`kEIWKEA4gr{)Sw!BXHhzDLV}$
z2t`n(5QW#?z*(s!%$@MF!_xWq4u}ZwtB;Q4&ij7SzT%fh{enZW^-z0`L{hMv%7tSB
zL6iaw#bXVekyyg)@%@KaN&!~cA@nx`e}WPcR{_(%Q^%Z3>PIQ`FYegqBpgo=go>dQ
z2-pgo;|-i<4IKW!k)0emzKv0h=g^Qn4ba~Rya?5=0>|?nc2Or&32KD$I$rm(BM~5F
zD~cTroH=0UE!J=Q5pRF_9EIc-MvfTACF7pvw1znddgz@;DmW_k0@)gyx|#&Zq!oZW
zuHZQ0XM$Wbp&ck3Y2b8w33Db49R7bke-tPC70Eh>!_H^CyXi67j;;b_4JCYdESQiO
z0csP}*V-slxSI<_2;jvlm;ITkrOcZ+ICw^E!?tZigA$v=T^o4k>qlujvJ$1NA%&Ol
zz3~;Gbr@a=-YJXVxMk-p%pxbVlm(Lq1OEszVk?$qAv)|&@I~nKMcDWlyN;|vVGR*{
zA6p<4pagEh@xz6LrBGc>jLj}%(X^i%IQ(Zme7*0yWgGA?&}9)084*gAfU<@NJ{<7^
zi1>lIiz7I0Ig$xQvb3=ov5X653>^Nyqwv~*h#*?`*xRd;2)PZsz2R}%4hNMmXn5&S
z08+IDO#eeFsmfd0hGkqlYw+-v9Xju6O<lT`S!XOEW4EBSF1LiKgoC~aZ>@ivU58hq
zum%T@gj?gd3J~3WM+nb@OiEEJElh1%#-($9p4NfFfBGnr4V@PufX${xa@qK&xbWPk
zSbX*)r0u4%2m+!BpbwQqSXUCkTpb1qFMVnO6B^P<$kM{}k;}P!-XP)YxAt&e2hNY=
z@`=xKPUAIr8YYeTabJkX$=J<kF)g71vC5V3l`q1fm4MZMc<AFCpat<mDNVv@U}o!b
zu9`nU_^m(Uzt%pA&ie2tIA7;Gf5ij?@0k~XNvHlei_U%!OV{?C6U63V#|GZ~@(B(c
z-+;pEAH0|bkSceC6dGlD6xvfvZTS_y=Y9Cr{==`^8ai(q=Me&Dv*}S>G4UDBX$s)O
zZ&nJ&DYCn54}~rlJFOtHd=*hNWLv4LsYmD^JYhchQuy<YIoiA0X-J&SPh5SaKjDq>
z0jz<*2hN8*AHrXL68N`1ewj6UULut(2EasG=KRqYa`n^~s7aiP)?UBh&HJiPf**c%
zl>hi%zTLGFZA~o=B<w{0;nx~?J6iU}`AN@kZXe(gg>+w$H0QM%c>A;-@JcBZRyFuA
zOSL%wjq`>anLl~qZ`Y+8+6Czc{QL1e-v{{ByI&$%S44CfULx?<Oe;C>!%GNnDU1Dw
zcCzchI+U`iI8TJ5%A>Jj(FHg&pD+GEYkg+lX8ZT~&oz&r>mogmaXvGOD<?h6xy@Ji
z4*yXJ-Z+m6SB9qSubFP(brjxa@4;>S<9m;xYL9UJ+!r{#d1fF`uka#4PA2Rfjg9pe
zDAbO+x=f@3Vun<OS8Uk+A^*8L3U8eEg0ep;{F@)W#Hy0><(?0n_k8C^U%=HTg@2rb
z?uWq!>c3Y%N!y{dD6AOx80)JEKpeaoxvt}^`1}uWYqtbtuQdijeCJ!aa`JPP@F<GK
zJa2sXT~@dG&es(|hdu9U&v*U;-}x7*je-9MAO3*z0g0pyVzck)I^N&#GOpKUI4j|$
z`&=Id5aQs&gQAnivG!xx0YJ}%PO_Dz%p|l{6<gYTA;-bOY7(^tL@Ohl1h8XEWj`YZ
z{(uj^!gt=l8?l3&D;z|W6Ysp3=yL^##KD`^5bA52n0EG0VoBPp+{ytKyN`Uv8=pVL
z(T*MA-X8OP*=DYr`xK`)EC?V)1kdz*ob!7QM4V69Wx-4&6E(~{@5f2m^@vDMc$1{c
zb~xVu_`A13*)JHojM-=0gpy>Br?ZG+%fS`A`NfkQ$?c46W&{yUOa1v=HT8L4g!y=$
z%h)j&a&5`^WDNWYAHG;}-ZCpzf}F52Tt4G2rl0k5xSj?o;X%s(q@QzuNIbj*p-I{q
z7M*vyFT#x|NuhPPghebiAAFBDK6{d*xm`W>_PQj(i1WE}>a#2wdyDV<^Ht#A58%ZE
zkr4i}nRhVv{H1uV0_hz-YNv_52>|i%p{hcnB*OW3Fz3u0u}GO#pnEg3<-mLV@29>9
z9py?e-(Q0DMHtIP6Cd>9PwyT6-N!gkD8bukZQwoQybnL`{AB^WoD5!0z9q5-2p?)H
znuMM9oxGhnXWfV*g+8GjHXm5wi|~}+4!gpIOZ1_o=w9LX7o!uNfwz75Sw8&OzQYf!
z1^V^GMuK)&?29n>tY|w(cROs_w}Ss!^HjMKRF7+R1^nN?<HHxq6Q0(XFz_=601thw
zfDj1j&*Q4F5*ClYjd^F^fJM^G)L}bp+PlJExIFEPunUDcDZCvzZ+gD${QPkPfEOX|
zT42R5g8KigPAI#yc*5<>JLg6$DbER}e*ufHOCqd#nj;;i9U}05_x5A#%bT+ILg$k{
z{1pR*j{%PrKo}T2kxEFGDq(_O3FqE`>Sbd5dd~{}Yo#wj`z~xNY2Z!ShZA1t{A?e7
z{J`ML^bv+?pAS$B#b<JaWFo@_lWs=@KG^s=o-TqI08xPm|GiQ%`|M@B@xgZk=ab2B
zCn;Kjmb$`+UoZ%G!9-s_BP2ax2mYY4JSX@f+=l3q2(RJl=&sLV<L>XVY3FJR?y>F(
z55cVP(p)*mho3Mg_>e=)2~~X^FnD;xK$fo#7fimD`D05HV+!pF64^Mp91Hgo8a%Db
z&Ij<z2MHf8-Az=l03@0Q|CCmX4%*?u$>mCTf8Fc2-R(ekmT>+EoL@K;@Fr`maa<Qq
zdsxcq`-h~4?)iMVq%WF!E27~?CyIcW39sb*okI*S6pIeFZE2;Hp!&KU9^yyTX4%X|
z({5#v4_IC&=-|BP3YL_d_u(h{@ZQkD7m7s+g(8-vzB*+@_HZhh?E5-k$RAOgi7^mi
zVtGy|<Q?!b0sNxL%hCOUFB_^*n17%Y%6yOOy10%*DrK*$&(=J*_S5ybOeS@*77$Dx
za(GU-L|#1o7MikWu<O9*oOjw>rkrzCzu-O3Bb%+EwzdY(^?aut9LGf|<pU>ieDDJY
zbF_D~Z*-je?b%aK|LDsv-eKm9iLp0DgK`n!%v>)21JBiG4n2GnMxm4fB*?B0L?7Wh
zyE;iFZO%ILG#}I>m+K<eRX}U;1xW+K?%n%n+r4+wj_q6TxaY2$-k3LU5g&j2ewCGA
z1m>HC54Xfx>wdwD2>bW%Ln*;^H616yi|&TswsrHJKKz@rXU`4ctL_CPh@pp%zi;1X
zcqp$E+K(TnSS*t3%+q-y{GR>Y@b}$w%Nw(1&yiKDJ|S)-VrKvW7(VdfY%f9o7YYuY
zo%yQpt5>ZA7}yPwVFw@j5=?kn1_vKM2gopnH#b?7Qq<H89KL!53{!Y>F1XZz3>?1N
zQaEHBPVgrC;kwSC;bR35hAF(c3TQ1HJ=Q^2*Wpduww2-iOI`eI-`5sMr;~taz#ERv
zYpuz5<pId&3!B%k|LUIm?!M)1!1CekfF}$UjcNiYz*0)t|MXA)*e;^K0u=*)vUZ8U
z(-Xe3!r~uT_U62n@~*BUm&3NL9Up!8!{;7(=&m)uNE0nUGtdMy0u8_jAPdw086XAN
zp+KQJmT8A%DgO3v|8Dl&c?%y-r_z(Ph=quX+*nX2-2PI1uMkvarS$S%kkENd&%32v
zowT*>-1Tq&`j3D6=YRgEE6q3PFbCm9!Uc*Z@<72HJLWYV6(DI8N|*BD#fuxKO`G28
zdTz=oItf49p6A)x)0Wod5Yb9REG<&XiXh{MlwlD?&&gC_M$gwkDTL_D#vc_HOGyO1
ze*L=K_U+qqfJ8z^A`0)A$VZ|OIj>c;1x(n{Fy|`zt0IR%<#CuRj;q|1j%E`o3LjGi
zae{azv<XpE4i%THoT~<@=--g);+W%jv53uP{2#K_HW^%SXL$es002ovPDHLkV1nOG
Bg_QsR

diff --git a/src/assets/img/files/epub.png b/src/assets/img/files/epub.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a59fdc029a13d342950e38672dac27edf09190c
GIT binary patch
literal 1344
zcmV-G1;6@<P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000FCNkl<Zcma)+
z1CV4%8i2p7dS$h3+udusb+&DrYj5D}aGY&xz1vu0rZsN6yZACME8e`AuBlV%|FiJ@
zj5MOrI6??-DrLT0DH<FY@{dp66q-2t%_~w;gko{2WYR%>?zLj5<yDV&)?ECAlu`gF
zrLd*4l=Kn^X5230hYDhblnPLFTHc8gC9|u4<M8UQ+1%S_XHOA}D%uOjxVGmLloVFh
zrA+fhSRnKX>2=_q)&(pkg_r=IF|dXg9Nwer|KR?kpCs;>BN%j`q=x5@@}hHZptzs{
z?Kxn<GQG|;punsD>rHD$G8M<=^f9~iC+<J;IpSg-zt5@RP~{os>aOc4$}j)_;R@hP
zbjHsn-bo_0UAnkE=S?_H5DGdmgrHKxFKYTcg?Tm{EfuCr;dHn_NwVPw>tdNPo?ZMS
zL7%60adX$}aw(8d7aZo|md{gg0G>=Gcx3K7Y$gtIe(i?{dn+}>%!1nnY-#L81%9u?
zxgP~*T+t93=91=2cuK<`Jp6U0mcE3^KC#p~mo?l>$WyLCG6QadvC@dKA2o>wB=MM{
zt7MGpdTyXFKNJ3dhEFbj37;p3$5F+c?ld#?SuStXMttQ~B<k!MSVj%Q3?q}0&f+m%
zdj5?R6=cHiKcwNOEcm7MH<0UX;kQqIgqfwkVkY70_B-&q^2x5j=^~HmE_r70_sOw=
zPf%Q#4WBr98s2a{jRoTzUwMk?egbI<T!tTqZ~_jj4wKn680xx`!s3dDOAD*_HQa9%
zG|v6cf0N0RU)J!DhJT*M!f}o*Kf!Mw|0Ju?XJ{)Q<?@#6aVQ^?hks0UaUVH>%Iq!*
zcnavKx@f~R&4m8aFK{xy^dJ+*zk(7;2CCjgOVJD2+FRyNPu|S(-V?N!k8yeH^%#Ws
z>*HVM;n}Y<*!UW*==xN41Zg3#^QSkGf=C@@kscP-?&t8yzf+TQ1z}yxmWnIM-!13T
zmQPsl=`Zt;h6jAP)D)cyN+6X)09Z^6tXiDuXB0X9O0H_Vjo&@-DP|V`PBQUnuI;*&
zfx0)5l5vzN_{-Fnd2r_I1U3A+-s`C^z8opdgArH;v_Js1A(TpcL9V}sYdUV@H&dTx
z=F~s=b@I~;_ufj-Q^KDoHT;l<`!&2@7r*qXG#qKSD%c%`6@joWnQx0pUZ95Sx^LxI
z6QAbriF^5F;xmNZ^-RruFP#>K2d<~-Y`9b)uypJQlt7XFa7m?&1gjb8yM<po^cfBv
zzZYrVtLstB$l&K`D$9af|I;#=N~JM&1nGn9hs#QrHd4dr;4S?8fzPtCG0(`*XJ{_J
z+J=Jyfk<<ZrX&`RF9<v<*b$(F1<iiA&O{Qb=EWD>MKr!iVWhz>C}zsU<#OQhc!?(x
zY;A4LtgWqo=;-mK<Ck98kD-*^rewi0?~<^;h>))+!}C}?#{PbaoLnawJTp7D@Qzo!
zbmZ^vegDUJ`<q{eLHf^@iT?!8+IG%KFDu^~zG1`v`kwcFjIVzA9smpgtPG(~GKb30
z>}@HQkW#X)J>S~deP<djgvcNmd3j;+!yo=+y|-`RUV&&brJ4Sdu(lEhJQo?BTSF|b
ztnB>yS3m#y*S`A2W3PY)AOS>yT_A1%;^i-Y$<pgy_xg8+!;#4D?yeD!$Bkq%=`>B#
zq4RAU(pzFhEc6mepK5t|DKRne=$;i5rnQlFu>S)3nCH}5O)g3R0000<MNUMnLSTYC
C$E)}N

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/flash-64.png b/src/assets/img/files/flash-64.png
deleted file mode 100644
index 01d28e03e1518599aacbca5885c7bfebade1c47d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3752
zcmV;Z4p;GsP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000heNkl<Zcmd3p
z1#BZr7DdmiZd1s~B>BwD%*+hQd}c<`@`@RjnVFfHnL)gQW!_=7-Enu--B3wR%bCgN
zxl*NG%;&sUmfIw;d_?(vGsnh_8#(Oo!`ZTVbM@^P9s9&phwpp(jxDWxY`B7#C?xW@
z$K?YI)cEgTH`tor{!?GtvHfEYzWp8Fzx&B22thnMQT!WA%nav@<+7{*NtbvZE|6q^
zSd4RyR;R<O-|(hl&tHA}sB0#xcZH6pk$ZAMH-y=x`8A_3yTnZ4v4NEJX_aK(<2iI>
zZ<<NEe*gP!e_!>GgEHlXD?<QC&rE>8W}|8){fTq-gB1(#KD@Nuo_SqgIp*k^!+rJB
zZ2j^_nfdQ_8rdAQqg#j>ALw|^u0T5kT6uw*6*e^z>esI3{QDnZ-+lMOIVf5g$_r!$
z>H&!G0s~|s{vRU*Dq#!MV=vZ;b2OU+FRfJ4H>^ZJV;24od0rfBW-N(w%*bec=DoDP
z`f;k;J%b(S=0=f2UNA2qivqfyZZl>5P=Z}E&3X6T#a?5pC`Vd$gd=JRwgj*8^VIuv
zd<Zle)xV84hmMofrYC6#fl?Zhn$RD<{e}0CeeV+t1kZ2^Mct?v5SJM^uwd9kjqS7W
z)hnhr<K8=-F+6?Yq5Ke)9%=@`ho<+wF0oVqyGn!)M*A!8VdjS)XFvtbs!^CDF^I9a
z2MDVwtQkn~m)*eW_uRqW&m120g;xn!u`V5r*dehp0p-qr?cH>LG~0RQH0y@X!I=m$
z5_%FuKAN(=o{(K~11H^eJNvxA@Uf273IzyUvH<_p1^5OzV|DNz3<2PPz=8w|Vy2Pu
zza(M%MK^Nn?YHeF@POz)0cJ+Om`mu+!GG!9%>4M1^PL~9L69xN8}vw!AgiYQM+sZb
zzmcPExs82S?IxX<O4z#)VDo2Qv_AWu+0K88M(8ry00jdla4eDFf@lp@_-F3eaQ2NH
zF}*v%gIGT4C6`=6j4ukt#>aW{yWWR=^)qDO{v-|GrP(li0R|Yo62K%{jS7Fy64swL
z#o;&H#(v|wA-vRIzz=`;LwYkdIhkz!@Vi{&SKp!9Dj2Cbd>0IX1U(YW0<E+<3-4He
z_7sO*vwOlzV!5OfwJI^4!t?lkBTo$e{(GZgea27%g&EGku@u5dw30dagmq_3bLdsG
z@DsZ)yy7Yg_|6Td(vy*qiRNSZpSCmD5qZr>jKvrZz`zt})oSydUwhhW4!iO;_MKdX
z0V>0r00Bmn5pR>?3zjat%usv*6T%>hFo6tUv3`1;k4f{c5hF;m&7Jx{A-aW;8l@OX
z2(*T3{G(&6JNFh2zV1%;8XqGVNY7^H#gb^5DJVSV{Z8Oxt^NWA8;;%#I*|t`ilv{y
z4BQ<2NR@wPj!l=}30aK|FMcIk8+9bX%2S3fvm)XWQn?mEP_#Q7aLW|?PF+vlYQwVd
zpk>ZLIy{*6P=e1EuIRiMD2^wX7ul)`|IQs7&YR|_8}DS(`#;RsFMmxsG(<TVPdUAC
z0z#}8_ukqg@@?B0JpU|0lI$8D`Wi@cAC?M`$h`1{Py(3E!*|Ck{5KezFPP?t8*XLa
z@lm#<DWP6RjXKXH>V;pd1ByGL=l@uHK~c{MNea@k@CZspNq|@qA4C=c3t|lOhM%ai
zCUI=LWQwDv=ipai0ElOr*j2&OZZARvAoSY>MGygY3a`aNqHoedffxgFEePm_0N!A{
z%Ep?bec2Sp+;VH_7v3}Nda2`3>h|&iyr4kyHBS#d3Q$=9oglJqfg7*0X)vL<;zmxm
z<JNd#^W2VmX$pd3tq2|;hYt(;(}RykfRX@2r|^W)l(j=C>6KHQdgpEB>-h+>q8JuG
zAnM&qU5yhUfk$}C0>Df0ITZ7|0NW|Nc76m{Dxe71aLT4UVc?o+PP^xJ_8RT~3vZ=q
z`+_0_)aRStOC)Agl7w#XWQ8XH73aV#3c#Zt8Q`S_0n#qv5x@$+1E{5Jtcc3xt2z6g
zJ7?j?`obG4%S_i(oNnxWR1=>I)bjx)EP?E=1si^vk?mb@(1pV|5C8c=MrU(CE>4N?
zqDM#+02UjvQ+V|kKx2>?=Zv*mGa6T{=BzvJX0Nf)r``ED>O~MElXdn!ya^o-DPY9;
zhXmS#UDp00!&Mvy9yEmIu%<FY?gJP|;LDQ$<cnei{J%M~;E^jw;`q<+^*}hw%*-T)
zV`lmcd!l1zW+vf&j$^(X!7?*%n1*M%+s{>(v{h2cil;j|8Yh+=H>7`m7r6Wku!J|)
zqviq!o;!>+mBjpE<<*~g2j`x72BcIiY;=Mkr<Tq-g?>UhVd<Fx{i7W;7PORZsOS_(
z61skZn1xFyNbt~E2+IN%1ho!7wiufG+Y4BW5|?j0>%6_^pK<!>gn(Ay-7q$%Csi~@
zHbPJiKd{EZhu2^#<ekNKG34D&LP(G#n>aZDngwL|><%snj)kwgz|UkE*Wx#JZvWIw
zulJh)gc^LQq*A6cX8~5_N$%PzIu!_0?nf(hG2bj9f=b9iE;~2|?FA4Mpi*FY_zkbb
ze)oqzU`<50^_pw%kzG6Iwd+pbsHzJ-jcIX+abr^O0>r5F2Z<mdn{<u?sDgb!lhSz$
zaL~!6%}%prOaxymhTimsH&FWU>dLwUFX4S|Rm6dpMU1L*fh1^Dc3j!At=G^rnU@CE
z4=T$qD`<u%S(?iLJ_{s0Nf6W;ye(39fs~{g%tF1M&wu^y_!FEHCJO*0B@Gi7UbB^p
zuHAxJM3{o7=T>>(xfNOyN+6XM;Dey0K~Y2i>hP*#4nnoE)F=BA-lk+Of>JM7%mT7W
z&|gS&Ljl!MZ(CSjNm)cOYssHG(Gd_z0bC3~H-u;0L5O-Ady^yN-4B+U0Chi9)hs~J
zBs4*JYHo$SPxT4CfPr;M(OwpfltoA;0OtERS8(D2)ZtB@Qx{;eYpe_y{H{9zyai+t
zlsFXD`$Cv<PysqJ7$T6<AW@azEugTpyjF+z1~9n`IJi)Uw;-5Zz*lKLFy=sps%@d<
z_XH&n(9zu0_F@(QL&-iK0{Jt}_f>r@Fb-ZR)4+xTgy0pZ!=sk91Ps~>;ewZ@+)0Y<
zY-14}@6TD(hQQRcFpxAVihSy`_xsAwr@9i}##(ErHXVC=YbB}ehRt&X7i>*Y8Wn<y
z<!{%)<|#pwfq3Jqw{q)^)2v4!sbako@@V3^$X$Uqlv5ReD!er{0EHw4j5=}pGK%#5
z6=4`n7z4_4X_TW!;Kf%WZ38>E_L!M!>BI?ZZsn^(_nT_)Ce7q&ko+fTsNLK9GkT5z
zm6A2|0?$3r@!Ui6sKQ_<&_d^mnp_V+itwAita8>FePU7$9_?saNabyj`@hRPU&2#l
z2^}kde`gr;xGD!PFacZ!@ISg62uUDWp@fg@E`9_UcFJ>m6RHqe51dDTi)7yiwZNC>
zCHRDCFl-E;A?Wnv0{C-#0wk2_%S0%G8=Apg#P>&Q!HJUBK&ipI;6J$wctvaQW?6**
z{?dY)Tja6a{o)!t73QwRRk>M$R?NQi|H&=Ddq5qY-~tj-6e}LG6rwC^%VTtLMV=u|
zgc5w?oi7U_>*FoJl6(joKB8900u(!4USA~#=LIUEO$aT6p10%-U;f$}y!*_A2O(g>
z=koz6gP@15?Y3X5KNBd;y#%j3IWFLB6s3z@F1A!BJqiax6&}bCL=g}nK^X_!9MnXj
zV)6#<gz$b}0nfb(pMeL1A&SzQY7rSPfUlsc@C4|($Y3x)r>96tVeW43szbqNfFh{b
z+yuz;>K%O2h)BZTM*%OY4EjR`!^nB(o%u+wZI97{Z=vf_Sqq%Lw6y+AjPZ0rI2nBA
zZyOe0-a|TYU^LglPbudLw(8$Y?fp2aVk2w^x)|Ag@rBHsbvBX`!6Lq7_!v7v2+YqP
z+4qwledmqy^Yf3lZChG^R#RZ8z=I;OWA`N&!IhVTcps!vp4R88)Xmt5;^R+@Lw4-g
z#<rPh2K_#RL1Z|LBjDLB({x?O;=&3qzVy<ePk-ve?|JOeM;<?E8q}%_gc^LFgg}ZB
zh7q0o5q16QdQ3@cV<51)x=ODHXPkc~{r-^QAhNpFCnY&9%2rgABS#i_^s&befBB1_
zeBblWJ#){gSA(imcsKu_!kh4W_r5}}4aAsOT3%y$HN)@Rxs|pJ96WTC$Bx5)<x3;@
zIjFY=g_HHo2@k5m!otGH+*elnqb`!+N00Uno`8Si@RyInKlki2|D@8!q`^%HkFDp=
z_Xm-cmGyrMzU~5>5MEKAB}NvI{vCJ|px0|T(aW~k;3+G*5ZJNf-+(s(e*4?s@#v$E
zjYMdgfa>OiFV78IW~XV}e*@kGc<Wo=!tJ-;#*cseV?qeo8g%o)+vn_fn^NN7p=19B
zyo&)bMn3V0PjKg*caG*w+ip5|8<Pkk%G%n1<7b<H3!X9v-gVbqyyY!#(XQ*HX_`$3
zFRHArt}#11%i$wO4}bo1AN@dvCs6hYTMxi}NayC}7WcgJ^266$d&BFNmsj#4lOJh4
zuu{IS1T#hJf|!INLL7FZ=&vgCU;5&wK6w0)^8j!Txe1_d%=6rnoBP+*z#Fm{(*Sqe
zamS56{>jgObkT(u-yFMWZw{)I#Zho`w}X|PFM%2F^Cn#E5~)k!nP;Bd^S$qW<5!PA
z{`h^sYyq7da0f(k9{~M4j(Q}&E?$5svH)9vFf%i=b;tJY=PNo*t{GaaD^19s2?UzD
z3EF7$P_6;$-(m}XbZP`$Sy^5l42BWtIe6a_r2rXzo!ke&ki0Jbhc>wzXa;j@P1zl+
zpHt5LSXnEet83!j)w(zBQViESZz0YFs;zu2jDZLfeaB=?>;Lv^b@3+r4*mso@OFq=
S;F)g#0000<MNUMnLSTY=FD^;|

diff --git a/src/assets/img/files/flash.png b/src/assets/img/files/flash.png
new file mode 100644
index 0000000000000000000000000000000000000000..11c5570513b1b7fb6fc12ed510628594b35a05bc
GIT binary patch
literal 1264
zcmV<M1P}X(P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000EHNkl<Zcmaiz
z1CVS<8il{SsIKm3bL^S5ZQHhO+qUfuErM$X$F}G7w%x_6{LjO!$hhm1k&KLUekPIt
z@ZKKby+1W=rNtND{f_qCF8tF|4sP7Eb+xSgaz3DU;G}fx?H+Xgec$~0^Ds-15YSiv
zVIoPB__j1nehY9+K+^ufApf;m?G39p-oSI#C$Vl!XC|Y!-ecvycj0ay`V_~VaPW@9
zPVW^GC<us}1B8$X7rAQtw#|2pB6m&VoCDEv?eW&|w(BUq@n$y8PoW*-RAq+lc2Dm4
zk&m)_?_P$TKK~aE%#?WV+s;KK*W7R;>G%Yj``shtZ)Hn=l6YsEd}+Yk{qMmEZ~Yj%
zckiamG6e9ytPghrl1Ja|&YXU5->z@n>8y0y`V?;WIKIl5ywiQy{qm2qXYVem+!M9i
zz=%AE2sb+WJV$0o&{Rl%`LNqD=G+6L8)hlT+lV1Ioqju_+dYx!=1FF+y#XLt$%w!j
zR(mtHoOUY7rcKB^2sE0>&TVacF1I%Hl)WKqcfB_gkAEKSE$^jY7RWgO>J<cdK_#Oy
zQJPVdCF9@z3d!B?hN`OZQzSj_DJx^P+a-O_y*cCEpJ04xg(Y8+CJ8tP2Ij#eECNG#
zz(=AIlrF+V$UzfHp1?pQYxln^_x{L7*u8rPtJAZ{Mc^F5VVfY@9uddjJ4P|6s45tC
zMIn)!;hPDjk%LPwK18x{yFKs+A7#(JeUw=l%1uC-8|^!dvH#wi=-iyKKAn@c9mSeh
zxVVpxMdm%;6soEoARxK!oQH7c@hAL!{}J*m%W-KEs-zO+CdM%OQ#n`ua+%zVlOEJ2
zFGb%QUPd<B)exvj9LeW@_9G-McRIroSqdOTVZtFYiLuPHVTa>(Pv68puFJ>=6?p-D
z@A1?gRDx!QiyDddwK52W60GA2F!aVoi&>w_x#)KtIz!JHcS#u*c2uDL>kYG-$0V8x
z2>=B3&^SXg5cJL1ZiX)^7FNq+?^PAEYo{Z_sJzI%$1CIjLZTG}8p)}x7<!Kc8RF1Q
z8B>!vd1RD`E3V1dwj-uM6lS4{OhP6CebWO_=sqtPRE7|_V0FpJD#PNsEZ0|!n->d+
zMP+rqtWiY`G(89l<~^N$9|4(ag4)u$b4%&itd34Itg7&JKI$+#N2`^RCUHZ6kq6$0
z+HE%7_0E{Y7^1Y=(m*O<qbWd@r@eU-@<!TfvAD3XFf)DY+}K!30s=&+{i0yg!2>+#
z=iftWR+hqDGQ$6=qLoIBr7cV_IXTsP<ttwNoXak|cm^Pe<CwCn8ci}HC_>`|vM{aQ
zanS4b$cBARIrTJdzVW8@m%r=<PrLf6EB+F4Fh9S*?%lgUAx!YEqy*A1O~T1x=82Pp
zsi~>KD_`-VXC5K{GYuqXpM4fz``Xue@{^xIe=um0G(|#)nnC~*6C1exx@*@z_`&x+
z?aC`I3*<pyWo3oeyyn%tEnBu<vTy%^)624~BsmGETEU50%<6mCor|L7<>l%_AA0YH
zuDJZtYk|{&66gaxAWHzZwzjtZq$fS@QE8fPlN1995Cak58nX!jc<+lN7yuJMIhr0Y
aK!*Xn<p?OA^_xEc0000<MNUMnLSTZ+o^mt*

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/folder-64.png b/src/assets/img/files/folder-64.png
deleted file mode 100644
index 2508ab25219f830d7eef6397d2b74e7d2cdfed46..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1102
zcmV-U1hM;xP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000CPNkl<ZcmeI$
zHIOsQ5y0_(caKho#*Zm7GuyEvGgIow%#oRyneFr?kC`EP%*@PmsNIva)9<!!OE(`g
z&8J`0=GFh|nNdmHonzTBz%altz%altz=~mjVSr(PVSr(PVSrzrHvOr|QNCyDuVfEI
zXQAx+nbT$U;~#x^^$kaTfWMwMeare6?Ah?C$7Xo=v6=Y6AARJ-S96rmon(1s6`j5P
zR!{lHHB)->_fB~F%|~^Bs&e}K_`P^CZd^4XCx5GsaI_wQKb-xvubOoB$8;g|D~<^6
zbmqGJ|9c;J@fX=fU<az`^rN#sCfm*tWZaQY1A7)AMyM*X;_l-BdltZ#w;(6|D0_AX
z$Pa(0-+j$ztEo{ZC$oj{lbhF?f1kMP4Y>JLa@VS9#z&l-bh-jJUlQQsT@vzvU)}t#
zcf4%sQ|+K>j4|?5&{*up{$+Q}9T(QTp#6cT7bvS3X`qs4fauKAFok;d@Z?<V&2=jy
z(J~=Ny~_I}%Eed(RVz(xf`kfLG9`s-EQ6^Qrn+?iB}>NE>e+*tb(X$uOXW#OVHP_<
zmp6cvijyT3QuXYirB((rQj%!^bs^Q#`VI*71{f*9$&rhYvQQNvNPPz=TZ`mLN!7Cl
zGcC8>09?qDC@Hh53~E}K3MtPtfQXQ)XAh=Qn3BSsEQye!o;`$m158N8NS0KER6To8
zA=!YuZ9At5^#)j>dvFKjxdB!LQ=c^z0X+9Rz?78Kvj+?MgbE^(1c><ua7XIdL(BY0
zQ%zq8i7MnM-E?=PMSL=743BGwszS9AAlnTX1c;7mKRh11EsvWZsxnv&)oh=^!KO=e
z=`GDJ?#}NoSbSt9fQMecT1|#p!JZJ23Lr-3Ywv7t2mnE)5S6iJ1E?h1JD^5Qp#TT~
zrWB%#0mQ720HQ(-Ck<dyHf4~ASgx;t2!o?8lt}<O!ZHEL_+R0{b~|(i0fJJH6tGB^
z)DTmad2$5Qq=dmMAR^g5gY`$FT-gAja7lh5Dp^wT!Tl!b1_YB%9BhDy=KE845J0!N
z1IjA-GsJ`}sjO_brAI(b3!EC2a%^mX$jT9DDMg=U8ZlL}B<gAg&EV-PKu4m`P!S<d
zGMG)(2X{cNESnW5dT76La@2P>lp3v(<PL})7mA+Y?$RkMiypzri-3xoi^>w8XvGCE
z0>I2O&)(e&FBmDheJ#tbxjQ))5D}~J_Si^>GtW%l4XY49fK|Ue>Bf`CUcBW^(P;x&
z2B@j9SUml}HQ)HqYd-`$IS2r}8+bV|4vYXsUMipmEC9CyXHf@mcSNKOYy@5ktOs5Q
zi~&j>B2WO&0*?ZB0S~$RViQ0Fux99XvjGYSdGIDexA_X7?@PqpX*417=gH8|0mwoS
UYkc;Fvj6}907*qoM6N<$g21u*+yDRo

diff --git a/src/assets/img/files/folder-open-64.png b/src/assets/img/files/folder-open-64.png
deleted file mode 100644
index 27f7271bd09b40b0a4fc158818b820393d9ee75f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1255
zcmV<D1Q`2?P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000E8Nkl<ZcmeFt
zfdBwN2n4Wye~?hZx(Fg@L)cI9E)yU?fB*pt0RjXF5FkK+009C72oO*`)tUv2W62SQ
zzrVWsjb}N`%qR#m2*S)HW(b2Q%$$f7ahOpQF<e9u9bcGcCcNmmoIUQYP|K37-kG=3
zQh!pZs?7D-ethod8&Qvi@ob-3uzhmDWk>qyCth=h=Uy}cAN(Npi0AF*XpCm(ROY_|
zt`x(~w-4`sKZOH`jNv}NAK=cIjUWCmX9~fLD@6Uw_r2}n2)N6!0SQSQ#Gg+W{&E&9
z1g;$QGs8s^kkfGUPN9u(92~%LK!|z+%fA?o*T+zkFKcH>l`I6JR`vFZBx-?4v?w_Z
z02f8TW(h+M?1R?wl_!*N@dONm4H>5=0=jqtQqmBL(-USFQ2?ftO!P!X>7ogk1Pzkt
z33m+_v?27mFW&SO;9)cffx|~8!$awa>232{a%Pt{H-F<T4}a6jFW~w=oH;Iu78@z(
z_D2@<#L4MQv%O3UcRx-gQjys$xZj-y5|Zc&3DKm^x-NjCUm$-rO=J?CA)`s1bzOj)
z|3Xd^>+ly~LbRx}t_xr`%zrVNCE6f&dPB6Rvr;iCzxvqI{th}x8|4E1#C`&F^1rh-
zw*w|a_=P)9VvQ7|f*IXVKl4Um9VC7M&=jzdQd7W?qRaw4F(k=d7bqZvUludgi9u!|
z&=aw^`H)!0O8Mn^1st9nx@GQ}b%LqGzkp=stTQOwa^7Qt0=@Wizr6-*V@<$aCEbIL
zaQE$8{4cCfW<P%W{h#XK&0m0nzh)S=-TnS6mSnNNogt6W3#)U)Z3o|XZ*YidORNeg
zkih7Rl8mq_1#KO;JG?oht)f+PxhUfFg+dH#%K&pbSU?D2D}_~aiv_W}`60&03MF%}
zfI}O$<ysXW5sN!LVNx6-D=6lJ1*DL+eC;nV&z^!rPdJ`Z(5e7WBbEU-O?GCFzO{f1
z06YYf=ng3a0w~ux%Eon*ol)lo-}jS${TR4AK*`$Jo%<u{ki&y+u;8=W?tJJ)n=c-9
zP;@Zc@+x5Ao`Q)U2}X)$GXTLB4PyI=`U`RZ3W{cQi3MT|wQ>Drw15=z)a%p>Cx%`H
z7%?UQP|4HL0%Ei&2!Ofh_ZJ{yvZaj+5D+v~6<{KTeg&iy0Kj3qfDn8s0Flh-6OqDF
zfR7iD6sFkH+-5Mk#9=dr+LSO}z#yNN81O=H%EU~a3h+rV3o^3p<?#aY#HWM9tqTqZ
z6a69<g~Nv;XXg_iFCdm-8dD+9I4o(5Y8<akt(|6HyV|cI5VctLwXR5wejjq-NQ|5<
zdqY!z(cqfzd<i3mdFDhgv2RFN<F;C3?S8~-wO`w`Pv3}n;kc2*e`gwfo#5^7a*wBc
z@&~{8{&aEp&d@(c;_lzx^RkD${N!J^e>O^hq}u~`0FD7ifTJ}Z1_r=@0I1eh>zbEA
zqi$v2C$H2s3d_8#bFJsVE-(eo)qEECr@NmVD?mU5LJfmuoq&xRL(R*+Mp`~+HMatw
z(2l&8_kekg*)mr9Js__=Hv<cI_qKqsR5^`rzLfzqGW*C}0B`16{};x?zX8>{R?x$V
RF~0x+002ovPDHLkV1jS^KRy5e

diff --git a/src/assets/img/files/folder-open.png b/src/assets/img/files/folder-open.png
new file mode 100644
index 0000000000000000000000000000000000000000..bcca6f434e24544fc5238fe07dbc1f7f90d1f46a
GIT binary patch
literal 539
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaAeGBjjasB`QKai>2a1}_-JOg6i
zc>yAUVA|mydIiV(cl~bI{H=8Lx4W<ZC(V9Swc@Q`&%MQmKR2xZ+`HrZ)IDFVYA+P5
z{a3K=-|nk_a##J$UHw<5=r|Ao#r=BkCCzzVvg&KY=I=ebe@;I1J89O_q*>1rXFg7v
z`2<KNOn;a#1Bf0~u6R?u^39|pe<vUQyYSGbH77sY)t|F(IPcneHL(9d!t6IWOTQGY
z`tH_p(Y^JeXUFxR2@m6EzsX(#60F+rvu^E&`n4bH*L?)Ks&U)z<_(|PcKvSK{kt86
z{&egCqQ8ARzRleCb>{xBTQB}H6nn4$=tHZLAirP+CRPp(ej!n5X$^hn@Tjc(hW4qm
z7cAYp`OuLgC(eMu`D-_B+`M_~_U+pb9=v$*;`Q5iA3lEl`Pbmzy8S>?W_h|ehEy=#
z?R8FKWfWk2-7A_cdgp({#@@v8p7YF0w(%decVt*y{h;~t(Sy1Ij4jp`wmX<7Sv=D|
zz<cSUxYDE^izoUYl}fd{OwBG&TwwY9mF1!`PvyoBvpBLhe{|>-be!(bBKy8EQ)$D`
zMt`<{qA5KSYFU@f2;8@BmlkXJpUY~2WeN$}O-2DP<apBjlPp+2b~Y&p<fZX3tdHAj
VmD}=ldos|K44$rjF6*2UngDS~8I}M5

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/folder.png b/src/assets/img/files/folder.png
new file mode 100644
index 0000000000000000000000000000000000000000..8479747ef38ee974607555301dbe806e867aff91
GIT binary patch
literal 543
zcmV+)0^t3LP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0005zNkl<ZcmeH|
zGoW2T5QhJmIeYdZwyi2nY`aYtc2ODiUDTzF?WAvG+qTX7?!n}7WA00r?-)DZdP!CB
zFJb(G|AGLYF>Cqd3(wz0T~JBZ%8P~#vSSyHZ+#Gd$rp`0aq0Pzaorn-)-cMr_V7K9
zUwf$vD1MU~Hh8&wdguDzErBqDncQ>xCb_bM01$qY9s3{D`(YIsBNQbHpROB*;kQ-P
zb<UwwRSDGy5%lzu-W*gu(8R%QU)9QmwT0nDk^)cP6klxJbF;3iA|sNXxD_R}^8uLD
zPoRXiACj~zrW1t5L_{nZ8-m~`P!Qe~iV~V2c7lvG1tM_P3jF6L0+C8tOee@%^M)v`
zXAL1u{RGSe0yt;QYbVIr@Ff#9$XY_25PS%PK%}LD@P!lPv*s~WJ7o+bV!sj?VGx0H
zWig$=%H8*ch^$fXMh=aFp`5Y7T{uBTZWKz2Y&ZfW^(z4@n3PLnUUve+#jC=~p~Pi&
z&o)TG47NtEIKivC=dMfbE_n93h$QhVfe1qwh+p5o3^W3%DmwHVQFrS6O;1}lsm*{t
zw;sMqcdeaQ``GrCZ_5NAA^|WlFs3yCf*%@3(PaQzv=q1C5K#*NP2rCMxTmTQ0N`^0
h1ISd9prDn3KLVC_yctCXX_o*1002ovPDHLkV1kk^?$H1M

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/gif-64.png b/src/assets/img/files/gif-64.png
deleted file mode 100644
index 2373292b7a5315048e15038a4ee440f6fee833b6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4540
zcmV;t5ku~YP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000q#Nkl<Zcmd6t
z1(4jv*0!J1k_MK>_J%o^9A>!8%oJw0%*@Qp%*@Qp%n+z>Vu-z79M~B__xaadGv%)R
zN6xw&-_OU@rB~V>d7h(wTYaPvRi!+X<$o73%*@Pi``g`tx%t`35pTZTllH&gekU)q
zTKVXn6;MzM>I8LojSAK}>TZM$H*S{e{=8AMpUi*u{V#m~&z^M7lW<PCbwUBqZ4wc|
z7@;gm6QHX1w$|NURRvJ`VT_@>*yUYsdROt?k#8JUy-#vZmZ#*^3=eGq3u*;t1uei9
zO3hTMPS-d_k7Dor_9odQ-g5Ts&;IBkl|y^E7G^nwSGscvP|q(~N#b7{BR^+I#0&{*
z-E$Tf)3**wj=^Ax3X>PFMmEBR=?$b&2J;b`fqH1c6`;9Lq{?VAiftMmI`K#@z5B)N
zd%!+KhCMr3??nrXZ9qUnfIhr}04mzw4^b6#8MX#pR0o>K7#fX{=Ojt|_LYo)`V#zQ
zd0reUB7_l11ex&O^>5{~Q=gz?J7jSNd4$Ua&GF6kli=Z_F~(XWoH2Sj7v22=R`0WV
z$Y?7c!hO_XutDGDpVRQ;Sm&tME7z}Tj2)$_iv$rn=UAQqRc(L}hLH%_3V-uk`274Q
z=~dd;BqQDmKlq{u4#5Z%I3|)M_=OQp8()II+XbxJd*|R83Lj_!9ds1|XI;ZuTT^AR
z!~&(^;mua~&2Q!l3!kD}X=3X+Q6BZN!FYJ>!z<&_sE2<{?KCdD^My<Bt9BY*hr;VJ
zU=4I=4FTVjFyfWMzi(;@zWGTOt4-YKR(OL(iofD0uAhVg%NXN~&W!Qc<aEwI^`fO=
z|9=P{>b_cG0u&=LCN;cw%bWOObLq-2!RvTVRBVOs_W=e;C~%DG7$dVIJT^Xq^G>>O
zH-QI~;Uhpq7#30g%D-pRoA`3;({w5e9^R-yjUq^pDDd!hocjD2kC8Ju_rxXmeRq>9
zuR(t(Pe2H7bLHLZ-@=y`K0~`Q52HE889)&c!X!AcjO7zlrpI`+U4lR1qTL7{l=6u0
zeeZiSh{6_3uAbz>@A()XpZ*A+pZ+xMcmb&u81H!?5+q21!!epSs7#IWsQfI>Id(UN
zR~?>!U;N@1gt6C}y`pzs{Z{k+>^m&jCe#a}G(wYL5{U#6^;dpmEBwtPJi2!dXCJ*Z
z?DyOK;J3HjkK;8lgK#}Z?d;@9Ka(G?nrY8r#|q-i;7~v?gOdwbv5aP`sBBz<Up$Ai
zj@-TBHE3bPCw%Ehf|!_Gy~h)7*tnida-uBq@B%PMf`Fx9B40yo(<rBP&*#kkl{X@&
zDvBZuGzg#!U}Xrr@70I*diyIp4f+GlISRF<@Y{<x%O%*Ac)ruD6>$Nb2-iP>0UQ8|
z#nG^9u<M1RHr$cD_P-5(pZgb4Ga@evj1eL+WY!Xi*W|W9wjO6mJL~%xF%-pCZG7UE
z`uJ^R44Jb;KH2^LV*GyYa^F9~pWmNH5DuO^hy&K_hqZPYe5gz2fa-VzVbmPj6kHCX
z0Ky;%xmqS%gWCK!$E-VrM;(1SwqdCzF_ox7vzt*#Dpcbtw%elG*G;dJ|6li(bR6|{
zNguD{KvxKLWl67_zlj6a9Drg=;6Y0~5Ra@*f?6N4)S`v>hJr&u1iKZU29+&!&WO)r
z?b>5WCKI|@3WdQTq^<yKP%-pefm(yxp0))l%QQQtEkY3hm%^8<24iO-On_R@0$c$y
zC~VZyh$g5`)j2&no3l^8fU7&#Gndbi7C9(BvL!A2Z?&q!IW2(?c*`uHPJ#@8s-RZT
z-0x7RqmhhLo33+4^(@Xg@qAy>n(J<0qBe#^LN%)R;RsNTZ*}drjif=%)JdWki8bhx
zu#k07=Z3;-UzE*<F-{2+fK$}sn{`T~I?m|)2xrvK;M`L@d_Pf2ugFN38VU+{&8@2a
zl^!vpe6Ia5{<!cv9^N>Odye0qK_7==odb~_h6jjMg)r0!u7Dzg@v%|HTBDpkdOGLd
z=>o!%R#CD%#Sg_@XaQ>-e`^1ZuP=O_EGzh&{TK(uhf=rWWMq8{xE+NLM*z!40N6qq
ztBf$QIKr6|r*pwwLilYD8z<`HNN#qS1@@}$&DXkL<kPM9V-iDMN0^ss-r9T_&zpEH
zht_XP5oIi-9h@tN*X>$BAq;Dk(Mla=3}-f$;O};R>BEd&WC1?{M$IUnpZ+AD+4M0?
z1WBA=GpIx(OxbDP*nR~U@AYJkA3F)_EF$IbY|jF2*&I-zLUkS<J@F_mx@S4Os*)AE
z#scb;zqkI%=eK+kEd<dRtBT77b&y1LZtiX3+tXj;nA!<ARRke25rE&fTA(Yr3yj*a
zZTykYo$hhk_@kFRe_km(s+e75fjw(`@%^dq@X?v~Vk1lJ5+s7Ksj<Xy%+V9a(ij<I
zvD@_{Xtp_rQ>Y{f<MmO{;PzN%f%P{`GYG2=cXPob9{MoW>^+IY4lis3l;L*)1tN(t
zF7m$Y<=F~{ea2`s%D1Mz&IfONFU}MsNd=o}A6#&mc=$pJp0d}ox!bCHGMmm*F%|wb
z^)H??dl6>ba`fEYdFNptBsb|T7eiNke%&^}v}o;f^5lj!`>$SO5S&t8)hR<Pkda8j
z#$p5i?)`%Uqk~yHa=1T!%fnvyZ}UHVY~6<_az_$Xa1L()wIBv;?mYZC`(MD}wWDcf
zP2$K9xhj@|bpL7M$$~6zf)g<K(CsdSzCS|{dE=Oao)=f*A83Y@!uLJbSZ0BWsrX_1
z>Z@MDf9C(g0rdm<_;H_RQq~|wsV3E-!+wwY9{ghSFZjTQ_t4cYiK&8753K^mfHO*_
z84uq3Aw2GoCvsEsCMt2_&y(hs+-CG{N{Hr#d?AAUgUWDwkHmiR<DW1H=NxN~Is7l<
z+L$Y}SW{ZhBPdF@Zvj=PMm4T$U(YAke~ha-*RWdmWVSQU#echyXCM4L4sRSj)D9!j
z2tV8WQ{H;zTggbN#x-oAh!MnqFE7N=(=Jau@F_fSp9it2yNO<rq9_hUoj?S(7ojn@
zTn0AX247YT-S>X?WqGvQ-2lAgVMeeJiiw!+ZsD`nf0oNyS5lA1umvQh##DQnFW&Ga
z&OYR9ZaaRP&<=<SS2wTby;r@DUYb*hs@VRp$IwrJBd6f82c5z3<0sP0TEtPbtrkFu
zTmlg!s~~DXRDe1K6VwA`7O>WpzGjp%cy-XXfXNN3stsO$#T)tS{NI?UjDg^r3Vs>;
z_l3W+`I=39`p%yM6b$T9pX865|IB-?eJ`{5992{E{Y3~quXJt7J@>sk&pP~BtZS|#
ziIT8J@D}Rj1)0rhUuTfIk~x93iXy1$b{9ehD81E{UHSfry#;zj=C|WAfn+g73N{sN
zCb(4me$|e$abb!Jesc*ow$}Ogg@4%mCtmZ9H?VGgBbA~)=s)-@HdUJK4i_GL5zoH;
zv)H`2nQoqX+YGFf=38}&bq){d3~D1Zc<RJ0ErckK68LQ~ut0}4ryclMZkS!qzi0nL
ztx`j+q5@*X>qKhYIJb^3U;8y4nB9*LU-dCs-401y!xe=6{jkq8=ivuGoI6dPN;~Ti
zMbYqb7{$26e@-Hh1hAkQJcdJeJOQQf{m~&JG)Bge%-;nVua5DYW1qnXulOjxy!qEm
zL=(Y95CBHvF@8VwC;mA77ew&0J*r_JuNU(kr|xqSFFWytY-nyIj^ffX*;^pX{fOwS
z6EqgGRe~4=Cxc0_ycXCVyp+G9##<l{7eZ~SQso85KAS8r`18iUQH!f!KrJ2^qeQj>
z;%9lRReyZY2Z2uB;{3JeaModuVawvQPexTM<%=j)tPTtvfiWQBfd~E{avLa5fJm5u
zvRBl@Yk^MIL4YS8bt$v01+JREhI&#*twI1QB4_}O*GlR#?sxG0xaWR%_1-qdgu|Y4
z3wR8)P!tC?^grkhTcB+A_fof6pf-*~%WHvzy=!~&qEnyAJOB1U{;~OAe(0-&-zm@n
zqOh1Pa@1Z&@W#8poK3CGL?&7`?8`0C&GMy|;T8-Sp{M}@sGvAdU`Or(0OjyOIqWUq
zTcC61drcaZ2Cu%$i#T%fC>DDuZt&|7-vXUMr`6=qw|lsUpXtug$-3b=%XR-Q;9P&!
zi+n>RxbiyS*Oezg`~OPeMf`r+w?I~8zJ<D-wsGos)=5v`ps@q!rD=a%?^|C(FUz>o
zfp_5nhu(|A7Id@j&~uh(p9t$Lag;C?uVN%>FdmQL!pj~OL}4qnfcBe|y{=LW(5Mfy
zK&TUr-sf;$bl0cz*57}CYiF;c8jozN9<xObnLLDdKJYcnbY?MP!t<=y0yFIej^FP%
zetFK<P*tCd%x2-O5Z&=PKuX{NRUDAzxBNtCc5$Bl#`obZ_kTIh{Qk?iX?8tHQX@~B
zJm9bg@WfNjqm{O4r;8qDho2y+QaJy7fIUVhQFL&OVElvXj?MvE{-RO@RQ;D&$#8A;
zTEr6Z+`BxHy~p+;Uu<&pekbs-wfFN^y^}76{dd>`P8~SNUG8mU`|zRvS3Uwl2b8^~
z)j>JD^7jHs9COEmPT-aIeHQ=TbS0-9{Sf@EPADytS89R0WpTLRVuht}0O8w;ETEtY
zBBigW9ZFtiff7BlIM2RgdvS-O4yAAf?X=S$_OcTXQ5CD@@SfRkSGW)YR{Vb6TVTf?
zih8f-Hm4F-Zk<<SD9*Z4c)xW@krz0psOn0W!h)2;uiOH=N(UCmnzkHXl{C#zlsJiS
zt|S2^YryhfW~kCDvB3XUE7sYe@J^Mqmyu>U`|i8Pf8r>bC1QmZP(?+C!vm_0)R)6q
z_)rvK#d_x~U^AS}DQtqZ1t5dfFE|fRo)<)MMAqtTe9{vydGg%c98nZ4Pk@%(0zt~)
z@rw;s)f-3`|APfTldB7~`r%ny($d$}TTxS3PQ1<WzEn=TISC1As)z`+dWE7WSeS2f
z!;LpiJ^y)6f8=HV{m<nL3CW9Mc{RAE+3a4O=XQ-S{0B*b_*>X@TW%n;IU<69&$<90
zICTSEdR)~(cpM4zwyHDiV?=0oI!x5+JmAjvqT5aBbb2&fi&*CvA0Hty!se-2{(ITw
zTVDRs=RWGXYp?#@j#q=;0)hVn;ZQ#T9eu!&2r`&#=u23pRkqC=40Jfb2HN+b<g?(D
zebrT0a_D{sl4XSlZ+Ch)=a`rn!EA-!Ji}#|U9sgAFMIBzOW@02j)tBWr1Ym~>L7Dj
z`7blJ_o6Zc9ni8oDSZ`e5qwNdPqFttlODVb{^d*X*Isk=ZwX`NBVfmWhque&2`6Bs
zm*)QQ{Z7D_)&jdFye_jymgU%;ga<Hj9I>@6i`@=>c}0f^<KsIA4`6=y!yobA|6b;k
zV2q%;d%`P(|3CFwg(%uNcmVUD2R)DzPB@;ozy0lqh))E%`@y3M!SdEx>u+^C0AD@_
z<ay3>p7R_Y|M<syZK7zmgYR#>@10W?7gLtjHY<l;$t3vEkA9Q~KJbBB6ooU!>~`=@
zl}=}oTCK*G>6tAre$g`@+lQASZAB3S1Rv7h{qA=Q>(|}%@3n^=dGA)MjXy~6<;!({
z8-DTS{f2;fU6PO>!Ol7ItnjnHs+)V+OP}|IrA5v^fW5(o12our-ETI~;oo%tZu-fn
z0GxQ@iATNt9q)eIfd?FPOkU)J&Z5fl;z$C`woS>EUk=O)JnyBF7ZzJsx%%oW*T3nF
zuX*3)mtX!jptcO!2EYZ7_gf0|`rEXBtN>h?fTW**Iv~|*b!2>OY(GUSK&%ikXo?Xq
zfFPK%AsB4?T9zLJH0%-{81e%h(RRDlO4BR{;s8Euc1QwxK)2sgAnPA@;TJXiHUJ%f
znP5L`A$X`+uETA~v1QPu$6RRFAwykDlHn5)j*!3tr6EK1w+A6BJjY5x%lE@$<;h#&
aIrx9rA)E+<6hcn`0000<MNUMnLSTX^iQOUq

diff --git a/src/assets/img/files/gif.png b/src/assets/img/files/gif.png
new file mode 100644
index 0000000000000000000000000000000000000000..303cfd9efdc5b3139c9f2ef2bdf9ae97e6c87349
GIT binary patch
literal 1473
zcmV;y1wQ(TP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000GuNkl<ZcmaKs
z1CaDg8i1cpI@#gcyJy?BZQHhu!f)#<oqdI~Z5yABH3rE{lGdfVZl~t>rk-~9%ZhN$
z0bq=Mc*#xUSQc-+_^p+%-{gx=Zd|W1ZZb^P)7-Rs^XUGS2mbm^k9gg$jI)uW{D7gx
z_tqgJ8J>(H`3(SJt)*15n5OyR3f21I?g8Gq`fC2X^A~JKl5}z&WFNvc54?&STyL3H
zF98S6?I|dG4|t{4Ap)T%Cr0lO1Y*AwLf{~-1=V<e_wT%R{dpV<4-z+PB)Z4L^uxIF
z?pHB4w?Mm>A^^w#5dqdZX^g1|5g?BoI6^J1vs2mOwW}}SMDqakph`-Qhww-)y~lOT
z%*>J%eH{FM>j!fNBJcR{JFsw*g_(tS&qhb<hiO!6<TB#{okwuNt*&K$Zk|kK$UtKK
z!-LycERMa$K|AI9VGZ&YAHEqv@_?heClR_zLZ3Ug?#VMoUrCpgwX=UFARsMzG)8J@
zV-W&+c}BgQ8)q=q5{roIPh1~c&b^l&2*wucRL4eyO(n@r!2`A)#k&^HCmYGw%r|Hi
zyL5G%mF`(mlhDyEKVR#eLy@CwLC<tpPu3BD8+hqKS|u<gX}92E&4+X4o%gY0Tm0$R
ze&VQtGKw$=>68}N`dtdG5JFHC@T=CZ_-XPzp4NN;6<hnK)sA72VGv-o<sl;v<jVVA
z&h*SQ+v~ebHzt^APNIyaJcF^ioKKPKf?8PPx9YciEWMV~`3ZtZ@T$h!sJI%21no2f
z1&4lgmPt8bFMZU7%+Jr0tDHg?v`T9yvL2b~Ga^Q4m-AX&C3KSG`7tg%ej!P`i_=wt
zph8P_*w?z42S$(L`js0Ef)qUX(1Uoqe*BLX78b~g+`AZvkkPoo{`7CW^Uz!Qd+%>d
zRK^)ESyd}seBwg3do5Jo@ubP8^Qz_7qioLSS|4RCUm<iM_;?BAC-;4X^3m;1r>`6~
zas&iI&{l1(Ja!GMy;ZJAuHyAKd?Pl}od35AS<Ti_ndOP|kK=huFF?7%m$29v#Z^Ow
zi&+|Dz183bNwUt;h?+cl_OX0;|0mea5-x9FORZXAC0)l@!NV3F&TDS^8hX0#&pV*M
zDKU%Su<U7&;AOZ1d}5P4<%!pSEUj*r&ma5}JFd%a+NDsIhu!djJmZE>rCTKQRR#i-
zR&+LUbYc8kgE9qRsD7<=#9_>Mtx2O==e2ivDb=vXM}PYnC>)Qz#Upt8y<f{#cZad^
zOjTDvI4A^<SbhYPBU5Or2T2|%*b5N?a-Emfwy8xmj5R#v=8xs%`Z*Mam)!n2w938h
zWQQn}-g4~>n1G8O^j?x8_4naFLp1n#2?R2fNGWmJc?(~7=ch40Hd|iy3H5vB8Sk}l
z0;3$M>U)EP5X5mrB*P&ELrD%rKrM=>#}!l%5C)Ps45&mg0_Ur&pGP#x{Xz#g0ez)#
z&Jx8jn;RP&E9XwEjf_M{_|FQe$SPxU5?6!>8{>qaCdSa20~2BqR2ik{IkLhq)fnUE
z%S+|G8mCU5NnY{t7d`t=fBO9jfDFSBrS#xmu8m=`Hp#tiFpaTxunxkz?+vjQ5Z;(1
zN$ICunhRqbI&!4_vX?&psek|5U%o%c!TS0Jv$HechQnmh&I}&+pY`JbwnQLMra;J$
z(`V20Uh(o5KBIj6dkjf%>s#N7&wcLmG@DJLC@zVRB~c{(*dzTK9_b<Sy`)yFvvO{w
z{h}8>_X&Uf%b&i@zli`CA0MCo^rt`nwS~o{o2xQjrG>&dO1wK_&ok@iZqN%61l!x&
z`hy>Q&j<hV=RbZ4r~?W}fdt3|P=YKit(Q!ckA{E*LLdOd5X0gCj4?$iJs<`&pn$$t
b0{K4xX^my{PtL$800000NkvXXu0mjfjF!{6

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/h5p-64.png b/src/assets/img/files/h5p-64.png
deleted file mode 100644
index cdd1c9b1bc657d802771805efb9617cf744654a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2837
zcmV+w3+nWVP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;|l~32s6)_Eu;Vd3Zh9w
zK~#9!-J5%iTvZvsf9KxW*}1cCc6PTd1q!r0YN1aktYDguG=@i^k02nR2%>)|8U!V1
zQHY5OiXlc~2nuSIS5V;}`2$-_Nr6JC#q<TW?M}D5-EP_LYhL$pKL6O6?L6+x&g?dH
zwkJ7zXZD_R@BMw}`@Zv?@7z&Lv0V82-fI_jbS&RDY)eB!E#e7i4O&2ZAOc!YTGL!(
zFfb6~!_C`t{CNCX`Qul6IK@R3JE66{+_v2>0!Ho`8T*rr8`p0+I@fB9+;(szj<y;Q
z*9A{!Rd4L5H4UaBaJ-Ls$wNfWznGf(CLUeZ{$o#kub;U~(ISY?dEdS|Tvz*sp^U9%
z3&6JB`;*DkucX)mxDG%2c!;;+79R~H(KQyh-ihjX;JV;ya2y&;h$N43XUkDmcP^p5
zy&c0a@<p1BhRBJB69kd5Hfp@ZSQ}KP|Cm5TrLQG2en~?q8tSe4t#IwH%Mw5=mh@cL
zGm61KzJHiEV-`CGQ+PEN;%Kz15!XX90&qN(>k>vd+wJG}x?a{@wUoBDwjB6zkfI|f
zIp4=yWPg|Zev;iCK?nu|az;yI0aL(Ny+n$_|FUb8P0293QXWQABVv2w06H5(L9MAc
z-|6K`4SlTZJazB@qWuRuP`0;l9iHrtu_<M-TZ7S1k9Zoyz{_$JI;~hi;6mpJH;4OK
zw|wy_h4*zA6$!v~c=B+JjfoI@Ffr;w;H8Z+jXo{}1wn+l$s^nx?ql7uOR5B3CMf{d
z;aA-;-nK*RHUg-S1zKaE05cmMt-!K{vqyWmCD_Z_r3<PDUM8afuEP`2Q9f`jwtFTu
zbryo4j4@Z6D+H59g!aK+ZdFm%R1v(Cm`($w;D2#ogb%$in^Oi>qlIMVCPl6glt~LN
z_5D5E=KYV=OD~xg@Wln-IsE*SVcvBtwj_mcQwZ&83{fak<p@D3h`1W_Xg7D*A9K@^
z>V%g{e85xtM%Ww=vNf&=HrAnC50$oa1IC4*l%iE@q$kQ<$-S&vT&3_O)Sy5B=e@9f
z{l+1a_Xa)8`Y_rZb8;pcoh1arG-yS`;e*^ApPuj(#`&=Pyt5zsV8B6)AfBV~+_5On
za|LlV+8et;tLLGj2f1r>FRK<UsCsxQcNW+;m?C6Zj3!*4P6j4IL}{eAi@V}`xp5kd
zd_^W;ge@4b5l4fZ2yZh>hc-i_qfx%@d~#CY`K;i})c^w!S0kPtkMlA@m|-eZ_aW}l
z`?zuGrPF5QMJkyEbb1}{xF9AvErj-<f}Sq!HTHAUvgrk1DzV@%fXuocKq(?YgPOi5
z-wbxKdYZzQ?F4f)0BEi;XguD{J;5$kU$$r(!<TCUo`B<`9G7swU}mhBJ44;9S-yzK
zX$D_Z1C-|xLYQOsaeMs{)?TrATEj~vvw+f?fC%&CD7VxNu=dK+7v5I@0br(cjI~Y2
zS=*Tl|M$IvJh-U`Gb_0?Vr#m;^*LYo>t5N<fgyXm?Kc*-^6h1jvf*FaJ;YDn?f1=P
z848+eP3E@-Su?kR6=&6zgfDv<w1$pwQ_}#~U%r?~B$6}owiZTh?U$qW9r<BfGn6{f
zeo=>2(a5JfVZ`r#=`xtobPYTF^FWM6ZMD2|!<qi@B_hFswZNNuk8=ALmK4C3no5eR
zeQxQTWlaE2S!pc4@}K?`4{h!*3NPgfz_V+HOHXy>!sm9FRUg1K)CBNS6h0hK%xSD)
zc75?2&a0n{;A-)QmvW~;r|xP;)Q(aP&({KqIK1)EKQmkaf9vaq*wPa(YlK&vRmX3x
znK2IalP&#h*gag(ZtIaGSI)G`g7?(`p6L82<w@D_lmQQL#jJ3_$Y<bdjImm(cp^F8
z{zuDOecK&Ncm?oMQ6yNw$ouZf74ZR`v+8o-k0(4H`+PgMT--!3V;aD=BXOSm;8V8r
zBuYG!&=Yfg&s*s!DjS|kmc!-E^SNc`u_Uh6Iq<cnBITa&;IkV7IX2%MGPrX=bDqKo
zOFAqzTsNByI|q4WOaJ(pp_FFVu@p&9vv1Jm@%IOOpXJiFpfCI+H%7|asa^Tf{*qVe
zoE4sU$0lntQ$+ak{3bp=ZnI(c5CHG?CRp`acgg!)&{9Lh3KYVZumPhuczN*Ultmq(
z0(j38zPquPt6$j918?=B#~=2@&DLMhTG4%ecTI;sJd-eiqT%f%%G28iczXK)5zAy=
zOOUzEL3Z>f`KUhyK=;T9gGtRZD`)0}x2B<(-x_4sr*_HfFO1ak)QUDb!lo~LMQee{
zz_0IYADe%(ItL8+?e+l%l3tF7K9)%Ej*o-;S2X4u+s~{Eu<KKsdCfJfnb&}qeh;A5
zRLrb1xvV2ZW35?q<R#zi%G(~FD2JC@?p=6>Z-n=kU4uCS$drg>l5jOK=fp+NZ?5rO
z*knTCbDL`T+JdH{LC$30%W{I{`hbE6FRRbWId$AIznQr$L1xqi5P_~?n;ZUih*3w=
z5Hxsp<t*P--S(r&!g!-n_{#SNrL6F_D12VoKj?7P?7EyK?KzD>c6{YLM(i;G_`$!|
zo50ce+F3b#sb@FJ@c|QUF_&D`0s97RHbzH%*Ym~TMd0DL`%fBtu~^8MGCZZ>Gv)3#
zde}3NDm$5R-=;pIBd&kAUFpb61*^eQvAwOORP%x$XEaZLuYEPj5B`0GLnBU6_)XC`
zoiBFr#=%%l-?%GNgD;{2zAp|94aLN9y(y)!v<ONu<uulmY(5LVHWXye*)vr6CNRYu
zUNylB#oq`m9txl01m?+vCu=EPxequk;K6a+$%Mk6Exh<>-pPPZ**036mBj(46MQ_L
zz%bOF3M0YKc++B%@FLn5UJKYMn|LBYV}oU1bip|*CK(A<r_H;bM<^6vW=AV+k!G42
z>aeU3mQ_p38BMe_*JBuh>pIR$FTZ?|GK{`SM1s``@3=0G9cM;+1QAFiZAM}V;)xW2
zKmZX<^iU7`_D9|4pL=HUs#R+bQqeS6#qcPIMh_CULL?F?Mq>$L@g$z7X=n&znu@Nj
z!yNAEb6@+%i;JH7!!tWCUv{xnCV&#*?WvyXM1<o51Gt_yA^e}7|NYL1mhpk<1fTif
zd74zp!7!%=U)lt!I>-Urai$DEfeBP^gqQx|(3Igz%mURO-fBXj;FRGfhy<%Qw%0Ni
z08JIXcqCZW@PcjI3=NHP^w`jp;EM}DRqv`Ul}r&&BoGYu)tCRgblbM~_vC4^l$zLz
z2_XFw2n@hgivNn{l1vt%YT#{~!J#3}opX-+!-pSS`OZ6U_q&eM#@O4ul2vuq(Mun*
z>v-F2@Bk1D1Om19edoTJ4}9;Tzgkv!fp0#gAn}>|Hl}2oQI^*(*sII_U0>$p_^&^6
z1?1QcDcd31b>Pq=>%af#)~)YHwbnWhHXGOloODeA$@DRm{+|nY83CAS0n`GuhGAG*
z>x^K6Ku!9*nXX2<nt9rzvTA<LQI*O=`tHp7t8h>$WyqL{m4f%upmrKQyV}_TAPd0A
z(gxE9IKQea`!n(&RSEF?|A`N%_#Cr8XHw4jLddUPy1G8*AZmh4@kAr2ii~J>TPZT~
nY63?kdDoCKHKvp>3-0rOaJhx8=LF=N00000NkvXXu0mjf$nAFS

diff --git a/src/assets/img/files/h5p.png b/src/assets/img/files/h5p.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3554abbf022ca76d1d49c58eb3a8a427d6be662
GIT binary patch
literal 1246
zcmV<41R?v0P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;|l~32`wy*A%*||1Zzn|
zK~zY`os~;yR96_sf9Kpgk2{l$CNVKSrWP$URidD=*fyowmOh{lTET*q(v46z#V*vY
zidex#SEXQ!E1`%1p+OfdO%YnCuS#P~Dzz#Kt%=EG@|wxK?&Ex2%w%SQ6>ZL4+<Ok^
z{{H;G?|k1;0G?M;t}8D9?O}!a^3QSm#AIksLF|w!x`f;!>&%q(>gv|Moom|$Tq9aU
z5CH%I$`e5Z1&r#j^-Ch=h+P(t^}Zkcq`|(JaXC2~WvHMC@*a{cup>Oi=g%iu+S1gO
zEBSLEL<FJyMrvy){D@Lrz*QT-h&Yx~`5UvP#K&WrJJC2{@hJiC>l8=2pP(Tg$2W2x
zoO<}&W5@?V-~iYFj#l(f<@xX*#l5&g2(U%iUL55}*BTn)am)kYQV*|lp(^3C0rm}~
zmz~bo;gMJaj&BgHc%$$)pLH}X2o7M%yUGH6*+}Pb&P0uPxFWolyTPFi$^V4&5V%y5
zJvVFsC8ABigCO87FU_G%4~EM_;B)ixzn}r6=wh;Y-jxv!cQ!vTERPDm&w-aO@j+~a
zL(e_MUs+AxwMjO$JFHn8;cmv|{BVxV?GBG6LREOS6!62HEEb@E4XqK9jUhx#)oE2=
ztBm-czPJ`A7UTH2yPUc{&B5+=R&NN?KUQGx*%5l)OtPZECgTQZ;LeQ8zMsbkYjDd<
zzS`EtE34ua$8`eRyVmw6;*q>D60>!AbJS7@5Vas?D>_@FT)LO%%&iOsPZ&rQXbfqN
zzrKu~>lsen$nxuOftQjFN+~dP0^KX(ldkLg2C0Vc``a1D^B&jIMUsgy4PnjZ_9z?M
zqIkw|^vWbh2d3z~ndRb00f5C3T@8;BRTD53OH$+W+r2!4sRG47Xp7l=ePx1c=@LWZ
zMZSA`C3`nE^Uc5%y|=PNEXC%f5q5PnR*x{4nt)U*zLxz@x|XneeKWl`XE=NzMb<TF
z1<M<3O1?otnx?45v6q*UY_y5lYF>Sq`bw@gE2#7v2x*0-!Lb!NPuSU!pw+R+dxm&O
zb8K*u=~6&rSj~eQBcKH8PZ3f!WFhQ$GC}8(2wRrN5E0h3L^$wt3q$E5TUW-2hcqKu
z7su8d+|t6Lu$~96G`s3?RRA-Y+!oLEe-x3#!-`16RM$<llh(lnj4|18$bN0j>J{hp
zoP%1D7X~+C%5P)H=kva0>D#qdp(?f(0QdZWaM+@G@gf{2LM}I(8~S5#+vBU2jn2!#
zLf|5ho1I012*xPJC(^^e_Yb_YXZNnF^Lmj8^RB%A6LVt>qF{U?o$D{dFH<+lAu@sy
z)clsrBV01&A{`w~<@);0ZvANYuFFkL&8l9&2Gr>@y<^Wl(|t)`rSJR77}3TAsw^z3
z&ehzv%!#DNQpKL06JPY4{B}ku)iE_S=>j=m7APpCloAnZ|Na9_#z=H}dfG0zt}c~I
zItT*od7eguAP97|(iLcJ84xDY6W)aj=L(hH5CA^l0wuuz7dH><u8uEpB>(^b07*qo
IM6N<$f}563-T(jq

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/html-64.png b/src/assets/img/files/html-64.png
deleted file mode 100644
index 7f703bb834a1ce3c26bfd722fbe515c9d8e562f1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2150
zcmV-s2$}bZP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000OrNkl<Zcmds-
z1(4%95{7@t4sHe?3_ND$_m=sXvFMnYnVFfH?}}@;_?V&Kn3kC#8B8WK6N64&aaZ}e
z#x5T|C%x5?(w4LPwYue&*2)-zWHFG}mC~4+n!>f$UW?h;+2T9i@s1Zh>|qbPui0#R
zl}ZIPo-_<Y$kugToIZV8{r>mAH{bvM_rLS{*T4QJPk;K;?KOk{ju`&rE|gNxS|Ldi
z9boO-gCN{&Tg5*|qP0f5-NuJL^dVm<-1xu;KJdx(o$L%MH3$NfN+og_mX|xYcx()#
zBO~=&Z@u*^wc5av9it@#i823~0}O~?nPS2HrPk`FnH^xkU)^pme?(qmk9wYmbLY<3
z**uAQy$%uvCFQ>F`!p7-R;|Lq!UC$*8n$fNhD$EF6po|O>2$ggBBsqSJP}Z%41bTI
z5~09mQ{+AFJ6dCCsQT(c!Tnek2UINlF3<C?B3KFE>3BGJa39W|J&mQMC6ExTfF~t*
z3tc66R4P?$-n<Rt<KrttTVe<^s(=;nM&4)Qw<8EcR4T<I!$Y-OEpHn!ap@l{q+$mR
z0V~5FI&=Vy#(A1u6bc0bj*lU5P9Y2r52Mv;(adAh=B*eX8~cyoA>oB%Sd17-^B4x<
zP!I%VWAM)oK(Yw<4vri-i0SD%!J}9#S@-}lN*I1%V8FsRQ7ToiVZ)~X3cOhn-UwhG
zAX7sTiS#DiZ1A3iKV;z>1aF}TJ_NH%c*^<t`FR^5C9GSwk;49dh37u06gM0E!3aJe
zc%(f#d9`=lBG#^5p9grhuN(mcxsqtzUF{DaK7g5-hV4_>7h}&>4I#89*s(Lvj*Hc+
z*X3vCjS<-C4j?#M;c2xO@R0~7P(+l=Wh#*9Zmhm<4JPse&;0~(w{PDbd;a?v85zZ=
zKmB=}Idcm2`dNbKuqQ>_Vbmw3>y1VO#wgr(-)c-uOymzfA#L5C{p@Fm%joE+vv=<<
z-RUf&-CpDcFCHBP%`;D7Z{epvL+-ifzC6OGu30WUt63=QpZLTlzECL)&&|yd96#4(
zibOf@5<D%AxclyVa}94;r31eC&2J(mgBM+N(euxoIm6{`;&YzX1cLXx{KKb-OFOt&
zPP^@PyG+moFD1U<5quC3eBQ&J`w44+6~u*ibp%JPgs)aBwBYqj&U4=+<bX@FDNA00
zmkywapbBqlYMR`Hd+%M{Tkr|hper{sbQACB;<j3?)-7_hOOLvqfv1b2lkNb9C*_$R
z92}tX7LHTI>eXwh!s{7$9?K>vng&ZHXx`6Lip<T;Tlj*l?br1cJc$;^SK=_ELi_n>
zW3!>Z;8P-iPjW1L8^vN7>uEnfKGw7FCTj|C_!Io%;-U@z3N~)sjPbFahG%28MUd(O
zI?SMBtj+cqYpgHeQ=S5}*<o=UhtBO$DOa&}{f54QHzqj>+!H5GATGy`AIGB}^;nzp
z6HMFd@adbOojZ4OpBBI7O*h?iYI1UNR8vi0On<<qrNE9II}j7^$}6vYZLwJTUJwMT
zZ{X98#D4h0A0l4w-*(&Wzf(%h7-L5J3O;Ew^q>bl2vS<D#Ta-m!?Q6Z1%e<1i$qp^
z08dS7A+#dA;g8;jkKLHr0W5t1&sUN}_d7ffO-cbb4PNyHyx{??=@Fn*)af61wq%ch
z7+OETi;2&+2J{g;^PB7uV4^?DsGf&Md@O0E2r&II^L$l;XG{Ur7w}+ulQ9Lvy!SXf
z^QY_v(=tHy0etL-S+hid>E5VR&%+yPs1+VacR-)ayx}%9@I4=)ZH+NmOJN1o5Aas$
z{baJZ1&5rFZ4KbhUMO;q03Q<kQU}W&4-*p?{>^oqX*kH30`x;l<+`>f!1&P(eHuj<
zy72UZm*YC<G#5_4@CDC)5&iGB<2cd*Ch-xdatg1|eTT7Dt6*@T2G93xn0ug?I+ao=
zSBmhhZEm)OqsNY&f8A?e_Sjv2|J!b?AewzB6;Qc_r?=0;u!Hfj3!t?^$HFhPm#}18
zx8Q;ny+&gWfBMVc>MwoC^B!;Ef0y|{Bu0?W1y3oQI&}iBLs1Z5zS%}|VF^J%?=e*2
zSo^v2Q`og@cm3^eea+(!A3E?Gq=-gB2;>u<#)P1kH7ML$7MwH;yYLhZ=gtxQp8DG?
z{Go#fehn#^O5r@hvpu?>!kv!qv%_akfn4wE_<o9j;6H>X(XQ)&R7mdNA$N32VPN1t
zgD277|Nal~_rLD~Ie~u6<ha6%|NWJ65svep!IS8RJ?x>l`|i8&v5$Q$dO^YgOrCdj
zhF|2gtNnB;eC9QPii%gi`qg;e^PUIlYsblLZBKbm^?bX%3|re|fzQ4Oe&s7)!9ySV
zP~-c4sI|@=d}wuHp$&R<uiludzv+#ycwz*vAT^`7QOh@(-~8q`b0<$6|LYAm-m<;f
zY;}!{Nli+h+BmR*94Em@xSzh+p~s!q@oDv^T43g_Z+Y$WZISaQ0AuJ%NCUa$exw2S
z#dX8rI&wx4pqHTUx%Fco|I|k>yY%wgJ>TQO${5JakrG8y)FjNj1V+lti-`050D&K<
z0|)k={NM-P{n_2ScmDxESwIIdVBe}2>9W<Os3rBH>tWmhg~$OFvXx4u>OieFX<*3a
z8o&XofmYpn6cluF2y)APC2it_MzKL$U~eeXYBig7e@_4|!wU_h10wiE(#QcFva<ug
zPKcC28H{aOD#MCCWM8z9HVK_#3*+g^DneU2gVh%i!YPm_@|r?Agv#_A*~FxMXIq-{
cGX4hs0pc+tm#2!vF#rGn07*qoM6N<$f`>sX2LJ#7

diff --git a/src/assets/img/files/html.png b/src/assets/img/files/html.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d36c22271d07e0996afcf2725b414cbc1a32e29
GIT binary patch
literal 888
zcmV-;1Bd*HP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0009&Nkl<ZcmbuA
z1CTsN7{y=rbkFLKi*4JsZQDuNjLVm@b>#|6v003hvu*p<+nsNEdn&zk)8U(X`|ar0
zufGw~S|d`ermiI)9fqRZ-27Vlpo0#)^MC^mXet(qwQ{+PN~I#x>CBHe+;HO$bdCf`
zH~yHaG=vnvsFdOpkeE^mbi#pKTcv)+cy4WN75)9)n4h0Vp-@0RpGPW{#^sk^g+mTG
z#H>>$vbJoh#(<6%rNKC>?zzXV(>Q0{f-weC7z9DMva*8i?hX`-1%zQpv#L=|;erb;
z#(w+lNALpvRt!)|3pzJVfgyT&dJHU;%Au#H!$8yNG)kqCNp<F#=U|_G_C>i|F$wWk
z>7Dgh{OYT(#*<Gzxle2BFEXFsLNp_48(HJ@GtR=k`|ca{ABJo}@WNs2jv!iET0rf&
zY<YP(s%9VO0ZuvPbOUcl9#<dSRC|oI*kg}9qJ%7J3CYah?6aff``P3PaI+-BjqB3J
zJc7_|XzmyxB+fbKf`+!}q~r=zli{&ragy1P$z*Zig_l@(H5m@TpB#>zYw+7|zeT-Q
zH{5VD_TPVh({pcfz*HBMI1{tLm=6pLMo;l~^wgr_!nF_X+TSJ^Gcdd1@b&dVzt&1_
zPwu^#{%rvE+joz%q!7OeN^dqcB!@3K{uZvtwm(J!R@>ol;LZc&hsU;XZR`x78(ZT|
z4li6qRoRf%0#<R0@V9X7hg-W6w*G&(`g5HzhA@<nB5($Pg}@8<*!F_es|-Ud(8pwY
zYGgK*k`QJq9Ef|tV?YeUc6g;)g%k|AY!+Yv#>Xc%pL_O+2U}Zzod${9H>hXoXzZ_Q
zYzxVJoE8=qAY=+7Bcp3iKJm~U1pgXVd~R+YLIi-*9wa^bzWytPKuAnZPUfF`_VN3=
zI@`a3BYxtEC*bY3-@(qEJ0WFAmJnnq1zFZDqHWfqZfUAOHk-rr)b!dDk3W1{M|<n%
z313j4si|r2H{N*XqXP~+=-3LqN+}tmaLmqz#W#Smvx_TZoG&dcRbPGeg;(3#et!=@
zj$9#ckvGXjW(N_JG)LZppn<)8qsqz5u`5lEzTst39zaO0+5rl7kkTKrbQK*L*1mWE
O0000<MNUMnLSTaMv8~Mj

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/image-64.png b/src/assets/img/files/image-64.png
deleted file mode 100644
index 2d8f9e4fadb98d0e982887883c89503ed8f9df08..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5800
zcmV;Z7FX$sP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000(mNkl<Zcmd?r
zCyZp<6@}q%pL43ZC+H<kY-&Su$z0}=12=!10|!owjLfM6$Ih9V>xE8r?_PdrO6nS?
z>2dzi)k1fzvr{GU|IG4wMt8okZTpuA#9Ji!Yg%0L_x?o$AVjLFTpia>=A7S0d&Fxi
zVBh=0o16P@C-JrkBrY`w2oi)sDiY+8)c^tEERhIcj^W*RpMQ8btndCk0X+N6{LfFP
z?Q>P-ZIk40zJB1W2`<fE1{%m^CG6dvJv;vKy?0-JG06>QR(D?nkmOzd8Rk97yw{q)
zY@7gupo-r6-F@G$6E~b0{zW8^Cz+2+^Dg@y$m7;1l*cT82iMm}$K#U3e=-4#DmS<H
zKK}TI5D?_e0;uA9KlqWK{pL@~(4r7Q2^tX+Nk9vz5UtS|iG)TV5h1jwoV6jZv=S}S
zp<<1)^{%%~pEkyz%9p<IdEflnR|o+J6!MP;0PApY>QbX5REQD?Dp~<4Eg%U>Qc`qc
zQzRrBkdV+2hKT3@#Ph}8P3@B5Zi^DxHd}>#Gv;(WtVb;napsKzs4>j7)EEj$1VV~n
zq{Z1l3kgW3y<&z+M6@<?HXpIlq9g+`kVLet%5jz+!zpE;w~etJ=1^nk4r2jA2s|}_
zHHNi@8dH$8C=w7Ph4T*&LkC(=B8i|f$V3w)TB$^|#JNgFL{Z##scN*|cY3p~rm+rA
zC)BP+U7AmxSOIfbYcht2&J>i;r3Fn&L@N<1B}x)W?8WGSk%%FQgoQwcgd`%SR#lSF
z8)?0rjI?<?%2*y!=4ui(3j~nl=@l@lj5*aTNg0VoP?M36DM7WQbtt5wn_V12Dk73-
zQHe^4sI<bSNvV`J5INnszx%{ETsa)3F|X{Fq|HPW85le=9|U>h07hAJGE0J#2q}cT
z>T0DVQxb75<53~#*hRw7qE$*1N)juBilEZ6?@s&4tT?P;9<N17T4j=Gk*4OjeEGLA
z1jky|pi_jdNC+et24oPD)*_;ssdYjz(poUYAXHi_DJqdZ*+bcFryIvP9N+!GTu13$
z_pS=2PK>nJEfHsuAWs~EbGlkX)zAtN=bo1cl7LRrCD;`eGDNgUh6*JrEl4k`8oRB_
zrfoMLyMFPG!#nTF-uAt9PSUN$FqC~ekv6g`T#deLfgs2m25=a|;jmN<(XV<lDba`s
zO|+Z`nU$7F2O%j*BoL`0bYdtTPR9L>@o=(UymWZ>+}0<QQDwh>kbU=Xds3s!IULur
z)=@VZ^U^#B@`f{DmaDbY9FmCWl<4#NN=S4{kPZnMIuX%{BnW8<35{do#eS!cL&m|U
zv)mq*)7__%_HcJAqf}$xZJ+7K7tdW^KUZUr7;C)x1_5uU1rEn))Br&zq9i3E30j9F
zy3ZzCOSg8`s;6k(anPP+b6Qspqg+31x+43@UhUJHPp!Eq9F}o4spqzRm+VGDak#oR
z*8vCtk$74Fhc!GqPE`}J=koq<5IU0ByTz2yX`Nlts)r=@M5Qz;?KaDfqjrB?=ATJ5
z3!u7|H4A@#_m*QEI1nTu;YOanad&rjEgLHzpR#ecl5v-E8GG*T?(bdK+?xvoIB<Mh
zcmMNh7o391NT?*hmZNL+T5EUz|27rT(GgXEG)+lb9kOgnS(R85vCv&0&oj~_CT+I?
zm`x`5Pyu&>zc&R$mLy3qMnHw*v7Cd~6E)PJb*_M*T92Rx&>)~E3JCc6af6_E>RezU
zREYPK2yvB@PY1ZDiI@h5&pypG%UQj25n~Jsoi-W*HK_tso|BJ9l+($b;P0IPL!)64
zV?iO*Ab`^(plGo5em&aZI36`nD<A{}B?Li(Ierg4-U<;OON35m%nFaIDvGql=xBrw
z1G)=sE^XbQ@*W!}SOUJt2?CjS_47qNaU7osKfPBAs8U;?m0FCP5MY@vX%tZKN_|WX
z*3^KN8e9z+^*E(IPfd^<TSEv6i+IQ~Ztm?dBE}apW`}*&);CyKTq0>UD7@!rZ^%+_
ziSclZ21f{iEX!&;v^s5?jTlaW=N>FDXD*E_tu(3$P?dSAiz@b50R;f2mZh&p*49ek
zWR$&7+X4tD;Dg|R6)jlxQ%190tl!~QW{G=iw3av74RP&#PpGAD)zQDbLpIB}bl(+{
zBxW)illEG~1YDla!QabO;7l1Sjt$M!5*t&ewFf*xt`S}Z(Li$Se-|vC8Z-op)P(rC
z4T1{lJx*(~>hnU1aVd6VlZ}gOv`Wh$YBSo|hFONMazYYu)E_aO&Jbg0G*S)^_A%B{
z%w|N#ld8?jm(E~TRXDE&6h%%Qw_>5u7OZiUK4m%bsCVR5LFO%$iEzYlBI)CB(x9M%
z4}w3DeGs&Mj^d83(Nra1zzLJkU@|#kd-n-KvrV(rs1v`;Gj8qPV((zU^2H4_i8<^a
zA_x~&dzi8yn@-3M5AS|4^uJbW6_B$b7#m9`EpgLb##NV~u+VfYR|AL|^yyLh<RsMQ
zRtYDdz2H@k=kb9SB`pd@E~3(ib*bo!Wky7t^oU|%91KyMfQ^|>BVP2GFW|G|xV{?P
zeEbP+bYqfshiEonG|Sn%vdPtMd=~uqEpX?P#R?TMK8olp9@5(R7*1lmU!hDc)uYjI
zo)9Tslp+|Yea@-WS3&@4=_~3Zay5w6+CB%-Iz>w`D6KL_^9jRSI~+z0CRxVe!HDNQ
z|2pkXlZ{-sZ|V88aU`t<sZnw)Aun0kx{RKNt%}}j2-c-23l$MXd=0a;1SY0Y9imTs
z1iQ9LBtz6LlEs@CX9>Zh3R(m91U0CyEmEJW126=l5Qx3QR5?|VlOOJL7!sPjE|&&-
z+<N?BgqX`$Hfi}0?X*SGUZe~G(`-W&LnJH?ck$yLqH_IC@aJC)on1sk7K}A@3I{BK
z4Kyf{Hi)msNRpzufcG8LHE6~sHh}s!oXB6$IRPFGidVt<dbLStr1YGnSvq{=*u2=_
z5-Yf*&15p-U>Y&HIVGsFvEHLIyvcB9m;I<id})j4t#;{UPoD*#=e59@2+(;!B(?@?
z<y28zQEejWHR{kq5#vb{j~s)fPI>05!w`;%slB1hbAklX2&0ZhW0{Td5uw<}xNT;$
z1NvEym3)W%**=qIkJj=U>GmFRF{FXzz6C>i^F6FA?Gs=A3eY(R=bs483zBlWAfgx>
zFjjy72%;xMRAA&3<8oZ<^EE)LdJJAckAVlBs{>zPr@Qz($N9i?s>CuQp6xT94oT98
zD{@5h!V<l$wYnTuPBXI6l+N`n)*FW5Q_qriD@N;|NwoHSmQQfp^F(OA=Mn1lH*lID
zMNmLdsgCP-AX)(x5J3=7P!muM5RSKivAdM_e~|H0hqN|&bUIHmeY|8aZPHokA?*$;
zmp4e;mJqeje9Wj^z%*`B^>=ytc7YxD8Sm~hXkQ@O-(^d8S-t_BiNf;}aK<{u1|)JI
zpn%N50}3husYwZ_c!UX1fJUehC})US1Y?lk=k<V)-6r4LLo0`yP3TY7Nw(VD*KHFj
zPw9mspOGJqVekxoZ=0f@^T=V!W0M5YKAQ{5XKw@!W*MbP(DCfd_dgNz`7_|ui?ZP^
zcEMxYi)Xx|C<s89$E*P$20$qh31~b(j~+lLGc;+UlOZ~q;E%SEojoE_N|TW^3uX_^
z7{`{#D6>Jv;a-UrfeR}R6Dx}wj^|of>LpZFL^Blh_dQ32p$s`(E>3}0<_C9E5fVAg
z0CO3A;tlV?hNpS)H+&)8^;Jw9W9Cm5Ab^~Z;8AsmDiA<RL<;C6kb=q>scvG5XOMh~
zSrELNP>zShVo9ARpH)n9Pq!_+@UthBLt*+%%3vqqaMmQl@>p4ere7pXynrgA%2zqd
zXTlu3p5Fp@wyc-PdF1_{V*IH`SX^mAl;DztMkgUoW72MexEUd?q*Z0CtP4@Eg;`%j
zYyhWd=^!!~<6&V5z1GBT&ag#BTxO&uLK0{U3$#>R5D)_kjx;EZ8wI^b`)oes`Pl6a
zwh+1|&}{%6OVTnVm1CnB06nV!y~hlA{x@~`%rEI;qkt9}GMh3f1+fk{a)^yEDFo+9
zy^yMfk-)&iY61yJ=|O@03amv^fh53@LSc|hQH1;ujDhJ`sY+-j3Qh=4NqvKOO?lzE
z<ppu5EfM!Dtu+sc!&i>7=WwUME1>6@2Ph{?U74R7-rnKX{SR>K5H@>;I8v4yLVs8>
z$pfEwyy69yA~qHUS12ENu;kf&$9H~C%HGWL!6!=A+m_G2V%hC`KD_Pu@@p|~xW8bn
zA-G(SGH`PrRvRfdCyuM#lnNzoz<OH{FYHa>=D1`jwFIq~$2bB3rF5ZQvwZD$_xYyh
zpXrUkxjI94E{6EizuV?t|M@|NUb)zg5QW}C#54~KrjCINY_ucR788spdn1Pr@U{;%
znPjdeDYbBMrGW?>jXj@uFk*WzBeH@(U33)!59@@=DbI|A+<~tG#(?+ABnu33k2ivf
zU=0Y+NDQq+up+G8n(|F&1{2P|7C_*Xbbj)yn|y1d$H8vJ^RB0$&{>ShM<oaSiU)2v
zKI^$no_8g!NAjV^3POM{{+telIL1RqBe5)9Y%?8r21gZFucsW|j4;6<xnN^UUcod^
z$a9a_gsdjc6B|QS3WGt#{-B_0Bm`p+18GB9>_IaX2+;ey1%R{uKYw>v&t$-j&t2w)
z8=Kg?gxEr<APJNuZsPfpLP?j}SOPxxeC0-g7{RQyXt!c|&LKge850j23r;bM4K7?<
zB;<-zN-&nDDxDeN71fAPL6QbU4Ph3L{R-cA?36LX5K&LjTS{}$5T!z>Jkn^vS^u9;
z0m|8VfC5$DFn%(n(db}X5v4bH6O$x{s%1znL{y1kmN`^Px)%(x&_EYjkVJ?EwDe$N
zq*oDZ2E_~w9%*La3XD-q3ek~Aa|_;~VzFx#R04eqW1&z>HcNOiPnoG9907eptD!_8
zu(6iVJJYi~_i9i<6-4GLc=YiYKiy*M#uZw<MPh5}I$>ljEeodhv66U4aCIzUtOaX9
zN>mGA3eJHkU~&Naw_!Mgi3bh%GRCfeKU8#PYXyiZcAUf5;s*)kFk)0%k|?m8297de
zmMi0lXH@!Hb)WZK&x_$qzf#e2w8rkd6^+Fg-Jsj*v9h)?Z;pt1P>-sE<C>p_fW#hE
zj|PX-k5z~tpwkf{D==wF$X9W`K_s`S_J+7%39Syz%v0qapEQX&4ct-A_9qMK4AFu_
zGg^sdDK&h2-*7uO><?#5rzN*$B~cu+bo=0JJs>Eqa)jfC&0S7~1vwQ07q*^9%n&aY
z)ldT@)ZnR)gM;8O>M`m_bcO^_Z_!|IRfjBE#&^J)2%jiL2UdBCV)9YOy9Mp;0(m3B
z+}9-P_Gq*$Pd>QK@4w{3wc?mfsq%`p6;>D9{Kq2$#zDx7l1b_C0RqZ;e{!a2Qxqkt
z^(B%J?t%cl<1ZN7#(M_}!Mo$SpMy|Wez0mtfx7M&pwb9+Lgp=n8p^Opg#ZCxdg@A0
zoY0Lb%xWJu*kux}aCyDrV5iT=KYqZ4-U6@qz)k-3y|;)W!370CL}(;a%F3b2$+<he
za}B<%=pP<&{o3XOQ4}3=_wxWn<<vxIIH1!8FgWaS<rk{bV=!1ET!6wWRq)^&IPdB&
z?Q69t!3UB!=3Vdm2>S;^zUSM%g57+P#>(gO!3RFd@BZ#9XhtR5dsFsjhBUFvN=KX+
z0OC{Mr*s}8=4{PE1U=qz4F2)Q9wSN3&QniLf8qMI%XdH(=iJ#7!t!X8Jz7?7Swui#
zVWG+I{Kl_v|0h4d_3K;w%CGz!-KB1=gd)#T0q+A<S>c>R3=~C0Rl50|9KqLHRH3L!
zD(7h>35p^J5*+XU&?kB9@muU|Kg-+R^Ktf$rT`!yfSCCqLE%fj_)GY;U;p*mQe{=Q
z(olqJ*Y3j@Ls2RR2mSILZ-3*D|LLFn(SNEccPK#rR}09QmDJ(knAg4j{iMkUdCz-4
z!V6yX0<K)X$jWk$Znwkc`YIQe7s-O*>Fr&vUA;=P*&r)3f>(lv5Wt6kU{NgN+#@GR
zEy5Rn;b-$zU;240g(+`+%X|6gGXr*acKO&RAEF9@X;$GC^0MNKzUWJM+uPs8Xgp&w
z&KOTKLI^A@v@ixnql^b1{zQ29J6``|fAcqg^<U>-4b~QzA7QPb)r=r0pZdh(eDq_F
z6955X3(cmjiAd8X`~3l5{dHf#_kaI)b76IrI7vXD(u$ypp!ixDCk4}h2^IM?V-_mL
z<3rZhHu$FJe<m)=_|h92>}>C{J##FrEORiP@?$^wON0QENycQBqpB<}wlPMyy?4m{
z_dnp?_nx=@@TbAQ<p1st|1T0amgez3AP`UxNRo&M2=yTdP*uw9y%DNItTDX$<!|C`
zZ+aJN>#JP5evQkQFY(N+XW81?B5gK_VpBgaiDO!=7K@7=q{t9!@I^sZI-2De>k9UL
z%29hA(@=6_X?2?fU_8y4O!Io=yWQ3u;Q#6`|NIW{`}_O6<RvfR-~avJ2_gJHjS&Tf
zd2_Ur#P~Yo&fXN|73xz6h~N~gwal`D#~*)&M?d`wXKz)ufCxke;y9w&YEplpIKmo%
zdPKV{by`fzst!Fp)wKJHuOBg)oDclZ{LIhr@|VB7CgCnD04gUtkQzfbjvxXR5Fi{A
z5C9(_XuuuII-vEJb3PD&px{;K&)0e%D!^5q>CqU3IZ+~T`(QXv_nH(DjDe~OOeZtE
zzkBci|NPJYe5VDX=)aq{1{h0%AX@!(W^lgv?2Da?{*QTz&2w<JZH0%JXWO=;^#*Is
zO!e>U&Q@hRm9-~%Q`K+ys%u;mcNP$})DOx_0k^S%Lx$4z)`7<UWyn)tXjv!J^3H86
zh_G$c1~hSzZY-}y!`Vfj;As==#Ox?U1XsB2u1-Nv2Q2;#i*Lt}xPAMMJwC_7j2Y8i
zk69QnUJ7tw^nugo-Lww=!qCa31o7d+d#I?aaalp)f8m=~j}{$or+DDtx{{K;d-uYs
zRjXVNk1Q>%{1=8e(l#g%qVQPyO;lqUCgoRJ_8S_+k;hi7gO_9b?b{c7wMoL%X|v(o
z`w#f)`Ta#FP8@5ucs>__>-oEP??ORA0c0|n0jSOL2=xHc->1YIi`=|i7|?$J<QEp}
z%NNfrx_s#(iEsZ9lP8IEI&Ba!8;iyIq<Ht>Q(j&UL5R3{!<wbnuU&QGl|+00990DK
z;>C-K{Jh++lc!8yP*qjkK!U&X&H7~h9hdVpA<Xw>KzLrdqJ&m_6d@Rm<vX`;SoiDK
zkDCB6n(H=&W#2)QWf%qvk5MpE7BGMQ{27Oj96vN+{KQ!iMm)1(fxLr`^L)Pto9=lj
z7+UCgk#SBqqE^3uea}C1Xy5stKYzRefPq4k_5`CvL<lVE$vQ+dJ?jS`NdXw(I9r)H
zaLC}nV-1)TJu}3CVIZaeVszz;HJ^fP*;j&-r+CE#TXqfK57?}%41yq}ea$ujEdxN}
z>j;5GNPO1c(HMb+#+c`}1dA0u2w&JHIU%}fjs(V-XNWA2!C;`s5IO{!ACzoM5z@A8
m9qqpr5N*jd9lW-!1O5ZXQ*YZlkCyoW0000<MNUMnLSTZG!odyz

diff --git a/src/assets/img/files/image.png b/src/assets/img/files/image.png
new file mode 100644
index 0000000000000000000000000000000000000000..52d7060dc9b5f817952ad0b7d9d2db02d4abde79
GIT binary patch
literal 1222
zcmV;%1UdVOP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000DyNkl<Zcma)-
z1I#wd9mRh$vv~I5Yt**Qu!!oYaibbR?Krh<`}zj8ZCkIc_00Uc`)$(a!^L-!-{2%U
zXT3^90K%%WFSOR)6BIWl5uuwwXa|7lx}C)fVHEy-(2w5;l*)ULh}<$w%l|gBx}0zj
zL^@BpHOSOM!QAZVo?5Fv1g+5!0WOZiAP5Ytchi~{T_B|>i;A<fz&W2NGy$EYrD^0d
z*Zh#flN=H72-1$e9YMr*o^O!W^B5&~@9?%}elp@2PkrpPT|vM_ih2=i|J=a~U5I$3
z!FrEBw|9s;SJ3%&M(d#i7MB(P!HXb(a6<)QKtJix6?nvV;l9DOM~dmr$k()9paMik
zIDyb81g5&7f+UWa3=^CPA`a(#gX_Y*LE2EM@$I$Nnpzu*EF&<QBr?$5Q|P#~V3>r=
zP5L-5c<I9Ha|IS}E$v=o(4i;W+Cr3OH0XiWD6J4^3vT!fT7NX`u{<~Wf4FrP+ZHr)
zZELJ|jM7~;_O=M9nHh|zTw5$inStD3!PHzF87AT>#gO?PRU2;WF1$8~s~N^UjLf1^
z%iiG$$2<EN<x#g;1i0`fi@>xH#)E)JpV1z1Wk#faL~S*;);O#1Rzo>PjHCMJzeq-!
zd))GNgudqXx0*~}JOoe|pMem@Au728kz@@*&l$X<L2wRSZP97LVtK&oc%P%J#@dib
zJLc5{1jKu~IG7gDNt>E5^gsky3_0QoC{n~06o2_H)xi!@LlXCx2~*bobHw3(NtmoM
zzAs&PH%tqV&O7+icS+(M!XzZ>DU7aAvl`e(oo>>Xf0HzRSy{xD=<O8$_khj1kI74J
zh1~Q_{{0_*%-XNN$Z6*3g$h*)$<PoOjTS?mI_xo=rJ7J{Tv@YyVhM+uaef~}xUo06
zGna#k@z|4Up%({)-qT<15kv;#JrwPcEAkUT2Oim1{N=A9SrW4vM<4<>d<NZcyZb(x
z;e&4vT0m-WB}5LgJviHiKmHz+fm;qq4>F3A3_Blj<%XtS^V}Y=&f%RmV&u|G#NvIB
z_%77t8B`fIKO#L!NsC*O<^>DGRet-^pYfNSjL&}SKm2q3kT6he=fcx(^#Gpe92@KF
zNBg^L`6D0s2m%mVgiddN$H&krV{u`Y;h@iWZl2}kCCaj(C<=~eAHngRR`~5dzQc*y
zM~05MTiuSYec=j>iTL+_*5$`P`tD0!{pwf#!#PV}jG?YAB3;RU|GmLiuDA*XpkQ`>
z!X55-2jVy;jG|@^nMnfr;~5_P(EGEwf5bx`^>~J(d3JYqx$c@PUeJVp5a6j#eJYK)
z*M{G2d*`r9(?VJ~=WhUagV=^Ied!AM+dtOj<u8Bbv$#mXeeQE_-ul+Jt0z9`X<?eC
zq**!r-(H08X2f@E8kEv(Ztv9}d*O3mbnP`)zK@HfT9PDLxbmv&u3uSMy?tHR3PA~?
zx?t3$Wz(Pg?#^!h`q#bUUBCYIuRabWKn3K$SvxDBCD2+Ao1z&J34j&@Xh2;AfIvrc
kKrN?009c^z3dn%se`CF6hYHIFu>b%707*qoM6N<$g4iEja{vGU

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/impress-64.png b/src/assets/img/files/impress-64.png
deleted file mode 100644
index c279c62ef3785f8761e16f53f02e3f2d2e359caa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3321
zcmV<V3<mRwP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000cYNkl<ZcmdU$
z1#siY(#L;2k{#QDW!|IYnE9i}%*@Qp%*@Qp%*@Qp?=AE0?PeKbJGQLR^rv%8rJ|Je
zA|KTA{Zn17aDLrAJw4-!s4BhWoFYQkvJws-I>dPwT}r2MWZ{>ebmJG?=(JUr+IGX5
zS`~GQvydc;TE(T7BtV>?<udy=ZIh`#|4nx`qfg!Qt3Ufx?fjdd%5^A3@lw3-EW%uc
z<VtU4t-BE*fZ`PdhH|CGqaXi7J3jg2vo2p=d0?w~P=-QqjV8`IT&&ob)H{+`aZy4L
zl-bjQgQr}<_!YP1>{{vKaPivnI*u0B8hU8{z-WE|6cj{2OQrBv#+V<`Lp>`XN!&A9
zt?13EXSM{u1hmyK_V>?G`u!(q)(=t%IwXlBu?b0>`p98B32|Go)0Q9{W{<71_wxI4
z?!6z)+BGXN0oZ065(^@z15gA70jF6$4}}0Kpz1)gVGvc^%riLunZOtpEEs-f8i=<P
z3Bbtobo944wi9zpMohr86ZqMOsQuwn2ra6mHi;%U8{?9zebR-uk;AqvA|vdMhuMA6
z{W#}dk7CV|MR=MXnbr(!HlvvwXW?~j>CbvkA#sjswY+WNg5gV4sWVGqj{>Nw>LQ>g
zy!`BARR8!z1Yx*T!iiv{10@h6zGn!6B`hywXEef|3-86*cYS1U_{>wzW6t~D&HDu+
z;1XSwBwB$v0RZi_upG!7cvARJQTyXp5N8-Jmr*eQ2#OJK0T=*cOfbf_R*jwK-;=ZM
z_(;|+UDy*ozZyW%9&DOLR_$F0n*A9H4$z`aum}8S(#(Gu;|#TO1;he^L2-ZpMnH`s
zVU=yuL+m)~9-MyLNBn2uvkR-QT>vqmFZ(p}fBGuM1u1+8lEAF(!2k}y;BYd^j&_M{
zr{9(FTRoJM{?qUZ`TP)y2)$(dnwOt`oa&#y<}+Uc0SNH&K~Mr!5=PiDEo`2+GpFA2
zL7cQ~5ikhwN}j^pvbT!-?87PiR|tIBgL-7i20<N80(LYVn<j40DYv-);J~9O`3moR
zm%Gf`{}V<=M)h@XeK!mK`UT2=`Ygub;S;(d$Ob_bCqpTG%*OFMr11CV<YkKo2VVV?
zD$*+e-}>e^vqQkb#o?=d_8zHj`ytM?QurZMECN6|8w91B`JGM2hBWi1-r}BV=9dg4
zyb3)PKIzsI00>ZTTh3j*@X;sj`{febImU3=pd!dj@e4Cj!I>1kVOc+Mn-u=;0|`I#
zp!5tv_@?_@#*C0f3FXJf2ewiTA`(gn1_QH#0I0*6GCP}b3V-Vq{%!*cKVKgVlYMn&
zgoMf1P^DZ-NZJ-LU;<Ep41ATHjZO-GyBjn-K*-o|=4eo=;&fWkB*6eG;EZ5qy8Q?{
z8gaVj@02O~!G_n|Ss*kEM>2<Ijat|^0h@p-2!6^-NMvlL;hmOgcmocvfNIYOgf31p
z0dQ7HVh0_EltCmxOhQsx$gZZaapKM?{C!jS#W$GDEBOkY%^vtQQC#eBQ35EU36xX#
zM#z>k?w-OwAT#6)JiLF_`~bM@5{MNWDK2t|O9;Y+>}*!pcJ{p(zr}-YnD9!jOp?HC
zb5`kIW=vaPm>ttKww{^7-})gpNO-UO)1W5VCD82w?Svp0VON~mdH3Or+djN|sv{pB
zu?^~5eh;lFFox@13PG95DHjo!mlcLr1<kJlLYHVZ0I|b_Rd%(6ednjwSa*5^Yvwu9
z%Jc#1Uw;W>%{_!=gBszwl_2WS*m2^I!<26MOziSY3c-Vd_wxoo1dIe+6@^@N>HRqO
z?pI%9&3~Tn{OzkOo!*5#<!mNTz7Z~{AvmrpDT0u&c>kYSzVojf`^)Fh+g(xw-urxo
zrCH@_jA3^pV&A3r;Jmv$gf)wcU1kg&-wB-t_0_jv(V2I?-qw73^bCf!{e?<nFL596
zs+xZxGPPrp8Ch#i96uhO{m|F2YS|KSNuh=(@iew^l(A)}5M7TAPsYYcq6i~Vad_1G
z-Z2Qb|M=I;@JF4g1!t_<dD8MF7bhZxyS;X%p*@AT4qh~V`9@j?*CAnrYb;GLL5<<t
zz6sQ$bm}<zfL9Nn*8{%WDdR;eqJ5j%qUT)}2H$R=LD8*_xP?Y_UooIS`HF{k17pNo
zbAG^xWV?N*2~ZS1|1!iYeDR;RW`5vMDfn$WtRB(CE|;SFyp7SegCv<L`_j-7!ql$o
zeO@~)(Ei}bKMD|zE?qu1>gBl6GN?mE3Jp1GEySRzSy+JWKccewTv|h`Kq1)wdo+%q
zS7oRpUh{wde#nX2K!5Nk`AyI{%`HDEI^j8Qkbw`T_p)=t&sk9#rnF`ipzPoJ2dte&
zBp@rrS<CX(|CbLB;Jh!I`T4HI$SPYdQUE@yOt(*}t66o<t*I>=C-Q~9?DYS`#U02Q
zmV*7iLu`j=&5d)`d4KSz!i?|l<#9mfh1c8&LeSdBRU3cA@^YDQ^)gU6yzMvGcp5PQ
zz2xFHwq0k1lwj3==gjuS;kEx)hWbC)^nzEwR#vm}>|0S=dKzt|tEChFi?baNAtT>E
zl2um}IM`4a9tG(4g%P=i@R`p+*xtupUjgB&Whly#+zL=!Y+0HHAb-fgt3P<n>>9;-
zK-WZyA8C8d3~^=EOa-*iyb8!DIPm*!4`{ExQEnjmg3s=O{q%tT;hFP`OYKQ^`3eYD
zEkzX$r4^8LE5MMI%<TcN^2*$UO>y{nuEef2yecAqfRO#g@zAR7E>KM?U|Q*F`NaQ`
z*bdTb7jTYv#bx+2d{1~0fPUcB`+l~;t|_8Y=wK6sf+>L-lj%97_Fi`W^P8+NcgCz)
z3MdCR{UpB!*qD=-tfd(&&)w=uVbDLk_r)tfy-BfCT^I^M2$4u;yzNw0v+547&1_qX
zZuGQ&dy~_gXTl4DfIy_b%xnHIXvkIZBdsfy2`bR~{ihIZUh6x&Jow5#KS9trhE|9B
zfLHH}H^IKo^G8m*IctypiY42>%!&8?8W&apEiz*jmN>^qdoSVQDhI}I+8;dL_Y(jG
zq~K*neBJ}u5JW7i|B-4mHU9;dDvE#z#icY$6CA3YiB3F{un%|?Z-txS%pg$cCTBP-
zlbrbob{)A9-7U_8^%|K~71V*4Y*$zBa`6=*WO&gywXo6`y!yBPnqZ&TSfk|<BP-9l
zPS<>&-985%)G2YtqU!ow0{vfR3?zIz>Y(aOs^S6Qh6JC}^_?nF3g79(oV0eu-@-6B
zQak{@2Mi*-|2)oR2NnSoe}|}GV@nu@Oiv%){f5`S`Y8(+F3?nS1E9H0U~u7uxDzuv
zT4ii(ggCZ7(-sh_wIQsHnVM2|?%cWWdCz&;J^t~Jzpd+Y6b2c<vKNGAvq>1j$`vQk
zZb#h`Z#E+m=NKEUq3Sqtbc%odYyITQUi|EPZ`rcx&*gHNUNQ>IHFSX2JaE<CJ%oW^
zZNgN&Nxj~p3qMxF1j2y>NBP%3*G<0cCC|AU{x?Aok|#sY2n-;+DuUotNngDpieeg#
zR%&gWY6?G$F<p4pt=};DvX?&h-di?r{B;-x^iq-}UCSMW6p#VSy!SYD-8Elt&W2|O
zKFz#`59eI(Dc0JqFR%*$G9d7pIi7cY)QP(pOv^qW-b>XH$4Lg<i_jQ@bB>Hu25`s$
z75}v;BGS#gb2b+~<??L#GL1$ZV}u|u%)%Tnc+GfKs8)vv0-1q-`7HPp8f$IW&nI*F
z<(Koam%W^W2M=|FU_<~06yAHkmJc30#=3RuCtv>3=iGa93U7?b0neA<H99)Vr#|&*
z?sAtqFFkg=zOmhomx#zf&GrC^bNulSzvI+X$Ju}I@Z^hL@Qiz<ng0#fPyt?@PKR%N
z<LgXLPF8Px<C{Loh^e_5a?oDS3QBQc@8-L=%LxLY&}cTPHyX5~X!7~bd-{F0ZrSu}
zK)iYR_xq^;zyPjXE}P%|?)Tq2@BE8zef)SG5uF9<p?X$92Cz`(=Ym3B+0!lSPJH!v
zTW8Pi?T23R@)tjP-MWAN2pGx!w;Srs&9Y?9vwB0k8KC4%FT3or^WXZmcf4`!no}-}
z;|^Xj_oxXf*}H?{nV<Xl?0(POYUr-*)MV?{&AVRzx>vq;-MV#u0ctt0-iW<LK-*j7
zKV|_p`yYTppbS(2DwRrYY;1Ims+NJ!Ti}Bw+2<KAAl}0)pZ}bdX8f$yBch0iJ8@#F
z9z{_HD9?h{IRUV<tmDC3-Xj08*av`YCHP?YXJ$aX_m&0EH+uNIAm}`SP;cT*Gv)4m
zPU%~3ZkAU-rC@)^Z!md)IiLkAAp3stYH<aEn$iCQg57_LO=>tE00000NkvXXu0mjf
DU?hZV

diff --git a/src/assets/img/files/impress.png b/src/assets/img/files/impress.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b9723919d975442f068e08a18813aeee0ed8fab
GIT binary patch
literal 1157
zcmV;01bX|4P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000C`Nkl<Zcma)+
z1FSVm632gyGjn)t<Kx=4H(c8e*0yc$hKpcr<5|J8?RTwraRz6)E+)5=`CLhR@~i59
zO_vf80Gx9VaZV0fYm)DO{R`zME&Sv44;t&~-Q38sbS+{gYY!NDz{L-E*XRE!PD+RX
z0(tK{5scP)rc^Q)0^|;azKzZ1wax@R>B>CyzkLcjb3Sq0Bw1YJw(y};-|<t%jvOJ~
z*hFLx#C~vojqLA9S7+l<*6PbFx!;=DusvOxA^6Sb36^ezu!B&?+&%PYYA^pj!;^<d
z);9qU!^81#5OCsDmbt3d8hhJa_hQ3xR%<m~@SD$4U%VGp?tx^HJL``_z3B4{jZV>u
znnk!AAG!EFuN?LrFMcY6{r&CVe)dq%SiTd={gA}mUOPhe;*T&iGC>xfG2Ax*1=!!d
z`~fH}4+vMUR#~ZpN#}Op52E#=k1#kgPL?#0Q^WlpIUFyW0v&dAQmQso61B)S7rCV}
zO6!FmV_<ZgRvdX)0ZuV;mqYz10^|;{aU@9MNaohLYwS^kFZ(6~L!-DPLbtY%R*X^#
z{~MB9?#vOJ26!-e^S>}ymnyQ&guChwqwSU7WpH?mR@}ry%S8YCGK3*0%?ZtA*i1;D
z`YCc|F$Vy4@v>`)gEH;!{t1KQ)1=WBAaKWplppXMlJRFE>$jnl@lk;S$w<Oc>UaDD
zvv4I_-48)HCI^7MrQ?CL4-Q`c(5Y!j<EHX|OR|Zrw4qvyMC%JEZFZZND%+K=X9S}R
zNg8?mkGsM1zyEVYWaa+#W`elTCp1lwq)BGF2}(1R>OCx8`4>=za_2B=_htevUI$gh
z!wZQ9>)hUkMnrkI&k=bv${;8R+fdq&2^fK#qK<n5PP~*@ay!1Z0HE@DE5c<7t>zla
zSjbXzK?)D|ZT|`uZ$-FK4pj<4z%&L(f?k52Nfe55*C=TYLfa61?3-{t2glz)$j79;
zkKn>@P@1|NC16FUm=XZ8awFv|L5#uO`d`wge*r1J@SIa{P$&mNH2hRH9<l=I7N}h3
z!ndvp;^3igz*P_8#Cdr@VU1DNXjGQ%9ZamPZQi&u4+<q=zd^ASIDh74fqdUs%i8MN
zRv5TPRjZZjEr?H20ZtKq;s#lkVT__yt0E{?SJzq}`tW<-bm94DUmu2Lv{I_5-<iV!
zh~t=r`FXUq%*`)EZ+q*TUi-iQ{PWjQ6z@1&#U@EY5QGTDlIsB6?kLD{(tr~OsC?9#
zg~i3>9dCQnD=)eDf<NU!3jq2FPk18doO6z<*J{cbgWhWvqw~4ZzWFn4biUSlFSzBU
z<>+m1dE-lW;edw&D1b(z(eaz#{NZnh4j*|;vST8m@<_=?--?ncrS<a4a`uUjeeiRa
zTyoJbff|qkO<)~}6rcc8sZ`pk)oQ<p7{CGs(10p703>gUG)?05_4PF%09xJwYyj~#
X`b)M%jOja}00000NkvXXu0mjfp8hXq

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/isf-64.png b/src/assets/img/files/isf-64.png
deleted file mode 100644
index ad5a1886787a768fda32c34c4322bc524eec9007..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3509
zcmV;m4NCHfP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000eqNkl<Zcmd6t
z1$5immWID`BxA7Qv}qf>%*<<DreU7B43GH@Gcz+YGtXRRW-L>fIWbCSkK<^0DNd9+
zweP&_uD@qX#_vDit)nOrAvlEM$Cc7dPfyd^+sEA8Z1_)q`HoNBbH~}2CYNTic3mT4
z09O!CVpdyR2UL`~p@VAto#*6t|7Y&6Zu;WyJo)YSd<tWP%7l3T7gCf`Xsrl}Km$bN
z2G=#$iHHIOFSOPyCzAZ^&;6>?Q~UB6ciq1Gu4FnvH0-XzIx8}sz_<o74mwoL&=d@3
zTG_j+hW5trWW4vTKQhtI6yj(<L?M&%3=mMckZ{O;PHXj4$p+-WzcZ0Y|I)_hXwq3l
z_440iPyag$bNxi^B(6gq+GGuqlgW5_DuWenWN5yM6OlXUyY68+cD17|FqssHgP=hC
z03N)60z`>->_-)lwb;H>AX3OJt*NVve`hFU|4Jza#B%T-X0uM0QmW|Lnp7Ih=pPW9
z`!|d`O(e90aTMaX`Q8>sFj+TmfTS~Mdj-Cp<5mv-+8lh_4vIr0cnEu_8^QXXTl_ll
zzZ};XVzKb?`nu|KL?nSPY-7wi14N__Hinn6Kcs5$zYsM?RXmMx!(bT<pp{}J(<qP(
zI?~4A><*5HZ>I0675MtH;Mou!ik~7yPgN>E73*Brjf$|=07?m^Nv0KQ{12#F`fpIP
z#H+HnIe3MOW;F~dp9>CFsD=KiI*zHE=)Lm6iolCU6x`dsBPpI53i1-RVu0843N^6;
z|Gy|TLoAlX7#pou`x_{jAh@8La`3erGdIz5+5PNp-|-cN_i|5^YJh;UDD?dDBj`N5
zgNTjN0tU1O!)oX}d?P0&syUjuiSCQ;+a~aUu<-~`O0iKWWs%Cm|32~MM^Q3GtjYng
zPyh;#ezg%?gdF^M6^Bzd&~@QG?B2OedS0XmJIDYZd@^HT^!IY`kD!<$9(Tc5pvX&!
zDwv>*i_uLv_$Y@GIr#JM%E32m6L=7U!@l8$8+^b24m)-<@~gk`M^rEVHIaq?LaAwD
zId~&BN=Y8vZ-P<|Mm5qu7UAIX^>m*19orLLWMc!Ke)?(rQQy#PWrzMi$Mo~K?l_Su
zgE2Nr8$hq^edQpgAqOAkz|swLp8M_F5`MFC-)?S<f)|OD!*|}_^{GA4_v@2$gT&$)
zj2p_sYc#Ae!C9U2Irx2xH?a4dZ`;=J;*&q@*Z=)4d{Nub(DI4o^lOAeNsMcu#RUWd
z1rro5hGzO#;1_Pp!GG&EhTlBw7M=1PDm$B;j)p=mk`Tl);8l3wViZ`$#Z@f~jE8bP
ze<PjSAKuFY)&Pmt_zfT&(Ku-^j-bT#{l;4;(iokCp9rykDF=V<|1bRX*m2UyY1%t4
z*&;khz#Oo3O}&p_A(_PL#f)Q6D6}#dyg46gSzYiFH_>(O=5v02dX&`CJS}@qFB^Vg
zVT!54|3;Vnuk?pMe`@dn)u1hoS!;mnUC!pDQ5e8lfe*Ll;G-N&-9q<y-%iI#dOnj{
zruEs+a-{KAny<K*+J@#W!_Q6*F?aM|=nDNWd*ZW<r90Twcm0;&@tWW%;1(O;ZD?d&
z3>pgu>^Ax*;vCN0O3(S<aZ-4I`j!q-D$aQ`|HAwuPjRUIo7r>uHxr3fofLjz=m4qy
zf2KG56rHgI$`Vj8qP~evZEp!)yhMZ`1AIq{ya6V&B7+tO70UJeWEDr8Tj;&$ZaPY=
z?QJ{4WVnNd>?Cz+jteLLkg@;%UxxPHMc2i5qLf|-KXmj>82m?0i@t~*aliu9sur?!
zwD#OuQFzY)Svvw8$@jjbGU!MP1Jkt}<yLwxxwm9^FC|g62j<@{K(whL+J=9Q6QlpZ
zQqO(tIqMn_7})<Tk<owTtnix<0kjleqtt4CEOisR<8>8<2e2`I0|YUG$v9Y{Mh0i=
zId0!Z?-lo-()GNl?}P;kFnBPXY9I7}F9!!MBcu|X6Mi2;0-9ARPhRd|5$pK6Q-+t#
zr@&eR$gaTG(LWQSKYBZTS3Gdan;Fr@E*JpRMiNffulk3%58RWNA6>eHrqjDm86F`p
zv>1aF<f5%GLpk^pp*!fi=Ap87a;h6UNUI1?==}i6hPm?cRNXg}4Iku!);fYGLUxRi
zsWknOn>g*d9DHke+gR0gP0Z_tU~mnn%{7wfq`mWsvfxF6M}eIf*biPPgxQf1`fmO_
zZEa0}TULc<g=}U*duee;gL_<W-ut8aYuIbq<-l)#G4#a0{Wo~wX3XO0=eG}c>}+aq
zl>#ZRyiF|56P9HkSbzc+znM%kt-W`a55HL<bk|=Se3AW|p1SY8Bx3*XVg^+X{E2s;
zq2<u;(5**62hI1*7r%sCi&Cn5_|3M&9(n8u@WL3w#pj*=dRl5`5vSo);Fsp7nSAbd
zI5+VK=<*i7j+&#KIP?Y5dwz<Vy4LdG#iz~g3<)$WFC`B<j%k3c!5@4333eX*U78r9
z(3_Tct?#%vx7OyW==^xHgW0;DrlF;0tMFdO3ejk2rnzZHpNP!h3)^)~;B7`#BK-8|
z2@)^=9_J;WFP_h*y!iRgx7G|1Nqv!l!JnYD<H9Y$i)>y9=?&op5GlFm=Z6mxapqaj
zb-}=;FMb=ESRbFEFY-MMAAfdB@F&|AR*vIR6b*?)`f%=igHl`D%vf5SV`lIGnUS}s
zUwVf&juW#I>!*TM`tUEFF0Qh8Yy3-e^nPtg@B)Z2M5B?JmS%4XlxhH~yq%o+>2YR<
zKY+<MIX(L*Q9HFYcz>?f=5Gu>%&y-1PYREK5koW*nQ3kD8xTANDz=SP+t9+^b8lep
z_1{guKChI@ujH!nlCD2u?C7r{BAdbczNc&`O;IQXQ27naM5Jpgi(g6W$b~)s$jso6
z<7Csp@Ln4fn!u3C?%vk+Zo2r5r8?NRa1CS04$>y#2i??+bGx4)J^g(o67#|ELh!W!
z!BIJQfp|j~vY=7Q-Oz}!>d&*Y=So~BOaJ^NiG=~O$zwz~LVe@}J8DO%iO+9n#%X(B
zXK>=nEG+yaH8t(U@E*UEZh(0Il&FgB+t)O-vv{nUT6=ySz=`EEX}|Ca5YSeLy4-VX
zceDeS7e04ld5+_=!=w|(vE(S#v12sU4pCn>iEX*;Za>KU^2a$g_H#5gpS9-u;=dp&
z#Q?;Us@zSBXsm`A*+s4L4De~L_HL?Bn^t(ScwJt?Sp}elbdu5WF;dAva92z@KuzTL
zn40_~jZJ6zIunE~PXSf&J2nft6V$#ny+4pRot+n4jlh;Gyl^;5sG$?26X6;V$Yhhm
zt)%}wJjs?9!HU8IWUG4CEq*gKcY)Gdh7VfsLUxo`e8;-^FKne0_EhP6b>Z6XHH+V1
zvX8dzYbyp%(R=t`hiohz)cc536ds_uaW^T67Dm8i{5#NEf28o@y_b|)2mv42UD|kc
z12fqcP%xD2W@qnpA2Gbw8o|jr7$e2ntQ1xizeTOJ#hmO01rxDvM=ATGhtDaU&XCSz
zu|pP?y;k-~{^Yn)@LmEbtAm+rGi_&GUlDi#2!J;$@Tpb!_V%XtZOfX$D!C32M5&6x
z3qVyj$DKAhtWbIIfRVKYivmOeW)(i0b@IKOSzI3Z)F&VM^z7^`mSq(iAOSytpehZI
zuw&QdSax~v3YCM)Qe7RRwx*h_<B(2g$z-x9rHIDDIF7^o+!81H`zOBVyFdSRAAa!u
zJ~jv~z(xX9ad;7kSJxAc#>;|VUS7tS3~jBAXsyWP;Fl9AQn}U+*@zLQrsjG3-S;Oy
z_t}qsLk|A+tzQj_R2;q{3!YL84-aBnifq<pVKKqtathZq)YitaEXDZ5G#`GrZ}LZf
z_`AO0*wMo;vPtNm0%3c?gNR{nZZ1FEmzGm`8M6wnbq;=f1%ChJkL2Kw9y$C1!Li9A
zxE<kr?<*qt;l8w#EDJtp3T#VwK??9degwE>!UJgAwpdY7Y&ZDzS9D5IQ&S#1fPUnW
zNBQ7`5A!Bytq|Fs@WR^9k43{+R(bFM`u5vz<D!c$<X3*>S5QjjjX<^^JR;yLZ(Y}A
zd}5|7cmNILi;D03&hO;oAOCnh*Os;2;0vv548{nFM4DV}Qx^QXMevXQ=#RMVw%f#U
z9HX_~cJL;r<>ds?Xq3sR>B%4X{x5!$2d~zt#ION;FOnBud~tqgaNxbu&p7*r#l@x7
zllZ=TaPGDKFJAn-4Z!^QCKo%#7_u2Bzxs=q*&qI)@BT!t$ax!RWi<>Sh1SbGxxU>0
zxcE1yZ6FMA@x>RP^DDpl8^64}W6yb6C+j^KC9>|yQ2BBwG(kOI1WXBY-ZL)ixVVn1
z4j(=+^z%RWlfS)h-@Z42Xc4sQ19pI{r!<iA+O&7h0gT^(kY_*)P?1O^UQ=DYQ;;xV
z`|s2tXayQjD6d^Fe65$O;&XubpW;8^wSG60EG;cArqh`$VEf?xa*GY{;FF%xK*l?7
z{9jai@<0n<x^P^ifID~i^Wrw(ToH8OIpd$M8w_<RHp3^!KSF#{ATZRr<IN#dN$*iw
jNbs@$T(Eg1z6bvYjZ2`Vw?js000000NkvXXu0mjfMRWA)

diff --git a/src/assets/img/files/isf.png b/src/assets/img/files/isf.png
new file mode 100644
index 0000000000000000000000000000000000000000..30466983fe97a08250cc1fc6180568e95c4bc31b
GIT binary patch
literal 1213
zcmV;u1Va0XP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000DpNkl<Zcmai!
z1CT7s7DZQ9Wj4n%t-0T}ZQHgH`nGM`fp1&SwsAGKJ+0z-HOlCorxUS?5o>4cf)Wt`
zq9}e^6h(J&Q^x=P*FKVY`n|4s(H)QU_4u_QifTUd)w1z2cfI5uPkHynN@4?o04*Cp
zhy`u5J7J9eFMx{U7!et))x4pYOg^ZN(7F6^;_WN&t3J_Im8s^F=zP>SsoeH<`1L9x
zBpd_?vddni#Da2E*w@>2f5%bBv{DKng_BK%TSH{$K7eM3D3!)!e5So;(Djh7QY=;y
zd5v2g1#v7oX(OYQgFbeA2yJro=c}aWK15!Rf|El94aWSZlDpsMDHaNZ$+-aB((3Iw
zcJ#BK_Au^ox7!we`-MB2tUigTJj6a@n~%iY`7?>UxGM)>U&PJI*`+l>U;6tOVvIaq
zdzTW3V5l*+^*G!+e41jZM16Y=lgVP`f?a8&US(zBD3#kk1W@)mf(_H%g)(taSIzYR
z+#2K2(@5VfkrzvZfyd&+QNl)*+dts(SUJMh<_c>kenyxo01s`c$G%a!=%5)Pen7Nd
zXFBsF@(=jZe&-$_fWy6yew5*f2jM>WojBUCeeze_BYz6F?MbTa|MP*^(mL9WHK8v|
zhfkvGeqT&hp2+<@xd?QXZcFI6+%>)eu6rG1fUJNKj%_`L;+-q|Vk{uofRRhiBXsj|
z&y#+{KzT5cH?3R{I=cs0bxM?+S#SVX_HYzZcum`zV~-I8c5(iE^md%|9&~o4QfXaz
zf)IF3#{T;?`rSovX(Lb?lzUiiVHbrG5n_=$Y;QG&L}GKW^0oOX%$Xmi;!HwXAS1S(
z1XMQ0GbxVyU!;87hqng+rDE@cjn-E>Q4|v=w5}Y1uKo(~Grr9=cl`uMQ%`8CNA2z*
zo%VP@;k`_c{>{qc1c~<?01o?O<?QVpSJTlmki4ExrSz0f;yGz>K^(=BH;5-0Th~MH
z`ZeYze$ieLduYH)+dd?0uQ-loQEtcW+#!Y<52N?NUt_UZV`FUsZ}BMF8K=~LE_2gv
z@=`pLT)ux_j}5RD(I&UGv8nF_?n%PJn|9AlD$79W9*ErCR@3WNQR3JpXbrd}c>;dA
z!jyMc1}gVxx!>Nq(K#zmr3^;9EdkurkINpTd+*Dd+=KEVxvg96?M*7h^3u}M-0b*5
zI&IJ(K#LIUF;*aS74D4d>cet^FvMs@K9>XKGBq__ef!(q_^PX~zG4o*ab4F64-*Tv
zf^4pfr1!R30GiDP%gf7XlV*H;V)IRJeDw<x`5Ekwv$(i~)-JTv!%cnqa?`|djH?YZ
zGc)zKzwHe#KYIPOr_(adz3z2Se*gPF(An9EF{uQDPB2C%m_4*Xn|<^iW_Pd2<?_tU
z&TYQ&4X=6rb=O{f3Wr7k^z`%${N^`*_;+RS$lZb<2t`DRkRXs8AG`qZ-nrc?<v6RW
ztKp|V{jpD9d(BmU2l7Aw)PO3`RQn;?7?V%v6%iNEfD1T)vb2u?L{a1?QwLH&xF68i
b5AkjQHUN3xFE3hX00000NkvXXu0mjfp|V*s

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/jpeg-64.png b/src/assets/img/files/jpeg-64.png
deleted file mode 100644
index b4fc0c998aa8ef15d851bcd931a1ae61268c9838..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4459
zcmV-x5tQzUP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000p(Nkl<ZcmdU#
z1(4jh^6-DM2N%O|%*^3q=6lS{%*@Qp%*;&3%n&{b9EBIMlbxBJv1Ro)QK?+|rp8nI
z@@W66>QyWDYW-_>w_0+Ph>+cc_UlRojEszM$f1WYwsWlT;mcm}%8QOZWl?3<uDGwS
z$KIca!5B$(F+!3U@`VChH*ZxBKlq6JdF}N-dBs=Xb@g*!`a*l}zo$w1)2S$>2m(b`
z%QS$9oSh`*bP-WNdQ%Vt)F<kE@^hcj#Wf>GoVV`@&z@*D2#vysAu*|7TB4JdXic$H
zVl1hX?Ay<N^Y>w9&*0EO7cBTrao)6s=p^tVQceCf1Bm5UQpo3S2m*D@qz%vle{;Rw
z{7gsVC`C-duIuk(`;{vh9UekygEod(CnQONPBdB@;#MEWno>^><3U8}^n*G58JDp4
z{JjanfOw*bBqn{}6u`k-0zj0wv5zVsZP?=7B9iK15HL8{^X7a$_qoX!pxlCA8^`)U
zr4)Wsfud<NTmE(zJFi|t)NEkk9cZi*v@^i&K8j+B<raJxQ#kEFPJ7zL%$qr<gSTb7
zutV(x>)qS_d*c7P^~Q3!@X)luzGFnBj@NR=7}^aWB7@Kwe#hm@sowMe0YY!SL>$Br
zgNQ-_N?AcfT2>#V62_F49n2|Dy@+`;X8%j@bb|MFJl(rhDKLo{Op>G|!vAjoy0muq
z;g-wSZeB--qFgGYbz<Suminwv?CWP|&?L8Hf0jMzf`1*}cl$1HI~_@TXeh8EOx^$<
z{K!?SsNb@lT%ahGd#sD2+FpSIBFGhrjLHOR(S9s>;(5;P|CjJiciN;4pn`y=iCge1
zso%PRoKo}@dq_+|*daL*L0HZ+oYXK2_hs?p&SCykfOo@=9-x%!`sRnOSmEHIw^&9H
z0u?|A?NF*zVq3I}_@upAc<EVF0p97-hTY8o?#)L@#I{zpuid)dvX;v|7!j1h8YeKG
z5k!z;z>fM(q6Kp~@uD-BKWnPMgOJ^FXP<p`I!Lr;`pg-8`Rm_c?7I7?wAT7SgdP|3
zp@=PnRG_Q`5`cio<=9ahrGDZZjywNU_L?<!>cNY2Ho&#lUW?ym%$gZ){Qb>=TD1*5
z(WKvHdjSYT00OKL2v8(SvAt2DdfW_-J@*v$nmzU4yOsO7={^1Fpb<wr<H$2#nZI{r
zTBWj!o_v8=YotTM3k)O*woHsMcFZ)6K6}}eh8Iu#mix)`KZMr?=1iaU^5IR}Y=svq
zji7J|)Uhkjnj{R_+Ndyg)Bs1Gvm1Wil!fosa)l&^Kdz2fO94XDxjjBS3K4@T7T8g%
zP&sxwM^Altr)T7Vd@+aL@?l8B2yvp*Nqnk8smS))DAnU<am@c2c#w=3$d!A_UT7=g
zC_*RN?&^FO5F>=WIkrwzm{>5E<IX$PkNK$&pHU6wEU0GyV+=`Ru$eyurGQAt_xG`V
zcagJbZ%(-Iw9KVWDae-!pn}fZ+&HmD7J&aayw95v0!9Qs)Qxrj#EKvwhC+WoL%NDt
zx-SbZJ~OMxu?Eyev;2zd8QVN$YX<+#n<QcHqYvTG<BvrW{U3+-?-gNk21vwufHi<I
zhSESkBQk+nvLA~sJ-Z{k3IakEkSpccdi!d2ed~G#@+CyMD$zZZi8VX!+{8hjI-EkW
zgc!5O@Z$FQ7_-Ol068(@kziw8n}jHe7#tX+5=4Yc_it@%cJJzD<F_!EL&AX3(GeQ;
zI;u6U>xj7*oz&7p1n~jw+(9wN@X!#l`??4|e9DZVe28`++?qW&Kwr6+s2S}Myz>C#
z@hj^AI!-9>KE}$$6qg;uk|$h1JA5wR0vQ?Mu3ueF<K9gK%>)EgE<m*)EnAY<9;FcX
zFd_#1kJ}KDRE+CW0c$LiUN?xrjSWVy-lL|MS^Uz+bJU^}i5tyKc=@M7ATgB6C59Wj
zD4lu;%bt8;dYIw6{CKs--Cz0*(;u$U-#;Bnq^>R+l2{WKau6z_Y6EfsDR8dG0a|go
zgLAr3VppQ18K?IdW3YW<dy;C*$}jzqy}z(OeFFm+opgjpx_Lkv0xpB+@>HZj@$`c@
z?Wq?rw+$Y!?p=Lo8#A{wDGl}$V-NucXyJSJoy~zSJ|8KBJoLk>8C(4@Shx3~4R+kY
z0J;$~?TEcO>}h9^L^|~hL?8@!_}Ue0yz(B@@C5ZOBlJ(7j_9Ndykt~@g(7&Tr`syS
z6i+>nrB67&BfPjdi=xPdq0JZW&8HGKBc`8nIOT)qk?4e3=N`}S@(n1Z5b?mp!5atf
zc|#n>1cPN}Ek2xRBEnB{xk4VM_p<KV<s@}OP67nUgcr&7g535k+tPs;VR)j#S+Bc{
zd9&w$k<21TfJ6k9#;v4Ypj5#6<@Zurb|{5nkq7Twg-J8E`)&~HmLyncto0E{y+9|4
z4ab0hP?QI!2t+~P@|Ddqf`V-LZkwSS?!F@(#Bn@+^udR2ZdG_QluKM)Dm)9NOq$@*
zH%LCDxqK7<c>7n7e89k#$eti;t?jpfppc_?{!GfV20<xmBNZx}hG<r5sDi7$f`CnH
zH*)jeuA+a|bd2^2wlJi!d52BbiCYGR?(mr*@RfCc#B1>f4u9EOi}~W;BSCe8x4_2!
zNVB$cYb%9(p7|rTmVjK5rpwX?oVS1jE?Yt}z07#MX0MlvB?=AUkycFK|N9%6sMH9G
zdCW+i<sbePap30mKDjAT^o3;-G4A;!8@}6-*yUGTfot|*PB{A5JEautlvvNmf>+Mf
z6XyXAJnhq%4g^sUPc$eF_Oj?LPeboN$Th$I2ajF5l4Q7Q@1-x#tObX%^jQ~i&RNHC
z<A;9C(EX1R77Gj%`w)}DV^q2txQ{T#q0=2cYcq8IdFSCb0czC=M6$oRDcf~0fO}9s
zndw*)mhvq9z;oH$sBpz|zrg%lKj%O3d}bbVfQ|jp^;=l^`|J44vp>wzcRrJ|KK*ho
zf8CcEUcbeLiv>2~<~1a?7q@S*c_b6w8_=l*Nn-HDv;;sh;BoL4+Wk&qY>zfcI*)b_
z7dM(5^TG=l%O_m@`meHV(PEzPlXnxHG>;pX-@&yv-^lQ6#d%+U9T&dj8Qk`spK$Np
zD_QpTXV@w;jx^fNnOM=r>Bj2zS~qwRx)(xpXd>>1>SVxlVzl)DNZsF9N#iwc#ta@f
zkJ+am%^%+WRgOIJ2#$Z()A-X@e!|1QyoqugA_5!CHLO^6Fi-y2YdCdmoLfHjbDr~?
z53~PS$8+DGZXs7H_=S-7w~RG}Aer!VFN6rlZe8~CE(avu8+T&gjC)&ABVyjNBia7g
zHX3WUa^kBW&uzcIiY-67nc2l@l=^xp_LiB^JIKU!8@TdQKjO&eolTKE>#n|wgU&t4
z0=xN~r#Ug{7%|!KZj^0+J%Ps-G>}63E^6K1_SOsf51G%7l^YnCKLa(lk4OG=2jya!
z$Y``qh!aDUX!5;fwqJWM^=g&97aqap+wZ4;zuAO6MRaWE^Wjt7xK)S@c;^8BTnMC`
z-A;1ELZcKI+A2D?LKvVl(1#wbQ=Ha^M5d+Juukh9-d{EJcoRKZqj#^Fj4xkDsi%y}
zhv;z)p*6a@*NO`Pt9OAH+LwW@22jekKn6T+Kb{x}+$!K@XA%2gM6sq;t&;C6v1@FX
zg$T<<;vE%efjMy7+qrTf<$+$thDRv$mFzaR*%BM~38dhj0a{|Ir3<|5SqMlbymFK3
z)a{+iJ3V$G5jP{YJ@_cIk3N8*hqh8}8R4L_PNY6wN4rd}-6~SARM~gIVU*`iWBtvm
z+4rQw7~Q&q+SquS023!B?Zpd$Y<P$AujT-MQqtt)OS)V+BZvyvc>PMIAG#OQ=FR5%
zum6@4T1(<V=bS`+=XeXc#>9A?@sVB3IdmT``N&JS<#$)p++N|ROO~<biaXE~F^Px|
z?sTu_aFPWtIDOK~AmZM%YKKo7Zo{Jd5HM{eYfiCk`3BbCwT83a`D}jp+z;{heSgIT
zpMEJvT)Bu1H?BlCWBay`dCKYBdCMLA{XO5~+3$Y^yL5w9zq^sJkhgQEuAhRXc?Z`z
zz_%qwE0gg6>3VeS_$AH$aa#yzZPH~cGy&Is@@EA54Dh5+zm_#$yPPjS|J@9in;iR^
zi&^;gC!vm-#W&yi8GikuPxFM=J)2{me-6KX&)12Esz{(nJmZQO7yEwV%Z3-k$C>;p
z04n?3-o1%fYk~mMOzyd*ak}IJ;zug{<Q1Rbsb6>lulnPsxbE}6;+nU8k80e&V8~03
zgAO~GH~s7rOj~#W-+cWi*mU`7O1(W69>kTq?G>F$jUvzyKBbq*hd`&L&(p2D(=%%T
zTdFo=2!r+|%^AQ7K`Bpk?=ata+Iv~>(u+9tL(k?M{X8bNjoIa}XU-sMT9JEhyn`z*
z{Q}K<hbZ^hot}g4Sjt+D%NO(X%^I|NJABIDWgSpjC+*ANjPYt?T^#EfitKayFrVYD
z@BEd!zxQ`^tR1-6KJkvX{ADX?YQ`sOFu#Y{#~;9q{pS&cA!A#H*s@|H^>st^1Vw^E
z-g*x>aDQ2DD|*g-?UOn4O;4j<o9GCS`}^fmadiH?nTLwV=p+m<u`Z6ZI}~Y$PrriL
zhu?hH0}Ma#D3X}AqcIRt-MKL+0izS5X48g{h}fgJe7<0d9^;@>0-xXY*ok1?;rnsG
zsmIccA|#Pc@ae%#xm+CGD>Xp(5SYXl8^9fY?!Dv)_B-WhcS&{qpBduo>0~N3ly{>)
zmj~mAg4iRqM!gA=1@C$zzL!q66jrE7e6i7u2%YgEBKt$7r%&cEqkEa#9bUv%lY)?Q
z)#oJYfcBr0|5nGOK2)YmUE$lkG3})dI0N47hHpePqnP>gXRXeK;V2<YE(AmnrT(KI
zDh25Z-@UfS0{Yoe0iuBPXk8QLLZb27mRG*w#jo1Ab0=XKwi`e)mq0Z|;T4KFj_K<w
zGtl2>lWDUV6GbsfDN5x6T5Bp}RUUriksWV)>+7DdcFpR0>CgfJIti#L3ty|%FeYN&
z+?fP{B5KCe>J1vr*nYFL-#3OUEMK{L=(VqT*^^rEcmDIcL6NBjpB~0+-uxK3P!Y!o
zyLNA;Y7JYK4-E7WhKlVwMp(P{-l6xu_bpG_xMAJRbZG$@E-*FWLBudNHfG(uT5DJ_
z#==`~*uH%?{Cz|3Yr$_=zwRb7TK6P472)xZx5T=8wL0-H!DolS6oeNfg$Jw$B>y5j
zK#<FY?3VU6)!-eyU$fKS|F6LV1poNQ<*Zq=)*2xQ6e3d-UcmqRluHG|@Lz)m2rjzl
zLQXpAL_YVq&!LpEhCrqsJd#e9ev{a~WAtBwPjf&V$GrK?Z{}q$dzsaPFr0Gmu20Vc
z>-8qB+GY>oGm_wUzVjU}yzoNNTALsUrX0Kxp;oI?DwP--9vOPqJKyjW2d_HFq*~7P
z%8A^3^Uak_k3G8T@FR{sdwjf#0tD~jvvt?|58i%XJD6+TPju5$s5sI#`-_;J?|si(
zU*0NmmIHIK4FgEpJKag*>Hc+b-~`SX1%L$$798`r&wuH&`|h*faj}lm9ft$-3nk_0
zq#YS=z8#oJ#Jn?HtP>KQsCDb^-}K2(eE6&P-h1!eK&cHn@qjfDJ81$9py?!b*Ntz0
zyfZ)<P{m@gr@yanFF^`GP9VeyLZBc36pA3*1=HT?%JqJe_Jdd<bMvgES{)y6HlrBG
zdGNj@?FMl06Hb~y<o@0G4;naepeb13jeYUKeH~xVHip-?Ludb+@x!%)t4oG4oI!jK
xNkbsBsSe|A5Nc9$Os+|{v1`)Jc$1ui{|B81*6fKaxXJ(k002ovPDHLkV1mw}<lq1R

diff --git a/src/assets/img/files/jpeg.png b/src/assets/img/files/jpeg.png
new file mode 100644
index 0000000000000000000000000000000000000000..03e2302aa7285049f5a543bdcc6557c863b632d3
GIT binary patch
literal 1336
zcmV-81;_e{P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000F4Nkl<Zcmai!
z1CS(57RP^CmDL#Io5twF+Bn;`ZTkXe+qP}nw%0z5mOb0<Qs%p^MMa%oL^|XDf7T)b
zfHC&A{joNe)8T8L|MJ3Bf3f$hj7^U9g24E_fOu-a8`(Dho0~uUF25Ed9)Li00t72)
zPrHBfJpE08gn<5-?skJO;<<yh6U*Gzy@r}yptf|1R-+A@O5FJA_h5E@Zb!G(d8`PC
z2m+9-7X}D|SV1`|o){n5;W+A$R!RZnoV=H7FP`D-$A6A<uEWsqFeZwT-IMHo+Px@O
zD)d@i{;w#oR<tpupp=6?eDnxjA<sbQarR?BrP#Bm(IKd}X>6&m`%$;2R4NntA%ejF
z(mp+tioW&rZ_2v4tEXOit4Dgpwjn=0f)g5=vqjcD@MeAR5>XJsWpD)kD>%s@%b-7a
z-{+x~bF=o+IZWRYSrvL$k1+qhn^P*6li=fMCovl_Cbi%{fT#BeDVZK08zl-OwHllz
z?DpvH7-I8-ZccS(hR_daojZ>;7T41ZPK+Xu0g*JYaTJph03d*%gE%INBHE1(gS+P0
z`MA4Ks+Ku->I~=qvdr?=evOR{xhsa5z0>u<aS>~=BA6h;7=te4n4GPqR%At^6me{D
zw^q3J)9y`WcA8Urj&bZ=U&nL;2Ij7SfdcjYOC0#)r-_Xr`EOmt;M^2Og!=MXwmk4w
zti8>33A+K1iNWCmM{tJ=_7<;tG?i+FD2|Cw*2y<x#L*0|n?Z()H1{kpFj^!wmUgRw
zo*3Y|&wK#I$r1K`?0eLYtRT0|xD60MADs=@aLwG0r>j-`Af#Up2#UbOh^txn=I@EE
zrF8R6M8h813c04w(vSA>)hE9h$+@(aYiz&AO-TctMp>cX@cy?Zm$hcI7a`&S#Ma=4
zAtIKre?4`hjYw&T?%DGMy@0{eIOUsf<KQQLL}U!zb~mw%G<7ph(#F{25=aXK6I*(I
zfK9CM9P+c1bm}cmeD;?FU7z{e?q*``H16aut(9{miIT)c1gr>I1`PmYGl1B{bo~%(
z9K>}9FJzh_=!NvUAz}q%Eq)Z@2mKL7iPdRMAel4;fUNHzjAA-HAFPMp>9KO;?~Ghs
zX8tbM!G<w|eT(XScb#24lm3q*a}mP|DSXxfxLl1Er;wx7Y-1cn6vZ6;@-L{~bPHo^
zD>!bB#Up>^$k%^IQ15`_B&kVpYzVR0Li-OcLWHOnGJE|^-0~HV!f$sGz{Do0cJdQL
zh@%)97~!fd>ru|d7NT>SH8<Ts(D4xwlv3n!9-ekH1X&9_&Dz^v2PAthh_P6)pw#8R
z>08(fFma5R%W?M1nKLWPe?67YduR~If^cy)9Unxn!o@Yyce2ecN<g(@a9{w`01FF?
z?Z-X#5f9w6=MO6Y+I3x`v{9u5*$(+1M?$Dj_<oOiufv+P>p6b>MB_1!e(1dq9@zJT
zGzO<npP^KmBI^$R6`cP}0${Dh)gDVrOWnsk_Tl&IgMXil=*^oq@%FdBgL~ZLzI3|X
ze*qz@ahir%f`NfSjvhJOc+rcVckliC_N3q`!RqQNPkiDN+M}Zrf2>Z=tdIKs5)mar
ze+VRdBvYl5u1YyhtyYU){Nm@mc;DVX9R}6|5zqnJfUf~nuh$!Qzx$nU?|I(1h`4|T
ulGOoJW@JSGj4@$fy1)Psad8;H0`d>gXwl)I>m6$V0000<MNUMnLSTY3WthkS

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/markup-64.png b/src/assets/img/files/markup-64.png
deleted file mode 100644
index b890727137a1602606e0fedf002fd7ac75972a0e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4171
zcmV-R5VY@!P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000mYNkl<ZcmdU#
z1$5k4mWIFk1XX1WGcz@J4`aIb3^T*>ZsYPWGcz+YGc#jTsFMkU9Zn2|lHR*3J36No
z9oNJ?PIf(i&W)f*->-Wg$)c*Xmr{IP#BlQDNmi^}#lY!P;k*B3#tl!uN6%HY!6^2+
z4JhD1vn>j!f&~*82K$DkwWF@@{C)G2_kG2?fAo}pxB=&s^CJa7@7zU1Fh*#nwg#x`
zMr+;uR8;^alQD)`y}@hW_>N@$kx#C9^2I|>t2LAW2aYU2vn>`hQGzn`H_9BH{y>&3
zT*Ta7|9I)Dr+!d-mo~A9DMA3KPRsxWNu^=n|J)e)@wg30!JkpDx869WIbvuzAOE)Z
z!p(2u^syR&bvP?vfdtfM;8xKVgk8d67jkIb4Xk?9zp`N7Y>WrmY@#kf5zst92CpE1
zie|@oR0S<yD`?KWY#+}UdV4#b5d{95$74Vxh2I*-$x;z1uzNHUL+zKZ!@KpZL=7QG
z^bBmA15dJT<On+rhc)ED+8bH($bV$P%qbM5+CGId)B<b)UW=bo@?UA4qf!a?PU-F1
zpsICp@||-O4N%oy7#qI+o7drQN#Pxod_|3*35Y1fpaKG@D&=V&{VwF-${Seoh!lRt
z#NZhd9*S?#!dpeaS=Vc=Evs_20gOXp%$Ym?+t(9pdn>UMN+GBPNdQ0*gbczdrCvk7
zEpcGw^{jsA`GMCl;k5v)*?zG!1dyVe_~V23sQ>PD1b4iZ#0g;;umUIw2ssm+5|&f=
zxHNj_S3me4vb6vIga^<p7_R|}7%zi=J^meU8-*{GK%HdZ1rrp4PNBb5;=uB>!F$kT
zfd`baGeATbOBwu`n%|znTL?>_2pAAJ+XM$;1^VhG_AgE0ubD)5UbTST&VW384E0})
zr2X576Qxv^J6ky6Y!e&=6``*hvVZZ7tlIeZESNP};6Z6Gf8)lDWWpv1Q>Rbot?&9U
z=9c&3ZF(zF!YI5tK>!SAo1hNAWat|T*|#8tzyBnKR~_4cpZw$}<TZ81EN}QHuQoIG
ze}YC0!jhmC1Vz1q2`IjA=uhGI&QIa*o5IhYeDJDDJNYxZ4Vh>}%1!r<ZkT)I(^G~9
zEP*dzK>^52ATvQ6zUOgxIAHJG6#hPw8(wpfm;cij&LyXwS<}ncRrlBM?I>&p4k`d3
zq9_mq9{s~1duHD-x#7<te@;f0f%>iCxa^_01Vl3vB-epBC8&&~eZZc1lO8^|-=+;n
z%0gbAr&tG?0Gg$}2#~>dWHp~Qc&pQzpFiub0UoqX4fv*0$ftm|6cWIKYA)?9gxx88
zHDuqC6#o8yW$<lAgFaTzHo#?(fOwz+s1o+1@bwgaSvsqGz+VqM*`{p?ph8|a1v?U;
zWbnNyd^2SKiWL6p6#jgV@I(+T&if}0pMP(=_Rv>HJ_A5OvsD}{l%}4U*c@1y!vD>M
zfp=~s6h$yNjL3zAFJ=Ha<(9Fc5qROS4LPtng@4fbher%a)Z)kw|ATVehjYr*d%p@Z
z>q@ZA3l0z9Q_KJd8bhfoh1U`XSEcX|P2n%VeBPLV`l%gMj(?9Cr8*i+!|Rzvq!u}k
z@Y>!83<~*BtAriUFQqffSP%P$3Bil;FkvTZg2K|3BF3kAY%^uo#3ljsUW6;pM-&LV
z5YIa=@F;C%RF!=AfzTg?99(x3Yaj8K!y6OemAYxRTJ+uW2~KbND8?)0--}ftK5`2o
zii;9t+NDtHWMJoy8TjR!X$_r3!*0YcfyxBo+w=l{5RwVcK;OxjLu;>P&4Wkad+#DV
z7{81oVEE)d26lWEyZ3W+SAWaYi~j{@u7xBbOAVstFmn8MJOZ3`$n?vx0?FVZD!+IR
z$(E1MTKY)5^-rKQX9LE7Mh!sk61-~rEb!w)O)`<Vgj%hWRgZlvb7xKiwc~;pF_@r2
zoLEjBxRv4UpT_V1CcWBEN2!EXI#DTuYA!>3TBr9A4DSWsfZvNwTL%_I0*vXRR6mNn
z`5i>JeVppTjhKs{OlkRj@JrojTnC$=3bchE$7JZ{U)0Eii{jxW7j^WdWBX}N1hhST
zmgb}B*{Bb3ddJsk?D!;=(?4gHUnMMe;Is#86>Sb-q9#brG%uiWbStISX`J&gvzDS=
z3s7fqafGW^aUC<jbQ2~C;r6c*Z~G>VS(n2lPa@p#V1g<0kfezwt#iS*FM)^ua)6xT
zFRbf)*80%@&afh5!wV*bR`IExI+TKcm1HE%>zkMsDyE}?b18Tfqwx@ek2m#V%=`yn
zT>=UK4k7Nlg`N@Mro)?l5zgyGQ=ra;ml3Rd7##c~S{npY2I;~V#qYbBWbf~Ze)0~Q
z8y-z?<zorvufd>b)C8wR_&>iS_TBIQfJ`{&xbmX4e`uNB)5OWNBD@$6Cm|;fZenQ1
zXEBGqMz1?aM=3-*I&jvJG@4*zOl1!K;z!~wdn`KpURbXSjT?|nu9B#U9=;7v12j%B
zvo9wBG;UIve-S+Sb8vJEvgI4NE#Jl+*@-3&{0hc1R0jHSKYSC>FFs0b^+wD+pF+6m
z9(cY#`W+y7_+kyTe=_7?TD{uXnIvu+<l%jq)l>BS^!Zedf0tf=m@w=>)yKvWq;TSO
z;LW@oZ|S3uMGwYxF2SjyNdug_v;Mu2M)EM#k35JOdJ2^i;XiznWZJsX49J9fCGbO}
zb^><&9CyoCaNB>08$1D~1YQZT7T0W$5E3oCobpp%hQH(@T-<_;%{ir94o=OSF?FS?
zo+2mTTE|#YK=QRSV!%*8y~n@C)DDkiB+U~C2tm)v(G-`(k3gqihVwek-0i43#uJ;Y
z{*P=YOu^I_WX2-sU5wi3?CvdTj)wEfaM2@S!z1vH?7+MIJLsnGWBYdE5(Tdd-zomq
zpAz<MC0c$tL`?ux|NKD69}`})|0HLIDk27?1DnLz1tz#O)tl>|OStk8c!7sDTWD(#
zpzW;AiAQwsR;DBoE-{2N*JDe)(5$xU=PlZ-A)W_|E+Scc8PydVX?^;|Oi9}VObAZE
zR8Zreo%ZJ#2>G;Ep`RB}hc>II1C<JBfDHCyzke-5zuSPUcr2wA52iGIDT1O=1Jo9b
z06PM{{}z1p(AXjKufSo(hL^0-^+$%y#~Awcw`u<ROO$s0j_#xZUI<pvC`O0th_xWV
zIC=m8e|+%ZY>UdYC6w;@68O_+;P`e_&$u1};qjYE`hQ33w{M}b@M`>ZkE68Y?)a4+
zByOTfgrbP&(;7IANmE%|fEo{(cQI-s^6(fBFRT#7F{gKLqWYU}z|G&H>)39l8t{S&
zPCQ(rfkqMj>?MQ`y%u-T{n1u~Vgii61jwg7nKT<FSKzY$LD&90Zr}HDTR(+8@LOD~
z0bU2jR4BIw(5;^&-u!v0(=S5SKAO_{hZ9U+fY=BzBlW+FaPSDuQ_PgP==9~I24xzd
zqcJ?dVA|-le*G0nyMDv;)-a{8jFvlbi6ySp5e&hyi}4@$B)I#-iKomXX;cv#qeup?
zjNJ{iF+il)3Tn<thepHTm66p?#$WLmOnTSdrcaUV_%3efc-Cik6NnNV*@QjtN18u+
z6ZV>C({can(UA<;dmCM?2F@6Q*=unf)1XxcKvKw)xBisj5BxX11BaOAnKQ%dat}!q
zqs>7~xtsEp55~LtskjaIBPw-an{}i*fB;2!z3U~=eyk4)&O$VdLty^BFbnQOc=sK+
zO<yFr{Y%)RyHNGc7?nnO_$1-ctzbN?wIq9PA#j357Fl>1&iDXmHbb;W_A%qcUc#=a
zIHx3|4QmU3`aFV-Ps2Rm$=Icr&{RQFaB4$HzUGVY3h2bzfHrG*3UM6;n6eak;0p=v
z_OE!`zJvYUr?Gqfh{h3`fD&SiAsRf19NLN@z=<Gfi>@|7GXOFZoch>m4V=SYw3guh
zPeAVd7?PQbiJ};-*AX<=-nE6#_;vgSX!cK3#=n4>w9qsNx{<5?9{-Xj;O+V)_P3uV
z{{2_bMgu&L#^F5#Ck~+q(mfOAtimM`0-&G*E^0xPP`dIOyp2yqFS~}MbLwcCQyl_8
z$glWnTX+ES6QXftfMy|gW%V|bOVH*JAh7ysyfs&2(%Lt}CqR|v-py3%HLNj&D^vKM
znMf4f`5jS{j%63o_3|$xX^S440N1QRbr8vC-Z<eEErO4?1Y`nB*MKS-)c{2oU5XWf
zI3oVjAL((N8UHW23=K-7^$h@uiz7N#T}I;hXsdx}0~GiR;Zd^CyWR*YoR@Wb;uc~I
z%@kDc_#IxlwN^39E+t7UkcX1dk|2%{Kqm&D@#{D<pjZLt^Pz=Pj7^yJq-Rjl7{o(Y
z-Yr|<q1}9bg75_gvlvGPD5!$Sd3<7{_~i=R?}<1OR6$#HaQ1@2YxZ3_-hmKs;T~5x
z2hAE82*3q~&$doU;soauRUPk8Sda_%tnU8~UX@lWLQ(v{!?|-Bkb{Bq4xhdEyum9#
z8+bPY-;8KQF>~k6*z9}WDZFuy0~8gRyznpz2nxl&WN~NU<2b?dJ)+@S{|(pw^NpuZ
zpT_gNq5;~r3zSI;FGva()74d>r@M<dNociVq9{g0C|5#~Bw=u%%D(;kk3IWY|MBRp
zTQ+ZF3>gK+3Xn+)U#rz{E@IB?=@=tKDSWNoq?vC0z(<{O;=~}g-oE+xzyI5{k4@qK
zKpPp_Np(`zJR<b<9mMy9IJOK8*BP!gvDVSk(}Cv+M~|Ik>(*_@U-F`7K6cOUoxg(i
zGPFs7$q5gtj)8%J(R8n-;3MJO8F*t-_@g86cN~9l3cq{T&R=p4`HZPa2v2@_OGnea
zT5U`SzI_QyLU={V-~mQ6z)lbz!1%t$NE9{M;3>}NMCk6G7(9Ua?svb(mMvRHO)y4K
zot*H>*}q>Yhj`w^-~r4-9`ax=zx*=Z{N^_!BBMs2lMfzM$PI6;wP|aAYC`Y;1|W`O
zp7D%laP76%j_w=Jn{@Em7V8|&DfN1bbZj#rc#4hS2S4~h9{k`3Ymy|+7&GbMohr3j
zopQO%@e?PHKmU3E_4o{4D8@MDXIsfafAy<h4IVmpVAJX~>o*P$R}nzTUwr%h;_8i3
zd|wePlb(CB<D4Uok~1s9>Q2Ath0nS!9pu~!%mx4)pt-FAE(@F6&%dr2I3_bA1i0dg
zD>l6OEpLC*!Uc;ij+0n(&qs@sBgyS^=cdh_F9I`;n$L`j6N^o(?A*Ei(Cc3Nig#_>
zw(Vx1T!6MY-~@=XXaP;2l|`Jr?(zl%nE@3*N~KaqcURXuMMJ<>@E{At2pB*ROuG~;
zq@sWn&jDIoh*jFI9Eet{!^5ps6a#(^J|DJdKnCB)q6I|Rd6&OXlSKwf28PKU7b9<A
z5nKR@+cxKl(CyB-e7TO1>RL1-7fB&QvJz-7DIT8#LdNwS<CC7_7(mZq-gv%){{^g8
V0h`I3Xk7pR002ovPDHLkV1geJ`tbk&

diff --git a/src/assets/img/files/markup.png b/src/assets/img/files/markup.png
new file mode 100644
index 0000000000000000000000000000000000000000..350b1d5ef23074c90efa05e8cfdd8ac77dd238b2
GIT binary patch
literal 1296
zcmV+r1@HQaP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000EnNkl<Zcmai!
z1F-Ep7lxm-$>y=~*|u%lzQ1kTwr$(CZTr~Q+ijEeZ)E1{xm+_(*ED$FScwP#*1F4@
z9HKKidgBY9kUOvT!JGCQD)uD}u~M(Gx$77s2i*M2LvMQAFO;(e1OZYXKyZRKI-E8}
ze+@u6=Ma&JN~Q5H3G>Cq>feyBKZNLie<P`AD3w{;_d*69@*c+bn<Ofi5uu4UXyrB_
z2;u}4sAQnO=lCE{f741SfQ-uIGmWJ`Q~&y11Y4${m?uoitV~?U;63kQbabpOzSmIT
zoM>xpPN@L>w}1Qxoh{NY8=K;Hqoe<!x(Y~BY;pgK8NBh`43CTuH);sLo<^Vg_kq6h
z+@m?-z>(p1-7;u&bqacmkd#^OKcD_9-oc0$2fz!lTXEW?9rO>MGKdb6^JRGkXL3M^
z)sc(nz4Bd6@v-$IM>=`e;y(K}9^E})aFM7=EkRYwtPWjB|5Y9FB=RFq38^sG=^R%P
zSTFAJo!SI80T%=1ruf9g4BYzOrue8A_p=Q&hyrD(&HtEq?mM9Kh~SZ(z()`&g-T-9
z4rra0ceXb)iRyrY)@XH+Mrj#mBb+kCzkM0u(szj~n~^XJCeQkru-;(#kE<*#W!&%s
z-pa_>7&dC4Oc5L8s4V@4(hnX@^37`qY?ZjYg4#5Pj9*UuGj|bv>K>wheGjKX$aaBJ
zh&Y@-Wi9mQxsxL&_xr&$<Kxt#2xnueQ{Te<`vU|^-zT3RBs}Z^NNxx_^;5!{h5jSS
z9(y<Z_|4dN-$F8W3htD<36H%3vIRt}pNc|>2u|dH()QZFL>Ely*RLS>^)oTUCla3V
zG8j7-2?_{8<p-}N^Up64JmBky&Vr4wbAKTE<n!Sd-$h-#0rjvqBlQZSBmE~Et$(Mj
zb$-nRu?gA!!=dXi;^ie8zxXJ@Q4YQT8A!I9=x;wJH+d#va@guN>i_!_(T_hx_^*GH
z?VBXr|2PtxAWlF4Km&lEk*%T+xEdKd3-#}>k^JIa#P7QSJ9Zl31Da;@|Ao`<!#Ydp
zjSoft>Pr+S4kNhcQOKD$ko1n?8r9STC}{&h0FpXly5P7C=p%1K{p$zFU%o{&_jiI)
z1p6M3tCh&~Pmp`;yK$#ph0S*18a1R*?Tj8TpPm5-{+c6_AdT&aC^+I`g5$3y{>BF|
zV@G4Vhf#4%=7BFIQ6W;VBGv7?yaS{Sym;zNdm7dD=<+9D3MXHNOOj4`)IglW9}>jf
z-$yA$CSx!<Oc}7tx5eYY<Zyski!b*8EmS9)Oop}9)z!s?spV|eph19?AgSA!5^&<Y
zc^Zh51fvzjLIG6B?Cf0m;SYP@U4Qt)Zx;cAFbsG5o;bm0U*>%FWdQYhjkUEkw8=6x
zHNEXY54`)vrucX95v;7NqIJ0L#bo^w`SM-koFmkR`T6<k!yop5+yDBPKYfQ(1V<fp
zB%k=iC+Y6)#+XbKgKlDsZelv<R+&e)@MT(4C=^*-Slsr&2i$Z0pa1lSZ^HUe0DXOZ
zLm&O<C%-a2F?m=V$BBq25tN^e@&^FtXXi6Y1;M6Go01p2;Mp(u(;t8T1)vDTKm{lR
zb>&U8F{aq0UqnJc10fIqDn&X3z*-wMqY7kz#2eJSN#p+l>WiZ$0HTcm0000<MNUMn
GLSTYZ1b`<1

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/math-64.png b/src/assets/img/files/math-64.png
deleted file mode 100644
index d98beea61e6a686896a0bcd9dcb687e20f32b628..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3170
zcmV-o44w0dP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000arNkl<ZcmdU#
z1#lZplZKy}U9p)R{+OAWnfaKRnVFfP@CuHZ`D12wm^m>^7A;KQ-c+`%+VcLfoH)Pp
zTCJWHMNfARDoR9HNX7_CL1YOj#>dCG{IW}#tyFuS`{p10vGr%3e`U2+4GQ@pMhs#i
zGa<%UZ?8iWka08Y+p|mU+ObutbLBt#i$D3pKfB<Z^@wm1CCGd;)-e`EQZA{IyMw^o
z45-$R(vCwRU*KE6^;?6D`zq)453T+3nQ~bv<xsB75r!cmAtnqW3$2BrAHlmcYZcC2
z+s_?0JWH|Ed3kSl*F|Ay>XB&{(D4H!=>ZTBEVpDb?(16X=UG4tRzMh<@2l6FzZrRw
za<m2sdF|t!{O?<zF+Dwl5rr`UVGv*f-})f*ZQJ*n<a1d}(BP)a&*GWKA7<66H8_r@
zR<9F=0t&<c2nu_R5kL~C_9+krA|`$wnTNp;x4|Iscc#0$^!-sFerquS=&042ANziA
zR<dNY)<_ueAFqAFi|=m43ql0Pf(DU=p$!6|4T4ADd*reiB&c)ar5kuUg6|&~ifI<e
zw6wq`Gn&Y8E4(C2zvW6GG=@SUyQ8PObcF~NTI7n5R6#^~fh4>w>;HN4b6)#sJIcwB
za|^b-13&<U{R4$nKA%VY8rMacf9lZ(=^GeK&?Q<a&6Mld9rp!FfeEEI3?&bV0Dvsi
zu?(mrJpcRl7_Wc41MOtV<+2uDDZxrXfC9h>WQ!T3Ima~@ujBED?@fhIuZB3&Nj8~p
zC$A+@G4YkXVE|e5Aee-I{_Rb?@$oK{n<byMnQwW!B32+m!PSI~3RhjYipL(fD_QoZ
z6h6_h+L{H>+QEcA7XFi6=m<WOD<Wb5HwJG7z{x4R+BDakKg`4T-A@1D@D~@}x>SB#
zrBrI>#rRR5ALETrciFPf7D^xjDEoX8K8vAIndO>uhj{4jTO#<86#{P?i?0AjYdebn
z*Xy6!%qyKClPe&`pp>!(nm7g`pu|w0D|6M^ecXTN%_|4qK9Vl?(MKO8Rv3nKc6P{b
z|JLvDdeq-vet!$-424|IE@+ga(dgD7pfor-pi!OXvNL<R@Am5%h~Qy`z{k&tpcV?i
zzy9mL(yE@GZug&`e@}hBdlEk|<ce8>FaQJx7vs<pgvf_Jjq(JSuJ7cYTd!kaXcT1S
z!HZ%+x!2tG5V5>wgQ3y2-?-(#On;?XBa<uHMNR7$bZ`&{K!f<y%Hv$Twu8HFzIH{z
z#|?x9gW%r#<k!%m-i)Ka_2A)g1Un9(02c`C9act^E&KZH1Q)F-TKK`?QDEi4A8#CV
z%hTh;QVKVhFXfeX2>d3<{Cda*LKh@}jAN+IPIB?O4(`6iX8yE<w_N!`i57{Q$r)p6
zcA;aXG~j^(BSJ1?s8(jU?2K;ix#hak1YT0t0&c0JtEB=Ip4TMs156x%czJ6)3b`z`
z*=epktB-qcz5eupm-s?R%8fze02pI1c2^e?Z$Eu86bd=&a}#!vbKmVZM(`u2P3DDk
zxgv&nDU1n^1;9fjW6Qo+bn$C5Tyx$C586e}=>s3Pg@vU}XlOMtA)(#hdv+kqxDH{X
z%+*omAHL_d(-U64U<HKCOCiU)K;U_lI`fEUx3oNR-yQT13?CQ%@WeRFAu&R4cW>M9
z^OBSR7-{7{RskOQTm}`?x$d$vdHlh<>088>wo<RLb>D=&Qc7{Mq!f65z=n~4)q?}=
zz}vRifGx5D!Z0M8%i=Yv+;G|1Jn`_oi-ET)<#Swg_8RKs?E$IdXj(HUDB4#%J9)US
zv<+|DLV5)lV_N?qyUq3MRc?wh|J0)owRMuCaOldp1hooICPTSAXLpt&(A!z0lvM;_
zxU>q;nv8BA-g?sII*t>!EqrBWiW@FHlSdzlGT-0+F_x3b(_0k0YLiC3K&4#4aa?xp
z+Rb^Ro%Hwh()9ecYa#C%3dNo!!HY=xfymKA2U@qodagX<e(RTi6N7^z7-N<++PiLn
z;gTYdI?bR+wLC}Q<oS5_1P_d^C7WA@(LN16emtcUxF3J;4zZ$sR$jAi!|uVMk;|1j
zv8m2+^Q`WK(A4q$Lga;Jro=zI^fpi2as8=-x3~0_fS#K^LTr`ELyerPek7C0gvg1{
z^N!B3uB$+Qr-PHrlg(yPg>L@t`8Q7)eDW|PDK#-M#k>SJlj+jh-DW~Fbg~vX#x&VB
zUggkqlX|U2wN@vn&GPJBH=Gi96Ini&ofsPIxd51;MQ(q8F9~Jm=IUBRK&g|m!qY0t
zxr2&O;9w}^f{;+U_^bbYgXiwKaarM$13*&R7$ITHv%Dq4`9mFy_T|YHOBC~Y$anFV
z|NZ*1!pm`v#8Q5hU7oc)xLh#Q!`gu&j_cA@D%mk13c|9%W81M;Bu$f|<=oi#l__S+
z6^t0VJ3HxHy@5SP#+L<N+WTc_`QdjQIKbPR_A@jzf)VKJ?O{WYX1J?!S>Rjl79Rkm
zmIr><!GpZ;;SNSutpb7m!G6|tsbz;3A%5@T0uaAJsgnqQ=pg_5!FEPQkHHW0vA$a~
zvfS|2NxNO(<Ys>7fdf(Iw=+Dl3I!2-KkIu=6}-K**9A^;pSNW{GP)Y2l+Aop_NNeD
zu(x&sAl3vW>I5?%_4yBMpGRp$U%xH;Qw$&bb}B%?nmVxo@A(h6F}ivUAoO&1aZZ1h
zzGC5&XFm4QZWma3<}JJ}d#ylF9Nxc|>fr!4lf{UkUHL)CW#^qqZ>ghAcp>%+$vxTd
zTlekfrH{5pWxvM4$0trszQk11Lwo^r+b2Sers44PoDD$R@L1no00dBN!cSMLyt(NB
z>o%Na;YAFf>@9<$SSqm;DHILQ$8nq`!6U@B*g<f9A<)jby&oE`y>Ja3g?xOP6bIl0
zrSN?hS366B7wlh~gWwW=wCFAs(4mLTzN6Fn)PfJEKPc8rR+GyYmH-c81m6n~F>Q8%
zHh;0nXotR@-sRfWEg8Pi^bj#R(jo(}d_Pw$1AO|ZZz5|(@Sf+hcFpj|uIo%LJ^=9;
zuma)Z=Z%rpT1D9_g?*1e;0L&_ORYAs_t$>)7r(2gr&}T=10bm#aOJ`)e9xz|vp`o@
z2fiO1%X9!J3dI~j;8QLOyLazC_#;2`Jx_l6>BnPjE`>p@z_M2;s?{p43nRm8X*8O)
z#H-aNp)quI77;N_PL=um^Nojo<|lvfnQhy)e2~p%Sx8!dq#-M~&jb4p?89{wK@d`|
zRH;<zSop3Y+EE-iGR5bgjUD=#pZcNyhkw&?T+*ajFaj$OUIc~0h%h@dL$m1<onA-Q
zu#a_hmC)M4Gq!Qlp`ZEbAAV-r*3ECYuERnK!_ZplLP!9$!ZIIwBgXdmO0^XpVtAW*
z3-2b5_k<t_tY5?|0H_r;)y3O$>zkf$Gib{`1%4jf;QL`Kcr0A4HO80(yaHAbe0;6q
z*9uB0n|Wh`G<eIEWJ^lV%~fpQaU4wx<_d$C7H=JeLJr4K#PB~m4{xD^Ah7;;(pO)7
zH9zw+Kg-dh<2DFdDS#CUZ++aCqwhS;*x1HHKl{@^^vu=>UTeK*@K`Y|ot>Th*`NJ6
zk3Ray!1PRIbEDz+E2UNje9LEq#_-;|Z?j>;nH)Ykap)(0?E9XMGXEw^l+*Hm1NfJJ
z`DYFtI#jsjmfOBVD_t}q#FB;D0>a{ftvl|yU0M(Tfw^jx%G?}{X7kXG{>b+}yM5c1
zHvnZVR(#z~1ppc_*=$z7{q{Tmb<xF_-!n5)L8<u5B;b>oPXI0^^GQ%hD|>8Nd%jP(
zTw&kdo#Q|Evp@NbV`HB^4|L3j2V?zwJGL;<7Hch$(m=)<$W>Qeb@6Zi&hP#Dn$_zs
z^?fhqRmrU;h)SFtEIRXv=M(ci$!f5DJ2JI>`_?_b`YS*G$75q-9|FY`*w}n)&;%OR
zY}-B-045HA1GqpIC;;U1`C?aB=V}qj0<JZ101c=_JN62c^~nlLX(uHKPh1E}*{RRW
z&Xz09X43<*Ezpt(K+s~I1&6vd8vy&59|s^&32`uNn;10q){@}q#sZ#{Ye^48^03~T
zw3vx~O6dpI;&w|{QKU<yx2=&5m=3zA3P@bHQ7z_pK~3ua00)5C#fPoakN^Mx07*qo
IM6N<$f;>boX#fBK

diff --git a/src/assets/img/files/math.png b/src/assets/img/files/math.png
new file mode 100644
index 0000000000000000000000000000000000000000..70509ac82f6c1888950378eb81507fd30ccf2032
GIT binary patch
literal 1094
zcmV-M1iAZ(P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000CHNkl<Zcmb7_
z1&r%B6h)66H=U-#%$-?gW@ct)W@Z+xU{TDxAXsK*W@cs{?C<ZiNg8`IjipKTInp)C
z=Uu;NwZa$!fYy2=t<Bm>Il;}h-rn@(pW(>^!-byEuSAtfnXCxiwZ{hDKIgP!pVpDi
zB&TefYK*~=QvRLEIBx>f0~kYZxm@|ukxutavBcd^zRTA?{XwN%qEwuvzdgehXC1@Z
zYpqGCJO{}ctT`+LgRyIv&W@HXl#(AQ05JKCQf(8{#Tfn`e@>P0ygWe=GB(u31t;v!
z>f_^-7S90|MhZ>}Za^C?qDXsEO4RSa{Yp0LMnO&KJD+%$={ZAdOG^wZQ|Qfe%E3EQ
z7#*cj^&8=4N#`cDhE1B<?~o(u>+5gZde39s$+DrnwUr=@==LIx-DhV;hli>9!OFv}
z00f}+JmMTctoPeL)56W>C@vE8wg`^hdn-nUho}ZChTAn;8!NyFkgaWPczI9M{0ha{
zS(=?P$M3rpqa(xkeh6kMa2lO!3$=YLzy?%N7*Gqt`fFKjq?>b&+JoVtL8?JWWTJZR
zg%FS`EGhS{a#PN+N-O{<V>Ce!Fx1t=c_$oLPfNuQz!)k)z&C$P)(_=eMJ<X*f05P{
zdOOIwu65m50|52Ix8LAq9Iib3SjG#5hS%b`S=Jfr=aZlQ!;3=JFAP}-XyzLW#KLK)
zL0xjVQ?b#S17DAi70l9JOHMkhHPpd(6J>t>XL2FuI>~w5EsXV&HxPDVv{b5mr?t*5
zS<s{}`XMiW{3GiOwzKA7k1eQmP6}?-*Vnm2*3G=B?1qdbmIWtPYewNnn5jl}a0A?=
z;mO?kN7+%T`VDX!03LnkONIyg*kq`~0+%oAU?Bi38~#`fA06yvqj@;M(xDCYv0wTI
zOQxk3>xs9&LQ9u_|C`{Y$*I)!p;oK0#X1F=GcNXg(qlOd0UBOUGG4TJj?LHTM@qSH
zD*&upZOBN+=3S>=kU%+(P>xKc$T~<Dx!udrmTR)`R5A6EX|W8H%21pw&i(k~4^v)z
zUXdJcfZOpB^;l96MG>)C@_7$~V0N}xyXxvoPkZzAm%q+tn~*|?RQ^^C4&eJf6aW2(
zlxn_C)w9k#?Zg+Jd-~pL)sKVCqJkj6b+hT>Cg}js^L+}c(`nIwNO~!mn4ApGIqS4z
z-+B9uN9v}n1G(LH+w;mRuZZS+UO0|}tV`j@WbDWV*}YgYnM+wWH$637J?o59kDP}C
zjXxCtEiEnW_uco<6Kk!#&Q?ME8DoTXYWt=CYY8Fc^vra0!*y5Q_|7|T-3{b{5U2np
zpek$-Czs2$dY;!8A9Mf(IDoYKX#to-f-nsHQmIq~T%eW;uo&?F2kKMi=-f?<KL7v#
M07*qoM6N<$f_JeO)c^nh

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/moodle-64.png b/src/assets/img/files/moodle-64.png
deleted file mode 100644
index 44ad3a37d35797cb18baad5437af81077663efeb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3578
zcmV<W4F&RvP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000faNkl<Zcmds+
z1#~01mWDs6%8niGbcV5Mnuq$$G7d8{J!WQRW@ct)X2zz0W=wM@X$Tm~u9EILb?Wrd
z#x8I2GH=$qf6k30JF57*b#?1XRw6>WgvswKr8#`~F!SdxU}WTI_ES&%=O^EN-kBE!
zg<|OSbt6Ww(S(6Da?B*Oi1rxSxmz7seZPF<f$`5>{DBYr{Eo*x8Eb`yMw0wK)<r3W
z)`~QxIzU7&G{*j$h$uivq_w74D)Yv-zbjfW_{&9iF6q20Fd;cVfsHIS6pUlGV$gn;
zeSv1Me*trj@8iUd%y7pgcYjQdKQkbT^kfJCk(oI_VtysrjQ<<0)i0*(fExI7OQp)&
z8ahX5Dpt|;z?bp={5gu_gXF#H#2idyFrmd%3{lk*20~Pd@G_n3iSq1QaT`l+c^s#l
zd?MNdDF=v&5EO_DkiZKlK$Ik72Q?vdXE`r{$g#esH9bA;&&_1~cTB|r`5OHCFpTCX
zrNEWe1P1u^C&;b*JW5KmXDS$puqMPthS&*JOElqxAObZ3-^uQCZe!66kLA?<Sq-8s
zJ%kg~dRTWXljn&$9b+x|e0FDVPv<fbDdEVs*48;dM0y|%{xjrPehn?u;C-wDg+hA@
z2tg^7GAJxwwwGPiF7}>t6N|2yfbX3VJPqO9*-qd2Q>DNf+hdH$iSXYYKoix&f1dVL
z-$aY9!DkVr0F72)73gDOWl{Mac9uKXwd_XDy8JOShj+q0{cbxWnY=U<#3s1%rw;$c
z8vM8Lj3(dK21I~D0|IetwL*(UGC2lH?d)811M@C<6sI2dzYU-C5hlx@8vGZ?PrzGM
zgU<pM9DgP)8jICkHTVqM7hK1j3-9H$mVgI@#u1>DqLEY#ui#g;HNWQD_!IEitUJ|p
z0-gwlP6o=Ft@Ezt%>TTL(~h6j8h2g<7dzbn4tzNj)UQ8LgP#a{YVbMders@@AQr3I
z*;%q|nR_{B{O9d01P?;G{0lF<5E7XvV%F^0yz~7ZqkGMl$*%r#4Bvii%>!u1R7_=6
zt_B~mdF~}O_*-i5eXR$dQdRlC{N*ok)!ToZXMX)5o!j<f#Fk@tAwr=hr40=NR(T8*
zBR0*Oxbru(Bz&`S-#@Oq4HA{AhUfj;iBCRl|F3(i)uVJ|JuKQyc8UC$Duyo^HqM*4
z^ViqlXSXc8IOfV<{mRR6)ZN?F^~B2Xwz#~t_^1TmbwUiUvkVkNHpXFpT}#6QO(LKi
z;f_OH%w>FwDMx4or4<_B7`(;md<?%~?q!_W`tV6VB?s8fyfai}b70GYH4z|a6jp;y
zvb|BA3>2bT*k8q&Egtr6UsBe9ue&=Oeub?Dn9x9EkCA9Vl)<PT28vQkcvsZmZ*mh}
z>%*s1gT4u^>wp;CR4r09_!$k#5a0PsFT0D1&2f=)%l{d8k|uo#80QTI5=p$5mx=`h
z9}8_g>@N6hU2r{f;v(mvfe))?#>U1cPL?>h{{U#sKmOCdGIRL)d1?93m&kPh*a%Ej
zuoa847VS;k`8?Yf-o%{0vb>F=fbHA2vw7ntHgDd{z`#xp?Ay<gBS$!T^eCgFqg;LM
zwY>KAuX|YGlL(+b0xA|;3h{e-7zjETSb7ulF1~kKySm-Gw(*BQ{E^iwSFv^L7KVq1
zDVNHKSWpU2Dat`WM`tH*d(|ts{>IxLZurCj5p@v|1qRRSVprJ3o@KYN;L@pWX-7s5
z^V6UIf?xgWH|*TL6{%JzS1Kr_$Y!(nzK=DAsAl71V=O=C9A5v1H*m(B1%Fd`N%~XD
z0X8&vnRfP6H2as|%EBuj{XZUN?ASHH4}b6j9$fiH!jWNmeZvK_6ytQUen?}Y2xB4u
z#0rS;xF<f5r$6I42>i|AX|@Dpk^{8z*c<rlJ?}P_T=y7GnVk;5Z{IF{^Mh}(<G#P3
zD&x%YHDld*4hM$aMN2WLpe9Ys=5j<)$nek*#o`F<9lZ_V`$twn6oAr@>tQ&*WQOo5
zPXVnpIH#w3M=BgxaRZC5xhECAbaX$fe)x4ZtXaue5E7_14y!&2m587c5`|T)4e_)>
ztU^z;qVaQis+9^s5b%w!eU0D!?)QB7U9V@}IdSHvcg?#oTYruehNze-N&&HX^t9#C
zv(CU<a0x?m@0u38NO~0b#U1+~k+PQ2(GeEi^9D}rpABMg6;uKSH?CsmUw#!Ib2I<%
z(LqQqD05s;qO({ej3S~ij6*((VngEVjxsbjNEn7_rO9`6GFm86{mu*N53Ztma0}ty
z)u^@(@O<#vK`BrW%Np$PX6%9c>09?TGMB!NgKbNiz)x*6q&_z%4~a}Q%q(1V!s?}8
zT)Euj`@lqXVeju=MRfX#x<}oC{kwV53ttpJ*F_{*_lDRJVa-g4H5OxSJT4fYS6$M}
z6BidKmCE2xK(~RC1UhLnpqv*J5LLj>aO9R>PYK?NkZa2v>F@7dAR<R_<lnusjHB@L
z%e$X{f$#lrTu_Y?UVBFeqYa9j+5P<}6o`<|=g4F-7-Ojf0YOlvT!zqwRI3%Lk>Pp&
z+0PRe6$wHh+n&%0NhU_ckZoWMU?J1)eCixTCHjB<7=|zUcvE<R=0{>b`pM5Ak+qf;
zOBb%Jv~?dPjQScr=S3P;cv^dO_4U(#;z?w)8H(fM@uMybLqNq#p->p-)VXKz?CV!>
zWB6Ty2rL>m3CHmHZZiM)B!*AFp5sgFFzdd7+5CNCa1<zFhuEQYQ-@F63|)4~MYs~6
zSSUN-4m<#=4j#bs+IYmAe)biG!-WckNKrB#6|2#{$HGO6`Hu_#lUr`R6M*U;EN1Oj
zQEi>zhMF~GuXr6p-H(Vt2J=hdf~Cx^j$?QH3bGxz9_!ovO%B%_l?Lw&Xe8elOCt%O
z8kM&yy|#aB?hgzWk1*8P%V^Fg>^F4O+SBiO2fZhqh5M-U&c1=@{%^P!1skDe&xzqD
zKkED?*HPL23zUoRw;@Ni!)fX8A~Y|A8p2EROVv9t+VV$w&hKL+b6nl7&ckq8F5pc6
zFj|3<5N4gmp-J!p9O_t1m!C`ikK=%j{yKPogFXL5pO<kR7Pn%mP2r(=A*4xFJ$$}A
zNc6zZvBSGkwzP^+G=cRf*Q{hTW${xhJd~nN+OLCe&Y+sYC!=XQpz)SAtRQ2Dv4{6I
zfOk~SHI1`+Nr4w=_&=J%C-a*xfz%u@IooIQ(3VHW4%NY@5T(MWPniC$t~tEW>@lF3
zB&C3q!;EsSAAQmSq&!v!pAM7)-vsEPhL^u?2}r|ipIP#6U`!o+bDny5nI^n6pV1s%
zfaxv)py8u#Y|#~TRfFd6ZlZ>n!#A2FQ-)9YWg3sc<VT5WnC-{TzM&pIoof1DTBO6L
zC>=hQyCIs=5|A03-qw*%7oK|f=5w0D3zFbWI|ry4!8@83JSq)7g+iLcBP1r%PJ+{e
zPn!CaRS%!;h&1?gc4!VS$4I7A3MZzf`=y07U<@b?O2y;Y(%`KDv4DVrc&@eS8=Lt0
zQF47i3@R$6z&rDr?FQ3hRzRt#!y}j#cOsP{Xblj<srKH~Gra0~j{+>9KoP^KzSC1{
z`(XK_!SfK3zqgjCcV1I?Nv<U+9#BzaaHSM|<KyM6VHowHlmq|po!*Mb^opEx__#I3
zlFj-@PCe!L`V%2iBq-GX19%akQmG;ce#XOEnOY7=ez!cl0Hna%3HYE&r5bY5N&OG{
zo_7RqDmg%s3n|sQ@DKyKWv2o}0XBvw3?n?>qdH#P|Kuk<_9+wJLwcS!*#VMTS*aF<
zS17_Tq_Z<mcULE26j7;!RI4FMDRTKNQ4}#cQea@$uAvt^{~6b>U-#e!8b}M!$UwC$
ze6d)>+A1fWFdMBE)k;XQ6cE%}KjR}-ICN-~wf8?b{Pd?i;l>*L%IWV0MOriADaF2h
zd+<F)7#haLON<wTIMa7`x8r$=!J)&fU%z4al`ntZjXSn){XI>jNeO}0ga;AJ$jC?>
z?uB9yo3$}~91Vkm6Yv{{Ur~eKzHRI8Xs(nb*oyGD$6FGId!bOC5q$a*Xwm1qIP)hW
zz|0UHK>NPOgiTVb!PoETl%lI^X7B*|M?d;8>(;H0ouIWsTDZb<|9?K0#q(wc51_BO
z;&RSE|2*FDj(4DxiXDNpW_gQK-Wp>V96B-scqa#hVaRiz`&^#zgeSy(?Rl-cv9T6w
zg;J?Pt+tsFd|eX!*vCG`<(FSBQ50FNb<4q95sJkUxm=FnLx+c7^5SRRoWQGko0@z8
zXOjH>_rD+AyJz<U3l}ZDaD2Rg0tENNr}yL50hYSIYXIi-n{9TiwS?6u&i*3y=*wUB
z{3q6moVCCS5X%DMv~fQ%<MiG4B>_h#&d36+Sg~T+JKp)8x1V<E>1T&gcx=ZZQnxcy
zjgG~Hlsi8em?^CJ#BpI{Fp*JPw{F_|<~P0e{TnuHSPkSRK^q4+0>Z>9Kmb${3zPS)
z>wrw+fIOhu+S=N?Iy+AmBn$Wg9wa7c1sYJOq^&ocHtDOlO+Da80Z7`(KPV{_#>Xp_
zY6$oaylbZ30Wo|zu?kR4UbpTC)rlpb$H25RcFhHM`_%WHw*Iwx==9gDyIku+z1|_l
zvB-@OcL}6P)s34&s3~4!Dw4FZBWdQmDPDvB0^W@mU9e_s+yDRo07*qoM6N<$f<N@@
A+yDRo

diff --git a/src/assets/img/files/moodle.png b/src/assets/img/files/moodle.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9822356773a9545ab2279fc179373c678b5f451
GIT binary patch
literal 1212
zcmV;t1Vj6YP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000DoNkl<Zcmaiz
z1F&PsABDfZN}ioJ_TM(vwr!)dwr%eg*0ybPY}@lR^PF7uZ&OLC>kd+Ts?Jq+f2VV*
zqeKLNIM#c{aXi8H+~A=bE=}+2e|zYtOnrT}FN*!{92-)jTs`(56MuK|xj(5`yC4XV
zxB!9{9M`c|xUTa7fYMqcBEtp-{6*SHRfX%9Qv1QR*qu}H{Xue_JuGY3g@&^qV%X@B
z_<j9|khhfBf)reg6fG!AMU4%$f3Ykz&rwPNcz6|Fw01G+S8l}XUxRoJcvirQ3476a
z)V*X{hvwk}{Gt?SEl$3Tv{Dw%yakJJ(v>vD{iI&IiR%7M;59+e$+D*1NFR0snU)NZ
zpEYfi-Mx9o$k}(tfAG68!&_cHYJywc-vM3=68bEy|10((my*e}7T^GsK$L}3a5BM}
zeBsWxw(OMdTSV-nu!1(0H2fF)u**vD9Fl|!NLjcPj9|j7nx;llRaMH*21Em$ENb{Y
z1|IlepdlS?>zOq1N7k)fg|Ic;7=e-<KP!l@@!R@Y`RiS&JmOX|%^3sVxT%vV6DKll
z+Ega~G?7uGM|0a9w;Py&C!CZckwrKdv$Ay;nvc1MOiQuzxicp5!D}xud*%!lxAid4
z-_K!39KjV=Utb1}F$gAL*^kqRD{FMiRnO5fWGFh@!=z8&W#X&_ELqn@HdRk+YXu!v
zJ0E=T0q5`1%CMd(1ncLZY#Y@yimtt%BN>(~$sYQjy>Q0=E%?_S`<@wu5uz-HjsHFW
z`ri)xG;Jmudk5(1=)iJQ+`dOOf6snH(A$Rn>s_#FhoIL_qhiVHxWoQL&dZp9>dN#Z
zmSwMZu6yDcv`AN9Z#G1<D~Y3c{%^Wj9In7S>?r<xz*%Hgzr(;=mtznA16|wQT7Wfe
zJP`4F(96F>{`ALUK%yiojx{=ODE63IJ=Gk=QM9v1&1!c4*KZ2%k=FnSq-#y@c+~(P
zy6{csEm};1MNy_hRog<nzX1`5vGBzv3L`{{kkVu`ACcsGV{=R?%5*naGlBtgmO&EZ
z2^mmQX7>h<2{08Qf+T?gZ22z9fKnZizpYRcuqC|UaQrUl+R@~yh9d&m^iZNd9D!;Y
zXXa!_?1s*D6Eyu9(Zz2{DLl``b!=1=#fZq5p5B2)Iu=(b_a~AvHuV+)9M`3zy}dm<
z*!{Ou%3bGx0Lh7%XT;QIAX~!2D8h9VRh5;XY*wvW-GA1ZryM(D#?*BHmTlW*cc_KZ
zz4T2d#{_^}E=xy82acO!`SKM#r=D`$A$j=clw`HFwc|K82xf<DSqoCOBCR#H<FaPW
zn!&TqJo%`(b7p-;Le}qp|2tlK>1AqaYH(dIZx<(T*LCuCi*^d%igt>23wMXg$|}~a
zUDtEU$;Tfwd)ADP*+L4SzP`Ts`R8ALZ|Jb$zYfDN5)mbWD*YN&`~{$k@8+(QWp#CR
zMb}+-<#n@WPJaui0zzN_=m&DD6ymt9Ta|Z%h}eJw*nkD7gp(40IF5t71_2L<N&(qY
ai2pMiPpheZ`)9)d0000<MNUMnLSTZ(A5fbB

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/mp3-64.png b/src/assets/img/files/mp3-64.png
deleted file mode 100644
index 13b8da0b8d9397a6fb627b1fe799cacec5b47930..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4301
zcmV;;5HjzHP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000n_Nkl<Zcmd6t
z1$Z3Cl7Ro7ncdlyWU(2;c@(C{p_e!ekC~a7nVFfHnK5t|20t^~A+saNS{~@WNqu&I
zb91wn*7EyKZI`-xcIdCJuI{Q`WsISHF=Rhi%HjU|@8_7Kk7jgitoVr6zv88HA9L2}
zjY>7_?d?MwO{`<$SW8<!(AGNX#~9aP$G!Ke&Ffa1#x*zo;4AO^@IPPt+~=XS;qVj#
z^4B&|O5r$)cBQQXlH=zl5RXY}1=y1u$DvWL^O=u-BD$eIdc1$eiBDI}5XW^aXdFjG
zI*~XQ38N5-1yrTRseT{x=FY|M>)rE&(;o4S1^t7~<QyjpAuTgC1sLI1rdaT<cO3Pv
zNh=@$e|^2)`b73KtI<gF$E|Dm(b_v`?j6N32zV5RgmEHKlt@63^jkp-%05mj<f%&@
z!gDXWlDYHe<2nwtR+C6;vcqNsUK)t@m9c$`Dufwq`ERvn+sU)&>+5=bq2PULG72as
z@T<cxIwFB3T^yw#iuvh^+xW?b<#<7erxj5Y5{Dv0aU>%i?uU;{1)Lz_NsEr>nM<!=
zVAjkWYino17Bvqxb#C@LlfGOmvs^B2?eFV(Xu?}3RXnXVSp^tl`XCQJ;%94?@$<Xa
zQgU1h<)T1)3KXDF;5dll4A50ZwOU-c<T##o;iU}BoEkj2@V0G>$(*Vb=veo~aa=Nn
z|E&NfQ7rtr<^1BFbqTyjvAc{;;M+J5yctDQqrv6#kL5|{Uo=(tjM=vzZQC>1si8o`
z(2)WJK8*PJhL!yC-u0AR55MfAqZlU_9-^X)Q>%0N+#`AXITtWE>;D(twndn<0_>ds
z`TFGv{04z9mC6_$i{sOfRssqLJq6<xE}ON4s~&q^0zYdSz)LsZ0+dqu@Q%RCod4y0
zGV+wm-SQx%TyO<GtpoyP&|@_&9bUv0k2;5;+0y`C8YY9?UIBKkH$lKpSKcmW?>jDj
zR|%svI7&p}0@6eS5t?}47#9!B<MKy5X8OR}c7E~BJ@;JOiK2+1!9l+I#jo;*&1?AC
z=2iI0!|y3$;ustw;AthG6rqj@_w8e8?;I{Y^HB->?CA$@OuhoHx#k+uW#-V3`~BN*
zaQ?A(8*UikcbCv%i~<}NDGCRi2SgEsF~P_v7k1C$lG7i-@SKU^<qik7s0y?;iD-;P
zI=t`)+wOa%zFymjTLJSfI{&5DRCf34N|jQnOLliICOzLlfzpbWiD^9mUmoV-)6O~=
zyukWJA7!A~Y*DRNXoZ2iT)`{Q)73@UFCj{m4OM(t;f<Ay0xtZ_M@W@kf1vNhm2Eq5
z4a89Z%3g+JThLN6@?78#a`CATz|YBrcU^~a0zNuA!cBMF&Yhb#uw`Tqqpb!_9RrG@
z=h0U#vuI$L6BixHDMua4tf65-*;PhUf}f~(RTYu$>w2x^Iu5NU!nKQ=N@EckO)!?s
z`K}=u`F8MKr4r+bWBkb<e#>9iEN5pNpt{R=#UiR)01EPw)kO9Nb=Ga$%wO+b&+skR
z@tC8I=jziR$-J2}skZ`*(HQ6)-nQHLfG)pGx)cjV>UvyEUoOm01sI~yDoba~O5pS7
zJScj~C2qX!7QXnW-*Ar;(=#|o8AB@wWHsq37V*6T0L>_*+H9bW!7UaTCE}+^pmoib
zwLIsnv$^=BGYND=to5P6OPxOlyzZVJ(ve=+3IslmBQT&)7Cv-+;*k+9>7U1?XFQUj
zJb0xj7kqy3n_uwto3EoZe-6E_OQYFhL862+A9@TY%wNRZ-T_g9LQxM|?5^x%^^W_v
zaq~LX?c9dvxQs+CKK!rWvtiE;UUtr<c*-R-5kTkgkgEYNisSUlO9De8x-i6e2BiR_
zi3=`zbc{=f7jo%YkIscRD7uS2-~9QH`PRR0VsObKn$0FN{1VST`!Sq<+(YRvbrZ*0
zmQF1r3cY@r`F(?&zVIlXc+y$iuw@<JyZKr+?%s)CDDabi-%KqCc+=9WapWD%q~S@!
z+mas*iUr8aNlYKwz&!T5QR5XZpS^_3A9;4$O-@f&ncw~G&wTsN8wI{ruW`b{#k}^s
zOIX}LO#K1x-)#Qhr7lLC9mqQ*iaLQ)797bJuKgo_Ty-a<LXlsux{ZPE9$t3##ngh<
zWZ~_z+WA8#)-f58mkGikkrq+GC9c)DbY`->eayLS;fuv08#is_3;+BRy$k0j@O4gG
zawH$P?8(gQ>8H|Y5F0&VNUODxL`k>r^R}f=;0Y(3ne-c!3I)D<>$P0JakWexGj(_=
zj@Fu#>{oy!Gl+^Fy4m82*++2o+2=EKkif<<ny>xgS2PEE<@zN<GkNocS5i<e%`lwo
z4$mGB<2Vt`tIoTW#~yK<_=!kszVu&zVLVZ$qns(iTMN)+Mdp9mM+G5Q%{_`IoO|Ix
zqq>q`WZ9~f+`Q{Py1Ki;z)R1*fC0ZtmeWJs-bOk?IS#Km_cDfyT{1mZZo8Ymu3JXA
zP?$8lIoK4?Mw1fp{-#vKi(;O*;5eTAxQixCW4TK4mpg98^mfx|G<ej}$8l;hhik1C
zYD#;1#CjIZn#&VUID<y3fdl+;<!!QbDy1d`PbX7AyAG<};3<nA%+r@%Hen{mbzJuB
zy`MXiktvqTI0`O)=*j3<AC|yIln@0hJ>hhQ3ni4JSd~0$)7~8v9Ipd-ldk|A2P>XS
zG*;m$3m?QYlk9E(%;5<G8_)CDy6rypMu9A$^9P1FcIG@<QFz#*x-g8GH#CbAX3m%R
zVXR)0sZem8Nx>V_-U_^(+wZlV$QTN{N4VlySBb;ZMo$>hy2|06WW5etg&T$(F+7VN
zza-{=IHNkxb9wNbh5T{LYK#M$_G||=G5mzV(8_;ZV>>1cD@Pu4?6$!<vj>&jeByXs
zDcD=xhjx_Y3}*NCp-_iCq>YVXUjGn8F{a?MYkU-~&7|SmZiLJqZy;5|zC}mB(JL1J
z45-N_Gn)J31|7$gyuyDZo;Mg-|Fw?L#-SbrlZ8KcO6>1{`@8LEtvUW-5529+^+uyG
z8k_{Yd@k^bNW^CTQ^^b^2gOmFI1$|$e7j)i{KuV7wp6Q)6nI;Bae&2=Cv_|t9VHJ}
zO5yuHQ51<x1>SKSiBOf2dyCn}T1&g^mx*F6j<Fqls?%m86l<~qVA{hAM9D9)WBU%S
zz2PRdZof}9EMlr4_3g`-v1{)h9M=VN$nf$->`lvVquFerl#-EGC`Kyd{O#uJS%24N
ze6NU7Iq*^)d?Vzw`C>=@pvWEhQqkw{*I&yAfBR#`eV2moQ!1AjZ`3I#?LS|C4KMxC
zmwD8wXYj>mzFam+vC*BHz2pnt_oHv|<=g+s+n)4X9yx1?D4^tdEWdXPPh9(Px(Yt8
zz2ItIoa`1`I?TeuL>nO{C>eMe>FW46pa0u$sSfwjJupC_R1&k)i8#RKy*p7u{oGp_
zqaHLtaY%DM4nsDK?t;D<Y`A|1D1(;g#7N$ur-z0MpSbq7$+EbEg6n1B?K3)8Kz{04
zf{^iQm5O61x~^=UV~OpxjIv~PTo)5-l>IWMQ+P`t_d;vgZ=@Wq-MJQ&L%r2vPi-Hb
zax(Dt5gknd3$NPc?UkU(s4H!de_CG3t^#5aM%!yTO=HO;Py)+=dx6y2t~SQ52I2#9
z;SFt;fqVrhmDWJpuc+-PC|UkQ1bTnlz9<}O4o@M9H5vq1diFa6?9wZ>b#_^JThpNh
z<S%{L5l-L)*h#&Jj12P6hSr_Kr?;8HDGEqGS4-O}UOu<?&4V{Uhf^RQKGhMEKQJ=d
zLffTK>v;d@bq+7aci;*;1#BM?y<gc@89+X~wTsCrz>cCas%=P{vVfFhiqmtGSX=DQ
zb9gAEMuQR9^u47{9kUJ~3oj)T5KX86d#1{Vx6UX%7ctV8cFGCb2X>glQ%Y(P0kh{>
zKVyB7RR(0??Qzq&4^a8=2S!2Lk+41>PWgb8f<!ujx1TAgK^p`b?DH@><&!L87Cz<t
zJD37(ew~#w1r+jPDGM<AfP$<AbP8{$pRs`2`T|m;pJvLAe0KhKWC3;t<VAG`*`oup
z0RmFXU@V_$YXK?94&dd#GLRW{*Y&_IjTsQv!RRb}CLj`-)K1W}{q0>G#|-xmaQwW5
zRO&UmBMYJs&viL<@zJzeE%5<S9LZ<U8GQPMbri|Fv|3G$S-6BbGX^0Duq8RZaA+n+
z&srewkb$>WB&{6DS3vuCUbL?~mp5JURE`;*!$_@~NJVmhuf6a}&RBE|rE(WYU{s`B
zETT;(@YbRv?ilFpg?fd)au*9`&*2?cKZl}Uf<_hURZ2ZQy#I+WV6ZfUP{&z#q}GNg
zjKm_dqM|6y?gR%bmBz*(j0Y9@$qZwlTqv@uGRi;KEoZb*<@6=TaK_?eX$29LMvY%D
zzljqUAH_-Yj+Bw<0NyI!a~$s4vy;DXSjJ^1oyDwjKSkGL&Ca{IZqq7US8?9)Cv()m
zT!};#Iq-=z8ZC-`VdS`D7afy8kB}<43K&lm5QdQ`APb*vdyY$Kf3hNsLYt;?l|#4h
z3wR?4fsWxVM8S3C+va+!Nf1S#py(FxJr96J5Qz2V!Rtg?&46YrV9DaS*CnaWvzh!p
zz+jYW122Urj;X|rG!P1Ljxr*^A;Tjz`@g4*q;r6>6$K(XHlXaj5&2jFTHqy}?s_gk
zrMCU0FM0mUMn^{_y38oRv|R#K2Wc!OSn4{3H(B44dKZO~ukU(#%Jk0Y5hb-+Awdv|
zHI~XnNyY6Ot8&-fckh1F8(($h>QyV(kW(B3<O!(G(^!WaJ_VhIuhnX39WZD15RRh=
z68KuZNi(Uvf+tRI@7{eZTfTD7D_`-Vs}uO!I!}lgGu`0rPrtWqyBE(@gkj8hrB0>R
zlw4+SZ<jd6UAymR_3AZy-u=!uT)k!U#v3?DamY7;X$mjPFk@q5V(!&iQ$%Zl7i-wH
z>jC(+d)}46Z{D==zp<sGSYR5$+v9S*n0u1GpAvlgDKPEerETE>v4D7L@KPMlb4i43
znO^WYnN6jbF=I;bQk=j1<*%$-wOW+mI0|E?Cww-lESHM7?v&uAI2T>Clv7SQnNNM{
zQz)fG5t!))Z!fUh+c=IBZ$B~>c<TdXQ}O!Ozn&Mp=ta_YTz9&`+d9?~W>c@XNcJ{U
zfX{J)-}uHiSh{qniK0k5jx+7xbt1J|ol>bp^0S;hZ+q)&o*?j`a%57)14vzDZn)uw
zefQma&x+%Yf5^F&N)<Us`sLfVr6&F2+4FM1Y`c9%7bL?(7)0XzjnSj;e8(GKoNRKI
z0ke^U28^w3TO>}k)1R9I;EpH*iU6mcdg?<z_36)ja^ZqSCxlUG6GYk6GoVs!Y(=|~
z&j2&woVSV#qnJ2~)y9qM?)&IR-v7llYu4NWlrqq93OE8n5oiHTsYT>i1n9H^3Zeig
z1IqXPt{FW&^9-g4cm`Y!h`~{E4GM+SIfAWiTV;=Ba#YG5$p3+kGSzCO(rQVJ?WN$;
z66YwO2{c4R0R(a!boxad5esU;oK!z60-I@*X=m%~v3%(KV>&%ub4=ajD?=p8Scshh
v?TX6wCxB3syvJmUnV>JnCQ#mF?!o^6-Lh~<;^t}{00000NkvXXu0mjflSW(1

diff --git a/src/assets/img/files/mp3.png b/src/assets/img/files/mp3.png
new file mode 100644
index 0000000000000000000000000000000000000000..83ce89b9c1bdba1b225aa81a1bbb4a5a3babccfc
GIT binary patch
literal 1369
zcmV-f1*ZCmP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000FbNkl<ZcmaKt
z1CT6B7KXp9%Btq{^ss08+IMZ+w(Z@(+O}<l);6DQUE995=k>Tz$jn!j5fxL9r{nLF
zrSl(V3S$faO6jL3SnvBX{OFgySiG*ti|Z5P^<J;5W_yb?-GcXo@fFv<>-jIcP8sbP
zAVL1mYHg67bdP$T{2zeOT9c48JDp&E!Eq~xr>FSdO;>RA#0i3h1zK}6+-qo*ufP1w
ztXjE}xy~XO(r;1)skQ)<{<J|jA|4*9J-~6qZYhMofM1fHf1uss8(XeqI_OcZ)d=E<
zN7mNz$>+YDiHQdDoelyp+=B?v+DN5TQ3waQfA3yOet`uk`R2`6GVellpvpW8+-Ic0
zho10E#>N{2VT5#D0Ai)k#@yNa+;t}Mp-+4Q&9!UB9`=qmd2<4)gEhJ;X0_w<zQ;X*
z#>507HJ}tHr&=hZ86O;?S}N0zLSk)l#<9pV$VY$mQ#g+EgmdjSrDBOWqgh|9^1g>Z
zk!8&$y>5@cTzff}9ooxWzlX-yh#$6UJ+FSm<Ea#iHkBr;i(QbBA!{Qe#9=7f$4}8s
zjNRXFTI0>hCi4r6eD*KD=4{;OHIIHGo5m(_1RR<=$1ktBglmuP;~Ou21NCy1Fpif9
ztQZR?3<H9o&$;<&HdbqV^eNA$(P*HR;-?q<n>LCcyy~qyYt#K{*6K8>gFIo~z4+;?
z-a)-o;Zy(qeU_1oz#<bzW9UU8_Zyw$)6ah;<KyEfr8${+dDZbleDG<{W6&?L5cG+Z
zvgm{XLI^(e)EBVp<WX)qegNN<mdGMcuw~0lOdmU{zx>kIGno{$ABK3Y%hn@@7)rWn
z{pbYUFj(ps3+P7?%ZJ9eSCY2N_V2(IPWBv~YOrvgIIDSHt$A5<qL~`EFBCkF`CbQK
zdQ|)Zu;f`Dr9y!L=`+{u*l)DaODVDt$Y1~PC+Us${CqD;w3qh!o?}P2{>XleE4XyW
z7VfojO+E!ywANg<^A>_AWY@7%T(x%x_gcQ1IF2*#tvG4EQ-BQ}7x>P3|KL9dcMwMr
zU;W>onC*9Pgvb|=FbMeC`G01%*WubEMeq5`&rwQ&!EP5BgTzYanL%kyC=3EYsG@X6
z@&jZ6R^hlVv5G+mVy*1Af~?3EIfC4XD-{#Op$#`mkmXj}cR+w$TaUE?72A|84cStW
zC7EEu2LaunPcK0y>=Q(R4H-<n1+9+K362#+Au2&~@6K%s<humnI6OGn2Baf+XrgQ7
z3RsWx9i;6X6g;0t-Rl8RD)YcKoA6v|BLVPz58soBI9BOLtLNrB`?WG&=G}>zDVEnq
zxpi@#TCt3S$dg!1cNQ3~)HpHSqEQ>N@3>Mj)oQhR-Ps2f3f}32AhravbKQi%o>bW4
z2$xXBIKr`o)Y-17mk1o;5`+QeqK{uFpb;EDeq!+*Z+qhlw{E@pVz7<i-f4(ZV?i8Q
zZHt^4%^9~v){0)g$Eh=?aiqtQBS+`n{HE8uC^K#e&Yf!^r3<-3gIuvJu==iGbM8uy
zlP6Dh-|_Z0zGBzT?H7>~=ic|e7k~J}9~l@J!1MeB9x{RFNxQa?_8u0}0?%qmxm@A&
zsnc_BdgE(fuw(ny^SSd03iWz@^tZqL<9{Zb%Qi+)6epeuV@O~iU1K96J0>$NgyXc^
z?fA2w{lsUtZ`<+@paMid2UrC90!SefPb&$A5~D64fmAzy$RRHVKq(a_(gl1V220Qb
bOA_1$eq*F?S_Muc00000NkvXXu0mjfm*b@&

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/mpeg-64.png b/src/assets/img/files/mpeg-64.png
deleted file mode 100644
index 05d77fa7bd6ed5d2a249629e634b89cf99892bc7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5308
zcmV;t6hrHYP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000z&Nkl<Zcmd6t
z1#lcmnyA05s^(S;Z1Kn_GYxr|)^ncqEHm%pcg)Pp%*@QpcS9a~z>FG?Ws=3@ZZ#HW
zJ~<<{LhW|R{Z<=sPRAcrDRs*A{q<vJ3#Am%Lvicxg)o?(pJ#B>AccG({+*xv=`VZo
z-uLWX$d|m1Tn?!ueh_F0<e~&pUp+s-Od4Dr85O68hSlM7fA@z!@QYve!vFX`pG8W=
z7iK5`6yYsG2n<6IH6j(Dl-d^r@~OqE0KyL$hC#Jj<;Q>OM}0NYw)L@1&wtu=984L*
z*PuRr;N$v!c<;C#v1E+0KS#31qqpxKTGOj$_wL{Do4KyEEq!U!L4?n+G6g8jFH}5c
z9W)H_V$%v(1pkI=)%nTWDn~#dJ*H3AxO8}y{Coisn7Dz5>uJI9TpZWM_FSqpn?yQ}
zBZ{ouo8mnme}?|PehkyVsd>mig%7+0K*MVSKnWGjLsU&zkG<qapj3Eo8V0Sc>2HX|
zte<X10jWj!^PcCg7eds3*bunB!_`A`j2tNtH~~VMxSop!U!nlpb*b4lR?@;2Mf&fz
zc=t!2p>tIajn)=r!Xat{Y~5Vlx=t-!P9P<zRQzgNYj&qns>+gKNhuo?pp<Hb+ry8(
zo@e@0m86JcrQ#YE0SEy?U$megl}=DqdDiYq^4y1>STQ_}@b&kE_jMl?0%RatgCIyM
zMZE%u9u4s0Z!R!<#wKMZNW@e6&4U8!)ukj@xfrEjj_z$H``-5`T`PlcH2a9R9nRFP
zt|35+qIm^q?P+)>kCd1@>yR>2WKwBd-$UJQxdOv7D0s81+NOB&-H*_<`o9)Fyw^hW
z3eaypaF}?r$lSS`@JVvXoQ~`<(}IR~57L05JxA*{kH-$|rF(VnT>!7Ax3>Tt=x7{<
z0bbxR_Id#gZzO3=<&aA0RH%Sh9hJZrl5%;T>=uWI_TNu;=iLCW>M{awX9XCB(82BM
zp?T)c+9b^+*<@B1G(s4QB6Mm2hzSr%;Kh9MwP})r74F}+o1V_Ty96E-(ZkxeZ(leG
z{DAgV?fl{|{}NNjYK)&K>1dx$r0}JWfr)8ILM5060)cJ1%oZoG))%?=>7Dd;_1}H)
z5mlA-(n~L~bgWw4VV?i@F{5%d2CgEJN#gh(F%*^wEK!1ifvsvxmBwIgo;^=&zboOF
zEBCFo?5c3$cr`xo!2kR*dnDObEtYh^vpttMs!oGKD?w3{4im-e1ozCb>+!Ahb>F@4
zDk2Y9zy4MKz><+`U)}K~GgI>z(!}vylxSQg09!gt7Dw^>XW9AqmZso^VPKi2jxh?^
zP{_zYBK<{C@(T*T+^}rNsGFAx)ugE`DqammBRERn#yn=q6Ua4l?7YL97XspmgpMJF
ze1X}?ITmJ1I3*9y2{42~ENPL>C28$!p}nh>OfIY4%XfXGS|NOR9}xqxsU%BB(uz~{
zZC%rYs)v^XFX1y^nZj6CVE3ZW_eJ=;5Rgd5DOby!dE*=-rzi1dAm*fr%QTiqVHhTX
zfSTuXLphAbE07)|+ZUsM=W6;l_mGGu@Em`I@Sq}mz-rBA>Z(4+^|a}S3ef1Fq(Y_?
z3&mODgJt$SwIed%SuqQV&l|74$=e67lP;~It7RkcWD=EBw5?0hHkcyOY9XbhI_EO;
zc8UD8D#`)pqQ}r%vs~_-VdG=ntl8O%Aq@gwHY%c7_=sxI^8BDq0lJs>v=YL1uarW>
z4Dyv3GFxo!duI0{{O$96BAH-vYMdAU>=5QeJDXNNfYoE^_E=gzo1W{UV_TX)N$v9h
zxpfIT@5?fFe4dN{K7%qKVW#jW1J3-}6yxU#?0MIEGP#U)i{{}&-e?!_gIg64pcUY{
zp!6TYN|?;mCTZR7vG>{gB8!}4I?1^+XF2poCmBrbp|!6~m(q^w=r_IX-F>uePU2L(
zy5|W{2w?3at8oH{i~lr>VVOunVp(x!PC2|X_7;0TzJacR4qV4?7Cux|R6I0%8Bixd
zfa7^#KaV9SxU*!pIy~~+{mZ~7IC11Sum09)wr3t8nMh+hHi4A-fqQnfF2bj9szLo)
z2o>$sB<uI~kX$QqZC|f-99KVAam?e;Zw)hXd7fCpM6DcN4<iTymPlv;Roljho0Nk&
z+IDz6@%)2}@V${{KXh)0H~(;m2RA&y;PagfJk<(uMc_#=pmS#y-wPl*&+9l7Gh=k`
z%2IVJS_!MyweZ-dH?i^YPO1f;L%(;C`SBuF+yu1(_)q~-QZIpi`>|vUTNGHe8=ijm
zBavO5Wtq&)&v5V$kFmAmLDoFoM$f}p2A*suyIWDI)QF`Gbingv1bp3g9IahhYO+i`
zW%2MQH?n4L2M>H?J(;zVg{c~c|M+d(nujoG3SQ~^NCgBe70>fYq~iEinV$PBo_+u0
z%l7laf*1bcApOQx%(#IvB>-_NLEfIGVwX_@5KUHi3Jg<Vdp1%4rUGeT#SCuPQ((cw
z#R4b)<tkR(XbK)h<gkK3h7*Cnh?!L64c0uE;J}BTqH|SuBz!y(<NTTPR4<wg^sUBr
zZH8Z-;zn(r*}^0jUL0dxW(T#hgI5iRw^^t_MZt%=&I|b>z8g@=*Esm6Lkv8W;mq+N
z=7wE5vj%|@oOx-KjeC3O=*!@HstNdrEMTTYI57>A8-=Mw_$2#3@Yu5Opa_)D=@;Lo
zFSiNDw^2e;nUhTaS)PhrqrYV<0TR39Gkc}PnnzY4t3E(vd27ZDE}XoCDO32;WBBzM
zPQFys@u97?2VI_{sFhq!|K~NH{hzzQmCM2_6>SC9)vJ?rdwDl%6a26L`z&3nd-cL7
z_*g8))hkzVMop5PDXjqC35aJb`Ug6RC3~?e4uz>IZqeuBt5bAsYayPFp@X3UsE1Fc
z5?r}_nW2N@bQ*)03Bka+Rm77$+KOgI3sedYM$FKz_x7<#9(dPAG93w&FB{;SYKH#(
z$bW<r*Y!#}H*X(bOm!W?02M?xHil&|eCjH#)@q&Sl~4>m(@p=qZNzdWLVyeuwSvpF
zV{;6>Fv078bdiTXy@6~lqm>m%i9l$}i>Km@j*algKmE_Nv5p7dvz{$a^pa|ggMqFB
zOLH|&{^u2r|HoAgRw+ANJu}UH``2N6a#{E&6ELsMALVm0S~xEEY<cL)dp^4F)5?$n
zb$fUa_|oOrKM&F3cVooh{*SNao`>2|hSCo!eWlITN}2R*Z6(_s(@Gdwd|=P063d!8
zpGy@mpP%RO3vcpwzjBD2vxX0R&7*AJ*M~Hewie%$NU2C<V{E*?hg8nw;_*p5FTjeK
zY<=V&{eMQnD}`y9wM;ts3qY;j0{;Eq!-<rVT|4$1H4-Wxc&a0+pEnJI8~HqLUZ4!Y
zmM`jI)s_r)#cRm(%9pr{vUX25a|iOA`s)df{P8HHFC$W(cAe4<8(B)wW^UjepV`jZ
z`#Y!<oraB^zzg)Q)qP(y$mG}@um1TZrmp94DjvcTAa4(^mhk~=|Ni~lI?Cl5N=2W!
z8KyxoUqn_-S_YH!-P?{+^_M-g@a%w1kMwiy;B|sR0<UOb)KbJ`3oU^}r6nz$Nwz%R
zOSSAqH#QR7TEO0SZsO>F4pW$|P+qWU?MxF$)d0U_5>*LGZWREv?1?K>%Qk@{=vbG=
zNC=c%KF`ZQYTwVTu_zTQ^lfe9W8eJ<ANr2Hw69H2Dpt8?OFOZQg$m@djZNVDw6AWZ
zXH$lSg{sa7!Vrz{`f`Ut2)KQ!Qz~*B3xUqlDnR?PQWCgxkz)vxc-GK8!k*{WlIu;;
zxwe&!Pv$6BOSG&`hbDWc3ePkwa-9jP)tZh40FCf<3!7I!IHLFPbipE((wh|m(d-_c
zK3eyKKsPl)04OdDUBnA?R%o)eR{(gvhu*3ek?`TVs9}9R@JcEY>4a`qXGe-`33~1b
zFAzAM!`S5+;>iwP`}>PrxiZ3y@-){^mPn;mGd-GbvbG1`_Zc6VB^HknPg*)lG{T4L
zn{<ID-~s)nvaK16q-5;E4Q8(ubxK?2&Fj5_x6WQ*dbmmuD9S~fw-4T6`j|;lt-|$P
zhEGlEj9{2z+1frHi!m`i!SLxRTG}#X+mgs2h=5mwlSXN@03kvE5RLGFZkt=%vcz)+
z)oF*<|KcM1zicO|mK3h-E%oCNes*q(zxbv9BqjUVaBnA@_x91zo6$jc`uYNAUmM~4
z8>1Zjn{&M9|2{~q>>-r|sDn3zp_TntzyEL4=3{hh&XCC^a6LZ~UN!Fm(W$S_79^yz
zY1#)eOia2=UMld9zj&NSKQ>7JhEBcNi4;0A2P)vLp&|b8Xa0#qrJqlH%hL?*?Lwk-
zPDjDO_Ep@wZyiVf<060iYez`6#d!LIJ3(5wuCFy9fLJ_%5<b8G>wm`4f0-a2YiHfI
zPOOB5<9Gm#@SzW^GzK(uR|XsQ^m6s}3wrlwdbq^j{P+>Nwx;MF%#p~L6c@@|J~zsh
z6Z2$6AD{i6XIX#WYF*?kwG!9SfsDuByA5A?{OL~}W_WSk<L}!_@4za($?7^T*UpUc
z4}ba!Z@<1kF5QLayX<~s9iHn)!-xE;c?Br+KZFvICpNz0FKWM!ROdzPSs!76^h`#M
zRyhCij4qW8)4(zlWa;DK=LZ+zJGJkNdcB4|UMadfdSDx;Uc1DRe;wh};cFyYLE>ZA
z9LjkYBgl};bW*F?3~ujb-L@`V$BTs5qrM?(A_%HGA6H2!$+l$K{$zic+5#DXq1gWL
zT6XN+NGh4ZjG16bc04hFt5YV?sZL2uVR7F()*<2n(zggIDK-yor9E>GanVjZ8OIMi
zT-RgY2X~`4VPrJCLN$Un=K|u6XLX(vu;-~woPBwW!kDMG)E|5AR-XGGyLEB$*Ne@~
zk$=8QNB7MWpNy{Mm(TO)b-imkAm$-df-n2Nce3lTwM>l6^W$It7fg+m@m!Csd+uTH
zzCmgg7l?)r>6N1SG#D<wQ+XSZ$!2)^6FYFFgYQe$@9rW{N*{;yY)ewHOCZqFOp&8>
z=VssqE-mdT*6--1v{0japo3NGOsW+JD{k?ruYMX`{z|zlydorNUI7X%P3+;J)85wm
z*YU^)HtG$~*Z<`LH)acrj$Y@5zkfr=fKstWrDP*aamNbJG)?mJ3plpN?9>7;{{1QZ
zz~zlsk8t{p%ew9T)K@&srro{NstyXG;2RpEMu~I*6&~<4QQqn(zV9RVQk<)C=x>J?
z3!W>KojiUqNh%qqaHGud=}8^stF9ddudlI~#fdl0<J$%@Bl)ABJILSv$w6+OSlfjJ
zpZMZOIq-@5bn}F`GrZ>1*O0o&AlUr*yf#A_!27=V5uW<U77CL-qTH_2qZjxn0WbX3
zX$o^?;t4D4(CXn8sZ^57moM|e-<&3y%!Y-~>@}aDoaHlL@eXbJVY}W0yuM0>@A*in
z8f2MLSTqA4-UPaZh4=lRhxzbVJ%kZg`Yi>1fMLSu<#~SZ$6ugQu940rFiaB=2mz*P
z>WnfwKg~~l*YD%xTfk7d;w+VHQY~@5`Ul>_$G`juy<SSyJiJo+bjfi&y?bO@^&)&f
zxV04SD3)r&p67Q6Xa>H{l!Xu^QWhg`&+w1GdyF%0jOcAGD{gAP9@x^xfzRw_^UgJ7
zb7}p63xy&lkDTMrfAb{@*Apa@DXLW)(=>Sa9b5S1mp?_{`VOs78uC350WWXD+b*`_
zvTkkfD?QyE&rm-i6i~dW0IvffKJPCl#1fV^y|<2y^2$G)=fa7xMbN5Ng2bnzFF~#|
zhVOgKP866Ow}~4$VsTS9H@o+)<DDP5k8KYO;Ca4YSLgG9l&bCsUjW+MrH0q*gb?KO
za}z)FQ$MmlpU)4Org^IZ{M#zPy=ehLtoUmw+UJ#G>Ux1o=O(pGjpmu3DeKIjfOIB7
zduN88fi^bp?ql<=e!2%*b#Z0aJW%xwjzHjf9@%V)TuT<u_i-Fu9BJTWDz4k*g+iHY
zBO^24{7ql|p7ZC<9)-psya)w&UeF=n3-iqk0hT3nO%LF?fj-;Q)`!5f4DB|SWg?Z*
zrL9+gc2EajsZ_8m*t}^2w(U|XRVi0(9fw+4(wK%|dgcb_&JWFg_ji8d2d`WnKK%dP
z4Qj0mRsvsFi+k=(al#)NF@tzagr@8`9=7c@RBR1Jjv*KyA7$f)HCjo<oA4D|m*%-#
z8sjGX^gQR!zcu?k-}Q|jS`Hq-h$s+N{N|%}a!_cIfm{?t5NMwbf4*!>tE)*#p-{ke
zJq;cO|J{r5moE(;qG2>;0bh9d=tGOfZLH|7j<B$?9Z%N-D}j$Hgzidsg$m&TZ2`dw
z;Q<WGGPx=B<F12m?C6A`rDbLC0LH)m>%VdC+<C18Lmw{Oo$!jf|6lhQrnxeB0OR@R
z4{-ne_wmy|{nH2`v?5S<8+^DREN_D#(5Y?(@L>$lMa4IK!#D87U;M@T-Z0I(4L-aE
zQlAu4tvZ}LJG3JBh9LNxzxkUSIB-DuzAp{Kxa;7hQdBBclF1~qbMv#`{%v3T5e*Nb
zQJNbTz>-Dk@ZrM?W24v4Y}vYFU#V0M>+A60qwX8>y+Sp7t`STR6{V1HrA~LA>+9&R
zl+1tEcYf2CEEYK@fo{-40xG<Q_gaGRzW(>>bKnMG0dar_9(Z8qPyfu%|J1-eYj%6S
z7j_(~@tfOX$vuRZs5gHLFn9F%P;s8GzZ)QihcAr%*pL3eFAWV19S4%PKnF{JeZT`P
z4q&6NT0Fo9<WdF1fH;r>L?V$$w`8+@3Ka(|1ty;pg(1KI1Og+<1jB21FK9GR)$oP<
zhF^r*5UN}*l^n<Q04s#Am!MGr8omZv9KZ!UKrVeyLrVx6f*IkwQ9=baf@>jK8R4}N
zI{IgFsk_o>>MBARS|Rlo61qU-5RLO?Aw-jZqnV+i=iyMxDX+=D!T$r4nx9Zy=AXO(
O0000<MNUMnLSTZ7lxwH}

diff --git a/src/assets/img/files/mpeg.png b/src/assets/img/files/mpeg.png
new file mode 100644
index 0000000000000000000000000000000000000000..6047ef2199873a6b5847de8e739fa5d37f9e204b
GIT binary patch
literal 1467
zcmV;s1w{IZP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000GoNkl<Zcmai#
z1F$Sj5{19&?i%CH)yzDbYumPMJGi#3z<M|IJFvE`AJ4qD@3^N`wf!n$`(g3t#A)|A
znJ2Srgw`5>C{mA$u`iW!{7-)9bD5#lqt6;0*gDYawWC(Mi>|n`dMNkzXTJQAe^Zf`
z0Q%~U*(;4B9eYYj=O+L{DMc)@rQ7u`2%CI!xy$%Z8Z1pT*l2CCvc5@bhtG50_E2{0
z+)lUMLu+Da4DF@80chf%(g;h0gO$?VElZqngb)BJJ7uMsi(O`a-bHrORLUj7AVl8P
z<591CAhl{WCU?2h5TKNHqA1D;Vd0!Tf0k5Ql2&D=f7+%P4Pcc7x(S_K0S|ii-5DJn
z#q$D_A^$J?<eVg&M?dIs?Adu><Q>obtSkm)qDqJkY&xYC?*7D`hCB=vPRd4UV<!U3
zTvIWwCdc4P1?O|Gx&>*=hc_2pRNg{qO)#>_fhSd|)oO;c-E6UNZk?zNXn|9(s2;3P
zsALI!WqeQiVh%{eoRP{feh`Sol~r8V!`rvP{hqXsdc981bvgZ;aT=!rDz!2@9yDaK
z9s9!)W52#g?H(l#KYA;|vP?CJfC+72^}Ie^*EQ3kYAx>ng8fu$HA8;#mt(M$rI;^s
z_*q*h?o3nOndQhcx1gnFW3tb!-<u=~6+j}8hyYe>34PzAxJUE2SKTZ2ylQMY^ZRks
za+=cJZGv<kCu0+NiolCV=OmOuc09Pu*vVOr{cIX1Z6&r`CGgi{w{dZKOg-n#4~=c9
z5r!eHjTZC&XcM}ye!fq?8?ipqCS8zZ3u$J@7g=9uG5*gLw6eJM7h|;6T!dxFO&>KF
zIPK9>RQDYGUF<o&=VMEYmB}WRYMFbza0fDH)7fyj_4{Mk{{S!O(^ztO@|*5YX*7%5
z^||G9e`5UDB6oYlF2W!}CtVgeU;WnSiB;EIEjNhw5+Ud{Jht6;5GQBhy8(s4EJOS9
z%$;bUEX|I6b;|V|ZrdZ1licmm+gTiMlJo%#0Guc?-3O9ULn)2#g;<saLSWk#?M{c)
zwM{(Tqf{**44KK2Pz6LPM1!&CN(BoONps9h=PDU){mD4X(;I|Q!1<GtOr2WhZV%nd
zy&im+<+)9kW;WyOQ*^o=e)GLM7_1gi>dH|yzyYo(O&bsE`vz$=PI1#m|4goG(O7kP
z`FkJB;MTlJq`J4ncRulRw(cL|)U6Y-rJ959+=kx|O@bu!Nd+VpsYsD4X1K=_c2Tb8
zx&M<7QXI@PP|MS6dj=z0%cP4ANAJB0-`70$x%Z?PR~?1Xwco*&6#%9ROk?l)$h|Z-
zy4?8X-x2n0HkMlq*Gqt4VQz^t$7VQpVxIdy>Hv>^_T6whenKvUAeE9x$3}!kRqtxH
zx))TWr6zd@VZlG*8UOM1|HMuS9`URrXc6+`8~;grP4Tps-k(Q4<F4l0i9+K)j+Csf
ztgN`b#y!(%xeyD4MxfE`#R5udxT?%l#-`KkGjV2_h3Pdy6;azd$ezPh^5ra@b`QrE
z<Z?L>HZwD`o!7ti70)<!?6zM6n7_;*2xEcn)dB{@P^KE&u@IIp*P|%H_aZYjolb|o
z+hy;*16;f~)_m=2UiO^Rr%wDT>A~{y3ZtVVkgV%KLT>hEZ3_EI1C!-IAdHCZNap6|
zdar-oE1rKPIe>NK$YE}}>1K+>B2uPeNaLfFjyX1P%ry)g1EkqIu{C)X<`<f;e8o$i
ze)7bzpL2B}00ssIhOfW=<{#C!Y&{Ufe#IHa)*1WY(lP(8#GEI4AuMZseLeiphu-_4
z6UXoP9*_qDpbK<>zAz#XCnxhUDlw@IIDidUfJkt4Xn?pMejGg@1%yTbTq6SBzW|P-
VkZ2Q=$<F`)002ovPDHLkV1mhb(m4PC

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/oth-64.png b/src/assets/img/files/oth-64.png
deleted file mode 100644
index 8ffa8b4661301bcce9d14beedab5bdcbbfc21a46..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3724
zcmV;74s-E|P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000hCNkl<ZcmdU$
z1#sg^lgIy(Wri?wvdql8$IMK{b<E7n%vf;D%*^okW%Ip_mjWA3i~+MPOE*2PuG6Wk
zisNMKd3$#<BeZ`#Jv}`wSusr$^~5ktC<>_9L_so{#QF2*kk1#|f9%J8>{~BizI-K{
z&FUVH2XsFwhGE!ic)ecC&(AB<)6-@mk@)SO_=%tR?cw2JaU4e|CQNV>EU2+4u!{yq
zF+W__jeC;Vax0h1B|v=mqA&Uq9WYNGKYsl4ghCYBUoMv=D3@xr$~AmGA2v5PrD8wo
zqdppuNZX}gFnm^gMnRmTqK@pZ7}Hq+ru<LHrrWLkx2mfDj5<=+0;*NxYYT<aPly_J
z5jTRa>)6`b5I}2)#}go7P%73oDJ2*TLRbg_fe=3UgFh6*!y`hGDvHITR0tHnlpke^
zW^J2xTlpADp^DBo4L;5l!N35wA=<SgE>%TaTkz|IB7U+F1%&eX(oChIPuWdIQB+ha
zWz5YzlL{yl3XbrkB&z*>KXSROuz;Y1@9XbpnmRpgT43!xYU^VwylFRm%a*9Bh5^6d
zv(Vlaylk4tz#>{51Mmx_bigL041!-+c#cFOCIM;8GccdSZBlGF97ZOS5j`Kq{Rbah
zAKu=wHyyXR+W!QFEUIdDRI8>BuqgmA>kTXeP;BrO0Y8UiG9e+^;W01^JHbdKg1x;x
zah?zN?tc*ao!}j<fqUA{X0a06Hvi$a^&WCWP}Qgtw8Ou6F^_aQDS^qGv!kmg<nRdI
z?e^l%-TUt=ylr3|XciFgE@}3Qi~k><{YJfMg^us+>_F4pxOMyP`wvf*Ge0zjsORl#
zV}4G;>v{zqkC(w^;c1ag-|co|dpj+zb>YU%I|6>7Mc_?1iRuhrk={O;jMG#`J!(Hk
zDuD}`{qF8AfExTjOThCUXVE_K6F-sL(!@idkon_3{*&0++C)6QMc$sxp2j?ZTm1v=
zr{feIinfC5*KgF|(IW7COf>4*x_uvc@4i3$!#|2vt9lm&F9b(sPOwyS&+|<+O_T7I
zN)=bHT^I0!EeB5>=kdCeUG3r10FtnX_UWJg>D-&h<#L#uocsb2rFEs#y97rU(=iFo
zQyyCZjrkh9fvZ<r6P_FLW9pcI_LX1xm9R*MnBTu-eSO^;;IOa~WY3H9Bz(DC74X+E
zFwmOt`}sjFpU+#zv?d&$k3c!dq26a`9s)J^6m*^7ufMYJBpSh3#1w!A$MOVBZEKVl
z2n3KwB;_LJ+O-?62s~d@M*%c_S-rY-Noy6_rd3@kl?0#)Z+{d0{jUhTDL3kBKx0r=
z0GmFWJ?|s<bee)34L5Jzq9EthfVW}qs{m^<!@97kg|{97fBTh!=eCm)REFfj3Sd7#
z>v@XsTrM|m-MaHq;0>ela^b0NQ~^8$C=?C^{K#bXWEgz=_Pv(^pUdsxmw)ZI@LPZQ
zhc5-*^2v=40qXf$8Y?F(Ac(tnAE57uS9Q5UR$A8l!V7eD_do%}=j|dCj2tOEwM{r%
zfkr)U_x5D=@pxQ*nfoG{aa8byVxAl+tup0wI?y+WL~0w!y&T#jA;c0%q4>zr!E@Ve
z+yW@PrDTRoU_SU@k;dvf9DJ!<KuSPU0+goQp6)KV-9GRI@k9z0T}Qy@#rWtj7MB(=
zIW~D@@cU(!HCpUgQ{EH?`+R=fxpTiM__>8Sy!GxwOihlVucrrY&5ic<cG=rjZy!s<
zklx-#YG)TEogA(KRq>#|uNN;?mV`3Kjtt(UhSLyOTU)c5zq+!rB9_RXLJp5EJaEs?
zFRdb#DPZgE58%wPaeUN=eK`1vY<5qWd`ez4G&ms4-H$gOK9UI(69#rOJBWna5Dpix
zzPXOU{-MLe^L~dxp#8%?`~$Zs3fvnV9bFn69J*8sfQ$p1{k6*%V5%B6wqlr_TS9v0
zPjTbQ1)51j(J(PO&bJX(kPu4A!zZlp{OOa}-l6GMMQ3}rxPDzID~9gQ-owGm|IU$s
zy0o+eE{lr`MPUWs?D4p(&A^j%v_&v6+>fgl&!Mxc3v00y{^&3N9))~f^ynbpMwosQ
zGmoOsDeizF9q!1`2$oh>K|<$dGFfDEyN7~zN`|m#fA(j81}lo&?Rj0CpE3-yS5Xe`
z?J0indfYfUbquNk%tW6fo`~bm|NdWbZF38g<73j-v<XF34b*}yZyQ!O)-XIUj58<C
zVD@PgXGJ|BoZ++i=QuGHITSpcmjX~bIy&%wrIS)(9>7#ZX=<vYp+n1LY7h1I;Krph
z0_r6Ep%DJ(o%ir>|MeP%MNfx=ZP?4^<hi3m140R2F(kGCm=b<@b(ua)z#qr#<5^)1
z+fBoxK0Hr@b&fDh6G4vEcT{x)gMHmNJ~0W8+lA+gOV~<p<5zzDH}K&0b$Yri^9%jG
z-RSD<!NQAqluJc1Rd!-!brtW<%*agihOnH!`KNyq{$m)Q{Ba*k{-p7q=Z7^48hkEb
zH5cVT@Rnx<irl8EP%0zn2Tn|kqO+qN(Ps<T+}gz7{L6pI>6V7e+}ylKzb{}bo<bs>
zhU^nXg(3=#qhKJ2-hm;w{Q>0iIkZLE8-|B$bA7PK<8(n2t2(7t^Khu>@(7Lf(^I1u
z9~s1dy#5YeEG>f*t&bO1pjWF12*9?^Zc+OY35Vbj!=k%Aj5g8E7t1&$rd1W%f#A*N
zo(wg=q*YXf&x9u6N~N-Fn}#WlxeyNcu$@YvYKcHcM~1~P86|~C^PU{(M^&#PmP`wU
zjiFG?B9qNE1#kJ&xB?WV`SrXC7ZfORr`w|e`Py}nwh-Q#eu#&Uo*<JK<Gi<53;{1<
zTXB?xSzkPL8jCA0#5kXjx7|psi)nE{w%0dfm>QpK7M?cw+Qyy?ndTvr8A`3?QeEH_
z`t;0u_?Q2F6S-mq;}hff=nuJv``0eP@An~|+QvWq$G^#S0)Np`xg<m5VkwJoDA+u_
zeGY6y0l?uhIb_PzcDuY-TU*B;{l%Z-&FNV&&356$i76Z#9fa4V!teE<Jrah??Z*6z
zRRsMJd4t8}MPd3Avc0ykg`TdyL%{Eo5<6;m`lGots^qlxumAmq42_3JM{(}daa=lm
zQeILhWI=LMgvtN<+S^E_Qh4<E5ze1E2d~Ujo5+iE+QQ*O!ke}FAPV5vSuvHSa(ETJ
zf;ZoJ3vbTMA|iUdTg>ZYL;W~^lE*RN_XR=C;ejAdO(hVmR`D?URNmqI>2o02iYI98
zaA<h08@B)+GRnc>^=bvLy)}(|S;ye;D8|IJHzmEgE&`fOp`5CmDacAZZVy5sN{n=4
zE4huG-Cbm}1(4*6c|;=NBk6gr&Blj7^V!?kr*rTH+b}rNj={bz+4Ek_D=+D62lxx?
zW);O!3Hee{<{pnvjbmj!hFE$BySY6%?G5(y9|1h?Z#WJ(T<UsopdaB#2yXe_U<q5X
zgq#U9O{2hudR^2WXmBCu^;40z3<M)6>jt*PvFQ&)asKS7qk{+6jVgdgKofcUo{kQg
z?{j-Ra04jly37HV%d*HP&_?ZbI&c<Bb89jHiUfT00wujuNXghEgO?31`zwHNB<HgO
z!RrJ>z3K6SJ-5%L!ABV%(bM*oT*)+O`79MwDOcpQ7!pco3%KFZTt^0P*8UyP2{!e_
z#zX}cQRG3m9FiFxC~`=cng{UL6t<h)m5U&^sT>JBhvAj7POH=d4uJ!~0~(Y==kOw-
z2yGrIe6ds}cvVQ_3V7Mi>bQOQAjjG38={m-<a;U@8Sb0WG*_x|1+WijL3loH7}kJ=
zN1Rf-#sn?J<?NHsCs%&-M}FWd+uPerA$A3rj!vL;;T7pL!(l%nkq{~ZwARzQJmwF0
z<$H~LdnP4&H@^8Bzxq?(dv7Lsz)%=aTF~qjC~_**G@!q41jS;BOkC_M$s9u@9FWc~
zmEObb?BmVv{*G_>4Dr6>yZk1MT~vm(7MLwO<^im&uR?RxlCOK295R_g4L%ZpD)z@>
zY0N%~ZhrT7ej~xZ=5jfYbQN_q&}#6U+gGGx+uhj_CSRd-gD6GXC*Xrn)f#;C@srK(
z{;qHOjJfAe|3^4J)DeCQ#xW4$A<$Ai&$VG1a?EFPR(LRct>-1YW=rqM+$7bF%mM(E
z)|%>gc}{hyT%jH$vv-2GfK$X-g%zAdqu{{)Mi?j2TLzxD6+Tx!e~>+I7`hX@<!v`-
zQM1{M96R(-(t_Dy@TRq<3VuJm!>oYezsCa4Z@EytpQzWaUBh>O_xH$Oe~}VYP6@Xt
zJk>mw<MC}oqmMVg=exe~GoA~0vStQvRG3!&!0ESt`*-k(pZE#g+dG-3#bTw4%&aBg
zE%%`5?(MhU!1(wiw&KanZ~xY>{dCduuc1kCS>6r6U;gD^(2pDa;=Q0RR~0p2m{t#J
zZ}azR9GI*9@^<x<z&Fa~a>!(}lug?FmT&%=&zzro_CEj=YiIKIK`ek%<c5ft)HmLE
z^Y71|yYvw|I~gbne;FIRz2|L!jr6=76mT+oNV6_iD7?*Jb!9Q}z2Ea4Ul5Hx`ey(k
z>#yCYwzRoaZEZe>H6`KQs1@_-)vM=z>ZgD9$A*W-E>N<9m1QwU##U^(gGPJae%v<S
z!)^^Uwy7xd^Us%m<cGiSm!i?=G=P8uESCyur39cTi)_n%I-So7Z~@Q&cmViO`{`Ri
zWMzj0j7J`mMV_bfHQeU9Ruqf*aqZZ)i)pLDhM*{N>N9qC_cA4lf&h;N+O#P^x0Et!
z;00Nv0_465E5L3EtPE;{LAmB)19vK@Q^R4~+(!}CwXee449~TL>9aBnuK8M}LI2?F
qV4MM+K=-!*`*!2jV(h0>yZkRn_Vj~FGNiQt0000<MNUMnLSTZMHcd_d

diff --git a/src/assets/img/files/oth.png b/src/assets/img/files/oth.png
new file mode 100644
index 0000000000000000000000000000000000000000..97fa3eeebaa908b042c59acce316a27756fdcc7b
GIT binary patch
literal 1098
zcmV-Q1hxB#P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000CLNkl<Zcmb7_
z1(O>$7=|Bd!4zilg_#-3+zywS!oy|eACN!Mfig2QGlrRS7}I)fOV!rexlJx~o_WQ3
zzEAIJWTCYNKq)mxDLvJ7op8g34e9><``<oc!i1qg5HxDF8pUGC_dM_0tFF5GU9;8$
z0By_e!r&Y!<pIxgz6OW`3@a9czd;NsmrHEi_&0|R9i&t$VFDn8<lJ*FVB*Aylq(g`
z5eOq2Anv2%F+FHt-$kw~e{t=CoQc}MSS;|@Uw;^I5tA*cl#dXCrAyDErKROqI0-lj
zxCW(_Xf#yTFmZS8+==h|4af1-Uw{2hWJfxkCJaN<_F1@a8DqwbAvEJ8;ksw$Ivz_n
z=iYSFO^h5lvj57JEBy$b$z+HY)$0xB&0EOm(W83@w*nA=`_xlUMK;W6Yiku!I#HWw
z!OWR+&lqmU>^dtz3vm1P?Q62Fi!iL2i4dhU3l=PH!p#_*0M3arPYUb=(!hzV34#hB
zShQ%V_58%}u0m%LbX?|ij}ZwZK%>zhvS-<{vrcM@(sjy}B47XT3$5*~Cxj<0ihpwB
z#*IWb>8!KPBcE@f8ivI1pjzRTx89+nvmLZUy`c!qd^+W$Nx-pij{63HY;SMFb=`mS
z`Mj<jmwC!hlQ(v~{PqXz*|!@FRI4GGbRV?RC>@FJw(5BTVFy|Yh0127RO&<@bnn3f
zeEQY5j2bqCBW)ebnl_29qeTj(64NJ7VffIY-Egbn!v~$6^1ZKRG+`vopg0jcsz(nS
z&SmGF#m|5KOR-$xU~4<+Oq!N4qZu+}5Gn>+DI=Rdu5I;vTWlR^=kA?+@%_(SaMm*Z
z-nf~i^XKBZX*+*n*{|Lm08R}5@weaDz5gIrTzo!*`VK%y$+tiK#yLxuo&ZeqG%9h6
zk|#*QF{*?i!u7b~A_MO?5c6;|eq0_uo28?8Gzqq{Z7c^87STP4UFdrr3ua8GrZG|o
zB#z@TbMi!7*NcJHca^w70@rbb>&S#fc46`(3%kLwClo>;rGw|Ed)N{)qQG69UFB`t
zwzg%n8C>jPlJK~lwCu!cz5*s$a=9!TL1$-I{ecJXUitNxpZ=RlrIA92gnzw*15~S3
zjvPLWlrD!39|_j3S$XS6AH4f~5L8XDPTVjI@%>Z`0}D_9DykDum9#|xqFGDHk=E95
z{o0i`e)sKHuf<P3fLyWSEI#|}GtnoP6OQ8`|Cfs+o9(EMW#^1!vv0sra_w#H!P?b#
zUK_!IW1k8D^Pe!_g%@6VYs%DVOG5KA3xv(o)+c`Zg^;qnqrLIiBlkb^-FM$S3*>+r
zPyq@+AZ!rF{8jeLX0yZ1M#o;?sFrp<DFEG+pjHd3g+ieV@PT?FKoO|^2mEgH(docb
QNB{r;07*qoM6N<$f^GQ|eE<Le

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/pdf-64.png b/src/assets/img/files/pdf-64.png
deleted file mode 100644
index b7cdae7e95534abf0ea8e6146f1d6c548aa27545..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4231
zcmV;25P0v2P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000n9Nkl<Zcmd6t
z1#}!o(#L<@GfQH!6}H34cgz?v#W{vBA2TyEGcz+Y_<YQKVRFDuVg^ap@=SMqBX7TX
z<9-^g^g=4XN`qz{|NdQFUDGQiBIKLk|6D1}?%lgN^5~<PnwThl=@F}+b=EP*J)k~0
z6_tnku>!HN7%TfccCCpFl*;V7VWZmq&;Q9+_HO;^V?ObT-<<QzXJV~z`<SHvbzPKF
zXsyVzTmeL6g)#O-5m7+;kk*=7qrp4g|AF|J|NQ;9vkp4&yr|uv$Hv6A13%+YEJQYG
zjnHmI=t?hJP)sd5gd<1C7%!D}4xD-VXXUWNnnbboApk^fn*ahTF)0?pKWeRhJ8uCJ
z@R!u<t@q9<j?%Q0qW|YVAo%HzXzkcSZ`|svw6V0~88@^eOEWSwn-S7C$mUX+J&!nz
zdtH1n2OoS8IsjX3B5{l;1(F4D@B#`DC2pKW6%Y?wGLML){XlC52YX&pD1`5yj{ubf
z{>mtd4_C?y9j$2!$hW>k>E}NotnZ~SYJde}VoYp1B1DGPj0g#Q)HBE}m0q@<x|Vxf
zd=Uo^kKmg~eh52M57vVh|8tW4IL2BkmEui9gMD`wkvbU*t+n_9h{zz!1~2fPuTom~
z3&I4vPgy7w!59Js3WHMnIw-N|u`#xkdfB;h756xQ27dT9!80p7_>YM9s8V2!9W=(2
zMc7{ex|@S1f&UuC_3IqGK%oG}kUj<-cx$jjBWx-5u=S)B9CywIw;kRO`<&HIN8)b{
z1t?!l!Ue(qdL4yUjotvz4nFW6x0bknn41e_Za!fJN1k;ahm4He#qh3=;9EFv_}~1B
zLc5W`D<DX-6oym;ti|*WvN0%f<HJv3`5EVO=%RoJgxMn?O>~~A8F+wie}&?2*Aq5t
z9e5RhSSOGpw;lMnXMh`3f$JZ363d=&_9B575b?0{1xVo=)}p@orDWyTQ)pJ{4Ld9E
z9sp7iI`EYQUNjpXasta9e-?+1E*5wY@-1AkVnsSIam?`OC?ELbXBhbD_tEQqp1{{S
z@De&`4N5r?1Z<qZ_j99x4G&G=AA9=Zgcq4zfZzS@cVumN$&$c+?F+i}kH4a(C+RIX
zcxyrH{Y4N<T<Uf34`<n9o|wRoE;{(R%KdO@rJN4xam-7PT=uMkFS}&O?AbxDvS16K
zOg1rs5-^4+f!}CU0{<|UJ^BfY8eUTO1o-#4r<1XP!I34;h&NnKU)+KqfY{(0))1BZ
z6L`2TS^4FUdOU}WjiCVX;gy>~A!%3K&y^cHNO6O-G8WfQClCd=&xsO{F7RC}?5oC^
zp$d(fC|58TW6|zyitHoC5X~HQvE|wmS8`ag=MPL)-YO8eJy%|U*=zgkhcO0aOg?<t
z&&dJ0ze3iE1&uL+#0Eq<B7}g+!V4Q#KY|f!7=FzQXq3wy%q-@_R8bq#Y@*5)2nuOn
z`fQRFNx<SnNXLTI>r|d_CWRydZPF(f9wcWEgoT0L?7tA(Y++-AHWoLDRvne2{$Vy+
zovi#x9RBz->HqSlIpC6ip!)hjvZS-ogKf3hGPsnU6{{Kf*B@caW(dRmqecYRAPyMU
z+H}sfd#6zkKaoZdbcfHW2E*7`vI1Z&act4CO+Tq@OguQsM$ue%LQ>&9_KYOq4KWpl
zm{J*?csC0W_Sle~x4wtLt1qRw=FybC{&}QOgbXkqe75hmw$vsFLPYZ6k-6hCG)Bm-
zk{C-ATZjyZMp=Uy8e@|xaKlL}S@yUy({o;!zlkx}CF2Z^FU7q6OT^2Lq*N>+)&;u{
z%Pip56Tk{u1O?a}cp*)&IRe=I1+Z3V?GwO)iII^pHisoPp0tYPetEkPvw|v@QH28S
zVwsi|daX@Y8FE*;13QZd*5JfiFnnq{w!(gHgm!FcHrqs%L2fMeaKkC9IsA-sy1;ia
z1<Dw#4v5MX)bb+`V@YA`jFZy};@rAt(|K7qeD?@w#{|8DY^wCKW94d&nR%rh9_BWg
z(&$DVv6g6f3B~?FY#bv&0r6MgdaEwt+|5~1Aw;^v%R;t*i4Cf!pIgHc6KmFTw{z#X
z%n;^nf<o7(iR*P*M;%K~A;h#Jq#XLm&V%)~K`Kxh8C~I-YYP}7IL9Wg!XjIOfL*7p
z<?a_=*!3o-i>1lRDn&2@zkNH!m8TLk8`#)j)7A9dg}nQ`adXxPCOZ~~+!bDC7a%B=
zaZaIJVS5xYxn?!@y67Sf8p?;C7x;dm3qjN-x?uyu54bO~bt{5SSJbAkd182Z!Yx_`
zFc)4VKMKN$>uw@7Ynhs!<Q}hl1>>V*U`^K-8_(uE(*vd9@=J-E5wd9`RtNiMb-^18
z)@HXxb}UY`6gmgK%gfLoe*f2W5Zh?_p34u}oV?hK#9Dz}2)u*!&vZ!pN(a<7ZltHt
zK%ubKdcbKC%nFi%XLEoRIwiY+La<%na|@vt*a<QgeSV<#Wh;X47t<nYE_mhUl(*`+
zXFAYoG>PwV9}2?*L?@h#z5FsHEIP<6u*(an7@4G(5yiD+&}W06`$}xx`t_L|V7c#c
z$N#I<+c!ZRk92>l11q4cTXphFSS_%ZfXb>h)c<!G!RocxZ+sQ0)e#+}(Af;{odn*N
z5SIucfbQ^lFGFiqts-jz)T#{!o(G?Wb?~^>g5V!#AdLpqqmJXC<BzBHjHeL4`5lCh
zKLhj0k0X8kh`-AI{<o49C{38|PcD3BkarAPvThRxkbL;G<AA+Po@Q!{YZ0MZYoH(X
zSi;Sl3I6+UT3`J#Jn5;}!<J(kO{|fQThhK{vc1V3fkraV0HSi?MdmJqbY2!mr0Zpd
zKsG^P#kJniMLT9<XoP`BKAPwkKSKockG@Z9(<bz*U)Om)j?>Q>aiHm{TWs2QB1^Uu
zmRxwc6+(2eJos#p<08NTdm$=N-#blv<yv}rdx+Mr!;~uMW{dWl-iSQ-A@Ho{5>MAK
zvF)s?iv(lDIcb|Ih%(!STzEI?D!{_w0Z2jpRZpGRu)A1h;KGZszx@sN#+#5Jz?RDB
z|NW1~o8L_E+~>hlo`RXKW+K5NnH3l5%-Ku@XzW}o??)=LS~wTH>hdjZ<|y)CRnxY)
zw@P!>TE>q$iuRk|fDwfl_e`Z1zW#MuBcqgG^E#@11H>QvFxpr|>r5@7I}j)YuwKFh
znFC(%j)A!aP%5iH{spGHki}R*Te2BC-2&QLcBz2=r#ub$>t8Vc{x=kh5JlKlJ82@?
z#?pS*yV317BQJgl&BKpi@<SgYYPA7HXAd=y#8s`1t~b%KMU_gaKv_l~K5bc81mq+@
zztRH9gk(B)G1r`$rm^Z&4!HMyh%Y{$_QWLh{s9`}<Je=4K_7KA;n9hYjS=?tA=6dL
zt5z~{;tAMVJ@Fb+ts+Wcj3KVqiFfQIy5dUI_kM!C@j666RJ!!D!way`EzlKSfxtd^
zHOm>TjbTTj#L#n}PvdvLW&3p-uxFn``9Ak!aCDTS71ZP;a`R^FzyF8XGeK?FZfv7L
z;k30B&v+v7@GyIS@k`>Lts|J2qOfEs<)e?H_mmSb4|*_Dr(b{=(+%G7%lrip_eY7E
z9Uf3_wS55)P;o?caxd)*E@m)U<*846g8qXJp?vEW<Ua}Q&fT=C)z0g%v7~z&g^1Ap
z`@gAw<2w`|_Za$4T}At(6RH34&(wao9{J|CX?)=e^u6KL=-xj6=GTV@$O?pX7a;Sb
z>iTt+%K>iH<Cv*hgXSTJQXO5&_;a31^sR3a{^-X@7!nCstq~G0maqlC;&W{g%yrij
zz2%+oiO&$;=iXEv^gzlNo=^Myb1Af21eaVvtF{BtIzREHiwUyu9H8cehcpv|1)42x
z)f!1cKDhjHiYJ{+PaISK$Vae+0umIkB7Vv1mAaYn%xA*Hr>iu7^;=|S^>v6I8bX)L
zM7wrj384#oN-wg|IzV#avnP+WAPM}<g(BhmKg{^%Ells+$<imDPV?<=$86b#b?|AW
zXR@^d*vwe`3sDsy39wXpkz$d!S|v&np+%)7ZZ3SvFAIwRajx><v$wFZVJi`Z_kW1-
zq_EkLg#6fVeh1(E9_^p}6e(BITp^Nw`5~FHi<Gp`BJ&JNBRT`#1s+K!Q|~H3y1Ytt
z{ffFeU8VKXm$Q6wFE_sT-BiBtMfxWvslWXl*s$oL#LfvSe(TQxWafRF3qE~o^%dxv
z1Yu5i1rS>r149g*vXYH&dkclne3qq0A4mPdi!jw1;=cJ2>)-e|csl*rL;!q2$hDN;
zhj*<N;wVm|aGs^GLUsA&gc#^)wc$rUWcanOr_yRszxZOzrcIsDH#Q6HZvpV2(>Xw_
zc-L%s<T5wB2(4BdK?n;0)^-uVs{wQ2MS&QD)Enr}eF63Jb<}t7#x`3>p@=kE88BY}
zUx@7eVYlK%W%>~!25?d1!P^=5W}8+!;=lvPE)RoX55c_a06~<R9UhQcjnOAOk-|eC
ziqaa1W6%MjlvkYW*LUDvBJFac3$q==3L8a)%MK-~)>3Ii0j@BMqL?5IXiwL+JnNZH
zdG^G_1VIq^0!Ypg2r3621frPYvSr9oM<O=+yr9xk#J@xp5Kx)bRhgXPZg?G|>u1DJ
zX{(6hh`#<F`b$NkMw3=6qTP;AN>Q#9iQ|~5$toK+ZQAkjmp%V+S6*@XRm@_c<Zc0#
z4=;40BWgpt?dH3GMcw7zzUwQk(1EYkYJ?$-A2>?0*`}Sq*Xm7-vGgaRh!uA2n&OHp
zuiE+g*S_=#H{P(}Ukkqw5n1?eW8J~<2%r?3H{U`SD5A))ce>7Wtph(W&_fU?w(r=@
zl?nVCUbheaFU(;YfmwW!!h?uqa&mHCxK|VK8Mn3ruXO^yeFpyOov%;eZ@7NLpXp*D
zv)N*V_by_at%z#1aU0<Cx4@!=7bJxT_C<iXjqm_E3<GA|vqcB*ztN!-{r$HM9zg%{
zm+QFViYxbtptV9|al#Ax|NkrHB0+H5-~se$r>*6__q`AAfB*YYN_C<^79Tt!kSTAC
zF-f-HbDQAP91ukjFL}vJc>2?yzOS!?V6nlct#RKC)axyh+Gc_9U6SBuKl@qMu3al}
z99ymRqJy_0)M|Cg<uW^W?cVw7SH19b2d{i*o)!XRJ|utn%U`B$z2)Z1jy>*fE2gKb
zok_2rpR3N#0t^0gKA1Df6(kkdT1(W9_ho+(JMp^LzU&!Ek@G)boQ_#Q($@8zn@m6Z
zb8+BkCq@zAe)qfI-QWL#55MowLk_!V6i4Ef_Sr&7W%{HIc`NS$({<0M!bP#c#71q{
zaLujndgog{cGXo^{Rb#}&?W;M1CjF<&~$Cf&BcJt3Q%wYQ~*^fm3sR7`VJDL2!sLw
z&JnZ%4JZ^kKLpd(^_4#dNcNHJgln^ED5+Mbr(3Od1cVv*tQ%hd2j6hs0@`lgX8)nu
zxdTnXbUOCk!FqlCezwh-^PqF*Y<9cO66)fMk@47z5Vr;LP5I+45Ne)($9zn>i~*#J
dc=P!?_<xoI)=|r-<|+UH002ovPDHLkV1lP(HWB~;

diff --git a/src/assets/img/files/pdf.png b/src/assets/img/files/pdf.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb98c99a869c2d7dd27ccba7b0c418deb371aebc
GIT binary patch
literal 1319
zcmV+?1=#wDP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000E;Nkl<Zcmai!
z1F-E*5{JJD&bijJ{noZ^+qP}Hu(oX#*XG~0ukCw~o0;j}Q<=)CtUL9K(_c>`iK+tN
zy*$u+e=@11`KRCd)}Du4e!*i8508v&WY#wt84G(3r133oan`L~@zOI9Nl`_C%C0zy
zlB7vIo~Fsq0SZ7z`&+H;pGvLXZ?C?N7i}z1-(12i%n+?^F?ZX$u;(3b=ire;w`y-T
zUZ@J%1t?kw6h%cbk#S?AL$`_|b9rKn0i{MyZ_QqRE%lGQkNV6F(A!6pTbAy5ANIZd
zz3kbumu$1i|1|?5nt1PfjEP7tzxryD-d@I<?T+*JGq^Md{ex(u!8NzPJN4JTjorI;
zW3vne_+Qaiu1iZEdZ#;ZlY@tL{qVLoPX`yKU|<lnj%#myXVO=`o;`ba;WDAKLQKVR
z2`atmc7}?C%L*Ym<KYjZ9+`XfPhA6Xgf<&ob^NBto$kii`1Lfex*|Am4x$LfKmpRg
z5k*8uPM(IrAyj;T2aycz9P7}xO{;C`aT(X&^MS;Vcq~WW^*W5Rs4-x3TDQ0zwaAcO
zd>%eZ5K+V{-V2gj{Kvn5zug^+K!RzZq-h1o9QkU4^?Tfd!8g2<v9)CoPn;wH;2pJN
z$C24th*B^SiXz1ZUL(4l)lt<FZz6IljNjpI9DMtG*u8rP+w(JEOjjsaHAIJw;?DdV
zE~(?a206u9B^K?b1u8YT^6wYI(10BM;^)}4Zyz?Zm9YUSKb)C{9lNmG4yS368s`Mx
zk;^@GsdQ1XQ7HNCjZbpZqeuUE*ZuowXE~%vS)`C-1<5^GTBmmK2+{#~;|u4`E8hA7
zkceO^fDn}-`M`I+j;gL~ZniBdY1z}x3lRn{uuY8LcNn|6j@<N?*b6Sg*LuPVtaJcE
zuPBBR0NSmAmrxkG1A>Yc9~(7DwoUscw;*mbaNqwv^3s=MXBV;8TwioksDno&^uKge
zB_ssvc0u`)SS1oA&m7rp?m&FT8Q4yW{Nyyr>)%Lz(Z%HB6R@y^j!z@bVY)slZA!38
z?gGqjyN+@ix4Au0?#VV9n0g=bmovzI{YRpE+@0k3No@ZRz9X@YNW;&r>%OvrGDRVe
zUTA7W>u&cVzQY}fKl6E5S}t1E2}N4mSHF#>b!2Q5zrKMy<0+_A=ioo22n`U)+HBqY
zR>U{ICGmHENPBz=m)47x^b-1CJe^}3ncV_Bs?u#!V+^%gN}9wKKv`t*=)fQYL&KQy
zNnEW?e7C!SSE7z$k?@;Py6M1sqQOB_JZY`Q(&FOc?92`G^?FKDW~)2uc}{Zp2qPc*
zV38_K)5-t^r=e5AJ?lJaYUoXCg^$U}>Bfs*_?)L+c;R`o07)FjSnK}Ti3$QJ6u=T*
zO3GXtXl*sf+D%TJJjFHFT)Xjt=RfoDmtA`C@47WuSXgBD?p+WDtXhkI9)0NoARNP-
zgr6eQ)6=aNz3|yj>Nx)`6-#b<)0^<=Pk)BTJm!fsTP>=QRv{9O{|o~9`ue%*$}2YB
z^{%%){*sF?49=^7)zwvA`qGy)hKI+_-?#t3X=|-hRZ|2Q2&P<Fnfvl+OcbrGthjf-
z`)%*O_@WE008RrIXaWr&O8~RJzP|D3M?d_*X_}6zY78Vm3`BsbsA?J-$mbnv0eyfa
d$U`XOKL85+%)<vv6Ey$;002ovPDHLkV1nJlj<^5-

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/png-64.png b/src/assets/img/files/png-64.png
deleted file mode 100644
index 3ecf3e5df737baf94f6f17c40f6c0124f379fa6d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4528
zcmV;h5l`-kP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000qpNkl<Zcmd6t
z19T+K7RPVTbTDxyYkyup+iRQ8wr$(CZQHi73f9cV&Y<7@ot=BOr&GO|IS*edTids5
zs;ldN>$0l7AP6MB1QPw-^Agh4)g?FGbd&V-^i-~1z4~zr7cRWh@bGXZoletV^7;IP
zn#<*ca^}n#@9%&Ad(hq8{mBn}-~&H;<Rc%czuP<h(-PSKM(TV$NhCapD{%|}$f{f}
ze{a3=v~|+K5;8I}B5!%iTe83Z{qGhxHa0$hF=&qhwreJnvEOCIij^{V?p#TwQk`42
zZ292KnX^W-*=(X1gw5eUVgUa<EkR|4|8r%+kHt}ZSEB-d#_;gi8y(DHM6JHua?4`*
z```a2ot>R9%fJ>@1t#O;<Kp|iG9W2CckYr0J?J4ad-fbjCT05Y@aXdf28L|HR{<D!
z5ODDVyAMGHVFWh+LfkVtsmyO|ta(O7h5zPKBp{{W|CPyPuLG<VTYb8J?sK1(FMa6?
zfHv@e1+;VJVZgR+JLCZmc#xnb6QwOygbk_-Y^ZPXbM}li=JI)!xXR;Ajdja)zQaWl
zz+|Hg&`ymaF7SbT{_~%cuYK(+x`Ii78EBIZD);o2nwlE=$)-)4<-oxQNV@qy11~P{
zVcL2`y0VV>T)t7~RjuzUW`LAX08jbC7d|iF_{LWOWjY;aKcuRvihi<w{YKfp|KNWP
zJ}UOk)wVn6sA_nyBFatiO9%fs`Q|sj#=TTjR9q80zteBsx(%{-?|#Jo)&*}gHB$W2
zz<*Z3f1P`&tgHmQ{T9ar1;1W)@7^~>zzc+10?^rb@EE+$$hW@r4WS?4?YAfs0Bv>6
znssXNcTW-U5cF^qHv`Pz<>fP<`4lS;cyt<Y&=Z(oz%hPn*RGcxJ9bG+OUo1iZ?wDk
zt5&TNE4VTy{@(X~P`>{4ugX`x@+ARqb#*mh4S19Z+;e5+ad%S_d`wj3|Kuk>k#Lzl
zeR}faAOA?=r$7CP5X1l;#$eGYQ6{kR{Jv_{8riya`;-KKt#IE5U|0g?&!7Le-~8s+
zO+!ONSaZbM6%E>;1Um|TwQSnFbxMN|tVS8IW5<s0eM4Pc-D5OivFOeQnE>8&|9<yd
zEt?g*#`G|Y-h#Abq4hD}Pii~kc#=peoy|dNpM+$U_C#sl`Um1CeSxO<32iSt3(b52
zo=y0S10#4B?}aXF<*oRvbi^%I1Cp1S(R2BE&HiNBvgOKv`>C2#%HhNRlsR+e2<7a#
zb28WHvu8<ujMhHT)^2^y$sFi_XSF@lhjz+2=%RM$K-<sB>^bvv4k-!pfdjnJZe}EO
z#U)(L&s#Esh(lAM`HkzH?|c`z)1B_9AZEh=O^v&RE44RF_jZSAVsfGO^>s;oeT`6|
zYf@DjI#<a+e~(@Z^gxf))>KoK?v>hFrL_(Y_DWrCwbqmj4fW|F<%JRp-c-?1{f35y
zBJmy@8?(g5B*3gZu8`kk!^TarK||b|Zn|DHx2K=FzqRt`KmS=MrP1p&ulT%B_U+qe
z?dnO^mPM~#y+-;6hGk%IL=v7C4?ZRu^w^LHF(9p$zxCwFlWE=Tu!M(p^7lewvqg68
z+JkQEzQ7<7V=pSXkR<)%AOC;>Jgd3Fe%&Wnfm%uVh4C6Bmv^r`c=G|diQk=WZn#O?
zyNgtSj^WBmM^yme{I+4kCJl0S%d~0JkrZibYa`mD%CTd|N}<(Q&Xf};PRN_y^d@=u
z!yhgWedt5w4R3e@ZTwd1I7aInTG^msk(}Vo2gI$B_ppaOtVjYBSgTGZ&9)bop4Gy@
zY~8xe5}Sgmj4ItIfBW0tc%j_k4tJ10{pn9afkrhbD_5>8qFMDXfBDPuf)~6%+S}V<
zG_F@(|N7S>3Hpw`vCoFb57T}9L#6^w@cBFvP|@9zo+tqxD-dNsM@L7Rou1m-TB>Z{
zzEkz|paO2TKu8T&uX27sRiJ8un}m6nE?qL!VTDj7eWp*o|NZYPGq=(%qoboR0130-
zG?LsVy3IyA%;#CgC&r*U)h$(1ul-|JUTZu9{K$aj{}osT`b~64J}=G9&EbvFf(o?D
zJ@0u>VT|AY_P27kyWNe6%i|yacvc2rqV|Lprd^0HkT}4zf=iYxp&fgmE_Ipc9-(~l
zlb@7Xvt}_S{h@i6oIZV8zWUX#!c_UqZ+;_pz3W|tqWh9^<4sF+t~CITf;TE&1s?RE
z2Ng+xu1f2vQ>TywO=tJAjTHuO9cA310$65N^+!MY5zL@nmM&e27y}f*@`peC0R}@`
zyY4UEBLDp7KVd%Y8dDsmU39luT3cHg6N%EfJb)NPZh!mR7pp+u5S{=PaD&ey0hQg;
zS|*nObA4**ck2rutl*m_a!ov))R=U1w3}FB#GnPnF<CR5fI(%9X7vGg{P=OBc~%I?
zp#f|LO;ypv8nsg6I}KH`chL;3<J61i25;gJ9|%S6vHGg>JLG{6e25b~gPRdV1)`Rj
ziG}S4h7Mh(0tnDl7yxK0Ac!%jDt)Xn>W2z&<zDn0fw7%lVA#BX8$3*eb{3x(TCuEe
z>$V*_I4hfvfHyml!%*q2&pJ~9XjA|RkehG58Q?;>%U$kbqAqv5;~f!oXt~|(ZYTfx
z*T0~#@Fw=C08#+W;R{T|5XyoD3jmG;@Gexqf+Fed8<hV3VUrvKUs5vUA)X-vSh0Nh
z@<09f$3I(<O4Tq4XI5ukV03ga>;)`Q!lmhE=z5wM!)kQ<oND*iY=;5oG{1P`8{fzn
zQBR;!R418i5DT6_s9L?iv}sKf10e>qiUw$C{4A9Mo^^pYwqXM%r~rWs6TNWZf;2TX
znW#s_-b5YohQ`7}Q%Q7KWh!GKkvxkxVccl2L@;K7P~6I2b4$$o!4H0Dv{~VFOUv|D
zJs3&H<?|T9@$oU$$zm_?g)e+TKKt3v%9Eb-B*0=%5MvW{x#5NzOw?u3qD26)KnRs#
zwaFZLmUdhqjAC9SYU=WSFVA_-bJRv{4|@Sr08aoDT;K~5P}x1*Bw&)0q4eP3NNYBm
zPsg3Pp#uH=sKAv?6AT=>{jraIjD*L6oTxZQD-3e>fsU#MrMI^i11qn5<two>LMqR}
zXJu8bjukk;Q-}nst1FZN%@b8X&jBS`DZwNst^h>*SS76WYhLpjVRHpng%L9gkLV)i
z&?f3Ijc2%05p@&$^XJba_Efoe@uJa)zoyRhcmjF!qaV#Z@78yr0;9~y0iMewfe^bg
zQ3=qq!B%ZgBT*6XrUa;f>SGH*58x3^+!<a#ZoKhEIdtd{D<{`qf4v+zas(Pn4%1jw
znKy497M^xJES(LbXh+9k6zwn*=FpD516n9B<ml0(^1k=IPwsP{`$$jkfU3a|flw5@
z<pS(SbkCS>5>PS&+<SNl4;AQBCJeJ`^3jielvGx3d)wP`HPJ0Wyi043dJ>qmY11Y`
zZefmoMUARJ-U*&dkk2avs+<f+NKA>}z$~bM211BBtMrU#JcH;De~*}&g{QKbChA2N
z9#Q9N;*DK_wkVSO%a<?Ph75raSH>WokQcxB#Rc!9q4LNGlX8ML$56HkWRL)fg14to
zfl*P8%3uHbH=z)pKl#Z|X42RKv-~FNtR#Des0p-Lc>1sv4=`vGb^72+VF>Ne1X{WQ
zyIJ1(&UZqa_mS=%Re|0?4B|xa{1sGS=8VZz0Bq@@A!R@Y6>xy3kG`nC?}`f8j*uOi
zGC3?Yx{p2hPsH8=C$1Po#Qy0|e>w)3Hk+@$w?@V?dhY<wzkHCFl&Sy>C_@E;*nNBA
zfas18h7R$6>QkS}iZj8YU<R6%g*H()u}5m4sV3@Fw&f@s(7@>DKKHq}T;65xz2XIw
zA^L<9yj^2+0f{e8@b<+;Lt}%6yX#Paa4x{g;RSGW03zT))a}rPc4#a=b^uyt%$UIn
z^DJ%-hL{S#5d1x35+L!eNG`BO`}E@pi0hr;Z7EA;0G;{s0x#Sai37$odh3X$!+>DY
z=r|0B8aSiPz{RdQG`mD0+D@Cp>9Bf)6L<mi(!KJONJ2EZ3QY1rl7|Wu0wG5_3<$IE
ztgMMQwt*{voEF}qJuChF{V><)=(|h>$OVW2oZz7iPMIp;#hul$%GXi>MBRYn1+W7a
z+ava7`OU%ugbfd~_An3|f=vN9D!|SX40ozPm#RQ_Pe1WV6nrQTE<*)Ek2?=4(Y3J{
z6@UgLS0sSdwZj&~7$XL_u-J!J9cHnj^sx;Z7(jm;KdJ&rKP8?Uyy<^=5@1a8+^4jN
z8#X|VQrm=0QOe@Qi|z9`B!Sh28N>$I1nyaJGCZNc7-&FZ>{xB20hJ-pf_aQ(U!oRo
zivC^}F1k??$twJP1UxqeB2*`f0|qo3%#3H#tWMk!btXG5vu37I0q3~@X)nb#IT;Ja
zkSc%u>tClGCa}^-1%2eefdj-5#QBU#e_Wn1HTGQKa#tUo0H#j>&y{ziQdQk^X0?<S
z2n`I3upf}-#s!{0XkegEvYFAcj>ecES>c=C{AT_9<})NdtS%}e4|&K#2&u#3Us7R;
z$z)1nfh-~$1<#cXSLf+>&zn1=^gt*OH+b$m4=+&u(HN`AUIB5ueq@b$Am)1Hwt+U7
zL!WZS#0#(~iWhW(XK}{H#${|gqwZ3JFu%AuC7{0`0iH<Aml=FNFs4?$#jOI9&@hnP
zfxMpb{`bEh4^s9xMt5HB#S<W5Md0&*A03xbWx%3^vwx;4dtZqZHv{@%Kn4{k1|Ly@
zoH7C96#iPAQVPv;+=ox2T>S%!`Hl9N<JB+IU}mx+r5RyX>8r^P;B^rT!PVt+Z+X*e
z)~b6wgfR{mSSFD=**7^13TN5J!%EvOP+2sFPB&nw(6Rkn^x6`pTc)9U#0$EAI8PZ_
zAvLLLjTus!6!}u6HmRw(UdOEwKbg>U{M4n#Kkkt`^jPiC&wlnZ`SFi`TvWXboOen9
z>2Ul9NpRRxBI)~uGX;*(jn0Z+;IyXII!Wa-?U@{U$K#T-FVFBOxp04@!~Fwj@s%bD
z?d$JTqn4EG7A;i$&Pe~jkmx=pISOB#NKz&A;-zl+=f4hhzW9aD+}Y9I`YS0r5=6v2
zae_A~paWuN!eq3tWu~;9B8`t<rL$^`#As!jaeYi_3$sU+wmuov-@*@)9m^s9np~Zh
z>#v*7`;-}jGB|W4J!aJtfWO$KF~{M~m%QkiyJErHtX&#V`sb&ikEo(Ff7}}^Vv10^
z>90@=G=DZuxPPJ9#?#2LhX@hivEW~<;M?0;e<@bVl7RBQ!z<~_jQB$f_coR*u`!b8
zN5?XV{eJ*HJ`R|Y;GqpXWn5J$_aB0%Brq)0NSRvTT|1kehr#=gz*7?6{qFblROeqX
z!8R4ABzSJa?@v`%su%gsz*7<%H*V0V>~_TG7#SGB8>Sq1drm^1=Hu%A6YypOu&5*=
zgr?AZ(>vwB+ZDa%q(`^z<)8mJ^dEqC7{L#I@Pi~Kfd(>p!qBM(KCg9XXqco)<NvPC
z=RfbMdkWw^M=hzC8?=XlU;XM=eP>Re`ui=5m#rEY7_`mi(Bxxj!x)};q@M$r(J>4$
z7UJ%7j{@tj-Sa&!df~Gkqe0GJL}aF&?$a@JHJX|;+J3icz!L>#R2DL<<!^q=+ut;Q
z-h!2xY{oi!2GAx*TZj&?pnK(`fMrshH^vcC^NGCI+Ir;7>t6eccj@6P>0osPv;pOs
zMY{`iOzS9DDsB8u-!KCz3JgfmrbpT}^>uY~bW*hWfk;xU29of2hG#vlaUy6}qrGUG
zvB|oG8yw%Lc){S{z<}oW0Pqcbq~;t90Q?BGz<_bujR9gzpc+VMYq$GoHLwv{B6Rc`
zZF7Tmx8=j?>Jat7#SCLeL_$mjVv85Op9F+g;uxirz<uv(b2G2RG34LnwKq#3-#{q<
O0000<MNUMnLSTZH_s6^d

diff --git a/src/assets/img/files/png.png b/src/assets/img/files/png.png
new file mode 100644
index 0000000000000000000000000000000000000000..33b4acac4a2da34fa19989088f3b6d6d000f5b8e
GIT binary patch
literal 1279
zcmV<b1OWSqP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000EWNkl<ZcmaJ>
z1F$4X6aK2Fx}Vp!y*u;&XWO=I+cv{{;qwKK;R~EEu(o%f?f1s)p3DAXDx!`#FJG(b
z%gisoEL|>_5t{D@XZpUs$n)I7GtWF*y=~jpOD9g8IId7A_{n4vQ>ILHk390I4R_yt
z_j+09LahAff4l}|XjeyCT~~h(F$NHyk;&x0^Sr9M0|y#0Iy!<<sf70Sc8rXSVD;)K
zUU}tp%$++s8c(F|4Dq;+m~y3u@bZ%g%2A~W<HtlDNA1;0sqmv$Q&ZzLHa6n@_uoc;
ze;;aVYmv|Aanw;q<AoPq#<XeEkVvGVnCE|(0)n8drOIlh9O#1w4?@6^OlAc9UBu&~
zsIPAjusC9||KW)zp2p<KQ;^H$2>hSfThGSy5l0+>nKNfjjz(kd@bD1EjvY&|#fz8X
z;fEi?)Tz_>ER_<R(7Z1*U7F$t7;rm+KK=C5!_6mkc6Pw?JmG&7ixw@y?YG}9l~oB{
zJunuDL<lP7R~kyr3G6r#R8`l?eE<flxE7^Al%hI1IuNSmm}8E`0}nhTG}R)VPQZ2D
zFaZMZ*s(2Ki^C2(jL+Huih)m1&#f{P8AZ``sFq@}C~6tTvBw^VXP<ph8eA>C80O-p
zrsnX<;F(N@>RP{kJtQ&0%$_|PT1OBFm@)w@(~jdXz~P4<iI-n~T{xeD!NCEc!$DtP
zKX&iljdA0~kshP0-rip9-Md%T4dRL`uE4x`^D4lm!B!8#Y$i;Y7<}~6r<gW<I<nGG
zSxj04l;D#lO+qS_lB(j!X0!ZWS69cXq;KI`D}XqEpzByHhJ_0k{yJmEbmVh+00d{#
z`uh4<-SF@*=@D?-DTsah_F=wMP%M?<2PS~&vV#8Ni!Z{LLy1JTD9v&KMNT(v+=RBa
zHZ(Le5Xb^H!5I9juf9SM1i0XWi;>BdzyKCWGI4>;pP58dRe7SKG$m;OEpX0;(8jCu
zhCxKKl&&2?12lq@dw@z=xpI|cSi<kW{|*rXfyMtuksN+F?X**+cLmw+h%<nZsU5&@
z$3K=ob?Q`th%r+eT(YO47B60mLcT!0&EUbn+Z9+885Qv=V5CV-RSua6Bm+p5ks1I5
zuefbCMSyjP`F@GR^zg$E6R5el8SlRPE~WX@Q%@lpjgm?^yX0CVRG7U<&huQjI${NY
zJtT^ab{r)$z=_3i#~q6&pL{~H&q2;Fp(n@nLE!Vd6VWJ?e7K&6f&Tvf?yi>Jswx-S
zuw|Oe#ZEZ24Sc4v2R@EH?j&ZHlOW8Pl}aPEBN<l-cm(b39jUwSyye>M+qZO+A}OD0
zvCnetdKRA*U8}GkTqk@hxdyB>mC8x*3>Ge0j6;VS<9FPC<K=sH@B9g-2jO`$Wy)kh
zuxKI(tP0GrOy_qa=|BQSv_@xVXXdUuZ@x;ve}rXv#fs%vyY>TIa><oQi_QsR+zMh;
zVh0ivD(i4y|GxN3FFkkpuASR$aGDO!nS1ZOCpC8LgsszO%v@3wzGSnK{o;(EOl6!>
zadTD5afXJ5N-w|s+{-(6Y}*H5iFi>wEuIq3X#h%wDSq+A=btUw9xtGgihRSXBd#pB
pjU~v86vQ%NF(5eI7Z1eCe*pGxtKwfl0O0@t002ovPDHLkV1nwlaM}O>

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/powerpoint-64.png b/src/assets/img/files/powerpoint-64.png
deleted file mode 100644
index 4d44c7d2b29c63e2cc4f4d3e0b7c4dd69727ffb9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4634
zcmV+#66NiQP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000r;Nkl<Zcmd6u
z1(Y1ewZFex-Gf@vN|q&A3}y}|e|W~2NnvJYLztPFnVC7U!)C}cNQy0s!CBGrP<PdR
zvs35n_Ukh}vtj*wuB&S3?04(ls#`T9QB|^~q@Nct95`@*HEY%~GBTY1!m}Ut+$Wr}
z;sLdZ$tW1?L#^WCDFbJ9+B9;g2^iVBLk`}0yMF49@vofuv5#Hz*k?Q!=aher6aby+
zA|e<gWGT}Ds(QM$?*FN(0E!pJ7$z%K-u~VX#A}Csd-UUu?Rk97MifK!u(88MicOfS
zTTGZ|cg-*~e=RE)46<-eZr_}<p70r6u%bpBn=}M~>ObZH1!+q2x$qCh$ZuxtfF}6m
zl}i0RZJi^Ax)XZu_$J|vUtw~5h*HqNT8E7-HgedyC2lyPni5xHf?N+f;}W~?_h^oN
z<TE&8@j^@hTCJfrMiI~ifQR=4fQsVBNmK<*Vb44Ss?+_z82bCmm*;Zf`)1>SQWJiC
z6vZn=1d=j_ngxFUIf^%b710XiTpg=1&PKS{dM7j-@sty4F~}5r4?9kJG)G_hbe7DY
zOIoVgA&f_D2b*|p`hA*wJJvZ$rTo@`{+{DiwL(InbB>fss@e}(@L!^I^LH>x6F$TV
z2!aU&h(H7pi{J?I18i^fvg@RE9DU&w{J=j1Pg{6MzeH0n6#-{mzqPig%Kvr%U6q9Y
zD&<?gk5SWv&!ZxM!3a13gO{j7O8soD&SCrUmvQ7dPx}Yq(_x=I+tVXWr-lHM_9o%%
z;lJL5{{ewDlnMnP1_T2r9^M(js6%r_wpGe(J^E5spY;@$9QL1v2T*S*g|mbI8l@?C
zCr$V~-~bRn6RpAFOm7oD$L6&cv-0#OvGkCD2bA^^AR@GrwBQAP*Ub6ben>b4pU)@X
znsfqzDwZC$RSla~U%-mf9?#MRa}SM~S50AebbyDiMvDCYb4~cEu%`)MOw6}|q!ZNP
zq|DZe<DOOLu>7>g976D*WGg)V^wR+^8^_F@H;?y!^fUC`_D%A)ezOH%p3ZpylQ02Q
zoD`ezF?X*zs|o+eCj8)`2d~=R0l)q2Z%Jxk{$YXr{U=QE-e01w+JaYN1W7F$1{9nG
zY@3Yv%j&6_zx0rV?^N!GhxHWzuS&ym#s6FQ+@*VdKhS6lGbbP5Fv-Pk#tEt(zGB(9
zdTQn`X~NI@8{z2=PbYXmaR6Q6HDO7Gx4!-y66zc1?R|EA-@UE!))68eKj{PyZ}M!L
zjM&%;`-@4!BL>1eDgihLYEy9OnU@4&MunFuZ#};tE=KE(R=>;4XGB0XCOMAGWHA>y
zY&FK9h!G6HG`z!^QVV{=s)w^82`>V<GOjj;ZoU@T`DbKeAJi+T3Rnlup{-WYDYJMm
z>&LWOKgPHC_uwCQ%)Dl740Glq$zAj~s7_|W`+mk6;Cf2TNXQq#RTXDrKrsl;fB{4u
zR(jYr5jVsBd{!jGJ_u0>(B|S9tp6!t{{q5gCm}~a5W*6OLBLCse<`4eeD>qEuhSVi
zOu5YXcYna}&9{?V_avxvf(OmWfzb5LN$?A<QNu<SVh5^#hgY#!>1W%dHW$2eoAB#q
z7Q7&jYfK_Pe?3J5x$|BEgM-i*gSZCj5NBI0stE(s;py;Tv?=7lOF;dYpubGGawQBM
z1f2zZMl~4P$R!=n0=Er^HY{PzfLK5CxdC=e3U{}PoWxdV0$fyuA6!9c#mNK@U5Acu
zh2c%0f~XH+bqe@CPDwgL5>8PiBU}Xpe5+_+&^Siv43BR*q<~dOdN@|%hC}NPP(mCO
z`q?oNvT5xltZWrIgG?(dAU}U2r6tD@KJ+r&!SzU3gj^YM&I20{jyezpafppj8-sI*
zDw=deJBiFJd??~vGNm%%eNQt#Hq<!j0B|wbhT`fDaSjtq&3uW?N3COJy1dPmaCiTf
zLS-Mpg)hPlZvX<~Eq6j~0{kC~s)BVb)20y=2zurb&OHnhhG=yH6hIN30T7a9ydc1I
z<r-V2@s!!XXGH*zj)1zuRU*Rvezw)-u<f{YtUmKeq)&CK4!Qk1<R17asP4gsyiou3
z7jQ%OV2VY=fRB8|Mc%P-ELbgI29_}AerMBr>Vq+rgWfp`lD>xo5WySXtOW)B0eJ6#
z7}60C*DOKM%l4?3oyR|twP&|E(gr!)zRl$0I<jOfI=&gffLbIMU<x_Hasdg9kNmjx
zKNQ6n#Z?<bJJz%JuG<*fa3PBy`z*}pZqz$q8p6YaB4B{&2#5g%=?<^HKf5)+MYhRS
zW@p{7=Y&Ub)Ok;Bf0<!&aNkDEz~UAdP5}q1NVyN`9YjKl!J$S`HJDNljs{f6K|u;7
zf}T9%zyBUXa~HGdob!;q+dzUu3WyJXQBVV-fI{rRce}#VDFrm;03!jrY9YH$c{Imf
z{4|c3mvNpKK}PRG`VR+J$IqGrr<BfqHUQBzA3^ut<14~k59JHrf;4A2x^F9EH~xxv
z&rTp9nA69|HQ#0M|D8)g0-xW``Y?B~@B2!~8x~w0oI!;y@LhHRV+<s2Pj`*fx$l0L
za?FKK%!HqojWBZ;BG#fUc)(c*^9TWI1=nz>2$}~e4I=eA#Z~jk&0EgUH$O<c_W+m>
zJF=h3_RSQERX8{V)`NRsKmZXC9|h#|paTFXo#9opqad8zvK#Oc=NKIw;piv6jfL~)
zf!dA-8`L1B{>0v{zO@d)Vk2KuU<8Pu?{JtiAKMIbDLD#@)-t*Kuc$M)*b<M8f@{F|
zFqj~@|9fyF9$tXR;>iV6v*EiPhW>c<jewVJMB_&tefaJrhtC_dM!<GH)v5I}g!&f8
z%-#=Z!(r<VF$Szf@@34trLgEo7~hZn@u#?kMMXhD#6Z;Wp>I>Gpa_`6P7uccAPUeG
zJ~IWLu(e7;(N|CCyYc~H@bhs+I>385MVtbO*>}F|6$RU{EeBvMI7N|}b3@M{)%$k(
z*;ij1ggyN<?)?j<F-cG=AYljzAdK-Q3ULHFEBMY=V!!y+)lBm^$Ni2w>gIZ(Z<r_^
z%!E(p)-*Wa)4}Jp3yEqL2?T6Rymtp`9r6C%41ecCOx|@fYKqwL3gN<4^qhVvx@-;g
z8?MIPdj~;dlH5RV)A}Hv!!L>sP>5^-Uc19*9flr$))^$Fz~n@A8oc98j#K=;?fa-A
zfHbO5=*I>9*h&K_glMhG&>Pp`Vn;Ml!PX-*DC24o@kE`)PrjUR{vv2v?!jkacW$A6
z?bS?P_bc?4jpWNAg~f*x4h}$Qz*(UC%=<xy6tLFOP6|jTcmN9|4>W+*CeZ^s2#z`v
zYeV9yFR9gmiyKV?=Ypm|JT}rAFMPopnYZrg%t#29uBQB$)s!CjbfOLaP5rk&W%S11
zA$M)2FxW%+eq|Um0HBfyuiB*$qK&4{<U%&QPQ%aS>BK=~bRS?~;W4d>vQbsUzZQ)^
ztwU9i;s8A-p2qygznH!Up8*GU!F`({ieO+NEL;htIY<zaKjHo@)9O{!Z@Z4#uYSP6
zTkfJhu?<~*JSv(APq#vdOm%@5rc(fQ==eUQGK$6#X6|w*_O-&?)-2*8q)=qZ8^26$
z!4fcraBxA(i0kl+55n!gh2aA*QGrSg79Rx<xe)&UWzf?PfRsuUA9hB|-1sP!Ykq~)
z9dXn^GvL*a{yqnEy}fk`PSMHzP#*^s#Ky4jC;(i;64xC@V?>m~niI$`Tnb6u_)WO$
zYLF0$JzxcD4OsU=$Q9v}uZ5?)3g#^&Dbw3e&n1tf2iUiNgmI@B0n+da3SCkl17148
z!*uZ@HbNC}7IG!zup<F*{&EGU4iosJFlp`E45c2Z#b69XbvXM;aLQ>jhn}y#2VT^)
zHnP@Itu+v`;FV6>fXTRbnAN?#y5#375=St18I%VAu(4tr>f4C+8e9S{1|#0`ML)j%
z53qL^ocw>GUWe^>(@xcDoj8g?vf=gbO9AbEZ|}Fi#I20OEIJ18(pYg3h$s?fEJi0?
z09$T@eS3Ta<nr+QZ^2JL52gSEi(q`zKc1F4s@t|f?>tb=hR?nf#*m?|@B+9*f;op2
zdXV|6053aHCmM!$q(MAd_peW@e-WI26)ai{^$Ij95QZLj`~ckiYdG<tuy`eD*<CxC
z`1P-mLZKtP;`_7T2J!!iN_%+l&{lnmAT~l4tcGGA;C1*@p3lH(=ObZ&G=ajog8<+h
z?Arx>^Pn^b4qFM2eFtp(liv+?ZHDo2Sak|K@Ekbf(X><L`fF)y*+f2<Lu=J`@Ls6{
zQCA0`c#|yn^f6P>7V$A8HUFYVXJ2r}F~kwvaUE1AVC8Xe{C|1FM-(QYld8Ag1TI36
zOn61p;Imx=qyxMHGdJ7de-a~uE0~q)HCVg?#K6+Eu;CW?$roT^1eUCZ`<({MkD`;b
zTA{K2c35*fsAj?^7U{oz5me~>Ev*9-a2A=r2J&TQr9GQ{abrSIg@>IB4?PDq-40iO
z3tshTShND(`gJIj+WYY4KjDV=Be`5hc=i2m5s;Aq8Sv>sh#){4<LK}Xq<^so>!cOO
z`0(Dc9&W!5CP!hx62I6z?``muSNf<3bJ^j4%}*(wa(`;Zbc9D0I-Le-D+N^$X$wC+
zcIx|K9v!+Dw|6sAm`a6J$f9Fm?hzn{w5D@=)p4-wNZ7FnZoV4c|1zkI!Gq6%N52q)
zkan^|d$9N1Me&SF(2biR8{RW(awX924w%i469m91stPU!ae$&@e}%nUVEwO=ISXLX
zF|g!#7(AlosFeIHuR7M-MNfz8eg?N+3yr#euI=pqjG(%YaG)P`4$X%5tyAJC#`(W@
zwxzHj-F}%7TTp{p_8_Eh6<B}t#ZFlaQNx4m-3&NbunG_|<hR5#9_g)v!bL|=eDUjO
zj5&y0XLwcW^#+O(<^r7S?to+sm<=!BY{1@kyp7<SM}c!5PTJJfs$e5<mTpqK1kjAL
zx)e*0FA#6M6M5+AsJgcBZVJBEpx%gBv}pdFVGtZ7fTSdjZF-9y92=`{ilS%`k@oNa
z0$QnHhYz;EQ~?3BgVWG<2NvH?7g<Rdd_P_3IT6g<xlk;7#{i0=&cjDhjEFEiynoO8
z-~0BnhKGkY1VNCF0L|P2B?}$}2bAX!^z?!%illy%C#Wi*UB9%*y39zwUevb+p%F#&
z_Lk`@mxvk->h*|5BWeK`OL^irW^`nNZQHl+z3R#rU9$eJJ2%iqVS9W4>Hcdh|Lske
z@8|yk_%^k@AWTk95{9sFa3Qr?gGN1KvQooZ*K&$FW&i$B?pnWL-|Jp;#bsMIZ@QTb
z8M36>8QypPt?(!y!tUKW2?HUDEMwyp#wR^|UtgIZ5Qg?1V0{z*^{;KgUrPrW6x!G!
z3J<D|k&%&BxKB*hTIQUGH%1s5nu6cB?{!W1&G&Bl6I~S2PKP2q$?GkpR*#sNsQyFn
zSt)Qx!Yeur540k{{)6xUCJY0nETuyZp7e=Mgx=nN3?9Jz;upW<uDjN^oM4QgdT7F@
ze+^bD<_Us-3?9Iod+s@$dg>{>?|tt>M0_;pAqJl=j#RPMGPL*LKLih80HP@3^2;yh
zS<iY_t8aqfP=lXtt#df1R4R3vwaq^O-)0f~%x6BsIp>_CaU45i%pnKwRGFNtP%IYN
zxBtMtSH1EjkMQtF8=I9vfW({h+H0>J-L-Sa9Y-B~-09=v6A0-VKD(c;=auy9+JFIQ
z=Nny6oO48txV8GLy5ZNp=E`R`i=00Lho|qS0G;l8vx$E4dG+96fDp(7-0yz(JN|v|
z|ImAvE?IVB6h|``L`wQ#BZ)pUP1ek(fa#v|zN<w3A7#p>O@G<-&Ud`|qZ>ACxD_a-
zplt#;1|q!Gftqhy76CEfk`Bn>9Z&+KP$-mpdwLctng>FK0Pv<50Rsqv=@5d_{>Q#a
zY5F2oQ%@wkAv!TJK3=akA|On_C(X8TKn<wktqwHskGtd_YVhVEnFce7amqYws!y_?
zZZjTBL1#YZlIhwe)U~ZMyv3;qQ9y-kNqXD`LT33HvypZg185iL&E_-sAD$eZ7o5+4
QPXGV_07*qoM6N<$g2kr6o&W#<

diff --git a/src/assets/img/files/powerpoint.png b/src/assets/img/files/powerpoint.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8a83078063607c9084479639539a9d6b7b58bc5
GIT binary patch
literal 1371
zcmV-h1*H0kP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000FdNkl<Zcmai#
z1CS)m7KOje%BpFPXV$yVwr$%s1JAZ?gyY$^ZEMZJdiZbeG^)BP^S+GEsEB_2PsBIp
zmhMSSv=R{jtabOa)?PhI;=zaC__E4<vtK=Q&)mdBf2*+BrId?fdt!H$oBiQBPk!F-
zm31))0*w3_x)V%nqNO-C-vv<4IYeYfx0@YzW~`oHI7REbuOnLj3t849U2n56c^4+1
z{b6?O-A%UDK?F}3;C)Dl6elRHimA!gjkH#WjZz9AA*m+Cxf4{r_$HFhStOYx(F2yQ
zelMmT^*-k2xBKQ@u2c$~6JxEdD5Wunj~>TVYE0V>V_$wVjm{O2Ov7NEh3UIddDt77
zo1LS``Ut@P8~w<2DRbXD-i+()+d2D%M_oN`bk-o5Me>YO6E`M$*ejUZzJnr75fz0G
zl^_rrm9<tN7AXouU^Kz}=|y)Yj^s|2t>aiTh90bNa`M*bN4|!+n#LXeAqIzt0xQT6
zNAPgpZeAkadp*>?Yasam1SEiIPER3us<O2KiEObne^25^yqa0l$1MGxc-uV62P@}1
z7P1r>Sb{Vvj>w#1{o*>&)vkpMgdiDWvc4dhBU|aPe9gO3d&JwBog7CW{RL*W#o$+;
zMM;6}^sv&PdaYZMv|31>gHjM1RFNW)!nv>qqcT!x@}6aR{w~Zs=DowyQk*|VQjNh`
zWaR{`9Kluh&^@up<}ZKE?kB$lqYJPWjDl{4)PQn>5lZQW-~E-Pg%vmZjCV4(%{L!p
z;lWrP9ao8O_E7TN(C{;xdd%xd&o0qD_%~QQ=s5%n2T`l%5Hv2FqTnz@f3tC87OsBR
zpYPZnnhS&t^{6~Yx+(qjlzafa%Q;2gp?6)6qMc)xPs7EFFg#`9WR);PVP5~yPvS&2
zwl4Q`#KnmACg7p7iKsf=E1>)OCy@7r*(bb==Di+?+qw_Mxn=TSe~V&e4Y|54k8f~-
zjI}N#A|aFz?uU!Y+PKy}x)-|aeaA;>-sYa@-+dC^`f&7Jo<?%Zd&4d6gj=~tqo1>t
zrXa#-f+i^3A9*Ng2i2OxB~x^lQ=*CO=&=g;`xGfG?uVaz5fJqJHe51>guxDhfFUS6
zAl!6Tz&e<@21&G?J+FK-$@X2~9Nhd-V5Z>IA=q;bKruLel<x6GxXCS%GzCBi7$_x#
zVDHX>sX}WfNp+f?&wW*Bet8pC&qHG;-1a(fgIfWR{o}9LOrew-{Xh86C8FFQ>q7qF
zZ^Q9lK>H$S4dc@=H3xa$`wZoWvTzux4ay|~NRpT&HX}<^ZnASoWN0t+P?11(0HR~a
z_#7w=QH(eZf8LM$^&k`lMbbn~P2ij*P7>BuS69!UTf8_n7Nd%yKt%RkYWI#i>*BBz
z3ST2m5JIT41%iZoQUZBVkW|O0*Xtm{>C<OB&w9p_AN=>f|K%qDI*KC76BGyyQGf=N
z3|*NB6&dfIC<0$=Uk`l1`symiUoS2$x1aiy$2}x857H|u{-KFr<VPcH^axVcE+FCw
z?ws{mhO=kS_MY|3CqL@Y!TmpGMEbhdy$+xM{1<38o5XSAi7}oyHl8?O!o49T5D(o@
ztJOJw?tJ?xPk#J^4($K?5BN7JfQgBTna_OY3*X+pW9K#VJTF8<iQp0Nb$I|>xTbWa
zwBFd*C|>{iSG|7!KmPW0pbq3f7w7<~B7_(}(z<6-L?XZdQMn5vj7k8kwF9pnkN^cC
dpic<N{s|pwP<y!vqILiP002ovPDHLkV1k54nU??n

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/psd-64.png b/src/assets/img/files/psd-64.png
deleted file mode 100644
index 0b800dffae3bec55fe65569b931b3f91ed063a1f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3944
zcmV-u50~(XP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000j!Nkl<Zcmd6u
z1&|xL(ty97@p^Z|jE|BWGcz;PU*X5h%*@Qp%*@Qp%<moFB^w5NAq)15)cx<4Ri(0B
z<66I?RaKuf^4wj%R+FTOa68-oz38jg%)7_orwBdP*FOtP!5pT|l8{rvk&RT@@t?ow
z$w%Jnvu}R!qqlQ6w?YL>Ow`X&)l1Dt03)>ADV5PW+Xi;YYd-Sb!|!p<mIu|wGWuuD
zLtT!k$27-$9^iAl%aPO=t?XqD1I(Q}A4z+&hi|&*^-CAe_2r%(0L-AhS^TFp&9}{k
z8Hk;TplOo)WZt~lznzu>0{k<xEPsm`w7+homh*vMRQT5QIm1;?sWc054!pyBj`|F9
zb=1}Hu1-&n$MOmfJSkz*HRrKx*$R?G@T!=BssREh5w<gE6RS1hgMqbZp})WU%t<A@
zZCVN#8>@}vxtlA}{Ii*nYQ{T%S><d0t}!?y<W49jz4V$VQ4ih+_zcT4(sY6zsdE1l
zayDIkE{hf~CrKduw^0QV0=%GrC=lipAwGv06%dH;hW7vzR1`tN7%-);w>-LV;oP~j
zv?TPcpy9=K__zPM%9pRJv2(~+f8+@NedTIC_^`R8y(yNaNT~!py(FbxN_`2l`o?*{
zN!)Glf`WnfItO4{3Mhhq>u;vuC)hIvk2q<94VRtDiElZ?bq5l@_ndn$VJVs<NKzv0
zF=myA*?O#F;}vJzeefz6#VwgO{BJ9K`Gy)h^FGG<7jeny$B?)><Ep&k$2E5CKgj7v
z%)(8<mmGcRLAD-KpH$MxELw8+!K(mRkggOUP4Hj2F=JbGlvkfV!7m=z!<Mg%Fp?YJ
zc;sUGvu&(dIgjfPDy5#Bvg~8)QKPKC<b+B16?Y?ibOGz$0vhmd`&ET+-Q*Y;FZ1dP
zXH#EvI8XfQcAk5}A>R1g5%!IHw!P&X9{bfAHCLlo_p<fyA=Y0!1K_9O0;QtdI0gTX
zUsU+cHpjM+6xTbKdoG(#FZ=k-(@*4s|ETffD|)!++bbOPyD1kKqp!Y``>i|3h6`s1
zd>CVZbzuP|alGqi2l?g=8Mo|Ju3S>(6PJ2k`a8$>_buS)w_eXHzVsKy9r!e1=WvbE
z=l~Czgx@&B;3dQ{>&5~;{+mI*bzO};LkXMLj_`zyXYk7#s(f<8e9r#BcK-Y1wJe)=
zEZ2Oo%G|UL2e<LiwG}p<Kl9*K6}oYOQ#QZg#ozqT7(+uTv&$*(f5KVZ@8i3<SF(p~
zOOIu4{~S*H=rFkqv!XXcD%*JEnhKlGo0;$;f|*T!FYv@K4(NaWJuKDwY%&s7FHQN;
z)0cBg)i~$92k7q;T$(ViCr2x{^2qyC*fN9R3FC6Phvmx_N@oiIMk~Y8*FP6Vb9z$P
zx!<__?fWK`u!4<8mHF<?jzy)6{J?EI?(jkGf5FKtTDlxbKmtuvxB+Q<ZBI&jZJ)N+
z_M|PfeHz9BC|HTiE2h2}zFQZVGk-pND|Hg@@B-yDom7J3+V|{d?ebn0NF6=6oyQ+J
zNUh$-miOF5DZRO1TVd_P;x~xeGhz>*5T4EAZ@F_k^peB4-+A{Y7i)(PV^ag0rUKGL
zFz-<BNX#%AO1N!z&Yqzf3=i;#qpNJb;3VGvlYRWLl2J|)x^A7o%_6iZSOTWOQZ$H>
z<;GRD1Q811Q3$G=o&rog<}=JY%*rGPW-xEIr(WI8!;cwa!v!Zc%G>k+sR-%q;a3Au
zFhHUb5KoK_9)QFYh?3$FQ|JJ%5`A)-3UH{;F_%NhP+(S{#|`b~p~nuh{-TpYz!Nb3
z=N2QGfdS@;mf*pInu7VD7mY&by$4gwtPoyM)Bx*30p>HzWnj=d+t9ItJn*<fljZHn
z0Ui*!ovTiOi6)N^iV#Ac2(UzJ00r;B6g2cu3?ECu=_)`mpP{Zsx#TJ3qulqn3D#e7
zYICZyt_>jOMhid~_+ah^;86gtNL=Y4K8^_rQx9ex;YC2ZsRYd&-en|7opLhF)?+;D
zFFm7eOKS#Lx8_cO0Ep0dP-{GkC=kTAn|+XY@ETm85FP~spo<`Ab^3dTxZiOlHe7xt
z?fd!Z9i@1usPipp%@8rtM36+m2<Gmil|<-fW#GURHEVN$B6v~3=pqO@?=UyS{ZCBT
zaOIgDPjWiLdrrP`?WEib4QvK@2YYWG<S*a4j_QsoNg_xvag3JLc2OB>fTE^|IWPnD
z;rC*A1WXOHX&#7F5A2<U?_vFwXaCResDT+i_qYu547>;Dz$q-a&jK!g#yPA!dMV~}
zzyk{84e>eXlqdvIa@0FSU6{)uSb!ph@Wqv2fdYQ}oo}(}s&iSqcv;8V-U`8Euo5xU
zKuYkPxBiyzzvDOD_P5<A!o-Af+C$Eu)YB-uP#=L&@C`_v5_O0w(tr*UU7#2~RDyJI
zBD8PE&OOVQH}ZU^jSbcs<g7WTo8m)|cLqayhN*0?@|%zSo}K^RORhquu<F!%Va_$G
z&n&~&CYTbfPfDIg@RpSi5@JFzyaHGkrSLN!ci#<O?GHfbU0os&|KsgBU8lt36bwKV
z5v5cTZu|YM%s*l|nKSy9&%<1flwkE$C$r%A`#^7*iJ>tD|8fI^KmRk52$+Kq2Z%8M
zGeszd7uD`gh2Q$(hyO8mZdzMfBLJHxrY#rd9Nt5wM(zRiK^%rr^N@MNImNO%>mGI~
zi_Sg<Kf9kiEy2S1%)8_aEYI3kKa4Gm6)S{CBy2Bi`X@pbxH`k9#LbGf<#aQ{t0(th
z2@NxMIhy6HI`;_bnMWmM<hH%^E}cv7eO6J+9ecm}3&w69puBiK<zv={eSS=P5Yr%<
zH+rKGUZcNurvQ+ShZz`g^*y1Q1H~hNs6$Q3y`df!tXo1_PFZ%wVU$-bCd)m!%c%VM
zMtWB-rj~o03gfp7pp`*tgH>ub+=8SMKrKXcC8og;Y$=8pQPk*80Wgh|oCF}Oged9(
zQzYbb)Z<mjypTD^Q4c;JuaJ39-8Iy7>qozb`JDRhebk-da?gUtZDssdf2H=vzhh&g
zfB=S?L)2PogrFF+Vt541x^n?AfX>HQL<>+0stN)g%mrX2_d+%@fy2ng>WppQ&;FnO
z89z9JB!boJ9Q@J`nYH;Uycg07&!X>wv&nw>JKT?c0%?L^pe`z)H3$~Ki-Ka^TYz<j
z$HXuc^NIvZXcF~!r_{aSCFP&5`8=vQVg_Oeq3%~h1Zsc#583t|^jv-+9B~*f%dzv%
zMXFW!^PeDrm<57_O0Xk*Lj&F44Pu=SFi~PT>Z71hoHbma?hWZNl2k}aMv@p}K1Oqw
zfqAr2q5jFwQ~%WG@sg6)Gu)ar;6hc12cHM=aW`mI03Y`PhIJhTJD=XB(FMTTHZ7tK
z?;JI6D1vz(OxT)oy7`=B)pD3WAOE+%BkHhf6=$F(NWC83Z`lgt3F#MsBKT+l)_o8x
zh8Hjh7LbEj^IqKt7ceFBh7bN56`+JMq8>{UZ0kns+N*KHL+Jd4Sni?ROX<&lXx}B8
z505@pf(7uw0&Z^%Xg{|{iGC<F?bB5oy+g>Q2ba(QZBl>&jZ`UncH@8d2mHFj(M3yO
zqK53*Md=qmCB5xtkfccgY90|F)Eh!EJOXB2x&Rnh=SvGxYf*p;1xh^1I`re;G4lOi
zf_WrOkzoF9Iej7{{rcBPy#w>{Trf!?5rV0s!Sn?}%uz7w2(Ktumo8ucbiT1MQcMDn
z2MsV-TwxJKN(mU?<LWnZx&qO4NQ1^L33F)!TtQ8nYYg!KG5%N)e3+xl%TWwKI$l==
zzr@s|5>sJAA*}_Ag_^xFmgoXa=lq~8;!!}t7-G2{<BnliF}wh3-3LMI051Rrgy1Fu
z5Lch*>rEyvgy*1u_)fcMSpBBcA_;x#C5ll9FRCbX9|SRq;T0@3EWpOexY`iFO(B?k
zyzL2NUkon>NL=}NTST-NF#rrJh8F?VZcAZ+&bPFXLaPD-ENUnL+%zhMmUBL$0L?*;
z5ac9oPvgN0fHVc{0{BJ`-DUx>&R5i662N?T(THiVr95saWLisRHQIxm0ce}Q7hT8{
z!J7zpkIP+`S-=Y6g9{M%<RU;!gHjma+Ra|YBS3qQ^DX8MAO(wMh47|IEz9XK?KTTo
z=g&_uT<-7_H6{|;Z*R2VR;TTEi#?$?i<Z)<IY;h27=`flEN6VY#>$n8{x<E8r3VKO
zS(ZCQr0~lOF=1C_gaadW5)4C#kr}`+;yCt(5zIRHvxT1cUg)gND&v#jRavok0rO_}
z#s6-j5Acp!ZGr{!=M3%Mz5ArgE<JyHcM34+_*qI4u>rv>*3MxZnJ~;~|JplDM&Qt4
zQD<0lFAeLPGrOO8^JbIho?1Pp@n<%A`^%_T4jimfsZ>VZ`Hr`q^^LE8`MR!SKp}h>
zn+jeCyD^W507ks1w2n76#m88kYx{bwj`wxeu363ac%53k&gj_GoM-Ob*_grP={^HH
z_Z)i33!Z+_4L4kOU3cdJLEHc12T1{*I|bf=fgRiF@9Sk^B4ccPya_%{69xu$O)6mb
zp%*{@sZ;QOgRT!m3}6Pr8(>r`Rh)Aj;a~KEr(Ja8jW_%iplbyffXx*6_FbJ>Bf58l
zzo8AjTNju~@Qtw%w*pz_x`pqy6t)=!uL9Ci&riW8iA)2&YZovuW){3EMog)FedR7!
zzU%Gq%z{^uU;&_Edp$6)n;pBR;GfY2d>5tg41$m4tr>ZiGcq#9!Rqj#=REU?7j3)k
z)=u!<yFjU224m*It5U1g$+8SZMj!jg2VOb_Klwd_Bxx#u+^)Ylx^m^JWY3=6x@*_o
zKcuDJGradr2MJ+(r<AuqoP)O7o+<d;F;pF5Y;17sQICAsmi_zp{xvWdpn$cEHHZ&=
zl+Yyhl!2ZpS-W=ans0sUyB}D$?(oxm01!ac!T<~-QYwZ3H0=WdY|~sE6W-AR1w>_9
z*m-7|<DdWh>n%@w!lU1`YuB!uT7b0$*agXg)PQ<?CI?IafRq3a^Z~tL+#3{A3X+CC
z2_mh15L(9V3U6;#FeZXVw=Gz02Uvjfq0a*NM2iv};Dy*E045QXG)Ph)(pjLhGKv*Y
zFxN@6KztAv$3bb+3>q@co@qb|(`(knvrVHfZ2u2`1tW|KP8yp40000<MNUMnLSTY`
C%7upj

diff --git a/src/assets/img/files/psd.png b/src/assets/img/files/psd.png
new file mode 100644
index 0000000000000000000000000000000000000000..3433fbc8470358426aa09e5f84fd0de7d322e7ef
GIT binary patch
literal 1320
zcmV+@1=sqCP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000E<Nkl<ZcmZvb
z1CVS@7KFc3jfa`FZQHhO+xBi~ZQH@$wr$(CJ?!r3TUD74eRrZKVlyJkb$o&r<8gj#
z)8t3=y2=0D`{d3c*WKqM_ne*S)n=KMm1Q0fH>8(6?!KqJ<8?1M8zLElVRc?zD|)^D
zwRgY!#sdJl0H>XH#(kQm?w>3!y=lN6*WQO`KlnZzbjl(gjd<<@Z{&C1eHFcRcYkIs
z8Oa!d16vqlgKcn->zJ#rzV3dHdep=3NNk0By$)P)$B<9$b2D#!;X~xUc+6w&&hsC&
zpnq=`9^DyoX|Rw(1R*Sl07AwD0h1S0sSA(*?pj##HFu79+xEBWz0bOzHg?A`-<#1)
zxlI53@-rj48)R2mA%!9wvK$V}w&eEAo}6PatcGa&6K;9rg~#8*@7{8sbmYw)mTPEu
z{dsA}&pn0c&q#7I33p7#Nyf<?WT#|Ihomee%Qz&Q!kASBGmn4eo0~I-9C2ad@)cOW
za4uhc(StbtiV?LA0I)roCmXz#0z<Ba=REeltnVf40F0+SSl92VJ6__bbEFqN<a)mK
zrbonce|5d+-wH&41;JK?gDOD@N)c*cFp86Y_i{bzz8jDo0C>uSnum-AbG+oyH>ZDo
z_IX@+TNeFDGwVA@k`*azA{kqXC<$fJ$q6#U7%S{F@yY_iOnERKE%Dq3-NN6${5qmH
zL#=bGVd<~$^6;nJ7h7C=&W)7O7+g@zq&h~mKptU<Rsos{X#%+Z%%k}4_udHI4U($}
z1-2w>!)!O6^VY}e?)TrIH~;W8avnulUXqs=LwQA!hawNcuClFa2d(f`1#fuHqj&4B
z+lcLCk?b&bO3KN#_>S8K>7;)jo8|^J-Q(f+@Z-Pmy7Y)|yvtr*NaSH+JhbH`J7L)d
zPv_uePk+E%slq~Z3|3GZDGDV=H2uDw_}P~+KPVIw3&TdY{d>D0iZm{4^*~j|xJH1n
zr#z^|SfEhCk!+hXPO+J4#=dKq)17Bumd^dzwrTn7^SyNGHL3T5Z`l2mqFGMlkwMAr
zU)jKv2VfK?92g-R$`D+U5_c^Y7S6bk)D`i_2QwJ1kXKBf!sZ2(5teZ^#;grdi!fM%
zP9p3{Ww_GZI^fnF_a{0TYQ~pc0!#C(JM~zYpTn+D#@MS>1ZHic*<cxmg^i`48Oao!
zo6zFz3TIRsC^^#Amx!7Js-yz72}?4j+5!K^1BI|7fsw0NSxU83sEw#OQ5!ZB*G8x&
z)uN=FaD|*Dk=pW+<*2pBnjBbxEILlC>vwtaQ|`~Yo}d&^Aym-TxnfnIfB~D~xS_wU
zL#YChnkFwtaL3vZS%gE?;-UAuM;!F)_s9;6!?tWA8=J6^H94;q-9&V{>(u0uuDR~I
z(T>}1`<#FO>#uo@2RPbBGYV<2;$)jvc&Zld8@W1}$$2iB`MEpwu!lV&UAtNM-~RgN
z=j^uY4wtRzWC(1xi57OdZ#gA=suWwwq|`|_+<4RfgkQ`mS`P+;L3BGEs)}(3PylXy
ziy+)?AP9^N;RvTrCvLgr*1;eD_`ByEf80@*!de8t{qA?)+5PuF<m9{G<6aMzD%fEN
zPk;@R*<l-L@*+&!cH8aakAM6FU%&H?+s^|GG{6v81V+IGz1Ew4yY941K&;^eo@V=2
eKxw(sGH(LIr6Y?H^=y~`0000<MNUMnLSTZ|UzSS%

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/publisher-64.png b/src/assets/img/files/publisher-64.png
deleted file mode 100644
index 9633ef3dd0caaedaf10a26f18f3c3802e67128cf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4973
zcmV-z6O!zSP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000v-Nkl<Zcmd6t
z1(X~)l7>HJW?^%;dCWVEw;pEZW!@cF9yq>RI%bAtW@ct)#xb*JOyg!OPDycjdX-Oa
zx?HvO-jc&FO3I?n?^lGRP+5rx?M+zxx>5mCQ&XIB^2yB1&Sua3yO-R*?&_;9Tqu{~
z-obvb7PJLp!5A>^8cEtngrmofshu+uQvTA{-uwFd{^)D>-*q?E3cnr`|0wDGDuO`K
z&e{qfBG(yXuS#0wzYc;RpjxT$s{i_L{h6S4dg1bm?x-4#&P6zIZM?@iaf6Lx3MwR=
zo#))%ewLrSk?ipB#M3vP`qp*1o?0w6SPbEM@~a6Tj$cVO6MZ`f)YrQfAOU|-rBeT&
z<GmK32(;nt6A$vv2X}I~JV!Z!7i|*P4w{BeJcfFVsWli>5xol)?p(2!7hZo0D_5-|
z3<64Vj26q{VUrYIz^Sh!z4oY%a1pkD3PjSr`&$D8#TR8V(aXCLppd|Ck7K<-DfLKr
zrBJcvHTyR6&O>{c4J-?}5Niyvu^5w%d<=D+c!NG0FgRb~?vayt;dM7NxO^F{(bgt}
zJ?e2`{d*UG&ch>Mtff%MJ~%kgd$x#F@J3{<Z4p332H^PcZ`ikm4<6Y^BLZ8<led-_
z0EGe!APQ&wVTR$^5_c?5M*gZBer0%C;e8)(vgoZ!fi-r(7?T&_kpj?#rSNY~;6HM7
zKaEg9u|UBJ4Fv>vQ=k>}5i&GC&mDs+x##k08Tggqeb{#xZGR<;Q$vAsp@RVJ;orJ%
zD<3_2Ac2Q4fzOM@!P8VAz?oGrWCI4~=D4G88TVX#bppTqcM0$N&goVF5C4_~{$t6=
z$4&S^gcyY=9K2v%YXcZE&^t5Bvx-Z2!39?`u;N632ZZBCfKrO%Sr{mSX3l>+8Tonu
zK`~D#U{PdfS}KCF491GW^a4-IkMP{{uV7&12{Q5`i?BNj;Fb+juanI7F6?We5EY9k
z0iW`UDAiO!K2}5%b38da#9f;%WAKE52cf-1*IjoVscEAb85-uzuYDtL9X-JN5AUTG
zL0BlD#1fz!a^OX9@V#0HCT4g-c93Unx|E@nD^4u<4!f%88{hZ_;BDE+Ncg|Ie-?aZ
zVTzf+5EP2!MM&qn45T7B%g2IB;2)nE<msC(IU(UYZTF*SXpq!wy-v@QZ@>R*^@YJv
zQ^OS9I!{9>PywlB0E;58Ey2VzkB$0yY8!Y2)FOB#;F0`w`VJ*&-+xwI-@~VU+a<iD
zzF2@u-~MXw)<4`oc<+|^DN5Opj5W=5K7i&-kHYnOji3_v$0hJjN#KV)Jdp~>2O(C3
zhBb)4Wtt=&NffS0G5t08iU!AlG+$OYVFN{g5NiV+;5%7lwSZSUny*&#aW2Bv8pNSA
z2i}WdPz)Fa6SE0?pNDTQo4rBA!OA?J9y`R3X2+QqLm>!p1XjShO3}3{X))ri#Tt}0
z&DSKYB%O<U&bfbGgsFuEp1A2ko_+b1l<T!N@M*uz9FQ*-zzcxQXQ5ofXyZN@N06Ec
z6vIXlOw93w%s>+Mmy*Kg63EyX{(k?@`TWdLHVrN1aT`x%L$Qxy7y)3#BH%+;{1Sz4
zea@%p<H=GY`ty0d@v~pBb^k+d)#?ln(k2I@p1vNy*Ur^AMq=$MJ3|NxXBuItiHN3V
zc}jMOXZYEkd>ArXDf8?d-(_w80Pnl#2A1Rs%;*MXt*ME{2xt)p?p$o*U~#Be_Xwg`
zlmZHTt<ii<K|agUfdPUrbdbLkzRhkhlGxx)fibAGtOblx7+|SY<ff;2Mt%gp)IlZ)
zn5tEI>eg@a^!2B5|AsR;SS|BVrQ~3&2(bfq@E9u?v6$u!+UCtW0mOq_@U}<>5ustU
zM`;W1dE2G{#)1z4+;u}kJtqCkpk(Qpo#l?=Qtm$gat52*TLnZY{%F?^xo!0Z?pb#R
z+ZSe=BP(bJn>Y^C^`jsl7ey`_N;+-|AYOo$WzfT;ya3w6g0zPhd^&X}fHwX>1ED{N
z7?_>ouHI!l_kt@(;Q^Q1A3eICg~0NXlh5VHvy=S61K(vqEMXWR0M;VLKx|xU6$#jo
z>*2B$CvnM|b<{&eC60kK74S2D%i)DWDQOB|@%-Juw-vxFiU5No@YEXgg&BsX=ec`u
z6)(8xDh50}3eeW_p3wvR;c4eE9mh1R<xs6e84FPaC}_eH$IZxUu%~*2FYVmM*+WbD
zyQ^;?H_+!!htiY)@Hvf70VSyBXvfxi^v>`dEod$^-nGTnWBMgzc&@_TeJgmurPs7n
zbx{zqbAFndvYbD-jOn<JAf!taVF*!(YXb#hoja6F4zfA6jUMI2pZ++^&NDqbMWxZe
zDuo6I=v=(}>y{Mg2rsVRr2tkNx0Vl=Yur7QjQkbX9rrLJs{+0~HOhvbepflxtsx&~
zc-iTj__LGGbD@q~*9{vAy}azq3whGUGgv<`1TN&oiEwCYl21SI3(m+DId=FU`wkvp
zdT!PMN)RA!6NH~E1&oMu=@K5-?{W@^fZW^y&sesW=U;mh1Iw1O*xUdE`x_<B85(h+
zubUIxZ7bF>)u{1~Lwl*j8nk9rPo6v1oyxAt0{?XG#k_mV&-kw&d>bq-RldA$53jua
z30$;l9X~koAU`{Hge`|3LKO=1508*ZS~v1qJMh>FB_*r}6y3s0n_2)Kxeu6~<LN8c
za@SSYG1vy)tEX6-??FpC+e1k=SkP`S0f}QYR%`cMIq|jmB7d8#Bp=+ql|$p>paRAg
zN*tV-=A4zQxN_rZoVjXkBE&;{ddCBNYv)#X_P9KGZFpn}nM?+44E=GAb)LN=yh!^f
zh>lK9lA2SuR^jot-NNv)<yfQ*yx_W4P=H_R{P*A{y~LX*#j#jMGCBIf2trtu2ysYj
zFkp?Lk$6R{+f!7n;jEL^uztlV_RUQ4-Tk}y*}?rBJ+PntB}*7tu@c?a?>9vvo!~nc
zL%&G!FSR(17uKC~*3sb=D~1E*_>K#o8deZIyuktrYb{c5E~VP-@m-p%EffKmP9P7@
z&VT?$yXADaSVRG#QV39P#LStP-a-%8oc(CdIr((<j2>b4p@-O;-1EB2dQd@+ANx-5
zol+ov(>w7--2eA4dr6ebeL)&pb*Sgl2ykv)*R{~x)HwKhQ-IhID_EWH0pQ=i|1DhP
zq1<wN{@M*3MDzB2Td5g?JB}l96}TFs5C-%|S*}Ua<K|>8`Rgxz0?Fo(itP@*(~;O$
zzVu~Mv(|F@dFTD4SD4Wv!<`Q^XfACjyx-P}1(gaQuxnzR|M}L}=|Q>v-iMC?LGuTc
zIxoEJ3eF#1%CTCNZ%>c2r#kOomSzjA%oSOxau~5F;Kv8|F_R4mvRR}Yr#I9YzC#W~
zH{5h%%K=8IT=n3cPI9b(h>rkiPNYU-Y7Hj<DqyNM&)3H%K^uQMTdTuDiRWH<HFsQa
zApp-@wch!RZt%eTjPqml8YQjC1p(Eh{odgN<dS)yZZxS0w1vmD9a6v;%kfMA)d`+v
z-H@)&IAbENaiCJdB=D&K7!B2$dw=R9J$?My6K>{Due+YbHWX#Kc6hn-IUTdFvcS<s
zjolMt{P^f0dU6}7X^m15bcT10bgTth4Uy)9;`s1BXVRI{MZnQ|g~_<#W_%T=DIhHC
z>E+4iUVsvTAfV7w;OsSPID5rP8e-|e+q{k)NHNNgQHp`2J->gL^MT3UL58nv@X5V9
zIJ9*OKac_#gQ)iK{L+n3XX|)?sjNkbIN(FIGIMd9mcUTg%}G$RVd)B9|JWx2&_LKx
zp67>?qkKFG=NCWfY*N!=nTzX8HySJ$O*RNvp3So|Uv&K?N&EcYyV&`Wxfwq9i=V<U
zXsz4AH?O)Epj&v?HP$KraJ|Zc)}R!UPKJ%RxeRJ-tVu14;*3Hc{YwKk+QZo#snv{W
z?kcS-l_wfCe$W_45LV<0oYOzVDZK-38@_sAh<mTO5n~L;j!n70sh|~JK%hekbbwc#
z;1QH@6CrW)kBeArnu~F>tk&A~fdr_|(OTJ6nL(g9rKg|N1gIF}3Z8ni=t-cQkJoE#
zo}1!BNB1Z2A%A}IIb1xn6o6W-L97i*sW$LJ%QDbO0Hwey&>r5kHm&f$rjEPmCb)KO
zT5^xot2~f^jMr+6<Z?V`%_*dofTt1Q1ZY^-cW$r*3bY8L)e?i5EPz`YcOE&)(tIz{
z0p7K3Ea;Q~oqx1Y=_E+=pFhzNary6-x@z6^EwHB0!$m{OSXC&pDpw>-)dsh8HpEaD
z>nh8JaV^e`YnhK5TrjwV(|QL0*f%!Hmo`5@K9lVPpQ8M#b3p4+m0t#No{B)A=pPzn
zc~38a2pg6zrL1EIF_6h}VG_Qp^F>m#B2;ZU`ps6Xj|OqiQPqZ<m#-$ZFK^w<Lz7cP
zVb}rQ-&@xLq$8?CwS)J|pd(fwem5CrGTeFRQ~1mEXD}FLC>z5A^V3Y$YXnNMB7r~6
z=RY-TsA%oldMZLX`c_jn#!ZS#vN<jrSx#y{*uR%vav<&D0lzXh?<NJLyWi@tO-H=K
z;7045zClKEc?bh+peO{9gZs(Mq>Bb`PzXY|8e~;KtqEH;I*kS=#(X1o@WYuL0ORF(
z_D+nFiK341g0z5lnF6XKyex_U<=;=Jl-s-j39NPi%W?&>VL*Q-%cg;mMN6NdFUoLs
z{}3B``q*8X;}>&NJY20X6W82Xf)U}yWj_2rwrdOPmo6h0W)P9K@IF7gPXWL~wuKkJ
z6;>*hOx%sGOkhtg_Toa@XjkND+;Yj<<oR?K2i!;>u9le9v5SC{3O$_HKkP(0QmgRI
z$%pyu=poh@`#68l3FlJc%Mb41^7W^1_{c;@_?GzWY7S_+IxhU;VhEHgUBRN90O#}#
zkPkv;;szzH-P%7|tGXiR@hjHijiwmA#FYhhEzBmsqX@#fM5qfA;5%2J%u`owV60Xp
zQUL(pIkcaHwF*yPx0Httj&_9i1(EkIB0!q8fI2?B|8nR4hbwX5=kyM`k*`{VC|H&+
zCVflI8W$bjaOpCV%{f24XMkPhIesub&KJiI^Y%l#7z}e<vt%WIu<=YE{yVoI1A~N7
z<nN^oyns)U)Vr7jyZg@x&2m^HG{m}{+(`-SvTV-n<*UY}09u4%Cc_m8NRsQcv%XA*
z3kR3*#|iAeopB-0U2~cf?fcVX>7Ie9N|{d_*g<A^7`GKy?jG90yVeRi)>tbo-eD`O
zP@Ukx?ZcJ8r9(^EkS(|wdv&frA&gK#Kt77-w^{f6a%)(g&C#u`E%b2Lnv;3j>Wxm=
z)G9jWPcFTVGahvcX5S&Sv7O-)uh$#y^(YfM=x*i!|JVZW&*BG*1^(;PpW@UX{TQ(}
zJrG4FuE0-@C{*(`i_j_RP-)+%h)P^r_epp3-kZsA;7428HhPRJHlB*e@!@Ua^;&~^
zBWC5wC0nB~oF>E@ptLrNYk}eU`Rd*{j)zl%7WgJywccQ=T*6rE@7q5hE&UEh*BvG>
z57v4w!@WJtt+1fd8Q(g1;#fQJW@aWIe#QU(`;9X*GdsdCTpR(?b_rB%;6bn!3b`z6
z^CKWF^F{0D7Kw6PLDEjzm*c`as7BnNzqd$FPmy{YQ?JJ~8nJsVU&x}hW^T5WtP%&u
zU;2_ie!})`TX)cEMA9}IRa<!cwioL!yZni|^XV;}t2z{la=A<t!N`(Tt{iS8@a0Mk
zV=R4rMHc~+lXGm_zGLF={^rF`I<SB5Pr9!LJwZEo-~X+```kNv^e|DVh-1V2LWPC0
zgQvg0NEj-{#;4ex!2kW<I{5F=!2$$Yof8xuL@cwjvo73A<(hMA9Xvshz>obu{LYEL
zOW^nK+xuNQTf1fO1cV3h=MB{AF{M)VSAy@H0w)%{>!<L5ivaU0!UF_R6p}cL?F55w
zt>~1ZukTlb2ME6S#V@gK+jb{H5GX`WOnBjuf4`8=5{ADTJV0>kt+%jg)1!I$%U_OC
z$_as-Sn&RHetT<-NoM=$Uj^RJ0dXAjq8Gi0d+xc%^@A`x(csh8<-N5+rBWx^+x#l<
zt&`we-}+W=x#bqoTH7E9PB?g*c)465pU*QfIW_TDfBC0RX~L@(@6sXw{~_di-}~O&
zk;8|!oOb$I*DWlRP_%4g+xA`SfsvN?wSoa14>kSP+Y&dloBc)X%-{aaOYTiJIllmw
z;|vRkZ_~bW<67^MdI}yi#mEAjfByMrzx)-i{@*pL*Pa{e*dGu{OJ%5hAAHkp<QD<c
zMb0;ci?zXMqxSCIb>u()<DXx*W5<r40r^GH#si~)xaoDE=33{(&DX6L05VMh3V_Px
za>c&h-c^ERfk+@Ebs<m?01DM?TOHq~eMM_{3f`1|!na-xl$1&f3-x*<2BH*xk(*Wl
z9DKFub)W&nsQ{!RIQO6_Sm3W)+zZ$O?wqz___hVQ!*dpVx_bAa-A0U55Fa5v1=^Zw
rx$X?1y84dpOgdjXlg{FG^&R{lRjw*iy{lTu00000NkvXXu0mjf@-U|t

diff --git a/src/assets/img/files/publisher.png b/src/assets/img/files/publisher.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a51d4701b98d6b249a72e8fde31a4b07e181b84
GIT binary patch
literal 1424
zcmV;B1#kL^P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000G7Nkl<ZcmaKt
z1CTq*7RG-)(>=*1YbVz>o^9K<ZQHh0ytZxI_PzhLccV!%Gu`J+B~x2@{HA`>sH*cF
z1WH5zu-3geW$z%+(HDOD<NVpBf!7a~%fr+|8&&G;?L700op!zcQ_p+Rbxy<xAoRYv
zs}r=*{$s}Ia{!cc4iPCg8tn)2$}c{+wZ^9(x{0eA>$ICK*r@P=B+oxy@;Y|kWf!)>
z5ClXdi!De85Cn08@>DW9GI*Hhse80i3W1=Yb#VXsDqp<w8Xl&_s0mn#V_q;Y&Oe^|
z5=v9kRKg|-5dM!8I49a#n^($1KX~tb6oMQZxqvU+bqz}@VO-}~ja$6V7WmE6p3CIK
zB+V#7kpG{3&zVg6@E1Oh(q4N`jD7W!W`~zBrSr6sm}fQ>KYhY;*lDUnt=&Q)s4Ng!
zaHP9<-7b)H+6}!9`tiU28P@pExg~B87{g-J<i%~xFCYIr+Jgm-TX=|m6W{|bv50kG
zw^x)1)mnqSM#kBDa*8NPGUG0KY<!Gn5-V1=sOc8ZQG@*ANzY-u5O95UiTy@L$@!XC
z1m$_ulbFa_B&)^ueS+0>HaDtx>6~Ocd+DHQMo1hHt!?t+;Yt4TtQSyBgI=^Y!=jD&
z-W^wAtkAC1cuM~$uigJ3oc2*lfe4=UI;|N{9?o@V&@1i778ka7x!2DhpYc-4Q&Zfs
zvBE$u&)#01Fp0?t96mP5$v56exVpgypZ;_n3hPALCtoNK*qCX^1`W_NgFElOo1t9Z
z{pB@pqclBDGmh~T3>d?%eFb(?0V0kQpZ#*)w6e)Pk37nArgx!lZHdz#dw_?dkiATi
z19KBdRzdfngZGrQ_b(|7T~;oaXhkuIpd2_68rI@!A&ZO4{O*RUx$@q7c|vJtZU`$}
z->$RIu6yv5@e*6j5K!IV8FWzSBY*uHL}a~MZN`EaK_Ski2+MJsW~I*Z+#<hA6FGe6
zUHIK=UQcOokb?_@gyJ~6UMEUo;v_+!YtYjqZLRA%X8l8fC&FeFu_JM8t#9(&bodv1
z{8QXn-(s>jz*f{|CalqRj+gDSCvPtAL9^QIbij$w>!8WhttvCIjwUg&@u1Sc?^Dc0
zO`LUTrC5tv%r--=T3@1?MEvf6CsT>47~>(CLFUqHAZ$NQ0HGeW`N+#(%8N&*c&uLK
zkbw~ZLTg!1O%_@WUQynS`)79W(CjkLOFzO%(gr{>JhmlS6@YUo-Sb-xK9oIn+ZpQ|
zL)x&On#SVTuYZWg50CM@u@X0}%wv4NJG*SinecjBL{^2f7DU*!P-H5|@o=NYXfBVh
z6r<^RJfCMHX{QDg3@VRnD(e)q!S;O7g1`_M-P5A10_Oyy4ehx(2J(GeI<rPw9C^=Y
zM^?60iavp@B<2E{;Xn!$a(P4?CJ0zvSy@?_e{?CAGpHm<5Ru)tD&YgpIwJ@Q)v3Zd
zhs}oOoWo`1rz>=TI7!mrhC;E3LoqWmTmQ(1-uv3yZoBzn0MGaRtoM>ZC$K1m@;v+$
z&r|rmm*RKOo%`-SiDQ;mSMjvr(MKPvy#IagcwH780B?DD1+9JP`O_f9xgN5!I7doW
zMR&E%;%m*^++6sP55M;<ci(l#MfAu!@W2B&?zrO_7#P5qAjP0ljL|8ki#BMJp}UyQ
zswotTEX*%d-uK>jzUIz5ZabfUlL8nX9v(mX=;O~Sm3P`Vj^ji`ln5%TMs0rpy65dx
zDbHJ9Ur)aK-EVyNj@xfN4JZOJ&;aT{OJye77*k9c5fLBIfDd?p>Y-NxV6BZ(g+Kr#
enL#r%Y5x;5$7MMtJjqW00000<MNUMnLSTZvRl80A

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/quicktime-64.png b/src/assets/img/files/quicktime-64.png
deleted file mode 100644
index 90f2fbc0d1be90723eb5d6142b59ffa971f3e54f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4664
zcmV-8636X{P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000sHNkl<Zcmd6s
z1&|v_((ixS-C_;f9(x&WFEbo7^Wrg|?>lB@W*;*%Gvo5^yJd!FI<tp8B&oZrD&Oq5
zBBYZ?Bl&qFKIcS6Rl`X7{X45VD@#<B)}}OH7YP^}8)M}$$1uKocXsvrzwxpo9&_<o
zBU9D1RL+4aI0x44Y2BV<YaM+NY}!65_uRQv&7Z&XgD<}RY5#or^PY)w%6(%BfY!T+
z2tgpUvX%m<>cg#d4^~wH6mLNgP_4}J*^hnH{5o^k>h4Ee^sMP>jhQG<;2f9+cx%B}
zjB)g31B$zMa+DdN_n^ax`UXc{bbQ}8jxC3^#A(nB0ie2n0w~CwX*LsG9t85Qjs>vR
zy`fTxKe^Dg00>OX*T%E_XoqFv_%u_JBeWJZ7E<r?eS=L5%L)NK(>po8dz_a(^b`&{
z_z;3HU^cO&PHBE@>fuokKt=s=BdUTnVb@QAs_#P>1oZS2-;l{fYdaC3Fb97}nwld;
zghmSmB&qSqtua3u7KRdKGRPC87B}Z=9GE&hiKRa)49x7{!qNz99(pppg9p=Ws;xuV
zqb>+rzqk4S>hLI7=O`4in|gc7C#q_N28*0?dkLVbJ+J_LT;o$a5`H!jG8PDxQl4CD
zu|9&GfCB!pF_6!&bY>gpb&av+!TS%-g7DCMi#FXV0?xV~Yi(YY{}zC@R)=3Zl=6$I
zh|x%>7K-GI#S+pemLfP{pcJxnYAfgEhgoy~6YmpvT@YTIfYtY#hlT*stR_)M@QH_?
zj2H<6;(Up$wKxJ42LyN{1(rm@l8G&xm)XghbC08U`TsV&@1rzZ)DirylwVGTj7A|z
zu|#AYssV%^-iu&>!4UdK=itK~tT}5nJ<AU{0N?>-;Rq0sMd3fWBjq>KA;V!rTq+T&
zqJaQP&;V~y21V%`+Qw658!tX{B|R$+1b7A2ChRr>gn{5{H9oO5;a5{3Lt#LgFA_Qh
z0TG}<1S86z8oGzK@D#U&7oC1Ay$1|DD6K7e_`@HLH;lC`>FeXGpZ`2x9?SBxQ5XsY
zQ!MTYdrvPxT?7LRI!k$E4nEz?3r;<T-h&Q6c-4gkxa5*cXtZVhec{K}&jf$9OW2V*
zl5&A4b+||f07Ag+5y6PC)EP>{n|WGo6VE;Qz=U5c-H*b)rFg^DDr7Ex&C9No<-J>G
zs#J<4vc}>x00ICn0vHYU!0(!apWVoFPCA;t0~lUgya%FFzIQd=Q0P8vp#P;ek5-wM
z9FehD0#HBz4FIqR%dMd_bT9k{o^#?c`ve~b0U`hbsyJ1wI#lm__;wcAOb^}=h=wXA
zUk$QIY;YRVY^j7CtcK$77M@n!*b%&lkc}d;0w%68H9f^loDdsFCJZU&GISSm<T5!D
zgqn4za{&7dU+=e=19BN@6absaAe96)t`6a^r3foXDGY7pY4IkWbMmo^!iz8mm%~(M
zxq1Bt{=Q|DYo;6<HP5)@NP-NZKyLttMTWDwBObZD#M#Sx=_(YMF%ESK>@PfMi!l%t
zO4&N3K%6)<bzm&2-~<3t6%Gyz<z3r2-)`o)r?iGwlw2l5#wPsr-`Df$yGFS@8pQOi
zg265b!-kuc38!pwj?1bEpSow3Q#TCr@<Xy*a6~`3Y?g|#`w!nD8;sOCz?%ThA$}bX
zpaNEf<q>oZZ|6d`@VwJk(zl`&JapxAY}>Y#xBT;Feij@GM?3_w88B(RPN3igsQ04)
zjk>wXcJq==6}~$(#wS)6Idy3_Q>kl+g3jS-gkQh{tfR^Oa<=ZvLPzh|7A|s|dBGy^
z06m2)*W7#y5C82P{NMxN=#xMck{Fx?Rd8Cb7HQq<;uy$fxiaqNF*l|B>_5Bdj@Wnj
zhI?DhhY@bC2=J9015R0z59yoO%7vL7yzs2n3mZl0&gb~&wKs6_b)!t2^k@%WtN#+G
zU_Gn|i28HB4H}+Q>HwIMJTJH_VcN~`!XwH|8okfpy#TtG0Gb*!HuU#IEScQO1^FRf
zbk6ZD;Xx_oa@=y)-8}o+VJ1#~BxnlO)x$fzS0Le$%Q8HqH{hr|lme()Wkbbr`Gnzb
z!-lDv0|!q$Bu84S@z)`X3qoFdmti1R<w+~@Or^kn!nck9t2kpB$OkN$-p&Q(QC@ui
z6Bb?1hhfOf#27ET^lpZadsH1B1*3!lFFrEMYYz@NCgV_5j8mK{0z9Hyc*$Uf4M#+L
zeoM-his8qn7MYrMTv(mv>fIqmgxB33v$`B{STQ1Y+A+K?B1C{X8r@n;e=cNMWd|1)
zhk5Y>7l#L>6a}pP*L7SwcsgW4FxEeH$3Ry2`KblIa+Gk07$#FUAI7s*sXCZ-FqJCP
zMmeE7%egymWNOPMHc!m3w3y`wr+4wde!x0*%{tzHPmNF%_5mKHr3LB~?>GnLD4;aC
zgY(N{ytsohRyLF2?v0!H(s&-0u7ETJRWOd;jPT1-@;s%-G8Q{xU7(EBFnNCepI5Nv
z_Jpg#!+7fdnc~igm?L{~JY@VfsLnzNzup>i>1awJlzoA3od^v?Qdc7knc2CGr*uv5
z{QI9e2Y*o8^fnj3_io<E#Ndfw;`+?)l+PYl;K3!wSfWT%dfN!!JqQ2m%dTe4%~jHs
zXM;(YTaU5k)*6qWy`B$m4&l%;I0MG=%}p^68OU@Dui82aq76Hyz?(yu-Z9EYpLhZT
zbMUqed=LbTjgIomi4czN0~3Rv!OuH5%QKh2MC{tY=lJ85*YLvYCaJAF7fcLR!8*=d
zRwfx=fzGvJQ*eq3T(Yyqy4fN}6d<wf;M**QZvWdq>VT=4?q9und;f|<`Xx|sy6D0t
z7e@Sh>n_&kmx4CD;{$m0p&5*^=wk529Dlp!TAqK+7?qXx1Dk+#^Hk4W-OZ;?EV6BA
zfNyRdVkqcEoI@05DweB9Q&t|HCAJQrEqu!%px=Kb4VISQ@U=HZxx$|@v(j!=7m0G+
z&=eGpz~>EM9A^$>IHLp=(+XbcD(1QL+8cQ8<-3?Z*26movEvylyZHRcMW!n;gFPi4
zQjYoAw1EIn1?#wWB<A^t=Q@F3yd?Jbzx@?&IOkY(^6A(0l1vz-zukJ?nS?uMEEEc0
zEdW^MfxRJlQEJWbzE{fUxax+RdDg$Su>05tfJ?zC#Fh(=>EcVLmPq0hqab0#IsFko
z8>vDe@8=lDx~Y_!Ds&3pYBBW4M?IQmo0+M4@Ye7M7-QI;22c#ZIebdX>Z0I$zd0Sx
zW+Lv{xQXZdZ3AP+JP@4mPu}vBqr3R(8D&h8lIk81qrwqgSxBpBE|2){8Lb#926Cbp
zr6qjBL5q5TbuG6Ur4_utYK*0#p+8m6`uZYpP8VFy=fi;C-M)pL%T5A(+Fi3e{-`qF
zJhKaJfCq32<%|&61n1`%RH-D6)Il~_9A33uBD4^^2WeZz5+M+2+y<X_+X5cIS;x|4
z%K(8mg^J-(N0j-_IXz%f5)WTD#aW9pws8?ffP!dS_;zLCh&I*|9wiDxx*`GN{Eu;9
zm0dN51OXWKDrU^4hVxH6jN5dIKaawL2g`i?lrBP(QnSt5<4PdH*i03i)N>5$=n93L
z2<jGx_ec9IKu5c@VH9#iA%toQk>GzEH&3K+Xa;cq9R(gL3?n{vdOz=RP>zIJno`rf
z;Q>N{TX#%AFo0O=SF4WY#gI}Y%*Jit6%_Vq2y|Y(m5`Hq^N`f)Ie;iv4#$k8jzAV(
z!&_CV))A^>Cb51J+Z$dGDzh_Ox@8LT#d<x#I8Nxx5{c^oUh6OmctDeh0G+@qB&wXT
zyqn1Q5OoevHclk`WoJw&lxFxQAr>!V74liGzWx7l?Q9W(0Q{N-fd?$lW2|-n?_2gU
z0zli=?PKFOepxSP<`PK#B<0`JYwwz2B5_2)|6dI+3<J{HDL!@iI_N#rr@{_W%OO2k
z&R&+In!1kQJ<7fcK-*0Vb&f(I&(jYtK&=W+5$h0vJ4R#Pd&_PLAq2=i!HWo8*^srr
zxrD3C!H@~TdRXIl+Oa(>&4TR=-t%kc0;vCMzheWlMmc}wQdVWEU>a(B0etQ53Lm&(
zlv1c<LqR)$kD`$7T*w!G^;bT&E`os-h)F>ewT^5q<k>6B#Hm3$fTwYYG<z!n(9XB3
ztaU8uD)E*R$`IF3|E?BQ2;d{PR#<b%Rwkxr=*@*>qY$7G9uXlEMf4PNR42!H<F|gp
z+inF`tU^pufB!2avE?h*?*x>9_VDVj>%PARr5(ICWjb|Sv}zgu+PRG%Y%!1(aEhox
zDEx4f<Ff7BSaW2=6OQWPu>LNxnJfx`ki-ewcJ1VEx31^ww~VkMa|EmyKup}2&LSu(
z%C~Qsq(3XX_1r<GlluPuLhvYyz6Zq^+x!;jpP8wxOH<R2(D7bfMgl5H%tim$$<-qu
z8J`z;S1S<5l&NrhKIVvmQVcA$IAzoB8h1}AlR+PJFF^tYYk<Zd?^~ZKVk{qj$Woql
zd>>V-E#Vb#^K(^he8uvCV^wv$tpL+r0HHm6bDlpk8}qD7hPifE3K>BFpCfn%sqZ~l
z3jkpRVSuRf=d}KPi331F`S0^a87xKo;~7U#4#4Qb@P6}^LcT6Q+ey&NybtgIP&JMv
z#VkL6<RDKyDi5(m{p-;?;tYaALXd2TL;)fWu_;)C7Yj8Otr#A&s*hKl*@q@6+7MBo
zq=?_TZw>FWPke7Lk6Q5W8+^S()jCR<h;Ki1IgdPeijUm1o9*K<2oMN@(v+h%g|>s#
z(c6>bH4k0J%TMYhV`8?CO!BLB31oxDXhj!=_pMV*YH+@k-q9qe2(s_{^N7z71$f@d
zZXR=Ji65_@;b-fnxO1e2iyK4S!@K(4;89BooVTi%XCK$Y;YFCN#w3C8p@$yKU85W4
z+(Ibe{P0lF#o$$m;{-*CG9k`s`$=$Wy6WeE{okLDL?}csZInC5Q*IckanE?d(5#_i
z9JxRkD1@x+%W=kFo)ZVM^hPinrz95eaK%i>4O_?g{OuLOD8i{y&PKfFeghQL;1+;)
zs>HQ~TAXmi;VUj%KG^?IpaTJ>?iC>IM`XX?8~Xxe1NJ0D2-e>(fS`yfiFMSB;yeWE
z@%{H_Lz(l?UjXBjN@DO|fq1dh?>eQaK}49C7~S#dPkrQ36B846hGEz|1hhpi2y!36
z<D<N0m8wx-Z@^Y%ETwLVQDT!K2uYgIRW35Pw4c-%;y5Kq(s|%~A&W7F$=x&jXY=Oa
zH^1rCPrc*z+wNom3lvz$LGCknWg$>#;O%%-CkV5%v#3j1J~%)S2uYkWTdB?G6j3HZ
zoiaK)$xXN1Hu9=ht~qZG{<?i%4XWPv@U5%2ov-Rd*uH%$Q7ELTWoo*@^lS}l9o^kU
z!cZ6*9^;NX?i_i~yWV)-#trMPVi5~y5dsG$Jg7Q$@7_Hh?lZHsd3SCPd=LmjL-)ep
zHS+E`_zmmVT}c~@SjY}U_@=U2El%gl_npIcJ_HU(ct!E>0P_)G_Y)o<h@y}=r^ya9
z_`O$jB6M}_A3Q+tm%sd#+i$;PUW6bJR1Zveg~sonuNQ{l{=owTk9*u>IsNq0Si5#D
zA~G)odf>sM3JvM4wU(jb@%@4a2msPF<qdCm18df-nePW-c)-E?7V8|&DV0jhTyE1j
zd?%COH@@)=9{bqGsxig|L2$sqJ5^?9E9CQeMn=a*-u|}NUf|(nFYnMI-->s=>Z+?I
zw{6{W>#Ef!JbZe31_6}DAK$v)oYm=G_ceog)5R;gpg8A96GM`usJe-Fz4J{kolA0V
z0tNv92PpW~_q|(uzv;SqZ~`wz7T}CC&Ny-Hr$6_pLk~IZ<kY18W<+(bm7z5BsW+{j
zd=oGojCn6yYAn`RS-0-)Z6EvS2fldcop;^<<eQ*v1F!*7?=esVV(+QH?ivNicmWE4
z<Z`)USGjzUqFEqP2*JA&2n2v2zTMktXnkLr&*5<!Z`bAvbu~n1W~Qg(I7xvB58vdr
zSpW}T^&SI>KkpiUXyDz0da(MrU@!NuO??{s&25Ww&CspRxyIqTK&b0NVt6-A5#onH
uYm?^VHW1R$XLM%T<`_WRh}X$y@c#f*YU{E-@BR1y0000<MNUMnLSTYErO(L#

diff --git a/src/assets/img/files/quicktime.png b/src/assets/img/files/quicktime.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a56a967678c604c7fc9626af485670b36d3be0e
GIT binary patch
literal 1399
zcmV--1&I2IP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000F(Nkl<ZcmZ{k
z1Cabm7sY>_bTV9iYyP?VY}>YN+qP}n_Oor9Yjbuc6Lt5?e^NV@r<-b4a!&3&r>-={
z0HBn9LNX4yt{uMj%iqcWYxq&mDfErDo4T*!dcb6~<~*pZ&wc+B?{$tc!ZCm$JEf~O
zNJrY!jw6o(Xb>c0!1IEC<T0fy)&tIa^lP|zO<`8+P^t4oYl&|?dWezX!F%p_!5c`w
z!2r#@0Yma=gRn&0+0lAW%Mw>fAp{28qAlF3Dgm!ugv*R1Ul!Dr%M)4R#}6E)ueX<q
z7a&N1?=%ExZKP5vFNB4>{_3kJI+FEbH?NyFT$3-;A_P?g&#X@K-3N8k-Q7(+j8kaC
zo&SC2ychDGk9`XLhbOw*KK^Ux@?4o#2SUs6qy+q%lP&Zl;C`&h+ZIx!;DOQvT624F
z8Y9af$9{GiNavAPRxOAlD!|i&S-y3!L{Co-!WgVL;G&HhS5^WX+vc7fMaEilDC<ZW
zH8jCfA`DG3+1}Ys5NW|$jX2OeEdl@LJ=zoSUZhc+GPA;mrWF^4MTkp)!Lef=(Gv32
zu{?*%l4?w*JWWS6h9n3vp(fn*cuMOwKe%UKqvq0R{(9{qub6g-bDfOe1@2ok_>t!9
zZOt`-;+YrL`OCcvjF)WcIzx~N=>lOK^K@s0?>uOvQI=R~<~O%_=gko3+xft#;6p=#
zvSo0j<U1EHCZxrrY$0#BNOAnbS`mQW(}0Wy*I#-KZMN25fAW6%`%<^GID%hJ@3Lmv
zcyW*63!@g5NTV&A|6M)L`!4snM_-=4u)^i*MNV1{d19ZWrqT@3hsKZ(z3CW+4^N)b
z-~SN&AV3K4>H#NgYLFIh9k2+L!L}@pzhQyrpX1Tp)y1zL(84h{hWvld<J2XeC-;?U
z>d;hKAb<C*&yieiR4VnzU>t$KixqR8rlq7Aa1EgrL{Y$pF0N5*>)`JXDlt*AxYPyw
zfK@NTkP$jlB&k&DXE03<yS7D#4NG3gR+yu+0K&HU^n(ZKFGwa!qEU{`Y8@g)i)adr
zPDYkNLK;mU17+9Yp&c$)-RSe@X`3(Hz07(5kLz`bmBH5nHxBsg)$3rDctB4Mm35KH
z+BA(!?I19Mm+vp}%Nw`&`sF)}=M*nGP{Lp#rJ(A0eCpI2Ic?RUSb_(2JA_K3P1@|5
z@YxKqCGum#eY;D1WXk6==k4&uQxd;lv&nti41N%C@?4FJ*96!O-fqCB&s^p^kM2Vl
z8YJ1smI#b#idBmZ@3~t$62Vt4+Tz&jeU6PHP^JMq)?eU>!#RF%?i#0DS7qe^ik^bi
z_*Mvk>pD2n&Jb|x#-$DT7~XyNHl8w6;N*Fa=}LqxV4~gO(aBwJUNBm;nDL<KSdG7T
zT$i=g)z!s?o0oGr2f0_RtjO8MwG(KDOE#~YYDJK~7b#6W(ro#OHsh`2TnjDpXe?%D
z=c;df!>eC%$t4#q0!Z7oiJ~~`;cQ=Tj6fgJCAD+bjsn5@ZWZ6Faq#dMH(r0k&g)<I
zisxN<#bqZpHCS0$rKhJGn&shk?Ki!@{Q%HfV>=G>^Yh*t-|(szCg3NK2{|=2$@jkZ
zeV+a77f|!OEI^h7y?3Xx1W+uNxb~W>cRu;ak3R46%Pz@+rv#guo4n;MZ?3krbzamz
zFgO+^^)ki?V-O}~5PO;F^xRy9u&j-Zjrdca`sk-FyY%9#fiWNgYCsk6B_Ou9w|AcP
ztfxK6ah#3>)CMGA0~R1MBO3-lDHSH+0YxB62MW-DxdkGGl5D@P`kDX$002ovPDHLk
FV1iStxQPG&

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/sourcecode-64.png b/src/assets/img/files/sourcecode-64.png
deleted file mode 100644
index ad25537e4703a0d66166a861a56f7f5d9dd3356b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4297
zcmV;)5H|0LP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000n>Nkl<Zcmd5?
z1#la^x;=6nCr%S5bvdP!;b&&*WyYb$%zT-dnVFfHnHkFMEjP^Ipz)nEJKxMc&93bv
zcm5Ym6l=B8uFj{AwXRaBAih-K-*+y7(a}-t-n|<W6BDWDKmYmv{IG{T?512US4gMR
z8n23Sx$OTUnM|Uuuh0GZ*T1fO{p(-<@YA05wD0`oU;ZWURq)3t75i^ZIOmW^IK-7$
z0<iy3sZ_q3znX1>_^<?KXJ_%sSH8079QHr(fe-vsU8~=K`n6Olp{c1!1jE8Y9_u%3
zKz8-&;VZAa^4+biZSx$H@IeG?SQY{F=U6JK#^eu4gzwf(00Mu~?Cip;{d-2yLZN`c
z!G7*$4~B<_p<+N)tz9e@p|Pu0t-{RA3|d-RanC*XVe{rKXlO_vpU(#z;%!^SzzczX
zT*a<KP=(Ngt-lcUtlhxPX>V_NQe$KCwe=7nP4LGHh2jo@^}ut{1)M#58Uq7;n4h0l
zx4`<~RRx})TLd2IbPMjj`#x;kxG{p;Vp-UrMu82D_2*T>(@`py`To>}j`r3oiFX#E
zlGK8I0&q|}5Dos^xic6U8Pe{ev9VEr!(#;8L<k)n9hjb;*3RRuyYIzDvi@?wBMN-D
zZ6my)+Q)LK+|IQ%^L_u90H|3Ed>$7roW<DKu)rggY9ja&d@eEYZEbA?pQG%jamO8Z
zEg!tk_K~|Cx~ll1;e^B{)lC4~d4fMj@FN0GPy$~TWh22$=BK8n$RSO*?Y29`_W!To
zt*z>pWPRYZ^8z1e^J=Ekw0$y}!mYR7z9PWeWh4g(WK@yuloC6C{tU*)N7xqIr$V+h
z0k23WaO^k|4N2U5^KC0-=glHmsZ9WZlZKbJ_ra_9L=Z<bH#f^c(rny((=FJvV!&HF
zh5&~S9SYh1B37@?;!SUQ8~XcuY2yb3-q>DMz{5mP)qPrq5y)q{>86{pY15{a2R=q@
zli&N^_Yf}GY_{RlspE-!et{m}oGH98cL=oYyx5-LN1-7%+;G!M1YcEWC1tCvi0z;F
z#3%kU@pVj2P70jtdZdV`(6fTTOF3SD{f#Rce8s9yfDe4&1L5n;x^?URvA@6H+}l_?
zFP$Lpg~H;&>zPRsuTrkq7!t8?zwW%1q$0SGOeY!GH1pTk-Y=%`1YX=h@YUHqh{T-Y
z3wsASZ4M`XdtCDs6YzOy?B25%Nm>s9tZ1G~$Wf;oYlxN#-r6xbfW>ETP0-@>>w~9T
zo0h_>Df0rFN;P6=c!<wzK&CAN5w#)NpguZE<LK(zj^I544A?RoI6jw~Lb*~#d!|Fm
zneF9(*Kf28B(<Bq%d18C1kmE;;f;=tiA=ch#&~TnqAo1V<EKCUF-GY+Uvu>}B7p9)
zIxNgDAd|^Z!8SvlrTPW10V0I_k37El&97nGwyjvZb^|&$ZzZQRP-MzW2Or}NCj8i4
zlPsdMK68KN<jB-j1Fwb3Yy8SrzDOmRz%4i5OoB9Ea&iogJDX~3l!GPK4@Hed&MiYC
zAl>qVAAFy{v#e_vPfXzKnUf^iymn~O;O%Ct2>8*QfmgMi&t%%<-g40?dU&_i^zZ~|
z=gyrZ(nfN^f)+!To}?%w(bIhymoHx=`)><zSp_2$i{|E5^z`;{>^QEu<{HfvK}o;_
zQcX#XT{L(b8>bJGo}Bv}AXeq>O>t+M>D$+KZ#8f2y7lCiQTh=xko?;_y1Oqz7N)av
zqZFwTK$Y(pM=!xoOiW_mzJ0J{iMVC``VB~u_<6RmJn*$SAe_wT=xA3wuaK7D?;!XM
zu?kOYZiI7?L$!{|vL8x_sNWRmo;|z6I>rbtLNRO8u4>sN^~)FGI<hG6T7{y+n$-HJ
z6Z8x$8N5nDle}t~9D<*PcK&w7^YP%dU@E+ypnssB?TXlz`G8go4GqK34Qgi%oL?=4
z7S1e5Q96o_o*C$&34H&1-@(vezX(wm_{t(gKra?}<@%`g+i>TdcVk19WQI)LkAC!1
zvU?6WnzqrAA;uGH@cZBYjzm~x&-96GpzYc~_<aOCM(((PrsftLIs7}WYY-U{cX+53
zYu2vQ9!h~$1&_sufJ~T@8A@Z_%`{dO@M1^q@(_2vj}hQa+Cj~ysT`u*uB8@Vs~rsk
z*BJe3uErY2samk*6N{jgfbEBfEfETI#)J~HRJ2>=WYq>AX9dJoR>)?`+apbC-+KEU
z)xfJI7G%hL2AwpCBBaT+I7mK&*xf+beWl72aW?ZEGK&xa=myVF*C^L0YXLZ)TL?6G
zhY?DN&Vl|Ou5pvb3v4WSjYpgaba!`$uW6z#<57=#EM<O^W>)p>^K@7a9=uX!i*-u7
z7s>Jhu6x_IZKGAm%Dq*RGKd8LWsgXdwa8G}4G#38xBIdH_|LHCim-t~-MtsiN%<C`
z;)Aa%82apIKWlAKH+SH`f!@x}&a6B#d1qAvn{u$*>2x#MQ>m~q_$+UW-mzmR$7Uc?
z=KJ;{L=gc9v9#WGk!iTlVM~Y*MR6ug<w0^#N?v1a@YO`%GoSfP_`1;5)%6sD`5Gzi
z>IrF;8CG-6nhiL8`ZQTT4U=t?`7K+v!oXWG@Sd1zJc+OcW22+=D1$g6Y@H+uS6+1;
z11eeza)NU;!B<a-ee;{&MA!mcb=B3sBD;?B0oht1t?~hOe`+cRIXMRo?3Ge7wxz5$
zAxria_<BQH&E2xKONTGyEEjgs<sFhpW$CMs63vTStAmdVh92~w2f;7X({lza61-Sb
zUf%D1e+qdnNZBJEj#7@>HBZ28_bKxmGyy1<>ker(zdh4V)0bup5cVcPt{B62zVi)8
zY~&-fP}%O;yB|#yK|R|CZx^v5pxv_KLv}H2uaLI4kIJg&63_WMxsVomYZ>iINb{@8
zr&vXWS25^yhqNx?(At{8#Q2Dg)r<>7RMrA(NdcBb5IefMlv6;N_dM|WsqP3xCq2x~
ziy~mqC>E4JT`hp7_{_r#DZq;D-lD+UE;cr%DC-LX7k)0BlMmrUaP<qGCPjirEk_9P
zB|e8&hF&hf+VLu$9({h+C1rA)le~xBV(;0iyk{I74c^{SKLKiix6{@PWi*$|D1JBp
z-V|R*YZoy$J4;sX;Jn2pGo0jobVMn&un%BIate~j1!*Xy*W8rWnxeql^A{%qhTFwt
zZ;Q0WOrFx+U5B#3^5r@RJ$m#o^+75e;Lt4|;n+=!0&f}Wp5Dt?v$`WpTzQzdg^{V8
zCvjoGiNU*~!B<et3?$$cQ5Q9jsErl%>m-v5W3$p+mQu3?(Y+nU#N@aZS{Harx*k1p
zm=<Op3C;^gl4}_NWwYza89JJGG_R$a;Po3<5>*7C&b)mYDaI2DPWosW47^oo>@$Bj
zA#*7(!4u-aE99m9A7ps_L#!v4g~MZ+UnNaWo;)ssYO^${7I=fQSOTC9@WIK@v7<-v
zsZV_jt*ctJFfG`shA5pzpW#=SnVFVm7Z4x3`eacQjNy}?_%J=oEFAm71l4#YXny(g
zAK{n3_=$)k?o)qN@OC$<IN4KA1hUgJ^Jl2QvJS2a_#hYXo8SBzzxvhBuy^lXvkZP5
zU~a7L(=FZ+xW<%aOUY{u;-JIKAsjyZ8|sX;iZS%8*nEPr&dM0yd*6daJn5oH@HRi4
zZW`OLA-jij$7(A<V;NWVxJsH=XNh3^U>{FeW=Djyu+~nP)X#X~7*3r!rf?WZa*z6^
zrY12yHVQGuwyj%$V64fu+NyRgY5IqHr%kRl6{Z5BNbqVKoW+_!SM#hc2z0igk8%0r
z#JCowMKW63s2vr%h7%l?<I^wZ=B81Y$_oe@I7b#m#muOIm*SJf+03(nGiUz5=juI>
z`NdUNUq_;sW3;{}|C+Q20@(B#XLSk;fc^Wfz;A#13uSK^^LL@0alO73ken(`Q1Mw<
zgi;7?>}|mP1j_1;4%~gu0~i;yVtdzabYH$eC3p<`_wQ$NWwlPQ0T&D2<iB1H@Fbw-
zL1nOG{MeD-0^KdAgg!!<pbI+WpvLZ%Jcni2+BK^YpdqP*Xd~w5W@Y<%hIkO$x_0sT
z4dkNv8sNQv$ZBmXV7_&Ir?gT)lIH~i=c2`))cU_w^1_sms<=V!ZDdwh`a{l-xz@%d
z3bA{-FX{PmeU*hG=7gLd16mb)#kfzch#JWOOF5#p#H?gK$E50s<43vsYr={V`wtv|
zCMfMD&(TC9$Q5R!O!ZMES^R{>`kG6{c><d{x5Ba?>aPpD{VL;B5YdCVb-Kb1ZVBh}
zN|fq+KpNfHS-ZY{`*vJ+?M-kAaY_k;hkq@*Z^Yp-`wi&Yu~)>yARVER(P0rm#8E0-
zN)yfLR)JXrczb`I*W%I!5uvsS7?`DeoS+@wwskum@yN$YH*n#zvgtfZzXkIP1&M)x
zDNr)@M-ciparb8>^SJreJH`H-JExDW@X&`nk}*IAWfCLW$%zJEW|fJQXs*e&AEn+H
z<A>7-*LV@ogPdE^ml-<OSGqcT?^-1{^~o$6Q)w<_LBN#YFx##jR>a5qjX_R<*Yfvo
zzU59Tx(asf-p?_CISebj;5}i7#XhXojR3retmI8TH`Dje|Ma*2qSI|TW1a|9Voji1
z#%C#kGvt`AI>4O^#DJH9yfc*6p-CfmTY!Ua1=1oMM0n*7cPr&hVu@>@{t$QvCr%@W
zrFBZAb3;B~+*Qy!DJm(wpT5a7E?&Ac^wg*P$77ElJ9;A0+tFm-6`q=!qbpp>y5)YB
z;t??D3Xc(B1QDNh&5!Cl`8M!Ul=7nY?%638M=m#u>DhTDW2sCTkC3AVhsJR1_=(}?
zKKsd!JAdxXPZl2yRw~N{@7)hemt7|mLX!(3<N0X!);anY-4qXTK?zd?pPLbQC216l
z3H&II6a4d@^W?|JgEs<1o5w#Q`1s>0)iP_{A*~CzM$x6%eVV{kMLdB|Xy*q7{^am;
z3I5#KGe3rvMa2U519*E&-QcZ1m@nO+^!>8H$BDp-1aAUq^Th$B<$yN==*tdOudFQa
zQJGEWr0|vw-U#sZuYUu_jvW^f^f0|+MS|C5`2Fc-B}JD3-U#rphdq>T=yiDQYhP>M
z`T&)c2j1o(bX+b|w>0pc4v<svq$fQI|L_n0ptkJtiUV)Il6(0Kv$G4JZ?jbJ(Ms^$
z?|wHP`p}0~=tY&~vaU4nWmd%tN}CTeT6*R){_BYWc({mar7kmQlPW*?$xkNvG2@Ya
z`>!~Z%T24(_vGT*hB3TwZ(Ia0Yey5rW(GNfd{Nq8zQFi%p8b@6q?7YI02?d>(ZJBJ
zwN*>jw)<8Mcp@MMQml;JZn*NbuY2Qbwr<&WHNW4n!Oj4N93>ZOhj%b~=Y7DaE%QdW
zLa~HWvE<I2Io0!um%r#OCr+IB4S;43v;oy`QPLe$EU?b&S5<wwud!hQGzJ7fT76AC
z^KNTx?c}1=m(*v#uv$UF1#_IzGx02Fzt(nspO>R@*5TbSYPbp$DLKaX0+2NDUM)os
zK;Y+sDgq#{ej@-vL{K%L3G26OzZzJt4ZrRE`hC%$qx;HXakc8PwoeSJMUO*F1Y(Qx
ruWNvCbv~n>QmJumeeuMr?-}@C4(4Rfc3##U00000NkvXXu0mjfh#!91

diff --git a/src/assets/img/files/sourcecode.png b/src/assets/img/files/sourcecode.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c886348020303fb1bc9c545427f0b81f2f237e9
GIT binary patch
literal 1308
zcmV+%1>^dOP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000EzNkl<Zcmah~
zWq0F95Ui1BWLgT@QTCXbnVFfH;XfRI-1`mt^_ZEN`NDY{=H=ZuW{`X}{p1%NcV2m(
zG*Wj}O}C<&%_eO4esB?Sfa~hoh7C_A*01lm&hxx=l}g30)oQ5M>n4#%{&?x7m;JzZ
z3>eKn|Hv9Np^c7B8>8O?Lj^$qzR*)FR!5a`(z)CcMn{LSZQC}K%Vm^GCB)+ioO90k
z*mKW4<(iy`W|*6+z^3OPD=0@b+S}F~?Ko;!E2Y42W3iaKd-rY(4-cSHDZ_PLs`9zU
zaq6jOAe+rHc^Us33J8Lx=DP_Jh8`IivB}6XjggT7Nt#F`P_0&l)p5t2h_0>-YPGsB
z#DB4mT(`ox;DQTq-+lLW_4fW^N~I#KBHBhYam=yDBa_LX(Wr~RjuVsp702<H<PbzF
z=#3jUg7%!fYu7Hj+C52h<dMfnax%9E3}XytXQo7LChMVAt-*;o(d6M8stlpq+S+Ua
zWi4R{!xK(8UOaC!8km}zU~-MNwoViZ%UH8!HI|oim>3^rp)5)CM641-^}(_1*oM+E
zS{s~r;;DQo%c2cokV>a$R~_^7Q&gy=i>4+=NhE-#0>^RS(^AG?i%4ibAUBf96iz$s
zOtFRYfEn5m1in?recvi0AgaRirII|RXMR8`mBN7s9@e_gh!ptkx8JPy!KIg8f$r{Z
z@!SSIr>Y8zNJ6xCbYk`DbwXz6j_p)5gDqPYNub68NlS(Z704e1&e+(vW&8!F7IjH(
z9}3Xk-bp(ul3?Asc64@jlZYk^yq-O|pOJa7L%7#o`-jO_00C8pH}+XxE{`&?u}NlT
zr?EhWwqrPrIDqowZbH1~v*LR$m&1=gd<6yzRdL86hhyLU4un_=Ae(7B-e~=sWBn#V
z=8zeP8<*X(w)L_MAGe|hD6_%ul<cM12yWaJ6@h(*YwH*sgwg8b24Cpp<nFiML2?Eh
zKB}1&)>>;h8$e-Xc#zXxk^3i|d?q|^Pbs=WLI900WCLMkzBDk<huyn(%C~5GdJ=_V
zk>`*l;|8XuCb76UXOr`wH{<KCKEv7PUMM7my`&bb6lht*AF-+1^Vl`3P@|{gW1BEJ
zF^17iBVpSHP|9Iz9!y1XDQd6%rXQVwzgq-R0r54P^>FYZM_@NUA;n^WUDGZW*@N%s
z=#qi679M`&u{ik9Bhj#f88!if&l$KzM=Zi$zKWDu4XV=r%27D>n3M44Td%-T3TK~l
zA-?_gOE$t9IS0St14@#>kid5SGg(}i+7gc&C{Cud=~AvV8u)>Ub_)n6786CRhq>7)
z@!j+GkbNj6U1qeBX@-hnc6P4t@PqeU)7$&&r(kGKF@2RHf=B@Z@a-N%5%$`9KdwP|
z4nkOlZK+(u{s$Zc4sGti2kyFIXt3WVmvFXj-3F~=K*SzIKEF}aYqc=B?f0P75Qu5R
zPse=e;fL<InaMvvB%H$zI}|Ux@FF{AHH>iy15FqsJr9AFdk|;=jI5g0q_McLn7j9$
zJFXt+@BI*e2}ST*v##^mXJ35B>sfyg88*mJksKj1RI34kP+e<fYdSl3?rc2u)T2-J
z_x=6`fHYAjibR2^sIZ78(=^e>q_J>5?CKCIf@rXcv~-P80^kyjus}I1QvCxuKx+Me
SiB`4%0000<MNUMnLSTYdsd_;G

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/spreadsheet-64.png b/src/assets/img/files/spreadsheet-64.png
deleted file mode 100644
index 00427c0e7807817bf9a1901361ab6313ac5ff119..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5317
zcmV;$6gumPP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000z>Nkl<Zcmd6t
z1(e*z(x|_dG`!>`+iS-$+d;>SA%~L-;p8$i-@wnzbeWl%A<Ud>W@cP3dSO7&_2fP}
z*4a58W#5mkIpr?F$oo}ScU8AWi3qhtsJ^b0MNdx;Gp5g=ufH$-y1%;OeV1H4XW{U0
zpVv^I0s*ZR5`-$DYRs_?1SNIsKhmil-n~~2J-GIJU;5am9)HhU-;375e~$<N5}PQc
zuq;I_sp$X_Ss4WSvanV0<G`{kip3J2_}5SRyVdivr>>avhKf6gm99jfq57v<3u9|V
z;0r0co=Tsh#cHL#qn+HCT-PlZ-t@HzbrZ_I_N{6NW66Kb0b=--q*Kl_mZhE;wF5%%
zdy2)%zmL2YM}YY7!tr17_`Zke>N|*Ul?Z$b-&X{on%1+7?YTlB-2y`?R*YTDoh$ET
z;)Ds<wqn>V6T$-ugcu-#Hw1tviH?a;4Pg~_d<sNP+qPxV*qFa3m2y5Y8VBS;_${92
zPf<z{3s}k`aN*HC-{Pr54^j4eaIGS~XW@F_`$i)NoPvj((}GjXvb=R!2!97HV_T^f
zk=h{~p`H;ozPI{&F+2i+*5q>OeNByZ7m7%cSa7t~R69UK8sW_FPaXI+FCTvt+vy{l
zEn~S3Zqz;Mbd(67DP&r)hO#VaU&`%Q+!?~R{FmT4BRo{!B2~941v=1;K@em`80i2K
zq#FL&L*Hgq=c72O9-K@C*K<%JpfC!?MhIwdT2TX87B(;8)=TgDufxY-pVZs&kyH;2
z1xAJ14oHB1{_wY1ec~}v=^k=f7uUB@0-#4i;ghynkp3JC8kceNvb)a$cw<M(=pA6-
zJ$NpJUvuK|5Wbg8-XjQX#Eu?_1?bZ~@6dwRn`3VMa$db8gdcY{zyrdWBS0y2W_ZiM
z^UQ&7h44?{q`S!#TtsYat9ryKPyv>1q1cmUL4G+mF1nl6vjN^1QiYx500VF1S9~7d
z`z=<Vf=_jk&U<KWV<|u>Y>QY_fCQ~n`Z8RSUB-3u?>dX%L8vXx%9Sf25<l>18PmcS
zKKE6gKmH3|IQ%Gfs)tO*!}Dz%OTYq4sn`iBK$lx_d(vE(TE<m#@1$+~*#w_lRXI;S
z`6LiaYfGE``)%K}HVv)9(_Q5AF0St&M4?XX1gul=Efi0rm~AcRiaB@Ceip(fmHSR%
zOa>zHDn9dXoA|z6?v|#LrK6+^Ws~X<9l=}Cco$Fsf!oT^35OXh=dwAs*ML`mRKZ8*
zh~X6qi9Sk*uEu8pbA&|qM9<M^fLDZ<8hOC^=(k=&EYi@>FyTG>x_05I61X->bOa7y
zYz(~D#!#ojG#$cUG!oviQlzXjUf`h#P6G&_B(53alSGZ2PAqYSr(%C0h*ELMVJR#u
zJl}@|_#|-xt3WKu8LphnVps4=cJu%hg9BPT#BZn6?J!e9_=`jM4g-&E*&%p_eZ4z*
z@xbF88QhEG*eGnYfYy<U5JYwmK%mVrrVTi4>k-#LN4A(}K=)8Tx6Zwqw=KJw;YzU<
zd}P;{19I7_6RCh;@RV1h4v5D-T6~la;d^b)x0iGIC2`NEoh*Z;etx|1lN=n}$=q`m
z^O|XQ)0At$Qg&513dW3WB)(46obg;_Q^@3bVC^$(-n-j4J{caQ#u#ww3pNn1oy)E!
z@G&Y8yHbMSW7E!1cZxabOS$rrc*4ts@CSSM^2I;=9hXd6$e%9#4^no9VQ<*1_5>Y+
z8b=Beodt<o73FLdJ1T~k7z)A4q-beqL9G2C^2+cvszE0R)CdRYK%HLN+9D`GOF)Cw
zMyV^!g50HCJ?~ViYX%5G({v6T;j=IOCAZIe3yUYOq^H<L;0<9!K%*mY9cqLwVl;9M
zB2{f{6Um4Pvf{fy3|Ip`=B+gZL@S6rfY#BP-cyKJXnY!+Hr$>Ji|a1qx`lVqHm*5#
znAUuK^}lib1-Gzd%2k{!_mFl{h?vxg8+Zgk5QVb=H;zDoowBeb0*&tV0v}WaATfTm
zBYX*nMQXy!>Fd;T0I?_#t<b)O+0f7)P3cyoKg+_#72LG=E?OgafQ+5vv7Nsro6B&`
ztXtU8wTlBiM=%aR6Nt|_O&v7k8mRc?(>;z70v)jX;L)%(F<>%AeXhXx);7w1IUXFR
zSw;XxLyI^9Mh~AH0iwa|<Wz))hE~+cEQ^|#@fx$LYaTINT))DLhaU|?|IKE+E8vfR
z^{*W0I}}1^33P=^r!C?Ocl|phzl27c-p^+;{PfAE_|^lzC6h`aB2;{je|yJ$*yC(m
z*8?Puni%giuqR%0{GW#hu(Vc;&_LmPLO$JsGn8XV({gTJF#<kHc@Fz~c465txn&lE
z?f@N)?fk_}AE1zN$fXsn^##@+eVL!H|2ZxB7Ch~dO4)2XxR0Ma@hB<BF%{)-rNo`f
zZ{VWyrgCDa%S4W^PpOA5k!>`<sQ4y=Mhh<qj<7^4Vl}(BWK&I~N;#G{FXz_F?lSPz
zVyhH;`?k|wKMvb6y~to?n3c1Z@rFgO0ac+cYcsZ?o}X>}Hb?pnP)OHN^2&Vc_rIZ3
zDU-5o)AKXNPv(u+-^77|gNSGY8HkQ2&FG`e=hQXhgb0pg`1s^#<^VyF$3N+^qHQU+
zue_b+_G);LsB|6l`e@9xoGwQNF@SGh`UZA&ZJ@7o%nSuBC4R8>bNtD*|G|$Rcz}(2
zc2UUY3>*R<x%o{L?Lpj<2Vi>J6Av#4^^~nW6AghF$C%z92%6DShk{YSCu9L7O(XUI
z27CHh(zcM-TzYc|UwdJr5Xyd$sm;^TI*9s5@O__#Y-3oRy^SwF_s`_hkW1HbyttX~
zJpUOUd~Pq<bQ%Q=mW#aMvR8BNv^F-L*ld7Hewj*8!94}6eM}S>C_xcrD$!={$V(lO
zB*Kf-jsj<Q=kXEg<>;|q-twCF(Kfc-<p1PVog$y9M;rV&uMfM!%;{Lbm9ws4?cs+h
zWb4T|d3FvwjLNk@IZfHCFsoxKuU>gMPaS?PJT6DTf)Is%3_oJ^r$t9YKtK#&GJMiv
z=*LfNCK6oFADl6x^~l)qZOuvnk^~Q;i3*zd4>pQ6v;J!@2(yE`kN)xj@|i5zbe0A4
zDm?Y1g9H|Dz3wJnIQDzG%S8&=CX})W2=Jqxk2G>X45iUj0+&ce0iQ4gir-yLEO_-F
zyXHP8lX{Q<l>i_01W|b#JHaU06gAVEX7c8__wxNse}ttpX~$;L#DM9u2AEZMJFi`Q
z4bSg)SbuCS2Re7*0=awxnM@v~Fa=bgV+TZnmcUekajC45;FGt+9)0A|_`zB;`{MIg
z<yE226TdkDKDs}u@8e!No$DRTp^(lpHh(cggB`TDA0Tbgp2gfbF0Y+7mz2tK#grSk
zJk+BDhgg0153D-8iUTM1plwB6T|N119xR29908c;d%7wDlHe1@fOGXVS5qxRL!}73
zHatoQB;MB0Q4}bk=$9y@3RqZt`pF;h@4wy7pWfZT<TiyDC{ihS>G(I8(KeT~okal?
z8qQ(D`RDNJ^KM~Z&t9I}{{k-^T*dC=d$H0sjg1Wya(R?eW{9|f`^sS--%xW1SV5qv
zRsczYj|?4v)<p0E3I@F)jt_S-zHTh*5AEh3ANnTf48M9wQ}#8!7L=sf-Lt`Lx&jov
zVpP~*B4k?Ybl$Sy&3yLePxALy|1~Q+uEg!pY}vVo-G>j-UmU>40|f$!@FK~DkOQ1K
z)kQ!_dw7Aw=}FM^S5DGf>ZOp*leY`p^Q%9n6bxe*3T)jU@aX!0%P+90xE2;U9@+H+
zrj1!b+G(M`)JGvxpf%S_W3~xPDKm`bbX;WgJ>J{HjIxnOwm;4D2UfA_#4c!P#?~5?
zstM046+$FQ0z4>m03wP&G`;0MhW%lao+dX=;@dC%oOMV3z_>B>6kW}L=kwZG_v6{W
zqO-UYkqm?7VZO8WlYDH&Cn>ta?Csmf#?DP-?F<v@JGgM{1;z;g*;IyQQx+NxzsH(G
zn|OHb^RzTH5(Gg__~<Cn0i%bnIyT!@BJ{icChds`StmzlUl-q9{S79L$>aJ^4zGP^
z<!!uU+0AS`-pq!>_aow?b(Zx<*72JyKj3W(Kgfi}4i5AmWXp-I47s~#uWRSgU5_)X
zZ3Y*#pHF?J9)S96fh%S#F<N$Ay1P!Iqe!fVj{+cJ2qeI(TJVv?`+Gium`KRlS$?+q
zn>h9$ErlEd<$$S~F}(KTOWAyEcL=kbMH6r4w_ATi%Blm&^PN@SX3qGf%$qo$i^pEb
z?ADq1Ixx=I*0r6-_B=t_PIG?yY?hz9jEl!zL_U>^<{`oJg9LaXDGgXuiBiC5_U(x_
zD&q+#gif>Wz+)U8SkL%|9Q9df%vvF6h4=mBkGbsAZ(>L1KHf6#<Fw?a&@)t|>?%%{
zD*W?f|IWewL*WqEOwlVD!1LN>@fTPADeqeNb|yAX;DH?v^M;?im5)DgKap^t^C(IZ
z;Z0jhtmFZZ{L&)Of@pINWjXW=?&DDRleE@3)MWz-X-z)Vl;e}K1F|V)^0%eZykp@#
z3|9!@Jp!HK*}bdz&dWdH*w8UvKD;V);xS%4_%bNrvdJs>o2&kUZ{7Y?-oN-g<{02e
zUnh@je2z>ilMHWA{;P996?}CBxPFm?T@NuP7Z{)+7X<LN!VMsw7RsJNOJH=~#Ko+b
zaxK5!_yD$*rH~rKSDybdb0%KQ)w7rL=+4La^|s%UOXZl^I)i1C7Bgqu#oV*vBSgaU
z+t;x3*nU#BW7ZNi;3Iw+y#wMmG%E2oIXZ}Uc-^4FHM2g*w5DlhUoQ~Q67TD4F&i#S
zXc~v5Y<f%G+&S+~=1p2)3Y*4EBV)47OldxsoSoyUX)Dbn`1HPKd3?`Pd~f{^Y05V8
zzQyn6mh)c&!1@E*@pOQKTJZ7MsI?eMh<;E>@9Hp+Vn74ZPL5fv3#d!go%wO1O>P&A
zFs^Q_0UB4|ZYH~<gU8rC&_&0XR=SHlq^uN6&RJwMyv8G8Hu%w|pWs+FfLTp$3wwWj
z-MB<}L8`$=I|Nh$yu@>WKp>hinWh@>f*<&1onQ2dA#@WJzhWxBx=ev{8YY^Ye{86e
z9o;)<NH_As^*?4`-+pGc%?vZfd@c$z!&~RQk=M<+6I)pTJiX^7x=Vdb48M;^O?ZSz
zM>zzlMtss++9(Zzh|p2!sNqIM%1&WhHfcL$dho!|ar(<AjT0KPjizj#P(R+Nh_HO}
zGDN|1`=95hn|@AnzBzQn0^V@R-E@Ta0AcO$2=k_#4<(fdFL4x%J_`uEB0M5!ZPZk5
z?fEvUMT<VYt))<8ovf+s&TX1xKs@c4%J0|Pf5&e^Jy||!=7V`1m+;}G@8>^m{1@K6
z=pE)eUt9AndWyXO?C(9yy5pOf-7y7U>qK}YhB$-PihyWvD^&v?!~kLnmgZcuS^b?!
zeDNu{Wdf}klWR1989T!{jT4#JFoCXOH`}{*&^dg<<o~a(`X)``ee);G<HGjyx$C0a
zx$T0R+0(n1sm)UXcy!0J4A4t1mqtVq;RWJ*PHXZI81;`6L<1-~^5bj%$SUXLP^f4L
z>lqO9ZXlhfE#E?0p_TSR8-mbR>Z2*!z?vg#`Q7#hDWnTrH0}acPQ8MK6X&B)0Q_*>
zFQMQWFdz}$v|8{zKia>L(U!srl>iTzC9I=ttmJaSgg!tZ0h7l}GR~+374rrt>u1PD
zP6{K5cZOBp&BbnZ_3Sp2=3r%ro>C94?~-vcX4m=7g*VaO-hg)^OAz=-5`3tYifgVr
zDI2Xv;Q*=rw;Dd0_!{%|{KId)!4F@2#5f~aFpx?`3XxNE)%$xz%5rdQ2NiuZ!q>e=
zO{-8Qd)U})I=Yj~rp`y?%<%dYeA%VqdW;|6y2-KaUTj8)^8KKCEzmqLP}=2rUNcIa
z86M1~Ql&!A@W~i{l&`2qyOR^!YUDGcXDDDyp@Cc~8}CbCLf*i8o^PDp*VldYlmGEg
z*Yx%EZMAK?Is&9-3RE@VLC_j<nJkmCIgsi<y!v}pAzEci3>gDsYy=gxGQ#<u=TTpm
zr%=dI3GGV7!*x9aoXw^2eV>#4L+n3r;Kcp+efZ`rn>TIc4B|-5A)so)$D5)7IzCK%
zMLqhSPhQn26vM;AI1aS5j;CC9aYOjwVwoV&)Ys=t1ax<wWb>A-U4QxK_ujg9&#qPf
z|EocfTJW*`zX~6B|B)kyaBPL=1q=)p85}n7G&JO~ZAIsa9=3$=fAtpz{&^C_s#PGI
zo$w%{>F@71;XX86HmbFO$Ff5B&QtK)y8beR-?Mwyb0kPY8axZ(M{I8i<%(yv@Bb_C
z$wS~QgBRke4lofA{1@Q?EXT14m1;TL;3N7G`MSRTzXlIrJ@nASY~H-ZIKi?MB4;PO
zF!KM;Wz*R9e+?eMy5WZFnKy4PpZLTlP)Zp`AZH&uA`q9i1VKROiQfMbJb(qJsNkM^
z?&00<ez&nL+dk{yqt=Xjt%YK-LRj039)2{F;MczPHLkz@dhvZ<Tb6a!!Rt_mhl^yh
zS-QG=y8iS}K6-luud0<%iW9XeQhEOQ=T9C!ba3OW*%z!F92`Pb|7116Hf;=yP<>xD
zSR_*0A#v%g@m$}`{vx{XFaG?#_k=~xI$$hD(165kWE&-j?Ge`{0>_G+kp`GQfBuD^
z_~d8)<D7|;F7|vcx)~)>y)s0_HpEShp05UG6k|SeoaYAwexP>k+J5+7{`v1dzjf=@
zH9)osI*5Vs0WZ=DPzEZIdeL<qI{;FV19E`MWHR~sy1EWQ(tsmi6DfkFzycHsD<K3;
z8{4Y-T<o>@cB#G)dqc_4(BNRD;(CA+!;jFQ+5r)KDbfnyM(1_>hk|7^2DRez(Q&m#
zuvIoyb`595Z8dblISuh}JwvEV4QE6Si6bN)0<}d|A16bgM)i!*i6kEzk!0tM>KXh$
XMC)c5GEFf!00000NkvXXu0mjfP=s4o

diff --git a/src/assets/img/files/spreadsheet.png b/src/assets/img/files/spreadsheet.png
new file mode 100644
index 0000000000000000000000000000000000000000..23d94f272cb711f454088d0fdcf5152eb0e2d4c2
GIT binary patch
literal 1444
zcmV;V1zY-wP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000GRNkl<Zcmai!
z1CT4-9>jlV5N+1XUh~7%vu)e9ZQC|W&$eyr+P-Us<8%Hmm87QT@$0SLad)~891#IP
zYjYQ^_0C+*jb8KCR}|)_{_%kE>4BlpS32;a9B*_t4qyAHr{DFlf7D`J03rLYdo+UM
zI`&1^b-oYKF=%tz^TMw?D&Kd0`5c9tE#NONacpLZYRzzsdrO{rkLR&v)5Zf0ulW=a
z5Rsm?ARU4rh!K>fl9Azo1D2(ZJ4z{lT;49`W~*oU=DAnXl+%p%JH$!A4V|0woZGyN
zsmUoCUW@C50%OF{S{IbEa88{#O(9n#&ij1h>}%15^NbWq2myNwx8gCkcqJ1P69iF!
z0Q|pSpI(!~x#gX1#O58F#_#gt{ce;y&3L|TrV}QDoAAIJyo$<H1uyUbh3X3R&IJ(#
z0#@gsNKAqVWF4HReC%FeaobC^a})~-BR-q;&3VY)*I<e<zrFY)`ttoC3T=eMbS4D4
za}<my)|w5r4Q*oA#Ac!-1_9~O85=7TM6vSbZ5n}3CB7vOx!J4nb9H8FXSsIsenc$%
z#K(3ll!8|1kr;!BVA~eXvSDp)9cywcBI%6k(9xkHX|rAv_7C5hC*SN<^beOgJ^xp<
zRp#wK{uuY%cSm+tw)4AVf9LO~PjHtT-<<xzZk4vB@O02V_F;OaSvWR%bZppDycy5A
z-3zHqRyezSf^u<?Vt$lgo%=DX!AYKc(--j0&wrY&<J07C=TePoL`j4wLp_QZkus$9
z3#q{`{(gm`T{3UE_baJPO%X;RN-0XYG9&%NyzX8v;akVw$tQpQHY_P{*E?UIL)C-$
zaY(FV5{YrcGNaChG(q=|4xPcvlWg0y^_P`Og)j`UEE~iEEE++b8*IEK>)ugL4t|w;
z?0W(Gw%>@KU;G7gwOLvwz;P``P~bqi0Mk)cIG=sr#}JX#dfkr&aS<>^I`oal`dYx7
zzkQUu-84^B`Xf6AAI|2z+o<~M99%rguV#MBN@EQ(ks$O8G9@`$cVmI{OuNTs?4d>T
znLm65U)Q+J^o#i6nRno|-p@U*c@)j0#m<p!+-Umx)LJdHrwHQ+BSO}}p^G$LHvz;L
zj?ey#h1yRTDd)Mg>T~1DBYF4FKgwijFE`q9fMbg%_|^JvxZAF~5(f$~Ce`S<WDU}x
zK^q~^0oSiwpPN)}!h9`cvVR-fMmMtRK_hC>2pg>XYwQ@?&f@Ai=Pu83n_V{{i2_pj
zY=X2RfkYb|+vSEE?uM&!un~+Hmc11oedCAXS`Nn+PIQcJGIAq+cI2;=7)bY`EV30r
zFGZXrjF-o|;y`R-LLCB-n1rfdqaM}SJhZX%&Yu_m!aXPNf$mkLlp>dNaUDBj&`V&9
zp_nUj==>Qj&M$SYK@sVwGw;j!{`N8AN^PA!H>AFFg3Y-dlnZ4<3~nyR^3u}M-0X#g
zeBQ+Y$<!mA<v%?*-cB$~Z-%9@MMxLZ4JY?@Y73%>8&~#H>MLS^%a>=GPkqYcA93*D
z-{t@u+qQ}0Boz|6eOt;x*$NR!X@pLE$yA}^n8kXP9fP|#cjj#E$xnLBgN_|N{4;uR
z78jS8m>361Yl5y=##9g^|7IpA6xwKP$6;n>#(U~h9{13;_)p2ex%S#?_|S(w%>D2G
z5L%v>6+tp4rgzL50hCI8oH}`;_S)CJ@<B%qA56tlgSE9ap7D&QHwOnt{$82husd$|
zB_c`$C0z%VPJr%pdQ{4?R##V(*S+qQuRDC`A18p_Kn%2iCJ;D)s#dGD``zzecXM5L
ySVU~V0c^kmREAjyfYv%{!vjh{+@l5zApZn1w~qY=S}HaG0000<MNUMnLSTYLHp)%_

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/text-64.png b/src/assets/img/files/text-64.png
deleted file mode 100644
index 7b397cea5abac6b8885b260057958e84e714307f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3692
zcmV-y4wLbTP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000g%Nkl<Zcmd6s
z1#sL*vw**rwClBFwqpkl!<_$^ehmD~%*>qRF*7qWQ}JWw_l_9?$9zG@@fmj|O+QDa
zy6u~i9Hjy;lTxV%<jmL8Jv}`us!DlL{C<&uv9U2$uUf<SiR1N8f6vI5uH4am&BR0+
z5BAkj1?Mz-R0Ze2sgk4+1qqKoJ1)1}KdBG>yZ*^<e&?_K+owPNrEKikDGGqLMMQ)k
z5Xwra0#tQdnz~o3ssKt}f*@dKW|p7*sb5Z>P5*e^hS!XLq&XX)fuN2I)Hx+R`D8N0
ziPBL|X-?Ex9PMCa*>ZXZqoc3g`0?Kv>RK_Ex+L%+GD*)&0h;lP)@#v!2Z8*1Wd+QG
z@0pot{*3Lj7T}VIyPo@1Zhi8{Ido)>L?KO;Bw_wh;uO+YNm8X5D~q}mnXPm6$Zp=Z
z^NTEBHbM}>Y-<kZ5)=Wo06DyZ04kc-EvkZg*lLETz9ff1Kwn?io?0#Xxhe|ioQK~V
z$I0a)f-QlBq;bf99{4eCf95Bdo(+hdkU_@~r%HNKP9TXhcse_ksM*0)!+Ut|>p#oz
zNMC`q6|bN{ErK;;{qNL%PU;+;o%JXC`?@!&>I|kt&N+MqsA?Y+!3X@$V?V}yhkpu3
zL`SC(#7gdBh(MePpbCTCN-)>SmeF0jXZvRvIzxC0;lUrG-cS*6sq0JAw4ut&6+nd&
zNI(*Y-15Ya^Wf2+MkS)N>tvf6H7VpZRi&?2VWz>xfnB`wb!QH5&AxoKO-+5*5I}rw
z5><nbxNY9wA3F9^C=p#J;ZyK6k0=Us*A+M2U_;+7-u9Z$Fg*JI2yf(Es;U6Z%|7DR
zC+6YDei}0PkklzTv4IB#qR<h)I1k^mi?_V$(-#OlpcGqxh!n4Ukilm@zi%Gi={)?R
z5LE~R`-g<QMi4mWj(4!WdlzrK@lzMh%By<VWePCxNfZ9_;UCLZ-nnodKEOGU00gT9
zP=pR~OdaiDP3Je*aowj_JlcPOz=Kj=qHWu@kr$FQVQ658U;CBcpAU1t!aXniB-zS$
zhomWh5+YU!C`v@i%vg<8^>6aJt3S!ek_!-CwO9fF@gM(zEyF`2;Xgg_!@=V-zr)OI
znC<p)+}`1>5<m%nnd3dIigxpwD?iETQVVY;FIv#%!HWkke%$vJW@|#4Hc5%`KT*|k
z3+U+&$qTKfa{W8wFFl|BVgK<HO1(pJ_`Db;2$I2%ADN|R_BE{9I!deiW}cfg3b${&
zBBo8XV6tlVYzJz9RsHX>I_{+PcCTlk^HQ8ke0a1Z4n*Ja+ZWk-@6h7l3y(cBN#Z~Z
zyj6k&YML@J*1>Z3S+-np14E;AzyTJ<*2>{2gI6^&sJEH<E+8mcW#z2`W+lbePfTh9
z$yOdO4?+N^(5NdXj@7tKzRs(!{xnOMjUdQb^LhJ0K7~r>|I7t62E@YWvX;0&XM`=a
znviB$ouZi7nZtJlj)^06Rz_dvRabtD#Y+~Ex@i=kY~|Hdy~IWVswXz3o1f-qUMYkJ
zE%AY<zq@8KJ(z8#BzZ!ks(HKMRH;SE)Ugiw-L)*=;ux?01><AJ>=e}dPjj)@cNMJJ
zJI!Ie{_O4fzd9o;#A%b&i??&}z||z$0w2EQG#Di*SOvIz^^-(F1rcS=DZM?y%y^xR
zi@wQ@>pwof^8E;$_m%g6JXuJbg}2iwaRGm$aQQ_>k|?U+6#9CU)<lENy}NkB4WDIn
z=_pVDD;CA%^OjO<3R^MG7XpLdpSUK8i$N)Jkzxfn2i5}8mn`6<tPFHPI@Mrn|8CxV
z)8}Xmp5U1mZvzdz%L^~%aO(GGGHp{gGJxW|P}i2*uHv-q+iK+0B`oP(&)}lVa3q!B
z0Rrcs{Rl3<-I;4S8XXR1Pp<rKvcx7o;i-XTp-|_=kenM)(7Y~czcYfiU#QwpSGvh5
zl~>+afWCZ+>XcRti@G3e&9D6MF5dpyPiOhOYC=!_a{4;f0(#0&hkeN@%w89c?LKhP
z*wi&i(ijlz{B$7~@H^5JIvXj;RD&x=_VCVapTS;cIBk(?)0%yGoIj@<9>&EqM;4?2
z9$m-+oC4+wIZQ~VYFst^4c@cE!b2!^4o~07a})oDPzTh6tM<g5a%%r|-~hZ(=Zyb5
z2a4_YWpJ4QaoS?TvTdvwxrR7t6~Jp*I_%mTLa59fQ?8tcf7`2bcvDhsG1$3<!N#Tw
zYvuFr1Sy19Ew_T`(P!q2c_&OBYw)4>yoceDL6j6*RFzO_gkjxGrg};%MWIfrE6Bh7
z_2!USLF!tjzd|zfSATOD^3rVS<W*NJetvXW|DcF?n-2t1V`A<J#%A^-5`n{nHUrYu
zy5}N_&GH=i<Xjs*mr)~Q6QSJfu_wv=E@Sz?dPaILBXx-nU+w~j{!VQ@ZmjS7)~Fu-
z12IyZ*cegFaalnN;myhk<c@D-WA-KCOARnqwrO&^=EE<1CH61>{IBK|=-9A%?VUC4
z8;>;^^x>Vx^fp#7(76s!f1(TC<WQE(NL90!T-KM%Dj@BRFgpq>K76SUL_2nF$1hV;
zvmRJ`5-x3#GUox7`!7`3@Cx&J^)E^azr)BP;=$WWi3_BuvvuFXEgGS8@WRv`JURBS
zh}7FY?T086>e~H&cvRF6b%kNiuPY8O8+2sZ;43cO&f2Bd(Mp@vRTe%7;TP*`0#<>k
zHW}&J%;N4%=XB*&fhsF+<lF-A;W^boh=q%1=8iz>L_r6+Ua>#GDR_QLdz`74$N6GK
z`7&rhC_D*2N1C=WS?xHqx&q4JL9;M8KK%qoruHL5C<@NI!}E53=ZCQ(S5d%|oomD8
zFt`QAB`)F8q4g{sxI7DqUW6!hfuJJ1se2ikfDexr?7mq4x1M5UGg;B%eg(9+O$Aid
zgEx~Zcp|(a0+ig_J7Na9E@!xVt?_FCO3l8)#YX8R$HH<!vJ<CG;@k!7I6ZwAC`)lA
zi?d1EEZy+5!UZO$AL<H^zy7^|h!n#spl7@XKp50{ZtQj*KJ>2yK|K#aC85yB?j?U+
zFid*iojMa#6NXz!lWSJ)VB<yC=8?cEA(tzM!Tg`7*tTrtm-TODY2Oy(0_T0@{Y=js
zgusXQtyC*nfENE&r)Xvck<_vH=;>s5UY`MAA$VU|{xKIaD@al=8$^BZsxBb-+75ym
zM<*ZW;P^g7qLQr6%6Z*^tC-a}n>8w6`|<(m9e_}XUCfG+4J;qLEDwX8|7&FzC=Y$2
z3R<4qmu7XooI?rV{PR4D^HvbZ+tjxj-$D!8GWql@K(UaR6^j|}S;3ON^{BdqGrY2N
z^bE~jwLCP&Nh=S7-i`7?*<jh~=evqGA<29!PUfm_coom~CDu}U1zvR65fLB09Z9SP
zDs6(`!IR|xj~%|92cP}tY%?sqs5HLm77CLTWPkw9yIeK>*3_-yT5*dT*6v{QrPpSg
zp>-E^N)jh|7}jcgfFi!1XJPP?;VoP|xEUy0c}0<YVhTvf$}6gJ#w%~%g5bleD$QmK
zMTu%5&Q(x=@m|l=9Z^sxiaIh`D%{@U!%&>6YJsfydr1j=CS>sDD6BYDnsY6ht(c`t
zhaZf>@Hk=RbAY1Or%=M6#^DoB@XXj=0tt;N1Em>WK1uJg)9&n9w-0Y2?Qe&!y&pN}
zG8u%_C9GO99|ngmBT3>6K8_Q@D5Nzx{lb^N_?a({kB<|Ep|1cf4S`a!+p2np3oYBR
zJ+rp5g5*497n#1<i-IG+|BqvOx;yFZ=_XE6W@cxp)oXOr>vZ=tNRot!6H`3(^wUSa
z?OVV8&b<#kxUVn_7UNTx$t4;y+P5OReg>^>_NB+*GP5uDc|n+-nI;UC6)TsMv|w^_
zZoX}nxz-#KD(aMD$0m4a@4lno_dVb8?k669^v=`I231i3Z=P8gY$bC5#T#Bp8mo#O
zXJvoo7Y=oS@W|r_SiSNxW@lTBpO|E7dM<N^-rg>PKsbDOjJ<pJAN~IC&ERilff5yZ
zfYG*Hty<8*z87xe?#KT*+YG%-t|Yvf-v$eBgzzp`4Rpapi=sSv;3>W`yqn?SrKRxS
zHxK{#V~_qXwp6!(!h=ngX{{XD%H@kU=c`?Q@nJ(<)s?s7EwEh>1@7#+je5|@#EVmB
z1YfRzvL7w-NdyvkVKSefC#!;p9ha-i$XMAAlhSTC_s0Yh&}t>5X9y1vMNtSqlB7OA
zQoeaDa6T{3-K+b0(Ye4=ng~5TU8trd@YPE2kN@~jJoM0B<`t1?QmbEJoL6}DuH8Bt
zb;3~22p%AK)0^JNl~-QD&;8ubAtIR~&<hXV9w1beG)*~t<oFrDn``knj@h$k51;@1
z=QBA7!wU{Re`kL0oH8@hWd3Y(2Ji*H3;fRS{0?t?;~O<e5*Gx)1qbg`nVz1Z(P(h=
z*x1qU`p$2@H;0#khssgFe55zueDlO}&pz|O+I1VZO-@cB{?1%3=Wjc4e_R3BLP?HM
zuyc;MmC$O%sJij*{hn|A!u%oUUSO1VYN6(x$@!BS+4gG=PLM034sg{~S8e*apZ}$w
zz4)R_w!}%S=0?mv;faxHze-l#2d0A0XQF23{WMAC(MJzF_me;I!@s(3-@dznh6kM*
z-~@>CrwPmf&HRb;erFX>%N5WGNJmFUS5J5MGDYio&JaTWD1kr#2trV1g65se;<o{6
zhuDUKAI3zdrY0ww%~lLV2HrlYuYeqWHh-ExD{pspqCxhwK?BpC)&0l7S{Yxq?~*nj
zx~$DvcP%h=^_5{2VlBkFKv@yLehLVw^f#&%Ew9_Qa^+S08~h)xF@9g8Lp&h>0000<
KMNUMnLSTXt^*Fi!

diff --git a/src/assets/img/files/text.png b/src/assets/img/files/text.png
new file mode 100644
index 0000000000000000000000000000000000000000..9eb4b197ebea5ae978ea4a7966b59144557fdade
GIT binary patch
literal 1117
zcmV-j1fu(iP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000CeNkl<ZcmZvc
z1CTd45XFDVWd2xxSe|W_&bDpaE}ZX5XWM4!Y!=V9`I&3XBz^y>uBm+Lt+$=(?Dp&T
zCW#Rd0K5;oG_ZQ5;wG-T=G<EUlt&Mk+SArCHYR>#e1zt(PP$V2{vRK^$Auqx@hJ!b
z#9x|&;8K_Tm8R}B024w$MEZt@$A59A-aNDadtUhVSbmxI0|SGGg@Yrk*18?%?fnER
zt*|@;BSRn{QWA)+MJXi+#+rQcq_&N$H9t6G3_zul)GIR<e8Ve09!h`qCmpSIvb>*_
zns?xoogSmRyO+U6a}(!Xb{GgjocF$FjK%%@<8M?e&G_nUUism0vgB_%T3YBgL#!ox
zaM)&#(AC+=cs7nT4k;}$U`iE6P%(J}g(H#AZN1}qth8EJ=icYGreo$0CbhSa%Lpym
z`s}jF#njq|m@_;FwMDHdbI`Ts5U8h9No_Mohy-We-ib~8w*Srjn_8txU?DwrYj#`z
zW+r#GH6|ZHmTs;DA^PqmP!dLf?e1!#wWV%`hZE*59H3=%J9b&`x<>PMvTOpxqA(O$
z#3;&jFlAPi=np7dJ|Rp@1p0>t*`RY5j@a^ES~`l_IKt9XOMp-+DC$A23Yw9i1Z7xb
z4Y{9S&5j*7d6&iq?dl=Rb07g(8iFm?s))EJrDY<K;De9;<kw#%oUzA)^!D^JJ~76!
zJx38JvQDoG;$BolX_9OH?+8{~YsC+Gd&}m5LJ?(?cv6TKm3Bm%eDKtqM-u%zWiz-(
z?|!T(%o`XO%@EQMaz-Z>loJv{d16??Yuzhrxi1LXskj#HjfV3+C?h%zSW?>-r#I-N
zMzm(Nq2@^Dt;d=~FItEUPLoaxI&JQ=s6egItcqf735$HtVGDpF62uP)IE+@Y6w`yz
zf5L#)iajHMs?#^ksJi%(BLOG@7$70mO1UL_%%yZg0WC!ZOIw6cNDg@KOEvLQg(WXp
zX`R*!d-UlK=<}SCx`aqjDiDJ;j-W-N9cqOI1Z9`P8uY_s3<gV@R+v3|*6iui{+wB@
zrZ|vjPn>qy3gYDD9(k5isW@7iT4`%w_RKj$r=D{B5np}v`E&r6BnerTqu#01u}p9C
zlBXxWqFM(S92}y(+QHf@ug;G@|I~ldiANvw{deEIiw0)q%vp4Gb*?;j?!YfT_!JDp
zr$WJ!4_)CkD8V3kK0)H#$T3GBcEGpaeDx+Vu<Ne74$nUO9IdUbg?~8bNL<o@EwUm>
zumy@*QlO~mx>m0-ZQ8W{<BvOP-`G5c0qE%HnEKRH&%M&yx7?ap!!HprA~YaStcji%
zi!vKy?Yw#O@~f`8^r~;Z{_+K&8OVTPU<ep9N`gz%w7G#vB9Z_OD6$1iL<~Rxy!R80
j7y&9kt^|xK3FH3*)h)9zCYSw)00000NkvXXu0mjf>S_~G

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/tiff-64.png b/src/assets/img/files/tiff-64.png
deleted file mode 100644
index c11a85e28b7daad21656e3bfc25707816db5d998..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4684
zcmV-S60_}zP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000sbNkl<Zcmd6t
z1(Y1OmWDr7RpWqZ9EX{i^DvwZGs9zMW@ct)W~MMRql0FKu`|%qP$aE%TIaR4w%Xl(
z_MWwTu8XVn{kpokC5=!@(Y+|L*M;y{zkWTt@39BtV`IgiTzKK@F5Q3sBbpNvabfy&
zl$4}tiZmvr*|v}47)m9^7cUl#M;=x`m^c5I$Nk_3H(c_{S0bfi^Ay$jUt#Mj@H|1c
z(oFyZeteqBqxDvFUI(7%QExQ)%$L8E>^|?Ay)WK*=gY$|qzrA?Byo+zZ1r`oTxO+|
zjP0}&dv3EW+f=KgrBhD%VLE5)7D?h|AZ#5rO#lT#7ga0-w`vh?>{|d0{*Fc?{9>*+
zLJ%q#yz@5v8?R?--8w23G>u~tZE+NlXp4<Cn|K2QtOx?u9(O$ZU-1&Q+jd(#UmzPT
zNK;#37r??B0ze66k6lzln88+{9QEuzzUMJ*TJ;@;Lh$8&1gL2E$KyEJMTm^+cpj}(
zqOQG~(k(Y4!jOsvFyO|d-NqI^(eSEL!N9LL`dIeA{6%axb7qdWb$4Nlng{FLn|)5X
zkCRGCrBYlpecIsunzw;d0x2a~0hChHAP+u;8?U2$_Z^t7Fi<LC+}slav<YyPCD1Lu
z)c09^)N|SYlFK$3o?Ljy-l8(M3IQ^e)6z68E5-j5fL_Igzv%|b_uP$fscN~5Op<nx
z$#f9|FZA`rLa^enBiQ?bi#8eFb^GqE?Hs9W*ARfns!7l{{4F<8zV99aA*gD%R%wdc
zMLehFDHK>DB})%Ej6KdhpY3PO`hSK8P}b;E0H@D$^Nk(&Y87m^$qp{QQY605(l}<(
zp@*~UnP+bq@b)m*1B4Ld72ye5Qnvg2{r3`pY59(uYfuFUr{z;mu%s2T;LyX^<+L-|
zVPs^>XnCbF*gXUgo<}oD;JT|#%i}|*<vp)$Qd$wfGc8{%vZ!8X{(%Rx^U0@eLGYmH
zUV`I~KOS35L}!L}*{^=*`wZN68wE4gE5*RTK)cTyZ~#{Xy-j_eMa?Gj_CJ7~PCS_%
zW^aM;O63c1(@i(wmKh@>e)NyOd9xm$i)yt@%eSLFI4*BR5P}p~tl^*8dp~wM{zMHw
zdy9kLP`V$?)~#y`jX37*2Oadf?VovidNe+6#(9(6AS}hdMGyj{Bt@~f(cq~)_hzT#
zPGE<vwp@7Sm|KE-U;A2|GCX7E%-4iVmr}7GFxhe5iecQI#r1j{{@CL+{8oL#dxZkZ
z#18?&=DntisW{r~@V!bfquIngmJ<`@f&sK{?*lS3&g+2JZu!0TVdss27kH>bz{H~Y
zB#Rf}P1X>AH*FYy=Upl8xDz5tOvN`Ryxs2-18}+kK(SCT@Te%lw{GuQ5qv3$%Vn0-
zYCOH)0qlIdcKg}=!Gl2h9&7*b8>ZiWE3=ivw-=>S#DxO!aVL_Vex?y&GsA=G(g%WI
zc-T#2P2eMqW0W?B#K4niv6j>uJaf>&>~g|MY~Ll|2_X=L0A=21V3HKCTw?V0TNt_F
zI!2~VBej(?<{L{>N>}}p=JwkY=?s!EMEF5_s8zCEAF2Lx_%7LCU|?|tNK;pUHjI?0
zp&^!<p-$)ayPkA%S9q^jB#J^BPd|mw5Jmm%U)*XAiIi~Pz0A-;#L6Zo&Q<{^N%8)B
zNc3;0a)tV;mBcHS6I82|cG(TDSb!+nD0p0WTe^P@S^;7sKp3Ko0NT(kwp^cEaQKnz
zddg{R-zCX0lO7Wb7ts8}Zy8y(loF6?;o=t@L-_m`P#zmYcs@$Xi~wyzc!<$alBp@y
z{NwLbZ@rNrz3=%x$sT)=UU~(-juYBT`-69c>J|@!R0C%PNHnZ8O6z@JCq~PpWbqM4
zv77Fn-Qax<zwU{-s2_Zn-ILgefiz&vChA{*XIy)PYBrG25g;Q1fSR0S;%i@Gj?P1d
zs})lH9&^8%`zY}jKST7!w;}e}6I!iJh6nJZhIB2p0z{_b_LFwu5l6DyS?A=#+hJ{D
z`7-2>zR#{QMU~3N<w=!73V|#Z8J_nv!@AOm9rC1sGS>dx_7+IT$Ju7yGbZ~aR*;%H
znRk^+c<a|w{MJ`t%_>w-*kpJB&s4%SQ<+#-RA}{=1p!N*^W2`Fv?+@EU;o68jRt8@
zXagBg_q{=Yg7&c$L7RI|=bG=6c0}q3q=jbra)Lko0pWRl!>f(y0ww_Z)hf$FpV1c_
z&Au00yurx~;d?a4o@Hp!LV{9>#8ejYUEBiZT+4I|_x{XvErNLL5xm+sX}OA!vM0Pf
z*<TR!f`FC4nq!XZdm2k12t1!OijbZMIp8j^$uNnc&Us9$2Vhzi%=vr~tmk-o>v>*Z
zE#Gq#@QX!oW>1$l8jP9=%nL8k@H2YC8}}?spFz6YZpi!ZGn1g*TUvuF4eo8b4SHb#
zX3aL&kZV@MGfyK|EH^@E^Runr5wBjSaP%?6!_!dp2BJ5-eU^Ly>I)WN3qr#*!;t;n
z{C4J;KCfh7xxEoiopmnp!iD&g<4BS90&OO)=;1WD;>9G|yBeNPRI34s!r(B4FoYYf
z0o}jV__%R(>-JUvD`2qQws@CbPLjxe;Cp`z-FN%#*g_hHwSD*7Z-q{BW+tA1v{!B~
z5S22m+9aWrOzFvxS$YP^H<h>G79MZT9Q^mZj|rVRul>tk@$bBy()xAyKs+)V@q!mp
zKI3e>{SHKZ>SK5&(ie&yc)ius#K#=ZL@TDym?F@^nPC<sd%|~f0YRqx{)7`wzTo$N
zzG|{i6v%Xg@TR}7x$0j8I=3GfA0q%N<_evlC6feEEE0V9qpY7Xi?yHn1atJ5K3FQX
zU0q3J6q7_D@u5fHzxRWr`a?;4`2F~Cgc8E-0)*NkDUtdEtZ>R1Ml?v%wg`|5Z=Nre
zi_gv;nZAcU|13@kuD<R%Y(YxNVf*ZRU#naiBTi;+$n7bYSpECoGUHFbXXfA_Qo~3C
ztTI8X*(5mYEb6=N&f53AhaEJ0acGF--%y}}cFte8=PuNjKS%J<Pf`D`Qz+{XC(0E!
z7*dc@TZ+;mC13eGGHl^ras{&4$b~lmY6E>BIQhgAaf<@#Q%wt=4{s{lST{;huMW*L
zsjlZ`hcU28jxf_{+HFT~xrLbzJwU-EI7#B(+j-Um(A#e#xaUs9NvF{I`(G#}2?{bp
zCGAA0n8M%wjL>tCR0kkUv+y_v<P|SXC9X+r0BS=ku7OXqdKCjxQzUjIa1$1r>9y18
zt>+MrY(;waoeU^NV(&HA-DF7GXUtHlbbKgmw;iGWh*DvQbl>S_uEHZ39mQL{(u^Lt
z@JjVagvcpM+5ZGxrm+MxTX=D7Tt7Qhb&mCQZ(xW-2s}O12_XzbZh~X?+ucZi1)AYG
z8W=>Hq0@Mn^9*j5X+$>eFUW<bS0Y5$(hVMj(q<DLW!<hTP!yVD{8D=<P5FM#eU2bW
zf+&^DHPW!v@vLk@<-7ym2bB+RkLXssjf1y>$`pUb43Z!)P}U_~cecj@(v`Y3n@#+^
z_9h9#{QI2lU|QVYcRyN_lc-gzKnSM`IQKb!bRlNUGROJwRv4xF7ohhNwT3S0J}P(K
z1vynS0J%UCLAqiE>XC=3=t-1Fi>7me?0ud7Z-mmrTcCs5xE>J-x^GK63~K9$U@e`P
zpme|i$nCa=IL?RfxJIsdWQq_#uc>P#3A}*fOJ6~{<Ic$1B+|5)2Iv4;QIdq{_rIoS
zz+UqPQgf|QM`izvrd~%V#n3z7MQw1HsbBt#0lT)Z9Kp<RXTat7IF$qTr}Fl96QymK
zJb1g^_!y8skMF!Rj_`Nd8S$}CAs)C7p}z*>WlKpOeh5#9PM<be;e!t#zw=EBZ+R=S
zS|$C?H%zkA{x*;bJdfh8yE6E;cM!htXcm3+qfCF~As84m;7-s>DLwD`1p0Rid+&qL
zU#rbh)y@!!?(hn28!Z667cIgNRjH!%a+vf4%RccDwhCK_V#y6`CZ#3$^)HF)b?pVO
zr}U#=ARf9OxnMp*K(N~$h{KOyY^uSs_r8arzx<I(xk6&#-Mpd|B6WZF-u*!$GXm-N
znK}R)gje=z|HGjDCzR;1Vq*iMQY`<?Zy3DhDuSV5<L3W+Xbb|>AAU#U?z^a;aTfj&
zN9n$PIuZzVPEq^OkBBt*%%w{x8!yR@6!sm>-~Jk*TR*tqQjpTEQ!YI2$Y8Cv2PkWz
z_i~jG9<5r9^y+^yR4kH6nLET`tW=_~d>P5tzD!guGgUF55}}{3HX6*(&npd|<V}uP
zQ@%(1=RZ(5{VWgyl-wY^LRp-R?gFB}wK~runjELJZXHs1Hd5!L#s3EI5gNWICB?~!
z_Bm+B1{?6mCOpu2pXZb6M9G_~kqk`-<ObnUSW_Dx1Qm3LcXEQ_@HBig7B5<WEEcoi
z`9c^IB6ms*3$1e24`dh;%$bAGziGr0J>Zq&1%2lM3i^YmUGc)e5T$d^BQ`-XNl-b7
zi;Ck;0%R;_QdDM!ysVjb6UPj`<YmOA3PQ@B@F)i&$Fc%AbgJ)FTG?tcpaYw@;G*^z
z?TTO%9H5=kyWp-E79QURK<Z~)c=OJ5Vw{;~HT(2)NT;Sy&<novCE0Hx1Z?~gwUQ7g
zRNwS=f)~HURGw5PMy8VK*cip_w`1TFpQ2$h!6-tyS)D6}zGgDP;ZJ`KZ`*B=<74f2
zXi*7UjOaX}@Q(M>nrcArmhWt(B8d~ER9WjD0~7+WF-z1M1W!@cD>sEh4=4H8KcGHE
zQ7@zx&%Hpyj}U+FyOcB}Hclu2C&(EAyrChAr=QKx0SA-(`S+wcvGS)4Q#t=a)N^&>
zqXj|A{^7NSVPvio6nq2SM;?&*zwae#>)zh;UP$TrM<ZxQ?WW1`Q55y6Z=x4SMWN97
znsb7kY&0kzc~m<AnlY2Y>)%RArtOg?ktW@?zn=l_0xu1GD<X_yw%KOnvB3AA#qT>0
zuu=LyS)VukmrjKQ0D|F*FQaz-HK=*dpvq+s9@tOdRKpMKw=X5V0NQFa+rc!hkviQl
zTNkO^gvBPq0+4O^I8N{bGy7a$`MTG>;`L*?JNmwlTSSs1*^i-_latMPQJl;aLTvIM
zC%BasrLy_U5Tc*{faI}9%{m~U@b!>ZI`|L<UiDg9bG9`xWP`cAKoFbJV6ejQ&>*p9
z2*a2tiZOLASBe;}iSa2GFIlqo-S2wy8IR9>>^^deh`R_7$LUPLW`egn=A0-Lp-@27
zYtU*M7<7%11A`>35EX^k(iOgLz9|CObB|qVwIXV@22+g|X(|~Ss^WWsHEW+`?&D94
ze)xm$Ja^%Od3S95gosj`86H3&;|Qq%5)qJ8hlr|!gb3nV4W+Mv*l=zy1S?i7Bk+wE
zq)ck~TD=WFJgnh;1HYcfHT*|D^v?70;avd~<k{wj&wQZB6w<Z{DG?5JcX&`rGOoLh
zarY?=ZcNHHyk}Z|je&o1^uro{!Tfo*<CeZt;s0a!{Mp+c@VL`kidLuvm}+hUeD^M}
zMZ%kX<vedZAl*cG051r9jAhCe2XE=!XwA^jrojVvS6_V%bLT#e5y8AnsVx&;0q*Zt
z%0+yC)8GNTQ%^mGLk~TKFMs*V2qD_uptdx4`+$?)rfF)1x=nz0Vt`31-tmri@ak8;
z8nf^D{uT#sx1>@crJ~UYnfuri{lNDh1b_I$A9Bhmr>G=Jr002C9K6(4uQw={%Z#pD
zKl=Xnz4ZbMFLJD}5&$?4sXOktL;uCw(nt5&d%xprwW;<=oXU6Kw_CU3+52+9-2JQ|
zj=)k%;wZsHf2HKuhd%hO*XShYAz%*eA_3)WjY(^%v+rJ4797utQ3N>bu*3HM@>jn8
zr5(24@xVBV?ac@a=q5_S*{8GV*76x(`snjkxHw5klT^%`_tf&wefAUIdg6&E9stT2
z=+psDfY@3HwCvVcY_CgKfPxjE0*F$nR2>=|+*YBAK%l?}YYI<*2M9!an`1azyDzfm
zu(<B+Ds#b6L#U~#S}io+w-7k+uBBN4EPT^i2t@Y0bSvsvv!E8NbI!{#SHLW|F|ynI
zb6M!F=cL<Rb6j0z#c(Xic!=!+-HXT`_ka+6zN4R_dK?3&9^&=$4*na_>v%37b7r;x
O0000<MNUMnLSTZb>mASl

diff --git a/src/assets/img/files/tiff.png b/src/assets/img/files/tiff.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd17d28dd20ad66c911c8a300cbaf83c110bdd98
GIT binary patch
literal 1404
zcmV-?1%vvDP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000F;Nkl<Zcmai#
z1CTVy7KOj8%BmjQ^K9F;{noY_j<xL#tZm!IZ`<Zr%}Q)$)F0iw&WTfw^W8c3Mz*ll
z0-&||lhYSuEKAp(aYoIbwru&|r(0TDve~T8PfRe>(HY5ad~@cP4n1^+&^iLJ?>eMs
zW08>zH$;(q20$2NaFD)iwz$g3s6N@gmBxGTMyy&%VRDk(zyRyN{1rM+J%j$we2U`4
zl=~hho7(!bmw)E}96<y^wY4^VI|#%wDTDxs$z)=+WivJR-%C6;f^BIbP7*f$<fn8W
zcOu<AJ<dGK$1VZJSgEzH5h6e?Te%WhQ$u@V$UJZ_4TS<UHN*Hg8^8KB>JK=WuC6YU
zLebX;A60$jzP#k$fA%xJ@~KaC-uvf2NA>v}w6tPNCDwFzBX{4+o1=<F2t%xl0Q`GU
z>I2NdtC}FE?YAFs5d1pcvISLJi!_$ipZt_F-<vKMi}oMK8Iqwvm^Fh?8~FYYaG9ls
z4rYz1^d%*hVX~>M4O1+N!qgPTY0bC3O=b^Qd2cVJd;zm&6~dYE)DyJ6{RY+nN}D$_
z@&7%+6%~Bx%h(`r5M2hO%i<;T#UjS#UKku;<VQcD`LHADbg`6N=K7)gX`c2by15mt
z5_F~p*F22tTX@0Q#5;DNe)2PtLyy2B%7E$>_y@`XHh=w_G@fuWot<5&$+oRDICCK*
z#Mmg|&=5LFFiv)0C-LwwIt<~}mk3v`z(!FymTHLHFl!dJsmb(TdL<n$77xRHj035z
zZrHjNqZH=5-y_%8k1&>C^Cs+@uVZ}n?HyRxv((sBnhstB&wTQeZ2a!`UhD1aD^E+}
zs#Q1NfF2$}<+7-+eVx&sKJ?>{Vjg*r#F>_U_+!-6B&D%2@|RzN_0UjOHQGxMoO#=A
z{QvaRh6{;G{6nG`vv?78Z@fz2qEXsV`0VEhpM0EXd>lJDiGA#0^cTKJ34tCR#XkEK
z_O+L>aa=XJ>5^KTl!&d&un;~fUlGQSVWRw$P|D?ee+U{HP{#Og5bj>*^T;4=vPs>`
zgn)Ea=Ges)e(O7!zy5<#CWFdmF>_|YKmUX2=mbC3|J$A1w70Pn6PP$Ac4IAm|7UEz
zP>G0CvI0n3gVu=VW{P|7M`6ZvB4aSKW?)?P_V<6n2ups(G{U#uL<<4hkU8`yw1b;m
zJ~c1fQvp;*<mE?^4eL?fqm*D>#d_LX7_AA5B}@=t0K0L6Z!o5#tGs1Y*1IE0jRE5f
z<)=SO=>ByzIpwznRC~KOcQROa&8I$v$xczb-vQtvwZ3Pj0*K>?IFbmZw14=S@rmpz
zqis~)xDZ%h<?^M7Pkx%QYpx)<>3R>L&Vg%AJsZ7t4Z+vHf%YCc-6~`hF*q<Vkk5^M
zH<O9BIe@|g#>R6FU>pE{U&%6xvBseN$iDeHLL~%0|0Sli0}CX%EKw+^tE&SMvT4)i
zsUr_R=syb<%zYU^c%vjy4v>8xpt3_6Y!HH*D*w#nbC^USgkW-Nl0rVq=fChJR<B+&
ze)wSr?6!2tqL<1&*tv56DMP5**QuDN0<2Pgw{@EI*X3`GF@!R58|#+bkw+Y~XO(#h
z_}bUL%6<3UPh(>vQ4~8xK1X+!{yLTP&vr?A?RqAqi>97!TepoLe9(UXUc6|*^B?dF
z3N0-y9e3Y-|5Lqv{a;F4Uam41T^b+$8k<Iw-j~lp1i|p|usZ9kQ_otoaQ<UJJ&*ud
zU<xRR6yl4E>YZAhY3T0(e+~dq*1MMl&{~(=$^kK;NCA0LNbw!P->wIkQ47HU0000<
KMNUMnLSTYq7_`Cw

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/unknown-64.png b/src/assets/img/files/unknown-64.png
deleted file mode 100644
index 7f703bb834a1ce3c26bfd722fbe515c9d8e562f1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2150
zcmV-s2$}bZP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000OrNkl<Zcmds-
z1(4%95{7@t4sHe?3_ND$_m=sXvFMnYnVFfH?}}@;_?V&Kn3kC#8B8WK6N64&aaZ}e
z#x5T|C%x5?(w4LPwYue&*2)-zWHFG}mC~4+n!>f$UW?h;+2T9i@s1Zh>|qbPui0#R
zl}ZIPo-_<Y$kugToIZV8{r>mAH{bvM_rLS{*T4QJPk;K;?KOk{ju`&rE|gNxS|Ldi
z9boO-gCN{&Tg5*|qP0f5-NuJL^dVm<-1xu;KJdx(o$L%MH3$NfN+og_mX|xYcx()#
zBO~=&Z@u*^wc5av9it@#i823~0}O~?nPS2HrPk`FnH^xkU)^pme?(qmk9wYmbLY<3
z**uAQy$%uvCFQ>F`!p7-R;|Lq!UC$*8n$fNhD$EF6po|O>2$ggBBsqSJP}Z%41bTI
z5~09mQ{+AFJ6dCCsQT(c!Tnek2UINlF3<C?B3KFE>3BGJa39W|J&mQMC6ExTfF~t*
z3tc66R4P?$-n<Rt<KrttTVe<^s(=;nM&4)Qw<8EcR4T<I!$Y-OEpHn!ap@l{q+$mR
z0V~5FI&=Vy#(A1u6bc0bj*lU5P9Y2r52Mv;(adAh=B*eX8~cyoA>oB%Sd17-^B4x<
zP!I%VWAM)oK(Yw<4vri-i0SD%!J}9#S@-}lN*I1%V8FsRQ7ToiVZ)~X3cOhn-UwhG
zAX7sTiS#DiZ1A3iKV;z>1aF}TJ_NH%c*^<t`FR^5C9GSwk;49dh37u06gM0E!3aJe
zc%(f#d9`=lBG#^5p9grhuN(mcxsqtzUF{DaK7g5-hV4_>7h}&>4I#89*s(Lvj*Hc+
z*X3vCjS<-C4j?#M;c2xO@R0~7P(+l=Wh#*9Zmhm<4JPse&;0~(w{PDbd;a?v85zZ=
zKmB=}Idcm2`dNbKuqQ>_Vbmw3>y1VO#wgr(-)c-uOymzfA#L5C{p@Fm%joE+vv=<<
z-RUf&-CpDcFCHBP%`;D7Z{epvL+-ifzC6OGu30WUt63=QpZLTlzECL)&&|yd96#4(
zibOf@5<D%AxclyVa}94;r31eC&2J(mgBM+N(euxoIm6{`;&YzX1cLXx{KKb-OFOt&
zPP^@PyG+moFD1U<5quC3eBQ&J`w44+6~u*ibp%JPgs)aBwBYqj&U4=+<bX@FDNA00
zmkywapbBqlYMR`Hd+%M{Tkr|hper{sbQACB;<j3?)-7_hOOLvqfv1b2lkNb9C*_$R
z92}tX7LHTI>eXwh!s{7$9?K>vng&ZHXx`6Lip<T;Tlj*l?br1cJc$;^SK=_ELi_n>
zW3!>Z;8P-iPjW1L8^vN7>uEnfKGw7FCTj|C_!Io%;-U@z3N~)sjPbFahG%28MUd(O
zI?SMBtj+cqYpgHeQ=S5}*<o=UhtBO$DOa&}{f54QHzqj>+!H5GATGy`AIGB}^;nzp
z6HMFd@adbOojZ4OpBBI7O*h?iYI1UNR8vi0On<<qrNE9II}j7^$}6vYZLwJTUJwMT
zZ{X98#D4h0A0l4w-*(&Wzf(%h7-L5J3O;Ew^q>bl2vS<D#Ta-m!?Q6Z1%e<1i$qp^
z08dS7A+#dA;g8;jkKLHr0W5t1&sUN}_d7ffO-cbb4PNyHyx{??=@Fn*)af61wq%ch
z7+OETi;2&+2J{g;^PB7uV4^?DsGf&Md@O0E2r&II^L$l;XG{Ur7w}+ulQ9Lvy!SXf
z^QY_v(=tHy0etL-S+hid>E5VR&%+yPs1+VacR-)ayx}%9@I4=)ZH+NmOJN1o5Aas$
z{baJZ1&5rFZ4KbhUMO;q03Q<kQU}W&4-*p?{>^oqX*kH30`x;l<+`>f!1&P(eHuj<
zy72UZm*YC<G#5_4@CDC)5&iGB<2cd*Ch-xdatg1|eTT7Dt6*@T2G93xn0ug?I+ao=
zSBmhhZEm)OqsNY&f8A?e_Sjv2|J!b?AewzB6;Qc_r?=0;u!Hfj3!t?^$HFhPm#}18
zx8Q;ny+&gWfBMVc>MwoC^B!;Ef0y|{Bu0?W1y3oQI&}iBLs1Z5zS%}|VF^J%?=e*2
zSo^v2Q`og@cm3^eea+(!A3E?Gq=-gB2;>u<#)P1kH7ML$7MwH;yYLhZ=gtxQp8DG?
z{Go#fehn#^O5r@hvpu?>!kv!qv%_akfn4wE_<o9j;6H>X(XQ)&R7mdNA$N32VPN1t
zgD277|Nal~_rLD~Ie~u6<ha6%|NWJ65svep!IS8RJ?x>l`|i8&v5$Q$dO^YgOrCdj
zhF|2gtNnB;eC9QPii%gi`qg;e^PUIlYsblLZBKbm^?bX%3|re|fzQ4Oe&s7)!9ySV
zP~-c4sI|@=d}wuHp$&R<uiludzv+#ycwz*vAT^`7QOh@(-~8q`b0<$6|LYAm-m<;f
zY;}!{Nli+h+BmR*94Em@xSzh+p~s!q@oDv^T43g_Z+Y$WZISaQ0AuJ%NCUa$exw2S
z#dX8rI&wx4pqHTUx%Fco|I|k>yY%wgJ>TQO${5JakrG8y)FjNj1V+lti-`050D&K<
z0|)k={NM-P{n_2ScmDxESwIIdVBe}2>9W<Os3rBH>tWmhg~$OFvXx4u>OieFX<*3a
z8o&XofmYpn6cluF2y)APC2it_MzKL$U~eeXYBig7e@_4|!wU_h10wiE(#QcFva<ug
zPKcC28H{aOD#MCCWM8z9HVK_#3*+g^DneU2gVh%i!YPm_@|r?Agv#_A*~FxMXIq-{
cGX4hs0pc+tm#2!vF#rGn07*qoM6N<$f`>sX2LJ#7

diff --git a/src/assets/img/files/unknown.png b/src/assets/img/files/unknown.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d36c22271d07e0996afcf2725b414cbc1a32e29
GIT binary patch
literal 888
zcmV-;1Bd*HP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0009&Nkl<ZcmbuA
z1CTsN7{y=rbkFLKi*4JsZQDuNjLVm@b>#|6v003hvu*p<+nsNEdn&zk)8U(X`|ar0
zufGw~S|d`ermiI)9fqRZ-27Vlpo0#)^MC^mXet(qwQ{+PN~I#x>CBHe+;HO$bdCf`
zH~yHaG=vnvsFdOpkeE^mbi#pKTcv)+cy4WN75)9)n4h0Vp-@0RpGPW{#^sk^g+mTG
z#H>>$vbJoh#(<6%rNKC>?zzXV(>Q0{f-weC7z9DMva*8i?hX`-1%zQpv#L=|;erb;
z#(w+lNALpvRt!)|3pzJVfgyT&dJHU;%Au#H!$8yNG)kqCNp<F#=U|_G_C>i|F$wWk
z>7Dgh{OYT(#*<Gzxle2BFEXFsLNp_48(HJ@GtR=k`|ca{ABJo}@WNs2jv!iET0rf&
zY<YP(s%9VO0ZuvPbOUcl9#<dSRC|oI*kg}9qJ%7J3CYah?6aff``P3PaI+-BjqB3J
zJc7_|XzmyxB+fbKf`+!}q~r=zli{&ragy1P$z*Zig_l@(H5m@TpB#>zYw+7|zeT-Q
zH{5VD_TPVh({pcfz*HBMI1{tLm=6pLMo;l~^wgr_!nF_X+TSJ^Gcdd1@b&dVzt&1_
zPwu^#{%rvE+joz%q!7OeN^dqcB!@3K{uZvtwm(J!R@>ol;LZc&hsU;XZR`x78(ZT|
z4li6qRoRf%0#<R0@V9X7hg-W6w*G&(`g5HzhA@<nB5($Pg}@8<*!F_es|-Ud(8pwY
zYGgK*k`QJq9Ef|tV?YeUc6g;)g%k|AY!+Yv#>Xc%pL_O+2U}Zzod${9H>hXoXzZ_Q
zYzxVJoE8=qAY=+7Bcp3iKJm~U1pgXVd~R+YLIi-*9wa^bzWytPKuAnZPUfF`_VN3=
zI@`a3BYxtEC*bY3-@(qEJ0WFAmJnnq1zFZDqHWfqZfUAOHk-rr)b!dDk3W1{M|<n%
z313j4si|r2H{N*XqXP~+=-3LqN+}tmaLmqz#W#Smvx_TZoG&dcRbPGeg;(3#et!=@
zj$9#ckvGXjW(N_JG)LZppn<)8qsqz5u`5lEzTst39zaO0+5rl7kkTKrbQK*L*1mWE
O0000<MNUMnLSTaMv8~Mj

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/video-64.png b/src/assets/img/files/video-64.png
deleted file mode 100644
index 570c4b2b319ff8aae875897308c42d1bb69d0984..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4211
zcmV-(5RC7MP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000m=Nkl<Zcmd6t
z1#ld>wy?jW?m^qJV~00P?_Fl*Ww^}D%*@Qp%*@QpOv_ma?1tmSG21f@()q_Vw@c-j
z^xsZ=t6ol(s-?#Hj-*31qN?PJ(s^CPaQygjwr<_V`1n})Gw-_aX^*<_Mz?89k0xRN
z5b6M{Xx3c&h)qGNj32m0hA;WOe&omFUp)J{AO6+D9`!VwQ~o=m0I2UGA{Zm&Nv;A^
z^-OEsT~$^5>%bVp%xr_Vy!AclmL-4r-$z`q?h%b>mTK9yVbi(hXg6@yL7ZYry&M>U
zgYil>oYBYXq4Kf%)<=BORW~-#)O11ss4h+c3eplSm%`s0Bfnm-0$SiNn4OK@d1B=l
zqD1JO`5NKz?=d;PmulF+rZ5NX5{I^$i~rMa#suXd4oviLedR*7-SvsAJ!3T{02enw
zQxpNk17z?D0;p&<_NXXm2ev;2s#%}F82bC`FDRA5cP~T%wHEx9Ns?|7k&e3!%?RA#
zk5e1}F3ujOQkur4f~FQ{9hxdGvAEcwQH%-a;0L%aXu;p51;1)3ouZnvggxpBVg0?G
z&v|$htaH?A<?9CedvC0&vv?tN&UGn3Rr}$@@OtDE^i2H_m2rCN5zdw&a5%t-;BXiO
zG{#g`v43nS*Okv<+a2fN2NnfSH@xrTMLTX40cTymwYI9td<9S-8GIuWWccIsO#cXE
zjCxOkwPgg00RS9=0hE-Ww1T}O{p^vm*?Nb^FCM;Q+2_o*A8F^-5I_KB!3yv*FUZk3
z_@5v$O0AaQT!=C4`35p2pja@=TJTHQ<IZNwZ6C|J)l2`6;Q_Q0zDNNI68M>)`6))`
z;8RpX#3(p01{?rjuwaI`{%9||<Fna(%g3B1@PKmS6(Ay<NJN76%nyHz`pnM|9ii5f
zf(8hHkkMldC>Es!KitF4=9z4|#iLla<}{gk)eh`j1$g*I?BMW6Tkt<c7@=Ob-~zI(
zBr2H_5NB~_Sqr|(wX-ewn?0fhKX{tJgOV@dnP;Af_x~wNmk#ls_kWV!sV`BP{2?O8
zsnsn`Lqs$K&y;{jijyJs9;tB6%stq6(}$m4@C8v-_?zGS1}`u$xI9P>eB9K`AFy_q
zN{_?25HSug^JiaD)D5=a%UnHuCL3?^u+tJ=RmqcZ`B0TiW}7K5c<iR9t*>4_&=}uO
ztsdiSX$~HPfq6<u+k3tRzhml5Hr)83tUF^F#+a@jFESrq6c7*L#{h~bsDQtw*>gCx
zDDI@;HOCKx|M=b`@WPV8!4*$w9REAzQUhlLj9Nf(kSPJd;#kh!Irz!5TJR5M<GNME
zsbzX<1o^MceD`zZ`XFIg1{?WD^WiCyaD{2&MZ%<Uyjm(*bXL*80boP`ixUW(#mWly
z4VTz4bru_M{17&@;73QU<Jgt2WT<>8L0CsA1L~KrLT9F;3X)w@JaBf8!vop~+$?GT
zt&weSz|_}+iwog>KgR}WwGS^sxnf8oaH%3{y^kkAh;XI_f3(C^(=GU$JY;U!lO&dr
zD__P9*X*UV;_=wApJC#?IR9M_mw~ERM&~)ztgqP^Q`-oG4<|YBRqXy(lKjtSQ56&|
zh6glf4}_*~0M9RIJljrYQimWIaX4u2`O=EE!J9psO*eVyoWX0S$5SH=m9M6>{_V{6
zT*Tz`|I$10T&g{*P?c_Y$N;ld07{M`92yOyYhOZh@Lo*LZl(Xos|npW5&a11!r*hF
z!BA5-Ujg<%>1?YR1P26~qUDt>_$t>l&t>yXAI93u+ADx!f&fb|IEZX76}N=SrZ13c
zKd41f=-#uro&p6-NMm}0^y2$7Kn+bH(gC8_P!m8Yg7+75w}9<bfTF2G6N|$TkV3eM
zy+`ZpjL&1s%^vRIy`buF=_CZuoH<TE4og3=4j`l`-n4^u7(D5S*aTD&4QQkh8d)@*
zfDoF~#~E-o`)DD&;<s6j0`MZBR&nuMa~MsLQfuaq^{^{Fm#w#aBx^fjdj(Vlw1ggd
z7f1G7iXQtBJ!>kYY7tT(MLMj#DD&MS+U|Qlj{t&0330pL&hXAl(L+C=zOqc}KoR6r
z;k^QM{t8GHO)T1sF_jhUJHCY7oX6H%Ke`K^c|l4@5ba`3{BMF~eZYEDH3M8kkfSIi
z%<Q$SY5tR7NguE=^AwAM2QWAV-%zKxI3*|zv43oU-S&L8-sZ6<gjdD)ZGu#{5v+S9
zHr#^R82&2}9%vF_dbSh(&+AAlTOo~33SND`Xay)FbMXD_9WAl9dI8&R|G45}28w75
ztDjHY-?G$=&Ge1DmVm{<OXeC}f^2yS&E@xJGTy|Jy|2QcAb=LbqvVQF=kU#9f-(nM
z@Yk0vWZRvePz3MCDp=_S3r+1ON+b(`PdT>Ntgk{!51K&4AaNoHfJ!lZkryzgLMA~F
zuzz@(y_K`se!G^nU%3Ey0B9>PnLq<*PLI;>YzBaw0=&0~pw`a48%ofaIyU!iZ%m8f
zQO#ck;q1Pv$V5=a4jp3KInQR*s%3yJfY0Cr2(kO#$&uZcp+|m5eRUbDi_7XH>r=w+
zcq>P)y#)4spZfAL)&ZhL@Wsi{FTeXEGO@9n`k$MvKDc(xvOy~XTAb1%*~d!+jh(D+
z{)=F+4|Kz#Q(7MphnT5rS>3#tpk4zu0)Wbb;d8gZBfjMDLh|J;{V%$8CH%=$j1<EA
z9gf-vsck1*a}nwA_Xz9^n(64&@_BFM(g-v3Ka{uMi}?C)6Qr}Kf{G%=@c;jk*iV1{
zOEPiJajTpD&p#sV8$;8<B6$4Qz$VCs7ZMNNhskIYy@y^+2!NgvykA@nu?gk|FJ)%U
zgP2G+v*g-W5TI}}@OjD5dFPzf71zv6H#~SQd}oj&Sb8CaNS9Jdgi2T@kUD6JXU?<Q
zoqZ4!U`jO<Ln^&!43P{HB|?uVs)7{2`$5hYu-4@j#gPJd{7qmT8n@&1#>^;vHezhw
zADK>i5G-hi+w7Pf5AQ+51k6rN(3>{VcoIs`oEo9+VFb`Zc-4YHh;H#|sZdzS@fmE0
z-SsvO?Yb0q_$SnsL^O6hnch@=aYN_j{=V-N1#sF`52!0t%K_2FEiZ8OztQWyOMR$>
z(>A;mz!#N;L-M5nzB3pqA+tMK)%Yi2-yn_})i8pf13m-R&T|=f#~4skK_{+d<&jGW
zDj}NX0wRU**_AvA7Xv?U2GVxCUfy^wl7l}$ng=mMcLPeOI_M~TNL~d9P?x<_a5lys
z{tIFMHcB_S7xAud5v0=qfEL61SD%~$6p#XV6ja&(xR{_7uQyiRkBN9QJ=ed2%1u8?
zY=#g`b87YALFfVz6EZz<lxX*@IODD_V`jrcm~flvyW*vUD5@ZZ@Cw~-AYTC@omMa(
zex9h1nqJ!R`cg`<P_{A7Hb7GknP0%@0x>~I8qeaKkeVJ`(-D~=%88+bLNUBQ=7=Fz
zv=ClBK|5ZL{u8fHkASoO<DJvq3GW9dUK!5fniEhqG^dUs&VmYxE(~4)U4#wDh0hEb
z0+dL1yqQBgFTw8p9`$8qoGM6h-M%=V4@v(1dWNsQ7`N*?)R&g9*~LP5Ka~r2gJdp7
zit~8^0M!tgYFX;WT)bWfHlQpH-tWc|GPa8qhu%d{5tQ`{h6kV{Au8Siy5LHVUj=D|
z>Dx}_X0OH7wxVgg_?ge*g)}A{+D7%xFT?e1fi%jzM-jZwRZiXw%E?u7Y(j9um(yJT
zKqlN4daiyMmBqlLKFpm{z-?a5%$A2U&Sv`l{Srzn4Bi`mJ!vDjFnIAk+nPQ!hFAuP
zVgWgIc<;Xzq3vN@BP9-ph^;|TRHYDJJ;}lqpzT%+kJqp|i$>!}31+885N8(ypWTQ+
z``yiPsDv~o+a4xcA4Tx~#V2YxTfm2FQe4cy7cJt8-^k%>F2?TpF7?3@P65$Vg4YZl
z0ZK%FejP{VyudZzp=Y3ks-mJu0erTKbfJL|a7v|XC?ONqvi!&ugyj+{8xRGQQ-TMd
zEIA30(LJm<@Lqx{sH{O1K#JhoN2jDoigSK43T=QQCs)QwBZ7hLRB!t#Y;U`EuPAz|
z@cs&<F{Nc&sGa#@T>nN$6M%)ms}e;qQJfH#0)lXU3k&{oyui}6LYffX{8cnJKbR@D
zP`mWS^pvUuK@YeDGNXmg>nqw3)%m^zB}{1sY(jX)*D}5Rkxa-I`u_eRN_b#$;N2X2
zvkkv`^|H&uAQ&ZJfm=Wo6(JwKJJ7H}FB(A<EF*{<@vh%8ZF>={_uJj?%Qu2zXiSgO
zqmDG_!!=@}(hwDEC<9I%q7D!M1W*B78$L-==4LsbnmP2er#|87V`F0kLC~oH&2fPs
z3n^WzA|?c<Xk!e@(3~El+88DH&7-KL3V?Q|zW@%P^Uo0TT~Q6Fg^)I;pj@Ugag+fu
zqz>x!GX1^%Bxy<%CB$)ph)}JSNz;^x@oBE#yZ7jeU-azzUU|jkJD^)a&D{c02oH+0
zmP+4p?8b|j{r&S9zT%H0yMIir<PcFRB@eD{KAalg@A?;qR|L*N^H(qB=%v4ctG`R>
zmgf-#y=-1FK(iSWM+q~tO{{hF_0>_QjEqch#g#jbz510ey#JovJO4qBNRp<V>G0s>
zWMgL%r-KL!s@@_2nl_OgA3zTMhM-)>Ng347t}32VyJLymYXB->n`qLYw(UGFE1$#a
zwd+~G_6)|xr<k5;;+$j2k~+o+!^6k9^2)1@z4}!zy#MZ9JO2ofuYlyl3W$?rP(&8~
zS2PJAtYNTZEaX~y52v|qQoEHTf<yT0AAZA4Z@itAtJ(@U1^5CZcq)HFREx$_SPxYk
zpmbG=wL@{8=d$Nhno+{^bYn5_1-U>meDQyBa>Cn81VzBt3jy)ZW=DSx|9l)L*hRtv
zm@o`zwcJ=>@x_edy8XhlI-R#y`}!6K4`6=!)1Pt06<0E+1Y-o%(-U5q|NUCEOb{#%
z9>831!TH?smbc*D?|wHT(q0XE`oW_L`0&<R%ka_B#lU+TkR%B&c)<&J@{^y;T;Bx2
zX$PMjt#df1%+5x%Vw=UlcN@V^e)5x?fByNJrl~W=oObX|m6@4Ys?{pTMvfnQ`OBXB
zz&1S6)fOlr0RAEU)1Uq{abW+x%l_woZ*=C=)HKrNvlR+lSiY<41_MBI72+dK=Sbp|
zI8IP?W3PJUi=NVo@Gb^c;sa~NAG5v#Y}W6%t{J!iLZA$At6Sab#_xX5``@*0?fRQ0
zY2yFq&>f`-zK=iT&3p$i#d|(eT#{OBYGvons}H>Gt#A0yjvYJx1ynnrEgm=p651^S
znm|OmB|r)|uK*|kWuOK~rBbQ)_4ck&v<!p_0a;UwfB^)-<Sjve%=*%K4p6)ZfOcN+
z+7O+do|=lHI03>8zN1;X70?74v|9wkK$0l{yb=r^Gy^l)xU*%j9euj{{+M&F6FTpl
z!@pbUUh0~oj7%YZh4?LyE7CbGfRF{fV_~8NV*o8s-a_8N{{tHRNpeoAho1ld002ov
JPDHLkV1igq4wwJ{

diff --git a/src/assets/img/files/video.png b/src/assets/img/files/video.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ac140c8b2420c80a99ca75e6a7ff38200eee426
GIT binary patch
literal 1261
zcmV<J1QPp+P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000EENkl<Zcmai!
z1CaDe8-<@vx|5lmwf)<+ZQHhO+qO!-ZQH)~U3~u5-eHpN_ok{VwVBdARnK_NseaF!
zC=mg`T6ceI?RCS*B%l4rn<@{u@r94R*39r=(nzgsB&^maO{a3b|K9Mvul$b^XFw33
z^Z*D>&_;(RjM2XWP|i6-WV+GlEI2B)w7x{&=38-x=aSSD>_MGV?R(RA=Z`ZrH&4>6
zBSKCQApW)ZNO6J+R5m=+e~TbcmuaOGKtxcDvV#SxE3ZSdfQ@2ICE;}Ef%M<@!;Ftl
z<>n2pRtlUGZLO^+6`(J>d;x8G7^&5XSKdHPFGJ9SN?ROD?nlqf-<z9{lcjBnvG_+o
zKnf5<3Mhnr$o+564X-~p_O16_%T)E1h^m20IDT*!%yr+#=-4<(Vi95}jQogv0uEG$
zxU2}HoS^^rokwAe+(UQ%M=FA$!STa;;-+82Q1TtJ<x6o{14JRtJBTC40#&G76E*pC
zM2{en<w)1b^uX98E^VszZVF*;ZtqX!hVNx0K1<pdN7B>O#%_mofPgr`n<#93nYOtB
zVf|uc@P3G-If9pvgHGEPNmA@?lhc)ZQ@iB{7#km>y>k-QzCti?JKBTK#aZ#QFE%C&
zNwz<XI`t{^4c>r2(E(-Y&}p(nIGx>_{+qv_@!Z^|DL6|w@<>E1%C^9!P%;r$L75@+
z%;RwmMBGsalsZ`Y@88M7nj5_L7Z{zK&coUeM2IMoor}=bX*8;9Q~ZP!w!Kffb3tCi
zHH+ds#kK*#4=$bO%FeC-GBq`on|FYsBq1^e6B;C}fbNAbM|&_a5L1mK@E2<rK2f3H
z`RQ-sM79qPS}8aq0x183HrIijC4$bUuudRHoWmC#pbnR)S8hPX(j8D5lD5{TQ{Ha@
z=OEhqJvuu?vQ=_pu;R_FfCJauBs#bR8G0$sw~WgvCuqEm%mJTZ=?p)KB;BKOgBN3M
z)^(*y7?WJ_HLQg=2XUqGK#>w01xQzkP84e4!^F+YvCiVMc8M0wS?tc0==0x+5{Cnv
z_!E}Lq$z|Hm$}DgaD%tdX|7>xr?iIR$%9niwQ;w7Kh}bjiY}>q0{<YT!zCAe3U#oA
z=qdyzM<1bkuzM%T{`)~F!rf6o6d59;OC1y?BfhLG#mqejm$pc^mT*M}1wo8cG4b^t
ziDVX(_c2k#=Elax%Gu*<act1gy+H!tEJ0<MP8K02euY{19?AuX<LHK$WrWpX>N5|g
zw||!29s`v=PMtbkf5G#g_2dgKIClj=i3n+$U2|{0vEZyTLJ<@|YmGoMoG5Qvtf3Tr
zIS%U$>hyD+>s*J$#ijk{J@@I4z4Vfc{(u*HeSL%c{?m1@_XZin6Qn4=9c7AHD@f7<
z!mQ1iGiRDFc>Xh=P?#4AZhYe#@tyB{m%hF}jEQm#+8F<=155}}jwuMbU-wjFR?e>M
zKkJ!KeZ<8VUGQ7F<*OMS931`TH^2Lfsp*;Pr}?}@M2YzEk-siZR*a{3Rw@X#x3{x*
zzVj{byy(L7e*)Bi6lef-psnyB+89&I84{5Y&_D<TfGSaz09b32TumSXGJHS_AJVxB
XX6KFrt7I6{00000NkvXXu0mjf9|2@@

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/wav-64.png b/src/assets/img/files/wav-64.png
deleted file mode 100644
index 819781a9b564c188089b5796a99b661a94cd07da..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5410
zcmV+-72WEIP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000!}Nkl<Zcmd6t
z1$11;wx+*bhZ-eWvSp5w8&jB>efcp%@G&zpGcz+YGgFv3@0u~Tz=FmDReL(MCcS#x
zZjE9Ocx&xd&~(1PcCkcN8Ewj$uZtMw=jYkJV+V^13-Ql<{FR^o3A;Dm)M|9{^12$T
zf;xIGsN&1cmlY9V?(iu&^&fBOZyam>)<^xy&;IkLe){L(obrFh6ab~4^}lJ1Fv>;>
zpsIVUb$9nt0s3z;#?Wea_`V<ciDKjHf4=+UHk$`Jxg|D=TESU7uy-psCupIBamdNs
zu>7uTxn$#dHq_$TvG;!RFX_}pU2I{_gaA-IKLOP9i^fs-AI8YPtXhB`_*b^u=?|S%
z95G}Bn1BCe(!c&W7G~!Ni-Mv6n=7_pzy+Hrajn8^SYr9T4|44TpULJ;8!!f3yNkL4
zML-z@@bI1hP|<$5kLn4}!0uN8s{MRm4CCXKuZ*JbM^+<1xd;Dho)?#h2!n<(be*B|
zcRz;v`=6soQ^G9krH;JkMW)!iFMzL)t5s%`DvR%VgzFyobT&<{VK~}Gg>WBr7<RC%
zXMRoxKaO>daydRYF<!e;Roe_$=$so8Kvl=#?C|-&`~=~nzl<w6DiP$}5X1r2r-*t-
zm1MHYOj2X{o`<;ZQ$M2zKXG3048srR`=)2SRRo-M<JQ`eD*vkhtj5I9wFdWJKS}h&
zuOeloWDHp+LMc!N%^~WD%Vkc6H5TrCh-*IOGtUctIP6EacE6-&b`1gV$~zOlczE=&
zpC)?p*9a?)N@9G=hggQG9ARALgj6|w`$Jsyi5CJqfO-d3D}aIt@bHiRl!uQiO061D
z<Vv8zAc7!>=9r+$v7*e}Ee~<U$9@KzF9>)*IeP?%$cU&9NS(p{doS#t`gNj;rB*kf
zLJ$sqGYC-NP%0cJ;nd9!aQR1mI-931kd{{+YWo!h5a04j_K!bC_{6Uhlnbim5VatN
zo(n-_`tX9{Y=sk@h&ONgRCayvVK%S5P~brsZQ-6hd-?@i6s(z=;>UmXm;F4i|Ncu*
zDkw#vpVERDOlS}zeG!Z(MONZi7I5s^PhrP<9%RefH5VTIh*eeiumAe54BDD?)4}4O
z{;-*N?vGK|At@V*j-U<zU{C}lFJg|g0uEjA$y|ER{cKrx;lZ!8+z;1Qqkf^2J3jx)
z>gP|r^4Am1r6uZB$l4*Q7G==<I6$6899jz4zw48^_^wZ7%k(+GO90OPUx(MepBVw4
zdou$zHd(KJZsWiqf+8pD1}OFnbU|?BX^F#)fPLFPnQeD{3R}+w9tfJpag_}?fd5PI
zD_K}u&KWFc+9?I1<f;0WA6`2<3R~r9C*Z*DPvT+^KY7k!A1!}~v@{7OerNFg?+pMu
z8or+&F$M(VWd<!w40!=IbEwJ?ywfTtnubGHe+rl0egC<IJpcw=MttNSan((9$1X!O
z8;0*Q%UK7upnD2innD#A2@g7=4}{5Nb%0Q?ofMmE&+#7?dX59<5L4r19&+ra``Lcq
zc@B6208+FuT8wUa1Z<nAGecgx1f}SIy+f!jzD#?=Jy>LA_z|l?<E-+wYtNlitcCve
zHg^=A9HqpOPRx<(9`aM&Xm|w?Kn8$hNDTGvz-FKh6&Y@M1z&G7;&c`@AxMCSmw>P*
zN|-OAVn)I<2+yz?b;8^3-cCLI+gn<TL=}$bWlr4uFn*CU3SI;xK+*+p1*iZ5E<?2d
z1x!fLJVMku0ww|fKF4s&<4fW)Pz5X|TOjOx)=3Cr2-10?d;yS=@Y+AwVuSz+Z##+?
z!CL9>=Yyom396jD<6$oQs81Wc!ZQJ;Gl%32g2oX_C;tmX&>$jQ{BNS>QPe~zf;vl(
zHz9AMMS&Lq&N|>F3$Gz+A@5S2f1XnND3}0MPy~t$Rd-JC0LD2ObX9y>WJ*-3_$}?+
z-H&kP$F01!M-^$Dz+}r_M6+}Z5r+rPx=7K*3j#>{G<27VmiA-21zK482X7cu-tNx=
zSsMVFa|Fkqg0uk$2w*L?n<DCeXO-}yyFlM<uEf;}Go?DG?|p=;KH<|xZ)wHgy}O7x
z_7o7HR<U_O|9SEpmvu2SuOb3w@d)G@+Vi}f<9aC`%0Ooh=`Mj60$i4&YGCdlGJ6o$
zX@dv^F}Bmho;(O*R)p6Ty8tlg&MHZ%#9X<?!k$OC`jb|G2j7y2S0C4GqR#pjwXF`Q
zBI3If%pM|`c>^(_pJH9=1t4oXIQ|;Oc5z{Z+5ew}%g1ph1O(UZg3T#fUGip%>!c9I
zm^WX-9C(6kxrM@t@aRerU}4aW2q!gU={*l~?fomm69jPl706n?m5Wx2cAD7ZZ}^$R
zho*=ZwK(tsc6kXk;$dvNjq9dljjpc;MG)+<eYiLN9b<e%_-R>fLDqxMS_QV<1!G|D
zF#612^y)043J5F1>!|Ip=@$aigYOh9-}fn8_i+!hY0V1o#^9Fc(B(zU{Bhi=gSb{o
zxc_<V{7L`NfpZ|>tf4q@oFJJdK**adFbOIpvW~&b&SLgI1DEe1YqW{mKFobI6+LlG
zVab~rvYZm87DTa`C7oF!ObP;ZC<Yk;uR1yk!lk`4^sTTg*_^As<Re)>H3e!%FLI2b
z`@~-p*o<)f4vIssQ_L@7(+{CR07XVg9iobJLb{X^EiMxpA#Y{a#e+C&N#`20U;R_Y
z*Iz++?Yqeq8xVygVF(K+$q&3i{FX2+OaA&BR4=-fK!l=`(V1zGtc9`(z>b7pc{B7c
zfBN(QziV7`^S0w#)~}r`L_p6DFQp3Y=l+A%qyI$Zs#|>v6&*`D-@qL^NwRIH@82bW
zIK*i{_jC)bFH<%`-nA4jJ%yC3qzfIo`%h4rog)e$TTUsKjuAH((Xd3`%!%`y?ui+?
zhu$P!Y7rQ)?UZf<^u#RjzL$`lH=t<;g<<%Wy1<uN$AIO(GB*CzdxGF^8>pNWK8kVO
zHtiRlV)60Ea9X0aZW~2A^L;d*J&l>{lAb(<`=ei>bo0FsCZvmPs4W3t3qy17L86UY
zDY}NVLoc<6Le>MeAKK4Er$y0h(K+@eWvg^g&6BnTn}eV}0*X8$efc%w$Nz=Wj_YtD
z;B**%r6aMw|Hpso7o2lkfBEjG)3CNcUQ7<b2Laj4o1}YRqw&;}G!LD`B`=b9m3aL|
z@>W6n#5~cawg+zi#UE2WaDZg@)xGzgfXXx&a2nD&Izy$p9>O{{7{}TG0?1oA*<wnk
zC$LUT(S36cb?Rq}&TNa;-UHN)kase&j*vH%#xqY5-SHZ-<0`b%LX~0oQJbOnz31IS
zw`;9tX8;_;2r9<=!e9L<?H8YA@rftN+DdS`Mf;!rnaO+KgUwA3yhA#-gv|`?lc&*W
zAEzIGlFpGC;;kvR(eSfCQA9W?VLQEi9@2dMzZsujCSPokr_g-j2{cKt8spN;cZKdE
zbWfeeBw%xgGgYKsV)5CRFn|09)ITvI*mfxt1q$F?A8KS5u-1*dW)wjENZf!Rpg7$F
z>ZHv7`+p%}1xFdFP7;l+qiE--6CVZXLKCNs#@-_Y6C3CppTSAlr!znM6EvTH9_u3f
zyq*_O8mIBns~r8tucUkA1g;2rptGdMkCM-yX5r8On0%>?h7qkp$C&@k-=X!)vuISs
z<sGtC&ir5eImxcescgTDe0~nBLy{ONl~-H{g=d9VKotUmc2m;*`@t!uoRI9;O**^4
znmg~L^X3dTSIV0<lQ-JE`Z=64zJ-Y*zsz;HBU|neO^oB5u<&pHhDk~gS5ZQ2kwaAR
z?`=N!0{Ox+B7$qDXaRYn!%{DTY&#=dyOHjjvmE=5Zy{e=CZ3)~b4M^XMZ9@4odX96
zUV9mxIR!~VFf|2Rws|o|nPDY!4k=ft-E<4JTW+Ox>#fN61l3);n7HX?!m%-0`}WZ}
zc!*;8t?*qWtW+slZ6t~?<ucj)ya$RVr${z!Laim)xY37o`>pYz2N8{rd%?<=ZYL<0
zv7HX(?c3S#xnDr32Ugv=i*RBB6US(tGk*7dMAPdjmX>@3sZ)}z7m*)7jvhNq`OdqE
zuD=QC!E0dwJvRXqz$q^G>vf7wO56jPxZyf#x8F`!E0au3pxq|6xr}JugQ=lKm#9{u
zG(ClDH3+K-r48$drzY9-S)Wa1=MGF{aGe%*d68tpH1T+yb@x9&{rc-DO^s9S30!{9
z`x(3GCN_TM*HFIfGC$3gHcm5s&plMHzZT8Agyje^j_$#I)ULgjaB>Q(;Ihoa4_vpe
zT7Z!!Ihtmad#y3P=e>~Uj9s>av0d+?wtX8$I|Qa6o~#iVOFU7dw(}CAl2Beh*#oR0
zMVsVZms0=WM<BLM5EQuOIWJIo^EBmMyBT};dx$C#LAiu&wuslSg|*YfJyDX0GUZL{
z2*$?<DhY8dCM<`3Ka$iF>hJvk=9(M*{$co(S<mW20*C-BoZGuBr*_*NB-<{gw045p
z<-3^r@Q)y>#)Oe0t|cU62_~>46IC{U=4UZ}<MsZ1MpKL^RBFWICE}_fuE&I-WzBti
z2)15A&<pLbBw&Cr@U82Lf@IAY<qc~HOpb)&f3LoC8)4%7LCMr7-;b`}gza`v&(??c
zDXe}FT;WU))E1cf8l1Hx>&6MErYY~-P4(hU<Z}VZnhM5N2@}DTl=@rK<KO-f)!XhS
zKlCaR07fXUtK*suaSf933gOyGECv%wPuLn^y^0ls2^5?os>Q^$kmS<K{df?R0!%d|
zFjY#G9fX^=QaC^X&VW}y-?0D;!=w1r=6*$3+Pc*bTH%f>DR0?8oLIuK1d}HOVL^Q5
zRfHGq^aGh08>e#VyD;NZSdkudf|CGKE>YgRo*)#oC@@LPnveV>%(k5rc|i~XVo0`L
zOi@zGJ9ZFkyvTQ(pdKRIuOO<`k<g&d4a4{Ob@c)${tr<(`;CpC9jYX^z8Bs13^F!F
z>B{R#|LZWxWF2E0Na846el>1vEkUh>XioXoJ?Q#v$mx^BlNB&c2q8?Q=OKBPdBK96
zSCcyd$p~vDFacb=i?{;erY#gxTm6_2&L+sVZ3OpzDmE-bmJY!KFt{OFjR5_3%Bbrq
zg(Amn-i{;*NPy|}zskiI5sXzau7(65CIsu0AXFqUP>OvkBZkuYNeG&_ZilEE!M4lM
zB8NDkunKBX@G}kSPy@+S9b+uHbwrbs#FJIrM4fc%Vq9wx)D6KaIt;$LE+8Y|VIV=L
zFTo#j#sSf`cY!T1j6soMk_f91CdRKPv^I{l1q1;}HNYgBaP4KH1k$A9BMUdUcQXX#
zn8G<EjEL8cBS}EVIim43#A~V)rHF2xj)d>itG@F=P~m@nU1f7HAtn&QiAjhO?3#51
z$Dcz>CEu!Y@wHH2M-f)NFd9_|u6-}@>3!G}uM#FohN22G_}~ITeVhWoKs;8)hWJn~
zw%>{CoFEJpRUHZM*;kkc%nChV^>=l)K&G}}ckaQBO(WHs4{J#x|5~x}YVx2&|M*)B
zZp+n}$@N5K!Nh{%(TDnOy7e{+H3*Kl8WBVWoFz{t$ZJzRx^Sc6(E*5I$Bb%yR9Amd
zX*2B94$|rt#3(@$5mpi;3;{)p40K?hu8Ihl*!)i@0Rh$Flbl>4)H#eeic9ZCOI81x
z7d?*rZz*mhy!u4Z5ekG1+c{iO1J<I5?+Qjkf^x|Vpl<la#z#ecE4Fi#QUV$=@+3#p
z`EpU+Oe3yP>3s%Y2NER+UDN>p48!}>sh?7v^W9~2V}K&aIo!`@Q&$nsy?`WDit;q7
z78$y$D=3mFy3rcOLcs<AG6YZmGY)4W(r^+TtAWiB2`S2JQJaJ6Xn0l9G(%CsDDWbz
zY778<$MB*`x3n3D!NoPY<;~zM!<QD&zlM^4eyB18KcImFF?1>8E43g^HjzsSu;?&6
zPL*yqBh7NACdXe6gWz-=g$()%>i|VX-tm8Ch|5tiv^U&~vkHv5u~F2Ro=5#FGjte!
zun`n5a=)J!CZSQ?joJbL0aO6z;mPxYAPmSFtrMUBd7t?O3kwSbL2zal(2-N1oa?`(
zge9_Y4NetV>BfctOaK4~9&iYLcw-|7d7e|NSE<)GP{}jWG$+e)M1)c~rYH)Q7MmP8
ze0b(-zWPf(=G9kTehr2#)RA34&Iw*Lr@Q8AR02fpXn0#-OVec2H<M3Zfh7cWtAcN}
zT7)5NnBL+;yq)H>+Fh)5)aw=0DRXm6yz=U6v)}SfU-fYZ_V0cAogav(zC-wa4oi$v
z84a&^p|bLN7B;+}`T7kM4rFC`pCZEX<3|YtA<r$#jW&&zhi7c8LJ$b2X6AXd2mh_#
z?BO3}1v4Y2$8&@4=iQ3%0P00>bfPJ=NLL9Ds*c6QMIY|XR@b|89v)+Q@TcB_e|`2_
zdhq-A?foxSwh@EidBL+H{Lnn_EUX5;UyuKMH_d4_JLd&Istf!-gGY7M@QU`~0UrVO
zJmCRM7zXrwnE%3pAKuZ4P_LgKJb?MTzx#V$dF53vf-!>Xg$b{~;P019F+p&C@Brq6
zAN&B<Uw<7x@*_Wjh<G8;3lAPu7+Bs~YdJM@`n=!)4B!_PU-^|^$>)5|=lHw{f(s44
zpIYZ|PHDGOdTX2Wf*%?Lf9aQgi4T0>16mY?GsawS@J^Lht4*m?Vs>tR_8Y$b%Ra%w
zgADm9Ed&_&kUsk8qf5t*9(ifk?kn~*8clp9gAYGCKXffU^uA#*0Cc1veSw{G<XPcI
ze^s~e&ENFZpW9pHJP)h~034wGw4e8G2l9ij>)YT42!R;jh8u3U@<)F3Cw_SAmW!^=
zi(LC#a~;|l%9)EMR@~K{0nExRKNxX&VX=jky?fs{_Wj@Yoj?8BYp*>El+J**1Hc84
zgZC8Z;#2QAPylXFfCz|zG9XEkRO+?bCPiZ)R0w$66(e8(K`^62u%Gtx!f<%%;9CYO
zhW|ka(Pp#JNYg9_!U6a}x5EN>_zrkafegq2H~65&dmpq9X8Pq}?+Z8#?wz4@xNaDF
zbe$XQt_+8|4vW$EVlYAmyTB-uq4LTQva0V`ohd7q0d!^YR`nhH4|7@cT!Nqqxc~qF
M07*qoM6N<$g78l@)Bpeg

diff --git a/src/assets/img/files/wav.png b/src/assets/img/files/wav.png
new file mode 100644
index 0000000000000000000000000000000000000000..b12df5d4cf9c9d981005b06d7339e9f1f093ac52
GIT binary patch
literal 1417
zcmV;41$O$0P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000G0Nkl<Zcmai#
z1B^9G9>srEUDea$JJz#p+cws=ZHH@H!Fq$W9X{Kf`83?&ojbQt*xF9-q}L}o#pIm&
zBi+J#4}i7qlE8yhtn$yi@2$ycPygbEy@v-HS%xjz1?z(c=;*LBZ#(*BZ@g7ltHI-e
z+EC8UqqK@<v{t_Y5Y9P*$z-dQJ?>R!cQ*GZeEW55-hVgE6-#@i&HAyIaNvi&!sLE?
zk!@_^J%Rr)2y@BO67M`h3Ntv+cdV4+VI_nBh($+dobP!A{nOW=^Cw}v8<(%JcK9V6
z^p3AEHa-!=Tl`-LaLy}hZ6bt3J^a`csHB^Le3j_Ouce{)z*qy}SJ`#q73}rm&oVkX
zMv=Dh0RQXtwS5KD<!2nnp?i;yeC7O6J?LjJQv*b<&Cb!YXk7P+Qru*1N_bIa+f_!?
z#Mx%uLH+*OM-vHuu9<$4W}gJN%<O&_kX#?cNB%CJ0^ku~wovUQ@}7Oc8%iyxgk3fJ
zx;b)SVu-H(K9M$|xqF?*yU!rGA&8HTV~QMVuM>F_)qEN+6&{H!HW4mI1Y_Nv!y~Ko
zZCj%XBZ3gL*HYT2T*AJu`Vu3fqnJELHg_RxhV2{yp@=quxG{JUfp@5l8Dzde)_)MP
zy^Krt2Jfju38`@=W#jmZIq)5yV{|NtXBlj*!Tb~Wjvl;`h*l8TSj1*6Wd96aNbJ%s
z*qp;{7I>S(P=q%CwHiG3r~9EX;12%8*BPFez*vV}nZ-PLH*V%Z)WOH&ZH(JJgISr!
zOh14&eTd#6ve{+)@)Eu)L-q{7;gYfzuub**i8DCj;Qjt`dJs>I!Q~kX-~0l;xdLGw
zO)o?5AbM<^t-J0e-!)C&)DpJ&BtG3L_wnJ!k^bdZ44?h1GBWRMRb_#wdUwB#X8UoQ
zW_t6ETY2IQuO=QDA?oP~LQT@SS$d8?5!Y(rf~f52Lpp==kS{Nj9C%1Dzm>@keT3xn
zvp~m;jSZftmAYG6>j*3zMI4hHdKd$jTu!mkBwPF|L>i%DI>sjn4?sjQ@$e|U=Uhn7
zsb?WOx-hFNcqb5fiby)Cf1VTowO-caQ;a?1Mv`7Z>z>=`JYZkcW#^I{d<3LRMBdVP
z{tK`htBB5SRJw?d6Vhmd<lKv}&O;!StQ&Z|3oHua5c1IVH__Fxh8mtiopA*uee^x@
zdt$9oha5?iweho0(0js><->Z9ISiZh;PVvfMP?fw4`2=S3?dIamcCO@L7I$wD5R%*
zh`y6fLT}E}io5VKB5E{Hc^9T{Z=6oZU72d?khK(*LpcQ#Cu97fXVWp-j|<{f=wNyR
z$#56tJrPA?Z~WK+xc(8OmN@J1l|dY9Vy$W^;$Odt4%0D+Y3z^n67LK~_ac?Ud5?1*
zgre1d1k!90MKQuzbR4s^xVSjGXL`P)L!+u})qf(Dk;SVnTD?bX_q7fCv~g4wtt;ok
z6lj%@^bVqhWarLZo3DJui=T7vy?4z5$S8`~7O&HJoKTpkE38dvVswMmk@L&7t5T7s
zZI+f6Q95RNdS?A4FMjUzLHv(YkP8dpQbkZp4}s<6e4wkMD%Ut`>JPy=N2D~nckkYM
z<ttwF%!eMl{}0q4k2vCRe(-}I(%ajM)^VUl1!}FzbxBp8mDEb1RCN~CU0vPG?wMVG
z@r#~!?F0AU`&<460-(`o41f2#Km5hS<kTTWQ5f&N@E%b`BdP|#m3zNE3nAt5^0N8R
zhu-_4`|rEwCqOq)04-n>NJV9$!b`gY2ZCq>C?EnPAZo0`16XVGfGr>fOl8onOtQZL
X+MPbgiZ%2t00000NkvXXu0mjfmd3w3

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/wmv-64.png b/src/assets/img/files/wmv-64.png
deleted file mode 100644
index 570c4b2b319ff8aae875897308c42d1bb69d0984..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4211
zcmV-(5RC7MP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000m=Nkl<Zcmd6t
z1#ld>wy?jW?m^qJV~00P?_Fl*Ww^}D%*@Qp%*@QpOv_ma?1tmSG21f@()q_Vw@c-j
z^xsZ=t6ol(s-?#Hj-*31qN?PJ(s^CPaQygjwr<_V`1n})Gw-_aX^*<_Mz?89k0xRN
z5b6M{Xx3c&h)qGNj32m0hA;WOe&omFUp)J{AO6+D9`!VwQ~o=m0I2UGA{Zm&Nv;A^
z^-OEsT~$^5>%bVp%xr_Vy!AclmL-4r-$z`q?h%b>mTK9yVbi(hXg6@yL7ZYry&M>U
zgYil>oYBYXq4Kf%)<=BORW~-#)O11ss4h+c3eplSm%`s0Bfnm-0$SiNn4OK@d1B=l
zqD1JO`5NKz?=d;PmulF+rZ5NX5{I^$i~rMa#suXd4oviLedR*7-SvsAJ!3T{02enw
zQxpNk17z?D0;p&<_NXXm2ev;2s#%}F82bC`FDRA5cP~T%wHEx9Ns?|7k&e3!%?RA#
zk5e1}F3ujOQkur4f~FQ{9hxdGvAEcwQH%-a;0L%aXu;p51;1)3ouZnvggxpBVg0?G
z&v|$htaH?A<?9CedvC0&vv?tN&UGn3Rr}$@@OtDE^i2H_m2rCN5zdw&a5%t-;BXiO
zG{#g`v43nS*Okv<+a2fN2NnfSH@xrTMLTX40cTymwYI9td<9S-8GIuWWccIsO#cXE
zjCxOkwPgg00RS9=0hE-Ww1T}O{p^vm*?Nb^FCM;Q+2_o*A8F^-5I_KB!3yv*FUZk3
z_@5v$O0AaQT!=C4`35p2pja@=TJTHQ<IZNwZ6C|J)l2`6;Q_Q0zDNNI68M>)`6))`
z;8RpX#3(p01{?rjuwaI`{%9||<Fna(%g3B1@PKmS6(Ay<NJN76%nyHz`pnM|9ii5f
zf(8hHkkMldC>Es!KitF4=9z4|#iLla<}{gk)eh`j1$g*I?BMW6Tkt<c7@=Ob-~zI(
zBr2H_5NB~_Sqr|(wX-ewn?0fhKX{tJgOV@dnP;Af_x~wNmk#ls_kWV!sV`BP{2?O8
zsnsn`Lqs$K&y;{jijyJs9;tB6%stq6(}$m4@C8v-_?zGS1}`u$xI9P>eB9K`AFy_q
zN{_?25HSug^JiaD)D5=a%UnHuCL3?^u+tJ=RmqcZ`B0TiW}7K5c<iR9t*>4_&=}uO
ztsdiSX$~HPfq6<u+k3tRzhml5Hr)83tUF^F#+a@jFESrq6c7*L#{h~bsDQtw*>gCx
zDDI@;HOCKx|M=b`@WPV8!4*$w9REAzQUhlLj9Nf(kSPJd;#kh!Irz!5TJR5M<GNME
zsbzX<1o^MceD`zZ`XFIg1{?WD^WiCyaD{2&MZ%<Uyjm(*bXL*80boP`ixUW(#mWly
z4VTz4bru_M{17&@;73QU<Jgt2WT<>8L0CsA1L~KrLT9F;3X)w@JaBf8!vop~+$?GT
zt&weSz|_}+iwog>KgR}WwGS^sxnf8oaH%3{y^kkAh;XI_f3(C^(=GU$JY;U!lO&dr
zD__P9*X*UV;_=wApJC#?IR9M_mw~ERM&~)ztgqP^Q`-oG4<|YBRqXy(lKjtSQ56&|
zh6glf4}_*~0M9RIJljrYQimWIaX4u2`O=EE!J9psO*eVyoWX0S$5SH=m9M6>{_V{6
zT*Tz`|I$10T&g{*P?c_Y$N;ld07{M`92yOyYhOZh@Lo*LZl(Xos|npW5&a11!r*hF
z!BA5-Ujg<%>1?YR1P26~qUDt>_$t>l&t>yXAI93u+ADx!f&fb|IEZX76}N=SrZ13c
zKd41f=-#uro&p6-NMm}0^y2$7Kn+bH(gC8_P!m8Yg7+75w}9<bfTF2G6N|$TkV3eM
zy+`ZpjL&1s%^vRIy`buF=_CZuoH<TE4og3=4j`l`-n4^u7(D5S*aTD&4QQkh8d)@*
zfDoF~#~E-o`)DD&;<s6j0`MZBR&nuMa~MsLQfuaq^{^{Fm#w#aBx^fjdj(Vlw1ggd
z7f1G7iXQtBJ!>kYY7tT(MLMj#DD&MS+U|Qlj{t&0330pL&hXAl(L+C=zOqc}KoR6r
z;k^QM{t8GHO)T1sF_jhUJHCY7oX6H%Ke`K^c|l4@5ba`3{BMF~eZYEDH3M8kkfSIi
z%<Q$SY5tR7NguE=^AwAM2QWAV-%zKxI3*|zv43oU-S&L8-sZ6<gjdD)ZGu#{5v+S9
zHr#^R82&2}9%vF_dbSh(&+AAlTOo~33SND`Xay)FbMXD_9WAl9dI8&R|G45}28w75
ztDjHY-?G$=&Ge1DmVm{<OXeC}f^2yS&E@xJGTy|Jy|2QcAb=LbqvVQF=kU#9f-(nM
z@Yk0vWZRvePz3MCDp=_S3r+1ON+b(`PdT>Ntgk{!51K&4AaNoHfJ!lZkryzgLMA~F
zuzz@(y_K`se!G^nU%3Ey0B9>PnLq<*PLI;>YzBaw0=&0~pw`a48%ofaIyU!iZ%m8f
zQO#ck;q1Pv$V5=a4jp3KInQR*s%3yJfY0Cr2(kO#$&uZcp+|m5eRUbDi_7XH>r=w+
zcq>P)y#)4spZfAL)&ZhL@Wsi{FTeXEGO@9n`k$MvKDc(xvOy~XTAb1%*~d!+jh(D+
z{)=F+4|Kz#Q(7MphnT5rS>3#tpk4zu0)Wbb;d8gZBfjMDLh|J;{V%$8CH%=$j1<EA
z9gf-vsck1*a}nwA_Xz9^n(64&@_BFM(g-v3Ka{uMi}?C)6Qr}Kf{G%=@c;jk*iV1{
zOEPiJajTpD&p#sV8$;8<B6$4Qz$VCs7ZMNNhskIYy@y^+2!NgvykA@nu?gk|FJ)%U
zgP2G+v*g-W5TI}}@OjD5dFPzf71zv6H#~SQd}oj&Sb8CaNS9Jdgi2T@kUD6JXU?<Q
zoqZ4!U`jO<Ln^&!43P{HB|?uVs)7{2`$5hYu-4@j#gPJd{7qmT8n@&1#>^;vHezhw
zADK>i5G-hi+w7Pf5AQ+51k6rN(3>{VcoIs`oEo9+VFb`Zc-4YHh;H#|sZdzS@fmE0
z-SsvO?Yb0q_$SnsL^O6hnch@=aYN_j{=V-N1#sF`52!0t%K_2FEiZ8OztQWyOMR$>
z(>A;mz!#N;L-M5nzB3pqA+tMK)%Yi2-yn_})i8pf13m-R&T|=f#~4skK_{+d<&jGW
zDj}NX0wRU**_AvA7Xv?U2GVxCUfy^wl7l}$ng=mMcLPeOI_M~TNL~d9P?x<_a5lys
z{tIFMHcB_S7xAud5v0=qfEL61SD%~$6p#XV6ja&(xR{_7uQyiRkBN9QJ=ed2%1u8?
zY=#g`b87YALFfVz6EZz<lxX*@IODD_V`jrcm~flvyW*vUD5@ZZ@Cw~-AYTC@omMa(
zex9h1nqJ!R`cg`<P_{A7Hb7GknP0%@0x>~I8qeaKkeVJ`(-D~=%88+bLNUBQ=7=Fz
zv=ClBK|5ZL{u8fHkASoO<DJvq3GW9dUK!5fniEhqG^dUs&VmYxE(~4)U4#wDh0hEb
z0+dL1yqQBgFTw8p9`$8qoGM6h-M%=V4@v(1dWNsQ7`N*?)R&g9*~LP5Ka~r2gJdp7
zit~8^0M!tgYFX;WT)bWfHlQpH-tWc|GPa8qhu%d{5tQ`{h6kV{Au8Siy5LHVUj=D|
z>Dx}_X0OH7wxVgg_?ge*g)}A{+D7%xFT?e1fi%jzM-jZwRZiXw%E?u7Y(j9um(yJT
zKqlN4daiyMmBqlLKFpm{z-?a5%$A2U&Sv`l{Srzn4Bi`mJ!vDjFnIAk+nPQ!hFAuP
zVgWgIc<;Xzq3vN@BP9-ph^;|TRHYDJJ;}lqpzT%+kJqp|i$>!}31+885N8(ypWTQ+
z``yiPsDv~o+a4xcA4Tx~#V2YxTfm2FQe4cy7cJt8-^k%>F2?TpF7?3@P65$Vg4YZl
z0ZK%FejP{VyudZzp=Y3ks-mJu0erTKbfJL|a7v|XC?ONqvi!&ugyj+{8xRGQQ-TMd
zEIA30(LJm<@Lqx{sH{O1K#JhoN2jDoigSK43T=QQCs)QwBZ7hLRB!t#Y;U`EuPAz|
z@cs&<F{Nc&sGa#@T>nN$6M%)ms}e;qQJfH#0)lXU3k&{oyui}6LYffX{8cnJKbR@D
zP`mWS^pvUuK@YeDGNXmg>nqw3)%m^zB}{1sY(jX)*D}5Rkxa-I`u_eRN_b#$;N2X2
zvkkv`^|H&uAQ&ZJfm=Wo6(JwKJJ7H}FB(A<EF*{<@vh%8ZF>={_uJj?%Qu2zXiSgO
zqmDG_!!=@}(hwDEC<9I%q7D!M1W*B78$L-==4LsbnmP2er#|87V`F0kLC~oH&2fPs
z3n^WzA|?c<Xk!e@(3~El+88DH&7-KL3V?Q|zW@%P^Uo0TT~Q6Fg^)I;pj@Ugag+fu
zqz>x!GX1^%Bxy<%CB$)ph)}JSNz;^x@oBE#yZ7jeU-azzUU|jkJD^)a&D{c02oH+0
zmP+4p?8b|j{r&S9zT%H0yMIir<PcFRB@eD{KAalg@A?;qR|L*N^H(qB=%v4ctG`R>
zmgf-#y=-1FK(iSWM+q~tO{{hF_0>_QjEqch#g#jbz510ey#JovJO4qBNRp<V>G0s>
zWMgL%r-KL!s@@_2nl_OgA3zTMhM-)>Ng347t}32VyJLymYXB->n`qLYw(UGFE1$#a
zwd+~G_6)|xr<k5;;+$j2k~+o+!^6k9^2)1@z4}!zy#MZ9JO2ofuYlyl3W$?rP(&8~
zS2PJAtYNTZEaX~y52v|qQoEHTf<yT0AAZA4Z@itAtJ(@U1^5CZcq)HFREx$_SPxYk
zpmbG=wL@{8=d$Nhno+{^bYn5_1-U>meDQyBa>Cn81VzBt3jy)ZW=DSx|9l)L*hRtv
zm@o`zwcJ=>@x_edy8XhlI-R#y`}!6K4`6=!)1Pt06<0E+1Y-o%(-U5q|NUCEOb{#%
z9>831!TH?smbc*D?|wHT(q0XE`oW_L`0&<R%ka_B#lU+TkR%B&c)<&J@{^y;T;Bx2
zX$PMjt#df1%+5x%Vw=UlcN@V^e)5x?fByNJrl~W=oObX|m6@4Ys?{pTMvfnQ`OBXB
zz&1S6)fOlr0RAEU)1Uq{abW+x%l_woZ*=C=)HKrNvlR+lSiY<41_MBI72+dK=Sbp|
zI8IP?W3PJUi=NVo@Gb^c;sa~NAG5v#Y}W6%t{J!iLZA$At6Sab#_xX5``@*0?fRQ0
zY2yFq&>f`-zK=iT&3p$i#d|(eT#{OBYGvons}H>Gt#A0yjvYJx1ynnrEgm=p651^S
znm|OmB|r)|uK*|kWuOK~rBbQ)_4ck&v<!p_0a;UwfB^)-<Sjve%=*%K4p6)ZfOcN+
z+7O+do|=lHI03>8zN1;X70?74v|9wkK$0l{yb=r^Gy^l)xU*%j9euj{{+M&F6FTpl
z!@pbUUh0~oj7%YZh4?LyE7CbGfRF{fV_~8NV*o8s-a_8N{{tHRNpeoAho1ld002ov
JPDHLkV1igq4wwJ{

diff --git a/src/assets/img/files/wmv.png b/src/assets/img/files/wmv.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ac140c8b2420c80a99ca75e6a7ff38200eee426
GIT binary patch
literal 1261
zcmV<J1QPp+P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000EENkl<Zcmai!
z1CaDe8-<@vx|5lmwf)<+ZQHhO+qO!-ZQH)~U3~u5-eHpN_ok{VwVBdARnK_NseaF!
zC=mg`T6ceI?RCS*B%l4rn<@{u@r94R*39r=(nzgsB&^maO{a3b|K9Mvul$b^XFw33
z^Z*D>&_;(RjM2XWP|i6-WV+GlEI2B)w7x{&=38-x=aSSD>_MGV?R(RA=Z`ZrH&4>6
zBSKCQApW)ZNO6J+R5m=+e~TbcmuaOGKtxcDvV#SxE3ZSdfQ@2ICE;}Ef%M<@!;Ftl
z<>n2pRtlUGZLO^+6`(J>d;x8G7^&5XSKdHPFGJ9SN?ROD?nlqf-<z9{lcjBnvG_+o
zKnf5<3Mhnr$o+564X-~p_O16_%T)E1h^m20IDT*!%yr+#=-4<(Vi95}jQogv0uEG$
zxU2}HoS^^rokwAe+(UQ%M=FA$!STa;;-+82Q1TtJ<x6o{14JRtJBTC40#&G76E*pC
zM2{en<w)1b^uX98E^VszZVF*;ZtqX!hVNx0K1<pdN7B>O#%_mofPgr`n<#93nYOtB
zVf|uc@P3G-If9pvgHGEPNmA@?lhc)ZQ@iB{7#km>y>k-QzCti?JKBTK#aZ#QFE%C&
zNwz<XI`t{^4c>r2(E(-Y&}p(nIGx>_{+qv_@!Z^|DL6|w@<>E1%C^9!P%;r$L75@+
z%;RwmMBGsalsZ`Y@88M7nj5_L7Z{zK&coUeM2IMoor}=bX*8;9Q~ZP!w!Kffb3tCi
zHH+ds#kK*#4=$bO%FeC-GBq`on|FYsBq1^e6B;C}fbNAbM|&_a5L1mK@E2<rK2f3H
z`RQ-sM79qPS}8aq0x183HrIijC4$bUuudRHoWmC#pbnR)S8hPX(j8D5lD5{TQ{Ha@
z=OEhqJvuu?vQ=_pu;R_FfCJauBs#bR8G0$sw~WgvCuqEm%mJTZ=?p)KB;BKOgBN3M
z)^(*y7?WJ_HLQg=2XUqGK#>w01xQzkP84e4!^F+YvCiVMc8M0wS?tc0==0x+5{Cnv
z_!E}Lq$z|Hm$}DgaD%tdX|7>xr?iIR$%9niwQ;w7Kh}bjiY}>q0{<YT!zCAe3U#oA
z=qdyzM<1bkuzM%T{`)~F!rf6o6d59;OC1y?BfhLG#mqejm$pc^mT*M}1wo8cG4b^t
ziDVX(_c2k#=Elax%Gu*<act1gy+H!tEJ0<MP8K02euY{19?AuX<LHK$WrWpX>N5|g
zw||!29s`v=PMtbkf5G#g_2dgKIClj=i3n+$U2|{0vEZyTLJ<@|YmGoMoG5Qvtf3Tr
zIS%U$>hyD+>s*J$#ijk{J@@I4z4Vfc{(u*HeSL%c{?m1@_XZin6Qn4=9c7AHD@f7<
z!mQ1iGiRDFc>Xh=P?#4AZhYe#@tyB{m%hF}jEQm#+8F<=155}}jwuMbU-wjFR?e>M
zKkJ!KeZ<8VUGQ7F<*OMS931`TH^2Lfsp*;Pr}?}@M2YzEk-siZR*a{3Rw@X#x3{x*
zzVj{byy(L7e*)Bi6lef-psnyB+89&I84{5Y&_D<TfGSaz09b32TumSXGJHS_AJVxB
XX6KFrt7I6{00000NkvXXu0mjf9|2@@

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/writer-64.png b/src/assets/img/files/writer-64.png
deleted file mode 100644
index 6285b6ffafd8b1c30b20ec68df6aaaaac378d21d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2836
zcmV+v3+wcWP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000WxNkl<ZcmdU#
z1#}}v(#L<*GeTRoHui>g_n5<+kC`#}F@=+3=DXm>%#7hj$IQ&^Fee)?86{a7&2-l%
z+x_m%n|R(zI`6am-&d{{7=BgNHPxdPRb?YNr--m>83_ju9^&*<PT){8s{hPu{^w24
zc>Y<ZH(Q-#e7p!w5o^IJI0tTh?Gj5+47lf>N98kL+po=qCvN`O|6O_WkDhQ8s%)YZ
z#Y@4<vj|y*<Vt@sN!$+tlKxR92&j}xTz%D*$;S>(KfiSBNx${TTtg%%GB?)+Yu8My
zgJgZ};)GJ6fNed_^QIe|{+lnLP(An5<BzJGpw_lytA?klkHBbt02FkcTMLEoGsc*Y
zuz@zL0BhZ=+U@8sdY-HTV+gd%e|$6H_OCU0Y;KtjA;vne2_z1Z7~%xF39b{fqgtSv
z9OS$cBL3jKv)Q$44<-<rD=~=$1k?d2f`WikKr^W7vmv1B{FCd>!{ETL!J**)=E=#i
zSN8((m;D4_d}Ss2MjR*47Lg3RU~Gp!|MUVke?4M8vNW}b(F9$~yz>D_Adaz7!gM)c
zvIl?R3s<<b2Vb8)9#6ADrZo+l$!I3WX?V?+e(I5eb&g7<_+Wi<>@-yxq!g->RYg^I
z02{-9W|3RJ88e?iE38sbhq?ftKfl?)D(tM5*^%tyyce{&?3d4GG7Fzw<t=j_dw1A3
zh=8-Y!&)svCIFyhq<{m-z(@SqXO_6_TQPHq&@POv!~3#Sz<aELsak;@@hs;(ugPUU
ze`Y>>_PI=^pUS2ww#;MAR7~n;C^$g-Zi1Q2_u!Yg{o6hG*w87I2~pGuAP^W2FIcrq
zRYU60Ue0^wBA5N#X-w|iwN>!hjWy6!fWVk__)jl!$4s&Y9~CPE_&?4VZ~zVs3{GLH
zY^Zmh;DTo?aOuySvi0x^<nt4X$i^=iL*P36>8BUDvj=~uyPEkbf%uXV5Cn`t9avSS
zio#?M{`{xUbLmf>+=JgeBJfI{Odh;(9scA~i`?;@nEes7L!WuyRRjS)Tv##eEE*=G
zC%ItHp&tB+qXUnk<SYE;U;d@k_1{t(AJ@P8%fH}Xzv;OB8xaQ+Au3b|@eNN67#{?M
zF0iwp)LMHvf6qZK`SBCh;TaKlzgAU*r%K4^sCw;~tN!5=Gw*r4HuXfKOH>*oGzJjF
z2mr!*5E2!p0>^mkaW34okKg~X7f~NUc;_6&QsK~4z4k)j5GjSv|Cvj{W5t~YJ9fX|
z@-NNRr}i$lXa^O4omUV8Y7h|+C9%SEQ5kDJ!9_jz-y2bQ`~u&%vI>9bcdkvB!;VtO
z)t`N6iMECWYH=2fF<>0(K#Za5gkwsMYIAQ7es(SMlOqa$xIP#*4m82bh=koSQ`R6v
zY>cWRAvnOW9)zy#!IzavqnG*J`?fE<S6HhR(nm(6P;lZ_z*^rK#s6qXG+^gy<{Nvt
zc+V>Q3EKo-b7z6DUN5IA02&>K#tB%9raEQU!7&wKyfw?kPdm81;1&Ns$tu*uftL!9
zKGFI2#}1AjGmNkFGXL~L{Qi%hxUDj;<SQh7<`=+ONG!w&=z1)6)<P!Qy@vP91^(bC
zPTF4ZeyzCyaG3yDha@p{6Rd^l$s&`{EEhg&kw5rJKih9Fc<=iPfUKuHPOwqTRK2uz
zq`lyI4KDea)0mv@5560B5D^AfxashKm-e#-1aS`AwM<n)>h1s+JbQ&pe)jaf;H@gx
z|MP8p{+stwEtl9VCDw9OZH#|?`%4Fd_iH7;3PRGapt!^`Q7+)xPjdeAI$ZLLXZL+G
z!>RV(do0g6u|m06V6)^@32}qLXRiYJ6<|qMfC&Ojr<eH`wYlV1&Kc-VPAG<}e);=J
zk}e{`W=fG^;JwdR=u7~31p&=NPw?|EX!Gko-^={e;J2~L#S#=sThQ?G;Z-&NhREK>
z=2ORE%%igh!k54DRHk~}-n!wsePW|NDj+<v@Y$c|EvxW@AG;U4y4`qr$FBM#)5q*S
z)reqm1HmiG_5X7F;7u^M>AmE8hgT1u+XEIq1$ag6PW_ob_J*)fdan`%gJ#~rrZhp{
z^fm=P_hyKf>_4<bnkp!iCW-;~JDVI0GVqYoiK9(vf{IWu#Z7^Cs+3E`Lr3qdKlO&l
z(Nhy-RBSfeMir33C%jTvT(vE0cv<+|2H+Jsr#Tq_8FIX}E?WWNmcgrEtI+@F0;>23
z3=V(&zutbtCc%Gv^ECs*qnZL3?Bj7j20hpu;Yo0CcpdJOp`lN8M`RKdEes8x`qF;@
zM20`o7J~wXo^9ox&%&#M<^;mz^?>i?Jg*v$3cPnZ=oT0r{>Fd1WAG-J+w`v91b9&L
z6>cUxy1A3!=D@4>0|Y?*j}VnXPj#6lxFroQ3-A3P6`<Z^@FQ&~Az>lh+C87myyg#s
zhI|cwo*yZA^*+A|ZYumu|FPNx?>i!s;NQOfis9h#evkktAVXw+Vyf2!PpDEZhMPMH
ziW?dp#arJ^&<_G41DE~p|J>PFXAy*a>EN&E@bK#Y4blXM-t%L{@{!r|GAul(Q{rxd
zsvB?%Y}1C9h3`aNRGsN*uqL=|;B&gZQzh!bce^orb|3SNFbwAU4}k9hqX_R`$GOzN
z;=d{as;EK|Cxl_h%F3a~{`607dRe_bsXb)_pt((8bm4`#8&j)Qn3xzRjuW5h1Q06K
z5=j!XysSL($Rkg_;dQS#|6AYs#>{}DFvtj&y&$w&Ey56vJ!TJ`PPA6ytyY9}j)__o
zRma@?GT-^mU9;D|^|cq>fB(H-Ef$MxB%?sq&=KDAz!Q5PCk%unu`D-QG#c%7_=zee
z5ccn%=R4n?nZ5RHuUm!xTo8oh$*^GrMi5>VL2#-pEiMv8G0kSXXC0hs4}J_|*5POF
zx_kE8x4-_P`|rEwvtbypk*u|=mOlt7AS0G}?{VtZ_I#t2h6fM7nt2Z&W^V5(Ns_Gk
zey#$5jMk;jAJ5l()Q#6N*em-y_!PJ!jxDN6R-rKl=UfI}MsUbUPlJkxtYzN0Bp2Q}
z=h^aQn#~5r2ti;-VUFyPR@WVsN{Jwl@4{b~f?tJBk|Y;CEpz6XXL9Ye*Ky#$!L=Y5
z5r7ee_ulX20|yqEnYnBBy0^dXqWgOA#+ZEY90^{vT8*1;zJ=a@pPyb>Y~0i7#8V<N
zQnNjPb&fB8=?gsL8P8(hfkU%zdDE*d>}CFQ45<LGZnw+3-t|sqXJ;!v^g}=L5+kPS
zRPjPLS}Q311ABM4`*t}&02G?77L8_;P87|)@eQxM_<{TH{VX8fy!_)qDgZEmD;A69
z3t#x+2TnNg)Sp^hY#`$Qm@IrY^I5<?GM@#7ys}?!Xx(^qylwFKV-Fp?{<^nbJ~Q*}
zj{xJT>z4E0uf2iItkoOh%>V^&dd3-NocLFN{kMO%d)L!Xj^i#~l09mIieGrwcjhy%
zXRr5UtAQj*R!tsw;J!!y<d1Lor<s|VuL0E@SZ~DMBB0|f^3NrJ^8p|LLZAp#0LtZZ
zbz-8nOI3?N=q>QUlFZtB1jKtt`Mh;jn(^QZK|~P|x3sj}h@z+q6jRWe2|$vvt_N>>
zi~Mu34*=Op@WH?Uq(Hs*mI2Q(vOYfu=wSk(-o%@xEE|Mu=_lS?$}6BkzH+nYjeNj-
m(0(c)`*?tAafb_PR{swIiXmdG)Mi=$0000<MNUMnLSTY>V3J+{

diff --git a/src/assets/img/files/writer.png b/src/assets/img/files/writer.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb8e7cf1a84ae55eb84797d574d0fe0ce72b69b2
GIT binary patch
literal 1113
zcmV-f1g86mP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000CaNkl<Zcmb7D
z1F-E#6zrKyl8a}X_4ldv7uL3I+q;Fe3v1iuTHCg5+upralABEa+)Q$79;<#=I-WkA
zJ}1QYebm4?U(UHd!I<WpciFYE7xI$_^^Ht+qEhkPl8v~VHU?VRTjw6N?o(ooE|<x*
zzOobdHA?AUx~{zefuMlcx=JPM3q$ie{>oZ7?#U8f`MCnWQiheYuufwNHyySN(-Wh}
zi(-&#5Sf!2fqZn&Z)<H_oiX|$3+pCh49&l$EFAJk25<eV!O$5hj)}GVv$%P$2`n2O
zK)z@Lh{P0eDB@z{J|~{X6O>Z0-+%oHaZ~s5UXmaDa0c(BO(f$KW!uF@?f>GYod+>G
z*pIU1&KCFQJNK1)QD|(_T@OP~Z*Q}{#o5MNskjgatSYcx!+*GWhc1i^^r7smjJRYC
zM3Ak0*iG;VnSTBckLaX|a)n^MrvGu%_HA`>_)CjN_YjKLV<Q0TZcCz4<wUd7uv`&K
zS53S}#3ID)MVw=C=k<uff{avM5aH6vmau8RgIjhV#Xx^g;GBaal_`Ky0zhr7yy6^a
zP9_xRP^L@1%NY0IiO|<<&Ebl@Cooux#jXZ#{+})2&Zl38Y3i5@&V3Q5g?+YOAMFjv
zKv<0^0{iHb-@&Mh3lEyW`0xPAR<#~WTT=tJU3WP&jY5UzadfmcBVm|PWKtY+dLYPp
z*k9=BZu@F{q~EXDE>Sa27s`0zy>AgSbf~Dh9;Qcnu<q1o-8rArhX^FRF_bS<zV$gb
z=Qi}`fBu6;DO3<am-FCj$GSU$_c@<kpu4+mebdn2VBrHQc4V%2*>UjQAOAyV8dMNM
z;Cdd4WeYv+%`i1>mN*xTtT0F@-N&q4xm^bL7!(BJ!+qTtoEVkwM(!1c*+E&Uip!&^
z>lhyBo!4aU`RHtIT5$e(STKU}1+&E=m@bs?)axH3Hg8M`IOix;EbJ@Bv?&&YKlcv@
z1l0oS9~-_HHw|pK`V3f@u|#A*Hacz?VeVX+AW~aHm`0U|qyx3dLGxA}?vrlRQRMSu
zi8L6~k;~@FKm720Dv^kTK`vLtqjNQ~MF@DF2VoY;WCA`2ve}$_>S-q&`o?Q7ePx<4
zP(p~B-^z#wux%Uv{rfK{W%%dc|EwdAIP`$$pMB~c%d$nWESTdsFbq>|u8ac$ymnMX
zxf%-xK;)59{P+L=&e2C6y3gBhz5cK?EgjHx*If@Uzx*<3NG6G<X`lfaG%C+ET4(f3
zkjiUH19RzA+B)*^L-weNM?;|g^=NEtY`OQ|2OnQ$VscGKK)gUgr(|v{>NO#hrZZ{p
z>@!a}_wBdeybVB7uqs#)EC^a8ETYBZ@uox~(JdBg;rMETR6bWI;Y$)!tBzeL6mkFz
fL02hI6tq_WpjfD1malm{00000NkvXXu0mjf8XOyo

literal 0
HcmV?d00001

diff --git a/src/core/services/utils/mimetype.ts b/src/core/services/utils/mimetype.ts
index d8e4610ed..386a6f267 100644
--- a/src/core/services/utils/mimetype.ts
+++ b/src/core/services/utils/mimetype.ts
@@ -280,7 +280,7 @@ export class CoreMimetypeUtilsProvider {
      * @return The path to a folder icon.
      */
     getFolderIcon(): string {
-        return 'assets/img/files/folder-64.png';
+        return 'assets/img/files/folder.png';
     }
 
     /**
@@ -290,7 +290,7 @@ export class CoreMimetypeUtilsProvider {
      * @return The icon path.
      */
     getFileIconForType(type: string): string {
-        return 'assets/img/files/' + type + '-64.png';
+        return `assets/img/files/${type}.png`;
     }
 
     /**

From add0b95386379579cea1b31cbe9570df87175dc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 29 Mar 2022 16:55:51 +0200
Subject: [PATCH 0844/1008] MOBILE-3833 style: Fix icon on chip color on dark
 mode

---
 src/addons/notifications/pages/list/list.scss | 2 ++
 src/theme/theme.base.scss                     | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/addons/notifications/pages/list/list.scss b/src/addons/notifications/pages/list/list.scss
index 4ac957b62..da15978c7 100644
--- a/src/addons/notifications/pages/list/list.scss
+++ b/src/addons/notifications/pages/list/list.scss
@@ -40,6 +40,8 @@ ion-item {
     div.core-notification-icon,
     core-mod-icon.core-notification-icon {
         padding: 8px;
+        max-width: var(--core-avatar-size);
+        max-height:  var(--core-avatar-size);
     }
 }
 
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 681843dd4..a97d2eea2 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -1069,9 +1069,7 @@ ion-chip {
             border-color: var(--ion-color-base);
             color: var(--ion-color-base);
         }
-    }
 
-    &.ion-color {
         &.ion-color-light,
         &.ion-color-medium,
         &.ion-color-dark,
@@ -1082,6 +1080,10 @@ ion-chip {
             }
         }
     }
+
+    &:not(.ion-color) ion-icon {
+        color: var(--text-color);
+    }
 }
 
 ion-searchbar {

From 6dadd7b9a64697ad7e63841a520164facd477317 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 30 Mar 2022 09:38:33 +0200
Subject: [PATCH 0845/1008] MOBILE-3833 core: Fix handle links with URL scheme

---
 .../features/contentlinks/services/contentlinks-helper.ts  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/core/features/contentlinks/services/contentlinks-helper.ts b/src/core/features/contentlinks/services/contentlinks-helper.ts
index 8c5ccd06c..e4d6379dd 100644
--- a/src/core/features/contentlinks/services/contentlinks-helper.ts
+++ b/src/core/features/contentlinks/services/contentlinks-helper.ts
@@ -21,6 +21,7 @@ import { makeSingleton, Translate } from '@singletons';
 import { CoreNavigator } from '@services/navigator';
 import { Params } from '@angular/router';
 import { CoreContentLinksChooseSiteModalComponent } from '../components/choose-site-modal/choose-site-modal';
+import { CoreCustomURLSchemes } from '@services/urlschemes';
 
 /**
  * Service that provides some features regarding content links.
@@ -138,6 +139,12 @@ export class CoreContentLinksHelperProvider {
         openBrowserRoot?: boolean,
     ): Promise<boolean> {
         try {
+            if (CoreCustomURLSchemes.isCustomURL(url)) {
+                await CoreCustomURLSchemes.handleCustomURL(url);
+
+                return true;
+            }
+
             if (checkRoot) {
                 const data = await CoreSites.isStoredRootURL(url, username);
 

From 9884ceb6b34164c770ba5d3e59332b5cfda8522f Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 30 Mar 2022 09:38:55 +0200
Subject: [PATCH 0846/1008] MOBILE-3833 ios: Fix handle iframe links in iOS

---
 src/core/initializers/inject-ios-scripts.ts |  3 ++-
 src/core/services/utils/iframe.ts           | 19 +++----------------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/core/initializers/inject-ios-scripts.ts b/src/core/initializers/inject-ios-scripts.ts
index 64b26993d..cfd717666 100644
--- a/src/core/initializers/inject-ios-scripts.ts
+++ b/src/core/initializers/inject-ios-scripts.ts
@@ -17,10 +17,11 @@ import { CoreIframeUtils } from '@services/utils/iframe';
 import { Platform } from '@singletons';
 
 export default async function(): Promise<void> {
+    await Platform.ready();
+
     if (!CoreApp.isIOS() || !('WKUserScript' in window)) {
         return;
     }
 
-    await Platform.ready();
     CoreIframeUtils.injectiOSScripts(window);
 }
diff --git a/src/core/services/utils/iframe.ts b/src/core/services/utils/iframe.ts
index 1faf9308e..08745cb44 100644
--- a/src/core/services/utils/iframe.ts
+++ b/src/core/services/utils/iframe.ts
@@ -446,26 +446,13 @@ export class CoreIframeUtilsProvider {
             } else {
                 element.setAttribute('src', url);
             }
-        } else if (CoreUrlUtils.isLocalFileUrl(url)) {
-            // It's a local file.
-            const filename = url.substring(url.lastIndexOf('/') + 1);
-
-            if (!CoreFileHelper.isOpenableInApp({ filename })) {
-                try {
-                    await CoreFileHelper.showConfirmOpenUnsupportedFile();
-                } catch (error) {
-                    return; // Cancelled, stop.
-                }
-            }
-
+        } else {
             try {
-                await CoreUtils.openFile(url);
+                // It's an external link or a local file, check if it can be opened in the app.
+                await CoreWindow.open(url, name);
             } catch (error) {
                 CoreDomUtils.showErrorModal(error);
             }
-        } else {
-            // It's an external link, check if it can be opened in the app.
-            await CoreWindow.open(url, name);
         }
     }
 

From 35433615f3b6cc3400bf21499f1e131ce8e2f475 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 30 Mar 2022 14:33:07 +0200
Subject: [PATCH 0847/1008] MOBILE-3833 usertours: Watch elements visibility

---
 src/core/directives/directives.module.ts      |   6 +-
 src/core/directives/swipe-navigation.ts       |   1 +
 .../directives/{on-appear.ts => user-tour.ts} |  35 +++-
 .../side-blocks-button.html                   |   2 +-
 .../side-blocks-button/side-blocks-button.ts  |  30 +--
 .../course-format/course-format.html          |   2 +-
 .../components/course-format/course-format.ts |  29 +--
 .../user-menu-button/user-menu-button.html    |   2 +-
 .../user-menu-button/user-menu-button.ts      |  26 +--
 .../components/user-tour/user-tour.ts         |  40 +++-
 .../features/usertours/services/user-tours.ts | 186 +++++++++++++++---
 src/core/singletons/dom.ts                    |  93 ++++++---
 12 files changed, 312 insertions(+), 140 deletions(-)
 rename src/core/directives/{on-appear.ts => user-tour.ts} (50%)

diff --git a/src/core/directives/directives.module.ts b/src/core/directives/directives.module.ts
index 3a89d007f..d004ce3cd 100644
--- a/src/core/directives/directives.module.ts
+++ b/src/core/directives/directives.module.ts
@@ -32,8 +32,8 @@ import { CoreSwipeNavigationDirective } from './swipe-navigation';
 import { CoreCollapsibleItemDirective } from './collapsible-item';
 import { CoreCollapsibleFooterDirective } from './collapsible-footer';
 import { CoreContentDirective } from './content';
-import { CoreOnAppearDirective } from './on-appear';
 import { CoreUpdateNonReactiveAttributesDirective } from './update-non-reactive-attributes';
+import { CoreUserTourDirective } from './user-tour';
 
 @NgModule({
     declarations: [
@@ -48,7 +48,6 @@ import { CoreUpdateNonReactiveAttributesDirective } from './update-non-reactive-
         CoreSupressEventsDirective,
         CoreUserLinkDirective,
         CoreAriaButtonClickDirective,
-        CoreOnAppearDirective,
         CoreOnResizeDirective,
         CoreDownloadFileDirective,
         CoreCollapsibleHeaderDirective,
@@ -57,6 +56,7 @@ import { CoreUpdateNonReactiveAttributesDirective } from './update-non-reactive-
         CoreCollapsibleFooterDirective,
         CoreContentDirective,
         CoreUpdateNonReactiveAttributesDirective,
+        CoreUserTourDirective,
     ],
     exports: [
         CoreAutoFocusDirective,
@@ -70,7 +70,6 @@ import { CoreUpdateNonReactiveAttributesDirective } from './update-non-reactive-
         CoreSupressEventsDirective,
         CoreUserLinkDirective,
         CoreAriaButtonClickDirective,
-        CoreOnAppearDirective,
         CoreOnResizeDirective,
         CoreDownloadFileDirective,
         CoreCollapsibleHeaderDirective,
@@ -79,6 +78,7 @@ import { CoreUpdateNonReactiveAttributesDirective } from './update-non-reactive-
         CoreCollapsibleFooterDirective,
         CoreContentDirective,
         CoreUpdateNonReactiveAttributesDirective,
+        CoreUserTourDirective,
     ],
 })
 export class CoreDirectivesModule {}
diff --git a/src/core/directives/swipe-navigation.ts b/src/core/directives/swipe-navigation.ts
index ee2f6c6a1..b2aa69c6b 100644
--- a/src/core/directives/swipe-navigation.ts
+++ b/src/core/directives/swipe-navigation.ts
@@ -93,6 +93,7 @@ export class CoreSwipeNavigationDirective implements AfterViewInit, OnDestroy {
         await CoreUserTours.showIfPending({
             id: 'swipe-navigation',
             component: CoreSwipeNavigationTourComponent,
+            watch: this.element,
         });
     }
 
diff --git a/src/core/directives/on-appear.ts b/src/core/directives/user-tour.ts
similarity index 50%
rename from src/core/directives/on-appear.ts
rename to src/core/directives/user-tour.ts
index 4dff653c9..04d3636ea 100644
--- a/src/core/directives/on-appear.ts
+++ b/src/core/directives/user-tour.ts
@@ -12,20 +12,22 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Directive, ElementRef, EventEmitter, OnDestroy, OnInit, Output } from '@angular/core';
+import { Directive, ElementRef, Input, OnDestroy, OnInit } from '@angular/core';
 import { CoreCancellablePromise } from '@classes/cancellable-promise';
+import { CoreUserTours, CoreUserToursFocusedOptions, CoreUserToursUserTour } from '@features/usertours/services/user-tours';
 import { CoreDom } from '@singletons/dom';
 
 /**
- * Directive to listen when an element becomes visible.
+ * Directive to control a User Tour linked to the lifecycle of the element where it's defined.
  */
 @Directive({
-    selector: '[onAppear]',
+    selector: '[userTour]',
 })
-export class CoreOnAppearDirective implements OnInit, OnDestroy {
+export class CoreUserTourDirective implements OnInit, OnDestroy {
 
-    @Output() onAppear = new EventEmitter();
+    @Input() userTour!: CoreUserTourDirectiveOptions;
 
+    private tour?: CoreUserToursUserTour | null;
     private element: HTMLElement;
     protected visiblePromise?: CoreCancellablePromise<void>;
 
@@ -41,14 +43,35 @@ export class CoreOnAppearDirective implements OnInit, OnDestroy {
 
         await this.visiblePromise;
 
-        this.onAppear.emit();
+        const { getFocusedElement, ...options } = this.userTour;
+
+        this.tour = await CoreUserTours.showIfPending({
+            ...options,
+            focus: getFocusedElement?.(this.element) ?? this.element,
+        });
     }
 
     /**
      * @inheritdoc
      */
     ngOnDestroy(): void {
+        this.tour?.cancel();
         this.visiblePromise?.cancel();
     }
 
 }
+
+/**
+ * User Tour options to control with this directive.
+ */
+export type CoreUserTourDirectiveOptions = Omit<CoreUserToursFocusedOptions, 'focus'> & {
+
+    /**
+     * Getter to obtain element to focus in the User Tour. If this isn't provided, the element where the
+     * directive is defined will be used.
+     *
+     * @param element Element where the directive is defined.
+     */
+    getFocusedElement?(element: HTMLElement): HTMLElement;
+
+};
diff --git a/src/core/features/block/components/side-blocks-button/side-blocks-button.html b/src/core/features/block/components/side-blocks-button/side-blocks-button.html
index 13cd1b7fe..69fdcdf8f 100644
--- a/src/core/features/block/components/side-blocks-button/side-blocks-button.html
+++ b/src/core/features/block/components/side-blocks-button/side-blocks-button.html
@@ -1,4 +1,4 @@
-<ion-button (click)="openBlocks()" (onAppear)="showTour()" [attr.aria-label]="'core.block.opendrawerblocks' | translate" color="secondary"
+<ion-button (click)="openBlocks()" [userTour]="userTour" [attr.aria-label]="'core.block.opendrawerblocks' | translate" color="secondary"
     #button>
     <ion-icon name="fas-chevron-left" slot="icon-only" aria-hidden="true"></ion-icon>
 </ion-button>
diff --git a/src/core/features/block/components/side-blocks-button/side-blocks-button.ts b/src/core/features/block/components/side-blocks-button/side-blocks-button.ts
index 3bec41f02..03efee0ae 100644
--- a/src/core/features/block/components/side-blocks-button/side-blocks-button.ts
+++ b/src/core/features/block/components/side-blocks-button/side-blocks-button.ts
@@ -14,7 +14,8 @@
 
 import { Component, ElementRef, Input, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { CoreCancellablePromise } from '@classes/cancellable-promise';
-import { CoreUserTours, CoreUserToursAlignment, CoreUserToursSide } from '@features/usertours/services/user-tours';
+import { CoreUserTourDirectiveOptions } from '@directives/user-tour';
+import { CoreUserToursAlignment, CoreUserToursSide } from '@features/usertours/services/user-tours';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreDom } from '@singletons/dom';
 import { CoreBlockSideBlocksTourComponent } from '../side-blocks-tour/side-blocks-tour';
@@ -34,6 +35,14 @@ export class CoreBlockSideBlocksButtonComponent implements OnInit, OnDestroy {
     @Input() instanceId!: number;
     @ViewChild('button', { read: ElementRef }) button?: ElementRef<HTMLElement>;
 
+    userTour: CoreUserTourDirectiveOptions = {
+        id: 'side-blocks-button',
+        component: CoreBlockSideBlocksTourComponent,
+        side: CoreUserToursSide.Start,
+        alignment: CoreUserToursAlignment.Center,
+        getFocusedElement: nativeButton => nativeButton.shadowRoot?.children[0] as HTMLElement,
+    };
+
     protected element: HTMLElement;
     protected slotPromise?: CoreCancellablePromise<void>;
 
@@ -61,25 +70,6 @@ export class CoreBlockSideBlocksButtonComponent implements OnInit, OnDestroy {
         });
     }
 
-    /**
-     * Show User Tour.
-     */
-    async showTour(): Promise<void> {
-        const nativeButton = this.button?.nativeElement.shadowRoot?.children[0] as HTMLElement;
-
-        if (!nativeButton) {
-            return;
-        }
-
-        await CoreUserTours.showIfPending({
-            id: 'side-blocks-button',
-            component: CoreBlockSideBlocksTourComponent,
-            focus: nativeButton,
-            side: CoreUserToursSide.Start,
-            alignment: CoreUserToursAlignment.Center,
-        });
-    }
-
     /**
      * @inheritdoc
      */
diff --git a/src/core/features/course/components/course-format/course-format.html b/src/core/features/course/components/course-format/course-format.html
index 323c1dbfc..4b86d5ce7 100644
--- a/src/core/features/course/components/course-format/course-format.html
+++ b/src/core/features/course/components/course-format/course-format.html
@@ -55,7 +55,7 @@
 
 <!-- Course Index button. -->
 <ion-fab slot="fixed" core-fab vertical="bottom" horizontal="end" *ngIf="loaded && displayCourseIndex">
-    <ion-fab-button (click)="openCourseIndex()" (onAppear)="showCourseIndexTour()" [attr.aria-label]="'core.course.courseindex' | translate"
+    <ion-fab-button (click)="openCourseIndex()" [userTour]="courseIndexTour" [attr.aria-label]="'core.course.courseindex' | translate"
         color="secondary" #courseIndexFab>
         <ion-icon name="fas-list-ul" aria-hidden="true"></ion-icon>
         <span class="sr-only">{{'core.course.courseindex' | translate }}</span>
diff --git a/src/core/features/course/components/course-format/course-format.ts b/src/core/features/course/components/course-format/course-format.ts
index c1bee68f6..ca8f8b29c 100644
--- a/src/core/features/course/components/course-format/course-format.ts
+++ b/src/core/features/course/components/course-format/course-format.ts
@@ -46,9 +46,10 @@ import { CoreBlockHelper } from '@features/block/services/block-helper';
 import { CoreNavigator } from '@services/navigator';
 import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate';
 import { CoreCourseViewedModulesDBRecord } from '@features/course/services/database/course';
-import { CoreUserTours, CoreUserToursAlignment, CoreUserToursSide } from '@features/usertours/services/user-tours';
+import { CoreUserToursAlignment, CoreUserToursSide } from '@features/usertours/services/user-tours';
 import { CoreCourseCourseIndexTourComponent } from '../course-index-tour/course-index-tour';
 import { CoreDom } from '@singletons/dom';
+import { CoreUserTourDirectiveOptions } from '@directives/user-tour';
 
 /**
  * Component to display course contents using a certain format. If the format isn't found, use default one.
@@ -87,6 +88,13 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
     canLoadMore = false;
     showSectionId = 0;
     data: Record<string, unknown> = {}; // Data to pass to the components.
+    courseIndexTour: CoreUserTourDirectiveOptions = {
+        id: 'course-index',
+        component: CoreCourseCourseIndexTourComponent,
+        side: CoreUserToursSide.Top,
+        alignment: CoreUserToursAlignment.End,
+        getFocusedElement: nativeButton => nativeButton.shadowRoot?.children[0] as HTMLElement,
+    };
 
     displayCourseIndex = false;
     displayBlocks = false;
@@ -166,25 +174,6 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
         });
     }
 
-    /**
-     * Show Course Index User Tour.
-     */
-    async showCourseIndexTour(): Promise<void> {
-        const nativeButton = this.courseIndexFab?.nativeElement.shadowRoot?.children[0] as HTMLElement;
-
-        if (!nativeButton) {
-            return;
-        }
-
-        await CoreUserTours.showIfPending({
-            id: 'course-index',
-            component: CoreCourseCourseIndexTourComponent,
-            focus: nativeButton,
-            side: CoreUserToursSide.Top,
-            alignment: CoreUserToursAlignment.End,
-        });
-    }
-
     /**
      * Detect changes on input properties.
      */
diff --git a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.html b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.html
index bd0e01204..e24ded5c4 100644
--- a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.html
+++ b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.html
@@ -1,4 +1,4 @@
 <core-user-avatar *ngIf="isMainScreen && siteInfo" [user]="siteInfo" class="core-bar-button-image clickable" [linkProfile]="false"
-    (ariaButtonClick)="openUserMenu($event)" (onAppear)="showTour()" role="button" tabindex="0"
+    (ariaButtonClick)="openUserMenu($event)" [userTour]="userTour" role="button" tabindex="0"
     [attr.aria-label]="'core.user.useraccount' | translate" #avatar>
 </core-user-avatar>
diff --git a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts
index 8c8efb728..54e11f46f 100644
--- a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts
+++ b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts
@@ -14,7 +14,8 @@
 
 import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
 import { CoreSiteInfo } from '@classes/site';
-import { CoreUserTours, CoreUserToursAlignment, CoreUserToursSide } from '@features/usertours/services/user-tours';
+import { CoreUserTourDirectiveOptions } from '@directives/user-tour';
+import { CoreUserToursAlignment, CoreUserToursSide } from '@features/usertours/services/user-tours';
 import { IonRouterOutlet } from '@ionic/angular';
 import { CoreScreen } from '@services/screen';
 import { CoreSites } from '@services/sites';
@@ -36,6 +37,12 @@ export class CoreMainMenuUserButtonComponent implements OnInit {
 
     siteInfo?: CoreSiteInfo;
     isMainScreen = false;
+    userTour: CoreUserTourDirectiveOptions = {
+        id: 'user-menu',
+        component: CoreMainMenuUserMenuTourComponent,
+        alignment: CoreUserToursAlignment.Start,
+        side: CoreScreen.isMobile ? CoreUserToursSide.Start : CoreUserToursSide.End,
+    };
 
     @ViewChild('avatar', { read: ElementRef }) avatar?: ElementRef<HTMLElement>;
 
@@ -66,21 +73,4 @@ export class CoreMainMenuUserButtonComponent implements OnInit {
         });
     }
 
-    /**
-     * Show User Tour.
-     */
-    async showTour(): Promise<void> {
-        if (!this.avatar) {
-            return;
-        }
-
-        await CoreUserTours.showIfPending({
-            id: 'user-menu',
-            component: CoreMainMenuUserMenuTourComponent,
-            focus: this.avatar.nativeElement,
-            alignment: CoreUserToursAlignment.Start,
-            side: CoreScreen.isMobile ? CoreUserToursSide.Start : CoreUserToursSide.End,
-        });
-    }
-
 }
diff --git a/src/core/features/usertours/components/user-tour/user-tour.ts b/src/core/features/usertours/components/user-tour/user-tour.ts
index fae112402..fc32a9f99 100644
--- a/src/core/features/usertours/components/user-tour/user-tour.ts
+++ b/src/core/features/usertours/components/user-tour/user-tour.ts
@@ -55,6 +55,7 @@ export class CoreUserToursUserTourComponent implements AfterViewInit {
     popoverWrapperStyles?: string;
     popoverWrapperArrowStyles?: string;
     private element: HTMLElement;
+    private tour?: HTMLElement;
     private wrapperTransform = '';
     private wrapperElement = new CorePromisedValue<HTMLElement>();
     private backButtonListener?: (event: BackButtonEvent) => void;
@@ -77,14 +78,18 @@ export class CoreUserToursUserTourComponent implements AfterViewInit {
     }
 
     /**
-     * Present User Tour.
+     * Show User Tour.
      */
-    async present(): Promise<void> {
+    async show(): Promise<void> {
         // Insert tour component and wait until it's ready.
         const wrapper = await this.wrapperElement;
-        const tour = await AngularFrameworkDelegate.attachViewToDom(wrapper, this.component, this.componentProps ?? {});
+        this.tour = await AngularFrameworkDelegate.attachViewToDom(wrapper, this.component, this.componentProps ?? {});
 
-        await CoreDomUtils.waitForImages(tour);
+        if (!this.tour) {
+            return;
+        }
+
+        await CoreDomUtils.waitForImages(this.tour);
 
         // Calculate focus styles or dismiss if the element is gone.
         if (this.focus && !CoreDom.isElementVisible(this.focus)) {
@@ -111,6 +116,19 @@ export class CoreUserToursUserTourComponent implements AfterViewInit {
         await this.playEnterAnimation();
     }
 
+    /**
+     * Hide User Tour temporarily.
+     */
+    async hide(): Promise<void> {
+        const wrapper = await this.wrapperElement;
+
+        await this.playLeaveAnimation();
+        await AngularFrameworkDelegate.removeViewFromDom(wrapper, this.tour);
+
+        this.active = false;
+        this.backButtonListener && document.removeEventListener('ionBackButton', this.backButtonListener);
+    }
+
     /**
      * Dismiss User Tour.
      *
@@ -119,13 +137,15 @@ export class CoreUserToursUserTourComponent implements AfterViewInit {
     async dismiss(acknowledge: boolean = true): Promise<void> {
         this.beforeDismiss.emit();
 
-        await this.playLeaveAnimation();
-        await Promise.all<unknown>([
-            AngularFrameworkDelegate.removeViewFromDom(this.container, this.element),
-            acknowledge && CoreUserTours.acknowledge(this.id),
-        ]);
+        if (this.active) {
+            await this.playLeaveAnimation();
+            await AngularFrameworkDelegate.removeViewFromDom(this.container, this.element);
+
+            this.backButtonListener && document.removeEventListener('ionBackButton', this.backButtonListener);
+        }
+
+        acknowledge && await CoreUserTours.acknowledge(this.id);
 
-        this.backButtonListener && document.removeEventListener('ionBackButton', this.backButtonListener);
         this.afterDismiss.emit();
     }
 
diff --git a/src/core/features/usertours/services/user-tours.ts b/src/core/features/usertours/services/user-tours.ts
index 749287f1b..fac59c705 100644
--- a/src/core/features/usertours/services/user-tours.ts
+++ b/src/core/features/usertours/services/user-tours.ts
@@ -15,12 +15,14 @@
 import { CoreConstants } from '@/core/constants';
 import { asyncInstance } from '@/core/utils/async-instance';
 import { Injectable } from '@angular/core';
+import { CoreCancellablePromise } from '@classes/cancellable-promise';
 import { CoreDatabaseTable } from '@classes/database/database-table';
 import { CoreDatabaseCachingStrategy, CoreDatabaseTableProxy } from '@classes/database/database-table-proxy';
 import { CoreApp } from '@services/app';
 import { CoreUtils } from '@services/utils/utils';
 import { AngularFrameworkDelegate, makeSingleton } from '@singletons';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
+import { CoreDom } from '@singletons/dom';
 import { CoreSubscriptions } from '@singletons/subscriptions';
 import { CoreUserToursUserTourComponent } from '../components/user-tour/user-tour';
 import { APP_SCHEMA, CoreUserToursDBEntry, USER_TOURS_TABLE_NAME } from './database/user-tours';
@@ -32,8 +34,7 @@ import { APP_SCHEMA, CoreUserToursDBEntry, USER_TOURS_TABLE_NAME } from './datab
 export class CoreUserToursService {
 
     protected table = asyncInstance<CoreDatabaseTable<CoreUserToursDBEntry>>();
-    protected tours: CoreUserToursUserTourComponent[] = [];
-    protected tourReadyCallbacks = new WeakMap<CoreUserToursUserTourComponent, () => void>();
+    protected tours: { component: CoreUserToursUserTourComponent; visible: boolean }[] = [];
 
     /**
      * Initialize database.
@@ -84,14 +85,17 @@ export class CoreUserToursService {
      * Show a User Tour if it's pending.
      *
      * @param options User Tour options.
+     * @returns User tour controller, if any.
      */
-    async showIfPending(options: CoreUserToursBasicOptions): Promise<void>;
-    async showIfPending(options: CoreUserToursFocusedOptions): Promise<void>;
-    async showIfPending(options: CoreUserToursBasicOptions | CoreUserToursFocusedOptions): Promise<void> {
+    async showIfPending(options: CoreUserToursBasicOptions): Promise<CoreUserToursUserTour | null>;
+    async showIfPending(options: CoreUserToursFocusedOptions): Promise<CoreUserToursUserTour | null>;
+    async showIfPending(
+        options: CoreUserToursBasicOptions | CoreUserToursFocusedOptions,
+    ): Promise<CoreUserToursUserTour | null> {
         const isPending = await CoreUserTours.isPending(options.id);
 
         if (!isPending) {
-            return;
+            return null;
         }
 
         return this.show(options);
@@ -101,16 +105,15 @@ export class CoreUserToursService {
      * Show a User Tour.
      *
      * @param options User Tour options.
+     * @returns User tour controller.
      */
-    protected async show(options: CoreUserToursBasicOptions): Promise<void>;
-    protected async show(options: CoreUserToursFocusedOptions): Promise<void>;
-    protected async show(options: CoreUserToursBasicOptions | CoreUserToursFocusedOptions): Promise<void> {
+    protected async show(options: CoreUserToursBasicOptions): Promise<CoreUserToursUserTour>;
+    protected async show(options: CoreUserToursFocusedOptions): Promise<CoreUserToursUserTour>;
+    protected async show(options: CoreUserToursBasicOptions | CoreUserToursFocusedOptions): Promise<CoreUserToursUserTour> {
         const { delay, ...componentOptions } = options;
 
-        // Delay start.
         await CoreUtils.wait(delay ?? 200);
 
-        // Create tour.
         const container = document.querySelector('ion-app') ?? document.body;
         const element = await AngularFrameworkDelegate.attachViewToDom(
             container,
@@ -119,26 +122,7 @@ export class CoreUserToursService {
         );
         const tour = CoreComponentsRegistry.require(element, CoreUserToursUserTourComponent);
 
-        this.tours.push(tour);
-
-        // Handle present/dismiss lifecycle.
-        CoreSubscriptions.once(tour.beforeDismiss, () => {
-            const index = this.tours.indexOf(tour);
-
-            if (index === -1) {
-                return;
-            }
-
-            this.tours.splice(index, 1);
-
-            const nextTour = this.tours[0] as CoreUserToursUserTourComponent | undefined;
-
-            nextTour?.present().then(() => this.tourReadyCallbacks.get(nextTour)?.());
-        });
-
-        this.tours.length > 1
-            ? await new Promise<void>(resolve => this.tourReadyCallbacks.set(tour, resolve))
-            : await tour.present();
+        return this.startTour(tour, options.watch ?? (options as CoreUserToursFocusedOptions).focus);
     }
 
     /**
@@ -147,13 +131,144 @@ export class CoreUserToursService {
      * @param acknowledge Whether to acknowledge that the user has seen this User Tour or not.
      */
     async dismiss(acknowledge: boolean = true): Promise<void> {
-        await this.tours[0]?.dismiss(acknowledge);
+        await this.tours.find(({ visible }) => visible)?.component.dismiss(acknowledge);
+    }
+
+    /**
+     * Activate a tour component and bind its lifecycle to an element if provided.
+     *
+     * @param tour User tour.
+     * @param watchElement Element to watch in order to update tour lifecycle.
+     * @returns User tour controller.
+     */
+    protected startTour(tour: CoreUserToursUserTourComponent, watchElement?: HTMLElement | false): CoreUserToursUserTour {
+        if (!watchElement) {
+            this.activateTour(tour);
+
+            return {
+                cancel: () => tour.dismiss(false),
+            };
+        }
+
+        let unsubscribeVisible: (() => void) | undefined;
+        let visiblePromise: CoreCancellablePromise | undefined = CoreDom.waitToBeInViewport(watchElement);
+
+        // eslint-disable-next-line promise/catch-or-return, promise/always-return
+        visiblePromise.then(() => {
+            visiblePromise = undefined;
+
+            this.activateTour(tour);
+
+            unsubscribeVisible = CoreDom.watchElementInViewport(
+                watchElement,
+                visible => visible ? this.activateTour(tour) : this.deactivateTour(tour),
+            );
+
+            CoreSubscriptions.once(tour.beforeDismiss, () => {
+                unsubscribeVisible?.();
+
+                visiblePromise = undefined;
+                unsubscribeVisible = undefined;
+            });
+        });
+
+        return {
+            cancel: async () => {
+                visiblePromise?.cancel();
+
+                if (!unsubscribeVisible) {
+                    return;
+                }
+
+                unsubscribeVisible();
+
+                await tour.dismiss(false);
+            },
+        };
+    }
+
+    /**
+     * Activate the given user tour.
+     *
+     * @param tour User tour.
+     */
+    protected activateTour(tour: CoreUserToursUserTourComponent): void {
+        // Handle show/dismiss lifecycle.
+        CoreSubscriptions.once(tour.beforeDismiss, () => {
+            const index = this.tours.findIndex(({ component }) => component === tour);
+
+            if (index === -1) {
+                return;
+            }
+
+            this.tours.splice(index, 1);
+
+            const foregroundTour = this.tours.find(({ visible }) => visible);
+
+            foregroundTour?.component.show();
+        });
+
+        // Add to existing tours and show it if it's on top.
+        const index = this.tours.findIndex(({ component }) => component === tour);
+        const foregroundTour = this.tours.find(({ visible }) => visible);
+
+        if (index !== -1) {
+            this.tours[index].visible = true;
+        } else {
+            this.tours.push({
+                visible: true,
+                component: tour,
+            });
+        }
+
+        if (this.tours.find(({ visible }) => visible)?.component !== tour) {
+            return;
+        }
+
+        foregroundTour?.component.hide();
+
+        tour.show();
+    }
+
+    /**
+     * Hide User Tour if visible.
+     *
+     * @param tour User tour.
+     */
+    protected deactivateTour(tour: CoreUserToursUserTourComponent): void {
+        const index = this.tours.findIndex(({ component }) => component === tour);
+        const foregroundTourIndex = this.tours.findIndex(({ visible }) => visible);
+
+        if (index === -1) {
+            return;
+        }
+
+        this.tours[index].visible = false;
+
+        if (index === foregroundTourIndex) {
+            tour.hide();
+
+            this.tours.find(({ visible }) => visible)?.component.show();
+        }
     }
 
 }
 
 export const CoreUserTours = makeSingleton(CoreUserToursService);
 
+/**
+ * User Tour controller.
+ */
+export interface CoreUserToursUserTour {
+
+    /**
+     * Cancelling a User Tours removed it from the queue if it was pending or dimisses it without
+     * acknowledging if it existed.
+     */
+    cancel(): Promise<void>;
+
+}
+
 /**
  * User Tour side.
  */
@@ -202,6 +317,13 @@ export interface CoreUserToursBasicOptions {
      */
     delay?: number;
 
+    /**
+     * Whether to watch an element to bind the User Tour lifecycle. Whenever this element appears or
+     * leaves the screen, the user tour will do it as well. Focused user tours do it by default with
+     * the focused element, but it can be disabled by explicitly using `false` here.
+     */
+    watch?: HTMLElement | false;
+
 }
 
 /**
diff --git a/src/core/singletons/dom.ts b/src/core/singletons/dom.ts
index 35306cc12..914cc6ff2 100644
--- a/src/core/singletons/dom.ts
+++ b/src/core/singletons/dom.ts
@@ -354,6 +354,62 @@ export class CoreDom {
         );
     }
 
+    /**
+     * Watch whenever an elements visibility changes within the viewport.
+     *
+     * @param element Element to watch.
+     * @param intersectionRatio Intersection ratio (From 0 to 1).
+     * @param callback Callback when visibility changes.
+     * @return Function to stop watching.
+     */
+    static watchElementInViewport(
+        element: HTMLElement,
+        intersectionRatio: number,
+        callback: (visible: boolean) => void,
+    ): () => void;
+
+    /**
+     * Watch whenever an elements visibility changes within the viewport.
+     *
+     * @param element Element to watch.
+     * @param callback Callback when visibility changes.
+     * @return Function to stop watching.
+     */
+    static watchElementInViewport(element: HTMLElement, callback: (visible: boolean) => void): () => void;
+
+    static watchElementInViewport(
+        element: HTMLElement,
+        intersectionRatioOrCallback: number | ((visible: boolean) => void),
+        callback?: (visible: boolean) => void,
+    ): () => void {
+        const visibleCallback = callback ?? intersectionRatioOrCallback as (visible: boolean) => void;
+        const intersectionRatio = typeof intersectionRatioOrCallback === 'number' ? intersectionRatioOrCallback : 1;
+
+        let visible = CoreDom.isElementInViewport(element, intersectionRatio);
+        const setVisible = (newValue: boolean) => {
+            if (visible === newValue) {
+                return;
+            }
+
+            visible = newValue;
+            visibleCallback(visible);
+        };
+
+        if (!('IntersectionObserver' in window)) {
+            const interval = setInterval(() => setVisible(CoreDom.isElementInViewport(element, intersectionRatio)), 50);
+
+            return () => clearInterval(interval);
+        }
+
+        const observer = new IntersectionObserver(([{ isIntersecting, intersectionRatio }]) => {
+            setVisible(isIntersecting && intersectionRatio >= intersectionRatio);
+        });
+
+        observer.observe(element);
+
+        return () => observer.disconnect();
+    }
+
     /**
      * Wait an element to be in dom and visible.
      *
@@ -362,48 +418,29 @@ export class CoreDom {
      * @return Cancellable promise.
      */
     static waitToBeInViewport(element: HTMLElement, intersectionRatio = 1): CoreCancellablePromise<void> {
+        let unsubscribe: (() => void) | undefined;
         const visiblePromise = CoreDom.waitToBeVisible(element);
 
-        let intersectionObserver: IntersectionObserver;
-        let interval: number | undefined;
-
         return new CoreCancellablePromise<void>(
             async (resolve) => {
                 await visiblePromise;
 
                 if (CoreDom.isElementInViewport(element, intersectionRatio)) {
-
                     return resolve();
                 }
 
-                if ('IntersectionObserver' in window) {
-                    intersectionObserver = new IntersectionObserver((observerEntries) => {
-                        const isIntersecting = observerEntries
-                            .some((entry) => entry.isIntersecting && entry.intersectionRatio >= intersectionRatio);
-                        if (!isIntersecting) {
-                            return;
-                        }
+                unsubscribe = this.watchElementInViewport(element, intersectionRatio, inViewport => {
+                    if (!inViewport) {
+                        return;
+                    }
 
-                        resolve();
-                        intersectionObserver?.disconnect();
-                    });
-
-                    intersectionObserver.observe(element);
-                } else {
-                    interval = window.setInterval(() => {
-                        if (!CoreDom.isElementInViewport(element, intersectionRatio)) {
-                            return;
-                        }
-
-                        resolve();
-                        window.clearInterval(interval);
-                    }, 50);
-                }
+                    resolve();
+                    unsubscribe?.();
+                });
             },
             () => {
                 visiblePromise.cancel();
-                intersectionObserver?.disconnect();
-                window.clearInterval(interval);
+                unsubscribe?.();
             },
         );
     }

From cc04a794d89329fb382b7ec4c6bc40eec2007b02 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 30 Mar 2022 14:33:46 +0200
Subject: [PATCH 0848/1008] MOBILE-3833 dx: Enforce spacing between functions

---
 .eslintrc.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.eslintrc.js b/.eslintrc.js
index eba7eb33f..6319501e3 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -234,6 +234,11 @@ const appConfig = {
                 prev: '*',
                 next: 'return',
             },
+            {
+                blankLine: 'always',
+                prev: '*',
+                next: 'function',
+            },
         ],
         'prefer-arrow/prefer-arrow-functions': [
             'error',

From 2fe652b99438933f3c1d32dc1de07682720e830d Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 30 Mar 2022 15:53:49 +0200
Subject: [PATCH 0849/1008] MOBILE-3833 usertours: Define max width

---
 src/core/features/usertours/components/user-tour/user-tour.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/core/features/usertours/components/user-tour/user-tour.scss b/src/core/features/usertours/components/user-tour/user-tour.scss
index 3cb31e5bc..2e37de273 100644
--- a/src/core/features/usertours/components/user-tour/user-tour.scss
+++ b/src/core/features/usertours/components/user-tour/user-tour.scss
@@ -33,6 +33,7 @@
         color: var(--ion-text-color, #000);
         background: var(--popover-background);
         width: 70vw;
+        max-width: 400px;
         padding: 16px;
         border-radius: 8px;
 

From ab95e1d75982f4cee79fa92b89e87cba1b3efc09 Mon Sep 17 00:00:00 2001
From: Alfonso <alfonsomtb98@gmail.com>
Date: Wed, 30 Mar 2022 15:28:38 +0200
Subject: [PATCH 0850/1008] MOBILE-3833 module-summary: format file size to
 readable size only when requires it

---
 .../components/module-summary/module-summary.html    |  8 ++++----
 .../components/module-summary/module-summary.ts      | 12 +++++++-----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/core/features/course/components/module-summary/module-summary.html b/src/core/features/course/components/module-summary/module-summary.html
index 7af594e4b..8bd270c5e 100644
--- a/src/core/features/course/components/module-summary/module-summary.html
+++ b/src/core/features/course/components/module-summary/module-summary.html
@@ -153,7 +153,7 @@
             </ion-list>
         </ion-card>
 
-        <ion-card *ngIf="(canPrefetch && displayOptions.displayPrefetch) || (sizeReadable && displayOptions.displaySize)">
+        <ion-card *ngIf="(canPrefetch && displayOptions.displayPrefetch) || (size && displayOptions.displaySize)">
             <ion-item lines="full" class="ion-text-wrap card-header">
                 <ion-label>
                     <h2>
@@ -162,13 +162,13 @@
                     </h2>
                 </ion-label>
             </ion-item>
-            <ion-item *ngIf="sizeReadable && displayOptions.displaySize" class="ion-text-wrap">
+            <ion-item *ngIf="size && displayOptions.displaySize" class="ion-text-wrap">
                 <ion-label>
                     <p class="item-heading ion-text-wrap">{{ 'addon.storagemanager.totalspaceusage' | translate }}</p>
-                    <ion-badge color="light">{{ sizeReadable | coreBytesToSize }}</ion-badge>
+                    <ion-badge color="light">{{ size | coreBytesToSize }}</ion-badge>
                 </ion-label>
                 <ion-button *ngIf="!removeFilesLoading" [disabled]="prefetchLoading" (click)="removeFiles()" color="danger" fill="clear"
-                    [attr.aria-label]="'core.clearstoreddata' | translate:{$a: sizeReadable}" slot="end">
+                    [attr.aria-label]="'core.clearstoreddata' | translate:{$a: size | coreBytesToSize}" slot="end">
                     <ion-icon name="fas-trash" slot="icon-only" aria-hidden="true"></ion-icon>
                 </ion-button>
                 <ion-spinner *ngIf="removeFilesLoading" slot="end" aria-hidden="true"></ion-spinner>
diff --git a/src/core/features/course/components/module-summary/module-summary.ts b/src/core/features/course/components/module-summary/module-summary.ts
index 61e5695cf..7a399e8c1 100644
--- a/src/core/features/course/components/module-summary/module-summary.ts
+++ b/src/core/features/course/components/module-summary/module-summary.ts
@@ -62,7 +62,7 @@ export class CoreCourseModuleSummaryComponent implements OnInit, OnDestroy {
     prefetchLoading = false;
     canPrefetch = false;;
     prefetchDisabled = false;
-    sizeReadable = '';
+    size?: number; // Size in bytes
     downloadTimeReadable = ''; // Last download time in a readable format.
     grades?: CoreGradesFormattedRow[];
     blog = false; // If blog is available.
@@ -137,7 +137,9 @@ export class CoreCourseModuleSummaryComponent implements OnInit, OnDestroy {
 
                 const moduleSize = await CoreCourseModulePrefetchDelegate.getModuleStoredSize(this.module, this.courseId);
 
-                this.sizeReadable = moduleSize > 0 ? CoreTextUtils.bytesToSize(moduleSize, 2) : '';
+                if (moduleSize) {
+                    this.size = moduleSize;
+                }
             }, 1000);
 
             this.fileStatusObserver = CoreEvents.on(
@@ -211,9 +213,9 @@ export class CoreCourseModuleSummaryComponent implements OnInit, OnDestroy {
             this.prefetchDisabled = moduleInfo.status == CoreConstants.DOWNLOADED;
         }
 
-        this.sizeReadable = moduleInfo.size && moduleInfo.size > 0
-            ? moduleInfo.sizeReadable
-            : '';
+        if (moduleInfo.size && moduleInfo.size > 0) {
+            this.size = moduleInfo.size;
+        }
     }
 
     /**

From f27282a633b357a1d01be367b2fe55f664bc2e46 Mon Sep 17 00:00:00 2001
From: Alfonso <alfonsomtb98@gmail.com>
Date: Wed, 30 Mar 2022 07:55:30 +0200
Subject: [PATCH 0851/1008] MOBILE-4017 testing utils: make error path agnostic
 and set default eol as LF in vscode settings

---
 .gitattributes                       |  2 ++
 .vscode/settings.json                |  1 +
 src/core/classes/tests/error.test.ts |  6 ++++--
 src/testing/utils.ts                 | 11 +++++++++++
 4 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..dac53350e
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+* text=auto
+*.ts eol=lf
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 592fc58af..8c748420b 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -11,6 +11,7 @@
     "eslint.format.enable": true,
     "html.format.endWithNewline": true,
     "html.format.wrapLineLength": 140,
+    "files.eol": "\n",
     "files.trimFinalNewlines": true,
     "files.insertFinalNewline": true,
     "files.trimTrailingWhitespace": true,
diff --git a/src/core/classes/tests/error.test.ts b/src/core/classes/tests/error.test.ts
index a8f90e5be..f3c4865fc 100644
--- a/src/core/classes/tests/error.test.ts
+++ b/src/core/classes/tests/error.test.ts
@@ -16,6 +16,8 @@ import Faker from 'faker';
 
 import { CoreError } from '@classes/errors/error';
 
+import { agnosticPath } from '@/testing/utils';
+
 describe('CoreError', () => {
 
     it('behaves like an error', () => {
@@ -38,7 +40,7 @@ describe('CoreError', () => {
         expect(error!.name).toEqual('CoreError');
         expect(error!.message).toEqual(message);
         expect(error!.stack).not.toBeNull();
-        expect(error!.stack).toContain('src/core/classes/tests/error.test.ts');
+        expect(error!.stack).toContain(agnosticPath('src/core/classes/tests/error.test.ts'));
     });
 
     it('can be subclassed', () => {
@@ -70,7 +72,7 @@ describe('CoreError', () => {
         expect(error!.name).toEqual('CustomCoreError');
         expect(error!.message).toEqual(`Custom message: ${message}`);
         expect(error!.stack).not.toBeNull();
-        expect(error!.stack).toContain('src/core/classes/tests/error.test.ts');
+        expect(error!.stack).toContain(agnosticPath('src/core/classes/tests/error.test.ts'));
     });
 
 });
diff --git a/src/testing/utils.ts b/src/testing/utils.ts
index e31f69047..cd9a09696 100644
--- a/src/testing/utils.ts
+++ b/src/testing/utils.ts
@@ -16,6 +16,7 @@ import { AbstractType, Component, CUSTOM_ELEMENTS_SCHEMA, Type, ViewChild } from
 import { BrowserModule } from '@angular/platform-browser';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { Observable, Subject } from 'rxjs';
+import { sep } from 'path';
 
 import { CORE_SITE_SCHEMAS } from '@services/sites';
 import { CoreSingletonProxy, Network, Platform } from '@singletons';
@@ -245,3 +246,13 @@ export async function renderWrapperComponent<T>(
 
     return renderTemplate(component, `<${tag} ${inputAttributes}></${tag}>`, config);
 }
+
+/**
+ * Transform the provided path into a cross-platform path.
+ *
+ * @param unixPath path in unix format.
+ * @returns cross-platform path.
+ */
+export function agnosticPath(unixPath: string): string {
+    return unixPath.replace(/\//g, sep);
+}

From a17886ad538eb6dc73911ba0abf0b41ba1bcbbed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 30 Mar 2022 13:00:30 +0200
Subject: [PATCH 0852/1008] MOBILE-3833 collapsible: Do not calculate if not
 visible

---
 src/core/directives/collapsible-footer.ts | 24 +++++++++++++++++
 src/core/directives/collapsible-header.ts | 21 ++++++++++++---
 src/core/directives/collapsible-item.ts   | 32 ++++++++++++++++++++---
 3 files changed, 70 insertions(+), 7 deletions(-)

diff --git a/src/core/directives/collapsible-footer.ts b/src/core/directives/collapsible-footer.ts
index 7ead926a9..f0b7c90ad 100644
--- a/src/core/directives/collapsible-footer.ts
+++ b/src/core/directives/collapsible-footer.ts
@@ -50,6 +50,9 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
     protected endContentScrollListener?: EventListener;
     protected resizeListener?: CoreEventObserver;
     protected slotPromise?: CoreCancellablePromise<void>;
+    protected calcPending = false;
+    protected pageDidEnterListener?: EventListener;
+    protected page?: HTMLElement;
 
     constructor(el: ElementRef, protected ionContent: IonContent) {
         this.element = el.nativeElement;
@@ -82,6 +85,14 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
      * Calculate the height of the footer.
      */
     protected async calculateHeight(): Promise<void> {
+        if (!CoreDom.isElementVisible(this.element)) {
+            this.calcPending = true;
+
+            return;
+        }
+
+        this.calcPending = false;
+
         this.element.classList.remove('is-active');
         await CoreUtils.nextTick();
 
@@ -159,6 +170,16 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
         this.resizeListener = CoreDom.onWindowResize(() => {
             this.calculateHeight();
         }, 50);
+
+        this.page = this.content.closest<HTMLElement>('.ion-page') || undefined;
+        this.page?.addEventListener(
+            'ionViewDidEnter',
+            this.pageDidEnterListener = () => {
+                if (this.calcPending) {
+                    this.calculateHeight();
+                }
+            },
+        );
     }
 
     /**
@@ -228,6 +249,9 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
         if (this.content && this.endContentScrollListener) {
             this.content.removeEventListener('ionScrollEnd', this.endContentScrollListener);
         }
+        if (this.page && this.pageDidEnterListener) {
+            this.page.removeEventListener('ionViewDidEnter', this.pageDidEnterListener);
+        }
 
         this.resizeListener?.off();
         this.slotPromise?.cancel();
diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts
index 1cb15b1d6..19da86802 100644
--- a/src/core/directives/collapsible-header.ts
+++ b/src/core/directives/collapsible-header.ts
@@ -77,6 +77,8 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
     protected isWithinContent = false;
     protected enteredPromise = new CorePromisedValue<void>();
     protected mutationObserver?: MutationObserver;
+    protected firstEnter = true;
+    protected initPending = false;
 
     constructor(el: ElementRef) {
         this.collapsedHeader = el.nativeElement;
@@ -145,14 +147,19 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
         this.page.addEventListener(
             'ionViewDidEnter',
             this.pageDidEnterListener = () => {
-                clearTimeout(timeout);
-                this.enteredPromise.resolve();
+                if (this.firstEnter) {
+                    this.firstEnter = false;
+                    clearTimeout(timeout);
+                    this.enteredPromise.resolve();
+                } else if (this.initPending) {
+                    this.initializeFloatingTitle();
+                }
             },
-            { once: true },
         );
 
         // Timeout in case event is never fired.
         const timeout = window.setTimeout(() => {
+            this.firstEnter = false;
             this.enteredPromise.reject(new Error('[collapsible-header] Waiting for ionViewDidEnter timeout reached'));
         }, 5000);
 
@@ -259,6 +266,14 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
             throw new Error('[collapsible-header] Couldn\'t create floating title');
         }
 
+        if (!CoreDom.isElementVisible(this.expandedHeader)) {
+            this.initPending = true;
+
+            return;
+        }
+
+        this.initPending = false;
+
         this.page.classList.remove('collapsible-header-page-is-active');
         CoreUtils.nextTick();
 
diff --git a/src/core/directives/collapsible-item.ts b/src/core/directives/collapsible-item.ts
index 3bac8a97c..6e95242f2 100644
--- a/src/core/directives/collapsible-item.ts
+++ b/src/core/directives/collapsible-item.ts
@@ -56,6 +56,9 @@ export class CoreCollapsibleItemDirective implements OnInit, OnDestroy {
     protected darkModeListener?: Subscription;
     protected domPromise?: CoreCancellablePromise<void>;
     protected uniqueId: string;
+    protected calcPending = false;
+    protected pageDidEnterListener?: EventListener;
+    protected page?: HTMLElement;
 
     constructor(el: ElementRef<HTMLElement>) {
         this.element = el.nativeElement;
@@ -93,6 +96,15 @@ export class CoreCollapsibleItemDirective implements OnInit, OnDestroy {
 
         await this.calculateHeight();
 
+        this.page?.addEventListener(
+            'ionViewDidEnter',
+            this.pageDidEnterListener = () => {
+                if (this.calcPending) {
+                    this.calculateHeight();
+                }
+            },
+        );
+
         this.resizeListener = CoreDom.onWindowResize(() => {
             this.calculateHeight();
         }, 50);
@@ -112,13 +124,12 @@ export class CoreCollapsibleItemDirective implements OnInit, OnDestroy {
 
         await this.domPromise;
 
-        const page = this.element.closest('.ion-page');
-
-        if (!page) {
+        this.page = this.element.closest<HTMLElement>('.ion-page') || undefined;
+        if (!this.page) {
             return;
         }
 
-        await CoreComponentsRegistry.waitComponentsReady(page, 'core-loading', CoreLoadingComponent);
+        await CoreComponentsRegistry.waitComponentsReady(this.page, 'core-loading', CoreLoadingComponent);
     }
 
     /**
@@ -137,6 +148,15 @@ export class CoreCollapsibleItemDirective implements OnInit, OnDestroy {
 
         await this.waitFormatTextsRendered();
 
+        if (!this.element.clientHeight) {
+            this.calcPending = true;
+            this.element.classList.remove('collapsible-loading-height');
+
+            return;
+        }
+
+        this.calcPending = false;
+
         this.expandedHeight = this.element.getBoundingClientRect().height;
 
         // Restore the max height now.
@@ -278,6 +298,10 @@ export class CoreCollapsibleItemDirective implements OnInit, OnDestroy {
         this.resizeListener?.off();
         this.darkModeListener?.unsubscribe();
         this.domPromise?.cancel();
+
+        if (this.page && this.pageDidEnterListener) {
+            this.page.removeEventListener('ionViewDidEnter', this.pageDidEnterListener);
+        }
     }
 
 }

From f25a51b5d12e2f238b40aac69be43e53d9eadd8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 30 Mar 2022 13:24:28 +0200
Subject: [PATCH 0853/1008] MOBILE-3833 module: Hide module navigation on non
 main pages

---
 .../folder/components/index/addon-mod-folder-index.html  | 4 ++--
 .../mod/wiki/components/index/addon-mod-wiki-index.html  | 9 +++++----
 src/addons/mod/wiki/components/index/index.scss          | 1 -
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/addons/mod/folder/components/index/addon-mod-folder-index.html b/src/addons/mod/folder/components/index/addon-mod-folder-index.html
index 3a121644d..e41323e5d 100644
--- a/src/addons/mod/folder/components/index/addon-mod-folder-index.html
+++ b/src/addons/mod/folder/components/index/addon-mod-folder-index.html
@@ -32,6 +32,6 @@
 
 </core-loading>
 
-<core-course-module-navigation collapsible-footer appearOnBottom [hidden]="showLoading" [courseId]="courseId" [currentModuleId]="module.id"
-    (completionChanged)="onCompletionChange()">
+<core-course-module-navigation collapsible-footer appearOnBottom *ngIf="!subfolder" [hidden]="showLoading" [courseId]="courseId"
+    [currentModuleId]="module.id" (completionChanged)="onCompletionChange()">
 </core-course-module-navigation>
diff --git a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
index 4c220849f..56336ba50 100644
--- a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
+++ b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
@@ -30,8 +30,8 @@
 <core-loading [hideUntil]="!showLoading">
 
     <!-- Activity info. -->
-    <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
-        [courseId]="courseId" (completionChanged)="onCompletionChange()">
+    <core-course-module-info *ngIf="isMainPage" [module]="module" [description]="description" [component]="component"
+        [componentId]="componentId" [courseId]="courseId" (completionChanged)="onCompletionChange()">
     </core-course-module-info>
 
     <div *ngIf="pageIsOffline || hasOffline || pageWarning">
@@ -54,7 +54,7 @@
             </ion-item>
         </ion-card>
     </div>
-    <div class="ion-padding addon-mod_wiki-page-content">
+    <div class="ion-padding-horizontal addon-mod_wiki-page-content">
         <h2 *ngIf="pageTitle">{{pageTitle}}</h2>
         <article [ngClass]="{'addon-mod_wiki-noedit': !canEdit}">
             <core-format-text *ngIf="pageContent" [component]="component" [componentId]="componentId" [text]="pageContent"
@@ -71,7 +71,8 @@
     </div>
 </core-loading>
 
-<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModuleId]="module.id">
+<core-course-module-navigation collapsible-footer *ngIf="isMainPage" [hidden]="showLoading" [courseId]="courseId"
+    [currentModuleId]="module.id">
 </core-course-module-navigation>
 
 <ion-fab slot="fixed" core-fab vertical="bottom" horizontal="end" *ngIf="canEdit">
diff --git a/src/addons/mod/wiki/components/index/index.scss b/src/addons/mod/wiki/components/index/index.scss
index f0251ad37..64a882770 100644
--- a/src/addons/mod/wiki/components/index/index.scss
+++ b/src/addons/mod/wiki/components/index/index.scss
@@ -11,7 +11,6 @@ $addon-mod-wiki-toc-level-padding:    12px !default;
 
     .addon-mod_wiki-page-content {
         background-color: var(--ion-item-background);
-        border-top: 1px solid var(--stroke);
         padding-bottom: 10px;
     }
 

From c6191229a02d40800b6746114527ab1eacf6e26a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 30 Mar 2022 13:33:59 +0200
Subject: [PATCH 0854/1008] MOBILE-3833 resource: Change button order on
 resource

---
 .../components/index/addon-mod-resource-index.html   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/addons/mod/resource/components/index/addon-mod-resource-index.html b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
index 213d21523..6291b1a09 100644
--- a/src/addons/mod/resource/components/index/addon-mod-resource-index.html
+++ b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
@@ -81,6 +81,12 @@
 
     <div collapsible-footer appearOnBottom *ngIf="!showLoading" slot="fixed">
         <div class="list-item-limited-width" *ngIf="mode == 'external'">
+            <ion-button *ngIf="isIOS && (!shouldOpenInBrowser || !isOnline)" expand="block" fill="outline"
+                (click)="open(openFileAction.OPEN_WITH)" class="ion-margin ion-text-wrap">
+                <ion-icon name="far-share-square" slot="start" aria-hidden="true"></ion-icon>
+                {{ 'core.openwith' | translate }}
+            </ion-button>
+
             <ion-button expand="block" (click)="open(openFileAction.OPEN)" class="ion-margin ion-text-wrap">
                 <ng-container *ngIf="isStreamedFile">
                     <ion-icon name="fas-play" slot="start" aria-hidden="true"></ion-icon>
@@ -91,12 +97,6 @@
                     {{ 'addon.mod_resource.openthefile' | translate }}
                 </ng-container>
             </ion-button>
-
-            <ion-button *ngIf="isIOS && (!shouldOpenInBrowser || !isOnline)" expand="block" (click)="open(openFileAction.OPEN_WITH)"
-                class="ion-margin ion-text-wrap">
-                <ion-icon name="far-share-square" slot="start" aria-hidden="true"></ion-icon>
-                {{ 'core.openwith' | translate }}
-            </ion-button>
         </div>
         <core-course-module-navigation [courseId]="courseId" [currentModuleId]="module.id">
         </core-course-module-navigation>

From c7a5b8589b95ebd49f7652d758f936898e19b6a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 30 Mar 2022 14:13:33 +0200
Subject: [PATCH 0855/1008] MOBILE-3833 iframe: Fix full screen header styles

---
 src/theme/components/collapsible-header.scss |  6 ++--
 src/theme/theme.base.scss                    | 29 ++++++++++----------
 src/theme/theme.light.scss                   |  2 ++
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/theme/components/collapsible-header.scss b/src/theme/components/collapsible-header.scss
index 04304a443..eed43f951 100644
--- a/src/theme/components/collapsible-header.scss
+++ b/src/theme/components/collapsible-header.scss
@@ -1,4 +1,4 @@
-.collapsible-header-page {
+body:not(.core-iframe-fullscreen) .collapsible-header-page {
     --collapsible-header-progress: 0;
     --collapsible-header-collapsed-height: 0px;
     --collapsible-header-expanded-y-delta: 0px;
@@ -27,10 +27,10 @@
 
     &:not(.collapsible-header-page-is-collapsed) .collapsible-header-collapsed {
         --core-header-toolbar-border-width: 0;
+        --core-header-buttons-background: var(--ion-background-color);
+        --core-header-buttons-color: var(--text-color);
         ion-toolbar {
             --background: transparent;
-            --core-header-buttons-background: var(--ion-background-color);
-            --core-header-buttons-color: var(--text-color);
         }
 
         h1 {
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index a97d2eea2..8f94c4e2e 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -154,9 +154,6 @@ ion-header {
     z-index: 12; // To hide ion-slides on scroll.
 
     ion-toolbar {
-        --core-header-buttons-background: var(--core-header-toolbar-background);
-        --core-header-buttons-color: var(--core-header-toolbar-color);
-
         ion-spinner {
             margin: 10px;
         }
@@ -579,14 +576,19 @@ body.core-iframe-fullscreen ion-router-outlet {
         }
     }
 
-    --core-header-toolbar-height: 48px;
-    --core-header-toolbar-color: white;
-    --core-header-toolbar-background: black;
-    --core-header-toolbar-border-width: 0px;
+    .ion-page ion-header {
+        --core-header-toolbar-height: 48px;
+        --core-header-toolbar-color: white;
+        --core-header-toolbar-background: black;
+        --core-header-buttons-background: var(--core-header-toolbar-background);
+        --core-header-buttons-background: var(--core-header-toolbar-background);
+        --core-header-buttons-color: var(--core-header-toolbar-color);
+        --core-header-toolbar-border-width: 0px;
 
-    ion-header ion-toolbar {
-        h1, ion-back-button {
-            display: none;
+        ion-toolbar {
+            h1, ion-back-button {
+                display: none;
+            }
         }
     }
 
@@ -1585,11 +1587,8 @@ ion-header.no-title {
     --core-header-toolbar-border-width: 0;
     --core-header-toolbar-background: transparent;
     --core-header-shadow: none !important;
-    ion-toolbar {
-        --core-header-buttons-background: var(--ion-background-color);
-        --core-header-buttons-color: var(--text-color);
-    }
-
+    --core-header-buttons-background: var(--ion-background-color);
+    --core-header-buttons-color: var(--text-color);
 }
 
 // To make core-swipe-slides fill the remaining height.
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 21e9485e1..7478d0a85 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -148,6 +148,8 @@
     --core-header-toolbar-color: var(--text-color);
     --core-header-toolbar-height: 48px;
     --core-header-shadow: none;
+    --core-header-buttons-background: var(--core-header-toolbar-background);
+    --core-header-buttons-color: var(--core-header-toolbar-color);
 
     ion-header {
         box-shadow: var(--core-header-shadow, none);

From c40b792f5dc1902e532c50b1b969d5f069dacc52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 30 Mar 2022 14:20:12 +0200
Subject: [PATCH 0856/1008] MOBILE-3833 style: Normalize font-size on cards

---
 .../components/calendar/calendar.scss         |  2 +-
 .../components/index/index.scss               |  2 +-
 .../mod/scorm/components/index/index.scss     |  2 +-
 .../mod/survey/components/index/index.scss    |  2 +-
 src/addons/notifications/pages/list/list.scss |  2 +-
 .../pages/notification/notification.scss      |  2 +-
 .../components/course-index/course-index.scss |  2 +-
 .../features/grades/pages/course/course.scss  |  2 +-
 src/theme/components/format-text.scss         |  2 +-
 src/theme/theme.base.scss                     | 24 ++++++++++---------
 src/theme/theme.light.scss                    |  1 +
 11 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/addons/calendar/components/calendar/calendar.scss b/src/addons/calendar/components/calendar/calendar.scss
index b5c40fd10..1fe5598cc 100644
--- a/src/addons/calendar/components/calendar/calendar.scss
+++ b/src/addons/calendar/components/calendar/calendar.scss
@@ -17,7 +17,7 @@
     .addon-calendar-months {
         background-color: var(--contrast-background);
         padding: 0;
-        font-size: 14px;
+        font-size: var(--text-size);
     }
 
     .addon-calendar-day {
diff --git a/src/addons/mod/bigbluebuttonbn/components/index/index.scss b/src/addons/mod/bigbluebuttonbn/components/index/index.scss
index 61fe68559..c6f581f99 100644
--- a/src/addons/mod/bigbluebuttonbn/components/index/index.scss
+++ b/src/addons/mod/bigbluebuttonbn/components/index/index.scss
@@ -1,3 +1,3 @@
 ion-item > p[slot="end"] {
-    font-size: 14px;
+    font-size: var(--text-size);
 }
diff --git a/src/addons/mod/scorm/components/index/index.scss b/src/addons/mod/scorm/components/index/index.scss
index 636b83653..f8fc150a1 100644
--- a/src/addons/mod/scorm/components/index/index.scss
+++ b/src/addons/mod/scorm/components/index/index.scss
@@ -2,7 +2,7 @@
 
 :host {
     .addon-mod_scorm-attempt-summary ion-item > p {
-        font-size: 14px;
+        font-size: var(--text-size);
     }
 
     .addon-mod_scorm-toc {
diff --git a/src/addons/mod/survey/components/index/index.scss b/src/addons/mod/survey/components/index/index.scss
index 6f557a178..bdb061e94 100644
--- a/src/addons/mod/survey/components/index/index.scss
+++ b/src/addons/mod/survey/components/index/index.scss
@@ -3,7 +3,7 @@
     --even-background: var(--gray-200);
 
     .option-name {
-        font-size: 14px;
+        font-size: var(--text-size);
     }
 
     .addon-mod_survey-question {
diff --git a/src/addons/notifications/pages/list/list.scss b/src/addons/notifications/pages/list/list.scss
index da15978c7..e58fa6b12 100644
--- a/src/addons/notifications/pages/list/list.scss
+++ b/src/addons/notifications/pages/list/list.scss
@@ -5,7 +5,7 @@ ion-item {
         margin-top: 8px;
         margin-bottom: 8px;
         p.item-heading {
-            font-size: 14px;
+            font-size: var(--text-size);
             -webkit-line-clamp: 3;
             overflow: hidden;
             text-overflow: ellipsis;
diff --git a/src/addons/notifications/pages/notification/notification.scss b/src/addons/notifications/pages/notification/notification.scss
index 05f459851..7b0943218 100644
--- a/src/addons/notifications/pages/notification/notification.scss
+++ b/src/addons/notifications/pages/notification/notification.scss
@@ -17,7 +17,7 @@
 
     .core-notification-body {
         core-format-text {
-            font-size: 14px;
+            font-size: var(--text-size);
         }
 
         h2 {
diff --git a/src/core/features/course/components/course-index/course-index.scss b/src/core/features/course/components/course-index/course-index.scss
index f4575ba22..7804c82f3 100644
--- a/src/core/features/course/components/course-index/course-index.scss
+++ b/src/core/features/course/components/course-index/course-index.scss
@@ -74,7 +74,7 @@ ion-item.item {
         }
 
         &.restricted {
-            font-size: 14px;
+            font-size: var(--text-size);
         }
     }
 }
diff --git a/src/core/features/grades/pages/course/course.scss b/src/core/features/grades/pages/course/course.scss
index bed25f18e..fff8ae719 100644
--- a/src/core/features/grades/pages/course/course.scss
+++ b/src/core/features/grades/pages/course/course.scss
@@ -98,7 +98,7 @@
         }
 
         .expandable-status-icon {
-            font-size: 14px;
+            font-size: var(--text-size);
             @include margin-horizontal(0, 2px);
             @include core-transition(transform, 200ms);
 
diff --git a/src/theme/components/format-text.scss b/src/theme/components/format-text.scss
index 808d38dbc..d2a47fe51 100644
--- a/src/theme/components/format-text.scss
+++ b/src/theme/components/format-text.scss
@@ -210,7 +210,7 @@ core-rich-text-editor .core-rte-editor {
 
     p, ul, ol, li {
         // Normalize font-size inside formatted text.
-        font-size: 14px;
+        font-size: var(--text-size);
     }
 
     p {
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 8f94c4e2e..ae32731e9 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -96,7 +96,7 @@ body {
     &.item-heading-secondary {
         @include margin(2px, 0);
 
-        font-size: 14px;
+        font-size: var(--text-size);
         font-weight: normal;
 
         line-height: normal;
@@ -112,7 +112,7 @@ body {
     &.item-heading-secondary {
         @include margin(0, 0, 3px);
 
-        font-size: 14px;
+        font-size: var(--text-size);
         font-weight: normal;
 
         line-height: normal;
@@ -222,7 +222,7 @@ ion-header {
 
         h1 + h2,
         h1 + .subheading {
-            font-size: 14px;
+            font-size: var(--text-size);
             font-weight: 400;
         }
 
@@ -242,7 +242,7 @@ ion-header {
 
             h1 + h2,
             h1 + .subheading {
-                font-size: 14px;
+                font-size: var(--text-size);
                 font-weight: 400;
             }
         }
@@ -690,7 +690,7 @@ body.core-iframe-fullscreen ion-router-outlet {
     font-style: italic;
     margin-top: 0;
     margin-bottom: 10px;
-    font-size: 14px;
+    font-size: var(--text-size);
 }
 
 // Item styles
@@ -714,7 +714,7 @@ body.core-iframe-fullscreen ion-router-outlet {
     }
 
     p.item-heading {
-        font-size: 14px;
+        font-size: var(--text-size);
     }
 
     p {
@@ -767,6 +767,7 @@ body.core-iframe-fullscreen ion-router-outlet {
             --color: var(--color-shade);
             --inner-border-width: 0px;
             --border-width: 0px;
+            font-size: var(--text-size);
 
             ion-label, ion-label > p {
                 --color: var(--color-shade);
@@ -1227,6 +1228,7 @@ audio.core-media-adapt-width {
 }
 
 ion-item {
+    font-size: var(--text-size);
     --inner-border-width: 0px;
 }
 
@@ -1283,7 +1285,7 @@ html.md div.fake-ion-item {
     h6 {
         @include margin(2px, 0);
 
-        font-size: 14px;
+        font-size: var(--text-size);
         font-weight: normal;
 
         line-height: normal;
@@ -1291,7 +1293,7 @@ html.md div.fake-ion-item {
 
     p {
         @include margin(0, 0, 2px);
-        font-size: 14px;
+        font-size: var(--text-size);
         line-height: 20px;
         text-overflow: inherit;
         overflow: inherit;
@@ -1299,7 +1301,7 @@ html.md div.fake-ion-item {
 }
 
 html.ios div.fake-ion-item {
-    font-size: 14px;
+    font-size: var(--text-size);
     @include padding(null, 10px, null, 20px);
     @include margin(10px, 8px, 10px, null);
 
@@ -1320,14 +1322,14 @@ html.ios div.fake-ion-item {
     h5,
     h6 {
         @include margin(0, 0, 3px);
-        font-size: 14px;
+        font-size: var(--text-size);
         font-weight: normal;
         line-height: normal;
     }
 
     p {
         @include margin(0, 0, 2px 0);
-        font-size: 14px;
+        font-size: var(--text-size);
         line-height: normal;
         text-overflow: inherit;
         overflow: inherit;
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 7478d0a85..14da0eacf 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -59,6 +59,7 @@
     --huge-radius: 24px;
 
     --text-color:       #{$text-color};
+    --text-size:        14px;
     --background-color: #{$background-color};
     --stroke:            var(--gray-300);
 

From 442a3ec856e0134a17d54f598857d1862846c28a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 30 Mar 2022 14:23:13 +0200
Subject: [PATCH 0857/1008] MOBILE-3833 module: Disable visited module styles

---
 .../course/components/module-info/course-module-info.scss    | 4 ++++
 src/core/features/course/components/module/module.scss       | 5 -----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/core/features/course/components/module-info/course-module-info.scss b/src/core/features/course/components/module-info/course-module-info.scss
index 8b6c8feb0..d6aa6ad69 100644
--- a/src/core/features/course/components/module-info/course-module-info.scss
+++ b/src/core/features/course/components/module-info/course-module-info.scss
@@ -29,6 +29,10 @@
         margin: 8px;
         padding: 8px;
 
+        &:empty {
+            display: none;
+        }
+
         ::ng-deep ion-item {
             --ion-item-background: var(--light);
             --background: var(--light);
diff --git a/src/core/features/course/components/module/module.scss b/src/core/features/course/components/module/module.scss
index 2ef99974b..3485350cf 100644
--- a/src/core/features/course/components/module/module.scss
+++ b/src/core/features/course/components/module/module.scss
@@ -3,7 +3,6 @@
 :host {
     --horizontal-margin: 10px;
     --vertical-margin: 10px;
-    --core-course-module-not-viewed-border-color: var(--gray-500);
 
     ion-card {
         margin: var(--vertical-margin) var(--horizontal-margin);
@@ -93,10 +92,6 @@
         display: none;
     }
 
-    &.core-course-module-not-viewed ion-card.core-course-module-with-view {
-        --ion-card-border-color: var(--core-course-module-not-viewed-border-color);
-    }
-
     .core-course-last-module-viewed {
         padding: 8px 12px;
         color: var(--subdued-text-color);

From 0336ab0808613c855ba70b90d809af023ddbbf3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 30 Mar 2022 14:42:12 +0200
Subject: [PATCH 0858/1008] MOBILE-3833 module: Make module navigation less
 prominent

---
 scripts/langindex.json                        |  8 ++--
 src/addons/mod/feedback/pages/form/form.html  |  2 +-
 .../course-format/course-format.scss          |  2 +
 .../core-course-module-navigation.html        | 21 +++++-----
 .../module-navigation/module-navigation.scss  | 38 +++++++++++++++----
 .../module-navigation/module-navigation.ts    |  2 +-
 src/core/features/course/lang.json            | 14 +++----
 7 files changed, 56 insertions(+), 31 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 3a9d7ae12..aba8a3680 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1558,10 +1558,6 @@
   "core.course.errordownloadingsection": "local_moodlemobileapp",
   "core.course.errorgetmodule": "local_moodlemobileapp",
   "core.course.failed": "completion",
-  "core.course.gotonextactivity": "local_moodlemobileapp",
-  "core.course.gotonextactivitynotfound": "local_moodlemobileapp",
-  "core.course.gotopreviousactivity": "local_moodlemobileapp",
-  "core.course.gotopreviousactivitynotfound": "local_moodlemobileapp",
   "core.course.hiddenfromstudents": "moodle",
   "core.course.hiddenoncoursepage": "moodle",
   "core.course.highlighted": "moodle",
@@ -1570,8 +1566,12 @@
   "core.course.lastaccessedactivity": "local_moodlemobileapp",
   "core.course.manualcompletionnotsynced": "local_moodlemobileapp",
   "core.course.modulenotfound": "local_moodlemobileapp",
+  "core.course.nextactivity": "local_moodlemobileapp",
+  "core.course.nextactivitynotfound": "local_moodlemobileapp",
   "core.course.nocontentavailable": "local_moodlemobileapp",
   "core.course.overriddennotice": "grades",
+  "core.course.previousactivity": "local_moodlemobileapp",
+  "core.course.previousactivitynotfound": "local_moodlemobileapp",
   "core.course.refreshcourse": "local_moodlemobileapp",
   "core.course.section": "moodle",
   "core.course.startdate": "moodle",
diff --git a/src/addons/mod/feedback/pages/form/form.html b/src/addons/mod/feedback/pages/form/form.html
index 6ca2f58d8..e16c65d39 100644
--- a/src/addons/mod/feedback/pages/form/form.html
+++ b/src/addons/mod/feedback/pages/form/form.html
@@ -158,7 +158,7 @@
                 </ion-button>
                 <ion-button expand="block" (click)="continue()" class="ion-text-wrap ion-margin">
                     <ng-container *ngIf="!siteAfterSubmit">{{ 'core.continue' | translate }}</ng-container>
-                    <ng-container *ngIf="siteAfterSubmit">{{ 'core.course.gotonextactivity' | translate }}</ng-container>
+                    <ng-container *ngIf="siteAfterSubmit">{{ 'core.course.nextactivity' | translate }}</ng-container>
                 </ion-button>
             </div>
         </div>
diff --git a/src/core/features/course/components/course-format/course-format.scss b/src/core/features/course/components/course-format/course-format.scss
index 869e69a96..da38b60b6 100644
--- a/src/core/features/course/components/course-format/course-format.scss
+++ b/src/core/features/course/components/course-format/course-format.scss
@@ -10,6 +10,8 @@
         overflow: hidden;
         text-transform: none;
         flex: 1;
+        margin-left: 4px;
+        margin-right: 4px;
     }
 }
 
diff --git a/src/core/features/course/components/module-navigation/core-course-module-navigation.html b/src/core/features/course/components/module-navigation/core-course-module-navigation.html
index 5ca66de46..67afb3dc5 100644
--- a/src/core/features/course/components/module-navigation/core-course-module-navigation.html
+++ b/src/core/features/course/components/module-navigation/core-course-module-navigation.html
@@ -1,17 +1,16 @@
 <core-loading [hideUntil]="loaded" [fullscreen]="false">
-    <ion-row class="ion-justify-content-between ion-align-items-center ion-no-padding ion-wrap" *ngIf="previousModule || nextModule">
-        <ion-col size="auto" class="ion-no-padding core-course-module-navigation-arrow">
-            <ion-button fill="clear" class="core-course-previous-module" [disabled]="!previousModule" (click)="goToActivity(false)"
-                [attr.aria-label]="'core.course.gotopreviousactivity' | translate">
-                <ion-icon name="fas-arrow-left" slot="start" aria-hidden="true"></ion-icon>
-                {{ 'core.previous' | translate }}
+    <ion-row class="ion-justify-content-between ion-align-items-center ion-no-padding" *ngIf="previousModule || nextModule">
+        <ion-col size="6" class="ion-no-padding core-course-module-navigation-arrow">
+            <ion-button fill="clear" class="core-course-previous-module ion-text-wrap" [disabled]="!previousModule"
+                (click)="goToActivity(false)">
+                <ion-icon name="fas-chevron-left" slot="start" aria-hidden="true"></ion-icon>
+                <div class="button-text">{{ 'core.course.previousactivity' | translate }}</div>
             </ion-button>
         </ion-col>
-        <ion-col size="auto" class="ion-no-padding core-course-module-navigation-arrow">
-            <ion-button fill="clear" class="core-course-next-module" [disabled]="!nextModule" (click)="goToActivity(true)"
-                [attr.aria-label]="'core.course.gotonextactivity' | translate">
-                {{ 'core.next' | translate }}
-                <ion-icon name="fas-arrow-right" slot="end" aria-hidden="true"></ion-icon>
+        <ion-col size="6" class="ion-no-padding core-course-module-navigation-arrow">
+            <ion-button fill="clear" class="core-course-next-module ion-text-wrap" [disabled]=" !nextModule" (click)="goToActivity(true)">
+                <div class="button-text">{{ 'core.course.nextactivity' | translate }}</div>
+                <ion-icon name="fas-chevron-right" slot="end" aria-hidden="true"></ion-icon>
             </ion-button>
         </ion-col>
     </ion-row>
diff --git a/src/core/features/course/components/module-navigation/module-navigation.scss b/src/core/features/course/components/module-navigation/module-navigation.scss
index 4b4eb2a8c..6b8ce25f6 100644
--- a/src/core/features/course/components/module-navigation/module-navigation.scss
+++ b/src/core/features/course/components/module-navigation/module-navigation.scss
@@ -3,7 +3,7 @@
 :host {
     --height: var(--core-navigation-max-height);
     --background: var(--core-navigation-background);
-    --button-vertical-margin: 2px;
+    --button-color: var(--gray-700);
 
     height: var(--height);
     width: 100%;
@@ -16,18 +16,42 @@
         --loading-inline-min-height: var(--height);
     }
 
-    ion-button,
-    ::ng-deep ion-button {
-        margin-top: var(--button-vertical-margin);
-        margin-bottom: var(--button-vertical-margin);
-    }
-
     &.empty {
         display: none;
     }
+
+    .core-course-module-navigation-arrow {
+        ion-button {
+            margin: 0;
+            --border-radius: 0;
+            width: 100%;
+            text-transform: none;
+            font-size: 12px;
+            font-weight: normal;
+            --color: var(--button-color);
+
+            .button-text {
+                width:100%;
+            }
+
+            ion-icon {
+                font-size: 12px;
+            }
+        }
+        .core-course-previous-module {
+            text-align: start;
+        }
+        .core-course-next-module {
+            text-align: end;
+        }
+    }
 }
 
 :host-context(core-course-format.core-course-format-singleactivity) {
     opacity: 0 !important;
     height: 0 !important;
 }
+
+:host-context(body.dark) {
+    --button-color: var(--gray-100);
+}
diff --git a/src/core/features/course/components/module-navigation/module-navigation.ts b/src/core/features/course/components/module-navigation/module-navigation.ts
index 63211dbc2..cf1327ebd 100644
--- a/src/core/features/course/components/module-navigation/module-navigation.ts
+++ b/src/core/features/course/components/module-navigation/module-navigation.ts
@@ -215,7 +215,7 @@ export class CoreCourseModuleNavigationComponent implements OnInit, OnDestroy {
         if (!module) {
             // It seems the module was hidden. Show a message.
             CoreDomUtils.instance.showErrorModal(
-                next ? 'core.course.gotonextactivitynotfound' : 'core.course.gotopreviousactivitynotfound',
+                next ? 'core.course.nextactivitynotfound' : 'core.course.previousactivitynotfound',
                 true,
             );
 
diff --git a/src/core/features/course/lang.json b/src/core/features/course/lang.json
index 1103a9902..8195622c0 100644
--- a/src/core/features/course/lang.json
+++ b/src/core/features/course/lang.json
@@ -20,11 +20,11 @@
     "confirmdownload": "You are about to download {{size}}.{{availableSpace}} Are you sure you want to continue?",
     "confirmdownloadunknownsize": "It was not possible to calculate the size of the download.{{availableSpace}} Are you sure you want to continue?",
     "confirmdownloadzerosize": "You are about to start downloading.{{availableSpace}} Are you sure you want to continue?",
-    "confirmpartialdownloadsize": "You are about to download <strong>at least</strong> {{size}}.{{availableSpace}} Are you sure you want to continue?",
     "confirmlimiteddownload": "You are not currently connected to Wi-Fi. ",
-    "courseindex": "Course index",
+    "confirmpartialdownloadsize": "You are about to download <strong>at least</strong> {{size}}.{{availableSpace}} Are you sure you want to continue?",
     "couldnotloadsectioncontent": "Could not load the section content. Please try again later.",
     "couldnotloadsections": "Could not load the sections. Please try again later.",
+    "courseindex": "Course index",
     "coursesummary": "Course summary",
     "done": "Done",
     "downloadcourse": "Download course",
@@ -35,20 +35,20 @@
     "errordownloadingsection": "Error downloading section.",
     "errorgetmodule": "Error getting activity data.",
     "failed": "Failed",
-    "gotonextactivity": "Go to next activity",
-    "gotonextactivitynotfound": "Next activity not found. It's possible that it has been hidden or deleted.",
-    "gotopreviousactivity": "Go to previous activity",
-    "gotopreviousactivitynotfound": "Previous activity not found. It's possible that it has been hidden or deleted.",
     "hiddenfromstudents": "Hidden from students",
     "hiddenoncoursepage": "Available but not shown on course page",
     "highlighted": "Highlighted",
-    "insufficientavailablespace": "You are trying to download {{size}}. This will leave your device with insufficient space to operate normally. Please clear some storage space first.",
     "insufficientavailablequota": "Your device could not allocate space to save this download. It may be reserving space for app and system updates. Please clear some storage space first.",
+    "insufficientavailablespace": "You are trying to download {{size}}. This will leave your device with insufficient space to operate normally. Please clear some storage space first.",
     "lastaccessedactivity": "Last accessed activity",
     "manualcompletionnotsynced": "Manual completion not synchronised.",
     "modulenotfound": "Resource or activity not found, please make sure you're online and it's still available.",
+    "nextactivity": "Next activity",
+    "nextactivitynotfound": "Next activity not found. It's possible that it has been hidden or deleted.",
     "nocontentavailable": "No content available at the moment.",
     "overriddennotice": "Your final grade from this activity was manually adjusted.",
+    "previousactivity": "Previous activity",
+    "previousactivitynotfound": "Previous activity not found. It's possible that it has been hidden or deleted.",
     "refreshcourse": "Refresh course",
     "section": "Section",
     "startdate": "Course start date",

From f56cfa3ab6fe23218166bf53c59ccd1149e850f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 30 Mar 2022 16:14:30 +0200
Subject: [PATCH 0859/1008] MOBILE-3833 tabs: Remove MAX_HEIGHT_TO_HIDE_TABS
 and scroll hide

---
 src/core/classes/tabs.ts                      | 158 +-----------------
 .../components/tabs-outlet/tabs-outlet.ts     |   9 -
 src/core/components/tabs/tab.ts               |   3 -
 src/core/components/tabs/tabs.ts              |   9 -
 4 files changed, 1 insertion(+), 178 deletions(-)

diff --git a/src/core/classes/tabs.ts b/src/core/classes/tabs.ts
index fbb1d0f52..dbec45e01 100644
--- a/src/core/classes/tabs.ts
+++ b/src/core/classes/tabs.ts
@@ -26,7 +26,7 @@ import {
     SimpleChange,
 } from '@angular/core';
 import { IonSlides } from '@ionic/angular';
-import { BackButtonEvent, ScrollDetail } from '@ionic/core';
+import { BackButtonEvent } from '@ionic/core';
 import { Subscription } from 'rxjs';
 
 import { Platform, Translate } from '@singletons';
@@ -45,9 +45,6 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
 
     // Minimum tab's width.
     protected static readonly MIN_TAB_WIDTH = 107;
-    // @todo [4.0]
-    // Max height that allows tab hiding. WARNING: Hide tabs on scroll disabled. If confirmed, remove the associated code.
-    protected static readonly MAX_HEIGHT_TO_HIDE_TABS = 0;
 
     @Input() selectedIndex = 0; // Index of the tab to select.
     @Input() hideUntil = false; // Determine when should the contents be shown.
@@ -73,10 +70,6 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
     protected initialized = false;
     protected afterViewInitTriggered = false;
 
-    protected tabBarHeight = 0;
-    protected tabsElement?: HTMLElement; // The tabs parent element. It's the element that will be "scrolled" to hide tabs.
-    protected tabBarElement?: HTMLIonTabBarElement; // The top tab bar element.
-    protected tabsShown = true;
     protected resizeListener?: CoreEventObserver;
     protected isDestroyed = false;
     protected isCurrentView = true;
@@ -91,9 +84,6 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
     protected isInTransition = false; // Wether Slides is in transition.
     protected slidesSwiper: any; // eslint-disable-line @typescript-eslint/no-explicit-any
     protected slidesSwiperLoaded = false;
-    protected scrollElements: Record<string | number, HTMLElement> = {}; // Scroll elements for each loaded tab.
-    protected lastScroll = 0;
-    protected previousLastScroll = 0;
 
     tabAction: CoreTabsRoleTab<T>;
 
@@ -128,7 +118,6 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
         }
 
         this.afterViewInitTriggered = true;
-        this.tabBarElement = this.element.nativeElement.querySelector('ion-tab-bar');
 
         if (!this.initialized && this.hideUntil) {
             // Tabs should be shown, initialize them.
@@ -140,49 +129,6 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
         });
     }
 
-    /**
-     * Calculate the tab bar height.
-     */
-    protected calculateTabBarHeight(): void {
-        if (!this.tabBarElement) {
-            return;
-        }
-
-        this.tabBarHeight = this.tabBarElement.offsetHeight;
-
-        this.applyScroll(this.tabsShown, this.lastScroll);
-    }
-
-    /**
-     * Apply scroll to hiding tabs.
-     *
-     * @param showTabs Show or completely hide tabs.
-     * @param scroll Scroll position.
-     */
-    protected applyScroll(showTabs: boolean, scroll?: number): void {
-        if (!this.tabBarElement || !this.tabBarHeight) {
-
-            return;
-        }
-
-        if (showTabs) {
-            // Smooth translation.
-            this.tabBarElement.classList.remove('tabs-hidden');
-            if (scroll === 0) {
-                this.tabBarElement.style.height = '';
-                this.previousLastScroll = this.lastScroll;
-                this.lastScroll = 0;
-            } else if (scroll !== undefined) {
-                this.tabBarElement.style.height = (this.tabBarHeight - scroll) + 'px';
-            }
-        } else {
-            this.tabBarElement.classList.add('tabs-hidden');
-            this.tabBarElement.style.height = '';
-        }
-
-        this.tabsShown = showTabs;
-    }
-
     /**
      * @inheritdoc
      */
@@ -260,15 +206,6 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
             return;
         }
 
-        if (window.innerHeight >= CoreTabsBaseComponent.MAX_HEIGHT_TO_HIDE_TABS) {
-            // Ensure tabbar is shown.
-            this.applyScroll(true, 0);
-            this.calculateTabBarHeight();
-        } else if (!this.tabsShown) {
-            // Don't recalculate.
-            return;
-        }
-
         await this.calculateMaxSlides();
 
         await this.updateSlides();
@@ -314,9 +251,6 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
         this.firstSelectedTab = selectedTab.id!;
         this.selectTab(this.firstSelectedTab);
 
-        // Setup tab scrolling.
-        this.calculateTabBarHeight();
-
         this.initialized = true;
 
         // Check which arrows should be shown.
@@ -374,8 +308,6 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
 
         this.slideChanged();
 
-        this.calculateTabBarHeight();
-
         // @todo: This call to update() can trigger JS errors in the console if tabs are re-loaded and there's only 1 tab.
         // For some reason, swiper.slides is undefined inside the Slides class, and the swiper is marked as destroyed.
         // Changing *ngIf="hideUntil" to [hidden] doesn't solve the issue, and it causes another error to be raised.
@@ -484,61 +416,6 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
         }
     }
 
-    /**
-     * Show or hide the tabs. This is used when the user is scrolling inside a tab.
-     *
-     * @param scrollTop Scroll top.
-     * @param scrollElement Content scroll element to check measures.
-     */
-    showHideTabs(scrollTop: number, scrollElement: HTMLElement): void {
-        if (!this.tabBarElement || !this.tabsElement || !scrollElement) {
-            return;
-        }
-
-        // Always show on very tall screens.
-        if (window.innerHeight >= CoreTabsBaseComponent.MAX_HEIGHT_TO_HIDE_TABS) {
-            return;
-        }
-
-        if (!this.tabBarHeight && this.tabBarElement.offsetHeight != this.tabBarHeight) {
-            // Wrong tab height, recalculate it.
-            this.calculateTabBarHeight();
-        }
-
-        if (!this.tabBarHeight) {
-            // We don't have the tab bar height, this means the tab bar isn't shown.
-            return;
-        }
-
-        if (scrollTop <= 0) {
-            // Ensure tabbar is shown.
-            this.applyScroll(true, 0);
-
-            return;
-        }
-
-        if (scrollTop == this.lastScroll || scrollTop == this.previousLastScroll) {
-            // Ensure scroll has been modified to avoid flicks.
-            return;
-        }
-
-        if (this.tabsShown && scrollTop > this.tabBarHeight) {
-            // Hide tabs.
-            this.applyScroll(false);
-        } else if (!this.tabsShown && scrollTop <= this.tabBarHeight) {
-            this.applyScroll(true);
-        }
-
-        if (this.tabsShown && scrollElement.scrollHeight > scrollElement.clientHeight + (this.tabBarHeight - scrollTop)) {
-            // Smooth translation.
-            this.applyScroll(true, scrollTop);
-        }
-
-        // Use lastScroll after moving the tabs to avoid flickering.
-        this.previousLastScroll = this.lastScroll;
-        this.lastScroll = scrollTop;
-    }
-
     /**
      * Select a tab by ID.
      *
@@ -626,39 +503,6 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
         return true;
     }
 
-    /**
-     * Listen scroll events in an element's inner ion-content (if any).
-     *
-     * @param element Element to search ion-content in.
-     * @param id ID of the tab/page.
-     * @return Promise resolved when done.
-     */
-    async listenContentScroll(element: HTMLElement, id: number | string): Promise<void> {
-        if (this.scrollElements[id]) {
-            return; // Already set.
-        }
-
-        let content = element.querySelector('ion-content');
-        if (!content) {
-            return;
-        }
-
-        // Search the inner ion-content if there's more than one.
-        let childContent = content.querySelector('ion-content') || null;
-        while (childContent != null) {
-            content = childContent;
-            childContent = content.querySelector('ion-content') || null;
-        }
-
-        const scroll = await content.getScrollElement();
-
-        content.scrollEvents = true;
-        this.scrollElements[id] = scroll;
-        content.addEventListener('ionScroll', (e: CustomEvent<ScrollDetail>): void => {
-            this.showHideTabs(e.detail.scrollTop, scroll);
-        });
-    }
-
     /**
      * Adapt tabs to a window resize.
      */
diff --git a/src/core/components/tabs-outlet/tabs-outlet.ts b/src/core/components/tabs-outlet/tabs-outlet.ts
index 4a75166a9..fcd46d166 100644
--- a/src/core/components/tabs-outlet/tabs-outlet.ts
+++ b/src/core/components/tabs-outlet/tabs-outlet.ts
@@ -97,7 +97,6 @@ export class CoreTabsOutletComponent extends CoreTabsBaseComponent<CoreTabsOutle
             return;
         }
 
-        this.tabsElement = this.element.nativeElement.querySelector('ion-tabs');
         this.stackEventsSubscription = this.ionTabs.outlet.stackEvents.subscribe(async (stackEvent: StackEvent) => {
             if (!this.isCurrentView) {
                 return;
@@ -118,14 +117,6 @@ export class CoreTabsOutletComponent extends CoreTabsBaseComponent<CoreTabsOutle
             }
 
             this.showHideNavBarButtons(stackEvent.enteringView.element.tagName);
-
-            await this.listenContentScroll(stackEvent.enteringView.element, stackEvent.enteringView.id);
-
-            const scrollElement = this.scrollElements[stackEvent.enteringView.id];
-            if (scrollElement) {
-                // Show or hide tabs based on the new page scroll.
-                this.showHideTabs(scrollElement.scrollTop, scrollElement);
-            }
         });
         this.outletActivatedSubscription = this.ionTabs.outlet.activateEvents.subscribe(() => {
             this.lastActiveComponent = this.ionTabs.outlet.component;
diff --git a/src/core/components/tabs/tab.ts b/src/core/components/tabs/tab.ts
index 2d3166fd5..0287ef83c 100644
--- a/src/core/components/tabs/tab.ts
+++ b/src/core/components/tabs/tab.ts
@@ -120,9 +120,6 @@ export class CoreTabComponent implements OnInit, OnDestroy, CoreTabBase {
         this.loaded = true;
         this.ionSelect.emit(this);
         this.showHideNavBarButtons(true);
-
-        // Setup tab scrolling.
-        this.tabs.listenContentScroll(this.element, this.id!);
     }
 
     /**
diff --git a/src/core/components/tabs/tabs.ts b/src/core/components/tabs/tabs.ts
index a0fef9e06..e540dab55 100644
--- a/src/core/components/tabs/tabs.ts
+++ b/src/core/components/tabs/tabs.ts
@@ -67,7 +67,6 @@ export class CoreTabsComponent extends CoreTabsBaseComponent<CoreTabComponent> i
             return;
         }
 
-        this.tabsElement = this.element.nativeElement;
         this.originalTabsContainer = this.originalTabsRef?.nativeElement;
     }
 
@@ -92,14 +91,6 @@ export class CoreTabsComponent extends CoreTabsBaseComponent<CoreTabComponent> i
             setTimeout(() => {
                 this.calculateSlides();
             });
-
-            if (this.initialized && this.tabs.length > 1 && this.tabBarHeight == 0) {
-                // Calculate the tabBarHeight again now that there is more than 1 tab and the bar will be seen.
-                // Use timeout to wait for the view to be rendered. 0 ms should be enough, use 50 to be sure.
-                setTimeout(() => {
-                    this.calculateTabBarHeight();
-                }, 50);
-            }
         }
     }
 

From 7a7950f49cfa21c9d26aa8b85bf2e3d3f32047ea Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 31 Mar 2022 12:00:47 +0200
Subject: [PATCH 0860/1008] MOBILE-3833 dx: Expose app provider in devtools

---
 src/core/initializers/prepare-devtools.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/core/initializers/prepare-devtools.ts b/src/core/initializers/prepare-devtools.ts
index adc324726..7f9d565bb 100644
--- a/src/core/initializers/prepare-devtools.ts
+++ b/src/core/initializers/prepare-devtools.ts
@@ -12,18 +12,21 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { CoreApp, CoreAppProvider } from '@services/app';
 import { CoreConfig, CoreConfigProvider } from '@services/config';
 import { CoreDB, CoreDbProvider } from '@services/db';
 import { CoreCustomURLSchemes, CoreCustomURLSchemesProvider } from '@services/urlschemes';
 import { CoreConstants } from '../constants';
 
 type DevelopmentWindow = Window & {
+    appProvider?: CoreAppProvider;
     configProvider?: CoreConfigProvider;
     dbProvider?: CoreDbProvider;
     urlSchemes?: CoreCustomURLSchemesProvider;
 };
 
 function initializeDevelopmentWindow(window: DevelopmentWindow) {
+    window.appProvider = CoreApp.instance;
     window.configProvider = CoreConfig.instance;
     window.dbProvider = CoreDB.instance;
     window.urlSchemes = CoreCustomURLSchemes.instance;

From 5434a1a4f30a88229e389d12eb05c1d2d1bbe761 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 31 Mar 2022 12:01:29 +0200
Subject: [PATCH 0861/1008] MOBILE-3833 course: Fix manual completion db

Issue introduced by mistake in https://github.com/moodlehq/moodleapp/commit/b72e247f81f2bda9bafd689af12ec493c42c1c43#diff-d5618a894713624722f8d892b9befe9b865f16cc00593ee23f420047917d3fcaR112
---
 src/core/features/course/services/database/course.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/features/course/services/database/course.ts b/src/core/features/course/services/database/course.ts
index 47fa10b87..7762d0b91 100644
--- a/src/core/features/course/services/database/course.ts
+++ b/src/core/features/course/services/database/course.ts
@@ -109,7 +109,7 @@ export const OFFLINE_SITE_SCHEMA: CoreSiteSchema = {
                     type: 'TEXT',
                 },
                 {
-                    name: 'timeaccess',
+                    name: 'timecompleted',
                     type: 'INTEGER',
                 },
             ],

From b2246a01c55d4a2d9ef6e6242fcabdcc3a6bf04e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 30 Mar 2022 15:51:55 +0200
Subject: [PATCH 0862/1008] MOBILE-3833 tabs: Fix tab size calculations

---
 src/core/classes/tabs.ts                      | 193 +++++++++++-------
 .../tabs-outlet/core-tabs-outlet.html         |   5 +-
 .../components/tabs-outlet/tabs-outlet.ts     |   2 +-
 src/core/components/tabs/core-tabs.html       |   5 +-
 src/core/components/tabs/tab.ts               |   5 +-
 src/core/components/tabs/tabs.scss            |   7 +-
 src/core/components/tabs/tabs.ts              |  10 +-
 src/core/features/course/pages/index/index.ts |   7 +-
 8 files changed, 131 insertions(+), 103 deletions(-)

diff --git a/src/core/classes/tabs.ts b/src/core/classes/tabs.ts
index dbec45e01..bccb13a6a 100644
--- a/src/core/classes/tabs.ts
+++ b/src/core/classes/tabs.ts
@@ -22,7 +22,6 @@ import {
     OnDestroy,
     AfterViewInit,
     ViewChild,
-    ElementRef,
     SimpleChange,
 } from '@angular/core';
 import { IonSlides } from '@ionic/angular';
@@ -34,6 +33,8 @@ import { CoreSettingsHelper } from '@features/settings/services/settings-helper'
 import { CoreAriaRoleTab, CoreAriaRoleTabFindable } from './aria-role-tab';
 import { CoreEventObserver } from '@singletons/events';
 import { CoreDom } from '@singletons/dom';
+import { CoreUtils } from '@services/utils/utils';
+import { CoreError } from './errors/error';
 
 /**
  * Class to abstract some common code for tabs.
@@ -54,6 +55,7 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
 
     tabs: T[] = []; // List of tabs.
 
+    hideTabs = false;
     selected?: string; // Selected tab id.
     showPrevButton = false;
     showNextButton = false;
@@ -65,10 +67,11 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
         initialSlide: 0,
         slidesPerView: 3,
         centerInsufficientSlides: true,
+        threshold: 10,
     };
 
+    protected slidesElement?: HTMLIonSlidesElement;
     protected initialized = false;
-    protected afterViewInitTriggered = false;
 
     protected resizeListener?: CoreEventObserver;
     protected isDestroyed = false;
@@ -79,54 +82,41 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
 
     protected firstSelectedTab?: string; // ID of the first selected tab to control history.
     protected backButtonFunction: (event: BackButtonEvent) => void;
-    protected languageChangedSubscription?: Subscription;
     // Swiper 6 documentation: https://swiper6.vercel.app/
     protected isInTransition = false; // Wether Slides is in transition.
-    protected slidesSwiper: any; // eslint-disable-line @typescript-eslint/no-explicit-any
-    protected slidesSwiperLoaded = false;
+    protected subscriptions: Subscription[] = [];
 
     tabAction: CoreTabsRoleTab<T>;
 
-    constructor(
-        protected element: ElementRef,
-    ) {
+    constructor() {
         this.backButtonFunction = this.backButtonClicked.bind(this);
 
         this.tabAction = new CoreTabsRoleTab(this);
     }
 
     /**
-     * Component being initialized.
+     * @inheritdoc
      */
-    ngOnInit(): void {
+    async ngOnInit(): Promise<void> {
         this.direction = Platform.isRTL ? 'rtl' : 'ltr';
 
         // Change the side when the language changes.
-        this.languageChangedSubscription = Translate.onLangChange.subscribe(() => {
+        this.subscriptions.push(Translate.onLangChange.subscribe(() => {
             setTimeout(() => {
                 this.direction = Platform.isRTL ? 'rtl' : 'ltr';
             });
-        });
+        }));
     }
 
     /**
-     * View has been initialized.
+     * @inheritdoc
      */
-    async ngAfterViewInit(): Promise<void> {
+    ngAfterViewInit(): void {
         if (this.isDestroyed) {
             return;
         }
 
-        this.afterViewInitTriggered = true;
-
-        if (!this.initialized && this.hideUntil) {
-            // Tabs should be shown, initialize them.
-            await this.initializeTabs();
-        }
-
-        this.resizeListener = CoreDom.onWindowResize(() => {
-            this.windowResized();
-        });
+        this.init();
     }
 
     /**
@@ -134,14 +124,7 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
      */
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     ngOnChanges(changes: Record<string, SimpleChange>): void {
-        // Wait for ngAfterViewInit so it works in the case that each tab has its own component.
-        if (!this.initialized && this.hideUntil && this.afterViewInitTriggered) {
-            // Tabs should be shown, initialize them.
-            // Use a setTimeout so child components update their inputs before initializing the tabs.
-            setTimeout(() => {
-                this.initializeTabs();
-            });
-        }
+        this.init();
     }
 
     /**
@@ -206,6 +189,16 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
             return;
         }
 
+        this.numTabsShown = this.tabs.reduce((prev: number, current) => current.enabled ? prev + 1 : prev, 0);
+
+        if (this.numTabsShown <= 1) {
+            this.hideTabs = true;
+
+            // Only one, nothing to do here.
+            return;
+        }
+        this.hideTabs = false;
+
         await this.calculateMaxSlides();
 
         await this.updateSlides();
@@ -233,28 +226,81 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
     }
 
     /**
-     * Initialize the tabs, determining the first tab to be shown.
+     * Init the component.
      */
-    protected async initializeTabs(): Promise<void> {
-        // Initialize slider.
-        this.slidesSwiper = await this.slides?.getSwiper();
-        this.slidesSwiper.once('progress', () => {
-            this.slidesSwiperLoaded = true;
-            this.calculateSlides();
-        });
-
-        const selectedTab = this.calculateInitialTab();
-        if (!selectedTab) {
+    protected async init(): Promise<void> {
+        if (!this.hideUntil) {
+            // Hidden, do nothing.
             return;
         }
 
-        this.firstSelectedTab = selectedTab.id!;
-        this.selectTab(this.firstSelectedTab);
+        try {
+            await this.initializeSlider();
+            await this.initializeTabs();
+        } catch {
+            // Something went wrong, ignore.
+        }
+    }
+
+    /**
+     * Initialize the slider elements.
+     */
+    protected async initializeSlider(): Promise<void> {
+        if (this.initialized) {
+            return;
+        }
+
+        if (this.slidesElement) {
+            // Already initializated, await for ready.
+            await this.slidesElement.componentOnReady();
+
+            return;
+        }
+
+        if (!this.slides) {
+            await CoreUtils.nextTick();
+        }
+        const slidesSwiper = await this.slides?.getSwiper();
+        if (!slidesSwiper || !this.slides) {
+            throw new CoreError('Swiper not found, will try on next change.');
+        }
+
+        this.slidesElement = <HTMLIonSlidesElement>slidesSwiper.el;
+        await this.slidesElement.componentOnReady();
 
         this.initialized = true;
 
+        // Subscribe to changes.
+        this.subscriptions.push(this.slides.ionSlideDidChange.subscribe(() => {
+            this.slideChanged();
+        }));
+    }
+
+    /**
+     * Initialize the tabs, determining the first tab to be shown.
+     */
+    protected async initializeTabs(): Promise<void> {
+        if (!this.initialized || !this.slidesElement) {
+            return;
+        }
+
+        const selectedTab = this.calculateInitialTab();
+        if (!selectedTab) {
+            // No enabled tabs, return.
+            throw new CoreError('No enabled tabs.');
+        }
+
+        this.firstSelectedTab = selectedTab.id;
+        if (this.firstSelectedTab !== undefined) {
+            this.selectTab(this.firstSelectedTab);
+        }
+
         // Check which arrows should be shown.
         this.calculateSlides();
+
+        this.resizeListener = CoreDom.onWindowResize(() => {
+            this.calculateSlides();
+        });
     }
 
     /**
@@ -277,7 +323,7 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
      * Method executed when the slides are changed.
      */
     async slideChanged(): Promise<void> {
-        if (!this.slidesSwiperLoaded) {
+        if (!this.slidesElement) {
             return;
         }
 
@@ -302,17 +348,15 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
      * Updates the number of slides to show.
      */
     protected async updateSlides(): Promise<void> {
-        this.numTabsShown = this.tabs.reduce((prev: number, current) => current.enabled ? prev + 1 : prev, 0);
+        if (!this.slides) {
+            return;
+        }
 
         this.slidesOpts = { ...this.slidesOpts, slidesPerView: Math.min(this.maxSlides, this.numTabsShown) };
 
-        this.slideChanged();
+        await this.slideChanged();
 
-        // @todo: This call to update() can trigger JS errors in the console if tabs are re-loaded and there's only 1 tab.
-        // For some reason, swiper.slides is undefined inside the Slides class, and the swiper is marked as destroyed.
-        // Changing *ngIf="hideUntil" to [hidden] doesn't solve the issue, and it causes another error to be raised.
-        // This can be tested in lesson as a student, play a lesson and go back to the entry page.
-        await this.slides!.update();
+        await this.slides.update();
 
         if (!this.hasSliddenToInitial && this.selectedIndex && this.selectedIndex >= this.slidesOpts.slidesPerView) {
             this.hasSliddenToInitial = true;
@@ -320,7 +364,7 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
 
             setTimeout(() => {
                 if (this.shouldSlideToInitial) {
-                    this.slides!.slideTo(this.selectedIndex, 0);
+                    this.slides?.slideTo(this.selectedIndex, 0);
                     this.shouldSlideToInitial = false;
                 }
             }, 400);
@@ -339,17 +383,23 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
      * Calculate the number of slides that can fit on the screen.
      */
     protected async calculateMaxSlides(): Promise<void> {
-        if (!this.slidesSwiperLoaded) {
+        if (!this.slidesElement || !this.slides) {
             return;
         }
 
         this.maxSlides = 3;
-        let width = this.slidesSwiper.width;
-        if (!width) {
-            this.slidesSwiper.updateSize();
-            width = this.slidesSwiper.width;
+        await CoreUtils.nextTick();
 
+        let width: number = this.slidesElement.getBoundingClientRect().width;
+        if (!width) {
+            const slidesSwiper = await this.slides.getSwiper();
+
+            await slidesSwiper.updateSize();
+            await CoreUtils.nextTick();
+
+            width = slidesSwiper.width;
             if (!width) {
+
                 return;
             }
         }
@@ -456,12 +506,12 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
             return;
         }
 
-        if (this.selected) {
+        if (this.selected && this.slides) {
             // Check if we need to slide to the tab because it's not visible.
-            const firstVisibleTab = await this.slides!.getActiveIndex();
+            const firstVisibleTab = await this.slides.getActiveIndex();
             const lastVisibleTab = firstVisibleTab + this.slidesOpts.slidesPerView - 1;
             if (index < firstVisibleTab || index > lastVisibleTab) {
-                await this.slides!.slideTo(index, 0, true);
+                await this.slides.slideTo(index, 0, true);
             }
         }
 
@@ -470,9 +520,9 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
             return;
         }
 
-        const ok = await this.loadTab(tabToSelect);
+        const suceeded = await this.loadTab(tabToSelect);
 
-        if (ok !== false) {
+        if (suceeded !== false) {
             this.tabSelected(tabToSelect, index);
         }
     }
@@ -503,15 +553,6 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
         return true;
     }
 
-    /**
-     * Adapt tabs to a window resize.
-     */
-    protected windowResized(): void {
-        setTimeout(() => {
-            this.calculateSlides();
-        }, 200);
-    }
-
     /**
      * Component destroyed.
      */
@@ -519,7 +560,7 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
         this.isDestroyed = true;
 
         this.resizeListener?.off();
-        this.languageChangedSubscription?.unsubscribe();
+        this.subscriptions.forEach((subscription) => subscription.unsubscribe());
     }
 
 }
@@ -541,8 +582,8 @@ class CoreTabsRoleTab<T extends CoreTabBase> extends CoreAriaRoleTab<CoreTabsBas
      */
     getSelectableTabs(): CoreAriaRoleTabFindable[] {
         return this.componentInstance.tabs.filter((tab) => tab.enabled).map((tab) => ({
-            id: tab.id!,
-            findIndex: tab.id!,
+            id: tab.id || '',
+            findIndex: tab.id || '',
         }));
     }
 
diff --git a/src/core/components/tabs-outlet/core-tabs-outlet.html b/src/core/components/tabs-outlet/core-tabs-outlet.html
index 7ef200d94..7d0b9e925 100644
--- a/src/core/components/tabs-outlet/core-tabs-outlet.html
+++ b/src/core/components/tabs-outlet/core-tabs-outlet.html
@@ -6,10 +6,9 @@
                 <ion-icon *ngIf="showPrevButton" name="fas-chevron-left" [attr.aria-label]="'core.previous' | translate"></ion-icon>
             </ion-col>
             <ion-col class="ion-no-padding" size="10">
-                <ion-slides (ionSlideDidChange)="slideChanged()" [options]="slidesOpts" [dir]="direction" role="tablist"
-                    [attr.aria-label]="description">
+                <ion-slides [options]="slidesOpts" [dir]="direction" role="tablist" [attr.aria-label]="description">
                     <ng-container *ngFor="let tab of tabs">
-                        <ion-slide role="presentation" [id]="tab.id! + '-tab'" class="tab-slide" tabindex="-1"
+                        <ion-slide role="presentation" class="tab-slide" [id]=" tab.id! + '-tab'" tabindex="-1"
                             [class.selected]="selected == tab.id">
                             <ion-tab-button (ionTabButtonClick)="selectTab(tab.id, $event)" (keydown)="tabAction.keyDown($event)"
                                 (keyup)="tabAction.keyUp(tab.id, $event)" [tab]="tab.page" [layout]="layout" class="{{tab.class}}"
diff --git a/src/core/components/tabs-outlet/tabs-outlet.ts b/src/core/components/tabs-outlet/tabs-outlet.ts
index fcd46d166..50bf4c761 100644
--- a/src/core/components/tabs-outlet/tabs-outlet.ts
+++ b/src/core/components/tabs-outlet/tabs-outlet.ts
@@ -70,7 +70,7 @@ export class CoreTabsOutletComponent extends CoreTabsBaseComponent<CoreTabsOutle
     protected existsInNavigationStack = false;
 
     constructor(element: ElementRef) {
-        super(element);
+        super();
 
         CoreComponentsRegistry.register(element.nativeElement, this);
     }
diff --git a/src/core/components/tabs/core-tabs.html b/src/core/components/tabs/core-tabs.html
index 8e2ea5ee7..ced60ce60 100644
--- a/src/core/components/tabs/core-tabs.html
+++ b/src/core/components/tabs/core-tabs.html
@@ -5,10 +5,9 @@
             <ion-icon *ngIf="showPrevButton" name="fas-chevron-left" [attr.aria-label]="'core.previous' | translate"></ion-icon>
         </ion-col>
         <ion-col class="ion-no-padding" size="10">
-            <ion-slides (ionSlideDidChange)="slideChanged()" [options]="slidesOpts" [dir]="direction" role="tablist"
-                [attr.aria-label]="description">
+            <ion-slides [options]="slidesOpts" [dir]="direction" role="tablist" [attr.aria-label]="description">
                 <ng-container *ngFor="let tab of tabs">
-                    <ion-slide *ngIf="tab.enabled" role="presentation" [hidden]="!hideUntil" class="tab-slide" [id]="tab.id! + '-tab'"
+                    <ion-slide *ngIf="tab.enabled" role="presentation" class="tab-slide" [id]="tab.id! + '-tab'"
                         [class.selected]="selected == tab.id">
                         <ion-tab-button (click)="selectTab(tab.id, $event)" (keydown)="tabAction.keyDown($event)"
                             (keyup)="tabAction.keyUp(tab.id, $event)" class="{{tab.class}}" [layout]="layout" role="tab"
diff --git a/src/core/components/tabs/tab.ts b/src/core/components/tabs/tab.ts
index 0287ef83c..c98e10472 100644
--- a/src/core/components/tabs/tab.ts
+++ b/src/core/components/tabs/tab.ts
@@ -65,7 +65,7 @@ export class CoreTabComponent implements OnInit, OnDestroy, CoreTabBase {
         return this.isEnabled;
     }
 
-    @Input() id?: string; // An ID to identify the tab.
+    @Input() id = ''; // An ID to identify the tab.
     @Output() ionSelect: EventEmitter<CoreTabComponent> = new EventEmitter<CoreTabComponent>();
 
     @ContentChild(TemplateRef) template?: TemplateRef<unknown>; // Template defined by the content.
@@ -82,7 +82,7 @@ export class CoreTabComponent implements OnInit, OnDestroy, CoreTabBase {
         element: ElementRef,
     ) {
         this.element = element.nativeElement;
-
+        this.id = this.id || 'core-tab-' + CoreUtils.getUniqueId('CoreTabComponent');
         this.element.setAttribute('role', 'tabpanel');
         this.element.setAttribute('tabindex', '0');
         this.element.setAttribute('aria-hidden', 'true');
@@ -92,7 +92,6 @@ export class CoreTabComponent implements OnInit, OnDestroy, CoreTabBase {
      * Component being initialized.
      */
     ngOnInit(): void {
-        this.id = this.id || 'core-tab-' + CoreUtils.getUniqueId('CoreTabComponent');
         this.element.setAttribute('aria-labelledby', this.id + '-tab');
         this.element.setAttribute('id', this.id);
 
diff --git a/src/core/components/tabs/tabs.scss b/src/core/components/tabs/tabs.scss
index 04a50ba1b..8aa6e50c8 100644
--- a/src/core/components/tabs/tabs.scss
+++ b/src/core/components/tabs/tabs.scss
@@ -39,7 +39,7 @@
             ion-tab-button {
                 max-width: 100%;
                 ion-label {
-                    font-size: 16px;
+                    font-size: 14px;
                     font-weight: 400;
                     text-overflow: ellipsis;
                     white-space: nowrap;
@@ -109,8 +109,3 @@
         position: relative;
     }
 }
-
-
-:host-context(.ios) {
-    --height: 53px;
-}
diff --git a/src/core/components/tabs/tabs.ts b/src/core/components/tabs/tabs.ts
index e540dab55..a603c3ef8 100644
--- a/src/core/components/tabs/tabs.ts
+++ b/src/core/components/tabs/tabs.ts
@@ -51,12 +51,6 @@ export class CoreTabsComponent extends CoreTabsBaseComponent<CoreTabComponent> i
 
     protected originalTabsContainer?: HTMLElement; // The container of the original tabs. It will include each tab's content.
 
-    constructor(
-        element: ElementRef,
-    ) {
-        super(element);
-    }
-
     /**
      * View has been initialized.
      */
@@ -84,7 +78,7 @@ export class CoreTabsComponent extends CoreTabsBaseComponent<CoreTabComponent> i
      */
     addTab(tab: CoreTabComponent): void {
         // Check if tab is already in the list.
-        if (this.getTabIndex(tab.id!) == -1) {
+        if (this.getTabIndex(tab.id) === -1) {
             this.tabs.push(tab);
             this.sortTabs();
 
@@ -100,7 +94,7 @@ export class CoreTabsComponent extends CoreTabsBaseComponent<CoreTabComponent> i
      * @param tab The tab to remove.
      */
     removeTab(tab: CoreTabComponent): void {
-        const index = this.getTabIndex(tab.id!);
+        const index = this.getTabIndex(tab.id);
         this.tabs.splice(index, 1);
 
         this.calculateSlides();
diff --git a/src/core/features/course/pages/index/index.ts b/src/core/features/course/pages/index/index.ts
index fdd5e47c8..462a97c56 100644
--- a/src/core/features/course/pages/index/index.ts
+++ b/src/core/features/course/pages/index/index.ts
@@ -131,6 +131,7 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
         } catch (error) {
             CoreDomUtils.showErrorModal(error);
             CoreNavigator.back();
+            this.loaded = true;
 
             return;
         }
@@ -224,9 +225,9 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
         // Select the tab if needed.
         this.firstTabName = undefined;
         if (tabToLoad) {
-            setTimeout(() => {
-                this.tabsComponent?.selectByIndex(tabToLoad!);
-            });
+            await CoreUtils.nextTick();
+
+            this.tabsComponent?.selectByIndex(tabToLoad);
         }
     }
 

From 73d5648cb09f74ef97f5f0d992b11b71d8d2b324 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 31 Mar 2022 10:14:41 +0200
Subject: [PATCH 0863/1008] MOBILE-3833 tabs: Reduce tabs layouts

---
 .../tabs-outlet/core-tabs-outlet.html         | 65 +++++++------
 src/core/components/tabs/core-tabs.html       | 64 +++++++------
 src/core/components/tabs/tabs.scss            | 92 ++++++++++---------
 3 files changed, 113 insertions(+), 108 deletions(-)

diff --git a/src/core/components/tabs-outlet/core-tabs-outlet.html b/src/core/components/tabs-outlet/core-tabs-outlet.html
index 7d0b9e925..ff4c3f825 100644
--- a/src/core/components/tabs-outlet/core-tabs-outlet.html
+++ b/src/core/components/tabs-outlet/core-tabs-outlet.html
@@ -1,37 +1,36 @@
 <ion-tabs class="hide-header">
-    <ion-tab-bar slot="top" class="core-tabs-bar" [hidden]="!tabs || numTabsShown <= 1" #tabBar>
+    <ion-tab-bar slot="top" class="core-tabs-bar" [hidden]="hideUntil && (!tabs || numTabsShown <= 1)">
         <ion-spinner *ngIf="!hideUntil" [attr.aria-label]="'core.loading' | translate"></ion-spinner>
-        <ion-row *ngIf="hideUntil">
-            <ion-col class="col-with-arrow ion-no-padding" (click)="slidePrev()" size="1" [class.clickable]="showPrevButton">
-                <ion-icon *ngIf="showPrevButton" name="fas-chevron-left" [attr.aria-label]="'core.previous' | translate"></ion-icon>
-            </ion-col>
-            <ion-col class="ion-no-padding" size="10">
-                <ion-slides [options]="slidesOpts" [dir]="direction" role="tablist" [attr.aria-label]="description">
-                    <ng-container *ngFor="let tab of tabs">
-                        <ion-slide role="presentation" class="tab-slide" [id]=" tab.id! + '-tab'" tabindex="-1"
-                            [class.selected]="selected == tab.id">
-                            <ion-tab-button (ionTabButtonClick)="selectTab(tab.id, $event)" (keydown)="tabAction.keyDown($event)"
-                                (keyup)="tabAction.keyUp(tab.id, $event)" [tab]="tab.page" [layout]="layout" class="{{tab.class}}"
-                                role="tab" [attr.aria-controls]="tab.id" [attr.aria-selected]="selected == tab.id"
-                                [tabindex]="selected == tab.id ? 0 : -1">
-                                <ion-icon *ngIf="tab.icon" [name]="tab.icon" aria-hidden="true"></ion-icon>
-                                <ion-label>
-                                    {{ tab.title | translate}}
-                                    <ion-badge *ngIf="tab.badge">
-                                        <span [attr.aria-hidden]="!!tab.badgeA11yText">{{ tab.badge }}</span>
-                                        <span *ngIf="tab.badgeA11yText" class="sr-only">
-                                            {{ tab.badgeA11yText | translate: {$a : tab.badge } }}
-                                        </span>
-                                    </ion-badge>
-                                </ion-label>
-                            </ion-tab-button>
-                        </ion-slide>
-                    </ng-container>
-                </ion-slides>
-            </ion-col>
-            <ion-col class="col-with-arrow ion-no-padding" (click)="slideNext()" size="1" [class.clickable]="showNextButton">
-                <ion-icon *ngIf="showNextButton" name="fas-chevron-right" [attr.aria-label]="'core.next' | translate"></ion-icon>
-            </ion-col>
-        </ion-row>
+        <ng-container *ngIf="hideUntil">
+            <ion-button fill="clear" class="arrow-button" (click)="slidePrev()" [disabled]="!showPrevButton"
+                [attr.aria-label]="'core.previous' | translate">
+                <ion-icon *ngIf="showPrevButton" name="fas-chevron-left" aria-hidden="true" slot="icon-only"></ion-icon>
+            </ion-button>
+            <ion-slides [options]="slidesOpts" [dir]="direction" role="tablist" [attr.aria-label]="description">
+                <ng-container *ngFor="let tab of tabs">
+                    <ion-slide role="presentation" [id]="tab.id! + '-tab'" tabindex="-1" [class.selected]="selected == tab.id">
+                        <ion-tab-button (ionTabButtonClick)="selectTab(tab.id, $event)" (keydown)="tabAction.keyDown($event)"
+                            (keyup)="tabAction.keyUp(tab.id, $event)" [tab]="tab.page" [layout]="layout" class="{{tab.class}}" role="tab"
+                            [attr.aria-controls]="tab.id" [attr.aria-selected]="selected == tab.id"
+                            [tabindex]="selected == tab.id ? 0 : -1">
+                            <ion-icon *ngIf="tab.icon" [name]="tab.icon" aria-hidden="true"></ion-icon>
+                            <ion-label>
+                                {{ tab.title | translate}}
+                                <ion-badge *ngIf="tab.badge">
+                                    <span [attr.aria-hidden]="!!tab.badgeA11yText">{{ tab.badge }}</span>
+                                    <span *ngIf="tab.badgeA11yText" class="sr-only">
+                                        {{ tab.badgeA11yText | translate: {$a : tab.badge } }}
+                                    </span>
+                                </ion-badge>
+                            </ion-label>
+                        </ion-tab-button>
+                    </ion-slide>
+                </ng-container>
+            </ion-slides>
+            <ion-button fill="clear" class="arrow-button" (click)="slideNext()" [disabled]="!showNextButton"
+                [attr.aria-label]="'core.next' | translate">
+                <ion-icon *ngIf="showNextButton" name="fas-chevron-right" aria-hidden="true" slot="icon-only"></ion-icon>
+            </ion-button>
+        </ng-container>
     </ion-tab-bar>
 </ion-tabs>
diff --git a/src/core/components/tabs/core-tabs.html b/src/core/components/tabs/core-tabs.html
index ced60ce60..89e426368 100644
--- a/src/core/components/tabs/core-tabs.html
+++ b/src/core/components/tabs/core-tabs.html
@@ -1,37 +1,35 @@
-<ion-tab-bar slot="top" class="core-tabs-bar" [hidden]="!tabs || numTabsShown <= 1" #tabBar>
+<ion-tab-bar slot="top" class="core-tabs-bar" [hidden]="hideUntil && (!tabs || numTabsShown <= 1)">
     <ion-spinner *ngIf="!hideUntil" [attr.aria-label]="'core.loading' | translate"></ion-spinner>
-    <ion-row *ngIf="hideUntil">
-        <ion-col class="col-with-arrow ion-no-padding" (click)="slidePrev()" size="1" [class.clickable]="showPrevButton">
-            <ion-icon *ngIf="showPrevButton" name="fas-chevron-left" [attr.aria-label]="'core.previous' | translate"></ion-icon>
-        </ion-col>
-        <ion-col class="ion-no-padding" size="10">
-            <ion-slides [options]="slidesOpts" [dir]="direction" role="tablist" [attr.aria-label]="description">
-                <ng-container *ngFor="let tab of tabs">
-                    <ion-slide *ngIf="tab.enabled" role="presentation" class="tab-slide" [id]="tab.id! + '-tab'"
-                        [class.selected]="selected == tab.id">
-                        <ion-tab-button (click)="selectTab(tab.id, $event)" (keydown)="tabAction.keyDown($event)"
-                            (keyup)="tabAction.keyUp(tab.id, $event)" class="{{tab.class}}" [layout]="layout" role="tab"
-                            [attr.aria-controls]="tab.id" [attr.aria-selected]="selected == tab.id"
-                            [tabindex]="selected == tab.id ? 0 : -1">
-                            <ion-icon *ngIf="tab.icon" [name]="tab.icon" aria-hidden="true"></ion-icon>
-                            <ion-label>
-                                {{ tab.title | translate}}
-                                <ion-badge *ngIf="tab.badge">
-                                    <span [attr.aria-hidden]="!!tab.badgeA11yText">{{ tab.badge }}</span>
-                                    <span *ngIf="tab.badgeA11yText" class="sr-only">
-                                        {{ tab.badgeA11yText | translate: {$a : tab.badge } }}
-                                    </span>
-                                </ion-badge>
-                            </ion-label>
-                        </ion-tab-button>
-                    </ion-slide>
-                </ng-container>
-            </ion-slides>
-        </ion-col>
-        <ion-col class="col-with-arrow ion-no-padding" (click)="slideNext()" size="1" [class.clickable]="showNextButton">
-            <ion-icon *ngIf="showNextButton" name="fas-chevron-right" [attr.aria-label]="'core.next' | translate"></ion-icon>
-        </ion-col>
-    </ion-row>
+    <ng-container *ngIf="hideUntil">
+        <ion-button fill="clear" class="arrow-button" (click)="slidePrev()" [disabled]="!showPrevButton"
+            [attr.aria-label]="'core.previous' | translate">
+            <ion-icon *ngIf="showPrevButton" name="fas-chevron-left" aria-hidden="true" slot="icon-only"></ion-icon>
+        </ion-button>
+        <ion-slides [options]="slidesOpts" [dir]="direction" role="tablist" [attr.aria-label]="description">
+            <ng-container *ngFor="let tab of tabs">
+                <ion-slide *ngIf="tab.enabled" role="presentation" [id]="tab.id! + '-tab'" [class.selected]="selected == tab.id">
+                    <ion-tab-button (click)="selectTab(tab.id, $event)" (keydown)="tabAction.keyDown($event)"
+                        (keyup)="tabAction.keyUp(tab.id, $event)" class="{{tab.class}}" [layout]="layout" role="tab"
+                        [attr.aria-controls]="tab.id" [attr.aria-selected]="selected == tab.id" [tabindex]="selected == tab.id ? 0 : -1">
+                        <ion-icon *ngIf="tab.icon" [name]="tab.icon" aria-hidden="true"></ion-icon>
+                        <ion-label>
+                            {{ tab.title | translate}}
+                            <ion-badge *ngIf="tab.badge">
+                                <span [attr.aria-hidden]="!!tab.badgeA11yText">{{ tab.badge }}</span>
+                                <span *ngIf="tab.badgeA11yText" class="sr-only">
+                                    {{ tab.badgeA11yText | translate: {$a : tab.badge } }}
+                                </span>
+                            </ion-badge>
+                        </ion-label>
+                    </ion-tab-button>
+                </ion-slide>
+            </ng-container>
+        </ion-slides>
+        <ion-button fill="clear" class="arrow-button" (click)="slideNext()" [disabled]="!showNextButton"
+            [attr.aria-label]="'core.next' | translate">
+            <ion-icon *ngIf="showNextButton" name="fas-chevron-right" aria-hidden="true" slot="icon-only"></ion-icon>
+        </ion-button>
+    </ng-container>
 </ion-tab-bar>
 <div class="core-tabs-content-container" #originalTabs>
     <ng-content></ng-content>
diff --git a/src/core/components/tabs/tabs.scss b/src/core/components/tabs/tabs.scss
index 8aa6e50c8..69d09150f 100644
--- a/src/core/components/tabs/tabs.scss
+++ b/src/core/components/tabs/tabs.scss
@@ -14,7 +14,7 @@
         position: relative;
     }
 
-    ion-tab-bar.core-tabs-bar {
+    ion-tab-bar {
         position: relative;
         background: var(--tabs-background);
         @include safe-area-padding-end(null, 0px);
@@ -22,57 +22,65 @@
         color: var(--tabs-color);
         border-bottom: 1px solid var(--stroke);
         display: flex;
-        align-items: flex-end;
+        flex-direction: row;
+        justify-content: space-between;
         flex-shrink: 0;
 
-        ion-row {
-            width: 100%;
+        ion-spinner {
+            flex-grow: 1;
         }
 
-        .tab-slide {
-            border-bottom: 2px solid transparent;
-            min-width: 100px;
-            min-height: var(--height);
-            cursor: pointer;
-            overflow: hidden;
-
-            ion-tab-button {
-                max-width: 100%;
-                ion-label {
-                    font-size: 14px;
-                    font-weight: 400;
-                    text-overflow: ellipsis;
-                    white-space: nowrap;
-                    overflow: hidden;
-                    word-wrap: break-word;
-                    max-width: 100%;
-                    line-height: 1.2em;
-                    margin-top: 16px;
-                    margin-bottom: 16px;
-                }
-            }
-
-            &[aria-selected=true],
-            &.selected {
-                color: var(--color-active);
-                border-bottom-color: var(--border-color-active);
-                ion-tab-button {
-                    color: var(--color-active);
-                    ion-label {
-                        font-weight: var(--font-weight-active);
-                    }
-                }
+        ion-button.arrow-button {
+            flex-shrink: 1;
+            margin: 0;
+            padding: 0;
+            --padding-start: 0;
+            --padding-end: 0;
+            min-width: 30px;
+            height: var(--height);
+            --border-radius: 0;
+            ion-icon {
+                font-size: 16px;
             }
         }
 
-        ion-col {
+        ion-slides {
             text-align: center;
             line-height: 1.6rem;
+            flex-grow: 1;
 
-            &.col-with-arrow {
-                display: flex;
-                justify-content: center;
-                align-items: center;
+            ion-slide {
+                border-bottom: 2px solid transparent;
+                min-width: 100px;
+                height: var(--height);
+                cursor: pointer;
+                overflow: hidden;
+
+                ion-tab-button {
+                    max-width: 100%;
+                    ion-label {
+                        font-size: 14px;
+                        font-weight: 400;
+                        text-overflow: ellipsis;
+                        white-space: nowrap;
+                        overflow: hidden;
+                        word-wrap: break-word;
+                        max-width: 100%;
+                        line-height: 1.2em;
+                    }
+                }
+
+                &[aria-selected=true],
+                &.selected {
+                    color: var(--color-active);
+                    border-bottom-color: var(--border-color-active);
+                    ion-tab-button {
+                        color: var(--color-active);
+                        ion-label {
+                            font-weight: var(--font-weight-active);
+                        }
+                    }
+                }
             }
         }
 

From 23275c790300c60c345c96ec825bc1b26db03911 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 31 Mar 2022 10:37:00 +0200
Subject: [PATCH 0864/1008] MOBILE-3833 styles: Fix show password button
 position

---
 src/core/components/show-password/show-password.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/core/components/show-password/show-password.scss b/src/core/components/show-password/show-password.scss
index b5feb9e38..07280df85 100644
--- a/src/core/components/show-password/show-password.scss
+++ b/src/core/components/show-password/show-password.scss
@@ -11,6 +11,7 @@
         margin-top: 0;
         margin-bottom: 0;
         z-index: 3;
+        bottom: 0;
     }
 }
 

From cdeb4af6daee1f96b51a6b2fb1374fa25127d82c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 31 Mar 2022 11:02:52 +0200
Subject: [PATCH 0865/1008] MOBILE-3833 collapsible: Wait tabs to be ready

---
 src/core/classes/tabs.ts                      | 21 ++++++++++++++++---
 .../components/tabs-outlet/tabs-outlet.ts     |  9 +-------
 src/core/directives/collapsible-header.ts     | 21 +++++++++++++++++--
 src/core/singletons/components-registry.ts    | 18 ++++++++++++----
 4 files changed, 52 insertions(+), 17 deletions(-)

diff --git a/src/core/classes/tabs.ts b/src/core/classes/tabs.ts
index bccb13a6a..61f006286 100644
--- a/src/core/classes/tabs.ts
+++ b/src/core/classes/tabs.ts
@@ -23,6 +23,7 @@ import {
     AfterViewInit,
     ViewChild,
     SimpleChange,
+    ElementRef,
 } from '@angular/core';
 import { IonSlides } from '@ionic/angular';
 import { BackButtonEvent } from '@ionic/core';
@@ -35,6 +36,9 @@ import { CoreEventObserver } from '@singletons/events';
 import { CoreDom } from '@singletons/dom';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreError } from './errors/error';
+import { CorePromisedValue } from './promised-value';
+import { AsyncComponent } from './async-component';
+import { CoreComponentsRegistry } from '@singletons/components-registry';
 
 /**
  * Class to abstract some common code for tabs.
@@ -42,7 +46,7 @@ import { CoreError } from './errors/error';
 @Component({
     template: '',
 })
-export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, AfterViewInit, OnChanges, OnDestroy {
+export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, AfterViewInit, OnChanges, OnDestroy, AsyncComponent {
 
     // Minimum tab's width.
     protected static readonly MIN_TAB_WIDTH = 107;
@@ -85,13 +89,16 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
     // Swiper 6 documentation: https://swiper6.vercel.app/
     protected isInTransition = false; // Wether Slides is in transition.
     protected subscriptions: Subscription[] = [];
+    protected onReadyPromise = new CorePromisedValue<void>();
 
     tabAction: CoreTabsRoleTab<T>;
 
-    constructor() {
+    constructor(element: ElementRef) {
         this.backButtonFunction = this.backButtonClicked.bind(this);
 
         this.tabAction = new CoreTabsRoleTab(this);
+
+        CoreComponentsRegistry.register(element.nativeElement, this);
     }
 
     /**
@@ -525,6 +532,7 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
         if (suceeded !== false) {
             this.tabSelected(tabToSelect, index);
         }
+        this.onReadyPromise.resolve();
     }
 
     /**
@@ -554,7 +562,14 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
     }
 
     /**
-     * Component destroyed.
+     * @inheritdoc
+     */
+    async ready(): Promise<void> {
+        return await this.onReadyPromise;
+    }
+
+    /**
+     * @inheritdoc
      */
     ngOnDestroy(): void {
         this.isDestroyed = true;
diff --git a/src/core/components/tabs-outlet/tabs-outlet.ts b/src/core/components/tabs-outlet/tabs-outlet.ts
index 50bf4c761..279ddde43 100644
--- a/src/core/components/tabs-outlet/tabs-outlet.ts
+++ b/src/core/components/tabs-outlet/tabs-outlet.ts
@@ -20,7 +20,6 @@ import {
     OnDestroy,
     AfterViewInit,
     ViewChild,
-    ElementRef,
     SimpleChange,
 } from '@angular/core';
 import { IonRouterOutlet, IonTabs, ViewDidEnter, ViewDidLeave } from '@ionic/angular';
@@ -69,12 +68,6 @@ export class CoreTabsOutletComponent extends CoreTabsBaseComponent<CoreTabsOutle
     protected lastActiveComponent?: Partial<ViewDidLeave>;
     protected existsInNavigationStack = false;
 
-    constructor(element: ElementRef) {
-        super();
-
-        CoreComponentsRegistry.register(element.nativeElement, this);
-    }
-
     /**
      * Init tab info.
      *
@@ -223,7 +216,7 @@ export class CoreTabsOutletComponent extends CoreTabsBaseComponent<CoreTabsOutle
     }
 
     /**
-     * Component destroyed.
+     * @inheritdoc
      */
     ngOnDestroy(): void {
         super.ngOnDestroy();
diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts
index 19da86802..5bb3d05cf 100644
--- a/src/core/directives/collapsible-header.ts
+++ b/src/core/directives/collapsible-header.ts
@@ -16,6 +16,7 @@ import { Directive, ElementRef, Input, OnChanges, OnDestroy, OnInit, SimpleChang
 import { CorePromisedValue } from '@classes/promised-value';
 import { CoreLoadingComponent } from '@components/loading/loading';
 import { CoreTabsOutletComponent } from '@components/tabs-outlet/tabs-outlet';
+import { CoreTabsComponent } from '@components/tabs/tabs';
 import { CoreSettingsHelper } from '@features/settings/services/settings-helper';
 import { ScrollDetail } from '@ionic/core';
 import { CoreUtils } from '@services/utils/utils';
@@ -230,8 +231,12 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
      * Search the page content, initialize it, and wait until it's ready for the transition to trigger on scroll.
      */
     protected async initializeContent(): Promise<void> {
+        if (!this.page) {
+            return;
+        }
+
         // Initialize from tabs.
-        const tabs = CoreComponentsRegistry.resolve(this.page?.querySelector('core-tabs-outlet'), CoreTabsOutletComponent);
+        const tabs = CoreComponentsRegistry.resolve(this.page.querySelector('core-tabs-outlet'), CoreTabsOutletComponent);
 
         if (tabs) {
             const outlet = tabs.getOutlet();
@@ -249,7 +254,7 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
         }
 
         // Initialize from page content.
-        const content = this.page?.querySelector('ion-content:not(.disable-scroll-y)');
+        const content = this.page.querySelector('ion-content:not(.disable-scroll-y)');
 
         if (!content) {
             throw new Error('[collapsible-header] Couldn\'t get content');
@@ -357,7 +362,19 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
             return;
         }
 
+        // Wait loadings to finish.
         await CoreComponentsRegistry.waitComponentsReady(this.page, 'core-loading', CoreLoadingComponent);
+
+        // Wait tabs to be ready.
+        await CoreComponentsRegistry.waitComponentsReady(this.page, 'core-tabs', CoreTabsComponent);
+        await CoreComponentsRegistry.waitComponentsReady(this.page, 'core-tabs-outlet', CoreTabsOutletComponent);
+
+        // Wait loadings to finish, inside tabs (if any).
+        await CoreComponentsRegistry.waitComponentsReady(
+            this.page,
+            'core-tab core-loading, ion-router-outlet core-loading',
+            CoreLoadingComponent,
+        );
     }
 
     /**
diff --git a/src/core/singletons/components-registry.ts b/src/core/singletons/components-registry.ts
index 32b08e3dd..0a5e18cea 100644
--- a/src/core/singletons/components-registry.ts
+++ b/src/core/singletons/components-registry.ts
@@ -15,6 +15,7 @@
 import { Component } from '@angular/core';
 import { AsyncComponent } from '@classes/async-component';
 import { CoreUtils } from '@services/utils/utils';
+import { CoreLogger } from './logger';
 
 /**
  * Registry to keep track of component instances.
@@ -22,6 +23,7 @@ import { CoreUtils } from '@services/utils/utils';
 export class CoreComponentsRegistry {
 
     private static instances: WeakMap<Element, unknown> = new WeakMap();
+    protected static logger = CoreLogger.getInstance('CoreComponentsRegistry');
 
     /**
      * Register a component instance.
@@ -78,6 +80,8 @@ export class CoreComponentsRegistry {
     ): Promise<void> {
         const instance = this.resolve(element, componentClass);
         if (!instance) {
+            this.logger.error('No instance registered for element ' + componentClass, element);
+
             return;
         }
 
@@ -97,15 +101,21 @@ export class CoreComponentsRegistry {
         selector: string,
         componentClass?: ComponentConstructor<T>,
     ): Promise<void> {
+        let elements: Element[] = [];
+
         if (element.matches(selector)) {
             // Element to wait is myself.
-            await CoreComponentsRegistry.waitComponentReady<T>(element, componentClass);
+            elements = [element];
         } else {
-            await Promise.all(Array
-                .from(element.querySelectorAll(selector))
-                .map(element => CoreComponentsRegistry.waitComponentReady<T>(element, componentClass)));
+            elements = Array.from(element.querySelectorAll(selector));
         }
 
+        if (!elements.length) {
+            return;
+        }
+
+        await Promise.all(elements.map(element => CoreComponentsRegistry.waitComponentReady<T>(element, componentClass)));
+
         // Wait for next tick to ensure components are completely rendered.
         await CoreUtils.nextTick();
     }

From 0963914524168146b3b125b1428d89e99b1ffbb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 31 Mar 2022 11:22:45 +0200
Subject: [PATCH 0866/1008] MOBILE-3833 collapsible: Fix button size

---
 src/theme/components/collapsible-item.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/theme/components/collapsible-item.scss b/src/theme/components/collapsible-item.scss
index a40ea19c4..616bcb02e 100644
--- a/src/theme/components/collapsible-item.scss
+++ b/src/theme/components/collapsible-item.scss
@@ -36,6 +36,8 @@
                 color: var(--collapsible-toggle-text);
                 min-height: var(--toggle-size);
                 min-width: var(--toggle-size);
+                height: var(--toggle-size);
+                width: var(--toggle-size);
                 --border-radius: var(--huge-radius);
                 border-radius: var(--border-radius);
                 --padding-start: 0px;

From c0a0d3bff6843d6d9e19c792c2950ee1940bc262 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 31 Mar 2022 11:56:44 +0200
Subject: [PATCH 0867/1008] MOBILE-3833 iframe: Fix iframe heights

---
 src/core/components/iframe/iframe.scss   | 16 ++++++----------
 src/core/components/loading/loading.scss |  1 +
 src/theme/theme.base.scss                |  2 ++
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/core/components/iframe/iframe.scss b/src/core/components/iframe/iframe.scss
index bc8a94691..e71baa682 100644
--- a/src/core/components/iframe/iframe.scss
+++ b/src/core/components/iframe/iframe.scss
@@ -1,14 +1,5 @@
 :host {
-    > div {
-        max-width: 100%;
-        max-height: 100%;
-    }
-    iframe {
-        border: 0;
-        display: block;
-        max-width: 100%;
-        background-color: var(--ion-background-color);
-    }
+    flex-grow: 1;
 }
 
 :host-context(.core-iframe-fullscreen) {
@@ -21,3 +12,8 @@
     height: 100%;
     z-index: 9999;
 }
+
+:host-context(.limited-width > :not([slot])) {
+    display: flex;
+    flex-direction: column;
+}
diff --git a/src/core/components/loading/loading.scss b/src/core/components/loading/loading.scss
index 82ab20289..d6b31d067 100644
--- a/src/core/components/loading/loading.scss
+++ b/src/core/components/loading/loading.scss
@@ -93,4 +93,5 @@
 :host-context(.limited-width > ):not([slot]) {
     --contents-display: flex;
     flex-direction: column;
+    min-height: 100%;
 }
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index ae32731e9..b10ac0d47 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -863,6 +863,7 @@ ion-content.limited-width > :not([slot]) {
 ion-content.limited-width > :not([slot]) {
     display: flex;
     flex-direction: column;
+    min-height: 100%;
 }
 
 ion-toolbar h1 img.core-bar-button-image,
@@ -1500,6 +1501,7 @@ ion-content.disable-scroll-y::part(scroll) {
 }
 
 iframe {
+    flex-grow: 1;
     border: 0;
     display: block;
     max-width: 100%;

From b4085ff3741aa220e471d98b9b614d22c5817c5f Mon Sep 17 00:00:00 2001
From: Alfonso <alfonsomtb98@gmail.com>
Date: Thu, 31 Mar 2022 12:12:56 +0200
Subject: [PATCH 0868/1008] MOBILE-3833 chat-helper: add white space in message
 private

---
 src/addons/mod/chat/services/chat-helper.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/addons/mod/chat/services/chat-helper.ts b/src/addons/mod/chat/services/chat-helper.ts
index d6f827fe4..9b2c03d06 100644
--- a/src/addons/mod/chat/services/chat-helper.ts
+++ b/src/addons/mod/chat/services/chat-helper.ts
@@ -66,8 +66,7 @@ export class AddonModChatHelperProvider {
         if (!formattedMessage.special && formattedMessage.message.match(patternTo)) {
             const matches = formattedMessage.message.match(patternTo);
 
-            formattedMessage.message = '<b>' + Translate.instant('addon.mod_chat.saidto') +
-                '</b> <i>' + matches![1] + '</i>: ' + matches![2];
+            formattedMessage.message = `<i><b>${Translate.instant('addon.mod_chat.saidto')} </b>${matches![1]}</i>: ${matches![2]}`;
         }
 
         formattedMessage.showUserData = this.showUserData(currentUserId, message, prevMessage);

From 46dd4683148a7206a394a98a74509484a164aa47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 31 Mar 2022 12:25:48 +0200
Subject: [PATCH 0869/1008] MOBILE-3833 styles: Improve offline notification
 styles

---
 src/core/features/mainmenu/pages/menu/menu.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/core/features/mainmenu/pages/menu/menu.scss b/src/core/features/mainmenu/pages/menu/menu.scss
index 349a0fe15..637457cc4 100644
--- a/src/core/features/mainmenu/pages/menu/menu.scss
+++ b/src/core/features/mainmenu/pages/menu/menu.scss
@@ -21,6 +21,7 @@
     .core-network-message {
         visibility: visible;
         height: var(--network-message-height);
+        line-height: var(--network-message-height);
         padding-bottom: calc(var(--ion-safe-area-bottom, 0px) + var(--network-message-height));
     }
 }
@@ -167,6 +168,7 @@ ion-tabs.placement-side {
     transition: all 500ms ease-in-out;
     opacity: .8;
     z-index: 12;
+    font-size: 12px;
 
     .core-online-message {
         display: var(--network-message-online);

From a690353ad7002c2cba7ab65abdad56e2a655c08e Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 31 Mar 2022 13:02:24 +0200
Subject: [PATCH 0870/1008] MOBILE-3833 core: Fix collisions in link handlers

The /admin handlers haven't been modified because that folder can be moved to somewhere else in some Moodle versions
---
 .../badges/services/handlers/badge-link.ts    |  2 +-
 .../badges/services/handlers/mybadges-link.ts |  2 +-
 .../blog/services/handlers/index-link.ts      |  2 +-
 .../calendar/services/handlers/view-link.ts   |  2 +-
 .../services/handlers/contact-request-link.ts |  2 +-
 .../services/handlers/discussion-link.ts      |  2 +-
 .../messages/services/handlers/index-link.ts  |  2 +-
 .../data/services/handlers/approve-link.ts    |  2 +-
 .../mod/data/services/handlers/delete-link.ts |  2 +-
 .../mod/data/services/handlers/edit-link.ts   |  2 +-
 .../mod/data/services/handlers/show-link.ts   |  2 +-
 .../services/handlers/analysis-link.ts        |  2 +-
 .../services/handlers/complete-link.ts        |  2 +-
 .../feedback/services/handlers/print-link.ts  |  2 +-
 .../services/handlers/show-entries-link.ts    |  2 +-
 .../handlers/show-non-respondents-link.ts     |  2 +-
 .../services/handlers/discussion-link.ts      |  2 +-
 .../mod/forum/services/handlers/post-link.ts  |  2 +-
 .../glossary/services/handlers/edit-link.ts   |  2 +-
 .../glossary/services/handlers/entry-link.ts  |  2 +-
 .../services/handlers/report-link.ts          |  2 +-
 .../lesson/services/handlers/report-link.ts   |  2 +-
 .../mod/quiz/services/handlers/review-link.ts |  2 +-
 .../mod/wiki/services/handlers/create-link.ts |  2 +-
 .../mod/wiki/services/handlers/edit-link.ts   |  2 +-
 .../services/handlers/page-or-map-link.ts     |  2 +-
 .../services/handlers/notifications-link.ts   |  2 +-
 .../services/handlers/preferences-link.ts     |  2 +-
 .../insights/services/handlers/action-link.ts |  2 +-
 .../classes/module-grade-handler.ts           |  2 +-
 .../classes/module-index-handler.ts           |  6 ++---
 .../classes/module-list-handler.ts            |  4 ++--
 .../services/contentlinks-delegate.ts         | 24 +++++++++++++------
 .../courses/services/handlers/course-link.ts  |  2 +-
 .../services/handlers/courses-index-link.ts   |  2 +-
 .../services/handlers/dashboard-link.ts       |  2 +-
 .../grades/services/handlers/overview-link.ts |  2 +-
 .../grades/services/handlers/report-link.ts   |  2 +-
 .../grades/services/handlers/user-link.ts     |  2 +-
 .../sitehome/services/handlers/index-link.ts  |  2 +-
 .../tag/services/handlers/index-link.ts       |  2 +-
 .../tag/services/handlers/search-link.ts      |  2 +-
 .../user/services/handlers/profile-link.ts    |  2 +-
 src/core/services/sites.ts                    | 13 ++++------
 src/core/singletons/text.ts                   | 14 +++++++++++
 upgrade.txt                                   |  1 +
 46 files changed, 82 insertions(+), 60 deletions(-)

diff --git a/src/addons/badges/services/handlers/badge-link.ts b/src/addons/badges/services/handlers/badge-link.ts
index 25b14f5d9..9012435ec 100644
--- a/src/addons/badges/services/handlers/badge-link.ts
+++ b/src/addons/badges/services/handlers/badge-link.ts
@@ -27,7 +27,7 @@ import { AddonBadges } from '../badges';
 export class AddonBadgesBadgeLinkHandlerService extends CoreContentLinksHandlerBase {
 
     name = 'AddonBadgesBadgeLinkHandler';
-    pattern = /\/badges\/badge\.php.*([?&]hash=)/;
+    pattern = /^\/badges\/badge\.php.*([?&]hash=)/;
 
     /**
      * Get the list of actions for a link (url).
diff --git a/src/addons/badges/services/handlers/mybadges-link.ts b/src/addons/badges/services/handlers/mybadges-link.ts
index 2de022feb..543643dcd 100644
--- a/src/addons/badges/services/handlers/mybadges-link.ts
+++ b/src/addons/badges/services/handlers/mybadges-link.ts
@@ -27,7 +27,7 @@ export class AddonBadgesMyBadgesLinkHandlerService extends CoreContentLinksHandl
 
     name = 'AddonBadgesMyBadgesLinkHandler';
     featureName = 'CoreUserDelegate_AddonBadges';
-    pattern = /\/badges\/mybadges\.php/;
+    pattern = /^\/badges\/mybadges\.php/;
 
     /**
      * Get the list of actions for a link (url).
diff --git a/src/addons/blog/services/handlers/index-link.ts b/src/addons/blog/services/handlers/index-link.ts
index add0dcafb..e262c2804 100644
--- a/src/addons/blog/services/handlers/index-link.ts
+++ b/src/addons/blog/services/handlers/index-link.ts
@@ -28,7 +28,7 @@ export class AddonBlogIndexLinkHandlerService extends CoreContentLinksHandlerBas
 
     name = 'AddonBlogIndexLinkHandler';
     featureName = 'CoreUserDelegate_AddonBlog:blogs';
-    pattern = /\/blog\/index\.php/;
+    pattern = /^\/blog\/index\.php/;
 
     /**
      * @inheritdoc
diff --git a/src/addons/calendar/services/handlers/view-link.ts b/src/addons/calendar/services/handlers/view-link.ts
index 45914e697..1ebd188ed 100644
--- a/src/addons/calendar/services/handlers/view-link.ts
+++ b/src/addons/calendar/services/handlers/view-link.ts
@@ -30,7 +30,7 @@ const SUPPORTED_VIEWS = ['month', 'mini', 'minithree', 'day', 'upcoming', 'upcom
 export class AddonCalendarViewLinkHandlerService extends CoreContentLinksHandlerBase {
 
     name = 'AddonCalendarViewLinkHandler';
-    pattern = /\/calendar\/view\.php/;
+    pattern = /^\/calendar\/view\.php/;
 
     /**
      * Get the list of actions for a link (url).
diff --git a/src/addons/messages/services/handlers/contact-request-link.ts b/src/addons/messages/services/handlers/contact-request-link.ts
index a06eb6e11..bb787113b 100644
--- a/src/addons/messages/services/handlers/contact-request-link.ts
+++ b/src/addons/messages/services/handlers/contact-request-link.ts
@@ -26,7 +26,7 @@ import { AddonMessages } from '../messages';
 export class AddonMessagesContactRequestLinkHandlerService extends CoreContentLinksHandlerBase {
 
     name = 'AddonMessagesContactRequestLinkHandler';
-    pattern = /\/message\/pendingcontactrequests\.php/;
+    pattern = /^\/message\/pendingcontactrequests\.php/;
 
     /**
      * Get the list of actions for a link (url).
diff --git a/src/addons/messages/services/handlers/discussion-link.ts b/src/addons/messages/services/handlers/discussion-link.ts
index 2eb03cdec..3276ee859 100644
--- a/src/addons/messages/services/handlers/discussion-link.ts
+++ b/src/addons/messages/services/handlers/discussion-link.ts
@@ -29,7 +29,7 @@ import { AddonMessages } from '../messages';
 export class AddonMessagesDiscussionLinkHandlerService extends CoreContentLinksHandlerBase {
 
     name = 'AddonMessagesDiscussionLinkHandler';
-    pattern = /\/message\/index\.php.*([?&](id|user1|user2)=\d+)/;
+    pattern = /^\/message\/index\.php.*([?&](id|user1|user2)=\d+)/;
 
     /**
      * Get the list of actions for a link (url).
diff --git a/src/addons/messages/services/handlers/index-link.ts b/src/addons/messages/services/handlers/index-link.ts
index d552a6886..34f294340 100644
--- a/src/addons/messages/services/handlers/index-link.ts
+++ b/src/addons/messages/services/handlers/index-link.ts
@@ -28,7 +28,7 @@ import { AddonMessagesMainMenuHandlerService } from './mainmenu';
 export class AddonMessagesIndexLinkHandlerService extends CoreContentLinksHandlerBase {
 
     name = 'AddonMessagesIndexLinkHandler';
-    pattern = /\/message\/index\.php((?![?&](id|user1|user2)=\d+).)*$/;
+    pattern = /^\/message\/index\.php((?![?&](id|user1|user2)=\d+).)*$/;
 
     /**
      * Get the list of actions for a link (url).
diff --git a/src/addons/mod/data/services/handlers/approve-link.ts b/src/addons/mod/data/services/handlers/approve-link.ts
index f6802bca2..1e24c9d8d 100644
--- a/src/addons/mod/data/services/handlers/approve-link.ts
+++ b/src/addons/mod/data/services/handlers/approve-link.ts
@@ -28,7 +28,7 @@ export class AddonModDataApproveLinkHandlerService extends CoreContentLinksHandl
 
     name = 'AddonModDataApproveLinkHandler';
     featureName = 'CoreCourseModuleDelegate_AddonModData';
-    pattern = /\/mod\/data\/view\.php.*([?&](d|approve|disapprove)=\d+)/;
+    pattern = /^\/mod\/data\/view\.php.*([?&](d|approve|disapprove)=\d+)/;
     priority = 50; // Higher priority than the default link handler for view.php.
 
     /**
diff --git a/src/addons/mod/data/services/handlers/delete-link.ts b/src/addons/mod/data/services/handlers/delete-link.ts
index 71b0d8125..f18a54e54 100644
--- a/src/addons/mod/data/services/handlers/delete-link.ts
+++ b/src/addons/mod/data/services/handlers/delete-link.ts
@@ -28,7 +28,7 @@ export class AddonModDataDeleteLinkHandlerService extends CoreContentLinksHandle
 
     name = 'AddonModDataDeleteLinkHandler';
     featureName = 'CoreCourseModuleDelegate_AddonModData';
-    pattern = /\/mod\/data\/view\.php.*([?&](d|delete)=\d+)/;
+    pattern = /^\/mod\/data\/view\.php.*([?&](d|delete)=\d+)/;
 
     /**
      * @inheritdoc
diff --git a/src/addons/mod/data/services/handlers/edit-link.ts b/src/addons/mod/data/services/handlers/edit-link.ts
index bcabe86bd..135c12b3d 100644
--- a/src/addons/mod/data/services/handlers/edit-link.ts
+++ b/src/addons/mod/data/services/handlers/edit-link.ts
@@ -32,7 +32,7 @@ export class AddonModDataEditLinkHandlerService extends CoreContentLinksHandlerB
 
     name = 'AddonModDataEditLinkHandler';
     featureName = 'CoreCourseModuleDelegate_AddonModData';
-    pattern = /\/mod\/data\/edit\.php.*([?&](d|rid)=\d+)/;
+    pattern = /^\/mod\/data\/edit\.php.*([?&](d|rid)=\d+)/;
 
     /**
      * @inheritdoc
diff --git a/src/addons/mod/data/services/handlers/show-link.ts b/src/addons/mod/data/services/handlers/show-link.ts
index f30535768..5050c4c90 100644
--- a/src/addons/mod/data/services/handlers/show-link.ts
+++ b/src/addons/mod/data/services/handlers/show-link.ts
@@ -32,7 +32,7 @@ export class AddonModDataShowLinkHandlerService extends CoreContentLinksHandlerB
 
     name = 'AddonModDataShowLinkHandler';
     featureName = 'CoreCourseModuleDelegate_AddonModData';
-    pattern = /\/mod\/data\/view\.php.*([?&](d|rid|page|group|mode)=\d+)/;
+    pattern = /^\/mod\/data\/view\.php.*([?&](d|rid|page|group|mode)=\d+)/;
     priority = 50; // Higher priority than the default link handler for view.php.
 
     /**
diff --git a/src/addons/mod/feedback/services/handlers/analysis-link.ts b/src/addons/mod/feedback/services/handlers/analysis-link.ts
index f1b38c0dc..0549950cc 100644
--- a/src/addons/mod/feedback/services/handlers/analysis-link.ts
+++ b/src/addons/mod/feedback/services/handlers/analysis-link.ts
@@ -30,7 +30,7 @@ export class AddonModFeedbackAnalysisLinkHandlerService extends CoreContentLinks
 
     name = 'AddonModFeedbackAnalysisLinkHandler';
     featureName = 'CoreCourseModuleDelegate_AddonModFeedback';
-    pattern = /\/mod\/feedback\/analysis\.php.*([&?]id=\d+)/;
+    pattern = /^\/mod\/feedback\/analysis\.php.*([&?]id=\d+)/;
 
     /**
      * @inheritdoc
diff --git a/src/addons/mod/feedback/services/handlers/complete-link.ts b/src/addons/mod/feedback/services/handlers/complete-link.ts
index 7ae34e1a5..c5154243a 100644
--- a/src/addons/mod/feedback/services/handlers/complete-link.ts
+++ b/src/addons/mod/feedback/services/handlers/complete-link.ts
@@ -31,7 +31,7 @@ export class AddonModFeedbackCompleteLinkHandlerService extends CoreContentLinks
 
     name = 'AddonModFeedbackCompleteLinkHandler';
     featureName = 'CoreCourseModuleDelegate_AddonModFeedback';
-    pattern = /\/mod\/feedback\/complete\.php.*([?&](id|gopage)=\d+)/;
+    pattern = /^\/mod\/feedback\/complete\.php.*([?&](id|gopage)=\d+)/;
 
     /**
      * @inheritdoc
diff --git a/src/addons/mod/feedback/services/handlers/print-link.ts b/src/addons/mod/feedback/services/handlers/print-link.ts
index bb6d4d099..9c5f09f11 100644
--- a/src/addons/mod/feedback/services/handlers/print-link.ts
+++ b/src/addons/mod/feedback/services/handlers/print-link.ts
@@ -31,7 +31,7 @@ export class AddonModFeedbackPrintLinkHandlerService extends CoreContentLinksHan
 
     name = 'AddonModFeedbackPrintLinkHandler';
     featureName = 'CoreCourseModuleDelegate_AddonModFeedback';
-    pattern = /\/mod\/feedback\/print\.php.*([?&](id)=\d+)/;
+    pattern = /^\/mod\/feedback\/print\.php.*([?&](id)=\d+)/;
 
     /**
      * @inheritdoc
diff --git a/src/addons/mod/feedback/services/handlers/show-entries-link.ts b/src/addons/mod/feedback/services/handlers/show-entries-link.ts
index 30f3b7c15..b3d83cf79 100644
--- a/src/addons/mod/feedback/services/handlers/show-entries-link.ts
+++ b/src/addons/mod/feedback/services/handlers/show-entries-link.ts
@@ -27,7 +27,7 @@ export class AddonModFeedbackShowEntriesLinkHandlerService extends CoreContentLi
 
     name = 'AddonModFeedbackShowEntriesLinkHandler';
     featureName = 'CoreCourseModuleDelegate_AddonModFeedback';
-    pattern = /\/mod\/feedback\/show_entries\.php.*([?&](id|showcompleted)=\d+)/;
+    pattern = /^\/mod\/feedback\/show_entries\.php.*([?&](id|showcompleted)=\d+)/;
 
     /**
      * @inheritdoc
diff --git a/src/addons/mod/feedback/services/handlers/show-non-respondents-link.ts b/src/addons/mod/feedback/services/handlers/show-non-respondents-link.ts
index ea6e054ef..207808a6b 100644
--- a/src/addons/mod/feedback/services/handlers/show-non-respondents-link.ts
+++ b/src/addons/mod/feedback/services/handlers/show-non-respondents-link.ts
@@ -30,7 +30,7 @@ export class AddonModFeedbackShowNonRespondentsLinkHandlerService extends CoreCo
 
     name = 'AddonModFeedbackShowNonRespondentsLinkHandler';
     featureName = 'CoreCourseModuleDelegate_AddonModFeedback';
-    pattern = /\/mod\/feedback\/show_nonrespondents\.php.*([?&](id)=\d+)/;
+    pattern = /^\/mod\/feedback\/show_nonrespondents\.php.*([?&](id)=\d+)/;
 
     /**
      * @inheritdoc
diff --git a/src/addons/mod/forum/services/handlers/discussion-link.ts b/src/addons/mod/forum/services/handlers/discussion-link.ts
index 922ccf4a1..babfcd8a1 100644
--- a/src/addons/mod/forum/services/handlers/discussion-link.ts
+++ b/src/addons/mod/forum/services/handlers/discussion-link.ts
@@ -28,7 +28,7 @@ export class AddonModForumDiscussionLinkHandlerService extends CoreContentLinksH
 
     name = 'AddonModForumDiscussionLinkHandler';
     featureName = 'CoreCourseModuleDelegate_AddonModForum';
-    pattern = /\/mod\/forum\/discuss\.php.*([&?]d=\d+)/;
+    pattern = /^\/mod\/forum\/discuss\.php.*([&?]d=\d+)/;
 
     /**
      * Get the list of actions for a link (url).
diff --git a/src/addons/mod/forum/services/handlers/post-link.ts b/src/addons/mod/forum/services/handlers/post-link.ts
index 4349b2aa9..a404d38e3 100644
--- a/src/addons/mod/forum/services/handlers/post-link.ts
+++ b/src/addons/mod/forum/services/handlers/post-link.ts
@@ -32,7 +32,7 @@ export class AddonModForumPostLinkHandlerService extends CoreContentLinksHandler
 
     name = 'AddonModForumPostLinkHandler';
     featureName = 'CoreCourseModuleDelegate_AddonModForum';
-    pattern = /\/mod\/forum\/post\.php.*([?&](forum)=\d+)/;
+    pattern = /^\/mod\/forum\/post\.php.*([?&](forum)=\d+)/;
 
     /**
      * Get the list of actions for a link (url).
diff --git a/src/addons/mod/glossary/services/handlers/edit-link.ts b/src/addons/mod/glossary/services/handlers/edit-link.ts
index 8859a6d72..d9a08609e 100644
--- a/src/addons/mod/glossary/services/handlers/edit-link.ts
+++ b/src/addons/mod/glossary/services/handlers/edit-link.ts
@@ -32,7 +32,7 @@ export class AddonModGlossaryEditLinkHandlerService extends CoreContentLinksHand
 
     name = 'AddonModGlossaryEditLinkHandler';
     featureName = 'CoreCourseModuleDelegate_AddonModGlossary';
-    pattern = /\/mod\/glossary\/edit\.php.*([?&](cmid)=\d+)/;
+    pattern = /^\/mod\/glossary\/edit\.php.*([?&](cmid)=\d+)/;
 
     /**
      * @inheritdoc
diff --git a/src/addons/mod/glossary/services/handlers/entry-link.ts b/src/addons/mod/glossary/services/handlers/entry-link.ts
index d58a0bac3..3a7fcbf87 100644
--- a/src/addons/mod/glossary/services/handlers/entry-link.ts
+++ b/src/addons/mod/glossary/services/handlers/entry-link.ts
@@ -31,7 +31,7 @@ export class AddonModGlossaryEntryLinkHandlerService extends CoreContentLinksHan
 
     name = 'AddonModGlossaryEntryLinkHandler';
     featureName = 'CoreCourseModuleDelegate_AddonModGlossary';
-    pattern = /\/mod\/glossary\/(showentry|view)\.php.*([&?](eid|g|mode|hook)=\d+)/;
+    pattern = /^\/mod\/glossary\/(showentry|view)\.php.*([&?](eid|g|mode|hook)=\d+)/;
 
     /**
      * @inheritdoc
diff --git a/src/addons/mod/h5pactivity/services/handlers/report-link.ts b/src/addons/mod/h5pactivity/services/handlers/report-link.ts
index f3272d2bf..c72f6e541 100644
--- a/src/addons/mod/h5pactivity/services/handlers/report-link.ts
+++ b/src/addons/mod/h5pactivity/services/handlers/report-link.ts
@@ -33,7 +33,7 @@ export class AddonModH5PActivityReportLinkHandlerService extends CoreContentLink
 
     name = 'AddonModH5PActivityReportLinkHandler';
     featureName = 'CoreCourseModuleDelegate_AddonModH5PActivity';
-    pattern = /\/mod\/h5pactivity\/report\.php.*([&?]a=\d+)/;
+    pattern = /^\/mod\/h5pactivity\/report\.php.*([&?]a=\d+)/;
 
     /**
      * @inheritdoc
diff --git a/src/addons/mod/lesson/services/handlers/report-link.ts b/src/addons/mod/lesson/services/handlers/report-link.ts
index 355476434..08d599b31 100644
--- a/src/addons/mod/lesson/services/handlers/report-link.ts
+++ b/src/addons/mod/lesson/services/handlers/report-link.ts
@@ -31,7 +31,7 @@ export class AddonModLessonReportLinkHandlerService extends CoreContentLinksHand
 
     name = 'AddonModLessonReportLinkHandler';
     featureName = 'CoreCourseModuleDelegate_AddonModLesson';
-    pattern = /\/mod\/lesson\/report\.php.*([&?]id=\d+)/;
+    pattern = /^\/mod\/lesson\/report\.php.*([&?]id=\d+)/;
 
     /**
      * Get the list of actions for a link (url).
diff --git a/src/addons/mod/quiz/services/handlers/review-link.ts b/src/addons/mod/quiz/services/handlers/review-link.ts
index d2c7cdd3b..ebd3d50ec 100644
--- a/src/addons/mod/quiz/services/handlers/review-link.ts
+++ b/src/addons/mod/quiz/services/handlers/review-link.ts
@@ -26,7 +26,7 @@ export class AddonModQuizReviewLinkHandlerService extends CoreContentLinksHandle
 
     name = 'AddonModQuizReviewLinkHandler';
     featureName = 'CoreCourseModuleDelegate_AddonModQuiz';
-    pattern = /\/mod\/quiz\/review\.php.*([&?]attempt=\d+)/;
+    pattern = /^\/mod\/quiz\/review\.php.*([&?]attempt=\d+)/;
 
     /**
      * Get the list of actions for a link (url).
diff --git a/src/addons/mod/wiki/services/handlers/create-link.ts b/src/addons/mod/wiki/services/handlers/create-link.ts
index b78a3f632..79efa5cf4 100644
--- a/src/addons/mod/wiki/services/handlers/create-link.ts
+++ b/src/addons/mod/wiki/services/handlers/create-link.ts
@@ -33,7 +33,7 @@ export class AddonModWikiCreateLinkHandlerService extends CoreContentLinksHandle
 
     name = 'AddonModWikiCreateLinkHandler';
     featureName = 'CoreCourseModuleDelegate_AddonModWiki';
-    pattern = /\/mod\/wiki\/create\.php.*([&?]swid=\d+)/;
+    pattern = /^\/mod\/wiki\/create\.php.*([&?]swid=\d+)/;
 
     /**
      * Check if the current view is a wiki page of the same wiki.
diff --git a/src/addons/mod/wiki/services/handlers/edit-link.ts b/src/addons/mod/wiki/services/handlers/edit-link.ts
index 68e3a5140..3aafc53dd 100644
--- a/src/addons/mod/wiki/services/handlers/edit-link.ts
+++ b/src/addons/mod/wiki/services/handlers/edit-link.ts
@@ -31,7 +31,7 @@ export class AddonModWikiEditLinkHandlerService extends CoreContentLinksHandlerB
 
     name = 'AddonModWikiEditLinkHandler';
     featureName = 'CoreCourseModuleDelegate_AddonModWiki';
-    pattern = /\/mod\/wiki\/edit\.php.*([&?]pageid=\d+)/;
+    pattern = /^\/mod\/wiki\/edit\.php.*([&?]pageid=\d+)/;
 
     /**
      * @inheritdoc
diff --git a/src/addons/mod/wiki/services/handlers/page-or-map-link.ts b/src/addons/mod/wiki/services/handlers/page-or-map-link.ts
index 9b995e3bd..4bd476fde 100644
--- a/src/addons/mod/wiki/services/handlers/page-or-map-link.ts
+++ b/src/addons/mod/wiki/services/handlers/page-or-map-link.ts
@@ -32,7 +32,7 @@ export class AddonModWikiPageOrMapLinkHandlerService extends CoreContentLinksHan
 
     name = 'AddonModWikiPageOrMapLinkHandler';
     featureName = 'CoreCourseModuleDelegate_AddonModWiki';
-    pattern = /\/mod\/wiki\/(view|map)\.php.*([&?]pageid=\d+)/;
+    pattern = /^\/mod\/wiki\/(view|map)\.php.*([&?]pageid=\d+)/;
 
     /**
      * @inheritdoc
diff --git a/src/addons/notifications/services/handlers/notifications-link.ts b/src/addons/notifications/services/handlers/notifications-link.ts
index 9d560d165..a3b17bb5f 100644
--- a/src/addons/notifications/services/handlers/notifications-link.ts
+++ b/src/addons/notifications/services/handlers/notifications-link.ts
@@ -27,7 +27,7 @@ import { AddonNotificationsMainMenuHandlerService } from './mainmenu';
 export class AddonNotificationsLinkHandlerService extends CoreContentLinksHandlerBase {
 
     name = 'AddonNotificationsLinkHandler';
-    pattern = /\/message\/output\/popup\/notifications\.php/;
+    pattern = /^\/message\/output\/popup\/notifications\.php/;
     featureName = 'CoreMainMenuDelegate_AddonNotifications';
 
     /**
diff --git a/src/addons/notifications/services/handlers/preferences-link.ts b/src/addons/notifications/services/handlers/preferences-link.ts
index a2ab6da07..5da2ae898 100644
--- a/src/addons/notifications/services/handlers/preferences-link.ts
+++ b/src/addons/notifications/services/handlers/preferences-link.ts
@@ -28,7 +28,7 @@ import { AddonNotificationsSettingsHandlerService } from './settings';
 export class AddonNotificationsPreferencesLinkHandlerService extends CoreContentLinksHandlerBase {
 
     name = 'AddonNotificationsPreferencesLinkHandler';
-    pattern = /\/message\/notificationpreferences\.php/;
+    pattern = /^\/message\/notificationpreferences\.php/;
     checkAllUsers = true;
     featureName = 'CoreMainMenuDelegate_AddonNotifications';
 
diff --git a/src/addons/report/insights/services/handlers/action-link.ts b/src/addons/report/insights/services/handlers/action-link.ts
index aad2a84fc..e5f91b406 100644
--- a/src/addons/report/insights/services/handlers/action-link.ts
+++ b/src/addons/report/insights/services/handlers/action-link.ts
@@ -38,7 +38,7 @@ const BULK_ACTIONS = {
 export class AddonReportInsightsActionLinkHandlerService extends CoreContentLinksHandlerBase {
 
     name = 'AddonReportInsightsActionLinkHandler';
-    pattern = /\/report\/insights\/action\.php/;
+    pattern = /^\/report\/insights\/action\.php/;
 
     /**
      * @inheritdoc
diff --git a/src/core/features/contentlinks/classes/module-grade-handler.ts b/src/core/features/contentlinks/classes/module-grade-handler.ts
index cce3bad41..88e416ef8 100644
--- a/src/core/features/contentlinks/classes/module-grade-handler.ts
+++ b/src/core/features/contentlinks/classes/module-grade-handler.ts
@@ -47,7 +47,7 @@ export class CoreContentLinksModuleGradeHandler extends CoreContentLinksHandlerB
         super();
 
         // Match the grade.php URL with an id param.
-        this.pattern = new RegExp('/mod/' + modName + '/grade.php.*([&?]id=\\d+)');
+        this.pattern = new RegExp('^/mod/' + modName + '/grade.php.*([&?]id=\\d+)');
         this.featureName = 'CoreCourseModuleDelegate_' + addon;
     }
 
diff --git a/src/core/features/contentlinks/classes/module-index-handler.ts b/src/core/features/contentlinks/classes/module-index-handler.ts
index 384d37155..5910de0eb 100644
--- a/src/core/features/contentlinks/classes/module-index-handler.ts
+++ b/src/core/features/contentlinks/classes/module-index-handler.ts
@@ -43,11 +43,11 @@ export class CoreContentLinksModuleIndexHandler extends CoreContentLinksHandlerB
     ) {
         super();
 
+        // Match the view.php URL with an id or instance id param.
         const pattern = instanceIdParam ?
-            '/mod/' + modName + '/view.php.*([&?](' + instanceIdParam + '|id)=\\d+)' :
-            '/mod/' + modName + '/view.php.*([&?]id=\\d+)';
+            '^/mod/' + modName + '/view.php.*([&?](' + instanceIdParam + '|id)=\\d+)' :
+            '^/mod/' + modName + '/view.php.*([&?]id=\\d+)';
 
-        // Match the view.php URL with an id param.
         this.pattern = new RegExp(pattern);
         this.featureName = 'CoreCourseModuleDelegate_' + addon;
     }
diff --git a/src/core/features/contentlinks/classes/module-list-handler.ts b/src/core/features/contentlinks/classes/module-list-handler.ts
index 9d4089b4f..a20e8cf41 100644
--- a/src/core/features/contentlinks/classes/module-list-handler.ts
+++ b/src/core/features/contentlinks/classes/module-list-handler.ts
@@ -40,8 +40,8 @@ export class CoreContentLinksModuleListHandler extends CoreContentLinksHandlerBa
     ) {
         super();
 
-        // Match the view.php URL with an id param.
-        this.pattern = new RegExp('/mod/' + modName + '/index.php.*([&?]id=\\d+)');
+        // Match the index.php URL with an id param.
+        this.pattern = new RegExp('^/mod/' + modName + '/index.php.*([&?]id=\\d+)');
         this.featureName = 'CoreCourseModuleDelegate_' + addon;
     }
 
diff --git a/src/core/features/contentlinks/services/contentlinks-delegate.ts b/src/core/features/contentlinks/services/contentlinks-delegate.ts
index e8c36920e..3d5b98d15 100644
--- a/src/core/features/contentlinks/services/contentlinks-delegate.ts
+++ b/src/core/features/contentlinks/services/contentlinks-delegate.ts
@@ -18,6 +18,7 @@ import { CoreSites } from '@services/sites';
 import { CoreUrlUtils } from '@services/utils/url';
 import { CoreUtils } from '@services/utils/utils';
 import { makeSingleton } from '@singletons';
+import { CoreText } from '@singletons/text';
 
 /**
  * Interface that all handlers must implement.
@@ -49,7 +50,7 @@ export interface CoreContentLinksHandler {
      * Get the list of actions for a link (url).
      *
      * @param siteIds List of sites the URL belongs to.
-     * @param url The URL to treat.
+     * @param url The URL to treat.  It's a relative URL, it won't include the site URL.
      * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
      * @param courseId Course ID related to the URL. Optional but recommended.
      * @param data Extra data to handle the URL.
@@ -66,7 +67,7 @@ export interface CoreContentLinksHandler {
     /**
      * Check if a URL is handled by this handler.
      *
-     * @param url The URL to check.
+     * @param url The URL to check. It's a relative URL, it won't include the site URL.
      * @return Whether the URL is handled by this handler
      */
     handles(url: string): boolean;
@@ -84,7 +85,7 @@ export interface CoreContentLinksHandler {
      * If not defined, defaults to true.
      *
      * @param siteId The site ID.
-     * @param url The URL to treat.
+     * @param url The URL to treat.  It's a relative URL, it won't include the site URL.
      * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
      * @param courseId Course ID related to the URL. Optional but recommended.
      * @return Whether the handler is enabled for the URL and site.
@@ -163,15 +164,24 @@ export class CoreContentLinksDelegateService {
 
         // Get the list of sites the URL belongs to.
         const siteIds = await CoreSites.getSiteIdsFromUrl(url, true, username);
+        if (!siteIds.length) {
+            // No sites, no actions.
+            return [];
+        }
+
+        const site = await CoreSites.getSite(siteIds[0]);
+
         const linkActions: CoreContentLinksHandlerActions[] = [];
         const promises: Promise<void>[] = [];
         const params = CoreUrlUtils.extractUrlParams(url);
+        const relativeUrl = CoreText.addStartingSlash(url.replace(site.getURL(), ''));
+
         for (const name in this.handlers) {
             const handler = this.handlers[name];
             const checkAll = handler.checkAllUsers;
-            const isEnabledFn = this.isHandlerEnabled.bind(this, handler, url, params, courseId);
+            const isEnabledFn = this.isHandlerEnabled.bind(this, handler, relativeUrl, params, courseId);
 
-            if (!handler.handles(url)) {
+            if (!handler.handles(relativeUrl)) {
                 // Invalid handler or it doesn't handle the URL. Stop.
                 continue;
             }
@@ -183,7 +193,7 @@ export class CoreContentLinksDelegateService {
                     return;
                 }
 
-                const actions = await handler.getActions(siteIds, url, params, courseId, data);
+                const actions = await handler.getActions(siteIds, relativeUrl, params, courseId, data);
 
                 if (actions && actions.length) {
                     // Set default values if any value isn't supplied.
@@ -262,7 +272,7 @@ export class CoreContentLinksDelegateService {
      * Check if a handler is enabled for a certain site and URL.
      *
      * @param handler Handler to check.
-     * @param url The URL to check.
+     * @param url The URL to check.  It's a relative URL, it won't include the site URL.
      * @param params The params of the URL
      * @param courseId Course ID the URL belongs to (can be undefined).
      * @param siteId The site ID to check.
diff --git a/src/core/features/courses/services/handlers/course-link.ts b/src/core/features/courses/services/handlers/course-link.ts
index 5c7347844..b8d847a96 100644
--- a/src/core/features/courses/services/handlers/course-link.ts
+++ b/src/core/features/courses/services/handlers/course-link.ts
@@ -35,7 +35,7 @@ import { CoreIonLoadingElement } from '@classes/ion-loading';
 export class CoreCoursesCourseLinkHandlerService extends CoreContentLinksHandlerBase {
 
     name = 'CoreCoursesCourseLinkHandler';
-    pattern = /((\/enrol\/index\.php)|(\/course\/enrol\.php)|(\/course\/view\.php)).*([?&]id=\d+)/;
+    pattern = /((^\/enrol\/index\.php)|(^\/course\/enrol\.php)|(^\/course\/view\.php)).*([?&]id=\d+)/;
 
     protected waitStart = 0;
     protected logger: CoreLogger;
diff --git a/src/core/features/courses/services/handlers/courses-index-link.ts b/src/core/features/courses/services/handlers/courses-index-link.ts
index 4ca26a580..e486728ab 100644
--- a/src/core/features/courses/services/handlers/courses-index-link.ts
+++ b/src/core/features/courses/services/handlers/courses-index-link.ts
@@ -28,7 +28,7 @@ export class CoreCoursesIndexLinkHandlerService extends CoreContentLinksHandlerB
 
     name = 'CoreCoursesIndexLinkHandler';
     featureName = 'CoreMainMenuDelegate_CoreCourses';
-    pattern = /\/course\/?(index\.php.*)?$/;
+    pattern = /^\/course\/?(index\.php.*)?$/;
 
     /**
      * @inheritdoc
diff --git a/src/core/features/courses/services/handlers/dashboard-link.ts b/src/core/features/courses/services/handlers/dashboard-link.ts
index 05ad995a0..24af04dc3 100644
--- a/src/core/features/courses/services/handlers/dashboard-link.ts
+++ b/src/core/features/courses/services/handlers/dashboard-link.ts
@@ -27,7 +27,7 @@ import { CoreDashboardHomeHandler, CoreDashboardHomeHandlerService } from './das
 export class CoreCoursesDashboardLinkHandlerService extends CoreContentLinksHandlerBase {
 
     name = 'CoreCoursesDashboardLinkHandler';
-    pattern = /\/my\/?$/;
+    pattern = /^\/my\/?$/;
 
     /**
      * Get the list of actions for a link (url).
diff --git a/src/core/features/grades/services/handlers/overview-link.ts b/src/core/features/grades/services/handlers/overview-link.ts
index 2205e29ea..844c8ea69 100644
--- a/src/core/features/grades/services/handlers/overview-link.ts
+++ b/src/core/features/grades/services/handlers/overview-link.ts
@@ -27,7 +27,7 @@ import { GRADES_PAGE_NAME } from '../grades-helper';
 export class CoreGradesOverviewLinkHandlerService extends CoreContentLinksHandlerBase {
 
     name = 'CoreGradesOverviewLinkHandler';
-    pattern = /\/grade\/report\/overview\/index.php/;
+    pattern = /^\/grade\/report\/overview\/index.php/;
 
     /**
      * Get the list of actions for a link (url).
diff --git a/src/core/features/grades/services/handlers/report-link.ts b/src/core/features/grades/services/handlers/report-link.ts
index 1efed0df7..9f5e9da61 100644
--- a/src/core/features/grades/services/handlers/report-link.ts
+++ b/src/core/features/grades/services/handlers/report-link.ts
@@ -27,7 +27,7 @@ import { makeSingleton } from '@singletons';
 export class CoreGradesReportLinkHandlerService extends CoreContentLinksHandlerBase {
 
     name = 'CoreGradesReportLinkHandler';
-    pattern = /\/grade\/report(\/user)?\/index.php/;
+    pattern = /^\/grade\/report(\/user)?\/index.php/;
 
     /**
      * Get the list of actions for a link (url).
diff --git a/src/core/features/grades/services/handlers/user-link.ts b/src/core/features/grades/services/handlers/user-link.ts
index 1f1ba4008..2616e9688 100644
--- a/src/core/features/grades/services/handlers/user-link.ts
+++ b/src/core/features/grades/services/handlers/user-link.ts
@@ -27,7 +27,7 @@ import { makeSingleton } from '@singletons';
 export class CoreGradesUserLinkHandlerService extends CoreContentLinksHandlerBase {
 
     name = 'CoreGradesUserLinkHandler';
-    pattern = /\/course\/user\.php.*[?&]mode=grade/;
+    pattern = /^\/course\/user\.php.*[?&]mode=grade/;
 
     /**
      * Get the list of actions for a link (url).
diff --git a/src/core/features/sitehome/services/handlers/index-link.ts b/src/core/features/sitehome/services/handlers/index-link.ts
index 1f6e333a6..017a14d0c 100644
--- a/src/core/features/sitehome/services/handlers/index-link.ts
+++ b/src/core/features/sitehome/services/handlers/index-link.ts
@@ -31,7 +31,7 @@ export class CoreSiteHomeIndexLinkHandlerService extends CoreContentLinksHandler
 
     name = 'CoreSiteHomeIndexLinkHandler';
     featureName = 'CoreMainMenuDelegate_CoreSiteHome';
-    pattern = /\/course\/view\.php.*([?&]id=\d+)|\/index\.php(\?redirect=0)?/;
+    pattern = /^\/course\/view\.php.*([?&]id=\d+)|^\/index\.php(\?redirect=0)?/;
 
     /**
      * @inheritdoc
diff --git a/src/core/features/tag/services/handlers/index-link.ts b/src/core/features/tag/services/handlers/index-link.ts
index 6454bbdb9..5e60dec7f 100644
--- a/src/core/features/tag/services/handlers/index-link.ts
+++ b/src/core/features/tag/services/handlers/index-link.ts
@@ -27,7 +27,7 @@ import { CoreTag } from '../tag';
 export class CoreTagIndexLinkHandlerService extends CoreContentLinksHandlerBase {
 
     name = 'CoreTagIndexLinkHandler';
-    pattern = /\/tag\/index\.php/;
+    pattern = /^\/tag\/index\.php/;
 
     /**
      * Get the list of actions for a link (url).
diff --git a/src/core/features/tag/services/handlers/search-link.ts b/src/core/features/tag/services/handlers/search-link.ts
index 1749af16a..c97c07a7f 100644
--- a/src/core/features/tag/services/handlers/search-link.ts
+++ b/src/core/features/tag/services/handlers/search-link.ts
@@ -27,7 +27,7 @@ import { CoreTag } from '../tag';
 export class CoreTagSearchLinkHandlerService extends CoreContentLinksHandlerBase {
 
     name = 'CoreTagSearchLinkHandler';
-    pattern = /\/tag\/search\.php/;
+    pattern = /^\/tag\/search\.php/;
 
     /**
      * Get the list of actions for a link (url).
diff --git a/src/core/features/user/services/handlers/profile-link.ts b/src/core/features/user/services/handlers/profile-link.ts
index b7eb0ad5b..18fd695f1 100644
--- a/src/core/features/user/services/handlers/profile-link.ts
+++ b/src/core/features/user/services/handlers/profile-link.ts
@@ -27,7 +27,7 @@ export class CoreUserProfileLinkHandlerService extends CoreContentLinksHandlerBa
 
     name = 'CoreUserProfileLinkHandler';
     // Match user/view.php and user/profile.php but NOT grade/report/user/.
-    pattern = /((\/user\/view\.php)|(\/user\/profile\.php)).*([?&]id=\d+)/;
+    pattern = /((^\/user\/view\.php)|(^\/user\/profile\.php)).*([?&]id=\d+)/;
 
     /**
      * Get the list of actions for a link (url).
diff --git a/src/core/services/sites.ts b/src/core/services/sites.ts
index 280e518a3..3666de2df 100644
--- a/src/core/services/sites.ts
+++ b/src/core/services/sites.ts
@@ -1484,7 +1484,7 @@ export class CoreSitesProvider {
     async getSiteIdsFromUrl(url: string, prioritize?: boolean, username?: string): Promise<string[]> {
         // If prioritize is true, check current site first.
         if (prioritize && this.currentSite && this.currentSite.containsUrl(url)) {
-            if (!username || this.currentSite?.getInfo()?.username == username) {
+            if (!username || this.currentSite?.getInfo()?.username === username) {
                 return [this.currentSite.getId()];
             }
         }
@@ -1508,21 +1508,18 @@ export class CoreSitesProvider {
         try {
             const siteEntries = await this.sitesTable.getMany();
             const ids: string[] = [];
-            const promises: Promise<unknown>[] = [];
 
-            siteEntries.forEach((site) => {
+            await Promise.all(siteEntries.map(async (site) => {
                 if (!this.sites[site.id]) {
-                    promises.push(this.addSiteFromSiteListEntry(site));
+                    await this.addSiteFromSiteListEntry(site);
                 }
 
                 if (this.sites[site.id].containsUrl(url)) {
-                    if (!username || this.sites[site.id].getInfo()?.username == username) {
+                    if (!username || this.sites[site.id].getInfo()?.username === username) {
                         ids.push(site.id);
                     }
                 }
-            });
-
-            await Promise.all(promises);
+            }));
 
             return ids;
         } catch {
diff --git a/src/core/singletons/text.ts b/src/core/singletons/text.ts
index d84955206..f94e5996a 100644
--- a/src/core/singletons/text.ts
+++ b/src/core/singletons/text.ts
@@ -22,6 +22,20 @@ export class CoreText {
         // Nothing to do.
     }
 
+    /**
+     * Add starting slash to a string if needed.
+     *
+     * @param text Text to treat.
+     * @return Treated text.
+     */
+    static addStartingSlash(text = ''): string {
+        if (text[0] === '/') {
+            return text;
+        }
+
+        return '/' + text;
+    }
+
     /**
      * Remove ending slash from a path or URL.
      *
diff --git a/upgrade.txt b/upgrade.txt
index 5bb5fdf59..0923819d3 100644
--- a/upgrade.txt
+++ b/upgrade.txt
@@ -24,6 +24,7 @@ information provided here is intended especially for developers.
 - contextMenuPrefetch and fillContextMenu have been removed from CoreCourseHelper.
 - The variable "loaded" in CoreCourseModuleMainResourceComponent has been changed to "showLoading" to reflect its purpose better.
 - The function getCurrentSection of course formats can now return a forceSelected boolean along with the section (defaults to false if not returned).
+- The link handlers functions (CoreContentLinksHandler) will now always receive a relative URL instead of an absolute URL. It's now recommended to use "^" in your regular expressions to avoid false positives.
 
 
 

From bc2e38dece84f924004c31ca7ac3ae2c816d339b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 31 Mar 2022 13:09:59 +0200
Subject: [PATCH 0871/1008] MOBILE-3833 collapsible: Do not init collapsible
 heading if not needed

---
 src/addons/mod/folder/pages/index/index.html |  2 +-
 src/addons/mod/wiki/pages/index/index.html   |  2 +-
 src/core/directives/collapsible-header.ts    | 24 ++++++++++++++++----
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/addons/mod/folder/pages/index/index.html b/src/addons/mod/folder/pages/index/index.html
index 66812df13..cfafeebb9 100644
--- a/src/addons/mod/folder/pages/index/index.html
+++ b/src/addons/mod/folder/pages/index/index.html
@@ -1,4 +1,4 @@
-<ion-header collapsible>
+<ion-header [collapsible]="!subfolder">
     <ion-toolbar>
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
diff --git a/src/addons/mod/wiki/pages/index/index.html b/src/addons/mod/wiki/pages/index/index.html
index fd6c31ce6..c11fb730c 100644
--- a/src/addons/mod/wiki/pages/index/index.html
+++ b/src/addons/mod/wiki/pages/index/index.html
@@ -1,4 +1,4 @@
-<ion-header collapsible>
+<ion-header [collapsible]="!this.pageId && !this.pageTitle">
     <ion-toolbar>
         <ion-buttons slot="start">
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts
index 5bb3d05cf..196a2b1ce 100644
--- a/src/core/directives/collapsible-header.ts
+++ b/src/core/directives/collapsible-header.ts
@@ -88,7 +88,18 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
     /**
      * @inheritdoc
      */
-    async ngOnInit(): Promise<void> {
+    ngOnInit(): void {
+        this.init();
+    }
+
+    /**
+     * Init function.
+     */
+    async init(): Promise<void> {
+        if (!this.collapsible || this.expandedHeader) {
+            return;
+        }
+
         this.initializePage();
 
         await Promise.all([
@@ -104,9 +115,12 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
     /**
      * @inheritdoc
      */
-    ngOnChanges(changes: {[name: string]: SimpleChange}): void {
+    async ngOnChanges(changes: {[name: string]: SimpleChange}): Promise<void> {
         if (changes.collapsible) {
             this.enabled = !CoreUtils.isFalseOrZero(changes.collapsible.currentValue);
+
+            await this.init();
+
             setTimeout(() => {
                 this.setEnabled(this.enabled);
             }, 200);
@@ -160,8 +174,10 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
 
         // Timeout in case event is never fired.
         const timeout = window.setTimeout(() => {
-            this.firstEnter = false;
-            this.enteredPromise.reject(new Error('[collapsible-header] Waiting for ionViewDidEnter timeout reached'));
+            if (this.firstEnter) {
+                this.firstEnter = false;
+                this.enteredPromise.reject(new Error('[collapsible-header] Waiting for ionViewDidEnter timeout reached'));
+            }
         }, 5000);
 
         this.resizeListener = CoreDom.onWindowResize(() => {

From b4a438b91b0d53274967ec63049af95d24a235e5 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 31 Mar 2022 13:29:41 +0200
Subject: [PATCH 0872/1008] MOBILE-3833 security: Update simple-plist

https://github.com/advisories/GHSA-gff7-g5r8-mg8m
---
 package-lock.json | 676 ++++------------------------------------------
 1 file changed, 47 insertions(+), 629 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a73545b60..ecb4446bb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3261,11 +3261,6 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/badge/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/camera": {
       "version": "5.33.0",
       "resolved": "https://registry.npmjs.org/@ionic-native/camera/-/camera-5.33.0.tgz",
@@ -3278,11 +3273,6 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/camera/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/chooser": {
       "version": "5.33.0",
       "resolved": "https://registry.npmjs.org/@ionic-native/chooser/-/chooser-5.33.0.tgz",
@@ -3295,11 +3285,6 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/chooser/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/clipboard": {
       "version": "5.33.0",
       "resolved": "https://registry.npmjs.org/@ionic-native/clipboard/-/clipboard-5.33.0.tgz",
@@ -3312,11 +3297,6 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/clipboard/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/core": {
       "version": "5.33.0",
       "resolved": "https://registry.npmjs.org/@ionic-native/core/-/core-5.33.0.tgz",
@@ -3328,11 +3308,6 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/core/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/device": {
       "version": "5.33.0",
       "resolved": "https://registry.npmjs.org/@ionic-native/device/-/device-5.33.0.tgz",
@@ -3345,11 +3320,6 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/device/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/diagnostic": {
       "version": "5.33.0",
       "resolved": "https://registry.npmjs.org/@ionic-native/diagnostic/-/diagnostic-5.33.0.tgz",
@@ -3362,11 +3332,6 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/diagnostic/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/file": {
       "version": "5.33.0",
       "resolved": "https://registry.npmjs.org/@ionic-native/file/-/file-5.33.0.tgz",
@@ -3391,11 +3356,6 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/file-opener/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/file-transfer": {
       "version": "5.33.0",
       "resolved": "https://registry.npmjs.org/@ionic-native/file-transfer/-/file-transfer-5.33.0.tgz",
@@ -3408,16 +3368,6 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/file-transfer/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
-    "node_modules/@ionic-native/file/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/geolocation": {
       "version": "5.33.0",
       "resolved": "https://registry.npmjs.org/@ionic-native/geolocation/-/geolocation-5.33.0.tgz",
@@ -3430,11 +3380,6 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/geolocation/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/http": {
       "version": "5.33.0",
       "resolved": "https://registry.npmjs.org/@ionic-native/http/-/http-5.33.0.tgz",
@@ -3447,11 +3392,6 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/http/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/in-app-browser": {
       "version": "5.33.0",
       "resolved": "https://registry.npmjs.org/@ionic-native/in-app-browser/-/in-app-browser-5.33.0.tgz",
@@ -3464,11 +3404,6 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/in-app-browser/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/ionic-webview": {
       "version": "5.33.0",
       "resolved": "https://registry.npmjs.org/@ionic-native/ionic-webview/-/ionic-webview-5.33.0.tgz",
@@ -3481,11 +3416,6 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/ionic-webview/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/keyboard": {
       "version": "5.33.0",
       "resolved": "https://registry.npmjs.org/@ionic-native/keyboard/-/keyboard-5.33.0.tgz",
@@ -3498,11 +3428,6 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/keyboard/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/local-notifications": {
       "version": "5.33.0",
       "resolved": "https://registry.npmjs.org/@ionic-native/local-notifications/-/local-notifications-5.33.0.tgz",
@@ -3515,11 +3440,6 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/local-notifications/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/media": {
       "version": "5.33.0",
       "resolved": "https://registry.npmjs.org/@ionic-native/media/-/media-5.33.0.tgz",
@@ -3544,16 +3464,6 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/media-capture/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
-    "node_modules/@ionic-native/media/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/network": {
       "version": "5.33.0",
       "resolved": "https://registry.npmjs.org/@ionic-native/network/-/network-5.33.0.tgz",
@@ -3566,11 +3476,6 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/network/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/push": {
       "version": "5.33.0",
       "resolved": "https://registry.npmjs.org/@ionic-native/push/-/push-5.33.0.tgz",
@@ -3583,11 +3488,6 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/push/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/qr-scanner": {
       "version": "5.33.0",
       "resolved": "https://registry.npmjs.org/@ionic-native/qr-scanner/-/qr-scanner-5.33.0.tgz",
@@ -3600,11 +3500,6 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/qr-scanner/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/splash-screen": {
       "version": "5.33.0",
       "resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-5.33.0.tgz",
@@ -3617,11 +3512,6 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/splash-screen/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/sqlite": {
       "version": "5.33.0",
       "resolved": "https://registry.npmjs.org/@ionic-native/sqlite/-/sqlite-5.33.0.tgz",
@@ -3634,11 +3524,6 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/sqlite/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/status-bar": {
       "version": "5.33.0",
       "resolved": "https://registry.npmjs.org/@ionic-native/status-bar/-/status-bar-5.33.0.tgz",
@@ -3651,11 +3536,6 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/status-bar/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/web-intent": {
       "version": "5.33.0",
       "resolved": "https://registry.npmjs.org/@ionic-native/web-intent/-/web-intent-5.33.0.tgz",
@@ -3668,11 +3548,6 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/web-intent/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic-native/zip": {
       "version": "5.33.0",
       "resolved": "https://registry.npmjs.org/@ionic-native/zip/-/zip-5.33.0.tgz",
@@ -3685,11 +3560,6 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
-    "node_modules/@ionic-native/zip/node_modules/@types/cordova": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-      "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-    },
     "node_modules/@ionic/angular": {
       "version": "5.9.2",
       "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-5.9.2.tgz",
@@ -5987,104 +5857,6 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/experimental-utils": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.22.0.tgz",
-      "integrity": "sha512-xJXHHl6TuAxB5AWiVrGhvbGL8/hbiCQ8FiWwObO3r0fnvBdrbWEDy1hlvGQOAWc6qsCWuWMKdVWlLAEMpxnddg==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.3",
-        "@typescript-eslint/scope-manager": "4.22.0",
-        "@typescript-eslint/types": "4.22.0",
-        "@typescript-eslint/typescript-estree": "4.22.0",
-        "eslint-scope": "^5.0.0",
-        "eslint-utils": "^2.0.0"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "*"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.22.0.tgz",
-      "integrity": "sha512-OcCO7LTdk6ukawUM40wo61WdeoA7NM/zaoq1/2cs13M7GyiF+T4rxuA4xM+6LeHWjWbss7hkGXjFDRcKD4O04Q==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "4.22.0",
-        "@typescript-eslint/visitor-keys": "4.22.0"
-      },
-      "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.22.0.tgz",
-      "integrity": "sha512-sW/BiXmmyMqDPO2kpOhSy2Py5w6KvRRsKZnV0c4+0nr4GIcedJwXAq+RHNK4lLVEZAJYFltnnk1tJSlbeS9lYA==",
-      "dev": true,
-      "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.0.tgz",
-      "integrity": "sha512-TkIFeu5JEeSs5ze/4NID+PIcVjgoU3cUQUIZnH3Sb1cEn1lBo7StSV5bwPuJQuoxKXlzAObjYTilOEKRuhR5yg==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "4.22.0",
-        "@typescript-eslint/visitor-keys": "4.22.0",
-        "debug": "^4.1.1",
-        "globby": "^11.0.1",
-        "is-glob": "^4.0.1",
-        "semver": "^7.3.2",
-        "tsutils": "^3.17.1"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.0.tgz",
-      "integrity": "sha512-nnMu4F+s4o0sll6cBSsTeVsT4cwxB7zECK3dFxzEjPBii9xLpq4yqqsy/FU5zMfan6G60DKZSCXAa3sHJZrcYw==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "4.22.0",
-        "eslint-visitor-keys": "^2.0.0"
-      },
-      "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/debug": {
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
@@ -6102,19 +5874,6 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -6185,80 +5944,6 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.22.0.tgz",
-      "integrity": "sha512-OcCO7LTdk6ukawUM40wo61WdeoA7NM/zaoq1/2cs13M7GyiF+T4rxuA4xM+6LeHWjWbss7hkGXjFDRcKD4O04Q==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "4.22.0",
-        "@typescript-eslint/visitor-keys": "4.22.0"
-      },
-      "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.22.0.tgz",
-      "integrity": "sha512-sW/BiXmmyMqDPO2kpOhSy2Py5w6KvRRsKZnV0c4+0nr4GIcedJwXAq+RHNK4lLVEZAJYFltnnk1tJSlbeS9lYA==",
-      "dev": true,
-      "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.0.tgz",
-      "integrity": "sha512-TkIFeu5JEeSs5ze/4NID+PIcVjgoU3cUQUIZnH3Sb1cEn1lBo7StSV5bwPuJQuoxKXlzAObjYTilOEKRuhR5yg==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "4.22.0",
-        "@typescript-eslint/visitor-keys": "4.22.0",
-        "debug": "^4.1.1",
-        "globby": "^11.0.1",
-        "is-glob": "^4.0.1",
-        "semver": "^7.3.2",
-        "tsutils": "^3.17.1"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.0.tgz",
-      "integrity": "sha512-nnMu4F+s4o0sll6cBSsTeVsT4cwxB7zECK3dFxzEjPBii9xLpq4yqqsy/FU5zMfan6G60DKZSCXAa3sHJZrcYw==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "4.22.0",
-        "eslint-visitor-keys": "^2.0.0"
-      },
-      "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
     "node_modules/@typescript-eslint/parser/node_modules/debug": {
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
@@ -8290,11 +7975,11 @@
       }
     },
     "node_modules/bplist-creator": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.8.tgz",
-      "integrity": "sha512-Za9JKzD6fjLC16oX2wsXfc+qBEhJBJB1YPInoAQpMLhDuj5aVOv1baGeIQSq1Fr3OCqzvsoQcSBSwGId/Ja2PA==",
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.1.0.tgz",
+      "integrity": "sha512-sXaHZicyEEmY86WyueLTQesbeoH/mquvarJaQNbjuOQO+7gbFcDEWqKmcWA4cOTLzFlfgvkiVxolk1k5bBIpmg==",
       "dependencies": {
-        "stream-buffers": "~2.2.0"
+        "stream-buffers": "2.2.x"
       }
     },
     "node_modules/bplist-parser": {
@@ -23394,9 +23079,9 @@
       }
     },
     "node_modules/plist": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.4.tgz",
-      "integrity": "sha512-ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.5.tgz",
+      "integrity": "sha512-83vX4eYdQp3vP9SxuYgEM/G/pJQqLUz/V/xzPrzruLs7fz7jxGQ1msZ/mg1nwZxUSuOp4sb+/bEIbRrbzZRxDA==",
       "dependencies": {
         "base64-js": "^1.5.1",
         "xmlbuilder": "^9.0.7"
@@ -26744,13 +26429,24 @@
       }
     },
     "node_modules/simple-plist": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/simple-plist/-/simple-plist-1.1.1.tgz",
-      "integrity": "sha512-pKMCVKvZbZTsqYR6RKgLfBHkh2cV89GXcA/0CVPje3sOiNOnXA8+rp/ciAMZ7JRaUdLzlEM6JFfUn+fS6Nt3hg==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/simple-plist/-/simple-plist-1.3.1.tgz",
+      "integrity": "sha512-iMSw5i0XseMnrhtIzRb7XpQEXepa9xhWxGUojHBL43SIpQuDQkh3Wpy67ZbDzZVr6EKxvwVChnVpdl8hEVLDiw==",
       "dependencies": {
-        "bplist-creator": "0.0.8",
-        "bplist-parser": "0.2.0",
-        "plist": "^3.0.1"
+        "bplist-creator": "0.1.0",
+        "bplist-parser": "0.3.1",
+        "plist": "^3.0.5"
+      }
+    },
+    "node_modules/simple-plist/node_modules/bplist-parser": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.3.1.tgz",
+      "integrity": "sha512-PyJxiNtA5T2PlLIeBot4lbp7rj4OadzjnMZD/G5zuBNt8ei/yCU7+wW0h2bag9vr8c+/WuRWmSxbqAl9hL1rBA==",
+      "dependencies": {
+        "big-integer": "1.6.x"
+      },
+      "engines": {
+        "node": ">= 5.10.0"
       }
     },
     "node_modules/simple-swizzle": {
@@ -33807,13 +33503,6 @@
       "integrity": "sha512-g/E2HLB53csZq5hWeyWUFj6r7CrllSPuOkV88XotIFTQFNuY7TaLtiFUVFSvWXRh0Kvu+w7TI5Hys67d/v7F/g==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/camera": {
@@ -33822,13 +33511,6 @@
       "integrity": "sha512-cLAxM4e8IrTECvlszyUe9FnUjE4PbWR99NNDwkOuB85yJ3diyKxiQhHu89Qh9A6qzHTJQLa93iknY2Q40VM/5Q==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/chooser": {
@@ -33837,13 +33519,6 @@
       "integrity": "sha512-hz2OtB8UsJpKdXZByDzGS6+U1FK8toIjKmIVCDQAuOXxjbw9dU2Ef+MSUKXOpK6MYnP56oP80JdSX9LDEFJnRA==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/clipboard": {
@@ -33852,13 +33527,6 @@
       "integrity": "sha512-HFZN4tsAjFJ9Se9ik0/IOUvApL4zNPEKQAtUsjqP7vCnTsdrgS+FDMln1UDEKXCQ/dEEwU1N1ndFmPBGxjkGzQ==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/core": {
@@ -33867,13 +33535,6 @@
       "integrity": "sha512-dnZHu7SadvQvliGJPndk2ohdoPvwiyBWJjsJw33BKyhadnmLlmkYKkRgPPI+i22BZofDKq4YiAfIIqhvfHU6gw==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/device": {
@@ -33882,13 +33543,6 @@
       "integrity": "sha512-KYQvVsN98bGTEomI193Jf9r1vaXBFJQXuhkhwBI6lajynAlf2SIVJwthNUXnK43kNXy1cOelYxScUuKyPwqudw==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/diagnostic": {
@@ -33897,13 +33551,6 @@
       "integrity": "sha512-zBDv/yNMvUkXfxy17rgrGVU3+XKREXRI7cqy/DyvpjdomOnmx2pnFvhszgMEgeD03LkXXKiFOR5yUAVNgYirmg==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/file": {
@@ -33912,13 +33559,6 @@
       "integrity": "sha512-RisSGJl2t8JrBgw30Vn5hJYYKEDTHR9f3KbQDfe1MQg+VrZo7vnbml/vk4l55u65c1TYZDH+F6i7s9nyif1QVQ==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/file-opener": {
@@ -33927,13 +33567,6 @@
       "integrity": "sha512-v7t1ndalAPYT9gvMAhxAup8tg1NPV415cfG6tzs1foPFP91UZC3MQny0tup8AgFivugT1GRdoSk1NMuK1jy8Cw==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/file-transfer": {
@@ -33942,13 +33575,6 @@
       "integrity": "sha512-xDUpdJVgTBP6aEiU08iZ/pa9aMoGSMB9391dQKk+VSDs0hdbIwk+Cx4V40GIE4QF3TI06sUMdKXD2sIhVsr2QA==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/geolocation": {
@@ -33957,13 +33583,6 @@
       "integrity": "sha512-oE6pi6l8/Wsv94vpJmPlPqE1LheP6cQTJrC78WYQp9WVDOOCGZnFznNoH8BlQfnfjuDx/kUARxzEJBO/gbUg1A==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/http": {
@@ -33972,13 +33591,6 @@
       "integrity": "sha512-dqcPu3igSLlfDUK8Mvma/6o6aq7WtKBlcR8xXwE8tVsO/r4fEB6NevLLN4S4zCr381Jy+RxIIjn3CZx5XHF6JQ==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/in-app-browser": {
@@ -33987,13 +33599,6 @@
       "integrity": "sha512-GGIvnYHf8FgaIae9yfRzxqxj0ZAxrYhOJpsHVSq1YKjxnDpRe6ImWWaHHfaeXE5IdUUMUXVuf75VTSBN00VBvA==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/ionic-webview": {
@@ -34002,13 +33607,6 @@
       "integrity": "sha512-Jbr4M6z/Fya51F+QXuPLm/crFlZ9T6YvRM1cygGmFwZ7SgDAimYnjgSO8SEGJmvO2ZekYmFuF56qiVPSvx2wUA==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/keyboard": {
@@ -34017,13 +33615,6 @@
       "integrity": "sha512-TIYU3LC+Yz/pcpBuHcxLThMNuN9y1E1wBu4SlmS6VlO3/D3R3At2WOg2UK3iA66G2kTJubed5haqTYZjeoA6Uw==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/local-notifications": {
@@ -34032,13 +33623,6 @@
       "integrity": "sha512-ljn2uq0rFWpjG1I1qK+mPVX8T3T+09fsF8sZ9nK7uvD9YWShCVz2e2ctf8qPRFq+TWDeDqlnwXz3wCvWmbBUWw==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/media": {
@@ -34047,13 +33631,6 @@
       "integrity": "sha512-nUu7/FSH41j9+BqHXYVMBd3EifNsTNOufD3NEiMVpHVDWLWqG7tG5h5cFlsVACxUaP4kNpSEke2mjom6CKyjxQ==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/media-capture": {
@@ -34062,13 +33639,6 @@
       "integrity": "sha512-aQTnonVSeijpuZ9B7oYJCjIDqgFVhNdvqkx9vUoaO359BtJGpGS1rNPjEovt4DsqV7oe7TkbmBd8DMEwnB3A2g==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/network": {
@@ -34077,13 +33647,6 @@
       "integrity": "sha512-J+3+rbDTMVNUspa/nV+P8a0hFKDicJK1rVIrm5aLBQdmN9n7WaqJmeMYTptyWOnZxQpktJAJDdhJTEvVmKQjjw==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/push": {
@@ -34092,13 +33655,6 @@
       "integrity": "sha512-H4gOkMbOaNvi97cKKJDggWvAR1BVCUbtdLyWInA0q3cZBHWSc6KcRJGz+hcdDndCQJUnHofs1Tpw8LN3zhjYyQ==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/qr-scanner": {
@@ -34107,13 +33663,6 @@
       "integrity": "sha512-cyiQv0Rje/fN9/JYoDXP1+ILJkRkjvPtoSx4vd2FsKAuJB60U2DpQfmVEE/KMF4iceTpx4MK/kGzr2WE2AYnIg==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/splash-screen": {
@@ -34122,13 +33671,6 @@
       "integrity": "sha512-6PHk5WJeUoc3zru6wTvUmd9DCASvRQoQq1dysYI3JCECaAJ6X0x1RbzM8dBFs3JPLfWtDn+P8eTp+KaA0Xf58w==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/sqlite": {
@@ -34137,13 +33679,6 @@
       "integrity": "sha512-JIdQJr6bcksotF/3ZMJQZo9lHgaHXvHOOK9R30mM/5Ds5fFu+rUoUf0wvyqaGzEFu94pGw2uPGnfD+WI7x7+1A==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/status-bar": {
@@ -34152,13 +33687,6 @@
       "integrity": "sha512-cnyfd42N9gGfhyDtF7wbWoacKg/jfsoJQHOHltfhS4/EjxsVu4bjkwq1YBLMcMY3OIqFDSn2aFcejHn8wVNkDQ==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/web-intent": {
@@ -34167,13 +33695,6 @@
       "integrity": "sha512-3CIAofrg9nkJQbSftFdMKYOduXy9Ra/a1Q0it6ysm9NFeAQn7iZPThSexBeZ9xiKKj/QTPZtnqAJ0MQ+4mkGag==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic-native/zip": {
@@ -34182,13 +33703,6 @@
       "integrity": "sha512-hErISQ6/xqVErmVnnha5BR+3GWRNQIVfMTXzprEpNZxQl3iDe1UTIVQdFnMd3Nasz/naY+61Vq/y91PZ1Rrajw==",
       "requires": {
         "@types/cordova": "latest"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
       }
     },
     "@ionic/angular": {
@@ -35938,61 +35452,6 @@
         "tsutils": "^3.17.1"
       },
       "dependencies": {
-        "@typescript-eslint/experimental-utils": {
-          "version": "4.22.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.22.0.tgz",
-          "integrity": "sha512-xJXHHl6TuAxB5AWiVrGhvbGL8/hbiCQ8FiWwObO3r0fnvBdrbWEDy1hlvGQOAWc6qsCWuWMKdVWlLAEMpxnddg==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.3",
-            "@typescript-eslint/scope-manager": "4.22.0",
-            "@typescript-eslint/types": "4.22.0",
-            "@typescript-eslint/typescript-estree": "4.22.0",
-            "eslint-scope": "^5.0.0",
-            "eslint-utils": "^2.0.0"
-          }
-        },
-        "@typescript-eslint/scope-manager": {
-          "version": "4.22.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.22.0.tgz",
-          "integrity": "sha512-OcCO7LTdk6ukawUM40wo61WdeoA7NM/zaoq1/2cs13M7GyiF+T4rxuA4xM+6LeHWjWbss7hkGXjFDRcKD4O04Q==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "4.22.0",
-            "@typescript-eslint/visitor-keys": "4.22.0"
-          }
-        },
-        "@typescript-eslint/types": {
-          "version": "4.22.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.22.0.tgz",
-          "integrity": "sha512-sW/BiXmmyMqDPO2kpOhSy2Py5w6KvRRsKZnV0c4+0nr4GIcedJwXAq+RHNK4lLVEZAJYFltnnk1tJSlbeS9lYA==",
-          "dev": true
-        },
-        "@typescript-eslint/typescript-estree": {
-          "version": "4.22.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.0.tgz",
-          "integrity": "sha512-TkIFeu5JEeSs5ze/4NID+PIcVjgoU3cUQUIZnH3Sb1cEn1lBo7StSV5bwPuJQuoxKXlzAObjYTilOEKRuhR5yg==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "4.22.0",
-            "@typescript-eslint/visitor-keys": "4.22.0",
-            "debug": "^4.1.1",
-            "globby": "^11.0.1",
-            "is-glob": "^4.0.1",
-            "semver": "^7.3.2",
-            "tsutils": "^3.17.1"
-          }
-        },
-        "@typescript-eslint/visitor-keys": {
-          "version": "4.22.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.0.tgz",
-          "integrity": "sha512-nnMu4F+s4o0sll6cBSsTeVsT4cwxB7zECK3dFxzEjPBii9xLpq4yqqsy/FU5zMfan6G60DKZSCXAa3sHJZrcYw==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "4.22.0",
-            "eslint-visitor-keys": "^2.0.0"
-          }
-        },
         "debug": {
           "version": "4.3.1",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
@@ -36002,16 +35461,6 @@
             "ms": "2.1.2"
           }
         },
-        "eslint-scope": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-          "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-          "dev": true,
-          "requires": {
-            "esrecurse": "^4.3.0",
-            "estraverse": "^4.1.1"
-          }
-        },
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -36058,47 +35507,6 @@
         "debug": "^4.1.1"
       },
       "dependencies": {
-        "@typescript-eslint/scope-manager": {
-          "version": "4.22.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.22.0.tgz",
-          "integrity": "sha512-OcCO7LTdk6ukawUM40wo61WdeoA7NM/zaoq1/2cs13M7GyiF+T4rxuA4xM+6LeHWjWbss7hkGXjFDRcKD4O04Q==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "4.22.0",
-            "@typescript-eslint/visitor-keys": "4.22.0"
-          }
-        },
-        "@typescript-eslint/types": {
-          "version": "4.22.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.22.0.tgz",
-          "integrity": "sha512-sW/BiXmmyMqDPO2kpOhSy2Py5w6KvRRsKZnV0c4+0nr4GIcedJwXAq+RHNK4lLVEZAJYFltnnk1tJSlbeS9lYA==",
-          "dev": true
-        },
-        "@typescript-eslint/typescript-estree": {
-          "version": "4.22.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.0.tgz",
-          "integrity": "sha512-TkIFeu5JEeSs5ze/4NID+PIcVjgoU3cUQUIZnH3Sb1cEn1lBo7StSV5bwPuJQuoxKXlzAObjYTilOEKRuhR5yg==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "4.22.0",
-            "@typescript-eslint/visitor-keys": "4.22.0",
-            "debug": "^4.1.1",
-            "globby": "^11.0.1",
-            "is-glob": "^4.0.1",
-            "semver": "^7.3.2",
-            "tsutils": "^3.17.1"
-          }
-        },
-        "@typescript-eslint/visitor-keys": {
-          "version": "4.22.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.0.tgz",
-          "integrity": "sha512-nnMu4F+s4o0sll6cBSsTeVsT4cwxB7zECK3dFxzEjPBii9xLpq4yqqsy/FU5zMfan6G60DKZSCXAa3sHJZrcYw==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "4.22.0",
-            "eslint-visitor-keys": "^2.0.0"
-          }
-        },
         "debug": {
           "version": "4.3.1",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
@@ -37684,11 +37092,11 @@
       }
     },
     "bplist-creator": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.8.tgz",
-      "integrity": "sha512-Za9JKzD6fjLC16oX2wsXfc+qBEhJBJB1YPInoAQpMLhDuj5aVOv1baGeIQSq1Fr3OCqzvsoQcSBSwGId/Ja2PA==",
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.1.0.tgz",
+      "integrity": "sha512-sXaHZicyEEmY86WyueLTQesbeoH/mquvarJaQNbjuOQO+7gbFcDEWqKmcWA4cOTLzFlfgvkiVxolk1k5bBIpmg==",
       "requires": {
-        "stream-buffers": "~2.2.0"
+        "stream-buffers": "2.2.x"
       }
     },
     "bplist-parser": {
@@ -49577,9 +48985,9 @@
       }
     },
     "plist": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.4.tgz",
-      "integrity": "sha512-ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.5.tgz",
+      "integrity": "sha512-83vX4eYdQp3vP9SxuYgEM/G/pJQqLUz/V/xzPrzruLs7fz7jxGQ1msZ/mg1nwZxUSuOp4sb+/bEIbRrbzZRxDA==",
       "requires": {
         "base64-js": "^1.5.1",
         "xmlbuilder": "^9.0.7"
@@ -52308,13 +51716,23 @@
       }
     },
     "simple-plist": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/simple-plist/-/simple-plist-1.1.1.tgz",
-      "integrity": "sha512-pKMCVKvZbZTsqYR6RKgLfBHkh2cV89GXcA/0CVPje3sOiNOnXA8+rp/ciAMZ7JRaUdLzlEM6JFfUn+fS6Nt3hg==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/simple-plist/-/simple-plist-1.3.1.tgz",
+      "integrity": "sha512-iMSw5i0XseMnrhtIzRb7XpQEXepa9xhWxGUojHBL43SIpQuDQkh3Wpy67ZbDzZVr6EKxvwVChnVpdl8hEVLDiw==",
       "requires": {
-        "bplist-creator": "0.0.8",
-        "bplist-parser": "0.2.0",
-        "plist": "^3.0.1"
+        "bplist-creator": "0.1.0",
+        "bplist-parser": "0.3.1",
+        "plist": "^3.0.5"
+      },
+      "dependencies": {
+        "bplist-parser": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.3.1.tgz",
+          "integrity": "sha512-PyJxiNtA5T2PlLIeBot4lbp7rj4OadzjnMZD/G5zuBNt8ei/yCU7+wW0h2bag9vr8c+/WuRWmSxbqAl9hL1rBA==",
+          "requires": {
+            "big-integer": "1.6.x"
+          }
+        }
       }
     },
     "simple-swizzle": {

From 1402577c2604c1e160ee93ce69fc6fd00b8dfb8a Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 31 Mar 2022 13:32:08 +0200
Subject: [PATCH 0873/1008] MOBILE-3833 security: Update tar

---
 package-lock.json | 78 +++++++++++++++++++++++++++++++----------------
 1 file changed, 52 insertions(+), 26 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ecb4446bb..89c04cd81 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22625,6 +22625,26 @@
         "rimraf": "bin.js"
       }
     },
+    "node_modules/pacote/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
     "node_modules/pacote/node_modules/semver": {
       "version": "5.7.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
@@ -22644,18 +22664,18 @@
       }
     },
     "node_modules/pacote/node_modules/tar": {
-      "version": "4.4.13",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz",
-      "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
+      "version": "4.4.19",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz",
+      "integrity": "sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==",
       "dev": true,
       "dependencies": {
-        "chownr": "^1.1.1",
-        "fs-minipass": "^1.2.5",
-        "minipass": "^2.8.6",
-        "minizlib": "^1.2.1",
-        "mkdirp": "^0.5.0",
-        "safe-buffer": "^5.1.2",
-        "yallist": "^3.0.3"
+        "chownr": "^1.1.4",
+        "fs-minipass": "^1.2.7",
+        "minipass": "^2.9.0",
+        "minizlib": "^1.3.3",
+        "mkdirp": "^0.5.5",
+        "safe-buffer": "^5.2.1",
+        "yallist": "^3.1.1"
       },
       "engines": {
         "node": ">=4.5"
@@ -28056,9 +28076,9 @@
       }
     },
     "node_modules/tar": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.1.tgz",
-      "integrity": "sha512-GG0R7yt/CQkvG4fueXDi52Zskqxe2AyRJ+Wm54yqarnBgcX3qRIWh10qLVAAN+mlPFGTfP5UxvD3Fbi11UOTUQ==",
+      "version": "6.1.11",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
+      "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
       "dependencies": {
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
@@ -48630,6 +48650,12 @@
             "glob": "^7.1.3"
           }
         },
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "dev": true
+        },
         "semver": {
           "version": "5.7.1",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
@@ -48646,18 +48672,18 @@
           }
         },
         "tar": {
-          "version": "4.4.13",
-          "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz",
-          "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
+          "version": "4.4.19",
+          "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz",
+          "integrity": "sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==",
           "dev": true,
           "requires": {
-            "chownr": "^1.1.1",
-            "fs-minipass": "^1.2.5",
-            "minipass": "^2.8.6",
-            "minizlib": "^1.2.1",
-            "mkdirp": "^0.5.0",
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.3"
+            "chownr": "^1.1.4",
+            "fs-minipass": "^1.2.7",
+            "minipass": "^2.9.0",
+            "minizlib": "^1.3.3",
+            "mkdirp": "^0.5.5",
+            "safe-buffer": "^5.2.1",
+            "yallist": "^3.1.1"
           }
         },
         "which": {
@@ -53020,9 +53046,9 @@
       "dev": true
     },
     "tar": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.1.tgz",
-      "integrity": "sha512-GG0R7yt/CQkvG4fueXDi52Zskqxe2AyRJ+Wm54yqarnBgcX3qRIWh10qLVAAN+mlPFGTfP5UxvD3Fbi11UOTUQ==",
+      "version": "6.1.11",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
+      "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
       "requires": {
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",

From c19057ad6fb67f5a5a8913998b0474a79d1828f1 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 31 Mar 2022 13:34:36 +0200
Subject: [PATCH 0874/1008] MOBILE-3833 security: Update y18n

---
 package-lock.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 89c04cd81..2a9afd324 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15975,9 +15975,9 @@
       }
     },
     "node_modules/gulp/node_modules/y18n": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-      "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
+      "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==",
       "dev": true
     },
     "node_modules/gulp/node_modules/yargs": {
@@ -30965,9 +30965,9 @@
       }
     },
     "node_modules/y18n": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
       "dev": true
     },
     "node_modules/yallist": {
@@ -43239,9 +43239,9 @@
           }
         },
         "y18n": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
+          "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==",
           "dev": true
         },
         "yargs": {
@@ -55363,9 +55363,9 @@
       "dev": true
     },
     "y18n": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
       "dev": true
     },
     "yallist": {

From bcdee781d2e55cd7c6265455dc7a8c01fc58a6d3 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 31 Mar 2022 13:35:19 +0200
Subject: [PATCH 0875/1008] MOBILE-3833 security: Update underscore

---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2a9afd324..77a83e632 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28951,9 +28951,9 @@
       }
     },
     "node_modules/underscore": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.11.0.tgz",
-      "integrity": "sha512-xY96SsN3NA461qIRKZ/+qox37YXPtSBswMGfiNptr+wrt6ds4HaMw23TP612fEyGekRE6LNRiLYr/aqbHXNedw=="
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.2.tgz",
+      "integrity": "sha512-ekY1NhRzq0B08g4bGuX4wd2jZx5GnKz6mKSqFL4nqBlfyMGiG10gDFhDTMEfYmDL6Jy0FUIZp7wiRB+0BP7J2g=="
     },
     "node_modules/undertaker": {
       "version": "1.3.0",
@@ -53719,9 +53719,9 @@
       "dev": true
     },
     "underscore": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.11.0.tgz",
-      "integrity": "sha512-xY96SsN3NA461qIRKZ/+qox37YXPtSBswMGfiNptr+wrt6ds4HaMw23TP612fEyGekRE6LNRiLYr/aqbHXNedw=="
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.2.tgz",
+      "integrity": "sha512-ekY1NhRzq0B08g4bGuX4wd2jZx5GnKz6mKSqFL4nqBlfyMGiG10gDFhDTMEfYmDL6Jy0FUIZp7wiRB+0BP7J2g=="
     },
     "undertaker": {
       "version": "1.3.0",

From 8e5e7e9d77ca1975b5cb355b780c71c87c8e1b5d Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 31 Mar 2022 13:36:00 +0200
Subject: [PATCH 0876/1008] MOBILE-3833 security: Update ssri

---
 package-lock.json | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 77a83e632..02061875b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20317,9 +20317,9 @@
       }
     },
     "node_modules/make-fetch-happen/node_modules/ssri": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz",
+      "integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==",
       "dev": true,
       "dependencies": {
         "figgy-pudding": "^3.5.1"
@@ -22655,9 +22655,9 @@
       }
     },
     "node_modules/pacote/node_modules/ssri": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz",
+      "integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==",
       "dev": true,
       "dependencies": {
         "figgy-pudding": "^3.5.1"
@@ -30502,9 +30502,9 @@
       }
     },
     "node_modules/webpack/node_modules/ssri": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz",
+      "integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==",
       "dev": true,
       "dependencies": {
         "figgy-pudding": "^3.5.1"
@@ -46769,9 +46769,9 @@
           }
         },
         "ssri": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-          "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz",
+          "integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==",
           "dev": true,
           "requires": {
             "figgy-pudding": "^3.5.1"
@@ -48663,9 +48663,9 @@
           "dev": true
         },
         "ssri": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-          "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz",
+          "integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==",
           "dev": true,
           "requires": {
             "figgy-pudding": "^3.5.1"
@@ -54590,9 +54590,9 @@
           "dev": true
         },
         "ssri": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-          "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz",
+          "integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==",
           "dev": true,
           "requires": {
             "figgy-pudding": "^3.5.1"

From ce5aa5f0640a6c5cd3c34a53f5a01c5a01903dad Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 31 Mar 2022 13:36:27 +0200
Subject: [PATCH 0877/1008] MOBILE-3833 security: Update simple-get

---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 02061875b..30f8f9260 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -26414,9 +26414,9 @@
       "optional": true
     },
     "node_modules/simple-get": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz",
-      "integrity": "sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.1.tgz",
+      "integrity": "sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==",
       "optional": true,
       "dependencies": {
         "decompress-response": "^4.2.0",
@@ -51714,9 +51714,9 @@
       "optional": true
     },
     "simple-get": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz",
-      "integrity": "sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.1.tgz",
+      "integrity": "sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==",
       "optional": true,
       "requires": {
         "decompress-response": "^4.2.0",

From 4a55e65e603a242a12e9864f6e9ec682ce5ea39d Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 31 Mar 2022 13:42:26 +0200
Subject: [PATCH 0878/1008] MOBILE-3833 security: Update simctl

---
 package-lock.json | 66 +++++++++++++++++++++++++----------------------
 1 file changed, 35 insertions(+), 31 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 30f8f9260..0d60e4ef9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17121,7 +17121,6 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
       "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
-      "dev": true,
       "engines": {
         "node": ">= 0.10"
       }
@@ -24807,7 +24806,6 @@
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
       "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
-      "dev": true,
       "dependencies": {
         "resolve": "^1.1.6"
       },
@@ -26338,6 +26336,22 @@
         "node": ">=8"
       }
     },
+    "node_modules/shelljs": {
+      "version": "0.8.5",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz",
+      "integrity": "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==",
+      "dependencies": {
+        "glob": "^7.0.0",
+        "interpret": "^1.0.0",
+        "rechoir": "^0.6.2"
+      },
+      "bin": {
+        "shjs": "bin/shjs"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/shellwords": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
@@ -26374,25 +26388,14 @@
       "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
     },
     "node_modules/simctl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/simctl/-/simctl-2.0.0.tgz",
-      "integrity": "sha512-5rB7rN4N3b0z0nFdy9eczVssXqrv2aAgdVRksPVqVoiDtvXmfzNvebp3EMdId2sAUzXIflarQlx4P0hjVQEzKQ==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/simctl/-/simctl-2.0.3.tgz",
+      "integrity": "sha512-kKCak0yszxHae5eVWcmrjV3ouUGac3sjlhjdLWpyPu4eiQcWoHsCrqS34kkgzHN8Ystqkh/LFjzrldk/g3BYJg==",
       "dependencies": {
-        "shelljs": "^0.2.6",
+        "shelljs": "^0.8.5",
         "tail": "^0.4.0"
       }
     },
-    "node_modules/simctl/node_modules/shelljs": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz",
-      "integrity": "sha1-kEktcv/MgVmXa6umL7D2iE8MM3g=",
-      "bin": {
-        "shjs": "bin/shjs"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/simple-concat": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
@@ -44302,8 +44305,7 @@
     "interpret": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
-      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
-      "dev": true
+      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA=="
     },
     "invariant": {
       "version": "2.2.4",
@@ -50449,7 +50451,6 @@
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
       "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
-      "dev": true,
       "requires": {
         "resolve": "^1.1.6"
       }
@@ -51660,6 +51661,16 @@
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
     },
+    "shelljs": {
+      "version": "0.8.5",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz",
+      "integrity": "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==",
+      "requires": {
+        "glob": "^7.0.0",
+        "interpret": "^1.0.0",
+        "rechoir": "^0.6.2"
+      }
+    },
     "shellwords": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
@@ -51692,19 +51703,12 @@
       "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
     },
     "simctl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/simctl/-/simctl-2.0.0.tgz",
-      "integrity": "sha512-5rB7rN4N3b0z0nFdy9eczVssXqrv2aAgdVRksPVqVoiDtvXmfzNvebp3EMdId2sAUzXIflarQlx4P0hjVQEzKQ==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/simctl/-/simctl-2.0.3.tgz",
+      "integrity": "sha512-kKCak0yszxHae5eVWcmrjV3ouUGac3sjlhjdLWpyPu4eiQcWoHsCrqS34kkgzHN8Ystqkh/LFjzrldk/g3BYJg==",
       "requires": {
-        "shelljs": "^0.2.6",
+        "shelljs": "^0.8.5",
         "tail": "^0.4.0"
-      },
-      "dependencies": {
-        "shelljs": {
-          "version": "0.2.6",
-          "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz",
-          "integrity": "sha1-kEktcv/MgVmXa6umL7D2iE8MM3g="
-        }
       }
     },
     "simple-concat": {

From a72f2ac43b55c02ea53392d2aa5329167436ce8f Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 31 Mar 2022 13:49:50 +0200
Subject: [PATCH 0879/1008] MOBILE-3833 security: Update @ionic/cli

---
 package-lock.json | 549 +++++++++++++++++++++++++---------------------
 package.json      |   4 +-
 2 files changed, 296 insertions(+), 257 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0d60e4ef9..19149dead 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -108,7 +108,7 @@
         "@angular/compiler-cli": "10.0.14",
         "@angular/language-service": "10.0.14",
         "@ionic/angular-toolkit": "2.3.3",
-        "@ionic/cli": "6.14.1",
+        "@ionic/cli": "6.19.0",
         "@types/faker": "5.1.3",
         "@types/node": "12.12.64",
         "@types/resize-observer-browser": "0.1.5",
@@ -3629,20 +3629,20 @@
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
     },
     "node_modules/@ionic/cli": {
-      "version": "6.14.1",
-      "resolved": "https://registry.npmjs.org/@ionic/cli/-/cli-6.14.1.tgz",
-      "integrity": "sha512-QGmA5hjW4PvS8o0f+ptJ2bOknu4dPKzlECFApBiR7ayDgGTDMwmbxrtNpRhDnjdsVlMAzWq8eo9l76831+DBjQ==",
+      "version": "6.19.0",
+      "resolved": "https://registry.npmjs.org/@ionic/cli/-/cli-6.19.0.tgz",
+      "integrity": "sha512-JBseXBFRg6voCTg47HDLdrJCQFflqrlbv1f15MMPe1HtrHNY/q8U0QQdYnwWwiAMBUYMo6wrCbyXkoso4UdSKQ==",
       "dev": true,
       "dependencies": {
-        "@ionic/cli-framework": "5.1.0",
-        "@ionic/cli-framework-output": "2.2.2",
+        "@ionic/cli-framework": "5.1.1",
+        "@ionic/cli-framework-output": "2.2.3",
         "@ionic/cli-framework-prompts": "2.1.8",
         "@ionic/utils-array": "2.1.5",
         "@ionic/utils-fs": "3.1.5",
         "@ionic/utils-network": "2.1.5",
         "@ionic/utils-process": "2.1.8",
         "@ionic/utils-stream": "3.1.5",
-        "@ionic/utils-subprocess": "2.1.8",
+        "@ionic/utils-subprocess": "2.1.9",
         "@ionic/utils-terminal": "2.3.1",
         "chalk": "^4.0.0",
         "debug": "^4.0.0",
@@ -3657,7 +3657,7 @@
         "ssh-config": "^1.1.1",
         "stream-combiner2": "^1.1.1",
         "superagent": "^5.2.1",
-        "superagent-proxy": "^2.0.0",
+        "superagent-proxy": "^3.0.0",
         "tar": "^6.0.1",
         "tslib": "^2.0.1"
       },
@@ -3669,18 +3669,18 @@
       }
     },
     "node_modules/@ionic/cli-framework": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-5.1.0.tgz",
-      "integrity": "sha512-Hb/P2zuHB3zQZN0qG7Lxda8IlP2mHisfb0KR+wc9cw2BSiH+rtXRd/A4JxndPznjWs00PHbWiEm0Ehas2pA/nw==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-5.1.1.tgz",
+      "integrity": "sha512-cew3/WamnRs7ddv5GShyruaaNH3wHWMPjvGnb0ePa0d9uPR4FM5nuWlQMb8vDz8wuJ2QHj6lAp9Isc7qh1zaPA==",
       "dev": true,
       "dependencies": {
-        "@ionic/cli-framework-output": "2.2.2",
+        "@ionic/cli-framework-output": "2.2.3",
         "@ionic/utils-array": "2.1.5",
         "@ionic/utils-fs": "3.1.5",
         "@ionic/utils-object": "2.1.5",
         "@ionic/utils-process": "2.1.8",
         "@ionic/utils-stream": "3.1.5",
-        "@ionic/utils-subprocess": "2.1.8",
+        "@ionic/utils-subprocess": "2.1.9",
         "@ionic/utils-terminal": "2.3.1",
         "chalk": "^4.0.0",
         "debug": "^4.0.0",
@@ -3695,9 +3695,9 @@
       }
     },
     "node_modules/@ionic/cli-framework-output": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/@ionic/cli-framework-output/-/cli-framework-output-2.2.2.tgz",
-      "integrity": "sha512-eQYkqIW1/tCwSC6Bd0gjse96U11lDX/ikf3jvsjX7a8z/zwSmGzCHRizb7xogV65Ey+1/zyAZR71cpDRQuFLBQ==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/@ionic/cli-framework-output/-/cli-framework-output-2.2.3.tgz",
+      "integrity": "sha512-Ok0DuQseeyEQnpq1eIE9Wt2oy80qmsprmQYu4bMeiaggbXTmzdf0wa+2CIRrAy1Mzh7Lnz95AI4KyYl3h+97GQ==",
       "dev": true,
       "dependencies": {
         "@ionic/utils-terminal": "2.3.1",
@@ -3709,9 +3709,9 @@
       }
     },
     "node_modules/@ionic/cli-framework-output/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
       "dependencies": {
         "ms": "2.1.2"
@@ -3954,9 +3954,9 @@
       }
     },
     "node_modules/@ionic/cli-framework/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -3970,9 +3970,9 @@
       }
     },
     "node_modules/@ionic/cli-framework/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
       "dependencies": {
         "ms": "2.1.2"
@@ -4055,9 +4055,9 @@
       }
     },
     "node_modules/@ionic/utils-array/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
       "dependencies": {
         "ms": "2.1.2"
@@ -4164,9 +4164,9 @@
       }
     },
     "node_modules/@ionic/utils-object/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
       "dependencies": {
         "ms": "2.1.2"
@@ -4204,9 +4204,9 @@
       }
     },
     "node_modules/@ionic/utils-process/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
       "dependencies": {
         "ms": "2.1.2"
@@ -4240,9 +4240,9 @@
       }
     },
     "node_modules/@ionic/utils-stream/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
       "dependencies": {
         "ms": "2.1.2"
@@ -4263,9 +4263,9 @@
       "dev": true
     },
     "node_modules/@ionic/utils-subprocess": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-2.1.8.tgz",
-      "integrity": "sha512-pkmtf1LtXcEMPn6/cctREL2aZtZoy0+0Sl+nT0NIkOHIoBUcqrcfMWdctCSM4Mp6+2/hLWtgpHE3TOIibkWfIg==",
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-2.1.9.tgz",
+      "integrity": "sha512-OZ4QKyFOoC3+NCcBW8tvDUdLzWqOMKZPpzOQR009xVsfGbT3LwV8h60os7VRAbRV2KrA7t6YMMDrMQYV5DS+DQ==",
       "dev": true,
       "dependencies": {
         "@ionic/utils-array": "2.1.5",
@@ -4273,7 +4273,7 @@
         "@ionic/utils-process": "2.1.8",
         "@ionic/utils-stream": "3.1.5",
         "@ionic/utils-terminal": "2.3.1",
-        "cross-spawn": "^7.0.0",
+        "cross-spawn": "^7.0.3",
         "debug": "^4.0.0",
         "tslib": "^2.0.1"
       },
@@ -4282,9 +4282,9 @@
       }
     },
     "node_modules/@ionic/utils-subprocess/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
       "dependencies": {
         "ms": "2.1.2"
@@ -6935,15 +6935,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array-includes/node_modules/object-inspect": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.2.tgz",
-      "integrity": "sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/array-includes/node_modules/object.assign": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
@@ -10124,9 +10115,9 @@
       "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
     },
     "node_modules/cookiejar": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz",
-      "integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.3.tgz",
+      "integrity": "sha512-JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ==",
       "dev": true
     },
     "node_modules/copy-concurrently": {
@@ -12295,14 +12286,15 @@
       }
     },
     "node_modules/degenerator": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-2.2.0.tgz",
-      "integrity": "sha512-aiQcQowF01RxFI4ZLFMpzyotbQonhNpBao6dkI8JPk5a+hmSjR5ErHp2CQySmQe8os3VBqLCIh87nDBgZXvsmg==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-3.0.2.tgz",
+      "integrity": "sha512-c0mef3SNQo56t6urUU6tdQAs+ThoD0o9B9MJ8HEt7NQcGEILCRFqQb7ZbP9JAv+QF1Ky5plydhMR/IrqWDm+TQ==",
       "dev": true,
       "dependencies": {
         "ast-types": "^0.13.2",
         "escodegen": "^1.8.1",
-        "esprima": "^4.0.0"
+        "esprima": "^4.0.0",
+        "vm2": "^3.9.8"
       },
       "engines": {
         "node": ">= 6"
@@ -14156,9 +14148,9 @@
       "dev": true
     },
     "node_modules/fast-safe-stringify": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz",
-      "integrity": "sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
+      "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
       "dev": true
     },
     "node_modules/fastq": {
@@ -14647,9 +14639,9 @@
       }
     },
     "node_modules/formidable": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.2.tgz",
-      "integrity": "sha512-V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.6.tgz",
+      "integrity": "sha512-KcpbcpuLNOwrEjnbpMC0gS+X8ciDoZE1kkqzat4a8vrprf+s9pKNQ/QIwWfbfs4ltgmFl3MD177SNTkve3BwGQ==",
       "deprecated": "Please upgrade to latest, formidable@v2 or formidable@v3! Check these notes: https://bit.ly/2ZEqIau",
       "dev": true,
       "funding": {
@@ -14955,9 +14947,9 @@
       }
     },
     "node_modules/get-uri/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
       "dependencies": {
         "ms": "2.1.2"
@@ -21756,9 +21748,9 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
-      "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==",
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
+      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
       "dev": true,
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -22336,9 +22328,9 @@
       }
     },
     "node_modules/pac-proxy-agent": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-4.1.0.tgz",
-      "integrity": "sha512-ejNgYm2HTXSIYX9eFlkvqFp8hyJ374uDf0Zq5YUAifiSh1D6fo+iBivQZirGvVv8dCYUsLhmLBRhlAYvBKI5+Q==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-CcFG3ZtnxO8McDigozwE3AqAw15zDvGH+OjXO4kzf7IkEKkQ4gxQ+3sdF50WmhQ4P/bVusXcqNE2S3XrNURwzQ==",
       "dev": true,
       "dependencies": {
         "@tootallnate/once": "1",
@@ -22347,12 +22339,12 @@
         "get-uri": "3",
         "http-proxy-agent": "^4.0.1",
         "https-proxy-agent": "5",
-        "pac-resolver": "^4.1.0",
+        "pac-resolver": "^5.0.0",
         "raw-body": "^2.2.0",
         "socks-proxy-agent": "5"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">= 8"
       }
     },
     "node_modules/pac-proxy-agent/node_modules/agent-base": {
@@ -22368,9 +22360,9 @@
       }
     },
     "node_modules/pac-proxy-agent/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
       "dependencies": {
         "ms": "2.1.2"
@@ -22418,12 +22410,12 @@
       "dev": true
     },
     "node_modules/pac-proxy-agent/node_modules/socks-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ==",
       "dev": true,
       "dependencies": {
-        "agent-base": "6",
+        "agent-base": "^6.0.2",
         "debug": "4",
         "socks": "^2.3.3"
       },
@@ -22432,17 +22424,17 @@
       }
     },
     "node_modules/pac-resolver": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-4.2.0.tgz",
-      "integrity": "sha512-rPACZdUyuxT5Io/gFKUeeZFfE5T7ve7cAkE5TUZRRfuKP0u5Hocwe48X7ZEm6mYB+bTB0Qf+xlVlA/RM/i6RCQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-5.0.0.tgz",
+      "integrity": "sha512-H+/A6KitiHNNW+bxBKREk2MCGSxljfqRX76NjummWEYIat7ldVXRU3dhRIE3iXZ0nvGBk6smv3nntxKkzRL8NA==",
       "dev": true,
       "dependencies": {
-        "degenerator": "^2.2.0",
+        "degenerator": "^3.0.1",
         "ip": "^1.1.5",
         "netmask": "^2.0.1"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">= 8"
       }
     },
     "node_modules/package-json": {
@@ -24295,9 +24287,9 @@
       }
     },
     "node_modules/proxy-agent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-4.0.1.tgz",
-      "integrity": "sha512-ODnQnW2jc/FUVwHHuaZEfN5otg/fMbvMxz9nMSUQfJ9JU7q2SZvSULSsjLloVgJOiv9yhc8GlNMKc4GkFmcVEA==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-gkH7BkvLVkSfX9Dk27W6TyNOWWZWRilRfk1XxGNWOYJ2TuedAv1yFpCaU9QSBmBe716XOTNpYNOzhysyw8xn7g==",
       "dev": true,
       "dependencies": {
         "agent-base": "^6.0.0",
@@ -24305,12 +24297,12 @@
         "http-proxy-agent": "^4.0.0",
         "https-proxy-agent": "^5.0.0",
         "lru-cache": "^5.1.1",
-        "pac-proxy-agent": "^4.1.0",
+        "pac-proxy-agent": "^5.0.0",
         "proxy-from-env": "^1.0.0",
         "socks-proxy-agent": "^5.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">= 8"
       }
     },
     "node_modules/proxy-agent/node_modules/agent-base": {
@@ -24326,9 +24318,9 @@
       }
     },
     "node_modules/proxy-agent/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
       "dependencies": {
         "ms": "2.1.2"
@@ -24385,12 +24377,12 @@
       "dev": true
     },
     "node_modules/proxy-agent/node_modules/socks-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ==",
       "dev": true,
       "dependencies": {
-        "agent-base": "6",
+        "agent-base": "^6.0.2",
         "debug": "4",
         "socks": "^2.3.3"
       },
@@ -26373,15 +26365,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/side-channel/node_modules/object-inspect": {
-      "version": "1.10.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz",
-      "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/signal-exit": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
@@ -27673,7 +27656,7 @@
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/superagent/-/superagent-5.3.1.tgz",
       "integrity": "sha512-wjJ/MoTid2/RuGCOFtlacyGNxN9QLMgcpYLDQlWFIhhdJ93kNscFonGvrpAHSCVjRVj++DGCglocF7Aej1KHvQ==",
-      "deprecated": "Please upgrade to v7.0.2+ of superagent.  We have fixed numerous issues with streams, form-data, attach(), filesystem errors not bubbling up (ENOENT on attach()), and all tests are now passing.  See the releases tab for more information at <https://github.com/visionmedia/superagent/releases>. Thanks to @shadowgate15, @spence-s, and @niftylettuce. Superagent is sponsored by Forward Email at <https://forwardemail.net>.",
+      "deprecated": "Please upgrade to v7.0.2+ of superagent.  We have fixed numerous issues with streams, form-data, attach(), filesystem errors not bubbling up (ENOENT on attach()), and all tests are now passing.  See the releases tab for more information at <https://github.com/visionmedia/superagent/releases>.",
       "dev": true,
       "dependencies": {
         "component-emitter": "^1.3.0",
@@ -27693,13 +27676,13 @@
       }
     },
     "node_modules/superagent-proxy": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/superagent-proxy/-/superagent-proxy-2.1.0.tgz",
-      "integrity": "sha512-DnarpKN6Xn8e3pYlFV4Yvsj9yxLY4q5FIsUe5JvN7vjzP+YCfzXv03dTkZSD2yzrSadsNYHf0IgOUJwKjX457A==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/superagent-proxy/-/superagent-proxy-3.0.0.tgz",
+      "integrity": "sha512-wAlRInOeDFyd9pyonrkJspdRAxdLrcsZ6aSnS+8+nu4x1aXbz6FWSTT9M6Ibze+eG60szlL7JA8wEIV7bPWuyQ==",
       "dev": true,
       "dependencies": {
-        "debug": "^3.1.0",
-        "proxy-agent": "^4.0.0"
+        "debug": "^4.3.2",
+        "proxy-agent": "^5.0.0"
       },
       "engines": {
         "node": ">=6"
@@ -27709,24 +27692,32 @@
       }
     },
     "node_modules/superagent-proxy/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
       "dependencies": {
-        "ms": "^2.1.1"
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
     "node_modules/superagent-proxy/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
       "dev": true
     },
     "node_modules/superagent/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
       "dependencies": {
         "ms": "2.1.2"
@@ -27755,9 +27746,9 @@
       }
     },
     "node_modules/superagent/node_modules/mime": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
-      "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
+      "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
       "dev": true,
       "bin": {
         "mime": "cli.js"
@@ -27773,9 +27764,9 @@
       "dev": true
     },
     "node_modules/superagent/node_modules/qs": {
-      "version": "6.10.1",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz",
-      "integrity": "sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==",
+      "version": "6.10.3",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
+      "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
       "dev": true,
       "dependencies": {
         "side-channel": "^1.0.4"
@@ -29614,6 +29605,43 @@
       "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
       "dev": true
     },
+    "node_modules/vm2": {
+      "version": "3.9.9",
+      "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.9.tgz",
+      "integrity": "sha512-xwTm7NLh/uOjARRBs8/95H0e8fT3Ukw5D/JJWhxMbhKzNh1Nu981jQKvkep9iKYNxzlVrdzD0mlBGkDKZWprlw==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^8.7.0",
+        "acorn-walk": "^8.2.0"
+      },
+      "bin": {
+        "vm2": "bin/vm2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
+    "node_modules/vm2/node_modules/acorn": {
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
+      "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/vm2/node_modules/acorn-walk": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
+      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/w3c-hr-time": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
@@ -33774,20 +33802,20 @@
       }
     },
     "@ionic/cli": {
-      "version": "6.14.1",
-      "resolved": "https://registry.npmjs.org/@ionic/cli/-/cli-6.14.1.tgz",
-      "integrity": "sha512-QGmA5hjW4PvS8o0f+ptJ2bOknu4dPKzlECFApBiR7ayDgGTDMwmbxrtNpRhDnjdsVlMAzWq8eo9l76831+DBjQ==",
+      "version": "6.19.0",
+      "resolved": "https://registry.npmjs.org/@ionic/cli/-/cli-6.19.0.tgz",
+      "integrity": "sha512-JBseXBFRg6voCTg47HDLdrJCQFflqrlbv1f15MMPe1HtrHNY/q8U0QQdYnwWwiAMBUYMo6wrCbyXkoso4UdSKQ==",
       "dev": true,
       "requires": {
-        "@ionic/cli-framework": "5.1.0",
-        "@ionic/cli-framework-output": "2.2.2",
+        "@ionic/cli-framework": "5.1.1",
+        "@ionic/cli-framework-output": "2.2.3",
         "@ionic/cli-framework-prompts": "2.1.8",
         "@ionic/utils-array": "2.1.5",
         "@ionic/utils-fs": "3.1.5",
         "@ionic/utils-network": "2.1.5",
         "@ionic/utils-process": "2.1.8",
         "@ionic/utils-stream": "3.1.5",
-        "@ionic/utils-subprocess": "2.1.8",
+        "@ionic/utils-subprocess": "2.1.9",
         "@ionic/utils-terminal": "2.3.1",
         "chalk": "^4.0.0",
         "debug": "^4.0.0",
@@ -33802,7 +33830,7 @@
         "ssh-config": "^1.1.1",
         "stream-combiner2": "^1.1.1",
         "superagent": "^5.2.1",
-        "superagent-proxy": "^2.0.0",
+        "superagent-proxy": "^3.0.0",
         "tar": "^6.0.1",
         "tslib": "^2.0.1"
       },
@@ -33835,18 +33863,18 @@
       }
     },
     "@ionic/cli-framework": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-5.1.0.tgz",
-      "integrity": "sha512-Hb/P2zuHB3zQZN0qG7Lxda8IlP2mHisfb0KR+wc9cw2BSiH+rtXRd/A4JxndPznjWs00PHbWiEm0Ehas2pA/nw==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-5.1.1.tgz",
+      "integrity": "sha512-cew3/WamnRs7ddv5GShyruaaNH3wHWMPjvGnb0ePa0d9uPR4FM5nuWlQMb8vDz8wuJ2QHj6lAp9Isc7qh1zaPA==",
       "dev": true,
       "requires": {
-        "@ionic/cli-framework-output": "2.2.2",
+        "@ionic/cli-framework-output": "2.2.3",
         "@ionic/utils-array": "2.1.5",
         "@ionic/utils-fs": "3.1.5",
         "@ionic/utils-object": "2.1.5",
         "@ionic/utils-process": "2.1.8",
         "@ionic/utils-stream": "3.1.5",
-        "@ionic/utils-subprocess": "2.1.8",
+        "@ionic/utils-subprocess": "2.1.9",
         "@ionic/utils-terminal": "2.3.1",
         "chalk": "^4.0.0",
         "debug": "^4.0.0",
@@ -33858,9 +33886,9 @@
       },
       "dependencies": {
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -33868,9 +33896,9 @@
           }
         },
         "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
           "dev": true,
           "requires": {
             "ms": "2.1.2"
@@ -33885,9 +33913,9 @@
       }
     },
     "@ionic/cli-framework-output": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/@ionic/cli-framework-output/-/cli-framework-output-2.2.2.tgz",
-      "integrity": "sha512-eQYkqIW1/tCwSC6Bd0gjse96U11lDX/ikf3jvsjX7a8z/zwSmGzCHRizb7xogV65Ey+1/zyAZR71cpDRQuFLBQ==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/@ionic/cli-framework-output/-/cli-framework-output-2.2.3.tgz",
+      "integrity": "sha512-Ok0DuQseeyEQnpq1eIE9Wt2oy80qmsprmQYu4bMeiaggbXTmzdf0wa+2CIRrAy1Mzh7Lnz95AI4KyYl3h+97GQ==",
       "dev": true,
       "requires": {
         "@ionic/utils-terminal": "2.3.1",
@@ -33896,9 +33924,9 @@
       },
       "dependencies": {
         "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
           "dev": true,
           "requires": {
             "ms": "2.1.2"
@@ -34097,9 +34125,9 @@
       },
       "dependencies": {
         "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
           "dev": true,
           "requires": {
             "ms": "2.1.2"
@@ -34179,9 +34207,9 @@
       },
       "dependencies": {
         "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
           "dev": true,
           "requires": {
             "ms": "2.1.2"
@@ -34210,9 +34238,9 @@
       },
       "dependencies": {
         "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
           "dev": true,
           "requires": {
             "ms": "2.1.2"
@@ -34237,9 +34265,9 @@
       },
       "dependencies": {
         "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
           "dev": true,
           "requires": {
             "ms": "2.1.2"
@@ -34254,9 +34282,9 @@
       }
     },
     "@ionic/utils-subprocess": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-2.1.8.tgz",
-      "integrity": "sha512-pkmtf1LtXcEMPn6/cctREL2aZtZoy0+0Sl+nT0NIkOHIoBUcqrcfMWdctCSM4Mp6+2/hLWtgpHE3TOIibkWfIg==",
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-2.1.9.tgz",
+      "integrity": "sha512-OZ4QKyFOoC3+NCcBW8tvDUdLzWqOMKZPpzOQR009xVsfGbT3LwV8h60os7VRAbRV2KrA7t6YMMDrMQYV5DS+DQ==",
       "dev": true,
       "requires": {
         "@ionic/utils-array": "2.1.5",
@@ -34264,15 +34292,15 @@
         "@ionic/utils-process": "2.1.8",
         "@ionic/utils-stream": "3.1.5",
         "@ionic/utils-terminal": "2.3.1",
-        "cross-spawn": "^7.0.0",
+        "cross-spawn": "^7.0.3",
         "debug": "^4.0.0",
         "tslib": "^2.0.1"
       },
       "dependencies": {
         "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
           "dev": true,
           "requires": {
             "ms": "2.1.2"
@@ -36313,12 +36341,6 @@
             "has-symbols": "^1.0.1"
           }
         },
-        "object-inspect": {
-          "version": "1.10.2",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.2.tgz",
-          "integrity": "sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA==",
-          "dev": true
-        },
         "object.assign": {
           "version": "4.1.2",
           "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
@@ -38847,9 +38869,9 @@
       "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
     },
     "cookiejar": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz",
-      "integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.3.tgz",
+      "integrity": "sha512-JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ==",
       "dev": true
     },
     "copy-concurrently": {
@@ -40428,14 +40450,15 @@
       }
     },
     "degenerator": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-2.2.0.tgz",
-      "integrity": "sha512-aiQcQowF01RxFI4ZLFMpzyotbQonhNpBao6dkI8JPk5a+hmSjR5ErHp2CQySmQe8os3VBqLCIh87nDBgZXvsmg==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-3.0.2.tgz",
+      "integrity": "sha512-c0mef3SNQo56t6urUU6tdQAs+ThoD0o9B9MJ8HEt7NQcGEILCRFqQb7ZbP9JAv+QF1Ky5plydhMR/IrqWDm+TQ==",
       "dev": true,
       "requires": {
         "ast-types": "^0.13.2",
         "escodegen": "^1.8.1",
-        "esprima": "^4.0.0"
+        "esprima": "^4.0.0",
+        "vm2": "^3.9.8"
       }
     },
     "del": {
@@ -41915,9 +41938,9 @@
       "dev": true
     },
     "fast-safe-stringify": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz",
-      "integrity": "sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
+      "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
       "dev": true
     },
     "fastq": {
@@ -42296,9 +42319,9 @@
       }
     },
     "formidable": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.2.tgz",
-      "integrity": "sha512-V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.6.tgz",
+      "integrity": "sha512-KcpbcpuLNOwrEjnbpMC0gS+X8ciDoZE1kkqzat4a8vrprf+s9pKNQ/QIwWfbfs4ltgmFl3MD177SNTkve3BwGQ==",
       "dev": true
     },
     "forwarded": {
@@ -42542,9 +42565,9 @@
       },
       "dependencies": {
         "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
           "dev": true,
           "requires": {
             "ms": "2.1.2"
@@ -47961,9 +47984,9 @@
       }
     },
     "object-inspect": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
-      "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==",
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
+      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
       "dev": true
     },
     "object-is": {
@@ -48398,9 +48421,9 @@
       "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
     },
     "pac-proxy-agent": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-4.1.0.tgz",
-      "integrity": "sha512-ejNgYm2HTXSIYX9eFlkvqFp8hyJ374uDf0Zq5YUAifiSh1D6fo+iBivQZirGvVv8dCYUsLhmLBRhlAYvBKI5+Q==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-CcFG3ZtnxO8McDigozwE3AqAw15zDvGH+OjXO4kzf7IkEKkQ4gxQ+3sdF50WmhQ4P/bVusXcqNE2S3XrNURwzQ==",
       "dev": true,
       "requires": {
         "@tootallnate/once": "1",
@@ -48409,7 +48432,7 @@
         "get-uri": "3",
         "http-proxy-agent": "^4.0.1",
         "https-proxy-agent": "5",
-        "pac-resolver": "^4.1.0",
+        "pac-resolver": "^5.0.0",
         "raw-body": "^2.2.0",
         "socks-proxy-agent": "5"
       },
@@ -48424,9 +48447,9 @@
           }
         },
         "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
           "dev": true,
           "requires": {
             "ms": "2.1.2"
@@ -48460,12 +48483,12 @@
           "dev": true
         },
         "socks-proxy-agent": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz",
-          "integrity": "sha512-lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA==",
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz",
+          "integrity": "sha512-vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ==",
           "dev": true,
           "requires": {
-            "agent-base": "6",
+            "agent-base": "^6.0.2",
             "debug": "4",
             "socks": "^2.3.3"
           }
@@ -48473,12 +48496,12 @@
       }
     },
     "pac-resolver": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-4.2.0.tgz",
-      "integrity": "sha512-rPACZdUyuxT5Io/gFKUeeZFfE5T7ve7cAkE5TUZRRfuKP0u5Hocwe48X7ZEm6mYB+bTB0Qf+xlVlA/RM/i6RCQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-5.0.0.tgz",
+      "integrity": "sha512-H+/A6KitiHNNW+bxBKREk2MCGSxljfqRX76NjummWEYIat7ldVXRU3dhRIE3iXZ0nvGBk6smv3nntxKkzRL8NA==",
       "dev": true,
       "requires": {
-        "degenerator": "^2.2.0",
+        "degenerator": "^3.0.1",
         "ip": "^1.1.5",
         "netmask": "^2.0.1"
       }
@@ -50024,9 +50047,9 @@
       }
     },
     "proxy-agent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-4.0.1.tgz",
-      "integrity": "sha512-ODnQnW2jc/FUVwHHuaZEfN5otg/fMbvMxz9nMSUQfJ9JU7q2SZvSULSsjLloVgJOiv9yhc8GlNMKc4GkFmcVEA==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-gkH7BkvLVkSfX9Dk27W6TyNOWWZWRilRfk1XxGNWOYJ2TuedAv1yFpCaU9QSBmBe716XOTNpYNOzhysyw8xn7g==",
       "dev": true,
       "requires": {
         "agent-base": "^6.0.0",
@@ -50034,7 +50057,7 @@
         "http-proxy-agent": "^4.0.0",
         "https-proxy-agent": "^5.0.0",
         "lru-cache": "^5.1.1",
-        "pac-proxy-agent": "^4.1.0",
+        "pac-proxy-agent": "^5.0.0",
         "proxy-from-env": "^1.0.0",
         "socks-proxy-agent": "^5.0.0"
       },
@@ -50049,9 +50072,9 @@
           }
         },
         "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
           "dev": true,
           "requires": {
             "ms": "2.1.2"
@@ -50094,12 +50117,12 @@
           "dev": true
         },
         "socks-proxy-agent": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz",
-          "integrity": "sha512-lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA==",
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz",
+          "integrity": "sha512-vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ==",
           "dev": true,
           "requires": {
-            "agent-base": "6",
+            "agent-base": "^6.0.2",
             "debug": "4",
             "socks": "^2.3.3"
           }
@@ -51687,14 +51710,6 @@
         "call-bind": "^1.0.0",
         "get-intrinsic": "^1.0.2",
         "object-inspect": "^1.9.0"
-      },
-      "dependencies": {
-        "object-inspect": {
-          "version": "1.10.3",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz",
-          "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==",
-          "dev": true
-        }
       }
     },
     "signal-exit": {
@@ -52761,9 +52776,9 @@
       },
       "dependencies": {
         "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
           "dev": true,
           "requires": {
             "ms": "2.1.2"
@@ -52781,9 +52796,9 @@
           }
         },
         "mime": {
-          "version": "2.5.2",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
-          "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
+          "version": "2.6.0",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
+          "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
           "dev": true
         },
         "ms": {
@@ -52793,9 +52808,9 @@
           "dev": true
         },
         "qs": {
-          "version": "6.10.1",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz",
-          "integrity": "sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==",
+          "version": "6.10.3",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
+          "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
           "dev": true,
           "requires": {
             "side-channel": "^1.0.4"
@@ -52815,28 +52830,28 @@
       }
     },
     "superagent-proxy": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/superagent-proxy/-/superagent-proxy-2.1.0.tgz",
-      "integrity": "sha512-DnarpKN6Xn8e3pYlFV4Yvsj9yxLY4q5FIsUe5JvN7vjzP+YCfzXv03dTkZSD2yzrSadsNYHf0IgOUJwKjX457A==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/superagent-proxy/-/superagent-proxy-3.0.0.tgz",
+      "integrity": "sha512-wAlRInOeDFyd9pyonrkJspdRAxdLrcsZ6aSnS+8+nu4x1aXbz6FWSTT9M6Ibze+eG60szlL7JA8wEIV7bPWuyQ==",
       "dev": true,
       "requires": {
-        "debug": "^3.1.0",
-        "proxy-agent": "^4.0.0"
+        "debug": "^4.3.2",
+        "proxy-agent": "^5.0.0"
       },
       "dependencies": {
         "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.2"
           }
         },
         "ms": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         }
       }
@@ -54273,6 +54288,30 @@
       "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
       "dev": true
     },
+    "vm2": {
+      "version": "3.9.9",
+      "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.9.tgz",
+      "integrity": "sha512-xwTm7NLh/uOjARRBs8/95H0e8fT3Ukw5D/JJWhxMbhKzNh1Nu981jQKvkep9iKYNxzlVrdzD0mlBGkDKZWprlw==",
+      "dev": true,
+      "requires": {
+        "acorn": "^8.7.0",
+        "acorn-walk": "^8.2.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "8.7.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
+          "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+          "dev": true
+        },
+        "acorn-walk": {
+          "version": "8.2.0",
+          "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
+          "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
+          "dev": true
+        }
+      }
+    },
     "w3c-hr-time": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
diff --git a/package.json b/package.json
index 767ed5d13..4b6e6c6f5 100644
--- a/package.json
+++ b/package.json
@@ -137,7 +137,7 @@
     "@angular/compiler-cli": "10.0.14",
     "@angular/language-service": "10.0.14",
     "@ionic/angular-toolkit": "2.3.3",
-    "@ionic/cli": "6.14.1",
+    "@ionic/cli": "6.19.0",
     "@types/faker": "5.1.3",
     "@types/node": "12.12.64",
     "@types/resize-observer-browser": "0.1.5",
@@ -243,4 +243,4 @@
   "optionalDependencies": {
     "keytar": "7.2.0"
   }
-}
\ No newline at end of file
+}

From 677f70a7d8acf410c05c287d47da163c503e2676 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 31 Mar 2022 13:58:56 +0200
Subject: [PATCH 0880/1008] MOBILE-3833 security: Update lodash

---
 package-lock.json | 36 ++++++------------------------------
 1 file changed, 6 insertions(+), 30 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 19149dead..6238cbdc3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13392,12 +13392,6 @@
         }
       }
     },
-    "node_modules/eslint-plugin-jsdoc/node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
-    },
     "node_modules/eslint-plugin-jsdoc/node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -13574,12 +13568,6 @@
         "node": ">= 4"
       }
     },
-    "node_modules/eslint/node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
-    },
     "node_modules/eslint/node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -19918,9 +19906,9 @@
       }
     },
     "node_modules/lodash": {
-      "version": "4.17.20",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-      "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
     "node_modules/lodash._baseassign": {
       "version": "3.2.0",
@@ -41256,12 +41244,6 @@
           "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
           "dev": true
         },
-        "lodash": {
-          "version": "4.17.21",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-          "dev": true
-        },
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -41441,12 +41423,6 @@
             "ms": "2.1.2"
           }
         },
-        "lodash": {
-          "version": "4.17.21",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-          "dev": true
-        },
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -46452,9 +46428,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.20",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-      "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
     "lodash._baseassign": {
       "version": "3.2.0",

From 947e47a9dd26df38ab38a75400a677c5fc98170d Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 31 Mar 2022 14:01:53 +0200
Subject: [PATCH 0881/1008] MOBILE-3833 security: Update postcss-svgo

---
 package-lock.json | 47 ++++++-----------------------------------------
 1 file changed, 6 insertions(+), 41 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6238cbdc3..7d0eae612 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16294,12 +16294,6 @@
       "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg=",
       "dev": true
     },
-    "node_modules/html-comment-regex": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz",
-      "integrity": "sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==",
-      "dev": true
-    },
     "node_modules/html-encoding-sniffer": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
@@ -17695,18 +17689,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-svg": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz",
-      "integrity": "sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==",
-      "dev": true,
-      "dependencies": {
-        "html-comment-regex": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/is-symbol": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
@@ -23969,12 +23951,11 @@
       }
     },
     "node_modules/postcss-svgo": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz",
-      "integrity": "sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.3.tgz",
+      "integrity": "sha512-NoRbrcMWTtUghzuKSoIm6XV+sJdvZ7GZSc3wdBN0W19FTtp2ko8NqLsgoh/m9CzNhU3KLPvQmjIwtaNFkaFTvw==",
       "dev": true,
       "dependencies": {
-        "is-svg": "^3.0.0",
         "postcss": "^7.0.0",
         "postcss-value-parser": "^3.0.0",
         "svgo": "^1.0.0"
@@ -43640,12 +43621,6 @@
       "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg=",
       "dev": true
     },
-    "html-comment-regex": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz",
-      "integrity": "sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==",
-      "dev": true
-    },
     "html-encoding-sniffer": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
@@ -44726,15 +44701,6 @@
       "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==",
       "dev": true
     },
-    "is-svg": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz",
-      "integrity": "sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==",
-      "dev": true,
-      "requires": {
-        "html-comment-regex": "^1.1.0"
-      }
-    },
     "is-symbol": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
@@ -49842,12 +49808,11 @@
       }
     },
     "postcss-svgo": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz",
-      "integrity": "sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.3.tgz",
+      "integrity": "sha512-NoRbrcMWTtUghzuKSoIm6XV+sJdvZ7GZSc3wdBN0W19FTtp2ko8NqLsgoh/m9CzNhU3KLPvQmjIwtaNFkaFTvw==",
       "dev": true,
       "requires": {
-        "is-svg": "^3.0.0",
         "postcss": "^7.0.0",
         "postcss-value-parser": "^3.0.0",
         "svgo": "^1.0.0"

From 5e681629b9154699e7cd0859c724c1ce8ae38fe1 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 31 Mar 2022 14:08:02 +0200
Subject: [PATCH 0882/1008] MOBILE-3833 security: Update dns-packet

---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7d0eae612..689b619eb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12546,9 +12546,9 @@
       "dev": true
     },
     "node_modules/dns-packet": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
-      "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz",
+      "integrity": "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==",
       "dev": true,
       "dependencies": {
         "ip": "^1.1.0",
@@ -40627,9 +40627,9 @@
       "dev": true
     },
     "dns-packet": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
-      "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz",
+      "integrity": "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==",
       "dev": true,
       "requires": {
         "ip": "^1.1.0",

From 916fdb11f40dcd6bd6dc35343cd3853c034fcfc6 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 31 Mar 2022 14:09:12 +0200
Subject: [PATCH 0883/1008] MOBILE-3833 security: Update copy-props

---
 package-lock.json | 37 +++++++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 689b619eb..6dd42636c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10156,13 +10156,22 @@
       }
     },
     "node_modules/copy-props": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz",
-      "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.5.tgz",
+      "integrity": "sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw==",
       "dev": true,
       "dependencies": {
-        "each-props": "^1.3.0",
-        "is-plain-object": "^2.0.1"
+        "each-props": "^1.3.2",
+        "is-plain-object": "^5.0.0"
+      }
+    },
+    "node_modules/copy-props/node_modules/is-plain-object": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
     "node_modules/copy-webpack-plugin": {
@@ -38875,13 +38884,21 @@
       "dev": true
     },
     "copy-props": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz",
-      "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.5.tgz",
+      "integrity": "sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw==",
       "dev": true,
       "requires": {
-        "each-props": "^1.3.0",
-        "is-plain-object": "^2.0.1"
+        "each-props": "^1.3.2",
+        "is-plain-object": "^5.0.0"
+      },
+      "dependencies": {
+        "is-plain-object": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+          "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+          "dev": true
+        }
       }
     },
     "copy-webpack-plugin": {

From a4923e4b90622a503073dcb8cbd3ebc5936bfdde Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 31 Mar 2022 14:11:06 +0200
Subject: [PATCH 0884/1008] MOBILE-3833 security: Update ws

---
 package-lock.json | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6dd42636c..bd84cfb18 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3603,9 +3603,9 @@
       "dev": true
     },
     "node_modules/@ionic/angular-toolkit/node_modules/ws": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz",
-      "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==",
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz",
+      "integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==",
       "dev": true,
       "engines": {
         "node": ">=8.3.0"
@@ -19345,9 +19345,9 @@
       "dev": true
     },
     "node_modules/jsdom/node_modules/ws": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz",
-      "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==",
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz",
+      "integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==",
       "dev": true,
       "engines": {
         "node": ">=8.3.0"
@@ -30902,9 +30902,9 @@
       }
     },
     "node_modules/ws": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
-      "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
+      "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
       "dev": true,
       "dependencies": {
         "async-limiter": "~1.0.0"
@@ -33771,9 +33771,9 @@
           "dev": true
         },
         "ws": {
-          "version": "7.3.1",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz",
-          "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==",
+          "version": "7.5.7",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz",
+          "integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==",
           "dev": true,
           "requires": {}
         }
@@ -45977,9 +45977,9 @@
           "dev": true
         },
         "ws": {
-          "version": "7.3.1",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz",
-          "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==",
+          "version": "7.5.7",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz",
+          "integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==",
           "dev": true,
           "requires": {}
         }
@@ -55307,9 +55307,9 @@
       }
     },
     "ws": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
-      "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
+      "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
       "dev": true,
       "requires": {
         "async-limiter": "~1.0.0"

From 627c0891a80be257f35d5119b86ffcca18afcc7a Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 31 Mar 2022 14:14:55 +0200
Subject: [PATCH 0885/1008] MOBILE-3833 security: Update tmpl

---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bd84cfb18..544921620 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28462,9 +28462,9 @@
       }
     },
     "node_modules/tmpl": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
-      "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
+      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
       "dev": true
     },
     "node_modules/to-absolute-glob": {
@@ -53350,9 +53350,9 @@
       }
     },
     "tmpl": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
-      "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
+      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
       "dev": true
     },
     "to-absolute-glob": {

From b4c6be8f07dcc4b6cf101ba2282bd02f929e8c0c Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 31 Mar 2022 14:15:40 +0200
Subject: [PATCH 0886/1008] MOBILE-3833 security: Update node-notifier

---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 544921620..5836f02dd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21371,9 +21371,9 @@
       }
     },
     "node_modules/node-notifier": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.0.tgz",
-      "integrity": "sha512-46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.2.tgz",
+      "integrity": "sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==",
       "dev": true,
       "optional": true,
       "dependencies": {
@@ -47647,9 +47647,9 @@
       "dev": true
     },
     "node-notifier": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.0.tgz",
-      "integrity": "sha512-46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.2.tgz",
+      "integrity": "sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==",
       "dev": true,
       "optional": true,
       "requires": {

From 2e23df3fb01abd97de5d28c192ea88e4cce42e9e Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 31 Mar 2022 14:18:06 +0200
Subject: [PATCH 0887/1008] MOBILE-3833 security: Update jszip

---
 package-lock.json | 14 +++++++-------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5836f02dd..e25ffd60b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -85,7 +85,7 @@
         "core-js": "3.9.1",
         "es6-promise-plugin": "4.2.2",
         "hammerjs": "2.0.8",
-        "jszip": "3.5.0",
+        "jszip": "3.7.1",
         "mathjax": "2.7.7",
         "moment": "2.29.0",
         "nl.kingsquare.cordova.background-audio": "1.0.1",
@@ -19504,9 +19504,9 @@
       ]
     },
     "node_modules/jszip": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.5.0.tgz",
-      "integrity": "sha512-WRtu7TPCmYePR1nazfrtuF216cIVon/3GWOvHS9QR5bIwSbnxtdpma6un3jyGGNhHsKCSzn5Ypk+EkDRvTGiFA==",
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.7.1.tgz",
+      "integrity": "sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==",
       "dependencies": {
         "lie": "~3.3.0",
         "pako": "~1.0.2",
@@ -46097,9 +46097,9 @@
       }
     },
     "jszip": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.5.0.tgz",
-      "integrity": "sha512-WRtu7TPCmYePR1nazfrtuF216cIVon/3GWOvHS9QR5bIwSbnxtdpma6un3jyGGNhHsKCSzn5Ypk+EkDRvTGiFA==",
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.7.1.tgz",
+      "integrity": "sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==",
       "requires": {
         "lie": "~3.3.0",
         "pako": "~1.0.2",
diff --git a/package.json b/package.json
index 4b6e6c6f5..c7c684c1d 100644
--- a/package.json
+++ b/package.json
@@ -114,7 +114,7 @@
     "core-js": "3.9.1",
     "es6-promise-plugin": "4.2.2",
     "hammerjs": "2.0.8",
-    "jszip": "3.5.0",
+    "jszip": "3.7.1",
     "mathjax": "2.7.7",
     "moment": "2.29.0",
     "nl.kingsquare.cordova.background-audio": "1.0.1",

From 7d24e0dcd643aa7ce2110c14e22cf35b84bc39c4 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 31 Mar 2022 14:19:35 +0200
Subject: [PATCH 0888/1008] MOBILE-3833 security: Update jsprim

---
 package-lock.json | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e25ffd60b..2042c7836 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19394,9 +19394,9 @@
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
     },
     "node_modules/json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
+      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="
     },
     "node_modules/json-schema-traverse": {
       "version": "0.4.1",
@@ -19482,17 +19482,17 @@
       }
     },
     "node_modules/jsprim": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "engines": [
-        "node >=0.6.0"
-      ],
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
+      "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
       "dependencies": {
         "assert-plus": "1.0.0",
         "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
+        "json-schema": "0.4.0",
         "verror": "1.10.0"
+      },
+      "engines": {
+        "node": ">=0.6.0"
       }
     },
     "node_modules/jsprim/node_modules/extsprintf": {
@@ -46008,9 +46008,9 @@
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
     },
     "json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
+      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="
     },
     "json-schema-traverse": {
       "version": "0.4.1",
@@ -46079,13 +46079,13 @@
       }
     },
     "jsprim": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
+      "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
       "requires": {
         "assert-plus": "1.0.0",
         "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
+        "json-schema": "0.4.0",
         "verror": "1.10.0"
       },
       "dependencies": {

From 1c13c9b6c68ed20c02d2898eab669e90e14cabad Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 31 Mar 2022 14:20:25 +0200
Subject: [PATCH 0889/1008] MOBILE-3833 security: Update hosted-git-info

---
 package-lock.json | 48 +++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2042c7836..54ca2a4eb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16269,9 +16269,9 @@
       }
     },
     "node_modules/hosted-git-info": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.5.tgz",
-      "integrity": "sha512-i4dpK6xj9BIpVOTboXIlKG9+8HMKggcrMX7WA24xZtKwX0TPelq/rbaS5rCKeNX8sJXZJGdSxpnEGtta+wismQ==",
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.8.tgz",
+      "integrity": "sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw==",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -21434,9 +21434,9 @@
       }
     },
     "node_modules/normalize-package-data/node_modules/hosted-git-info": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
-      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
       "dev": true
     },
     "node_modules/normalize-package-data/node_modules/semver": {
@@ -21560,9 +21560,9 @@
       }
     },
     "node_modules/npm-registry-fetch/node_modules/hosted-git-info": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
-      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
       "dev": true
     },
     "node_modules/npm-registry-fetch/node_modules/lru-cache": {
@@ -22527,9 +22527,9 @@
       }
     },
     "node_modules/pacote/node_modules/hosted-git-info": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
-      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
       "dev": true
     },
     "node_modules/pacote/node_modules/lru-cache": {
@@ -43607,9 +43607,9 @@
       }
     },
     "hosted-git-info": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.5.tgz",
-      "integrity": "sha512-i4dpK6xj9BIpVOTboXIlKG9+8HMKggcrMX7WA24xZtKwX0TPelq/rbaS5rCKeNX8sJXZJGdSxpnEGtta+wismQ==",
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.8.tgz",
+      "integrity": "sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw==",
       "requires": {
         "lru-cache": "^6.0.0"
       }
@@ -47703,9 +47703,9 @@
       },
       "dependencies": {
         "hosted-git-info": {
-          "version": "2.8.8",
-          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
-          "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+          "version": "2.8.9",
+          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+          "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
           "dev": true
         },
         "semver": {
@@ -47810,9 +47810,9 @@
       },
       "dependencies": {
         "hosted-git-info": {
-          "version": "2.8.8",
-          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
-          "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+          "version": "2.8.9",
+          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+          "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
           "dev": true
         },
         "lru-cache": {
@@ -48569,9 +48569,9 @@
           }
         },
         "hosted-git-info": {
-          "version": "2.8.8",
-          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
-          "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+          "version": "2.8.9",
+          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+          "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
           "dev": true
         },
         "lru-cache": {

From b181af29d61ef60eb2a3d15384c7898b624fc734 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 31 Mar 2022 14:21:12 +0200
Subject: [PATCH 0890/1008] MOBILE-3833 security: Update elliptic

---
 package-lock.json | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 54ca2a4eb..e6c841929 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12747,18 +12747,18 @@
       }
     },
     "node_modules/elliptic": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
-      "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
       "dev": true,
       "dependencies": {
-        "bn.js": "^4.4.0",
-        "brorand": "^1.0.1",
+        "bn.js": "^4.11.9",
+        "brorand": "^1.1.0",
         "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.0"
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1"
       }
     },
     "node_modules/elliptic/node_modules/bn.js": {
@@ -40815,18 +40815,18 @@
       }
     },
     "elliptic": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
-      "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.4.0",
-        "brorand": "^1.0.1",
+        "bn.js": "^4.11.9",
+        "brorand": "^1.1.0",
         "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.0"
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1"
       },
       "dependencies": {
         "bn.js": {

From 204c5c259c59bf80f55cdfd0d9769374b76581bd Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 31 Mar 2022 14:22:18 +0200
Subject: [PATCH 0891/1008] MOBILE-3833 security: Update color-string

---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e6c841929..904ad9b84 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9770,9 +9770,9 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/color-string": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz",
-      "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.0.tgz",
+      "integrity": "sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ==",
       "dev": true,
       "dependencies": {
         "color-name": "^1.0.0",
@@ -38585,9 +38585,9 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "color-string": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz",
-      "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.0.tgz",
+      "integrity": "sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ==",
       "dev": true,
       "requires": {
         "color-name": "^1.0.0",

From eeb67f3341337376556c677bb4c1495a93d93fca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 31 Mar 2022 13:42:42 +0200
Subject: [PATCH 0892/1008] MOBILE-3833 navbar-buttons: Wait content to be
 ready before searching

---
 .../components/navbar-buttons/navbar-buttons.ts   | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/core/components/navbar-buttons/navbar-buttons.ts b/src/core/components/navbar-buttons/navbar-buttons.ts
index 8655a1bae..77878e67c 100644
--- a/src/core/components/navbar-buttons/navbar-buttons.ts
+++ b/src/core/components/navbar-buttons/navbar-buttons.ts
@@ -86,7 +86,7 @@ export class CoreNavBarButtonsComponent implements OnInit, OnDestroy {
     }
 
     /**
-     * Component being initialized.
+     * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
         try {
@@ -128,7 +128,7 @@ export class CoreNavBarButtonsComponent implements OnInit, OnDestroy {
             }
         } catch (error) {
             // Header not found.
-            this.logger.warn(error);
+            this.logger.error(error);
         }
     }
 
@@ -199,13 +199,20 @@ export class CoreNavBarButtonsComponent implements OnInit, OnDestroy {
      */
     protected async searchHeader(): Promise<HTMLIonHeaderElement> {
         await CoreDom.waitToBeInDOM(this.element);
-
         let parentPage: HTMLElement | null = this.element;
+
         while (parentPage && parentPage.parentElement) {
-            // Get the next parent page.
+            const content = parentPage.closest<HTMLIonContentElement>('ion-content');
+            if (content) {
+                // Sometimes ion-page class is not yet added by the ViewController, wait for content to render.
+                await content.componentOnReady();
+            }
+
             parentPage = parentPage.parentElement.closest('.ion-page');
+
             // Check if the page has a header. If it doesn't, search the next parent page.
             const header  = parentPage?.querySelector<HTMLIonHeaderElement>(':scope > ion-header');
+
             if (header && getComputedStyle(header).display !== 'none') {
                 return header;
             }

From 82b350c1051b0c7845cf0686ed94d2cadb6dbd03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 31 Mar 2022 14:19:22 +0200
Subject: [PATCH 0893/1008] MOBILE-3833 dom: Size does not depend on scroll
 position

---
 src/core/directives/link.ts |  4 ++--
 src/core/singletons/dom.ts  | 15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/core/directives/link.ts b/src/core/directives/link.ts
index 37043ffc8..d9d51c659 100644
--- a/src/core/directives/link.ts
+++ b/src/core/directives/link.ts
@@ -140,10 +140,10 @@ export class CoreLinkDirective implements OnInit {
             return this.openLocalFile(href);
         }
 
-        if (href.charAt(0) == '#') {
+        if (href.charAt(0) === '#') {
             // Look for id or name.
             href = href.substring(1);
-            const container = this.element.closest('ion-content');
+            const container = this.element.closest<HTMLIonContentElement>('ion-content');
             if (container) {
                 CoreDom.scrollToElement(
                     container,
diff --git a/src/core/singletons/dom.ts b/src/core/singletons/dom.ts
index 914cc6ff2..cefd2c4bf 100644
--- a/src/core/singletons/dom.ts
+++ b/src/core/singletons/dom.ts
@@ -88,10 +88,11 @@ export class CoreDom {
      * Check whether an element is visible or not.
      *
      * @param element Element.
+     * @param checkSize Wether to check size to check for visibility.
      * @return True if element is visible inside the DOM.
      */
-    static isElementVisible(element: HTMLElement): boolean {
-        if (element.clientWidth === 0 || element.clientHeight === 0) {
+    static isElementVisible(element: HTMLElement, checkSize = true): boolean {
+        if (checkSize && (element.clientWidth === 0 || element.clientHeight === 0)) {
             return false;
         }
 
@@ -193,11 +194,10 @@ export class CoreDom {
             element = foundElement;
         }
 
-        await CoreDom.waitToBeVisible(element);
+        await CoreDom.waitToBeVisible(element, false);
 
         const content = element.closest<HTMLIonContentElement>('ion-content') ?? undefined;
         if (!content) {
-
             // Content to scroll, not found.
             return false;
         }
@@ -449,9 +449,10 @@ export class CoreDom {
      * Wait an element to be in dom and visible.
      *
      * @param element Element to wait.
+     * @param checkSize Wether to check size to check for visibility.
      * @return Cancellable promise.
      */
-    static waitToBeVisible(element: HTMLElement): CoreCancellablePromise<void> {
+    static waitToBeVisible(element: HTMLElement, checkSize = true): CoreCancellablePromise<void> {
         const domPromise = CoreDom.waitToBeInDOM(element);
 
         let interval: number | undefined;
@@ -461,12 +462,12 @@ export class CoreDom {
             async (resolve) => {
                 await domPromise;
 
-                if (CoreDom.isElementVisible(element)) {
+                if (CoreDom.isElementVisible(element, checkSize)) {
                     return resolve();
                 }
 
                 interval = window.setInterval(() => {
-                    if (!CoreDom.isElementVisible(element)) {
+                    if (!CoreDom.isElementVisible(element, checkSize)) {
                         return;
                     }
 

From 93fa5edd049181aa916755548561094945f58bf4 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 31 Mar 2022 16:18:13 +0200
Subject: [PATCH 0894/1008] MOBILE-3833 security: Update ansi-regex

---
 package-lock.json | 192 +++++++++++++++++++++++-----------------------
 1 file changed, 96 insertions(+), 96 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 904ad9b84..0beae8c63 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1208,9 +1208,9 @@
       }
     },
     "node_modules/@angular/cli/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
@@ -1429,9 +1429,9 @@
       }
     },
     "node_modules/@angular/compiler-cli/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
@@ -3762,9 +3762,9 @@
       }
     },
     "node_modules/@ionic/cli-framework-prompts/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
@@ -4324,9 +4324,9 @@
       }
     },
     "node_modules/@ionic/utils-terminal/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
@@ -4596,9 +4596,9 @@
       }
     },
     "node_modules/@jest/core/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
@@ -5668,9 +5668,9 @@
       }
     },
     "node_modules/@types/jest/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
@@ -6643,9 +6643,9 @@
       }
     },
     "node_modules/ansi-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+      "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
       "engines": {
         "node": ">=4"
       }
@@ -8582,9 +8582,9 @@
       }
     },
     "node_modules/check-es-compat/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
@@ -13499,9 +13499,9 @@
       }
     },
     "node_modules/eslint/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
@@ -18588,9 +18588,9 @@
       }
     },
     "node_modules/jest-runtime/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
@@ -18983,9 +18983,9 @@
       }
     },
     "node_modules/jest/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
@@ -22091,9 +22091,9 @@
       }
     },
     "node_modules/ora/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
@@ -24144,9 +24144,9 @@
       }
     },
     "node_modules/pretty-format/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
@@ -27315,9 +27315,9 @@
       }
     },
     "node_modules/string-length/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
@@ -27456,9 +27456,9 @@
       }
     },
     "node_modules/strip-ansi/node_modules/ansi-regex": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
       "engines": {
         "node": ">=6"
       }
@@ -27975,9 +27975,9 @@
       }
     },
     "node_modules/table/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
@@ -31867,9 +31867,9 @@
           }
         },
         "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
           "dev": true
         },
         "cli-cursor": {
@@ -32030,9 +32030,9 @@
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
           "dev": true
         },
         "cliui": {
@@ -33940,9 +33940,9 @@
           }
         },
         "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
           "dev": true
         },
         "chalk": {
@@ -34309,9 +34309,9 @@
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
           "dev": true
         },
         "debug": {
@@ -34516,9 +34516,9 @@
           }
         },
         "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
           "dev": true
         },
         "chalk": {
@@ -35322,9 +35322,9 @@
           }
         },
         "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
           "dev": true
         },
         "diff-sequences": {
@@ -36103,9 +36103,9 @@
       }
     },
     "ansi-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+      "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw=="
     },
     "ansi-styles": {
       "version": "4.3.0",
@@ -37630,9 +37630,9 @@
           }
         },
         "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
           "dev": true
         },
         "ansi-styles": {
@@ -41193,9 +41193,9 @@
           }
         },
         "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
           "dev": true
         },
         "chalk": {
@@ -44885,9 +44885,9 @@
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
           "dev": true
         },
         "chalk": {
@@ -45604,9 +45604,9 @@
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
           "dev": true
         },
         "chalk": {
@@ -48217,9 +48217,9 @@
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
           "dev": true
         },
         "cli-cursor": {
@@ -49907,9 +49907,9 @@
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
           "dev": true
         }
       }
@@ -52465,9 +52465,9 @@
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
           "dev": true
         },
         "strip-ansi": {
@@ -52581,9 +52581,9 @@
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g=="
         }
       }
     },
@@ -52966,9 +52966,9 @@
           }
         },
         "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
           "dev": true
         },
         "emoji-regex": {

From 910d557b8724bd4d8d71d94c4f4da2167fa5f3fd Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 31 Mar 2022 17:16:19 +0200
Subject: [PATCH 0895/1008] MOBILE-4015 core: Support data-app-url attribute

---
 src/core/directives/aria-button.ts | 18 ++--------
 src/core/directives/format-text.ts | 58 ++++++++++++++++++++++++++++++
 src/core/directives/link.ts        | 19 ++--------
 src/core/singletons/dom.ts         | 23 ++++++++++++
 4 files changed, 85 insertions(+), 33 deletions(-)

diff --git a/src/core/directives/aria-button.ts b/src/core/directives/aria-button.ts
index 092c53737..3d0d29593 100644
--- a/src/core/directives/aria-button.ts
+++ b/src/core/directives/aria-button.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import { Directive, ElementRef, OnInit, Output, EventEmitter } from '@angular/core';
+import { CoreDom } from '@singletons/dom';
 
 /**
  * Directive to emulate click and key actions following aria role button.
@@ -36,22 +37,7 @@ export class CoreAriaButtonClickDirective implements OnInit {
      * Initialize actions.
      */
     ngOnInit(): void {
-        this.element.addEventListener('click', async (event) => {
-            this.ariaButtonClick.emit(event);
-        });
-
-        this.element.addEventListener('keydown', async (event) => {
-            if ((event.key == ' ' || event.key == 'Enter')) {
-                event.preventDefault();
-                event.stopPropagation();
-            }
-        });
-
-        this.element.addEventListener('keyup', async (event) => {
-            if ((event.key == ' ' || event.key == 'Enter')) {
-                this.ariaButtonClick.emit(event);
-            }
-        });
+        CoreDom.onActivate(this.element, (event) => this.ariaButtonClick.emit(event));
     }
 
 }
diff --git a/src/core/directives/format-text.ts b/src/core/directives/format-text.ts
index f134eddd6..7b4d8a7ea 100644
--- a/src/core/directives/format-text.ts
+++ b/src/core/directives/format-text.ts
@@ -452,9 +452,16 @@ export class CoreFormatTextDirective implements OnChanges, OnDestroy, AsyncCompo
         const svgImages = Array.from(div.querySelectorAll('image'));
         const promises: Promise<void>[] = [];
 
+        this.treatAppUrlElements(div, site);
+
         // Walk through the content to find the links and add our directive to it.
         // Important: We need to look for links first because in 'img' we add new links without core-link.
         anchors.forEach((anchor) => {
+            if (anchor.getAttribute('data-app-url')) {
+                // Link already treated in data-app-url, ignore it.
+                return;
+            }
+
             // Angular 2 doesn't let adding directives dynamically. Create the CoreLinkDirective manually.
             const linkDir = new CoreLinkDirective(new ElementRef(anchor), this.content);
             linkDir.capture = this.captureLinks ?? true;
@@ -546,6 +553,57 @@ export class CoreFormatTextDirective implements OnChanges, OnDestroy, AsyncCompo
         await Promise.all(promises);
     }
 
+    /**
+     * Treat elements with an app-url data attribute.
+     *
+     * @param div Div containing the elements.
+     * @param site Site.
+     */
+    protected treatAppUrlElements(div: HTMLElement, site?: CoreSite): void {
+        const appUrlElements = Array.from(div.querySelectorAll<HTMLElement>('*[data-app-url]'));
+
+        appUrlElements.forEach((element) => {
+            const url = element.getAttribute('data-app-url');
+            if (!url) {
+                return;
+            }
+
+            if (element.tagName !== 'BUTTON' && element.tagName !== 'A') {
+                element.setAttribute('tabindex', '0');
+                element.setAttribute('role', 'button');
+            }
+
+            CoreDom.onActivate(element, async (event) => {
+                event.preventDefault();
+                event.stopPropagation();
+
+                site = site || CoreSites.getCurrentSite();
+                if (!site) {
+                    return;
+                }
+
+                const confirmMessage = element.getAttribute('data-app-url-confirm');
+                const openInApp = element.getAttribute('data-open-in') === 'app';
+
+                if (confirmMessage) {
+                    try {
+                        await CoreDomUtils.showConfirm(Translate.instant(confirmMessage));
+                    } catch {
+                        return;
+                    }
+                }
+
+                if (openInApp) {
+                    site.openInAppWithAutoLoginIfSameSite(url);
+                } else {
+                    site.openInBrowserWithAutoLoginIfSameSite(url, undefined, {
+                        showBrowserWarning: !confirmMessage,
+                    });
+                }
+            });
+        });
+    }
+
     /**
      * Returns the element width in pixels.
      *
diff --git a/src/core/directives/link.ts b/src/core/directives/link.ts
index 37043ffc8..5df73e728 100644
--- a/src/core/directives/link.ts
+++ b/src/core/directives/link.ts
@@ -48,7 +48,7 @@ export class CoreLinkDirective implements OnInit {
     @Input() autoLogin = 'check';
     @Input() showBrowserWarning = true; // Whether to show a warning before opening browser. Defaults to true.
 
-    protected element: Element;
+    protected element: HTMLElement;
 
     constructor(
         element: ElementRef,
@@ -68,22 +68,7 @@ export class CoreLinkDirective implements OnInit {
             this.element.setAttribute('role', 'button');
         }
 
-        this.element.addEventListener('click', async (event) => {
-            this.performAction(event);
-        });
-
-        this.element.addEventListener('keydown', (event: KeyboardEvent) => {
-            if ((event.key == ' ' || event.key == 'Enter')) {
-                event.preventDefault();
-                event.stopPropagation();
-            }
-        });
-
-        this.element.addEventListener('keyup', (event: KeyboardEvent) => {
-            if ((event.key == ' ' || event.key == 'Enter')) {
-                this.performAction(event);
-            }
-        });
+        CoreDom.onActivate(this.element, (event) => this.performAction(event));
     }
 
     /**
diff --git a/src/core/singletons/dom.ts b/src/core/singletons/dom.ts
index 914cc6ff2..2544650d0 100644
--- a/src/core/singletons/dom.ts
+++ b/src/core/singletons/dom.ts
@@ -481,6 +481,29 @@ export class CoreDom {
         );
     }
 
+    /**
+     * Listen to click and Enter/Space keys in an element.
+     *
+     * @param element Element to listen to events.
+     * @param callback Callback to call when clicked or the key is pressed.
+     */
+    static onActivate(element: HTMLElement, callback: (event: MouseEvent | KeyboardEvent) => void): void {
+        element.addEventListener('click', (event) => callback(event));
+
+        element.addEventListener('keydown', (event) => {
+            if ((event.key == ' ' || event.key == 'Enter')) {
+                event.preventDefault();
+                event.stopPropagation();
+            }
+        });
+
+        element.addEventListener('keyup', (event) => {
+            if ((event.key == ' ' || event.key == 'Enter')) {
+                callback(event);
+            }
+        });
+    }
+
 }
 
 /**

From 6d13fdf6a78903dc944fa4829236bd9aa0123cfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 31 Mar 2022 15:33:42 +0200
Subject: [PATCH 0896/1008] MOBILE-3833 style: Restyle spacers

---
 .../components/filteroptions/filteroptions.scss           | 8 ++++++++
 .../myoverview/components/filteroptions/filteroptions.ts  | 1 +
 src/core/components/spacer/spacer.ts                      | 5 +++--
 src/core/features/sitehome/pages/index/index.scss         | 8 ++------
 src/theme/theme.light.scss                                | 6 ++----
 5 files changed, 16 insertions(+), 12 deletions(-)
 create mode 100644 src/addons/block/myoverview/components/filteroptions/filteroptions.scss

diff --git a/src/addons/block/myoverview/components/filteroptions/filteroptions.scss b/src/addons/block/myoverview/components/filteroptions/filteroptions.scss
new file mode 100644
index 000000000..166260056
--- /dev/null
+++ b/src/addons/block/myoverview/components/filteroptions/filteroptions.scss
@@ -0,0 +1,8 @@
+ion-footer {
+    &::before {
+        display: none;
+    }
+    ion-button {
+        margin: 0;
+    }
+}
diff --git a/src/addons/block/myoverview/components/filteroptions/filteroptions.ts b/src/addons/block/myoverview/components/filteroptions/filteroptions.ts
index 93b9d753a..ad77d9a5b 100644
--- a/src/addons/block/myoverview/components/filteroptions/filteroptions.ts
+++ b/src/addons/block/myoverview/components/filteroptions/filteroptions.ts
@@ -22,6 +22,7 @@ import { AddonBlockMyOverviewFilterOptions } from '../myoverview/myoverview';
 @Component({
     selector: 'addon-block-myoverview-filter-options',
     templateUrl: 'filteroptions.html',
+    styleUrls: ['filteroptions.scss'],
 })
 export class AddonBlockMyOverviewFilterOptionsComponent {
 
diff --git a/src/core/components/spacer/spacer.ts b/src/core/components/spacer/spacer.ts
index e2196dd81..0bedc96bf 100644
--- a/src/core/components/spacer/spacer.ts
+++ b/src/core/components/spacer/spacer.ts
@@ -22,8 +22,9 @@ import { Component } from '@angular/core';
  */
 @Component({
     selector: 'core-spacer',
-    template: '<ion-item-divider><ion-label></ion-label></ion-item-divider>',
-    styles: [':host {--item-divider-min-height: 30px;}'],
+    template: '',
+    styles: [':host { display: block; margin: var(--spacer-vertical) var(--spacer-horizontal); \
+        border-bottom: 1px solid var(--spacer-color);}'],
 })
 export class CoreSpacerComponent {
 
diff --git a/src/core/features/sitehome/pages/index/index.scss b/src/core/features/sitehome/pages/index/index.scss
index f77fee9ef..2581b9366 100644
--- a/src/core/features/sitehome/pages/index/index.scss
+++ b/src/core/features/sitehome/pages/index/index.scss
@@ -11,10 +11,6 @@ ion-item ion-icon {
     @include margin-horizontal(null, var(--margin-end));
 }
 
-core-spacer ::ng-deep .item {
-    border-radius: var(--medium-radius);
-    --horizontal-margin: 10px;
-    margin-left: var(--horizontal-margin);
-    margin-right: var(--horizontal-margin);
-    width: auto;
+core-spacer {
+    --spacer-horizontal: 10px;
 }
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 14da0eacf..944c0f5d6 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -308,10 +308,8 @@
         --min-height: var(--item-divider-min-height);
     }
 
-    --spacer-background: var(--light);
-    core-spacer {
-        --item-divider-background: var(--spacer-background);
-    }
+    --spacer-vertical: 8px;
+    --spacer-color: var(--gray-300);
 
     ion-note {
         --color: var(--subdued-text-color);

From 2ce808dfab550ec0ed35deed785baf1a3550a0b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 31 Mar 2022 16:53:24 +0200
Subject: [PATCH 0897/1008] MOBILE-3833 my: Move search to empty box on my
 overview

---
 .../myoverview/addon-block-myoverview.html           |  5 +++++
 .../myoverview/components/myoverview/myoverview.ts   | 12 +++++++++++-
 src/core/features/courses/pages/my/my.html           |  3 ---
 src/core/features/courses/pages/my/my.ts             | 11 -----------
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
index 3718ea8e7..f0b31314a 100644
--- a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
+++ b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
@@ -70,6 +70,11 @@
 
     <core-empty-box *ngIf="filteredCourses.length == 0" image="assets/img/icons/courses.svg"
         [message]="'addon.block_myoverview.nocourses' | translate">
+        <ion-button *ngIf="searchEnabled" (click)="openSearch()" fill="outline">
+            <ion-icon name="fas-search" slot="start" aria-hidden="true">
+            </ion-icon>
+            {{'core.courses.searchcourses' | translate}}
+        </ion-button>
     </core-empty-box>
 
     <!-- List of courses. -->
diff --git a/src/addons/block/myoverview/components/myoverview/myoverview.ts b/src/addons/block/myoverview/components/myoverview/myoverview.ts
index 8c97fa6c6..4bdfa9d7a 100644
--- a/src/addons/block/myoverview/components/myoverview/myoverview.ts
+++ b/src/addons/block/myoverview/components/myoverview/myoverview.ts
@@ -30,6 +30,7 @@ import { AddonCourseCompletion } from '@addons/coursecompletion/services/coursec
 import { AddonBlockMyOverviewFilterOptionsComponent } from '../filteroptions/filteroptions';
 import { IonSearchbar } from '@ionic/angular';
 import moment from 'moment';
+import { CoreNavigator } from '@services/navigator';
 
 const FILTER_PRIORITY: AddonBlockMyOverviewTimeFilters[] = ['all', 'inprogress', 'future', 'past'];
 
@@ -88,6 +89,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
 
     textFilter = '';
     hasCourses = false;
+    searchEnabled = false;
 
     protected currentSite!: CoreSite;
     protected allCourses: CoreEnrolledCourseDataWithOptions[] = [];
@@ -110,12 +112,13 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
         // Refresh the enabled flags if enabled.
         this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
         this.downloadCoursesEnabled = !CoreCourses.isDownloadCoursesDisabledInSite();
+        this.searchEnabled = !CoreCourses.isSearchCoursesDisabledInSite();
 
         // Refresh the enabled flags if site is updated.
         this.updateSiteObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, () => {
             this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
             this.downloadCoursesEnabled = !CoreCourses.isDownloadCoursesDisabledInSite();
-
+            this.searchEnabled = !CoreCourses.isSearchCoursesDisabledInSite();
         }, CoreSites.getCurrentSiteId());
 
         this.coursesObserver = CoreEvents.on(
@@ -676,6 +679,13 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
         this.filterCourses();
     }
 
+    /**
+     * Go to search courses.
+     */
+    async openSearch(): Promise<void> {
+        CoreNavigator.navigateToSitePath('/list', { params : { mode: 'search' } });
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/src/core/features/courses/pages/my/my.html b/src/core/features/courses/pages/my/my.html
index bf26674dc..1ea788466 100644
--- a/src/core/features/courses/pages/my/my.html
+++ b/src/core/features/courses/pages/my/my.html
@@ -11,9 +11,6 @@
             </h1>
         </ion-title>
         <ion-buttons slot="end">
-            <ion-button *ngIf="searchEnabled" (click)="openSearch()" [attr.aria-label]="'core.courses.searchcourses' | translate">
-                <ion-icon name="fas-search" slot="icon-only" aria-hidden="true"></ion-icon>
-            </ion-button>
             <core-user-menu-button></core-user-menu-button>
         </ion-buttons>
     </ion-toolbar>
diff --git a/src/core/features/courses/pages/my/my.ts b/src/core/features/courses/pages/my/my.ts
index 029225665..ad8f0a206 100644
--- a/src/core/features/courses/pages/my/my.ts
+++ b/src/core/features/courses/pages/my/my.ts
@@ -19,7 +19,6 @@ import { CoreCourseBlock } from '@features/course/services/course';
 import { CoreCoursesDashboard, CoreCoursesDashboardProvider } from '@features/courses/services/dashboard';
 import { CoreMainMenuDeepLinkManager } from '@features/mainmenu/classes/deep-link-manager';
 import { IonRefresher } from '@ionic/angular';
-import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
@@ -38,7 +37,6 @@ export class CoreCoursesMyCoursesPage implements OnInit, OnDestroy {
     @ViewChild(CoreBlockComponent) block!: CoreBlockComponent;
 
     siteName = '';
-    searchEnabled = false;
     downloadCoursesEnabled = false;
     userId: number;
     loadedBlock?: Partial<CoreCourseBlock>;
@@ -50,7 +48,6 @@ export class CoreCoursesMyCoursesPage implements OnInit, OnDestroy {
     constructor() {
         // Refresh the enabled flags if site is updated.
         this.updateSiteObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, () => {
-            this.searchEnabled = !CoreCourses.isSearchCoursesDisabledInSite();
             this.downloadCoursesEnabled = !CoreCourses.isDownloadCoursesDisabledInSite();
             this.loadSiteName();
 
@@ -63,7 +60,6 @@ export class CoreCoursesMyCoursesPage implements OnInit, OnDestroy {
      * @inheritdoc
      */
     ngOnInit(): void {
-        this.searchEnabled = !CoreCourses.isSearchCoursesDisabledInSite();
         this.downloadCoursesEnabled = !CoreCourses.isDownloadCoursesDisabledInSite();
 
         const deepLinkManager = new CoreMainMenuDeepLinkManager();
@@ -122,13 +118,6 @@ export class CoreCoursesMyCoursesPage implements OnInit, OnDestroy {
         };
     }
 
-    /**
-     * Go to search courses.
-     */
-    async openSearch(): Promise<void> {
-        CoreNavigator.navigateToSitePath('/list', { params : { mode: 'search' } });
-    }
-
     /**
      * Refresh the data.
      *

From e3e54ec194adc719061c592088dee75e8cfe5005 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 31 Mar 2022 17:23:32 +0200
Subject: [PATCH 0898/1008] MOBILE-3833 collapsible: Fix collapsible header
 enabled

---
 src/core/directives/collapsible-header.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts
index 196a2b1ce..31a4083bc 100644
--- a/src/core/directives/collapsible-header.ts
+++ b/src/core/directives/collapsible-header.ts
@@ -89,6 +89,7 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
      * @inheritdoc
      */
     ngOnInit(): void {
+        this.collapsible = !CoreUtils.isFalseOrZero(this.collapsible);
         this.init();
     }
 
@@ -117,7 +118,8 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
      */
     async ngOnChanges(changes: {[name: string]: SimpleChange}): Promise<void> {
         if (changes.collapsible) {
-            this.enabled = !CoreUtils.isFalseOrZero(changes.collapsible.currentValue);
+            this.collapsible = !CoreUtils.isFalseOrZero(changes.collapsible.currentValue);
+            this.enabled = this.collapsible;
 
             await this.init();
 

From dd60ea69789d6304156f41b39a0d7ed6bc35df48 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 1 Apr 2022 14:24:11 +0200
Subject: [PATCH 0899/1008] MOBILE-3833 data: Fix wrong group list in some
 cases

---
 src/addons/mod/data/pages/edit/edit.ts | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/addons/mod/data/pages/edit/edit.ts b/src/addons/mod/data/pages/edit/edit.ts
index 52abfab1e..068d83431 100644
--- a/src/addons/mod/data/pages/edit/edit.ts
+++ b/src/addons/mod/data/pages/edit/edit.ts
@@ -171,31 +171,34 @@ export class AddonModDataEditPage implements OnInit {
             // Check permissions when adding a new entry or offline entry.
             if (!this.isEditing) {
                 let haveAccess = false;
+                let groupInfo: CoreGroupInfo | undefined = this.groupInfo;
 
                 if (refresh) {
-                    this.groupInfo = await CoreGroups.getActivityGroupInfo(this.database.coursemodule);
-                    if (this.groupInfo.visibleGroups && this.groupInfo.groups?.length) {
+                    groupInfo = await CoreGroups.getActivityGroupInfo(this.database.coursemodule);
+                    if (groupInfo.visibleGroups && groupInfo.groups?.length) {
                         // There is a bug in Moodle with All participants and visible groups (MOBILE-3597). Remove it.
-                        this.groupInfo.groups = this.groupInfo.groups.filter(group => group.id !== 0);
-                        this.groupInfo.defaultGroupId = this.groupInfo.groups[0].id;
+                        groupInfo.groups = groupInfo.groups.filter(group => group.id !== 0);
+                        groupInfo.defaultGroupId = groupInfo.groups[0].id;
                     }
 
-                    this.selectedGroup = CoreGroups.validateGroupId(this.selectedGroup, this.groupInfo);
+                    this.selectedGroup = CoreGroups.validateGroupId(this.selectedGroup, groupInfo);
                     this.initialSelectedGroup = this.selectedGroup;
                 }
 
-                if (this.groupInfo?.groups && this.groupInfo.groups.length > 0) {
+                if (groupInfo?.groups && groupInfo?.groups.length > 0) {
                     if (refresh) {
                         const canAddGroup: Record<number, boolean> = {};
 
-                        await Promise.all(this.groupInfo.groups.map(async (group) => {
+                        await Promise.all(groupInfo.groups.map(async (group) => {
                             const accessData = await AddonModData.getDatabaseAccessInformation(this.database!.id, {
-                                cmId: this.moduleId, groupId: group.id });
+                                cmId: this.moduleId,
+                                groupId: group.id,
+                            });
 
                             canAddGroup[group.id] = accessData.canaddentry;
                         }));
 
-                        this.groupInfo.groups = this.groupInfo.groups.filter((group) => !!canAddGroup[group.id]);
+                        groupInfo.groups = groupInfo.groups.filter((group) => !!canAddGroup[group.id]);
 
                         haveAccess = canAddGroup[this.selectedGroup];
                     } else {
@@ -207,6 +210,8 @@ export class AddonModDataEditPage implements OnInit {
                     haveAccess = accessData.canaddentry;
                 }
 
+                this.groupInfo = groupInfo;
+
                 if (!haveAccess) {
                     // You shall not pass, go back.
                     CoreDomUtils.showErrorModal('addon.mod_data.noaccess', true);

From 50c3985822f659efa333a1e445986dbb47ec76ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 1 Apr 2022 09:58:11 +0200
Subject: [PATCH 0900/1008] MOBILE-3833 collapsible: Change collapsible visible
 strategy

---
 .../components/myoverview/myoverview.ts       |  2 +-
 src/core/directives/collapsible-footer.ts     | 18 ++--
 src/core/directives/collapsible-header.ts     | 86 ++++++++-----------
 src/core/directives/collapsible-item.ts       | 27 +++---
 4 files changed, 60 insertions(+), 73 deletions(-)

diff --git a/src/addons/block/myoverview/components/myoverview/myoverview.ts b/src/addons/block/myoverview/components/myoverview/myoverview.ts
index 4bdfa9d7a..d54b6c3b6 100644
--- a/src/addons/block/myoverview/components/myoverview/myoverview.ts
+++ b/src/addons/block/myoverview/components/myoverview/myoverview.ts
@@ -683,7 +683,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
      * Go to search courses.
      */
     async openSearch(): Promise<void> {
-        CoreNavigator.navigateToSitePath('/list', { params : { mode: 'search' } });
+        CoreNavigator.navigateToSitePath('courses/list', { params : { mode: 'search' } });
     }
 
     /**
diff --git a/src/core/directives/collapsible-footer.ts b/src/core/directives/collapsible-footer.ts
index f0b7c90ad..e90806092 100644
--- a/src/core/directives/collapsible-footer.ts
+++ b/src/core/directives/collapsible-footer.ts
@@ -50,7 +50,8 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
     protected endContentScrollListener?: EventListener;
     protected resizeListener?: CoreEventObserver;
     protected slotPromise?: CoreCancellablePromise<void>;
-    protected calcPending = false;
+    protected viewportPromise?: CoreCancellablePromise<void>;
+    protected loadingHeight = false;
     protected pageDidEnterListener?: EventListener;
     protected page?: HTMLElement;
 
@@ -85,13 +86,14 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
      * Calculate the height of the footer.
      */
     protected async calculateHeight(): Promise<void> {
-        if (!CoreDom.isElementVisible(this.element)) {
-            this.calcPending = true;
-
+        if (this.loadingHeight) {
+            // Already calculating, return.
             return;
         }
+        this.loadingHeight = true;
 
-        this.calcPending = false;
+        this.viewportPromise = CoreDom.waitToBeInViewport(this.element);
+        await this.viewportPromise;
 
         this.element.classList.remove('is-active');
         await CoreUtils.nextTick();
@@ -110,6 +112,7 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
         this.element.classList.add('is-active');
 
         this.setBarHeight(this.initialHeight);
+        this.loadingHeight = false;
     }
 
     /**
@@ -175,9 +178,7 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
         this.page?.addEventListener(
             'ionViewDidEnter',
             this.pageDidEnterListener = () => {
-                if (this.calcPending) {
-                    this.calculateHeight();
-                }
+                this.calculateHeight();
             },
         );
     }
@@ -255,6 +256,7 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
 
         this.resizeListener?.off();
         this.slotPromise?.cancel();
+        this.viewportPromise?.cancel();
     }
 
 }
diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts
index 31a4083bc..887918f05 100644
--- a/src/core/directives/collapsible-header.ts
+++ b/src/core/directives/collapsible-header.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { Directive, ElementRef, Input, OnChanges, OnDestroy, OnInit, SimpleChange } from '@angular/core';
-import { CorePromisedValue } from '@classes/promised-value';
+import { CoreCancellablePromise } from '@classes/cancellable-promise';
 import { CoreLoadingComponent } from '@components/loading/loading';
 import { CoreTabsOutletComponent } from '@components/tabs-outlet/tabs-outlet';
 import { CoreTabsComponent } from '@components/tabs/tabs';
@@ -69,17 +69,15 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
     protected content?: HTMLIonContentElement;
     protected contentScrollListener?: EventListener;
     protected endContentScrollListener?: EventListener;
-    protected pageDidEnterListener?: EventListener;
     protected resizeListener?: CoreEventObserver;
     protected floatingTitle?: HTMLHeadingElement;
     protected scrollingHeight?: number;
     protected subscriptions: Subscription[] = [];
     protected enabled = true;
     protected isWithinContent = false;
-    protected enteredPromise = new CorePromisedValue<void>();
     protected mutationObserver?: MutationObserver;
-    protected firstEnter = true;
-    protected initPending = false;
+    protected loadingFloatingTitle = false;
+    protected visiblePromise?: CoreCancellablePromise<void>;
 
     constructor(el: ElementRef) {
         this.collapsedHeader = el.nativeElement;
@@ -106,10 +104,9 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
         await Promise.all([
             this.initializeCollapsedHeader(),
             this.initializeExpandedHeader(),
-            await this.enteredPromise,
         ]);
 
-        this.initializeFloatingTitle();
+        await this.initializeFloatingTitle();
         this.initializeContent();
     }
 
@@ -117,7 +114,7 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
      * @inheritdoc
      */
     async ngOnChanges(changes: {[name: string]: SimpleChange}): Promise<void> {
-        if (changes.collapsible) {
+        if (changes.collapsible && !changes.collapsible.firstChange) {
             this.collapsible = !CoreUtils.isFalseOrZero(changes.collapsible.currentValue);
             this.enabled = this.collapsible;
 
@@ -141,47 +138,16 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
         if (this.content && this.endContentScrollListener) {
             this.content.removeEventListener('ionScrollEnd', this.endContentScrollListener);
         }
-        if (this.page && this.pageDidEnterListener) {
-            this.page.removeEventListener('ionViewDidEnter', this.pageDidEnterListener);
-        }
 
         this.resizeListener?.off();
         this.mutationObserver?.disconnect();
+        this.visiblePromise?.cancel();
     }
 
     /**
-     * Search the page element, initialize it, and wait until it's ready for the transition to trigger on scroll.
+     * Listen to changing events.
      */
-    protected initializePage(): void {
-        if (!this.collapsedHeader.parentElement) {
-            throw new Error('[collapsible-header] Couldn\'t get page');
-        }
-
-        // Find element and prepare classes.
-        this.page = this.collapsedHeader.parentElement;
-        this.page.classList.add('collapsible-header-page');
-
-        this.page.addEventListener(
-            'ionViewDidEnter',
-            this.pageDidEnterListener = () => {
-                if (this.firstEnter) {
-                    this.firstEnter = false;
-                    clearTimeout(timeout);
-                    this.enteredPromise.resolve();
-                } else if (this.initPending) {
-                    this.initializeFloatingTitle();
-                }
-            },
-        );
-
-        // Timeout in case event is never fired.
-        const timeout = window.setTimeout(() => {
-            if (this.firstEnter) {
-                this.firstEnter = false;
-                this.enteredPromise.reject(new Error('[collapsible-header] Waiting for ionViewDidEnter timeout reached'));
-            }
-        }, 5000);
-
+    protected listenEvents(): void {
         this.resizeListener = CoreDom.onWindowResize(() => {
             this.initializeFloatingTitle();
         }, 50);
@@ -216,6 +182,19 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
         });
     }
 
+    /**
+     * Search the page element, initialize it, and wait until it's ready for the transition to trigger on scroll.
+     */
+    protected initializePage(): void {
+        if (!this.collapsedHeader.parentElement) {
+            throw new Error('[collapsible-header] Couldn\'t get page');
+        }
+
+        // Find element and prepare classes.
+        this.page = this.collapsedHeader.parentElement;
+        this.page.classList.add('collapsible-header-page');
+    }
+
     /**
      * Search the collapsed header element, initialize it, and wait until it's ready for the transition to trigger on scroll.
      */
@@ -253,6 +232,8 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
             return;
         }
 
+        this.listenEvents();
+
         // Initialize from tabs.
         const tabs = CoreComponentsRegistry.resolve(this.page.querySelector('core-tabs-outlet'), CoreTabsOutletComponent);
 
@@ -284,21 +265,22 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
     /**
      * Initialize a floating title to mimic transitioning the title from one state to the other.
      */
-    protected initializeFloatingTitle(): void {
+    protected async initializeFloatingTitle(): Promise<void> {
         if (!this.page || !this.expandedHeader) {
-            throw new Error('[collapsible-header] Couldn\'t create floating title');
-        }
-
-        if (!CoreDom.isElementVisible(this.expandedHeader)) {
-            this.initPending = true;
-
             return;
         }
 
-        this.initPending = false;
+        if (this.loadingFloatingTitle) {
+            // Already calculating, return.
+            return;
+        }
+        this.loadingFloatingTitle = true;
+
+        this.visiblePromise = CoreDom.waitToBeVisible(this.expandedHeader);
+        await this.visiblePromise;
 
         this.page.classList.remove('collapsible-header-page-is-active');
-        CoreUtils.nextTick();
+        await CoreUtils.nextTick();
 
         // Add floating title and measure initial position.
         const collapsedHeaderTitle = this.collapsedHeader.querySelector('h1') as HTMLHeadingElement;
@@ -370,6 +352,8 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
         this.collapsedFontStyles = collapsedFontStyles;
         this.expandedFontStyles = expandedFontStyles;
         this.expandedHeaderHeight = expandedHeaderHeight;
+
+        this.loadingFloatingTitle = false;
     }
 
     /**
diff --git a/src/core/directives/collapsible-item.ts b/src/core/directives/collapsible-item.ts
index 6e95242f2..1a4950c8b 100644
--- a/src/core/directives/collapsible-item.ts
+++ b/src/core/directives/collapsible-item.ts
@@ -55,8 +55,9 @@ export class CoreCollapsibleItemDirective implements OnInit, OnDestroy {
     protected resizeListener?: CoreEventObserver;
     protected darkModeListener?: Subscription;
     protected domPromise?: CoreCancellablePromise<void>;
+    protected visiblePromise?: CoreCancellablePromise<void>;
     protected uniqueId: string;
-    protected calcPending = false;
+    protected loadingHeight = false;
     protected pageDidEnterListener?: EventListener;
     protected page?: HTMLElement;
 
@@ -99,9 +100,7 @@ export class CoreCollapsibleItemDirective implements OnInit, OnDestroy {
         this.page?.addEventListener(
             'ionViewDidEnter',
             this.pageDidEnterListener = () => {
-                if (this.calcPending) {
-                    this.calculateHeight();
-                }
+                this.calculateHeight();
             },
         );
 
@@ -143,20 +142,20 @@ export class CoreCollapsibleItemDirective implements OnInit, OnDestroy {
      * Calculate the height and check if we need to display show more or not.
      */
     protected async calculateHeight(): Promise<void> {
+        if (this.loadingHeight) {
+            // Already calculating, return.
+            return;
+        }
+        this.loadingHeight = true;
+
+        this.visiblePromise = CoreDom.waitToBeVisible(this.element);
+        await this.visiblePromise;
+
         // Remove max-height (if any) to calculate the real height.
         this.element.classList.add('collapsible-loading-height');
 
         await this.waitFormatTextsRendered();
 
-        if (!this.element.clientHeight) {
-            this.calcPending = true;
-            this.element.classList.remove('collapsible-loading-height');
-
-            return;
-        }
-
-        this.calcPending = false;
-
         this.expandedHeight = this.element.getBoundingClientRect().height;
 
         // Restore the max height now.
@@ -167,6 +166,7 @@ export class CoreCollapsibleItemDirective implements OnInit, OnDestroy {
         this.setExpandButtonEnabled(enable);
         this.setGradientColor();
 
+        this.loadingHeight = false;
     }
 
     /**
@@ -298,6 +298,7 @@ export class CoreCollapsibleItemDirective implements OnInit, OnDestroy {
         this.resizeListener?.off();
         this.darkModeListener?.unsubscribe();
         this.domPromise?.cancel();
+        this.visiblePromise?.cancel();
 
         if (this.page && this.pageDidEnterListener) {
             this.page.removeEventListener('ionViewDidEnter', this.pageDidEnterListener);

From bf5f9c8b99b21d16ff82ea70a116ecf112df9816 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 31 Mar 2022 16:54:06 +0200
Subject: [PATCH 0901/1008] MOBILE-3833 my: Style Filter buttons

---
 .../myoverview/addon-block-myoverview.html    | 16 +++++------
 .../components/myoverview/myoverview.scss     | 20 +++++++++++--
 src/theme/theme.base.scss                     | 28 ++++++++++++-------
 src/theme/theme.light.scss                    | 15 +++-------
 4 files changed, 47 insertions(+), 32 deletions(-)

diff --git a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
index f0b31314a..f2a0b892e 100644
--- a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
+++ b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
@@ -22,6 +22,14 @@
 </ion-item-divider>
 <core-loading [hideUntil]="loaded">
 
+    <ion-row class="ion-hide-md-up addon-block-myoverview-filter" *ngIf="hasCourses">
+        <ion-col>
+            <!-- Filter courses. -->
+            <ion-searchbar [(ngModel)]="textFilter" (ionInput)="filterTextChanged($event.target)"
+                (ionCancel)="filterTextChanged($event.target)" [placeholder]="'core.filter' | translate">
+            </ion-searchbar>
+        </ion-col>
+    </ion-row>
     <ion-row class="ion-justify-content-between ion-align-items-center addon-block-myoverview-filter" *ngIf="hasCourses">
         <ion-col size="auto" *ngIf="filters.enabled">
             <core-combobox interface="modal" [label]="'core.courses.filtermycourses' | translate" (onChange)="filterOptionsChanged($event)"
@@ -59,14 +67,6 @@
             </ion-button>
         </ion-col>
     </ion-row>
-    <ion-row class="ion-hide-md-up addon-block-myoverview-filter" *ngIf="hasCourses">
-        <ion-col>
-            <!-- Filter courses. -->
-            <ion-searchbar [(ngModel)]="textFilter" (ionInput)="filterTextChanged($event.target)"
-                (ionCancel)="filterTextChanged($event.target)" [placeholder]="'core.filter' | translate">
-            </ion-searchbar>
-        </ion-col>
-    </ion-row>
 
     <core-empty-box *ngIf="filteredCourses.length == 0" image="assets/img/icons/courses.svg"
         [message]="'addon.block_myoverview.nocourses' | translate">
diff --git a/src/addons/block/myoverview/components/myoverview/myoverview.scss b/src/addons/block/myoverview/components/myoverview/myoverview.scss
index 9c2cb0d56..06c764187 100644
--- a/src/addons/block/myoverview/components/myoverview/myoverview.scss
+++ b/src/addons/block/myoverview/components/myoverview/myoverview.scss
@@ -1,21 +1,35 @@
 :host {
     ion-row.addon-block-myoverview-filter {
-        padding: 4px 8px 0px 8px;
+        margin: 8px;
+        padding: 0;
 
         ion-col {
-            padding: 0 2px;
+            padding: 0;
         }
 
         ion-button,
         core-combobox ::ng-deep ion-button {
+            --border-width: 0;
+            --a11y-min-target-size: 40px;
             margin: 0;
+
+            .select-icon {
+                display: none;
+            }
             ion-icon {
                 font-size: 20px;
             }
         }
 
-        ::ng-deep ion-searchbar {
+        core-combobox ::ng-deep ion-select {
+            margin: 0;
+            --a11y-min-target-size: 40px;
+        }
+
+       ion-searchbar {
             padding: 0;
+            --height: 40px;
         }
     }
+
 }
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index b10ac0d47..a162e6c0a 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -1091,20 +1091,28 @@ ion-chip {
 }
 
 ion-searchbar {
-    .searchbar-search-icon.ios {
-        top: 4px;
-    }
-    .searchbar-search-icon.md {
-    }
+    height: var(--height) !important;
 
-    .searchbar-input,
-    .sc-ion-searchbar-md.searchbar-input,
-    .sc-ion-searchbar-ios.searchbar-input {
-        @include padding-horizontal(48px);
+    .searchbar-input-container {
+        color: var(--color) !important;
+        height: var(--height) !important;
     }
 
     .searchbar-input {
-        @include padding-horizontal(48px);
+        height: var(--height) !important;
+        border: 1px solid var(--border-color) !important;
+        box-shadow: none !important;
+        border-radius: var(--border-radius) !important;
+        background: var(--background) !important;
+        @include padding-horizontal(var(--height) !important);
+    }
+
+    .searchbar-search-icon {
+        @include position(null, null, null, calc(var(--height) / 4) !important);
+    }
+
+    button {
+        @include position(null, 0 !important, null, null);
     }
 }
 
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 944c0f5d6..f8799c64f 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -190,23 +190,16 @@
     --ion-searchbar-background: var(--ion-background-color);
     --ion-searchbar-border-color: var(--core-input-stroke);
     --ion-searchbar-border-radius: var(--core-input-radius);
+    --ion-searchbar-height: var(--a11y-min-target-size);
     --ion-searchbar-color: var(--text-color);
     --ion-searchbar-icon-color: var(--core-input-stroke);
     ion-searchbar {
         --background: var(--ion-searchbar-background);
         --border-color: var(--ion-searchbar-border-color);
+        --color: var(--ion-searchbar-color);
+        --border-radius: var(--ion-searchbar-border-radius);
         --icon-color: var(--ion-searchbar-icon-color);
-
-        .searchbar-input-container {
-            color: var(--ion-searchbar-color) !important;
-        }
-        .searchbar-input {
-            height: var(--a11y-min-target-size);
-            border: 1px solid var(--ion-searchbar-border-color);
-            box-shadow: none;
-            border-radius: var(--ion-searchbar-border-radius);
-            background: var(--ion-searchbar-background) !important;
-        }
+        --height: var(--ion-searchbar-height);
     }
 
     --core-search-box-background: var(--ion-background-color);

From dc934ffcb2363ab767f55549ad8946a567328259 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 1 Apr 2022 10:25:34 +0200
Subject: [PATCH 0902/1008] MOBILE-3833 my: Revert to basic filters with
 advanced option

---
 scripts/langindex.json                        |   5 +-
 .../components/components.module.ts           |   2 -
 .../filteroptions/filteroptions.html          |  58 -----
 .../filteroptions/filteroptions.scss          |   8 -
 .../components/filteroptions/filteroptions.ts |  45 ----
 .../myoverview/addon-block-myoverview.html    |  39 ++-
 .../components/myoverview/myoverview.ts       | 234 +++++++-----------
 src/addons/block/myoverview/lang.json         |   4 +-
 src/core/components/combobox/combobox.ts      |   1 -
 .../components/combobox/core-combobox.html    |   2 -
 src/core/lang.json                            |   1 -
 src/theme/theme.base.scss                     |  14 +-
 12 files changed, 141 insertions(+), 272 deletions(-)
 delete mode 100644 src/addons/block/myoverview/components/filteroptions/filteroptions.html
 delete mode 100644 src/addons/block/myoverview/components/filteroptions/filteroptions.scss
 delete mode 100644 src/addons/block/myoverview/components/filteroptions/filteroptions.ts

diff --git a/scripts/langindex.json b/scripts/langindex.json
index aba8a3680..93ec25362 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -40,10 +40,10 @@
   "addon.block_learningplans.pluginname": "block_lp",
   "addon.block_myoverview.all": "block_myoverview",
   "addon.block_myoverview.allincludinghidden": "block_myoverview",
-  "addon.block_myoverview.aria:favourites": "block_myoverview",
-  "addon.block_myoverview.aria:hiddencourses": "block_myoverview",
   "addon.block_myoverview.card": "block_myoverview",
+  "addon.block_myoverview.favourites": "block_myoverview",
   "addon.block_myoverview.future": "block_myoverview",
+  "addon.block_myoverview.hiddencourses": "block_myoverview",
   "addon.block_myoverview.inprogress": "block_myoverview",
   "addon.block_myoverview.lastaccessed": "block_myoverview",
   "addon.block_myoverview.list": "block_myoverview",
@@ -1451,7 +1451,6 @@
   "core.allparticipants": "moodle",
   "core.answer": "moodle",
   "core.answered": "quiz",
-  "core.applyfilters": "user",
   "core.areyousure": "moodle",
   "core.back": "moodle",
   "core.block.blocks": "moodle",
diff --git a/src/addons/block/myoverview/components/components.module.ts b/src/addons/block/myoverview/components/components.module.ts
index 49e53a2f4..c1829bd61 100644
--- a/src/addons/block/myoverview/components/components.module.ts
+++ b/src/addons/block/myoverview/components/components.module.ts
@@ -17,12 +17,10 @@ import { NgModule } from '@angular/core';
 import { CoreSharedModule } from '@/core/shared.module';
 import { CoreCoursesComponentsModule } from '@features/courses/components/components.module';
 import { AddonBlockMyOverviewComponent } from './myoverview/myoverview';
-import { AddonBlockMyOverviewFilterOptionsComponent } from './filteroptions/filteroptions';
 
 @NgModule({
     declarations: [
         AddonBlockMyOverviewComponent,
-        AddonBlockMyOverviewFilterOptionsComponent,
     ],
     imports: [
         CoreSharedModule,
diff --git a/src/addons/block/myoverview/components/filteroptions/filteroptions.html b/src/addons/block/myoverview/components/filteroptions/filteroptions.html
deleted file mode 100644
index 2a6caf36b..000000000
--- a/src/addons/block/myoverview/components/filteroptions/filteroptions.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<ion-header>
-    <ion-toolbar>
-        <ion-title>
-            <h1>{{ 'core.courses.filtermycourses' | translate }}</h1>
-        </ion-title>
-        <ion-buttons slot="end">
-            <ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
-                <ion-icon name="fas-times" slot="icon-only" aria-hidden="true"></ion-icon>
-            </ion-button>
-        </ion-buttons>
-    </ion-toolbar>
-</ion-header>
-<ion-content>
-    <ion-list>
-        <ion-radio-group [(ngModel)]="options.timeFilterSelected">
-            <ion-item class="ion-text-wrap" *ngIf="options.show.all">
-                <ion-label>{{'addon.block_myoverview.all' | translate}}</ion-label>
-                <ion-radio slot="end" value="all"></ion-radio>
-            </ion-item>
-            <ion-item class="ion-text-wrap" *ngIf="options.show.inprogress">
-                <ion-label>{{'addon.block_myoverview.inprogress' | translate}}</ion-label>
-                <ion-radio slot="end" value="inprogress"></ion-radio>
-            </ion-item>
-            <ion-item class="ion-text-wrap" *ngIf="options.show.future">
-                <ion-label>{{'addon.block_myoverview.future' | translate}}</ion-label>
-                <ion-radio slot="end" value="future"></ion-radio>
-            </ion-item>
-            <ion-item class="ion-text-wrap" *ngIf="options.show.past">
-                <ion-label>{{'addon.block_myoverview.past' | translate}}</ion-label>
-                <ion-radio slot="end" value="past"></ion-radio>
-            </ion-item>
-        </ion-radio-group>
-
-        <core-spacer *ngIf="options.show.custom"></core-spacer>
-        <ion-radio-group [(ngModel)]="options.customSelected" *ngIf="options.show.custom" allowEmptySelection="true">
-            <ion-item class="ion-text-wrap" *ngFor="let customOption of options.customFilters">
-                <ion-label>{{customOption.name}}</ion-label>
-                <ion-radio slot="end" [value]="customOption.value"></ion-radio>
-            </ion-item>
-        </ion-radio-group>
-
-        <core-spacer></core-spacer>
-        <ion-item *ngIf="options.show.favourite">
-            <ion-label>{{ 'addon.block_myoverview.aria:favourites' | translate }}</ion-label>
-            <ion-toggle [(ngModel)]="options.favouriteSelected"></ion-toggle>
-        </ion-item>
-
-        <ion-item *ngIf="options.show.hidden">
-            <ion-label>{{ 'addon.block_myoverview.aria:hiddencourses' | translate }}</ion-label>
-            <ion-toggle [(ngModel)]="options.hiddenSelected"></ion-toggle>
-        </ion-item>
-    </ion-list>
-</ion-content>
-<ion-footer class="ion-padding">
-    <ion-button (click)="apply()" expand="block" [attr.aria-label]="'core.applyfilters' | translate" class="ion-text-wrap">
-        {{ 'core.applyfilters' | translate }}
-    </ion-button>
-</ion-footer>
diff --git a/src/addons/block/myoverview/components/filteroptions/filteroptions.scss b/src/addons/block/myoverview/components/filteroptions/filteroptions.scss
deleted file mode 100644
index 166260056..000000000
--- a/src/addons/block/myoverview/components/filteroptions/filteroptions.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-ion-footer {
-    &::before {
-        display: none;
-    }
-    ion-button {
-        margin: 0;
-    }
-}
diff --git a/src/addons/block/myoverview/components/filteroptions/filteroptions.ts b/src/addons/block/myoverview/components/filteroptions/filteroptions.ts
deleted file mode 100644
index ad77d9a5b..000000000
--- a/src/addons/block/myoverview/components/filteroptions/filteroptions.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-// (C) Copyright 2015 Moodle Pty Ltd.
-//
-// 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, Input } from '@angular/core';
-import { ModalController } from '@singletons';
-import { AddonBlockMyOverviewFilterOptions } from '../myoverview/myoverview';
-
-/**
- * Component to render a my overview filter options.
- */
-@Component({
-    selector: 'addon-block-myoverview-filter-options',
-    templateUrl: 'filteroptions.html',
-    styleUrls: ['filteroptions.scss'],
-})
-export class AddonBlockMyOverviewFilterOptionsComponent {
-
-    @Input() options!: AddonBlockMyOverviewFilterOptions;
-
-    /**
-     * Appl filters.
-     */
-    apply(): void {
-        ModalController.dismiss(this.options);
-    }
-
-    /**
-     * Close modal.
-     */
-    closeModal(): void {
-        ModalController.dismiss();
-    }
-
-}
diff --git a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
index f2a0b892e..d4328e235 100644
--- a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
+++ b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
@@ -26,20 +26,51 @@
         <ion-col>
             <!-- Filter courses. -->
             <ion-searchbar [(ngModel)]="textFilter" (ionInput)="filterTextChanged($event.target)"
-                (ionCancel)="filterTextChanged($event.target)" [placeholder]="'core.filter' | translate">
+                (ionCancel)="filterTextChanged($event.target)" [placeholder]="'core.courses.filtermycourses' | translate">
             </ion-searchbar>
         </ion-col>
     </ion-row>
     <ion-row class="ion-justify-content-between ion-align-items-center addon-block-myoverview-filter" *ngIf="hasCourses">
         <ion-col size="auto" *ngIf="filters.enabled">
-            <core-combobox interface="modal" [label]="'core.courses.filtermycourses' | translate" (onChange)="filterOptionsChanged($event)"
-                icon="fas-filter" [badge]="filters.count" [modalOptions]="filterModalOptions">
+            <core-combobox [label]="'core.courses.filtermycourses' | translate" [selection]="filters.timeFilterSelected"
+                (onChange)="filterOptionsChanged($event)">
+                <ion-select-option class="ion-text-wrap core-select-option-border-bottom" value="allincludinghidden"
+                    *ngIf="filters.show.allincludinghidden">
+                    {{ 'addon.block_myoverview.allincludinghidden' | translate }}
+                </ion-select-option>
+                <ion-select-option class="ion-text-wrap core-select-option-border-bottom" value="all" *ngIf="filters.show.all">
+                    {{ 'addon.block_myoverview.all' | translate }}
+                </ion-select-option>
+                <ion-select-option class="ion-text-wrap"
+                    [class.core-select-option-border-bottom]="!filters.show.past && !filters.show.future" value="inprogress"
+                    *ngIf="filters.show.inprogress">
+                    {{ 'addon.block_myoverview.inprogress' | translate }}
+                </ion-select-option>
+                <ion-select-option class="ion-text-wrap" [class.core-select-option-border-bottom]="!filters.show.past" value="future"
+                    *ngIf="filters.show.future">
+                    {{ 'addon.block_myoverview.future' | translate }}
+                </ion-select-option>
+                <ion-select-option class="ion-text-wrap core-select-option-border-bottom" value="past" *ngIf="filters.show.past">
+                    {{ 'addon.block_myoverview.past' | translate }}
+                </ion-select-option>
+                <ng-container *ngIf="filters.show.custom">
+                    <ng-container *ngFor="let customOption of filters.customFilters; let index = index; let last = last">
+                        <ion-select-option class="ion-text-wrap" value="custom-{{index}}" [class.core-select-option-border-bottom]="last">
+                            {{ customOption.name }}</ion-select-option>
+                    </ng-container>
+                </ng-container>
+                <ion-select-option class="ion-text-wrap core-select-option-border-bottom" value="favourite" *ngIf="filters.show.favourite">
+                    {{ 'addon.block_myoverview.favourites' | translate }}
+                </ion-select-option>
+                <ion-select-option class="ion-text-wrap" value="hidden" *ngIf="filters.show.hidden">
+                    {{ 'addon.block_myoverview.hiddencourses' | translate }}
+                </ion-select-option>
             </core-combobox>
         </ion-col>
         <ion-col>
             <!-- Filter courses. -->
             <ion-searchbar class="ion-hide-md-down" [(ngModel)]="textFilter" (ionInput)="filterTextChanged($event.target)"
-                (ionCancel)="filterTextChanged($event.target)" [placeholder]="'core.filter' | translate">
+                (ionCancel)="filterTextChanged($event.target)" [placeholder]="'core.courses.filtermycourses' | translate">
             </ion-searchbar>
         </ion-col>
         <ion-col size="auto" *ngIf="sort.enabled">
diff --git a/src/addons/block/myoverview/components/myoverview/myoverview.ts b/src/addons/block/myoverview/components/myoverview/myoverview.ts
index d54b6c3b6..14bb2c6ff 100644
--- a/src/addons/block/myoverview/components/myoverview/myoverview.ts
+++ b/src/addons/block/myoverview/components/myoverview/myoverview.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Component, OnInit, OnDestroy } from '@angular/core';
-import { ModalOptions } from '@ionic/core';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreTimeUtils } from '@services/utils/time';
 import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
@@ -27,12 +26,12 @@ import { CoreUtils } from '@services/utils/utils';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTextUtils } from '@services/utils/text';
 import { AddonCourseCompletion } from '@addons/coursecompletion/services/coursecompletion';
-import { AddonBlockMyOverviewFilterOptionsComponent } from '../filteroptions/filteroptions';
 import { IonSearchbar } from '@ionic/angular';
 import moment from 'moment';
 import { CoreNavigator } from '@services/navigator';
 
-const FILTER_PRIORITY: AddonBlockMyOverviewTimeFilters[] = ['all', 'inprogress', 'future', 'past'];
+const FILTER_PRIORITY: AddonBlockMyOverviewTimeFilters[] =
+    ['all', 'inprogress', 'future', 'past', 'favourite', 'allincludinghidden', 'hidden'];
 
 /**
  * Component to render a my overview block.
@@ -59,6 +58,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
     filters: AddonBlockMyOverviewFilterOptions = {
         enabled: false,
         show: { // Options are visible, disabled, hidden.
+            allincludinghidden: true,
             all: true,
             past: true,
             inprogress: true,
@@ -68,14 +68,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
             custom: false,
         },
         timeFilterSelected: 'inprogress',
-        favouriteSelected: false,
-        hiddenSelected: false,
         customFilters: [],
-        count: 0,
-    };
-
-    filterModalOptions: ModalOptions = {
-        component: AddonBlockMyOverviewFilterOptionsComponent,
     };
 
     isLayoutSwitcherAvailable = false;
@@ -100,6 +93,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
     protected fetchContentDefaultError = 'Error getting my overview data.';
     protected gradePeriodAfter = 0;
     protected gradePeriodBefore = 0;
+    protected today = 0;
 
     constructor() {
         super('AddonBlockMyOverviewComponent');
@@ -151,43 +145,11 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
             return;
         }));
 
-        // Wait for the migration.
-        await this.currentSite.getLocalSiteConfig<string>(
+        promises.push(this.currentSite.getLocalSiteConfig(
             'AddonBlockMyOverviewFilter',
             this.filters.timeFilterSelected,
-        ).then(async (value) => {
-            if (FILTER_PRIORITY.includes(value as AddonBlockMyOverviewTimeFilters)) {
-                this.filters.timeFilterSelected = value as AddonBlockMyOverviewTimeFilters;
-
-                return;
-            }
-
-            // Migrate setting.
-            this.filters.hiddenSelected = value == 'allincludinghidden' || value == 'hidden';
-
-            if (value == 'favourite') {
-                this.filters.favouriteSelected = true;
-            } else {
-                this.filters.favouriteSelected = false;
-            }
-
-            return await this.saveFilters('all');
-        });
-
-        promises.push(this.currentSite.getLocalSiteConfig(
-            'AddonBlockMyOverviewFavouriteFilter',
-            this.filters.favouriteSelected ? 1 : 0,
         ).then((value) => {
-            this.filters.favouriteSelected = value == 1;
-
-            return;
-        }));
-
-        promises.push(this.currentSite.getLocalSiteConfig(
-            'AddonBlockMyOverviewHiddenFilter',
-            this.filters.hiddenSelected ? 1 : 0,
-        ).then((value) => {
-            this.filters.hiddenSelected = value == 1;
+            this.filters.timeFilterSelected = value;
 
             return;
         }));
@@ -315,6 +277,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
             config?.displaygroupingallincludinghidden?.value == '1' ||
             sampleCourse.hidden !== undefined && (!config || config.displaygroupinghidden?.value == '1');
 
+        this.filters.show.allincludinghidden =  !config || config.displaygroupingallincludinghidden?.value == '1';
         this.filters.show.all =  !config || config.displaygroupingall?.value == '1';
         this.filters.show.inprogress = !config || config.displaygroupinginprogress?.value == '1';
         this.filters.show.past = !config || config.displaygroupingpast?.value == '1';
@@ -338,10 +301,6 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
             this.saveFilters('all');
         }
 
-        this.filterModalOptions.componentProps = {
-            options: Object.assign({}, this.filters),
-        };
-
         this.filterCourses();
     }
 
@@ -475,81 +434,66 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
      * Set selected courses filter.
      */
     protected async filterCourses(): Promise<void> {
-        this.filters.count = 0;
-
         let timeFilter = this.filters.timeFilterSelected;
 
-        // Filter is not active, take the first active or all.
-        if (!this.filters.show[timeFilter]) {
-            timeFilter = FILTER_PRIORITY.find((name) => this.filters.show[name]) || 'all';
-
-            this.saveFilters(timeFilter);
-        }
-
-        if (timeFilter !== 'all') {
-            this.filters.count++;
-        }
-
         this.filteredCourses = this.allCourses;
 
-        const customFilterName = this.block.configsRecord?.customfiltergrouping.value;
-        const customFilterValue = this.filters.customSelected;
-        if (customFilterName && this.filters.show.custom && customFilterValue !== undefined) {
-            this.filters.count++;
+        if (this.filters.show.custom && timeFilter.startsWith('custom-')) {
+            // Custom filter.
+            const customFilterName = this.block.configsRecord?.customfiltergrouping.value;
+            const customFilterValue = this.filters.customFilters[timeFilter.substring(7)]?.value;
 
-            this.loaded = false;
-            try {
-                const courses = await CoreCourses.getEnrolledCoursesByCustomField(customFilterName, customFilterValue);
+            if (customFilterName !== undefined && customFilterValue !== undefined) {
+                this.loaded = false;
+                try {
+                    const courses = await CoreCourses.getEnrolledCoursesByCustomField(customFilterName, customFilterValue);
 
-                const courseIds = courses.map((course) => course.id);
+                    // Get the courses information from allincludinghidden to get the max info about the course.
+                    const courseIds = courses.map((course) => course.id);
 
-                this.filteredCourses = this.filteredCourses.filter((course) => courseIds.includes(course.id));
-            } catch (error) {
-                CoreDomUtils.showErrorModalDefault(error, this.fetchContentDefaultError);
-            } finally {
-                this.loaded = true;
-            }
-        }
-
-        const onlyFavourite = this.filters.show.favourite && this.filters.favouriteSelected;
-        if (onlyFavourite) {
-            this.filters.count++;
-        }
-
-        const showHidden = this.filters.show.hidden && this.filters.hiddenSelected;
-        if (showHidden) {
-            this.filters.count++;
-        }
-
-        // Time filter, favourite and hidden.
-        const today = CoreTimeUtils.timestamp();
-
-        this.filteredCourses = this.filteredCourses.filter((course) => {
-            let include = timeFilter == 'all';
-
-            if (!include) {
-                if ((course.enddate && this.courseClassifyEndDate(course.enddate) < today) || course.completed) {
-                    // Courses that have already ended.
-                    include = timeFilter == 'past';
-                } else if (course.startdate && this.courseClassifyStartDate(course.startdate) > today) {
-                    // Courses that have not started yet.
-                    include = timeFilter == 'future';
-                } else {
-                    // Courses still in progress.
-                    include = timeFilter == 'inprogress';
+                    this.filteredCourses = this.filteredCourses.filter((course) => courseIds.includes(course.id));
+                } catch (error) {
+                    CoreDomUtils.showErrorModalDefault(error, this.fetchContentDefaultError);
+                } finally {
+                    this.loaded = true;
                 }
             }
-
-            if (onlyFavourite) {
-                include = include && !!course.isfavourite;
+        } else {
+            // Filter is not active, take the first active or all. Custom is never saved.
+            if (!this.filters.show[timeFilter]) {
+                timeFilter = FILTER_PRIORITY.find((name) => this.filters.show[name]) || 'all';
             }
+            this.saveFilters(timeFilter);
 
-            if (!showHidden) {
-                include = include && !course.hidden;
+            // Update today date.
+            this.today = Date.now();
+
+            // Apply filters.
+            switch(timeFilter) {
+                case 'allincludinghidden':
+                    // No nothing, it's all courses.
+                    break;
+                case 'all':
+                    this.filteredCourses = this.filteredCourses.filter((course) => !course.hidden);
+                    break;
+                case 'inprogress':
+                    this.filteredCourses = this.filteredCourses.filter((course) =>
+                        !course.hidden && !this.isPastCourse(course) && !this.isFutureCourse(course));
+                    break;
+                case 'future':
+                    this.filteredCourses = this.filteredCourses.filter((course) => !course.hidden && this.isFutureCourse(course));
+                    break;
+                case 'past':
+                    this.filteredCourses = this.filteredCourses.filter((course) => !course.hidden && this.isPastCourse(course));
+                    break;
+                case 'favourite':
+                    this.filteredCourses = this.filteredCourses.filter((course) => !course.hidden && course.isfavourite);
+                    break;
+                case 'hidden':
+                    this.filteredCourses = this.filteredCourses.filter((course) => course.hidden);
+                    break;
             }
-
-            return include;
-        });
+        }
 
         // Text filter.
         const value = this.textFilter.trim().toLowerCase();
@@ -572,23 +516,41 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
     }
 
     /**
-     * This function calculates the end date to use for display classification purposes, incorporating the grace period, if any.
+     * Calculates if course date is past.
      *
-     * @param endDate Course end date.
-     * @return The new enddate.
+     * @param course Course Object.
+     * @return Wether the course is past.
      */
-    protected courseClassifyEndDate(endDate: number): number {
-        return moment(endDate).add(this.gradePeriodAfter, 'days').valueOf();
+    protected isPastCourse(course: CoreEnrolledCourseDataWithOptions): boolean {
+        if (course.completed) {
+            return true;
+        }
+
+        if (!course.enddate) {
+            return false;
+        }
+
+        // Calculate the end date to use for display classification purposes, incorporating the grace period, if any.
+        const endDate = moment(course.enddate * 1000).add(this.gradePeriodAfter, 'days').valueOf();
+
+        return endDate < this.today;
     }
 
     /**
-     * This function calculates the start date to use for display classification purposes, incorporating the grace period, if any.
+     * Calculates if course date is future.
      *
-     * @param startDate Course start date.
-     * @return The new startdate.
+     * @param course Course Object.
+     * @return Wether the course is future.
      */
-    protected courseClassifyStartDate(startDate: number): number {
-        return moment(startDate).subtract(this.gradePeriodBefore, 'days').valueOf();
+    protected isFutureCourse(course: CoreEnrolledCourseDataWithOptions): boolean {
+        if (this.isPastCourse(course) || !course.startdate) {
+            return false;
+        }
+
+        // Calculate the start date to use for display classification purposes, incorporating the grace period, if any.
+        const startDate = moment(course.startdate * 1000).subtract(this.gradePeriodBefore, 'days').valueOf();
+
+        return startDate > this.today;
     }
 
     /**
@@ -630,18 +592,9 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
      * @param timeFilter New time filter.
      * @return Promise resolved when done.
      */
-    async saveFilters(timeFilter: AddonBlockMyOverviewTimeFilters): Promise<void> {
+    async saveFilters(timeFilter: string): Promise<void> {
         this.filters.timeFilterSelected = timeFilter;
-
-        this.filterModalOptions.componentProps = {
-            options: Object.assign({}, this.filters),
-        };
-
-        await Promise.all([
-            this.currentSite.setLocalSiteConfig('AddonBlockMyOverviewFilter', this.filters.timeFilterSelected),
-            this.currentSite.setLocalSiteConfig('AddonBlockMyOverviewFavouriteFilter', this.filters.favouriteSelected ? 1 : 0),
-            this.currentSite.setLocalSiteConfig('AddonBlockMyOverviewHiddenFilter', this.filters.hiddenSelected ? 1 : 0),
-        ]);
+        await this.currentSite.setLocalSiteConfig('AddonBlockMyOverviewFilter', timeFilter);
     }
 
     /**
@@ -669,13 +622,13 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
     }
 
     /**
-     * Opens display Options modal.
+     * Option selected save and apply filter.
      *
+     * @param selected Option selected.
      * @return Promise resolved when done.
      */
-    filterOptionsChanged(modalData: AddonBlockMyOverviewFilterOptions): void {
-        this.filters = modalData;
-        this.saveFilters(this.filters.timeFilterSelected);
+    async filterOptionsChanged(selected: AddonBlockMyOverviewTimeFilters): Promise<void> {
+        this.filters.timeFilterSelected = selected;
         this.filterCourses();
     }
 
@@ -698,11 +651,12 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
 }
 
 type AddonBlockMyOverviewLayouts = 'card'|'list';
-type AddonBlockMyOverviewTimeFilters = 'all'|'inprogress'|'future'|'past';
+type AddonBlockMyOverviewTimeFilters = 'allincludinghidden'|'all'|'inprogress'|'future'|'past'|'favourite'|'hidden';
 
 export type AddonBlockMyOverviewFilterOptions = {
     enabled: boolean;
     show: {
+        allincludinghidden: boolean;
         all: boolean;
         inprogress: boolean;
         future: boolean;
@@ -711,15 +665,11 @@ export type AddonBlockMyOverviewFilterOptions = {
         hidden: boolean;
         custom: boolean;
     };
-    timeFilterSelected: AddonBlockMyOverviewTimeFilters;
-    favouriteSelected: boolean;
-    hiddenSelected: boolean;
+    timeFilterSelected: string;
     customFilters: {
         name: string;
         value: string;
     }[];
-    customSelected?: string;
-    count: number;
 };
 
 type AddonBlockMyOverviewSortOptions = {
diff --git a/src/addons/block/myoverview/lang.json b/src/addons/block/myoverview/lang.json
index 8030a7813..40c94300b 100644
--- a/src/addons/block/myoverview/lang.json
+++ b/src/addons/block/myoverview/lang.json
@@ -1,10 +1,10 @@
 {
     "all": "All",
     "allincludinghidden": "All (including archived)",
-    "aria:favourites": "Show starred courses only",
-    "aria:hiddencourses": "Show archived courses",
     "card": "Card",
+    "favourites": "Starred",
     "future": "Future",
+    "hiddencourses": "Archived",
     "inprogress": "In progress",
     "lastaccessed": "Last accessed",
     "list": "List",
diff --git a/src/core/components/combobox/combobox.ts b/src/core/components/combobox/combobox.ts
index 32e56a904..83d1f4877 100644
--- a/src/core/components/combobox/combobox.ts
+++ b/src/core/components/combobox/combobox.ts
@@ -53,7 +53,6 @@ export class CoreComboboxComponent {
 
     // Additional options when interface modal is selected.
     @Input() icon?: string; // Icon for modal interface.
-    @Input() badge?: number; // Badge number to show near the icon.
     @Input() modalOptions?: ModalOptions; // Will emit an event the value changed.
     @Input() listboxId = '';
 
diff --git a/src/core/components/combobox/core-combobox.html b/src/core/components/combobox/core-combobox.html
index baa897fa3..02b0cec27 100644
--- a/src/core/components/combobox/core-combobox.html
+++ b/src/core/components/combobox/core-combobox.html
@@ -1,7 +1,6 @@
 <ion-button (click)="openSelect($event)" *ngIf="interface != 'modal' && icon" [disabled]="disabled">
     <ion-icon [name]="icon" [attr.aria-label]="label" slot="start">
     </ion-icon>
-    <ion-badge *ngIf="badge && badge > 0" slot="start">{{badge}}</ion-badge>
     <div class="select-icon" role="presentation" aria-hidden="true">
         <div class="select-icon-inner"></div>
     </div>
@@ -14,7 +13,6 @@
 <ion-button *ngIf="interface == 'modal'" aria-haspopup="listbox" [attr.aria-controls]="listboxId" [attr.aria-owns]="listboxId"
     [attr.aria-expanded]="expanded" (click)="openSelect()" [disabled]="disabled" expand="block" role="combobox">
     <ion-icon *ngIf="icon" [name]="icon" slot="start" aria-hidden="true"></ion-icon>
-    <ion-badge *ngIf="badge && badge > 0" slot="start">{{badge}}</ion-badge>
     <span class="sr-only" *ngIf="label">{{ label }}:</span>
     <div class="select-text">
         <slot name="text">{{selection}}</slot>
diff --git a/src/core/lang.json b/src/core/lang.json
index a66c1a6a3..7429c930b 100644
--- a/src/core/lang.json
+++ b/src/core/lang.json
@@ -9,7 +9,6 @@
     "allparticipants": "All participants",
     "answer": "Answer",
     "answered": "Answered",
-    "applyfilters": "Apply filters",
     "areyousure": "Are you sure?",
     "back": "Back",
     "browser": "Browser",
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index a162e6c0a..e135701a0 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -1020,10 +1020,16 @@ ion-select::part(icon) {
     opacity: 1;
 }
 
-ion-select-popover ion-item.core-select-option-title {
-    cursor: pointer;
-    ion-radio {
-        display: none;
+ion-select-popover {
+    ion-item.core-select-option-border-bottom {
+        border-bottom: 1px solid var(--stroke);
+    }
+
+    ion-item.core-select-option-title {
+        cursor: pointer;
+        ion-radio {
+            display: none;
+        }
     }
 }
 

From d776cbe054bb1187c59b74b022080d2f764544c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 1 Apr 2022 13:03:31 +0200
Subject: [PATCH 0903/1008] MOBILE-3833 format-text: Change expand image icon

---
 src/core/directives/format-text.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/core/directives/format-text.ts b/src/core/directives/format-text.ts
index f134eddd6..a6f0d2f9d 100644
--- a/src/core/directives/format-text.ts
+++ b/src/core/directives/format-text.ts
@@ -256,7 +256,8 @@ export class CoreFormatTextDirective implements OnChanges, OnDestroy, AsyncCompo
             button.classList.add('hidden');
             button.setAttribute('aria-label', label);
             // Add an ion-icon item to apply the right styles, but the ion-icon component won't be executed.
-            button.innerHTML = '<ion-icon name="fas-search" aria-hidden="true" src="assets/fonts/font-awesome/solid/search.svg">\
+            button.innerHTML = '<ion-icon name="fas-expand-alt" aria-hidden="true" \
+                src="assets/fonts/font-awesome/solid/expand-alt.svg">\
             </ion-icon>';
 
             button.addEventListener('click', (e: Event) => {

From 16b750b566f40ad7316dee8164ad7f73c132d06f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 1 Apr 2022 14:04:05 +0200
Subject: [PATCH 0904/1008] MOBILE-3833 resource: Add padding on embedded
 resources

---
 .../mod/resource/components/index/addon-mod-resource-index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/addons/mod/resource/components/index/addon-mod-resource-index.html b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
index 6291b1a09..020ba6eea 100644
--- a/src/addons/mod/resource/components/index/addon-mod-resource-index.html
+++ b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
@@ -24,7 +24,7 @@
         <core-iframe [src]="src"></core-iframe>
     </ng-container>
 
-    <div *ngIf="mode == 'embedded'">
+    <div *ngIf="mode == 'embedded'" class="ion-padding">
         <core-format-text [text]="contentText" [filter]="false"></core-format-text>
     </div>
 

From f66400aae6c1e4861665ed484935f664c1401c28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 1 Apr 2022 14:10:17 +0200
Subject: [PATCH 0905/1008] MOBILE-3833 messages: Reduce padding on title bar

---
 .../messages/pages/discussion/discussion.scss | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/addons/messages/pages/discussion/discussion.scss b/src/addons/messages/pages/discussion/discussion.scss
index 2db2276f0..f3a030dc3 100644
--- a/src/addons/messages/pages/discussion/discussion.scss
+++ b/src/addons/messages/pages/discussion/discussion.scss
@@ -27,24 +27,28 @@
         @include position(0, 0, null, null);
     }
 
-    ion-header ion-toolbar h1 {
-        display: flex;
-        align-items: center;
+    ion-header ion-toolbar ion-title {
         padding: 0;
 
-        .core-bar-button-image {
-            @include margin-horizontal(null, 6px);
-        }
+        h1 {
+            display: flex;
+            align-items: center;
+            padding: 0;
 
-        core-format-text {
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-            flex-shrink: 1;
-        }
+            .core-bar-button-image {
+                @include margin-horizontal(null, 6px);
+            }
 
-        ion-icon {
-            @include margin-horizontal(6px, null);
+            core-format-text {
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+                flex-shrink: 1;
+            }
+
+            ion-icon {
+                @include margin-horizontal(6px, null);
+            }
         }
     }
 }

From 230e42ab5d11aa89b711cf44ce7bf7cb567697c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 1 Apr 2022 14:43:45 +0200
Subject: [PATCH 0906/1008] MOBILE-3833 style: Small fix on empty box

---
 src/addons/messages/pages/contacts/contacts.html | 4 ++--
 src/core/components/empty-box/empty-box.scss     | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/addons/messages/pages/contacts/contacts.html b/src/addons/messages/pages/contacts/contacts.html
index 8a3cacd95..0715dea69 100644
--- a/src/addons/messages/pages/contacts/contacts.html
+++ b/src/addons/messages/pages/contacts/contacts.html
@@ -24,7 +24,7 @@
                         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
                     </ion-refresher>
                     <core-loading [hideUntil]="confirmedLoaded">
-                        <ion-list class="ion-no-margin">
+                        <ion-list class="ion-no-margin" *ngIf="confirmedContacts.length">
                             <ion-item class="ion-text-wrap addon-messages-conversation-item" (click)="selectUser(contact.id)" button
                                 *ngFor="let contact of confirmedContacts" [attr.aria-label]="contact.fullname" detail="true"
                                 [attr.aria-current]="contact.id == selectedUserId ? 'page' : 'false'">
@@ -62,7 +62,7 @@
                         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
                     </ion-refresher>
                     <core-loading [hideUntil]="requestsLoaded">
-                        <ion-list class="ion-no-margin">
+                        <ion-list class="ion-no-margin" *ngIf="requests.length">
                             <ion-item class="ion-text-wrap addon-messages-conversation-item" *ngFor="let request of requests"
                                 [attr.aria-label]="request.fullname" (click)="selectUser(request.id)" button
                                 [attr.aria-current]="request.id == selectedUserId ? 'page' : 'false'" detail="true">
diff --git a/src/core/components/empty-box/empty-box.scss b/src/core/components/empty-box/empty-box.scss
index 812dde4ca..5f333fb36 100644
--- a/src/core/components/empty-box/empty-box.scss
+++ b/src/core/components/empty-box/empty-box.scss
@@ -13,6 +13,8 @@
     padding: 16px;
     --image-size: 120px;
 
+    height: 100%;
+
     ion-icon {
         font-size: var(--image-size);
     }

From 5fe63cda956077a61965ad3c242ee2c84be7fb93 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 4 Apr 2022 08:02:46 +0200
Subject: [PATCH 0907/1008] MOBILE-3919 assign: Dismiss toast when leaving page

---
 src/addons/mod/assign/pages/edit/edit.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/addons/mod/assign/pages/edit/edit.ts b/src/addons/mod/assign/pages/edit/edit.ts
index 4a5e59cfa..a1a29932e 100644
--- a/src/addons/mod/assign/pages/edit/edit.ts
+++ b/src/addons/mod/assign/pages/edit/edit.ts
@@ -73,6 +73,7 @@ export class AddonModAssignEditPage implements OnInit, OnDestroy, CanLeave {
     protected hasOffline = false; // Whether the assignment has offline data.
     protected isDestroyed = false; // Whether the component has been destroyed.
     protected forceLeave = false; // To allow leaving the page without checking for changes.
+    protected timeUpToast?: HTMLIonToastElement;
 
     constructor(
         protected route: ActivatedRoute,
@@ -463,8 +464,8 @@ export class AddonModAssignEditPage implements OnInit, OnDestroy, CanLeave {
     /**
      * Function called when the time is up.
      */
-    timeUp(): void {
-        CoreDomUtils.showToastWithOptions({
+    async timeUp(): Promise<void> {
+        this.timeUpToast = await CoreDomUtils.showToastWithOptions({
             message: Translate.instant('addon.mod_assign.caneditsubmission'),
             duration: 0,
             buttons: [Translate.instant('core.dismiss')],
@@ -477,6 +478,7 @@ export class AddonModAssignEditPage implements OnInit, OnDestroy, CanLeave {
      */
     ngOnDestroy(): void {
         this.isDestroyed = true;
+        this.timeUpToast?.dismiss();
 
         // Unblock the assignment.
         if (this.assign) {

From 82c11b83857d2d2e1068cb7a825aef3e674ff983 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 4 Apr 2022 10:24:56 +0200
Subject: [PATCH 0908/1008] MOBILE-3833 my: Add horizontal margin on filter
 columns

---
 .../block/myoverview/components/myoverview/myoverview.scss      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/addons/block/myoverview/components/myoverview/myoverview.scss b/src/addons/block/myoverview/components/myoverview/myoverview.scss
index 06c764187..2c09ff1e8 100644
--- a/src/addons/block/myoverview/components/myoverview/myoverview.scss
+++ b/src/addons/block/myoverview/components/myoverview/myoverview.scss
@@ -5,6 +5,8 @@
 
         ion-col {
             padding: 0;
+            margin-right: 2px;
+            margin-left: 2px;
         }
 
         ion-button,

From bb523b14134cb227677c77cc7ec874afc8dc90cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 4 Apr 2022 10:26:30 +0200
Subject: [PATCH 0909/1008] MOBILE-3833 collapsible: Revert to listen
 ionViewDidEnter again

---
 src/core/directives/collapsible-header.ts | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts
index 887918f05..17bbc9e07 100644
--- a/src/core/directives/collapsible-header.ts
+++ b/src/core/directives/collapsible-header.ts
@@ -14,6 +14,7 @@
 
 import { Directive, ElementRef, Input, OnChanges, OnDestroy, OnInit, SimpleChange } from '@angular/core';
 import { CoreCancellablePromise } from '@classes/cancellable-promise';
+import { CorePromisedValue } from '@classes/promised-value';
 import { CoreLoadingComponent } from '@components/loading/loading';
 import { CoreTabsOutletComponent } from '@components/tabs-outlet/tabs-outlet';
 import { CoreTabsComponent } from '@components/tabs/tabs';
@@ -69,12 +70,14 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
     protected content?: HTMLIonContentElement;
     protected contentScrollListener?: EventListener;
     protected endContentScrollListener?: EventListener;
+    protected pageDidEnterListener?: EventListener;
     protected resizeListener?: CoreEventObserver;
     protected floatingTitle?: HTMLHeadingElement;
     protected scrollingHeight?: number;
     protected subscriptions: Subscription[] = [];
     protected enabled = true;
     protected isWithinContent = false;
+    protected enteredPromise = new CorePromisedValue<void>();
     protected mutationObserver?: MutationObserver;
     protected loadingFloatingTitle = false;
     protected visiblePromise?: CoreCancellablePromise<void>;
@@ -104,6 +107,7 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
         await Promise.all([
             this.initializeCollapsedHeader(),
             this.initializeExpandedHeader(),
+            await this.enteredPromise,
         ]);
 
         await this.initializeFloatingTitle();
@@ -138,6 +142,9 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
         if (this.content && this.endContentScrollListener) {
             this.content.removeEventListener('ionScrollEnd', this.endContentScrollListener);
         }
+        if (this.page && this.pageDidEnterListener) {
+            this.page.removeEventListener('ionViewDidEnter', this.pageDidEnterListener);
+        }
 
         this.resizeListener?.off();
         this.mutationObserver?.disconnect();
@@ -193,6 +200,22 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
         // Find element and prepare classes.
         this.page = this.collapsedHeader.parentElement;
         this.page.classList.add('collapsible-header-page');
+
+        this.page.addEventListener(
+            'ionViewDidEnter',
+            this.pageDidEnterListener = () => {
+                clearTimeout(timeout);
+                this.enteredPromise.resolve();
+                if (this.page && this.pageDidEnterListener) {
+                    this.page.removeEventListener('ionViewDidEnter', this.pageDidEnterListener);
+                }
+            },
+        );
+
+        // Timeout in case event is never fired.
+        const timeout = window.setTimeout(() => {
+            this.enteredPromise.reject(new Error('[collapsible-header] Waiting for ionViewDidEnter timeout reached'));
+        }, 5000);
     }
 
     /**

From 28c817b7ed87a3bcaf9cf85cb596353b48370f2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 4 Apr 2022 10:55:19 +0200
Subject: [PATCH 0910/1008] MOBILE-3833 style: Style hr when comes from WS

---
 src/addons/mod/data/data.scss         | 5 ++++-
 src/theme/components/format-text.scss | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/addons/mod/data/data.scss b/src/addons/mod/data/data.scss
index 0714c8760..b844da080 100644
--- a/src/addons/mod/data/data.scss
+++ b/src/addons/mod/data/data.scss
@@ -57,14 +57,17 @@ $grid-column-paddings: (
         // Do not let block elements to define widths or heights.
         address, article, aside, blockquote, canvas, dd, div, dl, dt, fieldset, figcaption, figure, footer, form,
         h1, h2, h3, h4, h5, h6,
-        header, hr, li, main, nav, noscript, ol, p, pre, section, table, tfoot, ul, video {
+        header, li, main, nav, noscript, ol, p, pre, section, table, tfoot, ul, video {
             width: auto !important;
             height: auto !important;
             min-width: auto !important;
             min-height: auto !important;
             // Avoid having one entry over another.
             max-height: none !important;
+        }
 
+        hr {
+            border-top: 1px solid var(--stroke);
         }
     }
 }
diff --git a/src/theme/components/format-text.scss b/src/theme/components/format-text.scss
index d2a47fe51..fa6dbe4a0 100644
--- a/src/theme/components/format-text.scss
+++ b/src/theme/components/format-text.scss
@@ -218,6 +218,10 @@ core-rich-text-editor .core-rte-editor {
         margin-block-start: 0;
     }
 
+    hr {
+        border-top: 1px solid var(--stroke);
+    }
+
     .no-overflow {
         overflow: auto;
     }

From 823bf576b0ff5f393f66071491347ef412f0e3aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 4 Apr 2022 10:57:11 +0200
Subject: [PATCH 0911/1008] MOBILE-3833 database: Change single entry icon

---
 .../mod/data/components/action/addon-mod-data-action.html       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/addons/mod/data/components/action/addon-mod-data-action.html b/src/addons/mod/data/components/action/addon-mod-data-action.html
index 09676dcea..475b66e28 100644
--- a/src/addons/mod/data/components/action/addon-mod-data-action.html
+++ b/src/addons/mod/data/components/action/addon-mod-data-action.html
@@ -1,5 +1,5 @@
 <ion-button size="small" *ngIf="action == 'more'" fill="clear" (click)="viewEntry()" [attr.aria-label]="'addon.mod_data.more' | translate">
-    <ion-icon name="fas-search" slot="icon-only" aria-hidden="true"></ion-icon>
+    <ion-icon name="fas-search-plus" slot="icon-only" aria-hidden="true"></ion-icon>
 </ion-button>
 
 <ion-button size="small" *ngIf="action == 'edit'" fill="clear" (click)="editEntry()" [attr.aria-label]="'core.edit' | translate">

From 39c5ced53ae33b91fdb400ec2a59e9441579d081 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 4 Apr 2022 15:47:44 +0200
Subject: [PATCH 0912/1008] MOBILE-3833 style: Fix ripple effect color on brand

---
 src/theme/theme.light.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index f8799c64f..f13f3aee1 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -254,6 +254,7 @@
             --border-color: var(--core-tab-border-color);
             --color-active: var(--core-tab-color-active);
             --border-color-active: var(--core-tab-border-color-active);
+            --color-selected: var(--border-color-active);
             --font-weight-active: var(--core-tab-font-weight-active);
         }
     }

From dc6ca1f08549ea01ff0b8c085d53a0cca9eb9d4c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 1 Apr 2022 11:48:54 +0200
Subject: [PATCH 0913/1008] MOBILE-4015 core: Support refresh on resume with
 data-app-url

---
 src/core/directives/format-text.ts            | 33 +++++++++++++++----
 .../course/pages/contents/contents.ts         | 29 ++++++++++++----
 src/core/singletons/events.ts                 | 25 ++++++++++++++
 src/core/utils/refresh-context.ts             | 27 +++++++++++++++
 4 files changed, 102 insertions(+), 12 deletions(-)
 create mode 100644 src/core/utils/refresh-context.ts

diff --git a/src/core/directives/format-text.ts b/src/core/directives/format-text.ts
index 7b4d8a7ea..26d5c741a 100644
--- a/src/core/directives/format-text.ts
+++ b/src/core/directives/format-text.ts
@@ -24,6 +24,7 @@ import {
     ViewContainerRef,
     ViewChild,
     OnDestroy,
+    Inject,
 } from '@angular/core';
 import { IonContent } from '@ionic/angular';
 
@@ -33,7 +34,7 @@ import { CoreIframeUtils, CoreIframeUtilsProvider } from '@services/utils/iframe
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreSite } from '@classes/site';
-import { Translate } from '@singletons';
+import { NgZone, Platform, Translate } from '@singletons';
 import { CoreExternalContentDirective } from './external-content';
 import { CoreLinkDirective } from './link';
 import { CoreFilter, CoreFilterFilter, CoreFilterFormatTextOptions } from '@features/filter/services/filter';
@@ -46,6 +47,8 @@ import { CoreCancellablePromise } from '@classes/cancellable-promise';
 import { AsyncComponent } from '@classes/async-component';
 import { CoreText } from '@singletons/text';
 import { CoreDom } from '@singletons/dom';
+import { CoreEvents } from '@singletons/events';
+import { CoreRefreshContext, CORE_REFRESH_CONTEXT } from '@/core/utils/refresh-context';
 
 /**
  * Directive to format text rendered. It renders the HTML and treats all links and media, using CoreLinkDirective
@@ -99,6 +102,7 @@ export class CoreFormatTextDirective implements OnChanges, OnDestroy, AsyncCompo
         element: ElementRef,
         @Optional() protected content: IonContent,
         protected viewContainerRef: ViewContainerRef,
+        @Optional() @Inject(CORE_REFRESH_CONTEXT) protected refreshContext?: CoreRefreshContext,
     ) {
         CoreComponentsRegistry.register(element.nativeElement, this);
 
@@ -457,8 +461,8 @@ export class CoreFormatTextDirective implements OnChanges, OnDestroy, AsyncCompo
         // Walk through the content to find the links and add our directive to it.
         // Important: We need to look for links first because in 'img' we add new links without core-link.
         anchors.forEach((anchor) => {
-            if (anchor.getAttribute('data-app-url')) {
-                // Link already treated in data-app-url, ignore it.
+            if (anchor.dataset.appUrl) {
+                // Link already treated in treatAppUrlElements, ignore it.
                 return;
             }
 
@@ -563,7 +567,7 @@ export class CoreFormatTextDirective implements OnChanges, OnDestroy, AsyncCompo
         const appUrlElements = Array.from(div.querySelectorAll<HTMLElement>('*[data-app-url]'));
 
         appUrlElements.forEach((element) => {
-            const url = element.getAttribute('data-app-url');
+            const url = element.dataset.appUrl;
             if (!url) {
                 return;
             }
@@ -582,8 +586,9 @@ export class CoreFormatTextDirective implements OnChanges, OnDestroy, AsyncCompo
                     return;
                 }
 
-                const confirmMessage = element.getAttribute('data-app-url-confirm');
-                const openInApp = element.getAttribute('data-open-in') === 'app';
+                const confirmMessage = element.dataset.appUrlConfirm;
+                const openInApp = element.dataset.openIn === 'app';
+                const refreshOnResume = element.dataset.appUrlResumeAction === 'refresh';
 
                 if (confirmMessage) {
                     try {
@@ -595,10 +600,26 @@ export class CoreFormatTextDirective implements OnChanges, OnDestroy, AsyncCompo
 
                 if (openInApp) {
                     site.openInAppWithAutoLoginIfSameSite(url);
+
+                    if (refreshOnResume && this.refreshContext) {
+                        // Refresh the context when the IAB is closed.
+                        CoreEvents.once(CoreEvents.IAB_EXIT, () => {
+                            this.refreshContext?.refreshContext();
+                        });
+                    }
                 } else {
                     site.openInBrowserWithAutoLoginIfSameSite(url, undefined, {
                         showBrowserWarning: !confirmMessage,
                     });
+
+                    if (refreshOnResume && this.refreshContext) {
+                        // Refresh the context when the app is resumed.
+                        CoreSubscriptions.once(Platform.resume, () => {
+                            NgZone.run(async () => {
+                                this.refreshContext?.refreshContext();
+                            });
+                        });
+                    }
                 }
             });
         });
diff --git a/src/core/features/course/pages/contents/contents.ts b/src/core/features/course/pages/contents/contents.ts
index 7413a0444..42a653ace 100644
--- a/src/core/features/course/pages/contents/contents.ts
+++ b/src/core/features/course/pages/contents/contents.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, ViewChild, OnInit, OnDestroy } from '@angular/core';
+import { Component, ViewChild, OnInit, OnDestroy, forwardRef } from '@angular/core';
 import { IonContent, IonRefresher } from '@ionic/angular';
 
 import { CoreDomUtils } from '@services/utils/dom';
@@ -36,6 +36,7 @@ import {
     CoreEventObserver,
 } from '@singletons/events';
 import { CoreNavigator } from '@services/navigator';
+import { CoreRefreshContext, CORE_REFRESH_CONTEXT } from '@/core/utils/refresh-context';
 
 /**
  * Page that displays the contents of a course.
@@ -43,8 +44,12 @@ import { CoreNavigator } from '@services/navigator';
 @Component({
     selector: 'page-core-course-contents',
     templateUrl: 'contents.html',
+    providers: [{
+        provide: CORE_REFRESH_CONTEXT,
+        useExisting: forwardRef(() => CoreCourseContentsPage),
+    }],
 })
-export class CoreCourseContentsPage implements OnInit, OnDestroy {
+export class CoreCourseContentsPage implements OnInit, OnDestroy, CoreRefreshContext {
 
     @ViewChild(IonContent) content?: IonContent;
     @ViewChild(CoreCourseFormatComponent) formatComponent?: CoreCourseFormatComponent;
@@ -127,7 +132,7 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
             CoreEvents.COMPLETION_MODULE_VIEWED,
             (data) => {
                 if (data && data.courseId == this.course.id) {
-                    this.refreshAfterCompletionChange(true);
+                    this.showLoadingAndRefresh(true, false);
                 }
             },
         );
@@ -141,7 +146,7 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
                 return;
             }
 
-            this.refreshAfterCompletionChange(false);
+            this.showLoadingAndRefresh(false, false);
 
             if (data.warnings && data.warnings[0]) {
                 CoreDomUtils.showErrorModal(data.warnings[0]);
@@ -315,7 +320,7 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
 
         await CoreUtils.ignoreErrors(this.invalidateData());
 
-        await this.refreshAfterCompletionChange(true);
+        await this.showLoadingAndRefresh(true, false);
     }
 
     /**
@@ -341,9 +346,10 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
      * Refresh list after a completion change since there could be new activities.
      *
      * @param sync If it should try to sync.
+     * @param invalidateData Whether to invalidate data. Set it to false if data has already been invalidated.
      * @return Promise resolved when done.
      */
-    protected async refreshAfterCompletionChange(sync?: boolean): Promise<void> {
+    protected async showLoadingAndRefresh(sync = false, invalidateData = true): Promise<void> {
         // Save scroll position to restore it once done.
         const scrollElement = await this.content?.getScrollElement();
         const scrollTop = scrollElement?.scrollTop || 0;
@@ -353,6 +359,10 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
         this.content?.scrollToTop(0); // Scroll top so the spinner is seen.
 
         try {
+            if (invalidateData) {
+                await CoreUtils.ignoreErrors(this.invalidateData());
+            }
+
             await this.loadData(true, sync);
 
             await this.formatComponent?.doRefresh(undefined, undefined, true);
@@ -366,6 +376,13 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
         }
     }
 
+    /**
+     * @inheritdoc
+     */
+    async refreshContext(): Promise<void> {
+        await this.showLoadingAndRefresh(true, true);
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/src/core/singletons/events.ts b/src/core/singletons/events.ts
index d1d805e6c..9f303efa7 100644
--- a/src/core/singletons/events.ts
+++ b/src/core/singletons/events.ts
@@ -173,6 +173,31 @@ export class CoreEvents {
         };
     }
 
+    /**
+     * Listen once for a certain event. To stop listening to the event (in case it wasn't triggered):
+     * let observer = eventsProvider.on('something', myCallBack);
+     * ...
+     * observer.off();
+     *
+     * @param eventName Name of the event to listen to.
+     * @param callBack Function to call when the event is triggered.
+     * @param siteId Site where to trigger the event. Undefined won't check the site.
+     * @return Observer to stop listening.
+     */
+    static once<Fallback = unknown, Event extends string = string>(
+        eventName: Event,
+        callBack: (value: CoreEventData<Event, Fallback> & CoreEventSiteData) => void,
+        siteId?: string,
+    ): CoreEventObserver {
+        const listener = CoreEvents.on<Fallback, Event>(eventName, (value) => {
+            setTimeout(() => listener.off(), 0);
+
+            callBack(value);
+        }, siteId);
+
+        return listener;
+    }
+
     /**
      * Listen for several events. To stop listening to the events:
      * let observer = eventsProvider.onMultiple(['something', 'another'], myCallBack);
diff --git a/src/core/utils/refresh-context.ts b/src/core/utils/refresh-context.ts
new file mode 100644
index 000000000..a0cfbed71
--- /dev/null
+++ b/src/core/utils/refresh-context.ts
@@ -0,0 +1,27 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { InjectionToken } from '@angular/core';
+
+/**
+ * Context to refresh data when a certain action happens.
+ */
+export interface CoreRefreshContext {
+    /**
+     * Refresh the context.
+     */
+    refreshContext(): Promise<void>;
+}
+
+export const CORE_REFRESH_CONTEXT = new InjectionToken<CoreRefreshContext>('CORE_REFRESH_CONTEXT');

From e85acc68688bc06d78987d07684cb1cf3940ceb1 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 1 Apr 2022 12:21:23 +0200
Subject: [PATCH 0914/1008] MOBILE-4015 course: Fix keep scroll when refresh

---
 src/core/features/course/pages/contents/contents.html | 4 ++--
 src/core/features/course/pages/contents/contents.ts   | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/core/features/course/pages/contents/contents.html b/src/core/features/course/pages/contents/contents.html
index 2d0eeb1db..81b1e7dc0 100644
--- a/src/core/features/course/pages/contents/contents.html
+++ b/src/core/features/course/pages/contents/contents.html
@@ -1,9 +1,9 @@
 <ion-content>
-    <ion-refresher slot="fixed" [disabled]="!dataLoaded || !displayRefresher" (ionRefresh)="doRefresh($event.target)">
+    <ion-refresher slot="fixed" [disabled]="!dataLoaded || updatingData || !displayRefresher" (ionRefresh)="doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
-    <core-loading [hideUntil]="dataLoaded">
+    <core-loading [hideUntil]="dataLoaded && !updatingData">
         <core-course-format [course]="course" [sections]="sections" [initialSectionId]="sectionId" [initialSectionNumber]="sectionNumber"
             [moduleId]="moduleId" class="core-course-format-{{course.format}}" *ngIf="dataLoaded">
         </core-course-format>
diff --git a/src/core/features/course/pages/contents/contents.ts b/src/core/features/course/pages/contents/contents.ts
index 42a653ace..b190f4ec0 100644
--- a/src/core/features/course/pages/contents/contents.ts
+++ b/src/core/features/course/pages/contents/contents.ts
@@ -59,6 +59,7 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy, CoreRefreshCon
     sectionId?: number;
     sectionNumber?: number;
     dataLoaded = false;
+    updatingData = false;
     downloadCourseEnabled = false;
     moduleId?: number;
     displayEnableDownload = false;
@@ -355,7 +356,7 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy, CoreRefreshCon
         const scrollTop = scrollElement?.scrollTop || 0;
         const scrollLeft = scrollElement?.scrollLeft || 0;
 
-        this.dataLoaded = false;
+        this.updatingData = true;
         this.content?.scrollToTop(0); // Scroll top so the spinner is seen.
 
         try {
@@ -367,7 +368,7 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy, CoreRefreshCon
 
             await this.formatComponent?.doRefresh(undefined, undefined, true);
         } finally {
-            this.dataLoaded = true;
+            this.updatingData = false;
 
             // Wait for new content height to be calculated and scroll without animation.
             setTimeout(() => {

From e6b76f705d4356a09c4c78cbe7fc8576e55fe653 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 4 Apr 2022 08:52:39 +0200
Subject: [PATCH 0915/1008] MOBILE-3833 user-menu: Fix blink effect in handlers

---
 .../mainmenu/components/user-menu/user-menu.ts    | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.ts b/src/core/features/mainmenu/components/user-menu/user-menu.ts
index c84bc642a..e3cda789c 100644
--- a/src/core/features/mainmenu/components/user-menu/user-menu.ts
+++ b/src/core/features/mainmenu/components/user-menu/user-menu.ts
@@ -79,12 +79,15 @@ export class CoreMainMenuUserMenuComponent implements OnInit, OnDestroy {
                         return;
                     }
 
-                    this.handlers = [];
-                    handlers.forEach((handler) => {
-                        if (handler.type == CoreUserDelegateService.TYPE_NEW_PAGE) {
-                            this.handlers.push(handler.data);
-                        }
-                    });
+                    const newHandlers = handlers
+                        .filter((handler) => handler.type === CoreUserDelegateService.TYPE_NEW_PAGE)
+                        .map((handler) => handler.data);
+
+                    // Only update handlers if they have changed, to prevent a blink effect.
+                    if (newHandlers.length !== this.handlers.length ||
+                            JSON.stringify(newHandlers) !== JSON.stringify(this.handlers)) {
+                        this.handlers = newHandlers;
+                    }
 
                     this.handlersLoaded = CoreUserDelegate.areHandlersLoaded(this.user.id, CoreUserDelegateContext.USER_MENU);
                 });

From ef834b34eaccfdddb6abf3d0e2f7d37e55283d76 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 5 Apr 2022 08:26:49 +0200
Subject: [PATCH 0916/1008] MOBILE-3833 mod_data: Fix wrong unsaved changes
 warning

---
 .../data/classes/field-plugin-component.ts    | 13 ++++++--
 .../components/field-plugin/field-plugin.ts   | 11 +++++--
 .../mod/data/fields/date/component/date.ts    | 11 ++++++-
 src/addons/mod/data/pages/edit/edit.ts        | 30 +++++++++++++++++--
 src/addons/mod/data/services/data-helper.ts   |  4 +--
 src/addons/mod/data/services/data.ts          |  8 ++---
 6 files changed, 63 insertions(+), 14 deletions(-)

diff --git a/src/addons/mod/data/classes/field-plugin-component.ts b/src/addons/mod/data/classes/field-plugin-component.ts
index 9c0a79948..c48a136a8 100644
--- a/src/addons/mod/data/classes/field-plugin-component.ts
+++ b/src/addons/mod/data/classes/field-plugin-component.ts
@@ -32,10 +32,11 @@ export abstract class AddonModDataFieldPluginComponent implements OnInit, OnChan
     @Input() error?: string; // Error when editing.
     @Input() form?: FormGroup; // Form where to add the form control. Just required for edit and search modes.
     @Input() searchFields?: CoreFormFields; // The search value of all fields.
-    @Output() gotoEntry: EventEmitter<number>; // Action to perform.
+    @Output() gotoEntry = new EventEmitter<number>(); // Action to perform.
+    // Output called when the field is initialized with a value and it didn't have one already.
+    @Output() onFieldInit = new EventEmitter<AddonModDataEntryFieldInitialized>();
 
     constructor(protected fb: FormBuilder) {
-        this.gotoEntry = new EventEmitter();
     }
 
     /**
@@ -114,3 +115,11 @@ export abstract class AddonModDataFieldPluginComponent implements OnInit, OnChan
     }
 
 }
+
+/**
+ * Data for an initialized field.
+ */
+export type AddonModDataEntryFieldInitialized = Partial<AddonModDataEntryField> & {
+    fieldid: number;
+    content: string;
+};
diff --git a/src/addons/mod/data/components/field-plugin/field-plugin.ts b/src/addons/mod/data/components/field-plugin/field-plugin.ts
index 74ed1e710..b1feba23d 100644
--- a/src/addons/mod/data/components/field-plugin/field-plugin.ts
+++ b/src/addons/mod/data/components/field-plugin/field-plugin.ts
@@ -16,6 +16,7 @@ import { Component, OnInit, OnChanges, ViewChild, Input, Output, SimpleChange, T
 import { FormGroup } from '@angular/forms';
 import { CoreDynamicComponent } from '@components/dynamic-component/dynamic-component';
 import { CoreFormFields } from '@singletons/form';
+import { AddonModDataEntryFieldInitialized } from '../../classes/field-plugin-component';
 import { AddonModDataData, AddonModDataField, AddonModDataTemplateMode } from '../../services/data';
 import { AddonModDataFieldsDelegate } from '../../services/data-fields-delegate';
 
@@ -37,7 +38,9 @@ export class AddonModDataFieldPluginComponent implements OnInit, OnChanges {
     @Input() error?: string; // Error when editing.
     @Input() form?: FormGroup; // Form where to add the form control. Just required for edit and search modes.
     @Input() searchFields?: CoreFormFields; // The search value of all fields.
-    @Output() gotoEntry = new EventEmitter(); // Action to perform.
+    @Output() gotoEntry = new EventEmitter<number>(); // Action to perform.
+    // Output called when the field is initialized with a value and it didn't have one already.
+    @Output() onFieldInit = new EventEmitter<AddonModDataEntryFieldInitialized>();
 
     fieldComponent?: Type<unknown>; // Component to render the plugin.
     pluginData?: AddonDataFieldPluginComponentData; // Data to pass to the component.
@@ -65,9 +68,10 @@ export class AddonModDataFieldPluginComponent implements OnInit, OnChanges {
                     value: this.value,
                     database: this.database,
                     error: this.error,
-                    gotoEntry: this.gotoEntry,
                     form: this.form,
                     searchFields: this.searchFields,
+                    gotoEntry: this.gotoEntry,
+                    onFieldInit: this.onFieldInit,
                 };
             }
         } finally {
@@ -99,5 +103,6 @@ export type AddonDataFieldPluginComponentData = {
     error?: string; // Error when editing.
     form?: FormGroup; // Form where to add the form control. Just required for edit and search modes.
     searchFields?: CoreFormFields; // The search value of all fields.
-    gotoEntry: EventEmitter<unknown>;
+    gotoEntry: EventEmitter<number>;
+    onFieldInit: EventEmitter<AddonModDataEntryFieldInitialized>;
 };
diff --git a/src/addons/mod/data/fields/date/component/date.ts b/src/addons/mod/data/fields/date/component/date.ts
index 5fa517dd7..ad539abf5 100644
--- a/src/addons/mod/data/fields/date/component/date.ts
+++ b/src/addons/mod/data/fields/date/component/date.ts
@@ -68,7 +68,16 @@ export class AddonModDataFieldDateComponent extends AddonModDataFieldPluginCompo
 
         }
 
-        this.addControl('f_' + this.field.id, CoreTimeUtils.toDatetimeFormat(date.getTime()));
+        const seconds = Math.floor(date.getTime() / 1000);
+
+        this.addControl('f_' + this.field.id, CoreTimeUtils.toDatetimeFormat(seconds * 1000));
+
+        if (!this.searchMode && !this.value?.content) {
+            this.onFieldInit.emit({
+                fieldid: this.field.id,
+                content: String(seconds),
+            });
+        }
     }
 
 }
diff --git a/src/addons/mod/data/pages/edit/edit.ts b/src/addons/mod/data/pages/edit/edit.ts
index 068d83431..d93b58cae 100644
--- a/src/addons/mod/data/pages/edit/edit.ts
+++ b/src/addons/mod/data/pages/edit/edit.ts
@@ -41,6 +41,7 @@ import {
 } from '../../services/data';
 import { AddonModDataHelper } from '../../services/data-helper';
 import { CoreDom } from '@singletons/dom';
+import { AddonModDataEntryFieldInitialized } from '../../classes/field-plugin-component';
 
 /**
  * Page that displays the view edit page.
@@ -62,6 +63,7 @@ export class AddonModDataEditPage implements OnInit {
     protected forceLeave = false; // To allow leaving the page without checking for changes.
     protected initialSelectedGroup?: number;
     protected isEditing = false;
+    protected originalData: AddonModDataEntryFields = {};
 
     entry?: AddonModDataEntry;
     fields: Record<number, AddonModDataField> = {};
@@ -83,6 +85,7 @@ export class AddonModDataEditPage implements OnInit {
         contents: AddonModDataEntryFields;
         errors?: Record<number, string>;
         form: FormGroup;
+        onFieldInit: (data: AddonModDataEntryFieldInitialized) => void;
     };
 
     errors: Record<number, string> = {};
@@ -128,7 +131,7 @@ export class AddonModDataEditPage implements OnInit {
 
         const inputData = this.editForm.value;
 
-        let changed = AddonModDataHelper.hasEditDataChanged(inputData, this.fieldsArray, this.entry.contents);
+        let changed = AddonModDataHelper.hasEditDataChanged(inputData, this.fieldsArray, this.originalData);
         changed = changed || (!this.isEditing && this.initialSelectedGroup != this.selectedGroup);
 
         if (changed) {
@@ -162,6 +165,7 @@ export class AddonModDataEditPage implements OnInit {
 
             const entry = await AddonModDataHelper.fetchEntry(this.database, this.fieldsArray, this.entryId || 0);
             this.entry = entry.entry;
+            this.originalData = CoreUtils.clone(this.entry.contents);
 
             if (this.entryId) {
                 // Load correct group.
@@ -401,6 +405,7 @@ export class AddonModDataEditPage implements OnInit {
             form: this.editForm,
             database: this.database,
             errors: this.errors,
+            onFieldInit: this.onFieldInit.bind(this),
         };
 
         let template = AddonModDataHelper.getTemplate(this.database!, AddonModDataTemplateType.ADD, this.fieldsArray);
@@ -414,7 +419,7 @@ export class AddonModDataEditPage implements OnInit {
             // Replace field by a generic directive.
             const render = '<addon-mod-data-field-plugin [class.has-errors]="!!errors[' + field.id + ']" mode="edit" \
                 [field]="fields[' + field.id + ']" [value]="contents[' + field.id + ']" [form]="form" [database]="database" \
-                [error]="errors[' + field.id + ']"></addon-mod-data-field-plugin>';
+                [error]="errors[' + field.id + ']" (onFieldInit)="onFieldInit($event)"></addon-mod-data-field-plugin>';
             template = template.replace(replaceRegEx, render);
 
             // Replace the field id tag.
@@ -435,6 +440,27 @@ export class AddonModDataEditPage implements OnInit {
         return template;
     }
 
+    /**
+     * A certain value has been initialized.
+     *
+     * @param data Data.
+     */
+    onFieldInit(data: AddonModDataEntryFieldInitialized): void {
+        if (!this.originalData[data.fieldid]) {
+            this.originalData[data.fieldid] = {
+                id: 0,
+                recordid: this.entry?.id ?? 0,
+                fieldid: data.fieldid,
+                content: data.content,
+                content1: data.content1 ?? null,
+                content2: data.content2 ?? null,
+                content3: data.content3 ?? null,
+                content4: data.content4 ?? null,
+                files: data.files ?? [],
+            };
+        }
+    }
+
     /**
      * Return to the entry list (previous page) discarding temp data.
      *
diff --git a/src/addons/mod/data/services/data-helper.ts b/src/addons/mod/data/services/data-helper.ts
index 64703aedb..e11bc25d9 100644
--- a/src/addons/mod/data/services/data-helper.ts
+++ b/src/addons/mod/data/services/data-helper.ts
@@ -213,8 +213,8 @@ export class AddonModDataHelperProvider {
 
             // Replace field by a generic directive.
             const render = '<addon-mod-data-field-plugin [field]="fields[' + field.id + ']" [value]="entries[' + entry.id +
-                    '].contents[' + field.id + ']" mode="' + mode + '" [database]="database" (gotoEntry)="gotoEntry(' + entry.id +
-                    ')"></addon-mod-data-field-plugin>';
+                    '].contents[' + field.id + ']" mode="' + mode + '" [database]="database" (gotoEntry)="gotoEntry($event)">' +
+                    '</addon-mod-data-field-plugin>';
             template = template.replace(replaceRegex, render);
         });
 
diff --git a/src/addons/mod/data/services/data.ts b/src/addons/mod/data/services/data.ts
index 8c7e4e993..297f4204e 100644
--- a/src/addons/mod/data/services/data.ts
+++ b/src/addons/mod/data/services/data.ts
@@ -1134,10 +1134,10 @@ export type AddonModDataEntryField = {
     fieldid: number; // The field type of the content.
     recordid: number; // The record this content belongs to.
     content: string; // Contents.
-    content1: string; // Contents.
-    content2: string; // Contents.
-    content3: string; // Contents.
-    content4: string; // Contents.
+    content1: string | null; // Contents.
+    content2: string | null; // Contents.
+    content3: string | null; // Contents.
+    content4: string | null; // Contents.
     files: CoreFileEntry[];
 };
 

From dc4aabd2e3eddc69415aa08ba49fe57f5d6d73d5 Mon Sep 17 00:00:00 2001
From: Alfonso <alfonsomtb98@gmail.com>
Date: Mon, 4 Apr 2022 14:28:13 +0200
Subject: [PATCH 0917/1008] MOBILE-3833 module-summary: Delete size when remove
 files

---
 .../features/course/components/module-summary/module-summary.ts  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/core/features/course/components/module-summary/module-summary.ts b/src/core/features/course/components/module-summary/module-summary.ts
index 7a399e8c1..89c7ef570 100644
--- a/src/core/features/course/components/module-summary/module-summary.ts
+++ b/src/core/features/course/components/module-summary/module-summary.ts
@@ -336,6 +336,7 @@ export class CoreCourseModuleSummaryComponent implements OnInit, OnDestroy {
             }
         } finally {
             this.removeFilesLoading = false;
+            delete this.size;
         }
 
         await this.getPackageStatus();

From 4ad2c7243858b70086a063041e5dac8da272ef80 Mon Sep 17 00:00:00 2001
From: Alfonso <alfonsomtb98@gmail.com>
Date: Mon, 4 Apr 2022 14:34:02 +0200
Subject: [PATCH 0918/1008] MOBILE-3833 base theme: Align toast message to
 start

---
 src/theme/theme.base.scss | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index e135701a0..6efa32011 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -503,6 +503,9 @@ ion-toast {
             flex-direction: column;
             align-items: flex-end;
         }
+        &::part(message) {
+            align-self: flex-start;
+        }
     }
 }
 

From 10d357f9f9240b4768355de74f8b6f4542871830 Mon Sep 17 00:00:00 2001
From: Alfonso <alfonsomtb98@gmail.com>
Date: Mon, 4 Apr 2022 14:32:51 +0200
Subject: [PATCH 0919/1008] MOBILE-3833 course-storage: Add class to handle
 padding in section

---
 .../storagemanager/pages/course-storage/course-storage.html  | 2 +-
 .../storagemanager/pages/course-storage/course-storage.scss  | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.html b/src/addons/storagemanager/pages/course-storage/course-storage.html
index 2df7b3282..1d0182cf1 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.html
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.html
@@ -99,7 +99,7 @@
                         </div>
                     </ion-item>
                 </ion-card-header>
-                <ion-card-content id="core-course-storage-section-{{section.id}}">
+                <ion-card-content id="core-course-storage-section-{{section.id}}" [ngClass]="{'hidden-content': !section.expanded}">
                     <ng-container *ngIf="section.expanded">
                         <ng-container *ngFor="let module of section.modules">
                             <ion-item class="ion-no-padding core-course-storage-activity"
diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.scss b/src/addons/storagemanager/pages/course-storage/course-storage.scss
index 9f3ad5c36..8393ed5c4 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.scss
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.scss
@@ -8,7 +8,6 @@
     }
 
     ion-card.section ion-card-header {
-        margin-bottom: 8px;
         padding-top: 8px;
         padding-bottom: 8px;
     }
@@ -17,6 +16,10 @@
         font-size: 1.2rem;
     }
 
+    ion-card-content.hidden-content {
+        padding: 0;
+    }
+
     .core-course-storage-activity ion-label {
         max-height: var(--course-storage-max-activity-height);
 

From 525218a4a028c1347232f88d331ce2fdc18dbad4 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 5 Apr 2022 11:46:31 +0200
Subject: [PATCH 0920/1008] MOBILE-3833 comments: Don't display Sync option in
 offline

---
 .../features/comments/pages/viewer/viewer.html     |  4 ++--
 .../features/comments/pages/viewer/viewer.page.ts  | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/core/features/comments/pages/viewer/viewer.html b/src/core/features/comments/pages/viewer/viewer.html
index 8a909686e..95127219c 100644
--- a/src/core/features/comments/pages/viewer/viewer.html
+++ b/src/core/features/comments/pages/viewer/viewer.html
@@ -18,7 +18,7 @@
                 <core-context-menu-item [hidden]="!(commentsLoaded && !hasOffline)" [priority]="100" [content]="'core.refresh' | translate"
                     (action)="refreshComments(false)" [iconAction]="refreshIcon" [closeOnClick]="true">
                 </core-context-menu-item>
-                <core-context-menu-item [hidden]="!(commentsLoaded && hasOffline)" [priority]="100"
+                <core-context-menu-item [hidden]="!(commentsLoaded && hasOffline && isOnline)" [priority]="100"
                     [content]="'core.settings.synchronizenow' | translate" (action)="refreshComments(true)" [iconAction]="syncIcon"
                     [closeOnClick]="false">
                 </core-context-menu-item>
@@ -31,7 +31,7 @@
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
     <core-loading [hideUntil]="commentsLoaded">
-        <core-empty-box *ngIf="!comments || !comments.length" icon="fas-comments" [message]="'core.comments.nocomments' | translate">
+        <core-empty-box *ngIf="!comments?.length && !offlineComment" icon="fas-comments" [message]="'core.comments.nocomments' | translate">
         </core-empty-box>
 
         <!-- Load previous messages. -->
diff --git a/src/core/features/comments/pages/viewer/viewer.page.ts b/src/core/features/comments/pages/viewer/viewer.page.ts
index fba333730..038983c2f 100644
--- a/src/core/features/comments/pages/viewer/viewer.page.ts
+++ b/src/core/features/comments/pages/viewer/viewer.page.ts
@@ -30,7 +30,7 @@ import {
 import { IonContent, IonRefresher } from '@ionic/angular';
 import { ContextLevel, CoreConstants } from '@/core/constants';
 import { CoreNavigator } from '@services/navigator';
-import { Translate } from '@singletons';
+import { Network, NgZone, Translate } from '@singletons';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUser } from '@features/user/services/user';
@@ -41,6 +41,7 @@ import { CoreCommentsDBRecord } from '@features/comments/services/database/comme
 import { CoreTimeUtils } from '@services/utils/time';
 import { CoreApp } from '@services/app';
 import moment from 'moment';
+import { Subscription } from 'rxjs';
 
 /**
  * Page that displays comments.
@@ -77,9 +78,11 @@ export class CoreCommentsViewerPage implements OnInit, OnDestroy {
     currentUserId: number;
     sending = false;
     newComment = '';
+    isOnline: boolean;
 
     protected addDeleteCommentsAvailable = false;
     protected syncObserver?: CoreEventObserver;
+    protected onlineObserver: Subscription;
     protected viewDestroyed = false;
 
     constructor(
@@ -104,6 +107,14 @@ export class CoreCommentsViewerPage implements OnInit, OnDestroy {
                 this.fetchComments(false);
             }
         }, CoreSites.getCurrentSiteId());
+
+        this.isOnline = CoreApp.isOnline();
+        this.onlineObserver = Network.onChange().subscribe(() => {
+            // Execute the callback in the Angular zone, so change detection doesn't stop working.
+            NgZone.run(() => {
+                this.isOnline = CoreApp.isOnline();
+            });
+        });
     }
 
     /**
@@ -596,6 +607,7 @@ export class CoreCommentsViewerPage implements OnInit, OnDestroy {
      */
     ngOnDestroy(): void {
         this.syncObserver?.off();
+        this.onlineObserver.unsubscribe();
         this.viewDestroyed = true;
     }
 

From 2f395125525f665a0849fe630c0f371e13e706b8 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 5 Apr 2022 12:19:37 +0200
Subject: [PATCH 0921/1008] MOBILE-3833 course: Make last access coherent with
 recent block

---
 src/addons/mod/data/pages/entry/entry.ts              |  2 +-
 src/addons/mod/feedback/pages/attempt/attempt.ts      |  8 --------
 src/addons/mod/feedback/pages/attempts/attempts.ts    | 10 ----------
 .../feedback/pages/nonrespondents/nonrespondents.ts   |  8 --------
 .../mod/forum/pages/discussion/discussion.page.ts     |  8 --------
 src/addons/mod/glossary/pages/entry/entry.ts          |  8 --------
 .../pages/attempt-results/attempt-results.ts          |  4 ----
 .../h5pactivity/pages/user-attempts/user-attempts.ts  |  4 ----
 .../pages/users-attempts/users-attempts.ts            |  4 ----
 .../mod/lesson/pages/user-retake/user-retake.page.ts  |  8 --------
 src/addons/mod/quiz/pages/review/review.page.ts       |  4 ----
 src/addons/mod/wiki/components/index/index.ts         | 10 ++++++++++
 .../course/classes/main-resource-component.ts         | 11 ++++++++++-
 13 files changed, 21 insertions(+), 68 deletions(-)

diff --git a/src/addons/mod/data/pages/entry/entry.ts b/src/addons/mod/data/pages/entry/entry.ts
index 6bc442857..761962bb1 100644
--- a/src/addons/mod/data/pages/entry/entry.ts
+++ b/src/addons/mod/data/pages/entry/entry.ts
@@ -212,7 +212,7 @@ export class AddonModDataEntryPage implements OnInit, OnDestroy {
                 this.logAfterFetch = false;
                 await CoreUtils.ignoreErrors(AddonModData.logView(this.database.id, this.database.name));
 
-                // Store module viewed. It's done in this page because it can be reached using a link.
+                // Store module viewed because this page also updates recent accessed items block.
                 CoreCourse.storeModuleViewed(this.courseId, this.moduleId);
             }
         } catch (error) {
diff --git a/src/addons/mod/feedback/pages/attempt/attempt.ts b/src/addons/mod/feedback/pages/attempt/attempt.ts
index 7ee5e6028..e8981da89 100644
--- a/src/addons/mod/feedback/pages/attempt/attempt.ts
+++ b/src/addons/mod/feedback/pages/attempt/attempt.ts
@@ -16,7 +16,6 @@ import { Component, OnDestroy, OnInit } from '@angular/core';
 import { ActivatedRouteSnapshot } from '@angular/router';
 import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
 import { CoreSwipeNavigationItemsManager } from '@classes/items-management/swipe-navigation-items-manager';
-import { CoreCourse } from '@features/course/services/course';
 import { CoreNavigator } from '@services/navigator';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTextUtils } from '@services/utils/text';
@@ -50,7 +49,6 @@ export class AddonModFeedbackAttemptPage implements OnInit, OnDestroy {
     loaded = false;
 
     protected attemptId: number;
-    protected fetchSuccess = false;
 
     constructor() {
         this.cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
@@ -132,12 +130,6 @@ export class AddonModFeedbackAttemptPage implements OnInit, OnDestroy {
 
                 return attemptItem;
             }).filter((itemData) => itemData); // Filter items with errors.
-
-            if (!this.fetchSuccess) {
-                this.fetchSuccess = true;
-                // Store module viewed. It's done in this page because it can be reached using a link.
-                CoreCourse.storeModuleViewed(this.courseId, this.cmId);
-            }
         } catch (message) {
             // Some call failed on fetch, go back.
             CoreDomUtils.showErrorModalDefault(message, 'core.course.errorgetmodule', true);
diff --git a/src/addons/mod/feedback/pages/attempts/attempts.ts b/src/addons/mod/feedback/pages/attempts/attempts.ts
index 1da06886d..ecea1615d 100644
--- a/src/addons/mod/feedback/pages/attempts/attempts.ts
+++ b/src/addons/mod/feedback/pages/attempts/attempts.ts
@@ -25,7 +25,6 @@ import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
 import { AddonModFeedbackAttemptItem, AddonModFeedbackAttemptsSource } from '../../classes/feedback-attempts-source';
 import { AddonModFeedbackWSAnonAttempt, AddonModFeedbackWSAttempt } from '../../services/feedback';
-import { CoreCourse } from '@features/course/services/course';
 
 /**
  * Page that displays feedback attempts.
@@ -187,13 +186,4 @@ export class AddonModFeedbackAttemptsPage implements AfterViewInit, OnDestroy {
  * Attempts manager.
  */
 class AddonModFeedbackAttemptsManager extends CoreListItemsManager<AddonModFeedbackAttemptItem, AddonModFeedbackAttemptsSource> {
-
-    /**
-     * @inheritdoc
-     */
-    protected async logActivity(): Promise<void> {
-        // Store module viewed. It's done in this page because it can be reached using a link.
-        CoreCourse.storeModuleViewed(this.getSource().COURSE_ID, this.getSource().CM_ID);
-    }
-
 }
diff --git a/src/addons/mod/feedback/pages/nonrespondents/nonrespondents.ts b/src/addons/mod/feedback/pages/nonrespondents/nonrespondents.ts
index 59b4f7ca5..db568a32a 100644
--- a/src/addons/mod/feedback/pages/nonrespondents/nonrespondents.ts
+++ b/src/addons/mod/feedback/pages/nonrespondents/nonrespondents.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Component, OnInit } from '@angular/core';
-import { CoreCourse } from '@features/course/services/course';
 import { IonRefresher } from '@ionic/angular';
 import { CoreGroupInfo, CoreGroups } from '@services/groups';
 import { CoreNavigator } from '@services/navigator';
@@ -35,7 +34,6 @@ export class AddonModFeedbackNonRespondentsPage implements OnInit {
     protected courseId!: number;
     protected feedback?: AddonModFeedbackWSFeedback;
     protected page = 0;
-    protected fetchSuccess = false;
 
     selectedGroup!: number;
     groupInfo?: CoreGroupInfo;
@@ -83,12 +81,6 @@ export class AddonModFeedbackNonRespondentsPage implements OnInit {
             this.selectedGroup = CoreGroups.validateGroupId(this.selectedGroup, this.groupInfo);
 
             await this.loadGroupUsers(this.selectedGroup);
-
-            if (!this.fetchSuccess) {
-                this.fetchSuccess = true;
-                // Store module viewed. It's done in this page because it can be reached using a link.
-                CoreCourse.storeModuleViewed(this.courseId, this.cmId);
-            }
         } catch (message) {
             CoreDomUtils.showErrorModalDefault(message, 'core.course.errorgetmodule', true);
 
diff --git a/src/addons/mod/forum/pages/discussion/discussion.page.ts b/src/addons/mod/forum/pages/discussion/discussion.page.ts
index a59703a50..4fec08325 100644
--- a/src/addons/mod/forum/pages/discussion/discussion.page.ts
+++ b/src/addons/mod/forum/pages/discussion/discussion.page.ts
@@ -17,7 +17,6 @@ import { Component, OnDestroy, ViewChild, OnInit, AfterViewInit, ElementRef, Opt
 import { ActivatedRoute, ActivatedRouteSnapshot } from '@angular/router';
 import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
-import { CoreCourse } from '@features/course/services/course';
 import { CoreFileUploader } from '@features/fileuploader/services/fileuploader';
 import { CoreRatingInfo, CoreRatingProvider } from '@features/rating/services/rating';
 import { CoreRatingOffline } from '@features/rating/services/rating-offline';
@@ -120,7 +119,6 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
     protected ratingOfflineObserver?: CoreEventObserver;
     protected ratingSyncObserver?: CoreEventObserver;
     protected changeDiscObserver?: CoreEventObserver;
-    protected fetchSuccess = false;
 
     constructor(
         @Optional() protected splitView: CoreSplitViewComponent,
@@ -547,12 +545,6 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
 
             this.hasOfflineRatings =
                 await CoreRatingOffline.hasRatings('mod_forum', 'post', ContextLevel.MODULE, this.cmId, this.discussionId);
-
-            if (!this.fetchSuccess) {
-                this.fetchSuccess = true;
-                // Store module viewed. It's done in this page because it can be reached using a link.
-                this.courseId && this.cmId && CoreCourse.storeModuleViewed(this.courseId, this.cmId);
-            }
         } catch (error) {
             CoreDomUtils.showErrorModal(error);
         } finally {
diff --git a/src/addons/mod/glossary/pages/entry/entry.ts b/src/addons/mod/glossary/pages/entry/entry.ts
index f07b4004b..ca53e83e0 100644
--- a/src/addons/mod/glossary/pages/entry/entry.ts
+++ b/src/addons/mod/glossary/pages/entry/entry.ts
@@ -17,7 +17,6 @@ import { ActivatedRoute, ActivatedRouteSnapshot } from '@angular/router';
 import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
 import { CoreCommentsCommentsComponent } from '@features/comments/components/comments/comments';
 import { CoreComments } from '@features/comments/services/comments';
-import { CoreCourse } from '@features/course/services/course';
 import { CoreRatingInfo } from '@features/rating/services/rating';
 import { CoreTag } from '@features/tag/services/tag';
 import { IonRefresher } from '@ionic/angular';
@@ -59,7 +58,6 @@ export class AddonModGlossaryEntryPage implements OnInit, OnDestroy {
     cmId?: number;
 
     protected entryId!: number;
-    protected fetchSuccess = false;
 
     constructor(protected route: ActivatedRoute) {}
 
@@ -148,12 +146,6 @@ export class AddonModGlossaryEntryPage implements OnInit, OnDestroy {
             this.entry = result.entry;
             this.ratingInfo = result.ratinginfo;
 
-            if (!this.fetchSuccess) {
-                this.fetchSuccess = true;
-                // Store module viewed. It's done in this page because it can be reached using a link.
-                this.cmId && CoreCourse.storeModuleViewed(this.courseId, this.cmId);
-            }
-
             if (this.glossary) {
                 // Glossary already loaded, nothing else to load.
                 return;
diff --git a/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.ts b/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.ts
index 458449191..3b3727a2b 100644
--- a/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.ts
+++ b/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.ts
@@ -25,7 +25,6 @@ import {
     AddonModH5PActivityData,
     AddonModH5PActivityAttemptResults,
 } from '../../services/h5pactivity';
-import { CoreCourse } from '@features/course/services/course';
 
 /**
  * Page that displays results of an attempt.
@@ -100,9 +99,6 @@ export class AddonModH5PActivityAttemptResultsPage implements OnInit {
                     this.h5pActivity.name,
                     { attemptId: this.attemptId },
                 ));
-
-                // Store module viewed. It's done in this page because it can be reached using a link.
-                CoreCourse.storeModuleViewed(this.courseId, this.cmId);
             }
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'Error loading attempt.');
diff --git a/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.ts b/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.ts
index a45b31b05..bb95f9fcb 100644
--- a/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.ts
+++ b/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.ts
@@ -26,7 +26,6 @@ import {
     AddonModH5PActivityData,
     AddonModH5PActivityUserAttempts,
 } from '../../services/h5pactivity';
-import { CoreCourse } from '@features/course/services/course';
 
 /**
  * Page that displays user attempts of a certain user.
@@ -102,9 +101,6 @@ export class AddonModH5PActivityUserAttemptsPage implements OnInit {
                     this.h5pActivity.name,
                     { userId: this.userId },
                 ));
-
-                // Store module viewed. It's done in this page because it can be reached using a link.
-                CoreCourse.storeModuleViewed(this.courseId, this.cmId);
             }
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'Error loading attempts.');
diff --git a/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.ts b/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.ts
index 2acb07e59..f50cd056c 100644
--- a/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.ts
+++ b/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Component, OnInit } from '@angular/core';
-import { CoreCourse } from '@features/course/services/course';
 import { CoreUser, CoreUserProfile } from '@features/user/services/user';
 import { IonRefresher } from '@ionic/angular';
 
@@ -93,9 +92,6 @@ export class AddonModH5PActivityUsersAttemptsPage implements OnInit {
             if (!this.fetchSuccess) {
                 this.fetchSuccess = true;
                 CoreUtils.ignoreErrors(AddonModH5PActivity.logViewReport(this.h5pActivity.id, this.h5pActivity.name));
-
-                // Store module viewed. It's done in this page because it can be reached using a link.
-                CoreCourse.storeModuleViewed(this.courseId, this.cmId);
             }
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'Error loading attempts.');
diff --git a/src/addons/mod/lesson/pages/user-retake/user-retake.page.ts b/src/addons/mod/lesson/pages/user-retake/user-retake.page.ts
index 4ac48bf57..21fbb7fac 100644
--- a/src/addons/mod/lesson/pages/user-retake/user-retake.page.ts
+++ b/src/addons/mod/lesson/pages/user-retake/user-retake.page.ts
@@ -34,7 +34,6 @@ import {
     AddonModLessonUserAttemptAnswerPageWSData,
 } from '../../services/lesson';
 import { AddonModLessonAnswerData, AddonModLessonHelper } from '../../services/lesson-helper';
-import { CoreCourse } from '@features/course/services/course';
 import { CoreTime } from '@singletons/time';
 
 /**
@@ -60,7 +59,6 @@ export class AddonModLessonUserRetakePage implements OnInit {
     protected userId?: number; // User ID to see the retakes.
     protected retakeNumber?: number; // Number of the initial retake to see.
     protected previousSelectedRetake?: number; // To be able to detect the previous selected retake when it has changed.
-    protected fetchSuccess = false;
 
     /**
      * Component being initialized.
@@ -162,12 +160,6 @@ export class AddonModLessonUserRetakePage implements OnInit {
             this.student.profileimageurl = user?.profileimageurl;
 
             await this.setRetake(this.selectedRetake);
-
-            if (!this.fetchSuccess) {
-                this.fetchSuccess = true;
-                // Store module viewed. It's done in this page because it can be reached using a link.
-                CoreCourse.storeModuleViewed(this.courseId, this.cmId);
-            }
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'Error getting data.', true);
         }
diff --git a/src/addons/mod/quiz/pages/review/review.page.ts b/src/addons/mod/quiz/pages/review/review.page.ts
index 1a3a4c3f6..957d86304 100644
--- a/src/addons/mod/quiz/pages/review/review.page.ts
+++ b/src/addons/mod/quiz/pages/review/review.page.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
-import { CoreCourse } from '@features/course/services/course';
 import { CoreQuestionQuestionParsed } from '@features/question/services/question';
 import { CoreQuestionHelper } from '@features/question/services/question-helper';
 import { IonContent, IonRefresher } from '@ionic/angular';
@@ -162,9 +161,6 @@ export class AddonModQuizReviewPage implements OnInit {
                 CoreUtils.ignoreErrors(
                     AddonModQuiz.logViewAttemptReview(this.attemptId, this.quiz.id, this.quiz.name),
                 );
-
-                // Store module viewed. It's done in this page because it can be reached using a link.
-                CoreCourse.storeModuleViewed(this.courseId, this.cmId);
             }
         } catch (error) {
             CoreDomUtils.showErrorModalDefault(error, 'addon.mod_quiz.errorgetquiz', true);
diff --git a/src/addons/mod/wiki/components/index/index.ts b/src/addons/mod/wiki/components/index/index.ts
index 558db1026..fac51cd87 100644
--- a/src/addons/mod/wiki/components/index/index.ts
+++ b/src/addons/mod/wiki/components/index/index.ts
@@ -447,6 +447,16 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
         }
     }
 
+    /**
+     * @inheritdoc
+     */
+    protected async storeModuleViewed(): Promise<void> {
+        // Only store module viewed when viewing the main page.
+        if (!this.pageId) {
+            await super.storeModuleViewed();
+        }
+    }
+
     /**
      * Get path to the wiki home view. If cannot determine or it's current view, return undefined.
      *
diff --git a/src/core/features/course/classes/main-resource-component.ts b/src/core/features/course/classes/main-resource-component.ts
index a9600520c..9e995d682 100644
--- a/src/core/features/course/classes/main-resource-component.ts
+++ b/src/core/features/course/classes/main-resource-component.ts
@@ -442,7 +442,7 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
         }
 
         this.fetchSuccess = true;
-        CoreCourse.storeModuleViewed(this.courseId, this.module.id, { sectionId: this.module.section });
+        this.storeModuleViewed();
 
         // Log activity now.
         try {
@@ -456,6 +456,15 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
         }
     }
 
+    /**
+     * Store module as viewed.
+     *
+     * @return Promise resolved when done.
+     */
+    protected async storeModuleViewed(): Promise<void> {
+        await CoreCourse.storeModuleViewed(this.courseId, this.module.id, { sectionId: this.module.section });
+    }
+
     /**
      * Log activity.
      *

From de9a47863390c32eef8ceee70ca4064de576f5b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 5 Apr 2022 11:01:10 +0200
Subject: [PATCH 0922/1008] MOBILE-3833 dev: Add the option to reset user tours

---
 src/core/features/settings/pages/dev/dev.html |  8 ++++++
 src/core/features/settings/pages/dev/dev.ts   | 13 +++++++++
 .../features/usertours/services/user-tours.ts | 27 ++++++++++++++++++-
 3 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/src/core/features/settings/pages/dev/dev.html b/src/core/features/settings/pages/dev/dev.html
index d7dd7f061..bf055c1ca 100644
--- a/src/core/features/settings/pages/dev/dev.html
+++ b/src/core/features/settings/pages/dev/dev.html
@@ -45,6 +45,14 @@
                 </ion-label>
                 <ion-toggle [(ngModel)]="pluginStyles" (ionChange)="pluginStylesChanged()"></ion-toggle>
             </ion-item>
+            <ion-item class="ion-text-wrap" *ngIf="userToursEnabled">
+                <ion-label>
+                    <h2>Reset user tours</h2>
+                </ion-label>
+                <ion-button (click)="resetUserTours()" aria-label="Reset user tours" fill="clear" slot="end">
+                    <ion-icon slot="icon-only" aria-hidden="true" name="fas-broom"></ion-icon>
+                </ion-button>
+            </ion-item>
 
             <ion-item-divider>
                 <ion-label>
diff --git a/src/core/features/settings/pages/dev/dev.ts b/src/core/features/settings/pages/dev/dev.ts
index 9b14f3e42..913708872 100644
--- a/src/core/features/settings/pages/dev/dev.ts
+++ b/src/core/features/settings/pages/dev/dev.ts
@@ -14,7 +14,9 @@
 
 import { Component, OnInit } from '@angular/core';
 import { CoreSitePlugins } from '@features/siteplugins/services/siteplugins';
+import { CoreUserTours } from '@features/usertours/services/user-tours';
 import { CoreSites } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
 import { Platform } from '@singletons';
 
@@ -36,6 +38,7 @@ export class CoreSettingsDevPage implements OnInit {
     pluginStyles = true;
     pluginStylesCount = 0;
     sitePlugins: CoreSitePluginsBasicInfo[] = [];
+    userToursEnabled = true;
 
     disabledFeatures: string[] = [];
 
@@ -60,6 +63,8 @@ export class CoreSettingsDevPage implements OnInit {
         this.pluginStyles = false;
         this.pluginStylesCount = 0;
 
+        this.userToursEnabled = !CoreUserTours.isDisabled();
+
         document.head.querySelectorAll('style').forEach((style) => {
             if (this.siteId && style.id.endsWith(this.siteId)) {
                 if (style.innerHTML.length > 0) {
@@ -139,6 +144,14 @@ export class CoreSettingsDevPage implements OnInit {
         CoreUtils.copyToClipboard(JSON.stringify({ disabledFeatures: this.disabledFeatures, sitePlugins: this.sitePlugins }));
     }
 
+    /**
+     * Reset all user tours.
+     */
+    async resetUserTours(): Promise<void> {
+        await CoreUserTours.resetTours();
+        CoreDomUtils.showToast('User tours have been reseted');
+    }
+
 }
 
 // Basic site plugin info.
diff --git a/src/core/features/usertours/services/user-tours.ts b/src/core/features/usertours/services/user-tours.ts
index fac59c705..d73c52071 100644
--- a/src/core/features/usertours/services/user-tours.ts
+++ b/src/core/features/usertours/services/user-tours.ts
@@ -63,7 +63,7 @@ export class CoreUserToursService {
      * @returns Whether the User Tour is pending or not.
      */
     async isPending(id: string): Promise<boolean> {
-        if (CoreConstants.CONFIG.disableUserTours || CoreConstants.CONFIG.disabledUserTours?.includes(id)) {
+        if (this.isDisabled(id)) {
             return false;
         }
 
@@ -252,6 +252,31 @@ export class CoreUserToursService {
         }
     }
 
+    /**
+     * Is user Tour disabled?
+     *
+     * @param tourId Tour Id or undefined to check all user tours.
+     * @return Wether a particular or all user tours are disabled.
+     */
+    isDisabled(tourId?: string): boolean {
+        if (CoreConstants.CONFIG.disableUserTours) {
+            return true;
+        }
+
+        return !!tourId && !!CoreConstants.CONFIG.disabledUserTours?.includes(tourId);
+    }
+
+    /**
+     * It will reset all user tours.
+     */
+    async resetTours(): Promise<void> {
+        if (this.isDisabled()) {
+            return;
+        }
+
+        await this.table.delete();
+    }
+
 }
 
 export const CoreUserTours = makeSingleton(CoreUserToursService);

From 2ac0a02feea5ac7a0d343d3a2ac711b0b477f16e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 5 Apr 2022 13:55:47 +0200
Subject: [PATCH 0923/1008] MOBILE-3833 storage: Fix max height on labels

---
 .../storagemanager/pages/course-storage/course-storage.scss    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.scss b/src/addons/storagemanager/pages/course-storage/course-storage.scss
index 8393ed5c4..8682b14eb 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.scss
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.scss
@@ -20,7 +20,8 @@
         padding: 0;
     }
 
-    .core-course-storage-activity ion-label {
+    .core-course-storage-activity ion-label h3 {
+        position: relative;
         max-height: var(--course-storage-max-activity-height);
 
         &:before {

From 8f0c0bcfbb0c9e0e3d8c669451cd4cc95b6699de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 5 Apr 2022 14:48:57 +0200
Subject: [PATCH 0924/1008] MOBILE-3833 storage: Show download buttons on
 downloadable modules

---
 src/core/features/course/services/module-delegate.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/core/features/course/services/module-delegate.ts b/src/core/features/course/services/module-delegate.ts
index ba49c4c72..f2faeac31 100644
--- a/src/core/features/course/services/module-delegate.ts
+++ b/src/core/features/course/services/module-delegate.ts
@@ -299,11 +299,17 @@ export class CoreCourseModuleDelegateService extends CoreDelegate<CoreCourseModu
         sectionId?: number,
         forCoursePage?: boolean,
     ): Promise<CoreCourseModuleHandlerData | undefined> {
-        return await this.executeFunctionOnEnabled<CoreCourseModuleHandlerData>(
+        const data = await this.executeFunctionOnEnabled<CoreCourseModuleHandlerData>(
             modname,
             'getData',
             [module, courseId, sectionId, forCoursePage],
         );
+
+        if (data) {
+            data.showDownloadButton = data.showDownloadButton ?? true;
+        }
+
+        return data;
     }
 
     /**

From 1f08ceba4ab2755b4d33609db2f469c55a1c0dad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 5 Apr 2022 15:13:31 +0200
Subject: [PATCH 0925/1008] MOBILE-3833 h5p: Fix Cannot access user attempts
 error on prefetch

---
 src/addons/mod/h5pactivity/services/handlers/prefetch.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/addons/mod/h5pactivity/services/handlers/prefetch.ts b/src/addons/mod/h5pactivity/services/handlers/prefetch.ts
index 14ecc15cb..98309cf0a 100644
--- a/src/addons/mod/h5pactivity/services/handlers/prefetch.ts
+++ b/src/addons/mod/h5pactivity/services/handlers/prefetch.ts
@@ -154,6 +154,10 @@ export class AddonModH5PActivityPrefetchHandlerService extends CoreCourseActivit
         };
 
         if (!accessInfo.canreviewattempts) {
+            if (!h5pActivity.enabletracking) {
+                return;
+            }
+
             // Not a teacher, prefetch user attempts and the current user profile.
             const site = await CoreSites.getSite(siteId);
 

From f81ddb374de58611db5eff6c4a275cf36bf21f87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 5 Apr 2022 15:25:32 +0200
Subject: [PATCH 0926/1008] MOBILE-3833 files: Revert size of filetype assets

This reverts commit 1c2da44b442f4e9a9511ae59d2966a493d383cf4.
---
 src/assets/img/files/archive-64.png     | Bin 0 -> 3914 bytes
 src/assets/img/files/archive.png        | Bin 1257 -> 0 bytes
 src/assets/img/files/audio-64.png       | Bin 0 -> 4609 bytes
 src/assets/img/files/audio.png          | Bin 1388 -> 0 bytes
 src/assets/img/files/avi-64.png         | Bin 0 -> 4698 bytes
 src/assets/img/files/avi.png            | Bin 1370 -> 0 bytes
 src/assets/img/files/base-64.png        | Bin 0 -> 4069 bytes
 src/assets/img/files/base.png           | Bin 1261 -> 0 bytes
 src/assets/img/files/bmp-64.png         | Bin 0 -> 4270 bytes
 src/assets/img/files/bmp.png            | Bin 1322 -> 0 bytes
 src/assets/img/files/calc-64.png        | Bin 0 -> 3438 bytes
 src/assets/img/files/calc.png           | Bin 1200 -> 0 bytes
 src/assets/img/files/chart-64.png       | Bin 0 -> 3359 bytes
 src/assets/img/files/chart.png          | Bin 1145 -> 0 bytes
 src/assets/img/files/database-64.png    | Bin 0 -> 4949 bytes
 src/assets/img/files/database.png       | Bin 1416 -> 0 bytes
 src/assets/img/files/document-64.png    | Bin 0 -> 4876 bytes
 src/assets/img/files/document.png       | Bin 1409 -> 0 bytes
 src/assets/img/files/draw-64.png        | Bin 0 -> 3441 bytes
 src/assets/img/files/draw.png           | Bin 1097 -> 0 bytes
 src/assets/img/files/eps-64.png         | Bin 0 -> 3679 bytes
 src/assets/img/files/eps.png            | Bin 1242 -> 0 bytes
 src/assets/img/files/epub-64.png        | Bin 0 -> 3839 bytes
 src/assets/img/files/epub.png           | Bin 1344 -> 0 bytes
 src/assets/img/files/flash-64.png       | Bin 0 -> 3752 bytes
 src/assets/img/files/flash.png          | Bin 1264 -> 0 bytes
 src/assets/img/files/folder-64.png      | Bin 0 -> 1102 bytes
 src/assets/img/files/folder-open-64.png | Bin 0 -> 1255 bytes
 src/assets/img/files/folder-open.png    | Bin 539 -> 0 bytes
 src/assets/img/files/folder.png         | Bin 543 -> 0 bytes
 src/assets/img/files/gif-64.png         | Bin 0 -> 4540 bytes
 src/assets/img/files/gif.png            | Bin 1473 -> 0 bytes
 src/assets/img/files/h5p-64.png         | Bin 0 -> 2837 bytes
 src/assets/img/files/h5p.png            | Bin 1246 -> 0 bytes
 src/assets/img/files/html-64.png        | Bin 0 -> 2150 bytes
 src/assets/img/files/html.png           | Bin 888 -> 0 bytes
 src/assets/img/files/image-64.png       | Bin 0 -> 5800 bytes
 src/assets/img/files/image.png          | Bin 1222 -> 0 bytes
 src/assets/img/files/impress-64.png     | Bin 0 -> 3321 bytes
 src/assets/img/files/impress.png        | Bin 1157 -> 0 bytes
 src/assets/img/files/isf-64.png         | Bin 0 -> 3509 bytes
 src/assets/img/files/isf.png            | Bin 1213 -> 0 bytes
 src/assets/img/files/jpeg-64.png        | Bin 0 -> 4459 bytes
 src/assets/img/files/jpeg.png           | Bin 1336 -> 0 bytes
 src/assets/img/files/markup-64.png      | Bin 0 -> 4171 bytes
 src/assets/img/files/markup.png         | Bin 1296 -> 0 bytes
 src/assets/img/files/math-64.png        | Bin 0 -> 3170 bytes
 src/assets/img/files/math.png           | Bin 1094 -> 0 bytes
 src/assets/img/files/moodle-64.png      | Bin 0 -> 3578 bytes
 src/assets/img/files/moodle.png         | Bin 1212 -> 0 bytes
 src/assets/img/files/mp3-64.png         | Bin 0 -> 4301 bytes
 src/assets/img/files/mp3.png            | Bin 1369 -> 0 bytes
 src/assets/img/files/mpeg-64.png        | Bin 0 -> 5308 bytes
 src/assets/img/files/mpeg.png           | Bin 1467 -> 0 bytes
 src/assets/img/files/oth-64.png         | Bin 0 -> 3724 bytes
 src/assets/img/files/oth.png            | Bin 1098 -> 0 bytes
 src/assets/img/files/pdf-64.png         | Bin 0 -> 4231 bytes
 src/assets/img/files/pdf.png            | Bin 1319 -> 0 bytes
 src/assets/img/files/png-64.png         | Bin 0 -> 4528 bytes
 src/assets/img/files/png.png            | Bin 1279 -> 0 bytes
 src/assets/img/files/powerpoint-64.png  | Bin 0 -> 4634 bytes
 src/assets/img/files/powerpoint.png     | Bin 1371 -> 0 bytes
 src/assets/img/files/psd-64.png         | Bin 0 -> 3944 bytes
 src/assets/img/files/psd.png            | Bin 1320 -> 0 bytes
 src/assets/img/files/publisher-64.png   | Bin 0 -> 4973 bytes
 src/assets/img/files/publisher.png      | Bin 1424 -> 0 bytes
 src/assets/img/files/quicktime-64.png   | Bin 0 -> 4664 bytes
 src/assets/img/files/quicktime.png      | Bin 1399 -> 0 bytes
 src/assets/img/files/sourcecode-64.png  | Bin 0 -> 4297 bytes
 src/assets/img/files/sourcecode.png     | Bin 1308 -> 0 bytes
 src/assets/img/files/spreadsheet-64.png | Bin 0 -> 5317 bytes
 src/assets/img/files/spreadsheet.png    | Bin 1444 -> 0 bytes
 src/assets/img/files/text-64.png        | Bin 0 -> 3692 bytes
 src/assets/img/files/text.png           | Bin 1117 -> 0 bytes
 src/assets/img/files/tiff-64.png        | Bin 0 -> 4684 bytes
 src/assets/img/files/tiff.png           | Bin 1404 -> 0 bytes
 src/assets/img/files/unknown-64.png     | Bin 0 -> 2150 bytes
 src/assets/img/files/unknown.png        | Bin 888 -> 0 bytes
 src/assets/img/files/video-64.png       | Bin 0 -> 4211 bytes
 src/assets/img/files/video.png          | Bin 1261 -> 0 bytes
 src/assets/img/files/wav-64.png         | Bin 0 -> 5410 bytes
 src/assets/img/files/wav.png            | Bin 1417 -> 0 bytes
 src/assets/img/files/wmv-64.png         | Bin 0 -> 4211 bytes
 src/assets/img/files/wmv.png            | Bin 1261 -> 0 bytes
 src/assets/img/files/writer-64.png      | Bin 0 -> 2836 bytes
 src/assets/img/files/writer.png         | Bin 1113 -> 0 bytes
 src/core/services/utils/mimetype.ts     |   4 ++--
 87 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 src/assets/img/files/archive-64.png
 delete mode 100644 src/assets/img/files/archive.png
 create mode 100644 src/assets/img/files/audio-64.png
 delete mode 100644 src/assets/img/files/audio.png
 create mode 100644 src/assets/img/files/avi-64.png
 delete mode 100644 src/assets/img/files/avi.png
 create mode 100644 src/assets/img/files/base-64.png
 delete mode 100644 src/assets/img/files/base.png
 create mode 100644 src/assets/img/files/bmp-64.png
 delete mode 100644 src/assets/img/files/bmp.png
 create mode 100644 src/assets/img/files/calc-64.png
 delete mode 100644 src/assets/img/files/calc.png
 create mode 100644 src/assets/img/files/chart-64.png
 delete mode 100644 src/assets/img/files/chart.png
 create mode 100644 src/assets/img/files/database-64.png
 delete mode 100644 src/assets/img/files/database.png
 create mode 100644 src/assets/img/files/document-64.png
 delete mode 100644 src/assets/img/files/document.png
 create mode 100644 src/assets/img/files/draw-64.png
 delete mode 100644 src/assets/img/files/draw.png
 create mode 100644 src/assets/img/files/eps-64.png
 delete mode 100644 src/assets/img/files/eps.png
 create mode 100644 src/assets/img/files/epub-64.png
 delete mode 100644 src/assets/img/files/epub.png
 create mode 100644 src/assets/img/files/flash-64.png
 delete mode 100644 src/assets/img/files/flash.png
 create mode 100644 src/assets/img/files/folder-64.png
 create mode 100644 src/assets/img/files/folder-open-64.png
 delete mode 100644 src/assets/img/files/folder-open.png
 delete mode 100644 src/assets/img/files/folder.png
 create mode 100644 src/assets/img/files/gif-64.png
 delete mode 100644 src/assets/img/files/gif.png
 create mode 100644 src/assets/img/files/h5p-64.png
 delete mode 100644 src/assets/img/files/h5p.png
 create mode 100644 src/assets/img/files/html-64.png
 delete mode 100644 src/assets/img/files/html.png
 create mode 100644 src/assets/img/files/image-64.png
 delete mode 100644 src/assets/img/files/image.png
 create mode 100644 src/assets/img/files/impress-64.png
 delete mode 100644 src/assets/img/files/impress.png
 create mode 100644 src/assets/img/files/isf-64.png
 delete mode 100644 src/assets/img/files/isf.png
 create mode 100644 src/assets/img/files/jpeg-64.png
 delete mode 100644 src/assets/img/files/jpeg.png
 create mode 100644 src/assets/img/files/markup-64.png
 delete mode 100644 src/assets/img/files/markup.png
 create mode 100644 src/assets/img/files/math-64.png
 delete mode 100644 src/assets/img/files/math.png
 create mode 100644 src/assets/img/files/moodle-64.png
 delete mode 100644 src/assets/img/files/moodle.png
 create mode 100644 src/assets/img/files/mp3-64.png
 delete mode 100644 src/assets/img/files/mp3.png
 create mode 100644 src/assets/img/files/mpeg-64.png
 delete mode 100644 src/assets/img/files/mpeg.png
 create mode 100644 src/assets/img/files/oth-64.png
 delete mode 100644 src/assets/img/files/oth.png
 create mode 100644 src/assets/img/files/pdf-64.png
 delete mode 100644 src/assets/img/files/pdf.png
 create mode 100644 src/assets/img/files/png-64.png
 delete mode 100644 src/assets/img/files/png.png
 create mode 100644 src/assets/img/files/powerpoint-64.png
 delete mode 100644 src/assets/img/files/powerpoint.png
 create mode 100644 src/assets/img/files/psd-64.png
 delete mode 100644 src/assets/img/files/psd.png
 create mode 100644 src/assets/img/files/publisher-64.png
 delete mode 100644 src/assets/img/files/publisher.png
 create mode 100644 src/assets/img/files/quicktime-64.png
 delete mode 100644 src/assets/img/files/quicktime.png
 create mode 100644 src/assets/img/files/sourcecode-64.png
 delete mode 100644 src/assets/img/files/sourcecode.png
 create mode 100644 src/assets/img/files/spreadsheet-64.png
 delete mode 100644 src/assets/img/files/spreadsheet.png
 create mode 100644 src/assets/img/files/text-64.png
 delete mode 100644 src/assets/img/files/text.png
 create mode 100644 src/assets/img/files/tiff-64.png
 delete mode 100644 src/assets/img/files/tiff.png
 create mode 100644 src/assets/img/files/unknown-64.png
 delete mode 100644 src/assets/img/files/unknown.png
 create mode 100644 src/assets/img/files/video-64.png
 delete mode 100644 src/assets/img/files/video.png
 create mode 100644 src/assets/img/files/wav-64.png
 delete mode 100644 src/assets/img/files/wav.png
 create mode 100644 src/assets/img/files/wmv-64.png
 delete mode 100644 src/assets/img/files/wmv.png
 create mode 100644 src/assets/img/files/writer-64.png
 delete mode 100644 src/assets/img/files/writer.png

diff --git a/src/assets/img/files/archive-64.png b/src/assets/img/files/archive-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba7111a024e281a4b889c45b587d5021832cc2d7
GIT binary patch
literal 3914
zcmV-Q54G@#P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000jWNkl<Zcmd6t
z1(4*rxwap<-84I}G_w?5rX;%?I9wHGW@ct)X66+9|7B(lGc)JVGS3cUgKd4^ow(Yi
zx;m}xJ{4M3c`Vs&m!4Ppq*wA7RVADh|GqI1)6>&z+rEvt*}2MlANscEJ>bCo?>s-d
zm=0E}s47+jQOyslLVnFErNJ^26EkLRuA%?_lYjc_$G-8AUw+)vpMZ$+yGiQ)YEfT9
z6d6J(D1fTo-CDUuRgHTcL{UVe(crxwdS5npxV-DW+wT2@X0t&ljdI{j1S?9Wg5-H2
zwU)|2l^L0%v_;vubvt82qm%3IGWP$?>bQl~$cF$>{p|$MoZo1r9DgH<%vbsrz*>1l
zqtX6gS8)ualF|6#EYshaVEV!|CNpH3gOZ9RlTO|W?KGu6SZ9HGs<$t3)x)l2^QJ9%
ztJt<hMNzNWw18JIfEq2z4mBtAu-zq4E%KD2h>?+jSCq@~hx-wrz5@U2G|g^njKL)^
zk)dtdOnv1H3*Vn6X(mKjL?V_X>%dz}A_aU#bybx`7AWn5s~>tL8`p2bPpW|~>`=SH
zy5IWGIe3)37uM^Q<Euvo_o-?Fmxx6KUjS7df$s3LUpq(p$MeLQQY+O-jD@V|I$!_{
zAW&aD#5{A9cSl_L;LCq&c)Gy5yi4l+)EE#eBi7oQD*smidL{?I`1SLoKV77f8LII>
z-qLCnrR08_Ln)Qv8Z$bB*{NLlpx+YS@Al!=b|v*g!xXh6EI=5ZrEiRr{%na_2KCAS
zX%6q8aa6>Eb*AhLvP-$^11`G+;EM+oKgGS^Tei*e*H_?wu|ze4p%wT{1tr3Np%I8y
z#f+y@q`NJ5zVBVwbV<MiO7|XMj3M0e2@5MRpZx|tf#LE1YLo~=T#7s@&=vTJ_61ry
zGY;J6PHY;zL|R_e!ww7J;IlR}E2Dk-^F^wOGFTbFA~}52c_xmcVxGd*Bc__;EN@S^
z!@Ul&d35t70uM?!#dp8^-6@jIENj-S;p3nFG>z}gvizeNDk)UU10*8ECITQb9T6fZ
z+laJg7+*fm+}0+0?{VM~gb%x__^V(2D&W%E^=nI~KYKJPA2Y~u!axphQPX*#<U}Z8
zXjb6d@;KACTW0s&?#Pz0?(n%KEk_rHS5<6k;dcywF}okH9auw=T4{?X?tAp}YA52=
z3v=@fMKu!1z!ooXA{d2sY&e@tGQF#{0)KD?eha3{oNO{7ZMB&_G7T1>3%m&Bp&G+m
z)=(<PU_6uKJ3IwR1W^mn6J7)JK>UwS`wMVscy!~2=gdsZVX}yJY|#wg3Fq)hHR4=4
z$?-MkSu5+2?<{a8T0m7%S63txR_|HQ)D7eC{bj1vDxyjOCk2!Ok)iU)h^gsml8F{3
zG87`II-uNV4AmGrv^n=1no1bHM~W+@LBN%l=bJTSP2TdFDL%dt$Oa7KtqD%99cN%X
zW_z}g>PQXIq5>|4CAHLAWva=_Q5r&V-d;@y$bh0~BG43cCS!P}ik3R}Db6lb+Q*ul
zzy2s&9=|<bWg-%QFY<vgpzKX&WsPX5l30tPU=85xtqep=ET3m#Z^C*RWruEL>{+|W
zVkL?rOewnQfTyr|>k#Q}7r}aiTmdIaX}C;v_XvY`8N-+^-5!@(vkeY^{O2^UU0~?S
z^+*c{!h;54ARefc0mqnH+c^XP3ZpNI8H^ckUSM%Yi+y*$Gxj@kl(QOHSuq&qFU-*x
zU(E9WiUZBN^RNL3uHsY^<W~!z{($EoL?vI6uiG(7yPhG<4Cn(s;0EJN1aJb_&YC`z
z3<{4g8S!wPbL|P5yHaj{&x84Bf7;9;qWPe8>W4>}`R|hqWveg-R6%i-5LMUO9Vqq6
zC<yu4b$t}=l#6S%(K_pIH%9S}FudaphJdKz3y_NI0V+ymcoi4gQ>1$=cf8k~*gU!k
zQz&bo)o3yMr88_|6df=*tQ+78P#@R{A_^3s{#lhGZxhSlwh^{GZYybI5vynqc*VWD
zw*Ur2wAj$d;cFu`rtCDbM>uq!yWs4tYsI9IP)jRF3|1@((4(al54?*&{@IG4CD00J
zqOMo;1s@c^3jq<b&Spk^^&qo4huNdt`TlqH7B()%jR7?v4gv?>tEGMDK#$3vS45Oz
z7fDd0U-+;9u3$PZO*2bvu$FIQ#d{(yf530n^BZppujB`visY3<y?E~4ofWU_iPNno
zh}YVM5MV9}uYHFA2AfF^KbcNZ-4}ED0}FUBxmI!c0*G)t7vMz&r6?CY#23ar>jY45
zZ0P~dMMJ=w1>$;{xz;%4{iT&{tSh>~d&(+m3^|M{(nSDJ2jPzouBQ~|a1Rhg4U{S+
zQkywJjH^=sK0FJ=BQ?P7o?cj(pmK*2cYVNJ3Bx<NMTF{Ljmp>n+3^&rQ7Dc*uy9Lz
z&ldR{xH;G2>@Uu+=C<q5g3tZw3a=XO1@ZKSc?T!ZFbyuh_gxqr-3Uq;9@i>ysl=uS
z-Hy30o+lk|QQUQNKVi^9NL3&#06+}1=h}?_=NZ<%a2;xjdtvyVi=iK#{3S(7(`@n3
zj@@Th*7Iw#VxkYi<GOVwRMyql`1q}u6cq2-;Hs|2@)po;dj`gkMHynnLHB?UhQQlD
z|5|V<{p4*v@v2&-_Sq$xCJgT?TCBsOsKmn597`7#gLc;qP@WKhm0UNm#41r_7~MXG
z;*B%V4gTU=VxRxQ7bud5aA5y|A10-2mXx&@g9jJerE-bmKRm+Oe?7uLQU_xS0B@@E
z=X!S^1u0;<Jqw8BC032CV(i6Zr~#Ee;X{j|d*AC``1AYnQqzG4;K9XatJ&iGXHT%s
zu7!clAm~H%bbGxA!>nytyK5~wp1g}JvRJDKa#46!2!w#O68y|)!thQ|lUrfRNepF!
z6&q^lupsVQNEl~@BSotQX}fzDgIDcggu22PwKfFdO{cQbDJWn?5u?!OwAR!Ad()&8
zUcf3C_pXb<)5{1EPC<CrJ)AR>!mIlbxci`px=Kn|2ppILEv&CW-L)R@?oQtV^oB1^
z&YS1?UdG1d!)~w3J#gZwzvtK+-Z|&603mo2fX4+FQdr?Y4+zG&w_<eH0**0%e_@4V
z(kw#|2Nr}^x=aIM0gM5sK=`ADbAm#Butt63Dv}%9m|E252p<+Iv_!TdG-jKe`q?Sg
z-)<eM21VUe7l7CPL!igh=Q%A=5K&5{61RKUF3$hYDVpaS#gko@vw&-P9~^LHx5Mo2
zSAfP$i(~(CoY7aTFRZZVG`qkna5F=oC%j^cfsA|!y?%hLPumTt`;B(9v)W@1&o?k$
zUR5!<6}E_V9v}qo__coliZ(K8Jb15yZhfBH)A^}67RKi>8aenNNRjh5LtMU_NGb}(
zuxaN;e{TV}DLh{9&^`okzce9u0FX{sjVm#Szjp&S{=;=tTU9Uy^^J%Z+v4vHhL_6z
zEW*f!AvV8iBkFda0|Or}gl_&AV8ZaOeRJ4mv&qr_I>Jc08sn_6@9ugSp75E@b7_*X
zVb3TBp1GgQ<RMV>z#zOE{PpG!f(l{y0xY+}ZAz^O;@k>%pW57_r>i3rfF2v8g%zd(
zl86%-4Zyqj@6iJS5fFk0XG|nlq1Y8h0y{kvUEP8AzaxwSIMD>x019A&@NRH$M=t@~
z+l}c8?=m0`*5$ox;LiQ71Hc~}3cKwwDWCy(zxNeK4*~l9=LGj+XN3!Q=3siqxdZn7
zKi$U*@Psa^>BARiQL;2cB!8w~D{L@fcu<heVE`3HM35*jlDi6_JwJ)LGwJ|E1rr(K
zYHo$yG<-35Rod+YMTyHLM0yM0)Px{>Q7vnQ+Hjp!n+I9Gu0a&A!o48_+vebUh$u@l
z%N+m72}ZY$qJRShJa|#1-AZUDDVsK}|7Bb%%~0yw2PkSx03P>cMkKewdmp`zWB+lK
z#WTwQxXOEb{;vB6KcKp@A8xQb-QwDRIKtgtJ4Vt@v8hGf#Elw2a(L1-qZF4&7MIUG
z@43%-{_N~*URO^54Nie32wy+}nP4!izU68TJpUlJk%c!VAm9Z3-<dAgTwU^i*-x76
zz590dU$!&<lGQYAk|f0#L#<vR%QEKYmN;?p<ix9A_2P&A`d7camM$sQU<jCt!;3Py
zbv-wJ?=aVW=6d3_F&Mh}c?aS0o^=iTf7g4QI7>@QjNNh#_kPk<G@9)kbh**W!*OV6
z02O6wYMx*H`r64izwwn1KX&x+4{zpbum}Ny|ACby8Cwo)p*@~(>hq^bvlNA!+Sjfz
z?M;bY21D@j#k(+^nmEqm-ufVt%rdtEzqH&!L>L|(Ac_nZE==?5Utc%*mN(__-zJ=h
z0}+6t7>oz+@+yEaY<u8VZgtJA&{V;An~~mpsxAu-&g%(*0oScf_|cD7F)&(Zer`Dk
z|K=6=qel*Zi*V{;gdhly3uLmkP^y<;fL>o|d+px#Uey&rP&2fWl%=KSZvo#k1VBxH
z|ADEZzZ>|#dfweN#gaH5@a%614-mz1iIt-pe_!yx9|qoE(HX<g&~FD15Pj}*pXXP<
z`gJZs6d6=6O?dUD(0Z*xsr1{y14Q?`-+eiF@BknF@P{$R<U*jA7QB1T*;{KZ7ba$Y
zD|mniAWc(V@rqaQ>}Nka&qt-wB?n)etq3AYqtRx?+w_L-Er3h^|NsAg?t9<+YL;aZ
zMbRY(FRCmrH>lNWOioQtzW#MDePjpTbUEmM7H|*gx4-@E`7@_a{bJ{?y?0++T*COf
zyWu>ly<A|(^@Rj+0*eS~lI5ens?5IWjjwvniplvYumQJ4sqS3l^TQT-@4gn`QAdml
zz@bBj_I>yxAOFxTZ*i;Jr&;PYh}2&hVq6~FDb(^FFuh~G5H8IuHnZmN;p@-5@4fH%
z)V0@M`(vQyL0bn*2Be*%4YYuE=SVyE#R&lAjsSJQRIAm2p~1n;idKMFp+s>gk%0&>
z7@|-Ybmt;({A*4%_jC1cI5mteEiEp#+er$<1-y4yUw{sLvvah81V{@3a3T=lKnt*_
zDEmhN>*cv=-kk&2eCW_M0T-@ay1E9$C<Jjm#DzdG8Nb{E!u0u$ev$^uE@=<(`gsTc
Y3qk`2_p{c^J^%m!07*qoM6N<$f|Pb}X8-^I

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/archive.png b/src/assets/img/files/archive.png
deleted file mode 100644
index 20aab03e1d52ac88732dd942ef494457b50e77ad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1257
zcmV<F1Qz>=P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000EANkl<Zcmaiz
z1F*zO7KXo0I+=UN*IL`QU0B;z*<9PjE!Wz%ZS&dodsm}OlJ0Xhm99!<eNx|?WN`5R
zJw{al@Lrx!al0h7#RuN}zLncwb<1b$4tK|kBKKKd;&vq2xaa2Y@Bj4s{SF}k(Dn-<
zi((TSUzQ~HI{-#RP}TkUJikD#>1EeWIr+*}+;qtiC(8w=vnBpE%0piJKyG&P1G4H_
zl?o-)R<s5bMMW`@aqDZtdq$Bt#~Nb*(x|!?*GyS_`ARxBI!4_Uyz`WI7Vi1-`>?aK
zQx(tozhOW`t@nP#m<W6B`R9_Xr1af@`IoL_JhRZZn7QGm+s(P>^X|*e_BPIYOkz+q
z;H3h>%n%5h1ZcuO{=tvs_P4nG)_b4!j$}Bsl>Hd%4cBkYxY?6#&*o@@>@*|4X@Po0
zMX>!2@gPBbEicAKnAo5ainlx1PrTs6BysY{*|l@D(+QIgPwC%sonf}Z<m?-fL|Ojj
z1Tw{!LUOwvW-mc=MO1Mo1%tb8U`J^^016twZuG~L&Y7dhf+BZJ?^1B^&|9!!N6fCA
zpvMkD5o?ehh(x#>7wApkMTu5p;<be0aEV<@QKy8^8k@V4qI67V8Qr^dxZex!&7kOV
zdd3ape>}lBgIB31^%Ww5uTfm#S-n-C^j1B*HXhK9NDP$XF}E|^`(^iGyE3#WN<<Xr
zg+hEqmA(HDIGhSXXsk-0?ZJgtUxgi5dFZPj%+Br(W$qB?vEvT?`)*Ji7brpN8qu(c
zN^Nr7vn)@RbT@j<2H~Q{p0#l{ce&l2ezw22M^@y7(*R<j7%62bhyiUi2+ct1?+K>x
zNGKj?TsGMEe(;^B>fvOPm8d4DffyFo&pG+^jZlIUK{V*@L#~k8gZ{0CY(8Qe5otA`
z2Eh7omI0+sgz3DKy08Kssn9x$YV%wohy`K@b;5S-4mPBgIcjPTl3_~!j^o+`F<MU@
zBoe~C)J5a2WpSL*-|V+)w2mnu8tsf~ZC<o$S-sl;uFp_Iqp^sF9Kb{d*Y-e^rhIz?
zP@3kkVRGGsYkz(XJ`?=E{s%%M%EB?a)rgxvdcTpVf_Ahe0&S+l<sRo1jSZsIlZi2?
ziBOfWRcvaBqLrAcL9?APhBQq`Y}{%PHoy=JPDUM8_j+W9OJV~?1XMAhTP<bkBFfS;
zJ6tf_8URX?rrdbL4L4kK^`+N!Itdn(MxG!8aVI996>L9vn=*6FR!ZB0@S7qp7*~Vr
z-(iP1O}PB>D`&5L&C6f#x4-@Q8UP!|F=go*{iIZSJAHQVN!6rebxf<Ew(kMMbUG!E
zb5{CY&Oh(M(^tRhCC@thtTTSxcyRsoH?Y0E1=`32qI7qAbZHlFAt7T7b`nt*1y@{t
z<>IxkdD(NT;y<Dl(OvFxXFm72&odYdNRqT7!B)g3CL$1r9MJZCL?>P0>Z`6kefi5?
z^wcxY_}lmSmoNb1@p$vopZ@%}_Vy3%P*!@Ws!_#gFvf(<K*DpAjftYe!$bF$x4ix>
zXZ-!IUjuqT3Cw{Rur#3wwwk<Gv8JjqV1XEj0Mnu!3gEpjs#pLi;6ekk(1iRS_{_kI
TFxK`y00000NkvXXu0mjf`fPRL

diff --git a/src/assets/img/files/audio-64.png b/src/assets/img/files/audio-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..e98c78dd7ab95c2234044611a139c2b592866c30
GIT binary patch
literal 4609
zcmV+c68`OpP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000rlNkl<Zcmd6t
z1(Y1gkwAY|Rm1RTMywSsNLt}ClWeWDjApjqGc()AObf?oW@cChfkDi&mc%d&O$7<p
zoAvssZd97rw`0o_QcOm5RrcsdMPz1VN*H4}y%<K`7s8>hua9%iJ(t0Of$V*+zvf*x
zE}eBru^dDlZH*{RRdrR3RjCZxwi=A#(D5#@@A<>#XIu7v<pcNq=i_g9+dJ(2-;S8t
z&zgx40>=@YPEP9pW6TPr^tIJiocua)9EWnb!r$Hhplmt3e!<Fl&99T%kn;pm#h_7D
ztu3pz)`XG56@otBU}h|4#`NiQHs^cJz3z_BG)$b~YbBkL5Y{qdbAYk@!elev8pjb&
z)a`&O_(#g+;J#Gn2ti~V%3FR!_nNOWTquxnvCxrxQI!P_WK|=LA4pu+Wk?EIFT029
z?s|iDfa^k7@iAIr5MYu37Ct5bj4-w91ga%WV#j|I-mBTJ<IvXD_>oM;d!QZ%G*sbt
zN0FQ>gdi!xaR?Q3t@$c_>%NHqVt8f2tpk*f9Z*$2k_cP|r9<N-cX90<uVd=Oj+AIi
zeS=BVG}y$mBm0?Tcbk$84cYzeZOw~~F=Z0sX{}FjfH9^GPK6H?^sfB|!@v42xvWRt
zbC60UpF)U}Ju{w5f9TS3@$Fo7>ubggPbz%ECSfNY6#}%<ZAz)UG5lW#kS?k4{p-I;
zal?1XSK%A8uFdz93;`4O>GcJ<i*Dtzn_oR<_>{0udE1FAGcq*<ST!WYs~3JC0pFa@
z*f;Nv{5nws6ZBOK&azv%Xw@sn0lc-XjufxnH(%QLy()Z$)`l!nYdagHiPF#?YRr<G
zxoG9ROq(<w;O%941PCEUh3{MU4T>+qXR7dxIgBv~Ax?3CAf5?&eUOW9Vfl)Cs_>oT
z<INj00(*1^SolzCde(f6;)d_p0k0*WL2DhuS5<>`f~dhuO;;I$g}1QuhP#+PdAz{a
z>~!%~tXM%!l$1>9?Bt*S{eLKJ{xJi;_%^wWOH<B6YGr{Ps5v3dD#x)?-m#*hGJiFT
zuD^49!W)zBfG3}PlB9G@oa7#U?2C@r`xu~U$Y$&u@460FMmV7yDvlN;#q(Bi{<U|E
zOZd^2`(AZPN=^Jo@uo{>yesqEn)Y%S($bi*dF_qt?>M+XB~lz2ju<}YMiyLq`?!WT
z2~CRk{g2*4LR#CK8s0I`--qYMd5uxvCI`D%%gPYLuVnr;w=?5+4IeM;!2zQTP%r%G
z;>kdgye>OIKI=ME0?jG?1qckG)Hdu3=dNPGnSr<Cj~|6ZVMKFN6G};dy5M8mq&uLw
zF-Jn|LTAX=gi_g#BiEJ@h7)B?>Ack}y!K4Jc@Wtg4}b1Hri(!?e#>9lvfOB0AG~eT
zbHHnDZb&R+1z{KwMsaZiCQ%X?q;~14DEx&tv*@}rG~fYlHqVnk_zGsnkH}2OapdW*
zF=NGB&_Stwcu4htCzVb*0I6+RYr{MiQCmyXSCT}FZ)3?Bp6Zk~OlojxXv-6c49A}O
z8qKqp(l&27GN?cbd|LFTi6gZksj8}>jLX?DitBr+;Y3jroPP^TR-A!Fjse&4a5GtJ
z>nLF1%2(5J@m+*f;3)Jt_|Si$!ir6W(cojtVAA<<l-49wDot3`K*sfa)ug)ua>=bM
zfBC&kpY*$j_c9r}P8?<bo-Jf@4H%;_GGNZCw;`sUkJg6%7k1LM=^>jQ^}?q+Kp7Hh
zBOtOnISPZIH*hdZZ{xxnUvWkX8zCUl@c38%i34B%BMMyya56c&O3gPkF>BS^@r{SU
z;owu>BrNnJ9JfCB^awB{RVib`-*p@YBNz9AJGgZ9E15RNk~Wjgk*NY?a*ZII)8)K<
z<C~xQDVgV=ra_f>?)wj*!+<KJ&G%^wE~07C3Zf`t@c4eZwm*@Kf>d}jS_)_b3AHKU
zxef)LAz#h8D{g+(Sn7E@f9D#T*}Z)ePk!xR+4ktSh-~hP)B!JwLe5>dl$qz8AD80$
zHgfcrKd3<>jAHiHcjJo}uLXxUJcJ6%AjE0m89fCw3AJSXfuZTLySe7}*NzE3lgXgn
z3_ttkXW8+YkCEN_RSFN?N8vZ?a5DLmP7)4oE(d^?5gjw;GUu+35jlCZaI2yI4Jv)d
z5Uz&|1E$PfK;t==5=lwl{=Ezz-iPC6F_?7t(PjZ-pr!)oEd{h(awj+3`8uX_PI$@i
z`Nk%?`v>{<{hvUt`A-&2Z6M#&YE!`kMNIt0?2d7Ne=l2~_%U84hd~heC8nHr0i9RA
z%C1X_J;yn=;b*v+ct65(1k*2CNkt0$a*6J}8*n@iAQj$NKvKmy+SN}@4<7C2XkU@b
zUUmypCQf`w@B*sv&1~KDD}MU7Z|AI@Uodm>1bi8%mx>Qc5OE*8T%Ij!9^#p={2|A;
zJW{=G00SzhFz=c>P;E2N299iel&Ca_a2#Y5F!h|Jn3l<CrRmzY6(d885vlODO;@~!
zHteM)Q5Y4L&YyL(I?s0qkpxbMkLT(PKy9Z8T$jgx_)QM|_(7IT${@T}{79pXL2K)T
zlY9QIOHX$<hu40Wxou7C`@z4`GV^@$9n;V<q_txboy%8p?BV}L9y`F`!98@&zZ4nx
z)q9;ZOh1oe&mjhm?k5=T$8BswYncjv+FIaCTaS{EXwLleK9<XPKMz5S2A|31={j+O
z?nBQYj7Erfi+umiUlVNq2}`Cn5*Y_2HO3fX2N=87&_>52vo_@Oc@{0dn89t2Ap5#F
zxaQj|y!RuhD753jjAhrb|FN&&1qFJa-O9v;SHzLydbG}*PhT}^80@Fif1I|K4p4F=
z{ODU^k38}yHPKqLY|+AvCfhV%BH3{|_-qw^<GLr<``!DP>K1T?Lky^CccFP=6M@2l
zYGW`Os;yP25`&c1<Z?L{-Sa`#9oUQMIl%GlYnb=)H{dq3qN0e7X|oXRGmuAj(|>Ru
zXc_l6n)a!)3AKap{i*}HXrH_E^zf%EhE}e8IU}W5tR%pb@bQQ}G+f}BpZo_)TPv7M
zs|D8vjEUD0fr?>G{MKvtY7t;t5b-)+hP1R#Wa6c_ao`6J67`;7_~^5AF1Xyz`?-cj
zvYj(19@;^nuM6o{z*d5a#%ez)GB{C%@?am15U0Q=F6x>Ftpb=7_}YO-sW?n4CA6C(
zv`1p5RzSrAoldSSW0kR88w8U_IyT=Y%v(YgmnaA*b{)3A2e6@@ZJTVryHXfNMLt3Z
z>-20xBTBePDGAC&5Ml(pZAM)Pd8CLj)aJ$1(OwAqGj^B}7RZ=dn8&#t+a&Ch$K-m%
zW`;4EY`%#Q4^K*>pteu~1PC`{9UMg=7#%|ygX6mP_d80Xq)dfR-xjXxU?d&B<{JyI
zUsMr;ni^!%KE)BXUo8NVqjMBRR+Rxa*FX)Ds)j*eqsIu>hJUS(iWE{Rgf<ArO@+4&
zrcMXc0gsLsF9vL>tZ<1zAqgJaSUWi$$l7&c$?Ccu1Kr1oDkV(bqj}O<wJ5O;8}9G6
z4)pR(wnSET%60H7MY}TejKIq^g4U_krGeAe0{<^~3#4f4n8=Lf*HbAL@r%Rwr2;{z
z+Lnt%VTg)B6XQx8`Z8{<GZO0z8{)s&v=&bW<l83EKJ#2u6k5n~xn$>ggQ1~)QXCyx
z+c9FOzZV($XyMS%)`5;AW(2&c!KA8}db(SCUYuIhX<Lv;mfrPV`sXjF+_fLA6gUp$
zfgZZ|Zlu_I3}M&$Vq^qZht#g)DlyBZU#{WMFMdL&FwDI0I`Zw4t#h;0dk6MEPw~V-
znhkW!Iv3$&0N*;N`|y5{5hB+_Q|A<PVjM`qo0paXhV&W4U{suQlP<gwk;q95R0g`(
z`;*VG|LO05<ALj)93*SAfzp7m16{=rSo@{>X_JHGI;OB__3H?O5HPse96Nvc1WsiL
zaye!!ybz@%#;zw6N1xq|Fot|fJ1w2l?7dWY1Js)W2^oDe!)TOWK~{=3ccXGut9GWj
zon^24B+K6LN04o>#fq}v8mZ%y(A5^OZN8zAORKd<7)h>v<40(kGS}v{>$>(oW9@nB
z$K+gxwrR7NeBN@Rz>f>4zFxYY-H8C&r_YX4K&e#tT2j<M4HEwmM%2H7S<5OJft1X<
z?k?J9p2vnS{1x5LY{ShrVi3sMLde8DRp>MS>YHiroXFfOZ^ADPBLw6cn)$(3KZ`u^
z9MXmPSFIx3G=Xw)*v|jY?pi~o=Ln6$FtZvN!pnmnq~t!3EQsog05itpDx-<Y#cIwj
z;D(R>JLkOYRRom^l|q3^sfbbv1OV1<Y;NJ4D{sd4eT*@7>ucAJEo}Pkf76o7&^Tcd
zi&x%5;8y_92DUu$6S63rY>v4XUWJUp6nJZ=fY&t!h?fGN{M;^Ryljpu-tvcZ&RfLc
z%}?6Vd)D%+iGtwdvQ=p!Rf+T7%W&k#A-?hVpP=28sZ>I)e%%{ro-&)#@DRCdju)QW
z$AL{x(&9KwnYVx`=PV`&{Zx2sTdh9@NOT|bL8X$is)}>3y@T_vyVDMQQ5f1h7h>cd
zUc7hs%b$J=wSOC`v60!!F6E*--)d(C0XW$#kAM4%WXeN?!mxD3Z8*6m2!~VQO>Ea6
z0m%#yV}wsW9Qnxu43h?L+aRd$vb*0v*XGCZ`%iG|2mc!FWYDTiLt_&=Hg90><KJUK
zHbcwADJ;7FHiB|F1wN%9vRYRJ)b_~4Z~c6J^xa!9QqeM@lU48eGcqQkW%}9p#R8t^
zQL6ZS@8AE1W)tB1lGXRTnZ^lIDGd(-sqnTnwoUhdH_8&=%)%!+g?^ct3zmTp7G5~Q
zZk2uc!M|i^&#!69WjSm9A}+l7)s#zxQQ>W?4Kk9oC3<~hfI%S6IDG9nVMldrstB@G
z_@8{^3vBxKe=@nH$?gW<@~%%owh3b$AWjco)gTD%eJ^9{mb%7(+Rrl$pIXvtW5^3d
zYerBk472(z?`O`%*HaiAvhbwC+kSx`5`+=crcK=Gxo$r$b*6wZ7$JV|@bLiZbHlxF
zrvKoxRJsqc;>{nTG+eZO5=Bew3IXUCK8hr+=Mol5$KLhMx4nB{V8E^-lOm*)Ba5Mq
z;o-`&VI(_*5Wjc$xQT0z(68X2$TYN4sg!7GZltxP*``DgM1)~vQzqY#rOL(7V37j{
z4|ae2WADFp_pY5A(+@^~G==d3k8QP5WO8}jTr)#MgBTq#bxJ3WBM5_tQrX9^wqC}w
zgI;g%5L>tJ?0MgN-+p%zzW!p!m~jGcYOQsGF`8pX597IlC{hd;$`nezEwWl$8*yDh
zS9c$~ckk)>lRx_C-7h@<?0QBKhx8B_Z}7ELw+<K_9E^|5O1@RCExe6}uC5p1_xAj8
z75@3>o?S;$>R$?vJNOZssK$nSu~-=s{OBn#zTmB0g9mH`s4>C=IG*QHRYuCVf=}Do
z6oQtPvB3j44?XlSyLRoiPH-H7G2;{70LkCqkk8_}V}l29Zn|kT7hZS)4?OSyLI~>!
z%=m-19TLl1r4(J={bPa$aB7DVANj~fc>CMmZf(bP#~pmFt(`5F%K^J~?imAo${_fe
z&wPf}t5+K-rFI-=+`;RrmP%!Nq~6op*YoL5eem8G9+9GTi3gDAWY(`=KXl~qp&j!V
zELu@06ypy`{NqQlZJPi#r#zPeX6<x`Bps}^CJLn;{f*HBfAohRdq;JVvlW;^EE+J0
zHnw9`2|Ib;)W98LXJi2`y6B?C4?OtK_s=|Q*3w8uCpU=9DV3o}*qm(A-#jCMsUzpD
zY2srzsl>C-{^rQv{q0};+nzmpHUs$)&?*5efrwZGz_)Fz5%GPUbU=pK0S$o2<#LTJ
z&CSydCJT55Txx1?MBGOp;x<J|w8XZsZQ6vJc-)M*k?@8v#bTil1Yrbt3HYR{6bJY~
zg;)b11frS)NI1daBxnuHNn9s237)h`+9_??XDQIBpXp?}ri8jlcZOA&jF4msoK8f_
r^=J^HuJ5Q%%;?uv%;?Um>pS>gFxZG|cAq(d00000NkvXXu0mjfW}5wl

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/audio.png b/src/assets/img/files/audio.png
deleted file mode 100644
index 7d8a7824e719b3c874e703f368dae5d1db622aa0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1388
zcmV-y1(W)TP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000FuNkl<Zcmai!
z1C;wp7{z~+Ow!$UZ9m(#ZQHhO+qP}nwrzIp-8OA7^K#lbC(r+{=jIFV{qCKlLTe2`
z6sa|%D4N}M9sj(OkFJ<|?7dApTN>)7JU^PA%8|=-I8}2m`_Agy?D@7<kprOrx+!&~
zk&d)~b{zR6fKW;ii*)32#cz?R%yi$6j6QK5)7kHt@O(x_Cn&Tn$cp=%MR!j(`RQr2
zCWbcLaW4Th8m%<K5@ADq%|ezXzLY`;0M~LW-Kp$%j6HHTPHuoqCQTR=$<MJQOYe9x
zt*vb_d5#&D0Hw5y)2I-_LVoqlw>YUZnJCA|qvuc^jANy%As0{Hz6c9#aSSajE%?QP
znfQOEPmaNqTyy!wnWLw(`K-+rbE^Cibage6?=e_CC$nsHScyC+7Qv7kYA{5WbO?hW
z5sHy0fV^$*RdFq`QgJMcopR9=<BT=TOXtRi$K-7#a*a;N69*`z82agJ8oOpo)<v6p
z46N3MTB<UYV#*5{8yhE^nXN<~XHMuB;h*Fs$W$f8`1*HupUT*muVc9tNknKcuslB^
zUyK+YonWGQ0p{BJ1X|7Hm|QJeV!LTHCTn5y-J4G$g=UsDcHz6Ht|!P(fe?ucQ<hRt
zh{;sf!YsPe$>q#_L#{zqWEkrGnQxxEov7$x$rP4T!PuuS@#7O$)4ueEc%qWN51zwv
zQkbX`fp<Rsif?)+)k=GwN?Tid>20y4gO$o4VtoJZ3w(9MVNASy9Xjy%;r*8w`tnWY
z+2RO(|KdHofuCtzd|iHi_jz=rO5{o>A<1v+7G|#5W_h{2qrH@=B^|Qge8l)yuTjiT
zGx7OLq;yE&q)`a8H_5jz-Ntf9-HO{WFTJ0>O8qPg@#WKZ5O~vQ%Pu=8K_D-=<_6*u
zBa@R}fL2bZCD~W*ApGt%lwE;sx#UBEQUPJ?u4}P1`0mB~@P@Ob+h=1m`!luktwi2e
z_=Ox!y0*+sxnyK)fyOi}OOh{!M8Zc|nlJ)wQ?jnY5HC<zj*C|);9wJl5d}X0%p$8q
z!NQbT9E1v)eZ9Sycc-(Md7Zt8WSXhTNxWi&WxIUy)^k+WHj%1p<(JRir>=VrCWd-Z
zs`Ns{Ju(BAArk>j=@$j0o4d)h%}R@9(=gxiynW+o^ndd)z8^<4`+Ur?@KSvJ-fN8i
z{sS{FzA7)=eLeLZJ*97>kedcb78z4XM4-a}9rz{Dnzor)@xY51{PrW<INwZD6_JLQ
zPCJOj*WH@Xa{1`l2iSPO<A@?NeNumRP~McAHh`d5K)MxlEwU0p!7G1&La^@M$I?9W
zTs(Be=`=JpG4rA;;1|4d%tGM04vw@*1o->EVj>jhN*Lx7VWnuDZGI-lM`LH7u;D((
zn!yx~>oPPrIM|#0sXvu+5MdaiwVru=BLA(5l=Ei?#84X3%^E44Tu0#Lr^!@RkxIEB
zY<~Uqx9Pq1*m>iRKmOna0L!-RWZJ($ne)mVC*;YwNDKP=`;ktHpMLszV%J@^+r*Fq
zU=0imBBc#UJn+|u%=v#u7zWr<^84?<=l9xk=dHf@{L|-23TxhZ=i%<V@1eT78pm;C
zILH`|BV#ya$kMqoWEoDWOVa5Kz1iN0U3T7nqt8D5_!<6I0-&z0uIY|D?s>euqjSz6
z2tuv3&>CUfh_VAv#+~U1VOb+1BjL#>A9wPnpM3N%kO2Z92TTJ6VMJs+X(mQ}OlkuX
uumKAY3I0+VAc`VCt~}rZp%L(mNbwI5YnD2vy#Cez0000<MNUMnLSTY#eX~vg

diff --git a/src/assets/img/files/avi-64.png b/src/assets/img/files/avi-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec1a942cd13bfa3441aa2d3914f05442a3c862a0
GIT binary patch
literal 4698
zcmV-g5~b~lP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000spNkl<Zcmd3r
z1ym$S(#L;URqfp{%nXdd*t)yBoXfhqyPUhb+uFIiyREyskGldh4J}obmH7qv-pADO
zXtvKU-wRS2sb56=Gb0OSt)+FdjQw0GkN*CCw%%qNHVqDDzjo}gmmRai4*S%r)wpBI
z6cTIENkVK4dSooUGp#W}z?y{%)zZ7~w!iG}|K2$_-gwJtmtKl7mVZsNxUXA=D5dZ`
zMXT1*0kVE%l9)rKSHS2ud7ekD(ct5s{j8q*<P+N;+uM7Fi6V;DI_Nk_oJC@xSR`wa
zd~Wl3*2y@W)yurDE_!mg4bx6O`D<QZU(?3g8w=q^_MdZrb^OX^Gr^tWgj?HofPlZL
zUJpM#u5*+kL{a+79|?c|TjF)=C`FM2jpNusH?^iI<A(J0W|O2+VO=hVe${K(_nh;X
zHESlm4|=$X)f%f5*ffBH#}NQl+0pqHR7aS`Cbb0Cj*flLqqDR4rc5UIY&#Ap2>df~
ztmldMNH;u>rnMwL{|WYwe;{A0Q3*pAaUI7l%_Ff;tReHJz=!2Bs|p2buY48z2>gt$
z$>U_(_z_H@jt86i-myPt(?3pP4242=$)wKm&ca(K)dFJ-V;vyh)CuFmn_v9`Zn>F~
zKz9TIS}FV}8r2)P0m>NY?q<EfM@JmR-e;X7@Lm5DJmbNq$E3!oZ&eCRVmgx~$y>|c
zI)FBsgEs>I+h4)$w@?zej%*ey>s}mhp>PgxX+<(=5*sA#hYmY}T~9xgng2X|I_+CT
zJ2kUorJ=x?rF{paBmcW!3;eAV6M+{nk^~oNz)S59o-u?S9jwY^=s)C8wm;=`W=)>_
zUxs&MXJcE?7W{911$W*~(Kz_gr&sB39f6ninrMEx=dtdfL)hk|Q|SGlfOpgJGr;L~
zoTfarMe}#vK~Za$_BcTq@cpzC9Q<&p#1dmzz5jvCJO0G~4R|+5eLuXk1C-Nzg8BJR
zUE~FRH1f^?o|irro#yMs0!yNpl?NQe++&WTZ_1Sa5qPk)Zo!d99yvNm1hh*Y{PQ<`
zmEs@%fW7(8lt$q5c^CDxG@L2rs2bv&#bL;DiTs?`zW#p@zI9a<+;-b-q+3^ax8MBH
z54^&I50D=oc9FM9f&!QJX(u@NAYhTeFWYB7=Dhl~^i7@mKL<ZixgYcti?{}^a=Uhi
z9WI;l^iz{OsrTiacUj@!GZ|DW?a|u7FODLX?Y%E^Uis>OJ$!0E@`4PWpTT$#*Xxj2
zpnZ7T;v5L>x!?j)t)ru>>k{+ab5!CO4ftdB2nFf1XX#%1{PXas@9>m|mkChfTqEO1
z$JB;~s4iQ^=EaL>E?>${uRo6Lq%KU7v;{v=3y?HVJ!TL=z7vSG#>X{$a5N6y7#hU_
ziy94=_HzZk_aB7!l#l0NeT=7wBF)fHmCb9`P+hoyx>&qyDgKIO<Tq}hD9<`YCuH~B
z8`IqbiEaztjcKt56r^ZLw_+yauCrF_GzC5m-ktMHnxc8x@aD?prd@c?6IcONet=N|
z8^;V)1$Nz9hL$d&{^E<oPd_QJD=5`#bXF=%m+#4}T1il@U`L*-R7Tf^(MuNL@4XMU
zZFsOPG!T^1C8|=Gdfh#o5=$36UXm~@&RQz#%cRJeCmY_l@POxgDOis%j;U5RQ(e89
z>Y{}-L}JOZB?NMlEc9=rB9Wbu&rvz%SV||Igq_)o>Fpy5BkJG$8qHt*9Mfz-HitHb
zc)^PV77Vlx-=Z1}B-Kefz#8N3^2mDnV$+n`ewnPVIQUTJzxEghuN1Ck@Poje5Q&Sd
zz-|`UwQD4@OKC_Nn*|HVNYsk88dFO}I%dxy5O5`tr(AZ|Wo<3}1A`22w<DFU=R>uQ
z72y0^-j09Z!PKt%JkhhyVmyy<(IWC;6BJ-3f=}_bl7M&=(itF-q1K}kP%@9DqFVv1
zKIAaAk|L*9&Uw#MXaOG@fnBqjp@j=+KK~p>qLW#_p3?9TQyUG+T9fVVC41Qw<aXSN
zSRAQ4#Rdn7zx_@0FMfszL&yp2&3~bO|9#ZYI+w1KPbDV~NW^K`0}mmy+wL^K_icuL
z^aH}>%di9eNYR2dx;1=CBC^z;0}`1xwZ_CTNS_GoT8ZxZ!wzTb<4zR#$u8o90{QG`
zK1s*&<&-47XA}xl`uZsBvJ3W!$1xk$V~RzW6|wB%19#j(X4~!Qm@*ZHYfvbXx%N#c
zsT{-WzaaX58VUt+lIqbHKFhkh@1%UywRG;fI}Oo&b<-v`?YR#dpL~LDc^A>OWHElv
zbkO=AfKN+cJO_+Kz1akTUnP+lJp4$uKk<~&Tb)HroG|CvXP7r{9`Q#%PG;_0B0nI?
zW-$E&*zbSGmC~jex#(7;q^>>k5F1WAgHE|2<^<N%8{`f+ko+Ed(D=dk8UDfd&_kP@
zBeD<NNA;;ES-jgG3`mCML^5Rw#EjXqnS9>)1mZ~ZPr#3x0ZJ)kP9qGlqRkZ&!N!qC
zvy;2hj&7E&GAxR72DaUf=3|dCc+(Ad7hXbTr=3x?1}a~GE3QWEcL4Ur>o89~i4~}P
z7!uuZ9UJethvHRNliO|wHjAD&tys<`z-F_|7D;*K3Z86&oik=Id0G#-!ww@Sf6J2$
zGo4+ST%JVaWy27ZdP#UYp#-c=JHVa)wp3!BjP=W2!5-<C87WU^GFg(j^U)I3Ne?~1
zutcl><kP5}dOG=15fw&w2keL4a}R3Y|2~cHd`p~DbJ<XM@P6tSKf#Lvm<$fOigVVq
zX>=a2Kl$@7z@IlCHDe}9_6wWIVZgm_v|>aW!YUTphG!xPB<T#W7VG=0Rf_NxuVP=>
zjAnFA8uy$J5Zh`i>c&zm<jHG||FxT_-ggi6%daF7eGcCB0z)GO&7uW#)$7bL2ITa}
z?zS7nx$~GIvdL_{EyyNmq_RuIsm6dwVi*B-u<_VbPV=-2-})4=o=5tX_j*aK<mi{P
z?<uFXgm+EH<OHB5X<IM`trSS=cRcwxwQH|pW2HjD^Vn+obSm3yOYWWThOM?n$(&A!
zY}R+MNo=r*h9p4=tcMi?ya4M4>9aiT2umD>ZNWPywUWTv1q-&o8N+}aFMD0{MyAOo
zgGpLect&fAGiR}}YcfVQC?l|1Qnn!*S|TajBWFGGc_gswGa2^~HWAoWtFg;hA`8x}
zHIRB}ks%fZDIjai*ozIG@6*%U=PFE#Z2{lLW#}(|`qStnilU)?=g(i&+uc1`dkReJ
z^41tbuF^qWPKHE^o<y|Wlr*nC|2)y-k7EG`trPb^zGO-$pBrP{-0k3Es*rbU#u|K)
zfR?p5i~!u4ZZ`4qd8|^-Stt(xRV*^?C%*!D1`<6n{6rG?Ocar7@n<_a-jehEKWb~$
zM76!LVxA%d5@VcYMLtuiRr0&;O6ARO#bk3}1guo%zVCjENk9ED#SzFjav;-17Qt?N
zxI!pbDzQk4sHN|FH#4HpNh+#V={e>YdM>>JqZ235I0(4yBOjn!HeF9yOdFA(@Rit~
z|9UgPXjJ#ue*1^wQh5-qCr@~*Q(OLbnEby<!IPH_uKbzL6L(L;#+sm<<<DRHCdp5K
zLXW^V;us;J_ah%8^V;Lw-M&yNvOuJG*JnS?j&dqAC0imn4yT`R0y97MDIzc9uI1YI
z`OW*^jd%0S^vIEDp?&yPm!X#*eH7_tf!c5*1wIBoeYOI|S{MCTs=>mZdot<M0^ivM
zwHkp${x4s=4*Qu;v17SJJ&N4bx9?-0B>T$O5(#XfT;_!*p5*RJ&u5oatMDbYn^N`7
zJmpkz(kBRYg0CYY-{Y5We>1u7ev|2iB5|9MPfZxFc}ZeOn-K%Bt>M#Na1PKC#qvQ1
z(|z5I*zO(z1HPp6pRW4?eEO4YFXP$>h(vnc7p|lD`qyDZF2&AHo|6*zu8YoPXSw#O
zLV-{mH(M&bd6GrO3&;i;B2V%2x4(tlcfP@N(R|Z6Jr&Xk;H8_m5CX<M>f9Ga%a<9-
z%@rn!V9p$d&%1!Z<*TsaB0SOllfVBBfmD6lNQCQgj4PhbzmU~4`_T72gdg~9l<V*l
z?|d6O$tKDOyhx~g=%FO1p1})`KY^?B{eXLKx{kt+e?Ygui-btTGRENGUILz%D1?;O
z31iyidOchq>ywpg{TfRt<!b+jFF2dI61{=0E)sVxLoxy@Sur)2Bf>qL)BS*GyCIQx
zx<sLy4W?Rym&u}yaqFQtVlawbZD7G=WxigclFK8j07Q}{Mk)6D-Jh}L4y@KK;ax0^
zA)n6;^mKP^W33%%=RZSjzr!<ejOm+=-De-X|7*@Hx*f-XD12q-;V?5Z(|U0AdNue9
zhMAd}8Fu|cde+0t&CE;>`o)f=QJlNDM<>#FI6kLNm1QOIcU`WOWiNnpKn|cX2J4~e
z=U_a{2tR4P8#cfs4C@I`+FI=G11H7HW(G49GHbQ4%dZdS{^82_eVe%QngES&0fjda
zc#)u9s+#@kOW1F}f#V5<zK-D-qc?6Xi)b*fp9gfm?jiQ?w$EIzO2a#FM=T+LF{(g(
z>DsVOsI0Bidu({PFNi|a&^itZ;K!|sp<dzXD`Vs_*!>|qM;c~8vii%H8V~?rBP6f_
zqvHaj8NlN_#(A0{6oQ}OZ&}D<ZyH|aH5DKQF9WXEt`af|8%g=V%kg+7I2KuJ+5b0y
z=gbBI2&ksHz)O8#hOiMLeC(bMzy#RZD0n!oqE<Za2a@p6`anwypfgQ>cs*t*fUPQ6
zO=<P%^rnxdepD22KLzi=Ie)$em>4`q4OD=tA8Y_-1txi=Bj8#KEMp|#8Pi;I0p#Nm
zc)&Pmg`JfOPvAs#59iU+`x0AvIF2RY9pmO1pm#t7UXqI$AOa)`nI%Z_N((r6T<1aN
z3vCQudS$Vs0Q%o*O#J=4;j@6H0Dqyny8uw<L&Sgzr}LBW!RMMbLP(^&s%^9eXa*#%
zZmO_31=cJO@L+BOczWy5DLb&1pKI0%8<@WEst)^r%EDDu-^v~vQ*RYiJ`=*%oA^fX
z-rDV=KHeJ2VQnZtx(AHHI~ItlDC(y=2XJ{xQ`s>N$Dqfwh*1PdR(jnmz;~DYOa$I`
z;b#l9ixNj1aqus#Jl~GIaUbB|jOh>0A23CUOP+lJ!&AHAOr}>%+f&Bg5=-2S6^463
zOG+_Y!z1-Fyp^}x2CPlC2Va(*dflOzoL+z1tvB4h!>>T)c^(SjqJM!V0xv4y5dZSh
zW?8T*!&re8OyR@#_z{t`9@J|QMS+nPu<zb`*Kf1h?b45x-D6&t-s<wMol{u3YSre4
zAG-Uh-+ujNe*YIE(Oba8;U)IV){L9KqE4^jrF(k=gX!*iqlZ8IloK)QQ@rr-(=)U6
z;>kYyjMqhP>(*WP^|$$3o__MdYnCrt@(m(ehS=s@8lJ&_22T%Tux{NNv~q*8tgw4>
z29wi0_<i>sNAAZrZQh38Jp40H)$pGov1P0_p$#a!cg|wx&Yg9-PkHdJS=)opG7rD0
z3%_8?(;j}=(j}iJ*b_x?5aGdbetx#?1(@3N*WnYlz(B(LSo?uG1FF9aF9Nh$IlKkK
zg9lG~UAyxI@2|p(0Q2U3j9-8Ktt&$PWzG#CJa_f?$3};d=YJJm1eh~t0vBF*0p5Q5
zZ5U&E+295ZK4^ixRaNDy{r0~OuQi}7OFZzv1GxF-o9j5s^MQk>=YyAne|ZDn+x!Li
zL=l`jcP=I-CY<l0Y?fsM2XDPiPtRa<bQD{*Zrk$sWA|Q1c+<xkZ7q63bDw?o*{-!~
zR{wn3>1SOrIXMLrwzTn>UQaxn*9T1FKoAw!T8pyi)YacPyW^=RAG*aiIX?h6OrMd&
z*D<Y<SdTk`Bcm9@-f+=H7oGj~JMX`B%+bf5TXsqpECg$#WF(d=7`gHxFw$3EGp_7Z
zs5+HdvSi`f*Is?$qxtjae+OVRfUX3%<E^B%z0Gz#t>kg50t``rF>hvMWMq7wz4t!S
z!4317AqQv<ndyDTz|hmgAfB<I*Ujk^9iUe=jGLO8oNTv?E<j7*)v8bc!tbHAy%ij{
zdZHPPpakO>y_$k+42?q{8FT6rV^(ihF-`4I3>8E(gttI^Gkx|`5T@aGG}&BwpJQq9
cntTU-2ar|&DZEPJ)&Kwi07*qoM6N<$f_23<y#N3J

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/avi.png b/src/assets/img/files/avi.png
deleted file mode 100644
index 700f9ce62c2520b2f646891a491ff9e45053f7b9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1370
zcmV-g1*Q6lP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000FcNkl<Zcmai!
z1GFPu7KOiCxfMO;nZIq@wr$(~|BP+h_RPZAw%grlyVH;9xGv_dN?xrRpIW<Id!MsU
zohz-i0BCK_bJ#~FW%E7xeEQ5n;i}2LzTUZdUC&l3ObrbB>HQD*{Rxje@;i+2u@(!&
zcHz-jq%RZeeP4bDAQW&It5zG|u*qacqp*(qDpln4H06yO31(&}9(6SPKKlZbd+c_2
ztyI3xTCkCTJB9#@+l)ncLiOdk5BEH=ObQ_YlBCng#`<;055AAg_HEG9Lna6)pMC}h
z<X^$i$OyGkh5s7@jImN{ofg7FE?c=0naPl=Ht|37etJvuA-S2GW9@Or)A!hu3=Rzu
z)azJ)f6X3&UD%>(h(ca`;)(1(IXU>bV~_QFogL(Im}Zle`|L~Rp8G>`<;Vd90umlV
zN(`W_L$iUWBH|En1^I*PuEW)Gdb&_R`97XCtUTxtQuja1@YpC?X+$=Qs?|`{8bP%}
zb<1Y-+O?=Z{|Qmv#lXv74c*;Xr9&Ysk(lfo9>&yaVpp|_R*Fq0o<!#Uhv@0*WPb4?
zRIx~HXAuF&)dlo-zk@jW6moaphYbQsAN~N^^)7Mb(bzy?qwH-6SqTDEqrv>_EDiVJ
z=u0ohcOT4r{9AM#dpzmyf0yL%ev5I0$p;>xJ~Br61Mg+l^~hd%HT8=xCGD#4AnHLp
zWJ3t*PGrlm$8li(70&a1O6%6r{rle`jyMYQe4g3|-%H}tp9m{y?zcbbr=BI_dSjfJ
zf8r?^DN)sGWDCT4@aJFrf<$MhIp#edU}$udpj=0cPf%A1^TyXPfA|qdN1A;2F^mu-
zG8ux=F)Fnhdc%5fvyvJZplhG~u&QNIYa@jG)9$--;2wMYY;<gldZP&fNN1Q69=TkO
ziQDgB^P<I+UXf?;+UxKxx`b7)eg)aho0xdRo7uE%5qkA%4tm%7(LoRiw8|04w|(w&
zSZk+CrCNYBK6qFa(9C9$4?axM^O^g^#~3*4?63y~H!H$fIQ-UkQW_p%)AP?T>E^`>
zh~^+>lGNI?8)GB?uuyXXtG@Von$y$B{yw(UYSf>361#H;;(!BL@|7>rC>F6DS?V2~
z*fx)Gh$~3iv9P`fA+VlDuw@HL=W#+xn%1J0EyHS!5`sXxW6(rfsF%yAgAN5Dq6&x_
zZQ}xwcj2+A6~Y(-rBGU<j0q96&$Y3wdqIHK8q?0+8cReUs~~0(;jy7q*ff<$L;`_>
zjszU6C4lf8YyWKy{>`HBCDD4RR<7XfDxthYl)a9QZ2%1*2>%{1#zNcXWYWi%iI~7b
z1;!!}bRK#b-oStp@WM<@i!>zBw63kS;ed7TwKqm<z~U#9>?{_GTeqy+o=W*hi2k6c
z#6%*&@$dgIt)gPjXn7o8mX%f{JV*;ey1U!W-KO&W_uYBZ-~RUJtpL)I5d<pwXn|C<
zhbAr%!L%AG1eAA`sn;s(?UwgKVfFmI_uO{P(j|+29Q9zwjv_-tgJ5Ge#Yz7?^9Wdh
zF*^K}H*eltz5l*Du6N`=A{O$XgAU|<?|VO2UU?mrYBf#}7s0fTaUp<gwu6-`me0TP
zmHBHHFZx?V9tq6M%<#}d50-m+`u;LHHojlr{Ib>xYjFq_#6o4JbsZgr@Vx2iY4xgC
z<zKbv?|)qm><0uu1t<e`35dD5x%n%uxa0!g_j8Uk0Z70d@c<D+JS>3Ly6K_{WPzX!
c4H&@w16H=lm&rm&@&Et;07*qoM6N<$f=hg^!vFvP

diff --git a/src/assets/img/files/base-64.png b/src/assets/img/files/base-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf698f52540fe055284eb8319e0a2c8b208604d0
GIT binary patch
literal 4069
zcmV<B4;t`^P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000lHNkl<ZcmdU#
z1#lZ#wy?k3-9lSr%M?4zj62NC%rpQ0cwm{Cnep*5Gw(1n^EjC>$BrqsSWWl!-r6oJ
zDr;<M$#bes-P>-}NqvVdbcB?WiNtj!LZI|;5ey9uvV7fYtieq3`=`I<y{qRfU1yDC
z>`*L>g<GKxHr^;bbu6@|DEoW23H$y%vfmv3!9PFnwI3voUxt+Y1w|sqr@o+As$l?w
znj%lLZTC1pRGQK?jbJ3o^*7yQci(kj@$yLLwf5FN5plp8%3)(G@G`cit{O{@h29+H
z;NU^TvNVg2T*HyU$eLhR>vBuVqO=^131o7|$l4B&AW_^h5HKFnH0>@XkO?!uaoo2S
zi{&qPV^!<{U8k(Ogun9?rJp=WX?q{hjHy6PX{)h_O#zcU7J0jbY)>*66X=(&;kbXh
zk{R9I=t9HF74hIf6G#_8B9I`!m51~BPy&zwq;&D$%W)W7{5iNt{GcTgO>grY@x`e)
zpt(>eKWAC?{OXhux<*kr*#CYX_K%+;bTCKrArn(NSeA+9TBwLCCz#~$X6XcdDGlqg
zRUC8URdgoPKFtJ?mKCto5v_`GCA_Ro{fZ|Ej_VSM1h*#>O>3njONAKK{6IuXnF6SW
zF9`?dzaK*W<^`JaHVNCnY7!WxiK;P6fFl5bK%%v$*qat`@e+={;c_|?Rq$1_8q*rj
z{xJCugaFr(DaVmvsB!?vi3-aFaX35<_BS3z{^3QUd55G7U^i)KWgA1HkO3qh92eQ%
z%Kla;UbK+)H(Wwj4fxvG01`O?n;f54Kg+6&sjwjx6LRWJunOM!_9Jj}FHIhNLJJ`y
z4w`9KH3*5YUF?n&eJu`S7cXGtjTbWG?+0I9Saq!e2wg{|{Wl-Ry=9{Z?<#mgE?6KW
zXchdzmXy09?2VfYU9^BDH=IXzqV4YsFM-<p7(xgp5>3}AX)gBvJcPV;Bhj2gf&dtz
zsz5*kuqDOL7`vMa96WCU3;*>TdZrD$noK<dgrQM%EU(+&kMz>MIcJm5!w~R^6*9tq
zbX@WsP3#Qj*?-nt=KbTD(+3`jq_!C6UvNRi`tQ&ji^<P??JGpT^)$|}o~1c!k<h{r
zwm}%6YoG~GP7o^X3+V{kwJiHipT*qkPGe@Wefq%r@1#Ub6l|&_){^Xa<c6>Hw%oO+
zHQ1jaB|;DhAcBUcI>M-Mg5y$%=pKBA-KTak=jv0Knd+E!@UH6;3<ZW-ld+}15EWwF
zu;3JYPh{;9OOieRmU?QSRqPt1*)p)BHd+}p1Squ;7~nu57GS%c_26eP=kk-h$WK3b
z{D}l9pjwQN9({G?i6K>vg>JGRc$wr_87m|)%7V&fr{FE?Pidc1kyr4k4q*DhPu2&G
zgJWZi6AB|@g~GA2r0h5ZOpD4+DTDyaA>Y}|4#wDhTKB6OUa^If(aH>vVOMi4;UHWK
z6hD64(JYr-SBxDZ!=BS;GS7qWc~!v6ntK5wnrf=d0Nk+>Woe;F8zf+(L|6``o+P^h
zIrg11mw8^p>q)*!;HCc{sTRX@ZN^35;!wsJCwD+NE@n@Py^#V3E?mg`Yfty!+g~-2
zm(&)+s(S6>Qp5sG1QLOR-H~R0%w*t_MJ)V>v(zT1QFyCdq@2xRmrB^C4S*3eFv4L%
zu_p9D_%93Z+o|mUm+A~qhaW7!LAJLukg_>+=~5Q|^SO1y_ix_9{%1Eax@{Nb!BN~o
z8C`<wIN-ScH4~by;|S2AAwq3Qk_+b0y>=<B^XC2e@RFKh*f<sV0t<%%7B)qUbSDF?
zlKiEMS$_TbbjPO-|Kjg&XY=pwfq^lSZD~?-duZOUnn-7wP)kB>tPo-xz_clkj8W_#
zBDbfXLw7yN&L7_j?FklNa0-jhI;A1_agntg;8r=nrRbPwtx5K$HJnSAvF7@VrhKHe
z3weI`&QEjbiA~I3w~~2pynxm<i;1+f)>ZS?*eJu#ZDz+W?&8Uhf1Pc2Jj4Z`eK)oq
zs0UunCAG6avydF7j*XUzGtd^Gbm>agUVlkl=lKV}^lkRt@-VIQXK}=*-bl|W$J7mv
zgg`t=#|cL$8=fs?)3aSSyqe2b$^cnW0<J&=gA4{OxNHqaUVjChiPkB@3$sja=K-YS
zGM38{jYV<)%x<qmo0Tokrm|fVzW)06kNrV>4H#jDN?D9^S909HUP)(s>hQj}Qlbfs
zvFEq)jSFsM^Ii9YV>Sf8<GzRa!Nu1rTb@m2yAgOPW$g=*5#Or<q~&U*zG36Yw_ZkP
zYdbh@UGM-_uBaN`yrb5z{pS0*^}2U+S5G_X)r;s@xtNxDGf8%}5eNqnLIY*P#VVPM
z_6;(!V=o6^+|1DPTd?*G(AL?(vTHA3$79ba+jYbHf3Hyl#@HV=<BKh=OiNeGuCCVh
zHE06q)VIzHpj^yjv@~(#C*H!mYtEtn{-+pt;w6SR?PS~i&wKAnI6~sME@~+RwFK&#
zhAsu6NSIiA3yW7Qqy3+~5<GDOiG}mnbM2dy?YiNm4_~7PJlMP!Uy5eAbV@4q?ywQK
zxhP$|?j4>4SE}_Lq@-=xBGR666O=}V$@dLW=pUkdD1(*FW0y<-jBt=Ztcg%6PP8*k
zQ&$=zo}jYfIgW`dWqt6IT!sJ`pV{^YDnWyK;881R3`^T>7j?k<PeMp?qgkqJKAdVH
z<Y~*&MUCw6JewJs;>``gQ~M}@7H@CC*Mz6x)>u#qG^DHx-hZcuL+pG0Ievb_I~m!w
z{m<UpXZP&kcW-!~vgz4w2p&o8Cg{2ozmb5b2Obbeq=06k?E2-c{O50Pr~AnDEI#W5
zW*xDHw)wNv`u<ArPA<dX_C4%*;yE_o_5k}If10rEDw|R?5P8%bDeAZtmeMDx_f#j;
zA*X%q64qUH30r=63kM$S<-Ug>!o?sEO%UyDCDPua4nAJ(1E^k5&gLl&j8Nzw#wv`V
zVUy5PEMLBkMc1CgGe7y2vRyAcYVMEqeI5ry9q=GPb#^@#X8Au~#^P(wrT>W+8GNFb
zk&WBP>^eYxV2E<>K5`z6V_5*`fdIj9m{e1go&}4E&zV8XvIVpqv7ELe*8=eT&9^Aq
z^}@@>z6>>fp06x9Js6?;xYsblQzW=%fzqK2=2#x9P{c7UP`?Whh(-t|nh2-jxO!-U
z{X7l8`w#Vg7!i%ZD`>-Dc-MZlEtY{`<-d;zMu>Do2)Ebn_HK<PcW8GXt#i5?f>#c#
z;Rvlp4`}cvM-m8y8QQ&-ubyx@&;Iz=xP?N)=Xu>S+4#%f^S>uvrfhn)>xcJ^)>i`c
z!~5b&mvpd`&|r?6-}El-`oI_IK6)*)k6uUTibb^abkWqBLTip!!Xxup^23K1+1E$^
zOIz6e=rinp^jXT8gLKAcDx03|2H+>T68lTR`)$xF6-jPb!08`+o3{$w%>D<SV(8At
z*mL`xIDjC65shL*f{1_tfV6DvqKRE7ASt2)F)hZdnX~D>@H`fI&GgQXenHu;AKu>%
z*Ru>Nl?W;7yubwMN`x+GTf2hv+U1l-Mi_c=8>4?*1-9=ef8Zdc(JbX$9;ajipeKTa
znwtnGV>Hd^AU?mF<gx{%S1v#_$B+_bQ@Rbo`(qs$AeDls2VPdxw!p9IV5)@~CmiAF
zYYwmZQUTYt0niKs8H!ADqy><TMPAn43~JPr`r!Q?mk|ii_xxrCdS8C!h8K<^n&O_u
zCWRl{wq4ouY&QTe{SoSOK>as4wh>^_IcE~entbz&Yxvdc-^b2Jp1`rJhHi59KlLns
zc<YCiEzhR1-4Hyoz8>J)6%AZtt^S8g5r)B*|M(eufAI%4|Kc}9+GdbmwTSkm3u&1@
zo2K?O;drxZgn(**rA$uk5=XZ0W?<7+hF;i0aqs|93>MB`!J^k)!NN<<Y6u=l%^DDn
z<5DH*Y_71$GVQbwqTw$#Lw)`9-Tp8G_dm_>i<=qqo(oP66AOu^)VD2^x=Moti0aKG
zx;klHxtR77*VA?8u{5Vr4Z{2XPcSsp-PN`f7@FJxS<eBMokoa1`*T&nwaM-4C%1Dy
zg*|<g4h&+AW-v1aoN^feJrp7sj}l163D0OFI;)H3x!oi?I~uR~ioZFwLm*%b&7Rev
z95D3~_zQfiiwK>_%x=;>-Hl&nG!Bn+C8e^7l&<DUojbw5{D;cFJbdl0kLzjKgEvi!
znLQoP8HPSQbq7cZLQG3||Gn!TzF`r7M1WLwu`L_JFens;_I&m;pLk<3nUJ1TJ3!W2
z0H-m$z%ngju?X>aGnQrlDbh9|h(tr!wnZi**|lrefp@?2&6m9J!gIZKZiPWi!?YI&
z^7%Z50i7K)DV549#q;^H>h|$i6e(SXM>4$h(#F0If8ZULZ{522>0mI(M50NcT9MPZ
z=7D|t_hRS*+jhug^JKF{6ns32rV9=p9O0!Gd;328!FT=<{t;a_s3jT`dSDvDONl_J
z#x^!OO1W&2%N0E>slUbJO=y~er+4F~z7K!sU6*g&^76xmp)-*<j-#|j2}mR$rdj0u
z(Uq>M`E0%t9(;Hec?EA&UGGV3+g9TgRsldvtEJ9Ao~yBJS}KAn?Q6m_{_W9nD#3lh
z&@>I#b*tb7Fpc2-XW{==B7{(pcU`+CyvL>Vl|;+svZ{7;U84eXn!(G8Q4K^QA#`2f
z!+&HPUP0Tot;Wej+pu8+AO7%17#J8-PSAt^n6B_@^lN!w;1IpN8~Z-;p?6-s#e>&0
zZOY)j__V}gF@EraA9BG3=cf;iW?wFqtX3h!^nkCh;kYhOKJgfH=FFpiV5sl??|tiK
zUgRI4LDBt*X`1}*cfX~tuP<`^@h84s6I#^uDF8XqT!Likz-pNE-maDt013H#o@_2h
zsa)=R&%57p#kQ@R9|nX{U;O8KG62v3Hy8|Rk3IJIZOd1zIem0Aix9E`)Q6fV3#tJp
zk9;*K)Jl6)TAP+dCX;3Fo*jc9{m2LYt+)5ZyMShtjDJ_DnEUEf&85-`Pia6vDaiHf
z*RS}}m%sYCp6=PJEX(wHMfFh=q`-#+V9JrNdSAWXQ=JW}wmlWwwr$z{nNNT0zj}Ln
zp8=vZV12ceLK!G2RdX!B23+3(I$!`nAOa8$hokX$tXoPM1PrC10~#Qz=Kd%^_%`v!
zN#>Ozt491p5JD||?$}r+TP~MPAXot{s~ligsHwoAs1(Y830S@Zsx!fNh6dn+`lHfn
z@Y>1*BQ>7oB#w|u$8AerE1ggy^=+m8yrNVDwMEpL*LWu;vr|U~)OemWTinT<S}p$v
XEl0?dh4B%@00000NkvXXu0mjfu9NHs

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/base.png b/src/assets/img/files/base.png
deleted file mode 100644
index c75e01f12e2e1159eeef550fb4cbb67792baba96..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1261
zcmV<J1QPp+P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000EENkl<Zcmb7^
z1CT6T5{188Rqe5D|F&(L&whcmZQHhO+t0R*VfVDFyYAhZ8(k5#y>Id7L{8S#$&)8D
zS}3IekWyYKr5d&@)Bf;V-W|T+my?Tzn%f(v$U5;thM6iW*x1wgkE`Ci_!m;C0Q%jW
zgYx}T3ezx*(}95bHvpXgMN=xB-6;cRgFT)g_>v!C{(J}V%q-(-hC^4iF#6dS&^I<h
zE|~_Uf$+#FZ;kTyR9$W5<(6e^GD;U>gaXy}nK<GVKO(m26rrjZl_E^x$|27G+>7WQ
z8u(XmeBk)Nl~zMIj*LnP*5MP!up%KRl0?pd*BzKeG*uxdlAO4!o0<<iL0fMZg-jms
zfvYm+zN(Z@Icvo&kI>T6QvI&zt-+QZGl<q&lr1@MWi5d>+)HauC&lLg?m2(}tdC#1
z5W`_C_}hcRmH~nY4qn%Qc*A|Pc6Z=p?EeYw?cqzHWfNe9T5C`lTf|icm2^0JRW0E+
z-><=oSq~iYv$HtqtbS}p!&sG-<;;B!loDDgY>MPb6cU`ish_q_%%`QZ9j64Io0#Ij
zAJ<Tfr%+PAL>LA}EKK(`mk?@e1s||>-w0b7OOkhToVu=!OFpuk)~*h%xk8aRe4O9C
z;X^$9#rK?3^MAbkV|2Jl+Hbr{ul*8vW}Vq^2pJSy{NB}c^!4DM7CVtbx$8f?>OC}G
zI80?*BSHw$6Elo&+0E>cQ`8Ukq9}n=)&s!GbyiW=+PJ&3uUEO63x7k4g*?~2b`>qd
z{T%tjI?_i@Ynh@AHC+FqC8XjB4*g|=-jg11c?C~=<u!8~GqcI8t&|M;rbTQ0z16Sa
z^7&8Fd&3npTsR0qkWVDp@sr=O;mhCQ(gjcWn3p#iEGhMdfl{J;6s2@{^0V(HT2aBl
z->)Tk>WpR^Yigk9#>?rs{&EifZGAa=z1D`nqGbQ}+X5Jd$@f>iiYr&mXYk$|uxe`2
zcQPps{dpbhKK^AceCA=Dw7deZ1PjmbgL@T7Zhy`5$&bfb^WiUHXY~LO2!&|u?%>83
ztzhQtgbx^WHPY7ue+7PUT(>G>?D@(Mxz=rH@6-3AN{{v5Y@D?p`x?!cp6{Q3bfkoX
zKY?$0C|#^}$M%9{PrK~D!o;ovI0ak3GE9rwfi6a$eaLP6Xi0bJn;?N@n!+*-gyZOg
zo<t(O*ZmIqo9uZ}N-}3B$;OlJS`w<PAktJ1;K>5$>M$*fL_CoR1?A<@Xk@pg(I|oW
z!M#1e5Q129g9i0v^5k$F2bV0dSQLdI9#0fs{)!hZ{o7yuusakA&%G6X{mQ|0Jh!7Q
zpU*QfK8|5noE@LYtz5Bm!Eb;4i*My}c{f=c%eHNT!H~bXI!XXJ7xlWFxz-$nju-|L
zlau!9l}n#l^N+v&P?Ih(Fs{A!I{x^_KZ=T2OqiyLq20nX^tX;B_s(25&}+lc<ff;l
zb1RoGd14M6k7&sRKxJiR&9}e({htmEk6dZH=3WpbrlMRH|5^ycn4Xz-Ui<2oy?M==
zzkdaY0R<onB!QeLB{3tBNL4f%ZFV1;fCZR<0f;gOP-qtv3U)r3OeTOJQ1m580r`Id
Xv~}3Z9LSQF00000NkvXXu0mjfPL^+J

diff --git a/src/assets/img/files/bmp-64.png b/src/assets/img/files/bmp-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..562e7bbab340de7772e77982737834c637a3c19a
GIT binary patch
literal 4270
zcmV;f5K-@mP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000nmNkl<Zcmd6t
z1&|y!m&bqV?xE#f^TrS|eGo8Q=)-W1nVFfHneSs}W@aW+7`+bIF~q#=rJ3%Q^lsfX
zsv1?N=O*XW-OBY=Pipn7e}6sUtP&B5li)uGr2-}<CfIoS<xEXam%r;bU-xTUuKCWL
z(=+pFfByj17>qGkW3l#pZn8YphH6PTcKoE;|JY-4?Cy`f=Z*jPD_{NPpZf`{6`q|W
z?x%B6N)ZH#qEsk=h}>w5eUXSLz%?QW0u~nLdD(ybs~(wIz2%~-zVj#ISYuQ*gVkDR
zW?J$zNvTy7QXl2gp*pMAuBEGg`Pg^tT>q9e1LcM`5_k~KlM53-GJYlHQuM7LP+#j<
z0AuVQEG)$TnSTaK0VZMBVZ|38I>+ebJc(4%X_A4aX-bkLr1AN3LZcDWQ&W`mIJa(v
zpZcEb86I9s7zQjfQj8VE?>5B23n)O8xN>W3g8103%Bko4FbL@H@A`vMDSBBa0@N1a
zN77VZqLd#xfdZSxd}(B!uO3*Sp~DP5i4)@FJa|f)xICd=kLfB~DrStEHX45Nd#+_@
z`5N-kRv5w#H3#dJ#edJe<0_4{)N17;1N}YE6Ojd4Qe>^o2_Pc<kcT%q=9`Z<*mp!z
zu5=N0brCfZ0wPeLn*UG=0hZT7O37(nbTRzccU(9;d3fK)`F>NSz#7|cjH!y?3qW!5
z;nSGihhpx2N>i<Nqsl$Rae|T(E;-RGP%A@FKgso%rToZkJ1-pG3;W{UmX-$o&`^+>
z(5V0({NBSU_daE*)_N$_`bgpwBm#VX5h#Tg=1+0Wh6R4`rmGoR@&60&eCKs6fD8M*
zPbS=R+*0l8rq<Js))py;c_;z`7D%Vhuw(5k-}{m)7+N{J1mFST=_9~RbUF9{td9BC
z6Y*lt>#XOyd;1ZAFi@1k5X$c3njvNr?75R{TQkjfzTmkmTY1sa=y?$zyI24Ruh2=%
zR}L(2&oND<+C!zgA7dnY<~9~3LR1-)3b49Cef9*~S4?u-bz4}zYN^0Gzd(Q+Z@dwg
zv^Fdo8szn_eGT7wQnBYyol>QT?rJYdqA5iI5dltw2tY-o@htJwF|HUK<;I<xSg~sD
z5`!<^RYhO_`q#aR<;w=ckKa8JJTlgemJ+4zE*f!)ltNr`A_SqrH0GHbKf>0YGrV~F
z<*Z!2^x)fV_oJ@9<+!AiI$Lh~wO`vm-a9Zoms0ELrO`-1Y;LxXR7l!bU}p3%n`)<c
z;Z>I{X?Q7E2cn<)=dZSw`-TSlf93euI*C*W;sg*JwaWxW8qbkT9pkw@i||)(WYroU
zURr;v67o?fURgTX<cLG}Kerwmv<RvIzFmqMsb8L+ZB&h_G}n0ng%5_p>N%!P9c1?S
z{e<gRGkyOQN=^BIevkS+>)>7QG@rY&b<dENXJkN`Z(S4!p@Lhl*~FUVJ!maHyyq9p
z0kvAquP9eBvkj6Y^+HVn7KNAwY5g?i$p=YRY^SpE3Kp<=wWS5r<xK#wg3v5`hV$E-
z6+lQ*!^rUkuGvxJBHF=&6pVqWr>ECD>BX@oNz=^4#k>M55Rfu6d6FB3r|DY0o_+Q8
z{L(c6)j(s#aVvtRXT>R@06~;$`o&>iJm&or1|g$kWBlH`#!$g|eA^zrU^f`)H1z~9
z#x#$%35cMYAz2O#^@-D5vu28$uepLJPR%1nh13Xv6^uX_1eBwI`obI{LbX~&8-=#E
z!wFA1p8UcH8cB*ylV*fU4!%X@;vrzIX%RqSjcp!j6KID0Kv_u7o#mRfGu(0gb6K(K
zBAz(?ga;BuCFW<QdH**a;^0(;u-ePU)m_|r<#GmktE8qFzSC2k=Zm<bt{Xm23-2Tq
zp+Ep*TLoxFKuQ`X7z4{H3g*sm?S^^2^Tk)NeC04o0pb*gK!wB$v;61#c5|X@Cj-k@
zXU}$x#vHw~!LQz6=&1%6dG?k%*VY<~727F%E(O*YeAAf#jYdqhWC$ClxnbQb-*;mM
z@AZtEl&a;BFYn#Y@$!|dTs2H!lgw&mIC`$aHxDaH!Lz&0gA>3wz>eVyE<{`e*ev|J
zt5DUWyy!B^58kppccc}-y{prhLlcUg!8Pc(j%}H(Lo82DgrpJx_E~`!=Zbhkpa@=^
z-^m=HwWg~Ykj{>C<K+QAddD>k7F=dH#T8KP>cPYYs|0JsMMoxRfI_Jdc}DO;xfG$b
z!H9V9?oBrYL<E#7gs1Hgu$ERUMMBUR<>t-s<KKC0Av^+NErLK0a`mMH+16Maai4`T
zhDKtz;-ZKMc}DP+a)|?vA7*N1o-j~I!4A(@gNW?_UY=fnO3C7^S_VBo#!Xw);sxe)
zi}0)4?(MA=5QtOD&P^*8BgRrs40DY|tLsHG+_16C3oi?3q|z~b6h%x;jPrNzyqnKF
z)Swa-%<$5T0NWm3q&NzqBgam+s0r!9Y5wT@Z(#X~VXR0Id{Y36xZyy+5ANt?%dlbO
zY=|+!=2a2f*9BQ5*bd<V$|1b@qq~@{Y~u3|&GK!R)_C5!8ViZ_mr>j@Xn`;f-^pR<
zu3ewOr6fsbH(zn($;EYkNGU*y;G61O>kcK@tPEEUhg`K*0U%arXp`@GfiMgR0!R|$
z1!#A*%2#*Y$yW}Q>02|%{6d|#eC;g%^keIYf&gQs1<I`g0`1|8H$oG8U(;GnyPo@x
ze-xD}pNCi#z_$pH-{Hju#I%|11xlreqfedS_}CmT*|CL%I02v(MVuWy%^N;@kjk<h
zn501|5FS1{&qw!-^D{45&0Isb{GSACtn-WE+g*u$`Ac7Neg?Gl`B&Xj3(ZuT%21p0
zyf*|oKF>EN>rffq@#(u5sc+<x4GXLtDiNm;h497??_xB#j9v`d7{pr2q40rSqinyl
zn=Na*smC@q2@14_FFFj}e9J94Rp#dE4!i&!r@nV&ZU^sbYqct0`Q|?EI@v>cSud~q
z(pmoc`-kc4?cxhx+s&7ri0E5AfKD5TNOPD8vklGbKYx;c|Jln46mG(E%U~hAD-^B*
z##nr_?wvw-!Hs!C=QlY*7==uZkMXuI9;PyM86^_#J3P;a?wn-&%yC}->4Q`TFT*5t
zj4@5K7;PvA!rf0y^O4<W=&A&W1rUrI0xA#hvbGx`pkSRBP~_lSDcvvc1YUq@DdhE^
z+QTV(G5yM7jHVL8r|z9%?_Ecj2rr?gGH|ltWd$pOH2qQ_yyGj!*|D*Yt?T-5^N@%X
z!t+0EglL!Y@VPmlv%Njksuk{kXoOEcl+e?^44o!q0$RhuLd>E0HB_qIq-o;*zMz>K
zOw$y?<ZQyLKY18!EP*16Lb1j0?n&nYbOf((OHlqiF9cx#;^2iK2uSMly#5mpAblIL
zX-o#Cwd?I{V$@n=n<1}V_<Omg8o{?78Rx^hPExCcS$jc>;RRek7YooiyeqkbNUp6?
zurN1A5GY)9bXCiI<O_RvWO4<Sa)dT%4$NrdjeDErt>&V_QVQWspF6_g)AM9nTLGZ}
zUceRd<_q8eD2DeY3a7qnSE*Fk|L7t9>D_lBDnKbHmrEQze1vy>;|$${!|0@eX$^1P
z67EeAJb2v{!#3MkgTgX4-QeuGlt8)hUkoq*yCEP?3oqUzXxy<7l)|PB-u3wh*>ie1
zUw&|c?s7<g;q@Qc%S`D~uxSgZ&4;;lWhaCa!{TyhNOKNwogh*K?@%su4)AAtOY15C
z-L(pz`}$qne|CW0t}5^T<{75y@b%qy^Nm9#y1TkDX_^DfeC_g<ItOc8M6ga2i<|vj
zE>H;Xr0IMaZ2nWC+FoE<W02++cJ%C-#U<(})q$%~Hs;Kf<>enez~cuFQySQeNgMuu
z+6q>hxwS2qC_b2L>y|nz?zpX*&jk^n03Q6yR_R0lTuW65pP8`+1gfQgcYSIvr}R4d
zF}RJ(S00{0aS2iAwzYzY#acl!==@rr`F_0v_ue<6KyW+7%!<B*@xVJ0033bW+goca
z)k=wn_K)z1`{wChaS1w&abRH>WVzNU8H6uDzE1KYi1<Rdcf=|L!PVtweVpI4j)#C3
z^o5%o7p_UX!0SJLFG<&>L^^gGlYF@Q;2u=IJ}-s{UK?Za>O5d_<G=F=@J2uZylW6e
zA@}b;#62f!REH{Po%m4saCi0jHm$wxz&&{9JCPJ*etUStRXXb^0>mwCIe2fPw3d1z
zNZ5_lDb^SV)j_yR>ptEA<|acA9uOBz;thcU_?BqRDbP-U_IrDWk1+-SW3*e={BU<r
zt>f8>Kb~`;@2sVaMT91(ix67GkwSRaUZ>g#-`N}>C{(*UJnK$kmL$;-X{^<`<;{V3
zA~@d{ArIchjHsqKu9pkoMTp}BL5NBr)^;F(ct49TFtyfn*Q%^t*-NR`jTnO!4>||r
zjrSZFxbO$OdK_%CY(>%2RcSs0$irI^;zmN8q^w!9{E;XOCkZ>=2MD560X&EZlhbvk
z=MsMT#y%_xh`@m$xohl#5G|Ux{99hHEremniDQQupQ?L*!y*c3PNHe538Ro?cK+0_
z{pv6L`qb1^_8z_fQn&=FB6x&qxkM?1|NO*pM928yTRg7aIJVArg1It&8S>xrE2W5&
zggdU=z$aeyGhA`mGNQmzvPt%=S}SMKd2V`+qsNYo{_!9E_V<qLf8+q<lS;MrD-=UB
zGxdXMYK9bfc=t2ahC~A@%>B(zz88Jpj{piIAm2_hz`6N(qEOg&#YRMH#wKPsH(SSA
zOK)!%VW2oWI?4W#17m;vmw)(uho3yShiA4EbVGo`FDgq>NI4=05Badq!viSSuA>`W
zCy)vhCyyTIvP;(!H&Q02W|*6AWbl1`T?FUh&rUEh^61##{M8?Rzk@FpKnk`22ntpF
z{k#R+0^Gs(^Tqe}ot)?0m^6lo$ti}1S2H_TFNFW=MffKV9o&tVI*x!2zM}rWh0jgE
zjX2G&?>mR@{61hw!ndsV?rS{E1;PUaQ516C{IulY^Cvo`=<U5Qc!1ywU-%;X_m5;E
z1c5?iX~GNs@2^$MgyDt30|a;6aXZ_#UCqm0_A-=GnGnd*gLm)Yw!+3_OWlRQ<K}=g
zP5FaA_yd0Vmw!3)gD_lj@GdvjVy$FfrY!DlE(AV53BKhmZ{haaZx^k#4T50F!CMjL
z=NG6}tBj3LjQ#na{q7Go;Z@E$Oc6lKOR{Iro^vOTKlSkDEziAic6JU$ZZlKh=XZjV
zYnKPZ`E71=-PdqwqO;jw#7_OyU;fdrEN*fh09FA277&*^zi9^N`_ILJ2Td``0Nb~3
zf8NVp{;L04w|4y%sZL#EmAicf)#8K8DC&6+xTBjKCtRwt%T{&p;A1EL?O*@lwFeFy
zxDTk}Lz@<04Wvzrfd&vaEp0xxtpb#q0@MIisZ_dpdwPZiDFcx}h%+Hj5C95AP#l6T
zcfKMYp5iwF$v<#vD4Cm^osHup1tJ{0ZzeB5248Pl3?xA61i*>VGzaRy0$0wPgY|rT
z-_Hx`eCXmj+d5oxp`I7Sc!GEl;)XzRQu%UQ2-VSNbe5!j+0_+`*WqXI-<P|R-S7;j
QPXGV_07*qoM6N<$f~HtPF8}}l

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/bmp.png b/src/assets/img/files/bmp.png
deleted file mode 100644
index 6b6dc8f37de98942ecaaf387cbd2eed4e96f53f8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1322
zcmV+_1=aeAP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000E>Nkl<ZcmaKr
z1C0M(7R5iWeeKwupN+L`+qM}kf;Hl-gSBnj8~n|m?Xl;JwoluaHgCPRIdhTpoO{o=
zBb;*p7-Jt_VsDzt;yoY!SmzmW|7Z7&ZX0Yhnx?tgV6tl^x#!O0hSxpk;ny2W0^t7T
zPnE4hCNjR5B=T1P!dgoyGTm(Er)A`NW>+%4b&KWL<&2e;4HlPHx$E!}A9&?G*|~iy
z>y0)z{5v(bt7<><k9CMh=;5LMdqj~qE`<;PX@?Z)wUYd2#~~NJjE_hPW!OKk$lITF
zFD54@*l1)3!0~@VfVEB<V>*S1kf%-_r!!4Za+n_<aYWrCjCBh9R`(cN<`oa$&G`5@
zS*~%o|G$0c2_YZ&h$pda*Z#4`z2UQo>l$M+wFoJg78iK>BSx8=949X{N$hYnIRueF
zW-KUOlLrNm&wlsM5OMm5^NW^&{w6{=<mOopZ|UIVS`WvT)=|b%{Z?RInXRk)DrbdZ
z$5<zK-PTK?ZGB}0IXE~*QE0I-vqH12*wt}`yYK1c(Ei;>+hU~!lLOt@@RIW)p^gO1
zEUt55G3RdE`@)6bJdj16k>!fz<rN;h$MJ^89pF;4n@Df+y&Km!-yGuUchx+0e@yNz
zAb9LEkr1>y9T%+*zrjC8gtMrk;9ip(yz{yH7@HWUC={D*!_{n%)hy=BqTd>fho!2G
zsbF0NW2o)_7ZG{uZ8tK|71>X{<-tr%PLSssr42(vJv`?gmSc04#~qL;<49wH(q)!{
zFaPEYJ^drR;34B)0IfC7Ru@zc9>{&}7Itkp_?M~aDe|Hqi3Qd;l(9T$SHc5#Itp!x
zBEjG8yvjZHO>ySZ9N)RVL030CU|(M;OnpHRs812duYBgCez?4`(N<+nKwzE0IZy1+
z#*xUFt8+_y^cQnH=%8U{cAng(tS@cy$)8=~txp)i8WZfPwy#1OV{6YG;VUr~YaMY!
z6;|<u-(Fx-b@02}moZu(Tt;LSf4XgsExkF@Bc0W|CH`4KQbiyKffr4ah?`H&Vxlgx
z#wvd~sgX&9Q3|6KT50b)d8YW?EwjAzG23gNTA)@50=0KRC~LRMtuM2xx^eji#z|~B
zQ`&fPjPU}7BKLw(34^oFgFp{KfM5}hB!(aV?HtEueAhxNz-3|UlB~+cP!t-i;_#pC
z5#rx1sugfnbK}_tn=L_1MdqPAsj7&*h|ld@ljSMKT5K&Kgdj~5|8WF?U=IQs&4Pgr
z$G$PZfiVJWqB2X2^>wwehtigjUNFW2jwDT4Tv%9`xprZ$qa#7WzkWeV8MaOI^MnWN
zpfeE|Q*BjSP;D9P0Hrj&oiX=5yp@iwZe}lDZoJ|3uX^$Ax8E`YASzP5b8WqO+8UcU
zKt_T%78OYV1c4d=jm-w_c9ZQp_i*ym>GjvW_7%@PcJ$6aP=}nKUtoNE3|z3upG~eH
zko(65;vggtG_%6n#-+<wTIJ?1sL4Y_hYug(JKy;(eSLi-Nm?R7mPium>k87(YDkZI
zCMDh7J<MF2S%1|lU;2zAci#S6{w)N+;NalsH^2GaUrbGJ*{_t+&N<;+Wgot-FSAu2
zvJg?Uyu7SG@PT)K;Lba4`w7qkD4+>6fJ{^(ez~Nl#E^3?1|;Bf1c-ot4F_P1DavR8
gDWGeCb}f?s9h2h7tS)Bk4*&oF07*qoM6N<$f|V+P?EnA(

diff --git a/src/assets/img/files/calc-64.png b/src/assets/img/files/calc-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..b813dd2cbfad8bbc5a8682bd1112e1e485fe94aa
GIT binary patch
literal 3438
zcmV-!4UzJRP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000d&Nkl<ZcmdU#
z1#slXwuZmc(r7$mSnnEk!_3T_TxPyE^q85MU*It_Gvj4uzF}Twbj&b@8A;vejlH8P
zMK!YJIIrUUU1z%`ozm2I`ZQ`qRcR;Z6cH9JBVlxGlq)a0nwk00-f#ZR*Ztg?mt1i5
zLO2{(D<zx*wSqdqxy6#DdTf;v8`-h{pnP)gUagHx{>vAB{onrO+S9H_m6uS8LQ+lC
zViB_P$(6n)j@_+*q+jKEhK_QT@BQxYi+AalFX%mE^Vg3}9}yFT%*_~_rD@GF7SsyX
zH7!<3UN`lLNzN#p!;ioECdyqMR}OTYbcu^uh+S-Gqm=`r`2kSS<J?**`Cm51e3~|D
zn*r9kA6r;x{BE-(E6@0-g|7^~mrw8iIAc?Xh-IEQ_OUTd6XK@X$TUp|L!~p=gv^$>
zb@L6}{hE6?^^{ZaJeaL75IYMZr~^<01p%io<V&CgPytn!JVzmc!I9L#p#XTsuwg^z
zk2eGHdqo1!H9y~YDvIKBvMFQ4LnGxAd;WpXANm*zc7n*v5l7w<Xk-Pu1P^f}L=jX<
zeR#7S+}eK=cfICr`Zo6`G;La1)3BKq&9t$S_RXd~nsTttQK<xbdpC4mrAm#Id{wfl
zsOm-_3y+JG&+Y$59vb>2o<B*YvVa%*G?HjW5TS^Gilf@m--Iu7<K~;V^ObkADFdHV
z%T)8OlVW8D5pY&FTB{w92>@ujj^#iy@bJY$|Hvc5pTrL)D3u#Tae$}=6c9v`mT>fx
z`e3TebsKNuJ$KyGgzsw$pPvn&Xd5<tA+l=wOwbp;L%{)Bd=SjQfBEn~@aV{=C^g}$
zm5?wl0SXw>?{-)MuMam_;o1#1^UhoEeL3N?9cxvy07iUVsC=mj|JcZ92uhQbJ0q<1
zzylQU4FHHkCB~ONqL~WUb>G6<ZvHy@wrqNN;T6c|#}^UW$(Z9U|Aj-x;Y+1)s$C(f
z9vCG_dtwk@P!!RA=Epm@wt5S1zTw_=1g`+aGr%(*wqg17zQ5zq;U;`AMzGlO&cg^z
z6ELY?v<|iX)F%S2D&N8zuDgf+mpkn<vq+x&x4rFcsrld1-PNtX|J#4US4ZC4?DwC<
z3nu932#I4K&r<-5NGb>x+k|h7mbkoh3$MQVZu+<M0qX=ld8UfA3&4jy^dZvf?dkPD
z^lg75TNj=nw4-#DLc*wo`bvNxsUV24xUi48VV{f4t-SKeyBJuf@G3bOaMOFv0|0@>
zT*Q`h`oD8`w7qY7?ifK=oyH=(IzRve$ni`Ni*3T!n(*gy3wJESpS1qqNh(U)Aoy?n
zp&Ljfu+h{0@7*`Ni^wcM=phL_01iP=EH)ZscDTej_GWIseEq_&G!FWc6NW@0#;=s8
zI`A5V3kF3IAerw)K#6g7kcAPC^Rx-yZ27?x6du6us-^=V>Xl;WYKAxhRS*)nr9a#N
z^J6|2d(A$7)rr#bn!6V8ySu$~09a_aCHUBa0_hc=&mgtY5?2Pd^6Dmh|A_*x$%T@Y
zZ(|`H0JTCK8*G#;aY2dcF@wyHl(@EfJFmU^?h^+dmR|>`0}=^1C%B~`2q37&RQv(L
zv49)8@8FHs-$UQ#O(za~@}B$v7!oB16E+s&$Y7nNHyFT8mASs>Hr{gM2@0>vW`JY@
zU~sV^YA74J`(e7w4V!M^9k<-erX2X#jWaoYVA+H-Vh}kV)V2745cp-v{&|Jq6Xos(
zoqORJ;4H+EQVsg><^paSXl`k5Tinm*Z)|oS`+FYSdp{eytB6S3-wNZHD2l08%4_ne
zM-8yOyy}Yor9&=W5ndG(MYZ4<V6D<o>ZLx>;Fc{n^6op9hX=)Yj_z)_`n12qmklVE
zv^?qH(9GX+toA;x-qQ3jYw(%=TMkcs7@!b5C@A?Epqf1c=p>pBxoz+!?tJxKY#J=G
zr4?-Cb5h^ibNl>6^bqyo_cFNYt+{=^tL4+b;mx^ye$mH{y&n-N1h2}nGDdqz%#%&j
z#$s;jzm_{+(}W)=wxtDd4#IdOcfe~jY5-U_mOJ1jJ}MKr175u`1DI98t7`s%$o}Vt
zlk6vQ&KwyY_rLk=-^bwQL9E(BqrDLyN5m(exfRp{QPL6&mT8O^uh}PZlLUSj6opUj
z=X3)9Umx8`qDC0aoO@Ewfz4Y6t`q^Z*i`4#(NQ*>KX4DebfVboxXoz&b4)Be$~nDj
z_4zC#GtZz<3|<rXoH3xZXOcv&9@aMw4E&52ls=+Py`u9xIO53Xyp!+Go#&$w<>>g=
zIQzn1&YkC@@#8*cocD{l^L#X=9GiFu5m2`heEwlbB7gUPehE^fUdj7fiD2A1JBSoq
z<e)1qazvJjTzDYy$%R)<`Dk%?^0xx`1HFA@6wJ;p7{vjyGJI<ch-}E`p1TvFl=g3d
zm6#8=B4YXC_PbZ~`O40(%k`NJpQGe=t_q$6zWqX|{SyVG0DN-4qeIxxHIERG?Qez%
z6F3M<^i&rx62E9431VvV1})n1D;<fERXSay=-S@mVxP-S{ZBlvv+X>;Yxp;qsQn(7
zU+^CYmA3Qz-qGJ)^11Zf_vQ|A2Pc1*$)*nl;S-1BrI3{&R|VlyK6&t<l!GePYA(Dg
ziO;ele7Ri3se(`lURVERX!W}~5knMPp56aDc%~D@k(OryhG#y9V%d7=_g3`TdGrr+
zeV(8G48AD?#o$x_6c2z%ad-gK5R@I0;a?$mWc#kDA@*uiDjsY1na0x!s>R_|Q`uB>
z3`nM&BKvtIMksOhsUITnHbI*O%<i$@;lRY-a`l-n&d2ITK-oY30Q<)N7N8J(a&MJg
zV3mg%fU`np_59p<zS_B&=y^*=`P{biyh7qb$v+F1GtV#j*kOxEQTP>(#MTV2iilvX
zWq9g~l)N6mk(QAXV-tH&l(E{ESM-^j|Jt%X#`uNd69!#P0Ft${s1!QJ5<JAWJbmO|
zR88AWjME0CK-cVJb%B!Ciz-M#_@peJ0opPtc82HFQt~{mI%T<ojDO&0?fqPJ(pr7~
zp2L$LURBE{r55i3t3SZBu~|IGXnTN}9Cn1GmW^F+$eriAs>gl0E3eC2<TQOQ!j8Qc
z3d3ts(oW{3fL9djl$f#HMb1Kf2IrPt<Rm`JuJGpT)2Iqs7=DFg@#Wy95Ii6bKZyD4
zv$wZB$N&%Z#_6aweYRb;qR$t0UYYCT%qZ1rfOQdmL3otJiVlLBECdRj+jn}`abE9F
zVvNb1Z$<ppKo_mi$Dmrl$Y5c3ZT+og5M0$qi@u&$u%UVff)xJ0yN0OXmNsXqi;Kd8
zIwcBYRNX4OK*29I9v0&j_+ld|;I+WBI{11cMAez5iU;7O|6KL|2%j_RJ5?G@_%Mt(
z?bOXr`Mx(^JOIfUunysq=gz%w!6JYnpo%KQQH<~V%+HS<`mNvm)gS8Z-Jnfn1E9Hs
z!1{$3qA;SnyFyP-7f}?qS~>=VO0`TJN6gG92M!!K_A@{ABky|VnWwg{aw!b54%1!`
z=H}+`eb}=3H0t%nVv0BKHL%Xn(_KZ?F+MTFbI)xXy6+c%^3L76cRn5j0qtZI$Qrti
z`#f;u=wW<Mh-1r4ZH`)P;W&Ix72^rR!xKFB?AD?Ce(9$c;lJv6K6x^<jlepDS49w<
zD$`R_G#U}j)9a?yajH%DPK-GYzjfR8q5FRMr|;aoYsXi7-=m$ZwTqU&5K=(aS<5G-
zQ@7OTYjbIM68OcIZ^8SS<2@yg<HfSbEC9&*n(C76`C{1!BdoQHX`ct50(V4_O@k-G
zH^$(c%fQR}n&*>iNqiL%S!#Lb;#~M9SHhMnGdo+u7{T)lDa>^Sujvw1s8q^$o{+%b
zpMqb6j^lVmcmQ+lwbydrefKjmGP)E5BLc84;gd4y%OfL`Y~8wT=>A{+sXKQy;f*nc
z!4oC4ba!|2FaPqdyzOmo?Vp^g?WotIJ`q_T@TqrL=XmsyhdA@hvw41GZ0Hw$?#JHK
zZ27P9BIPBOFbw(N2S32j&`{;J+wS-QBc|$9Nu=%S3QBR{q*&qHE++_p!tC4}wb@zf
zjmFT={>+cwwP*LvuK<#6%*=JZGEN3?K@gaS9(wrWmt1<~Yp14ah-eBl1)pvC3}BI#
z&w@f;+JkeBFj`#R);N4<-{=GP|KfLU-TLgOfv(iN<p5396SJ9m;)Arz0Hv1cHP>8o
z>F@u+AN}^Jr<`$l6os@T*{vq1WX=u>w|wS#X1*tz4a9N0XtHO|u7kh%8xQ{Z)~#Eg
z0IE5#iA61I0QHtNTK8hWB?0gN9|(X7Ku1SMwWp{16jcoXzhxd^0Lj#oQb1ZIBxPQ`
zjWkn|B!Y+{B5rzmrq)<o1woL4)=U86l!Yzug_bp1_o5^K*-S`+VE|H~Nom@E=NWBE
za;|lSKxoUPWtuXVlsT!N1S6>@{wm~4^6ELyq`-TMW<d73XtuZ&gPPI*0b(lTvHmt2
QlK=n!07*qoM6N<$g00NnvH$=8

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/calc.png b/src/assets/img/files/calc.png
deleted file mode 100644
index ec76dceac5a56c8737bfda586c8d51d63715b841..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1200
zcmV;h1W)^kP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000DcNkl<Zcmb7^
z1F$Pe8-}0m=?RZ*|F&)0wr$%++4XY^YumPUZQq=e8=R9tGTl3wsmW&6+f{EqW!?`B
zVT=JlYyC{E&6AX}{6GKmkGXBdD?T;7GCb-xMBusxHU={zy(`!K<lWys&uC*C3`79a
z^<xZ{l=6^mTh{=n*v(j@;ay^p89CZGjQxT`G>??IYj>GSEntRc@Z&dqi>ItS@j12i
zjjv)NB9h`vVq+4Y85-<;zEbj5Mf{JVlG*-p{Sc>a`z5RX?F<$ap6~KR{WQMyil4DO
zzf8^9phHd<IbGxiw9z66bRp~nwQu)+vYA}qTb@37%P(;3yBO{*Af&?+HlEEVUiC}n
zXBKdLH%)HRl_z>4lcA}%f9y4kPfYZ`=rhZib^A`n>;f&_WYBpg?|$~rnVp`;Z9X3I
z7ytrL@A&x(0G_(5vRUM^7T_@649TDLb7meRdEz5Ukc>@$9P00(r<fD2qc~devCB{6
zJx}~uMD9J@SV&i{W70&10OEwGpebpiRyC{?pU)Rx@JptrX7HLd*1erT(yoOztymWd
zV_G5NNJcDmh+~+}cS>rTrr%=DdK%w+)sMoN&qNz~q<T3A)=p!5@Fn<RvQq6vW`<u6
zz^)^wGBNa8a`ph_`aLKy$=uMFQzJ^2x?$@PY@Ojpum35FbDh(IlnNn5q(j@L^P#jr
zpre=&24!Vqa#DK`K@}Q{OpT0fTAEuluI~vtt!jF*Phzm}V!T$FhPN8&K-k@l4CG%B
zb}&LK0I%sJ^M7y$|NYKi+KyxOy5onW*<?cnl4I*zQDO)`s8V<LaHMi001fXDrRptY
z)F4%76Z!0XiaZ7oLTMd2WC)QyEt=lqC_@8txPApU*v@dM1FSWA>F=8%pBW~QtF)SF
za^2}bporIl-WCK1qo8FYw2j2Zv@)H~LSGb<Ce-0U9V9I%IxGFQfTX%{03|ll3~H=9
zhbh%I5szq%a(x@NRiftXrI1}n-wAC<)`L1Q#IhAM=qpY#HuOwfe+^&nW<1mZ%FbmB
z_C1+AuLSGgcwPhZz#9$`+OJ+auu!dSY|(+q7~=Na)*7Yim4F052#MAjFi2sAdO*@^
zPwwd`rn*j$V19P|71^wP_5BH|8(Ts>lX?;oK>8`rkxY#RV!x#n)k?LI&FJSB3i(Y6
z43H3Yk&_~S7(fsNSeBqzEMO2+D%I8xfApQtUUSuDo3hy)QV5Zr-{T+$@H~&w(WBAL
zKXSC>e(?*R{lvu=o_B)ldSS8(%J+RTnQVuQ<SYZ|w(KI+-DA;!h^3U2R#*KmfAO;)
zx&FGVPmhXDo|Tur^krOr`Q@UgSQM6JAtNX(8S9};ki<gB*p@OXuDn)uzxesje4tGZ
zq@D@^(A(QPaN>!lp8dopJ^6)xxT0GfR~pL>(jyZ>%JQ*t@bjPk;J4Rbf9-KV5oiJq
zPzPKAv|;7*`MyG-Fdlwr0Sd4H35YZRFfjzprtj73^(v47T3rd&0q;IUm%vF5p`<PV
O0000<MNUMnLSTa59zxUr

diff --git a/src/assets/img/files/chart-64.png b/src/assets/img/files/chart-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b8f85bd679568e00265f2f4fe7752e7eb43e5ba
GIT binary patch
literal 3359
zcmV+)4dC*LP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000c;Nkl<ZcmdU#
z1#lb5(#L;2GrJ;NcHq14W5(mV$IOh!{4p~#Gcz+YGc(gMQyh+C86@q_^pm$#Q__|!
zXI+<^uTx#qf}P6mKixyJs49~z1Vx0x$4xkX;y4$-<Pwf`kIujJ2cG+-`(Co|;uGCd
zd40}70QI0j3a5y{`#_sE58d;)-18rgDT}?I|GV${)1QCUuGgW;6KG28E(Q!)gtECQ
z9lbfv!>a)q?aEj~BW>|%pY-YZ@790)`N=cQbtgI}B}@BcXEF+4FX*rh9(*3COP!_T
zUEW|`$2ITYOET{++*>>NV$E2~G&fAJ&4tm81yE2B0ZkJ3_r{n%2hL6a@5AS=t@XZR
z(3S@uD;AsAn7?Tj4hJ4TeUzT<V{%K#Ky#r0&(<CCo-&iP$j=zAZoi*Tc>QhcJGciU
z>{;%0zxd3`GKio7KoJxKf{yV;C;?PJHGq!GAgY8ILl}NyjbU!C^?3s!zLSzoDuJ2R
z)!u(+S^n%&$`tU@H+<jY-^R}#{YlpRDt*_7%of0!F=&Yb_`cGzEm}(ru5Mn<ZEv`l
zxjj2ZkxC=2W3c5B9eYQ|g(;`LqA~U%&}gLh&(F0kQl-O)IaSKmP}Lnk86L9^zwmAR
z!l|F6m#*N`9=7iYfI(3N02M`1+G&fKGfh6y{wTM;wtz3wO^nLn<kzv;^a~;oyzcN`
z>rfH^bW&jjkP^J*`;L7Jzi{R!>DHDBjXo}O1l6JXhJa!aJj#q6z%RD=aQ&m)@~T@0
z@bi=5%kPb`=ma($M^>Gj2|C_~LIAYFBsc=!8^E9V7JjjS@1U&=n;Fz9qJjYeVF({+
z$qcQNEk5K1@UI-e?|stX%Y{{G6~Kxcj{G<COG`gRH|?OaeT=uL1<)b96m5>DsWUWA
z4MyHx#Z8w#sUsi1HiaK2B1|%CYytnh3*W*ocYcP|b@+B4qXspKAhBm7kV~KyW~rZ^
z;X`sYH(qut^Xntec7RtlGB+9Cp<Vc%N57R{UixWP(lgM?Fu{U=2vGzCg5<QaHnrm|
zJ{Yd%hKmRA`?d*ud}p$`_rCYNBkRAXJ=50j`?eqCCr|z;KY#qESWT9Yy2oS|bqZDy
zk;2s|K?2SG9O=;}AIz@h`U|%ee2i5Up==<OY-fAto=^OZPq_V${O|8t%uk?m87?tM
zs)$>65DOyU#ZzCKC3$pE^DEbL-Ae}W`?nu_2!XVgoY*x#`$FIZBj)yA`*BeUzv5{<
ztMv(gY5siIsl`S7j4#%CuK_C(I~E|fIj#OY$>9bcTD_iYw<&xK6jUf1?pdFIXfz#m
z%(3HB9(?psdXnM#76pO|h+>C5WRf$J4dIsu@Grh)+rn=)54z>Y{fGeKw7pc%6OXLg
zxXCdX0s&A|0&PElKQe&tuEXCvfZy?yga>eqc}FxswdR9%gph$KAcCMpn~A3#+Sn5V
z`20Gqed$vLUN_texaQ7;$S=_EdO{{>E&v2!*wFx<Ig(>_KFW1mci{kj-%|u$0o92L
zxR4V~hR0HJ2ssFXLCMrJXWP_{)VazH;4iu9oWno5ct4^NKgok<|IR~LtyP1E>H7dJ
zO^q4^^*|=5D!B&ck~WPK4X&zP!}aF@{_)lO`KCYlJgl+t7H7HF;nUvmrChl8HPzsC
z`ew-CA)0^&&|C;PgrKx*Gc*?m@bzoB;qn3e-gBS!B8t?(IEh<sV?m5=4Sw1rNcqD6
z!3$ZYv}an(E;YHTbrm<ha!~Vo&d*Ypx;h8u4`Hp10<88|Xw+sZ!xK$6D1iXcM9?7k
zT$!mgnOz;g&tAn%uO7gk$0Mx>7_kG70u19y@G;i-%%&Njgb-+^bvPkhGe0=bzwV~<
zexwZ==w)53Mgi#MYxv+R!N*vqWIzZ?Gy|!o)J`cMYJZSh-*98R#yX!%T?n4leg_*|
z6kw&-!H2vuyed=8wfxNJPLS0TU9M_>Xi)PvFn7WEhX?Q)Sj|>(BLb}TSII-ZC3scc
z_(J6HBPSWsljpg~7rcAlyWhjky}R-1pOj6GhN1+>bwq&m67aq{JUVPAYvBI>w;v%|
zH(T2OqFoQ|IJomdgW&btz<>8&e>weZ4I`EUE?eb|FM2mu9(pSPfj}?sV%5ccKsWE=
z)mMjC&?!3sH~SdT`fJ+V@xt~O+r<8X_SK#X_?|5B???ZZ)vSXR2SBH{#Ip~)pb$V6
zf(EkCBjBR|S>7Y4uLwW=G6cZg_xpD+N@Y{`PifvbnTPxW<Q$~E2#HAso??vyAhqkU
z8Jpp=JR?{o3gG*M5Vi!*#zz6%1v@UFWa;wqno$BE=b+{xsG>t>xa^hh@RUimHTc-!
z)Mc<_3dlK_@TS}JWos+&I*e5++zQ8Zk#jKHPlwyYs>7oSv90#=I3Shb`?^e?XR&rw
zm4=-wCBT+ds0^>we;L|(+AsDO`1(KmJRUjy05w;ShnQDC=Pi8JtG^xqm$#;p=@SfJ
zQvU1&5UC6wcW^yfrDs;acz{8?OvV~#Qv}N9wiS5QDBM}k0fmcHt9d~%III*7fRzLz
zwtS7X)e5K%KWz;J3{$KMeA%`Rr%bcz@Y8!VPY`^C8D5!e=L%kjZIxxPa79$AEp?(8
z5oGAVFdnbp@^_4wv3W-TV<z<@)!}1XK>&2<Qt>7SgG(GqnvmE8fI)<{F2Vyimyk#j
z=ZPdF7~^6Ih!GN3JQoE>LW(hV3-H8N&sqSsw#g9@k|d>8t5LHx0D{R$l4NY3pVm@>
zuVcjmkVze9Eub+Y*88w79*5~u!&tKgc#SR91gL(V7lAZQsHHVhn*!h^$2m8)&ZkLA
zuz3`qMq0qe5->uVregxsv^X$r4Swpi_!M}l01tqeBK^}eB?@5jqAZC28H&$Chysw2
zVyz{XfEbcminAjEP(!TQ5<E)uvz!FuMxgRvW7X>oTG}KrH2_R5q)Bb;Ca2kGV3l|w
zB1tF&AkGs)tJxa67T3gMa9e`c;lFB=AXI|~axc_tb(*F{A}IjY7Xrj?x^9Jfb6o%-
z3g8vvTr5)`49)fLjAVf10mN<r9yBOfKSwoGEP;wYROZ2>E|6G*69Yg9hG2Y5?=1J2
z1d?KO4FHKZczo<H_a0k=#F@Ah*<8p&z9sl>ua9al1FJ9zR)hzr%M4f4-iM0Er~xRz
zW|H~%P(p*(HLk-*l(+!fo$QY=v$C5vH*Uci7qc*PJ@&fil;Nk&`azZ60KVVPICOB&
ze>-PSQZn&AP_o^f&gz|mhjxp|6Z-r7gm^1^`}lbX;~N%<=NK(K%QD0mjvYJl$RGW|
zZ@qJVe(rWvEoXpkI0<ZDcp>X&%+5Aww`a(*d^plMAT*ja@;qZ{NqOj@hYo-77k>5!
z|M!3Y`}T@kVUTSGkAfhqtgPT1?A>#SZnsyY_{vHT9|G;!CaQsxr<VBt|G#75tH0t4
zK63B9cmGG4rc5%UK-pukt>9zCV~;<IvqGMGmO3kRI%^d0?Iy+wM~|N3|Nrmyg|Gg~
zFI<QJM{6A$nPH*=+YnwAK?tgxSzM&o%NX2V54=lI9l*CRrhw=6JMLWg>aY5ukKB9D
zUH{;mWs-UC3*T@fq=0O%k&kWAP}F>9WfYzWUyOVK?@HHuN}lIMyZJJxfNT?Z9Xp;E
zZLgmdBUq&UWcU&AK$iJY@Mz8$LkOV+FTnPJkFSN{cNGySMm~gmL--Iv;nU14FLy9T
zu+}hwxy|5ptW||ZqlUE-;lE}CejPf`^J(zW%%zuJ%2$8&*Kq9E@j?V60<dl2QH`~H
z?AU2;zx|GdulcGk{K!26cw@}jf=7$Av$M1O{LlXa?|tukcAsAC+|})7yF_Grz{fYh
zhrqx6>p%01XFQ7|$4)GK`Imm~hX*77k8IH_L+khZ{O<4m4hstljn};9b)Rm;G(#i@
zofIo5XAc~k>GyUUhyW-oudL8nUZ&gYEquurf6hnmyZ7#Y00fZIz)GbI01Ob)G&TSH
z&;RnrFMi2|Z&_UIAfh9n5o*H7mjO2)`7$VMl=cuppr5U8Z#z8t$OFf}_G`Z46K=o#
z|Nb19A<9Dllo&_%rC5g^l`=pwbiL$~OJ4F_-~GMccJRQ{UzTP4C|3EX2`Uj1fU_R?
z(&y#%o^m!6wLNgT@4kB;{+4h4x*xjz_S^pxXikQWo(;VRbcfy>zLx`GC;%34KngSf
z>h*fF-JU(5swv=xZiiyYcpO^+8MYAHDRIfP)W)etL=lm2=FC#3*X#9xbOc&U0^}p!
zAA+w9y*GR>V<<o=6QURfAcDp=dIX>1l-nsH=q5tw&}HZvy(~gG^`jUuj-?`OY%(RD
p^qFkdPlXH^dtD)0!e*kD?PG`pFPnI0-lzZo002ovPDHLkV1k#Pceell

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/chart.png b/src/assets/img/files/chart.png
deleted file mode 100644
index 8e04b2bc876e8f2f4c48bd3509ff28984e4bb85c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1145
zcmV-<1cv*GP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000C)Nkl<Zcmb7?
z1CT697lpsfs%qoewr#%`*82m$*LGlS2G_Q2+qP}*czSwXPqVr+w<n`ICS$Ouj@u`B
z?z!it&{_kalv<*cp6j|!<;)AtjNCEyroGbhQlo1{Q7e`zjO`pBS{GXX##uYhctX{*
zr_o>nwDqSoj+C<5^PJZJOacvK@;$}RLPSQj6q-2d*F$){>vdGOOHZ!MveHVf+;SNU
zX3eELpKlNmh%;#B=*F5JF+91-b>;gqI1rDBX!^Ip&m7Y9KVBEl5Q>8z%d^s3#+6$y
zWA@b9bQdggEOIPzZQKyGnu;j}ZqtuVM7?M&>*ds;zwE)M@wZ4g3G%YQn#_7GSamhi
zCQhf|7r|1B?x#E$8?>Br*X_B6vE#<2N9;c=^ik|RQjr8DQD9ki9p}%!rcOTX?~w-q
zAOLsN86!}lvfz`<XTqt**(D0BD6QkXDRuG*e~rAchLynBCP1b~C5WY>LKi~hx_p*4
zujl;9*D!s;jG@Va*8I<W+VnQLN){E68Z-d}38k(IR6X)NW!9HBa{014`NTSTwFnGK
zZt&Uf?&p#>Pvgt>4=m*b(f5R<K;rvVR*2<XwDBS)Pn<%rI)rk|=VT<!nAA8TUc^>y
z_rQGackeZkB+1oV&SB={8RRR4A<4@+XVyYGLAKDzZ`q$Hl=El;a{BcEaJRPXV8Xa@
zU(A{^Q`bEgLwIiH2i^S-s><iaf4@l4FVLB9r{tH=%JRQ|1-G1hP47b2u3WLAwF(dA
zIrXSg!N)h_ny#5-N-JBr6&Mbwl%^gMtwn$GOr?eUKE0NYT3<64MDXhqD1ZU#&AhQM
z4PtfQQvPG+YtDP|L>~S84!dlNAh@drR?sLxTE_seZE>YXIyQ`0C~hi~(m@IdS{szo
zT(^k9RHLjO*cJ5m+;d%0sT8qT)a)mdN&K2`l0~8sv*&ps?DubwfCoDP_UkcYgzGV8
z!bsw&xVb!H^f0R0H{)0`&Y1Bd@xr0NcV)dGf$KQJb!1<HhWB=pN4b;u|Ma675gu>m
zJ0~AhM}<<FrOE9~@a8ZnJg2WG8eG?-JKJ6O?z?Y0dn*^UTCMl;v}`v2RZXdooyar~
ztk+@CYAW>JuZtxfkD(D{v)$DrjyPoZ*Is$yu5dVl6hhekHOTFL3=x>GTrShz)`pZW
zt!?e40}t4Dk7u8L;;vGuTu+w8tyC(6LSehP1{HwnMKkZO+;|QGgHqDo(NQ`0z<vMs
z<{Pg*Xha7J<c19!dGW;;MIs&-j^iLrxH!^`4F=KJtB1tQr8MF)ote^s`|tCwUUC{j
zgHM2Ye#7p*`~FAg%$>KUQvbBpB2X&&+hWg!kTTPishxb{F=xK{=Igfrali+PKn^I0
zAc+%=MpLm^Y;66a1GqphN<j1rBN7t=->;N&xm-680;*Pm9-#a?OS09Zo#IlS00000
LNkvXXu0mjfZJR*B

diff --git a/src/assets/img/files/database-64.png b/src/assets/img/files/database-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..33d5043c19bd08fc8d9baf32d068c844aad05de0
GIT binary patch
literal 4949
zcmV-b6RPZqP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000vlNkl<Zcmd6t
z1$5*%(#L<Y-4NysCd0JM%*=eucYDmt%*@Qp%nVDnx4Z+pHyP$IHMng{_4Rh_myTbY
zp81aEpI1+^+wS;RQb{Gbm57imA^y2i7Q@5CtX#E<vC+}=r_X)%bFW@^=E?c7alf&n
z86Sg>Ca9E#sPs*MN~amvyi0kv?~?D2-|~&?KKZ6UKH+&cV~p_ckpLjmRg_X#mLf@s
z4iJ$Gv^M96hysLAmSvGI7I@ExKM?f%>A>2nyN`Q9kS~x8z*h#3fD!>7h7!6`ceRhz
zSkE9X^t7_NX%SuN#=)*9p7jN1S*I($w&D-~BLA8L1XNj)PC0+GEcK^@c0d{Y<%L4&
z1G75EQk0Y-`_+3We)ld)TlY~v;p3qxNq~!wOF#jiJY@@tNOv1U&0ybfJZIkgXcjJ9
zh-KU8yh|CL$i>wFB1{ngq9i=7Mir14wt!T5FRI&?MN3Ql%Tp=mLkHu4x-$Gm-w&24
zrDE_FB^BU*@~;Hnxra>uB#omUo(b@MAK&<t&=n^XD-Lk+I+{7qVdLL)45vTy(JW}|
zBrcKUE*zr9U}NwSzfY=fM;k+3U3z<KOXE=@QlLtXF^0GUM5F~~fhQpN?5)U8*VB;m
zX$~BMdWGXzpcMEDv=1m0g6f>lo-T#DejTSj>n0YocKl25%nA?jOC)xwQed=c(OPFk
znCSp&s2W~>>2~Co8)?V~v`D%PZ)25wY^J3EOB+mQ2Yb7~y?zxZJnQ;@89vtS6I#3K
zNaCTP02TKp&OyU}<qpiRHci2+3?{3wy!aP_(t_8~z=00U#PusV>e<(@u%+{V3=bfo
zQQHCWnAcw_!~ePrpPPawV^Au*r229#l;&sI+v+oX?F!c1d?kwx3wS`7y$2|zm`%!7
zl$1t){x-~S9-?8g3{MJdKrB?M3Ot0*&2MB^gG>LFD_QyU%UImnb$GPANDRA%1C(u5
z=5GC|zgAklal)s?&VU0b00oW}RVy){>uz9sI?uk#ma*(97avCOASBDV;DQT?q=SIA
zj&?rs+0T;w^4$bKexMBR(PCwhj1IfK4OW#Cv{2}*XPZ6A-iv!#`uGd!Y3)Az;6-M4
zz@Pv8XR6iK-Dwv-_6IBV`yJHnpQKr3&~*XIf)IP!2?h!+=`#ETyDwbCl1HCUPut-K
zKUcc%bfue!RMZ~NpLfo4TkaZYwYCq@7&rvk0Luc4X(<$FMWNX#!{^v}!9teYbS^#Z
zv%oV4d_2Qb;loN;hp-+?hLlv*0jUiyk;NVGr|aHAm71G7yPh5VZ8I(79)3o!Jw>F*
z2`Uf@opo%ra_qWrK1*&qrwl)jNXoHMDGQ?o6&Pd&QFSval$z-tC92v#A-qBnv4uwh
zSPCVA@pUqM4LO!?5lNJCypf4)lW*`$K*}Q~g%cR^^BUR4L>Yb|OK&`v#bL`U+d^e*
ziaUlGzjYg>t%Fzs*i%qqOxXk@24f7OHRZBm`jNVRq#iHJ7G5WnYXuR55ur3ZN$-uP
zv+`*d5#)<W@L@e+3`jL)s`wOHqwvru?Slv?HJ#xFhRKCZ>`-O+i+fpi(|JVjR>r~4
zxeR>qF8s}dv>w|-_q8XG>8J-MOqGSOC8K3_RhLJ?y3CAw0cMGDry<MsU){yt4LeY_
zssRs@5CcwKYr~9{o|$m*B)}>gT0(TNd?DA<!p>BVJy$Ge*<;S1hR-_WcMdb~k-yS*
zOb-j*ejQFz7V<v$0ip#l21LL}1Y0po6vJvds3oGQ3I`Q?@N|ay?lzRQ8xg4upO6hY
zzR^reVbHh)C;~uGT9r-XEpBIbU6K9QtYUe2s$1L^!l!JC`^P!(zCY3P*punFU=55E
zk)b>yQh`?)2P>NaZNLbKpbI6W<O3ik>J_GHElfO(0~CaVp6z9-dQvhxVUZXDKC?Rj
zJRk)ag6>ZCHF*qNzlN1hzGOPdQ3_)W1E08sg;yU_ftSI21yU+zu+k2bw>-r7AJ${i
zHh~yCw@BBOC(?H8N_5T*dqN0Lbx4pX2{b}&cwz4Ea(oQaQfLfC0t^9yhOTY~J2ay=
zt!4GoE}w=EyZ+!W*OO_?(tXv@MDV6;NN6aAKmA*V|9A(Q6h$<XOpqHMr0tV0K}Lg_
zV}ZyNn2~tnS1SxD!cd|Xe4?BHQ-!ba(G>>-xHuhU_)aL?xP~L1aW#utJ7)}-f$Nj|
z>sFRO?M%q|AcBeF+!&N?;ce?j-?^81+VK$-0S1ThTQ=hkjNm962?8X#Plpd|60$cH
z^7#f3sNM2&%JMP9t!PT<&KCA|*^J+K1V`R{%}jVeITraX12~RN!-{UC=wm_vjH#HU
zY)ZHEVdZi-q_F`9MVb`e;0U94_hDsI7*8W5gSZ;;3_Nn|mn{fOzxvo9o}Rh}L8uKc
zb2!2ZFjSjw0<5-X2D?(YHy*|DH($@f7(4*BMX7I)x<#!OXNWdY%TJF1UV!)ehp@3x
z1k@k5gmg~_3WGuz_~U)3lmiv;vIV9BX&x!HE}KD&#LP^c52nYATJX#n0#X$MMxmTE
zgXsXd@mNm1`BBVI*vV0rLLZnU+ua0#sT#-xV+>ddvul{(uAL}S2zi<xbqaD<A7i`s
zV3T3^mJO69CaZIU3Lx4*FxBEjy+G^8$rX6zd59PUYQWc+1uQ#V)u=Z6OZ}v-Jc?5u
zcTFOESOW_(^O`}M>6X`104kHlyKO7}_!x#1l&${ERh04t^iK@nklWqQ@P=)4_4eQo
zjAM!(;(Aanb-DCCpCItDltns|#&H~s2nw)T8&DR2)PxsF?gh^HmVGnm+yg_L^0FJ5
z-`Ne?)LhkBX&a2pnEDWbK$HLDMmz+AkF~Ue)Zz}ZD;FZ9FlaPB2mW#&9XE7P+I9f(
z0}N1XuyNZQe9OXhg~IR{`E7%=Wb0{PIFJ6l`|x)@gx%c+wp|0h#$ssmZ|^6P*1_be
z`3v_h=<I4oDP#_KU<#P&DNjO2U|IOPN67u7j{pcL(sb&QN}M}s2YX&KLH_{Yu>aQe
ztiJIAC<SDXT8wjiZyB<!(&CC~pu$8BZ44<amZxn7w(R29ANnF)3zuREwcwLO;3fL!
zRLTEj%M)K&XJ>w05K(il=M^GRdP@jDb*xf0`M>v(9~;IZgGWHuX)7r8?FT;~yS$5`
z{=FD%MmFzcba;r~r=E-5+s<rKD6%+gd({`1d|*3`M=fR9n;ysYuYEob-}(T7A4KT0
z!Oy)V_S@h8o=C<Rj$d=sT|sktlpttNhM&G(s#`xQwPxf`_fx_L6jE15cGUv(z+?rc
zY1JaUJMKXP9!2*2eLc&bbTM;j>pQ-|fnVRnit8^VD7p-M>CY^B>!Z;-hbfIsR;E+T
z9Pmktp-V2hh-wLt&lN-PWO$g4_b`d6n6fQOyNBt&^PdDL3`LrcUP`LD9(UIWmTl3v
zWFDk4czzLs!;atI$?2|#lTDK(wXlN&^Xph4f@N7m*B1V8AFA$D>{Sa9qlv?Z2gxCz
zwP7|1pyq-Hj0xc*18_A%zkh)7(Lo$C7+`GMUhaC%CkP5IS{Zz!@g%^<AXp6aZD-$|
z>*+oBM3S`f1=ljxWN~0qKfSAZX}Nmp+CW*P+nNw<W`!4-I}vhbg_mfuClQ{i4UXt0
zJyJlqhW)ocKoO4=76KH9h6slCqajSVG#V9Vo<flVn}6}QIUS%Jo0Fe$9olFtWfARW
zcU^rN<B|+djYP;ISv58=r&fZ3fHvsi0+RPB4vw<-frs%Rd`s*yNuC0J*-8{CQNSZ#
zaZ!LDt_?Q-=5|b=sU_R8L-_DG(0C8+L8YBp;lm@6<oy5Os|G<M=ux)<Z)Z~UZ|Gxq
zw4XFtgdz<+^XNHlE&lK%Moh)DF$BKP){UF+JRh*xw_!7T@7+YtDMxcCGC3E$a{#ez
z5HAiNb$}WnkN~f0yrnfpBgTMli1LALcifAMhry||^V&zB&50LZK;fTzrsC8K5I+Dn
zU}(6XkzLzS*c8aI>6d>wWC!FP+=?`0QDTr;;f1-T0gITF0uE;19-;+Gc%Py$G|G+#
z*W+X1;uByq@3=L%I|uOH5`LkGS2lNOob-}T);;?gO1K0FV6*90f8$VO@+Ah#3##-9
zD=?l;fDg+<9|NT3OAB3<2RNw|JMQ1WzM-ACcuX=$dU+@9^XK7D6hHtYl`dO<bT7?M
zIh%=H<M;%)6wnAe?!BKq_ip51we!v2z-z20v#tm6gCzJ6<&Yh~obZCeR82h?VPNMj
zTDup~+PjFRj&7Enbt374!DtP}pv&-$r>&y-acA(y7krl1`SUsY`pfBBy_`iyt)ru-
zhkffeb1>TTw(oM+2fxV3i9Ohs1(FOOHRZuigW;bNHRo?~suPcr>vGzS*KpdkS61TO
zcrFAQcSk>13X}I}x#(z|lb3VLE56L4vyWiylg{H5^O%|Ic@dH%uFv>i*0b{+-!1o+
z2RU%&YI;Xq6v^-a#1=#~9e{+U65s`tM5%C?|I5@AWx^XR6gt|#@B&(|JOQ(!i@V?R
zLsmWNOctMiGyux7P|VcG&+cUBM}9(jSvT3XR>bou?ipn4{;dpc-^EB;XgL2UPQLt1
z#`=aak_<0Mh;zu(pql$dr2?6;EiK`(A$oHofd(VAU3W5mR|8wV{ukCg`Fz@s=mDs#
z|98CO+oW0=XgqQ$b*mQ8|K&fh={?_JVqOEy+xFs(=kWp`ae$^evd1rHZDR{dSFgh@
zhtTlDgMcK$BZMZ0>HtAtR`{@}8Us{lRa1#JDBGs_hU4)YQXKg6dR9H|Z0hH?5y>AI
zW!rcDf}2SrlLc%)z@5k=CoN@7`#c)OCI|wI5tIVkcFJahgs>tBQy%g7uh9dNA|MGq
zl!;PMRo!V67(vyiX}aJDbYq6xrakmtaT2M<EY&I<7^S|Wjb+ELrI;^}&*gCgk9lNp
ze1kR`1=vbK*$e_=rk$*)36BWOwHi!neJWro`Tcy=R+Cc9aDoJe><K;C3tI6GjL~_*
za;%ii`0WqT_ma<%ncqsLyRG5?CzB?n1=}bZ)Ae9w2z-sP1h7Cwt)Wnlm~9cg84fik
zeDs`B?SYyOILIF-NR$U?Kug6`xMQm_DHKpYuO;*l<R9M7&fGW@vT*+vq*!9f>ZM4&
zg!X*Io8AB=-2KHEA}PzlL{nbLuO8(S;iEl@zz?F;>%peN3N;5j0>)@ig1x$nY)2N1
z!Ds`%##z`JOD&=4s1=;_&YPjD1+>A4(Bv7izF<rRb~?M1$YSHNQXoQhK|6c<2d1WC
zR5H8>rILprI4K)rYCE8M1(gUd2<heq{_(CK@bC|AM~s>Ipn=RhCxVqtV>>ofJ%m9J
zrGOY{k|gR4it$amX+7^q#F$y(jR+;zqvZK4SkSrNvF#CTW=I8rj;{sUCnk!0zVElA
zR02GpKo>pS;Ymbm1QK3U#vK@6u*7$C<6U}|??k|WC`h+AV%KFr1Qm_=W(wZ-1C&yX
zjt=en@CV<0@#yI2Cfl~-JwOttK$QfKfT8k_8+$YHmy>ajSyyI~^bSv?>RiGG2MXW!
zX=<vYslL9lq%M{GN~x40TbCvX0>;O3?AW<;;8m}D(RCX)tlz{eawM^rsoKBBG8)k!
z2mgvXsbyoJ$*VerBA?IWIMCg`0N3^KN<R65i`J&>lzPMnLqp?i*tlu%O>cO`4coT%
z-F4`zL6HRbSpB~UA5DjQ_wL5A6~3>Tm@F`vpMr00uE(|&{R6{nEW^L~jTQLYm_rr<
zv)SPZ4<d%Kv9U^b&*j~U88ZcMS&IJtN8leCd{Y^I>z2M-sUe41br{0O5-_*qlgkzV
zCHUkJI1J$hiQoY$JwX49@Bo(M*p!X94mbGtiVme{YWmmU0j%Hr=C^Fvu(9F<%TkCO
zp76rV|6i9)W8424Jb-oi<(F~73CHuH4}A!wRK*d<;RlZhRHe6CYx)O9{v~(-3&8h%
zUjFiz^Q>n*t5UaY`>=zLN*(@OwooWh&TVSIAL1bRg)e-8%PzZ2f*>%KWgT|#MudF6
zKsK9YaA<h&b+3KNO(DFB8wV)|pz0>M?Y7&-_w3&F;F`5ZUNAYCLlMv6lk4$(UWi{e
z3mDYg(FMU6gYN~E(O<-jzVQvOe0Dj>xeu7flnfwI8P!A6Q9bs#MBrBFj5NTBC!ToJ
zhd%tV5B4nXJ;o3G=wda?!bVlqnJ$uAJ_bzfn2#Li2O1q{)z|m%p7*}z?VsGVY12JG
zHU_P$fCIn}tpvD0DKtO)+*CUt6*`~}P?=1ozNxWsp&)6%5wM9&uoPH;LSZF$!KjSt
zDt?amf*+9B2UXrslFLm_mP(!vI1zlzbld?Ud@-~V;DzT+^@CcWMW7Lw6&=Sdf{oRw
zuE)!Sb8+aTbEZ06XX)w^cSe;3u^tkJK(bW)xCVqe$nQ89NsVIwso}hX`40XMy#x*V
TXzIVq00000NkvXXu0mjf?gV21

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/database.png b/src/assets/img/files/database.png
deleted file mode 100644
index 5e9fd837ecae4899b59b0e273e682e3893aa2ac1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1416
zcmV;31$X+1P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000F~Nkl<Zcmai#
z1CZ^^7KOh~I+-)JuZ?Hhwr$(C?b2U<wr$(*-m&dtC+Y5&o7AN8_^+yO;=OjS-Ze)U
zV*pS}-z(&dbfx#vSH3NCyI(gRHs06YlclDzL5=FsZm0jksXyHOB@h2ST00mpkoprJ
zwLv=4UU3}xT>zoACNvqVR-1FCMYcB=cgei$8;GCJQf!pjA<x>qPIJTSUc`~($7z%*
z7(<95t{omDz+f=iAS@B|^>*FZvc!}WLV&@g&2^h|+t{!D7VQgJbZ;lYUVwj(6Wrvw
zr!zD<5*Dv=y%M0ckxHqI5EgQ3ZU)(wp|>EAul+W?+jSV|!cb=Y5oZ~G-=i2D8p5wP
zF&OxN-KVY(CGU5OJ8^FO<lra!AL{fiS7Edp9Vlk+G(h`X9>mbt2!5r35r-d!N0FFB
zU<m+BpyPK^4)R;~el0CZ+*$r;0nc)g+lKjjkJI{&htREBDE@R7ry~Q7h4uoJ@1vAP
zD-~fdH1ZYPQ^Rzg8HwJBR~aL_#`@8fy2$G)L8Z#h-ACyTi+5FR^ztr4=f)5iyxjtJ
zZwHnmF@XXdg@P?5g{^(Ivqd`3j$)GTO@vjZNzpXe^b5@0?-<=5dpv#Z-FUOR4BYet
zvZsyghkwXFZv8Um-}5EVnxIsRP{leyp@y#efJp5@Dx!vKXyCE;fb-nqL(gD%beQt=
zHf>?IMr+hTSnT@~bo35V{M|IoTm>o~y4H*`w=D}*uR)I_iJ!y(Yw_1pY_IL>TfFx<
zVewJ?x`(g?PG<(A4BpiZyp0@#FM9x`)jbY=bp?MXM@==z*9#PiS$4M8@l1fxarZhk
z0P^Z7&4uG*KOY+%qtR%BEzt2OL`K<f{fTP7WZ>c$o;0jqndbN_9s&ZqLWPyLexAOY
zoS-?}iwaa6QL@Vd`Hs(g3}Z~TRI2+J<6uO1&>;dp?0o4bf25ktvHSK<kZl&p{r+#<
z#`lq~gPn14Z+x7=3n$21;Asu1?g1>NG$DYAO(9-EBjDf<vn;O8!|4Hh70@!$!|K8u
z+kc+{hzw3V<({<O;uLzngi$(<N1MdKB3APMg+l}1F!Sr*u`9~l=xGn+cF%YiH-FwE
z$x`GmU-&j@Rj1df?B>C-Q&SWpiIvU{tu<b)$+4T=h{2=dWQ0v^w1dv0$9T!Fzl__O
zq4cM@DD&$4CR3mLAwAE$KSPMP`=mUHK@t%VFI5E`J%5(q$T;dmH`b{kGSXuCgI_0?
zFSGK?37o*7{D8sRUVyeXjE*-srSu98a{{Fm2%?YW<x$#iIL`K0f5U88v~|5mt1`5o
zJ^_KkM&R{yQc^xT9#e!6xUPdE?Ucdc3be*<aoAj6!wHXKx{S55Np+`ycXSB*%n<?|
z#h4WHJs&rd!Dx-+y6o@m?QLx?@3dU|J_rJgF((Se+MHI}F&Gdc$~T?}9Yuz10RnAw
z2+5uWet_dxbhNccqrJAaUU~L2pYo8u|NSpN0kCY_P9`V@LZiq;T*I;u(oO~;^4A))
z!P3yIH#pec$F?1omsg5Ud+OsK8W)dc?e6X&r46Yc4WiCdB-c77Y9u~tt+1tJV`HQC
z>}NgY(UTKbeoRW%rArt2{O7+wXJ;pl<AylM5XX@rPK=E2MaUQ@I!fBYXtp-DicfvY
z6CQl^%HMy$zexb}^z;mT<}+XT_UPF7Ip6mKV~j9{kZ3jHZ~%0Cog77&UpAW!-tv~$
zzvaq5{`PgC9q@rFPyrf(*hGe%wukf@V{AYIHedlFMOp?xDdmN#0WJ^_8`OzSn*Ri~
W)q9NexkBjx0000<MNUMnLSTZpB*2;g

diff --git a/src/assets/img/files/document-64.png b/src/assets/img/files/document-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..0888ebbbd8c668aa57328aa9ff7d347186f45f80
GIT binary patch
literal 4876
zcmV+n6Z7neP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000uxNkl<Zcmd6t
z1&|~+vaml@RpT%&uVER?Y#(`#+4$pw<9kfU%*@Qp%nWAx7|gs3!!tcSO;u99T1ADT
zyJM=i?;UMM<VY%*oiCNCOsQ6h2<alU-&e|GW@d&>8#gjHKcC(8ukZTD?dM;9PI<8$
z4h<DiVn7=(0><`jE0IBYiu?9Vs2hKCSf+0J%%|V;=KuARe|p;AV2tpm5ph40E=nmp
zPmw061`v^5TAK&OtpeObp65}mRCxQFUmsmHGq!d7j7$E1tx*F%YoXB^B5lEyjvz9a
zFd~-;FqKKx^pq%$t|!|&Hubj`ul(@IquE-h#cPMKJ^AAdAeLWAHWOUydFrQK8z2UM
zR;5yZ^K$n*1)d4{=*<zI|4o^FGYizn;28^UmGEdAp~47VYcO2MP|(v{wxh<AE;*Og
ztJmWD9!s@|7@qcNlLX!p0HVZ=9jYa4!*-Vd5!d%UkAZ>Wvoe|Bt=$-)5X0XVhS5n%
zDVoLi6e_Cmmh0#E%x~+=)HP+v;)_PK2Hk9gkf<IpmiHMv3cq!Ur(ALlL!+yg@wPM<
zcBsq3y0Nss=iu#F8$+Rx-90$ayHi9eG)Z8Lp-l=RG5~4t^L*~+kl6?-L6M9Y#0V{M
zq7+(Ste9h1PjJbGDo=gfISl@h@GJ}O`c9<nQKi6WGoZE3i_mHSjx7%U%{MIYg<B)0
zLq#RiLm(P4o`bio0xgP>zJTHI2$!5(=BbZ9i$5OTxqZjkb|YyI4Fy((t_|Se^-=f|
zU$`Y?DpXW6MFNb4$1{L40!Cn@=ri0n9K$d0)JLAd;MiXq-uA7wOVG{Czv=n~zI1!U
zbmURb6bQrs3X}(cBt|d-!+DRP`XMeoah|6<{M6$F-VT@d0Hst4JSbha@L!JMr|ODY
zrihPNa1oo=!FT{fN*Kw(VD%uEuAk*858WBVuQ@(uUZf4XvjObPn=ppIZk{jQ7BbOL
zG%|$*9&FQOgh+dgWexq6!(6s*h9~XX!QlAu0uMsE1iN<aa)T(+jEoHN!S}qI5Byfg
zF<)oW!rPfgEWc_oLTDt07y6fCw_iKOlP=!Q(D4YLQdI?4U3C@BGCn%wzw??Y?_2wN
zn5Y`+*`kek5rtB;7$G!@v5e3g!(X;`lD~h*@d@9l+z)d7qi&!ZRo3i!=0E;?W^nM}
z!XmYxh;Izy3CehJ>tT%mL`E^5G4w1Q;EJ_J_`3&hTOJ-z4hyR;l9Fr6vDj;NZ2Po5
zXJPEv^}B@^r>zoP`MMvvfr9@2p^<0axMz`SQr=>LZMs7ltPvsuE3y*9ALNQP?eLHZ
zJhHyBWp1QRVgcpg?Kr`3V>j~(R9i`_6pl?LFW9wM*>}Q7ARWG=1Ul+zHb77=*Yn~B
zC=((GF66BdjsgiQa!270#qbj?@PY4<^WpYGC4O-0B==5M@PNRxvEx*XRS;uaOmo|E
z&5lXh<X!iB=1Mgl{lJa<??-K?Qfs8aC;gN)ptr|&0}GnXpiBjcH2AG<92ywQLr?iI
zSFW4jZ<}JikoB2ftnsd&?B?F7Di>`Yi`RrTjP~WQDb+c%o2Ue&Ip$k8J<`57G>v--
z8GdyA-Q0HfVSHb8gtu)<3<UlC`Ientxvr5=qqN32!zc?sUQqPKZhz(a$ryfzgD=ML
zw;x>KCEvV<hiqTLvmSp6xokkWE;O{ANsNfA6paxFXAs2L>qzp9$gx~lk@2#O4)xk_
z6Om)Xr&NQ1o#{kG0op(mL8RTYp@9`W9(|RA{I3&d_`8c8Jh{N*-ibw?|FygLk4J6g
z!Q01~C}|ez5r_rFU~HRseXPk?B)Mk$&J)C{bjn^d8lHQeRCvdm9s(GH6K4R8gb_-F
zNMNitpuZZ&{7G~C{lz<7k>e>vBhtL`+xPJFi#PJ1ZQ~p%MR+Iz1zN<aaqt2-FsoXN
zI}uVO&$-r$T}YGr?q{f*eLfvtaG{lE0Kth;pfxIrPz`%n!RTOy!TMn?->|@w9@bjh
z7qT87xpptBM|yee8LQbd8&Zn|m4F8xHXFo%E({uxP_8FoVGPBLpLm&2u7-#;m|Gw0
zJ3WN}&r>ZBp*A>Rx`IzBg^g+AS72-ipz94r274I}C%A0WB2Rw!>CNzV_Dj`}pWZdg
z3!iujrJ68X)%^W8C#Y+&dj9Gh?|sx5GvyFtppfzS^e?9P@O2aPdWLeT#>+1|k%yf+
z%H4;Sc;0(|&tj==YY$>Ip&=W<$6onBj0%V%<5H%M9QOYh-g2M~tt#kx#7H4v*i3TS
zh7wPHWDC5@^}pXYPk$lHiQ|1N)iq;9pKRc<e@U3G!|$g<%ArY4WuOrme!0J54K-7a
zn2q(fdlt#~ibiOdFNe&Q8q6)m8n=@(RfhYr3=QP$@mZt|Q6z+sA=K^RlnyT)4B=r6
z%_@<mKc8WU87|*a=E;vavmM@wuM~G4TI8g$UR#i8BlHBYeLM@kBA@k`sTz)yHD2;p
zPRD?|XB!kVo=si3tjC=Pmn@XlLOnDVB=9|}Muc;AjG#pkHVjcHM3FUuZJi5rf_E3Y
zFo4ABc^-a!ip#cDdGh0r9%HRqwzgLa=9WS>jQ7xpT$*FYNCq)>9iZGW>|Th7dGQbn
zKUt3OJ(YNoV((;?*>c0y5zl!1$y~5=lt!ol!BcSBmJ#+%RGFEtGci-+@N|ts@jFN2
z);O@v@Ex;&QJx!kzE8PykVkK=#nsh$sqi%YLqo+(lGlY$!`7jIJOW0L$Z&5Aea47l
zwia^pks9^L(1SG)zJl4s2K%RKb}_tQ+X#2wH*dYk0HcF>R>uauWACE%5R^5%Wyxd$
zhJyr|&hR4XUJ&fxJKqGS*n4D>fB%ou7>(Uti=@H3R=}mXdL*px^BK(&18bBq+&NKa
z$3uqMKUe4OYi3XuB*}pW>J7s^hs$gn?O|_hi2Dwd2|Q)J;PedxsKBROiR?Oo!llYE
zG)Mqeq$7Oi&Crj2c&!^mp<Wz3X~V(M6>EmAW9VaVX>Hm<T!lB7^;qBIF)?2!Bf>os
zRY0+BD9@q!5MK-!jgGYKD-rHGu*B)>`k5~^m@U=uJ*b76(>4#q<A_E>V*=&2;Ud^Y
zlYD~P1$=4<Ed27hG)cJbq_;mO$P~VZ)YY-zk=Dx17(?Fo*gWWS)9#3ZuQ)VUXL?Cf
zu4#5pRIO3`SciK8W@baOp5os9W#l5m-pLY6mC&Z+jPJ4aq(Kf&R_y9;3@%lR^#JXV
z=nUWCNX&YG+YVcREj!Nm<v>o)MWGCLgtzxh(vlQ5pp~$7B!jQD%@hkI!~XdO`=@J^
z$_<L1VWijR%Ckmz>(_UaRdD~IGHXWij12@-YY}-L#s_l@59Z@6v4Fw>x$}s6sNF%Q
zAjgJJ+YCMI;SZ->%H^s9PlE@yHBI1c7})%LVt<CB7)%2i)sQ<5R&2VHFeJjTer<tE
z&Kc+3-`IoF#=8B?LIY1@C!wK*t=os=wh^yMvlO#giiI56z(*-tSrRs+)wNUL-5@Ol
zv^J@q8C55E6c}mU!HKX~*JKn7XJBG6#EUdH-aXI#M=E5+(5Qv%TwUPo4Fjy|&v4*K
z1JQ<`{Az+<-#KSX=UOGQ@&9*^+`vhzdb$4hN4WXkISwsq3b`D;#R8Geqg*7W!rMkV
z?giSV2?j+9eA9!1tKUmC%|b=nl6UK9hJ%w!6g}apo2Ttco)cqZ_pFoq@jTeJrpWz!
z=P3k=uU)mD(qhA|36TdEo;C)+15aH+tkz3@e%mD1{^oFOj2X&HWr`|`0#NDj$2t}c
z=p>yFFx~D>8<>v)D|Kzl)K$Y-9<sTg@Bey&V&3QAL<J?b9;Pqjab|1)fU`FA^Np+a
z5fpq5PgU?lFp*(&AjetThG~}J{v40KV4c;&GZlV*%OqF-VmG!9(Iyo>8Fg!b?%@G<
zq*bbFYPO8UuGlMwvYdNz9~o_s2KbWX{CdQul|?qL>H*;F&4Xl;#O^0;y%BM49RKT9
z^pGa2Mv7eWkP~^rgHB*!u}WpBf)PPMJG^s%&LNNjuR0%HTX<Um+7`PwWjw`re+FOm
zFp~EvS3;W&Fk%<PQ`Yy`eFDJF6Z;wM%TO*i@RPqhj5Oz;Iz~6*d5XTC9E+tgN&vMS
zywE8Pc(jRfX6y{F1Pg^*1nn-(eihDTyf_SUoIH}V(1a005vCq-ZanLW#Isyv!|Ec9
zdIZU#XD0Bt==3qVl}e>X6h)ojZJQ<@sUoTHIJYwHurUd7){f-exy`BTdkL)pG}6!%
zd^l(G5Y2M>hC#wc1SBWU!v)URGE6sO1a==RSx@K$pP>Aq1|SulgwWLi7GB6_6|07_
zkjR-E`jPn>rG;2$D-0KWww>5Vvz)zc7_$^oinTmfW6KHstQ;-SjqE#I;_6@RBbV_z
z!MmyKJ`Ey?o2yQrtDM_PGJC6sG8D7UrabP#RebPe=h?k~6d6_y=NanD(kzd<Xbm5F
z?E~@b2FP&grXiQpl~Qz)pWl3deFvrqf{oV0mV<YzV%lb?gZG0<g?E2stnT@B!@1Vg
zdbGgPpSXcevSK*T(=Odaleo>!QZ=;eN+B1}*OR5)9>2R|0_o)T;O@&Gz6PjceW-LH
zU<8VJkMV&F-HL$qiWqR2|BDE@tWR$-W4Fb>xOI|`eD!wjxPKNBnOUfF$L={>9wU+p
z@93r55NLJ!RCp^!+<D*1fvi0bY%8TZn^!@#8d0f*2+&)|Sm?y{$!2`kt?XmvXb-~!
zIf?~m;J6|@#9}2R@QVnf!6*D3c7q)wpcA}xe`8yvV0F{tM>4xw+j|6oXOF?!CGb7^
zd$V@7=Sp>UA6&FY<2^Cxnz14ygL#xvHZ`8Ptu;0N=%xdlzGWPx8Xe&gchPAV9w6@E
zZ+Uok$*%tW1)q`Lfc8^kr3}@&W}#e1Yq6klEZcicVy~|pEiyh*WOkv({rgM&^cM&1
zI<RKEhixYh#rFz$iD%rqe}VfCEpo-hYq<CRLmlBQvu&LPx-dYO|2ZMq2HV&V{N-o3
zujtW}53IXR&sA;S7E#uv$A$`t%VWh;_8ida8QVs!NBsJ>$vD*=;P0QXm6O*F0PwAA
z_AtGm<9D+Ou%yAe?RpeO?(DM5QdptV;jL(G>{;E)UhkMC>p*YTY8V*~O;zmSNEj`#
zc15rK^3x{POE#Y{V6{?<TD)fC`az!eq+znEYD29fe600)!`=@vKE`xm0BQf(3hzEy
z4fN%B?`M9_cdx$7Zi1Y2N;?XC&m-9$SR;x6>2KTTO#&l8F&~i4c-(Q{4Cn4#fstk5
z?e%)CLA?>OYSrj1f$z`a(;_O0bbAUKE|seHgkd<0Qp>`NeNL#=G;@nJyB!r;j>}U%
zSIM%wHE6%r`i_HZNp%XalR!QfxZ?}KeTO6rBfE&s%}pPA+go1u@VU9U+kM|}_W(&v
zfhq+a1Y;nd4_H&^b-*3J&!@nrpW(G+oR(ClP&C2@eSJlGdwT2)*XtpTMreWag{<8m
zEzFnMvv=?0bD#5Xm)v&iEw{6b1d<v8Dit2V9ikdH?Di9N=hIv0xT~}9OG{;f07ggF
zP^&d)#PCa%8d@7`6fwf|^a8iucKg&zU;OOL?!WJzU;g2{L6KB=*Z+&cyV&F4!TmPt
zgrTOiSYdI=!qeYhwEK>U$r)~o;a~O=3x5M0#6w^iJx<|4#4tZUZ{5ATRI_S~g}2#e
zV&W+L9aArj;qSZmp6f}M4r%asgl{?C5^D9(9^d~l@M$4%T*3?D-~sCa`j3OR;st?E
zthCDU2cOWl<m<k^KMLN8_x<nxfLm|9%^D#&S~@P_h1P$+kk8`#e-ykG@6nHb6lb1!
z25)`qTWt=t-XO;tynDfww_0l^CTIUBc((?GVaT(d^(>z8jAz)s=ljPSylb^F7$a0F
zb>iBld-!e^!4H4<!#wIykCG^gjOTgB9lVKkX{ka!pJ!@%X6l76_>U_Rc(sgnB>`64
zOLD^vH!K|3zwhQPTX*bQTr8v7>-6-#ZQD!Q*5@2p$5Pj|Ev2_1Y(#eT7cp}$dGT|e
z85cRf1y+C+1Bh!~->P=~*87rx<0Zz(0-SZ$Sv%kQws*c|-P-l1hEeDah(u`L*r=vH
zxF&7p+kojJ=G{jZjgGXs=bk$cyy5k)de7~*-~MYL-v+IlfFmGGv<}p;t<^BOZ<-B|
zNeoZ`R4$h*_VxCz79^YO8GJ}o@DzA}LgA&kple-U**1OatK0?GwwO;zxxBbouQx&<
zaPY0F+YOMwR}-xRjpVv%{zE;h4%C5pZrrL4ysghNeb=U3YlTj~W}3rw8CRDSV_1W<
yc!&#ubWzKUJ3*+fen)pAoyS(BlkvLz9sD<5m$&{S2w`*p0000<MNUMnLSTYP-<v)F

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/document.png b/src/assets/img/files/document.png
deleted file mode 100644
index 6a4bb8ba55a20e85f897e503c0e0e9dc7df23ffb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1409
zcmV-{1%CR8P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000F@Nkl<ZcmaKt
z1C%R47KXp-uIlJb-tf(2=GoTrU~SvBZQJ(l;o7!s@3XDRFzz&}wo{$cC(E1j_ig_F
ze{bD75ylt*;#l7~!Di2s!HeJU?)>k~&F()jxn`JlCyv`bld`V1RpcL@{ji(=UTc&A
z5)2+})&{AhdqFArT>zoACJ~u#wYsPBE~S&RZJz%9Hh;d-!T245<u-SlTIK_f-^sdl
zGt`^i-uo#4df5U@@23sI5z**Kd7tBmV^Ro#0k7l<@5r?lkNrlCBg-zHr|_egyKSlQ
z!H4dqGP%l<gW>;%0IiLT<2WybgFJQO7{#1ofe{{`kRNO0Ddq*8Zp1w+H9l~^4NOd|
zve(wL;eWf&uE|2)>^660X2Z6L@`FF14%d3*5JZN%3|IN!eP@`SnxxSQv32%|M4!Ab
zgCnqaBin8mRFL<2)pv*-b(<eu(?}80_TlbhbA04}6}oZ--}=W5h6)N7u<NA_CXV}A
zTj5&6XYFK(4Ku?8VVoN2Lslk6X>}vv_>1^)#J$$^$k(!@3!J;r;lSo8A|n8U5`u;w
z;W!RLfZvU+b6s6xVY$Y})x(&~y|IuY2%sAgEVa1TrjQRma0~gN5l)<3q%bzYr;fI`
z-{u0>mb!fJ&?2|rTINqj=ebdBakHIcY}+(SClM+-BCRSF$ih(=Ob~I`nFjBB*hZ$3
zo?o1Av3jh;#ahTKf0elF#Qf+)gLi-ZB1bMa_}QOl`PgTUQCs#|Tn=cqBQnnh21VrW
zes_{w&gl0)BN@en-0z0C0t%jDW7#3EHH&`Cxdq=+oW0sg+BVFYGYjBI{&8}df*UZk
zR-pS8q(3a=n)p|&ncDvI%JejT(8Wzhf*{gN<Rl|;z#q=HxH{Ki-MHf9r8>hxGrls%
z^@R>CA12F|ifl}?RTjukeC*A=n+x@NCrq+RpK0P)Ct`-}MZ=eVbrre+Pq|HnkA3Y7
zSNwp7-f<1LzUdf0{KG7>iygwK3}idp0>J4JCFnmS+dwTprr~RDvo6n>V{@#CWA1)%
zoaR!8i&yL1`4$!Ka`Osrf5twZ`M_<gsSGC`VsuYHn@qt;Q?@wSMrn6r3ZBEA_l&@7
zgH6MVeVbM?UUC>4QXJeq3Se8hbK@w(<$TX*)~0MsNn>DfQU^NLOq3<7DrMgNynWnq
z*BAhAea3z}mMcms$q|K|<kZDQPM^KO-Yw&FgMo>HOdxAf0!!|>F00Clf)YIMq1&=5
z?{nKVXl-menynDmags@zBl3NO7#z|6Xi;_`jAF)CxRx9s2sKNMF7;M`5W=?a%8e$C
zc8KE$4xd@JmBd<S0-mSvlpJVLT7h*}$SF>oyTL+r$zEHLD5l+s7%D1UnT~SDk2rK(
zFjCYE59RE;%JZ13R;$;pp1+YxctjLMJ=OKgwe~3;Yh?fdL{UtnwXI4gAbpT7<iLjN
zeP7HgilrjjI9$4Px%reQJ@&qT|NCEl0^qo=n@vz3wp8H=r0d`&NVBl*Npc41x<p~X
zY;`Un@;HC~LhbR7d&K=x@-&>;*(y@HFz}~gUF!k#uZ_;!qX*2mQgY?WmG)Df{Md&a
zJ#y&B41}|D=MFyq`7bauG=x%K0)<SVluV#fNP91ZOrdO+6pJOUUA<O&++!bkpTmd#
z{saCk1i<j{@c3sw^M!9$rf0T>VHhROgfWPIH6j~;^g7EzIL^YtLiF0#zT&lq{_(f3
z10^5?T0j%<MPEcFPD=?!5>gkCKrcIh7{Fi{fH;nWB-(%nM16ryU!?m_%obl;$4Rp)
P00000NkvXXu0mjfTs6a?

diff --git a/src/assets/img/files/draw-64.png b/src/assets/img/files/draw-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b827c7c63d7fd2b88f7516b4aa9a143a95c487a
GIT binary patch
literal 3441
zcmV-%4UY1OP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000d*Nkl<ZcmdUz
z1$5h3(}th9l2NupWrk(u|6^umW@ct)W@ct)W@au^3fpW04VW$I&adX!sgF+FINh|H
zzCEw!y8O({MNw5|leLNnM2<-q9UbAqi?5_!Inw*hH=p;Cn_aT}3coxRIOzmx0jp>z
zsAa|yD4O&*v}eEU*|I|ikMg-kzx`*Q%dWmHsw|)sJw9xy$s)w%(ouT5Ah0(Br2VgQ
z978e!dHfTe7Hs5e=U%nRJhVJ9Dk&!*EEzNe4VaFEU<1&=;wIA^yjD4oyans-dJito
zr!RA}>n>~rRI!0!7R{X)?VJDw1rg9h!u_2w=4Z^JSvw#M?Q^Qt`rD%zt34nNwJ<?`
z_(LT2e}v-EQIg`LfoZ~m`Vjhn54NGWX^(^DG<ydg!r8ZbJnL33$2j2E>R^2kK`nqH
zC<s^uG={1mfC{KuPyo>5FxZ(fSQG%q7<ziV=SGQmM>h$`RVwv=`F^lD-ZCN%72iSk
zyczHChY5o!X&O;9*oL41O$)X`<PbNNi{NwY>3t|?-R?20UEbHCnWfU&4jZdztj6u|
z8gKo!ZwjHcWHQM;y*=LLsuXFHt4drMRqX?2g_r$r!W;Q0>Qu=l>uBI&P*6|-D}X2l
zC6UduzZk(EtNg7W!<ra;hf!?U`Fk_W`5Q#QhT0c~nub^cK#55K3j*!%4F_}RO=OS3
zyX6SJf%*;>MN}}NSP=}MSWGI%{z;ELg$HxiEgl=e_s$C6xf?*yS=h9VE%sew9n<!A
zC|E$}u?WWD--tK*QAm`?rUPu?fGPqQz#<qFRf{C@>>tmuJNpne-|TU$U2y}#L;L5v
zb^%0OsxA1jk0FUNnXC_?gE$HZ0H8CK$K)6s%dso{P&VD<u{S)t!U_0sMTFU8Oa$*c
zaNvz($3G5EiHz3(bwI!v#R4D*f=URIXWx-LJChG(<28#3UIDuA05L9=I<W6ec%z>{
zoFZAz2kS7?^UapGfDob-*gKMAyBon@xrpFVl+JSRagTen?f)TOuApyv+Xu)Gf0)$J
zN5LtP_5w5%1O+3<lOTeT0JS~rI|k3gn1)~33oH_NZH`nC;sPP2T%mvY-@p2}Eo&Oz
z8t{WLyj%lZ2XPb=SsachfdKUj>>u*@U*i#MxNLF4TWd+C5~BmX`SXEM+T=d<eoFxm
zfnqu2f=#){ud_cMsFudbW__&hASg6HL7SZrqG2!lk7W6uAHiSxm_-RcGf+?=F5I_2
zZ6n7eeb&i6xprhfDQPs}!2qCGq&W_t2|r!=OCtDHixYmXb<oxE@HoDR8>Y%>*Mu{b
zH_!&IsD@x8_|Ys|nw39O;Q?IDxU{5*x=FQRNw7YkU;zP8!4RTaVDM;`t@;QyUe;{;
zMGvnX&jPN=rD$sbw9&x&iVeXaEqc%ZoCtm_%Qh3iUvUP(YwL^7(gA@oBLNMGET|9G
zDh2_yXtsyJ;Vj#ek6_akk2<3&uXL8HmUsfNfkp;{poBQdJo`sIc4QvT=Bp$46@6z8
zyq@?l<PydbV4L^)2B@`|d;~w?vD14Pn{V`J)-LZo^Wc?^GOEySEZ~FIEynex@AEq|
z5&TUaGjDjIhT75%3V&SM-4w7PSYL6{IS!OP_Vh<DIX7>@>)i0A;os9Z`cI@bh@phR
z5^4gQScOx#gxu=8o>q8OQ1k@nfY=luw797ZgHy`hr4QwtTRx_%$BgpuA7~u<ECqLn
zWnPLzHibA2Ab?L0Y^7BC3lsnP7U_*o!|l2Bw7`RccJ2V97FxzCj+5lzRFb^|5&Uht
zgP+>>8Qg=fU_<{A2KqgcUIOu4$R#5uAZ2kKrMJ+_`lVCoo);5L{^PX3t8zlQiA0u`
z97ouHxWvBx2XOW+9>toabHj&|e<45m0s58=K-Q(6>1R?mQwi7L+a5%PggZiS|5kd6
zJCUlga*1$w|GUtOKYd!@Rkibj$i$&xW)ueI(D0PI`M!5!_3|a4!JKnGtZt{UaTUe%
zdd7nbs5P!8lR1Zimzi1cth$U;2Jtf=W=Z`YU>*A0y_6<@1%+FlT6nY>XU~EA+h6^Y
zmi#(XOE&inu3OoESttTJ_iAsJ-jlr(=i`P0<Z~OznfPiCA_2YL8iI-25ct2tB|$0?
zP_FF2MhQ5j@Y;m$v<v*=K%SPWRljzp4gD`lC*ALt19j$t2XIUeOZ%_tYO6~mdhkmn
zT+c()$FbwsQwcxEV+erz=5Ot$B?VFm=Z|%p8B^;o6Is|pPIdRY=}k4jra%HT(R*6p
z>3kKyE%Ys;T?)x^scOKY$b!LFcD#y#@K-qQ3eXz0Y(GKIt>z8i`1>7@`XLhMy$S8R
zdspyufCn(vD(zOQ3x2%yhrdOB;^TOQB@p`9yu)bjVQAu<dBG=-eu35AUN)>wkv#ai
zuHdyfR_TxcW|8W`p6zA-8|mxsg-{@GxGr-$lDS9CyX~d)Hxfw?OorZENGAC2obaf^
zOq94WbkIV<*S9{0{`4>y4-!5{Qx_oK^G<5cJ5d6}O#>l8Vg(iFqB-Gpj!UsQmGGvz
zg<SdjB(nox18QD@O6u_#3iF2_{umiE0=R%rHFZf>@NFO6CqQIjuC(FUFUe&Cz=cG>
z1h*xTxyebb_Re)5CG8bJAV{QX6z<qHyz0!~6L;q|U?J}F#@~aJN`WIZ0>RDR`J~|O
zwujPRsDnvEN}2F(Og(w??%)Ab=Q{-!<}t&ejJPRqpb@4CGFQzT-rxEVmSz5nn;ihh
zQq3=;<~?p6@St>-IaTl|NHPnK0Vj!2fyp0t4R6Q3hW+2IS<|zFbbcie5-!Ozl6VNA
zJ!c;9dcq{Qvx9@8h{{RB1Nh#hsQ(8faLD!)C?0+ljYg5glKXaq55~SlIQ#|r+->x&
z9srhs)(KYhbI`vBhWpMNz8Sku0NS)%&u6Tjdotnwj=stsq>*ODa)*iWH!wN!2|{-r
zIK7CIMZ^%+uO;bkqbD;#VR;UdSO=jGX{D0e#No=_NtnBz1UxfQyG{TL^M+?_FB9R@
zBF+y`s0>2IrFZEHdbLg%Y#|H-R22l=ToNad23CO$AZf9=rCjG<La}&f(uoUC5?))e
z+YVUR2h2?J5)My1gNpY}mMz<fsf~kw3^p=N2_OPSAdw_UtYoyYnWGcekV@S&f_JV5
z{2b5XCxVv+dcEz*UBGy06~mMNq9?ltFFj1gDdI?gVDW8=TIf;pd#F{GQfaIw;hu+=
z&Vq8i;Zd6IdJ$Am1(5}Nz3uUOfLl_m-IU4kNmQ#q04R{aI9c4tUNS*40g5gdyf%N#
zZxK92PuIDW6S;rx`}~5zgIdLJ1gP41PJz?%Zhz|GYxM@I)<o()0h}@LomYLUN<D&a
zG<?>sS^h8Ab;i0+fGUVAO8C~VTdVE8iU5j$Dyk6p0j}#(sf-?Y%bQ>SjNaZJjTBFS
zc3cD&FTCJ4eDe7Wg+dPB51N$@03nl25d=O{Q_A4r;Ncg&;92+i&wu{4Wu8Z2kVV+`
zf>17(aa~xkd@Z$FeY(ZV<vO9Y6!KYAEn`Qg_}~Aw4!!E-&%gh!T|54sOeUF4MuE7|
zMLg$$L)RX}b%Y=YnJShk7OPCd7qS>fICA7D|NHNjp;x`)1;^n3;5aUwWSBJrix6HF
zL9nV!PE1g*`;<!6$Th5L1n*(YG(20jZX0^lD_?m3T|2k`-gO;jQy7Ls?tBnZKo(i$
zThXeWp7X_WJ3KS+QRSQPZtQta34#Ds?PeDMWN~eEq5?1->kWUpf>GOdf^P%2_<o40
z5|?X?!CD)GmqmEU0hQM8RYYXE^410&;UlhTpGc-uDq@V_IEFUNMFy|5M^(sVQaFyx
zz`wc;K7u9)f;r&<%vD!i#j9TRYKDhLrjuYq02VDgsxxzWczB#GTec3p`js!Z|IP^B
z7&A9`Of$6ke4fvJ?(^K^9(P|dK2h9WtN8;WvZ&7X0HL+~^)G*7!-h><H#|D@vX?yP
zeo^KBz)8xXsYav0cfRv&hK7bRH^2EUpJv2l?F>2SY-0tbdtd;a``xZX5&(r#xlFNC
zqE@dDz4%4Xe!%WsJAMxcAhE*AygC3dfK4Wo=1+h6^N%jP=(5{SOcW7OP|!Ghyz+6t
zE-D`fg-&e`)><0A&(u_rg9rAGyyn#}fBcp$|NR+|JDwgapl#!p!`N7xMw&K2qG`SI
z$}2B==eyqX)-|iwU*h`>nv(cc6I9}F2VGV^{_C;*9^%~)1Obs{_wJqh-~6W6esIf{
zE&l+r9bjAbo2~=3rt5$Y1b}TNzyVw!31k4$>2$VG$gft_B;Ypf00xlQxD^GY8KEt9
z9LJ=wNUIS<6cMqLlT*cdz1{$lZO|G^K+xt!6TI4V9cTc4D*^FNXeGk{w1KvwiG!cO
z#N!E)pmQWbo0g`v&G96}TR&*pwnYV0=q%|pZko=3ok6?mfcW?ByT#6#)R_Js>=Z*)
T5xp!m00000NkvXXu0mjf)^?Gt

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/draw.png b/src/assets/img/files/draw.png
deleted file mode 100644
index f9f2da1eac427eb2839d9b7e174b5780f05c6083..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1097
zcmV-P1h)H$P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000CKNkl<Zcma)*
z1JEo-6otR;>DA2tY}<%!mJ!=d3bAe5Mj^Is+s?ypb3J{tdAnUxQ~Of&y6WusyQj~+
zt3(6<YwdDtWq~nX@s{f@N^dpn;X{_q9yP9*m5^MK)!FgM!G?`L*<kl8U$IsaAXEiH
z^do|&wQflyypI4}f$@Wbxt}cQv88Mi!5>GX+diVuZ?OG28f9b5uJ<r~?g9$gArL_X
zoH=pVh`T4FM-AK982z=Wy%31bj3^DRB=zS3BubxS1D|Ahh=1(HB(}VV$us81;Yb80
zf+JwXsxY*^)*AEoie^kQ69!(tP5!Yz4dycl0z8%Fuc58bTi?s%sj~=+**IM4olA7j
zg@!ryfX$dRapH*Uj|h@};tOP014^>2$ZdgLR)J5MO<2kz>j-xOP=I;z>~SbnUab3n
zRHd{}k{l~aTTq^NACsocS|_->hb!P>Q()4=hau&%Dzq6?VTeBqTcS3&n~4?Y<zfz4
z3!HlAaRIf0x?F^E0c?MP73FQw8$D2g&%u_ea3y(=fjHcO>YP(kG{VNS9=4dLQEx<Y
z>)R`_Okd+%M9@vwA-Ny%C?d&4lqR2z@W1d_L~iM(U;kmnsv*)l-@xQ)vnkc!VduR_
zD#V+6GR!+0KiNp8@f2{G6TyWVoOlleFkcUD!{`YUf7x`}TnS4#<wjABIf78297^>?
zJC$VaHHHLiectX~-44v2XFZIF^z;wpiXt|(wuUCNACTz0o5IWsu<=+3+Al+uy6BsD
z4fTx%ZLLs|Mnu)atH;FZODK=qg`w2JZmOJf{GnG#X3{aZbvr<z0l;;?9-b-xKqCAZ
z8FNDQzK!A-)_nzDYKZpX7suU44x$1eK>a9Y^->ry3F&>I>aONySlgilJWb>H&ttLJ
znhCc|d<PMnXgBmuyb8bn7RC(hfQUkLhT^CtG<x^N=ii-E<HQQY{;@(-P$=1L>F~Ei
zY&!};)G$<-all&cHi`#@@jPWb9Tgw~y7NeYL1Wc~Dj<})SRBKc1bw}I*}wk!v&;80
z7!W|};YeLS>IGpKQZY*q_y~&L-oEnbXPk8SM<2ZNODdH{E2ZN3tveimLZLuMdplYi
z+S)tvM;~?gL2thP%47L_p;D|DQ!ExqCR4HIx@o}*7Kxx%h+?sTsvfnbqqDPk?9qqs
z_vt4eK3g>{0O&2Z+=_SKeOEOEf$}^Ly+#I4SI<4|6g|_Pu3l@s#$0z-cmC)j58LZM
zxEpo16u_`y!$v;-_|q@WU$Ah~Vr7YlsyVG4o#K%xrFC~tcX;mEr(OK%ryoB81V9PM
z0Ruo@)rxqTOlG+6`x8XO0}S8+8c=ZoAXO<!rD9=VV4x330_CUxgFxY5SUmvL82z2Z
P00000NkvXXu0mjf85s{p

diff --git a/src/assets/img/files/eps-64.png b/src/assets/img/files/eps-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..c42492441422918841a03f87313b53a5e27382fb
GIT binary patch
literal 3679
zcmV-l4xsUgP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000gqNkl<Zcmd6t
z1#ly~vWCBw#<3k(W`;w1nVFfHnVFfHnVA_2E;BRJ?p|7Eh9riWk^0$Z?NUV*C9aoK
z@1?7HN1BP@`_<jk8n37-X;b3sB8F3^PI1vimvHv%>7frjVciq&eWNAUojjKpBMStt
z;JWU?X>jip%`7JljLVVjZT<W&j(z6duYKPSAN1%a;=OXkm;#_-h=^c}kg}uzs(LHu
z{LNHV!rOr{hRH^gH@xLt<%Sbqx$It7Z#}qZd1`o^hqC9+LD8Q(MQXy)MwN-t8?$-E
zMplkhPAs{}eLo^gH?(l2i6H<~=O%!HbWDdT+0TrT9}O%(2mINMM*A((iX(=$v(&bK
zg7Q!ArEzqETIner6a{pTc?m`L=%8HyqlRNXV{+TWx#ry-$-1?xFcw_1h58ajKnVbS
zcm)Ael>R)RDrkfqPJt@@u{DN;3x}Uwsbp^(M1Xn+etS`rn?-~ezU2(%@7@i6eLuDV
z^)7U-blnw7QF6gAhgWpOaD)nHE_*}={-LZ{zL?ll6CoT>BiIOD<JSdv6rA_e>qC1M
zEgZdysx}~4=DjBtKvfsQH1MUt{rNqZe}9mQ7)I()TE$8~-vCj>faGAtEC;p1`HMO$
zf7cHDvbn)CEj+}3qS2p<fOmeObFQY!Q~@AuF}(l#d$GGd#E|L0j|eVT44$3^&D6sp
z%VAgH^yY_i)jQ7}J`VfDYKNJ|sUd*GYLX2Mzr6#$y91vY#%h8uz=#3>K2%**e60gt
zR5)?bBiMF_hp=|}|2I5<_MAZlP!LOi|1h;KeAVC`NKaFPp)Y~}?IFv-M#j-C59gBG
zJ%n}h0v=GNj{p%#EPN0CukXR``7qTk{IEq81O)^Gc)%bChIXbLIBz+$>ET>-s|U{$
zcm>r6J1szf&z16z?<U*zVTP=*U|3KO2w((3(VhsX&_dXEM%cgZVQjg12Y$tTfd?gR
z*{yDMEBfZjlEq7x@{ad@l-l1viR}CU6=N73Gq?go6|n*aFoHorp{2r}bB2AZ9?Iq$
zKZy175ngqA0e<}BA49N?04r?cXKyq0LtnwRxlrxfU^Kj&AYed@&_daJ-m-VuL)mnL
z2eN+U{DYsV-OrYfS^Cz@Jx{wiPh5WdtBcCh1*0`X*;b5rz+ebw1lk_<oVDy;*nz*^
z1Lifn_B|Hh=daof!4@o9GW_^_Z<FCdDMhhUUS==?2BqbNF8r<qov`n~uUoYQ3BWNj
zAk)ChH1I<FT1BGvR)P=%z|Uk^jmngHF;Ud2>M05?!1q=kJOZFXvufCTTG+kp5p2A{
zLs;8c`5;s1<rABm0ardqAbr^BqQI4aOTve7q6TC&1%g$r;yn05K|vtg?9`JR!~Rpk
z-gQr4aUl$U?$Mm7)=_0ZQ~FTE62<Lp-}_)1#){%w4Hn$wfz)qsA6#cl5*{>>16gfE
z!c4%op(q7k0@_nRK)j<Ivg|)&*thm!Y`w`tssHrdj2!wYroMo=TMQfK9#AECZ|)lB
zsWxtoN;W%uq8rSdW2yii3J>0e_!F<Vg_eWoEeASH&eoegh;=I$aN1^QrQY=`1RSOU
zY69H%#x5&SlObplKJX?|z$pal3E+CEWqZAScVpAcIK1@{Ty%>IO^z^Ei+}+%0;dP7
z(L5TXX?X1o!sP)4C`-U8vcz(<sBrwEM{@CPLVK%l#jd(WIj>RpN6=ou_0Kand~BJI
zE;@z6DR}{QvEhKLaPpEzvhDWWUEQK9a@Et}o`mkreK>l+4g{Zy03RkI;1u!_7&RQG
z!nund$(8TafnOHE4;%%F3Lk)An()>bTBCCz0%nERK~q2g=M*y{9L_Tump+oK-}xb|
znGRk9%%I@TEA8B)3L-+KVu<q{g|blc(qoN5GNBLcBVoJ`V$1~3peY~#nc-;LFuv{K
zT<flBcnN3&g}Zp+tmG`bRgIx8cnjLUE%60YM96bbb9u??>kO0cQ6_de)bydFyMPB(
z0&p5WeHW0dO5d!7V`p+2mpqhf-982XzbkTi?yy@dYpya1rGmiGT@9N1OX#gKDzuGb
z^X<l1xTZ?6*7M)plem_mMEM_505kwj2d|org6#CcR+y>d^zk}Zf70DpxqK<8OTa5L
znb&Cb5t`03wz&$W;+-N^sBO%c*jpm~mGz2M3lo4-y4Q-9&R7gX1jq0LZiasHlh8tz
zMLB-e&BKQ}z5Nm=0-A<bO^172*u*KtuxHV_Dz2%V-P30AWmW3yEK(I*0V+MQ)Nt_Y
zZH_L;X`b*Pf&w0h)4-*3K88=Hzzcq|AA%L{U%&Rb^-AU26R0HN0b%fadY&uU21|XR
zrMcH}@;7ZpHdd%Eu?(%SOziEY0bD44n><<PT5S<D{taFt_~<U60eyP-nI4IK_j}(b
zG(nzgUS-?w^P#ab6y=f>JQ{&(`koF#)0HgVG6V*ihf2y*%H*+v+NGA^O_p=JOZtix
zg|haVHI`p>nDLzjJ9jj}P9Fgw1(+Q^wHdnIZEr(dye21_0XzXuZyXEYV*$KUj&#F+
z2yJ>M_LrcB@qHyrFHuI;Tc`@Y2(R~rLR)c#;uJ_ULeBSKRa5Y>I>ct2^91+!jsxh7
z@EWQz;58gI@^)JpTH6i(jMhm{>x9QtgvNePG3n{1L4BpAEEKPCQ41^WJa~<dfjtGU
zI&&jrfJBp{Gr@<-J)L`S3SNblcP!jm0V9m>FBv~u(kvb0M@r5gDUhl#y2Vnu@Uwcb
z3v;JE=n(c{J_|gvHA19qpdTvL0}65IdjO}nQO}~aLugAGyU4O`VGS{$Ug;J^a%F6z
z#nc2>L=n(~6i<3jpg<a)-YhM^oZwaQ8loXCR7G2<Z8p@$GF(f^h78L#RHufxQ|gNi
z!>cT(ce_3u5FioI)NN3i89ppbT7VS1B;bP)1c){+sL=8yYc3js3Y`60!NDIFNY-z9
zKr6~6_o*_vDr3<_mJ|PWI0?#w;yqvpkrnL*byj#Kx(&=MfCvNy(ho32L(!6H?$PQ%
z$GX+O0=aVbKaPAtkxKZRcFT8Gz32+S!c7)a7u@9ZDG*1O62{?HM+_g12{R;32Y7lL
z7pCCt+%vqvP+yeMKIa)f>>&d$!NnL(?{ZKoBg=)cwT3bWF@OamDt;b<(D6=CQ}EHk
z4=ez)!S_NrRBso)B)K{kuCG7~&h2)z#uYCC#CcE)=MO38kCgZV7H+V3g`%bS3Ew&P
z;QLP01V#Csf)CORSOXO8g}Ef*L*9ew9W{h1S;cbVXK?&y4azoP!xvWwKrO?cKAj`B
zz&ohaEjz#A`RBKqI0qO)*azU?(RMh357Cj@45gzVklBB(@*eQu<J%KLKB=LTlc`}F
zL;&9euRREXq6z911&~nuQcs7KRN(_fWAH(5gEAvL5LPsRO+5lC(Yg5V=>J{RN=KES
zNH{cHM@hg(yRv}=h!jo!P#LOp1Qi#mXyp@)jYj7a4@@H=6wnwx&i_FpAj*JQ;Jqp?
z)PO`J#IR9Fd+;PeJIZ|`0bu5pk2XZXXAvO8mq-#`;~Ee*C@JVD71BR|#L%foo*BO1
zvFf0W5HRrX^PwG0!20+}ZtBtZ%;64Uo-zf9;rmCgltqd6imDFU3Ja2k51m?%D$e(5
zA|VKqnv)K96p#eAl7?5M-Of>ztYYzg00A`qH-_&6x)PV?Xx4ELK8DqJg(Zwr;U0sh
z4J`}QyU+(j@V*P*%4z2Xt5+}kduHuv?7)41q9SSd)+DQLc5mdGH$udsiCtJ?w-y($
zXdb~#S%eS{t}Li6UrW(!03d)0y@*tbqQqvFe0=io6QA(tC!INS25W6BfF^H&l7I(A
zT}gGtMp(Tyd{JiJn-hx^jb|=qVJ<*X6f7JYX0$#;(Qeaj7vy<?h*0aCE6b8|XD8UZ
zZ{P9fJ@;w%*#3{d?_e6sG?@Z2`~SUlIg~jHz@R@-N1zG8QX3mVn3$X-%V5R&Wwcs3
zdAne;(ZV^;SVt7~%E^=G_{a7gCtmiF=iF=euK)ag@ZDe_NW+Km|0z5Qh;Zo80WvET
zh2#8qgYn4=@Cz0UW36!P_$jt`;9vgI%i(`X+At_g<MR|AR6S?Up6!M^6CLobdw&7m
zm=650F8t0DFYCbX`tN^!L1crq!t)V+N?}!6?ShGk<{aSDDKIbLmC)4z-3Y+V5gx!~
znWgKI%{%zG4@QKsvAMwmnD2b&yZqxH+q)uQjG#I{;gzYMU#|^e?cCr2%pLD|2d;Ik
zYx1_Yy$un$5Dhy2;8BIp-r}6=RQuC&f(J14nu=#X``JA1agXbcG1ksI`2Nv(kM~NW
z(WcYe%n3d&f_&s7AK?ynxPz8u>5Vb-4&JLWIoY6At8wDwsS_`H;WO^jgO}JD&@zDV
zBJ`KP{N=fW2loH%(#x)VtMTy(1kk9BO^xHeUy1)N2J4xo1PKCr?<w+<JTFl7XI}b}
z=RUsE<op>}2>^IN!?8cc1Fk=gu4^CM^u!nfxc0TLeU-Pp{atTeziz|Tin0g~h&0|A
zB4G^SkXZQ`nDojMMO;xjT<PRL|M};^H@@N3@7=Lu#~*=O1nmMaB~bLd4YYuE&x_u5
z9|V9(Pk=fg)oOKkY;<&uqC-HYVClPJ1PmYuCLMwZ!2~2e7gP&>uJMJShUmn^_;|aW
z7eLmBkKDxq^x&I4Zv#0{^aUV@fFXeP!AzLPP7p8xkH!&rbS{QYpYssXb(&DuSd2)J
x5FsH2k|yzd76=*eJq9sN&V%Vp;tlv7{0}xne|NiVZr=a^002ovPDHLkV1j(m^&<cP

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/eps.png b/src/assets/img/files/eps.png
deleted file mode 100644
index 99b23525c77ca59133f890b207b6a27c6d325646..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1242
zcmV<01SR{4P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000D`Nkl<Zcmai!
z1F$4b7KOj8%Bt4v^z_@OwQbwBZJWWhZ6mbyZfL#x+cw8D&qkxVD)ZiljHsyJx8rpA
zJDI0$rBzh`yq9Ng>+UwS`S(8m(fX6}KfUyhV|(^>hw8h-jFrZHlH|58Jm;aWc=y?e
zB%mlz`2!SDY+~ahNn-yAuxqfb+xGjzze(I^<#Si_jyqh1?6>r;&B!+T%-!+v+~svY
z;C6So-Gc_b?mJaMRS9e*FoLCuVj|;4I(r`!MdnIti~&eV8fme3CCORurIsH>MrwGs
z!PIRZ&s|^p112UX$$C9*u?&c)_1@QwiLh5*y&qd^(J`yoGv7};p2m#aih^x;^NEZ;
z?>mf*O;8L6D8S8)zC5NZ``jl!fP39#V(gc%y<^hWDHv-ZcEF*|liBmQZ!kVFhRX$$
zHcGguz)ROWLsbI2;$Z*x@jH+jeUhC%M&3+Ov&n(hgW=9E=GIFG=+0h&qEJ2;MpzxW
zh?3s+UeMT!ss{xP!gfXyWT>Xs^GI)lxv^(Zzu((v|K(kH$pM2gWxSx^!^3#lk>U%7
zefuwo?)n(i_X(xDvI7TFz*@J@%-x^J<cq&gXE;x$jySOa3m~8Z5{IpK;LVN{XF#ER
z2i39?8-|iIf9J<@_t$@y@$nG`hmL`X0JAF<a7{3=!L2F|#dIRvic&am-rxlcTE<u!
zTzTO#)JEmr@A@WV+pXyGqWaw+K%NV&C)a7VEz^JKBMrm8`z7>FD;O4vb0DIqgc*b%
zyRxSiFXTRVxYNl`xy^0K@*%_t3L#?+QOMqiI5G^^J@I%<f8J5_ge+Hb56*{sEu}#K
zsKI{a$3I6^mp3*B1u6+4OPqjF$a5u~j2SKn*@mZa7t6|=qjS%MV`up=0}m2LA5;m+
zdM~JkQ(+Uf&MRsRxrg>0V$%AyMk8z^!p8=eL+*AJ3_|N7s#F~;p~~JiVN31}svvEM
z>k<3^mN6VE_j+ZW=ItYhLOeqczB+^I$A?x8%2$IZ<W5mFNM@KirJ&yr-Ln7x1zwaZ
z{*jYqA<8fV4Gd9Ae02uZh$PGa1&R&GmjsEx1Ix!eP7KZq8in>00aeN_s#a-G<`0M$
zvi<-e3NT?;g@6woQ-VW#I>h@jB4Z3`nvmGIVt}H74rznru8%-5#Ihr>3W;cdYET)s
zcx-bIDxM@wSzK6Hn3+C2SF0shP^d0oMNT?;d+zj+UlRa<B-N!^rM%x2jwFewrzr{?
zJ2usQ*E`?x+KVr~U<Sa(aZFLTN)HEsh@e`9Dy1YC8lczhk_~#??e6zr|NaB(?|Azg
zUw*~qm!3c<?EL%!<KttXm6)y%rLqiE1O^dLY%Nn$Q~h_n^Ubf?hX0>R+56u2KK$^9
zKjI}Xc_qDmzY3_DRNAm=0L^BLYp%X({WG8W#LF+c^x`T!7_6+U@ZR^nr`v9iTzH$?
z-tL~oc3!G#R52PHj1tTw9G6>TqG)+}*?so2pZM&hmt1rea8IBBdO#P*EMV5w*4AJA
z;^#j*Ns^AL#()K4AOcK9)lvZOeZF0Npa~Q~ct8N%0$Lub7#Q@~`2YX_07*qoM6N<$
Eg6N%H{Qv*}

diff --git a/src/assets/img/files/epub-64.png b/src/assets/img/files/epub-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..298d5dcd9bd5947e92c05fbabeea0b66c5d59163
GIT binary patch
literal 3839
zcmV<b4gm3qP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000igNkl<Zcmd6t
z1$5h3x3-@nnUXl2P@8s`%FOf)GyMN$rou2YGhBv6_Zz&-%rMybXs|R`m~xvkCr)fj
zI{V7<S&>plb!gV)tnO|_cHnv6y^qe3tQg?9?+?eYdy7*)?~?3K*(o(6Ulf(CwGmNh
zEoi~d<q#1(Pe@prP21a9v*CCl=eqwfb{0R}wF&v;H~H2^g#e!Cp_EEHj(dsLGFwCv
zR1AwlNA~cqYnGqa;eGWJuBWo108{{~H9_`*Odv?Y2D<8LPA;OcWelT7joG?z+)w{Q
zUAj3ZB8u)I;r~K7D$WTNN7BppD%^x^ugYXnD@5x;BAJL6Kx>WiM?PP?&vm_Lw3ck8
zVv5du2On&Dg|%(3aisk?jsbQ(a9s%^dYnmH)aXWLwl3p}`M=1iV@}1kEwt!f;H3Jw
z$oc5Y5*~yyio&u~M=F(kroO)B_q7(WZ7X7BWQYh_ON-~}U+oPZ1OL&Mmsq>|C609-
z#l^$Z9*$33bX<zA7ev8vgGeTXl-t0xmZe-i?-yuoZADr1gqNP6((|18IvQf4m#_7S
zub0g5vX1Nin&){Vwbn#OqGtsNAT=U1^akJM!>`=_GG88em7>>4GOfS?g&-&hRS!~K
z#v<c2Go^VcSNhJ69zB{w!ltL_@ugqsa1VQtUdvvh-;N*{wo_bJXHdio5IYR~nw>AR
z{?My9x|4K`!YaXsD5y|`pzPCbGn1N@a@pKp_*UUX2#54n00X~vR|)>LZg|h5mm!EK
zQVB((*u(@M{*u|>E_~#q3Dq9~jPpMH#=}0m<Va@}S|siwLWxs#HZitwDHqNB`EMOw
zx{V3(`zk;HziLMrzNmAgGN#Byk)TopODS|mBj=v7gzrorUhuJo#lz?Lc<W0+*%x)$
zc@a>m1PWMX5fqfqi=vqG;p>*LXzI@mLwKsUfM~ESo6fGoyuayXzS{pP1uqx$yw;$U
z1mIRg1QEej3b)gTulY6RPa1~sB1qT+@d9jUdz*c`kEIWKEA4gr{)Sw!BXHhzDLV}$
z2t`n(5QW#?z*(s!%$@MF!_xWq4u}ZwtB;Q4&ij7SzT%fh{enZW^-z0`L{hMv%7tSB
zL6iaw#bXVekyyg)@%@KaN&!~cA@nx`e}WPcR{_(%Q^%Z3>PIQ`FYegqBpgo=go>dQ
z2-pgo;|-i<4IKW!k)0emzKv0h=g^Qn4ba~Rya?5=0>|?nc2Or&32KD$I$rm(BM~5F
zD~cTroH=0UE!J=Q5pRF_9EIc-MvfTACF7pvw1znddgz@;DmW_k0@)gyx|#&Zq!oZW
zuHZQ0XM$Wbp&ck3Y2b8w33Db49R7bke-tPC70Eh>!_H^CyXi67j;;b_4JCYdESQiO
z0csP}*V-slxSI<_2;jvlm;ITkrOcZ+ICw^E!?tZigA$v=T^o4k>qlujvJ$1NA%&Ol
zz3~;Gbr@a=-YJXVxMk-p%pxbVlm(Lq1OEszVk?$qAv)|&@I~nKMcDWlyN;|vVGR*{
zA6p<4pagEh@xz6LrBGc>jLj}%(X^i%IQ(Zme7*0yWgGA?&}9)084*gAfU<@NJ{<7^
zi1>lIiz7I0Ig$xQvb3=ov5X653>^Nyqwv~*h#*?`*xRd;2)PZsz2R}%4hNMmXn5&S
z08+IDO#eeFsmfd0hGkqlYw+-v9Xju6O<lT`S!XOEW4EBSF1LiKgoC~aZ>@ivU58hq
zum%T@gj?gd3J~3WM+nb@OiEEJElh1%#-($9p4NfFfBGnr4V@PufX${xa@qK&xbWPk
zSbX*)r0u4%2m+!BpbwQqSXUCkTpb1qFMVnO6B^P<$kM{}k;}P!-XP)YxAt&e2hNY=
z@`=xKPUAIr8YYeTabJkX$=J<kF)g71vC5V3l`q1fm4MZMc<AFCpat<mDNVv@U}o!b
zu9`nU_^m(Uzt%pA&ie2tIA7;Gf5ij?@0k~XNvHlei_U%!OV{?C6U63V#|GZ~@(B(c
z-+;pEAH0|bkSceC6dGlD6xvfvZTS_y=Y9Cr{==`^8ai(q=Me&Dv*}S>G4UDBX$s)O
zZ&nJ&DYCn54}~rlJFOtHd=*hNWLv4LsYmD^JYhchQuy<YIoiA0X-J&SPh5SaKjDq>
z0jz<*2hN8*AHrXL68N`1ewj6UULut(2EasG=KRqYa`n^~s7aiP)?UBh&HJiPf**c%
zl>hi%zTLGFZA~o=B<w{0;nx~?J6iU}`AN@kZXe(gg>+w$H0QM%c>A;-@JcBZRyFuA
zOSL%wjq`>anLl~qZ`Y+8+6Czc{QL1e-v{{ByI&$%S44CfULx?<Oe;C>!%GNnDU1Dw
zcCzchI+U`iI8TJ5%A>Jj(FHg&pD+GEYkg+lX8ZT~&oz&r>mogmaXvGOD<?h6xy@Ji
z4*yXJ-Z+m6SB9qSubFP(brjxa@4;>S<9m;xYL9UJ+!r{#d1fF`uka#4PA2Rfjg9pe
zDAbO+x=f@3Vun<OS8Uk+A^*8L3U8eEg0ep;{F@)W#Hy0><(?0n_k8C^U%=HTg@2rb
z?uWq!>c3Y%N!y{dD6AOx80)JEKpeaoxvt}^`1}uWYqtbtuQdijeCJ!aa`JPP@F<GK
zJa2sXT~@dG&es(|hdu9U&v*U;-}x7*je-9MAO3*z0g0pyVzck)I^N&#GOpKUI4j|$
z`&=Id5aQs&gQAnivG!xx0YJ}%PO_Dz%p|l{6<gYTA;-bOY7(^tL@Ohl1h8XEWj`YZ
z{(uj^!gt=l8?l3&D;z|W6Ysp3=yL^##KD`^5bA52n0EG0VoBPp+{ytKyN`Uv8=pVL
z(T*MA-X8OP*=DYr`xK`)EC?V)1kdz*ob!7QM4V69Wx-4&6E(~{@5f2m^@vDMc$1{c
zb~xVu_`A13*)JHojM-=0gpy>Br?ZG+%fS`A`NfkQ$?c46W&{yUOa1v=HT8L4g!y=$
z%h)j&a&5`^WDNWYAHG;}-ZCpzf}F52Tt4G2rl0k5xSj?o;X%s(q@QzuNIbj*p-I{q
z7M*vyFT#x|NuhPPghebiAAFBDK6{d*xm`W>_PQj(i1WE}>a#2wdyDV<^Ht#A58%ZE
zkr4i}nRhVv{H1uV0_hz-YNv_52>|i%p{hcnB*OW3Fz3u0u}GO#pnEg3<-mLV@29>9
z9py?e-(Q0DMHtIP6Cd>9PwyT6-N!gkD8bukZQwoQybnL`{AB^WoD5!0z9q5-2p?)H
znuMM9oxGhnXWfV*g+8GjHXm5wi|~}+4!gpIOZ1_o=w9LX7o!uNfwz75Sw8&OzQYf!
z1^V^GMuK)&?29n>tY|w(cROs_w}Ss!^HjMKRF7+R1^nN?<HHxq6Q0(XFz_=601thw
zfDj1j&*Q4F5*ClYjd^F^fJM^G)L}bp+PlJExIFEPunUDcDZCvzZ+gD${QPkPfEOX|
zT42R5g8KigPAI#yc*5<>JLg6$DbER}e*ufHOCqd#nj;;i9U}05_x5A#%bT+ILg$k{
z{1pR*j{%PrKo}T2kxEFGDq(_O3FqE`>Sbd5dd~{}Yo#wj`z~xNY2Z!ShZA1t{A?e7
z{J`ML^bv+?pAS$B#b<JaWFo@_lWs=@KG^s=o-TqI08xPm|GiQ%`|M@B@xgZk=ab2B
zCn;Kjmb$`+UoZ%G!9-s_BP2ax2mYY4JSX@f+=l3q2(RJl=&sLV<L>XVY3FJR?y>F(
z55cVP(p)*mho3Mg_>e=)2~~X^FnD;xK$fo#7fimD`D05HV+!pF64^Mp91Hgo8a%Db
z&Ij<z2MHf8-Az=l03@0Q|CCmX4%*?u$>mCTf8Fc2-R(ekmT>+EoL@K;@Fr`maa<Qq
zdsxcq`-h~4?)iMVq%WF!E27~?CyIcW39sb*okI*S6pIeFZE2;Hp!&KU9^yyTX4%X|
z({5#v4_IC&=-|BP3YL_d_u(h{@ZQkD7m7s+g(8-vzB*+@_HZhh?E5-k$RAOgi7^mi
zVtGy|<Q?!b0sNxL%hCOUFB_^*n17%Y%6yOOy10%*DrK*$&(=J*_S5ybOeS@*77$Dx
za(GU-L|#1o7MikWu<O9*oOjw>rkrzCzu-O3Bb%+EwzdY(^?aut9LGf|<pU>ieDDJY
zbF_D~Z*-je?b%aK|LDsv-eKm9iLp0DgK`n!%v>)21JBiG4n2GnMxm4fB*?B0L?7Wh
zyE;iFZO%ILG#}I>m+K<eRX}U;1xW+K?%n%n+r4+wj_q6TxaY2$-k3LU5g&j2ewCGA
z1m>HC54Xfx>wdwD2>bW%Ln*;^H616yi|&TswsrHJKKz@rXU`4ctL_CPh@pp%zi;1X
zcqp$E+K(TnSS*t3%+q-y{GR>Y@b}$w%Nw(1&yiKDJ|S)-VrKvW7(VdfY%f9o7YYuY
zo%yQpt5>ZA7}yPwVFw@j5=?kn1_vKM2gopnH#b?7Qq<H89KL!53{!Y>F1XZz3>?1N
zQaEHBPVgrC;kwSC;bR35hAF(c3TQ1HJ=Q^2*Wpduww2-iOI`eI-`5sMr;~taz#ERv
zYpuz5<pId&3!B%k|LUIm?!M)1!1CekfF}$UjcNiYz*0)t|MXA)*e;^K0u=*)vUZ8U
z(-Xe3!r~uT_U62n@~*BUm&3NL9Up!8!{;7(=&m)uNE0nUGtdMy0u8_jAPdw086XAN
zp+KQJmT8A%DgO3v|8Dl&c?%y-r_z(Ph=quX+*nX2-2PI1uMkvarS$S%kkENd&%32v
zowT*>-1Tq&`j3D6=YRgEE6q3PFbCm9!Uc*Z@<72HJLWYV6(DI8N|*BD#fuxKO`G28
zdTz=oItf49p6A)x)0Wod5Yb9REG<&XiXh{MlwlD?&&gC_M$gwkDTL_D#vc_HOGyO1
ze*L=K_U+qqfJ8z^A`0)A$VZ|OIj>c;1x(n{Fy|`zt0IR%<#CuRj;q|1j%E`o3LjGi
zae{azv<XpE4i%THoT~<@=--g);+W%jv53uP{2#K_HW^%SXL$es002ovPDHLkV1nOG
Bg_QsR

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/epub.png b/src/assets/img/files/epub.png
deleted file mode 100644
index 9a59fdc029a13d342950e38672dac27edf09190c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1344
zcmV-G1;6@<P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000FCNkl<Zcma)+
z1CV4%8i2p7dS$h3+udusb+&DrYj5D}aGY&xz1vu0rZsN6yZACME8e`AuBlV%|FiJ@
zj5MOrI6??-DrLT0DH<FY@{dp66q-2t%_~w;gko{2WYR%>?zLj5<yDV&)?ECAlu`gF
zrLd*4l=Kn^X5230hYDhblnPLFTHc8gC9|u4<M8UQ+1%S_XHOA}D%uOjxVGmLloVFh
zrA+fhSRnKX>2=_q)&(pkg_r=IF|dXg9Nwer|KR?kpCs;>BN%j`q=x5@@}hHZptzs{
z?Kxn<GQG|;punsD>rHD$G8M<=^f9~iC+<J;IpSg-zt5@RP~{os>aOc4$}j)_;R@hP
zbjHsn-bo_0UAnkE=S?_H5DGdmgrHKxFKYTcg?Tm{EfuCr;dHn_NwVPw>tdNPo?ZMS
zL7%60adX$}aw(8d7aZo|md{gg0G>=Gcx3K7Y$gtIe(i?{dn+}>%!1nnY-#L81%9u?
zxgP~*T+t93=91=2cuK<`Jp6U0mcE3^KC#p~mo?l>$WyLCG6QadvC@dKA2o>wB=MM{
zt7MGpdTyXFKNJ3dhEFbj37;p3$5F+c?ld#?SuStXMttQ~B<k!MSVj%Q3?q}0&f+m%
zdj5?R6=cHiKcwNOEcm7MH<0UX;kQqIgqfwkVkY70_B-&q^2x5j=^~HmE_r70_sOw=
zPf%Q#4WBr98s2a{jRoTzUwMk?egbI<T!tTqZ~_jj4wKn680xx`!s3dDOAD*_HQa9%
zG|v6cf0N0RU)J!DhJT*M!f}o*Kf!Mw|0Ju?XJ{)Q<?@#6aVQ^?hks0UaUVH>%Iq!*
zcnavKx@f~R&4m8aFK{xy^dJ+*zk(7;2CCjgOVJD2+FRyNPu|S(-V?N!k8yeH^%#Ws
z>*HVM;n}Y<*!UW*==xN41Zg3#^QSkGf=C@@kscP-?&t8yzf+TQ1z}yxmWnIM-!13T
zmQPsl=`Zt;h6jAP)D)cyN+6X)09Z^6tXiDuXB0X9O0H_Vjo&@-DP|V`PBQUnuI;*&
zfx0)5l5vzN_{-Fnd2r_I1U3A+-s`C^z8opdgArH;v_Js1A(TpcL9V}sYdUV@H&dTx
z=F~s=b@I~;_ufj-Q^KDoHT;l<`!&2@7r*qXG#qKSD%c%`6@joWnQx0pUZ95Sx^LxI
z6QAbriF^5F;xmNZ^-RruFP#>K2d<~-Y`9b)uypJQlt7XFa7m?&1gjb8yM<po^cfBv
zzZYrVtLstB$l&K`D$9af|I;#=N~JM&1nGn9hs#QrHd4dr;4S?8fzPtCG0(`*XJ{_J
z+J=Jyfk<<ZrX&`RF9<v<*b$(F1<iiA&O{Qb=EWD>MKr!iVWhz>C}zsU<#OQhc!?(x
zY;A4LtgWqo=;-mK<Ck98kD-*^rewi0?~<^;h>))+!}C}?#{PbaoLnawJTp7D@Qzo!
zbmZ^vegDUJ`<q{eLHf^@iT?!8+IG%KFDu^~zG1`v`kwcFjIVzA9smpgtPG(~GKb30
z>}@HQkW#X)J>S~deP<djgvcNmd3j;+!yo=+y|-`RUV&&brJ4Sdu(lEhJQo?BTSF|b
ztnB>yS3m#y*S`A2W3PY)AOS>yT_A1%;^i-Y$<pgy_xg8+!;#4D?yeD!$Bkq%=`>B#
zq4RAU(pzFhEc6mepK5t|DKRne=$;i5rnQlFu>S)3nCH}5O)g3R0000<MNUMnLSTYC
C$E)}N

diff --git a/src/assets/img/files/flash-64.png b/src/assets/img/files/flash-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..01d28e03e1518599aacbca5885c7bfebade1c47d
GIT binary patch
literal 3752
zcmV;Z4p;GsP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000heNkl<Zcmd3p
z1#BZr7DdmiZd1s~B>BwD%*+hQd}c<`@`@RjnVFfHnL)gQW!_=7-Enu--B3wR%bCgN
zxl*NG%;&sUmfIw;d_?(vGsnh_8#(Oo!`ZTVbM@^P9s9&phwpp(jxDWxY`B7#C?xW@
z$K?YI)cEgTH`tor{!?GtvHfEYzWp8Fzx&B22thnMQT!WA%nav@<+7{*NtbvZE|6q^
zSd4RyR;R<O-|(hl&tHA}sB0#xcZH6pk$ZAMH-y=x`8A_3yTnZ4v4NEJX_aK(<2iI>
zZ<<NEe*gP!e_!>GgEHlXD?<QC&rE>8W}|8){fTq-gB1(#KD@Nuo_SqgIp*k^!+rJB
zZ2j^_nfdQ_8rdAQqg#j>ALw|^u0T5kT6uw*6*e^z>esI3{QDnZ-+lMOIVf5g$_r!$
z>H&!G0s~|s{vRU*Dq#!MV=vZ;b2OU+FRfJ4H>^ZJV;24od0rfBW-N(w%*bec=DoDP
z`f;k;J%b(S=0=f2UNA2qivqfyZZl>5P=Z}E&3X6T#a?5pC`Vd$gd=JRwgj*8^VIuv
zd<Zle)xV84hmMofrYC6#fl?Zhn$RD<{e}0CeeV+t1kZ2^Mct?v5SJM^uwd9kjqS7W
z)hnhr<K8=-F+6?Yq5Ke)9%=@`ho<+wF0oVqyGn!)M*A!8VdjS)XFvtbs!^CDF^I9a
z2MDVwtQkn~m)*eW_uRqW&m120g;xn!u`V5r*dehp0p-qr?cH>LG~0RQH0y@X!I=m$
z5_%FuKAN(=o{(K~11H^eJNvxA@Uf273IzyUvH<_p1^5OzV|DNz3<2PPz=8w|Vy2Pu
zza(M%MK^Nn?YHeF@POz)0cJ+Om`mu+!GG!9%>4M1^PL~9L69xN8}vw!AgiYQM+sZb
zzmcPExs82S?IxX<O4z#)VDo2Qv_AWu+0K88M(8ry00jdla4eDFf@lp@_-F3eaQ2NH
zF}*v%gIGT4C6`=6j4ukt#>aW{yWWR=^)qDO{v-|GrP(li0R|Yo62K%{jS7Fy64swL
z#o;&H#(v|wA-vRIzz=`;LwYkdIhkz!@Vi{&SKp!9Dj2Cbd>0IX1U(YW0<E+<3-4He
z_7sO*vwOlzV!5OfwJI^4!t?lkBTo$e{(GZgea27%g&EGku@u5dw30dagmq_3bLdsG
z@DsZ)yy7Yg_|6Td(vy*qiRNSZpSCmD5qZr>jKvrZz`zt})oSydUwhhW4!iO;_MKdX
z0V>0r00Bmn5pR>?3zjat%usv*6T%>hFo6tUv3`1;k4f{c5hF;m&7Jx{A-aW;8l@OX
z2(*T3{G(&6JNFh2zV1%;8XqGVNY7^H#gb^5DJVSV{Z8Oxt^NWA8;;%#I*|t`ilv{y
z4BQ<2NR@wPj!l=}30aK|FMcIk8+9bX%2S3fvm)XWQn?mEP_#Q7aLW|?PF+vlYQwVd
zpk>ZLIy{*6P=e1EuIRiMD2^wX7ul)`|IQs7&YR|_8}DS(`#;RsFMmxsG(<TVPdUAC
z0z#}8_ukqg@@?B0JpU|0lI$8D`Wi@cAC?M`$h`1{Py(3E!*|Ck{5KezFPP?t8*XLa
z@lm#<DWP6RjXKXH>V;pd1ByGL=l@uHK~c{MNea@k@CZspNq|@qA4C=c3t|lOhM%ai
zCUI=LWQwDv=ipai0ElOr*j2&OZZARvAoSY>MGygY3a`aNqHoedffxgFEePm_0N!A{
z%Ep?bec2Sp+;VH_7v3}Nda2`3>h|&iyr4kyHBS#d3Q$=9oglJqfg7*0X)vL<;zmxm
z<JNd#^W2VmX$pd3tq2|;hYt(;(}RykfRX@2r|^W)l(j=C>6KHQdgpEB>-h+>q8JuG
zAnM&qU5yhUfk$}C0>Df0ITZ7|0NW|Nc76m{Dxe71aLT4UVc?o+PP^xJ_8RT~3vZ=q
z`+_0_)aRStOC)Agl7w#XWQ8XH73aV#3c#Zt8Q`S_0n#qv5x@$+1E{5Jtcc3xt2z6g
zJ7?j?`obG4%S_i(oNnxWR1=>I)bjx)EP?E=1si^vk?mb@(1pV|5C8c=MrU(CE>4N?
zqDM#+02UjvQ+V|kKx2>?=Zv*mGa6T{=BzvJX0Nf)r``ED>O~MElXdn!ya^o-DPY9;
zhXmS#UDp00!&Mvy9yEmIu%<FY?gJP|;LDQ$<cnei{J%M~;E^jw;`q<+^*}hw%*-T)
zV`lmcd!l1zW+vf&j$^(X!7?*%n1*M%+s{>(v{h2cil;j|8Yh+=H>7`m7r6Wku!J|)
zqviq!o;!>+mBjpE<<*~g2j`x72BcIiY;=Mkr<Tq-g?>UhVd<Fx{i7W;7PORZsOS_(
z61skZn1xFyNbt~E2+IN%1ho!7wiufG+Y4BW5|?j0>%6_^pK<!>gn(Ay-7q$%Csi~@
zHbPJiKd{EZhu2^#<ekNKG34D&LP(G#n>aZDngwL|><%snj)kwgz|UkE*Wx#JZvWIw
zulJh)gc^LQq*A6cX8~5_N$%PzIu!_0?nf(hG2bj9f=b9iE;~2|?FA4Mpi*FY_zkbb
ze)oqzU`<50^_pw%kzG6Iwd+pbsHzJ-jcIX+abr^O0>r5F2Z<mdn{<u?sDgb!lhSz$
zaL~!6%}%prOaxymhTimsH&FWU>dLwUFX4S|Rm6dpMU1L*fh1^Dc3j!At=G^rnU@CE
z4=T$qD`<u%S(?iLJ_{s0Nf6W;ye(39fs~{g%tF1M&wu^y_!FEHCJO*0B@Gi7UbB^p
zuHAxJM3{o7=T>>(xfNOyN+6XM;Dey0K~Y2i>hP*#4nnoE)F=BA-lk+Of>JM7%mT7W
z&|gS&Ljl!MZ(CSjNm)cOYssHG(Gd_z0bC3~H-u;0L5O-Ady^yN-4B+U0Chi9)hs~J
zBs4*JYHo$SPxT4CfPr;M(OwpfltoA;0OtERS8(D2)ZtB@Qx{;eYpe_y{H{9zyai+t
zlsFXD`$Cv<PysqJ7$T6<AW@azEugTpyjF+z1~9n`IJi)Uw;-5Zz*lKLFy=sps%@d<
z_XH&n(9zu0_F@(QL&-iK0{Jt}_f>r@Fb-ZR)4+xTgy0pZ!=sk91Ps~>;ewZ@+)0Y<
zY-14}@6TD(hQQRcFpxAVihSy`_xsAwr@9i}##(ErHXVC=YbB}ehRt&X7i>*Y8Wn<y
z<!{%)<|#pwfq3Jqw{q)^)2v4!sbako@@V3^$X$Uqlv5ReD!er{0EHw4j5=}pGK%#5
z6=4`n7z4_4X_TW!;Kf%WZ38>E_L!M!>BI?ZZsn^(_nT_)Ce7q&ko+fTsNLK9GkT5z
zm6A2|0?$3r@!Ui6sKQ_<&_d^mnp_V+itwAita8>FePU7$9_?saNabyj`@hRPU&2#l
z2^}kde`gr;xGD!PFacZ!@ISg62uUDWp@fg@E`9_UcFJ>m6RHqe51dDTi)7yiwZNC>
zCHRDCFl-E;A?Wnv0{C-#0wk2_%S0%G8=Apg#P>&Q!HJUBK&ipI;6J$wctvaQW?6**
z{?dY)Tja6a{o)!t73QwRRk>M$R?NQi|H&=Ddq5qY-~tj-6e}LG6rwC^%VTtLMV=u|
zgc5w?oi7U_>*FoJl6(joKB8900u(!4USA~#=LIUEO$aT6p10%-U;f$}y!*_A2O(g>
z=koz6gP@15?Y3X5KNBd;y#%j3IWFLB6s3z@F1A!BJqiax6&}bCL=g}nK^X_!9MnXj
zV)6#<gz$b}0nfb(pMeL1A&SzQY7rSPfUlsc@C4|($Y3x)r>96tVeW43szbqNfFh{b
z+yuz;>K%O2h)BZTM*%OY4EjR`!^nB(o%u+wZI97{Z=vf_Sqq%Lw6y+AjPZ0rI2nBA
zZyOe0-a|TYU^LglPbudLw(8$Y?fp2aVk2w^x)|Ag@rBHsbvBX`!6Lq7_!v7v2+YqP
z+4qwledmqy^Yf3lZChG^R#RZ8z=I;OWA`N&!IhVTcps!vp4R88)Xmt5;^R+@Lw4-g
z#<rPh2K_#RL1Z|LBjDLB({x?O;=&3qzVy<ePk-ve?|JOeM;<?E8q}%_gc^LFgg}ZB
zh7q0o5q16QdQ3@cV<51)x=ODHXPkc~{r-^QAhNpFCnY&9%2rgABS#i_^s&befBB1_
zeBblWJ#){gSA(imcsKu_!kh4W_r5}}4aAsOT3%y$HN)@Rxs|pJ96WTC$Bx5)<x3;@
zIjFY=g_HHo2@k5m!otGH+*elnqb`!+N00Uno`8Si@RyInKlki2|D@8!q`^%HkFDp=
z_Xm-cmGyrMzU~5>5MEKAB}NvI{vCJ|px0|T(aW~k;3+G*5ZJNf-+(s(e*4?s@#v$E
zjYMdgfa>OiFV78IW~XV}e*@kGc<Wo=!tJ-;#*cseV?qeo8g%o)+vn_fn^NN7p=19B
zyo&)bMn3V0PjKg*caG*w+ip5|8<Pkk%G%n1<7b<H3!X9v-gVbqyyY!#(XQ*HX_`$3
zFRHArt}#11%i$wO4}bo1AN@dvCs6hYTMxi}NayC}7WcgJ^266$d&BFNmsj#4lOJh4
zuu{IS1T#hJf|!INLL7FZ=&vgCU;5&wK6w0)^8j!Txe1_d%=6rnoBP+*z#Fm{(*Sqe
zamS56{>jgObkT(u-yFMWZw{)I#Zho`w}X|PFM%2F^Cn#E5~)k!nP;Bd^S$qW<5!PA
z{`h^sYyq7da0f(k9{~M4j(Q}&E?$5svH)9vFf%i=b;tJY=PNo*t{GaaD^19s2?UzD
z3EF7$P_6;$-(m}XbZP`$Sy^5l42BWtIe6a_r2rXzo!ke&ki0Jbhc>wzXa;j@P1zl+
zpHt5LSXnEet83!j)w(zBQViESZz0YFs;zu2jDZLfeaB=?>;Lv^b@3+r4*mso@OFq=
S;F)g#0000<MNUMnLSTY=FD^;|

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/flash.png b/src/assets/img/files/flash.png
deleted file mode 100644
index 11c5570513b1b7fb6fc12ed510628594b35a05bc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1264
zcmV<M1P}X(P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000EHNkl<Zcmaiz
z1CVS<8il{SsIKm3bL^S5ZQHhO+qUfuErM$X$F}G7w%x_6{LjO!$hhm1k&KLUekPIt
z@ZKKby+1W=rNtND{f_qCF8tF|4sP7Eb+xSgaz3DU;G}fx?H+Xgec$~0^Ds-15YSiv
zVIoPB__j1nehY9+K+^ufApf;m?G39p-oSI#C$Vl!XC|Y!-ecvycj0ay`V_~VaPW@9
zPVW^GC<us}1B8$X7rAQtw#|2pB6m&VoCDEv?eW&|w(BUq@n$y8PoW*-RAq+lc2Dm4
zk&m)_?_P$TKK~aE%#?WV+s;KK*W7R;>G%Yj``shtZ)Hn=l6YsEd}+Yk{qMmEZ~Yj%
zckiamG6e9ytPghrl1Ja|&YXU5->z@n>8y0y`V?;WIKIl5ywiQy{qm2qXYVem+!M9i
zz=%AE2sb+WJV$0o&{Rl%`LNqD=G+6L8)hlT+lV1Ioqju_+dYx!=1FF+y#XLt$%w!j
zR(mtHoOUY7rcKB^2sE0>&TVacF1I%Hl)WKqcfB_gkAEKSE$^jY7RWgO>J<cdK_#Oy
zQJPVdCF9@z3d!B?hN`OZQzSj_DJx^P+a-O_y*cCEpJ04xg(Y8+CJ8tP2Ij#eECNG#
zz(=AIlrF+V$UzfHp1?pQYxln^_x{L7*u8rPtJAZ{Mc^F5VVfY@9uddjJ4P|6s45tC
zMIn)!;hPDjk%LPwK18x{yFKs+A7#(JeUw=l%1uC-8|^!dvH#wi=-iyKKAn@c9mSeh
zxVVpxMdm%;6soEoARxK!oQH7c@hAL!{}J*m%W-KEs-zO+CdM%OQ#n`ua+%zVlOEJ2
zFGb%QUPd<B)exvj9LeW@_9G-McRIroSqdOTVZtFYiLuPHVTa>(Pv68puFJ>=6?p-D
z@A1?gRDx!QiyDddwK52W60GA2F!aVoi&>w_x#)KtIz!JHcS#u*c2uDL>kYG-$0V8x
z2>=B3&^SXg5cJL1ZiX)^7FNq+?^PAEYo{Z_sJzI%$1CIjLZTG}8p)}x7<!Kc8RF1Q
z8B>!vd1RD`E3V1dwj-uM6lS4{OhP6CebWO_=sqtPRE7|_V0FpJD#PNsEZ0|!n->d+
zMP+rqtWiY`G(89l<~^N$9|4(ag4)u$b4%&itd34Itg7&JKI$+#N2`^RCUHZ6kq6$0
z+HE%7_0E{Y7^1Y=(m*O<qbWd@r@eU-@<!TfvAD3XFf)DY+}K!30s=&+{i0yg!2>+#
z=iftWR+hqDGQ$6=qLoIBr7cV_IXTsP<ttwNoXak|cm^Pe<CwCn8ci}HC_>`|vM{aQ
zanS4b$cBARIrTJdzVW8@m%r=<PrLf6EB+F4Fh9S*?%lgUAx!YEqy*A1O~T1x=82Pp
zsi~>KD_`-VXC5K{GYuqXpM4fz``Xue@{^xIe=um0G(|#)nnC~*6C1exx@*@z_`&x+
z?aC`I3*<pyWo3oeyyn%tEnBu<vTy%^)624~BsmGETEU50%<6mCor|L7<>l%_AA0YH
zuDJZtYk|{&66gaxAWHzZwzjtZq$fS@QE8fPlN1995Cak58nX!jc<+lN7yuJMIhr0Y
aK!*Xn<p?OA^_xEc0000<MNUMnLSTZ+o^mt*

diff --git a/src/assets/img/files/folder-64.png b/src/assets/img/files/folder-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..2508ab25219f830d7eef6397d2b74e7d2cdfed46
GIT binary patch
literal 1102
zcmV-U1hM;xP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000CPNkl<ZcmeI$
zHIOsQ5y0_(caKho#*Zm7GuyEvGgIow%#oRyneFr?kC`EP%*@PmsNIva)9<!!OE(`g
z&8J`0=GFh|nNdmHonzTBz%altz%altz=~mjVSr(PVSr(PVSrzrHvOr|QNCyDuVfEI
zXQAx+nbT$U;~#x^^$kaTfWMwMeare6?Ah?C$7Xo=v6=Y6AARJ-S96rmon(1s6`j5P
zR!{lHHB)->_fB~F%|~^Bs&e}K_`P^CZd^4XCx5GsaI_wQKb-xvubOoB$8;g|D~<^6
zbmqGJ|9c;J@fX=fU<az`^rN#sCfm*tWZaQY1A7)AMyM*X;_l-BdltZ#w;(6|D0_AX
z$Pa(0-+j$ztEo{ZC$oj{lbhF?f1kMP4Y>JLa@VS9#z&l-bh-jJUlQQsT@vzvU)}t#
zcf4%sQ|+K>j4|?5&{*up{$+Q}9T(QTp#6cT7bvS3X`qs4fauKAFok;d@Z?<V&2=jy
z(J~=Ny~_I}%Eed(RVz(xf`kfLG9`s-EQ6^Qrn+?iB}>NE>e+*tb(X$uOXW#OVHP_<
zmp6cvijyT3QuXYirB((rQj%!^bs^Q#`VI*71{f*9$&rhYvQQNvNPPz=TZ`mLN!7Cl
zGcC8>09?qDC@Hh53~E}K3MtPtfQXQ)XAh=Qn3BSsEQye!o;`$m158N8NS0KER6To8
zA=!YuZ9At5^#)j>dvFKjxdB!LQ=c^z0X+9Rz?78Kvj+?MgbE^(1c><ua7XIdL(BY0
zQ%zq8i7MnM-E?=PMSL=743BGwszS9AAlnTX1c;7mKRh11EsvWZsxnv&)oh=^!KO=e
z=`GDJ?#}NoSbSt9fQMecT1|#p!JZJ23Lr-3Ywv7t2mnE)5S6iJ1E?h1JD^5Qp#TT~
zrWB%#0mQ720HQ(-Ck<dyHf4~ASgx;t2!o?8lt}<O!ZHEL_+R0{b~|(i0fJJH6tGB^
z)DTmad2$5Qq=dmMAR^g5gY`$FT-gAja7lh5Dp^wT!Tl!b1_YB%9BhDy=KE845J0!N
z1IjA-GsJ`}sjO_brAI(b3!EC2a%^mX$jT9DDMg=U8ZlL}B<gAg&EV-PKu4m`P!S<d
zGMG)(2X{cNESnW5dT76La@2P>lp3v(<PL})7mA+Y?$RkMiypzri-3xoi^>w8XvGCE
z0>I2O&)(e&FBmDheJ#tbxjQ))5D}~J_Si^>GtW%l4XY49fK|Ue>Bf`CUcBW^(P;x&
z2B@j9SUml}HQ)HqYd-`$IS2r}8+bV|4vYXsUMipmEC9CyXHf@mcSNKOYy@5ktOs5Q
zi~&j>B2WO&0*?ZB0S~$RViQ0Fux99XvjGYSdGIDexA_X7?@PqpX*417=gH8|0mwoS
UYkc;Fvj6}907*qoM6N<$g21u*+yDRo

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/folder-open-64.png b/src/assets/img/files/folder-open-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..27f7271bd09b40b0a4fc158818b820393d9ee75f
GIT binary patch
literal 1255
zcmV<D1Q`2?P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000E8Nkl<ZcmeFt
zfdBwN2n4Wye~?hZx(Fg@L)cI9E)yU?fB*pt0RjXF5FkK+009C72oO*`)tUv2W62SQ
zzrVWsjb}N`%qR#m2*S)HW(b2Q%$$f7ahOpQF<e9u9bcGcCcNmmoIUQYP|K37-kG=3
zQh!pZs?7D-ethod8&Qvi@ob-3uzhmDWk>qyCth=h=Uy}cAN(Npi0AF*XpCm(ROY_|
zt`x(~w-4`sKZOH`jNv}NAK=cIjUWCmX9~fLD@6Uw_r2}n2)N6!0SQSQ#Gg+W{&E&9
z1g;$QGs8s^kkfGUPN9u(92~%LK!|z+%fA?o*T+zkFKcH>l`I6JR`vFZBx-?4v?w_Z
z02f8TW(h+M?1R?wl_!*N@dONm4H>5=0=jqtQqmBL(-USFQ2?ftO!P!X>7ogk1Pzkt
z33m+_v?27mFW&SO;9)cffx|~8!$awa>232{a%Pt{H-F<T4}a6jFW~w=oH;Iu78@z(
z_D2@<#L4MQv%O3UcRx-gQjys$xZj-y5|Zc&3DKm^x-NjCUm$-rO=J?CA)`s1bzOj)
z|3Xd^>+ly~LbRx}t_xr`%zrVNCE6f&dPB6Rvr;iCzxvqI{th}x8|4E1#C`&F^1rh-
zw*w|a_=P)9VvQ7|f*IXVKl4Um9VC7M&=jzdQd7W?qRaw4F(k=d7bqZvUludgi9u!|
z&=aw^`H)!0O8Mn^1st9nx@GQ}b%LqGzkp=stTQOwa^7Qt0=@Wizr6-*V@<$aCEbIL
zaQE$8{4cCfW<P%W{h#XK&0m0nzh)S=-TnS6mSnNNogt6W3#)U)Z3o|XZ*YidORNeg
zkih7Rl8mq_1#KO;JG?oht)f+PxhUfFg+dH#%K&pbSU?D2D}_~aiv_W}`60&03MF%}
zfI}O$<ysXW5sN!LVNx6-D=6lJ1*DL+eC;nV&z^!rPdJ`Z(5e7WBbEU-O?GCFzO{f1
z06YYf=ng3a0w~ux%Eon*ol)lo-}jS${TR4AK*`$Jo%<u{ki&y+u;8=W?tJJ)n=c-9
zP;@Zc@+x5Ao`Q)U2}X)$GXTLB4PyI=`U`RZ3W{cQi3MT|wQ>Drw15=z)a%p>Cx%`H
z7%?UQP|4HL0%Ei&2!Ofh_ZJ{yvZaj+5D+v~6<{KTeg&iy0Kj3qfDn8s0Flh-6OqDF
zfR7iD6sFkH+-5Mk#9=dr+LSO}z#yNN81O=H%EU~a3h+rV3o^3p<?#aY#HWM9tqTqZ
z6a69<g~Nv;XXg_iFCdm-8dD+9I4o(5Y8<akt(|6HyV|cI5VctLwXR5wejjq-NQ|5<
zdqY!z(cqfzd<i3mdFDhgv2RFN<F;C3?S8~-wO`w`Pv3}n;kc2*e`gwfo#5^7a*wBc
z@&~{8{&aEp&d@(c;_lzx^RkD${N!J^e>O^hq}u~`0FD7ifTJ}Z1_r=@0I1eh>zbEA
zqi$v2C$H2s3d_8#bFJsVE-(eo)qEECr@NmVD?mU5LJfmuoq&xRL(R*+Mp`~+HMatw
z(2l&8_kekg*)mr9Js__=Hv<cI_qKqsR5^`rzLfzqGW*C}0B`16{};x?zX8>{R?x$V
RF~0x+002ovPDHLkV1jS^KRy5e

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/folder-open.png b/src/assets/img/files/folder-open.png
deleted file mode 100644
index bcca6f434e24544fc5238fe07dbc1f7f90d1f46a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 539
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaAeGBjjasB`QKai>2a1}_-JOg6i
zc>yAUVA|mydIiV(cl~bI{H=8Lx4W<ZC(V9Swc@Q`&%MQmKR2xZ+`HrZ)IDFVYA+P5
z{a3K=-|nk_a##J$UHw<5=r|Ao#r=BkCCzzVvg&KY=I=ebe@;I1J89O_q*>1rXFg7v
z`2<KNOn;a#1Bf0~u6R?u^39|pe<vUQyYSGbH77sY)t|F(IPcneHL(9d!t6IWOTQGY
z`tH_p(Y^JeXUFxR2@m6EzsX(#60F+rvu^E&`n4bH*L?)Ks&U)z<_(|PcKvSK{kt86
z{&egCqQ8ARzRleCb>{xBTQB}H6nn4$=tHZLAirP+CRPp(ej!n5X$^hn@Tjc(hW4qm
z7cAYp`OuLgC(eMu`D-_B+`M_~_U+pb9=v$*;`Q5iA3lEl`Pbmzy8S>?W_h|ehEy=#
z?R8FKWfWk2-7A_cdgp({#@@v8p7YF0w(%decVt*y{h;~t(Sy1Ij4jp`wmX<7Sv=D|
zz<cSUxYDE^izoUYl}fd{OwBG&TwwY9mF1!`PvyoBvpBLhe{|>-be!(bBKy8EQ)$D`
zMt`<{qA5KSYFU@f2;8@BmlkXJpUY~2WeN$}O-2DP<apBjlPp+2b~Y&p<fZX3tdHAj
VmD}=ldos|K44$rjF6*2UngDS~8I}M5

diff --git a/src/assets/img/files/folder.png b/src/assets/img/files/folder.png
deleted file mode 100644
index 8479747ef38ee974607555301dbe806e867aff91..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 543
zcmV+)0^t3LP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0005zNkl<ZcmeH|
zGoW2T5QhJmIeYdZwyi2nY`aYtc2ODiUDTzF?WAvG+qTX7?!n}7WA00r?-)DZdP!CB
zFJb(G|AGLYF>Cqd3(wz0T~JBZ%8P~#vSSyHZ+#Gd$rp`0aq0Pzaorn-)-cMr_V7K9
zUwf$vD1MU~Hh8&wdguDzErBqDncQ>xCb_bM01$qY9s3{D`(YIsBNQbHpROB*;kQ-P
zb<UwwRSDGy5%lzu-W*gu(8R%QU)9QmwT0nDk^)cP6klxJbF;3iA|sNXxD_R}^8uLD
zPoRXiACj~zrW1t5L_{nZ8-m~`P!Qe~iV~V2c7lvG1tM_P3jF6L0+C8tOee@%^M)v`
zXAL1u{RGSe0yt;QYbVIr@Ff#9$XY_25PS%PK%}LD@P!lPv*s~WJ7o+bV!sj?VGx0H
zWig$=%H8*ch^$fXMh=aFp`5Y7T{uBTZWKz2Y&ZfW^(z4@n3PLnUUve+#jC=~p~Pi&
z&o)TG47NtEIKivC=dMfbE_n93h$QhVfe1qwh+p5o3^W3%DmwHVQFrS6O;1}lsm*{t
zw;sMqcdeaQ``GrCZ_5NAA^|WlFs3yCf*%@3(PaQzv=q1C5K#*NP2rCMxTmTQ0N`^0
h1ISd9prDn3KLVC_yctCXX_o*1002ovPDHLkV1kk^?$H1M

diff --git a/src/assets/img/files/gif-64.png b/src/assets/img/files/gif-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..2373292b7a5315048e15038a4ee440f6fee833b6
GIT binary patch
literal 4540
zcmV;t5ku~YP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000q#Nkl<Zcmd6t
z1(4jv*0!J1k_MK>_J%o^9A>!8%oJw0%*@Qp%*@Qp%n+z>Vu-z79M~B__xaadGv%)R
zN6xw&-_OU@rB~V>d7h(wTYaPvRi!+X<$o73%*@Pi``g`tx%t`35pTZTllH&gekU)q
zTKVXn6;MzM>I8LojSAK}>TZM$H*S{e{=8AMpUi*u{V#m~&z^M7lW<PCbwUBqZ4wc|
z7@;gm6QHX1w$|NURRvJ`VT_@>*yUYsdROt?k#8JUy-#vZmZ#*^3=eGq3u*;t1uei9
zO3hTMPS-d_k7Dor_9odQ-g5Ts&;IBkl|y^E7G^nwSGscvP|q(~N#b7{BR^+I#0&{*
z-E$Tf)3**wj=^Ax3X>PFMmEBR=?$b&2J;b`fqH1c6`;9Lq{?VAiftMmI`K#@z5B)N
zd%!+KhCMr3??nrXZ9qUnfIhr}04mzw4^b6#8MX#pR0o>K7#fX{=Ojt|_LYo)`V#zQ
zd0reUB7_l11ex&O^>5{~Q=gz?J7jSNd4$Ua&GF6kli=Z_F~(XWoH2Sj7v22=R`0WV
z$Y?7c!hO_XutDGDpVRQ;Sm&tME7z}Tj2)$_iv$rn=UAQqRc(L}hLH%_3V-uk`274Q
z=~dd;BqQDmKlq{u4#5Z%I3|)M_=OQp8()II+XbxJd*|R83Lj_!9ds1|XI;ZuTT^AR
z!~&(^;mua~&2Q!l3!kD}X=3X+Q6BZN!FYJ>!z<&_sE2<{?KCdD^My<Bt9BY*hr;VJ
zU=4I=4FTVjFyfWMzi(;@zWGTOt4-YKR(OL(iofD0uAhVg%NXN~&W!Qc<aEwI^`fO=
z|9=P{>b_cG0u&=LCN;cw%bWOObLq-2!RvTVRBVOs_W=e;C~%DG7$dVIJT^Xq^G>>O
zH-QI~;Uhpq7#30g%D-pRoA`3;({w5e9^R-yjUq^pDDd!hocjD2kC8Ju_rxXmeRq>9
zuR(t(Pe2H7bLHLZ-@=y`K0~`Q52HE889)&c!X!AcjO7zlrpI`+U4lR1qTL7{l=6u0
zeeZiSh{6_3uAbz>@A()XpZ*A+pZ+xMcmb&u81H!?5+q21!!epSs7#IWsQfI>Id(UN
zR~?>!U;N@1gt6C}y`pzs{Z{k+>^m&jCe#a}G(wYL5{U#6^;dpmEBwtPJi2!dXCJ*Z
z?DyOK;J3HjkK;8lgK#}Z?d;@9Ka(G?nrY8r#|q-i;7~v?gOdwbv5aP`sBBz<Up$Ai
zj@-TBHE3bPCw%Ehf|!_Gy~h)7*tnida-uBq@B%PMf`Fx9B40yo(<rBP&*#kkl{X@&
zDvBZuGzg#!U}Xrr@70I*diyIp4f+GlISRF<@Y{<x%O%*Ac)ruD6>$Nb2-iP>0UQ8|
z#nG^9u<M1RHr$cD_P-5(pZgb4Ga@evj1eL+WY!Xi*W|W9wjO6mJL~%xF%-pCZG7UE
z`uJ^R44Jb;KH2^LV*GyYa^F9~pWmNH5DuO^hy&K_hqZPYe5gz2fa-VzVbmPj6kHCX
z0Ky;%xmqS%gWCK!$E-VrM;(1SwqdCzF_ox7vzt*#Dpcbtw%elG*G;dJ|6li(bR6|{
zNguD{KvxKLWl67_zlj6a9Drg=;6Y0~5Ra@*f?6N4)S`v>hJr&u1iKZU29+&!&WO)r
z?b>5WCKI|@3WdQTq^<yKP%-pefm(yxp0))l%QQQtEkY3hm%^8<24iO-On_R@0$c$y
zC~VZyh$g5`)j2&no3l^8fU7&#Gndbi7C9(BvL!A2Z?&q!IW2(?c*`uHPJ#@8s-RZT
z-0x7RqmhhLo33+4^(@Xg@qAy>n(J<0qBe#^LN%)R;RsNTZ*}drjif=%)JdWki8bhx
zu#k07=Z3;-UzE*<F-{2+fK$}sn{`T~I?m|)2xrvK;M`L@d_Pf2ugFN38VU+{&8@2a
zl^!vpe6Ia5{<!cv9^N>Odye0qK_7==odb~_h6jjMg)r0!u7Dzg@v%|HTBDpkdOGLd
z=>o!%R#CD%#Sg_@XaQ>-e`^1ZuP=O_EGzh&{TK(uhf=rWWMq8{xE+NLM*z!40N6qq
ztBf$QIKr6|r*pwwLilYD8z<`HNN#qS1@@}$&DXkL<kPM9V-iDMN0^ss-r9T_&zpEH
zht_XP5oIi-9h@tN*X>$BAq;Dk(Mla=3}-f$;O};R>BEd&WC1?{M$IUnpZ+AD+4M0?
z1WBA=GpIx(OxbDP*nR~U@AYJkA3F)_EF$IbY|jF2*&I-zLUkS<J@F_mx@S4Os*)AE
z#scb;zqkI%=eK+kEd<dRtBT77b&y1LZtiX3+tXj;nA!<ARRke25rE&fTA(Yr3yj*a
zZTykYo$hhk_@kFRe_km(s+e75fjw(`@%^dq@X?v~Vk1lJ5+s7Ksj<Xy%+V9a(ij<I
zvD@_{Xtp_rQ>Y{f<MmO{;PzN%f%P{`GYG2=cXPob9{MoW>^+IY4lis3l;L*)1tN(t
zF7m$Y<=F~{ea2`s%D1Mz&IfONFU}MsNd=o}A6#&mc=$pJp0d}ox!bCHGMmm*F%|wb
z^)H??dl6>ba`fEYdFNptBsb|T7eiNke%&^}v}o;f^5lj!`>$SO5S&t8)hR<Pkda8j
z#$p5i?)`%Uqk~yHa=1T!%fnvyZ}UHVY~6<_az_$Xa1L()wIBv;?mYZC`(MD}wWDcf
zP2$K9xhj@|bpL7M$$~6zf)g<K(CsdSzCS|{dE=Oao)=f*A83Y@!uLJbSZ0BWsrX_1
z>Z@MDf9C(g0rdm<_;H_RQq~|wsV3E-!+wwY9{ghSFZjTQ_t4cYiK&8753K^mfHO*_
z84uq3Aw2GoCvsEsCMt2_&y(hs+-CG{N{Hr#d?AAUgUWDwkHmiR<DW1H=NxN~Is7l<
z+L$Y}SW{ZhBPdF@Zvj=PMm4T$U(YAke~ha-*RWdmWVSQU#echyXCM4L4sRSj)D9!j
z2tV8WQ{H;zTggbN#x-oAh!MnqFE7N=(=Jau@F_fSp9it2yNO<rq9_hUoj?S(7ojn@
zTn0AX247YT-S>X?WqGvQ-2lAgVMeeJiiw!+ZsD`nf0oNyS5lA1umvQh##DQnFW&Ga
z&OYR9ZaaRP&<=<SS2wTby;r@DUYb*hs@VRp$IwrJBd6f82c5z3<0sP0TEtPbtrkFu
zTmlg!s~~DXRDe1K6VwA`7O>WpzGjp%cy-XXfXNN3stsO$#T)tS{NI?UjDg^r3Vs>;
z_l3W+`I=39`p%yM6b$T9pX865|IB-?eJ`{5992{E{Y3~quXJt7J@>sk&pP~BtZS|#
ziIT8J@D}Rj1)0rhUuTfIk~x93iXy1$b{9ehD81E{UHSfry#;zj=C|WAfn+g73N{sN
zCb(4me$|e$abb!Jesc*ow$}Ogg@4%mCtmZ9H?VGgBbA~)=s)-@HdUJK4i_GL5zoH;
zv)H`2nQoqX+YGFf=38}&bq){d3~D1Zc<RJ0ErckK68LQ~ut0}4ryclMZkS!qzi0nL
ztx`j+q5@*X>qKhYIJb^3U;8y4nB9*LU-dCs-401y!xe=6{jkq8=ivuGoI6dPN;~Ti
zMbYqb7{$26e@-Hh1hAkQJcdJeJOQQf{m~&JG)Bge%-;nVua5DYW1qnXulOjxy!qEm
zL=(Y95CBHvF@8VwC;mA77ew&0J*r_JuNU(kr|xqSFFWytY-nyIj^ffX*;^pX{fOwS
z6EqgGRe~4=Cxc0_ycXCVyp+G9##<l{7eZ~SQso85KAS8r`18iUQH!f!KrJ2^qeQj>
z;%9lRReyZY2Z2uB;{3JeaModuVawvQPexTM<%=j)tPTtvfiWQBfd~E{avLa5fJm5u
zvRBl@Yk^MIL4YS8bt$v01+JREhI&#*twI1QB4_}O*GlR#?sxG0xaWR%_1-qdgu|Y4
z3wR8)P!tC?^grkhTcB+A_fof6pf-*~%WHvzy=!~&qEnyAJOB1U{;~OAe(0-&-zm@n
zqOh1Pa@1Z&@W#8poK3CGL?&7`?8`0C&GMy|;T8-Sp{M}@sGvAdU`Or(0OjyOIqWUq
zTcC61drcaZ2Cu%$i#T%fC>DDuZt&|7-vXUMr`6=qw|lsUpXtug$-3b=%XR-Q;9P&!
zi+n>RxbiyS*Oezg`~OPeMf`r+w?I~8zJ<D-wsGos)=5v`ps@q!rD=a%?^|C(FUz>o
zfp_5nhu(|A7Id@j&~uh(p9t$Lag;C?uVN%>FdmQL!pj~OL}4qnfcBe|y{=LW(5Mfy
zK&TUr-sf;$bl0cz*57}CYiF;c8jozN9<xObnLLDdKJYcnbY?MP!t<=y0yFIej^FP%
zetFK<P*tCd%x2-O5Z&=PKuX{NRUDAzxBNtCc5$Bl#`obZ_kTIh{Qk?iX?8tHQX@~B
zJm9bg@WfNjqm{O4r;8qDho2y+QaJy7fIUVhQFL&OVElvXj?MvE{-RO@RQ;D&$#8A;
zTEr6Z+`BxHy~p+;Uu<&pekbs-wfFN^y^}76{dd>`P8~SNUG8mU`|zRvS3Uwl2b8^~
z)j>JD^7jHs9COEmPT-aIeHQ=TbS0-9{Sf@EPADytS89R0WpTLRVuht}0O8w;ETEtY
zBBigW9ZFtiff7BlIM2RgdvS-O4yAAf?X=S$_OcTXQ5CD@@SfRkSGW)YR{Vb6TVTf?
zih8f-Hm4F-Zk<<SD9*Z4c)xW@krz0psOn0W!h)2;uiOH=N(UCmnzkHXl{C#zlsJiS
zt|S2^YryhfW~kCDvB3XUE7sYe@J^Mqmyu>U`|i8Pf8r>bC1QmZP(?+C!vm_0)R)6q
z_)rvK#d_x~U^AS}DQtqZ1t5dfFE|fRo)<)MMAqtTe9{vydGg%c98nZ4Pk@%(0zt~)
z@rw;s)f-3`|APfTldB7~`r%ny($d$}TTxS3PQ1<WzEn=TISC1As)z`+dWE7WSeS2f
z!;LpiJ^y)6f8=HV{m<nL3CW9Mc{RAE+3a4O=XQ-S{0B*b_*>X@TW%n;IU<69&$<90
zICTSEdR)~(cpM4zwyHDiV?=0oI!x5+JmAjvqT5aBbb2&fi&*CvA0Hty!se-2{(ITw
zTVDRs=RWGXYp?#@j#q=;0)hVn;ZQ#T9eu!&2r`&#=u23pRkqC=40Jfb2HN+b<g?(D
zebrT0a_D{sl4XSlZ+Ch)=a`rn!EA-!Ji}#|U9sgAFMIBzOW@02j)tBWr1Ym~>L7Dj
z`7blJ_o6Zc9ni8oDSZ`e5qwNdPqFttlODVb{^d*X*Isk=ZwX`NBVfmWhque&2`6Bs
zm*)QQ{Z7D_)&jdFye_jymgU%;ga<Hj9I>@6i`@=>c}0f^<KsIA4`6=y!yobA|6b;k
zV2q%;d%`P(|3CFwg(%uNcmVUD2R)DzPB@;ozy0lqh))E%`@y3M!SdEx>u+^C0AD@_
z<ay3>p7R_Y|M<syZK7zmgYR#>@10W?7gLtjHY<l;$t3vEkA9Q~KJbBB6ooU!>~`=@
zl}=}oTCK*G>6tAre$g`@+lQASZAB3S1Rv7h{qA=Q>(|}%@3n^=dGA)MjXy~6<;!({
z8-DTS{f2;fU6PO>!Ol7ItnjnHs+)V+OP}|IrA5v^fW5(o12our-ETI~;oo%tZu-fn
z0GxQ@iATNt9q)eIfd?FPOkU)J&Z5fl;z$C`woS>EUk=O)JnyBF7ZzJsx%%oW*T3nF
zuX*3)mtX!jptcO!2EYZ7_gf0|`rEXBtN>h?fTW**Iv~|*b!2>OY(GUSK&%ikXo?Xq
zfFPK%AsB4?T9zLJH0%-{81e%h(RRDlO4BR{;s8Euc1QwxK)2sgAnPA@;TJXiHUJ%f
znP5L`A$X`+uETA~v1QPu$6RRFAwykDlHn5)j*!3tr6EK1w+A6BJjY5x%lE@$<;h#&
aIrx9rA)E+<6hcn`0000<MNUMnLSTX^iQOUq

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/gif.png b/src/assets/img/files/gif.png
deleted file mode 100644
index 303cfd9efdc5b3139c9f2ef2bdf9ae97e6c87349..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1473
zcmV;y1wQ(TP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000GuNkl<ZcmaKs
z1CaDg8i1cpI@#gcyJy?BZQHhu!f)#<oqdI~Z5yABH3rE{lGdfVZl~t>rk-~9%ZhN$
z0bq=Mc*#xUSQc-+_^p+%-{gx=Zd|W1ZZb^P)7-Rs^XUGS2mbm^k9gg$jI)uW{D7gx
z_tqgJ8J>(H`3(SJt)*15n5OyR3f21I?g8Gq`fC2X^A~JKl5}z&WFNvc54?&STyL3H
zF98S6?I|dG4|t{4Ap)T%Cr0lO1Y*AwLf{~-1=V<e_wT%R{dpV<4-z+PB)Z4L^uxIF
z?pHB4w?Mm>A^^w#5dqdZX^g1|5g?BoI6^J1vs2mOwW}}SMDqakph`-Qhww-)y~lOT
z%*>J%eH{FM>j!fNBJcR{JFsw*g_(tS&qhb<hiO!6<TB#{okwuNt*&K$Zk|kK$UtKK
z!-LycERMa$K|AI9VGZ&YAHEqv@_?heClR_zLZ3Ug?#VMoUrCpgwX=UFARsMzG)8J@
zV-W&+c}BgQ8)q=q5{roIPh1~c&b^l&2*wucRL4eyO(n@r!2`A)#k&^HCmYGw%r|Hi
zyL5G%mF`(mlhDyEKVR#eLy@CwLC<tpPu3BD8+hqKS|u<gX}92E&4+X4o%gY0Tm0$R
ze&VQtGKw$=>68}N`dtdG5JFHC@T=CZ_-XPzp4NN;6<hnK)sA72VGv-o<sl;v<jVVA
z&h*SQ+v~ebHzt^APNIyaJcF^ioKKPKf?8PPx9YciEWMV~`3ZtZ@T$h!sJI%21no2f
z1&4lgmPt8bFMZU7%+Jr0tDHg?v`T9yvL2b~Ga^Q4m-AX&C3KSG`7tg%ej!P`i_=wt
zph8P_*w?z42S$(L`js0Ef)qUX(1Uoqe*BLX78b~g+`AZvkkPoo{`7CW^Uz!Qd+%>d
zRK^)ESyd}seBwg3do5Jo@ubP8^Qz_7qioLSS|4RCUm<iM_;?BAC-;4X^3m;1r>`6~
zas&iI&{l1(Ja!GMy;ZJAuHyAKd?Pl}od35AS<Ti_ndOP|kK=huFF?7%m$29v#Z^Ow
zi&+|Dz183bNwUt;h?+cl_OX0;|0mea5-x9FORZXAC0)l@!NV3F&TDS^8hX0#&pV*M
zDKU%Su<U7&;AOZ1d}5P4<%!pSEUj*r&ma5}JFd%a+NDsIhu!djJmZE>rCTKQRR#i-
zR&+LUbYc8kgE9qRsD7<=#9_>Mtx2O==e2ivDb=vXM}PYnC>)Qz#Upt8y<f{#cZad^
zOjTDvI4A^<SbhYPBU5Or2T2|%*b5N?a-Emfwy8xmj5R#v=8xs%`Z*Mam)!n2w938h
zWQQn}-g4~>n1G8O^j?x8_4naFLp1n#2?R2fNGWmJc?(~7=ch40Hd|iy3H5vB8Sk}l
z0;3$M>U)EP5X5mrB*P&ELrD%rKrM=>#}!l%5C)Ps45&mg0_Ur&pGP#x{Xz#g0ez)#
z&Jx8jn;RP&E9XwEjf_M{_|FQe$SPxU5?6!>8{>qaCdSa20~2BqR2ik{IkLhq)fnUE
z%S+|G8mCU5NnY{t7d`t=fBO9jfDFSBrS#xmu8m=`Hp#tiFpaTxunxkz?+vjQ5Z;(1
zN$ICunhRqbI&!4_vX?&psek|5U%o%c!TS0Jv$HechQnmh&I}&+pY`JbwnQLMra;J$
z(`V20Uh(o5KBIj6dkjf%>s#N7&wcLmG@DJLC@zVRB~c{(*dzTK9_b<Sy`)yFvvO{w
z{h}8>_X&Uf%b&i@zli`CA0MCo^rt`nwS~o{o2xQjrG>&dO1wK_&ok@iZqN%61l!x&
z`hy>Q&j<hV=RbZ4r~?W}fdt3|P=YKit(Q!ckA{E*LLdOd5X0gCj4?$iJs<`&pn$$t
b0{K4xX^my{PtL$800000NkvXXu0mjfjF!{6

diff --git a/src/assets/img/files/h5p-64.png b/src/assets/img/files/h5p-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..cdd1c9b1bc657d802771805efb9617cf744654a0
GIT binary patch
literal 2837
zcmV+w3+nWVP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;|l~32s6)_Eu;Vd3Zh9w
zK~#9!-J5%iTvZvsf9KxW*}1cCc6PTd1q!r0YN1aktYDguG=@i^k02nR2%>)|8U!V1
zQHY5OiXlc~2nuSIS5V;}`2$-_Nr6JC#q<TW?M}D5-EP_LYhL$pKL6O6?L6+x&g?dH
zwkJ7zXZD_R@BMw}`@Zv?@7z&Lv0V82-fI_jbS&RDY)eB!E#e7i4O&2ZAOc!YTGL!(
zFfb6~!_C`t{CNCX`Qul6IK@R3JE66{+_v2>0!Ho`8T*rr8`p0+I@fB9+;(szj<y;Q
z*9A{!Rd4L5H4UaBaJ-Ls$wNfWznGf(CLUeZ{$o#kub;U~(ISY?dEdS|Tvz*sp^U9%
z3&6JB`;*DkucX)mxDG%2c!;;+79R~H(KQyh-ihjX;JV;ya2y&;h$N43XUkDmcP^p5
zy&c0a@<p1BhRBJB69kd5Hfp@ZSQ}KP|Cm5TrLQG2en~?q8tSe4t#IwH%Mw5=mh@cL
zGm61KzJHiEV-`CGQ+PEN;%Kz15!XX90&qN(>k>vd+wJG}x?a{@wUoBDwjB6zkfI|f
zIp4=yWPg|Zev;iCK?nu|az;yI0aL(Ny+n$_|FUb8P0293QXWQABVv2w06H5(L9MAc
z-|6K`4SlTZJazB@qWuRuP`0;l9iHrtu_<M-TZ7S1k9Zoyz{_$JI;~hi;6mpJH;4OK
zw|wy_h4*zA6$!v~c=B+JjfoI@Ffr;w;H8Z+jXo{}1wn+l$s^nx?ql7uOR5B3CMf{d
z;aA-;-nK*RHUg-S1zKaE05cmMt-!K{vqyWmCD_Z_r3<PDUM8afuEP`2Q9f`jwtFTu
zbryo4j4@Z6D+H59g!aK+ZdFm%R1v(Cm`($w;D2#ogb%$in^Oi>qlIMVCPl6glt~LN
z_5D5E=KYV=OD~xg@Wln-IsE*SVcvBtwj_mcQwZ&83{fak<p@D3h`1W_Xg7D*A9K@^
z>V%g{e85xtM%Ww=vNf&=HrAnC50$oa1IC4*l%iE@q$kQ<$-S&vT&3_O)Sy5B=e@9f
z{l+1a_Xa)8`Y_rZb8;pcoh1arG-yS`;e*^ApPuj(#`&=Pyt5zsV8B6)AfBV~+_5On
za|LlV+8et;tLLGj2f1r>FRK<UsCsxQcNW+;m?C6Zj3!*4P6j4IL}{eAi@V}`xp5kd
zd_^W;ge@4b5l4fZ2yZh>hc-i_qfx%@d~#CY`K;i})c^w!S0kPtkMlA@m|-eZ_aW}l
z`?zuGrPF5QMJkyEbb1}{xF9AvErj-<f}Sq!HTHAUvgrk1DzV@%fXuocKq(?YgPOi5
z-wbxKdYZzQ?F4f)0BEi;XguD{J;5$kU$$r(!<TCUo`B<`9G7swU}mhBJ44;9S-yzK
zX$D_Z1C-|xLYQOsaeMs{)?TrATEj~vvw+f?fC%&CD7VxNu=dK+7v5I@0br(cjI~Y2
zS=*Tl|M$IvJh-U`Gb_0?Vr#m;^*LYo>t5N<fgyXm?Kc*-^6h1jvf*FaJ;YDn?f1=P
z848+eP3E@-Su?kR6=&6zgfDv<w1$pwQ_}#~U%r?~B$6}owiZTh?U$qW9r<BfGn6{f
zeo=>2(a5JfVZ`r#=`xtobPYTF^FWM6ZMD2|!<qi@B_hFswZNNuk8=ALmK4C3no5eR
zeQxQTWlaE2S!pc4@}K?`4{h!*3NPgfz_V+HOHXy>!sm9FRUg1K)CBNS6h0hK%xSD)
zc75?2&a0n{;A-)QmvW~;r|xP;)Q(aP&({KqIK1)EKQmkaf9vaq*wPa(YlK&vRmX3x
znK2IalP&#h*gag(ZtIaGSI)G`g7?(`p6L82<w@D_lmQQL#jJ3_$Y<bdjImm(cp^F8
z{zuDOecK&Ncm?oMQ6yNw$ouZf74ZR`v+8o-k0(4H`+PgMT--!3V;aD=BXOSm;8V8r
zBuYG!&=Yfg&s*s!DjS|kmc!-E^SNc`u_Uh6Iq<cnBITa&;IkV7IX2%MGPrX=bDqKo
zOFAqzTsNByI|q4WOaJ(pp_FFVu@p&9vv1Jm@%IOOpXJiFpfCI+H%7|asa^Tf{*qVe
zoE4sU$0lntQ$+ak{3bp=ZnI(c5CHG?CRp`acgg!)&{9Lh3KYVZumPhuczN*Ultmq(
z0(j38zPquPt6$j918?=B#~=2@&DLMhTG4%ecTI;sJd-eiqT%f%%G28iczXK)5zAy=
zOOUzEL3Z>f`KUhyK=;T9gGtRZD`)0}x2B<(-x_4sr*_HfFO1ak)QUDb!lo~LMQee{
zz_0IYADe%(ItL8+?e+l%l3tF7K9)%Ej*o-;S2X4u+s~{Eu<KKsdCfJfnb&}qeh;A5
zRLrb1xvV2ZW35?q<R#zi%G(~FD2JC@?p=6>Z-n=kU4uCS$drg>l5jOK=fp+NZ?5rO
z*knTCbDL`T+JdH{LC$30%W{I{`hbE6FRRbWId$AIznQr$L1xqi5P_~?n;ZUih*3w=
z5Hxsp<t*P--S(r&!g!-n_{#SNrL6F_D12VoKj?7P?7EyK?KzD>c6{YLM(i;G_`$!|
zo50ce+F3b#sb@FJ@c|QUF_&D`0s97RHbzH%*Ym~TMd0DL`%fBtu~^8MGCZZ>Gv)3#
zde}3NDm$5R-=;pIBd&kAUFpb61*^eQvAwOORP%x$XEaZLuYEPj5B`0GLnBU6_)XC`
zoiBFr#=%%l-?%GNgD;{2zAp|94aLN9y(y)!v<ONu<uulmY(5LVHWXye*)vr6CNRYu
zUNylB#oq`m9txl01m?+vCu=EPxequk;K6a+$%Mk6Exh<>-pPPZ**036mBj(46MQ_L
zz%bOF3M0YKc++B%@FLn5UJKYMn|LBYV}oU1bip|*CK(A<r_H;bM<^6vW=AV+k!G42
z>aeU3mQ_p38BMe_*JBuh>pIR$FTZ?|GK{`SM1s``@3=0G9cM;+1QAFiZAM}V;)xW2
zKmZX<^iU7`_D9|4pL=HUs#R+bQqeS6#qcPIMh_CULL?F?Mq>$L@g$z7X=n&znu@Nj
z!yNAEb6@+%i;JH7!!tWCUv{xnCV&#*?WvyXM1<o51Gt_yA^e}7|NYL1mhpk<1fTif
zd74zp!7!%=U)lt!I>-Urai$DEfeBP^gqQx|(3Igz%mURO-fBXj;FRGfhy<%Qw%0Ni
z08JIXcqCZW@PcjI3=NHP^w`jp;EM}DRqv`Ul}r&&BoGYu)tCRgblbM~_vC4^l$zLz
z2_XFw2n@hgivNn{l1vt%YT#{~!J#3}opX-+!-pSS`OZ6U_q&eM#@O4ul2vuq(Mun*
z>v-F2@Bk1D1Om19edoTJ4}9;Tzgkv!fp0#gAn}>|Hl}2oQI^*(*sII_U0>$p_^&^6
z1?1QcDcd31b>Pq=>%af#)~)YHwbnWhHXGOloODeA$@DRm{+|nY83CAS0n`GuhGAG*
z>x^K6Ku!9*nXX2<nt9rzvTA<LQI*O=`tHp7t8h>$WyqL{m4f%upmrKQyV}_TAPd0A
z(gxE9IKQea`!n(&RSEF?|A`N%_#Cr8XHw4jLddUPy1G8*AZmh4@kAr2ii~J>TPZT~
nY63?kdDoCKHKvp>3-0rOaJhx8=LF=N00000NkvXXu0mjf$nAFS

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/h5p.png b/src/assets/img/files/h5p.png
deleted file mode 100644
index b3554abbf022ca76d1d49c58eb3a8a427d6be662..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1246
zcmV<41R?v0P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;|l~32`wy*A%*||1Zzn|
zK~zY`os~;yR96_sf9Kpgk2{l$CNVKSrWP$URidD=*fyowmOh{lTET*q(v46z#V*vY
zidex#SEXQ!E1`%1p+OfdO%YnCuS#P~Dzz#Kt%=EG@|wxK?&Ex2%w%SQ6>ZL4+<Ok^
z{{H;G?|k1;0G?M;t}8D9?O}!a^3QSm#AIksLF|w!x`f;!>&%q(>gv|Moom|$Tq9aU
z5CH%I$`e5Z1&r#j^-Ch=h+P(t^}Zkcq`|(JaXC2~WvHMC@*a{cup>Oi=g%iu+S1gO
zEBSLEL<FJyMrvy){D@Lrz*QT-h&Yx~`5UvP#K&WrJJC2{@hJiC>l8=2pP(Tg$2W2x
zoO<}&W5@?V-~iYFj#l(f<@xX*#l5&g2(U%iUL55}*BTn)am)kYQV*|lp(^3C0rm}~
zmz~bo;gMJaj&BgHc%$$)pLH}X2o7M%yUGH6*+}Pb&P0uPxFWolyTPFi$^V4&5V%y5
zJvVFsC8ABigCO87FU_G%4~EM_;B)ixzn}r6=wh;Y-jxv!cQ!vTERPDm&w-aO@j+~a
zL(e_MUs+AxwMjO$JFHn8;cmv|{BVxV?GBG6LREOS6!62HEEb@E4XqK9jUhx#)oE2=
ztBm-czPJ`A7UTH2yPUc{&B5+=R&NN?KUQGx*%5l)OtPZECgTQZ;LeQ8zMsbkYjDd<
zzS`EtE34ua$8`eRyVmw6;*q>D60>!AbJS7@5Vas?D>_@FT)LO%%&iOsPZ&rQXbfqN
zzrKu~>lsen$nxuOftQjFN+~dP0^KX(ldkLg2C0Vc``a1D^B&jIMUsgy4PnjZ_9z?M
zqIkw|^vWbh2d3z~ndRb00f5C3T@8;BRTD53OH$+W+r2!4sRG47Xp7l=ePx1c=@LWZ
zMZSA`C3`nE^Uc5%y|=PNEXC%f5q5PnR*x{4nt)U*zLxz@x|XneeKWl`XE=NzMb<TF
z1<M<3O1?otnx?45v6q*UY_y5lYF>Sq`bw@gE2#7v2x*0-!Lb!NPuSU!pw+R+dxm&O
zb8K*u=~6&rSj~eQBcKH8PZ3f!WFhQ$GC}8(2wRrN5E0h3L^$wt3q$E5TUW-2hcqKu
z7su8d+|t6Lu$~96G`s3?RRA-Y+!oLEe-x3#!-`16RM$<llh(lnj4|18$bN0j>J{hp
zoP%1D7X~+C%5P)H=kva0>D#qdp(?f(0QdZWaM+@G@gf{2LM}I(8~S5#+vBU2jn2!#
zLf|5ho1I012*xPJC(^^e_Yb_YXZNnF^Lmj8^RB%A6LVt>qF{U?o$D{dFH<+lAu@sy
z)clsrBV01&A{`w~<@);0ZvANYuFFkL&8l9&2Gr>@y<^Wl(|t)`rSJR77}3TAsw^z3
z&ehzv%!#DNQpKL06JPY4{B}ku)iE_S=>j=m7APpCloAnZ|Na9_#z=H}dfG0zt}c~I
zItT*od7eguAP97|(iLcJ84xDY6W)aj=L(hH5CA^l0wuuz7dH><u8uEpB>(^b07*qo
IM6N<$f}563-T(jq

diff --git a/src/assets/img/files/html-64.png b/src/assets/img/files/html-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f703bb834a1ce3c26bfd722fbe515c9d8e562f1
GIT binary patch
literal 2150
zcmV-s2$}bZP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000OrNkl<Zcmds-
z1(4%95{7@t4sHe?3_ND$_m=sXvFMnYnVFfH?}}@;_?V&Kn3kC#8B8WK6N64&aaZ}e
z#x5T|C%x5?(w4LPwYue&*2)-zWHFG}mC~4+n!>f$UW?h;+2T9i@s1Zh>|qbPui0#R
zl}ZIPo-_<Y$kugToIZV8{r>mAH{bvM_rLS{*T4QJPk;K;?KOk{ju`&rE|gNxS|Ldi
z9boO-gCN{&Tg5*|qP0f5-NuJL^dVm<-1xu;KJdx(o$L%MH3$NfN+og_mX|xYcx()#
zBO~=&Z@u*^wc5av9it@#i823~0}O~?nPS2HrPk`FnH^xkU)^pme?(qmk9wYmbLY<3
z**uAQy$%uvCFQ>F`!p7-R;|Lq!UC$*8n$fNhD$EF6po|O>2$ggBBsqSJP}Z%41bTI
z5~09mQ{+AFJ6dCCsQT(c!Tnek2UINlF3<C?B3KFE>3BGJa39W|J&mQMC6ExTfF~t*
z3tc66R4P?$-n<Rt<KrttTVe<^s(=;nM&4)Qw<8EcR4T<I!$Y-OEpHn!ap@l{q+$mR
z0V~5FI&=Vy#(A1u6bc0bj*lU5P9Y2r52Mv;(adAh=B*eX8~cyoA>oB%Sd17-^B4x<
zP!I%VWAM)oK(Yw<4vri-i0SD%!J}9#S@-}lN*I1%V8FsRQ7ToiVZ)~X3cOhn-UwhG
zAX7sTiS#DiZ1A3iKV;z>1aF}TJ_NH%c*^<t`FR^5C9GSwk;49dh37u06gM0E!3aJe
zc%(f#d9`=lBG#^5p9grhuN(mcxsqtzUF{DaK7g5-hV4_>7h}&>4I#89*s(Lvj*Hc+
z*X3vCjS<-C4j?#M;c2xO@R0~7P(+l=Wh#*9Zmhm<4JPse&;0~(w{PDbd;a?v85zZ=
zKmB=}Idcm2`dNbKuqQ>_Vbmw3>y1VO#wgr(-)c-uOymzfA#L5C{p@Fm%joE+vv=<<
z-RUf&-CpDcFCHBP%`;D7Z{epvL+-ifzC6OGu30WUt63=QpZLTlzECL)&&|yd96#4(
zibOf@5<D%AxclyVa}94;r31eC&2J(mgBM+N(euxoIm6{`;&YzX1cLXx{KKb-OFOt&
zPP^@PyG+moFD1U<5quC3eBQ&J`w44+6~u*ibp%JPgs)aBwBYqj&U4=+<bX@FDNA00
zmkywapbBqlYMR`Hd+%M{Tkr|hper{sbQACB;<j3?)-7_hOOLvqfv1b2lkNb9C*_$R
z92}tX7LHTI>eXwh!s{7$9?K>vng&ZHXx`6Lip<T;Tlj*l?br1cJc$;^SK=_ELi_n>
zW3!>Z;8P-iPjW1L8^vN7>uEnfKGw7FCTj|C_!Io%;-U@z3N~)sjPbFahG%28MUd(O
zI?SMBtj+cqYpgHeQ=S5}*<o=UhtBO$DOa&}{f54QHzqj>+!H5GATGy`AIGB}^;nzp
z6HMFd@adbOojZ4OpBBI7O*h?iYI1UNR8vi0On<<qrNE9II}j7^$}6vYZLwJTUJwMT
zZ{X98#D4h0A0l4w-*(&Wzf(%h7-L5J3O;Ew^q>bl2vS<D#Ta-m!?Q6Z1%e<1i$qp^
z08dS7A+#dA;g8;jkKLHr0W5t1&sUN}_d7ffO-cbb4PNyHyx{??=@Fn*)af61wq%ch
z7+OETi;2&+2J{g;^PB7uV4^?DsGf&Md@O0E2r&II^L$l;XG{Ur7w}+ulQ9Lvy!SXf
z^QY_v(=tHy0etL-S+hid>E5VR&%+yPs1+VacR-)ayx}%9@I4=)ZH+NmOJN1o5Aas$
z{baJZ1&5rFZ4KbhUMO;q03Q<kQU}W&4-*p?{>^oqX*kH30`x;l<+`>f!1&P(eHuj<
zy72UZm*YC<G#5_4@CDC)5&iGB<2cd*Ch-xdatg1|eTT7Dt6*@T2G93xn0ug?I+ao=
zSBmhhZEm)OqsNY&f8A?e_Sjv2|J!b?AewzB6;Qc_r?=0;u!Hfj3!t?^$HFhPm#}18
zx8Q;ny+&gWfBMVc>MwoC^B!;Ef0y|{Bu0?W1y3oQI&}iBLs1Z5zS%}|VF^J%?=e*2
zSo^v2Q`og@cm3^eea+(!A3E?Gq=-gB2;>u<#)P1kH7ML$7MwH;yYLhZ=gtxQp8DG?
z{Go#fehn#^O5r@hvpu?>!kv!qv%_akfn4wE_<o9j;6H>X(XQ)&R7mdNA$N32VPN1t
zgD277|Nal~_rLD~Ie~u6<ha6%|NWJ65svep!IS8RJ?x>l`|i8&v5$Q$dO^YgOrCdj
zhF|2gtNnB;eC9QPii%gi`qg;e^PUIlYsblLZBKbm^?bX%3|re|fzQ4Oe&s7)!9ySV
zP~-c4sI|@=d}wuHp$&R<uiludzv+#ycwz*vAT^`7QOh@(-~8q`b0<$6|LYAm-m<;f
zY;}!{Nli+h+BmR*94Em@xSzh+p~s!q@oDv^T43g_Z+Y$WZISaQ0AuJ%NCUa$exw2S
z#dX8rI&wx4pqHTUx%Fco|I|k>yY%wgJ>TQO${5JakrG8y)FjNj1V+lti-`050D&K<
z0|)k={NM-P{n_2ScmDxESwIIdVBe}2>9W<Os3rBH>tWmhg~$OFvXx4u>OieFX<*3a
z8o&XofmYpn6cluF2y)APC2it_MzKL$U~eeXYBig7e@_4|!wU_h10wiE(#QcFva<ug
zPKcC28H{aOD#MCCWM8z9HVK_#3*+g^DneU2gVh%i!YPm_@|r?Agv#_A*~FxMXIq-{
cGX4hs0pc+tm#2!vF#rGn07*qoM6N<$f`>sX2LJ#7

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/html.png b/src/assets/img/files/html.png
deleted file mode 100644
index 5d36c22271d07e0996afcf2725b414cbc1a32e29..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 888
zcmV-;1Bd*HP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0009&Nkl<ZcmbuA
z1CTsN7{y=rbkFLKi*4JsZQDuNjLVm@b>#|6v003hvu*p<+nsNEdn&zk)8U(X`|ar0
zufGw~S|d`ermiI)9fqRZ-27Vlpo0#)^MC^mXet(qwQ{+PN~I#x>CBHe+;HO$bdCf`
zH~yHaG=vnvsFdOpkeE^mbi#pKTcv)+cy4WN75)9)n4h0Vp-@0RpGPW{#^sk^g+mTG
z#H>>$vbJoh#(<6%rNKC>?zzXV(>Q0{f-weC7z9DMva*8i?hX`-1%zQpv#L=|;erb;
z#(w+lNALpvRt!)|3pzJVfgyT&dJHU;%Au#H!$8yNG)kqCNp<F#=U|_G_C>i|F$wWk
z>7Dgh{OYT(#*<Gzxle2BFEXFsLNp_48(HJ@GtR=k`|ca{ABJo}@WNs2jv!iET0rf&
zY<YP(s%9VO0ZuvPbOUcl9#<dSRC|oI*kg}9qJ%7J3CYah?6aff``P3PaI+-BjqB3J
zJc7_|XzmyxB+fbKf`+!}q~r=zli{&ragy1P$z*Zig_l@(H5m@TpB#>zYw+7|zeT-Q
zH{5VD_TPVh({pcfz*HBMI1{tLm=6pLMo;l~^wgr_!nF_X+TSJ^Gcdd1@b&dVzt&1_
zPwu^#{%rvE+joz%q!7OeN^dqcB!@3K{uZvtwm(J!R@>ol;LZc&hsU;XZR`x78(ZT|
z4li6qRoRf%0#<R0@V9X7hg-W6w*G&(`g5HzhA@<nB5($Pg}@8<*!F_es|-Ud(8pwY
zYGgK*k`QJq9Ef|tV?YeUc6g;)g%k|AY!+Yv#>Xc%pL_O+2U}Zzod${9H>hXoXzZ_Q
zYzxVJoE8=qAY=+7Bcp3iKJm~U1pgXVd~R+YLIi-*9wa^bzWytPKuAnZPUfF`_VN3=
zI@`a3BYxtEC*bY3-@(qEJ0WFAmJnnq1zFZDqHWfqZfUAOHk-rr)b!dDk3W1{M|<n%
z313j4si|r2H{N*XqXP~+=-3LqN+}tmaLmqz#W#Smvx_TZoG&dcRbPGeg;(3#et!=@
zj$9#ckvGXjW(N_JG)LZppn<)8qsqz5u`5lEzTst39zaO0+5rl7kkTKrbQK*L*1mWE
O0000<MNUMnLSTaMv8~Mj

diff --git a/src/assets/img/files/image-64.png b/src/assets/img/files/image-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d8f9e4fadb98d0e982887883c89503ed8f9df08
GIT binary patch
literal 5800
zcmV;Z7FX$sP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000(mNkl<Zcmd?r
zCyZp<6@}q%pL43ZC+H<kY-&Su$z0}=12=!10|!owjLfM6$Ih9V>xE8r?_PdrO6nS?
z>2dzi)k1fzvr{GU|IG4wMt8okZTpuA#9Ji!Yg%0L_x?o$AVjLFTpia>=A7S0d&Fxi
zVBh=0o16P@C-JrkBrY`w2oi)sDiY+8)c^tEERhIcj^W*RpMQ8btndCk0X+N6{LfFP
z?Q>P-ZIk40zJB1W2`<fE1{%m^CG6dvJv;vKy?0-JG06>QR(D?nkmOzd8Rk97yw{q)
zY@7gupo-r6-F@G$6E~b0{zW8^Cz+2+^Dg@y$m7;1l*cT82iMm}$K#U3e=-4#DmS<H
zKK}TI5D?_e0;uA9KlqWK{pL@~(4r7Q2^tX+Nk9vz5UtS|iG)TV5h1jwoV6jZv=S}S
zp<<1)^{%%~pEkyz%9p<IdEflnR|o+J6!MP;0PApY>QbX5REQD?Dp~<4Eg%U>Qc`qc
zQzRrBkdV+2hKT3@#Ph}8P3@B5Zi^DxHd}>#Gv;(WtVb;napsKzs4>j7)EEj$1VV~n
zq{Z1l3kgW3y<&z+M6@<?HXpIlq9g+`kVLet%5jz+!zpE;w~etJ=1^nk4r2jA2s|}_
zHHNi@8dH$8C=w7Ph4T*&LkC(=B8i|f$V3w)TB$^|#JNgFL{Z##scN*|cY3p~rm+rA
zC)BP+U7AmxSOIfbYcht2&J>i;r3Fn&L@N<1B}x)W?8WGSk%%FQgoQwcgd`%SR#lSF
z8)?0rjI?<?%2*y!=4ui(3j~nl=@l@lj5*aTNg0VoP?M36DM7WQbtt5wn_V12Dk73-
zQHe^4sI<bSNvV`J5INnszx%{ETsa)3F|X{Fq|HPW85le=9|U>h07hAJGE0J#2q}cT
z>T0DVQxb75<53~#*hRw7qE$*1N)juBilEZ6?@s&4tT?P;9<N17T4j=Gk*4OjeEGLA
z1jky|pi_jdNC+et24oPD)*_;ssdYjz(poUYAXHi_DJqdZ*+bcFryIvP9N+!GTu13$
z_pS=2PK>nJEfHsuAWs~EbGlkX)zAtN=bo1cl7LRrCD;`eGDNgUh6*JrEl4k`8oRB_
zrfoMLyMFPG!#nTF-uAt9PSUN$FqC~ekv6g`T#deLfgs2m25=a|;jmN<(XV<lDba`s
zO|+Z`nU$7F2O%j*BoL`0bYdtTPR9L>@o=(UymWZ>+}0<QQDwh>kbU=Xds3s!IULur
z)=@VZ^U^#B@`f{DmaDbY9FmCWl<4#NN=S4{kPZnMIuX%{BnW8<35{do#eS!cL&m|U
zv)mq*)7__%_HcJAqf}$xZJ+7K7tdW^KUZUr7;C)x1_5uU1rEn))Br&zq9i3E30j9F
zy3ZzCOSg8`s;6k(anPP+b6Qspqg+31x+43@UhUJHPp!Eq9F}o4spqzRm+VGDak#oR
z*8vCtk$74Fhc!GqPE`}J=koq<5IU0ByTz2yX`Nlts)r=@M5Qz;?KaDfqjrB?=ATJ5
z3!u7|H4A@#_m*QEI1nTu;YOanad&rjEgLHzpR#ecl5v-E8GG*T?(bdK+?xvoIB<Mh
zcmMNh7o391NT?*hmZNL+T5EUz|27rT(GgXEG)+lb9kOgnS(R85vCv&0&oj~_CT+I?
zm`x`5Pyu&>zc&R$mLy3qMnHw*v7Cd~6E)PJb*_M*T92Rx&>)~E3JCc6af6_E>RezU
zREYPK2yvB@PY1ZDiI@h5&pypG%UQj25n~Jsoi-W*HK_tso|BJ9l+($b;P0IPL!)64
zV?iO*Ab`^(plGo5em&aZI36`nD<A{}B?Li(Ierg4-U<;OON35m%nFaIDvGql=xBrw
z1G)=sE^XbQ@*W!}SOUJt2?CjS_47qNaU7osKfPBAs8U;?m0FCP5MY@vX%tZKN_|WX
z*3^KN8e9z+^*E(IPfd^<TSEv6i+IQ~Ztm?dBE}apW`}*&);CyKTq0>UD7@!rZ^%+_
ziSclZ21f{iEX!&;v^s5?jTlaW=N>FDXD*E_tu(3$P?dSAiz@b50R;f2mZh&p*49ek
zWR$&7+X4tD;Dg|R6)jlxQ%190tl!~QW{G=iw3av74RP&#PpGAD)zQDbLpIB}bl(+{
zBxW)illEG~1YDla!QabO;7l1Sjt$M!5*t&ewFf*xt`S}Z(Li$Se-|vC8Z-op)P(rC
z4T1{lJx*(~>hnU1aVd6VlZ}gOv`Wh$YBSo|hFONMazYYu)E_aO&Jbg0G*S)^_A%B{
z%w|N#ld8?jm(E~TRXDE&6h%%Qw_>5u7OZiUK4m%bsCVR5LFO%$iEzYlBI)CB(x9M%
z4}w3DeGs&Mj^d83(Nra1zzLJkU@|#kd-n-KvrV(rs1v`;Gj8qPV((zU^2H4_i8<^a
zA_x~&dzi8yn@-3M5AS|4^uJbW6_B$b7#m9`EpgLb##NV~u+VfYR|AL|^yyLh<RsMQ
zRtYDdz2H@k=kb9SB`pd@E~3(ib*bo!Wky7t^oU|%91KyMfQ^|>BVP2GFW|G|xV{?P
zeEbP+bYqfshiEonG|Sn%vdPtMd=~uqEpX?P#R?TMK8olp9@5(R7*1lmU!hDc)uYjI
zo)9Tslp+|Yea@-WS3&@4=_~3Zay5w6+CB%-Iz>w`D6KL_^9jRSI~+z0CRxVe!HDNQ
z|2pkXlZ{-sZ|V88aU`t<sZnw)Aun0kx{RKNt%}}j2-c-23l$MXd=0a;1SY0Y9imTs
z1iQ9LBtz6LlEs@CX9>Zh3R(m91U0CyEmEJW126=l5Qx3QR5?|VlOOJL7!sPjE|&&-
z+<N?BgqX`$Hfi}0?X*SGUZe~G(`-W&LnJH?ck$yLqH_IC@aJC)on1sk7K}A@3I{BK
z4Kyf{Hi)msNRpzufcG8LHE6~sHh}s!oXB6$IRPFGidVt<dbLStr1YGnSvq{=*u2=_
z5-Yf*&15p-U>Y&HIVGsFvEHLIyvcB9m;I<id})j4t#;{UPoD*#=e59@2+(;!B(?@?
z<y28zQEejWHR{kq5#vb{j~s)fPI>05!w`;%slB1hbAklX2&0ZhW0{Td5uw<}xNT;$
z1NvEym3)W%**=qIkJj=U>GmFRF{FXzz6C>i^F6FA?Gs=A3eY(R=bs483zBlWAfgx>
zFjjy72%;xMRAA&3<8oZ<^EE)LdJJAckAVlBs{>zPr@Qz($N9i?s>CuQp6xT94oT98
zD{@5h!V<l$wYnTuPBXI6l+N`n)*FW5Q_qriD@N;|NwoHSmQQfp^F(OA=Mn1lH*lID
zMNmLdsgCP-AX)(x5J3=7P!muM5RSKivAdM_e~|H0hqN|&bUIHmeY|8aZPHokA?*$;
zmp4e;mJqeje9Wj^z%*`B^>=ytc7YxD8Sm~hXkQ@O-(^d8S-t_BiNf;}aK<{u1|)JI
zpn%N50}3husYwZ_c!UX1fJUehC})US1Y?lk=k<V)-6r4LLo0`yP3TY7Nw(VD*KHFj
zPw9mspOGJqVekxoZ=0f@^T=V!W0M5YKAQ{5XKw@!W*MbP(DCfd_dgNz`7_|ui?ZP^
zcEMxYi)Xx|C<s89$E*P$20$qh31~b(j~+lLGc;+UlOZ~q;E%SEojoE_N|TW^3uX_^
z7{`{#D6>Jv;a-UrfeR}R6Dx}wj^|of>LpZFL^Blh_dQ32p$s`(E>3}0<_C9E5fVAg
z0CO3A;tlV?hNpS)H+&)8^;Jw9W9Cm5Ab^~Z;8AsmDiA<RL<;C6kb=q>scvG5XOMh~
zSrELNP>zShVo9ARpH)n9Pq!_+@UthBLt*+%%3vqqaMmQl@>p4ere7pXynrgA%2zqd
zXTlu3p5Fp@wyc-PdF1_{V*IH`SX^mAl;DztMkgUoW72MexEUd?q*Z0CtP4@Eg;`%j
zYyhWd=^!!~<6&V5z1GBT&ag#BTxO&uLK0{U3$#>R5D)_kjx;EZ8wI^b`)oes`Pl6a
zwh+1|&}{%6OVTnVm1CnB06nV!y~hlA{x@~`%rEI;qkt9}GMh3f1+fk{a)^yEDFo+9
zy^yMfk-)&iY61yJ=|O@03amv^fh53@LSc|hQH1;ujDhJ`sY+-j3Qh=4NqvKOO?lzE
z<ppu5EfM!Dtu+sc!&i>7=WwUME1>6@2Ph{?U74R7-rnKX{SR>K5H@>;I8v4yLVs8>
z$pfEwyy69yA~qHUS12ENu;kf&$9H~C%HGWL!6!=A+m_G2V%hC`KD_Pu@@p|~xW8bn
zA-G(SGH`PrRvRfdCyuM#lnNzoz<OH{FYHa>=D1`jwFIq~$2bB3rF5ZQvwZD$_xYyh
zpXrUkxjI94E{6EizuV?t|M@|NUb)zg5QW}C#54~KrjCINY_ucR788spdn1Pr@U{;%
znPjdeDYbBMrGW?>jXj@uFk*WzBeH@(U33)!59@@=DbI|A+<~tG#(?+ABnu33k2ivf
zU=0Y+NDQq+up+G8n(|F&1{2P|7C_*Xbbj)yn|y1d$H8vJ^RB0$&{>ShM<oaSiU)2v
zKI^$no_8g!NAjV^3POM{{+telIL1RqBe5)9Y%?8r21gZFucsW|j4;6<xnN^UUcod^
z$a9a_gsdjc6B|QS3WGt#{-B_0Bm`p+18GB9>_IaX2+;ey1%R{uKYw>v&t$-j&t2w)
z8=Kg?gxEr<APJNuZsPfpLP?j}SOPxxeC0-g7{RQyXt!c|&LKge850j23r;bM4K7?<
zB;<-zN-&nDDxDeN71fAPL6QbU4Ph3L{R-cA?36LX5K&LjTS{}$5T!z>Jkn^vS^u9;
z0m|8VfC5$DFn%(n(db}X5v4bH6O$x{s%1znL{y1kmN`^Px)%(x&_EYjkVJ?EwDe$N
zq*oDZ2E_~w9%*La3XD-q3ek~Aa|_;~VzFx#R04eqW1&z>HcNOiPnoG9907eptD!_8
zu(6iVJJYi~_i9i<6-4GLc=YiYKiy*M#uZw<MPh5}I$>ljEeodhv66U4aCIzUtOaX9
zN>mGA3eJHkU~&Naw_!Mgi3bh%GRCfeKU8#PYXyiZcAUf5;s*)kFk)0%k|?m8297de
zmMi0lXH@!Hb)WZK&x_$qzf#e2w8rkd6^+Fg-Jsj*v9h)?Z;pt1P>-sE<C>p_fW#hE
zj|PX-k5z~tpwkf{D==wF$X9W`K_s`S_J+7%39Syz%v0qapEQX&4ct-A_9qMK4AFu_
zGg^sdDK&h2-*7uO><?#5rzN*$B~cu+bo=0JJs>Eqa)jfC&0S7~1vwQ07q*^9%n&aY
z)ldT@)ZnR)gM;8O>M`m_bcO^_Z_!|IRfjBE#&^J)2%jiL2UdBCV)9YOy9Mp;0(m3B
z+}9-P_Gq*$Pd>QK@4w{3wc?mfsq%`p6;>D9{Kq2$#zDx7l1b_C0RqZ;e{!a2Qxqkt
z^(B%J?t%cl<1ZN7#(M_}!Mo$SpMy|Wez0mtfx7M&pwb9+Lgp=n8p^Opg#ZCxdg@A0
zoY0Lb%xWJu*kux}aCyDrV5iT=KYqZ4-U6@qz)k-3y|;)W!370CL}(;a%F3b2$+<he
za}B<%=pP<&{o3XOQ4}3=_wxWn<<vxIIH1!8FgWaS<rk{bV=!1ET!6wWRq)^&IPdB&
z?Q69t!3UB!=3Vdm2>S;^zUSM%g57+P#>(gO!3RFd@BZ#9XhtR5dsFsjhBUFvN=KX+
z0OC{Mr*s}8=4{PE1U=qz4F2)Q9wSN3&QniLf8qMI%XdH(=iJ#7!t!X8Jz7?7Swui#
zVWG+I{Kl_v|0h4d_3K;w%CGz!-KB1=gd)#T0q+A<S>c>R3=~C0Rl50|9KqLHRH3L!
zD(7h>35p^J5*+XU&?kB9@muU|Kg-+R^Ktf$rT`!yfSCCqLE%fj_)GY;U;p*mQe{=Q
z(olqJ*Y3j@Ls2RR2mSILZ-3*D|LLFn(SNEccPK#rR}09QmDJ(knAg4j{iMkUdCz-4
z!V6yX0<K)X$jWk$Znwkc`YIQe7s-O*>Fr&vUA;=P*&r)3f>(lv5Wt6kU{NgN+#@GR
zEy5Rn;b-$zU;240g(+`+%X|6gGXr*acKO&RAEF9@X;$GC^0MNKzUWJM+uPs8Xgp&w
z&KOTKLI^A@v@ixnql^b1{zQ29J6``|fAcqg^<U>-4b~QzA7QPb)r=r0pZdh(eDq_F
z6955X3(cmjiAd8X`~3l5{dHf#_kaI)b76IrI7vXD(u$ypp!ixDCk4}h2^IM?V-_mL
z<3rZhHu$FJe<m)=_|h92>}>C{J##FrEORiP@?$^wON0QENycQBqpB<}wlPMyy?4m{
z_dnp?_nx=@@TbAQ<p1st|1T0amgez3AP`UxNRo&M2=yTdP*uw9y%DNItTDX$<!|C`
zZ+aJN>#JP5evQkQFY(N+XW81?B5gK_VpBgaiDO!=7K@7=q{t9!@I^sZI-2De>k9UL
z%29hA(@=6_X?2?fU_8y4O!Io=yWQ3u;Q#6`|NIW{`}_O6<RvfR-~avJ2_gJHjS&Tf
zd2_Ur#P~Yo&fXN|73xz6h~N~gwal`D#~*)&M?d`wXKz)ufCxke;y9w&YEplpIKmo%
zdPKV{by`fzst!Fp)wKJHuOBg)oDclZ{LIhr@|VB7CgCnD04gUtkQzfbjvxXR5Fi{A
z5C9(_XuuuII-vEJb3PD&px{;K&)0e%D!^5q>CqU3IZ+~T`(QXv_nH(DjDe~OOeZtE
zzkBci|NPJYe5VDX=)aq{1{h0%AX@!(W^lgv?2Da?{*QTz&2w<JZH0%JXWO=;^#*Is
zO!e>U&Q@hRm9-~%Q`K+ys%u;mcNP$})DOx_0k^S%Lx$4z)`7<UWyn)tXjv!J^3H86
zh_G$c1~hSzZY-}y!`Vfj;As==#Ox?U1XsB2u1-Nv2Q2;#i*Lt}xPAMMJwC_7j2Y8i
zk69QnUJ7tw^nugo-Lww=!qCa31o7d+d#I?aaalp)f8m=~j}{$or+DDtx{{K;d-uYs
zRjXVNk1Q>%{1=8e(l#g%qVQPyO;lqUCgoRJ_8S_+k;hi7gO_9b?b{c7wMoL%X|v(o
z`w#f)`Ta#FP8@5ucs>__>-oEP??ORA0c0|n0jSOL2=xHc->1YIi`=|i7|?$J<QEp}
z%NNfrx_s#(iEsZ9lP8IEI&Ba!8;iyIq<Ht>Q(j&UL5R3{!<wbnuU&QGl|+00990DK
z;>C-K{Jh++lc!8yP*qjkK!U&X&H7~h9hdVpA<Xw>KzLrdqJ&m_6d@Rm<vX`;SoiDK
zkDCB6n(H=&W#2)QWf%qvk5MpE7BGMQ{27Oj96vN+{KQ!iMm)1(fxLr`^L)Pto9=lj
z7+UCgk#SBqqE^3uea}C1Xy5stKYzRefPq4k_5`CvL<lVE$vQ+dJ?jS`NdXw(I9r)H
zaLC}nV-1)TJu}3CVIZaeVszz;HJ^fP*;j&-r+CE#TXqfK57?}%41yq}ea$ujEdxN}
z>j;5GNPO1c(HMb+#+c`}1dA0u2w&JHIU%}fjs(V-XNWA2!C;`s5IO{!ACzoM5z@A8
m9qqpr5N*jd9lW-!1O5ZXQ*YZlkCyoW0000<MNUMnLSTZG!odyz

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/image.png b/src/assets/img/files/image.png
deleted file mode 100644
index 52d7060dc9b5f817952ad0b7d9d2db02d4abde79..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1222
zcmV;%1UdVOP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000DyNkl<Zcma)-
z1I#wd9mRh$vv~I5Yt**Qu!!oYaibbR?Krh<`}zj8ZCkIc_00Uc`)$(a!^L-!-{2%U
zXT3^90K%%WFSOR)6BIWl5uuwwXa|7lx}C)fVHEy-(2w5;l*)ULh}<$w%l|gBx}0zj
zL^@BpHOSOM!QAZVo?5Fv1g+5!0WOZiAP5Ytchi~{T_B|>i;A<fz&W2NGy$EYrD^0d
z*Zh#flN=H72-1$e9YMr*o^O!W^B5&~@9?%}elp@2PkrpPT|vM_ih2=i|J=a~U5I$3
z!FrEBw|9s;SJ3%&M(d#i7MB(P!HXb(a6<)QKtJix6?nvV;l9DOM~dmr$k()9paMik
zIDyb81g5&7f+UWa3=^CPA`a(#gX_Y*LE2EM@$I$Nnpzu*EF&<QBr?$5Q|P#~V3>r=
zP5L-5c<I9Ha|IS}E$v=o(4i;W+Cr3OH0XiWD6J4^3vT!fT7NX`u{<~Wf4FrP+ZHr)
zZELJ|jM7~;_O=M9nHh|zTw5$inStD3!PHzF87AT>#gO?PRU2;WF1$8~s~N^UjLf1^
z%iiG$$2<EN<x#g;1i0`fi@>xH#)E)JpV1z1Wk#faL~S*;);O#1Rzo>PjHCMJzeq-!
zd))GNgudqXx0*~}JOoe|pMem@Au728kz@@*&l$X<L2wRSZP97LVtK&oc%P%J#@dib
zJLc5{1jKu~IG7gDNt>E5^gsky3_0QoC{n~06o2_H)xi!@LlXCx2~*bobHw3(NtmoM
zzAs&PH%tqV&O7+icS+(M!XzZ>DU7aAvl`e(oo>>Xf0HzRSy{xD=<O8$_khj1kI74J
zh1~Q_{{0_*%-XNN$Z6*3g$h*)$<PoOjTS?mI_xo=rJ7J{Tv@YyVhM+uaef~}xUo06
zGna#k@z|4Up%({)-qT<15kv;#JrwPcEAkUT2Oim1{N=A9SrW4vM<4<>d<NZcyZb(x
z;e&4vT0m-WB}5LgJviHiKmHz+fm;qq4>F3A3_Blj<%XtS^V}Y=&f%RmV&u|G#NvIB
z_%77t8B`fIKO#L!NsC*O<^>DGRet-^pYfNSjL&}SKm2q3kT6he=fcx(^#Gpe92@KF
zNBg^L`6D0s2m%mVgiddN$H&krV{u`Y;h@iWZl2}kCCaj(C<=~eAHngRR`~5dzQc*y
zM~05MTiuSYec=j>iTL+_*5$`P`tD0!{pwf#!#PV}jG?YAB3;RU|GmLiuDA*XpkQ`>
z!X55-2jVy;jG|@^nMnfr;~5_P(EGEwf5bx`^>~J(d3JYqx$c@PUeJVp5a6j#eJYK)
z*M{G2d*`r9(?VJ~=WhUagV=^Ied!AM+dtOj<u8Bbv$#mXeeQE_-ul+Jt0z9`X<?eC
zq**!r-(H08X2f@E8kEv(Ztv9}d*O3mbnP`)zK@HfT9PDLxbmv&u3uSMy?tHR3PA~?
zx?t3$Wz(Pg?#^!h`q#bUUBCYIuRabWKn3K$SvxDBCD2+Ao1z&J34j&@Xh2;AfIvrc
kKrN?009c^z3dn%se`CF6hYHIFu>b%707*qoM6N<$g4iEja{vGU

diff --git a/src/assets/img/files/impress-64.png b/src/assets/img/files/impress-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..c279c62ef3785f8761e16f53f02e3f2d2e359caa
GIT binary patch
literal 3321
zcmV<V3<mRwP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000cYNkl<ZcmdU$
z1#siY(#L;2k{#QDW!|IYnE9i}%*@Qp%*@Qp%*@Qp?=AE0?PeKbJGQLR^rv%8rJ|Je
zA|KTA{Zn17aDLrAJw4-!s4BhWoFYQkvJws-I>dPwT}r2MWZ{>ebmJG?=(JUr+IGX5
zS`~GQvydc;TE(T7BtV>?<udy=ZIh`#|4nx`qfg!Qt3Ufx?fjdd%5^A3@lw3-EW%uc
z<VtU4t-BE*fZ`PdhH|CGqaXi7J3jg2vo2p=d0?w~P=-QqjV8`IT&&ob)H{+`aZy4L
zl-bjQgQr}<_!YP1>{{vKaPivnI*u0B8hU8{z-WE|6cj{2OQrBv#+V<`Lp>`XN!&A9
zt?13EXSM{u1hmyK_V>?G`u!(q)(=t%IwXlBu?b0>`p98B32|Go)0Q9{W{<71_wxI4
z?!6z)+BGXN0oZ065(^@z15gA70jF6$4}}0Kpz1)gVGvc^%riLunZOtpEEs-f8i=<P
z3Bbtobo944wi9zpMohr86ZqMOsQuwn2ra6mHi;%U8{?9zebR-uk;AqvA|vdMhuMA6
z{W#}dk7CV|MR=MXnbr(!HlvvwXW?~j>CbvkA#sjswY+WNg5gV4sWVGqj{>Nw>LQ>g
zy!`BARR8!z1Yx*T!iiv{10@h6zGn!6B`hywXEef|3-86*cYS1U_{>wzW6t~D&HDu+
z;1XSwBwB$v0RZi_upG!7cvARJQTyXp5N8-Jmr*eQ2#OJK0T=*cOfbf_R*jwK-;=ZM
z_(;|+UDy*ozZyW%9&DOLR_$F0n*A9H4$z`aum}8S(#(Gu;|#TO1;he^L2-ZpMnH`s
zVU=yuL+m)~9-MyLNBn2uvkR-QT>vqmFZ(p}fBGuM1u1+8lEAF(!2k}y;BYd^j&_M{
zr{9(FTRoJM{?qUZ`TP)y2)$(dnwOt`oa&#y<}+Uc0SNH&K~Mr!5=PiDEo`2+GpFA2
zL7cQ~5ikhwN}j^pvbT!-?87PiR|tIBgL-7i20<N80(LYVn<j40DYv-);J~9O`3moR
zm%Gf`{}V<=M)h@XeK!mK`UT2=`Ygub;S;(d$Ob_bCqpTG%*OFMr11CV<YkKo2VVV?
zD$*+e-}>e^vqQkb#o?=d_8zHj`ytM?QurZMECN6|8w91B`JGM2hBWi1-r}BV=9dg4
zyb3)PKIzsI00>ZTTh3j*@X;sj`{febImU3=pd!dj@e4Cj!I>1kVOc+Mn-u=;0|`I#
zp!5tv_@?_@#*C0f3FXJf2ewiTA`(gn1_QH#0I0*6GCP}b3V-Vq{%!*cKVKgVlYMn&
zgoMf1P^DZ-NZJ-LU;<Ep41ATHjZO-GyBjn-K*-o|=4eo=;&fWkB*6eG;EZ5qy8Q?{
z8gaVj@02O~!G_n|Ss*kEM>2<Ijat|^0h@p-2!6^-NMvlL;hmOgcmocvfNIYOgf31p
z0dQ7HVh0_EltCmxOhQsx$gZZaapKM?{C!jS#W$GDEBOkY%^vtQQC#eBQ35EU36xX#
zM#z>k?w-OwAT#6)JiLF_`~bM@5{MNWDK2t|O9;Y+>}*!pcJ{p(zr}-YnD9!jOp?HC
zb5`kIW=vaPm>ttKww{^7-})gpNO-UO)1W5VCD82w?Svp0VON~mdH3Or+djN|sv{pB
zu?^~5eh;lFFox@13PG95DHjo!mlcLr1<kJlLYHVZ0I|b_Rd%(6ednjwSa*5^Yvwu9
z%Jc#1Uw;W>%{_!=gBszwl_2WS*m2^I!<26MOziSY3c-Vd_wxoo1dIe+6@^@N>HRqO
z?pI%9&3~Tn{OzkOo!*5#<!mNTz7Z~{AvmrpDT0u&c>kYSzVojf`^)Fh+g(xw-urxo
zrCH@_jA3^pV&A3r;Jmv$gf)wcU1kg&-wB-t_0_jv(V2I?-qw73^bCf!{e?<nFL596
zs+xZxGPPrp8Ch#i96uhO{m|F2YS|KSNuh=(@iew^l(A)}5M7TAPsYYcq6i~Vad_1G
z-Z2Qb|M=I;@JF4g1!t_<dD8MF7bhZxyS;X%p*@AT4qh~V`9@j?*CAnrYb;GLL5<<t
zz6sQ$bm}<zfL9Nn*8{%WDdR;eqJ5j%qUT)}2H$R=LD8*_xP?Y_UooIS`HF{k17pNo
zbAG^xWV?N*2~ZS1|1!iYeDR;RW`5vMDfn$WtRB(CE|;SFyp7SegCv<L`_j-7!ql$o
zeO@~)(Ei}bKMD|zE?qu1>gBl6GN?mE3Jp1GEySRzSy+JWKccewTv|h`Kq1)wdo+%q
zS7oRpUh{wde#nX2K!5Nk`AyI{%`HDEI^j8Qkbw`T_p)=t&sk9#rnF`ipzPoJ2dte&
zBp@rrS<CX(|CbLB;Jh!I`T4HI$SPYdQUE@yOt(*}t66o<t*I>=C-Q~9?DYS`#U02Q
zmV*7iLu`j=&5d)`d4KSz!i?|l<#9mfh1c8&LeSdBRU3cA@^YDQ^)gU6yzMvGcp5PQ
zz2xFHwq0k1lwj3==gjuS;kEx)hWbC)^nzEwR#vm}>|0S=dKzt|tEChFi?baNAtT>E
zl2um}IM`4a9tG(4g%P=i@R`p+*xtupUjgB&Whly#+zL=!Y+0HHAb-fgt3P<n>>9;-
zK-WZyA8C8d3~^=EOa-*iyb8!DIPm*!4`{ExQEnjmg3s=O{q%tT;hFP`OYKQ^`3eYD
zEkzX$r4^8LE5MMI%<TcN^2*$UO>y{nuEef2yecAqfRO#g@zAR7E>KM?U|Q*F`NaQ`
z*bdTb7jTYv#bx+2d{1~0fPUcB`+l~;t|_8Y=wK6sf+>L-lj%97_Fi`W^P8+NcgCz)
z3MdCR{UpB!*qD=-tfd(&&)w=uVbDLk_r)tfy-BfCT^I^M2$4u;yzNw0v+547&1_qX
zZuGQ&dy~_gXTl4DfIy_b%xnHIXvkIZBdsfy2`bR~{ihIZUh6x&Jow5#KS9trhE|9B
zfLHH}H^IKo^G8m*IctypiY42>%!&8?8W&apEiz*jmN>^qdoSVQDhI}I+8;dL_Y(jG
zq~K*neBJ}u5JW7i|B-4mHU9;dDvE#z#icY$6CA3YiB3F{un%|?Z-txS%pg$cCTBP-
zlbrbob{)A9-7U_8^%|K~71V*4Y*$zBa`6=*WO&gywXo6`y!yBPnqZ&TSfk|<BP-9l
zPS<>&-985%)G2YtqU!ow0{vfR3?zIz>Y(aOs^S6Qh6JC}^_?nF3g79(oV0eu-@-6B
zQak{@2Mi*-|2)oR2NnSoe}|}GV@nu@Oiv%){f5`S`Y8(+F3?nS1E9H0U~u7uxDzuv
zT4ii(ggCZ7(-sh_wIQsHnVM2|?%cWWdCz&;J^t~Jzpd+Y6b2c<vKNGAvq>1j$`vQk
zZb#h`Z#E+m=NKEUq3Sqtbc%odYyITQUi|EPZ`rcx&*gHNUNQ>IHFSX2JaE<CJ%oW^
zZNgN&Nxj~p3qMxF1j2y>NBP%3*G<0cCC|AU{x?Aok|#sY2n-;+DuUotNngDpieeg#
zR%&gWY6?G$F<p4pt=};DvX?&h-di?r{B;-x^iq-}UCSMW6p#VSy!SYD-8Elt&W2|O
zKFz#`59eI(Dc0JqFR%*$G9d7pIi7cY)QP(pOv^qW-b>XH$4Lg<i_jQ@bB>Hu25`s$
z75}v;BGS#gb2b+~<??L#GL1$ZV}u|u%)%Tnc+GfKs8)vv0-1q-`7HPp8f$IW&nI*F
z<(Koam%W^W2M=|FU_<~06yAHkmJc30#=3RuCtv>3=iGa93U7?b0neA<H99)Vr#|&*
z?sAtqFFkg=zOmhomx#zf&GrC^bNulSzvI+X$Ju}I@Z^hL@Qiz<ng0#fPyt?@PKR%N
z<LgXLPF8Px<C{Loh^e_5a?oDS3QBQc@8-L=%LxLY&}cTPHyX5~X!7~bd-{F0ZrSu}
zK)iYR_xq^;zyPjXE}P%|?)Tq2@BE8zef)SG5uF9<p?X$92Cz`(=Ym3B+0!lSPJH!v
zTW8Pi?T23R@)tjP-MWAN2pGx!w;Srs&9Y?9vwB0k8KC4%FT3or^WXZmcf4`!no}-}
z;|^Xj_oxXf*}H?{nV<Xl?0(POYUr-*)MV?{&AVRzx>vq;-MV#u0ctt0-iW<LK-*j7
zKV|_p`yYTppbS(2DwRrYY;1Ims+NJ!Ti}Bw+2<KAAl}0)pZ}bdX8f$yBch0iJ8@#F
z9z{_HD9?h{IRUV<tmDC3-Xj08*av`YCHP?YXJ$aX_m&0EH+uNIAm}`SP;cT*Gv)4m
zPU%~3ZkAU-rC@)^Z!md)IiLkAAp3stYH<aEn$iCQg57_LO=>tE00000NkvXXu0mjf
DU?hZV

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/impress.png b/src/assets/img/files/impress.png
deleted file mode 100644
index 8b9723919d975442f068e08a18813aeee0ed8fab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1157
zcmV;01bX|4P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000C`Nkl<Zcma)+
z1FSVm632gyGjn)t<Kx=4H(c8e*0yc$hKpcr<5|J8?RTwraRz6)E+)5=`CLhR@~i59
zO_vf80Gx9VaZV0fYm)DO{R`zME&Sv44;t&~-Q38sbS+{gYY!NDz{L-E*XRE!PD+RX
z0(tK{5scP)rc^Q)0^|;azKzZ1wax@R>B>CyzkLcjb3Sq0Bw1YJw(y};-|<t%jvOJ~
z*hFLx#C~vojqLA9S7+l<*6PbFx!;=DusvOxA^6Sb36^ezu!B&?+&%PYYA^pj!;^<d
z);9qU!^81#5OCsDmbt3d8hhJa_hQ3xR%<m~@SD$4U%VGp?tx^HJL``_z3B4{jZV>u
znnk!AAG!EFuN?LrFMcY6{r&CVe)dq%SiTd={gA}mUOPhe;*T&iGC>xfG2Ax*1=!!d
z`~fH}4+vMUR#~ZpN#}Op52E#=k1#kgPL?#0Q^WlpIUFyW0v&dAQmQso61B)S7rCV}
zO6!FmV_<ZgRvdX)0ZuV;mqYz10^|;{aU@9MNaohLYwS^kFZ(6~L!-DPLbtY%R*X^#
z{~MB9?#vOJ26!-e^S>}ymnyQ&guChwqwSU7WpH?mR@}ry%S8YCGK3*0%?ZtA*i1;D
z`YCc|F$Vy4@v>`)gEH;!{t1KQ)1=WBAaKWplppXMlJRFE>$jnl@lk;S$w<Oc>UaDD
zvv4I_-48)HCI^7MrQ?CL4-Q`c(5Y!j<EHX|OR|Zrw4qvyMC%JEZFZZND%+K=X9S}R
zNg8?mkGsM1zyEVYWaa+#W`elTCp1lwq)BGF2}(1R>OCx8`4>=za_2B=_htevUI$gh
z!wZQ9>)hUkMnrkI&k=bv${;8R+fdq&2^fK#qK<n5PP~*@ay!1Z0HE@DE5c<7t>zla
zSjbXzK?)D|ZT|`uZ$-FK4pj<4z%&L(f?k52Nfe55*C=TYLfa61?3-{t2glz)$j79;
zkKn>@P@1|NC16FUm=XZ8awFv|L5#uO`d`wge*r1J@SIa{P$&mNH2hRH9<l=I7N}h3
z!ndvp;^3igz*P_8#Cdr@VU1DNXjGQ%9ZamPZQi&u4+<q=zd^ASIDh74fqdUs%i8MN
zRv5TPRjZZjEr?H20ZtKq;s#lkVT__yt0E{?SJzq}`tW<-bm94DUmu2Lv{I_5-<iV!
zh~t=r`FXUq%*`)EZ+q*TUi-iQ{PWjQ6z@1&#U@EY5QGTDlIsB6?kLD{(tr~OsC?9#
zg~i3>9dCQnD=)eDf<NU!3jq2FPk18doO6z<*J{cbgWhWvqw~4ZzWFn4biUSlFSzBU
z<>+m1dE-lW;edw&D1b(z(eaz#{NZnh4j*|;vST8m@<_=?--?ncrS<a4a`uUjeeiRa
zTyoJbff|qkO<)~}6rcc8sZ`pk)oQ<p7{CGs(10p703>gUG)?05_4PF%09xJwYyj~#
X`b)M%jOja}00000NkvXXu0mjfp8hXq

diff --git a/src/assets/img/files/isf-64.png b/src/assets/img/files/isf-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad5a1886787a768fda32c34c4322bc524eec9007
GIT binary patch
literal 3509
zcmV;m4NCHfP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000eqNkl<Zcmd6t
z1$5immWID`BxA7Qv}qf>%*<<DreU7B43GH@Gcz+YGtXRRW-L>fIWbCSkK<^0DNd9+
zweP&_uD@qX#_vDit)nOrAvlEM$Cc7dPfyd^+sEA8Z1_)q`HoNBbH~}2CYNTic3mT4
z09O!CVpdyR2UL`~p@VAto#*6t|7Y&6Zu;WyJo)YSd<tWP%7l3T7gCf`Xsrl}Km$bN
z2G=#$iHHIOFSOPyCzAZ^&;6>?Q~UB6ciq1Gu4FnvH0-XzIx8}sz_<o74mwoL&=d@3
zTG_j+hW5trWW4vTKQhtI6yj(<L?M&%3=mMckZ{O;PHXj4$p+-WzcZ0Y|I)_hXwq3l
z_440iPyag$bNxi^B(6gq+GGuqlgW5_DuWenWN5yM6OlXUyY68+cD17|FqssHgP=hC
z03N)60z`>->_-)lwb;H>AX3OJt*NVve`hFU|4Jza#B%T-X0uM0QmW|Lnp7Ih=pPW9
z`!|d`O(e90aTMaX`Q8>sFj+TmfTS~Mdj-Cp<5mv-+8lh_4vIr0cnEu_8^QXXTl_ll
zzZ};XVzKb?`nu|KL?nSPY-7wi14N__Hinn6Kcs5$zYsM?RXmMx!(bT<pp{}J(<qP(
zI?~4A><*5HZ>I0675MtH;Mou!ik~7yPgN>E73*Brjf$|=07?m^Nv0KQ{12#F`fpIP
z#H+HnIe3MOW;F~dp9>CFsD=KiI*zHE=)Lm6iolCU6x`dsBPpI53i1-RVu0843N^6;
z|Gy|TLoAlX7#pou`x_{jAh@8La`3erGdIz5+5PNp-|-cN_i|5^YJh;UDD?dDBj`N5
zgNTjN0tU1O!)oX}d?P0&syUjuiSCQ;+a~aUu<-~`O0iKWWs%Cm|32~MM^Q3GtjYng
zPyh;#ezg%?gdF^M6^Bzd&~@QG?B2OedS0XmJIDYZd@^HT^!IY`kD!<$9(Tc5pvX&!
zDwv>*i_uLv_$Y@GIr#JM%E32m6L=7U!@l8$8+^b24m)-<@~gk`M^rEVHIaq?LaAwD
zId~&BN=Y8vZ-P<|Mm5qu7UAIX^>m*19orLLWMc!Ke)?(rQQy#PWrzMi$Mo~K?l_Su
zgE2Nr8$hq^edQpgAqOAkz|swLp8M_F5`MFC-)?S<f)|OD!*|}_^{GA4_v@2$gT&$)
zj2p_sYc#Ae!C9U2Irx2xH?a4dZ`;=J;*&q@*Z=)4d{Nub(DI4o^lOAeNsMcu#RUWd
z1rro5hGzO#;1_Pp!GG&EhTlBw7M=1PDm$B;j)p=mk`Tl);8l3wViZ`$#Z@f~jE8bP
ze<PjSAKuFY)&Pmt_zfT&(Ku-^j-bT#{l;4;(iokCp9rykDF=V<|1bRX*m2UyY1%t4
z*&;khz#Oo3O}&p_A(_PL#f)Q6D6}#dyg46gSzYiFH_>(O=5v02dX&`CJS}@qFB^Vg
zVT!54|3;Vnuk?pMe`@dn)u1hoS!;mnUC!pDQ5e8lfe*Ll;G-N&-9q<y-%iI#dOnj{
zruEs+a-{KAny<K*+J@#W!_Q6*F?aM|=nDNWd*ZW<r90Twcm0;&@tWW%;1(O;ZD?d&
z3>pgu>^Ax*;vCN0O3(S<aZ-4I`j!q-D$aQ`|HAwuPjRUIo7r>uHxr3fofLjz=m4qy
zf2KG56rHgI$`Vj8qP~evZEp!)yhMZ`1AIq{ya6V&B7+tO70UJeWEDr8Tj;&$ZaPY=
z?QJ{4WVnNd>?Cz+jteLLkg@;%UxxPHMc2i5qLf|-KXmj>82m?0i@t~*aliu9sur?!
zwD#OuQFzY)Svvw8$@jjbGU!MP1Jkt}<yLwxxwm9^FC|g62j<@{K(whL+J=9Q6QlpZ
zQqO(tIqMn_7})<Tk<owTtnix<0kjleqtt4CEOisR<8>8<2e2`I0|YUG$v9Y{Mh0i=
zId0!Z?-lo-()GNl?}P;kFnBPXY9I7}F9!!MBcu|X6Mi2;0-9ARPhRd|5$pK6Q-+t#
zr@&eR$gaTG(LWQSKYBZTS3Gdan;Fr@E*JpRMiNffulk3%58RWNA6>eHrqjDm86F`p
zv>1aF<f5%GLpk^pp*!fi=Ap87a;h6UNUI1?==}i6hPm?cRNXg}4Iku!);fYGLUxRi
zsWknOn>g*d9DHke+gR0gP0Z_tU~mnn%{7wfq`mWsvfxF6M}eIf*biPPgxQf1`fmO_
zZEa0}TULc<g=}U*duee;gL_<W-ut8aYuIbq<-l)#G4#a0{Wo~wX3XO0=eG}c>}+aq
zl>#ZRyiF|56P9HkSbzc+znM%kt-W`a55HL<bk|=Se3AW|p1SY8Bx3*XVg^+X{E2s;
zq2<u;(5**62hI1*7r%sCi&Cn5_|3M&9(n8u@WL3w#pj*=dRl5`5vSo);Fsp7nSAbd
zI5+VK=<*i7j+&#KIP?Y5dwz<Vy4LdG#iz~g3<)$WFC`B<j%k3c!5@4333eX*U78r9
z(3_Tct?#%vx7OyW==^xHgW0;DrlF;0tMFdO3ejk2rnzZHpNP!h3)^)~;B7`#BK-8|
z2@)^=9_J;WFP_h*y!iRgx7G|1Nqv!l!JnYD<H9Y$i)>y9=?&op5GlFm=Z6mxapqaj
zb-}=;FMb=ESRbFEFY-MMAAfdB@F&|AR*vIR6b*?)`f%=igHl`D%vf5SV`lIGnUS}s
zUwVf&juW#I>!*TM`tUEFF0Qh8Yy3-e^nPtg@B)Z2M5B?JmS%4XlxhH~yq%o+>2YR<
zKY+<MIX(L*Q9HFYcz>?f=5Gu>%&y-1PYREK5koW*nQ3kD8xTANDz=SP+t9+^b8lep
z_1{guKChI@ujH!nlCD2u?C7r{BAdbczNc&`O;IQXQ27naM5Jpgi(g6W$b~)s$jso6
z<7Csp@Ln4fn!u3C?%vk+Zo2r5r8?NRa1CS04$>y#2i??+bGx4)J^g(o67#|ELh!W!
z!BIJQfp|j~vY=7Q-Oz}!>d&*Y=So~BOaJ^NiG=~O$zwz~LVe@}J8DO%iO+9n#%X(B
zXK>=nEG+yaH8t(U@E*UEZh(0Il&FgB+t)O-vv{nUT6=ySz=`EEX}|Ca5YSeLy4-VX
zceDeS7e04ld5+_=!=w|(vE(S#v12sU4pCn>iEX*;Za>KU^2a$g_H#5gpS9-u;=dp&
z#Q?;Us@zSBXsm`A*+s4L4De~L_HL?Bn^t(ScwJt?Sp}elbdu5WF;dAva92z@KuzTL
zn40_~jZJ6zIunE~PXSf&J2nft6V$#ny+4pRot+n4jlh;Gyl^;5sG$?26X6;V$Yhhm
zt)%}wJjs?9!HU8IWUG4CEq*gKcY)Gdh7VfsLUxo`e8;-^FKne0_EhP6b>Z6XHH+V1
zvX8dzYbyp%(R=t`hiohz)cc536ds_uaW^T67Dm8i{5#NEf28o@y_b|)2mv42UD|kc
z12fqcP%xD2W@qnpA2Gbw8o|jr7$e2ntQ1xizeTOJ#hmO01rxDvM=ATGhtDaU&XCSz
zu|pP?y;k-~{^Yn)@LmEbtAm+rGi_&GUlDi#2!J;$@Tpb!_V%XtZOfX$D!C32M5&6x
z3qVyj$DKAhtWbIIfRVKYivmOeW)(i0b@IKOSzI3Z)F&VM^z7^`mSq(iAOSytpehZI
zuw&QdSax~v3YCM)Qe7RRwx*h_<B(2g$z-x9rHIDDIF7^o+!81H`zOBVyFdSRAAa!u
zJ~jv~z(xX9ad;7kSJxAc#>;|VUS7tS3~jBAXsyWP;Fl9AQn}U+*@zLQrsjG3-S;Oy
z_t}qsLk|A+tzQj_R2;q{3!YL84-aBnifq<pVKKqtathZq)YitaEXDZ5G#`GrZ}LZf
z_`AO0*wMo;vPtNm0%3c?gNR{nZZ1FEmzGm`8M6wnbq;=f1%ChJkL2Kw9y$C1!Li9A
zxE<kr?<*qt;l8w#EDJtp3T#VwK??9degwE>!UJgAwpdY7Y&ZDzS9D5IQ&S#1fPUnW
zNBQ7`5A!Bytq|Fs@WR^9k43{+R(bFM`u5vz<D!c$<X3*>S5QjjjX<^^JR;yLZ(Y}A
zd}5|7cmNILi;D03&hO;oAOCnh*Os;2;0vv548{nFM4DV}Qx^QXMevXQ=#RMVw%f#U
z9HX_~cJL;r<>ds?Xq3sR>B%4X{x5!$2d~zt#ION;FOnBud~tqgaNxbu&p7*r#l@x7
zllZ=TaPGDKFJAn-4Z!^QCKo%#7_u2Bzxs=q*&qI)@BT!t$ax!RWi<>Sh1SbGxxU>0
zxcE1yZ6FMA@x>RP^DDpl8^64}W6yb6C+j^KC9>|yQ2BBwG(kOI1WXBY-ZL)ixVVn1
z4j(=+^z%RWlfS)h-@Z42Xc4sQ19pI{r!<iA+O&7h0gT^(kY_*)P?1O^UQ=DYQ;;xV
z`|s2tXayQjD6d^Fe65$O;&XubpW;8^wSG60EG;cArqh`$VEf?xa*GY{;FF%xK*l?7
z{9jai@<0n<x^P^ifID~i^Wrw(ToH8OIpd$M8w_<RHp3^!KSF#{ATZRr<IN#dN$*iw
jNbs@$T(Eg1z6bvYjZ2`Vw?js000000NkvXXu0mjfMRWA)

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/isf.png b/src/assets/img/files/isf.png
deleted file mode 100644
index 30466983fe97a08250cc1fc6180568e95c4bc31b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1213
zcmV;u1Va0XP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000DpNkl<Zcmai!
z1CT7s7DZQ9Wj4n%t-0T}ZQHgH`nGM`fp1&SwsAGKJ+0z-HOlCorxUS?5o>4cf)Wt`
zq9}e^6h(J&Q^x=P*FKVY`n|4s(H)QU_4u_QifTUd)w1z2cfI5uPkHynN@4?o04*Cp
zhy`u5J7J9eFMx{U7!et))x4pYOg^ZN(7F6^;_WN&t3J_Im8s^F=zP>SsoeH<`1L9x
zBpd_?vddni#Da2E*w@>2f5%bBv{DKng_BK%TSH{$K7eM3D3!)!e5So;(Djh7QY=;y
zd5v2g1#v7oX(OYQgFbeA2yJro=c}aWK15!Rf|El94aWSZlDpsMDHaNZ$+-aB((3Iw
zcJ#BK_Au^ox7!we`-MB2tUigTJj6a@n~%iY`7?>UxGM)>U&PJI*`+l>U;6tOVvIaq
zdzTW3V5l*+^*G!+e41jZM16Y=lgVP`f?a8&US(zBD3#kk1W@)mf(_H%g)(taSIzYR
z+#2K2(@5VfkrzvZfyd&+QNl)*+dts(SUJMh<_c>kenyxo01s`c$G%a!=%5)Pen7Nd
zXFBsF@(=jZe&-$_fWy6yew5*f2jM>WojBUCeeze_BYz6F?MbTa|MP*^(mL9WHK8v|
zhfkvGeqT&hp2+<@xd?QXZcFI6+%>)eu6rG1fUJNKj%_`L;+-q|Vk{uofRRhiBXsj|
z&y#+{KzT5cH?3R{I=cs0bxM?+S#SVX_HYzZcum`zV~-I8c5(iE^md%|9&~o4QfXaz
zf)IF3#{T;?`rSovX(Lb?lzUiiVHbrG5n_=$Y;QG&L}GKW^0oOX%$Xmi;!HwXAS1S(
z1XMQ0GbxVyU!;87hqng+rDE@cjn-E>Q4|v=w5}Y1uKo(~Grr9=cl`uMQ%`8CNA2z*
zo%VP@;k`_c{>{qc1c~<?01o?O<?QVpSJTlmki4ExrSz0f;yGz>K^(=BH;5-0Th~MH
z`ZeYze$ieLduYH)+dd?0uQ-loQEtcW+#!Y<52N?NUt_UZV`FUsZ}BMF8K=~LE_2gv
z@=`pLT)ux_j}5RD(I&UGv8nF_?n%PJn|9AlD$79W9*ErCR@3WNQR3JpXbrd}c>;dA
z!jyMc1}gVxx!>Nq(K#zmr3^;9EdkurkINpTd+*Dd+=KEVxvg96?M*7h^3u}M-0b*5
zI&IJ(K#LIUF;*aS74D4d>cet^FvMs@K9>XKGBq__ef!(q_^PX~zG4o*ab4F64-*Tv
zf^4pfr1!R30GiDP%gf7XlV*H;V)IRJeDw<x`5Ekwv$(i~)-JTv!%cnqa?`|djH?YZ
zGc)zKzwHe#KYIPOr_(adz3z2Se*gPF(An9EF{uQDPB2C%m_4*Xn|<^iW_Pd2<?_tU
z&TYQ&4X=6rb=O{f3Wr7k^z`%${N^`*_;+RS$lZb<2t`DRkRXs8AG`qZ-nrc?<v6RW
ztKp|V{jpD9d(BmU2l7Aw)PO3`RQn;?7?V%v6%iNEfD1T)vb2u?L{a1?QwLH&xF68i
b5AkjQHUN3xFE3hX00000NkvXXu0mjfp|V*s

diff --git a/src/assets/img/files/jpeg-64.png b/src/assets/img/files/jpeg-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4fc0c998aa8ef15d851bcd931a1ae61268c9838
GIT binary patch
literal 4459
zcmV-x5tQzUP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000p(Nkl<ZcmdU#
z1(4jh^6-DM2N%O|%*^3q=6lS{%*@Qp%*;&3%n&{b9EBIMlbxBJv1Ro)QK?+|rp8nI
z@@W66>QyWDYW-_>w_0+Ph>+cc_UlRojEszM$f1WYwsWlT;mcm}%8QOZWl?3<uDGwS
z$KIca!5B$(F+!3U@`VChH*ZxBKlq6JdF}N-dBs=Xb@g*!`a*l}zo$w1)2S$>2m(b`
z%QS$9oSh`*bP-WNdQ%Vt)F<kE@^hcj#Wf>GoVV`@&z@*D2#vysAu*|7TB4JdXic$H
zVl1hX?Ay<N^Y>w9&*0EO7cBTrao)6s=p^tVQceCf1Bm5UQpo3S2m*D@qz%vle{;Rw
z{7gsVC`C-duIuk(`;{vh9UekygEod(CnQONPBdB@;#MEWno>^><3U8}^n*G58JDp4
z{JjanfOw*bBqn{}6u`k-0zj0wv5zVsZP?=7B9iK15HL8{^X7a$_qoX!pxlCA8^`)U
zr4)Wsfud<NTmE(zJFi|t)NEkk9cZi*v@^i&K8j+B<raJxQ#kEFPJ7zL%$qr<gSTb7
zutV(x>)qS_d*c7P^~Q3!@X)luzGFnBj@NR=7}^aWB7@Kwe#hm@sowMe0YY!SL>$Br
zgNQ-_N?AcfT2>#V62_F49n2|Dy@+`;X8%j@bb|MFJl(rhDKLo{Op>G|!vAjoy0muq
z;g-wSZeB--qFgGYbz<Suminwv?CWP|&?L8Hf0jMzf`1*}cl$1HI~_@TXeh8EOx^$<
z{K!?SsNb@lT%ahGd#sD2+FpSIBFGhrjLHOR(S9s>;(5;P|CjJiciN;4pn`y=iCge1
zso%PRoKo}@dq_+|*daL*L0HZ+oYXK2_hs?p&SCykfOo@=9-x%!`sRnOSmEHIw^&9H
z0u?|A?NF*zVq3I}_@upAc<EVF0p97-hTY8o?#)L@#I{zpuid)dvX;v|7!j1h8YeKG
z5k!z;z>fM(q6Kp~@uD-BKWnPMgOJ^FXP<p`I!Lr;`pg-8`Rm_c?7I7?wAT7SgdP|3
zp@=PnRG_Q`5`cio<=9ahrGDZZjywNU_L?<!>cNY2Ho&#lUW?ym%$gZ){Qb>=TD1*5
z(WKvHdjSYT00OKL2v8(SvAt2DdfW_-J@*v$nmzU4yOsO7={^1Fpb<wr<H$2#nZI{r
zTBWj!o_v8=YotTM3k)O*woHsMcFZ)6K6}}eh8Iu#mix)`KZMr?=1iaU^5IR}Y=svq
zji7J|)Uhkjnj{R_+Ndyg)Bs1Gvm1Wil!fosa)l&^Kdz2fO94XDxjjBS3K4@T7T8g%
zP&sxwM^Altr)T7Vd@+aL@?l8B2yvp*Nqnk8smS))DAnU<am@c2c#w=3$d!A_UT7=g
zC_*RN?&^FO5F>=WIkrwzm{>5E<IX$PkNK$&pHU6wEU0GyV+=`Ru$eyurGQAt_xG`V
zcagJbZ%(-Iw9KVWDae-!pn}fZ+&HmD7J&aayw95v0!9Qs)Qxrj#EKvwhC+WoL%NDt
zx-SbZJ~OMxu?Eyev;2zd8QVN$YX<+#n<QcHqYvTG<BvrW{U3+-?-gNk21vwufHi<I
zhSESkBQk+nvLA~sJ-Z{k3IakEkSpccdi!d2ed~G#@+CyMD$zZZi8VX!+{8hjI-EkW
zgc!5O@Z$FQ7_-Ol068(@kziw8n}jHe7#tX+5=4Yc_it@%cJJzD<F_!EL&AX3(GeQ;
zI;u6U>xj7*oz&7p1n~jw+(9wN@X!#l`??4|e9DZVe28`++?qW&Kwr6+s2S}Myz>C#
z@hj^AI!-9>KE}$$6qg;uk|$h1JA5wR0vQ?Mu3ueF<K9gK%>)EgE<m*)EnAY<9;FcX
zFd_#1kJ}KDRE+CW0c$LiUN?xrjSWVy-lL|MS^Uz+bJU^}i5tyKc=@M7ATgB6C59Wj
zD4lu;%bt8;dYIw6{CKs--Cz0*(;u$U-#;Bnq^>R+l2{WKau6z_Y6EfsDR8dG0a|go
zgLAr3VppQ18K?IdW3YW<dy;C*$}jzqy}z(OeFFm+opgjpx_Lkv0xpB+@>HZj@$`c@
z?Wq?rw+$Y!?p=Lo8#A{wDGl}$V-NucXyJSJoy~zSJ|8KBJoLk>8C(4@Shx3~4R+kY
z0J;$~?TEcO>}h9^L^|~hL?8@!_}Ue0yz(B@@C5ZOBlJ(7j_9Ndykt~@g(7&Tr`syS
z6i+>nrB67&BfPjdi=xPdq0JZW&8HGKBc`8nIOT)qk?4e3=N`}S@(n1Z5b?mp!5atf
zc|#n>1cPN}Ek2xRBEnB{xk4VM_p<KV<s@}OP67nUgcr&7g535k+tPs;VR)j#S+Bc{
zd9&w$k<21TfJ6k9#;v4Ypj5#6<@Zurb|{5nkq7Twg-J8E`)&~HmLyncto0E{y+9|4
z4ab0hP?QI!2t+~P@|Ddqf`V-LZkwSS?!F@(#Bn@+^udR2ZdG_QluKM)Dm)9NOq$@*
zH%LCDxqK7<c>7n7e89k#$eti;t?jpfppc_?{!GfV20<xmBNZx}hG<r5sDi7$f`CnH
zH*)jeuA+a|bd2^2wlJi!d52BbiCYGR?(mr*@RfCc#B1>f4u9EOi}~W;BSCe8x4_2!
zNVB$cYb%9(p7|rTmVjK5rpwX?oVS1jE?Yt}z07#MX0MlvB?=AUkycFK|N9%6sMH9G
zdCW+i<sbePap30mKDjAT^o3;-G4A;!8@}6-*yUGTfot|*PB{A5JEautlvvNmf>+Mf
z6XyXAJnhq%4g^sUPc$eF_Oj?LPeboN$Th$I2ajF5l4Q7Q@1-x#tObX%^jQ~i&RNHC
z<A;9C(EX1R77Gj%`w)}DV^q2txQ{T#q0=2cYcq8IdFSCb0czC=M6$oRDcf~0fO}9s
zndw*)mhvq9z;oH$sBpz|zrg%lKj%O3d}bbVfQ|jp^;=l^`|J44vp>wzcRrJ|KK*ho
zf8CcEUcbeLiv>2~<~1a?7q@S*c_b6w8_=l*Nn-HDv;;sh;BoL4+Wk&qY>zfcI*)b_
z7dM(5^TG=l%O_m@`meHV(PEzPlXnxHG>;pX-@&yv-^lQ6#d%+U9T&dj8Qk`spK$Np
zD_QpTXV@w;jx^fNnOM=r>Bj2zS~qwRx)(xpXd>>1>SVxlVzl)DNZsF9N#iwc#ta@f
zkJ+am%^%+WRgOIJ2#$Z()A-X@e!|1QyoqugA_5!CHLO^6Fi-y2YdCdmoLfHjbDr~?
z53~PS$8+DGZXs7H_=S-7w~RG}Aer!VFN6rlZe8~CE(avu8+T&gjC)&ABVyjNBia7g
zHX3WUa^kBW&uzcIiY-67nc2l@l=^xp_LiB^JIKU!8@TdQKjO&eolTKE>#n|wgU&t4
z0=xN~r#Ug{7%|!KZj^0+J%Ps-G>}63E^6K1_SOsf51G%7l^YnCKLa(lk4OG=2jya!
z$Y``qh!aDUX!5;fwqJWM^=g&97aqap+wZ4;zuAO6MRaWE^Wjt7xK)S@c;^8BTnMC`
z-A;1ELZcKI+A2D?LKvVl(1#wbQ=Ha^M5d+Juukh9-d{EJcoRKZqj#^Fj4xkDsi%y}
zhv;z)p*6a@*NO`Pt9OAH+LwW@22jekKn6T+Kb{x}+$!K@XA%2gM6sq;t&;C6v1@FX
zg$T<<;vE%efjMy7+qrTf<$+$thDRv$mFzaR*%BM~38dhj0a{|Ir3<|5SqMlbymFK3
z)a{+iJ3V$G5jP{YJ@_cIk3N8*hqh8}8R4L_PNY6wN4rd}-6~SARM~gIVU*`iWBtvm
z+4rQw7~Q&q+SquS023!B?Zpd$Y<P$AujT-MQqtt)OS)V+BZvyvc>PMIAG#OQ=FR5%
zum6@4T1(<V=bS`+=XeXc#>9A?@sVB3IdmT``N&JS<#$)p++N|ROO~<biaXE~F^Px|
z?sTu_aFPWtIDOK~AmZM%YKKo7Zo{Jd5HM{eYfiCk`3BbCwT83a`D}jp+z;{heSgIT
zpMEJvT)Bu1H?BlCWBay`dCKYBdCMLA{XO5~+3$Y^yL5w9zq^sJkhgQEuAhRXc?Z`z
zz_%qwE0gg6>3VeS_$AH$aa#yzZPH~cGy&Is@@EA54Dh5+zm_#$yPPjS|J@9in;iR^
zi&^;gC!vm-#W&yi8GikuPxFM=J)2{me-6KX&)12Esz{(nJmZQO7yEwV%Z3-k$C>;p
z04n?3-o1%fYk~mMOzyd*ak}IJ;zug{<Q1Rbsb6>lulnPsxbE}6;+nU8k80e&V8~03
zgAO~GH~s7rOj~#W-+cWi*mU`7O1(W69>kTq?G>F$jUvzyKBbq*hd`&L&(p2D(=%%T
zTdFo=2!r+|%^AQ7K`Bpk?=ata+Iv~>(u+9tL(k?M{X8bNjoIa}XU-sMT9JEhyn`z*
z{Q}K<hbZ^hot}g4Sjt+D%NO(X%^I|NJABIDWgSpjC+*ANjPYt?T^#EfitKayFrVYD
z@BEd!zxQ`^tR1-6KJkvX{ADX?YQ`sOFu#Y{#~;9q{pS&cA!A#H*s@|H^>st^1Vw^E
z-g*x>aDQ2DD|*g-?UOn4O;4j<o9GCS`}^fmadiH?nTLwV=p+m<u`Z6ZI}~Y$PrriL
zhu?hH0}Ma#D3X}AqcIRt-MKL+0izS5X48g{h}fgJe7<0d9^;@>0-xXY*ok1?;rnsG
zsmIccA|#Pc@ae%#xm+CGD>Xp(5SYXl8^9fY?!Dv)_B-WhcS&{qpBduo>0~N3ly{>)
zmj~mAg4iRqM!gA=1@C$zzL!q66jrE7e6i7u2%YgEBKt$7r%&cEqkEa#9bUv%lY)?Q
z)#oJYfcBr0|5nGOK2)YmUE$lkG3})dI0N47hHpePqnP>gXRXeK;V2<YE(AmnrT(KI
zDh25Z-@UfS0{Yoe0iuBPXk8QLLZb27mRG*w#jo1Ab0=XKwi`e)mq0Z|;T4KFj_K<w
zGtl2>lWDUV6GbsfDN5x6T5Bp}RUUriksWV)>+7DdcFpR0>CgfJIti#L3ty|%FeYN&
z+?fP{B5KCe>J1vr*nYFL-#3OUEMK{L=(VqT*^^rEcmDIcL6NBjpB~0+-uxK3P!Y!o
zyLNA;Y7JYK4-E7WhKlVwMp(P{-l6xu_bpG_xMAJRbZG$@E-*FWLBudNHfG(uT5DJ_
z#==`~*uH%?{Cz|3Yr$_=zwRb7TK6P472)xZx5T=8wL0-H!DolS6oeNfg$Jw$B>y5j
zK#<FY?3VU6)!-eyU$fKS|F6LV1poNQ<*Zq=)*2xQ6e3d-UcmqRluHG|@Lz)m2rjzl
zLQXpAL_YVq&!LpEhCrqsJd#e9ev{a~WAtBwPjf&V$GrK?Z{}q$dzsaPFr0Gmu20Vc
z>-8qB+GY>oGm_wUzVjU}yzoNNTALsUrX0Kxp;oI?DwP--9vOPqJKyjW2d_HFq*~7P
z%8A^3^Uak_k3G8T@FR{sdwjf#0tD~jvvt?|58i%XJD6+TPju5$s5sI#`-_;J?|si(
zU*0NmmIHIK4FgEpJKag*>Hc+b-~`SX1%L$$798`r&wuH&`|h*faj}lm9ft$-3nk_0
zq#YS=z8#oJ#Jn?HtP>KQsCDb^-}K2(eE6&P-h1!eK&cHn@qjfDJ81$9py?!b*Ntz0
zyfZ)<P{m@gr@yanFF^`GP9VeyLZBc36pA3*1=HT?%JqJe_Jdd<bMvgES{)y6HlrBG
zdGNj@?FMl06Hb~y<o@0G4;naepeb13jeYUKeH~xVHip-?Ludb+@x!%)t4oG4oI!jK
xNkbsBsSe|A5Nc9$Os+|{v1`)Jc$1ui{|B81*6fKaxXJ(k002ovPDHLkV1mw}<lq1R

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/jpeg.png b/src/assets/img/files/jpeg.png
deleted file mode 100644
index 03e2302aa7285049f5a543bdcc6557c863b632d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1336
zcmV-81;_e{P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000F4Nkl<Zcmai!
z1CS(57RP^CmDL#Io5twF+Bn;`ZTkXe+qP}nw%0z5mOb0<Qs%p^MMa%oL^|XDf7T)b
zfHC&A{joNe)8T8L|MJ3Bf3f$hj7^U9g24E_fOu-a8`(Dho0~uUF25Ed9)Li00t72)
zPrHBfJpE08gn<5-?skJO;<<yh6U*Gzy@r}yptf|1R-+A@O5FJA_h5E@Zb!G(d8`PC
z2m+9-7X}D|SV1`|o){n5;W+A$R!RZnoV=H7FP`D-$A6A<uEWsqFeZwT-IMHo+Px@O
zD)d@i{;w#oR<tpupp=6?eDnxjA<sbQarR?BrP#Bm(IKd}X>6&m`%$;2R4NntA%ejF
z(mp+tioW&rZ_2v4tEXOit4Dgpwjn=0f)g5=vqjcD@MeAR5>XJsWpD)kD>%s@%b-7a
z-{+x~bF=o+IZWRYSrvL$k1+qhn^P*6li=fMCovl_Cbi%{fT#BeDVZK08zl-OwHllz
z?DpvH7-I8-ZccS(hR_daojZ>;7T41ZPK+Xu0g*JYaTJph03d*%gE%INBHE1(gS+P0
z`MA4Ks+Ku->I~=qvdr?=evOR{xhsa5z0>u<aS>~=BA6h;7=te4n4GPqR%At^6me{D
zw^q3J)9y`WcA8Urj&bZ=U&nL;2Ij7SfdcjYOC0#)r-_Xr`EOmt;M^2Og!=MXwmk4w
zti8>33A+K1iNWCmM{tJ=_7<;tG?i+FD2|Cw*2y<x#L*0|n?Z()H1{kpFj^!wmUgRw
zo*3Y|&wK#I$r1K`?0eLYtRT0|xD60MADs=@aLwG0r>j-`Af#Up2#UbOh^txn=I@EE
zrF8R6M8h813c04w(vSA>)hE9h$+@(aYiz&AO-TctMp>cX@cy?Zm$hcI7a`&S#Ma=4
zAtIKre?4`hjYw&T?%DGMy@0{eIOUsf<KQQLL}U!zb~mw%G<7ph(#F{25=aXK6I*(I
zfK9CM9P+c1bm}cmeD;?FU7z{e?q*``H16aut(9{miIT)c1gr>I1`PmYGl1B{bo~%(
z9K>}9FJzh_=!NvUAz}q%Eq)Z@2mKL7iPdRMAel4;fUNHzjAA-HAFPMp>9KO;?~Ghs
zX8tbM!G<w|eT(XScb#24lm3q*a}mP|DSXxfxLl1Er;wx7Y-1cn6vZ6;@-L{~bPHo^
zD>!bB#Up>^$k%^IQ15`_B&kVpYzVR0Li-OcLWHOnGJE|^-0~HV!f$sGz{Do0cJdQL
zh@%)97~!fd>ru|d7NT>SH8<Ts(D4xwlv3n!9-ekH1X&9_&Dz^v2PAthh_P6)pw#8R
z>08(fFma5R%W?M1nKLWPe?67YduR~If^cy)9Unxn!o@Yyce2ecN<g(@a9{w`01FF?
z?Z-X#5f9w6=MO6Y+I3x`v{9u5*$(+1M?$Dj_<oOiufv+P>p6b>MB_1!e(1dq9@zJT
zGzO<npP^KmBI^$R6`cP}0${Dh)gDVrOWnsk_Tl&IgMXil=*^oq@%FdBgL~ZLzI3|X
ze*qz@ahir%f`NfSjvhJOc+rcVckliC_N3q`!RqQNPkiDN+M}Zrf2>Z=tdIKs5)mar
ze+VRdBvYl5u1YyhtyYU){Nm@mc;DVX9R}6|5zqnJfUf~nuh$!Qzx$nU?|I(1h`4|T
ulGOoJW@JSGj4@$fy1)Psad8;H0`d>gXwl)I>m6$V0000<MNUMnLSTY3WthkS

diff --git a/src/assets/img/files/markup-64.png b/src/assets/img/files/markup-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..b890727137a1602606e0fedf002fd7ac75972a0e
GIT binary patch
literal 4171
zcmV-R5VY@!P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000mYNkl<ZcmdU#
z1$5k4mWIFk1XX1WGcz@J4`aIb3^T*>ZsYPWGcz+YGc#jTsFMkU9Zn2|lHR*3J36No
z9oNJ?PIf(i&W)f*->-Wg$)c*Xmr{IP#BlQDNmi^}#lY!P;k*B3#tl!uN6%HY!6^2+
z4JhD1vn>j!f&~*82K$DkwWF@@{C)G2_kG2?fAo}pxB=&s^CJa7@7zU1Fh*#nwg#x`
zMr+;uR8;^alQD)`y}@hW_>N@$kx#C9^2I|>t2LAW2aYU2vn>`hQGzn`H_9BH{y>&3
zT*Ta7|9I)Dr+!d-mo~A9DMA3KPRsxWNu^=n|J)e)@wg30!JkpDx869WIbvuzAOE)Z
z!p(2u^syR&bvP?vfdtfM;8xKVgk8d67jkIb4Xk?9zp`N7Y>WrmY@#kf5zst92CpE1
zie|@oR0S<yD`?KWY#+}UdV4#b5d{95$74Vxh2I*-$x;z1uzNHUL+zKZ!@KpZL=7QG
z^bBmA15dJT<On+rhc)ED+8bH($bV$P%qbM5+CGId)B<b)UW=bo@?UA4qf!a?PU-F1
zpsICp@||-O4N%oy7#qI+o7drQN#Pxod_|3*35Y1fpaKG@D&=V&{VwF-${Seoh!lRt
z#NZhd9*S?#!dpeaS=Vc=Evs_20gOXp%$Ym?+t(9pdn>UMN+GBPNdQ0*gbczdrCvk7
zEpcGw^{jsA`GMCl;k5v)*?zG!1dyVe_~V23sQ>PD1b4iZ#0g;;umUIw2ssm+5|&f=
zxHNj_S3me4vb6vIga^<p7_R|}7%zi=J^meU8-*{GK%HdZ1rrp4PNBb5;=uB>!F$kT
zfd`baGeATbOBwu`n%|znTL?>_2pAAJ+XM$;1^VhG_AgE0ubD)5UbTST&VW384E0})
zr2X576Qxv^J6ky6Y!e&=6``*hvVZZ7tlIeZESNP};6Z6Gf8)lDWWpv1Q>Rbot?&9U
z=9c&3ZF(zF!YI5tK>!SAo1hNAWat|T*|#8tzyBnKR~_4cpZw$}<TZ81EN}QHuQoIG
ze}YC0!jhmC1Vz1q2`IjA=uhGI&QIa*o5IhYeDJDDJNYxZ4Vh>}%1!r<ZkT)I(^G~9
zEP*dzK>^52ATvQ6zUOgxIAHJG6#hPw8(wpfm;cij&LyXwS<}ncRrlBM?I>&p4k`d3
zq9_mq9{s~1duHD-x#7<te@;f0f%>iCxa^_01Vl3vB-epBC8&&~eZZc1lO8^|-=+;n
z%0gbAr&tG?0Gg$}2#~>dWHp~Qc&pQzpFiub0UoqX4fv*0$ftm|6cWIKYA)?9gxx88
zHDuqC6#o8yW$<lAgFaTzHo#?(fOwz+s1o+1@bwgaSvsqGz+VqM*`{p?ph8|a1v?U;
zWbnNyd^2SKiWL6p6#jgV@I(+T&if}0pMP(=_Rv>HJ_A5OvsD}{l%}4U*c@1y!vD>M
zfp=~s6h$yNjL3zAFJ=Ha<(9Fc5qROS4LPtng@4fbher%a)Z)kw|ATVehjYr*d%p@Z
z>q@ZA3l0z9Q_KJd8bhfoh1U`XSEcX|P2n%VeBPLV`l%gMj(?9Cr8*i+!|Rzvq!u}k
z@Y>!83<~*BtAriUFQqffSP%P$3Bil;FkvTZg2K|3BF3kAY%^uo#3ljsUW6;pM-&LV
z5YIa=@F;C%RF!=AfzTg?99(x3Yaj8K!y6OemAYxRTJ+uW2~KbND8?)0--}ftK5`2o
zii;9t+NDtHWMJoy8TjR!X$_r3!*0YcfyxBo+w=l{5RwVcK;OxjLu;>P&4Wkad+#DV
z7{81oVEE)d26lWEyZ3W+SAWaYi~j{@u7xBbOAVstFmn8MJOZ3`$n?vx0?FVZD!+IR
z$(E1MTKY)5^-rKQX9LE7Mh!sk61-~rEb!w)O)`<Vgj%hWRgZlvb7xKiwc~;pF_@r2
zoLEjBxRv4UpT_V1CcWBEN2!EXI#DTuYA!>3TBr9A4DSWsfZvNwTL%_I0*vXRR6mNn
z`5i>JeVppTjhKs{OlkRj@JrojTnC$=3bchE$7JZ{U)0Eii{jxW7j^WdWBX}N1hhST
zmgb}B*{Bb3ddJsk?D!;=(?4gHUnMMe;Is#86>Sb-q9#brG%uiWbStISX`J&gvzDS=
z3s7fqafGW^aUC<jbQ2~C;r6c*Z~G>VS(n2lPa@p#V1g<0kfezwt#iS*FM)^ua)6xT
zFRbf)*80%@&afh5!wV*bR`IExI+TKcm1HE%>zkMsDyE}?b18Tfqwx@ek2m#V%=`yn
zT>=UK4k7Nlg`N@Mro)?l5zgyGQ=ra;ml3Rd7##c~S{npY2I;~V#qYbBWbf~Ze)0~Q
z8y-z?<zorvufd>b)C8wR_&>iS_TBIQfJ`{&xbmX4e`uNB)5OWNBD@$6Cm|;fZenQ1
zXEBGqMz1?aM=3-*I&jvJG@4*zOl1!K;z!~wdn`KpURbXSjT?|nu9B#U9=;7v12j%B
zvo9wBG;UIve-S+Sb8vJEvgI4NE#Jl+*@-3&{0hc1R0jHSKYSC>FFs0b^+wD+pF+6m
z9(cY#`W+y7_+kyTe=_7?TD{uXnIvu+<l%jq)l>BS^!Zedf0tf=m@w=>)yKvWq;TSO
z;LW@oZ|S3uMGwYxF2SjyNdug_v;Mu2M)EM#k35JOdJ2^i;XiznWZJsX49J9fCGbO}
zb^><&9CyoCaNB>08$1D~1YQZT7T0W$5E3oCobpp%hQH(@T-<_;%{ir94o=OSF?FS?
zo+2mTTE|#YK=QRSV!%*8y~n@C)DDkiB+U~C2tm)v(G-`(k3gqihVwek-0i43#uJ;Y
z{*P=YOu^I_WX2-sU5wi3?CvdTj)wEfaM2@S!z1vH?7+MIJLsnGWBYdE5(Tdd-zomq
zpAz<MC0c$tL`?ux|NKD69}`})|0HLIDk27?1DnLz1tz#O)tl>|OStk8c!7sDTWD(#
zpzW;AiAQwsR;DBoE-{2N*JDe)(5$xU=PlZ-A)W_|E+Scc8PydVX?^;|Oi9}VObAZE
zR8Zreo%ZJ#2>G;Ep`RB}hc>II1C<JBfDHCyzke-5zuSPUcr2wA52iGIDT1O=1Jo9b
z06PM{{}z1p(AXjKufSo(hL^0-^+$%y#~Awcw`u<ROO$s0j_#xZUI<pvC`O0th_xWV
zIC=m8e|+%ZY>UdYC6w;@68O_+;P`e_&$u1};qjYE`hQ33w{M}b@M`>ZkE68Y?)a4+
zByOTfgrbP&(;7IANmE%|fEo{(cQI-s^6(fBFRT#7F{gKLqWYU}z|G&H>)39l8t{S&
zPCQ(rfkqMj>?MQ`y%u-T{n1u~Vgii61jwg7nKT<FSKzY$LD&90Zr}HDTR(+8@LOD~
z0bU2jR4BIw(5;^&-u!v0(=S5SKAO_{hZ9U+fY=BzBlW+FaPSDuQ_PgP==9~I24xzd
zqcJ?dVA|-le*G0nyMDv;)-a{8jFvlbi6ySp5e&hyi}4@$B)I#-iKomXX;cv#qeup?
zjNJ{iF+il)3Tn<thepHTm66p?#$WLmOnTSdrcaUV_%3efc-Cik6NnNV*@QjtN18u+
z6ZV>C({can(UA<;dmCM?2F@6Q*=unf)1XxcKvKw)xBisj5BxX11BaOAnKQ%dat}!q
zqs>7~xtsEp55~LtskjaIBPw-an{}i*fB;2!z3U~=eyk4)&O$VdLty^BFbnQOc=sK+
zO<yFr{Y%)RyHNGc7?nnO_$1-ctzbN?wIq9PA#j357Fl>1&iDXmHbb;W_A%qcUc#=a
zIHx3|4QmU3`aFV-Ps2Rm$=Icr&{RQFaB4$HzUGVY3h2bzfHrG*3UM6;n6eak;0p=v
z_OE!`zJvYUr?Gqfh{h3`fD&SiAsRf19NLN@z=<Gfi>@|7GXOFZoch>m4V=SYw3guh
zPeAVd7?PQbiJ};-*AX<=-nE6#_;vgSX!cK3#=n4>w9qsNx{<5?9{-Xj;O+V)_P3uV
z{{2_bMgu&L#^F5#Ck~+q(mfOAtimM`0-&G*E^0xPP`dIOyp2yqFS~}MbLwcCQyl_8
z$glWnTX+ES6QXftfMy|gW%V|bOVH*JAh7ysyfs&2(%Lt}CqR|v-py3%HLNj&D^vKM
znMf4f`5jS{j%63o_3|$xX^S440N1QRbr8vC-Z<eEErO4?1Y`nB*MKS-)c{2oU5XWf
zI3oVjAL((N8UHW23=K-7^$h@uiz7N#T}I;hXsdx}0~GiR;Zd^CyWR*YoR@Wb;uc~I
z%@kDc_#IxlwN^39E+t7UkcX1dk|2%{Kqm&D@#{D<pjZLt^Pz=Pj7^yJq-Rjl7{o(Y
z-Yr|<q1}9bg75_gvlvGPD5!$Sd3<7{_~i=R?}<1OR6$#HaQ1@2YxZ3_-hmKs;T~5x
z2hAE82*3q~&$doU;soauRUPk8Sda_%tnU8~UX@lWLQ(v{!?|-Bkb{Bq4xhdEyum9#
z8+bPY-;8KQF>~k6*z9}WDZFuy0~8gRyznpz2nxl&WN~NU<2b?dJ)+@S{|(pw^NpuZ
zpT_gNq5;~r3zSI;FGva()74d>r@M<dNociVq9{g0C|5#~Bw=u%%D(;kk3IWY|MBRp
zTQ+ZF3>gK+3Xn+)U#rz{E@IB?=@=tKDSWNoq?vC0z(<{O;=~}g-oE+xzyI5{k4@qK
zKpPp_Np(`zJR<b<9mMy9IJOK8*BP!gvDVSk(}Cv+M~|Ik>(*_@U-F`7K6cOUoxg(i
zGPFs7$q5gtj)8%J(R8n-;3MJO8F*t-_@g86cN~9l3cq{T&R=p4`HZPa2v2@_OGnea
zT5U`SzI_QyLU={V-~mQ6z)lbz!1%t$NE9{M;3>}NMCk6G7(9Ua?svb(mMvRHO)y4K
zot*H>*}q>Yhj`w^-~r4-9`ax=zx*=Z{N^_!BBMs2lMfzM$PI6;wP|aAYC`Y;1|W`O
zp7D%laP76%j_w=Jn{@Em7V8|&DfN1bbZj#rc#4hS2S4~h9{k`3Ymy|+7&GbMohr3j
zopQO%@e?PHKmU3E_4o{4D8@MDXIsfafAy<h4IVmpVAJX~>o*P$R}nzTUwr%h;_8i3
zd|wePlb(CB<D4Uok~1s9>Q2Ath0nS!9pu~!%mx4)pt-FAE(@F6&%dr2I3_bA1i0dg
zD>l6OEpLC*!Uc;ij+0n(&qs@sBgyS^=cdh_F9I`;n$L`j6N^o(?A*Ei(Cc3Nig#_>
zw(Vx1T!6MY-~@=XXaP;2l|`Jr?(zl%nE@3*N~KaqcURXuMMJ<>@E{At2pB*ROuG~;
zq@sWn&jDIoh*jFI9Eet{!^5ps6a#(^J|DJdKnCB)q6I|Rd6&OXlSKwf28PKU7b9<A
z5nKR@+cxKl(CyB-e7TO1>RL1-7fB&QvJz-7DIT8#LdNwS<CC7_7(mZq-gv%){{^g8
V0h`I3Xk7pR002ovPDHLkV1geJ`tbk&

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/markup.png b/src/assets/img/files/markup.png
deleted file mode 100644
index 350b1d5ef23074c90efa05e8cfdd8ac77dd238b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1296
zcmV+r1@HQaP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000EnNkl<Zcmai!
z1F-Ep7lxm-$>y=~*|u%lzQ1kTwr$(CZTr~Q+ijEeZ)E1{xm+_(*ED$FScwP#*1F4@
z9HKKidgBY9kUOvT!JGCQD)uD}u~M(Gx$77s2i*M2LvMQAFO;(e1OZYXKyZRKI-E8}
ze+@u6=Ma&JN~Q5H3G>Cq>feyBKZNLie<P`AD3w{;_d*69@*c+bn<Ofi5uu4UXyrB_
z2;u}4sAQnO=lCE{f741SfQ-uIGmWJ`Q~&y11Y4${m?uoitV~?U;63kQbabpOzSmIT
zoM>xpPN@L>w}1Qxoh{NY8=K;Hqoe<!x(Y~BY;pgK8NBh`43CTuH);sLo<^Vg_kq6h
z+@m?-z>(p1-7;u&bqacmkd#^OKcD_9-oc0$2fz!lTXEW?9rO>MGKdb6^JRGkXL3M^
z)sc(nz4Bd6@v-$IM>=`e;y(K}9^E})aFM7=EkRYwtPWjB|5Y9FB=RFq38^sG=^R%P
zSTFAJo!SI80T%=1ruf9g4BYzOrue8A_p=Q&hyrD(&HtEq?mM9Kh~SZ(z()`&g-T-9
z4rra0ceXb)iRyrY)@XH+Mrj#mBb+kCzkM0u(szj~n~^XJCeQkru-;(#kE<*#W!&%s
z-pa_>7&dC4Oc5L8s4V@4(hnX@^37`qY?ZjYg4#5Pj9*UuGj|bv>K>wheGjKX$aaBJ
zh&Y@-Wi9mQxsxL&_xr&$<Kxt#2xnueQ{Te<`vU|^-zT3RBs}Z^NNxx_^;5!{h5jSS
z9(y<Z_|4dN-$F8W3htD<36H%3vIRt}pNc|>2u|dH()QZFL>Ely*RLS>^)oTUCla3V
zG8j7-2?_{8<p-}N^Up64JmBky&Vr4wbAKTE<n!Sd-$h-#0rjvqBlQZSBmE~Et$(Mj
zb$-nRu?gA!!=dXi;^ie8zxXJ@Q4YQT8A!I9=x;wJH+d#va@guN>i_!_(T_hx_^*GH
z?VBXr|2PtxAWlF4Km&lEk*%T+xEdKd3-#}>k^JIa#P7QSJ9Zl31Da;@|Ao`<!#Ydp
zjSoft>Pr+S4kNhcQOKD$ko1n?8r9STC}{&h0FpXly5P7C=p%1K{p$zFU%o{&_jiI)
z1p6M3tCh&~Pmp`;yK$#ph0S*18a1R*?Tj8TpPm5-{+c6_AdT&aC^+I`g5$3y{>BF|
zV@G4Vhf#4%=7BFIQ6W;VBGv7?yaS{Sym;zNdm7dD=<+9D3MXHNOOj4`)IglW9}>jf
z-$yA$CSx!<Oc}7tx5eYY<Zyski!b*8EmS9)Oop}9)z!s?spV|eph19?AgSA!5^&<Y
zc^Zh51fvzjLIG6B?Cf0m;SYP@U4Qt)Zx;cAFbsG5o;bm0U*>%FWdQYhjkUEkw8=6x
zHNEXY54`)vrucX95v;7NqIJ0L#bo^w`SM-koFmkR`T6<k!yop5+yDBPKYfQ(1V<fp
zB%k=iC+Y6)#+XbKgKlDsZelv<R+&e)@MT(4C=^*-Slsr&2i$Z0pa1lSZ^HUe0DXOZ
zLm&O<C%-a2F?m=V$BBq25tN^e@&^FtXXi6Y1;M6Go01p2;Mp(u(;t8T1)vDTKm{lR
zb>&U8F{aq0UqnJc10fIqDn&X3z*-wMqY7kz#2eJSN#p+l>WiZ$0HTcm0000<MNUMn
GLSTYZ1b`<1

diff --git a/src/assets/img/files/math-64.png b/src/assets/img/files/math-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..d98beea61e6a686896a0bcd9dcb687e20f32b628
GIT binary patch
literal 3170
zcmV-o44w0dP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000arNkl<ZcmdU#
z1#lZplZKy}U9p)R{+OAWnfaKRnVFfP@CuHZ`D12wm^m>^7A;KQ-c+`%+VcLfoH)Pp
zTCJWHMNfARDoR9HNX7_CL1YOj#>dCG{IW}#tyFuS`{p10vGr%3e`U2+4GQ@pMhs#i
zGa<%UZ?8iWka08Y+p|mU+ObutbLBt#i$D3pKfB<Z^@wm1CCGd;)-e`EQZA{IyMw^o
z45-$R(vCwRU*KE6^;?6D`zq)453T+3nQ~bv<xsB75r!cmAtnqW3$2BrAHlmcYZcC2
z+s_?0JWH|Ed3kSl*F|Ay>XB&{(D4H!=>ZTBEVpDb?(16X=UG4tRzMh<@2l6FzZrRw
za<m2sdF|t!{O?<zF+Dwl5rr`UVGv*f-})f*ZQJ*n<a1d}(BP)a&*GWKA7<66H8_r@
zR<9F=0t&<c2nu_R5kL~C_9+krA|`$wnTNp;x4|Iscc#0$^!-sFerquS=&042ANziA
zR<dNY)<_ueAFqAFi|=m43ql0Pf(DU=p$!6|4T4ADd*reiB&c)ar5kuUg6|&~ifI<e
zw6wq`Gn&Y8E4(C2zvW6GG=@SUyQ8PObcF~NTI7n5R6#^~fh4>w>;HN4b6)#sJIcwB
za|^b-13&<U{R4$nKA%VY8rMacf9lZ(=^GeK&?Q<a&6Mld9rp!FfeEEI3?&bV0Dvsi
zu?(mrJpcRl7_Wc41MOtV<+2uDDZxrXfC9h>WQ!T3Ima~@ujBED?@fhIuZB3&Nj8~p
zC$A+@G4YkXVE|e5Aee-I{_Rb?@$oK{n<byMnQwW!B32+m!PSI~3RhjYipL(fD_QoZ
z6h6_h+L{H>+QEcA7XFi6=m<WOD<Wb5HwJG7z{x4R+BDakKg`4T-A@1D@D~@}x>SB#
zrBrI>#rRR5ALETrciFPf7D^xjDEoX8K8vAIndO>uhj{4jTO#<86#{P?i?0AjYdebn
z*Xy6!%qyKClPe&`pp>!(nm7g`pu|w0D|6M^ecXTN%_|4qK9Vl?(MKO8Rv3nKc6P{b
z|JLvDdeq-vet!$-424|IE@+ga(dgD7pfor-pi!OXvNL<R@Am5%h~Qy`z{k&tpcV?i
zzy9mL(yE@GZug&`e@}hBdlEk|<ce8>FaQJx7vs<pgvf_Jjq(JSuJ7cYTd!kaXcT1S
z!HZ%+x!2tG5V5>wgQ3y2-?-(#On;?XBa<uHMNR7$bZ`&{K!f<y%Hv$Twu8HFzIH{z
z#|?x9gW%r#<k!%m-i)Ka_2A)g1Un9(02c`C9act^E&KZH1Q)F-TKK`?QDEi4A8#CV
z%hTh;QVKVhFXfeX2>d3<{Cda*LKh@}jAN+IPIB?O4(`6iX8yE<w_N!`i57{Q$r)p6
zcA;aXG~j^(BSJ1?s8(jU?2K;ix#hak1YT0t0&c0JtEB=Ip4TMs156x%czJ6)3b`z`
z*=epktB-qcz5eupm-s?R%8fze02pI1c2^e?Z$Eu86bd=&a}#!vbKmVZM(`u2P3DDk
zxgv&nDU1n^1;9fjW6Qo+bn$C5Tyx$C586e}=>s3Pg@vU}XlOMtA)(#hdv+kqxDH{X
z%+*omAHL_d(-U64U<HKCOCiU)K;U_lI`fEUx3oNR-yQT13?CQ%@WeRFAu&R4cW>M9
z^OBSR7-{7{RskOQTm}`?x$d$vdHlh<>088>wo<RLb>D=&Qc7{Mq!f65z=n~4)q?}=
zz}vRifGx5D!Z0M8%i=Yv+;G|1Jn`_oi-ET)<#Swg_8RKs?E$IdXj(HUDB4#%J9)US
zv<+|DLV5)lV_N?qyUq3MRc?wh|J0)owRMuCaOldp1hooICPTSAXLpt&(A!z0lvM;_
zxU>q;nv8BA-g?sII*t>!EqrBWiW@FHlSdzlGT-0+F_x3b(_0k0YLiC3K&4#4aa?xp
z+Rb^Ro%Hwh()9ecYa#C%3dNo!!HY=xfymKA2U@qodagX<e(RTi6N7^z7-N<++PiLn
z;gTYdI?bR+wLC}Q<oS5_1P_d^C7WA@(LN16emtcUxF3J;4zZ$sR$jAi!|uVMk;|1j
zv8m2+^Q`WK(A4q$Lga;Jro=zI^fpi2as8=-x3~0_fS#K^LTr`ELyerPek7C0gvg1{
z^N!B3uB$+Qr-PHrlg(yPg>L@t`8Q7)eDW|PDK#-M#k>SJlj+jh-DW~Fbg~vX#x&VB
zUggkqlX|U2wN@vn&GPJBH=Gi96Ini&ofsPIxd51;MQ(q8F9~Jm=IUBRK&g|m!qY0t
zxr2&O;9w}^f{;+U_^bbYgXiwKaarM$13*&R7$ITHv%Dq4`9mFy_T|YHOBC~Y$anFV
z|NZ*1!pm`v#8Q5hU7oc)xLh#Q!`gu&j_cA@D%mk13c|9%W81M;Bu$f|<=oi#l__S+
z6^t0VJ3HxHy@5SP#+L<N+WTc_`QdjQIKbPR_A@jzf)VKJ?O{WYX1J?!S>Rjl79Rkm
zmIr><!GpZ;;SNSutpb7m!G6|tsbz;3A%5@T0uaAJsgnqQ=pg_5!FEPQkHHW0vA$a~
zvfS|2NxNO(<Ys>7fdf(Iw=+Dl3I!2-KkIu=6}-K**9A^;pSNW{GP)Y2l+Aop_NNeD
zu(x&sAl3vW>I5?%_4yBMpGRp$U%xH;Qw$&bb}B%?nmVxo@A(h6F}ivUAoO&1aZZ1h
zzGC5&XFm4QZWma3<}JJ}d#ylF9Nxc|>fr!4lf{UkUHL)CW#^qqZ>ghAcp>%+$vxTd
zTlekfrH{5pWxvM4$0trszQk11Lwo^r+b2Sers44PoDD$R@L1no00dBN!cSMLyt(NB
z>o%Na;YAFf>@9<$SSqm;DHILQ$8nq`!6U@B*g<f9A<)jby&oE`y>Ja3g?xOP6bIl0
zrSN?hS366B7wlh~gWwW=wCFAs(4mLTzN6Fn)PfJEKPc8rR+GyYmH-c81m6n~F>Q8%
zHh;0nXotR@-sRfWEg8Pi^bj#R(jo(}d_Pw$1AO|ZZz5|(@Sf+hcFpj|uIo%LJ^=9;
zuma)Z=Z%rpT1D9_g?*1e;0L&_ORYAs_t$>)7r(2gr&}T=10bm#aOJ`)e9xz|vp`o@
z2fiO1%X9!J3dI~j;8QLOyLazC_#;2`Jx_l6>BnPjE`>p@z_M2;s?{p43nRm8X*8O)
z#H-aNp)quI77;N_PL=um^Nojo<|lvfnQhy)e2~p%Sx8!dq#-M~&jb4p?89{wK@d`|
zRH;<zSop3Y+EE-iGR5bgjUD=#pZcNyhkw&?T+*ajFaj$OUIc~0h%h@dL$m1<onA-Q
zu#a_hmC)M4Gq!Qlp`ZEbAAV-r*3ECYuERnK!_ZplLP!9$!ZIIwBgXdmO0^XpVtAW*
z3-2b5_k<t_tY5?|0H_r;)y3O$>zkf$Gib{`1%4jf;QL`Kcr0A4HO80(yaHAbe0;6q
z*9uB0n|Wh`G<eIEWJ^lV%~fpQaU4wx<_d$C7H=JeLJr4K#PB~m4{xD^Ah7;;(pO)7
zH9zw+Kg-dh<2DFdDS#CUZ++aCqwhS;*x1HHKl{@^^vu=>UTeK*@K`Y|ot>Th*`NJ6
zk3Ray!1PRIbEDz+E2UNje9LEq#_-;|Z?j>;nH)Ykap)(0?E9XMGXEw^l+*Hm1NfJJ
z`DYFtI#jsjmfOBVD_t}q#FB;D0>a{ftvl|yU0M(Tfw^jx%G?}{X7kXG{>b+}yM5c1
zHvnZVR(#z~1ppc_*=$z7{q{Tmb<xF_-!n5)L8<u5B;b>oPXI0^^GQ%hD|>8Nd%jP(
zTw&kdo#Q|Evp@NbV`HB^4|L3j2V?zwJGL;<7Hch$(m=)<$W>Qeb@6Zi&hP#Dn$_zs
z^?fhqRmrU;h)SFtEIRXv=M(ci$!f5DJ2JI>`_?_b`YS*G$75q-9|FY`*w}n)&;%OR
zY}-B-045HA1GqpIC;;U1`C?aB=V}qj0<JZ101c=_JN62c^~nlLX(uHKPh1E}*{RRW
z&Xz09X43<*Ezpt(K+s~I1&6vd8vy&59|s^&32`uNn;10q){@}q#sZ#{Ye^48^03~T
zw3vx~O6dpI;&w|{QKU<yx2=&5m=3zA3P@bHQ7z_pK~3ua00)5C#fPoakN^Mx07*qo
IM6N<$f;>boX#fBK

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/math.png b/src/assets/img/files/math.png
deleted file mode 100644
index 70509ac82f6c1888950378eb81507fd30ccf2032..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1094
zcmV-M1iAZ(P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000CHNkl<Zcmb7_
z1&r%B6h)66H=U-#%$-?gW@ct)W@Z+xU{TDxAXsK*W@cs{?C<ZiNg8`IjipKTInp)C
z=Uu;NwZa$!fYy2=t<Bm>Il;}h-rn@(pW(>^!-byEuSAtfnXCxiwZ{hDKIgP!pVpDi
zB&TefYK*~=QvRLEIBx>f0~kYZxm@|ukxutavBcd^zRTA?{XwN%qEwuvzdgehXC1@Z
zYpqGCJO{}ctT`+LgRyIv&W@HXl#(AQ05JKCQf(8{#Tfn`e@>P0ygWe=GB(u31t;v!
z>f_^-7S90|MhZ>}Za^C?qDXsEO4RSa{Yp0LMnO&KJD+%$={ZAdOG^wZQ|Qfe%E3EQ
z7#*cj^&8=4N#`cDhE1B<?~o(u>+5gZde39s$+DrnwUr=@==LIx-DhV;hli>9!OFv}
z00f}+JmMTctoPeL)56W>C@vE8wg`^hdn-nUho}ZChTAn;8!NyFkgaWPczI9M{0ha{
zS(=?P$M3rpqa(xkeh6kMa2lO!3$=YLzy?%N7*Gqt`fFKjq?>b&+JoVtL8?JWWTJZR
zg%FS`EGhS{a#PN+N-O{<V>Ce!Fx1t=c_$oLPfNuQz!)k)z&C$P)(_=eMJ<X*f05P{
zdOOIwu65m50|52Ix8LAq9Iib3SjG#5hS%b`S=Jfr=aZlQ!;3=JFAP}-XyzLW#KLK)
zL0xjVQ?b#S17DAi70l9JOHMkhHPpd(6J>t>XL2FuI>~w5EsXV&HxPDVv{b5mr?t*5
zS<s{}`XMiW{3GiOwzKA7k1eQmP6}?-*Vnm2*3G=B?1qdbmIWtPYewNnn5jl}a0A?=
z;mO?kN7+%T`VDX!03LnkONIyg*kq`~0+%oAU?Bi38~#`fA06yvqj@;M(xDCYv0wTI
zOQxk3>xs9&LQ9u_|C`{Y$*I)!p;oK0#X1F=GcNXg(qlOd0UBOUGG4TJj?LHTM@qSH
zD*&upZOBN+=3S>=kU%+(P>xKc$T~<Dx!udrmTR)`R5A6EX|W8H%21pw&i(k~4^v)z
zUXdJcfZOpB^;l96MG>)C@_7$~V0N}xyXxvoPkZzAm%q+tn~*|?RQ^^C4&eJf6aW2(
zlxn_C)w9k#?Zg+Jd-~pL)sKVCqJkj6b+hT>Cg}js^L+}c(`nIwNO~!mn4ApGIqS4z
z-+B9uN9v}n1G(LH+w;mRuZZS+UO0|}tV`j@WbDWV*}YgYnM+wWH$637J?o59kDP}C
zjXxCtEiEnW_uco<6Kk!#&Q?ME8DoTXYWt=CYY8Fc^vra0!*y5Q_|7|T-3{b{5U2np
zpek$-Czs2$dY;!8A9Mf(IDoYKX#to-f-nsHQmIq~T%eW;uo&?F2kKMi=-f?<KL7v#
M07*qoM6N<$f_JeO)c^nh

diff --git a/src/assets/img/files/moodle-64.png b/src/assets/img/files/moodle-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..44ad3a37d35797cb18baad5437af81077663efeb
GIT binary patch
literal 3578
zcmV<W4F&RvP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000faNkl<Zcmds+
z1#~01mWDs6%8niGbcV5Mnuq$$G7d8{J!WQRW@ct)X2zz0W=wM@X$Tm~u9EILb?Wrd
z#x8I2GH=$qf6k30JF57*b#?1XRw6>WgvswKr8#`~F!SdxU}WTI_ES&%=O^EN-kBE!
zg<|OSbt6Ww(S(6Da?B*Oi1rxSxmz7seZPF<f$`5>{DBYr{Eo*x8Eb`yMw0wK)<r3W
z)`~QxIzU7&G{*j$h$uivq_w74D)Yv-zbjfW_{&9iF6q20Fd;cVfsHIS6pUlGV$gn;
zeSv1Me*trj@8iUd%y7pgcYjQdKQkbT^kfJCk(oI_VtysrjQ<<0)i0*(fExI7OQp)&
z8ahX5Dpt|;z?bp={5gu_gXF#H#2idyFrmd%3{lk*20~Pd@G_n3iSq1QaT`l+c^s#l
zd?MNdDF=v&5EO_DkiZKlK$Ik72Q?vdXE`r{$g#esH9bA;&&_1~cTB|r`5OHCFpTCX
zrNEWe1P1u^C&;b*JW5KmXDS$puqMPthS&*JOElqxAObZ3-^uQCZe!66kLA?<Sq-8s
zJ%kg~dRTWXljn&$9b+x|e0FDVPv<fbDdEVs*48;dM0y|%{xjrPehn?u;C-wDg+hA@
z2tg^7GAJxwwwGPiF7}>t6N|2yfbX3VJPqO9*-qd2Q>DNf+hdH$iSXYYKoix&f1dVL
z-$aY9!DkVr0F72)73gDOWl{Mac9uKXwd_XDy8JOShj+q0{cbxWnY=U<#3s1%rw;$c
z8vM8Lj3(dK21I~D0|IetwL*(UGC2lH?d)811M@C<6sI2dzYU-C5hlx@8vGZ?PrzGM
zgU<pM9DgP)8jICkHTVqM7hK1j3-9H$mVgI@#u1>DqLEY#ui#g;HNWQD_!IEitUJ|p
z0-gwlP6o=Ft@Ezt%>TTL(~h6j8h2g<7dzbn4tzNj)UQ8LgP#a{YVbMders@@AQr3I
z*;%q|nR_{B{O9d01P?;G{0lF<5E7XvV%F^0yz~7ZqkGMl$*%r#4Bvii%>!u1R7_=6
zt_B~mdF~}O_*-i5eXR$dQdRlC{N*ok)!ToZXMX)5o!j<f#Fk@tAwr=hr40=NR(T8*
zBR0*Oxbru(Bz&`S-#@Oq4HA{AhUfj;iBCRl|F3(i)uVJ|JuKQyc8UC$Duyo^HqM*4
z^ViqlXSXc8IOfV<{mRR6)ZN?F^~B2Xwz#~t_^1TmbwUiUvkVkNHpXFpT}#6QO(LKi
z;f_OH%w>FwDMx4or4<_B7`(;md<?%~?q!_W`tV6VB?s8fyfai}b70GYH4z|a6jp;y
zvb|BA3>2bT*k8q&Egtr6UsBe9ue&=Oeub?Dn9x9EkCA9Vl)<PT28vQkcvsZmZ*mh}
z>%*s1gT4u^>wp;CR4r09_!$k#5a0PsFT0D1&2f=)%l{d8k|uo#80QTI5=p$5mx=`h
z9}8_g>@N6hU2r{f;v(mvfe))?#>U1cPL?>h{{U#sKmOCdGIRL)d1?93m&kPh*a%Ej
zuoa847VS;k`8?Yf-o%{0vb>F=fbHA2vw7ntHgDd{z`#xp?Ay<gBS$!T^eCgFqg;LM
zwY>KAuX|YGlL(+b0xA|;3h{e-7zjETSb7ulF1~kKySm-Gw(*BQ{E^iwSFv^L7KVq1
zDVNHKSWpU2Dat`WM`tH*d(|ts{>IxLZurCj5p@v|1qRRSVprJ3o@KYN;L@pWX-7s5
z^V6UIf?xgWH|*TL6{%JzS1Kr_$Y!(nzK=DAsAl71V=O=C9A5v1H*m(B1%Fd`N%~XD
z0X8&vnRfP6H2as|%EBuj{XZUN?ASHH4}b6j9$fiH!jWNmeZvK_6ytQUen?}Y2xB4u
z#0rS;xF<f5r$6I42>i|AX|@Dpk^{8z*c<rlJ?}P_T=y7GnVk;5Z{IF{^Mh}(<G#P3
zD&x%YHDld*4hM$aMN2WLpe9Ys=5j<)$nek*#o`F<9lZ_V`$twn6oAr@>tQ&*WQOo5
zPXVnpIH#w3M=BgxaRZC5xhECAbaX$fe)x4ZtXaue5E7_14y!&2m587c5`|T)4e_)>
ztU^z;qVaQis+9^s5b%w!eU0D!?)QB7U9V@}IdSHvcg?#oTYruehNze-N&&HX^t9#C
zv(CU<a0x?m@0u38NO~0b#U1+~k+PQ2(GeEi^9D}rpABMg6;uKSH?CsmUw#!Ib2I<%
z(LqQqD05s;qO({ej3S~ij6*((VngEVjxsbjNEn7_rO9`6GFm86{mu*N53Ztma0}ty
z)u^@(@O<#vK`BrW%Np$PX6%9c>09?TGMB!NgKbNiz)x*6q&_z%4~a}Q%q(1V!s?}8
zT)Euj`@lqXVeju=MRfX#x<}oC{kwV53ttpJ*F_{*_lDRJVa-g4H5OxSJT4fYS6$M}
z6BidKmCE2xK(~RC1UhLnpqv*J5LLj>aO9R>PYK?NkZa2v>F@7dAR<R_<lnusjHB@L
z%e$X{f$#lrTu_Y?UVBFeqYa9j+5P<}6o`<|=g4F-7-Ojf0YOlvT!zqwRI3%Lk>Pp&
z+0PRe6$wHh+n&%0NhU_ckZoWMU?J1)eCixTCHjB<7=|zUcvE<R=0{>b`pM5Ak+qf;
zOBb%Jv~?dPjQScr=S3P;cv^dO_4U(#;z?w)8H(fM@uMybLqNq#p->p-)VXKz?CV!>
zWB6Ty2rL>m3CHmHZZiM)B!*AFp5sgFFzdd7+5CNCa1<zFhuEQYQ-@F63|)4~MYs~6
zSSUN-4m<#=4j#bs+IYmAe)biG!-WckNKrB#6|2#{$HGO6`Hu_#lUr`R6M*U;EN1Oj
zQEi>zhMF~GuXr6p-H(Vt2J=hdf~Cx^j$?QH3bGxz9_!ovO%B%_l?Lw&Xe8elOCt%O
z8kM&yy|#aB?hgzWk1*8P%V^Fg>^F4O+SBiO2fZhqh5M-U&c1=@{%^P!1skDe&xzqD
zKkED?*HPL23zUoRw;@Ni!)fX8A~Y|A8p2EROVv9t+VV$w&hKL+b6nl7&ckq8F5pc6
zFj|3<5N4gmp-J!p9O_t1m!C`ikK=%j{yKPogFXL5pO<kR7Pn%mP2r(=A*4xFJ$$}A
zNc6zZvBSGkwzP^+G=cRf*Q{hTW${xhJd~nN+OLCe&Y+sYC!=XQpz)SAtRQ2Dv4{6I
zfOk~SHI1`+Nr4w=_&=J%C-a*xfz%u@IooIQ(3VHW4%NY@5T(MWPniC$t~tEW>@lF3
zB&C3q!;EsSAAQmSq&!v!pAM7)-vsEPhL^u?2}r|ipIP#6U`!o+bDny5nI^n6pV1s%
zfaxv)py8u#Y|#~TRfFd6ZlZ>n!#A2FQ-)9YWg3sc<VT5WnC-{TzM&pIoof1DTBO6L
zC>=hQyCIs=5|A03-qw*%7oK|f=5w0D3zFbWI|ry4!8@83JSq)7g+iLcBP1r%PJ+{e
zPn!CaRS%!;h&1?gc4!VS$4I7A3MZzf`=y07U<@b?O2y;Y(%`KDv4DVrc&@eS8=Lt0
zQF47i3@R$6z&rDr?FQ3hRzRt#!y}j#cOsP{Xblj<srKH~Gra0~j{+>9KoP^KzSC1{
z`(XK_!SfK3zqgjCcV1I?Nv<U+9#BzaaHSM|<KyM6VHowHlmq|po!*Mb^opEx__#I3
zlFj-@PCe!L`V%2iBq-GX19%akQmG;ce#XOEnOY7=ez!cl0Hna%3HYE&r5bY5N&OG{
zo_7RqDmg%s3n|sQ@DKyKWv2o}0XBvw3?n?>qdH#P|Kuk<_9+wJLwcS!*#VMTS*aF<
zS17_Tq_Z<mcULE26j7;!RI4FMDRTKNQ4}#cQea@$uAvt^{~6b>U-#e!8b}M!$UwC$
ze6d)>+A1fWFdMBE)k;XQ6cE%}KjR}-ICN-~wf8?b{Pd?i;l>*L%IWV0MOriADaF2h
zd+<F)7#haLON<wTIMa7`x8r$=!J)&fU%z4al`ntZjXSn){XI>jNeO}0ga;AJ$jC?>
z?uB9yo3$}~91Vkm6Yv{{Ur~eKzHRI8Xs(nb*oyGD$6FGId!bOC5q$a*Xwm1qIP)hW
zz|0UHK>NPOgiTVb!PoETl%lI^X7B*|M?d;8>(;H0ouIWsTDZb<|9?K0#q(wc51_BO
z;&RSE|2*FDj(4DxiXDNpW_gQK-Wp>V96B-scqa#hVaRiz`&^#zgeSy(?Rl-cv9T6w
zg;J?Pt+tsFd|eX!*vCG`<(FSBQ50FNb<4q95sJkUxm=FnLx+c7^5SRRoWQGko0@z8
zXOjH>_rD+AyJz<U3l}ZDaD2Rg0tENNr}yL50hYSIYXIi-n{9TiwS?6u&i*3y=*wUB
z{3q6moVCCS5X%DMv~fQ%<MiG4B>_h#&d36+Sg~T+JKp)8x1V<E>1T&gcx=ZZQnxcy
zjgG~Hlsi8em?^CJ#BpI{Fp*JPw{F_|<~P0e{TnuHSPkSRK^q4+0>Z>9Kmb${3zPS)
z>wrw+fIOhu+S=N?Iy+AmBn$Wg9wa7c1sYJOq^&ocHtDOlO+Da80Z7`(KPV{_#>Xp_
zY6$oaylbZ30Wo|zu?kR4UbpTC)rlpb$H25RcFhHM`_%WHw*Iwx==9gDyIku+z1|_l
zvB-@OcL}6P)s34&s3~4!Dw4FZBWdQmDPDvB0^W@mU9e_s+yDRo07*qoM6N<$f<N@@
A+yDRo

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/moodle.png b/src/assets/img/files/moodle.png
deleted file mode 100644
index e9822356773a9545ab2279fc179373c678b5f451..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1212
zcmV;t1Vj6YP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000DoNkl<Zcmaiz
z1F&PsABDfZN}ioJ_TM(vwr!)dwr%eg*0ybPY}@lR^PF7uZ&OLC>kd+Ts?Jq+f2VV*
zqeKLNIM#c{aXi8H+~A=bE=}+2e|zYtOnrT}FN*!{92-)jTs`(56MuK|xj(5`yC4XV
zxB!9{9M`c|xUTa7fYMqcBEtp-{6*SHRfX%9Qv1QR*qu}H{Xue_JuGY3g@&^qV%X@B
z_<j9|khhfBf)reg6fG!AMU4%$f3Ykz&rwPNcz6|Fw01G+S8l}XUxRoJcvirQ3476a
z)V*X{hvwk}{Gt?SEl$3Tv{Dw%yakJJ(v>vD{iI&IiR%7M;59+e$+D*1NFR0snU)NZ
zpEYfi-Mx9o$k}(tfAG68!&_cHYJywc-vM3=68bEy|10((my*e}7T^GsK$L}3a5BM}
zeBsWxw(OMdTSV-nu!1(0H2fF)u**vD9Fl|!NLjcPj9|j7nx;llRaMH*21Em$ENb{Y
z1|IlepdlS?>zOq1N7k)fg|Ic;7=e-<KP!l@@!R@Y`RiS&JmOX|%^3sVxT%vV6DKll
z+Ega~G?7uGM|0a9w;Py&C!CZckwrKdv$Ay;nvc1MOiQuzxicp5!D}xud*%!lxAid4
z-_K!39KjV=Utb1}F$gAL*^kqRD{FMiRnO5fWGFh@!=z8&W#X&_ELqn@HdRk+YXu!v
zJ0E=T0q5`1%CMd(1ncLZY#Y@yimtt%BN>(~$sYQjy>Q0=E%?_S`<@wu5uz-HjsHFW
z`ri)xG;Jmudk5(1=)iJQ+`dOOf6snH(A$Rn>s_#FhoIL_qhiVHxWoQL&dZp9>dN#Z
zmSwMZu6yDcv`AN9Z#G1<D~Y3c{%^Wj9In7S>?r<xz*%Hgzr(;=mtznA16|wQT7Wfe
zJP`4F(96F>{`ALUK%yiojx{=ODE63IJ=Gk=QM9v1&1!c4*KZ2%k=FnSq-#y@c+~(P
zy6{csEm};1MNy_hRog<nzX1`5vGBzv3L`{{kkVu`ACcsGV{=R?%5*naGlBtgmO&EZ
z2^mmQX7>h<2{08Qf+T?gZ22z9fKnZizpYRcuqC|UaQrUl+R@~yh9d&m^iZNd9D!;Y
zXXa!_?1s*D6Eyu9(Zz2{DLl``b!=1=#fZq5p5B2)Iu=(b_a~AvHuV+)9M`3zy}dm<
z*!{Ou%3bGx0Lh7%XT;QIAX~!2D8h9VRh5;XY*wvW-GA1ZryM(D#?*BHmTlW*cc_KZ
zz4T2d#{_^}E=xy82acO!`SKM#r=D`$A$j=clw`HFwc|K82xf<DSqoCOBCR#H<FaPW
zn!&TqJo%`(b7p-;Le}qp|2tlK>1AqaYH(dIZx<(T*LCuCi*^d%igt>23wMXg$|}~a
zUDtEU$;Tfwd)ADP*+L4SzP`Ts`R8ALZ|Jb$zYfDN5)mbWD*YN&`~{$k@8+(QWp#CR
zMb}+-<#n@WPJaui0zzN_=m&DD6ymt9Ta|Z%h}eJw*nkD7gp(40IF5t71_2L<N&(qY
ai2pMiPpheZ`)9)d0000<MNUMnLSTZ(A5fbB

diff --git a/src/assets/img/files/mp3-64.png b/src/assets/img/files/mp3-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..13b8da0b8d9397a6fb627b1fe799cacec5b47930
GIT binary patch
literal 4301
zcmV;;5HjzHP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000n_Nkl<Zcmd6t
z1$Z3Cl7Ro7ncdlyWU(2;c@(C{p_e!ekC~a7nVFfHnK5t|20t^~A+saNS{~@WNqu&I
zb91wn*7EyKZI`-xcIdCJuI{Q`WsISHF=Rhi%HjU|@8_7Kk7jgitoVr6zv88HA9L2}
zjY>7_?d?MwO{`<$SW8<!(AGNX#~9aP$G!Ke&Ffa1#x*zo;4AO^@IPPt+~=XS;qVj#
z^4B&|O5r$)cBQQXlH=zl5RXY}1=y1u$DvWL^O=u-BD$eIdc1$eiBDI}5XW^aXdFjG
zI*~XQ38N5-1yrTRseT{x=FY|M>)rE&(;o4S1^t7~<QyjpAuTgC1sLI1rdaT<cO3Pv
zNh=@$e|^2)`b73KtI<gF$E|Dm(b_v`?j6N32zV5RgmEHKlt@63^jkp-%05mj<f%&@
z!gDXWlDYHe<2nwtR+C6;vcqNsUK)t@m9c$`Dufwq`ERvn+sU)&>+5=bq2PULG72as
z@T<cxIwFB3T^yw#iuvh^+xW?b<#<7erxj5Y5{Dv0aU>%i?uU;{1)Lz_NsEr>nM<!=
zVAjkWYino17Bvqxb#C@LlfGOmvs^B2?eFV(Xu?}3RXnXVSp^tl`XCQJ;%94?@$<Xa
zQgU1h<)T1)3KXDF;5dll4A50ZwOU-c<T##o;iU}BoEkj2@V0G>$(*Vb=veo~aa=Nn
z|E&NfQ7rtr<^1BFbqTyjvAc{;;M+J5yctDQqrv6#kL5|{Uo=(tjM=vzZQC>1si8o`
z(2)WJK8*PJhL!yC-u0AR55MfAqZlU_9-^X)Q>%0N+#`AXITtWE>;D(twndn<0_>ds
z`TFGv{04z9mC6_$i{sOfRssqLJq6<xE}ON4s~&q^0zYdSz)LsZ0+dqu@Q%RCod4y0
zGV+wm-SQx%TyO<GtpoyP&|@_&9bUv0k2;5;+0y`C8YY9?UIBKkH$lKpSKcmW?>jDj
zR|%svI7&p}0@6eS5t?}47#9!B<MKy5X8OR}c7E~BJ@;JOiK2+1!9l+I#jo;*&1?AC
z=2iI0!|y3$;ustw;AthG6rqj@_w8e8?;I{Y^HB->?CA$@OuhoHx#k+uW#-V3`~BN*
zaQ?A(8*UikcbCv%i~<}NDGCRi2SgEsF~P_v7k1C$lG7i-@SKU^<qik7s0y?;iD-;P
zI=t`)+wOa%zFymjTLJSfI{&5DRCf34N|jQnOLliICOzLlfzpbWiD^9mUmoV-)6O~=
zyukWJA7!A~Y*DRNXoZ2iT)`{Q)73@UFCj{m4OM(t;f<Ay0xtZ_M@W@kf1vNhm2Eq5
z4a89Z%3g+JThLN6@?78#a`CATz|YBrcU^~a0zNuA!cBMF&Yhb#uw`Tqqpb!_9RrG@
z=h0U#vuI$L6BixHDMua4tf65-*;PhUf}f~(RTYu$>w2x^Iu5NU!nKQ=N@EckO)!?s
z`K}=u`F8MKr4r+bWBkb<e#>9iEN5pNpt{R=#UiR)01EPw)kO9Nb=Ga$%wO+b&+skR
z@tC8I=jziR$-J2}skZ`*(HQ6)-nQHLfG)pGx)cjV>UvyEUoOm01sI~yDoba~O5pS7
zJScj~C2qX!7QXnW-*Ar;(=#|o8AB@wWHsq37V*6T0L>_*+H9bW!7UaTCE}+^pmoib
zwLIsnv$^=BGYND=to5P6OPxOlyzZVJ(ve=+3IslmBQT&)7Cv-+;*k+9>7U1?XFQUj
zJb0xj7kqy3n_uwto3EoZe-6E_OQYFhL862+A9@TY%wNRZ-T_g9LQxM|?5^x%^^W_v
zaq~LX?c9dvxQs+CKK!rWvtiE;UUtr<c*-R-5kTkgkgEYNisSUlO9De8x-i6e2BiR_
zi3=`zbc{=f7jo%YkIscRD7uS2-~9QH`PRR0VsObKn$0FN{1VST`!Sq<+(YRvbrZ*0
zmQF1r3cY@r`F(?&zVIlXc+y$iuw@<JyZKr+?%s)CDDabi-%KqCc+=9WapWD%q~S@!
z+mas*iUr8aNlYKwz&!T5QR5XZpS^_3A9;4$O-@f&ncw~G&wTsN8wI{ruW`b{#k}^s
zOIX}LO#K1x-)#Qhr7lLC9mqQ*iaLQ)797bJuKgo_Ty-a<LXlsux{ZPE9$t3##ngh<
zWZ~_z+WA8#)-f58mkGikkrq+GC9c)DbY`->eayLS;fuv08#is_3;+BRy$k0j@O4gG
zawH$P?8(gQ>8H|Y5F0&VNUODxL`k>r^R}f=;0Y(3ne-c!3I)D<>$P0JakWexGj(_=
zj@Fu#>{oy!Gl+^Fy4m82*++2o+2=EKkif<<ny>xgS2PEE<@zN<GkNocS5i<e%`lwo
z4$mGB<2Vt`tIoTW#~yK<_=!kszVu&zVLVZ$qns(iTMN)+Mdp9mM+G5Q%{_`IoO|Ix
zqq>q`WZ9~f+`Q{Py1Ki;z)R1*fC0ZtmeWJs-bOk?IS#Km_cDfyT{1mZZo8Ymu3JXA
zP?$8lIoK4?Mw1fp{-#vKi(;O*;5eTAxQixCW4TK4mpg98^mfx|G<ej}$8l;hhik1C
zYD#;1#CjIZn#&VUID<y3fdl+;<!!QbDy1d`PbX7AyAG<};3<nA%+r@%Hen{mbzJuB
zy`MXiktvqTI0`O)=*j3<AC|yIln@0hJ>hhQ3ni4JSd~0$)7~8v9Ipd-ldk|A2P>XS
zG*;m$3m?QYlk9E(%;5<G8_)CDy6rypMu9A$^9P1FcIG@<QFz#*x-g8GH#CbAX3m%R
zVXR)0sZem8Nx>V_-U_^(+wZlV$QTN{N4VlySBb;ZMo$>hy2|06WW5etg&T$(F+7VN
zza-{=IHNkxb9wNbh5T{LYK#M$_G||=G5mzV(8_;ZV>>1cD@Pu4?6$!<vj>&jeByXs
zDcD=xhjx_Y3}*NCp-_iCq>YVXUjGn8F{a?MYkU-~&7|SmZiLJqZy;5|zC}mB(JL1J
z45-N_Gn)J31|7$gyuyDZo;Mg-|Fw?L#-SbrlZ8KcO6>1{`@8LEtvUW-5529+^+uyG
z8k_{Yd@k^bNW^CTQ^^b^2gOmFI1$|$e7j)i{KuV7wp6Q)6nI;Bae&2=Cv_|t9VHJ}
zO5yuHQ51<x1>SKSiBOf2dyCn}T1&g^mx*F6j<Fqls?%m86l<~qVA{hAM9D9)WBU%S
zz2PRdZof}9EMlr4_3g`-v1{)h9M=VN$nf$->`lvVquFerl#-EGC`Kyd{O#uJS%24N
ze6NU7Iq*^)d?Vzw`C>=@pvWEhQqkw{*I&yAfBR#`eV2moQ!1AjZ`3I#?LS|C4KMxC
zmwD8wXYj>mzFam+vC*BHz2pnt_oHv|<=g+s+n)4X9yx1?D4^tdEWdXPPh9(Px(Yt8
zz2ItIoa`1`I?TeuL>nO{C>eMe>FW46pa0u$sSfwjJupC_R1&k)i8#RKy*p7u{oGp_
zqaHLtaY%DM4nsDK?t;D<Y`A|1D1(;g#7N$ur-z0MpSbq7$+EbEg6n1B?K3)8Kz{04
zf{^iQm5O61x~^=UV~OpxjIv~PTo)5-l>IWMQ+P`t_d;vgZ=@Wq-MJQ&L%r2vPi-Hb
zax(Dt5gknd3$NPc?UkU(s4H!de_CG3t^#5aM%!yTO=HO;Py)+=dx6y2t~SQ52I2#9
z;SFt;fqVrhmDWJpuc+-PC|UkQ1bTnlz9<}O4o@M9H5vq1diFa6?9wZ>b#_^JThpNh
z<S%{L5l-L)*h#&Jj12P6hSr_Kr?;8HDGEqGS4-O}UOu<?&4V{Uhf^RQKGhMEKQJ=d
zLffTK>v;d@bq+7aci;*;1#BM?y<gc@89+X~wTsCrz>cCas%=P{vVfFhiqmtGSX=DQ
zb9gAEMuQR9^u47{9kUJ~3oj)T5KX86d#1{Vx6UX%7ctV8cFGCb2X>glQ%Y(P0kh{>
zKVyB7RR(0??Qzq&4^a8=2S!2Lk+41>PWgb8f<!ujx1TAgK^p`b?DH@><&!L87Cz<t
zJD37(ew~#w1r+jPDGM<AfP$<AbP8{$pRs`2`T|m;pJvLAe0KhKWC3;t<VAG`*`oup
z0RmFXU@V_$YXK?94&dd#GLRW{*Y&_IjTsQv!RRb}CLj`-)K1W}{q0>G#|-xmaQwW5
zRO&UmBMYJs&viL<@zJzeE%5<S9LZ<U8GQPMbri|Fv|3G$S-6BbGX^0Duq8RZaA+n+
z&srewkb$>WB&{6DS3vuCUbL?~mp5JURE`;*!$_@~NJVmhuf6a}&RBE|rE(WYU{s`B
zETT;(@YbRv?ilFpg?fd)au*9`&*2?cKZl}Uf<_hURZ2ZQy#I+WV6ZfUP{&z#q}GNg
zjKm_dqM|6y?gR%bmBz*(j0Y9@$qZwlTqv@uGRi;KEoZb*<@6=TaK_?eX$29LMvY%D
zzljqUAH_-Yj+Bw<0NyI!a~$s4vy;DXSjJ^1oyDwjKSkGL&Ca{IZqq7US8?9)Cv()m
zT!};#Iq-=z8ZC-`VdS`D7afy8kB}<43K&lm5QdQ`APb*vdyY$Kf3hNsLYt;?l|#4h
z3wR?4fsWxVM8S3C+va+!Nf1S#py(FxJr96J5Qz2V!Rtg?&46YrV9DaS*CnaWvzh!p
zz+jYW122Urj;X|rG!P1Ljxr*^A;Tjz`@g4*q;r6>6$K(XHlXaj5&2jFTHqy}?s_gk
zrMCU0FM0mUMn^{_y38oRv|R#K2Wc!OSn4{3H(B44dKZO~ukU(#%Jk0Y5hb-+Awdv|
zHI~XnNyY6Ot8&-fckh1F8(($h>QyV(kW(B3<O!(G(^!WaJ_VhIuhnX39WZD15RRh=
z68KuZNi(Uvf+tRI@7{eZTfTD7D_`-Vs}uO!I!}lgGu`0rPrtWqyBE(@gkj8hrB0>R
zlw4+SZ<jd6UAymR_3AZy-u=!uT)k!U#v3?DamY7;X$mjPFk@q5V(!&iQ$%Zl7i-wH
z>jC(+d)}46Z{D==zp<sGSYR5$+v9S*n0u1GpAvlgDKPEerETE>v4D7L@KPMlb4i43
znO^WYnN6jbF=I;bQk=j1<*%$-wOW+mI0|E?Cww-lESHM7?v&uAI2T>Clv7SQnNNM{
zQz)fG5t!))Z!fUh+c=IBZ$B~>c<TdXQ}O!Ozn&Mp=ta_YTz9&`+d9?~W>c@XNcJ{U
zfX{J)-}uHiSh{qniK0k5jx+7xbt1J|ol>bp^0S;hZ+q)&o*?j`a%57)14vzDZn)uw
zefQma&x+%Yf5^F&N)<Us`sLfVr6&F2+4FM1Y`c9%7bL?(7)0XzjnSj;e8(GKoNRKI
z0ke^U28^w3TO>}k)1R9I;EpH*iU6mcdg?<z_36)ja^ZqSCxlUG6GYk6GoVs!Y(=|~
z&j2&woVSV#qnJ2~)y9qM?)&IR-v7llYu4NWlrqq93OE8n5oiHTsYT>i1n9H^3Zeig
z1IqXPt{FW&^9-g4cm`Y!h`~{E4GM+SIfAWiTV;=Ba#YG5$p3+kGSzCO(rQVJ?WN$;
z66YwO2{c4R0R(a!boxad5esU;oK!z60-I@*X=m%~v3%(KV>&%ub4=ajD?=p8Scshh
v?TX6wCxB3syvJmUnV>JnCQ#mF?!o^6-Lh~<;^t}{00000NkvXXu0mjflSW(1

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/mp3.png b/src/assets/img/files/mp3.png
deleted file mode 100644
index 83ce89b9c1bdba1b225aa81a1bbb4a5a3babccfc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1369
zcmV-f1*ZCmP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000FbNkl<ZcmaKt
z1CT6B7KXp9%Btq{^ss08+IMZ+w(Z@(+O}<l);6DQUE995=k>Tz$jn!j5fxL9r{nLF
zrSl(V3S$faO6jL3SnvBX{OFgySiG*ti|Z5P^<J;5W_yb?-GcXo@fFv<>-jIcP8sbP
zAVL1mYHg67bdP$T{2zeOT9c48JDp&E!Eq~xr>FSdO;>RA#0i3h1zK}6+-qo*ufP1w
ztXjE}xy~XO(r;1)skQ)<{<J|jA|4*9J-~6qZYhMofM1fHf1uss8(XeqI_OcZ)d=E<
zN7mNz$>+YDiHQdDoelyp+=B?v+DN5TQ3waQfA3yOet`uk`R2`6GVellpvpW8+-Ic0
zho10E#>N{2VT5#D0Ai)k#@yNa+;t}Mp-+4Q&9!UB9`=qmd2<4)gEhJ;X0_w<zQ;X*
z#>507HJ}tHr&=hZ86O;?S}N0zLSk)l#<9pV$VY$mQ#g+EgmdjSrDBOWqgh|9^1g>Z
zk!8&$y>5@cTzff}9ooxWzlX-yh#$6UJ+FSm<Ea#iHkBr;i(QbBA!{Qe#9=7f$4}8s
zjNRXFTI0>hCi4r6eD*KD=4{;OHIIHGo5m(_1RR<=$1ktBglmuP;~Ou21NCy1Fpif9
ztQZR?3<H9o&$;<&HdbqV^eNA$(P*HR;-?q<n>LCcyy~qyYt#K{*6K8>gFIo~z4+;?
z-a)-o;Zy(qeU_1oz#<bzW9UU8_Zyw$)6ah;<KyEfr8${+dDZbleDG<{W6&?L5cG+Z
zvgm{XLI^(e)EBVp<WX)qegNN<mdGMcuw~0lOdmU{zx>kIGno{$ABK3Y%hn@@7)rWn
z{pbYUFj(ps3+P7?%ZJ9eSCY2N_V2(IPWBv~YOrvgIIDSHt$A5<qL~`EFBCkF`CbQK
zdQ|)Zu;f`Dr9y!L=`+{u*l)DaODVDt$Y1~PC+Us${CqD;w3qh!o?}P2{>XleE4XyW
z7VfojO+E!ywANg<^A>_AWY@7%T(x%x_gcQ1IF2*#tvG4EQ-BQ}7x>P3|KL9dcMwMr
zU;W>onC*9Pgvb|=FbMeC`G01%*WubEMeq5`&rwQ&!EP5BgTzYanL%kyC=3EYsG@X6
z@&jZ6R^hlVv5G+mVy*1Af~?3EIfC4XD-{#Op$#`mkmXj}cR+w$TaUE?72A|84cStW
zC7EEu2LaunPcK0y>=Q(R4H-<n1+9+K362#+Au2&~@6K%s<humnI6OGn2Baf+XrgQ7
z3RsWx9i;6X6g;0t-Rl8RD)YcKoA6v|BLVPz58soBI9BOLtLNrB`?WG&=G}>zDVEnq
zxpi@#TCt3S$dg!1cNQ3~)HpHSqEQ>N@3>Mj)oQhR-Ps2f3f}32AhravbKQi%o>bW4
z2$xXBIKr`o)Y-17mk1o;5`+QeqK{uFpb;EDeq!+*Z+qhlw{E@pVz7<i-f4(ZV?i8Q
zZHt^4%^9~v){0)g$Eh=?aiqtQBS+`n{HE8uC^K#e&Yf!^r3<-3gIuvJu==iGbM8uy
zlP6Dh-|_Z0zGBzT?H7>~=ic|e7k~J}9~l@J!1MeB9x{RFNxQa?_8u0}0?%qmxm@A&
zsnc_BdgE(fuw(ny^SSd03iWz@^tZqL<9{Zb%Qi+)6epeuV@O~iU1K96J0>$NgyXc^
z?fA2w{lsUtZ`<+@paMid2UrC90!SefPb&$A5~D64fmAzy$RRHVKq(a_(gl1V220Qb
bOA_1$eq*F?S_Muc00000NkvXXu0mjfm*b@&

diff --git a/src/assets/img/files/mpeg-64.png b/src/assets/img/files/mpeg-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..05d77fa7bd6ed5d2a249629e634b89cf99892bc7
GIT binary patch
literal 5308
zcmV;t6hrHYP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000z&Nkl<Zcmd6t
z1#lcmnyA05s^(S;Z1Kn_GYxr|)^ncqEHm%pcg)Pp%*@QpcS9a~z>FG?Ws=3@ZZ#HW
zJ~<<{LhW|R{Z<=sPRAcrDRs*A{q<vJ3#Am%Lvicxg)o?(pJ#B>AccG({+*xv=`VZo
z-uLWX$d|m1Tn?!ueh_F0<e~&pUp+s-Od4Dr85O68hSlM7fA@z!@QYve!vFX`pG8W=
z7iK5`6yYsG2n<6IH6j(Dl-d^r@~OqE0KyL$hC#Jj<;Q>OM}0NYw)L@1&wtu=984L*
z*PuRr;N$v!c<;C#v1E+0KS#31qqpxKTGOj$_wL{Do4KyEEq!U!L4?n+G6g8jFH}5c
z9W)H_V$%v(1pkI=)%nTWDn~#dJ*H3AxO8}y{Coisn7Dz5>uJI9TpZWM_FSqpn?yQ}
zBZ{ouo8mnme}?|PehkyVsd>mig%7+0K*MVSKnWGjLsU&zkG<qapj3Eo8V0Sc>2HX|
zte<X10jWj!^PcCg7eds3*bunB!_`A`j2tNtH~~VMxSop!U!nlpb*b4lR?@;2Mf&fz
zc=t!2p>tIajn)=r!Xat{Y~5Vlx=t-!P9P<zRQzgNYj&qns>+gKNhuo?pp<Hb+ry8(
zo@e@0m86JcrQ#YE0SEy?U$megl}=DqdDiYq^4y1>STQ_}@b&kE_jMl?0%RatgCIyM
zMZE%u9u4s0Z!R!<#wKMZNW@e6&4U8!)ukj@xfrEjj_z$H``-5`T`PlcH2a9R9nRFP
zt|35+qIm^q?P+)>kCd1@>yR>2WKwBd-$UJQxdOv7D0s81+NOB&-H*_<`o9)Fyw^hW
z3eaypaF}?r$lSS`@JVvXoQ~`<(}IR~57L05JxA*{kH-$|rF(VnT>!7Ax3>Tt=x7{<
z0bbxR_Id#gZzO3=<&aA0RH%Sh9hJZrl5%;T>=uWI_TNu;=iLCW>M{awX9XCB(82BM
zp?T)c+9b^+*<@B1G(s4QB6Mm2hzSr%;Kh9MwP})r74F}+o1V_Ty96E-(ZkxeZ(leG
z{DAgV?fl{|{}NNjYK)&K>1dx$r0}JWfr)8ILM5060)cJ1%oZoG))%?=>7Dd;_1}H)
z5mlA-(n~L~bgWw4VV?i@F{5%d2CgEJN#gh(F%*^wEK!1ifvsvxmBwIgo;^=&zboOF
zEBCFo?5c3$cr`xo!2kR*dnDObEtYh^vpttMs!oGKD?w3{4im-e1ozCb>+!Ahb>F@4
zDk2Y9zy4MKz><+`U)}K~GgI>z(!}vylxSQg09!gt7Dw^>XW9AqmZso^VPKi2jxh?^
zP{_zYBK<{C@(T*T+^}rNsGFAx)ugE`DqammBRERn#yn=q6Ua4l?7YL97XspmgpMJF
ze1X}?ITmJ1I3*9y2{42~ENPL>C28$!p}nh>OfIY4%XfXGS|NOR9}xqxsU%BB(uz~{
zZC%rYs)v^XFX1y^nZj6CVE3ZW_eJ=;5Rgd5DOby!dE*=-rzi1dAm*fr%QTiqVHhTX
zfSTuXLphAbE07)|+ZUsM=W6;l_mGGu@Em`I@Sq}mz-rBA>Z(4+^|a}S3ef1Fq(Y_?
z3&mODgJt$SwIed%SuqQV&l|74$=e67lP;~It7RkcWD=EBw5?0hHkcyOY9XbhI_EO;
zc8UD8D#`)pqQ}r%vs~_-VdG=ntl8O%Aq@gwHY%c7_=sxI^8BDq0lJs>v=YL1uarW>
z4Dyv3GFxo!duI0{{O$96BAH-vYMdAU>=5QeJDXNNfYoE^_E=gzo1W{UV_TX)N$v9h
zxpfIT@5?fFe4dN{K7%qKVW#jW1J3-}6yxU#?0MIEGP#U)i{{}&-e?!_gIg64pcUY{
zp!6TYN|?;mCTZR7vG>{gB8!}4I?1^+XF2poCmBrbp|!6~m(q^w=r_IX-F>uePU2L(
zy5|W{2w?3at8oH{i~lr>VVOunVp(x!PC2|X_7;0TzJacR4qV4?7Cux|R6I0%8Bixd
zfa7^#KaV9SxU*!pIy~~+{mZ~7IC11Sum09)wr3t8nMh+hHi4A-fqQnfF2bj9szLo)
z2o>$sB<uI~kX$QqZC|f-99KVAam?e;Zw)hXd7fCpM6DcN4<iTymPlv;Roljho0Nk&
z+IDz6@%)2}@V${{KXh)0H~(;m2RA&y;PagfJk<(uMc_#=pmS#y-wPl*&+9l7Gh=k`
z%2IVJS_!MyweZ-dH?i^YPO1f;L%(;C`SBuF+yu1(_)q~-QZIpi`>|vUTNGHe8=ijm
zBavO5Wtq&)&v5V$kFmAmLDoFoM$f}p2A*suyIWDI)QF`Gbingv1bp3g9IahhYO+i`
zW%2MQH?n4L2M>H?J(;zVg{c~c|M+d(nujoG3SQ~^NCgBe70>fYq~iEinV$PBo_+u0
z%l7laf*1bcApOQx%(#IvB>-_NLEfIGVwX_@5KUHi3Jg<Vdp1%4rUGeT#SCuPQ((cw
z#R4b)<tkR(XbK)h<gkK3h7*Cnh?!L64c0uE;J}BTqH|SuBz!y(<NTTPR4<wg^sUBr
zZH8Z-;zn(r*}^0jUL0dxW(T#hgI5iRw^^t_MZt%=&I|b>z8g@=*Esm6Lkv8W;mq+N
z=7wE5vj%|@oOx-KjeC3O=*!@HstNdrEMTTYI57>A8-=Mw_$2#3@Yu5Opa_)D=@;Lo
zFSiNDw^2e;nUhTaS)PhrqrYV<0TR39Gkc}PnnzY4t3E(vd27ZDE}XoCDO32;WBBzM
zPQFys@u97?2VI_{sFhq!|K~NH{hzzQmCM2_6>SC9)vJ?rdwDl%6a26L`z&3nd-cL7
z_*g8))hkzVMop5PDXjqC35aJb`Ug6RC3~?e4uz>IZqeuBt5bAsYayPFp@X3UsE1Fc
z5?r}_nW2N@bQ*)03Bka+Rm77$+KOgI3sedYM$FKz_x7<#9(dPAG93w&FB{;SYKH#(
z$bW<r*Y!#}H*X(bOm!W?02M?xHil&|eCjH#)@q&Sl~4>m(@p=qZNzdWLVyeuwSvpF
zV{;6>Fv078bdiTXy@6~lqm>m%i9l$}i>Km@j*algKmE_Nv5p7dvz{$a^pa|ggMqFB
zOLH|&{^u2r|HoAgRw+ANJu}UH``2N6a#{E&6ELsMALVm0S~xEEY<cL)dp^4F)5?$n
zb$fUa_|oOrKM&F3cVooh{*SNao`>2|hSCo!eWlITN}2R*Z6(_s(@Gdwd|=P063d!8
zpGy@mpP%RO3vcpwzjBD2vxX0R&7*AJ*M~Hewie%$NU2C<V{E*?hg8nw;_*p5FTjeK
zY<=V&{eMQnD}`y9wM;ts3qY;j0{;Eq!-<rVT|4$1H4-Wxc&a0+pEnJI8~HqLUZ4!Y
zmM`jI)s_r)#cRm(%9pr{vUX25a|iOA`s)df{P8HHFC$W(cAe4<8(B)wW^UjepV`jZ
z`#Y!<oraB^zzg)Q)qP(y$mG}@um1TZrmp94DjvcTAa4(^mhk~=|Ni~lI?Cl5N=2W!
z8KyxoUqn_-S_YH!-P?{+^_M-g@a%w1kMwiy;B|sR0<UOb)KbJ`3oU^}r6nz$Nwz%R
zOSSAqH#QR7TEO0SZsO>F4pW$|P+qWU?MxF$)d0U_5>*LGZWREv?1?K>%Qk@{=vbG=
zNC=c%KF`ZQYTwVTu_zTQ^lfe9W8eJ<ANr2Hw69H2Dpt8?OFOZQg$m@djZNVDw6AWZ
zXH$lSg{sa7!Vrz{`f`Ut2)KQ!Qz~*B3xUqlDnR?PQWCgxkz)vxc-GK8!k*{WlIu;;
zxwe&!Pv$6BOSG&`hbDWc3ePkwa-9jP)tZh40FCf<3!7I!IHLFPbipE((wh|m(d-_c
zK3eyKKsPl)04OdDUBnA?R%o)eR{(gvhu*3ek?`TVs9}9R@JcEY>4a`qXGe-`33~1b
zFAzAM!`S5+;>iwP`}>PrxiZ3y@-){^mPn;mGd-GbvbG1`_Zc6VB^HknPg*)lG{T4L
zn{<ID-~s)nvaK16q-5;E4Q8(ubxK?2&Fj5_x6WQ*dbmmuD9S~fw-4T6`j|;lt-|$P
zhEGlEj9{2z+1frHi!m`i!SLxRTG}#X+mgs2h=5mwlSXN@03kvE5RLGFZkt=%vcz)+
z)oF*<|KcM1zicO|mK3h-E%oCNes*q(zxbv9BqjUVaBnA@_x91zo6$jc`uYNAUmM~4
z8>1Zjn{&M9|2{~q>>-r|sDn3zp_TntzyEL4=3{hh&XCC^a6LZ~UN!Fm(W$S_79^yz
zY1#)eOia2=UMld9zj&NSKQ>7JhEBcNi4;0A2P)vLp&|b8Xa0#qrJqlH%hL?*?Lwk-
zPDjDO_Ep@wZyiVf<060iYez`6#d!LIJ3(5wuCFy9fLJ_%5<b8G>wm`4f0-a2YiHfI
zPOOB5<9Gm#@SzW^GzK(uR|XsQ^m6s}3wrlwdbq^j{P+>Nwx;MF%#p~L6c@@|J~zsh
z6Z2$6AD{i6XIX#WYF*?kwG!9SfsDuByA5A?{OL~}W_WSk<L}!_@4za($?7^T*UpUc
z4}ba!Z@<1kF5QLayX<~s9iHn)!-xE;c?Br+KZFvICpNz0FKWM!ROdzPSs!76^h`#M
zRyhCij4qW8)4(zlWa;DK=LZ+zJGJkNdcB4|UMadfdSDx;Uc1DRe;wh};cFyYLE>ZA
z9LjkYBgl};bW*F?3~ujb-L@`V$BTs5qrM?(A_%HGA6H2!$+l$K{$zic+5#DXq1gWL
zT6XN+NGh4ZjG16bc04hFt5YV?sZL2uVR7F()*<2n(zggIDK-yor9E>GanVjZ8OIMi
zT-RgY2X~`4VPrJCLN$Un=K|u6XLX(vu;-~woPBwW!kDMG)E|5AR-XGGyLEB$*Ne@~
zk$=8QNB7MWpNy{Mm(TO)b-imkAm$-df-n2Nce3lTwM>l6^W$It7fg+m@m!Csd+uTH
zzCmgg7l?)r>6N1SG#D<wQ+XSZ$!2)^6FYFFgYQe$@9rW{N*{;yY)ewHOCZqFOp&8>
z=VssqE-mdT*6--1v{0japo3NGOsW+JD{k?ruYMX`{z|zlydorNUI7X%P3+;J)85wm
z*YU^)HtG$~*Z<`LH)acrj$Y@5zkfr=fKstWrDP*aamNbJG)?mJ3plpN?9>7;{{1QZ
zz~zlsk8t{p%ew9T)K@&srro{NstyXG;2RpEMu~I*6&~<4QQqn(zV9RVQk<)C=x>J?
z3!W>KojiUqNh%qqaHGud=}8^stF9ddudlI~#fdl0<J$%@Bl)ABJILSv$w6+OSlfjJ
zpZMZOIq-@5bn}F`GrZ>1*O0o&AlUr*yf#A_!27=V5uW<U77CL-qTH_2qZjxn0WbX3
zX$o^?;t4D4(CXn8sZ^57moM|e-<&3y%!Y-~>@}aDoaHlL@eXbJVY}W0yuM0>@A*in
z8f2MLSTqA4-UPaZh4=lRhxzbVJ%kZg`Yi>1fMLSu<#~SZ$6ugQu940rFiaB=2mz*P
z>WnfwKg~~l*YD%xTfk7d;w+VHQY~@5`Ul>_$G`juy<SSyJiJo+bjfi&y?bO@^&)&f
zxV04SD3)r&p67Q6Xa>H{l!Xu^QWhg`&+w1GdyF%0jOcAGD{gAP9@x^xfzRw_^UgJ7
zb7}p63xy&lkDTMrfAb{@*Apa@DXLW)(=>Sa9b5S1mp?_{`VOs78uC350WWXD+b*`_
zvTkkfD?QyE&rm-i6i~dW0IvffKJPCl#1fV^y|<2y^2$G)=fa7xMbN5Ng2bnzFF~#|
zhVOgKP866Ow}~4$VsTS9H@o+)<DDP5k8KYO;Ca4YSLgG9l&bCsUjW+MrH0q*gb?KO
za}z)FQ$MmlpU)4Org^IZ{M#zPy=ehLtoUmw+UJ#G>Ux1o=O(pGjpmu3DeKIjfOIB7
zduN88fi^bp?ql<=e!2%*b#Z0aJW%xwjzHjf9@%V)TuT<u_i-Fu9BJTWDz4k*g+iHY
zBO^24{7ql|p7ZC<9)-psya)w&UeF=n3-iqk0hT3nO%LF?fj-;Q)`!5f4DB|SWg?Z*
zrL9+gc2EajsZ_8m*t}^2w(U|XRVi0(9fw+4(wK%|dgcb_&JWFg_ji8d2d`WnKK%dP
z4Qj0mRsvsFi+k=(al#)NF@tzagr@8`9=7c@RBR1Jjv*KyA7$f)HCjo<oA4D|m*%-#
z8sjGX^gQR!zcu?k-}Q|jS`Hq-h$s+N{N|%}a!_cIfm{?t5NMwbf4*!>tE)*#p-{ke
zJq;cO|J{r5moE(;qG2>;0bh9d=tGOfZLH|7j<B$?9Z%N-D}j$Hgzidsg$m&TZ2`dw
z;Q<WGGPx=B<F12m?C6A`rDbLC0LH)m>%VdC+<C18Lmw{Oo$!jf|6lhQrnxeB0OR@R
z4{-ne_wmy|{nH2`v?5S<8+^DREN_D#(5Y?(@L>$lMa4IK!#D87U;M@T-Z0I(4L-aE
zQlAu4tvZ}LJG3JBh9LNxzxkUSIB-DuzAp{Kxa;7hQdBBclF1~qbMv#`{%v3T5e*Nb
zQJNbTz>-Dk@ZrM?W24v4Y}vYFU#V0M>+A60qwX8>y+Sp7t`STR6{V1HrA~LA>+9&R
zl+1tEcYf2CEEYK@fo{-40xG<Q_gaGRzW(>>bKnMG0dar_9(Z8qPyfu%|J1-eYj%6S
z7j_(~@tfOX$vuRZs5gHLFn9F%P;s8GzZ)QihcAr%*pL3eFAWV19S4%PKnF{JeZT`P
z4q&6NT0Fo9<WdF1fH;r>L?V$$w`8+@3Ka(|1ty;pg(1KI1Og+<1jB21FK9GR)$oP<
zhF^r*5UN}*l^n<Q04s#Am!MGr8omZv9KZ!UKrVeyLrVx6f*IkwQ9=baf@>jK8R4}N
zI{IgFsk_o>>MBARS|Rlo61qU-5RLO?Aw-jZqnV+i=iyMxDX+=D!T$r4nx9Zy=AXO(
O0000<MNUMnLSTZ7lxwH}

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/mpeg.png b/src/assets/img/files/mpeg.png
deleted file mode 100644
index 6047ef2199873a6b5847de8e739fa5d37f9e204b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1467
zcmV;s1w{IZP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000GoNkl<Zcmai#
z1F$Sj5{19&?i%CH)yzDbYumPMJGi#3z<M|IJFvE`AJ4qD@3^N`wf!n$`(g3t#A)|A
znJ2Srgw`5>C{mA$u`iW!{7-)9bD5#lqt6;0*gDYawWC(Mi>|n`dMNkzXTJQAe^Zf`
z0Q%~U*(;4B9eYYj=O+L{DMc)@rQ7u`2%CI!xy$%Z8Z1pT*l2CCvc5@bhtG50_E2{0
z+)lUMLu+Da4DF@80chf%(g;h0gO$?VElZqngb)BJJ7uMsi(O`a-bHrORLUj7AVl8P
z<591CAhl{WCU?2h5TKNHqA1D;Vd0!Tf0k5Ql2&D=f7+%P4Pcc7x(S_K0S|ii-5DJn
z#q$D_A^$J?<eVg&M?dIs?Adu><Q>obtSkm)qDqJkY&xYC?*7D`hCB=vPRd4UV<!U3
zTvIWwCdc4P1?O|Gx&>*=hc_2pRNg{qO)#>_fhSd|)oO;c-E6UNZk?zNXn|9(s2;3P
zsALI!WqeQiVh%{eoRP{feh`Sol~r8V!`rvP{hqXsdc981bvgZ;aT=!rDz!2@9yDaK
z9s9!)W52#g?H(l#KYA;|vP?CJfC+72^}Ie^*EQ3kYAx>ng8fu$HA8;#mt(M$rI;^s
z_*q*h?o3nOndQhcx1gnFW3tb!-<u=~6+j}8hyYe>34PzAxJUE2SKTZ2ylQMY^ZRks
za+=cJZGv<kCu0+NiolCV=OmOuc09Pu*vVOr{cIX1Z6&r`CGgi{w{dZKOg-n#4~=c9
z5r!eHjTZC&XcM}ye!fq?8?ipqCS8zZ3u$J@7g=9uG5*gLw6eJM7h|;6T!dxFO&>KF
zIPK9>RQDYGUF<o&=VMEYmB}WRYMFbza0fDH)7fyj_4{Mk{{S!O(^ztO@|*5YX*7%5
z^||G9e`5UDB6oYlF2W!}CtVgeU;WnSiB;EIEjNhw5+Ud{Jht6;5GQBhy8(s4EJOS9
z%$;bUEX|I6b;|V|ZrdZ1licmm+gTiMlJo%#0Guc?-3O9ULn)2#g;<saLSWk#?M{c)
zwM{(Tqf{**44KK2Pz6LPM1!&CN(BoONps9h=PDU){mD4X(;I|Q!1<GtOr2WhZV%nd
zy&im+<+)9kW;WyOQ*^o=e)GLM7_1gi>dH|yzyYo(O&bsE`vz$=PI1#m|4goG(O7kP
z`FkJB;MTlJq`J4ncRulRw(cL|)U6Y-rJ959+=kx|O@bu!Nd+VpsYsD4X1K=_c2Tb8
zx&M<7QXI@PP|MS6dj=z0%cP4ANAJB0-`70$x%Z?PR~?1Xwco*&6#%9ROk?l)$h|Z-
zy4?8X-x2n0HkMlq*Gqt4VQz^t$7VQpVxIdy>Hv>^_T6whenKvUAeE9x$3}!kRqtxH
zx))TWr6zd@VZlG*8UOM1|HMuS9`URrXc6+`8~;grP4Tps-k(Q4<F4l0i9+K)j+Csf
ztgN`b#y!(%xeyD4MxfE`#R5udxT?%l#-`KkGjV2_h3Pdy6;azd$ezPh^5ra@b`QrE
z<Z?L>HZwD`o!7ti70)<!?6zM6n7_;*2xEcn)dB{@P^KE&u@IIp*P|%H_aZYjolb|o
z+hy;*16;f~)_m=2UiO^Rr%wDT>A~{y3ZtVVkgV%KLT>hEZ3_EI1C!-IAdHCZNap6|
zdar-oE1rKPIe>NK$YE}}>1K+>B2uPeNaLfFjyX1P%ry)g1EkqIu{C)X<`<f;e8o$i
ze)7bzpL2B}00ssIhOfW=<{#C!Y&{Ufe#IHa)*1WY(lP(8#GEI4AuMZseLeiphu-_4
z6UXoP9*_qDpbK<>zAz#XCnxhUDlw@IIDidUfJkt4Xn?pMejGg@1%yTbTq6SBzW|P-
VkZ2Q=$<F`)002ovPDHLkV1mhb(m4PC

diff --git a/src/assets/img/files/oth-64.png b/src/assets/img/files/oth-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ffa8b4661301bcce9d14beedab5bdcbbfc21a46
GIT binary patch
literal 3724
zcmV;74s-E|P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000hCNkl<ZcmdU$
z1#sg^lgIy(Wri?wvdql8$IMK{b<E7n%vf;D%*^okW%Ip_mjWA3i~+MPOE*2PuG6Wk
zisNMKd3$#<BeZ`#Jv}`wSusr$^~5ktC<>_9L_so{#QF2*kk1#|f9%J8>{~BizI-K{
z&FUVH2XsFwhGE!ic)ecC&(AB<)6-@mk@)SO_=%tR?cw2JaU4e|CQNV>EU2+4u!{yq
zF+W__jeC;Vax0h1B|v=mqA&Uq9WYNGKYsl4ghCYBUoMv=D3@xr$~AmGA2v5PrD8wo
zqdppuNZX}gFnm^gMnRmTqK@pZ7}Hq+ru<LHrrWLkx2mfDj5<=+0;*NxYYT<aPly_J
z5jTRa>)6`b5I}2)#}go7P%73oDJ2*TLRbg_fe=3UgFh6*!y`hGDvHITR0tHnlpke^
zW^J2xTlpADp^DBo4L;5l!N35wA=<SgE>%TaTkz|IB7U+F1%&eX(oChIPuWdIQB+ha
zWz5YzlL{yl3XbrkB&z*>KXSROuz;Y1@9XbpnmRpgT43!xYU^VwylFRm%a*9Bh5^6d
zv(Vlaylk4tz#>{51Mmx_bigL041!-+c#cFOCIM;8GccdSZBlGF97ZOS5j`Kq{Rbah
zAKu=wHyyXR+W!QFEUIdDRI8>BuqgmA>kTXeP;BrO0Y8UiG9e+^;W01^JHbdKg1x;x
zah?zN?tc*ao!}j<fqUA{X0a06Hvi$a^&WCWP}Qgtw8Ou6F^_aQDS^qGv!kmg<nRdI
z?e^l%-TUt=ylr3|XciFgE@}3Qi~k><{YJfMg^us+>_F4pxOMyP`wvf*Ge0zjsORl#
zV}4G;>v{zqkC(w^;c1ag-|co|dpj+zb>YU%I|6>7Mc_?1iRuhrk={O;jMG#`J!(Hk
zDuD}`{qF8AfExTjOThCUXVE_K6F-sL(!@idkon_3{*&0++C)6QMc$sxp2j?ZTm1v=
zr{feIinfC5*KgF|(IW7COf>4*x_uvc@4i3$!#|2vt9lm&F9b(sPOwyS&+|<+O_T7I
zN)=bHT^I0!EeB5>=kdCeUG3r10FtnX_UWJg>D-&h<#L#uocsb2rFEs#y97rU(=iFo
zQyyCZjrkh9fvZ<r6P_FLW9pcI_LX1xm9R*MnBTu-eSO^;;IOa~WY3H9Bz(DC74X+E
zFwmOt`}sjFpU+#zv?d&$k3c!dq26a`9s)J^6m*^7ufMYJBpSh3#1w!A$MOVBZEKVl
z2n3KwB;_LJ+O-?62s~d@M*%c_S-rY-Noy6_rd3@kl?0#)Z+{d0{jUhTDL3kBKx0r=
z0GmFWJ?|s<bee)34L5Jzq9EthfVW}qs{m^<!@97kg|{97fBTh!=eCm)REFfj3Sd7#
z>v@XsTrM|m-MaHq;0>ela^b0NQ~^8$C=?C^{K#bXWEgz=_Pv(^pUdsxmw)ZI@LPZQ
zhc5-*^2v=40qXf$8Y?F(Ac(tnAE57uS9Q5UR$A8l!V7eD_do%}=j|dCj2tOEwM{r%
zfkr)U_x5D=@pxQ*nfoG{aa8byVxAl+tup0wI?y+WL~0w!y&T#jA;c0%q4>zr!E@Ve
z+yW@PrDTRoU_SU@k;dvf9DJ!<KuSPU0+goQp6)KV-9GRI@k9z0T}Qy@#rWtj7MB(=
zIW~D@@cU(!HCpUgQ{EH?`+R=fxpTiM__>8Sy!GxwOihlVucrrY&5ic<cG=rjZy!s<
zklx-#YG)TEogA(KRq>#|uNN;?mV`3Kjtt(UhSLyOTU)c5zq+!rB9_RXLJp5EJaEs?
zFRdb#DPZgE58%wPaeUN=eK`1vY<5qWd`ez4G&ms4-H$gOK9UI(69#rOJBWna5Dpix
zzPXOU{-MLe^L~dxp#8%?`~$Zs3fvnV9bFn69J*8sfQ$p1{k6*%V5%B6wqlr_TS9v0
zPjTbQ1)51j(J(PO&bJX(kPu4A!zZlp{OOa}-l6GMMQ3}rxPDzID~9gQ-owGm|IU$s
zy0o+eE{lr`MPUWs?D4p(&A^j%v_&v6+>fgl&!Mxc3v00y{^&3N9))~f^ynbpMwosQ
zGmoOsDeizF9q!1`2$oh>K|<$dGFfDEyN7~zN`|m#fA(j81}lo&?Rj0CpE3-yS5Xe`
z?J0indfYfUbquNk%tW6fo`~bm|NdWbZF38g<73j-v<XF34b*}yZyQ!O)-XIUj58<C
zVD@PgXGJ|BoZ++i=QuGHITSpcmjX~bIy&%wrIS)(9>7#ZX=<vYp+n1LY7h1I;Krph
z0_r6Ep%DJ(o%ir>|MeP%MNfx=ZP?4^<hi3m140R2F(kGCm=b<@b(ua)z#qr#<5^)1
z+fBoxK0Hr@b&fDh6G4vEcT{x)gMHmNJ~0W8+lA+gOV~<p<5zzDH}K&0b$Yri^9%jG
z-RSD<!NQAqluJc1Rd!-!brtW<%*agihOnH!`KNyq{$m)Q{Ba*k{-p7q=Z7^48hkEb
zH5cVT@Rnx<irl8EP%0zn2Tn|kqO+qN(Ps<T+}gz7{L6pI>6V7e+}ylKzb{}bo<bs>
zhU^nXg(3=#qhKJ2-hm;w{Q>0iIkZLE8-|B$bA7PK<8(n2t2(7t^Khu>@(7Lf(^I1u
z9~s1dy#5YeEG>f*t&bO1pjWF12*9?^Zc+OY35Vbj!=k%Aj5g8E7t1&$rd1W%f#A*N
zo(wg=q*YXf&x9u6N~N-Fn}#WlxeyNcu$@YvYKcHcM~1~P86|~C^PU{(M^&#PmP`wU
zjiFG?B9qNE1#kJ&xB?WV`SrXC7ZfORr`w|e`Py}nwh-Q#eu#&Uo*<JK<Gi<53;{1<
zTXB?xSzkPL8jCA0#5kXjx7|psi)nE{w%0dfm>QpK7M?cw+Qyy?ndTvr8A`3?QeEH_
z`t;0u_?Q2F6S-mq;}hff=nuJv``0eP@An~|+QvWq$G^#S0)Np`xg<m5VkwJoDA+u_
zeGY6y0l?uhIb_PzcDuY-TU*B;{l%Z-&FNV&&356$i76Z#9fa4V!teE<Jrah??Z*6z
zRRsMJd4t8}MPd3Avc0ykg`TdyL%{Eo5<6;m`lGots^qlxumAmq42_3JM{(}daa=lm
zQeILhWI=LMgvtN<+S^E_Qh4<E5ze1E2d~Ujo5+iE+QQ*O!ke}FAPV5vSuvHSa(ETJ
zf;ZoJ3vbTMA|iUdTg>ZYL;W~^lE*RN_XR=C;ejAdO(hVmR`D?URNmqI>2o02iYI98
zaA<h08@B)+GRnc>^=bvLy)}(|S;ye;D8|IJHzmEgE&`fOp`5CmDacAZZVy5sN{n=4
zE4huG-Cbm}1(4*6c|;=NBk6gr&Blj7^V!?kr*rTH+b}rNj={bz+4Ek_D=+D62lxx?
zW);O!3Hee{<{pnvjbmj!hFE$BySY6%?G5(y9|1h?Z#WJ(T<UsopdaB#2yXe_U<q5X
zgq#U9O{2hudR^2WXmBCu^;40z3<M)6>jt*PvFQ&)asKS7qk{+6jVgdgKofcUo{kQg
z?{j-Ra04jly37HV%d*HP&_?ZbI&c<Bb89jHiUfT00wujuNXghEgO?31`zwHNB<HgO
z!RrJ>z3K6SJ-5%L!ABV%(bM*oT*)+O`79MwDOcpQ7!pco3%KFZTt^0P*8UyP2{!e_
z#zX}cQRG3m9FiFxC~`=cng{UL6t<h)m5U&^sT>JBhvAj7POH=d4uJ!~0~(Y==kOw-
z2yGrIe6ds}cvVQ_3V7Mi>bQOQAjjG38={m-<a;U@8Sb0WG*_x|1+WijL3loH7}kJ=
zN1Rf-#sn?J<?NHsCs%&-M}FWd+uPerA$A3rj!vL;;T7pL!(l%nkq{~ZwARzQJmwF0
z<$H~LdnP4&H@^8Bzxq?(dv7Lsz)%=aTF~qjC~_**G@!q41jS;BOkC_M$s9u@9FWc~
zmEObb?BmVv{*G_>4Dr6>yZk1MT~vm(7MLwO<^im&uR?RxlCOK295R_g4L%ZpD)z@>
zY0N%~ZhrT7ej~xZ=5jfYbQN_q&}#6U+gGGx+uhj_CSRd-gD6GXC*Xrn)f#;C@srK(
z{;qHOjJfAe|3^4J)DeCQ#xW4$A<$Ai&$VG1a?EFPR(LRct>-1YW=rqM+$7bF%mM(E
z)|%>gc}{hyT%jH$vv-2GfK$X-g%zAdqu{{)Mi?j2TLzxD6+Tx!e~>+I7`hX@<!v`-
zQM1{M96R(-(t_Dy@TRq<3VuJm!>oYezsCa4Z@EytpQzWaUBh>O_xH$Oe~}VYP6@Xt
zJk>mw<MC}oqmMVg=exe~GoA~0vStQvRG3!&!0ESt`*-k(pZE#g+dG-3#bTw4%&aBg
zE%%`5?(MhU!1(wiw&KanZ~xY>{dCduuc1kCS>6r6U;gD^(2pDa;=Q0RR~0p2m{t#J
zZ}azR9GI*9@^<x<z&Fa~a>!(}lug?FmT&%=&zzro_CEj=YiIKIK`ek%<c5ft)HmLE
z^Y71|yYvw|I~gbne;FIRz2|L!jr6=76mT+oNV6_iD7?*Jb!9Q}z2Ea4Ul5Hx`ey(k
z>#yCYwzRoaZEZe>H6`KQs1@_-)vM=z>ZgD9$A*W-E>N<9m1QwU##U^(gGPJae%v<S
z!)^^Uwy7xd^Us%m<cGiSm!i?=G=P8uESCyur39cTi)_n%I-So7Z~@Q&cmViO`{`Ri
zWMzj0j7J`mMV_bfHQeU9Ruqf*aqZZ)i)pLDhM*{N>N9qC_cA4lf&h;N+O#P^x0Et!
z;00Nv0_465E5L3EtPE;{LAmB)19vK@Q^R4~+(!}CwXee449~TL>9aBnuK8M}LI2?F
qV4MM+K=-!*`*!2jV(h0>yZkRn_Vj~FGNiQt0000<MNUMnLSTZMHcd_d

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/oth.png b/src/assets/img/files/oth.png
deleted file mode 100644
index 97fa3eeebaa908b042c59acce316a27756fdcc7b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1098
zcmV-Q1hxB#P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000CLNkl<Zcmb7_
z1(O>$7=|Bd!4zilg_#-3+zywS!oy|eACN!Mfig2QGlrRS7}I)fOV!rexlJx~o_WQ3
zzEAIJWTCYNKq)mxDLvJ7op8g34e9><``<oc!i1qg5HxDF8pUGC_dM_0tFF5GU9;8$
z0By_e!r&Y!<pIxgz6OW`3@a9czd;NsmrHEi_&0|R9i&t$VFDn8<lJ*FVB*Aylq(g`
z5eOq2Anv2%F+FHt-$kw~e{t=CoQc}MSS;|@Uw;^I5tA*cl#dXCrAyDErKROqI0-lj
zxCW(_Xf#yTFmZS8+==h|4af1-Uw{2hWJfxkCJaN<_F1@a8DqwbAvEJ8;ksw$Ivz_n
z=iYSFO^h5lvj57JEBy$b$z+HY)$0xB&0EOm(W83@w*nA=`_xlUMK;W6Yiku!I#HWw
z!OWR+&lqmU>^dtz3vm1P?Q62Fi!iL2i4dhU3l=PH!p#_*0M3arPYUb=(!hzV34#hB
zShQ%V_58%}u0m%LbX?|ij}ZwZK%>zhvS-<{vrcM@(sjy}B47XT3$5*~Cxj<0ihpwB
z#*IWb>8!KPBcE@f8ivI1pjzRTx89+nvmLZUy`c!qd^+W$Nx-pij{63HY;SMFb=`mS
z`Mj<jmwC!hlQ(v~{PqXz*|!@FRI4GGbRV?RC>@FJw(5BTVFy|Yh0127RO&<@bnn3f
zeEQY5j2bqCBW)ebnl_29qeTj(64NJ7VffIY-Egbn!v~$6^1ZKRG+`vopg0jcsz(nS
z&SmGF#m|5KOR-$xU~4<+Oq!N4qZu+}5Gn>+DI=Rdu5I;vTWlR^=kA?+@%_(SaMm*Z
z-nf~i^XKBZX*+*n*{|Lm08R}5@weaDz5gIrTzo!*`VK%y$+tiK#yLxuo&ZeqG%9h6
zk|#*QF{*?i!u7b~A_MO?5c6;|eq0_uo28?8Gzqq{Z7c^87STP4UFdrr3ua8GrZG|o
zB#z@TbMi!7*NcJHca^w70@rbb>&S#fc46`(3%kLwClo>;rGw|Ed)N{)qQG69UFB`t
zwzg%n8C>jPlJK~lwCu!cz5*s$a=9!TL1$-I{ecJXUitNxpZ=RlrIA92gnzw*15~S3
zjvPLWlrD!39|_j3S$XS6AH4f~5L8XDPTVjI@%>Z`0}D_9DykDum9#|xqFGDHk=E95
z{o0i`e)sKHuf<P3fLyWSEI#|}GtnoP6OQ8`|Cfs+o9(EMW#^1!vv0sra_w#H!P?b#
zUK_!IW1k8D^Pe!_g%@6VYs%DVOG5KA3xv(o)+c`Zg^;qnqrLIiBlkb^-FM$S3*>+r
zPyq@+AZ!rF{8jeLX0yZ1M#o;?sFrp<DFEG+pjHd3g+ieV@PT?FKoO|^2mEgH(docb
QNB{r;07*qoM6N<$f^GQ|eE<Le

diff --git a/src/assets/img/files/pdf-64.png b/src/assets/img/files/pdf-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7cdae7e95534abf0ea8e6146f1d6c548aa27545
GIT binary patch
literal 4231
zcmV;25P0v2P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000n9Nkl<Zcmd6t
z1#}!o(#L<@GfQH!6}H34cgz?v#W{vBA2TyEGcz+Y_<YQKVRFDuVg^ap@=SMqBX7TX
z<9-^g^g=4XN`qz{|NdQFUDGQiBIKLk|6D1}?%lgN^5~<PnwThl=@F}+b=EP*J)k~0
z6_tnku>!HN7%TfccCCpFl*;V7VWZmq&;Q9+_HO;^V?ObT-<<QzXJV~z`<SHvbzPKF
zXsyVzTmeL6g)#O-5m7+;kk*=7qrp4g|AF|J|NQ;9vkp4&yr|uv$Hv6A13%+YEJQYG
zjnHmI=t?hJP)sd5gd<1C7%!D}4xD-VXXUWNnnbboApk^fn*ahTF)0?pKWeRhJ8uCJ
z@R!u<t@q9<j?%Q0qW|YVAo%HzXzkcSZ`|svw6V0~88@^eOEWSwn-S7C$mUX+J&!nz
zdtH1n2OoS8IsjX3B5{l;1(F4D@B#`DC2pKW6%Y?wGLML){XlC52YX&pD1`5yj{ubf
z{>mtd4_C?y9j$2!$hW>k>E}NotnZ~SYJde}VoYp1B1DGPj0g#Q)HBE}m0q@<x|Vxf
zd=Uo^kKmg~eh52M57vVh|8tW4IL2BkmEui9gMD`wkvbU*t+n_9h{zz!1~2fPuTom~
z3&I4vPgy7w!59Js3WHMnIw-N|u`#xkdfB;h756xQ27dT9!80p7_>YM9s8V2!9W=(2
zMc7{ex|@S1f&UuC_3IqGK%oG}kUj<-cx$jjBWx-5u=S)B9CywIw;kRO`<&HIN8)b{
z1t?!l!Ue(qdL4yUjotvz4nFW6x0bknn41e_Za!fJN1k;ahm4He#qh3=;9EFv_}~1B
zLc5W`D<DX-6oym;ti|*WvN0%f<HJv3`5EVO=%RoJgxMn?O>~~A8F+wie}&?2*Aq5t
z9e5RhSSOGpw;lMnXMh`3f$JZ363d=&_9B575b?0{1xVo=)}p@orDWyTQ)pJ{4Ld9E
z9sp7iI`EYQUNjpXasta9e-?+1E*5wY@-1AkVnsSIam?`OC?ELbXBhbD_tEQqp1{{S
z@De&`4N5r?1Z<qZ_j99x4G&G=AA9=Zgcq4zfZzS@cVumN$&$c+?F+i}kH4a(C+RIX
zcxyrH{Y4N<T<Uf34`<n9o|wRoE;{(R%KdO@rJN4xam-7PT=uMkFS}&O?AbxDvS16K
zOg1rs5-^4+f!}CU0{<|UJ^BfY8eUTO1o-#4r<1XP!I34;h&NnKU)+KqfY{(0))1BZ
z6L`2TS^4FUdOU}WjiCVX;gy>~A!%3K&y^cHNO6O-G8WfQClCd=&xsO{F7RC}?5oC^
zp$d(fC|58TW6|zyitHoC5X~HQvE|wmS8`ag=MPL)-YO8eJy%|U*=zgkhcO0aOg?<t
z&&dJ0ze3iE1&uL+#0Eq<B7}g+!V4Q#KY|f!7=FzQXq3wy%q-@_R8bq#Y@*5)2nuOn
z`fQRFNx<SnNXLTI>r|d_CWRydZPF(f9wcWEgoT0L?7tA(Y++-AHWoLDRvne2{$Vy+
zovi#x9RBz->HqSlIpC6ip!)hjvZS-ogKf3hGPsnU6{{Kf*B@caW(dRmqecYRAPyMU
z+H}sfd#6zkKaoZdbcfHW2E*7`vI1Z&act4CO+Tq@OguQsM$ue%LQ>&9_KYOq4KWpl
zm{J*?csC0W_Sle~x4wtLt1qRw=FybC{&}QOgbXkqe75hmw$vsFLPYZ6k-6hCG)Bm-
zk{C-ATZjyZMp=Uy8e@|xaKlL}S@yUy({o;!zlkx}CF2Z^FU7q6OT^2Lq*N>+)&;u{
z%Pip56Tk{u1O?a}cp*)&IRe=I1+Z3V?GwO)iII^pHisoPp0tYPetEkPvw|v@QH28S
zVwsi|daX@Y8FE*;13QZd*5JfiFnnq{w!(gHgm!FcHrqs%L2fMeaKkC9IsA-sy1;ia
z1<Dw#4v5MX)bb+`V@YA`jFZy};@rAt(|K7qeD?@w#{|8DY^wCKW94d&nR%rh9_BWg
z(&$DVv6g6f3B~?FY#bv&0r6MgdaEwt+|5~1Aw;^v%R;t*i4Cf!pIgHc6KmFTw{z#X
z%n;^nf<o7(iR*P*M;%K~A;h#Jq#XLm&V%)~K`Kxh8C~I-YYP}7IL9Wg!XjIOfL*7p
z<?a_=*!3o-i>1lRDn&2@zkNH!m8TLk8`#)j)7A9dg}nQ`adXxPCOZ~~+!bDC7a%B=
zaZaIJVS5xYxn?!@y67Sf8p?;C7x;dm3qjN-x?uyu54bO~bt{5SSJbAkd182Z!Yx_`
zFc)4VKMKN$>uw@7Ynhs!<Q}hl1>>V*U`^K-8_(uE(*vd9@=J-E5wd9`RtNiMb-^18
z)@HXxb}UY`6gmgK%gfLoe*f2W5Zh?_p34u}oV?hK#9Dz}2)u*!&vZ!pN(a<7ZltHt
zK%ubKdcbKC%nFi%XLEoRIwiY+La<%na|@vt*a<QgeSV<#Wh;X47t<nYE_mhUl(*`+
zXFAYoG>PwV9}2?*L?@h#z5FsHEIP<6u*(an7@4G(5yiD+&}W06`$}xx`t_L|V7c#c
z$N#I<+c!ZRk92>l11q4cTXphFSS_%ZfXb>h)c<!G!RocxZ+sQ0)e#+}(Af;{odn*N
z5SIucfbQ^lFGFiqts-jz)T#{!o(G?Wb?~^>g5V!#AdLpqqmJXC<BzBHjHeL4`5lCh
zKLhj0k0X8kh`-AI{<o49C{38|PcD3BkarAPvThRxkbL;G<AA+Po@Q!{YZ0MZYoH(X
zSi;Sl3I6+UT3`J#Jn5;}!<J(kO{|fQThhK{vc1V3fkraV0HSi?MdmJqbY2!mr0Zpd
zKsG^P#kJniMLT9<XoP`BKAPwkKSKockG@Z9(<bz*U)Om)j?>Q>aiHm{TWs2QB1^Uu
zmRxwc6+(2eJos#p<08NTdm$=N-#blv<yv}rdx+Mr!;~uMW{dWl-iSQ-A@Ho{5>MAK
zvF)s?iv(lDIcb|Ih%(!STzEI?D!{_w0Z2jpRZpGRu)A1h;KGZszx@sN#+#5Jz?RDB
z|NW1~o8L_E+~>hlo`RXKW+K5NnH3l5%-Ku@XzW}o??)=LS~wTH>hdjZ<|y)CRnxY)
zw@P!>TE>q$iuRk|fDwfl_e`Z1zW#MuBcqgG^E#@11H>QvFxpr|>r5@7I}j)YuwKFh
znFC(%j)A!aP%5iH{spGHki}R*Te2BC-2&QLcBz2=r#ub$>t8Vc{x=kh5JlKlJ82@?
z#?pS*yV317BQJgl&BKpi@<SgYYPA7HXAd=y#8s`1t~b%KMU_gaKv_l~K5bc81mq+@
zztRH9gk(B)G1r`$rm^Z&4!HMyh%Y{$_QWLh{s9`}<Je=4K_7KA;n9hYjS=?tA=6dL
zt5z~{;tAMVJ@Fb+ts+Wcj3KVqiFfQIy5dUI_kM!C@j666RJ!!D!way`EzlKSfxtd^
zHOm>TjbTTj#L#n}PvdvLW&3p-uxFn``9Ak!aCDTS71ZP;a`R^FzyF8XGeK?FZfv7L
z;k30B&v+v7@GyIS@k`>Lts|J2qOfEs<)e?H_mmSb4|*_Dr(b{=(+%G7%lrip_eY7E
z9Uf3_wS55)P;o?caxd)*E@m)U<*846g8qXJp?vEW<Ua}Q&fT=C)z0g%v7~z&g^1Ap
z`@gAw<2w`|_Za$4T}At(6RH34&(wao9{J|CX?)=e^u6KL=-xj6=GTV@$O?pX7a;Sb
z>iTt+%K>iH<Cv*hgXSTJQXO5&_;a31^sR3a{^-X@7!nCstq~G0maqlC;&W{g%yrij
zz2%+oiO&$;=iXEv^gzlNo=^Myb1Af21eaVvtF{BtIzREHiwUyu9H8cehcpv|1)42x
z)f!1cKDhjHiYJ{+PaISK$Vae+0umIkB7Vv1mAaYn%xA*Hr>iu7^;=|S^>v6I8bX)L
zM7wrj384#oN-wg|IzV#avnP+WAPM}<g(BhmKg{^%Ells+$<imDPV?<=$86b#b?|AW
zXR@^d*vwe`3sDsy39wXpkz$d!S|v&np+%)7ZZ3SvFAIwRajx><v$wFZVJi`Z_kW1-
zq_EkLg#6fVeh1(E9_^p}6e(BITp^Nw`5~FHi<Gp`BJ&JNBRT`#1s+K!Q|~H3y1Ytt
z{ffFeU8VKXm$Q6wFE_sT-BiBtMfxWvslWXl*s$oL#LfvSe(TQxWafRF3qE~o^%dxv
z1Yu5i1rS>r149g*vXYH&dkclne3qq0A4mPdi!jw1;=cJ2>)-e|csl*rL;!q2$hDN;
zhj*<N;wVm|aGs^GLUsA&gc#^)wc$rUWcanOr_yRszxZOzrcIsDH#Q6HZvpV2(>Xw_
zc-L%s<T5wB2(4BdK?n;0)^-uVs{wQ2MS&QD)Enr}eF63Jb<}t7#x`3>p@=kE88BY}
zUx@7eVYlK%W%>~!25?d1!P^=5W}8+!;=lvPE)RoX55c_a06~<R9UhQcjnOAOk-|eC
ziqaa1W6%MjlvkYW*LUDvBJFac3$q==3L8a)%MK-~)>3Ii0j@BMqL?5IXiwL+JnNZH
zdG^G_1VIq^0!Ypg2r3621frPYvSr9oM<O=+yr9xk#J@xp5Kx)bRhgXPZg?G|>u1DJ
zX{(6hh`#<F`b$NkMw3=6qTP;AN>Q#9iQ|~5$toK+ZQAkjmp%V+S6*@XRm@_c<Zc0#
z4=;40BWgpt?dH3GMcw7zzUwQk(1EYkYJ?$-A2>?0*`}Sq*Xm7-vGgaRh!uA2n&OHp
zuiE+g*S_=#H{P(}Ukkqw5n1?eW8J~<2%r?3H{U`SD5A))ce>7Wtph(W&_fU?w(r=@
zl?nVCUbheaFU(;YfmwW!!h?uqa&mHCxK|VK8Mn3ruXO^yeFpyOov%;eZ@7NLpXp*D
zv)N*V_by_at%z#1aU0<Cx4@!=7bJxT_C<iXjqm_E3<GA|vqcB*ztN!-{r$HM9zg%{
zm+QFViYxbtptV9|al#Ax|NkrHB0+H5-~se$r>*6__q`AAfB*YYN_C<^79Tt!kSTAC
zF-f-HbDQAP91ukjFL}vJc>2?yzOS!?V6nlct#RKC)axyh+Gc_9U6SBuKl@qMu3al}
z99ymRqJy_0)M|Cg<uW^W?cVw7SH19b2d{i*o)!XRJ|utn%U`B$z2)Z1jy>*fE2gKb
zok_2rpR3N#0t^0gKA1Df6(kkdT1(W9_ho+(JMp^LzU&!Ek@G)boQ_#Q($@8zn@m6Z
zb8+BkCq@zAe)qfI-QWL#55MowLk_!V6i4Ef_Sr&7W%{HIc`NS$({<0M!bP#c#71q{
zaLujndgog{cGXo^{Rb#}&?W;M1CjF<&~$Cf&BcJt3Q%wYQ~*^fm3sR7`VJDL2!sLw
z&JnZ%4JZ^kKLpd(^_4#dNcNHJgln^ED5+Mbr(3Od1cVv*tQ%hd2j6hs0@`lgX8)nu
zxdTnXbUOCk!FqlCezwh-^PqF*Y<9cO66)fMk@47z5Vr;LP5I+45Ne)($9zn>i~*#J
dc=P!?_<xoI)=|r-<|+UH002ovPDHLkV1lP(HWB~;

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/pdf.png b/src/assets/img/files/pdf.png
deleted file mode 100644
index cb98c99a869c2d7dd27ccba7b0c418deb371aebc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1319
zcmV+?1=#wDP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000E;Nkl<Zcmai!
z1F-E*5{JJD&bijJ{noZ^+qP}Hu(oX#*XG~0ukCw~o0;j}Q<=)CtUL9K(_c>`iK+tN
zy*$u+e=@11`KRCd)}Du4e!*i8508v&WY#wt84G(3r133oan`L~@zOI9Nl`_C%C0zy
zlB7vIo~Fsq0SZ7z`&+H;pGvLXZ?C?N7i}z1-(12i%n+?^F?ZX$u;(3b=ire;w`y-T
zUZ@J%1t?kw6h%cbk#S?AL$`_|b9rKn0i{MyZ_QqRE%lGQkNV6F(A!6pTbAy5ANIZd
zz3kbumu$1i|1|?5nt1PfjEP7tzxryD-d@I<?T+*JGq^Md{ex(u!8NzPJN4JTjorI;
zW3vne_+Qaiu1iZEdZ#;ZlY@tL{qVLoPX`yKU|<lnj%#myXVO=`o;`ba;WDAKLQKVR
z2`atmc7}?C%L*Ym<KYjZ9+`XfPhA6Xgf<&ob^NBto$kii`1Lfex*|Am4x$LfKmpRg
z5k*8uPM(IrAyj;T2aycz9P7}xO{;C`aT(X&^MS;Vcq~WW^*W5Rs4-x3TDQ0zwaAcO
zd>%eZ5K+V{-V2gj{Kvn5zug^+K!RzZq-h1o9QkU4^?Tfd!8g2<v9)CoPn;wH;2pJN
z$C24th*B^SiXz1ZUL(4l)lt<FZz6IljNjpI9DMtG*u8rP+w(JEOjjsaHAIJw;?DdV
zE~(?a206u9B^K?b1u8YT^6wYI(10BM;^)}4Zyz?Zm9YUSKb)C{9lNmG4yS368s`Mx
zk;^@GsdQ1XQ7HNCjZbpZqeuUE*ZuowXE~%vS)`C-1<5^GTBmmK2+{#~;|u4`E8hA7
zkceO^fDn}-`M`I+j;gL~ZniBdY1z}x3lRn{uuY8LcNn|6j@<N?*b6Sg*LuPVtaJcE
zuPBBR0NSmAmrxkG1A>Yc9~(7DwoUscw;*mbaNqwv^3s=MXBV;8TwioksDno&^uKge
zB_ssvc0u`)SS1oA&m7rp?m&FT8Q4yW{Nyyr>)%Lz(Z%HB6R@y^j!z@bVY)slZA!38
z?gGqjyN+@ix4Au0?#VV9n0g=bmovzI{YRpE+@0k3No@ZRz9X@YNW;&r>%OvrGDRVe
zUTA7W>u&cVzQY}fKl6E5S}t1E2}N4mSHF#>b!2Q5zrKMy<0+_A=ioo22n`U)+HBqY
zR>U{ICGmHENPBz=m)47x^b-1CJe^}3ncV_Bs?u#!V+^%gN}9wKKv`t*=)fQYL&KQy
zNnEW?e7C!SSE7z$k?@;Py6M1sqQOB_JZY`Q(&FOc?92`G^?FKDW~)2uc}{Zp2qPc*
zV38_K)5-t^r=e5AJ?lJaYUoXCg^$U}>Bfs*_?)L+c;R`o07)FjSnK}Ti3$QJ6u=T*
zO3GXtXl*sf+D%TJJjFHFT)Xjt=RfoDmtA`C@47WuSXgBD?p+WDtXhkI9)0NoARNP-
zgr6eQ)6=aNz3|yj>Nx)`6-#b<)0^<=Pk)BTJm!fsTP>=QRv{9O{|o~9`ue%*$}2YB
z^{%%){*sF?49=^7)zwvA`qGy)hKI+_-?#t3X=|-hRZ|2Q2&P<Fnfvl+OcbrGthjf-
z`)%*O_@WE008RrIXaWr&O8~RJzP|D3M?d_*X_}6zY78Vm3`BsbsA?J-$mbnv0eyfa
d$U`XOKL85+%)<vv6Ey$;002ovPDHLkV1nJlj<^5-

diff --git a/src/assets/img/files/png-64.png b/src/assets/img/files/png-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ecf3e5df737baf94f6f17c40f6c0124f379fa6d
GIT binary patch
literal 4528
zcmV;h5l`-kP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000qpNkl<Zcmd6t
z19T+K7RPVTbTDxyYkyup+iRQ8wr$(CZQHi73f9cV&Y<7@ot=BOr&GO|IS*edTids5
zs;ldN>$0l7AP6MB1QPw-^Agh4)g?FGbd&V-^i-~1z4~zr7cRWh@bGXZoletV^7;IP
zn#<*ca^}n#@9%&Ad(hq8{mBn}-~&H;<Rc%czuP<h(-PSKM(TV$NhCapD{%|}$f{f}
ze{a3=v~|+K5;8I}B5!%iTe83Z{qGhxHa0$hF=&qhwreJnvEOCIij^{V?p#TwQk`42
zZ292KnX^W-*=(X1gw5eUVgUa<EkR|4|8r%+kHt}ZSEB-d#_;gi8y(DHM6JHua?4`*
z```a2ot>R9%fJ>@1t#O;<Kp|iG9W2CckYr0J?J4ad-fbjCT05Y@aXdf28L|HR{<D!
z5ODDVyAMGHVFWh+LfkVtsmyO|ta(O7h5zPKBp{{W|CPyPuLG<VTYb8J?sK1(FMa6?
zfHv@e1+;VJVZgR+JLCZmc#xnb6QwOygbk_-Y^ZPXbM}li=JI)!xXR;Ajdja)zQaWl
zz+|Hg&`ymaF7SbT{_~%cuYK(+x`Ii78EBIZD);o2nwlE=$)-)4<-oxQNV@qy11~P{
zVcL2`y0VV>T)t7~RjuzUW`LAX08jbC7d|iF_{LWOWjY;aKcuRvihi<w{YKfp|KNWP
zJ}UOk)wVn6sA_nyBFatiO9%fs`Q|sj#=TTjR9q80zteBsx(%{-?|#Jo)&*}gHB$W2
zz<*Z3f1P`&tgHmQ{T9ar1;1W)@7^~>zzc+10?^rb@EE+$$hW@r4WS?4?YAfs0Bv>6
znssXNcTW-U5cF^qHv`Pz<>fP<`4lS;cyt<Y&=Z(oz%hPn*RGcxJ9bG+OUo1iZ?wDk
zt5&TNE4VTy{@(X~P`>{4ugX`x@+ARqb#*mh4S19Z+;e5+ad%S_d`wj3|Kuk>k#Lzl
zeR}faAOA?=r$7CP5X1l;#$eGYQ6{kR{Jv_{8riya`;-KKt#IE5U|0g?&!7Le-~8s+
zO+!ONSaZbM6%E>;1Um|TwQSnFbxMN|tVS8IW5<s0eM4Pc-D5OivFOeQnE>8&|9<yd
zEt?g*#`G|Y-h#Abq4hD}Pii~kc#=peoy|dNpM+$U_C#sl`Um1CeSxO<32iSt3(b52
zo=y0S10#4B?}aXF<*oRvbi^%I1Cp1S(R2BE&HiNBvgOKv`>C2#%HhNRlsR+e2<7a#
zb28WHvu8<ujMhHT)^2^y$sFi_XSF@lhjz+2=%RM$K-<sB>^bvv4k-!pfdjnJZe}EO
z#U)(L&s#Esh(lAM`HkzH?|c`z)1B_9AZEh=O^v&RE44RF_jZSAVsfGO^>s;oeT`6|
zYf@DjI#<a+e~(@Z^gxf))>KoK?v>hFrL_(Y_DWrCwbqmj4fW|F<%JRp-c-?1{f35y
zBJmy@8?(g5B*3gZu8`kk!^TarK||b|Zn|DHx2K=FzqRt`KmS=MrP1p&ulT%B_U+qe
z?dnO^mPM~#y+-;6hGk%IL=v7C4?ZRu^w^LHF(9p$zxCwFlWE=Tu!M(p^7lewvqg68
z+JkQEzQ7<7V=pSXkR<)%AOC;>Jgd3Fe%&Wnfm%uVh4C6Bmv^r`c=G|diQk=WZn#O?
zyNgtSj^WBmM^yme{I+4kCJl0S%d~0JkrZibYa`mD%CTd|N}<(Q&Xf};PRN_y^d@=u
z!yhgWedt5w4R3e@ZTwd1I7aInTG^msk(}Vo2gI$B_ppaOtVjYBSgTGZ&9)bop4Gy@
zY~8xe5}Sgmj4ItIfBW0tc%j_k4tJ10{pn9afkrhbD_5>8qFMDXfBDPuf)~6%+S}V<
zG_F@(|N7S>3Hpw`vCoFb57T}9L#6^w@cBFvP|@9zo+tqxD-dNsM@L7Rou1m-TB>Z{
zzEkz|paO2TKu8T&uX27sRiJ8un}m6nE?qL!VTDj7eWp*o|NZYPGq=(%qoboR0130-
zG?LsVy3IyA%;#CgC&r*U)h$(1ul-|JUTZu9{K$aj{}osT`b~64J}=G9&EbvFf(o?D
zJ@0u>VT|AY_P27kyWNe6%i|yacvc2rqV|Lprd^0HkT}4zf=iYxp&fgmE_Ipc9-(~l
zlb@7Xvt}_S{h@i6oIZV8zWUX#!c_UqZ+;_pz3W|tqWh9^<4sF+t~CITf;TE&1s?RE
z2Ng+xu1f2vQ>TywO=tJAjTHuO9cA310$65N^+!MY5zL@nmM&e27y}f*@`peC0R}@`
zyY4UEBLDp7KVd%Y8dDsmU39luT3cHg6N%EfJb)NPZh!mR7pp+u5S{=PaD&ey0hQg;
zS|*nObA4**ck2rutl*m_a!ov))R=U1w3}FB#GnPnF<CR5fI(%9X7vGg{P=OBc~%I?
zp#f|LO;ypv8nsg6I}KH`chL;3<J61i25;gJ9|%S6vHGg>JLG{6e25b~gPRdV1)`Rj
ziG}S4h7Mh(0tnDl7yxK0Ac!%jDt)Xn>W2z&<zDn0fw7%lVA#BX8$3*eb{3x(TCuEe
z>$V*_I4hfvfHyml!%*q2&pJ~9XjA|RkehG58Q?;>%U$kbqAqv5;~f!oXt~|(ZYTfx
z*T0~#@Fw=C08#+W;R{T|5XyoD3jmG;@Gexqf+Fed8<hV3VUrvKUs5vUA)X-vSh0Nh
z@<09f$3I(<O4Tq4XI5ukV03ga>;)`Q!lmhE=z5wM!)kQ<oND*iY=;5oG{1P`8{fzn
zQBR;!R418i5DT6_s9L?iv}sKf10e>qiUw$C{4A9Mo^^pYwqXM%r~rWs6TNWZf;2TX
znW#s_-b5YohQ`7}Q%Q7KWh!GKkvxkxVccl2L@;K7P~6I2b4$$o!4H0Dv{~VFOUv|D
zJs3&H<?|T9@$oU$$zm_?g)e+TKKt3v%9Eb-B*0=%5MvW{x#5NzOw?u3qD26)KnRs#
zwaFZLmUdhqjAC9SYU=WSFVA_-bJRv{4|@Sr08aoDT;K~5P}x1*Bw&)0q4eP3NNYBm
zPsg3Pp#uH=sKAv?6AT=>{jraIjD*L6oTxZQD-3e>fsU#MrMI^i11qn5<two>LMqR}
zXJu8bjukk;Q-}nst1FZN%@b8X&jBS`DZwNst^h>*SS76WYhLpjVRHpng%L9gkLV)i
z&?f3Ijc2%05p@&$^XJba_Efoe@uJa)zoyRhcmjF!qaV#Z@78yr0;9~y0iMewfe^bg
zQ3=qq!B%ZgBT*6XrUa;f>SGH*58x3^+!<a#ZoKhEIdtd{D<{`qf4v+zas(Pn4%1jw
znKy497M^xJES(LbXh+9k6zwn*=FpD516n9B<ml0(^1k=IPwsP{`$$jkfU3a|flw5@
z<pS(SbkCS>5>PS&+<SNl4;AQBCJeJ`^3jielvGx3d)wP`HPJ0Wyi043dJ>qmY11Y`
zZefmoMUARJ-U*&dkk2avs+<f+NKA>}z$~bM211BBtMrU#JcH;De~*}&g{QKbChA2N
z9#Q9N;*DK_wkVSO%a<?Ph75raSH>WokQcxB#Rc!9q4LNGlX8ML$56HkWRL)fg14to
zfl*P8%3uHbH=z)pKl#Z|X42RKv-~FNtR#Des0p-Lc>1sv4=`vGb^72+VF>Ne1X{WQ
zyIJ1(&UZqa_mS=%Re|0?4B|xa{1sGS=8VZz0Bq@@A!R@Y6>xy3kG`nC?}`f8j*uOi
zGC3?Yx{p2hPsH8=C$1Po#Qy0|e>w)3Hk+@$w?@V?dhY<wzkHCFl&Sy>C_@E;*nNBA
zfas18h7R$6>QkS}iZj8YU<R6%g*H()u}5m4sV3@Fw&f@s(7@>DKKHq}T;65xz2XIw
zA^L<9yj^2+0f{e8@b<+;Lt}%6yX#Paa4x{g;RSGW03zT))a}rPc4#a=b^uyt%$UIn
z^DJ%-hL{S#5d1x35+L!eNG`BO`}E@pi0hr;Z7EA;0G;{s0x#Sai37$odh3X$!+>DY
z=r|0B8aSiPz{RdQG`mD0+D@Cp>9Bf)6L<mi(!KJONJ2EZ3QY1rl7|Wu0wG5_3<$IE
ztgMMQwt*{voEF}qJuChF{V><)=(|h>$OVW2oZz7iPMIp;#hul$%GXi>MBRYn1+W7a
z+ava7`OU%ugbfd~_An3|f=vN9D!|SX40ozPm#RQ_Pe1WV6nrQTE<*)Ek2?=4(Y3J{
z6@UgLS0sSdwZj&~7$XL_u-J!J9cHnj^sx;Z7(jm;KdJ&rKP8?Uyy<^=5@1a8+^4jN
z8#X|VQrm=0QOe@Qi|z9`B!Sh28N>$I1nyaJGCZNc7-&FZ>{xB20hJ-pf_aQ(U!oRo
zivC^}F1k??$twJP1UxqeB2*`f0|qo3%#3H#tWMk!btXG5vu37I0q3~@X)nb#IT;Ja
zkSc%u>tClGCa}^-1%2eefdj-5#QBU#e_Wn1HTGQKa#tUo0H#j>&y{ziQdQk^X0?<S
z2n`I3upf}-#s!{0XkegEvYFAcj>ecES>c=C{AT_9<})NdtS%}e4|&K#2&u#3Us7R;
z$z)1nfh-~$1<#cXSLf+>&zn1=^gt*OH+b$m4=+&u(HN`AUIB5ueq@b$Am)1Hwt+U7
zL!WZS#0#(~iWhW(XK}{H#${|gqwZ3JFu%AuC7{0`0iH<Aml=FNFs4?$#jOI9&@hnP
zfxMpb{`bEh4^s9xMt5HB#S<W5Md0&*A03xbWx%3^vwx;4dtZqZHv{@%Kn4{k1|Ly@
zoH7C96#iPAQVPv;+=ox2T>S%!`Hl9N<JB+IU}mx+r5RyX>8r^P;B^rT!PVt+Z+X*e
z)~b6wgfR{mSSFD=**7^13TN5J!%EvOP+2sFPB&nw(6Rkn^x6`pTc)9U#0$EAI8PZ_
zAvLLLjTus!6!}u6HmRw(UdOEwKbg>U{M4n#Kkkt`^jPiC&wlnZ`SFi`TvWXboOen9
z>2Ul9NpRRxBI)~uGX;*(jn0Z+;IyXII!Wa-?U@{U$K#T-FVFBOxp04@!~Fwj@s%bD
z?d$JTqn4EG7A;i$&Pe~jkmx=pISOB#NKz&A;-zl+=f4hhzW9aD+}Y9I`YS0r5=6v2
zae_A~paWuN!eq3tWu~;9B8`t<rL$^`#As!jaeYi_3$sU+wmuov-@*@)9m^s9np~Zh
z>#v*7`;-}jGB|W4J!aJtfWO$KF~{M~m%QkiyJErHtX&#V`sb&ikEo(Ff7}}^Vv10^
z>90@=G=DZuxPPJ9#?#2LhX@hivEW~<;M?0;e<@bVl7RBQ!z<~_jQB$f_coR*u`!b8
zN5?XV{eJ*HJ`R|Y;GqpXWn5J$_aB0%Brq)0NSRvTT|1kehr#=gz*7?6{qFblROeqX
z!8R4ABzSJa?@v`%su%gsz*7<%H*V0V>~_TG7#SGB8>Sq1drm^1=Hu%A6YypOu&5*=
zgr?AZ(>vwB+ZDa%q(`^z<)8mJ^dEqC7{L#I@Pi~Kfd(>p!qBM(KCg9XXqco)<NvPC
z=RfbMdkWw^M=hzC8?=XlU;XM=eP>Re`ui=5m#rEY7_`mi(Bxxj!x)};q@M$r(J>4$
z7UJ%7j{@tj-Sa&!df~Gkqe0GJL}aF&?$a@JHJX|;+J3icz!L>#R2DL<<!^q=+ut;Q
z-h!2xY{oi!2GAx*TZj&?pnK(`fMrshH^vcC^NGCI+Ir;7>t6eccj@6P>0osPv;pOs
zMY{`iOzS9DDsB8u-!KCz3JgfmrbpT}^>uY~bW*hWfk;xU29of2hG#vlaUy6}qrGUG
zvB|oG8yw%Lc){S{z<}oW0Pqcbq~;t90Q?BGz<_bujR9gzpc+VMYq$GoHLwv{B6Rc`
zZF7Tmx8=j?>Jat7#SCLeL_$mjVv85Op9F+g;uxirz<uv(b2G2RG34LnwKq#3-#{q<
O0000<MNUMnLSTZH_s6^d

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/png.png b/src/assets/img/files/png.png
deleted file mode 100644
index 33b4acac4a2da34fa19989088f3b6d6d000f5b8e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1279
zcmV<b1OWSqP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000EWNkl<ZcmaJ>
z1F$4X6aK2Fx}Vp!y*u;&XWO=I+cv{{;qwKK;R~EEu(o%f?f1s)p3DAXDx!`#FJG(b
z%gisoEL|>_5t{D@XZpUs$n)I7GtWF*y=~jpOD9g8IId7A_{n4vQ>ILHk390I4R_yt
z_j+09LahAff4l}|XjeyCT~~h(F$NHyk;&x0^Sr9M0|y#0Iy!<<sf70Sc8rXSVD;)K
zUU}tp%$++s8c(F|4Dq;+m~y3u@bZ%g%2A~W<HtlDNA1;0sqmv$Q&ZzLHa6n@_uoc;
ze;;aVYmv|Aanw;q<AoPq#<XeEkVvGVnCE|(0)n8drOIlh9O#1w4?@6^OlAc9UBu&~
zsIPAjusC9||KW)zp2p<KQ;^H$2>hSfThGSy5l0+>nKNfjjz(kd@bD1EjvY&|#fz8X
z;fEi?)Tz_>ER_<R(7Z1*U7F$t7;rm+KK=C5!_6mkc6Pw?JmG&7ixw@y?YG}9l~oB{
zJunuDL<lP7R~kyr3G6r#R8`l?eE<flxE7^Al%hI1IuNSmm}8E`0}nhTG}R)VPQZ2D
zFaZMZ*s(2Ki^C2(jL+Huih)m1&#f{P8AZ``sFq@}C~6tTvBw^VXP<ph8eA>C80O-p
zrsnX<;F(N@>RP{kJtQ&0%$_|PT1OBFm@)w@(~jdXz~P4<iI-n~T{xeD!NCEc!$DtP
zKX&iljdA0~kshP0-rip9-Md%T4dRL`uE4x`^D4lm!B!8#Y$i;Y7<}~6r<gW<I<nGG
zSxj04l;D#lO+qS_lB(j!X0!ZWS69cXq;KI`D}XqEpzByHhJ_0k{yJmEbmVh+00d{#
z`uh4<-SF@*=@D?-DTsah_F=wMP%M?<2PS~&vV#8Ni!Z{LLy1JTD9v&KMNT(v+=RBa
zHZ(Le5Xb^H!5I9juf9SM1i0XWi;>BdzyKCWGI4>;pP58dRe7SKG$m;OEpX0;(8jCu
zhCxKKl&&2?12lq@dw@z=xpI|cSi<kW{|*rXfyMtuksN+F?X**+cLmw+h%<nZsU5&@
z$3K=ob?Q`th%r+eT(YO47B60mLcT!0&EUbn+Z9+885Qv=V5CV-RSua6Bm+p5ks1I5
zuefbCMSyjP`F@GR^zg$E6R5el8SlRPE~WX@Q%@lpjgm?^yX0CVRG7U<&huQjI${NY
zJtT^ab{r)$z=_3i#~q6&pL{~H&q2;Fp(n@nLE!Vd6VWJ?e7K&6f&Tvf?yi>Jswx-S
zuw|Oe#ZEZ24Sc4v2R@EH?j&ZHlOW8Pl}aPEBN<l-cm(b39jUwSyye>M+qZO+A}OD0
zvCnetdKRA*U8}GkTqk@hxdyB>mC8x*3>Ge0j6;VS<9FPC<K=sH@B9g-2jO`$Wy)kh
zuxKI(tP0GrOy_qa=|BQSv_@xVXXdUuZ@x;ve}rXv#fs%vyY>TIa><oQi_QsR+zMh;
zVh0ivD(i4y|GxN3FFkkpuASR$aGDO!nS1ZOCpC8LgsszO%v@3wzGSnK{o;(EOl6!>
zadTD5afXJ5N-w|s+{-(6Y}*H5iFi>wEuIq3X#h%wDSq+A=btUw9xtGgihRSXBd#pB
pjU~v86vQ%NF(5eI7Z1eCe*pGxtKwfl0O0@t002ovPDHLkV1nwlaM}O>

diff --git a/src/assets/img/files/powerpoint-64.png b/src/assets/img/files/powerpoint-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d44c7d2b29c63e2cc4f4d3e0b7c4dd69727ffb9
GIT binary patch
literal 4634
zcmV+#66NiQP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000r;Nkl<Zcmd6u
z1(Y1ewZFex-Gf@vN|q&A3}y}|e|W~2NnvJYLztPFnVC7U!)C}cNQy0s!CBGrP<PdR
zvs35n_Ukh}vtj*wuB&S3?04(ls#`T9QB|^~q@Nct95`@*HEY%~GBTY1!m}Ut+$Wr}
z;sLdZ$tW1?L#^WCDFbJ9+B9;g2^iVBLk`}0yMF49@vofuv5#Hz*k?Q!=aher6aby+
zA|e<gWGT}Ds(QM$?*FN(0E!pJ7$z%K-u~VX#A}Csd-UUu?Rk97MifK!u(88MicOfS
zTTGZ|cg-*~e=RE)46<-eZr_}<p70r6u%bpBn=}M~>ObZH1!+q2x$qCh$ZuxtfF}6m
zl}i0RZJi^Ax)XZu_$J|vUtw~5h*HqNT8E7-HgedyC2lyPni5xHf?N+f;}W~?_h^oN
z<TE&8@j^@hTCJfrMiI~ifQR=4fQsVBNmK<*Vb44Ss?+_z82bCmm*;Zf`)1>SQWJiC
z6vZn=1d=j_ngxFUIf^%b710XiTpg=1&PKS{dM7j-@sty4F~}5r4?9kJG)G_hbe7DY
zOIoVgA&f_D2b*|p`hA*wJJvZ$rTo@`{+{DiwL(InbB>fss@e}(@L!^I^LH>x6F$TV
z2!aU&h(H7pi{J?I18i^fvg@RE9DU&w{J=j1Pg{6MzeH0n6#-{mzqPig%Kvr%U6q9Y
zD&<?gk5SWv&!ZxM!3a13gO{j7O8soD&SCrUmvQ7dPx}Yq(_x=I+tVXWr-lHM_9o%%
z;lJL5{{ewDlnMnP1_T2r9^M(js6%r_wpGe(J^E5spY;@$9QL1v2T*S*g|mbI8l@?C
zCr$V~-~bRn6RpAFOm7oD$L6&cv-0#OvGkCD2bA^^AR@GrwBQAP*Ub6ben>b4pU)@X
znsfqzDwZC$RSla~U%-mf9?#MRa}SM~S50AebbyDiMvDCYb4~cEu%`)MOw6}|q!ZNP
zq|DZe<DOOLu>7>g976D*WGg)V^wR+^8^_F@H;?y!^fUC`_D%A)ezOH%p3ZpylQ02Q
zoD`ezF?X*zs|o+eCj8)`2d~=R0l)q2Z%Jxk{$YXr{U=QE-e01w+JaYN1W7F$1{9nG
zY@3Yv%j&6_zx0rV?^N!GhxHWzuS&ym#s6FQ+@*VdKhS6lGbbP5Fv-Pk#tEt(zGB(9
zdTQn`X~NI@8{z2=PbYXmaR6Q6HDO7Gx4!-y66zc1?R|EA-@UE!))68eKj{PyZ}M!L
zjM&%;`-@4!BL>1eDgihLYEy9OnU@4&MunFuZ#};tE=KE(R=>;4XGB0XCOMAGWHA>y
zY&FK9h!G6HG`z!^QVV{=s)w^82`>V<GOjj;ZoU@T`DbKeAJi+T3Rnlup{-WYDYJMm
z>&LWOKgPHC_uwCQ%)Dl740Glq$zAj~s7_|W`+mk6;Cf2TNXQq#RTXDrKrsl;fB{4u
zR(jYr5jVsBd{!jGJ_u0>(B|S9tp6!t{{q5gCm}~a5W*6OLBLCse<`4eeD>qEuhSVi
zOu5YXcYna}&9{?V_avxvf(OmWfzb5LN$?A<QNu<SVh5^#hgY#!>1W%dHW$2eoAB#q
z7Q7&jYfK_Pe?3J5x$|BEgM-i*gSZCj5NBI0stE(s;py;Tv?=7lOF;dYpubGGawQBM
z1f2zZMl~4P$R!=n0=Er^HY{PzfLK5CxdC=e3U{}PoWxdV0$fyuA6!9c#mNK@U5Acu
zh2c%0f~XH+bqe@CPDwgL5>8PiBU}Xpe5+_+&^Siv43BR*q<~dOdN@|%hC}NPP(mCO
z`q?oNvT5xltZWrIgG?(dAU}U2r6tD@KJ+r&!SzU3gj^YM&I20{jyezpafppj8-sI*
zDw=deJBiFJd??~vGNm%%eNQt#Hq<!j0B|wbhT`fDaSjtq&3uW?N3COJy1dPmaCiTf
zLS-Mpg)hPlZvX<~Eq6j~0{kC~s)BVb)20y=2zurb&OHnhhG=yH6hIN30T7a9ydc1I
z<r-V2@s!!XXGH*zj)1zuRU*Rvezw)-u<f{YtUmKeq)&CK4!Qk1<R17asP4gsyiou3
z7jQ%OV2VY=fRB8|Mc%P-ELbgI29_}AerMBr>Vq+rgWfp`lD>xo5WySXtOW)B0eJ6#
z7}60C*DOKM%l4?3oyR|twP&|E(gr!)zRl$0I<jOfI=&gffLbIMU<x_Hasdg9kNmjx
zKNQ6n#Z?<bJJz%JuG<*fa3PBy`z*}pZqz$q8p6YaB4B{&2#5g%=?<^HKf5)+MYhRS
zW@p{7=Y&Ub)Ok;Bf0<!&aNkDEz~UAdP5}q1NVyN`9YjKl!J$S`HJDNljs{f6K|u;7
zf}T9%zyBUXa~HGdob!;q+dzUu3WyJXQBVV-fI{rRce}#VDFrm;03!jrY9YH$c{Imf
z{4|c3mvNpKK}PRG`VR+J$IqGrr<BfqHUQBzA3^ut<14~k59JHrf;4A2x^F9EH~xxv
z&rTp9nA69|HQ#0M|D8)g0-xW``Y?B~@B2!~8x~w0oI!;y@LhHRV+<s2Pj`*fx$l0L
za?FKK%!HqojWBZ;BG#fUc)(c*^9TWI1=nz>2$}~e4I=eA#Z~jk&0EgUH$O<c_W+m>
zJF=h3_RSQERX8{V)`NRsKmZXC9|h#|paTFXo#9opqad8zvK#Oc=NKIw;piv6jfL~)
zf!dA-8`L1B{>0v{zO@d)Vk2KuU<8Pu?{JtiAKMIbDLD#@)-t*Kuc$M)*b<M8f@{F|
zFqj~@|9fyF9$tXR;>iV6v*EiPhW>c<jewVJMB_&tefaJrhtC_dM!<GH)v5I}g!&f8
z%-#=Z!(r<VF$Szf@@34trLgEo7~hZn@u#?kMMXhD#6Z;Wp>I>Gpa_`6P7uccAPUeG
zJ~IWLu(e7;(N|CCyYc~H@bhs+I>385MVtbO*>}F|6$RU{EeBvMI7N|}b3@M{)%$k(
z*;ij1ggyN<?)?j<F-cG=AYljzAdK-Q3ULHFEBMY=V!!y+)lBm^$Ni2w>gIZ(Z<r_^
z%!E(p)-*Wa)4}Jp3yEqL2?T6Rymtp`9r6C%41ecCOx|@fYKqwL3gN<4^qhVvx@-;g
z8?MIPdj~;dlH5RV)A}Hv!!L>sP>5^-Uc19*9flr$))^$Fz~n@A8oc98j#K=;?fa-A
zfHbO5=*I>9*h&K_glMhG&>Pp`Vn;Ml!PX-*DC24o@kE`)PrjUR{vv2v?!jkacW$A6
z?bS?P_bc?4jpWNAg~f*x4h}$Qz*(UC%=<xy6tLFOP6|jTcmN9|4>W+*CeZ^s2#z`v
zYeV9yFR9gmiyKV?=Ypm|JT}rAFMPopnYZrg%t#29uBQB$)s!CjbfOLaP5rk&W%S11
zA$M)2FxW%+eq|Um0HBfyuiB*$qK&4{<U%&QPQ%aS>BK=~bRS?~;W4d>vQbsUzZQ)^
ztwU9i;s8A-p2qygznH!Up8*GU!F`({ieO+NEL;htIY<zaKjHo@)9O{!Z@Z4#uYSP6
zTkfJhu?<~*JSv(APq#vdOm%@5rc(fQ==eUQGK$6#X6|w*_O-&?)-2*8q)=qZ8^26$
z!4fcraBxA(i0kl+55n!gh2aA*QGrSg79Rx<xe)&UWzf?PfRsuUA9hB|-1sP!Ykq~)
z9dXn^GvL*a{yqnEy}fk`PSMHzP#*^s#Ky4jC;(i;64xC@V?>m~niI$`Tnb6u_)WO$
zYLF0$JzxcD4OsU=$Q9v}uZ5?)3g#^&Dbw3e&n1tf2iUiNgmI@B0n+da3SCkl17148
z!*uZ@HbNC}7IG!zup<F*{&EGU4iosJFlp`E45c2Z#b69XbvXM;aLQ>jhn}y#2VT^)
zHnP@Itu+v`;FV6>fXTRbnAN?#y5#375=St18I%VAu(4tr>f4C+8e9S{1|#0`ML)j%
z53qL^ocw>GUWe^>(@xcDoj8g?vf=gbO9AbEZ|}Fi#I20OEIJ18(pYg3h$s?fEJi0?
z09$T@eS3Ta<nr+QZ^2JL52gSEi(q`zKc1F4s@t|f?>tb=hR?nf#*m?|@B+9*f;op2
zdXV|6053aHCmM!$q(MAd_peW@e-WI26)ai{^$Ij95QZLj`~ckiYdG<tuy`eD*<CxC
z`1P-mLZKtP;`_7T2J!!iN_%+l&{lnmAT~l4tcGGA;C1*@p3lH(=ObZ&G=ajog8<+h
z?Arx>^Pn^b4qFM2eFtp(liv+?ZHDo2Sak|K@Ekbf(X><L`fF)y*+f2<Lu=J`@Ls6{
zQCA0`c#|yn^f6P>7V$A8HUFYVXJ2r}F~kwvaUE1AVC8Xe{C|1FM-(QYld8Ag1TI36
zOn61p;Imx=qyxMHGdJ7de-a~uE0~q)HCVg?#K6+Eu;CW?$roT^1eUCZ`<({MkD`;b
zTA{K2c35*fsAj?^7U{oz5me~>Ev*9-a2A=r2J&TQr9GQ{abrSIg@>IB4?PDq-40iO
z3tshTShND(`gJIj+WYY4KjDV=Be`5hc=i2m5s;Aq8Sv>sh#){4<LK}Xq<^so>!cOO
z`0(Dc9&W!5CP!hx62I6z?``muSNf<3bJ^j4%}*(wa(`;Zbc9D0I-Le-D+N^$X$wC+
zcIx|K9v!+Dw|6sAm`a6J$f9Fm?hzn{w5D@=)p4-wNZ7FnZoV4c|1zkI!Gq6%N52q)
zkan^|d$9N1Me&SF(2biR8{RW(awX924w%i469m91stPU!ae$&@e}%nUVEwO=ISXLX
zF|g!#7(AlosFeIHuR7M-MNfz8eg?N+3yr#euI=pqjG(%YaG)P`4$X%5tyAJC#`(W@
zwxzHj-F}%7TTp{p_8_Eh6<B}t#ZFlaQNx4m-3&NbunG_|<hR5#9_g)v!bL|=eDUjO
zj5&y0XLwcW^#+O(<^r7S?to+sm<=!BY{1@kyp7<SM}c!5PTJJfs$e5<mTpqK1kjAL
zx)e*0FA#6M6M5+AsJgcBZVJBEpx%gBv}pdFVGtZ7fTSdjZF-9y92=`{ilS%`k@oNa
z0$QnHhYz;EQ~?3BgVWG<2NvH?7g<Rdd_P_3IT6g<xlk;7#{i0=&cjDhjEFEiynoO8
z-~0BnhKGkY1VNCF0L|P2B?}$}2bAX!^z?!%illy%C#Wi*UB9%*y39zwUevb+p%F#&
z_Lk`@mxvk->h*|5BWeK`OL^irW^`nNZQHl+z3R#rU9$eJJ2%iqVS9W4>Hcdh|Lske
z@8|yk_%^k@AWTk95{9sFa3Qr?gGN1KvQooZ*K&$FW&i$B?pnWL-|Jp;#bsMIZ@QTb
z8M36>8QypPt?(!y!tUKW2?HUDEMwyp#wR^|UtgIZ5Qg?1V0{z*^{;KgUrPrW6x!G!
z3J<D|k&%&BxKB*hTIQUGH%1s5nu6cB?{!W1&G&Bl6I~S2PKP2q$?GkpR*#sNsQyFn
zSt)Qx!Yeur540k{{)6xUCJY0nETuyZp7e=Mgx=nN3?9Jz;upW<uDjN^oM4QgdT7F@
ze+^bD<_Us-3?9Iod+s@$dg>{>?|tt>M0_;pAqJl=j#RPMGPL*LKLih80HP@3^2;yh
zS<iY_t8aqfP=lXtt#df1R4R3vwaq^O-)0f~%x6BsIp>_CaU45i%pnKwRGFNtP%IYN
zxBtMtSH1EjkMQtF8=I9vfW({h+H0>J-L-Sa9Y-B~-09=v6A0-VKD(c;=auy9+JFIQ
z=Nny6oO48txV8GLy5ZNp=E`R`i=00Lho|qS0G;l8vx$E4dG+96fDp(7-0yz(JN|v|
z|ImAvE?IVB6h|``L`wQ#BZ)pUP1ek(fa#v|zN<w3A7#p>O@G<-&Ud`|qZ>ACxD_a-
zplt#;1|q!Gftqhy76CEfk`Bn>9Z&+KP$-mpdwLctng>FK0Pv<50Rsqv=@5d_{>Q#a
zY5F2oQ%@wkAv!TJK3=akA|On_C(X8TKn<wktqwHskGtd_YVhVEnFce7amqYws!y_?
zZZjTBL1#YZlIhwe)U~ZMyv3;qQ9y-kNqXD`LT33HvypZg185iL&E_-sAD$eZ7o5+4
QPXGV_07*qoM6N<$g2kr6o&W#<

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/powerpoint.png b/src/assets/img/files/powerpoint.png
deleted file mode 100644
index d8a83078063607c9084479639539a9d6b7b58bc5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1371
zcmV-h1*H0kP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000FdNkl<Zcmai#
z1CS)m7KOje%BpFPXV$yVwr$%s1JAZ?gyY$^ZEMZJdiZbeG^)BP^S+GEsEB_2PsBIp
zmhMSSv=R{jtabOa)?PhI;=zaC__E4<vtK=Q&)mdBf2*+BrId?fdt!H$oBiQBPk!F-
zm31))0*w3_x)V%nqNO-C-vv<4IYeYfx0@YzW~`oHI7REbuOnLj3t849U2n56c^4+1
z{b6?O-A%UDK?F}3;C)Dl6elRHimA!gjkH#WjZz9AA*m+Cxf4{r_$HFhStOYx(F2yQ
zelMmT^*-k2xBKQ@u2c$~6JxEdD5Wunj~>TVYE0V>V_$wVjm{O2Ov7NEh3UIddDt77
zo1LS``Ut@P8~w<2DRbXD-i+()+d2D%M_oN`bk-o5Me>YO6E`M$*ejUZzJnr75fz0G
zl^_rrm9<tN7AXouU^Kz}=|y)Yj^s|2t>aiTh90bNa`M*bN4|!+n#LXeAqIzt0xQT6
zNAPgpZeAkadp*>?Yasam1SEiIPER3us<O2KiEObne^25^yqa0l$1MGxc-uV62P@}1
z7P1r>Sb{Vvj>w#1{o*>&)vkpMgdiDWvc4dhBU|aPe9gO3d&JwBog7CW{RL*W#o$+;
zMM;6}^sv&PdaYZMv|31>gHjM1RFNW)!nv>qqcT!x@}6aR{w~Zs=DowyQk*|VQjNh`
zWaR{`9Kluh&^@up<}ZKE?kB$lqYJPWjDl{4)PQn>5lZQW-~E-Pg%vmZjCV4(%{L!p
z;lWrP9ao8O_E7TN(C{;xdd%xd&o0qD_%~QQ=s5%n2T`l%5Hv2FqTnz@f3tC87OsBR
zpYPZnnhS&t^{6~Yx+(qjlzafa%Q;2gp?6)6qMc)xPs7EFFg#`9WR);PVP5~yPvS&2
zwl4Q`#KnmACg7p7iKsf=E1>)OCy@7r*(bb==Di+?+qw_Mxn=TSe~V&e4Y|54k8f~-
zjI}N#A|aFz?uU!Y+PKy}x)-|aeaA;>-sYa@-+dC^`f&7Jo<?%Zd&4d6gj=~tqo1>t
zrXa#-f+i^3A9*Ng2i2OxB~x^lQ=*CO=&=g;`xGfG?uVaz5fJqJHe51>guxDhfFUS6
zAl!6Tz&e<@21&G?J+FK-$@X2~9Nhd-V5Z>IA=q;bKruLel<x6GxXCS%GzCBi7$_x#
zVDHX>sX}WfNp+f?&wW*Bet8pC&qHG;-1a(fgIfWR{o}9LOrew-{Xh86C8FFQ>q7qF
zZ^Q9lK>H$S4dc@=H3xa$`wZoWvTzux4ay|~NRpT&HX}<^ZnASoWN0t+P?11(0HR~a
z_#7w=QH(eZf8LM$^&k`lMbbn~P2ij*P7>BuS69!UTf8_n7Nd%yKt%RkYWI#i>*BBz
z3ST2m5JIT41%iZoQUZBVkW|O0*Xtm{>C<OB&w9p_AN=>f|K%qDI*KC76BGyyQGf=N
z3|*NB6&dfIC<0$=Uk`l1`symiUoS2$x1aiy$2}x857H|u{-KFr<VPcH^axVcE+FCw
z?ws{mhO=kS_MY|3CqL@Y!TmpGMEbhdy$+xM{1<38o5XSAi7}oyHl8?O!o49T5D(o@
ztJOJw?tJ?xPk#J^4($K?5BN7JfQgBTna_OY3*X+pW9K#VJTF8<iQp0Nb$I|>xTbWa
zwBFd*C|>{iSG|7!KmPW0pbq3f7w7<~B7_(}(z<6-L?XZdQMn5vj7k8kwF9pnkN^cC
dpic<N{s|pwP<y!vqILiP002ovPDHLkV1k54nU??n

diff --git a/src/assets/img/files/psd-64.png b/src/assets/img/files/psd-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b800dffae3bec55fe65569b931b3f91ed063a1f
GIT binary patch
literal 3944
zcmV-u50~(XP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000j!Nkl<Zcmd6u
z1&|xL(ty97@p^Z|jE|BWGcz;PU*X5h%*@Qp%*@Qp%<moFB^w5NAq)15)cx<4Ri(0B
z<66I?RaKuf^4wj%R+FTOa68-oz38jg%)7_orwBdP*FOtP!5pT|l8{rvk&RT@@t?ow
z$w%Jnvu}R!qqlQ6w?YL>Ow`X&)l1Dt03)>ADV5PW+Xi;YYd-Sb!|!p<mIu|wGWuuD
zLtT!k$27-$9^iAl%aPO=t?XqD1I(Q}A4z+&hi|&*^-CAe_2r%(0L-AhS^TFp&9}{k
z8Hk;TplOo)WZt~lznzu>0{k<xEPsm`w7+homh*vMRQT5QIm1;?sWc054!pyBj`|F9
zb=1}Hu1-&n$MOmfJSkz*HRrKx*$R?G@T!=BssREh5w<gE6RS1hgMqbZp})WU%t<A@
zZCVN#8>@}vxtlA}{Ii*nYQ{T%S><d0t}!?y<W49jz4V$VQ4ih+_zcT4(sY6zsdE1l
zayDIkE{hf~CrKduw^0QV0=%GrC=lipAwGv06%dH;hW7vzR1`tN7%-);w>-LV;oP~j
zv?TPcpy9=K__zPM%9pRJv2(~+f8+@NedTIC_^`R8y(yNaNT~!py(FbxN_`2l`o?*{
zN!)Glf`WnfItO4{3Mhhq>u;vuC)hIvk2q<94VRtDiElZ?bq5l@_ndn$VJVs<NKzv0
zF=myA*?O#F;}vJzeefz6#VwgO{BJ9K`Gy)h^FGG<7jeny$B?)><Ep&k$2E5CKgj7v
z%)(8<mmGcRLAD-KpH$MxELw8+!K(mRkggOUP4Hj2F=JbGlvkfV!7m=z!<Mg%Fp?YJ
zc;sUGvu&(dIgjfPDy5#Bvg~8)QKPKC<b+B16?Y?ibOGz$0vhmd`&ET+-Q*Y;FZ1dP
zXH#EvI8XfQcAk5}A>R1g5%!IHw!P&X9{bfAHCLlo_p<fyA=Y0!1K_9O0;QtdI0gTX
zUsU+cHpjM+6xTbKdoG(#FZ=k-(@*4s|ETffD|)!++bbOPyD1kKqp!Y``>i|3h6`s1
zd>CVZbzuP|alGqi2l?g=8Mo|Ju3S>(6PJ2k`a8$>_buS)w_eXHzVsKy9r!e1=WvbE
z=l~Czgx@&B;3dQ{>&5~;{+mI*bzO};LkXMLj_`zyXYk7#s(f<8e9r#BcK-Y1wJe)=
zEZ2Oo%G|UL2e<LiwG}p<Kl9*K6}oYOQ#QZg#ozqT7(+uTv&$*(f5KVZ@8i3<SF(p~
zOOIu4{~S*H=rFkqv!XXcD%*JEnhKlGo0;$;f|*T!FYv@K4(NaWJuKDwY%&s7FHQN;
z)0cBg)i~$92k7q;T$(ViCr2x{^2qyC*fN9R3FC6Phvmx_N@oiIMk~Y8*FP6Vb9z$P
zx!<__?fWK`u!4<8mHF<?jzy)6{J?EI?(jkGf5FKtTDlxbKmtuvxB+Q<ZBI&jZJ)N+
z_M|PfeHz9BC|HTiE2h2}zFQZVGk-pND|Hg@@B-yDom7J3+V|{d?ebn0NF6=6oyQ+J
zNUh$-miOF5DZRO1TVd_P;x~xeGhz>*5T4EAZ@F_k^peB4-+A{Y7i)(PV^ag0rUKGL
zFz-<BNX#%AO1N!z&Yqzf3=i;#qpNJb;3VGvlYRWLl2J|)x^A7o%_6iZSOTWOQZ$H>
z<;GRD1Q811Q3$G=o&rog<}=JY%*rGPW-xEIr(WI8!;cwa!v!Zc%G>k+sR-%q;a3Au
zFhHUb5KoK_9)QFYh?3$FQ|JJ%5`A)-3UH{;F_%NhP+(S{#|`b~p~nuh{-TpYz!Nb3
z=N2QGfdS@;mf*pInu7VD7mY&by$4gwtPoyM)Bx*30p>HzWnj=d+t9ItJn*<fljZHn
z0Ui*!ovTiOi6)N^iV#Ac2(UzJ00r;B6g2cu3?ECu=_)`mpP{Zsx#TJ3qulqn3D#e7
zYICZyt_>jOMhid~_+ah^;86gtNL=Y4K8^_rQx9ex;YC2ZsRYd&-en|7opLhF)?+;D
zFFm7eOKS#Lx8_cO0Ep0dP-{GkC=kTAn|+XY@ETm85FP~spo<`Ab^3dTxZiOlHe7xt
z?fd!Z9i@1usPipp%@8rtM36+m2<Gmil|<-fW#GURHEVN$B6v~3=pqO@?=UyS{ZCBT
zaOIgDPjWiLdrrP`?WEib4QvK@2YYWG<S*a4j_QsoNg_xvag3JLc2OB>fTE^|IWPnD
z;rC*A1WXOHX&#7F5A2<U?_vFwXaCResDT+i_qYu547>;Dz$q-a&jK!g#yPA!dMV~}
zzyk{84e>eXlqdvIa@0FSU6{)uSb!ph@Wqv2fdYQ}oo}(}s&iSqcv;8V-U`8Euo5xU
zKuYkPxBiyzzvDOD_P5<A!o-Af+C$Eu)YB-uP#=L&@C`_v5_O0w(tr*UU7#2~RDyJI
zBD8PE&OOVQH}ZU^jSbcs<g7WTo8m)|cLqayhN*0?@|%zSo}K^RORhquu<F!%Va_$G
z&n&~&CYTbfPfDIg@RpSi5@JFzyaHGkrSLN!ci#<O?GHfbU0os&|KsgBU8lt36bwKV
z5v5cTZu|YM%s*l|nKSy9&%<1flwkE$C$r%A`#^7*iJ>tD|8fI^KmRk52$+Kq2Z%8M
zGeszd7uD`gh2Q$(hyO8mZdzMfBLJHxrY#rd9Nt5wM(zRiK^%rr^N@MNImNO%>mGI~
zi_Sg<Kf9kiEy2S1%)8_aEYI3kKa4Gm6)S{CBy2Bi`X@pbxH`k9#LbGf<#aQ{t0(th
z2@NxMIhy6HI`;_bnMWmM<hH%^E}cv7eO6J+9ecm}3&w69puBiK<zv={eSS=P5Yr%<
zH+rKGUZcNurvQ+ShZz`g^*y1Q1H~hNs6$Q3y`df!tXo1_PFZ%wVU$-bCd)m!%c%VM
zMtWB-rj~o03gfp7pp`*tgH>ub+=8SMKrKXcC8og;Y$=8pQPk*80Wgh|oCF}Oged9(
zQzYbb)Z<mjypTD^Q4c;JuaJ39-8Iy7>qozb`JDRhebk-da?gUtZDssdf2H=vzhh&g
zfB=S?L)2PogrFF+Vt541x^n?AfX>HQL<>+0stN)g%mrX2_d+%@fy2ng>WppQ&;FnO
z89z9JB!boJ9Q@J`nYH;Uycg07&!X>wv&nw>JKT?c0%?L^pe`z)H3$~Ki-Ka^TYz<j
z$HXuc^NIvZXcF~!r_{aSCFP&5`8=vQVg_Oeq3%~h1Zsc#583t|^jv-+9B~*f%dzv%
zMXFW!^PeDrm<57_O0Xk*Lj&F44Pu=SFi~PT>Z71hoHbma?hWZNl2k}aMv@p}K1Oqw
zfqAr2q5jFwQ~%WG@sg6)Gu)ar;6hc12cHM=aW`mI03Y`PhIJhTJD=XB(FMTTHZ7tK
z?;JI6D1vz(OxT)oy7`=B)pD3WAOE+%BkHhf6=$F(NWC83Z`lgt3F#MsBKT+l)_o8x
zh8Hjh7LbEj^IqKt7ceFBh7bN56`+JMq8>{UZ0kns+N*KHL+Jd4Sni?ROX<&lXx}B8
z505@pf(7uw0&Z^%Xg{|{iGC<F?bB5oy+g>Q2ba(QZBl>&jZ`UncH@8d2mHFj(M3yO
zqK53*Md=qmCB5xtkfccgY90|F)Eh!EJOXB2x&Rnh=SvGxYf*p;1xh^1I`re;G4lOi
zf_WrOkzoF9Iej7{{rcBPy#w>{Trf!?5rV0s!Sn?}%uz7w2(Ktumo8ucbiT1MQcMDn
z2MsV-TwxJKN(mU?<LWnZx&qO4NQ1^L33F)!TtQ8nYYg!KG5%N)e3+xl%TWwKI$l==
zzr@s|5>sJAA*}_Ag_^xFmgoXa=lq~8;!!}t7-G2{<BnliF}wh3-3LMI051Rrgy1Fu
z5Lch*>rEyvgy*1u_)fcMSpBBcA_;x#C5ll9FRCbX9|SRq;T0@3EWpOexY`iFO(B?k
zyzL2NUkon>NL=}NTST-NF#rrJh8F?VZcAZ+&bPFXLaPD-ENUnL+%zhMmUBL$0L?*;
z5ac9oPvgN0fHVc{0{BJ`-DUx>&R5i662N?T(THiVr95saWLisRHQIxm0ce}Q7hT8{
z!J7zpkIP+`S-=Y6g9{M%<RU;!gHjma+Ra|YBS3qQ^DX8MAO(wMh47|IEz9XK?KTTo
z=g&_uT<-7_H6{|;Z*R2VR;TTEi#?$?i<Z)<IY;h27=`flEN6VY#>$n8{x<E8r3VKO
zS(ZCQr0~lOF=1C_gaadW5)4C#kr}`+;yCt(5zIRHvxT1cUg)gND&v#jRavok0rO_}
z#s6-j5Acp!ZGr{!=M3%Mz5ArgE<JyHcM34+_*qI4u>rv>*3MxZnJ~;~|JplDM&Qt4
zQD<0lFAeLPGrOO8^JbIho?1Pp@n<%A`^%_T4jimfsZ>VZ`Hr`q^^LE8`MR!SKp}h>
zn+jeCyD^W507ks1w2n76#m88kYx{bwj`wxeu363ac%53k&gj_GoM-Ob*_grP={^HH
z_Z)i33!Z+_4L4kOU3cdJLEHc12T1{*I|bf=fgRiF@9Sk^B4ccPya_%{69xu$O)6mb
zp%*{@sZ;QOgRT!m3}6Pr8(>r`Rh)Aj;a~KEr(Ja8jW_%iplbyffXx*6_FbJ>Bf58l
zzo8AjTNju~@Qtw%w*pz_x`pqy6t)=!uL9Ci&riW8iA)2&YZovuW){3EMog)FedR7!
zzU%Gq%z{^uU;&_Edp$6)n;pBR;GfY2d>5tg41$m4tr>ZiGcq#9!Rqj#=REU?7j3)k
z)=u!<yFjU224m*It5U1g$+8SZMj!jg2VOb_Klwd_Bxx#u+^)Ylx^m^JWY3=6x@*_o
zKcuDJGradr2MJ+(r<AuqoP)O7o+<d;F;pF5Y;17sQICAsmi_zp{xvWdpn$cEHHZ&=
zl+Yyhl!2ZpS-W=ans0sUyB}D$?(oxm01!ac!T<~-QYwZ3H0=WdY|~sE6W-AR1w>_9
z*m-7|<DdWh>n%@w!lU1`YuB!uT7b0$*agXg)PQ<?CI?IafRq3a^Z~tL+#3{A3X+CC
z2_mh15L(9V3U6;#FeZXVw=Gz02Uvjfq0a*NM2iv};Dy*E045QXG)Ph)(pjLhGKv*Y
zFxN@6KztAv$3bb+3>q@co@qb|(`(knvrVHfZ2u2`1tW|KP8yp40000<MNUMnLSTY`
C%7upj

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/psd.png b/src/assets/img/files/psd.png
deleted file mode 100644
index 3433fbc8470358426aa09e5f84fd0de7d322e7ef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1320
zcmV+@1=sqCP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000E<Nkl<ZcmZvb
z1CVS@7KFc3jfa`FZQHhO+xBi~ZQH@$wr$(CJ?!r3TUD74eRrZKVlyJkb$o&r<8gj#
z)8t3=y2=0D`{d3c*WKqM_ne*S)n=KMm1Q0fH>8(6?!KqJ<8?1M8zLElVRc?zD|)^D
zwRgY!#sdJl0H>XH#(kQm?w>3!y=lN6*WQO`KlnZzbjl(gjd<<@Z{&C1eHFcRcYkIs
z8Oa!d16vqlgKcn->zJ#rzV3dHdep=3NNk0By$)P)$B<9$b2D#!;X~xUc+6w&&hsC&
zpnq=`9^DyoX|Rw(1R*Sl07AwD0h1S0sSA(*?pj##HFu79+xEBWz0bOzHg?A`-<#1)
zxlI53@-rj48)R2mA%!9wvK$V}w&eEAo}6PatcGa&6K;9rg~#8*@7{8sbmYw)mTPEu
z{dsA}&pn0c&q#7I33p7#Nyf<?WT#|Ihomee%Qz&Q!kASBGmn4eo0~I-9C2ad@)cOW
za4uhc(StbtiV?LA0I)roCmXz#0z<Ba=REeltnVf40F0+SSl92VJ6__bbEFqN<a)mK
zrbonce|5d+-wH&41;JK?gDOD@N)c*cFp86Y_i{bzz8jDo0C>uSnum-AbG+oyH>ZDo
z_IX@+TNeFDGwVA@k`*azA{kqXC<$fJ$q6#U7%S{F@yY_iOnERKE%Dq3-NN6${5qmH
zL#=bGVd<~$^6;nJ7h7C=&W)7O7+g@zq&h~mKptU<Rsos{X#%+Z%%k}4_udHI4U($}
z1-2w>!)!O6^VY}e?)TrIH~;W8avnulUXqs=LwQA!hawNcuClFa2d(f`1#fuHqj&4B
z+lcLCk?b&bO3KN#_>S8K>7;)jo8|^J-Q(f+@Z-Pmy7Y)|yvtr*NaSH+JhbH`J7L)d
zPv_uePk+E%slq~Z3|3GZDGDV=H2uDw_}P~+KPVIw3&TdY{d>D0iZm{4^*~j|xJH1n
zr#z^|SfEhCk!+hXPO+J4#=dKq)17Bumd^dzwrTn7^SyNGHL3T5Z`l2mqFGMlkwMAr
zU)jKv2VfK?92g-R$`D+U5_c^Y7S6bk)D`i_2QwJ1kXKBf!sZ2(5teZ^#;grdi!fM%
zP9p3{Ww_GZI^fnF_a{0TYQ~pc0!#C(JM~zYpTn+D#@MS>1ZHic*<cxmg^i`48Oao!
zo6zFz3TIRsC^^#Amx!7Js-yz72}?4j+5!K^1BI|7fsw0NSxU83sEw#OQ5!ZB*G8x&
z)uN=FaD|*Dk=pW+<*2pBnjBbxEILlC>vwtaQ|`~Yo}d&^Aym-TxnfnIfB~D~xS_wU
zL#YChnkFwtaL3vZS%gE?;-UAuM;!F)_s9;6!?tWA8=J6^H94;q-9&V{>(u0uuDR~I
z(T>}1`<#FO>#uo@2RPbBGYV<2;$)jvc&Zld8@W1}$$2iB`MEpwu!lV&UAtNM-~RgN
z=j^uY4wtRzWC(1xi57OdZ#gA=suWwwq|`|_+<4RfgkQ`mS`P+;L3BGEs)}(3PylXy
ziy+)?AP9^N;RvTrCvLgr*1;eD_`ByEf80@*!de8t{qA?)+5PuF<m9{G<6aMzD%fEN
zPk;@R*<l-L@*+&!cH8aakAM6FU%&H?+s^|GG{6v81V+IGz1Ew4yY941K&;^eo@V=2
eKxw(sGH(LIr6Y?H^=y~`0000<MNUMnLSTZ|UzSS%

diff --git a/src/assets/img/files/publisher-64.png b/src/assets/img/files/publisher-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..9633ef3dd0caaedaf10a26f18f3c3802e67128cf
GIT binary patch
literal 4973
zcmV-z6O!zSP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000v-Nkl<Zcmd6t
z1(X~)l7>HJW?^%;dCWVEw;pEZW!@cF9yq>RI%bAtW@ct)#xb*JOyg!OPDycjdX-Oa
zx?HvO-jc&FO3I?n?^lGRP+5rx?M+zxx>5mCQ&XIB^2yB1&Sua3yO-R*?&_;9Tqu{~
z-obvb7PJLp!5A>^8cEtngrmofshu+uQvTA{-uwFd{^)D>-*q?E3cnr`|0wDGDuO`K
z&e{qfBG(yXuS#0wzYc;RpjxT$s{i_L{h6S4dg1bm?x-4#&P6zIZM?@iaf6Lx3MwR=
zo#))%ewLrSk?ipB#M3vP`qp*1o?0w6SPbEM@~a6Tj$cVO6MZ`f)YrQfAOU|-rBeT&
z<GmK32(;nt6A$vv2X}I~JV!Z!7i|*P4w{BeJcfFVsWli>5xol)?p(2!7hZo0D_5-|
z3<64Vj26q{VUrYIz^Sh!z4oY%a1pkD3PjSr`&$D8#TR8V(aXCLppd|Ck7K<-DfLKr
zrBJcvHTyR6&O>{c4J-?}5Niyvu^5w%d<=D+c!NG0FgRb~?vayt;dM7NxO^F{(bgt}
zJ?e2`{d*UG&ch>Mtff%MJ~%kgd$x#F@J3{<Z4p332H^PcZ`ikm4<6Y^BLZ8<led-_
z0EGe!APQ&wVTR$^5_c?5M*gZBer0%C;e8)(vgoZ!fi-r(7?T&_kpj?#rSNY~;6HM7
zKaEg9u|UBJ4Fv>vQ=k>}5i&GC&mDs+x##k08Tggqeb{#xZGR<;Q$vAsp@RVJ;orJ%
zD<3_2Ac2Q4fzOM@!P8VAz?oGrWCI4~=D4G88TVX#bppTqcM0$N&goVF5C4_~{$t6=
z$4&S^gcyY=9K2v%YXcZE&^t5Bvx-Z2!39?`u;N632ZZBCfKrO%Sr{mSX3l>+8Tonu
zK`~D#U{PdfS}KCF491GW^a4-IkMP{{uV7&12{Q5`i?BNj;Fb+juanI7F6?We5EY9k
z0iW`UDAiO!K2}5%b38da#9f;%WAKE52cf-1*IjoVscEAb85-uzuYDtL9X-JN5AUTG
zL0BlD#1fz!a^OX9@V#0HCT4g-c93Unx|E@nD^4u<4!f%88{hZ_;BDE+Ncg|Ie-?aZ
zVTzf+5EP2!MM&qn45T7B%g2IB;2)nE<msC(IU(UYZTF*SXpq!wy-v@QZ@>R*^@YJv
zQ^OS9I!{9>PywlB0E;58Ey2VzkB$0yY8!Y2)FOB#;F0`w`VJ*&-+xwI-@~VU+a<iD
zzF2@u-~MXw)<4`oc<+|^DN5Opj5W=5K7i&-kHYnOji3_v$0hJjN#KV)Jdp~>2O(C3
zhBb)4Wtt=&NffS0G5t08iU!AlG+$OYVFN{g5NiV+;5%7lwSZSUny*&#aW2Bv8pNSA
z2i}WdPz)Fa6SE0?pNDTQo4rBA!OA?J9y`R3X2+QqLm>!p1XjShO3}3{X))ri#Tt}0
z&DSKYB%O<U&bfbGgsFuEp1A2ko_+b1l<T!N@M*uz9FQ*-zzcxQXQ5ofXyZN@N06Ec
z6vIXlOw93w%s>+Mmy*Kg63EyX{(k?@`TWdLHVrN1aT`x%L$Qxy7y)3#BH%+;{1Sz4
zea@%p<H=GY`ty0d@v~pBb^k+d)#?ln(k2I@p1vNy*Ur^AMq=$MJ3|NxXBuItiHN3V
zc}jMOXZYEkd>ArXDf8?d-(_w80Pnl#2A1Rs%;*MXt*ME{2xt)p?p$o*U~#Be_Xwg`
zlmZHTt<ii<K|agUfdPUrbdbLkzRhkhlGxx)fibAGtOblx7+|SY<ff;2Mt%gp)IlZ)
zn5tEI>eg@a^!2B5|AsR;SS|BVrQ~3&2(bfq@E9u?v6$u!+UCtW0mOq_@U}<>5ustU
zM`;W1dE2G{#)1z4+;u}kJtqCkpk(Qpo#l?=Qtm$gat52*TLnZY{%F?^xo!0Z?pb#R
z+ZSe=BP(bJn>Y^C^`jsl7ey`_N;+-|AYOo$WzfT;ya3w6g0zPhd^&X}fHwX>1ED{N
z7?_>ouHI!l_kt@(;Q^Q1A3eICg~0NXlh5VHvy=S61K(vqEMXWR0M;VLKx|xU6$#jo
z>*2B$CvnM|b<{&eC60kK74S2D%i)DWDQOB|@%-Juw-vxFiU5No@YEXgg&BsX=ec`u
z6)(8xDh50}3eeW_p3wvR;c4eE9mh1R<xs6e84FPaC}_eH$IZxUu%~*2FYVmM*+WbD
zyQ^;?H_+!!htiY)@Hvf70VSyBXvfxi^v>`dEod$^-nGTnWBMgzc&@_TeJgmurPs7n
zbx{zqbAFndvYbD-jOn<JAf!taVF*!(YXb#hoja6F4zfA6jUMI2pZ++^&NDqbMWxZe
zDuo6I=v=(}>y{Mg2rsVRr2tkNx0Vl=Yur7QjQkbX9rrLJs{+0~HOhvbepflxtsx&~
zc-iTj__LGGbD@q~*9{vAy}azq3whGUGgv<`1TN&oiEwCYl21SI3(m+DId=FU`wkvp
zdT!PMN)RA!6NH~E1&oMu=@K5-?{W@^fZW^y&sesW=U;mh1Iw1O*xUdE`x_<B85(h+
zubUIxZ7bF>)u{1~Lwl*j8nk9rPo6v1oyxAt0{?XG#k_mV&-kw&d>bq-RldA$53jua
z30$;l9X~koAU`{Hge`|3LKO=1508*ZS~v1qJMh>FB_*r}6y3s0n_2)Kxeu6~<LN8c
za@SSYG1vy)tEX6-??FpC+e1k=SkP`S0f}QYR%`cMIq|jmB7d8#Bp=+ql|$p>paRAg
zN*tV-=A4zQxN_rZoVjXkBE&;{ddCBNYv)#X_P9KGZFpn}nM?+44E=GAb)LN=yh!^f
zh>lK9lA2SuR^jot-NNv)<yfQ*yx_W4P=H_R{P*A{y~LX*#j#jMGCBIf2trtu2ysYj
zFkp?Lk$6R{+f!7n;jEL^uztlV_RUQ4-Tk}y*}?rBJ+PntB}*7tu@c?a?>9vvo!~nc
zL%&G!FSR(17uKC~*3sb=D~1E*_>K#o8deZIyuktrYb{c5E~VP-@m-p%EffKmP9P7@
z&VT?$yXADaSVRG#QV39P#LStP-a-%8oc(CdIr((<j2>b4p@-O;-1EB2dQd@+ANx-5
zol+ov(>w7--2eA4dr6ebeL)&pb*Sgl2ykv)*R{~x)HwKhQ-IhID_EWH0pQ=i|1DhP
zq1<wN{@M*3MDzB2Td5g?JB}l96}TFs5C-%|S*}Ua<K|>8`Rgxz0?Fo(itP@*(~;O$
zzVu~Mv(|F@dFTD4SD4Wv!<`Q^XfACjyx-P}1(gaQuxnzR|M}L}=|Q>v-iMC?LGuTc
zIxoEJ3eF#1%CTCNZ%>c2r#kOomSzjA%oSOxau~5F;Kv8|F_R4mvRR}Yr#I9YzC#W~
zH{5h%%K=8IT=n3cPI9b(h>rkiPNYU-Y7Hj<DqyNM&)3H%K^uQMTdTuDiRWH<HFsQa
zApp-@wch!RZt%eTjPqml8YQjC1p(Eh{odgN<dS)yZZxS0w1vmD9a6v;%kfMA)d`+v
z-H@)&IAbENaiCJdB=D&K7!B2$dw=R9J$?My6K>{Due+YbHWX#Kc6hn-IUTdFvcS<s
zjolMt{P^f0dU6}7X^m15bcT10bgTth4Uy)9;`s1BXVRI{MZnQ|g~_<#W_%T=DIhHC
z>E+4iUVsvTAfV7w;OsSPID5rP8e-|e+q{k)NHNNgQHp`2J->gL^MT3UL58nv@X5V9
zIJ9*OKac_#gQ)iK{L+n3XX|)?sjNkbIN(FIGIMd9mcUTg%}G$RVd)B9|JWx2&_LKx
zp67>?qkKFG=NCWfY*N!=nTzX8HySJ$O*RNvp3So|Uv&K?N&EcYyV&`Wxfwq9i=V<U
zXsz4AH?O)Epj&v?HP$KraJ|Zc)}R!UPKJ%RxeRJ-tVu14;*3Hc{YwKk+QZo#snv{W
z?kcS-l_wfCe$W_45LV<0oYOzVDZK-38@_sAh<mTO5n~L;j!n70sh|~JK%hekbbwc#
z;1QH@6CrW)kBeArnu~F>tk&A~fdr_|(OTJ6nL(g9rKg|N1gIF}3Z8ni=t-cQkJoE#
zo}1!BNB1Z2A%A}IIb1xn6o6W-L97i*sW$LJ%QDbO0Hwey&>r5kHm&f$rjEPmCb)KO
zT5^xot2~f^jMr+6<Z?V`%_*dofTt1Q1ZY^-cW$r*3bY8L)e?i5EPz`YcOE&)(tIz{
z0p7K3Ea;Q~oqx1Y=_E+=pFhzNary6-x@z6^EwHB0!$m{OSXC&pDpw>-)dsh8HpEaD
z>nh8JaV^e`YnhK5TrjwV(|QL0*f%!Hmo`5@K9lVPpQ8M#b3p4+m0t#No{B)A=pPzn
zc~38a2pg6zrL1EIF_6h}VG_Qp^F>m#B2;ZU`ps6Xj|OqiQPqZ<m#-$ZFK^w<Lz7cP
zVb}rQ-&@xLq$8?CwS)J|pd(fwem5CrGTeFRQ~1mEXD}FLC>z5A^V3Y$YXnNMB7r~6
z=RY-TsA%oldMZLX`c_jn#!ZS#vN<jrSx#y{*uR%vav<&D0lzXh?<NJLyWi@tO-H=K
z;7045zClKEc?bh+peO{9gZs(Mq>Bb`PzXY|8e~;KtqEH;I*kS=#(X1o@WYuL0ORF(
z_D+nFiK341g0z5lnF6XKyex_U<=;=Jl-s-j39NPi%W?&>VL*Q-%cg;mMN6NdFUoLs
z{}3B``q*8X;}>&NJY20X6W82Xf)U}yWj_2rwrdOPmo6h0W)P9K@IF7gPXWL~wuKkJ
z6;>*hOx%sGOkhtg_Toa@XjkND+;Yj<<oR?K2i!;>u9le9v5SC{3O$_HKkP(0QmgRI
z$%pyu=poh@`#68l3FlJc%Mb41^7W^1_{c;@_?GzWY7S_+IxhU;VhEHgUBRN90O#}#
zkPkv;;szzH-P%7|tGXiR@hjHijiwmA#FYhhEzBmsqX@#fM5qfA;5%2J%u`owV60Xp
zQUL(pIkcaHwF*yPx0Httj&_9i1(EkIB0!q8fI2?B|8nR4hbwX5=kyM`k*`{VC|H&+
zCVflI8W$bjaOpCV%{f24XMkPhIesub&KJiI^Y%l#7z}e<vt%WIu<=YE{yVoI1A~N7
z<nN^oyns)U)Vr7jyZg@x&2m^HG{m}{+(`-SvTV-n<*UY}09u4%Cc_m8NRsQcv%XA*
z3kR3*#|iAeopB-0U2~cf?fcVX>7Ie9N|{d_*g<A^7`GKy?jG90yVeRi)>tbo-eD`O
zP@Ukx?ZcJ8r9(^EkS(|wdv&frA&gK#Kt77-w^{f6a%)(g&C#u`E%b2Lnv;3j>Wxm=
z)G9jWPcFTVGahvcX5S&Sv7O-)uh$#y^(YfM=x*i!|JVZW&*BG*1^(;PpW@UX{TQ(}
zJrG4FuE0-@C{*(`i_j_RP-)+%h)P^r_epp3-kZsA;7428HhPRJHlB*e@!@Ua^;&~^
zBWC5wC0nB~oF>E@ptLrNYk}eU`Rd*{j)zl%7WgJywccQ=T*6rE@7q5hE&UEh*BvG>
z57v4w!@WJtt+1fd8Q(g1;#fQJW@aWIe#QU(`;9X*GdsdCTpR(?b_rB%;6bn!3b`z6
z^CKWF^F{0D7Kw6PLDEjzm*c`as7BnNzqd$FPmy{YQ?JJ~8nJsVU&x}hW^T5WtP%&u
zU;2_ie!})`TX)cEMA9}IRa<!cwioL!yZni|^XV;}t2z{la=A<t!N`(Tt{iS8@a0Mk
zV=R4rMHc~+lXGm_zGLF={^rF`I<SB5Pr9!LJwZEo-~X+```kNv^e|DVh-1V2LWPC0
zgQvg0NEj-{#;4ex!2kW<I{5F=!2$$Yof8xuL@cwjvo73A<(hMA9Xvshz>obu{LYEL
zOW^nK+xuNQTf1fO1cV3h=MB{AF{M)VSAy@H0w)%{>!<L5ivaU0!UF_R6p}cL?F55w
zt>~1ZukTlb2ME6S#V@gK+jb{H5GX`WOnBjuf4`8=5{ADTJV0>kt+%jg)1!I$%U_OC
z$_as-Sn&RHetT<-NoM=$Uj^RJ0dXAjq8Gi0d+xc%^@A`x(csh8<-N5+rBWx^+x#l<
zt&`we-}+W=x#bqoTH7E9PB?g*c)465pU*QfIW_TDfBC0RX~L@(@6sXw{~_di-}~O&
zk;8|!oOb$I*DWlRP_%4g+xA`SfsvN?wSoa14>kSP+Y&dloBc)X%-{aaOYTiJIllmw
z;|vRkZ_~bW<67^MdI}yi#mEAjfByMrzx)-i{@*pL*Pa{e*dGu{OJ%5hAAHkp<QD<c
zMb0;ci?zXMqxSCIb>u()<DXx*W5<r40r^GH#si~)xaoDE=33{(&DX6L05VMh3V_Px
za>c&h-c^ERfk+@Ebs<m?01DM?TOHq~eMM_{3f`1|!na-xl$1&f3-x*<2BH*xk(*Wl
z9DKFub)W&nsQ{!RIQO6_Sm3W)+zZ$O?wqz___hVQ!*dpVx_bAa-A0U55Fa5v1=^Zw
rx$X?1y84dpOgdjXlg{FG^&R{lRjw*iy{lTu00000NkvXXu0mjf@-U|t

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/publisher.png b/src/assets/img/files/publisher.png
deleted file mode 100644
index 8a51d4701b98d6b249a72e8fde31a4b07e181b84..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1424
zcmV;B1#kL^P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000G7Nkl<ZcmaKt
z1CTq*7RG-)(>=*1YbVz>o^9K<ZQHh0ytZxI_PzhLccV!%Gu`J+B~x2@{HA`>sH*cF
z1WH5zu-3geW$z%+(HDOD<NVpBf!7a~%fr+|8&&G;?L700op!zcQ_p+Rbxy<xAoRYv
zs}r=*{$s}Ia{!cc4iPCg8tn)2$}c{+wZ^9(x{0eA>$ICK*r@P=B+oxy@;Y|kWf!)>
z5ClXdi!De85Cn08@>DW9GI*Hhse80i3W1=Yb#VXsDqp<w8Xl&_s0mn#V_q;Y&Oe^|
z5=v9kRKg|-5dM!8I49a#n^($1KX~tb6oMQZxqvU+bqz}@VO-}~ja$6V7WmE6p3CIK
zB+V#7kpG{3&zVg6@E1Oh(q4N`jD7W!W`~zBrSr6sm}fQ>KYhY;*lDUnt=&Q)s4Ng!
zaHP9<-7b)H+6}!9`tiU28P@pExg~B87{g-J<i%~xFCYIr+Jgm-TX=|m6W{|bv50kG
zw^x)1)mnqSM#kBDa*8NPGUG0KY<!Gn5-V1=sOc8ZQG@*ANzY-u5O95UiTy@L$@!XC
z1m$_ulbFa_B&)^ueS+0>HaDtx>6~Ocd+DHQMo1hHt!?t+;Yt4TtQSyBgI=^Y!=jD&
z-W^wAtkAC1cuM~$uigJ3oc2*lfe4=UI;|N{9?o@V&@1i778ka7x!2DhpYc-4Q&Zfs
zvBE$u&)#01Fp0?t96mP5$v56exVpgypZ;_n3hPALCtoNK*qCX^1`W_NgFElOo1t9Z
z{pB@pqclBDGmh~T3>d?%eFb(?0V0kQpZ#*)w6e)Pk37nArgx!lZHdz#dw_?dkiATi
z19KBdRzdfngZGrQ_b(|7T~;oaXhkuIpd2_68rI@!A&ZO4{O*RUx$@q7c|vJtZU`$}
z->$RIu6yv5@e*6j5K!IV8FWzSBY*uHL}a~MZN`EaK_Ski2+MJsW~I*Z+#<hA6FGe6
zUHIK=UQcOokb?_@gyJ~6UMEUo;v_+!YtYjqZLRA%X8l8fC&FeFu_JM8t#9(&bodv1
z{8QXn-(s>jz*f{|CalqRj+gDSCvPtAL9^QIbij$w>!8WhttvCIjwUg&@u1Sc?^Dc0
zO`LUTrC5tv%r--=T3@1?MEvf6CsT>47~>(CLFUqHAZ$NQ0HGeW`N+#(%8N&*c&uLK
zkbw~ZLTg!1O%_@WUQynS`)79W(CjkLOFzO%(gr{>JhmlS6@YUo-Sb-xK9oIn+ZpQ|
zL)x&On#SVTuYZWg50CM@u@X0}%wv4NJG*SinecjBL{^2f7DU*!P-H5|@o=NYXfBVh
z6r<^RJfCMHX{QDg3@VRnD(e)q!S;O7g1`_M-P5A10_Oyy4ehx(2J(GeI<rPw9C^=Y
zM^?60iavp@B<2E{;Xn!$a(P4?CJ0zvSy@?_e{?CAGpHm<5Ru)tD&YgpIwJ@Q)v3Zd
zhs}oOoWo`1rz>=TI7!mrhC;E3LoqWmTmQ(1-uv3yZoBzn0MGaRtoM>ZC$K1m@;v+$
z&r|rmm*RKOo%`-SiDQ;mSMjvr(MKPvy#IagcwH780B?DD1+9JP`O_f9xgN5!I7doW
zMR&E%;%m*^++6sP55M;<ci(l#MfAu!@W2B&?zrO_7#P5qAjP0ljL|8ki#BMJp}UyQ
zswotTEX*%d-uK>jzUIz5ZabfUlL8nX9v(mX=;O~Sm3P`Vj^ji`ln5%TMs0rpy65dx
zDbHJ9Ur)aK-EVyNj@xfN4JZOJ&;aT{OJye77*k9c5fLBIfDd?p>Y-NxV6BZ(g+Kr#
enL#r%Y5x;5$7MMtJjqW00000<MNUMnLSTZvRl80A

diff --git a/src/assets/img/files/quicktime-64.png b/src/assets/img/files/quicktime-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..90f2fbc0d1be90723eb5d6142b59ffa971f3e54f
GIT binary patch
literal 4664
zcmV-8636X{P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000sHNkl<Zcmd6s
z1&|v_((ixS-C_;f9(x&WFEbo7^Wrg|?>lB@W*;*%Gvo5^yJd!FI<tp8B&oZrD&Oq5
zBBYZ?Bl&qFKIcS6Rl`X7{X45VD@#<B)}}OH7YP^}8)M}$$1uKocXsvrzwxpo9&_<o
zBU9D1RL+4aI0x44Y2BV<YaM+NY}!65_uRQv&7Z&XgD<}RY5#or^PY)w%6(%BfY!T+
z2tgpUvX%m<>cg#d4^~wH6mLNgP_4}J*^hnH{5o^k>h4Ee^sMP>jhQG<;2f9+cx%B}
zjB)g31B$zMa+DdN_n^ax`UXc{bbQ}8jxC3^#A(nB0ie2n0w~CwX*LsG9t85Qjs>vR
zy`fTxKe^Dg00>OX*T%E_XoqFv_%u_JBeWJZ7E<r?eS=L5%L)NK(>po8dz_a(^b`&{
z_z;3HU^cO&PHBE@>fuokKt=s=BdUTnVb@QAs_#P>1oZS2-;l{fYdaC3Fb97}nwld;
zghmSmB&qSqtua3u7KRdKGRPC87B}Z=9GE&hiKRa)49x7{!qNz99(pppg9p=Ws;xuV
zqb>+rzqk4S>hLI7=O`4in|gc7C#q_N28*0?dkLVbJ+J_LT;o$a5`H!jG8PDxQl4CD
zu|9&GfCB!pF_6!&bY>gpb&av+!TS%-g7DCMi#FXV0?xV~Yi(YY{}zC@R)=3Zl=6$I
zh|x%>7K-GI#S+pemLfP{pcJxnYAfgEhgoy~6YmpvT@YTIfYtY#hlT*stR_)M@QH_?
zj2H<6;(Up$wKxJ42LyN{1(rm@l8G&xm)XghbC08U`TsV&@1rzZ)DirylwVGTj7A|z
zu|#AYssV%^-iu&>!4UdK=itK~tT}5nJ<AU{0N?>-;Rq0sMd3fWBjq>KA;V!rTq+T&
zqJaQP&;V~y21V%`+Qw658!tX{B|R$+1b7A2ChRr>gn{5{H9oO5;a5{3Lt#LgFA_Qh
z0TG}<1S86z8oGzK@D#U&7oC1Ay$1|DD6K7e_`@HLH;lC`>FeXGpZ`2x9?SBxQ5XsY
zQ!MTYdrvPxT?7LRI!k$E4nEz?3r;<T-h&Q6c-4gkxa5*cXtZVhec{K}&jf$9OW2V*
zl5&A4b+||f07Ag+5y6PC)EP>{n|WGo6VE;Qz=U5c-H*b)rFg^DDr7Ex&C9No<-J>G
zs#J<4vc}>x00ICn0vHYU!0(!apWVoFPCA;t0~lUgya%FFzIQd=Q0P8vp#P;ek5-wM
z9FehD0#HBz4FIqR%dMd_bT9k{o^#?c`ve~b0U`hbsyJ1wI#lm__;wcAOb^}=h=wXA
zUk$QIY;YRVY^j7CtcK$77M@n!*b%&lkc}d;0w%68H9f^loDdsFCJZU&GISSm<T5!D
zgqn4za{&7dU+=e=19BN@6absaAe96)t`6a^r3foXDGY7pY4IkWbMmo^!iz8mm%~(M
zxq1Bt{=Q|DYo;6<HP5)@NP-NZKyLttMTWDwBObZD#M#Sx=_(YMF%ESK>@PfMi!l%t
zO4&N3K%6)<bzm&2-~<3t6%Gyz<z3r2-)`o)r?iGwlw2l5#wPsr-`Df$yGFS@8pQOi
zg265b!-kuc38!pwj?1bEpSow3Q#TCr@<Xy*a6~`3Y?g|#`w!nD8;sOCz?%ThA$}bX
zpaNEf<q>oZZ|6d`@VwJk(zl`&JapxAY}>Y#xBT;Feij@GM?3_w88B(RPN3igsQ04)
zjk>wXcJq==6}~$(#wS)6Idy3_Q>kl+g3jS-gkQh{tfR^Oa<=ZvLPzh|7A|s|dBGy^
z06m2)*W7#y5C82P{NMxN=#xMck{Fx?Rd8Cb7HQq<;uy$fxiaqNF*l|B>_5Bdj@Wnj
zhI?DhhY@bC2=J9015R0z59yoO%7vL7yzs2n3mZl0&gb~&wKs6_b)!t2^k@%WtN#+G
zU_Gn|i28HB4H}+Q>HwIMJTJH_VcN~`!XwH|8okfpy#TtG0Gb*!HuU#IEScQO1^FRf
zbk6ZD;Xx_oa@=y)-8}o+VJ1#~BxnlO)x$fzS0Le$%Q8HqH{hr|lme()Wkbbr`Gnzb
z!-lDv0|!q$Bu84S@z)`X3qoFdmti1R<w+~@Or^kn!nck9t2kpB$OkN$-p&Q(QC@ui
z6Bb?1hhfOf#27ET^lpZadsH1B1*3!lFFrEMYYz@NCgV_5j8mK{0z9Hyc*$Uf4M#+L
zeoM-his8qn7MYrMTv(mv>fIqmgxB33v$`B{STQ1Y+A+K?B1C{X8r@n;e=cNMWd|1)
zhk5Y>7l#L>6a}pP*L7SwcsgW4FxEeH$3Ry2`KblIa+Gk07$#FUAI7s*sXCZ-FqJCP
zMmeE7%egymWNOPMHc!m3w3y`wr+4wde!x0*%{tzHPmNF%_5mKHr3LB~?>GnLD4;aC
zgY(N{ytsohRyLF2?v0!H(s&-0u7ETJRWOd;jPT1-@;s%-G8Q{xU7(EBFnNCepI5Nv
z_Jpg#!+7fdnc~igm?L{~JY@VfsLnzNzup>i>1awJlzoA3od^v?Qdc7knc2CGr*uv5
z{QI9e2Y*o8^fnj3_io<E#Ndfw;`+?)l+PYl;K3!wSfWT%dfN!!JqQ2m%dTe4%~jHs
zXM;(YTaU5k)*6qWy`B$m4&l%;I0MG=%}p^68OU@Dui82aq76Hyz?(yu-Z9EYpLhZT
zbMUqed=LbTjgIomi4czN0~3Rv!OuH5%QKh2MC{tY=lJ85*YLvYCaJAF7fcLR!8*=d
zRwfx=fzGvJQ*eq3T(Yyqy4fN}6d<wf;M**QZvWdq>VT=4?q9und;f|<`Xx|sy6D0t
z7e@Sh>n_&kmx4CD;{$m0p&5*^=wk529Dlp!TAqK+7?qXx1Dk+#^Hk4W-OZ;?EV6BA
zfNyRdVkqcEoI@05DweB9Q&t|HCAJQrEqu!%px=Kb4VISQ@U=HZxx$|@v(j!=7m0G+
z&=eGpz~>EM9A^$>IHLp=(+XbcD(1QL+8cQ8<-3?Z*26movEvylyZHRcMW!n;gFPi4
zQjYoAw1EIn1?#wWB<A^t=Q@F3yd?Jbzx@?&IOkY(^6A(0l1vz-zukJ?nS?uMEEEc0
zEdW^MfxRJlQEJWbzE{fUxax+RdDg$Su>05tfJ?zC#Fh(=>EcVLmPq0hqab0#IsFko
z8>vDe@8=lDx~Y_!Ds&3pYBBW4M?IQmo0+M4@Ye7M7-QI;22c#ZIebdX>Z0I$zd0Sx
zW+Lv{xQXZdZ3AP+JP@4mPu}vBqr3R(8D&h8lIk81qrwqgSxBpBE|2){8Lb#926Cbp
zr6qjBL5q5TbuG6Ur4_utYK*0#p+8m6`uZYpP8VFy=fi;C-M)pL%T5A(+Fi3e{-`qF
zJhKaJfCq32<%|&61n1`%RH-D6)Il~_9A33uBD4^^2WeZz5+M+2+y<X_+X5cIS;x|4
z%K(8mg^J-(N0j-_IXz%f5)WTD#aW9pws8?ffP!dS_;zLCh&I*|9wiDxx*`GN{Eu;9
zm0dN51OXWKDrU^4hVxH6jN5dIKaawL2g`i?lrBP(QnSt5<4PdH*i03i)N>5$=n93L
z2<jGx_ec9IKu5c@VH9#iA%toQk>GzEH&3K+Xa;cq9R(gL3?n{vdOz=RP>zIJno`rf
z;Q>N{TX#%AFo0O=SF4WY#gI}Y%*Jit6%_Vq2y|Y(m5`Hq^N`f)Ie;iv4#$k8jzAV(
z!&_CV))A^>Cb51J+Z$dGDzh_Ox@8LT#d<x#I8Nxx5{c^oUh6OmctDeh0G+@qB&wXT
zyqn1Q5OoevHclk`WoJw&lxFxQAr>!V74liGzWx7l?Q9W(0Q{N-fd?$lW2|-n?_2gU
z0zli=?PKFOepxSP<`PK#B<0`JYwwz2B5_2)|6dI+3<J{HDL!@iI_N#rr@{_W%OO2k
z&R&+In!1kQJ<7fcK-*0Vb&f(I&(jYtK&=W+5$h0vJ4R#Pd&_PLAq2=i!HWo8*^srr
zxrD3C!H@~TdRXIl+Oa(>&4TR=-t%kc0;vCMzheWlMmc}wQdVWEU>a(B0etQ53Lm&(
zlv1c<LqR)$kD`$7T*w!G^;bT&E`os-h)F>ewT^5q<k>6B#Hm3$fTwYYG<z!n(9XB3
ztaU8uD)E*R$`IF3|E?BQ2;d{PR#<b%Rwkxr=*@*>qY$7G9uXlEMf4PNR42!H<F|gp
z+inF`tU^pufB!2avE?h*?*x>9_VDVj>%PARr5(ICWjb|Sv}zgu+PRG%Y%!1(aEhox
zDEx4f<Ff7BSaW2=6OQWPu>LNxnJfx`ki-ewcJ1VEx31^ww~VkMa|EmyKup}2&LSu(
z%C~Qsq(3XX_1r<GlluPuLhvYyz6Zq^+x!;jpP8wxOH<R2(D7bfMgl5H%tim$$<-qu
z8J`z;S1S<5l&NrhKIVvmQVcA$IAzoB8h1}AlR+PJFF^tYYk<Zd?^~ZKVk{qj$Woql
zd>>V-E#Vb#^K(^he8uvCV^wv$tpL+r0HHm6bDlpk8}qD7hPifE3K>BFpCfn%sqZ~l
z3jkpRVSuRf=d}KPi331F`S0^a87xKo;~7U#4#4Qb@P6}^LcT6Q+ey&NybtgIP&JMv
z#VkL6<RDKyDi5(m{p-;?;tYaALXd2TL;)fWu_;)C7Yj8Otr#A&s*hKl*@q@6+7MBo
zq=?_TZw>FWPke7Lk6Q5W8+^S()jCR<h;Ki1IgdPeijUm1o9*K<2oMN@(v+h%g|>s#
z(c6>bH4k0J%TMYhV`8?CO!BLB31oxDXhj!=_pMV*YH+@k-q9qe2(s_{^N7z71$f@d
zZXR=Ji65_@;b-fnxO1e2iyK4S!@K(4;89BooVTi%XCK$Y;YFCN#w3C8p@$yKU85W4
z+(Ibe{P0lF#o$$m;{-*CG9k`s`$=$Wy6WeE{okLDL?}csZInC5Q*IckanE?d(5#_i
z9JxRkD1@x+%W=kFo)ZVM^hPinrz95eaK%i>4O_?g{OuLOD8i{y&PKfFeghQL;1+;)
zs>HQ~TAXmi;VUj%KG^?IpaTJ>?iC>IM`XX?8~Xxe1NJ0D2-e>(fS`yfiFMSB;yeWE
z@%{H_Lz(l?UjXBjN@DO|fq1dh?>eQaK}49C7~S#dPkrQ36B846hGEz|1hhpi2y!36
z<D<N0m8wx-Z@^Y%ETwLVQDT!K2uYgIRW35Pw4c-%;y5Kq(s|%~A&W7F$=x&jXY=Oa
zH^1rCPrc*z+wNom3lvz$LGCknWg$>#;O%%-CkV5%v#3j1J~%)S2uYkWTdB?G6j3HZ
zoiaK)$xXN1Hu9=ht~qZG{<?i%4XWPv@U5%2ov-Rd*uH%$Q7ELTWoo*@^lS}l9o^kU
z!cZ6*9^;NX?i_i~yWV)-#trMPVi5~y5dsG$Jg7Q$@7_Hh?lZHsd3SCPd=LmjL-)ep
zHS+E`_zmmVT}c~@SjY}U_@=U2El%gl_npIcJ_HU(ct!E>0P_)G_Y)o<h@y}=r^ya9
z_`O$jB6M}_A3Q+tm%sd#+i$;PUW6bJR1Zveg~sonuNQ{l{=owTk9*u>IsNq0Si5#D
zA~G)odf>sM3JvM4wU(jb@%@4a2msPF<qdCm18df-nePW-c)-E?7V8|&DV0jhTyE1j
zd?%COH@@)=9{bqGsxig|L2$sqJ5^?9E9CQeMn=a*-u|}NUf|(nFYnMI-->s=>Z+?I
zw{6{W>#Ef!JbZe31_6}DAK$v)oYm=G_ceog)5R;gpg8A96GM`usJe-Fz4J{kolA0V
z0tNv92PpW~_q|(uzv;SqZ~`wz7T}CC&Ny-Hr$6_pLk~IZ<kY18W<+(bm7z5BsW+{j
zd=oGojCn6yYAn`RS-0-)Z6EvS2fldcop;^<<eQ*v1F!*7?=esVV(+QH?ivNicmWE4
z<Z`)USGjzUqFEqP2*JA&2n2v2zTMktXnkLr&*5<!Z`bAvbu~n1W~Qg(I7xvB58vdr
zSpW}T^&SI>KkpiUXyDz0da(MrU@!NuO??{s&25Ww&CspRxyIqTK&b0NVt6-A5#onH
uYm?^VHW1R$XLM%T<`_WRh}X$y@c#f*YU{E-@BR1y0000<MNUMnLSTYErO(L#

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/quicktime.png b/src/assets/img/files/quicktime.png
deleted file mode 100644
index 4a56a967678c604c7fc9626af485670b36d3be0e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1399
zcmV--1&I2IP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000F(Nkl<ZcmZ{k
z1Cabm7sY>_bTV9iYyP?VY}>YN+qP}n_Oor9Yjbuc6Lt5?e^NV@r<-b4a!&3&r>-={
z0HBn9LNX4yt{uMj%iqcWYxq&mDfErDo4T*!dcb6~<~*pZ&wc+B?{$tc!ZCm$JEf~O
zNJrY!jw6o(Xb>c0!1IEC<T0fy)&tIa^lP|zO<`8+P^t4oYl&|?dWezX!F%p_!5c`w
z!2r#@0Yma=gRn&0+0lAW%Mw>fAp{28qAlF3Dgm!ugv*R1Ul!Dr%M)4R#}6E)ueX<q
z7a&N1?=%ExZKP5vFNB4>{_3kJI+FEbH?NyFT$3-;A_P?g&#X@K-3N8k-Q7(+j8kaC
zo&SC2ychDGk9`XLhbOw*KK^Ux@?4o#2SUs6qy+q%lP&Zl;C`&h+ZIx!;DOQvT624F
z8Y9af$9{GiNavAPRxOAlD!|i&S-y3!L{Co-!WgVL;G&HhS5^WX+vc7fMaEilDC<ZW
zH8jCfA`DG3+1}Ys5NW|$jX2OeEdl@LJ=zoSUZhc+GPA;mrWF^4MTkp)!Lef=(Gv32
zu{?*%l4?w*JWWS6h9n3vp(fn*cuMOwKe%UKqvq0R{(9{qub6g-bDfOe1@2ok_>t!9
zZOt`-;+YrL`OCcvjF)WcIzx~N=>lOK^K@s0?>uOvQI=R~<~O%_=gko3+xft#;6p=#
zvSo0j<U1EHCZxrrY$0#BNOAnbS`mQW(}0Wy*I#-KZMN25fAW6%`%<^GID%hJ@3Lmv
zcyW*63!@g5NTV&A|6M)L`!4snM_-=4u)^i*MNV1{d19ZWrqT@3hsKZ(z3CW+4^N)b
z-~SN&AV3K4>H#NgYLFIh9k2+L!L}@pzhQyrpX1Tp)y1zL(84h{hWvld<J2XeC-;?U
z>d;hKAb<C*&yieiR4VnzU>t$KixqR8rlq7Aa1EgrL{Y$pF0N5*>)`JXDlt*AxYPyw
zfK@NTkP$jlB&k&DXE03<yS7D#4NG3gR+yu+0K&HU^n(ZKFGwa!qEU{`Y8@g)i)adr
zPDYkNLK;mU17+9Yp&c$)-RSe@X`3(Hz07(5kLz`bmBH5nHxBsg)$3rDctB4Mm35KH
z+BA(!?I19Mm+vp}%Nw`&`sF)}=M*nGP{Lp#rJ(A0eCpI2Ic?RUSb_(2JA_K3P1@|5
z@YxKqCGum#eY;D1WXk6==k4&uQxd;lv&nti41N%C@?4FJ*96!O-fqCB&s^p^kM2Vl
z8YJ1smI#b#idBmZ@3~t$62Vt4+Tz&jeU6PHP^JMq)?eU>!#RF%?i#0DS7qe^ik^bi
z_*Mvk>pD2n&Jb|x#-$DT7~XyNHl8w6;N*Fa=}LqxV4~gO(aBwJUNBm;nDL<KSdG7T
zT$i=g)z!s?o0oGr2f0_RtjO8MwG(KDOE#~YYDJK~7b#6W(ro#OHsh`2TnjDpXe?%D
z=c;df!>eC%$t4#q0!Z7oiJ~~`;cQ=Tj6fgJCAD+bjsn5@ZWZ6Faq#dMH(r0k&g)<I
zisxN<#bqZpHCS0$rKhJGn&shk?Ki!@{Q%HfV>=G>^Yh*t-|(szCg3NK2{|=2$@jkZ
zeV+a77f|!OEI^h7y?3Xx1W+uNxb~W>cRu;ak3R46%Pz@+rv#guo4n;MZ?3krbzamz
zFgO+^^)ki?V-O}~5PO;F^xRy9u&j-Zjrdca`sk-FyY%9#fiWNgYCsk6B_Ou9w|AcP
ztfxK6ah#3>)CMGA0~R1MBO3-lDHSH+0YxB62MW-DxdkGGl5D@P`kDX$002ovPDHLk
FV1iStxQPG&

diff --git a/src/assets/img/files/sourcecode-64.png b/src/assets/img/files/sourcecode-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad25537e4703a0d66166a861a56f7f5d9dd3356b
GIT binary patch
literal 4297
zcmV;)5H|0LP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000n>Nkl<Zcmd5?
z1#la^x;=6nCr%S5bvdP!;b&&*WyYb$%zT-dnVFfHnHkFMEjP^Ipz)nEJKxMc&93bv
zcm5Ym6l=B8uFj{AwXRaBAih-K-*+y7(a}-t-n|<W6BDWDKmYmv{IG{T?512US4gMR
z8n23Sx$OTUnM|Uuuh0GZ*T1fO{p(-<@YA05wD0`oU;ZWURq)3t75i^ZIOmW^IK-7$
z0<iy3sZ_q3znX1>_^<?KXJ_%sSH8079QHr(fe-vsU8~=K`n6Olp{c1!1jE8Y9_u%3
zKz8-&;VZAa^4+biZSx$H@IeG?SQY{F=U6JK#^eu4gzwf(00Mu~?Cip;{d-2yLZN`c
z!G7*$4~B<_p<+N)tz9e@p|Pu0t-{RA3|d-RanC*XVe{rKXlO_vpU(#z;%!^SzzczX
zT*a<KP=(Ngt-lcUtlhxPX>V_NQe$KCwe=7nP4LGHh2jo@^}ut{1)M#58Uq7;n4h0l
zx4`<~RRx})TLd2IbPMjj`#x;kxG{p;Vp-UrMu82D_2*T>(@`py`To>}j`r3oiFX#E
zlGK8I0&q|}5Dos^xic6U8Pe{ev9VEr!(#;8L<k)n9hjb;*3RRuyYIzDvi@?wBMN-D
zZ6my)+Q)LK+|IQ%^L_u90H|3Ed>$7roW<DKu)rggY9ja&d@eEYZEbA?pQG%jamO8Z
zEg!tk_K~|Cx~ll1;e^B{)lC4~d4fMj@FN0GPy$~TWh22$=BK8n$RSO*?Y29`_W!To
zt*z>pWPRYZ^8z1e^J=Ekw0$y}!mYR7z9PWeWh4g(WK@yuloC6C{tU*)N7xqIr$V+h
z0k23WaO^k|4N2U5^KC0-=glHmsZ9WZlZKbJ_ra_9L=Z<bH#f^c(rny((=FJvV!&HF
zh5&~S9SYh1B37@?;!SUQ8~XcuY2yb3-q>DMz{5mP)qPrq5y)q{>86{pY15{a2R=q@
zli&N^_Yf}GY_{RlspE-!et{m}oGH98cL=oYyx5-LN1-7%+;G!M1YcEWC1tCvi0z;F
z#3%kU@pVj2P70jtdZdV`(6fTTOF3SD{f#Rce8s9yfDe4&1L5n;x^?URvA@6H+}l_?
zFP$Lpg~H;&>zPRsuTrkq7!t8?zwW%1q$0SGOeY!GH1pTk-Y=%`1YX=h@YUHqh{T-Y
z3wsASZ4M`XdtCDs6YzOy?B25%Nm>s9tZ1G~$Wf;oYlxN#-r6xbfW>ETP0-@>>w~9T
zo0h_>Df0rFN;P6=c!<wzK&CAN5w#)NpguZE<LK(zj^I544A?RoI6jw~Lb*~#d!|Fm
zneF9(*Kf28B(<Bq%d18C1kmE;;f;=tiA=ch#&~TnqAo1V<EKCUF-GY+Uvu>}B7p9)
zIxNgDAd|^Z!8SvlrTPW10V0I_k37El&97nGwyjvZb^|&$ZzZQRP-MzW2Or}NCj8i4
zlPsdMK68KN<jB-j1Fwb3Yy8SrzDOmRz%4i5OoB9Ea&iogJDX~3l!GPK4@Hed&MiYC
zAl>qVAAFy{v#e_vPfXzKnUf^iymn~O;O%Ct2>8*QfmgMi&t%%<-g40?dU&_i^zZ~|
z=gyrZ(nfN^f)+!To}?%w(bIhymoHx=`)><zSp_2$i{|E5^z`;{>^QEu<{HfvK}o;_
zQcX#XT{L(b8>bJGo}Bv}AXeq>O>t+M>D$+KZ#8f2y7lCiQTh=xko?;_y1Oqz7N)av
zqZFwTK$Y(pM=!xoOiW_mzJ0J{iMVC``VB~u_<6RmJn*$SAe_wT=xA3wuaK7D?;!XM
zu?kOYZiI7?L$!{|vL8x_sNWRmo;|z6I>rbtLNRO8u4>sN^~)FGI<hG6T7{y+n$-HJ
z6Z8x$8N5nDle}t~9D<*PcK&w7^YP%dU@E+ypnssB?TXlz`G8go4GqK34Qgi%oL?=4
z7S1e5Q96o_o*C$&34H&1-@(vezX(wm_{t(gKra?}<@%`g+i>TdcVk19WQI)LkAC!1
zvU?6WnzqrAA;uGH@cZBYjzm~x&-96GpzYc~_<aOCM(((PrsftLIs7}WYY-U{cX+53
zYu2vQ9!h~$1&_sufJ~T@8A@Z_%`{dO@M1^q@(_2vj}hQa+Cj~ysT`u*uB8@Vs~rsk
z*BJe3uErY2samk*6N{jgfbEBfEfETI#)J~HRJ2>=WYq>AX9dJoR>)?`+apbC-+KEU
z)xfJI7G%hL2AwpCBBaT+I7mK&*xf+beWl72aW?ZEGK&xa=myVF*C^L0YXLZ)TL?6G
zhY?DN&Vl|Ou5pvb3v4WSjYpgaba!`$uW6z#<57=#EM<O^W>)p>^K@7a9=uX!i*-u7
z7s>Jhu6x_IZKGAm%Dq*RGKd8LWsgXdwa8G}4G#38xBIdH_|LHCim-t~-MtsiN%<C`
z;)Aa%82apIKWlAKH+SH`f!@x}&a6B#d1qAvn{u$*>2x#MQ>m~q_$+UW-mzmR$7Uc?
z=KJ;{L=gc9v9#WGk!iTlVM~Y*MR6ug<w0^#N?v1a@YO`%GoSfP_`1;5)%6sD`5Gzi
z>IrF;8CG-6nhiL8`ZQTT4U=t?`7K+v!oXWG@Sd1zJc+OcW22+=D1$g6Y@H+uS6+1;
z11eeza)NU;!B<a-ee;{&MA!mcb=B3sBD;?B0oht1t?~hOe`+cRIXMRo?3Ge7wxz5$
zAxria_<BQH&E2xKONTGyEEjgs<sFhpW$CMs63vTStAmdVh92~w2f;7X({lza61-Sb
zUf%D1e+qdnNZBJEj#7@>HBZ28_bKxmGyy1<>ker(zdh4V)0bup5cVcPt{B62zVi)8
zY~&-fP}%O;yB|#yK|R|CZx^v5pxv_KLv}H2uaLI4kIJg&63_WMxsVomYZ>iINb{@8
zr&vXWS25^yhqNx?(At{8#Q2Dg)r<>7RMrA(NdcBb5IefMlv6;N_dM|WsqP3xCq2x~
ziy~mqC>E4JT`hp7_{_r#DZq;D-lD+UE;cr%DC-LX7k)0BlMmrUaP<qGCPjirEk_9P
zB|e8&hF&hf+VLu$9({h+C1rA)le~xBV(;0iyk{I74c^{SKLKiix6{@PWi*$|D1JBp
z-V|R*YZoy$J4;sX;Jn2pGo0jobVMn&un%BIate~j1!*Xy*W8rWnxeql^A{%qhTFwt
zZ;Q0WOrFx+U5B#3^5r@RJ$m#o^+75e;Lt4|;n+=!0&f}Wp5Dt?v$`WpTzQzdg^{V8
zCvjoGiNU*~!B<et3?$$cQ5Q9jsErl%>m-v5W3$p+mQu3?(Y+nU#N@aZS{Harx*k1p
zm=<Op3C;^gl4}_NWwYza89JJGG_R$a;Po3<5>*7C&b)mYDaI2DPWosW47^oo>@$Bj
zA#*7(!4u-aE99m9A7ps_L#!v4g~MZ+UnNaWo;)ssYO^${7I=fQSOTC9@WIK@v7<-v
zsZV_jt*ctJFfG`shA5pzpW#=SnVFVm7Z4x3`eacQjNy}?_%J=oEFAm71l4#YXny(g
zAK{n3_=$)k?o)qN@OC$<IN4KA1hUgJ^Jl2QvJS2a_#hYXo8SBzzxvhBuy^lXvkZP5
zU~a7L(=FZ+xW<%aOUY{u;-JIKAsjyZ8|sX;iZS%8*nEPr&dM0yd*6daJn5oH@HRi4
zZW`OLA-jij$7(A<V;NWVxJsH=XNh3^U>{FeW=Djyu+~nP)X#X~7*3r!rf?WZa*z6^
zrY12yHVQGuwyj%$V64fu+NyRgY5IqHr%kRl6{Z5BNbqVKoW+_!SM#hc2z0igk8%0r
z#JCowMKW63s2vr%h7%l?<I^wZ=B81Y$_oe@I7b#m#muOIm*SJf+03(nGiUz5=juI>
z`NdUNUq_;sW3;{}|C+Q20@(B#XLSk;fc^Wfz;A#13uSK^^LL@0alO73ken(`Q1Mw<
zgi;7?>}|mP1j_1;4%~gu0~i;yVtdzabYH$eC3p<`_wQ$NWwlPQ0T&D2<iB1H@Fbw-
zL1nOG{MeD-0^KdAgg!!<pbI+WpvLZ%Jcni2+BK^YpdqP*Xd~w5W@Y<%hIkO$x_0sT
z4dkNv8sNQv$ZBmXV7_&Ir?gT)lIH~i=c2`))cU_w^1_sms<=V!ZDdwh`a{l-xz@%d
z3bA{-FX{PmeU*hG=7gLd16mb)#kfzch#JWOOF5#p#H?gK$E50s<43vsYr={V`wtv|
zCMfMD&(TC9$Q5R!O!ZMES^R{>`kG6{c><d{x5Ba?>aPpD{VL;B5YdCVb-Kb1ZVBh}
zN|fq+KpNfHS-ZY{`*vJ+?M-kAaY_k;hkq@*Z^Yp-`wi&Yu~)>yARVER(P0rm#8E0-
zN)yfLR)JXrczb`I*W%I!5uvsS7?`DeoS+@wwskum@yN$YH*n#zvgtfZzXkIP1&M)x
zDNr)@M-ciparb8>^SJreJH`H-JExDW@X&`nk}*IAWfCLW$%zJEW|fJQXs*e&AEn+H
z<A>7-*LV@ogPdE^ml-<OSGqcT?^-1{^~o$6Q)w<_LBN#YFx##jR>a5qjX_R<*Yfvo
zzU59Tx(asf-p?_CISebj;5}i7#XhXojR3retmI8TH`Dje|Ma*2qSI|TW1a|9Voji1
z#%C#kGvt`AI>4O^#DJH9yfc*6p-CfmTY!Ua1=1oMM0n*7cPr&hVu@>@{t$QvCr%@W
zrFBZAb3;B~+*Qy!DJm(wpT5a7E?&Ac^wg*P$77ElJ9;A0+tFm-6`q=!qbpp>y5)YB
z;t??D3Xc(B1QDNh&5!Cl`8M!Ul=7nY?%638M=m#u>DhTDW2sCTkC3AVhsJR1_=(}?
zKKsd!JAdxXPZl2yRw~N{@7)hemt7|mLX!(3<N0X!);anY-4qXTK?zd?pPLbQC216l
z3H&II6a4d@^W?|JgEs<1o5w#Q`1s>0)iP_{A*~CzM$x6%eVV{kMLdB|Xy*q7{^am;
z3I5#KGe3rvMa2U519*E&-QcZ1m@nO+^!>8H$BDp-1aAUq^Th$B<$yN==*tdOudFQa
zQJGEWr0|vw-U#sZuYUu_jvW^f^f0|+MS|C5`2Fc-B}JD3-U#rphdq>T=yiDQYhP>M
z`T&)c2j1o(bX+b|w>0pc4v<svq$fQI|L_n0ptkJtiUV)Il6(0Kv$G4JZ?jbJ(Ms^$
z?|wHP`p}0~=tY&~vaU4nWmd%tN}CTeT6*R){_BYWc({mar7kmQlPW*?$xkNvG2@Ya
z`>!~Z%T24(_vGT*hB3TwZ(Ia0Yey5rW(GNfd{Nq8zQFi%p8b@6q?7YI02?d>(ZJBJ
zwN*>jw)<8Mcp@MMQml;JZn*NbuY2Qbwr<&WHNW4n!Oj4N93>ZOhj%b~=Y7DaE%QdW
zLa~HWvE<I2Io0!um%r#OCr+IB4S;43v;oy`QPLe$EU?b&S5<wwud!hQGzJ7fT76AC
z^KNTx?c}1=m(*v#uv$UF1#_IzGx02Fzt(nspO>R@*5TbSYPbp$DLKaX0+2NDUM)os
zK;Y+sDgq#{ej@-vL{K%L3G26OzZzJt4ZrRE`hC%$qx;HXakc8PwoeSJMUO*F1Y(Qx
ruWNvCbv~n>QmJumeeuMr?-}@C4(4Rfc3##U00000NkvXXu0mjfh#!91

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/sourcecode.png b/src/assets/img/files/sourcecode.png
deleted file mode 100644
index 5c886348020303fb1bc9c545427f0b81f2f237e9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1308
zcmV+%1>^dOP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000EzNkl<Zcmah~
zWq0F95Ui1BWLgT@QTCXbnVFfH;XfRI-1`mt^_ZEN`NDY{=H=ZuW{`X}{p1%NcV2m(
zG*Wj}O}C<&%_eO4esB?Sfa~hoh7C_A*01lm&hxx=l}g30)oQ5M>n4#%{&?x7m;JzZ
z3>eKn|Hv9Np^c7B8>8O?Lj^$qzR*)FR!5a`(z)CcMn{LSZQC}K%Vm^GCB)+ioO90k
z*mKW4<(iy`W|*6+z^3OPD=0@b+S}F~?Ko;!E2Y42W3iaKd-rY(4-cSHDZ_PLs`9zU
zaq6jOAe+rHc^Us33J8Lx=DP_Jh8`IivB}6XjggT7Nt#F`P_0&l)p5t2h_0>-YPGsB
z#DB4mT(`ox;DQTq-+lLW_4fW^N~I#KBHBhYam=yDBa_LX(Wr~RjuVsp702<H<PbzF
z=#3jUg7%!fYu7Hj+C52h<dMfnax%9E3}XytXQo7LChMVAt-*;o(d6M8stlpq+S+Ua
zWi4R{!xK(8UOaC!8km}zU~-MNwoViZ%UH8!HI|oim>3^rp)5)CM641-^}(_1*oM+E
zS{s~r;;DQo%c2cokV>a$R~_^7Q&gy=i>4+=NhE-#0>^RS(^AG?i%4ibAUBf96iz$s
zOtFRYfEn5m1in?recvi0AgaRirII|RXMR8`mBN7s9@e_gh!ptkx8JPy!KIg8f$r{Z
z@!SSIr>Y8zNJ6xCbYk`DbwXz6j_p)5gDqPYNub68NlS(Z704e1&e+(vW&8!F7IjH(
z9}3Xk-bp(ul3?Asc64@jlZYk^yq-O|pOJa7L%7#o`-jO_00C8pH}+XxE{`&?u}NlT
zr?EhWwqrPrIDqowZbH1~v*LR$m&1=gd<6yzRdL86hhyLU4un_=Ae(7B-e~=sWBn#V
z=8zeP8<*X(w)L_MAGe|hD6_%ul<cM12yWaJ6@h(*YwH*sgwg8b24Cpp<nFiML2?Eh
zKB}1&)>>;h8$e-Xc#zXxk^3i|d?q|^Pbs=WLI900WCLMkzBDk<huyn(%C~5GdJ=_V
zk>`*l;|8XuCb76UXOr`wH{<KCKEv7PUMM7my`&bb6lht*AF-+1^Vl`3P@|{gW1BEJ
zF^17iBVpSHP|9Iz9!y1XDQd6%rXQVwzgq-R0r54P^>FYZM_@NUA;n^WUDGZW*@N%s
z=#qi679M`&u{ik9Bhj#f88!if&l$KzM=Zi$zKWDu4XV=r%27D>n3M44Td%-T3TK~l
zA-?_gOE$t9IS0St14@#>kid5SGg(}i+7gc&C{Cud=~AvV8u)>Ub_)n6786CRhq>7)
z@!j+GkbNj6U1qeBX@-hnc6P4t@PqeU)7$&&r(kGKF@2RHf=B@Z@a-N%5%$`9KdwP|
z4nkOlZK+(u{s$Zc4sGti2kyFIXt3WVmvFXj-3F~=K*SzIKEF}aYqc=B?f0P75Qu5R
zPse=e;fL<InaMvvB%H$zI}|Ux@FF{AHH>iy15FqsJr9AFdk|;=jI5g0q_McLn7j9$
zJFXt+@BI*e2}ST*v##^mXJ35B>sfyg88*mJksKj1RI34kP+e<fYdSl3?rc2u)T2-J
z_x=6`fHYAjibR2^sIZ78(=^e>q_J>5?CKCIf@rXcv~-P80^kyjus}I1QvCxuKx+Me
SiB`4%0000<MNUMnLSTYdsd_;G

diff --git a/src/assets/img/files/spreadsheet-64.png b/src/assets/img/files/spreadsheet-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..00427c0e7807817bf9a1901361ab6313ac5ff119
GIT binary patch
literal 5317
zcmV;$6gumPP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000z>Nkl<Zcmd6t
z1(e*z(x|_dG`!>`+iS-$+d;>SA%~L-;p8$i-@wnzbeWl%A<Ud>W@cP3dSO7&_2fP}
z*4a58W#5mkIpr?F$oo}ScU8AWi3qhtsJ^b0MNdx;Gp5g=ufH$-y1%;OeV1H4XW{U0
zpVv^I0s*ZR5`-$DYRs_?1SNIsKhmil-n~~2J-GIJU;5am9)HhU-;375e~$<N5}PQc
zuq;I_sp$X_Ss4WSvanV0<G`{kip3J2_}5SRyVdivr>>avhKf6gm99jfq57v<3u9|V
z;0r0co=Tsh#cHL#qn+HCT-PlZ-t@HzbrZ_I_N{6NW66Kb0b=--q*Kl_mZhE;wF5%%
zdy2)%zmL2YM}YY7!tr17_`Zke>N|*Ul?Z$b-&X{on%1+7?YTlB-2y`?R*YTDoh$ET
z;)Ds<wqn>V6T$-ugcu-#Hw1tviH?a;4Pg~_d<sNP+qPxV*qFa3m2y5Y8VBS;_${92
zPf<z{3s}k`aN*HC-{Pr54^j4eaIGS~XW@F_`$i)NoPvj((}GjXvb=R!2!97HV_T^f
zk=h{~p`H;ozPI{&F+2i+*5q>OeNByZ7m7%cSa7t~R69UK8sW_FPaXI+FCTvt+vy{l
zEn~S3Zqz;Mbd(67DP&r)hO#VaU&`%Q+!?~R{FmT4BRo{!B2~941v=1;K@em`80i2K
zq#FL&L*Hgq=c72O9-K@C*K<%JpfC!?MhIwdT2TX87B(;8)=TgDufxY-pVZs&kyH;2
z1xAJ14oHB1{_wY1ec~}v=^k=f7uUB@0-#4i;ghynkp3JC8kceNvb)a$cw<M(=pA6-
zJ$NpJUvuK|5Wbg8-XjQX#Eu?_1?bZ~@6dwRn`3VMa$db8gdcY{zyrdWBS0y2W_ZiM
z^UQ&7h44?{q`S!#TtsYat9ryKPyv>1q1cmUL4G+mF1nl6vjN^1QiYx500VF1S9~7d
z`z=<Vf=_jk&U<KWV<|u>Y>QY_fCQ~n`Z8RSUB-3u?>dX%L8vXx%9Sf25<l>18PmcS
zKKE6gKmH3|IQ%Gfs)tO*!}Dz%OTYq4sn`iBK$lx_d(vE(TE<m#@1$+~*#w_lRXI;S
z`6LiaYfGE``)%K}HVv)9(_Q5AF0St&M4?XX1gul=Efi0rm~AcRiaB@Ceip(fmHSR%
zOa>zHDn9dXoA|z6?v|#LrK6+^Ws~X<9l=}Cco$Fsf!oT^35OXh=dwAs*ML`mRKZ8*
zh~X6qi9Sk*uEu8pbA&|qM9<M^fLDZ<8hOC^=(k=&EYi@>FyTG>x_05I61X->bOa7y
zYz(~D#!#ojG#$cUG!oviQlzXjUf`h#P6G&_B(53alSGZ2PAqYSr(%C0h*ELMVJR#u
zJl}@|_#|-xt3WKu8LphnVps4=cJu%hg9BPT#BZn6?J!e9_=`jM4g-&E*&%p_eZ4z*
z@xbF88QhEG*eGnYfYy<U5JYwmK%mVrrVTi4>k-#LN4A(}K=)8Tx6Zwqw=KJw;YzU<
zd}P;{19I7_6RCh;@RV1h4v5D-T6~la;d^b)x0iGIC2`NEoh*Z;etx|1lN=n}$=q`m
z^O|XQ)0At$Qg&513dW3WB)(46obg;_Q^@3bVC^$(-n-j4J{caQ#u#ww3pNn1oy)E!
z@G&Y8yHbMSW7E!1cZxabOS$rrc*4ts@CSSM^2I;=9hXd6$e%9#4^no9VQ<*1_5>Y+
z8b=Beodt<o73FLdJ1T~k7z)A4q-beqL9G2C^2+cvszE0R)CdRYK%HLN+9D`GOF)Cw
zMyV^!g50HCJ?~ViYX%5G({v6T;j=IOCAZIe3yUYOq^H<L;0<9!K%*mY9cqLwVl;9M
zB2{f{6Um4Pvf{fy3|Ip`=B+gZL@S6rfY#BP-cyKJXnY!+Hr$>Ji|a1qx`lVqHm*5#
znAUuK^}lib1-Gzd%2k{!_mFl{h?vxg8+Zgk5QVb=H;zDoowBeb0*&tV0v}WaATfTm
zBYX*nMQXy!>Fd;T0I?_#t<b)O+0f7)P3cyoKg+_#72LG=E?OgafQ+5vv7Nsro6B&`
ztXtU8wTlBiM=%aR6Nt|_O&v7k8mRc?(>;z70v)jX;L)%(F<>%AeXhXx);7w1IUXFR
zSw;XxLyI^9Mh~AH0iwa|<Wz))hE~+cEQ^|#@fx$LYaTINT))DLhaU|?|IKE+E8vfR
z^{*W0I}}1^33P=^r!C?Ocl|phzl27c-p^+;{PfAE_|^lzC6h`aB2;{je|yJ$*yC(m
z*8?Puni%giuqR%0{GW#hu(Vc;&_LmPLO$JsGn8XV({gTJF#<kHc@Fz~c465txn&lE
z?f@N)?fk_}AE1zN$fXsn^##@+eVL!H|2ZxB7Ch~dO4)2XxR0Ma@hB<BF%{)-rNo`f
zZ{VWyrgCDa%S4W^PpOA5k!>`<sQ4y=Mhh<qj<7^4Vl}(BWK&I~N;#G{FXz_F?lSPz
zVyhH;`?k|wKMvb6y~to?n3c1Z@rFgO0ac+cYcsZ?o}X>}Hb?pnP)OHN^2&Vc_rIZ3
zDU-5o)AKXNPv(u+-^77|gNSGY8HkQ2&FG`e=hQXhgb0pg`1s^#<^VyF$3N+^qHQU+
zue_b+_G);LsB|6l`e@9xoGwQNF@SGh`UZA&ZJ@7o%nSuBC4R8>bNtD*|G|$Rcz}(2
zc2UUY3>*R<x%o{L?Lpj<2Vi>J6Av#4^^~nW6AghF$C%z92%6DShk{YSCu9L7O(XUI
z27CHh(zcM-TzYc|UwdJr5Xyd$sm;^TI*9s5@O__#Y-3oRy^SwF_s`_hkW1HbyttX~
zJpUOUd~Pq<bQ%Q=mW#aMvR8BNv^F-L*ld7Hewj*8!94}6eM}S>C_xcrD$!={$V(lO
zB*Kf-jsj<Q=kXEg<>;|q-twCF(Kfc-<p1PVog$y9M;rV&uMfM!%;{Lbm9ws4?cs+h
zWb4T|d3FvwjLNk@IZfHCFsoxKuU>gMPaS?PJT6DTf)Is%3_oJ^r$t9YKtK#&GJMiv
z=*LfNCK6oFADl6x^~l)qZOuvnk^~Q;i3*zd4>pQ6v;J!@2(yE`kN)xj@|i5zbe0A4
zDm?Y1g9H|Dz3wJnIQDzG%S8&=CX})W2=Jqxk2G>X45iUj0+&ce0iQ4gir-yLEO_-F
zyXHP8lX{Q<l>i_01W|b#JHaU06gAVEX7c8__wxNse}ttpX~$;L#DM9u2AEZMJFi`Q
z4bSg)SbuCS2Re7*0=awxnM@v~Fa=bgV+TZnmcUekajC45;FGt+9)0A|_`zB;`{MIg
z<yE226TdkDKDs}u@8e!No$DRTp^(lpHh(cggB`TDA0Tbgp2gfbF0Y+7mz2tK#grSk
zJk+BDhgg0153D-8iUTM1plwB6T|N119xR29908c;d%7wDlHe1@fOGXVS5qxRL!}73
zHatoQB;MB0Q4}bk=$9y@3RqZt`pF;h@4wy7pWfZT<TiyDC{ihS>G(I8(KeT~okal?
z8qQ(D`RDNJ^KM~Z&t9I}{{k-^T*dC=d$H0sjg1Wya(R?eW{9|f`^sS--%xW1SV5qv
zRsczYj|?4v)<p0E3I@F)jt_S-zHTh*5AEh3ANnTf48M9wQ}#8!7L=sf-Lt`Lx&jov
zVpP~*B4k?Ybl$Sy&3yLePxALy|1~Q+uEg!pY}vVo-G>j-UmU>40|f$!@FK~DkOQ1K
z)kQ!_dw7Aw=}FM^S5DGf>ZOp*leY`p^Q%9n6bxe*3T)jU@aX!0%P+90xE2;U9@+H+
zrj1!b+G(M`)JGvxpf%S_W3~xPDKm`bbX;WgJ>J{HjIxnOwm;4D2UfA_#4c!P#?~5?
zstM046+$FQ0z4>m03wP&G`;0MhW%lao+dX=;@dC%oOMV3z_>B>6kW}L=kwZG_v6{W
zqO-UYkqm?7VZO8WlYDH&Cn>ta?Csmf#?DP-?F<v@JGgM{1;z;g*;IyQQx+NxzsH(G
zn|OHb^RzTH5(Gg__~<Cn0i%bnIyT!@BJ{icChds`StmzlUl-q9{S79L$>aJ^4zGP^
z<!!uU+0AS`-pq!>_aow?b(Zx<*72JyKj3W(Kgfi}4i5AmWXp-I47s~#uWRSgU5_)X
zZ3Y*#pHF?J9)S96fh%S#F<N$Ay1P!Iqe!fVj{+cJ2qeI(TJVv?`+Gium`KRlS$?+q
zn>h9$ErlEd<$$S~F}(KTOWAyEcL=kbMH6r4w_ATi%Blm&^PN@SX3qGf%$qo$i^pEb
z?ADq1Ixx=I*0r6-_B=t_PIG?yY?hz9jEl!zL_U>^<{`oJg9LaXDGgXuiBiC5_U(x_
zD&q+#gif>Wz+)U8SkL%|9Q9df%vvF6h4=mBkGbsAZ(>L1KHf6#<Fw?a&@)t|>?%%{
zD*W?f|IWewL*WqEOwlVD!1LN>@fTPADeqeNb|yAX;DH?v^M;?im5)DgKap^t^C(IZ
z;Z0jhtmFZZ{L&)Of@pINWjXW=?&DDRleE@3)MWz-X-z)Vl;e}K1F|V)^0%eZykp@#
z3|9!@Jp!HK*}bdz&dWdH*w8UvKD;V);xS%4_%bNrvdJs>o2&kUZ{7Y?-oN-g<{02e
zUnh@je2z>ilMHWA{;P996?}CBxPFm?T@NuP7Z{)+7X<LN!VMsw7RsJNOJH=~#Ko+b
zaxK5!_yD$*rH~rKSDybdb0%KQ)w7rL=+4La^|s%UOXZl^I)i1C7Bgqu#oV*vBSgaU
z+t;x3*nU#BW7ZNi;3Iw+y#wMmG%E2oIXZ}Uc-^4FHM2g*w5DlhUoQ~Q67TD4F&i#S
zXc~v5Y<f%G+&S+~=1p2)3Y*4EBV)47OldxsoSoyUX)Dbn`1HPKd3?`Pd~f{^Y05V8
zzQyn6mh)c&!1@E*@pOQKTJZ7MsI?eMh<;E>@9Hp+Vn74ZPL5fv3#d!go%wO1O>P&A
zFs^Q_0UB4|ZYH~<gU8rC&_&0XR=SHlq^uN6&RJwMyv8G8Hu%w|pWs+FfLTp$3wwWj
z-MB<}L8`$=I|Nh$yu@>WKp>hinWh@>f*<&1onQ2dA#@WJzhWxBx=ev{8YY^Ye{86e
z9o;)<NH_As^*?4`-+pGc%?vZfd@c$z!&~RQk=M<+6I)pTJiX^7x=Vdb48M;^O?ZSz
zM>zzlMtss++9(Zzh|p2!sNqIM%1&WhHfcL$dho!|ar(<AjT0KPjizj#P(R+Nh_HO}
zGDN|1`=95hn|@AnzBzQn0^V@R-E@Ta0AcO$2=k_#4<(fdFL4x%J_`uEB0M5!ZPZk5
z?fEvUMT<VYt))<8ovf+s&TX1xKs@c4%J0|Pf5&e^Jy||!=7V`1m+;}G@8>^m{1@K6
z=pE)eUt9AndWyXO?C(9yy5pOf-7y7U>qK}YhB$-PihyWvD^&v?!~kLnmgZcuS^b?!
zeDNu{Wdf}klWR1989T!{jT4#JFoCXOH`}{*&^dg<<o~a(`X)``ee);G<HGjyx$C0a
zx$T0R+0(n1sm)UXcy!0J4A4t1mqtVq;RWJ*PHXZI81;`6L<1-~^5bj%$SUXLP^f4L
z>lqO9ZXlhfE#E?0p_TSR8-mbR>Z2*!z?vg#`Q7#hDWnTrH0}acPQ8MK6X&B)0Q_*>
zFQMQWFdz}$v|8{zKia>L(U!srl>iTzC9I=ttmJaSgg!tZ0h7l}GR~+374rrt>u1PD
zP6{K5cZOBp&BbnZ_3Sp2=3r%ro>C94?~-vcX4m=7g*VaO-hg)^OAz=-5`3tYifgVr
zDI2Xv;Q*=rw;Dd0_!{%|{KId)!4F@2#5f~aFpx?`3XxNE)%$xz%5rdQ2NiuZ!q>e=
zO{-8Qd)U})I=Yj~rp`y?%<%dYeA%VqdW;|6y2-KaUTj8)^8KKCEzmqLP}=2rUNcIa
z86M1~Ql&!A@W~i{l&`2qyOR^!YUDGcXDDDyp@Cc~8}CbCLf*i8o^PDp*VldYlmGEg
z*Yx%EZMAK?Is&9-3RE@VLC_j<nJkmCIgsi<y!v}pAzEci3>gDsYy=gxGQ#<u=TTpm
zr%=dI3GGV7!*x9aoXw^2eV>#4L+n3r;Kcp+efZ`rn>TIc4B|-5A)so)$D5)7IzCK%
zMLqhSPhQn26vM;AI1aS5j;CC9aYOjwVwoV&)Ys=t1ax<wWb>A-U4QxK_ujg9&#qPf
z|EocfTJW*`zX~6B|B)kyaBPL=1q=)p85}n7G&JO~ZAIsa9=3$=fAtpz{&^C_s#PGI
zo$w%{>F@71;XX86HmbFO$Ff5B&QtK)y8beR-?Mwyb0kPY8axZ(M{I8i<%(yv@Bb_C
z$wS~QgBRke4lofA{1@Q?EXT14m1;TL;3N7G`MSRTzXlIrJ@nASY~H-ZIKi?MB4;PO
zF!KM;Wz*R9e+?eMy5WZFnKy4PpZLTlP)Zp`AZH&uA`q9i1VKROiQfMbJb(qJsNkM^
z?&00<ez&nL+dk{yqt=Xjt%YK-LRj039)2{F;MczPHLkz@dhvZ<Tb6a!!Rt_mhl^yh
zS-QG=y8iS}K6-luud0<%iW9XeQhEOQ=T9C!ba3OW*%z!F92`Pb|7116Hf;=yP<>xD
zSR_*0A#v%g@m$}`{vx{XFaG?#_k=~xI$$hD(165kWE&-j?Ge`{0>_G+kp`GQfBuD^
z_~d8)<D7|;F7|vcx)~)>y)s0_HpEShp05UG6k|SeoaYAwexP>k+J5+7{`v1dzjf=@
zH9)osI*5Vs0WZ=DPzEZIdeL<qI{;FV19E`MWHR~sy1EWQ(tsmi6DfkFzycHsD<K3;
z8{4Y-T<o>@cB#G)dqc_4(BNRD;(CA+!;jFQ+5r)KDbfnyM(1_>hk|7^2DRez(Q&m#
zuvIoyb`595Z8dblISuh}JwvEV4QE6Si6bN)0<}d|A16bgM)i!*i6kEzk!0tM>KXh$
XMC)c5GEFf!00000NkvXXu0mjfP=s4o

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/spreadsheet.png b/src/assets/img/files/spreadsheet.png
deleted file mode 100644
index 23d94f272cb711f454088d0fdcf5152eb0e2d4c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1444
zcmV;V1zY-wP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000GRNkl<Zcmai!
z1CT4-9>jlV5N+1XUh~7%vu)e9ZQC|W&$eyr+P-Us<8%Hmm87QT@$0SLad)~891#IP
zYjYQ^_0C+*jb8KCR}|)_{_%kE>4BlpS32;a9B*_t4qyAHr{DFlf7D`J03rLYdo+UM
zI`&1^b-oYKF=%tz^TMw?D&Kd0`5c9tE#NONacpLZYRzzsdrO{rkLR&v)5Zf0ulW=a
z5Rsm?ARU4rh!K>fl9Azo1D2(ZJ4z{lT;49`W~*oU=DAnXl+%p%JH$!A4V|0woZGyN
zsmUoCUW@C50%OF{S{IbEa88{#O(9n#&ij1h>}%15^NbWq2myNwx8gCkcqJ1P69iF!
z0Q|pSpI(!~x#gX1#O58F#_#gt{ce;y&3L|TrV}QDoAAIJyo$<H1uyUbh3X3R&IJ(#
z0#@gsNKAqVWF4HReC%FeaobC^a})~-BR-q;&3VY)*I<e<zrFY)`ttoC3T=eMbS4D4
za}<my)|w5r4Q*oA#Ac!-1_9~O85=7TM6vSbZ5n}3CB7vOx!J4nb9H8FXSsIsenc$%
z#K(3ll!8|1kr;!BVA~eXvSDp)9cywcBI%6k(9xkHX|rAv_7C5hC*SN<^beOgJ^xp<
zRp#wK{uuY%cSm+tw)4AVf9LO~PjHtT-<<xzZk4vB@O02V_F;OaSvWR%bZppDycy5A
z-3zHqRyezSf^u<?Vt$lgo%=DX!AYKc(--j0&wrY&<J07C=TePoL`j4wLp_QZkus$9
z3#q{`{(gm`T{3UE_baJPO%X;RN-0XYG9&%NyzX8v;akVw$tQpQHY_P{*E?UIL)C-$
zaY(FV5{YrcGNaChG(q=|4xPcvlWg0y^_P`Og)j`UEE~iEEE++b8*IEK>)ugL4t|w;
z?0W(Gw%>@KU;G7gwOLvwz;P``P~bqi0Mk)cIG=sr#}JX#dfkr&aS<>^I`oal`dYx7
zzkQUu-84^B`Xf6AAI|2z+o<~M99%rguV#MBN@EQ(ks$O8G9@`$cVmI{OuNTs?4d>T
znLm65U)Q+J^o#i6nRno|-p@U*c@)j0#m<p!+-Umx)LJdHrwHQ+BSO}}p^G$LHvz;L
zj?ey#h1yRTDd)Mg>T~1DBYF4FKgwijFE`q9fMbg%_|^JvxZAF~5(f$~Ce`S<WDU}x
zK^q~^0oSiwpPN)}!h9`cvVR-fMmMtRK_hC>2pg>XYwQ@?&f@Ai=Pu83n_V{{i2_pj
zY=X2RfkYb|+vSEE?uM&!un~+Hmc11oedCAXS`Nn+PIQcJGIAq+cI2;=7)bY`EV30r
zFGZXrjF-o|;y`R-LLCB-n1rfdqaM}SJhZX%&Yu_m!aXPNf$mkLlp>dNaUDBj&`V&9
zp_nUj==>Qj&M$SYK@sVwGw;j!{`N8AN^PA!H>AFFg3Y-dlnZ4<3~nyR^3u}M-0X#g
zeBQ+Y$<!mA<v%?*-cB$~Z-%9@MMxLZ4JY?@Y73%>8&~#H>MLS^%a>=GPkqYcA93*D
z-{t@u+qQ}0Boz|6eOt;x*$NR!X@pLE$yA}^n8kXP9fP|#cjj#E$xnLBgN_|N{4;uR
z78jS8m>361Yl5y=##9g^|7IpA6xwKP$6;n>#(U~h9{13;_)p2ex%S#?_|S(w%>D2G
z5L%v>6+tp4rgzL50hCI8oH}`;_S)CJ@<B%qA56tlgSE9ap7D&QHwOnt{$82husd$|
zB_c`$C0z%VPJr%pdQ{4?R##V(*S+qQuRDC`A18p_Kn%2iCJ;D)s#dGD``zzecXM5L
ySVU~V0c^kmREAjyfYv%{!vjh{+@l5zApZn1w~qY=S}HaG0000<MNUMnLSTYLHp)%_

diff --git a/src/assets/img/files/text-64.png b/src/assets/img/files/text-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b397cea5abac6b8885b260057958e84e714307f
GIT binary patch
literal 3692
zcmV-y4wLbTP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000g%Nkl<Zcmd6s
z1#sL*vw**rwClBFwqpkl!<_$^ehmD~%*>qRF*7qWQ}JWw_l_9?$9zG@@fmj|O+QDa
zy6u~i9Hjy;lTxV%<jmL8Jv}`us!DlL{C<&uv9U2$uUf<SiR1N8f6vI5uH4am&BR0+
z5BAkj1?Mz-R0Ze2sgk4+1qqKoJ1)1}KdBG>yZ*^<e&?_K+owPNrEKikDGGqLMMQ)k
z5Xwra0#tQdnz~o3ssKt}f*@dKW|p7*sb5Z>P5*e^hS!XLq&XX)fuN2I)Hx+R`D8N0
ziPBL|X-?Ex9PMCa*>ZXZqoc3g`0?Kv>RK_Ex+L%+GD*)&0h;lP)@#v!2Z8*1Wd+QG
z@0pot{*3Lj7T}VIyPo@1Zhi8{Ido)>L?KO;Bw_wh;uO+YNm8X5D~q}mnXPm6$Zp=Z
z^NTEBHbM}>Y-<kZ5)=Wo06DyZ04kc-EvkZg*lLETz9ff1Kwn?io?0#Xxhe|ioQK~V
z$I0a)f-QlBq;bf99{4eCf95Bdo(+hdkU_@~r%HNKP9TXhcse_ksM*0)!+Ut|>p#oz
zNMC`q6|bN{ErK;;{qNL%PU;+;o%JXC`?@!&>I|kt&N+MqsA?Y+!3X@$V?V}yhkpu3
zL`SC(#7gdBh(MePpbCTCN-)>SmeF0jXZvRvIzxC0;lUrG-cS*6sq0JAw4ut&6+nd&
zNI(*Y-15Ya^Wf2+MkS)N>tvf6H7VpZRi&?2VWz>xfnB`wb!QH5&AxoKO-+5*5I}rw
z5><nbxNY9wA3F9^C=p#J;ZyK6k0=Us*A+M2U_;+7-u9Z$Fg*JI2yf(Es;U6Z%|7DR
zC+6YDei}0PkklzTv4IB#qR<h)I1k^mi?_V$(-#OlpcGqxh!n4Ukilm@zi%Gi={)?R
z5LE~R`-g<QMi4mWj(4!WdlzrK@lzMh%By<VWePCxNfZ9_;UCLZ-nnodKEOGU00gT9
zP=pR~OdaiDP3Je*aowj_JlcPOz=Kj=qHWu@kr$FQVQ658U;CBcpAU1t!aXniB-zS$
zhomWh5+YU!C`v@i%vg<8^>6aJt3S!ek_!-CwO9fF@gM(zEyF`2;Xgg_!@=V-zr)OI
znC<p)+}`1>5<m%nnd3dIigxpwD?iETQVVY;FIv#%!HWkke%$vJW@|#4Hc5%`KT*|k
z3+U+&$qTKfa{W8wFFl|BVgK<HO1(pJ_`Db;2$I2%ADN|R_BE{9I!deiW}cfg3b${&
zBBo8XV6tlVYzJz9RsHX>I_{+PcCTlk^HQ8ke0a1Z4n*Ja+ZWk-@6h7l3y(cBN#Z~Z
zyj6k&YML@J*1>Z3S+-np14E;AzyTJ<*2>{2gI6^&sJEH<E+8mcW#z2`W+lbePfTh9
z$yOdO4?+N^(5NdXj@7tKzRs(!{xnOMjUdQb^LhJ0K7~r>|I7t62E@YWvX;0&XM`=a
znviB$ouZi7nZtJlj)^06Rz_dvRabtD#Y+~Ex@i=kY~|Hdy~IWVswXz3o1f-qUMYkJ
zE%AY<zq@8KJ(z8#BzZ!ks(HKMRH;SE)Ugiw-L)*=;ux?01><AJ>=e}dPjj)@cNMJJ
zJI!Ie{_O4fzd9o;#A%b&i??&}z||z$0w2EQG#Di*SOvIz^^-(F1rcS=DZM?y%y^xR
zi@wQ@>pwof^8E;$_m%g6JXuJbg}2iwaRGm$aQQ_>k|?U+6#9CU)<lENy}NkB4WDIn
z=_pVDD;CA%^OjO<3R^MG7XpLdpSUK8i$N)Jkzxfn2i5}8mn`6<tPFHPI@Mrn|8CxV
z)8}Xmp5U1mZvzdz%L^~%aO(GGGHp{gGJxW|P}i2*uHv-q+iK+0B`oP(&)}lVa3q!B
z0Rrcs{Rl3<-I;4S8XXR1Pp<rKvcx7o;i-XTp-|_=kenM)(7Y~czcYfiU#QwpSGvh5
zl~>+afWCZ+>XcRti@G3e&9D6MF5dpyPiOhOYC=!_a{4;f0(#0&hkeN@%w89c?LKhP
z*wi&i(ijlz{B$7~@H^5JIvXj;RD&x=_VCVapTS;cIBk(?)0%yGoIj@<9>&EqM;4?2
z9$m-+oC4+wIZQ~VYFst^4c@cE!b2!^4o~07a})oDPzTh6tM<g5a%%r|-~hZ(=Zyb5
z2a4_YWpJ4QaoS?TvTdvwxrR7t6~Jp*I_%mTLa59fQ?8tcf7`2bcvDhsG1$3<!N#Tw
zYvuFr1Sy19Ew_T`(P!q2c_&OBYw)4>yoceDL6j6*RFzO_gkjxGrg};%MWIfrE6Bh7
z_2!USLF!tjzd|zfSATOD^3rVS<W*NJetvXW|DcF?n-2t1V`A<J#%A^-5`n{nHUrYu
zy5}N_&GH=i<Xjs*mr)~Q6QSJfu_wv=E@Sz?dPaILBXx-nU+w~j{!VQ@ZmjS7)~Fu-
z12IyZ*cegFaalnN;myhk<c@D-WA-KCOARnqwrO&^=EE<1CH61>{IBK|=-9A%?VUC4
z8;>;^^x>Vx^fp#7(76s!f1(TC<WQE(NL90!T-KM%Dj@BRFgpq>K76SUL_2nF$1hV;
zvmRJ`5-x3#GUox7`!7`3@Cx&J^)E^azr)BP;=$WWi3_BuvvuFXEgGS8@WRv`JURBS
zh}7FY?T086>e~H&cvRF6b%kNiuPY8O8+2sZ;43cO&f2Bd(Mp@vRTe%7;TP*`0#<>k
zHW}&J%;N4%=XB*&fhsF+<lF-A;W^boh=q%1=8iz>L_r6+Ua>#GDR_QLdz`74$N6GK
z`7&rhC_D*2N1C=WS?xHqx&q4JL9;M8KK%qoruHL5C<@NI!}E53=ZCQ(S5d%|oomD8
zFt`QAB`)F8q4g{sxI7DqUW6!hfuJJ1se2ikfDexr?7mq4x1M5UGg;B%eg(9+O$Aid
zgEx~Zcp|(a0+ig_J7Na9E@!xVt?_FCO3l8)#YX8R$HH<!vJ<CG;@k!7I6ZwAC`)lA
zi?d1EEZy+5!UZO$AL<H^zy7^|h!n#spl7@XKp50{ZtQj*KJ>2yK|K#aC85yB?j?U+
zFid*iojMa#6NXz!lWSJ)VB<yC=8?cEA(tzM!Tg`7*tTrtm-TODY2Oy(0_T0@{Y=js
zgusXQtyC*nfENE&r)Xvck<_vH=;>s5UY`MAA$VU|{xKIaD@al=8$^BZsxBb-+75ym
zM<*ZW;P^g7qLQr6%6Z*^tC-a}n>8w6`|<(m9e_}XUCfG+4J;qLEDwX8|7&FzC=Y$2
z3R<4qmu7XooI?rV{PR4D^HvbZ+tjxj-$D!8GWql@K(UaR6^j|}S;3ON^{BdqGrY2N
z^bE~jwLCP&Nh=S7-i`7?*<jh~=evqGA<29!PUfm_coom~CDu}U1zvR65fLB09Z9SP
zDs6(`!IR|xj~%|92cP}tY%?sqs5HLm77CLTWPkw9yIeK>*3_-yT5*dT*6v{QrPpSg
zp>-E^N)jh|7}jcgfFi!1XJPP?;VoP|xEUy0c}0<YVhTvf$}6gJ#w%~%g5bleD$QmK
zMTu%5&Q(x=@m|l=9Z^sxiaIh`D%{@U!%&>6YJsfydr1j=CS>sDD6BYDnsY6ht(c`t
zhaZf>@Hk=RbAY1Or%=M6#^DoB@XXj=0tt;N1Em>WK1uJg)9&n9w-0Y2?Qe&!y&pN}
zG8u%_C9GO99|ngmBT3>6K8_Q@D5Nzx{lb^N_?a({kB<|Ep|1cf4S`a!+p2np3oYBR
zJ+rp5g5*497n#1<i-IG+|BqvOx;yFZ=_XE6W@cxp)oXOr>vZ=tNRot!6H`3(^wUSa
z?OVV8&b<#kxUVn_7UNTx$t4;y+P5OReg>^>_NB+*GP5uDc|n+-nI;UC6)TsMv|w^_
zZoX}nxz-#KD(aMD$0m4a@4lno_dVb8?k669^v=`I231i3Z=P8gY$bC5#T#Bp8mo#O
zXJvoo7Y=oS@W|r_SiSNxW@lTBpO|E7dM<N^-rg>PKsbDOjJ<pJAN~IC&ERilff5yZ
zfYG*Hty<8*z87xe?#KT*+YG%-t|Yvf-v$eBgzzp`4Rpapi=sSv;3>W`yqn?SrKRxS
zHxK{#V~_qXwp6!(!h=ngX{{XD%H@kU=c`?Q@nJ(<)s?s7EwEh>1@7#+je5|@#EVmB
z1YfRzvL7w-NdyvkVKSefC#!;p9ha-i$XMAAlhSTC_s0Yh&}t>5X9y1vMNtSqlB7OA
zQoeaDa6T{3-K+b0(Ye4=ng~5TU8trd@YPE2kN@~jJoM0B<`t1?QmbEJoL6}DuH8Bt
zb;3~22p%AK)0^JNl~-QD&;8ubAtIR~&<hXV9w1beG)*~t<oFrDn``knj@h$k51;@1
z=QBA7!wU{Re`kL0oH8@hWd3Y(2Ji*H3;fRS{0?t?;~O<e5*Gx)1qbg`nVz1Z(P(h=
z*x1qU`p$2@H;0#khssgFe55zueDlO}&pz|O+I1VZO-@cB{?1%3=Wjc4e_R3BLP?HM
zuyc;MmC$O%sJij*{hn|A!u%oUUSO1VYN6(x$@!BS+4gG=PLM034sg{~S8e*apZ}$w
zz4)R_w!}%S=0?mv;faxHze-l#2d0A0XQF23{WMAC(MJzF_me;I!@s(3-@dznh6kM*
z-~@>CrwPmf&HRb;erFX>%N5WGNJmFUS5J5MGDYio&JaTWD1kr#2trV1g65se;<o{6
zhuDUKAI3zdrY0ww%~lLV2HrlYuYeqWHh-ExD{pspqCxhwK?BpC)&0l7S{Yxq?~*nj
zx~$DvcP%h=^_5{2VlBkFKv@yLehLVw^f#&%Ew9_Qa^+S08~h)xF@9g8Lp&h>0000<
KMNUMnLSTXt^*Fi!

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/text.png b/src/assets/img/files/text.png
deleted file mode 100644
index 9eb4b197ebea5ae978ea4a7966b59144557fdade..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1117
zcmV-j1fu(iP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000CeNkl<ZcmZvc
z1CTd45XFDVWd2xxSe|W_&bDpaE}ZX5XWM4!Y!=V9`I&3XBz^y>uBm+Lt+$=(?Dp&T
zCW#Rd0K5;oG_ZQ5;wG-T=G<EUlt&Mk+SArCHYR>#e1zt(PP$V2{vRK^$Auqx@hJ!b
z#9x|&;8K_Tm8R}B024w$MEZt@$A59A-aNDadtUhVSbmxI0|SGGg@Yrk*18?%?fnER
zt*|@;BSRn{QWA)+MJXi+#+rQcq_&N$H9t6G3_zul)GIR<e8Ve09!h`qCmpSIvb>*_
zns?xoogSmRyO+U6a}(!Xb{GgjocF$FjK%%@<8M?e&G_nUUism0vgB_%T3YBgL#!ox
zaM)&#(AC+=cs7nT4k;}$U`iE6P%(J}g(H#AZN1}qth8EJ=icYGreo$0CbhSa%Lpym
z`s}jF#njq|m@_;FwMDHdbI`Ts5U8h9No_Mohy-We-ib~8w*Srjn_8txU?DwrYj#`z
zW+r#GH6|ZHmTs;DA^PqmP!dLf?e1!#wWV%`hZE*59H3=%J9b&`x<>PMvTOpxqA(O$
z#3;&jFlAPi=np7dJ|Rp@1p0>t*`RY5j@a^ES~`l_IKt9XOMp-+DC$A23Yw9i1Z7xb
z4Y{9S&5j*7d6&iq?dl=Rb07g(8iFm?s))EJrDY<K;De9;<kw#%oUzA)^!D^JJ~76!
zJx38JvQDoG;$BolX_9OH?+8{~YsC+Gd&}m5LJ?(?cv6TKm3Bm%eDKtqM-u%zWiz-(
z?|!T(%o`XO%@EQMaz-Z>loJv{d16??Yuzhrxi1LXskj#HjfV3+C?h%zSW?>-r#I-N
zMzm(Nq2@^Dt;d=~FItEUPLoaxI&JQ=s6egItcqf735$HtVGDpF62uP)IE+@Y6w`yz
zf5L#)iajHMs?#^ksJi%(BLOG@7$70mO1UL_%%yZg0WC!ZOIw6cNDg@KOEvLQg(WXp
zX`R*!d-UlK=<}SCx`aqjDiDJ;j-W-N9cqOI1Z9`P8uY_s3<gV@R+v3|*6iui{+wB@
zrZ|vjPn>qy3gYDD9(k5isW@7iT4`%w_RKj$r=D{B5np}v`E&r6BnerTqu#01u}p9C
zlBXxWqFM(S92}y(+QHf@ug;G@|I~ldiANvw{deEIiw0)q%vp4Gb*?;j?!YfT_!JDp
zr$WJ!4_)CkD8V3kK0)H#$T3GBcEGpaeDx+Vu<Ne74$nUO9IdUbg?~8bNL<o@EwUm>
zumy@*QlO~mx>m0-ZQ8W{<BvOP-`G5c0qE%HnEKRH&%M&yx7?ap!!HprA~YaStcji%
zi!vKy?Yw#O@~f`8^r~;Z{_+K&8OVTPU<ep9N`gz%w7G#vB9Z_OD6$1iL<~Rxy!R80
j7y&9kt^|xK3FH3*)h)9zCYSw)00000NkvXXu0mjf>S_~G

diff --git a/src/assets/img/files/tiff-64.png b/src/assets/img/files/tiff-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..c11a85e28b7daad21656e3bfc25707816db5d998
GIT binary patch
literal 4684
zcmV-S60_}zP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000sbNkl<Zcmd6t
z1(Y1OmWDr7RpWqZ9EX{i^DvwZGs9zMW@ct)W~MMRql0FKu`|%qP$aE%TIaR4w%Xl(
z_MWwTu8XVn{kpokC5=!@(Y+|L*M;y{zkWTt@39BtV`IgiTzKK@F5Q3sBbpNvabfy&
zl$4}tiZmvr*|v}47)m9^7cUl#M;=x`m^c5I$Nk_3H(c_{S0bfi^Ay$jUt#Mj@H|1c
z(oFyZeteqBqxDvFUI(7%QExQ)%$L8E>^|?Ay)WK*=gY$|qzrA?Byo+zZ1r`oTxO+|
zjP0}&dv3EW+f=KgrBhD%VLE5)7D?h|AZ#5rO#lT#7ga0-w`vh?>{|d0{*Fc?{9>*+
zLJ%q#yz@5v8?R?--8w23G>u~tZE+NlXp4<Cn|K2QtOx?u9(O$ZU-1&Q+jd(#UmzPT
zNK;#37r??B0ze66k6lzln88+{9QEuzzUMJ*TJ;@;Lh$8&1gL2E$KyEJMTm^+cpj}(
zqOQG~(k(Y4!jOsvFyO|d-NqI^(eSEL!N9LL`dIeA{6%axb7qdWb$4Nlng{FLn|)5X
zkCRGCrBYlpecIsunzw;d0x2a~0hChHAP+u;8?U2$_Z^t7Fi<LC+}slav<YyPCD1Lu
z)c09^)N|SYlFK$3o?Ljy-l8(M3IQ^e)6z68E5-j5fL_Igzv%|b_uP$fscN~5Op<nx
z$#f9|FZA`rLa^enBiQ?bi#8eFb^GqE?Hs9W*ARfns!7l{{4F<8zV99aA*gD%R%wdc
zMLehFDHK>DB})%Ej6KdhpY3PO`hSK8P}b;E0H@D$^Nk(&Y87m^$qp{QQY605(l}<(
zp@*~UnP+bq@b)m*1B4Ld72ye5Qnvg2{r3`pY59(uYfuFUr{z;mu%s2T;LyX^<+L-|
zVPs^>XnCbF*gXUgo<}oD;JT|#%i}|*<vp)$Qd$wfGc8{%vZ!8X{(%Rx^U0@eLGYmH
zUV`I~KOS35L}!L}*{^=*`wZN68wE4gE5*RTK)cTyZ~#{Xy-j_eMa?Gj_CJ7~PCS_%
zW^aM;O63c1(@i(wmKh@>e)NyOd9xm$i)yt@%eSLFI4*BR5P}p~tl^*8dp~wM{zMHw
zdy9kLP`V$?)~#y`jX37*2Oadf?VovidNe+6#(9(6AS}hdMGyj{Bt@~f(cq~)_hzT#
zPGE<vwp@7Sm|KE-U;A2|GCX7E%-4iVmr}7GFxhe5iecQI#r1j{{@CL+{8oL#dxZkZ
z#18?&=DntisW{r~@V!bfquIngmJ<`@f&sK{?*lS3&g+2JZu!0TVdss27kH>bz{H~Y
zB#Rf}P1X>AH*FYy=Upl8xDz5tOvN`Ryxs2-18}+kK(SCT@Te%lw{GuQ5qv3$%Vn0-
zYCOH)0qlIdcKg}=!Gl2h9&7*b8>ZiWE3=ivw-=>S#DxO!aVL_Vex?y&GsA=G(g%WI
zc-T#2P2eMqW0W?B#K4niv6j>uJaf>&>~g|MY~Ll|2_X=L0A=21V3HKCTw?V0TNt_F
zI!2~VBej(?<{L{>N>}}p=JwkY=?s!EMEF5_s8zCEAF2Lx_%7LCU|?|tNK;pUHjI?0
zp&^!<p-$)ayPkA%S9q^jB#J^BPd|mw5Jmm%U)*XAiIi~Pz0A-;#L6Zo&Q<{^N%8)B
zNc3;0a)tV;mBcHS6I82|cG(TDSb!+nD0p0WTe^P@S^;7sKp3Ko0NT(kwp^cEaQKnz
zddg{R-zCX0lO7Wb7ts8}Zy8y(loF6?;o=t@L-_m`P#zmYcs@$Xi~wyzc!<$alBp@y
z{NwLbZ@rNrz3=%x$sT)=UU~(-juYBT`-69c>J|@!R0C%PNHnZ8O6z@JCq~PpWbqM4
zv77Fn-Qax<zwU{-s2_Zn-ILgefiz&vChA{*XIy)PYBrG25g;Q1fSR0S;%i@Gj?P1d
zs})lH9&^8%`zY}jKST7!w;}e}6I!iJh6nJZhIB2p0z{_b_LFwu5l6DyS?A=#+hJ{D
z`7-2>zR#{QMU~3N<w=!73V|#Z8J_nv!@AOm9rC1sGS>dx_7+IT$Ju7yGbZ~aR*;%H
znRk^+c<a|w{MJ`t%_>w-*kpJB&s4%SQ<+#-RA}{=1p!N*^W2`Fv?+@EU;o68jRt8@
zXagBg_q{=Yg7&c$L7RI|=bG=6c0}q3q=jbra)Lko0pWRl!>f(y0ww_Z)hf$FpV1c_
z&Au00yurx~;d?a4o@Hp!LV{9>#8ejYUEBiZT+4I|_x{XvErNLL5xm+sX}OA!vM0Pf
z*<TR!f`FC4nq!XZdm2k12t1!OijbZMIp8j^$uNnc&Us9$2Vhzi%=vr~tmk-o>v>*Z
zE#Gq#@QX!oW>1$l8jP9=%nL8k@H2YC8}}?spFz6YZpi!ZGn1g*TUvuF4eo8b4SHb#
zX3aL&kZV@MGfyK|EH^@E^Runr5wBjSaP%?6!_!dp2BJ5-eU^Ly>I)WN3qr#*!;t;n
z{C4J;KCfh7xxEoiopmnp!iD&g<4BS90&OO)=;1WD;>9G|yBeNPRI34s!r(B4FoYYf
z0o}jV__%R(>-JUvD`2qQws@CbPLjxe;Cp`z-FN%#*g_hHwSD*7Z-q{BW+tA1v{!B~
z5S22m+9aWrOzFvxS$YP^H<h>G79MZT9Q^mZj|rVRul>tk@$bBy()xAyKs+)V@q!mp
zKI3e>{SHKZ>SK5&(ie&yc)ius#K#=ZL@TDym?F@^nPC<sd%|~f0YRqx{)7`wzTo$N
zzG|{i6v%Xg@TR}7x$0j8I=3GfA0q%N<_evlC6feEEE0V9qpY7Xi?yHn1atJ5K3FQX
zU0q3J6q7_D@u5fHzxRWr`a?;4`2F~Cgc8E-0)*NkDUtdEtZ>R1Ml?v%wg`|5Z=Nre
zi_gv;nZAcU|13@kuD<R%Y(YxNVf*ZRU#naiBTi;+$n7bYSpECoGUHFbXXfA_Qo~3C
ztTI8X*(5mYEb6=N&f53AhaEJ0acGF--%y}}cFte8=PuNjKS%J<Pf`D`Qz+{XC(0E!
z7*dc@TZ+;mC13eGGHl^ras{&4$b~lmY6E>BIQhgAaf<@#Q%wt=4{s{lST{;huMW*L
zsjlZ`hcU28jxf_{+HFT~xrLbzJwU-EI7#B(+j-Um(A#e#xaUs9NvF{I`(G#}2?{bp
zCGAA0n8M%wjL>tCR0kkUv+y_v<P|SXC9X+r0BS=ku7OXqdKCjxQzUjIa1$1r>9y18
zt>+MrY(;waoeU^NV(&HA-DF7GXUtHlbbKgmw;iGWh*DvQbl>S_uEHZ39mQL{(u^Lt
z@JjVagvcpM+5ZGxrm+MxTX=D7Tt7Qhb&mCQZ(xW-2s}O12_XzbZh~X?+ucZi1)AYG
z8W=>Hq0@Mn^9*j5X+$>eFUW<bS0Y5$(hVMj(q<DLW!<hTP!yVD{8D=<P5FM#eU2bW
zf+&^DHPW!v@vLk@<-7ym2bB+RkLXssjf1y>$`pUb43Z!)P}U_~cecj@(v`Y3n@#+^
z_9h9#{QI2lU|QVYcRyN_lc-gzKnSM`IQKb!bRlNUGROJwRv4xF7ohhNwT3S0J}P(K
z1vynS0J%UCLAqiE>XC=3=t-1Fi>7me?0ud7Z-mmrTcCs5xE>J-x^GK63~K9$U@e`P
zpme|i$nCa=IL?RfxJIsdWQq_#uc>P#3A}*fOJ6~{<Ic$1B+|5)2Iv4;QIdq{_rIoS
zz+UqPQgf|QM`izvrd~%V#n3z7MQw1HsbBt#0lT)Z9Kp<RXTat7IF$qTr}Fl96QymK
zJb1g^_!y8skMF!Rj_`Nd8S$}CAs)C7p}z*>WlKpOeh5#9PM<be;e!t#zw=EBZ+R=S
zS|$C?H%zkA{x*;bJdfh8yE6E;cM!htXcm3+qfCF~As84m;7-s>DLwD`1p0Rid+&qL
zU#rbh)y@!!?(hn28!Z667cIgNRjH!%a+vf4%RccDwhCK_V#y6`CZ#3$^)HF)b?pVO
zr}U#=ARf9OxnMp*K(N~$h{KOyY^uSs_r8arzx<I(xk6&#-Mpd|B6WZF-u*!$GXm-N
znK}R)gje=z|HGjDCzR;1Vq*iMQY`<?Zy3DhDuSV5<L3W+Xbb|>AAU#U?z^a;aTfj&
zN9n$PIuZzVPEq^OkBBt*%%w{x8!yR@6!sm>-~Jk*TR*tqQjpTEQ!YI2$Y8Cv2PkWz
z_i~jG9<5r9^y+^yR4kH6nLET`tW=_~d>P5tzD!guGgUF55}}{3HX6*(&npd|<V}uP
zQ@%(1=RZ(5{VWgyl-wY^LRp-R?gFB}wK~runjELJZXHs1Hd5!L#s3EI5gNWICB?~!
z_Bm+B1{?6mCOpu2pXZb6M9G_~kqk`-<ObnUSW_Dx1Qm3LcXEQ_@HBig7B5<WEEcoi
z`9c^IB6ms*3$1e24`dh;%$bAGziGr0J>Zq&1%2lM3i^YmUGc)e5T$d^BQ`-XNl-b7
zi;Ck;0%R;_QdDM!ysVjb6UPj`<YmOA3PQ@B@F)i&$Fc%AbgJ)FTG?tcpaYw@;G*^z
z?TTO%9H5=kyWp-E79QURK<Z~)c=OJ5Vw{;~HT(2)NT;Sy&<novCE0Hx1Z?~gwUQ7g
zRNwS=f)~HURGw5PMy8VK*cip_w`1TFpQ2$h!6-tyS)D6}zGgDP;ZJ`KZ`*B=<74f2
zXi*7UjOaX}@Q(M>nrcArmhWt(B8d~ER9WjD0~7+WF-z1M1W!@cD>sEh4=4H8KcGHE
zQ7@zx&%Hpyj}U+FyOcB}Hclu2C&(EAyrChAr=QKx0SA-(`S+wcvGS)4Q#t=a)N^&>
zqXj|A{^7NSVPvio6nq2SM;?&*zwae#>)zh;UP$TrM<ZxQ?WW1`Q55y6Z=x4SMWN97
znsb7kY&0kzc~m<AnlY2Y>)%RArtOg?ktW@?zn=l_0xu1GD<X_yw%KOnvB3AA#qT>0
zuu=LyS)VukmrjKQ0D|F*FQaz-HK=*dpvq+s9@tOdRKpMKw=X5V0NQFa+rc!hkviQl
zTNkO^gvBPq0+4O^I8N{bGy7a$`MTG>;`L*?JNmwlTSSs1*^i-_latMPQJl;aLTvIM
zC%BasrLy_U5Tc*{faI}9%{m~U@b!>ZI`|L<UiDg9bG9`xWP`cAKoFbJV6ejQ&>*p9
z2*a2tiZOLASBe;}iSa2GFIlqo-S2wy8IR9>>^^deh`R_7$LUPLW`egn=A0-Lp-@27
zYtU*M7<7%11A`>35EX^k(iOgLz9|CObB|qVwIXV@22+g|X(|~Ss^WWsHEW+`?&D94
ze)xm$Ja^%Od3S95gosj`86H3&;|Qq%5)qJ8hlr|!gb3nV4W+Mv*l=zy1S?i7Bk+wE
zq)ck~TD=WFJgnh;1HYcfHT*|D^v?70;avd~<k{wj&wQZB6w<Z{DG?5JcX&`rGOoLh
zarY?=ZcNHHyk}Z|je&o1^uro{!Tfo*<CeZt;s0a!{Mp+c@VL`kidLuvm}+hUeD^M}
zMZ%kX<vedZAl*cG051r9jAhCe2XE=!XwA^jrojVvS6_V%bLT#e5y8AnsVx&;0q*Zt
z%0+yC)8GNTQ%^mGLk~TKFMs*V2qD_uptdx4`+$?)rfF)1x=nz0Vt`31-tmri@ak8;
z8nf^D{uT#sx1>@crJ~UYnfuri{lNDh1b_I$A9Bhmr>G=Jr002C9K6(4uQw={%Z#pD
zKl=Xnz4ZbMFLJD}5&$?4sXOktL;uCw(nt5&d%xprwW;<=oXU6Kw_CU3+52+9-2JQ|
zj=)k%;wZsHf2HKuhd%hO*XShYAz%*eA_3)WjY(^%v+rJ4797utQ3N>bu*3HM@>jn8
zr5(24@xVBV?ac@a=q5_S*{8GV*76x(`snjkxHw5klT^%`_tf&wefAUIdg6&E9stT2
z=+psDfY@3HwCvVcY_CgKfPxjE0*F$nR2>=|+*YBAK%l?}YYI<*2M9!an`1azyDzfm
zu(<B+Ds#b6L#U~#S}io+w-7k+uBBN4EPT^i2t@Y0bSvsvv!E8NbI!{#SHLW|F|ynI
zb6M!F=cL<Rb6j0z#c(Xic!=!+-HXT`_ka+6zN4R_dK?3&9^&=$4*na_>v%37b7r;x
O0000<MNUMnLSTZb>mASl

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/tiff.png b/src/assets/img/files/tiff.png
deleted file mode 100644
index dd17d28dd20ad66c911c8a300cbaf83c110bdd98..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1404
zcmV-?1%vvDP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000F;Nkl<Zcmai#
z1CTVy7KOj8%BmjQ^K9F;{noY_j<xL#tZm!IZ`<Zr%}Q)$)F0iw&WTfw^W8c3Mz*ll
z0-&||lhYSuEKAp(aYoIbwru&|r(0TDve~T8PfRe>(HY5ad~@cP4n1^+&^iLJ?>eMs
zW08>zH$;(q20$2NaFD)iwz$g3s6N@gmBxGTMyy&%VRDk(zyRyN{1rM+J%j$we2U`4
zl=~hho7(!bmw)E}96<y^wY4^VI|#%wDTDxs$z)=+WivJR-%C6;f^BIbP7*f$<fn8W
zcOu<AJ<dGK$1VZJSgEzH5h6e?Te%WhQ$u@V$UJZ_4TS<UHN*Hg8^8KB>JK=WuC6YU
zLebX;A60$jzP#k$fA%xJ@~KaC-uvf2NA>v}w6tPNCDwFzBX{4+o1=<F2t%xl0Q`GU
z>I2NdtC}FE?YAFs5d1pcvISLJi!_$ipZt_F-<vKMi}oMK8Iqwvm^Fh?8~FYYaG9ls
z4rYz1^d%*hVX~>M4O1+N!qgPTY0bC3O=b^Qd2cVJd;zm&6~dYE)DyJ6{RY+nN}D$_
z@&7%+6%~Bx%h(`r5M2hO%i<;T#UjS#UKku;<VQcD`LHADbg`6N=K7)gX`c2by15mt
z5_F~p*F22tTX@0Q#5;DNe)2PtLyy2B%7E$>_y@`XHh=w_G@fuWot<5&$+oRDICCK*
z#Mmg|&=5LFFiv)0C-LwwIt<~}mk3v`z(!FymTHLHFl!dJsmb(TdL<n$77xRHj035z
zZrHjNqZH=5-y_%8k1&>C^Cs+@uVZ}n?HyRxv((sBnhstB&wTQeZ2a!`UhD1aD^E+}
zs#Q1NfF2$}<+7-+eVx&sKJ?>{Vjg*r#F>_U_+!-6B&D%2@|RzN_0UjOHQGxMoO#=A
z{QvaRh6{;G{6nG`vv?78Z@fz2qEXsV`0VEhpM0EXd>lJDiGA#0^cTKJ34tCR#XkEK
z_O+L>aa=XJ>5^KTl!&d&un;~fUlGQSVWRw$P|D?ee+U{HP{#Og5bj>*^T;4=vPs>`
zgn)Ea=Ges)e(O7!zy5<#CWFdmF>_|YKmUX2=mbC3|J$A1w70Pn6PP$Ac4IAm|7UEz
zP>G0CvI0n3gVu=VW{P|7M`6ZvB4aSKW?)?P_V<6n2ups(G{U#uL<<4hkU8`yw1b;m
zJ~c1fQvp;*<mE?^4eL?fqm*D>#d_LX7_AA5B}@=t0K0L6Z!o5#tGs1Y*1IE0jRE5f
z<)=SO=>ByzIpwznRC~KOcQROa&8I$v$xczb-vQtvwZ3Pj0*K>?IFbmZw14=S@rmpz
zqis~)xDZ%h<?^M7Pkx%QYpx)<>3R>L&Vg%AJsZ7t4Z+vHf%YCc-6~`hF*q<Vkk5^M
zH<O9BIe@|g#>R6FU>pE{U&%6xvBseN$iDeHLL~%0|0Sli0}CX%EKw+^tE&SMvT4)i
zsUr_R=syb<%zYU^c%vjy4v>8xpt3_6Y!HH*D*w#nbC^USgkW-Nl0rVq=fChJR<B+&
ze)wSr?6!2tqL<1&*tv56DMP5**QuDN0<2Pgw{@EI*X3`GF@!R58|#+bkw+Y~XO(#h
z_}bUL%6<3UPh(>vQ4~8xK1X+!{yLTP&vr?A?RqAqi>97!TepoLe9(UXUc6|*^B?dF
z3N0-y9e3Y-|5Lqv{a;F4Uam41T^b+$8k<Iw-j~lp1i|p|usZ9kQ_otoaQ<UJJ&*ud
zU<xRR6yl4E>YZAhY3T0(e+~dq*1MMl&{~(=$^kK;NCA0LNbw!P->wIkQ47HU0000<
KMNUMnLSTYq7_`Cw

diff --git a/src/assets/img/files/unknown-64.png b/src/assets/img/files/unknown-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f703bb834a1ce3c26bfd722fbe515c9d8e562f1
GIT binary patch
literal 2150
zcmV-s2$}bZP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000OrNkl<Zcmds-
z1(4%95{7@t4sHe?3_ND$_m=sXvFMnYnVFfH?}}@;_?V&Kn3kC#8B8WK6N64&aaZ}e
z#x5T|C%x5?(w4LPwYue&*2)-zWHFG}mC~4+n!>f$UW?h;+2T9i@s1Zh>|qbPui0#R
zl}ZIPo-_<Y$kugToIZV8{r>mAH{bvM_rLS{*T4QJPk;K;?KOk{ju`&rE|gNxS|Ldi
z9boO-gCN{&Tg5*|qP0f5-NuJL^dVm<-1xu;KJdx(o$L%MH3$NfN+og_mX|xYcx()#
zBO~=&Z@u*^wc5av9it@#i823~0}O~?nPS2HrPk`FnH^xkU)^pme?(qmk9wYmbLY<3
z**uAQy$%uvCFQ>F`!p7-R;|Lq!UC$*8n$fNhD$EF6po|O>2$ggBBsqSJP}Z%41bTI
z5~09mQ{+AFJ6dCCsQT(c!Tnek2UINlF3<C?B3KFE>3BGJa39W|J&mQMC6ExTfF~t*
z3tc66R4P?$-n<Rt<KrttTVe<^s(=;nM&4)Qw<8EcR4T<I!$Y-OEpHn!ap@l{q+$mR
z0V~5FI&=Vy#(A1u6bc0bj*lU5P9Y2r52Mv;(adAh=B*eX8~cyoA>oB%Sd17-^B4x<
zP!I%VWAM)oK(Yw<4vri-i0SD%!J}9#S@-}lN*I1%V8FsRQ7ToiVZ)~X3cOhn-UwhG
zAX7sTiS#DiZ1A3iKV;z>1aF}TJ_NH%c*^<t`FR^5C9GSwk;49dh37u06gM0E!3aJe
zc%(f#d9`=lBG#^5p9grhuN(mcxsqtzUF{DaK7g5-hV4_>7h}&>4I#89*s(Lvj*Hc+
z*X3vCjS<-C4j?#M;c2xO@R0~7P(+l=Wh#*9Zmhm<4JPse&;0~(w{PDbd;a?v85zZ=
zKmB=}Idcm2`dNbKuqQ>_Vbmw3>y1VO#wgr(-)c-uOymzfA#L5C{p@Fm%joE+vv=<<
z-RUf&-CpDcFCHBP%`;D7Z{epvL+-ifzC6OGu30WUt63=QpZLTlzECL)&&|yd96#4(
zibOf@5<D%AxclyVa}94;r31eC&2J(mgBM+N(euxoIm6{`;&YzX1cLXx{KKb-OFOt&
zPP^@PyG+moFD1U<5quC3eBQ&J`w44+6~u*ibp%JPgs)aBwBYqj&U4=+<bX@FDNA00
zmkywapbBqlYMR`Hd+%M{Tkr|hper{sbQACB;<j3?)-7_hOOLvqfv1b2lkNb9C*_$R
z92}tX7LHTI>eXwh!s{7$9?K>vng&ZHXx`6Lip<T;Tlj*l?br1cJc$;^SK=_ELi_n>
zW3!>Z;8P-iPjW1L8^vN7>uEnfKGw7FCTj|C_!Io%;-U@z3N~)sjPbFahG%28MUd(O
zI?SMBtj+cqYpgHeQ=S5}*<o=UhtBO$DOa&}{f54QHzqj>+!H5GATGy`AIGB}^;nzp
z6HMFd@adbOojZ4OpBBI7O*h?iYI1UNR8vi0On<<qrNE9II}j7^$}6vYZLwJTUJwMT
zZ{X98#D4h0A0l4w-*(&Wzf(%h7-L5J3O;Ew^q>bl2vS<D#Ta-m!?Q6Z1%e<1i$qp^
z08dS7A+#dA;g8;jkKLHr0W5t1&sUN}_d7ffO-cbb4PNyHyx{??=@Fn*)af61wq%ch
z7+OETi;2&+2J{g;^PB7uV4^?DsGf&Md@O0E2r&II^L$l;XG{Ur7w}+ulQ9Lvy!SXf
z^QY_v(=tHy0etL-S+hid>E5VR&%+yPs1+VacR-)ayx}%9@I4=)ZH+NmOJN1o5Aas$
z{baJZ1&5rFZ4KbhUMO;q03Q<kQU}W&4-*p?{>^oqX*kH30`x;l<+`>f!1&P(eHuj<
zy72UZm*YC<G#5_4@CDC)5&iGB<2cd*Ch-xdatg1|eTT7Dt6*@T2G93xn0ug?I+ao=
zSBmhhZEm)OqsNY&f8A?e_Sjv2|J!b?AewzB6;Qc_r?=0;u!Hfj3!t?^$HFhPm#}18
zx8Q;ny+&gWfBMVc>MwoC^B!;Ef0y|{Bu0?W1y3oQI&}iBLs1Z5zS%}|VF^J%?=e*2
zSo^v2Q`og@cm3^eea+(!A3E?Gq=-gB2;>u<#)P1kH7ML$7MwH;yYLhZ=gtxQp8DG?
z{Go#fehn#^O5r@hvpu?>!kv!qv%_akfn4wE_<o9j;6H>X(XQ)&R7mdNA$N32VPN1t
zgD277|Nal~_rLD~Ie~u6<ha6%|NWJ65svep!IS8RJ?x>l`|i8&v5$Q$dO^YgOrCdj
zhF|2gtNnB;eC9QPii%gi`qg;e^PUIlYsblLZBKbm^?bX%3|re|fzQ4Oe&s7)!9ySV
zP~-c4sI|@=d}wuHp$&R<uiludzv+#ycwz*vAT^`7QOh@(-~8q`b0<$6|LYAm-m<;f
zY;}!{Nli+h+BmR*94Em@xSzh+p~s!q@oDv^T43g_Z+Y$WZISaQ0AuJ%NCUa$exw2S
z#dX8rI&wx4pqHTUx%Fco|I|k>yY%wgJ>TQO${5JakrG8y)FjNj1V+lti-`050D&K<
z0|)k={NM-P{n_2ScmDxESwIIdVBe}2>9W<Os3rBH>tWmhg~$OFvXx4u>OieFX<*3a
z8o&XofmYpn6cluF2y)APC2it_MzKL$U~eeXYBig7e@_4|!wU_h10wiE(#QcFva<ug
zPKcC28H{aOD#MCCWM8z9HVK_#3*+g^DneU2gVh%i!YPm_@|r?Agv#_A*~FxMXIq-{
cGX4hs0pc+tm#2!vF#rGn07*qoM6N<$f`>sX2LJ#7

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/unknown.png b/src/assets/img/files/unknown.png
deleted file mode 100644
index 5d36c22271d07e0996afcf2725b414cbc1a32e29..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 888
zcmV-;1Bd*HP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0009&Nkl<ZcmbuA
z1CTsN7{y=rbkFLKi*4JsZQDuNjLVm@b>#|6v003hvu*p<+nsNEdn&zk)8U(X`|ar0
zufGw~S|d`ermiI)9fqRZ-27Vlpo0#)^MC^mXet(qwQ{+PN~I#x>CBHe+;HO$bdCf`
zH~yHaG=vnvsFdOpkeE^mbi#pKTcv)+cy4WN75)9)n4h0Vp-@0RpGPW{#^sk^g+mTG
z#H>>$vbJoh#(<6%rNKC>?zzXV(>Q0{f-weC7z9DMva*8i?hX`-1%zQpv#L=|;erb;
z#(w+lNALpvRt!)|3pzJVfgyT&dJHU;%Au#H!$8yNG)kqCNp<F#=U|_G_C>i|F$wWk
z>7Dgh{OYT(#*<Gzxle2BFEXFsLNp_48(HJ@GtR=k`|ca{ABJo}@WNs2jv!iET0rf&
zY<YP(s%9VO0ZuvPbOUcl9#<dSRC|oI*kg}9qJ%7J3CYah?6aff``P3PaI+-BjqB3J
zJc7_|XzmyxB+fbKf`+!}q~r=zli{&ragy1P$z*Zig_l@(H5m@TpB#>zYw+7|zeT-Q
zH{5VD_TPVh({pcfz*HBMI1{tLm=6pLMo;l~^wgr_!nF_X+TSJ^Gcdd1@b&dVzt&1_
zPwu^#{%rvE+joz%q!7OeN^dqcB!@3K{uZvtwm(J!R@>ol;LZc&hsU;XZR`x78(ZT|
z4li6qRoRf%0#<R0@V9X7hg-W6w*G&(`g5HzhA@<nB5($Pg}@8<*!F_es|-Ud(8pwY
zYGgK*k`QJq9Ef|tV?YeUc6g;)g%k|AY!+Yv#>Xc%pL_O+2U}Zzod${9H>hXoXzZ_Q
zYzxVJoE8=qAY=+7Bcp3iKJm~U1pgXVd~R+YLIi-*9wa^bzWytPKuAnZPUfF`_VN3=
zI@`a3BYxtEC*bY3-@(qEJ0WFAmJnnq1zFZDqHWfqZfUAOHk-rr)b!dDk3W1{M|<n%
z313j4si|r2H{N*XqXP~+=-3LqN+}tmaLmqz#W#Smvx_TZoG&dcRbPGeg;(3#et!=@
zj$9#ckvGXjW(N_JG)LZppn<)8qsqz5u`5lEzTst39zaO0+5rl7kkTKrbQK*L*1mWE
O0000<MNUMnLSTaMv8~Mj

diff --git a/src/assets/img/files/video-64.png b/src/assets/img/files/video-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..570c4b2b319ff8aae875897308c42d1bb69d0984
GIT binary patch
literal 4211
zcmV-(5RC7MP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000m=Nkl<Zcmd6t
z1#ld>wy?jW?m^qJV~00P?_Fl*Ww^}D%*@Qp%*@QpOv_ma?1tmSG21f@()q_Vw@c-j
z^xsZ=t6ol(s-?#Hj-*31qN?PJ(s^CPaQygjwr<_V`1n})Gw-_aX^*<_Mz?89k0xRN
z5b6M{Xx3c&h)qGNj32m0hA;WOe&omFUp)J{AO6+D9`!VwQ~o=m0I2UGA{Zm&Nv;A^
z^-OEsT~$^5>%bVp%xr_Vy!AclmL-4r-$z`q?h%b>mTK9yVbi(hXg6@yL7ZYry&M>U
zgYil>oYBYXq4Kf%)<=BORW~-#)O11ss4h+c3eplSm%`s0Bfnm-0$SiNn4OK@d1B=l
zqD1JO`5NKz?=d;PmulF+rZ5NX5{I^$i~rMa#suXd4oviLedR*7-SvsAJ!3T{02enw
zQxpNk17z?D0;p&<_NXXm2ev;2s#%}F82bC`FDRA5cP~T%wHEx9Ns?|7k&e3!%?RA#
zk5e1}F3ujOQkur4f~FQ{9hxdGvAEcwQH%-a;0L%aXu;p51;1)3ouZnvggxpBVg0?G
z&v|$htaH?A<?9CedvC0&vv?tN&UGn3Rr}$@@OtDE^i2H_m2rCN5zdw&a5%t-;BXiO
zG{#g`v43nS*Okv<+a2fN2NnfSH@xrTMLTX40cTymwYI9td<9S-8GIuWWccIsO#cXE
zjCxOkwPgg00RS9=0hE-Ww1T}O{p^vm*?Nb^FCM;Q+2_o*A8F^-5I_KB!3yv*FUZk3
z_@5v$O0AaQT!=C4`35p2pja@=TJTHQ<IZNwZ6C|J)l2`6;Q_Q0zDNNI68M>)`6))`
z;8RpX#3(p01{?rjuwaI`{%9||<Fna(%g3B1@PKmS6(Ay<NJN76%nyHz`pnM|9ii5f
zf(8hHkkMldC>Es!KitF4=9z4|#iLla<}{gk)eh`j1$g*I?BMW6Tkt<c7@=Ob-~zI(
zBr2H_5NB~_Sqr|(wX-ewn?0fhKX{tJgOV@dnP;Af_x~wNmk#ls_kWV!sV`BP{2?O8
zsnsn`Lqs$K&y;{jijyJs9;tB6%stq6(}$m4@C8v-_?zGS1}`u$xI9P>eB9K`AFy_q
zN{_?25HSug^JiaD)D5=a%UnHuCL3?^u+tJ=RmqcZ`B0TiW}7K5c<iR9t*>4_&=}uO
ztsdiSX$~HPfq6<u+k3tRzhml5Hr)83tUF^F#+a@jFESrq6c7*L#{h~bsDQtw*>gCx
zDDI@;HOCKx|M=b`@WPV8!4*$w9REAzQUhlLj9Nf(kSPJd;#kh!Irz!5TJR5M<GNME
zsbzX<1o^MceD`zZ`XFIg1{?WD^WiCyaD{2&MZ%<Uyjm(*bXL*80boP`ixUW(#mWly
z4VTz4bru_M{17&@;73QU<Jgt2WT<>8L0CsA1L~KrLT9F;3X)w@JaBf8!vop~+$?GT
zt&weSz|_}+iwog>KgR}WwGS^sxnf8oaH%3{y^kkAh;XI_f3(C^(=GU$JY;U!lO&dr
zD__P9*X*UV;_=wApJC#?IR9M_mw~ERM&~)ztgqP^Q`-oG4<|YBRqXy(lKjtSQ56&|
zh6glf4}_*~0M9RIJljrYQimWIaX4u2`O=EE!J9psO*eVyoWX0S$5SH=m9M6>{_V{6
zT*Tz`|I$10T&g{*P?c_Y$N;ld07{M`92yOyYhOZh@Lo*LZl(Xos|npW5&a11!r*hF
z!BA5-Ujg<%>1?YR1P26~qUDt>_$t>l&t>yXAI93u+ADx!f&fb|IEZX76}N=SrZ13c
zKd41f=-#uro&p6-NMm}0^y2$7Kn+bH(gC8_P!m8Yg7+75w}9<bfTF2G6N|$TkV3eM
zy+`ZpjL&1s%^vRIy`buF=_CZuoH<TE4og3=4j`l`-n4^u7(D5S*aTD&4QQkh8d)@*
zfDoF~#~E-o`)DD&;<s6j0`MZBR&nuMa~MsLQfuaq^{^{Fm#w#aBx^fjdj(Vlw1ggd
z7f1G7iXQtBJ!>kYY7tT(MLMj#DD&MS+U|Qlj{t&0330pL&hXAl(L+C=zOqc}KoR6r
z;k^QM{t8GHO)T1sF_jhUJHCY7oX6H%Ke`K^c|l4@5ba`3{BMF~eZYEDH3M8kkfSIi
z%<Q$SY5tR7NguE=^AwAM2QWAV-%zKxI3*|zv43oU-S&L8-sZ6<gjdD)ZGu#{5v+S9
zHr#^R82&2}9%vF_dbSh(&+AAlTOo~33SND`Xay)FbMXD_9WAl9dI8&R|G45}28w75
ztDjHY-?G$=&Ge1DmVm{<OXeC}f^2yS&E@xJGTy|Jy|2QcAb=LbqvVQF=kU#9f-(nM
z@Yk0vWZRvePz3MCDp=_S3r+1ON+b(`PdT>Ntgk{!51K&4AaNoHfJ!lZkryzgLMA~F
zuzz@(y_K`se!G^nU%3Ey0B9>PnLq<*PLI;>YzBaw0=&0~pw`a48%ofaIyU!iZ%m8f
zQO#ck;q1Pv$V5=a4jp3KInQR*s%3yJfY0Cr2(kO#$&uZcp+|m5eRUbDi_7XH>r=w+
zcq>P)y#)4spZfAL)&ZhL@Wsi{FTeXEGO@9n`k$MvKDc(xvOy~XTAb1%*~d!+jh(D+
z{)=F+4|Kz#Q(7MphnT5rS>3#tpk4zu0)Wbb;d8gZBfjMDLh|J;{V%$8CH%=$j1<EA
z9gf-vsck1*a}nwA_Xz9^n(64&@_BFM(g-v3Ka{uMi}?C)6Qr}Kf{G%=@c;jk*iV1{
zOEPiJajTpD&p#sV8$;8<B6$4Qz$VCs7ZMNNhskIYy@y^+2!NgvykA@nu?gk|FJ)%U
zgP2G+v*g-W5TI}}@OjD5dFPzf71zv6H#~SQd}oj&Sb8CaNS9Jdgi2T@kUD6JXU?<Q
zoqZ4!U`jO<Ln^&!43P{HB|?uVs)7{2`$5hYu-4@j#gPJd{7qmT8n@&1#>^;vHezhw
zADK>i5G-hi+w7Pf5AQ+51k6rN(3>{VcoIs`oEo9+VFb`Zc-4YHh;H#|sZdzS@fmE0
z-SsvO?Yb0q_$SnsL^O6hnch@=aYN_j{=V-N1#sF`52!0t%K_2FEiZ8OztQWyOMR$>
z(>A;mz!#N;L-M5nzB3pqA+tMK)%Yi2-yn_})i8pf13m-R&T|=f#~4skK_{+d<&jGW
zDj}NX0wRU**_AvA7Xv?U2GVxCUfy^wl7l}$ng=mMcLPeOI_M~TNL~d9P?x<_a5lys
z{tIFMHcB_S7xAud5v0=qfEL61SD%~$6p#XV6ja&(xR{_7uQyiRkBN9QJ=ed2%1u8?
zY=#g`b87YALFfVz6EZz<lxX*@IODD_V`jrcm~flvyW*vUD5@ZZ@Cw~-AYTC@omMa(
zex9h1nqJ!R`cg`<P_{A7Hb7GknP0%@0x>~I8qeaKkeVJ`(-D~=%88+bLNUBQ=7=Fz
zv=ClBK|5ZL{u8fHkASoO<DJvq3GW9dUK!5fniEhqG^dUs&VmYxE(~4)U4#wDh0hEb
z0+dL1yqQBgFTw8p9`$8qoGM6h-M%=V4@v(1dWNsQ7`N*?)R&g9*~LP5Ka~r2gJdp7
zit~8^0M!tgYFX;WT)bWfHlQpH-tWc|GPa8qhu%d{5tQ`{h6kV{Au8Siy5LHVUj=D|
z>Dx}_X0OH7wxVgg_?ge*g)}A{+D7%xFT?e1fi%jzM-jZwRZiXw%E?u7Y(j9um(yJT
zKqlN4daiyMmBqlLKFpm{z-?a5%$A2U&Sv`l{Srzn4Bi`mJ!vDjFnIAk+nPQ!hFAuP
zVgWgIc<;Xzq3vN@BP9-ph^;|TRHYDJJ;}lqpzT%+kJqp|i$>!}31+885N8(ypWTQ+
z``yiPsDv~o+a4xcA4Tx~#V2YxTfm2FQe4cy7cJt8-^k%>F2?TpF7?3@P65$Vg4YZl
z0ZK%FejP{VyudZzp=Y3ks-mJu0erTKbfJL|a7v|XC?ONqvi!&ugyj+{8xRGQQ-TMd
zEIA30(LJm<@Lqx{sH{O1K#JhoN2jDoigSK43T=QQCs)QwBZ7hLRB!t#Y;U`EuPAz|
z@cs&<F{Nc&sGa#@T>nN$6M%)ms}e;qQJfH#0)lXU3k&{oyui}6LYffX{8cnJKbR@D
zP`mWS^pvUuK@YeDGNXmg>nqw3)%m^zB}{1sY(jX)*D}5Rkxa-I`u_eRN_b#$;N2X2
zvkkv`^|H&uAQ&ZJfm=Wo6(JwKJJ7H}FB(A<EF*{<@vh%8ZF>={_uJj?%Qu2zXiSgO
zqmDG_!!=@}(hwDEC<9I%q7D!M1W*B78$L-==4LsbnmP2er#|87V`F0kLC~oH&2fPs
z3n^WzA|?c<Xk!e@(3~El+88DH&7-KL3V?Q|zW@%P^Uo0TT~Q6Fg^)I;pj@Ugag+fu
zqz>x!GX1^%Bxy<%CB$)ph)}JSNz;^x@oBE#yZ7jeU-azzUU|jkJD^)a&D{c02oH+0
zmP+4p?8b|j{r&S9zT%H0yMIir<PcFRB@eD{KAalg@A?;qR|L*N^H(qB=%v4ctG`R>
zmgf-#y=-1FK(iSWM+q~tO{{hF_0>_QjEqch#g#jbz510ey#JovJO4qBNRp<V>G0s>
zWMgL%r-KL!s@@_2nl_OgA3zTMhM-)>Ng347t}32VyJLymYXB->n`qLYw(UGFE1$#a
zwd+~G_6)|xr<k5;;+$j2k~+o+!^6k9^2)1@z4}!zy#MZ9JO2ofuYlyl3W$?rP(&8~
zS2PJAtYNTZEaX~y52v|qQoEHTf<yT0AAZA4Z@itAtJ(@U1^5CZcq)HFREx$_SPxYk
zpmbG=wL@{8=d$Nhno+{^bYn5_1-U>meDQyBa>Cn81VzBt3jy)ZW=DSx|9l)L*hRtv
zm@o`zwcJ=>@x_edy8XhlI-R#y`}!6K4`6=!)1Pt06<0E+1Y-o%(-U5q|NUCEOb{#%
z9>831!TH?smbc*D?|wHT(q0XE`oW_L`0&<R%ka_B#lU+TkR%B&c)<&J@{^y;T;Bx2
zX$PMjt#df1%+5x%Vw=UlcN@V^e)5x?fByNJrl~W=oObX|m6@4Ys?{pTMvfnQ`OBXB
zz&1S6)fOlr0RAEU)1Uq{abW+x%l_woZ*=C=)HKrNvlR+lSiY<41_MBI72+dK=Sbp|
zI8IP?W3PJUi=NVo@Gb^c;sa~NAG5v#Y}W6%t{J!iLZA$At6Sab#_xX5``@*0?fRQ0
zY2yFq&>f`-zK=iT&3p$i#d|(eT#{OBYGvons}H>Gt#A0yjvYJx1ynnrEgm=p651^S
znm|OmB|r)|uK*|kWuOK~rBbQ)_4ck&v<!p_0a;UwfB^)-<Sjve%=*%K4p6)ZfOcN+
z+7O+do|=lHI03>8zN1;X70?74v|9wkK$0l{yb=r^Gy^l)xU*%j9euj{{+M&F6FTpl
z!@pbUUh0~oj7%YZh4?LyE7CbGfRF{fV_~8NV*o8s-a_8N{{tHRNpeoAho1ld002ov
JPDHLkV1igq4wwJ{

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/video.png b/src/assets/img/files/video.png
deleted file mode 100644
index 8ac140c8b2420c80a99ca75e6a7ff38200eee426..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1261
zcmV<J1QPp+P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000EENkl<Zcmai!
z1CaDe8-<@vx|5lmwf)<+ZQHhO+qO!-ZQH)~U3~u5-eHpN_ok{VwVBdARnK_NseaF!
zC=mg`T6ceI?RCS*B%l4rn<@{u@r94R*39r=(nzgsB&^maO{a3b|K9Mvul$b^XFw33
z^Z*D>&_;(RjM2XWP|i6-WV+GlEI2B)w7x{&=38-x=aSSD>_MGV?R(RA=Z`ZrH&4>6
zBSKCQApW)ZNO6J+R5m=+e~TbcmuaOGKtxcDvV#SxE3ZSdfQ@2ICE;}Ef%M<@!;Ftl
z<>n2pRtlUGZLO^+6`(J>d;x8G7^&5XSKdHPFGJ9SN?ROD?nlqf-<z9{lcjBnvG_+o
zKnf5<3Mhnr$o+564X-~p_O16_%T)E1h^m20IDT*!%yr+#=-4<(Vi95}jQogv0uEG$
zxU2}HoS^^rokwAe+(UQ%M=FA$!STa;;-+82Q1TtJ<x6o{14JRtJBTC40#&G76E*pC
zM2{en<w)1b^uX98E^VszZVF*;ZtqX!hVNx0K1<pdN7B>O#%_mofPgr`n<#93nYOtB
zVf|uc@P3G-If9pvgHGEPNmA@?lhc)ZQ@iB{7#km>y>k-QzCti?JKBTK#aZ#QFE%C&
zNwz<XI`t{^4c>r2(E(-Y&}p(nIGx>_{+qv_@!Z^|DL6|w@<>E1%C^9!P%;r$L75@+
z%;RwmMBGsalsZ`Y@88M7nj5_L7Z{zK&coUeM2IMoor}=bX*8;9Q~ZP!w!Kffb3tCi
zHH+ds#kK*#4=$bO%FeC-GBq`on|FYsBq1^e6B;C}fbNAbM|&_a5L1mK@E2<rK2f3H
z`RQ-sM79qPS}8aq0x183HrIijC4$bUuudRHoWmC#pbnR)S8hPX(j8D5lD5{TQ{Ha@
z=OEhqJvuu?vQ=_pu;R_FfCJauBs#bR8G0$sw~WgvCuqEm%mJTZ=?p)KB;BKOgBN3M
z)^(*y7?WJ_HLQg=2XUqGK#>w01xQzkP84e4!^F+YvCiVMc8M0wS?tc0==0x+5{Cnv
z_!E}Lq$z|Hm$}DgaD%tdX|7>xr?iIR$%9niwQ;w7Kh}bjiY}>q0{<YT!zCAe3U#oA
z=qdyzM<1bkuzM%T{`)~F!rf6o6d59;OC1y?BfhLG#mqejm$pc^mT*M}1wo8cG4b^t
ziDVX(_c2k#=Elax%Gu*<act1gy+H!tEJ0<MP8K02euY{19?AuX<LHK$WrWpX>N5|g
zw||!29s`v=PMtbkf5G#g_2dgKIClj=i3n+$U2|{0vEZyTLJ<@|YmGoMoG5Qvtf3Tr
zIS%U$>hyD+>s*J$#ijk{J@@I4z4Vfc{(u*HeSL%c{?m1@_XZin6Qn4=9c7AHD@f7<
z!mQ1iGiRDFc>Xh=P?#4AZhYe#@tyB{m%hF}jEQm#+8F<=155}}jwuMbU-wjFR?e>M
zKkJ!KeZ<8VUGQ7F<*OMS931`TH^2Lfsp*;Pr}?}@M2YzEk-siZR*a{3Rw@X#x3{x*
zzVj{byy(L7e*)Bi6lef-psnyB+89&I84{5Y&_D<TfGSaz09b32TumSXGJHS_AJVxB
XX6KFrt7I6{00000NkvXXu0mjf9|2@@

diff --git a/src/assets/img/files/wav-64.png b/src/assets/img/files/wav-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..819781a9b564c188089b5796a99b661a94cd07da
GIT binary patch
literal 5410
zcmV+-72WEIP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000!}Nkl<Zcmd6t
z1$11;wx+*bhZ-eWvSp5w8&jB>efcp%@G&zpGcz+YGgFv3@0u~Tz=FmDReL(MCcS#x
zZjE9Ocx&xd&~(1PcCkcN8Ewj$uZtMw=jYkJV+V^13-Ql<{FR^o3A;Dm)M|9{^12$T
zf;xIGsN&1cmlY9V?(iu&^&fBOZyam>)<^xy&;IkLe){L(obrFh6ab~4^}lJ1Fv>;>
zpsIVUb$9nt0s3z;#?Wea_`V<ciDKjHf4=+UHk$`Jxg|D=TESU7uy-psCupIBamdNs
zu>7uTxn$#dHq_$TvG;!RFX_}pU2I{_gaA-IKLOP9i^fs-AI8YPtXhB`_*b^u=?|S%
z95G}Bn1BCe(!c&W7G~!Ni-Mv6n=7_pzy+Hrajn8^SYr9T4|44TpULJ;8!!f3yNkL4
zML-z@@bI1hP|<$5kLn4}!0uN8s{MRm4CCXKuZ*JbM^+<1xd;Dho)?#h2!n<(be*B|
zcRz;v`=6soQ^G9krH;JkMW)!iFMzL)t5s%`DvR%VgzFyobT&<{VK~}Gg>WBr7<RC%
zXMRoxKaO>daydRYF<!e;Roe_$=$so8Kvl=#?C|-&`~=~nzl<w6DiP$}5X1r2r-*t-
zm1MHYOj2X{o`<;ZQ$M2zKXG3048srR`=)2SRRo-M<JQ`eD*vkhtj5I9wFdWJKS}h&
zuOeloWDHp+LMc!N%^~WD%Vkc6H5TrCh-*IOGtUctIP6EacE6-&b`1gV$~zOlczE=&
zpC)?p*9a?)N@9G=hggQG9ARALgj6|w`$Jsyi5CJqfO-d3D}aIt@bHiRl!uQiO061D
z<Vv8zAc7!>=9r+$v7*e}Ee~<U$9@KzF9>)*IeP?%$cU&9NS(p{doS#t`gNj;rB*kf
zLJ$sqGYC-NP%0cJ;nd9!aQR1mI-931kd{{+YWo!h5a04j_K!bC_{6Uhlnbim5VatN
zo(n-_`tX9{Y=sk@h&ONgRCayvVK%S5P~brsZQ-6hd-?@i6s(z=;>UmXm;F4i|Ncu*
zDkw#vpVERDOlS}zeG!Z(MONZi7I5s^PhrP<9%RefH5VTIh*eeiumAe54BDD?)4}4O
z{;-*N?vGK|At@V*j-U<zU{C}lFJg|g0uEjA$y|ER{cKrx;lZ!8+z;1Qqkf^2J3jx)
z>gP|r^4Am1r6uZB$l4*Q7G==<I6$6899jz4zw48^_^wZ7%k(+GO90OPUx(MepBVw4
zdou$zHd(KJZsWiqf+8pD1}OFnbU|?BX^F#)fPLFPnQeD{3R}+w9tfJpag_}?fd5PI
zD_K}u&KWFc+9?I1<f;0WA6`2<3R~r9C*Z*DPvT+^KY7k!A1!}~v@{7OerNFg?+pMu
z8or+&F$M(VWd<!w40!=IbEwJ?ywfTtnubGHe+rl0egC<IJpcw=MttNSan((9$1X!O
z8;0*Q%UK7upnD2innD#A2@g7=4}{5Nb%0Q?ofMmE&+#7?dX59<5L4r19&+ra``Lcq
zc@B6208+FuT8wUa1Z<nAGecgx1f}SIy+f!jzD#?=Jy>LA_z|l?<E-+wYtNlitcCve
zHg^=A9HqpOPRx<(9`aM&Xm|w?Kn8$hNDTGvz-FKh6&Y@M1z&G7;&c`@AxMCSmw>P*
zN|-OAVn)I<2+yz?b;8^3-cCLI+gn<TL=}$bWlr4uFn*CU3SI;xK+*+p1*iZ5E<?2d
z1x!fLJVMku0ww|fKF4s&<4fW)Pz5X|TOjOx)=3Cr2-10?d;yS=@Y+AwVuSz+Z##+?
z!CL9>=Yyom396jD<6$oQs81Wc!ZQJ;Gl%32g2oX_C;tmX&>$jQ{BNS>QPe~zf;vl(
zHz9AMMS&Lq&N|>F3$Gz+A@5S2f1XnND3}0MPy~t$Rd-JC0LD2ObX9y>WJ*-3_$}?+
z-H&kP$F01!M-^$Dz+}r_M6+}Z5r+rPx=7K*3j#>{G<27VmiA-21zK482X7cu-tNx=
zSsMVFa|Fkqg0uk$2w*L?n<DCeXO-}yyFlM<uEf;}Go?DG?|p=;KH<|xZ)wHgy}O7x
z_7o7HR<U_O|9SEpmvu2SuOb3w@d)G@+Vi}f<9aC`%0Ooh=`Mj60$i4&YGCdlGJ6o$
zX@dv^F}Bmho;(O*R)p6Ty8tlg&MHZ%#9X<?!k$OC`jb|G2j7y2S0C4GqR#pjwXF`Q
zBI3If%pM|`c>^(_pJH9=1t4oXIQ|;Oc5z{Z+5ew}%g1ph1O(UZg3T#fUGip%>!c9I
zm^WX-9C(6kxrM@t@aRerU}4aW2q!gU={*l~?fomm69jPl706n?m5Wx2cAD7ZZ}^$R
zho*=ZwK(tsc6kXk;$dvNjq9dljjpc;MG)+<eYiLN9b<e%_-R>fLDqxMS_QV<1!G|D
zF#612^y)043J5F1>!|Ip=@$aigYOh9-}fn8_i+!hY0V1o#^9Fc(B(zU{Bhi=gSb{o
zxc_<V{7L`NfpZ|>tf4q@oFJJdK**adFbOIpvW~&b&SLgI1DEe1YqW{mKFobI6+LlG
zVab~rvYZm87DTa`C7oF!ObP;ZC<Yk;uR1yk!lk`4^sTTg*_^As<Re)>H3e!%FLI2b
z`@~-p*o<)f4vIssQ_L@7(+{CR07XVg9iobJLb{X^EiMxpA#Y{a#e+C&N#`20U;R_Y
z*Iz++?Yqeq8xVygVF(K+$q&3i{FX2+OaA&BR4=-fK!l=`(V1zGtc9`(z>b7pc{B7c
zfBN(QziV7`^S0w#)~}r`L_p6DFQp3Y=l+A%qyI$Zs#|>v6&*`D-@qL^NwRIH@82bW
zIK*i{_jC)bFH<%`-nA4jJ%yC3qzfIo`%h4rog)e$TTUsKjuAH((Xd3`%!%`y?ui+?
zhu$P!Y7rQ)?UZf<^u#RjzL$`lH=t<;g<<%Wy1<uN$AIO(GB*CzdxGF^8>pNWK8kVO
zHtiRlV)60Ea9X0aZW~2A^L;d*J&l>{lAb(<`=ei>bo0FsCZvmPs4W3t3qy17L86UY
zDY}NVLoc<6Le>MeAKK4Er$y0h(K+@eWvg^g&6BnTn}eV}0*X8$efc%w$Nz=Wj_YtD
z;B**%r6aMw|Hpso7o2lkfBEjG)3CNcUQ7<b2Laj4o1}YRqw&;}G!LD`B`=b9m3aL|
z@>W6n#5~cawg+zi#UE2WaDZg@)xGzgfXXx&a2nD&Izy$p9>O{{7{}TG0?1oA*<wnk
zC$LUT(S36cb?Rq}&TNa;-UHN)kase&j*vH%#xqY5-SHZ-<0`b%LX~0oQJbOnz31IS
zw`;9tX8;_;2r9<=!e9L<?H8YA@rftN+DdS`Mf;!rnaO+KgUwA3yhA#-gv|`?lc&*W
zAEzIGlFpGC;;kvR(eSfCQA9W?VLQEi9@2dMzZsujCSPokr_g-j2{cKt8spN;cZKdE
zbWfeeBw%xgGgYKsV)5CRFn|09)ITvI*mfxt1q$F?A8KS5u-1*dW)wjENZf!Rpg7$F
z>ZHv7`+p%}1xFdFP7;l+qiE--6CVZXLKCNs#@-_Y6C3CppTSAlr!znM6EvTH9_u3f
zyq*_O8mIBns~r8tucUkA1g;2rptGdMkCM-yX5r8On0%>?h7qkp$C&@k-=X!)vuISs
z<sGtC&ir5eImxcescgTDe0~nBLy{ONl~-H{g=d9VKotUmc2m;*`@t!uoRI9;O**^4
znmg~L^X3dTSIV0<lQ-JE`Z=64zJ-Y*zsz;HBU|neO^oB5u<&pHhDk~gS5ZQ2kwaAR
z?`=N!0{Ox+B7$qDXaRYn!%{DTY&#=dyOHjjvmE=5Zy{e=CZ3)~b4M^XMZ9@4odX96
zUV9mxIR!~VFf|2Rws|o|nPDY!4k=ft-E<4JTW+Ox>#fN61l3);n7HX?!m%-0`}WZ}
zc!*;8t?*qWtW+slZ6t~?<ucj)ya$RVr${z!Laim)xY37o`>pYz2N8{rd%?<=ZYL<0
zv7HX(?c3S#xnDr32Ugv=i*RBB6US(tGk*7dMAPdjmX>@3sZ)}z7m*)7jvhNq`OdqE
zuD=QC!E0dwJvRXqz$q^G>vf7wO56jPxZyf#x8F`!E0au3pxq|6xr}JugQ=lKm#9{u
zG(ClDH3+K-r48$drzY9-S)Wa1=MGF{aGe%*d68tpH1T+yb@x9&{rc-DO^s9S30!{9
z`x(3GCN_TM*HFIfGC$3gHcm5s&plMHzZT8Agyje^j_$#I)ULgjaB>Q(;Ihoa4_vpe
zT7Z!!Ihtmad#y3P=e>~Uj9s>av0d+?wtX8$I|Qa6o~#iVOFU7dw(}CAl2Beh*#oR0
zMVsVZms0=WM<BLM5EQuOIWJIo^EBmMyBT};dx$C#LAiu&wuslSg|*YfJyDX0GUZL{
z2*$?<DhY8dCM<`3Ka$iF>hJvk=9(M*{$co(S<mW20*C-BoZGuBr*_*NB-<{gw045p
z<-3^r@Q)y>#)Oe0t|cU62_~>46IC{U=4UZ}<MsZ1MpKL^RBFWICE}_fuE&I-WzBti
z2)15A&<pLbBw&Cr@U82Lf@IAY<qc~HOpb)&f3LoC8)4%7LCMr7-;b`}gza`v&(??c
zDXe}FT;WU))E1cf8l1Hx>&6MErYY~-P4(hU<Z}VZnhM5N2@}DTl=@rK<KO-f)!XhS
zKlCaR07fXUtK*suaSf933gOyGECv%wPuLn^y^0ls2^5?os>Q^$kmS<K{df?R0!%d|
zFjY#G9fX^=QaC^X&VW}y-?0D;!=w1r=6*$3+Pc*bTH%f>DR0?8oLIuK1d}HOVL^Q5
zRfHGq^aGh08>e#VyD;NZSdkudf|CGKE>YgRo*)#oC@@LPnveV>%(k5rc|i~XVo0`L
zOi@zGJ9ZFkyvTQ(pdKRIuOO<`k<g&d4a4{Ob@c)${tr<(`;CpC9jYX^z8Bs13^F!F
z>B{R#|LZWxWF2E0Na846el>1vEkUh>XioXoJ?Q#v$mx^BlNB&c2q8?Q=OKBPdBK96
zSCcyd$p~vDFacb=i?{;erY#gxTm6_2&L+sVZ3OpzDmE-bmJY!KFt{OFjR5_3%Bbrq
zg(Amn-i{;*NPy|}zskiI5sXzau7(65CIsu0AXFqUP>OvkBZkuYNeG&_ZilEE!M4lM
zB8NDkunKBX@G}kSPy@+S9b+uHbwrbs#FJIrM4fc%Vq9wx)D6KaIt;$LE+8Y|VIV=L
zFTo#j#sSf`cY!T1j6soMk_f91CdRKPv^I{l1q1;}HNYgBaP4KH1k$A9BMUdUcQXX#
zn8G<EjEL8cBS}EVIim43#A~V)rHF2xj)d>itG@F=P~m@nU1f7HAtn&QiAjhO?3#51
z$Dcz>CEu!Y@wHH2M-f)NFd9_|u6-}@>3!G}uM#FohN22G_}~ITeVhWoKs;8)hWJn~
zw%>{CoFEJpRUHZM*;kkc%nChV^>=l)K&G}}ckaQBO(WHs4{J#x|5~x}YVx2&|M*)B
zZp+n}$@N5K!Nh{%(TDnOy7e{+H3*Kl8WBVWoFz{t$ZJzRx^Sc6(E*5I$Bb%yR9Amd
zX*2B94$|rt#3(@$5mpi;3;{)p40K?hu8Ihl*!)i@0Rh$Flbl>4)H#eeic9ZCOI81x
z7d?*rZz*mhy!u4Z5ekG1+c{iO1J<I5?+Qjkf^x|Vpl<la#z#ecE4Fi#QUV$=@+3#p
z`EpU+Oe3yP>3s%Y2NER+UDN>p48!}>sh?7v^W9~2V}K&aIo!`@Q&$nsy?`WDit;q7
z78$y$D=3mFy3rcOLcs<AG6YZmGY)4W(r^+TtAWiB2`S2JQJaJ6Xn0l9G(%CsDDWbz
zY778<$MB*`x3n3D!NoPY<;~zM!<QD&zlM^4eyB18KcImFF?1>8E43g^HjzsSu;?&6
zPL*yqBh7NACdXe6gWz-=g$()%>i|VX-tm8Ch|5tiv^U&~vkHv5u~F2Ro=5#FGjte!
zun`n5a=)J!CZSQ?joJbL0aO6z;mPxYAPmSFtrMUBd7t?O3kwSbL2zal(2-N1oa?`(
zge9_Y4NetV>BfctOaK4~9&iYLcw-|7d7e|NSE<)GP{}jWG$+e)M1)c~rYH)Q7MmP8
ze0b(-zWPf(=G9kTehr2#)RA34&Iw*Lr@Q8AR02fpXn0#-OVec2H<M3Zfh7cWtAcN}
zT7)5NnBL+;yq)H>+Fh)5)aw=0DRXm6yz=U6v)}SfU-fYZ_V0cAogav(zC-wa4oi$v
z84a&^p|bLN7B;+}`T7kM4rFC`pCZEX<3|YtA<r$#jW&&zhi7c8LJ$b2X6AXd2mh_#
z?BO3}1v4Y2$8&@4=iQ3%0P00>bfPJ=NLL9Ds*c6QMIY|XR@b|89v)+Q@TcB_e|`2_
zdhq-A?foxSwh@EidBL+H{Lnn_EUX5;UyuKMH_d4_JLd&Istf!-gGY7M@QU`~0UrVO
zJmCRM7zXrwnE%3pAKuZ4P_LgKJb?MTzx#V$dF53vf-!>Xg$b{~;P019F+p&C@Brq6
zAN&B<Uw<7x@*_Wjh<G8;3lAPu7+Bs~YdJM@`n=!)4B!_PU-^|^$>)5|=lHw{f(s44
zpIYZ|PHDGOdTX2Wf*%?Lf9aQgi4T0>16mY?GsawS@J^Lht4*m?Vs>tR_8Y$b%Ra%w
zgADm9Ed&_&kUsk8qf5t*9(ifk?kn~*8clp9gAYGCKXffU^uA#*0Cc1veSw{G<XPcI
ze^s~e&ENFZpW9pHJP)h~034wGw4e8G2l9ij>)YT42!R;jh8u3U@<)F3Cw_SAmW!^=
zi(LC#a~;|l%9)EMR@~K{0nExRKNxX&VX=jky?fs{_Wj@Yoj?8BYp*>El+J**1Hc84
zgZC8Z;#2QAPylXFfCz|zG9XEkRO+?bCPiZ)R0w$66(e8(K`^62u%Gtx!f<%%;9CYO
zhW|ka(Pp#JNYg9_!U6a}x5EN>_zrkafegq2H~65&dmpq9X8Pq}?+Z8#?wz4@xNaDF
zbe$XQt_+8|4vW$EVlYAmyTB-uq4LTQva0V`ohd7q0d!^YR`nhH4|7@cT!Nqqxc~qF
M07*qoM6N<$g78l@)Bpeg

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/wav.png b/src/assets/img/files/wav.png
deleted file mode 100644
index b12df5d4cf9c9d981005b06d7339e9f1f093ac52..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1417
zcmV;41$O$0P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000G0Nkl<Zcmai#
z1B^9G9>srEUDea$JJz#p+cws=ZHH@H!Fq$W9X{Kf`83?&ojbQt*xF9-q}L}o#pIm&
zBi+J#4}i7qlE8yhtn$yi@2$ycPygbEy@v-HS%xjz1?z(c=;*LBZ#(*BZ@g7ltHI-e
z+EC8UqqK@<v{t_Y5Y9P*$z-dQJ?>R!cQ*GZeEW55-hVgE6-#@i&HAyIaNvi&!sLE?
zk!@_^J%Rr)2y@BO67M`h3Ntv+cdV4+VI_nBh($+dobP!A{nOW=^Cw}v8<(%JcK9V6
z^p3AEHa-!=Tl`-LaLy}hZ6bt3J^a`csHB^Le3j_Ouce{)z*qy}SJ`#q73}rm&oVkX
zMv=Dh0RQXtwS5KD<!2nnp?i;yeC7O6J?LjJQv*b<&Cb!YXk7P+Qru*1N_bIa+f_!?
z#Mx%uLH+*OM-vHuu9<$4W}gJN%<O&_kX#?cNB%CJ0^ku~wovUQ@}7Oc8%iyxgk3fJ
zx;b)SVu-H(K9M$|xqF?*yU!rGA&8HTV~QMVuM>F_)qEN+6&{H!HW4mI1Y_Nv!y~Ko
zZCj%XBZ3gL*HYT2T*AJu`Vu3fqnJELHg_RxhV2{yp@=quxG{JUfp@5l8Dzde)_)MP
zy^Krt2Jfju38`@=W#jmZIq)5yV{|NtXBlj*!Tb~Wjvl;`h*l8TSj1*6Wd96aNbJ%s
z*qp;{7I>S(P=q%CwHiG3r~9EX;12%8*BPFez*vV}nZ-PLH*V%Z)WOH&ZH(JJgISr!
zOh14&eTd#6ve{+)@)Eu)L-q{7;gYfzuub**i8DCj;Qjt`dJs>I!Q~kX-~0l;xdLGw
zO)o?5AbM<^t-J0e-!)C&)DpJ&BtG3L_wnJ!k^bdZ44?h1GBWRMRb_#wdUwB#X8UoQ
zW_t6ETY2IQuO=QDA?oP~LQT@SS$d8?5!Y(rf~f52Lpp==kS{Nj9C%1Dzm>@keT3xn
zvp~m;jSZftmAYG6>j*3zMI4hHdKd$jTu!mkBwPF|L>i%DI>sjn4?sjQ@$e|U=Uhn7
zsb?WOx-hFNcqb5fiby)Cf1VTowO-caQ;a?1Mv`7Z>z>=`JYZkcW#^I{d<3LRMBdVP
z{tK`htBB5SRJw?d6Vhmd<lKv}&O;!StQ&Z|3oHua5c1IVH__Fxh8mtiopA*uee^x@
zdt$9oha5?iweho0(0js><->Z9ISiZh;PVvfMP?fw4`2=S3?dIamcCO@L7I$wD5R%*
zh`y6fLT}E}io5VKB5E{Hc^9T{Z=6oZU72d?khK(*LpcQ#Cu97fXVWp-j|<{f=wNyR
z$#56tJrPA?Z~WK+xc(8OmN@J1l|dY9Vy$W^;$Odt4%0D+Y3z^n67LK~_ac?Ud5?1*
zgre1d1k!90MKQuzbR4s^xVSjGXL`P)L!+u})qf(Dk;SVnTD?bX_q7fCv~g4wtt;ok
z6lj%@^bVqhWarLZo3DJui=T7vy?4z5$S8`~7O&HJoKTpkE38dvVswMmk@L&7t5T7s
zZI+f6Q95RNdS?A4FMjUzLHv(YkP8dpQbkZp4}s<6e4wkMD%Ut`>JPy=N2D~nckkYM
z<ttwF%!eMl{}0q4k2vCRe(-}I(%ajM)^VUl1!}FzbxBp8mDEb1RCN~CU0vPG?wMVG
z@r#~!?F0AU`&<460-(`o41f2#Km5hS<kTTWQ5f&N@E%b`BdP|#m3zNE3nAt5^0N8R
zhu-_4`|rEwCqOq)04-n>NJV9$!b`gY2ZCq>C?EnPAZo0`16XVGfGr>fOl8onOtQZL
X+MPbgiZ%2t00000NkvXXu0mjfmd3w3

diff --git a/src/assets/img/files/wmv-64.png b/src/assets/img/files/wmv-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..570c4b2b319ff8aae875897308c42d1bb69d0984
GIT binary patch
literal 4211
zcmV-(5RC7MP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000m=Nkl<Zcmd6t
z1#ld>wy?jW?m^qJV~00P?_Fl*Ww^}D%*@Qp%*@QpOv_ma?1tmSG21f@()q_Vw@c-j
z^xsZ=t6ol(s-?#Hj-*31qN?PJ(s^CPaQygjwr<_V`1n})Gw-_aX^*<_Mz?89k0xRN
z5b6M{Xx3c&h)qGNj32m0hA;WOe&omFUp)J{AO6+D9`!VwQ~o=m0I2UGA{Zm&Nv;A^
z^-OEsT~$^5>%bVp%xr_Vy!AclmL-4r-$z`q?h%b>mTK9yVbi(hXg6@yL7ZYry&M>U
zgYil>oYBYXq4Kf%)<=BORW~-#)O11ss4h+c3eplSm%`s0Bfnm-0$SiNn4OK@d1B=l
zqD1JO`5NKz?=d;PmulF+rZ5NX5{I^$i~rMa#suXd4oviLedR*7-SvsAJ!3T{02enw
zQxpNk17z?D0;p&<_NXXm2ev;2s#%}F82bC`FDRA5cP~T%wHEx9Ns?|7k&e3!%?RA#
zk5e1}F3ujOQkur4f~FQ{9hxdGvAEcwQH%-a;0L%aXu;p51;1)3ouZnvggxpBVg0?G
z&v|$htaH?A<?9CedvC0&vv?tN&UGn3Rr}$@@OtDE^i2H_m2rCN5zdw&a5%t-;BXiO
zG{#g`v43nS*Okv<+a2fN2NnfSH@xrTMLTX40cTymwYI9td<9S-8GIuWWccIsO#cXE
zjCxOkwPgg00RS9=0hE-Ww1T}O{p^vm*?Nb^FCM;Q+2_o*A8F^-5I_KB!3yv*FUZk3
z_@5v$O0AaQT!=C4`35p2pja@=TJTHQ<IZNwZ6C|J)l2`6;Q_Q0zDNNI68M>)`6))`
z;8RpX#3(p01{?rjuwaI`{%9||<Fna(%g3B1@PKmS6(Ay<NJN76%nyHz`pnM|9ii5f
zf(8hHkkMldC>Es!KitF4=9z4|#iLla<}{gk)eh`j1$g*I?BMW6Tkt<c7@=Ob-~zI(
zBr2H_5NB~_Sqr|(wX-ewn?0fhKX{tJgOV@dnP;Af_x~wNmk#ls_kWV!sV`BP{2?O8
zsnsn`Lqs$K&y;{jijyJs9;tB6%stq6(}$m4@C8v-_?zGS1}`u$xI9P>eB9K`AFy_q
zN{_?25HSug^JiaD)D5=a%UnHuCL3?^u+tJ=RmqcZ`B0TiW}7K5c<iR9t*>4_&=}uO
ztsdiSX$~HPfq6<u+k3tRzhml5Hr)83tUF^F#+a@jFESrq6c7*L#{h~bsDQtw*>gCx
zDDI@;HOCKx|M=b`@WPV8!4*$w9REAzQUhlLj9Nf(kSPJd;#kh!Irz!5TJR5M<GNME
zsbzX<1o^MceD`zZ`XFIg1{?WD^WiCyaD{2&MZ%<Uyjm(*bXL*80boP`ixUW(#mWly
z4VTz4bru_M{17&@;73QU<Jgt2WT<>8L0CsA1L~KrLT9F;3X)w@JaBf8!vop~+$?GT
zt&weSz|_}+iwog>KgR}WwGS^sxnf8oaH%3{y^kkAh;XI_f3(C^(=GU$JY;U!lO&dr
zD__P9*X*UV;_=wApJC#?IR9M_mw~ERM&~)ztgqP^Q`-oG4<|YBRqXy(lKjtSQ56&|
zh6glf4}_*~0M9RIJljrYQimWIaX4u2`O=EE!J9psO*eVyoWX0S$5SH=m9M6>{_V{6
zT*Tz`|I$10T&g{*P?c_Y$N;ld07{M`92yOyYhOZh@Lo*LZl(Xos|npW5&a11!r*hF
z!BA5-Ujg<%>1?YR1P26~qUDt>_$t>l&t>yXAI93u+ADx!f&fb|IEZX76}N=SrZ13c
zKd41f=-#uro&p6-NMm}0^y2$7Kn+bH(gC8_P!m8Yg7+75w}9<bfTF2G6N|$TkV3eM
zy+`ZpjL&1s%^vRIy`buF=_CZuoH<TE4og3=4j`l`-n4^u7(D5S*aTD&4QQkh8d)@*
zfDoF~#~E-o`)DD&;<s6j0`MZBR&nuMa~MsLQfuaq^{^{Fm#w#aBx^fjdj(Vlw1ggd
z7f1G7iXQtBJ!>kYY7tT(MLMj#DD&MS+U|Qlj{t&0330pL&hXAl(L+C=zOqc}KoR6r
z;k^QM{t8GHO)T1sF_jhUJHCY7oX6H%Ke`K^c|l4@5ba`3{BMF~eZYEDH3M8kkfSIi
z%<Q$SY5tR7NguE=^AwAM2QWAV-%zKxI3*|zv43oU-S&L8-sZ6<gjdD)ZGu#{5v+S9
zHr#^R82&2}9%vF_dbSh(&+AAlTOo~33SND`Xay)FbMXD_9WAl9dI8&R|G45}28w75
ztDjHY-?G$=&Ge1DmVm{<OXeC}f^2yS&E@xJGTy|Jy|2QcAb=LbqvVQF=kU#9f-(nM
z@Yk0vWZRvePz3MCDp=_S3r+1ON+b(`PdT>Ntgk{!51K&4AaNoHfJ!lZkryzgLMA~F
zuzz@(y_K`se!G^nU%3Ey0B9>PnLq<*PLI;>YzBaw0=&0~pw`a48%ofaIyU!iZ%m8f
zQO#ck;q1Pv$V5=a4jp3KInQR*s%3yJfY0Cr2(kO#$&uZcp+|m5eRUbDi_7XH>r=w+
zcq>P)y#)4spZfAL)&ZhL@Wsi{FTeXEGO@9n`k$MvKDc(xvOy~XTAb1%*~d!+jh(D+
z{)=F+4|Kz#Q(7MphnT5rS>3#tpk4zu0)Wbb;d8gZBfjMDLh|J;{V%$8CH%=$j1<EA
z9gf-vsck1*a}nwA_Xz9^n(64&@_BFM(g-v3Ka{uMi}?C)6Qr}Kf{G%=@c;jk*iV1{
zOEPiJajTpD&p#sV8$;8<B6$4Qz$VCs7ZMNNhskIYy@y^+2!NgvykA@nu?gk|FJ)%U
zgP2G+v*g-W5TI}}@OjD5dFPzf71zv6H#~SQd}oj&Sb8CaNS9Jdgi2T@kUD6JXU?<Q
zoqZ4!U`jO<Ln^&!43P{HB|?uVs)7{2`$5hYu-4@j#gPJd{7qmT8n@&1#>^;vHezhw
zADK>i5G-hi+w7Pf5AQ+51k6rN(3>{VcoIs`oEo9+VFb`Zc-4YHh;H#|sZdzS@fmE0
z-SsvO?Yb0q_$SnsL^O6hnch@=aYN_j{=V-N1#sF`52!0t%K_2FEiZ8OztQWyOMR$>
z(>A;mz!#N;L-M5nzB3pqA+tMK)%Yi2-yn_})i8pf13m-R&T|=f#~4skK_{+d<&jGW
zDj}NX0wRU**_AvA7Xv?U2GVxCUfy^wl7l}$ng=mMcLPeOI_M~TNL~d9P?x<_a5lys
z{tIFMHcB_S7xAud5v0=qfEL61SD%~$6p#XV6ja&(xR{_7uQyiRkBN9QJ=ed2%1u8?
zY=#g`b87YALFfVz6EZz<lxX*@IODD_V`jrcm~flvyW*vUD5@ZZ@Cw~-AYTC@omMa(
zex9h1nqJ!R`cg`<P_{A7Hb7GknP0%@0x>~I8qeaKkeVJ`(-D~=%88+bLNUBQ=7=Fz
zv=ClBK|5ZL{u8fHkASoO<DJvq3GW9dUK!5fniEhqG^dUs&VmYxE(~4)U4#wDh0hEb
z0+dL1yqQBgFTw8p9`$8qoGM6h-M%=V4@v(1dWNsQ7`N*?)R&g9*~LP5Ka~r2gJdp7
zit~8^0M!tgYFX;WT)bWfHlQpH-tWc|GPa8qhu%d{5tQ`{h6kV{Au8Siy5LHVUj=D|
z>Dx}_X0OH7wxVgg_?ge*g)}A{+D7%xFT?e1fi%jzM-jZwRZiXw%E?u7Y(j9um(yJT
zKqlN4daiyMmBqlLKFpm{z-?a5%$A2U&Sv`l{Srzn4Bi`mJ!vDjFnIAk+nPQ!hFAuP
zVgWgIc<;Xzq3vN@BP9-ph^;|TRHYDJJ;}lqpzT%+kJqp|i$>!}31+885N8(ypWTQ+
z``yiPsDv~o+a4xcA4Tx~#V2YxTfm2FQe4cy7cJt8-^k%>F2?TpF7?3@P65$Vg4YZl
z0ZK%FejP{VyudZzp=Y3ks-mJu0erTKbfJL|a7v|XC?ONqvi!&ugyj+{8xRGQQ-TMd
zEIA30(LJm<@Lqx{sH{O1K#JhoN2jDoigSK43T=QQCs)QwBZ7hLRB!t#Y;U`EuPAz|
z@cs&<F{Nc&sGa#@T>nN$6M%)ms}e;qQJfH#0)lXU3k&{oyui}6LYffX{8cnJKbR@D
zP`mWS^pvUuK@YeDGNXmg>nqw3)%m^zB}{1sY(jX)*D}5Rkxa-I`u_eRN_b#$;N2X2
zvkkv`^|H&uAQ&ZJfm=Wo6(JwKJJ7H}FB(A<EF*{<@vh%8ZF>={_uJj?%Qu2zXiSgO
zqmDG_!!=@}(hwDEC<9I%q7D!M1W*B78$L-==4LsbnmP2er#|87V`F0kLC~oH&2fPs
z3n^WzA|?c<Xk!e@(3~El+88DH&7-KL3V?Q|zW@%P^Uo0TT~Q6Fg^)I;pj@Ugag+fu
zqz>x!GX1^%Bxy<%CB$)ph)}JSNz;^x@oBE#yZ7jeU-azzUU|jkJD^)a&D{c02oH+0
zmP+4p?8b|j{r&S9zT%H0yMIir<PcFRB@eD{KAalg@A?;qR|L*N^H(qB=%v4ctG`R>
zmgf-#y=-1FK(iSWM+q~tO{{hF_0>_QjEqch#g#jbz510ey#JovJO4qBNRp<V>G0s>
zWMgL%r-KL!s@@_2nl_OgA3zTMhM-)>Ng347t}32VyJLymYXB->n`qLYw(UGFE1$#a
zwd+~G_6)|xr<k5;;+$j2k~+o+!^6k9^2)1@z4}!zy#MZ9JO2ofuYlyl3W$?rP(&8~
zS2PJAtYNTZEaX~y52v|qQoEHTf<yT0AAZA4Z@itAtJ(@U1^5CZcq)HFREx$_SPxYk
zpmbG=wL@{8=d$Nhno+{^bYn5_1-U>meDQyBa>Cn81VzBt3jy)ZW=DSx|9l)L*hRtv
zm@o`zwcJ=>@x_edy8XhlI-R#y`}!6K4`6=!)1Pt06<0E+1Y-o%(-U5q|NUCEOb{#%
z9>831!TH?smbc*D?|wHT(q0XE`oW_L`0&<R%ka_B#lU+TkR%B&c)<&J@{^y;T;Bx2
zX$PMjt#df1%+5x%Vw=UlcN@V^e)5x?fByNJrl~W=oObX|m6@4Ys?{pTMvfnQ`OBXB
zz&1S6)fOlr0RAEU)1Uq{abW+x%l_woZ*=C=)HKrNvlR+lSiY<41_MBI72+dK=Sbp|
zI8IP?W3PJUi=NVo@Gb^c;sa~NAG5v#Y}W6%t{J!iLZA$At6Sab#_xX5``@*0?fRQ0
zY2yFq&>f`-zK=iT&3p$i#d|(eT#{OBYGvons}H>Gt#A0yjvYJx1ynnrEgm=p651^S
znm|OmB|r)|uK*|kWuOK~rBbQ)_4ck&v<!p_0a;UwfB^)-<Sjve%=*%K4p6)ZfOcN+
z+7O+do|=lHI03>8zN1;X70?74v|9wkK$0l{yb=r^Gy^l)xU*%j9euj{{+M&F6FTpl
z!@pbUUh0~oj7%YZh4?LyE7CbGfRF{fV_~8NV*o8s-a_8N{{tHRNpeoAho1ld002ov
JPDHLkV1igq4wwJ{

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/wmv.png b/src/assets/img/files/wmv.png
deleted file mode 100644
index 8ac140c8b2420c80a99ca75e6a7ff38200eee426..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1261
zcmV<J1QPp+P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000EENkl<Zcmai!
z1CaDe8-<@vx|5lmwf)<+ZQHhO+qO!-ZQH)~U3~u5-eHpN_ok{VwVBdARnK_NseaF!
zC=mg`T6ceI?RCS*B%l4rn<@{u@r94R*39r=(nzgsB&^maO{a3b|K9Mvul$b^XFw33
z^Z*D>&_;(RjM2XWP|i6-WV+GlEI2B)w7x{&=38-x=aSSD>_MGV?R(RA=Z`ZrH&4>6
zBSKCQApW)ZNO6J+R5m=+e~TbcmuaOGKtxcDvV#SxE3ZSdfQ@2ICE;}Ef%M<@!;Ftl
z<>n2pRtlUGZLO^+6`(J>d;x8G7^&5XSKdHPFGJ9SN?ROD?nlqf-<z9{lcjBnvG_+o
zKnf5<3Mhnr$o+564X-~p_O16_%T)E1h^m20IDT*!%yr+#=-4<(Vi95}jQogv0uEG$
zxU2}HoS^^rokwAe+(UQ%M=FA$!STa;;-+82Q1TtJ<x6o{14JRtJBTC40#&G76E*pC
zM2{en<w)1b^uX98E^VszZVF*;ZtqX!hVNx0K1<pdN7B>O#%_mofPgr`n<#93nYOtB
zVf|uc@P3G-If9pvgHGEPNmA@?lhc)ZQ@iB{7#km>y>k-QzCti?JKBTK#aZ#QFE%C&
zNwz<XI`t{^4c>r2(E(-Y&}p(nIGx>_{+qv_@!Z^|DL6|w@<>E1%C^9!P%;r$L75@+
z%;RwmMBGsalsZ`Y@88M7nj5_L7Z{zK&coUeM2IMoor}=bX*8;9Q~ZP!w!Kffb3tCi
zHH+ds#kK*#4=$bO%FeC-GBq`on|FYsBq1^e6B;C}fbNAbM|&_a5L1mK@E2<rK2f3H
z`RQ-sM79qPS}8aq0x183HrIijC4$bUuudRHoWmC#pbnR)S8hPX(j8D5lD5{TQ{Ha@
z=OEhqJvuu?vQ=_pu;R_FfCJauBs#bR8G0$sw~WgvCuqEm%mJTZ=?p)KB;BKOgBN3M
z)^(*y7?WJ_HLQg=2XUqGK#>w01xQzkP84e4!^F+YvCiVMc8M0wS?tc0==0x+5{Cnv
z_!E}Lq$z|Hm$}DgaD%tdX|7>xr?iIR$%9niwQ;w7Kh}bjiY}>q0{<YT!zCAe3U#oA
z=qdyzM<1bkuzM%T{`)~F!rf6o6d59;OC1y?BfhLG#mqejm$pc^mT*M}1wo8cG4b^t
ziDVX(_c2k#=Elax%Gu*<act1gy+H!tEJ0<MP8K02euY{19?AuX<LHK$WrWpX>N5|g
zw||!29s`v=PMtbkf5G#g_2dgKIClj=i3n+$U2|{0vEZyTLJ<@|YmGoMoG5Qvtf3Tr
zIS%U$>hyD+>s*J$#ijk{J@@I4z4Vfc{(u*HeSL%c{?m1@_XZin6Qn4=9c7AHD@f7<
z!mQ1iGiRDFc>Xh=P?#4AZhYe#@tyB{m%hF}jEQm#+8F<=155}}jwuMbU-wjFR?e>M
zKkJ!KeZ<8VUGQ7F<*OMS931`TH^2Lfsp*;Pr}?}@M2YzEk-siZR*a{3Rw@X#x3{x*
zzVj{byy(L7e*)Bi6lef-psnyB+89&I84{5Y&_D<TfGSaz09b32TumSXGJHS_AJVxB
XX6KFrt7I6{00000NkvXXu0mjf9|2@@

diff --git a/src/assets/img/files/writer-64.png b/src/assets/img/files/writer-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..6285b6ffafd8b1c30b20ec68df6aaaaac378d21d
GIT binary patch
literal 2836
zcmV+v3+wcWP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000WxNkl<ZcmdU#
z1#}}v(#L<*GeTRoHui>g_n5<+kC`#}F@=+3=DXm>%#7hj$IQ&^Fee)?86{a7&2-l%
z+x_m%n|R(zI`6am-&d{{7=BgNHPxdPRb?YNr--m>83_ju9^&*<PT){8s{hPu{^w24
zc>Y<ZH(Q-#e7p!w5o^IJI0tTh?Gj5+47lf>N98kL+po=qCvN`O|6O_WkDhQ8s%)YZ
z#Y@4<vj|y*<Vt@sN!$+tlKxR92&j}xTz%D*$;S>(KfiSBNx${TTtg%%GB?)+Yu8My
zgJgZ};)GJ6fNed_^QIe|{+lnLP(An5<BzJGpw_lytA?klkHBbt02FkcTMLEoGsc*Y
zuz@zL0BhZ=+U@8sdY-HTV+gd%e|$6H_OCU0Y;KtjA;vne2_z1Z7~%xF39b{fqgtSv
z9OS$cBL3jKv)Q$44<-<rD=~=$1k?d2f`WikKr^W7vmv1B{FCd>!{ETL!J**)=E=#i
zSN8((m;D4_d}Ss2MjR*47Lg3RU~Gp!|MUVke?4M8vNW}b(F9$~yz>D_Adaz7!gM)c
zvIl?R3s<<b2Vb8)9#6ADrZo+l$!I3WX?V?+e(I5eb&g7<_+Wi<>@-yxq!g->RYg^I
z02{-9W|3RJ88e?iE38sbhq?ftKfl?)D(tM5*^%tyyce{&?3d4GG7Fzw<t=j_dw1A3
zh=8-Y!&)svCIFyhq<{m-z(@SqXO_6_TQPHq&@POv!~3#Sz<aELsak;@@hs;(ugPUU
ze`Y>>_PI=^pUS2ww#;MAR7~n;C^$g-Zi1Q2_u!Yg{o6hG*w87I2~pGuAP^W2FIcrq
zRYU60Ue0^wBA5N#X-w|iwN>!hjWy6!fWVk__)jl!$4s&Y9~CPE_&?4VZ~zVs3{GLH
zY^Zmh;DTo?aOuySvi0x^<nt4X$i^=iL*P36>8BUDvj=~uyPEkbf%uXV5Cn`t9avSS
zio#?M{`{xUbLmf>+=JgeBJfI{Odh;(9scA~i`?;@nEes7L!WuyRRjS)Tv##eEE*=G
zC%ItHp&tB+qXUnk<SYE;U;d@k_1{t(AJ@P8%fH}Xzv;OB8xaQ+Au3b|@eNN67#{?M
zF0iwp)LMHvf6qZK`SBCh;TaKlzgAU*r%K4^sCw;~tN!5=Gw*r4HuXfKOH>*oGzJjF
z2mr!*5E2!p0>^mkaW34okKg~X7f~NUc;_6&QsK~4z4k)j5GjSv|Cvj{W5t~YJ9fX|
z@-NNRr}i$lXa^O4omUV8Y7h|+C9%SEQ5kDJ!9_jz-y2bQ`~u&%vI>9bcdkvB!;VtO
z)t`N6iMECWYH=2fF<>0(K#Za5gkwsMYIAQ7es(SMlOqa$xIP#*4m82bh=koSQ`R6v
zY>cWRAvnOW9)zy#!IzavqnG*J`?fE<S6HhR(nm(6P;lZ_z*^rK#s6qXG+^gy<{Nvt
zc+V>Q3EKo-b7z6DUN5IA02&>K#tB%9raEQU!7&wKyfw?kPdm81;1&Ns$tu*uftL!9
zKGFI2#}1AjGmNkFGXL~L{Qi%hxUDj;<SQh7<`=+ONG!w&=z1)6)<P!Qy@vP91^(bC
zPTF4ZeyzCyaG3yDha@p{6Rd^l$s&`{EEhg&kw5rJKih9Fc<=iPfUKuHPOwqTRK2uz
zq`lyI4KDea)0mv@5560B5D^AfxashKm-e#-1aS`AwM<n)>h1s+JbQ&pe)jaf;H@gx
z|MP8p{+stwEtl9VCDw9OZH#|?`%4Fd_iH7;3PRGapt!^`Q7+)xPjdeAI$ZLLXZL+G
z!>RV(do0g6u|m06V6)^@32}qLXRiYJ6<|qMfC&Ojr<eH`wYlV1&Kc-VPAG<}e);=J
zk}e{`W=fG^;JwdR=u7~31p&=NPw?|EX!Gko-^={e;J2~L#S#=sThQ?G;Z-&NhREK>
z=2ORE%%igh!k54DRHk~}-n!wsePW|NDj+<v@Y$c|EvxW@AG;U4y4`qr$FBM#)5q*S
z)reqm1HmiG_5X7F;7u^M>AmE8hgT1u+XEIq1$ag6PW_ob_J*)fdan`%gJ#~rrZhp{
z^fm=P_hyKf>_4<bnkp!iCW-;~JDVI0GVqYoiK9(vf{IWu#Z7^Cs+3E`Lr3qdKlO&l
z(Nhy-RBSfeMir33C%jTvT(vE0cv<+|2H+Jsr#Tq_8FIX}E?WWNmcgrEtI+@F0;>23
z3=V(&zutbtCc%Gv^ECs*qnZL3?Bj7j20hpu;Yo0CcpdJOp`lN8M`RKdEes8x`qF;@
zM20`o7J~wXo^9ox&%&#M<^;mz^?>i?Jg*v$3cPnZ=oT0r{>Fd1WAG-J+w`v91b9&L
z6>cUxy1A3!=D@4>0|Y?*j}VnXPj#6lxFroQ3-A3P6`<Z^@FQ&~Az>lh+C87myyg#s
zhI|cwo*yZA^*+A|ZYumu|FPNx?>i!s;NQOfis9h#evkktAVXw+Vyf2!PpDEZhMPMH
ziW?dp#arJ^&<_G41DE~p|J>PFXAy*a>EN&E@bK#Y4blXM-t%L{@{!r|GAul(Q{rxd
zsvB?%Y}1C9h3`aNRGsN*uqL=|;B&gZQzh!bce^orb|3SNFbwAU4}k9hqX_R`$GOzN
z;=d{as;EK|Cxl_h%F3a~{`607dRe_bsXb)_pt((8bm4`#8&j)Qn3xzRjuW5h1Q06K
z5=j!XysSL($Rkg_;dQS#|6AYs#>{}DFvtj&y&$w&Ey56vJ!TJ`PPA6ytyY9}j)__o
zRma@?GT-^mU9;D|^|cq>fB(H-Ef$MxB%?sq&=KDAz!Q5PCk%unu`D-QG#c%7_=zee
z5ccn%=R4n?nZ5RHuUm!xTo8oh$*^GrMi5>VL2#-pEiMv8G0kSXXC0hs4}J_|*5POF
zx_kE8x4-_P`|rEwvtbypk*u|=mOlt7AS0G}?{VtZ_I#t2h6fM7nt2Z&W^V5(Ns_Gk
zey#$5jMk;jAJ5l()Q#6N*em-y_!PJ!jxDN6R-rKl=UfI}MsUbUPlJkxtYzN0Bp2Q}
z=h^aQn#~5r2ti;-VUFyPR@WVsN{Jwl@4{b~f?tJBk|Y;CEpz6XXL9Ye*Ky#$!L=Y5
z5r7ee_ulX20|yqEnYnBBy0^dXqWgOA#+ZEY90^{vT8*1;zJ=a@pPyb>Y~0i7#8V<N
zQnNjPb&fB8=?gsL8P8(hfkU%zdDE*d>}CFQ45<LGZnw+3-t|sqXJ;!v^g}=L5+kPS
zRPjPLS}Q311ABM4`*t}&02G?77L8_;P87|)@eQxM_<{TH{VX8fy!_)qDgZEmD;A69
z3t#x+2TnNg)Sp^hY#`$Qm@IrY^I5<?GM@#7ys}?!Xx(^qylwFKV-Fp?{<^nbJ~Q*}
zj{xJT>z4E0uf2iItkoOh%>V^&dd3-NocLFN{kMO%d)L!Xj^i#~l09mIieGrwcjhy%
zXRr5UtAQj*R!tsw;J!!y<d1Lor<s|VuL0E@SZ~DMBB0|f^3NrJ^8p|LLZAp#0LtZZ
zbz-8nOI3?N=q>QUlFZtB1jKtt`Mh;jn(^QZK|~P|x3sj}h@z+q6jRWe2|$vvt_N>>
zi~Mu34*=Op@WH?Uq(Hs*mI2Q(vOYfu=wSk(-o%@xEE|Mu=_lS?$}6BkzH+nYjeNj-
m(0(c)`*?tAafb_PR{swIiXmdG)Mi=$0000<MNUMnLSTY>V3J+{

literal 0
HcmV?d00001

diff --git a/src/assets/img/files/writer.png b/src/assets/img/files/writer.png
deleted file mode 100644
index eb8e7cf1a84ae55eb84797d574d0fe0ce72b69b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1113
zcmV-f1g86mP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000CaNkl<Zcmb7D
z1F-E#6zrKyl8a}X_4ldv7uL3I+q;Fe3v1iuTHCg5+upralABEa+)Q$79;<#=I-WkA
zJ}1QYebm4?U(UHd!I<WpciFYE7xI$_^^Ht+qEhkPl8v~VHU?VRTjw6N?o(ooE|<x*
zzOobdHA?AUx~{zefuMlcx=JPM3q$ie{>oZ7?#U8f`MCnWQiheYuufwNHyySN(-Wh}
zi(-&#5Sf!2fqZn&Z)<H_oiX|$3+pCh49&l$EFAJk25<eV!O$5hj)}GVv$%P$2`n2O
zK)z@Lh{P0eDB@z{J|~{X6O>Z0-+%oHaZ~s5UXmaDa0c(BO(f$KW!uF@?f>GYod+>G
z*pIU1&KCFQJNK1)QD|(_T@OP~Z*Q}{#o5MNskjgatSYcx!+*GWhc1i^^r7smjJRYC
zM3Ak0*iG;VnSTBckLaX|a)n^MrvGu%_HA`>_)CjN_YjKLV<Q0TZcCz4<wUd7uv`&K
zS53S}#3ID)MVw=C=k<uff{avM5aH6vmau8RgIjhV#Xx^g;GBaal_`Ky0zhr7yy6^a
zP9_xRP^L@1%NY0IiO|<<&Ebl@Cooux#jXZ#{+})2&Zl38Y3i5@&V3Q5g?+YOAMFjv
zKv<0^0{iHb-@&Mh3lEyW`0xPAR<#~WTT=tJU3WP&jY5UzadfmcBVm|PWKtY+dLYPp
z*k9=BZu@F{q~EXDE>Sa27s`0zy>AgSbf~Dh9;Qcnu<q1o-8rArhX^FRF_bS<zV$gb
z=Qi}`fBu6;DO3<am-FCj$GSU$_c@<kpu4+mebdn2VBrHQc4V%2*>UjQAOAyV8dMNM
z;Cdd4WeYv+%`i1>mN*xTtT0F@-N&q4xm^bL7!(BJ!+qTtoEVkwM(!1c*+E&Uip!&^
z>lhyBo!4aU`RHtIT5$e(STKU}1+&E=m@bs?)axH3Hg8M`IOix;EbJ@Bv?&&YKlcv@
z1l0oS9~-_HHw|pK`V3f@u|#A*Hacz?VeVX+AW~aHm`0U|qyx3dLGxA}?vrlRQRMSu
zi8L6~k;~@FKm720Dv^kTK`vLtqjNQ~MF@DF2VoY;WCA`2ve}$_>S-q&`o?Q7ePx<4
zP(p~B-^z#wux%Uv{rfK{W%%dc|EwdAIP`$$pMB~c%d$nWESTdsFbq>|u8ac$ymnMX
zxf%-xK;)59{P+L=&e2C6y3gBhz5cK?EgjHx*If@Uzx*<3NG6G<X`lfaG%C+ET4(f3
zkjiUH19RzA+B)*^L-weNM?;|g^=NEtY`OQ|2OnQ$VscGKK)gUgr(|v{>NO#hrZZ{p
z>@!a}_wBdeybVB7uqs#)EC^a8ETYBZ@uox~(JdBg;rMETR6bWI;Y$)!tBzeL6mkFz
fL02hI6tq_WpjfD1malm{00000NkvXXu0mjf8XOyo

diff --git a/src/core/services/utils/mimetype.ts b/src/core/services/utils/mimetype.ts
index 386a6f267..d8e4610ed 100644
--- a/src/core/services/utils/mimetype.ts
+++ b/src/core/services/utils/mimetype.ts
@@ -280,7 +280,7 @@ export class CoreMimetypeUtilsProvider {
      * @return The path to a folder icon.
      */
     getFolderIcon(): string {
-        return 'assets/img/files/folder.png';
+        return 'assets/img/files/folder-64.png';
     }
 
     /**
@@ -290,7 +290,7 @@ export class CoreMimetypeUtilsProvider {
      * @return The icon path.
      */
     getFileIconForType(type: string): string {
-        return `assets/img/files/${type}.png`;
+        return 'assets/img/files/' + type + '-64.png';
     }
 
     /**

From cff39f065f9a133a0d82b54e9e6aad5c67d526bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 5 Apr 2022 15:49:23 +0200
Subject: [PATCH 0927/1008] MOBILE-3833 badges: Fix missing expired overlay

---
 .../badges/components/badges/badges.scss      | 53 +++++++++++++------
 src/assets/img/expired.svg                    |  1 +
 .../h5p/components/h5p-player/h5p-player.scss |  2 +-
 3 files changed, 39 insertions(+), 17 deletions(-)
 create mode 100644 src/assets/img/expired.svg

diff --git a/src/addons/block/badges/components/badges/badges.scss b/src/addons/block/badges/components/badges/badges.scss
index 5ca9725d5..539340b70 100644
--- a/src/addons/block/badges/components/badges/badges.scss
+++ b/src/addons/block/badges/components/badges/badges.scss
@@ -1,21 +1,42 @@
-:host .core-block-content ::ng-deep {
-    ul.badges {
-        list-style: none;
-        margin-left: 0;
-        margin-right: 0;
-        -webkit-padding-start: 0;
+:host {
+    --badge-size: 100px;
+    --badge-container-size: 150px;
 
-        li {
-            position: relative;
-            display: inline-block;
-            padding-top: 1em;
-            text-align: center;
-            vertical-align: top;
-            width: 150px;
+    .core-block-content ::ng-deep {
 
-            .badge-name {
-                display: block;
-                padding: 5px;
+        ul.badges {
+            list-style: none;
+            margin: 0;
+
+            li {
+                position: relative;
+                display: inline-block;
+                text-align: center;
+                margin-top: 1em;
+                vertical-align: top;
+                width: var(--badge-container-size);
+
+                .badge-name {
+                    display: block;
+                    padding: 5px;
+                }
+                .badge-image {
+                    width: var(--badge-size);
+                }
+
+                .expireimage {
+                    content: 'expired';
+                    background-image: url('/assets/img/expired.svg');
+                    background-repeat: no-repeat;
+                    background-size: var(--badge-size) var(--badge-size);
+                    width: var(--badge-size);
+                    height: var(--badge-size);
+                    left: calc((var(--badge-container-size) - var(--badge-size)) /2);
+                    top: 0;
+                    position: absolute;
+                    z-index: 2;
+                    opacity: .85;
+                }
             }
         }
     }
diff --git a/src/assets/img/expired.svg b/src/assets/img/expired.svg
new file mode 100644
index 000000000..adaaf862d
--- /dev/null
+++ b/src/assets/img/expired.svg
@@ -0,0 +1 @@
+<svg width="150" height="150" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMinYMid meet"><title>Layer 1</title><path stroke="#fff" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="8" fill="none" d="M6.773 112.162L113.546 5.39l29.7 29.698L36.47 141.86z"/><path stroke-width="5" stroke="#bf3b08" fill="none" d="M7 112.066L113.066 6l29.34 29.34L36.342 141.408z"/><text stroke="#fff" fill="#bf3b08" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" x="72.605" y="79.727" font-size="20" font-family="Sans-serif" text-anchor="middle" font-weight="bold" transform="rotate(-45 74.918 71.252) scale(1.00967 1)">E X P I R E D</text></svg>
\ No newline at end of file
diff --git a/src/core/features/h5p/components/h5p-player/h5p-player.scss b/src/core/features/h5p/components/h5p-player/h5p-player.scss
index 1761f096a..4644e74b4 100644
--- a/src/core/features/h5p/components/h5p-player/h5p-player.scss
+++ b/src/core/features/h5p/components/h5p-player/h5p-player.scss
@@ -6,7 +6,7 @@
         position: relative;
         width: 100%;
         height: 230px;
-        background: url('../../../../../assets/img/icons/h5p.svg') center top 25px / 100px auto no-repeat var(--core-h5p-placeholder-bg-color);
+        background: url('/assets/img/icons/h5p.svg') center top 25px / 100px auto no-repeat var(--core-h5p-placeholder-bg-color);
         color: var(--core-h5p-placeholder-text-color);
 
         .icon:not([color="success"]) {

From e8c94a3a80016d999751ee803448544c985e17b8 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 5 Apr 2022 15:52:24 +0200
Subject: [PATCH 0928/1008] MOBILE-4022 core: Use new setting
 autologinmintimebetweenreq

---
 src/core/classes/site.ts | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/core/classes/site.ts b/src/core/classes/site.ts
index dc2644d60..693830b19 100644
--- a/src/core/classes/site.ts
+++ b/src/core/classes/site.ts
@@ -1746,12 +1746,23 @@ export class CoreSite {
      * @return Promise resolved with the converted URL.
      */
     async getAutoLoginUrl(url: string, showModal: boolean = true): Promise<string> {
-        if (!this.privateToken || (this.lastAutoLogin &&
-                CoreTimeUtils.timestamp() - this.lastAutoLogin < CoreConstants.SECONDS_MINUTE * 6)) {
-            // No private token, WS not available or last auto-login was less than 6 minutes ago. Don't change the URL.
+        if (!this.privateToken) {
+            // No private token, don't change the URL.
             return url;
         }
 
+        if (this.lastAutoLogin > 0) {
+            const timeBetweenRequests = await CoreUtils.ignoreErrors(
+                this.getConfig('tool_mobile_autologinmintimebetweenreq'),
+                CoreConstants.SECONDS_MINUTE * 6,
+            );
+
+            if (CoreTimeUtils.timestamp() - this.lastAutoLogin < timeBetweenRequests) {
+                // Not enough time has passed since last auto login.
+                return url;
+            }
+        }
+
         const userId = this.getUserId();
         const params = {
             privatetoken: this.privateToken,

From 2cba36d3de1a3af76a3e681bcc6e6e8b660b7dbd Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 6 Apr 2022 08:38:09 +0200
Subject: [PATCH 0929/1008] MOBILE-3833 lesson: Fix header wrong position

---
 .../components/index/addon-mod-lesson-index.html     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
index d039f0303..a02bbbc11 100644
--- a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
+++ b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
@@ -7,16 +7,16 @@
 
 <!-- Content. -->
 <core-loading [hideUntil]="!showLoading">
+
+    <!-- Activity info. -->
+    <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
+        [courseId]="courseId" [hasDataToSync]="hasOffline" (completionChanged)="onCompletionChange()">
+    </core-course-module-info>
+
     <core-tabs [hideUntil]="!showLoading" [selectedIndex]="selectedTab">
         <!-- Index/Preview tab. -->
         <core-tab [title]="'addon.mod_lesson.preview' | translate" (ionSelect)="indexSelected()">
             <ng-template>
-
-                <!-- Activity info. -->
-                <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
-                    [courseId]="courseId" [hasDataToSync]="hasOffline" (completionChanged)="onCompletionChange()">
-                </core-course-module-info>
-
                 <!-- Prevent access messages. Only show the first one. -->
                 <ion-card class="core-info-card" *ngIf="lesson && preventReasons.length">
                     <ion-item>

From 9a724f2b1c78e9a633f1258f709d785f4d3b2633 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 6 Apr 2022 08:51:03 +0200
Subject: [PATCH 0930/1008] MOBILE-3833 book: Fix current chapter not marked in
 TOC

---
 src/addons/mod/book/pages/contents/contents.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/addons/mod/book/pages/contents/contents.ts b/src/addons/mod/book/pages/contents/contents.ts
index 1f8ebb2b9..865279a06 100644
--- a/src/addons/mod/book/pages/contents/contents.ts
+++ b/src/addons/mod/book/pages/contents/contents.ts
@@ -253,7 +253,7 @@ export class AddonModBookContentsPage implements OnInit, OnDestroy {
             componentProps: {
                 moduleId: this.cmId,
                 chapters: this.chapters,
-                selected: visibleChapter,
+                selected: visibleChapter?.id,
                 courseId: this.courseId,
                 book: this.book,
             },

From 5c3fe58ed7b85cd7ac38e209166c0a905fe5ddec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 6 Apr 2022 09:29:08 +0200
Subject: [PATCH 0931/1008] MOBILE-3833 storage: Fix hover style state

---
 .../pages/course-storage/course-storage.html  |  8 +--
 .../pages/course-storage/course-storage.scss  | 55 ++++++++++---------
 2 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.html b/src/addons/storagemanager/pages/course-storage/course-storage.html
index 1d0182cf1..d0801b848 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.html
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.html
@@ -47,8 +47,8 @@
         <ng-container *ngFor="let section of sections">
             <ion-card class="section" *ngIf="section.modules.length > 0">
                 <ion-card-header>
-                    <ion-item class="ion-no-padding" [lines]="section.expanded ? 'full' : 'none'" button detail="false"
-                        (click)="toggleExpand($event, section)" [class.core-course-storage-section-expanded]="section.expanded"
+                    <ion-item [lines]="section.expanded ? 'full' : 'none'" button detail="false" (click)="toggleExpand($event, section)"
+                        [class.core-course-storage-section-expanded]="section.expanded"
                         [attr.aria-label]="(section.expanded ? 'core.collapse' : 'core.expand') | translate"
                         [attr.aria-expanded]="section.expanded" [attr.aria-controls]="'core-course-storage-section-' + section.id">
                         <ion-icon name="fas-chevron-right" flip-rtl slot="start" class="expandable-status-icon"
@@ -99,10 +99,10 @@
                         </div>
                     </ion-item>
                 </ion-card-header>
-                <ion-card-content id="core-course-storage-section-{{section.id}}" [ngClass]="{'hidden-content': !section.expanded}">
+                <ion-card-content id="core-course-storage-section-{{section.id}}">
                     <ng-container *ngIf="section.expanded">
                         <ng-container *ngFor="let module of section.modules">
-                            <ion-item class="ion-no-padding core-course-storage-activity"
+                            <ion-item class="core-course-storage-activity"
                                 *ngIf="downloadEnabled || (!module.calculatingSize && module.totalSize > 0)">
                                 <core-mod-icon slot="start" *ngIf="module.handlerData.icon" [modicon]="module.handlerData.icon"
                                     [modname]="module.modname" [componentId]="module.instance">
diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.scss b/src/addons/storagemanager/pages/course-storage/course-storage.scss
index 8682b14eb..cf6193060 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.scss
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.scss
@@ -3,36 +3,41 @@
 :host {
     --course-storage-max-activity-height: 120px;
 
-    ion-card ion-item {
+    ion-card ion-item.size {
         --inner-padding-end: 0px;
     }
 
-    ion-card.section ion-card-header {
-        padding-top: 8px;
-        padding-bottom: 8px;
-    }
-    ion-card.section .item-heading {
-        font-weight: bold;
-        font-size: 1.2rem;
-    }
+    ion-card.section {
+        ion-card-header {
+            padding: 0;
+        }
+        ion-card-content {
+            padding: 0;
 
-    ion-card-content.hidden-content {
-        padding: 0;
-    }
+            .core-course-storage-activity ion-label {
+                h3 {
+                    position: relative;
+                    max-height: var(--course-storage-max-activity-height);
+                    overflow: hidden;
+                    ::ng-deep * {
+                        pointer-events: none !important;
+                    }
 
-    .core-course-storage-activity ion-label h3 {
-        position: relative;
-        max-height: var(--course-storage-max-activity-height);
-
-        &:before {
-            content: '';
-            height: 100%;
-            min-height: var(--course-storage-max-activity-height);
-            position: absolute;
-            @include position(0, 0, null, 0);
-            background: linear-gradient(to bottom, rgba(var(--background-gradient-rgb), 0) calc(100% - 30px), rgba(var(--background-gradient-rgb), 1) calc(100% - 20px));
-            z-index: 6;
-            pointer-events: none;
+                    &:before {
+                        content: '';
+                        height: var(--course-storage-max-activity-height);
+                        position: absolute;
+                        @include position(0, 0, null, 0);
+                        background: linear-gradient(to bottom, rgba(var(--background-gradient-rgb), 0) calc(100% - 30px), rgba(var(--background-gradient-rgb), 1) calc(100% - 20px));
+                        z-index: 6;
+                        pointer-events: none;
+                    }
+                }
+            }
+        }
+        .item-heading {
+            font-weight: bold;
+            font-size: 1.2rem;
         }
     }
 }

From be8ed25daaaa9635ff64ed063e5bcd935af92673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 6 Apr 2022 09:50:17 +0200
Subject: [PATCH 0932/1008] MOBILE-3833 course: Deprecate skipListStatus on
 prefetch handlers

---
 src/addons/mod/label/services/handlers/prefetch.ts          | 1 -
 src/core/features/course/classes/module-prefetch-handler.ts | 6 ------
 .../features/course/services/module-prefetch-delegate.ts    | 4 +++-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/addons/mod/label/services/handlers/prefetch.ts b/src/addons/mod/label/services/handlers/prefetch.ts
index 50feb8c62..72f153fa5 100644
--- a/src/addons/mod/label/services/handlers/prefetch.ts
+++ b/src/addons/mod/label/services/handlers/prefetch.ts
@@ -31,7 +31,6 @@ export class AddonModLabelPrefetchHandlerService extends CoreCourseResourcePrefe
     modName = 'label';
     component = AddonModLabelProvider.COMPONENT;
     updatesNames = /^.*files$/;
-    skipListStatus = true;
 
     /**
      * @inheritdoc
diff --git a/src/core/features/course/classes/module-prefetch-handler.ts b/src/core/features/course/classes/module-prefetch-handler.ts
index ab9bf9fda..79dfd6bc7 100644
--- a/src/core/features/course/classes/module-prefetch-handler.ts
+++ b/src/core/features/course/classes/module-prefetch-handler.ts
@@ -47,12 +47,6 @@ export class CoreCourseModulePrefetchHandlerBase implements CoreCourseModulePref
      */
     updatesNames = /^.*files$/;
 
-    /**
-     * If true, this module will be ignored when determining the status of a list of modules. The module will
-     * still be downloaded when downloading the section/course, it only affects whether the button should be displayed.
-     */
-    skipListStatus = false;
-
     /**
      * List of download promises to prevent downloading the module twice at the same time.
      */
diff --git a/src/core/features/course/services/module-prefetch-delegate.ts b/src/core/features/course/services/module-prefetch-delegate.ts
index 91e069b40..992e069e8 100644
--- a/src/core/features/course/services/module-prefetch-delegate.ts
+++ b/src/core/features/course/services/module-prefetch-delegate.ts
@@ -1361,8 +1361,10 @@ export interface CoreCourseModulePrefetchHandler extends CoreDelegateHandler {
     /**
      * If true, this module will be treated as not downloadable when determining the status of a list of modules. The module will
      * still be downloaded when downloading the section/course, it only affects whether the button should be displayed.
+     *
+     * @depracated since app 4.0.
      */
-    skipListStatus: boolean;
+    skipListStatus?: boolean;
 
     /**
      * Get the download size of a module.

From 6bf1bb7cb4748b74465ed9332b9a27737b849952 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 6 Apr 2022 10:17:49 +0200
Subject: [PATCH 0933/1008] MOBILE-3833 style: Center toast message and buttons
 on small screens

---
 src/theme/theme.base.scss | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 6efa32011..81ce547f4 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -501,10 +501,6 @@ ion-toast {
     @include media-breakpoint-down(sm) {
         &::part(container) {
             flex-direction: column;
-            align-items: flex-end;
-        }
-        &::part(message) {
-            align-self: flex-start;
         }
     }
 }

From 9de662f8964e16767e53727b01d47ca59b34bf42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 6 Apr 2022 10:58:36 +0200
Subject: [PATCH 0934/1008] MOBILE-3833 timeline: Import styles from myoverview

---
 .../events/addon-block-timeline-events.html   |  2 +-
 .../timeline/addon-block-timeline.html        | 29 +++++------
 .../components/timeline/timeline.scss         | 38 +++++++++++++++
 .../timeline/components/timeline/timeline.ts  |  1 +
 .../search-box/core-search-box.html           | 48 +++++++++----------
 .../components/search-box/search-box.scss     | 29 +++++++----
 6 files changed, 98 insertions(+), 49 deletions(-)
 create mode 100644 src/addons/block/timeline/components/timeline/timeline.scss

diff --git a/src/addons/block/timeline/components/events/addon-block-timeline-events.html b/src/addons/block/timeline/components/events/addon-block-timeline-events.html
index b370beae4..5244492db 100644
--- a/src/addons/block/timeline/components/events/addon-block-timeline-events.html
+++ b/src/addons/block/timeline/components/events/addon-block-timeline-events.html
@@ -53,7 +53,7 @@
                         </ion-row>
                     </ion-col>
                     <ion-col class="addon-block-timeline-activity-action ion-no-padding" *ngIf="event.action?.actionable">
-                        <ion-button fill="outline" (click)="action($event, event.action.url)" [title]="event.action.name">
+                        <ion-button fill="outline" (click)="action($event, event.action.url)" [title]="event.action.name" class="chip">
                             {{event.action.name}}
                             <ion-badge slot="end" class="ion-margin-start" *ngIf="event.action.showitemcount">
                                 {{event.action.itemcount}}
diff --git a/src/addons/block/timeline/components/timeline/addon-block-timeline.html b/src/addons/block/timeline/components/timeline/addon-block-timeline.html
index 949692cb2..c494a8f6f 100644
--- a/src/addons/block/timeline/components/timeline/addon-block-timeline.html
+++ b/src/addons/block/timeline/components/timeline/addon-block-timeline.html
@@ -4,13 +4,21 @@
     </ion-label>
 </ion-item-divider>
 <core-loading [hideUntil]="loaded">
-    <ion-row class="ion-no-padding ion-justify-content-between ion-align-items-center">
-        <ion-col size="auto" class="ion-no-padding">
-            <core-combobox [selection]="filter" (onChange)="switchFilter($event)" icon="fas-filter">
+    <ion-row class="ion-hide-md-up addon-block-timeline-filter" *ngIf="searchEnabled">
+        <ion-col>
+            <!-- Filter courses. -->
+            <core-search-box (onSubmit)="searchTextChanged($event)" (onClear)="searchTextChanged()"
+                [placeholder]="'addon.block_timeline.searchevents' | translate" autocorrect="off" spellcheck="false" lengthCheck="2"
+                searchArea="AddonBlockTimeline"></core-search-box>
+        </ion-col>
+    </ion-row>
+    <ion-row class="ion-justify-content-between ion-align-items-center addon-block-timeline-filter">
+        <ion-col size="auto">
+            <core-combobox [selection]="filter" (onChange)="switchFilter($event)">
                 <ion-select-option class="ion-text-wrap" value="all">
                     {{ 'core.all' | translate }}
                 </ion-select-option>
-                <ion-select-option class="ion-text-wrap" value="overdue">
+                <ion-select-option class="ion-text-wrap core-select-option-border-bottom" value="overdue">
                     {{ 'addon.block_timeline.overdue' | translate }}
                 </ion-select-option>
                 <ion-select-option class="ion-text-wrap core-select-option-title" disabled value="disabled">
@@ -30,13 +38,13 @@
                 </ion-select-option>
             </core-combobox>
         </ion-col>
-        <ion-col class="ion-no-padding ion-hide-md-down" *ngIf="searchEnabled">
+        <ion-col class="ion-hide-md-down" *ngIf="searchEnabled">
             <!-- Filter courses. -->
             <core-search-box (onSubmit)="searchTextChanged($event)" (onClear)="searchTextChanged()"
                 [placeholder]="'addon.block_timeline.searchevents' | translate" autocorrect="off" spellcheck="false" lengthCheck="2"
                 searchArea="AddonBlockTimeline"></core-search-box>
         </ion-col>
-        <ion-col size="auto" class="ion-no-padding">
+        <ion-col size="auto">
             <core-combobox [label]="'core.sortby' | translate" [selection]="sort" (onChange)="switchSort($event)"
                 icon="fas-sort-amount-down-alt">
                 <ion-select-option class="ion-text-wrap" value="sortbydates">
@@ -48,14 +56,7 @@
             </core-combobox>
         </ion-col>
     </ion-row>
-    <ion-row class="ion-no-padding ion-hide-md-up" *ngIf="searchEnabled">
-        <ion-col class="ion-no-padding">
-            <!-- Filter courses. -->
-            <core-search-box (onSubmit)="searchTextChanged($event)" (onClear)="searchTextChanged()"
-                [placeholder]="'addon.block_timeline.searchevents' | translate" autocorrect="off" spellcheck="false" lengthCheck="2"
-                searchArea="AddonBlockTimeline"></core-search-box>
-        </ion-col>
-    </ion-row>
+
 
     <core-loading [hideUntil]="timeline.loaded" [hidden]="sort != 'sortbydates'">
         <addon-block-timeline-events [events]="timeline.events" [canLoadMore]="timeline.canLoadMore" (loadMore)="loadMore()"
diff --git a/src/addons/block/timeline/components/timeline/timeline.scss b/src/addons/block/timeline/components/timeline/timeline.scss
new file mode 100644
index 000000000..aab42b195
--- /dev/null
+++ b/src/addons/block/timeline/components/timeline/timeline.scss
@@ -0,0 +1,38 @@
+:host {
+    ion-row.addon-block-timeline-filter {
+        margin: 8px;
+        padding: 0;
+
+        ion-col {
+            padding: 0;
+            margin-right: 2px;
+            margin-left: 2px;
+        }
+
+        ion-button,
+        core-combobox ::ng-deep ion-button {
+            --border-width: 0;
+            --a11y-min-target-size: 40px;
+            margin: 0;
+
+            .select-icon {
+                display: none;
+            }
+            ion-icon {
+                font-size: 20px;
+            }
+        }
+
+        core-combobox ::ng-deep ion-select {
+            margin: 0;
+            --a11y-min-target-size: 40px;
+        }
+
+       core-search-box {
+            padding: 0;
+            margin: 0;
+            --height: 40px;
+        }
+    }
+
+}
diff --git a/src/addons/block/timeline/components/timeline/timeline.ts b/src/addons/block/timeline/components/timeline/timeline.ts
index ce962f59f..e26045dd8 100644
--- a/src/addons/block/timeline/components/timeline/timeline.ts
+++ b/src/addons/block/timeline/components/timeline/timeline.ts
@@ -31,6 +31,7 @@ import { CoreNavigator } from '@services/navigator';
 @Component({
     selector: 'addon-block-timeline',
     templateUrl: 'addon-block-timeline.html',
+    styleUrls: ['timeline.scss'],
 })
 export class AddonBlockTimelineComponent extends CoreBlockBaseComponent implements OnInit {
 
diff --git a/src/core/features/search/components/search-box/core-search-box.html b/src/core/features/search/components/search-box/core-search-box.html
index 66dedb5c2..675a7f9b0 100644
--- a/src/core/features/search/components/search-box/core-search-box.html
+++ b/src/core/features/search/components/search-box/core-search-box.html
@@ -1,26 +1,24 @@
-<ion-card>
-    <form (ngSubmit)="submitForm($event)" role="search" #searchForm>
-        <ion-item>
-            <ion-label class="sr-only">{{ placeholder }}</ion-label>
-            <ion-input type="search" name="search" [(ngModel)]="searchText" [placeholder]="placeholder" [autocorrect]="autocorrect"
-                [spellcheck]="spellcheck" [core-auto-focus]="autoFocus" [disabled]="disabled" role="searchbox" (ionFocus)="focus($event)">
-            </ion-input>
-            <ion-button slot="end" fill="clear" type="submit" [attr.aria-label]="searchLabel"
-                [disabled]="disabled || !searchText || (searchText.length < lengthCheck)">
-                <ion-icon name="fas-search" slot="icon-only" aria-hidden="true"></ion-icon>
-            </ion-button>
-            <ion-button *ngIf="showClear" slot="end" fill="clear" [attr.aria-label]="'core.clearsearch' | translate"
-                [disabled]="searched == '' || disabled" (click)="clearForm()">
-                <ion-icon name="fas-backspace" slot="icon-only" aria-hidden="true" flip-rtl></ion-icon>
-            </ion-button>
+<form (ngSubmit)="submitForm($event)" role="search" #searchForm>
+    <ion-item class="search-box">
+        <ion-label class="sr-only">{{ placeholder }}</ion-label>
+        <ion-input type="search" name="search" [(ngModel)]="searchText" [placeholder]="placeholder" [autocorrect]="autocorrect"
+            [spellcheck]="spellcheck" [core-auto-focus]="autoFocus" [disabled]="disabled" role="searchbox" (ionFocus)="focus($event)">
+        </ion-input>
+        <ion-button slot="end" fill="clear" type="submit" [attr.aria-label]="searchLabel"
+            [disabled]="disabled || !searchText || (searchText.length < lengthCheck)">
+            <ion-icon name="fas-search" slot="icon-only" aria-hidden="true"></ion-icon>
+        </ion-button>
+        <ion-button *ngIf="showClear" slot="end" fill="clear" [attr.aria-label]="'core.clearsearch' | translate"
+            [disabled]="searched == '' || disabled" (click)="clearForm()">
+            <ion-icon name="fas-backspace" slot="icon-only" aria-hidden="true" flip-rtl></ion-icon>
+        </ion-button>
+    </ion-item>
+    <ion-list class="core-search-history" [hidden]="!historyShown">
+        <ion-item button class="ion-text-wrap" *ngFor="let item of history" (click)="historyClicked($event, item.searchedtext)" tabindex="0"
+            detail="true">
+            <ion-icon name="fas-history" slot="start" aria-hidden="true">
+            </ion-icon>
+            <ion-label>{{item.searchedtext}}</ion-label>
         </ion-item>
-        <ion-list class="core-search-history" [hidden]="!historyShown">
-            <ion-item button class="ion-text-wrap" *ngFor="let item of history" (click)="historyClicked($event, item.searchedtext)"
-                tabindex="0" detail="true">
-                <ion-icon name="fas-history" slot="start" aria-hidden="true">
-                </ion-icon>
-                <ion-label>{{item.searchedtext}}</ion-label>
-            </ion-item>
-        </ion-list>
-    </form>
-</ion-card>
+    </ion-list>
+</form>
diff --git a/src/core/features/search/components/search-box/search-box.scss b/src/core/features/search/components/search-box/search-box.scss
index 958a5edc7..698da8e5b 100644
--- a/src/core/features/search/components/search-box/search-box.scss
+++ b/src/core/features/search/components/search-box/search-box.scss
@@ -1,29 +1,40 @@
 :host {
-    min-height: var(--a11y-min-target-size);
+    --height: var(--a11y-min-target-size);
+    --search-height: calc(var(--height) - 2px);
+    min-height: var(--height);
     display: block;
     position: relative;
     margin: 8px;
 
-    ion-card {
+    form {
         position: absolute;
         left: 0;
         right: 0;
         z-index: 4;
         margin: 0;
-        --border-color: var(--core-search-box-border-color);
-        --border-radius: var(--core-search-box-border-radius);
-        --background: var(--core-search-box-background);
-        --color: var(--core-search-box-border-color);
+        border: 1px solid var(--core-search-box-border-color);
+        border-radius: var(--core-search-box-border-radius);
+        background: var(--core-search-box-background);
+        color: var(--core-search-box-border-color);
+
+        .search-box {
+            --min-height: var(--search-height);
+            border-radius: var(--core-search-box-border-radius);
+        }
+
+        ion-button.button {
+            margin: 0;
+            --a11y-min-target-size: var(--search-height);
+        }
     }
 
-    ion-button.button {
-        margin: 0;
-    }
+
 
     .core-search-history {
         max-height: calc(-120px + 80vh);
         overflow-y: auto;
         background: var(--core-search-box-background);
+        border-radius: 0 0 var(--core-search-box-border-radius) var(--core-search-box-border-radius);
         --ion-item-background: var(--core-search-box-background);
 
         .item:hover {

From 77cbaa1f966b32400492c3b4d63517575d02912e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 6 Apr 2022 11:04:35 +0200
Subject: [PATCH 0935/1008] MOBILE-3833 style: Margin on chip slotted icons

---
 src/theme/theme.base.scss | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 81ce547f4..e71e36640 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -1050,9 +1050,16 @@ ion-button.chip {
     ion-icon {
         font-size: 16px;
         min-width: 16px;
+    }
+
+    ion-icon[slot=start] {
         @include margin(0, 8px, 0, 0);
     }
 
+    ion-icon[slot=end] {
+        @include margin(0, 0, 0, 8px);
+    }
+
     ion-label {
         white-space: normal !important;
     }

From a251482349348c854e40559a7615b2695b6320fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 6 Apr 2022 11:17:36 +0200
Subject: [PATCH 0936/1008] MOBILE-3833 storage: Do not show info text if
 downloads are disabled

---
 .../storagemanager/pages/course-storage/course-storage.html   | 2 +-
 src/theme/theme.base.scss                                     | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.html b/src/addons/storagemanager/pages/course-storage/course-storage.html
index d0801b848..84fb399a2 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.html
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.html
@@ -10,7 +10,7 @@
 </ion-header>
 <ion-content class="limited-width">
     <core-loading [hideUntil]="loaded">
-        <ion-item class="ion-text-wrap">
+        <ion-item class="ion-text-wrap" *ngIf="downloadCourseEnabled">
             <ion-label>
                 <p>{{ 'addon.storagemanager.courseinfo' | translate }}</p>
             </ion-label>
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index e71e36640..32100b047 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -844,6 +844,10 @@ ion-card {
     ion-item:only-child {
         --inner-border-width: 0px;
     }
+
+    ion-card-title {
+        font-size: 20px;
+    }
 }
 
 .core-course-module-handler:not(.addon-mod-label-handler) .item-heading .filter_mathjaxloader_equation div {

From f833fa0099279166cc9b24ac73ecad8b379cbc21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 6 Apr 2022 14:22:41 +0200
Subject: [PATCH 0937/1008] MOBILE-3833 travis: Install build tools only on
 Android job

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9b254f518..1caac3334 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,6 @@ before_install:
   - npm --version
   - nvm --version
   - npm ci
-  - yes | sdkmanager "build-tools;30.0.3"
 
 before_script:
   - npx gulp
@@ -47,6 +46,8 @@ jobs:
       - extra-google-google_play_services
       - extra-google-m2repository
       - extra-android-m2repository
+    before_install:
+      - yes | sdkmanager "build-tools;30.0.3"
     addons:
       apt:
         packages:

From 19ea3beb2bc6678482a75f348ef8d9ecd29ec55a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 6 Apr 2022 14:54:13 +0200
Subject: [PATCH 0938/1008] MOBILE-3833 travis: Fix install build tools only on
 Android job

---
 .travis.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 1caac3334..e66761bab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,6 +47,12 @@ jobs:
       - extra-google-m2repository
       - extra-android-m2repository
     before_install:
+      - nvm install
+      - npm install npm@^7 -g
+      - node --version
+      - npm --version
+      - nvm --version
+      - npm ci
       - yes | sdkmanager "build-tools;30.0.3"
     addons:
       apt:

From 7236dd34c1c4d35f0ac759f6628ce1085dc3eb6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 6 Apr 2022 12:40:12 +0200
Subject: [PATCH 0939/1008] MOBILE-3833 user-tours: Listen to changes on scroll
 and resize

---
 .../components/user-tour/user-tour.ts         | 112 +++++++++++++++---
 src/core/singletons/dom.ts                    |  27 +++++
 2 files changed, 120 insertions(+), 19 deletions(-)

diff --git a/src/core/features/usertours/components/user-tour/user-tour.ts b/src/core/features/usertours/components/user-tour/user-tour.ts
index fc32a9f99..997ffab92 100644
--- a/src/core/features/usertours/components/user-tour/user-tour.ts
+++ b/src/core/features/usertours/components/user-tour/user-tour.ts
@@ -13,7 +13,17 @@
 // limitations under the License.
 
 import { BackButtonEvent } from '@ionic/core';
-import { AfterViewInit, Component, ElementRef, EventEmitter, HostBinding, Input, Output, ViewChild } from '@angular/core';
+import {
+    AfterViewInit,
+    Component,
+    ElementRef,
+    EventEmitter,
+    HostBinding,
+    Input,
+    OnDestroy,
+    Output,
+    ViewChild,
+} from '@angular/core';
 import { CorePromisedValue } from '@classes/promised-value';
 import { CoreUserToursFocusLayout } from '@features/usertours/classes/focus-layout';
 import { CoreUserToursPopoverLayout } from '@features/usertours/classes/popover-layout';
@@ -22,6 +32,7 @@ import { CoreDomUtils } from '@services/utils/dom';
 import { AngularFrameworkDelegate } from '@singletons';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
 import { CoreDom } from '@singletons/dom';
+import { CoreEventObserver } from '@singletons/events';
 
 const ANIMATION_DURATION = 200;
 const USER_TOURS_BACK_BUTTON_PRIORITY = 100;
@@ -36,7 +47,7 @@ const USER_TOURS_BACK_BUTTON_PRIORITY = 100;
     templateUrl: 'core-user-tours-user-tour.html',
     styleUrls: ['user-tour.scss'],
 })
-export class CoreUserToursUserTourComponent implements AfterViewInit {
+export class CoreUserToursUserTourComponent implements AfterViewInit, OnDestroy {
 
     @Input() container!: HTMLElement;
     @Input() id!: string;
@@ -59,6 +70,9 @@ export class CoreUserToursUserTourComponent implements AfterViewInit {
     private wrapperTransform = '';
     private wrapperElement = new CorePromisedValue<HTMLElement>();
     private backButtonListener?: (event: BackButtonEvent) => void;
+    protected resizeListener?: CoreEventObserver;
+    protected scrollListener?: EventListener;
+    protected content?: HTMLIonContentElement | null;
 
     constructor({ nativeElement: element }: ElementRef<HTMLElement>) {
         this.element = element;
@@ -100,18 +114,7 @@ export class CoreUserToursUserTourComponent implements AfterViewInit {
 
         this.calculateStyles();
 
-        // Show tour.
-        this.active = true;
-
-        document.addEventListener(
-            'ionBackButton',
-            this.backButtonListener = ({ detail }) => detail.register(
-                USER_TOURS_BACK_BUTTON_PRIORITY,
-                () => {
-                    // Silence back button.
-                },
-            ),
-        );
+        this.activate();
 
         await this.playEnterAnimation();
     }
@@ -125,8 +128,7 @@ export class CoreUserToursUserTourComponent implements AfterViewInit {
         await this.playLeaveAnimation();
         await AngularFrameworkDelegate.removeViewFromDom(wrapper, this.tour);
 
-        this.active = false;
-        this.backButtonListener && document.removeEventListener('ionBackButton', this.backButtonListener);
+        this.deactivate();
     }
 
     /**
@@ -139,11 +141,11 @@ export class CoreUserToursUserTourComponent implements AfterViewInit {
 
         if (this.active) {
             await this.playLeaveAnimation();
-            await AngularFrameworkDelegate.removeViewFromDom(this.container, this.element);
-
-            this.backButtonListener && document.removeEventListener('ionBackButton', this.backButtonListener);
         }
 
+        await AngularFrameworkDelegate.removeViewFromDom(this.container, this.element);
+        this.deactivate();
+
         acknowledge && await CoreUserTours.acknowledge(this.id);
 
         this.afterDismiss.emit();
@@ -205,4 +207,76 @@ export class CoreUserToursUserTourComponent implements AfterViewInit {
         await Promise.all(animations.map(animation => animation?.finished));
     }
 
+    /**
+     * @inheritdoc
+     */
+    ngOnDestroy(): void {
+        this.deactivate();
+    }
+
+    /**
+     * Activate tour.
+     */
+    protected activate(): void {
+        if (this.active) {
+            return;
+        }
+
+        this.active = true;
+
+        if (!this.backButtonListener) {
+            document.addEventListener(
+                'ionBackButton',
+                this.backButtonListener = ({ detail }) => detail.register(
+                    USER_TOURS_BACK_BUTTON_PRIORITY,
+                    () => {
+                        // Silence back button.
+                    },
+                ),
+            );
+        }
+
+        if (!this.focus) {
+            return;
+        }
+
+        if (!this.resizeListener) {
+            this.resizeListener = CoreDom.onWindowResize(() => {
+                this.calculateStyles();
+            });
+        }
+
+        if (!this.content) {
+            this.content = CoreDom.closest(this.focus, 'ion-content');
+        }
+
+        if (!this.scrollListener && this.content) {
+            this.content.scrollEvents = true;
+
+            this.content.addEventListener('ionScrollEnd', this.scrollListener = (): void => {
+                this.calculateStyles();
+            });
+        }
+    }
+
+    /**
+     * Deactivate tour.
+     */
+    protected deactivate(): void {
+        if (!this.active) {
+            return;
+        }
+
+        this.active = false;
+
+        this.resizeListener?.off();
+        this.backButtonListener && document.removeEventListener('ionBackButton', this.backButtonListener);
+        this.backButtonListener = undefined;
+        this.resizeListener = undefined;
+
+        if (this.content && this.scrollListener) {
+            this.content.removeEventListener('ionScrollEnd', this.scrollListener);
+        }
+    }
+
 }
diff --git a/src/core/singletons/dom.ts b/src/core/singletons/dom.ts
index cc3812f1e..65e16c62c 100644
--- a/src/core/singletons/dom.ts
+++ b/src/core/singletons/dom.ts
@@ -27,6 +27,33 @@ export class CoreDom {
         // Nothing to do.
     }
 
+    /**
+     * Perform a dom closest function piercing the shadow DOM.
+     *
+     * @param node DOM Element.
+     * @param selector Selector to search.
+     * @return Closest ancestor or null if not found.
+     */
+    static closest<T = HTMLElement>(node: HTMLElement | Node | null, selector: string): T | null {
+        if (!node) {
+            return null;
+        }
+
+        if (node instanceof ShadowRoot) {
+            return CoreDom.closest(node.host, selector);
+        }
+
+        if (node instanceof HTMLElement) {
+            if (node.matches(selector)) {
+                return node as unknown as T;
+            } else {
+                return CoreDom.closest<T>(node.parentNode, selector);
+            }
+        }
+
+        return CoreDom.closest<T>(node.parentNode, selector);
+    }
+
     /**
      * Retrieve the position of a element relative to another element.
      *

From 946292c0fd68e9e6a98c59c9af406e61007efd49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 6 Apr 2022 14:12:43 +0200
Subject: [PATCH 0940/1008] MOBILE-3833 user-tours: Fix flicking swipe tour

---
 .../features/usertours/services/user-tours.ts | 55 +++++++++++++------
 1 file changed, 38 insertions(+), 17 deletions(-)

diff --git a/src/core/features/usertours/services/user-tours.ts b/src/core/features/usertours/services/user-tours.ts
index d73c52071..7a93297a1 100644
--- a/src/core/features/usertours/services/user-tours.ts
+++ b/src/core/features/usertours/services/user-tours.ts
@@ -131,7 +131,7 @@ export class CoreUserToursService {
      * @param acknowledge Whether to acknowledge that the user has seen this User Tour or not.
      */
     async dismiss(acknowledge: boolean = true): Promise<void> {
-        await this.tours.find(({ visible }) => visible)?.component.dismiss(acknowledge);
+        await this.getForegroundTour()?.dismiss(acknowledge);
     }
 
     /**
@@ -195,7 +195,7 @@ export class CoreUserToursService {
     protected activateTour(tour: CoreUserToursUserTourComponent): void {
         // Handle show/dismiss lifecycle.
         CoreSubscriptions.once(tour.beforeDismiss, () => {
-            const index = this.tours.findIndex(({ component }) => component === tour);
+            const index = this.getTourIndex(tour);
 
             if (index === -1) {
                 return;
@@ -203,14 +203,17 @@ export class CoreUserToursService {
 
             this.tours.splice(index, 1);
 
-            const foregroundTour = this.tours.find(({ visible }) => visible);
-
-            foregroundTour?.component.show();
+            this.getForegroundTour()?.show();
         });
 
         // Add to existing tours and show it if it's on top.
-        const index = this.tours.findIndex(({ component }) => component === tour);
-        const foregroundTour = this.tours.find(({ visible }) => visible);
+        const index = this.getTourIndex(tour);
+        const previousForegroundTour = this.getForegroundTour();
+
+        if (previousForegroundTour?.id === tour.id) {
+            // Already activated.
+            return;
+        }
 
         if (index !== -1) {
             this.tours[index].visible = true;
@@ -221,35 +224,53 @@ export class CoreUserToursService {
             });
         }
 
-        if (this.tours.find(({ visible }) => visible)?.component !== tour) {
+        if (this.getForegroundTour()?.id !== tour.id) {
+            // Another tour is in use.
             return;
         }
 
-        foregroundTour?.component.hide();
-
         tour.show();
     }
 
+    /**
+     * Returns the first visible tour in the stack.
+     *
+     * @return foreground tour if found or undefined.
+     */
+    protected getForegroundTour(): CoreUserToursUserTourComponent | undefined {
+        return this.tours.find(({ visible }) => visible)?.component;
+    }
+
+    /**
+     * Returns the tour index in the stack.
+     *
+     * @return Tour index if found or -1 otherwise.
+     */
+    protected getTourIndex(tour: CoreUserToursUserTourComponent): number {
+        return this.tours.findIndex(({ component }) => component === tour);
+    }
+
     /**
      * Hide User Tour if visible.
      *
      * @param tour User tour.
      */
     protected deactivateTour(tour: CoreUserToursUserTourComponent): void {
-        const index = this.tours.findIndex(({ component }) => component === tour);
-        const foregroundTourIndex = this.tours.findIndex(({ visible }) => visible);
-
+        const index = this.getTourIndex(tour);
         if (index === -1) {
             return;
         }
 
+        const foregroundTour = this.getForegroundTour();
+
         this.tours[index].visible = false;
 
-        if (index === foregroundTourIndex) {
-            tour.hide();
-
-            this.tours.find(({ visible }) => visible)?.component.show();
+        if (foregroundTour?.id !== tour.id) {
+            // Another tour is in use.
+            return;
         }
+
+        tour.hide();
     }
 
     /**

From 1fc0b9184b02a0a401e6107f9a1dbc912c14b03b Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 6 Apr 2022 12:55:13 +0200
Subject: [PATCH 0941/1008] MOBILE-3833 assign: Fix error displayed after sync

---
 .../mod/assign/components/index/index.ts      | 28 ++++++++-----------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/addons/mod/assign/components/index/index.ts b/src/addons/mod/assign/components/index/index.ts
index adef90a39..37998df5b 100644
--- a/src/addons/mod/assign/components/index/index.ts
+++ b/src/addons/mod/assign/components/index/index.ts
@@ -312,12 +312,13 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
     }
 
     /**
-     * Checks if sync has succeed from result sync data.
-     *
-     * @param result Data returned by the sync function.
-     * @return If succeed or not.
+     * @inheritdoc
      */
-    protected hasSyncSucceed(result: AddonModAssignSyncResult): boolean {
+    protected hasSyncSucceed(result?: AddonModAssignSyncResult): boolean {
+        if (!result) {
+            return false;
+        }
+
         if (result.updated) {
             this.submissionComponent?.invalidateAndRefresh(false);
         }
@@ -326,9 +327,7 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
     }
 
     /**
-     * Perform the invalidate content function.
-     *
-     * @return Resolved when done.
+     * @inheritdoc
      */
     protected async invalidateContent(): Promise<void> {
         const promises: Promise<void>[] = [];
@@ -367,10 +366,7 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
     }
 
     /**
-     * Compares sync event data with current data to check if refresh content is needed.
-     *
-     * @param syncEventData Data receiven on sync observer.
-     * @return True if refresh is needed, false otherwise.
+     * @inheritdoc
      */
     protected isRefreshSyncNeeded(syncEventData: AddonModAssignAutoSyncData): boolean {
         if (!this.assign || syncEventData.assignId != this.assign.id) {
@@ -386,20 +382,18 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
     }
 
     /**
-     * Performs the sync of the activity.
-     *
-     * @return Promise resolved when done.
+     * @inheritdoc
      */
     protected async sync(): Promise<AddonModAssignSyncResult | void> {
         if (!this.assign) {
             return;
         }
 
-        await AddonModAssignSync.syncAssign(this.assign.id);
+        return await AddonModAssignSync.syncAssign(this.assign.id);
     }
 
     /**
-     * Component being destroyed.
+     * @inheritdoc
      */
     ngOnDestroy(): void {
         super.ngOnDestroy();

From 195c8d94e69c48a49eddd9093d5389bdb7e7e803 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 6 Apr 2022 15:54:05 +0200
Subject: [PATCH 0942/1008] MOBILE-3833 core: Add '^' dynamically in link
 handlers

---
 src/addons/badges/services/handlers/badge-link.ts |  2 +-
 .../badges/services/handlers/mybadges-link.ts     |  2 +-
 src/addons/blog/services/handlers/index-link.ts   |  2 +-
 .../calendar/services/handlers/view-link.ts       |  2 +-
 .../services/handlers/competency-link.ts          |  1 +
 .../competency/services/handlers/plan-link.ts     |  1 +
 .../competency/services/handlers/plans-link.ts    |  1 +
 .../services/handlers/user-competency-link.ts     |  1 +
 .../services/handlers/contact-request-link.ts     |  2 +-
 .../messages/services/handlers/discussion-link.ts |  2 +-
 .../messages/services/handlers/index-link.ts      |  2 +-
 .../mod/data/services/handlers/approve-link.ts    |  2 +-
 .../mod/data/services/handlers/delete-link.ts     |  2 +-
 .../mod/data/services/handlers/edit-link.ts       |  2 +-
 .../mod/data/services/handlers/show-link.ts       |  2 +-
 .../feedback/services/handlers/analysis-link.ts   |  2 +-
 .../feedback/services/handlers/complete-link.ts   |  2 +-
 .../mod/feedback/services/handlers/print-link.ts  |  2 +-
 .../services/handlers/show-entries-link.ts        |  2 +-
 .../handlers/show-non-respondents-link.ts         |  2 +-
 .../forum/services/handlers/discussion-link.ts    |  2 +-
 .../mod/forum/services/handlers/post-link.ts      |  2 +-
 .../mod/glossary/services/handlers/edit-link.ts   |  2 +-
 .../mod/glossary/services/handlers/entry-link.ts  |  2 +-
 .../h5pactivity/services/handlers/report-link.ts  |  2 +-
 .../mod/lesson/services/handlers/report-link.ts   |  2 +-
 .../mod/quiz/services/handlers/review-link.ts     |  2 +-
 .../mod/wiki/services/handlers/create-link.ts     |  2 +-
 .../mod/wiki/services/handlers/edit-link.ts       |  2 +-
 .../wiki/services/handlers/page-or-map-link.ts    |  2 +-
 .../services/handlers/notifications-link.ts       |  2 +-
 .../services/handlers/preferences-link.ts         |  2 +-
 .../insights/services/handlers/action-link.ts     |  2 +-
 .../features/contentlinks/classes/base-handler.ts | 15 ++++++++++++++-
 .../contentlinks/classes/module-grade-handler.ts  |  2 +-
 .../contentlinks/classes/module-index-handler.ts  |  4 ++--
 .../contentlinks/classes/module-list-handler.ts   |  2 +-
 .../courses/services/handlers/course-link.ts      |  2 +-
 .../services/handlers/courses-index-link.ts       |  2 +-
 .../courses/services/handlers/dashboard-link.ts   |  2 +-
 .../grades/services/handlers/overview-link.ts     |  2 +-
 .../grades/services/handlers/report-link.ts       |  2 +-
 .../grades/services/handlers/user-link.ts         |  2 +-
 .../sitehome/services/handlers/index-link.ts      |  2 +-
 .../features/tag/services/handlers/index-link.ts  |  2 +-
 .../features/tag/services/handlers/search-link.ts |  2 +-
 .../user/services/handlers/profile-link.ts        |  2 +-
 upgrade.txt                                       |  2 +-
 48 files changed, 62 insertions(+), 45 deletions(-)

diff --git a/src/addons/badges/services/handlers/badge-link.ts b/src/addons/badges/services/handlers/badge-link.ts
index 9012435ec..25b14f5d9 100644
--- a/src/addons/badges/services/handlers/badge-link.ts
+++ b/src/addons/badges/services/handlers/badge-link.ts
@@ -27,7 +27,7 @@ import { AddonBadges } from '../badges';
 export class AddonBadgesBadgeLinkHandlerService extends CoreContentLinksHandlerBase {
 
     name = 'AddonBadgesBadgeLinkHandler';
-    pattern = /^\/badges\/badge\.php.*([?&]hash=)/;
+    pattern = /\/badges\/badge\.php.*([?&]hash=)/;
 
     /**
      * Get the list of actions for a link (url).
diff --git a/src/addons/badges/services/handlers/mybadges-link.ts b/src/addons/badges/services/handlers/mybadges-link.ts
index 543643dcd..2de022feb 100644
--- a/src/addons/badges/services/handlers/mybadges-link.ts
+++ b/src/addons/badges/services/handlers/mybadges-link.ts
@@ -27,7 +27,7 @@ export class AddonBadgesMyBadgesLinkHandlerService extends CoreContentLinksHandl
 
     name = 'AddonBadgesMyBadgesLinkHandler';
     featureName = 'CoreUserDelegate_AddonBadges';
-    pattern = /^\/badges\/mybadges\.php/;
+    pattern = /\/badges\/mybadges\.php/;
 
     /**
      * Get the list of actions for a link (url).
diff --git a/src/addons/blog/services/handlers/index-link.ts b/src/addons/blog/services/handlers/index-link.ts
index e262c2804..add0dcafb 100644
--- a/src/addons/blog/services/handlers/index-link.ts
+++ b/src/addons/blog/services/handlers/index-link.ts
@@ -28,7 +28,7 @@ export class AddonBlogIndexLinkHandlerService extends CoreContentLinksHandlerBas
 
     name = 'AddonBlogIndexLinkHandler';
     featureName = 'CoreUserDelegate_AddonBlog:blogs';
-    pattern = /^\/blog\/index\.php/;
+    pattern = /\/blog\/index\.php/;
 
     /**
      * @inheritdoc
diff --git a/src/addons/calendar/services/handlers/view-link.ts b/src/addons/calendar/services/handlers/view-link.ts
index 1ebd188ed..45914e697 100644
--- a/src/addons/calendar/services/handlers/view-link.ts
+++ b/src/addons/calendar/services/handlers/view-link.ts
@@ -30,7 +30,7 @@ const SUPPORTED_VIEWS = ['month', 'mini', 'minithree', 'day', 'upcoming', 'upcom
 export class AddonCalendarViewLinkHandlerService extends CoreContentLinksHandlerBase {
 
     name = 'AddonCalendarViewLinkHandler';
-    pattern = /^\/calendar\/view\.php/;
+    pattern = /\/calendar\/view\.php/;
 
     /**
      * Get the list of actions for a link (url).
diff --git a/src/addons/competency/services/handlers/competency-link.ts b/src/addons/competency/services/handlers/competency-link.ts
index 15bc6cc1a..c1ae3bfc5 100644
--- a/src/addons/competency/services/handlers/competency-link.ts
+++ b/src/addons/competency/services/handlers/competency-link.ts
@@ -29,6 +29,7 @@ export class AddonCompetencyCompetencyLinkHandlerService extends CoreContentLink
 
     name = 'AddonCompetencyCompetencyLinkHandler';
     pattern = /\/admin\/tool\/lp\/(user_competency_in_course|user_competency_in_plan)\.php/;
+    patternMatchStart = false;
 
     /**
      * @inheritdoc
diff --git a/src/addons/competency/services/handlers/plan-link.ts b/src/addons/competency/services/handlers/plan-link.ts
index e38bb136a..01aa234e3 100644
--- a/src/addons/competency/services/handlers/plan-link.ts
+++ b/src/addons/competency/services/handlers/plan-link.ts
@@ -28,6 +28,7 @@ export class AddonCompetencyPlanLinkHandlerService extends CoreContentLinksHandl
 
     name = 'AddonCompetencyPlanLinkHandler';
     pattern = /\/admin\/tool\/lp\/plan\.php.*([?&]id=\d+)/;
+    patternMatchStart = false;
 
     /**
      * @inheritdoc
diff --git a/src/addons/competency/services/handlers/plans-link.ts b/src/addons/competency/services/handlers/plans-link.ts
index 2f5bddeb4..b88e76723 100644
--- a/src/addons/competency/services/handlers/plans-link.ts
+++ b/src/addons/competency/services/handlers/plans-link.ts
@@ -28,6 +28,7 @@ export class AddonCompetencyPlansLinkHandlerService extends CoreContentLinksHand
 
     name = 'AddonCompetencyPlansLinkHandler';
     pattern = /\/admin\/tool\/lp\/plans\.php/;
+    patternMatchStart = false;
 
     /**
      * @inheritdoc
diff --git a/src/addons/competency/services/handlers/user-competency-link.ts b/src/addons/competency/services/handlers/user-competency-link.ts
index adbab8a92..d6ddc5210 100644
--- a/src/addons/competency/services/handlers/user-competency-link.ts
+++ b/src/addons/competency/services/handlers/user-competency-link.ts
@@ -28,6 +28,7 @@ export class AddonCompetencyUserCompetencyLinkHandlerService extends CoreContent
 
     name = 'AddonCompetencyUserCompetencyLinkHandler';
     pattern = /\/admin\/tool\/lp\/user_competency\.php.*([?&]id=\d+)/;
+    patternMatchStart = false;
 
     /**
      * @inheritdoc
diff --git a/src/addons/messages/services/handlers/contact-request-link.ts b/src/addons/messages/services/handlers/contact-request-link.ts
index bb787113b..a06eb6e11 100644
--- a/src/addons/messages/services/handlers/contact-request-link.ts
+++ b/src/addons/messages/services/handlers/contact-request-link.ts
@@ -26,7 +26,7 @@ import { AddonMessages } from '../messages';
 export class AddonMessagesContactRequestLinkHandlerService extends CoreContentLinksHandlerBase {
 
     name = 'AddonMessagesContactRequestLinkHandler';
-    pattern = /^\/message\/pendingcontactrequests\.php/;
+    pattern = /\/message\/pendingcontactrequests\.php/;
 
     /**
      * Get the list of actions for a link (url).
diff --git a/src/addons/messages/services/handlers/discussion-link.ts b/src/addons/messages/services/handlers/discussion-link.ts
index 3276ee859..2eb03cdec 100644
--- a/src/addons/messages/services/handlers/discussion-link.ts
+++ b/src/addons/messages/services/handlers/discussion-link.ts
@@ -29,7 +29,7 @@ import { AddonMessages } from '../messages';
 export class AddonMessagesDiscussionLinkHandlerService extends CoreContentLinksHandlerBase {
 
     name = 'AddonMessagesDiscussionLinkHandler';
-    pattern = /^\/message\/index\.php.*([?&](id|user1|user2)=\d+)/;
+    pattern = /\/message\/index\.php.*([?&](id|user1|user2)=\d+)/;
 
     /**
      * Get the list of actions for a link (url).
diff --git a/src/addons/messages/services/handlers/index-link.ts b/src/addons/messages/services/handlers/index-link.ts
index 34f294340..d552a6886 100644
--- a/src/addons/messages/services/handlers/index-link.ts
+++ b/src/addons/messages/services/handlers/index-link.ts
@@ -28,7 +28,7 @@ import { AddonMessagesMainMenuHandlerService } from './mainmenu';
 export class AddonMessagesIndexLinkHandlerService extends CoreContentLinksHandlerBase {
 
     name = 'AddonMessagesIndexLinkHandler';
-    pattern = /^\/message\/index\.php((?![?&](id|user1|user2)=\d+).)*$/;
+    pattern = /\/message\/index\.php((?![?&](id|user1|user2)=\d+).)*$/;
 
     /**
      * Get the list of actions for a link (url).
diff --git a/src/addons/mod/data/services/handlers/approve-link.ts b/src/addons/mod/data/services/handlers/approve-link.ts
index 1e24c9d8d..f6802bca2 100644
--- a/src/addons/mod/data/services/handlers/approve-link.ts
+++ b/src/addons/mod/data/services/handlers/approve-link.ts
@@ -28,7 +28,7 @@ export class AddonModDataApproveLinkHandlerService extends CoreContentLinksHandl
 
     name = 'AddonModDataApproveLinkHandler';
     featureName = 'CoreCourseModuleDelegate_AddonModData';
-    pattern = /^\/mod\/data\/view\.php.*([?&](d|approve|disapprove)=\d+)/;
+    pattern = /\/mod\/data\/view\.php.*([?&](d|approve|disapprove)=\d+)/;
     priority = 50; // Higher priority than the default link handler for view.php.
 
     /**
diff --git a/src/addons/mod/data/services/handlers/delete-link.ts b/src/addons/mod/data/services/handlers/delete-link.ts
index f18a54e54..71b0d8125 100644
--- a/src/addons/mod/data/services/handlers/delete-link.ts
+++ b/src/addons/mod/data/services/handlers/delete-link.ts
@@ -28,7 +28,7 @@ export class AddonModDataDeleteLinkHandlerService extends CoreContentLinksHandle
 
     name = 'AddonModDataDeleteLinkHandler';
     featureName = 'CoreCourseModuleDelegate_AddonModData';
-    pattern = /^\/mod\/data\/view\.php.*([?&](d|delete)=\d+)/;
+    pattern = /\/mod\/data\/view\.php.*([?&](d|delete)=\d+)/;
 
     /**
      * @inheritdoc
diff --git a/src/addons/mod/data/services/handlers/edit-link.ts b/src/addons/mod/data/services/handlers/edit-link.ts
index 135c12b3d..bcabe86bd 100644
--- a/src/addons/mod/data/services/handlers/edit-link.ts
+++ b/src/addons/mod/data/services/handlers/edit-link.ts
@@ -32,7 +32,7 @@ export class AddonModDataEditLinkHandlerService extends CoreContentLinksHandlerB
 
     name = 'AddonModDataEditLinkHandler';
     featureName = 'CoreCourseModuleDelegate_AddonModData';
-    pattern = /^\/mod\/data\/edit\.php.*([?&](d|rid)=\d+)/;
+    pattern = /\/mod\/data\/edit\.php.*([?&](d|rid)=\d+)/;
 
     /**
      * @inheritdoc
diff --git a/src/addons/mod/data/services/handlers/show-link.ts b/src/addons/mod/data/services/handlers/show-link.ts
index 5050c4c90..f30535768 100644
--- a/src/addons/mod/data/services/handlers/show-link.ts
+++ b/src/addons/mod/data/services/handlers/show-link.ts
@@ -32,7 +32,7 @@ export class AddonModDataShowLinkHandlerService extends CoreContentLinksHandlerB
 
     name = 'AddonModDataShowLinkHandler';
     featureName = 'CoreCourseModuleDelegate_AddonModData';
-    pattern = /^\/mod\/data\/view\.php.*([?&](d|rid|page|group|mode)=\d+)/;
+    pattern = /\/mod\/data\/view\.php.*([?&](d|rid|page|group|mode)=\d+)/;
     priority = 50; // Higher priority than the default link handler for view.php.
 
     /**
diff --git a/src/addons/mod/feedback/services/handlers/analysis-link.ts b/src/addons/mod/feedback/services/handlers/analysis-link.ts
index 0549950cc..f1b38c0dc 100644
--- a/src/addons/mod/feedback/services/handlers/analysis-link.ts
+++ b/src/addons/mod/feedback/services/handlers/analysis-link.ts
@@ -30,7 +30,7 @@ export class AddonModFeedbackAnalysisLinkHandlerService extends CoreContentLinks
 
     name = 'AddonModFeedbackAnalysisLinkHandler';
     featureName = 'CoreCourseModuleDelegate_AddonModFeedback';
-    pattern = /^\/mod\/feedback\/analysis\.php.*([&?]id=\d+)/;
+    pattern = /\/mod\/feedback\/analysis\.php.*([&?]id=\d+)/;
 
     /**
      * @inheritdoc
diff --git a/src/addons/mod/feedback/services/handlers/complete-link.ts b/src/addons/mod/feedback/services/handlers/complete-link.ts
index c5154243a..7ae34e1a5 100644
--- a/src/addons/mod/feedback/services/handlers/complete-link.ts
+++ b/src/addons/mod/feedback/services/handlers/complete-link.ts
@@ -31,7 +31,7 @@ export class AddonModFeedbackCompleteLinkHandlerService extends CoreContentLinks
 
     name = 'AddonModFeedbackCompleteLinkHandler';
     featureName = 'CoreCourseModuleDelegate_AddonModFeedback';
-    pattern = /^\/mod\/feedback\/complete\.php.*([?&](id|gopage)=\d+)/;
+    pattern = /\/mod\/feedback\/complete\.php.*([?&](id|gopage)=\d+)/;
 
     /**
      * @inheritdoc
diff --git a/src/addons/mod/feedback/services/handlers/print-link.ts b/src/addons/mod/feedback/services/handlers/print-link.ts
index 9c5f09f11..bb6d4d099 100644
--- a/src/addons/mod/feedback/services/handlers/print-link.ts
+++ b/src/addons/mod/feedback/services/handlers/print-link.ts
@@ -31,7 +31,7 @@ export class AddonModFeedbackPrintLinkHandlerService extends CoreContentLinksHan
 
     name = 'AddonModFeedbackPrintLinkHandler';
     featureName = 'CoreCourseModuleDelegate_AddonModFeedback';
-    pattern = /^\/mod\/feedback\/print\.php.*([?&](id)=\d+)/;
+    pattern = /\/mod\/feedback\/print\.php.*([?&](id)=\d+)/;
 
     /**
      * @inheritdoc
diff --git a/src/addons/mod/feedback/services/handlers/show-entries-link.ts b/src/addons/mod/feedback/services/handlers/show-entries-link.ts
index b3d83cf79..30f3b7c15 100644
--- a/src/addons/mod/feedback/services/handlers/show-entries-link.ts
+++ b/src/addons/mod/feedback/services/handlers/show-entries-link.ts
@@ -27,7 +27,7 @@ export class AddonModFeedbackShowEntriesLinkHandlerService extends CoreContentLi
 
     name = 'AddonModFeedbackShowEntriesLinkHandler';
     featureName = 'CoreCourseModuleDelegate_AddonModFeedback';
-    pattern = /^\/mod\/feedback\/show_entries\.php.*([?&](id|showcompleted)=\d+)/;
+    pattern = /\/mod\/feedback\/show_entries\.php.*([?&](id|showcompleted)=\d+)/;
 
     /**
      * @inheritdoc
diff --git a/src/addons/mod/feedback/services/handlers/show-non-respondents-link.ts b/src/addons/mod/feedback/services/handlers/show-non-respondents-link.ts
index 207808a6b..ea6e054ef 100644
--- a/src/addons/mod/feedback/services/handlers/show-non-respondents-link.ts
+++ b/src/addons/mod/feedback/services/handlers/show-non-respondents-link.ts
@@ -30,7 +30,7 @@ export class AddonModFeedbackShowNonRespondentsLinkHandlerService extends CoreCo
 
     name = 'AddonModFeedbackShowNonRespondentsLinkHandler';
     featureName = 'CoreCourseModuleDelegate_AddonModFeedback';
-    pattern = /^\/mod\/feedback\/show_nonrespondents\.php.*([?&](id)=\d+)/;
+    pattern = /\/mod\/feedback\/show_nonrespondents\.php.*([?&](id)=\d+)/;
 
     /**
      * @inheritdoc
diff --git a/src/addons/mod/forum/services/handlers/discussion-link.ts b/src/addons/mod/forum/services/handlers/discussion-link.ts
index babfcd8a1..922ccf4a1 100644
--- a/src/addons/mod/forum/services/handlers/discussion-link.ts
+++ b/src/addons/mod/forum/services/handlers/discussion-link.ts
@@ -28,7 +28,7 @@ export class AddonModForumDiscussionLinkHandlerService extends CoreContentLinksH
 
     name = 'AddonModForumDiscussionLinkHandler';
     featureName = 'CoreCourseModuleDelegate_AddonModForum';
-    pattern = /^\/mod\/forum\/discuss\.php.*([&?]d=\d+)/;
+    pattern = /\/mod\/forum\/discuss\.php.*([&?]d=\d+)/;
 
     /**
      * Get the list of actions for a link (url).
diff --git a/src/addons/mod/forum/services/handlers/post-link.ts b/src/addons/mod/forum/services/handlers/post-link.ts
index a404d38e3..4349b2aa9 100644
--- a/src/addons/mod/forum/services/handlers/post-link.ts
+++ b/src/addons/mod/forum/services/handlers/post-link.ts
@@ -32,7 +32,7 @@ export class AddonModForumPostLinkHandlerService extends CoreContentLinksHandler
 
     name = 'AddonModForumPostLinkHandler';
     featureName = 'CoreCourseModuleDelegate_AddonModForum';
-    pattern = /^\/mod\/forum\/post\.php.*([?&](forum)=\d+)/;
+    pattern = /\/mod\/forum\/post\.php.*([?&](forum)=\d+)/;
 
     /**
      * Get the list of actions for a link (url).
diff --git a/src/addons/mod/glossary/services/handlers/edit-link.ts b/src/addons/mod/glossary/services/handlers/edit-link.ts
index d9a08609e..8859a6d72 100644
--- a/src/addons/mod/glossary/services/handlers/edit-link.ts
+++ b/src/addons/mod/glossary/services/handlers/edit-link.ts
@@ -32,7 +32,7 @@ export class AddonModGlossaryEditLinkHandlerService extends CoreContentLinksHand
 
     name = 'AddonModGlossaryEditLinkHandler';
     featureName = 'CoreCourseModuleDelegate_AddonModGlossary';
-    pattern = /^\/mod\/glossary\/edit\.php.*([?&](cmid)=\d+)/;
+    pattern = /\/mod\/glossary\/edit\.php.*([?&](cmid)=\d+)/;
 
     /**
      * @inheritdoc
diff --git a/src/addons/mod/glossary/services/handlers/entry-link.ts b/src/addons/mod/glossary/services/handlers/entry-link.ts
index 3a7fcbf87..d58a0bac3 100644
--- a/src/addons/mod/glossary/services/handlers/entry-link.ts
+++ b/src/addons/mod/glossary/services/handlers/entry-link.ts
@@ -31,7 +31,7 @@ export class AddonModGlossaryEntryLinkHandlerService extends CoreContentLinksHan
 
     name = 'AddonModGlossaryEntryLinkHandler';
     featureName = 'CoreCourseModuleDelegate_AddonModGlossary';
-    pattern = /^\/mod\/glossary\/(showentry|view)\.php.*([&?](eid|g|mode|hook)=\d+)/;
+    pattern = /\/mod\/glossary\/(showentry|view)\.php.*([&?](eid|g|mode|hook)=\d+)/;
 
     /**
      * @inheritdoc
diff --git a/src/addons/mod/h5pactivity/services/handlers/report-link.ts b/src/addons/mod/h5pactivity/services/handlers/report-link.ts
index c72f6e541..f3272d2bf 100644
--- a/src/addons/mod/h5pactivity/services/handlers/report-link.ts
+++ b/src/addons/mod/h5pactivity/services/handlers/report-link.ts
@@ -33,7 +33,7 @@ export class AddonModH5PActivityReportLinkHandlerService extends CoreContentLink
 
     name = 'AddonModH5PActivityReportLinkHandler';
     featureName = 'CoreCourseModuleDelegate_AddonModH5PActivity';
-    pattern = /^\/mod\/h5pactivity\/report\.php.*([&?]a=\d+)/;
+    pattern = /\/mod\/h5pactivity\/report\.php.*([&?]a=\d+)/;
 
     /**
      * @inheritdoc
diff --git a/src/addons/mod/lesson/services/handlers/report-link.ts b/src/addons/mod/lesson/services/handlers/report-link.ts
index 08d599b31..355476434 100644
--- a/src/addons/mod/lesson/services/handlers/report-link.ts
+++ b/src/addons/mod/lesson/services/handlers/report-link.ts
@@ -31,7 +31,7 @@ export class AddonModLessonReportLinkHandlerService extends CoreContentLinksHand
 
     name = 'AddonModLessonReportLinkHandler';
     featureName = 'CoreCourseModuleDelegate_AddonModLesson';
-    pattern = /^\/mod\/lesson\/report\.php.*([&?]id=\d+)/;
+    pattern = /\/mod\/lesson\/report\.php.*([&?]id=\d+)/;
 
     /**
      * Get the list of actions for a link (url).
diff --git a/src/addons/mod/quiz/services/handlers/review-link.ts b/src/addons/mod/quiz/services/handlers/review-link.ts
index ebd3d50ec..d2c7cdd3b 100644
--- a/src/addons/mod/quiz/services/handlers/review-link.ts
+++ b/src/addons/mod/quiz/services/handlers/review-link.ts
@@ -26,7 +26,7 @@ export class AddonModQuizReviewLinkHandlerService extends CoreContentLinksHandle
 
     name = 'AddonModQuizReviewLinkHandler';
     featureName = 'CoreCourseModuleDelegate_AddonModQuiz';
-    pattern = /^\/mod\/quiz\/review\.php.*([&?]attempt=\d+)/;
+    pattern = /\/mod\/quiz\/review\.php.*([&?]attempt=\d+)/;
 
     /**
      * Get the list of actions for a link (url).
diff --git a/src/addons/mod/wiki/services/handlers/create-link.ts b/src/addons/mod/wiki/services/handlers/create-link.ts
index 79efa5cf4..b78a3f632 100644
--- a/src/addons/mod/wiki/services/handlers/create-link.ts
+++ b/src/addons/mod/wiki/services/handlers/create-link.ts
@@ -33,7 +33,7 @@ export class AddonModWikiCreateLinkHandlerService extends CoreContentLinksHandle
 
     name = 'AddonModWikiCreateLinkHandler';
     featureName = 'CoreCourseModuleDelegate_AddonModWiki';
-    pattern = /^\/mod\/wiki\/create\.php.*([&?]swid=\d+)/;
+    pattern = /\/mod\/wiki\/create\.php.*([&?]swid=\d+)/;
 
     /**
      * Check if the current view is a wiki page of the same wiki.
diff --git a/src/addons/mod/wiki/services/handlers/edit-link.ts b/src/addons/mod/wiki/services/handlers/edit-link.ts
index 3aafc53dd..68e3a5140 100644
--- a/src/addons/mod/wiki/services/handlers/edit-link.ts
+++ b/src/addons/mod/wiki/services/handlers/edit-link.ts
@@ -31,7 +31,7 @@ export class AddonModWikiEditLinkHandlerService extends CoreContentLinksHandlerB
 
     name = 'AddonModWikiEditLinkHandler';
     featureName = 'CoreCourseModuleDelegate_AddonModWiki';
-    pattern = /^\/mod\/wiki\/edit\.php.*([&?]pageid=\d+)/;
+    pattern = /\/mod\/wiki\/edit\.php.*([&?]pageid=\d+)/;
 
     /**
      * @inheritdoc
diff --git a/src/addons/mod/wiki/services/handlers/page-or-map-link.ts b/src/addons/mod/wiki/services/handlers/page-or-map-link.ts
index 4bd476fde..9b995e3bd 100644
--- a/src/addons/mod/wiki/services/handlers/page-or-map-link.ts
+++ b/src/addons/mod/wiki/services/handlers/page-or-map-link.ts
@@ -32,7 +32,7 @@ export class AddonModWikiPageOrMapLinkHandlerService extends CoreContentLinksHan
 
     name = 'AddonModWikiPageOrMapLinkHandler';
     featureName = 'CoreCourseModuleDelegate_AddonModWiki';
-    pattern = /^\/mod\/wiki\/(view|map)\.php.*([&?]pageid=\d+)/;
+    pattern = /\/mod\/wiki\/(view|map)\.php.*([&?]pageid=\d+)/;
 
     /**
      * @inheritdoc
diff --git a/src/addons/notifications/services/handlers/notifications-link.ts b/src/addons/notifications/services/handlers/notifications-link.ts
index a3b17bb5f..9d560d165 100644
--- a/src/addons/notifications/services/handlers/notifications-link.ts
+++ b/src/addons/notifications/services/handlers/notifications-link.ts
@@ -27,7 +27,7 @@ import { AddonNotificationsMainMenuHandlerService } from './mainmenu';
 export class AddonNotificationsLinkHandlerService extends CoreContentLinksHandlerBase {
 
     name = 'AddonNotificationsLinkHandler';
-    pattern = /^\/message\/output\/popup\/notifications\.php/;
+    pattern = /\/message\/output\/popup\/notifications\.php/;
     featureName = 'CoreMainMenuDelegate_AddonNotifications';
 
     /**
diff --git a/src/addons/notifications/services/handlers/preferences-link.ts b/src/addons/notifications/services/handlers/preferences-link.ts
index 5da2ae898..a2ab6da07 100644
--- a/src/addons/notifications/services/handlers/preferences-link.ts
+++ b/src/addons/notifications/services/handlers/preferences-link.ts
@@ -28,7 +28,7 @@ import { AddonNotificationsSettingsHandlerService } from './settings';
 export class AddonNotificationsPreferencesLinkHandlerService extends CoreContentLinksHandlerBase {
 
     name = 'AddonNotificationsPreferencesLinkHandler';
-    pattern = /^\/message\/notificationpreferences\.php/;
+    pattern = /\/message\/notificationpreferences\.php/;
     checkAllUsers = true;
     featureName = 'CoreMainMenuDelegate_AddonNotifications';
 
diff --git a/src/addons/report/insights/services/handlers/action-link.ts b/src/addons/report/insights/services/handlers/action-link.ts
index e5f91b406..aad2a84fc 100644
--- a/src/addons/report/insights/services/handlers/action-link.ts
+++ b/src/addons/report/insights/services/handlers/action-link.ts
@@ -38,7 +38,7 @@ const BULK_ACTIONS = {
 export class AddonReportInsightsActionLinkHandlerService extends CoreContentLinksHandlerBase {
 
     name = 'AddonReportInsightsActionLinkHandler';
-    pattern = /^\/report\/insights\/action\.php/;
+    pattern = /\/report\/insights\/action\.php/;
 
     /**
      * @inheritdoc
diff --git a/src/core/features/contentlinks/classes/base-handler.ts b/src/core/features/contentlinks/classes/base-handler.ts
index 2ac903131..2e9199796 100644
--- a/src/core/features/contentlinks/classes/base-handler.ts
+++ b/src/core/features/contentlinks/classes/base-handler.ts
@@ -50,6 +50,11 @@ export class CoreContentLinksHandlerBase implements CoreContentLinksHandler {
      */
     pattern?: RegExp;
 
+    /**
+     * If true, a "^" will be added to the beginning of the pattern. It's recommended to avoid collisions with other handlers.
+     */
+    patternMatchStart = true;
+
     /**
      * Get the list of actions for a link (url).
      *
@@ -82,7 +87,15 @@ export class CoreContentLinksHandlerBase implements CoreContentLinksHandler {
      * @return Whether the URL is handled by this handler
      */
     handles(url: string): boolean {
-        return !!this.pattern && url.search(this.pattern) >= 0;
+        let pattern = this.pattern;
+
+        if (pattern && this.patternMatchStart) {
+            let patternString = pattern.toString();
+            patternString = patternString.substring(1, patternString.length - 1); // Remove slashes from beginning and end.
+            pattern = new RegExp('^' + patternString);
+        }
+
+        return !!pattern && url.search(pattern) >= 0;
     }
 
     /**
diff --git a/src/core/features/contentlinks/classes/module-grade-handler.ts b/src/core/features/contentlinks/classes/module-grade-handler.ts
index 88e416ef8..cce3bad41 100644
--- a/src/core/features/contentlinks/classes/module-grade-handler.ts
+++ b/src/core/features/contentlinks/classes/module-grade-handler.ts
@@ -47,7 +47,7 @@ export class CoreContentLinksModuleGradeHandler extends CoreContentLinksHandlerB
         super();
 
         // Match the grade.php URL with an id param.
-        this.pattern = new RegExp('^/mod/' + modName + '/grade.php.*([&?]id=\\d+)');
+        this.pattern = new RegExp('/mod/' + modName + '/grade.php.*([&?]id=\\d+)');
         this.featureName = 'CoreCourseModuleDelegate_' + addon;
     }
 
diff --git a/src/core/features/contentlinks/classes/module-index-handler.ts b/src/core/features/contentlinks/classes/module-index-handler.ts
index 5910de0eb..685970110 100644
--- a/src/core/features/contentlinks/classes/module-index-handler.ts
+++ b/src/core/features/contentlinks/classes/module-index-handler.ts
@@ -45,8 +45,8 @@ export class CoreContentLinksModuleIndexHandler extends CoreContentLinksHandlerB
 
         // Match the view.php URL with an id or instance id param.
         const pattern = instanceIdParam ?
-            '^/mod/' + modName + '/view.php.*([&?](' + instanceIdParam + '|id)=\\d+)' :
-            '^/mod/' + modName + '/view.php.*([&?]id=\\d+)';
+            '/mod/' + modName + '/view.php.*([&?](' + instanceIdParam + '|id)=\\d+)' :
+            '/mod/' + modName + '/view.php.*([&?]id=\\d+)';
 
         this.pattern = new RegExp(pattern);
         this.featureName = 'CoreCourseModuleDelegate_' + addon;
diff --git a/src/core/features/contentlinks/classes/module-list-handler.ts b/src/core/features/contentlinks/classes/module-list-handler.ts
index a20e8cf41..e8fd0a3f0 100644
--- a/src/core/features/contentlinks/classes/module-list-handler.ts
+++ b/src/core/features/contentlinks/classes/module-list-handler.ts
@@ -41,7 +41,7 @@ export class CoreContentLinksModuleListHandler extends CoreContentLinksHandlerBa
         super();
 
         // Match the index.php URL with an id param.
-        this.pattern = new RegExp('^/mod/' + modName + '/index.php.*([&?]id=\\d+)');
+        this.pattern = new RegExp('/mod/' + modName + '/index.php.*([&?]id=\\d+)');
         this.featureName = 'CoreCourseModuleDelegate_' + addon;
     }
 
diff --git a/src/core/features/courses/services/handlers/course-link.ts b/src/core/features/courses/services/handlers/course-link.ts
index b8d847a96..5c7347844 100644
--- a/src/core/features/courses/services/handlers/course-link.ts
+++ b/src/core/features/courses/services/handlers/course-link.ts
@@ -35,7 +35,7 @@ import { CoreIonLoadingElement } from '@classes/ion-loading';
 export class CoreCoursesCourseLinkHandlerService extends CoreContentLinksHandlerBase {
 
     name = 'CoreCoursesCourseLinkHandler';
-    pattern = /((^\/enrol\/index\.php)|(^\/course\/enrol\.php)|(^\/course\/view\.php)).*([?&]id=\d+)/;
+    pattern = /((\/enrol\/index\.php)|(\/course\/enrol\.php)|(\/course\/view\.php)).*([?&]id=\d+)/;
 
     protected waitStart = 0;
     protected logger: CoreLogger;
diff --git a/src/core/features/courses/services/handlers/courses-index-link.ts b/src/core/features/courses/services/handlers/courses-index-link.ts
index e486728ab..4ca26a580 100644
--- a/src/core/features/courses/services/handlers/courses-index-link.ts
+++ b/src/core/features/courses/services/handlers/courses-index-link.ts
@@ -28,7 +28,7 @@ export class CoreCoursesIndexLinkHandlerService extends CoreContentLinksHandlerB
 
     name = 'CoreCoursesIndexLinkHandler';
     featureName = 'CoreMainMenuDelegate_CoreCourses';
-    pattern = /^\/course\/?(index\.php.*)?$/;
+    pattern = /\/course\/?(index\.php.*)?$/;
 
     /**
      * @inheritdoc
diff --git a/src/core/features/courses/services/handlers/dashboard-link.ts b/src/core/features/courses/services/handlers/dashboard-link.ts
index 24af04dc3..05ad995a0 100644
--- a/src/core/features/courses/services/handlers/dashboard-link.ts
+++ b/src/core/features/courses/services/handlers/dashboard-link.ts
@@ -27,7 +27,7 @@ import { CoreDashboardHomeHandler, CoreDashboardHomeHandlerService } from './das
 export class CoreCoursesDashboardLinkHandlerService extends CoreContentLinksHandlerBase {
 
     name = 'CoreCoursesDashboardLinkHandler';
-    pattern = /^\/my\/?$/;
+    pattern = /\/my\/?$/;
 
     /**
      * Get the list of actions for a link (url).
diff --git a/src/core/features/grades/services/handlers/overview-link.ts b/src/core/features/grades/services/handlers/overview-link.ts
index 844c8ea69..2205e29ea 100644
--- a/src/core/features/grades/services/handlers/overview-link.ts
+++ b/src/core/features/grades/services/handlers/overview-link.ts
@@ -27,7 +27,7 @@ import { GRADES_PAGE_NAME } from '../grades-helper';
 export class CoreGradesOverviewLinkHandlerService extends CoreContentLinksHandlerBase {
 
     name = 'CoreGradesOverviewLinkHandler';
-    pattern = /^\/grade\/report\/overview\/index.php/;
+    pattern = /\/grade\/report\/overview\/index.php/;
 
     /**
      * Get the list of actions for a link (url).
diff --git a/src/core/features/grades/services/handlers/report-link.ts b/src/core/features/grades/services/handlers/report-link.ts
index 9f5e9da61..1efed0df7 100644
--- a/src/core/features/grades/services/handlers/report-link.ts
+++ b/src/core/features/grades/services/handlers/report-link.ts
@@ -27,7 +27,7 @@ import { makeSingleton } from '@singletons';
 export class CoreGradesReportLinkHandlerService extends CoreContentLinksHandlerBase {
 
     name = 'CoreGradesReportLinkHandler';
-    pattern = /^\/grade\/report(\/user)?\/index.php/;
+    pattern = /\/grade\/report(\/user)?\/index.php/;
 
     /**
      * Get the list of actions for a link (url).
diff --git a/src/core/features/grades/services/handlers/user-link.ts b/src/core/features/grades/services/handlers/user-link.ts
index 2616e9688..1f1ba4008 100644
--- a/src/core/features/grades/services/handlers/user-link.ts
+++ b/src/core/features/grades/services/handlers/user-link.ts
@@ -27,7 +27,7 @@ import { makeSingleton } from '@singletons';
 export class CoreGradesUserLinkHandlerService extends CoreContentLinksHandlerBase {
 
     name = 'CoreGradesUserLinkHandler';
-    pattern = /^\/course\/user\.php.*[?&]mode=grade/;
+    pattern = /\/course\/user\.php.*[?&]mode=grade/;
 
     /**
      * Get the list of actions for a link (url).
diff --git a/src/core/features/sitehome/services/handlers/index-link.ts b/src/core/features/sitehome/services/handlers/index-link.ts
index 017a14d0c..61850ca27 100644
--- a/src/core/features/sitehome/services/handlers/index-link.ts
+++ b/src/core/features/sitehome/services/handlers/index-link.ts
@@ -31,7 +31,7 @@ export class CoreSiteHomeIndexLinkHandlerService extends CoreContentLinksHandler
 
     name = 'CoreSiteHomeIndexLinkHandler';
     featureName = 'CoreMainMenuDelegate_CoreSiteHome';
-    pattern = /^\/course\/view\.php.*([?&]id=\d+)|^\/index\.php(\?redirect=0)?/;
+    pattern = /(\/course\/view\.php.*([?&]id=\d+)|\/index\.php(\?redirect=0)?)/;
 
     /**
      * @inheritdoc
diff --git a/src/core/features/tag/services/handlers/index-link.ts b/src/core/features/tag/services/handlers/index-link.ts
index 5e60dec7f..6454bbdb9 100644
--- a/src/core/features/tag/services/handlers/index-link.ts
+++ b/src/core/features/tag/services/handlers/index-link.ts
@@ -27,7 +27,7 @@ import { CoreTag } from '../tag';
 export class CoreTagIndexLinkHandlerService extends CoreContentLinksHandlerBase {
 
     name = 'CoreTagIndexLinkHandler';
-    pattern = /^\/tag\/index\.php/;
+    pattern = /\/tag\/index\.php/;
 
     /**
      * Get the list of actions for a link (url).
diff --git a/src/core/features/tag/services/handlers/search-link.ts b/src/core/features/tag/services/handlers/search-link.ts
index c97c07a7f..1749af16a 100644
--- a/src/core/features/tag/services/handlers/search-link.ts
+++ b/src/core/features/tag/services/handlers/search-link.ts
@@ -27,7 +27,7 @@ import { CoreTag } from '../tag';
 export class CoreTagSearchLinkHandlerService extends CoreContentLinksHandlerBase {
 
     name = 'CoreTagSearchLinkHandler';
-    pattern = /^\/tag\/search\.php/;
+    pattern = /\/tag\/search\.php/;
 
     /**
      * Get the list of actions for a link (url).
diff --git a/src/core/features/user/services/handlers/profile-link.ts b/src/core/features/user/services/handlers/profile-link.ts
index 18fd695f1..b7eb0ad5b 100644
--- a/src/core/features/user/services/handlers/profile-link.ts
+++ b/src/core/features/user/services/handlers/profile-link.ts
@@ -27,7 +27,7 @@ export class CoreUserProfileLinkHandlerService extends CoreContentLinksHandlerBa
 
     name = 'CoreUserProfileLinkHandler';
     // Match user/view.php and user/profile.php but NOT grade/report/user/.
-    pattern = /((^\/user\/view\.php)|(^\/user\/profile\.php)).*([?&]id=\d+)/;
+    pattern = /((\/user\/view\.php)|(\/user\/profile\.php)).*([?&]id=\d+)/;
 
     /**
      * Get the list of actions for a link (url).
diff --git a/upgrade.txt b/upgrade.txt
index 0923819d3..2ee2fb749 100644
--- a/upgrade.txt
+++ b/upgrade.txt
@@ -24,7 +24,7 @@ information provided here is intended especially for developers.
 - contextMenuPrefetch and fillContextMenu have been removed from CoreCourseHelper.
 - The variable "loaded" in CoreCourseModuleMainResourceComponent has been changed to "showLoading" to reflect its purpose better.
 - The function getCurrentSection of course formats can now return a forceSelected boolean along with the section (defaults to false if not returned).
-- The link handlers functions (CoreContentLinksHandler) will now always receive a relative URL instead of an absolute URL. It's now recommended to use "^" in your regular expressions to avoid false positives.
+- The link handlers functions (CoreContentLinksHandler) will now always receive a relative URL instead of an absolute URL. The CoreContentLinksHandlerBase class now adds "^" to the start of the pattern by default to prevent false positives.
 
 
 

From 96241053197ec9a79425cf3c63e993701ddc2451 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 6 Apr 2022 16:11:37 +0200
Subject: [PATCH 0943/1008] MOBILE-3833 myoverview: Change empty state texts

---
 scripts/langindex.json                        |  6 ++++-
 .../myoverview/addon-block-myoverview.html    | 27 ++++++++++++++-----
 .../components/myoverview/myoverview.scss     | 11 ++++++++
 src/addons/block/myoverview/lang.json         |  6 ++++-
 4 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 93ec25362..a75f1e41f 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -40,6 +40,7 @@
   "addon.block_learningplans.pluginname": "block_lp",
   "addon.block_myoverview.all": "block_myoverview",
   "addon.block_myoverview.allincludinghidden": "block_myoverview",
+  "addon.block_myoverview.browseallcourses": "local_moodlemobileapp",
   "addon.block_myoverview.card": "block_myoverview",
   "addon.block_myoverview.favourites": "block_myoverview",
   "addon.block_myoverview.future": "block_myoverview",
@@ -47,7 +48,10 @@
   "addon.block_myoverview.inprogress": "block_myoverview",
   "addon.block_myoverview.lastaccessed": "block_myoverview",
   "addon.block_myoverview.list": "block_myoverview",
-  "addon.block_myoverview.nocourses": "moodle",
+  "addon.block_myoverview.nocoursesenrolled": "local_moodlemobileapp",
+  "addon.block_myoverview.nocoursesenrolleddescription": "local_moodlemobileapp",
+  "addon.block_myoverview.noresult": "local_moodlemobileapp",
+  "addon.block_myoverview.noresultdescription": "local_moodlemobileapp",
   "addon.block_myoverview.past": "block_myoverview",
   "addon.block_myoverview.pluginname": "block_myoverview",
   "addon.block_myoverview.shortname": "block_myoverview",
diff --git a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
index d4328e235..233d107de 100644
--- a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
+++ b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
@@ -99,13 +99,26 @@
         </ion-col>
     </ion-row>
 
-    <core-empty-box *ngIf="filteredCourses.length == 0" image="assets/img/icons/courses.svg"
-        [message]="'addon.block_myoverview.nocourses' | translate">
-        <ion-button *ngIf="searchEnabled" (click)="openSearch()" fill="outline">
-            <ion-icon name="fas-search" slot="start" aria-hidden="true">
-            </ion-icon>
-            {{'core.courses.searchcourses' | translate}}
-        </ion-button>
+    <core-empty-box *ngIf="filteredCourses.length == 0" image="assets/img/icons/courses.svg">
+        <p *ngIf="hasCourses" class="item-heading">
+            {{'addon.block_myoverview.noresult' | translate}}
+        </p>
+        <p *ngIf="!hasCourses" class="item-heading">
+            {{'addon.block_myoverview.nocoursesenrolled' | translate}}
+        </p>
+        <ng-container *ngIf="searchEnabled">
+            <p *ngIf="hasCourses" class="subdued">
+                {{'addon.block_myoverview.noresultdescription' | translate}}
+            </p>
+            <p *ngIf="!hasCourses" class="subdued">
+                {{'addon.block_myoverview.nocoursesenrolleddescription' | translate}}
+            </p>
+            <ion-button (click)="openSearch()" fill="outline">
+                <ion-icon name="fas-search" slot="start" aria-hidden="true">
+                </ion-icon>
+                {{'addon.block_myoverview.browseallcourses' | translate}}
+            </ion-button>
+        </ng-container>
     </core-empty-box>
 
     <!-- List of courses. -->
diff --git a/src/addons/block/myoverview/components/myoverview/myoverview.scss b/src/addons/block/myoverview/components/myoverview/myoverview.scss
index 2c09ff1e8..37df6ca93 100644
--- a/src/addons/block/myoverview/components/myoverview/myoverview.scss
+++ b/src/addons/block/myoverview/components/myoverview/myoverview.scss
@@ -34,4 +34,15 @@
         }
     }
 
+    core-empty-box {
+        .item-heading {
+            font-weight: bold;
+            margin-bottom: 0;
+            font-size: 16px;
+        }
+
+        .subdued {
+            color: var(--subdued-text-color);
+        }
+    }
 }
diff --git a/src/addons/block/myoverview/lang.json b/src/addons/block/myoverview/lang.json
index 40c94300b..c2180cc2c 100644
--- a/src/addons/block/myoverview/lang.json
+++ b/src/addons/block/myoverview/lang.json
@@ -1,6 +1,7 @@
 {
     "all": "All",
     "allincludinghidden": "All (including archived)",
+    "browseallcourses": "Browse all courses",
     "card": "Card",
     "favourites": "Starred",
     "future": "Future",
@@ -8,7 +9,10 @@
     "inprogress": "In progress",
     "lastaccessed": "Last accessed",
     "list": "List",
-    "nocourses": "No courses",
+    "nocoursesenrolled": "You're not enrolled in any courses yet.",
+    "nocoursesenrolleddescription": "Browse all available courses below and start learning.",
+    "noresult": "Your search didn't match any courses.",
+    "noresultdescription": "Try adjusting your filters or browse all courses below.",
     "past": "Past",
     "pluginname": "Course overview",
     "shortname": "Short name",

From 2ece8e7e7e16b52b52ded57059573c76ae5a602d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 6 Apr 2022 16:22:47 +0200
Subject: [PATCH 0944/1008] MOBILE-3833 forum: Do not display empty card on
 response posts if none

---
 src/addons/mod/forum/pages/discussion/discussion.html    | 4 ++--
 src/addons/mod/forum/pages/discussion/discussion.page.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/addons/mod/forum/pages/discussion/discussion.html b/src/addons/mod/forum/pages/discussion/discussion.html
index 542fefeda..44a517136 100644
--- a/src/addons/mod/forum/pages/discussion/discussion.html
+++ b/src/addons/mod/forum/pages/discussion/discussion.html
@@ -92,7 +92,7 @@
             </addon-mod-forum-post>
         </div>
 
-        <ion-card *ngIf="sort != 'nested'">
+        <ion-card *ngIf="sort != 'nested' && posts.length">
             <ng-container *ngFor="let post of posts; first as first">
                 <core-spacer *ngIf="!first"></core-spacer>
                 <addon-mod-forum-post [post]="post" [courseId]="courseId" [discussionId]="discussionId" [component]="component"
@@ -103,7 +103,7 @@
             </ng-container>
         </ion-card>
 
-        <ng-container *ngIf="sort == 'nested'">
+        <ng-container *ngIf="sort == 'nested' && posts.length">
             <ng-container *ngFor="let post of posts">
                 <ng-container *ngTemplateOutlet="nestedPosts; context: {post: post}"></ng-container>
             </ng-container>
diff --git a/src/addons/mod/forum/pages/discussion/discussion.page.ts b/src/addons/mod/forum/pages/discussion/discussion.page.ts
index 4fec08325..9ed21d8b6 100644
--- a/src/addons/mod/forum/pages/discussion/discussion.page.ts
+++ b/src/addons/mod/forum/pages/discussion/discussion.page.ts
@@ -75,7 +75,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
     discussion?: AddonModForumDiscussion;
     discussions?: AddonModForumDiscussionDiscussionsSwipeManager;
     startingPost?: Post;
-    posts!: Post[];
+    posts: Post[] = [];
     discussionLoaded = false;
     postSubjects!: { [id: string]: string };
     isOnline!: boolean;

From 676a35f23d0e502282832c1fd87e24151f57cebb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 7 Apr 2022 12:17:42 +0200
Subject: [PATCH 0945/1008] MOBILE-3833 screen: Get orientation from cordova
 plugin

---
 package-lock.json            | 20 ++++++++++++++++++++
 package.json                 |  4 +++-
 src/core/services/screen.ts  | 24 +++++++++---------------
 src/core/singletons/index.ts |  1 -
 4 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0beae8c63..14d051271 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -117,6 +117,7 @@
         "@typescript-eslint/parser": "4.22.0",
         "check-es-compat": "1.1.1",
         "cordova-plugin-androidx-adapter": "1.1.3",
+        "cordova-plugin-screen-orientation": "^3.0.2",
         "cross-env": "7.0.3",
         "eslint": "7.25.0",
         "eslint-config-prettier": "8.3.0",
@@ -11141,6 +11142,19 @@
         }
       }
     },
+    "node_modules/cordova-plugin-screen-orientation": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-screen-orientation/-/cordova-plugin-screen-orientation-3.0.2.tgz",
+      "integrity": "sha512-2w6CMC+HGvbhogJetalwGurL2Fx8DQCCPy3wlSZHN1/W7WoQ5n9ujVozcoKrY4VaagK6bxrPFih+ElkO8Uqfzg==",
+      "dev": true,
+      "engines": {
+        "cordovaDependencies": {
+          "4.0.0": {
+            "cordova": ">100"
+          }
+        }
+      }
+    },
     "node_modules/cordova-plugin-splashscreen": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/cordova-plugin-splashscreen/-/cordova-plugin-splashscreen-6.0.0.tgz",
@@ -39599,6 +39613,12 @@
       "resolved": "https://registry.npmjs.org/cordova-plugin-prevent-override/-/cordova-plugin-prevent-override-1.0.1.tgz",
       "integrity": "sha512-yy1JZ+lXTR33Ai1yloT6wdXJXe0a3LrfgnKORuPZv/QkbiqfIQKjy0R4zRP8qljaJSelF/xv5CgrVt8iS0SkBg=="
     },
+    "cordova-plugin-screen-orientation": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-screen-orientation/-/cordova-plugin-screen-orientation-3.0.2.tgz",
+      "integrity": "sha512-2w6CMC+HGvbhogJetalwGurL2Fx8DQCCPy3wlSZHN1/W7WoQ5n9ujVozcoKrY4VaagK6bxrPFih+ElkO8Uqfzg==",
+      "dev": true
+    },
     "cordova-plugin-splashscreen": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/cordova-plugin-splashscreen/-/cordova-plugin-splashscreen-6.0.0.tgz",
diff --git a/package.json b/package.json
index c7c684c1d..712a8cdc3 100644
--- a/package.json
+++ b/package.json
@@ -146,6 +146,7 @@
     "@typescript-eslint/parser": "4.22.0",
     "check-es-compat": "1.1.1",
     "cordova-plugin-androidx-adapter": "1.1.3",
+    "cordova-plugin-screen-orientation": "^3.0.2",
     "cross-env": "7.0.3",
     "eslint": "7.25.0",
     "eslint-config-prettier": "8.3.0",
@@ -237,7 +238,8 @@
       },
       "@moodlehq/cordova-plugin-file-transfer": {},
       "cordova-plugin-prevent-override": {},
-      "cordova-plugin-androidx-adapter": {}
+      "cordova-plugin-androidx-adapter": {},
+      "cordova-plugin-screen-orientation": {}
     }
   },
   "optionalDependencies": {
diff --git a/src/core/services/screen.ts b/src/core/services/screen.ts
index 04a0e6917..e733946b6 100644
--- a/src/core/services/screen.ts
+++ b/src/core/services/screen.ts
@@ -16,7 +16,7 @@ import { Injectable } from '@angular/core';
 import { BehaviorSubject, Observable } from 'rxjs';
 import { distinctUntilChanged, map } from 'rxjs/operators';
 
-import { makeSingleton } from '@singletons';
+import { makeSingleton, Platform } from '@singletons';
 import { CoreEvents } from '@singletons/events';
 
 /**
@@ -103,9 +103,9 @@ export class CoreScreenService {
     }
 
     get orientation(): CoreScreenOrientation {
-        const mql = window.matchMedia('(orientation: portrait)');
-
-        return mql.matches ? CoreScreenOrientation.PORTRAIT : CoreScreenOrientation.LANDSCAPE;
+        return screen.orientation.type.startsWith(CoreScreenOrientation.LANDSCAPE)
+            ? CoreScreenOrientation.LANDSCAPE
+            : CoreScreenOrientation.PORTRAIT;
     }
 
     get isPortrait(): boolean {
@@ -119,18 +119,12 @@ export class CoreScreenService {
     /**
      * Watch orientation changes.
      */
-    watchOrientation(): void {
-        // Listen media orientation CSS queries.
-        const changeListener = (m: MediaQueryListEvent) => {
-            const orientation = m.matches ? CoreScreenOrientation.PORTRAIT : CoreScreenOrientation.LANDSCAPE;
+    async watchOrientation(): Promise<void> {
+        await Platform.ready();
 
-            CoreEvents.trigger(CoreEvents.ORIENTATION_CHANGE, { orientation });
-        };
-
-        const mql = window.matchMedia('(orientation: portrait)');
-        mql.addEventListener ?
-            mql.addEventListener('change', changeListener) :
-            mql.addListener(changeListener);
+        screen.orientation.addEventListener('change', () => {
+            CoreEvents.trigger(CoreEvents.ORIENTATION_CHANGE, { orientation: this.orientation });
+        });
     }
 
     /**
diff --git a/src/core/singletons/index.ts b/src/core/singletons/index.ts
index 0b57ec3fc..048dba0c6 100644
--- a/src/core/singletons/index.ts
+++ b/src/core/singletons/index.ts
@@ -120,7 +120,6 @@ export function setCreateSingletonMethodProxy(method: typeof createSingletonMeth
  *
  * @param injectionToken Injection token used to resolve the service. This is usually the service class if the provider was
  * defined using a class or the string used in the `provide` key if it was defined using an object.
- * @param getters Getter names to proxy.
  * @return Singleton proxy.
  */
 export function makeSingleton<Service extends object = object>( // eslint-disable-line @typescript-eslint/ban-types

From c10db2e1f9bdba3333af49b864ceebef9341e58d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 7 Apr 2022 13:13:22 +0200
Subject: [PATCH 0946/1008] MOBILE-3833 glossary: Do not infinite loading if
 not searched yet

---
 .../glossary/components/index/addon-mod-glossary-index.html    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
index 4f544012e..788686a95 100644
--- a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
+++ b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
@@ -69,7 +69,8 @@
             [message]="'addon.mod_glossary.noentriesfound' | translate">
         </core-empty-box>
 
-        <core-infinite-loading [enabled]="entries && !entries.completed" [error]="loadMoreError" (action)="loadMoreEntries($event)">
+        <core-infinite-loading [enabled]="entries && !entries.completed && (!isSearch || hasSearched)" [error]="loadMoreError"
+            (action)="loadMoreEntries($event)">
         </core-infinite-loading>
     </core-loading>
 

From 69ffb7ea101ed59ab5e62818838d0fefc517bab9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 7 Apr 2022 13:43:02 +0200
Subject: [PATCH 0947/1008] MOBILE-3833 loading: Fix incorrect order of DOM on
 iOS

---
 src/core/components/loading/loading.scss | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/core/components/loading/loading.scss b/src/core/components/loading/loading.scss
index d6b31d067..e6cebfac7 100644
--- a/src/core/components/loading/loading.scss
+++ b/src/core/components/loading/loading.scss
@@ -95,3 +95,10 @@
     flex-direction: column;
     min-height: 100%;
 }
+
+// There is a bug on iOs that displays inside elements in wrong order.
+// This bug seems not to affect other elements like format-text
+:host-context(.ios) {
+    --contents-display: flex;
+    flex-direction: column;
+}

From 7a718a727c060c007d25955b9b94bcf2a414fa66 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 7 Apr 2022 11:05:20 +0200
Subject: [PATCH 0948/1008] MOBILE-3833 core: Fix open module in course

---
 src/core/features/mainmenu/classes/deep-link-manager.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/features/mainmenu/classes/deep-link-manager.ts b/src/core/features/mainmenu/classes/deep-link-manager.ts
index 5ba0bfbfa..4f86078f5 100644
--- a/src/core/features/mainmenu/classes/deep-link-manager.ts
+++ b/src/core/features/mainmenu/classes/deep-link-manager.ts
@@ -78,7 +78,7 @@ export class CoreMainMenuDeepLinkManager {
             if (!params?.course) {
                 CoreCourseHelper.getAndOpenCourse(Number(coursePathMatches[1]), params);
             } else {
-                CoreCourse.openCourse(params.course, params);
+                CoreCourse.openCourse(params.course, navOptions);
             }
         } else {
             CoreNavigator.navigateToSitePath(path, {

From 4aeababbf67531988e069033eb9ca26400641500 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 7 Apr 2022 12:51:49 +0200
Subject: [PATCH 0949/1008] MOBILE-3833 audio: Allow capture audio in app in
 Android 10+

This was disabled before because there was a bug in the Cordova plugin, but it seems to be fixed now
---
 .../features/fileuploader/services/fileuploader-helper.ts     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/core/features/fileuploader/services/fileuploader-helper.ts b/src/core/features/fileuploader/services/fileuploader-helper.ts
index d8cdfb14f..f0b2287e2 100644
--- a/src/core/features/fileuploader/services/fileuploader-helper.ts
+++ b/src/core/features/fileuploader/services/fileuploader-helper.ts
@@ -550,10 +550,8 @@ export class CoreFileUploaderHelperProvider {
             media = medias[0]; // We used limit 1, we only want 1 media.
         } catch (error) {
 
-            if (isAudio && this.isNoAppError(error) && CoreApp.isMobile() &&
-                    (!Platform.is('android') || CoreApp.getPlatformMajorVersion() < 10)) {
+            if (isAudio && this.isNoAppError(error) && CoreApp.isMobile()) {
                 // No app to record audio, fallback to capture it ourselves.
-                // In Android it will only be done in Android 9 or lower because there's a bug in the plugin.
                 try {
                     media = await CoreFileUploader.captureAudioInApp();
                 } catch (error) {

From 15b6e12b04d1b1ab16e2feda37108053d56a189e Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 7 Apr 2022 13:05:18 +0200
Subject: [PATCH 0950/1008] MOBILE-3833 capture: Fix discard in-app audio in
 device

---
 .../components/capture-media/capture-media.ts | 48 +++++++++++++++----
 1 file changed, 38 insertions(+), 10 deletions(-)

diff --git a/src/core/features/emulator/components/capture-media/capture-media.ts b/src/core/features/emulator/components/capture-media/capture-media.ts
index 4d7fabd8e..2345ade66 100644
--- a/src/core/features/emulator/components/capture-media/capture-media.ts
+++ b/src/core/features/emulator/components/capture-media/capture-media.ts
@@ -130,7 +130,27 @@ export class CoreEmulatorCaptureMediaComponent implements OnInit, OnDestroy {
      * @return Promise resolved when ready.
      */
     protected async initCordovaMediaPlugin(): Promise<void> {
+
+        try {
+            await this.createFileAndMediaInstance();
+
+            this.readyToCapture = true;
+            this.previewMedia = this.previewAudio?.nativeElement;
+        } catch (error) {
+            this.dismissWithError(-1, error.message || error);
+        }
+    }
+
+    /**
+     * Create a file entry and the cordova media instance.
+     */
+    protected async createFileAndMediaInstance(): Promise<void> {
         this.filePath = this.getFilePath();
+
+        // First create the file.
+        this.fileEntry = await CoreFile.createFile(this.filePath);
+
+        // Now create the media instance.
         let absolutePath = CoreText.concatenatePaths(CoreFile.getBasePathInstant(), this.filePath);
 
         if (Platform.is('ios')) {
@@ -138,17 +158,21 @@ export class CoreEmulatorCaptureMediaComponent implements OnInit, OnDestroy {
             absolutePath = absolutePath.replace(/^file:\/\//, '');
         }
 
-        try {
-            // First create the file.
-            this.fileEntry = await CoreFile.createFile(this.filePath);
+        this.mediaFile = Media.create(absolutePath);
+    }
 
-            // Now create the media instance.
-            this.mediaFile = Media.create(absolutePath);
-            this.readyToCapture = true;
-            this.previewMedia = this.previewAudio?.nativeElement;
-        } catch (error) {
-            this.dismissWithError(-1, error.message || error);
+    /**
+     * Reset the file and the cordova media instance.
+     */
+    protected async resetCordovaMediaCapture(): Promise<void> {
+        if (this.filePath) {
+            // Remove old file, don't block the user for this.
+            CoreFile.removeFile(this.filePath);
         }
+
+        this.mediaFile?.release();
+
+        await this.createFileAndMediaInstance();
     }
 
     /**
@@ -410,11 +434,15 @@ export class CoreEmulatorCaptureMediaComponent implements OnInit, OnDestroy {
     /**
      * Discard the captured media.
      */
-    discard(): void {
+    async discard(): Promise<void> {
         this.previewMedia?.pause();
         this.streamVideo?.nativeElement.play();
         this.audioDrawer?.start();
 
+        if (this.isCordovaAudioCapture) {
+            await this.resetCordovaMediaCapture();
+        }
+
         this.hasCaptured = false;
         this.isCapturing = false;
         this.resetChrono = true;

From ef405e4309419cf83646c5b9026a8e8f296b968c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 7 Apr 2022 13:28:08 +0200
Subject: [PATCH 0951/1008] MOBILE-3833 capture: Fix non-null assertions and
 types

---
 .../components/capture-media/capture-media.ts   | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/core/features/emulator/components/capture-media/capture-media.ts b/src/core/features/emulator/components/capture-media/capture-media.ts
index 2345ade66..b226d5b61 100644
--- a/src/core/features/emulator/components/capture-media/capture-media.ts
+++ b/src/core/features/emulator/components/capture-media/capture-media.ts
@@ -229,7 +229,8 @@ export class CoreEmulatorCaptureMediaComponent implements OnInit, OnDestroy {
                 return;
             }
 
-            if (!this.streamVideo) {
+            const streamVideo = this.streamVideo;
+            if (!streamVideo) {
                 throw new CoreError('Video element not found.');
             }
 
@@ -245,7 +246,7 @@ export class CoreEmulatorCaptureMediaComponent implements OnInit, OnDestroy {
             }, 10000);
 
             // Listen for stream ready to display the stream.
-            this.streamVideo.nativeElement.onloadedmetadata = (): void => {
+            streamVideo.nativeElement.onloadedmetadata = (): void => {
                 if (hasLoaded) {
                     // Already loaded or timeout triggered, stop.
                     return;
@@ -254,19 +255,13 @@ export class CoreEmulatorCaptureMediaComponent implements OnInit, OnDestroy {
                 hasLoaded = true;
                 clearTimeout(waitTimeout);
                 this.readyToCapture = true;
-                this.streamVideo!.nativeElement.onloadedmetadata = null;
+                streamVideo.nativeElement.onloadedmetadata = null;
                 // Force change detection. Angular doesn't detect these async operations.
                 this.changeDetectorRef.detectChanges();
             };
 
             // Set the stream as the source of the video.
-            if ('srcObject' in this.streamVideo.nativeElement) {
-                this.streamVideo.nativeElement.srcObject = this.localMediaStream;
-            } else {
-                // Fallback for old browsers.
-                // See https://developer.mozilla.org/en-US/docs/Web/API/HTMLMediaElement/srcObject#Examples
-                this.streamVideo.nativeElement.src = window.URL.createObjectURL(this.localMediaStream);
-            }
+            streamVideo.nativeElement.srcObject = this.localMediaStream;
         } catch (error) {
             this.dismissWithError(-1, error.message || error);
         }
@@ -399,7 +394,7 @@ export class CoreEmulatorCaptureMediaComponent implements OnInit, OnDestroy {
             this.imgCanvas.nativeElement.getContext('2d').drawImage(this.streamVideo?.nativeElement, 0, 0, width, height);
 
             // Convert the image to blob and show it in an image element.
-            this.imgCanvas.nativeElement.toBlob((blob) => {
+            this.imgCanvas.nativeElement.toBlob((blob: Blob) => {
                 loadingModal.dismiss();
 
                 this.mediaBlob = blob;

From eac072593749caab447a8d132b8879d4c2901703 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 7 Apr 2022 16:51:53 +0200
Subject: [PATCH 0952/1008] MOBILE-3833 messages: Fix offline messages label

---
 src/addons/messages/pages/discussion/discussion.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/addons/messages/pages/discussion/discussion.html b/src/addons/messages/pages/discussion/discussion.html
index 924b36f7b..bb9cc05ff 100644
--- a/src/addons/messages/pages/discussion/discussion.html
+++ b/src/addons/messages/pages/discussion/discussion.html
@@ -76,7 +76,7 @@
                     {{ message.timecreated | coreFormatDate: "strftimedayshort" }}
                 </h3>
 
-                <ion-chip class="addon-messages-unreadfrom" *ngIf="unreadMessageFrom && message.id == unreadMessageFrom" color="light">
+                <ion-chip class="addon-messages-unreadfrom" *ngIf="unreadMessageFrom > 0 && message.id == unreadMessageFrom" color="light">
                     <ion-label>{{ 'addon.messages.newmessages' | translate }}</ion-label>
                     <ion-icon name="fas-arrow-down" aria-hidden="true"></ion-icon>
                 </ion-chip>

From 8c41be35207a2ae415438ea956e123b863772b1e Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 7 Apr 2022 10:05:28 +0200
Subject: [PATCH 0953/1008] MOBILE-3833 core: Block logout when a form is
 active

---
 scripts/langindex.json                             |  1 +
 .../mainmenu/components/user-menu/user-menu.ts     | 14 +++++++++++++-
 src/core/lang.json                                 |  1 +
 src/core/services/navigator.ts                     |  9 +++++++++
 4 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 93ec25362..809db3959 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1465,6 +1465,7 @@
   "core.cannotconnecttrouble": "local_moodlemobileapp",
   "core.cannotconnectverify": "local_moodlemobileapp",
   "core.cannotdownloadfiles": "local_moodlemobileapp",
+  "core.cannotlogoutpageblocks": "local_moodlemobileapp",
   "core.cannotopeninapp": "local_moodlemobileapp",
   "core.cannotopeninappdownload": "local_moodlemobileapp",
   "core.captureaudio": "local_moodlemobileapp",
diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.ts b/src/core/features/mainmenu/components/user-menu/user-menu.ts
index e3cda789c..c20d16bce 100644
--- a/src/core/features/mainmenu/components/user-menu/user-menu.ts
+++ b/src/core/features/mainmenu/components/user-menu/user-menu.ts
@@ -28,7 +28,7 @@ import {
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
-import { ModalController } from '@singletons';
+import { ModalController, Translate } from '@singletons';
 import { Subscription } from 'rxjs';
 
 /**
@@ -172,6 +172,12 @@ export class CoreMainMenuUserMenuComponent implements OnInit, OnDestroy {
      * @param event Click event
      */
     async logout(event: Event): Promise<void> {
+        if (CoreNavigator.currentRouteCanBlockLeave()) {
+            await CoreDomUtils.showAlert(undefined, Translate.instant('core.cannotlogoutpageblocks'));
+
+            return;
+        }
+
         if (this.removeAccountOnLogout) {
             // Ask confirm.
             const siteName = this.siteName ?
@@ -200,6 +206,12 @@ export class CoreMainMenuUserMenuComponent implements OnInit, OnDestroy {
      * @param event Click event
      */
     async switchAccounts(event: Event): Promise<void> {
+        if (CoreNavigator.currentRouteCanBlockLeave()) {
+            await CoreDomUtils.showAlert(undefined, Translate.instant('core.cannotlogoutpageblocks'));
+
+            return;
+        }
+
         const thisModal = await ModalController.getTop();
 
         event.preventDefault();
diff --git a/src/core/lang.json b/src/core/lang.json
index 7429c930b..a3e73bb03 100644
--- a/src/core/lang.json
+++ b/src/core/lang.json
@@ -18,6 +18,7 @@
     "cannotconnecttrouble": "We're having trouble connecting to your site.",
     "cannotconnectverify": "<strong>Please check the address is correct.</strong>",
     "cannotdownloadfiles": "File downloading is disabled. Please contact your site administrator.",
+    "cannotlogoutpageblocks": "Please save or discard your changes before continuing.",
     "cannotopeninapp": "This file may not work as expected on this device. Would you like to open it anyway?",
     "cannotopeninappdownload": "This file may not work as expected on this device. Would you like to download it anyway?",
     "captureaudio": "Record audio",
diff --git a/src/core/services/navigator.ts b/src/core/services/navigator.ts
index e2613e579..a33abca58 100644
--- a/src/core/services/navigator.ts
+++ b/src/core/services/navigator.ts
@@ -658,6 +658,15 @@ export class CoreNavigatorService {
         }
     }
 
+    /**
+     * Check if the current route page can block leaving the route.
+     *
+     * @return Whether the current route page can block leaving the route.
+     */
+    currentRouteCanBlockLeave(): boolean {
+        return !!this.getCurrentRoute().snapshot.routeConfig?.canDeactivate?.length;
+    }
+
 }
 
 export const CoreNavigator = makeSingleton(CoreNavigatorService);

From eb9a6f1023b07a6eb2fb30a668a014473f63630c Mon Sep 17 00:00:00 2001
From: Alfonso Salces <alfonso.salces@moodle.com>
Date: Fri, 8 Apr 2022 09:44:59 +0200
Subject: [PATCH 0954/1008] MOBILE-3833 site-onboarding: Do not show browser
 warning before open url

---
 .../login/components/site-onboarding/site-onboarding.ts         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/features/login/components/site-onboarding/site-onboarding.ts b/src/core/features/login/components/site-onboarding/site-onboarding.ts
index b0ae8e338..3a15a6f03 100644
--- a/src/core/features/login/components/site-onboarding/site-onboarding.ts
+++ b/src/core/features/login/components/site-onboarding/site-onboarding.ts
@@ -79,7 +79,7 @@ export class CoreLoginSiteOnboardingComponent {
 
         this.saveOnboardingDone();
 
-        CoreUtils.openInBrowser('https://moodle.com/getstarted/');
+        CoreUtils.openInBrowser('https://moodle.com/getstarted/', { showBrowserWarning: false });
 
         ModalController.dismiss();
     }

From d4695dd845f772ba1a67b660b29df6a2c76be97c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 8 Apr 2022 10:23:18 +0200
Subject: [PATCH 0955/1008] MOBILE-3833 course: Display loading in course index

This improves performance in old deviced or big courses
---
 .../components/course-index/course-index.html | 127 +++++++++---------
 .../components/course-index/course-index.ts   |   9 ++
 2 files changed, 75 insertions(+), 61 deletions(-)

diff --git a/src/core/features/course/components/course-index/course-index.html b/src/core/features/course/components/course-index/course-index.html
index 8de92a89b..7fca7f10e 100644
--- a/src/core/features/course/components/course-index/course-index.html
+++ b/src/core/features/course/components/course-index/course-index.html
@@ -11,74 +11,79 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-list id="core-course-section-selector" role="listbox" aria-labelledby="core-course-section-selector-label">
-        <ng-container *ngFor="let section of sectionsToRender">
-            <ion-item *ngIf="allSectionId == section.id" class="divider core-course-index-all"
-                (click)="selectSectionOrModule($event, section.id)" button [class.item-current]="selectedId === section.id" detail="false">
-                <ion-label>
-                    <h2>
-                        <core-format-text [text]="section.name" contextLevel="course" [contextInstanceId]="course?.id">
-                        </core-format-text>
-                    </h2>
-                </ion-label>
-            </ion-item>
-            <ng-container *ngIf="allSectionId != section.id">
-                <ion-item class="divider section" (click)="selectSectionOrModule($event, section.id)" button
-                    [class.item-current]="selectedId === section.id" [class.item-dimmed]="!section.visible"
-                    [class.item-hightlighted]="section.highlighted" detail="false" sticky="true">
-                    <ion-icon *ngIf="section.hasVisibleModules" name="fas-chevron-right" flip-rtl slot="start"
-                        class="expandable-status-icon" (click)="toggleExpand($event, section)"
-                        [attr.aria-label]="(section.expanded ? 'core.collapse' : 'core.expand') | translate"
-                        [attr.aria-expanded]="section.expanded" [attr.aria-controls]="'core-course-index-section-' + section.id"
-                        [class.expandable-status-icon-expanded]="section.expanded">
-                    </ion-icon>
-                    <ion-icon *ngIf="!section.hasVisibleModules" name="" slot="start" aria-hidden="true" class="expandable-status-icon">
-                    </ion-icon>
+    <core-loading [hideUntil]="loaded">
+        <ion-list *ngIf="loaded" id="core-course-section-selector" role="listbox" aria-labelledby="core-course-section-selector-label">
+            <ng-container *ngFor="let section of sectionsToRender">
+                <ion-item *ngIf="allSectionId == section.id" class="divider core-course-index-all"
+                    (click)="selectSectionOrModule($event, section.id)" button [class.item-current]="selectedId === section.id"
+                    detail="false">
                     <ion-label>
                         <h2>
                             <core-format-text [text]="section.name" contextLevel="course" [contextInstanceId]="course?.id">
                             </core-format-text>
                         </h2>
                     </ion-label>
-                    <ion-badge *ngIf="section.highlighted && highlighted" slot="end">{{highlighted}}</ion-badge>
-                    <ion-icon name="fas-lock" *ngIf="section.availabilityinfo" slot="end" class="restricted"
-                        [attr.aria-label]="'core.restricted' | translate"></ion-icon>
-                    <ion-icon name="fas-eye-slash" *ngIf="!section.visible && !section.uservisible" slot="end" class="restricted"
-                        [attr.aria-label]="'core.notavailable' | translate"></ion-icon>
-                    <ion-icon name="fas-eye-slash" *ngIf="!section.visible && section.uservisible" slot="end" class="restricted"
-                        [attr.aria-label]="'core.course.hiddenfromstudents' | translate"></ion-icon>
                 </ion-item>
-                <div id="core-course-index-section-{{section.id}}">
-                    <ng-container *ngIf="section.expanded">
-                        <ng-container *ngFor="let module of section.modules">
-                            <ion-item class="module" [class.item-dimmed]="!module.visible" [class.item-hightlighted]="section.highlighted"
-                                (click)="selectSectionOrModule($event, section.id, module.id)" button>
-                                <ion-icon class="completioninfo completion_none" name="" *ngIf="module.completionStatus === undefined"
-                                    slot="start" aria-hidden="true"></ion-icon>
-                                <ion-icon class="completioninfo completion_incomplete" name="far-circle"
-                                    *ngIf="module.completionStatus === 0" slot="start" [attr.aria-label]="'core.course.todo' | translate">
-                                </ion-icon>
-                                <ion-icon class="completioninfo completion_complete" name="fas-circle"
-                                    *ngIf="module.completionStatus === 1 || module.completionStatus === 2" color="success" slot="start"
-                                    [attr.aria-label]="'core.course.done' | translate">
-                                </ion-icon>
-                                <ion-icon class="completioninfo completion_fail" name="fas-circle" *ngIf="module.completionStatus === 3"
-                                    color="danger" slot="start" [attr.aria-label]="'core.course.failed' | translate">
-                                </ion-icon>
-                                <ion-label>
-                                    <p class="item-heading">
-                                        <core-format-text [text]="module.name" contextLevel="module" [contextInstanceId]="module.id"
-                                            [courseId]="module.course">
-                                        </core-format-text>
-                                    </p>
-                                </ion-label>
-                                <ion-icon name="fas-lock" *ngIf="!module.uservisible" slot="end" class="restricted"
-                                    [attr.aria-label]="'core.restricted' | translate"></ion-icon>
-                            </ion-item>
+                <ng-container *ngIf="allSectionId != section.id">
+                    <ion-item class="divider section" (click)="selectSectionOrModule($event, section.id)" button
+                        [class.item-current]="selectedId === section.id" [class.item-dimmed]="!section.visible"
+                        [class.item-hightlighted]="section.highlighted" detail="false" sticky="true">
+                        <ion-icon *ngIf="section.hasVisibleModules" name="fas-chevron-right" flip-rtl slot="start"
+                            class="expandable-status-icon" (click)="toggleExpand($event, section)"
+                            [attr.aria-label]="(section.expanded ? 'core.collapse' : 'core.expand') | translate"
+                            [attr.aria-expanded]="section.expanded" [attr.aria-controls]="'core-course-index-section-' + section.id"
+                            [class.expandable-status-icon-expanded]="section.expanded">
+                        </ion-icon>
+                        <ion-icon *ngIf="!section.hasVisibleModules" name="" slot="start" aria-hidden="true" class="expandable-status-icon">
+                        </ion-icon>
+                        <ion-label>
+                            <h2>
+                                <core-format-text [text]="section.name" contextLevel="course" [contextInstanceId]="course?.id">
+                                </core-format-text>
+                            </h2>
+                        </ion-label>
+                        <ion-badge *ngIf="section.highlighted && highlighted" slot="end">{{highlighted}}</ion-badge>
+                        <ion-icon name="fas-lock" *ngIf="section.availabilityinfo" slot="end" class="restricted"
+                            [attr.aria-label]="'core.restricted' | translate"></ion-icon>
+                        <ion-icon name="fas-eye-slash" *ngIf="!section.visible && !section.uservisible" slot="end" class="restricted"
+                            [attr.aria-label]="'core.notavailable' | translate"></ion-icon>
+                        <ion-icon name="fas-eye-slash" *ngIf="!section.visible && section.uservisible" slot="end" class="restricted"
+                            [attr.aria-label]="'core.course.hiddenfromstudents' | translate"></ion-icon>
+                    </ion-item>
+                    <div id="core-course-index-section-{{section.id}}">
+                        <ng-container *ngIf="section.expanded">
+                            <ng-container *ngFor="let module of section.modules">
+                                <ion-item class="module" [class.item-dimmed]="!module.visible"
+                                    [class.item-hightlighted]="section.highlighted"
+                                    (click)="selectSectionOrModule($event, section.id, module.id)" button>
+                                    <ion-icon class="completioninfo completion_none" name="" *ngIf="module.completionStatus === undefined"
+                                        slot="start" aria-hidden="true"></ion-icon>
+                                    <ion-icon class="completioninfo completion_incomplete" name="far-circle"
+                                        *ngIf="module.completionStatus === 0" slot="start"
+                                        [attr.aria-label]="'core.course.todo' | translate">
+                                    </ion-icon>
+                                    <ion-icon class="completioninfo completion_complete" name="fas-circle"
+                                        *ngIf="module.completionStatus === 1 || module.completionStatus === 2" color="success" slot="start"
+                                        [attr.aria-label]="'core.course.done' | translate">
+                                    </ion-icon>
+                                    <ion-icon class="completioninfo completion_fail" name="fas-circle" *ngIf="module.completionStatus === 3"
+                                        color="danger" slot="start" [attr.aria-label]="'core.course.failed' | translate">
+                                    </ion-icon>
+                                    <ion-label>
+                                        <p class="item-heading">
+                                            <core-format-text [text]="module.name" contextLevel="module" [contextInstanceId]="module.id"
+                                                [courseId]="module.course">
+                                            </core-format-text>
+                                        </p>
+                                    </ion-label>
+                                    <ion-icon name="fas-lock" *ngIf="!module.uservisible" slot="end" class="restricted"
+                                        [attr.aria-label]="'core.restricted' | translate"></ion-icon>
+                                </ion-item>
+                            </ng-container>
                         </ng-container>
-                    </ng-container>
-                </div>
+                    </div>
+                </ng-container>
             </ng-container>
-        </ng-container>
-    </ion-list>
+        </ion-list>
+    </core-loading>
 </ion-content>
diff --git a/src/core/features/course/components/course-index/course-index.ts b/src/core/features/course/components/course-index/course-index.ts
index f2a66fdde..3e9ee1499 100644
--- a/src/core/features/course/components/course-index/course-index.ts
+++ b/src/core/features/course/components/course-index/course-index.ts
@@ -21,6 +21,7 @@ import {
 import { CoreCourseHelper, CoreCourseSection } from '@features/course/services/course-helper';
 import { CoreCourseFormatDelegate } from '@features/course/services/format-delegate';
 import { CoreCourseAnyCourseData } from '@features/courses/services/courses';
+import { CoreUtils } from '@services/utils/utils';
 import { ModalController } from '@singletons';
 import { CoreDom } from '@singletons/dom';
 
@@ -41,6 +42,7 @@ export class CoreCourseCourseIndexComponent implements OnInit {
     allSectionId = CoreCourseProvider.ALL_SECTIONS_ID;
     highlighted?: string;
     sectionsToRender: CourseIndexSection[] = [];
+    loaded = false;
 
     constructor(
         protected elementRef: ElementRef,
@@ -109,6 +111,13 @@ export class CoreCourseCourseIndexComponent implements OnInit {
 
         this.highlighted = CoreCourseFormatDelegate.getSectionHightlightedName(this.course);
 
+        // Wait a bit to render the data, otherwise the modal takes a while to appear in big courses or slow devices.
+        await CoreUtils.wait(400);
+
+        this.loaded = true;
+
+        await CoreUtils.nextTick();
+
         CoreDom.scrollToElement(
             this.elementRef.nativeElement,
             '.item.item-current',

From 0e74f735493f7fdb9eeb50af5311ce4724395665 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 8 Apr 2022 12:19:54 +0200
Subject: [PATCH 0956/1008] MOBILE-3833 core: Save public config in cache

---
 src/core/classes/site.ts                      | 83 ++++++++++++++++++-
 .../login/pages/reconnect/reconnect.ts        |  6 +-
 .../features/login/services/handlers/cron.ts  |  6 +-
 src/core/services/sites.ts                    |  4 +-
 4 files changed, 92 insertions(+), 7 deletions(-)

diff --git a/src/core/classes/site.ts b/src/core/classes/site.ts
index 693830b19..3420106dc 100644
--- a/src/core/classes/site.ts
+++ b/src/core/classes/site.ts
@@ -41,7 +41,7 @@ import { CoreLogger } from '@singletons/logger';
 import { Translate } from '@singletons';
 import { CoreIonLoadingElement } from './ion-loading';
 import { CoreLang } from '@services/lang';
-import { CoreSites } from '@services/sites';
+import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
 import { asyncInstance, AsyncInstance } from '../utils/async-instance';
 import { CoreDatabaseTable } from './database/database-table';
 import { CoreDatabaseCachingStrategy } from './database/database-table-proxy';
@@ -1389,9 +1389,88 @@ export class CoreSite {
     /**
      * Get the public config of this site.
      *
+     * @param options Options.
      * @return Promise resolved with public config. Rejected with an object if error, see CoreWSProvider.callAjax.
      */
-    async getPublicConfig(): Promise<CoreSitePublicConfigResponse> {
+    async getPublicConfig(options: { readingStrategy?: CoreSitesReadingStrategy } = {}): Promise<CoreSitePublicConfigResponse> {
+        if (!this.db) {
+            return this.requestPublicConfig();
+        }
+
+        const method = 'tool_mobile_get_public_config';
+        const cacheId = this.getCacheId(method, {});
+        const cachePreSets: CoreSiteWSPreSets = {
+            getFromCache: true,
+            saveToCache: true,
+            emergencyCache: true,
+            ...CoreSites.getReadingStrategyPreSets(options.readingStrategy),
+        };
+
+        if (this.offlineDisabled) {
+            // Offline is disabled, don't use cache.
+            cachePreSets.getFromCache = false;
+            cachePreSets.saveToCache = false;
+            cachePreSets.emergencyCache = false;
+        }
+
+        // Check for an ongoing identical request if we're not ignoring cache.
+        if (cachePreSets.getFromCache && this.ongoingRequests[cacheId]) {
+            const response = await this.ongoingRequests[cacheId];
+
+            return response;
+        }
+
+        const promise = this.getFromCache<CoreSitePublicConfigResponse>(method, {}, cachePreSets, false).catch(async () => {
+            if (cachePreSets.forceOffline) {
+                // Don't call the WS, just fail.
+                throw new CoreError(
+                    Translate.instant('core.cannotconnect', { $a: CoreSite.MINIMUM_MOODLE_VERSION }),
+                );
+            }
+
+            // Call the WS.
+            try {
+                const config = await this.requestPublicConfig();
+
+                if (cachePreSets.saveToCache) {
+                    this.saveToCache(method, {}, config, cachePreSets);
+                }
+
+                return config;
+            } catch (error) {
+                cachePreSets.omitExpires = true;
+                cachePreSets.getFromCache = true;
+
+                try {
+                    return await this.getFromCache<CoreSitePublicConfigResponse>(method, {}, cachePreSets, true);
+                } catch {
+                    throw error;
+                }
+            }
+        });
+
+        this.ongoingRequests[cacheId] = promise;
+
+        // Clear ongoing request after setting the promise (just in case it's already resolved).
+        try {
+            const response = await promise;
+
+            // We pass back a clone of the original object, this may prevent errors if in the callback the object is modified.
+            return response;
+        } finally {
+            // Make sure we don't clear the promise of a newer request that ignores the cache.
+            if (this.ongoingRequests[cacheId] === promise) {
+                delete this.ongoingRequests[cacheId];
+            }
+        }
+    }
+
+    /**
+     * Perform a request to the server to get the public config of this site.
+     *
+     * @return Promise resolved with public config.
+     */
+    protected async requestPublicConfig(): Promise<CoreSitePublicConfigResponse> {
         const preSets: CoreWSAjaxPreSets = {
             siteUrl: this.siteUrl,
         };
diff --git a/src/core/features/login/pages/reconnect/reconnect.ts b/src/core/features/login/pages/reconnect/reconnect.ts
index f40c6fd05..c8a8acf37 100644
--- a/src/core/features/login/pages/reconnect/reconnect.ts
+++ b/src/core/features/login/pages/reconnect/reconnect.ts
@@ -16,7 +16,7 @@ import { Component, OnInit, OnDestroy, ViewChild, ElementRef } from '@angular/co
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 
 import { CoreApp } from '@services/app';
-import { CoreSites } from '@services/sites';
+import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreLoginHelper } from '@features/login/services/login-helper';
@@ -132,7 +132,9 @@ export class CoreLoginReconnectPage implements OnInit, OnDestroy {
      * Get some data (like identity providers) from the site config.
      */
     protected async checkSiteConfig(site: CoreSite): Promise<void> {
-        this.siteConfig = await CoreUtils.ignoreErrors(site.getPublicConfig());
+        this.siteConfig = await CoreUtils.ignoreErrors(site.getPublicConfig({
+            readingStrategy: CoreSitesReadingStrategy.PREFER_NETWORK,
+        }));
 
         if (!this.siteConfig) {
             return;
diff --git a/src/core/features/login/services/handlers/cron.ts b/src/core/features/login/services/handlers/cron.ts
index 2add95869..3b6c53838 100644
--- a/src/core/features/login/services/handlers/cron.ts
+++ b/src/core/features/login/services/handlers/cron.ts
@@ -14,7 +14,7 @@
 
 import { Injectable } from '@angular/core';
 import { CoreCronHandler } from '@services/cron';
-import { CoreSites } from '@services/sites';
+import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
 import { makeSingleton } from '@singletons';
 
@@ -39,7 +39,9 @@ export class CoreLoginCronHandlerService implements CoreCronHandler {
         // Do not check twice in the same 10 minutes.
         const site = await CoreSites.getSite(siteId);
 
-        const config = await CoreUtils.ignoreErrors(site.getPublicConfig());
+        const config = await CoreUtils.ignoreErrors(site.getPublicConfig({
+            readingStrategy: CoreSitesReadingStrategy.ONLY_NETWORK,
+        }));
 
         CoreUtils.ignoreErrors(CoreSites.checkApplication(config));
     }
diff --git a/src/core/services/sites.ts b/src/core/services/sites.ts
index 3666de2df..64c5af804 100644
--- a/src/core/services/sites.ts
+++ b/src/core/services/sites.ts
@@ -897,7 +897,9 @@ export class CoreSitesProvider {
      */
     protected async getPublicConfigAndCheckApplication(site: CoreSite): Promise<void> {
         try {
-            const config = await site.getPublicConfig();
+            const config = await site.getPublicConfig({
+                readingStrategy: CoreSitesReadingStrategy.ONLY_NETWORK,
+            });
 
             await this.checkApplication(config);
         } catch {

From 7da65f383cbb3e6a0db19b3697bc07d9be92e988 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 8 Apr 2022 13:27:13 +0200
Subject: [PATCH 0957/1008] MOBILE-3833 style: Fix margin on chip with non
 slotted icons

---
 src/theme/theme.base.scss | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 32100b047..fe26a3881 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -1054,8 +1054,15 @@ ion-button.chip {
     ion-icon {
         font-size: 16px;
         min-width: 16px;
+        @include margin(0, 8px, 0, 0);
     }
 
+    ion-label {
+        white-space: normal !important;
+    }
+}
+
+ion-button.chip {
     ion-icon[slot=start] {
         @include margin(0, 8px, 0, 0);
     }
@@ -1063,10 +1070,6 @@ ion-button.chip {
     ion-icon[slot=end] {
         @include margin(0, 0, 0, 8px);
     }
-
-    ion-label {
-        white-space: normal !important;
-    }
 }
 
 ion-chip {

From 9975cedf9e19e5e8a8c1609be7f1a53dee2059d0 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 8 Apr 2022 15:23:51 +0200
Subject: [PATCH 0958/1008] MOBILE-3833 workshop: Fix required 'profile' param
 not found

---
 src/addons/mod/workshop/pages/assessment/assessment.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/addons/mod/workshop/pages/assessment/assessment.ts b/src/addons/mod/workshop/pages/assessment/assessment.ts
index 0c074a4f9..c15c1195f 100644
--- a/src/addons/mod/workshop/pages/assessment/assessment.ts
+++ b/src/addons/mod/workshop/pages/assessment/assessment.ts
@@ -53,7 +53,7 @@ export class AddonModWorkshopAssessmentPage implements OnInit, OnDestroy, CanLea
 
     assessment!: AddonModWorkshopSubmissionAssessmentWithFormData;
     submission!: AddonModWorkshopSubmissionData;
-    profile!: CoreUserProfile;
+    profile?: CoreUserProfile;
     courseId!: number;
     access?: AddonModWorkshopGetWorkshopAccessInformationWSResponse;
     assessmentId!: number;
@@ -120,7 +120,7 @@ export class AddonModWorkshopAssessmentPage implements OnInit, OnDestroy, CanLea
         try {
             this.assessment = CoreNavigator.getRequiredRouteParam<AddonModWorkshopSubmissionAssessmentWithFormData>('assessment');
             this.submission = CoreNavigator.getRequiredRouteParam<AddonModWorkshopSubmissionData>('submission');
-            this.profile = CoreNavigator.getRequiredRouteParam<CoreUserProfile>('profile');
+            this.profile = CoreNavigator.getRouteParam<CoreUserProfile>('profile');
             this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
         } catch (error) {
             CoreDomUtils.showErrorModal(error);
@@ -195,7 +195,7 @@ export class AddonModWorkshopAssessmentPage implements OnInit, OnDestroy, CanLea
 
             // Get all info of the assessment.
             const assessment = await AddonModWorkshopHelper.getReviewerAssessmentById(this.workshopId, this.assessmentId, {
-                userId: this.profile && this.profile.id,
+                userId: this.profile?.id,
                 cmId: this.workshop.coursemodule,
             });
 

From c5b8b4fb1998fd0bcb63e6dfe876f1f1fcc6d1d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 8 Apr 2022 14:11:52 +0200
Subject: [PATCH 0959/1008] MOBILE-3833 assignment: Add collapsible footer
 action buttons

---
 .../index/addon-mod-assign-index.html         |   3 -
 .../addon-mod-assign-submission.html          | 159 ++++++++++--------
 .../components/submission/submission.ts       |   3 +-
 src/core/classes/tabs.ts                      |   3 +
 4 files changed, 90 insertions(+), 78 deletions(-)

diff --git a/src/addons/mod/assign/components/index/addon-mod-assign-index.html b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
index 5aa7a97af..599a85136 100644
--- a/src/addons/mod/assign/components/index/addon-mod-assign-index.html
+++ b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
@@ -134,6 +134,3 @@
         [moduleId]="module.id">
     </addon-mod-assign-submission>
 </core-loading>
-
-<core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModuleId]="module.id">
-</core-course-module-navigation>
diff --git a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
index 42dde1d55..753b18636 100644
--- a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
+++ b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
@@ -37,7 +37,7 @@
         </ion-item>
 
         <!-- Tabs: see the submission or grade it. -->
-        <core-tabs [selectedIndex]="selectedTab" [hideUntil]="loaded" parentScrollable="true" (ionChange)="tabSelected($event)">
+        <core-tabs [hideUntil]="loaded" parentScrollable="true" (ionChange)="tabSelected($event)">
             <!-- View the submission tab. -->
             <core-tab [title]="'addon.mod_assign.submission' | translate" id="submission">
                 <ng-template>
@@ -139,79 +139,6 @@
                         [submission]="userSubmission" [plugin]="plugin">
                     </addon-mod-assign-submission-plugin>
 
-                    <!-- Add or edit submission. -->
-                    <ion-item class="ion-text-wrap" *ngIf="canEdit">
-                        <ion-label>
-                            <div *ngIf="!unsupportedEditPlugins.length && !showErrorStatementEdit">
-                                <!-- If has offline data, show edit. -->
-                                <ion-button expand="block" class="ion-text-wrap" *ngIf="hasOffline" (click)="goToEdit()">
-                                    {{ 'addon.mod_assign.editsubmission' | translate }}
-                                </ion-button>
-                                <!-- If no submission or is new, show add submission. -->
-                                <ion-button expand="block" class="ion-text-wrap" (click)="goToEdit()" *ngIf="!hasOffline &&
-                                    (!userSubmission || !userSubmission!.status || userSubmission!.status == statusNew)">
-                                    <ng-container *ngIf="!assign?.timelimit || userSubmission?.timestarted">
-                                        {{ 'addon.mod_assign.addsubmission' | translate }}
-                                    </ng-container>
-                                    <ng-container *ngIf="assign?.timelimit && (!userSubmission || !userSubmission.timestarted)">
-                                        {{ 'addon.mod_assign.beginassignment' | translate }}
-                                    </ng-container>
-                                </ion-button>
-                                <!-- If reopened, show addfromprevious and addnewattempt. -->
-                                <ng-container *ngIf="!hasOffline && userSubmission?.status == statusReopened">
-                                    <ion-button *ngIf="!isPreviousAttemptEmpty" expand="block" class="ion-text-wrap"
-                                        (click)="copyPrevious()">
-                                        {{ 'addon.mod_assign.addnewattemptfromprevious' | translate }}
-                                    </ion-button>
-                                    <ion-button expand="block" class="ion-text-wrap" (click)="goToEdit()">
-                                        {{ 'addon.mod_assign.addnewattempt' | translate }}
-                                    </ion-button>
-                                </ng-container>
-                                <!-- Else show editsubmission. -->
-                                <ion-button expand="block" class="ion-text-wrap" *ngIf="!hasOffline && userSubmission &&
-                                    userSubmission!.status && userSubmission!.status != statusNew &&
-                                    userSubmission!.status != statusReopened" (click)="goToEdit()">
-                                    {{ 'addon.mod_assign.editsubmission' | translate }}
-                                </ion-button>
-                            </div>
-                            <div *ngIf="unsupportedEditPlugins && unsupportedEditPlugins.length && !showErrorStatementEdit">
-                                <p class="core-danger-item">{{ 'addon.mod_assign.erroreditpluginsnotsupported' | translate }}</p>
-                                <p class="core-danger-item" *ngFor="let name of unsupportedEditPlugins">{{ name }}</p>
-                            </div>
-                            <div *ngIf="showErrorStatementEdit">
-                                <p class="core-danger-item">{{ 'addon.mod_assign.cannoteditduetostatementsubmission' | translate }}</p>
-                            </div>
-                        </ion-label>
-                    </ion-item>
-
-                    <!-- Submit for grading form. -->
-                    <ng-container *ngIf="canSubmit">
-                        <ion-item class="ion-text-wrap" *ngIf="submissionStatement">
-                            <ion-label>
-                                <core-format-text [text]="submissionStatement" [filter]="false"></core-format-text>
-                            </ion-label>
-                            <ion-checkbox slot="end" name="submissionstatement" [(ngModel)]="acceptStatement">
-                            </ion-checkbox>
-                        </ion-item>
-                        <!-- Submit button. -->
-                        <ion-item class="ion-text-wrap" *ngIf="!showErrorStatementSubmit">
-                            <ion-label>
-                                <ion-button expand="block" class="ion-text-wrap" (click)="submitForGrading(acceptStatement)">
-                                    {{ 'addon.mod_assign.submitassignment' | translate }}
-                                </ion-button>
-                                <p>{{ 'addon.mod_assign.submitassignment_help' | translate }}</p>
-                            </ion-label>
-                        </ion-item>
-                        <!-- Error because we lack submissions statement. -->
-                        <ion-item class="ion-text-wrap" *ngIf="showErrorStatementSubmit">
-                            <ion-label>
-                                <p class="core-danger-item">
-                                    {{ 'addon.mod_assign.cannotsubmitduetostatementsubmission' | translate }}
-                                </p>
-                            </ion-label>
-                        </ion-item>
-                    </ng-container>
-
                     <!-- Team members that need to submit it too. -->
                     <ion-item-divider class="ion-text-wrap" *ngIf="membersToSubmit && membersToSubmit.length > 0">
                         <ion-label>
@@ -236,6 +163,90 @@
                             </ion-item>
                         </ng-container>
                     </ng-container>
+
+                    <!-- Add or edit submission. -->
+                    <div collapsible-footer *ngIf="loaded && !isSubmittedForGrading" [hidden]="selectedTab !== 'submission'" slot="fixed">
+                        <div class="list-item-limited-width adaptable-buttons-row" *ngIf="canEdit || canSubmit">
+                            <ng-container *ngIf="canEdit">
+                                <ng-container *ngIf=" !unsupportedEditPlugins.length && !showErrorStatementEdit">
+                                    <!-- If has offline data, show edit. -->
+                                    <ion-button expand="block" class="ion-text-wrap" *ngIf="hasOffline" (click)="goToEdit()">
+                                        {{ 'addon.mod_assign.editsubmission' | translate }}
+                                    </ion-button>
+                                    <!-- If no submission or is new, show add submission. -->
+                                    <ion-button expand="block" class="ion-text-wrap" (click)="goToEdit()" *ngIf="!hasOffline &&
+                                        (!userSubmission || !userSubmission!.status || userSubmission!.status == statusNew)">
+                                        <ng-container *ngIf="!assign?.timelimit || userSubmission?.timestarted">
+                                            {{ 'addon.mod_assign.addsubmission' | translate }}
+                                        </ng-container>
+                                        <ng-container *ngIf="assign?.timelimit && (!userSubmission || !userSubmission.timestarted)">
+                                            {{ 'addon.mod_assign.beginassignment' | translate }}
+                                        </ng-container>
+                                    </ion-button>
+                                    <!-- If reopened, show addfromprevious and addnewattempt. -->
+                                    <ng-container *ngIf="!hasOffline && userSubmission?.status == statusReopened">
+                                        <ion-button *ngIf="!isPreviousAttemptEmpty" expand="block" class="ion-text-wrap"
+                                            (click)="copyPrevious()">
+                                            {{ 'addon.mod_assign.addnewattemptfromprevious' | translate }}
+                                        </ion-button>
+                                        <ion-button expand="block" class="ion-text-wrap" (click)="goToEdit()">
+                                            {{ 'addon.mod_assign.addnewattempt' | translate }}
+                                        </ion-button>
+                                    </ng-container>
+                                    <!-- Else show editsubmission. -->
+                                    <ion-button expand="block" class="ion-text-wrap" *ngIf="!hasOffline && userSubmission &&
+                                        userSubmission!.status && userSubmission!.status != statusNew &&
+                                        userSubmission!.status != statusReopened" (click)="goToEdit()">
+                                        {{ 'addon.mod_assign.editsubmission' | translate }}
+                                    </ion-button>
+                                </ng-container>
+                                <ion-item class="core-danger-item ion-text-wrap" *ngIf="(unsupportedEditPlugins
+                                    && unsupportedEditPlugins.length && !showErrorStatementEdit)|| showErrorStatementEdit">
+                                    <ion-label>
+                                        <ng-container
+                                            *ngIf="unsupportedEditPlugins && unsupportedEditPlugins.length && !showErrorStatementEdit">
+                                            <p>{{ 'addon.mod_assign.erroreditpluginsnotsupported' | translate }}</p>
+                                            <p *ngFor="let name of unsupportedEditPlugins">{{ name }}</p>
+                                        </ng-container>
+                                        <ng-container *ngIf="showErrorStatementEdit">
+                                            <p>{{ 'addon.mod_assign.cannoteditduetostatementsubmission' | translate }}</p>
+                                        </ng-container>
+                                    </ion-label>
+                                </ion-item>
+
+                            </ng-container>
+
+                            <!-- Submit for grading form. -->
+                            <ng-container *ngIf="canSubmit">
+                                <ion-item class="ion-text-wrap" *ngIf="submissionStatement">
+                                    <ion-label>
+                                        <core-format-text [text]="submissionStatement" [filter]="false"></core-format-text>
+                                    </ion-label>
+                                    <ion-checkbox slot="end" name="submissionstatement" [(ngModel)]="acceptStatement">
+                                    </ion-checkbox>
+                                </ion-item>
+                                <!-- Submit button. -->
+                                <ion-item class="ion-text-wrap" *ngIf="!showErrorStatementSubmit">
+                                    <ion-label>
+                                        <ion-button expand="block" class="ion-text-wrap" (click)="submitForGrading(acceptStatement)">
+                                            {{ 'addon.mod_assign.submitassignment' | translate }}
+                                        </ion-button>
+                                        <p>{{ 'addon.mod_assign.submitassignment_help' | translate }}</p>
+                                    </ion-label>
+                                </ion-item>
+                                <!-- Error because we lack submissions statement. -->
+                                <ion-item class="ion-text-wrap" *ngIf="showErrorStatementSubmit">
+                                    <ion-label>
+                                        <p class="core-danger-item">
+                                            {{ 'addon.mod_assign.cannotsubmitduetostatementsubmission' | translate }}
+                                        </p>
+                                    </ion-label>
+                                </ion-item>
+                            </ng-container>
+                        </div>
+                        <core-course-module-navigation [courseId]="courseId" [currentModuleId]="moduleId">
+                        </core-course-module-navigation>
+                    </div>
                 </ng-template>
             </core-tab>
 
diff --git a/src/addons/mod/assign/components/submission/submission.ts b/src/addons/mod/assign/components/submission/submission.ts
index 3699d2c59..f3c2f3840 100644
--- a/src/addons/mod/assign/components/submission/submission.ts
+++ b/src/addons/mod/assign/components/submission/submission.ts
@@ -184,7 +184,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
     }
 
     /**
-     * Component being initialized.
+     * @inheritdoc
      */
     ngOnInit(): void {
         this.isSubmittedForGrading = !!this.submitId;
@@ -1195,6 +1195,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
      * @param tab The tab that was selected.
      */
     tabSelected(tab: CoreTabComponent): void {
+        this.selectedTab = tab.id;
         // Block sync when selecting grade tab, unblock when leaving it.
         this.setGradeSyncBlocked(tab.id === 'grade');
     }
diff --git a/src/core/classes/tabs.ts b/src/core/classes/tabs.ts
index 61f006286..166711854 100644
--- a/src/core/classes/tabs.ts
+++ b/src/core/classes/tabs.ts
@@ -482,6 +482,9 @@ export class CoreTabsBaseComponent<T extends CoreTabBase> implements OnInit, Aft
      */
     async selectTab(tabId: string, e?: Event): Promise<void> {
         const index = this.tabs.findIndex((tab) => tabId == tab.id);
+        if (index < 0) {
+            return;
+        }
 
         return this.selectByIndex(index, e);
     }

From 72c516b88c29d9b08c63b8a13e544dc17856ad19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 8 Apr 2022 10:39:14 +0200
Subject: [PATCH 0960/1008] MOBILE-3833 settings: Warn user to restart app on
 language change

---
 scripts/langindex.json                        |  2 +
 src/core/features/settings/lang.json          |  6 +-
 .../settings/pages/general/general.ts         | 67 ++++++++++++++++---
 src/theme/theme.base.scss                     | 28 ++++++++
 4 files changed, 93 insertions(+), 10 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index bca4fe470..b245d6a4e 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -2167,6 +2167,8 @@
   "core.settings.cannotsyncloggedout": "local_moodlemobileapp",
   "core.settings.cannotsyncoffline": "local_moodlemobileapp",
   "core.settings.cannotsyncwithoutwifi": "local_moodlemobileapp",
+  "core.settings.changelanguage": "local_moodlemobileapp",
+  "core.settings.changelanguagealert": "local_moodlemobileapp",
   "core.settings.colorscheme": "local_moodlemobileapp",
   "core.settings.colorscheme-dark": "local_moodlemobileapp",
   "core.settings.colorscheme-light": "local_moodlemobileapp",
diff --git a/src/core/features/settings/lang.json b/src/core/features/settings/lang.json
index 29c25bbff..42114fcd0 100644
--- a/src/core/features/settings/lang.json
+++ b/src/core/features/settings/lang.json
@@ -6,11 +6,13 @@
     "cannotsyncloggedout": "This site cannot be synchronised because you've logged out. Please try again when you're logged in the site again.",
     "cannotsyncoffline": "Cannot synchronise offline.",
     "cannotsyncwithoutwifi": "Cannot synchronise because the current settings only allow to synchronise when connected to Wi-Fi. Please connect to a Wi-Fi network.",
-    "colorscheme": "Color Scheme",
+    "changelanguage": "Change to {{$a}}",
+    "changelanguagealert": "Changing the language will restart the app.",
     "colorscheme-dark": "Dark",
     "colorscheme-light": "Light",
-    "colorscheme-system": "System default",
     "colorscheme-system-notice": "System default mode will depend on your device support.",
+    "colorscheme-system": "System default",
+    "colorscheme": "Color Scheme",
     "compilationinfo": "Compilation info",
     "copyinfo": "Copy device info on the clipboard",
     "cordovadevicemodel": "Cordova device model",
diff --git a/src/core/features/settings/pages/general/general.ts b/src/core/features/settings/pages/general/general.ts
index e8ef89874..a1487f255 100644
--- a/src/core/features/settings/pages/general/general.ts
+++ b/src/core/features/settings/pages/general/general.ts
@@ -22,9 +22,10 @@ import { CorePushNotifications } from '@features/pushnotifications/services/push
 import { CoreSettingsHelper, CoreColorScheme, CoreZoomLevel } from '../../services/settings-helper';
 import { CoreApp } from '@services/app';
 import { CoreIframeUtils } from '@services/utils/iframe';
-import { Diagnostic } from '@singletons';
+import { Diagnostic, Translate } from '@singletons';
 import { CoreSites } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
+import { AlertButton } from '@ionic/angular';
 
 /**
  * Page that displays the general settings.
@@ -110,14 +111,64 @@ export class CoreSettingsGeneralPage {
     /**
      * Called when a new language is selected.
      */
-    languageChanged(): void {
-        CoreLang.changeCurrentLanguage(this.selectedLanguage).finally(async () => {
-            // Invalidate cache for all sites to get the content in the right language.
-            const sites = await CoreSites.getSitesInstances();
-            await CoreUtils.ignoreErrors(Promise.all(sites.map((site) => site.invalidateWsCache())));
+    async languageChanged(): Promise<void> {
+        const previousLanguage = await CoreLang.getCurrentLanguage();
+        if (this.selectedLanguage === previousLanguage) {
+            // Prevent opening again.
 
-            CoreEvents.trigger(CoreEvents.LANGUAGE_CHANGED, this.selectedLanguage);
-        });
+            return;
+        }
+
+        const previousLanguageCancel = Translate.instant('core.cancel');
+
+        try {
+            await CoreLang.changeCurrentLanguage(this.selectedLanguage);
+        } finally {
+            const langName = this.languages.find((lang) => lang.code == this.selectedLanguage)?.name;
+
+            const buttons: AlertButton[] = [
+                {
+                    text: previousLanguageCancel,
+                    role: 'cancel',
+                    handler: (): void => {
+                        clearTimeout(timeout);
+                        this.selectedLanguage = previousLanguage;
+                        CoreLang.changeCurrentLanguage(this.selectedLanguage);
+                    },
+                },
+                {
+                    text: Translate.instant('core.settings.changelanguage', { $a: langName }),
+                    cssClass: 'timed-button',
+                    handler: (): void => {
+                        clearTimeout(timeout);
+                        this.applyLanguageAndRestart();
+                    },
+                },
+            ];
+
+            const alert = await CoreDomUtils.showAlertWithOptions(
+                {
+                    message: Translate.instant('core.settings.changelanguagealert'),
+                    buttons,
+                },
+            );
+            const timeout = window.setTimeout(async () => {
+                await alert.dismiss();
+                this.applyLanguageAndRestart();
+            }, 10000);
+        }
+    }
+
+    /**
+     * Apply language changes and restart the app.
+     */
+    protected async applyLanguageAndRestart(): Promise<void> {
+        // Invalidate cache for all sites to get the content in the right language.
+        const sites = await CoreSites.getSitesInstances();
+        await CoreUtils.ignoreErrors(Promise.all(sites.map((site) => site.invalidateWsCache())));
+
+        CoreEvents.trigger(CoreEvents.LANGUAGE_CHANGED, this.selectedLanguage);
+        window.location.reload();
     }
 
     /**
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index fe26a3881..bfca7c48e 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -461,6 +461,34 @@ ion-alert.core-nohead {
     }
 }
 
+@keyframes scaleFrom0 {
+    from {
+        /* More performant than animating `width` */
+        transform: scaleX(0);
+    }
+}
+
+ion-alert .alert-button.timed-button{
+    position: relative;
+
+    &::before {
+        content: '';
+        position: absolute;
+        width: 100%;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        top: 0;
+        background-color: var(--primary-tint);
+        animation: scaleFrom0 10s forwards linear;
+        transform-origin: left;
+        @include rtl() {
+            transform-origin: right;
+        }
+        z-index: -1;
+    }
+}
+
 ion-alert {
     --border-radius: var(--huge-radius);
 

From 6af21412842dbf98c591f90b823292a594cd49ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 8 Apr 2022 16:17:47 +0200
Subject: [PATCH 0961/1008] MOBILE-3833 siteplugins: Use new icon function

---
 .../classes/handlers/module-handler.ts            | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/core/features/siteplugins/classes/handlers/module-handler.ts b/src/core/features/siteplugins/classes/handlers/module-handler.ts
index e501e91c6..57b415309 100644
--- a/src/core/features/siteplugins/classes/handlers/module-handler.ts
+++ b/src/core/features/siteplugins/classes/handlers/module-handler.ts
@@ -63,18 +63,18 @@ export class CoreSitePluginsModuleHandler extends CoreSitePluginsBaseHandler imp
     /**
      * @inheritdoc
      */
-    getData(
+    async getData(
         module: CoreCourseModuleData,
         courseId: number,
         sectionId?: number,
         forCoursePage?: boolean,
-    ): CoreCourseModuleHandlerData {
+    ): Promise<CoreCourseModuleHandlerData> {
         if (this.shouldOnlyDisplayDescription(module, forCoursePage)) {
             const title = module.description;
             module.description = '';
 
             return {
-                icon: this.getIconSrc(),
+                icon: await CoreCourse.getModuleIconSrc(module.modname, this.handlerSchema.displaydata?.icon),
                 title: title || '',
                 a11yTitle: '',
                 class: this.handlerSchema.displaydata?.class,
@@ -85,7 +85,7 @@ export class CoreSitePluginsModuleHandler extends CoreSitePluginsBaseHandler imp
         const showDowloadButton = this.handlerSchema.downloadbutton;
         const handlerData: CoreCourseModuleHandlerData = {
             title: module.name,
-            icon: this.getIconSrc(),
+            icon: await CoreCourse.getModuleIconSrc(module.modname, this.handlerSchema.displaydata?.icon),
             class: this.handlerSchema.displaydata?.class,
             showDownloadButton: showDowloadButton !== undefined ? showDowloadButton : hasOffline,
         };
@@ -198,13 +198,6 @@ export class CoreSitePluginsModuleHandler extends CoreSitePluginsBaseHandler imp
         }
     }
 
-    /**
-     * @inheritdoc
-     */
-    getIconSrc(): string | undefined {
-        return this.handlerSchema.displaydata?.icon;
-    }
-
     /**
      * @inheritdoc
      */

From 3ad99b7d3dd3820ef5f732af5561d9303a8e9f0e Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 7 Apr 2022 17:48:17 +0200
Subject: [PATCH 0962/1008] MOBILE-3833 usertours: Watch main menu visibility

---
 .../features/mainmenu/pages/menu/menu.html    |  3 +-
 src/core/features/mainmenu/pages/menu/menu.ts | 39 +++++++++++++++++--
 .../features/mainmenu/services/mainmenu.ts    |  2 +
 .../components/user-tour/user-tour.ts         | 19 +++++----
 4 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/src/core/features/mainmenu/pages/menu/menu.html b/src/core/features/mainmenu/pages/menu/menu.html
index b7a79fa7f..6ad0b0289 100644
--- a/src/core/features/mainmenu/pages/menu/menu.html
+++ b/src/core/features/mainmenu/pages/menu/menu.html
@@ -1,7 +1,6 @@
 <ion-tabs #mainTabs [hidden]="!showTabs" [class]="'placement-' + tabsPlacement"
     [class.tabshidden]="!isMainScreen && tabsPlacement == 'bottom'" (ionTabsDidChange)="tabChanged($event)">
-    <ion-tab-bar slot="bottom" class="mainmenu-tabs"
-        [@menuShowHideAnimation]="tabsPlacement == 'side' ? '' : (isMainScreen ? 'visible' : 'hidden')">
+    <ion-tab-bar slot="bottom" class="mainmenu-tabs" [@menuVisibilityAnimation]="visibility">
         <ion-spinner *ngIf="!loaded" [attr.aria-label]="'core.loading' | translate"></ion-spinner>
 
         <core-user-menu-button *ngIf="loaded && tabsPlacement == 'side'"></core-user-menu-button>
diff --git a/src/core/features/mainmenu/pages/menu/menu.ts b/src/core/features/mainmenu/pages/menu/menu.ts
index 0ff66fa97..35b0edd55 100644
--- a/src/core/features/mainmenu/pages/menu/menu.ts
+++ b/src/core/features/mainmenu/pages/menu/menu.ts
@@ -31,6 +31,8 @@ import { trigger, state, style, transition, animate } from '@angular/animations'
 import { CoreSites } from '@services/sites';
 import { CoreDom } from '@singletons/dom';
 
+const ANIMATION_DURATION = 500;
+
 /**
  * Page that displays the main menu of the app.
  */
@@ -38,7 +40,7 @@ import { CoreDom } from '@singletons/dom';
     selector: 'page-core-mainmenu',
     templateUrl: 'menu.html',
     animations: [
-        trigger('menuShowHideAnimation', [
+        trigger('menuVisibilityAnimation', [
             state('hidden', style({
                 height: 0,
                 visibility: 'hidden',
@@ -49,11 +51,11 @@ import { CoreDom } from '@singletons/dom';
             })),
             transition('visible => hidden', [
                 style({ transform: 'translateY(0)' }),
-                animate('500ms ease-in-out', style({ transform: 'translateY(100%)' })),
+                animate(`${ANIMATION_DURATION}ms ease-in-out`, style({ transform: 'translateY(100%)' })),
             ]),
             transition('hidden => visible', [
                 style({ transform: 'translateY(100%)',  visibility: 'visible', height: '*' }),
-                animate('500ms ease-in-out', style({ transform: 'translateY(0)' })),
+                animate(`${ANIMATION_DURATION}ms ease-in-out`, style({ transform: 'translateY(0)' })),
             ]),
         ])],
     styleUrls: ['menu.scss'],
@@ -69,6 +71,7 @@ export class CoreMainMenuPage implements OnInit, OnDestroy {
     selectedTab?: string;
     isMainScreen = false;
     moreBadge = false;
+    visibility = 'hidden';
 
     protected subscription?: Subscription;
     protected navSubscription?: Subscription;
@@ -93,8 +96,9 @@ export class CoreMainMenuPage implements OnInit, OnDestroy {
         // Listen navigation events to show or hide tabs.
         this.navSubscription = Router.events
             .pipe(filter(event => event instanceof NavigationEnd))
-            .subscribe(async () => {
+            .subscribe(() => {
                 this.isMainScreen = !this.mainTabs?.outlet.canGoBack();
+                this.updateVisibility();
             });
     }
 
@@ -108,6 +112,7 @@ export class CoreMainMenuPage implements OnInit, OnDestroy {
         this.redirectOptions = CoreNavigator.getRouteParam('redirectOptions');
 
         this.isMainScreen = !this.mainTabs?.outlet.canGoBack();
+        this.updateVisibility();
 
         this.subscription = CoreMainMenuDelegate.getHandlersObservable().subscribe((handlers) => {
             // Remove the handlers that should only appear in the More menu.
@@ -151,6 +156,7 @@ export class CoreMainMenuPage implements OnInit, OnDestroy {
             return;
         }
         this.tabsPlacement = CoreMainMenu.getTabPlacement();
+        this.updateVisibility();
 
         const handlers = this.allHandlers
             .filter((handler) => !handler.onlyInMore)
@@ -240,6 +246,20 @@ export class CoreMainMenuPage implements OnInit, OnDestroy {
         this.selectHistory.push(event.tab);
     }
 
+    /**
+     * Update menu visibility.
+     */
+    protected updateVisibility(): void {
+        const visibility = this.tabsPlacement == 'side' ? '' : (this.isMainScreen ? 'visible' : 'hidden');
+
+        if (visibility === this.visibility) {
+            return;
+        }
+
+        this.visibility = visibility;
+        this.notifyVisibilityUpdated();
+    }
+
     /**
      * Back button clicked.
      *
@@ -290,6 +310,17 @@ export class CoreMainMenuPage implements OnInit, OnDestroy {
         return !!CoreNavigator.getCurrentRoute({ routeData: { mainMenuTabRoot: CoreNavigator.getCurrentMainMenuTab() } });
     }
 
+    /**
+     * Notify that the menu visibility has been updated.
+     */
+    protected async notifyVisibilityUpdated(): Promise<void> {
+        await CoreUtils.nextTick();
+        await CoreUtils.wait(ANIMATION_DURATION);
+        await CoreUtils.nextTick();
+
+        CoreEvents.trigger(CoreMainMenuProvider.MAIN_MENU_VISIBILITY_UPDATED);
+    }
+
 }
 
 /**
diff --git a/src/core/features/mainmenu/services/mainmenu.ts b/src/core/features/mainmenu/services/mainmenu.ts
index a27b4e943..c0e624f2e 100644
--- a/src/core/features/mainmenu/services/mainmenu.ts
+++ b/src/core/features/mainmenu/services/mainmenu.ts
@@ -33,6 +33,7 @@ declare module '@singletons/events' {
      */
     export interface CoreEventsData {
         [CoreMainMenuProvider.MAIN_MENU_HANDLER_BADGE_UPDATED]: CoreMainMenuHandlerBadgeUpdatedEventData;
+        [CoreMainMenuProvider.MAIN_MENU_VISIBILITY_UPDATED]: void;
     }
 
 }
@@ -47,6 +48,7 @@ export class CoreMainMenuProvider {
     static readonly ITEM_MIN_WIDTH = 72; // Min with of every item, based on 5 items on a 360 pixel wide screen.
     static readonly MORE_PAGE_NAME = 'more';
     static readonly MAIN_MENU_HANDLER_BADGE_UPDATED = 'main_menu_handler_badge_updated';
+    static readonly MAIN_MENU_VISIBILITY_UPDATED = 'main_menu_visbility_updated';
 
     /**
      * Get the current main menu handlers.
diff --git a/src/core/features/usertours/components/user-tour/user-tour.ts b/src/core/features/usertours/components/user-tour/user-tour.ts
index 997ffab92..28d6bba73 100644
--- a/src/core/features/usertours/components/user-tour/user-tour.ts
+++ b/src/core/features/usertours/components/user-tour/user-tour.ts
@@ -32,7 +32,8 @@ import { CoreDomUtils } from '@services/utils/dom';
 import { AngularFrameworkDelegate } from '@singletons';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
 import { CoreDom } from '@singletons/dom';
-import { CoreEventObserver } from '@singletons/events';
+import { CoreEventObserver, CoreEvents } from '@singletons/events';
+import { CoreMainMenuProvider } from '@features/mainmenu/services/mainmenu';
 
 const ANIMATION_DURATION = 200;
 const USER_TOURS_BACK_BUTTON_PRIORITY = 100;
@@ -70,6 +71,7 @@ export class CoreUserToursUserTourComponent implements AfterViewInit, OnDestroy
     private wrapperTransform = '';
     private wrapperElement = new CorePromisedValue<HTMLElement>();
     private backButtonListener?: (event: BackButtonEvent) => void;
+    protected mainMenuListener?: CoreEventObserver;
     protected resizeListener?: CoreEventObserver;
     protected scrollListener?: EventListener;
     protected content?: HTMLIonContentElement | null;
@@ -240,15 +242,10 @@ export class CoreUserToursUserTourComponent implements AfterViewInit, OnDestroy
             return;
         }
 
-        if (!this.resizeListener) {
-            this.resizeListener = CoreDom.onWindowResize(() => {
-                this.calculateStyles();
-            });
-        }
-
-        if (!this.content) {
-            this.content = CoreDom.closest(this.focus, 'ion-content');
-        }
+        this.mainMenuListener = this.mainMenuListener ??
+            CoreEvents.on(CoreMainMenuProvider.MAIN_MENU_VISIBILITY_UPDATED, () => this.calculateStyles());
+        this.resizeListener = this.resizeListener ?? CoreDom.onWindowResize(() => this.calculateStyles());
+        this.content = this.content ?? CoreDom.closest(this.focus, 'ion-content');
 
         if (!this.scrollListener && this.content) {
             this.content.scrollEvents = true;
@@ -269,9 +266,11 @@ export class CoreUserToursUserTourComponent implements AfterViewInit, OnDestroy
 
         this.active = false;
 
+        this.mainMenuListener?.off();
         this.resizeListener?.off();
         this.backButtonListener && document.removeEventListener('ionBackButton', this.backButtonListener);
         this.backButtonListener = undefined;
+        this.mainMenuListener = undefined;
         this.resizeListener = undefined;
 
         if (this.content && this.scrollListener) {

From 0413aa87bf4a3e1429fc67fd80d1a37449e720c1 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 11 Apr 2022 09:05:19 +0200
Subject: [PATCH 0963/1008] MOBILE-3833 settings: Don't reload whole app when
 change language

---
 src/core/features/mainmenu/mainmenu.module.ts |  4 ++
 .../mainmenu/pages/reload/reload.html         |  3 ++
 .../mainmenu/pages/reload/reload.module.ts    | 37 +++++++++++++++++++
 .../features/mainmenu/pages/reload/reload.ts  | 36 ++++++++++++++++++
 .../settings/pages/general/general.ts         |  6 ++-
 5 files changed, 85 insertions(+), 1 deletion(-)
 create mode 100644 src/core/features/mainmenu/pages/reload/reload.html
 create mode 100644 src/core/features/mainmenu/pages/reload/reload.module.ts
 create mode 100644 src/core/features/mainmenu/pages/reload/reload.ts

diff --git a/src/core/features/mainmenu/mainmenu.module.ts b/src/core/features/mainmenu/mainmenu.module.ts
index ae4136604..3ff9bf494 100644
--- a/src/core/features/mainmenu/mainmenu.module.ts
+++ b/src/core/features/mainmenu/mainmenu.module.ts
@@ -41,6 +41,10 @@ const appRoutes: Routes = [
         canActivate: [CoreMainMenuAuthGuard],
         canLoad: [CoreMainMenuAuthGuard],
     },
+    {
+        path: 'reload',
+        loadChildren: () => import('./pages/reload/reload.module').then( m => m.CoreMainMenuReloadPageModule),
+    },
 ];
 
 @NgModule({
diff --git a/src/core/features/mainmenu/pages/reload/reload.html b/src/core/features/mainmenu/pages/reload/reload.html
new file mode 100644
index 000000000..5e5ea6d14
--- /dev/null
+++ b/src/core/features/mainmenu/pages/reload/reload.html
@@ -0,0 +1,3 @@
+<ion-content>
+    <core-loading></core-loading>
+</ion-content>
diff --git a/src/core/features/mainmenu/pages/reload/reload.module.ts b/src/core/features/mainmenu/pages/reload/reload.module.ts
new file mode 100644
index 000000000..74a1fb7aa
--- /dev/null
+++ b/src/core/features/mainmenu/pages/reload/reload.module.ts
@@ -0,0 +1,37 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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 { RouterModule, Routes } from '@angular/router';
+import { CoreSharedModule } from '@/core/shared.module';
+import { CoreMainMenuReloadPage } from './reload';
+
+const routes: Routes = [
+    {
+        path: '',
+        component: CoreMainMenuReloadPage,
+    },
+];
+
+@NgModule({
+    imports: [
+        RouterModule.forChild(routes),
+        CoreSharedModule,
+    ],
+    declarations: [
+        CoreMainMenuReloadPage,
+    ],
+    exports: [RouterModule],
+})
+export class CoreMainMenuReloadPageModule {}
diff --git a/src/core/features/mainmenu/pages/reload/reload.ts b/src/core/features/mainmenu/pages/reload/reload.ts
new file mode 100644
index 000000000..9a9b52a2f
--- /dev/null
+++ b/src/core/features/mainmenu/pages/reload/reload.ts
@@ -0,0 +1,36 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// 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, OnInit } from '@angular/core';
+import { CoreNavigator } from '@services/navigator';
+
+/**
+ * Page that displays a loading and then opens the main menu again.
+ */
+@Component({
+    selector: 'page-core-mainmenu-reload',
+    templateUrl: 'reload.html',
+})
+export class CoreMainMenuReloadPage implements OnInit {
+
+    /**
+     * @inheritdoc
+     */
+    ngOnInit(): void {
+        CoreNavigator.navigate('/main', {
+            reset: true,
+        });
+    }
+
+}
diff --git a/src/core/features/settings/pages/general/general.ts b/src/core/features/settings/pages/general/general.ts
index a1487f255..9db912420 100644
--- a/src/core/features/settings/pages/general/general.ts
+++ b/src/core/features/settings/pages/general/general.ts
@@ -26,6 +26,7 @@ import { Diagnostic, Translate } from '@singletons';
 import { CoreSites } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
 import { AlertButton } from '@ionic/angular';
+import { CoreNavigator } from '@services/navigator';
 
 /**
  * Page that displays the general settings.
@@ -168,7 +169,10 @@ export class CoreSettingsGeneralPage {
         await CoreUtils.ignoreErrors(Promise.all(sites.map((site) => site.invalidateWsCache())));
 
         CoreEvents.trigger(CoreEvents.LANGUAGE_CHANGED, this.selectedLanguage);
-        window.location.reload();
+
+        CoreNavigator.navigate('/reload', {
+            reset: true,
+        });
     }
 
     /**

From 4747c3bf20c054e0c464ad2a2f41bf7d76667fae Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 11 Apr 2022 09:06:16 +0200
Subject: [PATCH 0964/1008] MOBILE-3833 dependencies: Update moment to 2.29.2

---
 package-lock.json | 14 +++++++-------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 14d051271..8753828fd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -87,7 +87,7 @@
         "hammerjs": "2.0.8",
         "jszip": "3.7.1",
         "mathjax": "2.7.7",
-        "moment": "2.29.0",
+        "moment": "2.29.2",
         "nl.kingsquare.cordova.background-audio": "1.0.1",
         "rxjs": "6.5.5",
         "ts-md5": "1.2.7",
@@ -20984,9 +20984,9 @@
       "optional": true
     },
     "node_modules/moment": {
-      "version": "2.29.0",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.0.tgz",
-      "integrity": "sha512-z6IJ5HXYiuxvFTI6eiQ9dm77uE0gyy1yXNApVHqTcnIKfY9tIwEjlzsZ6u1LQXvVgKeTnv9Xm7NDvJ7lso3MtA==",
+      "version": "2.29.2",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.2.tgz",
+      "integrity": "sha512-UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg==",
       "engines": {
         "node": "*"
       }
@@ -47321,9 +47321,9 @@
       "optional": true
     },
     "moment": {
-      "version": "2.29.0",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.0.tgz",
-      "integrity": "sha512-z6IJ5HXYiuxvFTI6eiQ9dm77uE0gyy1yXNApVHqTcnIKfY9tIwEjlzsZ6u1LQXvVgKeTnv9Xm7NDvJ7lso3MtA=="
+      "version": "2.29.2",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.2.tgz",
+      "integrity": "sha512-UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg=="
     },
     "move-concurrently": {
       "version": "1.0.1",
diff --git a/package.json b/package.json
index 712a8cdc3..3db385576 100644
--- a/package.json
+++ b/package.json
@@ -116,7 +116,7 @@
     "hammerjs": "2.0.8",
     "jszip": "3.7.1",
     "mathjax": "2.7.7",
-    "moment": "2.29.0",
+    "moment": "2.29.2",
     "nl.kingsquare.cordova.background-audio": "1.0.1",
     "rxjs": "6.5.5",
     "ts-md5": "1.2.7",

From 83e7abec1b2f7b12137138a68b0397de1eb8e2c2 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 11 Apr 2022 10:27:28 +0200
Subject: [PATCH 0965/1008] MOBILE-3833 time: Stop using moment in formatTime

---
 src/core/services/utils/time.ts |  2 +-
 src/core/singletons/time.ts     | 56 ++++++++++++++++++++++-----------
 2 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/src/core/services/utils/time.ts b/src/core/services/utils/time.ts
index a771a6a21..446181a79 100644
--- a/src/core/services/utils/time.ts
+++ b/src/core/services/utils/time.ts
@@ -76,7 +76,7 @@ export class CoreTimeUtilsProvider {
         moment.relativeTimeThreshold('s', 60);
         moment.relativeTimeThreshold('m', 60);
         moment.relativeTimeThreshold('h', 24);
-        moment.relativeTimeThreshold('d', 31);
+        moment.relativeTimeThreshold('d', 30);
         moment.relativeTimeThreshold('M', 12);
         moment.relativeTimeThreshold('y', 365);
         moment.relativeTimeThreshold('ss', 0); // To display exact number of seconds instead of just "a few seconds".
diff --git a/src/core/singletons/time.ts b/src/core/singletons/time.ts
index e3a0f0435..6b222937b 100644
--- a/src/core/singletons/time.ts
+++ b/src/core/singletons/time.ts
@@ -12,7 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import moment from 'moment';
+import { Translate } from '@singletons';
+import { CoreConstants } from '../constants';
 
 /**
  * Singleton with helper functions for time operations.
@@ -27,37 +28,54 @@ export class CoreTime {
      * @return Seconds in a human readable format.
      */
     static formatTime(seconds: number, precision = 2): string {
-        precision = precision || 6; // Use max precision if 0 is passed.
+        precision = precision || 5; // Use max precision if 0 is passed.
 
-        const eventDuration = moment.duration(Math.abs(seconds), 'seconds');
-        let durationString = '';
+        const totalSecs = Math.abs(seconds);
+        if (!totalSecs) {
+            return Translate.instant('core.now');
+        }
 
-        if (precision && eventDuration.years() > 0) {
-            durationString += ' ' + moment.duration(eventDuration.years(), 'years').humanize();
+        const years = Math.floor(totalSecs / CoreConstants.SECONDS_YEAR);
+        let remainder = totalSecs - (years * CoreConstants.SECONDS_YEAR);
+        const days = Math.floor(remainder / CoreConstants.SECONDS_DAY);
+
+        remainder = totalSecs - (days * CoreConstants.SECONDS_DAY);
+
+        const hours = Math.floor(remainder / CoreConstants.SECONDS_HOUR);
+        remainder = remainder - (hours * CoreConstants.SECONDS_HOUR);
+
+        const mins = Math.floor(remainder / CoreConstants.SECONDS_MINUTE);
+        const secs = remainder - (mins * CoreConstants.SECONDS_MINUTE);
+
+        const secondsUnit = Translate.instant('core.' + (secs === 1 ? 'sec' : 'secs'));
+        const minutesUnit = Translate.instant('core.' + (mins === 1 ? 'min' : 'mins'));
+        const hoursUnit = Translate.instant('core.' + (hours === 1 ? 'hour' : 'hours'));
+        const daysUnit = Translate.instant('core.' + (days === 1 ? 'day' : 'days'));
+        const yearsUnit = Translate.instant('core.' + (years === 1 ? 'year' : 'years'));
+        const parts: string[] = [];
+
+        if (precision && years) {
+            parts.push(`${years} ${yearsUnit}`);
             precision--;
         }
-        if (precision && eventDuration.months() > 0) {
-            durationString += ' ' + moment.duration(eventDuration.months(), 'months').humanize();
+        if (precision && days) {
+            parts.push(`${days} ${daysUnit}`);
             precision--;
         }
-        if (precision && eventDuration.days() > 0) {
-            durationString += ' ' + moment.duration(eventDuration.days(), 'days').humanize();
+        if (precision && hours) {
+            parts.push(`${hours} ${hoursUnit}`);
             precision--;
         }
-        if (precision && eventDuration.hours() > 0) {
-            durationString += ' ' + moment.duration(eventDuration.hours(), 'hours').humanize();
+        if (precision && mins) {
+            parts.push(`${mins} ${minutesUnit}`);
             precision--;
         }
-        if (precision && eventDuration.minutes() > 0) {
-            durationString += ' ' + moment.duration(eventDuration.minutes(), 'minutes').humanize();
-            precision--;
-        }
-        if (precision && (eventDuration.seconds() > 0 || !durationString)) {
-            durationString += ' ' + moment.duration(eventDuration.seconds(), 'seconds').humanize();
+        if (precision && secs) {
+            parts.push(`${secs} ${secondsUnit}`);
             precision--;
         }
 
-        return durationString.trim();
+        return parts.join(' ');
     }
 
     /**

From 41680adf3326beba18b7f2fdc076e0511c1f03b2 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 11 Apr 2022 12:15:47 +0200
Subject: [PATCH 0966/1008] MOBILE-3833 forum: Display locked discussion icon

---
 src/addons/mod/forum/components/index/index.html | 2 ++
 src/addons/mod/forum/components/index/index.scss | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/src/addons/mod/forum/components/index/index.html b/src/addons/mod/forum/components/index/index.html
index 1dbc553e9..34c075f39 100644
--- a/src/addons/mod/forum/components/index/index.html
+++ b/src/addons/mod/forum/components/index/index.html
@@ -56,6 +56,8 @@
                             <core-format-text [text]="discussion.subject" contextLevel="module" [contextInstanceId]="module && module.id"
                                 [courseId]="courseId">
                             </core-format-text>
+                            <ion-icon name="fas-lock" *ngIf="discussion.locked" class="addon-mod-forum-locked-icon"
+                                [attr.aria-label]="'addon.mod_forum.discussionlocked' | translate"></ion-icon>
                         </p>
                         <ion-button *ngIf="canPin || discussion.canlock || discussion.canfavourite" fill="clear"
                             [attr.aria-label]="('core.displayoptions' | translate)" (click)="showOptionsMenu($event, discussion)">
diff --git a/src/addons/mod/forum/components/index/index.scss b/src/addons/mod/forum/components/index/index.scss
index d07dae27d..4fb44d094 100644
--- a/src/addons/mod/forum/components/index/index.scss
+++ b/src/addons/mod/forum/components/index/index.scss
@@ -18,6 +18,11 @@
 
                 ion-icon {
                     @include margin(0, 6px, 0, 0);
+
+                    &.addon-mod-forum-locked-icon {
+                        @include margin-horizontal(4px, 0px);
+                        color: var(--gray-500);
+                    }
                 }
 
             }

From 50322300ac5bf828760d9ed51d5884c95d5fa33d Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 11 Apr 2022 12:50:33 +0200
Subject: [PATCH 0967/1008] MOBILE-3833 forum: Display word count below post
 text

---
 .../components/post-options-menu/post-options-menu.html      | 5 -----
 .../forum/components/post-options-menu/post-options-menu.ts  | 2 --
 src/addons/mod/forum/components/post/post.html               | 3 +++
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/addons/mod/forum/components/post-options-menu/post-options-menu.html b/src/addons/mod/forum/components/post-options-menu/post-options-menu.html
index ee0955932..2ff947373 100644
--- a/src/addons/mod/forum/components/post-options-menu/post-options-menu.html
+++ b/src/addons/mod/forum/components/post-options-menu/post-options-menu.html
@@ -12,11 +12,6 @@
             <p class="item-heading" *ngIf="offlinePost">{{ 'core.discard' | translate }}</p>
         </ion-label>
     </ion-item>
-    <ion-item class="ion-text-wrap" *ngIf="wordCount">
-        <ion-label>
-            <p class="item-heading">{{ 'core.numwords' | translate: {'$a': wordCount} }}</p>
-        </ion-label>
-    </ion-item>
     <ion-item class="ion-text-wrap" [href]="url" *ngIf="url" core-link capture="false" button detail="false" [showBrowserWarning]="false">
         <ion-icon name="fas-external-link-alt" slot="start" aria-hidden="true"></ion-icon>
         <ion-label>
diff --git a/src/addons/mod/forum/components/post-options-menu/post-options-menu.ts b/src/addons/mod/forum/components/post-options-menu/post-options-menu.ts
index ad13a1e84..257d8ec78 100644
--- a/src/addons/mod/forum/components/post-options-menu/post-options-menu.ts
+++ b/src/addons/mod/forum/components/post-options-menu/post-options-menu.ts
@@ -34,7 +34,6 @@ export class AddonModForumPostOptionsMenuComponent implements OnInit, OnDestroy
     @Input() cmId!: number;
     @Input() forumId!: number; // The forum Id.
 
-    wordCount?: number | null; // Number of words when available.
     canEdit = false;
     canDelete = false;
     loaded = false;
@@ -89,7 +88,6 @@ export class AddonModForumPostOptionsMenuComponent implements OnInit, OnDestroy
 
         this.canDelete = !!this.post.capabilities.delete && AddonModForum.isDeletePostAvailable();
         this.canEdit = !!this.post.capabilities.edit && AddonModForum.isUpdatePostAvailable();
-        this.wordCount = (this.post.haswordcount && this.post.wordcount) || null;
         this.loaded = true;
     }
 
diff --git a/src/addons/mod/forum/components/post/post.html b/src/addons/mod/forum/components/post/post.html
index 9812ff26f..ab1f83cfe 100644
--- a/src/addons/mod/forum/components/post/post.html
+++ b/src/addons/mod/forum/components/post/post.html
@@ -63,6 +63,9 @@
             <core-format-text [component]="component" [componentId]="componentId" [text]="post.message" contextLevel="module"
                 [contextInstanceId]="forum && forum.cmid" [courseId]="courseId">
             </core-format-text>
+            <p *ngIf="post.haswordcount && post.wordcount">
+                <em>{{ 'core.numwords' | translate: {'$a': post.wordcount} }}</em>
+            </p>
             <div *ngIf="post.attachments && post.attachments.length > 0">
                 <core-files [files]="post.attachments" [component]="component" [componentId]="componentId" showInline="true">
                 </core-files>

From 56a9a432b831dd2b1b4f79219d6f6f20126ac4da Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 12 Apr 2022 08:19:39 +0200
Subject: [PATCH 0968/1008] MOBILE-3833 mainmenu: Add log when select first tab

---
 src/core/features/mainmenu/pages/menu/menu.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/core/features/mainmenu/pages/menu/menu.ts b/src/core/features/mainmenu/pages/menu/menu.ts
index 0ff66fa97..d960988b1 100644
--- a/src/core/features/mainmenu/pages/menu/menu.ts
+++ b/src/core/features/mainmenu/pages/menu/menu.ts
@@ -30,6 +30,7 @@ import { NavigationEnd } from '@angular/router';
 import { trigger, state, style, transition, animate } from '@angular/animations';
 import { CoreSites } from '@services/sites';
 import { CoreDom } from '@singletons/dom';
+import { CoreLogger } from '@singletons/logger';
 
 /**
  * Page that displays the main menu of the app.
@@ -81,6 +82,7 @@ export class CoreMainMenuPage implements OnInit, OnDestroy {
     protected urlToOpen?: string;
     protected redirectPath?: string;
     protected redirectOptions?: CoreNavigationOptions;
+    protected logger: CoreLogger;
 
     @ViewChild('mainTabs') mainTabs?: IonTabs;
 
@@ -89,6 +91,7 @@ export class CoreMainMenuPage implements OnInit, OnDestroy {
     constructor() {
         this.backButtonFunction = this.backButtonClicked.bind(this);
         this.tabAction = new CoreMainMenuRoleTab(this);
+        this.logger = CoreLogger.getInstance('CoreMainMenuPage');
 
         // Listen navigation events to show or hide tabs.
         this.navSubscription = Router.events
@@ -187,6 +190,7 @@ export class CoreMainMenuPage implements OnInit, OnDestroy {
 
             const tabPage = this.tabs[0] ? this.tabs[0].page : this.morePageName;
             const tabPageParams = this.tabs[0] ? this.tabs[0].pageParams : {};
+            this.logger.debug(`Select first tab: ${tabPage}.`, this.tabs);
 
             // Use navigate instead of mainTabs.select to be able to pass page params.
             CoreNavigator.navigate(tabPage, {

From 1eab0204b0fcc93849b6798b70052102ed8070f0 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 12 Apr 2022 09:34:52 +0200
Subject: [PATCH 0969/1008] MOBILE-3833 forum: Remove duplicated due date
 message in 3.11+

---
 .../mod/forum/components/index/index.ts       |  3 ++-
 src/addons/mod/forum/services/forum-helper.ts | 19 +++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/addons/mod/forum/components/index/index.ts b/src/addons/mod/forum/components/index/index.ts
index 849453c42..db1c36d17 100644
--- a/src/addons/mod/forum/components/index/index.ts
+++ b/src/addons/mod/forum/components/index/index.ts
@@ -345,8 +345,9 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
         }
 
         const forum = this.forum;
+        const showDueDateMessage = !CoreSites.getCurrentSite()?.isVersionGreaterEqualThan('3.11');
         this.description = forum.intro || this.description;
-        this.availabilityMessage = AddonModForumHelper.getAvailabilityMessage(forum);
+        this.availabilityMessage = AddonModForumHelper.getAvailabilityMessage(forum, showDueDateMessage);
         this.descriptionNote = Translate.instant('addon.mod_forum.numdiscussions', {
             numdiscussions: forum.numdiscussions,
         });
diff --git a/src/addons/mod/forum/services/forum-helper.ts b/src/addons/mod/forum/services/forum-helper.ts
index 47c2bd0cc..a9c26c9f5 100644
--- a/src/addons/mod/forum/services/forum-helper.ts
+++ b/src/addons/mod/forum/services/forum-helper.ts
@@ -278,23 +278,26 @@ export class AddonModForumHelperProvider {
      * Returns the availability message of the given forum.
      *
      * @param forum Forum instance.
+     * @param getDueDateMessage Whether to get due date message. If false, only cutoff date message will be returned.
      * @return Message or null if the forum has no cut-off or due date.
      */
-    getAvailabilityMessage(forum: AddonModForumData): string | null {
+    getAvailabilityMessage(forum: AddonModForumData, getDueDateMessage = true): string | null {
         if (this.isCutoffDateReached(forum)) {
             return Translate.instant('addon.mod_forum.cutoffdatereached');
         }
 
-        if (this.isDueDateReached(forum)) {
-            const dueDate = CoreTimeUtils.userDate(forum.duedate * 1000);
+        if (getDueDateMessage) {
+            if (this.isDueDateReached(forum)) {
+                const dueDate = CoreTimeUtils.userDate(forum.duedate * 1000);
 
-            return Translate.instant('addon.mod_forum.thisforumisdue', { $a: dueDate });
-        }
+                return Translate.instant('addon.mod_forum.thisforumisdue', { $a: dueDate });
+            }
 
-        if ((forum.duedate ?? 0) > 0) {
-            const dueDate = CoreTimeUtils.userDate(forum.duedate! * 1000);
+            if (forum.duedate && forum.duedate > 0) {
+                const dueDate = CoreTimeUtils.userDate(forum.duedate * 1000);
 
-            return Translate.instant('addon.mod_forum.thisforumhasduedate', { $a: dueDate });
+                return Translate.instant('addon.mod_forum.thisforumhasduedate', { $a: dueDate });
+            }
         }
 
         return null;

From 7383dc19744b8c114a9983888c4a7dee31b1907c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 12 Apr 2022 10:37:17 +0200
Subject: [PATCH 0970/1008] MOBILE-3833 forum: Display Q&A message for students

---
 scripts/langindex.json                                   | 1 +
 src/addons/mod/forum/components/index/index.html         | 8 ++++++++
 src/addons/mod/forum/components/index/index.ts           | 2 ++
 src/addons/mod/forum/lang.json                           | 1 +
 src/addons/mod/forum/pages/discussion/discussion.html    | 8 ++++++++
 src/addons/mod/forum/pages/discussion/discussion.page.ts | 6 ++++++
 6 files changed, 26 insertions(+)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index b245d6a4e..70cc0b1cc 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -657,6 +657,7 @@
   "addon.mod_forum.posttoforum": "forum",
   "addon.mod_forum.posttomygroups": "forum",
   "addon.mod_forum.privatereply": "forum",
+  "addon.mod_forum.qandanotify": "forum",
   "addon.mod_forum.re": "forum",
   "addon.mod_forum.refreshposts": "local_moodlemobileapp",
   "addon.mod_forum.removefromfavourites": "forum",
diff --git a/src/addons/mod/forum/components/index/index.html b/src/addons/mod/forum/components/index/index.html
index 34c075f39..724c2e70d 100644
--- a/src/addons/mod/forum/components/index/index.html
+++ b/src/addons/mod/forum/components/index/index.html
@@ -31,6 +31,14 @@
             </ion-item>
         </ion-card>
 
+        <!-- Q&A message. -->
+        <ion-card class="core-info-card" *ngIf="showQAMessage">
+            <ion-item>
+                <ion-icon name="fas-info-circle" slot="start" aria-hidden="true"></ion-icon>
+                <ion-label>{{ 'addon.mod_forum.qandanotify' | translate }}</ion-label>
+            </ion-item>
+        </ion-card>
+
         <ng-container *ngIf="forum">
             <core-empty-box *ngIf="!discussions || discussions.empty" icon="far-comments"
                 [message]="'addon.mod_forum.forumnodiscussionsyet' | translate">
diff --git a/src/addons/mod/forum/components/index/index.ts b/src/addons/mod/forum/components/index/index.ts
index db1c36d17..7686059b6 100644
--- a/src/addons/mod/forum/components/index/index.ts
+++ b/src/addons/mod/forum/components/index/index.ts
@@ -85,6 +85,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
     sortOrders: AddonModForumSortOrder[] = [];
     canPin = false;
     hasOfflineRatings = false;
+    showQAMessage = false;
     sortOrderSelectorModalOptions: ModalOptions = {
         component: AddonModForumSortOrderSelectorComponent,
     };
@@ -404,6 +405,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
                     const cutoffDateReached = AddonModForumHelper.isCutoffDateReached(forum)
                                     && !accessInfo.cancanoverridecutoff;
                     this.canAddDiscussion = !!forum.cancreatediscussions && !cutoffDateReached;
+                    this.showQAMessage = forum.type === 'qanda' && !accessInfo.canviewqandawithoutposting;
 
                     return;
                 }),
diff --git a/src/addons/mod/forum/lang.json b/src/addons/mod/forum/lang.json
index 86e48abf7..1c30bcf6a 100644
--- a/src/addons/mod/forum/lang.json
+++ b/src/addons/mod/forum/lang.json
@@ -49,6 +49,7 @@
     "posttoforum": "Post to forum",
     "posttomygroups": "Post a copy to all groups",
     "privatereply": "Reply privately",
+    "qandanotify": "This is a question and answer forum. In order to see other responses to these questions, you must first post your answer",
     "re": "Re:",
     "refreshposts": "Refresh posts",
     "removefromfavourites": "Unstar this discussion",
diff --git a/src/addons/mod/forum/pages/discussion/discussion.html b/src/addons/mod/forum/pages/discussion/discussion.html
index 44a517136..1c5b8d781 100644
--- a/src/addons/mod/forum/pages/discussion/discussion.html
+++ b/src/addons/mod/forum/pages/discussion/discussion.html
@@ -84,6 +84,14 @@
             </ion-item>
         </ion-card>
 
+        <!-- Q&A message. -->
+        <ion-card class="core-info-card" *ngIf="showQAMessage">
+            <ion-item>
+                <ion-icon name="fas-info-circle" slot="start" aria-hidden="true"></ion-icon>
+                <ion-label>{{ 'addon.mod_forum.qandanotify' | translate }}</ion-label>
+            </ion-item>
+        </ion-card>
+
         <div *ngIf="startingPost" class="ion-margin-bottom">
             <addon-mod-forum-post [post]="startingPost" [discussion]="discussion" [courseId]="courseId" [highlight]="true"
                 [discussionId]="discussionId" [component]="component" [componentId]="cmId" [formData]="formData"
diff --git a/src/addons/mod/forum/pages/discussion/discussion.page.ts b/src/addons/mod/forum/pages/discussion/discussion.page.ts
index 9ed21d8b6..b7c88be26 100644
--- a/src/addons/mod/forum/pages/discussion/discussion.page.ts
+++ b/src/addons/mod/forum/pages/discussion/discussion.page.ts
@@ -105,6 +105,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
     cmId?: number;
     canPin = false;
     availabilityMessage: string | null = null;
+    showQAMessage = false;
     leavingPage = false;
 
     protected forumId?: number;
@@ -493,6 +494,11 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
                                 });
                             }
 
+                            // Show Q&A message if user hasn't posted.
+                            const currentUserId = CoreSites.getCurrentSiteUserId();
+                            this.showQAMessage = forum.type === 'qanda' && !accessInfo.canviewqandawithoutposting &&
+                                !posts.some(post => post.author.id === currentUserId);
+
                             return;
                         }),
                 );

From 99cf4735e2ae80474c9c19dc0b23cdb1d3ebae97 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 12 Apr 2022 11:32:37 +0200
Subject: [PATCH 0971/1008] MOBILE-3833 pushnotifications: Update plugin

---
 package-lock.json | 14 +++++++-------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8753828fd..af5c4fab2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -49,7 +49,7 @@
         "@moodlehq/cordova-plugin-local-notification": "0.9.0-moodle.3",
         "@moodlehq/cordova-plugin-qrscanner": "3.0.1-moodle.2",
         "@moodlehq/cordova-plugin-zip": "3.1.0-moodle.1",
-        "@moodlehq/phonegap-plugin-push": "2.0.0-moodle.3",
+        "@moodlehq/phonegap-plugin-push": "2.0.0-moodle.4",
         "@ngx-translate/core": "13.0.0",
         "@ngx-translate/http-loader": "6.0.0",
         "@types/chart.js": "2.9.31",
@@ -5046,9 +5046,9 @@
       ]
     },
     "node_modules/@moodlehq/phonegap-plugin-push": {
-      "version": "2.0.0-moodle.3",
-      "resolved": "https://registry.npmjs.org/@moodlehq/phonegap-plugin-push/-/phonegap-plugin-push-2.0.0-moodle.3.tgz",
-      "integrity": "sha512-J5V/uElS6DDCFXQKCpnwEBTi2JlfbOGFWOpOicOrua+fGupmh4uj65zxBajtNwZghDbvQ2HKtmT2++obJ+DKEg==",
+      "version": "2.0.0-moodle.4",
+      "resolved": "https://registry.npmjs.org/@moodlehq/phonegap-plugin-push/-/phonegap-plugin-push-2.0.0-moodle.4.tgz",
+      "integrity": "sha512-nNcEn9ZpcGBc4b8/+nwFwRgOH5Cag2wNGRPeJzkNKt3DWRe1/avySudwB/24+ZmTXerisntNwerC5wSCnU29BQ==",
       "engines": {
         "cordovaDependencies": {
           "1.0.0": {
@@ -34841,9 +34841,9 @@
       "integrity": "sha512-QD5S6bsm6awJrNMb8YN/vkYghKAMfZMHccdimx6s1i5S9fgZUSf7L477NJqjFu62imVZYJIJuavBbw5fR/562w=="
     },
     "@moodlehq/phonegap-plugin-push": {
-      "version": "2.0.0-moodle.3",
-      "resolved": "https://registry.npmjs.org/@moodlehq/phonegap-plugin-push/-/phonegap-plugin-push-2.0.0-moodle.3.tgz",
-      "integrity": "sha512-J5V/uElS6DDCFXQKCpnwEBTi2JlfbOGFWOpOicOrua+fGupmh4uj65zxBajtNwZghDbvQ2HKtmT2++obJ+DKEg=="
+      "version": "2.0.0-moodle.4",
+      "resolved": "https://registry.npmjs.org/@moodlehq/phonegap-plugin-push/-/phonegap-plugin-push-2.0.0-moodle.4.tgz",
+      "integrity": "sha512-nNcEn9ZpcGBc4b8/+nwFwRgOH5Cag2wNGRPeJzkNKt3DWRe1/avySudwB/24+ZmTXerisntNwerC5wSCnU29BQ=="
     },
     "@netflix/nerror": {
       "version": "1.1.3",
diff --git a/package.json b/package.json
index 3db385576..afed0f16f 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,7 @@
     "@moodlehq/cordova-plugin-local-notification": "0.9.0-moodle.3",
     "@moodlehq/cordova-plugin-qrscanner": "3.0.1-moodle.2",
     "@moodlehq/cordova-plugin-zip": "3.1.0-moodle.1",
-    "@moodlehq/phonegap-plugin-push": "2.0.0-moodle.3",
+    "@moodlehq/phonegap-plugin-push": "2.0.0-moodle.4",
     "@ngx-translate/core": "13.0.0",
     "@ngx-translate/http-loader": "6.0.0",
     "@types/chart.js": "2.9.31",

From c6bdde182ccc4f4c8408634eee08bee222c15e43 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 12 Apr 2022 13:00:42 +0200
Subject: [PATCH 0972/1008] MOBILE-3833 forum: Fix check empty discussion list

---
 src/addons/mod/forum/components/index/index.html |  4 ++--
 src/addons/mod/forum/components/index/index.ts   | 12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/addons/mod/forum/components/index/index.html b/src/addons/mod/forum/components/index/index.html
index 724c2e70d..5ddd4c954 100644
--- a/src/addons/mod/forum/components/index/index.html
+++ b/src/addons/mod/forum/components/index/index.html
@@ -40,11 +40,11 @@
         </ion-card>
 
         <ng-container *ngIf="forum">
-            <core-empty-box *ngIf="!discussions || discussions.empty" icon="far-comments"
+            <core-empty-box *ngIf="!discussions || !discussions.hasDiscussions" icon="far-comments"
                 [message]="'addon.mod_forum.forumnodiscussionsyet' | translate">
             </core-empty-box>
 
-            <div *ngIf="discussions && !discussions.empty && sortingAvailable && selectedSortOrder" class="ion-text-wrap">
+            <div *ngIf="discussions?.hasDiscussions && sortingAvailable && selectedSortOrder" class="ion-text-wrap">
                 <core-combobox [modalOptions]="sortOrderSelectorModalOptions" listboxId="addon-mod-forum-sort-selector"
                     [label]="('core.sort' | translate)" (onChange)="setSortOrder($event)" [selection]="selectedSortOrder.label | translate"
                     interface="modal">
diff --git a/src/addons/mod/forum/components/index/index.ts b/src/addons/mod/forum/components/index/index.ts
index 7686059b6..a9c6fc7e8 100644
--- a/src/addons/mod/forum/components/index/index.ts
+++ b/src/addons/mod/forum/components/index/index.ts
@@ -705,4 +705,16 @@ class AddonModForumDiscussionsManager extends CoreListItemsManager<AddonModForum
         }
     }
 
+    /**
+     * Check whether there is any discussion in the items.
+     *
+     * @return Whether there is a discussion.
+     */
+    get hasDiscussions(): boolean {
+        const source = this.getSource();
+        const items = source.getItems();
+
+        return items !== null && items.some(item => !source.isNewDiscussionForm(item));
+    }
+
 }

From 49b4d13e9a2ed04e9b57e8416d5d6c1f1e60392d Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 12 Apr 2022 16:44:59 +0200
Subject: [PATCH 0973/1008] MOBILE-3833 core: Remove element on destroy

Angular usually removes elements, but in the collapsible-footer it needs to be done manually because it was moved to a different container
---
 src/core/directives/collapsible-footer.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/core/directives/collapsible-footer.ts b/src/core/directives/collapsible-footer.ts
index e90806092..173d0ac44 100644
--- a/src/core/directives/collapsible-footer.ts
+++ b/src/core/directives/collapsible-footer.ts
@@ -254,6 +254,7 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
             this.page.removeEventListener('ionViewDidEnter', this.pageDidEnterListener);
         }
 
+        this.element?.remove();
         this.resizeListener?.off();
         this.slotPromise?.cancel();
         this.viewportPromise?.cancel();

From 56d0cf251d84b6a6ee5a87f97b14c5a34aa37d11 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 13 Apr 2022 09:14:09 +0200
Subject: [PATCH 0974/1008] MOBILE-3833 glossary: Fix check empty entries list

---
 .../components/index/addon-mod-glossary-index.html       | 2 +-
 src/addons/mod/glossary/components/index/index.ts        | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
index 788686a95..69824078c 100644
--- a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
+++ b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
@@ -65,7 +65,7 @@
             </ng-container>
         </ion-list>
 
-        <core-empty-box *ngIf="(!entries || entries.empty) && (!isSearch || hasSearched)" icon="fas-list"
+        <core-empty-box *ngIf="(!entries || !entries.hasEntries) && (!isSearch || hasSearched)" icon="fas-list"
             [message]="'addon.mod_glossary.noentriesfound' | translate">
         </core-empty-box>
 
diff --git a/src/addons/mod/glossary/components/index/index.ts b/src/addons/mod/glossary/components/index/index.ts
index 8c3bbd65a..e0d559580 100644
--- a/src/addons/mod/glossary/components/index/index.ts
+++ b/src/addons/mod/glossary/components/index/index.ts
@@ -472,4 +472,13 @@ class AddonModGlossaryEntriesManager extends CoreListItemsManager<AddonModGlossa
         }
     }
 
+    /**
+     * Check whether there is any entry in the items.
+     *
+     * @return Whether there is an entry.
+     */
+    get hasEntries(): boolean {
+        return this.getSource().onlineEntries.length > 0 || this.getSource().offlineEntries.length > 0;
+    }
+
 }

From deb3b7a1f9653fa8b73fe2e782bc1d1eedc7acec Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 12 Apr 2022 14:25:39 +0200
Subject: [PATCH 0975/1008] MOBILE-3833 mod: Fix empty availability box in
 unsupported

---
 .../course/components/module-info/core-course-module-info.html  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/features/course/components/module-info/core-course-module-info.html b/src/core/features/course/components/module-info/core-course-module-info.html
index 62ccf0e34..f01531b83 100644
--- a/src/core/features/course/components/module-info/core-course-module-info.html
+++ b/src/core/features/course/components/module-info/core-course-module-info.html
@@ -34,7 +34,7 @@
     </div>
 
     <!-- Availability info space. -->
-    <div class="core-module-availabilityinfo core-module-info-box-section" *ngIf="showAvailabilityInfo">
+    <div class="core-module-availabilityinfo core-module-info-box-section" *ngIf="showAvailabilityInfo && module.availabilityinfo">
         <ion-icon name="fas-lock" [attr.aria-label]="'core.restricted' | translate"></ion-icon>
         <core-format-text [text]="module.availabilityinfo" contextLevel="module" [contextInstanceId]="module.id" [courseId]="module.course">
         </core-format-text>

From 1d05af2b7dfdde8e9432e0c789a57ee50ade56cf Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 13 Apr 2022 10:20:12 +0200
Subject: [PATCH 0976/1008] MOBILE-3833 assign: Display module navigation for
 teachers

---
 .../mod/assign/components/index/addon-mod-assign-index.html  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/addons/mod/assign/components/index/addon-mod-assign-index.html b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
index 599a85136..028cec0b9 100644
--- a/src/addons/mod/assign/components/index/addon-mod-assign-index.html
+++ b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
@@ -127,6 +127,11 @@
                 <ion-label>{{ 'addon.mod_assign.'+summary.warnofungroupedusers | translate }}</ion-label>
             </ion-item>
         </ion-card>
+
+        <div collapsible-footer *ngIf="!showLoading" slot="fixed">
+            <core-course-module-navigation [courseId]="courseId" [currentModuleId]="module.id">
+            </core-course-module-navigation>
+        </div>
     </ng-container>
 
     <!-- If it's a student, display his submission. -->

From e79172518ea0920f80571448eefb50ba5564181f Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 13 Apr 2022 13:56:11 +0200
Subject: [PATCH 0977/1008] MOBILE-3833 core: Add missing managers destroy

---
 .../badges/pages/issued-badge/issued-badge.page.ts    | 11 +++++++++--
 .../forum/pages/new-discussion/new-discussion.page.ts |  1 +
 src/core/features/settings/pages/site/site.ts         |  1 +
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/addons/badges/pages/issued-badge/issued-badge.page.ts b/src/addons/badges/pages/issued-badge/issued-badge.page.ts
index 1fc7a21be..675957abd 100644
--- a/src/addons/badges/pages/issued-badge/issued-badge.page.ts
+++ b/src/addons/badges/pages/issued-badge/issued-badge.page.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, OnInit } from '@angular/core';
+import { Component, OnDestroy, OnInit } from '@angular/core';
 import { IonRefresher } from '@ionic/angular';
 import { CoreTimeUtils } from '@services/utils/time';
 import { CoreDomUtils } from '@services/utils/dom';
@@ -34,7 +34,7 @@ import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/
     selector: 'page-addon-badges-issued-badge',
     templateUrl: 'issued-badge.html',
 })
-export class AddonBadgesIssuedBadgePage implements OnInit {
+export class AddonBadgesIssuedBadgePage implements OnInit, OnDestroy {
 
     protected badgeHash = '';
     protected userId!: number;
@@ -71,6 +71,13 @@ export class AddonBadgesIssuedBadgePage implements OnInit {
         this.badges.start();
     }
 
+    /**
+     * @inheritdoc
+     */
+    ngOnDestroy(): void {
+        this.badges.destroy();
+    }
+
     /**
      * Fetch the issued badge required for the view.
      *
diff --git a/src/addons/mod/forum/pages/new-discussion/new-discussion.page.ts b/src/addons/mod/forum/pages/new-discussion/new-discussion.page.ts
index 699eaf7ec..bd1592ce4 100644
--- a/src/addons/mod/forum/pages/new-discussion/new-discussion.page.ts
+++ b/src/addons/mod/forum/pages/new-discussion/new-discussion.page.ts
@@ -640,6 +640,7 @@ export class AddonModForumNewDiscussionPage implements OnInit, OnDestroy, CanLea
             CoreSync.unblockOperation(AddonModForumProvider.COMPONENT, this.syncId);
         }
         this.isDestroyed = true;
+        this.discussions?.destroy();
     }
 
 }
diff --git a/src/core/features/settings/pages/site/site.ts b/src/core/features/settings/pages/site/site.ts
index c2659848f..57826c5ea 100644
--- a/src/core/features/settings/pages/site/site.ts
+++ b/src/core/features/settings/pages/site/site.ts
@@ -126,6 +126,7 @@ export class CoreSitePreferencesPage implements AfterViewInit, OnDestroy {
     ngOnDestroy(): void {
         this.isDestroyed = true;
         this.sitesObserver?.off();
+        this.handlers.destroy();
     }
 
 }

From 7097d3c9fc52e341a268600864c426393377928b Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 13 Apr 2022 15:38:13 +0200
Subject: [PATCH 0978/1008] MOBILE-3833 core: Update handlers when user
 completes profile

---
 src/app/app.component.ts                      |  4 +-
 src/core/classes/delegate.ts                  |  5 +++
 .../features/login/services/login-helper.ts   | 37 ++++++++++++++-----
 src/core/singletons/events.ts                 |  9 +++++
 upgrade.txt                                   |  2 +-
 5 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 275daf547..63fade7ba 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -175,7 +175,7 @@ export class AppComponent implements OnInit, AfterViewInit {
             this.lastInAppUrl = '';
 
             if (CoreLoginHelper.isWaitingForBrowser()) {
-                CoreLoginHelper.setWaitingForBrowser(false);
+                CoreLoginHelper.stopWaitingForBrowser();
                 CoreLoginHelper.checkLogout();
             }
         });
@@ -184,7 +184,7 @@ export class AppComponent implements OnInit, AfterViewInit {
             // Wait a second before setting it to false since in iOS there could be some frozen WS calls.
             setTimeout(() => {
                 if (CoreLoginHelper.isWaitingForBrowser()) {
-                    CoreLoginHelper.setWaitingForBrowser(false);
+                    CoreLoginHelper.stopWaitingForBrowser();
                     CoreLoginHelper.checkLogout();
                 }
             }, 1000);
diff --git a/src/core/classes/delegate.ts b/src/core/classes/delegate.ts
index 588f0ce9f..3651bcc67 100644
--- a/src/core/classes/delegate.ts
+++ b/src/core/classes/delegate.ts
@@ -103,6 +103,11 @@ export class CoreDelegate<HandlerType extends CoreDelegateHandler> {
                     this.updateHandlers();
                 }
             });
+            CoreEvents.on(CoreEvents.COMPLETE_REQUIRED_PROFILE_DATA_FINISHED, (data) => {
+                if (data.siteId === CoreSites.getCurrentSiteId()) {
+                    this.updateHandlers();
+                }
+            });
         }
     }
 
diff --git a/src/core/features/login/services/login-helper.ts b/src/core/features/login/services/login-helper.ts
index fb14d6eea..108cff604 100644
--- a/src/core/features/login/services/login-helper.ts
+++ b/src/core/features/login/services/login-helper.ts
@@ -37,6 +37,7 @@ import { CoreCanceledError } from '@classes/errors/cancelederror';
 import { CoreCustomURLSchemes } from '@services/urlschemes';
 import { CorePushNotifications } from '@features/pushnotifications/services/pushnotifications';
 import { CoreText } from '@singletons/text';
+import { CorePromisedValue } from '@classes/promised-value';
 
 /**
  * Helper provider that provides some common features regarding authentication.
@@ -56,7 +57,7 @@ export class CoreLoginHelperProvider {
     protected logger: CoreLogger;
     protected sessionExpiredCheckingSite: Record<string, boolean> = {};
     protected isOpenEditAlertShown = false;
-    protected waitingForBrowser = false;
+    protected waitingForBrowser?: CorePromisedValue<void>;
 
     constructor() {
         this.logger = CoreLogger.getInstance('CoreLoginHelper');
@@ -768,11 +769,15 @@ export class CoreLoginHelperProvider {
 
             try {
                 await currentSite.openInAppWithAutoLogin(siteUrl + path, undefined, alertMessage);
-
-                this.waitingForBrowser = true;
             } finally {
                 this.isOpenEditAlertShown = false;
             }
+
+            await this.waitForBrowser();
+
+            CoreEvents.trigger(CoreEvents.COMPLETE_REQUIRED_PROFILE_DATA_FINISHED, {
+                path,
+            }, siteId);
         }
     }
 
@@ -917,7 +922,7 @@ export class CoreLoginHelperProvider {
                                 (currentSite.isLoggedOut() ? 'loggedoutssodescription' : 'reconnectssodescription')));
                         }
 
-                        this.waitingForBrowser = true;
+                        this.waitForBrowser();
 
                         this.openBrowserForSSOLogin(
                             result.siteUrl,
@@ -950,7 +955,7 @@ export class CoreLoginHelperProvider {
                             try {
                                 await CoreDomUtils.showConfirm(confirmMessage);
 
-                                this.waitingForBrowser = true;
+                                this.waitForBrowser();
                                 CoreSites.unsetCurrentSite(); // Unset current site to make authentication work fine.
 
                                 this.openBrowserForOAuthLogin(
@@ -1223,16 +1228,28 @@ export class CoreLoginHelperProvider {
      * @return Whether the app is waiting for browser.
      */
     isWaitingForBrowser(): boolean {
-        return this.waitingForBrowser;
+        return !!this.waitingForBrowser;
     }
 
     /**
-     * Set whether the app is waiting for browser.
+     * Start waiting when opening a browser/IAB.
      *
-     * @param value New value.
+     * @return Promise resolved when the app is resumed.
      */
-    setWaitingForBrowser(value: boolean): void {
-        this.waitingForBrowser = value;
+    async waitForBrowser(): Promise<void> {
+        if (!this.waitingForBrowser) {
+            this.waitingForBrowser = new CorePromisedValue();
+        }
+
+        await this.waitingForBrowser;
+    }
+
+    /**
+     * Stop waiting for browser.
+     */
+    stopWaitingForBrowser(): void {
+        this.waitingForBrowser?.resolve();
+        this.waitingForBrowser = undefined;
     }
 
     /**
diff --git a/src/core/singletons/events.ts b/src/core/singletons/events.ts
index 9f303efa7..35f3968b2 100644
--- a/src/core/singletons/events.ts
+++ b/src/core/singletons/events.ts
@@ -61,6 +61,7 @@ export interface CoreEventsData {
     [CoreEvents.APP_LAUNCHED_URL]: CoreEventAppLaunchedData;
     [CoreEvents.ORIENTATION_CHANGE]: CoreEventOrientationData;
     [CoreEvents.COURSE_MODULE_VIEWED]: CoreEventCourseModuleViewed;
+    [CoreEvents.COMPLETE_REQUIRED_PROFILE_DATA_FINISHED]: CoreEventCompleteRequiredProfileDataFinished;
 }
 
 /*
@@ -115,6 +116,7 @@ export class CoreEvents {
     static readonly ACTIVITY_DATA_SENT = 'activity_data_sent';
     static readonly DEVICE_REGISTERED_IN_MOODLE = 'device_registered_in_moodle';
     static readonly COURSE_MODULE_VIEWED = 'course_module_viewed';
+    static readonly COMPLETE_REQUIRED_PROFILE_DATA_FINISHED = 'complete_required_profile_data_finished';
 
     protected static logger = CoreLogger.getInstance('CoreEvents');
     protected static observables: { [eventName: string]: Subject<unknown> } = {};
@@ -467,3 +469,10 @@ export type CoreEventCourseModuleViewed = {
     timeaccess: number;
     sectionId?: number;
 };
+
+/**
+ * Data passed to COMPLETE_REQUIRED_PROFILE_DATA_FINISHED event.
+ */
+export type CoreEventCompleteRequiredProfileDataFinished = {
+    path: string;
+};
diff --git a/upgrade.txt b/upgrade.txt
index 2ee2fb749..b146617fb 100644
--- a/upgrade.txt
+++ b/upgrade.txt
@@ -25,7 +25,7 @@ information provided here is intended especially for developers.
 - The variable "loaded" in CoreCourseModuleMainResourceComponent has been changed to "showLoading" to reflect its purpose better.
 - The function getCurrentSection of course formats can now return a forceSelected boolean along with the section (defaults to false if not returned).
 - The link handlers functions (CoreContentLinksHandler) will now always receive a relative URL instead of an absolute URL. The CoreContentLinksHandlerBase class now adds "^" to the start of the pattern by default to prevent false positives.
-
+- The function CoreLoginHelper.setWaitingForBrowser has been removed, use CoreLoginHelper.waitForBrowser and CoreLoginHelper.stopWaitingForBrowser instead.
 
 
 === 3.9.5 ===

From dab598f473209e5baeecc65a3f6ed42d9cf26707 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 13 Apr 2022 16:09:23 +0200
Subject: [PATCH 0979/1008] MOBILE-3833 core: Fix error when renaming local
 file

---
 src/core/components/local-file/core-local-file.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/components/local-file/core-local-file.html b/src/core/components/local-file/core-local-file.html
index b723da5eb..5814bf9c9 100644
--- a/src/core/components/local-file/core-local-file.html
+++ b/src/core/components/local-file/core-local-file.html
@@ -22,13 +22,13 @@
             </ion-input>
 
             <div class="buttons" slot="end">
-                <ion-button fill="clear" *ngIf="isIOS" (click)="openFile($event, true)" [attr.aria-label]="openButtonLabel | translate">
+                <ion-button fill="clear" *ngIf="isIOS && !editMode" (click)="openFile($event, true)"
+                    [attr.aria-label]="openButtonLabel | translate">
                     <ion-icon slot="icon-only" [name]="openButtonIcon" aria-hidden="true"></ion-icon>
                 </ion-button>
 
                 <ng-container *ngIf="manage">
-                    <ion-button *ngIf="editMode" fill="clear" [attr.aria-label]="'core.save' | translate" color="success" type="submit"
-                        (click)="changeName(newFileName, $event)">
+                    <ion-button *ngIf="editMode" fill="clear" [attr.aria-label]="'core.save' | translate" color="success" type="submit">
                         <ion-icon name="fas-check" slot="icon-only" aria-hidden="true"></ion-icon>
                     </ion-button>
 

From f332b65100e04e2e71a357630877683a3d67f9aa Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 14 Apr 2022 11:15:17 +0200
Subject: [PATCH 0980/1008] MOBILE-3833 resource: Don't show outdated warning
 for external files

---
 src/addons/mod/resource/components/index/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/addons/mod/resource/components/index/index.ts b/src/addons/mod/resource/components/index/index.ts
index 6d6942ca2..a582ed675 100644
--- a/src/addons/mod/resource/components/index/index.ts
+++ b/src/addons/mod/resource/components/index/index.ts
@@ -205,7 +205,7 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
             downloadable = await AddonModResourceHelper.isMainFileDownloadable(this.module);
 
             if (downloadable) {
-                if (this.currentStatus === CoreConstants.OUTDATED && !this.isOnline) {
+                if (this.currentStatus === CoreConstants.OUTDATED && !this.isOnline && !this.isExternalFile) {
                     // Warn the user that the file isn't updated.
                     const alert = await CoreDomUtils.showAlert(
                         undefined,

From 542604f8942a75431f91ddfb62221cae466a3535 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 14 Apr 2022 11:47:39 +0200
Subject: [PATCH 0981/1008] MOBILE-3833 core: Hide sensitive info in open
 browser warning

---
 src/core/classes/site.ts         | 12 +-----------
 src/core/services/utils/utils.ts |  3 ++-
 src/core/singletons/window.ts    |  5 +++++
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/core/classes/site.ts b/src/core/classes/site.ts
index 3420106dc..31e0b3005 100644
--- a/src/core/classes/site.ts
+++ b/src/core/classes/site.ts
@@ -46,7 +46,6 @@ import { asyncInstance, AsyncInstance } from '../utils/async-instance';
 import { CoreDatabaseTable } from './database/database-table';
 import { CoreDatabaseCachingStrategy } from './database/database-table-proxy';
 import { CoreSilentError } from './errors/silenterror';
-import { CoreWindow } from '@singletons/window';
 
 /**
  * QR Code type enumeration.
@@ -1608,16 +1607,7 @@ export class CoreSite {
         if (inApp) {
             return CoreUtils.openInApp(autoLoginUrl, options);
         } else {
-            if ((options.showBrowserWarning || options.showBrowserWarning === undefined) && autoLoginUrl !== url) {
-                // Don't display the autologin URL in the warning.
-                try {
-                    await CoreWindow.confirmOpenBrowserIfNeeded(url);
-
-                    options.showBrowserWarning = false;
-                } catch (error) {
-                    return; // Cancelled, stop.
-                }
-            }
+            options.browserWarningUrl = url;
 
             return CoreUtils.openInBrowser(autoLoginUrl, options);
         }
diff --git a/src/core/services/utils/utils.ts b/src/core/services/utils/utils.ts
index ef080cc23..0485bb253 100644
--- a/src/core/services/utils/utils.ts
+++ b/src/core/services/utils/utils.ts
@@ -1112,7 +1112,7 @@ export class CoreUtilsProvider {
     async openInBrowser(url: string, options: CoreUtilsOpenInBrowserOptions = {}): Promise<void> {
         if (options.showBrowserWarning || options.showBrowserWarning === undefined) {
             try {
-                await CoreWindow.confirmOpenBrowserIfNeeded(url);
+                await CoreWindow.confirmOpenBrowserIfNeeded(options.browserWarningUrl ?? url);
             } catch (error) {
                 return; // Cancelled, stop.
             }
@@ -1836,6 +1836,7 @@ export type CoreUtilsOpenFileOptions = {
  */
 export type CoreUtilsOpenInBrowserOptions = {
     showBrowserWarning?: boolean; // Whether to display a warning before opening in browser. Defaults to true.
+    browserWarningUrl?: string; // The URL to display in the warning message. Use it to hide sensitive information.
 };
 
 /**
diff --git a/src/core/singletons/window.ts b/src/core/singletons/window.ts
index 328fbbda6..95b94247c 100644
--- a/src/core/singletons/window.ts
+++ b/src/core/singletons/window.ts
@@ -61,6 +61,11 @@ export class CoreWindow {
             return;
         }
 
+        // Remove common sensitive information from the URL.
+        url = url
+            .replace(/token=[^&#]+/gi, 'token=secret')
+            .replace(/tokenpluginfile\.php\/[^/]+/gi, 'tokenpluginfile.php/secret');
+
         const dontShowAgain = await CoreDomUtils.showPrompt(
             Translate.instant('core.warnopeninbrowser', { url }),
             undefined,

From ffd1ebe5b4d3f83c7fe2b31a0a09545ba04cbe47 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 19 Apr 2022 08:13:34 +0200
Subject: [PATCH 0982/1008] MOBILE-3833 assign: Fix empty box wrong position

---
 .../mod/assign/pages/submission-list/submission-list.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/addons/mod/assign/pages/submission-list/submission-list.html b/src/addons/mod/assign/pages/submission-list/submission-list.html
index 89ff9f3b9..a88073d1c 100644
--- a/src/addons/mod/assign/pages/submission-list/submission-list.html
+++ b/src/addons/mod/assign/pages/submission-list/submission-list.html
@@ -20,10 +20,6 @@
             <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
         </ion-refresher>
         <core-loading [hideUntil]="submissions.loaded">
-            <core-empty-box *ngIf="!submissions || submissions.empty" icon="fas-file-signature"
-                [message]="'addon.mod_assign.submissionstatus_' | translate">
-            </core-empty-box>
-
             <ion-list>
                 <ion-item class="ion-text-wrap core-group-selector" *ngIf="(groupInfo.separateGroups || groupInfo.visibleGroups)">
                     <ion-label id="addon-assign-groupslabel-list">
@@ -77,6 +73,10 @@
                     </ion-item>
                 </ng-container>
             </ion-list>
+
+            <core-empty-box *ngIf="!submissions || submissions.empty" icon="fas-file-signature"
+                [message]="'addon.mod_assign.submissionstatus_' | translate">
+            </core-empty-box>
         </core-loading>
     </core-split-view>
 </ion-content>

From 2e584357e74f02eb5e7071952adedcde8c4b5711 Mon Sep 17 00:00:00 2001
From: Alfonso Salces <alfonso.salces@moodle.com>
Date: Mon, 18 Apr 2022 15:52:20 +0200
Subject: [PATCH 0983/1008] MOBILE-3833 qtype multichoice: change button type

---
 .../qtype/multichoice/component/addon-qtype-multichoice.html    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/addons/qtype/multichoice/component/addon-qtype-multichoice.html b/src/addons/qtype/multichoice/component/addon-qtype-multichoice.html
index da99394bc..17a7b0abb 100644
--- a/src/addons/qtype/multichoice/component/addon-qtype-multichoice.html
+++ b/src/addons/qtype/multichoice/component/addon-qtype-multichoice.html
@@ -63,7 +63,7 @@
                 [attr.aria-label]="'core.question.incorrect' | translate"></ion-icon>
         </ion-item>
         <ion-button *ngIf="!multiQuestion.disabled" class="ion-text-wrap ion-margin-top" expand="block" fill="outline"
-            [disabled]="!multiQuestion.singleChoiceModel" (click)="clear()" type="reset">
+            [disabled]="!multiQuestion.singleChoiceModel" (click)="clear()" type="button">
             {{ 'addon.mod_quiz.clearchoice' | translate }}
         </ion-button>
 

From 70a4f1df40df04b786a6d5fa51fdc19153610774 Mon Sep 17 00:00:00 2001
From: Alfonso Salces <alfonso.salces@moodle.com>
Date: Tue, 19 Apr 2022 11:07:46 +0200
Subject: [PATCH 0984/1008] MOBILE-3833 show-password: fix show password eye
 icon

---
 src/core/components/show-password/core-show-password.html | 3 +--
 src/core/components/show-password/show-password.ts        | 2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/core/components/show-password/core-show-password.html b/src/core/components/show-password/core-show-password.html
index f6f283d40..bd1589bb6 100644
--- a/src/core/components/show-password/core-show-password.html
+++ b/src/core/components/show-password/core-show-password.html
@@ -1,6 +1,5 @@
 <ng-content></ng-content>
 <ion-button fill="clear" [attr.aria-label]="label | translate" core-suppress-events (onClick)="toggle($event)"
     (mousedown)="doNotBlur($event)" (keydown)="doNotBlur($event)" (keyup)="toggle($event)">
-    <ion-icon [name]=" iconName" slot="icon-only" aria-hidden="true">
-    </ion-icon>
+    <ion-icon [name]="shown ? 'fas-eye-slash' : 'fas-eye'" slot="icon-only" aria-hidden="true"></ion-icon>
 </ion-button>
diff --git a/src/core/components/show-password/show-password.ts b/src/core/components/show-password/show-password.ts
index 61d6bbc08..22faec88f 100644
--- a/src/core/components/show-password/show-password.ts
+++ b/src/core/components/show-password/show-password.ts
@@ -46,7 +46,6 @@ export class CoreShowPasswordComponent implements OnInit, AfterViewInit {
 
     shown = false; // Whether the password is shown.
     label = ''; // Label for the button to show/hide.
-    iconName = ''; // Name of the icon of the button to show/hide.
 
     protected input?: HTMLInputElement; // Input affected.
     protected element: HTMLElement; // Current element.
@@ -99,7 +98,6 @@ export class CoreShowPasswordComponent implements OnInit, AfterViewInit {
      */
     protected setData(input: HTMLInputElement): void {
         this.label = this.shown ? 'core.hide' : 'core.show';
-        this.iconName = this.shown ? 'fas-eye-slash' : 'fas-eye';
         input.type = this.shown ? 'text' : 'password';
     }
 

From b84a4a7aa8beb3acd36816fcf49a7331468f6a31 Mon Sep 17 00:00:00 2001
From: Alfonso Salces <alfonso.salces@moodle.com>
Date: Tue, 19 Apr 2022 14:06:24 +0200
Subject: [PATCH 0985/1008] MOBILE-3833 quiz: Fix scroll to question

---
 .../mod/quiz/pages/player/player.page.ts      | 11 ++++---
 .../question/components/question/question.ts  | 30 +++++++++++++------
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/src/addons/mod/quiz/pages/player/player.page.ts b/src/addons/mod/quiz/pages/player/player.page.ts
index ceaf636da..826fe4d67 100644
--- a/src/addons/mod/quiz/pages/player/player.page.ts
+++ b/src/addons/mod/quiz/pages/player/player.page.ts
@@ -47,6 +47,7 @@ import { CanLeave } from '@guards/can-leave';
 import { CoreForms } from '@singletons/form';
 import { CoreDom } from '@singletons/dom';
 import { CoreTime } from '@singletons/time';
+import { CoreComponentsRegistry } from '@singletons/components-registry';
 
 /**
  * Page that allows attempting a quiz.
@@ -264,7 +265,7 @@ export class AddonModQuizPlayerPage implements OnInit, OnDestroy, CanLeave {
             return;
         } else if (page == this.attempt.currentpage && !this.showSummary && slot !== undefined) {
             // Navigating to a question in the current page.
-            this.scrollToQuestion(slot);
+            await this.scrollToQuestion(slot);
 
             return;
         } else if ((page == this.attempt.currentpage && !this.showSummary) || (fromModal && this.isSequential && page != -1)) {
@@ -320,7 +321,7 @@ export class AddonModQuizPlayerPage implements OnInit, OnDestroy, CanLeave {
 
             if (slot !== undefined) {
                 // Scroll to the question.
-                this.scrollToQuestion(slot);
+                await this.scrollToQuestion(slot);
             }
         }
     }
@@ -687,8 +688,10 @@ export class AddonModQuizPlayerPage implements OnInit, OnDestroy, CanLeave {
      *
      * @param slot Slot of the question to scroll to.
      */
-    protected scrollToQuestion(slot: number): void {
-        CoreDom.scrollToElement(
+    protected async scrollToQuestion(slot: number): Promise<void> {
+        await CoreUtils.nextTick();
+        await CoreComponentsRegistry.waitComponentsReady(this.elementRef.nativeElement, 'core-question');
+        await CoreDom.scrollToElement(
             this.elementRef.nativeElement,
             '#addon-mod_quiz-question-' + slot,
         );
diff --git a/src/core/features/question/components/question/question.ts b/src/core/features/question/components/question/question.ts
index 4d17d9ef4..7def0c42a 100644
--- a/src/core/features/question/components/question/question.ts
+++ b/src/core/features/question/components/question/question.ts
@@ -12,7 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, Input, Output, OnInit, EventEmitter, ChangeDetectorRef, Type } from '@angular/core';
+import { Component, Input, Output, OnInit, EventEmitter, ChangeDetectorRef, Type, ElementRef } from '@angular/core';
+import { AsyncComponent } from '@classes/async-component';
+import { CorePromisedValue } from '@classes/promised-value';
 import { CoreQuestionBehaviourDelegate } from '@features/question/services/behaviour-delegate';
 import { CoreQuestionDelegate } from '@features/question/services/question-delegate';
 
@@ -20,6 +22,7 @@ import { CoreQuestionBehaviourButton, CoreQuestionHelper, CoreQuestionQuestion }
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
 import { Translate } from '@singletons';
+import { CoreComponentsRegistry } from '@singletons/components-registry';
 import { CoreLogger } from '@singletons/logger';
 
 /**
@@ -30,7 +33,7 @@ import { CoreLogger } from '@singletons/logger';
     templateUrl: 'core-question.html',
     styleUrls: ['../../question.scss'],
 })
-export class CoreQuestionComponent implements OnInit {
+export class CoreQuestionComponent implements OnInit, AsyncComponent {
 
     @Input() question?: CoreQuestionQuestion; // The question to render.
     @Input() component?: string; // The component the question belongs to.
@@ -50,15 +53,24 @@ export class CoreQuestionComponent implements OnInit {
     data: Record<string, unknown> = {}; // Data to pass to the component.
     seqCheck?: { name: string; value: string }; // Sequenche check name and value (if any).
     behaviourComponents?: Type<unknown>[] = []; // Components to render the question behaviour.
-    loaded = false;
+    promisedReady: CorePromisedValue<void>;
+
     validationError?: string;
 
     protected logger: CoreLogger;
 
-    constructor(
-        protected changeDetector: ChangeDetectorRef,
-    ) {
+    get loaded(): boolean {
+        return this.promisedReady.isResolved();
+    }
+
+    constructor(protected changeDetector: ChangeDetectorRef, private element: ElementRef) {
         this.logger = CoreLogger.getInstance('CoreQuestionComponent');
+        this.promisedReady = new CorePromisedValue();
+        CoreComponentsRegistry.register(this.element.nativeElement, this);
+    }
+
+    async ready(): Promise<void> {
+        await this.promisedReady;
     }
 
     /**
@@ -69,7 +81,7 @@ export class CoreQuestionComponent implements OnInit {
 
         if (!this.question || (this.question.type != 'random' &&
                 !CoreQuestionDelegate.isQuestionSupported(this.question.type))) {
-            this.loaded = true;
+            this.promisedReady.resolve();
 
             return;
         }
@@ -80,7 +92,7 @@ export class CoreQuestionComponent implements OnInit {
         );
 
         if (!this.componentClass) {
-            this.loaded = true;
+            this.promisedReady.resolve();
 
             return;
         }
@@ -163,7 +175,7 @@ export class CoreQuestionComponent implements OnInit {
             );
         } finally {
             this.question.html = CoreDomUtils.removeElementFromHtml(this.question.html, '.im-controls');
-            this.loaded = true;
+            this.promisedReady.resolve();
         }
     }
 

From ffa95a5115e56588fc81032df4681fec4322f869 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 19 Apr 2022 11:06:19 +0200
Subject: [PATCH 0986/1008] MOBILE-3833 loading: Let the user scroll on the
 content on iOS

---
 src/core/components/loading/loading.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/core/components/loading/loading.scss b/src/core/components/loading/loading.scss
index e6cebfac7..06b8be6c9 100644
--- a/src/core/components/loading/loading.scss
+++ b/src/core/components/loading/loading.scss
@@ -101,4 +101,6 @@
 :host-context(.ios) {
     --contents-display: flex;
     flex-direction: column;
+    max-height: max-content;
+    width: 100%;
 }

From 91e8d8af5538d7080a3c41c0b8ebb7a5448a8e97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 19 Apr 2022 15:58:18 +0200
Subject: [PATCH 0987/1008] MOBILE-3833 loading: Fix loading occupying full
 height

---
 .../components/index/addon-mod-glossary-index.html    |  9 +++++----
 src/core/components/loading/loading.scss              | 11 ++++++-----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
index 69824078c..613c62a6e 100644
--- a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
+++ b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
@@ -1,15 +1,16 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <ion-button *ngIf="glossary && glossary.browsemodes && glossary.browsemodes.length > 1" (click)="openModePicker($event)"
+    <ion-button *ngIf="!showLoading && glossary && glossary.browsemodes && glossary.browsemodes.length > 1" (click)="openModePicker($event)"
         [attr.aria-label]="'addon.mod_glossary.browsemode' | translate">
         <ion-icon name="fas-sort" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
 
-    <ion-button *ngIf="glossary" (click)="toggleSearch()" [attr.aria-label]="'addon.mod_glossary.bysearch' | translate">
+    <ion-button *ngIf="!showLoading && glossary" (click)="toggleSearch()" [attr.aria-label]="'addon.mod_glossary.bysearch' | translate">
         <ion-icon name="fas-search" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
 
-    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [attr.aria-label]="'core.info' | translate">
+    <ion-button *ngIf="!showLoading" fill="clear" (click)="openModuleSummary()" aria-haspopup="true"
+        [attr.aria-label]="'core.info' | translate">
         <ion-icon name="fas-info-circle" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
 </core-navbar-buttons>
@@ -77,7 +78,7 @@
     <core-course-module-navigation collapsible-footer [hidden]="showLoading" [courseId]="courseId" [currentModuleId]="module.id">
     </core-course-module-navigation>
 
-    <ion-fab slot="fixed" core-fab vertical="bottom" horizontal="end" *ngIf="canAdd">
+    <ion-fab slot="fixed" core-fab vertical="bottom" horizontal="end" *ngIf="canAdd && !showLoading">
         <ion-fab-button (click)="openNewEntry()" [attr.aria-label]="'addon.mod_glossary.addentry' | translate">
             <ion-icon name="fas-plus" aria-hidden="true"></ion-icon>
             <span class="sr-only">{{ 'addon.mod_glossary.addentry' | translate }}</span>
diff --git a/src/core/components/loading/loading.scss b/src/core/components/loading/loading.scss
index 06b8be6c9..4f0a58034 100644
--- a/src/core/components/loading/loading.scss
+++ b/src/core/components/loading/loading.scss
@@ -3,9 +3,9 @@
 @mixin inline() {
     min-height: var(--internal-loading-inline-min-height);
     max-height: 100vh; // In order show it on the page (content will be cut).
+    position: relative;
 
     &:not(.core-loading-loaded) {
-        position: relative;
         --contents-display: flex;
         flex-direction: column;
     }
@@ -15,6 +15,7 @@
         flex-direction: row;
         height: auto;
         width: auto;
+        position: absolute;
 
         .core-loading-message {
             @include margin(0, 0, 0, 10px);
@@ -32,14 +33,14 @@
     --internal-loading-inline-min-height: var(--loading-inline-min-height);
     --loading-display: flex;
     --loading-display-message: block;
-    --contents-display: contents;
+    --contents-display: block;
 
     @include core-transition(all, 200ms);
     pointer-events: none;
     display: var(--contents-display);
 
     &.core-loading-loaded {
-        position: static;
+        --contents-display: contents;
         pointer-events: auto;
         --internal-loading-inline-min-height: 0px;
 
@@ -52,11 +53,11 @@
 
     .core-loading-container {
         pointer-events: none;
-        position: absolute;
+        position: fixed;
         @include position(0, 0, 0, 0);
         height: 100%;
         width: 100%;
-        z-index: 3;
+        z-index: 100;
         margin: 0;
         padding: 0;
         color: var(--loading-text-color);

From 5445d24a5770239bff8346d3a161a9bf8e73d72b Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 19 Apr 2022 13:25:38 +0200
Subject: [PATCH 0988/1008] MOBILE-3833 siteplugins: Use theme icon if present
 for modules

---
 .../features/siteplugins/classes/handlers/module-handler.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/core/features/siteplugins/classes/handlers/module-handler.ts b/src/core/features/siteplugins/classes/handlers/module-handler.ts
index 57b415309..5b90fbee7 100644
--- a/src/core/features/siteplugins/classes/handlers/module-handler.ts
+++ b/src/core/features/siteplugins/classes/handlers/module-handler.ts
@@ -69,12 +69,14 @@ export class CoreSitePluginsModuleHandler extends CoreSitePluginsBaseHandler imp
         sectionId?: number,
         forCoursePage?: boolean,
     ): Promise<CoreCourseModuleHandlerData> {
+        const icon = module.modicon || this.handlerSchema.displaydata?.icon; // Prioritize theme icon over handler icon.
+
         if (this.shouldOnlyDisplayDescription(module, forCoursePage)) {
             const title = module.description;
             module.description = '';
 
             return {
-                icon: await CoreCourse.getModuleIconSrc(module.modname, this.handlerSchema.displaydata?.icon),
+                icon: await CoreCourse.getModuleIconSrc(module.modname, icon),
                 title: title || '',
                 a11yTitle: '',
                 class: this.handlerSchema.displaydata?.class,
@@ -85,7 +87,7 @@ export class CoreSitePluginsModuleHandler extends CoreSitePluginsBaseHandler imp
         const showDowloadButton = this.handlerSchema.downloadbutton;
         const handlerData: CoreCourseModuleHandlerData = {
             title: module.name,
-            icon: await CoreCourse.getModuleIconSrc(module.modname, this.handlerSchema.displaydata?.icon),
+            icon: await CoreCourse.getModuleIconSrc(module.modname, icon),
             class: this.handlerSchema.displaydata?.class,
             showDownloadButton: showDowloadButton !== undefined ? showDowloadButton : hasOffline,
         };

From 679f2e592f28f2de77fae4d0be95944c44327004 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 20 Apr 2022 09:22:16 +0200
Subject: [PATCH 0989/1008] MOBILE-3833 forum: Display post menu only if can
 edit or delete

---
 .../post-options-menu/post-options-menu.html  |  4 +-
 .../post-options-menu/post-options-menu.ts    | 59 ++++++++++---------
 src/addons/mod/forum/components/post/post.ts  | 11 +++-
 .../forum/pages/discussion/discussion.html    |  2 +
 .../forum/pages/discussion/discussion.page.ts |  2 +
 5 files changed, 46 insertions(+), 32 deletions(-)

diff --git a/src/addons/mod/forum/components/post-options-menu/post-options-menu.html b/src/addons/mod/forum/components/post-options-menu/post-options-menu.html
index 2ff947373..63660ebd7 100644
--- a/src/addons/mod/forum/components/post-options-menu/post-options-menu.html
+++ b/src/addons/mod/forum/components/post-options-menu/post-options-menu.html
@@ -1,11 +1,11 @@
 <core-loading [hideUntil]="loaded" [fullscreen]="false">
-    <ion-item button class="ion-text-wrap" (click)="editPost()" *ngIf="offlinePost || (canEdit && isOnline)" detail="false">
+    <ion-item button class="ion-text-wrap" (click)="editPost()" *ngIf="offlinePost || canEdit" detail="false">
         <ion-icon name="fas-pen" slot="start" aria-hidden="true"></ion-icon>
         <ion-label>
             <p class="item-heading">{{ 'addon.mod_forum.edit' | translate }}</p>
         </ion-label>
     </ion-item>
-    <ion-item button class="ion-text-wrap" (click)="deletePost()" *ngIf="offlinePost || (canDelete && isOnline)" detail="false">
+    <ion-item button class="ion-text-wrap" (click)="deletePost()" *ngIf="offlinePost || canDelete" detail="false">
         <ion-icon name="fas-trash" slot="start" aria-hidden="true"></ion-icon>
         <ion-label>
             <p class="item-heading" *ngIf="!offlinePost">{{ 'addon.mod_forum.delete' | translate }}</p>
diff --git a/src/addons/mod/forum/components/post-options-menu/post-options-menu.ts b/src/addons/mod/forum/components/post-options-menu/post-options-menu.ts
index 257d8ec78..02015d077 100644
--- a/src/addons/mod/forum/components/post-options-menu/post-options-menu.ts
+++ b/src/addons/mod/forum/components/post-options-menu/post-options-menu.ts
@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, Input, OnDestroy, OnInit } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
 import { CoreApp } from '@services/app';
 import { AddonModForum, AddonModForumPost } from '@addons/mod/forum/services/forum';
-import { Network, NgZone, PopoverController } from '@singletons';
-import { Subscription } from 'rxjs';
+import { PopoverController } from '@singletons';
 import { CoreDomUtils } from '@services/utils/dom';
+import { CoreNetworkError } from '@classes/errors/network-error';
 
 /**
  * This component is meant to display a popover with the post options.
@@ -28,7 +28,7 @@ import { CoreDomUtils } from '@services/utils/dom';
     templateUrl: 'post-options-menu.html',
     styleUrls: ['./post-options-menu.scss'],
 })
-export class AddonModForumPostOptionsMenuComponent implements OnInit, OnDestroy {
+export class AddonModForumPostOptionsMenuComponent implements OnInit {
 
     @Input() post!: AddonModForumPost; // The post.
     @Input() cmId!: number;
@@ -38,32 +38,15 @@ export class AddonModForumPostOptionsMenuComponent implements OnInit, OnDestroy
     canDelete = false;
     loaded = false;
     url?: string;
-    isOnline!: boolean;
-    offlinePost!: boolean;
-
-    protected onlineObserver?: Subscription;
+    offlinePost = false;
 
     /**
-     * Component being initialized.
+     * @inheritdoc
      */
     async ngOnInit(): Promise<void> {
-        this.isOnline = CoreApp.isOnline();
-
-        this.onlineObserver = Network.onChange().subscribe(() => {
-            // Execute the callback in the Angular zone, so change detection doesn't stop working.
-            NgZone.run(() => {
-                this.isOnline = CoreApp.isOnline();
-            });
-        });
-
-        if (this.post.id > 0) {
-            const site = CoreSites.getRequiredCurrentSite();
-            this.url = site.createSiteUrl('/mod/forum/discuss.php', { d: this.post.discussionid.toString() }, 'p' + this.post.id);
-            this.offlinePost = false;
-        } else {
-            // Offline post, you can edit or discard the post.
+        this.offlinePost = this.post.id < 0;
+        if (this.offlinePost) {
             this.loaded = true;
-            this.offlinePost = true;
 
             return;
         }
@@ -81,6 +64,8 @@ export class AddonModForumPostOptionsMenuComponent implements OnInit, OnDestroy
                 }
             } else {
                 this.loaded = true;
+                // Display the open in browser button to prevent having an empty menu.
+                this.setOpenInBrowserUrl();
 
                 return;
             }
@@ -88,14 +73,20 @@ export class AddonModForumPostOptionsMenuComponent implements OnInit, OnDestroy
 
         this.canDelete = !!this.post.capabilities.delete && AddonModForum.isDeletePostAvailable();
         this.canEdit = !!this.post.capabilities.edit && AddonModForum.isUpdatePostAvailable();
+        if (!this.canDelete && !this.canEdit) {
+            // Display the open in browser button to prevent having an empty menu.
+            this.setOpenInBrowserUrl();
+        }
+
         this.loaded = true;
     }
 
     /**
-     * Component destroyed.
+     * Set the URL to open in browser.
      */
-    ngOnDestroy(): void {
-        this.onlineObserver?.unsubscribe();
+    protected setOpenInBrowserUrl(): void {
+        const site = CoreSites.getRequiredCurrentSite();
+        this.url = site.createSiteUrl('/mod/forum/discuss.php', { d: this.post.discussionid.toString() }, 'p' + this.post.id);
     }
 
     /**
@@ -110,6 +101,12 @@ export class AddonModForumPostOptionsMenuComponent implements OnInit, OnDestroy
      */
     deletePost(): void {
         if (!this.offlinePost) {
+            if (!CoreApp.isOnline()) {
+                CoreDomUtils.showErrorModal(new CoreNetworkError());
+
+                return;
+            }
+
             PopoverController.dismiss({ action: 'delete' });
         } else {
             PopoverController.dismiss({ action: 'deleteoffline' });
@@ -120,6 +117,12 @@ export class AddonModForumPostOptionsMenuComponent implements OnInit, OnDestroy
      * Edit a post.
      */
     editPost(): void {
+        if (!this.offlinePost && !CoreApp.isOnline()) {
+            CoreDomUtils.showErrorModal(new CoreNetworkError());
+
+            return;
+        }
+
         PopoverController.dismiss({ action: 'edit' });
     }
 
diff --git a/src/addons/mod/forum/components/post/post.ts b/src/addons/mod/forum/components/post/post.ts
index 5f0acd153..8ece16ae3 100644
--- a/src/addons/mod/forum/components/post/post.ts
+++ b/src/addons/mod/forum/components/post/post.ts
@@ -116,8 +116,15 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
         this.defaultReplySubject = this.post.replysubject || ((this.post.subject.startsWith('Re: ') ||
             this.post.subject.startsWith(reTranslated)) ? this.post.subject : `${reTranslated} ${this.post.subject}`);
 
-        this.optionsMenuEnabled = this.post.id < 0 || (AddonModForum.isGetDiscussionPostAvailable() &&
-                    (AddonModForum.isDeletePostAvailable() || AddonModForum.isUpdatePostAvailable()));
+        if (this.post.id < 0) {
+            this.optionsMenuEnabled = true;
+        } else if (this.post.capabilities.delete !== undefined) {
+            this.optionsMenuEnabled = this.post.capabilities.delete === true || this.post.capabilities.edit === true;
+        } else {
+            // Cannot know if the user can edit/delete or not, display the menu if the WebServices are available.
+            this.optionsMenuEnabled = this.post.id < 0 || (AddonModForum.isGetDiscussionPostAvailable() &&
+                        (AddonModForum.isDeletePostAvailable() || AddonModForum.isUpdatePostAvailable()));
+        }
     }
 
     /**
diff --git a/src/addons/mod/forum/pages/discussion/discussion.html b/src/addons/mod/forum/pages/discussion/discussion.html
index 1c5b8d781..d41503ce8 100644
--- a/src/addons/mod/forum/pages/discussion/discussion.html
+++ b/src/addons/mod/forum/pages/discussion/discussion.html
@@ -53,6 +53,8 @@
             [content]="'addon.mod_forum.removefromfavourites' | translate" iconAction="fas-star" [iconSlash]="true"
             (action)="toggleFavouriteState(false)">
         </core-context-menu-item>
+        <core-context-menu-item [hidden]="!externalUrl" [priority]="100" [content]="'core.openinbrowser' | translate" [href]="externalUrl"
+            iconAction="fas-external-link-alt" [showBrowserWarning]="false"></core-context-menu-item>
     </core-context-menu>
 </core-navbar-buttons>
 <ion-content [core-swipe-navigation]="discussions" class="limited-width">
diff --git a/src/addons/mod/forum/pages/discussion/discussion.page.ts b/src/addons/mod/forum/pages/discussion/discussion.page.ts
index b7c88be26..2b422913e 100644
--- a/src/addons/mod/forum/pages/discussion/discussion.page.ts
+++ b/src/addons/mod/forum/pages/discussion/discussion.page.ts
@@ -107,6 +107,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
     availabilityMessage: string | null = null;
     showQAMessage = false;
     leavingPage = false;
+    externalUrl?: string;
 
     protected forumId?: number;
     protected postId?: number;
@@ -164,6 +165,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
         }
 
         this.isOnline = CoreApp.isOnline();
+        this.externalUrl = CoreSites.getCurrentSite()?.createSiteUrl('/mod/forum/discuss.php', { d: this.discussionId.toString() });
         this.onlineObserver = Network.onChange().subscribe(() => {
             // Execute the callback in the Angular zone, so change detection doesn't stop working.
             NgZone.run(() => {

From 44309284347eb426f512a48948d5596120c3d3fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 20 Apr 2022 13:11:50 +0200
Subject: [PATCH 0990/1008] MOBILE-3833 iframe: Hide warning cards when iframe
 is fullscreen

---
 src/theme/theme.base.scss | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index bfca7c48e..d2d550b9a 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -822,6 +822,12 @@ body.core-iframe-fullscreen ion-router-outlet {
         }
     }
 
+    .core-iframe-fullscreen ion-card.core-#{$color-name}-card,
+    .core-iframe-fullscreen .item.core-#{$color-name}-item {
+        opacity: 0 !important;
+        height: 0 !important;
+    }
+
     ion-icon.ion-color-#{$color-name} {
         --ion-color-base: var(--ion-color-#{$color-name});
         color: var(--ion-color-base);

From f6f876cf3fb2f9c9760dab33f736d265619d6be6 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 20 Apr 2022 13:52:29 +0200
Subject: [PATCH 0991/1008] MOBILE-3833 core: Clean up swipe managers

---
 src/addons/calendar/components/calendar/calendar.ts | 1 +
 src/addons/calendar/pages/day/day.page.ts           | 1 +
 src/addons/mod/book/pages/contents/contents.ts      | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/addons/calendar/components/calendar/calendar.ts b/src/addons/calendar/components/calendar/calendar.ts
index 35b8f92d1..f60aff1ce 100644
--- a/src/addons/calendar/components/calendar/calendar.ts
+++ b/src/addons/calendar/components/calendar/calendar.ts
@@ -324,6 +324,7 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
      */
     ngOnDestroy(): void {
         this.undeleteEventObserver?.off();
+        this.manager?.destroy();
         this.managerUnsubscribe && this.managerUnsubscribe();
     }
 
diff --git a/src/addons/calendar/pages/day/day.page.ts b/src/addons/calendar/pages/day/day.page.ts
index 5c7e7c4b9..36746c630 100644
--- a/src/addons/calendar/pages/day/day.page.ts
+++ b/src/addons/calendar/pages/day/day.page.ts
@@ -452,6 +452,7 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
         this.manualSyncObserver?.off();
         this.onlineObserver?.unsubscribe();
         this.filterChangedObserver?.off();
+        this.manager?.destroy();
         this.managerUnsubscribe && this.managerUnsubscribe();
     }
 
diff --git a/src/addons/mod/book/pages/contents/contents.ts b/src/addons/mod/book/pages/contents/contents.ts
index 865279a06..2a030fb9f 100644
--- a/src/addons/mod/book/pages/contents/contents.ts
+++ b/src/addons/mod/book/pages/contents/contents.ts
@@ -315,6 +315,7 @@ export class AddonModBookContentsPage implements OnInit, OnDestroy {
      */
     ngOnDestroy(): void {
         this.managerUnsubscribe && this.managerUnsubscribe();
+        this.manager?.destroy();
     }
 
 }

From a87f77cdafbdfeec4bee5a5f3488fae7de3400a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 20 Apr 2022 13:12:11 +0200
Subject: [PATCH 0992/1008] MOBILE-3833 loading: Hide content when iframe is
 not loaded

---
 src/core/components/loading/loading.scss | 31 +++++-----------
 src/core/components/loading/loading.ts   | 47 ++++++++++++++++++++++--
 2 files changed, 53 insertions(+), 25 deletions(-)

diff --git a/src/core/components/loading/loading.scss b/src/core/components/loading/loading.scss
index 4f0a58034..d07ba4a9b 100644
--- a/src/core/components/loading/loading.scss
+++ b/src/core/components/loading/loading.scss
@@ -1,21 +1,16 @@
 @import "~theme/globals";
 
 @mixin inline() {
-    min-height: var(--internal-loading-inline-min-height);
-    max-height: 100vh; // In order show it on the page (content will be cut).
-    position: relative;
-
     &:not(.core-loading-loaded) {
-        --contents-display: flex;
-        flex-direction: column;
+        min-height: var(--internal-loading-inline-min-height);
+        width: 100%;
+        position: relative;
     }
 
     .core-loading-container {
         --loading-background: rgba(var(--loading-background-inline), 0.4);
         flex-direction: row;
         height: auto;
-        width: auto;
-        position: absolute;
 
         .core-loading-message {
             @include margin(0, 0, 0, 10px);
@@ -40,8 +35,9 @@
     display: var(--contents-display);
 
     &.core-loading-loaded {
-        --contents-display: contents;
+        position: static;
         pointer-events: auto;
+        --contents-display: contents;
         --internal-loading-inline-min-height: 0px;
 
         &.has-spacer {
@@ -53,7 +49,7 @@
 
     .core-loading-container {
         pointer-events: none;
-        position: fixed;
+        position: absolute;
         @include position(0, 0, 0, 0);
         height: 100%;
         width: 100%;
@@ -92,16 +88,9 @@
 }
 
 :host-context(.limited-width > ):not([slot]) {
-    --contents-display: flex;
-    flex-direction: column;
+    &.core-loading-loaded {
+        --contents-display: flex;
+        flex-direction: column;
+    }
     min-height: 100%;
 }
-
-// There is a bug on iOs that displays inside elements in wrong order.
-// This bug seems not to affect other elements like format-text
-:host-context(.ios) {
-    --contents-display: flex;
-    flex-direction: column;
-    max-height: max-content;
-    width: 100%;
-}
diff --git a/src/core/components/loading/loading.ts b/src/core/components/loading/loading.ts
index 7485ade46..a1f8e5ff7 100644
--- a/src/core/components/loading/loading.ts
+++ b/src/core/components/loading/loading.ts
@@ -55,8 +55,9 @@ export class CoreLoadingComponent implements OnInit, OnChanges, AfterViewInit, A
     @Input() fullscreen = true; // Use the whole screen.
 
     uniqueId: string;
-    loaded = false; // Only comes true once.
+    loaded = false;
 
+    protected scroll = 0;
     protected element: HTMLElement; // Current element.
     protected onReadyPromise = new CorePromisedValue<void>();
 
@@ -106,18 +107,56 @@ export class CoreLoadingComponent implements OnInit, OnChanges, AfterViewInit, A
         this.element.classList.toggle('core-loading-loaded', loaded);
         this.element.setAttribute('aria-busy', loaded ?  'false' : 'true');
 
-        if (!this.loaded && loaded) {
-            this.loaded = true; // Only comes true once.
+        if (this.loaded === loaded) {
+            return;
+        }
+
+        if (!loaded) {
+            await this.saveScrollPosition();
+        }
+        this.loaded = loaded;
+
+        if (loaded) {
             this.onReadyPromise.resolve();
+
+            // Recover last scroll.
+            await this.recoverScrollPosition();
         }
 
         // Event has been deprecated since app 4.0.
         CoreEvents.trigger(CoreEvents.CORE_LOADING_CHANGED, <CoreEventLoadingChangedData> {
-            loaded: true,
+            loaded,
             uniqueId: this.uniqueId,
         });
     }
 
+    /**
+     * Saves current scroll position.
+     */
+    protected async saveScrollPosition(): Promise<void> {
+        const content = this.element.closest('ion-content');
+        if (!content) {
+            return;
+        }
+
+        const scrollElement = await content.getScrollElement();
+        this.scroll = scrollElement.scrollTop;
+    }
+
+    /**
+     * Recovers last set scroll position.
+     */
+    protected async recoverScrollPosition(): Promise<void> {
+        const content = this.element.closest('ion-content');
+        if (!content) {
+            return;
+        }
+
+        const scrollElement = await content.getScrollElement();
+
+        scrollElement.scrollTo(0, this.scroll);
+    }
+
     /**
      * @inheritdoc
      */

From fff702edab9befb8b8a504be4aa5165a00df630b Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 20 Apr 2022 17:36:16 +0200
Subject: [PATCH 0993/1008] MOBILE-3833 course: Remove unneeded scroll handling

---
 src/core/components/loading/loading.ts           |  4 ++++
 .../features/course/pages/contents/contents.ts   | 16 +++++-----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/core/components/loading/loading.ts b/src/core/components/loading/loading.ts
index a1f8e5ff7..6de2d8f4b 100644
--- a/src/core/components/loading/loading.ts
+++ b/src/core/components/loading/loading.ts
@@ -147,6 +147,10 @@ export class CoreLoadingComponent implements OnInit, OnChanges, AfterViewInit, A
      * Recovers last set scroll position.
      */
     protected async recoverScrollPosition(): Promise<void> {
+        if (this.scroll <= 0) {
+            return;
+        }
+
         const content = this.element.closest('ion-content');
         if (!content) {
             return;
diff --git a/src/core/features/course/pages/contents/contents.ts b/src/core/features/course/pages/contents/contents.ts
index b190f4ec0..62915db57 100644
--- a/src/core/features/course/pages/contents/contents.ts
+++ b/src/core/features/course/pages/contents/contents.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, ViewChild, OnInit, OnDestroy, forwardRef } from '@angular/core';
+import { Component, ViewChild, OnInit, OnDestroy, forwardRef, ChangeDetectorRef } from '@angular/core';
 import { IonContent, IonRefresher } from '@ionic/angular';
 
 import { CoreDomUtils } from '@services/utils/dom';
@@ -73,6 +73,8 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy, CoreRefreshCon
     protected modulesHaveCompletion = false;
     protected debouncedUpdateCachedCompletion?: () => void; // Update the cached completion after a certain time.
 
+    constructor(protected changeDetectorRef: ChangeDetectorRef) {}
+
     /**
      * @inheritdoc
      */
@@ -352,12 +354,8 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy, CoreRefreshCon
      */
     protected async showLoadingAndRefresh(sync = false, invalidateData = true): Promise<void> {
         // Save scroll position to restore it once done.
-        const scrollElement = await this.content?.getScrollElement();
-        const scrollTop = scrollElement?.scrollTop || 0;
-        const scrollLeft = scrollElement?.scrollLeft || 0;
-
         this.updatingData = true;
-        this.content?.scrollToTop(0); // Scroll top so the spinner is seen.
+        this.changeDetectorRef.detectChanges();
 
         try {
             if (invalidateData) {
@@ -369,11 +367,7 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy, CoreRefreshCon
             await this.formatComponent?.doRefresh(undefined, undefined, true);
         } finally {
             this.updatingData = false;
-
-            // Wait for new content height to be calculated and scroll without animation.
-            setTimeout(() => {
-                this.content?.scrollToPoint(scrollLeft, scrollTop, 0);
-            });
+            this.changeDetectorRef.detectChanges();
         }
     }
 

From 785d8390e8c0161a8bde91c7159ee4174b4b8ad3 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 21 Apr 2022 08:55:26 +0200
Subject: [PATCH 0994/1008] MOBILE-3833 course: Fix conflict with automatic
 scrolls

---
 .../course/components/course-format/course-format.ts   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/core/features/course/components/course-format/course-format.ts b/src/core/features/course/components/course-format/course-format.ts
index ca8f8b29c..b6bada1f1 100644
--- a/src/core/features/course/components/course-format/course-format.ts
+++ b/src/core/features/course/components/course-format/course-format.ts
@@ -509,12 +509,14 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
         const moduleIdToScroll = this.moduleId && previousValue === undefined ? this.moduleId : moduleId;
         if (moduleIdToScroll) {
             this.scrollToModule(moduleIdToScroll);
-        } else {
-            this.content.scrollToTop(0);
         }
 
-        if (!previousValue || previousValue.id != newSection.id) {
-            // First load or section changed, add log in Moodle.
+        if (!previousValue || previousValue.id !== newSection.id) {
+            // First load or section changed.
+            if (!moduleIdToScroll) {
+                this.content.scrollToTop(0);
+            }
+
             CoreUtils.ignoreErrors(
                 CoreCourse.logView(this.course.id, newSection.section, undefined, this.course.fullname),
             );

From 21200eab2151b4bbf47fcece95587ef61cb9ef78 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 21 Apr 2022 09:51:24 +0200
Subject: [PATCH 0995/1008] MOBILE-3833 swipe-slides: Fix slides width after
 resize

---
 src/core/components/swipe-slides/swipe-slides.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/core/components/swipe-slides/swipe-slides.ts b/src/core/components/swipe-slides/swipe-slides.ts
index a169714e4..27e6587b3 100644
--- a/src/core/components/swipe-slides/swipe-slides.ts
+++ b/src/core/components/swipe-slides/swipe-slides.ts
@@ -18,6 +18,8 @@ import {
 import { CoreSwipeSlidesItemsManager } from '@classes/items-management/swipe-slides-items-manager';
 import { IonContent, IonSlides } from '@ionic/angular';
 import { CoreDomUtils, VerticalPoint } from '@services/utils/dom';
+import { CoreDom } from '@singletons/dom';
+import { CoreEventObserver } from '@singletons/events';
 import { CoreMath } from '@singletons/math';
 
 /**
@@ -40,12 +42,17 @@ export class CoreSwipeSlidesComponent<Item = unknown> implements OnChanges, OnDe
 
     protected hostElement: HTMLElement;
     protected unsubscribe?: () => void;
+    protected resizeListener: CoreEventObserver;
 
     constructor(
         elementRef: ElementRef<HTMLElement>,
         protected content?: IonContent,
     ) {
         this.hostElement = elementRef.nativeElement;
+
+        this.resizeListener = CoreDom.onWindowResize(() => {
+            this.slides?.update();
+        });
     }
 
     /**
@@ -247,6 +254,7 @@ export class CoreSwipeSlidesComponent<Item = unknown> implements OnChanges, OnDe
      */
     ngOnDestroy(): void {
         this.unsubscribe && this.unsubscribe();
+        this.resizeListener.off();
     }
 
 }

From 3627e3fde536e80898018dbba47272ed82ddf05d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 21 Apr 2022 14:00:27 +0200
Subject: [PATCH 0996/1008] MOBILE-3833 signup: Fix min date on datetime user
 profile

---
 .../userprofilefield/datetime/component/datetime.ts       | 2 +-
 .../features/login/pages/email-signup/email-signup.ts     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/addons/userprofilefield/datetime/component/datetime.ts b/src/addons/userprofilefield/datetime/component/datetime.ts
index d494cf549..c26355ce0 100644
--- a/src/addons/userprofilefield/datetime/component/datetime.ts
+++ b/src/addons/userprofilefield/datetime/component/datetime.ts
@@ -75,7 +75,7 @@ export class AddonUserProfileFieldDatetimeComponent extends CoreUserProfileField
             this.max = field.param2;
         }
 
-        this.max = this.max || CoreTimeUtils.getDatetimeDefaultMin();
+        this.min = this.min || CoreTimeUtils.getDatetimeDefaultMin();
         this.max = this.max || CoreTimeUtils.getDatetimeDefaultMax();
     }
 
diff --git a/src/core/features/login/pages/email-signup/email-signup.ts b/src/core/features/login/pages/email-signup/email-signup.ts
index 8f130cd45..8aa65028e 100644
--- a/src/core/features/login/pages/email-signup/email-signup.ts
+++ b/src/core/features/login/pages/email-signup/email-signup.ts
@@ -55,7 +55,7 @@ export class CoreLoginEmailSignupPage implements OnInit {
     siteUrl!: string;
     siteConfig?: CoreSitePublicConfigResponse;
     siteName?: string;
-    authInstructions?: string;
+    authInstructions = '';
     settings?: AuthEmailSignupSettings;
     countries?: CoreCountry[];
     categories?: AuthEmailSignupProfileFieldsCategory[];
@@ -377,7 +377,7 @@ export class CoreLoginEmailSignupPage implements OnInit {
      * Show authentication instructions.
      */
     showAuthInstructions(): void {
-        CoreTextUtils.viewText(Translate.instant('core.login.instructions'), this.authInstructions!);
+        CoreTextUtils.viewText(Translate.instant('core.login.instructions'), this.authInstructions);
     }
 
     /**
@@ -419,7 +419,7 @@ export class CoreLoginEmailSignupPage implements OnInit {
 
             if (!result.status) {
                 if (this.countryControl.value) {
-                    this.signUpCountryControl!.setValue(this.countryControl.value);
+                    this.signUpCountryControl?.setValue(this.countryControl.value);
                 }
 
                 // Not a minor, go ahead.
@@ -428,7 +428,7 @@ export class CoreLoginEmailSignupPage implements OnInit {
                 // Is a minor.
                 this.isMinor = true;
             }
-        } catch (error) {
+        } catch {
             // Something wrong, redirect to the site.
             CoreDomUtils.showErrorModal('There was an error verifying your age, please try again using the browser.');
         } finally {

From c3c8594199a5b7df754e8dac47e181736296bbed Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 21 Apr 2022 12:26:11 +0200
Subject: [PATCH 0997/1008] MOBILE-3833 user-tours: Fix close user tours in iOS
 12

---
 src/core/features/course/pages/contents/contents.ts    |  1 -
 .../usertours/components/user-tour/user-tour.ts        | 10 ++++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/core/features/course/pages/contents/contents.ts b/src/core/features/course/pages/contents/contents.ts
index 62915db57..5ac35bca3 100644
--- a/src/core/features/course/pages/contents/contents.ts
+++ b/src/core/features/course/pages/contents/contents.ts
@@ -353,7 +353,6 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy, CoreRefreshCon
      * @return Promise resolved when done.
      */
     protected async showLoadingAndRefresh(sync = false, invalidateData = true): Promise<void> {
-        // Save scroll position to restore it once done.
         this.updatingData = true;
         this.changeDetectorRef.detectChanges();
 
diff --git a/src/core/features/usertours/components/user-tour/user-tour.ts b/src/core/features/usertours/components/user-tour/user-tour.ts
index 28d6bba73..cab608b62 100644
--- a/src/core/features/usertours/components/user-tour/user-tour.ts
+++ b/src/core/features/usertours/components/user-tour/user-tour.ts
@@ -183,6 +183,11 @@ export class CoreUserToursUserTourComponent implements AfterViewInit, OnDestroy
      * Play animation to show that the User Tour has started.
      */
     private async playEnterAnimation(): Promise<void> {
+        if (!('animate' in this.element)) {
+            // Not supported, don't animate.
+            return;
+        }
+
         const animations = [
             this.element.animate({ opacity: ['0', '1'] }, { duration: ANIMATION_DURATION }),
             this.wrapperElement.value?.animate(
@@ -198,6 +203,11 @@ export class CoreUserToursUserTourComponent implements AfterViewInit, OnDestroy
      * Play animation to show that the User Tour has endd.
      */
     private async playLeaveAnimation(): Promise<void> {
+        if (!('animate' in this.element)) {
+            // Not supported, don't animate.
+            return;
+        }
+
         const animations = [
             this.element.animate({ opacity: ['1', '0'] }, { duration: ANIMATION_DURATION }),
             this.wrapperElement.value?.animate(

From b6e08cc41d7eaedfceacaa8212c56351bdce5690 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 21 Apr 2022 14:17:00 +0200
Subject: [PATCH 0998/1008] MOBILE-3833 tours: Fix some tours not appearing in
 iOS

---
 .../side-blocks-button/side-blocks-button.html           | 3 +--
 .../components/side-blocks-button/side-blocks-button.ts  | 9 ++++++---
 .../course/components/course-format/course-format.html   | 2 +-
 .../course/components/course-format/course-format.ts     | 8 +++++---
 .../components/user-menu-button/user-menu-button.html    | 2 +-
 .../components/user-menu-button/user-menu-button.ts      | 4 +---
 6 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/core/features/block/components/side-blocks-button/side-blocks-button.html b/src/core/features/block/components/side-blocks-button/side-blocks-button.html
index 69fdcdf8f..d7450264c 100644
--- a/src/core/features/block/components/side-blocks-button/side-blocks-button.html
+++ b/src/core/features/block/components/side-blocks-button/side-blocks-button.html
@@ -1,4 +1,3 @@
-<ion-button (click)="openBlocks()" [userTour]="userTour" [attr.aria-label]="'core.block.opendrawerblocks' | translate" color="secondary"
-    #button>
+<ion-button (click)="openBlocks()" [userTour]="userTour" [attr.aria-label]="'core.block.opendrawerblocks' | translate" color="secondary">
     <ion-icon name="fas-chevron-left" slot="icon-only" aria-hidden="true"></ion-icon>
 </ion-button>
diff --git a/src/core/features/block/components/side-blocks-button/side-blocks-button.ts b/src/core/features/block/components/side-blocks-button/side-blocks-button.ts
index 03efee0ae..bc62226d7 100644
--- a/src/core/features/block/components/side-blocks-button/side-blocks-button.ts
+++ b/src/core/features/block/components/side-blocks-button/side-blocks-button.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, ElementRef, Input, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { Component, ElementRef, Input, OnDestroy, OnInit } from '@angular/core';
 import { CoreCancellablePromise } from '@classes/cancellable-promise';
 import { CoreUserTourDirectiveOptions } from '@directives/user-tour';
 import { CoreUserToursAlignment, CoreUserToursSide } from '@features/usertours/services/user-tours';
@@ -33,14 +33,17 @@ export class CoreBlockSideBlocksButtonComponent implements OnInit, OnDestroy {
 
     @Input() contextLevel!: string;
     @Input() instanceId!: number;
-    @ViewChild('button', { read: ElementRef }) button?: ElementRef<HTMLElement>;
 
     userTour: CoreUserTourDirectiveOptions = {
         id: 'side-blocks-button',
         component: CoreBlockSideBlocksTourComponent,
         side: CoreUserToursSide.Start,
         alignment: CoreUserToursAlignment.Center,
-        getFocusedElement: nativeButton => nativeButton.shadowRoot?.children[0] as HTMLElement,
+        getFocusedElement: nativeButton => {
+            const innerButton = Array.from(nativeButton.shadowRoot?.children ?? []).find(child => child.tagName === 'BUTTON');
+
+            return innerButton as HTMLElement ?? nativeButton;
+        },
     };
 
     protected element: HTMLElement;
diff --git a/src/core/features/course/components/course-format/course-format.html b/src/core/features/course/components/course-format/course-format.html
index 4b86d5ce7..7db7e5d2d 100644
--- a/src/core/features/course/components/course-format/course-format.html
+++ b/src/core/features/course/components/course-format/course-format.html
@@ -56,7 +56,7 @@
 <!-- Course Index button. -->
 <ion-fab slot="fixed" core-fab vertical="bottom" horizontal="end" *ngIf="loaded && displayCourseIndex">
     <ion-fab-button (click)="openCourseIndex()" [userTour]="courseIndexTour" [attr.aria-label]="'core.course.courseindex' | translate"
-        color="secondary" #courseIndexFab>
+        color="secondary">
         <ion-icon name="fas-list-ul" aria-hidden="true"></ion-icon>
         <span class="sr-only">{{'core.course.courseindex' | translate }}</span>
     </ion-fab-button>
diff --git a/src/core/features/course/components/course-format/course-format.ts b/src/core/features/course/components/course-format/course-format.ts
index b6bada1f1..38047778b 100644
--- a/src/core/features/course/components/course-format/course-format.ts
+++ b/src/core/features/course/components/course-format/course-format.ts
@@ -23,7 +23,6 @@ import {
     QueryList,
     Type,
     ElementRef,
-    ViewChild,
 } from '@angular/core';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreDynamicComponent } from '@components/dynamic-component/dynamic-component';
@@ -77,7 +76,6 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
     @Input() moduleId?: number; // The module ID to scroll to. Must be inside the initial selected section.
 
     @ViewChildren(CoreDynamicComponent) dynamicComponents?: QueryList<CoreDynamicComponent>;
-    @ViewChild('courseIndexFab', { read: ElementRef }) courseIndexFab?: ElementRef<HTMLElement>;
 
     // All the possible component classes.
     courseFormatComponent?: Type<unknown>;
@@ -93,7 +91,11 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
         component: CoreCourseCourseIndexTourComponent,
         side: CoreUserToursSide.Top,
         alignment: CoreUserToursAlignment.End,
-        getFocusedElement: nativeButton => nativeButton.shadowRoot?.children[0] as HTMLElement,
+        getFocusedElement: nativeButton => {
+            const innerButton = Array.from(nativeButton.shadowRoot?.children ?? []).find(child => child.tagName === 'BUTTON');
+
+            return innerButton as HTMLElement ?? nativeButton;
+        },
     };
 
     displayCourseIndex = false;
diff --git a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.html b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.html
index e24ded5c4..b4eb942c5 100644
--- a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.html
+++ b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.html
@@ -1,4 +1,4 @@
 <core-user-avatar *ngIf="isMainScreen && siteInfo" [user]="siteInfo" class="core-bar-button-image clickable" [linkProfile]="false"
     (ariaButtonClick)="openUserMenu($event)" [userTour]="userTour" role="button" tabindex="0"
-    [attr.aria-label]="'core.user.useraccount' | translate" #avatar>
+    [attr.aria-label]="'core.user.useraccount' | translate">
 </core-user-avatar>
diff --git a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts
index 54e11f46f..bece772fe 100644
--- a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts
+++ b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { CoreSiteInfo } from '@classes/site';
 import { CoreUserTourDirectiveOptions } from '@directives/user-tour';
 import { CoreUserToursAlignment, CoreUserToursSide } from '@features/usertours/services/user-tours';
@@ -44,8 +44,6 @@ export class CoreMainMenuUserButtonComponent implements OnInit {
         side: CoreScreen.isMobile ? CoreUserToursSide.Start : CoreUserToursSide.End,
     };
 
-    @ViewChild('avatar', { read: ElementRef }) avatar?: ElementRef<HTMLElement>;
-
     constructor(protected routerOutlet: IonRouterOutlet) {
         const currentSite = CoreSites.getRequiredCurrentSite();
 

From e502c7339250758922b0517f2f62302407e20bee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 21 Apr 2022 15:16:24 +0200
Subject: [PATCH 0999/1008] MOBILE-3833 signup: Add a wrapper container and
 remove refresher

---
 .../pages/email-signup/email-signup.html      | 346 +++++++++---------
 .../login/pages/email-signup/email-signup.ts  |  12 -
 2 files changed, 172 insertions(+), 186 deletions(-)

diff --git a/src/core/features/login/pages/email-signup/email-signup.html b/src/core/features/login/pages/email-signup/email-signup.html
index 1308598e1..6037c7519 100644
--- a/src/core/features/login/pages/email-signup/email-signup.html
+++ b/src/core/features/login/pages/email-signup/email-signup.html
@@ -17,12 +17,8 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-refresher slot="fixed" [disabled]="!settingsLoaded || isMinor" (ionRefresh)="refreshSettings($event.target)">
-        <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
-    </ion-refresher>
-    <div class="list-item-limited-width">
-
-        <core-loading [hideUntil]="settingsLoaded" *ngIf="!isMinor">
+    <core-loading [hideUntil]="settingsLoaded" *ngIf="!isMinor">
+        <div class="list-item-limited-width">
 
             <!-- Site has an unsupported required field. -->
             <ion-list *ngIf="!allRequiredSupported">
@@ -36,195 +32,197 @@
                 </ion-button>
             </ion-list>
 
-            <!-- Age verification. -->
-            <form *ngIf="allRequiredSupported && settingsLoaded && settings && ageDigitalConsentVerification"
-                [formGroup]="ageVerificationForm" (ngSubmit)="verifyAge($event)" #ageForm>
+            <ng-container *ngIf="allRequiredSupported && settingsLoaded && settings">
+                <!-- Age verification. -->
+                <form *ngIf="ageDigitalConsentVerification" [formGroup]="ageVerificationForm" (ngSubmit)="verifyAge($event)" #ageForm>
 
-                <ion-item-divider class="ion-text-wrap">
-                    <ion-label>
-                        <h3>{{ 'core.agelocationverification' | translate }}</h3>
-                    </ion-label>
-                </ion-item-divider>
+                    <ion-item-divider class="ion-text-wrap">
+                        <ion-label>
+                            <h3>{{ 'core.agelocationverification' | translate }}</h3>
+                        </ion-label>
+                    </ion-item-divider>
 
-                <ion-item class="ion-text-wrap">
-                    <ion-label position="stacked">
-                        <span core-mark-required="true">{{ 'core.whatisyourage' | translate }}</span>
-                    </ion-label>
-                    <ion-input type="number" name="age" placeholder="0" formControlName="age" autocapitalize="none" autocorrect="off">
-                    </ion-input>
-                </ion-item>
-
-                <ion-item class="ion-text-wrap">
-                    <ion-label position="stacked">
-                        <span core-mark-required="true">{{ 'core.wheredoyoulive' | translate }}</span>
-                    </ion-label>
-                    <ion-select name="country" formControlName="country" [placeholder]="'core.login.selectacountry' | translate">
-                        <ion-select-option value="">{{ 'core.login.selectacountry' | translate }}</ion-select-option>
-                        <ion-select-option *ngFor="let country of countries" [value]="country.code">{{country.name}}</ion-select-option>
-                    </ion-select>
-                </ion-item>
-
-                <!-- Submit button. -->
-                <ion-button expand="block" class="ion-margin" type="submit" [disabled]="!ageVerificationForm.valid">
-                    {{ 'core.proceed' | translate }}
-                </ion-button>
-
-                <ion-item class="ion-text-wrap">
-                    <ion-label>
-                        <h3 class="item-heading">{{ 'core.whyisthisrequired' | translate }}</h3>
-                        <p>{{ 'core.explanationdigitalminor' | translate }}</p>
-                    </ion-label>
-                </ion-item>
-            </form>
-
-            <!-- Signup form. -->
-            <form *ngIf="allRequiredSupported && settingsLoaded && settings && !ageDigitalConsentVerification" [formGroup]="signupForm"
-                (ngSubmit)="create($event)" #signupFormEl>
-
-                <ion-item class="ion-text-wrap ion-text-center">
-                    <ion-label>
-                        <!-- If no sitename show big siteurl. -->
-                        <p *ngIf="!siteName" class="ion-padding item-heading">{{siteUrl}}</p>
-                        <!-- If sitename, show big sitename and small siteurl. -->
-                        <p *ngIf="siteName" class="ion-padding item-heading">
-                            <core-format-text [text]="siteName" [filter]="false"></core-format-text>
-                        </p>
-                        <p *ngIf="siteName">{{siteUrl}}</p>
-                    </ion-label>
-                </ion-item>
-
-                <!-- Username and password. -->
-                <ion-item-divider class="ion-text-wrap">
-                    <ion-label>
-                        <h3>{{ 'core.login.createuserandpass' | translate }}</h3>
-                    </ion-label>
-                </ion-item-divider>
-                <ion-item class="ion-text-wrap">
-                    <ion-label position="stacked">
-                        <span core-mark-required="true">{{ 'core.login.username' | translate }}</span>
-                    </ion-label>
-                    <ion-input type="text" name="username" placeholder="{{ 'core.login.username' | translate }}" formControlName="username"
-                        autocapitalize="none" autocorrect="off">
-                    </ion-input>
-                    <core-input-errors [control]="signupForm.controls.username" [errorMessages]="usernameErrors"></core-input-errors>
-                </ion-item>
-                <ion-item class="ion-text-wrap">
-                    <ion-label position="stacked">
-                        <span core-mark-required="true">{{ 'core.login.password' | translate }}</span>
-                    </ion-label>
-                    <core-show-password name="password">
-                        <ion-input name="password" type="password" placeholder="{{ 'core.login.password' | translate }}"
-                            formControlName="password" [clearOnEdit]="false" autocomplete="new-password" required="true">
+                    <ion-item class="ion-text-wrap">
+                        <ion-label position="stacked">
+                            <span core-mark-required="true">{{ 'core.whatisyourage' | translate }}</span>
+                        </ion-label>
+                        <ion-input type="number" name="age" placeholder="0" formControlName="age" autocapitalize="none" autocorrect="off">
                         </ion-input>
-                    </core-show-password>
-                    <p *ngIf="settings.passwordpolicy" class="core-input-footnote">
-                        {{settings.passwordpolicy}}
-                    </p>
-                    <core-input-errors [control]="signupForm.controls.password" [errorMessages]="passwordErrors"></core-input-errors>
-                </ion-item>
+                    </ion-item>
 
-                <!-- More details. -->
-                <ion-item-divider class="ion-text-wrap">
-                    <ion-label>
-                        <h3>{{ 'core.login.supplyinfo' | translate }}</h3>
-                    </ion-label>
-                </ion-item-divider>
-                <ion-item class="ion-text-wrap">
-                    <ion-label position="stacked">
-                        <span core-mark-required="true">{{ 'core.user.email' | translate }}</span>
-                    </ion-label>
-                    <ion-input type="email" name="email" placeholder="{{ 'core.user.email' | translate }}" formControlName="email"
-                        autocapitalize="none" autocorrect="off">
-                    </ion-input>
-                    <core-input-errors [control]="signupForm.controls.email" [errorMessages]="emailErrors"></core-input-errors>
-                </ion-item>
-                <ion-item class="ion-text-wrap">
-                    <ion-label position="stacked">
-                        <span core-mark-required="true">{{ 'core.user.emailagain' | translate }}</span>
-                    </ion-label>
-                    <ion-input type="email" name="email2" placeholder="{{ 'core.user.emailagain' | translate }}" autocapitalize="none"
-                        formControlName="email2" autocorrect="off" [pattern]="escapeMail(signupForm.controls.email.value)">
-                    </ion-input>
-                    <core-input-errors [control]="signupForm.controls.email2" [errorMessages]="email2Errors"></core-input-errors>
-                </ion-item>
-                <ion-item *ngFor="let nameField of settings.namefields" class="ion-text-wrap">
-                    <ion-label position="stacked">
-                        <span core-mark-required="true">{{ 'core.user.' + nameField | translate }}</span>
-                    </ion-label>
-                    <ion-input type="text" name="nameField" placeholder="{{ 'core.user.' + nameField | translate }}"
-                        formControlName="{{nameField}}" autocorrect="off">
-                    </ion-input>
-                    <core-input-errors [control]="signupForm.controls[nameField]" [errorMessages]="namefieldsErrors![nameField]">
-                    </core-input-errors>
-                </ion-item>
-                <ion-item class="ion-text-wrap">
-                    <ion-label position="stacked">{{ 'core.user.city' | translate }}</ion-label>
-                    <ion-input type="text" name="city" placeholder="{{ 'core.user.city' | translate }}" formControlName="city"
-                        autocorrect="off">
-                    </ion-input>
-                </ion-item>
-                <ion-item class="ion-text-wrap">
-                    <ion-label position="stacked" id="core-login-signup-country">{{ 'core.user.country' | translate }}</ion-label>
-                    <ion-select name="country" formControlName="country" aria-labelledby="core-login-signup-country"
-                        [placeholder]="'core.login.selectacountry' | translate">
-
-                        <ion-select-option value="">{{ 'core.login.selectacountry' | translate }}</ion-select-option>
-                        <ion-select-option *ngFor="let country of countries" [value]="country.code">{{country.name}}</ion-select-option>
-                    </ion-select>
-                </ion-item>
-
-                <!-- Other categories. -->
-                <ng-container *ngFor="let category of categories">
-                    <ion-item-divider class="ion-text-wrap">
-                        <ion-label>
-                            <p class="item-heading">{{ category.name }}</p>
+                    <ion-item class="ion-text-wrap">
+                        <ion-label position="stacked">
+                            <span core-mark-required="true">{{ 'core.wheredoyoulive' | translate }}</span>
                         </ion-label>
-                    </ion-item-divider>
-                    <core-user-profile-field *ngFor="let field of category.fields" [field]="field" [edit]="true" [signup]="true"
-                        registerAuth="email" [form]="signupForm"></core-user-profile-field>
-                </ng-container>
+                        <ion-select name="country" formControlName="country" [placeholder]="'core.login.selectacountry' | translate">
+                            <ion-select-option value="">{{ 'core.login.selectacountry' | translate }}</ion-select-option>
+                            <ion-select-option *ngFor="let country of countries" [value]="country.code">{{country.name}}</ion-select-option>
+                        </ion-select>
+                    </ion-item>
 
-                <!-- ReCAPTCHA -->
-                <ng-container *ngIf="settings.recaptchapublickey">
-                    <ion-item-divider class="ion-text-wrap">
+                    <!-- Submit button. -->
+                    <ion-button expand="block" class="ion-margin" type="submit" [disabled]="!ageVerificationForm.valid">
+                        {{ 'core.proceed' | translate }}
+                    </ion-button>
+
+                    <ion-item class="ion-text-wrap">
                         <ion-label>
-                            <h3><span [core-mark-required]="true">{{ 'core.login.security_question' | translate }}</span></h3>
+                            <h3 class="item-heading">{{ 'core.whyisthisrequired' | translate }}</h3>
+                            <p>{{ 'core.explanationdigitalminor' | translate }}</p>
                         </ion-label>
-                    </ion-item-divider>
-                    <core-recaptcha [publicKey]="settings.recaptchapublickey" [model]="captcha" [siteUrl]="siteUrl"></core-recaptcha>
-                </ng-container>
+                    </ion-item>
+                </form>
 
-                <!-- Site policy (if any). -->
-                <ng-container *ngIf="settings.sitepolicy">
+                <!-- Signup form. -->
+                <form *ngIf="!ageDigitalConsentVerification" [formGroup]="signupForm" (ngSubmit)="create($event)" #signupFormEl>
+
+                    <ion-item class="ion-text-wrap ion-text-center">
+                        <ion-label>
+                            <!-- If no sitename show big siteurl. -->
+                            <p *ngIf="!siteName" class="ion-padding item-heading">{{siteUrl}}</p>
+                            <!-- If sitename, show big sitename and small siteurl. -->
+                            <p *ngIf="siteName" class="ion-padding item-heading">
+                                <core-format-text [text]="siteName" [filter]="false"></core-format-text>
+                            </p>
+                            <p *ngIf="siteName">{{siteUrl}}</p>
+                        </ion-label>
+                    </ion-item>
+
+                    <!-- Username and password. -->
                     <ion-item-divider class="ion-text-wrap">
                         <ion-label>
-                            <h3>{{ 'core.login.policyagreement' | translate }}</h3>
+                            <h3>{{ 'core.login.createuserandpass' | translate }}</h3>
                         </ion-label>
                     </ion-item-divider>
                     <ion-item class="ion-text-wrap">
-                        <ion-label>
-                            <a [href]="settings.sitepolicy" core-link capture="false">
-                                {{ 'core.login.policyagreementclick' | translate }}
-                            </a>
+                        <ion-label position="stacked">
+                            <span core-mark-required="true">{{ 'core.login.username' | translate }}</span>
                         </ion-label>
+                        <ion-input type="text" name="username" placeholder="{{ 'core.login.username' | translate }}"
+                            formControlName="username" autocapitalize="none" autocorrect="off">
+                        </ion-input>
+                        <core-input-errors [control]="signupForm.controls.username" [errorMessages]="usernameErrors"></core-input-errors>
                     </ion-item>
                     <ion-item class="ion-text-wrap">
-                        <ion-label>
-                            <span [core-mark-required]="true">{{ 'core.login.policyacceptmandatory' | translate }}</span>
-                            <core-input-errors [control]="signupForm.controls.policyagreed" [errorMessages]="policyErrors">
-                            </core-input-errors>
+                        <ion-label position="stacked">
+                            <span core-mark-required="true">{{ 'core.login.password' | translate }}</span>
                         </ion-label>
-                        <ion-checkbox slot="end" name="policyagreed" formControlName="policyagreed"></ion-checkbox>
+                        <core-show-password name="password">
+                            <ion-input name="password" type="password" placeholder="{{ 'core.login.password' | translate }}"
+                                formControlName="password" [clearOnEdit]="false" autocomplete="new-password" required="true">
+                            </ion-input>
+                        </core-show-password>
+                        <p *ngIf="settings.passwordpolicy" class="core-input-footnote">
+                            {{settings.passwordpolicy}}
+                        </p>
+                        <core-input-errors [control]="signupForm.controls.password" [errorMessages]="passwordErrors"></core-input-errors>
                     </ion-item>
-                </ng-container>
 
-                <!-- Submit button. -->
-                <ion-button expand="block" class="ion-margin" type="submit">{{ 'core.login.createaccount' | translate }}</ion-button>
-                <!-- Remove this once Ionic fixes this bug: https://github.com/ionic-team/ionic-framework/issues/19368 -->
-                <input type="submit" class="core-submit-hidden-enter" />
-            </form>
-        </core-loading>
+                    <!-- More details. -->
+                    <ion-item-divider class="ion-text-wrap">
+                        <ion-label>
+                            <h3>{{ 'core.login.supplyinfo' | translate }}</h3>
+                        </ion-label>
+                    </ion-item-divider>
+                    <ion-item class="ion-text-wrap">
+                        <ion-label position="stacked">
+                            <span core-mark-required="true">{{ 'core.user.email' | translate }}</span>
+                        </ion-label>
+                        <ion-input type="email" name="email" placeholder="{{ 'core.user.email' | translate }}" formControlName="email"
+                            autocapitalize="none" autocorrect="off">
+                        </ion-input>
+                        <core-input-errors [control]="signupForm.controls.email" [errorMessages]="emailErrors"></core-input-errors>
+                    </ion-item>
+                    <ion-item class="ion-text-wrap">
+                        <ion-label position="stacked">
+                            <span core-mark-required="true">{{ 'core.user.emailagain' | translate }}</span>
+                        </ion-label>
+                        <ion-input type="email" name="email2" placeholder="{{ 'core.user.emailagain' | translate }}" autocapitalize="none"
+                            formControlName="email2" autocorrect="off" [pattern]="escapeMail(signupForm.controls.email.value)">
+                        </ion-input>
+                        <core-input-errors [control]="signupForm.controls.email2" [errorMessages]="email2Errors"></core-input-errors>
+                    </ion-item>
+                    <ion-item *ngFor="let nameField of settings.namefields" class="ion-text-wrap">
+                        <ion-label position="stacked">
+                            <span core-mark-required="true">{{ 'core.user.' + nameField | translate }}</span>
+                        </ion-label>
+                        <ion-input type="text" name="nameField" placeholder="{{ 'core.user.' + nameField | translate }}"
+                            formControlName="{{nameField}}" autocorrect="off">
+                        </ion-input>
+                        <core-input-errors [control]="signupForm.controls[nameField]" [errorMessages]="namefieldsErrors![nameField]">
+                        </core-input-errors>
+                    </ion-item>
+                    <ion-item class="ion-text-wrap">
+                        <ion-label position="stacked">{{ 'core.user.city' | translate }}</ion-label>
+                        <ion-input type="text" name="city" placeholder="{{ 'core.user.city' | translate }}" formControlName="city"
+                            autocorrect="off">
+                        </ion-input>
+                    </ion-item>
+                    <ion-item class="ion-text-wrap">
+                        <ion-label position="stacked" id="core-login-signup-country">{{ 'core.user.country' | translate }}</ion-label>
+                        <ion-select name="country" formControlName="country" aria-labelledby="core-login-signup-country"
+                            [placeholder]="'core.login.selectacountry' | translate">
 
+                            <ion-select-option value="">{{ 'core.login.selectacountry' | translate }}</ion-select-option>
+                            <ion-select-option *ngFor="let country of countries" [value]="country.code">{{country.name}}</ion-select-option>
+                        </ion-select>
+                    </ion-item>
+
+                    <!-- Other categories. -->
+                    <ng-container *ngFor="let category of categories">
+                        <ion-item-divider class="ion-text-wrap">
+                            <ion-label>
+                                <p class="item-heading">{{ category.name }}</p>
+                            </ion-label>
+                        </ion-item-divider>
+                        <core-user-profile-field *ngFor="let field of category.fields" [field]="field" [edit]="true" [signup]="true"
+                            registerAuth="email" [form]="signupForm"></core-user-profile-field>
+                    </ng-container>
+
+                    <!-- ReCAPTCHA -->
+                    <ng-container *ngIf="settings.recaptchapublickey">
+                        <ion-item-divider class="ion-text-wrap">
+                            <ion-label>
+                                <h3><span [core-mark-required]="true">{{ 'core.login.security_question' | translate }}</span></h3>
+                            </ion-label>
+                        </ion-item-divider>
+                        <core-recaptcha [publicKey]="settings.recaptchapublickey" [model]="captcha" [siteUrl]="siteUrl"></core-recaptcha>
+                    </ng-container>
+
+                    <!-- Site policy (if any). -->
+                    <ng-container *ngIf="settings.sitepolicy">
+                        <ion-item-divider class="ion-text-wrap">
+                            <ion-label>
+                                <h3>{{ 'core.login.policyagreement' | translate }}</h3>
+                            </ion-label>
+                        </ion-item-divider>
+                        <ion-item class="ion-text-wrap">
+                            <ion-label>
+                                <a [href]="settings.sitepolicy" core-link capture="false">
+                                    {{ 'core.login.policyagreementclick' | translate }}
+                                </a>
+                            </ion-label>
+                        </ion-item>
+                        <ion-item class="ion-text-wrap">
+                            <ion-label>
+                                <span [core-mark-required]="true">{{ 'core.login.policyacceptmandatory' | translate }}</span>
+                                <core-input-errors [control]="signupForm.controls.policyagreed" [errorMessages]="policyErrors">
+                                </core-input-errors>
+                            </ion-label>
+                            <ion-checkbox slot="end" name="policyagreed" formControlName="policyagreed"></ion-checkbox>
+                        </ion-item>
+                    </ng-container>
+
+                    <!-- Submit button. -->
+                    <ion-button expand="block" class="ion-margin" type="submit">{{ 'core.login.createaccount' | translate }}</ion-button>
+                    <!-- Remove this once Ionic fixes this bug: https://github.com/ionic-team/ionic-framework/issues/19368 -->
+                    <input type="submit" class="core-submit-hidden-enter" />
+                </form>
+            </ng-container>
+        </div>
+    </core-loading>
+
+    <div class="list-item-limited-width">
         <ion-list *ngIf="allRequiredSupported && isMinor">
             <ion-item-divider class="ion-text-wrap">
                 <ion-label>
diff --git a/src/core/features/login/pages/email-signup/email-signup.ts b/src/core/features/login/pages/email-signup/email-signup.ts
index 8aa65028e..5e1616980 100644
--- a/src/core/features/login/pages/email-signup/email-signup.ts
+++ b/src/core/features/login/pages/email-signup/email-signup.ts
@@ -14,7 +14,6 @@
 
 import { Component, ViewChild, ElementRef, OnInit, ChangeDetectorRef } from '@angular/core';
 import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms';
-import { IonRefresher } from '@ionic/angular';
 
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
@@ -256,17 +255,6 @@ export class CoreLoginEmailSignupPage implements OnInit {
         }
     }
 
-    /**
-     * Pull to refresh.
-     *
-     * @param event Event.
-     */
-    refreshSettings(event?: IonRefresher): void {
-        this.fetchData().finally(() => {
-            event?.complete();
-        });
-    }
-
     /**
      * Create account.
      *

From 740b5332ce12fc485e7592b14167df83f81d1e0d Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Fri, 22 Apr 2022 09:14:09 +0200
Subject: [PATCH 1000/1008] MOBILE-3833 usertours: Watch collapsible header

---
 src/core/directives/collapsible-header.ts     | 44 +++++++++++++++++--
 .../components/user-tour/user-tour.ts         |  6 +++
 2 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts
index 17bbc9e07..6fdba530a 100644
--- a/src/core/directives/collapsible-header.ts
+++ b/src/core/directives/collapsible-header.ts
@@ -23,11 +23,26 @@ import { ScrollDetail } from '@ionic/core';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreComponentsRegistry } from '@singletons/components-registry';
 import { CoreDom } from '@singletons/dom';
-import { CoreEventObserver } from '@singletons/events';
+import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreMath } from '@singletons/math';
 import { Subscription } from 'rxjs';
 import { CoreFormatTextDirective } from './format-text';
 
+declare module '@singletons/events' {
+
+    /**
+     * Augment CoreEventsData interface with events specific to this service.
+     *
+     * @see https://www.typescriptlang.org/docs/handbook/declaration-merging.html#module-augmentation
+     */
+    export interface CoreEventsData {
+        [COLLAPSIBLE_HEADER_UPDATED]: { collapsed: boolean };
+    }
+
+}
+
+export const COLLAPSIBLE_HEADER_UPDATED = 'collapsible_header_updated';
+
 /**
  * Directive to make <ion-header> collapsible.
  *
@@ -151,6 +166,27 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
         this.visiblePromise?.cancel();
     }
 
+    /**
+     * Update collapsed status of the header.
+     *
+     * @param collapsed Whether header is collapsed or not.
+     */
+    protected setCollapsed(collapsed: boolean): void {
+        if (!this.page) {
+            return;
+        }
+
+        const isCollapsed = this.page.classList.contains('collapsible-header-page-is-collapsed');
+
+        if (isCollapsed === collapsed) {
+            return;
+        }
+
+        this.page.classList.toggle('collapsible-header-page-is-collapsed', collapsed);
+
+        CoreEvents.trigger(COLLAPSIBLE_HEADER_UPDATED, { collapsed });
+    }
+
     /**
      * Listen to changing events.
      */
@@ -458,8 +494,8 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
             }
         }
 
+        this.setCollapsed(!enable);
         this.page.style.setProperty('--collapsible-header-progress', enable ? '0' : '1');
-        this.page.classList.toggle('collapsible-header-page-is-collapsed', !enable);
     }
 
     /**
@@ -523,9 +559,9 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
                 ? 0
                 : CoreMath.clamp(contentScroll.scrollTop / scrollingHeight, 0, 1);
 
+            this.setCollapsed(progress === 1);
             page.style.setProperty('--collapsible-header-progress', `${progress}`);
             page.classList.toggle('collapsible-header-page-is-frozen', frozen);
-            page.classList.toggle('collapsible-header-page-is-collapsed', progress === 1);
 
             Object
                 .entries(progress > .5 ? collapsedFontStyles : expandedFontStyles)
@@ -547,8 +583,8 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
                 const scrollTop = contentScroll.scrollTop;
                 const collapse = progress > 0.5;
 
+                this.setCollapsed(collapse);
                 page.style.setProperty('--collapsible-header-progress', collapse ? '1' : '0');
-                page.classList.toggle('collapsible-header-page-is-collapsed', collapse);
 
                 if (collapse && this.scrollingHeight && this.scrollingHeight > 0 && scrollTop < this.scrollingHeight) {
                     this.content?.scrollToPoint(null, this.scrollingHeight);
diff --git a/src/core/features/usertours/components/user-tour/user-tour.ts b/src/core/features/usertours/components/user-tour/user-tour.ts
index cab608b62..13a736198 100644
--- a/src/core/features/usertours/components/user-tour/user-tour.ts
+++ b/src/core/features/usertours/components/user-tour/user-tour.ts
@@ -34,6 +34,7 @@ import { CoreComponentsRegistry } from '@singletons/components-registry';
 import { CoreDom } from '@singletons/dom';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreMainMenuProvider } from '@features/mainmenu/services/mainmenu';
+import { COLLAPSIBLE_HEADER_UPDATED } from '@directives/collapsible-header';
 
 const ANIMATION_DURATION = 200;
 const USER_TOURS_BACK_BUTTON_PRIORITY = 100;
@@ -71,6 +72,7 @@ export class CoreUserToursUserTourComponent implements AfterViewInit, OnDestroy
     private wrapperTransform = '';
     private wrapperElement = new CorePromisedValue<HTMLElement>();
     private backButtonListener?: (event: BackButtonEvent) => void;
+    protected collapsibleHeaderListener?: CoreEventObserver;
     protected mainMenuListener?: CoreEventObserver;
     protected resizeListener?: CoreEventObserver;
     protected scrollListener?: EventListener;
@@ -252,6 +254,8 @@ export class CoreUserToursUserTourComponent implements AfterViewInit, OnDestroy
             return;
         }
 
+        this.collapsibleHeaderListener = this.collapsibleHeaderListener ??
+            CoreEvents.on(COLLAPSIBLE_HEADER_UPDATED, () => this.calculateStyles());
         this.mainMenuListener = this.mainMenuListener ??
             CoreEvents.on(CoreMainMenuProvider.MAIN_MENU_VISIBILITY_UPDATED, () => this.calculateStyles());
         this.resizeListener = this.resizeListener ?? CoreDom.onWindowResize(() => this.calculateStyles());
@@ -276,10 +280,12 @@ export class CoreUserToursUserTourComponent implements AfterViewInit, OnDestroy
 
         this.active = false;
 
+        this.collapsibleHeaderListener?.off();
         this.mainMenuListener?.off();
         this.resizeListener?.off();
         this.backButtonListener && document.removeEventListener('ionBackButton', this.backButtonListener);
         this.backButtonListener = undefined;
+        this.collapsibleHeaderListener = undefined;
         this.mainMenuListener = undefined;
         this.resizeListener = undefined;
 

From b398b084b5e4a83166ca23b0f1aa233823a27a6a Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 22 Apr 2022 08:40:17 +0200
Subject: [PATCH 1001/1008] MOBILE-3833 module: Fix summary not loaded if
 cannot view grades

---
 .../module-summary/module-summary.ts          | 34 ++++++++++++++-----
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/core/features/course/components/module-summary/module-summary.ts b/src/core/features/course/components/module-summary/module-summary.ts
index 89c7ef570..0fed98fd1 100644
--- a/src/core/features/course/components/module-summary/module-summary.ts
+++ b/src/core/features/course/components/module-summary/module-summary.ts
@@ -174,21 +174,35 @@ export class CoreCourseModuleSummaryComponent implements OnInit, OnDestroy {
         this.componentId = this.module.id;
         this.externalUrl = this.module.url;
         this.courseId = this.courseId || this.module.course;
-
-        this.modicon = await CoreCourseModuleDelegate.getModuleIconSrc(this.module.modname, this.module.modicon, this.module);
         this.moduleNameTranslated = CoreCourse.translateModuleName(this.module.modname || '');
 
         this.blog = await AddonBlog.isPluginEnabled();
 
-        await Promise.all([
-            this.getPackageStatus(),
-            this.fetchGrades(),
-            this.fetchCourse(),
-        ]);
+        try {
+            await Promise.all([
+                this.loadModIcon(),
+                this.getPackageStatus(),
+                this.fetchGrades(),
+                this.fetchCourse(),
+            ]);
+        } catch (error) {
+            CoreDomUtils.showErrorModal(error);
+        }
 
         this.loaded = true;
     }
 
+    /**
+     * Load the module icon.
+     */
+    protected async loadModIcon(): Promise<void> {
+        if (!this.module) {
+            return;
+        }
+
+        this.modicon = await CoreCourseModuleDelegate.getModuleIconSrc(this.module.modname, this.module.modicon, this.module);
+    }
+
     /**
      * Updage package status.
      *
@@ -235,7 +249,11 @@ export class CoreCourseModuleSummaryComponent implements OnInit, OnDestroy {
             return;
         }
 
-        this.grades = await CoreGradesHelper.getModuleGrades(this.courseId, this.moduleId);
+        try {
+            this.grades = await CoreGradesHelper.getModuleGrades(this.courseId, this.moduleId);
+        } catch {
+            // Cannot get grades, don't display them.
+        }
     }
 
     /**

From b0f090061b88d0eb4d064e6244325223977e0aaa Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 22 Apr 2022 09:42:34 +0200
Subject: [PATCH 1002/1008] MOBILE-3833 bbb: Improve error message when user
 not in group

---
 scripts/langindex.json                        |  1 +
 .../bigbluebuttonbn/components/index/index.ts | 22 +++++++++++++------
 src/addons/mod/bigbluebuttonbn/lang.json      |  3 ++-
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 70cc0b1cc..fd706d2f8 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -461,6 +461,7 @@
   "addon.mod_bigbluebuttonbn.view_message_session_started_at": "bigbluebuttonbn",
   "addon.mod_bigbluebuttonbn.view_message_viewer": "bigbluebuttonbn",
   "addon.mod_bigbluebuttonbn.view_message_viewers": "bigbluebuttonbn",
+  "addon.mod_bigbluebuttonbn.view_nojoin": "bigbluebuttonbn",
   "addon.mod_book.errorchapter": "book",
   "addon.mod_book.modulenameplural": "book",
   "addon.mod_book.navnexttitle": "book",
diff --git a/src/addons/mod/bigbluebuttonbn/components/index/index.ts b/src/addons/mod/bigbluebuttonbn/components/index/index.ts
index 33a5fe693..444de98c2 100644
--- a/src/addons/mod/bigbluebuttonbn/components/index/index.ts
+++ b/src/addons/mod/bigbluebuttonbn/components/index/index.ts
@@ -81,15 +81,23 @@ export class AddonModBBBIndexComponent extends CoreCourseModuleMainActivityCompo
             return;
         }
 
-        this.meetingInfo = await AddonModBBB.getMeetingInfo(this.bbb.id, this.groupId, {
-            cmId: this.module.id,
-        });
+        try {
+            this.meetingInfo = await AddonModBBB.getMeetingInfo(this.bbb.id, this.groupId, {
+                cmId: this.module.id,
+            });
 
-        if (this.meetingInfo.statusrunning && this.meetingInfo.userlimit > 0) {
-            const count = (this.meetingInfo.participantcount || 0) + (this.meetingInfo.moderatorcount || 0);
-            if (count === this.meetingInfo.userlimit) {
-                this.meetingInfo.statusmessage = Translate.instant('addon.mod_bigbluebuttonbn.userlimitreached');
+            if (this.meetingInfo.statusrunning && this.meetingInfo.userlimit > 0) {
+                const count = (this.meetingInfo.participantcount || 0) + (this.meetingInfo.moderatorcount || 0);
+                if (count === this.meetingInfo.userlimit) {
+                    this.meetingInfo.statusmessage = Translate.instant('addon.mod_bigbluebuttonbn.userlimitreached');
+                }
             }
+        } catch (error) {
+            if (error && error.errorcode === 'restrictedcontextexception') {
+                error.message = Translate.instant('addon.mod_bigbluebuttonbn.view_nojoin');
+            }
+
+            throw error;
         }
     }
 
diff --git a/src/addons/mod/bigbluebuttonbn/lang.json b/src/addons/mod/bigbluebuttonbn/lang.json
index 959a678e0..380c2a357 100644
--- a/src/addons/mod/bigbluebuttonbn/lang.json
+++ b/src/addons/mod/bigbluebuttonbn/lang.json
@@ -14,5 +14,6 @@
     "view_message_moderators": "moderators",
     "view_message_session_started_at": "This session started at",
     "view_message_viewer": "viewer",
-    "view_message_viewers": "viewers"
+    "view_message_viewers": "viewers",
+    "view_nojoin": "You do not have a role that is allowed to join this session."
 }

From 6d0b53f0349c4c5d43e992e09bdfd666f7bdb907 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 22 Apr 2022 10:04:01 +0200
Subject: [PATCH 1003/1008] MOBILE-3881 timeline: Fix minimim time to get
 events from

---
 .../block/timeline/components/events/events.ts   |  6 +++---
 src/addons/block/timeline/services/timeline.ts   | 16 +++++++++++++---
 src/core/singletons/time.ts                      |  2 +-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/addons/block/timeline/components/events/events.ts b/src/addons/block/timeline/components/events/events.ts
index 4e0155873..fe986201f 100644
--- a/src/addons/block/timeline/components/events/events.ts
+++ b/src/addons/block/timeline/components/events/events.ts
@@ -18,10 +18,10 @@ import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreTimeUtils } from '@services/utils/time';
 import { CoreCourse } from '@features/course/services/course';
-import moment from 'moment';
 import { CoreContentLinksHelper } from '@features/contentlinks/services/contentlinks-helper';
 import { AddonCalendarEvent } from '@addons/calendar/services/calendar';
 import { CoreEnrolledCourseDataWithOptions } from '@features/courses/services/courses-helper';
+import { AddonBlockTimeline } from '../../services/timeline';
 
 /**
  * Directive to render a list of events in course overview.
@@ -94,8 +94,8 @@ export class AddonBlockTimelineEventsComponent implements OnChanges {
      * @return Filtered events.
      */
     protected async filterEventsByTime(start: number, end?: number): Promise<AddonBlockTimelineEvent[]> {
-        start = moment().add(start, 'days').startOf('day').unix();
-        end = end !== undefined ? moment().add(end, 'days').startOf('day').unix() : end;
+        start = AddonBlockTimeline.getDayStart(start);
+        end = end !== undefined ? AddonBlockTimeline.getDayStart(end) : end;
 
         return await Promise.all(this.events.filter((event) => {
             if (end) {
diff --git a/src/addons/block/timeline/services/timeline.ts b/src/addons/block/timeline/services/timeline.ts
index 831c5c5c5..c37f36591 100644
--- a/src/addons/block/timeline/services/timeline.ts
+++ b/src/addons/block/timeline/services/timeline.ts
@@ -55,7 +55,7 @@ export class AddonBlockTimelineProvider {
     ): Promise<{ events: AddonCalendarEvent[]; canLoadMore?: number }> {
         const site = await CoreSites.getSite(siteId);
 
-        const time = moment().subtract(14, 'days').unix(); // Check two weeks ago.
+        const time = this.getDayStart(-14); // Check two weeks ago.
 
         const data: AddonCalendarGetActionEventsByCourseWSParams = {
             timesortfrom: time,
@@ -109,7 +109,7 @@ export class AddonBlockTimelineProvider {
     ): Promise<{[courseId: string]: { events: AddonCalendarEvent[]; canLoadMore?: number } }> {
         const site = await CoreSites.getSite(siteId);
 
-        const time = moment().subtract(14, 'days').unix(); // Check two weeks ago.
+        const time = this.getDayStart(-14); // Check two weeks ago.
 
         const data: AddonCalendarGetActionEventsByCoursesWSParams = {
             timesortfrom: time,
@@ -164,7 +164,7 @@ export class AddonBlockTimelineProvider {
     ): Promise<{ events: AddonCalendarEvent[]; canLoadMore?: number }> {
         const site = await CoreSites.getSite(siteId);
 
-        const timesortfrom = moment().subtract(14, 'days').unix(); // Check two weeks ago.
+        const timesortfrom = this.getDayStart(-14); // Check two weeks ago.
         const limitnum = AddonBlockTimelineProvider.EVENTS_LIMIT;
 
         const data: AddonCalendarGetActionEventsByTimesortWSParams = {
@@ -275,6 +275,16 @@ export class AddonBlockTimelineProvider {
         };
     }
 
+    /**
+     * Returns the timestamp at the start of the day with an optional offset.
+     *
+     * @param daysOffset Offset days to add or substract.
+     * @return timestamp.
+     */
+    getDayStart(daysOffset = 0): number {
+        return moment().startOf('day').add(daysOffset, 'days').unix();
+    }
+
 }
 
 export const AddonBlockTimeline = makeSingleton(AddonBlockTimelineProvider);
diff --git a/src/core/singletons/time.ts b/src/core/singletons/time.ts
index 6b222937b..5c95ed837 100644
--- a/src/core/singletons/time.ts
+++ b/src/core/singletons/time.ts
@@ -81,7 +81,7 @@ export class CoreTime {
     /**
      * Converts a number of seconds into a short human readable format: minutes and seconds, in fromat: 3' 27''.
      *
-     * @param seconds Seconds
+     * @param duration Duration in seconds.
      * @return Short human readable text.
      */
     static formatTimeShort(duration: number): string {

From f9b19513472057aa04c056f97cb953ba923797dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 22 Apr 2022 11:17:49 +0200
Subject: [PATCH 1004/1008] MOBILE-3881 timeline: Fix overdue tasks showing
 different from LMS

---
 .../timeline/components/events/events.ts      | 43 ++++++++++++-------
 .../timeline/addon-block-timeline.html        |  4 +-
 .../timeline/components/timeline/timeline.ts  |  2 +
 src/addons/calendar/services/calendar.ts      |  2 +-
 4 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/src/addons/block/timeline/components/events/events.ts b/src/addons/block/timeline/components/events/events.ts
index fe986201f..653313e31 100644
--- a/src/addons/block/timeline/components/events/events.ts
+++ b/src/addons/block/timeline/components/events/events.ts
@@ -37,6 +37,7 @@ export class AddonBlockTimelineEventsComponent implements OnChanges {
     @Input() course?: CoreEnrolledCourseDataWithOptions; // Whether to show the course name.
     @Input() from = 0; // Number of days from today to offset the events.
     @Input() to?: number; // Number of days from today to limit the events to. If not defined, no limit.
+    @Input() overdue = false; // If filtering overdue events or not.
     @Input() canLoadMore = false; // Whether more events can be loaded.
     @Output() loadMore = new EventEmitter(); // Notify that more events should be loaded.
 
@@ -53,18 +54,13 @@ export class AddonBlockTimelineEventsComponent implements OnChanges {
 
         if (changes.events || changes.from || changes.to) {
             if (this.events) {
-                const filteredEvents = await this.filterEventsByTime(this.from, this.to);
+                const filteredEvents = await this.filterEventsByTime();
                 this.empty = !filteredEvents || filteredEvents.length <= 0;
 
-                const now = CoreTimeUtils.timestamp();
-
-                const eventsByDay: Record<number, AddonCalendarEvent[]> = {};
+                const eventsByDay: Record<number, AddonBlockTimelineEvent[]> = {};
                 filteredEvents.forEach((event) => {
                     const dayTimestamp = CoreTimeUtils.getMidnightForTimestamp(event.timesort);
 
-                    // Already calculated on 4.0 onwards but this will be live.
-                    event.overdue = event.timesort < now;
-
                     if (eventsByDay[dayTimestamp]) {
                         eventsByDay[dayTimestamp].push(event);
                     } else {
@@ -89,20 +85,34 @@ export class AddonBlockTimelineEventsComponent implements OnChanges {
     /**
      * Filter the events by time.
      *
-     * @param start Number of days to start getting events from today. E.g. -1 will get events from yesterday.
-     * @param end Number of days after the start.
      * @return Filtered events.
      */
-    protected async filterEventsByTime(start: number, end?: number): Promise<AddonBlockTimelineEvent[]> {
-        start = AddonBlockTimeline.getDayStart(start);
-        end = end !== undefined ? AddonBlockTimeline.getDayStart(end) : end;
+    protected async filterEventsByTime(): Promise<AddonBlockTimelineEvent[]> {
+        const start = AddonBlockTimeline.getDayStart(this.from);
+        const end = this.to !== undefined
+            ? AddonBlockTimeline.getDayStart(this.to)
+            : undefined;
+
+        const now = CoreTimeUtils.timestamp();
+        const midnight = AddonBlockTimeline.getDayStart();
 
         return await Promise.all(this.events.filter((event) => {
-            if (end) {
-                return start <= event.timesort && event.timesort < end;
+            if (start > event.timesort || (end && event.timesort >= end)) {
+                return false;
             }
 
-            return start <= event.timesort;
+            // Already calculated on 4.0 onwards but this will be live.
+            event.overdue = event.timesort < now;
+
+            if (event.eventtype === 'open' || event.eventtype === 'opensubmission') {
+                const dayTimestamp = CoreTimeUtils.getMidnightForTimestamp(event.timesort);
+
+                return dayTimestamp > midnight;
+            }
+
+            // When filtering by overdue, we fetch all events due today, in case any have elapsed already and are overdue.
+            // This means if filtering by overdue, some events fetched might not be required (eg if due later today).
+            return (!this.overdue || event.overdue);
         }).map(async (event) => {
             event.iconUrl = await CoreCourse.getModuleIconSrc(event.icon.component);
             event.modulename = event.modulename || event.icon.component;
@@ -147,7 +157,8 @@ export class AddonBlockTimelineEventsComponent implements OnChanges {
 
 }
 
-type AddonBlockTimelineEvent = AddonCalendarEvent & {
+type AddonBlockTimelineEvent = Omit<AddonCalendarEvent, 'eventtype'> & {
+    eventtype: string;
     iconUrl?: string;
     iconTitle?: string;
 };
diff --git a/src/addons/block/timeline/components/timeline/addon-block-timeline.html b/src/addons/block/timeline/components/timeline/addon-block-timeline.html
index c494a8f6f..e518b440c 100644
--- a/src/addons/block/timeline/components/timeline/addon-block-timeline.html
+++ b/src/addons/block/timeline/components/timeline/addon-block-timeline.html
@@ -60,12 +60,12 @@
 
     <core-loading [hideUntil]="timeline.loaded" [hidden]="sort != 'sortbydates'">
         <addon-block-timeline-events [events]="timeline.events" [canLoadMore]="timeline.canLoadMore" (loadMore)="loadMore()"
-            [from]="dataFrom" [to]="dataTo"></addon-block-timeline-events>
+            [from]="dataFrom" [to]="dataTo" [overdue]="overdue"></addon-block-timeline-events>
     </core-loading>
     <core-loading [hideUntil]="timelineCourses.loaded" [hidden]="sort != 'sortbycourses'">
         <ng-container *ngFor="let course of timelineCourses.courses">
             <addon-block-timeline-events [events]="course.events" [canLoadMore]="course.canLoadMore" (loadMore)="loadMore(course)"
-                [course]="course" [from]="dataFrom" [to]="dataTo"></addon-block-timeline-events>
+                [course]="course" [from]="dataFrom" [to]="dataTo" [overdue]="overdue"></addon-block-timeline-events>
         </ng-container>
         <core-empty-box *ngIf="timelineCourses.courses.length == 0" image="assets/img/icons/courses.svg"
             [message]="'addon.block_timeline.noevents' | translate"></core-empty-box>
diff --git a/src/addons/block/timeline/components/timeline/timeline.ts b/src/addons/block/timeline/components/timeline/timeline.ts
index e26045dd8..dc23ebbca 100644
--- a/src/addons/block/timeline/components/timeline/timeline.ts
+++ b/src/addons/block/timeline/components/timeline/timeline.ts
@@ -58,6 +58,7 @@ export class AddonBlockTimelineComponent extends CoreBlockBaseComponent implemen
 
     dataFrom?: number;
     dataTo?: number;
+    overdue = false;
 
     searchEnabled = false;
     searchText = '';
@@ -200,6 +201,7 @@ export class AddonBlockTimelineComponent extends CoreBlockBaseComponent implemen
     switchFilter(filter: string): void {
         this.filter = filter;
         this.currentSite.setLocalSiteConfig('AddonBlockTimelineFilter', this.filter);
+        this.overdue = this.filter === 'overdue';
 
         switch (this.filter) {
             case 'overdue':
diff --git a/src/addons/calendar/services/calendar.ts b/src/addons/calendar/services/calendar.ts
index c8bbf90d3..6877b54c3 100644
--- a/src/addons/calendar/services/calendar.ts
+++ b/src/addons/calendar/services/calendar.ts
@@ -45,7 +45,7 @@ import { CoreText } from '@singletons/text';
 const ROOT_CACHE_KEY = 'mmaCalendar:';
 
 /**
- * Context levels enumeration.
+ * Main calendar Event types enumeration.
  */
 export enum AddonCalendarEventType {
     SITE = 'site',

From cc24b2c7ff2e7242c6ba2946a76a81d698bdd7a9 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 22 Apr 2022 12:38:05 +0200
Subject: [PATCH 1005/1008] MOBILE-3833 mycourses: Display side blocks in my
 courses

---
 .../components/side-blocks-button/side-blocks-button.ts  | 2 ++
 .../features/block/components/side-blocks/side-blocks.ts | 3 ++-
 src/core/features/courses/pages/my/my.html               | 4 ++++
 src/core/features/courses/pages/my/my.ts                 | 8 ++++++--
 src/core/features/courses/services/dashboard.ts          | 9 +++++++--
 5 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/core/features/block/components/side-blocks-button/side-blocks-button.ts b/src/core/features/block/components/side-blocks-button/side-blocks-button.ts
index bc62226d7..74027b05a 100644
--- a/src/core/features/block/components/side-blocks-button/side-blocks-button.ts
+++ b/src/core/features/block/components/side-blocks-button/side-blocks-button.ts
@@ -33,6 +33,7 @@ export class CoreBlockSideBlocksButtonComponent implements OnInit, OnDestroy {
 
     @Input() contextLevel!: string;
     @Input() instanceId!: number;
+    @Input() myDashboardPage?: string;
 
     userTour: CoreUserTourDirectiveOptions = {
         id: 'side-blocks-button',
@@ -69,6 +70,7 @@ export class CoreBlockSideBlocksButtonComponent implements OnInit, OnDestroy {
             componentProps: {
                 contextLevel: this.contextLevel,
                 instanceId: this.instanceId,
+                myDashboardPage: this.myDashboardPage,
             },
         });
     }
diff --git a/src/core/features/block/components/side-blocks/side-blocks.ts b/src/core/features/block/components/side-blocks/side-blocks.ts
index 56624490f..5a7fc3494 100644
--- a/src/core/features/block/components/side-blocks/side-blocks.ts
+++ b/src/core/features/block/components/side-blocks/side-blocks.ts
@@ -34,6 +34,7 @@ export class CoreBlockSideBlocksComponent implements OnInit {
 
     @Input() contextLevel!: string;
     @Input() instanceId!: number;
+    @Input() myDashboardPage?: string;
 
     @ViewChildren(CoreBlockComponent) blocksComponents?: QueryList<CoreBlockComponent>;
 
@@ -83,7 +84,7 @@ export class CoreBlockSideBlocksComponent implements OnInit {
             if (this.contextLevel === 'course') {
                 this.blocks = await CoreBlockHelper.getCourseBlocks(this.instanceId);
             } else {
-                const blocks = await CoreCoursesDashboard.getDashboardBlocks();
+                const blocks = await CoreCoursesDashboard.getDashboardBlocks(undefined, undefined, this.myDashboardPage);
 
                 this.blocks = blocks.sideBlocks;
             }
diff --git a/src/core/features/courses/pages/my/my.html b/src/core/features/courses/pages/my/my.html
index 1ea788466..1f307e4b7 100644
--- a/src/core/features/courses/pages/my/my.html
+++ b/src/core/features/courses/pages/my/my.html
@@ -49,6 +49,10 @@
             <core-block *ngIf="loadedBlock?.visible" [block]="loadedBlock" contextLevel="user" [instanceId]="userId"></core-block>
         </ion-list>
 
+        <core-block-side-blocks-button slot="fixed" *ngIf="hasSideBlocks" contextLevel="user" [instanceId]="userId"
+            [myDashboardPage]="myPageCourses">
+        </core-block-side-blocks-button>
+
         <core-empty-box *ngIf="!loadedBlock" icon="fas-cubes" [message]="'core.course.nocontentavailable' | translate">
         </core-empty-box>
     </core-loading>
diff --git a/src/core/features/courses/pages/my/my.ts b/src/core/features/courses/pages/my/my.ts
index ad8f0a206..56551726e 100644
--- a/src/core/features/courses/pages/my/my.ts
+++ b/src/core/features/courses/pages/my/my.ts
@@ -42,6 +42,8 @@ export class CoreCoursesMyCoursesPage implements OnInit, OnDestroy {
     loadedBlock?: Partial<CoreCourseBlock>;
     myOverviewBlock?: AddonBlockMyOverviewComponent;
     loaded = false;
+    myPageCourses = CoreCoursesDashboardProvider.MY_PAGE_COURSES;
+    hasSideBlocks = false;
 
     protected updateSiteObserver: CoreEventObserver;
 
@@ -79,9 +81,11 @@ export class CoreCoursesMyCoursesPage implements OnInit, OnDestroy {
 
         if (available && !disabled) {
             try {
-                const blocks = await CoreCoursesDashboard.getDashboardBlocksFromWS(CoreCoursesDashboardProvider.MY_PAGE_COURSES);
+                const blocks = await CoreCoursesDashboard.getDashboardBlocks(undefined, undefined, this.myPageCourses);
 
-                this.loadedBlock = blocks.find((block) => block.name == 'myoverview');
+                // My overview block should always be in main blocks, but check side blocks too just in case.
+                this.loadedBlock = blocks.mainBlocks.concat(blocks.sideBlocks).find((block) => block.name == 'myoverview');
+                this.hasSideBlocks = blocks.sideBlocks.length > 0;
 
                 await CoreUtils.nextTicks(2);
 
diff --git a/src/core/features/courses/services/dashboard.ts b/src/core/features/courses/services/dashboard.ts
index 117c8d6df..8a5eb2d84 100644
--- a/src/core/features/courses/services/dashboard.ts
+++ b/src/core/features/courses/services/dashboard.ts
@@ -92,10 +92,15 @@ export class CoreCoursesDashboardProvider {
      *
      * @param userId User ID. Default, current user.
      * @param siteId Site ID. If not defined, current site.
+     * @param myPage What my page to return blocks of. Default MY_PAGE_DEFAULT.
      * @return Promise resolved with the list of blocks.
      */
-    async getDashboardBlocks(userId?: number, siteId?: string): Promise<CoreCoursesDashboardBlocks> {
-        const blocks = await this.getDashboardBlocksFromWS(CoreCoursesDashboardProvider.MY_PAGE_DEFAULT, userId, siteId);
+    async getDashboardBlocks(
+        userId?: number,
+        siteId?: string,
+        myPage = CoreCoursesDashboardProvider.MY_PAGE_DEFAULT,
+    ): Promise<CoreCoursesDashboardBlocks> {
+        const blocks = await this.getDashboardBlocksFromWS(myPage, userId, siteId);
 
         let mainBlocks: CoreCourseBlock[] = [];
         let sideBlocks: CoreCourseBlock[] = [];

From 0f5416e2f0750da7aa5c015ffcfb2d12fd87ae32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 22 Apr 2022 12:12:41 +0200
Subject: [PATCH 1006/1008] MOBILE-3881 timeline: Only show in progress courses

---
 .../components/myoverview/myoverview.ts       | 51 ++++---------------
 .../timeline/components/timeline/timeline.ts  | 27 +++++++---
 .../courses/services/courses-helper.ts        | 46 +++++++++++++++++
 3 files changed, 76 insertions(+), 48 deletions(-)

diff --git a/src/addons/block/myoverview/components/myoverview/myoverview.ts b/src/addons/block/myoverview/components/myoverview/myoverview.ts
index 14bb2c6ff..8ca110b87 100644
--- a/src/addons/block/myoverview/components/myoverview/myoverview.ts
+++ b/src/addons/block/myoverview/components/myoverview/myoverview.ts
@@ -27,7 +27,6 @@ import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTextUtils } from '@services/utils/text';
 import { AddonCourseCompletion } from '@addons/coursecompletion/services/coursecompletion';
 import { IonSearchbar } from '@ionic/angular';
-import moment from 'moment';
 import { CoreNavigator } from '@services/navigator';
 
 const FILTER_PRIORITY: AddonBlockMyOverviewTimeFilters[] =
@@ -478,13 +477,19 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
                     break;
                 case 'inprogress':
                     this.filteredCourses = this.filteredCourses.filter((course) =>
-                        !course.hidden && !this.isPastCourse(course) && !this.isFutureCourse(course));
+                        !course.hidden &&
+                        !CoreCoursesHelper.isPastCourse(course, this.gradePeriodAfter) &&
+                        !CoreCoursesHelper.isFutureCourse(course, this.gradePeriodAfter, this.gradePeriodBefore));
                     break;
                 case 'future':
-                    this.filteredCourses = this.filteredCourses.filter((course) => !course.hidden && this.isFutureCourse(course));
+                    this.filteredCourses = this.filteredCourses.filter((course) =>
+                        !course.hidden &&
+                        CoreCoursesHelper.isFutureCourse(course, this.gradePeriodAfter, this.gradePeriodBefore));
                     break;
                 case 'past':
-                    this.filteredCourses = this.filteredCourses.filter((course) => !course.hidden && this.isPastCourse(course));
+                    this.filteredCourses = this.filteredCourses.filter((course) =>
+                        !course.hidden &&
+                        CoreCoursesHelper.isPastCourse(course, this.gradePeriodAfter));
                     break;
                 case 'favourite':
                     this.filteredCourses = this.filteredCourses.filter((course) => !course.hidden && course.isfavourite);
@@ -515,44 +520,6 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
         this.initPrefetchCoursesIcons();
     }
 
-    /**
-     * Calculates if course date is past.
-     *
-     * @param course Course Object.
-     * @return Wether the course is past.
-     */
-    protected isPastCourse(course: CoreEnrolledCourseDataWithOptions): boolean {
-        if (course.completed) {
-            return true;
-        }
-
-        if (!course.enddate) {
-            return false;
-        }
-
-        // Calculate the end date to use for display classification purposes, incorporating the grace period, if any.
-        const endDate = moment(course.enddate * 1000).add(this.gradePeriodAfter, 'days').valueOf();
-
-        return endDate < this.today;
-    }
-
-    /**
-     * Calculates if course date is future.
-     *
-     * @param course Course Object.
-     * @return Wether the course is future.
-     */
-    protected isFutureCourse(course: CoreEnrolledCourseDataWithOptions): boolean {
-        if (this.isPastCourse(course) || !course.startdate) {
-            return false;
-        }
-
-        // Calculate the start date to use for display classification purposes, incorporating the grace period, if any.
-        const startDate = moment(course.startdate * 1000).subtract(this.gradePeriodBefore, 'days').valueOf();
-
-        return startDate > this.today;
-    }
-
     /**
      * Sort courses
      *
diff --git a/src/addons/block/timeline/components/timeline/timeline.ts b/src/addons/block/timeline/components/timeline/timeline.ts
index dc23ebbca..d0602b990 100644
--- a/src/addons/block/timeline/components/timeline/timeline.ts
+++ b/src/addons/block/timeline/components/timeline/timeline.ts
@@ -63,8 +63,10 @@ export class AddonBlockTimelineComponent extends CoreBlockBaseComponent implemen
     searchEnabled = false;
     searchText = '';
 
-    protected courseIds: number[] = [];
+    protected courseIdsToInvalidate: number[] = [];
     protected fetchContentDefaultError = 'Error getting timeline data.';
+    protected gradePeriodAfter = 0;
+    protected gradePeriodBefore = 0;
 
     constructor() {
         super('AddonBlockTimelineComponent');
@@ -106,8 +108,8 @@ export class AddonBlockTimelineComponent extends CoreBlockBaseComponent implemen
         promises.push(AddonBlockTimeline.invalidateActionEventsByCourses());
         promises.push(CoreCourses.invalidateUserCourses());
         promises.push(CoreCourseOptionsDelegate.clearAndInvalidateCoursesOptions());
-        if (this.courseIds.length > 0) {
-            promises.push(CoreCourses.invalidateCoursesByField('ids', this.courseIds.join(',')));
+        if (this.courseIdsToInvalidate.length > 0) {
+            promises.push(CoreCourses.invalidateCoursesByField('ids', this.courseIdsToInvalidate.join(',')));
         }
 
         return CoreUtils.allPromises(promises);
@@ -172,13 +174,26 @@ export class AddonBlockTimelineComponent extends CoreBlockBaseComponent implemen
      * @return Promise resolved when done.
      */
     protected async fetchMyOverviewTimelineByCourses(): Promise<void> {
+        try {
+            this.gradePeriodAfter = parseInt(await this.currentSite.getConfig('coursegraceperiodafter'), 10);
+            this.gradePeriodBefore = parseInt(await this.currentSite.getConfig('coursegraceperiodbefore'), 10);
+        } catch {
+            this.gradePeriodAfter = 0;
+            this.gradePeriodBefore = 0;
+        }
+
         // Do not filter courses by date because they can contain activities due.
         this.timelineCourses.courses = await CoreCoursesHelper.getUserCoursesWithOptions();
+        this.courseIdsToInvalidate = this.timelineCourses.courses.map((course) => course.id);
+
+        // Filter only in progress courses.
+        this.timelineCourses.courses = this.timelineCourses.courses.filter((course) =>
+            !course.hidden &&
+            !CoreCoursesHelper.isPastCourse(course, this.gradePeriodAfter) &&
+            !CoreCoursesHelper.isFutureCourse(course, this.gradePeriodAfter, this.gradePeriodBefore));
 
         if (this.timelineCourses.courses.length > 0) {
-            this.courseIds = this.timelineCourses.courses.map((course) => course.id);
-
-            const courseEvents = await AddonBlockTimeline.getActionEventsByCourses(this.courseIds, this.searchText);
+            const courseEvents = await AddonBlockTimeline.getActionEventsByCourses(this.courseIdsToInvalidate, this.searchText);
 
             this.timelineCourses.courses = this.timelineCourses.courses.filter((course) => {
                 if (courseEvents[course.id].events.length == 0) {
diff --git a/src/core/features/courses/services/courses-helper.ts b/src/core/features/courses/services/courses-helper.ts
index cb0e7b1f4..688db4f43 100644
--- a/src/core/features/courses/services/courses-helper.ts
+++ b/src/core/features/courses/services/courses-helper.ts
@@ -25,6 +25,7 @@ import {
 import { makeSingleton, Translate } from '@singletons';
 import { CoreWSExternalFile } from '@services/ws';
 import { AddonCourseCompletion } from '@addons/coursecompletion/services/coursecompletion';
+import moment from 'moment';
 
 /**
  * Helper to gather some common courses functions.
@@ -293,6 +294,51 @@ export class CoreCoursesHelperProvider {
         }));
     }
 
+    /**
+     * Calculates if course date is past.
+     *
+     * @param course Course Object.
+     * @param gradePeriodAfter Classify past courses as in progress for these many days after the course end date.
+     * @return Wether the course is past.
+     */
+    isPastCourse(course: CoreEnrolledCourseDataWithOptions, gradePeriodAfter = 0): boolean {
+        if (course.completed) {
+            return true;
+        }
+
+        if (!course.enddate) {
+            return false;
+        }
+
+        // Calculate the end date to use for display classification purposes, incorporating the grace period, if any.
+        const endDate = moment(course.enddate * 1000).add(gradePeriodAfter, 'days').valueOf();
+
+        return endDate < Date.now();
+    }
+
+    /**
+     * Calculates if course date is future.
+     *
+     * @param course Course Object.
+     * @param gradePeriodAfter Classify past courses as in progress for these many days after the course end date.
+     * @param gradePeriodBefore Classify future courses as in progress for these many days prior to the course start date.
+     * @return Wether the course is future.
+     */
+    isFutureCourse(
+        course: CoreEnrolledCourseDataWithOptions,
+        gradePeriodAfter = 0,
+        gradePeriodBefore = 0,
+    ): boolean {
+        if (this.isPastCourse(course, gradePeriodAfter) || !course.startdate) {
+            return false;
+        }
+
+        // Calculate the start date to use for display classification purposes, incorporating the grace period, if any.
+        const startDate = moment(course.startdate * 1000).subtract(gradePeriodBefore, 'days').valueOf();
+
+        return startDate > Date.now();
+    }
+
 }
 
 export const CoreCoursesHelper = makeSingleton(CoreCoursesHelperProvider);

From 7eff952b6b100eb02311f1d46b221980e3761eb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 22 Apr 2022 13:53:57 +0200
Subject: [PATCH 1007/1008] MOBILE-3881 timeline: Concatenate loaded more
 events

---
 src/addons/block/timeline/components/events/events.ts     | 1 +
 src/addons/block/timeline/components/timeline/timeline.ts | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/addons/block/timeline/components/events/events.ts b/src/addons/block/timeline/components/events/events.ts
index 653313e31..bdebff829 100644
--- a/src/addons/block/timeline/components/events/events.ts
+++ b/src/addons/block/timeline/components/events/events.ts
@@ -76,6 +76,7 @@ export class AddonBlockTimelineEventsComponent implements OnChanges {
                         events: eventsByDay[dayTimestamp],
                     };
                 });
+                this.loadingMore = false;
             } else {
                 this.empty = true;
             }
diff --git a/src/addons/block/timeline/components/timeline/timeline.ts b/src/addons/block/timeline/components/timeline/timeline.ts
index d0602b990..25daa185a 100644
--- a/src/addons/block/timeline/components/timeline/timeline.ts
+++ b/src/addons/block/timeline/components/timeline/timeline.ts
@@ -164,7 +164,7 @@ export class AddonBlockTimelineComponent extends CoreBlockBaseComponent implemen
     protected async fetchMyOverviewTimeline(afterEventId?: number): Promise<void> {
         const events = await AddonBlockTimeline.getActionEventsByTimesort(afterEventId, this.searchText);
 
-        this.timeline.events = events.events;
+        this.timeline.events = afterEventId ? this.timeline.events.concat(events.events) : events.events;
         this.timeline.canLoadMore = events.canLoadMore;
     }
 

From 1f055ac837883acf323c17dba63d1f563d73c9b8 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 22 Apr 2022 14:37:38 +0200
Subject: [PATCH 1008/1008] MOBILE-3833 core: Remove -dev from versions for 4.0
 release

---
 config.xml         | 4 ++--
 moodle.config.json | 2 +-
 package-lock.json  | 4 ++--
 package.json       | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config.xml b/config.xml
index da7166bf5..4bab48e54 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="40000" id="com.moodle.moodlemobile" ios-CFBundleVersion="4.0.0.0" version="4.0.0-dev" versionCode="40000" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-versionCode="40001" id="com.moodle.moodlemobile" ios-CFBundleVersion="4.0.0.1" version="4.0.0" versionCode="40001" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>Moodle</name>
     <description>Moodle official app</description>
     <author email="mobile@moodle.com" href="http://moodle.com">Moodle Mobile team</author>
@@ -27,7 +27,7 @@
     <preference name="UIWebViewBounce" value="false" />
     <preference name="DisallowOverscroll" value="true" />
     <preference name="prerendered-icon" value="true" />
-    <preference name="AppendUserAgent" value="MoodleMobile 4.0.0-dev (40000)" />
+    <preference name="AppendUserAgent" value="MoodleMobile 4.0.0 (40000)" />
     <preference name="BackupWebStorage" value="none" />
     <preference name="ScrollEnabled" value="false" />
     <preference name="KeyboardDisplayRequiresUserAction" value="false" />
diff --git a/moodle.config.json b/moodle.config.json
index 374012c07..7e6907749 100644
--- a/moodle.config.json
+++ b/moodle.config.json
@@ -2,7 +2,7 @@
     "app_id": "com.moodle.moodlemobile",
     "appname": "Moodle Mobile",
     "versioncode": 40000,
-    "versionname": "4.0.0-dev",
+    "versionname": "4.0.0",
     "cache_update_frequency_usually": 420000,
     "cache_update_frequency_often": 1200000,
     "cache_update_frequency_sometimes": 3600000,
diff --git a/package-lock.json b/package-lock.json
index af5c4fab2..ccfedf471 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "moodlemobile",
-  "version": "4.0.0-dev",
+  "version": "4.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "moodlemobile",
-      "version": "4.0.0-dev",
+      "version": "4.0.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@angular/animations": "10.0.14",
diff --git a/package.json b/package.json
index afed0f16f..3c3909d5e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "moodlemobile",
-  "version": "4.0.0-dev",
+  "version": "4.0.0",
   "description": "The official app for Moodle.",
   "author": {
     "name": "Moodle Pty Ltd.",